From: Chris Gianelloni <wolf31o2@gentoo.org>
Date: Tue, 5 Dec 2006 18:11:54 +0000 (+0000)
Subject: Removing old virtual/x11 dependency.
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=3b57cd58b3b02361df63791e056a10d13a58495c;p=gentoo.git

Removing old virtual/x11 dependency.
Package-Manager: portage-2.1.2_rc2-r2
---

diff --git a/games-fps/qudos/ChangeLog b/games-fps/qudos/ChangeLog
index 81820998322a..a8110d4bbc79 100644
--- a/games-fps/qudos/ChangeLog
+++ b/games-fps/qudos/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-fps/qudos
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/qudos/ChangeLog,v 1.4 2006/11/13 15:27:31 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/qudos/ChangeLog,v 1.5 2006/12/05 17:54:40 wolf31o2 Exp $
+
+  05 Dec 2006; Chris Gianelloni <wolf31o2@gentoo.org> qudos-0.40.1.ebuild,
+  qudos-9999.ebuild:
+  Removing old virtual/x11 dependency.
 
   13 Nov 2006; Diego Pettenò <flameeyes@gentoo.org> qudos-0.40.1.ebuild,
   qudos-9999.ebuild:
diff --git a/games-fps/qudos/qudos-0.40.1.ebuild b/games-fps/qudos/qudos-0.40.1.ebuild
index 11a3b1424577..237d950de748 100644
--- a/games-fps/qudos/qudos-0.40.1.ebuild
+++ b/games-fps/qudos/qudos-0.40.1.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-fps/qudos/qudos-0.40.1.ebuild,v 1.4 2006/11/13 15:27:31 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/qudos/qudos-0.40.1.ebuild,v 1.5 2006/12/05 17:54:40 wolf31o2 Exp $
 
 inherit eutils toolchain-funcs games
 
@@ -27,19 +27,15 @@ UIDEPEND="alsa? ( media-libs/alsa-lib )
 	media-libs/libogg
 	media-libs/libpng
 	media-libs/libvorbis
-	|| (
-		(
-			x11-libs/libX11
-			x11-libs/libXext
-			x11-libs/libXxf86dga
-			x11-libs/libXxf86vm )
-		virtual/x11 )"
-COMMON="${UIDEPEND}"
-RDEPEND="${COMMON}
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXxf86dga
+	x11-libs/libXxf86vm"
+RDEPEND="${UIDEPEND}
 	cdinstall? ( games-fps/quake2-data )
 	demo? ( games-fps/quake2-demodata )
 	textures? ( games-fps/quake2-textures )"
-DEPEND="${COMMON}"
+DEPEND="${UIDEPEND}"
 
 S=${WORKDIR}/${FILE_STEM}
 dir=${GAMES_DATADIR}/${MY_PN}
diff --git a/games-fps/qudos/qudos-9999.ebuild b/games-fps/qudos/qudos-9999.ebuild
index bd95e6c6ba24..e33c8011cd7a 100644
--- a/games-fps/qudos/qudos-9999.ebuild
+++ b/games-fps/qudos/qudos-9999.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-fps/qudos/qudos-9999.ebuild,v 1.3 2006/11/13 15:27:31 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/qudos/qudos-9999.ebuild,v 1.4 2006/12/05 17:54:40 wolf31o2 Exp $
 
 inherit eutils subversion toolchain-funcs games
 
@@ -28,19 +28,15 @@ UIDEPEND="alsa? ( media-libs/alsa-lib )
 	media-libs/libogg
 	media-libs/libpng
 	media-libs/libvorbis
-	|| (
-		(
-			x11-libs/libX11
-			x11-libs/libXext
-			x11-libs/libXxf86dga
-			x11-libs/libXxf86vm )
-		virtual/x11 )"
-COMMON="${UIDEPEND}"
-RDEPEND="${COMMON}
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXxf86dga
+	x11-libs/libXxf86vm"
+RDEPEND="${UIDEPEND}
 	cdinstall? ( games-fps/quake2-data )
 	demo? ( games-fps/quake2-demodata )
 	textures? ( games-fps/quake2-textures )"
-DEPEND="${COMMON}"
+DEPEND="${UIDEPEND}"
 
 S=${WORKDIR}
 dir=${GAMES_DATADIR}/${MY_PN}
