| 1 |
commit: 86ecd2dd3efb7b9dfd887acfc578e33dd0c087c5 |
| 2 |
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Oct 1 22:17:47 2022 +0000 |
| 4 |
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Oct 1 22:27:22 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=86ecd2dd |
| 7 |
|
| 8 |
app-crypt/gcr: Fix removing conflicting files |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/873895 |
| 11 |
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org> |
| 12 |
|
| 13 |
app-crypt/gcr/gcr-3.41.1-r1.ebuild | 13 ++++++++----- |
| 14 |
1 file changed, 8 insertions(+), 5 deletions(-) |
| 15 |
|
| 16 |
diff --git a/app-crypt/gcr/gcr-3.41.1-r1.ebuild b/app-crypt/gcr/gcr-3.41.1-r1.ebuild |
| 17 |
index ee7f1a92c62d..39aeeaaeb5c4 100644 |
| 18 |
--- a/app-crypt/gcr/gcr-3.41.1-r1.ebuild |
| 19 |
+++ b/app-crypt/gcr/gcr-3.41.1-r1.ebuild |
| 20 |
@@ -80,11 +80,14 @@ src_install() { |
| 21 |
meson_src_install |
| 22 |
|
| 23 |
# These files are installed by gcr:4 |
| 24 |
- rm \ |
| 25 |
- "${ED}"/usr/libexec/gcr-ssh-agent \ |
| 26 |
- "${ED}"/usr/lib/systemd/user/gcr-ssh-agent.service \ |
| 27 |
- "${ED}"/usr/lib/systemd/user/gcr-ssh-agent.socket \ |
| 28 |
- || die |
| 29 |
+ local conflicts=( |
| 30 |
+ "${ED}"/usr/libexec/gcr-ssh-agent |
| 31 |
+ ) |
| 32 |
+ use systemd && conflicts+=( |
| 33 |
+ "${ED}"/usr/lib/systemd/user/gcr-ssh-agent.{service,socket} |
| 34 |
+ ) |
| 35 |
+ einfo "${conflicts[@]}" |
| 36 |
+ rm "${conflicts[@]}" || die |
| 37 |
|
| 38 |
if use gtk-doc; then |
| 39 |
mkdir -p "${ED}"/usr/share/gtk-doc/html/ || die |
Archives