Drop virtual/x11 references.

(Portage version: 2.1.3_rc8)

9 files changed, 111 insertions, 153 deletions

diff --git a/x11-wm/afterstep/ChangeLog b/x11-wm/afterstep/ChangeLog
index e0236929a75b..728501b332b2 100644
--- a/x11-wm/afterstep/ChangeLog
+++ b/x11-wm/afterstep/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-wm/afterstep
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/afterstep/ChangeLog,v 1.80 2007/04/28 16:30:49 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/afterstep/ChangeLog,v 1.81 2007/07/22 06:02:57 dberkholz Exp $
+
+  22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>;
+  afterstep-2.00.05.ebuild, afterstep-2.1.2.ebuild, afterstep-2.2.0.ebuild,
+  afterstep-2.2.1.ebuild, afterstep-2.2.2.ebuild, afterstep-2.2.2-r1.ebuild,
+  afterstep-2.2.3.ebuild, afterstep-2.2.4.ebuild:
+  Drop virtual/x11 references.
 
   28 Apr 2007; Sven Wegener <swegener@gentoo.org> afterstep-2.00.05.ebuild,
   afterstep-2.1.2.ebuild, afterstep-2.2.0.ebuild, afterstep-2.2.1.ebuild,
diff --git a/x11-wm/afterstep/afterstep-2.00.05.ebuild b/x11-wm/afterstep/afterstep-2.00.05.ebuild
index 81ddafe273e4..657772705717 100644
--- a/x11-wm/afterstep/afterstep-2.00.05.ebuild
+++ b/x11-wm/afterstep/afterstep-2.00.05.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/x11-wm/afterstep/afterstep-2.00.05.ebuild,v 1.9 2007/07/12 03:41:53 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/afterstep/afterstep-2.00.05.ebuild,v 1.10 2007/07/22 06:02:57 dberkholz Exp $
 
 inherit flag-o-matic
 
@@ -20,26 +20,20 @@ RDEPEND="virtual/libc
 	jpeg? ( >=media-libs/jpeg-6b )
 	gif?  ( >=media-libs/giflib-4.1.0 )
 	tiff? ( >=media-libs/tiff-3.5.7 )
-	|| ( ( x11-libs/libICE
-			x11-libs/libXext
-			x11-libs/libSM
-			x11-libs/libXmu
-			x11-libs/libXt
-			x11-libs/libX11
-			x11-libs/libXpm
-			x11-libs/libXrender
-			xinerama? ( x11-libs/libXinerama )
-		)
-		virtual/x11
-	)"
+	x11-libs/libICE
+	x11-libs/libXext
+	x11-libs/libSM
+	x11-libs/libXmu
+	x11-libs/libXt
+	x11-libs/libX11
+	x11-libs/libXpm
+	x11-libs/libXrender
+	xinerama? ( x11-libs/libXinerama )"
 
 DEPEND="${RDEPEND}
-	|| ( ( x11-proto/xextproto
-			x11-proto/xproto
-			xinerama? ( x11-proto/xineramaproto )
-		)
-		virtual/x11
-	)"
+	x11-proto/xextproto
+	x11-proto/xproto
+	xinerama? ( x11-proto/xineramaproto )"
 
 S="${WORKDIR}/AfterStep-${PV}"
 
diff --git a/x11-wm/afterstep/afterstep-2.1.2.ebuild b/x11-wm/afterstep/afterstep-2.1.2.ebuild
index d337600d4f46..610cb0992db5 100644
--- a/x11-wm/afterstep/afterstep-2.1.2.ebuild
+++ b/x11-wm/afterstep/afterstep-2.1.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/x11-wm/afterstep/afterstep-2.1.2.ebuild,v 1.9 2007/07/12 03:41:53 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/afterstep/afterstep-2.1.2.ebuild,v 1.10 2007/07/22 06:02:57 dberkholz Exp $
 
 inherit flag-o-matic
 
@@ -20,26 +20,20 @@ RDEPEND="virtual/libc
 	jpeg? ( >=media-libs/jpeg-6b )
 	gif?  ( >=media-libs/giflib-4.1.0 )
 	tiff? ( >=media-libs/tiff-3.5.7 )
