gentoo auto-resync : 16:12:2024 - 02:01:58

72 files changed, 2085 insertions, 24 deletions

diff --git a/dev-qt/Manifest.gz b/dev-qt/Manifest.gz
index 48d8b05987bd..231e089cd2cf 100644
--- a/dev-qt/Manifest.gz
+++ b/dev-qt/Manifest.gz
diff --git a/dev-qt/qt3d/Manifest b/dev-qt/qt3d/Manifest
index 2011125442e4..4ad15dc33df9 100644
--- a/dev-qt/qt3d/Manifest
+++ b/dev-qt/qt3d/Manifest
@@ -9,5 +9,6 @@ EBUILD qt3d-6.7.2.ebuild 819 BLAKE2B 9203d5455ee0d393559998f08a30e3db9f897f841dc
 EBUILD qt3d-6.7.3.ebuild 820 BLAKE2B e11baa07b37e604780a42c7db9def3523f0b2afb68ac65702fa4aaa64faf7768b389ce9072422f4f24d8639fcf5d7738b6973d07ba0ed8eafddd2cc08cf6aa59 SHA512 6eb998879d4f9c698df13b605d63fd24634be25e485567ccf65f6b27495e9c17baacd701023970f8ec4258b6e8d51dc7d686059e13000e1f359079a87cd005e4
 EBUILD qt3d-6.8.1.ebuild 783 BLAKE2B 19cac8876ea39d0cfa4d642a61aadcb254f7273273eeb77311be87023c9e08e47acf70c0e14864a60e9f99b843716a058848141b45c58abe105c4a9697edbccb SHA512 ee627e2dd24c4e4a599d42e36f5120433c3e73fb0bcd545317dd8b07d6b664f67f6419526917dd9d65d7dcb02e339546815476416529eb8d0dde581f129c6b00
 EBUILD qt3d-6.8.9999.ebuild 783 BLAKE2B 19cac8876ea39d0cfa4d642a61aadcb254f7273273eeb77311be87023c9e08e47acf70c0e14864a60e9f99b843716a058848141b45c58abe105c4a9697edbccb SHA512 ee627e2dd24c4e4a599d42e36f5120433c3e73fb0bcd545317dd8b07d6b664f67f6419526917dd9d65d7dcb02e339546815476416529eb8d0dde581f129c6b00
+EBUILD qt3d-6.9.9999.ebuild 783 BLAKE2B 19cac8876ea39d0cfa4d642a61aadcb254f7273273eeb77311be87023c9e08e47acf70c0e14864a60e9f99b843716a058848141b45c58abe105c4a9697edbccb SHA512 ee627e2dd24c4e4a599d42e36f5120433c3e73fb0bcd545317dd8b07d6b664f67f6419526917dd9d65d7dcb02e339546815476416529eb8d0dde581f129c6b00
 EBUILD qt3d-6.9999.ebuild 783 BLAKE2B 19cac8876ea39d0cfa4d642a61aadcb254f7273273eeb77311be87023c9e08e47acf70c0e14864a60e9f99b843716a058848141b45c58abe105c4a9697edbccb SHA512 ee627e2dd24c4e4a599d42e36f5120433c3e73fb0bcd545317dd8b07d6b664f67f6419526917dd9d65d7dcb02e339546815476416529eb8d0dde581f129c6b00
 MISC metadata.xml 692 BLAKE2B 807ac52bd34ad8ea6471eb7b03703f20951c941a2b5841fa173796b4d9b3bdee1afc79fb83057a5bd6329db5cf656c0c5afdc6ece087684c14e0a581c91eed69 SHA512 5894daabb0fbee32e8fbcdc35f720f2f3225bd78ac632491d4603650db49c79c41fbe84d1cfde15870ed7a17c39c98cb5572ca5ed1da7fe5311faa7b2b750aec
diff --git a/dev-qt/qt3d/qt3d-6.9.9999.ebuild b/dev-qt/qt3d/qt3d-6.9.9999.ebuild
new file mode 100644
index 000000000000..c67d6bef95e6
--- /dev/null
+++ b/dev-qt/qt3d/qt3d-6.9.9999.ebuild
@@ -0,0 +1,36 @@
+# Copyright 2021-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit qt6-build
+
+DESCRIPTION="3D rendering module for the Qt6 framework"
+
+if [[ ${QT6_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+elif [[ ${QT6_BUILD_TYPE} == live ]]; then
+	EGIT_SUBMODULES=() # skip qtquick3d-assimp
+fi
+
+IUSE="gles2-only qml vulkan"
+
+RDEPEND="
+	~dev-qt/qtbase-${PV}:6[concurrent,gles2-only=,gui,network,opengl,vulkan=]
+	~dev-qt/qtshadertools-${PV}:6
+	media-libs/assimp:=
+	qml? ( ~dev-qt/qtdeclarative-${PV}:6 )
+"
+DEPEND="
+	${RDEPEND}
+	vulkan? ( dev-util/vulkan-headers )
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package qml Qt6Qml)
+		-DQT_FEATURE_qt3d_system_assimp=ON
+	)
+
+	qt6-build_src_configure
+}
diff --git a/dev-qt/qt5compat/Manifest b/dev-qt/qt5compat/Manifest
index 18242a5f1422..ae57405e2277 100644
--- a/dev-qt/qt5compat/Manifest
+++ b/dev-qt/qt5compat/Manifest
@@ -5,5 +5,6 @@ EBUILD qt5compat-6.7.2.ebuild 700 BLAKE2B 6f317548654d9239fcee6418f5fc75d6b70f17
 EBUILD qt5compat-6.7.3.ebuild 703 BLAKE2B 220a53b02469ed52240850d1c7b74c2e54aaa0d208d7bc4a44f07670b9c0dcbac2d047ac1fd78100c68269624d7618d1659bf2f7f39a8bcd9e874f1cea0d6961 SHA512 f2c18ddffc934c07a6794eaa8966266975fe8d65ee9d2c4cf9693b5af88132151a181662f3b8eb1987ef33d9956c441898c760b641672b29a1d4e83222a1b540
 EBUILD qt5compat-6.8.1.ebuild 706 BLAKE2B cde702b26ce3213329e1e6ee6030feef199a81cd89725f65aaf5c350da27de100e5cb1592065c11ce40bb2396b80b9053b56503aa6bdc13baa38774a1788823c SHA512 20c6f09f176449d81646a8d576db355544f4093f24be2ef970bf83d55d2eda867c21e027985fcd309deacda4fad4e6741815ab7b20787f017e5f68d84fffacbf
 EBUILD qt5compat-6.8.9999.ebuild 706 BLAKE2B cde702b26ce3213329e1e6ee6030feef199a81cd89725f65aaf5c350da27de100e5cb1592065c11ce40bb2396b80b9053b56503aa6bdc13baa38774a1788823c SHA512 20c6f09f176449d81646a8d576db355544f4093f24be2ef970bf83d55d2eda867c21e027985fcd309deacda4fad4e6741815ab7b20787f017e5f68d84fffacbf
+EBUILD qt5compat-6.9.9999.ebuild 706 BLAKE2B cde702b26ce3213329e1e6ee6030feef199a81cd89725f65aaf5c350da27de100e5cb1592065c11ce40bb2396b80b9053b56503aa6bdc13baa38774a1788823c SHA512 20c6f09f176449d81646a8d576db355544f4093f24be2ef970bf83d55d2eda867c21e027985fcd309deacda4fad4e6741815ab7b20787f017e5f68d84fffacbf
 EBUILD qt5compat-6.9999.ebuild 706 BLAKE2B cde702b26ce3213329e1e6ee6030feef199a81cd89725f65aaf5c350da27de100e5cb1592065c11ce40bb2396b80b9053b56503aa6bdc13baa38774a1788823c SHA512 20c6f09f176449d81646a8d576db355544f4093f24be2ef970bf83d55d2eda867c21e027985fcd309deacda4fad4e6741815ab7b20787f017e5f68d84fffacbf
 MISC metadata.xml 614 BLAKE2B 0398cf879d68d52becdfe5098503b6c40b9e84f6a0d05f961d068235a0caff829fd930027c0bd736dbae76aa5b00ee3f99c6e303120fe14b6da3789ee7781e7f SHA512 ebf0f12d0a42356a915c06626046498273659cba209a0537b69cc27da2b5dc721c49cf4180d1a7137a34b89ac1ee39d95295cbebb83848c1f63b786b1eaaad7c
