Removing old virtual/x11 dependency.

Package-Manager: portage-2.1.2_rc2-r2

30 files changed, 136 insertions, 116 deletions

diff --git a/games-action/0verkill/0verkill-0.16-r3.ebuild b/games-action/0verkill/0verkill-0.16-r3.ebuild
index caa220763fed..275434b0a5ca 100644
--- a/games-action/0verkill/0verkill-0.16-r3.ebuild
+++ b/games-action/0verkill/0verkill-0.16-r3.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-action/0verkill/0verkill-0.16-r3.ebuild,v 1.1 2006/06/10 12:49:56 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-action/0verkill/0verkill-0.16-r3.ebuild,v 1.2 2006/12/01 19:49:07 wolf31o2 Exp $
 
 inherit eutils games
 
-DESCRIPTION="A bloody 2D action deathmatch-like game in ASCII-ART"
+DESCRIPTION="a bloody 2D action deathmatch-like game in ASCII-ART"
 HOMEPAGE="http://artax.karlin.mff.cuni.cz/~brain/0verkill/"
 SRC_URI="http://artax.karlin.mff.cuni.cz/~brain/0verkill/release/${P}.tgz"
 
@@ -13,7 +13,7 @@ SLOT="0"
 KEYWORDS="amd64 ppc sparc x86"
 IUSE="X"
 
