From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 5E10C158021 for ; Fri, 9 Dec 2022 02:05:40 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6A9FCE0843; Fri, 9 Dec 2022 02:05:38 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 4FC4BE0843 for ; Fri, 9 Dec 2022 02:05:38 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 0DE4C340A3B for ; Fri, 9 Dec 2022 02:05:37 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 4871E77B for ; Fri, 9 Dec 2022 02:05:35 +0000 (UTC) From: "Zac Medico" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Zac Medico" Message-ID: <1670551530.5133ec2e1e0663cb1aae2f2805f9a97b3f3fa761.zmedico@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/flatpak/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-apps/flatpak/flatpak-1.12.3-r1.ebuild sys-apps/flatpak/flatpak-1.14.1.ebuild X-VCS-Directories: sys-apps/flatpak/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: 5133ec2e1e0663cb1aae2f2805f9a97b3f3fa761 X-VCS-Branch: master Date: Fri, 9 Dec 2022 02:05:35 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 899a97b3-e2a2-4cf8-9bfd-ba4f992fbd43 X-Archives-Hash: 5101915959300eb7a7a2cdf599a41453 commit: 5133ec2e1e0663cb1aae2f2805f9a97b3f3fa761 Author: Zac Medico gentoo org> AuthorDate: Fri Dec 9 02:02:58 2022 +0000 Commit: Zac Medico gentoo 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 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" }