Drop virtual/x11 references.

Package-Manager: portage-2.1.3_rc8

185 files changed, 1063 insertions, 1030 deletions

diff --git a/x11-plugins/asmon/ChangeLog b/x11-plugins/asmon/ChangeLog
index 3c32800e0c32..27566ab49b9a 100644
--- a/x11-plugins/asmon/ChangeLog
+++ b/x11-plugins/asmon/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for x11-plugins/asmon
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/asmon/ChangeLog,v 1.21 2007/01/10 17:25:13 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/asmon/ChangeLog,v 1.22 2007/07/22 05:39:35 dberkholz Exp $
+
+  22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>; asmon-0.7.ebuild:
+  Drop virtual/x11 references.
 
   10 Jan 2007; Michael Sterrett <mr_bones_@gentoo.org>
   -files/asmon-cflags.diff, -asmon-0.65.ebuild:
diff --git a/x11-plugins/asmon/asmon-0.7.ebuild b/x11-plugins/asmon/asmon-0.7.ebuild
index 388c2cdbb4ad..2efd82430afe 100644
--- a/x11-plugins/asmon/asmon-0.7.ebuild
+++ b/x11-plugins/asmon/asmon-0.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-plugins/asmon/asmon-0.7.ebuild,v 1.6 2007/01/03 01:15:45 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/asmon/asmon-0.7.ebuild,v 1.7 2007/07/22 05:39:35 dberkholz Exp $
 
 inherit eutils toolchain-funcs
 
@@ -12,11 +12,9 @@ SLOT="0"
 IUSE=""
 KEYWORDS="alpha ~amd64 ppc sparc x86"
 
-RDEPEND="|| ( ( x11-libs/libXpm )
-	<virtual/x11-7 )"
+RDEPEND="x11-libs/libXpm"
 DEPEND="${RDEPEND}
-	|| ( ( x11-proto/xextproto )
-	<virtual/x11-7 )"
+	x11-proto/xextproto"
 
 src_unpack() {
 	unpack ${A}
diff --git a/x11-plugins/cputnik/ChangeLog b/x11-plugins/cputnik/ChangeLog
index 17b6498540af..fd15830f67ad 100644
--- a/x11-plugins/cputnik/ChangeLog
+++ b/x11-plugins/cputnik/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for x11-plugins/cputnik
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/cputnik/ChangeLog,v 1.5 2007/02/06 01:48:42 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/cputnik/ChangeLog,v 1.6 2007/07/22 05:38:53 dberkholz Exp $
+
+  22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>; cputnik-0.1.1.ebuild:
+  Drop virtual/x11 references.
 
   06 Feb 2007; Diego Pettenò <flameeyes@gentoo.org> ChangeLog:
   Regenerate digest in Manifest2 format.
diff --git a/x11-plugins/cputnik/cputnik-0.1.1.ebuild b/x11-plugins/cputnik/cputnik-0.1.1.ebuild
index 1c168ca46849..d854fe2f4430 100644
--- a/x11-plugins/cputnik/cputnik-0.1.1.ebuild
+++ b/x11-plugins/cputnik/cputnik-0.1.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-plugins/cputnik/cputnik-0.1.1.ebuild,v 1.5 2006/01/22 11:24:46 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/cputnik/cputnik-0.1.1.ebuild,v 1.6 2007/07/22 05:38:53 dberkholz Exp $
 
 IUSE=""
 
@@ -12,13 +12,11 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~ppc x86"
 
-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()
 {
diff --git a/x11-plugins/epplets/ChangeLog b/x11-plugins/epplets/ChangeLog
index 3bdbb1fe218d..8a904bac3061 100644
--- a/x11-plugins/epplets/ChangeLog
+++ b/x11-plugins/epplets/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-plugins/epplets
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/epplets/ChangeLog,v 1.10 2007/05/05 07:44:01 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/epplets/ChangeLog,v 1.11 2007/07/22 05:38:11 dberkholz Exp $
+
+  22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>; epplets-0.9.ebuild,
+  epplets-0.10.ebuild:
+  Drop virtual/x11 references.
 
 *epplets-0.10 (05 May 2007)
 
diff --git a/x11-plugins/epplets/epplets-0.10.ebuild b/x11-plugins/epplets/epplets-0.10.ebuild
index f582bdf34472..f247f1c2f8f5 100644
--- a/x11-plugins/epplets/epplets-0.10.ebuild
+++ b/x11-plugins/epplets/epplets-0.10.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-plugins/epplets/epplets-0.10.ebuild,v 1.1 2007/05/05 07:44:01 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/epplets/epplets-0.10.ebuild,v 1.2 2007/07/22 05:38:11 dberkholz Exp $
 
 DESCRIPTION="Base files for Enlightenment epplets and some epplets"
 HOMEPAGE="http://www.enlightenment.org/"
@@ -11,13 +11,15 @@ SLOT="0"
 KEYWORDS="alpha amd64 ppc sparc x86"
 IUSE="esd"
 
-RDEPEND="|| ( ( x11-libs/libX11 x11-libs/libXext ) virtual/x11 )
+RDEPEND="x11-libs/libX11
+	x11-libs/libXext
 	virtual/glut
 	esd? ( media-sound/esound )
 	media-libs/imlib2
 	>=x11-wm/enlightenment-0.16.4"
 DEPEND="${RDEPEND}
-	|| ( ( x11-proto/xproto x11-proto/xextproto ) virtual/x11 )"
+	x11-proto/xproto
+	x11-proto/xextproto"
 
 src_install() {
 	make DESTDIR="${D}" install || die
diff --git a/x11-plugins/epplets/epplets-0.9.ebuild b/x11-plugins/epplets/epplets-0.9.ebuild
index ba0f720b2db6..577865b09710 100644
--- a/x11-plugins/epplets/epplets-0.9.ebuild
+++ b/x11-plugins/epplets/epplets-0.9.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-plugins/epplets/epplets-0.9.ebuild,v 1.2 2006/07/15 05:38:16 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/epplets/epplets-0.9.ebuild,v 1.3 2007/07/22 05:38:11 dberkholz Exp $
 
 DESCRIPTION="Base files for Enlightenment epplets and some epplets"
 HOMEPAGE="http://www.enlightenment.org/"
@@ -11,13 +11,15 @@ SLOT="0"
 KEYWORDS="alpha amd64 ppc sparc x86"
 IUSE="esd"
 
-RDEPEND="|| ( ( x11-libs/libX11 x11-libs/libXext ) virtual/x11 )
+RDEPEND="x11-libs/libX11
+	x11-libs/libXext
 	virtual/glut
 	esd? ( media-sound/esound )
 	media-libs/imlib2
 	>=x11-wm/enlightenment-0.16.4"
 DEPEND="${RDEPEND}
-	|| ( ( x11-proto/xproto x11-proto/xextproto ) virtual/x11 )"
+	x11-proto/xproto
+	x11-proto/xextproto"
 
 src_install() {
 	make DESTDIR="${D}" install || die
diff --git a/x11-plugins/fsviewer/ChangeLog b/x11-plugins/fsviewer/ChangeLog
index d5291d611420..a703e76d29e3 100644
--- a/x11-plugins/fsviewer/ChangeLog
+++ b/x11-plugins/fsviewer/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-plugins/fsviewer
-# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/fsviewer/ChangeLog,v 1.14 2007/01/26 17:16:00 s4t4n Exp $
+# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/fsviewer/ChangeLog,v 1.15 2007/07/22 05:36:37 dberkholz Exp $
+
+  22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>;
+  fsviewer-0.2.5.ebuild:
+  Drop virtual/x11 references.
 
   26 Jan 2006; Michele Noberasco <s4t4n@gentoo.org> fsviewer-0.2.5.ebuild:
   Fixed DEPEND. Closes bug #150634.
diff --git a/x11-plugins/fsviewer/fsviewer-0.2.5.ebuild b/x11-plugins/fsviewer/fsviewer-0.2.5.ebuild
index 25ca22af4e9b..46636f18bb31 100644
--- a/x11-plugins/fsviewer/fsviewer-0.2.5.ebuild
+++ b/x11-plugins/fsviewer/fsviewer-0.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/x11-plugins/fsviewer/fsviewer-0.2.5.ebuild,v 1.6 2007/01/26 17:16:00 s4t4n Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/fsviewer/fsviewer-0.2.5.ebuild,v 1.7 2007/07/22 05:36:37 dberkholz Exp $
 
 inherit eutils
 
@@ -17,22 +17,20 @@ KEYWORDS="amd64 ppc x86"
 IUSE=""
 
 DEPEND=">=x11-wm/windowmaker-0.92.0-r3
-	|| ( (
-		x11-libs/libX11
-		x11-libs/libXft
-		x11-libs/libXmu
-		x11-libs/libPropList
-		x11-libs/libXpm
-		x11-libs/libXext
-		x11-libs/libXrender
-		x11-libs/libXt
-		x11-libs/libSM
-		x11-libs/libICE
-		x11-libs/libXau
-		x11-libs/libXdmcp
-		x11-proto/xproto
-		x11-proto/xextproto )
-	virtual/x11 )
+	x11-libs/libX11
+	x11-libs/libXft
+	x11-libs/libXmu
+	x11-libs/libPropList
+	x11-libs/libXpm
+	x11-libs/libXext
+	x11-libs/libXrender
+	x11-libs/libXt
+	x11-libs/libSM
+	x11-libs/libICE
+	x11-libs/libXau
+	x11-libs/libXdmcp
+	x11-proto/xproto
+	x11-proto/xextproto
 	media-libs/tiff
 	media-libs/libpng
 	media-libs/jpeg
diff --git a/x11-plugins/wmCalClock/ChangeLog b/x11-plugins/wmCalClock/ChangeLog
index e4c013c82aa9..1ce57a17b5a0 100644
--- a/x11-plugins/wmCalClock/ChangeLog
+++ b/x11-plugins/wmCalClock/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-plugins/wmCalClock
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmCalClock/ChangeLog,v 1.14 2007/02/06 01:50:06 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmCalClock/ChangeLog,v 1.15 2007/07/22 05:35:48 dberkholz Exp $
+
+  22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>;
+  wmCalClock-1.25-r1.ebuild:
+  Drop virtual/x11 references.
 
   06 Feb 2007; Diego Pettenò <flameeyes@gentoo.org> ChangeLog:
   Regenerate digest in Manifest2 format.
diff --git a/x11-plugins/wmCalClock/wmCalClock-1.25-r1.ebuild b/x11-plugins/wmCalClock/wmCalClock-1.25-r1.ebuild
index 6815ed4770a7..4b07c315c823 100644
--- a/x11-plugins/wmCalClock/wmCalClock-1.25-r1.ebuild
+++ b/x11-plugins/wmCalClock/wmCalClock-1.25-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-plugins/wmCalClock/wmCalClock-1.25-r1.ebuild,v 1.16 2006/01/22 11:31:03 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmCalClock/wmCalClock-1.25-r1.ebuild,v 1.17 2007/07/22 05:35:48 dberkholz Exp $
 
 IUSE=""
 
@@ -8,16 +8,12 @@ DESCRIPTION="WMaker DockApp: A Calendar clock with antialiased text."
 SRC_URI="http://nis-www.lanl.gov/~mgh/WindowMaker/${P}.tar.gz"
 HOMEPAGE="http://nis-www.lanl.gov/~mgh/WindowMaker/DockApps.shtml"
 
-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/xproto
-		x11-proto/xextproto )
-	virtual/x11 )"
+	x11-proto/xproto
+	x11-proto/xextproto"
 
 SLOT="0"
 LICENSE="GPL-2"
diff --git a/x11-plugins/wmMatrix/ChangeLog b/x11-plugins/wmMatrix/ChangeLog
index 50cab642ba2d..c7ba68f4bfbd 100644
--- a/x11-plugins/wmMatrix/ChangeLog
+++ b/x11-plugins/wmMatrix/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for x11-plugins/wmMatrix
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmMatrix/ChangeLog,v 1.11 2007/02/06 01:51:10 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmMatrix/ChangeLog,v 1.12 2007/07/22 05:35:02 dberkholz Exp $
+
+  22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>; wmMatrix-0.2.ebuild:
+  Drop virtual/x11 references.
 
   06 Feb 2007; Diego Pettenò <flameeyes@gentoo.org> ChangeLog:
   Regenerate digest in Manifest2 format.
diff --git a/x11-plugins/wmMatrix/wmMatrix-0.2.ebuild b/x11-plugins/wmMatrix/wmMatrix-0.2.ebuild
index 71d2b2fef771..9c4677550dfd 100644
--- a/x11-plugins/wmMatrix/wmMatrix-0.2.ebuild
+++ b/x11-plugins/wmMatrix/wmMatrix-0.2.ebuild
@@ -1,22 +1,18 @@
-# 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-plugins/wmMatrix/wmMatrix-0.2.ebuild,v 1.12 2006/01/22 11:51:25 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmMatrix/wmMatrix-0.2.ebuild,v 1.13 2007/07/22 05:35:02 dberkholz Exp $
 
 IUSE=""
 DESCRIPTION="WMaker DockApp: Slightly modified version of Jamie Zawinski's xmatrix screenhack."
 SRC_URI="http://www.dockapps.org/download.php/id/17/${P}.tar.gz"
 HOMEPAGE="http://www.dockapps.org/file.php/id/10"
 
-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/xproto
-		x11-proto/xextproto )
-	virtual/x11 )"
+	x11-proto/xproto
+	x11-proto/xextproto"
 
 SLOT="0"
 LICENSE="GPL-2"
diff --git a/x11-plugins/wmMoonClock/ChangeLog b/x11-plugins/wmMoonClock/ChangeLog
index bd515da604f5..4174403f2c85 100644
--- a/x11-plugins/wmMoonClock/ChangeLog
+++ b/x11-plugins/wmMoonClock/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-plugins/wmMoonClock
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmMoonClock/ChangeLog,v 1.8 2007/02/06 01:51:43 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmMoonClock/ChangeLog,v 1.9 2007/07/22 05:34:11 dberkholz Exp $
+
+  22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>;
+  wmMoonClock-1.27.ebuild:
+  Drop virtual/x11 references.
 
   06 Feb 2007; Diego Pettenò <flameeyes@gentoo.org> ChangeLog:
   Regenerate digest in Manifest2 format.
diff --git a/x11-plugins/wmMoonClock/wmMoonClock-1.27.ebuild b/x11-plugins/wmMoonClock/wmMoonClock-1.27.ebuild
index 112612502641..6e46079a7c8c 100644
--- a/x11-plugins/wmMoonClock/wmMoonClock-1.27.ebuild
+++ b/x11-plugins/wmMoonClock/wmMoonClock-1.27.ebuild
@@ -1,22 +1,18 @@
-# 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-plugins/wmMoonClock/wmMoonClock-1.27.ebuild,v 1.13 2006/01/22 11:55:13 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmMoonClock/wmMoonClock-1.27.ebuild,v 1.14 2007/07/22 05:34:11 dberkholz Exp $
 
 IUSE=""
 DESCRIPTION="dockapp that shows lunar ephemeris to a high accuracy."
 SRC_URI="http://nis-www.lanl.gov/~mgh/WindowMaker/${P}.tar.gz"
 HOMEPAGE="http://nis-www.lanl.gov/~mgh/WindowMaker/DockApps.shtml"
 
-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/xproto
-		x11-proto/xextproto )
-	virtual/x11 )"
+	x11-proto/xproto
+	x11-proto/xextproto"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/x11-plugins/wmSMPmon/ChangeLog b/x11-plugins/wmSMPmon/ChangeLog
index 8ae7d0b11326..ba4e2672864a 100644
--- a/x11-plugins/wmSMPmon/ChangeLog
+++ b/x11-plugins/wmSMPmon/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-plugins/wmSMPmon
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmSMPmon/ChangeLog,v 1.14 2007/06/29 14:38:13 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmSMPmon/ChangeLog,v 1.15 2007/07/22 05:33:14 dberkholz Exp $
+
+  22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>; wmSMPmon-2.3.ebuild,
+  wmSMPmon-3.1.ebuild:
+  Drop virtual/x11 references.
 
   29 Jun 2007; Christoph Mende <angelos@gentoo.org> wmSMPmon-3.1.ebuild:
   Stable on amd64 wrt bug #183655
diff --git a/x11-plugins/wmSMPmon/wmSMPmon-2.3.ebuild b/x11-plugins/wmSMPmon/wmSMPmon-2.3.ebuild
index 0a6bdb31febb..985ad1e9521a 100644
--- a/x11-plugins/wmSMPmon/wmSMPmon-2.3.ebuild
+++ b/x11-plugins/wmSMPmon/wmSMPmon-2.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-plugins/wmSMPmon/wmSMPmon-2.3.ebuild,v 1.5 2006/01/22 12:05:43 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmSMPmon/wmSMPmon-2.3.ebuild,v 1.6 2007/07/22 05:33:14 dberkholz Exp $
 
 IUSE=""
 DESCRIPTION="SMP system monitor dockapp"
@@ -11,13 +11,11 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="x86 amd64"
 
-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"
 
 S="${WORKDIR}/${PN}-2.x/${PN}"
 
diff --git a/x11-plugins/wmSMPmon/wmSMPmon-3.1.ebuild b/x11-plugins/wmSMPmon/wmSMPmon-3.1.ebuild
index c9e22029c09a..e7c067f883fa 100644
--- a/x11-plugins/wmSMPmon/wmSMPmon-3.1.ebuild
+++ b/x11-plugins/wmSMPmon/wmSMPmon-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-plugins/wmSMPmon/wmSMPmon-3.1.ebuild,v 1.3 2007/06/29 14:38:13 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmSMPmon/wmSMPmon-3.1.ebuild,v 1.4 2007/07/22 05:33:14 dberkholz Exp $
 
 IUSE=""
 DESCRIPTION="SMP system monitor dockapp"
@@ -11,13 +11,11 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 x86"
 
-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"
 
 S="${WORKDIR}/${P}/${PN}"
 
diff --git a/x11-plugins/wmSpaceWeather/ChangeLog b/x11-plugins/wmSpaceWeather/ChangeLog
index ca46cdec2ea6..0ae615834d23 100644
--- a/x11-plugins/wmSpaceWeather/ChangeLog
+++ b/x11-plugins/wmSpaceWeather/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-plugins/wmSpaceWeather
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmSpaceWeather/ChangeLog,v 1.10 2007/02/06 01:52:14 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmSpaceWeather/ChangeLog,v 1.11 2007/07/22 05:32:16 dberkholz Exp $
+
+  22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>;
+  wmSpaceWeather-1.04.ebuild:
+  Drop virtual/x11 references.
 
   06 Feb 2007; Diego Pettenò <flameeyes@gentoo.org> ChangeLog:
   Regenerate digest in Manifest2 format.
diff --git a/x11-plugins/wmSpaceWeather/wmSpaceWeather-1.04.ebuild b/x11-plugins/wmSpaceWeather/wmSpaceWeather-1.04.ebuild
index a28b2ebda866..bdf947b20aff 100644
--- a/x11-plugins/wmSpaceWeather/wmSpaceWeather-1.04.ebuild
+++ b/x11-plugins/wmSpaceWeather/wmSpaceWeather-1.04.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-plugins/wmSpaceWeather/wmSpaceWeather-1.04.ebuild,v 1.14 2006/01/22 12:08:21 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmSpaceWeather/wmSpaceWeather-1.04.ebuild,v 1.15 2007/07/22 05:32:16 dberkholz Exp $
 
 inherit eutils
 
@@ -13,16 +13,12 @@ SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="x86 amd64 ~mips hppa ppc ~sparc"
 
-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/xproto
-		x11-proto/xextproto )
-	virtual/x11 )"
+	x11-proto/xproto
+	x11-proto/xextproto"
 
 src_compile() {
 	epatch ${FILESDIR}/getkp.patch
diff --git a/x11-plugins/wmSun/ChangeLog b/x11-plugins/wmSun/ChangeLog
index 0e80f0d050ad..237692c56715 100644
--- a/x11-plugins/wmSun/ChangeLog
+++ b/x11-plugins/wmSun/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for x11-plugins/wmSun
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmSun/ChangeLog,v 1.7 2007/02/06 01:52:45 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmSun/ChangeLog,v 1.8 2007/07/22 05:31:27 dberkholz Exp $
+
+  22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>; wmSun-1.03.ebuild:
+  Drop virtual/x11 references.
 
   06 Feb 2007; Diego Pettenò <flameeyes@gentoo.org> ChangeLog:
   Regenerate digest in Manifest2 format.
diff --git a/x11-plugins/wmSun/wmSun-1.03.ebuild b/x11-plugins/wmSun/wmSun-1.03.ebuild
index 0c25ea72a3e2..c56c8d7846ef 100644
--- a/x11-plugins/wmSun/wmSun-1.03.ebuild
+++ b/x11-plugins/wmSun/wmSun-1.03.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-plugins/wmSun/wmSun-1.03.ebuild,v 1.11 2006/01/22 12:11:11 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmSun/wmSun-1.03.ebuild,v 1.12 2007/07/22 05:31:27 dberkholz Exp $
 
 IUSE=""
 
@@ -12,16 +12,12 @@ SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="x86 amd64 ~mips ppc ~sparc"
 
-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/xproto
-		x11-proto/xextproto )
-	virtual/x11 )"
+	x11-proto/xproto
+	x11-proto/xextproto"
 
 src_compile() {
 	emake -C wmSun clean || die "make clean failed"
diff --git a/x11-plugins/wmacpiload-ac/ChangeLog b/x11-plugins/wmacpiload-ac/ChangeLog
index 1de7d36f81f7..5b7bd7debc8f 100644
--- a/x11-plugins/wmacpiload-ac/ChangeLog
+++ b/x11-plugins/wmacpiload-ac/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-plugins/wmacpiload-ac
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmacpiload-ac/ChangeLog,v 1.6 2007/02/06 01:53:14 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmacpiload-ac/ChangeLog,v 1.7 2007/07/22 05:30:36 dberkholz Exp $
+
+  22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>;
+  wmacpiload-ac-0.1.2_p3.ebuild:
+  Drop virtual/x11 references.
 
   06 Feb 2007; Diego Pettenò <flameeyes@gentoo.org> ChangeLog:
   Regenerate digest in Manifest2 format.
diff --git a/x11-plugins/wmacpiload-ac/wmacpiload-ac-0.1.2_p3.ebuild b/x11-plugins/wmacpiload-ac/wmacpiload-ac-0.1.2_p3.ebuild
index 399b4b0c3198..2fc2c4b549b9 100644
--- a/x11-plugins/wmacpiload-ac/wmacpiload-ac-0.1.2_p3.ebuild
+++ b/x11-plugins/wmacpiload-ac/wmacpiload-ac-0.1.2_p3.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-plugins/wmacpiload-ac/wmacpiload-ac-0.1.2_p3.ebuild,v 1.5 2006/01/22 12:14:11 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmacpiload-ac/wmacpiload-ac-0.1.2_p3.ebuild,v 1.6 2007/07/22 05:30:36 dberkholz Exp $
 
 MY_P="wmacpiload-0.1.2-ac3"
 
@@ -12,14 +12,12 @@ SRC_URI="http://perso.wanadoo.fr/acarriou/wmacpiload/${MY_P}.tar.bz2"
 # it has a new homepage, but the src_uri is still from the old one. change this
 # at the next version bump
 
-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 virtual/x11 )"
+	x11-proto/xextproto"
 
 SLOT="0"
 LICENSE="GPL-2"
