Modular X dependency fix

(Portage version: 2.1_pre4-r1)

8 files changed, 61 insertions, 19 deletions

diff --git a/games-strategy/glest/ChangeLog b/games-strategy/glest/ChangeLog
index 6f16986d76b0..b9000154d03b 100644
--- a/games-strategy/glest/ChangeLog
+++ b/games-strategy/glest/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for games-strategy/glest
-# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/glest/ChangeLog,v 1.7 2005/11/09 02:51:37 mr_bones_ Exp $
+# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/glest/ChangeLog,v 1.8 2006/02/23 22:36:20 tupone Exp $
+
+  23 Feb 2006; <Tupone@gentoo.org> glest-1.2.1.2.ebuild:
+  Modular X dependency fix
 
 *glest-1.2.1.2 (09 Nov 2005)
 
diff --git a/games-strategy/glest/Manifest b/games-strategy/glest/Manifest
index b1b6c8892d4a..58d009cc8aa2 100644
--- a/games-strategy/glest/Manifest
+++ b/games-strategy/glest/Manifest
@@ -1,5 +1,15 @@
-MD5 9851b926b3d0cf2e8392244cf74df154 ChangeLog 1403
-MD5 fece815f8c0a8e8641301a3ee504a8ae files/digest-glest-1.2.1.2 312
+MD5 fb80ba6305a3cf66d0ec73544c5999a0 ChangeLog 1488
+RMD160 4874e4d11ce379a283d4b268fa6e0bb60eeb21cf ChangeLog 1488
+SHA256 9385852346828e7a7cd67fe9f05705206e9674bdd51af891273f27ac497ce72e ChangeLog 1488
+MD5 a90d37d537ff1698ca05a8a87558fea1 files/digest-glest-1.2.1.2 1166
+RMD160 1e3b045af5753dc6d9e746385f9a0307aba29527 files/digest-glest-1.2.1.2 1166
+SHA256 7b437fa6d51ed9d17e12e78c0051f2084fdda347f7a76fbbc651e88abed29ef2 files/digest-glest-1.2.1.2 1166
 MD5 34b0cb001c745a9991f7168d297c0e45 files/glest 488
-MD5 842b20ea2ea3654138f6cdc9a0dfab45 glest-1.2.1.2.ebuild 2649
+RMD160 de9a33270c461bbefc46c88a4541dc06ece04790 files/glest 488
+SHA256 ff98e0cc1f7a8975d46dca982cfb67d1057f491c8268bf78545b9a278c659420 files/glest 488
+MD5 d7334bdaf4f7b151bcfafd0822a9bc83 glest-1.2.1.2.ebuild 2720
+RMD160 1f5e0485ffb86569e5d9792d1ac8ef0d7f7a06ab glest-1.2.1.2.ebuild 2720
+SHA256 797b7fb7474eb7f8fdb9a3be15488d86ec69865935c798d194a57bcdbcabd5d2 glest-1.2.1.2.ebuild 2720
 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
+RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea metadata.xml 158
+SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 metadata.xml 158
diff --git a/games-strategy/glest/files/digest-glest-1.2.1.2 b/games-strategy/glest/files/digest-glest-1.2.1.2
index f3db7910b90d..207a9e4d8f9e 100644
--- a/games-strategy/glest/files/digest-glest-1.2.1.2
+++ b/games-strategy/glest/files/digest-glest-1.2.1.2
@@ -1,5 +1,15 @@
-MD5 7a8f3fe40bb6591b81fe6bc175f3bde3 glest_source_1.2.1.2.zip 491053
-MD5 8594fa6d77685ec09d50174ded722f71 glest_data_1.2.1.zip 50989648
 MD5 a1b0063b7ecc7ed14689c63c31b34cf3 cesky_1.2.1.zip 1843
