| 1 |
mr_bones_ 15/02/08 07:41:43 |
| 2 |
|
| 3 |
Modified: soldieroffortune-1.06a-r1.ebuild ChangeLog |
| 4 |
Log: |
| 5 |
fix unpacking and sed with patch from Robert Cernansky (bug #539200) |
| 6 |
|
| 7 |
(Portage version: 2.2.14/cvs/Linux x86_64, unsigned Manifest commit) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.5 games-fps/soldieroffortune/soldieroffortune-1.06a-r1.ebuild |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-fps/soldieroffortune/soldieroffortune-1.06a-r1.ebuild?rev=1.5&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-fps/soldieroffortune/soldieroffortune-1.06a-r1.ebuild?rev=1.5&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-fps/soldieroffortune/soldieroffortune-1.06a-r1.ebuild?r1=1.4&r2=1.5 |
| 15 |
|
| 16 |
Index: soldieroffortune-1.06a-r1.ebuild |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/games-fps/soldieroffortune/soldieroffortune-1.06a-r1.ebuild,v |
| 19 |
retrieving revision 1.4 |
| 20 |
retrieving revision 1.5 |
| 21 |
diff -u -r1.4 -r1.5 |
| 22 |
--- soldieroffortune-1.06a-r1.ebuild 5 Feb 2015 03:19:28 -0000 1.4 |
| 23 |
+++ soldieroffortune-1.06a-r1.ebuild 8 Feb 2015 07:41:43 -0000 1.5 |
| 24 |
@@ -1,6 +1,6 @@ |
| 25 |
# Copyright 1999-2015 Gentoo Foundation |
| 26 |
# Distributed under the terms of the GNU General Public License v2 |
| 27 |
-# $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 $ |
| 28 |
+# $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 $ |
| 29 |
|
| 30 |
EAPI=5 |
| 31 |
inherit check-reqs eutils unpacker cdrom games |
| 32 |
@@ -37,6 +37,7 @@ |
| 33 |
|
| 34 |
dir=${GAMES_PREFIX_OPT}/${PN} |
| 35 |
Ddir=${ED}/${dir} |
| 36 |
+unpackDir=${T}/unpack |
| 37 |
|
| 38 |
CHECKREQS_DISK_BUILD="1450M" |
| 39 |
CHECKREQS_DISK_USR="725M" |
| 40 |
@@ -48,8 +49,9 @@ |
| 41 |
src_unpack() { |
| 42 |
cdrom_get_cds sof.xpm |
| 43 |
unpack_makeself |
| 44 |
- tar xzf "${CDROM_ROOT}"/paks.tar.gz -C "${T}" || die |
| 45 |
- tar xzf "${CDROM_ROOT}"/binaries.tar.gz -C "${T}" || die |
| 46 |
+ mkdir ${unpackDir} || die |
| 47 |
+ tar xzf "${CDROM_ROOT}"/paks.tar.gz -C "${unpackDir}" || die |
| 48 |
+ tar xzf "${CDROM_ROOT}"/binaries.tar.gz -C "${unpackDir}" || die |
| 49 |
} |
| 50 |
|
| 51 |
src_install() { |
| 52 |
@@ -57,7 +59,7 @@ |
| 53 |
exeinto "${dir}" |
| 54 |
doexe "${CDROM_ROOT}"/bin/x86/glibc-2.1/sof |
| 55 |
insinto "${dir}" |
| 56 |
- doins -r "${T}"/* |
| 57 |
+ doins -r "${unpackDir}"/* |
| 58 |
doins "${CDROM_ROOT}"/{README,kver.pub,sof.xpm} |
| 59 |
|
| 60 |
cd "${S}" |
| 61 |
@@ -68,12 +70,12 @@ |
| 62 |
# now, since these files are coming off a cd, the times/sizes/md5sums wont |
| 63 |
# be different ... that means portage will try to unmerge some files (!) |
| 64 |
# we run touch on ${D} so as to make sure portage doesnt do any such thing |
| 65 |
- find "${Ddir}" -exec touch '{}' \; |
| 66 |
+ find "${Ddir}" -exec touch '{}' + |
| 67 |
|
| 68 |
games_make_wrapper sof ./sof "${dir}" "${dir}" |
| 69 |
|
| 70 |
# fix buffer overflow |
| 71 |
- sed -i -e 's/^exec/i \ |
| 72 |
+ sed -i -e '/^exec/i \ |
| 73 |
export MESA_EXTENSION_MAX_YEAR=2003 \ |
| 74 |
export __GL_ExtensionStringVersion=17700' \ |
| 75 |
"${ED}/${GAMES_BINDIR}/sof" || die |
| 76 |
|
| 77 |
|
| 78 |
|
| 79 |
1.34 games-fps/soldieroffortune/ChangeLog |
| 80 |
|
| 81 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-fps/soldieroffortune/ChangeLog?rev=1.34&view=markup |
| 82 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-fps/soldieroffortune/ChangeLog?rev=1.34&content-type=text/plain |
| 83 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-fps/soldieroffortune/ChangeLog?r1=1.33&r2=1.34 |
| 84 |
|
| 85 |
Index: ChangeLog |
| 86 |
=================================================================== |
| 87 |
RCS file: /var/cvsroot/gentoo-x86/games-fps/soldieroffortune/ChangeLog,v |
| 88 |
retrieving revision 1.33 |
| 89 |
retrieving revision 1.34 |
| 90 |
diff -u -r1.33 -r1.34 |
| 91 |
--- ChangeLog 5 Feb 2015 03:19:28 -0000 1.33 |
| 92 |
+++ ChangeLog 8 Feb 2015 07:41:43 -0000 1.34 |
| 93 |
@@ -1,6 +1,10 @@ |
| 94 |
# ChangeLog for games-fps/soldieroffortune |
| 95 |
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 |
| 96 |
-# $Header: /var/cvsroot/gentoo-x86/games-fps/soldieroffortune/ChangeLog,v 1.33 2015/02/05 03:19:28 mr_bones_ Exp $ |
| 97 |
+# $Header: /var/cvsroot/gentoo-x86/games-fps/soldieroffortune/ChangeLog,v 1.34 2015/02/08 07:41:43 mr_bones_ Exp $ |
| 98 |
+ |
| 99 |
+ 08 Feb 2015; Michael Sterrett <mr_bones_@g.o> |
| 100 |
+ soldieroffortune-1.06a-r1.ebuild: |
| 101 |
+ fix unpacking and sed with patch from Robert Cernansky (bug #539200) |
| 102 |
|
| 103 |
05 Feb 2015; Michael Sterrett <mr_bones_@g.o> |
| 104 |
-soldieroffortune-1.06a.ebuild, soldieroffortune-1.06a-r1.ebuild: |
Archives