Drop virtual/x11 references.

Package-Manager: portage-2.1.3_rc8

41 files changed, 200 insertions, 214 deletions

diff --git a/media-plugins/gst-plugins-v4l/ChangeLog b/media-plugins/gst-plugins-v4l/ChangeLog
index 02ae7db2a4ef..d810a942690d 100644
--- a/media-plugins/gst-plugins-v4l/ChangeLog
+++ b/media-plugins/gst-plugins-v4l/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-plugins/gst-plugins-v4l
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/gst-plugins-v4l/ChangeLog,v 1.24 2007/02/22 02:23:15 peper Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/gst-plugins-v4l/ChangeLog,v 1.25 2007/07/22 09:20:38 dberkholz Exp $
+
+  22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>;
+  gst-plugins-v4l-0.8.11.ebuild, gst-plugins-v4l-0.8.12.ebuild,
+  gst-plugins-v4l-0.10.4.ebuild:
+  Drop virtual/x11 references.
 
   22 Feb 2007; Piotr Jaroszyński <peper@gentoo.org> ChangeLog:
   Transition to Manifest2.
diff --git a/media-plugins/gst-plugins-v4l/gst-plugins-v4l-0.10.4.ebuild b/media-plugins/gst-plugins-v4l/gst-plugins-v4l-0.10.4.ebuild
index aaedd1acb580..6b9490508420 100644
--- a/media-plugins/gst-plugins-v4l/gst-plugins-v4l-0.10.4.ebuild
+++ b/media-plugins/gst-plugins-v4l/gst-plugins-v4l-0.10.4.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-plugins/gst-plugins-v4l/gst-plugins-v4l-0.10.4.ebuild,v 1.3 2007/07/10 23:08:59 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/gst-plugins-v4l/gst-plugins-v4l-0.10.4.ebuild,v 1.4 2007/07/22 09:20:38 dberkholz Exp $
 
 inherit gst-plugins-base
 
@@ -10,7 +10,7 @@ KEYWORDS="~amd64 ~ppc ~x86"
 
 IUSE=""
 
-RDEPEND="|| ( x11-drivers/xf86-video-v4l virtual/x11 )"
+RDEPEND="x11-drivers/xf86-video-v4l"
 
 DEPEND="${RDEPEND}
 	virtual/os-headers
diff --git a/media-plugins/gst-plugins-v4l/gst-plugins-v4l-0.8.11.ebuild b/media-plugins/gst-plugins-v4l/gst-plugins-v4l-0.8.11.ebuild
index 3ab572ec473d..b9786b0b3386 100644
--- a/media-plugins/gst-plugins-v4l/gst-plugins-v4l-0.8.11.ebuild
+++ b/media-plugins/gst-plugins-v4l/gst-plugins-v4l-0.8.11.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-plugins/gst-plugins-v4l/gst-plugins-v4l-0.8.11.ebuild,v 1.6 2007/07/10 23:08:59 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/gst-plugins-v4l/gst-plugins-v4l-0.8.11.ebuild,v 1.7 2007/07/22 09:20:38 dberkholz Exp $
 
 inherit gst-plugins
 
@@ -10,7 +10,7 @@ KEYWORDS="amd64 ppc x86"
 
 IUSE=""
 
-RDEPEND="|| ( x11-libs/libXv virtual/x11 )"
+RDEPEND="x11-libs/libXv"
 
 DEPEND="${RDEPEND}
 	virtual/os-headers
diff --git a/media-plugins/gst-plugins-v4l/gst-plugins-v4l-0.8.12.ebuild b/media-plugins/gst-plugins-v4l/gst-plugins-v4l-0.8.12.ebuild
index 29ae1f9bb321..cbbe9745ef71 100644
--- a/media-plugins/gst-plugins-v4l/gst-plugins-v4l-0.8.12.ebuild
+++ b/media-plugins/gst-plugins-v4l/gst-plugins-v4l-0.8.12.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-plugins/gst-plugins-v4l/gst-plugins-v4l-0.8.12.ebuild,v 1.3 2007/07/10 23:08:59 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/gst-plugins-v4l/gst-plugins-v4l-0.8.12.ebuild,v 1.4 2007/07/22 09:20:38 dberkholz Exp $
 
 inherit gst-plugins
 
@@ -10,7 +10,7 @@ KEYWORDS="~amd64 ~ppc ~x86"
 
 IUSE=""
 
-RDEPEND="|| ( x11-libs/libXv virtual/x11 )"
+RDEPEND="x11-libs/libXv"
 
 DEPEND="${RDEPEND}
 	virtual/os-headers