+RMD160 845fb0feee86330aaa4db7025936d3b4c158ccec cesky_1.2.1.zip 1843
+SHA256 ca95140d89b613111628d1b1ff435b0baae5d2a22f0187c601f093fb98a1acdc cesky_1.2.1.zip 1843
+MD5 8594fa6d77685ec09d50174ded722f71 glest_data_1.2.1.zip 50989648
+RMD160 88b698c7db6ca1b5d397a5685f3ebbe2712aa3b0 glest_data_1.2.1.zip 50989648
+SHA256 fac6280d4ac7a718b1acb419d72323b5ef9f949989b62fbb56f439f5451cebae glest_data_1.2.1.zip 50989648
+MD5 7a8f3fe40bb6591b81fe6bc175f3bde3 glest_source_1.2.1.2.zip 491053
+RMD160 fafbfaa42cc8f07e76cc5e438aac695b4fe78870 glest_source_1.2.1.2.zip 491053
+SHA256 462961ab562ac54e6b4535cd01f12d80ebbb83e15c883d7c9d09d456d3bdd1c0 glest_source_1.2.1.2.zip 491053
 MD5 01cc8f8b53cb77e37de4abbb056a47f1 hebrew_1.2.1.zip 1742
+RMD160 cd11f5ec27d35ccbf212bc4cd04d69f933bbcacf hebrew_1.2.1.zip 1742
+SHA256 1f8a9dfb52d2c36b2b7c02387e0f4e8945f2f9677211c278daf600b6c48bdd95 hebrew_1.2.1.zip 1742
 MD5 66453e0227aaab6e73a526688481363e slovak_1.2.1.zip 1688
+RMD160 be75f0bcd7931a93d17aa066442b5d7b33083467 slovak_1.2.1.zip 1688
+SHA256 eac9d779340cc0ac9b483c124fa00f4c8862fe2c48bf556f53db7f4eb607f401 slovak_1.2.1.zip 1688
diff --git a/games-strategy/glest/glest-1.2.1.2.ebuild b/games-strategy/glest/glest-1.2.1.2.ebuild
index 4b8532931e76..42ebf8472230 100644
--- a/games-strategy/glest/glest-1.2.1.2.ebuild
+++ b/games-strategy/glest/glest-1.2.1.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-strategy/glest/glest-1.2.1.2.ebuild,v 1.1 2005/11/09 02:51:37 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/glest/glest-1.2.1.2.ebuild,v 1.2 2006/02/23 22:36:20 tupone Exp $
 
 inherit eutils games
 
@@ -26,9 +26,11 @@ RDEPEND=">=media-libs/libsdl-1.2.5
 	>=media-libs/openal-20040303
 	dev-libs/xerces-c
 	virtual/opengl
-	virtual/x11"
+	virtual/glu
+	|| ( x11-libs/libX11 virtual/x11 )"
 DEPEND="${RDEPEND}
 	app-arch/unzip
+	|| ( x11-libs/libXt virtual/x11 )
 	>=sys-devel/gcc-3.2
 	>=dev-util/jam-2.5"
 
diff --git a/games-strategy/xconq/ChangeLog b/games-strategy/xconq/ChangeLog
index 38c13a558c57..5d4e920ecca3 100644
--- a/games-strategy/xconq/ChangeLog
+++ b/games-strategy/xconq/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for games-strategy/xconq
-# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/xconq/ChangeLog,v 1.5 2005/05/01 17:02:56 hansmi Exp $
+# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/xconq/ChangeLog,v 1.6 2006/02/23 22:38:52 tupone Exp $
+
+  23 Feb 2006; <Tupone@gentoo.org> xconq-7.4.1.ebuild:
+  Modular X dependency fix
 
   01 May 2005; Michael Hanselmann <hansmi@gentoo.org> xconq-7.4.1.ebuild:
   Stable on ppc.
