[gentoo-commits] repo/gentoo:master commit in: media-sound/murmur/files/, media-sound/murmur/

[Lars Wendler]

commit:     dd0d977d305d389e54399810098f8a874cdc6a5a
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Wed May 15 14:25:02 2019 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Wed May 15 14:25:10 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dd0d977d

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 <AT> gentoo.org>

 media-sound/murmur/files/murmur.initd-r1 | 2 +-
 media-sound/murmur/murmur-9999.ebuild    | 8 ++------
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/media-sound/murmur/files/murmur.initd-r1 
b/media-sound/murmur/files/murmur.initd-r1
index 43ffb3a0a64..fe49b32f141 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 4ee163ac142..b7bdfc66910 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