Fix for prefix and add ~arm-linux + ~x86-linux keywords.

Package-Manager: portage-2.2.0_alpha163_p9/cvs/Linux i686
Manifest-Sign-Key: 0xFDE8EF85AE5719A3

4 files changed, 21 insertions, 17 deletions

diff --git a/media-gfx/gimp/ChangeLog b/media-gfx/gimp/ChangeLog
index 321a8ddcfd98..83fa29653816 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.401 2013/02/08 23:50:46 sping Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/ChangeLog,v 1.402 2013/02/22 21:15:05 zmedico Exp $
+
+  22 Feb 2013; Zac Medico <zmedico@gentoo.org> gimp-2.8.4.ebuild,
+  gimp-9999.ebuild:
+  Fix for prefix and add ~arm-linux + ~x86-linux keywords.
 
 *gimp-2.8.4 (08 Feb 2013)
 
diff --git a/media-gfx/gimp/Manifest b/media-gfx/gimp/Manifest
index 5ff25d07af57..78f761787ee1 100644
--- a/media-gfx/gimp/Manifest
+++ b/media-gfx/gimp/Manifest
@@ -26,14 +26,14 @@ DIST gimp-2.8.4.tar.bz2 20214383 SHA256 e24a9f826e7c30edb83d96f4cf4787cf1a0ed98f
 EBUILD gimp-2.6.12-r5.ebuild 4728 SHA256 8b54be2c26f65f310289a59ca001a50f63e98c3e2b8bb429766d88ada47a48af SHA512 0c384766fc6b6ca053dd4e96623fd9133d1b1b145f051f22176b932fec4dda357916bd67f5950ca85be519a2f30ac3de7eeb4ab43f3a7ce71b4c4333394fd917 WHIRLPOOL 991df8b5ca3dec6559cc29f532a7d1baca4e0027931a05e54b421512d5846cefcc08cfd24b7de3e72ea6dc03d766c464d56dedaf93572baf01c8eb938dcb9e82
 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 4684 SHA256 332fc8f40aa41a90f01f84be11c9edd28283c9a27acade9200a57b00614ed686 SHA512 29a73a1684db31df1ca9fb488daab6492a8d64c81f60e0184b137545a6d3d2db9085cc5725f5f92e48b372cd32e49a7b003950b2213db101813f9544a49a1406 WHIRLPOOL c2f4564964fc45c608296b0c5a308388bad759dcd2c3e6bb71b493cbfc069b0b5a55f58950a164078a63b768c79bc1a60324b1700ac06bee31de9f1fad3b761f
