From 386e17c07b7089b39376a5d57109f39778056152 Mon Sep 17 00:00:00 2001 From: Chris Gianelloni Date: Wed, 6 Dec 2006 17:23:52 +0000 Subject: [PATCH] Remove old virtual/x11 dependency. Package-Manager: portage-2.1.2_rc2-r2 --- games-puzzle/quadra/ChangeLog | 5 +++- games-puzzle/quadra/quadra-1.1.8.ebuild | 6 ++--- games-puzzle/xblockout/ChangeLog | 6 ++++- games-puzzle/xblockout/xblockout-1.1.3.ebuild | 4 ++-- games-puzzle/xbomb/ChangeLog | 5 +++- games-puzzle/xbomb/xbomb-2.1-r1.ebuild | 5 ++-- games-puzzle/xwelltris/ChangeLog | 6 ++++- games-puzzle/xwelltris/xwelltris-1.0.1.ebuild | 24 +++++++------------ 8 files changed, 34 insertions(+), 27 deletions(-) diff --git a/games-puzzle/quadra/ChangeLog b/games-puzzle/quadra/ChangeLog index a52e4cc9bed6..b26c2157deea 100644 --- 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 quadra-1.1.8.ebuild: + Remove old virtual/x11 dependency. 14 Sep 2006; 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 0b868a78963c..bc7c43a67245 100644 --- 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 b02dae5fb81c..d513bac8bc82 100644 --- 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 + 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 1941aabf123d..8e24147c2c2f 100644 --- 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 3b02c73f353b..a9446c1cce5a 100644 --- 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 xbomb-2.1-r1.ebuild: + Remove old virtual/x11 dependency. 29 Jun 2006; Chris Gianelloni 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 dff32a5c9fb5..1c4396fb78c0 100644 --- 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 e219e97f1e86..16c07e82dc6f 100644 --- 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 + xwelltris-1.0.1.ebuild: + Remove old virtual/x11 dependency. 29 Jun 2006; Chris Gianelloni 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 6fed45e55a2a..e78f83ff4947 100644 --- 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} -- 2.26.2