From e10d00333b48d8c0ab42676071e0034899965180 Mon Sep 17 00:00:00 2001 From: Chris Gianelloni Date: Fri, 10 Feb 2006 16:22:37 +0000 Subject: Added modular X dependencies and closing bug #121203. Package-Manager: portage-2.1_pre4-r1 --- games-fps/unreal-tournament-goty/ChangeLog | 8 ++++++-- .../unreal-tournament-goty-436.ebuild | 14 ++++++++++---- .../unreal-tournament-goty-451.ebuild | 22 ++++++++++++++++------ 3 files changed, 32 insertions(+), 12 deletions(-) (limited to 'games-fps/unreal-tournament-goty') 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 + unreal-tournament-goty-436.ebuild, unreal-tournament-goty-451.ebuild: + Added modular X dependencies and closing bug #121203. 26 Sep 2005; Chris Gianelloni 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" -- cgit v1.2.3-65-gdbad