diff --git a/x11-plugins/wmacpimon/ChangeLog b/x11-plugins/wmacpimon/ChangeLog
index f019c0d0b00b..f2387f249473 100644
--- a/x11-plugins/wmacpimon/ChangeLog
+++ b/x11-plugins/wmacpimon/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-plugins/wmacpimon
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmacpimon/ChangeLog,v 1.6 2007/04/28 17:50:17 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmacpimon/ChangeLog,v 1.7 2007/07/22 05:29:57 dberkholz Exp $
+
+  22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>;
+  wmacpimon-0.2.1.ebuild:
+  Drop virtual/x11 references.
 
   28 Apr 2007; Sven Wegener <swegener@gentoo.org> wmacpimon-0.2.1.ebuild:
   Fix *initd, *confd and *envd calls (#173884, #174266)
diff --git a/x11-plugins/wmacpimon/wmacpimon-0.2.1.ebuild b/x11-plugins/wmacpimon/wmacpimon-0.2.1.ebuild
index 7b2c2ba0f974..83d1c9805a28 100644
--- a/x11-plugins/wmacpimon/wmacpimon-0.2.1.ebuild
+++ b/x11-plugins/wmacpimon/wmacpimon-0.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-plugins/wmacpimon/wmacpimon-0.2.1.ebuild,v 1.5 2007/04/28 17:50:17 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmacpimon/wmacpimon-0.2.1.ebuild,v 1.6 2007/07/22 05:29:57 dberkholz Exp $
 
 inherit eutils
 
@@ -14,16 +14,12 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="x86"
 
-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/xproto
-		x11-proto/xextproto )
-	virtual/x11 )"
+	x11-proto/xproto
+	x11-proto/xextproto"
 
 src_unpack()
 {
diff --git a/x11-plugins/wmalms/ChangeLog b/x11-plugins/wmalms/ChangeLog
index 51fb7262771a..b8e6afcfc5d1 100644
--- a/x11-plugins/wmalms/ChangeLog
+++ b/x11-plugins/wmalms/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-plugins/wmalms
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmalms/ChangeLog,v 1.9 2007/02/06 01:54:09 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmalms/ChangeLog,v 1.10 2007/07/22 05:29:19 dberkholz Exp $
+
+  22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>;
+  wmalms-1.0.0a-r1.ebuild:
+  Drop virtual/x11 references.
 
   06 Feb 2007; Diego Pettenò <flameeyes@gentoo.org> ChangeLog:
   Regenerate digest in Manifest2 format.
diff --git a/x11-plugins/wmalms/wmalms-1.0.0a-r1.ebuild b/x11-plugins/wmalms/wmalms-1.0.0a-r1.ebuild
index 0ed36b99ff2a..72d0b33b0fa2 100644
--- a/x11-plugins/wmalms/wmalms-1.0.0a-r1.ebuild
+++ b/x11-plugins/wmalms/wmalms-1.0.0a-r1.ebuild
@@ -1,22 +1,18 @@
-# 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-plugins/wmalms/wmalms-1.0.0a-r1.ebuild,v 1.10 2006/01/22 12:25:19 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmalms/wmalms-1.0.0a-r1.ebuild,v 1.11 2007/07/22 05:29:19 dberkholz Exp $
 
 IUSE=""
 DESCRIPTION="wmalms X-windows hardware sensors applet"
 HOMEPAGE="http://www.geocities.com/wmalms"
 SRC_URI="http://www.geocities.com/wmalms/wmalms-1.0.0a.tar.gz"
 
-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/xproto
-		x11-proto/xextproto )
-	virtual/x11 )
+	x11-proto/xproto
+	x11-proto/xextproto
 	sys-apps/lm_sensors"
 
 LICENSE="GPL-2"
diff --git a/x11-plugins/wmapm/ChangeLog b/x11-plugins/wmapm/ChangeLog
index 2d1006a38954..beeb838e6134 100644
--- a/x11-plugins/wmapm/ChangeLog
+++ b/x11-plugins/wmapm/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for x11-plugins/wmapm
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmapm/ChangeLog,v 1.10 2007/02/06 01:54:38 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmapm/ChangeLog,v 1.11 2007/07/22 05:28:39 dberkholz Exp $
+
+  22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>; wmapm-3.1-r1.ebuild:
+  Drop virtual/x11 references.
 
   06 Feb 2007; Diego Pettenò <flameeyes@gentoo.org> ChangeLog:
   Regenerate digest in Manifest2 format.
diff --git a/x11-plugins/wmapm/wmapm-3.1-r1.ebuild b/x11-plugins/wmapm/wmapm-3.1-r1.ebuild
index 39f5969a0f73..c075906f55d7 100644
--- a/x11-plugins/wmapm/wmapm-3.1-r1.ebuild
+++ b/x11-plugins/wmapm/wmapm-3.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-plugins/wmapm/wmapm-3.1-r1.ebuild,v 1.12 2006/01/22 12:29:30 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmapm/wmapm-3.1-r1.ebuild,v 1.13 2007/07/22 05:28:39 dberkholz Exp $
 
 IUSE=""
 S=${WORKDIR}/${P}/${PN}
@@ -12,16 +12,12 @@ SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="x86 sparc amd64 ppc"
 
-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/xproto
-		x11-proto/xextproto )
-	virtual/x11 )"
+	x11-proto/xproto
+	x11-proto/xextproto"
 
 src_install () {
 	cd ${S}
diff --git a/x11-plugins/wmapmload/ChangeLog b/x11-plugins/wmapmload/ChangeLog
index e124ec2a0c9e..2f2a29c5d41b 100644
--- a/x11-plugins/wmapmload/ChangeLog
+++ b/x11-plugins/wmapmload/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-plugins/wmapmload
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmapmload/ChangeLog,v 1.11 2007/02/06 01:55:07 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmapmload/ChangeLog,v 1.12 2007/07/22 05:27:17 dberkholz Exp $
+
+  22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>;
+  wmapmload-0.3.3.ebuild:
+  Drop virtual/x11 references.
 
   06 Feb 2007; Diego Pettenò <flameeyes@gentoo.org> ChangeLog:
   Regenerate digest in Manifest2 format.
diff --git a/x11-plugins/wmapmload/wmapmload-0.3.3.ebuild b/x11-plugins/wmapmload/wmapmload-0.3.3.ebuild
index bdc3e7259e04..f976a97240f7 100644
--- a/x11-plugins/wmapmload/wmapmload-0.3.3.ebuild
+++ b/x11-plugins/wmapmload/wmapmload-0.3.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-plugins/wmapmload/wmapmload-0.3.3.ebuild,v 1.6 2006/01/22 12:39:39 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmapmload/wmapmload-0.3.3.ebuild,v 1.7 2007/07/22 05:27:17 dberkholz Exp $
 
 IUSE=""
 DESCRIPTION="dockapp that monitors your apm battery status."
@@ -11,14 +11,12 @@ SLOT="0"
 KEYWORDS="x86 amd64 ~ppc"
 LICENSE="GPL-2"
 
-RDEPEND="|| ( (
-		x11-libs/libX11
-		x11-libs/libXext
-		x11-libs/libXt
-		x11-libs/libXpm )
-	virtual/x11 )"
+RDEPEND="x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXt
+	x11-libs/libXpm"
 DEPEND="${RDEPEND}
-	|| ( x11-proto/xextproto virtual/x11 )"
+	x11-proto/xextproto"
 
 src_compile() {
 
diff --git a/x11-plugins/wmappl/ChangeLog b/x11-plugins/wmappl/ChangeLog
index 0936e8fbe551..6f9c495c4cf3 100644
--- a/x11-plugins/wmappl/ChangeLog
+++ b/x11-plugins/wmappl/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for x11-plugins/wmappl
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmappl/ChangeLog,v 1.13 2007/02/06 01:55:36 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmappl/ChangeLog,v 1.14 2007/07/22 05:26:35 dberkholz Exp $
+
+  22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>; wmappl-0.71.ebuild:
+  Drop virtual/x11 references.
 
   06 Feb 2007; Diego Pettenò <flameeyes@gentoo.org> ChangeLog:
   Regenerate digest in Manifest2 format.
diff --git a/x11-plugins/wmappl/wmappl-0.71.ebuild b/x11-plugins/wmappl/wmappl-0.71.ebuild
index 819e423387a3..608188c6a5a1 100644
--- a/x11-plugins/wmappl/wmappl-0.71.ebuild
+++ b/x11-plugins/wmappl/wmappl-0.71.ebuild
@@ -1,20 +1,18 @@
-# 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-plugins/wmappl/wmappl-0.71.ebuild,v 1.6 2006/01/22 13:33:36 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmappl/wmappl-0.71.ebuild,v 1.7 2007/07/22 05:26:35 dberkholz Exp $
 
 IUSE=""
 DESCRIPTION="Simple application launcher for the Window Maker dock."
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 HOMEPAGE="http://wmappl.sourceforge.net/"
 
-RDEPEND="|| ( (
-		x11-libs/libX11
-		x11-libs/libXext
-		x11-libs/libXt
-		x11-libs/libXpm )
-	virtual/x11 )"
+RDEPEND="x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXt
+	x11-libs/libXpm"
 DEPEND="${RDEPEND}
-	|| ( x11-proto/xextproto virtual/x11 )"
+	x11-proto/xextproto"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/x11-plugins/wmbatteries/ChangeLog b/x11-plugins/wmbatteries/ChangeLog
index 3be812b293d3..4bc424ef7603 100644
--- a/x11-plugins/wmbatteries/ChangeLog
+++ b/x11-plugins/wmbatteries/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-plugins/wmbatteries
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmbatteries/ChangeLog,v 1.4 2007/02/06 01:56:07 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmbatteries/ChangeLog,v 1.5 2007/07/22 05:25:35 dberkholz Exp $
+
+  22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>;
+  wmbatteries-0.1.3.ebuild:
+  Drop virtual/x11 references.
 
   06 Feb 2007; Diego Pettenò <flameeyes@gentoo.org> ChangeLog:
   Regenerate digest in Manifest2 format.
diff --git a/x11-plugins/wmbatteries/wmbatteries-0.1.3.ebuild b/x11-plugins/wmbatteries/wmbatteries-0.1.3.ebuild
index 3f8196c846ef..000afb9d3e37 100644
--- a/x11-plugins/wmbatteries/wmbatteries-0.1.3.ebuild
+++ b/x11-plugins/wmbatteries/wmbatteries-0.1.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-plugins/wmbatteries/wmbatteries-0.1.3.ebuild,v 1.3 2006/01/24 22:15:05 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmbatteries/wmbatteries-0.1.3.ebuild,v 1.4 2007/07/22 05:25:35 dberkholz Exp $
 
 inherit eutils
 
@@ -12,14 +12,12 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="x86"
 
-RDEPEND="|| ( (
-		x11-libs/libX11
-		x11-libs/libXext
-		x11-libs/libXt
-		x11-libs/libXpm )
-	virtual/x11 )"
+RDEPEND="x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXt
+	x11-libs/libXpm"
 DEPEND="${RDEPEND}
-	|| ( x11-proto/xextproto virtual/x11 )"
+	x11-proto/xextproto"
 
 src_install() {
 	einstall || die "Installation failed"
diff --git a/x11-plugins/wmbattery/ChangeLog b/x11-plugins/wmbattery/ChangeLog
index 38d2e4909e8f..67623e3ccd5a 100644
--- a/x11-plugins/wmbattery/ChangeLog
+++ b/x11-plugins/wmbattery/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-plugins/wmbattery
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmbattery/ChangeLog,v 1.17 2007/02/06 01:56:39 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmbattery/ChangeLog,v 1.18 2007/07/22 05:24:51 dberkholz Exp $
+
+  22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>;
+  wmbattery-2.19-r1.ebuild:
+  Drop virtual/x11 references.
 
   06 Feb 2007; Diego Pettenò <flameeyes@gentoo.org> ChangeLog:
   Regenerate digest in Manifest2 format.
diff --git a/x11-plugins/wmbattery/wmbattery-2.19-r1.ebuild b/x11-plugins/wmbattery/wmbattery-2.19-r1.ebuild
index ccea38fb3a3f..cd5faeb994ae 100644
--- a/x11-plugins/wmbattery/wmbattery-2.19-r1.ebuild
+++ b/x11-plugins/wmbattery/wmbattery-2.19-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-plugins/wmbattery/wmbattery-2.19-r1.ebuild,v 1.6 2006/01/24 22:18:27 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmbattery/wmbattery-2.19-r1.ebuild,v 1.7 2007/07/22 05:24:51 dberkholz Exp $
 
 inherit eutils
 
@@ -17,14 +17,12 @@ LICENSE="GPL-2"
 KEYWORDS="x86 amd64 -sparc ~ppc"
 
 RDEPEND="sys-apps/apmd
-	|| ( (
-		x11-libs/libX11
-		x11-libs/libXext
-		x11-libs/libXt
-		x11-libs/libXpm )
-	virtual/x11 )"
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXt
+	x11-libs/libXpm"
 DEPEND="${RDEPEND}
-	|| ( x11-proto/xextproto virtual/x11 )"
+	x11-proto/xextproto"
 
 src_compile() {
 	econf || die "Configuration failed"
diff --git a/x11-plugins/wmbiff/ChangeLog b/x11-plugins/wmbiff/ChangeLog
index 6e9ca959f5f7..5f932ad32f19 100644
--- a/x11-plugins/wmbiff/ChangeLog
+++ b/x11-plugins/wmbiff/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-plugins/wmbiff
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmbiff/ChangeLog,v 1.26 2007/02/21 23:32:38 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmbiff/ChangeLog,v 1.27 2007/07/22 05:24:06 dberkholz Exp $
+
+  22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>; wmbiff-0.4.25.ebuild,
+  wmbiff-0.4.25-r1.ebuild, wmbiff-0.4.27.ebuild:
+  Drop virtual/x11 references.
 
   21 Feb 2007; Markus Ullmann <jokey@gentoo.org> ChangeLog:
   Redigest for Manifest2
diff --git a/x11-plugins/wmbiff/wmbiff-0.4.25-r1.ebuild b/x11-plugins/wmbiff/wmbiff-0.4.25-r1.ebuild
index 152372f60ce2..3d9d7fe42db7 100644
--- a/x11-plugins/wmbiff/wmbiff-0.4.25-r1.ebuild
+++ b/x11-plugins/wmbiff/wmbiff-0.4.25-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-plugins/wmbiff/wmbiff-0.4.25-r1.ebuild,v 1.5 2006/01/31 21:20:02 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmbiff/wmbiff-0.4.25-r1.ebuild,v 1.6 2007/07/22 05:24:06 dberkholz Exp $
 
 inherit eutils
 
@@ -8,16 +8,12 @@ DESCRIPTION="WMBiff is a dock applet for WindowMaker which can monitor up to 5 m
 SRC_URI="mirror://sourceforge/wmbiff/${P}.tar.gz"
 HOMEPAGE="http://sourceforge.net/projects/wmbiff/"
 
-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/xproto
-		x11-proto/xextproto )
-	virtual/x11 )
+	x11-proto/xproto
+	x11-proto/xextproto
 	crypt? ( >=net-libs/gnutls-1.0.4
 		>=dev-libs/libgcrypt-1.1.94 )"
 
diff --git a/x11-plugins/wmbiff/wmbiff-0.4.25.ebuild b/x11-plugins/wmbiff/wmbiff-0.4.25.ebuild
index 7526bbffeb54..bbab36e718c8 100644
--- a/x11-plugins/wmbiff/wmbiff-0.4.25.ebuild
+++ b/x11-plugins/wmbiff/wmbiff-0.4.25.ebuild
@@ -1,21 +1,17 @@
-# 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-plugins/wmbiff/wmbiff-0.4.25.ebuild,v 1.7 2006/01/31 21:20:02 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmbiff/wmbiff-0.4.25.ebuild,v 1.8 2007/07/22 05:24:06 dberkholz Exp $
 
 DESCRIPTION="WMBiff is a dock applet for WindowMaker which can monitor up to 5 mailboxes."
 SRC_URI="mirror://sourceforge/wmbiff/${P}.tar.gz"
 HOMEPAGE="http://sourceforge.net/projects/wmbiff/"
 
-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/xproto
-		x11-proto/xextproto )
-	virtual/x11 )
+	x11-proto/xproto
+	x11-proto/xextproto
 	crypt? ( >=net-libs/gnutls-1.0.4
 		>=dev-libs/libgcrypt-1.1.94 )"
 
diff --git a/x11-plugins/wmbiff/wmbiff-0.4.27.ebuild b/x11-plugins/wmbiff/wmbiff-0.4.27.ebuild
index 517f32d8885d..880f91d9930a 100644
--- a/x11-plugins/wmbiff/wmbiff-0.4.27.ebuild
+++ b/x11-plugins/wmbiff/wmbiff-0.4.27.ebuild
@@ -1,21 +1,17 @@
-# 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-plugins/wmbiff/wmbiff-0.4.27.ebuild,v 1.5 2006/03/22 22:18:51 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmbiff/wmbiff-0.4.27.ebuild,v 1.6 2007/07/22 05:24:06 dberkholz Exp $
 
 DESCRIPTION="WMBiff is a dock applet for WindowMaker which can monitor up to 5 mailboxes."
 SRC_URI="mirror://sourceforge/wmbiff/${P}.tar.gz"
 HOMEPAGE="http://sourceforge.net/projects/wmbiff/"
 
-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/xproto
-		x11-proto/xextproto )
-	virtual/x11 )
+	x11-proto/xproto
+	x11-proto/xextproto
 	crypt? ( >=net-libs/gnutls-1.2.3
 		>=dev-libs/libgcrypt-1.2.1 )"
 
diff --git a/x11-plugins/wmbinclock/ChangeLog b/x11-plugins/wmbinclock/ChangeLog
index 0e6bad6d5d29..ce0e90194adb 100644
--- a/x11-plugins/wmbinclock/ChangeLog
+++ b/x11-plugins/wmbinclock/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-plugins/wmbinclock
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmbinclock/ChangeLog,v 1.10 2007/02/06 01:57:07 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmbinclock/ChangeLog,v 1.11 2007/07/22 05:22:35 dberkholz Exp $
+
+  22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>;
+  wmbinclock-0.3.ebuild:
+  Drop virtual/x11 references.
 
   06 Feb 2007; Diego Pettenò <flameeyes@gentoo.org> ChangeLog:
   Regenerate digest in Manifest2 format.
diff --git a/x11-plugins/wmbinclock/wmbinclock-0.3.ebuild b/x11-plugins/wmbinclock/wmbinclock-0.3.ebuild
index ba5a1667990e..8be013269d93 100644
--- a/x11-plugins/wmbinclock/wmbinclock-0.3.ebuild
+++ b/x11-plugins/wmbinclock/wmbinclock-0.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-plugins/wmbinclock/wmbinclock-0.3.ebuild,v 1.6 2006/01/24 22:21:17 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmbinclock/wmbinclock-0.3.ebuild,v 1.7 2007/07/22 05:22:35 dberkholz Exp $
 
 IUSE=""
 
@@ -12,16 +12,12 @@ SLOT="0"
 LICENSE="freedist"
 KEYWORDS="x86 amd64 ppc ppc64 ~sparc"
 
