commit: 8efc0e6128d196453d205efc85925349919535b6 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Mon Oct 10 16:09:09 2022 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Mon Oct 10 16:18:46 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8efc0e61
net-analyzer/wireshark: Drop USE=plugin-ifdemo (which needs Qt 6) No real point and we have too many USE flags for Wireshark anyway. Closes: https://bugs.gentoo.org/835962 Closes: https://bugs.gentoo.org/876304 Signed-off-by: Sam James <sam <AT> gentoo.org> net-analyzer/wireshark/wireshark-4.0.0.ebuild | 9 +++++---- net-analyzer/wireshark/wireshark-9999.ebuild | 9 +++++---- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/net-analyzer/wireshark/wireshark-4.0.0.ebuild b/net-analyzer/wireshark/wireshark-4.0.0.ebuild index 04f139078c66..34d454166c63 100644 --- a/net-analyzer/wireshark/wireshark-4.0.0.ebuild +++ b/net-analyzer/wireshark/wireshark-4.0.0.ebuild @@ -27,12 +27,13 @@ LICENSE="GPL-2" SLOT="0/${PV}" IUSE="androiddump bcg729 brotli +capinfos +captype ciscodump +dftest doc dpauxmon" IUSE+=" +dumpcap +editcap +gui http2 ilbc kerberos libxml2 lto lua lz4 maxminddb" -IUSE+=" +mergecap +minizip +netlink opus +plugins plugin-ifdemo +pcap qt6 +randpkt" +IUSE+=" +mergecap +minizip +netlink opus +plugins +pcap qt6 +randpkt" IUSE+=" +randpktdump +reordercap sbc selinux +sharkd smi snappy spandsp sshdump ssl" IUSE+=" sdjournal test +text2pcap tfshark +tshark +udpdump zlib +zstd" -REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} ) - plugin-ifdemo? ( plugins )" +REQUIRED_USE=" + lua? ( ${LUA_REQUIRED_USE} ) +" RESTRICT="!test? ( test )" @@ -207,7 +208,7 @@ src_configure() { -DENABLE_OPUS=$(usex opus) -DENABLE_PCAP=$(usex pcap) -DENABLE_PLUGINS=$(usex plugins) - -DENABLE_PLUGIN_IFDEMO=$(usex plugin-ifdemo) + -DENABLE_PLUGIN_IFDEMO=OFF -DENABLE_SBC=$(usex sbc) -DENABLE_SMI=$(usex smi) -DENABLE_SNAPPY=$(usex snappy) diff --git a/net-analyzer/wireshark/wireshark-9999.ebuild b/net-analyzer/wireshark/wireshark-9999.ebuild index 04f139078c66..34d454166c63 100644 --- a/net-analyzer/wireshark/wireshark-9999.ebuild +++ b/net-analyzer/wireshark/wireshark-9999.ebuild @@ -27,12 +27,13 @@ LICENSE="GPL-2" SLOT="0/${PV}" IUSE="androiddump bcg729 brotli +capinfos +captype ciscodump +dftest doc dpauxmon" IUSE+=" +dumpcap +editcap +gui http2 ilbc kerberos libxml2 lto lua lz4 maxminddb" -IUSE+=" +mergecap +minizip +netlink opus +plugins plugin-ifdemo +pcap qt6 +randpkt" +IUSE+=" +mergecap +minizip +netlink opus +plugins +pcap qt6 +randpkt" IUSE+=" +randpktdump +reordercap sbc selinux +sharkd smi snappy spandsp sshdump ssl" IUSE+=" sdjournal test +text2pcap tfshark +tshark +udpdump zlib +zstd" -REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} ) - plugin-ifdemo? ( plugins )" +REQUIRED_USE=" + lua? ( ${LUA_REQUIRED_USE} ) +" RESTRICT="!test? ( test )" @@ -207,7 +208,7 @@ src_configure() { -DENABLE_OPUS=$(usex opus) -DENABLE_PCAP=$(usex pcap) -DENABLE_PLUGINS=$(usex plugins) - -DENABLE_PLUGIN_IFDEMO=$(usex plugin-ifdemo) + -DENABLE_PLUGIN_IFDEMO=OFF -DENABLE_SBC=$(usex sbc) -DENABLE_SMI=$(usex smi) -DENABLE_SNAPPY=$(usex snappy)