Add support for newer Quake cds #142207 by Joe Quanaim.

Package-Manager: portage-2.1.1_pre4

3 files changed, 28 insertions, 17 deletions

diff --git a/games-fps/quake1-data/ChangeLog b/games-fps/quake1-data/ChangeLog
index b8a10082566d..b252c9b5aab0 100644
--- a/games-fps/quake1-data/ChangeLog
+++ b/games-fps/quake1-data/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for games-fps/quake1-data
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/quake1-data/ChangeLog,v 1.5 2006/06/27 19:54:48 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/quake1-data/ChangeLog,v 1.6 2006/08/11 02:38:47 vapier Exp $
+
+  11 Aug 2006; Mike Frysinger <vapier@gentoo.org> quake1-data-2.40.ebuild:
+  Add support for newer Quake cds #142207 by Joe Quanaim.
 
   27 Jun 2006; Chris Gianelloni <wolf31o2@gentoo.org>
   quake1-data-2.40.ebuild:
diff --git a/games-fps/quake1-data/Manifest b/games-fps/quake1-data/Manifest
index 3674e3aedeec..eec0313fa12b 100644
--- a/games-fps/quake1-data/Manifest
+++ b/games-fps/quake1-data/Manifest
@@ -1,14 +1,14 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-EBUILD quake1-data-2.40.ebuild 1669 RMD160 70268821687939f9b55b5c9e97b690859d60bc15 SHA1 e7ce410fcfc12f8127de9d59655dd7a963eec9e8 SHA256 1b776562e9f108795fb1e9ab20fdb6648d5f15558a882ea8e2393a8288846275
-MD5 b848dfb62a2fb646933a1488a6ee50c1 quake1-data-2.40.ebuild 1669
-RMD160 70268821687939f9b55b5c9e97b690859d60bc15 quake1-data-2.40.ebuild 1669
-SHA256 1b776562e9f108795fb1e9ab20fdb6648d5f15558a882ea8e2393a8288846275 quake1-data-2.40.ebuild 1669
-MISC ChangeLog 1027 RMD160 d41c51fe16b63c76cf6f8044239a8ee809ba0db8 SHA1 b10bbe55f24a1282d3f567df43b85171cacc934c SHA256 fd047bf2d556298aa639f67530c710a46793e4fb3e742532172b0f503be52e39
-MD5 2cc9b68d34b782847f3f15cfaf7efbbe ChangeLog 1027
-RMD160 d41c51fe16b63c76cf6f8044239a8ee809ba0db8 ChangeLog 1027
-SHA256 fd047bf2d556298aa639f67530c710a46793e4fb3e742532172b0f503be52e39 ChangeLog 1027
+EBUILD quake1-data-2.40.ebuild 2092 RMD160 f3e8643003038546d414d4c7639a67085c934ff7 SHA1 38c3b2b38009ef5813296d8384a6d144ee3ceec5 SHA256 25045230d6a986d9262beea5d6627f2c43e4a01efd1895a6af5fdb77566ac502
+MD5 2d8725ed53f43a9f011839300fb15597 quake1-data-2.40.ebuild 2092
+RMD160 f3e8643003038546d414d4c7639a67085c934ff7 quake1-data-2.40.ebuild 2092
+SHA256 25045230d6a986d9262beea5d6627f2c43e4a01efd1895a6af5fdb77566ac502 quake1-data-2.40.ebuild 2092
+MISC ChangeLog 1159 RMD160 432446b8309e1a7bac7ce9be58b5d31cb39fd6f3 SHA1 684256f34a8f1c74f1f08799e6c77b5b8ebfc31b SHA256 f93ac111d22e447c72635e3bbceb3f0cd0b74705b5b1cdd1551e4b8bf8488745
+MD5 4c7d75ff77baaab36a983b453d0a98c1 ChangeLog 1159
+RMD160 432446b8309e1a7bac7ce9be58b5d31cb39fd6f3 ChangeLog 1159
+SHA256 f93ac111d22e447c72635e3bbceb3f0cd0b74705b5b1cdd1551e4b8bf8488745 ChangeLog 1159
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea metadata.xml 158
@@ -19,7 +19,7 @@ SHA256 01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.4 (GNU/Linux)
 
-iD8DBQFE2+xIamhnQswr0vIRAg6qAKCtTYgi/nFe2thasRTKwatQKDU/LgCfck7b
-vkDl2I10xT636/1Z0G24Ik8=
-=lJU4
+iD8DBQFE2+3WamhnQswr0vIRAuY7AJ421VJBwf04mMrci5P5LTDhfdjuLwCePXhJ
+DrgUThjrySVBqeOFjS/BHIo=
+=A4pU
 -----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 929d8bcd67a6..32d42b4dc9d3 100644
--- a/games-fps/quake1-data/quake1-data-2.40.ebuild
+++ b/games-fps/quake1-data/quake1-data-2.40.ebuild
@@ -1,6 +1,11 @@
 # Copyright 1999-2006 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.10 2006/08/11 02:32:10 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/quake1-data/quake1-data-2.40.ebuild,v 1.11 2006/08/11 02:38:47 vapier Exp $
+
+# TODO: if installing off of the 1.01 cd, need to fetch the
+#       quake shareware and use that pak0
+# http://linux.omnipotent.net/article.php?article_id=11287
+# ftp://ftp.cdrom.com/pub/idgames/idstuff/quake/quake106.zip
 
 inherit eutils games
 
@@ -27,17 +32,20 @@ pkg_setup() {
 		die "Unmerge games-fps/quake1-demodata to remove the conflict"
 	fi
 
-	export CDROM_NAME_SET=("Existing Install" "Quake CD" "Ultimate Quake Collection")
-	cdrom_get_cds id1:q101_int.1:Setup/ID1
+	export CDROM_NAME_SET=("Existing Install" "Quake CD (1.01)" "Ultimate Quake Collection" "Quake CD (newer)")
+	cdrom_get_cds id1:q101_int.1:Setup/ID1:resource.1
 }
 
 src_unpack() {
-	echo ">>> Unpacking q101_int to ${PWD}"
 	if [[ ${CDROM_SET} == "1" ]] ; then
+		echo ">>> Unpacking q101_int.lha to ${PWD}"
 		cat "${CDROM_ROOT}"/q101_int.1 "${CDROM_ROOT}"/q101_int.2 > \
 			"${S}"/q101_int.exe
 		lha xqf "${S}"/q101_int.exe || die "failure unpacking q101_int.exe"
 		rm -f q101_int.exe
+	elif [[ ${CDROM_SET} == "3" ]] ; then
+		echo ">>> Unpacking resource.1 to ${PWD}"
+		lha xqf "${CDROM_ROOT}"/resource.1 || die "failure unpacking resource.1"
 	fi
 }
 
@@ -50,7 +58,7 @@ src_install() {
 		1)  doins id1/* || die "doins pak files"
 		    dodoc *.txt
 		    ;;
-		2)  newins "${CDROM_ROOT}"/Setup/ID1/PAK0.PAK pak0.pak \
+		2|3)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"