Fix bash 3.2 breakage

Package-Manager: portage-2.1.2_rc1-r5

diff --git a/games-fps/ut2004-data/ChangeLog b/games-fps/ut2004-data/ChangeLog
index b9b8b095e85f1f7b4775c5408916eacf9e337f1c..d2f2958e7d0a24de8808ff00e81bc6100bbf5455 100644 (file)
--- a/games-fps/ut2004-data/ChangeLog
+++ b/games-fps/ut2004-data/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for games-fps/ut2004-data
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/ut2004-data/ChangeLog,v 1.19 2006/10/24 22:54:40 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/ut2004-data/ChangeLog,v 1.20 2006/11/10 12:00:46 nyhm Exp $
+
+  10 Nov 2006; Tristan Heaven <nyhm@gentoo.org> ut2004-data-3186-r3.ebuild:
+  Fix bash 3.2 breakage
 
   24 Oct 2006; Chris Gianelloni <wolf31o2@gentoo.org>
   ut2004-data-3186-r3.ebuild:

diff --git a/games-fps/ut2004-data/Manifest b/games-fps/ut2004-data/Manifest
index a1eacc15f48cada2dc452df7cb53c6e6e87d4b6c..b23a123d0dd5242598cbd2fa794e9084d3af87d1 100644 (file)
--- a/games-fps/ut2004-data/Manifest
+++ b/games-fps/ut2004-data/Manifest
@@ -1,14 +1,14 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-EBUILD ut2004-data-3186-r3.ebuild 7994 RMD160 a78c44544188d40ae98e15e0c19c306f0aff463e SHA1 ec222daf381d76bf315d0a2630c6dbf7a6c25106 SHA256 ec03218536a5e1a19300ba34132f198d6aee5ca4fc9e81e81b55c05f4e02189c
-MD5 de26b65028223b50a760f002aa2b3cf8 ut2004-data-3186-r3.ebuild 7994
-RMD160 a78c44544188d40ae98e15e0c19c306f0aff463e ut2004-data-3186-r3.ebuild 7994
-SHA256 ec03218536a5e1a19300ba34132f198d6aee5ca4fc9e81e81b55c05f4e02189c ut2004-data-3186-r3.ebuild 7994
-MISC ChangeLog 3776 RMD160 cc87789b18bec32d99ac6cc26d178502f00f06b6 SHA1 d5ee5d9353ac55e453a282b77e7c012b098fda59 SHA256 3ef1f34e8071a7acbd2b41658a9676e6f1cd24b81767fe017815fc8fff39f847
-MD5 953d322aae2d4030201b2cd36845e166 ChangeLog 3776
-RMD160 cc87789b18bec32d99ac6cc26d178502f00f06b6 ChangeLog 3776
-SHA256 3ef1f34e8071a7acbd2b41658a9676e6f1cd24b81767fe017815fc8fff39f847 ChangeLog 3776
+EBUILD ut2004-data-3186-r3.ebuild 7730 RMD160 205e77e83351cb3c2ab21425d98ea317fef54c54 SHA1 f01738b5f60faa902ae2736e2082dfff9adc1e3f SHA256 3d43d62d9d3777d5155e736593c39129da24b24dbffe255d72424232a088182f
+MD5 1b43a1a774a7903ea3d555b3edc5f887 ut2004-data-3186-r3.ebuild 7730
+RMD160 205e77e83351cb3c2ab21425d98ea317fef54c54 ut2004-data-3186-r3.ebuild 7730
+SHA256 3d43d62d9d3777d5155e736593c39129da24b24dbffe255d72424232a088182f ut2004-data-3186-r3.ebuild 7730
+MISC ChangeLog 3873 RMD160 ee960649170d603079733221edbb56d27320c7c2 SHA1 560b0fdd58359abe8d3bf73aec56a5ab78842f5f SHA256 66c0014afac93a732d60387f89612c34acfce3e989e6d6f980526a5bfb93510b
+MD5 a698f4410220eec500718f7df6f448d2 ChangeLog 3873
+RMD160 ee960649170d603079733221edbb56d27320c7c2 ChangeLog 3873
+SHA256 66c0014afac93a732d60387f89612c34acfce3e989e6d6f980526a5bfb93510b ChangeLog 3873
 MISC metadata.xml 254 RMD160 877a1dc36df2be58926bc51041093feafdefe429 SHA1 45f0334cd127c4a1b4ece41f7098ab70046e378a SHA256 2916aab684ec3908fffb515065eeb2c481cde563380b682646add582bed5f535
 MD5 11a7e1491b1ac042ac7216b26b4ad1fb metadata.xml 254
 RMD160 877a1dc36df2be58926bc51041093feafdefe429 metadata.xml 254
