Revert to using system cairo

Package-Manager: portage-2.1.10.63/cvs/Linux x86_64

3 files changed, 20 insertions, 15 deletions

diff --git a/www-client/firefox/ChangeLog b/www-client/firefox/ChangeLog
index 3a5a0e00d1e5..a260a85b4470 100644
--- a/www-client/firefox/ChangeLog
+++ b/www-client/firefox/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for www-client/firefox
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/firefox/ChangeLog,v 1.153 2012/05/28 14:44:24 anarchy Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/firefox/ChangeLog,v 1.154 2012/05/28 18:48:50 anarchy Exp $
+
+*firefox-12.0-r2 (28 May 2012)
+
+  28 May 2012; <anarchy@gentoo.org> -firefox-12.0-r1.ebuild,
+  +firefox-12.0-r2.ebuild:
+  Revert to using system cairo
 
   28 May 2012; <anarchy@gentoo.org> firefox-12.0-r1.ebuild:
   Finish adding support for gcc-4.7, bug #410557
diff --git a/www-client/firefox/Manifest b/www-client/firefox/Manifest
index 1d9f424d14f7..80cea075c9ad 100644
--- a/www-client/firefox/Manifest
+++ b/www-client/firefox/Manifest
@@ -243,7 +243,7 @@ DIST firefox-12.0-nn-NO.xpi 251584 RMD160 041e66421f6743e0ce8629a0695702ef1dcf5f
 DIST firefox-12.0-nso.xpi 255057 RMD160 29e2594a03922f52810292b9598edda7e8ee4044 SHA1 d18938e88f74cf0c466a19305b58835cb88b9dc3 SHA256 80e3b19980b9bcfeb2754008dece354daa2001a9c16e18f85720b0fe454416a6
 DIST firefox-12.0-or.xpi 290264 RMD160 b67ad0647f050a8d28a0376b9de333e74098b81d SHA1 32a70a795b62377ed0c7cea417fe68aef043d6ce SHA256 8e7050a78db20ab5476e483d86c21b901c22c040a5797ad6080a1c8b404e5a28
 DIST firefox-12.0-pa-IN.xpi 291378 RMD160 9e16a42b5be9babf74d5b9a3f2db27a815fbdd74 SHA1 85f035b396acf7712903a7504809593edf7c1597 SHA256 6bf483528825485b7fd6ff8d8b25c63f298db64b3478e8a7e086bc8d4a083c29
-DIST firefox-12.0-patches-0.4.tar.xz 12820 RMD160 08c54d0a3365a615ead75559d0ac382604c83a3c SHA1 f74d4343b67cc59b29bb2bccb08139a757094d48 SHA256 1481e85400de6860f373149f7d0eebd5b8ae5179ed7d8fcbeef0d81115e0f781
+DIST firefox-12.0-patches-0.5.tar.xz 13428 RMD160 116725d5e3404bc844aff70de56be3a580422f7c SHA1 8fd7abca4e1ccf32e0a759618bd659120285883f SHA256 b0542c4a7bac047282085cb9e3682b43537cb30db653190215e399c3c327c5e7
 DIST firefox-12.0-pl.xpi 260629 RMD160 65079485d604c9b7b7d78ea0c34eb941c63fadc4 SHA1 970dcc47edf23e99c8695313c66757bad2f3c4a2 SHA256 84382b1ba9208e9fdcb4529ce8327c9b06ccc78bbfb9535c916781548892b8a2
 DIST firefox-12.0-pt-BR.xpi 256574 RMD160 0fe053715bc373d79de22279a5aa2a899b3988db SHA1 b846381743676685a833650b20fac819be4eb1aa SHA256 d535c55943207c1edc2d1009f44e74b6cc45c15d32f1b2d32c1d3b2e64384ed5
 DIST firefox-12.0-pt-PT.xpi 255627 RMD160 10d04a1014da862f2260ffac2f9578e2c6a51fe1 SHA1 0950af9b2b99f29744f82689cc63b6833b6c389e SHA256 16bef61dd49c2c9fdc1263576d1e9275c98e94d7ea744cb551a10a9b9e5a7180
