Removing old virtual/x11 dependency.

Package-Manager: portage-2.1.2_rc2-r2

16 files changed, 91 insertions, 93 deletions

diff --git a/games-fps/industri/ChangeLog b/games-fps/industri/ChangeLog
index d97bf6f9a27a..007fd94418fb 100644
--- a/games-fps/industri/ChangeLog
+++ b/games-fps/industri/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for games-fps/industri
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/industri/ChangeLog,v 1.5 2006/03/22 17:28:30 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/industri/ChangeLog,v 1.6 2006/12/05 17:08:32 wolf31o2 Exp $
+
+  05 Dec 2006; Chris Gianelloni <wolf31o2@gentoo.org> industri-1.01.ebuild:
+  Removing old virtual/x11 dependency.
 
   22 Mar 2006; Michael Sterrett <mr_bones_@gentoo.org> industri-1.01.ebuild:
   modular X deps
diff --git a/games-fps/industri/industri-1.01.ebuild b/games-fps/industri/industri-1.01.ebuild
index d49e34e74823..e5074fa2a85f 100644
--- a/games-fps/industri/industri-1.01.ebuild
+++ b/games-fps/industri/industri-1.01.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/industri/industri-1.01.ebuild,v 1.11 2006/03/22 17:28:30 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/industri/industri-1.01.ebuild,v 1.12 2006/12/05 17:08:32 wolf31o2 Exp $
 
 inherit toolchain-funcs games
 
@@ -15,24 +15,18 @@ KEYWORDS="x86"
 IUSE=""
 
 RDEPEND="virtual/opengl
-	|| (
-		(
-			media-libs/mesa
-			x11-libs/libXxf86dga
-			x11-libs/libXext
-			x11-libs/libX11
-			x11-libs/libXxf86vm )
-		virtual/x11 )
+	media-libs/mesa
+	x11-libs/libXxf86dga
+	x11-libs/libXext
+	x11-libs/libX11
+	x11-libs/libXxf86vm
 	media-libs/libpng
 	sys-libs/zlib"
 DEPEND="${RDEPEND}
-	|| (
-		(
-			x11-proto/xf86dgaproto
-			x11-proto/xextproto
-			x11-proto/xf86vidmodeproto
-			x11-proto/xproto )
-		virtual/x11 )
+	x11-proto/xf86dgaproto
+	x11-proto/xextproto
+	x11-proto/xf86vidmodeproto
+	x11-proto/xproto
 	app-arch/unzip"
 
 S=${WORKDIR}/industri_BIN
diff --git a/games-fps/legends/ChangeLog b/games-fps/legends/ChangeLog
index 64ce0a6c78a5..cf5a6e8baf15 100644
--- a/games-fps/legends/ChangeLog
+++ b/games-fps/legends/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-fps/legends
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/legends/ChangeLog,v 1.19 2006/09/15 20:33:06 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/legends/ChangeLog,v 1.20 2006/12/05 17:10:39 wolf31o2 Exp $
+
+  05 Dec 2006; Chris Gianelloni <wolf31o2@gentoo.org>
+  legends-0.4.1.40.ebuild:
+  Removing old virtual/x11 dependency.
 
   15 Sep 2006; Chris Gianelloni <wolf31o2@gentoo.org>
   legends-0.4.1.40.ebuild:
diff --git a/games-fps/legends/legends-0.4.1.40.ebuild b/games-fps/legends/legends-0.4.1.40.ebuild
index 94d22a747b8e..7db8d34de75f 100644
--- a/games-fps/legends/legends-0.4.1.40.ebuild
+++ b/games-fps/legends/legends-0.4.1.40.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/legends/legends-0.4.1.40.ebuild,v 1.3 2006/09/28 21:14:18 nyhm Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/legends/legends-0.4.1.40.ebuild,v 1.4 2006/12/05 17:10:39 wolf31o2 Exp $
 
 inherit eutils games
 
