Modular X dependency fix

(Portage version: 2.1_pre4-r1)

12 files changed, 66 insertions, 30 deletions

diff --git a/games-puzzle/triptych-demo/ChangeLog b/games-puzzle/triptych-demo/ChangeLog
index 4b69ae5f5132..f007210bab3d 100644
--- a/games-puzzle/triptych-demo/ChangeLog
+++ b/games-puzzle/triptych-demo/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for games-puzzle/triptych-demo
-# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-puzzle/triptych-demo/ChangeLog,v 1.5 2005/09/26 18:13:36 wolf31o2 Exp $
+# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/triptych-demo/ChangeLog,v 1.6 2006/02/17 22:31:09 tupone Exp $
+
+  17 Feb 2006; <Tupone@gentoo.org> triptych-demo-0.ebuild:
+  Modular X dependency fix
 
   26 Sep 2005; Chris Gianelloni <wolf31o2@gentoo.org>
   triptych-demo-0.ebuild:
diff --git a/games-puzzle/triptych-demo/Manifest b/games-puzzle/triptych-demo/Manifest
index 3197438e2afd..c286af3235d5 100644
--- a/games-puzzle/triptych-demo/Manifest
+++ b/games-puzzle/triptych-demo/Manifest
@@ -1,4 +1,12 @@
-MD5 4ac624295f93f6ea8e5f4f145fb94f1a triptych-demo-0.ebuild 1023
-MD5 2f5cd243a209ae0630a14e2d5bfcdd9b ChangeLog 827
+MD5 9d0edacf8fbd8dd50070458cc07b1e29 ChangeLog 914
+RMD160 52b9bddcacdbd9219e59da832ce5c6d97da35ee1 ChangeLog 914
+SHA256 ac143447ac4f9d2ebfd31f8875bf303532f168c7394ec1944a80b74a05ef0fcd ChangeLog 914
+MD5 3da66f6e68328e1311a7d8198b7d1fc2 files/digest-triptych-demo-0 229
+RMD160 b2436f9ca0481721fd2e10621651ec01c37ec7f4 files/digest-triptych-demo-0 229
+SHA256 ac013a96d88503de6b25493736edd0aff69ba5f43a94dbcef248c404aa960d42 files/digest-triptych-demo-0 229
 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
-MD5 5593d94dac71b0477981be9ef76204fc files/digest-triptych-demo-0 61
+RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea metadata.xml 158
+SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 metadata.xml 158
+MD5 a068e12f0ae3699a042c248e184793e4 triptych-demo-0.ebuild 1032
+RMD160 b8db1b0bf6eda4b5620e68c2c99874514e23366f triptych-demo-0.ebuild 1032
+SHA256 b12c1501b534bea3a95331f6a341335141ed6f0acedf628f551b6ba29f013891 triptych-demo-0.ebuild 1032
diff --git a/games-puzzle/triptych-demo/files/digest-triptych-demo-0 b/games-puzzle/triptych-demo/files/digest-triptych-demo-0
index 1511b9e1e14a..a2cab257114d 100644
--- a/games-puzzle/triptych-demo/files/digest-triptych-demo-0
+++ b/games-puzzle/triptych-demo/files/digest-triptych-demo-0
@@ -1 +1,3 @@
 MD5 dfd8b505f6dbbd1f28f35399f7b55e34 triptych.tar.gz 1748316
+RMD160 4e0c6f63a4ce44088a18e0491fa4841f547072a3 triptych.tar.gz 1748316
+SHA256 2d583edc1b974fc346087ab73adb24d476cee040fb59912e28fbf7a8467db5a8 triptych.tar.gz 1748316
diff --git a/games-puzzle/triptych-demo/triptych-demo-0.ebuild b/games-puzzle/triptych-demo/triptych-demo-0.ebuild
index 9b7b36cc8927..f830b6b0b86e 100644
--- a/games-puzzle/triptych-demo/triptych-demo-0.ebuild
+++ b/games-puzzle/triptych-demo/triptych-demo-0.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/games-puzzle/triptych-demo/triptych-demo-0.ebuild,v 1.6 2005/09/26 18:13:36 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/triptych-demo/triptych-demo-0.ebuild,v 1.7 2006/02/17 22:31:09 tupone Exp $
 
 inherit eutils games
 
@@ -13,9 +13,8 @@ SLOT="0"
 KEYWORDS="-* x86"
 IUSE=""
 
-RDEPEND="virtual/libc
+DEPEND="|| ( x11-libs/libXext virtual/x11 )
 	media-libs/libsdl
-	virtual/x11
 	virtual/opengl"
 
 S=${WORKDIR}/triptych
