commit: a974312c47c04399c97ab6e3b0f5d06db3f7b1f0 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Tue Dec 13 04:08:17 2022 +0000 Commit: Sam James <sam <AT> gentoo <DOT> 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 <sam <AT> 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)
