Drop virtual/x11 references.

Package-Manager: portage-2.1.3_rc8

18 files changed, 167 insertions, 165 deletions

diff --git a/media-tv/kdetv/ChangeLog b/media-tv/kdetv/ChangeLog
index bc7be8a3eeef..b45f9339a053 100644
--- a/media-tv/kdetv/ChangeLog
+++ b/media-tv/kdetv/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-tv/kdetv
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/kdetv/ChangeLog,v 1.30 2007/05/15 15:49:55 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/kdetv/ChangeLog,v 1.31 2007/07/22 09:07:56 dberkholz Exp $
+
+  22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>;
+  kdetv-0.8.8-r1.ebuild, kdetv-0.8.9.ebuild:
+  Drop virtual/x11 references.
 
   15 May 2007; Christian Faulhammer <opfer@gentoo.org>
   kdetv-0.8.8-r1.ebuild, kdetv-0.8.9.ebuild:
diff --git a/media-tv/kdetv/kdetv-0.8.8-r1.ebuild b/media-tv/kdetv/kdetv-0.8.8-r1.ebuild
index 06edafd25b89..aa3cd24ab18c 100644
--- a/media-tv/kdetv/kdetv-0.8.8-r1.ebuild
+++ b/media-tv/kdetv/kdetv-0.8.8-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-tv/kdetv/kdetv-0.8.8-r1.ebuild,v 1.15 2007/07/13 05:03:57 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/kdetv/kdetv-0.8.8-r1.ebuild,v 1.16 2007/07/22 09:07:56 dberkholz Exp $
 
 LANGS="bg ca br da de cs cy el es et fi ga fr gl hu is it lt nb mt nl pa pl pt ro ru rw ta sr sv tr en_GB pt_BR zh_CN sr@Latn"
 LANGS_DOC="da et fr it nl pt ru sv"
@@ -22,19 +22,18 @@ RDEPEND="zvbi? ( >=media-libs/zvbi-0.2.4 )
 	lirc? ( app-misc/lirc )
 	opengl? ( virtual/opengl )
 	media-libs/alsa-lib
-	|| ( ( x11-libs/libICE
-		x11-libs/libXxf86dga
-		x11-libs/libXrandr
-		x11-libs/libX11
-		x11-libs/libXv
-		x11-libs/libSM
-		x11-libs/libXxf86vm
-		x11-libs/libXext
-		x11-libs/libXrender
-		) <virtual/x11-7 )"
+	x11-libs/libICE
+	x11-libs/libXxf86dga
+	x11-libs/libXrandr
+	x11-libs/libX11
+	x11-libs/libXv
+	x11-libs/libSM
+	x11-libs/libXxf86vm
+	x11-libs/libXext
+	x11-libs/libXrender"
 
 DEPEND="${RDEPEND}
-	|| ( x11-proto/videoproto <virtual/x11-7 )
+	x11-proto/videoproto
 	virtual/os-headers"
 
 need-kde 3.2
diff --git a/media-tv/kdetv/kdetv-0.8.9.ebuild b/media-tv/kdetv/kdetv-0.8.9.ebuild
index 39cd9e817f68..c1c29bdd005d 100644
--- a/media-tv/kdetv/kdetv-0.8.9.ebuild
+++ b/media-tv/kdetv/kdetv-0.8.9.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-tv/kdetv/kdetv-0.8.9.ebuild,v 1.3 2007/07/13 05:03:57 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/kdetv/kdetv-0.8.9.ebuild,v 1.4 2007/07/22 09:07:56 dberkholz Exp $
 
 LANGS="bg ca br da de cs cy el es et fi ga fr gl hu is it lt nb mt nl pa pl pt ro ru rw ta sr sv tr en_GB pt_BR zh_CN sr@Latn"
 LANGS_DOC="da et fr it nl pt ru sv"
@@ -22,19 +22,18 @@ RDEPEND="zvbi? ( >=media-libs/zvbi-0.2.4 )
 	lirc? ( app-misc/lirc )
 	opengl? ( virtual/opengl )
 	media-libs/alsa-lib