@@ -25,9 +25,7 @@ RDEPEND=">=media-libs/libsdl-1.2
 	media-libs/openal
 	amd64? ( >=app-emulation/emul-linux-x86-sdl-2.1
 			>=app-emulation/emul-linux-x86-soundlibs-2.1 )
-	|| (
-		media-fonts/font-adobe-75dpi
-		virtual/x11 )"
+	media-fonts/font-adobe-75dpi"
 
 S=${WORKDIR}
 
diff --git a/games-fps/nexuiz/ChangeLog b/games-fps/nexuiz/ChangeLog
index c2bd961ff0d0..cbd7ff562c51 100644
--- a/games-fps/nexuiz/ChangeLog
+++ b/games-fps/nexuiz/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-fps/nexuiz
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/nexuiz/ChangeLog,v 1.16 2006/11/27 18:01:51 nyhm Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/nexuiz/ChangeLog,v 1.17 2006/12/05 17:14:21 wolf31o2 Exp $
+
+  05 Dec 2006; Chris Gianelloni <wolf31o2@gentoo.org> nexuiz-1.5.ebuild,
+  nexuiz-2.0.ebuild:
+  Removing old virtual/x11 dependency.
 
   27 Nov 2006; Tristan Heaven <nyhm@gentoo.org> nexuiz-2.1.ebuild:
   Add missing net-misc/curl dependency, bug #153155
diff --git a/games-fps/nexuiz/nexuiz-1.5.ebuild b/games-fps/nexuiz/nexuiz-1.5.ebuild
index 9c25e84bc99a..3adc6baad833 100644
--- a/games-fps/nexuiz/nexuiz-1.5.ebuild
+++ b/games-fps/nexuiz/nexuiz-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-fps/nexuiz/nexuiz-1.5.ebuild,v 1.7 2006/06/27 19:09:17 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/nexuiz/nexuiz-1.5.ebuild,v 1.8 2006/12/05 17:14:21 wolf31o2 Exp $
 
 inherit eutils games
 
@@ -18,13 +18,10 @@ IUSE="dedicated opengl sdl"
 UIDEPEND="media-libs/alsa-lib
 	media-libs/libogg
 	media-libs/libvorbis
