Drop virtual/x11 references.

Package-Manager: portage-2.1.3_rc8

37 files changed, 201 insertions, 184 deletions

diff --git a/net-misc/icaclient/ChangeLog b/net-misc/icaclient/ChangeLog
index 8f714871279f..9f1f6de333ea 100644
--- a/net-misc/icaclient/ChangeLog
+++ b/net-misc/icaclient/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-misc/icaclient
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/icaclient/ChangeLog,v 1.32 2007/04/10 21:54:22 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/icaclient/ChangeLog,v 1.33 2007/07/22 08:19:01 dberkholz Exp $
+
+  22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>; icaclient-9.0.ebuild:
+  Drop virtual/x11 references.
 
 *icaclient-10.0 (10 Apr 2007)
 
diff --git a/net-misc/icaclient/icaclient-9.0.ebuild b/net-misc/icaclient/icaclient-9.0.ebuild
index ebf9a64e806e..75ba922d5517 100644
--- a/net-misc/icaclient/icaclient-9.0.ebuild
+++ b/net-misc/icaclient/icaclient-9.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/net-misc/icaclient/icaclient-9.0.ebuild,v 1.8 2007/04/09 16:14:04 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/icaclient/icaclient-9.0.ebuild,v 1.9 2007/07/22 08:19:01 dberkholz Exp $
 
 inherit eutils multilib
 
@@ -15,13 +15,11 @@ IUSE=""
 RESTRICT="fetch"
 
 RDEPEND="virtual/libc
-	|| (
-		( x11-libs/libXp
-			x11-libs/libXaw
-			x11-libs/libX11
-			x11-libs/libSM
-			x11-libs/libICE )
-		 virtual/x11 )
+	x11-libs/libXp
+	x11-libs/libXaw
+	x11-libs/libX11
+	x11-libs/libSM
+	x11-libs/libICE
 	>=x11-libs/openmotif-2.2.2
 	amd64? ( >=app-emulation/emul-linux-x86-xlibs-1.0 )"
 DEPEND="${RDEPEND}
diff --git a/net-misc/lsh/ChangeLog b/net-misc/lsh/ChangeLog
index 1704cfd8c5eb..4f2ae1f26fe6 100644
--- a/net-misc/lsh/ChangeLog
+++ b/net-misc/lsh/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-misc/lsh
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/lsh/ChangeLog,v 1.17 2007/05/14 19:45:44 bangert Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/lsh/ChangeLog,v 1.18 2007/07/22 08:18:08 dberkholz Exp $
+
+  22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>; lsh-2.0.1-r2.ebuild:
+  Drop virtual/x11 references.
 
   14 May 2007; Thilo Bangert <bangert@gentoo.org> metadata.xml:
   add <herd>no-herd</herd>
diff --git a/net-misc/lsh/lsh-2.0.1-r2.ebuild b/net-misc/lsh/lsh-2.0.1-r2.ebuild
index b33e3a183790..a51b9e56beb9 100644
--- a/net-misc/lsh/lsh-2.0.1-r2.ebuild
+++ b/net-misc/lsh/lsh-2.0.1-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/net-misc/lsh/lsh-2.0.1-r2.ebuild,v 1.7 2007/06/26 02:32:58 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/lsh/lsh-2.0.1-r2.ebuild,v 1.8 2007/07/22 08:18:08 dberkholz Exp $
 
 inherit eutils
 
@@ -18,7 +18,7 @@ RDEPEND="dev-libs/gmp
 	dev-libs/liboop
 	dev-libs/nettle
 	zlib? ( sys-libs/zlib )
-	X? ( || ( ( x11-libs/libXau ) virtual/x11 ) )
+	X? ( x11-libs/libXau )
 	tcpd? ( sys-apps/tcp-wrappers )
 	pam? ( sys-libs/pam )"
 #	kerberos? ( virtual/krb5 )
diff --git a/net-misc/nx/ChangeLog b/net-misc/nx/ChangeLog
index 92605b39be8b..80a2c80b63bf 100644
--- a/net-misc/nx/ChangeLog
+++ b/net-misc/nx/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-misc/nx
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/nx/ChangeLog,v 1.5 2007/07/03 11:10:53 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/nx/ChangeLog,v 1.6 2007/07/22 08:01:53 dberkholz Exp $
+
+  22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>; nx-1.5.0.ebuild:
+  Drop virtual/x11 references.
 
   03 Jul 2007; Christian Faulhammer <opfer@gentoo.org> nx-2.1.0.ebuild:
   stable x86, bug 180040
diff --git a/net-misc/nx/nx-1.5.0.ebuild b/net-misc/nx/nx-1.5.0.ebuild
index 574c1976ac85..6d7d685029c4 100644
--- a/net-misc/nx/nx-1.5.0.ebuild
+++ b/net-misc/nx/nx-1.5.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/net-misc/nx/nx-1.5.0.ebuild,v 1.2 2007/04/26 10:06:32 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/nx/nx-1.5.0.ebuild,v 1.3 2007/07/22 08:01:53 dberkholz Exp $
 
 inherit eutils
 
@@ -27,44 +27,35 @@ SLOT="0"
 KEYWORDS="~x86"
 IUSE="rdesktop vnc"
 