diff --git a/media-plugins/gst-plugins-v4l2/ChangeLog b/media-plugins/gst-plugins-v4l2/ChangeLog
index a80370cc0198..6c4380874f70 100644
--- a/media-plugins/gst-plugins-v4l2/ChangeLog
+++ b/media-plugins/gst-plugins-v4l2/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-plugins/gst-plugins-v4l2
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/gst-plugins-v4l2/ChangeLog,v 1.17 2007/02/23 12:41:49 zaheerm Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/gst-plugins-v4l2/ChangeLog,v 1.18 2007/07/22 09:19:40 dberkholz Exp $
+
+  22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>;
+  gst-plugins-v4l2-0.8.11.ebuild, gst-plugins-v4l2-0.8.12.ebuild,
+  gst-plugins-v4l2-0.10.5.ebuild:
+  Drop virtual/x11 references.
 
 *gst-plugins-v4l2-0.10.5 (23 Feb 2007)
 
diff --git a/media-plugins/gst-plugins-v4l2/gst-plugins-v4l2-0.10.5.ebuild b/media-plugins/gst-plugins-v4l2/gst-plugins-v4l2-0.10.5.ebuild
index d1c33aaa04ba..bacb08d662fd 100644
--- a/media-plugins/gst-plugins-v4l2/gst-plugins-v4l2-0.10.5.ebuild
+++ b/media-plugins/gst-plugins-v4l2/gst-plugins-v4l2-0.10.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-plugins/gst-plugins-v4l2/gst-plugins-v4l2-0.10.5.ebuild,v 1.2 2007/07/10 23:08:59 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/gst-plugins-v4l2/gst-plugins-v4l2-0.10.5.ebuild,v 1.3 2007/07/22 09:19:40 dberkholz Exp $
 
 inherit gst-plugins-good
 
@@ -10,7 +10,7 @@ KEYWORDS="~amd64 ~ppc ~x86"
 
 IUSE=""
 
-RDEPEND="|| ( x11-drivers/xf86-video-v4l virtual/x11 )"
+RDEPEND="x11-drivers/xf86-video-v4l"
 
 DEPEND="${RDEPEND}
 	virtual/os-headers
diff --git a/media-plugins/gst-plugins-v4l2/gst-plugins-v4l2-0.8.11.ebuild b/media-plugins/gst-plugins-v4l2/gst-plugins-v4l2-0.8.11.ebuild
index 1bd611f8b2c7..21627df79938 100644
--- a/media-plugins/gst-plugins-v4l2/gst-plugins-v4l2-0.8.11.ebuild
+++ b/media-plugins/gst-plugins-v4l2/gst-plugins-v4l2-0.8.11.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-plugins/gst-plugins-v4l2/gst-plugins-v4l2-0.8.11.ebuild,v 1.6 2007/07/10 23:08:59 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/gst-plugins-v4l2/gst-plugins-v4l2-0.8.11.ebuild,v 1.7 2007/07/22 09:19:40 dberkholz Exp $
 
 inherit gst-plugins
 
@@ -10,7 +10,7 @@ KEYWORDS="amd64 ppc x86"
 
 IUSE=""
 
-RDEPEND="|| ( x11-libs/libXv virtual/x11 )
+RDEPEND="x11-libs/libXv
 	>=sys-kernel/linux-headers-2.6"
 
 DEPEND="${RDEPEND}
diff --git a/media-plugins/gst-plugins-v4l2/gst-plugins-v4l2-0.8.12.ebuild b/media-plugins/gst-plugins-v4l2/gst-plugins-v4l2-0.8.12.ebuild
index e03e427ef734..6e6b83a5ba64 100644
--- a/media-plugins/gst-plugins-v4l2/gst-plugins-v4l2-0.8.12.ebuild
+++ b/media-plugins/gst-plugins-v4l2/gst-plugins-v4l2-0.8.12.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-plugins/gst-plugins-v4l2/gst-plugins-v4l2-0.8.12.ebuild,v 1.3 2007/07/10 23:08:59 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/gst-plugins-v4l2/gst-plugins-v4l2-0.8.12.ebuild,v 1.4 2007/07/22 09:19:40 dberkholz Exp $
 
 inherit gst-plugins
 
@@ -10,7 +10,7 @@ KEYWORDS="~amd64 ~ppc ~x86"
 
 IUSE=""
 
-RDEPEND="|| ( x11-libs/libXv virtual/x11 )
+RDEPEND="x11-libs/libXv
 	>=sys-kernel/linux-headers-2.6"
 
 DEPEND="${RDEPEND}
diff --git a/media-plugins/gst-plugins-x/ChangeLog b/media-plugins/gst-plugins-x/ChangeLog
index cd2c18acaa90..d14571e832b8 100644
--- a/media-plugins/gst-plugins-x/ChangeLog
+++ b/media-plugins/gst-plugins-x/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-plugins/gst-plugins-x
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/gst-plugins-x/ChangeLog,v 1.27 2007/06/28 15:07:59 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/gst-plugins-x/ChangeLog,v 1.28 2007/07/22 09:17:46 dberkholz Exp $
+
+  22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>;
+  gst-plugins-x-0.10.4.ebuild, gst-plugins-x-0.10.6.ebuild,
+  gst-plugins-x-0.10.7.ebuild, gst-plugins-x-0.10.9.ebuild,
+  gst-plugins-x-0.10.10.ebuild, gst-plugins-x-0.10.11.ebuild,
+  gst-plugins-x-0.10.12.ebuild:
+  Drop virtual/x11 references.
 
   28 Jun 2007; Joseph Jezak <josejx@gentoo.org>
   gst-plugins-x-0.10.11.ebuild:
