22 files changed, 97 insertions, 92 deletions
diff --git a/x11-misc/driconf/ChangeLog b/x11-misc/driconf/ChangeLog
index 701a4d372a3f..333ef75a5d25 100644
--- a/x11-misc/driconf/ChangeLog
+++ b/x11-misc/driconf/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-misc/driconf
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/driconf/ChangeLog,v 1.10 2007/02/21 23:35:08 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/driconf/ChangeLog,v 1.11 2007/07/22 04:06:07 dberkholz Exp $
+
+  22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>; driconf-0.2.7.ebuild,
+  driconf-0.9.1.ebuild:
+  Drop virtual/x11 references.
 
   21 Feb 2007; Markus Ullmann <jokey@gentoo.org> ChangeLog:
   Redigest for Manifest2
diff --git a/x11-misc/driconf/driconf-0.2.7.ebuild b/x11-misc/driconf/driconf-0.2.7.ebuild
index 08da14e6347d..a1bf77bd447b 100644
--- a/x11-misc/driconf/driconf-0.2.7.ebuild
+++ b/x11-misc/driconf/driconf-0.2.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-misc/driconf/driconf-0.2.7.ebuild,v 1.5 2006/07/01 21:46:21 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/driconf/driconf-0.2.7.ebuild,v 1.6 2007/07/22 04:06:07 dberkholz Exp $
 
 inherit distutils
 
@@ -17,10 +17,7 @@ DEPEND=">=x11-libs/gtk+-2.4
 	>=dev-lang/python-2.3
 	dev-python/pygtk
 	dev-python/pyxml
-	|| (
-		x11-apps/xdriinfo
-		virtual/x11
-	)"
+	x11-apps/xdriinfo"
 
 DOCS="CHANGELOG COPYING PKG-INFO README TODO"
 
diff --git a/x11-misc/driconf/driconf-0.9.1.ebuild b/x11-misc/driconf/driconf-0.9.1.ebuild
index 2ef1a6707c3a..1e316ab7de07 100644
--- a/x11-misc/driconf/driconf-0.9.1.ebuild
+++ b/x11-misc/driconf/driconf-0.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-misc/driconf/driconf-0.9.1.ebuild,v 1.1 2006/09/18 06:08:24 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/driconf/driconf-0.9.1.ebuild,v 1.2 2007/07/22 04:06:07 dberkholz Exp $
 
 inherit distutils
 
@@ -17,10 +17,7 @@ DEPEND=">=x11-libs/gtk+-2.4
 	>=dev-lang/python-2.3
 	>=dev-python/pygtk-2.4
 	dev-python/pyxml
-	|| (
-		x11-apps/xdriinfo
-		virtual/x11
-	)"
+	x11-apps/xdriinfo"
 
 DOCS="CHANGELOG COPYING PKG-INFO README TODO"
 
diff --git a/x11-misc/electricsheep/ChangeLog b/x11-misc/electricsheep/ChangeLog
index 85bf86d46eae..deecc07171b1 100644
--- a/x11-misc/electricsheep/ChangeLog
+++ b/x11-misc/electricsheep/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-misc/electricsheep
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/electricsheep/ChangeLog,v 1.39 2007/04/14 00:02:42 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/electricsheep/ChangeLog,v 1.40 2007/07/22 04:04:00 dberkholz Exp $
+
+  22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>;
+  electricsheep-2.6.7-r1.ebuild, electricsheep-2.6.8.ebuild:
+  Drop virtual/x11 references.
 
   14 Apr 2007; <dan@gentoo.org> electricsheep-2.6.7-r1.ebuild,
   electricsheep-2.6.8.ebuild:
diff --git a/x11-misc/electricsheep/electricsheep-2.6.7-r1.ebuild b/x11-misc/electricsheep/electricsheep-2.6.7-r1.ebuild
index c83c76838bb2..66fd35140d13 100644
--- a/x11-misc/electricsheep/electricsheep-2.6.7-r1.ebuild
+++ b/x11-misc/electricsheep/electricsheep-2.6.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-misc/electricsheep/electricsheep-2.6.7-r1.ebuild,v 1.4 2007/07/13 05:09:41 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/electricsheep/electricsheep-2.6.7-r1.ebuild,v 1.5 2007/07/22 04:04:00 dberkholz Exp $
 
 inherit eutils flag-o-matic kde-functions
 
@@ -12,12 +12,9 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~sparc x86"
 
