add support for existing installs/ultimate quake by UncleOwen #111615

Package-Manager: portage-2.0.53_rc7

diff --git a/games-fps/quake1-data/Manifest b/games-fps/quake1-data/Manifest
index 99caba99b03c755f265ae471d0ed26cd67f2229a..fc3fc4ae3a2fc4c5a20d19762a92b1e73caba206 100644 (file)
--- a/games-fps/quake1-data/Manifest
+++ b/games-fps/quake1-data/Manifest
@@ -4,11 +4,11 @@ Hash: SHA1
 MD5 16f0bd0e9793a52fec9a0fc74940496e ChangeLog 343
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-quake1-data-2.40 0
 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
-MD5 9d862d20003cdd366874014831860170 quake1-data-2.40.ebuild 766
+MD5 a425b878490c85976249d8272d160d08 quake1-data-2.40.ebuild 1271
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFDZGDtgIKl8Uu19MoRAvhnAJ41t8FlHo4yco+3yZFKcBDx4wlz3wCfazxY
-HEuboQvroUaFUuR9jOIv5oU=
-=t/ms
+iD8DBQFDbTLJgIKl8Uu19MoRAtI/AJ9OJju+vVpKRj8Z3H9SwPOtyFPfLwCfXSgz
+zxhHBrhW8ssIkHo0C5At0bk=
+=2lUJ
 -----END PGP SIGNATURE-----

diff --git a/games-fps/quake1-data/quake1-data-2.40.ebuild b/games-fps/quake1-data/quake1-data-2.40.ebuild
index 5f7d5c79bab0507d6e0a9a35972a5fd8c7bc91f1..d3b1728f4bfd76e89de1a820f42efe300838b7cc 100644 (file)
--- a/games-fps/quake1-data/quake1-data-2.40.ebuild
+++ b/games-fps/quake1-data/quake1-data-2.40.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/quake1-data/quake1-data-2.40.ebuild,v 1.1 2005/10/30 05:57:41 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/quake1-data/quake1-data-2.40.ebuild,v 1.2 2005/11/05 22:30:21 vapier Exp $
 
 inherit games
 
@@ -18,18 +18,31 @@ DEPEND=""
 S=${WORKDIR}
 
 pkg_setup() {
+       export CDROM_SET_NAMES=("Existing Install" "Quake CD" "Ultimate Quake Collection")
        games_pkg_setup
-       cdrom_get_cds q101_int.1
+       cdrom_get_cds id1:q101_int.1:Setup/ID1
 }
 
 src_unpack() {
        echo ">>> Unpacking q101_int.1 to ${PWD}"
-       lha xqf "${CDROM_ROOT}"/q101_int.1 || die "failure unpacking q101_int.1"
+       if [[ ${CDROM_SET} == "1" ]] ; then
+               lha xqf "${CDROM_ROOT}"/q101_int.1 || die "failure unpacking q101_int.1"
+       fi
 }
 
 src_install() {
        insinto ${GAMES_DATADIR}/quake1/id1
-       doins id1/* || die "doins pak files"
-       dodoc *.txt
+       case ${CDROM_SET} in
+               0)  doins "${CDROM_ROOT}"/id1/* || die "doins pak files"
+                   dodoc "${CDROM_ROOT}"/*.txt
+                   ;;
+               1)  doins id1/* || die "doins pak files"
+                   dodoc *.txt
+                   ;;
+               2)  newins "${CDROM_ROOT}"/Setup/ID1/PAK0.PAK pak0.pak || die "ins pak0.pak failed"
+                   newins "${CDROM_ROOT}"/Setup/ID1/PAK1.PAK pak1.pak || die "ins pak1.pak failed"
+                   dodoc "${CDROM_ROOT}"/Docs/*
+                   ;;
+       esac
        prepgamesdirs
 }