-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/xproto
-		x11-proto/xextproto )
-	virtual/x11 )"
+	x11-proto/xproto
+	x11-proto/xextproto"
 
 src_compile()
 {
diff --git a/x11-plugins/wmbio/ChangeLog b/x11-plugins/wmbio/ChangeLog
index c2ebe5e1a9c5..9001ab2215fc 100644
--- a/x11-plugins/wmbio/ChangeLog
+++ b/x11-plugins/wmbio/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for x11-plugins/wmbio
-# Copyright 2001-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmbio/ChangeLog,v 1.12 2006/07/08 03:03:21 squinky86 Exp $
+# Copyright 2001-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmbio/ChangeLog,v 1.13 2007/07/22 05:21:53 dberkholz Exp $
+
+  22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>; wmbio-1.02.ebuild:
+  Drop virtual/x11 references.
 
   08 Jul 2006; Jon Hood <squinky86@gentoo.org> wmbio-1.02.ebuild:
   Adding ~amd64, bug #120555.
diff --git a/x11-plugins/wmbio/wmbio-1.02.ebuild b/x11-plugins/wmbio/wmbio-1.02.ebuild
index ca7b672ed9aa..dceec8fe71b2 100644
--- a/x11-plugins/wmbio/wmbio-1.02.ebuild
+++ b/x11-plugins/wmbio/wmbio-1.02.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-plugins/wmbio/wmbio-1.02.ebuild,v 1.7 2006/07/08 03:03:21 squinky86 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmbio/wmbio-1.02.ebuild,v 1.8 2007/07/22 05:21:53 dberkholz Exp $
 
 inherit eutils
 
@@ -10,13 +10,11 @@ DESCRIPTION="a Window Maker applet that shows your biorhythm"
 SRC_URI="http://wmbio.sourceforge.net/${P}.tar.gz"
 HOMEPAGE="http://wmbio.sourceforge.net/"
 
-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"
 
 SLOT="0"
 LICENSE="GPL-2"
diff --git a/x11-plugins/wmbluecpu/ChangeLog b/x11-plugins/wmbluecpu/ChangeLog
index 792f36954d0c..2448783e439e 100644
--- a/x11-plugins/wmbluecpu/ChangeLog
+++ b/x11-plugins/wmbluecpu/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for x11-plugins/wmbluecpu
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmbluecpu/ChangeLog,v 1.12 2007/02/06 01:57:35 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmbluecpu/ChangeLog,v 1.13 2007/07/22 05:21:10 dberkholz Exp $
+
+  22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>; wmbluecpu-0.6.ebuild:
+  Drop virtual/x11 references.
 
   06 Feb 2007; Diego Pettenò <flameeyes@gentoo.org> ChangeLog:
   Regenerate digest in Manifest2 format.
diff --git a/x11-plugins/wmbluecpu/wmbluecpu-0.6.ebuild b/x11-plugins/wmbluecpu/wmbluecpu-0.6.ebuild
index 11ef3bab9401..4d39fc84cf7d 100644
--- a/x11-plugins/wmbluecpu/wmbluecpu-0.6.ebuild
+++ b/x11-plugins/wmbluecpu/wmbluecpu-0.6.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-plugins/wmbluecpu/wmbluecpu-0.6.ebuild,v 1.5 2006/01/24 22:27:37 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmbluecpu/wmbluecpu-0.6.ebuild,v 1.6 2007/07/22 05:21:10 dberkholz Exp $
 
 IUSE=""
 
@@ -12,16 +12,12 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="ppc ~sparc x86"
 
-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/xproto
-		x11-proto/xextproto )
-	virtual/x11 )"
+	x11-proto/xproto
+	x11-proto/xextproto"
 
 src_compile()
 {
diff --git a/x11-plugins/wmbutton/ChangeLog b/x11-plugins/wmbutton/ChangeLog
index d833f4d1cbfe..f33a9b2e3909 100644
--- a/x11-plugins/wmbutton/ChangeLog
+++ b/x11-plugins/wmbutton/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for x11-plugins/wmbutton
-# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmbutton/ChangeLog,v 1.10 2006/10/27 08:36:32 s4t4n Exp $
+# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmbutton/ChangeLog,v 1.11 2007/07/22 05:20:32 dberkholz Exp $
+
+  22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>; wmbutton-0.5.ebuild:
+  Drop virtual/x11 references.
 
   24 Jan 2006; Michele Noberasco <s4t4n@gentoo.org> wmbutton-0.5.ebuild:
   Fixed modular X dependancies. Closes bug #150645
diff --git a/x11-plugins/wmbutton/wmbutton-0.5.ebuild b/x11-plugins/wmbutton/wmbutton-0.5.ebuild
index 998e2becbe0d..ef20ade294a5 100644
--- a/x11-plugins/wmbutton/wmbutton-0.5.ebuild
+++ b/x11-plugins/wmbutton/wmbutton-0.5.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-plugins/wmbutton/wmbutton-0.5.ebuild,v 1.10 2006/10/27 08:36:32 s4t4n Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmbutton/wmbutton-0.5.ebuild,v 1.11 2007/07/22 05:20:32 dberkholz Exp $
 
 inherit eutils
 
@@ -11,14 +11,11 @@ SRC_URI="http://www.dockapps.org/download.php/id/454/${P}.tar.gz
 	mirror://gentoo/${PN}-buttons.xpm"
 HOMEPAGE="http://www.dockapps.org/file.php/id/241"
 
-DEPEND="
-	|| ( (
-		x11-proto/xproto
-		x11-proto/xextproto
-		x11-libs/libX11
-		x11-libs/libXext
-		x11-libs/libXpm )
-	virtual/x11 )"
+DEPEND="x11-proto/xproto
+	x11-proto/xextproto
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXpm"
 
 SLOT="0"
 LICENSE="GPL-2"
diff --git a/x11-plugins/wmcalc/ChangeLog b/x11-plugins/wmcalc/ChangeLog
index de267b8efba9..7b07a11e5e83 100644
--- a/x11-plugins/wmcalc/ChangeLog
+++ b/x11-plugins/wmcalc/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for x11-plugins/wmcalc
-# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmcalc/ChangeLog,v 1.16 2006/10/25 10:44:52 s4t4n Exp $
+# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmcalc/ChangeLog,v 1.17 2007/07/22 05:19:51 dberkholz Exp $
+
+  22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>; wmcalc-0.4.ebuild:
+  Drop virtual/x11 references.
 
   25 Oct 2006; Michele Noberasco <s4t4n@gentoo.org> wmcalc-0.4.ebuild:
   Fixed modular X dependancies. Closes bug #150644.
diff --git a/x11-plugins/wmcalc/wmcalc-0.4.ebuild b/x11-plugins/wmcalc/wmcalc-0.4.ebuild
index 8bb2f43b038f..4e8ffe00eb7a 100644
--- a/x11-plugins/wmcalc/wmcalc-0.4.ebuild
+++ b/x11-plugins/wmcalc/wmcalc-0.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-plugins/wmcalc/wmcalc-0.4.ebuild,v 1.10 2006/10/25 10:44:52 s4t4n Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmcalc/wmcalc-0.4.ebuild,v 1.11 2007/07/22 05:19:51 dberkholz Exp $
 
 inherit eutils
 
@@ -11,14 +11,11 @@ SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="x86 amd64 ppc ppc64 ~sparc"
 
-DEPEND="
-	|| ( (
-		x11-libs/libX11
-		x11-libs/libXext
-		x11-libs/libXpm
-		x11-proto/xproto
-		x11-proto/xextproto )
-	virtual/x11 )"
+DEPEND="x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXpm
+	x11-proto/xproto
+	x11-proto/xextproto"
 
 IUSE=""
 
diff --git a/x11-plugins/wmcdplay/ChangeLog b/x11-plugins/wmcdplay/ChangeLog
index 041be825238c..415d74296b38 100644
--- a/x11-plugins/wmcdplay/ChangeLog
+++ b/x11-plugins/wmcdplay/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-plugins/wmcdplay
-# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmcdplay/ChangeLog,v 1.5 2006/10/16 10:55:11 s4t4n Exp $
+# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmcdplay/ChangeLog,v 1.6 2007/07/22 05:19:12 dberkholz Exp $
+
+  22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>;
+  wmcdplay-1.0_beta1.ebuild:
+  Drop virtual/x11 references.
 
   16 Oct 2006; Michele Noberasco <s4t4n@gentoo.org> wmcdplay-1.0_beta1.ebuild:
   Added missing imake dependancy, Closes bug #150641.
diff --git a/x11-plugins/wmcdplay/wmcdplay-1.0_beta1.ebuild b/x11-plugins/wmcdplay/wmcdplay-1.0_beta1.ebuild
index 1f7d29e273dc..e59672a21cbb 100644
--- a/x11-plugins/wmcdplay/wmcdplay-1.0_beta1.ebuild
+++ b/x11-plugins/wmcdplay/wmcdplay-1.0_beta1.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-plugins/wmcdplay/wmcdplay-1.0_beta1.ebuild,v 1.5 2006/10/16 10:55:11 s4t4n Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmcdplay/wmcdplay-1.0_beta1.ebuild,v 1.6 2007/07/22 05:19:12 dberkholz Exp $
 
 inherit eutils
 
@@ -13,17 +13,13 @@ DESCRIPTION="CD player applet for WindowMaker"
 SRC_URI="http://www.geocities.com/SiliconValley/Vista/2471/files/${MY_P}.tgz"
 HOMEPAGE="http://www.geocities.com/SiliconValley/Vista/2471/"
 
-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/xproto
-		x11-proto/xextproto
-		x11-misc/imake )
-	virtual/x11 )"
+	x11-proto/xproto
+	x11-proto/xextproto
+	x11-misc/imake"
 
 SLOT="0"
 LICENSE="GPL-2"
diff --git a/x11-plugins/wmclock/ChangeLog b/x11-plugins/wmclock/ChangeLog
index 32b24953e9f7..6667bd80758b 100644
--- a/x11-plugins/wmclock/ChangeLog
+++ b/x11-plugins/wmclock/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-plugins/wmclock
-# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmclock/ChangeLog,v 1.8 2006/07/17 08:36:53 s4t4n Exp $
+# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmclock/ChangeLog,v 1.9 2007/07/22 05:18:26 dberkholz Exp $
+
+  22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>;
+  wmclock-1.0.12.2.ebuild:
+  Drop virtual/x11 references.
 
   17 Jul 2006; Michele Noberasco <s4t4n@gentoo.org> wmclock-1.0.12.2.ebuild:
   Added x11-misc/imake to DEPEND. Closes bug #140261.
diff --git a/x11-plugins/wmclock/wmclock-1.0.12.2.ebuild b/x11-plugins/wmclock/wmclock-1.0.12.2.ebuild
index a82f90535d72..313b6e64b4d6 100644
--- a/x11-plugins/wmclock/wmclock-1.0.12.2.ebuild
+++ b/x11-plugins/wmclock/wmclock-1.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-plugins/wmclock/wmclock-1.0.12.2.ebuild,v 1.10 2006/07/17 08:36:53 s4t4n Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmclock/wmclock-1.0.12.2.ebuild,v 1.11 2007/07/22 05:18:26 dberkholz Exp $
 
 IUSE=""
 
@@ -12,17 +12,13 @@ SLOT="0"
 KEYWORDS="x86 amd64 ppc ~sparc"
 LICENSE="GPL-2"
 
-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-misc/gccmakedep
-		x11-proto/xproto
-		x11-proto/xextproto )
-	virtual/x11 )
+	x11-misc/gccmakedep
+	x11-proto/xproto
+	x11-proto/xextproto
 	>=x11-misc/imake-1.0.2"
 
 src_compile() {
diff --git a/x11-plugins/wmclockmon/ChangeLog b/x11-plugins/wmclockmon/ChangeLog
index 062332e4f610..f4833de8299b 100644
--- a/x11-plugins/wmclockmon/ChangeLog
+++ b/x11-plugins/wmclockmon/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-plugins/wmclockmon
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmclockmon/ChangeLog,v 1.24 2007/02/18 16:50:07 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmclockmon/ChangeLog,v 1.25 2007/07/22 05:17:41 dberkholz Exp $
+
+  22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>;
+  wmclockmon-0.8.0-r1.ebuild:
+  Drop virtual/x11 references.
 
   18 Feb 2007; Simon Stelling <blubb@gentoo.org> wmclockmon-0.8.0-r1.ebuild:
   stable on amd64; bug 167020
diff --git a/x11-plugins/wmclockmon/wmclockmon-0.8.0-r1.ebuild b/x11-plugins/wmclockmon/wmclockmon-0.8.0-r1.ebuild
index 40c2ab4fc1d8..e317ad31363b 100644
--- a/x11-plugins/wmclockmon/wmclockmon-0.8.0-r1.ebuild
+++ b/x11-plugins/wmclockmon/wmclockmon-0.8.0-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-plugins/wmclockmon/wmclockmon-0.8.0-r1.ebuild,v 1.7 2007/07/11 20:39:22 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmclockmon/wmclockmon-0.8.0-r1.ebuild,v 1.8 2007/07/22 05:17:41 dberkholz Exp $
 
 WANT_AUTOMAKE="1.4"
 WANT_AUTOCONF="1.4"
@@ -18,20 +18,16 @@ KEYWORDS="amd64 ppc ppc64 sparc x86"
 LICENSE="GPL-2"
 
 RDEPEND="gtk? ( =x11-libs/gtk+-1.2* )
-	|| ( (
-		x11-libs/libX11
-		x11-libs/libXext
-		x11-libs/libXpm
-		x11-libs/libXdmcp
-		x11-libs/libXau )
-	virtual/x11 )"
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXpm
+	x11-libs/libXdmcp
+	x11-libs/libXau"
 
 DEPEND="${RDEPEND}
 	!gtk? ( >=sys-apps/sed-4.1.4-r1 )
-	|| ( (
-		x11-proto/xproto
-		x11-proto/xextproto )
-	virtual/x11 )"
+	x11-proto/xproto
+	x11-proto/xextproto"
 
 src_compile()
 {
diff --git a/x11-plugins/wmcp/ChangeLog b/x11-plugins/wmcp/ChangeLog
index 3a570ee3f911..154a79fc41f0 100644
--- a/x11-plugins/wmcp/ChangeLog
+++ b/x11-plugins/wmcp/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for x11-plugins/wmcp
-# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmcp/ChangeLog,v 1.11 2006/10/18 08:55:32 s4t4n Exp $
+# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmcp/ChangeLog,v 1.12 2007/07/22 05:16:39 dberkholz Exp $
+
+  22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>; wmcp-1.2.8.ebuild:
+  Drop virtual/x11 references.
 
   18 Oct 2006; Michele Noberasco <s4t4n@gentoo.org> wmcp-1.2.8.ebuild:
   Shifted RDEPEND entried to DEPEND. Closes bug #150650.
diff --git a/x11-plugins/wmcp/wmcp-1.2.8.ebuild b/x11-plugins/wmcp/wmcp-1.2.8.ebuild
index 1877c674b0c9..0fd9ef7ec221 100644
--- a/x11-plugins/wmcp/wmcp-1.2.8.ebuild
+++ b/x11-plugins/wmcp/wmcp-1.2.8.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-plugins/wmcp/wmcp-1.2.8.ebuild,v 1.15 2006/10/18 08:55:32 s4t4n Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmcp/wmcp-1.2.8.ebuild,v 1.16 2007/07/22 05:16:39 dberkholz Exp $
 
 inherit eutils
 
@@ -12,14 +12,11 @@ SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="x86 amd64 ia64 ppc ~sparc alpha hppa ~mips"
 
-DEPEND="
-	|| ( (
-		x11-proto/xproto
-		x11-proto/xextproto
-		x11-libs/libX11
-		x11-libs/libXext
-		x11-libs/libXpm )
-	virtual/x11 )"
+DEPEND="x11-proto/xproto
+	x11-proto/xextproto
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXpm"
 
 src_unpack() {
 	unpack ${A}
diff --git a/x11-plugins/wmcpu/ChangeLog b/x11-plugins/wmcpu/ChangeLog
index 0dfd439ca71f..4f1e55cf9342 100644
--- a/x11-plugins/wmcpu/ChangeLog
+++ b/x11-plugins/wmcpu/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for x11-plugins/wmcpu
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmcpu/ChangeLog,v 1.2 2007/04/13 14:30:04 s4t4n Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmcpu/ChangeLog,v 1.3 2007/07/22 05:04:01 dberkholz Exp $
+
+  22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>; wmcpu-1.4.ebuild:
+  Drop virtual/x11 references.
 
   13 Apr 2007; Michele Noberasco <s4t4n@gentoo.org> wmcpu-1.4.ebuild:
   Stable for x86.
diff --git a/x11-plugins/wmcpu/wmcpu-1.4.ebuild b/x11-plugins/wmcpu/wmcpu-1.4.ebuild
index 4e90e1617d9f..65023dbb228d 100644
--- a/x11-plugins/wmcpu/wmcpu-1.4.ebuild
+++ b/x11-plugins/wmcpu/wmcpu-1.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-plugins/wmcpu/wmcpu-1.4.ebuild,v 1.2 2007/04/13 14:30:04 s4t4n Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmcpu/wmcpu-1.4.ebuild,v 1.3 2007/07/22 05:04:01 dberkholz Exp $
 
 inherit flag-o-matic
 
@@ -15,13 +15,11 @@ SLOT="0"
 KEYWORDS="x86"
 IUSE=""
 
-DEPEND="|| ( (
-			x11-libs/libX11
-			x11-libs/libXext
-			x11-libs/libXpm )
-		virtual/x11 )"
+DEPEND="x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXpm"
 RDEPEND="${RDEPEND}
-	|| ( x11-proto/xextproto virtual/x11 )"
+	x11-proto/xextproto"
 
 src_compile() {
 	# We then add the default -Wall from Makefile to CFLAGS
diff --git a/x11-plugins/wmcpuload/ChangeLog b/x11-plugins/wmcpuload/ChangeLog
index aa03e09a333a..a65111c80e7e 100644
--- a/x11-plugins/wmcpuload/ChangeLog
+++ b/x11-plugins/wmcpuload/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-plugins/wmcpuload
-# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmcpuload/ChangeLog,v 1.21 2006/07/17 09:52:13 s4t4n Exp $
+# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmcpuload/ChangeLog,v 1.22 2007/07/22 05:15:50 dberkholz Exp $
+
+  22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>;
+  wmcpuload-1.0.1.ebuild:
+  Drop virtual/x11 references.
 
   17 Jul 2006; Michele Noberasco <s4t4n@gentoo.org> wmcpuload-1.0.1.ebuild:
   Fixed HOMEPAGE and SRC_URI. Closes bug #140294.
diff --git a/x11-plugins/wmcpuload/wmcpuload-1.0.1.ebuild b/x11-plugins/wmcpuload/wmcpuload-1.0.1.ebuild
index e1ff9e791d85..9937b47c9c6b 100644
--- a/x11-plugins/wmcpuload/wmcpuload-1.0.1.ebuild
+++ b/x11-plugins/wmcpuload/wmcpuload-1.0.1.ebuild
@@ -1,20 +1,18 @@
-# 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-plugins/wmcpuload/wmcpuload-1.0.1.ebuild,v 1.17 2007/07/11 20:39:23 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmcpuload/wmcpuload-1.0.1.ebuild,v 1.18 2007/07/22 05:15:50 dberkholz Exp $
 
 IUSE=""
 DESCRIPTION="WMCPULoad is a program to monitor CPU usage."
 HOMEPAGE="http://seiichisato.jp/dockapps/"
 SRC_URI="http://seiichisato.jp/dockapps/src/${P}.tar.bz2"
 
-RDEPEND="|| ( (
-		x11-libs/libX11
-		x11-libs/libXext
-		x11-libs/libXt
-		x11-libs/libXpm )
-	virtual/x11 )"
+RDEPEND="x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXt
+	x11-libs/libXpm"
 DEPEND="${RDEPEND}
-	|| ( x11-proto/xextproto virtual/x11 )"
+	x11-proto/xextproto"
 
 SLOT="0"
 LICENSE="GPL-2"
diff --git a/x11-plugins/wmcube/ChangeLog b/x11-plugins/wmcube/ChangeLog
index a9f8d479f673..a61ff24679c0 100644
--- a/x11-plugins/wmcube/ChangeLog
+++ b/x11-plugins/wmcube/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for x11-plugins/wmcube
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmcube/ChangeLog,v 1.12 2007/02/06 01:59:04 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmcube/ChangeLog,v 1.13 2007/07/22 05:14:57 dberkholz Exp $
+
+  22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>; wmcube-0.98.ebuild:
+  Drop virtual/x11 references.
 
   06 Feb 2007; Diego Pettenò <flameeyes@gentoo.org> ChangeLog:
   Regenerate digest in Manifest2 format.
diff --git a/x11-plugins/wmcube/wmcube-0.98.ebuild b/x11-plugins/wmcube/wmcube-0.98.ebuild
index 93cc154ac028..0a4f1b1b8e56 100644
--- a/x11-plugins/wmcube/wmcube-0.98.ebuild
+++ b/x11-plugins/wmcube/wmcube-0.98.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-plugins/wmcube/wmcube-0.98.ebuild,v 1.12 2006/01/24 22:58:11 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmcube/wmcube-0.98.ebuild,v 1.13 2007/07/22 05:14:57 dberkholz Exp $
 
 DESCRIPTION="a dockapp cpu monitor with spinning 3d objects"
 HOMEPAGE="http://kling.mine.nu/kling/wmcube.htm"
@@ -12,13 +12,11 @@ KEYWORDS="x86 amd64 ~mips ppc ppc64 ~sparc"
 
 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"
 
 S="${WORKDIR}/${P}/wmcube"
 
diff --git a/x11-plugins/wmdf/ChangeLog b/x11-plugins/wmdf/ChangeLog
index 7e65e34b4192..acbc3d5e92fe 100644
--- a/x11-plugins/wmdf/ChangeLog
+++ b/x11-plugins/wmdf/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for x11-plugins/wmdf
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmdf/ChangeLog,v 1.10 2007/02/06 02:00:02 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmdf/ChangeLog,v 1.11 2007/07/22 05:14:12 dberkholz Exp $
+
+  22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>; wmdf-0.1.6-r1.ebuild:
+  Drop virtual/x11 references.
 
   06 Feb 2007; Diego Pettenò <flameeyes@gentoo.org> ChangeLog:
   Regenerate digest in Manifest2 format.
diff --git a/x11-plugins/wmdf/wmdf-0.1.6-r1.ebuild b/x11-plugins/wmdf/wmdf-0.1.6-r1.ebuild
index 16fcecf6e016..f8ffd1110c98 100644
--- a/x11-plugins/wmdf/wmdf-0.1.6-r1.ebuild
+++ b/x11-plugins/wmdf/wmdf-0.1.6-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-plugins/wmdf/wmdf-0.1.6-r1.ebuild,v 1.3 2006/01/22 12:42:46 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmdf/wmdf-0.1.6-r1.ebuild,v 1.4 2007/07/22 05:14:12 dberkholz Exp $
 
 inherit eutils
 
@@ -10,14 +10,12 @@ DESCRIPTION="An app to monitor disk space on partitions"
 SRC_URI="http://dockapps.org/download.php/id/359/${P}.tar.gz"
 HOMEPAGE="http://dockapps.org/file.php/id/175"
 
