Fix for modular X.

Package-Manager: portage-2.1_pre4-r1

5 files changed, 57 insertions, 36 deletions

diff --git a/x11-libs/gtk+/ChangeLog b/x11-libs/gtk+/ChangeLog
index 9894befe8c9d..c81beec0b9f3 100644
--- a/x11-libs/gtk+/ChangeLog
+++ b/x11-libs/gtk+/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-libs/gtk+
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/ChangeLog,v 1.216 2006/02/03 21:58:55 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/ChangeLog,v 1.217 2006/02/12 19:15:47 spyderous Exp $
+
+  12 Feb 2006; Donnie Berkholz <spyderous@gentoo.org>;
+  gtk+-1.2.10-r10.ebuild, gtk+-1.2.10-r11.ebuild, gtk+-2.6.10-r1.ebuild:
+  Fix for modular X.
 
   03 Feb 2006; Aron Griffis <agriffis@gentoo.org> gtk+-2.8.8.ebuild:
   Mark 2.8.8 stable on ia64
diff --git a/x11-libs/gtk+/Manifest b/x11-libs/gtk+/Manifest
index bbf75753535b..3a97ed025b07 100644
--- a/x11-libs/gtk+/Manifest
+++ b/x11-libs/gtk+/Manifest
@@ -1,9 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 6fac7b1747f264b01dad0ed9f3ce529c ChangeLog 31021
-RMD160 9dd747c644a4afda5b21662aa1cd6389998f4d93 ChangeLog 31021
-SHA256 4e678b457c9c25b639029165e347bb4631ec4e9901bcb2edd38c216456289bc6 ChangeLog 31021
+MD5 5bbb232b0b664016a5cf6b74fbfe9853 ChangeLog 31172
+RMD160 f353cb2ccf5f8b84bbcb84d61aa212fb0acfccfa ChangeLog 31172
+SHA256 8b372f8391482a8a5a6be7e268c79aac01669739812fa563adb8aeed1f5aa8c7 ChangeLog 31172
 MD5 621a7db3e7e6856c66eec5caeea1e88e files/digest-gtk+-1.2.10-r10 138
 RMD160 089774caae5ebadfe26a94913e690a0e2b1edd39 files/digest-gtk+-1.2.10-r10 138
 SHA256 f1c6441519ca2edf919e1163744c97ef7b7ff05bf456efed405eef49e2684048 files/digest-gtk+-1.2.10-r10 138
@@ -46,15 +43,15 @@ SHA256 f1fb49b3a93db10bdf6f29a641d5bdb6ebb96956623f0492a52efebdfa238fb2 files/gt
 MD5 36d00cf3b4035e6cb9873ade9ed1a9ce files/gtkrc 627
 RMD160 3171e0c9132bb2a9119c51750702db23c4a5f076 files/gtkrc 627
 SHA256 22e4197e5976ed623233399049082383033b613176d77126d246a1f6cb747294 files/gtkrc 627
-MD5 03ae62ac03643ccc0a36779df1bfd6af gtk+-1.2.10-r10.ebuild 1702
-RMD160 3ae454009ab1db14ff8e9573af69f37b2fb9755d gtk+-1.2.10-r10.ebuild 1702
-SHA256 ccfbc648d671ee7f966f8f03d808cba825279c55fd9bdbfbf6331a73332441b5 gtk+-1.2.10-r10.ebuild 1702
-MD5 60b495d6aa1169ba2dc4b20a303b18d7 gtk+-1.2.10-r11.ebuild 1916
-RMD160 06c322a5a109a750b018f237aa21a3aa5c33178a gtk+-1.2.10-r11.ebuild 1916
-SHA256 0efbb8dd9efcd76fb152c5cf403fbaf4644b76cc44cb561a9c2e2bdc8538b0db gtk+-1.2.10-r11.ebuild 1916
-MD5 6017f72966d53602c58c288364dd61a9 gtk+-2.6.10-r1.ebuild 3125
-RMD160 5e55bb7d0485906a46a39dfb72ec99cd8e807e99 gtk+-2.6.10-r1.ebuild 3125
-SHA256 0bb665028002781a421861aae73f864c4b7815867b6829274ca62f1a6f041f1d gtk+-2.6.10-r1.ebuild 3125
+MD5 e1786e8eefd917c4dc90ecbe3091aa08 gtk+-1.2.10-r10.ebuild 1821
+RMD160 ad3c002279536e8c98b498e4162c631332546af6 gtk+-1.2.10-r10.ebuild 1821
+SHA256 33d21b3f23e0ea30f8c68e21cf0ea7f863df4e947cc7bbf5406115c2312d01d4 gtk+-1.2.10-r10.ebuild 1821
+MD5 2813d3fbebddfe2ad57a3f4b0b390e2d gtk+-1.2.10-r11.ebuild 1912
+RMD160 68d2f28fcbc91a78fa2891c9cc8ab91245a3c656 gtk+-1.2.10-r11.ebuild 1912
+SHA256 75a679c989942aa7dba485c4773b26ed193061d5bbdd6fb2b4c682a64b3880c3 gtk+-1.2.10-r11.ebuild 1912
+MD5 16ca62398139ea671319657720b6fc8b gtk+-2.6.10-r1.ebuild 3455
+RMD160 63997fee767bbb4ddc7d978374c7d9fbe73bf6ba gtk+-2.6.10-r1.ebuild 3455
+SHA256 d58bd7ffe27a02b4c4cf71dd16dcc6c7116723b36df0d15519846b19549ade2e gtk+-2.6.10-r1.ebuild 3455
 MD5 98c3798b9681eb69ff09d1147d16e602 gtk+-2.8.11.ebuild 4192
 RMD160 6e692a0ae91d437641f042279e9c70502c8d7d63 gtk+-2.8.11.ebuild 4192
 SHA256 4ab0c704bb526c5a5e77aeff321d68f5542ca8aa86acd4fd0d80f9a163847eb0 gtk+-2.8.11.ebuild 4192
