Moved cdrom_get_cds to src_unpack since binary packages don't require the original media to install as well as some general cleanup.

Package-Manager: portage-2.1.2_pre3-r5

3 files changed, 45 insertions, 31 deletions

diff --git a/games-action/d2x/ChangeLog b/games-action/d2x/ChangeLog
index 2902cf11f24b..fde8aa8bea60 100644
--- a/games-action/d2x/ChangeLog
+++ b/games-action/d2x/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-action/d2x
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-action/d2x/ChangeLog,v 1.15 2006/04/13 19:43:16 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-action/d2x/ChangeLog,v 1.16 2006/10/24 22:31:42 wolf31o2 Exp $
+
+  24 Oct 2006; Chris Gianelloni <wolf31o2@gentoo.org> d2x-0.2.5-r2.ebuild:
+  Moved cdrom_get_cds to src_unpack since binary packages don't require the
+  original media to install as well as some general cleanup.
 
   13 Apr 2006; Chris Gianelloni <wolf31o2@gentoo.org> -d2x-0.2.5-r1.ebuild:
   Removing old ebuild.
diff --git a/games-action/d2x/Manifest b/games-action/d2x/Manifest
index 4a9bf9f0cd2d..0154772526ab 100644
--- a/games-action/d2x/Manifest
+++ b/games-action/d2x/Manifest
@@ -1,18 +1,35 @@
-MD5 7a953e44101e88799e28f743a59653a1 ChangeLog 1978
-RMD160 917d2d03eff0e6d18d7002b0dce024cdc611fd6b ChangeLog 1978
-SHA256 8da4c314ce05099cb981a7fd7edd3feb3ae82433d2f3dece4a5ead4a1fbda7f3 ChangeLog 1978
-MD5 76f71e55705f7da2bd6805bf0425c225 d2x-0.2.5-r2.ebuild 2695
-RMD160 995887278f4f3039bf1a810c99d6a53eb8fb3134 d2x-0.2.5-r2.ebuild 2695
-SHA256 2799a45da8ba811a71d2b4feeb4256cfa4abd9f668a88f26f705e269872367bd d2x-0.2.5-r2.ebuild 2695
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX 0.2.5-shellscripts.patch 747 RMD160 ef943a17656e7467f88360a9e53eff07ef1384c8 SHA1 f137924772a4be33e12483c274f61f5d2640ea40 SHA256 f9ef51252aa0c1641df8949a016609c8e5a38de8143efb3a04757f395148de5f
 MD5 499b24f4949333a0c04d1177aa3213e5 files/0.2.5-shellscripts.patch 747
 RMD160 ef943a17656e7467f88360a9e53eff07ef1384c8 files/0.2.5-shellscripts.patch 747
 SHA256 f9ef51252aa0c1641df8949a016609c8e5a38de8143efb3a04757f395148de5f files/0.2.5-shellscripts.patch 747
+AUX d2x-0.2.5-dofpcalcs-macro.patch 584 RMD160 30b0226da26b07aac6bca853431dd83c7f1d3468 SHA1 de16899310ebdd5f4c7760aa5f8dba5fc72f533b SHA256 4e6354b18218eb19699d2ba4698f50715056338ebad37b8ad16f17e27e543672
 MD5 db543dff86446ad7eec4b3d2f633106b files/d2x-0.2.5-dofpcalcs-macro.patch 584
 RMD160 30b0226da26b07aac6bca853431dd83c7f1d3468 files/d2x-0.2.5-dofpcalcs-macro.patch 584
 SHA256 4e6354b18218eb19699d2ba4698f50715056338ebad37b8ad16f17e27e543672 files/d2x-0.2.5-dofpcalcs-macro.patch 584
-MD5 b298d324cbce31e8cc4779c765fabc4d files/digest-d2x-0.2.5-r2 123
-RMD160 016e20058e959d5ac76dd0fc008f8da86704a8d0 files/digest-d2x-0.2.5-r2 123
-SHA256 83642c33b5d2eec3a741547c01feef7e7028aa861c846c956a62f3b4cf5c581b files/digest-d2x-0.2.5-r2 123
+DIST d2shar10.tar.gz 4311406
+DIST d2x-0.2.5.tar.gz 2015249
+EBUILD d2x-0.2.5-r2.ebuild 2656 RMD160 737794240fc7552ec1c85cebebf97cc4cacaa613 SHA1 72d0c58ee90b904dbc9c15f5a8d0ea59854d7269 SHA256 f3bb7c4218b6b65877ff88fcfb1969823aa272ade3cc40ac42584686623d7eb6
+MD5 9005642b5f693481289a4299bc88d7b3 d2x-0.2.5-r2.ebuild 2656
+RMD160 737794240fc7552ec1c85cebebf97cc4cacaa613 d2x-0.2.5-r2.ebuild 2656
+SHA256 f3bb7c4218b6b65877ff88fcfb1969823aa272ade3cc40ac42584686623d7eb6 d2x-0.2.5-r2.ebuild 2656
+MISC ChangeLog 2191 RMD160 df691072fa48eeaa2f3736fc8687ef9b3a5ee613 SHA1 6f54035fdd82aedec1c981adc904f5104a100a33 SHA256 f99da7c1f9622096426ea5c6c8592b4c4ab0b7d984d3aa68e7ad3fe50dc8eebd
+MD5 e46967f3bc7755e5eec874855cc20030 ChangeLog 2191
+RMD160 df691072fa48eeaa2f3736fc8687ef9b3a5ee613 ChangeLog 2191
+SHA256 f99da7c1f9622096426ea5c6c8592b4c4ab0b7d984d3aa68e7ad3fe50dc8eebd ChangeLog 2191
+MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea metadata.xml 158
 SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 metadata.xml 158
