diff options
| author |   Mike Gilbert <floppym@gentoo.org> | 2018-03-13 18:32:49 -0400 |
|---|---|---|
| committer | Mike Gilbert <floppym@gentoo.org> | 2018-03-13 18:33:32 -0400 |
| commit | d52a8034b002b208fdb5dab40e3c560f9b73629b (patch) | |
| tree | 5fc67fd5263654694656cda8a18fe7356c8c2452 | |
| parent | media-gfx/graphviz: stable 2.40.1-r1 for hppa, bug #530736 (diff) | |
| download | gentoo-d52a8034.tar.gz gentoo-d52a8034.tar.bz2 gentoo-d52a8034.zip | |
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
| -rw-r--r-- | sys-apps/systemd/systemd-238-r1.ebuild | 5 | ||||
| -rw-r--r-- | 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 |