Revert to using system cairo

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

3 files changed, 19 insertions, 14 deletions

diff --git a/mail-client/thunderbird/ChangeLog b/mail-client/thunderbird/ChangeLog
index 335ae3526791..55f42c2f5aee 100644
--- a/mail-client/thunderbird/ChangeLog
+++ b/mail-client/thunderbird/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for mail-client/thunderbird
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/thunderbird/ChangeLog,v 1.145 2012/05/28 14:41:25 anarchy Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/thunderbird/ChangeLog,v 1.146 2012/05/28 18:45:29 anarchy Exp $
+
+*thunderbird-12.0.1-r2 (28 May 2012)
+
+  28 May 2012; <anarchy@gentoo.org> -thunderbird-12.0.1-r1.ebuild,
+  +thunderbird-12.0.1-r2.ebuild:
+  Revert to using system cairo
 
   28 May 2012; <anarchy@gentoo.org> thunderbird-12.0.1-r1.ebuild:
   Finish adding support for gcc-4.7, bug #410557
diff --git a/mail-client/thunderbird/Manifest b/mail-client/thunderbird/Manifest
index 1480c216c03a..22e233f362db 100644
--- a/mail-client/thunderbird/Manifest
+++ b/mail-client/thunderbird/Manifest
@@ -25,7 +25,7 @@ AUX xulrunner-1.9.2-gtk+-2.21.patch 679 RMD160 060d514faa98768312d047985c8193434
 DIST enigmail-1.3.5.tar.gz 1348362 RMD160 9aa3cdd7b8f16f4cb15e3b6f63c5ac913ddaac3f SHA1 4cc928ce2fc328cf6aefbf0c7161484405dbbb5e SHA256 932a0206e9598eb10056f94622e9c0a64afc93542b43694568df810208a1e3b2
 DIST enigmail-1.4.1.tar.gz 1344516 RMD160 f235e266acd390992f128a20f73288c2ecc3c5a5 SHA1 5c629a5d06e23c5bebb86c840f44f04f0732dbda SHA256 100bc7f9ac6bca03e4507df25c5b29d6a39d0904c46301cc7def3676779d720b
 DIST firefox-10.0-patches-0.7.tar.xz 17792 RMD160 0944a903821af98617b29fda4fb0f6fcecf28040 SHA1 6d67d372b8f4935114a8d0c72e369e55114373a1 SHA256 81b78f4ee19a70b4190484be0b6938c05a799202b6de35cfcad66eb79dc44bf9
-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 thunderbird-10.0-patches-0.1.tar.xz 860 RMD160 88bec4475cf92181abb0a2cccacb3561b0d6d21c SHA1 9a0a69838eb9c7a65497d525b587456ee768c4df SHA256 22dd2e4c1787fece81a8ab4d596b890027c2d390b4021ddc135349214f33932e
 DIST thunderbird-10.0.3esr-ar.xpi 441462 RMD160 5c766a06764de46f12f047de4f1f25d291a0fd68 SHA1 5173b44d9e4af36fcb9c0fe37c0cdd907ecc7e56 SHA256 35cb4a50b24558d44a9473b0a247e7228e9e06c77ccd59398a09bd4e2aa4bcf2
 DIST thunderbird-10.0.3esr-ast.xpi 362706 RMD160 0a7df1c5dd8909448b4079116cc2892e0a2f65d1 SHA1 f48f456c2bf5df19f62b581fdbdb4ff4f3660469 SHA256 db64f4f9e7475ac97a0f080628a423bcd7a65b25c7cd5e5f2a4aa6ddd0b6e6c9
@@ -282,19 +282,19 @@ DIST thunderbird-3.1.14-zh-TW.xpi 220657 RMD160 9e7019bda257af283f94814117a22377
 DIST thunderbird-3.1.14.source.tar.bz2 69060251 RMD160 caf136d77eaf31a6dfa42a7520db5d8d8132bce0 SHA1 62ea0edbd5265be6da98fcefad3baa36349bfdd0 SHA256 69916894c9e4177c470d08f5b82ddbb15f2fddb40e5dbd52ea7d9a8d69a9c51c
 EBUILD thunderbird-10.0.3.ebuild 8905 RMD160 81dd972ec348bc8ea6a33e858d55e34d9c0cfcc3 SHA1 65ecdefd6f7a7a2dea0f9aed3617c40fcf97c28b SHA256 bf639b6d7b3d5fcd1cf60585ca76bf6824842c41a1e3ba4625bf743295dbc61a
 EBUILD thunderbird-10.0.4.ebuild 9145 RMD160 151c520ba66cad8e55e64ff94a36eac52f4846aa SHA1 8665708a09923b1aadd8a88f08ae03e48b23fb5c SHA256 e5292068c5cdb42b7dd26f36c5834235ff984bd9c12b753e90962f9e55a7dc86
