Drop virtual/x11 references.

Package-Manager: portage-2.1.3_rc8

3 files changed, 37 insertions, 36 deletions

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 )"