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

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

3 files changed, 30 insertions, 39 deletions

diff --git a/media-libs/fontconfig/ChangeLog b/media-libs/fontconfig/ChangeLog
index fb1b3d375979..2aba0a935a3b 100644
--- a/media-libs/fontconfig/ChangeLog
+++ b/media-libs/fontconfig/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-libs/fontconfig
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/fontconfig/ChangeLog,v 1.166 2013/02/26 20:33:12 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/fontconfig/ChangeLog,v 1.167 2013/02/27 19:54:27 zmedico Exp $
+
+  27 Feb 2013; Zac Medico <zmedico@gentoo.org> fontconfig-2.10.2-r1.ebuild:
+  Fix for prefix and add ~arm-linux + ~x86-linux keywords.
 
   26 Feb 2013; Michał Górny <mgorny@gentoo.org> fontconfig-2.10.2-r1.ebuild:
   Drop removed --with-freetype-config. Fontconfig uses pkg-config now.
diff --git a/media-libs/fontconfig/Manifest b/media-libs/fontconfig/Manifest
index c757689c2702..a28738a68429 100644
--- a/media-libs/fontconfig/Manifest
+++ b/media-libs/fontconfig/Manifest
@@ -8,29 +8,17 @@ AUX fontconfig-2.8.0-urw-aliases.patch 509 SHA256 4a1e122dd3b140765163ca72eba8c2
 DIST fontconfig-2.10.2.tar.bz2 1412488 SHA256 8ea8ef56738fd95f0be611015f89614fd4dec79ddac6b3ff26bc4a8338569952 SHA512 817ce375f987abb6ea01294c22754e194a9b795697e9fe01d454af87010665b22a416d0c857ceac6aab17351cc85fd0915f51d2a8702a00f851e08f65dd840bf WHIRLPOOL a213c2af9ef1e0ccf19ba8c7119cb1d85e06ec048cf66c933fc9c552b7c642b42636714d214dcbd9794024af123189fcbb73dc4968ba2135b66b6191c05d919e
 DIST fontconfig-2.8.0.tar.gz 1548409 SHA256 fa2a1c6eea654d9fce7a4b1220f10c99cdec848dccaf1625c01f076b31382335 SHA512 a110e72cc631f1e374324a02f6ba9526b89a547cafe2ae27b9913938b19018843b2940084d62f0dfaf38a6919dea6974fb98422d3908026f6873d5fba17c55a0 WHIRLPOOL cb7c5c461bcb0a0f6ef93d24a10506512beb99233a1f81d904321577c4023e38c7090806c616b8224689400fc4e2209e26aa20aa1f0ad84b2fcad5477061a003
 DIST fontconfig-2.9.0.tar.gz 1682774 SHA256 ca7e25071cf044bdcdaf7c48845243c115b9269b4e369c6bd78a29e71f01b41a SHA512 1e91132141756c7455b97fb4d7773b8c0812d98d0c0f5f137c728d6f03cb4601a7f2857c246bd63619d47a8d9aeceb475a16dd625bfc085e235e85b04d29014f WHIRLPOOL a3814b4b2a1b86cedde702545defbcfbca7d3d61ecf512f37a09b5c4041ebb317aadcde1553be534e70d30c212729f547b50cbcd3102226fa92a7c75a7e55620