diff --git a/media-plugins/gst-plugins-x/gst-plugins-x-0.10.10.ebuild b/media-plugins/gst-plugins-x/gst-plugins-x-0.10.10.ebuild
index 71d50cc6bf26..5a11fb054ace 100644
--- a/media-plugins/gst-plugins-x/gst-plugins-x-0.10.10.ebuild
+++ b/media-plugins/gst-plugins-x/gst-plugins-x-0.10.10.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-plugins/gst-plugins-x/gst-plugins-x-0.10.10.ebuild,v 1.2 2006/10/14 21:16:46 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/gst-plugins-x/gst-plugins-x-0.10.10.ebuild,v 1.3 2007/07/22 09:17:46 dberkholz Exp $
 
 inherit gst-plugins-base
 
@@ -8,9 +8,9 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86"
 IUSE=""
 
 RDEPEND=">=media-libs/gst-plugins-base-0.10.10
-	 || ( x11-libs/libX11 virtual/x11 )"
+	 x11-libs/libX11"
 DEPEND="${RDEPEND}
-	|| ( x11-proto/xproto virtual/x11 )"
+	x11-proto/xproto"
 
 # xshm is a compile time option of ximage
 GST_PLUGINS_BUILD="x xshm"
diff --git a/media-plugins/gst-plugins-x/gst-plugins-x-0.10.11.ebuild b/media-plugins/gst-plugins-x/gst-plugins-x-0.10.11.ebuild
index b182ca4da535..c108b7243774 100644
--- a/media-plugins/gst-plugins-x/gst-plugins-x-0.10.11.ebuild
+++ b/media-plugins/gst-plugins-x/gst-plugins-x-0.10.11.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/gst-plugins-x/gst-plugins-x-0.10.11.ebuild,v 1.9 2007/06/28 15:07:59 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/gst-plugins-x/gst-plugins-x-0.10.11.ebuild,v 1.10 2007/07/22 09:17:46 dberkholz Exp $
 
 inherit gst-plugins-base
 
@@ -8,9 +8,9 @@ KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ppc ppc64 ~sh sparc x86 ~x86-fbsd"
 IUSE=""
 
 RDEPEND=">=media-libs/gst-plugins-base-0.10.11
-	 || ( x11-libs/libX11 virtual/x11 )"
+	 x11-libs/libX11"
 DEPEND="${RDEPEND}
-	|| ( x11-proto/xproto virtual/x11 )"
+	x11-proto/xproto"
 
 # xshm is a compile time option of ximage
 GST_PLUGINS_BUILD="x xshm"
diff --git a/media-plugins/gst-plugins-x/gst-plugins-x-0.10.12.ebuild b/media-plugins/gst-plugins-x/gst-plugins-x-0.10.12.ebuild
index 7c85a46b280a..a012514b51d6 100644
--- a/media-plugins/gst-plugins-x/gst-plugins-x-0.10.12.ebuild
+++ b/media-plugins/gst-plugins-x/gst-plugins-x-0.10.12.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/gst-plugins-x/gst-plugins-x-0.10.12.ebuild,v 1.1 2007/03/23 18:16:04 zaheerm Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/gst-plugins-x/gst-plugins-x-0.10.12.ebuild,v 1.2 2007/07/22 09:17:46 dberkholz Exp $
 
 inherit gst-plugins-base
 
@@ -8,9 +8,9 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
 IUSE=""
 
 RDEPEND=">=media-libs/gst-plugins-base-0.10.12
-	 || ( x11-libs/libX11 virtual/x11 )"
+	 x11-libs/libX11"
 DEPEND="${RDEPEND}
-	|| ( x11-proto/xproto virtual/x11 )"
+	x11-proto/xproto"
 
 # xshm is a compile time option of ximage
 GST_PLUGINS_BUILD="x xshm"
diff --git a/media-plugins/gst-plugins-x/gst-plugins-x-0.10.4.ebuild b/media-plugins/gst-plugins-x/gst-plugins-x-0.10.4.ebuild
index 25e8170e9a91..10c8af4f90a0 100644
--- a/media-plugins/gst-plugins-x/gst-plugins-x-0.10.4.ebuild
+++ b/media-plugins/gst-plugins-x/gst-plugins-x-0.10.4.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-plugins/gst-plugins-x/gst-plugins-x-0.10.4.ebuild,v 1.15 2006/10/14 21:16:46 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/gst-plugins-x/gst-plugins-x-0.10.4.ebuild,v 1.16 2007/07/22 09:17:46 dberkholz Exp $
 
 inherit gst-plugins-base
 
