Fix this category's dependencies to work with modular X.

(Portage version: 2.1_pre4)

9 files changed, 51 insertions, 23 deletions

diff --git a/games-sports/billardgl/ChangeLog b/games-sports/billardgl/ChangeLog
index ec35ff20b2e0..a3f61e14d3d4 100644
--- a/games-sports/billardgl/ChangeLog
+++ b/games-sports/billardgl/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-sports/billardgl
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-sports/billardgl/ChangeLog,v 1.6 2004/12/28 23:37:05 ciaranm Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-sports/billardgl/ChangeLog,v 1.7 2006/01/29 08:04:42 joshuabaergen Exp $
+
+  29 Jan 2006; Joshua Baergen <joshuabaergen@gentoo.org>
+  billardgl-1.75-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-sports/billardgl/billardgl-1.75-r1.ebuild b/games-sports/billardgl/billardgl-1.75-r1.ebuild
index 4148cfee4050..534ce1e78e3d 100644
--- a/games-sports/billardgl/billardgl-1.75-r1.ebuild
+++ b/games-sports/billardgl/billardgl-1.75-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-sports/billardgl/billardgl-1.75-r1.ebuild,v 1.4 2004/06/24 23:24:08 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-sports/billardgl/billardgl-1.75-r1.ebuild,v 1.5 2006/01/29 08:04:42 joshuabaergen Exp $
 
 inherit games
 
@@ -13,7 +13,9 @@ KEYWORDS="amd64 x86 ppc"
 SLOT="0"
 IUSE=""
 
-RDEPEND="virtual/x11
+RDEPEND="|| ( ( x11-libs/libXi
+				x11-libs/libXmu )
+			virtual/x11 )
 	virtual/opengl
 	virtual/glu
 	virtual/glut"
diff --git a/games-sports/foobillard/ChangeLog b/games-sports/foobillard/ChangeLog
index e4c750b32806..8f843d718d4c 100644
--- a/games-sports/foobillard/ChangeLog
+++ b/games-sports/foobillard/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-sports/foobillard
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-sports/foobillard/ChangeLog,v 1.9 2004/12/28 23:37:49 ciaranm Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-sports/foobillard/ChangeLog,v 1.10 2006/01/29 08:04:42 joshuabaergen Exp $
+
+  29 Jan 2006; Joshua Baergen <joshuabaergen@gentoo.org>
+  foobillard-3.0a.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-sports/foobillard/foobillard-3.0a.ebuild b/games-sports/foobillard/foobillard-3.0a.ebuild
index 7b345174fe99..69b160722da6 100644
--- a/games-sports/foobillard/foobillard-3.0a.ebuild
+++ b/games-sports/foobillard/foobillard-3.0a.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-sports/foobillard/foobillard-3.0a.ebuild,v 1.6 2005/01/05 02:48:21 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-sports/foobillard/foobillard-3.0a.ebuild,v 1.7 2006/01/29 08:04:42 joshuabaergen Exp $
 
 inherit eutils games
 
@@ -13,7 +13,10 @@ SLOT="0"
 KEYWORDS="amd64 ppc x86"
 IUSE="sdl"
 
-DEPEND="virtual/x11
+DEPEND="|| ( ( x11-libs/libXaw
+				x11-libs/libXi )
+			virtual/x11
+		)
 	virtual/opengl
 	>=media-libs/freetype-2.0.9
 	>=media-libs/libpng-1.2.1
diff --git a/games-sports/gracer/ChangeLog b/games-sports/gracer/ChangeLog
index f78a6f71db07..8a5596fbccf6 100644
--- a/games-sports/gracer/ChangeLog
+++ b/games-sports/gracer/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-sports/gracer
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-sports/gracer/ChangeLog,v 1.12 2006/01/11 21:42:40 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-sports/gracer/ChangeLog,v 1.13 2006/01/29 08:04:42 joshuabaergen Exp $
+
+  29 Jan 2006; Joshua Baergen <joshuabaergen@gentoo.org>
+  gracer-0.1.5.ebuild:
+  Add modular X dependencies.
 
   11 Jan 2006; Michael Sterrett <mr_bones_@gentoo.org> gracer-0.1.5.ebuild:
   tidy
