Gentoo Archives: gentoo-commits

From: Mike Gilbert <floppym@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd/
Date: Sun, 28 Feb 2021 04:57:46
Message-Id: 1614488027.e9a076201762dfbbcffa27b1d685b7b286f6506b.floppym@gentoo
1 commit: e9a076201762dfbbcffa27b1d685b7b286f6506b
2 Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
3 AuthorDate: Sun Feb 28 03:49:30 2021 +0000
4 Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
5 CommitDate: Sun Feb 28 04:53:47 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e9a07620
7
8 sys-apps/systemd: add blocker on sys-apps/openrc[sysv-utils]
9
10 Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
11
12 sys-apps/systemd/systemd-246.6.ebuild | 5 ++++-
13 sys-apps/systemd/systemd-247.2-r4.ebuild | 5 ++++-
14 sys-apps/systemd/systemd-9999.ebuild | 5 ++++-
15 3 files changed, 12 insertions(+), 3 deletions(-)
16
17 diff --git a/sys-apps/systemd/systemd-246.6.ebuild b/sys-apps/systemd/systemd-246.6.ebuild
18 index 587173ad06b..b4a7a8ffedb 100644
19 --- a/sys-apps/systemd/systemd-246.6.ebuild
20 +++ b/sys-apps/systemd/systemd-246.6.ebuild
21 @@ -107,7 +107,10 @@ RDEPEND="${COMMON_DEPEND}
22 acct-user/systemd-timesync
23 >=sys-apps/baselayout-2.2
24 selinux? ( sec-policy/selinux-base-policy[systemd] )
25 - sysv-utils? ( !sys-apps/sysvinit )
26 + sysv-utils? (
27 + !sys-apps/openrc[sysv-utils(-)]
28 + !sys-apps/sysvinit
29 + )
30 !sysv-utils? ( sys-apps/sysvinit )
31 resolvconf? ( !net-dns/openresolv )
32 !build? ( || (
33
34 diff --git a/sys-apps/systemd/systemd-247.2-r4.ebuild b/sys-apps/systemd/systemd-247.2-r4.ebuild
35 index f6da107853f..2239dc02efc 100644
36 --- a/sys-apps/systemd/systemd-247.2-r4.ebuild
37 +++ b/sys-apps/systemd/systemd-247.2-r4.ebuild
38 @@ -112,7 +112,10 @@ RDEPEND="${COMMON_DEPEND}
39 >=acct-user/systemd-timesync-0-r1
40 >=sys-apps/baselayout-2.2
41 selinux? ( sec-policy/selinux-base-policy[systemd] )
42 - sysv-utils? ( !sys-apps/sysvinit )
43 + sysv-utils? (
44 + !sys-apps/openrc[sysv-utils(-)]
45 + !sys-apps/sysvinit
46 + )
47 !sysv-utils? ( sys-apps/sysvinit )
48 resolvconf? ( !net-dns/openresolv )
49 !build? ( || (
50
51 diff --git a/sys-apps/systemd/systemd-9999.ebuild b/sys-apps/systemd/systemd-9999.ebuild
52 index 51361983396..dc14b4f1a7f 100644
53 --- a/sys-apps/systemd/systemd-9999.ebuild
54 +++ b/sys-apps/systemd/systemd-9999.ebuild
55 @@ -112,7 +112,10 @@ RDEPEND="${COMMON_DEPEND}
56 >=acct-user/systemd-timesync-0-r1
57 >=sys-apps/baselayout-2.2
58 selinux? ( sec-policy/selinux-base-policy[systemd] )
59 - sysv-utils? ( !sys-apps/sysvinit )
60 + sysv-utils? (
61 + !sys-apps/openrc[sysv-utils(-)]
62 + !sys-apps/sysvinit
63 + )
64 !sysv-utils? ( sys-apps/sysvinit )
65 resolvconf? ( !net-dns/openresolv )
66 !build? ( || (