-	|| (
-		(
-			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="media-libs/jpeg
 	sys-libs/glibc
 	sys-libs/zlib
diff --git a/games-fps/nexuiz/nexuiz-2.0.ebuild b/games-fps/nexuiz/nexuiz-2.0.ebuild
index 6fc3da285a3d..6059caa43b1e 100644
--- a/games-fps/nexuiz/nexuiz-2.0.ebuild
+++ b/games-fps/nexuiz/nexuiz-2.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/nexuiz/nexuiz-2.0.ebuild,v 1.3 2006/06/28 21:57:53 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/nexuiz/nexuiz-2.0.ebuild,v 1.4 2006/12/05 17:14:21 wolf31o2 Exp $
 
 inherit eutils flag-o-matic games
 
@@ -20,22 +20,16 @@ IUSE="alsa dedicated opengl oss sdl"
 UIRDEPEND="alsa? ( media-libs/alsa-lib )
 	media-libs/libogg
 	media-libs/libvorbis
-	|| (
-		(
-			x11-libs/libX11
-			x11-libs/libXau
-			x11-libs/libXdmcp
-			x11-libs/libXext
-			x11-libs/libXxf86dga
-			x11-libs/libXxf86vm )
-		virtual/x11 )"
-UIDEPEND="|| (
-	(
-		x11-proto/xextproto
-		x11-proto/xf86dgaproto
-		x11-proto/xf86vidmodeproto
-		x11-proto/xproto )
-	virtual/x11 )"
+	x11-libs/libX11
+	x11-libs/libXau
+	x11-libs/libXdmcp
+	x11-libs/libXext
+	x11-libs/libXxf86dga
+	x11-libs/libXxf86vm"
+UIDEPEND="x11-proto/xextproto
+	x11-proto/xf86dgaproto
+	x11-proto/xf86vidmodeproto
+	x11-proto/xproto"
 RDEPEND="media-libs/jpeg
 	sys-libs/glibc
 	sys-libs/zlib
diff --git a/games-fps/postal2mp-demo/ChangeLog b/games-fps/postal2mp-demo/ChangeLog
index 69041d0072bb..222db85da382 100644
--- a/games-fps/postal2mp-demo/ChangeLog
+++ b/games-fps/postal2mp-demo/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-fps/postal2mp-demo
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/postal2mp-demo/ChangeLog,v 1.7 2006/10/05 12:07:18 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/postal2mp-demo/ChangeLog,v 1.8 2006/12/05 17:16:17 wolf31o2 Exp $
+
+  05 Dec 2006; Chris Gianelloni <wolf31o2@gentoo.org>
+  postal2mp-demo-1407.ebuild:
+  Removing old virtual/x11 dependency.
 
   05 Oct 2006; Chris Gianelloni <wolf31o2@gentoo.org>
   postal2mp-demo-1407.ebuild:
diff --git a/games-fps/postal2mp-demo/postal2mp-demo-1407.ebuild b/games-fps/postal2mp-demo/postal2mp-demo-1407.ebuild
index 8032798111a9..eb2835a2dba9 100644
--- a/games-fps/postal2mp-demo/postal2mp-demo-1407.ebuild
+++ b/games-fps/postal2mp-demo/postal2mp-demo-1407.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/postal2mp-demo/postal2mp-demo-1407.ebuild,v 1.6 2006/10/05 12:07:18 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/postal2mp-demo/postal2mp-demo-1407.ebuild,v 1.7 2006/12/05 17:16:17 wolf31o2 Exp $
 
 inherit eutils games
 
@@ -14,7 +14,7 @@ KEYWORDS="amd64 x86"
 IUSE=""
 RESTRICT="mirror strip"
 
-RDEPEND="|| ( x11-libs/libXext virtual/x11 )
+RDEPEND="x11-libs/libXext
 	amd64? (
 		app-emulation/emul-linux-x86-baselibs
 		app-emulation/emul-linux-x86-xlibs
@@ -22,9 +22,7 @@ RDEPEND="|| ( x11-libs/libXext virtual/x11 )
 			>=app-emulation/emul-linux-x86-xlibs-7.0
 			x11-drivers/nvidia-drivers
 			x11-drivers/nvidia-legacy-drivers
-			>=x11-drivers/ati-drivers-8.8.25-r1
-		)
-	)"
+			>=x11-drivers/ati-drivers-8.8.25-r1 ) )"
 DEPEND=">=sys-apps/portage-2.1"
 
 S=${WORKDIR}
diff --git a/games-fps/quake1/ChangeLog b/games-fps/quake1/ChangeLog
index 9d9b18185d07..74c272524301 100644
--- a/games-fps/quake1/ChangeLog
+++ b/games-fps/quake1/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for games-fps/quake1
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/quake1/ChangeLog,v 1.8 2006/03/15 22:23:15 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/quake1/ChangeLog,v 1.9 2006/12/05 17:18:42 wolf31o2 Exp $
+
+  05 Dec 2006; Chris Gianelloni <wolf31o2@gentoo.org> quake1-2.40-r1.ebuild:
+  Removing old virtual/x11 dependency.
 
   15 Mar 2006; Chris Gianelloni <wolf31o2@gentoo.org> quake1-2.40-r1.ebuild:
   Changed to use idsoftware thirdpartymirror and also closing bug #124327.
diff --git a/games-fps/quake1/quake1-2.40-r1.ebuild b/games-fps/quake1/quake1-2.40-r1.ebuild
index 517680cd0ac0..bc1b44bd4b8a 100644
--- a/games-fps/quake1/quake1-2.40-r1.ebuild
+++ b/games-fps/quake1/quake1-2.40-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/quake1/quake1-2.40-r1.ebuild,v 1.7 2006/05/26 02:48:17 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/quake1/quake1-2.40-r1.ebuild,v 1.8 2006/12/05 17:18:42 wolf31o2 Exp $
 
 inherit eutils games
 