-RDEPEND="|| ( (
-		x11-libs/libX11
-		x11-libs/libXext
-		x11-libs/libXt
-		x11-libs/libXpm )
-	virtual/x11 )"
+RDEPEND="x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXt
+	x11-libs/libXpm"
 DEPEND="${RDEPEND}
-	|| ( x11-proto/xextproto virtual/x11 )"
+	x11-proto/xextproto"
 
 SLOT="0"
 LICENSE="GPL-2"
diff --git a/x11-plugins/wmdiskmon/ChangeLog b/x11-plugins/wmdiskmon/ChangeLog
index 384737a21965..66ebd704fb55 100644
--- a/x11-plugins/wmdiskmon/ChangeLog
+++ b/x11-plugins/wmdiskmon/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-plugins/wmdiskmon
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmdiskmon/ChangeLog,v 1.10 2007/02/06 02:00:30 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmdiskmon/ChangeLog,v 1.11 2007/07/22 05:13:36 dberkholz Exp $
+
+  22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>;
+  wmdiskmon-0.0.1.ebuild:
+  Drop virtual/x11 references.
 
   06 Feb 2007; Diego Pettenò <flameeyes@gentoo.org> ChangeLog:
   Regenerate digest in Manifest2 format.
diff --git a/x11-plugins/wmdiskmon/wmdiskmon-0.0.1.ebuild b/x11-plugins/wmdiskmon/wmdiskmon-0.0.1.ebuild
index 1833cb41fbf1..aa5126f8424b 100644
--- a/x11-plugins/wmdiskmon/wmdiskmon-0.0.1.ebuild
+++ b/x11-plugins/wmdiskmon/wmdiskmon-0.0.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-plugins/wmdiskmon/wmdiskmon-0.0.1.ebuild,v 1.9 2006/01/24 23:02:45 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmdiskmon/wmdiskmon-0.0.1.ebuild,v 1.10 2007/07/22 05:13:35 dberkholz Exp $
 
 IUSE=""
 
@@ -12,14 +12,12 @@ SLOT="0"
 KEYWORDS="x86 ppc ~sparc"
 LICENSE="GPL-2"
 
-RDEPEND="|| ( (
-		x11-libs/libX11
-		x11-libs/libXext
-		x11-libs/libXt
-		x11-libs/libXpm )
-	virtual/x11 )"
+RDEPEND="x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXt
+	x11-libs/libXpm"
 DEPEND="${RDEPEND}
-	|| ( x11-proto/xextproto virtual/x11 )"
+	x11-proto/xextproto"
 
 src_install () {
 	einstall || die "Installation failed"
diff --git a/x11-plugins/wmdl/ChangeLog b/x11-plugins/wmdl/ChangeLog
index eb43d5dc9dd2..344df9266587 100644
--- a/x11-plugins/wmdl/ChangeLog
+++ b/x11-plugins/wmdl/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for x11-plugins/wmdl
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmdl/ChangeLog,v 1.10 2007/02/06 02:00:59 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmdl/ChangeLog,v 1.11 2007/07/22 05:12:49 dberkholz Exp $
+
+  22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>; wmdl-1.4.1.ebuild:
+  Drop virtual/x11 references.
 
   06 Feb 2007; Diego Pettenò <flameeyes@gentoo.org> ChangeLog:
   Regenerate digest in Manifest2 format.
diff --git a/x11-plugins/wmdl/wmdl-1.4.1.ebuild b/x11-plugins/wmdl/wmdl-1.4.1.ebuild
index 0f168880d139..2e3ecb6c814d 100644
--- a/x11-plugins/wmdl/wmdl-1.4.1.ebuild
+++ b/x11-plugins/wmdl/wmdl-1.4.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-plugins/wmdl/wmdl-1.4.1.ebuild,v 1.13 2006/01/24 23:05:37 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmdl/wmdl-1.4.1.ebuild,v 1.14 2007/07/22 05:12:49 dberkholz Exp $
 
 inherit eutils
 
@@ -13,16 +13,12 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ppc ~sparc x86"
 
-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/xproto
-		x11-proto/xextproto )
-	virtual/x11 )"
+	x11-proto/xproto
+	x11-proto/xextproto"
 
 src_unpack() {
 	unpack ${A}
diff --git a/x11-plugins/wmdots/ChangeLog b/x11-plugins/wmdots/ChangeLog
index ec2d82cbbd69..e982d046c711 100644
--- a/x11-plugins/wmdots/ChangeLog
+++ b/x11-plugins/wmdots/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-plugins/wmdots
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmdots/ChangeLog,v 1.7 2007/02/06 02:01:28 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmdots/ChangeLog,v 1.8 2007/07/22 05:11:15 dberkholz Exp $
+
+  22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>;
+  wmdots-0.2_beta.ebuild:
+  Drop virtual/x11 references.
 
   06 Feb 2007; Diego Pettenò <flameeyes@gentoo.org> ChangeLog:
   Regenerate digest in Manifest2 format.
diff --git a/x11-plugins/wmdots/wmdots-0.2_beta.ebuild b/x11-plugins/wmdots/wmdots-0.2_beta.ebuild
index 6bdab16c2cd2..89d3dc782712 100644
--- a/x11-plugins/wmdots/wmdots-0.2_beta.ebuild
+++ b/x11-plugins/wmdots/wmdots-0.2_beta.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-plugins/wmdots/wmdots-0.2_beta.ebuild,v 1.10 2006/01/24 23:07:31 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmdots/wmdots-0.2_beta.ebuild,v 1.11 2007/07/22 05:11:15 dberkholz Exp $
 
 MY_P=wmdots-0.2beta
 S=${WORKDIR}/${PN}
@@ -13,11 +13,9 @@ SLOT="0"
 
 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}"
 
 src_install () {
diff --git a/x11-plugins/wmfire/ChangeLog b/x11-plugins/wmfire/ChangeLog
index 605b42b8331e..e8cea169f7b4 100644
--- a/x11-plugins/wmfire/ChangeLog
+++ b/x11-plugins/wmfire/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-plugins/wmfire
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmfire/ChangeLog,v 1.8 2007/02/06 02:01:56 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmfire/ChangeLog,v 1.9 2007/07/22 05:09:22 dberkholz Exp $
+
+  22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>;
+  wmfire-0.0.3.9_pre4.ebuild:
+  Drop virtual/x11 references.
 
   06 Feb 2007; Diego Pettenò <flameeyes@gentoo.org> ChangeLog:
   Regenerate digest in Manifest2 format.
diff --git a/x11-plugins/wmfire/wmfire-0.0.3.9_pre4.ebuild b/x11-plugins/wmfire/wmfire-0.0.3.9_pre4.ebuild
index 65ae8d015b35..19b60ad0ff8f 100644
--- a/x11-plugins/wmfire/wmfire-0.0.3.9_pre4.ebuild
+++ b/x11-plugins/wmfire/wmfire-0.0.3.9_pre4.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-plugins/wmfire/wmfire-0.0.3.9_pre4.ebuild,v 1.10 2006/01/24 23:15:49 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmfire/wmfire-0.0.3.9_pre4.ebuild,v 1.11 2007/07/22 05:09:22 dberkholz Exp $
 
 IUSE=""
 
@@ -11,13 +11,11 @@ DESCRIPTION="WindowMaker dockapp that displays cpu usage as a dancing flame"
 SRC_URI="http://staff.xmms.org/zinx/misc/${MY_P}.tar.gz"
 HOMEPAGE="http://staff.xmms.org/zinx/misc"
 
-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"
 
 SLOT="0"
 LICENSE="GPL-2"
diff --git a/x11-plugins/wmfortune/ChangeLog b/x11-plugins/wmfortune/ChangeLog
index 14e9d5933884..2111afe86381 100644
--- a/x11-plugins/wmfortune/ChangeLog
+++ b/x11-plugins/wmfortune/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-plugins/wmfortune
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmfortune/ChangeLog,v 1.8 2007/02/21 23:33:38 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmfortune/ChangeLog,v 1.9 2007/07/22 05:08:42 dberkholz Exp $
+
+  22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>;
+  wmfortune-0.241.ebuild:
+  Drop virtual/x11 references.
 
   21 Feb 2007; Markus Ullmann <jokey@gentoo.org> ChangeLog:
   Redigest for Manifest2
diff --git a/x11-plugins/wmfortune/wmfortune-0.241.ebuild b/x11-plugins/wmfortune/wmfortune-0.241.ebuild
index 3c6f6af6f7aa..cb429768f048 100644
--- a/x11-plugins/wmfortune/wmfortune-0.241.ebuild
+++ b/x11-plugins/wmfortune/wmfortune-0.241.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-plugins/wmfortune/wmfortune-0.241.ebuild,v 1.10 2006/01/31 21:24:02 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmfortune/wmfortune-0.241.ebuild,v 1.11 2007/07/22 05:08:42 dberkholz Exp $
 
 IUSE=""
 DESCRIPTION="dock-app that shows fortune messages"
@@ -12,16 +12,12 @@ SLOT="0"
 KEYWORDS="x86 amd64 ppc ~sparc"
 
 RDEPEND="games-misc/fortune-mod
-	|| ( (
-		x11-libs/libX11
-		x11-libs/libXext
-		x11-libs/libXpm )
-	virtual/x11 )"
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXpm"
 DEPEND="${RDEPEND}
-	|| ( (
-		x11-proto/xproto
-		x11-proto/xextproto )
-	virtual/x11 )"
+	x11-proto/xproto
+	x11-proto/xextproto"
 
 src_compile() {
 	emake OPTIMIZE="${CFLAGS}" || die
diff --git a/x11-plugins/wmfsm/ChangeLog b/x11-plugins/wmfsm/ChangeLog
index 023ec5ab6b4e..9aadf55a13d5 100644
--- a/x11-plugins/wmfsm/ChangeLog
+++ b/x11-plugins/wmfsm/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for x11-plugins/wmfsm
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmfsm/ChangeLog,v 1.10 2007/02/06 02:02:26 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmfsm/ChangeLog,v 1.11 2007/07/22 05:08:01 dberkholz Exp $
+
+  22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>; wmfsm-0.34-r1.ebuild:
+  Drop virtual/x11 references.
 
   06 Feb 2007; Diego Pettenò <flameeyes@gentoo.org> ChangeLog:
   Regenerate digest in Manifest2 format.
diff --git a/x11-plugins/wmfsm/wmfsm-0.34-r1.ebuild b/x11-plugins/wmfsm/wmfsm-0.34-r1.ebuild
index f7207edeaebe..170346891721 100644
--- a/x11-plugins/wmfsm/wmfsm-0.34-r1.ebuild
+++ b/x11-plugins/wmfsm/wmfsm-0.34-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-plugins/wmfsm/wmfsm-0.34-r1.ebuild,v 1.5 2006/01/24 23:19:25 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmfsm/wmfsm-0.34-r1.ebuild,v 1.6 2007/07/22 05:08:01 dberkholz Exp $
 
 inherit eutils
 
@@ -13,17 +13,13 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="x86 ~sparc amd64 ppc"
 
-RDEPEND="|| ( (
-		x11-libs/libX11
-		x11-libs/libXext
-		x11-libs/libXt
-		x11-libs/libXpm )
-	virtual/x11 )"
+RDEPEND="x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXt
+	x11-libs/libXpm"
 DEPEND="${RDEPEND}
-	|| ( (
-		x11-proto/xproto
-		x11-proto/xextproto )
-	virtual/x11 )"
+	x11-proto/xproto
+	x11-proto/xextproto"
 
 src_unpack() {
 
diff --git a/x11-plugins/wmget/ChangeLog b/x11-plugins/wmget/ChangeLog
index ef7086ecf6de..bc87b99e4cc4 100644
--- a/x11-plugins/wmget/ChangeLog
+++ b/x11-plugins/wmget/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for x11-plugins/wmget
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmget/ChangeLog,v 1.13 2007/02/21 23:34:08 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmget/ChangeLog,v 1.14 2007/07/22 05:06:52 dberkholz Exp $
+
+  22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>; wmget-0.6.0.ebuild:
+  Drop virtual/x11 references.
 
   21 Feb 2007; Markus Ullmann <jokey@gentoo.org> ChangeLog:
   Redigest for Manifest2
diff --git a/x11-plugins/wmget/wmget-0.6.0.ebuild b/x11-plugins/wmget/wmget-0.6.0.ebuild
index d83d4fbd5233..7dd6f11c0787 100644
--- a/x11-plugins/wmget/wmget-0.6.0.ebuild
+++ b/x11-plugins/wmget/wmget-0.6.0.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-plugins/wmget/wmget-0.6.0.ebuild,v 1.6 2006/05/03 00:53:25 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmget/wmget-0.6.0.ebuild,v 1.7 2007/07/22 05:06:52 dberkholz Exp $
 
 IUSE=""
 DESCRIPTION="libcurl-based dockapp for automated-downloads"
@@ -11,17 +11,13 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="amd64 ppc ~sparc x86"
 
-RDEPEND="|| ( (
-		x11-libs/libX11
-		x11-libs/libXext
-		x11-libs/libXpm )
-	virtual/x11 )
+RDEPEND="x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXpm
 	>=net-misc/curl-7.9.7"
 DEPEND="${RDEPEND}
-	|| ( (
-		x11-proto/xproto
-		x11-proto/xextproto )
-	virtual/x11 )"
+	x11-proto/xproto
+	x11-proto/xextproto"
 
 S=${WORKDIR}/${PN}
 
diff --git a/x11-plugins/wmgrabimage/ChangeLog b/x11-plugins/wmgrabimage/ChangeLog
index 816228f998b3..5b3ddebcbc79 100644
--- a/x11-plugins/wmgrabimage/ChangeLog
+++ b/x11-plugins/wmgrabimage/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-plugins/wmgrabimage
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmgrabimage/ChangeLog,v 1.10 2007/02/21 23:34:37 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmgrabimage/ChangeLog,v 1.11 2007/07/22 05:06:09 dberkholz Exp $
+
+  22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>;
+  wmgrabimage-0.72-r1.ebuild:
+  Drop virtual/x11 references.
 
   21 Feb 2007; Markus Ullmann <jokey@gentoo.org> ChangeLog:
   Redigest for Manifest2
diff --git a/x11-plugins/wmgrabimage/wmgrabimage-0.72-r1.ebuild b/x11-plugins/wmgrabimage/wmgrabimage-0.72-r1.ebuild
index b34205f096d5..85c0a2a7698d 100644
--- a/x11-plugins/wmgrabimage/wmgrabimage-0.72-r1.ebuild
+++ b/x11-plugins/wmgrabimage/wmgrabimage-0.72-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-plugins/wmgrabimage/wmgrabimage-0.72-r1.ebuild,v 1.5 2007/07/11 20:39:23 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmgrabimage/wmgrabimage-0.72-r1.ebuild,v 1.6 2007/07/22 05:06:09 dberkholz Exp $
 
 inherit eutils
 
@@ -16,16 +16,12 @@ HOMEPAGE="http://www.dockapps.com/file.php/id/12"
 RDEPEND=">=net-misc/wget-1.9-r2
 	>=media-gfx/imagemagick-5.5.7.15
 	>=sys-apps/sed-4
-	|| ( (
-		x11-libs/libX11
-		x11-libs/libXext
-		x11-libs/libXpm )
-	virtual/x11 )"
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXpm"
 DEPEND="${RDEPEND}
-	|| ( (
-		x11-proto/xproto
-		x11-proto/xextproto )
-	virtual/x11 )"
+	x11-proto/xproto
+	x11-proto/xextproto"
 
 SLOT="0"
 LICENSE="GPL-2"
diff --git a/x11-plugins/wmgtemp/ChangeLog b/x11-plugins/wmgtemp/ChangeLog
index 836817a935e9..f8dae8289519 100644
--- a/x11-plugins/wmgtemp/ChangeLog
+++ b/x11-plugins/wmgtemp/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for x11-plugins/wmgtemp
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmgtemp/ChangeLog,v 1.12 2007/02/21 23:35:10 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmgtemp/ChangeLog,v 1.13 2007/07/22 05:05:27 dberkholz Exp $
+
+  22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>; wmgtemp-0.7.ebuild:
+  Drop virtual/x11 references.
 
   21 Feb 2007; Markus Ullmann <jokey@gentoo.org> ChangeLog:
   Redigest for Manifest2
diff --git a/x11-plugins/wmgtemp/wmgtemp-0.7.ebuild b/x11-plugins/wmgtemp/wmgtemp-0.7.ebuild
index 69d7c1382a90..15d4fe1cf0ac 100644
--- a/x11-plugins/wmgtemp/wmgtemp-0.7.ebuild
+++ b/x11-plugins/wmgtemp/wmgtemp-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-plugins/wmgtemp/wmgtemp-0.7.ebuild,v 1.8 2006/02/02 16:28:10 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmgtemp/wmgtemp-0.7.ebuild,v 1.9 2007/07/22 05:05:27 dberkholz Exp $
 
 IUSE=""
 
@@ -12,13 +12,11 @@ LICENSE="Artistic"
 SLOT="0"
 KEYWORDS="x86 -ppc -sparc amd64"
 
-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
 	sys-apps/lm_sensors
 	>=sys-apps/sed-4"
 
diff --git a/x11-plugins/wmhdplop/ChangeLog b/x11-plugins/wmhdplop/ChangeLog
index db197e6bf3cc..de62d8b37a15 100644
--- a/x11-plugins/wmhdplop/ChangeLog
+++ b/x11-plugins/wmhdplop/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-plugins/wmhdplop
-# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmhdplop/ChangeLog,v 1.11 2006/10/18 08:49:28 s4t4n Exp $
+# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmhdplop/ChangeLog,v 1.12 2007/07/22 05:04:45 dberkholz Exp $
+
+  22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>;
+  wmhdplop-0.9.7-r1.ebuild:
+  Drop virtual/x11 references.
 
   18 Oct 2006; Michele Noberasco <s4t4n@gentoo.org> wmhdplop-0.9.7-r1.ebuild:
   Added missing freetype dependancy. Closes bug #150651.
diff --git a/x11-plugins/wmhdplop/wmhdplop-0.9.7-r1.ebuild b/x11-plugins/wmhdplop/wmhdplop-0.9.7-r1.ebuild
index 4b8dacbc6ebf..c876f3f51da5 100644
--- a/x11-plugins/wmhdplop/wmhdplop-0.9.7-r1.ebuild
+++ b/x11-plugins/wmhdplop/wmhdplop-0.9.7-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-plugins/wmhdplop/wmhdplop-0.9.7-r1.ebuild,v 1.2 2006/10/18 08:49:28 s4t4n Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmhdplop/wmhdplop-0.9.7-r1.ebuild,v 1.3 2007/07/22 05:04:45 dberkholz Exp $
 
 inherit eutils
 
@@ -14,15 +14,13 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="x86 ~ppc ~amd64"
 
-RDEPEND="|| ( (
-		x11-libs/libX11
-		x11-libs/libXt
-		x11-libs/libXext )
-	virtual/x11 )
+RDEPEND="x11-libs/libX11
+	x11-libs/libXt
+	x11-libs/libXext
 	>=media-fonts/corefonts-1-r2
 	>=media-libs/freetype-2.1.10-r2"
 DEPEND="${RDEPEND}
-	|| ( x11-proto/xextproto virtual/x11 )
+	x11-proto/xextproto
 	>=media-libs/imlib2-1.2.0-r2
 	gkrellm? ( >=app-admin/gkrellm-2.1.28-r1 )"
 
diff --git a/x11-plugins/wmifinfo/ChangeLog b/x11-plugins/wmifinfo/ChangeLog
index afdf83662272..a2baf43b0600 100644
--- a/x11-plugins/wmifinfo/ChangeLog
+++ b/x11-plugins/wmifinfo/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for x11-plugins/wmifinfo
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmifinfo/ChangeLog,v 1.17 2007/02/21 23:35:37 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmifinfo/ChangeLog,v 1.18 2007/07/22 05:02:19 dberkholz Exp $
+
+  22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>; wmifinfo-0.09.ebuild:
+  Drop virtual/x11 references.
 
   21 Feb 2007; Markus Ullmann <jokey@gentoo.org> ChangeLog:
   Redigest for Manifest2
diff --git a/x11-plugins/wmifinfo/wmifinfo-0.09.ebuild b/x11-plugins/wmifinfo/wmifinfo-0.09.ebuild
index edb8afab52ee..4bef528edef9 100644
--- a/x11-plugins/wmifinfo/wmifinfo-0.09.ebuild
+++ b/x11-plugins/wmifinfo/wmifinfo-0.09.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-plugins/wmifinfo/wmifinfo-0.09.ebuild,v 1.5 2006/01/31 19:27:54 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmifinfo/wmifinfo-0.09.ebuild,v 1.6 2007/07/22 05:02:19 dberkholz Exp $
 
 IUSE=""
 
@@ -12,16 +12,12 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ppc ~sparc x86"
 