-	|| ( ( x11-libs/libICE
-			x11-libs/libXext
-			x11-libs/libSM
-			x11-libs/libXmu
-			x11-libs/libXt
-			x11-libs/libX11
-			x11-libs/libXpm
-			x11-libs/libXrender
-			xinerama? ( x11-libs/libXinerama )
-		)
-		virtual/x11
-	)"
+	x11-libs/libICE
+	x11-libs/libXext
+	x11-libs/libSM
+	x11-libs/libXmu
+	x11-libs/libXt
+	x11-libs/libX11
+	x11-libs/libXpm
+	x11-libs/libXrender
+	xinerama? ( x11-libs/libXinerama )"
 
 DEPEND="${RDEPEND}
-	|| ( ( x11-proto/xextproto
-			x11-proto/xproto
-			xinerama? ( x11-proto/xineramaproto )
-		)
-		virtual/x11
-	)"
+	x11-proto/xextproto
+	x11-proto/xproto
+	xinerama? ( x11-proto/xineramaproto )"
 
 S="${WORKDIR}/AfterStep-${PV}"
 
diff --git a/x11-wm/afterstep/afterstep-2.2.0.ebuild b/x11-wm/afterstep/afterstep-2.2.0.ebuild
index 4bed4d908745..d9c95f63a4eb 100644
--- a/x11-wm/afterstep/afterstep-2.2.0.ebuild
+++ b/x11-wm/afterstep/afterstep-2.2.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/x11-wm/afterstep/afterstep-2.2.0.ebuild,v 1.9 2007/07/12 03:41:53 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/afterstep/afterstep-2.2.0.ebuild,v 1.10 2007/07/22 06:02:57 dberkholz Exp $
 
 inherit flag-o-matic
 
@@ -20,26 +20,20 @@ RDEPEND="virtual/libc
 	jpeg? ( >=media-libs/jpeg-6b )
 	gif?  ( >=media-libs/giflib-4.1.0 )
 	tiff? ( >=media-libs/tiff-3.5.7 )
-	|| ( ( x11-libs/libICE
-			x11-libs/libXext
-			x11-libs/libSM
-			x11-libs/libXmu
-			x11-libs/libXt
-			x11-libs/libX11
-			x11-libs/libXpm
-			x11-libs/libXrender
-			xinerama? ( x11-libs/libXinerama )
-		)
-		virtual/x11
-	)"
+	x11-libs/libICE
+	x11-libs/libXext
+	x11-libs/libSM
+	x11-libs/libXmu
+	x11-libs/libXt
+	x11-libs/libX11
+	x11-libs/libXpm
+	x11-libs/libXrender
+	xinerama? ( x11-libs/libXinerama )"
 
 DEPEND="${RDEPEND}
-	|| ( ( x11-proto/xextproto
-			x11-proto/xproto
-			xinerama? ( x11-proto/xineramaproto )
-		)
-		virtual/x11
-	)"
+	x11-proto/xextproto
+	x11-proto/xproto
+	xinerama? ( x11-proto/xineramaproto )"
 
 S="${WORKDIR}/AfterStep-${PV}"
 
diff --git a/x11-wm/afterstep/afterstep-2.2.1.ebuild b/x11-wm/afterstep/afterstep-2.2.1.ebuild
index e44a8eb1a8db..fc7afed8fa44 100644
--- a/x11-wm/afterstep/afterstep-2.2.1.ebuild
+++ b/x11-wm/afterstep/afterstep-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/x11-wm/afterstep/afterstep-2.2.1.ebuild,v 1.3 2007/07/12 03:41:53 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/afterstep/afterstep-2.2.1.ebuild,v 1.4 2007/07/22 06:02:57 dberkholz Exp $
 
 inherit flag-o-matic
 
@@ -20,26 +20,20 @@ RDEPEND="virtual/libc
 	jpeg? ( >=media-libs/jpeg-6b )
 	gif?  ( >=media-libs/giflib-4.1.0 )
 	tiff? ( >=media-libs/tiff-3.5.7 )
-	|| ( ( x11-libs/libICE
-			x11-libs/libXext
-			x11-libs/libSM
-			x11-libs/libXmu
-			x11-libs/libXt
-			x11-libs/libX11
-			x11-libs/libXpm
-			x11-libs/libXrender
-			xinerama? ( x11-libs/libXinerama )
-		)
-		virtual/x11
-	)"
+	x11-libs/libICE
+	x11-libs/libXext
+	x11-libs/libSM
+	x11-libs/libXmu
+	x11-libs/libXt
+	x11-libs/libX11
+	x11-libs/libXpm
+	x11-libs/libXrender
+	xinerama? ( x11-libs/libXinerama )"
 
 DEPEND="${RDEPEND}