-	|| ( ( x11-libs/libICE
-		x11-libs/libXxf86dga
-		x11-libs/libXrandr
-		x11-libs/libX11
-		x11-libs/libXv
-		x11-libs/libSM
-		x11-libs/libXxf86vm
-		x11-libs/libXext
-		x11-libs/libXrender
-		) <virtual/x11-7 )"
+	x11-libs/libICE
+	x11-libs/libXxf86dga
+	x11-libs/libXrandr
+	x11-libs/libX11
+	x11-libs/libXv
+	x11-libs/libSM
+	x11-libs/libXxf86vm
+	x11-libs/libXext
+	x11-libs/libXrender"
 
 DEPEND="${RDEPEND}
-	|| ( x11-proto/videoproto <virtual/x11-7 )
+	x11-proto/videoproto
 	virtual/os-headers"
 
 need-kde 3.2
diff --git a/media-tv/nuppelvideo/ChangeLog b/media-tv/nuppelvideo/ChangeLog
index 335d04b1dc48..140de7aafd32 100644
--- a/media-tv/nuppelvideo/ChangeLog
+++ b/media-tv/nuppelvideo/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-tv/nuppelvideo
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/nuppelvideo/ChangeLog,v 1.7 2007/05/01 00:31:16 genone Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/nuppelvideo/ChangeLog,v 1.8 2007/07/22 09:06:38 dberkholz Exp $
+
+  22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>;
+  nuppelvideo-0.53a.ebuild:
+  Drop virtual/x11 references.
 
   01 May 2007; Marius Mauch <genone@gentoo.org> nuppelvideo-0.52a.ebuild:
   Replacing einfo with elog
diff --git a/media-tv/nuppelvideo/nuppelvideo-0.53a.ebuild b/media-tv/nuppelvideo/nuppelvideo-0.53a.ebuild
index 0ad90d212a51..2fb54eb4ab4b 100644
--- a/media-tv/nuppelvideo/nuppelvideo-0.53a.ebuild
+++ b/media-tv/nuppelvideo/nuppelvideo-0.53a.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-tv/nuppelvideo/nuppelvideo-0.53a.ebuild,v 1.2 2006/11/13 12:08:52 phosphan Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/nuppelvideo/nuppelvideo-0.53a.ebuild,v 1.3 2007/07/22 09:06:38 dberkholz Exp $
 
 inherit eutils toolchain-funcs linux-info
 
@@ -13,7 +13,7 @@ SLOT="0"
 IUSE=""
 
 KEYWORDS="~x86"
-DEPEND="|| ( x11-libs/libXext <virtual/x11-7 )"
+DEPEND="x11-libs/libXext"
 RDEPEND="${DEPEND}
 	media-sound/toolame
 	media-video/mjpegtools
diff --git a/media-tv/tvbrowser/ChangeLog b/media-tv/tvbrowser/ChangeLog
index 7f6a01e93164..a318c34857bb 100644
--- a/media-tv/tvbrowser/ChangeLog
+++ b/media-tv/tvbrowser/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-tv/tvbrowser
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/tvbrowser/ChangeLog,v 1.16 2007/05/18 17:47:52 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/tvbrowser/ChangeLog,v 1.17 2007/07/22 09:01:22 dberkholz Exp $
+
+  22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>; tvbrowser-2.1.ebuild,
+  tvbrowser-2.2.1.ebuild, tvbrowser-2.5.ebuild, tvbrowser-2.5-r1.ebuild:
+  Drop virtual/x11 references.
 
   18 May 2007; Matthias Schwarzott <zzam@gentoo.org> metadata.xml:
   Changing herd to java.
