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

[Mike Gilbert]

commit:     40a807ce427ae32887f60fe62013c7b3843f8e7e
Author:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 26 19:49:52 2018 +0000
Commit:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Fri Jan 26 20:21:52 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=40a807ce

sys-apps/systemd: keepdir /etc/udev/{hwdb.d,rules.d}

Bug: https://bugs.gentoo.org/645844
Package-Manager: Portage-2.3.19_p11, Repoman-2.3.6_p45

 sys-apps/systemd/systemd-236-r5.ebuild | 7 ++++---
 sys-apps/systemd/systemd-9999.ebuild   | 7 ++++---
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/sys-apps/systemd/systemd-236-r5.ebuild 
b/sys-apps/systemd/systemd-236-r5.ebuild
index 961530f55ed..4156ce618fe 100644
--- a/sys-apps/systemd/systemd-236-r5.ebuild
+++ b/sys-apps/systemd/systemd-236-r5.ebuild
@@ -313,9 +313,10 @@ multilib_src_install_all() {
        fi
 
        # Preserve empty dirs in /etc & /var, bug #437008
-       keepdir /etc/binfmt.d /etc/modules-load.d /etc/tmpfiles.d \
-               /etc/systemd/ntp-units.d /etc/systemd/user /var/lib/systemd \
-               /var/log/journal/remote
+       keepdir /etc/{binfmt.d,modules-load.d,tmpfiles.d}
+       keepdir /etc/systemd/{ntp-units.d,user} /var/lib/systemd
+       keepdir /etc/udev/{hwdb.d,rules.d}
+       keepdir /var/log/journal/remote
 
        # 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 7e7bcf41a44..36144514e86 100644
--- a/sys-apps/systemd/systemd-9999.ebuild
+++ b/sys-apps/systemd/systemd-9999.ebuild
@@ -312,9 +312,10 @@ multilib_src_install_all() {
        fi
 
        # Preserve empty dirs in /etc & /var, bug #437008
-       keepdir /etc/binfmt.d /etc/modules-load.d /etc/tmpfiles.d \
-               /etc/systemd/ntp-units.d /etc/systemd/user /var/lib/systemd \
-               /var/log/journal/remote
+       keepdir /etc/{binfmt.d,modules-load.d,tmpfiles.d}
+       keepdir /etc/systemd/{ntp-units.d,user} /var/lib/systemd
+       keepdir /etc/udev/{hwdb.d,rules.d}
+       keepdir /var/log/journal/remote
 
        # Symlink /etc/sysctl.conf for easy migration.
        dosym ../sysctl.conf /etc/sysctl.d/99-sysctl.conf