-EBUILD fontconfig-2.10.2-r1.ebuild 4043 SHA256 17037848f33c5ec2f6fafb1f6d4cb6858b434ccb426d0402fd86a333953cc304 SHA512 ad7921401ff04cc679a65a1a0939fd08442e17e60f3df69ab816da5dc572b0601268475b80baf47ff7c04390a702f12585b1c14da0d13c21efb7ba353dadb4a5 WHIRLPOOL 7e16baff5164fe9edf975384f10f402b752829dfc14e14f30f29b0d40884e28cf0523143bec8cc160b625fc9f396246bcccebe4ebd6afd97df807f3e0a264ab8
+EBUILD fontconfig-2.10.2-r1.ebuild 4141 SHA256 a170432d907abfd34a6fa4067bb31ecc9d902d4befda8cafd32777637b8b2568 SHA512 73822b066b40e047d07f9465b9ea89cf48716723477182afcf1fc764032fe67b0c205881141791b7e543dc0d01e0069ae4917895257915aa3e20d024e74a36f2 WHIRLPOOL 2784305a0948ed827b22f0c49033f17451970440f9194a35fc5e6fa764e84f04c20d8c2250b48a2635bade96778202bd94b7a06d28fab7d31c5807c11c3f3b4f
 EBUILD fontconfig-2.10.2.ebuild 3845 SHA256 870dc2a59ec26b7c2377dbe0d8b2851ef7edc74f43ab14164ef3d468624ab8e1 SHA512 c6e8525fc137b95167986c147abe8ee98006b5f21997f11a1d028a7044910b21fb46595aa8a781240f3364e3aca33dd4f9a771a6da50ba8001c545bfd4f6328b WHIRLPOOL 4f934bbb42c2c718b8ba537e51d3926290c5f82e76dc15a0d2376eb5fb83a8b7f478c095493968e0618ea5c60fcc073caa61f517dcf3e0b0e7790cd88d9a2407
 EBUILD fontconfig-2.8.0-r1.ebuild 3979 SHA256 41cc191c9e0763037801dcc0c8d8c753ce3ec5f236cec906a2e21a6140e5306f SHA512 5f0e19e48f9a7ca5ea863f2dd6c1afdcc2de2433a06da0ce69e5b6fcb769c757ebf2dcfaa500fc6532862af100501d5162678a1f7ce11256a871520350956556 WHIRLPOOL 7aca6d65eba1a31ab29ade2dbe39f6fc85d6542bed47aaadd3bfa38f5708aacf60b357a8f2df61b16da7e654e91a16b345cf17997de775099bad91680d305c92
 EBUILD fontconfig-2.8.0-r2.ebuild 4097 SHA256 bef5159f77106a962ab71c9649f09da4edcbf1b97689056bd41d6abb3d0cd72b SHA512 2870976af6b62fec207efd4836f3870345372716c46c1cf5466f1f697b8f3fea9a1185918240f182eb0ce39d5c85aee8a62e1b29236a8e707fa40c04f08a29f6 WHIRLPOOL ad2f48f5c86d75adca42e936589707b3b2e1a4faff6cc34b26e2ee574e1b73713ff5d57da35927ed8e0545044d98679ef5dbd715c38870f69d3ead0771c0bcd3
 EBUILD fontconfig-2.9.0.ebuild 4081 SHA256 6c897b70cec26bf69f8fd6344e62fa5204b4cd46860c1e5ea7cfa961c8b22b14 SHA512 7495d2a674d407d3ba535288b444034a3a7a9465eab1b89807e4f59366f0a8b548d0db973858026e58c4e633e0652ad7ffe9c0f5ba8037e207ede9082e84694b WHIRLPOOL 0d9a1b4d4dbd2c4e6fb790d5dea3e369ec112468843af9ce0c7a5f0dce0af1f411544b13dfeb4dceb4cfe9c1d5507dd304349ba33fc57a8a761ed47bc834ad18
