Drop virtual/x11 references.

(Portage version: 2.1.3_rc8)

10 files changed, 55 insertions, 81 deletions

diff --git a/media-plugins/vdr-softdevice/ChangeLog b/media-plugins/vdr-softdevice/ChangeLog
index 8108c2c82f52..9a65f37a6a60 100644
--- a/media-plugins/vdr-softdevice/ChangeLog
+++ b/media-plugins/vdr-softdevice/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for media-plugins/vdr-softdevice
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-softdevice/ChangeLog,v 1.44 2007/07/17 12:24:29 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-softdevice/ChangeLog,v 1.45 2007/07/22 09:15:01 dberkholz Exp $
+
+  22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>;
+  vdr-softdevice-0.3.0-r1.ebuild, vdr-softdevice-0.3.1-r2.ebuild,
+  vdr-softdevice-0.3.1.20061124.ebuild,
+  vdr-softdevice-0.3.1.20061217.ebuild,
+  vdr-softdevice-0.3.1.20070313.ebuild,
+  vdr-softdevice-0.3.1.20070410.ebuild, vdr-softdevice-0.4.0.ebuild,
+  vdr-softdevice-0.4.0.20070515.ebuild,
+  vdr-softdevice-0.4.0.20070711.ebuild:
+  Drop virtual/x11 references.
 
   17 Jul 2007; Matthias Schwarzott <zzam@gentoo.org>
   vdr-softdevice-0.4.0.ebuild:
diff --git a/media-plugins/vdr-softdevice/vdr-softdevice-0.3.0-r1.ebuild b/media-plugins/vdr-softdevice/vdr-softdevice-0.3.0-r1.ebuild
index 8d4186c68005..a4b65ea1e91c 100644
--- a/media-plugins/vdr-softdevice/vdr-softdevice-0.3.0-r1.ebuild
+++ b/media-plugins/vdr-softdevice/vdr-softdevice-0.3.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-plugins/vdr-softdevice/vdr-softdevice-0.3.0-r1.ebuild,v 1.5 2007/07/10 23:09:00 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-softdevice/vdr-softdevice-0.3.0-r1.ebuild,v 1.6 2007/07/22 09:15:01 dberkholz Exp $
 
 inherit vdr-plugin
 
@@ -21,23 +21,19 @@ RDEPEND=">=media-video/vdr-1.3.36
 		dev-libs/DFB++
 	)
 	media-libs/alsa-lib
-	xv? ( || ( ( x11-libs/libX11
-				x11-libs/libXext
-				x11-libs/libXi
-				x11-libs/libXv
-				xinerama? ( x11-libs/libXinerama )
-			)
-			virtual/x11
-		) )"
+	xv? ( x11-libs/libX11
+		x11-libs/libXext
+		x11-libs/libXi
+		x11-libs/libXv
+		xinerama? ( x11-libs/libXinerama )
+	)"
 
 DEPEND="${RDEPEND}
-	xv? ( || ( ( x11-proto/xproto
-				x11-proto/xextproto
-				x11-libs/libXv
-				xinerama? ( x11-proto/xineramaproto )
-			)
-			virtual/x11
-	) )
+	xv? ( x11-proto/xproto
+		x11-proto/xextproto
+		x11-libs/libXv
+		xinerama? ( x11-proto/xineramaproto )
+	)
 	fbcon? ( sys-kernel/linux-headers )
 	dev-util/pkgconfig"
 
diff --git a/media-plugins/vdr-softdevice/vdr-softdevice-0.3.1-r2.ebuild b/media-plugins/vdr-softdevice/vdr-softdevice-0.3.1-r2.ebuild
index 1b0641e686dc..f7b667b18d17 100644
--- a/media-plugins/vdr-softdevice/vdr-softdevice-0.3.1-r2.ebuild
+++ b/media-plugins/vdr-softdevice/vdr-softdevice-0.3.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-plugins/vdr-softdevice/vdr-softdevice-0.3.1-r2.ebuild,v 1.3 2007/07/10 23:09:00 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-softdevice/vdr-softdevice-0.3.1-r2.ebuild,v 1.4 2007/07/22 09:15:01 dberkholz Exp $
 
 inherit vdr-plugin
 
@@ -21,23 +21,19 @@ RDEPEND=">=media-video/vdr-1.3.36
 		dev-libs/DFB++
 	)
 	media-libs/alsa-lib
