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, 40 insertions, 21 deletions

diff --git a/games-fps/tribes2/ChangeLog b/games-fps/tribes2/ChangeLog
index ae90c614a64e..75353d314d57 100644
--- a/games-fps/tribes2/ChangeLog
+++ b/games-fps/tribes2/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-fps/tribes2
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/tribes2/ChangeLog,v 1.13 2006/04/13 21:13:57 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/tribes2/ChangeLog,v 1.14 2006/10/24 22:56:55 wolf31o2 Exp $
+
+  24 Oct 2006; Chris Gianelloni <wolf31o2@gentoo.org> tribes2-25034.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> tribes2-25034.ebuild:
   Moved games_pkg_setup to the beginning of pkg_setup.
diff --git a/games-fps/tribes2/Manifest b/games-fps/tribes2/Manifest
index fa24c030b795..b322450b386f 100644
--- a/games-fps/tribes2/Manifest
+++ b/games-fps/tribes2/Manifest
@@ -1,12 +1,26 @@
-MD5 5191a5fb277f06d60d4473d70a1f556c ChangeLog 1864
-RMD160 b5e37dd629355ad73539e581c6324b000601dcdf ChangeLog 1864
-SHA256 d3c56297991efe68e28cfaf7715852373daae243e5d393ce616631583193c1d3 ChangeLog 1864
-MD5 e233aa911d31f0d4ff66f8d5c95d898b files/digest-tribes2-25034 74
-RMD160 6b1fc0c9e4127ae3d6cd4f05b91ea77e4f6c21b8 files/digest-tribes2-25034 74
-SHA256 90e4be231522dcb33749fa0feda98952f1b2747b0b9bc54143156466bab7413b files/digest-tribes2-25034 74
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+DIST tribes2-25034-cdrom-x86.run 95560158
+EBUILD tribes2-25034.ebuild 2142 RMD160 0aa75c37a0dd2c512e1260b9f517f859bc8524d6 SHA1 215bd966b69cf11a93ae39831a648672bbae0af3 SHA256 5650da1e26f949f54f914a0df11261f669ebd5d30029969e6855f3b7d09a6f2e
+MD5 86229c658914b53d9da352e6d0057fdd tribes2-25034.ebuild 2142
+RMD160 0aa75c37a0dd2c512e1260b9f517f859bc8524d6 tribes2-25034.ebuild 2142
+SHA256 5650da1e26f949f54f914a0df11261f669ebd5d30029969e6855f3b7d09a6f2e tribes2-25034.ebuild 2142
+MISC ChangeLog 2078 RMD160 3792c17ecbb07a2d3a3441d2fc51d321f4ddd2ef SHA1 b974016708f6acff08704a732d88085b98d2bf1b SHA256 3485c580f7bc3c69f153fba259bec1c5b819296a585d81ad0c9fe44b184b135d
+MD5 968a64c6507d565d30fd85b740a6ff11 ChangeLog 2078
+RMD160 3792c17ecbb07a2d3a3441d2fc51d321f4ddd2ef ChangeLog 2078
+SHA256 3485c580f7bc3c69f153fba259bec1c5b819296a585d81ad0c9fe44b184b135d ChangeLog 2078
+MISC metadata.xml 254 RMD160 877a1dc36df2be58926bc51041093feafdefe429 SHA1 45f0334cd127c4a1b4ece41f7098ab70046e378a SHA256 2916aab684ec3908fffb515065eeb2c481cde563380b682646add582bed5f535
 MD5 11a7e1491b1ac042ac7216b26b4ad1fb metadata.xml 254
 RMD160 877a1dc36df2be58926bc51041093feafdefe429 metadata.xml 254
 SHA256 2916aab684ec3908fffb515065eeb2c481cde563380b682646add582bed5f535 metadata.xml 254
