diff options
| author |   Mike Gilbert <floppym@gentoo.org> | 2018-03-10 22:26:10 -0500 |
|---|---|---|
| committer | Mike Gilbert <floppym@gentoo.org> | 2018-03-10 22:26:10 -0500 |
| commit | 208664c8fc8d374e5aefae4f50cf88f87ae67ff7 (patch) | |
| tree | 71273ccab8a6e4347ec202ea5defb28149282ab3 /sys-apps/systemd | |
| parent | net-irc/unrealircd: version bump 4.0.17 (diff) | |
| download | gentoo-208664c8fc8d374e5aefae4f50cf88f87ae67ff7.tar.gz gentoo-208664c8fc8d374e5aefae4f50cf88f87ae67ff7.tar.bz2 gentoo-208664c8fc8d374e5aefae4f50cf88f87ae67ff7.zip | |
sys-apps/systemd: fix file collisions with sysv-utils disabled
Closes: https://bugs.gentoo.org/650160
Package-Manager: Portage-2.3.24, Repoman-2.3.6_p81
Diffstat (limited to 'sys-apps/systemd')
| -rw-r--r-- | sys-apps/systemd/systemd-238-r1.ebuild (renamed from sys-apps/systemd/systemd-238.ebuild) | 14 | ||||
| -rw-r--r-- | sys-apps/systemd/systemd-9999.ebuild | 14 |
2 files changed, 8 insertions, 20 deletions
diff --git a/sys-apps/systemd/systemd-238.ebuild b/sys-apps/systemd/systemd-238-r1.ebuild index 00e28112485d..d32d1e9d3d39 100644 --- a/sys-apps/systemd/systemd-238.ebuild +++ b/sys-apps/systemd/systemd-238-r1.ebuild @@ -302,17 +302,11 @@ multilib_src_install_all() { einstalldocs dodoc "${FILESDIR}"/nsswitch.conf - if use sysv-utils; then - local app - for app in halt poweroff reboot runlevel shutdown telinit; do - dosym ../bin/systemctl /sbin/${app} - done - dosym ../lib/systemd/systemd /sbin/init - else - # we just keep sysvinit tools, so no need for the mans - rm "${ED%/}"/usr/share/man/man8/{halt,poweroff,reboot,runlevel,shutdown,telinit}.8 \ - || die + if ! use sysv-utils; then + rm "${ED%/}"/sbin/{halt,init,poweroff,reboot,runlevel,shutdown,telinit} || die + rmdir "${ED%/}"/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 # Preserve empty dirs in /etc & /var, bug #437008 diff --git a/sys-apps/systemd/systemd-9999.ebuild b/sys-apps/systemd/systemd-9999.ebuild index 60dd1f8efd11..6c34c1b92a00 100644 --- a/sys-apps/systemd/systemd-9999.ebuild +++ b/sys-apps/systemd/systemd-9999.ebuild @@ -300,17 +300,11 @@ multilib_src_install_all() { einstalldocs dodoc "${FILESDIR}"/nsswitch.conf - if use sysv-utils; then - local app - for app in halt poweroff reboot runlevel shutdown telinit; do - dosym ../bin/systemctl /sbin/${app} - done - dosym ../lib/systemd/systemd /sbin/init - else - # we just keep sysvinit tools, so no need for the mans - rm "${ED%/}"/usr/share/man/man8/{halt,poweroff,reboot,runlevel,shutdown,telinit}.8 \ - || die + if ! use sysv-utils; then + rm "${ED%/}"/sbin/{halt,init,poweroff,reboot,runlevel,shutdown,telinit} || die + rmdir "${ED%/}"/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 # Preserve empty dirs in /etc & /var, bug #437008 |