diff --git a/media-tv/tvbrowser/tvbrowser-2.1.ebuild b/media-tv/tvbrowser/tvbrowser-2.1.ebuild
index 8900b9bb9bcb..61499f43d90d 100644
--- a/media-tv/tvbrowser/tvbrowser-2.1.ebuild
+++ b/media-tv/tvbrowser/tvbrowser-2.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-tv/tvbrowser/tvbrowser-2.1.ebuild,v 1.5 2007/01/06 10:04:10 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/tvbrowser/tvbrowser-2.1.ebuild,v 1.6 2007/07/22 09:01:22 dberkholz Exp $
 
 WANT_AUTOCONF="latest"
 WANT_AUTOMAKE="latest"
@@ -15,17 +15,14 @@ themes? ( http://www.tvbrowser.org/downloads/themepacks/allthemepacks.zip )"
 SLOT="0"
 KEYWORDS="~x86 ~amd64"
 
-RDEPEND="|| ( ( x11-libs/libXt
-			x11-libs/libSM
-			x11-libs/libICE
-			x11-libs/libXext
-			x11-libs/libXtst
-			x11-libs/libX11
-			x11-libs/libXau
-			x11-libs/libXdmcp
-		)
-		virtual/x11
-	)
+RDEPEND="x11-libs/libXt
+	x11-libs/libSM
+	x11-libs/libICE
+	x11-libs/libXext
+	x11-libs/libXtst
+	x11-libs/libX11
+	x11-libs/libXau
+	x11-libs/libXdmcp
 	>=virtual/jre-1.4
 	dev-java/junit
 	dev-java/commons-net
diff --git a/media-tv/tvbrowser/tvbrowser-2.2.1.ebuild b/media-tv/tvbrowser/tvbrowser-2.2.1.ebuild
index 3030b43ba5da..bb7fe51f2c81 100644
--- a/media-tv/tvbrowser/tvbrowser-2.2.1.ebuild
+++ b/media-tv/tvbrowser/tvbrowser-2.2.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-tv/tvbrowser/tvbrowser-2.2.1.ebuild,v 1.6 2007/01/30 04:45:55 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/tvbrowser/tvbrowser-2.2.1.ebuild,v 1.7 2007/07/22 09:01:22 dberkholz Exp $
 
 WANT_AUTOCONF="latest"
 WANT_AUTOMAKE="latest"
@@ -15,17 +15,14 @@ themes? ( http://www.tvbrowser.org/downloads/themepacks/allthemepacks.zip )"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
-RDEPEND="|| ( ( x11-libs/libXt
-			x11-libs/libSM
-			x11-libs/libICE
-			x11-libs/libXext
-			x11-libs/libXtst
-			x11-libs/libX11
-			x11-libs/libXau
-			x11-libs/libXdmcp
-		)
-		virtual/x11
-	)
+RDEPEND="x11-libs/libXt
+	x11-libs/libSM
+	x11-libs/libICE
+	x11-libs/libXext
+	x11-libs/libXtst
+	x11-libs/libX11
+	x11-libs/libXau
+	x11-libs/libXdmcp
 	>=virtual/jre-1.4
 	dev-java/junit
 	dev-java/commons-net
diff --git a/media-tv/tvbrowser/tvbrowser-2.5-r1.ebuild b/media-tv/tvbrowser/tvbrowser-2.5-r1.ebuild
index 3726fc31064c..c90139708421 100644
--- a/media-tv/tvbrowser/tvbrowser-2.5-r1.ebuild
+++ b/media-tv/tvbrowser/tvbrowser-2.5-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-tv/tvbrowser/tvbrowser-2.5-r1.ebuild,v 1.1 2007/03/11 16:15:16 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/tvbrowser/tvbrowser-2.5-r1.ebuild,v 1.2 2007/07/22 09:01:22 dberkholz Exp $
 
 WANT_AUTOCONF="latest"
 WANT_AUTOMAKE="latest"
@@ -17,17 +17,14 @@ KEYWORDS="~x86 ~amd64"
 
 # missing dependencies commons-compress, TVAnytimeAPI, jRegistryKey , gdata-calendar, gdata-client and jcom
 
