From: Chris Gianelloni <wolf31o2@gentoo.org>
Date: Wed, 6 Dec 2006 20:19:32 +0000 (+0000)
Subject: Remove old virtual/x11 dependency.
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=b9875eac405136efa398861b5324e3b85954adb3;p=gentoo.git

Remove old virtual/x11 dependency.
Package-Manager: portage-2.1.2_rc2-r2
---

diff --git a/games-simulation/bcs-demo/ChangeLog b/games-simulation/bcs-demo/ChangeLog
index c94c499fa003..af5bac4828c4 100644
--- a/games-simulation/bcs-demo/ChangeLog
+++ b/games-simulation/bcs-demo/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for games-simulation/bcs-demo
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-simulation/bcs-demo/ChangeLog,v 1.6 2006/09/19 19:51:22 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-simulation/bcs-demo/ChangeLog,v 1.7 2006/12/06 20:17:14 wolf31o2 Exp $
+
+  06 Dec 2006; Chris Gianelloni <wolf31o2@gentoo.org> bcs-demo-1.3.ebuild:
+  Remove old virtual/x11 dependency.
 
   19 Sep 2006; Chris Gianelloni <wolf31o2@gentoo.org> bcs-demo-1.3.ebuild:
   Adding strip to RESTRICT for bug #137819.
diff --git a/games-simulation/bcs-demo/bcs-demo-1.3.ebuild b/games-simulation/bcs-demo/bcs-demo-1.3.ebuild
index 17db9e1c658c..2afb9945a49d 100644
--- a/games-simulation/bcs-demo/bcs-demo-1.3.ebuild
+++ b/games-simulation/bcs-demo/bcs-demo-1.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-simulation/bcs-demo/bcs-demo-1.3.ebuild,v 1.5 2006/09/19 19:51:22 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-simulation/bcs-demo/bcs-demo-1.3.ebuild,v 1.6 2006/12/06 20:17:14 wolf31o2 Exp $
 
 inherit eutils games
 
@@ -19,13 +19,10 @@ RDEPEND="sys-libs/glibc
 	virtual/opengl
 	x86? (
 		media-libs/libsdl
-		|| (
-			(
-				x11-libs/libX11
-				x11-libs/libXext
-				x11-libs/libXau
-				x11-libs/libXdmcp )
-			virtual/x11 ) )
+		x11-libs/libX11
+		x11-libs/libXext
+		x11-libs/libXau
+		x11-libs/libXdmcp )
 	amd64? (
 		app-emulation/emul-linux-x86-xlibs
 		app-emulation/emul-linux-x86-sdl )"
diff --git a/games-simulation/lincity/ChangeLog b/games-simulation/lincity/ChangeLog
index dab77262c585..8a32dc7ddb76 100644
--- a/games-simulation/lincity/ChangeLog
+++ b/games-simulation/lincity/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for games-simulation/lincity
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-simulation/lincity/ChangeLog,v 1.15 2006/10/05 18:39:07 nyhm Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-simulation/lincity/ChangeLog,v 1.16 2006/12/06 20:19:32 wolf31o2 Exp $
+
+  06 Dec 2006; Chris Gianelloni <wolf31o2@gentoo.org> lincity-1.12.1.ebuild:
+  Remove old virtual/x11 dependency.
 
   05 Oct 2006; Tristan Heaven <nyhm@gentoo.org> lincity-1.12.1.ebuild:
   Fix gettext dependency
diff --git a/games-simulation/lincity/lincity-1.12.1.ebuild b/games-simulation/lincity/lincity-1.12.1.ebuild
index 9fe6a8790421..d7d12cf2f192 100644
--- a/games-simulation/lincity/lincity-1.12.1.ebuild
+++ b/games-simulation/lincity/lincity-1.12.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-simulation/lincity/lincity-1.12.1.ebuild,v 1.6 2006/10/05 18:39:07 nyhm Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-simulation/lincity/lincity-1.12.1.ebuild,v 1.7 2006/12/06 20:19:32 wolf31o2 Exp $
 
 inherit games
 
@@ -17,23 +17,11 @@ IUSE="nls svga X"
 RDEPEND="nls? ( virtual/libintl )
 	svga? ( media-libs/svgalib )
 	X? (
-			|| (
-				(
-					x11-libs/libXext
-					x11-libs/libSM
-				)
-				virtual/x11
-			)
-		)
+		x11-libs/libXext
+		x11-libs/libSM )
 	!svga? (
-			|| (
-				(
-					x11-libs/libXext
-					x11-libs/libSM
-				)
-				virtual/x11
-			)
-		)"
+		x11-libs/libXext
+		x11-libs/libSM )"
 DEPEND="${RDEPEND}
 	nls? ( sys-devel/gettext )"