gentoo auto-resync : 16:09:2022 - 05:14:17

5 files changed, 107 insertions, 66 deletions

diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index 3b2ad5202d11..3bddefa6f874 100644
--- a/net-analyzer/Manifest.gz
+++ b/net-analyzer/Manifest.gz
diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index 166cc680bc94..098cbbb9ed64 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -8,7 +8,7 @@ DIST wireshark-3.6.5.tar.xz 39939340 BLAKE2B 4df1abce2563f20e91fac169ef1ab65851a
 DIST wireshark-3.6.6.tar.xz 39950276 BLAKE2B cb74c4ed307b83ba509fa3b56356a33df11d9d1effb29054f73f248ca1c7107806676539d0802cc71e07687831a838145194104183afa4ae1825eb1fb85062b1 SHA512 c32d5aafb3091dc1475896a3c4cfcb5a47af002e53f011a65697271c611e690743153841f5db1021a6cbea6d427dc661dce7b85208832251200258fb46aad84b
 DIST wireshark-3.6.7.tar.xz 39967312 BLAKE2B 0539130aec2c7d8fdfec536114144a0b761addb8006d146a5e08d0a58e95d5d6b0db67ef32ceae4143de9836f25a3497802706f0a0eb633f29e1f24a47819e4b SHA512 caf087ee467bf934f28d096869ea3d9d7c5a3c83e51c4df447700096943a92abf5cf29f4956b9a549e0708bcb3515b55c4660a7ced2cb9dbc582b87550026fac
 DIST wireshark-3.6.8.tar.xz 39942580 BLAKE2B 8b51ae1b3bf56fe1ccec70e94d9edb891e7b486a87b8f43984ea6d3150fe8f6c04beef9f12ebd9b830138aec6a993bcf88d50cfc4695b1f9ade6933092bed8db SHA512 c286e84e113f06b13b931da89b6d21b18e342660682579f88e77697f3e9c335ba75cdc190b41651da4d5729529a20740ef1a41e9f9523d9f6cc768147363053a
-DIST wireshark-4.0.0rc1.tar.xz 41291340 BLAKE2B 96dc9616702c67f47517cf5fc575bf555d5f7e83cc90284301e3ef26476ca6292f8aba3c7230c3ca7e6404a9b953861247a448826b339fa586d5a8206c787989 SHA512 16d4f3d39198bb208d4ad58059c38a40f21352186abf2cafb4140674d048e5bd29e5dbc079ed50f28f1dde150733bba6a26c6fc7d10e524e4556bd20c6ae2856
+DIST wireshark-4.0.0rc2.tar.xz 41318448 BLAKE2B e4f3a9aca102a2f9fa519e429ad262f24df6a67fbd6debf9a9320ae0eb1e8753f65783ca19b5e4b224cf7af368af2a2cedc8065c7cc97216b4ced224fa9ffcaf SHA512 524722f7093af3d9cbb1e355fdeafb653917eabfb1d8d7d7c480a35853b0a777c8f5043d367955d01b7ca16b3f90569dcbafc1025bbeeb57a29ff486066840b8
 EBUILD wireshark-3.4.11.ebuild 7457 BLAKE2B 05a0c93f8b8137ecb865ad4cc5f409685c79ce8dab0694e2d89b18bda7b8760e6162f5bdd4843fb8e5a21c69cfd62608b31fcb707636c8f6592c5664f64ccf55 SHA512 51cb14b1866282aa3bc83d697aaa999d1ab2a839fcf778483bd290f0366f9a105b5f2813c00f67779c1df60a443cfb7243176857e3ee5b91549447a941b75509
 EBUILD wireshark-3.6.2.ebuild 7258 BLAKE2B 32c295bd798526fa0c406e1662e8dc941e402c322696c7d9be524e21a4066b2671d94ffb9e1fe1df854869eab2e9c32c25cf2f43c3a512f2c25fa57af7a1fac7 SHA512 59fdf0864bf220784ced5496adc1bd15a6e0a6a992fedd1e3138e38221734b0a97c704b7dd750477990c3a81153878c7275c9486cae5b0fd2a38d06243119431
 EBUILD wireshark-3.6.3.ebuild 7088 BLAKE2B 739c59ec85023365cd17a6ed7e77f1d9a50a541bb19c53d2df6848895c0f7e21c9d76d72f2246dd1ca1df8a4fb32cda36349417140e054bd3064a62eb2b673c4 SHA512 c47811d1cb475de60906b2bff0f6423c0eb9a955dba9d4e7cf378022b028665c3d8e7c315ca5afc886f581a5f6dd450e65b976942e57d3d602f31e1863196d4f
