Drop virtual/x11 references.

(Portage version: 2.1.3_rc8)

3 files changed, 25 insertions, 37 deletions

diff --git a/media-libs/allegro/ChangeLog b/media-libs/allegro/ChangeLog
index 4de45e5ea040..a9ac11e87349 100644
--- a/media-libs/allegro/ChangeLog
+++ b/media-libs/allegro/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/allegro
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/allegro/ChangeLog,v 1.65 2007/03/01 00:04:41 nyhm Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/allegro/ChangeLog,v 1.66 2007/07/22 09:43:17 dberkholz Exp $
+
+  22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>;
+  allegro-4.1.14.ebuild, allegro-4.2.0-r1.ebuild:
+  Drop virtual/x11 references.
 
   28 Feb 2007; Tristan Heaven <nyhm@gentoo.org> allegro-4.2.1.ebuild:
   install setup utility, bug #155123
diff --git a/media-libs/allegro/allegro-4.1.14.ebuild b/media-libs/allegro/allegro-4.1.14.ebuild
index b2635c56bff0..d3cd549c2161 100644
--- a/media-libs/allegro/allegro-4.1.14.ebuild
+++ b/media-libs/allegro/allegro-4.1.14.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-libs/allegro/allegro-4.1.14.ebuild,v 1.16 2006/08/27 19:39:28 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/allegro/allegro-4.1.14.ebuild,v 1.17 2007/07/22 09:43:17 dberkholz Exp $
 
 IUSE="static mmx sse oss alsa esd arts X fbcon svga tetex doc"
 
@@ -18,26 +18,16 @@ RDEPEND="alsa? ( media-libs/alsa-lib )
 	esd? ( media-sound/esound )
 	arts? ( kde-base/arts )
 	X? (
-		|| (
-			(
-				x11-libs/libXxf86vm
-				x11-libs/libXxf86dga
-			)
-			virtual/x11
-		)
+		x11-libs/libXxf86vm
+		x11-libs/libXxf86dga
 	)
 	svga? ( media-libs/svgalib )"
 DEPEND="${RDEPEND}
 	>=sys-apps/sed-4
 	X? (
-		|| (
-			(
-				x11-proto/xextproto
-				x11-proto/xf86dgaproto
-				x11-proto/xf86vidmodeproto
-			)
-			virtual/x11
-		)
+		x11-proto/xextproto
+		x11-proto/xf86dgaproto
+		x11-proto/xf86vidmodeproto
 	)
 	tetex? ( virtual/tetex )"
 
diff --git a/media-libs/allegro/allegro-4.2.0-r1.ebuild b/media-libs/allegro/allegro-4.2.0-r1.ebuild
index beb1c4d85f7f..05d8150a9009 100644
--- a/media-libs/allegro/allegro-4.2.0-r1.ebuild
+++ b/media-libs/allegro/allegro-4.2.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/media-libs/allegro/allegro-4.2.0-r1.ebuild,v 1.7 2006/08/28 02:09:59 metalgod Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/allegro/allegro-4.2.0-r1.ebuild,v 1.8 2007/07/22 09:43:17 dberkholz Exp $
 
 inherit flag-o-matic eutils
 
@@ -18,29 +18,23 @@ RDEPEND="alsa? ( media-libs/alsa-lib )
 	arts? ( kde-base/arts )
 	alsa? ( media-libs/alsa-lib )
 	X? (
-		|| (
-			( x11-libs/libX11
-			x11-libs/libXcursor
-			x11-libs/libXext
-			x11-libs/libXpm
-			x11-libs/libXxf86dga
-			x11-libs/libXxf86vm )
-			virtual/x11
-		)
+		x11-libs/libX11
+		x11-libs/libXcursor
+		x11-libs/libXext
+		x11-libs/libXpm
+		x11-libs/libXxf86dga
+		x11-libs/libXxf86vm
 	)
 	svga? ( media-libs/svgalib )"
 
 DEPEND="${RDEPEND}
 	tetex? ( virtual/tetex )
 	X? (
-		|| (
-			( x11-libs/libXt
-			x11-proto/xextproto
-			x11-proto/xf86dgaproto
-			x11-proto/xf86vidmodeproto
-			x11-proto/xproto )
-			virtual/x11
-		)
+		x11-libs/libXt
+		x11-proto/xextproto
+		x11-proto/xf86dgaproto
+		x11-proto/xf86vidmodeproto
+		x11-proto/xproto
 	)"
 
 src_compile() {