Gentoo Archives: gentoo-commits

From: Lars Wendler <polynomial-c@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-sound/murmur/, media-sound/murmur/files/
Date: Mon, 31 Jan 2022 21:15:59
Message-Id: 1643663748.5d8b0afb38cc95f2143fc7650d1c7fdb1946ce0d.polynomial-c@gentoo
1 commit: 5d8b0afb38cc95f2143fc7650d1c7fdb1946ce0d
2 Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
3 AuthorDate: Mon Jan 31 21:15:17 2022 +0000
4 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
5 CommitDate: Mon Jan 31 21:15:48 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5d8b0afb
7
8 media-sound/murmur: Revbump to fix init script
9
10 Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
11
12 media-sound/murmur/files/murmur.initd-r2 | 24 ++++++++++++++++++++++
13 ...mur-1.4.230.ebuild => murmur-1.4.230-r1.ebuild} | 2 +-
14 media-sound/murmur/murmur-9999.ebuild | 2 +-
15 3 files changed, 26 insertions(+), 2 deletions(-)
16
17 diff --git a/media-sound/murmur/files/murmur.initd-r2 b/media-sound/murmur/files/murmur.initd-r2
18 new file mode 100644
19 index 000000000000..b754c242462b
20 --- /dev/null
21 +++ b/media-sound/murmur/files/murmur.initd-r2
22 @@ -0,0 +1,24 @@
23 +#!/sbin/openrc-run
24 +
25 +pidfile="/run/murmur/murmur.pid"
26 +command="/usr/bin/mumble-server"
27 +command_args="-ini \"${MURMUR_CONF}\""
28 +start_stop_daemon_args="-u \"${MURMUR_USER}\" --env HOME=\"${MURMUR_HOME}\" --wait 20"
29 +extra_started_commands="reload"
30 +
31 +depend() {
32 + need localmount net
33 + use dbus logger
34 + after bootmisc mysql
35 +}
36 +
37 +start_pre() {
38 + checkpath -q -d -o ${MURMUR_USER} ${pidfile%/*}
39 +}
40 +
41 +reload() {
42 + ebegin "Reloading Murmur"
43 + start-stop-daemon --signal HUP --pidfile "${pidfile}" \
44 + --exec ${command}
45 + eend $?
46 +}
47
48 diff --git a/media-sound/murmur/murmur-1.4.230.ebuild b/media-sound/murmur/murmur-1.4.230-r1.ebuild
49 similarity index 98%
50 rename from media-sound/murmur/murmur-1.4.230.ebuild
51 rename to media-sound/murmur/murmur-1.4.230-r1.ebuild
52 index 3fd6f4ad9a21..7192a806faa5 100644
53 --- a/media-sound/murmur/murmur-1.4.230.ebuild
54 +++ b/media-sound/murmur/murmur-1.4.230-r1.ebuild
55 @@ -142,7 +142,7 @@ src_install() {
56 insinto /usr/share/murmur/
57 doins src/murmur/Murmur.ice
58
59 - newinitd "${FILESDIR}"/murmur.initd-r1 murmur
60 + newinitd "${FILESDIR}"/murmur.initd-r2 murmur
61 newconfd "${FILESDIR}"/murmur.confd murmur
62
63 systemd_dounit scripts/${PN}.service
64
65 diff --git a/media-sound/murmur/murmur-9999.ebuild b/media-sound/murmur/murmur-9999.ebuild
66 index 3fd6f4ad9a21..7192a806faa5 100644
67 --- a/media-sound/murmur/murmur-9999.ebuild
68 +++ b/media-sound/murmur/murmur-9999.ebuild
69 @@ -142,7 +142,7 @@ src_install() {
70 insinto /usr/share/murmur/
71 doins src/murmur/Murmur.ice
72
73 - newinitd "${FILESDIR}"/murmur.initd-r1 murmur
74 + newinitd "${FILESDIR}"/murmur.initd-r2 murmur
75 newconfd "${FILESDIR}"/murmur.confd murmur
76
77 systemd_dounit scripts/${PN}.service