From: Chris Gianelloni Date: Wed, 6 Dec 2006 21:12:09 +0000 (+0000) Subject: Remove old virtual/x11 dependency. X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=b3d69ee23ff816c8228400e49ef665be08e83f30;p=gentoo.git Remove old virtual/x11 dependency. Package-Manager: portage-2.1.2_rc2-r2 --- diff --git a/games-strategy/smac/ChangeLog b/games-strategy/smac/ChangeLog index d825a23c999c..1170a28498c8 100644 --- a/games-strategy/smac/ChangeLog +++ b/games-strategy/smac/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for games-strategy/smac # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-strategy/smac/ChangeLog,v 1.9 2006/10/24 23:08:25 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-strategy/smac/ChangeLog,v 1.10 2006/12/06 21:03:46 wolf31o2 Exp $ + + 06 Dec 2006; Chris Gianelloni smac-6.0a.ebuild: + Remove old virtual/x11 dependency. 24 Oct 2006; Chris Gianelloni smac-6.0a.ebuild: Moved cdrom_get_cds to src_unpack since binary packages don't require the diff --git a/games-strategy/smac/smac-6.0a.ebuild b/games-strategy/smac/smac-6.0a.ebuild index c9f71dd1ea2e..edcae0fd74a5 100644 --- a/games-strategy/smac/smac-6.0a.ebuild +++ b/games-strategy/smac/smac-6.0a.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-strategy/smac/smac-6.0a.ebuild,v 1.10 2006/10/24 23:08:25 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-strategy/smac/smac-6.0a.ebuild,v 1.11 2006/12/06 21:03:46 wolf31o2 Exp $ inherit eutils games @@ -17,13 +17,10 @@ RESTRICT="strip" DEPEND="games-util/loki_patch" RDEPEND="sys-libs/glibc - || ( - ( - 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 sys-libs/lib-compat-loki media-libs/libsdl media-libs/sdl-ttf diff --git a/games-strategy/ufo-ai/ChangeLog b/games-strategy/ufo-ai/ChangeLog index 4e674392cdd1..3f56e7a2d052 100644 --- a/games-strategy/ufo-ai/ChangeLog +++ b/games-strategy/ufo-ai/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for games-strategy/ufo-ai # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-strategy/ufo-ai/ChangeLog,v 1.10 2006/02/23 22:33:15 tupone Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-strategy/ufo-ai/ChangeLog,v 1.11 2006/12/06 21:06:04 wolf31o2 Exp $ + + 06 Dec 2006; Chris Gianelloni + ufo-ai-0.10.040218.ebuild: + Remove old virtual/x11 dependency. 23 Feb 2006; ufo-ai-0.10.040218.ebuild: Modular X dependency fix diff --git a/games-strategy/ufo-ai/ufo-ai-0.10.040218.ebuild b/games-strategy/ufo-ai/ufo-ai-0.10.040218.ebuild index f99eca71a69b..6c6d84291df5 100644 --- a/games-strategy/ufo-ai/ufo-ai-0.10.040218.ebuild +++ b/games-strategy/ufo-ai/ufo-ai-0.10.040218.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-strategy/ufo-ai/ufo-ai-0.10.040218.ebuild,v 1.17 2006/02/23 22:33:15 tupone Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-strategy/ufo-ai/ufo-ai-0.10.040218.ebuild,v 1.18 2006/12/06 21:06:04 wolf31o2 Exp $ inherit eutils flag-o-matic games @@ -14,17 +14,12 @@ SLOT="0" KEYWORDS="~ppc ~x86" IUSE="" -RDEPEND="|| ( - ( - x11-libs/libXxf86dga - x11-libs/libXxf86vm - ) - virtual/x11 - ) +RDEPEND="x11-libs/libXxf86dga + x11-libs/libXxf86vm media-libs/jpeg media-libs/libvorbis" DEPEND="${RDEPEND} - || ( x11-proto/xextproto virtual/x11 ) + x11-proto/xextproto media-libs/libogg virtual/opengl virtual/glu diff --git a/games-strategy/wesnoth/ChangeLog b/games-strategy/wesnoth/ChangeLog index e5bf3c421121..fdff25e93a31 100644 --- a/games-strategy/wesnoth/ChangeLog +++ b/games-strategy/wesnoth/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for games-strategy/wesnoth # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-strategy/wesnoth/ChangeLog,v 1.81 2006/12/05 05:44:04 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-strategy/wesnoth/ChangeLog,v 1.82 2006/12/06 21:07:59 wolf31o2 Exp $ + + 06 Dec 2006; Chris Gianelloni wesnoth-1.0.2.ebuild: + Remove old virtual/x11 dependency. *wesnoth-1.1.13 (05 Dec 2006) diff --git a/games-strategy/wesnoth/wesnoth-1.0.2.ebuild b/games-strategy/wesnoth/wesnoth-1.0.2.ebuild index 212d306a6e09..5ba504ee4f89 100644 --- a/games-strategy/wesnoth/wesnoth-1.0.2.ebuild +++ b/games-strategy/wesnoth/wesnoth-1.0.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-strategy/wesnoth/wesnoth-1.0.2.ebuild,v 1.11 2006/09/10 08:44:49 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-strategy/wesnoth/wesnoth-1.0.2.ebuild,v 1.12 2006/12/06 21:07:59 wolf31o2 Exp $ inherit eutils toolchain-funcs flag-o-matic games @@ -16,9 +16,7 @@ IUSE="dedicated editor gnome kde lite nls server tools" DEPEND=">=media-libs/libsdl-1.2.7 !dedicated? ( - || ( - x11-libs/libX11 - virtual/x11 ) + x11-libs/libX11 >=media-libs/freetype-2 ) >=media-libs/sdl-mixer-1.2 >=media-libs/sdl-image-1.2 diff --git a/games-strategy/x2-demo/ChangeLog b/games-strategy/x2-demo/ChangeLog index 13cdfc95aa37..751d685ea2cf 100644 --- a/games-strategy/x2-demo/ChangeLog +++ b/games-strategy/x2-demo/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for games-strategy/x2-demo # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-strategy/x2-demo/ChangeLog,v 1.1 2006/05/18 11:59:20 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-strategy/x2-demo/ChangeLog,v 1.2 2006/12/06 21:09:36 wolf31o2 Exp $ + + 06 Dec 2006; Chris Gianelloni x2-demo-1.4.01.ebuild: + Remove old virtual/x11 dependency. *x2-demo-1.4.01 (18 May 2006) diff --git a/games-strategy/x2-demo/x2-demo-1.4.01.ebuild b/games-strategy/x2-demo/x2-demo-1.4.01.ebuild index 6e359e22724f..1a6b4afced36 100644 --- a/games-strategy/x2-demo/x2-demo-1.4.01.ebuild +++ b/games-strategy/x2-demo/x2-demo-1.4.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-strategy/x2-demo/x2-demo-1.4.01.ebuild,v 1.1 2006/05/18 11:59:20 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-strategy/x2-demo/x2-demo-1.4.01.ebuild,v 1.2 2006/12/06 21:09:36 wolf31o2 Exp $ # The comments are in this ebuild in case upstream ever decides to make another # patch, we already have all the code. Blame Paul Bredbury for @@ -23,7 +23,7 @@ LICENSE="as-is" SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="" -RESTRICT="primaryuri strip" +RESTRICT="strip" RDEPEND="media-libs/alsa-lib sys-libs/glibc @@ -32,14 +32,11 @@ RDEPEND="media-libs/alsa-lib media-libs/openal sys-libs/zlib x11-libs/gtk+ - || ( - ( - x11-libs/libX11 - x11-libs/libXau - x11-libs/libXdmcp - x11-libs/libXext - x11-libs/libXi ) - virtual/x11 ) ) + x11-libs/libX11 + x11-libs/libXau + x11-libs/libXdmcp + x11-libs/libXext + x11-libs/libXi ) amd64? ( app-emulation/emul-linux-x86-baselibs app-emulation/emul-linux-x86-xlibs diff --git a/games-strategy/xbattle/ChangeLog b/games-strategy/xbattle/ChangeLog index 6635a129b10d..7cda336c973e 100644 --- a/games-strategy/xbattle/ChangeLog +++ b/games-strategy/xbattle/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for games-strategy/xbattle # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-strategy/xbattle/ChangeLog,v 1.6 2006/03/22 04:11:02 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-strategy/xbattle/ChangeLog,v 1.7 2006/12/06 21:10:43 wolf31o2 Exp $ + + 06 Dec 2006; Chris Gianelloni xbattle-5.4.1.ebuild: + Remove old virtual/x11 dependency. 22 Mar 2006; Chris Gianelloni xbattle-5.4.1.ebuild: Added blocker on games-strategy/xbattleai. diff --git a/games-strategy/xbattle/xbattle-5.4.1.ebuild b/games-strategy/xbattle/xbattle-5.4.1.ebuild index 66b337b8982a..413613831557 100644 --- a/games-strategy/xbattle/xbattle-5.4.1.ebuild +++ b/games-strategy/xbattle/xbattle-5.4.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-strategy/xbattle/xbattle-5.4.1.ebuild,v 1.8 2006/03/22 04:11:02 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-strategy/xbattle/xbattle-5.4.1.ebuild,v 1.9 2006/12/06 21:10:43 wolf31o2 Exp $ inherit games @@ -13,14 +13,14 @@ SLOT="0" KEYWORDS="alpha amd64 hppa ia64 mips ppc sparc x86" IUSE="" -RDEPEND=" - || ( ( x11-libs/libXext x11-libs/libX11 ) - virtual/x11 ) +RDEPEND="x11-libs/libXext + x11-libs/libX11 !games-strategy/xbattleai" DEPEND="${RDEPEND} - || ( ( x11-proto/xproto x11-libs/libX11 app-text/rman x11-misc/imake ) - virtual/x11 )" - + x11-proto/xproto + x11-libs/libX11 + app-text/rman + x11-misc/imake" src_unpack() { unpack ${A} diff --git a/games-strategy/xconq/ChangeLog b/games-strategy/xconq/ChangeLog index 0607cfe3b58d..e1a4b9aa1b41 100644 --- a/games-strategy/xconq/ChangeLog +++ b/games-strategy/xconq/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for games-strategy/xconq # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-strategy/xconq/ChangeLog,v 1.7 2006/03/22 23:12:54 tupone Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-strategy/xconq/ChangeLog,v 1.8 2006/12/06 21:12:09 wolf31o2 Exp $ + + 06 Dec 2006; Chris Gianelloni xconq-7.4.1.ebuild: + Remove old virtual/x11 dependency. 22 Mar 2006; +files/xconq-tkconq.patch, xconq-7.4.1.ebuild: diff --git a/games-strategy/xconq/xconq-7.4.1.ebuild b/games-strategy/xconq/xconq-7.4.1.ebuild index ddd3b57ee1fe..6f142c508880 100644 --- a/games-strategy/xconq/xconq-7.4.1.ebuild +++ b/games-strategy/xconq/xconq-7.4.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-strategy/xconq/xconq-7.4.1.ebuild,v 1.9 2006/03/22 23:12:54 tupone Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-strategy/xconq/xconq-7.4.1.ebuild,v 1.10 2006/12/06 21:12:09 wolf31o2 Exp $ inherit eutils games @@ -13,11 +13,11 @@ SLOT="0" KEYWORDS="x86 ppc" IUSE="" -RDEPEND="|| ( x11-libs/libXmu virtual/x11 ) +RDEPEND="x11-libs/libXmu dev-lang/tk dev-lang/tcl" DEPEND="${RDEPEND} - || ( x11-libs/libXaw virtual/x11 )" + x11-libs/libXaw" src_unpack() { unpack ${A}