[gentoo-commits] repo/gentoo:master commit in: net-misc/tigervnc/

[Ulrich Müller]

commit:     8f0cb17c74f10c28be6c270fa99ec2e57f01fe39
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Sat Oct  3 16:53:37 2020 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Sat Oct  3 17:20:05 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8f0cb17c

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 <AT> gentoo.org>

 .../{tigervnc-1.11.0-r1.ebuild => tigervnc-1.11.0-r2.ebuild}  | 11 ++++++-----
 1 file 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
similarity index 93%
rename from net-misc/tigervnc/tigervnc-1.11.0-r1.ebuild
rename to net-misc/tigervnc/tigervnc-1.11.0-r2.ebuild
index 7e15237fd3f..23c4836bddc 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
 }