From 9ab6e5a538ef02d2df93756202a68dc2cefceb13 Mon Sep 17 00:00:00 2001 From: Timo Gurr Date: Thu, 15 Sep 2011 21:42:38 +0000 Subject: Revbump fixing bug #382879 and bug #383003, thanks to Lars Wendler. Remove old. Package-Manager: portage-2.2.0_alpha51/cvs/Linux x86_64 --- media-sound/murmur/files/murmur-1.2.3-ice-3.4.2-compat.patch | 11 +++++++++++ media-sound/murmur/files/murmur.initd | 4 ++-- 2 files changed, 13 insertions(+), 2 deletions(-) create mode 100644 media-sound/murmur/files/murmur-1.2.3-ice-3.4.2-compat.patch (limited to 'media-sound/murmur/files') diff --git a/media-sound/murmur/files/murmur-1.2.3-ice-3.4.2-compat.patch b/media-sound/murmur/files/murmur-1.2.3-ice-3.4.2-compat.patch new file mode 100644 index 000000000000..430ae74d9c1b --- /dev/null +++ b/media-sound/murmur/files/murmur-1.2.3-ice-3.4.2-compat.patch @@ -0,0 +1,11 @@ +--- mumble-1.2.3/src/murmur/murmur.pro ++++ mumble-1.2.3/src/murmur/murmur.pro +@@ -69,7 +69,7 @@ + win32 { + slice.commands = slice2cpp --checksum -I\"$$ICE_PATH/slice\" Murmur.ice + } 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/ Murmur.ice ++ slice.commands = slice2cpp --checksum -I/usr/local/share/Ice -I/usr/share/Ice/slice -I/usr/share/slice -I/usr/share/Ice-3.4.2/slice/ -I/usr/share/Ice-3.4.1/slice/ -I/usr/share/Ice-3.3.1/slice/ Murmur.ice + } + + slice.depends = Murmur.ice diff --git a/media-sound/murmur/files/murmur.initd b/media-sound/murmur/files/murmur.initd index 38054eac3f02..f7c2ddd6480f 100644 --- a/media-sound/murmur/files/murmur.initd +++ b/media-sound/murmur/files/murmur.initd @@ -1,6 +1,6 @@ #!/sbin/runscript -opts="reload" +extra_started_commands="reload" depend() { need localmount net @@ -29,7 +29,7 @@ reload() { return 1 fi ebegin "Reloading Murmur" - start-stop-daemon --stop --oknodo --signal HUP --pidfile "${MURMUR_PID}" \ + start-stop-daemon --signal HUP --pidfile "${MURMUR_PID}" \ --exec /usr/bin/murmurd eend $? } -- cgit v1.2.3-65-gdbad