Unpack CD data to T instead of D. Closing bug #131102.

Package-Manager: portage-2.1.1_pre1-r2

3 files changed, 31 insertions, 17 deletions

diff --git a/games-fps/soldieroffortune/ChangeLog b/games-fps/soldieroffortune/ChangeLog
index 8330810a6099..897f996caf68 100644
--- a/games-fps/soldieroffortune/ChangeLog
+++ b/games-fps/soldieroffortune/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-fps/soldieroffortune
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/soldieroffortune/ChangeLog,v 1.15 2006/05/15 19:59:10 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/soldieroffortune/ChangeLog,v 1.16 2006/06/28 14:31:05 wolf31o2 Exp $
+
+  28 Jun 2006; Chris Gianelloni <wolf31o2@gentoo.org>
+  soldieroffortune-1.06a.ebuild:
+  Unpack CD data to T instead of D.  Closing bug #131102.
 
   15 May 2006; Chris Gianelloni <wolf31o2@gentoo.org>
   soldieroffortune-1.06a.ebuild:
diff --git a/games-fps/soldieroffortune/Manifest b/games-fps/soldieroffortune/Manifest
index 2ce58166ad41..05ae5ffb160e 100644
--- a/games-fps/soldieroffortune/Manifest
+++ b/games-fps/soldieroffortune/Manifest
@@ -1,16 +1,26 @@
-DIST sof-1.06a-cdrom-x86.run 22928437 size 22928437
-EBUILD soldieroffortune-1.06a.ebuild 2152 RMD160 c77db3c30bd3365f0b6735f5be509a0a83e74100 SHA1 593ff011801a6220703abfda2775725e7cc820ad SHA256 dc6ce869c0bc7edf06f31c3370d4e370175583219bd0899cda9a2d9e616f469e size 2152
-MD5 3f1e928f3bb1ce57ea5ba50a81ff6652 soldieroffortune-1.06a.ebuild 2152
-RMD160 c77db3c30bd3365f0b6735f5be509a0a83e74100 soldieroffortune-1.06a.ebuild 2152
-SHA256 dc6ce869c0bc7edf06f31c3370d4e370175583219bd0899cda9a2d9e616f469e soldieroffortune-1.06a.ebuild 2152
-MISC ChangeLog 2125 RMD160 bedf7ea0db59427c902fa58ddec6aeedd395cb2a SHA1 2c1ef2fc308bdda893cfbe484e589ed11a78057c SHA256 9b2d39423ee51770c7fe756dd1791e8b94637dbb1fdb250dc9964587411a98b6 size 2125
-MD5 c8073ea46c15d8e0186734efe4afe195 ChangeLog 2125
-RMD160 bedf7ea0db59427c902fa58ddec6aeedd395cb2a ChangeLog 2125
-SHA256 9b2d39423ee51770c7fe756dd1791e8b94637dbb1fdb250dc9964587411a98b6 ChangeLog 2125
-MISC metadata.xml 968 RMD160 8a462613ef25275be4aa93ab9519c2257efb1dea SHA1 4b9fac9504380047fafa29ca5739aad7517cc5c4 SHA256 568ea1d121306b19903c4f5e7dc1407ac36a0cf932cc13245f7f908e29e035e0 size 968
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+DIST sof-1.06a-cdrom-x86.run 22928437
+EBUILD soldieroffortune-1.06a.ebuild 2199 RMD160 30058772a83d99eb498e9cba55377e7eaebbb918 SHA1 a4bc34c605fb9017df7363d8a7051e09b8db04c8 SHA256 9891e609a1bbc1c6fb0c13b7679ddaebd7e635c0045269b6adfd7d80f98ad127
+MD5 4ee5762c710f44c0b799bb526743e961 soldieroffortune-1.06a.ebuild 2199
+RMD160 30058772a83d99eb498e9cba55377e7eaebbb918 soldieroffortune-1.06a.ebuild 2199
+SHA256 9891e609a1bbc1c6fb0c13b7679ddaebd7e635c0045269b6adfd7d80f98ad127 soldieroffortune-1.06a.ebuild 2199
+MISC ChangeLog 2271 RMD160 5a3bcecab08ad0a8616ff19f47c118cd2f98db12 SHA1 b8c133c0b749deee037f3e179a23fdd4d4721367 SHA256 f5e951155e7c0ee9dfabf977f96093d0174027be7e1b3ac822064fe1577d380e
+MD5 fc92466ca0d6faafeb10085e62f8584e ChangeLog 2271
+RMD160 5a3bcecab08ad0a8616ff19f47c118cd2f98db12 ChangeLog 2271
+SHA256 f5e951155e7c0ee9dfabf977f96093d0174027be7e1b3ac822064fe1577d380e ChangeLog 2271
+MISC metadata.xml 968 RMD160 8a462613ef25275be4aa93ab9519c2257efb1dea SHA1 4b9fac9504380047fafa29ca5739aad7517cc5c4 SHA256 568ea1d121306b19903c4f5e7dc1407ac36a0cf932cc13245f7f908e29e035e0
 MD5 e055f0cedd35a8ca9240ec727e52acf2 metadata.xml 968
 RMD160 8a462613ef25275be4aa93ab9519c2257efb1dea metadata.xml 968
 SHA256 568ea1d121306b19903c4f5e7dc1407ac36a0cf932cc13245f7f908e29e035e0 metadata.xml 968
 MD5 428261b94ec1355a846a1797056c894c files/digest-soldieroffortune-1.06a 70
 RMD160 74306ff7c19f2ad60e403e1279b5be1a5dfd016d files/digest-soldieroffortune-1.06a 70
 SHA256 15bc1ccb18c5b220c465772f778a3449784eeac57b95e0a39ff9fafb57d45cc7 files/digest-soldieroffortune-1.06a 70
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.3 (GNU/Linux)
+
+iD8DBQFEopK1kT4lNIS36YERAlDvAJ9P5dy1QYOmAHnyNmw9qLEGwpWEWACfVNXG
++TM3un0yWIeXEBzFZaSu6IU=
+=LmH4
+-----END PGP SIGNATURE-----
diff --git a/games-fps/soldieroffortune/soldieroffortune-1.06a.ebuild b/games-fps/soldieroffortune/soldieroffortune-1.06a.ebuild
index a5a464f22b89..0255b5631e47 100644
--- a/games-fps/soldieroffortune/soldieroffortune-1.06a.ebuild
+++ b/games-fps/soldieroffortune/soldieroffortune-1.06a.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/soldieroffortune/soldieroffortune-1.06a.ebuild,v 1.16 2006/05/15 19:59:10 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/soldieroffortune/soldieroffortune-1.06a.ebuild,v 1.17 2006/06/28 14:31:05 wolf31o2 Exp $
 
 inherit eutils games
 
