Drop virtual/x11 references.

Package-Manager: portage-2.1.3_rc8

10 files changed, 42 insertions, 47 deletions

diff --git a/net-www/gnash/ChangeLog b/net-www/gnash/ChangeLog
index c199353e22f3..058fc5f57ea5 100644
--- a/net-www/gnash/ChangeLog
+++ b/net-www/gnash/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-www/gnash
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/gnash/ChangeLog,v 1.47 2007/07/10 07:20:47 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/gnash/ChangeLog,v 1.48 2007/07/22 07:44:54 dberkholz Exp $
+
+  22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>; gnash-0.8.0.ebuild,
+  gnash-9999.ebuild:
+  Drop virtual/x11 references.
 
   10 Jul 2007; Stefan Schweizer <genstef@gentoo.org> -gnash-0.7.2.ebuild,
   -gnash-0.7.2_p20099999.ebuild, gnash-0.8.0.ebuild, gnash-9999.ebuild:
diff --git a/net-www/gnash/gnash-0.8.0.ebuild b/net-www/gnash/gnash-0.8.0.ebuild
index c96ec3c620ee..a9c0aead945e 100644
--- a/net-www/gnash/gnash-0.8.0.ebuild
+++ b/net-www/gnash/gnash-0.8.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/net-www/gnash/gnash-0.8.0.ebuild,v 1.4 2007/07/10 18:25:01 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/gnash/gnash-0.8.0.ebuild,v 1.5 2007/07/22 07:44:54 dberkholz Exp $
 
 inherit nsplugins kde-functions qt3 multilib flag-o-matic autotools
 set-kdedir
@@ -35,14 +35,11 @@ RDEPEND="
 	)
 	!gstreamer? ( media-libs/libsdl )
 	dev-libs/boost
-	|| (
-		( x11-libs/libX11
-		x11-libs/libXi
-		x11-libs/libXmu
-		x11-libs/libXt
-		x11-proto/xproto )
-		virtual/x11
-	)
+	x11-libs/libX11
+	x11-libs/libXi
+	x11-libs/libXmu
+	x11-libs/libXt
+	x11-proto/xproto
 	dev-libs/atk
 	dev-libs/glib
 	>x11-libs/gtk+-2
diff --git a/net-www/gnash/gnash-9999.ebuild b/net-www/gnash/gnash-9999.ebuild
index 8dd4e4039d97..973f35ef2f1d 100644
--- a/net-www/gnash/gnash-9999.ebuild
+++ b/net-www/gnash/gnash-9999.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/net-www/gnash/gnash-9999.ebuild,v 1.3 2007/07/10 18:25:01 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/gnash/gnash-9999.ebuild,v 1.4 2007/07/22 07:44:54 dberkholz Exp $
 
 WANT_AUTOCONF=latest
 inherit nsplugins autotools cvs kde-functions qt3 multilib
@@ -38,14 +38,11 @@ RDEPEND="
 	)
 	!gstreamer? ( media-libs/libsdl )
 	dev-libs/boost
-	|| (
-		( x11-libs/libX11
-		x11-libs/libXi
-		x11-libs/libXmu
-		x11-libs/libXt
-		x11-proto/xproto )
-		virtual/x11
-	)
+	x11-libs/libX11
+	x11-libs/libXi
+	x11-libs/libXmu
+	x11-libs/libXt
+	x11-proto/xproto
 	dev-libs/atk
 	dev-libs/glib
 	>x11-libs/gtk+-2
diff --git a/net-www/kaffeine-mozilla-plugin/ChangeLog b/net-www/kaffeine-mozilla-plugin/ChangeLog
index 4f50bd294e5e..d410b7f7a1c1 100644
--- a/net-www/kaffeine-mozilla-plugin/ChangeLog
+++ b/net-www/kaffeine-mozilla-plugin/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-www/kaffeine-mozilla-plugin
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/kaffeine-mozilla-plugin/ChangeLog,v 1.11 2007/02/03 02:41:30 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/kaffeine-mozilla-plugin/ChangeLog,v 1.12 2007/07/22 07:43:10 dberkholz Exp $
+
+  22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>;
+  kaffeine-mozilla-plugin-0.2.ebuild:
+  Drop virtual/x11 references.
 
   03 Feb 2007; Steve Dibb <beandog@gentoo.org>
   kaffeine-mozilla-plugin-0.2.ebuild:
diff --git a/net-www/kaffeine-mozilla-plugin/kaffeine-mozilla-plugin-0.2.ebuild b/net-www/kaffeine-mozilla-plugin/kaffeine-mozilla-plugin-0.2.ebuild
index 6acdbc441073..18b3f24f648b 100644
--- a/net-www/kaffeine-mozilla-plugin/kaffeine-mozilla-plugin-0.2.ebuild
+++ b/net-www/kaffeine-mozilla-plugin/kaffeine-mozilla-plugin-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/net-www/kaffeine-mozilla-plugin/kaffeine-mozilla-plugin-0.2.ebuild,v 1.10 2007/02/03 02:41:30 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/kaffeine-mozilla-plugin/kaffeine-mozilla-plugin-0.2.ebuild,v 1.11 2007/07/22 07:43:10 dberkholz Exp $
 
 inherit nsplugins multilib
 
@@ -17,7 +17,7 @@ LICENSE="GPL-2"
 IUSE=""
 
 RDEPEND=">=media-video/kaffeine-0.4.3
