media-gfx/gimp: 9999

Package-Manager: portage-2.2.12/cvs/Linux x86_64
Manifest-Sign-Key: 0x401A1600

3 files changed, 53 insertions, 39 deletions

diff --git a/media-gfx/gimp/ChangeLog b/media-gfx/gimp/ChangeLog
index 704a146b1798..4f61568ab333 100644
--- a/media-gfx/gimp/ChangeLog
+++ b/media-gfx/gimp/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-gfx/gimp
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/ChangeLog,v 1.438 2014/09/06 21:13:46 sping Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/ChangeLog,v 1.439 2014/09/20 00:24:16 sping Exp $
+
+  20 Sep 2014; Sebastian Pipping <sping@gentoo.org> gimp-9999.ebuild:
+  Update live ebuild
 
 *gimp-2.8.10-r2 (06 Sep 2014)
 
diff --git a/media-gfx/gimp/Manifest b/media-gfx/gimp/Manifest
index 4b8714e1a929..2658b12b6651 100644
--- a/media-gfx/gimp/Manifest
+++ b/media-gfx/gimp/Manifest
@@ -23,13 +23,13 @@ EBUILD gimp-2.8.10-r2.ebuild 4944 SHA256 2e23db4cd45248fcd2d456c80bce989ba11b88f
 EBUILD gimp-2.8.14.ebuild 4763 SHA256 b718d23c2c45bec6b3067b3f5ff3d43327e9309852dc1fbbe2fc63ba21b6591d SHA512 1b1ed3807067524ec8fc944a3ed0ecbecdb549b2313c4bc5bd55edcdbcbd96bb221db9cb4856a71959ba276ae86414f370ddd8b9259e223da13ebb21c079eefa WHIRLPOOL ed5431c47802a064d0e556b9d3c8868a3c74916fb4f745f1822c1c47fa0a8924d2459779240fc2fb35fd0585347bd1ba96ee1ccf39a5cea50931000c9fdc2448
 EBUILD gimp-2.8.6.ebuild 4864 SHA256 759bd0c8bc903bca8165467960a65d9f4d695afaff981b627886e115eabcc2f1 SHA512 7d8932c616ac736bde2dee24f9e011bdd06d8e256ef7fa92f26426c851f6ce7d10a81ce22182e1f7be6b9ceb3ee7a321260b49925ddcede03c2d9d5d5e8428b1 WHIRLPOOL 5fc0b5a4d1ef75cd8f89134b2166b454b154c65f6fe629edf020afcd038e4cd5fc33c16618160605d01f9f7ddba4b5233e7e36283214b1877573029ed3ca9f6b
 EBUILD gimp-2.8.8-r1.ebuild 4830 SHA256 f4ec17016fcc649b120822543cc3e3ec873279e97d333834c586fe2b40573285 SHA512 6fc865e35a91f0c3fb1d67851bc77694c77dc6f268554ae78b89f32115cac3e7dd7f43819758c2500d31eedbaa9ac32006befcf2329ce7a9f2805e1b68b5c731 WHIRLPOOL cdb60974f27e4164407ee37e923d0b7f9ad522855a9851656e565aa367e134e87b982ac60385a6ea8f602ed9bbb15a262fba75c9b21c4bff6c85956a4089a2d2
