app-crypt/gcr: Fix removing conflicting files

Closes: https://bugs.gentoo.org/873895 Signed-off-by: Matt Turner <[email protected]>
johu · Oct 1, 2022 · 86ecd2d · 86ecd2d
1 parent 2d53cac
commit 86ecd2d
Showing 1 changed file with 8 additions and 5 deletions.
diff --git 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