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 DD226138334 for ; Thu, 11 Jul 2019 08:31:49 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C8185E0821; Thu, 11 Jul 2019 08:31:48 +0000 (UTC) Received: from smtp.gentoo.org (smtp.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 B0910E0821 for ; Thu, 11 Jul 2019 08:31:48 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 5D22D347740 for ; Thu, 11 Jul 2019 08:31:47 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 9B19C6EA for ; Thu, 11 Jul 2019 08:31:44 +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: <1562833895.2ff5ea8e2cf8d43b0e87c25891f37be9b8c7e41b.polynomial-c@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-sound/murmur/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-sound/murmur/murmur-9999.ebuild X-VCS-Directories: media-sound/murmur/ X-VCS-Committer: polynomial-c X-VCS-Committer-Name: Lars Wendler X-VCS-Revision: 2ff5ea8e2cf8d43b0e87c25891f37be9b8c7e41b X-VCS-Branch: master Date: Thu, 11 Jul 2019 08:31:44 +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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 458db5c6-4e68-449b-aba3-d28086ff59e0 X-Archives-Hash: 05eb36f947885c4acbc44b4fddf3149a commit: 2ff5ea8e2cf8d43b0e87c25891f37be9b8c7e41b Author: Lars Wendler gentoo org> AuthorDate: Thu Jul 11 08:31:35 2019 +0000 Commit: Lars Wendler gentoo org> CommitDate: Thu Jul 11 08:31:35 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2ff5ea8e media-sound/murmur: Synced live ebuild Package-Manager: Portage-2.3.69, Repoman-2.3.16 Signed-off-by: Lars Wendler gentoo.org> media-sound/murmur/murmur-9999.ebuild | 34 ++++++++++++++++++++++++---------- 1 file changed, 24 insertions(+), 10 deletions(-) diff --git a/media-sound/murmur/murmur-9999.ebuild b/media-sound/murmur/murmur-9999.ebuild index cfce5144e23..e0d9d8f503e 100644 --- a/media-sound/murmur/murmur-9999.ebuild +++ b/media-sound/murmur/murmur-9999.ebuild @@ -54,6 +54,13 @@ DEPEND="${RDEPEND} BDEPEND=" virtual/pkgconfig" +if [[ "${PV}" == *9999 ]] ; then + # Required for the mkini.sh script which calls perl multiple times + BDEPEND+=" + dev-lang/perl + " +fi + DOC_CONTENTS=" Useful scripts are located in /usr/share/doc/${PF}/scripts.\n Please execute:\n @@ -72,10 +79,20 @@ pkg_setup() { src_prepare() { default + if [[ "${PV}" == *9999 ]] ; then + pushd scripts &>/dev/null || die + ./mkini.sh || die + popd &>/dev/null || die + fi + sed \ -e 's:mumble-server:murmur:g' \ -e 's:/var/run:/run:g' \ - -i "${S}"/scripts/murmur.{conf,ini} || die + -i "${S}"/scripts/murmur.{conf,ini.system} || die + + # Adjust systemd service file to our config location #689208 + sed "s@/etc/${PN}\.ini@/etc/${PN}/${PN}.ini@" \ + -i scripts/${PN}.service || die } src_configure() { @@ -103,15 +120,12 @@ src_install() { dodoc -r scripts/server docompress -x /usr/share/doc/${PF}/scripts - local dir=release - if use debug; then - dir=debug - fi - + local dir="$(usex debug debug release)" dobin "${dir}"/murmurd - insinto /etc/murmur/ - doins scripts/murmur.ini + local etcdir="/etc/murmur" + insinto ${etcdir} + newins scripts/${PN}.ini.system ${PN}.ini insinto /etc/logrotate.d/ newins "${FILESDIR}"/murmur.logrotate murmur @@ -134,8 +148,8 @@ src_install() { # Fix permissions on config file as it might contain passwords. # (bug #559362) - fowners root:murmur /etc/murmur/murmur.ini - fperms 640 /etc/murmur/murmur.ini + fowners root:murmur ${etcdir}/murmur.ini + fperms 640 ${etcdir}/murmur.ini doman man/murmurd.1