-EBUILD gimp-9999.ebuild 4055 SHA256 768d8eed1cb548ca41b8249c1707f8ba5b8f3d122dfbb79368829eed376f03f6 SHA512 aee12aec4c9fe6651a66c393e08f21e7fa9e004a1c6a0f65f3003f410257c1f06750a75e7bebe94d91892e98c038fa81769d24aee20d33c1b3ca18b1a83a7dca WHIRLPOOL 0e9b868b28ff959e44eb3526cc8c16e7d068ee9580827131f3ec07c2f4b40c93e65f2ab06668ecc8789f775d32bc5b472dcb3fa621fa84b0e2da68c66356c500
-MISC ChangeLog 62954 SHA256 4d6f80c6d7e8628b6213a13861b60c5f35239b29cbee85d226449fc8e7f37f7a SHA512 b334d5fc31a35b0fb6cf8b255e9471582ef256bd54267ea5efd9ac5b9f833c99b8a601dd1471c43b7eee5cbf1b71efa7a4f6ac0071b54f6ae435f9b126b875ae WHIRLPOOL 723cf107d4fb1391f2e56bd13cd1f35d5ea9e2a19a765b18942cee8a9bbf34b298e5853c7f300810ef26209e3a526186246df9551ca6f3f4ffdf9bb36e50140d
+EBUILD gimp-9999.ebuild 4417 SHA256 9370c757f0f0e79d7eea52bad87fedbdff7cd1b383ba14bb9d95ab7c1300da75 SHA512 76cb0453d9da30a83b79b7f9750952f4135eea37350970f1ec518b0584961d66b05da660c8bcb959ccace11c30177f4475656e8338d8ab4d0cfe32640690de5c WHIRLPOOL f56a8aeeb6e975d8929a6611f76a7cd1a1113d5af0fe25cfe88d9808c90a779dad1398bdefb68c39dcfbff09cc20181f462c485f90868ed3ff660b7036f0475a
+MISC ChangeLog 63046 SHA256 dca12c219739945bc78f5f3352cb10b1f39c28d579004e08825fa7962c166310 SHA512 139cef2d4125f0bc0829081ee78886697ba66e792ea45a8ae607efb376c3401cc5fba192a47ccb802ab494f6ef32814beca4ee1b85c858e8225f562a961c98c9 WHIRLPOOL d4c74446a95ef113c419a73732aef59a01ebe5c67f41b71a0ba748917b1270a1e4b2f5e5a819f3ccf04d4b6759b9c9961c48817109f83b93dcd353a3ebc6546a
 MISC metadata.xml 285 SHA256 77c9767711868abab1e559504dd88eb8aef8cf395629d8ec8c7a5fdb3d29397e SHA512 0b1abe9749d79ed8644c2a34312ab70cff232e08f64c1a914185cbafe8c754e9c6442eac1e3a1c449057e52b076333b70ea8be7418570bfcbee69f69d455079e WHIRLPOOL 9f2199f149dd49efce83f4710f026fc235a9aed38b7c7e0ffbb5480ef6865dee6ac555178bb92a819071d016fb0ead581765697cc3035b829ed96126bc7e6053
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlQLeRoACgkQsAvGakAaFgDVnACePpFAO3A6RYHqN8aihO/k/gfx
-omcAnRmhZtubo7AGCCLWpBr9JBzgftm9
-=9H4h
+iEYEAREIAAYFAlQcyT0ACgkQsAvGakAaFgCz/gCeIxfKGIHGJ+otZ6dAxGICUgE4
+4l8AoMNsc6r3v1JuurPjyahQEq+rby4B
+=0bGM
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/gimp/gimp-9999.ebuild b/media-gfx/gimp/gimp-9999.ebuild
index 542657ac140d..897ea84da8f0 100644
--- a/media-gfx/gimp/gimp-9999.ebuild
+++ b/media-gfx/gimp/gimp-9999.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-9999.ebuild,v 1.53 2014/07/24 18:05:29 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-9999.ebuild,v 1.54 2014/09/20 00:24:16 sping Exp $
 
-EAPI="3"
-PYTHON_DEPEND="python? 2:2.5"
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
 
-inherit git-2 autotools eutils gnome2 fdo-mime multilib python
+inherit autotools eutils gnome2 fdo-mime multilib python-single-r1 git-r3
 
 EGIT_REPO_URI="git://git.gnome.org/gimp"
 
@@ -17,9 +17,14 @@ LICENSE="GPL-3 LGPL-3"
 SLOT="2"
 KEYWORDS=""
 
-IUSE="alsa aalib altivec aqua bzip2 curl dbus debug doc gnome openexr postscript jpeg jpeg2k lcms mmx mng pdf png python smp sse svg tiff udev webkit wmf xpm"
+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 mmx mng pdf png python smp sse svg tiff udev webkit wmf xpm"
 
-RDEPEND=">=dev-libs/glib-2.36.0:2
+for lang in ${LANGS}; do
+	IUSE+=" linguas_${lang}"
+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
@@ -28,6 +33,8 @@ RDEPEND=">=dev-libs/glib-2.36.0:2
 	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
 	sys-libs/zlib
 	dev-libs/libxml2
 	dev-libs/libxslt
@@ -36,6 +43,7 @@ RDEPEND=">=dev-libs/glib-2.36.0:2
 	>=media-libs/gegl-0.2.1
 	aalib? ( media-libs/aalib )
 	alsa? ( media-libs/alsa-lib )
+	aqua? ( x11-libs/gtk-mac-integration )
 	curl? ( net-misc/curl )
 	dbus? ( dev-libs/dbus-glib )
 	gnome? ( gnome-base/gvfs )