-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/xproto
-		x11-proto/xextproto )
-	virtual/x11 )
+	x11-proto/xproto
+	x11-proto/xextproto
 	>=sys-apps/sed-4"
 
 src_unpack() {
diff --git a/x11-plugins/wmifs/ChangeLog b/x11-plugins/wmifs/ChangeLog
index f6c01a2180ac..9ab69ef5d871 100644
--- a/x11-plugins/wmifs/ChangeLog
+++ b/x11-plugins/wmifs/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-plugins/wmifs
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmifs/ChangeLog,v 1.19 2007/02/21 23:36:14 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmifs/ChangeLog,v 1.20 2007/07/22 05:01:25 dberkholz Exp $
+
+  22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>;
+  wmifs-1.3_beta1-r2.ebuild:
+  Drop virtual/x11 references.
 
   21 Feb 2007; Markus Ullmann <jokey@gentoo.org> ChangeLog:
   Redigest for Manifest2
diff --git a/x11-plugins/wmifs/wmifs-1.3_beta1-r2.ebuild b/x11-plugins/wmifs/wmifs-1.3_beta1-r2.ebuild
index 3d8d1ef67a84..5d3b5e3fe2fa 100644
--- a/x11-plugins/wmifs/wmifs-1.3_beta1-r2.ebuild
+++ b/x11-plugins/wmifs/wmifs-1.3_beta1-r2.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-plugins/wmifs/wmifs-1.3_beta1-r2.ebuild,v 1.7 2007/07/11 20:39:22 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmifs/wmifs-1.3_beta1-r2.ebuild,v 1.8 2007/07/22 05:01:25 dberkholz Exp $
 
 inherit eutils
 
@@ -12,13 +12,11 @@ HOMEPAGE="http://www.linux.tucows.com"
 SRC_URI="http://linux.tucows.tierra.net/files/x11/dock/${PN}-${MY_PV}.tar.gz
 	http://http.us.debian.org/debian/pool/main/w/wmifs/${PN}_${MY_PV}-11.diff.gz"
 
-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"
 
 SLOT="0"
 LICENSE="GPL-2"
diff --git a/x11-plugins/wminet/ChangeLog b/x11-plugins/wminet/ChangeLog
index 497425c13ce0..95cd8279d31d 100644
--- a/x11-plugins/wminet/ChangeLog
+++ b/x11-plugins/wminet/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for x11-plugins/wminet
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wminet/ChangeLog,v 1.9 2007/02/21 23:36:47 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wminet/ChangeLog,v 1.10 2007/07/22 05:00:36 dberkholz Exp $
+
+  22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>; wminet-2.0.3.ebuild:
+  Drop virtual/x11 references.
 
   21 Feb 2007; Markus Ullmann <jokey@gentoo.org> ChangeLog:
   Redigest for Manifest2
diff --git a/x11-plugins/wminet/wminet-2.0.3.ebuild b/x11-plugins/wminet/wminet-2.0.3.ebuild
index 1319c35c652f..7bee14367821 100644
--- a/x11-plugins/wminet/wminet-2.0.3.ebuild
+++ b/x11-plugins/wminet/wminet-2.0.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-plugins/wminet/wminet-2.0.3.ebuild,v 1.12 2006/01/31 19:31:12 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wminet/wminet-2.0.3.ebuild,v 1.13 2007/07/22 05:00:36 dberkholz Exp $
 
 S="${WORKDIR}/${PN}.app"
 IUSE=""
@@ -12,13 +12,11 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="x86 ~sparc amd64 ppc"
 
-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
 	>=sys-apps/sed-4"
 
 src_unpack() {
diff --git a/x11-plugins/wmitime/ChangeLog b/x11-plugins/wmitime/ChangeLog
index 13434aaa55e7..4e975bf6fa25 100644
--- a/x11-plugins/wmitime/ChangeLog
+++ b/x11-plugins/wmitime/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for x11-plugins/wmitime
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmitime/ChangeLog,v 1.12 2007/02/21 23:37:18 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmitime/ChangeLog,v 1.13 2007/07/22 04:59:54 dberkholz Exp $
+
+  22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>; wmitime-0.3.ebuild:
+  Drop virtual/x11 references.
 
   21 Feb 2007; Markus Ullmann <jokey@gentoo.org> ChangeLog:
   Redigest for Manifest2
diff --git a/x11-plugins/wmitime/wmitime-0.3.ebuild b/x11-plugins/wmitime/wmitime-0.3.ebuild
index 34afa8cf9ccf..63f5176b9e91 100644
--- a/x11-plugins/wmitime/wmitime-0.3.ebuild
+++ b/x11-plugins/wmitime/wmitime-0.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-plugins/wmitime/wmitime-0.3.ebuild,v 1.15 2006/01/31 19:33:14 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmitime/wmitime-0.3.ebuild,v 1.16 2007/07/22 04:59:54 dberkholz Exp $
 
 inherit eutils
 
@@ -14,13 +14,11 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="x86 amd64 ppc ppc64 ~sparc"
 
-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_unpack() {
 	unpack ${A} ; cd ${S}
diff --git a/x11-plugins/wmium/ChangeLog b/x11-plugins/wmium/ChangeLog
index aaec5824a43b..37e232c4d4e4 100644
--- a/x11-plugins/wmium/ChangeLog
+++ b/x11-plugins/wmium/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-plugins/wmium
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmium/ChangeLog,v 1.18 2007/02/22 21:15:17 lack Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmium/ChangeLog,v 1.19 2007/07/22 04:59:08 dberkholz Exp $
+
+  22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>; wmium-1.0.9b.ebuild,
+  wmium-1.0.9b-r1.ebuild:
+  Drop virtual/x11 references.
 
   22 Feb 2007; Jim Ramsay <lack@gentoo.org> wmium-1.0.9b.ebuild,
   wmium-1.0.9b-r1.ebuild:
diff --git a/x11-plugins/wmium/wmium-1.0.9b-r1.ebuild b/x11-plugins/wmium/wmium-1.0.9b-r1.ebuild
index 54408256f501..3a89e77f0d77 100644
--- a/x11-plugins/wmium/wmium-1.0.9b-r1.ebuild
+++ b/x11-plugins/wmium/wmium-1.0.9b-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-plugins/wmium/wmium-1.0.9b-r1.ebuild,v 1.3 2007/07/11 20:39:22 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmium/wmium-1.0.9b-r1.ebuild,v 1.4 2007/07/22 04:59:08 dberkholz Exp $
 
 IUSE="gtk"
 
@@ -17,13 +17,10 @@ DEPEND="virtual/libc
 		=app-admin/gkrellm-2*
 		dev-util/pkgconfig
 	)
-	( || (
-	( >=x11-libs/libX11-1.0.0
+	>=x11-libs/libX11-1.0.0
 	>=x11-libs/libXext-1.0.0
 	>=x11-libs/libXpm-3.5.4.2
-	>=x11-proto/xextproto-7.0.2 )
-	virtual/x11 )
-	)"
+	>=x11-proto/xextproto-7.0.2"
 
 RDEPEND="virtual/libc
 	dev-libs/openssl
@@ -32,13 +29,10 @@ RDEPEND="virtual/libc
 		=app-admin/gkrellm-2*
 	)
 	!gtk? ( x11-wm/windowmaker )
-	( || (
-	( >=x11-libs/libX11-1.0.0
+	>=x11-libs/libX11-1.0.0
 	>=x11-libs/libXext-1.0.0
 	>=x11-libs/libXpm-3.5.4.2
-	>=x11-proto/xextproto-7.0.2 )
-	virtual/x11 )
-	)"
+	>=x11-proto/xextproto-7.0.2"
 
 src_compile() {
 	emake build || die
diff --git a/x11-plugins/wmium/wmium-1.0.9b.ebuild b/x11-plugins/wmium/wmium-1.0.9b.ebuild
index 615943a93ceb..486348c4a0d1 100644
--- a/x11-plugins/wmium/wmium-1.0.9b.ebuild
+++ b/x11-plugins/wmium/wmium-1.0.9b.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-plugins/wmium/wmium-1.0.9b.ebuild,v 1.6 2007/07/11 20:39:22 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmium/wmium-1.0.9b.ebuild,v 1.7 2007/07/22 04:59:08 dberkholz Exp $
 
 IUSE="gtk"
 
@@ -17,13 +17,10 @@ DEPEND="virtual/libc
 		=app-admin/gkrellm-2*
 		dev-util/pkgconfig
 	)
-	( || (
-	( >=x11-libs/libX11-1.0.0
+	>=x11-libs/libX11-1.0.0
 	>=x11-libs/libXext-1.0.0
 	>=x11-libs/libXpm-3.5.4.2
-	>=x11-proto/xextproto-7.0.2 )
-	virtual/x11 )
-	)"
+	>=x11-proto/xextproto-7.0.2"
 
 RDEPEND="virtual/libc
 	dev-libs/openssl
@@ -32,13 +29,10 @@ RDEPEND="virtual/libc
 		=app-admin/gkrellm-2*
 	)
 	!gtk? ( x11-wm/windowmaker )
-	( || (
-	( >=x11-libs/libX11-1.0.0
+	>=x11-libs/libX11-1.0.0
 	>=x11-libs/libXext-1.0.0
 	>=x11-libs/libXpm-3.5.4.2
-	>=x11-proto/xextproto-7.0.2 )
-	virtual/x11 )
-	)"
+	>=x11-proto/xextproto-7.0.2"
 
 src_compile() {
 	emake build || die
diff --git a/x11-plugins/wmix/ChangeLog b/x11-plugins/wmix/ChangeLog
index ea0df3a0df2f..dba5454e36b7 100644
--- a/x11-plugins/wmix/ChangeLog
+++ b/x11-plugins/wmix/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for x11-plugins/wmix
-# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmix/ChangeLog,v 1.15 2006/08/18 02:03:42 malc Exp $
+# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmix/ChangeLog,v 1.16 2007/07/22 04:57:50 dberkholz Exp $
+
+  22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>; wmix-3.1-r1.ebuild:
+  Drop virtual/x11 references.
 
   18 Aug 2006; <malc@gentoo.org> wmix-3.1-r1.ebuild:
   Stable on amd64 - Bug #141394
diff --git a/x11-plugins/wmix/wmix-3.1-r1.ebuild b/x11-plugins/wmix/wmix-3.1-r1.ebuild
index 0cae53925e14..6e7de4f63024 100644
--- a/x11-plugins/wmix/wmix-3.1-r1.ebuild
+++ b/x11-plugins/wmix/wmix-3.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-plugins/wmix/wmix-3.1-r1.ebuild,v 1.4 2006/08/18 02:03:42 malc Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmix/wmix-3.1-r1.ebuild,v 1.5 2007/07/22 04:57:50 dberkholz Exp $
 
 inherit eutils
 
@@ -13,16 +13,12 @@ SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="amd64 ~ppc ~sparc x86"
 
-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/xproto
-		x11-proto/xextproto )
-	virtual/x11 )
+	x11-proto/xproto
+	x11-proto/xextproto
 	>=sys-apps/sed-4"
 
 src_unpack()
diff --git a/x11-plugins/wmjsql/ChangeLog b/x11-plugins/wmjsql/ChangeLog
index 72b645590a02..e1c9bca99d47 100644
--- a/x11-plugins/wmjsql/ChangeLog
+++ b/x11-plugins/wmjsql/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for x11-plugins/wmjsql
-# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmjsql/ChangeLog,v 1.9 2006/11/23 16:50:44 vivo Exp $
+# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmjsql/ChangeLog,v 1.10 2007/07/22 04:57:07 dberkholz Exp $
+
+  22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>; wmjsql-0.5.ebuild:
+  Drop virtual/x11 references.
 
   23 Nov 2006; Francesco Riosa <vivo@gentoo.org> wmjsql-0.5.ebuild:
   dev-db/mysql => virtual/mysql
diff --git a/x11-plugins/wmjsql/wmjsql-0.5.ebuild b/x11-plugins/wmjsql/wmjsql-0.5.ebuild
index 3c01c0a86cc3..094f7ad3b8a4 100644
--- a/x11-plugins/wmjsql/wmjsql-0.5.ebuild
+++ b/x11-plugins/wmjsql/wmjsql-0.5.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-plugins/wmjsql/wmjsql-0.5.ebuild,v 1.9 2006/11/23 16:50:44 vivo Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmjsql/wmjsql-0.5.ebuild,v 1.10 2007/07/22 04:57:07 dberkholz Exp $
 
 IUSE=""
 
@@ -11,16 +11,12 @@ DESCRIPTION="MySQL monitor dockapp"
 SRC_URI="http://www.dockapps.org/download.php/id/73/${P}.tar.gz"
 HOMEPAGE="http://www.dockapps.org/file.php/id/42"
 
-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/xproto
-		x11-proto/xextproto )
-	virtual/x11 )
+	x11-proto/xproto
+	x11-proto/xextproto
 	>=virtual/mysql-4.0"
 
 SLOT="0"
diff --git a/x11-plugins/wmlaptop/ChangeLog b/x11-plugins/wmlaptop/ChangeLog
index 3c081293b824..3676e3616f27 100644
--- a/x11-plugins/wmlaptop/ChangeLog
+++ b/x11-plugins/wmlaptop/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for x11-plugins/wmlaptop
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmlaptop/ChangeLog,v 1.6 2007/02/21 23:37:47 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmlaptop/ChangeLog,v 1.7 2007/07/22 04:56:29 dberkholz Exp $
+
+  22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>; wmlaptop-1.3.ebuild:
+  Drop virtual/x11 references.
 
   21 Feb 2007; Markus Ullmann <jokey@gentoo.org> ChangeLog:
   Redigest for Manifest2
diff --git a/x11-plugins/wmlaptop/wmlaptop-1.3.ebuild b/x11-plugins/wmlaptop/wmlaptop-1.3.ebuild
index 9a9a836f6008..6c889fe61c84 100644
--- a/x11-plugins/wmlaptop/wmlaptop-1.3.ebuild
+++ b/x11-plugins/wmlaptop/wmlaptop-1.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-plugins/wmlaptop/wmlaptop-1.3.ebuild,v 1.5 2006/01/31 19:38:33 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmlaptop/wmlaptop-1.3.ebuild,v 1.6 2007/07/22 04:56:29 dberkholz Exp $
 
 IUSE=""
 
@@ -11,13 +11,11 @@ DESCRIPTION="Dockapp for laptop users"
 SRC_URI="http://www.dockapps.org/download.php/id/474/${P}.tar.bz2"
 HOMEPAGE="http://www.dockapps.org/file.php/id/227"
 
-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"
 
 SLOT="0"
 LICENSE="GPL-2"
diff --git a/x11-plugins/wmload/ChangeLog b/x11-plugins/wmload/ChangeLog
index 9c87f1a51419..718ac0af8c7a 100644
--- a/x11-plugins/wmload/ChangeLog
+++ b/x11-plugins/wmload/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for x11-plugins/wmload
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmload/ChangeLog,v 1.8 2007/05/20 07:48:28 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmload/ChangeLog,v 1.9 2007/07/22 04:55:45 dberkholz Exp $
+
+  22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>; wmload-0.9.2.ebuild:
+  Drop virtual/x11 references.
 
   20 May 2007; Christian Faulhammer <opfer@gentoo.org> wmload-0.9.2.ebuild:
   added ~amd64, bug 177154
diff --git a/x11-plugins/wmload/wmload-0.9.2.ebuild b/x11-plugins/wmload/wmload-0.9.2.ebuild
index 31123c24a4ef..172c47458d77 100644
--- a/x11-plugins/wmload/wmload-0.9.2.ebuild
+++ b/x11-plugins/wmload/wmload-0.9.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-plugins/wmload/wmload-0.9.2.ebuild,v 1.7 2007/05/20 07:48:28 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmload/wmload-0.9.2.ebuild,v 1.8 2007/07/22 04:55:45 dberkholz Exp $
 
 inherit eutils
 
@@ -10,17 +10,13 @@ DESCRIPTION="yet another dock application showing a system load gauge"
 SRC_URI="http://www.cs.mun.ca/~gstarkes/wmaker/dockapps/files/${P}.tgz"
 HOMEPAGE="http://www.cs.mun.ca/~gstarkes/wmaker/dockapps/sys.html#wmload"
 
-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-misc/imake
-		x11-proto/xproto
-		x11-proto/xextproto )
-	virtual/x11 )"
+	x11-misc/imake
+	x11-proto/xproto
+	x11-proto/xextproto"
 
 SLOT="0"
 LICENSE="GPL-2"
diff --git a/x11-plugins/wmlongrun/ChangeLog b/x11-plugins/wmlongrun/ChangeLog
index a3a1963782a6..9ba237dbce1a 100644
--- a/x11-plugins/wmlongrun/ChangeLog
+++ b/x11-plugins/wmlongrun/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-plugins/wmlongrun
-# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmlongrun/ChangeLog,v 1.5 2006/07/17 09:55:56 s4t4n Exp $
+# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmlongrun/ChangeLog,v 1.6 2007/07/22 04:55:00 dberkholz Exp $
+
+  22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>;
+  wmlongrun-0.2.0.ebuild:
+  Drop virtual/x11 references.
 
   17 Jul 2006; Michele Noberasco <s4t4n@gentoo.org> wmlongrun-0.2.0.ebuild:
   Fixed HOMEPAGE and SRC_URI. Closes bug #140294.
diff --git a/x11-plugins/wmlongrun/wmlongrun-0.2.0.ebuild b/x11-plugins/wmlongrun/wmlongrun-0.2.0.ebuild
index bbd582f3afc6..603c86c3b05d 100644
--- a/x11-plugins/wmlongrun/wmlongrun-0.2.0.ebuild
+++ b/x11-plugins/wmlongrun/wmlongrun-0.2.0.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-plugins/wmlongrun/wmlongrun-0.2.0.ebuild,v 1.5 2006/07/17 09:55:56 s4t4n Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmlongrun/wmlongrun-0.2.0.ebuild,v 1.6 2007/07/22 04:55:00 dberkholz Exp $
 
 DESCRIPTION="A dockapp to monitor LongRun on a Transmeta Crusoe processor"
 HOMEPAGE="http://seiichisato.jp/dockapps/"
@@ -9,13 +9,11 @@ LICENSE="GPL-2"
 SLOT="0"
 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"
 
 # Since this will only work with a Crusoe processor, it's safe to assume that
 # the functionality is only available on x86.
diff --git a/x11-plugins/wmmemfree/ChangeLog b/x11-plugins/wmmemfree/ChangeLog
index 528d0fc2d927..212382287329 100644
--- a/x11-plugins/wmmemfree/ChangeLog
+++ b/x11-plugins/wmmemfree/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-plugins/wmmemfree
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmmemfree/ChangeLog,v 1.10 2007/02/21 23:39:47 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmmemfree/ChangeLog,v 1.11 2007/07/22 04:54:00 dberkholz Exp $
+
+  22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>;
+  wmmemfree-0.7-r1.ebuild:
+  Drop virtual/x11 references.
 
   21 Feb 2007; Markus Ullmann <jokey@gentoo.org> ChangeLog:
   Redigest for Manifest2
diff --git a/x11-plugins/wmmemfree/wmmemfree-0.7-r1.ebuild b/x11-plugins/wmmemfree/wmmemfree-0.7-r1.ebuild
index 8cf584c74fbf..35d40d60b2f1 100644
--- a/x11-plugins/wmmemfree/wmmemfree-0.7-r1.ebuild
+++ b/x11-plugins/wmmemfree/wmmemfree-0.7-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-plugins/wmmemfree/wmmemfree-0.7-r1.ebuild,v 1.7 2006/01/31 19:48:13 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmmemfree/wmmemfree-0.7-r1.ebuild,v 1.8 2007/07/22 04:54:00 dberkholz Exp $
 
 inherit eutils
 
@@ -13,13 +13,11 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="x86 ppc ppc64 ~sparc"
 
-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_unpack()
 {
diff --git a/x11-plugins/wmmemload/ChangeLog b/x11-plugins/wmmemload/ChangeLog
index aa8ba5d0a002..166c7f78e775 100644
--- a/x11-plugins/wmmemload/ChangeLog
+++ b/x11-plugins/wmmemload/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-plugins/wmmemload
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmmemload/ChangeLog,v 1.16 2007/02/21 23:40:17 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmmemload/ChangeLog,v 1.17 2007/07/22 04:53:18 dberkholz Exp $
+
+  22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>;
+  wmmemload-0.1.6.ebuild:
+  Drop virtual/x11 references.
 
   21 Feb 2007; Markus Ullmann <jokey@gentoo.org> ChangeLog:
   Redigest for Manifest2
diff --git a/x11-plugins/wmmemload/wmmemload-0.1.6.ebuild b/x11-plugins/wmmemload/wmmemload-0.1.6.ebuild
index 3c45d074815c..9152662b467d 100644
--- a/x11-plugins/wmmemload/wmmemload-0.1.6.ebuild
+++ b/x11-plugins/wmmemload/wmmemload-0.1.6.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-plugins/wmmemload/wmmemload-0.1.6.ebuild,v 1.8 2006/01/31 19:50:16 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmmemload/wmmemload-0.1.6.ebuild,v 1.9 2007/07/22 04:53:18 dberkholz Exp $
 
 IUSE=""
 DESCRIPTION="dockapp that displays memory and swap space usage."
@@ -11,14 +11,12 @@ SLOT="0"
 KEYWORDS="alpha amd64 ppc ppc64 ~sparc x86"
 LICENSE="GPL-2"
 
-RDEPEND="|| ( (
-		x11-libs/libX11
-		x11-libs/libXext
-		x11-libs/libXt
-		x11-libs/libXpm )
-	virtual/x11 )"
+RDEPEND="x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXt
+	x11-libs/libXpm"
 DEPEND="${RDEPEND}
-	|| ( x11-proto/xextproto virtual/x11 )"
+	x11-proto/xextproto"
 
 src_compile()
 {
diff --git a/x11-plugins/wmmemmon/ChangeLog b/x11-plugins/wmmemmon/ChangeLog
index a59b23d32ead..81f1851562b4 100644
--- a/x11-plugins/wmmemmon/ChangeLog
+++ b/x11-plugins/wmmemmon/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-plugins/wmmemmon
-# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmmemmon/ChangeLog,v 1.16 2006/07/17 10:22:02 s4t4n Exp $
+# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmmemmon/ChangeLog,v 1.17 2007/07/22 04:52:21 dberkholz Exp $
+
+  22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>;
+  wmmemmon-1.0.1.ebuild:
+  Drop virtual/x11 references.
 
   17 Jul 2006; Michele Noberasco <s4t4n@gentoo.org> wmmemmon-1.0.1.ebuild:
   Fixed HOMEPAGE and SRC_URI. Closes bug #140294.
diff --git a/x11-plugins/wmmemmon/wmmemmon-1.0.1.ebuild b/x11-plugins/wmmemmon/wmmemmon-1.0.1.ebuild
index f16e2aee668f..fdf78c10d8ad 100644
--- a/x11-plugins/wmmemmon/wmmemmon-1.0.1.ebuild
+++ b/x11-plugins/wmmemmon/wmmemmon-1.0.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-plugins/wmmemmon/wmmemmon-1.0.1.ebuild,v 1.13 2006/07/17 10:22:02 s4t4n Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmmemmon/wmmemmon-1.0.1.ebuild,v 1.14 2007/07/22 04:52:21 dberkholz Exp $
 
 IUSE=""
 DESCRIPTION="A program to monitor memory/swap usages."
@@ -11,14 +11,12 @@ LICENSE="GPL-2"
 KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
 SLOT="0"
 
-RDEPEND="|| ( (
-		x11-libs/libX11
-		x11-libs/libXext
-		x11-libs/libXt
-		x11-libs/libXpm )
-	virtual/x11 )"
+RDEPEND="x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXt
+	x11-libs/libXpm"
 DEPEND="${RDEPEND}