diff --git a/games-fps/red-blue-quake2/ChangeLog b/games-fps/red-blue-quake2/ChangeLog
index 3bfbc0f3beb7..3f07c940e9c4 100644
--- a/games-fps/red-blue-quake2/ChangeLog
+++ b/games-fps/red-blue-quake2/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-fps/red-blue-quake2
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/red-blue-quake2/ChangeLog,v 1.6 2006/05/06 22:51:12 tupone Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/red-blue-quake2/ChangeLog,v 1.7 2006/12/05 17:55:35 wolf31o2 Exp $
+
+  05 Dec 2006; Chris Gianelloni <wolf31o2@gentoo.org>
+  red-blue-quake2-0.1.ebuild:
+  Removing old virtual/x11 dependency.
 
   06 May 2006; <Tupone@gentoo.org> +files/red-blue-quake2-0.1-gcc41.patch,
   red-blue-quake2-0.1.ebuild:
diff --git a/games-fps/red-blue-quake2/red-blue-quake2-0.1.ebuild b/games-fps/red-blue-quake2/red-blue-quake2-0.1.ebuild
index 1c4043c9c6d6..753d7b441864 100644
--- a/games-fps/red-blue-quake2/red-blue-quake2-0.1.ebuild
+++ b/games-fps/red-blue-quake2/red-blue-quake2-0.1.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-fps/red-blue-quake2/red-blue-quake2-0.1.ebuild,v 1.9 2006/05/06 22:51:12 tupone Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/red-blue-quake2/red-blue-quake2-0.1.ebuild,v 1.10 2006/12/05 17:55:35 wolf31o2 Exp $
 
 inherit eutils games
 
@@ -14,9 +14,7 @@ SLOT="0"
 KEYWORDS="x86"
 IUSE=""
 
-RDEPEND="|| (
-	x11-libs/libX11
-	virtual/x11 )"
+RDEPEND="x11-libs/libX11"
 DEPEND="${RDEPEND}
 	app-arch/unzip"
 
diff --git a/games-fps/rtcw/ChangeLog b/games-fps/rtcw/ChangeLog
index 71d562334e52..9fe6cabff68f 100644
--- a/games-fps/rtcw/ChangeLog
+++ b/games-fps/rtcw/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for games-fps/rtcw
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/rtcw/ChangeLog,v 1.28 2006/05/13 23:50:18 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/rtcw/ChangeLog,v 1.29 2006/12/05 17:56:37 wolf31o2 Exp $
+
+  05 Dec 2006; Chris Gianelloni <wolf31o2@gentoo.org> rtcw-1.41b.ebuild:
+  Removing old virtual/x11 dependency.
 
   13 May 2006; Chris Gianelloni <wolf31o2@gentoo.org> rtcw-1.41b.ebuild:
   Added sys-libs/lib-compat to RDEPEND on x86 and closing bug #133190.
diff --git a/games-fps/rtcw/rtcw-1.41b.ebuild b/games-fps/rtcw/rtcw-1.41b.ebuild
index 5480249b0abd..e4165310bbcb 100644
--- a/games-fps/rtcw/rtcw-1.41b.ebuild
+++ b/games-fps/rtcw/rtcw-1.41b.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-fps/rtcw/rtcw-1.41b.ebuild,v 1.3 2006/05/15 23:02:06 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/rtcw/rtcw-1.41b.ebuild,v 1.4 2006/12/05 17:56:37 wolf31o2 Exp $
 
 inherit eutils games
 
@@ -19,13 +19,10 @@ RESTRICT="strip mirror"
 
 UIDEPEND="virtual/opengl
 	x86? (
-		|| (
-			(
-				x11-libs/libX11
-				x11-libs/libXext
-				x11-libs/libXau
-				x11-libs/libXdmcp )
-			virtual/x11 ) )
+		x11-libs/libX11
+		x11-libs/libXext
+		x11-libs/libXau
+		x11-libs/libXdmcp )
 	amd64? (
 		app-emulation/emul-linux-x86-xlibs )"
 
diff --git a/games-fps/rtcwmp-demo/ChangeLog b/games-fps/rtcwmp-demo/ChangeLog
index 9810a77d6587..350ffa1151d0 100644
--- a/games-fps/rtcwmp-demo/ChangeLog
+++ b/games-fps/rtcwmp-demo/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-fps/rtcwmp-demo
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/rtcwmp-demo/ChangeLog,v 1.5 2006/10/07 13:00:36 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/rtcwmp-demo/ChangeLog,v 1.6 2006/12/05 17:57:34 wolf31o2 Exp $
+
+  05 Dec 2006; Chris Gianelloni <wolf31o2@gentoo.org>
+  rtcwmp-demo-1.1.ebuild:
+  Removing old virtual/x11 dependency.
 
   07 Oct 2006; Chris Gianelloni <wolf31o2@gentoo.org>
   rtcwmp-demo-1.1.ebuild:
