From 5c98a15c7c7ad1aa7c50b8259bd8b641dee646e8 Mon Sep 17 00:00:00 2001 From: Chris Gianelloni Date: Fri, 1 Dec 2006 21:32:58 +0000 Subject: [PATCH] Removing old virtual/x11 dependency. Package-Manager: portage-2.1.2_rc2-r2 --- games-emulation/atari800/ChangeLog | 6 +++++- games-emulation/atari800/atari800-1.3.6.ebuild | 14 ++++++-------- games-emulation/atari800/atari800-2.0.1.ebuild | 14 ++++++-------- games-emulation/darcnes/ChangeLog | 6 +++++- games-emulation/darcnes/darcnes-0401-r2.ebuild | 14 +++++--------- games-emulation/kigb/ChangeLog | 6 +++++- games-emulation/kigb/kigb-1.68.ebuild | 5 ++--- games-emulation/kigb/kigb-2.02.ebuild | 5 ++--- games-emulation/mastergear-bin/ChangeLog | 6 +++++- .../mastergear-bin/mastergear-bin-2.0.ebuild | 4 ++-- games-emulation/mekanix/ChangeLog | 5 ++++- games-emulation/mekanix/mekanix-070.ebuild | 6 ++---- games-emulation/nestra/ChangeLog | 5 ++++- games-emulation/nestra/nestra-0.66-r1.ebuild | 4 ++-- games-emulation/vgba/ChangeLog | 5 ++++- games-emulation/vgba/vgba-2.1.ebuild | 5 ++--- 16 files changed, 61 insertions(+), 49 deletions(-) diff --git a/games-emulation/atari800/ChangeLog b/games-emulation/atari800/ChangeLog index 4bfcef238117..788e1efb7837 100644 --- a/games-emulation/atari800/ChangeLog +++ b/games-emulation/atari800/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for games-emulation/atari800 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-emulation/atari800/ChangeLog,v 1.18 2006/11/23 21:39:23 nyhm Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-emulation/atari800/ChangeLog,v 1.19 2006/12/01 21:18:53 wolf31o2 Exp $ + + 01 Dec 2006; Chris Gianelloni atari800-1.3.6.ebuild, + atari800-2.0.1.ebuild: + Removing old virtual/x11 dependency. 23 Nov 2006; Tristan Heaven atari800-2.0.2.ebuild: Fix hardcoded paths diff --git a/games-emulation/atari800/atari800-1.3.6.ebuild b/games-emulation/atari800/atari800-1.3.6.ebuild index 0ec7a6901c91..ac80ab60403c 100644 --- a/games-emulation/atari800/atari800-1.3.6.ebuild +++ b/games-emulation/atari800/atari800-1.3.6.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-emulation/atari800/atari800-1.3.6.ebuild,v 1.3 2006/02/02 22:41:35 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-emulation/atari800/atari800-1.3.6.ebuild,v 1.4 2006/12/01 21:18:53 wolf31o2 Exp $ inherit games @@ -15,15 +15,13 @@ KEYWORDS="alpha ~amd64 ppc sparc x86" IUSE="sdl" RDEPEND="sdl? ( >=media-libs/libsdl-1.2.0 ) - !sdl? ( || ( ( x11-libs/libX11 ) virtual/x11 ) )" + !sdl? ( x11-libs/libX11 )" DEPEND="${RDEPEND} !sdl? ( - || ( - ( x11-libs/libXt - x11-libs/libX11 - x11-proto/xextproto - x11-proto/xproto ) - virtual/x11 ) ) + x11-libs/libXt + x11-libs/libX11 + x11-proto/xextproto + x11-proto/xproto ) app-arch/unzip" src_unpack() { diff --git a/games-emulation/atari800/atari800-2.0.1.ebuild b/games-emulation/atari800/atari800-2.0.1.ebuild index 5ec7cfed35de..11dfc1f5c8fa 100644 --- a/games-emulation/atari800/atari800-2.0.1.ebuild +++ b/games-emulation/atari800/atari800-2.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-emulation/atari800/atari800-2.0.1.ebuild,v 1.1 2006/03/17 23:50:10 tupone Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-emulation/atari800/atari800-2.0.1.ebuild,v 1.2 2006/12/01 21:18:53 wolf31o2 Exp $ inherit games @@ -15,15 +15,13 @@ KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86" IUSE="sdl" RDEPEND="sdl? ( >=media-libs/libsdl-1.2.0 ) - !sdl? ( || ( ( x11-libs/libX11 ) virtual/x11 ) )" + !sdl? ( x11-libs/libX11 )" DEPEND="${RDEPEND} !sdl? ( - || ( - ( x11-libs/libXt - x11-libs/libX11 - x11-proto/xextproto - x11-proto/xproto ) - virtual/x11 ) ) + x11-libs/libXt + x11-libs/libX11 + x11-proto/xextproto + x11-proto/xproto ) app-arch/unzip" src_unpack() { diff --git a/games-emulation/darcnes/ChangeLog b/games-emulation/darcnes/ChangeLog index 06feab7d14b9..b44ea7afcccc 100644 --- a/games-emulation/darcnes/ChangeLog +++ b/games-emulation/darcnes/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for games-emulation/darcnes # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-emulation/darcnes/ChangeLog,v 1.12 2006/02/10 19:43:39 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-emulation/darcnes/ChangeLog,v 1.13 2006/12/01 21:22:33 wolf31o2 Exp $ + + 01 Dec 2006; Chris Gianelloni + darcnes-0401-r2.ebuild: + Removing old virtual/x11 dependency. 10 Feb 2006; Chris Gianelloni darcnes-0401-r2.ebuild: diff --git a/games-emulation/darcnes/darcnes-0401-r2.ebuild b/games-emulation/darcnes/darcnes-0401-r2.ebuild index 30e5ef871dbd..61b712658a4c 100644 --- a/games-emulation/darcnes/darcnes-0401-r2.ebuild +++ b/games-emulation/darcnes/darcnes-0401-r2.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-emulation/darcnes/darcnes-0401-r2.ebuild,v 1.10 2006/02/10 19:43:39 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-emulation/darcnes/darcnes-0401-r2.ebuild,v 1.11 2006/12/01 21:22:33 wolf31o2 Exp $ inherit eutils games @@ -14,16 +14,12 @@ KEYWORDS="-ppc x86" IUSE="gtk svga X" RDEPEND="svga? ( >=media-libs/svgalib-1.4.2 ) - !svga? ( !gtk? ( || ( x11-libs/libXaw - virtual/x11 ) ) ) - X? ( || ( x11-libs/libXaw - virtual/x11 ) ) + !svga? ( !gtk? ( x11-libs/libXaw ) ) + X? ( x11-libs/libXaw ) gtk? ( =x11-libs/gtk+-1.2* )" DEPEND="${RDEPEND} - !svga? ( || ( x11-proto/xextproto - virtual/x11 ) ) - X? ( || ( x11-proto/xextproto - virtual/x11 ) )" + !svga? ( x11-proto/xextproto ) + X? ( x11-proto/xextproto )" S=${WORKDIR}/${PN} diff --git a/games-emulation/kigb/ChangeLog b/games-emulation/kigb/ChangeLog index c9f7b2b891d3..bc6de4d42773 100644 --- a/games-emulation/kigb/ChangeLog +++ b/games-emulation/kigb/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for games-emulation/kigb # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-emulation/kigb/ChangeLog,v 1.9 2006/09/19 19:03:31 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-emulation/kigb/ChangeLog,v 1.10 2006/12/01 21:25:14 wolf31o2 Exp $ + + 01 Dec 2006; Chris Gianelloni kigb-1.68.ebuild, + kigb-2.02.ebuild: + Removing old virtual/x11 dependency. 19 Sep 2006; Chris Gianelloni kigb-1.68.ebuild, kigb-2.02.ebuild: diff --git a/games-emulation/kigb/kigb-1.68.ebuild b/games-emulation/kigb/kigb-1.68.ebuild index c57debc2efa9..e6fad6c60399 100644 --- a/games-emulation/kigb/kigb-1.68.ebuild +++ b/games-emulation/kigb/kigb-1.68.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-emulation/kigb/kigb-1.68.ebuild,v 1.3 2006/09/19 19:03:31 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-emulation/kigb/kigb-1.68.ebuild,v 1.4 2006/12/01 21:25:14 wolf31o2 Exp $ inherit games @@ -16,8 +16,7 @@ KEYWORDS="-* x86" RESTRICT="strip" IUSE="" -RDEPEND="|| ( x11-libs/libXext - virtual/x11 ) +RDEPEND="x11-libs/libXext sys-libs/zlib dev-games/hawknl" diff --git a/games-emulation/kigb/kigb-2.02.ebuild b/games-emulation/kigb/kigb-2.02.ebuild index a9eeff310100..a1c38dfb9bf8 100644 --- a/games-emulation/kigb/kigb-2.02.ebuild +++ b/games-emulation/kigb/kigb-2.02.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-emulation/kigb/kigb-2.02.ebuild,v 1.2 2006/09/19 19:03:31 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-emulation/kigb/kigb-2.02.ebuild,v 1.3 2006/12/01 21:25:14 wolf31o2 Exp $ inherit games @@ -16,8 +16,7 @@ KEYWORDS="-* x86" RESTRICT="strip" IUSE="" -RDEPEND="|| ( x11-libs/libXext - virtual/x11 ) +RDEPEND="x11-libs/libXext sys-libs/zlib dev-games/hawknl" diff --git a/games-emulation/mastergear-bin/ChangeLog b/games-emulation/mastergear-bin/ChangeLog index 9e188eb0c6bc..1d84453b3e13 100644 --- a/games-emulation/mastergear-bin/ChangeLog +++ b/games-emulation/mastergear-bin/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for games-emulation/mastergear-bin # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-emulation/mastergear-bin/ChangeLog,v 1.4 2006/03/31 20:33:34 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-emulation/mastergear-bin/ChangeLog,v 1.5 2006/12/01 21:28:14 wolf31o2 Exp $ + + 01 Dec 2006; Chris Gianelloni + mastergear-bin-2.0.ebuild: + Removing old virtual/x11 dependency. 31 Mar 2006; Chris Gianelloni mastergear-bin-2.0.ebuild: diff --git a/games-emulation/mastergear-bin/mastergear-bin-2.0.ebuild b/games-emulation/mastergear-bin/mastergear-bin-2.0.ebuild index 3f8558373d38..eff684b03370 100644 --- a/games-emulation/mastergear-bin/mastergear-bin-2.0.ebuild +++ b/games-emulation/mastergear-bin/mastergear-bin-2.0.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-emulation/mastergear-bin/mastergear-bin-2.0.ebuild,v 1.3 2006/03/31 20:33:34 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-emulation/mastergear-bin/mastergear-bin-2.0.ebuild,v 1.4 2006/12/01 21:28:14 wolf31o2 Exp $ inherit games @@ -14,7 +14,7 @@ KEYWORDS="x86" IUSE="" RESTRICT="strip" -RDEPEND="|| ( x11-libs/libXext virtual/x11 ) +RDEPEND="x11-libs/libXext sys-libs/zlib" S=${WORKDIR} diff --git a/games-emulation/mekanix/ChangeLog b/games-emulation/mekanix/ChangeLog index 3890312343df..dda591c75723 100644 --- a/games-emulation/mekanix/ChangeLog +++ b/games-emulation/mekanix/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for games-emulation/mekanix # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-emulation/mekanix/ChangeLog,v 1.8 2006/09/19 19:05:43 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-emulation/mekanix/ChangeLog,v 1.9 2006/12/01 21:30:35 wolf31o2 Exp $ + + 01 Dec 2006; Chris Gianelloni mekanix-070.ebuild: + Removing old virtual/x11 dependency. 19 Sep 2006; Chris Gianelloni mekanix-070.ebuild: Adding strip to RESTRICT for bug #137819. diff --git a/games-emulation/mekanix/mekanix-070.ebuild b/games-emulation/mekanix/mekanix-070.ebuild index c55895e9761a..34f3f2795d43 100644 --- a/games-emulation/mekanix/mekanix-070.ebuild +++ b/games-emulation/mekanix/mekanix-070.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-emulation/mekanix/mekanix-070.ebuild,v 1.4 2006/09/19 19:05:43 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-emulation/mekanix/mekanix-070.ebuild,v 1.5 2006/12/01 21:30:35 wolf31o2 Exp $ inherit games @@ -15,9 +15,7 @@ RESTRICT="strip" IUSE="" RDEPEND="media-libs/libpng - || ( - x11-libs/libXpm - virtual/x11 )" + x11-libs/libXpm" S=${WORKDIR}/${PN} diff --git a/games-emulation/nestra/ChangeLog b/games-emulation/nestra/ChangeLog index e985e6b1518e..27e7ac6cefe0 100644 --- a/games-emulation/nestra/ChangeLog +++ b/games-emulation/nestra/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for games-emulation/nestra # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-emulation/nestra/ChangeLog,v 1.12 2006/04/27 19:46:50 marienz Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-emulation/nestra/ChangeLog,v 1.13 2006/12/01 21:31:46 wolf31o2 Exp $ + + 01 Dec 2006; Chris Gianelloni nestra-0.66-r1.ebuild: + Removing old virtual/x11 dependency. 27 Apr 2006; Marien Zwart files/digest-nestra-0.66-r1, Manifest: diff --git a/games-emulation/nestra/nestra-0.66-r1.ebuild b/games-emulation/nestra/nestra-0.66-r1.ebuild index b22cbccafe1c..a9bbe2364adf 100644 --- a/games-emulation/nestra/nestra-0.66-r1.ebuild +++ b/games-emulation/nestra/nestra-0.66-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-emulation/nestra/nestra-0.66-r1.ebuild,v 1.15 2006/06/20 22:12:50 eradicator Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-emulation/nestra/nestra-0.66-r1.ebuild,v 1.16 2006/12/01 21:31:46 wolf31o2 Exp $ inherit eutils toolchain-funcs flag-o-matic multilib games @@ -16,7 +16,7 @@ KEYWORDS="~amd64 x86" IUSE="" RDEPEND="amd64? ( >=app-emulation/emul-linux-x86-xlibs-1.2-r7 ) - || ( x11-libs/libX11 virtual/x11 )" + x11-libs/libX11" DEPEND="${RDEPEND}" S=${WORKDIR}/${PN} diff --git a/games-emulation/vgba/ChangeLog b/games-emulation/vgba/ChangeLog index f135546349a6..ab4f995af470 100644 --- a/games-emulation/vgba/ChangeLog +++ b/games-emulation/vgba/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for games-emulation/vgba # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-emulation/vgba/ChangeLog,v 1.7 2006/10/15 23:12:31 nyhm Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-emulation/vgba/ChangeLog,v 1.8 2006/12/01 21:32:58 wolf31o2 Exp $ + + 01 Dec 2006; Chris Gianelloni vgba-2.1.ebuild: + Removing old virtual/x11 dependency. *vgba-3.0 (15 Oct 2006) diff --git a/games-emulation/vgba/vgba-2.1.ebuild b/games-emulation/vgba/vgba-2.1.ebuild index 34dfc27fe4ea..d01e64a6b9e0 100644 --- a/games-emulation/vgba/vgba-2.1.ebuild +++ b/games-emulation/vgba/vgba-2.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-emulation/vgba/vgba-2.1.ebuild,v 1.6 2006/09/19 19:17:38 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-emulation/vgba/vgba-2.1.ebuild,v 1.7 2006/12/01 21:32:58 wolf31o2 Exp $ inherit games @@ -15,8 +15,7 @@ RESTRICT="strip" IUSE="" RDEPEND="sys-libs/zlib - || ( x11-libs/libXext - virtual/x11 )" + x11-libs/libXext" S="${WORKDIR}" -- 2.26.2