fix support for original quake2 cd, add support for the ultimate quake collection...

Package-Manager: portage-2.0.53_rc7

diff --git a/games-fps/quake2-data/Manifest b/games-fps/quake2-data/Manifest
index f04e88e2cee9f030cef74b38450d710bcc3d2fe8..1575276b9543e192c1607a4ce73cca3357a59252 100644 (file)
--- a/games-fps/quake2-data/Manifest
+++ b/games-fps/quake2-data/Manifest
@@ -4,11 +4,11 @@ Hash: SHA1
 MD5 2eaa8e16c4fc1b66661df6f583fdea1a ChangeLog 959
 MD5 ac38ac21c5b1dd48241c3d7da6065bd7 files/digest-quake2-data-3.20 71
 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
-MD5 b4326c40e7f36983be6c720a6d6eeb47 quake2-data-3.20.ebuild 1800
+MD5 3635692ae931273b4e21e14ff4259f57 quake2-data-3.20.ebuild 2638
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFDZqLxgIKl8Uu19MoRAmHtAJ473jVELAAHJmEOLZfwi63/gwMnuQCfcdEB
-joPztgBiIvvm8zfF5lkKyfA=
-=+Lwp
+iD8DBQFDcBxfgIKl8Uu19MoRAuYHAJ4gSU31u6iyjfu8Q7F7Oufzqh99oQCeJ2Bp
+EGGQaOtSuUuxvSVHGynCzlw=
+=bIhL
 -----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 49b4daca8b6375839555f03f38d2804dd5d050b7..0a135300335bb91314aa144d607520104ce97b61 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-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.15 2005/10/31 23:03:45 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/quake2-data/quake2-data-3.20.ebuild,v 1.16 2005/11/08 03:32:07 vapier Exp $
 
 inherit eutils games
 
@@ -19,8 +19,8 @@ RDEPEND=""
 S=${WORKDIR}
 
 pkg_setup() {
-       export CDROM_SET_NAMES=("Existing Install" "Quake2 CD" "Quake4 Bonus DVD")
-       cdrom_get_cds baseq2:Install:Movies
+       export CDROM_SET_NAMES=("Existing Install" "Ultimate Quake Edition" "Quake2 CD" "Quake4 Bonus DVD")
+       cdrom_get_cds baseq2:Install/patch:Install:Movies
        games_pkg_setup
 }
 
@@ -34,14 +34,18 @@ src_install() {
        dodoc DOCS/* 3.20_Changes.txt
        newdoc ctf/readme.txt ctf-readme.txt
        case ${CDROM_SET} in
-               0|1) dohtml -r "${CDROM_ROOT}"/DOCS/quake2_manual/* ;;
-               2)   dodoc "${CDROM_ROOT}"/Docs/* ;;
+               0) dohtml -r "${CDROM_ROOT}"/Install/DOCS/quake2_manual/* ;;
+               1) dohtml -r "${CDROM_ROOT}"/Install/Docs/quake2_manual/* ;;
+               2) dohtml -r "${CDROM_ROOT}"/Install/DOCS/quake2_manual/* ;;
+               3) dodoc "${CDROM_ROOT}"/Docs/* ;;
        esac
 
        local baseq2_cdpath
        case ${CDROM_SET} in
-               0|1) baseq2_cdpath=${CDROM_ROOT}/baseq2;;
-               2)   baseq2_cdpath=${CDROM_ROOT}/setup/Data/baseq2;;
+               0) baseq2_cdpath=${CDROM_ROOT}/baseq2;;
+               1) baseq2_cdpath=${CDROM_ROOT}/Install/Data/baseq2;;
+               2) baseq2_cdpath=${CDROM_ROOT}/Install/Data/baseq2;;
+               3) baseq2_cdpath=${CDROM_ROOT}/setup/Data/baseq2;;
        esac
 
        dodir ${GAMES_DATADIR}/quake2/baseq2
@@ -55,7 +59,22 @@ src_install() {
        doins "${baseq2_cdpath}"/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}"/quake2/baseq2/ || die "couldnt grab player models"
+       dodir "${GAMES_DATADIR}"/quake2/baseq2/players
+       cp -R "${baseq2_cdpath}"/players/* baseq2/players/* \
+               "${D}/${GAMES_DATADIR}"/quake2/baseq2/players/ || die "couldnt grab player models"
+
+       for mod in ctf rogue xatrix ; do
+               if [[ -d ${baseq2_cdpath}/../${mod} ]] ; then
+                       if use videos && [[ -d ${baseq2_cdpath}/../${mod}/video ]] ; then
+                               insinto ${GAMES_DATADIR}/quake2/${mod}/video
+                               doins "${baseq2_cdpath}"/../${mod}/video/* 2>/dev/null
+                       fi
+                       if [[ -n $(ls "${baseq2_cdpath}"/../${mod}/*.pak 2>/dev/null) ]] ; then
+                               insinto ${GAMES_DATADIR}/quake2/${mod}
+                               doins "${baseq2_cdpath}"/../${mod}/*.pak || die "doins ${mod} pak"
+                       fi
+               fi
+       done
 
        insinto "${GAMES_DATADIR}"/quake2/ctf
        doins ctf/*.{cfg,ico,pak} || die "couldnt grab ctf"