diff --git a/games-fps/rtcwmp-demo/rtcwmp-demo-1.1.ebuild b/games-fps/rtcwmp-demo/rtcwmp-demo-1.1.ebuild
index d9c680f58862..cc0bd32e01b6 100644
--- a/games-fps/rtcwmp-demo/rtcwmp-demo-1.1.ebuild
+++ b/games-fps/rtcwmp-demo/rtcwmp-demo-1.1.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-fps/rtcwmp-demo/rtcwmp-demo-1.1.ebuild,v 1.6 2006/10/07 13:00:36 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/rtcwmp-demo/rtcwmp-demo-1.1.ebuild,v 1.7 2006/12/05 17:57:34 wolf31o2 Exp $
 
 inherit eutils games
 
@@ -22,22 +22,16 @@ RDEPEND="sys-libs/glibc
 		app-misc/screen )
 	!dedicated? (
 		virtual/opengl
-		|| (
-			(
-				x11-libs/libX11
-				x11-libs/libXext
-				x11-libs/libXau
-				x11-libs/libXdmcp )
-			virtual/x11 ) )
+		x11-libs/libX11
+		x11-libs/libXext
+		x11-libs/libXau
+		x11-libs/libXdmcp )
 	opengl? (
 		virtual/opengl
-		|| (
-			(
-				x11-libs/libX11
-				x11-libs/libXext
-				x11-libs/libXau
-				x11-libs/libXdmcp )
-			virtual/x11 ) )
+		x11-libs/libX11
+		x11-libs/libXext
+		x11-libs/libXau
+		x11-libs/libXdmcp )
 	amd64? (
 		app-emulation/emul-linux-x86-xlibs )"
 
diff --git a/games-fps/rtcwsp-demo/ChangeLog b/games-fps/rtcwsp-demo/ChangeLog
index e59adefe1cd3..074df67a14c5 100644
--- a/games-fps/rtcwsp-demo/ChangeLog
+++ b/games-fps/rtcwsp-demo/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-fps/rtcwsp-demo
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/rtcwsp-demo/ChangeLog,v 1.5 2006/10/07 13:01:12 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/rtcwsp-demo/ChangeLog,v 1.6 2006/12/05 17:59:02 wolf31o2 Exp $
+
+  05 Dec 2006; Chris Gianelloni <wolf31o2@gentoo.org>
+  rtcwsp-demo-1.1b.ebuild:
+  Removing old virtual/x11 dependency.
 
   07 Oct 2006; Chris Gianelloni <wolf31o2@gentoo.org>
   rtcwsp-demo-1.1b.ebuild:
diff --git a/games-fps/rtcwsp-demo/rtcwsp-demo-1.1b.ebuild b/games-fps/rtcwsp-demo/rtcwsp-demo-1.1b.ebuild
index 96cddbd6001c..2b3a1db453dc 100644
--- a/games-fps/rtcwsp-demo/rtcwsp-demo-1.1b.ebuild
+++ b/games-fps/rtcwsp-demo/rtcwsp-demo-1.1b.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-fps/rtcwsp-demo/rtcwsp-demo-1.1b.ebuild,v 1.6 2006/10/07 13:01:12 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/rtcwsp-demo/rtcwsp-demo-1.1b.ebuild,v 1.7 2006/12/05 17:59:02 wolf31o2 Exp $
 
 inherit eutils games
 
@@ -19,13 +19,11 @@ RESTRICT="strip mirror"
 
 RDEPEND="sys-libs/glibc
 	virtual/opengl
-	|| (
-		(
-			x11-libs/libX11
-			x11-libs/libXext
-			x11-libs/libXau
-			x11-libs/libXdmcp )
-		virtual/x11 )
+	x86? (
+		x11-libs/libX11
+		x11-libs/libXext
+		x11-libs/libXau
+		x11-libs/libXdmcp )
 	amd64? (
 		app-emulation/emul-linux-x86-xlibs )"
 
diff --git a/games-fps/soldieroffortune-demo/ChangeLog b/games-fps/soldieroffortune-demo/ChangeLog
index 39196d775696..fae4d69488dd 100644
--- a/games-fps/soldieroffortune-demo/ChangeLog
+++ b/games-fps/soldieroffortune-demo/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-fps/soldieroffortune-demo
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/soldieroffortune-demo/ChangeLog,v 1.6 2006/10/07 13:06:48 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/soldieroffortune-demo/ChangeLog,v 1.7 2006/12/05 18:01:00 wolf31o2 Exp $
+
+  05 Dec 2006; Chris Gianelloni <wolf31o2@gentoo.org>
+  soldieroffortune-demo-0.57.ebuild:
+  Removing old virtual/x11 dependency.
 
   19 Sep 2006; Chris Gianelloni <wolf31o2@gentoo.org>
   soldieroffortune-demo-0.57.ebuild:
