1 |
commit: 8f0cb17c74f10c28be6c270fa99ec2e57f01fe39 |
2 |
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Oct 3 16:53:37 2020 +0000 |
4 |
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Oct 3 17:20:05 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8f0cb17c |
7 |
|
8 |
net-misc/tigervnc: Remove vncserver binary when USE=-server. |
9 |
|
10 |
The previous fix was incomplete, because vncserver is now installed in |
11 |
/usr/libexec instead of /usr/bin. |
12 |
|
13 |
Fixes: 7fe6b665628d0893edb8f6ee5dd9b287cb3f2929 |
14 |
Bug: https://bugs.gentoo.org/745987 |
15 |
Package-Manager: Portage-3.0.8, Repoman-3.0.1 |
16 |
Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org> |
17 |
|
18 |
.../{tigervnc-1.11.0-r1.ebuild => tigervnc-1.11.0-r2.ebuild} | 11 ++++++----- |
19 |
1 file changed, 6 insertions(+), 5 deletions(-) |
20 |
|
21 |
diff --git a/net-misc/tigervnc/tigervnc-1.11.0-r1.ebuild b/net-misc/tigervnc/tigervnc-1.11.0-r2.ebuild |
22 |
similarity index 93% |
23 |
rename from net-misc/tigervnc/tigervnc-1.11.0-r1.ebuild |
24 |
rename to net-misc/tigervnc/tigervnc-1.11.0-r2.ebuild |
25 |
index 7e15237fd3f..23c4836bddc 100644 |
26 |
--- a/net-misc/tigervnc/tigervnc-1.11.0-r1.ebuild |
27 |
+++ b/net-misc/tigervnc/tigervnc-1.11.0-r2.ebuild |
28 |
@@ -160,9 +160,9 @@ src_install() { |
29 |
if use server; then |
30 |
emake -C unix/xserver/hw/vnc DESTDIR="${D}" install |
31 |
if ! use xorgmodule; then |
32 |
- rm -rv "${ED%/}"/usr/$(get_libdir)/xorg || die |
33 |
+ rm -rv "${ED}"/usr/$(get_libdir)/xorg || die |
34 |
else |
35 |
- rm -v "${ED%/}"/usr/$(get_libdir)/xorg/modules/extensions/libvnc.la || die |
36 |
+ rm -v "${ED}"/usr/$(get_libdir)/xorg/modules/extensions/libvnc.la || die |
37 |
fi |
38 |
|
39 |
newconfd "${FILESDIR}"/${PN}.confd ${PN} |
40 |
@@ -171,10 +171,11 @@ src_install() { |
41 |
systemd_douserunit unix/vncserver/vncserver@.service |
42 |
else |
43 |
local f |
44 |
- cd "${ED}" || die |
45 |
for f in x0vncserver vncconfig; do |
46 |
- rm usr/bin/$f || die |
47 |
- rm usr/share/man/man1/$f.1 || die |
48 |
+ rm "${ED}"/usr/bin/${f} || die |
49 |
+ rm "${ED}"/usr/share/man/man1/${f}.1 || die |
50 |
done |
51 |
+ rm -r "${ED}"/usr/{sbin,libexec} || die |
52 |
+ rm -r "${ED}"/usr/share/man/man8 || die |
53 |
fi |
54 |
} |