@@ -419,20 +419,20 @@ DIST firefox-3.6.22-zh-TW.xpi 128514 RMD160 2fdecb3fa108eb5f3cfc292bbc4044a29d75
 DIST firefox-3.6.22.source.tar.bz2 51675082 RMD160 7b5cd6bb9264b97b0059bb254c383d9237982e4c SHA1 db7953b20568126a3ffe7c5a89ab0cecac4b0a53 SHA256 788e5a64f8bdb07183405c568fda70d8cb7759d3a8d75c404f3589fe8a039229
 EBUILD firefox-10.0.3.ebuild 10665 RMD160 a54d0bb6ee04d962f96d89a9fa7bede0f8781361 SHA1 ae3df41ac6181c528df2c6fa688d765bbc623ad8 SHA256 521a745b5178a1a7566ee46f52ed1587e1088fce5fffadc9466cbeeab195a988
 EBUILD firefox-10.0.4.ebuild 10725 RMD160 9f9acf06ed6f60520ccfeab8a55ca82bce7c9835 SHA1 628bbbe0af455267cdb6c4ed11611a45cc1b622d SHA256 998c42c0da26ad1b8cfc640d6775c3e99ae6646670a743f51ea33b3953596e66
-EBUILD firefox-12.0-r1.ebuild 11235 RMD160 76181bb48c02a09d1571eb9990e468dfd3efcc99 SHA1 6425144e76b0c25aa80786ed47b388d6185f98a7 SHA256 07a6e0ab0d6e7cfc1f9a80a4aec924e79489284c763b72635950861605ecc931
+EBUILD firefox-12.0-r2.ebuild 11166 RMD160 15aad0106124d63cb6fc34eae2339304c762dfc9 SHA1 1fe5bf015c4b62d2d99da2da3b0cafdb49bdc3b8 SHA256 663d071219a67de88f4f4bef11307ba80432e49ca5ec90dfde6190cf8816cf5b
 EBUILD firefox-3.6.20.ebuild 9446 RMD160 c205a304dd6aa5429b7bc0e315326a572f7f06c7 SHA1 0c75cd125c39de8a74e3f2a3df156801a06043a1 SHA256 d747ec5ffcc4a579f57596fa184043e6ee894f518a5c591e80a2610ec7faf88c
 EBUILD firefox-3.6.22.ebuild 9451 RMD160 76e2e018e65012c6364c6f13d604080882e2df6e SHA1 a24853fb2285b14cbae92617450a46d0f19ab3e3 SHA256 2d420e5751373bb5422bdba9ae8a72bc5cc5e447e07e4de5b64792941d0fd7bc
-MISC ChangeLog 31100 RMD160 e34e9f44dfc83e56c4fd02c0ed7ac133c7fccbf7 SHA1 baa66f874564e2a83be0468701af8883027b17b1 SHA256 1d47406dcd450ab0b6ace15c793de9bfb822d1b4fc43c45ee9f69068b5ad8e3c
+MISC ChangeLog 31252 RMD160 2635ab6134d89adfe9db4a8eee313e2f6593984b SHA1 3798ee3b9a6303fb95f417bb781bb01cb2cd127e SHA256 cb099b65d459ece3f61c45e730f29798aa92328f6de7ba800613c3d89782471e
 MISC ChangeLog-2009 109736 RMD160 ae12e8bd2f6f9869d3aeb0e2b172016a16a8e38b SHA1 eed236ab9ea02cf4f3e234887f36935375a7fc6f SHA256 6a3f47a190cb2146174953971b193f7d75f408ea2cd1ad7d029fb848dd66f3c8
 MISC metadata.xml 1152 RMD160 6a8a637610be0a0c1766c9b6a19ecffb39568dab SHA1 f1ac580a01dbb6a4d34065312a6e6a91db3f3730 SHA256 35b283a48644ea59259a1da5217d300409c51e7ae251caea86e8de98a588173c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBAgAGBQJPw485AAoJEIXV9xahDnCoxowH/1f7kOYPy94/ggqHwzGfiBSZ