diff --git a/games-fps/soldieroffortune-demo/soldieroffortune-demo-0.57.ebuild b/games-fps/soldieroffortune-demo/soldieroffortune-demo-0.57.ebuild
index a5738d33fd6a..411734575077 100644
--- a/games-fps/soldieroffortune-demo/soldieroffortune-demo-0.57.ebuild
+++ b/games-fps/soldieroffortune-demo/soldieroffortune-demo-0.57.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-fps/soldieroffortune-demo/soldieroffortune-demo-0.57.ebuild,v 1.4 2006/09/19 19:32:58 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/soldieroffortune-demo/soldieroffortune-demo-0.57.ebuild,v 1.5 2006/12/05 18:01:00 wolf31o2 Exp $
 
 inherit eutils games
 
@@ -19,13 +19,10 @@ RESTRICT="strip"
 DEPEND="games-util/loki_patch"
 RDEPEND="virtual/opengl
 	x86? (
-		|| (
-			(
-				x11-libs/libX11
-				x11-libs/libXext
-				x11-libs/libXau
-				x11-libs/libXdmcp )
-			virtual/x11 )
+		x11-libs/libX11
+		x11-libs/libXext
+		x11-libs/libXau
+		x11-libs/libXdmcp
 		media-libs/libvorbis
 		media-libs/libogg
 		media-libs/smpeg )
diff --git a/games-fps/soldieroffortune/ChangeLog b/games-fps/soldieroffortune/ChangeLog
index dce02305dd06..9ce43a7ad862 100644
--- a/games-fps/soldieroffortune/ChangeLog
+++ b/games-fps/soldieroffortune/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-fps/soldieroffortune
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/soldieroffortune/ChangeLog,v 1.18 2006/10/24 22:53:31 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/soldieroffortune/ChangeLog,v 1.19 2006/12/05 18:00:16 wolf31o2 Exp $
+
+  05 Dec 2006; Chris Gianelloni <wolf31o2@gentoo.org>
+  soldieroffortune-1.06a.ebuild:
+  Removing old virtual/x11 dependency.
 
   24 Oct 2006; Chris Gianelloni <wolf31o2@gentoo.org>
   soldieroffortune-1.06a.ebuild:
diff --git a/games-fps/soldieroffortune/soldieroffortune-1.06a.ebuild b/games-fps/soldieroffortune/soldieroffortune-1.06a.ebuild
index 5bb6ae8fa56d..5576ddcd62ab 100644
--- a/games-fps/soldieroffortune/soldieroffortune-1.06a.ebuild
+++ b/games-fps/soldieroffortune/soldieroffortune-1.06a.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-fps/soldieroffortune/soldieroffortune-1.06a.ebuild,v 1.19 2006/10/24 22:53:31 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/soldieroffortune/soldieroffortune-1.06a.ebuild,v 1.20 2006/12/05 18:00:16 wolf31o2 Exp $
 
 inherit eutils games
 
@@ -18,13 +18,10 @@ DEPEND="sys-libs/glibc
 	games-util/loki_patch"
 RDEPEND="virtual/opengl
 	x86? (
-		|| (
-			(
-				x11-libs/libX11
-				x11-libs/libXext
-				x11-libs/libXau
-				x11-libs/libXdmcp )
-			virtual/x11 )
+		x11-libs/libX11
+		x11-libs/libXext
+		x11-libs/libXau
+		x11-libs/libXdmcp
 		media-libs/libvorbis
 		media-libs/libogg
 		media-libs/smpeg )
diff --git a/games-fps/tenebrae/ChangeLog b/games-fps/tenebrae/ChangeLog
index 5410bad9fe44..3258fc390578 100644
--- a/games-fps/tenebrae/ChangeLog
+++ b/games-fps/tenebrae/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for games-fps/tenebrae
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/tenebrae/ChangeLog,v 1.7 2006/03/20 23:00:31 tupone Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/tenebrae/ChangeLog,v 1.8 2006/12/05 18:02:09 wolf31o2 Exp $
+
+  05 Dec 2006; Chris Gianelloni <wolf31o2@gentoo.org> tenebrae-1.04.ebuild:
+  Removing old virtual/x11 dependency.
 
   20 Mar 2006; <Tupone@gentoo.org> tenebrae-1.04.ebuild:
   Modular X dependency fix, bug #123115 by P. Nienaber. Thanks UncleOwen
