diff options
| author |   Matt Turner <mattst88@gentoo.org> | 2022-10-01 18:17:47 -0400 |
|---|---|---|
| committer | Matt Turner <mattst88@gentoo.org> | 2022-10-01 18:27:22 -0400 |
| commit | 86ecd2dd3efb7b9dfd887acfc578e33dd0c087c5 (patch) | |
| tree | 708e724dc20afeea72caa102748f791dc1cddcfb | |
| parent | dev-util/libabigail: fix pre-generated man install path, add info pages (diff) | |
| download | gentoo-86ecd2dd3efb7b9dfd887acfc578e33dd0c087c5.tar.gz gentoo-86ecd2dd3efb7b9dfd887acfc578e33dd0c087c5.tar.bz2 gentoo-86ecd2dd3efb7b9dfd887acfc578e33dd0c087c5.zip | |
app-crypt/gcr: Fix removing conflicting files
Closes: https://bugs.gentoo.org/873895
Signed-off-by: Matt Turner <mattst88@gentoo.org>
| -rw-r--r-- | app-crypt/gcr/gcr-3.41.1-r1.ebuild | 13 |
1 files 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 |