-DEPEND="X? ( || ( x11-libs/libXpm virtual/x11 ) )"
+DEPEND="X? ( x11-libs/libXpm )"
 
 src_unpack() {
 	unpack ${A}
diff --git a/games-action/0verkill/ChangeLog b/games-action/0verkill/ChangeLog
index 6eacb2a94a63..588745cdcab6 100644
--- a/games-action/0verkill/ChangeLog
+++ b/games-action/0verkill/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-action/0verkill
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-action/0verkill/ChangeLog,v 1.13 2006/06/10 12:49:56 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-action/0verkill/ChangeLog,v 1.14 2006/12/01 19:49:07 wolf31o2 Exp $
+
+  01 Dec 2006; Chris Gianelloni <wolf31o2@gentoo.org>
+  0verkill-0.16-r3.ebuild:
+  Removing old virtual/x11 dependency.
 
 *0verkill-0.16-r3 (10 Jun 2006)
 
diff --git a/games-action/abuse_sdl/ChangeLog b/games-action/abuse_sdl/ChangeLog
index c7b61b042037..00e6acc52258 100644
--- a/games-action/abuse_sdl/ChangeLog
+++ b/games-action/abuse_sdl/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-action/abuse_sdl
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-action/abuse_sdl/ChangeLog,v 1.10 2006/04/18 12:14:12 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-action/abuse_sdl/ChangeLog,v 1.11 2006/12/01 20:06:10 wolf31o2 Exp $
+
+  01 Dec 2006; Chris Gianelloni <wolf31o2@gentoo.org>
+  abuse_sdl-0.7.0-r2.ebuild:
+  Removing old virtual/x11 dependency.
 
   18 Apr 2006; Jason Wever <weeve@gentoo.org> abuse_sdl-0.7.0-r2.ebuild:
   Stable on SPARC.
diff --git a/games-action/abuse_sdl/abuse_sdl-0.7.0-r2.ebuild b/games-action/abuse_sdl/abuse_sdl-0.7.0-r2.ebuild
index 15c948f3d80e..5285c2975e45 100644
--- a/games-action/abuse_sdl/abuse_sdl-0.7.0-r2.ebuild
+++ b/games-action/abuse_sdl/abuse_sdl-0.7.0-r2.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-action/abuse_sdl/abuse_sdl-0.7.0-r2.ebuild,v 1.10 2006/04/18 12:14:14 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-action/abuse_sdl/abuse_sdl-0.7.0-r2.ebuild,v 1.11 2006/12/01 20:06:10 wolf31o2 Exp $
 
 inherit eutils games
 
@@ -16,9 +16,8 @@ IUSE=""
 
 RDEPEND=">=media-libs/libsdl-1.1.6"
 DEPEND="${RDEPEND}
-	|| ( x11-libs/libXt virtual/x11 )
-	virtual/opengl
-	>=sys-apps/sed-4"
+	x11-libs/libXt
+	virtual/opengl"
 
 DATA="${WORKDIR}/datafiles"
 
diff --git a/games-action/battalion/ChangeLog b/games-action/battalion/ChangeLog
index 80d8c56f2370..d87e58b2d6ea 100644
--- a/games-action/battalion/ChangeLog
+++ b/games-action/battalion/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for games-action/battalion
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-action/battalion/ChangeLog,v 1.8 2006/01/28 21:19:10 joshuabaergen Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-action/battalion/ChangeLog,v 1.9 2006/12/01 19:58:01 wolf31o2 Exp $
+
+  01 Dec 2006; Chris Gianelloni <wolf31o2@gentoo.org> battalion-1.4b.ebuild:
+  Removing old virtual/x11 dependency.
 
   28 Jan 2006; Joshua Baergen <joshuabaergen@gentoo.org>
   battalion-1.4b.ebuild:
diff --git a/games-action/battalion/battalion-1.4b.ebuild b/games-action/battalion/battalion-1.4b.ebuild
index fa8a3a109536..791762d58639 100644
--- a/games-action/battalion/battalion-1.4b.ebuild
+++ b/games-action/battalion/battalion-1.4b.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-action/battalion/battalion-1.4b.ebuild,v 1.10 2006/01/28 21:19:10 joshuabaergen Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-action/battalion/battalion-1.4b.ebuild,v 1.11 2006/12/01 19:58:01 wolf31o2 Exp $
 
 inherit games
 
@@ -13,12 +13,9 @@ SLOT="0"
 KEYWORDS="ppc x86"
 IUSE=""
 
-RDEPEND="|| ( x11-libs/libXext virtual/x11 )
+RDEPEND="x11-libs/libXext
 	virtual/opengl"
 
-DEPEND="${RDEPEND}
-	>=sys-apps/sed-4"
-
 S="${WORKDIR}/${PN}${PV}"
 dir="${GAMES_DATADIR}/${PN}"
 
diff --git a/games-action/bomberclone/ChangeLog b/games-action/bomberclone/ChangeLog
index 24c158e3f9f2..8e7c9a6ff20d 100644
--- a/games-action/bomberclone/ChangeLog
+++ b/games-action/bomberclone/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-action/bomberclone
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-action/bomberclone/ChangeLog,v 1.22 2006/08/25 20:09:03 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-action/bomberclone/ChangeLog,v 1.23 2006/12/01 20:04:00 wolf31o2 Exp $
+
+  01 Dec 2006; Chris Gianelloni <wolf31o2@gentoo.org>
+  bomberclone-0.11.7.ebuild:
+  Removing old virtual/x11 dependency.
 
 *bomberclone-0.11.7 (25 Aug 2006)
 
diff --git a/games-action/bomberclone/bomberclone-0.11.7.ebuild b/games-action/bomberclone/bomberclone-0.11.7.ebuild
index dc73a5147504..b16050e45d06 100644
--- a/games-action/bomberclone/bomberclone-0.11.7.ebuild
+++ b/games-action/bomberclone/bomberclone-0.11.7.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-action/bomberclone/bomberclone-0.11.7.ebuild,v 1.1 2006/08/25 20:09:03 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-action/bomberclone/bomberclone-0.11.7.ebuild,v 1.2 2006/12/01 20:04:00 wolf31o2 Exp $
 
 inherit eutils games
 
@@ -16,7 +16,7 @@ IUSE="X"
 DEPEND=">=media-libs/libsdl-1.1.0
 	media-libs/sdl-image
 	media-libs/sdl-mixer
-	X? ( || ( x11-libs/libXt virtual/x11 ) )"
+	X? ( x11-libs/libXt )"
 
 src_unpack() {
 	unpack ${A}
diff --git a/games-action/bzflag/ChangeLog b/games-action/bzflag/ChangeLog
index 8c6f1f23e166..d2924be2d8fd 100644
--- a/games-action/bzflag/ChangeLog
+++ b/games-action/bzflag/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-action/bzflag
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-action/bzflag/ChangeLog,v 1.27 2006/10/30 09:38:45 the_paya Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-action/bzflag/ChangeLog,v 1.28 2006/12/01 20:08:50 wolf31o2 Exp $
+
+  01 Dec 2006; Chris Gianelloni <wolf31o2@gentoo.org>
+  bzflag-1.10.8.20041007.ebuild, bzflag-2.0.8.ebuild:
+  Removing old virtual/x11 dependency.
 
   30 Oct 2006; Javier Villavicencio <the_paya@gentoo.org>
   bzflag-2.0.8.ebuild:
diff --git a/games-action/bzflag/bzflag-1.10.8.20041007.ebuild b/games-action/bzflag/bzflag-1.10.8.20041007.ebuild
index fd6ad370554e..45f1d431d849 100644
--- a/games-action/bzflag/bzflag-1.10.8.20041007.ebuild
+++ b/games-action/bzflag/bzflag-1.10.8.20041007.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-action/bzflag/bzflag-1.10.8.20041007.ebuild,v 1.6 2005/08/28 21:20:49 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-action/bzflag/bzflag-1.10.8.20041007.ebuild,v 1.7 2006/12/01 20:08:50 wolf31o2 Exp $
 
 GAMES_USE_SDL="nojoystick"
 inherit flag-o-matic games
@@ -16,8 +16,6 @@ IUSE="dedicated"
 
 RDEPEND="virtual/libc
 	!dedicated? ( virtual/opengl )"
-DEPEND="${RDEPEND}
-	>=sys-apps/sed-4"
 
 src_unpack() {
 	unpack ${A}
diff --git a/games-action/bzflag/bzflag-2.0.8.ebuild b/games-action/bzflag/bzflag-2.0.8.ebuild
index 2507068a0904..48b2dedb0802 100644
--- a/games-action/bzflag/bzflag-2.0.8.ebuild
+++ b/games-action/bzflag/bzflag-2.0.8.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-action/bzflag/bzflag-2.0.8.ebuild,v 1.2 2006/10/30 09:38:45 the_paya Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-action/bzflag/bzflag-2.0.8.ebuild,v 1.3 2006/12/01 20:08:50 wolf31o2 Exp $
 
 inherit eutils flag-o-matic games
 
@@ -17,19 +17,16 @@ UIDEPEND="virtual/opengl
 	virtual/glu
 	media-libs/libsdl
 	media-libs/sdl-image
-	|| (
-		(
-			x11-libs/libICE
-			x11-libs/libSM
-			x11-libs/libX11
-			x11-libs/libXau
-			x11-libs/libXdmcp
-			x11-libs/libXext
-			x11-libs/libXi
-			x11-libs/libXmu
-			x11-libs/libXt
-			x11-libs/libXxf86vm )
-		virtual/x11 )"
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libX11
+	x11-libs/libXau
+	x11-libs/libXdmcp
+	x11-libs/libXext
+	x11-libs/libXi
+	x11-libs/libXmu
+	x11-libs/libXt
+	x11-libs/libXxf86vm"
 
 DEPEND=">=net-misc/curl-7.15.0
 	sys-libs/ncurses
diff --git a/games-action/mutantstorm-demo/ChangeLog b/games-action/mutantstorm-demo/ChangeLog
index 02b26247b262..80f9b1ae101c 100644
--- a/games-action/mutantstorm-demo/ChangeLog
+++ b/games-action/mutantstorm-demo/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-action/mutantstorm-demo
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-action/mutantstorm-demo/ChangeLog,v 1.10 2006/09/02 10:05:47 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-action/mutantstorm-demo/ChangeLog,v 1.11 2006/12/01 20:19:01 wolf31o2 Exp $
+
+  01 Dec 2006; Chris Gianelloni <wolf31o2@gentoo.org>
+  mutantstorm-demo-1.33.ebuild:
+  Removing old virtual/x11 dependency.
 
   02 Sep 2006; Michael Sterrett <mr_bones_@gentoo.org>
   mutantstorm-demo-1.33.ebuild:
diff --git a/games-action/mutantstorm-demo/mutantstorm-demo-1.33.ebuild b/games-action/mutantstorm-demo/mutantstorm-demo-1.33.ebuild
index 5f2984e04deb..3a52c729358f 100644
--- a/games-action/mutantstorm-demo/mutantstorm-demo-1.33.ebuild
+++ b/games-action/mutantstorm-demo/mutantstorm-demo-1.33.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-action/mutantstorm-demo/mutantstorm-demo-1.33.ebuild,v 1.9 2006/09/02 10:05:47 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-action/mutantstorm-demo/mutantstorm-demo-1.33.ebuild,v 1.10 2006/12/01 20:19:01 wolf31o2 Exp $
 
 inherit eutils games
 
@@ -21,14 +21,12 @@ RDEPEND="virtual/opengl
 		app-emulation/emul-linux-x86-compat
 		app-emulation/emul-linux-x86-sdl )
 	x86? (
-		|| (
-			(
-				x11-libs/libX11
-				x11-libs/libXext )
-			virtual/x11 ) )"
+		x11-libs/libX11
+		x11-libs/libXext )"
 
-GAMES_CHECK_LICENSE="yes"
 S=${WORKDIR}
+
+GAMES_CHECK_LICENSE="yes"
 dir=${GAMES_PREFIX_OPT}/${PN}
 Ddir=${D}/${dir}
 
diff --git a/games-action/poopmup/ChangeLog b/games-action/poopmup/ChangeLog
index 5c86779c0f81..f9b30c200b8b 100644
--- a/games-action/poopmup/ChangeLog
+++ b/games-action/poopmup/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for games-action/poopmup
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-action/poopmup/ChangeLog,v 1.10 2006/08/21 07:03:42 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-action/poopmup/ChangeLog,v 1.11 2006/12/01 20:02:50 wolf31o2 Exp $
+
+  01 Dec 2006; Chris Gianelloni <wolf31o2@gentoo.org> poopmup-1.2.ebuild:
+  Removing old virtual/x11 dependency.
 
   21 Aug 2006; Michael Sterrett <mr_bones_@gentoo.org>
   +files/poopmup-1.2-freeglut.patch, poopmup-1.2.ebuild:
diff --git a/games-action/poopmup/poopmup-1.2.ebuild b/games-action/poopmup/poopmup-1.2.ebuild
index a025e8ff2959..65dc765175a7 100644
--- a/games-action/poopmup/poopmup-1.2.ebuild
+++ b/games-action/poopmup/poopmup-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-action/poopmup/poopmup-1.2.ebuild,v 1.13 2006/08/21 07:03:41 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-action/poopmup/poopmup-1.2.ebuild,v 1.14 2006/12/01 20:02:50 wolf31o2 Exp $
 
 inherit eutils toolchain-funcs games
 
@@ -14,9 +14,8 @@ KEYWORDS="amd64 ppc x86"
 IUSE=""
 
 DEPEND="virtual/glut
-	|| ( ( x11-libs/libXi
-			x11-libs/libXmu )
-		virtual/x11 )
+	x11-libs/libXi
+	x11-libs/libXmu
 	virtual/opengl"
 
 S=${WORKDIR}/${PN}
diff --git a/games-action/transcend/ChangeLog b/games-action/transcend/ChangeLog
index 92dd7530de67..0a388cd6f2e8 100644
--- a/games-action/transcend/ChangeLog
+++ b/games-action/transcend/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for games-action/transcend
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-action/transcend/ChangeLog,v 1.5 2006/11/22 15:18:18 peper Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-action/transcend/ChangeLog,v 1.6 2006/12/01 19:47:34 wolf31o2 Exp $
+
+  01 Dec 2006; Chris Gianelloni <wolf31o2@gentoo.org> transcend-0.3.ebuild:
+  Removing old virtual/x11 dependency.
 
   22 Nov 2006; Piotr Jaroszyński <peper@gentoo.org> transcend-0.3.ebuild:
   Add ~amd64 wrt bug #155890.
diff --git a/games-action/transcend/transcend-0.3.ebuild b/games-action/transcend/transcend-0.3.ebuild
index 4209b4b423eb..b32258f529f6 100644
--- a/games-action/transcend/transcend-0.3.ebuild
+++ b/games-action/transcend/transcend-0.3.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-action/transcend/transcend-0.3.ebuild,v 1.3 2006/11/22 15:18:18 peper Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-action/transcend/transcend-0.3.ebuild,v 1.4 2006/12/01 19:47:34 wolf31o2 Exp $
 
 inherit games
 
@@ -13,9 +13,8 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc x86"
 IUSE=""
 
-DEPEND="|| ( ( x11-libs/libXmu
-				x11-libs/libXi )
-			virtual/x11 )
+DEPEND="x11-libs/libXmu
+	x11-libs/libXi
 	virtual/opengl
 	virtual/glu
 	virtual/glut"