@@ -13,10 +13,7 @@ SLOT="0"
 KEYWORDS="-*"
 IUSE="cdinstall X opengl svga 3dfx"
 
-RDEPEND="X? (
-	|| (
-		x11-libs/libX11
-		virtual/x11 ) )
+RDEPEND="X? ( x11-libs/libX11 )
 	opengl? ( virtual/opengl )
 	svga? ( media-libs/svgalib )
 	3dfx? ( media-libs/glide-v3 )"
diff --git a/games-fps/quake2-icculus/ChangeLog b/games-fps/quake2-icculus/ChangeLog
index d4b4900c4fa1..c4e04f70f12e 100644
--- a/games-fps/quake2-icculus/ChangeLog
+++ b/games-fps/quake2-icculus/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-fps/quake2-icculus
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/quake2-icculus/ChangeLog,v 1.23 2006/06/27 21:46:02 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/quake2-icculus/ChangeLog,v 1.24 2006/12/05 17:22:39 wolf31o2 Exp $
+
+  05 Dec 2006; Chris Gianelloni <wolf31o2@gentoo.org>
+  quake2-icculus-0.16.1.ebuild, quake2-icculus-0.16.1-r1.ebuild:
+  Removing old virtual/x11 dependency.
 
   27 Jun 2006; Chris Gianelloni <wolf31o2@gentoo.org>
   +files/0.16-rogue-armor.patch, quake2-icculus-0.16.1.ebuild,
diff --git a/games-fps/quake2-icculus/quake2-icculus-0.16.1-r1.ebuild b/games-fps/quake2-icculus/quake2-icculus-0.16.1-r1.ebuild
index b30ee19238b9..631556eb7111 100644
--- a/games-fps/quake2-icculus/quake2-icculus-0.16.1-r1.ebuild
+++ b/games-fps/quake2-icculus/quake2-icculus-0.16.1-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/quake2-icculus/quake2-icculus-0.16.1-r1.ebuild,v 1.2 2006/06/27 21:46:02 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/quake2-icculus/quake2-icculus-0.16.1-r1.ebuild,v 1.3 2006/12/05 17:22:39 wolf31o2 Exp $
 
 inherit eutils toolchain-funcs games
 
@@ -27,10 +27,11 @@ RDEPEND="${UIDEPEND}
 	cdinstall? ( games-fps/quake2-data )
 	demo? ( games-fps/quake2-demodata )"
 DEPEND="${UIDEPEND}
-	X? ( || (
-		( x11-proto/xproto x11-proto/xextproto x11-proto/xf86dgaproto x11-proto/xf86vidmodeproto )
-		virtual/x11
-	) )
+	X? (
+		x11-proto/xproto
+		x11-proto/xextproto
+		x11-proto/xf86dgaproto
+		x11-proto/xf86vidmodeproto )
 	rogue? ( || ( sys-freebsd/freebsd-ubin app-arch/sharutils ) )
 	xatrix? ( || ( sys-freebsd/freebsd-ubin app-arch/sharutils ) )"
 
diff --git a/games-fps/quake2-icculus/quake2-icculus-0.16.1.ebuild b/games-fps/quake2-icculus/quake2-icculus-0.16.1.ebuild
index a092b7254493..436a35445adf 100644
--- a/games-fps/quake2-icculus/quake2-icculus-0.16.1.ebuild
+++ b/games-fps/quake2-icculus/quake2-icculus-0.16.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/quake2-icculus/quake2-icculus-0.16.1.ebuild,v 1.16 2006/06/27 21:46:02 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/quake2-icculus/quake2-icculus-0.16.1.ebuild,v 1.17 2006/12/05 17:22:39 wolf31o2 Exp $
 
 inherit eutils toolchain-funcs games
 