@@ -16,6 +16,6 @@ EBUILD wireshark-3.6.5.ebuild 7290 BLAKE2B 9488d17dfd2e7bb6b9664b75ef4f9cc35f3f8
 EBUILD wireshark-3.6.6.ebuild 7286 BLAKE2B b38c93d1d5e04baa2e2b93916f31c60b832a33e67772788c9ad32dce2fc389b95d5b4f502db4bcf91568e0e25d4c4583ec296788c256b9560f90d64d3e7e55b8 SHA512 998880fb8514364ec6d193a63a0a706075da934ae84e29e843fb6efab03eed829c4f3c97199999e1dec188f7845ba3a79196ef7b6b1df828c666f4dce945d31c
 EBUILD wireshark-3.6.7.ebuild 7290 BLAKE2B 9488d17dfd2e7bb6b9664b75ef4f9cc35f3f8faba148701f9a376f43f7f5a01dba5dd145b8a3e822e85d2a2eecb6919b8906f7dca3268a61d85b5d1f204f3c0c SHA512 c97d5d8b388441536cd27ec737312cc0278f05947efb28a9d8a304350b84c103bf642b7668cadb476e599284ecb80c8bd80ade64af57e960cae3d0dde9458bed
 EBUILD wireshark-3.6.8.ebuild 7290 BLAKE2B 9488d17dfd2e7bb6b9664b75ef4f9cc35f3f8faba148701f9a376f43f7f5a01dba5dd145b8a3e822e85d2a2eecb6919b8906f7dca3268a61d85b5d1f204f3c0c SHA512 c97d5d8b388441536cd27ec737312cc0278f05947efb28a9d8a304350b84c103bf642b7668cadb476e599284ecb80c8bd80ade64af57e960cae3d0dde9458bed
