Remove old virtual/x11 dependency.

Package-Manager: portage-2.1.2_rc2-r2

diff --git a/games-puzzle/quadra/ChangeLog b/games-puzzle/quadra/ChangeLog
index a52e4cc9bed61e896ef76108466978787c891f6a..b26c2157deea0cabfa2118e1ede034a5ce2a2ecf 100644 (file)
--- a/games-puzzle/quadra/ChangeLog
+++ b/games-puzzle/quadra/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for games-puzzle/quadra
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-puzzle/quadra/ChangeLog,v 1.14 2006/09/14 07:20:20 tupone Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/quadra/ChangeLog,v 1.15 2006/12/06 17:18:47 wolf31o2 Exp $
+
+  06 Dec 2006; Chris Gianelloni <wolf31o2@gentoo.org> quadra-1.1.8.ebuild:
+  Remove old virtual/x11 dependency.
 
   14 Sep 2006; <tupone@gentoo.org> files/quadra-1.1.8-gcc3.patch,
   -files/quadra-1.1.8-gcc41.patch, quadra-1.1.8.ebuild:

diff --git a/games-puzzle/quadra/quadra-1.1.8.ebuild b/games-puzzle/quadra/quadra-1.1.8.ebuild
index 0b868a78963c771199c953c335e56d290fd571a4..bc7c43a67245c9505f339d45a18558a2ac679f2f 100644 (file)
--- a/games-puzzle/quadra/quadra-1.1.8.ebuild
+++ b/games-puzzle/quadra/quadra-1.1.8.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/quadra/quadra-1.1.8.ebuild,v 1.14 2006/09/14 07:20:20 tupone Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/quadra/quadra-1.1.8.ebuild,v 1.15 2006/12/06 17:18:47 wolf31o2 Exp $
 
 inherit eutils toolchain-funcs games
 
@@ -13,11 +13,11 @@ SLOT="0"
 KEYWORDS="~amd64 x86"
 IUSE="svga"
 
-RDEPEND="|| ( x11-libs/libXpm virtual/x11 )
+RDEPEND="x11-libs/libXpm
        >=media-libs/libpng-1.2.1
        svga? ( media-libs/svgalib )"
 DEPEND="${RDEPEND}