@@ -8,9 +8,9 @@ KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sh sparc x86"
 
 IUSE=""
 RDEPEND=">=media-libs/gst-plugins-base-0.10.4-r1
-	 || ( x11-libs/libX11 virtual/x11 )"
+	 x11-libs/libX11"
 DEPEND="${RDEPEND}
-	|| ( x11-proto/xproto virtual/x11 )"
+	x11-proto/xproto"
 
 # xshm is a compile time option of ximage
 GST_PLUGINS_BUILD="x xshm"
diff --git a/media-plugins/gst-plugins-x/gst-plugins-x-0.10.6.ebuild b/media-plugins/gst-plugins-x/gst-plugins-x-0.10.6.ebuild
index 6a6e48838369..998e43bbe8e9 100644
--- a/media-plugins/gst-plugins-x/gst-plugins-x-0.10.6.ebuild
+++ b/media-plugins/gst-plugins-x/gst-plugins-x-0.10.6.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-plugins/gst-plugins-x/gst-plugins-x-0.10.6.ebuild,v 1.4 2006/10/14 21:16:46 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/gst-plugins-x/gst-plugins-x-0.10.6.ebuild,v 1.5 2007/07/22 09:17:46 dberkholz Exp $
 
 inherit gst-plugins-base
 
@@ -8,9 +8,9 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86"
 
 IUSE=""
 RDEPEND=">=media-libs/gst-plugins-base-0.10.6
-	 || ( x11-libs/libX11 virtual/x11 )"
+	 x11-libs/libX11"
 DEPEND="${RDEPEND}
-	|| ( x11-proto/xproto virtual/x11 )"
+	x11-proto/xproto"
 
 # xshm is a compile time option of ximage
 GST_PLUGINS_BUILD="x xshm"
diff --git a/media-plugins/gst-plugins-x/gst-plugins-x-0.10.7.ebuild b/media-plugins/gst-plugins-x/gst-plugins-x-0.10.7.ebuild
index 55c21f3a59d0..23c6a56b61bb 100644
--- a/media-plugins/gst-plugins-x/gst-plugins-x-0.10.7.ebuild
+++ b/media-plugins/gst-plugins-x/gst-plugins-x-0.10.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-plugins/gst-plugins-x/gst-plugins-x-0.10.7.ebuild,v 1.3 2006/10/14 21:16:46 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/gst-plugins-x/gst-plugins-x-0.10.7.ebuild,v 1.4 2007/07/22 09:17:46 dberkholz Exp $
 
 inherit gst-plugins-base
 
@@ -8,9 +8,9 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86"
 
 IUSE=""
 RDEPEND=">=media-libs/gst-plugins-base-0.10.7
-	 || ( x11-libs/libX11 virtual/x11 )"
+	 x11-libs/libX11"
 DEPEND="${RDEPEND}
-	|| ( x11-proto/xproto virtual/x11 )"
+	x11-proto/xproto"
 
 # xshm is a compile time option of ximage
 GST_PLUGINS_BUILD="x xshm"
diff --git a/media-plugins/gst-plugins-x/gst-plugins-x-0.10.9.ebuild b/media-plugins/gst-plugins-x/gst-plugins-x-0.10.9.ebuild
index 506a6e1b889c..8dc26dc2f8f9 100644
--- a/media-plugins/gst-plugins-x/gst-plugins-x-0.10.9.ebuild
+++ b/media-plugins/gst-plugins-x/gst-plugins-x-0.10.9.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-plugins/gst-plugins-x/gst-plugins-x-0.10.9.ebuild,v 1.3 2006/10/14 21:16:46 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/gst-plugins-x/gst-plugins-x-0.10.9.ebuild,v 1.4 2007/07/22 09:17:46 dberkholz Exp $
 
 inherit gst-plugins-base
 
@@ -8,9 +8,9 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86"
 IUSE=""
 
 RDEPEND=">=media-libs/gst-plugins-base-0.10.9
-	 || ( x11-libs/libX11 virtual/x11 )"
+	 x11-libs/libX11"
 DEPEND="${RDEPEND}
-	|| ( x11-proto/xproto virtual/x11 )"
+	x11-proto/xproto"
 
 # xshm is a compile time option of ximage
 GST_PLUGINS_BUILD="x xshm"
diff --git a/media-plugins/gst-plugins-ximagesrc/ChangeLog b/media-plugins/gst-plugins-ximagesrc/ChangeLog
index e186e4583882..58a2179b44e5 100644
--- a/media-plugins/gst-plugins-ximagesrc/ChangeLog
+++ b/media-plugins/gst-plugins-ximagesrc/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-plugins/gst-plugins-ximagesrc
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/gst-plugins-ximagesrc/ChangeLog,v 1.2 2007/02/22 02:24:11 peper Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/gst-plugins-ximagesrc/ChangeLog,v 1.3 2007/07/22 09:16:13 dberkholz Exp $
+
+  22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>;
+  gst-plugins-ximagesrc-0.10.3.ebuild:
+  Drop virtual/x11 references.
 
   22 Feb 2007; Piotr Jaroszyński <peper@gentoo.org> ChangeLog:
   Transition to Manifest2.
