Drop cross-compiling hacks since upstream handles it now #284762.

Package-Manager: portage-2.2.0_alpha161/cvs/Linux x86_64
Manifest-Sign-Key: 0xFB7C4156

3 files changed, 32 insertions, 20 deletions

diff --git a/media-libs/fontconfig/ChangeLog b/media-libs/fontconfig/ChangeLog
index 5aec09c08279..5ff3e54674ba 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.162 2013/02/08 14:57:19 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/fontconfig/ChangeLog,v 1.163 2013/02/09 07:39:33 vapier Exp $
+
+  09 Feb 2013; Mike Frysinger <vapier@gentoo.org> fontconfig-2.10.2.ebuild:
+  Drop cross-compiling hacks since upstream handles it now #284762.
 
 *fontconfig-2.10.2 (08 Feb 2013)
 
diff --git a/media-libs/fontconfig/Manifest b/media-libs/fontconfig/Manifest
index 49460e50f83d..37ee0f52aeb7 100644
--- a/media-libs/fontconfig/Manifest
+++ b/media-libs/fontconfig/Manifest
@@ -1,13 +1,33 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX fontconfig-2.10.2-docbook.patch 648 SHA256 d4b5acc1fe079071cbe7b886769dc561d6318f9193c1e32ed2cca9720a3c346e SHA512 b0adb7c406445c25c96c5dc37af9e6fcc8c75a0752af255465673812bdc332ce43439a100c056744ace0dd5b3350596eedd612489c33d19a6f6cd182c08e2961 WHIRLPOOL b2cfd619aff49024190409c33bd5ff3754b88e5c04a30df52c90bf0ab9b4ce5cd5727423939b70538760bb1e7a02325d76426cf94bdb9e8eb165966b40767197
 AUX fontconfig-2.3.2-docbook.patch 506 SHA256 c6480dcf19fec22126a9205fa3d9b317e5a97613f86218cf1926a2a07848afd5 SHA512 8c5bc39c6d5c3b0457c626c678c0a7c94c5e5a4f041b5b2a42df04701750961e24950135d2e6df4d4e1c64a7f28e50a2533ab154d7226cf0a63db0853149f64f WHIRLPOOL 84de35d8f5755a10eb170b2f54afc5b89f4c1757b10f053adc9b5e96aebcd5bbfc47d16963f01a2b3bc0f791a736439b3317f823221794f9fc93e5c57162734f
 AUX fontconfig-2.7.1-latin-reorder.patch 1701 SHA256 cd27212a9e8a3045106fd427f2e5079ea348789c8760e7af443c2745479c8f82 SHA512 8fc514649e40ecd0c52e4fef9479e0945baa3aaa396335650bf827a983f6d9187b0f66ab97bf5b11b14917518b2e955b0a1bca126a336feafbebf754ff646d5d WHIRLPOOL e6e90c38c7ce04e297c48f5b9859c5e9230a59e9722dacde5ddd434cca8fbd33fab55f704df540eea3f3efd6ee05884987e6ce5da544d2b41f869e47ce3d259d
 AUX fontconfig-2.8.0-urw-aliases.patch 509 SHA256 4a1e122dd3b140765163ca72eba8c2c52daa9e9459ddbcb6a2eba9a5bebe76d4 SHA512 774c57a28e10eb666c18e69dd7cf59fe1110fe13bbbade185dbd21be4917d4d7fb632be56805b2739ea9b47ee96560c8dd1d3d1916fed56ac32a16757a911f7e WHIRLPOOL 11d7056d1830a7e48aea00a22bb81397c9025f59817fd476dc26083e7ac2603aefd2ace261dfd04df78b6caa8d9c07f66027f37438b4677a7efe28b3cff260b6
 DIST fontconfig-2.10.2.tar.bz2 1412488 SHA256 8ea8ef56738fd95f0be611015f89614fd4dec79ddac6b3ff26bc4a8338569952 SHA512 817ce375f987abb6ea01294c22754e194a9b795697e9fe01d454af87010665b22a416d0c857ceac6aab17351cc85fd0915f51d2a8702a00f851e08f65dd840bf WHIRLPOOL a213c2af9ef1e0ccf19ba8c7119cb1d85e06ec048cf66c933fc9c552b7c642b42636714d214dcbd9794024af123189fcbb73dc4968ba2135b66b6191c05d919e
