Remove old virtual/x11 dependency.

Package-Manager: portage-2.1.2_rc2-r2

10 files changed, 38 insertions, 32 deletions

diff --git a/games-puzzle/codebreaker/ChangeLog b/games-puzzle/codebreaker/ChangeLog
index ed75b487b8ea..cada27dd08c7 100644
--- a/games-puzzle/codebreaker/ChangeLog
+++ b/games-puzzle/codebreaker/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-puzzle/codebreaker
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-puzzle/codebreaker/ChangeLog,v 1.7 2006/08/15 13:49:31 tcort Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/codebreaker/ChangeLog,v 1.8 2006/12/06 16:55:47 wolf31o2 Exp $
+
+  06 Dec 2006; Chris Gianelloni <wolf31o2@gentoo.org>
+  codebreaker-1.2.1-r1.ebuild:
+  Remove old virtual/x11 dependency.
 
   15 Aug 2006; Thomas Cort <tcort@gentoo.org> codebreaker-1.2.1-r1.ebuild:
   Stable on amd64 wrt Bug #143961
diff --git a/games-puzzle/codebreaker/codebreaker-1.2.1-r1.ebuild b/games-puzzle/codebreaker/codebreaker-1.2.1-r1.ebuild
index 3c1107847375..42514490a913 100644
--- a/games-puzzle/codebreaker/codebreaker-1.2.1-r1.ebuild
+++ b/games-puzzle/codebreaker/codebreaker-1.2.1-r1.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-puzzle/codebreaker/codebreaker-1.2.1-r1.ebuild,v 1.7 2006/08/15 13:49:31 tcort Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/codebreaker/codebreaker-1.2.1-r1.ebuild,v 1.8 2006/12/06 16:55:47 wolf31o2 Exp $
 
 inherit games
 
@@ -13,7 +13,7 @@ SLOT="0"
 KEYWORDS="amd64 ppc x86"
 IUSE=""
 
-DEPEND="|| ( x11-libs/libXi virtual/x11 )
+DEPEND="x11-libs/libXi
 	=x11-libs/gtk+-1.2*"
 
 S="${WORKDIR}/${P}.orig"
diff --git a/games-puzzle/construo/ChangeLog b/games-puzzle/construo/ChangeLog
index 9f22c05944ea..58b9614ba0f6 100644
--- a/games-puzzle/construo/ChangeLog
+++ b/games-puzzle/construo/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for games-puzzle/construo
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-puzzle/construo/ChangeLog,v 1.8 2006/02/16 20:21:11 tupone Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/construo/ChangeLog,v 1.9 2006/12/06 16:57:17 wolf31o2 Exp $
+
+  06 Dec 2006; Chris Gianelloni <wolf31o2@gentoo.org> construo-0.2.2.ebuild:
+  Remove old virtual/x11 dependency.
 
   16 Feb 2006; <Tupone@gentoo.org> construo-0.2.2.ebuild:
   modular X dependency fix
diff --git a/games-puzzle/construo/construo-0.2.2.ebuild b/games-puzzle/construo/construo-0.2.2.ebuild
index 1928c6fa788d..6cf659586a14 100644
--- a/games-puzzle/construo/construo-0.2.2.ebuild
+++ b/games-puzzle/construo/construo-0.2.2.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-puzzle/construo/construo-0.2.2.ebuild,v 1.10 2006/02/16 20:21:11 tupone Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/construo/construo-0.2.2.ebuild,v 1.11 2006/12/06 16:57:17 wolf31o2 Exp $
 
 inherit games
 
@@ -13,22 +13,12 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc x86"
 IUSE=""
 
-RDEPEND="|| (
-				(
-					x11-libs/libSM
-					x11-libs/libXxf86vm
-				)
-				virtual/x11
-			)
-		sys-libs/zlib"
+RDEPEND="x11-libs/libSM
+	x11-libs/libXxf86vm
+	sys-libs/zlib"
 DEPEND="${RDEPEND}