diff --git a/games-fps/tenebrae/tenebrae-1.04.ebuild b/games-fps/tenebrae/tenebrae-1.04.ebuild
index 7885fe89627f..378b9f0de6a2 100644
--- a/games-fps/tenebrae/tenebrae-1.04.ebuild
+++ b/games-fps/tenebrae/tenebrae-1.04.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-fps/tenebrae/tenebrae-1.04.ebuild,v 1.10 2006/03/20 23:00:31 tupone Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/tenebrae/tenebrae-1.04.ebuild,v 1.11 2006/12/05 18:02:09 wolf31o2 Exp $
 
 #ECVS_SERVER="cvs.tenebrae.sourceforge.net:/cvsroot/tenebrae"
 #ECVS_MODULE="tenebrae_0"
@@ -20,23 +20,13 @@ IUSE=""
 RDEPEND="virtual/opengl
 	virtual/glu
 	media-libs/libpng
-	|| (
-		(
-			x11-libs/libXxf86vm
-			x11-libs/libXxf86dga
-		)
-		virtual/x11
-	)"
+	x11-libs/libXxf86vm
+	x11-libs/libXxf86dga"
 #	sdl? ( media-libs/libsdl )"
 DEPEND="${RDEPEND}
-	|| (
-		(
-			x11-proto/xextproto
-			x11-proto/xf86dgaproto
-			x11-proto/xf86vidmodeproto
-		)
-		virtual/x11
-	)
+	x11-proto/xextproto
+	x11-proto/xf86dgaproto
+	x11-proto/xf86vidmodeproto
 	app-arch/unzip"
 
 S=${WORKDIR}
diff --git a/games-fps/tremulous-bin/ChangeLog b/games-fps/tremulous-bin/ChangeLog
index 48512deaf74e..efbfd8d39419 100644
--- a/games-fps/tremulous-bin/ChangeLog
+++ b/games-fps/tremulous-bin/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-fps/tremulous-bin
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/tremulous-bin/ChangeLog,v 1.1 2006/09/06 22:17:48 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/tremulous-bin/ChangeLog,v 1.2 2006/12/05 18:05:09 wolf31o2 Exp $
+
+  05 Dec 2006; Chris Gianelloni <wolf31o2@gentoo.org>
+  tremulous-bin-1.1.0.ebuild:
+  Removing old virtual/x11 dependency.
 
 *tremulous-bin-1.1.0 (06 Sep 2006)
 
diff --git a/games-fps/tremulous-bin/tremulous-bin-1.1.0.ebuild b/games-fps/tremulous-bin/tremulous-bin-1.1.0.ebuild
index 5fbdad3f822b..eaeddeabe422 100644
--- a/games-fps/tremulous-bin/tremulous-bin-1.1.0.ebuild
+++ b/games-fps/tremulous-bin/tremulous-bin-1.1.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-fps/tremulous-bin/tremulous-bin-1.1.0.ebuild,v 1.1 2006/09/06 22:17:48 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/tremulous-bin/tremulous-bin-1.1.0.ebuild,v 1.2 2006/12/05 18:05:09 wolf31o2 Exp $
 
 inherit eutils games
 
@@ -26,14 +26,12 @@ UIDEPEND="virtual/opengl
 		media-libs/libogg
 		media-libs/libvorbis
 		media-libs/libsdl
-		|| ( (
-				x11-libs/libX11
-				x11-libs/libXau
-				x11-libs/libXdmcp
-				x11-libs/libXext
-				x11-libs/libXxf86dga
-				x11-libs/libXxf86vm )
-			virtual/x11 ) )
+		x11-libs/libX11
+		x11-libs/libXau
+		x11-libs/libXdmcp
+		x11-libs/libXext
+		x11-libs/libXxf86dga
+		x11-libs/libXxf86vm )
 	amd64? (
 		app-emulation/emul-linux-x86-sdl
 		app-emulation/emul-linux-x86-medialibs )"
diff --git a/games-fps/tremulous/ChangeLog b/games-fps/tremulous/ChangeLog
index 6dbfec6e1e7d..c1f98a624bec 100644
--- a/games-fps/tremulous/ChangeLog
+++ b/games-fps/tremulous/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-fps/tremulous
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/tremulous/ChangeLog,v 1.3 2006/11/10 13:26:04 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/tremulous/ChangeLog,v 1.4 2006/12/05 18:03:48 wolf31o2 Exp $
+
+  05 Dec 2006; Chris Gianelloni <wolf31o2@gentoo.org>
+  tremulous-1.1.0.ebuild:
+  Removing old virtual/x11 dependency.
 
   10 Nov 2006; Chris Gianelloni <wolf31o2@gentoo.org>
   tremulous-1.1.0.ebuild:
