Drop virtual/x11 references.

Package-Manager: portage-2.1.2.9

5 files changed, 29 insertions, 41 deletions

diff --git a/dev-games/clanlib/ChangeLog b/dev-games/clanlib/ChangeLog
index 3e2a5ca4fc75..2f7d3763a7c2 100644
--- a/dev-games/clanlib/ChangeLog
+++ b/dev-games/clanlib/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-games/clanlib
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-games/clanlib/ChangeLog,v 1.38 2007/06/12 23:38:03 nyhm Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-games/clanlib/ChangeLog,v 1.39 2007/07/22 09:50:49 graaff Exp $
+
+  22 Jul 2007; Hans de Graaff <graaff@gentoo.org> clanlib-0.6.5-r4.ebuild,
+  clanlib-0.7.8-r2.ebuild:
+  Drop virtual/x11 references.
 
   12 Jun 2007; Tristan Heaven <nyhm@gentoo.org>
   +files/clanlib-0.8.0-gcc42.patch, clanlib-0.8.0.ebuild:
diff --git a/dev-games/clanlib/clanlib-0.6.5-r4.ebuild b/dev-games/clanlib/clanlib-0.6.5-r4.ebuild
index 2410af7c52a0..bde5d4835a91 100644
--- a/dev-games/clanlib/clanlib-0.6.5-r4.ebuild
+++ b/dev-games/clanlib/clanlib-0.6.5-r4.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/dev-games/clanlib/clanlib-0.6.5-r4.ebuild,v 1.2 2006/09/28 16:55:37 nyhm Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-games/clanlib/clanlib-0.6.5-r4.ebuild,v 1.3 2007/07/22 09:50:49 graaff Exp $
 
 inherit eutils flag-o-matic multilib
 
@@ -15,13 +15,10 @@ IUSE="arts oss esd alsa png opengl truetype X vorbis mikmod jpeg directfb joysti
 
 DEPEND=">=media-libs/hermes-1.3.2
 	X? (
-		|| (
-			( media-libs/mesa
-			x11-libs/libXt
-			x11-proto/inputproto
-			x11-proto/xf86vidmodeproto )
-			virtual/x11
-		)
+		media-libs/mesa
+		x11-libs/libXt
+		x11-proto/inputproto
+		x11-proto/xf86vidmodeproto
 	)
 	png? ( media-libs/libpng )
 	jpeg? ( >=media-libs/jpeg-6b )
@@ -30,12 +27,9 @@ DEPEND=">=media-libs/hermes-1.3.2
 	directfb? ( dev-libs/DirectFB )
 	vorbis? ( media-libs/libvorbis )"
 RDEPEND="${DEPEND}
-	|| (
-		( media-libs/mesa
-		x11-libs/libXmu
-		x11-libs/libXxf86vm )
-		virtual/x11
-	)"
+	media-libs/mesa
+	x11-libs/libXmu
+	x11-libs/libXxf86vm"
 
 S=${WORKDIR}/ClanLib-${PV}
 
diff --git a/dev-games/clanlib/clanlib-0.7.8-r2.ebuild b/dev-games/clanlib/clanlib-0.7.8-r2.ebuild
index 1fa1352c0529..6164527e51e5 100644
--- a/dev-games/clanlib/clanlib-0.7.8-r2.ebuild
+++ b/dev-games/clanlib/clanlib-0.7.8-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/dev-games/clanlib/clanlib-0.7.8-r2.ebuild,v 1.2 2006/05/12 03:48:24 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-games/clanlib/clanlib-0.7.8-r2.ebuild,v 1.3 2007/07/22 09:50:49 graaff Exp $
 
 inherit flag-o-matic eutils
 
@@ -23,23 +23,13 @@ RDEPEND="media-libs/libpng
 		media-libs/libsdl
 		media-libs/sdl-gfx
 	)
-	|| (
-		(
-			x11-libs/libXmu
-			x11-libs/libXxf86vm
-		)
-		virtual/x11
-	)
+	x11-libs/libXmu
+	x11-libs/libXxf86vm
 	mikmod? ( >=media-libs/libmikmod-3.1.9 )
 	vorbis? ( media-libs/libvorbis )"
 DEPEND="${RDEPEND}
-	|| (
-		(
-			x11-libs/libXt
-			x11-proto/xf86vidmodeproto
-		)
-		virtual/x11
-	)"
+	x11-libs/libXt
+	x11-proto/xf86vidmodeproto"
 
 S="${WORKDIR}/ClanLib-${PV}"
 
diff --git a/dev-games/newton/ChangeLog b/dev-games/newton/ChangeLog
index 237ec4e6ac4d..7d1303127401 100644
--- a/dev-games/newton/ChangeLog
+++ b/dev-games/newton/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-games/newton
-# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-games/newton/ChangeLog,v 1.1 2006/09/06 19:29:19 wolf31o2 Exp $
+# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-games/newton/ChangeLog,v 1.2 2007/07/22 09:48:15 graaff Exp $
+
+  22 Jul 2007; Hans de Graaff <graaff@gentoo.org> newton-1.53.ebuild:
+  Drop virtual/x11 references.
 
 *newton-1.53 (06 Sep 2006)
 
diff --git a/dev-games/newton/newton-1.53.ebuild b/dev-games/newton/newton-1.53.ebuild
index 97f94d5244a5..e4b43d2e6302 100644
--- a/dev-games/newton/newton-1.53.ebuild
+++ b/dev-games/newton/newton-1.53.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/dev-games/newton/newton-1.53.ebuild,v 1.1 2006/09/06 19:29:19 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-games/newton/newton-1.53.ebuild,v 1.2 2007/07/22 09:48:15 graaff Exp $
 
 DESCRIPTION="an integrated solution for real time simulation of physics environments"
 HOMEPAGE="http://www.physicsengine.com/"
@@ -13,11 +13,8 @@ KEYWORDS="~x86"
 IUSE="doc"
 
 RDEPEND="doc? (
-	|| (
-		(
-			x11-libs/libXmu
-			x11-libs/libXi )
-		virtual/x11 )
+	x11-libs/libXmu
+	x11-libs/libXi
 	virtual/opengl
 	virtual/glut )"