Modular X dependency fix

Package-Manager: portage-2.1_pre4-r1

24 files changed, 181 insertions, 61 deletions

diff --git a/games-simulation/cannonsmash/ChangeLog b/games-simulation/cannonsmash/ChangeLog
index ed97a4ad10a2..900d7de91001 100644
--- a/games-simulation/cannonsmash/ChangeLog
+++ b/games-simulation/cannonsmash/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for games-simulation/cannonsmash
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-simulation/cannonsmash/ChangeLog,v 1.12 2005/09/06 13:00:18 wolf31o2 Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-simulation/cannonsmash/ChangeLog,v 1.13 2006/02/22 21:50:16 tupone Exp $
+
+  22 Feb 2006; <Tupone@gentoo.org> cannonsmash-0.6.6.ebuild:
+  Modular X dependency fix
 
   06 Sep 2005; Chris Gianelloni <wolf31o2@gentoo.org>
   cannonsmash-0.6.6.ebuild:
diff --git a/games-simulation/cannonsmash/Manifest b/games-simulation/cannonsmash/Manifest
index b1c29536df7f..001fc9149fcc 100644
--- a/games-simulation/cannonsmash/Manifest
+++ b/games-simulation/cannonsmash/Manifest
@@ -1,7 +1,21 @@
-MD5 4206a9ed5263bfec0491fa3596943664 cannonsmash-0.6.6.ebuild 1415
-MD5 b509442801291d060aac9a4c8ef5afcb ChangeLog 2167
-MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
-MD5 112758236b8f2e754e515d821380787e files/cannonsmash-0.6.6-sizeof-cast.patch 358
+MD5 448bdccdef56e130efdaa2f84c984197 ChangeLog 2256
+RMD160 619b8c08a51ac0edca9e312efa0000e855e927ca ChangeLog 2256
+SHA256 1c8b79baebf301720a13c8de53c1864e1f0740b3596c788ff6bd615773aa32dd ChangeLog 2256
+MD5 b15c318a75daf8745d0f7e07bd880f4b cannonsmash-0.6.6.ebuild 1449
+RMD160 9d920c8546d17c2b77eb9a9bcb84f96788a4e85a cannonsmash-0.6.6.ebuild 1449
+SHA256 412411a4ac26d865ef035db7d6bc6a9fb4cc0598941997a4ec8df37948a4dcc1 cannonsmash-0.6.6.ebuild 1449
 MD5 2ca70e3856451ca1226bb3461a653895 files/0.6.5-loadparts.patch 348
+RMD160 5716c46612ad18a253d17d511df1a3f335e87c91 files/0.6.5-loadparts.patch 348
+SHA256 7d409f3c9e9f0112fbacd39e2a161a256eef9766f312d47df1ad24cd06ee383e files/0.6.5-loadparts.patch 348
+MD5 112758236b8f2e754e515d821380787e files/cannonsmash-0.6.6-sizeof-cast.patch 358
+RMD160 e9d53d5d83ad316aacd1a826b229cd54d7824b45 files/cannonsmash-0.6.6-sizeof-cast.patch 358
+SHA256 a896a7f05317080500663aa49a6f61642c41e690b5889095f1f193a82cd4cbe6 files/cannonsmash-0.6.6-sizeof-cast.patch 358
 MD5 76dd644fdfc4521c420f0f63d3365f29 files/cannonsmash-0.6.6-x-inc.patch 305