-DIST fontconfig-2.8.0.tar.gz 1548409 SHA256 fa2a1c6eea654d9fce7a4b1220f10c99cdec848dccaf1625c01f076b31382335
-DIST fontconfig-2.9.0.tar.gz 1682774 SHA256 ca7e25071cf044bdcdaf7c48845243c115b9269b4e369c6bd78a29e71f01b41a
-EBUILD fontconfig-2.10.2.ebuild 4116 SHA256 77801af6597d33b51f1570a3100cc4957d416114b185f0cc51a4bb5d3cd15822 SHA512 3dc1acaee17f4945f5648906e41f784df70d8d49e95590138fc38390958b6409e7f21040d8284dbaa6414581e92228afb1bd5dec3d87da437c1563339532cb2b WHIRLPOOL 396ab44ca96329d3cf0d74eda0baaf4fa1a7398105b05160fc8297eafe5727a8ea7e05557e5a69b2b0c37bb17af04c89302f3a6180ff20f29e9a39882228812a
+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.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 3995 SHA256 f44ada59e3f6cac42693a7ef30db983a726d07b411d59c5b44e3cb0fe7d17d59 SHA512 e2f7a384abffc76969d2617637cbb3e9fafb1cc28a021dc8c5556c2240841ba196697d23a22e119e8e70119bb7f1614d261b956c168d265de0767706bd8fa649 WHIRLPOOL 6e53c22c05f7e7b0dee5d070654e3597a03ce9cb61e7ca6e87fa7fc918907780dad54ca59a57c2452496fbed217e56060cd0ebb1cf26cb128921b812d5383f38
-MISC ChangeLog 25943 SHA256 35eac6c5ee1bc8179c5679b798751d5fb272b11e669558315d86c9f03afe9c65 SHA512 188f8c20b4df452852a4f672fb66fd3b947a2dd26a41a8d59491f988bff3b9093e62b23619c97ccb43d55b0ecd2083a0a007a3937ac0dd8e13310a7531a2e915 WHIRLPOOL fe930a8797df0ae57065c1c14fadcdc2da381e480ec14b490256eed3ee65c8c6c61d98ea6e0921a9f486d93e650b4e717f26a32e30d4e091e4a210eb479e1102
+MISC ChangeLog 26088 SHA256 ef49d3d04e19b8f729031fe820d6e6f56e0bd299861f80dbae2f9bab4298bf4a SHA512 3e42cb929d9a09f8e15199c3b699dad7618dbf3fe3907b059b682c0cfe1bff896b509d5593379d6e922e56df2afa4b56c6dcbb364eed976d3917eb8f8e83fe20 WHIRLPOOL d802af7c1e5117f6e48b338ea1b0a1ebdcbae2c9b12188a2f70deb22b2c86cfb239f633a43b302f883179c2633f82ba73d3ae55383fe1c0b2236c6580862e665
 MISC metadata.xml 419 SHA256 859faa6fc0c008e92a6432f0fd50a760170d724b15997e557d5d73088277c4db SHA512 81f3d095bec15c4181c0f6f068de5ab08e1ff48e5bbd715b20572f7f1cd632c355a529d74fceff6d7f0c1c7c4ef44f31be003f12c85b938907cf6624893686eb WHIRLPOOL 1a660ae53987795db3a8e66085f9f35de759862583657184fb4dbb227eefabca77ed8afd12262bef038732539463676e0343437044f3fb6cc0d72c41d5a87729
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQIcBAEBCAAGBQJRFf05AAoJELEHsLL7fEFWkgkP+wZdumDvwRdpoKzNfosLlpAT
+Qli/+Uy+Qjmzqw4xORsNlrZWysMODIQc4lstTMPMrGXXTj9qLnFP9y3/gGpKi5WD
+tFRHb6Nr5Q1jcJar2jNsrEugiT/1E3gsBoTgRs1SdtXd6nwUQrSF+ndjMEp67Hzy
+76ZBnulQrKvty/7fSKF6lY/LcqOOCN6Lh72kaLb9TyqKw6d/MLNWiL7urA5AqHo4
+mfDq9sPnvrFlp636JCj60GCL1Dx1TRs9B0XfdW/uDQSGEhfrs3kCj/TxXo8cJSXN
+nzG2yUpBLCxDPGEpV6KVbTE6SbM9PudQvHnglpuyAmYSnRj9UAi2vhxCokI2nS/T
+qQ87+xa94OYKayCDbdo9FGxC3jSqEdWphKv2vn8SirulXG3moId4e0tWXs9D7elQ
+YUZgF/YoeYBDlViX/4YGKaodsACDL+Xij2VUeDnbjDuPoVnnqGp4LEIRESdWXM9x
+1O6QDRHtORXCZW19uyGDD4ysQ/RXcb9zU0QkFnbwuPU5wT+UGvtq2fBRTSoaVpnP
+bL73wQSp18xv3qiwgq4CLVShU0TAugN7OWfZhXcl6gr1oqWbY+sD3HXS/iglIvt0
+x1Sh1DfOzDYePiDHbgwv5dQ/sfjexMa8OjsiVakZtAN81JuUx+WHYl9SFZFwo9Yw
+jmwyTNlGDCNl/HjdJiTc
+=RmUE
+-----END PGP SIGNATURE-----
diff --git a/media-libs/fontconfig/fontconfig-2.10.2.ebuild b/media-libs/fontconfig/fontconfig-2.10.2.ebuild
index 1bc2a53c8531..1ee1d7f3e750 100644
--- a/media-libs/fontconfig/fontconfig-2.10.2.ebuild
+++ b/media-libs/fontconfig/fontconfig-2.10.2.ebuild
@@ -1,9 +1,9 @@
 # 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.ebuild,v 1.1 2013/02/08 14:57:19 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/fontconfig/fontconfig-2.10.2.ebuild,v 1.2 2013/02/09 07:39:33 vapier Exp $
 
 EAPI=5
