Drop virtual/x11 references.

Package-Manager: portage-2.1.3_rc8

56 files changed, 321 insertions, 323 deletions

diff --git a/x11-libs/dnd/ChangeLog b/x11-libs/dnd/ChangeLog
index 8b2f04ff8734..6bb4c1ddc826 100644
--- a/x11-libs/dnd/ChangeLog
+++ b/x11-libs/dnd/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for x11-libs/dnd
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/dnd/ChangeLog,v 1.26 2007/05/11 21:46:19 bangert Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/dnd/ChangeLog,v 1.27 2007/07/22 02:47:38 dberkholz Exp $
+
+  22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>; dnd-1.1-r1.ebuild:
+  Drop virtual/x11 references.
 
   11 May 2007; Thilo Bangert <bangert@gentoo.org> +metadata.xml:
   add metadata.xml
diff --git a/x11-libs/dnd/dnd-1.1-r1.ebuild b/x11-libs/dnd/dnd-1.1-r1.ebuild
index 299d7f689c3b..d62d2b3da152 100644
--- a/x11-libs/dnd/dnd-1.1-r1.ebuild
+++ b/x11-libs/dnd/dnd-1.1-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-libs/dnd/dnd-1.1-r1.ebuild,v 1.12 2007/01/18 06:58:49 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/dnd/dnd-1.1-r1.ebuild,v 1.13 2007/07/22 02:47:38 dberkholz Exp $
 
 inherit toolchain-funcs eutils
 
@@ -13,15 +13,13 @@ SLOT="0"
 LICENSE="GPL-2 LGPL-2"
 KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86"
 
-DEPEND="|| (
-	( >=x11-libs/libX11-1.0.0
+DEPEND=">=x11-libs/libX11-1.0.0
 	>=x11-libs/libXmu-1.0.0
 	>=x11-libs/libXt-1.0.0
 	>=x11-libs/libICE-1.0.0
 	>=x11-libs/libSM-1.0.0
 	>=x11-libs/libXaw-1.0.1
-	>=x11-proto/xproto-7.0.4 )
-	<virtual/x11-7.0 )"
+	>=x11-proto/xproto-7.0.4"
 
 src_unpack() {
 	unpack ${A}
diff --git a/x11-libs/fltk/ChangeLog b/x11-libs/fltk/ChangeLog
index a95f6d4aa47b..feb1887445cc 100644
--- a/x11-libs/fltk/ChangeLog
+++ b/x11-libs/fltk/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-libs/fltk
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/fltk/ChangeLog,v 1.81 2007/07/07 02:33:53 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/fltk/ChangeLog,v 1.82 2007/07/22 02:51:36 dberkholz Exp $
+
+  22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>; fltk-1.1.7.ebuild,
+  fltk-1.1.7-r1.ebuild, fltk-1.1.7-r2.ebuild:
+  Drop virtual/x11 references.
 
   07 Jul 2007; Mike Frysinger <vapier@gentoo.org> fltk-1.1.7-r2.ebuild:
   The amd64 patch is *not* amd64 specific, so apply it for everyone.
diff --git a/x11-libs/fltk/fltk-1.1.7-r1.ebuild b/x11-libs/fltk/fltk-1.1.7-r1.ebuild
index 5594b26cc2cd..e716675a766d 100644
--- a/x11-libs/fltk/fltk-1.1.7-r1.ebuild
+++ b/x11-libs/fltk/fltk-1.1.7-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-libs/fltk/fltk-1.1.7-r1.ebuild,v 1.1 2007/05/16 09:47:42 drac Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/fltk/fltk-1.1.7-r1.ebuild,v 1.2 2007/07/22 02:51:36 dberkholz Exp $
 
 inherit eutils toolchain-funcs multilib
 
@@ -21,13 +21,12 @@ LIBDIR=/usr/$(get_libdir)/fltk-${SLOT}
 
 IUSE="noxft opengl debug"
 
-DEPEND="|| ( (
-		x11-libs/libXext
-		x11-libs/libICE
-		x11-libs/libSM
-		x11-libs/libXt
-		x11-proto/xextproto )
-	virtual/x11 )
+DEPEND="
+	x11-libs/libXext
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libXt
+	x11-proto/xextproto
 	!noxft? ( virtual/xft )
 	media-libs/libpng
 	media-libs/jpeg
diff --git a/x11-libs/fltk/fltk-1.1.7-r2.ebuild b/x11-libs/fltk/fltk-1.1.7-r2.ebuild
index 6373acee92f4..d68ba696486a 100644
--- a/x11-libs/fltk/fltk-1.1.7-r2.ebuild
+++ b/x11-libs/fltk/fltk-1.1.7-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/x11-libs/fltk/fltk-1.1.7-r2.ebuild,v 1.2 2007/07/07 02:33:53 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/fltk/fltk-1.1.7-r2.ebuild,v 1.3 2007/07/22 02:51:36 dberkholz Exp $
 
 inherit eutils toolchain-funcs multilib
 
@@ -21,13 +21,12 @@ LIBDIR=/usr/$(get_libdir)/fltk-${SLOT}
 
 IUSE="noxft opengl debug"
 
-DEPEND="|| ( (
-		x11-libs/libXext
-		x11-libs/libICE
-		x11-libs/libSM
-		x11-libs/libXt
-		x11-proto/xextproto )
-	virtual/x11 )
+DEPEND="
+	x11-libs/libXext
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libXt
+	x11-proto/xextproto
 	!noxft? ( virtual/xft )
 	media-libs/libpng
 	media-libs/jpeg
diff --git a/x11-libs/fltk/fltk-1.1.7.ebuild b/x11-libs/fltk/fltk-1.1.7.ebuild
index 2ba4edee6822..a510feb2e63b 100644
--- a/x11-libs/fltk/fltk-1.1.7.ebuild
+++ b/x11-libs/fltk/fltk-1.1.7.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-libs/fltk/fltk-1.1.7.ebuild,v 1.13 2007/04/09 23:29:28 omp Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/fltk/fltk-1.1.7.ebuild,v 1.14 2007/07/22 02:51:36 dberkholz Exp $
 
 inherit eutils toolchain-funcs multilib
 
@@ -21,13 +21,11 @@ LIBDIR=/usr/$(get_libdir)/fltk-${SLOT}
 
 IUSE="noxft opengl debug"
 
-DEPEND="|| ( (
-		x11-libs/libXext
-		x11-libs/libICE
-		x11-libs/libSM
-		x11-libs/libXt
-		x11-proto/xextproto )
-	virtual/x11 )
+DEPEND="x11-libs/libXext
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libXt
+	x11-proto/xextproto
 	!noxft? ( virtual/xft )
 	media-libs/libpng
 	media-libs/jpeg
diff --git a/x11-libs/gksu/ChangeLog b/x11-libs/gksu/ChangeLog
index 89931665bc5e..85bef9cdc185 100644
--- a/x11-libs/gksu/ChangeLog
+++ b/x11-libs/gksu/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for x11-libs/gksu
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gksu/ChangeLog,v 1.41 2007/06/19 21:45:38 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gksu/ChangeLog,v 1.42 2007/07/22 02:52:52 dberkholz Exp $
+
+  22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>; gksu-1.9.1.ebuild:
+  Drop virtual/x11 references.
 
   19 Jun 2007; Daniel Gryniewicz <dang@gentoo.org> gksu-2.0.0.ebuild:
   Add einfo about env_reset and gksudo
diff --git a/x11-libs/gksu/gksu-1.9.1.ebuild b/x11-libs/gksu/gksu-1.9.1.ebuild
index 663fc4c439e0..47fb5bd42b02 100644
--- a/x11-libs/gksu/gksu-1.9.1.ebuild
+++ b/x11-libs/gksu/gksu-1.9.1.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/x11-libs/gksu/gksu-1.9.1.ebuild,v 1.8 2007/07/15 05:53:11 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gksu/gksu-1.9.1.ebuild,v 1.9 2007/07/22 02:52:52 dberkholz Exp $
 
 inherit gnome2 fixheadtails
 
