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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 6A697158086 for ; Fri, 10 Dec 2021 00:12:53 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9710E2BC019; Fri, 10 Dec 2021 00:12:52 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id E1BBE2BC019 for ; Fri, 10 Dec 2021 00:12:51 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 55C29343841 for ; Fri, 10 Dec 2021 00:12:50 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 8AE191DC for ; Fri, 10 Dec 2021 00:12:48 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1639095159.8bdc56e50cbdc681c1079c1fa4b55689ad99a0fc.sam@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.6.0-r1.ebuild net-analyzer/wireshark/wireshark-9999.ebuild X-VCS-Directories: net-analyzer/wireshark/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 8bdc56e50cbdc681c1079c1fa4b55689ad99a0fc X-VCS-Branch: master Date: Fri, 10 Dec 2021 00:12:48 +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: b960c606-19ec-456a-98ce-0d1556266e6c X-Archives-Hash: 616b0481db879f5dfd53302b2657c6c5 commit: 8bdc56e50cbdc681c1079c1fa4b55689ad99a0fc Author: Sam James gentoo org> AuthorDate: Fri Dec 10 00:12:24 2021 +0000 Commit: Sam James gentoo 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 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 '')