-	|| ( x11-proto/xextproto virtual/x11 )"
+	x11-proto/xextproto"
 
 src_install () {
 
diff --git a/x11-plugins/wmmisc/ChangeLog b/x11-plugins/wmmisc/ChangeLog
index 52b2a4f7f76c..36bf326ef867 100644
--- a/x11-plugins/wmmisc/ChangeLog
+++ b/x11-plugins/wmmisc/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for x11-plugins/wmmisc
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmmisc/ChangeLog,v 1.5 2007/02/21 23:40:46 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmmisc/ChangeLog,v 1.6 2007/07/22 04:28:27 dberkholz Exp $
+
+  22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>; wmmisc-0.9.ebuild:
+  Drop virtual/x11 references.
 
   21 Feb 2007; Markus Ullmann <jokey@gentoo.org> ChangeLog:
   Redigest for Manifest2
diff --git a/x11-plugins/wmmisc/wmmisc-0.9.ebuild b/x11-plugins/wmmisc/wmmisc-0.9.ebuild
index 3492ee1f5200..0a48289a7186 100644
--- a/x11-plugins/wmmisc/wmmisc-0.9.ebuild
+++ b/x11-plugins/wmmisc/wmmisc-0.9.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-plugins/wmmisc/wmmisc-0.9.ebuild,v 1.4 2006/01/31 19:54:16 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmmisc/wmmisc-0.9.ebuild,v 1.5 2007/07/22 04:28:27 dberkholz Exp $
 
 IUSE=""
 
@@ -12,13 +12,11 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="x86 ~ppc"
 
-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()
 {
diff --git a/x11-plugins/wmmixer/ChangeLog b/x11-plugins/wmmixer/ChangeLog
index ee05c9705e4c..3225dbe98d47 100644
--- a/x11-plugins/wmmixer/ChangeLog
+++ b/x11-plugins/wmmixer/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-plugins/wmmixer
-# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmmixer/ChangeLog,v 1.12 2007/01/25 16:11:30 s4t4n Exp $
+# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmmixer/ChangeLog,v 1.13 2007/07/22 04:51:32 dberkholz Exp $
+
+  22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>;
+  wmmixer-2.0_beta4-r1.ebuild:
+  Drop virtual/x11 references.
 
   25 Jan 2007; Michele Noberasco <s4t4n@gentoo.org> wmmixer-2.0_beta4-r1.ebuild:
   Fix DEPEND and RDEPEND. Wiped out broken oss support. Fixes bug #150652.
diff --git a/x11-plugins/wmmixer/wmmixer-2.0_beta4-r1.ebuild b/x11-plugins/wmmixer/wmmixer-2.0_beta4-r1.ebuild
index ffafc8b80186..adc779a716d1 100644
--- a/x11-plugins/wmmixer/wmmixer-2.0_beta4-r1.ebuild
+++ b/x11-plugins/wmmixer/wmmixer-2.0_beta4-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-plugins/wmmixer/wmmixer-2.0_beta4-r1.ebuild,v 1.4 2007/01/25 16:11:30 s4t4n Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmmixer/wmmixer-2.0_beta4-r1.ebuild,v 1.5 2007/07/22 04:51:32 dberkholz Exp $
 
 inherit eutils
 
@@ -10,13 +10,11 @@ DESCRIPTION="The next generation of WMMixer with native ALSA and OSS support."
 SRC_URI="http://freakzone.net/gordon/src/${PN}-2.0b4.tar.gz"
 HOMEPAGE="http://freakzone.net/gordon/#wmmixer"
 
-RDEPEND="|| ( (
-		x11-libs/libX11
-		x11-libs/libXext
-		x11-libs/libXpm
-		x11-proto/xproto
-		x11-proto/xextproto )
-	virtual/x11 )
+RDEPEND="x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXpm
+	x11-proto/xproto
+	x11-proto/xextproto
 	alsa? ( media-libs/alsa-lib )"
 DEPEND="${RDEPEND}
 	>=sys-apps/sed-4"
diff --git a/x11-plugins/wmmldonkey/ChangeLog b/x11-plugins/wmmldonkey/ChangeLog
index a8678267813c..e2e64ab8353b 100644
--- a/x11-plugins/wmmldonkey/ChangeLog
+++ b/x11-plugins/wmmldonkey/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-plugins/wmmldonkey
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmmldonkey/ChangeLog,v 1.5 2007/02/21 23:41:15 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmmldonkey/ChangeLog,v 1.6 2007/07/22 04:50:48 dberkholz Exp $
+
+  22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>;
+  wmmldonkey-0.003.ebuild:
+  Drop virtual/x11 references.
 
   21 Feb 2007; Markus Ullmann <jokey@gentoo.org> ChangeLog:
   Redigest for Manifest2
diff --git a/x11-plugins/wmmldonkey/wmmldonkey-0.003.ebuild b/x11-plugins/wmmldonkey/wmmldonkey-0.003.ebuild
index 0a6b6a860661..096d3551beef 100644
--- a/x11-plugins/wmmldonkey/wmmldonkey-0.003.ebuild
+++ b/x11-plugins/wmmldonkey/wmmldonkey-0.003.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-plugins/wmmldonkey/wmmldonkey-0.003.ebuild,v 1.4 2006/02/03 13:47:38 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmmldonkey/wmmldonkey-0.003.ebuild,v 1.5 2007/07/22 04:50:48 dberkholz Exp $
 
 DESCRIPTION="wmmsg is a dockapp to show the up and downloadrate from your mldonkey"
 HOMEPAGE="http://dockapps.org/file.php/id/174"
@@ -11,11 +11,9 @@ KEYWORDS="x86"
 IUSE=""
 S=${WORKDIR}/wmmldonkey3
 
-RDEPEND="|| ( (
-		x11-libs/libXext
-		x11-libs/libX11
-		x11-libs/libXpm )
-	virtual/x11 )"
+RDEPEND="x11-libs/libXext
+	x11-libs/libX11
+	x11-libs/libXpm"
 DEPEND="${RDEPEND}
 	net-p2p/mldonkey"
 
diff --git a/x11-plugins/wmmon+smp/ChangeLog b/x11-plugins/wmmon+smp/ChangeLog
index 24ccef0e6749..e96e6bc2f171 100644
--- a/x11-plugins/wmmon+smp/ChangeLog
+++ b/x11-plugins/wmmon+smp/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-plugins/wmmon+smp
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmmon+smp/ChangeLog,v 1.9 2007/02/21 23:42:15 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmmon+smp/ChangeLog,v 1.10 2007/07/22 04:49:01 dberkholz Exp $
+
+  22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>;
+  wmmon+smp-1.0-r1.ebuild:
+  Drop virtual/x11 references.
 
   21 Feb 2007; Markus Ullmann <jokey@gentoo.org> ChangeLog:
   Redigest for Manifest2
diff --git a/x11-plugins/wmmon+smp/wmmon+smp-1.0-r1.ebuild b/x11-plugins/wmmon+smp/wmmon+smp-1.0-r1.ebuild
index 1fae4e9f4b8d..c8f2b6f03822 100644
--- a/x11-plugins/wmmon+smp/wmmon+smp-1.0-r1.ebuild
+++ b/x11-plugins/wmmon+smp/wmmon+smp-1.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-plugins/wmmon+smp/wmmon+smp-1.0-r1.ebuild,v 1.10 2006/01/31 20:00:36 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmmon+smp/wmmon+smp-1.0-r1.ebuild,v 1.11 2007/07/22 04:49:01 dberkholz Exp $
 
 IUSE=""
 
@@ -14,13 +14,11 @@ SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="x86 amd64 ppc64"
 
-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() {
 	cd ${S2}
diff --git a/x11-plugins/wmmon/ChangeLog b/x11-plugins/wmmon/ChangeLog
index a392e16c495a..9adb8f419593 100644
--- a/x11-plugins/wmmon/ChangeLog
+++ b/x11-plugins/wmmon/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-plugins/wmmon
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmmon/ChangeLog,v 1.22 2007/02/21 23:41:46 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmmon/ChangeLog,v 1.23 2007/07/22 04:50:07 dberkholz Exp $
+
+  22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>;
+  wmmon-1.0_beta2-r2.ebuild, wmmon-1.0_beta2-r3.ebuild:
+  Drop virtual/x11 references.
 
   21 Feb 2007; Markus Ullmann <jokey@gentoo.org> ChangeLog:
   Redigest for Manifest2
diff --git a/x11-plugins/wmmon/wmmon-1.0_beta2-r2.ebuild b/x11-plugins/wmmon/wmmon-1.0_beta2-r2.ebuild
index 4ccb757ff159..9d83df59e671 100644
--- a/x11-plugins/wmmon/wmmon-1.0_beta2-r2.ebuild
+++ b/x11-plugins/wmmon/wmmon-1.0_beta2-r2.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-plugins/wmmon/wmmon-1.0_beta2-r2.ebuild,v 1.10 2006/01/31 19:58:51 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmmon/wmmon-1.0_beta2-r2.ebuild,v 1.11 2007/07/22 04:50:07 dberkholz Exp $
 
 inherit eutils
 
@@ -11,13 +11,11 @@ WMMON_VERSION=1_0b2
 SRC_URI="http://rpig.dyndns.org/~anstinus/Linux/${PN}-${WMMON_VERSION}.tar.gz"
 HOMEPAGE="http://www.bensinclair.com/dockapp/"
 
-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
 	>=sys-apps/sed-4"
 
 SLOT="0"
diff --git a/x11-plugins/wmmon/wmmon-1.0_beta2-r3.ebuild b/x11-plugins/wmmon/wmmon-1.0_beta2-r3.ebuild
index 98bf2f360c77..c495e01e48cb 100644
--- a/x11-plugins/wmmon/wmmon-1.0_beta2-r3.ebuild
+++ b/x11-plugins/wmmon/wmmon-1.0_beta2-r3.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-plugins/wmmon/wmmon-1.0_beta2-r3.ebuild,v 1.6 2006/02/07 21:14:05 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmmon/wmmon-1.0_beta2-r3.ebuild,v 1.7 2007/07/22 04:50:07 dberkholz Exp $
 
 inherit eutils
 
@@ -11,13 +11,11 @@ WMMON_VERSION=1_0b2
 SRC_URI="http://rpig.dyndns.org/~anstinus/Linux/${PN}-${WMMON_VERSION}.tar.gz"
 HOMEPAGE="http://www.bensinclair.com/dockapp/"
 
-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
 	>=sys-apps/sed-4"
 
 SLOT="0"
diff --git a/x11-plugins/wmmp/ChangeLog b/x11-plugins/wmmp/ChangeLog
index 08fac0054e50..63113142a6f4 100644
--- a/x11-plugins/wmmp/ChangeLog
+++ b/x11-plugins/wmmp/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for x11-plugins/wmmp
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmmp/ChangeLog,v 1.16 2007/07/02 15:02:55 peper Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmmp/ChangeLog,v 1.17 2007/07/22 04:48:21 dberkholz Exp $
+
+  22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>; wmmp-0.10.0.ebuild:
+  Drop virtual/x11 references.
 
   02 Jul 2007; Piotr Jaroszyński <peper@gentoo.org> wmmp-0.10.0.ebuild:
   (QA) RESTRICT clean up.
diff --git a/x11-plugins/wmmp/wmmp-0.10.0.ebuild b/x11-plugins/wmmp/wmmp-0.10.0.ebuild
index 221b5317d3b3..0c42f0894bc0 100644
--- a/x11-plugins/wmmp/wmmp-0.10.0.ebuild
+++ b/x11-plugins/wmmp/wmmp-0.10.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-plugins/wmmp/wmmp-0.10.0.ebuild,v 1.9 2007/07/02 15:02:55 peper Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmmp/wmmp-0.10.0.ebuild,v 1.10 2007/07/22 04:48:21 dberkholz Exp $
 
 IUSE=""
 
@@ -10,9 +10,8 @@ SRC_URI="mirror://sourceforge/musicpd/${MY_P}.tar.gz"
 RESTRICT="mirror"
 HOMEPAGE="http://www.musicpd.org"
 
-DEPEND="|| (
-		( x11-libs/libXext x11-libs/libXpm )
-		<virtual/x11-7 )"
+DEPEND="x11-libs/libXext
+	x11-libs/libXpm"
 
 SLOT="0"
 LICENSE="GPL-2"
diff --git a/x11-plugins/wmmp3/ChangeLog b/x11-plugins/wmmp3/ChangeLog
index 14dbcf75ead6..026a17c9e0cb 100644
--- a/x11-plugins/wmmp3/ChangeLog
+++ b/x11-plugins/wmmp3/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for x11-plugins/wmmp3
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmmp3/ChangeLog,v 1.10 2007/02/21 23:44:00 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmmp3/ChangeLog,v 1.11 2007/07/22 04:47:39 dberkholz Exp $
+
+  22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>; wmmp3-0.12.ebuild:
+  Drop virtual/x11 references.
 
   21 Feb 2007; Markus Ullmann <jokey@gentoo.org> ChangeLog:
   Redigest for Manifest2
diff --git a/x11-plugins/wmmp3/wmmp3-0.12.ebuild b/x11-plugins/wmmp3/wmmp3-0.12.ebuild
index bb01ee5c5310..b40048b57e6a 100644
--- a/x11-plugins/wmmp3/wmmp3-0.12.ebuild
+++ b/x11-plugins/wmmp3/wmmp3-0.12.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-plugins/wmmp3/wmmp3-0.12.ebuild,v 1.9 2006/02/01 22:58:41 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmmp3/wmmp3-0.12.ebuild,v 1.10 2007/07/22 04:47:39 dberkholz Exp $
 
 inherit eutils
 
@@ -14,13 +14,11 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ppc ~sparc x86"
 
-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
 	>=media-sound/mpg123-0.59s-r2"
 
 src_unpack()
diff --git a/x11-plugins/wmmsens/ChangeLog b/x11-plugins/wmmsens/ChangeLog
index cadc671d2ee8..38f6acb19d3c 100644
--- a/x11-plugins/wmmsens/ChangeLog
+++ b/x11-plugins/wmmsens/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-plugins/wmmsens
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmmsens/ChangeLog,v 1.8 2007/02/21 23:44:32 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmmsens/ChangeLog,v 1.9 2007/07/22 04:46:54 dberkholz Exp $
+
+  22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>;
+  wmmsens-0.29.6.ebuild:
+  Drop virtual/x11 references.
 
   21 Feb 2007; Markus Ullmann <jokey@gentoo.org> ChangeLog:
   Redigest for Manifest2
diff --git a/x11-plugins/wmmsens/wmmsens-0.29.6.ebuild b/x11-plugins/wmmsens/wmmsens-0.29.6.ebuild
index 90da02440606..a1e6ecefdb78 100644
--- a/x11-plugins/wmmsens/wmmsens-0.29.6.ebuild
+++ b/x11-plugins/wmmsens/wmmsens-0.29.6.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-plugins/wmmsens/wmmsens-0.29.6.ebuild,v 1.5 2006/02/02 16:30:52 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmmsens/wmmsens-0.29.6.ebuild,v 1.6 2007/07/22 04:46:54 dberkholz Exp $
 
 inherit eutils
 
@@ -13,13 +13,11 @@ LICENSE="Artistic"
 KEYWORDS="x86 ~amd64"
 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
 	sys-apps/lm_sensors"
 
 src_compile() {
diff --git a/x11-plugins/wmnd/ChangeLog b/x11-plugins/wmnd/ChangeLog
index 8e771362069b..aa893e08331e 100644
--- a/x11-plugins/wmnd/ChangeLog
+++ b/x11-plugins/wmnd/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-plugins/wmnd
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmnd/ChangeLog,v 1.40 2007/02/21 23:45:05 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmnd/ChangeLog,v 1.41 2007/07/22 04:46:01 dberkholz Exp $
+
+  22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>; wmnd-0.4.11.ebuild,
+  wmnd-0.4.11-r1.ebuild:
+  Drop virtual/x11 references.
 
   21 Feb 2007; Markus Ullmann <jokey@gentoo.org> ChangeLog:
   Redigest for Manifest2
diff --git a/x11-plugins/wmnd/wmnd-0.4.11-r1.ebuild b/x11-plugins/wmnd/wmnd-0.4.11-r1.ebuild
index d6a153cae273..a6589cea0f7b 100644
--- a/x11-plugins/wmnd/wmnd-0.4.11-r1.ebuild
+++ b/x11-plugins/wmnd/wmnd-0.4.11-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-plugins/wmnd/wmnd-0.4.11-r1.ebuild,v 1.7 2006/02/08 18:58:14 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmnd/wmnd-0.4.11-r1.ebuild,v 1.8 2007/07/22 04:46:01 dberkholz Exp $
 
 IUSE="snmp"
 DESCRIPTION="WindowMaker Network Devices (dockapp)"
@@ -11,14 +11,12 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ppc sparc x86"
 
-RDEPEND="|| ( (
-		x11-libs/libX11
-		x11-libs/libXext
-		x11-libs/libXt
-		x11-libs/libXpm )
-	virtual/x11 )"
+RDEPEND="x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXt
+	x11-libs/libXpm"
 DEPEND="${RDEPEND}
-	|| ( x11-proto/xextproto virtual/x11 )
+	x11-proto/xextproto
 	snmp? ( >=net-analyzer/net-snmp-5.2.1 )"
 
 src_compile()
diff --git a/x11-plugins/wmnd/wmnd-0.4.11.ebuild b/x11-plugins/wmnd/wmnd-0.4.11.ebuild
index cc6806f43f94..45fc64ffc29c 100644
--- a/x11-plugins/wmnd/wmnd-0.4.11.ebuild
+++ b/x11-plugins/wmnd/wmnd-0.4.11.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-plugins/wmnd/wmnd-0.4.11.ebuild,v 1.7 2006/01/31 20:03:49 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmnd/wmnd-0.4.11.ebuild,v 1.8 2007/07/22 04:46:01 dberkholz Exp $
 
 IUSE=""
 DESCRIPTION="WindowMaker Network Devices (dockapp)"
@@ -11,14 +11,12 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="x86 ppc sparc amd64"
 
-RDEPEND="|| ( (
-		x11-libs/libX11
-		x11-libs/libXext
-		x11-libs/libXt
-		x11-libs/libXpm )
-	virtual/x11 )"
+RDEPEND="x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXt
+	x11-libs/libXpm"
 DEPEND="${RDEPEND}
-	|| ( x11-proto/xextproto virtual/x11 )"
+	x11-proto/xextproto"
 
 src_compile() {
 	econf || die "configure failed"
diff --git a/x11-plugins/wmnet/ChangeLog b/x11-plugins/wmnet/ChangeLog
index daaa33958913..a0ad3743801d 100644
--- a/x11-plugins/wmnet/ChangeLog
+++ b/x11-plugins/wmnet/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for x11-plugins/wmnet
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmnet/ChangeLog,v 1.22 2007/02/21 23:45:37 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmnet/ChangeLog,v 1.23 2007/07/22 04:44:41 dberkholz Exp $
+
+  22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>; wmnet-1.06-r1.ebuild:
+  Drop virtual/x11 references.
 
   21 Feb 2007; Markus Ullmann <jokey@gentoo.org> ChangeLog:
   Redigest for Manifest2
diff --git a/x11-plugins/wmnet/wmnet-1.06-r1.ebuild b/x11-plugins/wmnet/wmnet-1.06-r1.ebuild
index a3ac0479d2e8..89e566bdd896 100644
--- a/x11-plugins/wmnet/wmnet-1.06-r1.ebuild
+++ b/x11-plugins/wmnet/wmnet-1.06-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-plugins/wmnet/wmnet-1.06-r1.ebuild,v 1.8 2006/01/31 20:06:22 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmnet/wmnet-1.06-r1.ebuild,v 1.9 2007/07/22 04:44:41 dberkholz Exp $
 
 inherit eutils
 
@@ -10,17 +10,13 @@ SRC_URI="http://www.digitalkaos.net/linux/wmnet/download/${P}.tar.gz
 	mirror://gentoo/${P}-misc.patch.bz2"
 HOMEPAGE="http://www.digitalkaos.net/linux/wmnet/"
 
-RDEPEND="|| ( (
-		x11-libs/libX11
-		x11-libs/libXext )
-	virtual/x11 )"
+RDEPEND="x11-libs/libX11
+	x11-libs/libXext"
 DEPEND="${RDEPEND}
-	|| ( (
-		x11-proto/xproto
-		x11-proto/xextproto
-		x11-misc/imake
-		app-text/rman )
-	virtual/x11 )"
+	x11-proto/xproto
+	x11-proto/xextproto
+	x11-misc/imake
+	app-text/rman"
 
 SLOT="0"
 LICENSE="GPL-2"
diff --git a/x11-plugins/wmnetmon/ChangeLog b/x11-plugins/wmnetmon/ChangeLog
index 7f7cbd574f48..4dec5a42dea9 100644
--- a/x11-plugins/wmnetmon/ChangeLog
+++ b/x11-plugins/wmnetmon/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for x11-plugins/wmnetmon
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmnetmon/ChangeLog,v 1.8 2007/02/21 23:46:06 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmnetmon/ChangeLog,v 1.9 2007/07/22 04:43:49 dberkholz Exp $
+
+  22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>; wmnetmon-0.2.ebuild:
+  Drop virtual/x11 references.
 
   21 Feb 2007; Markus Ullmann <jokey@gentoo.org> ChangeLog:
   Redigest for Manifest2