@@ -24,9 +24,7 @@ RDEPEND=">=x11-libs/libgksu-1.9.2
 	media-libs/libpng
 	nls? ( sys-devel/gettext )
 	>=dev-libs/glib-2.8.4
-	|| (
-	( >=x11-libs/libX11-1.0.0 )
-	virtual/x11 )"
+	>=x11-libs/libX11-1.0.0"
 
 DEPEND="${RDEPEND}"
 
diff --git a/x11-libs/gtk+/ChangeLog b/x11-libs/gtk+/ChangeLog
index 2944f787751f..79656d30fa18 100644
--- a/x11-libs/gtk+/ChangeLog
+++ b/x11-libs/gtk+/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-libs/gtk+
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/ChangeLog,v 1.326 2007/07/19 14:01:02 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/ChangeLog,v 1.327 2007/07/22 02:46:30 dberkholz Exp $
+
+  22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>;
+  gtk+-1.2.10-r12.ebuild, gtk+-2.6.10-r1.ebuild, gtk+-2.8.19.ebuild,
+  gtk+-2.8.20-r1.ebuild:
+  Drop virtual/x11 references.
 
   19 Jul 2007; Christoph Mende <angelos@gentoo.org> gtk+-2.10.13.ebuild:
   Stable on amd64 wrt bug #185614
diff --git a/x11-libs/gtk+/gtk+-1.2.10-r12.ebuild b/x11-libs/gtk+/gtk+-1.2.10-r12.ebuild
index 44a5c280b278..18bfb0f33f32 100644
--- a/x11-libs/gtk+/gtk+-1.2.10-r12.ebuild
+++ b/x11-libs/gtk+/gtk+-1.2.10-r12.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-libs/gtk+/gtk+-1.2.10-r12.ebuild,v 1.13 2007/06/27 16:52:18 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-1.2.10-r12.ebuild,v 1.14 2007/07/22 02:46:30 dberkholz Exp $
 
 GNOME_TARBALL_SUFFIX="gz"
 inherit gnome.org eutils toolchain-funcs autotools
@@ -20,15 +20,11 @@ MY_AVAILABLE_LINGUAS=" az ca cs da de el es et eu fi fr ga gl hr hu it ja ko lt
 IUSE="${IUSE} ${MY_AVAILABLE_LINGUAS// / linguas_}"
 
 RDEPEND="=dev-libs/glib-1.2*
-	||	(
-		( x11-libs/libXi x11-libs/libXt )
-		virtual/x11
-	)"
+	x11-libs/libXi
+	x11-libs/libXt"
 DEPEND="${RDEPEND}
-	||	(
-		( x11-proto/inputproto x11-proto/xextproto )
-		virtual/x11
-	)
+	x11-proto/inputproto
+	x11-proto/xextproto
 	nls? ( sys-devel/gettext dev-util/intltool )"
 
 src_unpack() {
diff --git a/x11-libs/gtk+/gtk+-2.6.10-r1.ebuild b/x11-libs/gtk+/gtk+-2.6.10-r1.ebuild
index 65f51d6f3bb0..dfa2db0cc99a 100644
--- a/x11-libs/gtk+/gtk+-2.6.10-r1.ebuild
+++ b/x11-libs/gtk+/gtk+-2.6.10-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/x11-libs/gtk+/gtk+-2.6.10-r1.ebuild,v 1.5 2007/07/15 05:53:11 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-2.6.10-r1.ebuild,v 1.6 2007/07/22 02:46:30 dberkholz Exp $
 
 inherit flag-o-matic eutils
 
@@ -15,19 +15,15 @@ SLOT="2"
 KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 sparc x86"
 IUSE="doc tiff jpeg"
 
-RDEPEND="|| ( (
-			x11-libs/libXrender
-			x11-libs/libX11
-			x11-libs/libXi
-			x11-libs/libXt
-			x11-libs/libXext
-			x11-libs/libXinerama
-			x11-libs/libXcursor
-			x11-libs/libXrandr
-			x11-libs/libXfixes
-		)
-		virtual/x11
-	)
+RDEPEND="x11-libs/libXrender
+	x11-libs/libX11
+	x11-libs/libXi
+	x11-libs/libXt
+	x11-libs/libXext
+	x11-libs/libXinerama
+	x11-libs/libXcursor
+	x11-libs/libXrandr
+	x11-libs/libXfixes
 	>=dev-libs/glib-2.6
 	>=dev-libs/atk-1.0.1
 	>=x11-libs/pango-1.8
@@ -40,14 +36,10 @@ DEPEND="${RDEPEND}
 	>=dev-util/pkgconfig-0.9
 	sys-devel/autoconf
 	>=sys-devel/automake-1.7.9
-	|| ( (
-			x11-proto/xextproto
-			x11-proto/xproto
-			x11-proto/inputproto
-			x11-proto/xineramaproto
-		)
-		virtual/x11
-	)
+	x11-proto/xextproto
+	x11-proto/xproto
+	x11-proto/inputproto
+	x11-proto/xineramaproto
 	doc? ( >=dev-util/gtk-doc-1 )"
 
 set_gtk2_confdir() {
diff --git a/x11-libs/gtk+/gtk+-2.8.19.ebuild b/x11-libs/gtk+/gtk+-2.8.19.ebuild
index 53eb018d2b9d..ae685d6a1a47 100644
--- a/x11-libs/gtk+/gtk+-2.8.19.ebuild
+++ b/x11-libs/gtk+/gtk+-2.8.19.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-libs/gtk+/gtk+-2.8.19.ebuild,v 1.18 2007/07/15 05:53:11 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-2.8.19.ebuild,v 1.19 2007/07/22 02:46:30 dberkholz Exp $
 
 inherit gnome.org flag-o-matic eutils autotools virtualx
 
@@ -12,17 +12,15 @@ SLOT="2"
 KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 sh sparc x86 ~x86-fbsd"
 IUSE="debug doc jpeg tiff xinerama"
 
-RDEPEND="|| ( (
-			x11-libs/libXrender
-			x11-libs/libX11
-			x11-libs/libXi
-			x11-libs/libXt
-			x11-libs/libXext
-			x11-libs/libXcursor
-			x11-libs/libXrandr
-			x11-libs/libXfixes
-			xinerama? ( x11-libs/libXinerama ) )
-		virtual/x11 )
+RDEPEND="x11-libs/libXrender
+	x11-libs/libX11
+	x11-libs/libXi
+	x11-libs/libXt
+	x11-libs/libXext
+	x11-libs/libXcursor
+	x11-libs/libXrandr
+	x11-libs/libXfixes
+	xinerama? ( x11-libs/libXinerama )
 	>=dev-libs/glib-2.10.1
 	>=x11-libs/pango-1.9
 	>=dev-libs/atk-1.10.1
@@ -37,12 +35,10 @@ DEPEND="${RDEPEND}
 	sys-devel/autoconf
 	>=dev-util/pkgconfig-0.9
 	=sys-devel/automake-1.7*
-	|| ( (
-			x11-proto/xextproto
-			x11-proto/xproto
-			x11-proto/inputproto
-			x11-proto/xineramaproto )
-		virtual/x11 )
+	x11-proto/xextproto
+	x11-proto/xproto
+	x11-proto/inputproto
+	x11-proto/xineramaproto
 	doc? (
 		>=dev-util/gtk-doc-1.4
 		~app-text/docbook-xml-dtd-4.1.2 )"
diff --git a/x11-libs/gtk+/gtk+-2.8.20-r1.ebuild b/x11-libs/gtk+/gtk+-2.8.20-r1.ebuild
index 68a12eb33e23..655433e7960b 100644
--- a/x11-libs/gtk+/gtk+-2.8.20-r1.ebuild
+++ b/x11-libs/gtk+/gtk+-2.8.20-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-libs/gtk+/gtk+-2.8.20-r1.ebuild,v 1.7 2007/07/15 05:53:11 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-2.8.20-r1.ebuild,v 1.8 2007/07/22 02:46:30 dberkholz Exp $
 
 inherit gnome.org flag-o-matic eutils autotools virtualx
 
