Drop virtual/x11 references.

Package-Manager: portage-2.1.3_rc8

47 files changed, 197 insertions, 177 deletions

diff --git a/media-gfx/blender/ChangeLog b/media-gfx/blender/ChangeLog
index 5f4f7bd1f409..e14d2ea82009 100644
--- a/media-gfx/blender/ChangeLog
+++ b/media-gfx/blender/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-gfx/blender
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/ChangeLog,v 1.117 2007/07/15 10:24:26 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/ChangeLog,v 1.118 2007/07/22 10:04:27 dberkholz Exp $
+
+  22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>;
+  blender-2.41-r1.ebuild, blender-2.42.ebuild, blender-2.42a-r1.ebuild,
+  blender-2.43.ebuild, blender-2.44.ebuild:
+  Drop virtual/x11 references.
 
   15 Jul 2007; Luca Barbato <lu_zero@gentoo.org> blender-2.44.ebuild:
   Add verse support as requested in bug #173124
diff --git a/media-gfx/blender/blender-2.41-r1.ebuild b/media-gfx/blender/blender-2.41-r1.ebuild
index 09e6b8e13fff..b951533eb62e 100644
--- a/media-gfx/blender/blender-2.41-r1.ebuild
+++ b/media-gfx/blender/blender-2.41-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/media-gfx/blender/blender-2.41-r1.ebuild,v 1.10 2007/07/12 04:08:47 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.41-r1.ebuild,v 1.11 2007/07/22 10:04:27 dberkholz Exp $
 
 inherit multilib flag-o-matic eutils python
 
@@ -29,7 +29,7 @@ RDEPEND="media-libs/libsdl
 	nls? ( >=media-libs/ftgl-2.1 )"
 
 DEPEND="=dev-util/scons-0.96.1
-	|| ( x11-libs/libXt virtual/x11 )
+	x11-libs/libXt
 	${RDEPEND}"
 
 S=${WORKDIR}/${PN}
diff --git a/media-gfx/blender/blender-2.42.ebuild b/media-gfx/blender/blender-2.42.ebuild
index 6578ba719eac..518f5e4534c4 100644
--- a/media-gfx/blender/blender-2.42.ebuild
+++ b/media-gfx/blender/blender-2.42.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/media-gfx/blender/blender-2.42.ebuild,v 1.7 2007/07/12 04:08:47 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.42.ebuild,v 1.8 2007/07/22 10:04:27 dberkholz Exp $
 
 inherit multilib flag-o-matic eutils python
 
@@ -33,7 +33,7 @@ RDEPEND="
 	virtual/opengl"
 
 DEPEND="=dev-util/scons-0.96.1
