From 5133ec2e1e0663cb1aae2f2805f9a97b3f3fa761 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Thu, 8 Dec 2022 18:02:58 -0800 Subject: [PATCH] sys-apps/flatpak: resolve sysusers.d conflict Closes: https://bugs.gentoo.org/856706 Signed-off-by: Zac Medico --- 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 6914f29a7ab8e..b2a47a674fcc4 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 d69ef1b584b35..af8f10e803c29 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" }