media-gfx/gimp: Merge 2.9.2 into and fix 9999 (bug #569346)

Package-Manager: portage-2.2.26

1 files changed, 29 insertions, 20 deletions

diff --git a/media-gfx/gimp/gimp-9999.ebuild b/media-gfx/gimp/gimp-9999.ebuild
index 00128f98c675..bdcb5f6868b9 100644
--- a/media-gfx/gimp/gimp-9999.ebuild
+++ b/media-gfx/gimp/gimp-9999.ebuild
@@ -5,7 +5,7 @@
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
 
-inherit autotools eutils gnome2 fdo-mime multilib python-single-r1 git-r3
+inherit virtualx autotools eutils gnome2 fdo-mime multilib python-single-r1 git-r3
 
 EGIT_REPO_URI="git://git.gnome.org/gimp"
 
@@ -18,7 +18,7 @@ SLOT="2"
 KEYWORDS=""
 
 LANGS="am ar ast az be bg br ca ca@valencia cs csb da de dz el en_CA en_GB eo es et eu fa fi fr ga gl gu he hi hr hu id is it ja ka kk km kn ko lt lv mk ml ms my nb nds ne nl nn oc pa pl pt pt_BR ro ru rw si sk sl sr sr@latin sv ta te th tr tt uk vi xh yi zh_CN zh_HK zh_TW"
-IUSE="alsa aalib altivec aqua bzip2 curl dbus debug doc exif gnome openexr postscript jpeg jpeg2k lcms cpu_flags_x86_mmx mng pdf png python smp cpu_flags_x86_sse svg tiff udev webkit wmf xpm"
+IUSE="alsa aalib altivec aqua debug doc openexr gnome postscript jpeg2k cpu_flags_x86_mmx mng pdf python smp cpu_flags_x86_sse svg udev webkit wmf xpm"
 
 for lang in ${LANGS}; do
 	IUSE+=" linguas_${lang}"
@@ -27,47 +27,46 @@ done
 RDEPEND=">=dev-libs/glib-2.40.0:2
 	>=dev-libs/atk-2.2.0
 	>=x11-libs/gtk+-2.24.10:2
-	>=x11-libs/gdk-pixbuf-2.24.1:2
+	dev-util/gtk-update-icon-cache
+	>=x11-libs/gdk-pixbuf-2.31:2
 	>=x11-libs/cairo-1.12.2
 	>=x11-libs/pango-1.29.4
 	xpm? ( x11-libs/libXpm )
 	>=media-libs/freetype-2.1.7
-	>=media-libs/fontconfig-2.2.0
-	>=media-libs/freetype-2.1.7:2
 	>=media-libs/harfbuzz-0.9.19
+	>=media-libs/gexiv2-0.6.1
+	>=media-libs/fontconfig-2.2.0
 	sys-libs/zlib
 	dev-libs/libxml2
 	dev-libs/libxslt
 	x11-themes/hicolor-icon-theme
-	>=media-libs/babl-0.1.11
-	media-libs/gegl:0.3
+	>=media-libs/babl-0.1.14
+	>=media-libs/gegl-0.3.4:0.3[cairo]
+	>=dev-libs/glib-2.43
 	aalib? ( media-libs/aalib )
 	alsa? ( media-libs/alsa-lib )
 	aqua? ( x11-libs/gtk-mac-integration )
-	curl? ( net-misc/curl )
-	dbus? ( dev-libs/dbus-glib )
+	dev-util/gdbus-codegen
 	gnome? ( gnome-base/gvfs )
 	webkit? ( >=net-libs/webkit-gtk-1.6.1:2 )
-	jpeg? ( virtual/jpeg:0 )
+	virtual/jpeg:0
 	jpeg2k? ( media-libs/jasper )
-	>=media-libs/gexiv2-0.6.1
-	lcms? ( >=media-libs/lcms-2.2:2 )
+	>=media-libs/lcms-2.2:2
 	mng? ( media-libs/libmng )
-	pdf? ( >=app-text/poppler-0.12.4[cairo] )
-	png? ( >=media-libs/libpng-1.2.37:0 )
+	openexr? ( >=media-libs/openexr-1.6.1 )
+	pdf? ( >=app-text/poppler-0.12.4[cairo] >=app-text/poppler-data-0.4.7 )
+	>=media-libs/libpng-1.2.37:0
 	python?	(
 		${PYTHON_DEPS}
 		>=dev-python/pygtk-2.10.4:2[${PYTHON_USEDEP}]
 	)
-	tiff? ( >=media-libs/tiff-3.5.7:0 )
+	>=media-libs/tiff-3.5.7:0
 	svg? ( >=gnome-base/librsvg-2.36.0:2 )
 	wmf? ( >=media-libs/libwmf-0.2.8 )
 	x11-libs/libXcursor
 	sys-libs/zlib
+	app-arch/bzip2
 	>=app-arch/xz-utils-5.0.0
-	openexr? ( >=media-libs/openexr-1.6.1 )
-	>=app-text/poppler-data-0.4.7
-	bzip2? ( app-arch/bzip2 )
 	postscript? ( app-text/ghostscript-gpl )
 	udev? ( virtual/libgudev:= )"
 DEPEND="${RDEPEND}
@@ -92,18 +91,17 @@ pkg_setup() {
 		$(use_with aalib aa) \
 		$(use_with alsa) \
 		$(use_enable altivec) \
-		$(use_with openexr) \
 		$(use_with webkit) \
 		$(use_with jpeg2k libjasper) \
 		$(use_with postscript gs) \
 		$(use_enable cpu_flags_x86_mmx mmx) \
 		$(use_with mng libmng) \
+		$(use_with openexr) \
 		$(use_with pdf poppler) \
 		$(use_enable python) \
 		$(use_enable smp mp) \
 		$(use_enable cpu_flags_x86_sse sse) \
 		$(use_with svg librsvg) \
-		$(use_with tiff libtiff) \
 		$(use_with udev gudev) \
 		$(use_with wmf) \
 		--with-xmc \
@@ -134,6 +132,10 @@ src_prepare() {
 	gnome2_src_prepare
 }
 
+src_configure() {
+	GEGL=/usr/bin/gegl-0.3 gnome2_src_configure
+}
+
 _clean_up_locales() {
 	einfo "Cleaning up locales..."
 	for lang in ${LANGS}; do
@@ -145,6 +147,10 @@ _clean_up_locales() {
 	done
 }
 
+src_test() {
+	Xemake check
+}
+
 src_install() {
 	gnome2_src_install
 
@@ -158,6 +164,9 @@ src_install() {
 
 	prune_libtool_files --all
 
+	# Prevent dead symlink gimp-console.1 from downstream man page compression (bug #433527)
+	mv "${ED}"/usr/share/man/man1/gimp-console{-*,}.1 || die
+
 	_clean_up_locales
 }