Drop virtual/x11 references.

(Portage version: 2.1.3_rc8)

9 files changed, 122 insertions, 190 deletions

diff --git a/x11-misc/x11vnc/ChangeLog b/x11-misc/x11vnc/ChangeLog
index c51ef41e5539..78e5e9622ba5 100644
--- a/x11-misc/x11vnc/ChangeLog
+++ b/x11-misc/x11vnc/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-misc/x11vnc
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/x11vnc/ChangeLog,v 1.43 2007/07/20 19:24:17 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/x11vnc/ChangeLog,v 1.44 2007/07/22 03:38:05 dberkholz Exp $
+
+  22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>; x11vnc-0.8.2.ebuild,
+  x11vnc-0.8.2-r1.ebuild, x11vnc-0.8.3.ebuild, x11vnc-0.8.4.ebuild,
+  x11vnc-0.9.ebuild, x11vnc-0.9.1.ebuild, x11vnc-0.9.2.ebuild,
+  x11vnc-0.9.2-r1.ebuild:
+  Drop virtual/x11 references.
 
   20 Jul 2007; Sven Wegener <swegener@gentoo.org>
   +files/x11vnc-0.9.1-ssl.patch, x11vnc-0.9.1.ebuild:
diff --git a/x11-misc/x11vnc/x11vnc-0.8.2-r1.ebuild b/x11-misc/x11vnc/x11vnc-0.8.2-r1.ebuild
index 353cf0123684..cf22f8c4ddf4 100644
--- a/x11-misc/x11vnc/x11vnc-0.8.2-r1.ebuild
+++ b/x11-misc/x11vnc/x11vnc-0.8.2-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/x11vnc/x11vnc-0.8.2-r1.ebuild,v 1.1 2006/10/28 19:47:45 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/x11vnc/x11vnc-0.8.2-r1.ebuild,v 1.2 2007/07/22 03:38:05 dberkholz Exp $
 
 DESCRIPTION="A VNC server for real X displays"
 HOMEPAGE="http://www.karlrunge.com/x11vnc/"
@@ -14,31 +14,21 @@ IUSE="jpeg zlib threads ssl crypt v4l xinerama"
 RDEPEND="zlib? ( sys-libs/zlib )
 	jpeg? (	media-libs/jpeg )
 	ssl? ( dev-libs/openssl )
-	|| (
-		(
-			xinerama? ( x11-libs/libXinerama )
-			x11-libs/libXfixes
-			x11-libs/libXrandr
-			x11-libs/libX11
-			x11-libs/libXtst
-			x11-libs/libXdamage
-			x11-libs/libXext
-		)
-		virtual/x11
-	)"
+	xinerama? ( x11-libs/libXinerama )
+	x11-libs/libXfixes
+	x11-libs/libXrandr
+	x11-libs/libX11
+	x11-libs/libXtst
+	x11-libs/libXdamage
+	x11-libs/libXext"
 
 DEPEND="${RDEPEND}
-	|| (
-		(
-			x11-libs/libXt
-			xinerama? ( x11-proto/xineramaproto )
-			x11-proto/trapproto
-			x11-proto/recordproto
-			x11-proto/xproto
-			x11-proto/xextproto
-		)
-		virtual/x11
-	)"
+	x11-libs/libXt
+	xinerama? ( x11-proto/xineramaproto )
+	x11-proto/trapproto
+	x11-proto/recordproto
+	x11-proto/xproto
+	x11-proto/xextproto"
 
 src_compile() {
 	econf \
diff --git a/x11-misc/x11vnc/x11vnc-0.8.2.ebuild b/x11-misc/x11vnc/x11vnc-0.8.2.ebuild
index d96acf13a75e..2f43931c05ef 100644
--- a/x11-misc/x11vnc/x11vnc-0.8.2.ebuild
+++ b/x11-misc/x11vnc/x11vnc-0.8.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/x11vnc/x11vnc-0.8.2.ebuild,v 1.9 2006/10/14 16:18:18 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/x11vnc/x11vnc-0.8.2.ebuild,v 1.10 2007/07/22 03:38:05 dberkholz Exp $
 
 DESCRIPTION="A VNC server for real X displays"
 HOMEPAGE="http://www.karlrunge.com/x11vnc/"
@@ -16,25 +16,21 @@ RDEPEND="zlib? ( sys-libs/zlib )
 		media-libs/jpeg
 		sys-libs/zlib
 	)