-RDEPEND="|| ( ( x11-libs/libXv
-			x11-libs/libICE
-			x11-libs/libSM
-		)
-		virtual/x11
-	)
+RDEPEND="x11-libs/libXv
+	x11-libs/libICE
+	x11-libs/libSM
 	dev-libs/expat
 	net-misc/curl
 	media-libs/jpeg
@@ -27,11 +24,8 @@ RDEPEND="|| ( ( x11-libs/libXv
 	sys-libs/zlib"
 
 DEPEND="${RDEPEND}
-	|| ( ( x11-proto/xextproto
-			x11-libs/libXt
-		)
-		virtual/x11
-	)
+	x11-proto/xextproto
+	x11-libs/libXt
 	sys-apps/groff
 	dev-lang/perl
 	>=sys-apps/sed-4
diff --git a/x11-misc/electricsheep/electricsheep-2.6.8.ebuild b/x11-misc/electricsheep/electricsheep-2.6.8.ebuild
index 2036fe40fb4b..18402889b2f5 100644
--- a/x11-misc/electricsheep/electricsheep-2.6.8.ebuild
+++ b/x11-misc/electricsheep/electricsheep-2.6.8.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-misc/electricsheep/electricsheep-2.6.8.ebuild,v 1.3 2007/07/13 05:09:41 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/electricsheep/electricsheep-2.6.8.ebuild,v 1.4 2007/07/22 04:04:00 dberkholz Exp $
 
 inherit eutils flag-o-matic kde-functions autotools
 
@@ -12,12 +12,9 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~sparc ~x86"
 
-RDEPEND="|| ( ( x11-libs/libXv
-			x11-libs/libICE
-			x11-libs/libSM
-		)
-		virtual/x11
-	)
+RDEPEND="x11-libs/libXv
+	x11-libs/libICE
+	x11-libs/libSM
 	dev-libs/expat
 	net-misc/curl
 	media-libs/jpeg
@@ -27,11 +24,8 @@ RDEPEND="|| ( ( x11-libs/libXv
 	sys-libs/zlib"
 
 DEPEND="${RDEPEND}
-	|| ( ( x11-proto/xextproto
-			x11-libs/libXt
-		)
-		virtual/x11
-	)
+	x11-proto/xextproto
+	x11-libs/libXt
 	sys-apps/groff
 	dev-lang/perl
 	media-libs/libmpeg2
diff --git a/x11-misc/fbdesk/ChangeLog b/x11-misc/fbdesk/ChangeLog
index 98311a3abcbb..7206738e4e58 100644
--- a/x11-misc/fbdesk/ChangeLog
+++ b/x11-misc/fbdesk/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for x11-misc/fbdesk
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/fbdesk/ChangeLog,v 1.20 2007/02/21 23:36:59 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/fbdesk/ChangeLog,v 1.21 2007/07/22 04:05:18 dberkholz Exp $
+
+  22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>; fbdesk-1.2.1.ebuild:
+  Drop virtual/x11 references.
 
   21 Feb 2007; Markus Ullmann <jokey@gentoo.org> ChangeLog:
   Redigest for Manifest2
diff --git a/x11-misc/fbdesk/fbdesk-1.2.1.ebuild b/x11-misc/fbdesk/fbdesk-1.2.1.ebuild
index c8d0a9780793..54e3e5220468 100644
--- a/x11-misc/fbdesk/fbdesk-1.2.1.ebuild
+++ b/x11-misc/fbdesk/fbdesk-1.2.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-misc/fbdesk/fbdesk-1.2.1.ebuild,v 1.8 2006/10/22 01:09:50 omp Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/fbdesk/fbdesk-1.2.1.ebuild,v 1.9 2007/07/22 04:05:18 dberkholz Exp $
 
 inherit eutils
 
@@ -14,9 +14,10 @@ KEYWORDS="x86 ppc ~sparc ia64 ~amd64"
 IUSE="debug png"
 
 RDEPEND="png? ( media-libs/libpng )
-		|| ( ( x11-libs/libXpm x11-libs/libXft ) virtual/x11 )"
+		x11-libs/libXpm
+		x11-libs/libXft"
 DEPEND="${RDEPEND}
