[gentoo-commits] repo/proj/emacs:master commit in: app-emacs/emacs-common/

[Ulrich Müller]

commit:     62a66325212778d8f852ded9e0bcb59e0d95180b
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 22 20:48:02 2025 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Tue Jul 22 20:48:02 2025 +0000
URL:        https://gitweb.gentoo.org/repo/proj/emacs.git/commit/?id=62a66325

app-emacs/emacs-common: Sync from Gentoo repository

Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>

 app-emacs/emacs-common/emacs-common-9999.ebuild | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/app-emacs/emacs-common/emacs-common-9999.ebuild 
b/app-emacs/emacs-common/emacs-common-9999.ebuild
index e1a1cee..5433db3 100644
--- a/app-emacs/emacs-common/emacs-common-9999.ebuild
+++ b/app-emacs/emacs-common/emacs-common-9999.ebuild
@@ -34,7 +34,7 @@ SITEFILE="10${PN}-gentoo.el"
 src_prepare() {
        default
        if [[ -n ${EPREFIX} ]]; then
-               sed -i -E -e "s,/(bin|sbin|usr)/,${EPREFIX}&," \
+               sed -i -E -e "s,/(bin|sbin|usr)/,${EPREFIX}&,g" \
                        subdirs.el.in emacs.initd emacs.service \
                        emacs.desktop emacsclient.desktop || die
        fi
@@ -56,7 +56,9 @@ src_install() {
        doexe emacs-wrapper.sh
        elisp-site-file-install "${SITEFILE}"
 
-       insinto /usr/lib/systemd/user
+       # don't use systemd_douserunit because it would require inheriting
+       # three eclasses (systemd pulls toolchain-funcs and multilib)
+       insinto "/usr/lib/systemd/user"
        doins emacs.service
 
        if use games; then