commit: 5133ec2e1e0663cb1aae2f2805f9a97b3f3fa761 Author: Zac Medico <zmedico <AT> gentoo <DOT> org> AuthorDate: Fri Dec 9 02:02:58 2022 +0000 Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> CommitDate: Fri Dec 9 02:05:30 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5133ec2e
sys-apps/flatpak: resolve sysusers.d conflict Closes: https://bugs.gentoo.org/856706 Signed-off-by: Zac Medico <zmedico <AT> gentoo.org> sys-apps/flatpak/flatpak-1.12.3-r1.ebuild | 6 ++++++ sys-apps/flatpak/flatpak-1.14.1.ebuild | 2 ++ 2 files changed, 8 insertions(+) diff --git a/sys-apps/flatpak/flatpak-1.12.3-r1.ebuild b/sys-apps/flatpak/flatpak-1.12.3-r1.ebuild index 6914f29a7ab8..b2a47a674fcc 100644 --- a/sys-apps/flatpak/flatpak-1.12.3-r1.ebuild +++ b/sys-apps/flatpak/flatpak-1.12.3-r1.ebuild @@ -100,3 +100,9 @@ src_configure() { econf "${myeconfargs[@]}" } + +src_install() { + default + # resolve conflict with acct-user/flatpak for #856706 + rm -rf "${ED}/usr/lib/sysusers.d" +} diff --git a/sys-apps/flatpak/flatpak-1.14.1.ebuild b/sys-apps/flatpak/flatpak-1.14.1.ebuild index d69ef1b584b3..af8f10e803c2 100644 --- a/sys-apps/flatpak/flatpak-1.14.1.ebuild +++ b/sys-apps/flatpak/flatpak-1.14.1.ebuild @@ -103,4 +103,6 @@ src_install() { default # https://projects.gentoo.org/qa/policy-guide/installed-files.html#pg0303 find "${ED}" -name '*.la' -delete || die + # resolve conflict with acct-user/flatpak for #856706 + rm -rf "${ED}/usr/lib/sysusers.d" }
