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@gentoo.org>

diff --git a/sys-apps/systemd/systemd-242-r6.ebuild b/sys-apps/systemd/systemd-242-r6.ebuild
index 0bf3ebc7c7d848e6bd3770d0c63819c360460604..ca285f8361a6bd88f8800e5d831991fcf25407ee 100644 (file)
--- 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 e0fd800a5e9ca06a23ed1c55fbdd6a60c8e73992..f128a67ba4856ec3d6e8d6768058ab4ce9dfa370 100644 (file)
--- 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