diff --git a/games-action/tuxkart/ChangeLog b/games-action/tuxkart/ChangeLog
index e79a94bb5d5e..bf9341cb25ae 100644
--- a/games-action/tuxkart/ChangeLog
+++ b/games-action/tuxkart/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for games-action/tuxkart
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-action/tuxkart/ChangeLog,v 1.11 2006/01/20 20:37:23 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-action/tuxkart/ChangeLog,v 1.12 2006/12/01 19:56:48 wolf31o2 Exp $
+
+  01 Dec 2006; Chris Gianelloni <wolf31o2@gentoo.org> tuxkart-0.4.0.ebuild:
+  Removing old virtual/x11 dependency.
 
   20 Jan 2006; Chris Gianelloni <wolf31o2@gentoo.org> tuxkart-0.4.0.ebuild:
   Added modular X dependencies and closing bug #119096.
diff --git a/games-action/tuxkart/tuxkart-0.4.0.ebuild b/games-action/tuxkart/tuxkart-0.4.0.ebuild
index ce14fc5abb38..a3948a9d046f 100644
--- a/games-action/tuxkart/tuxkart-0.4.0.ebuild
+++ b/games-action/tuxkart/tuxkart-0.4.0.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-action/tuxkart/tuxkart-0.4.0.ebuild,v 1.4 2006/01/20 20:37:23 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-action/tuxkart/tuxkart-0.4.0.ebuild,v 1.5 2006/12/01 19:56:48 wolf31o2 Exp $
 
 inherit games
 
