1 |
commit: 2a1ae335803504f7533f45a1b5fc860a5107f0b7 |
2 |
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Feb 1 06:16:36 2022 +0000 |
4 |
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Feb 1 06:18:30 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2a1ae335 |
7 |
|
8 |
media-sound/murmur: Revbump to fix systemd service file |
9 |
|
10 |
Fixed reported version number as well |
11 |
|
12 |
Closes: https://bugs.gentoo.org/832471 |
13 |
Closes: https://bugs.gentoo.org/832472 |
14 |
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org> |
15 |
|
16 |
.../murmur/{murmur-1.4.230-r1.ebuild => murmur-1.4.230-r2.ebuild} | 8 ++++++-- |
17 |
media-sound/murmur/murmur-9999.ebuild | 8 ++++++-- |
18 |
2 files changed, 12 insertions(+), 4 deletions(-) |
19 |
|
20 |
diff --git a/media-sound/murmur/murmur-1.4.230-r1.ebuild b/media-sound/murmur/murmur-1.4.230-r2.ebuild |
21 |
similarity index 95% |
22 |
rename from media-sound/murmur/murmur-1.4.230-r1.ebuild |
23 |
rename to media-sound/murmur/murmur-1.4.230-r2.ebuild |
24 |
index 7192a806faa5..50cc111347c0 100644 |
25 |
--- a/media-sound/murmur/murmur-1.4.230-r1.ebuild |
26 |
+++ b/media-sound/murmur/murmur-1.4.230-r2.ebuild |
27 |
@@ -94,7 +94,9 @@ src_prepare() { |
28 |
-i "${S}"/scripts/murmur.{conf,ini} || die |
29 |
|
30 |
# Adjust systemd service file to our config location #689208 |
31 |
- sed "s@/etc/${PN}\.ini@/etc/${PN}/${PN}.ini@" \ |
32 |
+ sed \ |
33 |
+ -e "s@/etc/${PN}\.ini@/etc/${PN}/${PN}.ini@" \ |
34 |
+ -e "s@murmurd@mumble-server@" \ |
35 |
-i scripts/${PN}.service || die |
36 |
|
37 |
cmake_src_prepare |
38 |
@@ -116,7 +118,9 @@ src_configure() { |
39 |
-Dserver="ON" |
40 |
-Dzeroconf="$(usex zeroconf)" |
41 |
) |
42 |
- |
43 |
+ if [[ "${PV}" != 9999 ]] ; then |
44 |
+ mycmakeargs+=( -DBUILD_NUMBER="$(ver_cut 3)" ) |
45 |
+ fi |
46 |
cmake_src_configure |
47 |
} |
48 |
|
49 |
|
50 |
diff --git a/media-sound/murmur/murmur-9999.ebuild b/media-sound/murmur/murmur-9999.ebuild |
51 |
index 7192a806faa5..50cc111347c0 100644 |
52 |
--- a/media-sound/murmur/murmur-9999.ebuild |
53 |
+++ b/media-sound/murmur/murmur-9999.ebuild |
54 |
@@ -94,7 +94,9 @@ src_prepare() { |
55 |
-i "${S}"/scripts/murmur.{conf,ini} || die |
56 |
|
57 |
# Adjust systemd service file to our config location #689208 |
58 |
- sed "s@/etc/${PN}\.ini@/etc/${PN}/${PN}.ini@" \ |
59 |
+ sed \ |
60 |
+ -e "s@/etc/${PN}\.ini@/etc/${PN}/${PN}.ini@" \ |
61 |
+ -e "s@murmurd@mumble-server@" \ |
62 |
-i scripts/${PN}.service || die |
63 |
|
64 |
cmake_src_prepare |
65 |
@@ -116,7 +118,9 @@ src_configure() { |
66 |
-Dserver="ON" |
67 |
-Dzeroconf="$(usex zeroconf)" |
68 |
) |
69 |
- |
70 |
+ if [[ "${PV}" != 9999 ]] ; then |
71 |
+ mycmakeargs+=( -DBUILD_NUMBER="$(ver_cut 3)" ) |
72 |
+ fi |
73 |
cmake_src_configure |
74 |
} |