-EBUILD wireshark-4.0.0_rc1.ebuild 7562 BLAKE2B 68499bb98c9cf5d93ac2f988c8172218e2b632637c61aebc66c2b810460bc3e9f975647dd8f0cc487f64b8af1147eddbb5bd2e440c02c49edd711978502791a4 SHA512 0002179e482e10b92d7a938b4f8e37cdb2db8c7f07786aa90dd979714ac8b78f8d3434c2db6ec274011fcbe1b57a550bfa52ecf14edf168246810c17638723b2
-EBUILD wireshark-9999.ebuild 7562 BLAKE2B 68499bb98c9cf5d93ac2f988c8172218e2b632637c61aebc66c2b810460bc3e9f975647dd8f0cc487f64b8af1147eddbb5bd2e440c02c49edd711978502791a4 SHA512 0002179e482e10b92d7a938b4f8e37cdb2db8c7f07786aa90dd979714ac8b78f8d3434c2db6ec274011fcbe1b57a550bfa52ecf14edf168246810c17638723b2
-MISC metadata.xml 5367 BLAKE2B ee72f812b3ed20e960ca3499fbe3b1e8a38e0ec7635d99b55a1d38f7f147f179a749a5d9fe1bdfdf0b7376437338b6fa8b0cb7b71cda011f863252a5e0233658 SHA512 97d9c715c030ba494a856e9aa3247a87904c305ee7909bc1bcf59b3726fad8ea5184a95d5809070c555690f928b9c89083497e01c6d2fed23c88500d56c94960
+EBUILD wireshark-4.0.0_rc2.ebuild 7763 BLAKE2B af1c84e4e7bab4f2050cc7c7ea2e498a9cc725ff2b5193b9bc691123198c34c2fd4036099328d0feed1d37f27bae9c21c5a31bf326d8581662e68408d9380770 SHA512 b0ee44b576ffb06019f79f44854c97cfb17184cbf8dcb177089056cdc8a762fbe2d563945cf673cd20cd236504e7c1fca630a5ee4ed73bded18d5b6a18227bf9
+EBUILD wireshark-9999.ebuild 7763 BLAKE2B af1c84e4e7bab4f2050cc7c7ea2e498a9cc725ff2b5193b9bc691123198c34c2fd4036099328d0feed1d37f27bae9c21c5a31bf326d8581662e68408d9380770 SHA512 b0ee44b576ffb06019f79f44854c97cfb17184cbf8dcb177089056cdc8a762fbe2d563945cf673cd20cd236504e7c1fca630a5ee4ed73bded18d5b6a18227bf9
+MISC metadata.xml 5459 BLAKE2B b70c4a0bad70faa4307870203662510479fbdad88e526b3cef966483406918a53c10fd3c134640e5b7f9280140a3ddf63c5ab50ec12b681233cb746dc4ac17bb SHA512 506c668b0fc6d0d1a2e4b6a09fef39c92fd4a9c03ed51968156c184a47c5ea14af4d794c17751edf58302c889e4278d7ab1b5b0ecdfa7ae76d90b7206af11069
diff --git a/net-analyzer/wireshark/metadata.xml b/net-analyzer/wireshark/metadata.xml
index eb55f5b7f3ea..ceb09bd64731 100644
--- a/net-analyzer/wireshark/metadata.xml
+++ b/net-analyzer/wireshark/metadata.xml
@@ -52,6 +52,7 @@
 		<flag name="pcap">Use <pkg>net-libs/libpcap</pkg> for network packet capturing (build dumpcap, rawshark)</flag>
 		<flag name="plugin-ifdemo">Install plugin interface demo</flag>
 		<flag name="plugins">Install plugins</flag>
+		<flag name="qt6">Build with Qt6 support instead of the default Qt5 for GUI support</flag>
 		<flag name="randpkt">Install randpkt, a utility for creating pcap trace files full of random packets</flag>
 		<flag name="randpktdump">Install randpktdump, an extcap interface to provide access to the random packet generator (randpkt)</flag>
 		<flag name="reordercap">Install reordercap, to reorder input file by timestamp into output file</flag>
diff --git a/net-analyzer/wireshark/wireshark-4.0.0_rc1.ebuild b/net-analyzer/wireshark/wireshark-4.0.0_rc2.ebuild
index 0bdf2a0c919a..9110abbac9e4 100644
--- a/net-analyzer/wireshark/wireshark-4.0.0_rc1.ebuild
+++ b/net-analyzer/wireshark/wireshark-4.0.0_rc2.ebuild
@@ -26,8 +26,8 @@ fi
 LICENSE="GPL-2"
 SLOT="0/${PV}"
 IUSE="androiddump bcg729 brotli +capinfos +captype ciscodump +dftest doc dpauxmon"
-IUSE+=" +dumpcap +editcap http2 ilbc kerberos libxml2 lto lua lz4 maxminddb"
-IUSE+=" +mergecap +minizip +netlink opus +plugins plugin-ifdemo +pcap +qt5 +randpkt"
+IUSE+=" +dumpcap +editcap +gui http2 ilbc kerberos libxml2 lto lua lz4 maxminddb"
+IUSE+=" +mergecap +minizip +netlink opus +plugins plugin-ifdemo +pcap qt6 +randpkt"
 IUSE+=" +randpktdump +reordercap sbc selinux +sharkd smi snappy spandsp sshdump ssl"
 IUSE+=" sdjournal test +text2pcap tfshark +tshark +udpdump zlib +zstd"
 
@@ -38,7 +38,8 @@ RESTRICT="!test? ( test )"
 
 # TODO: wifidump/libssh automagic?
 # bug #753062 for speexdsp