@@ -14,24 +14,18 @@ KEYWORDS="alpha amd64 x86"
 IUSE=""
 
 RDEPEND=">=media-libs/plib-1.8.0
-	|| (
-		(
-			x11-libs/libX11
-			x11-libs/libICE
-			x11-libs/libSM
-			x11-libs/libXext
-			x11-libs/libXmu
-			x11-libs/libXi )
-		virtual/x11 )
+	x11-libs/libX11
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libXext
+	x11-libs/libXmu
+	x11-libs/libXi
 	virtual/opengl"
 DEPEND="${RDEPEND}
-	|| (
-		x11-libs/libXt
-		virtual/x11 )
-	>=sys-apps/sed-4"
+	x11-libs/libXt"
 
 src_unpack() {
-	unpack "${A}"
+	unpack ${A}
 
 	cd "${S}"
 	# apparently <sys/perm.h> doesn't exist on alpha
diff --git a/games-action/xblast/ChangeLog b/games-action/xblast/ChangeLog
index defea8fe1b84..d4a6e01ef26c 100644
--- a/games-action/xblast/ChangeLog
+++ b/games-action/xblast/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for games-action/xblast
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-action/xblast/ChangeLog,v 1.10 2006/01/28 21:19:10 joshuabaergen Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-action/xblast/ChangeLog,v 1.11 2006/12/01 19:52:26 wolf31o2 Exp $
+
+  01 Dec 2006; Chris Gianelloni <wolf31o2@gentoo.org> xblast-2.10.2.ebuild:
+  Removing old virtual/x11 dependency.
 
   28 Jan 2006; Joshua Baergen <joshuabaergen@gentoo.org>
   xblast-2.10.0.ebuild, xblast-2.10.2.ebuild:
diff --git a/games-action/xblast/xblast-2.10.2.ebuild b/games-action/xblast/xblast-2.10.2.ebuild
index 89345ab8a9b1..2478012509c6 100644
--- a/games-action/xblast/xblast-2.10.2.ebuild
+++ b/games-action/xblast/xblast-2.10.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-action/xblast/xblast-2.10.2.ebuild,v 1.5 2006/01/28 21:19:10 joshuabaergen Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-action/xblast/xblast-2.10.2.ebuild,v 1.6 2006/12/01 19:52:26 wolf31o2 Exp $
 
 inherit games
 
@@ -25,12 +25,11 @@ SLOT="0"
 KEYWORDS="amd64 ppc x86"
 IUSE=""
 
-RDEPEND="|| ( ( x11-libs/libICE
-				x11-libs/libX11 )
-			virtual/x11 )
+RDEPEND="x11-libs/libICE
+	x11-libs/libX11
 	media-libs/libpng"
 DEPEND="${RDEPEND}
