1 |
commit: a251ff927e7105c54a9c9401a63027e8f9cdb2cf |
2 |
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Apr 27 19:15:29 2021 +0000 |
4 |
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Apr 27 19:15:57 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a251ff92 |
7 |
|
8 |
net-misc/teamviewer: make docs available for TeamViewer |
9 |
|
10 |
While here, fix installation of icons. |
11 |
|
12 |
Closes: https://bugs.gentoo.org/778617 |
13 |
Closes: https://github.com/gentoo/gentoo/pull/20425 |
14 |
Package-Manager: Portage-3.0.18, Repoman-3.0.3 |
15 |
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org> |
16 |
|
17 |
...15.17.6.ebuild => teamviewer-15.17.6-r1.ebuild} | 38 ++++++++++++---------- |
18 |
1 file changed, 21 insertions(+), 17 deletions(-) |
19 |
|
20 |
diff --git a/net-misc/teamviewer/teamviewer-15.17.6.ebuild b/net-misc/teamviewer/teamviewer-15.17.6-r1.ebuild |
21 |
similarity index 80% |
22 |
rename from net-misc/teamviewer/teamviewer-15.17.6.ebuild |
23 |
rename to net-misc/teamviewer/teamviewer-15.17.6-r1.ebuild |
24 |
index f1cc5dc99df..c9a4dd15708 100644 |
25 |
--- a/net-misc/teamviewer/teamviewer-15.17.6.ebuild |
26 |
+++ b/net-misc/teamviewer/teamviewer-15.17.6-r1.ebuild |
27 |
@@ -3,13 +3,14 @@ |
28 |
|
29 |
EAPI=7 |
30 |
|
31 |
-MY_PN=${PN}${PV/\.*} |
32 |
+MY_MAJOR="$(ver_cut 1)" |
33 |
+MY_P="${PN}${MY_MAJOR}" |
34 |
inherit desktop systemd xdg |
35 |
|
36 |
DESCRIPTION="All-In-One Solution for Remote Access and Support over the Internet" |
37 |
HOMEPAGE="https://www.teamviewer.com" |
38 |
-SRC_URI="amd64? ( https://dl.tvcdn.de/download/linux/version_${PV/\.*}x/${PN}_${PV}_amd64.tar.xz ) |
39 |
- x86? ( https://dl.tvcdn.de/download/linux/version_${PV/\.*}x/${PN}_${PV}_i386.tar.xz )" |
40 |
+SRC_URI="amd64? ( https://dl.tvcdn.de/download/linux/version_${MY_MAJOR}x/${PN}_${PV}_amd64.tar.xz ) |
41 |
+ x86? ( https://dl.tvcdn.de/download/linux/version_${MY_MAJOR}x/${PN}_${PV}_i386.tar.xz )" |
42 |
|
43 |
LICENSE="TeamViewer MIT" |
44 |
SLOT="0" |
45 |
@@ -34,7 +35,7 @@ RDEPEND=" |
46 |
RESTRICT="bindist mirror" |
47 |
|
48 |
# Silence QA messages |
49 |
-QA_PREBUILT="opt/${MY_PN}/*" |
50 |
+QA_PREBUILT="opt/${MY_P}/*" |
51 |
|
52 |
S="${WORKDIR}"/teamviewer |
53 |
|
54 |
@@ -49,7 +50,7 @@ src_prepare() { |
55 |
} |
56 |
|
57 |
src_install() { |
58 |
- local dst="/opt/${MY_PN}" # install destination |
59 |
+ local dst="/opt/${MY_P}" # install destination |
60 |
|
61 |
# Quirk: |
62 |
# Remove Intel 80386 32-bit ELF binary 'libdepend' present in all |
63 |
@@ -63,6 +64,7 @@ src_install() { |
64 |
doins -r tv_bin |
65 |
|
66 |
# Set permissions for executables and libraries |
67 |
+ local exe |
68 |
for exe in $(find tv_bin -type f -executable -or -name '*.so'); do |
69 |
fperms 755 ${dst}/${exe} |
70 |
done |
71 |
@@ -78,32 +80,34 @@ src_install() { |
72 |
insinto /usr/share/polkit-1/actions |
73 |
doins tv_bin/script/com.teamviewer.TeamViewer.policy |
74 |
|
75 |
+ local size |
76 |
for size in 16 24 32 48 256; do |
77 |
- newicon -s ${size} tv_bin/desktop/teamviewer_${size}.png TeamViewer.png |
78 |
+ newicon -s ${size} tv_bin/desktop/teamviewer_${size}.png teamviewer.png |
79 |
done |
80 |
|
81 |
- # Install documents (NOTE: using 'dodoc -r doc' instead of loop will |
82 |
- # have the undesired result of installing subdirectory 'doc' in /usr/ |
83 |
- # share/doc/teamviewer-<version>) |
84 |
- for doc in $(find doc -type f); do |
85 |
- dodoc ${doc} |
86 |
- done |
87 |
+ dodoc -r doc |
88 |
+ |
89 |
+ # Make docs available in expected location |
90 |
+ dosym ../../usr/share/doc/${PF}/doc ${dst}/doc |
91 |
+ |
92 |
+ # We need to keep docs uncompressed, bug #778617 |
93 |
+ docompress -x /usr/share/doc/${PF}/* |
94 |
|
95 |
- keepdir /etc/${MY_PN} |
96 |
- dosym ../../etc/${MY_PN} ${dst}/config |
97 |
+ keepdir /etc/${MY_P} |
98 |
+ dosym ../../etc/${MY_P} ${dst}/config |
99 |
|
100 |
# Create directory and symlink for log files (NOTE: according to Team- |
101 |
# Viewer devs, all paths are hard-coded in the binaries; therefore |
102 |
# using the same path as the DEB/RPM archives, i.e. '/var/log/teamviewer |
103 |
# <major-version>') |
104 |
- keepdir /var/log/${MY_PN} |
105 |
- dosym ../../var/log/${MY_PN} ${dst}/logfiles |
106 |
+ keepdir /var/log/${MY_P} |
107 |
+ dosym ../../var/log/${MY_P} ${dst}/logfiles |
108 |
|
109 |
dodir /opt/bin |
110 |
dosym ${dst}/tv_bin/teamviewerd /opt/bin/teamviewerd |
111 |
dosym ${dst}/tv_bin/script/teamviewer /opt/bin/teamviewer |
112 |
|
113 |
- make_desktop_entry teamviewer "TeamViewer ${SLOT}" TeamViewer |
114 |
+ make_desktop_entry teamviewer "TeamViewer ${MY_MAJOR}" teamviewer |
115 |
} |
116 |
|
117 |
pkg_postinst() { |