@@ -19,7 +19,7 @@ SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFFPpnKkT4lNIS36YERApnMAKCrl0i6Jb+o83ftwLgA1Juir8ZQHgCfWeot
-Mr0k67W6D8U4A/v+0ehw5II=
-=+FsB
+iD8DBQFFVGnzdz7hIScOURERAjj0AJ9rI0/y5+PmE7jZBar3Dp71Ybma6gCggUJX
+pOpM5dVygk965OweAu8YvBE=
+=Yf3s
 -----END PGP SIGNATURE-----

diff --git a/games-fps/ut2004-data/ut2004-data-3186-r3.ebuild b/games-fps/ut2004-data/ut2004-data-3186-r3.ebuild
index a2cc4c25f03d4559aa2d0d360270cce05aa83b0b..0a63f0aabf4e292ebf5bf83471ee6742fec02511 100644 (file)
--- a/games-fps/ut2004-data/ut2004-data-3186-r3.ebuild
+++ b/games-fps/ut2004-data/ut2004-data-3186-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/ut2004-data/ut2004-data-3186-r3.ebuild,v 1.10 2006/10/24 22:54:40 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/ut2004-data/ut2004-data-3186-r3.ebuild,v 1.11 2006/11/10 12:00:46 nyhm Exp $
 
 inherit eutils games games-ut2k4mod
 
@@ -13,6 +13,7 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 RESTRICT="strip"
 IUSE=""
+QA_TEXTRELS="${GAMES_PREFIX_OPT:1}/ut2004/System/libSDL-1.2.so.0"
 
 DEPEND="games-util/uz2unpack"
 PDEPEND="games-fps/ut2004"