-RDEPEND="|| ( ( x11-libs/libXt
-			x11-libs/libSM
-			x11-libs/libICE
-			x11-libs/libXext
-			x11-libs/libXtst
-			x11-libs/libX11
-			x11-libs/libXau
-			x11-libs/libXdmcp
-		)
-		virtual/x11
-	)
+RDEPEND="x11-libs/libXt
+	x11-libs/libSM
+	x11-libs/libICE
+	x11-libs/libXext
+	x11-libs/libXtst
+	x11-libs/libX11
+	x11-libs/libXau
+	x11-libs/libXdmcp
 	>=virtual/jre-1.5
 	dev-java/junit
 	dev-java/commons-net
diff --git a/media-tv/tvbrowser/tvbrowser-2.5.ebuild b/media-tv/tvbrowser/tvbrowser-2.5.ebuild
index 55f1403b59ad..5e441c71fd2f 100644
--- a/media-tv/tvbrowser/tvbrowser-2.5.ebuild
+++ b/media-tv/tvbrowser/tvbrowser-2.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-tv/tvbrowser/tvbrowser-2.5.ebuild,v 1.2 2007/07/13 05:03:58 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/tvbrowser/tvbrowser-2.5.ebuild,v 1.3 2007/07/22 09:01:22 dberkholz Exp $
 
 WANT_AUTOCONF="latest"
 WANT_AUTOMAKE="latest"
@@ -17,17 +17,14 @@ KEYWORDS="~x86 ~amd64"
 
 # missing dependencies commons-compress, TVAnytimeAPI, jRegistryKey , gdata-calendar, gdata-client and jcom
 
-RDEPEND="|| ( ( x11-libs/libXt
-			x11-libs/libSM
-			x11-libs/libICE
-			x11-libs/libXext
-			x11-libs/libXtst
-			x11-libs/libX11
-			x11-libs/libXau
-			x11-libs/libXdmcp
-		)
-		virtual/x11
-	)
+RDEPEND="x11-libs/libXt
+	x11-libs/libSM
+	x11-libs/libICE
+	x11-libs/libXext
+	x11-libs/libXtst
+	x11-libs/libX11
+	x11-libs/libXau
+	x11-libs/libXdmcp
 	>=virtual/jre-1.5
 	dev-java/junit
 	dev-java/commons-net
diff --git a/media-tv/tvtime/ChangeLog b/media-tv/tvtime/ChangeLog
index caf8a9483c30..099fadf07973 100644
--- a/media-tv/tvtime/ChangeLog
+++ b/media-tv/tvtime/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-tv/tvtime
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/tvtime/ChangeLog,v 1.39 2007/05/01 00:32:48 genone Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/tvtime/ChangeLog,v 1.40 2007/07/22 09:05:57 dberkholz Exp $
+
+  22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>; tvtime-1.0.2.ebuild,
+  tvtime-1.0.2-r1.ebuild:
+  Drop virtual/x11 references.
 
   01 May 2007; Marius Mauch <genone@gentoo.org> tvtime-1.0.2.ebuild,
   tvtime-1.0.2-r1.ebuild:
diff --git a/media-tv/tvtime/tvtime-1.0.2-r1.ebuild b/media-tv/tvtime/tvtime-1.0.2-r1.ebuild
index 8d9ac1127ac7..5f8a24e4ed28 100644
--- a/media-tv/tvtime/tvtime-1.0.2-r1.ebuild
+++ b/media-tv/tvtime/tvtime-1.0.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-tv/tvtime/tvtime-1.0.2-r1.ebuild,v 1.4 2007/05/01 00:32:48 genone Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/tvtime/tvtime-1.0.2-r1.ebuild,v 1.5 2007/07/22 09:05:57 dberkholz Exp $
 
 WANT_AUTOMAKE=1.7
 WANT_AUTOCONF=2.5
@@ -16,17 +16,16 @@ SLOT="0"
 KEYWORDS="amd64 ~ppc x86"
 IUSE="nls xinerama"
 