-	xv? ( || ( ( x11-libs/libX11
+	xv? ( x11-libs/libX11
 				x11-libs/libXext
 				x11-libs/libXi
 				x11-libs/libXv
 				xinerama? ( x11-libs/libXinerama )
-			)
-			virtual/x11
-		) )"
+	)"
 
 DEPEND="${RDEPEND}
-	xv? ( || ( ( x11-proto/xproto
+	xv? ( x11-proto/xproto
 				x11-proto/xextproto
 				x11-libs/libXv
 				xinerama? ( x11-proto/xineramaproto )
 			)
-			virtual/x11
-	) )
 	fbcon? ( sys-kernel/linux-headers )
 	dev-util/pkgconfig"
 
diff --git a/media-plugins/vdr-softdevice/vdr-softdevice-0.3.1.20061124.ebuild b/media-plugins/vdr-softdevice/vdr-softdevice-0.3.1.20061124.ebuild
index f8c32748373f..17ce454497cd 100644
--- a/media-plugins/vdr-softdevice/vdr-softdevice-0.3.1.20061124.ebuild
+++ b/media-plugins/vdr-softdevice/vdr-softdevice-0.3.1.20061124.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-plugins/vdr-softdevice/vdr-softdevice-0.3.1.20061124.ebuild,v 1.4 2007/07/10 23:09:00 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-softdevice/vdr-softdevice-0.3.1.20061124.ebuild,v 1.5 2007/07/22 09:15:01 dberkholz Exp $
 
 inherit vdr-plugin
 
@@ -24,23 +24,19 @@ RDEPEND=">=media-video/vdr-1.3.36
 		dev-libs/DFB++
 	)
 	media-libs/alsa-lib
-	xv? ( || ( ( x11-libs/libX11
+	xv? ( x11-libs/libX11
 				x11-libs/libXext
 				x11-libs/libXi
 				x11-libs/libXv
 				xinerama? ( x11-libs/libXinerama )
-			)
-			virtual/x11
-		) )"
+	)"
 
 DEPEND="${RDEPEND}
-	xv? ( || ( ( x11-proto/xproto
+	xv? ( x11-proto/xproto
 				x11-proto/xextproto
 				x11-libs/libXv
 				xinerama? ( x11-proto/xineramaproto )
 			)
-			virtual/x11
-	) )
 	fbcon? ( sys-kernel/linux-headers )
 	dev-util/pkgconfig"
 
diff --git a/media-plugins/vdr-softdevice/vdr-softdevice-0.3.1.20061217.ebuild b/media-plugins/vdr-softdevice/vdr-softdevice-0.3.1.20061217.ebuild
index 904b0a78fd0f..61184ba8d272 100644
--- a/media-plugins/vdr-softdevice/vdr-softdevice-0.3.1.20061217.ebuild
+++ b/media-plugins/vdr-softdevice/vdr-softdevice-0.3.1.20061217.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-plugins/vdr-softdevice/vdr-softdevice-0.3.1.20061217.ebuild,v 1.4 2007/07/10 23:09:00 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-softdevice/vdr-softdevice-0.3.1.20061217.ebuild,v 1.5 2007/07/22 09:15:01 dberkholz Exp $
 
 inherit vdr-plugin
 
@@ -24,23 +24,19 @@ RDEPEND=">=media-video/vdr-1.3.36
 		dev-libs/DFB++
 	)
 	media-libs/alsa-lib
-	xv? ( || ( ( x11-libs/libX11
+	xv? ( x11-libs/libX11
 				x11-libs/libXext
 				x11-libs/libXi
 				x11-libs/libXv
 				xinerama? ( x11-libs/libXinerama )
-			)
-			virtual/x11
-		) )"
+	)"
 
 DEPEND="${RDEPEND}