@@ -12,17 +12,15 @@ SLOT="2"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
 IUSE="debug doc jpeg tiff xinerama"
 
-RDEPEND="|| ( (
-			x11-libs/libXrender
-			x11-libs/libX11
-			x11-libs/libXi
-			x11-libs/libXt
-			x11-libs/libXext
-			x11-libs/libXcursor
-			x11-libs/libXrandr
-			x11-libs/libXfixes
-			xinerama? ( x11-libs/libXinerama ) )
-		virtual/x11 )
+RDEPEND="x11-libs/libXrender
+	x11-libs/libX11
+	x11-libs/libXi
+	x11-libs/libXt
+	x11-libs/libXext
+	x11-libs/libXcursor
+	x11-libs/libXrandr
+	x11-libs/libXfixes
+	xinerama? ( x11-libs/libXinerama )
 	>=dev-libs/glib-2.10.1
 	>=x11-libs/pango-1.9
 	>=dev-libs/atk-1.10.1
@@ -37,12 +35,10 @@ DEPEND="${RDEPEND}
 	sys-devel/autoconf
 	>=dev-util/pkgconfig-0.9
 	=sys-devel/automake-1.7*
-	|| ( (
-			x11-proto/xextproto
-			x11-proto/xproto
-			x11-proto/inputproto
-			xinerama? ( x11-proto/xineramaproto ) )
-		virtual/x11 )
+	x11-proto/xextproto
+	x11-proto/xproto
+	x11-proto/inputproto
+	xinerama? ( x11-proto/xineramaproto )
 	doc? (
 		>=dev-util/gtk-doc-1.4
 		~app-text/docbook-xml-dtd-4.1.2 )"
diff --git a/x11-libs/libast/ChangeLog b/x11-libs/libast/ChangeLog
index 7b6191f7371c..3dfbeaf000f4 100644
--- a/x11-libs/libast/ChangeLog
+++ b/x11-libs/libast/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-libs/libast
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libast/ChangeLog,v 1.27 2007/06/24 18:21:42 peper Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libast/ChangeLog,v 1.28 2007/07/22 02:54:35 dberkholz Exp $
+
+  22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>; libast-0.7.ebuild,
+  libast-9999.ebuild:
+  Drop virtual/x11 references.
 
   24 Jun 2007; Piotr Jaroszyński <peper@gentoo.org> libast-9999.ebuild:
   (QA) Don't use KEYWORDS="-*". bug #160519.
diff --git a/x11-libs/libast/libast-0.7.ebuild b/x11-libs/libast/libast-0.7.ebuild
index 5d593d9a8118..353ee5fc587f 100644
--- a/x11-libs/libast/libast-0.7.ebuild
+++ b/x11-libs/libast/libast-0.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/x11-libs/libast/libast-0.7.ebuild,v 1.11 2006/09/04 08:42:39 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libast/libast-0.7.ebuild,v 1.12 2007/07/22 02:54:35 dberkholz Exp $
 
 DESCRIPTION="LIBrary of Assorted Spiffy Things"
 HOMEPAGE="http://www.eterm.org/download/"
@@ -11,7 +11,11 @@ SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 sh sparc x86"
 IUSE="imlib mmx pcre"
 
-DEPEND="|| ( ( x11-libs/libXt x11-proto/xproto x11-libs/libICE x11-libs/libSM x11-libs/libX11 ) virtual/x11 )
+DEPEND="x11-libs/libXt
+	x11-proto/xproto
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libX11
 	=media-libs/freetype-2*
 	imlib? ( media-libs/imlib2 )
 	pcre? ( dev-libs/libpcre )"
diff --git a/x11-libs/libast/libast-9999.ebuild b/x11-libs/libast/libast-9999.ebuild
index f582a639d33d..6c3fa9b5fa32 100644
--- a/x11-libs/libast/libast-9999.ebuild
+++ b/x11-libs/libast/libast-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/x11-libs/libast/libast-9999.ebuild,v 1.7 2007/06/24 18:21:42 peper Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libast/libast-9999.ebuild,v 1.8 2007/07/22 02:54:35 dberkholz Exp $
 
 #ECVS_SERVER="cvs.sourceforge.net:/cvsroot/enlightenment"
 ECVS_SERVER="anoncvs.enlightenment.org:/var/cvs/e"
@@ -16,7 +16,11 @@ SLOT="0"
 KEYWORDS=""
 IUSE="imlib mmx pcre"
 
-DEPEND="|| ( ( x11-libs/libXt x11-proto/xproto x11-libs/libICE x11-libs/libSM x11-libs/libX11 ) virtual/x11 )
+DEPEND="x11-libs/libXt
+	x11-proto/xproto
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libX11
 	=media-libs/freetype-2*
 	imlib? ( media-libs/imlib2 )
 	pcre? ( dev-libs/libpcre )"
diff --git a/x11-libs/libdockapp/ChangeLog b/x11-libs/libdockapp/ChangeLog
index 64d046c2950c..873f315969bf 100644
--- a/x11-libs/libdockapp/ChangeLog
+++ b/x11-libs/libdockapp/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-libs/libdockapp
-# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libdockapp/ChangeLog,v 1.33 2006/11/02 09:10:23 s4t4n Exp $
+# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libdockapp/ChangeLog,v 1.34 2007/07/22 02:55:34 dberkholz Exp $
+
+  22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>;
+  libdockapp-0.6.1.ebuild:
+  Drop virtual/x11 references.
 
   02 Nov 2006; Michele Noberasco <s4t4n@gentoo.org> libdockapp-0.6.1.ebuild:
   Fixed autotools dependancy again. Re-closes bug #150517.
diff --git a/x11-libs/libdockapp/libdockapp-0.6.1.ebuild b/x11-libs/libdockapp/libdockapp-0.6.1.ebuild
index 5d0d63430644..171b8f1fd09a 100644
--- a/x11-libs/libdockapp/libdockapp-0.6.1.ebuild
+++ b/x11-libs/libdockapp/libdockapp-0.6.1.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/x11-libs/libdockapp/libdockapp-0.6.1.ebuild,v 1.8 2006/11/02 09:10:23 s4t4n Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libdockapp/libdockapp-0.6.1.ebuild,v 1.9 2007/07/22 02:55:34 dberkholz Exp $
 
 WANT_AUTOMAKE="1.5"
 WANT_AUTOCONF="latest"
@@ -17,17 +17,13 @@ LICENSE="as-is"
 SLOT="0"
 KEYWORDS="amd64 ppc ppc64 sparc x86"
 
-RDEPEND="|| ( (
-		x11-libs/libX11
-		x11-libs/libXt
-		x11-libs/libXext
-		x11-libs/libXpm )
-	virtual/x11 )"
+RDEPEND="x11-libs/libX11
+	x11-libs/libXt
+	x11-libs/libXext
+	x11-libs/libXpm"
 DEPEND="${RDEPEND}
-	|| ( (
-		x11-proto/xextproto
-		x11-proto/xproto )
-	virtual/x11 )"
+	x11-proto/xextproto
+	x11-proto/xproto"
 
 S=${WORKDIR}/${P/lib/}
 FONTDIR="/usr/share/fonts/${PN}-fonts"
diff --git a/x11-libs/libfakekey/ChangeLog b/x11-libs/libfakekey/ChangeLog
index b2e58ecdbb45..4d2311ddc894 100644
--- a/x11-libs/libfakekey/ChangeLog
+++ b/x11-libs/libfakekey/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-libs/libfakekey
-# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libfakekey/ChangeLog,v 1.2 2006/08/07 16:55:42 yvasilev Exp $
+# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libfakekey/ChangeLog,v 1.3 2007/07/22 03:14:19 dberkholz Exp $
+
+  22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>;
+  libfakekey-0.1.ebuild:
+  Drop virtual/x11 references.
 
   07 Aug 2006; <yvasilev@gentoo.org> libfakekey-0.1.ebuild:
   Added ~arm keyword.
