Fix category's dependencies for modular X.

Package-Manager: portage-2.1_pre4-r1

9 files changed, 49 insertions, 23 deletions

diff --git a/games-misc/gnurobots/ChangeLog b/games-misc/gnurobots/ChangeLog
index f356f7384eaa..048c9c4c42a6 100644
--- a/games-misc/gnurobots/ChangeLog
+++ b/games-misc/gnurobots/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-misc/gnurobots
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-misc/gnurobots/ChangeLog,v 1.6 2005/08/24 02:58:23 hparker Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-misc/gnurobots/ChangeLog,v 1.7 2006/01/29 22:17:24 joshuabaergen Exp $
+
+  29 Jan 2006; Joshua Baergen <joshuabaergen@gentoo.org>
+  gnurobots-1.0d.ebuild:
+  Add modular X dependencies.
 
   24 Aug 2005; Homer Parker <hparker@gentoo.org> gnurobots-1.0d.ebuild:
   Marked ~amd64.
diff --git a/games-misc/gnurobots/gnurobots-1.0d.ebuild b/games-misc/gnurobots/gnurobots-1.0d.ebuild
index 94ea938aef7a..d6ea1408c2b5 100644
--- a/games-misc/gnurobots/gnurobots-1.0d.ebuild
+++ b/games-misc/gnurobots/gnurobots-1.0d.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-misc/gnurobots/gnurobots-1.0d.ebuild,v 1.6 2005/08/24 02:58:23 hparker Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-misc/gnurobots/gnurobots-1.0d.ebuild,v 1.7 2006/01/29 22:17:24 joshuabaergen Exp $
 
 inherit games
 
@@ -16,7 +16,7 @@ IUSE="X"
 
 S=${WORKDIR}/${MY_P}
 