-	|| ( ( x11-proto/xextproto
-			x11-proto/xproto
-			xinerama? ( x11-proto/xineramaproto )
-		)
-		virtual/x11
-	)"
+	x11-proto/xextproto
+	x11-proto/xproto
+	xinerama? ( x11-proto/xineramaproto )"
 
 S="${WORKDIR}/AfterStep-${PV}"
 
diff --git a/x11-wm/afterstep/afterstep-2.2.2-r1.ebuild b/x11-wm/afterstep/afterstep-2.2.2-r1.ebuild
index 52b4f7a15e01..32de3db0205b 100644
--- a/x11-wm/afterstep/afterstep-2.2.2-r1.ebuild
+++ b/x11-wm/afterstep/afterstep-2.2.2-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/x11-wm/afterstep/afterstep-2.2.2-r1.ebuild,v 1.8 2007/07/12 03:41:53 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/afterstep/afterstep-2.2.2-r1.ebuild,v 1.9 2007/07/22 06:02:57 dberkholz Exp $
 
 inherit flag-o-matic eutils
 
@@ -20,26 +20,20 @@ RDEPEND="virtual/libc
 	jpeg? ( >=media-libs/jpeg-6b )
 	gif?  ( >=media-libs/giflib-4.1.0 )
 	tiff? ( >=media-libs/tiff-3.5.7 )
-	|| ( ( x11-libs/libICE
-			x11-libs/libXext
-			x11-libs/libSM
-			x11-libs/libXmu
-			x11-libs/libXt
-			x11-libs/libX11
-			x11-libs/libXpm
-			x11-libs/libXrender
-			xinerama? ( x11-libs/libXinerama )
-		)
-		virtual/x11
-	)"
+	x11-libs/libICE
+	x11-libs/libXext
+	x11-libs/libSM
+	x11-libs/libXmu
+	x11-libs/libXt
+	x11-libs/libX11
+	x11-libs/libXpm
+	x11-libs/libXrender
+	xinerama? ( x11-libs/libXinerama )"
 
 DEPEND="${RDEPEND}
-	|| ( ( x11-proto/xextproto
-			x11-proto/xproto
-			xinerama? ( x11-proto/xineramaproto )
-		)
-		virtual/x11
-	)"
+	x11-proto/xextproto
+	x11-proto/xproto
+	xinerama? ( x11-proto/xineramaproto )"
 
 S="${WORKDIR}/AfterStep-${PV}"
 
diff --git a/x11-wm/afterstep/afterstep-2.2.2.ebuild b/x11-wm/afterstep/afterstep-2.2.2.ebuild
index 0629082750b4..9ef6f8ee899a 100644
--- a/x11-wm/afterstep/afterstep-2.2.2.ebuild
+++ b/x11-wm/afterstep/afterstep-2.2.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/x11-wm/afterstep/afterstep-2.2.2.ebuild,v 1.3 2007/07/12 03:41:53 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/afterstep/afterstep-2.2.2.ebuild,v 1.4 2007/07/22 06:02:57 dberkholz Exp $
 
 inherit flag-o-matic
 
@@ -20,26 +20,20 @@ RDEPEND="virtual/libc
 	jpeg? ( >=media-libs/jpeg-6b )
 	gif?  ( >=media-libs/giflib-4.1.0 )
 	tiff? ( >=media-libs/tiff-3.5.7 )
-	|| ( ( x11-libs/libICE
-			x11-libs/libXext
-			x11-libs/libSM
-			x11-libs/libXmu
-			x11-libs/libXt
-			x11-libs/libX11
-			x11-libs/libXpm
-			x11-libs/libXrender
-			xinerama? ( x11-libs/libXinerama )
-		)
-		virtual/x11
-	)"
+	x11-libs/libICE
+	x11-libs/libXext
+	x11-libs/libSM
+	x11-libs/libXmu
+	x11-libs/libXt
+	x11-libs/libX11
+	x11-libs/libXpm
+	x11-libs/libXrender
+	xinerama? ( x11-libs/libXinerama )"
 
 DEPEND="${RDEPEND}
