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

install correct .ini config file and create .ini file in live ebuild

Thanks-to: Andrey Tikhomirov <vamp@vampik.ru>
Bug: https://bugs.gentoo.org/689208
Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>

diff --git a/media-sound/murmur/murmur-1.3.0_rc2.ebuild b/media-sound/murmur/murmur-1.3.0_rc2-r1.ebuild
similarity index 85%
rename from media-sound/murmur/murmur-1.3.0_rc2.ebuild
rename to media-sound/murmur/murmur-1.3.0_rc2-r1.ebuild
index cfce5144e23e43543ba0581d6e6974b91e30cef6..0a7f6b035c25c8844c4040369c02e79d3ab64f78 100644 (file)
--- a/media-sound/murmur/murmur-1.3.0_rc2.ebuild
+++ b/media-sound/murmur/murmur-1.3.0_rc2-r1.ebuild
@@ -72,10 +72,20 @@ pkg_setup() {
 src_prepare() {
        default
 
+       if [[ "${PV}" == *9999 ]] ; then
+               pushd scripts &>/dev/null || die
+               ./mkini.sh || die
+               popd &>/dev/null || die
+       fi
+
        sed \
                -e 's:mumble-server:murmur:g' \
                -e 's:/var/run:/run:g' \
-               -i "${S}"/scripts/murmur.{conf,ini} || die
+               -i "${S}"/scripts/murmur.{conf,ini.system} || die
+
+       # Adjust systemd service file to our config location #689208
+       sed "s@/etc/${PN}\.ini@/etc/${PN}/${PN}.ini@" \
+               -i scripts/${PN}.service || die
 }
 
 src_configure() {
@@ -103,15 +113,12 @@ src_install() {
        dodoc -r scripts/server
        docompress -x /usr/share/doc/${PF}/scripts
 
-       local dir=release
-       if use debug; then
-               dir=debug
-       fi
-
+       local dir="$(usex debug debug release)"
        dobin "${dir}"/murmurd
 
-       insinto /etc/murmur/
-       doins scripts/murmur.ini
+       local etcdir="/etc/murmur"
+       insinto ${etcdir}
+       newins scripts/${PN}.ini.system ${PN}.ini
 
        insinto /etc/logrotate.d/
        newins "${FILESDIR}"/murmur.logrotate murmur
@@ -134,8 +141,8 @@ src_install() {
 
        # Fix permissions on config file as it might contain passwords.
        # (bug #559362)
-       fowners root:murmur /etc/murmur/murmur.ini
-       fperms 640 /etc/murmur/murmur.ini
+       fowners root:murmur ${etcdir}/murmur.ini
+       fperms 640 ${etcdir}/murmur.ini
 
        doman man/murmurd.1