-MD5 e82483f8829d68c4582a2b5ea52ba427 files/digest-cannonsmash-0.6.6 134
+RMD160 41d3ba81a7b74ddd493b1c0a7ca78931ac9ff897 files/cannonsmash-0.6.6-x-inc.patch 305
+SHA256 29a261f5a92764061870fcafc84d4517f6d80249453a4daa2cfdb898833a2b7b files/cannonsmash-0.6.6-x-inc.patch 305
+MD5 0e521c083005d08a3e859eb0586df568 files/digest-cannonsmash-0.6.6 494
+RMD160 59054f25d6cea4d9b62186cab4338cb6e03f1e15 files/digest-cannonsmash-0.6.6 494
+SHA256 b2e418ef9ca25533fffb48f696fa8b5e8f129f234b4ee52edb0cc22acd92187b files/digest-cannonsmash-0.6.6 494
+MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
+RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea metadata.xml 158
+SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 metadata.xml 158
diff --git a/games-simulation/cannonsmash/cannonsmash-0.6.6.ebuild b/games-simulation/cannonsmash/cannonsmash-0.6.6.ebuild
index a37ef3aacb8c..031d32b564ba 100644
--- a/games-simulation/cannonsmash/cannonsmash-0.6.6.ebuild
+++ b/games-simulation/cannonsmash/cannonsmash-0.6.6.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-simulation/cannonsmash/cannonsmash-0.6.6.ebuild,v 1.9 2005/09/06 13:00:18 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-simulation/cannonsmash/cannonsmash-0.6.6.ebuild,v 1.10 2006/02/22 21:50:16 tupone Exp $
 
 inherit eutils games
 
@@ -15,12 +15,13 @@ SLOT="0"
 KEYWORDS="amd64 ppc x86"
 IUSE="vorbis nls"
 
-DEPEND="virtual/x11
+DEPEND="|| ( x11-libs/libXmu virtual/x11 )
 	virtual/opengl
+	virtual/glu
 	>=media-libs/libsdl-1.2.4
 	>=media-libs/sdl-mixer-1.2.3
 	>=media-libs/sdl-image-1.2.2
-	=x11-libs/gtk+-1.2*"
+	=x11-libs/gtk+-2*"
 
 S=${WORKDIR}/csmash-${PV}
 
diff --git a/games-simulation/cannonsmash/files/digest-cannonsmash-0.6.6 b/games-simulation/cannonsmash/files/digest-cannonsmash-0.6.6
index 43c2257f9d53..4ec96530daff 100644
--- a/games-simulation/cannonsmash/files/digest-cannonsmash-0.6.6
+++ b/games-simulation/cannonsmash/files/digest-cannonsmash-0.6.6
@@ -1,2 +1,6 @@
 MD5 bcf2eddd0f04d58e5dac6d767f41d9af csmash-0.6.6.tar.gz 1989943
+RMD160 8378b7e95ab179f67ebb90423a7c2b45144e226b csmash-0.6.6.tar.gz 1989943
+SHA256 e603f6cbd73c9c46a83311d4d7c96470b67fd5353bd1a1076d73ceb31e60b6f0 csmash-0.6.6.tar.gz 1989943
 MD5 d574b304d427a9b3c6d775af95ecbe8d danslatristesse2-48.ogg 1070787
+RMD160 77782fd73b575f0b25b575c0f9c6baa4c9c21872 danslatristesse2-48.ogg 1070787
+SHA256 aab5b276bc55ecad65c4b2e17f11daa6d173fc077e982e42997f10695f070bfe danslatristesse2-48.ogg 1070787
diff --git a/games-simulation/corewars/ChangeLog b/games-simulation/corewars/ChangeLog
index 9846ae3180d2..4e133c532019 100644
--- a/games-simulation/corewars/ChangeLog
+++ b/games-simulation/corewars/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for games-simulation/corewars
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-simulation/corewars/ChangeLog,v 1.8 2005/10/13 20:33:49 mr_bones_ Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-simulation/corewars/ChangeLog,v 1.9 2006/02/22 21:53:28 tupone Exp $
+
+  22 Feb 2006; <Tupone@gentoo.org> corewars-0.9.13-r1.ebuild:
+  Modular X dependency fix
 
   13 Oct 2005; Michael Sterrett <mr_bones_@gentoo.org>
   -corewars-0.9.12.ebuild, -corewars-0.9.13.ebuild:
