commit: 111e1527e7be452a15e0b02dea401c87ed937264 Author: Mike Gilbert <floppym <AT> gentoo <DOT> org> AuthorDate: Sun Dec 27 19:13:42 2020 +0000 Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> CommitDate: Sun Dec 27 19:19:26 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=111e1527
sys-apps/systemd: drop sysusers.d files These conflict with the files generated by the acct-* packages. Bug: https://bugs.gentoo.org/761763 Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org> sys-apps/systemd/{systemd-247.2-r1.ebuild => systemd-247.2-r2.ebuild} | 3 +++ sys-apps/systemd/systemd-9999.ebuild | 3 +++ 2 files changed, 6 insertions(+) diff --git a/sys-apps/systemd/systemd-247.2-r1.ebuild b/sys-apps/systemd/systemd-247.2-r2.ebuild similarity index 99% rename from sys-apps/systemd/systemd-247.2-r1.ebuild rename to sys-apps/systemd/systemd-247.2-r2.ebuild index 3d84b39bc76..d657bb688fa 100644 --- a/sys-apps/systemd/systemd-247.2-r1.ebuild +++ b/sys-apps/systemd/systemd-247.2-r2.ebuild @@ -371,6 +371,9 @@ multilib_src_install_all() { rmdir "${ED}${rootprefix}"/sbin || die fi + # https://bugs.gentoo.org/761763 + rm -r "${ED}"/usr/lib/sysusers.d || die + # Preserve empty dirs in /etc & /var, bug #437008 keepdir /etc/{binfmt.d,modules-load.d,tmpfiles.d} keepdir /etc/kernel/install.d diff --git a/sys-apps/systemd/systemd-9999.ebuild b/sys-apps/systemd/systemd-9999.ebuild index 3d84b39bc76..d657bb688fa 100644 --- a/sys-apps/systemd/systemd-9999.ebuild +++ b/sys-apps/systemd/systemd-9999.ebuild @@ -371,6 +371,9 @@ multilib_src_install_all() { rmdir "${ED}${rootprefix}"/sbin || die fi + # https://bugs.gentoo.org/761763 + rm -r "${ED}"/usr/lib/sysusers.d || die + # Preserve empty dirs in /etc & /var, bug #437008 keepdir /etc/{binfmt.d,modules-load.d,tmpfiles.d} keepdir /etc/kernel/install.d
