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

[Mike Gilbert]

commit:     12a4a6d2e50b11a0d69d6ce791f0977f1335e8f8
Author:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 27 02:02:26 2019 +0000
Commit:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Sat Jul 27 13:18:19 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=12a4a6d2

sys-apps/systemd: utilize new acct-{group,user} packages

Also drop a few obsolete users/groups.

Package-Manager: Portage-2.3.68, Repoman-2.3.16_p2
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>

 sys-apps/systemd/systemd-242-r6.ebuild | 22 ++++++++--------------
 sys-apps/systemd/systemd-9999.ebuild   | 22 ++++++++--------------
 2 files changed, 16 insertions(+), 28 deletions(-)

diff --git a/sys-apps/systemd/systemd-242-r6.ebuild 
b/sys-apps/systemd/systemd-242-r6.ebuild
index 0bf3ebc7c7d..ca285f8361a 100644
--- a/sys-apps/systemd/systemd-242-r6.ebuild
+++ b/sys-apps/systemd/systemd-242-r6.ebuild
@@ -72,6 +72,12 @@ DEPEND="${COMMON_DEPEND}
 
 # baselayout-2.2 has /run
 RDEPEND="${COMMON_DEPEND}
+       acct-group/systemd-journal
+       acct-user/systemd-journal-remote
+       acct-user/systemd-coredump
+       acct-user/systemd-network
+       acct-user/systemd-resolve
+       acct-user/systemd-timesync
        >=sys-apps/baselayout-2.2
        selinux? ( sec-policy/selinux-base-policy[systemd] )
        sysv-utils? ( !sys-apps/sysvinit )
@@ -85,7 +91,8 @@ RDEPEND="${COMMON_DEPEND}
        !sys-auth/nss-myhostname
        !<sys-kernel/dracut-044
        !sys-fs/eudev
-       !sys-fs/udev"
+       !sys-fs/udev
+"
 
 # sys-apps/dbus: the daemon only (+ build-time lib dep for tests)
 PDEPEND=">=sys-apps/dbus-1.9.8[systemd]
@@ -426,22 +433,9 @@ pkg_preinst() {
 }
 
 pkg_postinst() {
-       newusergroup() {
-               enewgroup "$1"
-               enewuser "$1" -1 -1 -1 "$1"
-       }
-
        enewgroup input
        enewgroup kvm 78
        enewgroup render
-       enewgroup systemd-journal
-       newusergroup systemd-coredump
-       newusergroup systemd-journal-gateway
-       newusergroup systemd-journal-remote
-       newusergroup systemd-journal-upload
-       newusergroup systemd-network
-       newusergroup systemd-resolve
-       newusergroup systemd-timesync
 
        systemd_update_catalog
 

diff --git a/sys-apps/systemd/systemd-9999.ebuild 
b/sys-apps/systemd/systemd-9999.ebuild
index e0fd800a5e9..f128a67ba48 100644
--- a/sys-apps/systemd/systemd-9999.ebuild
+++ b/sys-apps/systemd/systemd-9999.ebuild
@@ -72,6 +72,12 @@ DEPEND="${COMMON_DEPEND}
 
 # baselayout-2.2 has /run
 RDEPEND="${COMMON_DEPEND}
+       acct-group/systemd-journal
+       acct-user/systemd-journal-remote
+       acct-user/systemd-coredump
+       acct-user/systemd-network
+       acct-user/systemd-resolve
+       acct-user/systemd-timesync
        >=sys-apps/baselayout-2.2
        selinux? ( sec-policy/selinux-base-policy[systemd] )
        sysv-utils? ( !sys-apps/sysvinit )
@@ -85,7 +91,8 @@ RDEPEND="${COMMON_DEPEND}
        !sys-auth/nss-myhostname
        !<sys-kernel/dracut-044
        !sys-fs/eudev
-       !sys-fs/udev"
+       !sys-fs/udev
+"
 
 # sys-apps/dbus: the daemon only (+ build-time lib dep for tests)
 PDEPEND=">=sys-apps/dbus-1.9.8[systemd]
@@ -419,22 +426,9 @@ pkg_preinst() {
 }
 
 pkg_postinst() {
-       newusergroup() {
-               enewgroup "$1"
-               enewuser "$1" -1 -1 -1 "$1"
-       }
-
        enewgroup input
        enewgroup kvm 78
        enewgroup render
-       enewgroup systemd-journal
-       newusergroup systemd-coredump
-       newusergroup systemd-journal-gateway
-       newusergroup systemd-journal-remote
-       newusergroup systemd-journal-upload
-       newusergroup systemd-network
-       newusergroup systemd-resolve
-       newusergroup systemd-timesync
 
        systemd_update_catalog