commit: ba7dd574540c3edb0bb129fabe1be7dd38859e84 Author: Rob Levitsky <kitsunenokenja <AT> protonmail <DOT> ch> AuthorDate: Sun Jan 28 00:29:20 2018 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Thu Feb 1 17:45:40 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ba7dd574
games-fps/redeclipse: revision bump, fix installation This revision fixes the incorrect installation of the desktop file entry, and provides a wrapper script to address the runtime problem introduced by no longer using EAPI 5's games installation paths. Package-Manager: Portage-2.3.19, Repoman-2.3.6 Closes: https://github.com/gentoo/gentoo/pull/6979 games-fps/redeclipse/files/redeclipse | 10 ++++++++++ .../{redeclipse-1.6.0.ebuild => redeclipse-1.6.0-r1.ebuild} | 6 +++++- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/games-fps/redeclipse/files/redeclipse b/games-fps/redeclipse/files/redeclipse new file mode 100644 index 00000000000..667765d11d9 --- /dev/null +++ b/games-fps/redeclipse/files/redeclipse @@ -0,0 +1,10 @@ +#!/bin/sh + +# It is necessary to run the binary from the root of the data directory +# for the binary to properly locate its assets and load properly. +# Upstream's original install procedure is doing the same thing. + +SERVER=/usr/bin/redeclipse_server_linux +CLIENT=/usr/bin/redeclipse_linux +cd /usr/share/redeclipse || exit 1 +[ "$0" = "redeclipse_server" ] && exec $SERVER || exec $CLIENT diff --git a/games-fps/redeclipse/redeclipse-1.6.0.ebuild b/games-fps/redeclipse/redeclipse-1.6.0-r1.ebuild similarity index 93% rename from games-fps/redeclipse/redeclipse-1.6.0.ebuild rename to games-fps/redeclipse/redeclipse-1.6.0-r1.ebuild index 173ab9a6b75..5a45262fd90 100644 --- a/games-fps/redeclipse/redeclipse-1.6.0.ebuild +++ b/games-fps/redeclipse/redeclipse-1.6.0-r1.ebuild @@ -70,10 +70,14 @@ src_install() { if ! use dedicated; then dobin src/redeclipse_linux newicon "src/install/nix/${PN}_x128.png" "${PN}.png" - make_desktop_entry "src/install/nix/${PN}.desktop" + domenu "src/install/nix/${PN}.desktop" doman doc/man/redeclipse.6 fi + dobin "${FILESDIR}/redeclipse" + cd /usr/bin || die + dosym redeclipse redeclipse_server + doman doc/man/redeclipse-server.6 dodoc readme.txt doc/examples/servinit.cfg }
