Use improved unit files from Exherbo (thanks to tgurr for suggesting the change), revert the dependency restriction on Ice as I cannot reproduce the problem and, in any case, the problem would affect to even current stable (and probably would need a specific bug to handle that issue)

(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key A188FBD4)

6 files changed, 46 insertions, 14 deletions

diff --git a/media-sound/murmur/ChangeLog b/media-sound/murmur/ChangeLog
index 3fcac06b1d9c..2950d743b52c 100644
--- a/media-sound/murmur/ChangeLog
+++ b/media-sound/murmur/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for media-sound/murmur
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/murmur/ChangeLog,v 1.45 2013/10/07 17:19:08 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/murmur/ChangeLog,v 1.46 2013/10/09 18:58:44 pacho Exp $
+
+*murmur-1.2.4-r2 (09 Oct 2013)
+
+  09 Oct 2013; Pacho Ramos <pacho@gentoo.org> +files/murmurd-dbus.service,
+  +files/murmurd-dbus.tmpfiles, +files/murmurd-no-dbus.service,
+  +murmur-1.2.4-r2.ebuild, -files/murmur.service, -murmur-1.2.4-r1.ebuild:
+  Use improved unit files from Exherbo (thanks to tgurr for suggesting the
+  change), revert the dependency restriction on Ice as I cannot reproduce the
+  problem and, in any case, the problem would affect to even current stable (and
+  probably would need a specific bug to handle that issue)
 
   07 Oct 2013; Pacho Ramos <pacho@gentoo.org> murmur-1.2.4-r1.ebuild:
   Fix Ice dependency (#486304#c2 by Lars Wendler (Polynomial-C))
diff --git a/media-sound/murmur/files/murmur.service b/media-sound/murmur/files/murmur.service
deleted file mode 100644
index cd6606064028..000000000000
--- a/media-sound/murmur/files/murmur.service
+++ /dev/null
@@ -1,10 +0,0 @@
-[Unit]
-Description=Mumble Daemon
-After=network.target
-
-[Service]
-ExecStart=/usr/bin/murmurd -ini /etc/murmur/murmur.ini -fg
-Restart=always
-
-[Install]
-WantedBy=multi-user.target
diff --git a/media-sound/murmur/files/murmurd-dbus.service b/media-sound/murmur/files/murmurd-dbus.service
new file mode 100644
index 000000000000..46fe5327d4ac
--- /dev/null
+++ b/media-sound/murmur/files/murmurd-dbus.service
@@ -0,0 +1,14 @@
+[Unit]
+Description=Murmurd - VoIP Server (for Mumble)
+After=network.target mysql.service
+
+[Service]
+User=murmur
+Group=murmur
+Type=dbus
+BusName=net.sourceforge.mumble.murmur
+PIDFile=/run/murmur/murmur.pid
+ExecStart=/usr/bin/murmurd -ini /etc/murmur/murmur.ini
+
+[Install]
+WantedBy=multi-user.target
diff --git a/media-sound/murmur/files/murmurd-dbus.tmpfiles b/media-sound/murmur/files/murmurd-dbus.tmpfiles
new file mode 100644
index 000000000000..70963d0a575b
--- /dev/null
+++ b/media-sound/murmur/files/murmurd-dbus.tmpfiles
@@ -0,0 +1 @@
+d /run/murmur 0755 murmur murmur
diff --git a/media-sound/murmur/files/murmurd-no-dbus.service b/media-sound/murmur/files/murmurd-no-dbus.service
new file mode 100644
index 000000000000..8631de20aaa4
--- /dev/null
+++ b/media-sound/murmur/files/murmurd-no-dbus.service
@@ -0,0 +1,11 @@
+[Unit]
+Description=Murmurd - VoIP Server (for Mumble)
+After=network.target mysql.service
+
+[Service]
+User=murmur
+Group=murmur
+ExecStart=/usr/bin/murmurd -fg -ini /etc/murmur/murmur.ini
+
+[Install]
+WantedBy=multi-user.target
diff --git a/media-sound/murmur/murmur-1.2.4-r1.ebuild b/media-sound/murmur/murmur-1.2.4-r2.ebuild
index 342fbba2065a..deb817b6ba66 100644
--- a/media-sound/murmur/murmur-1.2.4-r1.ebuild
+++ b/media-sound/murmur/murmur-1.2.4-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/murmur/murmur-1.2.4-r1.ebuild,v 1.2 2013/10/07 17:19:08 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/murmur/murmur-1.2.4-r2.ebuild,v 1.1 2013/10/09 18:58:44 pacho Exp $
 
 EAPI="5"
 
@@ -27,7 +27,7 @@ RDEPEND=">=dev-libs/openssl-1.0.0b
 	|| ( dev-qt/qtsql:4[sqlite] dev-qt/qtsql:4[mysql] )
 	dev-qt/qtxmlpatterns:4
 	dbus? ( dev-qt/qtdbus:4 )
-	ice? ( >=dev-libs/Ice-3.5.0 )
+	ice? ( dev-libs/Ice )
 	zeroconf? ( net-dns/avahi[mdnsresponder-compat] )"
 
 DEPEND="${RDEPEND}
@@ -101,7 +101,13 @@ src_install() {
 
 	newinitd "${FILESDIR}"/murmur.initd-r1 murmur
 	newconfd "${FILESDIR}"/murmur.confd murmur
-	systemd_dounit "${FILESDIR}"/${PN}.service
+
+	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
 
 	keepdir /var/lib/murmur /var/log/murmur
 	fowners -R murmur /var/lib/murmur /var/log/murmur