Add support for the quake4 bonus dvd #111046 by Sonny.

Package-Manager: portage-2.0.53_rc6

3 files changed, 36 insertions, 27 deletions

diff --git a/games-fps/quake2-data/ChangeLog b/games-fps/quake2-data/ChangeLog
index fc733091e842..05a068dfab87 100644
--- a/games-fps/quake2-data/ChangeLog
+++ b/games-fps/quake2-data/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for games-fps/quake2-data
-# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/quake2-data/ChangeLog,v 1.6 2005/09/26 18:10:14 wolf31o2 Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-fps/quake2-data/ChangeLog,v 1.7 2005/10/31 23:03:45 vapier Exp $
+
+  31 Oct 2005; Mike Frysinger <vapier@gentoo.org> quake2-data-3.20.ebuild:
+  Add support for the quake4 bonus dvd #111046 by Sonny.
 
   26 Sep 2005; Chris Gianelloni <wolf31o2@gentoo.org>
   quake2-data-3.20.ebuild:
diff --git a/games-fps/quake2-data/Manifest b/games-fps/quake2-data/Manifest
index 5d6f70e1344f..f04e88e2cee9 100644
--- a/games-fps/quake2-data/Manifest
+++ b/games-fps/quake2-data/Manifest
@@ -1,14 +1,14 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 6bfb228dabf031440e898ac46f5c9967 ChangeLog 828
+MD5 2eaa8e16c4fc1b66661df6f583fdea1a ChangeLog 959
 MD5 ac38ac21c5b1dd48241c3d7da6065bd7 files/digest-quake2-data-3.20 71
 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
-MD5 9e2825866cd5b266490a8f4c6e0ce723 quake2-data-3.20.ebuild 1612
+MD5 b4326c40e7f36983be6c720a6d6eeb47 quake2-data-3.20.ebuild 1800
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFDZFoOgIKl8Uu19MoRAsaAAJ94uHqJ3ncHfCnYrRvYJjy3h7QDSQCeNJKA
-a4VCA3bnUKPa0viVCsrxPBE=
-=xeKV
+iD8DBQFDZqLxgIKl8Uu19MoRAmHtAJ473jVELAAHJmEOLZfwi63/gwMnuQCfcdEB
+joPztgBiIvvm8zfF5lkKyfA=
+=+Lwp
 -----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 2895730c1565..49b4daca8b63 100644
--- 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.14 2005/10/30 05:28:23 vapier Exp $
+# $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 $
 
 inherit eutils games
 
@@ -19,39 +19,45 @@ RDEPEND=""
 S=${WORKDIR}
 
 pkg_setup() {
-	cdrom_get_cds Install
-	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
-		export CDROM_ROOT=${CDROM_ROOT}
-		einfo "Source is an installed copy"
-	else
-		die "Could not determine what ${CDROM_ROOT} points at"
-	fi
-
+	export CDROM_SET_NAMES=("Existing Install" "Quake2 CD" "Quake4 Bonus DVD")
+	cdrom_get_cds baseq2:Install:Movies
 	games_pkg_setup
 }
 
+src_unpack() {
+	# The .exe is just a self-extracting .zip
+	echo ">>> Unpacking ${A} to ${PWD}"
+	unzip -qo "${DISTDIR}/${A}" || die "Failed to unpack ${A}"
+}
+
 src_install() {
 	dodoc DOCS/* 3.20_Changes.txt
 	newdoc ctf/readme.txt ctf-readme.txt
-	dohtml -r "${CDROM_ROOT}"/DOCS/quake2_manual/*
+	case ${CDROM_SET} in
+		0|1) dohtml -r "${CDROM_ROOT}"/DOCS/quake2_manual/* ;;
+		2)   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;;
+	esac
 
-	dodir ${GAMES_DATADIR}/${PN}/baseq2
+	dodir ${GAMES_DATADIR}/quake2/baseq2
 
 	if use videos ; then
-		insinto ${GAMES_DATADIR}/${PN}/baseq2/video
-		doins "${CDROM_ROOT}"/baseq2/video/*
+		insinto ${GAMES_DATADIR}/quake2/baseq2/video
+		doins "${baseq2_cdpath}"/video/* || die "doins videos"
 	fi
 
-	insinto ${GAMES_DATADIR}/${PN}/baseq2
-	doins "${CDROM_ROOT}"/baseq2/pak0.pak || die "couldnt grab pak0.pak"
+	insinto ${GAMES_DATADIR}/quake2/baseq2
+	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}"/${PN}/baseq2/ || die "couldnt grab player models"
+	cp -R baseq2/players "${D}/${GAMES_DATADIR}"/quake2/baseq2/ || die "couldnt grab player models"
 
-	insinto "${GAMES_DATADIR}"/${PN}/ctf
+	insinto "${GAMES_DATADIR}"/quake2/ctf
 	doins ctf/*.{cfg,ico,pak} || die "couldnt grab ctf"
 
 	prepgamesdirs