Add check for cairo built with X

diff --git a/mail-client/mozilla-thunderbird/ChangeLog b/mail-client/mozilla-thunderbird/ChangeLog
index bfec0c67d1edc3e997de0bd25a7fccb91935ffb7..04cb4d0c99eeb3cfcd7889750ac8bdeeedeb5c31 100644 (file)
--- a/mail-client/mozilla-thunderbird/ChangeLog
+++ b/mail-client/mozilla-thunderbird/ChangeLog
@@ -1,11 +1,15 @@
 # ChangeLog for mail-client/mozilla-thunderbird
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/mozilla-thunderbird/ChangeLog,v 1.154 2006/12/22 15:58:17 tgall Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/mozilla-thunderbird/ChangeLog,v 1.155 2006/12/25 13:05:22 pingu Exp $
 
   22 Dec 2006; Tom Gall <tgall@gentoo.org>
   mozilla-thunderbird-2.0_beta1.ebuild:
   added ~ppc64 (with much fanfare!)
 
+  22 Dec 2006; Christian Marie <pingu@gentoo.org>
+  mozilla-thunderbird-1.5.0.9.ebuild:
+  Add check for cairo with X, bug #140770.
+
   21 Dec 2006; Joshua Jackson <tsunam@gentoo.org>
   mozilla-thunderbird-1.5.0.9.ebuild:
   Stable x86; bug #158571

diff --git a/mail-client/mozilla-thunderbird/Manifest b/mail-client/mozilla-thunderbird/Manifest
index 78b427d9a02739932f2e6592620125c935b18b3f..db2967c95f9efcd8557bcdddcb85316bfde85cce 100644 (file)
--- a/mail-client/mozilla-thunderbird/Manifest
+++ b/mail-client/mozilla-thunderbird/Manifest
@@ -197,18 +197,18 @@ EBUILD mozilla-thunderbird-1.5.0.8.ebuild 7692 RMD160 921330a9e82dfabfaf952c1e04
 MD5 894510259d188a364e95d7ed5deb70a3 mozilla-thunderbird-1.5.0.8.ebuild 7692
 RMD160 921330a9e82dfabfaf952c1e049e23fdf9040383 mozilla-thunderbird-1.5.0.8.ebuild 7692
 SHA256 42b9e4a125c2fbb5c9236ca9baf6749dd1e75f28983f0de98caf61ed29cd545f mozilla-thunderbird-1.5.0.8.ebuild 7692
-EBUILD mozilla-thunderbird-1.5.0.9.ebuild 7640 RMD160 f2bcbf587a0986e4927d89ba991f1dabc30055fc SHA1 8d8254f0f095c6cb3c0fae46252a5f8c79e3f2ae SHA256 8e4744770465b7da96f98d917764c0f81a3b25b640f2e89b45dcd9c470858502
-MD5 31b05d7e004b0128d790cae5861ea7ee mozilla-thunderbird-1.5.0.9.ebuild 7640
-RMD160 f2bcbf587a0986e4927d89ba991f1dabc30055fc mozilla-thunderbird-1.5.0.9.ebuild 7640
-SHA256 8e4744770465b7da96f98d917764c0f81a3b25b640f2e89b45dcd9c470858502 mozilla-thunderbird-1.5.0.9.ebuild 7640
+EBUILD mozilla-thunderbird-1.5.0.9.ebuild 7823 RMD160 0aff20df3d06cf64609e9a06e79af579b6487157 SHA1 4b4c24788c50b7ff317cbbce58b9e78753afc6c8 SHA256 2bac1feaa11d50976e1ae1f9475c79da43ba7c21fc439f190c3e0323dfd9a33c
+MD5 aa5420b4107c07ec7f52154521397b4b mozilla-thunderbird-1.5.0.9.ebuild 7823
+RMD160 0aff20df3d06cf64609e9a06e79af579b6487157 mozilla-thunderbird-1.5.0.9.ebuild 7823
+SHA256 2bac1feaa11d50976e1ae1f9475c79da43ba7c21fc439f190c3e0323dfd9a33c mozilla-thunderbird-1.5.0.9.ebuild 7823
 EBUILD mozilla-thunderbird-2.0_beta1.ebuild 7886 RMD160 4dd4625ae3906bfe99432e1358208598fb8f82c8 SHA1 63c36758d748e80f1c28a6099fd7b1781c177dec SHA256 3c2286666b49879ee20d243ed16f24620db9488d1840eea3486807563691f766
 MD5 20b798caeb7acec4521ab74be20bfec0 mozilla-thunderbird-2.0_beta1.ebuild 7886
 RMD160 4dd4625ae3906bfe99432e1358208598fb8f82c8 mozilla-thunderbird-2.0_beta1.ebuild 7886
 SHA256 3c2286666b49879ee20d243ed16f24620db9488d1840eea3486807563691f766 mozilla-thunderbird-2.0_beta1.ebuild 7886