-RDEPEND="acct-group/pcap
+RDEPEND="
+	acct-group/pcap
 	>=dev-libs/glib-2.50.0:2
 	dev-libs/libpcre2
 	>=net-dns/c-ares-1.14.0:=
@@ -49,7 +50,7 @@ RDEPEND="acct-group/pcap
 	ciscodump? ( >=net-libs/libssh-0.6 )
 	filecaps? ( sys-libs/libcap )
 	http2? ( >=net-libs/nghttp2-1.11.0:= )
-	ilbc? ( media-libs/libilbc )
+	ilbc? ( media-libs/libilbc:= )
 	kerberos? ( virtual/krb5 )
 	libxml2? ( dev-libs/libxml2 )
 	lua? ( ${LUA_DEPS} )
@@ -59,27 +60,36 @@ RDEPEND="acct-group/pcap
 	netlink? ( dev-libs/libnl:3 )
 	opus? ( media-libs/opus )
 	pcap? ( net-libs/libpcap )
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtmultimedia:5
-		dev-qt/qtprintsupport:5
-		dev-qt/qtwidgets:5
+	gui? (
 		x11-misc/xdg-utils
+		qt6? (
+			dev-qt/qtbase:6[concurrent,dbus,gui,widgets]
+			dev-qt/qt5compat:6
+			dev-qt/qtmultimedia:6
+		)
+		!qt6? (
+			dev-qt/qtcore:5
+			dev-qt/qtgui:5
+			dev-qt/qtmultimedia:5
+			dev-qt/qtprintsupport:5
+			dev-qt/qtwidgets:5
+		)
 	)
 	sbc? ( media-libs/sbc )
-	sdjournal? ( sys-apps/systemd )
+	sdjournal? ( sys-apps/systemd:= )
 	smi? ( net-libs/libsmi )
 	snappy? ( app-arch/snappy )
-	spandsp? ( media-libs/spandsp )
-	sshdump? ( >=net-libs/libssh-0.6 )
+	spandsp? ( media-libs/spandsp:= )
+	sshdump? ( >=net-libs/libssh-0.6:= )
 	ssl? ( >=net-libs/gnutls-3.5.8:= )
 	zlib? ( sys-libs/zlib )
-	zstd? ( app-arch/zstd:= )"
+	zstd? ( app-arch/zstd:= )
+"
 DEPEND="${RDEPEND}"
 # TODO: 4.0.0_rc1 release notes say:
 # "Perl is no longer required to build Wireshark, but may be required to build some source code files and run code analysis checks."
-BDEPEND="${PYTHON_DEPS}
+BDEPEND="
+	${PYTHON_DEPS}
 	dev-lang/perl
 	sys-devel/flex
 	sys-devel/gettext
@@ -88,18 +98,26 @@ BDEPEND="${PYTHON_DEPS}
 		app-doc/doxygen
 		dev-ruby/asciidoctor
 	)