diff --git a/games-puzzle/twindistress/ChangeLog b/games-puzzle/twindistress/ChangeLog
index 290a785cbf2d..2da7a0db53d8 100644
--- a/games-puzzle/twindistress/ChangeLog
+++ b/games-puzzle/twindistress/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for games-puzzle/twindistress
-# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-puzzle/twindistress/ChangeLog,v 1.4 2004/11/22 21:39:13 josejx Exp $
+# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/twindistress/ChangeLog,v 1.5 2006/02/17 22:33:37 tupone Exp $
+
+  17 Feb 2006; <Tupone@gentoo.org> twindistress-1.03.ebuild:
+  Modular X dependency fix
 
   23 Nov 2004; Joseph Jezak <josejx@gentoo.org> twindistress-1.03.ebuild:
   Marked ppc stable.
diff --git a/games-puzzle/twindistress/Manifest b/games-puzzle/twindistress/Manifest
index ed9346a6af80..3679f9146bff 100644
--- a/games-puzzle/twindistress/Manifest
+++ b/games-puzzle/twindistress/Manifest
@@ -1,4 +1,12 @@
-MD5 fbd2e383aa4b897b827f0a85dfb1360c ChangeLog 613
+MD5 c85d22d724a9ad3d52be42bc178ba55b ChangeLog 702
+RMD160 a1b55867ecc275219eae434ea80377da36384e6f ChangeLog 702
+SHA256 9e718261fa2c1b90421db050076029e778928945a9a6204d81168a565196000a ChangeLog 702
+MD5 fd87c0404ea4b0734ac714f5f0741244 files/digest-twindistress-1.03 235
+RMD160 e824be7e5c935c1c33cb6efd2193ddbf8b74787b files/digest-twindistress-1.03 235
+SHA256 5842833d5088131796816ac472c65da42a1cd25a1d5b319f6c6b00bbd1e38ca5 files/digest-twindistress-1.03 235
 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
-MD5 d0a812af9dfade844e64ece53ef001a5 twindistress-1.03.ebuild 1680
-MD5 3d996cc3315e3f1d4c8abc912004b0a1 files/digest-twindistress-1.03 63
+RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea metadata.xml 158
+SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 metadata.xml 158
+MD5 1a2d5db7ceb48aaa8443128a8cd8dffe twindistress-1.03.ebuild 1609
+RMD160 1283ea86588c0721cc6bd8fd412d409955dd3296 twindistress-1.03.ebuild 1609
+SHA256 8ee89d09558ab4d0176e6531b3178769e634b13d5de0f96b367a4566082a8104 twindistress-1.03.ebuild 1609
diff --git a/games-puzzle/twindistress/files/digest-twindistress-1.03 b/games-puzzle/twindistress/files/digest-twindistress-1.03
index 105dc9d5863a..6187d1b4cdc4 100644
--- a/games-puzzle/twindistress/files/digest-twindistress-1.03
+++ b/games-puzzle/twindistress/files/digest-twindistress-1.03
@@ -1 +1,3 @@
 MD5 389dbe8b002bdcc9f87f967e492aeb7c twind-1.03.tar.gz 2814686
+RMD160 3046375946a67cc0878642b5f5f72218ddc8ef85 twind-1.03.tar.gz 2814686
+SHA256 9c9d114e934650b0c6a935dca5a625320e469d5edd512132ca1e9ddefb76336f twind-1.03.tar.gz 2814686
diff --git a/games-puzzle/twindistress/twindistress-1.03.ebuild b/games-puzzle/twindistress/twindistress-1.03.ebuild
index 4c7d4b5eeb5b..604962d43e30 100644
--- a/games-puzzle/twindistress/twindistress-1.03.ebuild
+++ b/games-puzzle/twindistress/twindistress-1.03.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-puzzle/twindistress/twindistress-1.03.ebuild,v 1.5 2004/11/22 21:39:13 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/twindistress/twindistress-1.03.ebuild,v 1.6 2006/02/17 22:33:37 tupone Exp $
 
 inherit eutils games
 
@@ -15,12 +15,8 @@ LICENSE="GPL-2"
 SLOT="0"
 IUSE=""
 
-RDEPEND="virtual/x11
-	media-libs/libsdl
-	media-libs/sdl-mixer
+DEPEND="media-libs/sdl-mixer
 	media-libs/sdl-image"