diff --git a/media-plugins/gst-plugins-ximagesrc/gst-plugins-ximagesrc-0.10.3.ebuild b/media-plugins/gst-plugins-ximagesrc/gst-plugins-ximagesrc-0.10.3.ebuild
index cd3d62f70f8f..bf8872b92e16 100644
--- a/media-plugins/gst-plugins-ximagesrc/gst-plugins-ximagesrc-0.10.3.ebuild
+++ b/media-plugins/gst-plugins-ximagesrc/gst-plugins-ximagesrc-0.10.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-plugins/gst-plugins-ximagesrc/gst-plugins-ximagesrc-0.10.3.ebuild,v 1.1 2006/05/05 10:40:40 zaheerm Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/gst-plugins-ximagesrc/gst-plugins-ximagesrc-0.10.3.ebuild,v 1.2 2007/07/22 09:16:13 dberkholz Exp $
 
 inherit gst-plugins-good
 
@@ -9,10 +9,11 @@ KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""
 RDEPEND=">=media-libs/gst-plugins-base-0.10.6
 	>=media-libs/gstreamer-0.10.5
-	 || ( ( x11-libs/libX11 x11-libs/libXdamage x11-libs/libXfixes )
-		virtual/x11 )"
+	x11-libs/libX11
+	x11-libs/libXdamage
+	x11-libs/libXfixes"
 DEPEND="${RDEPEND}
-	|| ( x11-proto/xproto virtual/x11 )"
+	x11-proto/xproto"
 
 # xshm is a compile time option of ximage
 GST_PLUGINS_BUILD="x xshm"
diff --git a/media-plugins/gst-plugins-xvideo/ChangeLog b/media-plugins/gst-plugins-xvideo/ChangeLog
index 17c1026cab73..410be6950608 100644
--- a/media-plugins/gst-plugins-xvideo/ChangeLog
+++ b/media-plugins/gst-plugins-xvideo/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-plugins/gst-plugins-xvideo
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/gst-plugins-xvideo/ChangeLog,v 1.89 2007/06/28 15:19:25 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/gst-plugins-xvideo/ChangeLog,v 1.90 2007/07/22 09:25:49 dberkholz Exp $
+
+  22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>;
+  gst-plugins-xvideo-0.8.11.ebuild, gst-plugins-xvideo-0.8.12.ebuild,
+  gst-plugins-xvideo-0.10.4-r1.ebuild, gst-plugins-xvideo-0.10.11.ebuild,
+  gst-plugins-xvideo-0.10.12.ebuild:
+  Drop virtual/x11 references.
 
   28 Jun 2007; Joseph Jezak <josejx@gentoo.org>
   gst-plugins-xvideo-0.10.11.ebuild:
diff --git a/media-plugins/gst-plugins-xvideo/gst-plugins-xvideo-0.10.11.ebuild b/media-plugins/gst-plugins-xvideo/gst-plugins-xvideo-0.10.11.ebuild
index 39599971d97e..46612879f1c0 100644
--- a/media-plugins/gst-plugins-xvideo/gst-plugins-xvideo-0.10.11.ebuild
+++ b/media-plugins/gst-plugins-xvideo/gst-plugins-xvideo-0.10.11.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/gst-plugins-xvideo/gst-plugins-xvideo-0.10.11.ebuild,v 1.9 2007/06/28 15:19:25 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/gst-plugins-xvideo/gst-plugins-xvideo-0.10.11.ebuild,v 1.10 2007/07/22 09:25:49 dberkholz Exp $
 
 inherit gst-plugins-base
 
@@ -8,12 +8,11 @@ KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ppc ppc64 ~sh sparc x86 ~x86-fbsd"
 IUSE=""
 
 RDEPEND=">=media-libs/gst-plugins-base-0.10.11
-		 || ( x11-libs/libXv virtual/x11 )"
+		 x11-libs/libXv"
 DEPEND="${RDEPEND}
-	|| ( ( x11-proto/videoproto
-		x11-proto/xproto
-		x11-proto/xextproto )
-	virtual/x11 )"
+	x11-proto/videoproto
+	x11-proto/xproto
+	x11-proto/xextproto"
 
 # xshm is a compile time option of xvideo
 # x is needed to build any X plugins, but we build/install only xv anyway
diff --git a/media-plugins/gst-plugins-xvideo/gst-plugins-xvideo-0.10.12.ebuild b/media-plugins/gst-plugins-xvideo/gst-plugins-xvideo-0.10.12.ebuild
index 66cbe9b038ab..8da07510891a 100644
--- a/media-plugins/gst-plugins-xvideo/gst-plugins-xvideo-0.10.12.ebuild
+++ b/media-plugins/gst-plugins-xvideo/gst-plugins-xvideo-0.10.12.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/gst-plugins-xvideo/gst-plugins-xvideo-0.10.12.ebuild,v 1.1 2007/03/23 18:47:32 zaheerm Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/gst-plugins-xvideo/gst-plugins-xvideo-0.10.12.ebuild,v 1.2 2007/07/22 09:25:49 dberkholz Exp $
 
 inherit gst-plugins-base
 