-	|| ( x11-libs/libXt virtual/x11 )"
+	x11-libs/libXt"
 
 src_compile() {
 	export MY_DATADIR="${GAMES_DATADIR}/${PN}"
diff --git a/games-action/xbomber/ChangeLog b/games-action/xbomber/ChangeLog
index ba8543fe6e61..ceed7d5a17f6 100644
--- a/games-action/xbomber/ChangeLog
+++ b/games-action/xbomber/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for games-action/xbomber
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-action/xbomber/ChangeLog,v 1.10 2006/09/27 07:14:18 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-action/xbomber/ChangeLog,v 1.11 2006/12/01 20:10:47 wolf31o2 Exp $
+
+  01 Dec 2006; Chris Gianelloni <wolf31o2@gentoo.org> xbomber-101.ebuild:
+  Removing old virtual/x11 dependency.
 
   27 Sep 2006; Simon Stelling <blubb@gentoo.org> xbomber-101.ebuild:
   stable on amd64
diff --git a/games-action/xbomber/xbomber-101.ebuild b/games-action/xbomber/xbomber-101.ebuild
index d6d9d035c8fa..e41c35871d11 100644
--- a/games-action/xbomber/xbomber-101.ebuild
+++ b/games-action/xbomber/xbomber-101.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-action/xbomber/xbomber-101.ebuild,v 1.12 2006/09/27 07:14:18 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-action/xbomber/xbomber-101.ebuild,v 1.13 2006/12/01 20:10:47 wolf31o2 Exp $
 
 inherit eutils games
 
@@ -13,7 +13,7 @@ SLOT="0"
 KEYWORDS="amd64 ~ppc x86"
 IUSE=""
 
-DEPEND="|| ( x11-libs/libX11 virtual/x11 )"
+DEPEND="x11-libs/libX11"
 
 src_unpack() {
 	unpack ${A}
diff --git a/games-action/xpilot-ng/ChangeLog b/games-action/xpilot-ng/ChangeLog
index 91fc75a0c838..c573be7621ba 100644
--- a/games-action/xpilot-ng/ChangeLog
+++ b/games-action/xpilot-ng/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-action/xpilot-ng
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-action/xpilot-ng/ChangeLog,v 1.7 2006/05/01 19:12:10 tupone Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-action/xpilot-ng/ChangeLog,v 1.8 2006/12/01 20:01:36 wolf31o2 Exp $
+
+  01 Dec 2006; Chris Gianelloni <wolf31o2@gentoo.org>
+  xpilot-ng-4.6.6.ebuild:
+  Removing old virtual/x11 dependency.
 
 *xpilot-ng-4.7.2-r1 (01 May 2006)
 
diff --git a/games-action/xpilot-ng/xpilot-ng-4.6.6.ebuild b/games-action/xpilot-ng/xpilot-ng-4.6.6.ebuild
index a5f63cf12072..54f2088f8b0b 100644
--- a/games-action/xpilot-ng/xpilot-ng-4.6.6.ebuild
+++ b/games-action/xpilot-ng/xpilot-ng-4.6.6.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-action/xpilot-ng/xpilot-ng-4.6.6.ebuild,v 1.3 2006/01/25 03:00:55 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-action/xpilot-ng/xpilot-ng-4.6.6.ebuild,v 1.4 2006/12/01 20:01:36 wolf31o2 Exp $
 
 inherit games
 
@@ -13,12 +13,9 @@ SLOT="0"
 KEYWORDS="~x86 ~amd64 ~ppc"
 IUSE="openal sdl"
 
-RDEPEND="|| (
-	(
-		x11-libs/libX11
-		x11-libs/libICE
-		x11-libs/libSM )
-	virtual/x11 )
+RDEPEND="x11-libs/libX11
+	x11-libs/libICE
+	x11-libs/libSM 
 	>=dev-libs/expat-1.1
 	>=sys-libs/zlib-1.1.3
 	openal? ( media-libs/openal )
@@ -28,12 +25,9 @@ RDEPEND="|| (
 		>=media-libs/sdl-image-1.0
 		>=media-libs/sdl-ttf-2.0 )"
 DEPEND="${RDEPEND}
