Drop virtual/x11 references.

Package-Manager: portage-2.1.3_rc8

5 files changed, 41 insertions, 49 deletions

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