fix unpacking and sed with patch from Robert Cernansky (bug #539200)

Package-Manager: portage-2.2.14/cvs/Linux x86_64

diff --git a/games-fps/soldieroffortune/ChangeLog b/games-fps/soldieroffortune/ChangeLog
index 645189604dac4a2dcfed14490f61d224dbccd28a..9d995f435453899a77bf2635a35741f6856a7125 100644 (file)
--- a/games-fps/soldieroffortune/ChangeLog
+++ b/games-fps/soldieroffortune/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-fps/soldieroffortune
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/soldieroffortune/ChangeLog,v 1.33 2015/02/05 03:19:28 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/soldieroffortune/ChangeLog,v 1.34 2015/02/08 07:41:43 mr_bones_ Exp $
+
+  08 Feb 2015; Michael Sterrett <mr_bones_@gentoo.org>
+  soldieroffortune-1.06a-r1.ebuild:
+  fix unpacking and sed with patch from Robert Cernansky (bug #539200)
 
   05 Feb 2015; Michael Sterrett <mr_bones_@gentoo.org>
   -soldieroffortune-1.06a.ebuild, soldieroffortune-1.06a-r1.ebuild:

diff --git a/games-fps/soldieroffortune/Manifest b/games-fps/soldieroffortune/Manifest
index 6de37892d4edd6838ea8e50fb92bd910eb128079..76fd21eb033c81fad2993e3125bd516ed05b363d 100644 (file)
--- a/games-fps/soldieroffortune/Manifest
+++ b/games-fps/soldieroffortune/Manifest
@@ -1,4 +1,4 @@
 DIST sof-1.06a-cdrom-x86.run 22928437 SHA256 44546073f26a610ec554f3d197e157a6691c0891651689308e62feccc01a1c16 SHA512 91ef3953bd6b6630ab602f64d15a3056f85d90139b18aa3eb9a9a0a75db2ece61ef683ddf1d03b63f0dfc902d7a27914ae673398713941f281e96555d9645078 WHIRLPOOL 986d4f7a5115203fec37ebb187c80e27ff4f986b19157afd42179af9f032b20bf305352cc4a3efe38a0b181ac8d3dcb8c98399fdf3b370b076cbe7615c4cd4d0
-EBUILD soldieroffortune-1.06a-r1.ebuild 2361 SHA256 7d7569a190d2283b991f76c5cedeb1b8be26d50d4a99f922dbe11c98af0467a7 SHA512 a0531bacde7a265f7d1561bdf997a00a72f0241de3f087ef456a4f6f33700d89822fe0ddd2f9669b8d477509cda82cf9c262f27d1f0df025435b0c83b17c945e WHIRLPOOL 50a4016ec1439d1517c259bf761e524d85eef8b6d8765d68ef38a41f805d84f93feeaf99ea8774827b2e2f85835bc108d4cdd3303dd62a68767e01746fcda19d
-MISC ChangeLog 4927 SHA256 f892f867ff390476d9382a65aba5daf304bff4785a5143a832de81ab2ff0475c SHA512 b037428161ed7afe9f4567f28b0dd635a6456d05ed8d4816e3dc9663b9be03f36291a42c40859fe8e0cf1034e685bff6000ebf0326b472ee2360d7f1f63ec523 WHIRLPOOL 1e48cf374767aaa3ccf901c8b5748180ded2a94df6906ec30e3fa27e520589468174216ede98316a0925b8b962b29743a0cdca9389272d16a32c78f721b91c30
+EBUILD soldieroffortune-1.06a-r1.ebuild 2432 SHA256 f2e3a907e8a490d5d884d12f59946f292e2f9823147b0de3e0a6749ec61a409f SHA512 979e2c8e9f5c888333d2b0da19d259ff0d119d7d5164b5f3819614bd78bc4e74a5f3cf259c8819aa250f5048ec4449b51b4bc5aac0cbc2d302178f24eae8109a WHIRLPOOL eff38119325d7e37d1a28323befc5c9aff8953322e2eed161d8787ff5fc76ba67eacd96b0d71159e790af0b21dc68e688eaa2d4d3b09c2a030fec80424b6d247
+MISC ChangeLog 5090 SHA256 b3b694335d842ec6ee2440e7237824ba6c87987f496d7c63632a6527de074881 SHA512 ecfb35500cac5c2313841df055889a0732100d83dbed65694354c42cea9f67e5fe099e9dbac72cc0e81fe8c69da4f5fc3b9538b339640c1143628c5d11e89f08 WHIRLPOOL deba91880bd05424149ecee84c1c93edfa82a86b9ac0418590f3bf97fe2a08ec4a14f1d85e4c10c01e26a6777a235e51f1a930ba9ff22c7ca030dcadd45461ab
 MISC metadata.xml 872 SHA256 96d85f872c5b4e35c415d883c79d042798f140ba5192135778a7292e96cd7b2b SHA512 48412f429a957e58074a7cac61efc7e3185419556279f94ff1364a82d48595159ca74665870af6f08b016383d1aa2366a41d33bf0ffcab3a63246061869c825c WHIRLPOOL 78905be5e4292ccd6bd729999763c9215b15b84f0d0a8c90b8cdb0fdff26586d14e6e8c27a2576762f64aa920469fa6dcd9e28a3e96791ad8f65e1d11c1a3fd5

diff --git a/games-fps/soldieroffortune/soldieroffortune-1.06a-r1.ebuild b/games-fps/soldieroffortune/soldieroffortune-1.06a-r1.ebuild
index 01560afbc504abda289376fc06868509fc716f0f..8964b30f25e97dc042894993d4c5d3d9784c96af 100644 (file)
--- a/games-fps/soldieroffortune/soldieroffortune-1.06a-r1.ebuild
+++ b/games-fps/soldieroffortune/soldieroffortune-1.06a-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/soldieroffortune/soldieroffortune-1.06a-r1.ebuild,v 1.4 2015/02/05 03:19:28 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/soldieroffortune/soldieroffortune-1.06a-r1.ebuild,v 1.5 2015/02/08 07:41:43 mr_bones_ Exp $
 
 EAPI=5
 inherit check-reqs eutils unpacker cdrom games
@@ -37,6 +37,7 @@ S=${WORKDIR}
 
 dir=${GAMES_PREFIX_OPT}/${PN}
 Ddir=${ED}/${dir}
+unpackDir=${T}/unpack
 
 CHECKREQS_DISK_BUILD="1450M"
 CHECKREQS_DISK_USR="725M"
@@ -48,8 +49,9 @@ pkg_pretend() {
 src_unpack() {
        cdrom_get_cds sof.xpm
        unpack_makeself
-       tar xzf "${CDROM_ROOT}"/paks.tar.gz -C "${T}" || die
-       tar xzf "${CDROM_ROOT}"/binaries.tar.gz -C "${T}" || die
+       mkdir ${unpackDir} || die
+       tar xzf "${CDROM_ROOT}"/paks.tar.gz -C "${unpackDir}" || die
+       tar xzf "${CDROM_ROOT}"/binaries.tar.gz -C "${unpackDir}" || die
 }
 
 src_install() {
@@ -57,7 +59,7 @@ src_install() {
        exeinto "${dir}"
        doexe "${CDROM_ROOT}"/bin/x86/glibc-2.1/sof
        insinto "${dir}"
-       doins -r "${T}"/*
+       doins -r "${unpackDir}"/*
        doins "${CDROM_ROOT}"/{README,kver.pub,sof.xpm}
 
        cd "${S}"
@@ -68,12 +70,12 @@ src_install() {
        # 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 '{}' +
 
        games_make_wrapper sof ./sof "${dir}" "${dir}"
 
        # fix buffer overflow
-       sed -i -e 's/^exec/i \
+       sed -i -e '/^exec/i \
 export MESA_EXTENSION_MAX_YEAR=2003 \
 export __GL_ExtensionStringVersion=17700' \
                "${ED}/${GAMES_BINDIR}/sof" || die