diff --git a/games-simulation/corewars/Manifest b/games-simulation/corewars/Manifest
index 0546a0f41965..49f87ae6d365 100644
--- a/games-simulation/corewars/Manifest
+++ b/games-simulation/corewars/Manifest
@@ -1,4 +1,12 @@
+MD5 40eb23ba42c5f48bd4249c07370f5ce1 ChangeLog 1582
+RMD160 adde71ee144ce7e233de031ab02b71db3c744c3a ChangeLog 1582
+SHA256 c6c39e84ea00adfb0cc83c401efd2af03a173dc13d0fc36a35817214472baee6 ChangeLog 1582
+MD5 36031fc7cdf32c791864aa1e68b36103 corewars-0.9.13-r1.ebuild 660
+RMD160 42e19b34d68407498c9b4dec032901bfa821c250 corewars-0.9.13-r1.ebuild 660
+SHA256 86ec470064190a6ef15903ed65ad2ca3728d5eeaef9dfef02a74dfe557fee857 corewars-0.9.13-r1.ebuild 660
+MD5 afb5943010ccae8a69fa352dccf47eb5 files/digest-corewars-0.9.13-r1 247
+RMD160 51b98f5208eee10be8ba18425d18cd82059a5d50 files/digest-corewars-0.9.13-r1 247
+SHA256 60a977d633232417d90e7a2376d08f150f40e4fb9d885f3736838fd2c2e58ea5 files/digest-corewars-0.9.13-r1 247
 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
-MD5 d1e5adfd45faa898f26b4563c47ae28c corewars-0.9.13-r1.ebuild 700
-MD5 4cf31e159f31713e3b42fa3430b37860 ChangeLog 1492
-MD5 9586d26f0c5617e0d69dc087ae1599fd files/digest-corewars-0.9.13-r1 67
+RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea metadata.xml 158
+SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 metadata.xml 158
diff --git a/games-simulation/corewars/corewars-0.9.13-r1.ebuild b/games-simulation/corewars/corewars-0.9.13-r1.ebuild
index e794925d4a63..2b3b7fa91ccc 100644
--- a/games-simulation/corewars/corewars-0.9.13-r1.ebuild
+++ b/games-simulation/corewars/corewars-0.9.13-r1.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-simulation/corewars/corewars-0.9.13-r1.ebuild,v 1.6 2005/10/13 20:32:35 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-simulation/corewars/corewars-0.9.13-r1.ebuild,v 1.7 2006/02/22 21:53:28 tupone Exp $
 
 inherit games
 
@@ -13,9 +13,7 @@ LICENSE="GPL-2"
 SLOT="0"
 IUSE=""
 
