sys-apps/systemd: update keepdir list

Closes: https://bugs.gentoo.org/678758
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 e6f4be93ba1eed5f2e29094fd806c0f4004028f2..15408cfe976ad74d4499dbb58341c115e0fa40d8 100644 (file)
--- a/sys-apps/systemd/systemd-242-r6.ebuild
+++ b/sys-apps/systemd/systemd-242-r6.ebuild
@@ -343,9 +343,14 @@ multilib_src_install_all() {
 
        # Preserve empty dirs in /etc & /var, bug #437008
        keepdir /etc/{binfmt.d,modules-load.d,tmpfiles.d}
-       keepdir /etc/systemd/{ntp-units.d,user} /var/lib/systemd
+       keepdir /etc/kernel/install.d
+       keepdir /etc/systemd/{network,user}
        keepdir /etc/udev/{hwdb.d,rules.d}
-       keepdir /var/log/journal/remote
+       keepdir "${rootprefix}"/lib/systemd/{system-sleep,system-shutdown}
+       keepdir /usr/lib/{binfmt.d,modules-load.d}
+       keepdir /usr/lib/systemd/user-generators
+       keepdir /var/lib/systemd
+       rm -rf "${ED}"/var/log || die
 
        # Symlink /etc/sysctl.conf for easy migration.
        dosym ../sysctl.conf /etc/sysctl.d/99-sysctl.conf

diff --git a/sys-apps/systemd/systemd-9999.ebuild b/sys-apps/systemd/systemd-9999.ebuild
index 7c9a8cf91165ddcf328ab9562f71036767e659b5..7769725c2c29f39d103e84a098b4db5d37a78957 100644 (file)
--- a/sys-apps/systemd/systemd-9999.ebuild
+++ b/sys-apps/systemd/systemd-9999.ebuild
@@ -336,9 +336,14 @@ multilib_src_install_all() {
 
        # Preserve empty dirs in /etc & /var, bug #437008
        keepdir /etc/{binfmt.d,modules-load.d,tmpfiles.d}
-       keepdir /etc/systemd/{ntp-units.d,user} /var/lib/systemd
+       keepdir /etc/kernel/install.d
+       keepdir /etc/systemd/{network,user}
        keepdir /etc/udev/{hwdb.d,rules.d}
-       keepdir /var/log/journal/remote
+       keepdir "${rootprefix}"/lib/systemd/{system-sleep,system-shutdown}
+       keepdir /usr/lib/{binfmt.d,modules-load.d}
+       keepdir /usr/lib/systemd/user-generators
+       keepdir /var/lib/systemd
+       rm -rf "${ED}"/var/log || die
 
        # Symlink /etc/sysctl.conf for easy migration.
        dosym ../sysctl.conf /etc/sysctl.d/99-sysctl.conf