[gentoo-commits] repo/gentoo:master commit in: media-sound/murmur/

["Lars Wendler" <polynomial-c@gentoo.org>]

commit:     2a1ae335803504f7533f45a1b5fc860a5107f0b7
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Tue Feb  1 06:16:36 2022 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Tue Feb  1 06:18:30 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2a1ae335

media-sound/murmur: Revbump to fix systemd service file

Fixed reported version number as well

Closes: https://bugs.gentoo.org/832471
Closes: https://bugs.gentoo.org/832472
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>

 .../murmur/{murmur-1.4.230-r1.ebuild => murmur-1.4.230-r2.ebuild} | 8 ++++++--
 media-sound/murmur/murmur-9999.ebuild                             | 8 ++++++--
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/media-sound/murmur/murmur-1.4.230-r1.ebuild b/media-sound/murmur/murmur-1.4.230-r2.ebuild
similarity index 95%
rename from media-sound/murmur/murmur-1.4.230-r1.ebuild
rename to media-sound/murmur/murmur-1.4.230-r2.ebuild
index 7192a806faa5..50cc111347c0 100644
--- a/media-sound/murmur/murmur-1.4.230-r1.ebuild
+++ b/media-sound/murmur/murmur-1.4.230-r2.ebuild
@@ -94,7 +94,9 @@ src_prepare() {
 		-i "${S}"/scripts/murmur.{conf,ini} || die
 
 	# Adjust systemd service file to our config location #689208
-	sed "s@/etc/${PN}\.ini@/etc/${PN}/${PN}.ini@" \
+	sed \
+		-e "s@/etc/${PN}\.ini@/etc/${PN}/${PN}.ini@" \
+		-e "s@murmurd@mumble-server@" \
 		-i scripts/${PN}.service || die
 
 	cmake_src_prepare
@@ -116,7 +118,9 @@ src_configure() {
 		-Dserver="ON"
 		-Dzeroconf="$(usex zeroconf)"
 	)
-
+	if [[ "${PV}" != 9999 ]] ; then
+		mycmakeargs+=( -DBUILD_NUMBER="$(ver_cut 3)" )
+	fi
 	cmake_src_configure
 }
 

diff --git a/media-sound/murmur/murmur-9999.ebuild b/media-sound/murmur/murmur-9999.ebuild
index 7192a806faa5..50cc111347c0 100644
--- a/media-sound/murmur/murmur-9999.ebuild
+++ b/media-sound/murmur/murmur-9999.ebuild
@@ -94,7 +94,9 @@ src_prepare() {
 		-i "${S}"/scripts/murmur.{conf,ini} || die
 
 	# Adjust systemd service file to our config location #689208
-	sed "s@/etc/${PN}\.ini@/etc/${PN}/${PN}.ini@" \
+	sed \
+		-e "s@/etc/${PN}\.ini@/etc/${PN}/${PN}.ini@" \
+		-e "s@murmurd@mumble-server@" \
 		-i scripts/${PN}.service || die
 
 	cmake_src_prepare
@@ -116,7 +118,9 @@ src_configure() {
 		-Dserver="ON"
 		-Dzeroconf="$(usex zeroconf)"
 	)
-
+	if [[ "${PV}" != 9999 ]] ; then
+		mycmakeargs+=( -DBUILD_NUMBER="$(ver_cut 3)" )
+	fi
 	cmake_src_configure
 }