-MISC ChangeLog 26553 SHA256 ef2a2edeb014cc07dc6066137cb089f698fca3bebc71ba3eb8092757a2dc1d3e SHA512 afb8cfcfbad5a12c6dc8a6d190733cac49fc8964ee6ea9e62e2252e64011b95a9a9db53901aa3cdb53a35bba9c4621a086102435ffb35489f5fe7b3885e020ef WHIRLPOOL 68e71692f0d9cf5fac963ce002b74a71cd753dc237ed8f0a03edfd0ebae753bc3f2cb1c3579bf3efc4096a7f9e4fd945a79d6e0dcb9e8e983f036c94be07fbbb
+MISC ChangeLog 26690 SHA256 dff4f1c37ed890ef4aa4f6db8dea01862eb0bfed609c257db1ca1caa3837b742 SHA512 188347ca9116f7834189dbaf371422f63efefaae2c76c03ad537c5e5e12eee881f73c78234fbe59c90cc6b2f52a3dba6658ee67d6554c080b493c4976dcd200b WHIRLPOOL d6c6a63532429fda6fc74f6a4649171a631d3678d3a29d52663be96ce86f85ffa34d81257d7b2d12ee23a025e2d2587990ccc37e8a932a288484037161e169c2
 MISC metadata.xml 419 SHA256 859faa6fc0c008e92a6432f0fd50a760170d724b15997e557d5d73088277c4db SHA512 81f3d095bec15c4181c0f6f068de5ab08e1ff48e5bbd715b20572f7f1cd632c355a529d74fceff6d7f0c1c7c4ef44f31be003f12c85b938907cf6624893686eb WHIRLPOOL 1a660ae53987795db3a8e66085f9f35de759862583657184fb4dbb227eefabca77ed8afd12262bef038732539463676e0343437044f3fb6cc0d72c41d5a87729
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQJ8BAEBCABmBQJRLRwjXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXRGRDhEM0MyMERDMzNBMkYzQzJFRTI3QjE5
-NjI3RjQ1NkY5REE3NjQzAAoJEJYn9Fb52nZDlqkP/jiIE45ZdE1b53jcIfR5S/7E
-hSsHq1w2tYomEbGwUWCnmg8CPBHL3F+29mlGfoyWFZ5B3+LDQtJ+/4cbNoPymseW
-MjgKa94SimQL8PU+QyrVvk2ABkZfk+Yhd2r461tPy1BsheNYZY08wQqztgy5Vt6E
-7/MaARhNEK7GZ7roGMefu49bC0S0j0agtcBM0EutB/1YMLQzzDWofmFKWELbcdQg
-EpnEccQjdblZVWpONkpOkukDx0CUw1xYrxloE04RjykCLO2uyBgc+gih7zDgf1OW
-2Fx7f6P4vxTx5risHt8/8YDZh8aQHOzzBpuUgbipYccPtuXEU1dukZKcLlpMOLaM
-rM6apui4SbxXFp1n6vG3JbjbxfZCemRFvZJndp/G4lTkLSIyVBdSKfFv0xk9IdNX
-bwlXpZxj+Cl9QTR6tkBPUH0DT2zoRC8p3CImYiYB7P2zPxLm+wR2rful9pGTH2lN
-CAbq+GlCq1V9uBMBOPd6/IO0O/zty412eK6cbSRJ2tdqxMmiKcgjsiQt80YN0Qjq
-gaVnZlprgHod2yaoMsdUDBlujDNbVgNZNXAmk1Op65IvOHy0VQk6R+wGS2HgnzU2
-z3LMuxlco5+kBy3OxLJytTOVhgDRN4zf76KV3zcfMpovndF5vhGAyfNeZOUprPxu
-e5a/LLHY7T+Ze0qYy8fR
-=x/Id
+iEYEAREIAAYFAlEuZHQACgkQ/ejvha5XGaNtZgCfXW1vZkqfVp7FpoB35VqF8+0r
+kk8An0pw38HG61hOwow96i9dQeLJVXCc
+=HShs
 -----END PGP SIGNATURE-----
diff --git a/media-libs/fontconfig/fontconfig-2.10.2-r1.ebuild b/media-libs/fontconfig/fontconfig-2.10.2-r1.ebuild
index 1175e86911db..e9e3b2008dc9 100644
--- a/media-libs/fontconfig/fontconfig-2.10.2-r1.ebuild
+++ b/media-libs/fontconfig/fontconfig-2.10.2-r1.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-libs/fontconfig/fontconfig-2.10.2-r1.ebuild,v 1.2 2013/02/26 20:33:12 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/fontconfig/fontconfig-2.10.2-r1.ebuild,v 1.3 2013/02/27 19:54:27 zmedico Exp $
 
 EAPI=5
 
@@ -13,7 +13,7 @@ SRC_URI="http://fontconfig.org/release/${P}.tar.bz2"
 
 LICENSE="MIT"
 SLOT="1.0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
 IUSE="doc static-libs"
 
 # Purposefully dropped the xml USE flag and libxml2 support.  Expat is the