diff --git a/x11-libs/libfakekey/libfakekey-0.1.ebuild b/x11-libs/libfakekey/libfakekey-0.1.ebuild
index 8bec00ee086b..c0b8aa44fb21 100644
--- a/x11-libs/libfakekey/libfakekey-0.1.ebuild
+++ b/x11-libs/libfakekey/libfakekey-0.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 2006-2006 Gentoo Foundation
+# Copyright 2006-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libfakekey/libfakekey-0.1.ebuild,v 1.2 2006/08/07 16:55:42 yvasilev Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libfakekey/libfakekey-0.1.ebuild,v 1.3 2007/07/22 03:14:19 dberkholz Exp $
 
 DESCRIPTION="Helper library for the x11-misc/matchbox-keyboard package."
 HOMEPAGE="http://projects.o-hand.com/matchbox/"
@@ -11,8 +11,7 @@ SLOT="0"
 KEYWORDS="~x86 ~arm"
 IUSE="debug doc"
 
-RDEPEND="|| (	x11-libs/libXtst
-		virtual/x11 )"
+RDEPEND="x11-libs/libXtst"
 
 DEPEND="${RDEPEND}
 	doc? ( app-doc/doxygen )"
diff --git a/x11-libs/libmatchbox/ChangeLog b/x11-libs/libmatchbox/ChangeLog
index 96dd33b54e8e..74f503292686 100644
--- a/x11-libs/libmatchbox/ChangeLog
+++ b/x11-libs/libmatchbox/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-libs/libmatchbox
-# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libmatchbox/ChangeLog,v 1.6 2006/08/17 15:47:51 yvasilev Exp $
+# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libmatchbox/ChangeLog,v 1.7 2007/07/22 03:13:37 dberkholz Exp $
+
+  22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>;
+  libmatchbox-1.8.ebuild, libmatchbox-1.9.ebuild:
+  Drop virtual/x11 references.
 
 *libmatchbox-1.9 (17 Aug 2006)
 
diff --git a/x11-libs/libmatchbox/libmatchbox-1.8.ebuild b/x11-libs/libmatchbox/libmatchbox-1.8.ebuild
index f99a47be8b87..3902e74ce05b 100644
--- a/x11-libs/libmatchbox/libmatchbox-1.8.ebuild
+++ b/x11-libs/libmatchbox/libmatchbox-1.8.ebuild
@@ -1,6 +1,6 @@
-# Copyright 2006-2006 Gentoo Foundation
+# Copyright 2006-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libmatchbox/libmatchbox-1.8.ebuild,v 1.4 2006/08/17 15:47:51 yvasilev Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libmatchbox/libmatchbox-1.8.ebuild,v 1.5 2007/07/22 03:13:37 dberkholz Exp $
 
 inherit eutils libtool
 
@@ -13,9 +13,8 @@ SLOT="0"
 KEYWORDS="~arm ~x86"
 IUSE="debug doc jpeg pango png truetype X xsettings"
 
-RDEPEND="|| ( (	x11-libs/libXext
-		truetype? ( x11-libs/libXft ) )
-		virtual/x11 )
+RDEPEND="x11-libs/libXext
+	truetype? ( x11-libs/libXft )
 	pango? ( x11-libs/pango )
 	jpeg? ( media-libs/jpeg )
 	png? ( media-libs/libpng )
diff --git a/x11-libs/libmatchbox/libmatchbox-1.9.ebuild b/x11-libs/libmatchbox/libmatchbox-1.9.ebuild
index 0c68a0efe6ae..fd1e1cd09fb4 100644
--- a/x11-libs/libmatchbox/libmatchbox-1.9.ebuild
+++ b/x11-libs/libmatchbox/libmatchbox-1.9.ebuild
@@ -1,6 +1,6 @@
-# Copyright 2006-2006 Gentoo Foundation
+# Copyright 2006-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libmatchbox/libmatchbox-1.9.ebuild,v 1.1 2006/08/17 15:47:51 yvasilev Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libmatchbox/libmatchbox-1.9.ebuild,v 1.2 2007/07/22 03:13:37 dberkholz Exp $
 
 inherit eutils libtool
 
@@ -13,9 +13,8 @@ SLOT="0"
 KEYWORDS="~arm ~x86"
 IUSE="debug doc jpeg pango png truetype X xsettings"
 
-RDEPEND="|| ( (	x11-libs/libXext
-		truetype? ( x11-libs/libXft ) )
-		virtual/x11 )
+RDEPEND="x11-libs/libXext
+	truetype? ( x11-libs/libXft )
 	pango? ( x11-libs/pango )
 	jpeg? ( media-libs/jpeg )
 	png? ( media-libs/libpng )
diff --git a/x11-libs/libwnck/ChangeLog b/x11-libs/libwnck/ChangeLog
index 8a8339920ff0..73d4941dda8f 100644
--- a/x11-libs/libwnck/ChangeLog
+++ b/x11-libs/libwnck/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-libs/libwnck
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libwnck/ChangeLog,v 1.163 2007/07/16 23:56:49 remi Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libwnck/ChangeLog,v 1.164 2007/07/22 02:48:54 dberkholz Exp $
+
+  22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>;
+  libwnck-2.14.2.ebuild:
+  Drop virtual/x11 references.
 
 *libwnck-2.18.3 (16 Jul 2007)
 
diff --git a/x11-libs/libwnck/libwnck-2.14.2.ebuild b/x11-libs/libwnck/libwnck-2.14.2.ebuild
index 80fb36f72c81..46f0dd773825 100644
--- a/x11-libs/libwnck/libwnck-2.14.2.ebuild
+++ b/x11-libs/libwnck/libwnck-2.14.2.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/x11-libs/libwnck/libwnck-2.14.2.ebuild,v 1.12 2006/10/19 14:49:53 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libwnck/libwnck-2.14.2.ebuild,v 1.13 2007/07/22 02:48:54 dberkholz Exp $
 
 inherit gnome2
 
@@ -15,7 +15,7 @@ IUSE="doc"
 RDEPEND=">=x11-libs/gtk+-2.5.4
 	>=dev-libs/glib-2
 	>=x11-libs/startup-notification-0.4
-	|| ( x11-libs/libXres virtual/x11 )"
+	x11-libs/libXres"
 
 DEPEND="${RDEPEND}
 	sys-devel/gettext
diff --git a/x11-libs/libxklavier/ChangeLog b/x11-libs/libxklavier/ChangeLog
index 4b853f2de032..f4e96f4d1aba 100644
--- a/x11-libs/libxklavier/ChangeLog
+++ b/x11-libs/libxklavier/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-libs/libxklavier
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libxklavier/ChangeLog,v 1.92 2007/06/04 19:46:11 compnerd Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libxklavier/ChangeLog,v 1.93 2007/07/22 02:58:03 dberkholz Exp $
+
+  22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>;
+  libxklavier-2.0-r1.ebuild, libxklavier-2.2.ebuild, libxklavier-3.1.ebuild:
+  Drop virtual/x11 references.
 
 *libxklavier-3.2 (04 Jun 2007)
 
diff --git a/x11-libs/libxklavier/libxklavier-2.0-r1.ebuild b/x11-libs/libxklavier/libxklavier-2.0-r1.ebuild
index 0d4869109d2d..fc78f905d77e 100644
--- a/x11-libs/libxklavier/libxklavier-2.0-r1.ebuild
+++ b/x11-libs/libxklavier/libxklavier-2.0-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/x11-libs/libxklavier/libxklavier-2.0-r1.ebuild,v 1.9 2006/09/04 07:15:35 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libxklavier/libxklavier-2.0-r1.ebuild,v 1.10 2007/07/22 02:58:03 dberkholz Exp $
 
 inherit eutils
 
@@ -13,17 +13,13 @@ SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sh sparc x86"
 IUSE="doc"
 
-RDEPEND="|| ( (
-		x11-libs/libX11
-		x11-libs/libxkbfile )
-	virtual/x11 )
+RDEPEND="x11-libs/libX11
+	x11-libs/libxkbfile
 	dev-libs/libxml2"
 
 DEPEND="${RDEPEND}