@@ -8,12 +8,11 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
 IUSE=""
 
 RDEPEND=">=media-libs/gst-plugins-base-0.10.12
-		 || ( x11-libs/libXv virtual/x11 )"
+		 x11-libs/libXv"
 DEPEND="${RDEPEND}
-	|| ( ( x11-proto/videoproto
-		x11-proto/xproto
-		x11-proto/xextproto )
-	virtual/x11 )"
+	x11-proto/videoproto
+	x11-proto/xproto
+	x11-proto/xextproto"
 
 # xshm is a compile time option of xvideo
 # x is needed to build any X plugins, but we build/install only xv anyway
diff --git a/media-plugins/gst-plugins-xvideo/gst-plugins-xvideo-0.10.4-r1.ebuild b/media-plugins/gst-plugins-xvideo/gst-plugins-xvideo-0.10.4-r1.ebuild
index 22242c20c241..06fb9eeebbab 100644
--- a/media-plugins/gst-plugins-xvideo/gst-plugins-xvideo-0.10.4-r1.ebuild
+++ b/media-plugins/gst-plugins-xvideo/gst-plugins-xvideo-0.10.4-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-plugins/gst-plugins-xvideo/gst-plugins-xvideo-0.10.4-r1.ebuild,v 1.15 2006/10/14 21:17:24 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/gst-plugins-xvideo/gst-plugins-xvideo-0.10.4-r1.ebuild,v 1.16 2007/07/22 09:25:49 dberkholz Exp $
 
 inherit gst-plugins-base
 
@@ -8,12 +8,11 @@ KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sh sparc x86"
 
 IUSE=""
 RDEPEND=">=media-libs/gst-plugins-base-0.10.4
-		 || ( x11-libs/libXv virtual/x11 )"
+		 x11-libs/libXv"
 DEPEND="${RDEPEND}
-	|| ( ( x11-proto/videoproto
-		x11-proto/xproto
-		x11-proto/xextproto )
-	virtual/x11 )"
+	x11-proto/videoproto
+	x11-proto/xproto
+	x11-proto/xextproto"
 
 # xshm is a compile time option of xvideo
 # x is needed to build any X plugins, but we build/install only xv anyway
diff --git a/media-plugins/gst-plugins-xvideo/gst-plugins-xvideo-0.8.11.ebuild b/media-plugins/gst-plugins-xvideo/gst-plugins-xvideo-0.8.11.ebuild
index da0348be91fa..30bf0889d66e 100644
--- a/media-plugins/gst-plugins-xvideo/gst-plugins-xvideo-0.8.11.ebuild
+++ b/media-plugins/gst-plugins-xvideo/gst-plugins-xvideo-0.8.11.ebuild
@@ -1,13 +1,13 @@
-# 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-plugins/gst-plugins-xvideo/gst-plugins-xvideo-0.8.11.ebuild,v 1.12 2006/10/14 21:17:24 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/gst-plugins-xvideo/gst-plugins-xvideo-0.8.11.ebuild,v 1.13 2007/07/22 09:25:49 dberkholz Exp $
 
 inherit gst-plugins
 
 KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sh sparc x86"
 
 IUSE=""
-DEPEND="|| ( x11-libs/libXv virtual/x11 )"
+DEPEND="x11-libs/libXv"
 
 # xshm is a compile time option of xvideo
 GST_PLUGINS_BUILD="x xvideo xshm"
diff --git a/media-plugins/gst-plugins-xvideo/gst-plugins-xvideo-0.8.12.ebuild b/media-plugins/gst-plugins-xvideo/gst-plugins-xvideo-0.8.12.ebuild
index d2520601e369..c9852123f146 100644
--- a/media-plugins/gst-plugins-xvideo/gst-plugins-xvideo-0.8.12.ebuild
+++ b/media-plugins/gst-plugins-xvideo/gst-plugins-xvideo-0.8.12.ebuild
@@ -1,13 +1,13 @@
-# 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-plugins/gst-plugins-xvideo/gst-plugins-xvideo-0.8.12.ebuild,v 1.3 2006/10/14 21:17:24 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/gst-plugins-xvideo/gst-plugins-xvideo-0.8.12.ebuild,v 1.4 2007/07/22 09:25:49 dberkholz Exp $
 
 inherit gst-plugins
 
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86"
 IUSE=""
 
-DEPEND="|| ( x11-libs/libXv virtual/x11 )"
+DEPEND="x11-libs/libXv"
 
 # xshm is a compile time option of xvideo
 GST_PLUGINS_BUILD="x xvideo xshm"
