commit: 8bdc56e50cbdc681c1079c1fa4b55689ad99a0fc Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Fri Dec 10 00:12:24 2021 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Fri Dec 10 00:12:39 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8bdc56e5
net-analyzer/wireshark: fix automagic doc generation Bug: https://bugs.gentoo.org/828612 Signed-off-by: Sam James <sam <AT> gentoo.org> net-analyzer/wireshark/wireshark-3.6.0-r1.ebuild | 1 + net-analyzer/wireshark/wireshark-9999.ebuild | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/net-analyzer/wireshark/wireshark-3.6.0-r1.ebuild b/net-analyzer/wireshark/wireshark-3.6.0-r1.ebuild index a9bf284be3dc..4d5832c71e75 100644 --- a/net-analyzer/wireshark/wireshark-3.6.0-r1.ebuild +++ b/net-analyzer/wireshark/wireshark-3.6.0-r1.ebuild @@ -127,6 +127,7 @@ src_configure() { python_setup mycmakeargs+=( + -DCMAKE_DISABLE_FIND_PACKAGE_{Asciidoctor,DOXYGEN}=$(usex !doc) $(use androiddump && use pcap && echo -DEXTCAP_ANDROIDDUMP_LIBPCAP=yes) $(usex qt5 LRELEASE=$(qt5_get_bindir)/lrelease '') $(usex qt5 MOC=$(qt5_get_bindir)/moc '') diff --git a/net-analyzer/wireshark/wireshark-9999.ebuild b/net-analyzer/wireshark/wireshark-9999.ebuild index 3b3d7769e8ea..01d79e76e7b1 100644 --- a/net-analyzer/wireshark/wireshark-9999.ebuild +++ b/net-analyzer/wireshark/wireshark-9999.ebuild @@ -18,8 +18,7 @@ else SRC_URI="https://www.wireshark.org/download/src/all-versions/${P/_/}.tar.xz"; S="${WORKDIR}/${P/_/}" - # Seems to break libvirt? - #KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~x86" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~x86" fi LICENSE="GPL-2" @@ -127,6 +126,7 @@ src_configure() { python_setup mycmakeargs+=( + -DCMAKE_DISABLE_FIND_PACKAGE_{Asciidoctor,DOXYGEN}=$(usex !doc) $(use androiddump && use pcap && echo -DEXTCAP_ANDROIDDUMP_LIBPCAP=yes) $(usex qt5 LRELEASE=$(qt5_get_bindir)/lrelease '') $(usex qt5 MOC=$(qt5_get_bindir)/moc '')
