mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-11-20 22:27:17 -08:00
app-crypt/gcr: Fix removing conflicting files
Closes: https://bugs.gentoo.org/873895 Signed-off-by: Matt Turner <mattst88@gentoo.org>
This commit is contained in:
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user