-	xv? ( || ( ( x11-proto/xproto
+	xv? ( x11-proto/xproto
 				x11-proto/xextproto
 				x11-libs/libXv
 				xinerama? ( x11-proto/xineramaproto )
 			)
-			virtual/x11
-	) )
 	fbcon? ( sys-kernel/linux-headers )
 	dev-util/pkgconfig"
 # Make sure the assembler USE flags are unmasked on amd64
diff --git a/media-plugins/vdr-softdevice/vdr-softdevice-0.3.1.20070313.ebuild b/media-plugins/vdr-softdevice/vdr-softdevice-0.3.1.20070313.ebuild
index dab1f7f120a8..e0d3dbd8f08d 100644
--- a/media-plugins/vdr-softdevice/vdr-softdevice-0.3.1.20070313.ebuild
+++ b/media-plugins/vdr-softdevice/vdr-softdevice-0.3.1.20070313.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-plugins/vdr-softdevice/vdr-softdevice-0.3.1.20070313.ebuild,v 1.3 2007/07/10 23:09:00 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-softdevice/vdr-softdevice-0.3.1.20070313.ebuild,v 1.4 2007/07/22 09:15:01 dberkholz Exp $
 
 inherit vdr-plugin
 
@@ -24,23 +24,19 @@ RDEPEND=">=media-video/vdr-1.3.36
 		dev-libs/DFB++
 	)
 	media-libs/alsa-lib
-	xv? ( || ( ( x11-libs/libX11
+	xv? ( x11-libs/libX11
 				x11-libs/libXext
 				x11-libs/libXi
 				x11-libs/libXv
 				xinerama? ( x11-libs/libXinerama )
-			)
-			virtual/x11
-		) )"
+	)"
 
 DEPEND="${RDEPEND}
-	xv? ( || ( ( x11-proto/xproto
+	xv? ( x11-proto/xproto
 				x11-proto/xextproto
 				x11-libs/libXv
 				xinerama? ( x11-proto/xineramaproto )
 			)
-			virtual/x11
-	) )
 	fbcon? ( sys-kernel/linux-headers )
 	dev-util/pkgconfig"
 # Make sure the assembler USE flags are unmasked on amd64
diff --git a/media-plugins/vdr-softdevice/vdr-softdevice-0.3.1.20070410.ebuild b/media-plugins/vdr-softdevice/vdr-softdevice-0.3.1.20070410.ebuild
index f38ae5696865..422bc49784ec 100644
--- a/media-plugins/vdr-softdevice/vdr-softdevice-0.3.1.20070410.ebuild
+++ b/media-plugins/vdr-softdevice/vdr-softdevice-0.3.1.20070410.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-plugins/vdr-softdevice/vdr-softdevice-0.3.1.20070410.ebuild,v 1.3 2007/07/10 23:09:00 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-softdevice/vdr-softdevice-0.3.1.20070410.ebuild,v 1.4 2007/07/22 09:15:01 dberkholz Exp $
 
 inherit vdr-plugin versionator
 
@@ -30,23 +30,19 @@ RDEPEND=">=media-video/vdr-1.3.36
 		dev-libs/DFB++
 	)
 	media-libs/alsa-lib
-	xv? ( || ( ( x11-libs/libX11
+	xv? ( x11-libs/libX11
 				x11-libs/libXext
 				x11-libs/libXi
 				x11-libs/libXv
 				xinerama? ( x11-libs/libXinerama )
-			)
-			virtual/x11
-		) )"
+	)"
 
 DEPEND="${RDEPEND}
-	xv? ( || ( ( x11-proto/xproto
+	xv? ( x11-proto/xproto
 				x11-proto/xextproto
 				x11-libs/libXv
 				xinerama? ( x11-proto/xineramaproto )
 			)
-			virtual/x11
-	) )
 	fbcon? ( sys-kernel/linux-headers )
 	dev-util/pkgconfig"
 # Make sure the assembler USE flags are unmasked on amd64
diff --git a/media-plugins/vdr-softdevice/vdr-softdevice-0.4.0.20070515.ebuild b/media-plugins/vdr-softdevice/vdr-softdevice-0.4.0.20070515.ebuild
index a1f699bd8649..bc6f088f88c6 100644
--- a/media-plugins/vdr-softdevice/vdr-softdevice-0.4.0.20070515.ebuild
+++ b/media-plugins/vdr-softdevice/vdr-softdevice-0.4.0.20070515.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-plugins/vdr-softdevice/vdr-softdevice-0.4.0.20070515.ebuild,v 1.3 2007/07/10 23:09:00 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-softdevice/vdr-softdevice-0.4.0.20070515.ebuild,v 1.4 2007/07/22 09:15:01 dberkholz Exp $
 
 inherit vdr-plugin versionator
 
@@ -30,23 +30,19 @@ RDEPEND=">=media-video/vdr-1.3.36
 		dev-libs/DFB++
 	)
 	media-libs/alsa-lib
