added prefix support (bug #476144)

Package-Manager: portage-2.2.0_alpha188/cvs/Linux x86_64
Manifest-Sign-Key: 0xC2000586

4 files changed, 23 insertions, 15 deletions

diff --git a/media-gfx/gimp/ChangeLog b/media-gfx/gimp/ChangeLog
index b98b2b0203a8..944e25af3362 100644
--- a/media-gfx/gimp/ChangeLog
+++ b/media-gfx/gimp/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-gfx/gimp
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/ChangeLog,v 1.405 2013/07/22 20:41:36 sping Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/ChangeLog,v 1.406 2013/07/24 03:34:02 ottxor Exp $
+
+  24 Jul 2013; Christoph Junghans <ottxor@gentoo.org> gimp-2.8.6.ebuild,
+  gimp-9999.ebuild:
+  added prefix support (bug #476144)
 
   22 Jul 2013; Sebastian Pipping <sping@gentoo.org> gimp-9999.ebuild:
   Fix src_prepare sandbox violation (#476626)
diff --git a/media-gfx/gimp/Manifest b/media-gfx/gimp/Manifest
index fd9fcd82dbba..3705df277f68 100644
--- a/media-gfx/gimp/Manifest
+++ b/media-gfx/gimp/Manifest
@@ -29,14 +29,18 @@ EBUILD gimp-2.6.12-r5.ebuild 4728 SHA256 8b54be2c26f65f310289a59ca001a50f63e98c3
 EBUILD gimp-2.8.2-r1.ebuild 4791 SHA256 1e573f079c860f1dec248adde5cd0239887cdc070719a00c1ce6004e0f3764ae SHA512 8c8edaf3420499e34720904907eaf32a190964150e7dc9d86c22a4c1225874644afd253111e0374f21fcb42836fb776e49814b9c000ea4c5d924b22ad972565e WHIRLPOOL 70b36e0a0c77c987968894e36396a2052349a1a94aae4ffb82debba1426e0927493bfc0bc2bf4b11da5b9f8bb1b03ad210243c6a22efd1109f6c7b0e2c7681c2
 EBUILD gimp-2.8.2.ebuild 4686 SHA256 02b92f7a88bdfb096e078b5b89e827ba9a0d295e26f62d61f6b3a6bf2061c6b1 SHA512 440346dfe1581481788553dc1ae44e96630a0272480c2e24148ceb03af2e91d5564f082d888f90fe9e9ba89b4be9ce13d53fa02dc9c698dfcfc1cc99eed8f5f3 WHIRLPOOL 5e323bbfcfad4140907796fbed8ef047930cb2f73b98d0dc126e3bedad4dc30f334f6f2663b7e8480b411804445c18ebe16dd01872014e65c70aaaf44cdeb948
 EBUILD gimp-2.8.4.ebuild 4783 SHA256 60755d6b50c8ef853daccfdfbc018db734bdcbb0c7eaed93400908f9e932a31a SHA512 9ec14a99ae69925169c42566fd906a881521f61bac88cd24e9c4959292688e98e919cfd205a7ea2670654654011517df3bc30de853100ff4e446f48bcd253de9 WHIRLPOOL 97a6b6268a03612cee998811a1924093a292a095e8afed4ee993674d19416ad14eb38ee5a2086b461d7dbe2de067fa0120f271b89616139192a063aa7176d2b5
-EBUILD gimp-2.8.6.ebuild 4710 SHA256 fd3d3e1789617dee11dc6a90f8a9d80bf710b86c0247464388e77ae0dd851a57 SHA512 a0dc05d74342bc199584639388e57637b6c9f7c3320d642f52c7c48c0e9838b525e7490ab7513f9bbb8942bc0fbc55efb54b80e814a12e8561d7cd787e3a4166 WHIRLPOOL ecc9f531e7fd1930cdbd5eb73093f03a3553b20c46c5b8e5d34bb1998d1271203e96fdb99f49186b15c51791cf40f9b96ba8e582baeccaa2680e1fb5e072b084
-EBUILD gimp-9999.ebuild 3986 SHA256 3c3f1c4be42fe5ab8af078a762b2be70b55c372a7e3913ce8511d5cd3a9a81bb SHA512 1d7d97f48b2976b791f8bcb2d6f47b0626c199e6014bf30ed106f5c592a1f06af8669d875a0a14434be9a02603677efba1ea7a5e96d9b14abae7a1f4d3b4a18b WHIRLPOOL 70814098d2639a3b6c4b636f46c12ec9a1ad36d34667b558fa59aedcf943843dbea09d32dadd5e7508bb4da19995b6c4271d8a26826f30df0b3ae02561908246
-MISC ChangeLog 57970 SHA256 3afc6c9b585c3142ba9a8f96d610bcbaf31ccc03e86000190a969bd4c257a39f SHA512 7e4f000358c44a55f9eb0289057217b371bceab868336544f31f13a19e6dc18705d07ba7a6023345af79f68cae3fa82ed81a8ace7a4c0c803cbae3747d806a2e WHIRLPOOL 55c4f6e9f5fc70e114a601eb20c0ba1d1639f4181c298f52f88bd3e65331a67f3c867c276352f4d6821c77fca0a99f80ef6cbd7629e8d53c73fb3caf0efbec14
+EBUILD gimp-2.8.6.ebuild 4812 SHA256 d70f386b65d5ad45b5dfb51105e432afc5c379bcdb230e002bb6e6cb7d49a69f SHA512 eb3cede7107c56f6c5022d17041772d243fb5691487611571960fc4095d48db49e8e107d4e270d62e72ac2f4c839f20e352671823dc66c3ab01d960577e1cf0c WHIRLPOOL 4847844502c78d1b0946a6a4dd8e9092946ff7efad3cad3d96ff1d7516f6a895546261860faa9e64e3591a5c014c88cf812e732aee560b5900e2903330f3edff
+EBUILD gimp-9999.ebuild 4003 SHA256 5186884e7125cfd226009ae2887ef8f68b02b4547373f17bb6f7dd20807eee3e SHA512 ceb5713ef7f3d7ca1f867171669253f5863e5710d928d2a63476655878eaab600915e1a783a85b0f560e844221e41dbabb6ac2b0667491e40b1f6da12b5cf432 WHIRLPOOL 004b5ae142a60d0022bcbc2a44423682662e2cc6759218e96e95b5692b18914b4521f3ce10b5a343ca9cd99830f428f5aca378b8cbdb7a6efb36f53af73dcd08
+MISC ChangeLog 58102 SHA256 a79292e3854b2840dee49355e1e36f0a46b46a00a2d83b83654b6d2159bffa93 SHA512 81757a1a52e4c6d620da93d6f095b35529d71857e021bbf4578c960e428002120f371f0fe9ebb402023e5c879443b60c9537acc52edd917e7b2dc1780e94f240 WHIRLPOOL b1442a461fb9c5bd709dd4d7b72e1dae71c8ba6777932426519bbfbcb0be1118a628ba2be6a653ca410677088b5de47b7fee9742c7991b655e5b2aa2af5ad3f6
 MISC metadata.xml 285 SHA256 77c9767711868abab1e559504dd88eb8aef8cf395629d8ec8c7a5fdb3d29397e SHA512 0b1abe9749d79ed8644c2a34312ab70cff232e08f64c1a914185cbafe8c754e9c6442eac1e3a1c449057e52b076333b70ea8be7418570bfcbee69f69d455079e WHIRLPOOL 9f2199f149dd49efce83f4710f026fc235a9aed38b7c7e0ffbb5480ef6865dee6ac555178bb92a819071d016fb0ead581765697cc3035b829ed96126bc7e6053
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iEYEAREIAAYFAlHtmSgACgkQsAvGakAaFgBFpACdF6w42LugTZuYkyEfBreJCrEh
-T/EAnRdif6Q7DKXsTcJ0CRmDGJkcy8/0
-=dN9K
+iQEcBAEBCAAGBQJR70svAAoJEOeBhlrCAAWG9JMH/iuFTVERgIATwwmw0bKqO7EF
+5kOf5/9vt7u9sbkJhjUB0BhEc+s+oIF76GKnjIse9u9C7LIBK14oPMmZzvL+UbSm
+QParSIWd1RBiI8zFDmpYMN+jDcu8zoU+qSNPYQCsUcsZoqngzAutypJdeV9bGXp1
+cXJ094W6Fve7CO6DgNPMkY43T3QD1X6n6rZCkSxoQzluXz8IoXw70NS4xgjMTAxg
+fFv8y3VCVGu+oSaSgDXwSHwaBiLSiv4x9Y5sE8boHKi5iJG3EH8a78F59MW2oHP3
+muZl1nPP8rbWGVop6jj6qISAmWBQQxD0B+OD97F7bHmInAljAonW2LpmgfIIvt8=
+=78UY
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/gimp/gimp-2.8.6.ebuild b/media-gfx/gimp/gimp-2.8.6.ebuild
index 019105269094..bb680a9544c5 100644
--- a/media-gfx/gimp/gimp-2.8.6.ebuild
+++ b/media-gfx/gimp/gimp-2.8.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-2.8.6.ebuild,v 1.1 2013/06/22 18:41:33 sping Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-2.8.6.ebuild,v 1.2 2013/07/24 03:34:02 ottxor Exp $
 
 EAPI="3"
 PYTHON_DEPEND="python? 2:2.5"
@@ -12,10 +12,10 @@ HOMEPAGE="http://www.gimp.org/"
 SRC_URI="mirror://gimp/v$(get_version_component_range 1-2)/${P}.tar.bz2"
 LICENSE="GPL-3 LGPL-3"
 SLOT="2"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~arm-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~arm-linux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 
 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 bzip2 curl dbus debug doc exif gnome postscript jpeg jpeg2k lcms mmx mng pdf png python smp sse svg tiff udev webkit wmf xpm"
+IUSE="alsa aalib altivec aqua bzip2 curl dbus debug doc exif gnome postscript jpeg jpeg2k lcms mmx mng pdf png python smp sse svg tiff udev webkit wmf xpm"
 
 for lang in ${LANGS}; do
 	IUSE+=" linguas_${lang}"
@@ -74,8 +74,8 @@ S="${WORKDIR}"/${P}
 
 pkg_setup() {
 	G2CONF="--enable-default-binary \
-		--with-x \
 		--disable-silent-rules \
+		$(use_with !aqua x) \
 		$(use_with aalib aa) \
 		$(use_with alsa) \
 		$(use_enable altivec) \
diff --git a/media-gfx/gimp/gimp-9999.ebuild b/media-gfx/gimp/gimp-9999.ebuild
index 099cb40467e8..4c37853e2444 100644
--- a/media-gfx/gimp/gimp-9999.ebuild
+++ b/media-gfx/gimp/gimp-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 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.50 2013/07/22 20:41:36 sping Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-9999.ebuild,v 1.51 2013/07/24 03:34:02 ottxor Exp $
 
 EAPI="3"
 PYTHON_DEPEND="python? 2:2.5"
@@ -17,7 +17,7 @@ LICENSE="GPL-3 LGPL-3"
 SLOT="2"
 KEYWORDS=""
 
-IUSE="alsa aalib altivec bzip2 curl dbus debug doc exif gnome postscript jpeg jpeg2k lcms mmx mng pdf png python smp sse svg tiff udev webkit wmf xpm"
+IUSE="alsa aalib altivec aqua bzip2 curl dbus debug doc exif gnome postscript jpeg jpeg2k lcms mmx mng pdf png python smp sse svg tiff udev webkit wmf xpm"
 
 RDEPEND=">=dev-libs/glib-2.30.2:2
 	>=dev-libs/atk-2.2.0
@@ -71,7 +71,7 @@ DOCS="AUTHORS ChangeLog* HACKING NEWS README*"
 
 pkg_setup() {
 	G2CONF="--enable-default-binary \
-		--with-x \
+		$(use_with !aqua x) \
 		$(use_with aalib aa) \
 		$(use_with alsa) \
 		$(use_enable altivec) \