diff options
author | 2004-06-16 12:17:33 +0000 | |
---|---|---|
committer | 2004-06-16 12:17:33 +0000 | |
commit | f31f2f80de039cff24309381e2131b496963dc8a (patch) | |
tree | 08cd364af0039ee6de49f6cf5888b88e068afb42 /games-fps/ut2004 | |
parent | QA - Don't assign default S. (Manifest recommit) (diff) | |
download | gentoo-2-f31f2f80de039cff24309381e2131b496963dc8a.tar.gz gentoo-2-f31f2f80de039cff24309381e2131b496963dc8a.tar.bz2 gentoo-2-f31f2f80de039cff24309381e2131b496963dc8a.zip |
Moved patch and amd64 ucc-bin/ut2004-bin renames to before uncompressing to attempt to solve problems with installation on amd64. Marked stable on x86 and closing bug #54028.
Diffstat (limited to 'games-fps/ut2004')
-rw-r--r-- | games-fps/ut2004/ChangeLog | 7 | ||||
-rw-r--r-- | games-fps/ut2004/ut2004-3204.ebuild | 28 |
2 files changed, 20 insertions, 15 deletions
diff --git a/games-fps/ut2004/ChangeLog b/games-fps/ut2004/ChangeLog index 05781fd27c11..5135f615fdfa 100644 --- a/games-fps/ut2004/ChangeLog +++ b/games-fps/ut2004/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for games-fps/ut2004 # Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-fps/ut2004/ChangeLog,v 1.8 2004/06/03 11:31:58 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-fps/ut2004/ChangeLog,v 1.9 2004/06/16 12:17:33 wolf31o2 Exp $ + + 16 Jun 2004; Chris Gianelloni <wolf31o2@gentoo.org> ut2004-3204.ebuild: + Moved patch and amd64 ucc-bin/ut2004-bin renames to before uncompressing to + attempt to solve problems with installation on amd64. Marked stable on x86 and + closing bug #54028. 03 Jun 2004; Michael Sterrett <mr_bones_@gentoo.org> ut2004-3204.ebuild: fix dir -> die typo; skip unnecessary dodirs diff --git a/games-fps/ut2004/ut2004-3204.ebuild b/games-fps/ut2004/ut2004-3204.ebuild index ad08b8771fe6..219e5eba4fc9 100644 --- a/games-fps/ut2004/ut2004-3204.ebuild +++ b/games-fps/ut2004/ut2004-3204.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-fps/ut2004/ut2004-3204.ebuild,v 1.8 2004/06/03 11:31:58 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-fps/ut2004/ut2004-3204.ebuild,v 1.9 2004/06/16 12:17:33 wolf31o2 Exp $ inherit games @@ -10,7 +10,7 @@ SRC_URI="http://mirror1.icculus.org/ut2004/ut2004-lnxpatch3204.tar.bz2" LICENSE="ut2003" SLOT="0" -KEYWORDS="~x86 ~amd64" +KEYWORDS="x86 ~amd64" RESTRICT="nostrip" IUSE="opengl dedicated" @@ -135,6 +135,18 @@ src_install() { # Removing uneccessary files in Sounds rm -f ${Ddir}/Sounds/*.{det,est,frt,itt,kot,smt,tmt}_uax.uz2 + # installing patch files + cp ${S}/UT2004-Patch/Help/* ${Ddir}/Help + cp ${S}/UT2004-Patch/System/* ${Ddir}/System + cp ${S}/UT2004-Patch/Textures/* ${Ddir}/Textures + + use amd64 && rm ${Ddir}/System/ucc-bin ${Ddir}/System/ut2004-bin \ + && mv ${Ddir}/System/ucc-bin-linux-amd64 ${Ddir}/System/ucc-bin \ + && mv ${Ddir}/System/ut2004-bin-linux-amd64 ${Ddir}/System/ut2004-bin \ + && chmod ug+x ${Ddir}/System/ucc-bin ${Ddir}/System/ut2004-bin + use x86 && rm ${Ddir}/System/ucc-bin-linux-amd64 \ + ${Ddir}/System/ut2004-bin-linux-amd64 + # uncompressing files einfo "Uncompressing files... this *will* take a while..." for j in {Animations,Maps,Sounds,StaticMeshes,Textures} ; do @@ -162,18 +174,6 @@ src_install() { mkdir -p ${D}/root/.loki/installed dosym ${dir}/.manifest/${PN}.xml ${D}/root/.loki/installed/${PN}.xml - # installing patch files - cp ${S}/UT2004-Patch/Help/* ${Ddir}/Help - cp ${S}/UT2004-Patch/System/* ${Ddir}/System - cp ${S}/UT2004-Patch/Textures/* ${Ddir}/Textures - - use amd64 && rm ${Ddir}/System/ucc-bin ${Ddir}/System/ut2004-bin \ - && mv ${Ddir}/System/ucc-bin-linux-amd64 ${Ddir}/System/ucc-bin \ - && mv ${Ddir}/System/ut2004-bin-linux-amd64 ${Ddir}/System/ut2004-bin \ - && chmod ug+x ${Ddir}/System/ucc-bin ${Ddir}/System/ut2004-bin - use x86 && rm ${Ddir}/System/ucc-bin-linux-amd64 \ - ${Ddir}/System/ut2004-bin-linux-amd64 - games_make_wrapper ut2004 ./ut2004 ${dir} # now, since these files are coming off a cd, the times/sizes/md5sums wont |