diff --git a/media-plugins/libvisual-plugins/ChangeLog b/media-plugins/libvisual-plugins/ChangeLog
index 07a84fccbaa4..92fb94c86813 100644
--- a/media-plugins/libvisual-plugins/ChangeLog
+++ b/media-plugins/libvisual-plugins/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-plugins/libvisual-plugins
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/libvisual-plugins/ChangeLog,v 1.35 2007/05/25 06:49:14 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/libvisual-plugins/ChangeLog,v 1.36 2007/07/22 09:22:09 dberkholz Exp $
+
+  22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>;
+  libvisual-plugins-0.2.0.ebuild, libvisual-plugins-0.4.0.ebuild,
+  libvisual-plugins-0.4.0-r1.ebuild:
+  Drop virtual/x11 references.
 
   25 May 2007; Alexis Ballier <aballier@gentoo.org>
   libvisual-plugins-0.4.0-r1.ebuild:
diff --git a/media-plugins/libvisual-plugins/libvisual-plugins-0.2.0.ebuild b/media-plugins/libvisual-plugins/libvisual-plugins-0.2.0.ebuild
index 45bb5b769067..c1948e4b8e86 100644
--- a/media-plugins/libvisual-plugins/libvisual-plugins-0.2.0.ebuild
+++ b/media-plugins/libvisual-plugins/libvisual-plugins-0.2.0.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-plugins/libvisual-plugins/libvisual-plugins-0.2.0.ebuild,v 1.13 2006/07/09 06:17:17 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/libvisual-plugins/libvisual-plugins-0.2.0.ebuild,v 1.14 2007/07/22 09:22:09 dberkholz Exp $
 
 inherit eutils
 
@@ -18,15 +18,13 @@ RDEPEND="~media-libs/libvisual-${PV}
 	esd? ( media-sound/esound )
 	jack? ( >=media-sound/jack-audio-connection-kit-0.98 )
 	gtk? ( >=x11-libs/gtk+-2 )
-	|| ( (
-			media-libs/fontconfig
-			x11-libs/libX11
-			x11-libs/libXext
-			x11-libs/libXrender
-		) <virtual/x11-7 )"
+	media-libs/fontconfig
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXrender"
 
 DEPEND="${RDEPEND}
