[gentoo-commits] repo/gentoo:master commit in: app-crypt/gcr/

["Matt Turner" <mattst88@gentoo.org>]

commit:     86ecd2dd3efb7b9dfd887acfc578e33dd0c087c5
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Sat Oct  1 22:17:47 2022 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> 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 <mattst88 <AT> 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