diff --git a/games-fps/tremulous/tremulous-1.1.0.ebuild b/games-fps/tremulous/tremulous-1.1.0.ebuild
index d7e0201e6757..02dddd2a4114 100644
--- a/games-fps/tremulous/tremulous-1.1.0.ebuild
+++ b/games-fps/tremulous/tremulous-1.1.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-fps/tremulous/tremulous-1.1.0.ebuild,v 1.3 2006/11/10 13:26:04 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/tremulous/tremulous-1.1.0.ebuild,v 1.4 2006/12/05 18:03:48 wolf31o2 Exp $
 
 inherit eutils toolchain-funcs games
 
@@ -18,16 +18,12 @@ IUSE="dedicated openal opengl vorbis"
 
 UIDEPEND="openal? ( media-libs/openal )
 	media-libs/libsdl
-	vorbis? (
-		media-libs/libogg
-		media-libs/libvorbis )
+	vorbis? ( media-libs/libogg media-libs/libvorbis )
 	virtual/opengl
-	|| ( (
-			x11-libs/libX11
-			x11-libs/libXau
-			x11-libs/libXdmcp
-			x11-libs/libXext )
-		virtual/x11 )"
+	x11-libs/libX11
+	x11-libs/libXau
+	x11-libs/libXdmcp
+	x11-libs/libXext"
 RDEPEND="opengl? ( ${UIDEPEND} )
 	!opengl? ( !dedicated? ( ${UIDEPEND} ) )
 	!games-fps/tremulous-bin"
diff --git a/games-fps/unreal-tournament-goty/ChangeLog b/games-fps/unreal-tournament-goty/ChangeLog
index ab6132b0a13c..fd9b9c843a14 100644
--- a/games-fps/unreal-tournament-goty/ChangeLog
+++ b/games-fps/unreal-tournament-goty/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-fps/unreal-tournament-goty
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/unreal-tournament-goty/ChangeLog,v 1.11 2006/10/24 22:58:44 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/unreal-tournament-goty/ChangeLog,v 1.12 2006/12/05 18:10:05 wolf31o2 Exp $
+
+  05 Dec 2006; Chris Gianelloni <wolf31o2@gentoo.org>
+  unreal-tournament-goty-436.ebuild, unreal-tournament-goty-451.ebuild:
+  Removing old virtual/x11 dependency.
 
   24 Oct 2006; Chris Gianelloni <wolf31o2@gentoo.org>
   unreal-tournament-goty-436.ebuild, unreal-tournament-goty-451.ebuild:
diff --git a/games-fps/unreal-tournament-goty/unreal-tournament-goty-436.ebuild b/games-fps/unreal-tournament-goty/unreal-tournament-goty-436.ebuild
index 427f9e0cd400..0c896556bf49 100644
--- a/games-fps/unreal-tournament-goty/unreal-tournament-goty-436.ebuild
+++ b/games-fps/unreal-tournament-goty/unreal-tournament-goty-436.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-fps/unreal-tournament-goty/unreal-tournament-goty-436.ebuild,v 1.11 2006/10/24 22:58:44 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/unreal-tournament-goty/unreal-tournament-goty-436.ebuild,v 1.12 2006/12/05 18:10:05 wolf31o2 Exp $
 
 inherit eutils games
 
@@ -17,13 +17,10 @@ IUSE="3dfx S3TC nls opengl"
 DEPEND="!games-fps/unreal-tournament
 	app-arch/unzip"
 RDEPEND="opengl? ( virtual/opengl )
-	|| (
-		(
-			x11-libs/libXext
-			x11-libs/libX11
-			x11-libs/libXau
-			x11-libs/libXdmcp )
-		virtual/x11 )"
+	x11-libs/libXext
+	x11-libs/libX11
+	x11-libs/libXau
+	x11-libs/libXdmcp"
 
 S=${WORKDIR}
 
diff --git a/games-fps/unreal-tournament-goty/unreal-tournament-goty-451.ebuild b/games-fps/unreal-tournament-goty/unreal-tournament-goty-451.ebuild
index d20bc43a3424..87ffa80464a4 100644
--- a/games-fps/unreal-tournament-goty/unreal-tournament-goty-451.ebuild
+++ b/games-fps/unreal-tournament-goty/unreal-tournament-goty-451.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-fps/unreal-tournament-goty/unreal-tournament-goty-451.ebuild,v 1.14 2006/10/24 22:58:44 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/unreal-tournament-goty/unreal-tournament-goty-451.ebuild,v 1.15 2006/12/05 18:10:05 wolf31o2 Exp $
 
 inherit eutils games
 
