[gentoo-commits] repo/gentoo:master commit in: sys-apps/s6-linux-init/

[Michał Górny]

commit:     92ad11511a9e3ac2c1930a3fcbda649cbda84e1b
Author:     Samuel Holland <samuel <AT> sholland <DOT> org>
AuthorDate: Sat Jun 22 15:21:53 2019 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Jun 27 14:51:25 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=92ad1151

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

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

 sys-apps/s6-linux-init/s6-linux-init-1.0.2.0.ebuild | 5 +++++
 1 file changed, 5 insertions(+)

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 6651fc87e2a..935ad1c8e6b 100644
--- 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
 }