diff --git a/x11-plugins/wmnetmon/wmnetmon-0.2.ebuild b/x11-plugins/wmnetmon/wmnetmon-0.2.ebuild
index e723e6bbdc7d..671b95287ba0 100644
--- a/x11-plugins/wmnetmon/wmnetmon-0.2.ebuild
+++ b/x11-plugins/wmnetmon/wmnetmon-0.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-plugins/wmnetmon/wmnetmon-0.2.ebuild,v 1.10 2006/01/31 20:07:46 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmnetmon/wmnetmon-0.2.ebuild,v 1.11 2007/07/22 04:43:49 dberkholz Exp $
 
 IUSE=""
 S=${WORKDIR}/${P}p5/
@@ -12,13 +12,11 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="x86 ppc ~sparc"
 
-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() {
 	econf --prefix=${D}/usr/bin || die "Configure failed."
diff --git a/x11-plugins/wmnetselect/ChangeLog b/x11-plugins/wmnetselect/ChangeLog
index 0b55ad8ee9d6..ba6d570b46a4 100644
--- a/x11-plugins/wmnetselect/ChangeLog
+++ b/x11-plugins/wmnetselect/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-plugins/wmnetselect
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmnetselect/ChangeLog,v 1.12 2007/02/21 23:46:36 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmnetselect/ChangeLog,v 1.13 2007/07/22 04:42:55 dberkholz Exp $
+
+  22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>;
+  wmnetselect-0.8-r1.ebuild:
+  Drop virtual/x11 references.
 
   21 Feb 2007; Markus Ullmann <jokey@gentoo.org> ChangeLog:
   Redigest for Manifest2
diff --git a/x11-plugins/wmnetselect/wmnetselect-0.8-r1.ebuild b/x11-plugins/wmnetselect/wmnetselect-0.8-r1.ebuild
index b5909a672742..ae24a34cde2b 100644
--- a/x11-plugins/wmnetselect/wmnetselect-0.8-r1.ebuild
+++ b/x11-plugins/wmnetselect/wmnetselect-0.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-plugins/wmnetselect/wmnetselect-0.8-r1.ebuild,v 1.12 2006/01/31 20:11:13 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmnetselect/wmnetselect-0.8-r1.ebuild,v 1.13 2007/07/22 04:42:54 dberkholz Exp $
 
 IUSE=""
 DESCRIPTION="WindowMaker browser launcher docklet"
@@ -11,18 +11,14 @@ SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="x86 sparc amd64 ppc"
 
-RDEPEND="|| ( (
-		x11-libs/libX11
-		x11-libs/libXmu
-		x11-libs/libXext
-		x11-libs/libXpm )
-	virtual/x11 )"
+RDEPEND="x11-libs/libX11
+	x11-libs/libXmu
+	x11-libs/libXext
+	x11-libs/libXpm"
 DEPEND="${RDEPEND}
-	|| ( (
-		x11-proto/xproto
-		x11-proto/xextproto
-		x11-misc/imake )
-	virtual/x11 )"
+	x11-proto/xproto
+	x11-proto/xextproto
+	x11-misc/imake"
 
 src_compile() {
 	xmkmf || die
diff --git a/x11-plugins/wmpager/ChangeLog b/x11-plugins/wmpager/ChangeLog
index 6081296c835b..2942f2da0714 100644
--- a/x11-plugins/wmpager/ChangeLog
+++ b/x11-plugins/wmpager/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-plugins/wmpager
-# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmpager/ChangeLog,v 1.9 2006/10/11 20:30:26 grobian Exp $
+# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmpager/ChangeLog,v 1.10 2007/07/22 04:41:20 dberkholz Exp $
+
+  22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>;
+  wmpager-1.2-r1.ebuild:
+  Drop virtual/x11 references.
 
   11 Oct 2006; Fabian Groffen <grobian@gentoo.org> wmpager-1.2-r1.ebuild:
   Put X11 stuff in DEPEND too, you need it during compilation, thanks to
diff --git a/x11-plugins/wmpager/wmpager-1.2-r1.ebuild b/x11-plugins/wmpager/wmpager-1.2-r1.ebuild
index 19f9b3b3f425..540b8b3b423c 100644
--- a/x11-plugins/wmpager/wmpager-1.2-r1.ebuild
+++ b/x11-plugins/wmpager/wmpager-1.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-plugins/wmpager/wmpager-1.2-r1.ebuild,v 1.10 2006/10/11 20:30:26 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmpager/wmpager-1.2-r1.ebuild,v 1.11 2007/07/22 04:41:20 dberkholz Exp $
 
 IUSE=""
 DESCRIPTION="A simple pager docklet for the WindowMaker window manager."
@@ -11,19 +11,12 @@ SLOT="0"
 LICENSE="BSD"
 KEYWORDS="amd64 ~sparc x86"
 
-DEPEND=">=sys-apps/sed-4
-	|| ( (
-			x11-libs/libX11
-			x11-libs/libXpm
-			x11-libs/libXext )
-		virtual/x11 )
-	virtual/libc"
-RDEPEND="|| ( (
-			x11-libs/libX11
-			x11-libs/libXpm
-			x11-libs/libXext )
-		virtual/x11 )
+RDEPEND="x11-libs/libX11
+	x11-libs/libXpm
+	x11-libs/libXext
 	virtual/libc"
+DEPEND="${RDEPEND}
+	>=sys-apps/sed-4"
 
 src_compile() {
 	sed -i "s:\(WMPAGER_DEFAULT_INSTALL_DIR \).*:\1\"/usr/share/wmpager\":" \
diff --git a/x11-plugins/wmpeople/ChangeLog b/x11-plugins/wmpeople/ChangeLog
index 501ca98d2665..754144e6c9c7 100644
--- a/x11-plugins/wmpeople/ChangeLog
+++ b/x11-plugins/wmpeople/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for x11-plugins/wmpeople
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmpeople/ChangeLog,v 1.10 2007/02/21 23:47:07 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmpeople/ChangeLog,v 1.11 2007/07/22 04:40:15 dberkholz Exp $
+
+  22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>; wmpeople-1.3.ebuild:
+  Drop virtual/x11 references.
 
   21 Feb 2007; Markus Ullmann <jokey@gentoo.org> ChangeLog:
   Redigest for Manifest2
diff --git a/x11-plugins/wmpeople/wmpeople-1.3.ebuild b/x11-plugins/wmpeople/wmpeople-1.3.ebuild
index 097fe5400c97..c17cb0c98a7e 100644
--- a/x11-plugins/wmpeople/wmpeople-1.3.ebuild
+++ b/x11-plugins/wmpeople/wmpeople-1.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-plugins/wmpeople/wmpeople-1.3.ebuild,v 1.5 2006/02/03 13:34:48 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmpeople/wmpeople-1.3.ebuild,v 1.6 2007/07/22 04:40:15 dberkholz Exp $
 
 inherit eutils
 
@@ -13,17 +13,13 @@ SLOT="0"
 KEYWORDS="x86 ppc ~sparc"
 IUSE=""
 
-RDEPEND="|| ( (
-		x11-libs/libX11
-		x11-libs/libXext
-		x11-libs/libXt
-		x11-libs/libXpm )
-	virtual/x11 )"
+RDEPEND="x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXt
+	x11-libs/libXpm"
 DEPEND="${RDEPEND}
-	|| ( (
-		x11-proto/xproto
-		x11-proto/xextproto )
-	virtual/x11 )
+	x11-proto/xproto
+	x11-proto/xextproto
 	>=net-mail/peephole-1.2"
 
 src_install() {
diff --git a/x11-plugins/wmpiki/ChangeLog b/x11-plugins/wmpiki/ChangeLog
index 9fe251e29f1e..df9cfba857d0 100644
--- a/x11-plugins/wmpiki/ChangeLog
+++ b/x11-plugins/wmpiki/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for x11-plugins/wmpiki
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmpiki/ChangeLog,v 1.7 2007/02/21 23:47:36 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmpiki/ChangeLog,v 1.8 2007/07/22 04:39:17 dberkholz Exp $
+
+  22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>; wmpiki-0.2.1.ebuild:
+  Drop virtual/x11 references.
 
   21 Feb 2007; Markus Ullmann <jokey@gentoo.org> ChangeLog:
   Redigest for Manifest2
diff --git a/x11-plugins/wmpiki/wmpiki-0.2.1.ebuild b/x11-plugins/wmpiki/wmpiki-0.2.1.ebuild
index c82db1da2fd0..0488ab8ab622 100644
--- a/x11-plugins/wmpiki/wmpiki-0.2.1.ebuild
+++ b/x11-plugins/wmpiki/wmpiki-0.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-plugins/wmpiki/wmpiki-0.2.1.ebuild,v 1.6 2006/01/31 20:12:48 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmpiki/wmpiki-0.2.1.ebuild,v 1.7 2007/07/22 04:39:17 dberkholz Exp $
 
 inherit eutils
 
@@ -14,13 +14,11 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="x86 ppc ~sparc"
 
-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()
 {
diff --git a/x11-plugins/wmpinboard/ChangeLog b/x11-plugins/wmpinboard/ChangeLog
index 8891ae6e7699..924e559b35bb 100644
--- a/x11-plugins/wmpinboard/ChangeLog
+++ b/x11-plugins/wmpinboard/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-plugins/wmpinboard
-# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmpinboard/ChangeLog,v 1.13 2006/07/17 08:58:25 s4t4n Exp $
+# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmpinboard/ChangeLog,v 1.14 2007/07/22 04:38:25 dberkholz Exp $
+
+  22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>;
+  wmpinboard-1.0.ebuild:
+  Drop virtual/x11 references.
 
   17 Jul 2006; Michele Noberasco <s4t4n@gentoo.org> wmpinboard-1.0.ebuild:
   Fixed HOMEPAGE and SRC_URI. Closes bug #140683.
diff --git a/x11-plugins/wmpinboard/wmpinboard-1.0.ebuild b/x11-plugins/wmpinboard/wmpinboard-1.0.ebuild
index 32595b31d056..9f7484de940c 100644
--- a/x11-plugins/wmpinboard/wmpinboard-1.0.ebuild
+++ b/x11-plugins/wmpinboard/wmpinboard-1.0.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-plugins/wmpinboard/wmpinboard-1.0.ebuild,v 1.16 2006/07/17 08:58:25 s4t4n Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmpinboard/wmpinboard-1.0.ebuild,v 1.17 2007/07/22 04:38:25 dberkholz Exp $
 
 inherit eutils
 
@@ -9,16 +9,12 @@ DESCRIPTION="Window Maker dock applet resembling a miniature pinboard."
 SRC_URI="http://dockapps.org/download.php/id/131/${P}.tar.gz"
 HOMEPAGE="http://dockapps.org/file.php/id/93"
 
-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/xproto
-		x11-proto/xextproto )
-	virtual/x11 )"
+	x11-proto/xproto
+	x11-proto/xextproto"
 
 SLOT="0"
 LICENSE="GPL-2"
diff --git a/x11-plugins/wmpop3lb/ChangeLog b/x11-plugins/wmpop3lb/ChangeLog
index 94d6ab2710ec..78bb891e0693 100644
--- a/x11-plugins/wmpop3lb/ChangeLog
+++ b/x11-plugins/wmpop3lb/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-plugins/wmpop3lb
-# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmpop3lb/ChangeLog,v 1.12 2007/04/13 14:35:31 s4t4n Exp $
+# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmpop3lb/ChangeLog,v 1.13 2007/07/22 04:37:20 dberkholz Exp $
+
+  22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>;
+  wmpop3lb-2.4.2.ebuild, wmpop3lb-2.4.2-r2.ebuild:
+  Drop virtual/x11 references.
 
   13 Apr 2007; Michele Noberasco <s4t4n@gentoo.org> wmpop3lb-2.4.2-r2.ebuild:
   Stable for x86.
diff --git a/x11-plugins/wmpop3lb/wmpop3lb-2.4.2-r2.ebuild b/x11-plugins/wmpop3lb/wmpop3lb-2.4.2-r2.ebuild
index f75a6ed08082..1ba5dfb73602 100644
--- a/x11-plugins/wmpop3lb/wmpop3lb-2.4.2-r2.ebuild
+++ b/x11-plugins/wmpop3lb/wmpop3lb-2.4.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-plugins/wmpop3lb/wmpop3lb-2.4.2-r2.ebuild,v 1.2 2007/04/13 14:35:31 s4t4n Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmpop3lb/wmpop3lb-2.4.2-r2.ebuild,v 1.3 2007/07/22 04:37:20 dberkholz Exp $
 
 inherit eutils
 
@@ -16,13 +16,11 @@ SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="~amd64 ~sparc x86"
 
-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
 	>=sys-apps/sed-4"
 
 src_unpack() {
diff --git a/x11-plugins/wmpop3lb/wmpop3lb-2.4.2.ebuild b/x11-plugins/wmpop3lb/wmpop3lb-2.4.2.ebuild
index e528c5e59f92..a43fb8173376 100644
--- a/x11-plugins/wmpop3lb/wmpop3lb-2.4.2.ebuild
+++ b/x11-plugins/wmpop3lb/wmpop3lb-2.4.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-plugins/wmpop3lb/wmpop3lb-2.4.2.ebuild,v 1.9 2006/01/31 20:18:13 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmpop3lb/wmpop3lb-2.4.2.ebuild,v 1.10 2007/07/22 04:37:20 dberkholz Exp $
 
 IUSE=""
 
@@ -14,13 +14,11 @@ SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="x86 amd64"
 
-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
 	>=sys-apps/sed-4"
 
 src_unpack() {
diff --git a/x11-plugins/wmpower/ChangeLog b/x11-plugins/wmpower/ChangeLog
index d25c5504855c..8f82d50ddbce 100644
--- a/x11-plugins/wmpower/ChangeLog
+++ b/x11-plugins/wmpower/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for x11-plugins/wmpower
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmpower/ChangeLog,v 1.27 2007/02/21 23:48:06 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmpower/ChangeLog,v 1.28 2007/07/22 04:36:18 dberkholz Exp $
+
+  22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>; wmpower-0.4.2.ebuild:
+  Drop virtual/x11 references.
 
   21 Feb 2007; Markus Ullmann <jokey@gentoo.org> ChangeLog:
   Redigest for Manifest2
diff --git a/x11-plugins/wmpower/wmpower-0.4.2.ebuild b/x11-plugins/wmpower/wmpower-0.4.2.ebuild
index 4571d16b5434..b7cfc5aee9b7 100644
--- a/x11-plugins/wmpower/wmpower-0.4.2.ebuild
+++ b/x11-plugins/wmpower/wmpower-0.4.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-plugins/wmpower/wmpower-0.4.2.ebuild,v 1.6 2006/02/07 21:14:22 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmpower/wmpower-0.4.2.ebuild,v 1.7 2007/07/22 04:36:18 dberkholz Exp $
 
 IUSE=""
 
@@ -12,16 +12,12 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ppc x86"
 
-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/xproto
-		x11-proto/xextproto )
-	virtual/x11 )"
+	x11-proto/xproto
+	x11-proto/xextproto"
 
 src_compile()
 {
diff --git a/x11-plugins/wmppp/ChangeLog b/x11-plugins/wmppp/ChangeLog
index 3c80c37e99cc..a922acab730c 100644
--- a/x11-plugins/wmppp/ChangeLog
+++ b/x11-plugins/wmppp/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for x11-plugins/wmppp
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmppp/ChangeLog,v 1.10 2007/02/06 02:04:51 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmppp/ChangeLog,v 1.11 2007/07/22 04:35:34 dberkholz Exp $
+
+  22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>; wmppp-1.3.0.ebuild:
+  Drop virtual/x11 references.
 
   06 Feb 2007; Diego Pettenò <flameeyes@gentoo.org> ChangeLog:
   Regenerate digest in Manifest2 format.
diff --git a/x11-plugins/wmppp/wmppp-1.3.0.ebuild b/x11-plugins/wmppp/wmppp-1.3.0.ebuild
index ff9a6f73818a..2f34159c68a1 100644
--- a/x11-plugins/wmppp/wmppp-1.3.0.ebuild
+++ b/x11-plugins/wmppp/wmppp-1.3.0.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-plugins/wmppp/wmppp-1.3.0.ebuild,v 1.12 2006/01/15 18:07:10 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmppp/wmppp-1.3.0.ebuild,v 1.13 2007/07/22 04:35:34 dberkholz Exp $
 
 IUSE=""
 S=${WORKDIR}/wmppp.app/wmppp
@@ -8,13 +8,11 @@ DESCRIPTION="Network monitoring dock.app"
 SRC_URI="http://web.cs.mun.ca/~gstarkes/wmaker/dockapps/files/${P}.tar.gz"
 HOMEPAGE="http://windowmaker.mezaway.org/" #but this site has been dead for a while ;(
 
-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"
 
 SLOT="0"
 LICENSE="GPL-2"
diff --git a/x11-plugins/wmrecord/ChangeLog b/x11-plugins/wmrecord/ChangeLog
index 21d04d335c29..175325d4a6ee 100644
--- a/x11-plugins/wmrecord/ChangeLog
+++ b/x11-plugins/wmrecord/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-plugins/wmrecord
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmrecord/ChangeLog,v 1.7 2007/02/21 23:48:35 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmrecord/ChangeLog,v 1.8 2007/07/22 04:34:46 dberkholz Exp $
+
+  22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>;
+  wmrecord-1.0.5.3-r1.ebuild:
+  Drop virtual/x11 references.
 
   21 Feb 2007; Markus Ullmann <jokey@gentoo.org> ChangeLog:
   Redigest for Manifest2
diff --git a/x11-plugins/wmrecord/wmrecord-1.0.5.3-r1.ebuild b/x11-plugins/wmrecord/wmrecord-1.0.5.3-r1.ebuild
index 29fe779cb037..481e8f4755e7 100644
--- a/x11-plugins/wmrecord/wmrecord-1.0.5.3-r1.ebuild
+++ b/x11-plugins/wmrecord/wmrecord-1.0.5.3-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-plugins/wmrecord/wmrecord-1.0.5.3-r1.ebuild,v 1.3 2006/07/16 21:47:22 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmrecord/wmrecord-1.0.5.3-r1.ebuild,v 1.4 2007/07/22 04:34:46 dberkholz Exp $
 
 IUSE=""
 
@@ -8,13 +8,11 @@ DESCRIPTION="A Dockable General Purpose Recording Utility"
 SRC_URI="http://ret009t0.eresmas.net/other_software/wmrecord/${PN}-1.0.5_20040218_0029.tgz"
 HOMEPAGE="http://ret009t0.eresmas.net/other_software/wmrecord/"
 
-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"
 
 SLOT="0"
 LICENSE="GPL-2"
diff --git a/x11-plugins/wmsensormon/ChangeLog b/x11-plugins/wmsensormon/ChangeLog
index a8ea1a66efe6..899e6882b980 100644
--- a/x11-plugins/wmsensormon/ChangeLog
+++ b/x11-plugins/wmsensormon/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-plugins/wmsensormon
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmsensormon/ChangeLog,v 1.17 2007/02/21 23:49:04 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmsensormon/ChangeLog,v 1.18 2007/07/22 04:33:49 dberkholz Exp $
+
+  22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>;
+  wmsensormon-1.2.1.ebuild:
+  Drop virtual/x11 references.
 
   21 Feb 2007; Markus Ullmann <jokey@gentoo.org> ChangeLog:
   Redigest for Manifest2
diff --git a/x11-plugins/wmsensormon/wmsensormon-1.2.1.ebuild b/x11-plugins/wmsensormon/wmsensormon-1.2.1.ebuild
index ec0bab7f271b..0ddd22c5506d 100644
--- a/x11-plugins/wmsensormon/wmsensormon-1.2.1.ebuild
+++ b/x11-plugins/wmsensormon/wmsensormon-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-plugins/wmsensormon/wmsensormon-1.2.1.ebuild,v 1.6 2006/02/02 16:33:13 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmsensormon/wmsensormon-1.2.1.ebuild,v 1.7 2007/07/22 04:33:49 dberkholz Exp $
 
 IUSE=""
 S=${WORKDIR}/${P/_/-}/${PN}
@@ -11,13 +11,11 @@ SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="x86 amd64"
 
-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
 	>=sys-apps/lm_sensors-2.8.7"
 
 src_compile() {
diff --git a/x11-plugins/wmsmixer/ChangeLog b/x11-plugins/wmsmixer/ChangeLog
index 09c16da630d3..c1519fdc7d0a 100644
--- a/x11-plugins/wmsmixer/ChangeLog
+++ b/x11-plugins/wmsmixer/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-plugins/wmsmixer
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmsmixer/ChangeLog,v 1.21 2007/02/21 23:49:35 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmsmixer/ChangeLog,v 1.22 2007/07/22 04:32:58 dberkholz Exp $
+
+  22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>;
+  wmsmixer-0.5.1.ebuild:
+  Drop virtual/x11 references.
 
   21 Feb 2007; Markus Ullmann <jokey@gentoo.org> ChangeLog:
   Redigest for Manifest2
diff --git a/x11-plugins/wmsmixer/wmsmixer-0.5.1.ebuild b/x11-plugins/wmsmixer/wmsmixer-0.5.1.ebuild
index 008321839244..b2da03bba7da 100644
--- a/x11-plugins/wmsmixer/wmsmixer-0.5.1.ebuild
+++ b/x11-plugins/wmsmixer/wmsmixer-0.5.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-plugins/wmsmixer/wmsmixer-0.5.1.ebuild,v 1.9 2006/01/31 20:40:38 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmsmixer/wmsmixer-0.5.1.ebuild,v 1.10 2007/07/22 04:32:58 dberkholz Exp $
 
 inherit eutils
 IUSE=""
@@ -12,16 +12,12 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ~ppc ppc64 ~sparc x86"
 
-RDEPEND="|| ( (
-		x11-libs/libXpm
-		x11-libs/libXext
-		x11-libs/libX11 )
-	virtual/x11 )"
+RDEPEND="x11-libs/libXpm
+	x11-libs/libXext
+	x11-libs/libX11"
 DEPEND="${RDEPEND}