-	|| ( ( x11-proto/xextproto
-			x11-proto/xproto
-			xinerama? ( x11-proto/xineramaproto )
-		)
-		virtual/x11
-	)"
+	x11-proto/xextproto
+	x11-proto/xproto
+	xinerama? ( x11-proto/xineramaproto )"
 
 S="${WORKDIR}/AfterStep-${PV}"
 
diff --git a/x11-wm/afterstep/afterstep-2.2.3.ebuild b/x11-wm/afterstep/afterstep-2.2.3.ebuild
index 45bab75a6cb8..36643fc6bcaa 100644
--- a/x11-wm/afterstep/afterstep-2.2.3.ebuild
+++ b/x11-wm/afterstep/afterstep-2.2.3.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/x11-wm/afterstep/afterstep-2.2.3.ebuild,v 1.8 2007/07/12 03:41:53 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/afterstep/afterstep-2.2.3.ebuild,v 1.9 2007/07/22 06:02:57 dberkholz Exp $
 
 inherit flag-o-matic eutils
 
@@ -20,26 +20,20 @@ RDEPEND="virtual/libc
 	jpeg? ( >=media-libs/jpeg-6b )
 	gif?  ( >=media-libs/giflib-4.1.0 )
 	tiff? ( >=media-libs/tiff-3.5.7 )
-	|| ( ( x11-libs/libICE
-			x11-libs/libXext
-			x11-libs/libSM
-			x11-libs/libXmu
-			x11-libs/libXt
-			x11-libs/libX11
-			x11-libs/libXpm
-			x11-libs/libXrender
-			xinerama? ( x11-libs/libXinerama )
-		)
-		virtual/x11
-	)"
+	x11-libs/libICE
+	x11-libs/libXext
+	x11-libs/libSM
+	x11-libs/libXmu
+	x11-libs/libXt
+	x11-libs/libX11
+	x11-libs/libXpm
+	x11-libs/libXrender
+	xinerama? ( x11-libs/libXinerama )"
 
 DEPEND="${RDEPEND}
-	|| ( ( x11-proto/xextproto
-			x11-proto/xproto
-			xinerama? ( x11-proto/xineramaproto )
-		)
-		virtual/x11
-	)"
+	x11-proto/xextproto
+	x11-proto/xproto
+	xinerama? ( x11-proto/xineramaproto )"
 
 S="${WORKDIR}/AfterStep-${PV}"
 
diff --git a/x11-wm/afterstep/afterstep-2.2.4.ebuild b/x11-wm/afterstep/afterstep-2.2.4.ebuild
index ba6d01c5c839..978c12056a38 100644
--- a/x11-wm/afterstep/afterstep-2.2.4.ebuild
+++ b/x11-wm/afterstep/afterstep-2.2.4.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/x11-wm/afterstep/afterstep-2.2.4.ebuild,v 1.12 2007/07/12 03:41:53 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/afterstep/afterstep-2.2.4.ebuild,v 1.13 2007/07/22 06:02:57 dberkholz Exp $
 
 inherit flag-o-matic eutils
 
@@ -20,26 +20,20 @@ RDEPEND="virtual/libc
 	jpeg? ( >=media-libs/jpeg-6b )
 	gif?  ( >=media-libs/giflib-4.1.0 )
 	tiff? ( >=media-libs/tiff-3.5.7 )
-	|| ( ( x11-libs/libICE
-			x11-libs/libXext
-			x11-libs/libSM
-			x11-libs/libXmu
-			x11-libs/libXt
-			x11-libs/libX11
-			x11-libs/libXpm
-			x11-libs/libXrender
-			xinerama? ( x11-libs/libXinerama )
-		)
-		virtual/x11
-	)"
+	x11-libs/libICE
+	x11-libs/libXext
+	x11-libs/libSM
+	x11-libs/libXmu
+	x11-libs/libXt
+	x11-libs/libX11
+	x11-libs/libXpm
+	x11-libs/libXrender
+	xinerama? ( x11-libs/libXinerama )"
 
 DEPEND="${RDEPEND}
-	|| ( ( x11-proto/xextproto
-			x11-proto/xproto
-			xinerama? ( x11-proto/xineramaproto )
-		)
-		virtual/x11
-	)"
+	x11-proto/xextproto
+	x11-proto/xproto
+	xinerama? ( x11-proto/xineramaproto )"
 
 S="${WORKDIR}/AfterStep-${PV}"