From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1000947-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id 74B4E1382C5
for <garchives@archives.gentoo.org>; Thu, 1 Feb 2018 17:46:52 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 99F2BE08C9;
Thu, 1 Feb 2018 17:46:51 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id 78B02E08C9
for <gentoo-commits@lists.gentoo.org>; Thu, 1 Feb 2018 17:46:51 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id 7E09B335C70
for <gentoo-commits@lists.gentoo.org>; Thu, 1 Feb 2018 17:46:50 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 0C4A81BD
for <gentoo-commits@lists.gentoo.org>; Thu, 1 Feb 2018 17:46:49 +0000 (UTC)
From: "Andreas Sturmlechner" <asturm@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" <asturm@gentoo.org>
Message-ID: <1517507140.ba7dd574540c3edb0bb129fabe1be7dd38859e84.asturm@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: games-fps/redeclipse/files/, games-fps/redeclipse/
X-VCS-Repository: repo/gentoo
X-VCS-Files: games-fps/redeclipse/files/redeclipse games-fps/redeclipse/redeclipse-1.6.0-r1.ebuild games-fps/redeclipse/redeclipse-1.6.0.ebuild
X-VCS-Directories: games-fps/redeclipse/ games-fps/redeclipse/files/
X-VCS-Committer: asturm
X-VCS-Committer-Name: Andreas Sturmlechner
X-VCS-Revision: ba7dd574540c3edb0bb129fabe1be7dd38859e84
X-VCS-Branch: master
Date: Thu, 1 Feb 2018 17:46:49 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Archives-Salt: a5470483-17ee-43ac-b509-3575a397c64f
X-Archives-Hash: 876b9aea4001c118c1f6a28a3ba88434
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
}