Modular X dependency fix

(Portage version: 2.1_pre4-r1)

8 files changed, 63 insertions, 20 deletions

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=