From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id D8386138334 for ; Thu, 27 Jun 2019 14:56:15 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E1E9FE07C7; Thu, 27 Jun 2019 14:56:14 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id ACD57E07C7 for ; Thu, 27 Jun 2019 14:56:14 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 9F1BE346B94 for ; Thu, 27 Jun 2019 14:56:13 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 22141606 for ; Thu, 27 Jun 2019 14:56:12 +0000 (UTC) From: "Michał Górny" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michał Górny" Message-ID: <1561647085.92ad11511a9e3ac2c1930a3fcbda649cbda84e1b.mgorny@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/s6-linux-init/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-apps/s6-linux-init/s6-linux-init-1.0.2.0.ebuild X-VCS-Directories: sys-apps/s6-linux-init/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 92ad11511a9e3ac2c1930a3fcbda649cbda84e1b X-VCS-Branch: master Date: Thu, 27 Jun 2019 14:56:12 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 89016f22-1cae-406b-9330-d262828acc09 X-Archives-Hash: 7410409788ff7c69995dfd70e751cefb commit: 92ad11511a9e3ac2c1930a3fcbda649cbda84e1b Author: Samuel Holland sholland org> AuthorDate: Sat Jun 22 15:21:53 2019 +0000 Commit: Michał Górny gentoo 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 sholland.org> Closes: https://github.com/gentoo/gentoo/pull/12305 Signed-off-by: Michał Górny 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 }