commit: 4f9b82151f9db60951268508ee4986d21bcebe18 Author: Kenton Groombridge <concord <AT> gentoo <DOT> org> AuthorDate: Sun Jun 9 16:32:51 2024 +0000 Commit: Kenton Groombridge <concord <AT> gentoo <DOT> org> CommitDate: Sun Jun 9 16:35:27 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4f9b8215
net-voip/murmur: fix split-usr handling of systemd unit rename Closes: https://bugs.gentoo.org/933856 Signed-off-by: Kenton Groombridge <concord <AT> gentoo.org> net-voip/murmur/murmur-1.5.634.ebuild | 5 +++-- net-voip/murmur/murmur-9999.ebuild | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/net-voip/murmur/murmur-1.5.634.ebuild b/net-voip/murmur/murmur-1.5.634.ebuild index 93abe94c1455..be38ba9a0de5 100644 --- a/net-voip/murmur/murmur-1.5.634.ebuild +++ b/net-voip/murmur/murmur-1.5.634.ebuild @@ -144,8 +144,9 @@ src_install() { fperms 750 /var/lib/murmur /var/log/murmur mv "${ED}"/etc/murmur/mumble-server.ini "${ED}"/etc/murmur/murmur.ini || die - mv "${ED}"/usr/lib/systemd/system/mumble-server.service "${ED}"/usr/lib/systemd/system/murmur.service || die - sed -ie 's|mumble-server\.ini|murmur.ini|' "${ED}"/usr/lib/systemd/system/murmur.service || die + mv "${D}/$(systemd_get_systemunitdir)/mumble-server.service" \ + "${D}/$(systemd_get_systemunitdir)/murmur.service" || die + sed -i 's|mumble-server\.ini|murmur.ini|' "${D}/$(systemd_get_systemunitdir)/murmur.service" || die readme.gentoo_create_doc } diff --git a/net-voip/murmur/murmur-9999.ebuild b/net-voip/murmur/murmur-9999.ebuild index 93abe94c1455..be38ba9a0de5 100644 --- a/net-voip/murmur/murmur-9999.ebuild +++ b/net-voip/murmur/murmur-9999.ebuild @@ -144,8 +144,9 @@ src_install() { fperms 750 /var/lib/murmur /var/log/murmur mv "${ED}"/etc/murmur/mumble-server.ini "${ED}"/etc/murmur/murmur.ini || die - mv "${ED}"/usr/lib/systemd/system/mumble-server.service "${ED}"/usr/lib/systemd/system/murmur.service || die - sed -ie 's|mumble-server\.ini|murmur.ini|' "${ED}"/usr/lib/systemd/system/murmur.service || die + mv "${D}/$(systemd_get_systemunitdir)/mumble-server.service" \ + "${D}/$(systemd_get_systemunitdir)/murmur.service" || die + sed -i 's|mumble-server\.ini|murmur.ini|' "${D}/$(systemd_get_systemunitdir)/murmur.service" || die readme.gentoo_create_doc }