-		||  (
-				(
-					x11-proto/xf86vidmodeproto
-					x11-libs/libXt
-				)
-				virtual/x11
-			)"
+	x11-proto/xf86vidmodeproto
+	x11-libs/libXt"
 
 src_unpack() {
 	unpack ${A}
diff --git a/games-puzzle/ensemblist/ChangeLog b/games-puzzle/ensemblist/ChangeLog
index 741876227bb6..1f25ae63075e 100644
--- a/games-puzzle/ensemblist/ChangeLog
+++ b/games-puzzle/ensemblist/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-puzzle/ensemblist
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-puzzle/ensemblist/ChangeLog,v 1.5 2006/06/29 15:32:40 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/ensemblist/ChangeLog,v 1.6 2006/12/06 16:59:33 wolf31o2 Exp $
+
+  06 Dec 2006; Chris Gianelloni <wolf31o2@gentoo.org>
+  ensemblist-040126.ebuild:
+  Remove old virtual/x11 dependency.
 
   29 Jun 2006; Chris Gianelloni <wolf31o2@gentoo.org>
   ensemblist-040126.ebuild:
diff --git a/games-puzzle/ensemblist/ensemblist-040126.ebuild b/games-puzzle/ensemblist/ensemblist-040126.ebuild
index 697e12db679b..f0b11d7a9aba 100644
--- a/games-puzzle/ensemblist/ensemblist-040126.ebuild
+++ b/games-puzzle/ensemblist/ensemblist-040126.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-puzzle/ensemblist/ensemblist-040126.ebuild,v 1.5 2006/06/29 15:32:40 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/ensemblist/ensemblist-040126.ebuild,v 1.6 2006/12/06 16:59:33 wolf31o2 Exp $
 
 inherit games
 
@@ -13,7 +13,7 @@ SLOT="0"
 KEYWORDS="ppc x86"
 IUSE=""
 
-DEPEND="|| ( x11-libs/libXmu virtual/x11 )
+DEPEND="x11-libs/libXmu
 	virtual/opengl
 	virtual/glut
 	virtual/glu
diff --git a/games-puzzle/fbg/ChangeLog b/games-puzzle/fbg/ChangeLog
index 85518f094059..a237ce613a67 100644
--- a/games-puzzle/fbg/ChangeLog
+++ b/games-puzzle/fbg/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for games-puzzle/fbg
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-puzzle/fbg/ChangeLog,v 1.6 2006/02/16 20:40:45 tupone Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/fbg/ChangeLog,v 1.7 2006/12/06 17:03:10 wolf31o2 Exp $
+
+  06 Dec 2006; Chris Gianelloni <wolf31o2@gentoo.org> fbg-0.9-r1.ebuild:
+  Remove old virtual/x11 dependency.
 
   16 Feb 2006; <Tupone@gentoo.org> fbg-0.9-r1.ebuild:
   Modular X dep fix
diff --git a/games-puzzle/fbg/fbg-0.9-r1.ebuild b/games-puzzle/fbg/fbg-0.9-r1.ebuild
index ddceedd9bb8f..87eb4f1634f9 100644
--- a/games-puzzle/fbg/fbg-0.9-r1.ebuild
+++ b/games-puzzle/fbg/fbg-0.9-r1.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-puzzle/fbg/fbg-0.9-r1.ebuild,v 1.7 2006/02/16 20:40:45 tupone Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/fbg/fbg-0.9-r1.ebuild,v 1.8 2006/12/06 17:03:10 wolf31o2 Exp $
 
 inherit games
 
@@ -13,18 +13,17 @@ SLOT="0"
 KEYWORDS="x86 ppc amd64"
 IUSE=""
 
-RDEPEND="
-	virtual/opengl
+RDEPEND="virtual/opengl
 	virtual/glu
 	>=dev-games/physfs-0.1.7
 	>=media-libs/libsdl-1.2.0
 	>=media-libs/libmikmod-3.1.10"
 DEPEND="${RDEPEND}
-	|| ( x11-libs/libXt virtual/x11 )"
+	x11-libs/libXt"
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
+	cd "${S}"
 	sed -i \
 		-e "/FBGDATADIR=/s:\".*\":\"${GAMES_DATADIR}/${PN}\":" configure \
 			|| die "sed configure failed"
diff --git a/games-puzzle/hoh-bin/ChangeLog b/games-puzzle/hoh-bin/ChangeLog
index 524771d2e32e..11ed6c6b91b8 100644
--- a/games-puzzle/hoh-bin/ChangeLog
+++ b/games-puzzle/hoh-bin/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for games-puzzle/hoh-bin
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-puzzle/hoh-bin/ChangeLog,v 1.9 2006/08/29 04:24:24 metalgod Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/hoh-bin/ChangeLog,v 1.10 2006/12/06 17:04:24 wolf31o2 Exp $
+
+  06 Dec 2006; Chris Gianelloni <wolf31o2@gentoo.org> hoh-bin-1.01.ebuild:
+  Remove old virtual/x11 dependency.
 
   29 Aug 2006; Luis Medinas <metalgod@gentoo.org> hoh-bin-1.01.ebuild:
   Stable on amd64.
diff --git a/games-puzzle/hoh-bin/hoh-bin-1.01.ebuild b/games-puzzle/hoh-bin/hoh-bin-1.01.ebuild
index f20632718b8d..c212eb339a8f 100644
--- a/games-puzzle/hoh-bin/hoh-bin-1.01.ebuild
+++ b/games-puzzle/hoh-bin/hoh-bin-1.01.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-puzzle/hoh-bin/hoh-bin-1.01.ebuild,v 1.10 2006/08/29 04:24:24 metalgod Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/hoh-bin/hoh-bin-1.01.ebuild,v 1.11 2006/12/06 17:04:24 wolf31o2 Exp $
 
 inherit games
 
@@ -14,7 +14,7 @@ KEYWORDS="amd64 x86"
 IUSE=""
 RESTRICT="strip"
 
-DEPEND="|| ( x11-libs/libX11 virtual/x11 )
+DEPEND="x11-libs/libX11
 	amd64? ( >=app-emulation/emul-linux-x86-xlibs-1.0 )"
 
 S=${WORKDIR}/hoh-install-${PV}