Needs cairo with both png and X

Package-Manager: portage-2.0.53_rc5

diff --git a/x11-libs/pango/ChangeLog b/x11-libs/pango/ChangeLog
index 6eaae602e3ca6e2109e4d6566f172fa627d2b1b9..3fe5c1b3f85ecc769647ece695d8fc0cad5c2eba 100644 (file)
--- a/x11-libs/pango/ChangeLog
+++ b/x11-libs/pango/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for x11-libs/pango
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/pango/ChangeLog,v 1.110 2005/10/11 14:49:04 hardave Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/pango/ChangeLog,v 1.111 2005/10/14 19:25:10 dang Exp $
+
+  14 Oct 2005; <dang@gentoo.org> pango-1.10.1.ebuild:
+  Needs cairo with both png and X
 
   11 Oct 2005; Hardave Riar <hardave@gentoo.org> pango-1.8.1-r1.ebuild:
   Stable on mips.

diff --git a/x11-libs/pango/Manifest b/x11-libs/pango/Manifest
index 5492adf98ae6bef2e89f45a8ea86936afc0504c5..d3707187762ba8c7490b01d6da10ced92a5c753f 100644 (file)
--- a/x11-libs/pango/Manifest
+++ b/x11-libs/pango/Manifest
@@ -1,16 +1,26 @@
-MD5 2c372520f2db7dd18e5ee11050001d24 ChangeLog 12408
-MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
-MD5 a4d0ffeb51ccd5e32c1bdecbe004ab3e pango-1.4.1-r1.ebuild 1881
-MD5 10c01fe6f38e0f3412b79c3beef2f3ed pango-1.8.2.ebuild 1853
-MD5 b7b54115564984b3d12baf5769ffc3ce pango-1.10.1.ebuild 2040
-MD5 da1e20a87deaa737c836f4b9819400db pango-1.8.1-r1.ebuild 1978
-MD5 724ba9499e8fd9e01e37131a0622919e pango-1.8.1.ebuild 1908
-MD5 64bcab7976f0bf42506cf97f7336e0c1 files/digest-pango-1.8.2 65
-MD5 941770096c4a3927b2acb1b81f90b915 files/digest-pango-1.4.1-r1 64
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 c74f9cf6ff56dbfc2f73eef059088910 ChangeLog 12494
 MD5 d01b8f91979149fb6b036c3d443315eb files/digest-pango-1.10.1 66
+MD5 941770096c4a3927b2acb1b81f90b915 files/digest-pango-1.4.1-r1 64
 MD5 54474022d422b0d0cf4b473cfcf5fffb files/digest-pango-1.8.1 64
 MD5 54474022d422b0d0cf4b473cfcf5fffb files/digest-pango-1.8.1-r1 64
+MD5 64bcab7976f0bf42506cf97f7336e0c1 files/digest-pango-1.8.2 65
 MD5 54a56a572951b08340d08e10e4d93414 files/pango-1.0.99.020606-xfonts.patch 4560
 MD5 ee91ace9933dbdbea591e08b6a82bb44 files/pango-1.2.2-slighthint.patch 1124
 MD5 2c7eef6720e5a5aecb7406200c6ede31 files/pango-1.2.5-lib64.patch 1107
 MD5 8de5114d2f4367487b3d70b712115ec4 files/pango-1.8.1-fontfix.patch 1320
+MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
+MD5 ea81b5a99e3a4a08ca83fe9e684c662f pango-1.10.1.ebuild 2054
+MD5 a4d0ffeb51ccd5e32c1bdecbe004ab3e pango-1.4.1-r1.ebuild 1881
+MD5 da1e20a87deaa737c836f4b9819400db pango-1.8.1-r1.ebuild 1978
+MD5 724ba9499e8fd9e01e37131a0622919e pango-1.8.1.ebuild 1908
+MD5 10c01fe6f38e0f3412b79c3beef2f3ed pango-1.8.2.ebuild 1853
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDUAYvomPajV0RnrERArKNAJ99I3CL3GrlFcxDFFSwLoqsPka8HQCeM1+b
+AjRXWVnhqnJednnM4TKCmtQ=
+=kUDy
+-----END PGP SIGNATURE-----

diff --git a/x11-libs/pango/pango-1.10.1.ebuild b/x11-libs/pango/pango-1.10.1.ebuild
index c72b155cf8c15680f3dec9e4ecda5b8b8d5f0002..e6b23432835a05e4d1d6658f17e58972dcf30da7 100644 (file)
--- a/x11-libs/pango/pango-1.10.1.ebuild
+++ b/x11-libs/pango/pango-1.10.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/pango/pango-1.10.1.ebuild,v 1.2 2005/10/11 13:22:35 allanonjl Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/pango/pango-1.10.1.ebuild,v 1.3 2005/10/14 19:25:10 dang Exp $
 
 inherit eutils gnome2
 
@@ -30,9 +30,9 @@ USE_DESTDIR="1"
 
 
 pkg_setup() {
-       if ! built_with_use x11-libs/cairo png; then
-               einfo "Please re-emerge x11-libs/cairo with the png use flag set"
-               die "cairo needs png flag set"
+       if ! built_with_use -a x11-libs/cairo png X; then
+               einfo "Please re-emerge x11-libs/cairo with the png and X USE flags set"
+               die "cairo needs png and X flags set"
        fi
 }