-	|| ( (
-			x11-libs/libXinerama
-			x11-libs/libXfixes
-			x11-libs/libXrandr
-			x11-libs/libX11
-			x11-libs/libXtst
-			x11-libs/libXdamage
-			x11-libs/libXext
-		) virtual/x11 )"
+	x11-libs/libXinerama
+	x11-libs/libXfixes
+	x11-libs/libXrandr
+	x11-libs/libX11
+	x11-libs/libXtst
+	x11-libs/libXdamage
+	x11-libs/libXext"
 
 DEPEND="${RDEPEND}
-	|| ( (
-			x11-libs/libXt
-			x11-proto/xineramaproto
-			x11-proto/trapproto
-			x11-proto/recordproto
-			x11-proto/xproto
-			x11-proto/xextproto
-		) virtual/x11 )"
+	x11-libs/libXt
+	x11-proto/xineramaproto
+	x11-proto/trapproto
+	x11-proto/recordproto
+	x11-proto/xproto
+	x11-proto/xextproto"
 
 src_compile() {
 	local myconf=""
diff --git a/x11-misc/x11vnc/x11vnc-0.8.3.ebuild b/x11-misc/x11vnc/x11vnc-0.8.3.ebuild
index c5f440d9ce66..c9af253b74b0 100644
--- a/x11-misc/x11vnc/x11vnc-0.8.3.ebuild
+++ b/x11-misc/x11vnc/x11vnc-0.8.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-misc/x11vnc/x11vnc-0.8.3.ebuild,v 1.1 2006/11/14 13:32:15 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/x11vnc/x11vnc-0.8.3.ebuild,v 1.2 2007/07/22 03:38:05 dberkholz Exp $
 
 DESCRIPTION="A VNC server for real X displays"
 HOMEPAGE="http://www.karlrunge.com/x11vnc/"
@@ -14,31 +14,21 @@ IUSE="jpeg zlib threads ssl crypt v4l xinerama"
 RDEPEND="zlib? ( sys-libs/zlib )
 	jpeg? (	media-libs/jpeg )
 	ssl? ( dev-libs/openssl )
-	|| (
-		(
-			xinerama? ( x11-libs/libXinerama )
-			x11-libs/libXfixes
-			x11-libs/libXrandr
-			x11-libs/libX11
-			x11-libs/libXtst
-			x11-libs/libXdamage
-			x11-libs/libXext
-		)
-		virtual/x11
-	)"
+	xinerama? ( x11-libs/libXinerama )
+	x11-libs/libXfixes
+	x11-libs/libXrandr
+	x11-libs/libX11
+	x11-libs/libXtst
+	x11-libs/libXdamage
+	x11-libs/libXext"
 
 DEPEND="${RDEPEND}
-	|| (
-		(
-			x11-libs/libXt
-			xinerama? ( x11-proto/xineramaproto )
-			x11-proto/trapproto
-			x11-proto/recordproto
-			x11-proto/xproto
-			x11-proto/xextproto
-		)
-		virtual/x11
-	)"
+	x11-libs/libXt
+	xinerama? ( x11-proto/xineramaproto )
+	x11-proto/trapproto
+	x11-proto/recordproto
+	x11-proto/xproto
+	x11-proto/xextproto"
 
 src_compile() {
 	econf \
diff --git a/x11-misc/x11vnc/x11vnc-0.8.4.ebuild b/x11-misc/x11vnc/x11vnc-0.8.4.ebuild
index edaea8a5154f..1bb16c18754b 100644
--- a/x11-misc/x11vnc/x11vnc-0.8.4.ebuild
+++ b/x11-misc/x11vnc/x11vnc-0.8.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-misc/x11vnc/x11vnc-0.8.4.ebuild,v 1.1 2007/02/04 22:17:42 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/x11vnc/x11vnc-0.8.4.ebuild,v 1.2 2007/07/22 03:38:05 dberkholz Exp $
 
 DESCRIPTION="A VNC server for real X displays"
 HOMEPAGE="http://www.karlrunge.com/x11vnc/"
@@ -14,31 +14,21 @@ IUSE="jpeg zlib threads ssl crypt v4l xinerama"
 RDEPEND="zlib? ( sys-libs/zlib )
 	jpeg? (	media-libs/jpeg )
 	ssl? ( dev-libs/openssl )
-	|| (
-		(
-			xinerama? ( x11-libs/libXinerama )
-			x11-libs/libXfixes
-			x11-libs/libXrandr
-			x11-libs/libX11
-			x11-libs/libXtst
-			x11-libs/libXdamage
-			x11-libs/libXext
-		)
-		virtual/x11
-	)"
+	xinerama? ( x11-libs/libXinerama )
+	x11-libs/libXfixes
+	x11-libs/libXrandr
+	x11-libs/libX11
+	x11-libs/libXtst
+	x11-libs/libXdamage
+	x11-libs/libXext"
 
 DEPEND="${RDEPEND}
-	|| (
-		(
-			x11-libs/libXt
-			xinerama? ( x11-proto/xineramaproto )
-			x11-proto/trapproto
-			x11-proto/recordproto
-			x11-proto/xproto
-			x11-proto/xextproto
-		)
-		virtual/x11
-	)"
+	x11-libs/libXt
+	xinerama? ( x11-proto/xineramaproto )
+	x11-proto/trapproto
+	x11-proto/recordproto
+	x11-proto/xproto
+	x11-proto/xextproto"
 
 src_compile() {
 	econf \
diff --git a/x11-misc/x11vnc/x11vnc-0.9.1.ebuild b/x11-misc/x11vnc/x11vnc-0.9.1.ebuild
index dc0e551af7f8..433097232b74 100644
--- a/x11-misc/x11vnc/x11vnc-0.9.1.ebuild
+++ b/x11-misc/x11vnc/x11vnc-0.9.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-misc/x11vnc/x11vnc-0.9.1.ebuild,v 1.3 2007/07/20 19:24:17 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/x11vnc/x11vnc-0.9.1.ebuild,v 1.4 2007/07/22 03:38:05 dberkholz Exp $
 
 inherit eutils
 
@@ -17,31 +17,21 @@ RDEPEND="zlib? ( sys-libs/zlib )
 	jpeg? (	media-libs/jpeg )
 	ssl? ( dev-libs/openssl )
 	avahi? ( >=net-dns/avahi-0.6.4 )
-	|| (
-		(
-			xinerama? ( x11-libs/libXinerama )
-			x11-libs/libXfixes
-			x11-libs/libXrandr
-			x11-libs/libX11
-			x11-libs/libXtst
-			x11-libs/libXdamage
-			x11-libs/libXext
-		)
-		virtual/x11
-	)"
+	xinerama? ( x11-libs/libXinerama )
+	x11-libs/libXfixes
+	x11-libs/libXrandr
+	x11-libs/libX11
+	x11-libs/libXtst
+	x11-libs/libXdamage
+	x11-libs/libXext"
 
 DEPEND="${RDEPEND}
-	|| (
-		(
-			x11-libs/libXt
-			xinerama? ( x11-proto/xineramaproto )
-			x11-proto/trapproto
-			x11-proto/recordproto
-			x11-proto/xproto
-			x11-proto/xextproto
-		)
-		virtual/x11
-	)"
+	x11-libs/libXt
+	xinerama? ( x11-proto/xineramaproto )
+	x11-proto/trapproto
+	x11-proto/recordproto
+	x11-proto/xproto
+	x11-proto/xextproto"
 
 src_unpack() {
 	unpack ${A}
diff --git a/x11-misc/x11vnc/x11vnc-0.9.2-r1.ebuild b/x11-misc/x11vnc/x11vnc-0.9.2-r1.ebuild
index b27d3ed13d2a..3349f0e9f5ce 100644
--- a/x11-misc/x11vnc/x11vnc-0.9.2-r1.ebuild
+++ b/x11-misc/x11vnc/x11vnc-0.9.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/x11vnc/x11vnc-0.9.2-r1.ebuild,v 1.5 2007/07/06 17:03:06 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/x11vnc/x11vnc-0.9.2-r1.ebuild,v 1.6 2007/07/22 03:38:05 dberkholz Exp $
 
 DESCRIPTION="A VNC server for real X displays"
 HOMEPAGE="http://www.karlrunge.com/x11vnc/"
@@ -16,31 +16,21 @@ RDEPEND="system-libvncserver? ( >=net-libs/libvncserver-0.9.1 )
 	jpeg? (	media-libs/jpeg )
 	ssl? ( dev-libs/openssl )
 	avahi? ( >=net-dns/avahi-0.6.4 )
-	|| (
-		(
-			xinerama? ( x11-libs/libXinerama )
-			x11-libs/libXfixes
-			x11-libs/libXrandr
-			x11-libs/libX11
-			x11-libs/libXtst
-			x11-libs/libXdamage
-			x11-libs/libXext
-		)
-		virtual/x11
-	)"
+	xinerama? ( x11-libs/libXinerama )
+	x11-libs/libXfixes
+	x11-libs/libXrandr
+	x11-libs/libX11
+	x11-libs/libXtst
+	x11-libs/libXdamage
+	x11-libs/libXext"
 
 DEPEND="${RDEPEND}
-	|| (
-		(
-			x11-libs/libXt
-			xinerama? ( x11-proto/xineramaproto )
-			x11-proto/trapproto
-			x11-proto/recordproto
-			x11-proto/xproto
-			x11-proto/xextproto
-		)
-		virtual/x11
-	)"
+	x11-libs/libXt
+	xinerama? ( x11-proto/xineramaproto )
+	x11-proto/trapproto
+	x11-proto/recordproto
+	x11-proto/xproto
+	x11-proto/xextproto"
 
 src_compile() {
 	local myconf=""
diff --git a/x11-misc/x11vnc/x11vnc-0.9.2.ebuild b/x11-misc/x11vnc/x11vnc-0.9.2.ebuild
index e5dc7a1782f5..cf9946bb6b55 100644
--- a/x11-misc/x11vnc/x11vnc-0.9.2.ebuild
+++ b/x11-misc/x11vnc/x11vnc-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-misc/x11vnc/x11vnc-0.9.2.ebuild,v 1.1 2007/06/18 19:32:41 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/x11vnc/x11vnc-0.9.2.ebuild,v 1.2 2007/07/22 03:38:05 dberkholz Exp $
 
 DESCRIPTION="A VNC server for real X displays"
 HOMEPAGE="http://www.karlrunge.com/x11vnc/"
@@ -15,31 +15,21 @@ RDEPEND="zlib? ( sys-libs/zlib )
 	jpeg? (	media-libs/jpeg )
 	ssl? ( dev-libs/openssl )
 	avahi? ( >=net-dns/avahi-0.6.4 )
-	|| (
-		(
-			xinerama? ( x11-libs/libXinerama )
-			x11-libs/libXfixes
-			x11-libs/libXrandr
-			x11-libs/libX11
-			x11-libs/libXtst
-			x11-libs/libXdamage
-			x11-libs/libXext
-		)
-		virtual/x11
-	)"
+	xinerama? ( x11-libs/libXinerama )
+	x11-libs/libXfixes
+	x11-libs/libXrandr
+	x11-libs/libX11
+	x11-libs/libXtst
+	x11-libs/libXdamage
+	x11-libs/libXext"
 
 DEPEND="${RDEPEND}
-	|| (
-		(
-			x11-libs/libXt
-			xinerama? ( x11-proto/xineramaproto )
-			x11-proto/trapproto
-			x11-proto/recordproto
-			x11-proto/xproto
-			x11-proto/xextproto
-		)
-		virtual/x11
-	)"
+	x11-libs/libXt
+	xinerama? ( x11-proto/xineramaproto )
+	x11-proto/trapproto
+	x11-proto/recordproto
+	x11-proto/xproto
+	x11-proto/xextproto"
 
 src_compile() {
 	econf \
diff --git a/x11-misc/x11vnc/x11vnc-0.9.ebuild b/x11-misc/x11vnc/x11vnc-0.9.ebuild
index b4b9260e0082..8c3474ecebfd 100644
--- a/x11-misc/x11vnc/x11vnc-0.9.ebuild
+++ b/x11-misc/x11vnc/x11vnc-0.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/x11vnc/x11vnc-0.9.ebuild,v 1.1 2007/04/19 20:23:01 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/x11vnc/x11vnc-0.9.ebuild,v 1.2 2007/07/22 03:38:05 dberkholz Exp $
 
 DESCRIPTION="A VNC server for real X displays"
 HOMEPAGE="http://www.karlrunge.com/x11vnc/"
@@ -15,31 +15,21 @@ RDEPEND="zlib? ( sys-libs/zlib )
 	jpeg? (	media-libs/jpeg )
 	ssl? ( dev-libs/openssl )
 	avahi? ( >=net-dns/avahi-0.6.4 )
-	|| (
-		(
-			xinerama? ( x11-libs/libXinerama )
-			x11-libs/libXfixes
-			x11-libs/libXrandr
-			x11-libs/libX11
-			x11-libs/libXtst
-			x11-libs/libXdamage
-			x11-libs/libXext
-		)
-		virtual/x11
-	)"
+	xinerama? ( x11-libs/libXinerama )
+	x11-libs/libXfixes
+	x11-libs/libXrandr
+	x11-libs/libX11
+	x11-libs/libXtst
+	x11-libs/libXdamage
+	x11-libs/libXext"
 
 DEPEND="${RDEPEND}
-	|| (
-		(
-			x11-libs/libXt
-			xinerama? ( x11-proto/xineramaproto )
-			x11-proto/trapproto
-			x11-proto/recordproto
-			x11-proto/xproto
-			x11-proto/xextproto
-		)
-		virtual/x11
-	)"
+	x11-libs/libXt
+	xinerama? ( x11-proto/xineramaproto )
+	x11-proto/trapproto
+	x11-proto/recordproto
+	x11-proto/xproto
+	x11-proto/xextproto"
 
 src_compile() {
 	econf \