-inherit autotools eutils libtool toolchain-funcs readme.gentoo
+inherit autotools eutils libtool readme.gentoo
 
 DESCRIPTION="A library for configuring and customizing font access"
 HOMEPAGE="http://fontconfig.org/"
@@ -46,16 +46,6 @@ src_prepare() {
 }
 
 src_configure() {
-	local myconf
-	if tc-is-cross-compiler; then
-		myconf="--with-arch=${ARCH}"
-		sed -i -e "s:^CFLAGS = @CFLAGS@:CFLAGS =:g" \
-			fc-case/Makefile.in \
-			fc-lang/Makefile.in \
-			fc-glyphname/Makefile.in \
-			fc-arch/Makefile.in
-	fi
-
 	# always enable docs to install manpages
 	econf \
 		$(use_enable static-libs static) \
@@ -64,15 +54,14 @@ src_configure() {
 		--localstatedir=/var \
 		--with-default-fonts=/usr/share/fonts \
 		--with-add-fonts=/usr/local/share/fonts \
-		--with-templatedir=/etc/fonts/conf.avail \
-		${myconf}
+		--with-templatedir=/etc/fonts/conf.avail
 }
 
 src_install() {
 	emake DESTDIR="${D}" install
 	emake DESTDIR="${D}" -C doc install-man
 
-	find "${ED}" -name '*.la' -exec rm -f {} +
+	find "${ED}" -name '*.la' -delete
 
 	#fc-lang directory contains language coverage datafiles
 	#which are needed to test the coverage of fonts.