-DEPEND="${RDEPEND}
-	>=sys-apps/sed-4"
 
 src_unpack() {
 	unpack ${A}
diff --git a/games-puzzle/xbomb/ChangeLog b/games-puzzle/xbomb/ChangeLog
index c43111232eaa..26ca1507f7e1 100644
--- a/games-puzzle/xbomb/ChangeLog
+++ b/games-puzzle/xbomb/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for games-puzzle/xbomb
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-puzzle/xbomb/ChangeLog,v 1.7 2005/04/15 17:28:06 nigoro Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/xbomb/ChangeLog,v 1.8 2006/02/17 22:35:49 tupone Exp $
+
+  17 Feb 2006; <Tupone@gentoo.org> xbomb-2.1-r1.ebuild:
+  Modular X dependency fix
 
   16 Apr 2005; Yuta SATOH <nigoro@gentoo.org> xbomb-2.1-r1.ebuild:
   Stable on ppc64
diff --git a/games-puzzle/xbomb/Manifest b/games-puzzle/xbomb/Manifest
index b3cc779ef206..0be7be624cf1 100644
--- a/games-puzzle/xbomb/Manifest
+++ b/games-puzzle/xbomb/Manifest
@@ -1,5 +1,15 @@
-MD5 f5ad5844aa81224949741448e29273d2 xbomb-2.1-r1.ebuild 1119
-MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
-MD5 c16aa371d19642e14afcd51037c5bbad ChangeLog 874
-MD5 15fe72ff47158963cb27d563903a0427 files/digest-xbomb-2.1-r1 57
+MD5 6189999bf9a81614cd2b1b886a32e80c ChangeLog 958
+RMD160 acc691e5f2b260a929a7cd30673ea629c56da347 ChangeLog 958
+SHA256 d37a71ad135b37f7059f901e5d5b0a6adbb7f782ed8c7454728adce545f3772a ChangeLog 958
+MD5 e64d9b858b53a3a566e7e0a00a7ed451 files/digest-xbomb-2.1-r1 217
+RMD160 c5b6788a31b0d481a0b26d862365d56d91dac7d5 files/digest-xbomb-2.1-r1 217
+SHA256 0ac5b4f92fff11ed02a44c430b170327656fbeae974a58aabad8ae60b1aad80d files/digest-xbomb-2.1-r1 217
 MD5 7919f1ad93b19f5c12e3432dd2487d46 files/xbomb-2.1.diff 957
+RMD160 084089306a3aba3e32202e9e83b19272a124674b files/xbomb-2.1.diff 957
+SHA256 a321e797aee0ce72a7240d55db0baf42d3ec73f3281dc142d6f6d7a4aa606c9e files/xbomb-2.1.diff 957
+MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
+RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea metadata.xml 158
+SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 metadata.xml 158
+MD5 8522ec3145c95b0b09ca7628588a1f6a xbomb-2.1-r1.ebuild 1142
+RMD160 0784d6dc10a9c59154957d694a4900a0bdfcc6b2 xbomb-2.1-r1.ebuild 1142
+SHA256 3e855e566249b3718513c49a1cfd5ba48676487a57f1db22d9c5c2ca9e0f8a21 xbomb-2.1-r1.ebuild 1142
diff --git a/games-puzzle/xbomb/files/digest-xbomb-2.1-r1 b/games-puzzle/xbomb/files/digest-xbomb-2.1-r1
index 1d168b884505..7007a45e063f 100644
--- a/games-puzzle/xbomb/files/digest-xbomb-2.1-r1
+++ b/games-puzzle/xbomb/files/digest-xbomb-2.1-r1
@@ -1 +1,3 @@
 MD5 4c3284096bcfb00eee0fb3b096378b56 xbomb-2.1.tgz 23773
+RMD160 490123b344341acbc60cfd199afc00246f1baf27 xbomb-2.1.tgz 23773
+SHA256 3de4aae217dab15e51dbb94c954840342224f32532db4e9e7856dbf6fceeffe8 xbomb-2.1.tgz 23773
diff --git a/games-puzzle/xbomb/xbomb-2.1-r1.ebuild b/games-puzzle/xbomb/xbomb-2.1-r1.ebuild
index 9fef78c65543..cacc5def72af 100644
--- a/games-puzzle/xbomb/xbomb-2.1-r1.ebuild
+++ b/games-puzzle/xbomb/xbomb-2.1-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/games-puzzle/xbomb/xbomb-2.1-r1.ebuild,v 1.12 2005/10/31 08:46:44 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/xbomb/xbomb-2.1-r1.ebuild,v 1.13 2006/02/17 22:35:49 tupone Exp $
 
 inherit eutils games
 
@@ -13,7 +13,7 @@ SLOT="0"
 KEYWORDS="amd64 ia64 ppc ppc64 x86"
 IUSE=""
 
-DEPEND="virtual/x11"
+DEPEND="|| ( x11-libs/libXaw virtual/x11 )"
 
 src_unpack() {
 	unpack ${A}