Removing old virtual/x11 dependency.

Package-Manager: portage-2.1.2_rc2-r2

diff --git a/games-fps/anaglyph-stereo-quake/ChangeLog b/games-fps/anaglyph-stereo-quake/ChangeLog
index 233e27dd4dc63324ba4214d837ebd3d74715f4d3..90e2f651e3b0ba5f4de3d61541ac034e4d73241e 100644 (file)
--- a/games-fps/anaglyph-stereo-quake/ChangeLog
+++ b/games-fps/anaglyph-stereo-quake/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-fps/anaglyph-stereo-quake
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/anaglyph-stereo-quake/ChangeLog,v 1.7 2006/03/22 18:03:01 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/anaglyph-stereo-quake/ChangeLog,v 1.8 2006/12/04 22:55:45 wolf31o2 Exp $
+
+  04 Dec 2006; Chris Gianelloni <wolf31o2@gentoo.org>
+  anaglyph-stereo-quake-130100-r1.ebuild:
+  Removing old virtual/x11 dependency.
 
   22 Mar 2006; Michael Sterrett <mr_bones_@gentoo.org>
   anaglyph-stereo-quake-130100-r1.ebuild:

diff --git a/games-fps/anaglyph-stereo-quake/anaglyph-stereo-quake-130100-r1.ebuild b/games-fps/anaglyph-stereo-quake/anaglyph-stereo-quake-130100-r1.ebuild
index 99e273fba91e8f469c6012380f2e8a8b205f1d02..d55216862dafbbd85723d9f602ecbcd7296da927 100644 (file)
--- a/games-fps/anaglyph-stereo-quake/anaglyph-stereo-quake-130100-r1.ebuild
+++ b/games-fps/anaglyph-stereo-quake/anaglyph-stereo-quake-130100-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/anaglyph-stereo-quake/anaglyph-stereo-quake-130100-r1.ebuild,v 1.12 2006/03/22 18:03:01 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/anaglyph-stereo-quake/anaglyph-stereo-quake-130100-r1.ebuild,v 1.13 2006/12/04 22:55:45 wolf31o2 Exp $
 
 inherit eutils games
 
@@ -15,20 +15,16 @@ KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND="virtual/opengl
-       || ( (
-                       x11-libs/libXxf86dga
-                       x11-libs/libXext
-                       x11-libs/libX11
-                       x11-libs/libXxf86vm )
-               virtual/x11 )
+       x11-libs/libXxf86dga
+       x11-libs/libXext
+       x11-libs/libX11
+       x11-libs/libXxf86vm
        media-libs/libsdl"
 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}/WinQuake

diff --git a/games-fps/darkplaces/ChangeLog b/games-fps/darkplaces/ChangeLog
index 2ed9ca9052d01b1e3250122c218fad80435476ee..567d544ec7f92c0f9862d1e7c6bdbda78a8ec291 100644 (file)
--- a/games-fps/darkplaces/ChangeLog
+++ b/games-fps/darkplaces/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-fps/darkplaces
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/darkplaces/ChangeLog,v 1.2 2006/06/27 19:53:04 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/darkplaces/ChangeLog,v 1.3 2006/12/04 22:59:10 wolf31o2 Exp $
+
+  04 Dec 2006; Chris Gianelloni <wolf31o2@gentoo.org>
+  darkplaces-20060616_beta1.ebuild:
+  Removing old virtual/x11 dependency.
 
   27 Jun 2006; Chris Gianelloni <wolf31o2@gentoo.org>
   darkplaces-20060616_beta1.ebuild:

