From 86ecd2dd3efb7b9dfd887acfc578e33dd0c087c5 Mon Sep 17 00:00:00 2001 From: Matt Turner Date: Sat, 1 Oct 2022 18:17:47 -0400 Subject: [PATCH] app-crypt/gcr: Fix removing conflicting files Closes: https://bugs.gentoo.org/873895 Signed-off-by: Matt Turner --- 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 ee7f1a92c62d3..39aeeaaeb5c46 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