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) server-digest SHA256) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 1D9F8158020 for ; Tue, 13 Dec 2022 04:08:40 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 12B5BE0878; Tue, 13 Dec 2022 04:08:39 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (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 E7B64E0878 for ; Tue, 13 Dec 2022 04:08:38 +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 9684F3410D5 for ; Tue, 13 Dec 2022 04:08:37 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id CA50C780 for ; Tue, 13 Dec 2022 04:08:35 +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: <1670904505.a974312c47c04399c97ab6e3b0f5d06db3f7b1f0.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.10.ebuild net-analyzer/wireshark/wireshark-3.6.9.ebuild net-analyzer/wireshark/wireshark-4.0.1.ebuild net-analyzer/wireshark/wireshark-4.0.2.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: a974312c47c04399c97ab6e3b0f5d06db3f7b1f0 X-VCS-Branch: master Date: Tue, 13 Dec 2022 04:08:35 +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: 3618a2a5-114f-444c-a40f-42292dfa79ae X-Archives-Hash: 5716ffc522d4b623683a9cc120154e3e commit: a974312c47c04399c97ab6e3b0f5d06db3f7b1f0 Author: Sam James gentoo org> AuthorDate: Tue Dec 13 04:08:17 2022 +0000 Commit: Sam James gentoo org> CommitDate: Tue Dec 13 04:08:25 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a974312c net-analyzer/wireshark: respect selected Python choice Closes: https://bugs.gentoo.org/885703 Closes: https://bugs.gentoo.org/884819 Signed-off-by: Sam James gentoo.org> net-analyzer/wireshark/wireshark-3.6.10.ebuild | 3 +++ net-analyzer/wireshark/wireshark-3.6.9.ebuild | 3 +++ net-analyzer/wireshark/wireshark-4.0.1.ebuild | 3 +++ net-analyzer/wireshark/wireshark-4.0.2.ebuild | 3 +++ net-analyzer/wireshark/wireshark-9999.ebuild | 3 +++ 5 files changed, 15 insertions(+) diff --git a/net-analyzer/wireshark/wireshark-3.6.10.ebuild b/net-analyzer/wireshark/wireshark-3.6.10.ebuild index fffca9343012..535f46aab957 100644 --- a/net-analyzer/wireshark/wireshark-3.6.10.ebuild +++ b/net-analyzer/wireshark/wireshark-3.6.10.ebuild @@ -137,12 +137,15 @@ src_configure() { python_setup mycmakeargs+=( + -DPython3_EXECUTABLE="${PYTHON}" -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 '') $(usex qt5 RCC=$(qt5_get_bindir)/rcc '') $(usex qt5 UIC=$(qt5_get_bindir)/uic '') + -DBUILD_androiddump=$(usex androiddump) -DBUILD_capinfos=$(usex capinfos) -DBUILD_captype=$(usex captype) diff --git a/net-analyzer/wireshark/wireshark-3.6.9.ebuild b/net-analyzer/wireshark/wireshark-3.6.9.ebuild index 4116451fbbfc..d4345cd1e3bb 100644 --- a/net-analyzer/wireshark/wireshark-3.6.9.ebuild +++ b/net-analyzer/wireshark/wireshark-3.6.9.ebuild @@ -137,12 +137,15 @@ src_configure() { python_setup mycmakeargs+=( + -DPython3_EXECUTABLE="${PYTHON}" -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 '') $(usex qt5 RCC=$(qt5_get_bindir)/rcc '') $(usex qt5 UIC=$(qt5_get_bindir)/uic '') + -DBUILD_androiddump=$(usex androiddump) -DBUILD_capinfos=$(usex capinfos) -DBUILD_captype=$(usex captype) diff --git a/net-analyzer/wireshark/wireshark-4.0.1.ebuild b/net-analyzer/wireshark/wireshark-4.0.1.ebuild index 08b136066287..318d2b7f27d5 100644 --- a/net-analyzer/wireshark/wireshark-4.0.1.ebuild +++ b/net-analyzer/wireshark/wireshark-4.0.1.ebuild @@ -169,12 +169,15 @@ src_configure() { fi mycmakeargs+=( + -DPython3_EXECUTABLE="${PYTHON}" -DCMAKE_DISABLE_FIND_PACKAGE_{Asciidoctor,DOXYGEN}=$(usex !doc) + $(use androiddump && use pcap && echo -DEXTCAP_ANDROIDDUMP_LIBPCAP=yes) $(usex gui LRELEASE=$(qt5_get_bindir)/lrelease '') $(usex gui MOC=$(qt5_get_bindir)/moc '') $(usex gui RCC=$(qt5_get_bindir)/rcc '') $(usex gui UIC=$(qt5_get_bindir)/uic '') + -DBUILD_androiddump=$(usex androiddump) -DBUILD_capinfos=$(usex capinfos) -DBUILD_captype=$(usex captype) diff --git a/net-analyzer/wireshark/wireshark-4.0.2.ebuild b/net-analyzer/wireshark/wireshark-4.0.2.ebuild index 08b136066287..318d2b7f27d5 100644 --- a/net-analyzer/wireshark/wireshark-4.0.2.ebuild +++ b/net-analyzer/wireshark/wireshark-4.0.2.ebuild @@ -169,12 +169,15 @@ src_configure() { fi mycmakeargs+=( + -DPython3_EXECUTABLE="${PYTHON}" -DCMAKE_DISABLE_FIND_PACKAGE_{Asciidoctor,DOXYGEN}=$(usex !doc) + $(use androiddump && use pcap && echo -DEXTCAP_ANDROIDDUMP_LIBPCAP=yes) $(usex gui LRELEASE=$(qt5_get_bindir)/lrelease '') $(usex gui MOC=$(qt5_get_bindir)/moc '') $(usex gui RCC=$(qt5_get_bindir)/rcc '') $(usex gui UIC=$(qt5_get_bindir)/uic '') + -DBUILD_androiddump=$(usex androiddump) -DBUILD_capinfos=$(usex capinfos) -DBUILD_captype=$(usex captype) diff --git a/net-analyzer/wireshark/wireshark-9999.ebuild b/net-analyzer/wireshark/wireshark-9999.ebuild index 08b136066287..318d2b7f27d5 100644 --- a/net-analyzer/wireshark/wireshark-9999.ebuild +++ b/net-analyzer/wireshark/wireshark-9999.ebuild @@ -169,12 +169,15 @@ src_configure() { fi mycmakeargs+=( + -DPython3_EXECUTABLE="${PYTHON}" -DCMAKE_DISABLE_FIND_PACKAGE_{Asciidoctor,DOXYGEN}=$(usex !doc) + $(use androiddump && use pcap && echo -DEXTCAP_ANDROIDDUMP_LIBPCAP=yes) $(usex gui LRELEASE=$(qt5_get_bindir)/lrelease '') $(usex gui MOC=$(qt5_get_bindir)/moc '') $(usex gui RCC=$(qt5_get_bindir)/rcc '') $(usex gui UIC=$(qt5_get_bindir)/uic '') + -DBUILD_androiddump=$(usex androiddump) -DBUILD_capinfos=$(usex capinfos) -DBUILD_captype=$(usex captype)