-	|| (
-		(
-			x11-proto/xextproto
-			x11-proto/xproto
-			x11-libs/libXt )
-		virtual/x11 )"
+	x11-proto/xextproto
+	x11-proto/xproto
+	x11-libs/libXt"
 
 src_compile() {
 	egamesconf \
diff --git a/games-action/xpilot/ChangeLog b/games-action/xpilot/ChangeLog
index 70a5f4b1308a..565a581b5fbc 100644
--- a/games-action/xpilot/ChangeLog
+++ b/games-action/xpilot/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for games-action/xpilot
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-action/xpilot/ChangeLog,v 1.9 2006/01/25 02:59:15 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-action/xpilot/ChangeLog,v 1.10 2006/12/01 20:17:34 wolf31o2 Exp $
+
+  01 Dec 2006; Chris Gianelloni <wolf31o2@gentoo.org> xpilot-4.5.4.ebuild:
+  Removing old virtual/x11 dependency.
+
+  01 Dec 2006; Chris Gianelloni <wolf31o2@gentoo.org> xpilot-4.5.4.ebuild:
+  Removing old virtual/x11 dependency.
 
   25 Jan 2006; Chris Gianelloni <wolf31o2@gentoo.org> xpilot-4.5.4.ebuild:
   Added modular X and closing bug #119986.
diff --git a/games-action/xpilot/xpilot-4.5.4.ebuild b/games-action/xpilot/xpilot-4.5.4.ebuild
index 3d717418178c..ce1f59361d6b 100644
--- a/games-action/xpilot/xpilot-4.5.4.ebuild
+++ b/games-action/xpilot/xpilot-4.5.4.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-action/xpilot/xpilot-4.5.4.ebuild,v 1.10 2006/04/07 17:14:07 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-action/xpilot/xpilot-4.5.4.ebuild,v 1.11 2006/12/01 20:17:34 wolf31o2 Exp $
 
 DESCRIPTION="A multi-player 2D client/server space game"
 HOMEPAGE="http://www.xpilot.org/"
@@ -11,20 +11,14 @@ SLOT="0"
 KEYWORDS="amd64 ppc x86"
 IUSE=""
 
-RDEPEND="|| (
-	(
-		x11-libs/libX11
-		x11-libs/libXext )
-	virtual/x11 )"
+RDEPEND="x11-libs/libX11
+	x11-libs/libXext"
 DEPEND="${RDEPEND}
