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

Package-Manager: portage-2.1_pre4

35 files changed, 190 insertions, 97 deletions

diff --git a/games-arcade/defendguin/ChangeLog b/games-arcade/defendguin/ChangeLog
index 467c68d6c6ef..61230ce3f9c3 100644
--- a/games-arcade/defendguin/ChangeLog
+++ b/games-arcade/defendguin/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-arcade/defendguin
-# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-arcade/defendguin/ChangeLog,v 1.5 2005/10/30 02:22:55 weeve Exp $
+# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-arcade/defendguin/ChangeLog,v 1.6 2006/01/29 00:00:27 joshuabaergen Exp $
+
+  28 Jan 2006; Joshua Baergen <joshuabaergen@gentoo.org>
+  defendguin-0.0.10.ebuild:
+  Remove x11 dependencies as this package does not directly depend on X.
 
   30 Oct 2005; Jason Wever <weeve@gentoo.org> defendguin-0.0.10.ebuild:
   Added ~sparc keyword.
diff --git a/games-arcade/defendguin/defendguin-0.0.10.ebuild b/games-arcade/defendguin/defendguin-0.0.10.ebuild
index e32bf61c59a8..e42149bb8fb6 100644
--- a/games-arcade/defendguin/defendguin-0.0.10.ebuild
+++ b/games-arcade/defendguin/defendguin-0.0.10.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-arcade/defendguin/defendguin-0.0.10.ebuild,v 1.5 2005/10/30 02:22:55 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-arcade/defendguin/defendguin-0.0.10.ebuild,v 1.6 2006/01/29 00:00:27 joshuabaergen Exp $
 
 inherit eutils games
 DESCRIPTION="A clone of the arcade game Defender, but with a Linux theme"
@@ -12,8 +12,7 @@ SLOT="0"
 KEYWORDS="~amd64 ppc ~sparc x86"
 IUSE=""
 
