From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id A26A8138359 for ; Sat, 3 Oct 2020 17:20:23 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id DA7CCE0828; Sat, 3 Oct 2020 17:20:22 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id BF7CCE0828 for ; Sat, 3 Oct 2020 17:20:22 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 708C6335D74 for ; Sat, 3 Oct 2020 17:20:21 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E6AEC373 for ; Sat, 3 Oct 2020 17:20:19 +0000 (UTC) From: "Ulrich Müller" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ulrich Müller" Message-ID: <1601745605.8f0cb17c74f10c28be6c270fa99ec2e57f01fe39.ulm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-misc/tigervnc/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-misc/tigervnc/tigervnc-1.11.0-r1.ebuild net-misc/tigervnc/tigervnc-1.11.0-r2.ebuild X-VCS-Directories: net-misc/tigervnc/ X-VCS-Committer: ulm X-VCS-Committer-Name: Ulrich Müller X-VCS-Revision: 8f0cb17c74f10c28be6c270fa99ec2e57f01fe39 X-VCS-Branch: master Date: Sat, 3 Oct 2020 17:20:19 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: b5e39c1e-decf-43eb-b08c-f44af30b9bc4 X-Archives-Hash: e9d961403a628206863194e15269bd80 commit: 8f0cb17c74f10c28be6c270fa99ec2e57f01fe39 Author: Ulrich Müller gentoo org> AuthorDate: Sat Oct 3 16:53:37 2020 +0000 Commit: Ulrich Müller gentoo 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 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 }