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

diff --git a/sys-apps/systemd/systemd-238.ebuild b/sys-apps/systemd/systemd-238-r1.ebuild
similarity index 97%
rename from sys-apps/systemd/systemd-238.ebuild
rename to sys-apps/systemd/systemd-238-r1.ebuild
index 00e28112485d03449dbedc9db4d5265c1d6a6751..d32d1e9d3d392cc72bfbf326757d6667acd2086e 100644 (file)
--- 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 60dd1f8efd115e23a81c08909368e64711d513db..6c34c1b92a008332481b0259895b1c4c27440bed 100644 (file)
--- 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