-RDEPEND="|| ( ( x11-libs/libSM
-				x11-libs/libICE
-				x11-libs/libX11
-				x11-libs/libXext
-				x11-libs/libXv
-				x11-libs/libXxf86vm
-				xinerama? ( x11-libs/libXinerama )
-				x11-libs/libXtst
-				x11-libs/libXau
-				x11-libs/libXdmcp )
-			<virtual/x11-7 )
+RDEPEND="x11-libs/libSM
+	x11-libs/libICE
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXv
+	x11-libs/libXxf86vm
+	xinerama? ( x11-libs/libXinerama )
+	x11-libs/libXtst
+	x11-libs/libXau
+	x11-libs/libXdmcp
 	>=media-libs/freetype-2
 	>=sys-libs/zlib-1.1.4
 	>=media-libs/libpng-1.2
diff --git a/media-tv/tvtime/tvtime-1.0.2.ebuild b/media-tv/tvtime/tvtime-1.0.2.ebuild
index b4d3084d7ff9..61c789eafe8d 100644
--- a/media-tv/tvtime/tvtime-1.0.2.ebuild
+++ b/media-tv/tvtime/tvtime-1.0.2.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-tv/tvtime/tvtime-1.0.2.ebuild,v 1.9 2007/05/01 00:32:48 genone Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/tvtime/tvtime-1.0.2.ebuild,v 1.10 2007/07/22 09:05:57 dberkholz Exp $
 
 WANT_AUTOMAKE=1.7
 WANT_AUTOCONF=2.5
@@ -16,17 +16,16 @@ SLOT="0"
 KEYWORDS="amd64 ~ppc x86"
 IUSE="nls xinerama"
 
-RDEPEND="|| ( ( x11-libs/libSM
-				x11-libs/libICE
-				x11-libs/libX11
-				x11-libs/libXext
-				x11-libs/libXv
-				x11-libs/libXxf86vm
-				xinerama? ( x11-libs/libXinerama )
-				x11-libs/libXtst
-				x11-libs/libXau
-				x11-libs/libXdmcp )
-			<virtual/x11-7 )
+RDEPEND="x11-libs/libSM
+	x11-libs/libICE
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXv
+	x11-libs/libXxf86vm
+	xinerama? ( x11-libs/libXinerama )
+	x11-libs/libXtst
+	x11-libs/libXau
+	x11-libs/libXdmcp
 	>=media-libs/freetype-2
 	>=sys-libs/zlib-1.1.4
 	>=media-libs/libpng-1.2
diff --git a/media-tv/xawtv/ChangeLog b/media-tv/xawtv/ChangeLog
index c694b2359acf..c887821c0f6d 100644
--- a/media-tv/xawtv/ChangeLog
+++ b/media-tv/xawtv/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-tv/xawtv
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/xawtv/ChangeLog,v 1.56 2007/03/02 17:26:49 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/xawtv/ChangeLog,v 1.57 2007/07/22 09:04:44 dberkholz Exp $
+
+  22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>; xawtv-3.95-r1.ebuild:
+  Drop virtual/x11 references.
 
   02 Mar 2007; Alexis Ballier <aballier@gentoo.org>
   +files/xawtv-3.95-pagemask-fix.patch, xawtv-3.95-r1.ebuild:
diff --git a/media-tv/xawtv/xawtv-3.95-r1.ebuild b/media-tv/xawtv/xawtv-3.95-r1.ebuild
index 73a84f7d0b4f..3b99d2b2e840 100644
--- a/media-tv/xawtv/xawtv-3.95-r1.ebuild
+++ b/media-tv/xawtv/xawtv-3.95-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-tv/xawtv/xawtv-3.95-r1.ebuild,v 1.22 2007/03/02 17:26:49 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/xawtv/xawtv-3.95-r1.ebuild,v 1.23 2007/07/22 09:04:44 dberkholz Exp $
 
 WANT_AUTOMAKE="latest"
 WANT_AUTOCONF="latest"
