Version bump, remove old. Fixes bug #452740,#460524,#472128.

(Portage version: 2.2.0_alpha177/cvs/Linux x86_64, signed Manifest commit with key 0xD1CB9BF8)

4 files changed, 59 insertions, 9 deletions

diff --git a/media-sound/murmur/ChangeLog b/media-sound/murmur/ChangeLog
index 49a5e26412d1..db2514a2e494 100644
--- a/media-sound/murmur/ChangeLog
+++ b/media-sound/murmur/ChangeLog
@@ -1,6 +1,13 @@
 # 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.38 2013/03/02 21:58:23 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/murmur/ChangeLog,v 1.39 2013/06/04 19:56:58 tgurr Exp $
+
+*murmur-1.2.4 (04 Jun 2013)
+
+  04 Jun 2013; Timo Gurr <tgurr@gentoo.org> -murmur-1.2.4_beta1-r1.ebuild,
+  +murmur-1.2.4.ebuild, +files/murmur-1.2.4-ice-3.5.0-compat.patch,
+  +files/murmur.initd-r1:
+  Version bump, remove old. Fixes bug #452740,#460524,#472128.
 
   02 Mar 2013; Markos Chandras <hwoarang@gentoo.org> murmur-1.2.3-r4.ebuild,
   murmur-1.2.4_beta1-r1.ebuild:
diff --git a/media-sound/murmur/files/murmur-1.2.4-ice-3.5.0-compat.patch b/media-sound/murmur/files/murmur-1.2.4-ice-3.5.0-compat.patch
new file mode 100644
index 000000000000..f7b82ba42b7b
--- /dev/null
+++ b/media-sound/murmur/files/murmur-1.2.4-ice-3.5.0-compat.patch
@@ -0,0 +1,12 @@
+diff -Naur mumble-1.2.4/src/murmur/murmur.pro mumble-1.2.4.new/src/murmur/murmur.pro
+--- mumble-1.2.4/src/murmur/murmur.pro	2013-06-01 23:16:32.000000000 +0200
++++ mumble-1.2.4.new/src/murmur/murmur.pro	2013-06-04 21:38:46.323677587 +0200
+@@ -74,7 +74,7 @@
+ 	win32 {
+ 		slice.commands = slice2cpp --checksum -I\"$$ICE_PATH/slice\" ${QMAKE_FILE_NAME}
+ 	} else {
+-		slice.commands = slice2cpp --checksum -I/usr/local/share/Ice -I/usr/share/Ice/slice -I/usr/share/slice -I/usr/share/Ice-3.4.1/slice/ -I/usr/share/Ice-3.3.1/slice/ -I/usr/share/Ice-3.4.2/slice/ ${QMAKE_FILE_NAME}
++		slice.commands = slice2cpp --checksum -I/usr/local/share/Ice -I/usr/share/Ice/slice -I/usr/share/slice -I/usr/share/Ice-3.4.1/slice/ -I/usr/share/Ice-3.3.1/slice/ -I/usr/share/Ice-3.4.2/slice/ -I/usr/share/Ice-3.5.0/slice/ ${QMAKE_FILE_NAME}
+ 	}
+ 	slice.input = SLICEFILES
+ 	slice.CONFIG *= no_link explicit_dependencies
diff --git a/media-sound/murmur/files/murmur.initd-r1 b/media-sound/murmur/files/murmur.initd-r1
new file mode 100644
index 000000000000..29b2f9d23a0f
--- /dev/null
+++ b/media-sound/murmur/files/murmur.initd-r1
@@ -0,0 +1,25 @@
+#!/sbin/runscript
+
+pidfile="/run/murmur/murmur.pid"
+command="/usr/bin/murmurd"
+command_args="-ini \"${MURMUR_CONF}\""
+start_stop_daemon_args="-u \"${MURMUR_USER}\" --env HOME=\"${MURMUR_HOME}\" --wait 20"
+extra_started_commands="reload"
+
+depend() {
+	need localmount net
+	use dbus logger
+	after bootmisc mysql
+}
+
+start_pre() {
+	checkpath -d -o ${MURMUR_USER} ${pidfile%/*}
+}
+
+reload() {
+	ebegin "Reloading Murmur"
+	start-stop-daemon --signal HUP --pidfile "${pidfile}" \
+		--exec ${command}
+	eend $?
+}
+
diff --git a/media-sound/murmur/murmur-1.2.4_beta1-r1.ebuild b/media-sound/murmur/murmur-1.2.4.ebuild
index 6d45def77fc4..3b3f61616f44 100644
--- a/media-sound/murmur/murmur-1.2.4_beta1-r1.ebuild
+++ b/media-sound/murmur/murmur-1.2.4.ebuild
@@ -1,8 +1,8 @@
 # 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_beta1-r1.ebuild,v 1.2 2013/03/02 21:58:23 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/murmur/murmur-1.2.4.ebuild,v 1.1 2013/06/04 19:56:58 tgurr Exp $
 
-EAPI="4"
+EAPI="5"
 
 QT_MINIMAL="4.6"
 
@@ -36,6 +36,10 @@ DEPEND="${RDEPEND}
 
 S="${WORKDIR}/${MY_P}"
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.2.4-ice-3.5.0-compat.patch
+)
+
 pkg_setup() {
 	enewgroup murmur
 	enewuser murmur -1 -1 /var/lib/murmur murmur
@@ -44,8 +48,10 @@ pkg_setup() {
 src_prepare() {
 	qt4-r2_src_prepare
 
-	sed -i -e 's:mumble-server:murmur:g' \
-		"${S}"/scripts/murmur.{conf,ini.system} || die
+	sed \
+		-e 's:mumble-server:murmur:g' \
+		-e 's:/var/run:/run:g' \
+		-i "${S}"/scripts/murmur.{conf,ini.system} || die
 }
 
 src_configure() {
@@ -93,12 +99,12 @@ src_install() {
 	insinto /usr/share/murmur/
 	doins src/murmur/Murmur.ice
 
-	newinitd "${FILESDIR}"/murmur.initd murmur
+	newinitd "${FILESDIR}"/murmur.initd-r1 murmur
 	newconfd "${FILESDIR}"/murmur.confd murmur
 
-	keepdir /var/lib/murmur /var/run/murmur /var/log/murmur
-	fowners -R murmur /var/lib/murmur /var/run/murmur /var/log/murmur
-	fperms 750 /var/lib/murmur /var/run/murmur /var/log/murmur
+	keepdir /var/lib/murmur /var/log/murmur
+	fowners -R murmur /var/lib/murmur /var/log/murmur
+	fperms 750 /var/lib/murmur /var/log/murmur
 
 	doman man/murmurd.1
 }