From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 4524915817D for ; Sun, 9 Jun 2024 16:36:39 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 74C2AE2A16; Sun, 9 Jun 2024 16:36:38 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 4B630E2A16 for ; Sun, 9 Jun 2024 16:36:38 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 350D8335D75 for ; Sun, 9 Jun 2024 16:36:37 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 962DF1BFE for ; Sun, 9 Jun 2024 16:36:35 +0000 (UTC) From: "Kenton Groombridge" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Kenton Groombridge" Message-ID: <1717950927.4f9b82151f9db60951268508ee4986d21bcebe18.concord@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-voip/murmur/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-voip/murmur/murmur-1.5.634.ebuild net-voip/murmur/murmur-9999.ebuild X-VCS-Directories: net-voip/murmur/ X-VCS-Committer: concord X-VCS-Committer-Name: Kenton Groombridge X-VCS-Revision: 4f9b82151f9db60951268508ee4986d21bcebe18 X-VCS-Branch: master Date: Sun, 9 Jun 2024 16:36:35 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: b6d8a7f8-3be6-4c86-b383-457c944d62f8 X-Archives-Hash: 8e08da3d4ed2985145da2d1b281f8056 commit: 4f9b82151f9db60951268508ee4986d21bcebe18 Author: Kenton Groombridge gentoo org> AuthorDate: Sun Jun 9 16:32:51 2024 +0000 Commit: Kenton Groombridge gentoo 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 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 }