@@ -24,23 +24,22 @@ KEYWORDS="alpha amd64 ia64 ~ppc ~sparc x86"
 
 RDEPEND=">=sys-libs/ncurses-5.1
 	>=media-libs/jpeg-6b
-	X? ( || ( (
-			x11-libs/libFS
-			x11-libs/libXmu
-			x11-libs/libX11
-			x11-libs/libXaw
-			x11-libs/libXt
-			x11-libs/libXext
-			x11-libs/libXrender
-			xext? (
-				x11-libs/libXinerama
-				x11-libs/libXxf86dga
-				x11-libs/libXrandr
-				x11-libs/libXxf86vm
-			)
-			x11-apps/xset
-			xv? ( x11-libs/libXv )
-		) <virtual/x11-7 )
+	X? (
+		x11-libs/libFS
+		x11-libs/libXmu
+		x11-libs/libX11
+		x11-libs/libXaw
+		x11-libs/libXt
+		x11-libs/libXext
+		x11-libs/libXrender
+		xext? (
+			x11-libs/libXinerama
+			x11-libs/libXxf86dga
+			x11-libs/libXrandr
+			x11-libs/libXxf86vm
+		)
+		x11-apps/xset
+		xv? ( x11-libs/libXv )
 	)
 	motif? ( x11-libs/openmotif
 		app-text/recode )
@@ -54,13 +53,12 @@ RDEPEND=">=sys-libs/ncurses-5.1
 		media-libs/libpng )"
 
 DEPEND="${RDEPEND}
-	X? ( || ( (
-				x11-apps/xset
-				x11-apps/bdftopcf
-				x11-proto/videoproto
-				xext? ( x11-proto/xineramaproto )
-			) <virtual/x11-7 )
-		)"
+	X? (
+		x11-apps/xset
+		x11-apps/bdftopcf
+		x11-proto/videoproto
+		xext? ( x11-proto/xineramaproto )
+	)"
 
 pkg_setup() {
 	if use X; then
diff --git a/media-tv/xdtv/ChangeLog b/media-tv/xdtv/ChangeLog
index 579fdd12a776..4465ffb9ace0 100644
--- a/media-tv/xdtv/ChangeLog
+++ b/media-tv/xdtv/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-tv/xdtv
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/xdtv/ChangeLog,v 1.50 2007/07/04 08:36:08 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/xdtv/ChangeLog,v 1.51 2007/07/22 09:03:16 dberkholz Exp $
+
+  22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>; xdtv-2.2.0-r1.ebuild,
+  xdtv-2.4.0.ebuild:
+  Drop virtual/x11 references.
 
   04 Jul 2007; Alexis Ballier <aballier@gentoo.org>
   -files/libxdtv-i18n-all-1.3.0-ldflags.patch,
diff --git a/media-tv/xdtv/xdtv-2.2.0-r1.ebuild b/media-tv/xdtv/xdtv-2.2.0-r1.ebuild
index bb1414b10779..7419b961c579 100644
--- a/media-tv/xdtv/xdtv-2.2.0-r1.ebuild
+++ b/media-tv/xdtv/xdtv-2.2.0-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-tv/xdtv/xdtv-2.2.0-r1.ebuild,v 1.15 2007/06/12 14:01:27 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/xdtv/xdtv-2.2.0-r1.ebuild,v 1.16 2007/07/22 09:03:16 dberkholz Exp $
 
 WANT_AUTOMAKE="1.7"
 WANT_AUTOCONF="2.5"
@@ -87,23 +87,22 @@ RDEPEND="zvbi? ( >=media-libs/zvbi-0.2.4 )
 	jpeg? ( media-libs/jpeg )
 	lirc? ( app-misc/lirc )
 	alsa? ( >=media-libs/alsa-lib-0.9 )
-	|| ( ( x11-libs/libX11
-		x11-libs/libXext
-		x11-libs/libXpm
-		x11-libs/libXt
-		x11-libs/libICE
-		x11-libs/libXmu
-		x11-libs/libXxf86vm
-		x11-libs/libXxf86dga
-		x11-libs/libSM
-		x11-libs/libXaw
-		x11-libs/libXv )
-		<virtual/x11-7 )
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXpm
+	x11-libs/libXt
+	x11-libs/libICE
+	x11-libs/libXmu
+	x11-libs/libXxf86vm
+	x11-libs/libXxf86dga
+	x11-libs/libSM
+	x11-libs/libXaw
+	x11-libs/libXv
 	"
 
 DEPEND="${RDEPEND}
 	dvb? ( media-tv/linuxtv-dvb-headers )
-	|| ( x11-proto/videoproto <virtual/x11-7 )"
+	x11-proto/videoproto"
 
 FONT_S="${S}/font"
 FONT_SUFFIX="pcf.gz"
diff --git a/media-tv/xdtv/xdtv-2.4.0.ebuild b/media-tv/xdtv/xdtv-2.4.0.ebuild
index 8cea61149986..9329330c34ce 100644
--- a/media-tv/xdtv/xdtv-2.4.0.ebuild
+++ b/media-tv/xdtv/xdtv-2.4.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-tv/xdtv/xdtv-2.4.0.ebuild,v 1.3 2007/07/13 05:03:57 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/xdtv/xdtv-2.4.0.ebuild,v 1.4 2007/07/22 09:03:16 dberkholz Exp $
 
 inherit eutils multilib flag-o-matic toolchain-funcs
 
@@ -32,7 +32,7 @@ KEYWORDS="~amd64 ~ppc ~x86"
 COMMON_DEPEND="zvbi? ( >=media-libs/zvbi-0.2.4 )
 	neXt? ( x11-libs/neXtaw )
 	Xaw3d? ( !neXt? ( x11-libs/Xaw3d ) )
-	!neXt? ( !Xaw3d? ( || ( x11-libs/libXaw <virtual/x11-7 ) ) )
+	!neXt? ( !Xaw3d? ( x11-libs/libXaw ) )
 	xvid? ( >=media-libs/xvid-1.1 )
 	encode? ( >=media-sound/lame-3.93 )
 	jpeg? ( media-libs/jpeg )
@@ -43,29 +43,27 @@ COMMON_DEPEND="zvbi? ( >=media-libs/zvbi-0.2.4 )
 		media-libs/libvorbis )
 	png? ( media-libs/libpng )
 	nls? ( virtual/libintl )