-RDEPEND="|| ( ( x11-libs/libX11
-				x11-libs/libFS
-				x11-libs/libXvMC
-				x11-libs/libICE
-				x11-libs/libXmu
-				x11-libs/libXdmcp
-				x11-libs/libSM
-				x11-libs/libXt
-				x11-libs/libXau
-				x11-libs/libXaw
-				x11-libs/libXp
-				x11-libs/libXpm
-				x11-libs/libXext
-				dev-libs/openssl
-				media-libs/mesa
-			)
-			virtual/x11
-		)
+RDEPEND="x11-libs/libX11
+		x11-libs/libFS
+		x11-libs/libXvMC
+		x11-libs/libICE
+		x11-libs/libXmu
+		x11-libs/libXdmcp
+		x11-libs/libSM
+		x11-libs/libXt
+		x11-libs/libXau
+		x11-libs/libXaw
+		x11-libs/libXp
+		x11-libs/libXpm
+		x11-libs/libXext
+		dev-libs/openssl
+		media-libs/mesa
 		>=media-libs/jpeg-6b-r4
 		>=media-libs/libpng-1.2.8
 		>=sys-libs/zlib-1.2.3
 		virtual/libc"
 
 DEPEND="${RDEPEND}
-		|| ( ( x11-proto/xproto
-				x11-proto/xf86vidmodeproto
-				x11-proto/glproto
-				x11-proto/videoproto
-				x11-proto/xextproto
-				x11-proto/fontsproto
-
-				x11-misc/gccmakedep
-				x11-misc/imake
-
-				app-text/rman
-			)
-			virtual/x11
-		)
+		x11-proto/xproto
+		x11-proto/xf86vidmodeproto
+		x11-proto/glproto
+		x11-proto/videoproto
+		x11-proto/xextproto
+		x11-proto/fontsproto
+		x11-misc/gccmakedep
+		x11-misc/imake
 		app-text/rman
 		"
 S=${WORKDIR}/${PN//x11/X11}
diff --git a/net-misc/openssh/ChangeLog b/net-misc/openssh/ChangeLog
index a8e0e1210dc7..5c7483397846 100644
--- a/net-misc/openssh/ChangeLog
+++ b/net-misc/openssh/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-misc/openssh
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/ChangeLog,v 1.247 2007/07/21 14:41:01 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/ChangeLog,v 1.248 2007/07/22 08:17:17 dberkholz Exp $
+
+  22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>;
+  openssh-4.3_p2-r5.ebuild:
+  Drop virtual/x11 references.
 
   21 Jul 2007; Joseph Jezak <josejx@gentoo.org> openssh-4.0_p1-r2.ebuild,
   openssh-4.1_p1-r1.ebuild, openssh-4.5_p1-r2.ebuild,
diff --git a/net-misc/openssh/openssh-4.3_p2-r5.ebuild b/net-misc/openssh/openssh-4.3_p2-r5.ebuild
index e7d5e6c53b42..48fd5c9a7017 100644
--- a/net-misc/openssh/openssh-4.3_p2-r5.ebuild
+++ b/net-misc/openssh/openssh-4.3_p2-r5.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/openssh-4.3_p2-r5.ebuild,v 1.10 2006/12/07 08:44:26 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/openssh-4.3_p2-r5.ebuild,v 1.11 2007/07/22 08:17:17 dberkholz Exp $
 
 WANT_AUTOCONF="latest"
 WANT_AUTOMAKE="latest"
@@ -38,7 +38,7 @@ RDEPEND="pam? ( virtual/pam )
 	>=sys-libs/zlib-1.2.3
 	smartcard? ( dev-libs/opensc )
 	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
-	X? ( || ( x11-apps/xauth virtual/x11 ) )
+	X? ( x11-apps/xauth )
 	userland_GNU? ( sys-apps/shadow )"
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig
diff --git a/net-misc/rdesktop/ChangeLog b/net-misc/rdesktop/ChangeLog
index 6444067f20c3..70dcfcce22a2 100644
--- a/net-misc/rdesktop/ChangeLog
+++ b/net-misc/rdesktop/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-misc/rdesktop
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/rdesktop/ChangeLog,v 1.91 2007/07/07 15:26:36 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/rdesktop/ChangeLog,v 1.92 2007/07/22 08:15:37 dberkholz Exp $
+
+  22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>;
+  rdesktop-1.4.1.ebuild, rdesktop-1.5.0.ebuild:
+  Drop virtual/x11 references.
 
   07 Jul 2007; Raúl Porcel <armin76@gentoo.org> rdesktop-1.5.0-r2.ebuild:
   alpha stable wrt #180310
diff --git a/net-misc/rdesktop/rdesktop-1.4.1.ebuild b/net-misc/rdesktop/rdesktop-1.4.1.ebuild
index 14f5c2a47464..acd6fdeef757 100644
--- a/net-misc/rdesktop/rdesktop-1.4.1.ebuild
+++ b/net-misc/rdesktop/rdesktop-1.4.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/net-misc/rdesktop/rdesktop-1.4.1.ebuild,v 1.17 2007/01/09 19:38:23 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/rdesktop/rdesktop-1.4.1.ebuild,v 1.18 2007/07/22 08:15:37 dberkholz Exp $
 
 inherit eutils
 
@@ -13,18 +13,13 @@ SLOT="0"
 KEYWORDS="alpha amd64 hppa ia64 mips ppc ppc64 sparc x86"
 IUSE="debug ipv6 oss"
 
-RDEPEND="|| (
-	(
-		x11-libs/libX11
-		x11-libs/libXext
-		x11-libs/libXau
-		x11-libs/libXdmcp )
-	virtual/x11 )
+RDEPEND="x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXau
+	x11-libs/libXdmcp
 	>=dev-libs/openssl-0.9.6b"
 DEPEND="${RDEPEND}
