From d52a8034b002b208fdb5dab40e3c560f9b73629b Mon Sep 17 00:00:00 2001 From: Mike Gilbert Date: Tue, 13 Mar 2018 18:32:49 -0400 Subject: [PATCH] sys-apps/systemd: fix install with USE="-sysv-utils usrmerge" Closes: https://bugs.gentoo.org/650442 Package-Manager: Portage-2.3.24, Repoman-2.3.6_p81 --- sys-apps/systemd/systemd-238-r1.ebuild | 5 +++-- sys-apps/systemd/systemd-9999.ebuild | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/sys-apps/systemd/systemd-238-r1.ebuild b/sys-apps/systemd/systemd-238-r1.ebuild index d32d1e9d3d39..1cfd6153c46a 100644 --- a/sys-apps/systemd/systemd-238-r1.ebuild +++ b/sys-apps/systemd/systemd-238-r1.ebuild @@ -303,8 +303,9 @@ multilib_src_install_all() { dodoc "${FILESDIR}"/nsswitch.conf if ! use sysv-utils; then - rm "${ED%/}"/sbin/{halt,init,poweroff,reboot,runlevel,shutdown,telinit} || die - rmdir "${ED%/}"/sbin || die + local rootprefix=$(usex usrmerge /usr '') + rm "${ED%/}${rootprefix}"/sbin/{halt,init,poweroff,reboot,runlevel,shutdown,telinit} || die + rmdir "${ED%/}${rootprefix}"/sbin || die rm "${ED%/}"/usr/share/man/man1/init.1 || die rm "${ED%/}"/usr/share/man/man8/{halt,poweroff,reboot,runlevel,shutdown,telinit}.8 || die fi diff --git a/sys-apps/systemd/systemd-9999.ebuild b/sys-apps/systemd/systemd-9999.ebuild index 6c34c1b92a00..44e359bc511b 100644 --- a/sys-apps/systemd/systemd-9999.ebuild +++ b/sys-apps/systemd/systemd-9999.ebuild @@ -301,8 +301,9 @@ multilib_src_install_all() { dodoc "${FILESDIR}"/nsswitch.conf if ! use sysv-utils; then - rm "${ED%/}"/sbin/{halt,init,poweroff,reboot,runlevel,shutdown,telinit} || die - rmdir "${ED%/}"/sbin || die + local rootprefix=$(usex usrmerge /usr '') + rm "${ED%/}${rootprefix}"/sbin/{halt,init,poweroff,reboot,runlevel,shutdown,telinit} || die + rmdir "${ED%/}${rootprefix}"/sbin || die rm "${ED%/}"/usr/share/man/man1/init.1 || die rm "${ED%/}"/usr/share/man/man8/{halt,poweroff,reboot,runlevel,shutdown,telinit}.8 || die fi -- 2.26.2