Fixing mod-x deps as per bug #123453

Package-Manager: portage-2.1_pre4-r1

4 files changed, 36 insertions, 21 deletions

diff --git a/x11-libs/gtk+/ChangeLog b/x11-libs/gtk+/ChangeLog
index cdc79e97eeb4..555f91bf81e6 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.219 2006/02/12 21:09:54 allanonjl Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/ChangeLog,v 1.220 2006/02/20 07:31:42 compnerd Exp $
+
+  20 Feb 2006; Saleem Abdulrasool <compnerd@gentoo.org>
+  gtk+-1.2.10-r11.ebuild:
+  Fixing mod-z deps as per bug #123453
 
   12 Feb 2006; John N. Laliberte <allanonjl@gentoo.org> gtk+-2.8.12.ebuild:
   add AT_M4DIR to fix compilation when user does not have gtk-doc installed
diff --git a/x11-libs/gtk+/Manifest b/x11-libs/gtk+/Manifest
index 8bc4383cb0f4..1a2709150a0c 100644
--- a/x11-libs/gtk+/Manifest
+++ b/x11-libs/gtk+/Manifest
@@ -1,12 +1,12 @@
-MD5 2dd3dca8746262e95814cadcd4aaa800 ChangeLog 31559
-RMD160 404af870f4d45b29cc180dfa801e555685c80fc8 ChangeLog 31559
-SHA256 529506f2b4c9a0c8b50bbec46a6db5265dd8816714683fc1de1b24ca76e3ed1f ChangeLog 31559
+MD5 8d3445fd57c1523c462040dd81f6460d ChangeLog 31680
+RMD160 12ca2c1dda4bbd19ab2e05830d2b1063e9994366 ChangeLog 31680
+SHA256 617984c3d42409b6fcb6c877ac642f2ee34f6d6faadcbb38751f6aa362ea52ff ChangeLog 31680
 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
-MD5 621a7db3e7e6856c66eec5caeea1e88e files/digest-gtk+-1.2.10-r11 138
-RMD160 089774caae5ebadfe26a94913e690a0e2b1edd39 files/digest-gtk+-1.2.10-r11 138
-SHA256 f1c6441519ca2edf919e1163744c97ef7b7ff05bf456efed405eef49e2684048 files/digest-gtk+-1.2.10-r11 138
+MD5 9a443de5999df036ffd6e66f5b0f83ce files/digest-gtk+-1.2.10-r11 506
+RMD160 45ddc3e7c5ca97084139787b6be318498a9965db files/digest-gtk+-1.2.10-r11 506
+SHA256 4bd7f7ef31547e6dabca532b07bc6be7e37c96d234abd2818afbb85d725aed47 files/digest-gtk+-1.2.10-r11 506
 MD5 f0e0f202bdf17540985215d5384480ed files/digest-gtk+-2.6.10-r1 212
 RMD160 1589e5993ab3c1086fa6b60ed4dec3633fd495fd files/digest-gtk+-2.6.10-r1 212
 SHA256 5ac30a979bdf26948a53b8e96c74733e8d3c68bdddf44bace638b9afba3cf3da files/digest-gtk+-2.6.10-r1 212
@@ -49,9 +49,9 @@ SHA256 22e4197e5976ed623233399049082383033b613176d77126d246a1f6cb747294 files/gt
 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 f332c729d4ad325eb05a7ffd1d839ae6 gtk+-1.2.10-r11.ebuild 1974
+RMD160 6300607f29a591118bc326c2eca5c5dbf63d4333 gtk+-1.2.10-r11.ebuild 1974
+SHA256 6b44b84edee41dd889367d6fbd022f63c0d938078d16fc48654405385e0f8ed8 gtk+-1.2.10-r11.ebuild 1974
 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
diff --git a/x11-libs/gtk+/files/digest-gtk+-1.2.10-r11 b/x11-libs/gtk+/files/digest-gtk+-1.2.10-r11
index c7995d372331..899dce31b869 100644
--- a/x11-libs/gtk+/files/digest-gtk+-1.2.10-r11
+++ b/x11-libs/gtk+/files/digest-gtk+-1.2.10-r11
@@ -1,2 +1,6 @@
-MD5 4d5cb2fc7fb7830e4af9747a36bfce20 gtk+-1.2.10.tar.gz 2868322
 MD5 0ae8dcec20e0fa6dbc022d5eb00dc2a3 gtk+-1.2.10-r8-gentoo.diff.bz2 81223
+RMD160 fa41bb12e41f0c60c605dbeac03a1aaa905f4333 gtk+-1.2.10-r8-gentoo.diff.bz2 81223
+SHA256 517bdadbaa0e13285b2d72a667b311219342306d4f68d838c3c1dbc5bfbf1684 gtk+-1.2.10-r8-gentoo.diff.bz2 81223
+MD5 4d5cb2fc7fb7830e4af9747a36bfce20 gtk+-1.2.10.tar.gz 2868322
+RMD160 9b38310d2768e947c4f6173db009243dd11db288 gtk+-1.2.10.tar.gz 2868322
+SHA256 3fb843ea671c89b909fd145fa09fd2276af3312e58cbab29ed1c93b462108c34 gtk+-1.2.10.tar.gz 2868322
diff --git a/x11-libs/gtk+/gtk+-1.2.10-r11.ebuild b/x11-libs/gtk+/gtk+-1.2.10-r11.ebuild
index f7b0c486414d..5f59e08e89d3 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-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.22 2006/02/12 19:15:47 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-1.2.10-r11.ebuild,v 1.23 2006/02/20 07:31:42 compnerd Exp $
 
 GNOME_TARBALL_SUFFIX="gz"
 inherit gnome.org eutils libtool toolchain-funcs
@@ -14,16 +14,23 @@ SLOT="1"
 KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 ~sparc x86"
 IUSE="nls debug"
 
-RDEPEND="|| ( x11-libs/libXi virtual/x11 )
-	=dev-libs/glib-1.2*"
+RDEPEND="||	(
+				(
+					x11-libs/libXi
+					x11-libs/libXt
+				)
+				virtual/x11
+			)
+		 =dev-libs/glib-1.2*"
 DEPEND="${RDEPEND}
-	|| ( ( x11-proto/inputproto
-			x11-proto/xextproto
-		)
-		virtual/x11
-	)
-	nls? ( sys-devel/gettext
-		dev-util/intltool )"
+		||	(
+				(
+					x11-proto/inputproto
+					x11-proto/xextproto
+				)
+				virtual/x11
+			)
+		nls? ( sys-devel/gettext dev-util/intltool )"
 
 src_unpack() {
 	unpack ${P}.tar.gz