diff --git a/games-sports/gracer/gracer-0.1.5.ebuild b/games-sports/gracer/gracer-0.1.5.ebuild
index 3b35df956121..ead165b877bc 100644
--- a/games-sports/gracer/gracer-0.1.5.ebuild
+++ b/games-sports/gracer/gracer-0.1.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-sports/gracer/gracer-0.1.5.ebuild,v 1.12 2006/01/11 21:42:40 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-sports/gracer/gracer-0.1.5.ebuild,v 1.13 2006/01/29 08:04:42 joshuabaergen Exp $
 
 inherit gnuconfig eutils games
 
@@ -13,7 +13,9 @@ SLOT="0"
 KEYWORDS="~amd64 ppc sparc x86"
 IUSE="gif jpeg png joystick"
 
-DEPEND="virtual/x11
+DEPEND="|| ( ( x11-libs/libXi
+				x11-libs/libXmu )
+			virtual/x11 )
 	virtual/glu
 	virtual/glut
 	virtual/opengl
@@ -26,9 +28,8 @@ DEPEND="virtual/x11
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
-	epatch \
-		"${FILESDIR}"/${PV}-gldefs.patch
-		"${FILESDIR}"/${PN}-gcc-3.4.patch
+	epatch "${FILESDIR}"/${PV}-gldefs.patch
+	epatch "${FILESDIR}"/${PN}-gcc-3.4.patch
 }
 
 src_compile() {
diff --git a/games-sports/trigger/ChangeLog b/games-sports/trigger/ChangeLog
index e51ebd27d433..98eace4aa784 100644
--- a/games-sports/trigger/ChangeLog
+++ b/games-sports/trigger/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-sports/trigger
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-sports/trigger/ChangeLog,v 1.8 2006/01/14 22:18:45 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-sports/trigger/ChangeLog,v 1.9 2006/01/29 08:04:42 joshuabaergen Exp $
+
+  29 Jan 2006; Joshua Baergen <joshuabaergen@gentoo.org>
+  trigger-0.5.1c.ebuild, trigger-0.5.2.ebuild:
+  Add modular X dependencies.
 
 *trigger-0.5.2 (14 Jan 2006)
 
diff --git a/games-sports/trigger/trigger-0.5.1c.ebuild b/games-sports/trigger/trigger-0.5.1c.ebuild
index 17905f84fc6f..5c17060033ff 100644
--- a/games-sports/trigger/trigger-0.5.1c.ebuild
+++ b/games-sports/trigger/trigger-0.5.1c.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-sports/trigger/trigger-0.5.1c.ebuild,v 1.3 2005/07/30 05:48:28 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-sports/trigger/trigger-0.5.1c.ebuild,v 1.4 2006/01/29 08:04:42 joshuabaergen Exp $
 
 inherit eutils games
 
@@ -16,13 +16,20 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc x86"
 IUSE=""
 
-RDEPEND="virtual/x11
-	virtual/opengl
+RDEPEND="virtual/opengl
+	|| (
+		( x11-libs/libX11 )
+		virtual/x11 )
 	>=media-libs/libsdl-1.2.5
 	>=media-libs/sdl-image-1.2
 	media-libs/openal
 	dev-games/physfs"
 DEPEND="${RDEPEND}
+	|| (
+		( x11-libs/libXt
+			x11-proto/xproto )
+		virtual/x11
+	)
 	dev-util/jam"
 
 S=${WORKDIR}/${PSOURCE}
diff --git a/games-sports/trigger/trigger-0.5.2.ebuild b/games-sports/trigger/trigger-0.5.2.ebuild
index 9b8b9450be03..27eb55e54bf8 100644
--- a/games-sports/trigger/trigger-0.5.2.ebuild
+++ b/games-sports/trigger/trigger-0.5.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-sports/trigger/trigger-0.5.2.ebuild,v 1.1 2006/01/14 22:18:45 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-sports/trigger/trigger-0.5.2.ebuild,v 1.2 2006/01/29 08:04:42 joshuabaergen Exp $
 
 inherit eutils games
 
@@ -18,7 +18,6 @@ RDEPEND="virtual/opengl
 	|| (
 		( x11-libs/libX11 )
 		virtual/x11 )
-	virtual/opengl
 	>=media-libs/libsdl-1.2.5
 	>=media-libs/sdl-image-1.2
 	media-libs/sdl-mixer