-DEPEND="X? ( virtual/x11 )
+DEPEND="X? ( || ( x11-libs/libXpm virtual/x11 ) )
 	dev-util/guile"
 
 src_compile() {
diff --git a/games-misc/xcruiser/ChangeLog b/games-misc/xcruiser/ChangeLog
index 6b6d395ab192..d6fef039df24 100644
--- a/games-misc/xcruiser/ChangeLog
+++ b/games-misc/xcruiser/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-misc/xcruiser
-# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-misc/xcruiser/ChangeLog,v 1.2 2005/06/15 18:46:31 wolf31o2 Exp $
+# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-misc/xcruiser/ChangeLog,v 1.3 2006/01/29 22:17:24 joshuabaergen Exp $
+
+  29 Jan 2006; Joshua Baergen <joshuabaergen@gentoo.org>
+  xcruiser-0.30.ebuild:
+  Add modular X dependencies.
 
   15 Jun 2005; Chris Gianelloni <wolf31o2@gentoo.org> xcruiser-0.30.ebuild:
   Removed INSTALL file.
diff --git a/games-misc/xcruiser/xcruiser-0.30.ebuild b/games-misc/xcruiser/xcruiser-0.30.ebuild
index 3535dc6f55a9..2e7ee7b36ce8 100644
--- a/games-misc/xcruiser/xcruiser-0.30.ebuild
+++ b/games-misc/xcruiser/xcruiser-0.30.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-misc/xcruiser/xcruiser-0.30.ebuild,v 1.2 2005/06/15 18:46:31 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-misc/xcruiser/xcruiser-0.30.ebuild,v 1.3 2006/01/29 22:17:24 joshuabaergen Exp $
 
 DESCRIPTION="Fly about 3D-formed file system"
 HOMEPAGE="http://xcruiser.sourceforge.net/"
@@ -11,7 +11,14 @@ SLOT="0"
 KEYWORDS="amd64 ppc x86"
 IUSE=""
 
-DEPEND="virtual/x11"
+RDEPEND="|| ( ( x11-libs/libXaw
+				x11-libs/libXp )
+			virtual/x11 )"
+DEPEND="${RDEPEND}
+	|| ( ( app-text/rman
+			x11-misc/gccmakedep
+			x11-misc/imake )
+		virtual/x11 )"
 
 src_compile() {
 	xmkmf -a
diff --git a/games-misc/xpenguins/ChangeLog b/games-misc/xpenguins/ChangeLog
index f5de74f21f1d..1700174f3be8 100644
--- a/games-misc/xpenguins/ChangeLog
+++ b/games-misc/xpenguins/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-misc/xpenguins
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-misc/xpenguins/ChangeLog,v 1.6 2004/12/28 23:06:52 ciaranm Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-misc/xpenguins/ChangeLog,v 1.7 2006/01/29 22:17:24 joshuabaergen Exp $
+
+  29 Jan 2006; Joshua Baergen <joshuabaergen@gentoo.org>
+  xpenguins-2.2.ebuild, xpenguins-2.2-r1.ebuild:
+  Add modular X dependencies.
 
   28 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
   Change encoding to UTF-8 for GLEP 31 compliance
diff --git a/games-misc/xpenguins/xpenguins-2.2-r1.ebuild b/games-misc/xpenguins/xpenguins-2.2-r1.ebuild
index 3591e18b7c75..1d6802ae08cf 100644
--- a/games-misc/xpenguins/xpenguins-2.2-r1.ebuild
+++ b/games-misc/xpenguins/xpenguins-2.2-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-misc/xpenguins/xpenguins-2.2-r1.ebuild,v 1.2 2004/06/24 22:59:01 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-misc/xpenguins/xpenguins-2.2-r1.ebuild,v 1.3 2006/01/29 22:17:24 joshuabaergen Exp $
 
 inherit games
 
@@ -15,7 +15,9 @@ SLOT="0"
 KEYWORDS="x86 ppc sparc alpha amd64"
 IUSE=""
 
-DEPEND="virtual/x11"
+RDEPEND="|| ( x11-libs/libXpm virtual/x11 )"
+DEPEND="${RDEPEND}
+	|| ( x11-proto/xextproto virtual/x11 )"
 
 src_compile() {
 	egamesconf --with-x || die
diff --git a/games-misc/xpenguins/xpenguins-2.2.ebuild b/games-misc/xpenguins/xpenguins-2.2.ebuild
index 51db2e8c3b9e..83b350bd2e30 100644
--- a/games-misc/xpenguins/xpenguins-2.2.ebuild
+++ b/games-misc/xpenguins/xpenguins-2.2.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-misc/xpenguins/xpenguins-2.2.ebuild,v 1.5 2004/06/24 22:59:01 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-misc/xpenguins/xpenguins-2.2.ebuild,v 1.6 2006/01/29 22:17:24 joshuabaergen Exp $
 
 inherit games
 
@@ -13,7 +13,9 @@ SLOT="0"
 KEYWORDS="x86 ppc sparc alpha amd64"
 IUSE=""
 
-DEPEND="virtual/x11"
+RDEPEND="|| ( x11-libs/libXpm virtual/x11 )"
+DEPEND="${RDEPEND}
+	|| ( x11-proto/xextproto virtual/x11 )"
 
 src_compile() {
 	egamesconf --with-x || die
diff --git a/games-misc/yadex/ChangeLog b/games-misc/yadex/ChangeLog
index 2ed988795801..7eb0a78d8161 100644
--- a/games-misc/yadex/ChangeLog
+++ b/games-misc/yadex/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for games-misc/yadex
-# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-misc/yadex/ChangeLog,v 1.3 2005/06/10 14:09:18 dholm Exp $
+# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-misc/yadex/ChangeLog,v 1.4 2006/01/29 22:17:24 joshuabaergen Exp $
+
+  29 Jan 2006; Joshua Baergen <joshuabaergen@gentoo.org> yadex-1.7.0.ebuild:
+  Add modular X dependencies.
 
   10 Jun 2005; David Holm <dholm@gentoo.org> yadex-1.7.0.ebuild:
   Added to ~ppc.
diff --git a/games-misc/yadex/yadex-1.7.0.ebuild b/games-misc/yadex/yadex-1.7.0.ebuild
index 4226e1477fd4..8b980c9af3e8 100644
--- a/games-misc/yadex/yadex-1.7.0.ebuild
+++ b/games-misc/yadex/yadex-1.7.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-misc/yadex/yadex-1.7.0.ebuild,v 1.4 2005/06/10 14:09:18 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-misc/yadex/yadex-1.7.0.ebuild,v 1.5 2006/01/29 22:17:24 joshuabaergen Exp $
 
 inherit games
 
@@ -13,7 +13,7 @@ SLOT="0"
 KEYWORDS="~ppc x86"
 IUSE=""
 
-DEPEND="virtual/x11"
+DEPEND="|| ( x11-libs/libX11 virtual/x11 )"
 
 src_unpack() {
 	unpack ${A}