| 1 |
commit: d7096743466c1b9075299f1198a0072c06be69b5 |
| 2 |
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Mar 1 22:03:35 2018 +0000 |
| 4 |
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Mar 1 22:03:35 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d7096743 |
| 7 |
|
| 8 |
games-action/trine-bin: Update for new download, unbundle libs, RPATH |
| 9 |
|
| 10 |
* Upstream download has changed content and filename. The game version |
| 11 |
is still the same so perhaps only the bundled libraries changed. |
| 12 |
* Game failed to launch with bundled libstdc++.so.6. Unbundle as many |
| 13 |
libraries as possible for security, if nothing else. |
| 14 |
* Use chrpath to set an absolute RPATH, improving security. |
| 15 |
|
| 16 |
Closes: https://bugs.gentoo.org/369923 |
| 17 |
Package-Manager: Portage-2.3.24, Repoman-2.3.6 |
| 18 |
|
| 19 |
games-action/trine-bin/Manifest | 2 +- |
| 20 |
...bin-1.08-r1.ebuild => trine-bin-1.08-r2.ebuild} | 51 +++++++++++++--------- |
| 21 |
2 files changed, 32 insertions(+), 21 deletions(-) |
| 22 |
|
| 23 |
diff --git a/games-action/trine-bin/Manifest b/games-action/trine-bin/Manifest |
| 24 |
index 0362ae96dbc..dd34b082ffe 100644 |
| 25 |
--- a/games-action/trine-bin/Manifest |
| 26 |
+++ b/games-action/trine-bin/Manifest |
| 27 |
@@ -1 +1 @@ |
| 28 |
-DIST Trine.64.run 648471997 SHA256 1c9067cb19e3c954b460b4df27e6ca5d80b31c7ead49bd5779dcbce5528177db SHA512 400200a3ebc6003545df460f9a8af7fe4f6f370655432c66ca8a5ceb10e40bf205e81f70cfbe3fe7386de9ec0aeb5e23f02590776c2b0f35a32f9fbc1012ea3a WHIRLPOOL b6610f53e8e4079383de9a664b8cb019fbe9daa7cdbb204116c3e34b27327325dfdc39649185076524429f8ba2fc1a0889f9006e6873db65c3f73784f440e1e9 |
| 29 |
+DIST TrineUpdate4.64.run 647258173 BLAKE2B b520d1f312b9bd9ef94f32cd5fbe7ceaea0cb1bd839d8a898ac02cac0eb3464d83588f1163949ca2f53d7badb2eca456b8e1438d6f5e96e3c6baa10ca6cb865a SHA512 1255edc90cfd47c4f5a3cf7fa07cebac047f46f9b5f9f6621baff01d9c4295c95204a695127ce4947038c50c80253e7a004ec1c3accff6ac8697605fd25885f9 |
| 30 |
|
| 31 |
diff --git a/games-action/trine-bin/trine-bin-1.08-r1.ebuild b/games-action/trine-bin/trine-bin-1.08-r2.ebuild |
| 32 |
similarity index 56% |
| 33 |
rename from games-action/trine-bin/trine-bin-1.08-r1.ebuild |
| 34 |
rename to games-action/trine-bin/trine-bin-1.08-r2.ebuild |
| 35 |
index dd00324d01d..99503c9efac 100644 |
| 36 |
--- a/games-action/trine-bin/trine-bin-1.08-r1.ebuild |
| 37 |
+++ b/games-action/trine-bin/trine-bin-1.08-r2.ebuild |
| 38 |
@@ -1,36 +1,43 @@ |
| 39 |
-# Copyright 1999-2017 Gentoo Foundation |
| 40 |
+# Copyright 1999-2018 Gentoo Foundation |
| 41 |
# Distributed under the terms of the GNU General Public License v2 |
| 42 |
|
| 43 |
-# these are ELFs that include a ZIP (504b0304) appended to it |
| 44 |
-# dd if=Trine.64.run of=Trine.64.zip ibs=$((0x342a8)) skip=1 |
| 45 |
-# dd if=Trine.32.run of=Trine.32.zip ibs=$((0x31c24)) skip=1 |
| 46 |
-# but `unzip` will skip the ELF at the start. both ELFs contain |
| 47 |
-# the same zip appended, so only need to hash one of them. |
| 48 |
- |
| 49 |
EAPI=6 |
| 50 |
-inherit unpacker eutils |
| 51 |
+ |
| 52 |
+inherit desktop eutils unpacker |
| 53 |
|
| 54 |
DESCRIPTION="A physics-based action game with character-dependent solutions to challenges" |
| 55 |
HOMEPAGE="http://trine-thegame.com/" |
| 56 |
-SRC_URI="Trine.64.run" |
| 57 |
+SRC_URI="TrineUpdate4.64.run" |
| 58 |
|
| 59 |
LICENSE="frozenbyte-eula" |
| 60 |
SLOT="0" |
| 61 |
KEYWORDS="-* ~amd64 ~x86" |
| 62 |
-IUSE="" |
| 63 |
RESTRICT="fetch strip" |
| 64 |
|
| 65 |
-DEPEND="app-arch/unzip" |
| 66 |
+DEPEND=" |
| 67 |
+ app-admin/chrpath |
| 68 |
+ app-arch/unzip |
| 69 |
+" |
| 70 |
+ |
| 71 |
RDEPEND=" |
| 72 |
+ dev-libs/glib:2 |
| 73 |
dev-libs/libx86 |
| 74 |
- gnome-base/libglade |
| 75 |
+ gnome-base/libglade:2.0 |
| 76 |
+ media-libs/libogg |
| 77 |
+ media-libs/libpng:1.2 |
| 78 |
+ >=media-libs/libsdl-1.2[opengl,sound,video] |
| 79 |
+ >=media-libs/libvorbis-1.3 |
| 80 |
+ >=media-libs/openal-1.15 |
| 81 |
+ >=media-libs/tiff-3.9:3 |
| 82 |
>=sys-devel/gcc-4.3.0 |
| 83 |
- >=sys-libs/glibc-2.4" |
| 84 |
+ >=sys-libs/glibc-2.4 |
| 85 |
+ virtual/jpeg:62 |
| 86 |
+ x11-libs/gtk+:2 |
| 87 |
+" |
| 88 |
|
| 89 |
-S=${WORKDIR} |
| 90 |
- |
| 91 |
-d=/opt/${PN} |
| 92 |
-QA_PREBUILT="${d#/}/trine-launcher ${d#/}/trine-bin ${d#/}/lib*/lib*.so*" |
| 93 |
+S="${WORKDIR}" |
| 94 |
+d="/opt/${PN}" |
| 95 |
+QA_PREBUILT="*" |
| 96 |
|
| 97 |
pkg_nofetch() { |
| 98 |
einfo "Fetch ${SRC_URI} and put it into ${DISTDIR}" |
| 99 |
@@ -38,9 +45,13 @@ pkg_nofetch() { |
| 100 |
} |
| 101 |
|
| 102 |
src_unpack() { |
| 103 |
- # manually run unzip as the initial seek causes it to exit(1) |
| 104 |
unpack_zip ${A} |
| 105 |
- rm lib*/lib{gcc_s,m,rt,selinux}.so.? || die |
| 106 |
+} |
| 107 |
+ |
| 108 |
+src_prepare() { |
| 109 |
+ default |
| 110 |
+ rm -v lib*/lib{gcc_s,jpeg,m,ogg,openal,png*,rt,SDL*,selinux,stdc++,tiff,vorbis*}.* || die |
| 111 |
+ chrpath --replace "${EPREFIX}${d}"/lib trine-{bin,launcher}$(usex x86 32 64) || die |
| 112 |
} |
| 113 |
|
| 114 |
src_install() { |
| 115 |
@@ -56,7 +67,7 @@ src_install() { |
| 116 |
make_desktop_entry ${bb} "Trine ${b}" Trine |
| 117 |
done |
| 118 |
|
| 119 |
- exeinto ${d}/lib${sfx} |
| 120 |
+ exeinto ${d}/lib |
| 121 |
doexe lib${sfx}/* |
| 122 |
|
| 123 |
insinto ${d} |
Archives