-	|| (
-		x11-libs/libXt
-		virtual/x11 )"
+	x11-libs/libXt"
 
 src_compile() {
 	sed -i -e '/-O2/c\' -e 'cflags="$cflags ${CFLAGS}"' configure
diff --git a/net-misc/rdesktop/rdesktop-1.5.0.ebuild b/net-misc/rdesktop/rdesktop-1.5.0.ebuild
index 0c7c9fee725d..2e3af8f65880 100644
--- a/net-misc/rdesktop/rdesktop-1.5.0.ebuild
+++ b/net-misc/rdesktop/rdesktop-1.5.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/net-misc/rdesktop/rdesktop-1.5.0.ebuild,v 1.2 2007/01/09 19:38:23 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/rdesktop/rdesktop-1.5.0.ebuild,v 1.3 2007/07/22 08:15:37 dberkholz Exp $
 
 inherit eutils
 
@@ -17,18 +17,13 @@ IUSE="debug ipv6 oss"
 
 S=${WORKDIR}/${PN}-${MY_PV}
 
-RDEPEND="|| (
-	(
-		x11-libs/libX11
-		x11-libs/libXext
-		x11-libs/libXau
-		x11-libs/libXdmcp )
-	virtual/x11 )
+RDEPEND="x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXau
+	x11-libs/libXdmcp
 	>=dev-libs/openssl-0.9.6b"
 DEPEND="${RDEPEND}
-	|| (
-		x11-libs/libXt
-		virtual/x11 )"
+	x11-libs/libXt"
 
 src_compile() {
 	sed -i -e '/-O2/c\' -e 'cflags="$cflags ${CFLAGS}"' configure
diff --git a/net-misc/sjphone/ChangeLog b/net-misc/sjphone/ChangeLog
index c77e726c5e4f..9e801f235098 100644
--- a/net-misc/sjphone/ChangeLog
+++ b/net-misc/sjphone/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-misc/sjphone
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/sjphone/ChangeLog,v 1.3 2007/02/22 02:47:26 peper Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/sjphone/ChangeLog,v 1.4 2007/07/22 08:00:32 dberkholz Exp $
+
+  22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>;
+  sjphone-1.60.2235.ebuild:
+  Drop virtual/x11 references.
 
   22 Feb 2007; Piotr Jaroszyński <peper@gentoo.org> ChangeLog:
   Transition to Manifest2.
diff --git a/net-misc/sjphone/sjphone-1.60.2235.ebuild b/net-misc/sjphone/sjphone-1.60.2235.ebuild
index 93104a33150c..0ab84853090a 100644
--- a/net-misc/sjphone/sjphone-1.60.2235.ebuild
+++ b/net-misc/sjphone/sjphone-1.60.2235.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/net-misc/sjphone/sjphone-1.60.2235.ebuild,v 1.1 2006/05/20 14:15:26 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/sjphone/sjphone-1.60.2235.ebuild,v 1.2 2007/07/22 08:00:32 dberkholz Exp $
 
 inherit eutils
 
@@ -14,13 +14,12 @@ SLOT="0"
 KEYWORDS="~x86"
 IUSE=""
 
-RDEPEND="|| ( ( x11-libs/libSM
+RDEPEND="x11-libs/libSM
 	x11-libs/libICE
 	x11-libs/libXext
 	x11-libs/libX11
 	x11-libs/libXau
-	x11-libs/libXdmcp )
-	virtual/x11 )"
+	x11-libs/libXdmcp"
 S=${WORKDIR}/${MY_P}
 
 src_install() {
diff --git a/net-misc/ssh/ChangeLog b/net-misc/ssh/ChangeLog
index 205411878cec..d1b3bc15f54a 100644
--- a/net-misc/ssh/ChangeLog
+++ b/net-misc/ssh/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-misc/ssh
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/ssh/ChangeLog,v 1.14 2007/02/22 02:48:41 peper Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/ssh/ChangeLog,v 1.15 2007/07/22 08:14:11 dberkholz Exp $
+
+  22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>;
+  ssh-3.2.9.1-r1.ebuild:
+  Drop virtual/x11 references.
 
   22 Feb 2007; Piotr Jaroszyński <peper@gentoo.org> ChangeLog:
   Transition to Manifest2.
diff --git a/net-misc/ssh/ssh-3.2.9.1-r1.ebuild b/net-misc/ssh/ssh-3.2.9.1-r1.ebuild
index dc897526f46c..17ac058a7044 100644
--- a/net-misc/ssh/ssh-3.2.9.1-r1.ebuild
+++ b/net-misc/ssh/ssh-3.2.9.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/ssh/ssh-3.2.9.1-r1.ebuild,v 1.4 2007/01/08 15:35:49 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/ssh/ssh-3.2.9.1-r1.ebuild,v 1.5 2007/07/22 08:14:11 dberkholz Exp $
 
 inherit eutils pam
 
@@ -13,12 +13,11 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE="X ipv6 crypt openssh"
 
-RDEPEND="X? ( || ( ( x11-libs/libSM
-					x11-libs/libXext )
-				virtual/x11 ) )
+RDEPEND="X? ( x11-libs/libSM
+			x11-libs/libXext )
 	!openssh? ( !virtual/ssh )"
 DEPEND="${RDEPEND}