-	|| (
-		(
-			x11-proto/xextproto
-			x11-proto/xproto
-			x11-misc/gccmakedep
-			x11-misc/imake
-			app-text/rman )
-		virtual/x11 )"
+	x11-proto/xextproto
+	x11-proto/xproto
+	x11-misc/gccmakedep
+	x11-misc/imake
+	app-text/rman"
 
 src_unpack() {
 	unpack ${A}
diff --git a/games-action/xshipwars/ChangeLog b/games-action/xshipwars/ChangeLog
index 0ffc8783a538..523a9d36930f 100644
--- a/games-action/xshipwars/ChangeLog
+++ b/games-action/xshipwars/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-action/xshipwars
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-action/xshipwars/ChangeLog,v 1.15 2006/11/07 19:53:06 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-action/xshipwars/ChangeLog,v 1.16 2006/12/01 20:14:29 wolf31o2 Exp $
+
+  01 Dec 2006; Chris Gianelloni <wolf31o2@gentoo.org>
+  xshipwars-1.34.0.ebuild, xshipwars-2.5.5.ebuild:
+  Removing old virtual/x11 dependency.
 
   07 Nov 2006; Chris Gianelloni <wolf31o2@gentoo.org>
   -xshipwars-2.4.7.ebuild, -xshipwars-2.5.4.ebuild:
diff --git a/games-action/xshipwars/xshipwars-1.34.0.ebuild b/games-action/xshipwars/xshipwars-1.34.0.ebuild
index fdd221b74108..b4fcb7d29c5c 100644
--- a/games-action/xshipwars/xshipwars-1.34.0.ebuild
+++ b/games-action/xshipwars/xshipwars-1.34.0.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-action/xshipwars/xshipwars-1.34.0.ebuild,v 1.15 2006/01/28 21:19:10 joshuabaergen Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-action/xshipwars/xshipwars-1.34.0.ebuild,v 1.16 2006/12/01 20:14:29 wolf31o2 Exp $
 
 inherit toolchain-funcs eutils games
 
@@ -18,10 +18,10 @@ SLOT="0"
 KEYWORDS="ppc x86"
 IUSE=""
 
-RDEPEND="|| ( x11-libs/libXpm virtual/x11 )
+RDEPEND="x11-libs/libXpm
 	>=media-sound/esound-0.2.23"
 DEPEND="${RDEPEND}
-	|| ( x11-proto/xextproto virtual/x11 )"
+	x11-proto/xextproto"
 
 S=${WORKDIR}/${MY_P}
 
diff --git a/games-action/xshipwars/xshipwars-2.5.5.ebuild b/games-action/xshipwars/xshipwars-2.5.5.ebuild
index d6e0f174e02f..0575ff2f5622 100644
--- a/games-action/xshipwars/xshipwars-2.5.5.ebuild
+++ b/games-action/xshipwars/xshipwars-2.5.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-action/xshipwars/xshipwars-2.5.5.ebuild,v 1.1 2006/09/08 23:55:17 tupone Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-action/xshipwars/xshipwars-2.5.5.ebuild,v 1.2 2006/12/01 20:14:29 wolf31o2 Exp $
 
 inherit toolchain-funcs eutils games
 
@@ -17,12 +17,12 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="joystick yiff esd debug"
 
-RDEPEND="|| ( x11-libs/libXpm virtual/x11 )
+RDEPEND="x11-libs/libXpm
 	joystick? ( media-libs/libjsw )
 	yiff? ( media-libs/yiff )
 	esd? ( media-sound/esound )"
 DEPEND="${RDEPEND}
-	|| ( x11-proto/xextproto virtual/x11 )"
+	x11-proto/xextproto"
 
 S=${WORKDIR}/${MY_P}