-MISC ChangeLog 24045 RMD160 dc368db27290dad33c54d3071a08e335b5340b32 SHA1 7e8956961b1a9a5645c62967aa6b21227bfc937b SHA256 945f2e672820ce22f39bdc49a4a183b2897338d3b967a55bc176caa1d1853061
-MD5 a25d7d79ee87786de0c2f5cc753cc36f ChangeLog 24045
-RMD160 dc368db27290dad33c54d3071a08e335b5340b32 ChangeLog 24045
-SHA256 945f2e672820ce22f39bdc49a4a183b2897338d3b967a55bc176caa1d1853061 ChangeLog 24045
+MISC ChangeLog 24177 RMD160 490382ab84589379beb3956154fab4a077862a55 SHA1 91a2f8acb868462be8c8ec72527f6eef7f0c8453 SHA256 6abe13a57bc5810727f4cd23b6724a61d0946755c4a483c92bad0268358bf041
+MD5 905baa9c20849aecc1852c4e84ecf7fa ChangeLog 24177
+RMD160 490382ab84589379beb3956154fab4a077862a55 ChangeLog 24177
+SHA256 6abe13a57bc5810727f4cd23b6724a61d0946755c4a483c92bad0268358bf041 ChangeLog 24177
 MISC metadata.xml 160 RMD160 d5a9f0bf8989621c2bde30facb53bcae00aba709 SHA1 5015c07af2083f20f9552d7fb11afb5ea69af345 SHA256 0cc5126362a12cee42ec1197c528a804cf36859329dd2c6d9225726831d14b8b
 MD5 ce23390351fe8020387d93ee29e09a3d metadata.xml 160
 RMD160 d5a9f0bf8989621c2bde30facb53bcae00aba709 metadata.xml 160

diff --git a/mail-client/mozilla-thunderbird/mozilla-thunderbird-1.5.0.9.ebuild b/mail-client/mozilla-thunderbird/mozilla-thunderbird-1.5.0.9.ebuild
index 0e96abcab32878cb173ccef7d8ef875e43b874c8..455ebba3f31dd3017d346112094b79634b3a2df7 100644 (file)
--- a/mail-client/mozilla-thunderbird/mozilla-thunderbird-1.5.0.9.ebuild
+++ b/mail-client/mozilla-thunderbird/mozilla-thunderbird-1.5.0.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/mozilla-thunderbird/mozilla-thunderbird-1.5.0.9.ebuild,v 1.4 2006/12/21 18:56:37 tsunam Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/mozilla-thunderbird/mozilla-thunderbird-1.5.0.9.ebuild,v 1.5 2006/12/25 13:05:22 pingu Exp $
 
 WANT_AUTOCONF="2.1"
 
@@ -73,6 +73,12 @@ linguas() {
 }
 
 pkg_setup() {
+       if ! built_with_use x11-libs/cairo X; then
+               eerror "Cairo is not built with X useflag."
+               eerror "Please add 'X' to your USE flags, and re-emerge cairo."
+               die "Cairo needs X"
+       fi
+
        use moznopango && warn_mozilla_launcher_stub
 }