diff --git a/games-strategy/xconq/Manifest b/games-strategy/xconq/Manifest
index 5929eabee22b..fe03e12c372a 100644
--- a/games-strategy/xconq/Manifest
+++ b/games-strategy/xconq/Manifest
@@ -1,5 +1,15 @@
-MD5 5f7a93735004fa2be6c81b87469cb62d xconq-7.4.1.ebuild 973
-MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
-MD5 899eeb97cd4ba04797b361e8aa0a8a77 ChangeLog 686
+MD5 893a5327bff0b3688ca547460263c761 ChangeLog 769
+RMD160 31f25ab9b2e34f0045508254601d40967647fba7 ChangeLog 769
+SHA256 56fae52b3425cd4b58c3afc4cdfcf5abaf64d9c182651798abb64f189a73dd76 ChangeLog 769
+MD5 028c52409e7a9e083023f419f65a76f6 files/digest-xconq-7.4.1 238
+RMD160 21997ae1f3f6e282e82ee04912546332a40f0a6e files/digest-xconq-7.4.1 238
+SHA256 1b7c045dc114e710dd70938c1d4a4b85a169538297cd267878b98f2a4da96916 files/digest-xconq-7.4.1 238
 MD5 678926da0bc080c8b9c755516e553ddb files/xconq-gcc-3.4.patch 223
-MD5 11e6b9f0b9deabfd09b8d9282236896a files/digest-xconq-7.4.1 64
+RMD160 286b8a0f3604eff1030234d35ca4c14a835e96fc files/xconq-gcc-3.4.patch 223
+SHA256 59e72407bef819ccabd9b1b0c175b8105a40521c3a8e33f370a63002074e695b files/xconq-gcc-3.4.patch 223
+MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
+RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea metadata.xml 158
+SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 metadata.xml 158
+MD5 f16583cfd29c9790c3bc78592830e701 xconq-7.4.1.ebuild 1053
+RMD160 0cfd85bbbd900303d447df8d47e889c3e9150661 xconq-7.4.1.ebuild 1053
+SHA256 75b0f8e045b92d05246cd301b39df26dcae9c26d1b93202e3ed3d59685e3b559 xconq-7.4.1.ebuild 1053
diff --git a/games-strategy/xconq/files/digest-xconq-7.4.1 b/games-strategy/xconq/files/digest-xconq-7.4.1
index de1288573b4e..1c6c62e8f14b 100644
--- a/games-strategy/xconq/files/digest-xconq-7.4.1
+++ b/games-strategy/xconq/files/digest-xconq-7.4.1
@@ -1 +1,3 @@
 MD5 c266e182c8f3454730ec4314e5d7b8aa xconq-7.4.1.tar.gz 3402832
+RMD160 e596eaccb6a48709e9ceb58fc59e715e36dbf43a xconq-7.4.1.tar.gz 3402832
+SHA256 50d0d11887374a9351ec1235f6b93b1e9060fd852ca99a6700c76098e585f3ce xconq-7.4.1.tar.gz 3402832
diff --git a/games-strategy/xconq/xconq-7.4.1.ebuild b/games-strategy/xconq/xconq-7.4.1.ebuild
index 01f899b95ff6..e940f4d4d6f9 100644
--- a/games-strategy/xconq/xconq-7.4.1.ebuild
+++ b/games-strategy/xconq/xconq-7.4.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-strategy/xconq/xconq-7.4.1.ebuild,v 1.7 2005/05/01 17:02:56 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/xconq/xconq-7.4.1.ebuild,v 1.8 2006/02/23 22:38:52 tupone Exp $
 
 inherit eutils games
 
@@ -13,9 +13,11 @@ SLOT="0"
 KEYWORDS="x86 ppc"
 IUSE=""
 
-DEPEND="virtual/x11
+RDEPEND="|| ( x11-libs/libXmu virtual/x11 )
 	dev-lang/tk
 	dev-lang/tcl"
+DEPEND="${RDEPEND}
+	|| ( x11-libs/libXaw virtual/x11 )"
 
 src_unpack() {
 	unpack ${A}