commit: dad82284b99709594e39d8f912df2755be0225cb Author: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org> AuthorDate: Sun May 1 04:58:41 2022 +0000 Commit: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org> CommitDate: Fri May 20 04:01:26 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dad82284
sys-apps/etckeeper: fix unit installation on prefix Closes: https://bugs.gentoo.org/841677 Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org> sys-apps/etckeeper/etckeeper-1.18.16-r1.ebuild | 4 +++- sys-apps/etckeeper/etckeeper-1.18.17.ebuild | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/sys-apps/etckeeper/etckeeper-1.18.16-r1.ebuild b/sys-apps/etckeeper/etckeeper-1.18.16-r1.ebuild index e42c1c08f094..aa3976831bbd 100644 --- a/sys-apps/etckeeper/etckeeper-1.18.16-r1.ebuild +++ b/sys-apps/etckeeper/etckeeper-1.18.16-r1.ebuild @@ -35,9 +35,11 @@ PATCHES=( "${FILESDIR}"/${PN}-1.18.14-gentoo.patch ) src_prepare() { default hprefixify *.d/* etckeeper + local systemdunitdir="$(systemd_get_systemunitdir)" + systemdunitdir="${systemdunitdir#${EPREFIX%/}}" sed -i \ -e s'@zsh/vendor-completions@zsh/site-functions@' \ - -e s"@/lib/systemd/system@"$(systemd_get_systemunitdir)"@" \ + -e s"@/lib/systemd/system@"${systemdunitdir}"@" \ Makefile || die rm -v init.d/60darcs-deleted-symlinks || die } diff --git a/sys-apps/etckeeper/etckeeper-1.18.17.ebuild b/sys-apps/etckeeper/etckeeper-1.18.17.ebuild index 6c678d1e6e34..37c14d9f11db 100644 --- a/sys-apps/etckeeper/etckeeper-1.18.17.ebuild +++ b/sys-apps/etckeeper/etckeeper-1.18.17.ebuild @@ -40,9 +40,11 @@ PATCHES=( src_prepare() { default hprefixify *.d/* etckeeper + local systemdunitdir="$(systemd_get_systemunitdir)" + systemdunitdir="${systemdunitdir#${EPREFIX%/}}" sed -i \ -e s'@zsh/vendor-completions@zsh/site-functions@' \ - -e s"@/lib/systemd/system@"$(systemd_get_systemunitdir)"@" \ + -e s"@/lib/systemd/system@"${systemdunitdir}"@" \ Makefile || die rm -v init.d/60darcs-deleted-symlinks || die }