@@ -86,7 +87,7 @@ src_unpack() {
 }
 
 src_install() {
-       local diskno srcdir varname
+       local diskno srcdir varname j
 
        # Disk 1
        einfo "Copying files from Disk 1..."
@@ -104,7 +105,7 @@ src_install() {
                || die "copying Benchmark files"
        cdrom_load_next_cd
 
-       for diskno in 2 3 4 5 ; do
+       for diskno in {2..5} ; do
                einfo "Copying files from Disk ${diskno}..."
                varname="DISK${diskno}"
                srcdir=${!varname}
@@ -119,44 +120,46 @@ src_install() {
        # Create empty files in Benchmark
        for j in {CSVs,Logs,Results}
        do
-               dodir "${dir}/Benchmark/${j}"
-               touch "${Ddir}/Benchmark/${j}"/DO_NOT_DELETE.ME || die "creating dummy files"
+               keepdir "${dir}"/Benchmark/${j}
        done
 
        # Install extra help files
        insinto "${dir}"/Help
-       doins "${S}"/Unreal.bmp
+       doins Unreal.bmp
 
        # Install EULA
        insinto "${dir}"
-       doins "${S}"/UT2004_EULA.txt
+       doins UT2004_EULA.txt
+
+       # Installing documentation/icon
+       doins README.linux ut2004.xpm || die "copying readme/icon"
+       dodoc README.linux || die "dodoc README.linux"
+       doicon ut2004.xpm
 
        # Install System.inis
        insinto "${dir}"/System
-       doins "${S}"/ini-{det,est,frt,int,itt,kot,smt,tmt}.tar
+       doins ini-{det,est,frt,int,itt,kot,smt,tmt}.tar
 
        # Copy ut2004
        exeinto "${dir}"
-       doexe "${S}"/bin/ut2004 || die "copying ut2004"
+       doexe bin/ut2004 || die "copying ut2004"
 
        exeinto "${dir}"/System
        # We install the provided libraries because upstream wants it that way.
        # If you want to use your own system binaries, then feel free to uncomment
-       # the following.  You will also want to comment the doexe lines below that
+       # the following.  You will also want to comment the doexe line below that
        # installs the libraries.
-#      newexe "${S}"/System/openal.so openal.so-binary
-#      newexe "${S}"/System/libSDL-1.2.so.0 libSDL-1.2.so.0-binary
-       doexe ${S}/System/{libSDL-1.2.so.0,openal.so} \
+#      newexe System/openal.so openal.so-binary
+#      newexe System/libSDL-1.2.so.0 libSDL-1.2.so.0-binary
+       doexe System/{libSDL-1.2.so.0,openal.so} \
                || die "copying libraries"
-       doexe "${S}"/System/{u{cc,t2004}-bin} \
-               || die "copying libs/ucc/ut2004"
 
        # Uncompressing files
        einfo "Uncompressing files... this *will* take a while..."
        for j in {Animations,Maps,Sounds,StaticMeshes,Textures}
        do
-               chmod -R u+w "${Ddir}/${j}" || die "chmod in uncompress"
-               games_ut_unpack "${Ddir}/${j}" || die "uncompressing files"
+               fperms -R u+w "${dir}"/${j} || die "fperms in uncompress"
+               games_ut_unpack "${Ddir}"/${j}
        done
 
        # Removing unneccessary files
@@ -171,13 +174,13 @@ src_install() {
        rm -f "${Ddir}"/Help/UT2004Logo.bmp
        rm -f "${Ddir}"/System/{ALAudio.kot,AS-{Convoy,FallenCity,Glacier}.kot,bonuspack.{det,est,frt},BonusPack.{int,itt,u}}
        rm -f "${Ddir}"/System/{Build.ini,CacheRecords.ucl,Core.{est,frt,int,itt,u},CTF-January.kot,D3DDrv.kot,DM-1on1-Squader.kot}
-       rm -f "${Ddir}"/System/{{Editor,Engine,Gameplay,GamePlay,UnrealGame,UT2k4Assault,XInterface,XPickups,xVoting,XVoting,XWeapons,XWebAdmin}.{det,est,frt,int,itt,u}}
+       rm -f "${Ddir}"/System/{Editor,Engine,Gameplay,GamePlay,UnrealGame,UT2k4Assault,XInterface,XPickups,xVoting,XVoting,XWeapons,XWebAdmin}.{det,est,frt,int,itt,u}
        rm -f "${Ddir}"/System/{Fire.u,IpDrv.u,License.int,ONS-ArcticStronghold.kot}
-       rm -f "${Ddir}"/System/{{OnslaughtFull,onslaughtfull,UT2k4AssaultFull}.{det,est,frt,itt,u}}
-       rm -f "${Ddir}"/System/{{GUI2K4,Onslaught,skaarjpack,SkaarjPack,XGame}.{det,est,frt,int,itt,kot,u}}
-       rm -f "${Ddir}"/System/{{Setup,Window}.{det,est,frt,int,itt,kot}}
-       rm -f "${Ddir}"/System/{XPlayers.{det,est,frt,int,itt}}
-       rm -f "${Ddir}"/System/{ucc-bin,UnrealEd.u,ut2004-bin,UTClassic.u,UTV2004c.u,UTV2004s.u,UWeb.u,Vehicles.kot,Vehicles.u,Xweapons.itt}
+       rm -f "${Ddir}"/System/{OnslaughtFull,onslaughtfull,UT2k4AssaultFull}.{det,est,frt,itt,u}
+       rm -f "${Ddir}"/System/{GUI2K4,Onslaught,skaarjpack,SkaarjPack,XGame}.{det,est,frt,int,itt,kot,u}
+       rm -f "${Ddir}"/System/{Setup,Window}.{det,est,frt,int,itt,kot}
+       rm -f "${Ddir}"/System/XPlayers.{det,est,frt,int,itt}
+       rm -f "${Ddir}"/System/{UnrealEd.u,UTClassic.u,UTV2004c.u,UTV2004s.u,UWeb.u,Vehicles.kot,Vehicles.u,Xweapons.itt}
        rm -f "${Ddir}"/System/{XAdmin.kot,XAdmin.u,XMaps.det,XMaps.est}
        rm -f "${Ddir}"/Web/ServerAdmin/{admins_home.htm,current_bots.htm,ut2003.css}
        rm -f "${Ddir}"/Web/ServerAdmin/ClassicUT/current_bots.htm
@@ -195,12 +198,6 @@ src_install() {
        rm -f "${Ddir}"/Textures/{AW-2k4XP,BenTex02,BenTropical01,BonusParticles,CicadaTex,Construction_S}.utx
        rm -f "${Ddir}"/Textures/{HourAdaraTexor,ONSBPTextures,ONSBP_DestroyedVehicles,PC_UrbanTex,UT2004ECEPlayerSkins}.utx
 
-       # Installing documentation/icon
-       dodoc "${S}"/README.linux || die "dodoc README.linux"
-       doicon "${S}"/ut2004.xpm || die "doicon ut2004.xpm"
-       insinto "${dir}"
-       doins "${S}"/{README.linux,ut2004.xpm} || die "copying readme/icon"
-
        # Now, since these files are coming off a CD, the times/sizes/md5sums won't
        # be different ... that means portage will try to unmerge some files (!)
        # We run touch on ${D} so as to make sure portage doesn't do any such thing