-	|| ( (
-		x11-libs/libXt
-		x11-proto/xproto )
-	virtual/x11 )
+	x11-libs/libXt
+	x11-proto/xproto
 	dev-util/pkgconfig
 	doc? ( app-doc/doxygen )"
 
diff --git a/x11-libs/libxklavier/libxklavier-2.2.ebuild b/x11-libs/libxklavier/libxklavier-2.2.ebuild
index c5288df65353..3c398cf864e6 100644
--- a/x11-libs/libxklavier/libxklavier-2.2.ebuild
+++ b/x11-libs/libxklavier/libxklavier-2.2.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/x11-libs/libxklavier/libxklavier-2.2.ebuild,v 1.13 2006/10/20 15:52:30 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libxklavier/libxklavier-2.2.ebuild,v 1.14 2007/07/22 02:58:03 dberkholz Exp $
 
 inherit eutils
 
@@ -13,12 +13,10 @@ SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 m68k ppc ppc64 s390 sh sparc x86"
 IUSE="doc"
 
-RDEPEND="|| ( (
-		|| ( x11-misc/xkeyboard-config x11-misc/xkbdata )
-		x11-apps/xkbcomp
-		x11-libs/libX11
-		x11-libs/libxkbfile )
-	virtual/x11 )
+RDEPEND="|| ( x11-misc/xkeyboard-config x11-misc/xkbdata )
+	x11-apps/xkbcomp
+	x11-libs/libX11
+	x11-libs/libxkbfile
 	dev-libs/libxml2"
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig
diff --git a/x11-libs/libxklavier/libxklavier-3.1.ebuild b/x11-libs/libxklavier/libxklavier-3.1.ebuild
index e7d77bd1d438..ed55f682e116 100644
--- a/x11-libs/libxklavier/libxklavier-3.1.ebuild
+++ b/x11-libs/libxklavier/libxklavier-3.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-libs/libxklavier/libxklavier-3.1.ebuild,v 1.12 2007/05/28 00:06:52 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libxklavier/libxklavier-3.1.ebuild,v 1.13 2007/07/22 02:58:03 dberkholz Exp $
 
 inherit eutils
 
@@ -13,15 +13,10 @@ SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sh sparc x86 ~x86-fbsd"
 IUSE="doc"
 
-RDEPEND="||	(
-				(
-					||	( x11-misc/xkeyboard-config x11-misc/xkbdata )
-					x11-apps/xkbcomp
-					x11-libs/libX11
-					x11-libs/libxkbfile
-				)
-				virtual/x11
-			)
+RDEPEND="||	( x11-misc/xkeyboard-config x11-misc/xkbdata )
+		x11-apps/xkbcomp
+		x11-libs/libX11
+		x11-libs/libxkbfile
 		dev-libs/libxml2
 		>=dev-libs/glib-2.6"
 
diff --git a/x11-libs/libxsettings-client/ChangeLog b/x11-libs/libxsettings-client/ChangeLog
index 878e32f6d609..5b3fa4879636 100644
--- a/x11-libs/libxsettings-client/ChangeLog
+++ b/x11-libs/libxsettings-client/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-libs/libxsettings-client
-# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libxsettings-client/ChangeLog,v 1.12 2006/10/25 05:04:20 dberkholz Exp $
+# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libxsettings-client/ChangeLog,v 1.13 2007/07/22 02:58:49 dberkholz Exp $
+
+  22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>;
+  libxsettings-client-0.10.ebuild:
+  Drop virtual/x11 references.
 
   25 Oct 2006; Donnie Berkholz <dberkholz@gentoo.org>;
   +files/0.10-as-needed.patch, libxsettings-client-0.10.ebuild:
diff --git a/x11-libs/libxsettings-client/libxsettings-client-0.10.ebuild b/x11-libs/libxsettings-client/libxsettings-client-0.10.ebuild
index 1a66d6d92523..a2e206dd2b3e 100644
--- a/x11-libs/libxsettings-client/libxsettings-client-0.10.ebuild
+++ b/x11-libs/libxsettings-client/libxsettings-client-0.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/x11-libs/libxsettings-client/libxsettings-client-0.10.ebuild,v 1.11 2006/11/04 11:39:56 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libxsettings-client/libxsettings-client-0.10.ebuild,v 1.12 2007/07/22 02:58:49 dberkholz Exp $
 
 WANT_AUTOCONF="latest"
 WANT_AUTOMAKE="latest"
@@ -15,11 +15,9 @@ SLOT="0"
 KEYWORDS="~amd64 arm ppc sh x86"
 IUSE=""
 
-DEPEND="|| ( (
-		x11-proto/xproto
-		x11-libs/libX11
-		x11-libs/libXt )
-	virtual/x11 )"
+DEPEND="x11-proto/xproto
+	x11-libs/libX11
+	x11-libs/libXt"
 
 S=${WORKDIR}/Xsettings-client-${PV}
 
diff --git a/x11-libs/neXtaw/ChangeLog b/x11-libs/neXtaw/ChangeLog
index f55927b98634..4ab38336a2a5 100644
--- a/x11-libs/neXtaw/ChangeLog
+++ b/x11-libs/neXtaw/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-libs/neXtaw
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/neXtaw/ChangeLog,v 1.34 2007/03/19 11:39:00 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/neXtaw/ChangeLog,v 1.35 2007/07/22 02:59:44 dberkholz Exp $
+
+  22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>;
+  neXtaw-0.15.1-r1.ebuild:
+  Drop virtual/x11 references.
 
   19 Mar 2007; Bryan Østergaard <kloeri@gentoo.org> metadata.xml:
   Remove mkennedy from metadata.xml due to retirement.
diff --git a/x11-libs/neXtaw/neXtaw-0.15.1-r1.ebuild b/x11-libs/neXtaw/neXtaw-0.15.1-r1.ebuild
index 83045ab64e9b..ee02672e8ec6 100644
--- a/x11-libs/neXtaw/neXtaw-0.15.1-r1.ebuild
+++ b/x11-libs/neXtaw/neXtaw-0.15.1-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-libs/neXtaw/neXtaw-0.15.1-r1.ebuild,v 1.15 2007/02/18 11:47:02 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/neXtaw/neXtaw-0.15.1-r1.ebuild,v 1.16 2007/07/22 02:59:44 dberkholz Exp $
 
 DESCRIPTION="Athena Widgets with N*XTSTEP appearance"
 HOMEPAGE="http://siag.nu/neXtaw/"
@@ -11,19 +11,16 @@ SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sh sparc x86 ~x86-fbsd"
 IUSE=""
 
-DEPEND="|| ( ( x11-libs/libICE
-		x11-libs/libXext
-		x11-libs/libXt
-		x11-libs/libX11
-		x11-libs/libSM
-		x11-libs/libXmu
-		x11-libs/libxkbfile
-		x11-libs/libXpm
-		x11-proto/xextproto
-		x11-proto/xproto
-		)
-		virtual/x11
-	)
+DEPEND="x11-libs/libICE
+	x11-libs/libXext
+	x11-libs/libXt
+	x11-libs/libX11
+	x11-libs/libSM
+	x11-libs/libXmu
+	x11-libs/libxkbfile
+	x11-libs/libXpm
+	x11-proto/xextproto
+	x11-proto/xproto
 	!<x11-libs/neXtaw-0.15.1-r1"
 
 src_install() {
diff --git a/x11-libs/pango/ChangeLog b/x11-libs/pango/ChangeLog
index 25b1a0855cc3..a0a014f0f517 100644
--- a/x11-libs/pango/ChangeLog
+++ b/x11-libs/pango/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-libs/pango
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/pango/ChangeLog,v 1.180 2007/07/19 13:59:27 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/pango/ChangeLog,v 1.181 2007/07/22 03:01:36 dberkholz Exp $
+
+  22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>;
+  pango-1.8.1-r1.ebuild, pango-1.10.3.ebuild, pango-1.10.4.ebuild,
+  pango-1.12.3.ebuild:
+  Drop virtual/x11 references.
 
   19 Jul 2007; Christoph Mende <angelos@gentoo.org> pango-1.16.4.ebuild:
   Stable on amd64 wrt bug #185614
diff --git a/x11-libs/pango/pango-1.10.3.ebuild b/x11-libs/pango/pango-1.10.3.ebuild
index 121908516c7c..48377956a74d 100644
--- a/x11-libs/pango/pango-1.10.3.ebuild
+++ b/x11-libs/pango/pango-1.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/x11-libs/pango/pango-1.10.3.ebuild,v 1.12 2006/07/05 05:19:10 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/pango/pango-1.10.3.ebuild,v 1.13 2007/07/22 03:01:36 dberkholz Exp $
 
 inherit eutils gnome2
 
@@ -12,12 +12,10 @@ SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 sh sparc x86"
 IUSE="doc"
 
-RDEPEND="|| ( (
-		x11-libs/libXrender
-		x11-libs/libX11
-		x11-libs/libXt
-		)
-	virtual/x11 )
+RDEPEND="
+	x11-libs/libXrender
+	x11-libs/libX11
+	x11-libs/libXt
 	virtual/xft
 	>=dev-libs/glib-2.5.7
 	>=media-libs/fontconfig-1.0.1