diff --git a/games-fps/darkplaces/darkplaces-20060616_beta1.ebuild b/games-fps/darkplaces/darkplaces-20060616_beta1.ebuild
index cdb3f516f260a609c4639a8424ea8e6bbd34d107..d22d4f202ddc772e4ee931428f4ba09c023f61cb 100644 (file)
--- a/games-fps/darkplaces/darkplaces-20060616_beta1.ebuild
+++ b/games-fps/darkplaces/darkplaces-20060616_beta1.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/darkplaces/darkplaces-20060616_beta1.ebuild,v 1.2 2006/06/27 19:53:04 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/darkplaces/darkplaces-20060616_beta1.ebuild,v 1.3 2006/12/04 22:59:10 wolf31o2 Exp $
 
 inherit eutils flag-o-matic versionator games
 
@@ -26,25 +26,19 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="alsa cdinstall cdsound dedicated demo dpmod lights opengl oss sdl textures"
 
-UIDEPEND="|| (
-       (
-               x11-proto/xextproto
-               x11-proto/xf86dgaproto
-               x11-proto/xf86vidmodeproto
-               x11-proto/xproto )
-       virtual/x11 )"
+UIDEPEND="x11-proto/xextproto
+       x11-proto/xf86dgaproto
+       x11-proto/xf86vidmodeproto
+       x11-proto/xproto"
 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 )"
+       x11-libs/libX11
+       x11-libs/libXau
+       x11-libs/libXdmcp
+       x11-libs/libXext
+       x11-libs/libXxf86dga
+       x11-libs/libXxf86vm"
 COMMON="media-libs/jpeg
        sdl? (
                media-libs/libsdl

diff --git a/games-fps/doomlegacy/ChangeLog b/games-fps/doomlegacy/ChangeLog
index c84639cc78ddc7bb09095fb31c0963cc97a71700..c96a0e67f01316f0761b21a0fac7e3c7d277fe56 100644 (file)
--- a/games-fps/doomlegacy/ChangeLog
+++ b/games-fps/doomlegacy/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-fps/doomlegacy
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/doomlegacy/ChangeLog,v 1.12 2006/02/13 21:22:53 tupone Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/doomlegacy/ChangeLog,v 1.13 2006/12/04 23:03:00 wolf31o2 Exp $
+
+  04 Dec 2006; Chris Gianelloni <wolf31o2@gentoo.org>
+  doomlegacy-1.42.ebuild:
+  Removing old virtual/x11 dependency.
 
   13 Feb 2006; <Tupone@gentoo.org> doomlegacy-1.42.ebuild:
   modular X dep

diff --git a/games-fps/doomlegacy/doomlegacy-1.42.ebuild b/games-fps/doomlegacy/doomlegacy-1.42.ebuild
index d9514e43db1a530204c4dc8c7767c6f02542a9af..02ea0ae7c4c069f991e606861c7c3a7f6c441fca 100644 (file)
--- a/games-fps/doomlegacy/doomlegacy-1.42.ebuild
+++ b/games-fps/doomlegacy/doomlegacy-1.42.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/doomlegacy/doomlegacy-1.42.ebuild,v 1.4 2006/02/13 21:22:53 tupone Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/doomlegacy/doomlegacy-1.42.ebuild,v 1.5 2006/12/04 23:03:00 wolf31o2 Exp $
 
 inherit eutils games
 
@@ -17,8 +17,7 @@ IUSE="X dga esd" #sdl - broken with recent sdl-mixer releases
 RDEPEND="
        virtual/opengl
        virtual/glu
-       || ( x11-libs/libXxf86vm
-                virtual/x11 )
+       x11-libs/libXxf86vm
        esd? ( media-sound/esound )"
        # broken with recent sdl-mixer releases
        #sdl? (
@@ -27,14 +26,9 @@ RDEPEND="
        #)"
 DEPEND="${RDEPEND}
        x86? ( >=dev-lang/nasm-0.98 )
-       || (
-                (
-                  x11-proto/xextproto
-              x11-proto/xf86vidmodeproto
-                  dga? ( x11-proto/xf86dgaproto )
-                )
-                virtual/x11
-          )"
+       x11-proto/xextproto
+    x11-proto/xf86vidmodeproto
+       dga? ( x11-proto/xf86dgaproto )"
 
 S=${WORKDIR}/doomlegacy_${PV/.}_src