@@ -21,18 +21,20 @@ RDEPEND="opengl? ( virtual/opengl )
 	svga? ( media-libs/svgalib )
 	sdl? ( media-libs/libsdl )
 	aalib? ( media-libs/aalib )
-	X? ( || (
-		( x11-libs/libX11 x11-libs/libXext x11-libs/libXxf86dga x11-libs/libXxf86vm )
-		virtual/x11
-	) )
+	X? (
+		x11-libs/libX11
+		x11-libs/libXext
+		x11-libs/libXxf86dga
+		x11-libs/libXxf86vm )
 	alsa? ( media-libs/alsa-lib )
 	arts? ( kde-base/arts )
 	media-libs/jpeg"
 DEPEND="${RDEPEND}
-	X? ( || (
-		( x11-proto/xproto x11-proto/xextproto x11-proto/xf86dgaproto x11-proto/xf86vidmodeproto )
-		virtual/x11
-	) )
+	X? (
+		x11-proto/xproto
+		x11-proto/xextproto
+		x11-proto/xf86dgaproto
+		x11-proto/xf86vidmodeproto )
 	rogue? ( || ( sys-freebsd/freebsd-ubin app-arch/sharutils ) )
 	xatrix? ( || ( sys-freebsd/freebsd-ubin app-arch/sharutils ) )"
 
diff --git a/games-fps/quakeforge/ChangeLog b/games-fps/quakeforge/ChangeLog
index c2e6443e78d9..556e8fc21d13 100644
--- a/games-fps/quakeforge/ChangeLog
+++ b/games-fps/quakeforge/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-fps/quakeforge
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/quakeforge/ChangeLog,v 1.13 2006/11/13 15:26:43 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/quakeforge/ChangeLog,v 1.14 2006/12/05 17:24:01 wolf31o2 Exp $
+
+  05 Dec 2006; Chris Gianelloni <wolf31o2@gentoo.org>
+  quakeforge-0.5.5.ebuild:
+  Removing old virtual/x11 dependency.
 
   13 Nov 2006; Diego Pettenò <flameeyes@gentoo.org>
   quakeforge-0.5.5.ebuild:
diff --git a/games-fps/quakeforge/quakeforge-0.5.5.ebuild b/games-fps/quakeforge/quakeforge-0.5.5.ebuild
index 8b95116e514f..21728b5f0435 100644
--- a/games-fps/quakeforge/quakeforge-0.5.5.ebuild
+++ b/games-fps/quakeforge/quakeforge-0.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-fps/quakeforge/quakeforge-0.5.5.ebuild,v 1.15 2006/11/13 15:26:43 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/quakeforge/quakeforge-0.5.5.ebuild,v 1.16 2006/12/05 17:24:01 wolf31o2 Exp $
 
 inherit eutils games
 
@@ -19,26 +19,17 @@ RDEPEND="3dfx? ( media-libs/glide-v3 )
 	sdl? ( media-libs/libsdl )
 	svga? ( media-libs/svgalib )
 	X? (
-		|| (
-			(
-				x11-libs/libX11
-				x11-libs/libXext
-				x11-libs/libXxf86vm )
-			virtual/x11 ) )
+		x11-libs/libX11
+		x11-libs/libXext
+		x11-libs/libXxf86vm )
 	ncurses? ( sys-libs/ncurses )
 	vorbis? ( media-libs/libogg media-libs/libvorbis )
 	zlib? ( sys-libs/zlib )
 	xv? (
-		|| (
-			(
-				x11-libs/libX11
-				x11-libs/libXext
-				x11-libs/libXxf86vm )
-			virtual/x11 ) )
-	dga? (
-		|| (
-			x11-libs/libXxf86dga
-			virtual/x11 ) )
+		x11-libs/libX11
+		x11-libs/libXext
+		x11-libs/libXxf86vm )
+	dga? ( x11-libs/libXxf86dga )
 	alsa? ( media-libs/alsa-lib )"
 DEPEND="${RDEPEND}
 	cdinstall? ( games-fps/quake1-data )