-	|| ( (
-		x11-proto/xproto
-		x11-proto/xextproto )
-	virtual/x11 )"
+	x11-proto/xproto
+	x11-proto/xextproto"
 
 src_compile() {
 	g++ ${CFLAGS} -I/usr/X11R6/include -c -o wmsmixer.o wmsmixer.cc
diff --git a/x11-plugins/wmswallow/ChangeLog b/x11-plugins/wmswallow/ChangeLog
index 9dc67dd24a87..496069566744 100644
--- a/x11-plugins/wmswallow/ChangeLog
+++ b/x11-plugins/wmswallow/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-plugins/wmswallow
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmswallow/ChangeLog,v 1.6 2007/02/21 23:50:03 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmswallow/ChangeLog,v 1.7 2007/07/22 04:27:36 dberkholz Exp $
+
+  22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>;
+  wmswallow-0.6.1.ebuild:
+  Drop virtual/x11 references.
 
   21 Feb 2007; Markus Ullmann <jokey@gentoo.org> ChangeLog:
   Redigest for Manifest2
diff --git a/x11-plugins/wmswallow/wmswallow-0.6.1.ebuild b/x11-plugins/wmswallow/wmswallow-0.6.1.ebuild
index bf0b2949cbb6..58e389b042fd 100644
--- a/x11-plugins/wmswallow/wmswallow-0.6.1.ebuild
+++ b/x11-plugins/wmswallow/wmswallow-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-plugins/wmswallow/wmswallow-0.6.1.ebuild,v 1.8 2007/07/11 20:39:22 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmswallow/wmswallow-0.6.1.ebuild,v 1.9 2007/07/22 04:27:36 dberkholz Exp $
 
 IUSE=""
 
@@ -12,15 +12,11 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="x86 amd64"
 
-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"
 
 S=${WORKDIR}/wmswallow
 
diff --git a/x11-plugins/wmsysmon/ChangeLog b/x11-plugins/wmsysmon/ChangeLog
index 4665a20ea4b7..fa3e2f718bff 100644
--- a/x11-plugins/wmsysmon/ChangeLog
+++ b/x11-plugins/wmsysmon/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-plugins/wmsysmon
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmsysmon/ChangeLog,v 1.29 2007/02/06 02:05:53 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmsysmon/ChangeLog,v 1.30 2007/07/22 04:26:48 dberkholz Exp $
+
+  22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>;
+  wmsysmon-0.7.6-r3.ebuild, wmsysmon-0.7.7.ebuild:
+  Drop virtual/x11 references.
 
   06 Feb 2007; Diego Pettenò <flameeyes@gentoo.org> ChangeLog:
   Regenerate digest in Manifest2 format.
diff --git a/x11-plugins/wmsysmon/wmsysmon-0.7.6-r3.ebuild b/x11-plugins/wmsysmon/wmsysmon-0.7.6-r3.ebuild
index ca0d5d5a6692..cbe4b59a3c7a 100644
--- a/x11-plugins/wmsysmon/wmsysmon-0.7.6-r3.ebuild
+++ b/x11-plugins/wmsysmon/wmsysmon-0.7.6-r3.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-plugins/wmsysmon/wmsysmon-0.7.6-r3.ebuild,v 1.10 2006/01/31 20:56:40 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmsysmon/wmsysmon-0.7.6-r3.ebuild,v 1.11 2007/07/22 04:26:48 dberkholz Exp $
 
 inherit eutils
 
@@ -13,13 +13,11 @@ SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="x86 sparc alpha amd64 ppc ppc64"
 
-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_unpack()
 {
diff --git a/x11-plugins/wmsysmon/wmsysmon-0.7.7.ebuild b/x11-plugins/wmsysmon/wmsysmon-0.7.7.ebuild
index a44610e43b4e..9a8d1b81dbfe 100644
--- a/x11-plugins/wmsysmon/wmsysmon-0.7.7.ebuild
+++ b/x11-plugins/wmsysmon/wmsysmon-0.7.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-plugins/wmsysmon/wmsysmon-0.7.7.ebuild,v 1.8 2006/02/20 18:18:34 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmsysmon/wmsysmon-0.7.7.ebuild,v 1.9 2007/07/22 04:26:48 dberkholz Exp $
 
 inherit eutils
 
@@ -13,13 +13,11 @@ SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
 
-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_unpack()
 {
diff --git a/x11-plugins/wmtop/ChangeLog b/x11-plugins/wmtop/ChangeLog
index a5fa01efed1a..41811df7c5a3 100644
--- a/x11-plugins/wmtop/ChangeLog
+++ b/x11-plugins/wmtop/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for x11-plugins/wmtop
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmtop/ChangeLog,v 1.8 2007/02/21 23:51:08 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmtop/ChangeLog,v 1.9 2007/07/22 04:25:22 dberkholz Exp $
+
+  22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>; wmtop-0.84.ebuild:
+  Drop virtual/x11 references.
 
   21 Feb 2007; Markus Ullmann <jokey@gentoo.org> ChangeLog:
   Redigest for Manifest2
diff --git a/x11-plugins/wmtop/wmtop-0.84.ebuild b/x11-plugins/wmtop/wmtop-0.84.ebuild
index 033640b96511..c3c821197ac7 100644
--- a/x11-plugins/wmtop/wmtop-0.84.ebuild
+++ b/x11-plugins/wmtop/wmtop-0.84.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-plugins/wmtop/wmtop-0.84.ebuild,v 1.11 2006/01/31 21:00:15 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmtop/wmtop-0.84.ebuild,v 1.12 2007/07/22 04:25:22 dberkholz Exp $
 
 IUSE=""
 DESCRIPTION="top in a dockapp"
@@ -11,16 +11,12 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="x86 ~sparc amd64 ppc"
 
-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/xproto
-		x11-proto/xextproto )
-	virtual/x11 )
+	x11-proto/xproto
+	x11-proto/xextproto
 	>=sys-apps/sed-4"
 
 src_unpack() {
diff --git a/x11-plugins/wmtz/ChangeLog b/x11-plugins/wmtz/ChangeLog
index e1a825a9b531..a05793c0d682 100644
--- a/x11-plugins/wmtz/ChangeLog
+++ b/x11-plugins/wmtz/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for x11-plugins/wmtz
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmtz/ChangeLog,v 1.15 2007/02/21 23:51:50 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmtz/ChangeLog,v 1.16 2007/07/22 04:24:31 dberkholz Exp $
+
+  22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>; wmtz-0.7.ebuild:
+  Drop virtual/x11 references.
 
   21 Feb 2007; Markus Ullmann <jokey@gentoo.org> ChangeLog:
   Redigest for Manifest2
diff --git a/x11-plugins/wmtz/wmtz-0.7.ebuild b/x11-plugins/wmtz/wmtz-0.7.ebuild
index e6f7cff8dbd4..d88e47bde948 100644
--- a/x11-plugins/wmtz/wmtz-0.7.ebuild
+++ b/x11-plugins/wmtz/wmtz-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-plugins/wmtz/wmtz-0.7.ebuild,v 1.15 2006/01/31 21:01:53 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmtz/wmtz-0.7.ebuild,v 1.16 2007/07/22 04:24:31 dberkholz Exp $
 
 inherit eutils toolchain-funcs
 
@@ -13,13 +13,11 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="x86 amd64 ppc ~sparc"
 
-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_unpack() {
 	unpack ${A}
diff --git a/x11-plugins/wmupmon/ChangeLog b/x11-plugins/wmupmon/ChangeLog
index 5e78decfb377..e60a8921d85f 100644
--- a/x11-plugins/wmupmon/ChangeLog
+++ b/x11-plugins/wmupmon/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-plugins/wmupmon
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmupmon/ChangeLog,v 1.19 2007/06/29 14:36:54 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmupmon/ChangeLog,v 1.20 2007/07/22 04:23:35 dberkholz Exp $
+
+  22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>; wmupmon-0.1.2.ebuild,
+  wmupmon-0.1.3.ebuild, wmupmon-0.1.3-r1.ebuild:
+  Drop virtual/x11 references.
 
   29 Jun 2007; Christoph Mende <angelos@gentoo.org> wmupmon-0.1.3-r1.ebuild:
   Stable on amd64 wrt bug #183653
diff --git a/x11-plugins/wmupmon/wmupmon-0.1.2.ebuild b/x11-plugins/wmupmon/wmupmon-0.1.2.ebuild
index d77c56501485..f21e7de52d09 100644
--- a/x11-plugins/wmupmon/wmupmon-0.1.2.ebuild
+++ b/x11-plugins/wmupmon/wmupmon-0.1.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-plugins/wmupmon/wmupmon-0.1.2.ebuild,v 1.8 2006/01/31 21:03:59 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmupmon/wmupmon-0.1.2.ebuild,v 1.9 2007/07/22 04:23:35 dberkholz Exp $
 
 DESCRIPTION="wmUpMon is a program to monitor your Uptime"
 HOMEPAGE="http://j-z-s.com/projects/index.php?project=wmupmon"
@@ -10,14 +10,12 @@ SLOT="0"
 KEYWORDS="x86 ~sparc amd64 ppc ppc64"
 IUSE=""
 
-RDEPEND="|| ( (
-		x11-libs/libX11
-		x11-libs/libXext
-		x11-libs/libXt
-		x11-libs/libXpm )
-	virtual/x11 )"
+RDEPEND="x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXt
+	x11-libs/libXpm"
 DEPEND="${RDEPEND}
-	|| ( x11-proto/xextproto virtual/x11 )"
+	x11-proto/xextproto"
 
 src_compile()
 {
diff --git a/x11-plugins/wmupmon/wmupmon-0.1.3-r1.ebuild b/x11-plugins/wmupmon/wmupmon-0.1.3-r1.ebuild
index 30d1aa9b24b0..ffd41dff54a9 100644
--- a/x11-plugins/wmupmon/wmupmon-0.1.3-r1.ebuild
+++ b/x11-plugins/wmupmon/wmupmon-0.1.3-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-plugins/wmupmon/wmupmon-0.1.3-r1.ebuild,v 1.4 2007/06/29 14:36:54 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmupmon/wmupmon-0.1.3-r1.ebuild,v 1.5 2007/07/22 04:23:35 dberkholz Exp $
 
 inherit eutils
 
@@ -12,14 +12,12 @@ SLOT="0"
 KEYWORDS="amd64 ~ppc ppc64 ~sparc x86"
 IUSE=""
 
-RDEPEND="|| ( (
-		x11-libs/libX11
-		x11-libs/libXext
-		x11-libs/libXt
-		x11-libs/libXpm )
-	virtual/x11 )"
+RDEPEND="x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXt
+	x11-libs/libXpm"
 DEPEND="${RDEPEND}
-	|| ( x11-proto/xextproto virtual/x11 )"
+	x11-proto/xextproto"
 
 src_unpack() {
 	unpack ${A}
diff --git a/x11-plugins/wmupmon/wmupmon-0.1.3.ebuild b/x11-plugins/wmupmon/wmupmon-0.1.3.ebuild
index 0d52fa5d72fe..563f0c6c8abc 100644
--- a/x11-plugins/wmupmon/wmupmon-0.1.3.ebuild
+++ b/x11-plugins/wmupmon/wmupmon-0.1.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-plugins/wmupmon/wmupmon-0.1.3.ebuild,v 1.5 2006/03/27 12:19:06 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmupmon/wmupmon-0.1.3.ebuild,v 1.6 2007/07/22 04:23:35 dberkholz Exp $
 
 DESCRIPTION="wmUpMon is a program to monitor your Uptime"
 HOMEPAGE="http://j-z-s.com/projects/index.php?project=wmupmon"
@@ -10,14 +10,12 @@ SLOT="0"
 KEYWORDS="~amd64 ppc ppc64 ~sparc x86"
 IUSE=""
 
-RDEPEND="|| ( (
-		x11-libs/libX11
-		x11-libs/libXext
-		x11-libs/libXt
-		x11-libs/libXpm )
-	virtual/x11 )"
+RDEPEND="x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXt
+	x11-libs/libXpm"
 DEPEND="${RDEPEND}
-	|| ( x11-proto/xextproto virtual/x11 )"
+	x11-proto/xextproto"
 
 src_compile()
 {
diff --git a/x11-plugins/wmwave/ChangeLog b/x11-plugins/wmwave/ChangeLog
index 52601a57ebe0..71ddb1c91d30 100644
--- a/x11-plugins/wmwave/ChangeLog
+++ b/x11-plugins/wmwave/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for x11-plugins/wmwave
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmwave/ChangeLog,v 1.8 2007/02/21 23:52:31 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmwave/ChangeLog,v 1.9 2007/07/22 04:19:07 dberkholz Exp $
+
+  22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>; wmwave-0.4.ebuild:
+  Drop virtual/x11 references.
 
   21 Feb 2007; Markus Ullmann <jokey@gentoo.org> ChangeLog:
   Redigest for Manifest2
diff --git a/x11-plugins/wmwave/wmwave-0.4.ebuild b/x11-plugins/wmwave/wmwave-0.4.ebuild
index 03f37610354d..6704384d081e 100644
--- a/x11-plugins/wmwave/wmwave-0.4.ebuild
+++ b/x11-plugins/wmwave/wmwave-0.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-plugins/wmwave/wmwave-0.4.ebuild,v 1.8 2006/01/31 21:06:41 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmwave/wmwave-0.4.ebuild,v 1.9 2007/07/22 04:19:07 dberkholz Exp $
 
 IUSE=""
 S="${WORKDIR}/wmwave"
@@ -11,13 +11,11 @@ HOMEPAGE="http://wmwave.sourceforge.net/"
 LICENSE="GPL-2"
 SLOT="0"
 
-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 FLAGS="${CFLAGS}" || die "Compilation failed"
diff --git a/x11-plugins/wmweather/ChangeLog b/x11-plugins/wmweather/ChangeLog
index 081ed3ecfc2a..8dc48287210f 100644
--- a/x11-plugins/wmweather/ChangeLog
+++ b/x11-plugins/wmweather/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-plugins/wmweather
-# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmweather/ChangeLog,v 1.17 2006/09/11 08:33:20 s4t4n Exp $
+# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmweather/ChangeLog,v 1.18 2007/07/22 04:17:49 dberkholz Exp $
+
+  22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>;
+  wmweather-2.4.0.ebuild:
+  Drop virtual/x11 references.
 
   11 Sep 2006; Michele Noberasco <s4t4n@gentoo.org> wmweather-2.4.0.ebuild:
   Added x11-apps/xmessage to RDEPEND. Closes bug #147016.
diff --git a/x11-plugins/wmweather/wmweather-2.4.0.ebuild b/x11-plugins/wmweather/wmweather-2.4.0.ebuild
index 79ce0fba4d78..cfffb309bb6a 100644
--- a/x11-plugins/wmweather/wmweather-2.4.0.ebuild
+++ b/x11-plugins/wmweather/wmweather-2.4.0.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-plugins/wmweather/wmweather-2.4.0.ebuild,v 1.16 2006/09/11 08:33:20 s4t4n Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmweather/wmweather-2.4.0.ebuild,v 1.17 2007/07/22 04:17:49 dberkholz Exp $
 
 IUSE=""
 DESCRIPTION="Dockable applet for WindowMaker that shows weather."
@@ -11,16 +11,14 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="x86 sparc amd64 ~mips ppc ppc64"
 
-RDEPEND="|| ( (
-		x11-libs/libX11
-		x11-libs/libXt
-		x11-libs/libXext
-		x11-libs/libXpm
-		>=x11-apps/xmessage-1.0.1 )
-	virtual/x11 )
+RDEPEND="x11-libs/libX11
+	x11-libs/libXt
+	x11-libs/libXext
+	x11-libs/libXpm
+	>=x11-apps/xmessage-1.0.1
 	net-misc/curl"
 DEPEND="${RDEPEND}
-	|| ( x11-proto/xextproto virtual/x11 )"
+	x11-proto/xextproto"
 
 src_compile() {
 	cd ${S}/src
diff --git a/x11-plugins/wmwifi/ChangeLog b/x11-plugins/wmwifi/ChangeLog
index 573ee3c0856f..37e7bbab05dd 100644
--- a/x11-plugins/wmwifi/ChangeLog
+++ b/x11-plugins/wmwifi/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for x11-plugins/wmwifi
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmwifi/ChangeLog,v 1.14 2007/06/15 13:14:42 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmwifi/ChangeLog,v 1.15 2007/07/22 04:16:54 dberkholz Exp $
+
+  22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>; wmwifi-0.5.ebuild:
+  Drop virtual/x11 references.
 
   15 Jun 2007; Christoph Mende <angelos@gentoo.org> wmwifi-0.5.ebuild:
   Stable on amd64 wrt bug 179508
diff --git a/x11-plugins/wmwifi/wmwifi-0.5.ebuild b/x11-plugins/wmwifi/wmwifi-0.5.ebuild
index c2e9a6b67d25..83a4b6cdc03d 100644
--- a/x11-plugins/wmwifi/wmwifi-0.5.ebuild
+++ b/x11-plugins/wmwifi/wmwifi-0.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/x11-plugins/wmwifi/wmwifi-0.5.ebuild,v 1.8 2007/06/15 13:14:42 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmwifi/wmwifi-0.5.ebuild,v 1.9 2007/07/22 04:16:54 dberkholz Exp $
 
 IUSE=""
 HOMEPAGE="http://wmwifi.digitalssg.net"
@@ -11,17 +11,13 @@ SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="amd64 ppc 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
 	=sys-devel/automake-1.4*"
 
 src_unpack()
diff --git a/x11-plugins/wmxkb/ChangeLog b/x11-plugins/wmxkb/ChangeLog
index d7b24c11f734..0a6e67312439 100644
--- a/x11-plugins/wmxkb/ChangeLog
+++ b/x11-plugins/wmxkb/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for x11-plugins/wmxkb
-# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmxkb/ChangeLog,v 1.8 2006/12/27 14:17:43 peper Exp $
+# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmxkb/ChangeLog,v 1.9 2007/07/22 04:16:09 dberkholz Exp $
+
+  22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>; wmxkb-1.2.2.ebuild:
+  Drop virtual/x11 references.
 
   27 Dec 2006; Piotr Jaroszyński <peper@gentoo.org> wmxkb-1.2.2.ebuild:
   Add ~amd64 wrt bug #126742.
diff --git a/x11-plugins/wmxkb/wmxkb-1.2.2.ebuild b/x11-plugins/wmxkb/wmxkb-1.2.2.ebuild
index 8bfdab432b12..ace2b5e30b68 100644
--- a/x11-plugins/wmxkb/wmxkb-1.2.2.ebuild
+++ b/x11-plugins/wmxkb/wmxkb-1.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-plugins/wmxkb/wmxkb-1.2.2.ebuild,v 1.5 2006/12/27 14:17:43 peper Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmxkb/wmxkb-1.2.2.ebuild,v 1.6 2007/07/22 04:16:09 dberkholz Exp $
 
 IUSE=""
 
@@ -12,18 +12,14 @@ SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="~amd64 ~ppc ~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/xproto
-		x11-proto/xextproto
-		x11-proto/inputproto )
-	virtual/x11 )"
+	x11-proto/xproto
+	x11-proto/xextproto
+	x11-proto/inputproto"
 
 src_install () {
 	make DESTDIR=${D} BINDIR=${D}/usr/bin DOCDIR=${D}/usr/share/doc DATADIR=${D}/usr/share install
diff --git a/x11-plugins/wmxres/ChangeLog b/x11-plugins/wmxres/ChangeLog
index 4814b6a99446..70e2ba431eeb 100644
--- a/x11-plugins/wmxres/ChangeLog
+++ b/x11-plugins/wmxres/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for x11-plugins/wmxres
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmxres/ChangeLog,v 1.5 2007/02/21 23:53:03 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmxres/ChangeLog,v 1.6 2007/07/22 04:15:24 dberkholz Exp $
+
+  22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>; wmxres-1.2.ebuild:
+  Drop virtual/x11 references.
 
   21 Feb 2007; Markus Ullmann <jokey@gentoo.org> ChangeLog:
   Redigest for Manifest2
diff --git a/x11-plugins/wmxres/wmxres-1.2.ebuild b/x11-plugins/wmxres/wmxres-1.2.ebuild
index 657d930e7c3c..5b7f5d1d3563 100644
--- a/x11-plugins/wmxres/wmxres-1.2.ebuild
+++ b/x11-plugins/wmxres/wmxres-1.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-plugins/wmxres/wmxres-1.2.ebuild,v 1.4 2006/01/31 21:15:04 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmxres/wmxres-1.2.ebuild,v 1.5 2007/07/22 04:15:24 dberkholz Exp $
 
 inherit eutils
 
@@ -10,18 +10,14 @@ DESCRIPTION="Dock application to select your display mode among those possible"
 SRC_URI="http://yalla.free.fr/wn/${PN}-1.1-0.tar.gz"
 HOMEPAGE="http://yalla.free.fr/wn/"
 
-RDEPEND="|| ( (
-		x11-libs/libX11
-		x11-libs/libXext
-		x11-libs/libXpm
-		x11-libs/libXxf86vm )
-	virtual/x11 )"
+RDEPEND="x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXpm
+	x11-libs/libXxf86vm"
 DEPEND="${RDEPEND}
-	|| ( (
-		x11-proto/xextproto
-		x11-proto/xf86vidmodeproto
-		x11-proto/xf86dgaproto )
-	virtual/x11 )"
+	x11-proto/xextproto
+	x11-proto/xf86vidmodeproto
+	x11-proto/xf86dgaproto"
 
 SLOT="0"
 LICENSE="GPL-1"