diff options
| author |   Michael Sterrett <mr_bones_@gentoo.org> | 2015-02-08 07:41:43 +0000 |
|---|---|---|
| committer | Michael Sterrett <mr_bones_@gentoo.org> | 2015-02-08 07:41:43 +0000 |
| commit | 3372b1ea24050473308ff131a54a2d7240be0c51 (patch) | |
| tree | 0b67d15a576bfeaef75d98a8694acfef1b0f3b69 /games-fps | |
| parent | version bump (diff) | |
| download | gentoo-2-3372b1ea24050473308ff131a54a2d7240be0c51.tar.gz gentoo-2-3372b1ea24050473308ff131a54a2d7240be0c51.tar.bz2 gentoo-2-3372b1ea24050473308ff131a54a2d7240be0c51.zip | |
fix unpacking and sed with patch from Robert Cernansky (bug #539200)
(Portage version: 2.2.14/cvs/Linux x86_64, unsigned Manifest commit)
Diffstat (limited to 'games-fps')
| -rw-r--r-- | games-fps/soldieroffortune/ChangeLog | 6 | ||||
| -rw-r--r-- | games-fps/soldieroffortune/soldieroffortune-1.06a-r1.ebuild | 14 |
2 files changed, 13 insertions, 7 deletions
diff --git a/games-fps/soldieroffortune/ChangeLog b/games-fps/soldieroffortune/ChangeLog index 645189604dac..9d995f435453 100644 --- 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/soldieroffortune-1.06a-r1.ebuild b/games-fps/soldieroffortune/soldieroffortune-1.06a-r1.ebuild index 01560afbc504..8964b30f25e9 100644 --- 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 |