-       || ( x11-proto/xextproto virtual/x11 )"
+       x11-proto/xextproto"
 
 src_unpack() {
        unpack ${A}

diff --git a/games-puzzle/xblockout/ChangeLog b/games-puzzle/xblockout/ChangeLog
index b02dae5fb81c993e99c417fc609bea07ad5067bd..d513bac8bc8214afaa397b6c4d6965a6a1748b36 100644 (file)
--- a/games-puzzle/xblockout/ChangeLog
+++ b/games-puzzle/xblockout/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-puzzle/xblockout
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-puzzle/xblockout/ChangeLog,v 1.12 2006/10/02 16:57:40 nyhm Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/xblockout/ChangeLog,v 1.13 2006/12/06 17:20:50 wolf31o2 Exp $
+
+  06 Dec 2006; Chris Gianelloni <wolf31o2@gentoo.org>
+  xblockout-1.1.3.ebuild:
+  Remove old virtual/x11 dependency.
 
 *xblockout-1.1.4 (02 Oct 2006)
 

diff --git a/games-puzzle/xblockout/xblockout-1.1.3.ebuild b/games-puzzle/xblockout/xblockout-1.1.3.ebuild
index 1941aabf123d2c0b82e49a7b0c6782026e52c2cd..8e24147c2c2f11e9050b0c0d74732ce5a21778d0 100644 (file)
--- a/games-puzzle/xblockout/xblockout-1.1.3.ebuild
+++ b/games-puzzle/xblockout/xblockout-1.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-puzzle/xblockout/xblockout-1.1.3.ebuild,v 1.2 2006/02/14 04:20:47 joshuabaergen Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/xblockout/xblockout-1.1.3.ebuild,v 1.3 2006/12/06 17:20:50 wolf31o2 Exp $
 
 inherit flag-o-matic games
 
@@ -13,7 +13,7 @@ SLOT="0"
 KEYWORDS="~amd64 ppc x86"
 IUSE=""
 
-DEPEND="|| ( x11-libs/libXext virtual/x11 )"
+DEPEND="x11-libs/libXext"
 
 S=${WORKDIR}/xbl-${PV}
 

diff --git a/games-puzzle/xbomb/ChangeLog b/games-puzzle/xbomb/ChangeLog
index 3b02c73f353b52c964fef214a9b30748c986d249..a9446c1cce5a4c5b7b8c25d330a98678f33888a3 100644 (file)
--- a/games-puzzle/xbomb/ChangeLog
+++ b/games-puzzle/xbomb/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for games-puzzle/xbomb
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-puzzle/xbomb/ChangeLog,v 1.9 2006/06/29 16:17:57 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/xbomb/ChangeLog,v 1.10 2006/12/06 17:21:51 wolf31o2 Exp $
+
+  06 Dec 2006; Chris Gianelloni <wolf31o2@gentoo.org> xbomb-2.1-r1.ebuild:
+  Remove old virtual/x11 dependency.
 
   29 Jun 2006; Chris Gianelloni <wolf31o2@gentoo.org> xbomb-2.1-r1.ebuild:
   Fixed binaries being pre-stripped. Thanks to Tristan Heaven

diff --git a/games-puzzle/xbomb/xbomb-2.1-r1.ebuild b/games-puzzle/xbomb/xbomb-2.1-r1.ebuild
index dff32a5c9fb59848ea4db1605f1a90205d05bc34..1c4396fb78c01169ceb01eac75183c71414683d5 100644 (file)
--- a/games-puzzle/xbomb/xbomb-2.1-r1.ebuild
+++ b/games-puzzle/xbomb/xbomb-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/xbomb/xbomb-2.1-r1.ebuild,v 1.14 2006/06/29 16:17:57 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/xbomb/xbomb-2.1-r1.ebuild,v 1.15 2006/12/06 17:21:51 wolf31o2 Exp $
 
 inherit eutils games
 
@@ -13,10 +13,11 @@ SLOT="0"
 KEYWORDS="amd64 ia64 ppc ppc64 x86"
 IUSE=""
 
-DEPEND="|| ( x11-libs/libXaw virtual/x11 )"
+DEPEND="x11-libs/libXaw"
 
 src_unpack() {
        unpack ${A}
+       cd "${S}"
        epatch "${FILESDIR}"/${P}.diff
        sed -i \
                -e '/strip/d' \

diff --git a/games-puzzle/xwelltris/ChangeLog b/games-puzzle/xwelltris/ChangeLog
index e219e97f1e86dc05fb4c7e85c499ab423afa670c..16c07e82dc6f11bcb82bf7d21fd6c9144b0fd8d7 100644 (file)
--- a/games-puzzle/xwelltris/ChangeLog
+++ b/games-puzzle/xwelltris/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-puzzle/xwelltris
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-puzzle/xwelltris/ChangeLog,v 1.9 2006/06/29 16:22:25 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/xwelltris/ChangeLog,v 1.10 2006/12/06 17:23:52 wolf31o2 Exp $
+
+  06 Dec 2006; Chris Gianelloni <wolf31o2@gentoo.org>
+  xwelltris-1.0.1.ebuild:
+  Remove old virtual/x11 dependency.
 
   29 Jun 2006; Chris Gianelloni <wolf31o2@gentoo.org>
   xwelltris-1.0.1.ebuild:

diff --git a/games-puzzle/xwelltris/xwelltris-1.0.1.ebuild b/games-puzzle/xwelltris/xwelltris-1.0.1.ebuild
index 6fed45e55a2a1e23b763b6dc44e87ba40fae01f2..e78f83ff494764082bd7906817b3854fe761fa49 100644 (file)
--- a/games-puzzle/xwelltris/xwelltris-1.0.1.ebuild
+++ b/games-puzzle/xwelltris/xwelltris-1.0.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-puzzle/xwelltris/xwelltris-1.0.1.ebuild,v 1.12 2006/06/29 16:22:25 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/xwelltris/xwelltris-1.0.1.ebuild,v 1.13 2006/12/06 17:23:52 wolf31o2 Exp $
 
 inherit games
 
@@ -13,22 +13,14 @@ SLOT="0"
 KEYWORDS="amd64 ppc x86"
 IUSE="sdl"
 
-RDEPEND="|| (
-       (
-               x11-misc/xbitmaps
-               x11-proto/xproto
-               x11-libs/libX11
-               x11-libs/libXt
-               x11-libs/libXmu
-               x11-libs/libXaw )
-       virtual/x11 )
-       sdl? (
-               media-libs/libsdl
-               media-libs/sdl-image )"
+RDEPEND="x11-misc/xbitmaps
+       x11-libs/libX11
+       x11-libs/libXt
+       x11-libs/libXmu
+       x11-libs/libXaw
+       sdl? ( media-libs/libsdl media-libs/sdl-image )"
 DEPEND="${RDEPEND}
-       || (
-               x11-libs/libX11
-               virtual/x11 )"
+       x11-proto/xproto"
 
 src_unpack() {
        unpack ${A}