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)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id CCCFD158094 for ; Sat, 1 Oct 2022 22:27:32 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 07DA9E0953; Sat, 1 Oct 2022 22:27:32 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 E4512E0953 for ; Sat, 1 Oct 2022 22:27:31 +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 D4269340DBE for ; Sat, 1 Oct 2022 22:27:30 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id EB13C523 for ; Sat, 1 Oct 2022 22:27:28 +0000 (UTC) From: "Matt Turner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Matt Turner" Message-ID: <1664663242.86ecd2dd3efb7b9dfd887acfc578e33dd0c087c5.mattst88@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-crypt/gcr/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-crypt/gcr/gcr-3.41.1-r1.ebuild X-VCS-Directories: app-crypt/gcr/ X-VCS-Committer: mattst88 X-VCS-Committer-Name: Matt Turner X-VCS-Revision: 86ecd2dd3efb7b9dfd887acfc578e33dd0c087c5 X-VCS-Branch: master Date: Sat, 1 Oct 2022 22:27:28 +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: c15b954e-4f61-42d1-b714-acad328c27ff X-Archives-Hash: b367cfbaee3b5776a50031ba0c6e67c2 commit: 86ecd2dd3efb7b9dfd887acfc578e33dd0c087c5 Author: Matt Turner gentoo org> AuthorDate: Sat Oct 1 22:17:47 2022 +0000 Commit: Matt Turner gentoo org> CommitDate: Sat Oct 1 22:27:22 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=86ecd2dd app-crypt/gcr: Fix removing conflicting files Closes: https://bugs.gentoo.org/873895 Signed-off-by: Matt Turner gentoo.org> app-crypt/gcr/gcr-3.41.1-r1.ebuild | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/app-crypt/gcr/gcr-3.41.1-r1.ebuild b/app-crypt/gcr/gcr-3.41.1-r1.ebuild index ee7f1a92c62d..39aeeaaeb5c4 100644 --- a/app-crypt/gcr/gcr-3.41.1-r1.ebuild +++ b/app-crypt/gcr/gcr-3.41.1-r1.ebuild @@ -80,11 +80,14 @@ src_install() { meson_src_install # These files are installed by gcr:4 - rm \ - "${ED}"/usr/libexec/gcr-ssh-agent \ - "${ED}"/usr/lib/systemd/user/gcr-ssh-agent.service \ - "${ED}"/usr/lib/systemd/user/gcr-ssh-agent.socket \ - || die + local conflicts=( + "${ED}"/usr/libexec/gcr-ssh-agent + ) + use systemd && conflicts+=( + "${ED}"/usr/lib/systemd/user/gcr-ssh-agent.{service,socket} + ) + einfo "${conflicts[@]}" + rm "${conflicts[@]}" || die if use gtk-doc; then mkdir -p "${ED}"/usr/share/gtk-doc/html/ || die