@@ -26,7 +24,7 @@ RDEPEND="|| ( (
 
 DEPEND="${RDEPEND}
 	>=dev-util/pkgconfig-0.9
-	|| ( x11-proto/xproto virtual/x11 )
+	x11-proto/xproto
 	doc? (
 		>=dev-util/gtk-doc-1
 		~app-text/docbook-xml-dtd-4.1.2 )"
diff --git a/x11-libs/pango/pango-1.10.4.ebuild b/x11-libs/pango/pango-1.10.4.ebuild
index c44473e99fbf..1f8d738a0d5f 100644
--- a/x11-libs/pango/pango-1.10.4.ebuild
+++ b/x11-libs/pango/pango-1.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/x11-libs/pango/pango-1.10.4.ebuild,v 1.2 2006/06/07 14:09:47 allanonjl Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/pango/pango-1.10.4.ebuild,v 1.3 2007/07/22 03:01:36 dberkholz Exp $
 
 inherit eutils gnome2
 
@@ -12,12 +12,10 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 IUSE="doc"
 
-RDEPEND="|| ( (
-		x11-libs/libXrender
-		x11-libs/libX11
-		x11-libs/libXt
-		)
-	virtual/x11 )
+RDEPEND="
+	x11-libs/libXrender
+	x11-libs/libX11
+	x11-libs/libXt
 	virtual/xft
 	>=dev-libs/glib-2.5.7
 	>=media-libs/fontconfig-1.0.1
@@ -26,7 +24,7 @@ RDEPEND="|| ( (
 
 DEPEND="${RDEPEND}
 	>=dev-util/pkgconfig-0.9
-	|| ( x11-proto/xproto virtual/x11 )
+	x11-proto/xproto
 	doc? (
 		>=dev-util/gtk-doc-1
 		~app-text/docbook-xml-dtd-4.1.2 )"
diff --git a/x11-libs/pango/pango-1.12.3.ebuild b/x11-libs/pango/pango-1.12.3.ebuild
index ec4bfac9e5c5..e6cbcb525b57 100644
--- a/x11-libs/pango/pango-1.12.3.ebuild
+++ b/x11-libs/pango/pango-1.12.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/x11-libs/pango/pango-1.12.3.ebuild,v 1.10 2006/10/20 13:30:13 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/pango/pango-1.12.3.ebuild,v 1.11 2007/07/22 03:01:36 dberkholz Exp $
 
 inherit eutils gnome2
 
@@ -12,12 +12,10 @@ SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd"
 IUSE="doc"
 
-RDEPEND="|| ( (
-		x11-libs/libXrender
-		x11-libs/libX11
-		x11-libs/libXft
-		)
-		virtual/x11 )
+RDEPEND="
+	x11-libs/libXrender
+	x11-libs/libX11
+	x11-libs/libXft
 	>=dev-libs/glib-2.10.0
 	>=media-libs/fontconfig-1.0.1
 	>=media-libs/freetype-2
diff --git a/x11-libs/pango/pango-1.8.1-r1.ebuild b/x11-libs/pango/pango-1.8.1-r1.ebuild
index de070da6d83d..9dfd364eb37c 100644
--- a/x11-libs/pango/pango-1.8.1-r1.ebuild
+++ b/x11-libs/pango/pango-1.8.1-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/x11-libs/pango/pango-1.8.1-r1.ebuild,v 1.13 2006/06/07 14:09:47 allanonjl Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/pango/pango-1.8.1-r1.ebuild,v 1.14 2007/07/22 03:01:36 dberkholz Exp $
 
 inherit gnome2 eutils
 
@@ -13,14 +13,10 @@ SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 sparc x86"
 IUSE="doc static"
 
-RDEPEND="|| (
-				(
-					x11-libs/libXt
-					x11-libs/libX11
-					x11-libs/libXrender
-				)
-				virtual/x11
-			)
+RDEPEND="
+	x11-libs/libXt
+	x11-libs/libX11
+	x11-libs/libXrender
 	virtual/xft
 	>=dev-libs/glib-2.6
 	>=media-libs/fontconfig-1.0.1
diff --git a/x11-libs/qt/ChangeLog b/x11-libs/qt/ChangeLog
index 72e7f4494047..3c3cd6ddd1fe 100644
--- a/x11-libs/qt/ChangeLog
+++ b/x11-libs/qt/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-libs/qt
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/ChangeLog,v 1.456 2007/07/20 20:00:31 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/ChangeLog,v 1.457 2007/07/22 03:05:35 dberkholz Exp $
+
+  22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>; qt-3.3.4-r8.ebuild,
+  qt-3.3.8-r2.ebuild:
+  Drop virtual/x11 references.
 
   20 Jul 2007; Raúl Porcel <armin76@gentoo.org>
   +files/qt-4.3.0-alpha-threading.patch, qt-4.3.0.ebuild:
diff --git a/x11-libs/qt/qt-3.3.4-r8.ebuild b/x11-libs/qt/qt-3.3.4-r8.ebuild
index 34dccad78d91..46b17b13c225 100644
--- a/x11-libs/qt/qt-3.3.4-r8.ebuild
+++ b/x11-libs/qt/qt-3.3.4-r8.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-libs/qt/qt-3.3.4-r8.ebuild,v 1.26 2007/05/03 11:25:09 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-3.3.4-r8.ebuild,v 1.27 2007/07/22 03:05:35 dberkholz Exp $
 
 inherit eutils flag-o-matic toolchain-funcs
 
@@ -19,16 +19,13 @@ SLOT="3"
 KEYWORDS="amd64 mips x86"
 IUSE="cups debug doc examples firebird gif ipv6 mysql nas odbc opengl postgres sqlite xinerama immqt immqt-bc"
 
-DEPEND="|| ( ( x11-libs/libXcursor
-			x11-libs/libXi
-			x11-libs/libXrandr
-			x11-libs/libSM
-			x11-proto/inputproto
-			x11-proto/xextproto
-			xinerama? ( x11-proto/xineramaproto x11-libs/libXinerama )
-		)
-		<virtual/x11-7
-	)
+DEPEND="x11-libs/libXcursor
+	x11-libs/libXi
+	x11-libs/libXrandr
+	x11-libs/libSM
+	x11-proto/inputproto
+	x11-proto/xextproto
+	xinerama? ( x11-proto/xineramaproto x11-libs/libXinerama )
 	virtual/xft
 	media-libs/libpng
 	media-libs/jpeg
diff --git a/x11-libs/qt/qt-3.3.8-r2.ebuild b/x11-libs/qt/qt-3.3.8-r2.ebuild
index 049f03c49925..cab467139d00 100644
--- a/x11-libs/qt/qt-3.3.8-r2.ebuild
+++ b/x11-libs/qt/qt-3.3.8-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/x11-libs/qt/qt-3.3.8-r2.ebuild,v 1.10 2007/05/30 11:49:19 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-3.3.8-r2.ebuild,v 1.11 2007/07/22 03:05:35 dberkholz Exp $
 
 # *** Please remember to update qt3.eclass when revbumping this ***
 