-KkWVoW0JPXoWz+ruRDDbSjrPouoeNGEGj3Nzu3tumEFpSOncOsm9HR5U/fsBOnyF
-Q18V4f3YF1zIlEUQZEeS7ezjJxT1sS6JdS8uU1m/rWnlF5qT8hRuLTcSeTMHgJ78
-0NZGRKNS9waXNujjh5x3OjB2uAxyfd8LBVvfBQAu7fwVSKlTA46O4XTzGqtG9q0/
-sXMNJ3N/mwH6TgsIJMAJFUavWAMIZVrrBa8ertgLMhuTof/6WhzCxglxwZfEICO8
-nVWa4wxJDBTVBIApYChNKxnYdGrbV9/TF+qoLDlC3BSFk5mNUjr2Yn55v7B2x/s=
-=IJdr
+iQEcBAEBAgAGBQJPw8iDAAoJEIXV9xahDnCoCvIH/AtffKz0Tj0x5slQ6XqRZKtL
+zMTlSHVRUZH8CoKMlB3ryWHk9LFVyVXEZR+QlxL3fv+uGGIz0ZuKnjmf7yThUZeE
+3BLCzJzLsOK2aBHvvMpxU8xU3mkWQ4ER5SRlXEmSjycF1N5OPxZkKkCySd6045OK
+KYaY8ooNvIJ1BjWLqoVH8Tp+tx9E//Xio2+vwigOjYZWUB45DO4+r5Z3xsblNbfW
+EiHdv6PCafFn2ztBz/Qykt4b9DMmWAaCAfmi+FjsIEAJKffsQEZhdYm9Ovh8ak77
+Xug9DBdcnAF6jyTWWBYqNsGmZhZrQw2gtsyOjy/jaah9jdQwSoSn0vRnwRAIp6U=
+=pCX5
 -----END PGP SIGNATURE-----
diff --git a/www-client/firefox/firefox-12.0-r1.ebuild b/www-client/firefox/firefox-12.0-r2.ebuild
index 0ca5f3e15055..a438846d5560 100644
--- a/www-client/firefox/firefox-12.0-r1.ebuild
+++ b/www-client/firefox/firefox-12.0-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/firefox/firefox-12.0-r1.ebuild,v 1.3 2012/05/28 14:44:24 anarchy Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/firefox/firefox-12.0-r2.ebuild,v 1.1 2012/05/28 18:48:50 anarchy Exp $
 
 EAPI="3"
 VIRTUALX_REQUIRED="pgo"
@@ -27,7 +27,7 @@ fi
 # Changeset for alpha snapshot
 CHANGESET="e56ecd8b3a68"
 # Patch version
-PATCH="${PN}-12.0-patches-0.4"
+PATCH="${PN}-12.0-patches-0.5"
 # Upstream ftp release URI that's used by mozlinguas.eclass
 # We don't use the http mirror because it deletes old tarballs.
 MOZ_FTP_URI="ftp://ftp.mozilla.org/pub/${PN}/releases/"
@@ -37,7 +37,7 @@ inherit check-reqs flag-o-matic toolchain-funcs eutils gnome2-utils mozconfig-3
 DESCRIPTION="Firefox Web Browser"
 HOMEPAGE="http://www.mozilla.com/firefox"
 
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 -sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 SLOT="0"
 LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2.1 )"
 IUSE="bindist +crashreporter +ipc +jit +minimal pgo selinux system-sqlite +webm"
@@ -201,7 +201,6 @@ src_configure() {
 	mozconfig_annotate '' --enable-safe-browsing
 	mozconfig_annotate '' --with-system-png
 	mozconfig_annotate '' --enable-system-ffi
-	mozconfig_annotate 'Missing features' --disable-system-cairo
 
 	# Other ff-specific settings
 	mozconfig_annotate '' --with-default-mozilla-five-home=${MOZILLA_FIVE_HOME}