-EBUILD gimp-9999.ebuild 3848 SHA256 db3592cde7b0f85745e2a610e1f66b076bdf4cc3220d6dc8c79db096a9482586 SHA512 c6ca7eb7c35dbfa7c080afb586b7fe3b80f5b5befed90df586d57260c139897c9a5fb5c498f308be805a4943b287777176090c6dde779b2852da8a02af842e96 WHIRLPOOL fd75c8f7834e3a93be73de9da5bb9b58ba920c000eae5d40c963f11853923f1e2887e507e457db02a288fbc4ab2a36644ab6fceb73f608b81cb6a7023b22b2e8
-MISC ChangeLog 57390 SHA256 747ab0f92cf0248aa206299a7acd72c374afc5463de05b04ac773b4c7128771e SHA512 834a5b0ae6a487410a41bdf47568803e6622091e41acd61bafdd6248791e8fd8138fa0011630a25181319f54aeb09e5eb864e3e0ad0fd01ba964a64b55e9b0c4 WHIRLPOOL 4618ed5ed05e1a81a3afcc42758bb111e3109ef3fc82bf0126a09d1f213d571987cff387a77856bd844ca2f95e979600813bb9d8936cd66f7e295b77d1a46a6d
+EBUILD gimp-2.8.4.ebuild 4712 SHA256 bb56d4841fa3ec903cdde1b0902bfcd9ae872ab18500749d51f9578faafe5f2f SHA512 ea6f797db2de5bd17fc56fc2489e8d5fd872bb735d12c3541d20bae88bb644ea3148a8fcb96824c1d949bd057c161a7a74499bf9a410674d0532a771bba4cded WHIRLPOOL c821e1ee60882f945ff493584d1d3c75b818547c006130c42f6b946f392100f25a7f0962dfcbfd538ead6f74ee756cde6ff2a803101af7d6d6f7b67abc8f6926
+EBUILD gimp-9999.ebuild 3850 SHA256 6c0b11efc9c64daec2700eb24bae602f9e8c7511127f9c4d2a4d7f6086a1fdbc SHA512 afed9ce445018abc7e5fc8e51c5e30cfd472400ad65126fd86736f107c47d84d2470581a5eddea4b32e496e050fb2e9ff04da65247c37aeeece9a9d8a27ea450 WHIRLPOOL 8085de7d6d3ad4a3f4d2abb67b8ff3f09d9452149b2ff9e7e488c7f7c8a0f1c58f5e6e64ddc3fea634139492e09163f48e16895a8de18dadabf2af3f152029b3
+MISC ChangeLog 57538 SHA256 6ead4cf7c7be1c3c93d47084f90a461038bcf00cc988cbca58fda13b03f70472 SHA512 5b756db147489b0f398c452840148d7f8ac18ca6c20d8003aa6a28aa0b7d35551fdec8dd6af241ebc604c441dcb5d28931133a5cf35304a6616dd5399e8e9ff0 WHIRLPOOL 0d64e51701a04517e02f5f9ee5b3132defe82ed584cb30c5a7114ac26de9d3f503997bb7c706646114adab09fce1cc8cadcd3c16024331f8339798e4ac648da5
 MISC metadata.xml 285 SHA256 77c9767711868abab1e559504dd88eb8aef8cf395629d8ec8c7a5fdb3d29397e SHA512 0b1abe9749d79ed8644c2a34312ab70cff232e08f64c1a914185cbafe8c754e9c6442eac1e3a1c449057e52b076333b70ea8be7418570bfcbee69f69d455079e WHIRLPOOL 9f2199f149dd49efce83f4710f026fc235a9aed38b7c7e0ffbb5480ef6865dee6ac555178bb92a819071d016fb0ead581765697cc3035b829ed96126bc7e6053
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlEVj4UACgkQsAvGakAaFgBJkwCfVbnnOePk0qW49OfvUf/nX1uf
-tawAn2FBc3f1fJFd5WTRNxpDzpXzHEiY
-=yeex
+iEYEAREIAAYFAlEn39sACgkQ/ejvha5XGaMYJgCdGGJSUsmwo3aS6tr7jYTiECbd
+ub0AoL0/h7QW/8oSiggy3M8vRUtX1gcP
+=ZvDr
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/gimp/gimp-2.8.4.ebuild b/media-gfx/gimp/gimp-2.8.4.ebuild
index 63a3b88d3660..e3728eecea36 100644
--- a/media-gfx/gimp/gimp-2.8.4.ebuild
+++ b/media-gfx/gimp/gimp-2.8.4.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.4.ebuild,v 1.1 2013/02/08 23:50:46 sping Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-2.8.4.ebuild,v 1.2 2013/02/22 21:15:05 zmedico Exp $
 
 EAPI="3"
 PYTHON_DEPEND="python? 2:2.5"
@@ -12,7 +12,7 @@ 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"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~arm-linux ~x86-linux"
 
 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"
@@ -125,7 +125,7 @@ _clean_up_locales() {
 			einfo "- keeping ${lang}"
 			continue
 		}
-		rm -Rf "${D}"/usr/share/locale/"${lang}" || die
+		rm -Rf "${ED}"/usr/share/locale/"${lang}" || die
 	done
 }
 
@@ -139,13 +139,13 @@ src_install() {
 
 	# Workaround for bug #321111 to give GIMP the least
 	# precedence on PDF documents by default
-	mv "${D}"/usr/share/applications/{,zzz-}gimp.desktop || die
+	mv "${ED}"/usr/share/applications/{,zzz-}gimp.desktop || die
 
-	find "${D}" -name '*.la' -delete || die
+	find "${ED}" -name '*.la' -delete || die
 
 	# Prevent dead symlink gimp-console.1 from downstream man page compression (bug #433527)
 	local gimp_app_version=$(get_version_component_range 1-2)
-	mv "${D}"/usr/share/man/man1/gimp-console{-${gimp_app_version},}.1 || die
+	mv "${ED}"/usr/share/man/man1/gimp-console{-${gimp_app_version},}.1 || die
 
 	_clean_up_locales
 }
diff --git a/media-gfx/gimp/gimp-9999.ebuild b/media-gfx/gimp/gimp-9999.ebuild
index 9854f919e192..158a09a87c4d 100644
--- a/media-gfx/gimp/gimp-9999.ebuild
+++ b/media-gfx/gimp/gimp-9999.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# 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.48 2012/12/11 05:43:44 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-9999.ebuild,v 1.49 2013/02/22 21:15:05 zmedico Exp $
 
 EAPI="3"
 PYTHON_DEPEND="python? 2:2.5"
@@ -132,9 +132,9 @@ src_install() {
 
 	# Workaround for bug #321111 to give GIMP the least
 	# precedence on PDF documents by default
-	mv "${D}"/usr/share/applications/{,zzz-}gimp.desktop || die
+	mv "${ED}"/usr/share/applications/{,zzz-}gimp.desktop || die
 
-	find "${D}" -name '*.la' -delete || die
+	find "${ED}" -name '*.la' -delete || die
 }
 
 pkg_postinst() {