@@ -21,17 +21,13 @@ SLOT="3"
 KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd"
 IUSE="cups debug doc examples firebird gif ipv6 mysql nas nis odbc opengl postgres sqlite xinerama immqt immqt-bc"
 
-DEPEND="|| ( ( x11-libs/libXcursor
-			x11-libs/libXi
-			x11-libs/libXrandr
-			x11-libs/libSM
-			x11-proto/inputproto
-			x11-proto/xextproto
-			xinerama? ( x11-proto/xineramaproto x11-libs/libXinerama )
-
-		)
-		<virtual/x11-7
-	)
+DEPEND="x11-libs/libXcursor
+	x11-libs/libXi
+	x11-libs/libXrandr
+	x11-libs/libSM
+	x11-proto/inputproto
+	x11-proto/xextproto
+	xinerama? ( x11-proto/xineramaproto x11-libs/libXinerama )
 	virtual/xft
 	media-libs/libpng
 	media-libs/jpeg
diff --git a/x11-libs/vte/ChangeLog b/x11-libs/vte/ChangeLog
index 9a6f80a5371a..e9b3426480a4 100644
--- a/x11-libs/vte/ChangeLog
+++ b/x11-libs/vte/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-libs/vte
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/vte/ChangeLog,v 1.158 2007/06/27 12:18:25 leio Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/vte/ChangeLog,v 1.159 2007/07/22 03:07:25 dberkholz Exp $
+
+  22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>; vte-0.12.2.ebuild,
+  vte-0.14.1.ebuild, vte-0.14.2.ebuild:
+  Drop virtual/x11 references.
 
 *vte-0.16.6 (27 Jun 2007)
 
diff --git a/x11-libs/vte/vte-0.12.2.ebuild b/x11-libs/vte/vte-0.12.2.ebuild
index dd20b348d51f..c90214d4b60e 100644
--- a/x11-libs/vte/vte-0.12.2.ebuild
+++ b/x11-libs/vte/vte-0.12.2.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/x11-libs/vte/vte-0.12.2.ebuild,v 1.12 2007/07/15 05:53:11 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/vte/vte-0.12.2.ebuild,v 1.13 2007/07/22 03:07:25 dberkholz Exp $
 
 inherit eutils autotools gnome2
 
@@ -24,7 +24,7 @@ RDEPEND=">=dev-libs/glib-2.6
 	opengl? (
 		virtual/opengl
 		virtual/glu )
-	|| ( x11-libs/libX11 virtual/x11 )
+	x11-libs/libX11
 	virtual/xft"
 
 # No need to specify gettext. See bug #134436.
diff --git a/x11-libs/vte/vte-0.14.1.ebuild b/x11-libs/vte/vte-0.14.1.ebuild
index 7df6ec117751..d53d41c8848b 100644
--- a/x11-libs/vte/vte-0.14.1.ebuild
+++ b/x11-libs/vte/vte-0.14.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-libs/vte/vte-0.14.1.ebuild,v 1.12 2007/05/27 04:42:40 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/vte/vte-0.14.1.ebuild,v 1.13 2007/07/22 03:07:25 dberkholz Exp $
 
 inherit eutils gnome2 autotools
 
@@ -26,7 +26,7 @@ RDEPEND=">=dev-libs/glib-2.9
 		virtual/opengl
 		virtual/glu
 	)
-	|| ( x11-libs/libX11 virtual/x11 )
+	x11-libs/libX11
 	virtual/xft"
 
 DEPEND="${RDEPEND}
diff --git a/x11-libs/vte/vte-0.14.2.ebuild b/x11-libs/vte/vte-0.14.2.ebuild
index 0ad4f04642f2..f2679a98ebed 100644
--- a/x11-libs/vte/vte-0.14.2.ebuild
+++ b/x11-libs/vte/vte-0.14.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-libs/vte/vte-0.14.2.ebuild,v 1.9 2007/06/24 22:40:48 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/vte/vte-0.14.2.ebuild,v 1.10 2007/07/22 03:07:25 dberkholz Exp $
 
 inherit eutils gnome2 autotools
 
@@ -26,7 +26,7 @@ RDEPEND=">=dev-libs/glib-2.9
 		virtual/opengl
 		virtual/glu
 	)
-	|| ( x11-libs/libX11 virtual/x11 )
+	x11-libs/libX11
 	virtual/xft"
 
 DEPEND="${RDEPEND}
diff --git a/x11-libs/xclass/ChangeLog b/x11-libs/xclass/ChangeLog
index 1a236505e876..2ef5a665ff03 100644
--- a/x11-libs/xclass/ChangeLog
+++ b/x11-libs/xclass/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-libs/xclass
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/xclass/ChangeLog,v 1.18 2007/05/11 18:23:15 bangert Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/xclass/ChangeLog,v 1.19 2007/07/22 03:09:01 dberkholz Exp $
+
+  22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>;
+  xclass-0.8.2-r1.ebuild, xclass-0.8.2-r2.ebuild:
+  Drop virtual/x11 references.
 
   11 May 2007; Thilo Bangert <bangert@gentoo.org> +metadata.xml:
   add metadata.xml
diff --git a/x11-libs/xclass/xclass-0.8.2-r1.ebuild b/x11-libs/xclass/xclass-0.8.2-r1.ebuild
index 4adc7a9cf89c..4ffab76e9387 100644
--- a/x11-libs/xclass/xclass-0.8.2-r1.ebuild
+++ b/x11-libs/xclass/xclass-0.8.2-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/x11-libs/xclass/xclass-0.8.2-r1.ebuild,v 1.6 2006/03/15 08:10:10 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/xclass/xclass-0.8.2-r1.ebuild,v 1.7 2007/07/22 03:09:01 dberkholz Exp $
 
 DESCRIPTION="a C++ GUI toolkit for the X windows environment"
 HOMEPAGE="http://xclass.sourceforge.net/"
@@ -11,10 +11,10 @@ SLOT="0"
 KEYWORDS="x86 ppc sparc alpha"
 IUSE=""
 
-RDEPEND="|| ( x11-libs/libXpm virtual/x11 )
+RDEPEND="x11-libs/libXpm
 	virtual/libc"
 DEPEND="${RDEPEND}
