1 |
Also drop a few obsolete users/groups. |
2 |
|
3 |
Package-Manager: Portage-2.3.68, Repoman-2.3.16_p2 |
4 |
Signed-off-by: Mike Gilbert <floppym@g.o> |
5 |
--- |
6 |
sys-apps/systemd/systemd-242-r6.ebuild | 22 ++++++++-------------- |
7 |
sys-apps/systemd/systemd-9999.ebuild | 22 ++++++++-------------- |
8 |
2 files changed, 16 insertions(+), 28 deletions(-) |
9 |
|
10 |
diff --git a/sys-apps/systemd/systemd-242-r6.ebuild b/sys-apps/systemd/systemd-242-r6.ebuild |
11 |
index 0bf3ebc7c7d8..ca285f8361a6 100644 |
12 |
--- a/sys-apps/systemd/systemd-242-r6.ebuild |
13 |
+++ b/sys-apps/systemd/systemd-242-r6.ebuild |
14 |
@@ -72,6 +72,12 @@ DEPEND="${COMMON_DEPEND} |
15 |
|
16 |
# baselayout-2.2 has /run |
17 |
RDEPEND="${COMMON_DEPEND} |
18 |
+ acct-group/systemd-journal |
19 |
+ acct-user/systemd-journal-remote |
20 |
+ acct-user/systemd-coredump |
21 |
+ acct-user/systemd-network |
22 |
+ acct-user/systemd-resolve |
23 |
+ acct-user/systemd-timesync |
24 |
>=sys-apps/baselayout-2.2 |
25 |
selinux? ( sec-policy/selinux-base-policy[systemd] ) |
26 |
sysv-utils? ( !sys-apps/sysvinit ) |
27 |
@@ -85,7 +91,8 @@ RDEPEND="${COMMON_DEPEND} |
28 |
!sys-auth/nss-myhostname |
29 |
!<sys-kernel/dracut-044 |
30 |
!sys-fs/eudev |
31 |
- !sys-fs/udev" |
32 |
+ !sys-fs/udev |
33 |
+" |
34 |
|
35 |
# sys-apps/dbus: the daemon only (+ build-time lib dep for tests) |
36 |
PDEPEND=">=sys-apps/dbus-1.9.8[systemd] |
37 |
@@ -426,22 +433,9 @@ pkg_preinst() { |
38 |
} |
39 |
|
40 |
pkg_postinst() { |
41 |
- newusergroup() { |
42 |
- enewgroup "$1" |
43 |
- enewuser "$1" -1 -1 -1 "$1" |
44 |
- } |
45 |
- |
46 |
enewgroup input |
47 |
enewgroup kvm 78 |
48 |
enewgroup render |
49 |
- enewgroup systemd-journal |
50 |
- newusergroup systemd-coredump |
51 |
- newusergroup systemd-journal-gateway |
52 |
- newusergroup systemd-journal-remote |
53 |
- newusergroup systemd-journal-upload |
54 |
- newusergroup systemd-network |
55 |
- newusergroup systemd-resolve |
56 |
- newusergroup systemd-timesync |
57 |
|
58 |
systemd_update_catalog |
59 |
|
60 |
diff --git a/sys-apps/systemd/systemd-9999.ebuild b/sys-apps/systemd/systemd-9999.ebuild |
61 |
index e0fd800a5e9c..f128a67ba485 100644 |
62 |
--- a/sys-apps/systemd/systemd-9999.ebuild |
63 |
+++ b/sys-apps/systemd/systemd-9999.ebuild |
64 |
@@ -72,6 +72,12 @@ DEPEND="${COMMON_DEPEND} |
65 |
|
66 |
# baselayout-2.2 has /run |
67 |
RDEPEND="${COMMON_DEPEND} |
68 |
+ acct-group/systemd-journal |
69 |
+ acct-user/systemd-journal-remote |
70 |
+ acct-user/systemd-coredump |
71 |
+ acct-user/systemd-network |
72 |
+ acct-user/systemd-resolve |
73 |
+ acct-user/systemd-timesync |
74 |
>=sys-apps/baselayout-2.2 |
75 |
selinux? ( sec-policy/selinux-base-policy[systemd] ) |
76 |
sysv-utils? ( !sys-apps/sysvinit ) |
77 |
@@ -85,7 +91,8 @@ RDEPEND="${COMMON_DEPEND} |
78 |
!sys-auth/nss-myhostname |
79 |
!<sys-kernel/dracut-044 |
80 |
!sys-fs/eudev |
81 |
- !sys-fs/udev" |
82 |
+ !sys-fs/udev |
83 |
+" |
84 |
|
85 |
# sys-apps/dbus: the daemon only (+ build-time lib dep for tests) |
86 |
PDEPEND=">=sys-apps/dbus-1.9.8[systemd] |
87 |
@@ -419,22 +426,9 @@ pkg_preinst() { |
88 |
} |
89 |
|
90 |
pkg_postinst() { |
91 |
- newusergroup() { |
92 |
- enewgroup "$1" |
93 |
- enewuser "$1" -1 -1 -1 "$1" |
94 |
- } |
95 |
- |
96 |
enewgroup input |
97 |
enewgroup kvm 78 |
98 |
enewgroup render |
99 |
- enewgroup systemd-journal |
100 |
- newusergroup systemd-coredump |
101 |
- newusergroup systemd-journal-gateway |
102 |
- newusergroup systemd-journal-remote |
103 |
- newusergroup systemd-journal-upload |
104 |
- newusergroup systemd-network |
105 |
- newusergroup systemd-resolve |
106 |
- newusergroup systemd-timesync |
107 |
|
108 |
systemd_update_catalog |
109 |
|
110 |
-- |
111 |
2.22.0 |