From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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 A0500139694 for ; Tue, 18 Jul 2017 23:06:21 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A7D12E0D76; Tue, 18 Jul 2017 23:06:20 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 7549CE0D33 for ; Tue, 18 Jul 2017 23:06:20 +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 C869D3418CA for ; Tue, 18 Jul 2017 23:06:18 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 460B474B4 for ; Tue, 18 Jul 2017 23:06:17 +0000 (UTC) From: "Lars Wendler" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Lars Wendler" Message-ID: <1500419166.d46cda64f4ab29c1c953810cd9de1c520de3ebd0.polynomial-c@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: games-simulation/openttd/, games-simulation/openttd/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: games-simulation/openttd/files/openttd.initd-r1 games-simulation/openttd/openttd-1.6.1-r1.ebuild games-simulation/openttd/openttd-1.7.1-r1.ebuild X-VCS-Directories: games-simulation/openttd/ games-simulation/openttd/files/ X-VCS-Committer: polynomial-c X-VCS-Committer-Name: Lars Wendler X-VCS-Revision: d46cda64f4ab29c1c953810cd9de1c520de3ebd0 X-VCS-Branch: master Date: Tue, 18 Jul 2017 23:06:17 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: ed81c2d0-a48c-4a43-abcd-ef9d355f55d4 X-Archives-Hash: 4e59a35e6c6de897a7382a92effff386 commit: d46cda64f4ab29c1c953810cd9de1c520de3ebd0 Author: Lars Wendler gentoo org> AuthorDate: Tue Jul 18 22:51:27 2017 +0000 Commit: Lars Wendler gentoo org> CommitDate: Tue Jul 18 23:06:06 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d46cda64 games-simulation/openttd: Fixed init script (bug #625472). Package-Manager: Portage-2.3.6, Repoman-2.3.2 games-simulation/openttd/files/openttd.initd-r1 | 13 +++++++++++++ games-simulation/openttd/openttd-1.6.1-r1.ebuild | 16 +++++----------- ...openttd-1.6.1-r1.ebuild => openttd-1.7.1-r1.ebuild} | 18 ++++++------------ 3 files changed, 24 insertions(+), 23 deletions(-) diff --git a/games-simulation/openttd/files/openttd.initd-r1 b/games-simulation/openttd/files/openttd.initd-r1 new file mode 100644 index 00000000000..0bfeefddf6d --- /dev/null +++ b/games-simulation/openttd/files/openttd.initd-r1 @@ -0,0 +1,13 @@ +#!/sbin/openrc-run +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License, v2 or later + +description="OpenTTD dedicated game server" +pidfile="/run/${SVCNAME}.pid" +command="/usr/bin/openttd" +command_args="-D" +command_background="true" + +depend() { + need net +} diff --git a/games-simulation/openttd/openttd-1.6.1-r1.ebuild b/games-simulation/openttd/openttd-1.6.1-r1.ebuild index f776da42d6e..e68b7259b6f 100644 --- a/games-simulation/openttd/openttd-1.6.1-r1.ebuild +++ b/games-simulation/openttd/openttd-1.6.1-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -17,15 +17,9 @@ RESTRICT="test" # needs a graphics set in order to test RDEPEND="!dedicated? ( media-libs/libsdl[sound,X,video] icu? ( - || ( - ( - dev-libs/icu-layoutex - dev-libs/icu-le-hb - >=dev-libs/icu-58.1 - ) - =dev-libs/icu-58.1:= ) truetype? ( media-libs/fontconfig @@ -107,7 +101,7 @@ src_compile() { src_install() { default if use dedicated ; then - newinitd "${FILESDIR}"/${PN}.initd ${PN} + newinitd "${FILESDIR}"/${PN}.initd-r1 ${PN} rm -rf "${ED}"/usr/share/{applications,icons,pixmaps} fi rm -f "${ED}"/usr/share/doc/${PF}/COPYING diff --git a/games-simulation/openttd/openttd-1.6.1-r1.ebuild b/games-simulation/openttd/openttd-1.7.1-r1.ebuild similarity index 94% copy from games-simulation/openttd/openttd-1.6.1-r1.ebuild copy to games-simulation/openttd/openttd-1.7.1-r1.ebuild index f776da42d6e..f24302009a4 100644 --- a/games-simulation/openttd/openttd-1.6.1-r1.ebuild +++ b/games-simulation/openttd/openttd-1.7.1-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -17,15 +17,9 @@ RESTRICT="test" # needs a graphics set in order to test RDEPEND="!dedicated? ( media-libs/libsdl[sound,X,video] icu? ( - || ( - ( - dev-libs/icu-layoutex - dev-libs/icu-le-hb - >=dev-libs/icu-58.1 - ) - =dev-libs/icu-58.1:= ) truetype? ( media-libs/fontconfig @@ -88,7 +82,7 @@ src_configure() { # It's all built as C++, upstream uses CFLAGS internally. CFLAGS="" ./configure \ --disable-strip \ - --prefix-dir="${EPREFIX}/usr" \ + --prefix-dir="${EPREFIX%/}/usr" \ --binary-dir="bin" \ --install-dir="${D}" \ --menu-group="Game;Simulation;" \ @@ -107,7 +101,7 @@ src_compile() { src_install() { default if use dedicated ; then - newinitd "${FILESDIR}"/${PN}.initd ${PN} + newinitd "${FILESDIR}"/${PN}.initd-r1 ${PN} rm -rf "${ED}"/usr/share/{applications,icons,pixmaps} fi rm -f "${ED}"/usr/share/doc/${PF}/COPYING