-	|| ( x11-proto/xextproto virtual/x11 )
+	x11-proto/xextproto
 	>=sys-apps/sed-4"
 
 src_unpack() {
diff --git a/x11-libs/xclass/xclass-0.8.2-r2.ebuild b/x11-libs/xclass/xclass-0.8.2-r2.ebuild
index 657e05887502..e08505f10425 100644
--- a/x11-libs/xclass/xclass-0.8.2-r2.ebuild
+++ b/x11-libs/xclass/xclass-0.8.2-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/x11-libs/xclass/xclass-0.8.2-r2.ebuild,v 1.2 2007/03/05 15:33:06 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/xclass/xclass-0.8.2-r2.ebuild,v 1.3 2007/07/22 03:09:01 dberkholz Exp $
 
 DESCRIPTION="a C++ GUI toolkit for the X windows environment"
 HOMEPAGE="http://xclass.sourceforge.net/"
@@ -11,10 +11,10 @@ SLOT="0"
 KEYWORDS="x86"
 IUSE=""
 
-RDEPEND="|| ( x11-libs/libXpm virtual/x11 )
+RDEPEND="x11-libs/libXpm
 	virtual/libc"
 DEPEND="${RDEPEND}
-	|| ( x11-proto/xextproto virtual/x11 )
+	x11-proto/xextproto
 	>=sys-apps/sed-4"
 
 src_unpack() {
diff --git a/x11-libs/xforms/ChangeLog b/x11-libs/xforms/ChangeLog
index e36c785403ed..0567839733a1 100644
--- a/x11-libs/xforms/ChangeLog
+++ b/x11-libs/xforms/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-libs/xforms
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/xforms/ChangeLog,v 1.39 2007/02/20 16:21:05 phreak Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/xforms/ChangeLog,v 1.40 2007/07/22 03:09:49 dberkholz Exp $
+
+  22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>;
+  xforms-1.0.90-r1.ebuild:
+  Drop virtual/x11 references.
 
   20 Feb 2007; Christian Heim <phreak@gentoo.org>
   files/xforms-1.0.90-Makefile.am.patch:
diff --git a/x11-libs/xforms/xforms-1.0.90-r1.ebuild b/x11-libs/xforms/xforms-1.0.90-r1.ebuild
index 9524f3117940..0d91a54fa1c5 100644
--- a/x11-libs/xforms/xforms-1.0.90-r1.ebuild
+++ b/x11-libs/xforms/xforms-1.0.90-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-libs/xforms/xforms-1.0.90-r1.ebuild,v 1.11 2007/07/15 05:53:11 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/xforms/xforms-1.0.90-r1.ebuild,v 1.12 2007/07/22 03:09:49 dberkholz Exp $
 
 inherit autotools
 
@@ -13,15 +13,11 @@ SLOT="0"
 KEYWORDS="amd64 arm ppc ~ppc64 sh sparc x86"
 IUSE="opengl"
 
-DEPEND=" || (
-				(
-					x11-libs/libICE
-					x11-libs/libXpm
-					x11-libs/libSM
-					x11-proto/xproto
-				)
-				virtual/x11
-			 )
+DEPEND="
+	x11-libs/libICE
+	x11-libs/libXpm
+	x11-libs/libSM
+	x11-proto/xproto
 	opengl? ( virtual/opengl )
 	media-libs/jpeg"
 
diff --git a/x11-libs/xosd/ChangeLog b/x11-libs/xosd/ChangeLog
index 9cab6c03d4b5..e1c704128bd7 100644
--- a/x11-libs/xosd/ChangeLog
+++ b/x11-libs/xosd/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-libs/xosd
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/xosd/ChangeLog,v 1.68 2007/07/02 14:55:10 peper Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/xosd/ChangeLog,v 1.69 2007/07/22 03:11:37 dberkholz Exp $
+
+  22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>; xosd-2.2.8-r1.ebuild,
+  xosd-2.2.10-r1.ebuild, xosd-2.2.14-r1.ebuild:
+  Drop virtual/x11 references.
 
   02 Jul 2007; Piotr Jaroszyński <peper@gentoo.org> xosd-2.2.14-r1.ebuild:
   (QA) RESTRICT clean up.
diff --git a/x11-libs/xosd/xosd-2.2.10-r1.ebuild b/x11-libs/xosd/xosd-2.2.10-r1.ebuild
index 22f6ef9e5192..8dd2997a7dcf 100644
--- a/x11-libs/xosd/xosd-2.2.10-r1.ebuild
+++ b/x11-libs/xosd/xosd-2.2.10-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-libs/xosd/xosd-2.2.10-r1.ebuild,v 1.3 2007/03/13 14:49:38 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/xosd/xosd-2.2.10-r1.ebuild,v 1.4 2007/07/22 03:11:37 dberkholz Exp $
 
 inherit eutils
 
@@ -14,13 +14,11 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="alpha ~amd64 ~hppa ia64 ppc ~sparc x86"
 
-DEPEND="|| ( (
-	x11-libs/libX11
+DEPEND="x11-libs/libX11
 	x11-libs/libXt
 	x11-proto/xextproto
 	x11-proto/xineramaproto
-	x11-proto/xproto )
-	virtual/x11 )"
+	x11-proto/xproto"
 
 src_compile() {
 	local myconf=""
diff --git a/x11-libs/xosd/xosd-2.2.14-r1.ebuild b/x11-libs/xosd/xosd-2.2.14-r1.ebuild
index f18680b464c4..5028f42b8943 100644
--- a/x11-libs/xosd/xosd-2.2.14-r1.ebuild
+++ b/x11-libs/xosd/xosd-2.2.14-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-libs/xosd/xosd-2.2.14-r1.ebuild,v 1.14 2007/07/15 05:53:11 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/xosd/xosd-2.2.14-r1.ebuild,v 1.15 2007/07/22 03:11:37 dberkholz Exp $
 
 WANT_AUTOCONF="latest"
 WANT_AUTOMAKE="latest"
@@ -18,17 +18,14 @@ SLOT="0"
 KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86"
 IUSE="xinerama"
 
-RDEPEND="|| ( ( x11-libs/libX11
-	x11-libs/libXext )
-	virtual/x11 )"
+RDEPEND="x11-libs/libX11
+	x11-libs/libXext"
 
-DEPEND="|| ( (
-	x11-libs/libX11
+DEPEND="x11-libs/libX11
 	x11-libs/libXt
 	x11-proto/xextproto
 	xinerama? ( x11-proto/xineramaproto )
-	x11-proto/xproto )
-	virtual/x11 )
+	x11-proto/xproto
 	${RDEPEND}"
 
 src_unpack() {
diff --git a/x11-libs/xosd/xosd-2.2.8-r1.ebuild b/x11-libs/xosd/xosd-2.2.8-r1.ebuild
index 29a2f708459e..3565b1e92fae 100644
--- a/x11-libs/xosd/xosd-2.2.8-r1.ebuild
+++ b/x11-libs/xosd/xosd-2.2.8-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/x11-libs/xosd/xosd-2.2.8-r1.ebuild,v 1.11 2006/11/13 14:35:35 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/xosd/xosd-2.2.8-r1.ebuild,v 1.12 2007/07/22 03:11:37 dberkholz Exp $
 
 inherit eutils
 
@@ -14,13 +14,11 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="alpha amd64 hppa ~ia64 ppc sparc x86"
 
-DEPEND="|| ( (
-	x11-libs/libX11
+DEPEND="x11-libs/libX11
 	x11-libs/libXt
 	x11-proto/xextproto
 	x11-proto/xineramaproto
-	x11-proto/xproto )
-	virtual/x11 )"
+	x11-proto/xproto"
 
 src_unpack() {
 	unpack ${A}
diff --git a/x11-libs/xview/ChangeLog b/x11-libs/xview/ChangeLog
index c139a94db8e5..7c2a3568a8c2 100644
--- a/x11-libs/xview/ChangeLog
+++ b/x11-libs/xview/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for x11-libs/xview
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/xview/ChangeLog,v 1.26 2007/07/01 20:34:26 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/xview/ChangeLog,v 1.27 2007/07/22 03:12:39 dberkholz Exp $
+
+  22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>; xview-3.2-r5.ebuild:
+  Drop virtual/x11 references.
 
   01 Jul 2007; Diego Pettenò <flameeyes@gentoo.org> ChangeLog:
   Once again, with passion.
diff --git a/x11-libs/xview/xview-3.2-r5.ebuild b/x11-libs/xview/xview-3.2-r5.ebuild
index 3462af42f3c6..7f461f7bddd6 100644
--- a/x11-libs/xview/xview-3.2-r5.ebuild
+++ b/x11-libs/xview/xview-3.2-r5.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/x11-libs/xview/xview-3.2-r5.ebuild,v 1.5 2007/06/26 02:59:19 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/xview/xview-3.2-r5.ebuild,v 1.6 2007/07/22 03:12:39 dberkholz Exp $
 
 inherit eutils
 
@@ -20,21 +20,15 @@ SLOT="0"
 IUSE=""
 KEYWORDS="-alpha -amd64 ~ppc ~sparc x86"
 
-RDEPEND="|| ( ( x11-libs/libXpm
-			x11-proto/xextproto
-		)
-		virtual/x11
-	)
+RDEPEND="x11-libs/libXpm
+	x11-proto/xextproto
 	media-fonts/font-bh-75dpi
 	media-fonts/font-sun-misc"
 
 DEPEND="${RDEPEND}
-	|| ( ( app-text/rman
-			x11-misc/gccmakedep
-			x11-misc/imake
-		)
-		virtual/x11
-	)"
+	app-text/rman
+	x11-misc/gccmakedep
+	x11-misc/imake"
 
 S="${WORKDIR}/${MY_PN}"