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 30F34138334 for ; Sat, 7 Sep 2019 09:30:21 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 559CCE0AA1; Sat, 7 Sep 2019 09:30:20 +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 381EBE0AA1 for ; Sat, 7 Sep 2019 09:30:20 +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 0E50334ADD3 for ; Sat, 7 Sep 2019 09:30:19 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 35E214D3 for ; Sat, 7 Sep 2019 09:30:03 +0000 (UTC) From: "Jeroen Roovers" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Jeroen Roovers" Message-ID: <1567848597.e46942e0ab7ffb4947d0aae6ccb6c7d544ba2bb0.jer@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-analyzer/wireshark/wireshark-3.0.3.ebuild net-analyzer/wireshark/wireshark-3.1.0.ebuild net-analyzer/wireshark/wireshark-99999999.ebuild X-VCS-Directories: net-analyzer/wireshark/ X-VCS-Committer: jer X-VCS-Committer-Name: Jeroen Roovers X-VCS-Revision: e46942e0ab7ffb4947d0aae6ccb6c7d544ba2bb0 X-VCS-Branch: master Date: Sat, 7 Sep 2019 09:30:03 +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: bba675a3-4fa0-4bef-a9c7-04b6374efc68 X-Archives-Hash: b6f760fea23e89ff15a75c671f5072b0 commit: e46942e0ab7ffb4947d0aae6ccb6c7d544ba2bb0 Author: Jeroen Roovers gentoo org> AuthorDate: Sat Sep 7 09:20:46 2019 +0000 Commit: Jeroen Roovers gentoo org> CommitDate: Sat Sep 7 09:29:57 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e46942e0 net-analyzer/wireshark: Fix installing documentation under prefix Closes: https://bugs.gentoo.org/693608 Package-Manager: Portage-2.3.75, Repoman-2.3.17 Patch-by: Jan B. Signed-off-by: Jeroen Roovers gentoo.org> net-analyzer/wireshark/wireshark-3.0.3.ebuild | 2 +- net-analyzer/wireshark/wireshark-3.1.0.ebuild | 2 +- net-analyzer/wireshark/wireshark-99999999.ebuild | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/net-analyzer/wireshark/wireshark-3.0.3.ebuild b/net-analyzer/wireshark/wireshark-3.0.3.ebuild index 6898a01da4d..b18434e3aee 100644 --- a/net-analyzer/wireshark/wireshark-3.0.3.ebuild +++ b/net-analyzer/wireshark/wireshark-3.0.3.ebuild @@ -146,7 +146,7 @@ src_configure() { -DBUILD_tshark=$(usex tshark) -DBUILD_udpdump=$(usex udpdump) -DBUILD_wireshark=$(usex qt5) - -DCMAKE_INSTALL_DOCDIR="/usr/share/doc/${PF}" + -DCMAKE_INSTALL_DOCDIR="${EROOT%/}/usr/share/doc/${PF}" -DDISABLE_WERROR=yes -DENABLE_BCG729=$(usex bcg729) -DENABLE_CAP=$(usex filecaps caps) diff --git a/net-analyzer/wireshark/wireshark-3.1.0.ebuild b/net-analyzer/wireshark/wireshark-3.1.0.ebuild index cb28f93ddff..e489d3494c1 100644 --- a/net-analyzer/wireshark/wireshark-3.1.0.ebuild +++ b/net-analyzer/wireshark/wireshark-3.1.0.ebuild @@ -147,7 +147,7 @@ src_configure() { -DBUILD_tshark=$(usex tshark) -DBUILD_udpdump=$(usex udpdump) -DBUILD_wireshark=$(usex qt5) - -DCMAKE_INSTALL_DOCDIR="/usr/share/doc/${PF}" + -DCMAKE_INSTALL_DOCDIR="${EROOT%/}/usr/share/doc/${PF}" -DDISABLE_WERROR=yes -DENABLE_BCG729=$(usex bcg729) -DENABLE_BROTLI=$(usex brotli) diff --git a/net-analyzer/wireshark/wireshark-99999999.ebuild b/net-analyzer/wireshark/wireshark-99999999.ebuild index a4453c74df1..97001a17890 100644 --- a/net-analyzer/wireshark/wireshark-99999999.ebuild +++ b/net-analyzer/wireshark/wireshark-99999999.ebuild @@ -147,7 +147,7 @@ src_configure() { -DBUILD_tshark=$(usex tshark) -DBUILD_udpdump=$(usex udpdump) -DBUILD_wireshark=$(usex qt5) - -DCMAKE_INSTALL_DOCDIR="/usr/share/doc/${PF}" + -DCMAKE_INSTALL_DOCDIR="${EROOT%/}/usr/share/doc/${PF}" -DDISABLE_WERROR=yes -DENABLE_BCG729=$(usex bcg729) -DENABLE_BROTLI=$(usex brotli)