@@ -15,15 +15,12 @@ KEYWORDS="~amd64 x86"
 IUSE="3dfx S3TC nls opengl"
 
 RDEPEND="!amd64? (
-		|| (
-			(
-				x11-libs/libXext
-				x11-libs/libX11
-				x11-libs/libXau
-				x11-libs/libXdmcp )
-			virtual/x11 )
-		=media-libs/libsdl-1.2*
-		opengl? ( virtual/opengl ) )
+	x11-libs/libXext
+	x11-libs/libX11
+	x11-libs/libXau
+	x11-libs/libXdmcp
+	=media-libs/libsdl-1.2*
+	opengl? ( virtual/opengl ) )
 	amd64? ( app-emulation/emul-linux-x86-sdl
 		app-emulation/emul-linux-x86-baselibs
 		app-emulation/emul-linux-x86-xlibs )"
diff --git a/games-fps/unreal-tournament/ChangeLog b/games-fps/unreal-tournament/ChangeLog
index 1ebfc7b729a8..801ecb899b41 100644
--- a/games-fps/unreal-tournament/ChangeLog
+++ b/games-fps/unreal-tournament/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-fps/unreal-tournament
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/unreal-tournament/ChangeLog,v 1.15 2006/10/24 22:59:23 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/unreal-tournament/ChangeLog,v 1.16 2006/12/05 18:07:38 wolf31o2 Exp $
+
+  05 Dec 2006; Chris Gianelloni <wolf31o2@gentoo.org>
+  unreal-tournament-436.ebuild, unreal-tournament-451.ebuild:
+  Removing old virtual/x11 dependency.
 
   24 Oct 2006; Chris Gianelloni <wolf31o2@gentoo.org>
   unreal-tournament-436.ebuild, unreal-tournament-451.ebuild:
diff --git a/games-fps/unreal-tournament/unreal-tournament-436.ebuild b/games-fps/unreal-tournament/unreal-tournament-436.ebuild
index d3f65f4bd1d6..9cc0b487d8c1 100644
--- a/games-fps/unreal-tournament/unreal-tournament-436.ebuild
+++ b/games-fps/unreal-tournament/unreal-tournament-436.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-fps/unreal-tournament/unreal-tournament-436.ebuild,v 1.14 2006/10/24 22:59:23 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/unreal-tournament/unreal-tournament-436.ebuild,v 1.15 2006/12/05 18:07:38 wolf31o2 Exp $
 
 inherit eutils games
 
@@ -16,13 +16,10 @@ IUSE="3dfx"
 
 DEPEND="app-arch/unzip
 	!games-fps/unreal-tournament-goty"
-RDEPEND="|| (
-	(
-		x11-libs/libXext
-		x11-libs/libX11
-		x11-libs/libXau
-		x11-libs/libXdmcp )
-	virtual/x11 )"
+RDEPEND="x11-libs/libXext
+	x11-libs/libX11
+	x11-libs/libXau
+	x11-libs/libXdmcp"
 
 S=${WORKDIR}
 
diff --git a/games-fps/unreal-tournament/unreal-tournament-451.ebuild b/games-fps/unreal-tournament/unreal-tournament-451.ebuild
index 7b3ce9617d07..daafa9f7dc70 100644
--- a/games-fps/unreal-tournament/unreal-tournament-451.ebuild
+++ b/games-fps/unreal-tournament/unreal-tournament-451.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-fps/unreal-tournament/unreal-tournament-451.ebuild,v 1.22 2006/10/29 03:48:31 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/unreal-tournament/unreal-tournament-451.ebuild,v 1.23 2006/12/05 18:07:38 wolf31o2 Exp $
 
 inherit eutils games
 
@@ -15,15 +15,12 @@ KEYWORDS="-* amd64 x86"
 IUSE="3dfx opengl"
 
 RDEPEND="!amd64? (
-		|| (
-			(
-				x11-libs/libXext
-				x11-libs/libX11
-				x11-libs/libXau
-				x11-libs/libXdmcp )
-			virtual/x11 )
-		=media-libs/libsdl-1.2*
-		opengl? ( virtual/opengl ) )
+	x11-libs/libXext
+	x11-libs/libX11
+	x11-libs/libXau
+	x11-libs/libXdmcp
+	=media-libs/libsdl-1.2*
+	opengl? ( virtual/opengl ) )
 	amd64? ( app-emulation/emul-linux-x86-sdl
 		app-emulation/emul-linux-x86-baselibs
 		app-emulation/emul-linux-x86-xlibs )"