+MD5 b298d324cbce31e8cc4779c765fabc4d files/digest-d2x-0.2.5-r2 123
+RMD160 016e20058e959d5ac76dd0fc008f8da86704a8d0 files/digest-d2x-0.2.5-r2 123
+SHA256 83642c33b5d2eec3a741547c01feef7e7028aa861c846c956a62f3b4cf5c581b files/digest-d2x-0.2.5-r2 123
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.5 (GNU/Linux)
+
+iD8DBQFFPpRnkT4lNIS36YERAvr6AJ9E9y37INfM2QbnfbeFsWPv5veYPgCfbMQA
+c1D4mNmISr/OnJ3/l6eeqH8=
+=eoJE
+-----END PGP SIGNATURE-----
diff --git a/games-action/d2x/d2x-0.2.5-r2.ebuild b/games-action/d2x/d2x-0.2.5-r2.ebuild
index 7e642b4d5481..72b02560c14f 100644
--- a/games-action/d2x/d2x-0.2.5-r2.ebuild
+++ b/games-action/d2x/d2x-0.2.5-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-action/d2x/d2x-0.2.5-r2.ebuild,v 1.4 2006/01/03 20:53:25 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-action/d2x/d2x-0.2.5-r2.ebuild,v 1.5 2006/10/24 22:31:42 wolf31o2 Exp $
 
 inherit flag-o-matic eutils games
 
@@ -24,36 +24,29 @@ RDEPEND="media-libs/libsdl
 DEPEND="${RDEPEND}
 	x86? ( dev-lang/nasm )"
 
-pkg_setup() {
-	games_pkg_setup
-
+src_unpack() {
+	unpack ${A}
 	if use cdinstall ; then
-		if [[ ! -e ${DISTDIR}/descent2.sow ]] ; then
+		if [[ ! -e "${DISTDIR}"/descent2.sow ]] ; then
 			cdrom_get_cds d2data
 			if [ -e ${CDROM_ROOT}/d2data/descent2.sow ] ; then
 				export CDROM_ROOT=${CDROM_ROOT}/d2data
 				einfo "Found the original Descent2 CD"
 				einfo "Copying descent2.sow to ${DISTDIR}"
-				cp ${CDROM_ROOT}/descent2.sow ${DISTDIR}/descent2.sow
+				cp ${CDROM_ROOT}/descent2.sow "${DISTDIR}"/descent2.sow
 			else
 				die "You need the original Descent2 CD"
 			fi
 		fi
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	if use cdinstall ; then
-		cd ${WORKDIR}
+		cd "${WORKDIR}"
 		mkdir SOW
 		cd SOW
-		unarj e ${DISTDIR}/descent2.sow
+		unarj e "${DISTDIR}"/descent2.sow
 	fi
 	rm *.{exe,bat}
-	cd ${S}
-	epatch ${FILESDIR}/${PV}-shellscripts.patch
-	epatch ${FILESDIR}/${P}-dofpcalcs-macro.patch
+	cd "${S}"
+	epatch "${FILESDIR}"/${PV}-shellscripts.patch
+	epatch "${FILESDIR}"/${P}-dofpcalcs-macro.patch
 }
 
 src_compile() {
@@ -87,13 +80,13 @@ src_compile() {
 }
 
 src_install() {
-	make install DESTDIR=${D} || die
+	make install DESTDIR="${D}" || die
 	dogamesbin my-bins/*
-	dodir ${GAMES_DATADIR}/${PN}
+	dodir "${GAMES_DATADIR}"/${PN}
 	if use cdinstall ; then
-		cp -r ${WORKDIR}/SOW/* ${D}/${GAMES_DATADIR}/${PN}/
+		cp -r "${WORKDIR}"/SOW/* "${D}/${GAMES_DATADIR}"/${PN}/
 	else
-		cp -r ${WORKDIR}/${DATAFILE}/* ${D}/${GAMES_DATADIR}/${PN}/
+		cp -r "${WORKDIR}"/${DATAFILE}/* "${D}/${GAMES_DATADIR}"/${PN}/
 	fi
 	dodoc AUTHORS ChangeLog NEWS README* TODO readme.txt
 	prepgamesdirs