Forgot to commit modular X deps from ages ago

Package-Manager: portage-2.0.53_rc6

diff --git a/x11-libs/pango/ChangeLog b/x11-libs/pango/ChangeLog
index 3fe5c1b3f85ecc769647ece695d8fc0cad5c2eba..8f156cf6b2d13d9a51411b239851a54d47453300 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.111 2005/10/14 19:25:10 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/pango/ChangeLog,v 1.112 2005/10/30 01:03:22 cardoe Exp $
+
+  30 Oct 2005; Doug Goldstein <cardoe@gentoo.org> pango-1.10.1.ebuild:
+  Forgot to commit modular X deps from ages ago
 
   14 Oct 2005; <dang@gentoo.org> pango-1.10.1.ebuild:
   Needs cairo with both png and X

diff --git a/x11-libs/pango/Manifest b/x11-libs/pango/Manifest
index d3707187762ba8c7490b01d6da10ced92a5c753f..43b0547ea33663f2ee08cef0e3d2b1511651c2c9 100644 (file)
--- a/x11-libs/pango/Manifest
+++ b/x11-libs/pango/Manifest
@@ -1,7 +1,7 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 c74f9cf6ff56dbfc2f73eef059088910 ChangeLog 12494
+MD5 65f9d4c205767b4eaa06547d9a93bc25 ChangeLog 12616
 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
@@ -12,7 +12,7 @@ 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 67536000773a531c886202e015e9795d pango-1.10.1.ebuild 2164
 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
@@ -20,7 +20,7 @@ MD5 10c01fe6f38e0f3412b79c3beef2f3ed pango-1.8.2.ebuild 1853
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFDUAYvomPajV0RnrERArKNAJ99I3CL3GrlFcxDFFSwLoqsPka8HQCeM1+b
-AjRXWVnhqnJednnM4TKCmtQ=
-=kUDy
+iD8DBQFDZBv5BtvusYtCZMsRAms2AJ9nUw6b+aYs3FWCdS7Khe8MuHbOugCfZTKt
+BRw0yFsCCx2i1V1mMwybr2Q=
+=F2C8
 -----END PGP SIGNATURE-----

diff --git a/x11-libs/pango/pango-1.10.1.ebuild b/x11-libs/pango/pango-1.10.1.ebuild
index e6b23432835a05e4d1d6658f17e58972dcf30da7..044dd3ad2643486ec3be51a703435ca2ffa0dcf9 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.3 2005/10/14 19:25:10 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/pango/pango-1.10.1.ebuild,v 1.4 2005/10/30 01:03:22 cardoe Exp $
 
 inherit eutils gnome2
 
@@ -12,7 +12,12 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 IUSE="doc"
 
-RDEPEND="virtual/x11
+RDEPEND="|| ( (
+               x11-libs/libXrender
+               x11-libs/libX11
+               x11-libs/libXt
+               )
+       virtual/x11 )
        virtual/xft
        >=dev-libs/glib-2.5.7
        >=media-libs/fontconfig-1.0.1
@@ -21,6 +26,7 @@ RDEPEND="virtual/x11
 
 DEPEND="${RDEPEND}
        >=dev-util/pkgconfig-0.9
+       || ( x11-proto/xproto virtual/x11 )
        doc? (
                >=dev-util/gtk-doc-1
                ~app-text/docbook-xml-dtd-4.1.2 )"