commit: c4b0a14d2f16ba537f7995cd0c3b9a839eff85e2 Author: Petr Vaněk <arkamar <AT> atlas <DOT> cz> AuthorDate: Tue Sep 13 13:34:53 2022 +0000 Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org> CommitDate: Mon Oct 10 12:20:08 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c4b0a14d
sys-apps/openrc: make the package work with sys-apps/s6-linux-init system sys-apps/s6-linux-init is an alternative init system which can be used together with openrc as a service manager. This commit changes dependencies in such a way that makes installation of s6-linux-init with openrc possible. Closes: https://bugs.gentoo.org/867898 Suggested-by: Hoël Bézier <hoelbezier <AT> riseup.net> Signed-off-by: Petr Vaněk <arkamar <AT> atlas.cz> Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org> sys-apps/openrc/{openrc-0.44.10.ebuild => openrc-0.44.10-r1.ebuild} | 5 ++++- sys-apps/openrc/{openrc-0.45.1.ebuild => openrc-0.45.1-r1.ebuild} | 5 ++++- sys-apps/openrc/{openrc-0.45.2.ebuild => openrc-0.45.2-r1.ebuild} | 5 ++++- sys-apps/openrc/openrc-9999.ebuild | 5 ++++- 4 files changed, 16 insertions(+), 4 deletions(-) diff --git a/sys-apps/openrc/openrc-0.44.10.ebuild b/sys-apps/openrc/openrc-0.44.10-r1.ebuild similarity index 97% rename from sys-apps/openrc/openrc-0.44.10.ebuild rename to sys-apps/openrc/openrc-0.44.10-r1.ebuild index c4028fe6262e..a2f439c6cd39 100644 --- a/sys-apps/openrc/openrc-0.44.10.ebuild +++ b/sys-apps/openrc/openrc-0.44.10-r1.ebuild @@ -42,7 +42,10 @@ RDEPEND="${COMMON_DEPEND} !sys-apps/systemd[sysv-utils(-)] !sys-apps/sysvinit ) - !sysv-utils? ( >=sys-apps/sysvinit-2.86-r6[selinux?] ) + !sysv-utils? ( || ( + >=sys-apps/sysvinit-2.86-r6[selinux?] + sys-apps/s6-linux-init[sysv-utils(-)] + ) ) virtual/tmpfiles ) selinux? ( diff --git a/sys-apps/openrc/openrc-0.45.1.ebuild b/sys-apps/openrc/openrc-0.45.1-r1.ebuild similarity index 97% rename from sys-apps/openrc/openrc-0.45.1.ebuild rename to sys-apps/openrc/openrc-0.45.1-r1.ebuild index c76771b7efea..11f6e54ca158 100644 --- a/sys-apps/openrc/openrc-0.45.1.ebuild +++ b/sys-apps/openrc/openrc-0.45.1-r1.ebuild @@ -39,7 +39,10 @@ RDEPEND="${COMMON_DEPEND} !sys-apps/systemd[sysv-utils(-)] !sys-apps/sysvinit ) - !sysv-utils? ( >=sys-apps/sysvinit-2.86-r6[selinux?] ) + !sysv-utils? ( || ( + >=sys-apps/sysvinit-2.86-r6[selinux?] + sys-apps/s6-linux-init[sysv-utils(-)] + ) ) virtual/tmpfiles ) selinux? ( diff --git a/sys-apps/openrc/openrc-0.45.2.ebuild b/sys-apps/openrc/openrc-0.45.2-r1.ebuild similarity index 97% rename from sys-apps/openrc/openrc-0.45.2.ebuild rename to sys-apps/openrc/openrc-0.45.2-r1.ebuild index dfa3900ed994..e9087045f091 100644 --- a/sys-apps/openrc/openrc-0.45.2.ebuild +++ b/sys-apps/openrc/openrc-0.45.2-r1.ebuild @@ -39,7 +39,10 @@ RDEPEND="${COMMON_DEPEND} !sys-apps/systemd[sysv-utils(-)] !sys-apps/sysvinit ) - !sysv-utils? ( >=sys-apps/sysvinit-2.86-r6[selinux?] ) + !sysv-utils? ( || ( + >=sys-apps/sysvinit-2.86-r6[selinux?] + sys-apps/s6-linux-init[sysv-utils(-)] + ) ) virtual/tmpfiles ) selinux? ( diff --git a/sys-apps/openrc/openrc-9999.ebuild b/sys-apps/openrc/openrc-9999.ebuild index c76771b7efea..11f6e54ca158 100644 --- a/sys-apps/openrc/openrc-9999.ebuild +++ b/sys-apps/openrc/openrc-9999.ebuild @@ -39,7 +39,10 @@ RDEPEND="${COMMON_DEPEND} !sys-apps/systemd[sysv-utils(-)] !sys-apps/sysvinit ) - !sysv-utils? ( >=sys-apps/sysvinit-2.86-r6[selinux?] ) + !sysv-utils? ( || ( + >=sys-apps/sysvinit-2.86-r6[selinux?] + sys-apps/s6-linux-init[sysv-utils(-)] + ) ) virtual/tmpfiles ) selinux? (