-	X? ( || ( x11-proto/xextproto virtual/x11 ) )"
+	X? ( x11-proto/xextproto )"
 PROVIDE="virtual/ssh"
 
 pkg_setup() {
diff --git a/net-misc/suite3270/ChangeLog b/net-misc/suite3270/ChangeLog
index e3e87442231c..5ba3f0798658 100644
--- a/net-misc/suite3270/ChangeLog
+++ b/net-misc/suite3270/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-misc/suite3270
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/suite3270/ChangeLog,v 1.17 2007/07/18 17:19:48 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/suite3270/ChangeLog,v 1.18 2007/07/22 08:13:23 dberkholz Exp $
+
+  22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>;
+  suite3270-3.2.20.ebuild, suite3270-3.3.2_p1.ebuild,
+  suite3270-3.3.4_p6.ebuild:
+  Drop virtual/x11 references.
 
   18 Jul 2007; Gustavo Zacarias <gustavoz@gentoo.org>
   suite3270-3.3.5_p8.ebuild:
diff --git a/net-misc/suite3270/suite3270-3.2.20.ebuild b/net-misc/suite3270/suite3270-3.2.20.ebuild
index c99589aa6caf..e563db83cef6 100644
--- a/net-misc/suite3270/suite3270-3.2.20.ebuild
+++ b/net-misc/suite3270/suite3270-3.2.20.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/net-misc/suite3270/suite3270-3.2.20.ebuild,v 1.9 2007/02/10 23:30:01 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/suite3270/suite3270-3.2.20.ebuild,v 1.10 2007/07/22 08:13:23 dberkholz Exp $
 
 IUSE="tcl X"
 
@@ -13,15 +13,14 @@ SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="x86 sparc"
 
-RDEPEND="X? ( || ( x11-libs/libXaw virtual/x11 ) )
+RDEPEND="X? ( x11-libs/libXaw )
 		tcl? ( dev-lang/tcl !>=dev-lang/tcl-8.3 )
 		sys-libs/ncurses
 		sys-libs/readline"
 DEPEND="${RDEPEND}
-		X? ( || ( ( app-text/rman
-					x11-misc/imake
-					x11-proto/xproto )
-				virtual/x11 ) )
+		X? ( app-text/rman
+			x11-misc/imake
+			x11-proto/xproto )
 		sys-apps/sed
 		sys-apps/grep"
 
diff --git a/net-misc/suite3270/suite3270-3.3.2_p1.ebuild b/net-misc/suite3270/suite3270-3.3.2_p1.ebuild
index b94ffad32348..eed685bf7b66 100644
--- a/net-misc/suite3270/suite3270-3.3.2_p1.ebuild
+++ b/net-misc/suite3270/suite3270-3.3.2_p1.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/net-misc/suite3270/suite3270-3.3.2_p1.ebuild,v 1.8 2007/02/10 23:30:01 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/suite3270/suite3270-3.3.2_p1.ebuild,v 1.9 2007/07/22 08:13:23 dberkholz Exp $
 
 IUSE="tcl X cjk ssl debug"
 
@@ -15,17 +15,16 @@ SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="~x86 ~sparc ~amd64 s390"
 
-RDEPEND="X? ( || ( x11-libs/libXaw virtual/x11 ) )
+RDEPEND="X? ( x11-libs/libXaw )
 		tcl? ( dev-lang/tcl )
 		sys-libs/ncurses
 		sys-libs/readline
 		ssl? ( dev-libs/openssl )
 		cjk? ( dev-libs/icu )"
 DEPEND="${RDEPEND}
-		X? ( || ( ( app-text/rman
-					x11-misc/imake
-					x11-proto/xproto )
-				virtual/x11 ) )
+		X? ( app-text/rman
+			x11-misc/imake
+			x11-proto/xproto )
 		sys-apps/sed
 		sys-apps/grep"
 
diff --git a/net-misc/suite3270/suite3270-3.3.4_p6.ebuild b/net-misc/suite3270/suite3270-3.3.4_p6.ebuild
index 770014913925..37f1043838ff 100644
--- a/net-misc/suite3270/suite3270-3.3.4_p6.ebuild
+++ b/net-misc/suite3270/suite3270-3.3.4_p6.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/net-misc/suite3270/suite3270-3.3.4_p6.ebuild,v 1.3 2007/03/13 13:23:19 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/suite3270/suite3270-3.3.4_p6.ebuild,v 1.4 2007/07/22 08:13:23 dberkholz Exp $
 
 IUSE="tcl X cjk ssl debug"
 
@@ -15,17 +15,16 @@ SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="~amd64 ~ppc ~s390 ~sparc x86"
 
-RDEPEND="X? ( || ( x11-libs/libXaw virtual/x11 ) )
+RDEPEND="X? ( x11-libs/libXaw )
 		tcl? ( dev-lang/tcl )
 		sys-libs/ncurses
 		sys-libs/readline
 		ssl? ( dev-libs/openssl )
 		cjk? ( dev-libs/icu )"
 DEPEND="${RDEPEND}
-		X? ( || ( ( app-text/rman
-					x11-misc/imake
-					x11-proto/xproto )
-				virtual/x11 ) )
+		X? ( app-text/rman
+			x11-misc/imake
+			x11-proto/xproto )
 		sys-apps/sed
 		sys-apps/grep"
 
diff --git a/net-misc/tn5250/ChangeLog b/net-misc/tn5250/ChangeLog
index 287626020941..958119166ed1 100644
--- a/net-misc/tn5250/ChangeLog
+++ b/net-misc/tn5250/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-misc/tn5250
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/tn5250/ChangeLog,v 1.14 2007/07/12 15:26:30 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tn5250/ChangeLog,v 1.15 2007/07/22 08:11:44 dberkholz Exp $
+
+  22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>; tn5250-0.16.5.ebuild,
+  tn5250-0.17.3.ebuild:
+  Drop virtual/x11 references.
 
   12 Jul 2007; Gustavo Zacarias <gustavoz@gentoo.org> tn5250-0.17.3.ebuild:
   Keyworded ~sparc
diff --git a/net-misc/tn5250/tn5250-0.16.5.ebuild b/net-misc/tn5250/tn5250-0.16.5.ebuild
index 32dcf8730a60..6b042c40183e 100644
--- a/net-misc/tn5250/tn5250-0.16.5.ebuild
+++ b/net-misc/tn5250/tn5250-0.16.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/net-misc/tn5250/tn5250-0.16.5.ebuild,v 1.11 2006/07/27 23:38:38 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tn5250/tn5250-0.16.5.ebuild,v 1.12 2007/07/22 08:11:44 dberkholz Exp $
 
 inherit eutils
 
@@ -17,7 +17,7 @@ RDEPEND="sys-libs/ncurses
 	ssl? ( dev-libs/openssl )
 	slang? ( =sys-libs/slang-1* )"
 DEPEND="${RDEPEND}
-	X? ( || ( x11-libs/libXt virtual/x11 ) )"
+	X? ( x11-libs/libXt )"
 
 src_unpack() {
 	unpack ${A}
diff --git a/net-misc/tn5250/tn5250-0.17.3.ebuild b/net-misc/tn5250/tn5250-0.17.3.ebuild
index bacaeded2604..2396ba24deed 100644
--- a/net-misc/tn5250/tn5250-0.17.3.ebuild
+++ b/net-misc/tn5250/tn5250-0.17.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/tn5250/tn5250-0.17.3.ebuild,v 1.2 2007/07/12 15:26:30 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tn5250/tn5250-0.17.3.ebuild,v 1.3 2007/07/22 08:11:44 dberkholz Exp $
 
 inherit eutils
 
@@ -17,7 +17,7 @@ RDEPEND="sys-libs/ncurses
 	ssl? ( dev-libs/openssl )
 	slang? ( =sys-libs/slang-1* )"
 DEPEND="${RDEPEND}
-	X? ( || ( x11-libs/libXt virtual/x11 ) )"
+	X? ( x11-libs/libXt )"
 
 src_unpack() {
 	unpack ${A}
diff --git a/net-misc/unison/ChangeLog b/net-misc/unison/ChangeLog
index ef787f1d8e1a..bc0ce142e06e 100644
--- a/net-misc/unison/ChangeLog
+++ b/net-misc/unison/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-misc/unison
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/unison/ChangeLog,v 1.43 2007/02/22 02:53:01 peper Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/unison/ChangeLog,v 1.44 2007/07/22 08:10:38 dberkholz Exp $
+
+  22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>;
+  unison-2.13.16.ebuild, unison-2.17.1-r1.ebuild:
+  Drop virtual/x11 references.
 
   22 Feb 2007; Piotr Jaroszyński <peper@gentoo.org> ChangeLog:
   Transition to Manifest2.
diff --git a/net-misc/unison/unison-2.13.16.ebuild b/net-misc/unison/unison-2.13.16.ebuild
index 8bb77df0deae..b0f8023d9f5b 100644
--- a/net-misc/unison/unison-2.13.16.ebuild
+++ b/net-misc/unison/unison-2.13.16.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/net-misc/unison/unison-2.13.16.ebuild,v 1.5 2006/09/12 15:55:09 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/unison/unison-2.13.16.ebuild,v 1.6 2007/07/22 08:10:38 dberkholz Exp $
 
 inherit eutils
 
@@ -18,7 +18,7 @@ DEPEND=">=dev-lang/ocaml-3.04
 RDEPEND="gtk? ( >=dev-ml/lablgtk-2.2
 || ( net-misc/x11-ssh-askpass net-misc/gtk2-ssh-askpass ) )"
 
-PDEPEND="gtk? ( || ( media-fonts/font-schumacher-misc <virtual/x11-7 ) )"
+PDEPEND="gtk? ( media-fonts/font-schumacher-misc )"
 
 SRC_URI="http://www.cis.upenn.edu/~bcpierce/unison/download/releases/${P}/${P}.tar.gz
 doc? ( http://www.cis.upenn.edu/~bcpierce/unison/download/releases/${P}/${P}-manual.pdf
diff --git a/net-misc/unison/unison-2.17.1-r1.ebuild b/net-misc/unison/unison-2.17.1-r1.ebuild
index 8f73c4846afa..f82ee1d00b2e 100644
--- a/net-misc/unison/unison-2.17.1-r1.ebuild
+++ b/net-misc/unison/unison-2.17.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/net-misc/unison/unison-2.17.1-r1.ebuild,v 1.3 2006/11/15 03:04:42 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/unison/unison-2.17.1-r1.ebuild,v 1.4 2007/07/22 08:10:38 dberkholz Exp $
 
 inherit eutils
 
@@ -18,7 +18,7 @@ DEPEND=">=dev-lang/ocaml-3.04
 RDEPEND="gtk? ( >=dev-ml/lablgtk-2.2
 || ( net-misc/x11-ssh-askpass net-misc/gtk2-ssh-askpass ) )"
 
-PDEPEND="gtk? ( || ( media-fonts/font-schumacher-misc <virtual/x11-7 ) )"
+PDEPEND="gtk? ( media-fonts/font-schumacher-misc )"
 
 SRC_URI="http://www.cis.upenn.edu/~bcpierce/unison/download/releases/${P}/${P}.tar.gz
 doc? ( http://www.cis.upenn.edu/~bcpierce/unison/download/releases/${P}/${P}-manual.pdf
diff --git a/net-misc/vino/ChangeLog b/net-misc/vino/ChangeLog
index e80fa1b757ca..afff292bc8ac 100644
--- a/net-misc/vino/ChangeLog
+++ b/net-misc/vino/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-misc/vino
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/vino/ChangeLog,v 1.83 2007/07/05 15:59:50 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/vino/ChangeLog,v 1.84 2007/07/22 08:08:57 dberkholz Exp $
+
+  22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>; vino-2.13.5.ebuild,
+  vino-2.16.0-r1.ebuild, vino-2.18.1.ebuild:
+  Drop virtual/x11 references.
 
   05 Jul 2007; Roy Marples <uberlord@gentoo.org> vino-2.18.1.ebuild:
   Keyworded ~x86-fbsd.
diff --git a/net-misc/vino/vino-2.13.5.ebuild b/net-misc/vino/vino-2.13.5.ebuild
index 75a04c7a2761..aac8abb6ca3c 100644
--- a/net-misc/vino/vino-2.13.5.ebuild
+++ b/net-misc/vino/vino-2.13.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/net-misc/vino/vino-2.13.5.ebuild,v 1.18 2007/01/08 01:00:29 leio Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/vino/vino-2.13.5.ebuild,v 1.19 2007/07/22 08:08:57 dberkholz Exp $
 
 WANT_AUTOCONF=latest
 WANT_AUTOMAKE=1.9
@@ -20,7 +20,7 @@ RDEPEND=">=x11-libs/gtk+-2
 	>=gnome-base/libgnomeui-2.5.2
 	>=gnome-base/orbit-2
 	>=gnome-base/libbonobo-2
-	|| ( x11-libs/libXtst virtual/x11 )
+	x11-libs/libXtst
 	avahi? ( >=net-dns/avahi-0.6 )
 	crypt? ( >=dev-libs/libgcrypt-1.1.90 )
 	gnutls? ( >=net-libs/gnutls-1 )
diff --git a/net-misc/vino/vino-2.16.0-r1.ebuild b/net-misc/vino/vino-2.16.0-r1.ebuild
index 3729d3df09e3..9ac87330fbea 100644
--- a/net-misc/vino/vino-2.16.0-r1.ebuild
+++ b/net-misc/vino/vino-2.16.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/net-misc/vino/vino-2.16.0-r1.ebuild,v 1.1 2007/01/30 21:13:26 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/vino/vino-2.16.0-r1.ebuild,v 1.2 2007/07/22 08:08:57 dberkholz Exp $
 
 WANT_AUTOCONF=latest
 WANT_AUTOMAKE=1.9
@@ -20,7 +20,7 @@ RDEPEND=">=x11-libs/gtk+-2
 	>=gnome-base/libgnomeui-2.5.2
 	>=gnome-base/orbit-2
 	>=gnome-base/libbonobo-2
-	|| ( x11-libs/libXtst virtual/x11 )
+	x11-libs/libXtst
 	avahi? ( >=net-dns/avahi-0.6 )
 	crypt? ( >=dev-libs/libgcrypt-1.1.90 )
 	gnutls? ( >=net-libs/gnutls-1 )
diff --git a/net-misc/vino/vino-2.18.1.ebuild b/net-misc/vino/vino-2.18.1.ebuild
index 5135fe4fcc71..9958966a954d 100644
--- a/net-misc/vino/vino-2.18.1.ebuild
+++ b/net-misc/vino/vino-2.18.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/net-misc/vino/vino-2.18.1.ebuild,v 1.3 2007/07/12 02:52:15 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/vino/vino-2.18.1.ebuild,v 1.4 2007/07/22 08:08:57 dberkholz Exp $
 
 WANT_AUTOCONF=latest
 WANT_AUTOMAKE=1.9
@@ -22,7 +22,7 @@ RDEPEND=">=dev-libs/glib-2.12
 	dev-libs/dbus-glib
 	>=gnome-base/orbit-2
 	>=gnome-base/libbonobo-2
-	|| ( x11-libs/libXtst virtual/x11 )
+	x11-libs/libXtst
 	libnotify? ( >=x11-libs/libnotify-0.4.3 )
 	keyring? ( gnome-base/gnome-keyring )
 	avahi? ( >=net-dns/avahi-0.6 )
diff --git a/net-misc/vncrec/ChangeLog b/net-misc/vncrec/ChangeLog
index d3fa0cfa8a6c..88344b285d6f 100644
--- a/net-misc/vncrec/ChangeLog
+++ b/net-misc/vncrec/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-misc/vncrec
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/vncrec/ChangeLog,v 1.6 2007/05/14 19:45:45 bangert Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/vncrec/ChangeLog,v 1.7 2007/07/22 08:06:24 dberkholz Exp $
+
+  22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>; vncrec-0.2.ebuild:
+  Drop virtual/x11 references.
 
   14 May 2007; Thilo Bangert <bangert@gentoo.org> metadata.xml:
   add <herd>no-herd</herd>
diff --git a/net-misc/vncrec/vncrec-0.2.ebuild b/net-misc/vncrec/vncrec-0.2.ebuild
index 2cf9ea6f3b29..13b71f1eded4 100644
--- a/net-misc/vncrec/vncrec-0.2.ebuild
+++ b/net-misc/vncrec/vncrec-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/net-misc/vncrec/vncrec-0.2.ebuild,v 1.5 2006/03/19 22:18:04 joshuabaergen Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/vncrec/vncrec-0.2.ebuild,v 1.6 2007/07/22 08:06:24 dberkholz Exp $
 
 DESCRIPTION="VNC session recorder and player"
 HOMEPAGE="http://www.sodan.org/~penny/vncrec/"
@@ -11,15 +11,13 @@ SLOT="0"
 KEYWORDS="~x86 ~ppc"
 IUSE=""
 
-RDEPEND="|| ( ( x11-libs/libXaw
-				x11-libs/libXp )
-			virtual/x11 )"
+RDEPEND="x11-libs/libXaw
+	x11-libs/libXp"
 DEPEND="${RDEPEND}
-	|| ( ( app-text/rman
-			x11-misc/gccmakedep
-			x11-misc/imake
-			x11-proto/xextproto )
-		virtual/x11 )"
+	app-text/rman
+	x11-misc/gccmakedep
+	x11-misc/imake
+	x11-proto/xextproto"
 
 src_compile() {
 	touch vncrec/vncrec.man
diff --git a/net-misc/x11-ssh-askpass/ChangeLog b/net-misc/x11-ssh-askpass/ChangeLog
index 43b50c606aea..ca454c15fefd 100644
--- a/net-misc/x11-ssh-askpass/ChangeLog
+++ b/net-misc/x11-ssh-askpass/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-misc/x11-ssh-askpass
-# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/x11-ssh-askpass/ChangeLog,v 1.25 2006/08/29 00:27:26 mr_bones_ Exp $
+# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/x11-ssh-askpass/ChangeLog,v 1.26 2007/07/22 08:05:17 dberkholz Exp $
+
+  22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>;
+  x11-ssh-askpass-1.2.4.1-r1.ebuild:
+  Drop virtual/x11 references.
 
   29 Aug 2006; Michael Sterrett <mr_bones_@gentoo.org>
   -files/stupid-imake.diff, -x11-ssh-askpass-1.2.2-r1.ebuild:
diff --git a/net-misc/x11-ssh-askpass/x11-ssh-askpass-1.2.4.1-r1.ebuild b/net-misc/x11-ssh-askpass/x11-ssh-askpass-1.2.4.1-r1.ebuild
index 41a98fe3c821..d8a2a843eef1 100644
--- a/net-misc/x11-ssh-askpass/x11-ssh-askpass-1.2.4.1-r1.ebuild
+++ b/net-misc/x11-ssh-askpass/x11-ssh-askpass-1.2.4.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/net-misc/x11-ssh-askpass/x11-ssh-askpass-1.2.4.1-r1.ebuild,v 1.9 2006/07/24 11:58:08 yoswink Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/x11-ssh-askpass/x11-ssh-askpass-1.2.4.1-r1.ebuild,v 1.10 2007/07/22 08:05:17 dberkholz Exp $
 
 inherit eutils multilib
 
@@ -14,17 +14,12 @@ SLOT="0"
 KEYWORDS="alpha amd64 ia64 ppc sparc x86"
 
 DEPEND="virtual/libc
-	|| 	(
-			(
-				app-text/rman
-				x11-misc/imake
-				x11-libs/libXt
-				x11-libs/libX11
-				x11-libs/libSM
-				x11-libs/libICE
-			)
-			virtual/x11
-		)"
+	app-text/rman
+	x11-misc/imake
+	x11-libs/libXt
+	x11-libs/libX11
+	x11-libs/libSM
+	x11-libs/libICE"
 RDEPEND="${DEPEND}
 	virtual/ssh"
 
diff --git a/net-misc/xf4vnc/ChangeLog b/net-misc/xf4vnc/ChangeLog
index 03ffc80a03ae..7c5a3ce6595a 100644
--- a/net-misc/xf4vnc/ChangeLog
+++ b/net-misc/xf4vnc/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-misc/xf4vnc
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/xf4vnc/ChangeLog,v 1.9 2007/05/11 22:28:46 bangert Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/xf4vnc/ChangeLog,v 1.10 2007/07/22 08:03:41 dberkholz Exp $
+
+  22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>;
+  xf4vnc-4.3.0.103.ebuild, xf4vnc-4.3.0.104.ebuild, xf4vnc-4.3.0.999.ebuild:
+  Drop virtual/x11 references.
 
   11 May 2007; Thilo Bangert <bangert@gentoo.org> metadata.xml:
   fix herd
diff --git a/net-misc/xf4vnc/xf4vnc-4.3.0.103.ebuild b/net-misc/xf4vnc/xf4vnc-4.3.0.103.ebuild
index 14906ddd4860..09fc12657950 100644
--- a/net-misc/xf4vnc/xf4vnc-4.3.0.103.ebuild
+++ b/net-misc/xf4vnc/xf4vnc-4.3.0.103.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/net-misc/xf4vnc/xf4vnc-4.3.0.103.ebuild,v 1.5 2006/08/28 17:24:24 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/xf4vnc/xf4vnc-4.3.0.103.ebuild,v 1.6 2007/07/22 08:03:41 dberkholz Exp $
 
 DESCRIPTION="VNC (remote desktop viewer) derived from tightvnc but cooler :-)"
 HOMEPAGE="http://xf4vnc.sourceforge.net/"
@@ -19,15 +19,14 @@ KEYWORDS="~alpha -*"
 IUSE=""
 
 DEPEND="
-	|| ( ( x11-libs/libICE
-		x11-libs/libSM
-		x11-libs/libX11
-		x11-libs/libXaw
-		x11-libs/libXext
-		x11-libs/libXmu
-		x11-libs/libXpm
-		x11-libs/libXt )
-	virtual/x11 )"
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libX11
+	x11-libs/libXaw
+	x11-libs/libXext
+	x11-libs/libXmu
+	x11-libs/libXpm
+	x11-libs/libXt"
 
 src_install() {
 	insinto /usr/X11R6/lib/modules/
diff --git a/net-misc/xf4vnc/xf4vnc-4.3.0.104.ebuild b/net-misc/xf4vnc/xf4vnc-4.3.0.104.ebuild
index beb31feb3c0e..b04916cd085b 100644
--- a/net-misc/xf4vnc/xf4vnc-4.3.0.104.ebuild
+++ b/net-misc/xf4vnc/xf4vnc-4.3.0.104.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/net-misc/xf4vnc/xf4vnc-4.3.0.104.ebuild,v 1.6 2007/07/12 02:52:15 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/xf4vnc/xf4vnc-4.3.0.104.ebuild,v 1.7 2007/07/22 08:03:41 dberkholz Exp $
 
 DESCRIPTION="VNC (remote desktop viewer) derived from tightvnc but cooler :-)"
 HOMEPAGE="http://xf4vnc.sourceforge.net/"
@@ -19,15 +19,14 @@ KEYWORDS="x86 -*"
 IUSE=""
 
 DEPEND="
-	|| ( ( x11-libs/libICE
-		x11-libs/libSM
-		x11-libs/libX11
-		x11-libs/libXaw
-		x11-libs/libXext
-		x11-libs/libXmu
-		x11-libs/libXpm
-		x11-libs/libXt )
-	virtual/x11 )"
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libX11
+	x11-libs/libXaw
+	x11-libs/libXext
+	x11-libs/libXmu
+	x11-libs/libXpm
+	x11-libs/libXt"
 
 src_install() {
 	insinto /usr/X11R6/lib/modules/
diff --git a/net-misc/xf4vnc/xf4vnc-4.3.0.999.ebuild b/net-misc/xf4vnc/xf4vnc-4.3.0.999.ebuild
index 2f5bb0d4a632..0bd23bbde2cc 100644
--- a/net-misc/xf4vnc/xf4vnc-4.3.0.999.ebuild
+++ b/net-misc/xf4vnc/xf4vnc-4.3.0.999.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/net-misc/xf4vnc/xf4vnc-4.3.0.999.ebuild,v 1.2 2006/08/28 17:27:48 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/xf4vnc/xf4vnc-4.3.0.999.ebuild,v 1.3 2007/07/22 08:03:41 dberkholz Exp $
 
 DESCRIPTION="VNC (remote desktop viewer) derived from tightvnc but cooler :-)"
 HOMEPAGE="http://xf4vnc.sourceforge.net/"
@@ -19,15 +19,14 @@ RDEPEND="vncviewer? (
 		media-libs/freetype
 		media-libs/jpeg
 	)
-	|| ( ( x11-libs/libICE
-		x11-libs/libSM
-		x11-libs/libX11
-		x11-libs/libXaw
-		x11-libs/libXext
-		x11-libs/libXmu
-		x11-libs/libXpm
-		x11-libs/libXt )
-	virtual/x11 )"
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libX11
+	x11-libs/libXaw
+	x11-libs/libXext
+	x11-libs/libXmu
+	x11-libs/libXpm
+	x11-libs/libXt"
 
 src_install() {
 	exeinto /usr/lib/xorg/modules