@@ -44,7 +44,7 @@ pkg_setup() {
 	DOC_CONTENTS="Please make fontconfig configuration changes using
 	\`eselect fontconfig\`. Any changes made to /etc/fonts/fonts.conf will be
 	overwritten. If you need to reset your configuration to upstream defaults,
-	delete the directory ${ROOT}etc/fonts/conf.d/ and re-emerge fontconfig."
+	delete the directory ${EROOT}etc/fonts/conf.d/ and re-emerge fontconfig."
 }
 
 src_configure() {
@@ -52,10 +52,10 @@ src_configure() {
 		$(use_enable doc docbook)
 		# always enable docs to install manpages
 		--enable-docs
-		--localstatedir=/var
-		--with-default-fonts=/usr/share/fonts
-		--with-add-fonts=/usr/local/share/fonts
-		--with-templatedir=/etc/fonts/conf.avail
+		--localstatedir="${EPREFIX}"/var
+		--with-default-fonts="${EPREFIX}"/usr/share/fonts
+		--with-add-fonts="${EPREFIX}"/usr/local/share/fonts
+		--with-templatedir="${EPREFIX}"/etc/fonts/conf.avail
 	)
 
 	autotools-multilib_src_configure
@@ -82,9 +82,9 @@ src_install() {
 
 	dodoc doc/fontconfig-user.{txt,pdf}
 
-	if [[ -e ${D}usr/share/doc/fontconfig/ ]];  then
-		mv "${D}"usr/share/doc/fontconfig/* "${D}"/usr/share/doc/${P}
-		rm -rf "${D}"usr/share/doc/fontconfig
+	if [[ -e ${ED}usr/share/doc/fontconfig/ ]];  then
+		mv "${ED}"usr/share/doc/fontconfig/* "${ED}"/usr/share/doc/${P}
+		rm -rf "${ED}"usr/share/doc/fontconfig
 	fi
 
 	# Changes should be made to /etc/fonts/local.conf, and as we had
@@ -94,7 +94,7 @@ src_install() {
 
 	# As of fontconfig 2.7, everything sticks their noses in here.
 	dodir /etc/sandbox.d
-	echo 'SANDBOX_PREDICT="/var/cache/fontconfig"' > "${D}"/etc/sandbox.d/37fontconfig
+	echo 'SANDBOX_PREDICT="/var/cache/fontconfig"' > "${ED}"/etc/sandbox.d/37fontconfig
 
 	readme.gentoo_create_doc
 }
@@ -104,15 +104,15 @@ pkg_preinst() {
 	# /etc/fonts/conf.d/ contains symlinks to ../conf.avail/ to include various
 	# config files.  If we install as-is, we'll blow away user settings.
 	ebegin "Syncing fontconfig configuration to system"
-	if [[ -e ${ROOT}/etc/fonts/conf.d ]]; then
-		for file in "${ROOT}"/etc/fonts/conf.avail/*; do
+	if [[ -e ${EROOT}/etc/fonts/conf.d ]]; then
+		for file in "${EROOT}"/etc/fonts/conf.avail/*; do
 			f=${file##*/}
-			if [[ -L ${ROOT}/etc/fonts/conf.d/${f} ]]; then
-				[[ -f ${D}etc/fonts/conf.avail/${f} ]] \
-					&& ln -sf ../conf.avail/"${f}" "${D}"etc/fonts/conf.d/ &>/dev/null
+			if [[ -L ${EROOT}/etc/fonts/conf.d/${f} ]]; then
+				[[ -f ${ED}etc/fonts/conf.avail/${f} ]] \
+					&& ln -sf ../conf.avail/"${f}" "${ED}"etc/fonts/conf.d/ &>/dev/null
 			else
-				[[ -f ${D}etc/fonts/conf.avail/${f} ]] \
-					&& rm "${D}"etc/fonts/conf.d/"${f}" &>/dev/null
+				[[ -f ${ED}etc/fonts/conf.avail/${f} ]] \
+					&& rm "${ED}"etc/fonts/conf.d/"${f}" &>/dev/null
 			fi
 		done
 	fi
@@ -120,14 +120,14 @@ pkg_preinst() {
 }
 
 pkg_postinst() {
-	einfo "Cleaning broken symlinks in "${ROOT}"etc/fonts/conf.d/"
-	find -L "${ROOT}"etc/fonts/conf.d/ -type l -delete
+	einfo "Cleaning broken symlinks in "${EROOT}"etc/fonts/conf.d/"
+	find -L "${EROOT}"etc/fonts/conf.d/ -type l -delete
 
 	readme.gentoo_print_elog
 
 	if [[ ${ROOT} = / ]]; then
 		ebegin "Creating global font cache"
-		/usr/bin/fc-cache -srf
+		"${EPREFIX}"/usr/bin/fc-cache -srf
 		eend $?
 	fi
 }