-		|| ( ( x11-proto/xextproto ) virtual/x11 )"
+		x11-proto/xextproto"
 
 src_unpack() {
 	unpack ${A}
diff --git a/x11-misc/fluxbg/ChangeLog b/x11-misc/fluxbg/ChangeLog
index 3e0576792e4c..1ca3cc12ea6d 100644
--- a/x11-misc/fluxbg/ChangeLog
+++ b/x11-misc/fluxbg/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for x11-misc/fluxbg
-# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/fluxbg/ChangeLog,v 1.11 2006/10/29 20:48:30 omp Exp $
+# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/fluxbg/ChangeLog,v 1.12 2007/07/22 04:02:33 dberkholz Exp $
+
+  22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>; fluxbg-0.7.ebuild:
+  Drop virtual/x11 references.
 
   29 Oct 2006; David Shakaryan <omp@gentoo.org> fluxbg-0.7.ebuild:
   Remove x11-misc/commonbox-utils dependency.
diff --git a/x11-misc/fluxbg/fluxbg-0.7.ebuild b/x11-misc/fluxbg/fluxbg-0.7.ebuild
index 6ba146a79aad..aa37451b79ec 100644
--- a/x11-misc/fluxbg/fluxbg-0.7.ebuild
+++ b/x11-misc/fluxbg/fluxbg-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-misc/fluxbg/fluxbg-0.7.ebuild,v 1.12 2007/07/13 05:09:41 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/fluxbg/fluxbg-0.7.ebuild,v 1.13 2007/07/22 04:02:33 dberkholz Exp $
 
 DESCRIPTION="fluxbg is a tool for comfortable background changing."
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
@@ -11,7 +11,7 @@ SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="~amd64 ppc x86"
 
-DEPEND="|| ( x11-libs/libXt virtual/x11 )
+DEPEND="x11-libs/libXt
 	>=sys-devel/autoconf-2.52
 	=dev-cpp/gtkmm-2.2*"
 
diff --git a/x11-misc/mixer_app/ChangeLog b/x11-misc/mixer_app/ChangeLog
index 8d7cd1fefede..1d940e2bd225 100644
--- a/x11-misc/mixer_app/ChangeLog
+++ b/x11-misc/mixer_app/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-misc/mixer_app
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/mixer_app/ChangeLog,v 1.18 2007/01/04 23:19:29 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/mixer_app/ChangeLog,v 1.19 2007/07/22 03:59:10 dberkholz Exp $
+
+  22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>;
+  mixer_app-1.8.0.ebuild:
+  Drop virtual/x11 references.
 
   04 Jan 2007; Steve Dibb <beandog@gentoo.org> mixer_app-1.8.0.ebuild:
   Add ~amd64, bug 155155
diff --git a/x11-misc/mixer_app/mixer_app-1.8.0.ebuild b/x11-misc/mixer_app/mixer_app-1.8.0.ebuild
index 025f050affcf..68782aac59c9 100644
--- a/x11-misc/mixer_app/mixer_app-1.8.0.ebuild
+++ b/x11-misc/mixer_app/mixer_app-1.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/x11-misc/mixer_app/mixer_app-1.8.0.ebuild,v 1.11 2007/01/04 23:19:29 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/mixer_app/mixer_app-1.8.0.ebuild,v 1.12 2007/07/22 03:59:10 dberkholz Exp $
 
 #need to do some name mangling
 #so that ebuild name adheres to "standart"
@@ -16,13 +16,11 @@ SLOT="0"
 KEYWORDS="~amd64 ppc sparc x86"
 IUSE=""
 
-RDEPEND="|| ( (
-		x11-libs/libX11
-		x11-libs/libXext
-		x11-libs/libXpm )
-	virtual/x11 )"
+RDEPEND="x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXpm"
 DEPEND="${RDEPEND}
-	|| ( x11-proto/xextproto virtual/x11 )"
+	x11-proto/xextproto"
 
 src_compile() {
 	emake || die
diff --git a/x11-misc/pogo/ChangeLog b/x11-misc/pogo/ChangeLog
index 56d4b1edc69b..dcada3e6ff07 100644
--- a/x11-misc/pogo/ChangeLog
+++ b/x11-misc/pogo/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for x11-misc/pogo
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/pogo/ChangeLog,v 1.12 2007/02/21 23:54:02 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/pogo/ChangeLog,v 1.13 2007/07/22 03:56:37 dberkholz Exp $
+
+  22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>; pogo-2.2.ebuild:
+  Drop virtual/x11 references.
 
   21 Feb 2007; Markus Ullmann <jokey@gentoo.org> ChangeLog:
   Redigest for Manifest2
diff --git a/x11-misc/pogo/pogo-2.2.ebuild b/x11-misc/pogo/pogo-2.2.ebuild
index 710a11e32470..7587638a0c8f 100644
--- a/x11-misc/pogo/pogo-2.2.ebuild
+++ b/x11-misc/pogo/pogo-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-misc/pogo/pogo-2.2.ebuild,v 1.12 2006/06/29 16:00:08 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/pogo/pogo-2.2.ebuild,v 1.13 2007/07/22 03:56:37 dberkholz Exp $
 
 IUSE=""
 
@@ -12,15 +12,11 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="x86 ~amd64 ~ppc"
 
-RDEPEND="|| ( (
-		x11-libs/libX11
-		x11-libs/libXext )
-	virtual/x11 )"
+RDEPEND="x11-libs/libX11
+	x11-libs/libXext"
 DEPEND="${RDEPEND}