@@ -48,10 +48,9 @@ pkg_setup() {
 
 src_unpack() {
 	unpack_makeself
-	dodir ${dir}
-	tar xzf ${CDROM_ROOT}/paks.tar.gz -C ${Ddir} \
+	tar xzf ${CDROM_ROOT}/paks.tar.gz -C ${T} \
 		|| die "uncompressing data"
-	tar xzf ${CDROM_ROOT}/binaries.tar.gz -C ${Ddir} \
+	tar xzf ${CDROM_ROOT}/binaries.tar.gz -C ${T} \
 		|| die "uncompressing binaries"
 }
 
@@ -59,9 +58,10 @@ src_install() {
 	dodir ${dir}
 	einfo "Copying files... this may take a while..."
 	exeinto ${dir}
-	doexe ${CDROM_ROOT}/bin/x86/glibc-2.1/sof
+	doexe ${CDROM_ROOT}/bin/x86/glibc-2.1/sof || die "doexe"
 	insinto ${dir}
-	doins ${CDROM_ROOT}/{README,kver.pub,sof.xpm}
+	doins -r ${T}/* || die "doins data"
+	doins ${CDROM_ROOT}/{README,kver.pub,sof.xpm} || die "doins"
 
 	cd ${S}
 	loki_patch --verify patch.dat