sys-apps/s6-linux-init: Fix sysv-utils location and deps

Closes: https://bugs.gentoo.org/688456
Signed-off-by: Samuel Holland <samuel@sholland.org>
Closes: https://github.com/gentoo/gentoo/pull/12305
Signed-off-by: Michał Górny <mgorny@gentoo.org>

diff --git a/sys-apps/s6-linux-init/s6-linux-init-1.0.2.0.ebuild b/sys-apps/s6-linux-init/s6-linux-init-1.0.2.0.ebuild
index 6651fc87e2a9ff9f9c3291b7525e7f7a743eb0d1..935ad1c8e6b17bd5f33145d80f5c10d75d5891fd 100644 (file)
--- a/sys-apps/s6-linux-init/s6-linux-init-1.0.2.0.ebuild
+++ b/sys-apps/s6-linux-init/s6-linux-init-1.0.2.0.ebuild
@@ -17,6 +17,10 @@ REQUIRED_USE="static? ( static-libs )"
 RDEPEND=">=dev-lang/execline-2.5.1.0:=[static-libs?]
        >=dev-libs/skalibs-2.8.1.0:=[static-libs?]
        >=sys-apps/s6-2.8.0.1:=[static-libs?]
+       sysv-utils? (
+               !sys-apps/systemd[sysv-utils]
+               !sys-apps/sysvinit
+       )
 "
 DEPEND="${RDEPEND}"
 
@@ -51,6 +55,7 @@ src_install() {
 
        if use sysv-utils ; then
                "${D}/bin/s6-linux-init-maker" -f "${D}/etc/s6-linux-init/skel" "${T}/dir" || die
+               into /
                dosbin "${T}/dir/bin"/{halt,poweroff,reboot,shutdown,telinit}
        fi
 }