diff options
| author |   Ulrich Müller <ulm@gentoo.org> | 2020-10-03 18:53:37 +0200 |
|---|---|---|
| committer | Ulrich Müller <ulm@gentoo.org> | 2020-10-03 19:20:05 +0200 |
| commit | 8f0cb17c74f10c28be6c270fa99ec2e57f01fe39 (patch) | |
| tree | 5b9411b1da239884228879843c385f031db28cdf | |
| parent | app-misc/resolve-march-native: 1.0.0 (diff) | |
| download | gentoo-8f0cb17c.tar.gz gentoo-8f0cb17c.tar.bz2 gentoo-8f0cb17c.zip | |
net-misc/tigervnc: Remove vncserver binary when USE=-server.
The previous fix was incomplete, because vncserver is now installed in
/usr/libexec instead of /usr/bin.
Fixes: 7fe6b665628d0893edb8f6ee5dd9b287cb3f2929
Bug: https://bugs.gentoo.org/745987
Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Ulrich Müller <ulm@gentoo.org>
| -rw-r--r-- | net-misc/tigervnc/tigervnc-1.11.0-r2.ebuild (renamed from net-misc/tigervnc/tigervnc-1.11.0-r1.ebuild) | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/net-misc/tigervnc/tigervnc-1.11.0-r1.ebuild b/net-misc/tigervnc/tigervnc-1.11.0-r2.ebuild index 7e15237fd3f9..23c4836bddc6 100644 --- a/net-misc/tigervnc/tigervnc-1.11.0-r1.ebuild +++ b/net-misc/tigervnc/tigervnc-1.11.0-r2.ebuild @@ -160,9 +160,9 @@ src_install() { if use server; then emake -C unix/xserver/hw/vnc DESTDIR="${D}" install if ! use xorgmodule; then - rm -rv "${ED%/}"/usr/$(get_libdir)/xorg || die + rm -rv "${ED}"/usr/$(get_libdir)/xorg || die else - rm -v "${ED%/}"/usr/$(get_libdir)/xorg/modules/extensions/libvnc.la || die + rm -v "${ED}"/usr/$(get_libdir)/xorg/modules/extensions/libvnc.la || die fi newconfd "${FILESDIR}"/${PN}.confd ${PN} @@ -171,10 +171,11 @@ src_install() { systemd_douserunit unix/vncserver/vncserver@.service else local f - cd "${ED}" || die for f in x0vncserver vncconfig; do - rm usr/bin/$f || die - rm usr/share/man/man1/$f.1 || die + rm "${ED}"/usr/bin/${f} || die + rm "${ED}"/usr/share/man/man1/${f}.1 || die done + rm -r "${ED}"/usr/{sbin,libexec} || die + rm -r "${ED}"/usr/share/man/man8 || die fi } |