-MD5 4b367151e47e28a010901e6b4f125de2 tribes2-25034.ebuild 2105
-RMD160 23c79c40d57ecf9b92ec3b9dae5e4ef3d4baf515 tribes2-25034.ebuild 2105
-SHA256 9c5be72b1e47673eb1246916ab69a58287a54159fa4dc072b6664ed3cb3a6460 tribes2-25034.ebuild 2105
+MD5 e233aa911d31f0d4ff66f8d5c95d898b files/digest-tribes2-25034 74
+RMD160 6b1fc0c9e4127ae3d6cd4f05b91ea77e4f6c21b8 files/digest-tribes2-25034 74
+SHA256 90e4be231522dcb33749fa0feda98952f1b2747b0b9bc54143156466bab7413b files/digest-tribes2-25034 74
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.5 (GNU/Linux)
+
+iD8DBQFFPppQkT4lNIS36YERAmU2AJ9T1+e/9FnIrelU36LM2iOT8So22gCfQWup
+1hLzZsR81PTP28l9WRP4t8E=
+=PeI9
+-----END PGP SIGNATURE-----
diff --git a/games-fps/tribes2/tribes2-25034.ebuild b/games-fps/tribes2/tribes2-25034.ebuild
index cbabac1b785a..bd1ba414fbcc 100644
--- a/games-fps/tribes2/tribes2-25034.ebuild
+++ b/games-fps/tribes2/tribes2-25034.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-fps/tribes2/tribes2-25034.ebuild,v 1.13 2006/04/13 21:13:57 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/tribes2/tribes2-25034.ebuild,v 1.14 2006/10/24 22:56:55 wolf31o2 Exp $
 
 inherit eutils games
 
@@ -29,35 +29,36 @@ Ddir=${D}/${dir}
 pkg_setup() {
 	games_pkg_setup
 	ewarn "The installed game takes about 507MB of space!"
-	cdrom_get_cds README.tribes2d
 }
 
 src_unpack() {
-	unpack_makeself || die "unpacking patch"
+	cdrom_get_cds README.tribes2d
+	unpack_makeself
 }
 
 src_install() {
-	dodir ${dir}
 	einfo "Copying files... this may take a while..."
-	exeinto ${dir}
+	exeinto "${dir}"
 	doexe ${CDROM_ROOT}/bin/x86/glibc-2.1/{t2launch,tribes2,tribes2.dynamic,tribes2d,tribes2d-restart.sh,tribes2d.dynamic} || die "doexe failed"
 
-	cp ${CDROM_ROOT}/{README,README.tribes2d,Tribes2_Manual.pdf,console_start.cs,kver.pub} ${Ddir} || die "copy failed"
+	insinto "${dir}"
+	doins ${CDROM_ROOT}/{README,README.tribes2d,Tribes2_Manual.pdf,console_start.cs,kver.pub} ${Ddir} || die "copy failed"
 
 	# Video card profiles
-	tar xzf ${CDROM_ROOT}/profiles.tar.gz -C ${Ddir} || die "uncompressing profiles"
+	# TODO: move this to src_unpack where it belongs.
+	tar xzf ${CDROM_ROOT}/profiles.tar.gz -C "${Ddir}" || die "uncompressing profiles"
 
 	# Base (Music, Textures, Maps, etc.)
-	cp -rf ${CDROM_ROOT}/base ${CDROM_ROOT}/menu ${Ddir} || die "copying data"
+	doins -r ${CDROM_ROOT}/base ${CDROM_ROOT}/menu || die "copying data"
 
-	cd ${S}
+	cd "${S}"
 	loki_patch --verify patch.dat
-	loki_patch patch.dat ${Ddir} >& /dev/null || die "patching"
+	loki_patch patch.dat "${Ddir}" >& /dev/null || die "patching"
 
 	# now, since these files are coming off a cd, the times/sizes/md5sums wont
 	# be different ... that means portage will try to unmerge some files (!)
 	# we run touch on ${D} so as to make sure portage doesnt do any such thing
-	find ${Ddir} -exec touch '{}' \;
+	find "${Ddir}" -exec touch '{}' \;
 
 	newicon ${CDROM_ROOT}/icon.xpm tribes2.xpm
 	games_make_wrapper t2launch ./t2launch "${dir}" "${dir}"