Fix quoting on CDROM_ROOT with patch from Jared in bug #326823

Package-Manager: portage-2.1.8.3/cvs/Linux i686

diff --git a/games-fps/quake4-data/ChangeLog b/games-fps/quake4-data/ChangeLog
index a8f93ca3d4c9488fcfa48c6e2f624d8af946beb8..1626f245ca7e5cb7b6b4d38327f67b0b22f70bef 100644 (file)
--- a/games-fps/quake4-data/ChangeLog
+++ b/games-fps/quake4-data/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-fps/quake4-data
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/quake4-data/ChangeLog,v 1.9 2008/09/26 18:57:08 zmedico Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-fps/quake4-data/ChangeLog,v 1.10 2010/07/14 18:06:34 mr_bones_ Exp $
+
+  14 Jul 2010; Michael Sterrett <mr_bones_@gentoo.org>
+  quake4-data-1.0.2147.12.ebuild:
+  Fix quoting on CDROM_ROOT with patch from Jared in bug #326823
 
   26 Sep 2008; Zac Medico <zmedico@gentoo.org>
   quake4-data-1.0.2147.12.ebuild:

diff --git a/games-fps/quake4-data/Manifest b/games-fps/quake4-data/Manifest
index 42b9ebd3a94a7b1e54cb91ab3845674b65687998..1540083b5e1ae05b82c80041dd23a8fef974ac83 100644 (file)
--- a/games-fps/quake4-data/Manifest
+++ b/games-fps/quake4-data/Manifest
@@ -1,13 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-EBUILD quake4-data-1.0.2147.12.ebuild 1669 RMD160 1f61de163fcbc1646665da8d9024cb425d8e4d27 SHA1 9ce06cd8b69d608c7ca15bb4c58bd0cd00cd2c33 SHA256 d7f7e4888b071fcc995e073eac3fc4c99afd606523c86f4a1a1ab010b6cb986b
-MISC ChangeLog 1781 RMD160 ea556a558efb54c92b4cdc0bd3342239f66e8fa6 SHA1 c570903d21138d916679d738b8da71ae9150fa26 SHA256 d46b75b7355e46b3c80f3c6b5035806816c5f083ddc5586d597cfaabfde2fb10
+EBUILD quake4-data-1.0.2147.12.ebuild 1682 RMD160 7e2f22832fe19155ef58a386d141414ef3dc7c3b SHA1 70e3ecd0cc1308ba5d8f74a40c0d71d2e3124160 SHA256 33637f4a2692e1df798c9378f0f24c7406fd17a3363fbdffdc1ae4f09b6d1331
+MISC ChangeLog 1939 RMD160 72b8c7d13d276b71618c4a068cfbdb90f4ab9030 SHA1 b82d13bf1711b99eae890cd812ad40d2116ae8d0 SHA256 a725bd3ded7058b370b4b31ebd39e339d27a6ed3e6c3d4116dfd13030a92247c
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAkjdMIQACgkQ/ejvha5XGaPNZgCgvNvM09tb5aV0pgf1sMb/ySYU
-z/4AoIoWA1vE7yt1fmLcg476rhDEKkxg
-=iqlc
------END PGP SIGNATURE-----

diff --git a/games-fps/quake4-data/quake4-data-1.0.2147.12.ebuild b/games-fps/quake4-data/quake4-data-1.0.2147.12.ebuild
index 172d16cf3d3e001e2a929fb9b7ec275326711d80..35b3f1e287ae9ac671f6bd34742dbf17f7f497b7 100644 (file)
--- a/games-fps/quake4-data/quake4-data-1.0.2147.12.ebuild
+++ b/games-fps/quake4-data/quake4-data-1.0.2147.12.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/quake4-data/quake4-data-1.0.2147.12.ebuild,v 1.9 2008/09/26 18:57:08 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/quake4-data/quake4-data-1.0.2147.12.ebuild,v 1.10 2010/07/14 18:06:34 mr_bones_ Exp $
 
 inherit eutils games
 
@@ -33,20 +33,20 @@ src_install() {
                Setup/Data/q4base/pak007.pk4
        insinto "${dir}"/q4base
        einfo "Copying files from Disk 1..."
-       doins ${CDROM_ROOT}/Setup/Data/q4base/pak01{0,1,2}.pk4 \
-               ${CDROM_ROOT}/Setup/Data/q4base/zpak*.pk4 \
+       doins "${CDROM_ROOT}"/Setup/Data/q4base/pak01{0,1,2}.pk4 \
+               "${CDROM_ROOT}"/Setup/Data/q4base/zpak*.pk4 \
                || die "copying pak010->pak012 and zpack*"
        cdrom_load_next_cd
        einfo "Copying files from Disk 2..."
-       doins ${CDROM_ROOT}/Setup/Data/q4base/pak00{1,2,3}.pk4 \
+       doins "${CDROM_ROOT}"/Setup/Data/q4base/pak00{1,2,3}.pk4 \
                || die "copying pak001->pak003"
        cdrom_load_next_cd
        einfo "Copying files from Disk 3..."
-       doins ${CDROM_ROOT}/Setup/Data/q4base/pak00{4,5,6}.pk4 \
+       doins "${CDROM_ROOT}"/Setup/Data/q4base/pak00{4,5,6}.pk4 \
                || die "copying pak004->pak006"
        cdrom_load_next_cd
        einfo "Copying files from Disk 4..."
-       doins ${CDROM_ROOT}/Setup/Data/q4base/pak00{7,8,9}.pk4 \
+       doins "${CDROM_ROOT}"/Setup/Data/q4base/pak00{7,8,9}.pk4 \
                || die "copying pak007->pak009"
 
        find ${Ddir} -exec touch '{}' \;