Drop virtual/x11 references.

Package-Manager: portage-2.1.3_rc8

62 files changed, 313 insertions, 285 deletions

diff --git a/media-video/alevt/ChangeLog b/media-video/alevt/ChangeLog
index 022ac1464cd3..e42462998bb3 100644
--- a/media-video/alevt/ChangeLog
+++ b/media-video/alevt/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/alevt
-# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/alevt/ChangeLog,v 1.26 2006/07/15 21:26:42 tove Exp $
+# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/alevt/ChangeLog,v 1.27 2007/07/22 08:59:12 dberkholz Exp $
+
+  22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>;
+  alevt-1.6.1-r1.ebuild, alevt-1.6.1-r3.ebuild, alevt-1.6.1-r4.ebuild:
+  Drop virtual/x11 references.
 
   15 Jul 2006; Torsten Veller <tove@gentoo.org> alevt-1.6.1-r4.ebuild:
   Stable on x86 (#138022)
diff --git a/media-video/alevt/alevt-1.6.1-r1.ebuild b/media-video/alevt/alevt-1.6.1-r1.ebuild
index d780317d7027..c0e32c7dba41 100644
--- a/media-video/alevt/alevt-1.6.1-r1.ebuild
+++ b/media-video/alevt/alevt-1.6.1-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/alevt/alevt-1.6.1-r1.ebuild,v 1.4 2006/07/09 20:14:49 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/alevt/alevt-1.6.1-r1.ebuild,v 1.5 2007/07/22 08:59:12 dberkholz Exp $
 
 inherit eutils
 
@@ -15,11 +15,11 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~sparc x86"
 
-RDEPEND="|| ( x11-libs/libX11 <virtual/x11-7 )
+RDEPEND="x11-libs/libX11
 	>=media-libs/libpng-1.0.12"
 
 DEPEND="${RDEPEND}
-	|| ( x11-proto/xproto <virtual/x11-7 )"
+	x11-proto/xproto"
 
 src_unpack() {
 	unpack ${A}
diff --git a/media-video/alevt/alevt-1.6.1-r3.ebuild b/media-video/alevt/alevt-1.6.1-r3.ebuild
index 182c850b916d..98ff35d9fd22 100644
--- a/media-video/alevt/alevt-1.6.1-r3.ebuild
+++ b/media-video/alevt/alevt-1.6.1-r3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/alevt/alevt-1.6.1-r3.ebuild,v 1.3 2006/07/09 20:14:49 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/alevt/alevt-1.6.1-r3.ebuild,v 1.4 2007/07/22 08:59:12 dberkholz Exp $
 
 inherit eutils toolchain-funcs flag-o-matic
 
@@ -15,11 +15,11 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~sparc ~x86"
 
-RDEPEND="|| ( x11-libs/libX11 <virtual/x11-7 )
+RDEPEND="x11-libs/libX11
 	>=media-libs/libpng-1.0.12"
 
 DEPEND="${RDEPEND}
-	|| ( x11-proto/xproto <virtual/x11-7 )"
+	x11-proto/xproto"
 
 src_unpack() {
 	unpack ${A}
diff --git a/media-video/alevt/alevt-1.6.1-r4.ebuild b/media-video/alevt/alevt-1.6.1-r4.ebuild
index 31660eba6ee2..d3485460eeaf 100644
--- a/media-video/alevt/alevt-1.6.1-r4.ebuild
+++ b/media-video/alevt/alevt-1.6.1-r4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/alevt/alevt-1.6.1-r4.ebuild,v 1.3 2006/07/15 21:26:42 tove Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/alevt/alevt-1.6.1-r4.ebuild,v 1.4 2007/07/22 08:59:12 dberkholz Exp $
 
 inherit eutils toolchain-funcs flag-o-matic
 
@@ -15,11 +15,11 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~sparc x86"
 
-RDEPEND="|| ( x11-libs/libX11 <virtual/x11-7 )
+RDEPEND="x11-libs/libX11
 	>=media-libs/libpng-1.0.12"
 
 DEPEND="${RDEPEND}
-	|| ( x11-proto/xproto <virtual/x11-7 )"
+	x11-proto/xproto"
 
 src_unpack() {
 	unpack ${A}
diff --git a/media-video/avidemux/ChangeLog b/media-video/avidemux/ChangeLog
index b9e772620285..c10f726a82aa 100644
--- a/media-video/avidemux/ChangeLog
+++ b/media-video/avidemux/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/avidemux
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/ChangeLog,v 1.114 2007/02/07 21:03:45 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/ChangeLog,v 1.115 2007/07/22 08:57:53 dberkholz Exp $
+
+  22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>;
+  avidemux-2.3.0.ebuild:
+  Drop virtual/x11 references.
 
   07 Feb 2007; Alexis Ballier <aballier@gentoo.org> avidemux-2.3.0.ebuild:
   Fix faac configuration, bug #165817
diff --git a/media-video/avidemux/avidemux-2.3.0.ebuild b/media-video/avidemux/avidemux-2.3.0.ebuild
index f01a1495ec12..98a2bd10ae00 100644
--- a/media-video/avidemux/avidemux-2.3.0.ebuild
+++ b/media-video/avidemux/avidemux-2.3.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/avidemux-2.3.0.ebuild,v 1.8 2007/02/07 21:03:45 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/avidemux-2.3.0.ebuild,v 1.9 2007/07/22 08:57:53 dberkholz Exp $
 
 WANT_AUTOCONF="latest"
 WANT_AUTOMAKE="latest"
@@ -37,19 +37,15 @@ RDEPEND="
 	truetype? ( >=media-libs/freetype-2.1.5 )
 	alsa? ( >=media-libs/alsa-lib-1.0.3b-r2 )
 	sdl? ( media-libs/libsdl )
-	|| ( (
-			xv? ( x11-libs/libXv )
-			x11-libs/libX11
-			x11-libs/libXext
-			x11-libs/libXrender
-		) virtual/x11 )"
+	xv? ( x11-libs/libXv )
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXrender"
 
 DEPEND="$RDEPEND
-	|| ( (
-			x11-base/xorg-server
-			x11-libs/libXt
-			x11-proto/xextproto
-		) virtual/x11 )
+	x11-base/xorg-server
+	x11-libs/libXt
+	x11-proto/xextproto
 	dev-util/pkgconfig"
 
 pkg_setup() {
diff --git a/media-video/cinelerra-cvs/ChangeLog b/media-video/cinelerra-cvs/ChangeLog
index 1ed76632d5bd..3a832c03e9b1 100644
--- a/media-video/cinelerra-cvs/ChangeLog
+++ b/media-video/cinelerra-cvs/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/cinelerra-cvs
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/cinelerra-cvs/ChangeLog,v 1.30 2007/07/02 15:22:48 peper Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/cinelerra-cvs/ChangeLog,v 1.31 2007/07/22 08:56:59 dberkholz Exp $
+
+  22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>;
+  cinelerra-cvs-20070122.ebuild, cinelerra-cvs-20070607.ebuild:
+  Drop virtual/x11 references.
 
   02 Jul 2007; Piotr Jaroszyński <peper@gentoo.org>
   cinelerra-cvs-20070122.ebuild:
diff --git a/media-video/cinelerra-cvs/cinelerra-cvs-20070122.ebuild b/media-video/cinelerra-cvs/cinelerra-cvs-20070122.ebuild
index bb34e904e285..794aa122370b 100644
--- a/media-video/cinelerra-cvs/cinelerra-cvs-20070122.ebuild
+++ b/media-video/cinelerra-cvs/cinelerra-cvs-20070122.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/cinelerra-cvs/cinelerra-cvs-20070122.ebuild,v 1.3 2007/07/02 15:22:48 peper Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/cinelerra-cvs/cinelerra-cvs-20070122.ebuild,v 1.4 2007/07/22 08:56:59 dberkholz Exp $
 
 WANT_AUTOMAKE=1.9
 WANT_AUTOCONF=2.5
@@ -41,14 +41,12 @@ RDEPEND="media-libs/libpng
 	>=media-libs/libvorbis-1.1.0
 	>=media-libs/libogg-1.1
 	>=media-libs/libtheora-1.0_alpha4-r1
-	|| ( (
-			x11-libs/libX11
-			x11-libs/libXv
-			x11-libs/libXxf86vm
-			x11-libs/libXext
-			x11-libs/libXvMC
-			x11-libs/libXft
-		) virtual/x11 )"
+	x11-libs/libX11
+	x11-libs/libXv
+	x11-libs/libXxf86vm
+	x11-libs/libXext
+	x11-libs/libXvMC
+	x11-libs/libXft"
 
 DEPEND="${RDEPEND}
 	x86? ( dev-lang/nasm )"
diff --git a/media-video/cinelerra-cvs/cinelerra-cvs-20070607.ebuild b/media-video/cinelerra-cvs/cinelerra-cvs-20070607.ebuild
index 69bffd1568b6..c7b2501cb07c 100644
--- a/media-video/cinelerra-cvs/cinelerra-cvs-20070607.ebuild
+++ b/media-video/cinelerra-cvs/cinelerra-cvs-20070607.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/cinelerra-cvs/cinelerra-cvs-20070607.ebuild,v 1.1 2007/06/11 19:26:02 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/cinelerra-cvs/cinelerra-cvs-20070607.ebuild,v 1.2 2007/07/22 08:56:59 dberkholz Exp $
 
 WANT_AUTOMAKE=1.9
 WANT_AUTOCONF=2.5
@@ -39,14 +39,12 @@ RDEPEND="media-libs/libpng
 	>=media-libs/libvorbis-1.1.0
 	>=media-libs/libogg-1.1
 	>=media-libs/libtheora-1.0_alpha4-r1
-	|| ( (
-			x11-libs/libX11
-			x11-libs/libXv
-			x11-libs/libXxf86vm
-			x11-libs/libXext
-			x11-libs/libXvMC
-			x11-libs/libXft
-		) virtual/x11 )"
+	x11-libs/libX11
+	x11-libs/libXv
+	x11-libs/libXxf86vm
+	x11-libs/libXext
+	x11-libs/libXvMC
+	x11-libs/libXft"
 
 DEPEND="${RDEPEND}
 	x86? ( dev-lang/nasm )"
diff --git a/media-video/codeine/ChangeLog b/media-video/codeine/ChangeLog
index cc9060cb4b5a..e566dcd04e8d 100644
--- a/media-video/codeine/ChangeLog
+++ b/media-video/codeine/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/codeine
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/codeine/ChangeLog,v 1.16 2007/02/22 01:44:32 peper Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/codeine/ChangeLog,v 1.17 2007/07/22 08:55:39 dberkholz Exp $
+
+  22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>;
+  codeine-1.0.1.3.ebuild:
+  Drop virtual/x11 references.
 
   22 Feb 2007; Piotr Jaroszyński <peper@gentoo.org> ChangeLog:
   Transition to Manifest2.
diff --git a/media-video/codeine/codeine-1.0.1.3.ebuild b/media-video/codeine/codeine-1.0.1.3.ebuild
index 5b73124c44a5..647cce6615ee 100644
--- a/media-video/codeine/codeine-1.0.1.3.ebuild
+++ b/media-video/codeine/codeine-1.0.1.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/codeine/codeine-1.0.1.3.ebuild,v 1.3 2006/08/30 16:44:14 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/codeine/codeine-1.0.1.3.ebuild,v 1.4 2007/07/22 08:55:39 dberkholz Exp $
 
 inherit kde multilib versionator toolchain-funcs
 
@@ -16,8 +16,7 @@ KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="media-libs/xine-lib
-	|| ( x11-libs/libXtst
-		<virtual/x11-7 )"
+	x11-libs/libXtst"
 
 DEPEND="${RDEPEND}
 	dev-util/scons"
diff --git a/media-video/cxfe/ChangeLog b/media-video/cxfe/ChangeLog
index fd199bfb7138..5526f2d37701 100644
--- a/media-video/cxfe/ChangeLog
+++ b/media-video/cxfe/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/cxfe
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/cxfe/ChangeLog,v 1.18 2007/01/30 19:18:44 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/cxfe/ChangeLog,v 1.19 2007/07/22 08:54:59 dberkholz Exp $
+
+  22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>; cxfe-0.9.1.ebuild,
+  cxfe-0.9.1-r2.ebuild:
+  Drop virtual/x11 references.
 
   30 Jan 2007; Alexis Ballier <aballier@gentoo.org>
   +files/cxfe-0.9.1-asneeded.patch, cxfe-0.9.1-r2.ebuild:
diff --git a/media-video/cxfe/cxfe-0.9.1-r2.ebuild b/media-video/cxfe/cxfe-0.9.1-r2.ebuild
index f1a424974f68..46c63c260376 100644
--- a/media-video/cxfe/cxfe-0.9.1-r2.ebuild
+++ b/media-video/cxfe/cxfe-0.9.1-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/cxfe/cxfe-0.9.1-r2.ebuild,v 1.4 2007/01/30 19:18:44 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/cxfe/cxfe-0.9.1-r2.ebuild,v 1.5 2007/07/22 08:54:59 dberkholz Exp $
 
 inherit eutils
 
@@ -15,16 +15,14 @@ KEYWORDS="~x86 ~amd64 ~ppc"
 IUSE="lirc"
 
 RDEPEND=">=media-libs/xine-lib-1_rc1
-	   || ( ( x11-libs/libX11
-	      x11-libs/libXext )
-	   virtual/x11 )
+	   x11-libs/libX11
+	   x11-libs/libXext
 	   lirc? ( app-misc/lirc )
 	   sys-libs/ncurses"
 
 DEPEND="${RDEPEND}
-	   || ( ( x11-libs/libX11
-	      x11-libs/libXext )
-	   virtual/x11 )"
+	   x11-libs/libX11
+	   x11-libs/libXext"
 
 src_unpack() {
 	unpack ${A}
diff --git a/media-video/cxfe/cxfe-0.9.1.ebuild b/media-video/cxfe/cxfe-0.9.1.ebuild
index 13da07c6e11b..cfc67c89edb2 100644
--- a/media-video/cxfe/cxfe-0.9.1.ebuild
+++ b/media-video/cxfe/cxfe-0.9.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/cxfe/cxfe-0.9.1.ebuild,v 1.4 2006/02/23 21:41:39 arj Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/cxfe/cxfe-0.9.1.ebuild,v 1.5 2007/07/22 08:54:59 dberkholz Exp $
 
 inherit eutils
 
@@ -15,16 +15,14 @@ KEYWORDS="x86 amd64"
 IUSE="lirc"
 
 RDEPEND=">=media-libs/xine-lib-1_rc1
-	   || ( ( x11-libs/libX11
-	      x11-libs/libXext )
-	   virtual/x11 )
+	   x11-libs/libX11
+	   x11-libs/libXext
 	   lirc? ( app-misc/lirc )
 	   sys-libs/ncurses"
 
 DEPEND="${RDEPEND}
-	   || ( ( x11-libs/libX11
-	      x11-libs/libXext )
-	   virtual/x11 )"
+	   x11-libs/libX11
+	   x11-libs/libXext"
 src_unpack() {
 	unpack ${A}
 	mv cxfe ${P}
diff --git a/media-video/gpac/ChangeLog b/media-video/gpac/ChangeLog
index 9dbb7551efdd..eb23bc572685 100644
--- a/media-video/gpac/ChangeLog
+++ b/media-video/gpac/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/gpac
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/gpac/ChangeLog,v 1.40 2007/05/14 04:38:18 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/gpac/ChangeLog,v 1.41 2007/07/22 08:50:27 dberkholz Exp $
+
+  22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>; gpac-0.4.2.ebuild,
+  gpac-0.4.2-r1.ebuild:
+  Drop virtual/x11 references.
 
   14 May 2007; Ryan Hill <dirtyepic@gentoo.org> gpac-0.4.2-r1.ebuild:
   Use wxwidgets.eclass.  Touch up ebuild.
diff --git a/media-video/gpac/gpac-0.4.2-r1.ebuild b/media-video/gpac/gpac-0.4.2-r1.ebuild
index 32ce0c7e7016..9e6c57397613 100644
--- a/media-video/gpac/gpac-0.4.2-r1.ebuild
+++ b/media-video/gpac/gpac-0.4.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/gpac/gpac-0.4.2-r1.ebuild,v 1.11 2007/05/14 04:38:18 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/gpac/gpac-0.4.2-r1.ebuild,v 1.12 2007/07/22 08:50:27 dberkholz Exp $
 
 inherit eutils wxwidgets flag-o-matic multilib toolchain-funcs
 
@@ -35,11 +35,9 @@ RDEPEND="aac? ( media-libs/faad2 )
 	xml? ( >=dev-libs/libxml2-2.6.0 )
 	xvid? ( >=media-libs/xvid-1.0.1 )
 	sdl? ( media-libs/libsdl )
-		|| ( (
-			x11-libs/libXt
-			x11-libs/libX11
-			x11-libs/libXext
-		) virtual/x11 )"
+	x11-libs/libXt
+	x11-libs/libX11
+	x11-libs/libXext"
 
 DEPEND="${RDEPEND}"
 
diff --git a/media-video/gpac/gpac-0.4.2.ebuild b/media-video/gpac/gpac-0.4.2.ebuild
index 61f89b56cf94..7b0d15b9846d 100644
--- a/media-video/gpac/gpac-0.4.2.ebuild
+++ b/media-video/gpac/gpac-0.4.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/gpac/gpac-0.4.2.ebuild,v 1.5 2006/10/09 21:42:59 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/gpac/gpac-0.4.2.ebuild,v 1.6 2007/07/22 08:50:27 dberkholz Exp $
 
 inherit eutils wxwidgets flag-o-matic multilib
 
@@ -34,11 +34,9 @@ RDEPEND="aac? ( media-libs/faad2 )
 	xml? ( >=dev-libs/libxml2-2.6.0 )
 	xvid? ( >=media-libs/xvid-1.0.1 )
 	sdl? ( media-libs/libsdl )
-		|| ( (
-			x11-libs/libXt
-			x11-libs/libX11
-			x11-libs/libXext
-		) virtual/x11 )"
+	x11-libs/libXt
+	x11-libs/libX11
+	x11-libs/libXext"
 
 DEPEND="${RDEPEND}"
 
diff --git a/media-video/gxine/ChangeLog b/media-video/gxine/ChangeLog
index 7e2666ab09c5..ff6fd47bdcf9 100644
--- a/media-video/gxine/ChangeLog
+++ b/media-video/gxine/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/gxine
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/gxine/ChangeLog,v 1.85 2007/05/12 10:40:42 drac Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/gxine/ChangeLog,v 1.86 2007/07/22 08:53:44 dberkholz Exp $
+
+  22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>; gxine-0.4.5.ebuild,
+  gxine-0.5.7.ebuild:
+  Drop virtual/x11 references.
 
   12 May 2007; Samuli Suominen <drac@gentoo.org> gxine-0.5.11.ebuild:
   Kill virtual/x11 usage.
diff --git a/media-video/gxine/gxine-0.4.5.ebuild b/media-video/gxine/gxine-0.4.5.ebuild
index e6ba3f5377ab..14a963d460e7 100644
--- a/media-video/gxine/gxine-0.4.5.ebuild
+++ b/media-video/gxine/gxine-0.4.5.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/gxine/gxine-0.4.5.ebuild,v 1.12 2006/07/09 04:14:32 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/gxine/gxine-0.4.5.ebuild,v 1.13 2007/07/22 08:53:44 dberkholz Exp $
 
 inherit eutils nsplugins fdo-mime
 
@@ -13,7 +13,7 @@ RDEPEND="media-libs/libpng
 	>=x11-libs/gtk+-2.6
 	>=dev-libs/glib-2.6
 	dev-lang/spidermonkey
-	|| ( x11-libs/libXtst <virtual/x11-7 )
+	x11-libs/libXtst
 	lirc? ( app-misc/lirc )"
 DEPEND="${RDEPEND}
 	nls? ( sys-devel/gettext )
diff --git a/media-video/gxine/gxine-0.5.7.ebuild b/media-video/gxine/gxine-0.5.7.ebuild
index 94e590350586..ddf07897a758 100644
--- a/media-video/gxine/gxine-0.5.7.ebuild
+++ b/media-video/gxine/gxine-0.5.7.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/gxine/gxine-0.5.7.ebuild,v 1.7 2006/10/01 17:44:23 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/gxine/gxine-0.5.7.ebuild,v 1.8 2007/07/22 08:53:44 dberkholz Exp $
 
 inherit eutils nsplugins fdo-mime libtool
 
@@ -14,22 +14,18 @@ RDEPEND="media-libs/libpng
 	>=dev-libs/glib-2.6
 	>=dev-lang/spidermonkey-1.5_rc6-r1
 	lirc? ( app-misc/lirc )
-	|| ( (
-			x11-libs/libX11
-			x11-libs/libXext
-			x11-libs/libXrender
-			xinerama? ( x11-libs/libXinerama )
-		) <virtual/x11-7 )
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXrender
+	xinerama? ( x11-libs/libXinerama )
 	nls? ( virtual/libintl )"
 DEPEND="${RDEPEND}
 	nls? ( sys-devel/gettext )
 	dev-util/pkgconfig
-	|| ( (
-			x11-libs/libX11
-			x11-libs/libXt
-			x11-libs/libXaw
-			xinerama? ( x11-proto/xineramaproto )
-		) <virtual/x11-7 )"
+	x11-libs/libX11
+	x11-libs/libXt
+	x11-libs/libXaw
+	xinerama? ( x11-proto/xineramaproto )"
 
 IUSE="nls lirc nsplugin xinerama"
 
diff --git a/media-video/kaffeine/ChangeLog b/media-video/kaffeine/ChangeLog
index 0cb5da3ccbf1..050efda5b2db 100644
--- a/media-video/kaffeine/ChangeLog
+++ b/media-video/kaffeine/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/kaffeine
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/kaffeine/ChangeLog,v 1.73 2007/04/13 23:49:54 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/kaffeine/ChangeLog,v 1.74 2007/07/22 08:52:44 dberkholz Exp $
+
+  22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>;
+  kaffeine-0.7.1-r2.ebuild:
+  Drop virtual/x11 references.
 
 *kaffeine-0.8.4 (13 Apr 2007)
 
diff --git a/media-video/kaffeine/kaffeine-0.7.1-r2.ebuild b/media-video/kaffeine/kaffeine-0.7.1-r2.ebuild
index 28374b3c772e..c75051b85550 100644
--- a/media-video/kaffeine/kaffeine-0.7.1-r2.ebuild
+++ b/media-video/kaffeine/kaffeine-0.7.1-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/kaffeine/kaffeine-0.7.1-r2.ebuild,v 1.5 2006/07/09 05:58:45 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/kaffeine/kaffeine-0.7.1-r2.ebuild,v 1.6 2007/07/22 08:52:44 dberkholz Exp $
 
 inherit eutils kde
 
@@ -13,15 +13,14 @@ SLOT="0"
 KEYWORDS="amd64 ppc ppc64 ~sparc x86"
 IUSE="dvb gstreamer xinerama"
 
-RDEPEND="|| ( x11-base/xorg-server
-	      >=x11-base/xorg-x11-6.8.0-r4 )
+RDEPEND="x11-base/xorg-server
 	>=media-libs/xine-lib-1
 	gstreamer? ( =media-libs/gstreamer-0.8*
 		=media-libs/gst-plugins-0.8* )
-	xinerama? ( || ( x11-libs/libXinerama <virtual/x11-7 ) )"
+	xinerama? ( x11-libs/libXinerama )"
 
 DEPEND="${RDEPEND}
-	xinerama? ( || ( x11-proto/xineramaproto <virtual/x11-7 ) )
+	xinerama? ( x11-proto/xineramaproto )
 	dvb? ( media-tv/linuxtv-dvb-headers )
 	dev-util/pkgconfig"
 
diff --git a/media-video/kdenlive/ChangeLog b/media-video/kdenlive/ChangeLog
index f5fc65a5b0e1..071b830a5d76 100644
--- a/media-video/kdenlive/ChangeLog
+++ b/media-video/kdenlive/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-video/kdenlive
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/kdenlive/ChangeLog,v 1.17 2007/04/14 17:49:54 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/kdenlive/ChangeLog,v 1.18 2007/07/22 08:51:36 dberkholz Exp $
+
+  22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>; kdenlive-0.4.ebuild:
+  Drop virtual/x11 references.
 
   14 Apr 2007; Stefan Schweizer <genstef@gentoo.org> kdenlive-0.4.ebuild:
   Add built_with_use check thanks to Johannes Hirte <johannes-hirte@web.de> in
diff --git a/media-video/kdenlive/kdenlive-0.4.ebuild b/media-video/kdenlive/kdenlive-0.4.ebuild
index 5d1959d5c730..9f6aa9cb5067 100644
--- a/media-video/kdenlive/kdenlive-0.4.ebuild
+++ b/media-video/kdenlive/kdenlive-0.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/kdenlive/kdenlive-0.4.ebuild,v 1.2 2007/04/14 17:49:54 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/kdenlive/kdenlive-0.4.ebuild,v 1.3 2007/07/22 08:51:36 dberkholz Exp $
 
 inherit eutils kde
 
@@ -27,11 +27,9 @@ RDEPEND=">=media-libs/libsdl-1.2.8-r1
 	>=media-libs/mlt++-20060601"
 
 DEPEND="${RDEPEND}
-	|| ( (
-			x11-base/xorg-server
-			x11-libs/libXt
-			x11-proto/xextproto
-		) virtual/x11 )
+	x11-base/xorg-server
+	x11-libs/libXt
+	x11-proto/xextproto
 	dev-util/pkgconfig
 	>=sys-devel/autoconf-2.58
 	>=sys-devel/automake-1.8.3"
diff --git a/media-video/mjpegtools/ChangeLog b/media-video/mjpegtools/ChangeLog
index 9c23ebe44aac..4784e8f3cd24 100644
--- a/media-video/mjpegtools/ChangeLog
+++ b/media-video/mjpegtools/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-video/mjpegtools
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mjpegtools/ChangeLog,v 1.127 2007/03/05 14:02:42 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mjpegtools/ChangeLog,v 1.128 2007/07/22 08:49:26 dberkholz Exp $
+
+  22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>;
+  mjpegtools-1.8.0-r1.ebuild, mjpegtools-1.8.0-r2.ebuild,
+  mjpegtools-1.9.0_rc1.ebuild, mjpegtools-1.9.0_rc2.ebuild:
+  Drop virtual/x11 references.
 
 *mjpegtools-1.9.0_rc2 (05 Mar 2007)
 
diff --git a/media-video/mjpegtools/mjpegtools-1.8.0-r1.ebuild b/media-video/mjpegtools/mjpegtools-1.8.0-r1.ebuild
index 26c9eee56c85..53bd218b6c8b 100644
--- a/media-video/mjpegtools/mjpegtools-1.8.0-r1.ebuild
+++ b/media-video/mjpegtools/mjpegtools-1.8.0-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mjpegtools/mjpegtools-1.8.0-r1.ebuild,v 1.24 2006/11/20 13:02:30 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mjpegtools/mjpegtools-1.8.0-r1.ebuild,v 1.25 2007/07/22 08:49:26 dberkholz Exp $
 
 WANT_AUTOMAKE="latest"
 WANT_AUTOCONF="latest"
@@ -23,11 +23,8 @@ RDEPEND="media-libs/jpeg
 	quicktime? ( virtual/quicktime )
 	png? ( media-libs/libpng )
 	sdl? ( >=media-libs/libsdl-1.2.7-r3 )
-	X? ( || ( ( x11-libs/libX11
-				x11-libs/libXt
-			)
-			virtual/x11
-		)
+	X? ( x11-libs/libX11
+		x11-libs/libXt
 	)"
 
 DEPEND="${RDEPEND}
diff --git a/media-video/mjpegtools/mjpegtools-1.8.0-r2.ebuild b/media-video/mjpegtools/mjpegtools-1.8.0-r2.ebuild
index 26587cce921e..082b8aeec977 100644
--- a/media-video/mjpegtools/mjpegtools-1.8.0-r2.ebuild
+++ b/media-video/mjpegtools/mjpegtools-1.8.0-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mjpegtools/mjpegtools-1.8.0-r2.ebuild,v 1.2 2006/11/20 13:02:30 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mjpegtools/mjpegtools-1.8.0-r2.ebuild,v 1.3 2007/07/22 08:49:26 dberkholz Exp $
 
 WANT_AUTOMAKE="latest"
 WANT_AUTOCONF="latest"
@@ -23,11 +23,8 @@ RDEPEND="media-libs/jpeg
 	quicktime? ( virtual/quicktime )
 	png? ( media-libs/libpng )
 	sdl? ( >=media-libs/libsdl-1.2.7-r3 )
-	X? ( || ( ( x11-libs/libX11
-				x11-libs/libXt
-			)
-			virtual/x11
-		)
+	X? ( x11-libs/libX11
+		x11-libs/libXt
 	)"
 
 DEPEND="${RDEPEND}
diff --git a/media-video/mjpegtools/mjpegtools-1.9.0_rc1.ebuild b/media-video/mjpegtools/mjpegtools-1.9.0_rc1.ebuild
index deb2a84ee249..5556a23d298d 100644
--- a/media-video/mjpegtools/mjpegtools-1.9.0_rc1.ebuild
+++ b/media-video/mjpegtools/mjpegtools-1.9.0_rc1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mjpegtools/mjpegtools-1.9.0_rc1.ebuild,v 1.1 2007/02/25 22:43:21 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mjpegtools/mjpegtools-1.9.0_rc1.ebuild,v 1.2 2007/07/22 08:49:26 dberkholz Exp $
 
 WANT_AUTOMAKE="latest"
 WANT_AUTOCONF="latest"
@@ -25,11 +25,8 @@ RDEPEND="media-libs/jpeg
 	quicktime? ( virtual/quicktime )
 	png? ( media-libs/libpng )
 	sdl? ( >=media-libs/libsdl-1.2.7-r3 )
-	X? ( || ( ( x11-libs/libX11
-				x11-libs/libXt
-			)
-			virtual/x11
-		)
+	X? ( x11-libs/libX11
+		x11-libs/libXt
 	)"
 
 DEPEND="${RDEPEND}
diff --git a/media-video/mjpegtools/mjpegtools-1.9.0_rc2.ebuild b/media-video/mjpegtools/mjpegtools-1.9.0_rc2.ebuild
index 1f48081a73d5..8824ea494ae2 100644
--- a/media-video/mjpegtools/mjpegtools-1.9.0_rc2.ebuild
+++ b/media-video/mjpegtools/mjpegtools-1.9.0_rc2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mjpegtools/mjpegtools-1.9.0_rc2.ebuild,v 1.1 2007/03/05 14:02:42 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mjpegtools/mjpegtools-1.9.0_rc2.ebuild,v 1.2 2007/07/22 08:49:26 dberkholz Exp $
 
 WANT_AUTOMAKE="latest"
 WANT_AUTOCONF="latest"
@@ -24,11 +24,8 @@ RDEPEND="media-libs/jpeg
 	quicktime? ( virtual/quicktime )
 	png? ( media-libs/libpng )
 	sdl? ( >=media-libs/libsdl-1.2.7-r3 )
-	X? ( || ( ( x11-libs/libX11
-				x11-libs/libXt
-			)
-			virtual/x11
-		)
+	X? ( x11-libs/libX11
+		x11-libs/libXt
 	)"
 
 DEPEND="${RDEPEND}
diff --git a/media-video/motioneye/ChangeLog b/media-video/motioneye/ChangeLog
index db7bbe2a3645..f500cef31d74 100644
--- a/media-video/motioneye/ChangeLog
+++ b/media-video/motioneye/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/motioneye
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/motioneye/ChangeLog,v 1.10 2007/02/22 01:50:36 peper Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/motioneye/ChangeLog,v 1.11 2007/07/22 08:47:53 dberkholz Exp $
+
+  22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>;
+  motioneye-1.3-r1.ebuild:
+  Drop virtual/x11 references.
 
   22 Feb 2007; Piotr Jaroszyński <peper@gentoo.org> ChangeLog:
   Transition to Manifest2.
diff --git a/media-video/motioneye/motioneye-1.3-r1.ebuild b/media-video/motioneye/motioneye-1.3-r1.ebuild
index 62d356576b93..3eec373d6734 100644
--- a/media-video/motioneye/motioneye-1.3-r1.ebuild
+++ b/media-video/motioneye/motioneye-1.3-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/motioneye/motioneye-1.3-r1.ebuild,v 1.2 2006/01/26 05:49:05 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/motioneye/motioneye-1.3-r1.ebuild,v 1.3 2007/07/22 08:47:53 dberkholz Exp $
 
 inherit eutils
 
@@ -11,18 +11,12 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~x86"
 IUSE="X"
-RDEPEND="X? ( || (
-					( x11-libs/libX11 )
-					virtual/x11
-				)
+RDEPEND="X? ( x11-libs/libX11
 			media-libs/imlib )"
 
 DEPEND="${RDEPEND}
 	sys-kernel/linux-headers
-	X? ( || (
-		( x11-proto/xextproto )
-		virtual/x11
-		) )
+	X? ( x11-proto/xextproto )
 	app-text/docbook-sgml-utils"
 
 src_compile() {
diff --git a/media-video/mpeg-tools/ChangeLog b/media-video/mpeg-tools/ChangeLog
index 368b5f72b7d8..ee5c1154b9b9 100644
--- a/media-video/mpeg-tools/ChangeLog
+++ b/media-video/mpeg-tools/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/mpeg-tools
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mpeg-tools/ChangeLog,v 1.18 2007/02/22 01:51:36 peper Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mpeg-tools/ChangeLog,v 1.19 2007/07/22 08:46:49 dberkholz Exp $
+
+  22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>;
+  mpeg-tools-1.5b-r2.ebuild:
+  Drop virtual/x11 references.
 
   22 Feb 2007; Piotr Jaroszyński <peper@gentoo.org> ChangeLog:
   Transition to Manifest2.
diff --git a/media-video/mpeg-tools/mpeg-tools-1.5b-r2.ebuild b/media-video/mpeg-tools/mpeg-tools-1.5b-r2.ebuild
index 95aa90c653db..62a44c23568b 100644
--- a/media-video/mpeg-tools/mpeg-tools-1.5b-r2.ebuild
+++ b/media-video/mpeg-tools/mpeg-tools-1.5b-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mpeg-tools/mpeg-tools-1.5b-r2.ebuild,v 1.6 2007/01/05 20:39:33 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mpeg-tools/mpeg-tools-1.5b-r2.ebuild,v 1.7 2007/07/22 08:46:49 dberkholz Exp $
 
 inherit eutils
 
@@ -14,7 +14,7 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE=""
 
-DEPEND="|| ( x11-libs/libX11 virtual/x11 )
+DEPEND="x11-libs/libX11
 	media-libs/jpeg"
 
 S=${WORKDIR}/${MY_PN}
diff --git a/media-video/mpeg4ip/ChangeLog b/media-video/mpeg4ip/ChangeLog
index 071a24697d0c..32967eefe926 100644
--- a/media-video/mpeg4ip/ChangeLog
+++ b/media-video/mpeg4ip/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-video/mpeg4ip
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mpeg4ip/ChangeLog,v 1.50 2007/04/17 21:28:36 tester Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mpeg4ip/ChangeLog,v 1.51 2007/07/22 08:45:39 dberkholz Exp $
+
+  22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>; mpeg4ip-1.4.1.ebuild,
+  mpeg4ip-1.4.1-r1.ebuild, mpeg4ip-1.5.0.1-r1.ebuild,
+  mpeg4ip-1.5.0.1-r2.ebuild:
+  Drop virtual/x11 references.
 
 *mpeg4ip-1.5.0.1-r2 (17 Apr 2007)
 
diff --git a/media-video/mpeg4ip/mpeg4ip-1.4.1-r1.ebuild b/media-video/mpeg4ip/mpeg4ip-1.4.1-r1.ebuild
index 047ba8f07e00..249a9fcbdbb3 100644
--- a/media-video/mpeg4ip/mpeg4ip-1.4.1-r1.ebuild
+++ b/media-video/mpeg4ip/mpeg4ip-1.4.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mpeg4ip/mpeg4ip-1.4.1-r1.ebuild,v 1.4 2007/07/12 02:40:42 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mpeg4ip/mpeg4ip-1.4.1-r1.ebuild,v 1.5 2007/07/22 08:45:39 dberkholz Exp $
 
 inherit eutils multilib
 
@@ -34,7 +34,7 @@ RDEPEND=" media-libs/libsdl
 		ffmpeg? ( >=media-video/ffmpeg-0.4.7 )
 		x264? ( media-libs/x264-svn )
 	)
-	nas? ( media-libs/nas || ( x11-libs/libXt virtual/x11 ) )
+	nas? ( media-libs/nas x11-libs/libXt )
 	alsa? ( media-libs/alsa-lib )
 	arts? ( kde-base/arts )
 	esd? ( media-sound/esound )
diff --git a/media-video/mpeg4ip/mpeg4ip-1.4.1.ebuild b/media-video/mpeg4ip/mpeg4ip-1.4.1.ebuild
index 539435c097fa..eb677dab9cb7 100644
--- a/media-video/mpeg4ip/mpeg4ip-1.4.1.ebuild
+++ b/media-video/mpeg4ip/mpeg4ip-1.4.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mpeg4ip/mpeg4ip-1.4.1.ebuild,v 1.13 2007/07/12 02:40:42 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mpeg4ip/mpeg4ip-1.4.1.ebuild,v 1.14 2007/07/22 08:45:39 dberkholz Exp $
 
 inherit eutils multilib
 
@@ -32,7 +32,7 @@ RDEPEND=" media-libs/libsdl
 		lame? ( >=media-sound/lame-3.92 )
 		ffmpeg? ( >=media-video/ffmpeg-0.4.7 )
 	)
-	nas? ( media-libs/nas || ( x11-libs/libXt virtual/x11 ) )
+	nas? ( media-libs/nas x11-libs/libXt )
 	alsa? ( media-libs/alsa-lib )
 	arts? ( kde-base/arts )
 	esd? ( media-sound/esound )
diff --git a/media-video/mpeg4ip/mpeg4ip-1.5.0.1-r1.ebuild b/media-video/mpeg4ip/mpeg4ip-1.5.0.1-r1.ebuild
index 8437966d0475..47b769d1ada1 100644
--- a/media-video/mpeg4ip/mpeg4ip-1.5.0.1-r1.ebuild
+++ b/media-video/mpeg4ip/mpeg4ip-1.5.0.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mpeg4ip/mpeg4ip-1.5.0.1-r1.ebuild,v 1.7 2007/07/12 02:40:42 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mpeg4ip/mpeg4ip-1.5.0.1-r1.ebuild,v 1.8 2007/07/22 08:45:39 dberkholz Exp $
 
 WANT_AUTOMAKE="1.9"
 
@@ -36,7 +36,7 @@ RDEPEND=" media-libs/libsdl
 		ffmpeg? ( >=media-video/ffmpeg-0.4.7 )
 		x264? ( media-libs/x264-svn )
 	)
-	nas? ( media-libs/nas || ( x11-libs/libXt virtual/x11 ) )
+	nas? ( media-libs/nas x11-libs/libXt )
 	alsa? ( media-libs/alsa-lib )
 	arts? ( kde-base/arts )
 	esd? ( media-sound/esound )
diff --git a/media-video/mpeg4ip/mpeg4ip-1.5.0.1-r2.ebuild b/media-video/mpeg4ip/mpeg4ip-1.5.0.1-r2.ebuild
index 982875b65ccb..77dbe9cc2040 100644
--- a/media-video/mpeg4ip/mpeg4ip-1.5.0.1-r2.ebuild
+++ b/media-video/mpeg4ip/mpeg4ip-1.5.0.1-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mpeg4ip/mpeg4ip-1.5.0.1-r2.ebuild,v 1.2 2007/07/12 02:40:42 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mpeg4ip/mpeg4ip-1.5.0.1-r2.ebuild,v 1.3 2007/07/22 08:45:39 dberkholz Exp $
 
 WANT_AUTOMAKE="1.9"
 
@@ -36,7 +36,7 @@ RDEPEND=" media-libs/libsdl
 		ffmpeg? ( >=media-video/ffmpeg-0.4.7 )
 		x264? ( media-libs/x264-svn )
 	)
-	nas? ( media-libs/nas || ( x11-libs/libXt virtual/x11 ) )
+	nas? ( media-libs/nas x11-libs/libXt )
 	alsa? ( media-libs/alsa-lib )
 	arts? ( kde-base/arts )
 	esd? ( media-sound/esound )
diff --git a/media-video/nvidia-settings/ChangeLog b/media-video/nvidia-settings/ChangeLog
index 3da38ede3bb1..5419f7fe3569 100644
--- a/media-video/nvidia-settings/ChangeLog
+++ b/media-video/nvidia-settings/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/nvidia-settings
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-settings/ChangeLog,v 1.32 2007/04/13 10:08:32 welp Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-settings/ChangeLog,v 1.33 2007/07/22 08:43:55 dberkholz Exp $
+
+  22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>;
+  nvidia-settings-1.0.20051122-r3.ebuild:
+  Drop virtual/x11 references.
 
   13 Apr 2007; Peter Weller <welp@gentoo.org>
   nvidia-settings-1.0.20070302.ebuild:
diff --git a/media-video/nvidia-settings/nvidia-settings-1.0.20051122-r3.ebuild b/media-video/nvidia-settings/nvidia-settings-1.0.20051122-r3.ebuild
index fce6bffaa8ea..7807fdb20bc9 100644
--- a/media-video/nvidia-settings/nvidia-settings-1.0.20051122-r3.ebuild
+++ b/media-video/nvidia-settings/nvidia-settings-1.0.20051122-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-settings/nvidia-settings-1.0.20051122-r3.ebuild,v 1.8 2007/03/07 21:57:40 peper Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-settings/nvidia-settings-1.0.20051122-r3.ebuild,v 1.9 2007/07/22 08:43:55 dberkholz Exp $
 
 inherit eutils toolchain-funcs multilib
 
@@ -27,22 +27,18 @@ IUSE=
 # for.
 DEPEND=">=x11-libs/gtk+-2
 		dev-util/pkgconfig
-		|| ( ( 	x11-base/xorg-server
-				x11-libs/libXt
-				x11-libs/libXv
-				x11-proto/xf86driproto
-				x11-misc/imake
-				x11-misc/gccmakedep )
-			virtual/x11
-		)"
+		x11-base/xorg-server
+		x11-libs/libXt
+		x11-libs/libXv
+		x11-proto/xf86driproto
+		x11-misc/imake
+		x11-misc/gccmakedep"
 RDEPEND="|| (
 			>=x11-drivers/nvidia-drivers-${NVIDIA_NEW_VERSION}
 			>=x11-drivers/nvidia-legacy-drivers-${NVIDIA_LEGACY_VERSION} )
 		>=x11-libs/gtk+-2
-		|| ( (	x11-base/xorg-server
-				x11-libs/libXt )
-			virtual/x11
-		)"
+		x11-base/xorg-server
+		x11-libs/libXt"
 
 src_unpack() {
 	unpack ${A}
diff --git a/media-video/ogle/ChangeLog b/media-video/ogle/ChangeLog
index aa4f07c6f467..ea7c0bba635a 100644
--- a/media-video/ogle/ChangeLog
+++ b/media-video/ogle/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-video/ogle
-# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ogle/ChangeLog,v 1.46 2006/08/29 21:20:02 jer Exp $
+# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/ogle/ChangeLog,v 1.47 2007/07/22 08:42:46 dberkholz Exp $
+
+  22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>; ogle-0.9.2-r1.ebuild:
+  Drop virtual/x11 references.
 
   29 Aug 2006; Jeroen Roovers <jer@gentoo.org> ogle-0.9.2-r1.ebuild:
   Marked ~hppa.
diff --git a/media-video/ogle/ogle-0.9.2-r1.ebuild b/media-video/ogle/ogle-0.9.2-r1.ebuild
index be6f05023326..8a7b6a440f48 100644
--- a/media-video/ogle/ogle-0.9.2-r1.ebuild
+++ b/media-video/ogle/ogle-0.9.2-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ogle/ogle-0.9.2-r1.ebuild,v 1.11 2006/08/29 21:20:02 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ogle/ogle-0.9.2-r1.ebuild,v 1.12 2007/07/22 08:42:46 dberkholz Exp $
 
 inherit eutils libtool
 
@@ -17,17 +17,14 @@ DEPEND=">=media-libs/libdvdcss-1.2.2
 	media-libs/jpeg
 	>=media-libs/libdvdread-0.9.4
 	media-libs/libmad
-	|| ( ( x11-libs/libXinerama
-			x11-libs/libXxf86vm
-			x11-libs/libICE
-			x11-libs/libSM
-			x11-proto/xextproto
-			x11-proto/xf86vidmodeproto
-			x11-proto/xineramaproto
-			xv? ( x11-libs/libXv x11-proto/videoproto )
-		)
-		virtual/x11
-	)
+	x11-libs/libXinerama
+	x11-libs/libXxf86vm
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-proto/xextproto
+	x11-proto/xf86vidmodeproto
+	x11-proto/xineramaproto
+	xv? ( x11-libs/libXv x11-proto/videoproto )
 	>=dev-libs/libxml2-2.4.19
 	>=media-libs/a52dec-0.7.3
 	alsa? ( media-libs/alsa-lib )"
diff --git a/media-video/oxine/ChangeLog b/media-video/oxine/ChangeLog
index fe492b483f96..e633b81bc125 100644
--- a/media-video/oxine/ChangeLog
+++ b/media-video/oxine/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/oxine
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/oxine/ChangeLog,v 1.26 2007/03/24 17:36:24 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/oxine/ChangeLog,v 1.27 2007/07/22 08:41:59 dberkholz Exp $
+
+  22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>; oxine-0.5.ebuild,
+  oxine-0.6.3-r1.ebuild, oxine-0.6.6.ebuild:
+  Drop virtual/x11 references.
 
 *oxine-0.6.6 (24 Mar 2007)
 
diff --git a/media-video/oxine/oxine-0.5.ebuild b/media-video/oxine/oxine-0.5.ebuild
index c96891109909..274aca5e39db 100644
--- a/media-video/oxine/oxine-0.5.ebuild
+++ b/media-video/oxine/oxine-0.5.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/oxine/oxine-0.5.ebuild,v 1.6 2006/12/21 16:36:52 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/oxine/oxine-0.5.ebuild,v 1.7 2007/07/22 08:42:00 dberkholz Exp $
 
 inherit eutils
 
@@ -23,7 +23,7 @@ DEPEND="media-libs/xine-lib
 	png? ( media-gfx/imagemagick
 		media-libs/netpbm
 		media-video/mjpegtools )
-	X? ( || ( ( x11-libs/libXext x11-libs/libX11 ) <virtual/x11-7 ) )
+	X? ( x11-libs/libXext x11-libs/libX11 )
 	virtual/eject"
 
 pkg_setup() {
diff --git a/media-video/oxine/oxine-0.6.3-r1.ebuild b/media-video/oxine/oxine-0.6.3-r1.ebuild
index 74cd27d8028c..2e96b3ff192f 100644
--- a/media-video/oxine/oxine-0.6.3-r1.ebuild
+++ b/media-video/oxine/oxine-0.6.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/oxine/oxine-0.6.3-r1.ebuild,v 1.4 2007/02/04 17:13:25 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/oxine/oxine-0.6.3-r1.ebuild,v 1.5 2007/07/22 08:41:59 dberkholz Exp $
 
 WANT_AUTOMAKE="1.9"
 inherit eutils autotools
@@ -28,7 +28,7 @@ DEPEND="media-libs/xine-lib
 	png? ( media-gfx/imagemagick
 		media-libs/netpbm
 		media-video/mjpegtools )
-	X? ( || ( ( x11-libs/libXext x11-libs/libX11 ) <virtual/x11-7 ) )
+	X? ( x11-libs/libXext x11-libs/libX11 )
 	virtual/eject"
 
 pkg_setup() {
diff --git a/media-video/oxine/oxine-0.6.6.ebuild b/media-video/oxine/oxine-0.6.6.ebuild
index 6d2d1a97ace8..6585653ba339 100644
--- a/media-video/oxine/oxine-0.6.6.ebuild
+++ b/media-video/oxine/oxine-0.6.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/oxine/oxine-0.6.6.ebuild,v 1.2 2007/03/25 13:28:28 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/oxine/oxine-0.6.6.ebuild,v 1.3 2007/07/22 08:41:59 dberkholz Exp $
 
 WANT_AUTOMAKE="1.9"
 inherit eutils autotools
@@ -28,7 +28,7 @@ DEPEND="media-libs/xine-lib
 	png? ( media-gfx/imagemagick
 		media-libs/netpbm
 		media-video/mjpegtools )
-	X? ( || ( ( x11-libs/libXext x11-libs/libX11 ) <virtual/x11-7 ) )
+	X? ( x11-libs/libXext x11-libs/libX11 )
 	virtual/eject"
 
 pkg_setup() {
diff --git a/media-video/sonic-snap/ChangeLog b/media-video/sonic-snap/ChangeLog
index 611b06fca06f..b8b57dee611d 100644
--- a/media-video/sonic-snap/ChangeLog
+++ b/media-video/sonic-snap/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/sonic-snap
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/sonic-snap/ChangeLog,v 1.3 2007/01/05 20:41:01 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/sonic-snap/ChangeLog,v 1.4 2007/07/22 08:28:27 dberkholz Exp $
+
+  22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>;
+  sonic-snap-1.5.ebuild:
+  Drop virtual/x11 references.
 
   05 Jan 2007; Diego Pettenò <flameeyes@gentoo.org> sonic-snap-1.5.ebuild:
   Convert to use elog.
diff --git a/media-video/sonic-snap/sonic-snap-1.5.ebuild b/media-video/sonic-snap/sonic-snap-1.5.ebuild
index ce2440f1646a..d0c9ac76bbdd 100644
--- a/media-video/sonic-snap/sonic-snap-1.5.ebuild
+++ b/media-video/sonic-snap/sonic-snap-1.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/sonic-snap/sonic-snap-1.5.ebuild,v 1.4 2007/01/05 20:41:01 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/sonic-snap/sonic-snap-1.5.ebuild,v 1.5 2007/07/22 08:28:27 dberkholz Exp $
 
 inherit eutils linux-info
 
@@ -17,13 +17,12 @@ DEPEND=" >=x11-libs/fltk-1.1.0_rc6
 	mpeg? ( >=media-libs/libfame-0.9.1 )
 	sys-libs/zlib
 	virtual/libc
-	|| ( ( x11-libs/libXdmcp
-	    x11-libs/libXau
-	    x11-libs/libXrender
-	    x11-libs/libX11
-	    x11-libs/libXext
-	    x11-libs/libXft )
-	    virtual/x11 )"
+	x11-libs/libXdmcp
+	x11-libs/libXau
+	x11-libs/libXrender
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXft"
 
 CONFIG_CHECK="USB_SN9C102"
 ERROR_USB_SN9C102="Please make sure Device Drivers -> USB Support -> SN9C10x \
diff --git a/media-video/subtitler-yuv/ChangeLog b/media-video/subtitler-yuv/ChangeLog
index f5bf2b11b454..37ba9e8c6a40 100644
--- a/media-video/subtitler-yuv/ChangeLog
+++ b/media-video/subtitler-yuv/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/subtitler-yuv
-# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/subtitler-yuv/ChangeLog,v 1.5 2006/09/14 11:18:27 zzam Exp $
+# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/subtitler-yuv/ChangeLog,v 1.6 2007/07/22 08:40:37 dberkholz Exp $
+
+  22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>;
+  subtitler-yuv-0.6.5.ebuild:
+  Drop virtual/x11 references.
 
   14 Sep 2006; Matthias Schwarzott <zzam@gentoo.org>
   -files/subtitler-yuv-0.6.4.2.patch, -files/gcc-3.4.patch,
diff --git a/media-video/subtitler-yuv/subtitler-yuv-0.6.5.ebuild b/media-video/subtitler-yuv/subtitler-yuv-0.6.5.ebuild
index 8bec68fd4f1f..e8488ce89df4 100644
--- a/media-video/subtitler-yuv/subtitler-yuv-0.6.5.ebuild
+++ b/media-video/subtitler-yuv/subtitler-yuv-0.6.5.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/subtitler-yuv/subtitler-yuv-0.6.5.ebuild,v 1.2 2006/09/14 11:18:27 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/subtitler-yuv/subtitler-yuv-0.6.5.ebuild,v 1.3 2007/07/22 08:40:37 dberkholz Exp $
 
 inherit toolchain-funcs
 
@@ -13,8 +13,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~x86 ~ppc"
 IUSE=""
-DEPEND="|| ( ( x11-libs/libXaw )
-	<virtual/x11-7 )"
+DEPEND="x11-libs/libXaw"
 RDEPEND="${DEPEND}"
 
 src_unpack() {
diff --git a/media-video/totem/ChangeLog b/media-video/totem/ChangeLog
index 4981dd353e52..6e387f76ad9d 100644
--- a/media-video/totem/ChangeLog
+++ b/media-video/totem/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/totem
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/totem/ChangeLog,v 1.170 2007/07/08 04:57:17 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/totem/ChangeLog,v 1.171 2007/07/22 08:39:50 dberkholz Exp $
+
+  22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>;
+  totem-1.4.2-r1.ebuild:
+  Drop virtual/x11 references.
 
   08 Jul 2007; Michael Sterrett <mr_bones_@gentoo.org>
   totem-1.2.1-r1.ebuild, totem-2.16.4.ebuild, totem-2.16.5.ebuild,
diff --git a/media-video/totem/totem-1.4.2-r1.ebuild b/media-video/totem/totem-1.4.2-r1.ebuild
index 210faba2dea4..150275bf94ef 100644
--- a/media-video/totem/totem-1.4.2-r1.ebuild
+++ b/media-video/totem/totem-1.4.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/totem/totem-1.4.2-r1.ebuild,v 1.13 2007/01/05 20:42:26 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/totem/totem-1.4.2-r1.ebuild,v 1.14 2007/07/22 08:39:50 dberkholz Exp $
 
 inherit autotools eutils multilib gnome2
 
@@ -25,17 +25,12 @@ RDEPEND=">=dev-libs/glib-2.6.3
 	>=gnome-base/libglade-2
 	>=gnome-base/gnome-desktop-2.2
 	app-text/iso-codes
-	|| (
-			(
-				x11-libs/libXtst
-				x11-libs/libX11
-				x11-libs/libXxf86vm
-				x11-libs/libXext
-				x11-libs/libXrandr
-				x11-libs/libXrender
-			)
-			virtual/x11
-		)
+	x11-libs/libXtst
+	x11-libs/libX11
+	x11-libs/libXxf86vm
+	x11-libs/libXext
+	x11-libs/libXrandr
+	x11-libs/libXrender
 	dbus? ( >=sys-apps/dbus-0.35 )
 	gnome? ( >=gnome-base/nautilus-2.10 )
 	lirc? ( app-misc/lirc )
diff --git a/media-video/vlc/ChangeLog b/media-video/vlc/ChangeLog
index fbf31ddaccb3..04986e908372 100644
--- a/media-video/vlc/ChangeLog
+++ b/media-video/vlc/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-video/vlc
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.254 2007/07/02 21:46:17 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.255 2007/07/22 08:35:38 dberkholz Exp $
+
+  22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>; vlc-0.8.6c.ebuild:
+  Drop virtual/x11 references.
 
   02 Jul 2007; Alexis Ballier <aballier@gentoo.org> -vlc-0.8.6-r1.ebuild,
   -vlc-0.8.6b.ebuild:
diff --git a/media-video/vlc/vlc-0.8.6c.ebuild b/media-video/vlc/vlc-0.8.6c.ebuild
index 15583bd6a137..ea615377290f 100644
--- a/media-video/vlc/vlc-0.8.6c.ebuild
+++ b/media-video/vlc/vlc-0.8.6c.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-0.8.6c.ebuild,v 1.6 2007/07/12 02:40:42 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-0.8.6c.ebuild,v 1.7 2007/07/22 08:35:38 dberkholz Exp $
 
 WANT_AUTOMAKE=latest
 WANT_AUTOCONF=latest
@@ -99,12 +99,11 @@ RDEPEND="
 		win32codecs? ( media-libs/win32codecs )
 		hal? ( sys-apps/hal )
 		avahi? ( >=net-dns/avahi-0.6 )
-		X? ( || ( (
-				x11-libs/libX11
-				x11-libs/libXext
-				xv? ( x11-libs/libXv )
-				xinerama? ( x11-libs/libXinerama )
-			) <virtual/x11-7 )
+		X? (
+			x11-libs/libX11
+			x11-libs/libXext
+			xv? ( x11-libs/libXv )
+			xinerama? ( x11-libs/libXinerama )
 			opengl? ( virtual/opengl )
 		)
 		directfb? ( dev-libs/DirectFB )
@@ -121,7 +120,7 @@ RDEPEND="
 			<media-libs/libdc1394-1.9.99 )"
 
 DEPEND="${RDEPEND}
-	X? ( xinerama? ( || ( x11-proto/xineramaproto <virtual/x11-7 ) ) )
+	X? ( xinerama? ( x11-proto/xineramaproto ) )
 	dev-util/pkgconfig"
 
 S="${WORKDIR}/${MY_P}"
diff --git a/media-video/xanim-export/ChangeLog b/media-video/xanim-export/ChangeLog
index f08445dd0cb9..5a84540673ee 100644
--- a/media-video/xanim-export/ChangeLog
+++ b/media-video/xanim-export/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/xanim-export
-# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/xanim-export/ChangeLog,v 1.13 2006/12/14 06:35:09 mr_bones_ Exp $
+# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/xanim-export/ChangeLog,v 1.14 2007/07/22 08:31:42 dberkholz Exp $
+
+  22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>;
+  xanim-export-2.80.1-r4.ebuild:
+  Drop virtual/x11 references.
 
   14 Dec 2006; Michael Sterrett <mr_bones_@gentoo.org>
   -xanim-export-2.80.1-r3.ebuild:
diff --git a/media-video/xanim-export/xanim-export-2.80.1-r4.ebuild b/media-video/xanim-export/xanim-export-2.80.1-r4.ebuild
index 48a807bfdb64..74a6725f968a 100644
--- a/media-video/xanim-export/xanim-export-2.80.1-r4.ebuild
+++ b/media-video/xanim-export/xanim-export-2.80.1-r4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/xanim-export/xanim-export-2.80.1-r4.ebuild,v 1.5 2007/07/12 02:40:43 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/xanim-export/xanim-export-2.80.1-r4.ebuild,v 1.6 2007/07/22 08:31:42 dberkholz Exp $
 
 inherit flag-o-matic eutils toolchain-funcs
 strip-flags -finline-functions
@@ -67,15 +67,13 @@ IUSE=""
 RDEPEND="virtual/libc
 	>=media-libs/jpeg-6b
 	>=media-libs/libpng-1.2.1
-	|| ( ( x11-libs/libXext
-		x11-libs/libXt )
-	<virtual/x11-7 )"
+	x11-libs/libXext
+	x11-libs/libXt"
 
 DEPEND="${RDEPEND}
 	app-arch/ncompress
-	|| ( ( x11-proto/xextproto
-		x11-proto/xproto )
-	<virtual/x11-7 )"
+	x11-proto/xextproto
+	x11-proto/xproto"
 
 S=${WORKDIR}/${MY_P}
 
diff --git a/media-video/xanim/ChangeLog b/media-video/xanim/ChangeLog
index 2d5559d30bed..53aa0a84ffaf 100644
--- a/media-video/xanim/ChangeLog
+++ b/media-video/xanim/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/xanim
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/xanim/ChangeLog,v 1.27 2007/02/22 01:57:45 peper Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/xanim/ChangeLog,v 1.28 2007/07/22 08:32:57 dberkholz Exp $
+
+  22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>;
+  xanim-2.80.1-r4.ebuild:
+  Drop virtual/x11 references.
 
   22 Feb 2007; Piotr Jaroszyński <peper@gentoo.org> ChangeLog:
   Transition to Manifest2.
diff --git a/media-video/xanim/xanim-2.80.1-r4.ebuild b/media-video/xanim/xanim-2.80.1-r4.ebuild
index 4b445c4b4603..1323d7519893 100644
--- a/media-video/xanim/xanim-2.80.1-r4.ebuild
+++ b/media-video/xanim/xanim-2.80.1-r4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/xanim/xanim-2.80.1-r4.ebuild,v 1.35 2007/07/12 02:40:43 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/xanim/xanim-2.80.1-r4.ebuild,v 1.36 2007/07/22 08:32:57 dberkholz Exp $
 
 inherit flag-o-matic toolchain-funcs
 
@@ -12,15 +12,12 @@ SLOT="0"
 KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86"
 IUSE=""
 
-RDEPEND="|| ( ( x11-libs/libXext
-			x11-libs/libXt
-		)
-		virtual/x11
-	)
+RDEPEND="x11-libs/libXext
+	x11-libs/libXt
 	>=sys-libs/zlib-1.1.3"
 DEPEND="${RDEPEND}
 	>=sys-apps/sed-4.0.5
-	|| ( x11-proto/xextproto virtual/x11 )"
+	x11-proto/xextproto"
 
 MY_P=${PN}${PV//.}
 S=${WORKDIR}/${MY_P}
diff --git a/media-video/xine-ui/ChangeLog b/media-video/xine-ui/ChangeLog
index e0f2c5c9922d..139f801dcd30 100644
--- a/media-video/xine-ui/ChangeLog
+++ b/media-video/xine-ui/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/xine-ui
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/xine-ui/ChangeLog,v 1.151 2007/05/11 14:50:48 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/xine-ui/ChangeLog,v 1.152 2007/07/22 08:30:45 dberkholz Exp $
+
+  22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>;
+  xine-ui-0.99.5_pre20070303.ebuild:
+  Drop virtual/x11 references.
 
   11 May 2007; Steve Dibb <beandog@gentoo.org> xine-ui-0.99.5.ebuild:
   amd64 stable, bug 177008
diff --git a/media-video/xine-ui/xine-ui-0.99.5_pre20070303.ebuild b/media-video/xine-ui/xine-ui-0.99.5_pre20070303.ebuild
index b46adb254095..c8734fd4658e 100644
--- a/media-video/xine-ui/xine-ui-0.99.5_pre20070303.ebuild
+++ b/media-video/xine-ui/xine-ui-0.99.5_pre20070303.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/xine-ui/xine-ui-0.99.5_pre20070303.ebuild,v 1.5 2007/05/10 14:53:59 drac Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/xine-ui/xine-ui-0.99.5_pre20070303.ebuild,v 1.6 2007/07/22 08:30:45 dberkholz Exp $
 
 # WANT_AUTOCONF=latest
 # WANT_AUTOMAKE=latest
@@ -25,26 +25,24 @@ RDEPEND=">=media-libs/libpng-1.2.8
 	libcaca? ( media-libs/libcaca )
 	curl? ( >=net-misc/curl-7.10.2 )
 	ncurses? ( sys-libs/ncurses )
-	X? ( || ( (
-			x11-libs/libX11
-			x11-libs/libXrender
-			x11-libs/libICE
-			x11-libs/libSM
-			x11-libs/libXext
-			x11-libs/libXxf86vm
-			x11-libs/libXv
-			x11-libs/libXtst
-			x11-libs/libXft
-			xinerama? ( x11-libs/libXinerama )
-		) <virtual/x11-7 ) )
+	X? (
+		x11-libs/libX11
+		x11-libs/libXrender
+		x11-libs/libICE
+		x11-libs/libSM
+		x11-libs/libXext
+		x11-libs/libXxf86vm
+		x11-libs/libXv
+		x11-libs/libXtst
+		x11-libs/libXft
+		xinerama? ( x11-libs/libXinerama ) )
 	nls? ( virtual/libintl )"
 DEPEND="${RDEPEND}
 	nls? ( sys-devel/gettext )
-	X? ( || ( (
-			x11-libs/libXt
-			x11-proto/xf86vidmodeproto
-			xinerama? ( x11-proto/xineramaproto )
-		) <virtual/x11-7 ) )
+	X? (
+		x11-libs/libXt
+		x11-proto/xf86vidmodeproto
+		xinerama? ( x11-proto/xineramaproto ) )
 	dev-util/pkgconfig"
 
 src_compile() {
diff --git a/media-video/xvattr/ChangeLog b/media-video/xvattr/ChangeLog
index 700b119d4420..faaa55ce371f 100644
--- a/media-video/xvattr/ChangeLog
+++ b/media-video/xvattr/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-video/xvattr
-# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/xvattr/ChangeLog,v 1.17 2006/10/28 00:48:23 flameeyes Exp $
+# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/xvattr/ChangeLog,v 1.18 2007/07/22 08:29:17 dberkholz Exp $
+
+  22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>; xvattr-1.3-r1.ebuild:
+  Drop virtual/x11 references.
 
   28 Oct 2006; Diego Pettenò <flameeyes@gentoo.org> xvattr-1.3-r1.ebuild:
   Add version dependencies of autotools. Thanks to Patrick Lauer in bug #153079.
diff --git a/media-video/xvattr/xvattr-1.3-r1.ebuild b/media-video/xvattr/xvattr-1.3-r1.ebuild
index bb92c4643ddc..f3aadc2c9104 100644
--- a/media-video/xvattr/xvattr-1.3-r1.ebuild
+++ b/media-video/xvattr/xvattr-1.3-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/xvattr/xvattr-1.3-r1.ebuild,v 1.13 2006/10/28 00:48:23 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/xvattr/xvattr-1.3-r1.ebuild,v 1.14 2007/07/22 08:29:17 dberkholz Exp $
 
 WANT_AUTOCONF="latest"
 WANT_AUTOMAKE="latest"
@@ -18,17 +18,15 @@ KEYWORDS="amd64 ppc x86"
 IUSE="gtk"
 
 RDEPEND="
-	|| ( (
-			x11-libs/libX11
-			x11-libs/libXv
-			x11-libs/libXext
-		) <virtual/x11-7 )
+	x11-libs/libX11
+	x11-libs/libXv
+	x11-libs/libXext
 	gtk? (
 		=x11-libs/gtk+-1.2*
 		=dev-libs/glib-1.2* )"
 
 DEPEND="${RDEPEND}
-	|| ( x11-libs/libXt <virtual/x11-7 )"
+	x11-libs/libXt"
 
 src_unpack() {
 	unpack ${A}