-EBUILD thunderbird-12.0.1-r1.ebuild 9744 RMD160 d16f2400ffa6e39021fb3fc1764119b4a0e8f84d SHA1 9303aba25831d13523adc42f47973b9abae8027a SHA256 3061247c3b9fa631105833f5bae81b7a813240ba5b95945c99d81b794bf7c842
+EBUILD thunderbird-12.0.1-r2.ebuild 9682 RMD160 084fa2196fa81b2381231eb4e7a1a5877104808f SHA1 5a6dcda8190ed1f7c52ebd60e3d32183738f2484 SHA256 f4207e2ab32347fd9d6a0e17bbdde7af5d37d296c90fd82c4adfd3d115571eb2
 EBUILD thunderbird-3.1.12.ebuild 8075 RMD160 2d883f455650b5c1d1a5388241b36b5b4ac28e87 SHA1 2e335bd19fe7205ebfe2f7020bb0db42431b5b08 SHA256 2f234bf655d1b533104e2fb46cedea9c9b61b5f4f5df8ea27d754c83aa8ec385
 EBUILD thunderbird-3.1.14.ebuild 8082 RMD160 140c386b6ee48b9526fc4dfcc7b556752a0dda84 SHA1 604f1e3b5cf1cf5c2698154cf502e93d8027527f SHA256 a4a9cae459778071add091cca28a853b53958a0f9167d1f5b163d6510602d47c
-MISC ChangeLog 73240 RMD160 a8c8547725d57dc33a365902d1b9d634683a11d3 SHA1 b246e84f838077eca86867ece964dadb8e0d5bab SHA256 de218dee3f9ab519f8b5dd02b0fa47f23b5275bed61d5fa7bec467c7d6a88420
+MISC ChangeLog 73410 RMD160 19eb8949a9b479c00b389f6e7399e4da1dde7eee SHA1 178c8e83ed826b42ad1bf1ff91481f5b1c95d15f SHA256 e4230c347d03b250d08ecb2f96bd00dcd76af4208a6dcc4c800293ab438cbf9b
 MISC metadata.xml 1115 RMD160 b5671b22eef5dc7eb948a98ff32144d0edbff008 SHA1 a566c73c286e01fcc59c6c6ee1117b4df891671f SHA256 08f047bd344a5e947e84e794a20c2d0bddcb476edb5ca4867ab26dd865d682b5
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBAgAGBQJPw46jAAoJEIXV9xahDnCoLYAIAJmWeKfwReieNGXHZPdNAXOJ
-Ef2pkD6WDA5bu7RcNgpVNQi7jvgT5qR08cEC265Rks8/O7Grg4fHkloi8pe/nhfK
-CMx6QgxAL+1frMNLtvEY9RUc6S72ezS2Z9YC0RB9NBmlTbA5z287wjDsdjZHiaPc
-iBJ1+JSRSnWUiWRgi4J2KqFplxclI1OatgnkLiXwIradfeBpzcMfes6ngT9d5Kn6
-2dSWvtyw/VZuWFn8x0ApfAs2DwjS/2d0VrS67UstY6B0AHbjMuwr/zOaI8o7e7qW
-jQEx2FzSGXoRCUKTd/l8y3sQ4ZMTSK3GiEMn0s5DfCYomnh51A+SGa8U3lGJNfk=
-=q4e1
+iQEcBAEBAgAGBQJPw8e/AAoJEIXV9xahDnCo7+gH/A8vt5mbBIMqjSWghPnx9iiz
+9hsxCHWFOe2TL6Hhti9qmbOdwDbmPRSAnTlvWC9lKSyS0Sl2UMpDQmtqZNvEi/YM
+wQ9m+eZpJzGumPytfJ2JycfRicE9DA1cvhCpfiE3h8Yhb0DuHZb3yE7guXWWHU/B
+9BxEIhaSB4ifvS+cfHhFs5d7kDwt0mJZ5jl8yFAfM1VKOaLhhDB3zJYuKBLhES7N
+Mualhqpi16PLi9Xziyqo5alCMb7LkB15+Au4HRplT/qBCOiHpxTdER9ekSz+hU7y
+MH2xf7JEbO6EuXsoFDGHoLnxvdEL9ah+D6T+SQSfh1GVETDP5AuLrpY2udxFjP4=
+=hMV/
 -----END PGP SIGNATURE-----
diff --git a/mail-client/thunderbird/thunderbird-12.0.1-r1.ebuild b/mail-client/thunderbird/thunderbird-12.0.1-r2.ebuild
index 4d775f913018..473ca675e9ed 100644
--- a/mail-client/thunderbird/thunderbird-12.0.1-r1.ebuild
+++ b/mail-client/thunderbird/thunderbird-12.0.1-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/mail-client/thunderbird/thunderbird-12.0.1-r1.ebuild,v 1.4 2012/05/28 14:41:25 anarchy Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/thunderbird/thunderbird-12.0.1-r2.ebuild,v 1.1 2012/05/28 18:45:29 anarchy Exp $
 
 EAPI="3"
 WANT_AUTOCONF="2.1"
@@ -36,7 +36,7 @@ LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2.1 )"
 IUSE="bindist gconf +crashreporter +crypt +ipc +jit +lightning +minimal mozdom +webm"
 
 PATCH="thunderbird-12.0-patches-0.1"
-PATCHFF="firefox-12.0-patches-0.4"
+PATCHFF="firefox-12.0-patches-0.5"
 
 SRC_URI="${SRC_URI}
 	${MOZ_FTP_URI}${MOZ_PV}/source/${MOZ_P}.source.tar.bz2
@@ -175,7 +175,6 @@ src_configure() {
 	mozconfig_annotate '' --with-system-png
 	mozconfig_annotate '' --enable-system-ffi
 	mozconfig_annotate '' --target="${CTARGET:-${CHOST}}"
-	mozconfig_annotate 'Missing features' --disable-system-cairo
 
 	# Use enable features
 	mozconfig_use_enable lightning calendar