touchups

diff --git a/games-fps/quake2-data/Manifest b/games-fps/quake2-data/Manifest
index 94070ab235461ab555b48ea8764b913eb6905941..199a6d2af2193fb096f6c662fac3b9373860056c 100644 (file)
--- a/games-fps/quake2-data/Manifest
+++ b/games-fps/quake2-data/Manifest
@@ -2,13 +2,13 @@
 Hash: SHA1
 
 MD5 3230d0e4ec19b013221359fcebcc9204 ChangeLog 710
-MD5 04c249c9d537ebeb3b7fdd572f932ebb quake2-data-3.20.ebuild 1666
+MD5 56b4d3bfe84f94e44e3e68819482d2a4 quake2-data-3.20.ebuild 1697
 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
 MD5 ac38ac21c5b1dd48241c3d7da6065bd7 files/digest-quake2-data-3.20 71
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.9.10 (GNU/Linux)
 
-iD8DBQFB1II1roRuSHgZdywRAoJiAJ9PI+/IbhTr3RHFRV5L7kUpxbjeqQCeKjqZ
-MeNW8NxwLlKaZwrdhrGJsoc=
-=Rihr
+iD8DBQFB2PXXroRuSHgZdywRAo2SAJ9R7luyZOKpRrDM+7tlfhy0WrIXHgCdGm3i
+IJrW/nifN4hMH2y9rT2li/U=
+=I0zC
 -----END PGP SIGNATURE-----

diff --git a/games-fps/quake2-data/quake2-data-3.20.ebuild b/games-fps/quake2-data/quake2-data-3.20.ebuild
index eb10aec3277464016e7766acc28033a1a868df1e..58c8021fdbe733c17402fc09df21907d73b2f6f1 100644 (file)
--- a/games-fps/quake2-data/quake2-data-3.20.ebuild
+++ b/games-fps/quake2-data/quake2-data-3.20.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/quake2-data/quake2-data-3.20.ebuild,v 1.11 2004/12/30 22:33:18 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/quake2-data/quake2-data-3.20.ebuild,v 1.12 2005/01/03 07:35:33 vapier Exp $
 
 inherit games eutils
 
@@ -20,10 +20,10 @@ S=${WORKDIR}
 
 pkg_setup() {
        cdrom_get_cds Install
-       if [ -e ${CDROM_ROOT}/Install/Data ] ; then
+       if [[ -e ${CDROM_ROOT}/Install/Data ]] ; then
                export CDROM_ROOT=${CDROM_ROOT}/Install/Data
                einfo "Source is the CD"
-       elif [ -e ${CDROM_ROOT}/baseq2 ] ; then
+       elif [[ -e ${CDROM_ROOT}/baseq2 ]] ; then
                export CDROM_ROOT=${CDROM_ROOT}
                einfo "Source is an installed copy"
        else
@@ -34,28 +34,29 @@ pkg_setup() {
 }
 
 src_unpack() {
-       unzip -L -q ${DISTDIR}/q2-${PV}-x86-full-ctf.exe
+       echo ">>> Unpacking ${A} to ${PWD}"
+       unzip -Lqo "${DISTDIR}/${A}"
 }
 
 src_install() {
        dodoc DOCS/* 3.20_Changes.txt
        newdoc ctf/readme.txt ctf-readme.txt
-       dohtml -r ${CDROM_ROOT}/DOCS/quake2_manual/*
+       dohtml -r "${CDROM_ROOT}"/DOCS/quake2_manual/*
 
        dodir ${GAMES_DATADIR}/${PN}/baseq2
 
        if use videos ; then
                insinto ${GAMES_DATADIR}/${PN}/baseq2/video
-               doins ${CDROM_ROOT}/baseq2/video/*
+               doins "${CDROM_ROOT}"/baseq2/video/*
        fi
 
        insinto ${GAMES_DATADIR}/${PN}/baseq2
-       doins ${CDROM_ROOT}/baseq2/pak0.pak || die "couldnt grab pak0.pak"
+       doins "${CDROM_ROOT}"/baseq2/pak0.pak || die "couldnt grab pak0.pak"
        doins baseq2/*.pak || die "couldnt grab release paks"
        doins baseq2/maps.lst || die "couldnt grab maps.lst"
-       cp -R baseq2/players ${D}/${GAMES_DATADIR}/${PN}/baseq2/ || die "couldnt grab player models"
+       cp -R baseq2/players "${D}/${GAMES_DATADIR}"/${PN}/baseq2/ || die "couldnt grab player models"
 
-       insinto ${GAMES_DATADIR}/${PN}/ctf
+       insinto "${GAMES_DATADIR}"/${PN}/ctf
        doins ctf/*.{cfg,ico,pak} || die "couldnt grab ctf"
 
        prepgamesdirs