-	|| ( ( x11-libs/libX11
-			x11-libs/libXext
-			x11-libs/libXpm
-			x11-libs/libXt
-			x11-libs/libXmu
-			x11-libs/libXxf86vm
-			x11-libs/libXxf86dga
-			x11-libs/libXv
-			x11-apps/xset
-			xinerama? ( x11-libs/libXinerama )
-		) <virtual/x11-7 )
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXpm
+	x11-libs/libXt
+	x11-libs/libXmu
+	x11-libs/libXxf86vm
+	x11-libs/libXxf86dga
+	x11-libs/libXv
+	x11-apps/xset
+	xinerama? ( x11-libs/libXinerama )
 	ffmpeg? ( media-video/ffmpeg )"
 
 DEPEND="${COMMON_DEPEND}
 	nls? ( sys-devel/gettext )
-	|| ( ( x11-proto/videoproto
-			x11-proto/xproto
-			x11-proto/xextproto
-			x11-apps/bdftopcf
-			x11-apps/mkfontdir
-			x11-apps/mkfontscale
-			xinerama? ( x11-proto/xineramaproto )
-		) <virtual/x11-7 )"
+	x11-proto/videoproto
+	x11-proto/xproto
+	x11-proto/xextproto
+	x11-apps/bdftopcf
+	x11-apps/mkfontdir
+	x11-apps/mkfontscale
+	xinerama? ( x11-proto/xineramaproto )"
 
 RDEPEND="${COMMON_DEPEND}
 	schedule? ( sys-process/at )"