-	|| ( (
-		x11-proto/xproto
-		x11-proto/xextproto )
-	virtual/x11 )
+	x11-proto/xproto
+	x11-proto/xextproto
 	media-libs/imlib
 	media-libs/jpeg
 	>=sys-apps/sed-4"
diff --git a/x11-misc/seyon/ChangeLog b/x11-misc/seyon/ChangeLog
index 00cc0fa1ab58..a4e33ae2ac85 100644
--- a/x11-misc/seyon/ChangeLog
+++ b/x11-misc/seyon/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for x11-misc/seyon
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/seyon/ChangeLog,v 1.10 2007/03/10 00:13:20 omp Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/seyon/ChangeLog,v 1.11 2007/07/22 03:55:54 dberkholz Exp $
+
+  22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>; seyon-2.20c.ebuild:
+  Drop virtual/x11 references.
 
   10 Mar 2007; David Shakaryan <omp@gentoo.org> seyon-2.20c.ebuild:
   Change nomirror to mirror in RESTRICT.
diff --git a/x11-misc/seyon/seyon-2.20c.ebuild b/x11-misc/seyon/seyon-2.20c.ebuild
index 88e10b6826ba..f92bf33f1588 100644
--- a/x11-misc/seyon/seyon-2.20c.ebuild
+++ b/x11-misc/seyon/seyon-2.20c.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-misc/seyon/seyon-2.20c.ebuild,v 1.9 2007/03/10 00:13:20 omp Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/seyon/seyon-2.20c.ebuild,v 1.10 2007/07/22 03:55:54 dberkholz Exp $
 
 inherit eutils
 
@@ -13,17 +13,15 @@ SLOT="0"
 KEYWORDS="~ppc x86"
 IUSE=""
 