-	|| ( x11-libs/libXaw virtual/x11 )"
+	x11-libs/libXaw"
 DEPEND="${RDEPEND}"
 
 src_compile() {
diff --git a/net-www/mplayerplug-in/ChangeLog b/net-www/mplayerplug-in/ChangeLog
index 78942042bc10..25d7b5bb8d16 100644
--- a/net-www/mplayerplug-in/ChangeLog
+++ b/net-www/mplayerplug-in/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-www/mplayerplug-in
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/mplayerplug-in/ChangeLog,v 1.94 2007/07/04 21:20:31 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/mplayerplug-in/ChangeLog,v 1.95 2007/07/22 07:42:29 dberkholz Exp $
+
+  22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>;
+  mplayerplug-in-3.21.ebuild, mplayerplug-in-3.31-r1.ebuild,
+  mplayerplug-in-3.35.ebuild, mplayerplug-in-3.40-r1.ebuild:
+  Drop virtual/x11 references.
 
   04 Jul 2007; Raúl Porcel <armin76@gentoo.org> mplayerplug-in-3.21.ebuild,
   mplayerplug-in-3.31-r1.ebuild, mplayerplug-in-3.35.ebuild,
diff --git a/net-www/mplayerplug-in/mplayerplug-in-3.21.ebuild b/net-www/mplayerplug-in/mplayerplug-in-3.21.ebuild
index 1c793cb278c2..796a61a2d264 100644
--- a/net-www/mplayerplug-in/mplayerplug-in-3.21.ebuild
+++ b/net-www/mplayerplug-in/mplayerplug-in-3.21.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/net-www/mplayerplug-in/mplayerplug-in-3.21.ebuild,v 1.11 2007/07/04 21:20:31 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/mplayerplug-in/mplayerplug-in-3.21.ebuild,v 1.12 2007/07/22 07:42:29 dberkholz Exp $
 
 inherit eutils multilib nsplugins
 
@@ -17,11 +17,8 @@ DEPEND=">=media-video/mplayer-1.0_pre5
 		|| ( www-client/mozilla-firefox
 				www-client/seamonkey
 		)
-		|| ( ( x11-libs/libXpm
-				x11-proto/xextproto
-			)
-			virtual/x11
-		)
+		x11-libs/libXpm
+		x11-proto/xextproto
 		gtk? (
 			>=x11-libs/gtk+-2.2.0
 			dev-libs/atk
diff --git a/net-www/mplayerplug-in/mplayerplug-in-3.31-r1.ebuild b/net-www/mplayerplug-in/mplayerplug-in-3.31-r1.ebuild
index b78416dc9c59..fdaf83deb6a1 100644
--- a/net-www/mplayerplug-in/mplayerplug-in-3.31-r1.ebuild
+++ b/net-www/mplayerplug-in/mplayerplug-in-3.31-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/net-www/mplayerplug-in/mplayerplug-in-3.31-r1.ebuild,v 1.11 2007/07/04 21:20:31 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/mplayerplug-in/mplayerplug-in-3.31-r1.ebuild,v 1.12 2007/07/22 07:42:29 dberkholz Exp $
 
 inherit eutils multilib nsplugins
 
@@ -17,11 +17,8 @@ DEPEND=">=media-video/mplayer-1.0_pre5
 		|| ( www-client/mozilla-firefox
 				www-client/seamonkey
 		)
-		|| ( ( x11-libs/libXpm
-				x11-proto/xextproto
-			)
-			virtual/x11
-		)
+		x11-libs/libXpm
+		x11-proto/xextproto
 		gtk? (
 			>=x11-libs/gtk+-2.2.0
 			dev-libs/atk
diff --git a/net-www/mplayerplug-in/mplayerplug-in-3.35.ebuild b/net-www/mplayerplug-in/mplayerplug-in-3.35.ebuild
index 5b9d427327be..9aa57adef598 100644
--- a/net-www/mplayerplug-in/mplayerplug-in-3.35.ebuild
+++ b/net-www/mplayerplug-in/mplayerplug-in-3.35.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/net-www/mplayerplug-in/mplayerplug-in-3.35.ebuild,v 1.9 2007/07/04 21:20:31 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/mplayerplug-in/mplayerplug-in-3.35.ebuild,v 1.10 2007/07/22 07:42:29 dberkholz Exp $
 
 inherit eutils multilib nsplugins
 
@@ -17,11 +17,8 @@ DEPEND=">=media-video/mplayer-1.0_pre5
 		|| ( www-client/mozilla-firefox
 				www-client/seamonkey
 		)
-		|| ( ( x11-libs/libXpm
-				x11-proto/xextproto
-			)
-			virtual/x11
-		)
+		x11-libs/libXpm
+		x11-proto/xextproto
 		gtk? (
 			>=x11-libs/gtk+-2.2.0
 			dev-libs/atk
diff --git a/net-www/mplayerplug-in/mplayerplug-in-3.40-r1.ebuild b/net-www/mplayerplug-in/mplayerplug-in-3.40-r1.ebuild
index eaf0443051c3..00fa96e3e0ef 100644
--- a/net-www/mplayerplug-in/mplayerplug-in-3.40-r1.ebuild
+++ b/net-www/mplayerplug-in/mplayerplug-in-3.40-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/net-www/mplayerplug-in/mplayerplug-in-3.40-r1.ebuild,v 1.4 2007/07/04 21:20:31 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/mplayerplug-in/mplayerplug-in-3.40-r1.ebuild,v 1.5 2007/07/22 07:42:29 dberkholz Exp $
 
 inherit eutils multilib
 
@@ -18,11 +18,8 @@ DEPEND="
 				www-client/seamonkey
 				www-client/epiphany
 		)
-		|| ( ( x11-libs/libXpm
-				x11-proto/xextproto
-			)
-			virtual/x11
-		)
+		x11-libs/libXpm
+		x11-proto/xextproto
 		gtk? (
 			>=x11-libs/gtk+-2.2.0
 			dev-libs/atk