-	|| ( x11-libs/libXt virtual/x11 )
+	x11-libs/libXt
 	${RDEPEND}"
 
 blend_with() {
diff --git a/media-gfx/blender/blender-2.42a-r1.ebuild b/media-gfx/blender/blender-2.42a-r1.ebuild
index 11778682202e..1bca12aa95cf 100644
--- a/media-gfx/blender/blender-2.42a-r1.ebuild
+++ b/media-gfx/blender/blender-2.42a-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/media-gfx/blender/blender-2.42a-r1.ebuild,v 1.12 2007/07/12 04:08:47 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.42a-r1.ebuild,v 1.13 2007/07/22 10:04:27 dberkholz Exp $
 
 inherit multilib flag-o-matic eutils python
 
@@ -35,7 +35,7 @@ RDEPEND="
 	virtual/opengl"
 
 DEPEND="dev-util/scons
-	|| ( x11-libs/libXt virtual/x11 )
+	x11-libs/libXt
 	${RDEPEND}"
 
 blend_with() {
diff --git a/media-gfx/blender/blender-2.43.ebuild b/media-gfx/blender/blender-2.43.ebuild
index c50996dfcfe2..c07fec46f264 100644
--- a/media-gfx/blender/blender-2.43.ebuild
+++ b/media-gfx/blender/blender-2.43.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/media-gfx/blender/blender-2.43.ebuild,v 1.8 2007/07/12 04:08:47 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.43.ebuild,v 1.9 2007/07/22 10:04:27 dberkholz Exp $
 
 inherit multilib flag-o-matic eutils python
 
@@ -32,7 +32,7 @@ RDEPEND=">=dev-libs/openssl-0.9.6
 	virtual/opengl"
 
 DEPEND="dev-util/scons
-	|| ( x11-libs/libXt virtual/x11 )
+	x11-libs/libXt
 	${RDEPEND}"
 
 blend_with() {
diff --git a/media-gfx/blender/blender-2.44.ebuild b/media-gfx/blender/blender-2.44.ebuild
index d629833f738e..44605b822653 100644
--- a/media-gfx/blender/blender-2.44.ebuild
+++ b/media-gfx/blender/blender-2.44.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/media-gfx/blender/blender-2.44.ebuild,v 1.3 2007/07/15 10:24:26 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.44.ebuild,v 1.4 2007/07/22 10:04:27 dberkholz Exp $
 
 inherit multilib flag-o-matic eutils python
 
@@ -33,7 +33,7 @@ RDEPEND=">=dev-libs/openssl-0.9.6
 	virtual/opengl"
 
 DEPEND="dev-util/scons
-	|| ( x11-libs/libXt virtual/x11 )
+	x11-libs/libXt
 	${RDEPEND}"
 
 blend_with() {
diff --git a/media-gfx/ebdftopcf/ChangeLog b/media-gfx/ebdftopcf/ChangeLog
index ded5eae91edf..9469baa7c900 100644
--- a/media-gfx/ebdftopcf/ChangeLog
+++ b/media-gfx/ebdftopcf/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-gfx/ebdftopcf
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/ebdftopcf/ChangeLog,v 1.13 2007/01/11 19:03:24 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/ebdftopcf/ChangeLog,v 1.14 2007/07/22 09:51:55 dberkholz Exp $
+
+  22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>; ebdftopcf-1.ebuild,
+  ebdftopcf-2.ebuild:
+  Drop virtual/x11 references.
 
   11 Jan 2007; Guy Martin <gmsoft@gentoo.org> ebdftopcf-2.ebuild:
   Stable on hppa.
diff --git a/media-gfx/ebdftopcf/ebdftopcf-1.ebuild b/media-gfx/ebdftopcf/ebdftopcf-1.ebuild
index af5c98f42e9f..b2e7581b33c7 100644
--- a/media-gfx/ebdftopcf/ebdftopcf-1.ebuild
+++ b/media-gfx/ebdftopcf/ebdftopcf-1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 2006-2006 Gentoo Foundation
+# Copyright 2006-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/ebdftopcf/ebdftopcf-1.ebuild,v 1.3 2006/03/20 02:52:13 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/ebdftopcf/ebdftopcf-1.ebuild,v 1.4 2007/07/22 09:51:55 dberkholz Exp $
 
 DESCRIPTION="ebdftopcf optimially generators PCF files from BDF files"
 HOMEPAGE="http://www.gentoo.org/"
@@ -11,7 +11,7 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc-macos ~ppc64 ~sh
 IUSE=""
 DEPEND=""
 # these apps are used at runtime by ebdftopcf
-RDEPEND="|| ( x11-apps/bdftopcf virtual/x11 )
+RDEPEND="x11-apps/bdftopcf
 		app-arch/gzip"
 
 src_install() {
diff --git a/media-gfx/ebdftopcf/ebdftopcf-2.ebuild b/media-gfx/ebdftopcf/ebdftopcf-2.ebuild
index 3617222ad466..cdc768c00292 100644
--- a/media-gfx/ebdftopcf/ebdftopcf-2.ebuild
+++ b/media-gfx/ebdftopcf/ebdftopcf-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/media-gfx/ebdftopcf/ebdftopcf-2.ebuild,v 1.12 2007/01/11 19:03:24 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/ebdftopcf/ebdftopcf-2.ebuild,v 1.13 2007/07/22 09:51:55 dberkholz Exp $
 
 DESCRIPTION="ebdftopcf optimially generators PCF files from BDF files"
 HOMEPAGE="http://www.gentoo.org/"
@@ -13,7 +13,7 @@ IUSE=""
 
 DEPEND=""
 # these apps are used at runtime by ebdftopcf
-RDEPEND="|| ( x11-apps/bdftopcf virtual/x11 )
+RDEPEND="x11-apps/bdftopcf
 	app-arch/gzip"
 
 src_install() {
diff --git a/media-gfx/fbida/ChangeLog b/media-gfx/fbida/ChangeLog
index 32a8c86e6b87..f7b0492c1a28 100644
--- a/media-gfx/fbida/ChangeLog
+++ b/media-gfx/fbida/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-gfx/fbida
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/fbida/ChangeLog,v 1.39 2007/06/25 18:41:30 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/fbida/ChangeLog,v 1.40 2007/07/22 09:54:09 dberkholz Exp $
+
+  22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>; fbida-2.03-r4.ebuild,
+  fbida-2.05.ebuild, fbida-2.06.ebuild:
+  Drop virtual/x11 references.
 
   25 Jun 2007; Raúl Porcel <armin76@gentoo.org> fbida-2.05.ebuild:
   alpha stable wrt #177324
diff --git a/media-gfx/fbida/fbida-2.03-r4.ebuild b/media-gfx/fbida/fbida-2.03-r4.ebuild
index bcf28c490446..d7de46c0d4f9 100644
--- a/media-gfx/fbida/fbida-2.03-r4.ebuild
+++ b/media-gfx/fbida/fbida-2.03-r4.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/media-gfx/fbida/fbida-2.03-r4.ebuild,v 1.4 2007/04/22 14:38:30 spock Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/fbida/fbida-2.03-r4.ebuild,v 1.5 2007/07/22 09:54:09 dberkholz Exp $
 
 inherit eutils
 
@@ -20,9 +20,11 @@ RDEPEND="jpeg? ( >=media-libs/jpeg-6b )
 	tiff? ( media-libs/tiff )
 	curl? ( net-misc/curl )
 	lirc? ( app-misc/lirc )
-	X? ( || ( ( x11-libs/libX11 x11-libs/libXt x11-libs/libXpm )
-			virtual/x11 )
-		virtual/motif )
+	X? ( x11-libs/libX11
+		x11-libs/libXt
+		x11-libs/libXpm
+		virtual/motif
+	)
 	!media-gfx/fbi
 	media-libs/libexif
 	>=media-libs/freetype-2.0
@@ -30,8 +32,7 @@ RDEPEND="jpeg? ( >=media-libs/jpeg-6b )
 	media-fonts/ttf-bitstream-vera"
 
 DEPEND="${RDEPEND}
-	X? ( || ( ( x11-proto/xextproto x11-proto/xproto )
-			virtual/x11 ) )"
+	X? ( x11-proto/xextproto x11-proto/xproto )"
 
 src_unpack() {
 	unpack ${A}
diff --git a/media-gfx/fbida/fbida-2.05.ebuild b/media-gfx/fbida/fbida-2.05.ebuild
index 204af46796df..c09cc3121eab 100644
--- a/media-gfx/fbida/fbida-2.05.ebuild
+++ b/media-gfx/fbida/fbida-2.05.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/media-gfx/fbida/fbida-2.05.ebuild,v 1.14 2007/06/25 18:41:30 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/fbida/fbida-2.05.ebuild,v 1.15 2007/07/22 09:54:09 dberkholz Exp $
 
 inherit eutils toolchain-funcs
 
@@ -20,9 +20,11 @@ RDEPEND="jpeg? ( >=media-libs/jpeg-6b )
 	tiff? ( media-libs/tiff )
 	curl? ( net-misc/curl )
 	lirc? ( app-misc/lirc )
-	X? ( || ( ( x11-libs/libX11 x11-libs/libXt x11-libs/libXpm )
-			virtual/x11 )
-		virtual/motif )
+	X? ( x11-libs/libX11
+		x11-libs/libXt
+		x11-libs/libXpm
+		virtual/motif
+	)
 	!media-gfx/fbi
 	media-libs/libexif
 	>=media-libs/freetype-2.0
@@ -30,8 +32,7 @@ RDEPEND="jpeg? ( >=media-libs/jpeg-6b )
 	media-fonts/ttf-bitstream-vera"
 
 DEPEND="${RDEPEND}
-	X? ( || ( ( x11-proto/xextproto x11-proto/xproto )
-			virtual/x11 ) )"
+	X? ( x11-proto/xextproto x11-proto/xproto )"
 
 src_unpack() {
 	unpack ${A}
diff --git a/media-gfx/fbida/fbida-2.06.ebuild b/media-gfx/fbida/fbida-2.06.ebuild
index 65cd11e1de6b..18f719b7f8aa 100644
--- a/media-gfx/fbida/fbida-2.06.ebuild
+++ b/media-gfx/fbida/fbida-2.06.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/media-gfx/fbida/fbida-2.06.ebuild,v 1.2 2007/05/06 13:29:05 spock Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/fbida/fbida-2.06.ebuild,v 1.3 2007/07/22 09:54:09 dberkholz Exp $
 
 inherit eutils toolchain-funcs
 
@@ -20,9 +20,11 @@ RDEPEND="jpeg? ( >=media-libs/jpeg-6b )
 	tiff? ( media-libs/tiff )
 	curl? ( net-misc/curl )
 	lirc? ( app-misc/lirc )
-	X? ( || ( ( x11-libs/libX11 x11-libs/libXt x11-libs/libXpm )
-			virtual/x11 )
-		virtual/motif )
+	X? ( x11-libs/libX11
+		x11-libs/libXt
+		x11-libs/libXpm
+		virtual/motif
+	)
 	!media-gfx/fbi
 	media-libs/libexif
 	>=media-libs/freetype-2.0
@@ -30,8 +32,7 @@ RDEPEND="jpeg? ( >=media-libs/jpeg-6b )
 	media-fonts/ttf-bitstream-vera"
 
 DEPEND="${RDEPEND}
-	X? ( || ( ( x11-proto/xextproto x11-proto/xproto )
-			virtual/x11 ) )"
+	X? ( x11-proto/xextproto x11-proto/xproto )"
 
 src_unpack() {
 	unpack ${A}
diff --git a/media-gfx/feh/ChangeLog b/media-gfx/feh/ChangeLog
index 6c82f0c93ec3..e276c96d0f67 100644
--- a/media-gfx/feh/ChangeLog
+++ b/media-gfx/feh/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-gfx/feh
-# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/feh/ChangeLog,v 1.28 2006/07/16 06:21:52 vapier Exp $
+# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/feh/ChangeLog,v 1.29 2007/07/22 10:03:08 dberkholz Exp $
+
+  22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>; feh-1.3.4.ebuild:
+  Drop virtual/x11 references.
 
   16 Jul 2006; Mike Frysinger <vapier@gentoo.org>
   +files/feh-1.3.4-headers.patch, +files/feh-1.3.4-xinerama.patch,
diff --git a/media-gfx/feh/feh-1.3.4.ebuild b/media-gfx/feh/feh-1.3.4.ebuild
index f49d6fafb0e8..728fcd46997c 100644
--- a/media-gfx/feh/feh-1.3.4.ebuild
+++ b/media-gfx/feh/feh-1.3.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/media-gfx/feh/feh-1.3.4.ebuild,v 1.9 2006/07/30 17:03:18 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/feh/feh-1.3.4.ebuild,v 1.10 2007/07/22 10:03:08 dberkholz Exp $
 
 inherit eutils autotools
 
@@ -17,16 +17,13 @@ RDEPEND=">=media-libs/giblib-1.2.4
 	>=media-libs/imlib2-1.0.0
 	>=media-libs/jpeg-6b-r4
 	media-libs/libpng
-	|| ( (
-		x11-libs/libX11
-		x11-libs/libXext
-		xinerama? ( x11-libs/libXinerama )
-		x11-libs/libXt
-		)
-		virtual/x11
-	)"
+	x11-libs/libX11
+	x11-libs/libXext
+	xinerama? ( x11-libs/libXinerama )
+	x11-libs/libXt"
 DEPEND="${RDEPEND}
-	|| ( ( x11-proto/xproto x11-proto/xineramaproto ) virtual/x11 )"
+	x11-proto/xproto
+	x11-proto/xineramaproto"
 
 src_unpack() {
 	unpack ${A}
diff --git a/media-gfx/freewrl/ChangeLog b/media-gfx/freewrl/ChangeLog
index 86d7a706733e..f3e2845e3d6b 100644
--- a/media-gfx/freewrl/ChangeLog
+++ b/media-gfx/freewrl/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-gfx/freewrl
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/freewrl/ChangeLog,v 1.16 2007/04/02 23:22:25 hanno Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/freewrl/ChangeLog,v 1.17 2007/07/22 10:02:16 dberkholz Exp $
+
+  22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>;
+  freewrl-1.16.1.ebuild, freewrl-1.18.10.ebuild, freewrl-1.18.14.ebuild,
+  freewrl-1.19.1.ebuild:
+  Drop virtual/x11 references.
 
 *freewrl-1.19.1 (02 Apr 2007)
 
diff --git a/media-gfx/freewrl/freewrl-1.16.1.ebuild b/media-gfx/freewrl/freewrl-1.16.1.ebuild
index 5b0f5790563d..e31b8e20b3cf 100644
--- a/media-gfx/freewrl/freewrl-1.16.1.ebuild
+++ b/media-gfx/freewrl/freewrl-1.16.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/media-gfx/freewrl/freewrl-1.16.1.ebuild,v 1.5 2007/02/13 14:56:13 hanno Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/freewrl/freewrl-1.16.1.ebuild,v 1.6 2007/07/22 10:02:16 dberkholz Exp $
 
 inherit nsplugins eutils perl-module toolchain-funcs
 
@@ -12,14 +12,12 @@ HOMEPAGE="http://freewrl.sourceforge.net/"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~x86"
-DEPEND="|| ( (
-		x11-libs/libXau
-		x11-libs/libXdmcp
-		x11-libs/libXxf86vm
-		x11-libs/libXext
-		x11-libs/libX11
-		media-libs/mesa
-	) virtual/x11 )
+DEPEND="x11-libs/libXau
+	x11-libs/libXdmcp
+	x11-libs/libXxf86vm
+	x11-libs/libXext
+	x11-libs/libX11
+	media-libs/mesa
 	virtual/opengl
 	virtual/jdk
 	media-libs/libpng
diff --git a/media-gfx/freewrl/freewrl-1.18.10.ebuild b/media-gfx/freewrl/freewrl-1.18.10.ebuild
index d8f240b7b3dc..befe8355b241 100644
--- a/media-gfx/freewrl/freewrl-1.18.10.ebuild
+++ b/media-gfx/freewrl/freewrl-1.18.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/media-gfx/freewrl/freewrl-1.18.10.ebuild,v 1.1 2007/01/17 07:45:27 hanno Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/freewrl/freewrl-1.18.10.ebuild,v 1.2 2007/07/22 10:02:16 dberkholz Exp $
 
 inherit nsplugins eutils perl-module toolchain-funcs
 
@@ -12,14 +12,12 @@ HOMEPAGE="http://freewrl.sourceforge.net/"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~x86"
-DEPEND="|| ( (
-		x11-libs/libXau
-		x11-libs/libXdmcp
-		x11-libs/libXxf86vm
-		x11-libs/libXext
-		x11-libs/libX11
-		media-libs/mesa
-	) virtual/x11 )
+DEPEND="x11-libs/libXau
+	x11-libs/libXdmcp
+	x11-libs/libXxf86vm
+	x11-libs/libXext
+	x11-libs/libX11
+	media-libs/mesa
 	virtual/opengl
 	virtual/jdk
 	media-libs/libpng
diff --git a/media-gfx/freewrl/freewrl-1.18.14.ebuild b/media-gfx/freewrl/freewrl-1.18.14.ebuild
index 33c932ca3f91..c39ce779d083 100644
--- a/media-gfx/freewrl/freewrl-1.18.14.ebuild
+++ b/media-gfx/freewrl/freewrl-1.18.14.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/media-gfx/freewrl/freewrl-1.18.14.ebuild,v 1.1 2007/02/13 14:56:13 hanno Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/freewrl/freewrl-1.18.14.ebuild,v 1.2 2007/07/22 10:02:16 dberkholz Exp $
 
 inherit nsplugins eutils perl-module toolchain-funcs
 
@@ -12,14 +12,12 @@ HOMEPAGE="http://freewrl.sourceforge.net/"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~x86"
-DEPEND="|| ( (
-		x11-libs/libXau
-		x11-libs/libXdmcp
-		x11-libs/libXxf86vm
-		x11-libs/libXext
-		x11-libs/libX11
-		media-libs/mesa
-	) virtual/x11 )
+DEPEND="x11-libs/libXau
+	x11-libs/libXdmcp
+	x11-libs/libXxf86vm
+	x11-libs/libXext
+	x11-libs/libX11
+	media-libs/mesa
 	virtual/opengl
 	virtual/jdk
 	media-libs/libpng
diff --git a/media-gfx/freewrl/freewrl-1.19.1.ebuild b/media-gfx/freewrl/freewrl-1.19.1.ebuild
index 6a1302094789..104771a675ac 100644
--- a/media-gfx/freewrl/freewrl-1.19.1.ebuild
+++ b/media-gfx/freewrl/freewrl-1.19.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/media-gfx/freewrl/freewrl-1.19.1.ebuild,v 1.1 2007/04/02 23:22:25 hanno Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/freewrl/freewrl-1.19.1.ebuild,v 1.2 2007/07/22 10:02:16 dberkholz Exp $
 
 inherit nsplugins eutils perl-module toolchain-funcs
 
@@ -12,14 +12,12 @@ HOMEPAGE="http://freewrl.sourceforge.net/"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~x86"
-DEPEND="|| ( (
-		x11-libs/libXau
-		x11-libs/libXdmcp
-		x11-libs/libXxf86vm
-		x11-libs/libXext
-		x11-libs/libX11
-		media-libs/mesa
-	) virtual/x11 )
+DEPEND="x11-libs/libXau
+	x11-libs/libXdmcp
+	x11-libs/libXxf86vm
+	x11-libs/libXext
+	x11-libs/libX11
+	media-libs/mesa
 	virtual/opengl
 	virtual/jdk
 	media-libs/libpng
diff --git a/media-gfx/gifsicle/ChangeLog b/media-gfx/gifsicle/ChangeLog
index b9f61f5e34dd..f22db6e26d4b 100644
--- a/media-gfx/gifsicle/ChangeLog
+++ b/media-gfx/gifsicle/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-gfx/gifsicle
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gifsicle/ChangeLog,v 1.16 2007/06/03 15:42:30 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gifsicle/ChangeLog,v 1.17 2007/07/22 10:00:40 dberkholz Exp $
+
+  22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>; gifsicle-1.44.ebuild:
+  Drop virtual/x11 references.
 
   03 Jun 2007; Raúl Porcel <armin76@gentoo.org> gifsicle-1.44.ebuild:
   Add ~alpha wrt #173108
diff --git a/media-gfx/gifsicle/gifsicle-1.44.ebuild b/media-gfx/gifsicle/gifsicle-1.44.ebuild
index eb16c16205ea..1e8b54f0803e 100644
--- a/media-gfx/gifsicle/gifsicle-1.44.ebuild
+++ b/media-gfx/gifsicle/gifsicle-1.44.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/media-gfx/gifsicle/gifsicle-1.44.ebuild,v 1.8 2007/06/03 15:42:30 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gifsicle/gifsicle-1.44.ebuild,v 1.9 2007/07/22 10:00:40 dberkholz Exp $
 
 DESCRIPTION="A UNIX command-line tool for creating, editing, and getting information about GIF images and animations"
 HOMEPAGE="http://www.lcdf.org/~eddietwo/gifsicle/"
@@ -11,11 +11,9 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ppc ~ppc-macos ~ppc64 sparc x86"
 IUSE="X"
 
-DEPEND="X? ( || ( (
-		x11-libs/libX11
+DEPEND="X? ( x11-libs/libX11
 		x11-libs/libXt
-		x11-proto/xproto )
-		virtual/x11 ) )"
+		x11-proto/xproto )"
 
 src_compile() {
 	local myconf
diff --git a/media-gfx/gimp/ChangeLog b/media-gfx/gimp/ChangeLog
index 5bf840f3dc78..158c090a4aed 100644
--- a/media-gfx/gimp/ChangeLog
+++ b/media-gfx/gimp/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-gfx/gimp
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/ChangeLog,v 1.214 2007/07/14 22:54:48 hanno Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/ChangeLog,v 1.215 2007/07/22 09:59:49 dberkholz Exp $
+
+  22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>; gimp-2.2.14.ebuild,
+  gimp-2.2.15.ebuild, gimp-2.2.16.ebuild, gimp-2.2.17.ebuild:
+  Drop virtual/x11 references.
 
 *gimp-2.2.17 (14 Jul 2007)
 
diff --git a/media-gfx/gimp/gimp-2.2.14.ebuild b/media-gfx/gimp/gimp-2.2.14.ebuild
index dea27ad6c182..8ce1c7a07658 100644
--- a/media-gfx/gimp/gimp-2.2.14.ebuild
+++ b/media-gfx/gimp/gimp-2.2.14.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/media-gfx/gimp/gimp-2.2.14.ebuild,v 1.11 2007/05/11 02:07:06 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-2.2.14.ebuild,v 1.12 2007/07/22 09:59:49 dberkholz Exp $
 
 inherit flag-o-matic libtool eutils fdo-mime alternatives multilib python
 
@@ -15,7 +15,6 @@ KEYWORDS="alpha amd64 hppa ia64 mips ppc ppc64 sparc x86"
 IUSE="aalib altivec debug doc gtkhtml gimpprint hardened jpeg lcms mmx mng png
 python smp sse svg tiff wmf"
 
-#	X? ( virtual/x11 )"
 RDEPEND=">=dev-libs/glib-2.4.5
 	>=x11-libs/gtk+-2.4.4
 	>=x11-libs/pango-1.4
diff --git a/media-gfx/gimp/gimp-2.2.15.ebuild b/media-gfx/gimp/gimp-2.2.15.ebuild
index 27f608a93514..94e82eb9961f 100644
--- a/media-gfx/gimp/gimp-2.2.15.ebuild
+++ b/media-gfx/gimp/gimp-2.2.15.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/media-gfx/gimp/gimp-2.2.15.ebuild,v 1.1 2007/05/30 20:39:16 hanno Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-2.2.15.ebuild,v 1.2 2007/07/22 09:59:49 dberkholz Exp $
 
 inherit flag-o-matic libtool eutils fdo-mime alternatives multilib python
 
@@ -15,7 +15,6 @@ KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 IUSE="aalib altivec debug doc gtkhtml gimpprint hardened jpeg lcms mmx mng png
 python smp sse svg tiff wmf"
 
-#	X? ( virtual/x11 )"
 RDEPEND=">=dev-libs/glib-2.4.5
 	>=x11-libs/gtk+-2.4.4
 	>=x11-libs/pango-1.4
diff --git a/media-gfx/gimp/gimp-2.2.16.ebuild b/media-gfx/gimp/gimp-2.2.16.ebuild
index cb90042ec363..41965c698e07 100644
--- a/media-gfx/gimp/gimp-2.2.16.ebuild
+++ b/media-gfx/gimp/gimp-2.2.16.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/media-gfx/gimp/gimp-2.2.16.ebuild,v 1.8 2007/07/11 17:22:20 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-2.2.16.ebuild,v 1.9 2007/07/22 09:59:49 dberkholz Exp $
 
 inherit flag-o-matic libtool eutils fdo-mime alternatives multilib python
 
@@ -15,7 +15,6 @@ KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86"
 IUSE="aalib altivec debug doc gtkhtml gimpprint hardened jpeg lcms mmx mng png
 python smp sse svg tiff wmf"
 
-#	X? ( virtual/x11 )"
 RDEPEND=">=dev-libs/glib-2.4.5
 	>=x11-libs/gtk+-2.4.4
 	>=x11-libs/pango-1.4
diff --git a/media-gfx/gimp/gimp-2.2.17.ebuild b/media-gfx/gimp/gimp-2.2.17.ebuild
index 9626859f2d37..37c1d3ea766b 100644
--- a/media-gfx/gimp/gimp-2.2.17.ebuild
+++ b/media-gfx/gimp/gimp-2.2.17.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/media-gfx/gimp/gimp-2.2.17.ebuild,v 1.1 2007/07/14 22:54:48 hanno Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-2.2.17.ebuild,v 1.2 2007/07/22 09:59:49 dberkholz Exp $
 
 inherit flag-o-matic libtool eutils fdo-mime alternatives multilib python
 
@@ -15,7 +15,6 @@ KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 IUSE="aalib altivec debug doc gtkhtml gimpprint hardened jpeg lcms mmx mng png
 python smp sse svg tiff wmf"
 
-#	X? ( virtual/x11 )"
 RDEPEND=">=dev-libs/glib-2.4.5
 	>=x11-libs/gtk+-2.4.4
 	>=x11-libs/pango-1.4
diff --git a/media-gfx/gozer/ChangeLog b/media-gfx/gozer/ChangeLog
index af62f29cb4bb..6fe2fe32e928 100644
--- a/media-gfx/gozer/ChangeLog
+++ b/media-gfx/gozer/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-gfx/gozer
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gozer/ChangeLog,v 1.11 2007/05/15 09:55:15 bangert Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gozer/ChangeLog,v 1.12 2007/07/22 09:57:42 dberkholz Exp $
+
+  22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>; gozer-0.7-r1.ebuild:
+  Drop virtual/x11 references.
 
   15 May 2007; Thilo Bangert <bangert@gentoo.org> metadata.xml:
   add <herd>no-herd</herd>
diff --git a/media-gfx/gozer/gozer-0.7-r1.ebuild b/media-gfx/gozer/gozer-0.7-r1.ebuild
index 77b721c89ed0..e9c18aca8401 100644
--- a/media-gfx/gozer/gozer-0.7-r1.ebuild
+++ b/media-gfx/gozer/gozer-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/media-gfx/gozer/gozer-0.7-r1.ebuild,v 1.6 2006/03/19 23:12:26 joshuabaergen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gozer/gozer-0.7-r1.ebuild,v 1.7 2007/07/22 09:57:42 dberkholz Exp $
 
 DESCRIPTION="tool for rendering arbitrary text as graphics, using ttfs and styles"
 HOMEPAGE="http://www.linuxbrit.co.uk/"
@@ -11,7 +11,7 @@ SLOT="0"
 KEYWORDS="~amd64 ppc x86"
 IUSE=""
 
-DEPEND="|| ( x11-libs/libXext virtual/x11 )
+DEPEND="x11-libs/libXext
 	>=media-libs/giblib-1.2.1"
 
 src_install() {
diff --git a/media-gfx/graphviz/ChangeLog b/media-gfx/graphviz/ChangeLog
index 739b8666400d..980e4880f932 100644
--- a/media-gfx/graphviz/ChangeLog
+++ b/media-gfx/graphviz/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-gfx/graphviz
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/graphviz/ChangeLog,v 1.122 2007/07/12 16:06:09 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/graphviz/ChangeLog,v 1.123 2007/07/22 09:57:04 dberkholz Exp $
+
+  22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>;
+  graphviz-2.6-r1.ebuild:
+  Drop virtual/x11 references.
 
   12 Jul 2007; Roy Marples <uberlord@gentoo.org> graphviz-2.12.ebuild:
   Keyworded ~sparc-fbsd.
diff --git a/media-gfx/graphviz/graphviz-2.6-r1.ebuild b/media-gfx/graphviz/graphviz-2.6-r1.ebuild
index a899e1f81cd7..82b3b2e6eb37 100644
--- a/media-gfx/graphviz/graphviz-2.6-r1.ebuild
+++ b/media-gfx/graphviz/graphviz-2.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/media-gfx/graphviz/graphviz-2.6-r1.ebuild,v 1.8 2006/09/26 17:32:18 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/graphviz/graphviz-2.6-r1.ebuild,v 1.9 2007/07/22 09:57:04 dberkholz Exp $
 
 inherit eutils libtool
 
@@ -23,10 +23,7 @@ RDEPEND=">=sys-libs/zlib-1.1.3
 	tk? ( >=dev-lang/tk-8.3 )
 	tcl? ( >=dev-lang/tcl-8.3 )
 	cairo? ( >=x11-libs/libsvg-cairo-0.1.3 )
-	X? ( || (
-	    ( x11-libs/libXaw x11-libs/libXpm )
-	virtual/x11 )
-	)"
+	X? ( x11-libs/libXaw x11-libs/libXpm )"
 
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig"
diff --git a/media-gfx/k3d/ChangeLog b/media-gfx/k3d/ChangeLog
index a95db8f6dc58..ca65fe11b60a 100644
--- a/media-gfx/k3d/ChangeLog
+++ b/media-gfx/k3d/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-gfx/k3d
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/k3d/ChangeLog,v 1.32 2007/04/09 00:43:12 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/k3d/ChangeLog,v 1.33 2007/07/22 09:55:45 dberkholz Exp $
+
+  22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>;
+  k3d-0.5.0.37-r1.ebuild, k3d-0.6.2.0.ebuild:
+  Drop virtual/x11 references.
 
   09 Apr 2007; Petteri Räty <betelgeuse@gentoo.org> -k3d-0.4.5.0.ebuild:
   Removed old ebuild with broken autotools handling for bug #160014.
diff --git a/media-gfx/k3d/k3d-0.5.0.37-r1.ebuild b/media-gfx/k3d/k3d-0.5.0.37-r1.ebuild
index f495272c54ac..4c3dcec72f7b 100644
--- a/media-gfx/k3d/k3d-0.5.0.37-r1.ebuild
+++ b/media-gfx/k3d/k3d-0.5.0.37-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/media-gfx/k3d/k3d-0.5.0.37-r1.ebuild,v 1.4 2007/01/04 23:07:18 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/k3d/k3d-0.5.0.37-r1.ebuild,v 1.5 2007/07/22 09:55:45 dberkholz Exp $
 
 inherit eutils
 
@@ -36,19 +36,13 @@ DEPEND="virtual/opengl
 	gnome-base/librsvg"
 
 RDEPEND="${DEPEND}
-	( || (
-	( x11-libs/libXmu
+	x11-libs/libXmu
 	x11-libs/libXt
 	x11-libs/libICE
-	x11-libs/libSM )
-	virtual/x11 )
-	)"
+	x11-libs/libSM"
 
 DEPEND="${DEPEND}
-	( || (
-	( media-libs/mesa )
-	virtual/x11 )
-	)"
+	media-libs/mesa"
 
 src_unpack() {
 	unpack ${A}
diff --git a/media-gfx/k3d/k3d-0.6.2.0.ebuild b/media-gfx/k3d/k3d-0.6.2.0.ebuild
index 8c15ce2a25d5..18ba3a7ba94c 100644
--- a/media-gfx/k3d/k3d-0.6.2.0.ebuild
+++ b/media-gfx/k3d/k3d-0.6.2.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/media-gfx/k3d/k3d-0.6.2.0.ebuild,v 1.3 2007/01/04 23:07:18 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/k3d/k3d-0.6.2.0.ebuild,v 1.4 2007/07/22 09:55:45 dberkholz Exp $
 
 inherit eutils
 
@@ -36,19 +36,13 @@ DEPEND="virtual/opengl
 	gnome-base/librsvg"
 
 RDEPEND="${DEPEND}
-	( || (
-	( x11-libs/libXmu
+	x11-libs/libXmu
 	x11-libs/libXt
 	x11-libs/libICE
-	x11-libs/libSM )
-	virtual/x11 )
-	)"
+	x11-libs/libSM"
 
 DEPEND="${DEPEND}
-	( || (
-	( media-libs/mesa )
-	virtual/x11 )
-	)"
+	media-libs/mesa"
 
 src_unpack() {
 	unpack ${A}
diff --git a/media-gfx/picasa/ChangeLog b/media-gfx/picasa/ChangeLog
index 5c3bb987d140..9f94074f4195 100644
--- a/media-gfx/picasa/ChangeLog
+++ b/media-gfx/picasa/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-gfx/picasa
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/picasa/ChangeLog,v 1.8 2007/05/15 09:55:15 bangert Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/picasa/ChangeLog,v 1.9 2007/07/22 09:46:19 dberkholz Exp $
+
+  22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>;
+  picasa-2.2.2820.5.ebuild:
+  Drop virtual/x11 references.
 
   15 May 2007; Thilo Bangert <bangert@gentoo.org> metadata.xml:
   add <herd>no-herd</herd>
diff --git a/media-gfx/picasa/picasa-2.2.2820.5.ebuild b/media-gfx/picasa/picasa-2.2.2820.5.ebuild
index 67e63b5d37c9..de2d7a796d93 100644
--- a/media-gfx/picasa/picasa-2.2.2820.5.ebuild
+++ b/media-gfx/picasa/picasa-2.2.2820.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/media-gfx/picasa/picasa-2.2.2820.5.ebuild,v 1.7 2007/01/19 15:31:46 masterdriverz Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/picasa/picasa-2.2.2820.5.ebuild,v 1.8 2007/07/22 09:46:19 dberkholz Exp $
 
 inherit eutils versionator
 
@@ -26,17 +26,12 @@ RDEPEND="dev-libs/atk
 	dev-libs/libxml2
 	sys-libs/zlib
 	x11-libs/gtk+
-	|| (
-		(
-			x11-libs/libICE
-			x11-libs/libSM
-			x11-libs/libX11
-			x11-libs/libXext
-			x11-libs/libXi
-			x11-libs/libXt
-		)
-		virtual/x11
-	)
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXi
+	x11-libs/libXt
 	x11-libs/pango"
 S=${WORKDIR}
 
diff --git a/media-gfx/povray/ChangeLog b/media-gfx/povray/ChangeLog
index f114bdd91c7a..f55087ee1bba 100644
--- a/media-gfx/povray/ChangeLog
+++ b/media-gfx/povray/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-gfx/povray
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/povray/ChangeLog,v 1.67 2007/06/15 17:44:21 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/povray/ChangeLog,v 1.68 2007/07/22 09:50:57 dberkholz Exp $
+
+  22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>;
+  povray-3.6.1-r1.ebuild, povray-3.6.1-r2.ebuild:
+  Drop virtual/x11 references.
 
   15 Jun 2007; Raúl Porcel <armin76@gentoo.org> povray-3.6.1-r2.ebuild:
   alpha stable wrt #16473
diff --git a/media-gfx/povray/povray-3.6.1-r1.ebuild b/media-gfx/povray/povray-3.6.1-r1.ebuild
index 0e8e0b7a6448..534f01a9a2cd 100644
--- a/media-gfx/povray/povray-3.6.1-r1.ebuild
+++ b/media-gfx/povray/povray-3.6.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/media-gfx/povray/povray-3.6.1-r1.ebuild,v 1.20 2007/04/03 23:25:41 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/povray/povray-3.6.1-r1.ebuild,v 1.21 2007/07/22 09:50:57 dberkholz Exp $
 
 inherit flag-o-matic eutils autotools
 
@@ -17,7 +17,7 @@ DEPEND="media-libs/libpng
 	>=media-libs/tiff-3.6.1
 	media-libs/jpeg
 	sys-libs/zlib
-	X? ( || ( x11-libs/libXaw virtual/x11 ) )
+	X? ( x11-libs/libXaw )
 	svga? ( media-libs/svgalib )"
 
 src_unpack() {
diff --git a/media-gfx/povray/povray-3.6.1-r2.ebuild b/media-gfx/povray/povray-3.6.1-r2.ebuild
index bd47f9cf8248..e1ec4c54e8ff 100644
--- a/media-gfx/povray/povray-3.6.1-r2.ebuild
+++ b/media-gfx/povray/povray-3.6.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/media-gfx/povray/povray-3.6.1-r2.ebuild,v 1.13 2007/06/15 17:44:21 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/povray/povray-3.6.1-r2.ebuild,v 1.14 2007/07/22 09:50:57 dberkholz Exp $
 
 inherit flag-o-matic eutils autotools
 
@@ -17,7 +17,7 @@ DEPEND="media-libs/libpng
 	>=media-libs/tiff-3.6.1
 	media-libs/jpeg
 	sys-libs/zlib
-	X? ( || ( x11-libs/libXaw virtual/x11 ) )
+	X? ( x11-libs/libXaw )
 	svga? ( media-libs/svgalib )"
 
 src_unpack() {
diff --git a/media-gfx/quat/ChangeLog b/media-gfx/quat/ChangeLog
index ae20a1faa70d..b48e224035e0 100644
--- a/media-gfx/quat/ChangeLog
+++ b/media-gfx/quat/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-gfx/quat
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/quat/ChangeLog,v 1.6 2007/03/15 11:00:38 spock Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/quat/ChangeLog,v 1.7 2007/07/22 09:49:32 dberkholz Exp $
+
+  22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>; quat-1.20.ebuild:
+  Drop virtual/x11 references.
 
   15 Mar 2007; Michał Januszewski <spock@gentoo.org> quat-1.20.ebuild:
   Don't use 'which' to find 'fluid'.
diff --git a/media-gfx/quat/quat-1.20.ebuild b/media-gfx/quat/quat-1.20.ebuild
index f5f5e2c7b0dd..9ca9db62459e 100644
--- a/media-gfx/quat/quat-1.20.ebuild
+++ b/media-gfx/quat/quat-1.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/media-gfx/quat/quat-1.20.ebuild,v 1.7 2007/03/15 11:00:38 spock Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/quat/quat-1.20.ebuild,v 1.8 2007/07/22 09:49:32 dberkholz Exp $
 
 DESCRIPTION="A 3D quaternionic fractal generator"
 HOMEPAGE="http://www.physcip.uni-stuttgart.de/phy11733/quat_e.html"
@@ -12,12 +12,9 @@ KEYWORDS="~ppc x86"
 IUSE="X debug"
 
 DEPEND="X? ( >=x11-libs/fltk-1.1
-			|| ( ( x11-libs/libX11
-					x11-libs/libXext
-					x11-libs/libXft
-				)
-				virtual/x11
-			)
+			x11-libs/libX11
+			x11-libs/libXext
+			x11-libs/libXft
 		)
 	>=sys-libs/zlib-1.1.4"
 RDEPEND=""
diff --git a/media-gfx/videorbits/ChangeLog b/media-gfx/videorbits/ChangeLog
index eaea4007dc8f..c89a1c21c637 100644
--- a/media-gfx/videorbits/ChangeLog
+++ b/media-gfx/videorbits/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-gfx/videorbits
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/videorbits/ChangeLog,v 1.8 2007/02/22 01:42:27 peper Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/videorbits/ChangeLog,v 1.9 2007/07/22 09:48:54 dberkholz Exp $
+
+  22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>;
+  videorbits-2.201.ebuild:
+  Drop virtual/x11 references.
 
   22 Feb 2007; Piotr Jaroszyński <peper@gentoo.org> ChangeLog:
   Transition to Manifest2.
diff --git a/media-gfx/videorbits/videorbits-2.201.ebuild b/media-gfx/videorbits/videorbits-2.201.ebuild
index 467f3a6d9eb0..6e681db403ec 100644
--- a/media-gfx/videorbits/videorbits-2.201.ebuild
+++ b/media-gfx/videorbits/videorbits-2.201.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/media-gfx/videorbits/videorbits-2.201.ebuild,v 1.10 2006/03/19 00:08:49 joshuabaergen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/videorbits/videorbits-2.201.ebuild,v 1.11 2007/07/22 09:48:54 dberkholz Exp $
 
 DESCRIPTION="a collection of programs for creating high dynamic range images"
 HOMEPAGE="http://comparametric.sourceforge.net/"
@@ -12,7 +12,7 @@ KEYWORDS="~ppc x86"
 IUSE=""
 
 DEPEND="virtual/libc
-	|| ( x11-libs/libX11 virtual/x11 )
+	x11-libs/libX11
 	sys-libs/zlib
 	media-libs/libpng
 	media-libs/jpeg"
diff --git a/media-gfx/xli/ChangeLog b/media-gfx/xli/ChangeLog
index 26430cae5764..d28e89c6ce5e 100644
--- a/media-gfx/xli/ChangeLog
+++ b/media-gfx/xli/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-gfx/xli
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/xli/ChangeLog,v 1.39 2007/05/14 17:43:00 drac Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/xli/ChangeLog,v 1.40 2007/07/22 09:48:04 dberkholz Exp $
+
+  22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>; xli-1.17.0-r2.ebuild:
+  Drop virtual/x11 references.
 
 *xli-1.17.0-r3 (14 May 2007)
 
diff --git a/media-gfx/xli/xli-1.17.0-r2.ebuild b/media-gfx/xli/xli-1.17.0-r2.ebuild
index 6aad28e02ef3..266e5b9ac253 100644
--- a/media-gfx/xli/xli-1.17.0-r2.ebuild
+++ b/media-gfx/xli/xli-1.17.0-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/media-gfx/xli/xli-1.17.0-r2.ebuild,v 1.13 2007/07/12 04:08:47 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/xli/xli-1.17.0-r2.ebuild,v 1.14 2007/07/22 09:48:04 dberkholz Exp $
 
 inherit alternatives eutils
 
@@ -14,18 +14,15 @@ SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc-macos ppc64 sparc x86"
 IUSE=""
 
-RDEPEND="|| ( x11-libs/libXext virtual/x11 )
+RDEPEND="x11-libs/libXext
 	>=sys-libs/zlib-1.1.4
 	>=media-libs/libpng-1.0.5
 	>=media-libs/jpeg-6b-r2
 	app-arch/bzip2"
 DEPEND="${RDEPEND}
-	|| ( ( x11-proto/xextproto
-			x11-misc/imake
-			app-text/rman
-		)
-		virtual/x11
-	)"
+	x11-proto/xextproto
+	x11-misc/imake
+	app-text/rman"
 
 S=${WORKDIR}/${PN}-${SNAPSHOT}
 
diff --git a/media-gfx/xv/ChangeLog b/media-gfx/xv/ChangeLog
index f03ef5832ee4..51691ebb275f 100644
--- a/media-gfx/xv/ChangeLog
+++ b/media-gfx/xv/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-gfx/xv
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/xv/ChangeLog,v 1.80 2007/06/02 18:28:26 lavajoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/xv/ChangeLog,v 1.81 2007/07/22 09:47:08 dberkholz Exp $
+
+  22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>; xv-3.10a-r12.ebuild:
+  Drop virtual/x11 references.
 
   02 Jun 2007; Joe Peterson <lavajoe@gentoo.org>
   +files/xv-3.10a-osx-bsd.patch, -files/xv-3.10a-r12-xv-osx.patch,
diff --git a/media-gfx/xv/xv-3.10a-r12.ebuild b/media-gfx/xv/xv-3.10a-r12.ebuild
index b844127b1431..ec0ec5b5d679 100644
--- a/media-gfx/xv/xv-3.10a-r12.ebuild
+++ b/media-gfx/xv/xv-3.10a-r12.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/xv/xv-3.10a-r12.ebuild,v 1.16 2007/06/02 18:28:26 lavajoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/xv/xv-3.10a-r12.ebuild,v 1.17 2007/07/22 09:47:08 dberkholz Exp $
 
 inherit flag-o-matic eutils toolchain-funcs
 
@@ -14,7 +14,7 @@ SLOT="0"
 KEYWORDS="alpha amd64 hppa ia64 mips ppc ppc-macos ppc64 sparc x86 ~x86-fbsd"
 IUSE="jpeg tiff png"
 
-DEPEND="|| ( x11-libs/libXt virtual/x11 )
+DEPEND="x11-libs/libXt
 	jpeg? ( >=media-libs/jpeg-6b )
 	tiff? ( >=media-libs/tiff-3.6.1-r2 )
 	png? ( >=media-libs/libpng-1.2 >=sys-libs/zlib-1.1.4 )"