-DEPEND="virtual/x11
-	>=dev-libs/glib-1.2.10-r1
-	=x11-libs/gtk+-1.2*"
+DEPEND="=x11-libs/gtk+-1.2*"
 
 src_install() {
 	make DESTDIR="${D}" install || die "make install failed"
diff --git a/games-simulation/corewars/files/digest-corewars-0.9.13-r1 b/games-simulation/corewars/files/digest-corewars-0.9.13-r1
index 1445bc9bbd91..172fbec5a1a0 100644
--- a/games-simulation/corewars/files/digest-corewars-0.9.13-r1
+++ b/games-simulation/corewars/files/digest-corewars-0.9.13-r1
@@ -1 +1,3 @@
 MD5 0a0b8067533b83a96488109ee265f664 corewars-0.9.13.tar.gz 203874
+RMD160 bb40d2665fb7df4f2c5b787e72112144e51d2c67 corewars-0.9.13.tar.gz 203874
+SHA256 23957e620e3bbee265c3eb878752caf5d4186428e361af79a3373a698010f6e2 corewars-0.9.13.tar.gz 203874
diff --git a/games-simulation/gl117/ChangeLog b/games-simulation/gl117/ChangeLog
index 464c66eba8a0..9155472af101 100644
--- a/games-simulation/gl117/ChangeLog
+++ b/games-simulation/gl117/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for games-simulation/gl117
-# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-simulation/gl117/ChangeLog,v 1.16 2005/09/26 18:21:44 wolf31o2 Exp $
+# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-simulation/gl117/ChangeLog,v 1.17 2006/02/22 21:56:01 tupone Exp $
+
+  22 Feb 2006; <Tupone@gentoo.org> gl117-1.3.2.ebuild:
+  Modular X dependency fix
 
   26 Sep 2005; Chris Gianelloni <wolf31o2@gentoo.org> gl117-1.3.2.ebuild:
   Making games last on inherit line.
diff --git a/games-simulation/gl117/Manifest b/games-simulation/gl117/Manifest
index 0109e292f146..94ddaa134e33 100644
--- a/games-simulation/gl117/Manifest
+++ b/games-simulation/gl117/Manifest
@@ -1,5 +1,15 @@
-MD5 99f35f81c60a679795474b76906bcbc1 gl117-1.3.2.ebuild 726
-MD5 0d5f81a8c3ab597b69e63320f2212933 ChangeLog 2144
-MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
-MD5 bfe91e613f3235365f1d485993995f6a files/digest-gl117-1.3.2 70
+MD5 15c9d263f45287c13b962e1efb81daf9 ChangeLog 2227
+RMD160 feb66ad22bee29a620849431b6abe862ac89224a ChangeLog 2227
+SHA256 e952314e7489b1567057185b8f7ccf0d7fae5b9ddafc62f298b864ab88244bb0 ChangeLog 2227
 MD5 dbc181b31b75b84a681b2d278a214165 files/1.3-gcc-3.4-gentoo.patch 1388
+RMD160 7a3f2fc966b35200d810418e428c34358c6cadf0 files/1.3-gcc-3.4-gentoo.patch 1388
+SHA256 1a346860744772e17fc10469a5ad55a039acc1f7a784b9b9a234667c30e5bf31 files/1.3-gcc-3.4-gentoo.patch 1388
+MD5 901f14f2f2d29faf0388592eed3ccfe4 files/digest-gl117-1.3.2 256
+RMD160 ce5b39d07583cb6084ff38a702eb38d4a22fd8d0 files/digest-gl117-1.3.2 256
+SHA256 9aac78d2a21ec3a0e16433ddd295d76c4791b848eac62042669c3cd6a29b0650 files/digest-gl117-1.3.2 256
+MD5 2e60e508acd77796f592d77a9f475c20 gl117-1.3.2.ebuild 713
+RMD160 bd218deaa4bce18860b3b1d2019394ea0cab6e3b gl117-1.3.2.ebuild 713
+SHA256 44966f9674b66e4a6469ce41d0ca2008773bae5d4848f4dd23bd5451f7fedc13 gl117-1.3.2.ebuild 713
+MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
+RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea metadata.xml 158
+SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 metadata.xml 158
diff --git a/games-simulation/gl117/files/digest-gl117-1.3.2 b/games-simulation/gl117/files/digest-gl117-1.3.2
index 7c0959ae2de5..39a2cbc5bdc2 100644
--- a/games-simulation/gl117/files/digest-gl117-1.3.2
+++ b/games-simulation/gl117/files/digest-gl117-1.3.2
@@ -1 +1,3 @@
 MD5 aad53c5531943529fd769fae4efeae02 gl-117-1.3.2-src.tar.bz2 2411075
+RMD160 a2996d59663cff3ba478294a71bafa8974023d30 gl-117-1.3.2-src.tar.bz2 2411075
+SHA256 64bd0190a102725c76eba4983a5d79a0979ec42a087c56c8025b461f6e0e6ffb gl-117-1.3.2-src.tar.bz2 2411075
diff --git a/games-simulation/gl117/gl117-1.3.2.ebuild b/games-simulation/gl117/gl117-1.3.2.ebuild
index adaccfe29bb1..6680f460c7e4 100644
--- a/games-simulation/gl117/gl117-1.3.2.ebuild
+++ b/games-simulation/gl117/gl117-1.3.2.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-simulation/gl117/gl117-1.3.2.ebuild,v 1.3 2005/09/26 18:21:44 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-simulation/gl117/gl117-1.3.2.ebuild,v 1.4 2006/02/22 21:56:01 tupone Exp $
 
 inherit eutils games
 
@@ -14,8 +14,7 @@ SLOT="0"
 KEYWORDS="~amd64 ppc x86"
 IUSE=""
 
-DEPEND="virtual/x11
-	media-libs/libsdl
+DEPEND="media-libs/libsdl
 	media-libs/sdl-mixer
 	virtual/opengl
 	virtual/glu
diff --git a/games-simulation/lincity/ChangeLog b/games-simulation/lincity/ChangeLog
index c829ccf9a2ae..384826995c6a 100644
--- a/games-simulation/lincity/ChangeLog
+++ b/games-simulation/lincity/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for games-simulation/lincity
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-simulation/lincity/ChangeLog,v 1.13 2005/10/29 11:04:32 grobian Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-simulation/lincity/ChangeLog,v 1.14 2006/02/22 21:59:02 tupone Exp $
+
+  22 Feb 2006; <Tupone@gentoo.org> lincity-1.12.1.ebuild:
+  Modular X dependency fix
 
   29 Oct 2005; Fabian Groffen <grobian@gentoo.org> lincity-1.12.1.ebuild:
   Marked ~ppc-macos (bug #107879)
diff --git a/games-simulation/lincity/Manifest b/games-simulation/lincity/Manifest
index a6c7045535b4..105cb259ac43 100644
--- a/games-simulation/lincity/Manifest
+++ b/games-simulation/lincity/Manifest
@@ -1,4 +1,12 @@
-MD5 d11c1d9b0108b587ee0ff8ca79fe7b01 ChangeLog 2736
-MD5 7ffc7f05881d541ece45baecb576a2bc lincity-1.12.1.ebuild 1161
+MD5 e20e570bcd5ca9f2592617daec5f8fd1 ChangeLog 2822
+RMD160 1170130d423e0930e7cc0a78986f2aca88b05059 ChangeLog 2822
+SHA256 9693008544eb912fc3e7d7311efa50fe5764f4d3c1d7aa47d17ea58b692c85f4 ChangeLog 2822
+MD5 0d4a84e4e34d4c4fa07a8836a432e23d files/digest-lincity-1.12.1 244
+RMD160 69d4893cc6d8ef406e55a1c3f0c2a9ea23df3ce5 files/digest-lincity-1.12.1 244
+SHA256 250cc1d4f03d424040892b5b5a34aa4f543d47c2828a02fb92d56b76ac5f2671 files/digest-lincity-1.12.1 244
+MD5 4c9754e60643078f603953985e85cb18 lincity-1.12.1.ebuild 1287
+RMD160 a893d7159a97719fa29ec5e2ed1f4aab0e1b7797 lincity-1.12.1.ebuild 1287
+SHA256 ac1633693262d568d7f0b06b97ea20b25dac3389344726cbdf3d3c646cdb3990 lincity-1.12.1.ebuild 1287
 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
-MD5 f0ba06d7b7e0fea26804209c4efb2c7d files/digest-lincity-1.12.1 66
+RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea metadata.xml 158
+SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 metadata.xml 158
diff --git a/games-simulation/lincity/files/digest-lincity-1.12.1 b/games-simulation/lincity/files/digest-lincity-1.12.1
index dee11eecda96..393ccf101f29 100644
--- a/games-simulation/lincity/files/digest-lincity-1.12.1
+++ b/games-simulation/lincity/files/digest-lincity-1.12.1
@@ -1 +1,3 @@
 MD5 cda964325bc041993bbefba297faf42b lincity-1.12.1.tar.gz 795709
+RMD160 5b0a3bfa77372577ac3d9cc42e6a806f27a52ef3 lincity-1.12.1.tar.gz 795709
+SHA256 9223a724204e0755ed65d6ae202a5b1a876204cc835ab3e87230dc39f7b9b976 lincity-1.12.1.tar.gz 795709
diff --git a/games-simulation/lincity/lincity-1.12.1.ebuild b/games-simulation/lincity/lincity-1.12.1.ebuild
index c9615136f71f..ebc6894e80b6 100644
--- a/games-simulation/lincity/lincity-1.12.1.ebuild
+++ b/games-simulation/lincity/lincity-1.12.1.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-simulation/lincity/lincity-1.12.1.ebuild,v 1.4 2005/10/29 11:04:32 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-simulation/lincity/lincity-1.12.1.ebuild,v 1.5 2006/02/22 21:59:02 tupone Exp $
 
 inherit games
 
@@ -14,11 +14,27 @@ KEYWORDS="amd64 ppc ~ppc-macos ~sparc x86"
 IUSE="nls svga X"
 
 # dep fix (bug #82318)
-DEPEND="virtual/libc
+DEPEND="
 	nls? ( sys-devel/gettext )
 	svga? ( media-libs/svgalib )
-	X? ( virtual/x11 )
-	!X? ( !svga? ( virtual/x11 ) )"
+	X? (
+			|| (
+				(
+					x11-libs/libXext
+					x11-libs/libSM
+				)
+				virtual/x11
+			)
+		)
+	!svga? (
+			|| (
+				(
+					x11-libs/libXext
+					x11-libs/libSM
+				)
+				virtual/x11
+			)
+		)"
 
 src_compile() {
 	local myconf=
diff --git a/games-simulation/searchandrescue/ChangeLog b/games-simulation/searchandrescue/ChangeLog
index 3cebce1a5821..68becd2b7650 100644
--- a/games-simulation/searchandrescue/ChangeLog
+++ b/games-simulation/searchandrescue/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for games-simulation/searchandrescue
-# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-simulation/searchandrescue/ChangeLog,v 1.8 2005/10/13 20:35:37 mr_bones_ Exp $
+# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-simulation/searchandrescue/ChangeLog,v 1.9 2006/02/22 22:02:12 tupone Exp $
+
+  22 Feb 2006; <Tupone@gentoo.org> searchandrescue-0.8.2.ebuild:
+  Modular X dependency fix
 
   13 Oct 2005; Michael Sterrett <mr_bones_@gentoo.org>
   -searchandrescue-0.8.1.ebuild:
diff --git a/games-simulation/searchandrescue/Manifest b/games-simulation/searchandrescue/Manifest
index 8d3329efa441..b759bd12f7cd 100644
--- a/games-simulation/searchandrescue/Manifest
+++ b/games-simulation/searchandrescue/Manifest
@@ -1,5 +1,15 @@
-MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
-MD5 fef0a783445dc1777ae544a10291e35f searchandrescue-0.8.2.ebuild 1645
-MD5 c188dd0f51236ac6a4dbb51dbba7cff6 ChangeLog 1031
-MD5 70585567904bf3efb823e6310904356a files/digest-searchandrescue-0.8.2 154
+MD5 c196ba0341e3432d97664e7a54558e39 ChangeLog 1124
+RMD160 99be14a0c2bccb4263207d2ae3a79b88735e43a3 ChangeLog 1124
+SHA256 622ed3d7e4f90cdddf3413db5d8d22951add9d3305c4cd1b461f7ca6b4c4cc5e ChangeLog 1124
+MD5 4ff4ee620da1798d09f9290e211ad780 files/digest-searchandrescue-0.8.2 554
+RMD160 8c6a7dea21fbbc4653130e31e8b898649e38720e files/digest-searchandrescue-0.8.2 554
+SHA256 4a6f51def5fdfee9a0ff9776c6c5df3c3e0290154a77961382b8cc6bef10e8ff files/digest-searchandrescue-0.8.2 554
 MD5 08d186b8d3ec9636687f7453c0981c9b files/searchandrescue-0.8.2-gcc33.patch 883
+RMD160 cbfe9e3c4e794906cad26245ca5a307ef6b19166 files/searchandrescue-0.8.2-gcc33.patch 883
+SHA256 f0a91651eb634e71f302b6e706feffc02bd9fe31e159276d4fa339d7848c0991 files/searchandrescue-0.8.2-gcc33.patch 883
+MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
+RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea metadata.xml 158
+SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 metadata.xml 158
+MD5 3754edee5541a578e4e1ed70d005aa11 searchandrescue-0.8.2.ebuild 1860
+RMD160 7474972fb7cfcb832de086d2f7040b6aa6c7434e searchandrescue-0.8.2.ebuild 1860
+SHA256 9ca2c47cbfa7a1e96119b3117d478c2909843b0502bba5376d87ff3474bd06c9 searchandrescue-0.8.2.ebuild 1860
diff --git a/games-simulation/searchandrescue/files/digest-searchandrescue-0.8.2 b/games-simulation/searchandrescue/files/digest-searchandrescue-0.8.2
index e0234e832c19..a2a324ed546b 100644
--- a/games-simulation/searchandrescue/files/digest-searchandrescue-0.8.2
+++ b/games-simulation/searchandrescue/files/digest-searchandrescue-0.8.2
@@ -1,2 +1,6 @@
 MD5 f3304fe2e91f329b8494897c398f26f3 SearchAndRescue-0.8.2.tar.bz2 613500
+RMD160 dda13ebcc1a7c7085322b0ed664e6bc9f5d4a2df SearchAndRescue-0.8.2.tar.bz2 613500
+SHA256 6f0ca44497b5a8d7b0f563bf27f5669166d0338512f6246994e84165d153efb3 SearchAndRescue-0.8.2.tar.bz2 613500
 MD5 3ac0e91b0b3360c4be17fcb5564feca8 SearchAndRescue-data-0.8.2.tar.bz2 7232214
+RMD160 d4c0b04850b754f896601ac09ad6eb895f081fc5 SearchAndRescue-data-0.8.2.tar.bz2 7232214
+SHA256 808bbc351b76a2d1f4ed2ae0270426a966819b8278a200501071e2067467a873 SearchAndRescue-data-0.8.2.tar.bz2 7232214
diff --git a/games-simulation/searchandrescue/searchandrescue-0.8.2.ebuild b/games-simulation/searchandrescue/searchandrescue-0.8.2.ebuild
index 108d7f5d0439..c4ee95e3d019 100644
--- a/games-simulation/searchandrescue/searchandrescue-0.8.2.ebuild
+++ b/games-simulation/searchandrescue/searchandrescue-0.8.2.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-simulation/searchandrescue/searchandrescue-0.8.2.ebuild,v 1.2 2005/09/26 18:22:41 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-simulation/searchandrescue/searchandrescue-0.8.2.ebuild,v 1.3 2006/02/22 22:02:12 tupone Exp $
 
 inherit eutils games
 
@@ -15,10 +15,27 @@ SLOT="0"
 KEYWORDS="ppc x86"
 IUSE="joystick"
 
-DEPEND="virtual/x11
+RDEPEND="|| (
+		(
+			x11-libs/libXxf86vm
+			x11-libs/libXmu
+			x11-libs/libXi
+			x11-libs/libXpm
+		)
+		virtual/x11
+	)
 	virtual/opengl
+	virtual/glu
 	media-libs/yiff
 	joystick? ( media-libs/libjsw )"
+DEPEND="${RDEPEND}
+	|| (
+		(
+			x11-proto/xextproto
+			x11-proto/xf86vidmodeproto
+		)
+		virtual/x11
+	)"
 
 S=${WORKDIR}/${MY_PN}-${PV}
 
diff --git a/games-simulation/senken/ChangeLog b/games-simulation/senken/ChangeLog
index 86e694e9b9d5..83832125c887 100644
--- a/games-simulation/senken/ChangeLog
+++ b/games-simulation/senken/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for games-simulation/senken
-# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-simulation/senken/ChangeLog,v 1.7 2005/05/09 14:02:11 dholm Exp $
+# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-simulation/senken/ChangeLog,v 1.8 2006/02/22 22:04:37 tupone Exp $
+
+  22 Feb 2006; <Tupone@gentoo.org> senken-0.3.0.ebuild:
+  Modular X dependency fix
 
   09 May 2005; David Holm <dholm@gentoo.org> senken-0.3.0.ebuild:
   Added to ~ppc.
diff --git a/games-simulation/senken/Manifest b/games-simulation/senken/Manifest
index 6c70cbe5819d..eb1edf2bfa7b 100644
--- a/games-simulation/senken/Manifest
+++ b/games-simulation/senken/Manifest
@@ -1,4 +1,12 @@
-MD5 72efb521fa53349d4e050d2a3894cfdf ChangeLog 938
+MD5 029775b3ca362204b6b9303eb244d33f ChangeLog 1022
+RMD160 3f119aa0d69fe6045dc7cf48909f7b5e5addd7ee ChangeLog 1022
+SHA256 c0c94b18eefbf47c15ae1050dd673e7e04fa68f7b7ce157a976e8d8b9ab9a337 ChangeLog 1022
+MD5 7dcf9dc22b5c459fc337887a34f8fd00 files/digest-senken-0.3.0 241
+RMD160 a6a379af52061f46523fced2342cabd7728bdabc files/digest-senken-0.3.0 241
+SHA256 f9ce69845dd874c371a5748a7e30a2367f4fc752cd87e031a11bc8b8d4937ded files/digest-senken-0.3.0 241
 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
-MD5 4134b683f3088ea39a3fcfbc0e6b364e senken-0.3.0.ebuild 1325
-MD5 f1875c2364dcc366833c7c888405013a files/digest-senken-0.3.0 65
+RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea metadata.xml 158
+SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 metadata.xml 158
+MD5 c7fc8ab71919152ce50ad8fa4d9f5977 senken-0.3.0.ebuild 1273
+RMD160 fb45bb6ef3fa5ae68d05b1e141cbc28ecc720e1f senken-0.3.0.ebuild 1273
+SHA256 8d2e3a289e303acb2744ba3e9f3514179af14e876fe23ff95ad1b4c499953f8f senken-0.3.0.ebuild 1273
diff --git a/games-simulation/senken/files/digest-senken-0.3.0 b/games-simulation/senken/files/digest-senken-0.3.0
index 958742ea534d..29d67df2369e 100644
--- a/games-simulation/senken/files/digest-senken-0.3.0
+++ b/games-simulation/senken/files/digest-senken-0.3.0
@@ -1 +1,3 @@
 MD5 464f03baddad251f999174a274f0f422 senken-0.3.0.tar.gz 1391010
+RMD160 1a9bdbc16342ac550c613393f3571b05da219dea senken-0.3.0.tar.gz 1391010
+SHA256 2b0c6c0f08a9dcc1c15d2c94f7c5f494953cb83bc387749fe46c1dc6fb7cb880 senken-0.3.0.tar.gz 1391010
diff --git a/games-simulation/senken/senken-0.3.0.ebuild b/games-simulation/senken/senken-0.3.0.ebuild
index c7d25bb2dccb..cbab2bace711 100644
--- a/games-simulation/senken/senken-0.3.0.ebuild
+++ b/games-simulation/senken/senken-0.3.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-simulation/senken/senken-0.3.0.ebuild,v 1.5 2005/05/09 14:02:11 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-simulation/senken/senken-0.3.0.ebuild,v 1.6 2006/02/22 22:04:37 tupone Exp $
 
 inherit games
 
@@ -13,12 +13,9 @@ SLOT="0"
 KEYWORDS="x86 ~amd64 ~ppc"
 IUSE="nls"
 
-RDEPEND="virtual/x11
-	>=x11-libs/gtk+-2
+DEPEND=">=x11-libs/gtk+-2
 	>=media-libs/libsdl-1.2.4
 	media-libs/sdl-image"
-DEPEND="${RDEPEND}
-	>=sys-apps/sed-4"
 
 src_unpack() {
 	unpack ${A}