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 | b93fa0b1ab02a7ec89653360e2a29ce54be17832 (patch) | |
| tree | 978ed204f2164a5e403438c58f822102a915d8d9 /games-fps | |
| parent | Version bumped. (diff) | |
| download | historical-b93fa0b1ab02a7ec89653360e2a29ce54be17832.tar.gz historical-b93fa0b1ab02a7ec89653360e2a29ce54be17832.tar.bz2 historical-b93fa0b1ab02a7ec89653360e2a29ce54be17832.zip | |
Always use the system libraries since the included ones don't seem to work with xcb (bug #239977)
Package-Manager: portage-2.1.6.4/cvs/Linux 2.6.28.1 i686
Diffstat (limited to 'games-fps')
| -rw-r--r-- | games-fps/ut2004/ChangeLog | 9 | ||||
| -rw-r--r-- | games-fps/ut2004/Manifest | 14 | ||||
| -rw-r--r-- | games-fps/ut2004/ut2004-3369-r4.ebuild | 25 |
3 files changed, 18 insertions, 30 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/Manifest b/games-fps/ut2004/Manifest index 00b477393555..c9b2d09a809b 100644 --- a/games-fps/ut2004/Manifest +++ b/games-fps/ut2004/Manifest @@ -1,15 +1,5 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - AUX ut2004.xml 370 RMD160 f54254f4af9422b72e93b9f4e2aa126b828c34f4 SHA1 53be0a7e6cd5ea1c5329fee791e527b9f8edf29a SHA256 69d2ad349f8b0464157979518ca3482b6b8bbc34f25d710668775f36581be34c DIST ut2004-lnxpatch3369-2.tar.bz2 22465217 RMD160 af632d8cd1f05e36e861eb3fab927ffc8ae3f59d SHA1 a8cc33877a02a0a09c288b5fc248efde282f7bdf SHA256 438b9b13a367d46f23cce12b065382a55afa2fc68add1f1dd3db03b015f60bb3 -EBUILD ut2004-3369-r4.ebuild 5230 RMD160 5c99efd670ed8b400da1d986fbd0cba8fe501eb9 SHA1 48077b20fb53ed0f143c0b3dc8b5aacddeab2ce7 SHA256 c5e74a44c370313556bc91786b6ccabb5413c1752c53572938e5ac93bba50d83 -MISC ChangeLog 11230 RMD160 3a809ceb0751d28a136a6c5f57fd369c99dfa7a6 SHA1 3fccdca8a3a230f698a268b00dbc02c6c8a78e30 SHA256 9344aa5afd89aee19babf624b951b402bbc899a9a9d9567a7ee98c75990cd4b1 +EBUILD ut2004-3369-r4.ebuild 4843 RMD160 c058288a4975a5d8397ea8dac35541312bb31882 SHA1 358d6625d26857e4baaef273100ee98e857ca3ed SHA256 28250f4fe517465f7bbfc5dad97e96cc95b8013ab12ed12731df6c464105a3eb +MISC ChangeLog 11414 RMD160 6367a8a3a76d138b50a08c19ebeb65687862ac50 SHA1 1d755b321bc7885f27a4ae6b3a965f1bf6cde8c2 SHA256 fa0fe482897400c2b1b8d69f060eb59a4d6f83ff5afa4f9d19775db724539a30 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.9 (GNU/Linux) - -iEYEARECAAYFAkiN9tcACgkQkT4lNIS36YECVwCeNEpEObwCXivZ4i7oeqFskBUL -dCkAnjhcmAjE81iGeKJhd2AwukWpR8bA -=8AmZ ------END PGP SIGNATURE----- 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 \ |