diff options
| author |   Chris Gianelloni <wolf31o2@gentoo.org> | 2006-02-10 16:22:37 +0000 |
|---|---|---|
| committer | Chris Gianelloni <wolf31o2@gentoo.org> | 2006-02-10 16:22:37 +0000 |
| commit | fe2c63ef70e3251b0870c611780567bc4d3f8cce (patch) | |
| tree | adfca8e4310176b04ffcf0c9d436459ff54bfe26 /games-fps | |
| parent | Remove -r1 now that -r2 is fully stable (diff) | |
| download | gentoo-2-fe2c63ef70e3251b0870c611780567bc4d3f8cce.tar.gz gentoo-2-fe2c63ef70e3251b0870c611780567bc4d3f8cce.tar.bz2 gentoo-2-fe2c63ef70e3251b0870c611780567bc4d3f8cce.zip | |
Added modular X dependencies and closing bug #121203.
(Portage version: 2.1_pre4-r1)
Diffstat (limited to 'games-fps')
6 files changed, 57 insertions, 20 deletions
diff --git a/games-fps/unreal-tournament-goty/ChangeLog b/games-fps/unreal-tournament-goty/ChangeLog index 20fe9a2353fe..c4601a614fbf 100644 --- a/games-fps/unreal-tournament-goty/ChangeLog +++ b/games-fps/unreal-tournament-goty/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for games-fps/unreal-tournament-goty -# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-fps/unreal-tournament-goty/ChangeLog,v 1.8 2005/09/26 18:08:44 wolf31o2 Exp $ +# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/games-fps/unreal-tournament-goty/ChangeLog,v 1.9 2006/02/10 16:22:37 wolf31o2 Exp $ + + 10 Feb 2006; Chris Gianelloni <wolf31o2@gentoo.org> + unreal-tournament-goty-436.ebuild, unreal-tournament-goty-451.ebuild: + Added modular X dependencies and closing bug #121203. 26 Sep 2005; Chris Gianelloni <wolf31o2@gentoo.org> unreal-tournament-goty-451.ebuild: diff --git a/games-fps/unreal-tournament-goty/unreal-tournament-goty-436.ebuild b/games-fps/unreal-tournament-goty/unreal-tournament-goty-436.ebuild index c1f573504570..daede03f8262 100644 --- a/games-fps/unreal-tournament-goty/unreal-tournament-goty-436.ebuild +++ b/games-fps/unreal-tournament-goty/unreal-tournament-goty-436.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2005 Gentoo Foundation +# Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-fps/unreal-tournament-goty/unreal-tournament-goty-436.ebuild,v 1.8 2005/09/16 03:00:32 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-fps/unreal-tournament-goty/unreal-tournament-goty-436.ebuild,v 1.9 2006/02/10 16:22:37 wolf31o2 Exp $ inherit eutils games @@ -16,8 +16,14 @@ IUSE="3dfx S3TC nls opengl" DEPEND="!games-fps/unreal-tournament app-arch/unzip" -RDEPEND="virtual/x11 - opengl? ( virtual/opengl )" +RDEPEND="opengl? ( virtual/opengl ) + || ( + ( + x11-libs/libXext + x11-libs/libX11 + x11-libs/libXau + x11-libs/libXdmcp ) + virtual/x11 )" S=${WORKDIR} diff --git a/games-fps/unreal-tournament-goty/unreal-tournament-goty-451.ebuild b/games-fps/unreal-tournament-goty/unreal-tournament-goty-451.ebuild index 78812be0f2f9..20e77b2b8a05 100644 --- a/games-fps/unreal-tournament-goty/unreal-tournament-goty-451.ebuild +++ b/games-fps/unreal-tournament-goty/unreal-tournament-goty-451.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2005 Gentoo Foundation +# Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-fps/unreal-tournament-goty/unreal-tournament-goty-451.ebuild,v 1.11 2005/09/26 18:08:44 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-fps/unreal-tournament-goty/unreal-tournament-goty-451.ebuild,v 1.12 2006/02/10 16:22:37 wolf31o2 Exp $ inherit eutils games @@ -11,12 +11,22 @@ SRC_URI="ftp://ftp.lokigames.com/pub/beta/ut/ut-install-436-GOTY.run LICENSE="as-is" SLOT="0" -KEYWORDS="x86 ~amd64" +KEYWORDS="~amd64 x86" IUSE="3dfx S3TC nls opengl" -RDEPEND="virtual/x11 - =media-libs/libsdl-1.2* - opengl? ( virtual/opengl )" +RDEPEND="!amd64? ( + || ( + ( + x11-libs/libXext + x11-libs/libX11 + x11-libs/libXau + x11-libs/libXdmcp ) + virtual/x11 ) + =media-libs/libsdl-1.2* + opengl? ( virtual/opengl ) ) + amd64? ( app-emulation/emul-linux-x86-sdl + app-emulation/emul-linux-x86-baselibs + app-emulation/emul-linux-x86-xlibs )" DEPEND="${RDEPEND} !games-fps/unreal-tournament app-arch/unzip" diff --git a/games-fps/unreal-tournament/ChangeLog b/games-fps/unreal-tournament/ChangeLog index 267f4186a427..e889264b9487 100644 --- a/games-fps/unreal-tournament/ChangeLog +++ b/games-fps/unreal-tournament/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for games-fps/unreal-tournament -# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-fps/unreal-tournament/ChangeLog,v 1.11 2005/12/20 13:13:03 flameeyes Exp $ +# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/games-fps/unreal-tournament/ChangeLog,v 1.12 2006/02/10 16:18:12 wolf31o2 Exp $ + + 10 Feb 2006; Chris Gianelloni <wolf31o2@gentoo.org> + unreal-tournament-436.ebuild, unreal-tournament-451.ebuild: + Added modular X dependencies and closing bug #121203. 20 Dec 2005; Diego Pettenò <flameeyes@gentoo.org> unreal-tournament-451.ebuild: diff --git a/games-fps/unreal-tournament/unreal-tournament-436.ebuild b/games-fps/unreal-tournament/unreal-tournament-436.ebuild index 288e78fc09bf..17979b0474f2 100644 --- a/games-fps/unreal-tournament/unreal-tournament-436.ebuild +++ b/games-fps/unreal-tournament/unreal-tournament-436.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2005 Gentoo Foundation +# Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-fps/unreal-tournament/unreal-tournament-436.ebuild,v 1.10 2005/05/12 12:15:39 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-fps/unreal-tournament/unreal-tournament-436.ebuild,v 1.11 2006/02/10 16:18:12 wolf31o2 Exp $ inherit eutils games @@ -16,7 +16,13 @@ IUSE="3dfx" DEPEND="app-arch/unzip !games-fps/unreal-tournament-goty" -RDEPEND="virtual/x11" +RDEPEND="|| ( + ( + x11-libs/libXext + x11-libx/libX11 + x11-libs/libXau + x11-libs/libXdmcp ) + virtual/x11 )" S=${WORKDIR} diff --git a/games-fps/unreal-tournament/unreal-tournament-451.ebuild b/games-fps/unreal-tournament/unreal-tournament-451.ebuild index e4d1827f9559..da690224b924 100644 --- a/games-fps/unreal-tournament/unreal-tournament-451.ebuild +++ b/games-fps/unreal-tournament/unreal-tournament-451.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2005 Gentoo Foundation +# Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-fps/unreal-tournament/unreal-tournament-451.ebuild,v 1.18 2005/12/21 20:03:37 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-fps/unreal-tournament/unreal-tournament-451.ebuild,v 1.19 2006/02/10 16:18:12 wolf31o2 Exp $ inherit eutils games @@ -14,7 +14,14 @@ SLOT="0" KEYWORDS="-* amd64 x86" IUSE="3dfx opengl" -RDEPEND="!amd64? ( virtual/x11 +RDEPEND="!amd64? ( + || ( + ( + x11-libs/libXext + x11-libs/libX11 + x11-libs/libXau + x11-libs/libXdmcp ) + virtual/x11 ) =media-libs/libsdl-1.2* opengl? ( virtual/opengl ) ) amd64? ( app-emulation/emul-linux-x86-sdl |