Gentoo Archives: gentoo-commits

From: Jeroen Roovers <jer@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/
Date: Sat, 07 Sep 2019 09:30:21
Message-Id: 1567848597.e46942e0ab7ffb4947d0aae6ccb6c7d544ba2bb0.jer@gentoo
1 commit: e46942e0ab7ffb4947d0aae6ccb6c7d544ba2bb0
2 Author: Jeroen Roovers <jer <AT> gentoo <DOT> org>
3 AuthorDate: Sat Sep 7 09:20:46 2019 +0000
4 Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org>
5 CommitDate: Sat Sep 7 09:29:57 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e46942e0
7
8 net-analyzer/wireshark: Fix installing documentation under prefix
9
10 Closes: https://bugs.gentoo.org/693608
11 Package-Manager: Portage-2.3.75, Repoman-2.3.17
12 Patch-by: Jan B.
13 Signed-off-by: Jeroen Roovers <jer <AT> gentoo.org>
14
15 net-analyzer/wireshark/wireshark-3.0.3.ebuild | 2 +-
16 net-analyzer/wireshark/wireshark-3.1.0.ebuild | 2 +-
17 net-analyzer/wireshark/wireshark-99999999.ebuild | 2 +-
18 3 files changed, 3 insertions(+), 3 deletions(-)
19
20 diff --git a/net-analyzer/wireshark/wireshark-3.0.3.ebuild b/net-analyzer/wireshark/wireshark-3.0.3.ebuild
21 index 6898a01da4d..b18434e3aee 100644
22 --- a/net-analyzer/wireshark/wireshark-3.0.3.ebuild
23 +++ b/net-analyzer/wireshark/wireshark-3.0.3.ebuild
24 @@ -146,7 +146,7 @@ src_configure() {
25 -DBUILD_tshark=$(usex tshark)
26 -DBUILD_udpdump=$(usex udpdump)
27 -DBUILD_wireshark=$(usex qt5)
28 - -DCMAKE_INSTALL_DOCDIR="/usr/share/doc/${PF}"
29 + -DCMAKE_INSTALL_DOCDIR="${EROOT%/}/usr/share/doc/${PF}"
30 -DDISABLE_WERROR=yes
31 -DENABLE_BCG729=$(usex bcg729)
32 -DENABLE_CAP=$(usex filecaps caps)
33
34 diff --git a/net-analyzer/wireshark/wireshark-3.1.0.ebuild b/net-analyzer/wireshark/wireshark-3.1.0.ebuild
35 index cb28f93ddff..e489d3494c1 100644
36 --- a/net-analyzer/wireshark/wireshark-3.1.0.ebuild
37 +++ b/net-analyzer/wireshark/wireshark-3.1.0.ebuild
38 @@ -147,7 +147,7 @@ src_configure() {
39 -DBUILD_tshark=$(usex tshark)
40 -DBUILD_udpdump=$(usex udpdump)
41 -DBUILD_wireshark=$(usex qt5)
42 - -DCMAKE_INSTALL_DOCDIR="/usr/share/doc/${PF}"
43 + -DCMAKE_INSTALL_DOCDIR="${EROOT%/}/usr/share/doc/${PF}"
44 -DDISABLE_WERROR=yes
45 -DENABLE_BCG729=$(usex bcg729)
46 -DENABLE_BROTLI=$(usex brotli)
47
48 diff --git a/net-analyzer/wireshark/wireshark-99999999.ebuild b/net-analyzer/wireshark/wireshark-99999999.ebuild
49 index a4453c74df1..97001a17890 100644
50 --- a/net-analyzer/wireshark/wireshark-99999999.ebuild
51 +++ b/net-analyzer/wireshark/wireshark-99999999.ebuild
52 @@ -147,7 +147,7 @@ src_configure() {
53 -DBUILD_tshark=$(usex tshark)
54 -DBUILD_udpdump=$(usex udpdump)
55 -DBUILD_wireshark=$(usex qt5)
56 - -DCMAKE_INSTALL_DOCDIR="/usr/share/doc/${PF}"
57 + -DCMAKE_INSTALL_DOCDIR="${EROOT%/}/usr/share/doc/${PF}"
58 -DDISABLE_WERROR=yes
59 -DENABLE_BCG729=$(usex bcg729)
60 -DENABLE_BROTLI=$(usex brotli)