-RDEPEND="|| ( (
-		app-text/rman
-		x11-misc/imake
-		x11-libs/libX11
-		x11-libs/libXmu
-		x11-libs/libXt
-		x11-libs/libXaw
-		x11-libs/libXext
-		x11-libs/libXpm
-		x11-libs/libXp )
-	virtual/x11 )"
+RDEPEND="app-text/rman
+	x11-misc/imake
+	x11-libs/libX11
+	x11-libs/libXmu
+	x11-libs/libXt
+	x11-libs/libXaw
+	x11-libs/libXext
+	x11-libs/libXpm
+	x11-libs/libXp"
 DEPEND="${RDEPEND}"
 
 src_compile() {
diff --git a/x11-misc/xac/ChangeLog b/x11-misc/xac/ChangeLog
index f2691c2ed4a2..366a9f07e463 100644
--- a/x11-misc/xac/ChangeLog
+++ b/x11-misc/xac/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-misc/xac
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xac/ChangeLog,v 1.8 2007/04/21 22:26:50 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xac/ChangeLog,v 1.9 2007/07/22 04:01:47 dberkholz Exp $
+
+  22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>; xac-0.6_pre1.ebuild,
+  xac-0.6_pre2.ebuild, xac-0.6_pre3.ebuild:
+  Drop virtual/x11 references.
 
   21 Apr 2007; Joseph Jezak <josejx@gentoo.org> xac-0.6_pre1.ebuild,
   xac-0.6_pre2.ebuild, xac-0.6_pre3.ebuild:
diff --git a/x11-misc/xac/xac-0.6_pre1.ebuild b/x11-misc/xac/xac-0.6_pre1.ebuild
index e0ae1bad1991..a8a0e6e977e9 100644
--- a/x11-misc/xac/xac-0.6_pre1.ebuild
+++ b/x11-misc/xac/xac-0.6_pre1.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-misc/xac/xac-0.6_pre1.ebuild,v 1.5 2007/06/26 02:59:42 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xac/xac-0.6_pre1.ebuild,v 1.6 2007/07/22 04:01:47 dberkholz Exp $
 
 inherit eutils toolchain-funcs
 
@@ -13,7 +13,7 @@ IUSE=""
 DEPEND=">=dev-lang/python-2.3
 	   sys-apps/pciutils"
 RDEPEND=">=dev-lang/python-2.3
-		 || ( x11-base/xorg-server virtual/x11 )"
+		 x11-base/xorg-server"
 SRC_URI="mirror://gentoo/${P}.tar.bz2"
 
 src_unpack() {
diff --git a/x11-misc/xac/xac-0.6_pre2.ebuild b/x11-misc/xac/xac-0.6_pre2.ebuild
index f8afdd92e0ce..ff9bf12dd1f2 100644
--- a/x11-misc/xac/xac-0.6_pre2.ebuild
+++ b/x11-misc/xac/xac-0.6_pre2.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-misc/xac/xac-0.6_pre2.ebuild,v 1.3 2007/06/26 02:59:42 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xac/xac-0.6_pre2.ebuild,v 1.4 2007/07/22 04:01:47 dberkholz Exp $
 
 inherit toolchain-funcs
 
@@ -13,7 +13,7 @@ IUSE=""
 DEPEND=">=dev-lang/python-2.3
 	   sys-apps/pciutils"
 RDEPEND=">=dev-lang/python-2.3
-		 || ( x11-base/xorg-server virtual/x11 )"
+		 x11-base/xorg-server"
 SRC_URI="mirror://gentoo/${P}.tar.bz2"
 
 src_unpack() {
diff --git a/x11-misc/xac/xac-0.6_pre3.ebuild b/x11-misc/xac/xac-0.6_pre3.ebuild
index 1d79e8bfb1de..a29a6d114fc2 100644
--- a/x11-misc/xac/xac-0.6_pre3.ebuild
+++ b/x11-misc/xac/xac-0.6_pre3.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-misc/xac/xac-0.6_pre3.ebuild,v 1.3 2007/06/26 02:59:42 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xac/xac-0.6_pre3.ebuild,v 1.4 2007/07/22 04:01:47 dberkholz Exp $
 
 inherit toolchain-funcs
 
@@ -13,7 +13,7 @@ IUSE="livecd"
 DEPEND=">=dev-lang/python-2.3
 	   sys-apps/pciutils"
 RDEPEND=">=dev-lang/python-2.3
-		 || ( x11-base/xorg-server virtual/x11 )"
+		x11-base/xorg-server"
 SRC_URI="mirror://gentoo/${P}.tar.bz2"
 
 src_unpack() {
diff --git a/x11-misc/xoo/ChangeLog b/x11-misc/xoo/ChangeLog
index a72f4951a3df..edade5ac1791 100644
--- a/x11-misc/xoo/ChangeLog
+++ b/x11-misc/xoo/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for x11-misc/xoo
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xoo/ChangeLog,v 1.2 2007/03/13 03:33:30 yvasilev Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xoo/ChangeLog,v 1.3 2007/07/22 03:58:23 dberkholz Exp $
+
+  22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>; xoo-0.7.ebuild:
+  Drop virtual/x11 references.
 
   13 Mar 2007; <yvasilev@gentoo.org> xoo-0.7.ebuild:
   Made the s/witch/type -P/ change as suggested by vapier
diff --git a/x11-misc/xoo/xoo-0.7.ebuild b/x11-misc/xoo/xoo-0.7.ebuild
index 4ec395d3d84c..d5de88e6c352 100644
--- a/x11-misc/xoo/xoo-0.7.ebuild
+++ b/x11-misc/xoo/xoo-0.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 2006-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xoo/xoo-0.7.ebuild,v 1.2 2007/03/13 03:33:30 yvasilev Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xoo/xoo-0.7.ebuild,v 1.3 2007/07/22 03:58:23 dberkholz Exp $
 
 DESCRIPTION="Xoo is a graphical wrapper around xnest. You can make Xnest look like a particular device's display and set up buttons on that device."
 HOMEPAGE="http://projects.o-hand.com/xoo"
@@ -13,9 +13,8 @@ IUSE="gnome"
 
 DEPEND="gnome? ( gnome-base/gconf )
 	gnome-base/libglade
-	|| ( (  x11-libs/libXtst
-		x11-base/xorg-server )
-		virtual/x11 )"
+	x11-libs/libXtst
+	x11-base/xorg-server"
 
 src_unpack() {
 	unpack ${A}