diff options
| author |   Chris Gianelloni <wolf31o2@gentoo.org> | 2006-04-17 21:56:58 +0000 |
|---|---|---|
| committer | Chris Gianelloni <wolf31o2@gentoo.org> | 2006-04-17 21:56:58 +0000 |
| commit | 966755e6ed21825c4f238e74e7779b4ceb313122 (patch) | |
| tree | 0eb2d3f6a7505db80900f7699966bb19ea7ef3f3 /games-fps | |
| parent | Fixed up file collisions and closing bug #130263. (diff) | |
| download | historical-966755e6ed21825c4f238e74e7779b4ceb313122.tar.gz historical-966755e6ed21825c4f238e74e7779b4ceb313122.tar.bz2 historical-966755e6ed21825c4f238e74e7779b4ceb313122.zip | |
Added patch to make the CD copying more flexible and closing bug #130102.
Package-Manager: portage-2.1_pre7-r5
Diffstat (limited to 'games-fps')
| -rw-r--r-- | games-fps/ut2004-data/ChangeLog | 6 | ||||
| -rw-r--r-- | games-fps/ut2004-data/Manifest | 12 | ||||
| -rw-r--r-- | games-fps/ut2004-data/ut2004-data-3186-r3.ebuild | 13 |
3 files changed, 20 insertions, 11 deletions
diff --git a/games-fps/ut2004-data/ChangeLog b/games-fps/ut2004-data/ChangeLog index 78e7701c7790..cdd0afada3e0 100644 --- a/games-fps/ut2004-data/ChangeLog +++ b/games-fps/ut2004-data/ChangeLog @@ -1,6 +1,10 @@ # 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.15 2006/04/14 16:43:53 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-fps/ut2004-data/ChangeLog,v 1.16 2006/04/17 21:56:58 wolf31o2 Exp $ + + 17 Apr 2006; Chris Gianelloni <wolf31o2@gentoo.org> + ut2004-data-3186-r3.ebuild: + Added patch to make the CD copying more flexible and closing bug #130102. 14 Apr 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 083bece9a8ec..af013910356f 100644 --- a/games-fps/ut2004-data/Manifest +++ b/games-fps/ut2004-data/Manifest @@ -1,12 +1,12 @@ -MD5 db5c1683fcaf180d0db92277c0223ed1 ChangeLog 2997 -RMD160 7dadf0d7b3a7170484145e71499b4a14f4d92608 ChangeLog 2997 -SHA256 7d9bca05f393bfa969cc85366486495b6edaaa54fa6fb4e3239f95ea6602e433 ChangeLog 2997 +MD5 82e9d9293f4d88c5405ca6fe7992a5c2 ChangeLog 3158 +RMD160 ac6f22bf362a3064fe951b4e0f3d78f90bbc547f ChangeLog 3158 +SHA256 5e30a80e496ff1ec36d2069e61891d9736d00322e62626831ad66e156018cfb0 ChangeLog 3158 MD5 68b329da9893e34099c7d8ad5cb9c940 files/digest-ut2004-data-3186-r3 1 RMD160 c0da025038ed83c687ddc430da9846ecb97f3998 files/digest-ut2004-data-3186-r3 1 SHA256 01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b files/digest-ut2004-data-3186-r3 1 MD5 11a7e1491b1ac042ac7216b26b4ad1fb metadata.xml 254 RMD160 877a1dc36df2be58926bc51041093feafdefe429 metadata.xml 254 SHA256 2916aab684ec3908fffb515065eeb2c481cde563380b682646add582bed5f535 metadata.xml 254 -MD5 d4957d889413d2232aa38301ab445bb1 ut2004-data-3186-r3.ebuild 8169 -RMD160 f0531cd875a10e2b59819a2525059fde72176777 ut2004-data-3186-r3.ebuild 8169 -SHA256 6f95b3baf5f8cba12a59602ed8cf301b8563b0da47032fff89099d467c7e7827 ut2004-data-3186-r3.ebuild 8169 +MD5 9c9c352dc681aedfd43c2ce6a9a2d661 ut2004-data-3186-r3.ebuild 8293 +RMD160 c44cf8f7f19a22bcc0c768075d0d0ae8437c0cf8 ut2004-data-3186-r3.ebuild 8293 +SHA256 6119fc5f53d1becf6408bf8c46fdca3add3c4445c561ddce2c2fe7ee81658e8c ut2004-data-3186-r3.ebuild 8293 diff --git a/games-fps/ut2004-data/ut2004-data-3186-r3.ebuild b/games-fps/ut2004-data/ut2004-data-3186-r3.ebuild index e36069e68018..46c1d63f3811 100644 --- 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.4 2006/04/14 16:43:53 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-fps/ut2004-data/ut2004-data-3186-r3.ebuild,v 1.5 2006/04/17 21:56:58 wolf31o2 Exp $ inherit games games-ut2k4mod @@ -23,10 +23,15 @@ dir=${GAMES_PREFIX_OPT}/ut2004 Ddir=${D}/${dir} grabdirs() { + local srcdir + for d in {Music,Sounds,Speech,StaticMeshes,Textures} ; do - if [[ -d "${CDROM_ROOT}/$1/${d}" ]] ; then - echo "Copying ${CDROM_ROOT}/$1${d}" - cp -r "${CDROM_ROOT}/$1/${d}" "${Ddir}" || die "copying $1" + srcdir=${CDROM_ROOT}/$1/${d} + # Is flexible to handle CD_ROOT vs CD_ROOT_1 mixups + [[ -d "${srcdir}" ]] || srcdir=${CDROM_ROOT}/${d} + if [[ -d "${srcdir}" ]] ; then + echo "Copying ${srcdir}" + cp -r "${srcdir}" "${Ddir}" || die "copying ${srcdir}" fi done } |