-	xv? ( || ( ( x11-libs/libX11
+	xv? ( x11-libs/libX11
 				x11-libs/libXext
 				x11-libs/libXi
 				x11-libs/libXv
 				xinerama? ( x11-libs/libXinerama )
-			)
-			virtual/x11
-		) )"
+	)"
 
 DEPEND="${RDEPEND}
-	xv? ( || ( ( x11-proto/xproto
+	xv? ( x11-proto/xproto
 				x11-proto/xextproto
 				x11-libs/libXv
 				xinerama? ( x11-proto/xineramaproto )
 			)
-			virtual/x11
-	) )
 	fbcon? ( sys-kernel/linux-headers )
 	dev-util/pkgconfig"
 # Make sure the assembler USE flags are unmasked on amd64
diff --git a/media-plugins/vdr-softdevice/vdr-softdevice-0.4.0.20070711.ebuild b/media-plugins/vdr-softdevice/vdr-softdevice-0.4.0.20070711.ebuild
index c63e0dcaed53..92468843efa0 100644
--- a/media-plugins/vdr-softdevice/vdr-softdevice-0.4.0.20070711.ebuild
+++ b/media-plugins/vdr-softdevice/vdr-softdevice-0.4.0.20070711.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-plugins/vdr-softdevice/vdr-softdevice-0.4.0.20070711.ebuild,v 1.1 2007/07/14 16:43:34 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-softdevice/vdr-softdevice-0.4.0.20070711.ebuild,v 1.2 2007/07/22 09:15:01 dberkholz Exp $
 
 inherit vdr-plugin versionator
 
@@ -30,23 +30,19 @@ RDEPEND=">=media-video/vdr-1.3.36
 		dev-libs/DFB++
 	)
 	media-libs/alsa-lib
-	xv? ( || ( ( x11-libs/libX11
+	xv? ( x11-libs/libX11
 				x11-libs/libXext
 				x11-libs/libXi
 				x11-libs/libXv
 				xinerama? ( x11-libs/libXinerama )
-			)
-			virtual/x11
-		) )"
+	)"
 
 DEPEND="${RDEPEND}
-	xv? ( || ( ( x11-proto/xproto
+	xv? ( x11-proto/xproto
 				x11-proto/xextproto
 				x11-libs/libXv
 				xinerama? ( x11-proto/xineramaproto )
 			)
-			virtual/x11
-	) )
 	fbcon? ( sys-kernel/linux-headers )
 	dev-util/pkgconfig"
 # Make sure the assembler USE flags are unmasked on amd64
diff --git a/media-plugins/vdr-softdevice/vdr-softdevice-0.4.0.ebuild b/media-plugins/vdr-softdevice/vdr-softdevice-0.4.0.ebuild
index a1d27e99425b..c5753e3b472b 100644
--- a/media-plugins/vdr-softdevice/vdr-softdevice-0.4.0.ebuild
+++ b/media-plugins/vdr-softdevice/vdr-softdevice-0.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-plugins/vdr-softdevice/vdr-softdevice-0.4.0.ebuild,v 1.3 2007/07/17 12:24:29 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-softdevice/vdr-softdevice-0.4.0.ebuild,v 1.4 2007/07/22 09:15:01 dberkholz Exp $
 
 inherit vdr-plugin versionator
 
@@ -30,23 +30,19 @@ RDEPEND=">=media-video/vdr-1.3.36
 		dev-libs/DFB++
 	)
 	media-libs/alsa-lib
-	xv? ( || ( ( x11-libs/libX11
+	xv? ( x11-libs/libX11
 				x11-libs/libXext
 				x11-libs/libXi
 				x11-libs/libXv
 				xinerama? ( x11-libs/libXinerama )
-			)
-			virtual/x11
-		) )"
+	)"
 
 DEPEND="${RDEPEND}
-	xv? ( || ( ( x11-proto/xproto
+	xv? ( x11-proto/xproto
 				x11-proto/xextproto
 				x11-libs/libXv
 				xinerama? ( x11-proto/xineramaproto )
 			)
-			virtual/x11
-	) )
 	fbcon? ( sys-kernel/linux-headers )
 	dev-util/pkgconfig"
 # Make sure the assembler USE flags are unmasked on amd64