-DEPEND="virtual/x11
-	media-libs/sdl-mixer
+DEPEND="media-libs/sdl-mixer
 	media-libs/libsdl"
 
 src_unpack() {
diff --git a/games-arcade/emergence-bin/ChangeLog b/games-arcade/emergence-bin/ChangeLog
index 564da87facd2..d604a245455c 100644
--- a/games-arcade/emergence-bin/ChangeLog
+++ b/games-arcade/emergence-bin/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-arcade/emergence-bin
-# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-arcade/emergence-bin/ChangeLog,v 1.4 2005/01/31 03:50:39 mr_bones_ Exp $
+# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-arcade/emergence-bin/ChangeLog,v 1.5 2006/01/29 00:00:27 joshuabaergen Exp $
+
+  28 Jan 2006; Joshua Baergen <joshuabaergen@gentoo.org>
+  emergence-bin-0.9.ebuild:
+  Add modular X dependencies.
 
   30 Jan 2005; Michael Sterrett <mr_bones_@gentoo.org>
   -emergence-bin-0.7.ebuild, -emergence-bin-0.8.ebuild:
diff --git a/games-arcade/emergence-bin/emergence-bin-0.9.ebuild b/games-arcade/emergence-bin/emergence-bin-0.9.ebuild
index 3ab96c03f229..f698ab8e35b2 100644
--- a/games-arcade/emergence-bin/emergence-bin-0.9.ebuild
+++ b/games-arcade/emergence-bin/emergence-bin-0.9.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-arcade/emergence-bin/emergence-bin-0.9.ebuild,v 1.2 2005/01/31 03:50:39 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-arcade/emergence-bin/emergence-bin-0.9.ebuild,v 1.3 2006/01/29 00:00:27 joshuabaergen Exp $
 
 inherit games
 
@@ -19,7 +19,7 @@ RDEPEND=">=sys-libs/zlib-1.2.1
 	>=media-libs/libpng-1.2.5
 	>=media-libs/libvorbis-1.0
 	>=media-libs/alsa-lib-1.0.2
-	virtual/x11"
+	|| ( x11-libs/libXrandr virtual/x11 )"
 
 S="${WORKDIR}/${MY_P}"
 
diff --git a/games-arcade/epiar/ChangeLog b/games-arcade/epiar/ChangeLog
index 23cee73eaf93..7a1ce6110cf9 100644
--- a/games-arcade/epiar/ChangeLog
+++ b/games-arcade/epiar/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for games-arcade/epiar
-# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-arcade/epiar/ChangeLog,v 1.7 2005/09/16 22:06:09 ciaranm Exp $
+# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-arcade/epiar/ChangeLog,v 1.8 2006/01/29 00:00:27 joshuabaergen Exp $
+
+  28 Jan 2006; Joshua Baergen <joshuabaergen@gentoo.org> epiar-0.5.ebuild:
+  Add modular X dependencies.
 
   16 Sep 2005; Ciaran McCreesh <ciaranm@gentoo.org> ChangeLog:
   Converted to UTF-8, fixed encoding screwups
diff --git a/games-arcade/epiar/epiar-0.5.ebuild b/games-arcade/epiar/epiar-0.5.ebuild
index 12bf59fc250d..1d649b3ef644 100644
--- a/games-arcade/epiar/epiar-0.5.ebuild
+++ b/games-arcade/epiar/epiar-0.5.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-arcade/epiar/epiar-0.5.ebuild,v 1.8 2006/01/13 21:08:27 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-arcade/epiar/epiar-0.5.ebuild,v 1.9 2006/01/29 00:00:27 joshuabaergen Exp $
 
 inherit flag-o-matic eutils games
 
@@ -13,10 +13,11 @@ SLOT="0"
 KEYWORDS="~ppc ~x86"
 IUSE=""
 
-RDEPEND="virtual/x11
-	media-libs/libsdl
+RDEPEND="media-libs/libsdl
 	media-libs/sdl-image"
 DEPEND="${RDEPEND}
+	|| ( x11-libs/libX11 virtual/x11 )
+	virtual/opengl
 	app-arch/unzip"
 
 S=${WORKDIR}
diff --git a/games-arcade/monster-masher/ChangeLog b/games-arcade/monster-masher/ChangeLog
index 11015122cd27..8a49adaeed53 100644
--- a/games-arcade/monster-masher/ChangeLog
+++ b/games-arcade/monster-masher/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-arcade/monster-masher
-# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-arcade/monster-masher/ChangeLog,v 1.12 2005/11/08 05:53:20 mr_bones_ Exp $
+# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-arcade/monster-masher/ChangeLog,v 1.13 2006/01/29 00:00:27 joshuabaergen Exp $
+
+  28 Jan 2006; Joshua Baergen <joshuabaergen@gentoo.org>
+  monster-masher-1.7.ebuild, monster-masher-1.8.ebuild:
+  Add modular X dependencies.
 
 *monster-masher-1.8 (08 Nov 2005)
 
diff --git a/games-arcade/monster-masher/monster-masher-1.7.ebuild b/games-arcade/monster-masher/monster-masher-1.7.ebuild
index b4c80a46afdd..970e2e0245ee 100644
--- a/games-arcade/monster-masher/monster-masher-1.7.ebuild
+++ b/games-arcade/monster-masher/monster-masher-1.7.ebuild
@@ -1,6 +1,8 @@
-# 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-arcade/monster-masher/monster-masher-1.7.ebuild,v 1.4 2005/08/24 05:46:36 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-arcade/monster-masher/monster-masher-1.7.ebuild,v 1.5 2006/01/29 00:00:27 joshuabaergen Exp $
+
+inherit eutils
 
 DESCRIPTION="Squash the monsters with your levitation worker gnome"
 HOMEPAGE="http://www.cs.auc.dk/~olau/monster-masher/"
@@ -11,12 +13,20 @@ SLOT="0"
 KEYWORDS="~ppc x86"
 IUSE=""
 
-DEPEND="virtual/x11
+DEPEND="|| ( x11-libs/libSM virtual/x11 )
 	=dev-cpp/gtkmm-2.4*
 	=dev-cpp/libgnomemm-2.6*
 	=dev-cpp/libgnomeuimm-2.6*
 	=dev-cpp/gconfmm-2.6*
-	=dev-cpp/libglademm-2.4*"
+	=dev-cpp/libglademm-2.4*
+	gnome-base/libgnome"
+
+pkg_setup() {
+	if ! built_with_use gnome-base/libgnome esd
+	then
+		die "You need to compile gnome-base/libgnome with esd USE flag!"
+	fi
+}
 
 src_install() {
 	make DESTDIR="${D}" install || die "make install failed"
diff --git a/games-arcade/monster-masher/monster-masher-1.8.ebuild b/games-arcade/monster-masher/monster-masher-1.8.ebuild
index 17d8ebc0e5ae..c3d69723270a 100644
--- a/games-arcade/monster-masher/monster-masher-1.8.ebuild
+++ b/games-arcade/monster-masher/monster-masher-1.8.ebuild
@@ -1,6 +1,8 @@
-# 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-arcade/monster-masher/monster-masher-1.8.ebuild,v 1.1 2005/11/08 05:53:20 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-arcade/monster-masher/monster-masher-1.8.ebuild,v 1.2 2006/01/29 00:00:27 joshuabaergen Exp $
+
+inherit eutils
 
 DESCRIPTION="Squash the monsters with your levitation worker gnome"
 HOMEPAGE="http://www.cs.auc.dk/~olau/monster-masher/"
@@ -11,11 +13,19 @@ SLOT="0"
 KEYWORDS="~ppc ~x86"
 IUSE=""
 
-DEPEND="virtual/x11
+DEPEND="|| ( x11-libs/libSM virtual/x11 )
 	=dev-cpp/gtkmm-2.6*
 	=dev-cpp/gconfmm-2.6*
 	=dev-cpp/libglademm-2.4*
-	=dev-cpp/libgnomecanvasmm-2.6*"
+	=dev-cpp/libgnomecanvasmm-2.6*
+	gnome-base/libgnome"
+
+pkg_setup() {
+	if ! built_with_use gnome-base/libgnome esd
+	then
+		die "You need to compile gnome-base/libgnome with esd USE flag!"
+	fi
+}
 
 src_install() {
 	make DESTDIR="${D}" install || die "make install failed"
diff --git a/games-arcade/mtp-target-bin/ChangeLog b/games-arcade/mtp-target-bin/ChangeLog
index 4d1b6b2a5322..a2832292a87d 100644
--- a/games-arcade/mtp-target-bin/ChangeLog
+++ b/games-arcade/mtp-target-bin/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-arcade/mtp-target-bin
-# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-arcade/mtp-target-bin/ChangeLog,v 1.9 2005/09/16 22:07:38 ciaranm Exp $
+# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-arcade/mtp-target-bin/ChangeLog,v 1.10 2006/01/29 00:00:27 joshuabaergen Exp $
+
+  28 Jan 2006; Joshua Baergen <joshuabaergen@gentoo.org>
+  mtp-target-bin-1.2.0.ebuild:
+  Add modular X dependencies.
 
   16 Sep 2005; Ciaran McCreesh <ciaranm@gentoo.org> ChangeLog:
   Converted to UTF-8, fixed encoding screwups
diff --git a/games-arcade/mtp-target-bin/mtp-target-bin-1.2.0.ebuild b/games-arcade/mtp-target-bin/mtp-target-bin-1.2.0.ebuild
index 4cce66377798..5cbd61358134 100644
--- a/games-arcade/mtp-target-bin/mtp-target-bin-1.2.0.ebuild
+++ b/games-arcade/mtp-target-bin/mtp-target-bin-1.2.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-arcade/mtp-target-bin/mtp-target-bin-1.2.0.ebuild,v 1.4 2005/08/23 19:21:28 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-arcade/mtp-target-bin/mtp-target-bin-1.2.0.ebuild,v 1.5 2006/01/29 00:00:27 joshuabaergen Exp $
 
 inherit games
 
@@ -18,7 +18,7 @@ DEPEND=""
 RDEPEND="dev-libs/STLport
 	sys-libs/zlib
 	dev-libs/libxml2
-	virtual/x11
+	|| ( x11-libs/libXmu virtual/x11 )
 	virtual/opengl
 	=media-libs/freetype-2*
 	media-libs/jpeg
diff --git a/games-arcade/openmortal/ChangeLog b/games-arcade/openmortal/ChangeLog
index 993517a9f3cb..393d770bb20b 100644
--- a/games-arcade/openmortal/ChangeLog
+++ b/games-arcade/openmortal/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-arcade/openmortal
-# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-arcade/openmortal/ChangeLog,v 1.12 2005/09/16 22:08:51 ciaranm Exp $
+# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-arcade/openmortal/ChangeLog,v 1.13 2006/01/29 00:00:27 joshuabaergen Exp $
+
+  28 Jan 2006; Joshua Baergen <joshuabaergen@gentoo.org>
+  openmortal-0.7.ebuild:
+  Remove x11 dependencies as this package does not directly depend on X.
 
   16 Sep 2005; Ciaran McCreesh <ciaranm@gentoo.org> ChangeLog:
   Converted to UTF-8, fixed encoding screwups
diff --git a/games-arcade/openmortal/openmortal-0.7.ebuild b/games-arcade/openmortal/openmortal-0.7.ebuild
index 276452ea6a2d..b81b50f999a9 100644
--- a/games-arcade/openmortal/openmortal-0.7.ebuild
+++ b/games-arcade/openmortal/openmortal-0.7.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-arcade/openmortal/openmortal-0.7.ebuild,v 1.4 2005/05/31 22:41:26 cryos Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-arcade/openmortal/openmortal-0.7.ebuild,v 1.5 2006/01/29 00:00:27 joshuabaergen Exp $
 
 inherit games
 
@@ -13,8 +13,7 @@ SLOT="0"
 KEYWORDS="amd64 ppc x86"
 IUSE=""
 
-DEPEND="virtual/x11
-	media-libs/libsdl
+DEPEND="media-libs/libsdl
 	media-libs/sdl-image
 	media-libs/sdl-mixer
 	media-libs/sdl-ttf
diff --git a/games-arcade/pacmanarena/ChangeLog b/games-arcade/pacmanarena/ChangeLog
index b01faba55826..39189a8b65eb 100644
--- a/games-arcade/pacmanarena/ChangeLog
+++ b/games-arcade/pacmanarena/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-arcade/pacmanarena
-# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-arcade/pacmanarena/ChangeLog,v 1.9 2005/09/11 02:52:59 agriffis Exp $
+# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-arcade/pacmanarena/ChangeLog,v 1.10 2006/01/29 00:00:27 joshuabaergen Exp $
+
+  28 Jan 2006; Joshua Baergen <joshuabaergen@gentoo.org>
+  pacmanarena-0.15.ebuild:
+  Add modular X dependencies.
 
   10 Sep 2005; Aron Griffis <agriffis@gentoo.org> pacmanarena-0.15.ebuild:
   Mark 0.15 stable on alpha
diff --git a/games-arcade/pacmanarena/pacmanarena-0.15.ebuild b/games-arcade/pacmanarena/pacmanarena-0.15.ebuild
index 470cb0b6e9cf..08cfe0d3a452 100644
--- a/games-arcade/pacmanarena/pacmanarena-0.15.ebuild
+++ b/games-arcade/pacmanarena/pacmanarena-0.15.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-arcade/pacmanarena/pacmanarena-0.15.ebuild,v 1.10 2005/09/16 01:11:23 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-arcade/pacmanarena/pacmanarena-0.15.ebuild,v 1.11 2006/01/29 00:00:27 joshuabaergen Exp $
 
 inherit games
 
@@ -14,12 +14,12 @@ SLOT="0"
 KEYWORDS="alpha amd64 x86"
 IUSE="vorbis"
 
-RDEPEND="virtual/x11
-	virtual/opengl
+RDEPEND="virtual/opengl
 	>=media-libs/sdl-mixer-1.2.4
 	>=media-libs/sdl-net-1.2.4
 	vorbis? ( media-libs/libvorbis )"
 DEPEND="${RDEPEND}
+	|| ( x11-libs/libXt virtual/x11 )
 	app-arch/unzip"
 
 S=${WORKDIR}/pacman
diff --git a/games-arcade/rocksndiamonds/ChangeLog b/games-arcade/rocksndiamonds/ChangeLog
index 94eb70851599..75b0db02a940 100644
--- a/games-arcade/rocksndiamonds/ChangeLog
+++ b/games-arcade/rocksndiamonds/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for games-arcade/rocksndiamonds
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-arcade/rocksndiamonds/ChangeLog,v 1.18 2006/01/12 18:16:34 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-arcade/rocksndiamonds/ChangeLog,v 1.19 2006/01/29 00:00:27 joshuabaergen Exp $
+
+  28 Jan 2006; Joshua Baergen <joshuabaergen@gentoo.org>
+  rocksndiamonds-3.1.0.ebuild, rocksndiamonds-3.1.1.ebuild,
+  rocksndiamonds-3.1.2.ebuild:
+  Add modular X dependencies.
 
 *rocksndiamonds-3.1.2 (12 Jan 2006)
 
diff --git a/games-arcade/rocksndiamonds/rocksndiamonds-3.1.0.ebuild b/games-arcade/rocksndiamonds/rocksndiamonds-3.1.0.ebuild
index 1c81bd949a6c..e9552dfdd388 100644
--- a/games-arcade/rocksndiamonds/rocksndiamonds-3.1.0.ebuild
+++ b/games-arcade/rocksndiamonds/rocksndiamonds-3.1.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-arcade/rocksndiamonds/rocksndiamonds-3.1.0.ebuild,v 1.4 2005/04/27 21:38:54 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-arcade/rocksndiamonds/rocksndiamonds-3.1.0.ebuild,v 1.5 2006/01/29 00:00:27 joshuabaergen Exp $
 
 inherit flag-o-matic games
 
@@ -21,8 +21,8 @@ IUSE="X sdl"
 
 RDEPEND="virtual/libc
 	app-arch/unzip
-	X? ( virtual/x11 )
-	!sdl? ( virtual/x11 )
+	X? ( || ( x11-libs/libX11 virtual/x11 ) )
+	!sdl? ( || ( x11-libs/libX11 virtual/x11 ) )
 	sdl? ( >=media-libs/libsdl-1.2.3
 		>=media-libs/sdl-mixer-1.2.4
 		media-libs/sdl-net
diff --git a/games-arcade/rocksndiamonds/rocksndiamonds-3.1.1.ebuild b/games-arcade/rocksndiamonds/rocksndiamonds-3.1.1.ebuild
index e5deefa75ae1..ae907e3f14dc 100644
--- a/games-arcade/rocksndiamonds/rocksndiamonds-3.1.1.ebuild
+++ b/games-arcade/rocksndiamonds/rocksndiamonds-3.1.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-arcade/rocksndiamonds/rocksndiamonds-3.1.1.ebuild,v 1.2 2005/09/22 23:45:23 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-arcade/rocksndiamonds/rocksndiamonds-3.1.1.ebuild,v 1.3 2006/01/29 00:00:27 joshuabaergen Exp $
 
 inherit flag-o-matic eutils games
 
@@ -21,8 +21,8 @@ KEYWORDS="amd64 ppc x86"
 IUSE="X sdl"
 
 DEPEND="app-arch/unzip
-	X? ( virtual/x11 )
-	!sdl? ( virtual/x11 )
+	X? ( || ( x11-libs/libX11 virtual/x11 ) )
+	!sdl? ( || ( x11-libs/libX11 virtual/x11 ) )
 	sdl? ( >=media-libs/libsdl-1.2.3
 		>=media-libs/sdl-mixer-1.2.4
 		media-libs/sdl-net
diff --git a/games-arcade/rocksndiamonds/rocksndiamonds-3.1.2.ebuild b/games-arcade/rocksndiamonds/rocksndiamonds-3.1.2.ebuild
index 8c32cbc65e8e..02e9e33c7457 100644
--- a/games-arcade/rocksndiamonds/rocksndiamonds-3.1.2.ebuild
+++ b/games-arcade/rocksndiamonds/rocksndiamonds-3.1.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-arcade/rocksndiamonds/rocksndiamonds-3.1.2.ebuild,v 1.1 2006/01/12 18:16:34 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-arcade/rocksndiamonds/rocksndiamonds-3.1.2.ebuild,v 1.2 2006/01/29 00:00:27 joshuabaergen Exp $
 
 inherit flag-o-matic eutils games
 
@@ -22,8 +22,8 @@ KEYWORDS="amd64 ppc x86"
 IUSE="X sdl"
 
 DEPEND="app-arch/unzip
-	X? ( virtual/x11 )
-	!sdl? ( virtual/x11 )
+	X? ( || ( x11-libs/libX11 virtual/x11 ) )
+	!sdl? ( || ( x11-libs/libX11 virtual/x11 ) )
 	sdl? ( >=media-libs/libsdl-1.2.3
 		>=media-libs/sdl-mixer-1.2.4
 		media-libs/sdl-net
diff --git a/games-arcade/spout/ChangeLog b/games-arcade/spout/ChangeLog
index c45a7f9a734c..602162c605dd 100644
--- a/games-arcade/spout/ChangeLog
+++ b/games-arcade/spout/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for games-arcade/spout
-# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-arcade/spout/ChangeLog,v 1.5 2005/04/02 07:11:23 mr_bones_ Exp $
+# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-arcade/spout/ChangeLog,v 1.6 2006/01/29 00:00:27 joshuabaergen Exp $
+
+  28 Jan 2006; Joshua Baergen <joshuabaergen@gentoo.org> spout-1.3.ebuild:
+  Remove x11 dependencies as this package does not directly depend on X.
 
   02 Apr 2005; Michael Sterrett <mr_bones_@gentoo.org> -spout-1.2.ebuild,
   spout-1.3.ebuild:
diff --git a/games-arcade/spout/spout-1.3.ebuild b/games-arcade/spout/spout-1.3.ebuild
index a660ce039255..880c85e04685 100644
--- a/games-arcade/spout/spout-1.3.ebuild
+++ b/games-arcade/spout/spout-1.3.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-arcade/spout/spout-1.3.ebuild,v 1.3 2005/04/02 07:11:23 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-arcade/spout/spout-1.3.ebuild,v 1.4 2006/01/29 00:00:27 joshuabaergen Exp $
 
 inherit eutils games
 
@@ -14,8 +14,7 @@ SLOT="0"
 KEYWORDS="ppc x86"
 IUSE=""
 
-DEPEND="virtual/x11
-	>=media-libs/libsdl-1.2.6"
+DEPEND=">=media-libs/libsdl-1.2.6"
 
 S=${WORKDIR}/${MY_P}
 
diff --git a/games-arcade/tuxracer-demo/ChangeLog b/games-arcade/tuxracer-demo/ChangeLog
index bef5f892b6b4..fc2337b73520 100644
--- a/games-arcade/tuxracer-demo/ChangeLog
+++ b/games-arcade/tuxracer-demo/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-arcade/tuxracer-demo
-# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-arcade/tuxracer-demo/ChangeLog,v 1.4 2005/09/26 17:38:43 wolf31o2 Exp $
+# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-arcade/tuxracer-demo/ChangeLog,v 1.5 2006/01/29 00:00:27 joshuabaergen Exp $
+
+  28 Jan 2006; Joshua Baergen <joshuabaergen@gentoo.org>
+  tuxracer-demo-1.1.ebuild:
+  Add modular X dependencies.
 
   26 Sep 2005; Chris Gianelloni <wolf31o2@gentoo.org>
   tuxracer-demo-1.1.ebuild:
diff --git a/games-arcade/tuxracer-demo/tuxracer-demo-1.1.ebuild b/games-arcade/tuxracer-demo/tuxracer-demo-1.1.ebuild
index 6adbd3e3c6c9..bbb169781557 100644
--- a/games-arcade/tuxracer-demo/tuxracer-demo-1.1.ebuild
+++ b/games-arcade/tuxracer-demo/tuxracer-demo-1.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-arcade/tuxracer-demo/tuxracer-demo-1.1.ebuild,v 1.7 2005/09/26 17:38:43 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-arcade/tuxracer-demo/tuxracer-demo-1.1.ebuild,v 1.8 2006/01/29 00:00:27 joshuabaergen Exp $
 
 inherit eutils games
 
@@ -16,7 +16,9 @@ IUSE=""
 
 DEPEND="virtual/opengl
 	virtual/glu
-	virtual/x11"
+	|| ( ( x11-libs/libXi
+			x11-libs/libXmu )
+		virtual/x11 )"
 
 S=${WORKDIR}
 
diff --git a/games-arcade/xboing/ChangeLog b/games-arcade/xboing/ChangeLog
index e6bf40372a17..0230867830cd 100644
--- a/games-arcade/xboing/ChangeLog
+++ b/games-arcade/xboing/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-arcade/xboing
-# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-arcade/xboing/ChangeLog,v 1.7 2005/09/26 17:39:14 wolf31o2 Exp $
+# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-arcade/xboing/ChangeLog,v 1.8 2006/01/29 00:00:27 joshuabaergen Exp $
+
+  28 Jan 2006; Joshua Baergen <joshuabaergen@gentoo.org>
+  xboing-2.4-r1.ebuild:
+  Add modular X dependencies.
 
   26 Sep 2005; Chris Gianelloni <wolf31o2@gentoo.org> xboing-2.4-r1.ebuild:
   Making games last on inherit line.
diff --git a/games-arcade/xboing/xboing-2.4-r1.ebuild b/games-arcade/xboing/xboing-2.4-r1.ebuild
index 6dfafe0d78c5..5f88d5923bc9 100644
--- a/games-arcade/xboing/xboing-2.4-r1.ebuild
+++ b/games-arcade/xboing/xboing-2.4-r1.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-arcade/xboing/xboing-2.4-r1.ebuild,v 1.8 2005/09/26 17:39:14 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-arcade/xboing/xboing-2.4-r1.ebuild,v 1.9 2006/01/29 00:00:27 joshuabaergen Exp $
 
 inherit eutils games
 
@@ -14,7 +14,12 @@ SLOT="0"
 KEYWORDS="ppc sparc x86"
 IUSE=""
 
-DEPEND="virtual/x11"
+RDEPEND="|| ( x11-libs/libXpm virtual/x11 )"
+DEPEND="${RDEPEND}
+	|| ( ( app-text/rman
+			x11-misc/gccmakedep
+			x11-misc/imake )
+		virtual/x11 )"
 
 S=${WORKDIR}/${PN}
 
diff --git a/games-arcade/xbubble/ChangeLog b/games-arcade/xbubble/ChangeLog
index f18cdd9c97d1..841ff98b2998 100644
--- a/games-arcade/xbubble/ChangeLog
+++ b/games-arcade/xbubble/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-arcade/xbubble
-# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-arcade/xbubble/ChangeLog,v 1.5 2005/09/26 17:39:55 wolf31o2 Exp $
+# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-arcade/xbubble/ChangeLog,v 1.6 2006/01/29 00:00:28 joshuabaergen Exp $
+
+  28 Jan 2006; Joshua Baergen <joshuabaergen@gentoo.org>
+  xbubble-0.5.8.ebuild:
+  Add modular X dependencies.
 
   26 Sep 2005; Chris Gianelloni <wolf31o2@gentoo.org> xbubble-0.5.8.ebuild:
   Making games last on inherit line.
diff --git a/games-arcade/xbubble/xbubble-0.5.8.ebuild b/games-arcade/xbubble/xbubble-0.5.8.ebuild
index c10eff5e4d6f..0809600bf684 100644
--- a/games-arcade/xbubble/xbubble-0.5.8.ebuild
+++ b/games-arcade/xbubble/xbubble-0.5.8.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-arcade/xbubble/xbubble-0.5.8.ebuild,v 1.7 2005/09/26 17:39:55 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-arcade/xbubble/xbubble-0.5.8.ebuild,v 1.8 2006/01/29 00:00:28 joshuabaergen Exp $
 
 inherit eutils games
 
@@ -13,8 +13,10 @@ SLOT="0"
 KEYWORDS="amd64 ppc x86"
 IUSE="nls"
 
-DEPEND="virtual/x11
+RDEPEND="|| ( x11-libs/libX11 virtual/x11 )
 	media-libs/libpng"
+DEPEND="${RDEPEND}
+	|| ( x11-libs/libXt virtual/x11 )"
 
 src_unpack() {
 	unpack ${A}
diff --git a/games-arcade/xevil/ChangeLog b/games-arcade/xevil/ChangeLog
index 8b83b0fe2e84..cdd340cb5c21 100644
--- a/games-arcade/xevil/ChangeLog
+++ b/games-arcade/xevil/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-arcade/xevil
-# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-arcade/xevil/ChangeLog,v 1.7 2005/09/26 17:37:31 wolf31o2 Exp $
+# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-arcade/xevil/ChangeLog,v 1.8 2006/01/29 00:00:28 joshuabaergen Exp $
+
+  28 Jan 2006; Joshua Baergen <joshuabaergen@gentoo.org>
+  xevil-2.02_p2.ebuild:
+  Add modular X dependencies.
 
   26 Sep 2005; Chris Gianelloni <wolf31o2@gentoo.org> xevil-2.02_p2.ebuild:
   Making games last on inherit line.
diff --git a/games-arcade/xevil/xevil-2.02_p2.ebuild b/games-arcade/xevil/xevil-2.02_p2.ebuild
index 9210a60c18a5..98951ca30154 100644
--- a/games-arcade/xevil/xevil-2.02_p2.ebuild
+++ b/games-arcade/xevil/xevil-2.02_p2.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-arcade/xevil/xevil-2.02_p2.ebuild,v 1.10 2005/09/26 17:37:31 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-arcade/xevil/xevil-2.02_p2.ebuild,v 1.11 2006/01/29 00:00:28 joshuabaergen Exp $
 
 inherit eutils games
 
@@ -16,7 +16,7 @@ SLOT="0"
 KEYWORDS="x86 ppc"
 IUSE=""
 
-RDEPEND="virtual/x11"
+RDEPEND="|| ( x11-libs/libXpm virtual/x11 )"
 DEPEND="${RDEPEND}
 	app-arch/unzip"
 
diff --git a/games-arcade/xkobo/ChangeLog b/games-arcade/xkobo/ChangeLog
index f8674135b075..6d93794e6b97 100644
--- a/games-arcade/xkobo/ChangeLog
+++ b/games-arcade/xkobo/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for games-arcade/xkobo
-# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-arcade/xkobo/ChangeLog,v 1.4 2004/06/24 22:14:30 agriffis Exp $
+# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-arcade/xkobo/ChangeLog,v 1.5 2006/01/29 00:00:28 joshuabaergen Exp $
+
+  28 Jan 2006; Joshua Baergen <joshuabaergen@gentoo.org> xkobo-1.11.ebuild:
+  Add modular X dependencies.
 
   21 Apr 2004; Michael Sterrett <mr_bones_@gentoo.org> xkobo-1.11.ebuild:
   keyword for amd64 (bug #48647)
diff --git a/games-arcade/xkobo/xkobo-1.11.ebuild b/games-arcade/xkobo/xkobo-1.11.ebuild
index 1638de8099ff..5656d43b80b0 100644
--- a/games-arcade/xkobo/xkobo-1.11.ebuild
+++ b/games-arcade/xkobo/xkobo-1.11.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-arcade/xkobo/xkobo-1.11.ebuild,v 1.7 2004/07/01 03:08:07 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-arcade/xkobo/xkobo-1.11.ebuild,v 1.8 2006/01/29 00:00:28 joshuabaergen Exp $
 
 inherit games
 
@@ -16,8 +16,11 @@ KEYWORDS="x86 ppc amd64"
 IUSE=""
 
 RDEPEND="virtual/libc
-	virtual/x11"
+	|| ( x11-libs/libXext virtual/x11 )"
 DEPEND="${RDEPEND}
+	|| ( ( x11-misc/gccmakedep
+			x11-misc/imake )
+		virtual/x11 )
 	>=sys-apps/sed-4"
 
 src_unpack() {
diff --git a/games-arcade/xscavenger/ChangeLog b/games-arcade/xscavenger/ChangeLog
index dfff995c94de..260e16c88a7d 100644
--- a/games-arcade/xscavenger/ChangeLog
+++ b/games-arcade/xscavenger/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-arcade/xscavenger
-# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-arcade/xscavenger/ChangeLog,v 1.3 2005/06/15 18:15:45 wolf31o2 Exp $
+# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-arcade/xscavenger/ChangeLog,v 1.4 2006/01/29 00:00:28 joshuabaergen Exp $
+
+  28 Jan 2006; Joshua Baergen <joshuabaergen@gentoo.org>
+  xscavenger-1.4.4.ebuild:
+  Add modular X dependencies.
 
   15 Jun 2005; Chris Gianelloni <wolf31o2@gentoo.org>
   xscavenger-1.4.4.ebuild:
diff --git a/games-arcade/xscavenger/xscavenger-1.4.4.ebuild b/games-arcade/xscavenger/xscavenger-1.4.4.ebuild
index 230d5fb3a4c0..b5ef2f01674d 100644
--- a/games-arcade/xscavenger/xscavenger-1.4.4.ebuild
+++ b/games-arcade/xscavenger/xscavenger-1.4.4.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-arcade/xscavenger/xscavenger-1.4.4.ebuild,v 1.3 2005/06/15 18:15:45 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-arcade/xscavenger/xscavenger-1.4.4.ebuild,v 1.4 2006/01/29 00:00:28 joshuabaergen Exp $
 
 inherit eutils games
 
@@ -13,8 +13,9 @@ SLOT="0"
 KEYWORDS="x86 ~ppc"
 IUSE=""
 
-RDEPEND="virtual/x11"
+RDEPEND="|| ( x11-libs/libXext virtual/x11 )"
 DEPEND="${RDEPEND}
+	|| ( x11-misc/imake virtual/x11 )
 	>=sys-apps/sed-4"
 
 src_unpack() {
diff --git a/games-arcade/xtux/ChangeLog b/games-arcade/xtux/ChangeLog
index fefb3913dfdb..68f15c5ceef6 100644
--- a/games-arcade/xtux/ChangeLog
+++ b/games-arcade/xtux/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-arcade/xtux
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-arcade/xtux/ChangeLog,v 1.8 2005/02/21 20:38:43 mr_bones_ Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-arcade/xtux/ChangeLog,v 1.9 2006/01/29 00:00:28 joshuabaergen Exp $
+
+  28 Jan 2006; Joshua Baergen <joshuabaergen@gentoo.org>
+  xtux-20030306.ebuild:
+  Add modular X dependencies.
 
   21 Feb 2005; Michael Sterrett <mr_bones_@gentoo.org> xtux-20030306.ebuild:
   fix to be able to start tux_serv from the menu
diff --git a/games-arcade/xtux/xtux-20030306.ebuild b/games-arcade/xtux/xtux-20030306.ebuild
index 698b6c7dce0c..2a7c1af065f9 100644
--- a/games-arcade/xtux/xtux-20030306.ebuild
+++ b/games-arcade/xtux/xtux-20030306.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-arcade/xtux/xtux-20030306.ebuild,v 1.10 2005/02/21 20:38:43 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-arcade/xtux/xtux-20030306.ebuild,v 1.11 2006/01/29 00:00:28 joshuabaergen Exp $
 
 inherit games
 
@@ -13,7 +13,7 @@ SLOT="0"
 KEYWORDS="amd64 ~ppc x86"
 IUSE=""
 
-DEPEND="virtual/x11"
+DEPEND="|| ( x11-libs/libXpm virtual/x11 )"
 
 S=${WORKDIR}/${PN}