@@ -47,21 +55,26 @@ RDEPEND=">=dev-libs/glib-2.36.0:2
 	mng? ( media-libs/libmng )
 	pdf? ( >=app-text/poppler-0.12.4[cairo] )
 	png? ( >=media-libs/libpng-1.2.37:0 )
-	python?	( >=dev-python/pygtk-2.10.4:2 )
+	python?	(
+		${PYTHON_DEPS}
+		>=dev-python/pygtk-2.10.4:2[${PYTHON_USEDEP}]
+	)
 	tiff? ( >=media-libs/tiff-3.5.7:0 )
-	svg? ( >=gnome-base/librsvg-2.34.2:2 )
+	svg? ( >=gnome-base/librsvg-2.36.0:2 )
 	wmf? ( >=media-libs/libwmf-0.2.8 )
 	x11-libs/libXcursor
 	sys-libs/zlib
 	>=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 )"
+	udev? ( virtual/libgudev:= )"
 DEPEND="${RDEPEND}
 	sys-apps/findutils
 	virtual/pkgconfig
 	>=dev-util/intltool-0.40.1
-	>=sys-devel/gettext-0.17
+	>=sys-devel/gettext-0.19
 	doc? ( >=dev-util/gtk-doc-1 )
 	>=sys-devel/libtool-2.2
 	>=sys-devel/autoconf-2.54
@@ -70,27 +83,22 @@ DEPEND="${RDEPEND}
 
 DOCS="AUTHORS ChangeLog* HACKING NEWS README*"
 
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
 pkg_setup() {
 	G2CONF="--enable-default-binary \
+		--disable-silent-rules \
 		$(use_with !aqua x) \
 		$(use_with aalib aa) \
 		$(use_with alsa) \
 		$(use_enable altivec) \
-		$(use_with bzip2) \
-		$(use_with curl libcurl) \
-		$(use_with dbus) \
-		$(use_with gnome gvfs) \
 		$(use_with openexr) \
 		$(use_with webkit) \
-		$(use_with jpeg libjpeg) \
 		$(use_with jpeg2k libjasper) \
-		$(use_with exif libexif) \
-		$(use_with lcms lcms lcms2) \
 		$(use_with postscript gs) \
 		$(use_enable mmx) \
 		$(use_with mng libmng) \
 		$(use_with pdf poppler) \
-		$(use_with png libpng) \
 		$(use_enable python) \
 		$(use_enable smp mp) \
 		$(use_enable sse) \
@@ -103,16 +111,13 @@ pkg_setup() {
 		--without-xvfb-run"
 
 	if use python; then
-		python_set_active_version 2
-		python_pkg_setup
+		python-single-r1_pkg_setup
 	fi
 }
 
-src_unpack() {
-	git-2_src_unpack
-}
-
 src_prepare() {
+	sed -i -e 's/== "xquartz"/= "xquartz"/' configure.ac || die #494864
+
 	echo '#!/bin/sh' > py-compile
 	chmod a+x py-compile || die
 	sed -i -e 's:\$srcdir/configure:#:g' autogen.sh
@@ -129,31 +134,37 @@ src_prepare() {
 	gnome2_src_prepare
 }
 
+_clean_up_locales() {
+	einfo "Cleaning up locales..."
+	for lang in ${LANGS}; do
+		use "linguas_${lang}" && {
+			einfo "- keeping ${lang}"
+			continue
+		}
+		rm -Rf "${ED}"/usr/share/locale/"${lang}" || die
+	done
+}
+
 src_install() {
 	gnome2_src_install
 
 	if use python; then
-		python_convert_shebangs -r $(python_get_version) "${ED}"
-		python_need_rebuild
+		python_optimize
 	fi
 
 	# Workaround for bug #321111 to give GIMP the least
 	# precedence on PDF documents by default
 	mv "${ED}"/usr/share/applications/{,zzz-}gimp.desktop || die
 
-	find "${ED}" -name '*.la' -delete || die
+	prune_libtool_files --all
+
+	_clean_up_locales
 }
 
 pkg_postinst() {
 	gnome2_pkg_postinst
-
-	use python && python_mod_optimize /usr/$(get_libdir)/gimp/2.0/python \
-		/usr/$(get_libdir)/gimp/2.0/plug-ins
 }
 
 pkg_postrm() {
 	gnome2_pkg_postrm
-
-	use python && python_mod_cleanup /usr/$(get_libdir)/gimp/2.0/python \
-		/usr/$(get_libdir)/gimp/2.0/plug-ins
 }