| 1 |
commit: d46cda64f4ab29c1c953810cd9de1c520de3ebd0 |
| 2 |
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Jul 18 22:51:27 2017 +0000 |
| 4 |
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Jul 18 23:06:06 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d46cda64 |
| 7 |
|
| 8 |
games-simulation/openttd: Fixed init script (bug #625472). |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.6, Repoman-2.3.2 |
| 11 |
|
| 12 |
games-simulation/openttd/files/openttd.initd-r1 | 13 +++++++++++++ |
| 13 |
games-simulation/openttd/openttd-1.6.1-r1.ebuild | 16 +++++----------- |
| 14 |
...openttd-1.6.1-r1.ebuild => openttd-1.7.1-r1.ebuild} | 18 ++++++------------ |
| 15 |
3 files changed, 24 insertions(+), 23 deletions(-) |
| 16 |
|
| 17 |
diff --git a/games-simulation/openttd/files/openttd.initd-r1 b/games-simulation/openttd/files/openttd.initd-r1 |
| 18 |
new file mode 100644 |
| 19 |
index 00000000000..0bfeefddf6d |
| 20 |
--- /dev/null |
| 21 |
+++ b/games-simulation/openttd/files/openttd.initd-r1 |
| 22 |
@@ -0,0 +1,13 @@ |
| 23 |
+#!/sbin/openrc-run |
| 24 |
+# Copyright 1999-2017 Gentoo Foundation |
| 25 |
+# Distributed under the terms of the GNU General Public License, v2 or later |
| 26 |
+ |
| 27 |
+description="OpenTTD dedicated game server" |
| 28 |
+pidfile="/run/${SVCNAME}.pid" |
| 29 |
+command="/usr/bin/openttd" |
| 30 |
+command_args="-D" |
| 31 |
+command_background="true" |
| 32 |
+ |
| 33 |
+depend() { |
| 34 |
+ need net |
| 35 |
+} |
| 36 |
|
| 37 |
diff --git a/games-simulation/openttd/openttd-1.6.1-r1.ebuild b/games-simulation/openttd/openttd-1.6.1-r1.ebuild |
| 38 |
index f776da42d6e..e68b7259b6f 100644 |
| 39 |
--- a/games-simulation/openttd/openttd-1.6.1-r1.ebuild |
| 40 |
+++ b/games-simulation/openttd/openttd-1.6.1-r1.ebuild |
| 41 |
@@ -1,4 +1,4 @@ |
| 42 |
-# Copyright 1999-2016 Gentoo Foundation |
| 43 |
+# Copyright 1999-2017 Gentoo Foundation |
| 44 |
# Distributed under the terms of the GNU General Public License v2 |
| 45 |
|
| 46 |
EAPI=6 |
| 47 |
@@ -17,15 +17,9 @@ RESTRICT="test" # needs a graphics set in order to test |
| 48 |
RDEPEND="!dedicated? ( |
| 49 |
media-libs/libsdl[sound,X,video] |
| 50 |
icu? ( |
| 51 |
- || ( |
| 52 |
- ( |
| 53 |
- dev-libs/icu-layoutex |
| 54 |
- dev-libs/icu-le-hb |
| 55 |
- >=dev-libs/icu-58.1 |
| 56 |
- ) |
| 57 |
- <dev-libs/icu-58.1 |
| 58 |
- ) |
| 59 |
- dev-libs/icu:= |
| 60 |
+ dev-libs/icu-layoutex |
| 61 |
+ dev-libs/icu-le-hb |
| 62 |
+ >=dev-libs/icu-58.1:= |
| 63 |
) |
| 64 |
truetype? ( |
| 65 |
media-libs/fontconfig |
| 66 |
@@ -107,7 +101,7 @@ src_compile() { |
| 67 |
src_install() { |
| 68 |
default |
| 69 |
if use dedicated ; then |
| 70 |
- newinitd "${FILESDIR}"/${PN}.initd ${PN} |
| 71 |
+ newinitd "${FILESDIR}"/${PN}.initd-r1 ${PN} |
| 72 |
rm -rf "${ED}"/usr/share/{applications,icons,pixmaps} |
| 73 |
fi |
| 74 |
rm -f "${ED}"/usr/share/doc/${PF}/COPYING |
| 75 |
|
| 76 |
diff --git a/games-simulation/openttd/openttd-1.6.1-r1.ebuild b/games-simulation/openttd/openttd-1.7.1-r1.ebuild |
| 77 |
similarity index 94% |
| 78 |
copy from games-simulation/openttd/openttd-1.6.1-r1.ebuild |
| 79 |
copy to games-simulation/openttd/openttd-1.7.1-r1.ebuild |
| 80 |
index f776da42d6e..f24302009a4 100644 |
| 81 |
--- a/games-simulation/openttd/openttd-1.6.1-r1.ebuild |
| 82 |
+++ b/games-simulation/openttd/openttd-1.7.1-r1.ebuild |
| 83 |
@@ -1,4 +1,4 @@ |
| 84 |
-# Copyright 1999-2016 Gentoo Foundation |
| 85 |
+# Copyright 1999-2017 Gentoo Foundation |
| 86 |
# Distributed under the terms of the GNU General Public License v2 |
| 87 |
|
| 88 |
EAPI=6 |
| 89 |
@@ -17,15 +17,9 @@ RESTRICT="test" # needs a graphics set in order to test |
| 90 |
RDEPEND="!dedicated? ( |
| 91 |
media-libs/libsdl[sound,X,video] |
| 92 |
icu? ( |
| 93 |
- || ( |
| 94 |
- ( |
| 95 |
- dev-libs/icu-layoutex |
| 96 |
- dev-libs/icu-le-hb |
| 97 |
- >=dev-libs/icu-58.1 |
| 98 |
- ) |
| 99 |
- <dev-libs/icu-58.1 |
| 100 |
- ) |
| 101 |
- dev-libs/icu:= |
| 102 |
+ dev-libs/icu-layoutex |
| 103 |
+ dev-libs/icu-le-hb |
| 104 |
+ >=dev-libs/icu-58.1:= |
| 105 |
) |
| 106 |
truetype? ( |
| 107 |
media-libs/fontconfig |
| 108 |
@@ -88,7 +82,7 @@ src_configure() { |
| 109 |
# It's all built as C++, upstream uses CFLAGS internally. |
| 110 |
CFLAGS="" ./configure \ |
| 111 |
--disable-strip \ |
| 112 |
- --prefix-dir="${EPREFIX}/usr" \ |
| 113 |
+ --prefix-dir="${EPREFIX%/}/usr" \ |
| 114 |
--binary-dir="bin" \ |
| 115 |
--install-dir="${D}" \ |
| 116 |
--menu-group="Game;Simulation;" \ |
| 117 |
@@ -107,7 +101,7 @@ src_compile() { |
| 118 |
src_install() { |
| 119 |
default |
| 120 |
if use dedicated ; then |
| 121 |
- newinitd "${FILESDIR}"/${PN}.initd ${PN} |
| 122 |
+ newinitd "${FILESDIR}"/${PN}.initd-r1 ${PN} |
| 123 |
rm -rf "${ED}"/usr/share/{applications,icons,pixmaps} |
| 124 |
fi |
| 125 |
rm -f "${ED}"/usr/share/doc/${PF}/COPYING |
Archives