diff --git a/games-fps/unreal/ChangeLog b/games-fps/unreal/ChangeLog
index a57ac79af855..72bc5e2dbb7c 100644
--- a/games-fps/unreal/ChangeLog
+++ b/games-fps/unreal/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for games-fps/unreal
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/unreal/ChangeLog,v 1.11 2006/10/24 23:00:00 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/unreal/ChangeLog,v 1.12 2006/12/05 18:06:26 wolf31o2 Exp $
+
+  05 Dec 2006; Chris Gianelloni <wolf31o2@gentoo.org> unreal-226.ebuild:
+  Removing old virtual/x11 dependency.
 
   24 Oct 2006; Chris Gianelloni <wolf31o2@gentoo.org> unreal-226.ebuild:
   Moved cdrom_get_cds to src_unpack since binary packages don't require the
diff --git a/games-fps/unreal/unreal-226.ebuild b/games-fps/unreal/unreal-226.ebuild
index a0258858ff3f..a561701c50a2 100644
--- a/games-fps/unreal/unreal-226.ebuild
+++ b/games-fps/unreal/unreal-226.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-fps/unreal/unreal-226.ebuild,v 1.15 2006/10/29 03:48:04 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/unreal/unreal-226.ebuild,v 1.16 2006/12/05 18:06:26 wolf31o2 Exp $
 
 inherit eutils games
 
@@ -18,15 +18,12 @@ IUSE="X opengl"
 DEPEND="sys-libs/lib-compat
 	app-arch/unzip"
 RDEPEND="!amd64? (
-		|| (
-			(
-				x11-libs/libXext
-				x11-libs/libX11
-				x11-libs/libXau
-				x11-libs/libXdmcp )
-			virtual/x11 )
-		=media-libs/libsdl-1.2*
-		opengl? ( virtual/opengl ) )
+	x11-libs/libXext
+	x11-libs/libX11
+	x11-libs/libXau
+	x11-libs/libXdmcp
+	=media-libs/libsdl-1.2*
+	opengl? ( virtual/opengl ) )
 	amd64? ( app-emulation/emul-linux-x86-sdl
 		app-emulation/emul-linux-x86-baselibs
 		app-emulation/emul-linux-x86-xlibs )"
diff --git a/games-fps/wolfgl/ChangeLog b/games-fps/wolfgl/ChangeLog
index 97fc95c7d18e..9d9000277f4b 100644
--- a/games-fps/wolfgl/ChangeLog
+++ b/games-fps/wolfgl/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for games-fps/wolfgl
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/wolfgl/ChangeLog,v 1.8 2006/01/29 00:01:17 halcy0n Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/wolfgl/ChangeLog,v 1.9 2006/12/05 18:11:54 wolf31o2 Exp $
+
+  05 Dec 2006; Chris Gianelloni <wolf31o2@gentoo.org> wolfgl-0.93-r1.ebuild:
+  Removing old virtual/x11 dependency.
 
   29 Jan 2006; Mark Loeser <halcy0n@gentoo.org> +files/0.93-gcc4.patch,
   wolfgl-0.93-r1.ebuild:
diff --git a/games-fps/wolfgl/wolfgl-0.93-r1.ebuild b/games-fps/wolfgl/wolfgl-0.93-r1.ebuild
index d78bc87db579..bc52fa01bb21 100644
--- a/games-fps/wolfgl/wolfgl-0.93-r1.ebuild
+++ b/games-fps/wolfgl/wolfgl-0.93-r1.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-fps/wolfgl/wolfgl-0.93-r1.ebuild,v 1.8 2006/05/12 16:59:18 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/wolfgl/wolfgl-0.93-r1.ebuild,v 1.9 2006/12/05 18:11:54 wolf31o2 Exp $
 
 #ECVS_SERVER="wolfgl.cvs.sourceforge.net:/cvsroot/wolfgl"
 #ECVS_MODULE="wolfgl"
@@ -20,12 +20,9 @@ SLOT="0"
 KEYWORDS="~ppc x86"
 IUSE=""
 
-RDEPEND="virtual/opengl
-	|| (
-		virtual/x11
-		x11-proto/xproto
-	)"
+RDEPEND="virtual/opengl"
 DEPEND="${RDEPEND}
+	x11-proto/xproto
 	app-arch/unzip"
 
 src_unpack() {