mr_bones_ 15/02/08 07:41:43 Modified: soldieroffortune-1.06a-r1.ebuild ChangeLog Log: fix unpacking and sed with patch from Robert Cernansky (bug #539200) (Portage version: 2.2.14/cvs/Linux x86_64, unsigned Manifest commit)
Revision Changes Path 1.5 games-fps/soldieroffortune/soldieroffortune-1.06a-r1.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-fps/soldieroffortune/soldieroffortune-1.06a-r1.ebuild?rev=1.5&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-fps/soldieroffortune/soldieroffortune-1.06a-r1.ebuild?rev=1.5&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-fps/soldieroffortune/soldieroffortune-1.06a-r1.ebuild?r1=1.4&r2=1.5 Index: soldieroffortune-1.06a-r1.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/games-fps/soldieroffortune/soldieroffortune-1.06a-r1.ebuild,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- soldieroffortune-1.06a-r1.ebuild 5 Feb 2015 03:19:28 -0000 1.4 +++ soldieroffortune-1.06a-r1.ebuild 8 Feb 2015 07:41:43 -0000 1.5 @@ -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 @@ dir=${GAMES_PREFIX_OPT}/${PN} Ddir=${ED}/${dir} +unpackDir=${T}/unpack CHECKREQS_DISK_BUILD="1450M" CHECKREQS_DISK_USR="725M" @@ -48,8 +49,9 @@ 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 @@ 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 @@ # 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 1.34 games-fps/soldieroffortune/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-fps/soldieroffortune/ChangeLog?rev=1.34&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-fps/soldieroffortune/ChangeLog?rev=1.34&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-fps/soldieroffortune/ChangeLog?r1=1.33&r2=1.34 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/games-fps/soldieroffortune/ChangeLog,v retrieving revision 1.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- ChangeLog 5 Feb 2015 03:19:28 -0000 1.33 +++ ChangeLog 8 Feb 2015 07:41:43 -0000 1.34 @@ -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 <[email protected]> + soldieroffortune-1.06a-r1.ebuild: + fix unpacking and sed with patch from Robert Cernansky (bug #539200) 05 Feb 2015; Michael Sterrett <[email protected]> -soldieroffortune-1.06a.ebuild, soldieroffortune-1.06a-r1.ebuild:
