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 | 0dfafe4b4a6878a40083f9d1727b321547cc9488 (patch) | |
| tree | 513e4f428fb24348fdae38e371930ccf66b81c5c /games-fps/ut2004-data | |
| parent | Fixed up file collisions and closing bug #130263. (diff) | |
| download | gentoo-2-0dfafe4b4a6878a40083f9d1727b321547cc9488.tar.gz gentoo-2-0dfafe4b4a6878a40083f9d1727b321547cc9488.tar.bz2 gentoo-2-0dfafe4b4a6878a40083f9d1727b321547cc9488.zip | |
Added patch to make the CD copying more flexible and closing bug #130102.
(Portage version: 2.1_pre7-r5)
Diffstat (limited to 'games-fps/ut2004-data')
| -rw-r--r-- | games-fps/ut2004-data/ChangeLog | 6 | ||||
| -rw-r--r-- | games-fps/ut2004-data/ut2004-data-3186-r3.ebuild | 13 |
2 files changed, 14 insertions, 5 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/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 } |