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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id F176B158094 for ; Mon, 10 Oct 2022 12:20:20 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id DC6AFE087A; Mon, 10 Oct 2022 12:20:19 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id BFE8EE087A for ; Mon, 10 Oct 2022 12:20:19 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id D474B341057 for ; Mon, 10 Oct 2022 12:20:18 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E8DBB615 for ; Mon, 10 Oct 2022 12:20:15 +0000 (UTC) From: "Joonas Niilola" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Joonas Niilola" Message-ID: <1665404408.c4b0a14d2f16ba537f7995cd0c3b9a839eff85e2.juippis@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/openrc/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-apps/openrc/openrc-0.44.10-r1.ebuild sys-apps/openrc/openrc-0.44.10.ebuild sys-apps/openrc/openrc-0.45.1-r1.ebuild sys-apps/openrc/openrc-0.45.1.ebuild sys-apps/openrc/openrc-0.45.2-r1.ebuild sys-apps/openrc/openrc-0.45.2.ebuild sys-apps/openrc/openrc-9999.ebuild X-VCS-Directories: sys-apps/openrc/ X-VCS-Committer: juippis X-VCS-Committer-Name: Joonas Niilola X-VCS-Revision: c4b0a14d2f16ba537f7995cd0c3b9a839eff85e2 X-VCS-Branch: master Date: Mon, 10 Oct 2022 12:20:15 +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: 45b3ae00-a50d-4f0b-8506-713e37640f8d X-Archives-Hash: d665bd014d07d434a1bbd7667d82858f commit: c4b0a14d2f16ba537f7995cd0c3b9a839eff85e2 Author: Petr Vaněk atlas cz> AuthorDate: Tue Sep 13 13:34:53 2022 +0000 Commit: Joonas Niilola gentoo 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 riseup.net> Signed-off-by: Petr Vaněk atlas.cz> Signed-off-by: Joonas Niilola 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? (