From: Lars Wendler <polynomial-c@gentoo.org>
Date: Wed, 15 May 2019 14:25:02 +0000 (+0200)
Subject: media-sound/murmur: Use upstream systemd service file
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=dd0d977d305d389e54399810098f8a874cdc6a5a;p=gentoo.git

media-sound/murmur: Use upstream systemd service file

Silence checkpath call in openrc init script.

Package-Manager: Portage-2.3.66, Repoman-2.3.12
Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
---

diff --git a/media-sound/murmur/files/murmur.initd-r1 b/media-sound/murmur/files/murmur.initd-r1
index 43ffb3a0a648..fe49b32f1410 100644
--- a/media-sound/murmur/files/murmur.initd-r1
+++ b/media-sound/murmur/files/murmur.initd-r1
@@ -13,7 +13,7 @@ depend() {
 }
 
 start_pre() {
-	checkpath -d -o ${MURMUR_USER} ${pidfile%/*}
+	checkpath -q -d -o ${MURMUR_USER} ${pidfile%/*}
 }
 
 reload() {
diff --git a/media-sound/murmur/murmur-9999.ebuild b/media-sound/murmur/murmur-9999.ebuild
index 4ee163ac142e..b7bdfc669100 100644
--- a/media-sound/murmur/murmur-9999.ebuild
+++ b/media-sound/murmur/murmur-9999.ebuild
@@ -124,12 +124,8 @@ src_install() {
 	newinitd "${FILESDIR}"/murmur.initd-r1 murmur
 	newconfd "${FILESDIR}"/murmur.confd murmur
 
-	if use dbus; then
-		systemd_newunit "${FILESDIR}"/murmurd-dbus.service "${PN}".service
-		systemd_newtmpfilesd "${FILESDIR}"/murmurd-dbus.tmpfiles "${PN}".conf
-	else
-		systemd_newunit "${FILESDIR}"/murmurd-no-dbus.service "${PN}".service
-	fi
+	systemd_dounit scripts/${PN}.service
+	systemd_newtmpfilesd "${FILESDIR}"/murmurd-dbus.tmpfiles "${PN}".conf
 
 	keepdir /var/lib/murmur /var/log/murmur
 	fowners -R murmur /var/lib/murmur /var/log/murmur