diff --git a/dev-qt/qt5compat/qt5compat-6.9.9999.ebuild b/dev-qt/qt5compat/qt5compat-6.9.9999.ebuild
new file mode 100644
index 000000000000..4462f312f154
--- /dev/null
+++ b/dev-qt/qt5compat/qt5compat-6.9.9999.ebuild
@@ -0,0 +1,37 @@
+# Copyright 2023-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit qt6-build
+
+DESCRIPTION="Qt module containing the unsupported Qt 5 APIs"
+
+if [[ ${QT6_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~x86"
+fi
+
+IUSE="icu qml"
+
+RDEPEND="
+	~dev-qt/qtbase-${PV}:6[gui,icu=,network,xml]
+	icu? ( dev-libs/icu:= )
+	qml? (
+		~dev-qt/qtdeclarative-${PV}:6
+		~dev-qt/qtshadertools-${PV}:6
+	)
+"
+DEPEND="${RDEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package qml Qt6Quick)
+	)
+
+	qt6-build_src_configure
+}
+
+src_test() {
+	# tst_qxmlinputsource sometimes hang without -j1
+	qt6-build_src_test -j1
+}
diff --git a/dev-qt/qtbase/Manifest b/dev-qt/qtbase/Manifest
index 8786d39530aa..51b8e3fefb5a 100644
--- a/dev-qt/qtbase/Manifest
+++ b/dev-qt/qtbase/Manifest
@@ -18,5 +18,6 @@ EBUILD qtbase-6.7.2-r5.ebuild 10317 BLAKE2B 92c1b6a9bea4277229f80a96c356de139d78
 EBUILD qtbase-6.7.3-r2.ebuild 10163 BLAKE2B 2212fccbce268418ca1c738c2dadc0df807f5e371795e3f208b01da1670139c02a579ad3f954c5bcfbea71c2fa5abc43c6524b2d14427fb229de1d3611b6db95 SHA512 26d72d04cfc13ee5ab6a0a51d43448d5de52b3a600f2c2db3274f410996bf7dceb31a5a26e33479fc223b03df73e8ec05a7ba58ceefc0e2f3d50ac74c49b0746
 EBUILD qtbase-6.8.1.ebuild 10554 BLAKE2B 64b0c95b5763f5e772e643cde8b11118034ddc303707e8c8b2cc7086f2b36f21ccff7b225d5a6aa818c65a63aa89d57127cbb985a486842f6746e0da2b85a0bb SHA512 bb42ddd44da538c8b229d150a02692524065afafe347268c0f2cf1e77cb8a8b310f9d8bac110dce3063d0203c7b74d4fa52b5a72b5eb8cc48e3b00d185d7df11
 EBUILD qtbase-6.8.9999.ebuild 10554 BLAKE2B 64b0c95b5763f5e772e643cde8b11118034ddc303707e8c8b2cc7086f2b36f21ccff7b225d5a6aa818c65a63aa89d57127cbb985a486842f6746e0da2b85a0bb SHA512 bb42ddd44da538c8b229d150a02692524065afafe347268c0f2cf1e77cb8a8b310f9d8bac110dce3063d0203c7b74d4fa52b5a72b5eb8cc48e3b00d185d7df11
-EBUILD qtbase-6.9999.ebuild 10504 BLAKE2B e5eee3ef59d52086f340b5669ef9cdbb35b31238dc5894860c694677bc0d2150e8204f5933f77495c6435355ce21731be5a5f41310fe8148f9b8919236fcb33c SHA512 861bcf82a0a283ef56265cc707184eba9533e2e351de9bf92cc395b0527075c0476ed7afe341af75205e3f31cbbdabe18f2f903561c34ea12872b2a25fb3b51f
+EBUILD qtbase-6.9.9999.ebuild 10540 BLAKE2B 98d8ccb6306c5847f2456cf08d90710ee1fc517af5682efd57b1633d14ed099e80ba4310b66354f67f4faef5336439295b195dd29f31b549d26aafe796bbcd73 SHA512 5ab9146b2a748df44513c69962ef2997e391c1a3cc5863e9758c61046f82d19e8bf8e4c0fe54c3c5886ac439c052b24e0bb235b1a16d0dba392a3e955697b4fa
+EBUILD qtbase-6.9999.ebuild 10540 BLAKE2B 98d8ccb6306c5847f2456cf08d90710ee1fc517af5682efd57b1633d14ed099e80ba4310b66354f67f4faef5336439295b195dd29f31b549d26aafe796bbcd73 SHA512 5ab9146b2a748df44513c69962ef2997e391c1a3cc5863e9758c61046f82d19e8bf8e4c0fe54c3c5886ac439c052b24e0bb235b1a16d0dba392a3e955697b4fa
 MISC metadata.xml 1965 BLAKE2B e91aa3bc2379fa587766cfc7c4053b382a8894c0092d075543b2a5d466dfa001105bb0f564008fab8e71d4517954e527618896de41069c6bafb4258f6201cdbe SHA512 a71f6fe0fb01e60716aa6632605a423f765983f41da2c8ca761afca548cd061bd52bc328f7441fa831e890d75bcfc2820112c946802588dab1de706fbb7ac531
diff --git a/dev-qt/qtbase/qtbase-6.9.9999.ebuild b/dev-qt/qtbase/qtbase-6.9.9999.ebuild
new file mode 100644
index 000000000000..cc29e9e6aef9
--- /dev/null
+++ b/dev-qt/qtbase/qtbase-6.9.9999.ebuild
@@ -0,0 +1,377 @@
+# Copyright 2021-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit flag-o-matic qt6-build toolchain-funcs
+
+DESCRIPTION="Cross-platform application development framework"
+
+if [[ ${QT6_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+fi
+
+declare -A QT6_IUSE=(
+	[global]="+ssl +udev zstd"
+	[core]="icu journald syslog"
+	[modules]="+concurrent +dbus +gui +network +sql +xml"
+
+	[gui]="
+		+X accessibility eglfs evdev gles2-only +libinput
+		opengl renderdoc tslib vulkan wayland +widgets
+	"
+	[network]="brotli gssapi libproxy sctp"
+	[sql]="mysql oci8 odbc postgres +sqlite"
+	[widgets]="cups gtk"
+
+	[optfeature]="nls" #810802
+)
+IUSE="${QT6_IUSE[*]}"
+REQUIRED_USE="
+	?? ( journald syslog )
+	$(
+		printf '%s? ( gui ) ' ${QT6_IUSE[gui]//+/}
+		printf '%s? ( network ) ' ${QT6_IUSE[network]//+/}
+		printf '%s? ( sql ) ' ${QT6_IUSE[sql]//+/}
+		printf '%s? ( gui widgets ) ' ${QT6_IUSE[widgets]//+/}
+	)
+	accessibility? ( dbus )
+	eglfs? ( opengl )
+	gles2-only? ( opengl )
+	gui? ( || ( X eglfs wayland ) )
+	libinput? ( udev )
+	sql? ( || ( ${QT6_IUSE[sql]//+/} ) )
+	test? ( icu sql? ( sqlite ) )
+"
+
+# groups:
+# - global (configure.cmake)
+# - qtcore (src/corelib/configure.cmake)
+# - qtgui (src/gui/configure.cmake)
+# - qtnetwork (src/network/configure.cmake)
+# - qtprintsupport (src/printsupport/configure.cmake) [gui+widgets]
+# - qtsql (src/plugins/sqldrivers/configure.cmake)
+# nolink: renderdoc, systemd
+COMMON_DEPEND="
+	sys-libs/zlib:=
+	ssl? ( dev-libs/openssl:= )
+	udev? ( virtual/libudev:= )
+	zstd? ( app-arch/zstd:= )
+
+	app-crypt/libb2
+	dev-libs/double-conversion:=
+	dev-libs/glib:2
+	dev-libs/libpcre2:=[pcre16,unicode(+)]
+	icu? ( dev-libs/icu:= )
+	journald? ( sys-apps/systemd )
+
+	dbus? ( sys-apps/dbus )
+	gui? (
+		media-libs/fontconfig
+		media-libs/freetype:2
+		media-libs/harfbuzz:=
+		media-libs/libjpeg-turbo:=
+		media-libs/libpng:=
+		x11-libs/libdrm
+		x11-libs/libxkbcommon[X?]
+		X? (
+			x11-libs/libICE
+			x11-libs/libSM
+			x11-libs/libX11
+			x11-libs/libxcb:=
+			x11-libs/xcb-util-cursor
+			x11-libs/xcb-util-image
+			x11-libs/xcb-util-keysyms
+			x11-libs/xcb-util-renderutil
+			x11-libs/xcb-util-wm
+		)
+		accessibility? ( app-accessibility/at-spi2-core:2 )
+		eglfs? ( media-libs/mesa[gbm(+)] )
+		evdev? ( sys-libs/mtdev )
+		libinput? ( dev-libs/libinput:= )
+		opengl? (
+			gles2-only? ( media-libs/libglvnd )
+			!gles2-only? ( media-libs/libglvnd[X?] )
+		)
+		renderdoc? ( media-gfx/renderdoc )
+		tslib? ( x11-libs/tslib )
+		widgets? (
+			cups? ( net-print/cups )
+			gtk? (
+				x11-libs/gdk-pixbuf:2
+				>=x11-libs/gtk+-3.24.41-r1:3[X?,wayland?]
+				x11-libs/pango
+			)
+		)
+	)
+	network? (
+		brotli? ( app-arch/brotli:= )
+		gssapi? ( virtual/krb5 )
+		libproxy? ( net-libs/libproxy )
+	)
+	sql? (
+		mysql? ( dev-db/mysql-connector-c:= )
+		oci8? ( dev-db/oracle-instantclient:=[sdk] )
+		odbc? ( dev-db/unixODBC )
+		postgres? ( dev-db/postgresql:* )
+		sqlite? ( dev-db/sqlite:3 )
+	)
+"
+RDEPEND="
+	${COMMON_DEPEND}
+	syslog? ( virtual/logger )
+"
+DEPEND="
+	${COMMON_DEPEND}
+	X? ( x11-base/xorg-proto )
+	gui? (
+		vulkan? ( dev-util/vulkan-headers )
+	)
+	network? (
+		sctp? ( net-misc/lksctp-tools )
+	)
+	test? (
+		elibc_musl? ( sys-libs/timezone-data )
+	)
+"
+BDEPEND="zstd? ( app-arch/libarchive[zstd] )" #910392
+PDEPEND="
+	nls? ( ~dev-qt/qttranslations-${PV}:6 )
+	wayland? ( ~dev-qt/qtwayland-${PV}:6 )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-6.5.2-hppa-forkfd-grow-stack.patch
+	"${FILESDIR}"/${PN}-6.5.2-no-symlink-check.patch
+	"${FILESDIR}"/${PN}-6.6.1-forkfd-childstack-size.patch
+	"${FILESDIR}"/${PN}-6.6.3-gcc14-avx512fp16.patch
+)
+
+src_prepare() {
+	qt6-build_src_prepare
+
+	if use test; then
+		# test itself has -Werror=strict-aliasing issues, drop for simplicity
+		sed -e '/add_subdirectory(qsharedpointer)/d' \
+			-i tests/auto/corelib/tools/CMakeLists.txt || die
+
+		# workaround for __extendhfxf2 being used for tst_qfloat16.cpp
+		# which is unavailable with compiler-rt (assume used if clang)
+		if tc-is-clang; then
+			sed -e '/add_subdirectory(qfloat16)/d' \
+				-i tests/auto/corelib/global/CMakeLists.txt || die
+		fi
+	fi
+}
+
+src_configure() {
+	if use gtk; then
+		# defang automagic dependencies (bug #624960)
+		use X || append-cxxflags -DGENTOO_GTK_HIDE_X11
+		use wayland || append-cxxflags -DGENTOO_GTK_HIDE_WAYLAND
+	fi
+
+	local mycmakeargs=(
+		-DBUILD_WITH_PCH=OFF
+
+		-DINSTALL_ARCHDATADIR="${QT6_ARCHDATADIR}"
+		-DINSTALL_BINDIR="${QT6_BINDIR}"
+		-DINSTALL_DATADIR="${QT6_DATADIR}"
+		-DINSTALL_DOCDIR="${QT6_DOCDIR}"
+		-DINSTALL_EXAMPLESDIR="${QT6_EXAMPLESDIR}"
+		-DINSTALL_INCLUDEDIR="${QT6_HEADERDIR}"
+		-DINSTALL_LIBDIR="${QT6_LIBDIR}"
+		-DINSTALL_LIBEXECDIR="${QT6_LIBEXECDIR}"
+		-DINSTALL_MKSPECSDIR="${QT6_MKSPECSDIR}"
+		-DINSTALL_PLUGINSDIR="${QT6_PLUGINDIR}"
+		-DINSTALL_QMLDIR="${QT6_QMLDIR}"
+		-DINSTALL_SYSCONFDIR="${QT6_SYSCONFDIR}"
+		-DINSTALL_TRANSLATIONSDIR="${QT6_TRANSLATIONDIR}"
+
+		-DQT_UNITY_BUILD=ON # ~30% faster build, affects other dev-qt/* too
+
+		-DQT_FEATURE_force_system_libs=ON
+		-DQT_FEATURE_relocatable=OFF #927691
+		$(qt_feature ssl openssl)
+		$(qt_feature ssl openssl_linked)
+		$(qt_feature udev libudev)
+		$(qt_feature zstd)
+
+		# qtcore
+		$(qt_feature icu)
+		$(qt_feature journald)
+		$(qt_feature syslog)
+
+		# tools
+		-DQT_FEATURE_androiddeployqt=OFF
+
+		# modules
+		$(qt_feature concurrent)
+		$(qt_feature dbus)
+		$(qt_feature gui)
+		$(qt_feature network)
+		$(qt_feature sql)
+		# trivial, and is often needed (sometimes even when not building tests)
+		-DQT_FEATURE_testlib=ON
+		$(qt_feature xml)
+
+		# let gentoo's defaults and/or users control security *FLAGS
+		-DQT_FEATURE_glibc_fortify_source=OFF
+		-DQT_FEATURE_intelcet=OFF
+		-DQT_FEATURE_libcpp_hardening=OFF
+		-DQT_FEATURE_libstdcpp_assertions=OFF
+		-DQT_FEATURE_relro_now_linker=OFF
+		-DQT_FEATURE_stack_clash_protection=OFF
+		-DQT_FEATURE_stack_protector=OFF
+		-DQT_FEATURE_trivial_auto_var_init_pattern=OFF
+
+		-DQT_INTERNAL_AVOID_OVERRIDING_SYNCQT_CONFIG=ON # would force -O3
+	)
+
+	use gui && mycmakeargs+=(
+		$(qt_feature X xcb)
+		$(qt_feature X system_xcb_xinput)
+		$(qt_feature X xkbcommon_x11)
+		$(cmake_use_find_package X X11) # needed for truly no automagic
+		$(qt_feature accessibility accessibility_atspi_bridge)
+		$(qt_feature eglfs)
+		$(qt_feature evdev)
+		$(qt_feature evdev mtdev)
+		$(qt_feature libinput)
+		$(qt_feature renderdoc graphicsframecapture)
+		$(qt_feature tslib)
+		$(qt_feature vulkan)
+		$(qt_feature wayland)
+		$(qt_feature widgets)
+		-DINPUT_opengl=$(usex opengl $(usex gles2-only es2 desktop) no)
+		-DQT_FEATURE_system_textmarkdownreader=OFF # TODO?: package md4c
+	) && use widgets && mycmakeargs+=(
+		# note: qtprintsupport is enabled w/ gui+widgets regardless of USE=cups
+		$(qt_feature cups)
+		$(qt_feature gtk gtk3)
+	)
+
+	use network && mycmakeargs+=(
+		$(qt_feature brotli)
+		$(qt_feature gssapi)
+		$(qt_feature libproxy)
+		$(qt_feature sctp)
+		$(usev test -DQT_SKIP_DOCKER_COMPOSE=ON)
+	)
+
+	use sql && mycmakeargs+=(
+		-DQT_FEATURE_sql_db2=OFF # unpackaged
+		-DQT_FEATURE_sql_ibase=OFF # unpackaged
+		-DQT_FEATURE_sql_mimer=OFF # unpackaged
+		$(qt_feature mysql sql_mysql)
+		$(qt_feature oci8 sql_oci)
+		$(usev oci8 -DOracle_ROOT="${ESYSROOT}"/usr/$(get_libdir)/oracle/client)
+		$(qt_feature odbc sql_odbc)
+		$(qt_feature postgres sql_psql)
+		$(qt_feature sqlite sql_sqlite)
+		$(qt_feature sqlite system_sqlite)
+	)
+
+	qt6-build_src_configure
+}
+
+src_test() {
+	local -x TZ=UTC
+	local -x LC_TIME=C
+
+	local CMAKE_SKIP_TESTS=(
+		# broken with out-of-source + if qtbase is not already installed
+		tst_moc
+		tst_qmake
+		# similarly broken when relocatable=OFF (bug #927691)
+		tst_qapplication
+		tst_qt_cmake_create
+		tst_uic
+		# needs x11/opengl, we *could* run these but tend to be flaky
+		# when opengl rendering is involved (even if software-only)
+		tst_qopengl{,config,widget,window}
+		tst_qgraphicsview
+		tst_qx11info
+		# fails with network sandbox
+		tst_qdnslookup
+		# fails with sandbox
+		tst_qsharedmemory
+		# typical to lack SCTP support on non-generic kernels
+		tst_qsctpsocket
+		# randomly fails without -j1, and not worth it over this (bug #916181)
+		tst_qfiledialog{,2}
+		# may randomly hang+timeout, perhaps related to -j as well
+		tst_qprocess #936484
+		tst_qtimer
+		# haystacksWithMoreThan4GiBWork can easily OOM (16GB ram not enough)
+		tst_qlatin1stringmatcher
+		# these can be flaky depending on the environment/toolchain
+		tst_qlogging # backtrace log test can easily vary
+		tst_q{,raw}font # affected by available fonts / settings (bug #914737)
+		tst_qprinter # checks system's printers (bug #916216)
+		tst_qhighdpi # may detect users' settings and fail (bug #935364)
+		tst_qstorageinfo # checks mounted filesystems
+		# flaky due to using different test framework and fails with USE=-gui
+		tst_selftests
+		# known failing when using clang+glibc+stdc++, needs looking into
+		tst_qthread
+		# partially failing on x86 chroots and seemingly(?) harmless (dev-qt
+		# revdeps tests pass), skip globally to avoid keywording flakiness
+		tst_json
+		tst_qcolorspace
+		tst_qdoublevalidator
+		tst_qglobal
+		tst_qglyphrun
+		tst_qvectornd
+		tst_rcc
+		# similarly, but on armv7 and potentially others (bug #914028)
+		tst_qlineedit
+		tst_qpainter
+		# likewise, known failing on BE arches (bug #914033,914371,918878)
+		tst_qimagereader
+		tst_qimagewriter
+		tst_qpluginloader
+		tst_quuid # >=6.6.2 had related fixes, needs retesting
+		# partially broken on llvm-musl, needs looking into but skip to have
+		# a baseline for regressions (rest of dev-qt still passes with musl)
+		$(usev elibc_musl '
+			tst_qicoimageformat
+			tst_qimagereader
+			tst_qimage
+		')
+		# fails due to hppa's NaN handling, needs looking into (bug #914371)
+		$(usev hppa '
+			tst_qcborvalue
+			tst_qnumeric
+		')
+		# bug #914033
+		$(usev sparc '
+			tst_qbuffer
+			tst_qtconcurrentiteratekernel
+		')
+		# note: for linux, upstream only really runs+maintains tests for amd64
+		# https://doc.qt.io/qt-6/supported-platforms.html
+	)
+
+	qt6-build_src_test
+}
+
+src_install() {
+	qt6-build_src_install
+
+	if use test; then
+		local delete_bins=( # need a better way to handle this
+			clientserver copier crashingServer desktopsettingsaware_helper
+			echo fileWriterProcess modal_helper nospace 'one space'
+			paster qcommandlineparser_test_helper qfileopeneventexternal
+			socketprocess syslocaleapp tst_qhashseed_helper 'two space s'
+			write-read-write
+		)
+		local delete=( # sigh
+			"${D}${QT6_BINDIR}"/test*
+			"${delete_bins[@]/#/${D}${QT6_BINDIR}/}"
+		)
+		# using -f given not tracking which tests may be skipped or not
+		rm -rf -- "${delete[@]}" || die
+	fi
+}
diff --git a/dev-qt/qtbase/qtbase-6.9999.ebuild b/dev-qt/qtbase/qtbase-6.9999.ebuild
index 3c595f73638f..cc29e9e6aef9 100644
--- a/dev-qt/qtbase/qtbase-6.9999.ebuild
+++ b/dev-qt/qtbase/qtbase-6.9999.ebuild
@@ -190,6 +190,7 @@ src_configure() {
 
 		-DQT_UNITY_BUILD=ON # ~30% faster build, affects other dev-qt/* too
 
+		-DQT_FEATURE_force_system_libs=ON
 		-DQT_FEATURE_relocatable=OFF #927691
 		$(qt_feature ssl openssl)
 		$(qt_feature ssl openssl_linked)
diff --git a/dev-qt/qtcharts/Manifest b/dev-qt/qtcharts/Manifest
index 88e88e4dc604..112bd8a1cf5c 100644
--- a/dev-qt/qtcharts/Manifest
+++ b/dev-qt/qtcharts/Manifest
@@ -9,5 +9,6 @@ EBUILD qtcharts-6.7.2.ebuild 566 BLAKE2B 55fc6766a2dde2d5d0f5a2a7439b117c1592ab4
 EBUILD qtcharts-6.7.3.ebuild 569 BLAKE2B e0c4f9ac64b76765425bc945333726c78b1e95e5a498f3ed4e95feab1c0f7884316d57c579dd2868c8860a06810e2d032c6e6aa3c4d4a3df361a51e1f9b3e30a SHA512 d5e07a6d7b6e0e91665d2dd50432190b2464b66f2250d6917dc5f722926e47d46aa69071efa5dfa75ee210a7f560bc9ce16c0bacbffc716a44ede8365b2c80da
 EBUILD qtcharts-6.8.1.ebuild 572 BLAKE2B 2a66f1efed7d379f9ccf64644560d8058b4ff0e93891f70aeb05f83d908f0ceb7f6dbca008c34fc097bc3460ce9a08a91c85abb43de57b8b537f4c05b18d415c SHA512 5f42c00286e8efb41b97e5ccc609f0390d7f75cd8c1c6744f89c248e6e22d2b5cb69a4064c21b010ca3ad684ac2cfa24ddb374065b8334276f2f03036bcdf215
 EBUILD qtcharts-6.8.9999.ebuild 572 BLAKE2B 2a66f1efed7d379f9ccf64644560d8058b4ff0e93891f70aeb05f83d908f0ceb7f6dbca008c34fc097bc3460ce9a08a91c85abb43de57b8b537f4c05b18d415c SHA512 5f42c00286e8efb41b97e5ccc609f0390d7f75cd8c1c6744f89c248e6e22d2b5cb69a4064c21b010ca3ad684ac2cfa24ddb374065b8334276f2f03036bcdf215
+EBUILD qtcharts-6.9.9999.ebuild 572 BLAKE2B 2a66f1efed7d379f9ccf64644560d8058b4ff0e93891f70aeb05f83d908f0ceb7f6dbca008c34fc097bc3460ce9a08a91c85abb43de57b8b537f4c05b18d415c SHA512 5f42c00286e8efb41b97e5ccc609f0390d7f75cd8c1c6744f89c248e6e22d2b5cb69a4064c21b010ca3ad684ac2cfa24ddb374065b8334276f2f03036bcdf215
 EBUILD qtcharts-6.9999.ebuild 572 BLAKE2B 2a66f1efed7d379f9ccf64644560d8058b4ff0e93891f70aeb05f83d908f0ceb7f6dbca008c34fc097bc3460ce9a08a91c85abb43de57b8b537f4c05b18d415c SHA512 5f42c00286e8efb41b97e5ccc609f0390d7f75cd8c1c6744f89c248e6e22d2b5cb69a4064c21b010ca3ad684ac2cfa24ddb374065b8334276f2f03036bcdf215
 MISC metadata.xml 613 BLAKE2B 693aba98343908132ab23149d09ca0e9a99c3af498ac177469d63fb87a5f782b31f92a70941c33bd9f5d82cd0dccb2a2fe7ddf9321f9644401b0603cd99fd21e SHA512 33ee8e1edf4e713a4081af40e7d1b17ae1dcfa390bb6b2dc908d4c1e0ad010b588f65ce1f592bbccaeda21fbab70aaa777d6809ad75e15238c27f40421a78e77
diff --git a/dev-qt/qtcharts/qtcharts-6.9.9999.ebuild b/dev-qt/qtcharts/qtcharts-6.9.9999.ebuild
new file mode 100644
index 000000000000..264ac86f8886
--- /dev/null
+++ b/dev-qt/qtcharts/qtcharts-6.9.9999.ebuild
@@ -0,0 +1,28 @@
+# Copyright 2021-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit qt6-build
+
+DESCRIPTION="Chart component library for the Qt6 framework"
+
+if [[ ${QT6_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+fi
+
+IUSE="gles2-only qml"
+
+RDEPEND="
+	~dev-qt/qtbase-${PV}:6[gles2-only=,gui,opengl,widgets]
+	qml? ( ~dev-qt/qtdeclarative-${PV}:6[opengl] )
+"
+DEPEND="${RDEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package qml Qt6Qml)
+	)
+
+	qt6-build_src_configure
+}
diff --git a/dev-qt/qtconnectivity/Manifest b/dev-qt/qtconnectivity/Manifest
index bab7ae7896ed..e5624bb7fb4b 100644
--- a/dev-qt/qtconnectivity/Manifest
+++ b/dev-qt/qtconnectivity/Manifest
@@ -5,5 +5,6 @@ EBUILD qtconnectivity-6.7.2.ebuild 1734 BLAKE2B 21b1cfd523c635eab9abc358262511a3
 EBUILD qtconnectivity-6.7.3.ebuild 1736 BLAKE2B 74f24d80da81e3757ad6f3784579a8b1f11a1b5b2892b18329dc2e2c59539520ae0b71703cbfba23cbfe7a40295a4273b5cbf92a535b25db1903589bc4fef1b5 SHA512 07be632f7ca1ac429c437937c83ef4f9b903845925daf32d3e9273e8a3661ca1102a8c5f3a3be05d40c381d05233fee940095064a3ba8093ff3d0da832eabbd9
 EBUILD qtconnectivity-6.8.1.ebuild 1900 BLAKE2B 793c75a1ad6163c68f41ac12cc4878a490126ac48197de40fb644df49e95299af53f32cd8a734dc2873f2d21528c787c92352db01ea5395ba646312976b517c4 SHA512 8ce94f9e5d17a0a5052e8c7fa84aba0924a275184e6c3630f1a48d13c44abf1980664eafed9e2718ab6553ad110b84ab5ced95a8ef21532fd34d3e3fcebf01fd
 EBUILD qtconnectivity-6.8.9999.ebuild 1900 BLAKE2B 793c75a1ad6163c68f41ac12cc4878a490126ac48197de40fb644df49e95299af53f32cd8a734dc2873f2d21528c787c92352db01ea5395ba646312976b517c4 SHA512 8ce94f9e5d17a0a5052e8c7fa84aba0924a275184e6c3630f1a48d13c44abf1980664eafed9e2718ab6553ad110b84ab5ced95a8ef21532fd34d3e3fcebf01fd
+EBUILD qtconnectivity-6.9.9999.ebuild 1900 BLAKE2B 793c75a1ad6163c68f41ac12cc4878a490126ac48197de40fb644df49e95299af53f32cd8a734dc2873f2d21528c787c92352db01ea5395ba646312976b517c4 SHA512 8ce94f9e5d17a0a5052e8c7fa84aba0924a275184e6c3630f1a48d13c44abf1980664eafed9e2718ab6553ad110b84ab5ced95a8ef21532fd34d3e3fcebf01fd
 EBUILD qtconnectivity-6.9999.ebuild 1900 BLAKE2B 793c75a1ad6163c68f41ac12cc4878a490126ac48197de40fb644df49e95299af53f32cd8a734dc2873f2d21528c787c92352db01ea5395ba646312976b517c4 SHA512 8ce94f9e5d17a0a5052e8c7fa84aba0924a275184e6c3630f1a48d13c44abf1980664eafed9e2718ab6553ad110b84ab5ced95a8ef21532fd34d3e3fcebf01fd
 MISC metadata.xml 721 BLAKE2B 4c2d1448a532b27910627b3fa1b8912b9048434058ee6f7b14276913ad5d77e55a6f2200002953863aa76ef5d66c04126995e0746cfaf208fa6dbd6e9b622ce1 SHA512 17808c1ab2c7a8e36f6f20801ac288abfd3b390d67ae55212d0d6b890aa7bb49ad8c7d3899cade2d8515faee76a5e02b3cfc582e3f5dde744371592e6d8dfb67
diff --git a/dev-qt/qtconnectivity/qtconnectivity-6.9.9999.ebuild b/dev-qt/qtconnectivity/qtconnectivity-6.9.9999.ebuild
new file mode 100644
index 000000000000..ed26392897ad
--- /dev/null
+++ b/dev-qt/qtconnectivity/qtconnectivity-6.9.9999.ebuild
@@ -0,0 +1,85 @@
+# Copyright 2023-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit qt6-build
+
+DESCRIPTION="Bluetooth and NFC support library for the Qt6 framework"
+
+if [[ ${QT6_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+fi
+
+IUSE="+bluetooth neard nfc smartcard"
+REQUIRED_USE="
+	|| ( bluetooth nfc )
+	nfc? ( ?? ( neard smartcard ) )
+"
+
+DEPEND="
+	~dev-qt/qtbase-${PV}:6[network]
+	bluetooth? (
+		~dev-qt/qtbase-${PV}:6[dbus]
+		net-wireless/bluez:=
+	)
+	nfc? (
+		neard? ( ~dev-qt/qtbase-${PV}:6[dbus] )
+		smartcard? ( sys-apps/pcsc-lite )
+	)
+"
+RDEPEND="
+	${DEPEND}
+	nfc? (
+		neard? ( net-wireless/neard )
+	)
+"
+
+CMAKE_SKIP_TESTS=(
+	# most hardware tests are auto-skipped, but some still misbehave
+	# if bluez/hardware is available (generally tests here may not be
+	# very relevant without hardware, lists may need to be extended)
+	tst_qbluetoothdevicediscoveryagent #936485
+	tst_qbluetoothlocaldevice
+	tst_qbluetoothserver
+	tst_qbluetoothservicediscoveryagent
+	tst_qbluetoothserviceinfo
+	tst_qlowenergycontroller
+)
+
+src_prepare() {
+	qt6-build_src_prepare
+
+	use bluetooth ||
+		sed -i '/add_subdirectory(bluetooth)/d' src/CMakeLists.txt || die
+	use nfc ||
+		sed -i '/add_subdirectory(nfc)/d' src/CMakeLists.txt || die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		$(usev nfc "
+			$(qt_feature neard)
+			$(qt_feature smartcard pcsclite)
+		")
+	)
+
+	qt6-build_src_configure
+}
+
+src_install() {
+	qt6-build_src_install
+
+	# broken (unnecessary) symlink due to add_app() being used over add_tool()
+	use !bluetooth || rm -- "${ED}"/usr/bin/sdpscanner6 || die
+
+	if use test; then
+		local delete=( # sigh
+			"${D}${QT6_BINDIR}"/bluetoothtestdevice
+			"${D}${QT6_BINDIR}"/bttestui
+			"${D}${QT6_BINDIR}"/qlecontroller-server
+		)
+		# using -f given not tracking which tests may be skipped or not
+		rm -f -- "${delete[@]}" || die
+	fi
+}
diff --git a/dev-qt/qtdeclarative/Manifest b/dev-qt/qtdeclarative/Manifest
index 0170430f2db0..502e19dafeb1 100644
--- a/dev-qt/qtdeclarative/Manifest
+++ b/dev-qt/qtdeclarative/Manifest
@@ -15,5 +15,6 @@ EBUILD qtdeclarative-6.7.2.ebuild 1175 BLAKE2B 4f4d132a22d7987afcb7164ce83e35358
 EBUILD qtdeclarative-6.7.3-r4.ebuild 1913 BLAKE2B 2e0fff6218ad15659d0ed07c0b41d24c073c7d5e4af65be98831b240682c3369097ecf1f54d7ff5659a9596d861a45e0a03371bd52e637bd29c25bd06d37559c SHA512 ce1776ec512680642899ae5d12224c77c3ff4f94caaebb454959d436d8c80da1ec72ac8752de3491206d8427caf4b2e07a9a9eae52f226ee02aa7ef3e04be895
 EBUILD qtdeclarative-6.8.1.ebuild 1739 BLAKE2B 434181ff4ee1fcb2d11b034c977b73bc23225cfe44d0ac5ee048620e2940fb0273c682defe6247d90a1052ad935e418c8c81881a5378d8f5b5f466a147f42120 SHA512 057e76f4969535d8437cbc02e8999aa70656e8256e95ba1e20f3a1bcab34a1bef0fe80812799eb608f3c9c0cb18eb06ad0a3ca04e7e6537997f81ff0136ddd35
 EBUILD qtdeclarative-6.8.9999.ebuild 1739 BLAKE2B 434181ff4ee1fcb2d11b034c977b73bc23225cfe44d0ac5ee048620e2940fb0273c682defe6247d90a1052ad935e418c8c81881a5378d8f5b5f466a147f42120 SHA512 057e76f4969535d8437cbc02e8999aa70656e8256e95ba1e20f3a1bcab34a1bef0fe80812799eb608f3c9c0cb18eb06ad0a3ca04e7e6537997f81ff0136ddd35
+EBUILD qtdeclarative-6.9.9999.ebuild 1739 BLAKE2B 434181ff4ee1fcb2d11b034c977b73bc23225cfe44d0ac5ee048620e2940fb0273c682defe6247d90a1052ad935e418c8c81881a5378d8f5b5f466a147f42120 SHA512 057e76f4969535d8437cbc02e8999aa70656e8256e95ba1e20f3a1bcab34a1bef0fe80812799eb608f3c9c0cb18eb06ad0a3ca04e7e6537997f81ff0136ddd35
 EBUILD qtdeclarative-6.9999.ebuild 1739 BLAKE2B 434181ff4ee1fcb2d11b034c977b73bc23225cfe44d0ac5ee048620e2940fb0273c682defe6247d90a1052ad935e418c8c81881a5378d8f5b5f466a147f42120 SHA512 057e76f4969535d8437cbc02e8999aa70656e8256e95ba1e20f3a1bcab34a1bef0fe80812799eb608f3c9c0cb18eb06ad0a3ca04e7e6537997f81ff0136ddd35
 MISC metadata.xml 945 BLAKE2B 8a5d26ab3274cb9ca8b7cf3dceddcd33d9690cd20194adc63b80cd5e13e11d222d48473232b4e2cb41cecf1f51b33df4458811b6fb622a41519f0f3f0223b578 SHA512 a4c587afdbb0320e0f23f47a3ae58e2f69e86a0f539bf613c275ab0be7b9490d33d9c9de35ace02d3cfef903f3e6c7caf492cfdfa53c989b2d56e6c7288f4552
diff --git a/dev-qt/qtdeclarative/qtdeclarative-6.9.9999.ebuild b/dev-qt/qtdeclarative/qtdeclarative-6.9.9999.ebuild
new file mode 100644
index 000000000000..724f992b0453
--- /dev/null
+++ b/dev-qt/qtdeclarative/qtdeclarative-6.9.9999.ebuild
@@ -0,0 +1,61 @@
+# Copyright 2021-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..13} )
+
+# behaves very badly when qtdeclarative is not already installed, also
+# other more minor issues (installs junk, sandbox/offscreen issues)
+QT6_RESTRICT_TESTS=1
+
+inherit python-any-r1 qt6-build
+
+DESCRIPTION="Qt Declarative (Quick 2)"
+
+if [[ ${QT6_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+fi
+
+IUSE="accessibility +jit +network opengl qmlls +sql +ssl svg vulkan +widgets"
+
+RDEPEND="
+	~dev-qt/qtbase-${PV}:6[accessibility=,gui,network=,opengl=,sql?,ssl?,vulkan=,widgets=]
+	qmlls? ( ~dev-qt/qtlanguageserver-${PV}:6 )
+	svg? ( ~dev-qt/qtsvg-${PV}:6 )
+"
+DEPEND="
+	${RDEPEND}
+	vulkan? ( dev-util/vulkan-headers )
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	~dev-qt/qtshadertools-${PV}:6
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package qmlls Qt6LanguageServerPrivate)
+		$(cmake_use_find_package sql Qt6Sql)
+		$(cmake_use_find_package svg Qt6Svg)
+		$(qt_feature jit qml_jit)
+		$(qt_feature network qml_network)
+		$(qt_feature ssl qml_ssl)
+	)
+
+	qt6-build_src_configure
+}
+
+src_install() {
+	qt6-build_src_install
+
+	if [[ ! -e ${D}${QT6_LIBDIR}/libQt6QuickControls2.so.6 ]]; then #940675
+		eerror "${CATEGORY}/${PF} seems to have been improperly built and"
+		eerror "install was aborted to protect the system. Possibly(?) due"
+		eerror "to a rare portage ordering bug. If using portage, try:"
+		eerror "    emerge -1 qtshadertools:6 qtdeclarative:6"
+		eerror "If that did not resolve the issue, please provide build.log"
+		eerror "on https://bugs.gentoo.org/940675"
+		die "aborting due to incomplete/broken build (see above)"
+	fi
+}
diff --git a/dev-qt/qthttpserver/Manifest b/dev-qt/qthttpserver/Manifest
index f937935cad7e..e62df6940240 100644
--- a/dev-qt/qthttpserver/Manifest
+++ b/dev-qt/qthttpserver/Manifest
@@ -5,5 +5,6 @@ EBUILD qthttpserver-6.7.2.ebuild 574 BLAKE2B 6cf58709afc0e04b157dab96c0c48f00e61
 EBUILD qthttpserver-6.7.3.ebuild 574 BLAKE2B 6cf58709afc0e04b157dab96c0c48f00e613eb751e50a741752b97cf6a934f99556f3c580645eb40431915d9376eaba9f3d47be99c962b7f11051ac84ff331cb SHA512 e06111695c353ee1b2991d4f0c492b1e504a29802b7177d3046690825e3b7f0a6c8e632b7eba3e100c47a6a5178826cc202ea3c0cd382c59dadbb4d530d5c4be
 EBUILD qthttpserver-6.8.1.ebuild 575 BLAKE2B affabe9fa30b9ee370823bdd6b7a34480c50a5d0371b3570aa25611d2a0b963e5239068f8d484647ef1bc8fa6fa52c635b9aaba3a087e2c70e6a3946562eeab0 SHA512 0348549a66c33c6720cc09ebe491ce04a54058254ab70be63725a94c7efa41869f660a79eeca5da91e3a59ea149b697a128804ae81f321c2920557cd9727eacf
 EBUILD qthttpserver-6.8.9999.ebuild 575 BLAKE2B affabe9fa30b9ee370823bdd6b7a34480c50a5d0371b3570aa25611d2a0b963e5239068f8d484647ef1bc8fa6fa52c635b9aaba3a087e2c70e6a3946562eeab0 SHA512 0348549a66c33c6720cc09ebe491ce04a54058254ab70be63725a94c7efa41869f660a79eeca5da91e3a59ea149b697a128804ae81f321c2920557cd9727eacf
+EBUILD qthttpserver-6.9.9999.ebuild 575 BLAKE2B affabe9fa30b9ee370823bdd6b7a34480c50a5d0371b3570aa25611d2a0b963e5239068f8d484647ef1bc8fa6fa52c635b9aaba3a087e2c70e6a3946562eeab0 SHA512 0348549a66c33c6720cc09ebe491ce04a54058254ab70be63725a94c7efa41869f660a79eeca5da91e3a59ea149b697a128804ae81f321c2920557cd9727eacf
 EBUILD qthttpserver-6.9999.ebuild 570 BLAKE2B 0d650d9a207c6c601dad662e173f099ca29a4b1e67c909d23617c06546849d951651489034b908182fb95a21c3299361517433f25f5aadf4cfcae56eec99b9ff SHA512 65867d14d6a7c004ce0d162af91c940bffd07c5c0eee76719e93960860fb24e3691e76740a606e68a7261d41684a8269d0330d88d33a13871fc69ee81bd2f6da
 MISC metadata.xml 648 BLAKE2B b39d7fe6bb7c7279cc181962b9827c456d6d04428cbd2648e7e23d7376e0a9a7218f316f4ec0699dbc1856587e4a24bfa8489b3586a2b4d7f8346b0a9a7ee3c8 SHA512 78a446053addfddedf86bf0408d4c82ea76203ef0f0c8c8e1d8b23111718a2b88b9a8c0b2f919feb344851af312d1051bbd94755e176927b7679f75c8f0c6e20
diff --git a/dev-qt/qthttpserver/qthttpserver-6.9.9999.ebuild b/dev-qt/qthttpserver/qthttpserver-6.9.9999.ebuild
new file mode 100644
index 000000000000..7583ea864f5f
--- /dev/null
+++ b/dev-qt/qthttpserver/qthttpserver-6.9.9999.ebuild
@@ -0,0 +1,31 @@
+# Copyright 2023-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit qt6-build
+
+DESCRIPTION="HTTP server functionality for the Qt6 framework"
+
+if [[ ${QT6_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64"
+fi
+
+IUSE="+ssl websockets"
+
+RDEPEND="
+	~dev-qt/qtbase-${PV}:6[network,ssl=]
+	websockets? ( ~dev-qt/qtwebsockets-${PV}:6 )
+"
+DEPEND="
+	${RDEPEND}
+	test? ( ~dev-qt/qtbase-${PV}:6[concurrent] )
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package websockets Qt6WebSockets)
+	)
+
+	qt6-build_src_configure
+}
diff --git a/dev-qt/qtimageformats/Manifest b/dev-qt/qtimageformats/Manifest
index fabd3449b905..202a40ef5fef 100644
--- a/dev-qt/qtimageformats/Manifest
+++ b/dev-qt/qtimageformats/Manifest
@@ -11,5 +11,6 @@ EBUILD qtimageformats-6.7.2.ebuild 846 BLAKE2B 73d140d34187d0bb89bfd7ab4d74a99d5
 EBUILD qtimageformats-6.7.3.ebuild 848 BLAKE2B a0d917fd12520598e89967a32330908114a563f4a60e04e592b6d8062de835e2550a21265b622396e571d96bede2a5a2df4e0c6db03a7ee57c4c299fa87f3815 SHA512 7b4b9ffa050f4a260e519615dd42c97fa0ab6ea67445959083782a9dcc56c0ea081d0b8f2271294bbafb1c2bc05c3d3d8cc9a1b923babefa620e93db92891cfb
 EBUILD qtimageformats-6.8.1.ebuild 851 BLAKE2B 105a8533f57e5182d3e2442b436a6709dcd438c6f9c76fed44b13b8414fbaa51341bebfb75b60911b59a4b65467186d11cef202edd1ee63305afcdf39efe9fe8 SHA512 41b629aaa477787039ee26b77501398557ff034a9c1c49f06c48eeb2ff4d07ab3ca32c4ecc04acf6b07c1bde25d8528c4dfc2fa96efc9bfefaecabe35ab9253e
 EBUILD qtimageformats-6.8.9999.ebuild 851 BLAKE2B 105a8533f57e5182d3e2442b436a6709dcd438c6f9c76fed44b13b8414fbaa51341bebfb75b60911b59a4b65467186d11cef202edd1ee63305afcdf39efe9fe8 SHA512 41b629aaa477787039ee26b77501398557ff034a9c1c49f06c48eeb2ff4d07ab3ca32c4ecc04acf6b07c1bde25d8528c4dfc2fa96efc9bfefaecabe35ab9253e
-EBUILD qtimageformats-6.9999.ebuild 851 BLAKE2B 105a8533f57e5182d3e2442b436a6709dcd438c6f9c76fed44b13b8414fbaa51341bebfb75b60911b59a4b65467186d11cef202edd1ee63305afcdf39efe9fe8 SHA512 41b629aaa477787039ee26b77501398557ff034a9c1c49f06c48eeb2ff4d07ab3ca32c4ecc04acf6b07c1bde25d8528c4dfc2fa96efc9bfefaecabe35ab9253e
+EBUILD qtimageformats-6.9.9999.ebuild 791 BLAKE2B 63b832a1c0d348c9c1e9c92e3d8501b9c6d46658b9a765d918dec12353e7fc8363f9273e8db1747386f68c04884cafeb36749ed40cf47bec63d60a4ad46a9c9b SHA512 79720370162e6b4b0e1de0d24426c9f38b10bbd7897afaf3afc91fed5231a6af855ceca7c206300fd40530a56d59aa57ef0ba4921250ce008d9e8a93fa5a4735
+EBUILD qtimageformats-6.9999.ebuild 791 BLAKE2B 63b832a1c0d348c9c1e9c92e3d8501b9c6d46658b9a765d918dec12353e7fc8363f9273e8db1747386f68c04884cafeb36749ed40cf47bec63d60a4ad46a9c9b SHA512 79720370162e6b4b0e1de0d24426c9f38b10bbd7897afaf3afc91fed5231a6af855ceca7c206300fd40530a56d59aa57ef0ba4921250ce008d9e8a93fa5a4735
 MISC metadata.xml 539 BLAKE2B f82d2242ecd287674a2be5eae280a70ddca0e7c913ee5c86c7bf95c9a122c5d0d57006d5bd236afb5ef55b51d1bed6be5110c51e732fbe94ebe5b6e10fee89db SHA512 22e5e3417dc154092e816cdfe391fb7c6595532f506766da0d2ae44f8254453f57a00d0fb1b12f9d2fb10c8cec5561d85f3891991aeb2aedcd3696f2c3b31d4a
diff --git a/dev-qt/qtimageformats/qtimageformats-6.9.9999.ebuild b/dev-qt/qtimageformats/qtimageformats-6.9.9999.ebuild
new file mode 100644
index 000000000000..cef280adccff
--- /dev/null
+++ b/dev-qt/qtimageformats/qtimageformats-6.9.9999.ebuild
@@ -0,0 +1,39 @@
+# Copyright 2021-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit qt6-build
+
+DESCRIPTION="Additional format plugins for the Qt image I/O system"
+
+if [[ ${QT6_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc64 ~riscv ~x86"
+fi
+
+IUSE="mng"
+
+RDEPEND="
+	~dev-qt/qtbase-${PV}:6[gui]
+	media-libs/libwebp:=
+	media-libs/tiff:=
+	mng? ( media-libs/libmng:= )
+"
+DEPEND="${RDEPEND}"
+
+CMAKE_SKIP_TESTS=(
+	# heif plugin is only for Mac, test is normally auto-skipped but may
+	# misbehave with kde-frameworks/kimageformats:6[heif] (bug #927971)
+	tst_qheif
+)
+
+src_configure() {
+	local mycmakeargs=(
+		-DQT_FEATURE_jasper=OFF
+		$(qt_feature mng)
+		-DQT_FEATURE_tiff=ON
+		-DQT_FEATURE_webp=ON
+	)
+
+	qt6-build_src_configure
+}
diff --git a/dev-qt/qtimageformats/qtimageformats-6.9999.ebuild b/dev-qt/qtimageformats/qtimageformats-6.9999.ebuild
index 9d1a9a6f9685..cef280adccff 100644
--- a/dev-qt/qtimageformats/qtimageformats-6.9999.ebuild
+++ b/dev-qt/qtimageformats/qtimageformats-6.9999.ebuild
@@ -33,8 +33,6 @@ src_configure() {
 		$(qt_feature mng)
 		-DQT_FEATURE_tiff=ON
 		-DQT_FEATURE_webp=ON
-		-DQT_FEATURE_system_tiff=ON
-		-DQT_FEATURE_system_webp=ON
 	)
 
 	qt6-build_src_configure
diff --git a/dev-qt/qtlanguageserver/Manifest b/dev-qt/qtlanguageserver/Manifest
index ff6fb751aed9..52fded80f1ea 100644
--- a/dev-qt/qtlanguageserver/Manifest
+++ b/dev-qt/qtlanguageserver/Manifest
@@ -5,5 +5,6 @@ EBUILD qtlanguageserver-6.7.2.ebuild 315 BLAKE2B 20841e633743aaeaf6f61a5ccf0ef80
 EBUILD qtlanguageserver-6.7.3.ebuild 315 BLAKE2B 20841e633743aaeaf6f61a5ccf0ef80d88e4eaeef957b03fa4cdbb4acfba6349dd6208003ddde02092b00b818e17d25d3410b33f34e8e5fe40c544b2594a1bd7 SHA512 4eac32e1244a4a4d68061860ad0d7b6454d7485b825ce57deac8c715417a8ebffaec7ad23e3ddce840348ba96d73d3a5093f178038e4a3ae7f6f751792a26ff7
 EBUILD qtlanguageserver-6.8.1.ebuild 316 BLAKE2B d430cbe5402d5ddef39cc6f2434cff80c96bdb1b509f1867512e5088a79c10e19af907512a36710051538408ad6003e8a883e9cf2a0703d8c982e855514374ba SHA512 44bf60549f9ee619904517be2112cd4f730a16d89dde3187c4a775446ff6e84dc77a25c184414594663cf62accad605ef14b33d0d76d934556ccefa55f39cd17
 EBUILD qtlanguageserver-6.8.9999.ebuild 316 BLAKE2B d430cbe5402d5ddef39cc6f2434cff80c96bdb1b509f1867512e5088a79c10e19af907512a36710051538408ad6003e8a883e9cf2a0703d8c982e855514374ba SHA512 44bf60549f9ee619904517be2112cd4f730a16d89dde3187c4a775446ff6e84dc77a25c184414594663cf62accad605ef14b33d0d76d934556ccefa55f39cd17
+EBUILD qtlanguageserver-6.9.9999.ebuild 316 BLAKE2B d430cbe5402d5ddef39cc6f2434cff80c96bdb1b509f1867512e5088a79c10e19af907512a36710051538408ad6003e8a883e9cf2a0703d8c982e855514374ba SHA512 44bf60549f9ee619904517be2112cd4f730a16d89dde3187c4a775446ff6e84dc77a25c184414594663cf62accad605ef14b33d0d76d934556ccefa55f39cd17
 EBUILD qtlanguageserver-6.9999.ebuild 316 BLAKE2B d430cbe5402d5ddef39cc6f2434cff80c96bdb1b509f1867512e5088a79c10e19af907512a36710051538408ad6003e8a883e9cf2a0703d8c982e855514374ba SHA512 44bf60549f9ee619904517be2112cd4f730a16d89dde3187c4a775446ff6e84dc77a25c184414594663cf62accad605ef14b33d0d76d934556ccefa55f39cd17
 MISC metadata.xml 541 BLAKE2B 63c47a8da80c17d5203a53d31e6736ac288f00869b7e8291a4232966a0f2fd0cfc6b93161e996e8911d081ccca8e67675b1c8c11389ff9b8dd771b68156fdb4b SHA512 0dabf104c9e8bda0a72202e51d3e761974d12df24d8509f0a89ed559dccc3d92214ac06597d8e1c338db1c35849a35bcbfefc97c10736943f2da4168d5246a9f
diff --git a/dev-qt/qtlanguageserver/qtlanguageserver-6.9.9999.ebuild b/dev-qt/qtlanguageserver/qtlanguageserver-6.9.9999.ebuild
new file mode 100644
index 000000000000..b02596ef5aab
--- /dev/null
+++ b/dev-qt/qtlanguageserver/qtlanguageserver-6.9.9999.ebuild
@@ -0,0 +1,15 @@
+# Copyright 2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit qt6-build
+
+DESCRIPTION="Implementation of the Language Server Protocol for Qt"
+
+if [[ ${QT6_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64"
+fi
+
+RDEPEND="~dev-qt/qtbase-${PV}:6"
+DEPEND="${RDEPEND}"
diff --git a/dev-qt/qtlocation/Manifest b/dev-qt/qtlocation/Manifest
index fa18135f64d9..64748cc3ae6d 100644
--- a/dev-qt/qtlocation/Manifest
+++ b/dev-qt/qtlocation/Manifest
@@ -12,5 +12,6 @@ EBUILD qtlocation-6.7.2.ebuild 1367 BLAKE2B 7b74bb6c4539fa58b6d2b6153909d37eb9dc
 EBUILD qtlocation-6.7.3.ebuild 1369 BLAKE2B 1201fde2d1e6828574f73a82d6a990643d2244afc2504ee15268c09754992ca0b2de726ef058d4bf0a10ab83bad54d3d448b9bb9729755b0b285b8fd2159d0ee SHA512 d4153d0f02735fe2ca0f60950fa445742eab593d5a268b9d7787e2148683b349020a3d4fe1a05f03ade335fe9e1321e417efc3f44607a9936bc2d8fd49a8fddb
 EBUILD qtlocation-6.8.1.ebuild 1372 BLAKE2B 0f3a72169d3cfc8e7424897727ea19b19b0484ef4ce1b07db9b3118d921d6cfeeaac3267ac6bf27a1caa37b444e513187afb5e492fa5fd5f6e004be53bfec82d SHA512 5dcffbcb3237af0ef18f2fd962d77ee412141ee9a1e7531d7fef916738a8a20ae37946052632ca7b7c4193342a3c7067a74df6122306e605e0de527befc3cb26
 EBUILD qtlocation-6.8.9999.ebuild 1372 BLAKE2B 0f3a72169d3cfc8e7424897727ea19b19b0484ef4ce1b07db9b3118d921d6cfeeaac3267ac6bf27a1caa37b444e513187afb5e492fa5fd5f6e004be53bfec82d SHA512 5dcffbcb3237af0ef18f2fd962d77ee412141ee9a1e7531d7fef916738a8a20ae37946052632ca7b7c4193342a3c7067a74df6122306e605e0de527befc3cb26
+EBUILD qtlocation-6.9.9999.ebuild 1372 BLAKE2B 0f3a72169d3cfc8e7424897727ea19b19b0484ef4ce1b07db9b3118d921d6cfeeaac3267ac6bf27a1caa37b444e513187afb5e492fa5fd5f6e004be53bfec82d SHA512 5dcffbcb3237af0ef18f2fd962d77ee412141ee9a1e7531d7fef916738a8a20ae37946052632ca7b7c4193342a3c7067a74df6122306e605e0de527befc3cb26
 EBUILD qtlocation-6.9999.ebuild 1372 BLAKE2B 0f3a72169d3cfc8e7424897727ea19b19b0484ef4ce1b07db9b3118d921d6cfeeaac3267ac6bf27a1caa37b444e513187afb5e492fa5fd5f6e004be53bfec82d SHA512 5dcffbcb3237af0ef18f2fd962d77ee412141ee9a1e7531d7fef916738a8a20ae37946052632ca7b7c4193342a3c7067a74df6122306e605e0de527befc3cb26
 MISC metadata.xml 535 BLAKE2B 061ed9abebe579a38a262451a5e72d112adbcf4693078042f3b55be8d16b7bd430198edb732cd127deccf8c67d444b9951dd7ac8e2d0fef7de02913a3a8ba644 SHA512 823b03655b8bbb923d38d4f8358898beb2e2fa34d36e2d8d843e164027d58eb044a3e661b8dfc12cda123f15fd07d0987874b81543c47e46c670c25fa35dde87
diff --git a/dev-qt/qtlocation/qtlocation-6.9.9999.ebuild b/dev-qt/qtlocation/qtlocation-6.9.9999.ebuild
new file mode 100644
index 000000000000..d407e2f12e54
--- /dev/null
+++ b/dev-qt/qtlocation/qtlocation-6.9.9999.ebuild
@@ -0,0 +1,44 @@
+# Copyright 2021-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit qt6-build
+
+DESCRIPTION="Location (places, maps, navigation) library for the Qt6 framework"
+
+if [[ ${QT6_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+fi
+
+RDEPEND="
+	~dev-qt/qtbase-${PV}:6[network]
+	~dev-qt/qtdeclarative-${PV}:6
+	~dev-qt/qtpositioning-${PV}:6[qml]
+"
+DEPEND="${RDEPEND}"
+
+CMAKE_SKIP_TESTS=(
+	# ignores QML_IMPORT_PATH (unlike other tests) and looks in
+	# the missing builddir/qml, skip rather than work around
+	tst_declarative_ui
+)
+
+src_install() {
+	qt6-build_src_install
+
+	if use test; then
+		local delete=( # sigh
+			"${D}${QT6_LIBDIR}"/cmake/Qt6Location/*TestGeoServicePlugin*.cmake
+			"${D}${QT6_LIBDIR}"/cmake/Qt6Location/*UnsupportedPlacesGeoServicePlugin*.cmake
+			"${D}${QT6_LIBDIR}"/cmake/Qt6Qml/QmlPlugins/*declarative_location_test*.cmake
+			"${D}${QT6_PLUGINDIR}"/geoservices/libqtgeoservices_geocodingplugin.so
+			"${D}${QT6_PLUGINDIR}"/geoservices/libqtgeoservices_placesplugin_unsupported.so
+			"${D}${QT6_PLUGINDIR}"/geoservices/libqtgeoservices_qmltestplugin.so
+			"${D}${QT6_PLUGINDIR}"/geoservices/libqtgeoservices_routingplugin.so
+			"${D}${QT6_QMLDIR}"/QtLocation/Test
+		)
+		# using -f given not tracking which tests may be skipped or not
+		rm -rf -- "${delete[@]}" || die
+	fi
+}
diff --git a/dev-qt/qtmultimedia/Manifest b/dev-qt/qtmultimedia/Manifest
index 1680c99b1fe3..c715d8c7530e 100644
--- a/dev-qt/qtmultimedia/Manifest
+++ b/dev-qt/qtmultimedia/Manifest
@@ -14,5 +14,6 @@ EBUILD qtmultimedia-6.7.2-r2.ebuild 3286 BLAKE2B 59566faeeb43449047c4829393193bb
 EBUILD qtmultimedia-6.7.3.ebuild 3791 BLAKE2B 27e2f4221e030c0daa3e2cb82963b4bf5f46a316ac2a47f7cfea3b2c443a2b694c4cdc3c2a786e76baa8fb509ebd05934ae55d30fb4ae809669523f666fd8d79 SHA512 4c4d68c7785bb8cf77a87b75ab8b210013e36ec2f06032b4ea6c4fbb7dc2f22b264010d76581490f6c71ee21aad6b92fb67fed02d3e98f72752588215b9492cd
 EBUILD qtmultimedia-6.8.1.ebuild 4098 BLAKE2B 90dcb1b7937298b99ec10e16c247f038d4629fe97350951ba9327e115022686c417b55d1302bcf05d95c16757d8db8a38b1a6ef322a43d8b48e141bc556a2408 SHA512 98cfae6b8f7e89b06de3a420a60c34331b3b701c26db6d4f110979db88eec857bc59db5091d6c1b3b4c4e041ef273f144c459a0aebc7443118f719413b4e3741
 EBUILD qtmultimedia-6.8.9999.ebuild 4098 BLAKE2B 90dcb1b7937298b99ec10e16c247f038d4629fe97350951ba9327e115022686c417b55d1302bcf05d95c16757d8db8a38b1a6ef322a43d8b48e141bc556a2408 SHA512 98cfae6b8f7e89b06de3a420a60c34331b3b701c26db6d4f110979db88eec857bc59db5091d6c1b3b4c4e041ef273f144c459a0aebc7443118f719413b4e3741
+EBUILD qtmultimedia-6.9.9999.ebuild 4098 BLAKE2B 90dcb1b7937298b99ec10e16c247f038d4629fe97350951ba9327e115022686c417b55d1302bcf05d95c16757d8db8a38b1a6ef322a43d8b48e141bc556a2408 SHA512 98cfae6b8f7e89b06de3a420a60c34331b3b701c26db6d4f110979db88eec857bc59db5091d6c1b3b4c4e041ef273f144c459a0aebc7443118f719413b4e3741
 EBUILD qtmultimedia-6.9999.ebuild 4098 BLAKE2B 90dcb1b7937298b99ec10e16c247f038d4629fe97350951ba9327e115022686c417b55d1302bcf05d95c16757d8db8a38b1a6ef322a43d8b48e141bc556a2408 SHA512 98cfae6b8f7e89b06de3a420a60c34331b3b701c26db6d4f110979db88eec857bc59db5091d6c1b3b4c4e041ef273f144c459a0aebc7443118f719413b4e3741
 MISC metadata.xml 888 BLAKE2B bf3f5b1376585d4aa9021aa838b486b8143e5fbf7c5bf7c7324500de96ab86fd0176993567f97f5e5d115284f8c3ccc16475f787407d747689aefa82cf9a9534 SHA512 98e962234f1ed462444e5f7f3e77a08794b2d0480df7773e822a5671cdfbf708b51edfafacffade2ad5f8b177d89cc0d53b975ef181be66b885c17db2a4a542b
diff --git a/dev-qt/qtmultimedia/qtmultimedia-6.9.9999.ebuild b/dev-qt/qtmultimedia/qtmultimedia-6.9.9999.ebuild
new file mode 100644
index 000000000000..5c9d4372dcb4
--- /dev/null
+++ b/dev-qt/qtmultimedia/qtmultimedia-6.9.9999.ebuild
@@ -0,0 +1,150 @@
+# Copyright 2021-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit flag-o-matic qt6-build
+
+DESCRIPTION="Multimedia (audio, video, radio, camera) library for the Qt6 framework"
+
+if [[ ${QT6_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~x86"
+fi
+
+IUSE="
+	+X alsa eglfs +ffmpeg gstreamer opengl pulseaudio
+	qml screencast v4l vaapi vulkan wayland
+"
+# tst_qmediaplayerbackend hard requires qml, review in case becomes optional
+REQUIRED_USE="
+	|| ( ffmpeg gstreamer )
+	eglfs? ( ffmpeg opengl qml )
+	screencast? ( ffmpeg )
+	test? ( qml )
+	vaapi? ( ffmpeg opengl )
+"
+
+# gstreamer[X=] is to avoid broken gst detect if -X w/ gst[X] w/o xorg-proto
+# (*could* be removed if gst-plugins-base[X] RDEPENDs on xorg-proto)
+# := skipped on pipewire due to only being used through dbus
+RDEPEND="
+	~dev-qt/qtbase-${PV}:6[gui,network,opengl=,vulkan=,widgets]
+	alsa? (
+		!pulseaudio? ( media-libs/alsa-lib )
+	)
+	ffmpeg? (
+		~dev-qt/qtbase-${PV}:6[X=,concurrent,eglfs=]
+		media-video/ffmpeg:=[vaapi?]
+		X? (
+			x11-libs/libX11
+			x11-libs/libXext
+			x11-libs/libXrandr
+		)
+	)
+	gstreamer? (
+		dev-libs/glib:2
+		media-libs/gst-plugins-bad:1.0
+		media-libs/gst-plugins-base:1.0[X=]
+		media-libs/gstreamer:1.0
+		opengl? (
+			~dev-qt/qtbase-${PV}:6[X?,wayland?]
+			media-libs/gst-plugins-base:1.0[X?,egl,opengl,wayland?]
+		)
+	)
+	opengl? ( media-libs/libglvnd )
+	pulseaudio? ( media-libs/libpulse )
+	qml? (
+		~dev-qt/qtdeclarative-${PV}:6
+		~dev-qt/qtquick3d-${PV}:6
+	)
+	screencast? (
+		~dev-qt/qtbase-${PV}:6[dbus]
+		media-video/pipewire
+	)
+"
+DEPEND="
+	${RDEPEND}
+	X? ( x11-base/xorg-proto )
+	v4l? ( sys-kernel/linux-headers )
+	vulkan? ( dev-util/vulkan-headers )
+"
+BDEPEND="~dev-qt/qtshadertools-${PV}:6"
+
+CMAKE_SKIP_TESTS=(
+	# unimportant and expects all backends to be available (bug #928420)
+	tst_backends
+	# tries to use real alsa or pulseaudio and fails in sandbox
+	tst_qaudiosink
+	tst_qaudiosource
+	tst_qmediacapture_gstreamer
+	tst_qmediacapturesession
+	tst_qmediaframeinputsbackend
+	tst_qmediaplayer_gstreamer
+	tst_qmediaplayerbackend
+	tst_qsoundeffect
+	# may try to use v4l2 or hardware acceleration depending on availability
+	tst_qmediarecorderbackend
+	tst_qscreencapture_integration
+	tst_qscreencapturebackend
+	tst_qvideoframebackend
+	# fails with offscreen rendering
+	tst_qvideoframecolormanagement
+	tst_qwindowcapturebackend
+)
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-6.7.3-eigen-ppc-no-vsx.patch
+)
+
+src_configure() {
+	# eigen + ppc32 seems broken w/ -maltivec (forced by Qt, bug #943402)
+	use ppc && append-cppflags -DEIGEN_DONT_VECTORIZE
+
+	# normally passed by the build system, but needed for 32-on-64 chroots
+	use x86 && append-cppflags -DDISABLE_SIMD -DPFFFT_SIMD_DISABLE
+
+	local mycmakeargs=(
+		$(cmake_use_find_package qml Qt6Qml)
+		$(qt_feature ffmpeg)
+		$(qt_feature gstreamer)
+		$(usev gstreamer "
+			$(qt_feature opengl gstreamer_gl)
+			$(usev opengl "
+				$(qt_feature X gstreamer_gl_x11)
+				$(qt_feature wayland gstreamer_gl_wayland)
+			")
+		")
+		$(qt_feature pulseaudio)
+		$(qt_feature screencast pipewire)
+		$(qt_feature v4l linux_v4l)
+		$(qt_feature vaapi)
+	)
+
+	# ALSA backend is experimental off-by-default and can take priority
+	# causing problems (bug #935146), disable if USE=pulseaudio is set
+	# (also do not want unnecessary usage of ALSA plugins -> pulse)
+	if use alsa && use pulseaudio; then
+		# einfo should be enough given pure-ALSA users tend to disable pulse
+		einfo "Warning: USE=alsa is ignored when USE=pulseaudio is set"
+		mycmakeargs+=( -DQT_FEATURE_alsa=OFF )
+	else
+		mycmakeargs+=( $(qt_feature alsa) )
+	fi
+
+	qt6-build_src_configure
+}
+
+src_install() {
+	qt6-build_src_install
+
+	if use test; then
+		local delete=( # sigh
+			"${D}${QT6_LIBDIR}"/cmake/Qt6Multimedia/Qt6MockMultimediaPlugin*.cmake
+			"${D}${QT6_MKSPECSDIR}"/modules/qt_plugin_mockmultimediaplugin.pri
+			"${D}${QT6_PLUGINDIR}"/multimedia/libmockmultimediaplugin.*
+			"${D}${QT6_PLUGINDIR}"/multimedia/objects-*
+		)
+		# using -f given not tracking which tests may be skipped or not
+		rm -rf -- "${delete[@]}" || die
+	fi
+}
diff --git a/dev-qt/qtnetworkauth/Manifest b/dev-qt/qtnetworkauth/Manifest
index 949473924d6a..55457b678891 100644
--- a/dev-qt/qtnetworkauth/Manifest
+++ b/dev-qt/qtnetworkauth/Manifest
@@ -11,5 +11,6 @@ EBUILD qtnetworkauth-6.7.2.ebuild 350 BLAKE2B 207a1fe348d0c5b0b94537aa9c77c789d5
 EBUILD qtnetworkauth-6.7.3.ebuild 352 BLAKE2B b33b27475fde857d3b7f6edff0e37ee1989a3edd276d684dab7638ef3ff257e2f004d9096ada72332b6dbccda527f57f3d2485c07127925db94550fc8e14749f SHA512 6e22e54136d845ed49044e84ae1e0bcf05a6aa3d99e551e9e6b70d3c65f782390f33a7909a6235c8d05e83ae5d4c88096881cbf3e5236ad7fde9048bc9ad9db1
 EBUILD qtnetworkauth-6.8.1.ebuild 358 BLAKE2B 3c7c84223bb8da524851b41b82eaec6ed51dc12f1658127a36fd9728903bb2c204b10d7a6e6866cfe975bb9b1e2692fc62299d8943735bcc8602dff04c0927bd SHA512 508dd20e4ae66ee07dc85c5bac4e14f7d3ee6b63edb534becd25bba15d1942a0de4ad70863e41ea60f1c58a970bb5fac7c744aaad80f744adf5d93362391d145
 EBUILD qtnetworkauth-6.8.9999.ebuild 358 BLAKE2B 3c7c84223bb8da524851b41b82eaec6ed51dc12f1658127a36fd9728903bb2c204b10d7a6e6866cfe975bb9b1e2692fc62299d8943735bcc8602dff04c0927bd SHA512 508dd20e4ae66ee07dc85c5bac4e14f7d3ee6b63edb534becd25bba15d1942a0de4ad70863e41ea60f1c58a970bb5fac7c744aaad80f744adf5d93362391d145
+EBUILD qtnetworkauth-6.9.9999.ebuild 358 BLAKE2B 3c7c84223bb8da524851b41b82eaec6ed51dc12f1658127a36fd9728903bb2c204b10d7a6e6866cfe975bb9b1e2692fc62299d8943735bcc8602dff04c0927bd SHA512 508dd20e4ae66ee07dc85c5bac4e14f7d3ee6b63edb534becd25bba15d1942a0de4ad70863e41ea60f1c58a970bb5fac7c744aaad80f744adf5d93362391d145
 EBUILD qtnetworkauth-6.9999.ebuild 358 BLAKE2B 3c7c84223bb8da524851b41b82eaec6ed51dc12f1658127a36fd9728903bb2c204b10d7a6e6866cfe975bb9b1e2692fc62299d8943735bcc8602dff04c0927bd SHA512 508dd20e4ae66ee07dc85c5bac4e14f7d3ee6b63edb534becd25bba15d1942a0de4ad70863e41ea60f1c58a970bb5fac7c744aaad80f744adf5d93362391d145
 MISC metadata.xml 538 BLAKE2B 0bf6259826c916b9b8f57a05397c87e9d013d69739c93f1ca3eb030c7bb6e7630021b8dfcc7497cff90aa5e5cc570a5e73285001edeb40a50839d10955e230aa SHA512 5c25a747fb6f9054d5c30b4ec08b4e02435676085f5dccc1d05bc68222230f3bbf426667f7cadf1a97d7a423aa8d1d8cb55e00d9212e333646300439c81ee2f8
diff --git a/dev-qt/qtnetworkauth/qtnetworkauth-6.9.9999.ebuild b/dev-qt/qtnetworkauth/qtnetworkauth-6.9.9999.ebuild
new file mode 100644
index 000000000000..e5e7961d25ba
--- /dev/null
+++ b/dev-qt/qtnetworkauth/qtnetworkauth-6.9.9999.ebuild
@@ -0,0 +1,15 @@
+# Copyright 2021-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit qt6-build
+
+DESCRIPTION="Network authorization library for the Qt6 framework"
+
+if [[ ${QT6_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+fi
+
+RDEPEND="~dev-qt/qtbase-${PV}:6[gui,network]"
+DEPEND="${RDEPEND}"
diff --git a/dev-qt/qtpositioning/Manifest b/dev-qt/qtpositioning/Manifest
index 5e8b39746a71..e3c697481703 100644
--- a/dev-qt/qtpositioning/Manifest
+++ b/dev-qt/qtpositioning/Manifest
@@ -9,5 +9,6 @@ EBUILD qtpositioning-6.7.2.ebuild 1570 BLAKE2B d6667399f47cd0fc13627c2141a587f3f
 EBUILD qtpositioning-6.7.3.ebuild 1573 BLAKE2B 615841034e3811aef2f1b40162d41eb71653a3045e2ec457e5996f8d218d1e0432ca60efea2f77666436fd272ec7ad41663042869f841229a31ceac6ac225539 SHA512 cdb09e170a65623bb00f888e10c53b51b76194b2ee6849bec0f38b895c48240ee3e77ab5ee20f7ee880a16b55c5bdb6b8edf2bbb3e8ec07f9e75323b6fcc03bc
 EBUILD qtpositioning-6.8.1.ebuild 1576 BLAKE2B 0a902084d44ef71dff03de73ca9d692b1fbe5bef21b1ce962b7ea892a707d9db46f63012d7c7378bd9314ed702a2c5d108d5c41a0a86e395033bcccb2dc029a8 SHA512 bfe20d4028ab0c0c1365db3d5f2ded0c1fe5e9e3e703cede4ca1ff57450cec65bf3b022ed364373b65c87e0bc776a9eca28a4607ef95ebdf661a17d89c3b6c56
 EBUILD qtpositioning-6.8.9999.ebuild 1576 BLAKE2B 0a902084d44ef71dff03de73ca9d692b1fbe5bef21b1ce962b7ea892a707d9db46f63012d7c7378bd9314ed702a2c5d108d5c41a0a86e395033bcccb2dc029a8 SHA512 bfe20d4028ab0c0c1365db3d5f2ded0c1fe5e9e3e703cede4ca1ff57450cec65bf3b022ed364373b65c87e0bc776a9eca28a4607ef95ebdf661a17d89c3b6c56
+EBUILD qtpositioning-6.9.9999.ebuild 1576 BLAKE2B 0a902084d44ef71dff03de73ca9d692b1fbe5bef21b1ce962b7ea892a707d9db46f63012d7c7378bd9314ed702a2c5d108d5c41a0a86e395033bcccb2dc029a8 SHA512 bfe20d4028ab0c0c1365db3d5f2ded0c1fe5e9e3e703cede4ca1ff57450cec65bf3b022ed364373b65c87e0bc776a9eca28a4607ef95ebdf661a17d89c3b6c56
 EBUILD qtpositioning-6.9999.ebuild 1576 BLAKE2B 0a902084d44ef71dff03de73ca9d692b1fbe5bef21b1ce962b7ea892a707d9db46f63012d7c7378bd9314ed702a2c5d108d5c41a0a86e395033bcccb2dc029a8 SHA512 bfe20d4028ab0c0c1365db3d5f2ded0c1fe5e9e3e703cede4ca1ff57450cec65bf3b022ed364373b65c87e0bc776a9eca28a4607ef95ebdf661a17d89c3b6c56
 MISC metadata.xml 804 BLAKE2B 94a5445b2839e69d26bb57e8467dd1eab0820c8511304283a4db38710e7026f5956614285526451f77188a7e25f12a638fefbe6a544424fbdc422daecefa0836 SHA512 f3037d4ef45f0490dbf9df8d57497d38931076b5e9c774161633d061ee644a0282ba390d6d95d6195b8f18d91229f055bf4a9e786717cdfc98e2fb87c0e32245
diff --git a/dev-qt/qtpositioning/qtpositioning-6.9.9999.ebuild b/dev-qt/qtpositioning/qtpositioning-6.9.9999.ebuild
new file mode 100644
index 000000000000..c872768c9bd8
--- /dev/null
+++ b/dev-qt/qtpositioning/qtpositioning-6.9.9999.ebuild
@@ -0,0 +1,68 @@
+# Copyright 2021-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit qt6-build
+
+DESCRIPTION="Physical position determination library for the Qt6 framework"
+
+if [[ ${QT6_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~x86"
+fi
+
+IUSE="geoclue nmea +qml"
+
+DEPEND="
+	~dev-qt/qtbase-${PV}:6
+	geoclue? ( ~dev-qt/qtbase-${PV}:6[dbus] )
+	nmea? (
+		~dev-qt/qtbase-${PV}:6[network]
+		~dev-qt/qtserialport-${PV}:6
+	)
+	qml? ( ~dev-qt/qtdeclarative-${PV}:6 )
+"
+RDEPEND="
+	${DEPEND}
+	geoclue? ( app-misc/geoclue:2.0 )
+"
+
+CMAKE_SKIP_TESTS=(
+	# threads test (rarely) fails randomly
+	tst_qgeoareamonitor
+)
+
+src_prepare() {
+	qt6-build_src_prepare
+
+	# unfortunately cmake_use_find_package would break things with qtbase
+	use geoclue ||
+		sed -e 's/TARGET Qt::DBus/FALSE/' \
+			-i src/plugins/position/CMakeLists.txt || die
+	use nmea ||
+		sed -e 's/TARGET Qt::Network/FALSE/' \
+			-i src/plugins/position/CMakeLists.txt || die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package qml Qt6Qml)
+	)
+
+	qt6-build_src_configure
+}
+
+src_install() {
+	qt6-build_src_install
+
+	if use test; then
+		local delete=( # sigh
+			"${D}${QT6_LIBDIR}"/cmake/Qt6Positioning/*DummyPlugin*.cmake
+			"${D}${QT6_LIBDIR}"/cmake/Qt6Positioning/*TestPlugin*.cmake
+			"${D}${QT6_PLUGINDIR}"/position/libqtposition_satellitesourcetest.so
+			"${D}${QT6_PLUGINDIR}"/position/libqtposition_testplugin{,2}.so
+		)
+		# using -f given not tracking which tests may be skipped or not
+		rm -f -- "${delete[@]}" || die
+	fi
+}
diff --git a/dev-qt/qtquick3d/Manifest b/dev-qt/qtquick3d/Manifest
index 5c57cc1ae66a..8f1fb73b70eb 100644
--- a/dev-qt/qtquick3d/Manifest
+++ b/dev-qt/qtquick3d/Manifest
@@ -4,9 +4,10 @@ AUX qtquick3d-6.7.2-gcc15.patch 1365 BLAKE2B 574cf06f28c4ff2c8415f302bf2061b1b38
 DIST qtquick3d-everywhere-src-6.7.2.tar.xz 66202160 BLAKE2B 1f3741bb11d21804ec56aa5bfa00b590d94258cb119b4284aa2757fa00785a69aba243e06bf68ca625355a8e8a392249be2ac9679226c8d250320aeb6c4ccf0f SHA512 d5a4557a6f0ea73b43de9238b8cd42fc037c417e72443a8cae96e8be779f82d5fd9efe1a09258a4d5dd55c4791b84192cb72e31bb1d744b618951080fe6fa1e2
 DIST qtquick3d-everywhere-src-6.7.3.tar.xz 66208152 BLAKE2B d165ea6d61c3b7e0253e6cc28a33c298a30b78add8cb761b460df280ebc069c979e52868b5675e15d4b2add6110f610bd9c6160848c7e02e5be0313f16179ec2 SHA512 cdfc34521a201325ee0d41dfb5608fc9deca6c27d71d27e170d147a53fad808c4e70ee67b5c7598c8685b8c534dd5fa8460f436ae4e7a208b7d5be27bf1631d5
 DIST qtquick3d-everywhere-src-6.8.1.tar.xz 75292284 BLAKE2B b0fa2fed9de6f9aa3cfb9bea6f50775f03aca17355e2b4f4f6b8b5de3f10febbe9e275b03337c9745c37fd62ac0a155c2b969ebd6be07662b0141e58fd5078c6 SHA512 9845cf84b57b33d0acb29a4c5ea2492ac60367d210b51c4896d6d5b9a33197be007cc02934c1b0dde5ee888641c8104cc4080f1493d0d09ed271fe2d08d2f410
-EBUILD qtquick3d-6.7.2.ebuild 1112 BLAKE2B 0727d60b992b12e5014fa6c219020ddfb23e0874beb1f70dde429ac10fa32f86fa81705553e62e64fc6854242977b275b1ac858a043b6f4fb5bfc2396c0d8f77 SHA512 18ad274c3b7f5fe11162302f59e56e2c96b0c60aabe851c2dd5ee01341d73443cc2475e32083388441b7bcee969f610458036158b6ff593ff3b614203682f830
-EBUILD qtquick3d-6.7.3.ebuild 1114 BLAKE2B 6d7888675abbaa0210b3a4131871641fc9434f5a03825db6b10e2eed68b5a8d8ca544cf7bdab89967b724f229b706ab458678b994d1c697dd5b9746f2254bc57 SHA512 1ea320f1f14a5273f032558dd5b423c5e88033b99c2a53089fe657bee4403d1728b924e0f59f77bd1ccdc891d1107ce3e787d34e353186378d25ed69f111f4e4
-EBUILD qtquick3d-6.8.1.ebuild 1307 BLAKE2B dc0f9407f5e3ce3319320cf3dd43f361de2bae68076d3051fa853a418a26471d70c7a4cc3126d8c16dd21d319d54d5b939cdd2ddc305823e0a7e80cdb7866651 SHA512 67f2107c2990b80284ce686d858f493aca82c4043fc91bd6deb082ae777093ee9e00d90bee5e9389c11194e6298b3b60c4204224f2b688768d330fed88561150
-EBUILD qtquick3d-6.8.9999.ebuild 1307 BLAKE2B dc0f9407f5e3ce3319320cf3dd43f361de2bae68076d3051fa853a418a26471d70c7a4cc3126d8c16dd21d319d54d5b939cdd2ddc305823e0a7e80cdb7866651 SHA512 67f2107c2990b80284ce686d858f493aca82c4043fc91bd6deb082ae777093ee9e00d90bee5e9389c11194e6298b3b60c4204224f2b688768d330fed88561150
-EBUILD qtquick3d-6.9999.ebuild 1307 BLAKE2B dc0f9407f5e3ce3319320cf3dd43f361de2bae68076d3051fa853a418a26471d70c7a4cc3126d8c16dd21d319d54d5b939cdd2ddc305823e0a7e80cdb7866651 SHA512 67f2107c2990b80284ce686d858f493aca82c4043fc91bd6deb082ae777093ee9e00d90bee5e9389c11194e6298b3b60c4204224f2b688768d330fed88561150
+EBUILD qtquick3d-6.7.2.ebuild 1155 BLAKE2B b31f4634cf9dc426e4f83f79e953a71ca0aef8197d6347c8767d606cd52661359a0ef783ad4849fe425bd03ba908d62e3096f10fae9088d303bfbc30f8120bf1 SHA512 a9836deb1eb0fff9eb45c1de5078974f74d5a3b8496a69f2633a8a2712aeaec5ff001c86223e24265f27b5b0b3521f9123b6b5743132ee56cb860dbe21d9336a
+EBUILD qtquick3d-6.7.3.ebuild 1157 BLAKE2B 153da8288eb9c21430c15253479eff44ab4c794627c8cffece3affdec29dd154c581d1370cc0019fb88a421f78fdf80c3933cf32d82d4fec5510a96ca1beed5b SHA512 d1707c247b7f45ad95a18f6510b6cff3254ac59acf711f0b5a4ed6b1536ad9337efab5dad27ad0163be27e4b8e2e67dfb24dd4f78e7e47f351e4a04bf3e055e1
+EBUILD qtquick3d-6.8.1.ebuild 1350 BLAKE2B 92303689d70e0c8c37903b1c071172624a22f4e696439b80d23e5616e10c9a9ee6ba19864caa8bd6af499fe2b7d2854eec368c35580bd5e436a5b3fd712c5659 SHA512 ca823a126eb3cfe464a29fe90939413a1b9f4c9ce4bb3ee5782439f55b4ba47b22051c78f1aba05dbb09153392939c0de7c68204092215e0f315ff8031b7fe62
+EBUILD qtquick3d-6.8.9999.ebuild 1366 BLAKE2B d08902ca78733072e8b45dce13714e21e1719efcf1d9729448da398cd1d794f2910c5aa2d0cbb7d5632f909dd74cee3862211608a3d6e2d2b6cd969c0d3572ae SHA512 c5930bbb70c9ff3f54019f7e5e6e7e55aabef74636818f69bcbf70b8cb959503a2262428fe736cdc60a8738e1d15d15391ff236249450e4d64521dfb8f2fcda7
+EBUILD qtquick3d-6.9.9999.ebuild 1302 BLAKE2B de0db67fa97d7ba2198939db40f81093be0fdd126c2cd0bc6bd44eddf2bbf2bdff981d8285c4c6e486b60b34e4fd89f954da0cc457011d68764c9522eac12e5f SHA512 c60eb7f98bfce95474c6624f831046e259081bcb82102f0bcbc0fee00f46480eeb5ea5ec1d817c7e5f05b6f75367f09cbb72e035495d12c278532f29f4c97eea
+EBUILD qtquick3d-6.9999.ebuild 1302 BLAKE2B de0db67fa97d7ba2198939db40f81093be0fdd126c2cd0bc6bd44eddf2bbf2bdff981d8285c4c6e486b60b34e4fd89f954da0cc457011d68764c9522eac12e5f SHA512 c60eb7f98bfce95474c6624f831046e259081bcb82102f0bcbc0fee00f46480eeb5ea5ec1d817c7e5f05b6f75367f09cbb72e035495d12c278532f29f4c97eea
 MISC metadata.xml 534 BLAKE2B 09cf606ee911d677c4a1fb8879a70bcbb527d23f81d39fb3263aef5ad6222b7b0027069cd50b76232f45322b1da0499f2eed6264ef636f3ff0d04c0a5793ec2b SHA512 66438122b8b1d1ce0b2a98b36925944806d3616ce7f653004d2b1a76ad4dee62759bcb8f342e0aefb730765648ca9ad193f833c3596252df3dbca596a8daff08
diff --git a/dev-qt/qtquick3d/qtquick3d-6.7.2.ebuild b/dev-qt/qtquick3d/qtquick3d-6.7.2.ebuild
index bd6e430f7c47..d24670414f6f 100644
--- a/dev-qt/qtquick3d/qtquick3d-6.7.2.ebuild
+++ b/dev-qt/qtquick3d/qtquick3d-6.7.2.ebuild
@@ -28,6 +28,9 @@ DEPEND="
 	test? ( ~dev-qt/qtbase-${PV}:6[network] )
 	vulkan? ( dev-util/vulkan-headers )
 "
+BDEPEND="
+	~dev-qt/qtshadertools-${PV}:6
+"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-6.6.2-gcc14.patch
diff --git a/dev-qt/qtquick3d/qtquick3d-6.7.3.ebuild b/dev-qt/qtquick3d/qtquick3d-6.7.3.ebuild
index 9ff7b18ab58d..84ee23157e6c 100644
--- a/dev-qt/qtquick3d/qtquick3d-6.7.3.ebuild
+++ b/dev-qt/qtquick3d/qtquick3d-6.7.3.ebuild
@@ -28,6 +28,9 @@ DEPEND="
 	test? ( ~dev-qt/qtbase-${PV}:6[network] )
 	vulkan? ( dev-util/vulkan-headers )
 "
+BDEPEND="
+	~dev-qt/qtshadertools-${PV}:6
+"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-6.6.2-gcc14.patch
diff --git a/dev-qt/qtquick3d/qtquick3d-6.8.1.ebuild b/dev-qt/qtquick3d/qtquick3d-6.8.1.ebuild
index 7dd511a1fd8f..950e172e1f23 100644
--- a/dev-qt/qtquick3d/qtquick3d-6.8.1.ebuild
+++ b/dev-qt/qtquick3d/qtquick3d-6.8.1.ebuild
@@ -28,6 +28,9 @@ DEPEND="
 	test? ( ~dev-qt/qtbase-${PV}:6[network] )
 	vulkan? ( dev-util/vulkan-headers )
 "
+BDEPEND="
+	~dev-qt/qtshadertools-${PV}:6
+"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-6.6.2-gcc14.patch
diff --git a/dev-qt/qtquick3d/qtquick3d-6.8.9999.ebuild b/dev-qt/qtquick3d/qtquick3d-6.8.9999.ebuild
index 7dd511a1fd8f..57af9fcdb4fe 100644
--- a/dev-qt/qtquick3d/qtquick3d-6.8.9999.ebuild
+++ b/dev-qt/qtquick3d/qtquick3d-6.8.9999.ebuild
@@ -28,11 +28,13 @@ DEPEND="
 	test? ( ~dev-qt/qtbase-${PV}:6[network] )
 	vulkan? ( dev-util/vulkan-headers )
 "
+BDEPEND="
+	~dev-qt/qtshadertools-${PV}:6
+"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-6.6.2-gcc14.patch
 	"${FILESDIR}"/${PN}-6.6.2-x32abi.patch
-	"${FILESDIR}"/${PN}-6.7.2-gcc15.patch
 )
 
 CMAKE_SKIP_TESTS=(
@@ -44,7 +46,8 @@ CMAKE_SKIP_TESTS=(
 src_configure() {
 	local mycmakeargs=(
 		# TODO: if someone wants it, openxr should likely have its own
-		# USE and be packaged rather than use the bundled copy
+		# USE and be packaged rather than use the bundled copy (if use
+		# bundled, note need to setup python-any-r1)
 		-DQT_FEATURE_quick3dxr_openxr=OFF
 		-DQT_FEATURE_system_assimp=ON
 		-DQT_FEATURE_system_openxr=ON
diff --git a/dev-qt/qtquick3d/qtquick3d-6.9.9999.ebuild b/dev-qt/qtquick3d/qtquick3d-6.9.9999.ebuild
new file mode 100644
index 000000000000..96f41a930627
--- /dev/null
+++ b/dev-qt/qtquick3d/qtquick3d-6.9.9999.ebuild
@@ -0,0 +1,55 @@
+# Copyright 2021-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit qt6-build
+
+DESCRIPTION="Qt module and API for defining 3D content in Qt QuickTools"
+
+if [[ ${QT6_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+elif [[ ${QT6_BUILD_TYPE} == live ]]; then
+	EGIT_SUBMODULES=() # skip qtquick3d-assimp
+fi
+
+IUSE="opengl vulkan"
+
+RDEPEND="
+	~dev-qt/qtbase-${PV}:6[concurrent,gui,opengl=,vulkan=,widgets]
+	~dev-qt/qtdeclarative-${PV}:6
+	~dev-qt/qtquicktimeline-${PV}:6
+	~dev-qt/qtshadertools-${PV}:6
+	media-libs/assimp:=
+	sys-libs/zlib:=
+"
+DEPEND="
+	${RDEPEND}
+	test? ( ~dev-qt/qtbase-${PV}:6[network] )
+	vulkan? ( dev-util/vulkan-headers )
+"
+BDEPEND="
+	~dev-qt/qtshadertools-${PV}:6
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-6.6.2-gcc14.patch
+	"${FILESDIR}"/${PN}-6.6.2-x32abi.patch
+)
+
+CMAKE_SKIP_TESTS=(
+	# needs off-by-default assimp[collada] that is masked on some profiles,
+	# not worth the extra trouble
+	tst_qquick3dassetimport
+)
+
+src_configure() {
+	local mycmakeargs=(
+		# TODO: if someone wants it, openxr should likely have its own
+		# USE and be packaged rather than use the bundled copy (if use
+		# bundled, note need to setup python-any-r1)
+		-DQT_FEATURE_quick3dxr_openxr=OFF
+	)
+
+	qt6-build_src_configure
+}
diff --git a/dev-qt/qtquick3d/qtquick3d-6.9999.ebuild b/dev-qt/qtquick3d/qtquick3d-6.9999.ebuild
index 7dd511a1fd8f..96f41a930627 100644
--- a/dev-qt/qtquick3d/qtquick3d-6.9999.ebuild
+++ b/dev-qt/qtquick3d/qtquick3d-6.9999.ebuild
@@ -28,11 +28,13 @@ DEPEND="
 	test? ( ~dev-qt/qtbase-${PV}:6[network] )
 	vulkan? ( dev-util/vulkan-headers )
 "
+BDEPEND="
+	~dev-qt/qtshadertools-${PV}:6
+"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-6.6.2-gcc14.patch
 	"${FILESDIR}"/${PN}-6.6.2-x32abi.patch
-	"${FILESDIR}"/${PN}-6.7.2-gcc15.patch
 )
 
 CMAKE_SKIP_TESTS=(
@@ -44,10 +46,9 @@ CMAKE_SKIP_TESTS=(
 src_configure() {
 	local mycmakeargs=(
 		# TODO: if someone wants it, openxr should likely have its own
-		# USE and be packaged rather than use the bundled copy
+		# USE and be packaged rather than use the bundled copy (if use
+		# bundled, note need to setup python-any-r1)
 		-DQT_FEATURE_quick3dxr_openxr=OFF
-		-DQT_FEATURE_system_assimp=ON
-		-DQT_FEATURE_system_openxr=ON
 	)
 
 	qt6-build_src_configure
diff --git a/dev-qt/qtquicktimeline/Manifest b/dev-qt/qtquicktimeline/Manifest
index 301def8938fd..f06aab38601d 100644
--- a/dev-qt/qtquicktimeline/Manifest
+++ b/dev-qt/qtquicktimeline/Manifest
@@ -9,5 +9,6 @@ EBUILD qtquicktimeline-6.7.2.ebuild 389 BLAKE2B ff876ea9bce98b1093d8bf580150581d
 EBUILD qtquicktimeline-6.7.3.ebuild 392 BLAKE2B 8dfe296dce2b68b862b4d1bf3e7560952befaa3335b8e71c29021fedeff3879bb77869f236a03598ba500a944a58326b0aed5be960a70a43ceed266d2d2fbe6f SHA512 1829a62485927854d3e821fdbffde2e44fcafdfc115b78ea4def98aca3cd285a5c3c0d14ae16ad09bdc9538075e86b4aaa94bf2bb3af35a00fc0ee8f99375bc4
 EBUILD qtquicktimeline-6.8.1.ebuild 395 BLAKE2B a6abf0944d3eb0c738d8455fde448b8418badfd9151dd30acc1ed80dbc7b65057bd88091e6372097c0470387c5d62850798fa1f08020435a5534b05b1278ae5d SHA512 29e70391521b8db27df1ac6db72797a4785ede1270136644433ac39c88ddac079aa17faf703b002eb6785510ba7c7d8df6312964fc1e798d295fa9c0f4f2c040
 EBUILD qtquicktimeline-6.8.9999.ebuild 395 BLAKE2B a6abf0944d3eb0c738d8455fde448b8418badfd9151dd30acc1ed80dbc7b65057bd88091e6372097c0470387c5d62850798fa1f08020435a5534b05b1278ae5d SHA512 29e70391521b8db27df1ac6db72797a4785ede1270136644433ac39c88ddac079aa17faf703b002eb6785510ba7c7d8df6312964fc1e798d295fa9c0f4f2c040
+EBUILD qtquicktimeline-6.9.9999.ebuild 395 BLAKE2B a6abf0944d3eb0c738d8455fde448b8418badfd9151dd30acc1ed80dbc7b65057bd88091e6372097c0470387c5d62850798fa1f08020435a5534b05b1278ae5d SHA512 29e70391521b8db27df1ac6db72797a4785ede1270136644433ac39c88ddac079aa17faf703b002eb6785510ba7c7d8df6312964fc1e798d295fa9c0f4f2c040
 EBUILD qtquicktimeline-6.9999.ebuild 395 BLAKE2B a6abf0944d3eb0c738d8455fde448b8418badfd9151dd30acc1ed80dbc7b65057bd88091e6372097c0470387c5d62850798fa1f08020435a5534b05b1278ae5d SHA512 29e70391521b8db27df1ac6db72797a4785ede1270136644433ac39c88ddac079aa17faf703b002eb6785510ba7c7d8df6312964fc1e798d295fa9c0f4f2c040
 MISC metadata.xml 441 BLAKE2B 74ac671e09bcf33c214467cee99e50cf1b0563655b52cd65916ac4e382c941f68f68ca13a5881ca4d2e85e3ef60e19ee9dd0f52d6d769dd67f89960adaac1263 SHA512 62ddfd6f5d6868707383f44f26f051308416f836373862e74f3b8af24fd6da166e31a1f0ab67fdc9c9c20e00887162f5b57a5224429e7b37c9deac44c8dca2b1
diff --git a/dev-qt/qtquicktimeline/qtquicktimeline-6.9.9999.ebuild b/dev-qt/qtquicktimeline/qtquicktimeline-6.9.9999.ebuild
new file mode 100644
index 000000000000..393a5c2037bc
--- /dev/null
+++ b/dev-qt/qtquicktimeline/qtquicktimeline-6.9.9999.ebuild
@@ -0,0 +1,18 @@
+# Copyright 2021-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit qt6-build
+
+DESCRIPTION="Qt module for keyframe-based timeline construction"
+
+if [[ ${QT6_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+fi
+
+RDEPEND="
+	~dev-qt/qtbase-${PV}:6
+	~dev-qt/qtdeclarative-${PV}:6
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-qt/qtremoteobjects/Manifest b/dev-qt/qtremoteobjects/Manifest
index 93256344aca5..13bcc599bb69 100644
--- a/dev-qt/qtremoteobjects/Manifest
+++ b/dev-qt/qtremoteobjects/Manifest
@@ -3,5 +3,6 @@ DIST qtremoteobjects-everywhere-src-6.8.1.tar.xz 537132 BLAKE2B b00cc0fd193c7b26
 EBUILD qtremoteobjects-6.7.3.ebuild 1024 BLAKE2B 28c12bf720c530099a243f173b61735179ee01c2d7d7b651aa46f21141f92cd1d020442bc3ffb8cd1eef1f85f18630404b5dd3e36c129ded2c58d6577150ba7d SHA512 a2f8acbc6a4ce485947ece4982e6e3feaacad17229da67cbddeeea7ef2ab6ce8cb91468fe8b1f0f4913609649dec09cdc5281c9f764fb25067ba0c4c3a2526b4
 EBUILD qtremoteobjects-6.8.1.ebuild 1136 BLAKE2B 0edbaed7e92b091c086eb3818fbfb5b5a1b641c37193a79c16ee2813238419c763eb92b65c9db5190131826d6a3751a5c6afbb7daea0b682594c0ecadea163c2 SHA512 1e4902140696c1359298d6cfd24e8cfd74497fd95aff43ada64da4f8d55eabe1b70fcf2ab702e37af2be6f4e7e83a8514cb030b3afabf41fd6250ef53aeef49f
 EBUILD qtremoteobjects-6.8.9999.ebuild 1136 BLAKE2B 0edbaed7e92b091c086eb3818fbfb5b5a1b641c37193a79c16ee2813238419c763eb92b65c9db5190131826d6a3751a5c6afbb7daea0b682594c0ecadea163c2 SHA512 1e4902140696c1359298d6cfd24e8cfd74497fd95aff43ada64da4f8d55eabe1b70fcf2ab702e37af2be6f4e7e83a8514cb030b3afabf41fd6250ef53aeef49f
+EBUILD qtremoteobjects-6.9.9999.ebuild 1136 BLAKE2B 0edbaed7e92b091c086eb3818fbfb5b5a1b641c37193a79c16ee2813238419c763eb92b65c9db5190131826d6a3751a5c6afbb7daea0b682594c0ecadea163c2 SHA512 1e4902140696c1359298d6cfd24e8cfd74497fd95aff43ada64da4f8d55eabe1b70fcf2ab702e37af2be6f4e7e83a8514cb030b3afabf41fd6250ef53aeef49f
 EBUILD qtremoteobjects-6.9999.ebuild 1136 BLAKE2B 0edbaed7e92b091c086eb3818fbfb5b5a1b641c37193a79c16ee2813238419c763eb92b65c9db5190131826d6a3751a5c6afbb7daea0b682594c0ecadea163c2 SHA512 1e4902140696c1359298d6cfd24e8cfd74497fd95aff43ada64da4f8d55eabe1b70fcf2ab702e37af2be6f4e7e83a8514cb030b3afabf41fd6250ef53aeef49f
 MISC metadata.xml 620 BLAKE2B 75466fd8e8439ad3462f1ee5f129fc507b40d0935e208999fa60a6e86bf3fb9073b014a141488fdea9a40b4c972bc6dd723e332ca2f94c444c97d1b5ac81719b SHA512 c7da7da3751d2b738ba7673cf3a034d6471acb91e0f30c3556b2ad83b73a093e6156bfed9549830d6ecf3fcbfe13beed50191035362e6c4ea5bb7ab108d7132e
diff --git a/dev-qt/qtremoteobjects/qtremoteobjects-6.9.9999.ebuild b/dev-qt/qtremoteobjects/qtremoteobjects-6.9.9999.ebuild
new file mode 100644
index 000000000000..62948acc2c91
--- /dev/null
+++ b/dev-qt/qtremoteobjects/qtremoteobjects-6.9.9999.ebuild
@@ -0,0 +1,54 @@
+# Copyright 2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit qt6-build
+
+DESCRIPTION="Inter-Process Communication (IPC) library for the Qt6 framework"
+
+if [[ ${QT6_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64"
+fi
+
+IUSE="qml"
+
+RDEPEND="
+	~dev-qt/qtbase-${PV}:6[network]
+	qml? (
+		~dev-qt/qtbase-${PV}:6[gui]
+		~dev-qt/qtdeclarative-${PV}:6
+	)
+"
+DEPEND="
+	${RDEPEND}
+	test? ( ~dev-qt/qtbase-${PV}:6[gui] )
+"
+
+src_configure() {
+	# same issue as bug #913692 when tests are enabled
+	has_version "=dev-qt/qtdeclarative-$(ver_cut 1-3)*:6" &&
+		local mycmakeargs=( $(cmake_use_find_package qml Qt6Qml) )
+
+	qt6-build_src_configure
+}
+
+src_test() {
+	local CMAKE_SKIP_TESTS=(
+		# rarely fails randomly even with -j1, not looked further into
+		tst_modelview
+	)
+
+	# tests re-use 127.0.0.1:65213 and randomly fail if ran at same time
+	qt6-build_src_test -j1
+}
+
+src_install() {
+	qt6-build_src_install
+
+	if use test; then
+		# installs 30+ test binaries like "qt6/bin/state" and, given
+		# otherwise empty, "can" delete the directory rather than list
+		rm -r -- "${D}${QT6_BINDIR}" || die
+	fi
+}
diff --git a/dev-qt/qtscxml/Manifest b/dev-qt/qtscxml/Manifest
index 5b953ee47918..f92893abe740 100644
--- a/dev-qt/qtscxml/Manifest
+++ b/dev-qt/qtscxml/Manifest
@@ -9,5 +9,6 @@ EBUILD qtscxml-6.7.2.ebuild 710 BLAKE2B bbd105c679bff1928af4d14c4af530c28ce44b26
 EBUILD qtscxml-6.7.3.ebuild 712 BLAKE2B 6ba2016c35d1c993fac8ab74d2f8f8b59f206e38ad54817a94e768ac776f1f8dbef4df3b665e1665cb2c0cce0dab992bd5a512a311252e43306dfaa4eb11984a SHA512 95a9317f230bd3a39b896b4969c1dad4a77a7f299eb60e349397d9953403d510227afef9e093b9972659cfe33b45fe6b95c25c682617fb1923373b56200061be
 EBUILD qtscxml-6.8.1.ebuild 715 BLAKE2B 087b7c91c5a79194a118136a153620779d6e0180b75ceeb879f290d5c14249ad8cefd6181cd377c965faeb214b7f701051b0bdf1d9d1b198f8a1e5bc11f867cb SHA512 208d13d443bbbcdbf7d2e5f0068bfd2da2f4f521982ad627113f4f7dd28351ba824504807720d3eb5c22840b9993d2a12314c06214f125d1863a820892f0a3d6
 EBUILD qtscxml-6.8.9999.ebuild 715 BLAKE2B 087b7c91c5a79194a118136a153620779d6e0180b75ceeb879f290d5c14249ad8cefd6181cd377c965faeb214b7f701051b0bdf1d9d1b198f8a1e5bc11f867cb SHA512 208d13d443bbbcdbf7d2e5f0068bfd2da2f4f521982ad627113f4f7dd28351ba824504807720d3eb5c22840b9993d2a12314c06214f125d1863a820892f0a3d6
+EBUILD qtscxml-6.9.9999.ebuild 715 BLAKE2B 087b7c91c5a79194a118136a153620779d6e0180b75ceeb879f290d5c14249ad8cefd6181cd377c965faeb214b7f701051b0bdf1d9d1b198f8a1e5bc11f867cb SHA512 208d13d443bbbcdbf7d2e5f0068bfd2da2f4f521982ad627113f4f7dd28351ba824504807720d3eb5c22840b9993d2a12314c06214f125d1863a820892f0a3d6
 EBUILD qtscxml-6.9999.ebuild 715 BLAKE2B 087b7c91c5a79194a118136a153620779d6e0180b75ceeb879f290d5c14249ad8cefd6181cd377c965faeb214b7f701051b0bdf1d9d1b198f8a1e5bc11f867cb SHA512 208d13d443bbbcdbf7d2e5f0068bfd2da2f4f521982ad627113f4f7dd28351ba824504807720d3eb5c22840b9993d2a12314c06214f125d1863a820892f0a3d6
 MISC metadata.xml 612 BLAKE2B 74120f98e194bd3776134a96e12add6f8b485464004a9b0bad910cd81ca00bb29d740dfbe8484067eaec788ea6d228a4148f2d9d0757ced2cba1ba0cc4cce0bd SHA512 42b0ed27db93385ca6734f2bf81a9d01b97b6658326c61f821d517a26451b27919e4c429641f7e4a27bcf26407b5c1e134e90651948064308075abd77f4fb942
diff --git a/dev-qt/qtscxml/qtscxml-6.9.9999.ebuild b/dev-qt/qtscxml/qtscxml-6.9.9999.ebuild
new file mode 100644
index 000000000000..0f087eb496fc
--- /dev/null
+++ b/dev-qt/qtscxml/qtscxml-6.9.9999.ebuild
@@ -0,0 +1,34 @@
+# Copyright 2021-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit qt6-build
+
+DESCRIPTION="State Chart XML (SCXML) support library for the Qt6 framework"
+
+if [[ ${QT6_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+fi
+
+IUSE="qml"
+
+RDEPEND="
+	~dev-qt/qtbase-${PV}:6[gui]
+	qml? ( ~dev-qt/qtdeclarative-${PV}:6 )
+"
+DEPEND="${RDEPEND}"
+
+CMAKE_SKIP_TESTS=(
+	# may fail with pid-sandbox, or at least musl/hardened+gcc (exact
+	# conditions unknown but passes without pid, considering this flaky)
+	tst_qstatemachine
+)
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package qml Qt6Qml)
+	)
+
+	qt6-build_src_configure
+}
diff --git a/dev-qt/qtsensors/Manifest b/dev-qt/qtsensors/Manifest
index 31d4dcb0bc07..a78b008c7301 100644
--- a/dev-qt/qtsensors/Manifest
+++ b/dev-qt/qtsensors/Manifest
@@ -9,5 +9,6 @@ EBUILD qtsensors-6.7.2.ebuild 534 BLAKE2B e3d26f2197c4776078c309a1bc8241fb3a7de8
 EBUILD qtsensors-6.7.3.ebuild 537 BLAKE2B 0e2caf068718a28d32347864600013bd08c7036c6696383f1f2e64f2054a2b2774c26f4cb8703c6999263c95286a57b144aa04844a10207b3cade9c03bbbe65a SHA512 28b1e7eb44ceb72170572e937402a25ff721d9834fa7df3294628e8d8559bcfb12c5157241930081afc74a4336fc9322ea608356487e1ba78fe71ba0f8ee959a
 EBUILD qtsensors-6.8.1.ebuild 540 BLAKE2B 10b7175ade199662f3358875d58ba9541b68aa03fb7e5c72098bfc3aae7f17bdf22cfcae44c80749016b029fc34087bec80f0ac1b7be94156be4eda863b8a152 SHA512 16cdb89c926c2cea6e21550a351a51bb358baf345e1b3bcd0c9544f235d4edfb949e215ea7c0761419e7467ea884380a18e378bc21bd6b6f2d4eb9a47d503ebb
 EBUILD qtsensors-6.8.9999.ebuild 540 BLAKE2B 10b7175ade199662f3358875d58ba9541b68aa03fb7e5c72098bfc3aae7f17bdf22cfcae44c80749016b029fc34087bec80f0ac1b7be94156be4eda863b8a152 SHA512 16cdb89c926c2cea6e21550a351a51bb358baf345e1b3bcd0c9544f235d4edfb949e215ea7c0761419e7467ea884380a18e378bc21bd6b6f2d4eb9a47d503ebb
+EBUILD qtsensors-6.9.9999.ebuild 540 BLAKE2B 10b7175ade199662f3358875d58ba9541b68aa03fb7e5c72098bfc3aae7f17bdf22cfcae44c80749016b029fc34087bec80f0ac1b7be94156be4eda863b8a152 SHA512 16cdb89c926c2cea6e21550a351a51bb358baf345e1b3bcd0c9544f235d4edfb949e215ea7c0761419e7467ea884380a18e378bc21bd6b6f2d4eb9a47d503ebb
 EBUILD qtsensors-6.9999.ebuild 540 BLAKE2B 10b7175ade199662f3358875d58ba9541b68aa03fb7e5c72098bfc3aae7f17bdf22cfcae44c80749016b029fc34087bec80f0ac1b7be94156be4eda863b8a152 SHA512 16cdb89c926c2cea6e21550a351a51bb358baf345e1b3bcd0c9544f235d4edfb949e215ea7c0761419e7467ea884380a18e378bc21bd6b6f2d4eb9a47d503ebb
 MISC metadata.xml 594 BLAKE2B 93f6b9de5266ef5bba3342d149afd04d4fdb27cac760d91b7dfb866d81ff4d4e86a3de1a512815444aa825350dad45923437f5caa7fea7cf6066667f2328d00e SHA512 68d91bcb4c8904a65021a81b01474081565e55c6776d29b54a70318282ce604f8e29e75f3d7574aedf9397ec72b2c6bd1e81ed4e630a4ecf553e070baebd9d64
diff --git a/dev-qt/qtsensors/qtsensors-6.9.9999.ebuild b/dev-qt/qtsensors/qtsensors-6.9.9999.ebuild
new file mode 100644
index 000000000000..5a576fcfd7cc
--- /dev/null
+++ b/dev-qt/qtsensors/qtsensors-6.9.9999.ebuild
@@ -0,0 +1,28 @@
+# Copyright 2023-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit qt6-build
+
+DESCRIPTION="Hardware sensor access library for the Qt6 framework"
+
+if [[ ${QT6_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~x86"
+fi
+
+IUSE="qml"
+
+RDEPEND="
+	~dev-qt/qtbase-${PV}:6[dbus]
+	qml? ( ~dev-qt/qtdeclarative-${PV}:6 )
+"
+DEPEND="${RDEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package qml Qt6Qml)
+	)
+
+	qt6-build_src_configure
+}
diff --git a/dev-qt/qtserialbus/Manifest b/dev-qt/qtserialbus/Manifest
index 796f8b4121da..090f9e1e8766 100644
--- a/dev-qt/qtserialbus/Manifest
+++ b/dev-qt/qtserialbus/Manifest
@@ -9,5 +9,6 @@ EBUILD qtserialbus-6.7.2.ebuild 900 BLAKE2B a8212f5f347a83f277a94b61f552b34ada55
 EBUILD qtserialbus-6.7.3.ebuild 900 BLAKE2B a8212f5f347a83f277a94b61f552b34ada5574fde237693e1415c7cf8be8d1895386ffec3c88e8b8add5ce05f02ec799966ed0b7978d4caa4c6d5d34a4fd6183 SHA512 2283d8ad2911a159b34f8af5b0b3dac1788072a21502b5afeecef815345384170feb42d46bea5b685c9093fbbb96073533e9ed9dd02cbfb722cf69ad9ef18aff
 EBUILD qtserialbus-6.8.1.ebuild 902 BLAKE2B c393a7bb277582de80fbdbac3f74031d50f2f9e2a65b697211c9f1c3bc43134fa5d0f770ed843c06458b3680ef1951b522c51827d28034e0753ea32124a9c135 SHA512 9ecd004c28e1cade57ccd33be257b6937bda9f475f581aa09fa0cc7dbb73e3e6c690569a565ffdb4f7b62082e4f4356d63a75beff528e9b3ee3cca38bee11050
 EBUILD qtserialbus-6.8.9999.ebuild 902 BLAKE2B c393a7bb277582de80fbdbac3f74031d50f2f9e2a65b697211c9f1c3bc43134fa5d0f770ed843c06458b3680ef1951b522c51827d28034e0753ea32124a9c135 SHA512 9ecd004c28e1cade57ccd33be257b6937bda9f475f581aa09fa0cc7dbb73e3e6c690569a565ffdb4f7b62082e4f4356d63a75beff528e9b3ee3cca38bee11050
+EBUILD qtserialbus-6.9.9999.ebuild 902 BLAKE2B c393a7bb277582de80fbdbac3f74031d50f2f9e2a65b697211c9f1c3bc43134fa5d0f770ed843c06458b3680ef1951b522c51827d28034e0753ea32124a9c135 SHA512 9ecd004c28e1cade57ccd33be257b6937bda9f475f581aa09fa0cc7dbb73e3e6c690569a565ffdb4f7b62082e4f4356d63a75beff528e9b3ee3cca38bee11050
 EBUILD qtserialbus-6.9999.ebuild 902 BLAKE2B c393a7bb277582de80fbdbac3f74031d50f2f9e2a65b697211c9f1c3bc43134fa5d0f770ed843c06458b3680ef1951b522c51827d28034e0753ea32124a9c135 SHA512 9ecd004c28e1cade57ccd33be257b6937bda9f475f581aa09fa0cc7dbb73e3e6c690569a565ffdb4f7b62082e4f4356d63a75beff528e9b3ee3cca38bee11050
 MISC metadata.xml 482 BLAKE2B 651a49dc4a07f5e5a9c21990868e666d98acdea7d7b0b2c0e4c98eafc3da72c803d380e4abda30f33250f7bbd7654df713833ccdddcb975cbad6f92e488f643b SHA512 192c670abd7da29645513bf1d9297d942efdc49f5cf170861e7689fda47f51daa47f10c7c81c3b045366e0259179c6839ff7747197c9d792e8d0fd1a5818973e
diff --git a/dev-qt/qtserialbus/qtserialbus-6.9.9999.ebuild b/dev-qt/qtserialbus/qtserialbus-6.9.9999.ebuild
new file mode 100644
index 000000000000..7f316fa23bbc
--- /dev/null
+++ b/dev-qt/qtserialbus/qtserialbus-6.9.9999.ebuild
@@ -0,0 +1,38 @@
+# Copyright 2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit qt6-build
+
+DESCRIPTION="Qt module to access CAN, ModBus, and other industrial serial buses and protocols"
+
+if [[ ${QT6_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~x86"
+fi
+
+RDEPEND="
+	~dev-qt/qtbase-${PV}:6[network]
+	~dev-qt/qtserialport-${PV}:6
+"
+DEPEND="${RDEPEND}"
+
+CMAKE_SKIP_TESTS=(
+	# rarely fails randomly (perhaps related to -j)
+	tst_qcandbcfileparser
+)
+
+src_install() {
+	qt6-build_src_install
+
+	if use test; then
+		local delete=( # sigh
+			"${D}${QT6_LIBDIR}"/cmake/Qt6SerialBus/*TestCanBusPlugin*.cmake
+			"${D}${QT6_MKSPECSDIR}"/modules/qt_plugin_qttestcanbus.pri
+			"${D}${QT6_PLUGINDIR}"/canbus/libqttestcanbus.*
+			"${D}${QT6_PLUGINDIR}"/canbus/objects-*/
+		)
+		# using -f given not tracking which tests may be skipped or not
+		rm -rf -- "${delete[@]}" || die
+	fi
+}
diff --git a/dev-qt/qtserialport/Manifest b/dev-qt/qtserialport/Manifest
index ce64ac7c6722..ef559b152a24 100644
--- a/dev-qt/qtserialport/Manifest
+++ b/dev-qt/qtserialport/Manifest
@@ -9,5 +9,6 @@ EBUILD qtserialport-6.7.2.ebuild 386 BLAKE2B edf782f739e2ab208f66d9312943af46ea7
 EBUILD qtserialport-6.7.3.ebuild 389 BLAKE2B 6b5619458e3aae8fe19df4e55cb2c4994e97f48c02759f5c935f57aedcb881c91c01a7dfb0e070f8904a042a53535c587a43ab4f1a722726faff03dd2e010753 SHA512 6de34d70917048e3bea751b6ee9aa61db1f9ba04749730abb7caf73e4673601c8a67e8865480240ac578ce517388cd3db356f840ce0ffe78f1c802b2ab0a8e70
 EBUILD qtserialport-6.8.1.ebuild 392 BLAKE2B 65750c8281a3febc2289e59f64f7eeb0eca466b773521e7ef801f0d3918b8d813cf59882bb1ab46ff3e962e1ba8b4c52033138dafa3ec10756daf689acd6dbe9 SHA512 b5ef4491f2babf2e5e775d537123aa1139d32a469c834832d264b61cf5f0c72a4fc59c0b32b41bccea2080cea52565cbb5aa8677c4a4079d6bb1b237f02a1c58
 EBUILD qtserialport-6.8.9999.ebuild 392 BLAKE2B 65750c8281a3febc2289e59f64f7eeb0eca466b773521e7ef801f0d3918b8d813cf59882bb1ab46ff3e962e1ba8b4c52033138dafa3ec10756daf689acd6dbe9 SHA512 b5ef4491f2babf2e5e775d537123aa1139d32a469c834832d264b61cf5f0c72a4fc59c0b32b41bccea2080cea52565cbb5aa8677c4a4079d6bb1b237f02a1c58
+EBUILD qtserialport-6.9.9999.ebuild 392 BLAKE2B 65750c8281a3febc2289e59f64f7eeb0eca466b773521e7ef801f0d3918b8d813cf59882bb1ab46ff3e962e1ba8b4c52033138dafa3ec10756daf689acd6dbe9 SHA512 b5ef4491f2babf2e5e775d537123aa1139d32a469c834832d264b61cf5f0c72a4fc59c0b32b41bccea2080cea52565cbb5aa8677c4a4079d6bb1b237f02a1c58
 EBUILD qtserialport-6.9999.ebuild 392 BLAKE2B 65750c8281a3febc2289e59f64f7eeb0eca466b773521e7ef801f0d3918b8d813cf59882bb1ab46ff3e962e1ba8b4c52033138dafa3ec10756daf689acd6dbe9 SHA512 b5ef4491f2babf2e5e775d537123aa1139d32a469c834832d264b61cf5f0c72a4fc59c0b32b41bccea2080cea52565cbb5aa8677c4a4079d6bb1b237f02a1c58
 MISC metadata.xml 537 BLAKE2B 48590dfe4d5912693284b963abe9e2fccfff319c2fcc3106fa8d20ec693f7430453eec3fc9ba16c7a9a2cf59f635c1b627f49c6f4e3a8f83be634a68a00b055c SHA512 60ab0488e4a3585fb036e22212f55b5ba5b512acefc9bc68b08a1b255fa6dd0e34e7652a77e55cd7107e1c1f6b742ed12ce20ae92df29a3a38cd2d9f22618f97
diff --git a/dev-qt/qtserialport/qtserialport-6.9.9999.ebuild b/dev-qt/qtserialport/qtserialport-6.9.9999.ebuild
new file mode 100644
index 000000000000..95b360fac6cf
--- /dev/null
+++ b/dev-qt/qtserialport/qtserialport-6.9.9999.ebuild
@@ -0,0 +1,18 @@
+# Copyright 2021-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit qt6-build
+
+DESCRIPTION="Serial port abstraction library for the Qt6 framework"
+
+if [[ ${QT6_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~x86"
+fi
+
+RDEPEND="
+	~dev-qt/qtbase-${PV}:6
+	virtual/libudev:=
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-qt/qtshadertools/Manifest b/dev-qt/qtshadertools/Manifest
index 18ecdcd4588c..c03b143f296c 100644
--- a/dev-qt/qtshadertools/Manifest
+++ b/dev-qt/qtshadertools/Manifest
@@ -6,5 +6,6 @@ EBUILD qtshadertools-6.7.2.ebuild 418 BLAKE2B aa94ccc444eb43698df85a293053c4a6b5
 EBUILD qtshadertools-6.7.3.ebuild 421 BLAKE2B 4ff95d09177058dfee0512005e0d6a382029614e3a64b143b333058b9b6985ee552b462f025424a53d754b62f79f35f29acb85922da2626415cda376415e11af SHA512 4eb58f65bf8dbf0ce92091bb0d24b1bf1c0ac7461d54abbc3c08270e7c3d7eaffb84b5ea91a26dfd1842a838cd8aea4a6b665b5a888486f662d46ab94e520a6e
 EBUILD qtshadertools-6.8.1.ebuild 424 BLAKE2B b9ab34a9eef76d7b44fb89094b7da9ff195ac4964843efd198cc9a56bac05a4f16100bdb496b890fbe862ad859431e812af3eb2edbe551f8ad0a113faa6c1729 SHA512 665c6dcbc05106adae48ca03fbf250fda9bf4224f4ce6d2e5a158c0c3fa73d5a15376b776847af1042e184ed237d7ca9e4a864e6d1f12c24515d525f286eade6
 EBUILD qtshadertools-6.8.9999.ebuild 424 BLAKE2B b9ab34a9eef76d7b44fb89094b7da9ff195ac4964843efd198cc9a56bac05a4f16100bdb496b890fbe862ad859431e812af3eb2edbe551f8ad0a113faa6c1729 SHA512 665c6dcbc05106adae48ca03fbf250fda9bf4224f4ce6d2e5a158c0c3fa73d5a15376b776847af1042e184ed237d7ca9e4a864e6d1f12c24515d525f286eade6
+EBUILD qtshadertools-6.9.9999.ebuild 424 BLAKE2B b9ab34a9eef76d7b44fb89094b7da9ff195ac4964843efd198cc9a56bac05a4f16100bdb496b890fbe862ad859431e812af3eb2edbe551f8ad0a113faa6c1729 SHA512 665c6dcbc05106adae48ca03fbf250fda9bf4224f4ce6d2e5a158c0c3fa73d5a15376b776847af1042e184ed237d7ca9e4a864e6d1f12c24515d525f286eade6
 EBUILD qtshadertools-6.9999.ebuild 424 BLAKE2B b9ab34a9eef76d7b44fb89094b7da9ff195ac4964843efd198cc9a56bac05a4f16100bdb496b890fbe862ad859431e812af3eb2edbe551f8ad0a113faa6c1729 SHA512 665c6dcbc05106adae48ca03fbf250fda9bf4224f4ce6d2e5a158c0c3fa73d5a15376b776847af1042e184ed237d7ca9e4a864e6d1f12c24515d525f286eade6
 MISC metadata.xml 538 BLAKE2B 59f8b1a838f1fadf78bc2d9f1c65fde2c7fdc306730671b16297ff19308186907744bcbd0924074001e1cdb43c1dde29486368bb0d2533b3cb12f7befa53d2dc SHA512 dfe1c793f5525ce4d4353d9131749247163021ec3d995d2cc95df53d214d2e0b24468a026df0dd6403cad41990ab5e8c5e801efa346a06a2d962f29990b16ddf
diff --git a/dev-qt/qtshadertools/qtshadertools-6.9.9999.ebuild b/dev-qt/qtshadertools/qtshadertools-6.9.9999.ebuild
new file mode 100644
index 000000000000..15f54c185b88
--- /dev/null
+++ b/dev-qt/qtshadertools/qtshadertools-6.9.9999.ebuild
@@ -0,0 +1,21 @@
+# Copyright 2021-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit qt6-build
+
+DESCRIPTION="Qt APIs and Tools for Graphics Pipelines"
+
+if [[ ${QT6_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+fi
+
+RDEPEND="
+	~dev-qt/qtbase-${PV}:6[gui]
+"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-6.7.2-gcc15.patch
+)
diff --git a/dev-qt/qtspeech/Manifest b/dev-qt/qtspeech/Manifest
index dfe89050f62f..8be9320c12e2 100644
--- a/dev-qt/qtspeech/Manifest
+++ b/dev-qt/qtspeech/Manifest
@@ -11,5 +11,6 @@ EBUILD qtspeech-6.7.2.ebuild 1190 BLAKE2B 082e9498be5b601e0454185ddd3e37d78ddaf9
 EBUILD qtspeech-6.7.3.ebuild 1192 BLAKE2B 645c346c0c2b729f95a1369fb57f684d5ff3fa9258b2fa5400eccfda86eca5384d3c78022144e43d92812db24b3078cedfa3d42216eb4c55f99783defdffc086 SHA512 12b611542d89fe642d94e191235467799ab0fb269369a1686f1997fd0574f3b265c6a36c478ea7dd40ad1a23758b053c859721020be6567999f52fc127510fec
 EBUILD qtspeech-6.8.1.ebuild 1195 BLAKE2B d16df9bd58482ec742dd2744f6595ccf9869f4aa127afc3b6f2d5030c3647fe4a44a465bbb4e3d53915d5b3cff22989b5f6de3dc79d844541672685d750495f9 SHA512 98827c741fc6b092d18bf0f6b8d99f8757966958f9178b412756dd5a329d95b84bcfc9be2e38c5c39a47808b6d6d60539db8dd5ebf3e753100d8280c66c0b6c3
 EBUILD qtspeech-6.8.9999.ebuild 1195 BLAKE2B d16df9bd58482ec742dd2744f6595ccf9869f4aa127afc3b6f2d5030c3647fe4a44a465bbb4e3d53915d5b3cff22989b5f6de3dc79d844541672685d750495f9 SHA512 98827c741fc6b092d18bf0f6b8d99f8757966958f9178b412756dd5a329d95b84bcfc9be2e38c5c39a47808b6d6d60539db8dd5ebf3e753100d8280c66c0b6c3
+EBUILD qtspeech-6.9.9999.ebuild 1195 BLAKE2B d16df9bd58482ec742dd2744f6595ccf9869f4aa127afc3b6f2d5030c3647fe4a44a465bbb4e3d53915d5b3cff22989b5f6de3dc79d844541672685d750495f9 SHA512 98827c741fc6b092d18bf0f6b8d99f8757966958f9178b412756dd5a329d95b84bcfc9be2e38c5c39a47808b6d6d60539db8dd5ebf3e753100d8280c66c0b6c3
 EBUILD qtspeech-6.9999.ebuild 1195 BLAKE2B d16df9bd58482ec742dd2744f6595ccf9869f4aa127afc3b6f2d5030c3647fe4a44a465bbb4e3d53915d5b3cff22989b5f6de3dc79d844541672685d750495f9 SHA512 98827c741fc6b092d18bf0f6b8d99f8757966958f9178b412756dd5a329d95b84bcfc9be2e38c5c39a47808b6d6d60539db8dd5ebf3e753100d8280c66c0b6c3
 MISC metadata.xml 861 BLAKE2B fe3a9f427c9a3868ece77a85d0e2f62d12ad109c893a6adba13a9d2cb0098acff98f4ede9185c77a24ea0ddb5d028b77b71f2efa6cfae275ff12138dcd4cac78 SHA512 1e6940d835b139860878cb5b16e4f0f6eadd1e48130273a0c5a511376341d03bed1fa59a83f12e2f7c87a269a5410f92cabeaf3e4f3574eb906f69bc61d8b401
diff --git a/dev-qt/qtspeech/qtspeech-6.9.9999.ebuild b/dev-qt/qtspeech/qtspeech-6.9.9999.ebuild
new file mode 100644
index 000000000000..1b13d4434223
--- /dev/null
+++ b/dev-qt/qtspeech/qtspeech-6.9.9999.ebuild
@@ -0,0 +1,44 @@
+# Copyright 2023-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# tests are kind of flaky, sometimes hang, and also fail with clang
+# (not that it's unusable with clang) -- may be worth revisiting
+# eventually given qtspeech is still somewhat new (added in 6.4.0)
+QT6_RESTRICT_TESTS=1
+
+inherit qt6-build
+
+DESCRIPTION="Text-to-speech library for the Qt6 framework"
+
+if [[ ${QT6_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+fi
+
+IUSE="flite qml +speechd"
+# can build with neither, but then it is just mock tts and may be confusing
+REQUIRED_USE="|| ( flite speechd )"
+
+RDEPEND="
+	~dev-qt/qtbase-${PV}:6
+	~dev-qt/qtmultimedia-${PV}:6
+	flite? ( app-accessibility/flite )
+	qml? ( ~dev-qt/qtdeclarative-${PV}:6 )
+	speechd? ( app-accessibility/speech-dispatcher )
+"
+DEPEND="${RDEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package qml Qt6Qml)
+		$(qt_feature flite)
+		$(qt_feature speechd)
+
+		# flite_alsa was likely to work around old issues in flite, it does
+		# nothing but add -lasound (no code change, and is unneeded)
+		-DQT_FEATURE_flite_alsa=OFF
+	)
+
+	qt6-build_src_configure
+}
diff --git a/dev-qt/qtsvg/Manifest b/dev-qt/qtsvg/Manifest
index 27e12c5dd8c9..d56f36d7424b 100644
--- a/dev-qt/qtsvg/Manifest
+++ b/dev-qt/qtsvg/Manifest
@@ -11,5 +11,6 @@ EBUILD qtsvg-6.7.2.ebuild 654 BLAKE2B 868b671ad183a7fe54943560e5a3498212d973c57e
 EBUILD qtsvg-6.7.3.ebuild 657 BLAKE2B c3af298f560613ecc634ed59621427abb5f06b7753bc464c5b22f543a6c01d9970d1927a336595d6e5b6ef1b1b4ada8811548abeb2a70f65f83255ab5ff811ef SHA512 fc07cab2dc4fe619f72eb6db8d9782a1741a4ec9e4d7a4a94817b6267600a1c52be7eba129b5eca3c9cc849deb547b861467979b99d739efa830c64cb89dc418
 EBUILD qtsvg-6.8.1.ebuild 660 BLAKE2B 5321a21eced92e802d7dd62ee7bf485a57f7f4ba95696e2a6fdf12d5e15bec14f9bce2e3b1301fd567f7ea54a9d6ee95dddb331c1f7b454bd3da6d08361885c2 SHA512 6c27314d9bec6e8e1a13826d18b3b8ef0ec791a331773bf5ca54a4f183ecafaf5bba144f6ed01849977f1c6746b3f765a861cb669ac09b1879f4756d532908ef
 EBUILD qtsvg-6.8.9999.ebuild 660 BLAKE2B 5321a21eced92e802d7dd62ee7bf485a57f7f4ba95696e2a6fdf12d5e15bec14f9bce2e3b1301fd567f7ea54a9d6ee95dddb331c1f7b454bd3da6d08361885c2 SHA512 6c27314d9bec6e8e1a13826d18b3b8ef0ec791a331773bf5ca54a4f183ecafaf5bba144f6ed01849977f1c6746b3f765a861cb669ac09b1879f4756d532908ef
+EBUILD qtsvg-6.9.9999.ebuild 660 BLAKE2B 5321a21eced92e802d7dd62ee7bf485a57f7f4ba95696e2a6fdf12d5e15bec14f9bce2e3b1301fd567f7ea54a9d6ee95dddb331c1f7b454bd3da6d08361885c2 SHA512 6c27314d9bec6e8e1a13826d18b3b8ef0ec791a331773bf5ca54a4f183ecafaf5bba144f6ed01849977f1c6746b3f765a861cb669ac09b1879f4756d532908ef
 EBUILD qtsvg-6.9999.ebuild 660 BLAKE2B 5321a21eced92e802d7dd62ee7bf485a57f7f4ba95696e2a6fdf12d5e15bec14f9bce2e3b1301fd567f7ea54a9d6ee95dddb331c1f7b454bd3da6d08361885c2 SHA512 6c27314d9bec6e8e1a13826d18b3b8ef0ec791a331773bf5ca54a4f183ecafaf5bba144f6ed01849977f1c6746b3f765a861cb669ac09b1879f4756d532908ef
 MISC metadata.xml 530 BLAKE2B 4cff37d5824321054b8131fc65a4a86433a2e33882c66411b7af25c0550ad4933a680ceb517d1ba2cd11dab4b3110da69f330f334d25577310d59d7ab4aca439 SHA512 f538df6a65076e6744ab7e498778ff1addd3f45af50708d5af3c0eefb5862fc0b82bf99c18b268bb6ed257b3feed51f64ed18cd4006ba717c03be37ea5258ab3
diff --git a/dev-qt/qtsvg/qtsvg-6.9.9999.ebuild b/dev-qt/qtsvg/qtsvg-6.9.9999.ebuild
new file mode 100644
index 000000000000..e7ea7c613b25
--- /dev/null
+++ b/dev-qt/qtsvg/qtsvg-6.9.9999.ebuild
@@ -0,0 +1,26 @@
+# Copyright 2021-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit qt6-build toolchain-funcs
+
+DESCRIPTION="SVG rendering library for the Qt6 framework"
+
+if [[ ${QT6_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~x86"
+fi
+
+RDEPEND="
+	~dev-qt/qtbase-${PV}:6[gui,widgets]
+	sys-libs/zlib:=
+"
+DEPEND="${RDEPEND}"
+
+src_test() {
+	# tst_QSvgRenderer::testFeColorMatrix (new in 6.7, likely low impact)
+	# is known failing on BE, could use more looking into (bug #935356)
+	[[ $(tc-endian) == big ]] && local CMAKE_SKIP_TESTS=( tst_qsvgrenderer )
+
+	qt6-build_src_test
+}
diff --git a/dev-qt/qttools/Manifest b/dev-qt/qttools/Manifest
index 7bd6e489efa0..1887852273cf 100644
--- a/dev-qt/qttools/Manifest
+++ b/dev-qt/qttools/Manifest
@@ -5,5 +5,6 @@ EBUILD qttools-6.7.2.ebuild 4646 BLAKE2B 4daf8cee81520005697a267037990a44bef6fd4
 EBUILD qttools-6.7.3.ebuild 4665 BLAKE2B 9457e7bf307b2ea633a07fba64fbd76631a58d426b937b3e92cd79d3c9e72ec3a93aa4a1bfdab025a005938eb45505805943fb8520fce4acbd5e304ad450b461 SHA512 42d2080043138d6173d2ead2dde7a689dbff3c82b3ee1269df3b14a9b6e83eabc037f20a9f46811083b97bab716525a5a50237566a7bc8211afb5e10c6cf37c4
 EBUILD qttools-6.8.1.ebuild 4918 BLAKE2B 2650098199b7a82c5083de956471eecd15028347fa5aff5ed23005d8eb44fa38dbd271d9b80351b9970ad459a0699134e78c04d6221ecf7b68db6bd7ab940d67 SHA512 22548464216cf24050b5a3728a702cde00ca6e771341fbac05b78196bae1be9fcda08651928cd9bd0028b4ea8f4c7e0728c0385159233fd6e19c5158b517544d
 EBUILD qttools-6.8.9999.ebuild 4918 BLAKE2B 2650098199b7a82c5083de956471eecd15028347fa5aff5ed23005d8eb44fa38dbd271d9b80351b9970ad459a0699134e78c04d6221ecf7b68db6bd7ab940d67 SHA512 22548464216cf24050b5a3728a702cde00ca6e771341fbac05b78196bae1be9fcda08651928cd9bd0028b4ea8f4c7e0728c0385159233fd6e19c5158b517544d
+EBUILD qttools-6.9.9999.ebuild 4918 BLAKE2B 2650098199b7a82c5083de956471eecd15028347fa5aff5ed23005d8eb44fa38dbd271d9b80351b9970ad459a0699134e78c04d6221ecf7b68db6bd7ab940d67 SHA512 22548464216cf24050b5a3728a702cde00ca6e771341fbac05b78196bae1be9fcda08651928cd9bd0028b4ea8f4c7e0728c0385159233fd6e19c5158b517544d
 EBUILD qttools-6.9999.ebuild 4918 BLAKE2B 2650098199b7a82c5083de956471eecd15028347fa5aff5ed23005d8eb44fa38dbd271d9b80351b9970ad459a0699134e78c04d6221ecf7b68db6bd7ab940d67 SHA512 22548464216cf24050b5a3728a702cde00ca6e771341fbac05b78196bae1be9fcda08651928cd9bd0028b4ea8f4c7e0728c0385159233fd6e19c5158b517544d
 MISC metadata.xml 1495 BLAKE2B 05681d2d714d1d6e2939d105c48c3e16a1a99b4196b04fe0f1ed62cd628f0b3d743d75229aa123c887dfd2abea1e67b43d7224a1603d889f2f75d964f51206b8 SHA512 6c692eed887713ef7a3d33b2644ecfcf0ec2f346e5e15857996b8a6916a137d22cb2255cc2a44de06a4fb1e0818395842c52925b232ac49d7280210d2441f89a
diff --git a/dev-qt/qttools/qttools-6.9.9999.ebuild b/dev-qt/qttools/qttools-6.9.9999.ebuild
new file mode 100644
index 000000000000..3944f485aac8
--- /dev/null
+++ b/dev-qt/qttools/qttools-6.9.9999.ebuild
@@ -0,0 +1,159 @@
+# Copyright 2021-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LLVM_COMPAT=( {17..19} ) # see .cmake.conf for minimum
+LLVM_OPTIONAL=1
+
+# behaves very badly when qttools is not already installed, also
+# other issues to handle (clang tests flaky depending on version,
+# and 3rdparty/ tries to FetchContent gtest)
+QT6_RESTRICT_TESTS=1
+
+inherit desktop llvm-r1 optfeature qt6-build
+
+DESCRIPTION="Qt Tools Collection"
+
+if [[ ${QT6_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+fi
+
+IUSE="
+	+assistant clang designer distancefieldgenerator gles2-only +linguist
+	opengl pixeltool +qdbus qdoc qml qmlls qtattributionsscanner qtdiag
+	qtplugininfo vulkan +widgets zstd
+"
+# note that some tools do not *require* widgets but will skip a sub-tool
+# if not enabled (e.g. linguist gives lrelease but not the GUI linguist6)
+REQUIRED_USE="
+	assistant? ( widgets )
+	clang? ( ${LLVM_REQUIRED_USE} )
+	designer? ( qml widgets )
+	distancefieldgenerator? ( qml widgets )
+	pixeltool? ( widgets )
+	qdoc? ( clang qml )
+	qmlls? ( assistant qml )
+"
+
+RDEPEND="
+	~dev-qt/qtbase-${PV}:6[widgets?]
+	assistant? ( ~dev-qt/qtbase-${PV}:6[network,sql,sqlite] )
+	clang? (
+		$(llvm_gen_dep '
+			llvm-core/clang:${LLVM_SLOT}=
+			llvm-core/llvm:${LLVM_SLOT}=
+		')
+	)
+	designer? (
+		~dev-qt/qtbase-${PV}:6[network,xml,zstd=]
+		zstd? ( app-arch/zstd:= )
+	)
+	qdbus? ( ~dev-qt/qtbase-${PV}:6[dbus,xml] )
+	qml? ( ~dev-qt/qtdeclarative-${PV}:6[widgets?] )
+	qmlls? ( ~dev-qt/qtdeclarative-${PV}:6[qmlls] )
+	qtdiag? ( ~dev-qt/qtbase-${PV}:6[network,gles2-only=,vulkan=] )
+	widgets? ( ~dev-qt/qtbase-${PV}:6[opengl=] )
+"
+DEPEND="
+	${RDEPEND}
+	qtdiag? (
+		vulkan? ( dev-util/vulkan-headers )
+	)
+"
+
+pkg_setup() {
+	use clang && llvm-r1_pkg_setup
+}
+
+src_configure() {
+	local mycmakeargs=(
+		# prevent the clang test as it can abort due to bug #916098
+		$(cmake_use_find_package clang WrapLibClang)
+		$(cmake_use_find_package qml Qt6Qml)
+		$(cmake_use_find_package widgets Qt6Widgets)
+		$(qt_feature assistant)
+		$(qt_feature clang)
+		$(qt_feature designer)
+		$(qt_feature distancefieldgenerator)
+		$(qt_feature linguist)
+		$(qt_feature pixeltool)
+		$(qt_feature qdbus)
+		$(qt_feature qdoc)
+		$(qt_feature qtattributionsscanner)
+		$(qt_feature qtdiag)
+		$(qt_feature qtplugininfo)
+
+		# TODO?: package litehtml, but support for latest releases seem
+		# to lag behind and bundled may work out better for now
+		# https://github.com/litehtml/litehtml/issues/266
+		$(usev assistant -DCMAKE_DISABLE_FIND_PACKAGE_litehtml=ON)
+
+		# USE=qmlls' help plugin may be temporary, upstream has plans to split
+		# QtHelp into another package so that qtdeclarative can depend on it
+		# without a circular dependency with qttools
+		$(cmake_use_find_package qmlls Qt6QmlLSPrivate)
+	)
+
+	qt6-build_src_configure
+}
+
+src_install() {
+	qt6-build_src_install
+
+	if use widgets; then #914766
+		use designer || use distancefieldgenerator || use pixeltool &&
+			newicon src/designer/src/designer/images/designer.png designer6.png
+
+		if use assistant; then
+			make_desktop_entry assistant6 'Qt 6 Assistant' assistant6 \
+				'Qt;Development;Documentation' \
+				'Comment=Tool for viewing online documentation in Qt help file format'
+			newicon src/assistant/assistant/images/assistant-128.png assistant6.png
+		fi
+
+		if use designer; then
+			make_desktop_entry designer6 'Qt 6 Designer' designer6 \
+				'Qt;Development;GUIDesigner' \
+				'Comment=WYSIWYG tool for designing and building graphical user interfaces with QtWidgets'
+		fi
+
+		if use distancefieldgenerator; then
+			# no icon, sharing with designer which fits letter-wise
+			make_desktop_entry qdistancefieldgenerator6 'Qt 6 Distance Field Generator' designer6 \
+				'Qt;Development' \
+				'Comment=Tool for pregenerating the font cache of Qt applications'
+		fi
+
+		if use linguist; then
+			make_desktop_entry linguist6 'Qt 6 Linguist' linguist6 \
+				'Qt;Development;Translation' \
+				'Comment=Tool for translating Qt applications'
+			newicon src/linguist/linguist/images/icons/linguist-128-32.png linguist6.png
+		fi
+
+		if use pixeltool; then
+			# no icon, not fitting but share with designer for now
+			make_desktop_entry pixeltool6 'Qt 6 Pixel Tool' designer6 \
+				'Qt;Development' \
+				'Comment=Tool for zooming in the desktop area pointed by the cursor'
+		fi
+
+		if use qdbus; then
+			make_desktop_entry qdbusviewer6 'Qt 6 QDBusViewer' qdbusviewer6 \
+				'Qt;Development' \
+				'Comment=Tool that lets introspect D-Bus objects and messages'
+			newicon src/qdbus/qdbusviewer/images/qdbusviewer-128.png qdbusviewer6.png
+		fi
+
+		# hack: make_destop_entry does not support overriding DESCRIPTION
+		find "${ED}" -type f -name "*.desktop" \
+			-exec sed -i "/^Comment=${DESCRIPTION}/d" -- {} + || die
+	fi
+}
+
+pkg_postinst() {
+	use assistant &&
+		optfeature "Qt documentation viewable in assistant" \
+			'dev-qt/qt-docs:6[qch]' #602296
+}
diff --git a/dev-qt/qttranslations/Manifest b/dev-qt/qttranslations/Manifest
index 0770bdbda1af..ea77e72eb622 100644
--- a/dev-qt/qttranslations/Manifest
+++ b/dev-qt/qttranslations/Manifest
@@ -9,5 +9,6 @@ EBUILD qttranslations-6.7.2.ebuild 412 BLAKE2B d08fc60c197e7a0349b64fefb0351ca74
 EBUILD qttranslations-6.7.3.ebuild 415 BLAKE2B 3a96a37095dc6f1da2d9c5e5286a5d1787e7f0ad0c1673d41e191f0926b54aa45f00a6df02e417a15a66dfbf9cfad9cc06d169e2e96e78705488f8e59da3ae97 SHA512 539e5abfb5e0aeefd2b75847c2c7df4a256811e3b8bdf1208c99909d99da04e76a1416378dd42ad88344f75eddd96c9a8c74392549d56b0eb386ca80cf5c2045
 EBUILD qttranslations-6.8.1.ebuild 418 BLAKE2B 295cea378d3a94f73b4bbd0430ad900f1e3f8478a863da1f5af987b55946909c6efcfe5840570a0f348bddbeb7f6ce25adcb04b1caff19140b6053cfc477b791 SHA512 d4fd0d708a0c7ea4b2e4c55c7aa19891ed771d86a45a108f7f3a4e1558751c5824dd4e0b18807902605c9df5b7d1ebfeeeab8730a5c45e3e2b7abbb3a2ad2baf
 EBUILD qttranslations-6.8.9999.ebuild 418 BLAKE2B 295cea378d3a94f73b4bbd0430ad900f1e3f8478a863da1f5af987b55946909c6efcfe5840570a0f348bddbeb7f6ce25adcb04b1caff19140b6053cfc477b791 SHA512 d4fd0d708a0c7ea4b2e4c55c7aa19891ed771d86a45a108f7f3a4e1558751c5824dd4e0b18807902605c9df5b7d1ebfeeeab8730a5c45e3e2b7abbb3a2ad2baf
+EBUILD qttranslations-6.9.9999.ebuild 418 BLAKE2B 295cea378d3a94f73b4bbd0430ad900f1e3f8478a863da1f5af987b55946909c6efcfe5840570a0f348bddbeb7f6ce25adcb04b1caff19140b6053cfc477b791 SHA512 d4fd0d708a0c7ea4b2e4c55c7aa19891ed771d86a45a108f7f3a4e1558751c5824dd4e0b18807902605c9df5b7d1ebfeeeab8730a5c45e3e2b7abbb3a2ad2baf
 EBUILD qttranslations-6.9999.ebuild 418 BLAKE2B 295cea378d3a94f73b4bbd0430ad900f1e3f8478a863da1f5af987b55946909c6efcfe5840570a0f348bddbeb7f6ce25adcb04b1caff19140b6053cfc477b791 SHA512 d4fd0d708a0c7ea4b2e4c55c7aa19891ed771d86a45a108f7f3a4e1558751c5824dd4e0b18807902605c9df5b7d1ebfeeeab8730a5c45e3e2b7abbb3a2ad2baf
 MISC metadata.xml 563 BLAKE2B 11869c4f597d5fabbf64d850fe11460e1e91c09170dadfb660a5035cc5fbc1589d5c616459f2426ce0c2480762dc40d5822beedb963da9855e580a4aa2e4df0e SHA512 e228dd2161cdf78f156ce10da18aadc938f58c3455c1226fbebda35acd371201ae09779e531847d4707054c837f063f2d213341f17111a2cf2665707db024116
diff --git a/dev-qt/qttranslations/qttranslations-6.9.9999.ebuild b/dev-qt/qttranslations/qttranslations-6.9.9999.ebuild
new file mode 100644
index 000000000000..4957b280c2a2
--- /dev/null
+++ b/dev-qt/qttranslations/qttranslations-6.9.9999.ebuild
@@ -0,0 +1,16 @@
+# Copyright 2021-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+QT6_RESTRICT_TESTS=1 # no tests
+inherit qt6-build
+
+DESCRIPTION="Translation files for the Qt6 framework"
+
+if [[ ${QT6_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+fi
+
+DEPEND="~dev-qt/qtbase-${PV}:6"
+BDEPEND="~dev-qt/qttools-${PV}:6[linguist]"
diff --git a/dev-qt/qtvirtualkeyboard/Manifest b/dev-qt/qtvirtualkeyboard/Manifest
index 3321774edde1..08df1a13ea05 100644
--- a/dev-qt/qtvirtualkeyboard/Manifest
+++ b/dev-qt/qtvirtualkeyboard/Manifest
@@ -9,5 +9,6 @@ EBUILD qtvirtualkeyboard-6.7.2.ebuild 1128 BLAKE2B 5e2e9cc78e01cbd695a92b5bcfa28
 EBUILD qtvirtualkeyboard-6.7.3.ebuild 1130 BLAKE2B 35ea0991d8221eb472ec35a6a845e43474bc1067fa484ce02bab273cf65952e0737f7321c2eb3a0ddefb6f0fd4575a6cad92ce29e69baeb8fce3e2ab0ee7bf82 SHA512 99db4dbdade0e8930237b93ead9f8fbb11da8c0e31553526b0f1c69cdd0a39e2571ab952b65f13777247bd4971c4547dac7311aad0a3c30d26cc1c01f3b55bd4
 EBUILD qtvirtualkeyboard-6.8.1.ebuild 1133 BLAKE2B 7d5eac988baec1f6defd7cdc46541ad8e05aa2dd0410f63fbe816e6b6702561ef2be2b5d8b0c6d2cc75580217c321e5150d5b6032eafe61632c39292338e2b39 SHA512 48522d0243e86467e49e18c22cb29669642a232a3d4b07a3ea46f228b73f5493b8bf6bca64fae43e8ad3af5d4d42ef7de395e3c0a8479938d021086eec1e241b
 EBUILD qtvirtualkeyboard-6.8.9999.ebuild 1133 BLAKE2B 7d5eac988baec1f6defd7cdc46541ad8e05aa2dd0410f63fbe816e6b6702561ef2be2b5d8b0c6d2cc75580217c321e5150d5b6032eafe61632c39292338e2b39 SHA512 48522d0243e86467e49e18c22cb29669642a232a3d4b07a3ea46f228b73f5493b8bf6bca64fae43e8ad3af5d4d42ef7de395e3c0a8479938d021086eec1e241b
-EBUILD qtvirtualkeyboard-6.9999.ebuild 1133 BLAKE2B 7d5eac988baec1f6defd7cdc46541ad8e05aa2dd0410f63fbe816e6b6702561ef2be2b5d8b0c6d2cc75580217c321e5150d5b6032eafe61632c39292338e2b39 SHA512 48522d0243e86467e49e18c22cb29669642a232a3d4b07a3ea46f228b73f5493b8bf6bca64fae43e8ad3af5d4d42ef7de395e3c0a8479938d021086eec1e241b
+EBUILD qtvirtualkeyboard-6.9.9999.ebuild 1229 BLAKE2B 7dcbc30b775f1556fb566c8c196a40612cd4d330046b372d30412394b3c9fa0163856b8bb5599ddd44a9580e64d81b85067a718fe70fa650355e12538cf7dfde SHA512 3e8104a10c958ed11d5f3c3b64317b9824e924d9dd9e25001cd83a697a7115aa35eac7c99a625369150a0674d8c676bef0fee851c97f801f9f3a9bf29931b627
+EBUILD qtvirtualkeyboard-6.9999.ebuild 1229 BLAKE2B 7dcbc30b775f1556fb566c8c196a40612cd4d330046b372d30412394b3c9fa0163856b8bb5599ddd44a9580e64d81b85067a718fe70fa650355e12538cf7dfde SHA512 3e8104a10c958ed11d5f3c3b64317b9824e924d9dd9e25001cd83a697a7115aa35eac7c99a625369150a0674d8c676bef0fee851c97f801f9f3a9bf29931b627
 MISC metadata.xml 640 BLAKE2B bdfed031e4d0191f510982695bca87366916ce6b7ba3ff7fad718ac55083cbd82d7b00b32048f65b3973944f2058cf8f652e19a7efb3606a2eb7e4b3cc3fd63f SHA512 a5b3338f67993f944258eb2fba56b6d6b927e0e298832c95e2c3b6b7eb148201e2912e1844de03a360c0b123c6322c7d956825913eeec7c866fed861ced34dfc
diff --git a/dev-qt/qtvirtualkeyboard/qtvirtualkeyboard-6.9.9999.ebuild b/dev-qt/qtvirtualkeyboard/qtvirtualkeyboard-6.9.9999.ebuild
new file mode 100644
index 000000000000..43f6827a6965
--- /dev/null
+++ b/dev-qt/qtvirtualkeyboard/qtvirtualkeyboard-6.9.9999.ebuild
@@ -0,0 +1,53 @@
+# Copyright 2023-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit qt6-build
+
+DESCRIPTION="Customizable input framework and virtual keyboard for Qt"
+
+if [[ ${QT6_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+fi
+
+IUSE="+sound +spell"
+
+RDEPEND="
+	~dev-qt/qtbase-${PV}:6[gui]
+	~dev-qt/qtdeclarative-${PV}:6
+	~dev-qt/qtsvg-${PV}:6
+	sound? ( ~dev-qt/qtmultimedia-${PV}:6 )
+	spell? ( app-text/hunspell:= )
+"
+DEPEND="${RDEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package sound Qt6Multimedia)
+		$(qt_feature spell hunspell)
+		-DINPUT_vkb_handwriting=no # neither cerence nor myscript are packaged
+	)
+
+	qt6-build_src_configure
+}
+
+src_test() {
+	local CMAKE_SKIP_TESTS=(
+		# rarely randomly(?) fails even with -j1
+		tst_layoutfilesystem
+	)
+
+	if use spell && has_version app-dicts/myspell-en; then
+		# 99% pass but minor sub-tests fail with myspell-en, needs looking into
+		ewarn "Warning: notable tests were skipped due to ${_} being installed"
+		CMAKE_SKIP_TESTS+=(
+			tst_inputpanel
+			tst_inputpanelcontrols2
+		)
+	else
+		einfo "tst_inputpanel can take >5mins, not known to actually hang"
+	fi
+
+	qt6-build_src_test
+}
diff --git a/dev-qt/qtvirtualkeyboard/qtvirtualkeyboard-6.9999.ebuild b/dev-qt/qtvirtualkeyboard/qtvirtualkeyboard-6.9999.ebuild
index 4639b2cf069d..43f6827a6965 100644
--- a/dev-qt/qtvirtualkeyboard/qtvirtualkeyboard-6.9999.ebuild
+++ b/dev-qt/qtvirtualkeyboard/qtvirtualkeyboard-6.9999.ebuild
@@ -11,18 +11,20 @@ if [[ ${QT6_BUILD_TYPE} == release ]]; then
 	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
 fi
 
-IUSE="+spell"
+IUSE="+sound +spell"
 
 RDEPEND="
 	~dev-qt/qtbase-${PV}:6[gui]
 	~dev-qt/qtdeclarative-${PV}:6
 	~dev-qt/qtsvg-${PV}:6
+	sound? ( ~dev-qt/qtmultimedia-${PV}:6 )
 	spell? ( app-text/hunspell:= )
 "
 DEPEND="${RDEPEND}"
 
 src_configure() {
 	local mycmakeargs=(
+		$(cmake_use_find_package sound Qt6Multimedia)
 		$(qt_feature spell hunspell)
 		-DINPUT_vkb_handwriting=no # neither cerence nor myscript are packaged
 	)
diff --git a/dev-qt/qtwayland/Manifest b/dev-qt/qtwayland/Manifest
index 4d3048079449..bb899621f449 100644
--- a/dev-qt/qtwayland/Manifest
+++ b/dev-qt/qtwayland/Manifest
@@ -18,5 +18,6 @@ EBUILD qtwayland-6.7.2-r3.ebuild 1641 BLAKE2B d709c378c8eea57e1533b4451676016b09
 EBUILD qtwayland-6.7.3-r1.ebuild 1543 BLAKE2B 567649129dff2f7460efc94e71944c14627f633ae0eaea7e6a32109b2947e8bea3ef39c1b666e8542b218864dac3e6190809900164e41590cf553f9d89f55e8f SHA512 f7380f4c5bd852d618982b8c23d6bfc4307004d55e76f28fca7edac506a635f59e2cc9cdb0d9f9712347c281d98713a53cbba88a669d1e2e6abe5e5e28d39e3d
 EBUILD qtwayland-6.8.1.ebuild 1715 BLAKE2B 6dbdda31184badc9a5ca7fd99d5dfbc271a76a0a7aec7ea0e42de77ab1e62a9bc7d1b2ee047b57a40131f76b6bb02bb8a04211968b821c95f4465ddc5ee5ec8e SHA512 4c465f4a3788d68b4f9bf474ff195ff9fe61a13d9c2e411aa227ebfb50ce60b5f930ca5998b785d36117ead90cc2b9ad03a407803dcd3175c12f17189126f415
 EBUILD qtwayland-6.8.9999.ebuild 1669 BLAKE2B 669f28bc549085675d1b846af2f3665d35e84dfa3cfae4098efc6b912f51f80151c53a1024907d1f844708f2d55b4b48adf7cabc7294402000f2a8cdb84d8a32 SHA512 90146a5961292eb49722978d52d8b0d8458a2c15576b052b52d181f1209509c75b2a88034db82b52749e15352e1f7f009a941ff1d19c6874b0c732c71308467c
+EBUILD qtwayland-6.9.9999.ebuild 1604 BLAKE2B 955233e9dce7287eab5e8ccb13b548e44bc31dc71a195f665c1422a33045a309a131cf4443714a31799a2c1a387fc0ffc1d4f653c6b7bd25de77cae8f92c2e68 SHA512 374607e7b5f0e65e89ce1dc9e2cb714212a876c556826ca92cfb347a6a7bea8dd2f94e3455dd3e2fd66cf16a5e23350e2ca4fb316139626eb0c7bc46f66fb800
 EBUILD qtwayland-6.9999.ebuild 1604 BLAKE2B 955233e9dce7287eab5e8ccb13b548e44bc31dc71a195f665c1422a33045a309a131cf4443714a31799a2c1a387fc0ffc1d4f653c6b7bd25de77cae8f92c2e68 SHA512 374607e7b5f0e65e89ce1dc9e2cb714212a876c556826ca92cfb347a6a7bea8dd2f94e3455dd3e2fd66cf16a5e23350e2ca4fb316139626eb0c7bc46f66fb800
 MISC metadata.xml 888 BLAKE2B b893520d74518b0ea0d104d72545925ac37c818ef52d29a5551a2e3406ded90bc4f6c3d53b64868f2b39919cab783ed124af13f63704e7ee66c534c21dfdfb23 SHA512 9861bb9cf35100d7464d88f86614511522fc4cf7e2ef5d09b9ea95cdb168d61f645614104aacad24fcebc8ecfc2c98601b26f434059bffe169513fd097b12aec
diff --git a/dev-qt/qtwayland/qtwayland-6.9.9999.ebuild b/dev-qt/qtwayland/qtwayland-6.9.9999.ebuild
new file mode 100644
index 000000000000..cb3c8f5542c4
--- /dev/null
+++ b/dev-qt/qtwayland/qtwayland-6.9.9999.ebuild
@@ -0,0 +1,66 @@
+# Copyright 2021-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit qt6-build
+
+DESCRIPTION="Wayland platform plugin for Qt"
+
+if [[ ${QT6_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+fi
+
+IUSE="accessibility compositor gnome qml vulkan"
+
+RDEPEND="
+	dev-libs/wayland
+	~dev-qt/qtbase-${PV}:6[accessibility=,gui,opengl,vulkan=,wayland]
+	media-libs/libglvnd
+	x11-libs/libxkbcommon
+	compositor? (
+		qml? ( ~dev-qt/qtdeclarative-${PV}:6 )
+	)
+	gnome? (
+		~dev-qt/qtbase-${PV}:6[dbus]
+		~dev-qt/qtsvg-${PV}:6
+	)
+"
+DEPEND="
+	${RDEPEND}
+	vulkan? ( dev-util/vulkan-headers )
+"
+BDEPEND="dev-util/wayland-scanner"
+
+CMAKE_SKIP_TESTS=(
+	# segfaults for not-looked-into reasons, but not considered
+	# an issue given >=seatv5 exists since wayland-1.10 (2016)
+	tst_seatv4
+	# needs a compositor/opengl, skip the extra trouble
+	tst_surface
+	tst_xdgdecorationv1
+	# known failing with wayland-1.23.0 (or at least with offscreen), not
+	# believed to result in critical runtime issues so skip until this is
+	# looked at upstream (https://bugreports.qt.io/browse/QTBUG-126379)
+	tst_client
+	tst_compositor
+	tst_scaling
+)
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package qml Qt6Quick)
+		$(qt_feature compositor wayland_server)
+		$(qt_feature gnome wayland_decoration_adwaita)
+	)
+
+	qt6-build_src_configure
+}
+
+src_test() {
+	# users' session setting may break tst_clientextension (bug #927030)
+	unset DESKTOP_SESSION XDG_CURRENT_DESKTOP
+	unset GNOME_DESKTOP_SESSION_ID KDE_FULL_SESSION
+
+	qt6-build_src_test
+}
diff --git a/dev-qt/qtwebchannel/Manifest b/dev-qt/qtwebchannel/Manifest
index 5a8228631995..c86d7d953035 100644
--- a/dev-qt/qtwebchannel/Manifest
+++ b/dev-qt/qtwebchannel/Manifest
@@ -11,5 +11,6 @@ EBUILD qtwebchannel-6.7.2.ebuild 559 BLAKE2B 592c74b3e20fd7b6733987bc830aa0e96c1
 EBUILD qtwebchannel-6.7.3.ebuild 562 BLAKE2B 19253bfe916196216f3cb12bb39bcd7785cfcef7d7be159aa325861427395e20c3e7f01c4ff21ea9659f36bf65c597e8a847a1450578da106666759efa4093e3 SHA512 dca3c1e46a36d82b142f86b1142d4ba229a31ebe013ec84d9e2a146b30887a1a95bca2a42b3e09530648353692b58bb2294416f376a37287a6197038f4112882
 EBUILD qtwebchannel-6.8.1.ebuild 565 BLAKE2B b1280cae03d3db874b48a73b9aac02a47dab09bdf73d88a122b0f114cbeaf56c534e694a4e16487b30f1beab1186affacdc6411befefca65cd6e915aad226861 SHA512 0ff730e7da3b4b8f274698bf451e4ee9aad7a732bdf2e930ca73cf33f80506e518602b6d7a8eecb30c8195e3b9e9b0d14e676f92cfa60a651e78bb90ac688553
 EBUILD qtwebchannel-6.8.9999.ebuild 565 BLAKE2B b1280cae03d3db874b48a73b9aac02a47dab09bdf73d88a122b0f114cbeaf56c534e694a4e16487b30f1beab1186affacdc6411befefca65cd6e915aad226861 SHA512 0ff730e7da3b4b8f274698bf451e4ee9aad7a732bdf2e930ca73cf33f80506e518602b6d7a8eecb30c8195e3b9e9b0d14e676f92cfa60a651e78bb90ac688553
+EBUILD qtwebchannel-6.9.9999.ebuild 565 BLAKE2B b1280cae03d3db874b48a73b9aac02a47dab09bdf73d88a122b0f114cbeaf56c534e694a4e16487b30f1beab1186affacdc6411befefca65cd6e915aad226861 SHA512 0ff730e7da3b4b8f274698bf451e4ee9aad7a732bdf2e930ca73cf33f80506e518602b6d7a8eecb30c8195e3b9e9b0d14e676f92cfa60a651e78bb90ac688553
 EBUILD qtwebchannel-6.9999.ebuild 565 BLAKE2B b1280cae03d3db874b48a73b9aac02a47dab09bdf73d88a122b0f114cbeaf56c534e694a4e16487b30f1beab1186affacdc6411befefca65cd6e915aad226861 SHA512 0ff730e7da3b4b8f274698bf451e4ee9aad7a732bdf2e930ca73cf33f80506e518602b6d7a8eecb30c8195e3b9e9b0d14e676f92cfa60a651e78bb90ac688553
 MISC metadata.xml 617 BLAKE2B c9bdd6bc7b0e0aae943acc9060d1ef91d46e5e836f7a034c863032dff51b540edc0643cfd3ea0c4c4e18472a099537aee2b13994ea6fa97249dff25ad5291575 SHA512 ecc344957ebad7d9adc689c343c8315d38fc4d219f0a3bfb6ca848d2d083b0d29d01365a5287d3d5943a95dc75c1147c2e60a2078083a88832296ed0fbee2d4c
diff --git a/dev-qt/qtwebchannel/qtwebchannel-6.9.9999.ebuild b/dev-qt/qtwebchannel/qtwebchannel-6.9.9999.ebuild
new file mode 100644
index 000000000000..e0cac52a6b5d
--- /dev/null
+++ b/dev-qt/qtwebchannel/qtwebchannel-6.9.9999.ebuild
@@ -0,0 +1,27 @@
+# Copyright 2021-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit qt6-build
+
+DESCRIPTION="Qt WebChannel"
+
+if [[ ${QT6_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+fi
+
+IUSE="qml"
+
+RDEPEND="
+	~dev-qt/qtbase-${PV}:6[concurrent]
+	qml? ( ~dev-qt/qtdeclarative-${PV}:6 )
+"
+DEPEND="${RDEPEND}"
+
+src_configure() {
+	has_version "=dev-qt/qtdeclarative-$(ver_cut 1-3)*:6" && #913692
+		local mycmakeargs=( $(cmake_use_find_package qml Qt6Qml) )
+
+	qt6-build_src_configure
+}
diff --git a/dev-qt/qtwebengine/Manifest b/dev-qt/qtwebengine/Manifest
index eb79712f4c30..1a8740d58bdc 100644
--- a/dev-qt/qtwebengine/Manifest
+++ b/dev-qt/qtwebengine/Manifest
@@ -16,6 +16,7 @@ DIST qtwebengine-5.15.16_p20241115.tar.xz 301382752 BLAKE2B 08adfae6228a91f1f4b2
 DIST qtwebengine-6.7-patchset-11.tar.xz 10004 BLAKE2B 10d96134cd02ca4665f72369817f55e2bf0eb209b5d7c4f6131cd3a1be193940c62f656a65081c77ac0dd7aa7bdda76d6ff3f994f8f6c815b249a33b797a10c2 SHA512 198f19d9e20f146878a6050cde435f4662c0d42a6ed21650bfadaab217b2e369284a1a11e5a01d096d3af3f0b34fe24f9bdc0195d37f7f74076b862503bb6c9f
 DIST qtwebengine-6.7-patchset-13.tar.xz 8312 BLAKE2B 8483dff26fdc1479d72bf77d176bf747415be989889946bca96f9ddd1612ab2307afbea40fa908f5644893401bf62e4e334b48a3afe86c2028b13246905eae36 SHA512 546883aa8903bf34bc97d5a8d4d8fe39b55d059acab91fd2979b028c268ef30872a8e078ee5d9bca85f393d689010e937a3cdad421098629a8278e113f84fadd
 DIST qtwebengine-6.8-patchset-7.tar.xz 9096 BLAKE2B 58a95b198a6c8180a71a4365e7c2e3bee2d3798ecff18b01fe23e228a4ceafe2aae43088f503a98fa2d5097271ec442985d993fb24e1b2d2c09014b3309bef4d SHA512 489caa5f7cc3d3091e5896c2eb4d489a40fc220738c2240ec406928c7c948ab8962817024c2fbe3c393294e70ef6ce8c02e47964952a3656ff6ebf7908069fc3
+DIST qtwebengine-6.9-patchset-1.tar.xz 8660 BLAKE2B c7d5e8bff9122e57ebba7402bff9600f1ad7a56af3100f8b355b9b9ed72b30bd54a4ce838c408a0c393ee07f2881b8ea51a5d88b311e780d97f182ef45a219c0 SHA512 a175ff9c757c37b9c784cecd0ef01095b75fd663258965a6d3575ed620257eac4afe7551bfaf48f25a993d97e20e0fc9a73add9d3c56b1bfa4f470a240af00dd
 DIST qtwebengine-everywhere-src-6.7.2.tar.xz 550888844 BLAKE2B 2de049c9284583940bd1a9611a00c88a4f330a3b0bab8291d11296b8532d9f4e41be0d019045aca3d5983c3cfd6254d9e50c1133a497d03ef615fb74973e10f0 SHA512 5e1f65b5c0cecd62623ac386bbc89b1222f41b8c17cec1dd43851692d21f56e8b2dba45dab9405c33e88e1d1b24998d93dbcbf371a6504a1c8cdb1a6b5a94bf7
 DIST qtwebengine-everywhere-src-6.7.3.tar.xz 550988288 BLAKE2B e506e8bd950be478a9d0ecf69c66f7c56dab3c7a1503c5534f0ed5a770ed4d009935ca6905a1255701750cc8d5b790b895eb4f1d6f994ea8231d57c461c22da9 SHA512 f20769ac9b3f4a9fda9865c86d9dd2c779e404823d85aaf12cbbc425880352c19352ed39eb804a80a06a99e13582d22d45dbf2a8d7bbefea3592ff965b863cbe
 DIST qtwebengine-everywhere-src-6.8.1.tar.xz 566480152 BLAKE2B 6e4137f66363169ae0ab9014d0f60e0af0af70e310ecfa5770d9b73ddb0cb32cffc2a3b15ec89d390aeb323e5250d3ce42576ebd09f741a23b333c6bebc85a4a SHA512 1cab90353894032e23ccccb279e3d0b4269f049879e5033f979b15f28141fd2fb3cae2cd31812811f648ca5b6a115d14790506e07f44cb56475f5865360b0ea6
@@ -25,5 +26,6 @@ EBUILD qtwebengine-6.7.2.ebuild 10382 BLAKE2B 49f97cc56c893138694a3638bc83b2496c
 EBUILD qtwebengine-6.7.3.ebuild 9979 BLAKE2B 17fb965f42ceba78dea107944b68141281c164dd4a86d06cbe8f8a62281af044b84d9e249944aa9f0995610010a97ec55b152fda255545f48440be9852fa01c3 SHA512 b08934fba065e79143b804511e871eb32359290b8156343ebc27e019e65c36a4e6eeb1699f57b5b96980a5c52591e11386113913b900fddbb22a53357fccdf62
 EBUILD qtwebengine-6.8.1.ebuild 10122 BLAKE2B 5f915c0d9180d80008fcf1fc65edab42a25c18e9820387899584c04f5e4a4f15f006e9dd7e768d65abe3434daf532bbad1ceca4ecd45777a562ecb373cd761a5 SHA512 8ee62e39276b49ede884c74e9ee7b6578a303b3197413d01df9b64b86271544b46ffd30f8f141b0ce46a176892bbbfd4d84c8f809400d86cc7c68d98579ab9bd
 EBUILD qtwebengine-6.8.9999.ebuild 10076 BLAKE2B 24b8842f56bb9a8c6bb9e815bffbdf9001574d65c4bb30e6f75534ad0bcad1365c34e4e6e6d708ad94bd9d54a47de1cd966337845f4c3304aed103f16e2c3657 SHA512 5849fe56d76450bfafc9771df135be779c5544ff5e885fdc244011eccaa7d4260f25cc724e3288c3d0d5a50b98a40271a037bb99d270f4ceea6bce26368fec5e
-EBUILD qtwebengine-6.9999.ebuild 10027 BLAKE2B 0902b768824ccf3415c82a48672cf4d504531153c6cf8675f362d11eb4e06df6cd404f5dde2e3d693126d2df09f0c0f74929cc288fbcb75c3cdce244f2e527ee SHA512 a684514d47c6174aa3c457afc5e949d212b8f0ec9fda46e12c2830baceae5180303783c94430fd37d4c17f8d214dec4a70a4aa1f6b7a200a8bc5975d6bc6fa32
+EBUILD qtwebengine-6.9.9999.ebuild 10036 BLAKE2B cfa9a18602cbf9509698127b012beeb95780c38db593755d8479668d908fb24cb27f500d70cc9ef595159174f302ada3533f58cb7f03033772c8e42475d68a0f SHA512 589469f93c0343abd13f13db30afc14e2201f5e422440e9968195f386fbda5f38434d435248961f468bf92b9d06566c0d93097826f50df9cbb3fb69f9c8106dd
+EBUILD qtwebengine-6.9999.ebuild 10036 BLAKE2B cfa9a18602cbf9509698127b012beeb95780c38db593755d8479668d908fb24cb27f500d70cc9ef595159174f302ada3533f58cb7f03033772c8e42475d68a0f SHA512 589469f93c0343abd13f13db30afc14e2201f5e422440e9968195f386fbda5f38434d435248961f468bf92b9d06566c0d93097826f50df9cbb3fb69f9c8106dd
 MISC metadata.xml 1236 BLAKE2B 9a47d6cb2641ee53f22926095457c11f8da65a3705863a3ae0496d5bb656ac65acb744b5420deb95afee6ac9f141933b4f45690459e92c71089fe72727854a28 SHA512 9a640a386cc03804858fc02b24299896c03eff53a07db00862bab9d7dd259ca839e890921fcf222c8275cad16b418e423e7e485c03e74e01ab86979553251b4c
diff --git a/dev-qt/qtwebengine/qtwebengine-6.9.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-6.9.9999.ebuild
new file mode 100644
index 000000000000..0cfdb283eca5
--- /dev/null
+++ b/dev-qt/qtwebengine/qtwebengine-6.9.9999.ebuild
@@ -0,0 +1,327 @@
+# Copyright 2021-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..13} )
+PYTHON_REQ_USE="xml(+)"
+inherit check-reqs flag-o-matic multiprocessing optfeature
+inherit prefix python-any-r1 qt6-build toolchain-funcs
+
+DESCRIPTION="Library for rendering dynamic web content in Qt6 C++ and QML applications"
+SRC_URI+="
+	https://dev.gentoo.org/~ionen/distfiles/${PN}-6.9-patchset-1.tar.xz
+"
+
+if [[ ${QT6_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~arm64"
+fi
+
+IUSE="
+	accessibility +alsa bindist custom-cflags designer geolocation
+	+jumbo-build kerberos opengl pdfium pulseaudio qml screencast
+	+system-icu vaapi vulkan webdriver +widgets
+"
+REQUIRED_USE="
+	designer? ( qml widgets )
+"
+
+# dlopen: krb5, libva, pciutils, udev
+# gcc: for -latomic
+RDEPEND="
+	app-arch/snappy:=
+	dev-libs/expat
+	dev-libs/libevent:=
+	dev-libs/libxml2[icu]
+	dev-libs/libxslt
+	dev-libs/nspr
+	dev-libs/nss
+	~dev-qt/qtbase-${PV}:6[accessibility=,gui,opengl=,vulkan?,widgets?]
+	~dev-qt/qtdeclarative-${PV}:6[widgets?]
+	~dev-qt/qtwebchannel-${PV}:6[qml?]
+	media-libs/fontconfig
+	media-libs/freetype
+	media-libs/harfbuzz:=
+	media-libs/lcms:2
+	media-libs/libjpeg-turbo:=
+	media-libs/libpng:=
+	media-libs/libwebp:=
+	media-libs/mesa[gbm(+)]
+	media-libs/openjpeg:2=
+	media-libs/opus
+	media-libs/tiff:=
+	sys-apps/dbus
+	sys-apps/pciutils
+	sys-devel/gcc:*
+	sys-libs/zlib:=[minizip]
+	virtual/libudev
+	x11-libs/libX11
+	x11-libs/libXcomposite
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXrandr
+	x11-libs/libXtst
+	x11-libs/libdrm
+	x11-libs/libxcb:=
+	x11-libs/libxkbcommon
+	x11-libs/libxkbfile
+	alsa? ( media-libs/alsa-lib )
+	designer? ( ~dev-qt/qttools-${PV}:6[designer] )
+	geolocation? ( ~dev-qt/qtpositioning-${PV}:6 )
+	kerberos? ( virtual/krb5 )
+	opengl? ( media-libs/libglvnd[X] )
+	pulseaudio? ( media-libs/libpulse[glib] )
+	screencast? (
+		dev-libs/glib:2
+		media-video/pipewire:=
+	)
+	system-icu? ( dev-libs/icu:= )
+	vaapi? ( media-libs/libva:=[X] )
+"
+DEPEND="
+	${RDEPEND}
+	media-libs/libglvnd
+	x11-base/xorg-proto
+	x11-libs/libXcursor
+	x11-libs/libXi
+	x11-libs/libxshmfence
+	screencast? ( media-libs/libepoxy[egl(+)] )
+	vaapi? (
+		vulkan? ( dev-util/vulkan-headers )
+	)
+"
+BDEPEND="
+	$(python_gen_any_dep 'dev-python/html5lib[${PYTHON_USEDEP}]')
+	dev-util/gperf
+	net-libs/nodejs[ssl]
+	sys-devel/bison
+	sys-devel/flex
+"
+
+PATCHES=( "${WORKDIR}"/patches/${PN} )
+[[ ${PV} == 6.9999 ]] || # too fragile for 6.9999, but keep for 6.x.9999
+	PATCHES+=( "${WORKDIR}"/patches/chromium )
+
+PATCHES+=(
+	# add extras as needed here, may merge in set if carries across versions
+)
+
+python_check_deps() {
+	python_has_version "dev-python/html5lib[${PYTHON_USEDEP}]"
+}
+
+qtwebengine_check-reqs() {
+	[[ ${MERGE_TYPE} == binary ]] && return
+
+	if is-flagq '-g?(gdb)?([1-9])'; then #307861
+		ewarn
+		ewarn "Used CFLAGS/CXXFLAGS seem to enable debug info (-g or -ggdb), which"
+		ewarn "is non-trivial with ${PN}. May experience extended compilation"
+		ewarn "times, increased disk/memory usage, and potentially link failure."
+		ewarn
+		ewarn "If run into issues, please try disabling before reporting a bug."
+	fi
+
+	local CHECKREQS_DISK_BUILD=9G
+	local CHECKREQS_DISK_USR=360M
+
+	if ! has distcc ${FEATURES}; then #830661
+		# assume ~2GB per job or 1.5GB if clang, possible with less
+		# depending on free memory and *FLAGS, but prefer being safe as
+		# users having OOM issues with qtwebengine been rather common
+		tc-is-clang && : 15 || : 20
+		local CHECKREQS_MEMORY=$(($(makeopts_jobs)*_/10))G
+	fi
+
+	check-reqs_${EBUILD_PHASE_FUNC} #570534
+}
+
+pkg_pretend() {
+	qtwebengine_check-reqs
+}
+
+pkg_setup() {
+	qtwebengine_check-reqs
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	qt6-build_src_prepare
+
+	# for www-plugins/chrome-binary-plugins (widevine) search paths on prefix
+	hprefixify -w /Gentoo/ src/core/content_client_qt.cpp
+
+	# store chromium versions, only used in postinst for a warning
+	local chromium
+	mapfile -t chromium < CHROMIUM_VERSION || die
+	[[ ${chromium[1]} =~ ^Based.*:[^0-9]+([0-9.]+$) ]] &&
+		QT6_CHROMIUM_VER=${BASH_REMATCH[1]} || die
+	[[ ${chromium[2]} =~ ^Patched.+:[^0-9]+([0-9.]+$) ]] &&
+		QT6_CHROMIUM_PATCHES_VER=${BASH_REMATCH[1]} || die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		$(qt_feature pdfium qtpdf_build)
+		$(qt_feature qml qtpdf_quick_build)
+		$(qt_feature webdriver webenginedriver)
+		$(qt_feature widgets qtpdf_widgets_build)
+		$(usev pdfium -DQT_FEATURE_pdf_v8=ON)
+
+		-DQT_FEATURE_qtwebengine_build=ON
+		$(qt_feature qml qtwebengine_quick_build)
+		$(qt_feature widgets qtwebengine_widgets_build)
+
+		$(cmake_use_find_package designer Qt6Designer)
+
+		$(qt_feature alsa webengine_system_alsa)
+		$(qt_feature !bindist webengine_proprietary_codecs)
+		$(qt_feature geolocation webengine_geolocation)
+		$(qt_feature jumbo-build webengine_jumbo_build)
+		$(qt_feature kerberos webengine_kerberos)
+		$(qt_feature pulseaudio webengine_system_pulseaudio)
+		$(qt_feature screencast webengine_webrtc_pipewire)
+		$(qt_feature system-icu webengine_system_icu)
+		$(qt_feature vaapi webengine_vaapi)
+		$(qt_feature vulkan webengine_vulkan)
+		-DQT_FEATURE_webengine_embedded_build=OFF
+		-DQT_FEATURE_webengine_extensions=ON
+		# TODO: it may be possible to make x11 optional since 6.8+
+		-DQT_FEATURE_webengine_ozone_x11=ON
+		-DQT_FEATURE_webengine_pepper_plugins=ON
+		-DQT_FEATURE_webengine_printing_and_pdf=ON
+		-DQT_FEATURE_webengine_spellchecker=ON
+		-DQT_FEATURE_webengine_webchannel=ON
+		-DQT_FEATURE_webengine_webrtc=ON
+
+		# needs a modified ffmpeg to be usable, and even then it may not
+		# cooperate with new major ffmpeg versions (bug #831487)
+		-DQT_FEATURE_webengine_system_ffmpeg=OFF
+
+		# use bundled re2 to avoid complications, Qt has also disabled
+		# this by default in 6.7.3+ (bug #913923)
+		-DQT_FEATURE_webengine_system_re2=OFF
+
+		# system_libvpx=ON is intentionally ignored with USE=vaapi which leads
+		# to using system's being less tested, prefer disabling for now until
+		# vaapi can use it as well
+		-DQT_FEATURE_webengine_system_libvpx=OFF
+
+		# not necessary to pass these (default), but in case detection fails
+		# given qtbase's force_system_libs does not affect these right now
+		$(printf -- '-DQT_FEATURE_webengine_system_%s=ON ' \
+			freetype gbm glib harfbuzz lcms2 libevent libjpeg \
+			libopenjpeg2 libpci libpng libtiff libwebp libxml \
+			minizip opus snappy zlib)
+
+		# TODO: fixup gn cross, or package dev-qt/qtwebengine-gn with =ON
+		# (see also BUILD_ONLY_GN option added in 6.8+ for the latter)
+		-DINSTALL_GN=OFF
+	)
+
+	local mygnargs=(
+		# prefer no dlopen where possible
+		$(usev pulseaudio link_pulseaudio=true)
+		$(usev screencast rtc_link_pipewire=true)
+		# reduce default disk space usage
+		symbol_level=0
+	)
+
+	if use !custom-cflags; then
+		strip-flags # fragile
+
+		if is-flagq '-g?(gdb)?([2-9])'; then #914475
+			replace-flags '-g?(gdb)?([2-9])' -g1
+			ewarn "-g2+/-ggdb* *FLAGS replaced with -g1 (enable USE=custom-cflags to keep)"
+		fi
+
+		# Built helpers segfault when using (at least) -march=armv8-a+pauth
+		# (bug #920555, #920568 -- suspected gcc bug). For now, filter all
+		# for simplicity. Override with USE=custom-cflags if wanted, please
+		# report if above -march works again so can cleanup.
+		use arm64 && tc-is-gcc && filter-flags '-march=*' '-mcpu=*'
+	fi
+
+	export NINJAFLAGS=$(get_NINJAOPTS)
+	[[ ${NINJA_VERBOSE^^} == OFF ]] || NINJAFLAGS+=" -v"
+
+	local -x EXTRA_GN="${mygnargs[*]} ${EXTRA_GN}"
+	einfo "Extra Gn args: ${EXTRA_GN}"
+
+	qt6-build_src_configure
+}
+
+src_compile() {
+	# tentatively work around a possible (rare) race condition (bug #921680)
+	cmake_build WebEngineCore_sync_all_public_headers
+
+	cmake_src_compile
+}
+
+src_test() {
+	if [[ ${EUID} == 0 ]]; then
+		# almost every tests fail, so skip entirely
+		ewarn "Skipping tests due to running as root (chromium refuses this configuration)."
+		return
+	fi
+
+	local CMAKE_SKIP_TESTS=(
+		# fails with network sandbox
+		tst_certificateerror
+		tst_loadsignals
+		tst_qquickwebengineview
+		tst_qwebengineglobalsettings
+		tst_qwebengineview
+		# fails with offscreen rendering, may be worth retrying if the issue
+		# persist given these are rather major tests (or consider virtx)
+		tst_qmltests
+		tst_qwebenginepage
+		# certs verfication seems flaky and gives expiration warnings
+		tst_qwebengineclientcertificatestore
+		# test is misperformed when qtbase is built USE=-test?
+		tst_touchinput
+		# currently requires webenginedriver to be already installed
+		tst_webenginedriver
+	)
+
+	# prevent using the system's qtwebengine
+	# (use glob to avoid unnecessary complications with arch dir)
+	local resources=( "${BUILD_DIR}/src/core/${CMAKE_BUILD_TYPE}/"* )
+	[[ -d ${resources[0]} ]] || die "invalid resources path: ${resources[0]}"
+	local -x QTWEBENGINEPROCESS_PATH=${BUILD_DIR}${QT6_LIBEXECDIR#"${QT6_PREFIX}"}/QtWebEngineProcess
+	local -x QTWEBENGINE_LOCALES_PATH=${resources[0]}/qtwebengine_locales
+	local -x QTWEBENGINE_RESOURCES_PATH=${resources[0]}
+
+	# random failures in several tests without -j1
+	qt6-build_src_test -j1
+}
+
+src_install() {
+	qt6-build_src_install
+
+	[[ -e ${D}${QT6_LIBDIR}/libQt6WebEngineCore.so ]] || #601472
+		die "${CATEGORY}/${PF} failed to build anything. Please report to https://bugs.gentoo.org/"
+
+	if use test && use webdriver; then
+		rm -- "${D}${QT6_BINDIR}"/testbrowser || die
+	fi
+}
+
+pkg_postinst() {
+	# plugin may also be found in $HOME if provided by chrome or firefox
+	use amd64 &&
+		optfeature "Widevine DRM support (protected media playback)" \
+			www-plugins/chrome-binary-plugins
+
+	elog
+	elog "This version of Qt WebEngine is based on Chromium version ${QT6_CHROMIUM_VER}, with"
+	elog "additional security fixes up to ${QT6_CHROMIUM_PATCHES_VER}. Extensive as it is, the"
+	elog "list of backports is impossible to evaluate, but always bound to be behind"
+	elog "Chromium's release schedule."
+	elog
+	elog "In addition, various online services may deny service based on an outdated"
+	elog "user agent version (and/or other checks). Google is already known to do so."
+	elog
+	elog "tl;dr your web browsing experience will be compromised."
+}
diff --git a/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild
index fe2e1400e79f..0cfdb283eca5 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild
@@ -10,7 +10,7 @@ inherit prefix python-any-r1 qt6-build toolchain-funcs
 
 DESCRIPTION="Library for rendering dynamic web content in Qt6 C++ and QML applications"
 SRC_URI+="
-	https://dev.gentoo.org/~ionen/distfiles/${PN}-6.8-patchset-7.tar.xz
+	https://dev.gentoo.org/~ionen/distfiles/${PN}-6.9-patchset-1.tar.xz
 "
 
 if [[ ${QT6_BUILD_TYPE} == release ]]; then
@@ -70,6 +70,7 @@ RDEPEND="
 	designer? ( ~dev-qt/qttools-${PV}:6[designer] )
 	geolocation? ( ~dev-qt/qtpositioning-${PV}:6 )
 	kerberos? ( virtual/krb5 )
+	opengl? ( media-libs/libglvnd[X] )
 	pulseaudio? ( media-libs/libpulse[glib] )
 	screencast? (
 		dev-libs/glib:2
@@ -85,11 +86,7 @@ DEPEND="
 	x11-libs/libXcursor
 	x11-libs/libXi
 	x11-libs/libxshmfence
-	opengl? ( media-libs/libglvnd[X] )
 	screencast? ( media-libs/libepoxy[egl(+)] )
-	test? (
-		widgets? ( app-text/poppler[cxx(+)] )
-	)
 	vaapi? (
 		vulkan? ( dev-util/vulkan-headers )
 	)
@@ -212,10 +209,11 @@ src_configure() {
 		-DQT_FEATURE_webengine_system_libvpx=OFF
 
 		# not necessary to pass these (default), but in case detection fails
+		# given qtbase's force_system_libs does not affect these right now
 		$(printf -- '-DQT_FEATURE_webengine_system_%s=ON ' \
 			freetype gbm glib harfbuzz lcms2 libevent libjpeg \
 			libopenjpeg2 libpci libpng libtiff libwebp libxml \
-			minizip opus poppler snappy zlib)
+			minizip opus snappy zlib)
 
 		# TODO: fixup gn cross, or package dev-qt/qtwebengine-gn with =ON
 		# (see also BUILD_ONLY_GN option added in 6.8+ for the latter)
diff --git a/dev-qt/qtwebsockets/Manifest b/dev-qt/qtwebsockets/Manifest
index fe745a0cddac..2ae4f3e9ff67 100644
--- a/dev-qt/qtwebsockets/Manifest
+++ b/dev-qt/qtwebsockets/Manifest
@@ -11,5 +11,6 @@ EBUILD qtwebsockets-6.7.2.ebuild 559 BLAKE2B 9b2e30c6559234b0a5489a79a2dd6c3e627
 EBUILD qtwebsockets-6.7.3.ebuild 562 BLAKE2B 52b5c4c65aa3403e88c3cf67b1be12b54678fb52ba24c523afe6c4076e707abb3ba4f927930127dd25fe8ade14067ac26ec1d9e88910aff5b01f063773801fe1 SHA512 455b8f5b8c75b02da0f24373ca644cbd30e7f9acb805842ac93453c1cea7a6836b544ce41f1028ee8bbe5210c7ff92ab305018e2a9b19e0bb6f08d44de5439a8
 EBUILD qtwebsockets-6.8.1.ebuild 565 BLAKE2B f3004841e3c405268952ef54d638e45877056312d2ae1c8cf27da9cf6b0d6d56e1b4b2b564c93f808f04157b66c8fcd253c5a31cf2ab7770344ad39a17588327 SHA512 5ea0ac9173a0e46dc7869ea03ceb26daecbe62f09c1d3c1e75b0b5441b2b1a3d7983d126a3450f54b094f7ae0f31b9c358517cda054967284c88ad8e20923226
 EBUILD qtwebsockets-6.8.9999.ebuild 565 BLAKE2B f3004841e3c405268952ef54d638e45877056312d2ae1c8cf27da9cf6b0d6d56e1b4b2b564c93f808f04157b66c8fcd253c5a31cf2ab7770344ad39a17588327 SHA512 5ea0ac9173a0e46dc7869ea03ceb26daecbe62f09c1d3c1e75b0b5441b2b1a3d7983d126a3450f54b094f7ae0f31b9c358517cda054967284c88ad8e20923226
+EBUILD qtwebsockets-6.9.9999.ebuild 565 BLAKE2B f3004841e3c405268952ef54d638e45877056312d2ae1c8cf27da9cf6b0d6d56e1b4b2b564c93f808f04157b66c8fcd253c5a31cf2ab7770344ad39a17588327 SHA512 5ea0ac9173a0e46dc7869ea03ceb26daecbe62f09c1d3c1e75b0b5441b2b1a3d7983d126a3450f54b094f7ae0f31b9c358517cda054967284c88ad8e20923226
 EBUILD qtwebsockets-6.9999.ebuild 565 BLAKE2B f3004841e3c405268952ef54d638e45877056312d2ae1c8cf27da9cf6b0d6d56e1b4b2b564c93f808f04157b66c8fcd253c5a31cf2ab7770344ad39a17588327 SHA512 5ea0ac9173a0e46dc7869ea03ceb26daecbe62f09c1d3c1e75b0b5441b2b1a3d7983d126a3450f54b094f7ae0f31b9c358517cda054967284c88ad8e20923226
 MISC metadata.xml 597 BLAKE2B 9cd42a9c56fb752ea155093f8f9222b8abecc3219bc770c4746ac45bb5b741b829688d8363b2c3580125ac43a31420522ba83949534a0c16aef7386bb46648b3 SHA512 55df60c57864187551629b4f6d83803d29154d4c685b50151e89ce9aae733a6cb3a0930c482cdad40b1880904f9c2c0ec21483ac7b801932086ba0186dfeb1de
diff --git a/dev-qt/qtwebsockets/qtwebsockets-6.9.9999.ebuild b/dev-qt/qtwebsockets/qtwebsockets-6.9.9999.ebuild
new file mode 100644
index 000000000000..d7e808f49cf7
--- /dev/null
+++ b/dev-qt/qtwebsockets/qtwebsockets-6.9.9999.ebuild
@@ -0,0 +1,28 @@
+# Copyright 2021-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit qt6-build
+
+DESCRIPTION="Implementation of the WebSocket protocol for the Qt6 framework"
+
+if [[ ${QT6_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~x86"
+fi
+
+IUSE="qml +ssl"
+
+RDEPEND="
+	~dev-qt/qtbase-${PV}:6[network,ssl=]
+	qml? ( ~dev-qt/qtdeclarative-${PV}:6 )
+"
+DEPEND="${RDEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package qml Qt6Quick)
+	)
+
+	qt6-build_src_configure
+}
diff --git a/dev-qt/qtwebview/Manifest b/dev-qt/qtwebview/Manifest
index 65316615d554..43ad809c0605 100644
--- a/dev-qt/qtwebview/Manifest
+++ b/dev-qt/qtwebview/Manifest
@@ -9,5 +9,6 @@ EBUILD qtwebview-6.7.2.ebuild 424 BLAKE2B 86e3c7fd77a21cf01d75f05ca479c626ff1c7e
 EBUILD qtwebview-6.7.3.ebuild 425 BLAKE2B 1981b2967573ff46eb5bfb76e36cb5323a257f29e9da79cdabac49fd7d97a60a599cb42eb1e513b92486ddc54b3c6338c6e18fa01be87c25742516d0972b2368 SHA512 f253c1ac1141728be6ef6100385400dff4075c6ce41d11687af432979abed8d778bc0904406dd1e2509239309000ed9b83b12dd6d5c9fe22d4f269334e0fcfab
 EBUILD qtwebview-6.8.1.ebuild 426 BLAKE2B 1b0f16550615267fb19493899bfd98a16be579edc184bb007eb2109d40b940d15cb0d1bcde3c8675dcabcfa1c4e74435648b1ebd9913a81baad3b0faf0615050 SHA512 1b13e77465674b5885adb9416dce839bb9e3f6342c0c2eac633f7a8beb0f96f82ac5a43d7fdf59be4ef37449841a0a89d00e5ee0a2e0b5b8d093388ac23544f2
 EBUILD qtwebview-6.8.9999.ebuild 426 BLAKE2B 1b0f16550615267fb19493899bfd98a16be579edc184bb007eb2109d40b940d15cb0d1bcde3c8675dcabcfa1c4e74435648b1ebd9913a81baad3b0faf0615050 SHA512 1b13e77465674b5885adb9416dce839bb9e3f6342c0c2eac633f7a8beb0f96f82ac5a43d7fdf59be4ef37449841a0a89d00e5ee0a2e0b5b8d093388ac23544f2
+EBUILD qtwebview-6.9.9999.ebuild 426 BLAKE2B 1b0f16550615267fb19493899bfd98a16be579edc184bb007eb2109d40b940d15cb0d1bcde3c8675dcabcfa1c4e74435648b1ebd9913a81baad3b0faf0615050 SHA512 1b13e77465674b5885adb9416dce839bb9e3f6342c0c2eac633f7a8beb0f96f82ac5a43d7fdf59be4ef37449841a0a89d00e5ee0a2e0b5b8d093388ac23544f2
 EBUILD qtwebview-6.9999.ebuild 426 BLAKE2B 1b0f16550615267fb19493899bfd98a16be579edc184bb007eb2109d40b940d15cb0d1bcde3c8675dcabcfa1c4e74435648b1ebd9913a81baad3b0faf0615050 SHA512 1b13e77465674b5885adb9416dce839bb9e3f6342c0c2eac633f7a8beb0f96f82ac5a43d7fdf59be4ef37449841a0a89d00e5ee0a2e0b5b8d093388ac23544f2
 MISC metadata.xml 534 BLAKE2B e41cc4c8e50d8d207559d68b8a9dc1d7a8c3afd218a28279163c917b24ac6b814361838a54c2b2256b13c0a1d1fbce4809c4f0c526d2fe576763cbed4ba33b6f SHA512 9ba885a1ccff4733d0ba510e4042d5f03a24ee9ac3f8b4cb89ad4b37fe3596fc5ec7f4786798397c58cf34ca82c40ce45d772ffde8be5cc9423428cb4aa19f8e
diff --git a/dev-qt/qtwebview/qtwebview-6.9.9999.ebuild b/dev-qt/qtwebview/qtwebview-6.9.9999.ebuild
new file mode 100644
index 000000000000..76539b793b79
--- /dev/null
+++ b/dev-qt/qtwebview/qtwebview-6.9.9999.ebuild
@@ -0,0 +1,19 @@
+# Copyright 2023-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit qt6-build
+
+DESCRIPTION="Module for displaying web content in a QML application using the Qt6 framework"
+
+if [[ ${QT6_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~arm64"
+fi
+
+RDEPEND="
+	~dev-qt/qtbase-${PV}:6[gui]
+	~dev-qt/qtdeclarative-${PV}:6
+	~dev-qt/qtwebengine-${PV}:6[qml]
+"
+DEPEND="${RDEPEND}"