From 208664c8fc8d374e5aefae4f50cf88f87ae67ff7 Mon Sep 17 00:00:00 2001 From: Mike Gilbert Date: Sat, 10 Mar 2018 22:26:10 -0500 Subject: 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 --- sys-apps/systemd/systemd-9999.ebuild | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) (limited to 'sys-apps/systemd/systemd-9999.ebuild') 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 -- cgit v1.2.3-65-gdbad