summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuel Holland <samuel@sholland.org>2019-06-22 10:21:53 -0500
committerMichał Górny <mgorny@gentoo.org>2019-06-27 16:51:25 +0200
commit92ad11511a9e3ac2c1930a3fcbda649cbda84e1b (patch)
treeb44efa93200c56ec3003ea5f826f92a280173359 /sys-apps
parentwww-apps/gitea: bump to 1.8.3 (diff)
downloadgentoo-92ad11511a9e3ac2c1930a3fcbda649cbda84e1b.tar.gz
gentoo-92ad11511a9e3ac2c1930a3fcbda649cbda84e1b.tar.bz2
gentoo-92ad11511a9e3ac2c1930a3fcbda649cbda84e1b.zip
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>
Diffstat (limited to 'sys-apps')
-rw-r--r--sys-apps/s6-linux-init/s6-linux-init-1.0.2.0.ebuild5
1 files changed, 5 insertions, 0 deletions
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 6651fc87e2a9..935ad1c8e6b1 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
}