[gentoo-commits] repo/gentoo:master commit in: sys-apps/openrc/

[William Hubbs]

commit:     3072b8073e353cc924d1898505e6b8949b0204a0
Author:     William Hubbs <williamh <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 18 22:36:52 2024 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Thu Jan 18 22:36:52 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3072b807

sys-apps/openrc: sync live

Signed-off-by: William Hubbs <williamh <AT> gentoo.org>

 sys-apps/openrc/openrc-9999.ebuild | 24 ++++++++++--------------
 1 file changed, 10 insertions(+), 14 deletions(-)

diff --git a/sys-apps/openrc/openrc-9999.ebuild 
b/sys-apps/openrc/openrc-9999.ebuild
index 11d77ecda370..b81bd00d2247 100644
--- a/sys-apps/openrc/openrc-9999.ebuild
+++ b/sys-apps/openrc/openrc-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -18,7 +18,7 @@ fi
 
 LICENSE="BSD-2"
 SLOT="0"
-IUSE="audit bash debug ncurses pam newnet +netifrc selinux sysv-utils unicode"
+IUSE="audit bash debug ncurses pam newnet +netifrc selinux s6 +sysvinit 
sysv-utils unicode"
 
 COMMON_DEPEND="
        ncurses? ( sys-libs/ncurses:0= )
@@ -34,19 +34,15 @@ DEPEND="${COMMON_DEPEND}
        ncurses? ( virtual/pkgconfig )"
 RDEPEND="${COMMON_DEPEND}
        bash? ( app-shells/bash )
-       !prefix? (
-               sysv-utils? (
-                       !sys-apps/systemd[sysv-utils(-)]
-                       !sys-apps/sysvinit
-               )
-               !sysv-utils? (
-                       || (
-                               >=sys-apps/sysvinit-2.86-r6[selinux?]
-                               sys-apps/s6-linux-init[sysv-utils(-)]
-                       )
-               )
-               virtual/tmpfiles
+       sysv-utils? (
+               !sys-apps/systemd[sysv-utils(-)]
+               !sys-apps/sysvinit
+       )
+       !sysv-utils? (
+               sysvinit? ( >=sys-apps/sysvinit-2.86-r6[selinux?] )
+               s6? ( sys-apps/s6-linux-init[sysv-utils(-)] )
        )
+       virtual/tmpfiles
        selinux? (
                >=sec-policy/selinux-base-policy-2.20170204-r4
                >=sec-policy/selinux-openrc-2.20170204-r4