-	qt5? (
-		dev-qt/linguist-tools:5
+	gui? (
+		qt6? (
+			dev-qt/qttools:6[linguist]
+		)
+		!qt6? (
+			dev-qt/linguist-tools:5
+		)
 	)
 	test? (
 		$(python_gen_any_dep '
 			dev-python/pytest[${PYTHON_USEDEP}]
 			dev-python/pytest-xdist[${PYTHON_USEDEP}]
 		')
-	)"
-RDEPEND="${RDEPEND}
-	qt5? ( virtual/freedesktop-icon-theme )
-	selinux? ( sec-policy/selinux-wireshark )"
+	)
+"
+RDEPEND="
+	${RDEPEND}
+	gui? ( virtual/freedesktop-icon-theme )
+	selinux? ( sec-policy/selinux-wireshark )
+"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-2.6.0-redhat.patch
@@ -122,6 +140,8 @@ pkg_setup() {
 src_configure() {
 	local mycmakeargs
 
+	python_setup
+
 	# Workaround bug #213705. If krb5-config --libs has -lcrypto then pass
 	# --with-ssl to ./configure. (Mimics code from acinclude.m4).
 	if use kerberos ; then
@@ -135,20 +155,17 @@ src_configure() {
 		esac
 	fi
 
-	if use qt5 ; then
-		#export QT_MIN_VERSION=5.3.0
+	if use gui ; then
 		append-cxxflags -fPIC -DPIC
 	fi
 
-	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 '')
-		$(usex qt5 RCC=$(qt5_get_bindir)/rcc '')
-		$(usex qt5 UIC=$(qt5_get_bindir)/uic '')
+		$(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)
@@ -169,7 +186,10 @@ src_configure() {
 		-DBUILD_tfshark=$(usex tfshark)
 		-DBUILD_tshark=$(usex tshark)
 		-DBUILD_udpdump=$(usex udpdump)
-		-DBUILD_wireshark=$(usex qt5)
+
+		-DBUILD_wireshark=$(usex gui)
+		-DUSE_qt6=$(usex qt6)
+
 		-DENABLE_WERROR=OFF
 		-DENABLE_BCG729=$(usex bcg729)
 		-DENABLE_BROTLI=$(usex brotli)
@@ -237,7 +257,7 @@ src_install() {
 		doins ${dir}/*.h
 	done
 
-	if use qt5 ; then
+	if use gui ; then
 		local s
 
 		for s in 16 32 48 64 128 256 512 1024 ; do
diff --git a/net-analyzer/wireshark/wireshark-9999.ebuild b/net-analyzer/wireshark/wireshark-9999.ebuild
index 0bdf2a0c919a..9110abbac9e4 100644
--- a/net-analyzer/wireshark/wireshark-9999.ebuild
+++ b/net-analyzer/wireshark/wireshark-9999.ebuild
@@ -26,8 +26,8 @@ fi
 LICENSE="GPL-2"
 SLOT="0/${PV}"
 IUSE="androiddump bcg729 brotli +capinfos +captype ciscodump +dftest doc dpauxmon"
-IUSE+=" +dumpcap +editcap http2 ilbc kerberos libxml2 lto lua lz4 maxminddb"
-IUSE+=" +mergecap +minizip +netlink opus +plugins plugin-ifdemo +pcap +qt5 +randpkt"
+IUSE+=" +dumpcap +editcap +gui http2 ilbc kerberos libxml2 lto lua lz4 maxminddb"
+IUSE+=" +mergecap +minizip +netlink opus +plugins plugin-ifdemo +pcap qt6 +randpkt"
 IUSE+=" +randpktdump +reordercap sbc selinux +sharkd smi snappy spandsp sshdump ssl"
 IUSE+=" sdjournal test +text2pcap tfshark +tshark +udpdump zlib +zstd"
 
@@ -38,7 +38,8 @@ RESTRICT="!test? ( test )"
 
 # TODO: wifidump/libssh automagic?
 # bug #753062 for speexdsp
-RDEPEND="acct-group/pcap
+RDEPEND="
+	acct-group/pcap
 	>=dev-libs/glib-2.50.0:2
 	dev-libs/libpcre2
 	>=net-dns/c-ares-1.14.0:=
@@ -49,7 +50,7 @@ RDEPEND="acct-group/pcap
 	ciscodump? ( >=net-libs/libssh-0.6 )
 	filecaps? ( sys-libs/libcap )
 	http2? ( >=net-libs/nghttp2-1.11.0:= )
-	ilbc? ( media-libs/libilbc )
+	ilbc? ( media-libs/libilbc:= )
 	kerberos? ( virtual/krb5 )
 	libxml2? ( dev-libs/libxml2 )
 	lua? ( ${LUA_DEPS} )
@@ -59,27 +60,36 @@ RDEPEND="acct-group/pcap
 	netlink? ( dev-libs/libnl:3 )
 	opus? ( media-libs/opus )
 	pcap? ( net-libs/libpcap )
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtmultimedia:5
-		dev-qt/qtprintsupport:5
-		dev-qt/qtwidgets:5
+	gui? (
 		x11-misc/xdg-utils
+		qt6? (
+			dev-qt/qtbase:6[concurrent,dbus,gui,widgets]
+			dev-qt/qt5compat:6
+			dev-qt/qtmultimedia:6
+		)
+		!qt6? (
+			dev-qt/qtcore:5
+			dev-qt/qtgui:5
+			dev-qt/qtmultimedia:5
+			dev-qt/qtprintsupport:5
+			dev-qt/qtwidgets:5
+		)
 	)
 	sbc? ( media-libs/sbc )
-	sdjournal? ( sys-apps/systemd )
+	sdjournal? ( sys-apps/systemd:= )
 	smi? ( net-libs/libsmi )
 	snappy? ( app-arch/snappy )
-	spandsp? ( media-libs/spandsp )
-	sshdump? ( >=net-libs/libssh-0.6 )
+	spandsp? ( media-libs/spandsp:= )
+	sshdump? ( >=net-libs/libssh-0.6:= )
 	ssl? ( >=net-libs/gnutls-3.5.8:= )
 	zlib? ( sys-libs/zlib )
-	zstd? ( app-arch/zstd:= )"
+	zstd? ( app-arch/zstd:= )
+"
 DEPEND="${RDEPEND}"
 # TODO: 4.0.0_rc1 release notes say:
 # "Perl is no longer required to build Wireshark, but may be required to build some source code files and run code analysis checks."
-BDEPEND="${PYTHON_DEPS}
+BDEPEND="
+	${PYTHON_DEPS}
 	dev-lang/perl
 	sys-devel/flex
 	sys-devel/gettext
@@ -88,18 +98,26 @@ BDEPEND="${PYTHON_DEPS}
 		app-doc/doxygen
 		dev-ruby/asciidoctor
 	)
-	qt5? (
-		dev-qt/linguist-tools:5
+	gui? (
+		qt6? (
+			dev-qt/qttools:6[linguist]
+		)
+		!qt6? (
+			dev-qt/linguist-tools:5
+		)
 	)
 	test? (
 		$(python_gen_any_dep '
 			dev-python/pytest[${PYTHON_USEDEP}]
 			dev-python/pytest-xdist[${PYTHON_USEDEP}]
 		')
-	)"
-RDEPEND="${RDEPEND}
-	qt5? ( virtual/freedesktop-icon-theme )
-	selinux? ( sec-policy/selinux-wireshark )"
+	)
+"
+RDEPEND="
+	${RDEPEND}
+	gui? ( virtual/freedesktop-icon-theme )
+	selinux? ( sec-policy/selinux-wireshark )
+"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-2.6.0-redhat.patch
@@ -122,6 +140,8 @@ pkg_setup() {
 src_configure() {
 	local mycmakeargs
 
+	python_setup
+
 	# Workaround bug #213705. If krb5-config --libs has -lcrypto then pass
 	# --with-ssl to ./configure. (Mimics code from acinclude.m4).
 	if use kerberos ; then
@@ -135,20 +155,17 @@ src_configure() {
 		esac
 	fi
 
-	if use qt5 ; then
-		#export QT_MIN_VERSION=5.3.0
+	if use gui ; then
 		append-cxxflags -fPIC -DPIC
 	fi
 
-	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 '')
-		$(usex qt5 RCC=$(qt5_get_bindir)/rcc '')
-		$(usex qt5 UIC=$(qt5_get_bindir)/uic '')
+		$(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)
@@ -169,7 +186,10 @@ src_configure() {
 		-DBUILD_tfshark=$(usex tfshark)
 		-DBUILD_tshark=$(usex tshark)
 		-DBUILD_udpdump=$(usex udpdump)
-		-DBUILD_wireshark=$(usex qt5)
+
+		-DBUILD_wireshark=$(usex gui)
+		-DUSE_qt6=$(usex qt6)
+
 		-DENABLE_WERROR=OFF
 		-DENABLE_BCG729=$(usex bcg729)
 		-DENABLE_BROTLI=$(usex brotli)
@@ -237,7 +257,7 @@ src_install() {
 		doins ${dir}/*.h
 	done
 
-	if use qt5 ; then
+	if use gui ; then
 		local s
 
 		for s in 16 32 48 64 128 256 512 1024 ; do