diff options
| author |   Michael Sterrett <mr_bones_@gentoo.org> | 2009-02-05 16:56:21 +0000 |
|---|---|---|
| committer | Michael Sterrett <mr_bones_@gentoo.org> | 2009-02-05 16:56:21 +0000 |
| commit | 5456cf63a85b6d037f2f797c43c3a05a8d2716a4 (patch) | |
| tree | ed288ab1fd9334c87dcf3be760032bc0d55edc13 /games-fps/ut2004 | |
| parent | Version bumped. (diff) | |
| download | gentoo-2-5456cf63a85b6d037f2f797c43c3a05a8d2716a4.tar.gz gentoo-2-5456cf63a85b6d037f2f797c43c3a05a8d2716a4.tar.bz2 gentoo-2-5456cf63a85b6d037f2f797c43c3a05a8d2716a4.zip | |
Always use the system libraries since the included ones don't seem to work with xcb (bug #239977)
(Portage version: 2.1.6.4/cvs/Linux 2.6.28.1 i686)
Diffstat (limited to 'games-fps/ut2004')
| -rw-r--r-- | games-fps/ut2004/ChangeLog | 9 | ||||
| -rw-r--r-- | games-fps/ut2004/ut2004-3369-r4.ebuild | 25 |
2 files changed, 16 insertions, 18 deletions
diff --git a/games-fps/ut2004/ChangeLog b/games-fps/ut2004/ChangeLog index 562fed765b3d..2d286b101ac4 100644 --- a/games-fps/ut2004/ChangeLog +++ b/games-fps/ut2004/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for games-fps/ut2004 -# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-fps/ut2004/ChangeLog,v 1.63 2008/07/28 16:41:54 wolf31o2 Exp $ +# Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/games-fps/ut2004/ChangeLog,v 1.64 2009/02/05 16:56:21 mr_bones_ Exp $ + + 05 Feb 2009; Michael Sterrett <mr_bones_@gentoo.org> + ut2004-3369-r4.ebuild: + Always use the system libraries since the included ones don't seem to work + with xcb (bug #239977) 28 Jul 2008; Chris Gianelloni <wolf31o2@gentoo.org> metadata.xml: Removing myself from metadata.xml since I am retiring from the project. diff --git a/games-fps/ut2004/ut2004-3369-r4.ebuild b/games-fps/ut2004/ut2004-3369-r4.ebuild index f073e93ddbda..364e85c4e586 100644 --- a/games-fps/ut2004/ut2004-3369-r4.ebuild +++ b/games-fps/ut2004/ut2004-3369-r4.ebuild @@ -1,11 +1,10 @@ -# Copyright 1999-2008 Gentoo Foundation +# Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-fps/ut2004/ut2004-3369-r4.ebuild,v 1.18 2008/02/29 19:23:40 carlo Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-fps/ut2004/ut2004-3369-r4.ebuild,v 1.19 2009/02/05 16:56:21 mr_bones_ Exp $ # To use system libraries, uncomment the following line and comment the one # below it. -#inherit eutils multilib games -inherit eutils games +inherit eutils multilib games MY_P="${PN}-lnxpatch${PV}-2.tar.bz2" DESCRIPTION="Editor's Choice Edition plus Mega Pack for the critically-acclaimed first-person shooter" @@ -35,12 +34,9 @@ RDEPEND=">=games-fps/ut2004-data-3186-r2 x11-libs/libXext x11-libs/libX11 x11-libs/libXau - x11-libs/libXdmcp" - # If you wish to use your system libSDL/openal, then you will need to remove - # the comments from the following two lines, along with the quotes above and - # this comment text. -# >=media-libs/libsdl-1.2 -# media-libs/openal" + x11-libs/libXdmcp + >=media-libs/libsdl-1.2 + media-libs/openal" S=${WORKDIR}/UT2004-Patch @@ -60,12 +56,9 @@ src_install() { || die "copying ${p} from patch" done - # To use system libraries, rather than binaries from ut2004-data, you will - # need to uncomment these three lines, as well as ensure that you have both - # libsdl and openal installed. -# dosym /usr/$(get_libdir)/libopenal.so "${dir}"/System/openal.so || die -# dosym /usr/$(get_libdir)/libSDL-1.2.so.0 "${dir}"/System/libSDL-1.2.so.0 \ -# || die + dosym /usr/$(get_libdir)/libopenal.so "${dir}"/System/openal.so || die + dosym /usr/$(get_libdir)/libSDL-1.2.so.0 "${dir}"/System/libSDL-1.2.so.0 \ + || die use amd64 && rm "${Ddir}"/System/u{cc,t2004}-bin \ && mv "${Ddir}"/System/ucc-bin-linux-amd64 "${Ddir}"/System/ucc-bin \ |