-	|| ( x11-libs/libXt <virtual/x11-7 )
+	x11-libs/libXt
 	>=dev-util/pkgconfig-0.14"
 
 src_compile() {
diff --git a/media-plugins/libvisual-plugins/libvisual-plugins-0.4.0-r1.ebuild b/media-plugins/libvisual-plugins/libvisual-plugins-0.4.0-r1.ebuild
index 5227dc76589e..a7a7649125d7 100644
--- a/media-plugins/libvisual-plugins/libvisual-plugins-0.4.0-r1.ebuild
+++ b/media-plugins/libvisual-plugins/libvisual-plugins-0.4.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/libvisual-plugins/libvisual-plugins-0.4.0-r1.ebuild,v 1.11 2007/07/10 23:09:00 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/libvisual-plugins/libvisual-plugins-0.4.0-r1.ebuild,v 1.12 2007/07/22 09:22:09 dberkholz Exp $
 
 WANT_AUTOMAKE="latest"
 WANT_AUTOCONF="latest"
@@ -28,14 +28,12 @@ RDEPEND="~media-libs/libvisual-${PV}
 	gstreamer? ( >=media-libs/gstreamer-0.8 )
 	alsa? ( media-libs/alsa-lib )
 	media-libs/fontconfig
-	|| ( (
-			x11-libs/libX11
-			x11-libs/libXext
-			x11-libs/libXrender
-		) <virtual/x11-7 )"
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXrender"
 
 DEPEND="${RDEPEND}
-	|| ( x11-libs/libXt <virtual/x11-7 )
+	x11-libs/libXt
 	>=dev-util/pkgconfig-0.14"
 
 src_unpack() {
diff --git a/media-plugins/libvisual-plugins/libvisual-plugins-0.4.0.ebuild b/media-plugins/libvisual-plugins/libvisual-plugins-0.4.0.ebuild
index 26616a31fa5d..f2eb33c71639 100644
--- a/media-plugins/libvisual-plugins/libvisual-plugins-0.4.0.ebuild
+++ b/media-plugins/libvisual-plugins/libvisual-plugins-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/libvisual-plugins/libvisual-plugins-0.4.0.ebuild,v 1.13 2007/02/04 16:58:32 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/libvisual-plugins/libvisual-plugins-0.4.0.ebuild,v 1.14 2007/07/22 09:22:09 dberkholz Exp $
 
 WANT_AUTOMAKE="latest"
 WANT_AUTOCONF="latest"
@@ -22,14 +22,12 @@ RDEPEND="~media-libs/libvisual-${PV}
 	jack? ( >=media-sound/jack-audio-connection-kit-0.98 )
 	gtk? ( >=x11-libs/gtk+-2 )
 	media-libs/fontconfig
-	|| ( (
-			x11-libs/libX11
-			x11-libs/libXext
-			x11-libs/libXrender
-		) <virtual/x11-7 )"
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXrender"
 
 DEPEND="${RDEPEND}
-	|| ( x11-libs/libXt <virtual/x11-7 )
+	x11-libs/libXt
 	>=dev-util/pkgconfig-0.14"
 
 src_unpack() {
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
diff --git a/media-plugins/vdr-xineliboutput/ChangeLog b/media-plugins/vdr-xineliboutput/ChangeLog
index bb593b789b3b..c5e754b457e8 100644
--- a/media-plugins/vdr-xineliboutput/ChangeLog
+++ b/media-plugins/vdr-xineliboutput/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-plugins/vdr-xineliboutput
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-xineliboutput/ChangeLog,v 1.27 2007/06/26 18:39:54 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-xineliboutput/ChangeLog,v 1.28 2007/07/22 09:11:31 dberkholz Exp $
+
+  22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>;
+  vdr-xineliboutput-1.0.0_rc1.ebuild, vdr-xineliboutput-1.0.0_rc2.ebuild:
+  Drop virtual/x11 references.
 
   26 Jun 2007; Joerg Bornkessel <hd_brummy@gentoo.org>
   +files/vdr-xineliboutput-1.0.0_rc2-vdr-1.5.3.diff,
diff --git a/media-plugins/vdr-xineliboutput/vdr-xineliboutput-1.0.0_rc1.ebuild b/media-plugins/vdr-xineliboutput/vdr-xineliboutput-1.0.0_rc1.ebuild
index 40d8fabbe96f..c7b6ef6c02a6 100644
--- a/media-plugins/vdr-xineliboutput/vdr-xineliboutput-1.0.0_rc1.ebuild
+++ b/media-plugins/vdr-xineliboutput/vdr-xineliboutput-1.0.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-plugins/vdr-xineliboutput/vdr-xineliboutput-1.0.0_rc1.ebuild,v 1.2 2007/07/10 23:09:00 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-xineliboutput/vdr-xineliboutput-1.0.0_rc1.ebuild,v 1.3 2007/07/22 09:11:31 dberkholz Exp $
 
 inherit vdr-plugin eutils multilib
 
@@ -22,25 +22,17 @@ RDEPEND=">=media-video/vdr-1.3.42
 		>=media-libs/xine-lib-1.1.1
 		media-libs/jpeg
 		X? (
-			|| ( (
-					x11-proto/xextproto
-					x11-proto/xf86vidmodeproto
-					x11-proto/xproto
-				)
-				virtual/x11
-			)
+			x11-proto/xextproto
+			x11-proto/xf86vidmodeproto
+			x11-proto/xproto
 		)"
 
 DEPEND="${RDEPEND}
 		sys-kernel/linux-headers
 		X? (
-			|| ( (
-					x11-libs/libX11
-					x11-libs/libXv
-					x11-libs/libXext
-				)
-				virtual/x11
-			)
+			x11-libs/libX11
+			x11-libs/libXv
+			x11-libs/libXext
 		)"
 
 #MY_PV=${PV%_p*}
diff --git a/media-plugins/vdr-xineliboutput/vdr-xineliboutput-1.0.0_rc2.ebuild b/media-plugins/vdr-xineliboutput/vdr-xineliboutput-1.0.0_rc2.ebuild
index fab1ec7f09e8..901ffc3793bf 100644
--- a/media-plugins/vdr-xineliboutput/vdr-xineliboutput-1.0.0_rc2.ebuild
+++ b/media-plugins/vdr-xineliboutput/vdr-xineliboutput-1.0.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-plugins/vdr-xineliboutput/vdr-xineliboutput-1.0.0_rc2.ebuild,v 1.3 2007/07/10 23:09:00 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-xineliboutput/vdr-xineliboutput-1.0.0_rc2.ebuild,v 1.4 2007/07/22 09:11:31 dberkholz Exp $
 
 inherit vdr-plugin eutils multilib
 
@@ -22,25 +22,17 @@ RDEPEND=">=media-video/vdr-1.3.42
 		>=media-libs/xine-lib-1.1.1
 		media-libs/jpeg
 		X? (
-			|| ( (
-					x11-proto/xextproto
-					x11-proto/xf86vidmodeproto
-					x11-proto/xproto
-				)
-				virtual/x11
-			)
+			x11-proto/xextproto
+			x11-proto/xf86vidmodeproto
+			x11-proto/xproto
 		)"
 
 DEPEND="${RDEPEND}
 		sys-kernel/linux-headers
 		X? (
-			|| ( (
-					x11-libs/libX11
-					x11-libs/libXv
-					x11-libs/libXext
-				)
-				virtual/x11
-			)
+			x11-libs/libX11
+			x11-libs/libXv
+			x11-libs/libXext
 		)"
 
 #MY_PV=${PV%_p*}