@@ -64,10 +61,3 @@ SHA256 11c0c44d19b8efe7994af62a4bed7aec110cb69e2f3b8d0bdd72bbe7cfdfe121 gtk+-2.8
 MD5 58b5c1a403ab43f5160c44c32761cbe0 metadata.xml 424
 RMD160 b1748199254d5d0f0db468fdec36f07bb75a3231 metadata.xml 424
 SHA256 8b65272928e676824c407ed438004d9e5d50077a09beee0b60984eadb695bc2d metadata.xml 424
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFD49IpJrHF4yAQTrARApwNAJ4ybUAvW1nmANO3HK4ExMzAAuCjngCgtpRr
-jUmD331mwbioJ3CTsMOcxkM=
-=kcTO
------END PGP SIGNATURE-----
diff --git a/x11-libs/gtk+/gtk+-1.2.10-r10.ebuild b/x11-libs/gtk+/gtk+-1.2.10-r10.ebuild
index 5bed752dde25..ff35dda80044 100644
--- a/x11-libs/gtk+/gtk+-1.2.10-r10.ebuild
+++ b/x11-libs/gtk+/gtk+-1.2.10-r10.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-1.2.10-r10.ebuild,v 1.20 2005/12/19 06:06:29 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-1.2.10-r10.ebuild,v 1.21 2006/02/12 19:15:47 spyderous Exp $
 
 GNOME_TARBALL_SUFFIX="gz"
 inherit gnome.org eutils libtool
@@ -15,8 +15,14 @@ SLOT="1"
 KEYWORDS="x86 ppc sparc alpha hppa amd64 ia64 mips"
 IUSE="nls debug"
 
-DEPEND="virtual/x11
-	=dev-libs/glib-1.2*
+RDEPEND="|| ( x11-libs/libXi virtual/x11 )
+	=dev-libs/glib-1.2*"
+DEPEND="${RDEPEND}
+	|| ( ( x11-proto/inputproto
+			x11-proto/xextproto
+		)
+		virtual/x11
+	)
 	nls? ( sys-devel/gettext
 		dev-util/intltool )"
 
diff --git a/x11-libs/gtk+/gtk+-1.2.10-r11.ebuild b/x11-libs/gtk+/gtk+-1.2.10-r11.ebuild
index 323359c0d972..f7b0c486414d 100644
--- a/x11-libs/gtk+/gtk+-1.2.10-r11.ebuild
+++ b/x11-libs/gtk+/gtk+-1.2.10-r11.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-1.2.10-r11.ebuild,v 1.21 2005/12/19 06:06:29 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-1.2.10-r11.ebuild,v 1.22 2006/02/12 19:15:47 spyderous Exp $
 
 GNOME_TARBALL_SUFFIX="gz"
 inherit gnome.org eutils libtool toolchain-funcs
@@ -14,13 +14,14 @@ SLOT="1"
 KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 ~sparc x86"
 IUSE="nls debug"
 
-RDEPEND="|| ( ( x11-libs/libXi )
-	( virtual/x11 ) )
+RDEPEND="|| ( x11-libs/libXi virtual/x11 )
 	=dev-libs/glib-1.2*"
 DEPEND="${RDEPEND}
 	|| ( ( x11-proto/inputproto
-	x11-proto/xextproto )
-	( virtual/x11 ) )
+			x11-proto/xextproto
+		)
+		virtual/x11
+	)
 	nls? ( sys-devel/gettext
 		dev-util/intltool )"
 
diff --git a/x11-libs/gtk+/gtk+-2.6.10-r1.ebuild b/x11-libs/gtk+/gtk+-2.6.10-r1.ebuild
index e65e0a4a885d..e4fd0fb17ff5 100644
--- a/x11-libs/gtk+/gtk+-2.6.10-r1.ebuild
+++ b/x11-libs/gtk+/gtk+-2.6.10-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-2.6.10-r1.ebuild,v 1.3 2005/11/20 06:27:34 hardave Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-2.6.10-r1.ebuild,v 1.4 2006/02/12 19:15:47 spyderous Exp $
 
 inherit flag-o-matic eutils
 
@@ -15,7 +15,19 @@ SLOT="2"
 KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 sparc x86"
 IUSE="doc tiff jpeg"
 
-RDEPEND="virtual/x11
+RDEPEND="|| ( (
+			x11-libs/libXrender
+			x11-libs/libX11
+			x11-libs/libXi
+			x11-libs/libXt
+			x11-libs/libXext
+			x11-libs/libXinerama
+			x11-libs/libXcursor
+			x11-libs/libXrandr
+			x11-libs/libXfixes
+		)
+		virtual/x11
+	)
 	>=dev-libs/glib-2.6
 	>=dev-libs/atk-1.0.1
 	>=x11-libs/pango-1.8
@@ -28,6 +40,14 @@ DEPEND="${RDEPEND}
 	>=dev-util/pkgconfig-0.9
 	sys-devel/autoconf
 	>=sys-devel/automake-1.7.9
+	|| ( (
+			x11-proto/xextproto
+			x11-proto/xproto
+			x11-proto/inputproto
+			x11-proto/xineramaproto
+		)
+		virtual/x11
+	)
 	doc? ( >=dev-util/gtk-doc-1 )"