gentoo auto-resync : 30:03:2024 - 01:13:30

65 files changed, 57 insertions, 1829 deletions

diff --git a/dev-qt/Manifest.gz b/dev-qt/Manifest.gz
index 04e75b92947c..f33c907e464f 100644
--- a/dev-qt/Manifest.gz
+++ b/dev-qt/Manifest.gz
diff --git a/dev-qt/qt3d/Manifest b/dev-qt/qt3d/Manifest
index bf0f5e14895f..d76b4df8df49 100644
--- a/dev-qt/qt3d/Manifest
+++ b/dev-qt/qt3d/Manifest
@@ -7,7 +7,6 @@ EBUILD qt3d-5.15.12.ebuild 948 BLAKE2B 398c6ec0d38bca086daab3d2cae7a7afe107f977b
 EBUILD qt3d-5.15.13.ebuild 951 BLAKE2B 6d5016d88ea292c22bb6f2e187daf8896a7cc2ce2458c99301fbc9091c0d5af57b2609f0a51fc0c66fb435b6441876b47d7357a1a7b6c7d0652f0717e00c8d1f SHA512 0abe4328044aed143e7c1a481b91c2415b7b2ec29f50a4232fc0b94d7f20bd86eedc0dcc504d61c23d06a6601eecadd88f049a6dcde25cf46aeb73dac47d5b6a
 EBUILD qt3d-6.6.2.ebuild 758 BLAKE2B f462d0705433bc88c2d86b19d361ea24c948d0c076365f8b7718b0fddd86aa9b49d76229ca960f7a99aa6f147ce7f1683885341be57ca8c5c3266f248a995977 SHA512 94aaf7f9a89b8639d59852efd27f8c185f411f42dfa08cbbebd8ded5f3777ab7a53343d2f0d94823950d5754affae4fafebc0c70e23011c0d0459100391d40e2
 EBUILD qt3d-6.6.3.ebuild 816 BLAKE2B 04a754865fa8c12e00ede1c171995c7059b2e7b0ee7faabeed56367a871da34cb0b055c196cd02bc215347bb2682fd51144eb67011adca572924ae1824d87b72 SHA512 eb88402a455bbc355d7a98b7b83f782af7d62fae95e4303912ea0f4771f39bac3028bcd15deeee4720288b7229d3d262b30581a52ffadd75535f4e6fae55cc01
-EBUILD qt3d-6.6.9999.ebuild 799 BLAKE2B 5aba1c30e3523badf5b6bd3a6d4433c6f926fe06ea0ad69e0d39f367b523cc3aa02f96c1a5bb38275b32ed3a2a991f2648014d24f71af367344154be25401b03 SHA512 2d91c5a919dc32c104c4b7c2b692c6423a1419b148b8fb2dd5b16d32a377ffcf9cc6212ba42cb2a8d7b85166d3f4fd6f20195f909f82f5025550846daa975614
 EBUILD qt3d-6.7.0_rc2.ebuild 799 BLAKE2B 5aba1c30e3523badf5b6bd3a6d4433c6f926fe06ea0ad69e0d39f367b523cc3aa02f96c1a5bb38275b32ed3a2a991f2648014d24f71af367344154be25401b03 SHA512 2d91c5a919dc32c104c4b7c2b692c6423a1419b148b8fb2dd5b16d32a377ffcf9cc6212ba42cb2a8d7b85166d3f4fd6f20195f909f82f5025550846daa975614
 EBUILD qt3d-6.7.9999.ebuild 799 BLAKE2B 5aba1c30e3523badf5b6bd3a6d4433c6f926fe06ea0ad69e0d39f367b523cc3aa02f96c1a5bb38275b32ed3a2a991f2648014d24f71af367344154be25401b03 SHA512 2d91c5a919dc32c104c4b7c2b692c6423a1419b148b8fb2dd5b16d32a377ffcf9cc6212ba42cb2a8d7b85166d3f4fd6f20195f909f82f5025550846daa975614
 EBUILD qt3d-6.9999.ebuild 799 BLAKE2B 5aba1c30e3523badf5b6bd3a6d4433c6f926fe06ea0ad69e0d39f367b523cc3aa02f96c1a5bb38275b32ed3a2a991f2648014d24f71af367344154be25401b03 SHA512 2d91c5a919dc32c104c4b7c2b692c6423a1419b148b8fb2dd5b16d32a377ffcf9cc6212ba42cb2a8d7b85166d3f4fd6f20195f909f82f5025550846daa975614
diff --git a/dev-qt/qt3d/qt3d-6.6.9999.ebuild b/dev-qt/qt3d/qt3d-6.6.9999.ebuild
deleted file mode 100644
index cfb594779d2b..000000000000
--- a/dev-qt/qt3d/qt3d-6.6.9999.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# 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"
-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
-		-DQT_UNITY_BUILD=OFF # fails to build
-	)
-
-	qt6-build_src_configure
-}
diff --git a/dev-qt/qt5compat/Manifest b/dev-qt/qt5compat/Manifest
index 9c58bb46a51d..4db6bf9d019d 100644
--- a/dev-qt/qt5compat/Manifest
+++ b/dev-qt/qt5compat/Manifest
@@ -3,7 +3,6 @@ DIST qt5compat-everywhere-src-6.6.3.tar.xz 14634848 BLAKE2B 6178a4c95786c968cee8
 DIST qt5compat-everywhere-src-6.7.0-rc2.tar.xz 14633604 BLAKE2B e7dcb34d38af5fe3eea0a242ec08bfd61456fb28bdf16e93e639f301d2850ee7ed0a18b8d0c1bce65e277a92b55ad311cac55eaf5517aa5024cbef1cd31c97ec SHA512 8b21b96bfb274f671f4de840c965db7affde02ddce6b033c69d2b3bf45c4dd65349d35964143262dc1e0b2cafbc5f9637c9900cf7ce6237896aaf9fa284ae7a1
 EBUILD qt5compat-6.6.2.ebuild 704 BLAKE2B 3ce34bc419a1dacd9429ad76ec7bcc2fa7fdb7edfd5a9081fbec6e6dae5fba209fff8a82c53801cf89c314f8742eccae3c0a9cb4c394b2eae513102753a76476 SHA512 524ec5bfd3b9a757eb58ab0f7d9f9484e97e566c81b42ff5852554ea0658320f6094b7e6246cb2183576c12ea7e3ae1c774c2f4389329271819708ffea097b7e
 EBUILD qt5compat-6.6.3.ebuild 706 BLAKE2B cde702b26ce3213329e1e6ee6030feef199a81cd89725f65aaf5c350da27de100e5cb1592065c11ce40bb2396b80b9053b56503aa6bdc13baa38774a1788823c SHA512 20c6f09f176449d81646a8d576db355544f4093f24be2ef970bf83d55d2eda867c21e027985fcd309deacda4fad4e6741815ab7b20787f017e5f68d84fffacbf
-EBUILD qt5compat-6.6.9999.ebuild 706 BLAKE2B cde702b26ce3213329e1e6ee6030feef199a81cd89725f65aaf5c350da27de100e5cb1592065c11ce40bb2396b80b9053b56503aa6bdc13baa38774a1788823c SHA512 20c6f09f176449d81646a8d576db355544f4093f24be2ef970bf83d55d2eda867c21e027985fcd309deacda4fad4e6741815ab7b20787f017e5f68d84fffacbf
 EBUILD qt5compat-6.7.0_rc2.ebuild 706 BLAKE2B cde702b26ce3213329e1e6ee6030feef199a81cd89725f65aaf5c350da27de100e5cb1592065c11ce40bb2396b80b9053b56503aa6bdc13baa38774a1788823c SHA512 20c6f09f176449d81646a8d576db355544f4093f24be2ef970bf83d55d2eda867c21e027985fcd309deacda4fad4e6741815ab7b20787f017e5f68d84fffacbf
 EBUILD qt5compat-6.7.9999.ebuild 706 BLAKE2B cde702b26ce3213329e1e6ee6030feef199a81cd89725f65aaf5c350da27de100e5cb1592065c11ce40bb2396b80b9053b56503aa6bdc13baa38774a1788823c SHA512 20c6f09f176449d81646a8d576db355544f4093f24be2ef970bf83d55d2eda867c21e027985fcd309deacda4fad4e6741815ab7b20787f017e5f68d84fffacbf
 EBUILD qt5compat-6.9999.ebuild 706 BLAKE2B cde702b26ce3213329e1e6ee6030feef199a81cd89725f65aaf5c350da27de100e5cb1592065c11ce40bb2396b80b9053b56503aa6bdc13baa38774a1788823c SHA512 20c6f09f176449d81646a8d576db355544f4093f24be2ef970bf83d55d2eda867c21e027985fcd309deacda4fad4e6741815ab7b20787f017e5f68d84fffacbf
diff --git a/dev-qt/qt5compat/qt5compat-6.6.9999.ebuild b/dev-qt/qt5compat/qt5compat-6.6.9999.ebuild
deleted file mode 100644
index 4462f312f154..000000000000
--- a/dev-qt/qt5compat/qt5compat-6.6.9999.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# 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 6861af9a66b8..a980fdeb9a8b 100644
--- a/dev-qt/qtbase/Manifest
+++ b/dev-qt/qtbase/Manifest
@@ -9,7 +9,6 @@ DIST qtbase-everywhere-src-6.6.3.tar.xz 48784716 BLAKE2B f79e369c31968d026fb50dd
 DIST qtbase-everywhere-src-6.7.0-rc2.tar.xz 49307632 BLAKE2B ffae9f9f93cef3f72b89d3cd4c09ca3927fa2341efe49d485e979cf70480ad6fd82578776cb44f1df6fcb3f03dafb3a4883d45966af1b01f3b6b05d4e02f658d SHA512 72f06ea8a2329b790398a7fe899d3ee851fcb719d9b81073db5705500b478bb96b283b0eac0bdc9c3f0f0ef302ba287ce0e987a98dba76e29d72e5f296e54332
 EBUILD qtbase-6.6.2-r1.ebuild 10021 BLAKE2B 6ae2a9a7936ef546aed4d69172e0a7ed2e9f55e41679f6b1acb2d8a8c3494f4659bbf3168e97b447bd73a3c845a32f9f3a70e143c4734338e20d76f621f33926 SHA512 0a57aab7621c5415e8172f74c6d240118df5202643f78de00f407f7308c89794ab60560b1e52c49583928c7da4bffa3d4fbf5f5f126b069033d096536c95acfe
 EBUILD qtbase-6.6.3.ebuild 10104 BLAKE2B efd01d5b0328345c6023495c3ee052eadeffc04b4719c849fdc2555f35ab14789b8724ba571fa204eeb16551d694601d12b068084c374986c40da806cd5831f5 SHA512 8b920b523bc7f636fb26a770d9217c9c48d717e93f7801d83e8276655b5e241029556c26c9ca6d5a5c624c8798d41efb692047e6f26d6bd38e802baed5cda2b7
-EBUILD qtbase-6.6.9999.ebuild 10104 BLAKE2B efd01d5b0328345c6023495c3ee052eadeffc04b4719c849fdc2555f35ab14789b8724ba571fa204eeb16551d694601d12b068084c374986c40da806cd5831f5 SHA512 8b920b523bc7f636fb26a770d9217c9c48d717e93f7801d83e8276655b5e241029556c26c9ca6d5a5c624c8798d41efb692047e6f26d6bd38e802baed5cda2b7
 EBUILD qtbase-6.7.0_rc2-r1.ebuild 10469 BLAKE2B 0bb3dd926ef658a36feb141ac462fb7b116c8d491db1887671b862cab1e9814ebe7bd2cac5688447c6e21b26a3701ce4f21eb576f1992bd8e174d46f58220b1a SHA512 0e3c0535a25cddfc93dbe2274164fe0559df45adbb4c32a49c12fb2e542fdddd643d88349835fcf90b1a20ec4790a53518c35ccaf51019ffb58ff86e0dd2b860
 EBUILD qtbase-6.7.9999.ebuild 10469 BLAKE2B 0bb3dd926ef658a36feb141ac462fb7b116c8d491db1887671b862cab1e9814ebe7bd2cac5688447c6e21b26a3701ce4f21eb576f1992bd8e174d46f58220b1a SHA512 0e3c0535a25cddfc93dbe2274164fe0559df45adbb4c32a49c12fb2e542fdddd643d88349835fcf90b1a20ec4790a53518c35ccaf51019ffb58ff86e0dd2b860
 EBUILD qtbase-6.9999.ebuild 10469 BLAKE2B 0bb3dd926ef658a36feb141ac462fb7b116c8d491db1887671b862cab1e9814ebe7bd2cac5688447c6e21b26a3701ce4f21eb576f1992bd8e174d46f58220b1a SHA512 0e3c0535a25cddfc93dbe2274164fe0559df45adbb4c32a49c12fb2e542fdddd643d88349835fcf90b1a20ec4790a53518c35ccaf51019ffb58ff86e0dd2b860
diff --git a/dev-qt/qtbase/qtbase-6.6.9999.ebuild b/dev-qt/qtbase/qtbase-6.6.9999.ebuild
deleted file mode 100644
index 40a65fab575d..000000000000
--- a/dev-qt/qtbase/qtbase-6.6.9999.ebuild
+++ /dev/null
@@ -1,368 +0,0 @@
-# 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"
-	[modules]="+concurrent +dbus +gui +network +sql +xml"
-
-	[gui]="
-		+X accessibility eglfs evdev gles2-only +libinput
-		opengl tslib vulkan +widgets
-	"
-	[network]="brotli gssapi libproxy sctp"
-	[sql]="mysql oci8 odbc postgres +sqlite"
-	[widgets]="cups gtk"
-
-	[optfeature]="nls wayland" #810802,864509
-)
-IUSE="${QT6_IUSE[*]}"
-REQUIRED_USE="
-	$(
-		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)
-RDEPEND="
-	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:= )
-
-	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?] )
-		)
-		tslib? ( x11-libs/tslib )
-		widgets? (
-			cups? ( net-print/cups )
-			gtk? (
-				x11-libs/gdk-pixbuf:2
-				x11-libs/gtk+:3
-				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 )
-	)
-"
-DEPEND="
-	${RDEPEND}
-	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-glx.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
-	fi
-}
-
-src_configure() {
-	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_relocatable=OFF #927691
-		$(qt_feature ssl openssl)
-		$(qt_feature ssl openssl_linked)
-		$(qt_feature udev libudev)
-		$(qt_feature zstd)
-
-		# qtcore
-		$(qt_feature icu)
-
-		# 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)
-	)
-
-	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 tslib)
-		$(qt_feature vulkan)
-		$(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)
-	)
-
-	if use amd64 || use x86; then
-		# see bug #913400 for explanations
-		local cpufeats=(
-			# list of checked cpu features in configure.cmake
-			avx avx2 avx512{bw,cd,dq,er,f,ifma,pf,vbmi,vbmi2,vl}
-			f16c rdrnd rdseed sse2 sse3 sse4_1 sse4_2 ssse3 vaes
-		)
-		# handle odd ones out not matching -m* and macros (keep same order)
-		local cpuflags=( "${cpufeats[@]}" aes sha )
-		local cpufeats+=( aesni shani )
-
-		local -a intrins
-		IFS=' ' read -ra intrins < <(
-			: "$(test-flags-CXX "${cpuflags[@]/#/-m}")"
-			$(tc-getCXX) -E -P ${_} ${CXXFLAGS} ${CPPFLAGS} - <<-EOF | tail -n 1
-				$(printf '__%s__ ' "${cpuflags[@]^^}")
-			EOF
-			assert
-		)
-
-		# do nothing and leave to qtbase if no macros expanded (test failed?)
-		if [[ \ ${intrins[*]} == *\ [^_\ ]* ]]; then
-			local -i i
-			for ((i=0; i<${#cpufeats[@]}; i++)); do
-				[[ ${intrins[i]} == __* ]] &&
-					mycmakeargs+=( -DQT_FEATURE_${cpufeats[i]}=OFF )
-			done
-			mycmakeargs+=( -DTEST_x86intrin=ON )
-		fi
-	fi
-
-	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_qtimer
-		# 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_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_qprocess
-			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/qtcharts/Manifest b/dev-qt/qtcharts/Manifest
index a946f1817c23..e7e0e7db4798 100644
--- a/dev-qt/qtcharts/Manifest
+++ b/dev-qt/qtcharts/Manifest
@@ -7,7 +7,6 @@ EBUILD qtcharts-5.15.12.ebuild 572 BLAKE2B 4a97d46f334a3dd2713d3a5727a5136de4f2c
 EBUILD qtcharts-5.15.13.ebuild 577 BLAKE2B 2423e17222a0c35d5d6d051c0bfbcd2c3cccedb9519ed5b32bf95f80cc6983d2373bb0429cd5a8c2fb970759e47a4dfb6744ae9a68c1b8e14818052b206af226 SHA512 0482b223a5fe4f4ce26a42d4cd1fc1e36842befa02fc3dd7cd1c25f5b14f45eec6c3e7c34b42a74396b9e7f60b46548289e943526a2cf4165eb4110efd251a5b
 EBUILD qtcharts-6.6.2.ebuild 570 BLAKE2B 98b620f6328ba26d55e1814c753b4284b519a4dbe11da9556ad857de5d2935887aa455c3be8910620bef275d737c812d9f091f1c960d6c063224d776d9948bcf SHA512 8b838d6905728e8737e4f60e0b996e102b08d0d273ed970c9b671db8c97934e4f041b9ea53d25803e15ac7db216044c2cf99ed6327a203fa63f32929d23c152a
 EBUILD qtcharts-6.6.3.ebuild 572 BLAKE2B 2a66f1efed7d379f9ccf64644560d8058b4ff0e93891f70aeb05f83d908f0ceb7f6dbca008c34fc097bc3460ce9a08a91c85abb43de57b8b537f4c05b18d415c SHA512 5f42c00286e8efb41b97e5ccc609f0390d7f75cd8c1c6744f89c248e6e22d2b5cb69a4064c21b010ca3ad684ac2cfa24ddb374065b8334276f2f03036bcdf215
-EBUILD qtcharts-6.6.9999.ebuild 572 BLAKE2B 2a66f1efed7d379f9ccf64644560d8058b4ff0e93891f70aeb05f83d908f0ceb7f6dbca008c34fc097bc3460ce9a08a91c85abb43de57b8b537f4c05b18d415c SHA512 5f42c00286e8efb41b97e5ccc609f0390d7f75cd8c1c6744f89c248e6e22d2b5cb69a4064c21b010ca3ad684ac2cfa24ddb374065b8334276f2f03036bcdf215
 EBUILD qtcharts-6.7.0_rc2.ebuild 572 BLAKE2B 2a66f1efed7d379f9ccf64644560d8058b4ff0e93891f70aeb05f83d908f0ceb7f6dbca008c34fc097bc3460ce9a08a91c85abb43de57b8b537f4c05b18d415c SHA512 5f42c00286e8efb41b97e5ccc609f0390d7f75cd8c1c6744f89c248e6e22d2b5cb69a4064c21b010ca3ad684ac2cfa24ddb374065b8334276f2f03036bcdf215
 EBUILD qtcharts-6.7.9999.ebuild 572 BLAKE2B 2a66f1efed7d379f9ccf64644560d8058b4ff0e93891f70aeb05f83d908f0ceb7f6dbca008c34fc097bc3460ce9a08a91c85abb43de57b8b537f4c05b18d415c SHA512 5f42c00286e8efb41b97e5ccc609f0390d7f75cd8c1c6744f89c248e6e22d2b5cb69a4064c21b010ca3ad684ac2cfa24ddb374065b8334276f2f03036bcdf215
 EBUILD qtcharts-6.9999.ebuild 572 BLAKE2B 2a66f1efed7d379f9ccf64644560d8058b4ff0e93891f70aeb05f83d908f0ceb7f6dbca008c34fc097bc3460ce9a08a91c85abb43de57b8b537f4c05b18d415c SHA512 5f42c00286e8efb41b97e5ccc609f0390d7f75cd8c1c6744f89c248e6e22d2b5cb69a4064c21b010ca3ad684ac2cfa24ddb374065b8334276f2f03036bcdf215
diff --git a/dev-qt/qtcharts/qtcharts-6.6.9999.ebuild b/dev-qt/qtcharts/qtcharts-6.6.9999.ebuild
deleted file mode 100644
index 264ac86f8886..000000000000
--- a/dev-qt/qtcharts/qtcharts-6.6.9999.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# 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 f5adc9783344..a368ea57e7d2 100644
--- a/dev-qt/qtconnectivity/Manifest
+++ b/dev-qt/qtconnectivity/Manifest
@@ -3,7 +3,6 @@ DIST qtconnectivity-everywhere-src-6.6.3.tar.xz 1060952 BLAKE2B d16e79be7cdd22c8
 DIST qtconnectivity-everywhere-src-6.7.0-rc2.tar.xz 1061232 BLAKE2B 33489b5d433d7aacb7a4936dc5771b3d36db4b4856b65cce53fe510d08541fd10c0f70da128cb428137b39aaaf1425828835ba9f15366f84501f237dc702c23a SHA512 d36b52cb6dfcffadd5f306cc78ca2c5056280710396fc693a59f8b4a853e13fcbb1b08596a30c62a62a6eed4b877f2a0292a1e47cf7c02b79e858ceb71de484e
 EBUILD qtconnectivity-6.6.2.ebuild 1664 BLAKE2B 5fac739b5e156cee0e4789b3178f1663a3862a34c9db7be9c8a69ea1fa6d8a17d6436720bba1873adf91b64618412bb9e148250abaa0b9e3efa340c2c160b308 SHA512 69f56d6914a0b604ae8e6f893d20ff70d66849252d98c8bf8ce0e844f617cf24009e890d33f3582e339448bcf01ecab00ec9dc1f1774997020d1d1323ec3d715
 EBUILD qtconnectivity-6.6.3.ebuild 1683 BLAKE2B c94145ac24b7545954637500dccde31df3584699c47893efd00866c3d255460a4021c881b68dd448f4156ff9f0ff54eef8461a9ab478bbed9ee875c848148a11 SHA512 bbcba9e6c26ec4afc5a839e436779d95fb7d19bdc300858047240dceb7c5b253295d3f2193b581c87c1c878a409e2c34276458928990cb45b167bbe89f6a26d3
-EBUILD qtconnectivity-6.6.9999.ebuild 1666 BLAKE2B 5c2c31dafb2a1fcd93143486fcfb957fff941bbead38ebb5e4500220257b3d51795a076e7511a08e4256fcd51756041afd4f4164fc2b1d31fa2d5336b362c557 SHA512 6071e64cd2149e2007618a565920589a6c3f1bc11fe8ecda179bde7afe84680cd22ab39253cabd87a61e7720f8e7b9f20332b07dec366360ca1e2d9ce8ed08b3
 EBUILD qtconnectivity-6.7.0_rc2.ebuild 1666 BLAKE2B 5c2c31dafb2a1fcd93143486fcfb957fff941bbead38ebb5e4500220257b3d51795a076e7511a08e4256fcd51756041afd4f4164fc2b1d31fa2d5336b362c557 SHA512 6071e64cd2149e2007618a565920589a6c3f1bc11fe8ecda179bde7afe84680cd22ab39253cabd87a61e7720f8e7b9f20332b07dec366360ca1e2d9ce8ed08b3
 EBUILD qtconnectivity-6.7.9999.ebuild 1666 BLAKE2B 5c2c31dafb2a1fcd93143486fcfb957fff941bbead38ebb5e4500220257b3d51795a076e7511a08e4256fcd51756041afd4f4164fc2b1d31fa2d5336b362c557 SHA512 6071e64cd2149e2007618a565920589a6c3f1bc11fe8ecda179bde7afe84680cd22ab39253cabd87a61e7720f8e7b9f20332b07dec366360ca1e2d9ce8ed08b3
 EBUILD qtconnectivity-6.9999.ebuild 1666 BLAKE2B 5c2c31dafb2a1fcd93143486fcfb957fff941bbead38ebb5e4500220257b3d51795a076e7511a08e4256fcd51756041afd4f4164fc2b1d31fa2d5336b362c557 SHA512 6071e64cd2149e2007618a565920589a6c3f1bc11fe8ecda179bde7afe84680cd22ab39253cabd87a61e7720f8e7b9f20332b07dec366360ca1e2d9ce8ed08b3
diff --git a/dev-qt/qtconnectivity/qtconnectivity-6.6.9999.ebuild b/dev-qt/qtconnectivity/qtconnectivity-6.6.9999.ebuild
deleted file mode 100644
index ee563938e4e6..000000000000
--- a/dev-qt/qtconnectivity/qtconnectivity-6.6.9999.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# 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 ~arm64 ~loong"
-fi
-
-IUSE="+bluetooth nfc smartcard"
-REQUIRED_USE="|| ( bluetooth nfc )"
-
-RDEPEND="
-	~dev-qt/qtbase-${PV}:6[network]
-	bluetooth? (
-		~dev-qt/qtbase-${PV}:6[dbus]
-		net-wireless/bluez:=
-	)
-	nfc? (
-		smartcard? ( sys-apps/pcsc-lite )
-	)
-"
-DEPEND="${RDEPEND}"
-
-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_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 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 3da52f02ea09..31573c7091dc 100644
--- a/dev-qt/qtdeclarative/Manifest
+++ b/dev-qt/qtdeclarative/Manifest
@@ -10,8 +10,7 @@ EBUILD qtdeclarative-5.15.12.ebuild 1537 BLAKE2B c2f7b010977ed65abbe16d8b2df6ed8
 EBUILD qtdeclarative-5.15.13.ebuild 1543 BLAKE2B dd04805055ecfadb16b1fca06faae6b47ad22858da8612c9bb481b5485a118ffa307021f9725d9987a5e28ec0e5b470b20871283fc7fd893e4b12cfeaebc9523 SHA512 8ac580e433a19c26102e33bc2ecc2aa8165bec9c7b77755d8fab75d2270753e4a4652726a6d871ca5e6fed8606540aa4d08c5cac8a8f354f596cf2147f39921c
 EBUILD qtdeclarative-6.6.2-r1.ebuild 800 BLAKE2B b072059836526c122e5e0a509418d73f612093575910747097201b0abfbdc2a7dfc44a91d5317dfdd41631d9a5bc247d765ef31e343e6a914d2a18633edd43b4 SHA512 f82b798eab8b99c4ad8a876277cfb9248cdeefd759ec0c881cce8319a1deca39ca9d733e1e124d78b8f25807f998bc77225a7967712c9eb1018abae49b6da71b
 EBUILD qtdeclarative-6.6.3.ebuild 802 BLAKE2B 92a135165b8b86da55f61130e08e93078c056d11757d2ffc4900f2bc8501faeb3269d68b1224aafab7d79b1a5e0c7dbcaf3f9161bcf84bc95b1e65161bd83c4a SHA512 5bd5b83717179ece75d9cf913fcd98c091523cec4d1efd4f07ce667ffaa0e4721bd32b72577ef1489e506c6b0f9808855f9cbea4c30717e679e4a1ba70c393e5
-EBUILD qtdeclarative-6.6.9999.ebuild 802 BLAKE2B 92a135165b8b86da55f61130e08e93078c056d11757d2ffc4900f2bc8501faeb3269d68b1224aafab7d79b1a5e0c7dbcaf3f9161bcf84bc95b1e65161bd83c4a SHA512 5bd5b83717179ece75d9cf913fcd98c091523cec4d1efd4f07ce667ffaa0e4721bd32b72577ef1489e506c6b0f9808855f9cbea4c30717e679e4a1ba70c393e5
 EBUILD qtdeclarative-6.7.0_rc2.ebuild 954 BLAKE2B f85a042c94d921a79ac8d1b86b78c9b9fc248bb88f97de7a5ea4c71a88c36231a93e7fdf7e9632accc71dc1a838490966c9ab5b021e480b19f944e942f70dfce SHA512 bf9817a86fa308ea76c777171c5c29126add4380f7e6368e16137b4781b473a6083ff800613144e8b55b95235ef53c237d07fe1d08fcce1ca752c6df353aa3bc
-EBUILD qtdeclarative-6.7.9999.ebuild 954 BLAKE2B f85a042c94d921a79ac8d1b86b78c9b9fc248bb88f97de7a5ea4c71a88c36231a93e7fdf7e9632accc71dc1a838490966c9ab5b021e480b19f944e942f70dfce SHA512 bf9817a86fa308ea76c777171c5c29126add4380f7e6368e16137b4781b473a6083ff800613144e8b55b95235ef53c237d07fe1d08fcce1ca752c6df353aa3bc
-EBUILD qtdeclarative-6.9999.ebuild 954 BLAKE2B f85a042c94d921a79ac8d1b86b78c9b9fc248bb88f97de7a5ea4c71a88c36231a93e7fdf7e9632accc71dc1a838490966c9ab5b021e480b19f944e942f70dfce SHA512 bf9817a86fa308ea76c777171c5c29126add4380f7e6368e16137b4781b473a6083ff800613144e8b55b95235ef53c237d07fe1d08fcce1ca752c6df353aa3bc
+EBUILD qtdeclarative-6.7.9999.ebuild 1032 BLAKE2B c071fc90e00cb09bf147a4e59a58bad0f7d6134d37ca9bad94712210426d6b12ed2632441315b30cfe2ce80f849ffcccd9d6df96e348217795407ecb160f1acd SHA512 559a0ef86898e1e3562f0e8259ac4911231050e60ebea9a3344dc3e750f853d88f208e03873c96c4fdcdcd3680b441af3ef0e5dbf7c3a9fcd292b12faf2f0e20
+EBUILD qtdeclarative-6.9999.ebuild 1032 BLAKE2B c071fc90e00cb09bf147a4e59a58bad0f7d6134d37ca9bad94712210426d6b12ed2632441315b30cfe2ce80f849ffcccd9d6df96e348217795407ecb160f1acd SHA512 559a0ef86898e1e3562f0e8259ac4911231050e60ebea9a3344dc3e750f853d88f208e03873c96c4fdcdcd3680b441af3ef0e5dbf7c3a9fcd292b12faf2f0e20
 MISC metadata.xml 855 BLAKE2B 6be7ee8e497916e78de02244cba14f33434b37f34f901a3a789bc684ea509da865042b10ae37f12491281f846adbb0daadeb90205026d5fdd76d07755cd168c8 SHA512 0abf60e4c4624c698081871cadf757698ad4eded995c7c83f0edf739af2fa3be5f9a79f716403e40f2f8e09dfeeb5dd20342ec498fa121eb4cf9733462c8055a
diff --git a/dev-qt/qtdeclarative/qtdeclarative-6.6.9999.ebuild b/dev-qt/qtdeclarative/qtdeclarative-6.6.9999.ebuild
deleted file mode 100644
index 7c725f7cc737..000000000000
--- a/dev-qt/qtdeclarative/qtdeclarative-6.6.9999.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 2021-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit 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 opengl +sql vulkan +widgets"
-
-# behaves very badly when qtdeclarative is not already installed, also
-# other more minor issues (installs junk, sandbox/offscreen issues)
-RESTRICT="test"
-
-RDEPEND="~dev-qt/qtbase-${PV}:6[accessibility=,gui,network,opengl=,sql?,vulkan=,widgets=]"
-DEPEND="
-	${RDEPEND}
-	vulkan? ( dev-util/vulkan-headers )
-"
-BDEPEND="~dev-qt/qtshadertools-${PV}:6"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package sql Qt6Sql)
-	)
-
-	qt6-build_src_configure
-}
diff --git a/dev-qt/qtdeclarative/qtdeclarative-6.7.9999.ebuild b/dev-qt/qtdeclarative/qtdeclarative-6.7.9999.ebuild
index 235c4f16520f..b87689b35832 100644
--- a/dev-qt/qtdeclarative/qtdeclarative-6.7.9999.ebuild
+++ b/dev-qt/qtdeclarative/qtdeclarative-6.7.9999.ebuild
@@ -12,13 +12,16 @@ if [[ ${QT6_BUILD_TYPE} == release ]]; then
 	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
 fi
 
-IUSE="accessibility +network opengl +sql +ssl vulkan +widgets"
+IUSE="accessibility +network opengl +sql +ssl svg vulkan +widgets"
 
 # behaves very badly when qtdeclarative is not already installed, also
 # other more minor issues (installs junk, sandbox/offscreen issues)
 RESTRICT="test"
 
-RDEPEND="~dev-qt/qtbase-${PV}:6[accessibility=,gui,network=,opengl=,sql?,ssl?,vulkan=,widgets=]"
+RDEPEND="
+	~dev-qt/qtbase-${PV}:6[accessibility=,gui,network=,opengl=,sql?,ssl?,vulkan=,widgets=]
+	svg? ( ~dev-qt/qtsvg-${PV}:6 )
+"
 DEPEND="
 	${RDEPEND}
 	vulkan? ( dev-util/vulkan-headers )
@@ -31,6 +34,7 @@ BDEPEND="
 src_configure() {
 	local mycmakeargs=(
 		$(cmake_use_find_package sql Qt6Sql)
+		$(cmake_use_find_package svg Qt6Svg)
 		$(qt_feature network qml_network)
 		$(qt_feature ssl qml_ssl)
 	)
diff --git a/dev-qt/qtdeclarative/qtdeclarative-6.9999.ebuild b/dev-qt/qtdeclarative/qtdeclarative-6.9999.ebuild
index 235c4f16520f..b87689b35832 100644
--- a/dev-qt/qtdeclarative/qtdeclarative-6.9999.ebuild
+++ b/dev-qt/qtdeclarative/qtdeclarative-6.9999.ebuild
@@ -12,13 +12,16 @@ if [[ ${QT6_BUILD_TYPE} == release ]]; then
 	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
 fi
 
-IUSE="accessibility +network opengl +sql +ssl vulkan +widgets"
+IUSE="accessibility +network opengl +sql +ssl svg vulkan +widgets"
 
 # behaves very badly when qtdeclarative is not already installed, also
 # other more minor issues (installs junk, sandbox/offscreen issues)
 RESTRICT="test"
 
-RDEPEND="~dev-qt/qtbase-${PV}:6[accessibility=,gui,network=,opengl=,sql?,ssl?,vulkan=,widgets=]"
+RDEPEND="
+	~dev-qt/qtbase-${PV}:6[accessibility=,gui,network=,opengl=,sql?,ssl?,vulkan=,widgets=]
+	svg? ( ~dev-qt/qtsvg-${PV}:6 )
+"
 DEPEND="
 	${RDEPEND}
 	vulkan? ( dev-util/vulkan-headers )
@@ -31,6 +34,7 @@ BDEPEND="
 src_configure() {
 	local mycmakeargs=(
 		$(cmake_use_find_package sql Qt6Sql)
+		$(cmake_use_find_package svg Qt6Svg)
 		$(qt_feature network qml_network)
 		$(qt_feature ssl qml_ssl)
 	)
diff --git a/dev-qt/qthttpserver/Manifest b/dev-qt/qthttpserver/Manifest
index 9e9e5e740f72..5e300424d051 100644
--- a/dev-qt/qthttpserver/Manifest
+++ b/dev-qt/qthttpserver/Manifest
@@ -3,7 +3,6 @@ DIST qthttpserver-everywhere-src-6.6.3.tar.xz 162228 BLAKE2B a913ad8a5581de2ac43
 DIST qthttpserver-everywhere-src-6.7.0-rc2.tar.xz 163024 BLAKE2B 07624d27de0a077eff52071bedd0bf0c868ef5a19ce87ccb676f0220309afef0a79251e9b441b6ac7f5cabedbfff5747a99168bf46c9b8093ecd5d3737851184 SHA512 a049d6d93bee725c883d58e4a7969173f0726c69f636477368f8d5478ea4bc1f21dea78612aa73e1bba2a9bf2d582649d9ce80b377d726583dbd875262e777da
 EBUILD qthttpserver-6.6.2.ebuild 574 BLAKE2B 6cf58709afc0e04b157dab96c0c48f00e613eb751e50a741752b97cf6a934f99556f3c580645eb40431915d9376eaba9f3d47be99c962b7f11051ac84ff331cb SHA512 e06111695c353ee1b2991d4f0c492b1e504a29802b7177d3046690825e3b7f0a6c8e632b7eba3e100c47a6a5178826cc202ea3c0cd382c59dadbb4d530d5c4be
 EBUILD qthttpserver-6.6.3.ebuild 575 BLAKE2B affabe9fa30b9ee370823bdd6b7a34480c50a5d0371b3570aa25611d2a0b963e5239068f8d484647ef1bc8fa6fa52c635b9aaba3a087e2c70e6a3946562eeab0 SHA512 0348549a66c33c6720cc09ebe491ce04a54058254ab70be63725a94c7efa41869f660a79eeca5da91e3a59ea149b697a128804ae81f321c2920557cd9727eacf
-EBUILD qthttpserver-6.6.9999.ebuild 570 BLAKE2B 0d650d9a207c6c601dad662e173f099ca29a4b1e67c909d23617c06546849d951651489034b908182fb95a21c3299361517433f25f5aadf4cfcae56eec99b9ff SHA512 65867d14d6a7c004ce0d162af91c940bffd07c5c0eee76719e93960860fb24e3691e76740a606e68a7261d41684a8269d0330d88d33a13871fc69ee81bd2f6da
 EBUILD qthttpserver-6.7.0_rc2.ebuild 575 BLAKE2B affabe9fa30b9ee370823bdd6b7a34480c50a5d0371b3570aa25611d2a0b963e5239068f8d484647ef1bc8fa6fa52c635b9aaba3a087e2c70e6a3946562eeab0 SHA512 0348549a66c33c6720cc09ebe491ce04a54058254ab70be63725a94c7efa41869f660a79eeca5da91e3a59ea149b697a128804ae81f321c2920557cd9727eacf
 EBUILD qthttpserver-6.7.9999.ebuild 570 BLAKE2B 0d650d9a207c6c601dad662e173f099ca29a4b1e67c909d23617c06546849d951651489034b908182fb95a21c3299361517433f25f5aadf4cfcae56eec99b9ff SHA512 65867d14d6a7c004ce0d162af91c940bffd07c5c0eee76719e93960860fb24e3691e76740a606e68a7261d41684a8269d0330d88d33a13871fc69ee81bd2f6da
 EBUILD qthttpserver-6.9999.ebuild 570 BLAKE2B 0d650d9a207c6c601dad662e173f099ca29a4b1e67c909d23617c06546849d951651489034b908182fb95a21c3299361517433f25f5aadf4cfcae56eec99b9ff SHA512 65867d14d6a7c004ce0d162af91c940bffd07c5c0eee76719e93960860fb24e3691e76740a606e68a7261d41684a8269d0330d88d33a13871fc69ee81bd2f6da
diff --git a/dev-qt/qthttpserver/qthttpserver-6.6.9999.ebuild b/dev-qt/qthttpserver/qthttpserver-6.6.9999.ebuild
deleted file mode 100644
index 49febbf2b658..000000000000
--- a/dev-qt/qthttpserver/qthttpserver-6.6.9999.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 2023 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 74112b122635..39c40e3f499a 100644
--- a/dev-qt/qtimageformats/Manifest
+++ b/dev-qt/qtimageformats/Manifest
@@ -9,7 +9,6 @@ EBUILD qtimageformats-5.15.12.ebuild 705 BLAKE2B 41cff8b31c082fc0803398c99d14282
 EBUILD qtimageformats-5.15.13.ebuild 709 BLAKE2B 638aa093b3a9913cf94d8241c41841b046733dacfdb932bf1dc6a40fc2d74763e7a12b452dcfe409febdab4b5522ea291a6d82275186df72a619c7e142ac1a02 SHA512 dc96378d82a77766df7f40cf6a8cff17b43d04eabb0c90b2d230c48edc4b2a7a3c20c48260329d03f2d47dd697d7145e73f786ae274ab941996e769df11b955e
 EBUILD qtimageformats-6.6.2.ebuild 849 BLAKE2B f11b9b97b70df25c903ed887bd2381afaeb3a7ef1563b5ab0004a8b5e788636975ba57f53e7051aa5b86de21501d3e774225e6aad7b57d193c7deeca5baf6897 SHA512 5e41f0edf6bde06cc8c29c2959fcea0de75d1dd02154091d322b4abfbb327ce82442bdb918ac82cde24b623b486ae2ed399b9c7d75936f5add023c733d51ae1e
 EBUILD qtimageformats-6.6.3.ebuild 851 BLAKE2B 105a8533f57e5182d3e2442b436a6709dcd438c6f9c76fed44b13b8414fbaa51341bebfb75b60911b59a4b65467186d11cef202edd1ee63305afcdf39efe9fe8 SHA512 41b629aaa477787039ee26b77501398557ff034a9c1c49f06c48eeb2ff4d07ab3ca32c4ecc04acf6b07c1bde25d8528c4dfc2fa96efc9bfefaecabe35ab9253e
-EBUILD qtimageformats-6.6.9999.ebuild 851 BLAKE2B 105a8533f57e5182d3e2442b436a6709dcd438c6f9c76fed44b13b8414fbaa51341bebfb75b60911b59a4b65467186d11cef202edd1ee63305afcdf39efe9fe8 SHA512 41b629aaa477787039ee26b77501398557ff034a9c1c49f06c48eeb2ff4d07ab3ca32c4ecc04acf6b07c1bde25d8528c4dfc2fa96efc9bfefaecabe35ab9253e
 EBUILD qtimageformats-6.7.0_rc2.ebuild 851 BLAKE2B 105a8533f57e5182d3e2442b436a6709dcd438c6f9c76fed44b13b8414fbaa51341bebfb75b60911b59a4b65467186d11cef202edd1ee63305afcdf39efe9fe8 SHA512 41b629aaa477787039ee26b77501398557ff034a9c1c49f06c48eeb2ff4d07ab3ca32c4ecc04acf6b07c1bde25d8528c4dfc2fa96efc9bfefaecabe35ab9253e
 EBUILD qtimageformats-6.7.9999.ebuild 851 BLAKE2B 105a8533f57e5182d3e2442b436a6709dcd438c6f9c76fed44b13b8414fbaa51341bebfb75b60911b59a4b65467186d11cef202edd1ee63305afcdf39efe9fe8 SHA512 41b629aaa477787039ee26b77501398557ff034a9c1c49f06c48eeb2ff4d07ab3ca32c4ecc04acf6b07c1bde25d8528c4dfc2fa96efc9bfefaecabe35ab9253e
 EBUILD qtimageformats-6.9999.ebuild 851 BLAKE2B 105a8533f57e5182d3e2442b436a6709dcd438c6f9c76fed44b13b8414fbaa51341bebfb75b60911b59a4b65467186d11cef202edd1ee63305afcdf39efe9fe8 SHA512 41b629aaa477787039ee26b77501398557ff034a9c1c49f06c48eeb2ff4d07ab3ca32c4ecc04acf6b07c1bde25d8528c4dfc2fa96efc9bfefaecabe35ab9253e
diff --git a/dev-qt/qtimageformats/qtimageformats-6.6.9999.ebuild b/dev-qt/qtimageformats/qtimageformats-6.6.9999.ebuild
deleted file mode 100644
index 9d1a9a6f9685..000000000000
--- a/dev-qt/qtimageformats/qtimageformats-6.6.9999.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# 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
-		-DQT_FEATURE_system_tiff=ON
-		-DQT_FEATURE_system_webp=ON
-	)
-
-	qt6-build_src_configure
-}
diff --git a/dev-qt/qtlocation/Manifest b/dev-qt/qtlocation/Manifest
index fabf1f77e0a5..cbcfea9f4416 100644
--- a/dev-qt/qtlocation/Manifest
+++ b/dev-qt/qtlocation/Manifest
@@ -10,7 +10,6 @@ EBUILD qtlocation-5.15.12.ebuild 1622 BLAKE2B a1e40c710309708023d0c7c76e3b009472
 EBUILD qtlocation-5.15.13.ebuild 1627 BLAKE2B 72accda57de13898dae42beffadb7ff3afa5c5bb0410e045796edfe912168708a89271200220664c041dde7b765c040f77f609fdaa6763980a9c92b71fbfd4b3 SHA512 9e6c5949e89a0001250bd044a1148d29c67e502feb30506fe917f64f609c2bd272244c7ca804a3d2dade6a86cb2d10528caf17db97ec94f346d184d7311ba3be
 EBUILD qtlocation-6.6.2.ebuild 1340 BLAKE2B 0743298a9720235d32f2f95639450bebaa2c7a1d546848c89f80af715751df7239b5db123fe449440df813ed673bfe1045c3eee399eeb97aa0c195aa524e05b8 SHA512 116d47c7c434989e0c2cfa07383154cdbf14b4cbbb77888f55b9d541feec481d774f4a7110ae9bee7e8bcf3a4190ab4e9cf3b78f86af0c5bc40474ca2cfa0839
 EBUILD qtlocation-6.6.3.ebuild 1358 BLAKE2B e6528cf94e9a0e09e8125cacd248aa2aec44b8dee0297e4fb1d07dd76f8dbeb4a04fd6f084f933a8e99ada89dac79273ebe1692fccc9bba8389954e261f47972 SHA512 3670254367f89c261abdda7bda506b39f7efff64de6f73f9d46eb36ff7da5dd627237d03def87b4bc94050d9e26de9c42ce898e8fac58a1eabf0f46a21c73c80
-EBUILD qtlocation-6.6.9999.ebuild 1341 BLAKE2B 80c39b17fc730913a37347fb1e11dea6b7e47f1c8e9262bc881fa043e50edd8a693147e5ae5f2e8eeee89cec834abab0e1abcfef0c59083e9cc654fbaaac6a80 SHA512 5c677f7bafd9cbbcc56ec77bbd49360b64f9bbeb2740a48345bec42478f8f8388e781c629305ae0e7b61c16d05adcfb14694bf2b5cee7dea250aaafa084f6527
 EBUILD qtlocation-6.7.0_rc2.ebuild 1341 BLAKE2B a60cf0373c9f4f1ea725cb1c7ce367665431465f6fe3439c7c3d0f46bd9c505f33e54ca220307269ee9b5c11f8c85a5000b5f28a04c8421f3a2c581812a40a3d SHA512 dddb0396f708f7815f07dc2ad0564e7610dad3dbae8a89a91ec87ce4cc9e01a0a18476fb33bcde86d8505ecf0f30e54c5fba1290a8b22a177b5678fbd8042778
 EBUILD qtlocation-6.7.9999.ebuild 1341 BLAKE2B 80c39b17fc730913a37347fb1e11dea6b7e47f1c8e9262bc881fa043e50edd8a693147e5ae5f2e8eeee89cec834abab0e1abcfef0c59083e9cc654fbaaac6a80 SHA512 5c677f7bafd9cbbcc56ec77bbd49360b64f9bbeb2740a48345bec42478f8f8388e781c629305ae0e7b61c16d05adcfb14694bf2b5cee7dea250aaafa084f6527
 EBUILD qtlocation-6.9999.ebuild 1341 BLAKE2B 80c39b17fc730913a37347fb1e11dea6b7e47f1c8e9262bc881fa043e50edd8a693147e5ae5f2e8eeee89cec834abab0e1abcfef0c59083e9cc654fbaaac6a80 SHA512 5c677f7bafd9cbbcc56ec77bbd49360b64f9bbeb2740a48345bec42478f8f8388e781c629305ae0e7b61c16d05adcfb14694bf2b5cee7dea250aaafa084f6527
diff --git a/dev-qt/qtlocation/qtlocation-6.6.9999.ebuild b/dev-qt/qtlocation/qtlocation-6.6.9999.ebuild
deleted file mode 100644
index 05a2dc329b2f..000000000000
--- a/dev-qt/qtlocation/qtlocation-6.6.9999.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 2021-2023 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"
-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 c775835d5911..80f61d7b40c7 100644
--- a/dev-qt/qtmultimedia/Manifest
+++ b/dev-qt/qtmultimedia/Manifest
@@ -9,8 +9,7 @@ EBUILD qtmultimedia-5.15.12.ebuild 1511 BLAKE2B 81fd1f3d666a9c3da203ccc37ef63595
 EBUILD qtmultimedia-5.15.13.ebuild 1517 BLAKE2B f58c9922692fdbcc42efab3ff9f7c02a1c6d77f809b4b828baf5765d6fe11301330b479ce1d1f610c1ca4bd8ddf91f717bee3307699d60beac354007a3b35e29 SHA512 eb2c7ff70d9efe5ad1753261e07f4c34f0f1736c39eb21c261ffb41627f87686355449a32d8df18418f1d2a1c66573049b79f7ee6731bc47e6483a671435a60a
 EBUILD qtmultimedia-6.6.2.ebuild 2170 BLAKE2B fd230c42d990efc14874526cc8cda39287f04273e60e674f240744a14dae125caa0f28b9a8cdaebb6e2927adec9756d9da4d6c9378f590732c4abb134085d163 SHA512 21a1295d8d03d51027b1e9dd68fda8a947a7bf858edd9c16e2a0a45f6c1632f7b6a1df86f0ca2d2a2711c9d4be8b8b339adf2506771a938da3cfc1f075e3772a
 EBUILD qtmultimedia-6.6.3.ebuild 2172 BLAKE2B 224fe5f641675256f4e9db192a4b5d25c700dba5463580ceef3c6a1d25bd58ef897d17c7c1bfcc8e3a23e1cccdb602fe1127711df247c75277c655266ecd5355 SHA512 0574b3debe66e2fbb9abe2f146ec3f5407e5985a770845134d5f0c277f37ad6b202cdb123955d5015ee1e139f6bf6416a7ab52b8f3d21f41f102b841c6156416
-EBUILD qtmultimedia-6.6.9999.ebuild 2172 BLAKE2B 224fe5f641675256f4e9db192a4b5d25c700dba5463580ceef3c6a1d25bd58ef897d17c7c1bfcc8e3a23e1cccdb602fe1127711df247c75277c655266ecd5355 SHA512 0574b3debe66e2fbb9abe2f146ec3f5407e5985a770845134d5f0c277f37ad6b202cdb123955d5015ee1e139f6bf6416a7ab52b8f3d21f41f102b841c6156416
 EBUILD qtmultimedia-6.7.0_rc2.ebuild 2172 BLAKE2B 224fe5f641675256f4e9db192a4b5d25c700dba5463580ceef3c6a1d25bd58ef897d17c7c1bfcc8e3a23e1cccdb602fe1127711df247c75277c655266ecd5355 SHA512 0574b3debe66e2fbb9abe2f146ec3f5407e5985a770845134d5f0c277f37ad6b202cdb123955d5015ee1e139f6bf6416a7ab52b8f3d21f41f102b841c6156416
-EBUILD qtmultimedia-6.7.9999.ebuild 2172 BLAKE2B 224fe5f641675256f4e9db192a4b5d25c700dba5463580ceef3c6a1d25bd58ef897d17c7c1bfcc8e3a23e1cccdb602fe1127711df247c75277c655266ecd5355 SHA512 0574b3debe66e2fbb9abe2f146ec3f5407e5985a770845134d5f0c277f37ad6b202cdb123955d5015ee1e139f6bf6416a7ab52b8f3d21f41f102b841c6156416
-EBUILD qtmultimedia-6.9999.ebuild 2172 BLAKE2B 224fe5f641675256f4e9db192a4b5d25c700dba5463580ceef3c6a1d25bd58ef897d17c7c1bfcc8e3a23e1cccdb602fe1127711df247c75277c655266ecd5355 SHA512 0574b3debe66e2fbb9abe2f146ec3f5407e5985a770845134d5f0c277f37ad6b202cdb123955d5015ee1e139f6bf6416a7ab52b8f3d21f41f102b841c6156416
+EBUILD qtmultimedia-6.7.9999.ebuild 2620 BLAKE2B e226a9f7f9e8d87af37be513eee2dab4c63cbf9ce885a5a378969022d1cf4cc6f71cb8710e3b94e71026149805ce238eaeb4d9bfc79c9b7f4ea565a9e13a3287 SHA512 876f1e095cb3b8ef50a195608b12e723359057b637826c478de7a0ff4339110e6b32d9194acbf544d3358731c9fce44b9ffdb3e288c7d312b5b21db5e20e53ec
+EBUILD qtmultimedia-6.9999.ebuild 2620 BLAKE2B e226a9f7f9e8d87af37be513eee2dab4c63cbf9ce885a5a378969022d1cf4cc6f71cb8710e3b94e71026149805ce238eaeb4d9bfc79c9b7f4ea565a9e13a3287 SHA512 876f1e095cb3b8ef50a195608b12e723359057b637826c478de7a0ff4339110e6b32d9194acbf544d3358731c9fce44b9ffdb3e288c7d312b5b21db5e20e53ec
 MISC metadata.xml 888 BLAKE2B bf3f5b1376585d4aa9021aa838b486b8143e5fbf7c5bf7c7324500de96ab86fd0176993567f97f5e5d115284f8c3ccc16475f787407d747689aefa82cf9a9534 SHA512 98e962234f1ed462444e5f7f3e77a08794b2d0480df7773e822a5671cdfbf708b51edfafacffade2ad5f8b177d89cc0d53b975ef181be66b885c17db2a4a542b
diff --git a/dev-qt/qtmultimedia/qtmultimedia-6.6.9999.ebuild b/dev-qt/qtmultimedia/qtmultimedia-6.6.9999.ebuild
deleted file mode 100644
index 2359fc0aabd3..000000000000
--- a/dev-qt/qtmultimedia/qtmultimedia-6.6.9999.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# 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 v4l vaapi vulkan"
-# tst_qmediaplayerbackend hard requires qml, review in case becomes optional
-REQUIRED_USE="
-	|| ( ffmpeg gstreamer )
-	eglfs? ( ffmpeg opengl )
-	vaapi? ( ffmpeg opengl )
-	test? ( qml )
-"
-
-RDEPEND="
-	~dev-qt/qtbase-${PV}:6[gui,network,opengl=,vulkan=,widgets]
-	alsa? ( 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=,opengl?]
-		media-libs/gstreamer:1.0
-	)
-	opengl? ( media-libs/libglvnd )
-	pulseaudio? ( media-libs/libpulse )
-	qml? (
-		~dev-qt/qtdeclarative-${PV}:6
-		~dev-qt/qtquick3d-${PV}:6
-	)
-"
-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=(
-	# tries to use real alsa or pulseaudio and fails in sandbox
-	tst_qaudiosink
-	tst_qaudiosource
-	tst_qmediacapturesession
-	tst_qmediaplayerbackend
-	tst_qsoundeffect
-	# may try to use v4l2 or hardware acceleration depending on availability
-	tst_qscreencapture_integration
-	tst_qscreencapturebackend
-	# fails with offscreen rendering
-	tst_qvideoframecolormanagement
-	tst_qwindowcapturebackend
-)
-
-src_configure() {
-	# normally passed by the build system, but needed for 32-on-64 chroots
-	use x86 && append-cppflags -DPFFFT_SIMD_DISABLE
-
-	local mycmakeargs=(
-		$(cmake_use_find_package qml Qt6Qml)
-		$(qt_feature alsa)
-		$(qt_feature ffmpeg)
-		$(qt_feature gstreamer)
-		$(usev gstreamer $(qt_feature opengl gstreamer_gl))
-		$(qt_feature pulseaudio)
-		$(qt_feature v4l linux_v4l)
-		$(qt_feature vaapi)
-	)
-
-	qt6-build_src_configure
-}
diff --git a/dev-qt/qtmultimedia/qtmultimedia-6.7.9999.ebuild b/dev-qt/qtmultimedia/qtmultimedia-6.7.9999.ebuild
index 2359fc0aabd3..4f3890da25d9 100644
--- a/dev-qt/qtmultimedia/qtmultimedia-6.7.9999.ebuild
+++ b/dev-qt/qtmultimedia/qtmultimedia-6.7.9999.ebuild
@@ -85,3 +85,18 @@ src_configure() {
 
 	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/qtmultimedia/qtmultimedia-6.9999.ebuild b/dev-qt/qtmultimedia/qtmultimedia-6.9999.ebuild
index 2359fc0aabd3..4f3890da25d9 100644
--- a/dev-qt/qtmultimedia/qtmultimedia-6.9999.ebuild
+++ b/dev-qt/qtmultimedia/qtmultimedia-6.9999.ebuild
@@ -85,3 +85,18 @@ src_configure() {
 
 	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 6d0bbefdb5df..3b107b8b57d9 100644
--- a/dev-qt/qtnetworkauth/Manifest
+++ b/dev-qt/qtnetworkauth/Manifest
@@ -7,7 +7,6 @@ EBUILD qtnetworkauth-5.15.12.ebuild 402 BLAKE2B 800ebd6400530326ecd665b3a776d110
 EBUILD qtnetworkauth-5.15.13.ebuild 405 BLAKE2B 4a4657bff23d82799c20032b7bc907fc5e0c38c42817ee68fb49282b9bebf074960eead8c2cd6b9df4e6839941c329fdc9649a2aa4daef72a1d81363bbdd2d33 SHA512 6d884d27fdaf785329c45f9c033cd794f1370ac015a51f52f77732dcb4d7b649825afb55c76278eb6ca1012b0438a92234a1f1d6b0e6d181b6038757e2a1daba
 EBUILD qtnetworkauth-6.6.2.ebuild 327 BLAKE2B f3279518b8af13181134b252ab1cea338927be7d151aa0f12be564b19d12e3843c8adeeb442052acc50269146ce3be8c9add10303f4b7b1d288dcac87d8290d4 SHA512 4c53f61f310640000e2bb465d63e92bcf3779db27cb75ddb9f2f1afd895b93c80a0208b1e3d7dccdd3f49d85866d8aafd8b30d02686944ccbb6355bafe79a37a
 EBUILD qtnetworkauth-6.6.3.ebuild 340 BLAKE2B 92a58d264fbb6690ebdbbf404887336a438b131f924857dbd605d7516c16c46f732e4d1670243703694553460197b75c3794f396357b0e491ffa32e1480ecd5b SHA512 0a28eb2a6e9f8d43ab88b896bdcd8f7df8a78777eef740b773b8587edf228d494e96a180d753f97a9d07f190601ab050dff2843045e3f77f4d5cee56a42f3acb
-EBUILD qtnetworkauth-6.6.9999.ebuild 328 BLAKE2B de758ef39149207fd3eee8a0d4a9c9987ecba375fec97d2ab73da285b8eb7051186d3886a74cbd7eb07cfa654e7a9ec4d45170136cf8d9e3aa0ace7a3e0bb3c1 SHA512 5bd7f25402133d0555646cb01b035515d7387827d7ff7140666a1f980f00309bca8ea4fe91fdf57924c0303702e06b9e3885a24aa77a16a4e9434b8807de6c73
 EBUILD qtnetworkauth-6.7.0_rc2.ebuild 328 BLAKE2B 9b5a560f505a4f47f767ed12afb02690756207711bcc7236557328e4a5ea0c2ff8fe89494268ea9d2d2eeb0a174444d7860e30632c61f7d11880748b36e2c60c SHA512 d3c7a6eddb5c38b375b98a5b0344adb16cd1eedb7e64a4905587342ddac4703dd13dbd2d7612f493731242bb6f5540cee56d881ab8508e4ebabcda55f5fe6b83
 EBUILD qtnetworkauth-6.7.9999.ebuild 328 BLAKE2B de758ef39149207fd3eee8a0d4a9c9987ecba375fec97d2ab73da285b8eb7051186d3886a74cbd7eb07cfa654e7a9ec4d45170136cf8d9e3aa0ace7a3e0bb3c1 SHA512 5bd7f25402133d0555646cb01b035515d7387827d7ff7140666a1f980f00309bca8ea4fe91fdf57924c0303702e06b9e3885a24aa77a16a4e9434b8807de6c73
 EBUILD qtnetworkauth-6.9999.ebuild 328 BLAKE2B de758ef39149207fd3eee8a0d4a9c9987ecba375fec97d2ab73da285b8eb7051186d3886a74cbd7eb07cfa654e7a9ec4d45170136cf8d9e3aa0ace7a3e0bb3c1 SHA512 5bd7f25402133d0555646cb01b035515d7387827d7ff7140666a1f980f00309bca8ea4fe91fdf57924c0303702e06b9e3885a24aa77a16a4e9434b8807de6c73
diff --git a/dev-qt/qtnetworkauth/qtnetworkauth-6.6.9999.ebuild b/dev-qt/qtnetworkauth/qtnetworkauth-6.6.9999.ebuild
deleted file mode 100644
index c0c8c0b51bf7..000000000000
--- a/dev-qt/qtnetworkauth/qtnetworkauth-6.6.9999.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 2021-2023 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"
-fi
-
-RDEPEND="~dev-qt/qtbase-${PV}:6[network]"
-DEPEND="${RDEPEND}"
diff --git a/dev-qt/qtpositioning/Manifest b/dev-qt/qtpositioning/Manifest
index 2f402e63d22c..534f487884ce 100644
--- a/dev-qt/qtpositioning/Manifest
+++ b/dev-qt/qtpositioning/Manifest
@@ -7,7 +7,6 @@ EBUILD qtpositioning-5.15.12.ebuild 877 BLAKE2B faaba7ce4da8906b08b10a326f4f9a21
 EBUILD qtpositioning-5.15.13.ebuild 883 BLAKE2B d7f8c737a79e717f8677ade142899104d91d7f860db97ec162e1c9671e97120ee5dbd099237e5450dfd662f3ed28117e4794bffcc58ee555d6db8f946ff076fa SHA512 8dffbadfaa291bf49c93b7b14596af9a45284dddf98972938267560105aed5185908f27249ef6afc8f3c62e81d88b30d6a27985435ffa3b9b9dbd454495ebaf9
 EBUILD qtpositioning-6.6.2.ebuild 1574 BLAKE2B 251541d705da198e0c95d321a66ceef2bd547dce229db0a1fb322b96b02a28039695eed097d816a33a3a39cf84272363a437e6809eea6c897a0cff5b984ea35b SHA512 2f978c890b67273429c49e0eca411542b649c821444505957f4e6307030eb27afda482904d3bfd2e4183ce3b420d07275780a82c001b89cc8c2804e30f7c9979
 EBUILD qtpositioning-6.6.3.ebuild 1576 BLAKE2B 0a902084d44ef71dff03de73ca9d692b1fbe5bef21b1ce962b7ea892a707d9db46f63012d7c7378bd9314ed702a2c5d108d5c41a0a86e395033bcccb2dc029a8 SHA512 bfe20d4028ab0c0c1365db3d5f2ded0c1fe5e9e3e703cede4ca1ff57450cec65bf3b022ed364373b65c87e0bc776a9eca28a4607ef95ebdf661a17d89c3b6c56
-EBUILD qtpositioning-6.6.9999.ebuild 1576 BLAKE2B 0a902084d44ef71dff03de73ca9d692b1fbe5bef21b1ce962b7ea892a707d9db46f63012d7c7378bd9314ed702a2c5d108d5c41a0a86e395033bcccb2dc029a8 SHA512 bfe20d4028ab0c0c1365db3d5f2ded0c1fe5e9e3e703cede4ca1ff57450cec65bf3b022ed364373b65c87e0bc776a9eca28a4607ef95ebdf661a17d89c3b6c56
 EBUILD qtpositioning-6.7.0_rc2.ebuild 1576 BLAKE2B 0a902084d44ef71dff03de73ca9d692b1fbe5bef21b1ce962b7ea892a707d9db46f63012d7c7378bd9314ed702a2c5d108d5c41a0a86e395033bcccb2dc029a8 SHA512 bfe20d4028ab0c0c1365db3d5f2ded0c1fe5e9e3e703cede4ca1ff57450cec65bf3b022ed364373b65c87e0bc776a9eca28a4607ef95ebdf661a17d89c3b6c56
 EBUILD qtpositioning-6.7.9999.ebuild 1576 BLAKE2B 0a902084d44ef71dff03de73ca9d692b1fbe5bef21b1ce962b7ea892a707d9db46f63012d7c7378bd9314ed702a2c5d108d5c41a0a86e395033bcccb2dc029a8 SHA512 bfe20d4028ab0c0c1365db3d5f2ded0c1fe5e9e3e703cede4ca1ff57450cec65bf3b022ed364373b65c87e0bc776a9eca28a4607ef95ebdf661a17d89c3b6c56
 EBUILD qtpositioning-6.9999.ebuild 1576 BLAKE2B 0a902084d44ef71dff03de73ca9d692b1fbe5bef21b1ce962b7ea892a707d9db46f63012d7c7378bd9314ed702a2c5d108d5c41a0a86e395033bcccb2dc029a8 SHA512 bfe20d4028ab0c0c1365db3d5f2ded0c1fe5e9e3e703cede4ca1ff57450cec65bf3b022ed364373b65c87e0bc776a9eca28a4607ef95ebdf661a17d89c3b6c56
diff --git a/dev-qt/qtpositioning/qtpositioning-6.6.9999.ebuild b/dev-qt/qtpositioning/qtpositioning-6.6.9999.ebuild
deleted file mode 100644
index c872768c9bd8..000000000000
--- a/dev-qt/qtpositioning/qtpositioning-6.6.9999.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# 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 5671c580a893..3f4061721bee 100644
--- a/dev-qt/qtquick3d/Manifest
+++ b/dev-qt/qtquick3d/Manifest
@@ -5,7 +5,6 @@ DIST qtquick3d-everywhere-src-6.6.3.tar.xz 65597184 BLAKE2B c72c45d991871c3d6de9
 DIST qtquick3d-everywhere-src-6.7.0-rc2.tar.xz 66179576 BLAKE2B 7019aff203d127092c5875b7de8e82db737d3aafe7bb36bc9a097fb02ce007293a9d2af4c04b056041e66d4bd31939966c08749c6f218b8cc25c58f12851d4c0 SHA512 8ef466231889a0b82475d13c9d3c700de52802612477e16dace1b298b57a67f4ae8e868e9b49a473697df038048b67aba8d1db2f3e0cb729be0b25ed10b2d3f6
 EBUILD qtquick3d-6.6.2.ebuild 1050 BLAKE2B 3c6e182d13510ccb0ed65808d34f58dc7e73bde5c2acf5438a48ca71a79832f9e63c2a319a1ec81c3f0ca1958a929e5820428a538e0bd04eb59ef0f8cf864c5c SHA512 3f6a955b20549a66ad25ffbd170b47ee3b667b77b23431b36d9c16c7869da48e5ae52a6cbb6c24df2d816685929eb21e00d97c1d36de766911789b5eac195831
 EBUILD qtquick3d-6.6.3.ebuild 1092 BLAKE2B 11adf3cba040eae1c334e26faa6df3a2bb92452e592267402930b2700edb99910f56eb1bbd76c9afc32db1758dcd75bfc2fbcf76760fffbb56d7db4d6d48a870 SHA512 e48fd22fea35e1a43016a278426899891bea3766e53e4879e8c680751002e542e8dd7768300bef16cabf7c39963e95f82cf1244b4319652ad390b34434dcfcfd
-EBUILD qtquick3d-6.6.9999.ebuild 1092 BLAKE2B 11adf3cba040eae1c334e26faa6df3a2bb92452e592267402930b2700edb99910f56eb1bbd76c9afc32db1758dcd75bfc2fbcf76760fffbb56d7db4d6d48a870 SHA512 e48fd22fea35e1a43016a278426899891bea3766e53e4879e8c680751002e542e8dd7768300bef16cabf7c39963e95f82cf1244b4319652ad390b34434dcfcfd
 EBUILD qtquick3d-6.7.0_rc2.ebuild 1052 BLAKE2B ba4c71955c32e74452a4feeba78742133794c3fccbb4d20171da7e4b07e18f961308da857511a461a3a2dbdf0de329efad5eb07155edfde7524b270d84e962af SHA512 b9bd254fd9a64cbd82be8cdf8e61c21709ebc0428fc9b98a462b4bbd9b5224b19d0c72a41f0377821a99c7177cff86c44ca2fd00556acb3aa4ba40adf8d652bf
 EBUILD qtquick3d-6.7.9999.ebuild 1052 BLAKE2B ba4c71955c32e74452a4feeba78742133794c3fccbb4d20171da7e4b07e18f961308da857511a461a3a2dbdf0de329efad5eb07155edfde7524b270d84e962af SHA512 b9bd254fd9a64cbd82be8cdf8e61c21709ebc0428fc9b98a462b4bbd9b5224b19d0c72a41f0377821a99c7177cff86c44ca2fd00556acb3aa4ba40adf8d652bf
 EBUILD qtquick3d-6.9999.ebuild 1052 BLAKE2B ba4c71955c32e74452a4feeba78742133794c3fccbb4d20171da7e4b07e18f961308da857511a461a3a2dbdf0de329efad5eb07155edfde7524b270d84e962af SHA512 b9bd254fd9a64cbd82be8cdf8e61c21709ebc0428fc9b98a462b4bbd9b5224b19d0c72a41f0377821a99c7177cff86c44ca2fd00556acb3aa4ba40adf8d652bf
diff --git a/dev-qt/qtquick3d/qtquick3d-6.6.9999.ebuild b/dev-qt/qtquick3d/qtquick3d-6.6.9999.ebuild
deleted file mode 100644
index 3ce3b4f8b69d..000000000000
--- a/dev-qt/qtquick3d/qtquick3d-6.6.9999.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# 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 ~ppc ~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 )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-6.6.2-gcc14.patch
-	"${FILESDIR}"/${PN}-6.6.2-x32abi.patch
-)
-
-CMAKE_SKIP_TESTS=(
-	# collada support is disabled in system media-libs/assimp (bug #891787)
-	tst_qquick3dassetimport
-)
-
-src_configure() {
-	local mycmakeargs=(
-		-DQT_FEATURE_system_assimp=ON
-		-DQT_UNITY_BUILD=OFF # fails to build
-	)
-
-	qt6-build_src_configure
-}
diff --git a/dev-qt/qtquicktimeline/Manifest b/dev-qt/qtquicktimeline/Manifest
index b931de211368..4fd1b9105ce6 100644
--- a/dev-qt/qtquicktimeline/Manifest
+++ b/dev-qt/qtquicktimeline/Manifest
@@ -7,7 +7,6 @@ EBUILD qtquicktimeline-5.15.12.ebuild 367 BLAKE2B 177d100c4cd775817bc42b85319072
 EBUILD qtquicktimeline-5.15.13.ebuild 367 BLAKE2B 177d100c4cd775817bc42b853190722920cf6453a773c12de253907fcf730af3e1b146b40e519619850162c1fd6a841b32ea99926276bf05f05d0f546b4edd13 SHA512 80c731f2b961d1191f8a3573748fafd23ed73bc93b5645e107d9c4138f07d8139b47484b15d1289b0c9546de46a5e4876e33cdd4e3a899d31d1de2ce65d7bb93
 EBUILD qtquicktimeline-6.6.2.ebuild 393 BLAKE2B 94bf68327deaad5a08b78873093ea4dc25ce04c8be6fe406cecb1114bd913ec4b197b238d3523a43a0f92ac1d7eafdcdcb2c199bbbda02f05cb063f25557214b SHA512 4eef4fe96d51c6d19295ea41f00c39a9a520d12aadd26b7a1ea6ff8b0c827f8677ebdf65048edc61990b4a271aec5733996126efceab55ac0abc86293ac726d3
 EBUILD qtquicktimeline-6.6.3.ebuild 395 BLAKE2B a6abf0944d3eb0c738d8455fde448b8418badfd9151dd30acc1ed80dbc7b65057bd88091e6372097c0470387c5d62850798fa1f08020435a5534b05b1278ae5d SHA512 29e70391521b8db27df1ac6db72797a4785ede1270136644433ac39c88ddac079aa17faf703b002eb6785510ba7c7d8df6312964fc1e798d295fa9c0f4f2c040
-EBUILD qtquicktimeline-6.6.9999.ebuild 395 BLAKE2B a6abf0944d3eb0c738d8455fde448b8418badfd9151dd30acc1ed80dbc7b65057bd88091e6372097c0470387c5d62850798fa1f08020435a5534b05b1278ae5d SHA512 29e70391521b8db27df1ac6db72797a4785ede1270136644433ac39c88ddac079aa17faf703b002eb6785510ba7c7d8df6312964fc1e798d295fa9c0f4f2c040
 EBUILD qtquicktimeline-6.7.0_rc2.ebuild 395 BLAKE2B a6abf0944d3eb0c738d8455fde448b8418badfd9151dd30acc1ed80dbc7b65057bd88091e6372097c0470387c5d62850798fa1f08020435a5534b05b1278ae5d SHA512 29e70391521b8db27df1ac6db72797a4785ede1270136644433ac39c88ddac079aa17faf703b002eb6785510ba7c7d8df6312964fc1e798d295fa9c0f4f2c040
 EBUILD qtquicktimeline-6.7.9999.ebuild 395 BLAKE2B a6abf0944d3eb0c738d8455fde448b8418badfd9151dd30acc1ed80dbc7b65057bd88091e6372097c0470387c5d62850798fa1f08020435a5534b05b1278ae5d SHA512 29e70391521b8db27df1ac6db72797a4785ede1270136644433ac39c88ddac079aa17faf703b002eb6785510ba7c7d8df6312964fc1e798d295fa9c0f4f2c040
 EBUILD qtquicktimeline-6.9999.ebuild 395 BLAKE2B a6abf0944d3eb0c738d8455fde448b8418badfd9151dd30acc1ed80dbc7b65057bd88091e6372097c0470387c5d62850798fa1f08020435a5534b05b1278ae5d SHA512 29e70391521b8db27df1ac6db72797a4785ede1270136644433ac39c88ddac079aa17faf703b002eb6785510ba7c7d8df6312964fc1e798d295fa9c0f4f2c040
diff --git a/dev-qt/qtquicktimeline/qtquicktimeline-6.6.9999.ebuild b/dev-qt/qtquicktimeline/qtquicktimeline-6.6.9999.ebuild
deleted file mode 100644
index 393a5c2037bc..000000000000
--- a/dev-qt/qtquicktimeline/qtquicktimeline-6.6.9999.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# 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/qtscxml/Manifest b/dev-qt/qtscxml/Manifest
index d4738deb3bb1..f27e59ae4c36 100644
--- a/dev-qt/qtscxml/Manifest
+++ b/dev-qt/qtscxml/Manifest
@@ -7,7 +7,6 @@ EBUILD qtscxml-5.15.12.ebuild 398 BLAKE2B 64f5af29a9076f0bb09b8843208e1c00358f48
 EBUILD qtscxml-5.15.13.ebuild 401 BLAKE2B 8e22b19b9ade2224c0112310cd9947aaebb313e4d7f61d0b6f273de6034d9afd03d592d309944aea18b100a3764bc73c37e418a931f2aa5cefa1fe13ab36177d SHA512 5f80a9f8730e125b063f0affb2e2657b3a3d75b2643ba586dd1d0d28e4c76a983c49f880d48118509d91d90eff5df3152b2b2ab1c3cbc530075d79d5fbc59a60
 EBUILD qtscxml-6.6.2.ebuild 676 BLAKE2B 808033bf6b6fd6b9ae0ea027880c134e9f189276f98d8c0f346eff7911b5fb36cc25567b4516e3232f975c2f7cbc4787f43a483902aa87e1cb797cb59dd5147e SHA512 03eaf56745adbab86d884c5704edd0118124b2a6cff72836cf0afee6cb1acf1d528eafccd7eee52a4fcebb133939be75c4afc1fdc4c9b6060383c99c7d83cbf7
 EBUILD qtscxml-6.6.3.ebuild 694 BLAKE2B ed386a162f554adc96f11b26b8f799853f2bff6866b86c5255788b5cd7641cc24930f029e0a513662b47b6d71b6ff14e97d058144ff0d60fb8e1b2da6899b03c SHA512 cdabc581629f3d823b28af81d60de55a4b7d9c4f5ee4e9244df02965862658c92f830390a4d5ab993f60b5c2fed9f82429e25510ebe16a5b63db985cc8478232
-EBUILD qtscxml-6.6.9999.ebuild 677 BLAKE2B 5b4a53a211c467cc30ca0220a4e949e6b869e71ce8351839f77b0846d6d001bbe780b225f19d9c93ac8bdda1a3ff4993d9c8f70e65aead9464d524d47508a33a SHA512 0c8cf8f2e6019062ac0e153ced62bfa7026b00d0aa4d021fff939bd2791a7fc4d57db22c83fa145dccaa7b09ea9303868c73cdfda8e163126a9bf1da154fc87f
 EBUILD qtscxml-6.7.0_rc2.ebuild 677 BLAKE2B 03c4ae72b15f1e584e55a640f84d23cd8c1b794e9fb36473d8afad4f1512bf244c0a1e65776d4ac2dd67d8bd2425cb01f748920b92030a77dacedde617cc5db4 SHA512 5a411433335bf74065b7f9bf195b7dc0331a70a3b96d6e2d10b37ecc768c4ec2217c3eb4f76a32fc73ccbf3d963db94241423bc730736dfcb7aa9d7f06563640
 EBUILD qtscxml-6.7.9999.ebuild 677 BLAKE2B 5b4a53a211c467cc30ca0220a4e949e6b869e71ce8351839f77b0846d6d001bbe780b225f19d9c93ac8bdda1a3ff4993d9c8f70e65aead9464d524d47508a33a SHA512 0c8cf8f2e6019062ac0e153ced62bfa7026b00d0aa4d021fff939bd2791a7fc4d57db22c83fa145dccaa7b09ea9303868c73cdfda8e163126a9bf1da154fc87f
 EBUILD qtscxml-6.9999.ebuild 677 BLAKE2B 5b4a53a211c467cc30ca0220a4e949e6b869e71ce8351839f77b0846d6d001bbe780b225f19d9c93ac8bdda1a3ff4993d9c8f70e65aead9464d524d47508a33a SHA512 0c8cf8f2e6019062ac0e153ced62bfa7026b00d0aa4d021fff939bd2791a7fc4d57db22c83fa145dccaa7b09ea9303868c73cdfda8e163126a9bf1da154fc87f
diff --git a/dev-qt/qtscxml/qtscxml-6.6.9999.ebuild b/dev-qt/qtscxml/qtscxml-6.6.9999.ebuild
deleted file mode 100644
index 3baf824212bc..000000000000
--- a/dev-qt/qtscxml/qtscxml-6.6.9999.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2021-2023 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"
-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 90b705640539..0c6962ec837b 100644
--- a/dev-qt/qtsensors/Manifest
+++ b/dev-qt/qtsensors/Manifest
@@ -7,7 +7,6 @@ EBUILD qtsensors-5.15.12.ebuild 566 BLAKE2B 1448b9978f85ba18bcccb00f356458bcd30d
 EBUILD qtsensors-5.15.13.ebuild 571 BLAKE2B 52dcb343ec1cc8d3d36c0ea421716814af95d2343336dbfeccbfc191349b3e102cf01eb86259c14799049f9a7b33f5dad45c1d8ba4fb294656e85775f88ae317 SHA512 b666d0d3bcaf9472d62e946c24efd1eb584cfcf95c917b8d04fa8c517ce4a9ae0172aaafd5aa65b22b50b2c24742da10521b30925f41233f8a9938de03846716
 EBUILD qtsensors-6.6.2.ebuild 503 BLAKE2B 3be14a126756361fce11238978c46c5b313ce472066d7aaa573abac3d45cf5e2cd74df261f0d9c0ca68e89d3be28f4cd96f64354986fdb04f31b72a91f03f399 SHA512 8365f1a22a1e3ad291544070a5cbaf4da548a9751aaa3c88969351817b066fbfb3671501f1126b94b24fcf6ffd05ebea23f83402d3b4e01f63c2322feffd4042
 EBUILD qtsensors-6.6.3.ebuild 527 BLAKE2B fc5e59ceef5aa5a2e83428c7f8c4bf2453bf6c0265d2f06d256cb54fe1cb6376c56199896eb2de2899339ae9265b9ba4fac62b63bb2bc52deeac1ad3e6bc3d9b SHA512 c681f742eb926254311c27ae1f769a94c44433e2a37b775a5933bf5e10fb993fa0a360206d3aac44549a54d354953a8bc9aa08174a6cbce4fc8e5ae9da6ac80e
-EBUILD qtsensors-6.6.9999.ebuild 505 BLAKE2B 575886c546513570a43f4f9822cba51756e0771a3f15d931f5a37af551370762fd7952f18b09fa3fa2e8733162a44dbe9f2afbecfea20f30bda4554e20b2dcf3 SHA512 ae048d28ff336ebada0a7251ea95a06fbbec0af6b643c89ace77a9b287095e078661937ccda8965765b0ab0da902a042a18e3fdc9c98ac212b5a96f8dea976e8
 EBUILD qtsensors-6.7.0_rc2.ebuild 505 BLAKE2B 575886c546513570a43f4f9822cba51756e0771a3f15d931f5a37af551370762fd7952f18b09fa3fa2e8733162a44dbe9f2afbecfea20f30bda4554e20b2dcf3 SHA512 ae048d28ff336ebada0a7251ea95a06fbbec0af6b643c89ace77a9b287095e078661937ccda8965765b0ab0da902a042a18e3fdc9c98ac212b5a96f8dea976e8
 EBUILD qtsensors-6.7.9999.ebuild 505 BLAKE2B 575886c546513570a43f4f9822cba51756e0771a3f15d931f5a37af551370762fd7952f18b09fa3fa2e8733162a44dbe9f2afbecfea20f30bda4554e20b2dcf3 SHA512 ae048d28ff336ebada0a7251ea95a06fbbec0af6b643c89ace77a9b287095e078661937ccda8965765b0ab0da902a042a18e3fdc9c98ac212b5a96f8dea976e8
 EBUILD qtsensors-6.9999.ebuild 505 BLAKE2B 575886c546513570a43f4f9822cba51756e0771a3f15d931f5a37af551370762fd7952f18b09fa3fa2e8733162a44dbe9f2afbecfea20f30bda4554e20b2dcf3 SHA512 ae048d28ff336ebada0a7251ea95a06fbbec0af6b643c89ace77a9b287095e078661937ccda8965765b0ab0da902a042a18e3fdc9c98ac212b5a96f8dea976e8
diff --git a/dev-qt/qtsensors/qtsensors-6.6.9999.ebuild b/dev-qt/qtsensors/qtsensors-6.6.9999.ebuild
deleted file mode 100644
index 10bdcfe73164..000000000000
--- a/dev-qt/qtsensors/qtsensors-6.6.9999.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# 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 ~arm64 ~loong"
-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 ed32df456269..6b75f5c598c0 100644
--- a/dev-qt/qtserialbus/Manifest
+++ b/dev-qt/qtserialbus/Manifest
@@ -7,7 +7,6 @@ EBUILD qtserialbus-5.15.12.ebuild 430 BLAKE2B 11ca9b29a206685addc9929eb1bdd1f0f2
 EBUILD qtserialbus-5.15.13.ebuild 430 BLAKE2B 11ca9b29a206685addc9929eb1bdd1f0f2be4235ca4f8d1a374f96b8984cc9009836c158909d6fabf3d710a06f00d2becffb6bfee6ecc52fa8b793db8f61e40d SHA512 526c137d6e04dbbf06ca280b9a35403b2d05499ff1eb9cfc79cf805bc025a7e20a495f3d16858a25ebbe075c1e6d48d4020edd20457cb4ea9e4b3331a2cef9b3
 EBUILD qtserialbus-6.6.2.ebuild 896 BLAKE2B 624eef6598df5f97d19a32a1983aabfe69540c80b542dc8822cdcf80b2c082e77445f651bc541e1754f1869197f091ac24fdf18f034d105b8d1baea65f349499 SHA512 d339f82ed93ed9df2cf8481a4413cbae54270da30c661d3a425005bf06d7911a057f76651efdce0b577db50f58476a6aef99105dc02d41fb98a6adc5e70e169e
 EBUILD qtserialbus-6.6.3.ebuild 902 BLAKE2B c393a7bb277582de80fbdbac3f74031d50f2f9e2a65b697211c9f1c3bc43134fa5d0f770ed843c06458b3680ef1951b522c51827d28034e0753ea32124a9c135 SHA512 9ecd004c28e1cade57ccd33be257b6937bda9f475f581aa09fa0cc7dbb73e3e6c690569a565ffdb4f7b62082e4f4356d63a75beff528e9b3ee3cca38bee11050
-EBUILD qtserialbus-6.6.9999.ebuild 897 BLAKE2B 9aede19c48c8cf98a1f4d2dbe38f21e61e1fedea5161db618a62c8e50bf0200a6f65689b5cc7a22275a784f63e02d08c25f27c8702842e165f0a2aac6cc305f0 SHA512 d44d573c3a1393d1d1309635e6cf4ca92ce13c435d9131c1fd7abf609bfadb2bf4842992f1a105b3c32cbfe776fb3d5fcbaf66ddf9fe26c8b0d4b14d9f838557
 EBUILD qtserialbus-6.7.0_rc2.ebuild 897 BLAKE2B 9aede19c48c8cf98a1f4d2dbe38f21e61e1fedea5161db618a62c8e50bf0200a6f65689b5cc7a22275a784f63e02d08c25f27c8702842e165f0a2aac6cc305f0 SHA512 d44d573c3a1393d1d1309635e6cf4ca92ce13c435d9131c1fd7abf609bfadb2bf4842992f1a105b3c32cbfe776fb3d5fcbaf66ddf9fe26c8b0d4b14d9f838557
 EBUILD qtserialbus-6.7.9999.ebuild 897 BLAKE2B 9aede19c48c8cf98a1f4d2dbe38f21e61e1fedea5161db618a62c8e50bf0200a6f65689b5cc7a22275a784f63e02d08c25f27c8702842e165f0a2aac6cc305f0 SHA512 d44d573c3a1393d1d1309635e6cf4ca92ce13c435d9131c1fd7abf609bfadb2bf4842992f1a105b3c32cbfe776fb3d5fcbaf66ddf9fe26c8b0d4b14d9f838557
 EBUILD qtserialbus-6.9999.ebuild 897 BLAKE2B 9aede19c48c8cf98a1f4d2dbe38f21e61e1fedea5161db618a62c8e50bf0200a6f65689b5cc7a22275a784f63e02d08c25f27c8702842e165f0a2aac6cc305f0 SHA512 d44d573c3a1393d1d1309635e6cf4ca92ce13c435d9131c1fd7abf609bfadb2bf4842992f1a105b3c32cbfe776fb3d5fcbaf66ddf9fe26c8b0d4b14d9f838557
diff --git a/dev-qt/qtserialbus/qtserialbus-6.6.9999.ebuild b/dev-qt/qtserialbus/qtserialbus-6.6.9999.ebuild
deleted file mode 100644
index a9d55ad33aa7..000000000000
--- a/dev-qt/qtserialbus/qtserialbus-6.6.9999.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# 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"
-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 a22c31805222..46c41f790a07 100644
--- a/dev-qt/qtserialport/Manifest
+++ b/dev-qt/qtserialport/Manifest
@@ -7,7 +7,6 @@ EBUILD qtserialport-5.15.12.ebuild 565 BLAKE2B 683036990929b3ceed4ead89d9a5d77b8
 EBUILD qtserialport-5.15.13.ebuild 571 BLAKE2B ef342d4bbf1f5e9167fa472f4e72ff48a408de27e734c8a779a7c6d08c73471ff25fbadd71bc223d2f36d9ce7c0164d8e8bca3ffb2f376e5e6bcc90ac7500aa3 SHA512 9d40f1b3a1b8f9f8b48f93777afc3594f820e351a891ba4d5ae846df0dca4c247c620bb55876d062538ecf4b6f2e0d606ed887d1200845db1195d46c1b0f244e
 EBUILD qtserialport-6.6.2.ebuild 390 BLAKE2B 1c60f756335a193beb10930e126900032020d10c203736506f492a35da0b156588effb9690547ddbad7fd7967f0a82bff50795c7beba035c5e2aa1662c7f3d11 SHA512 bbee937b7fe3ff972e72eb56b6b01e97f25ba089009f79aca803f534394b9547c0a3907f1116c46a7da3d7c79cfab2c3e088b5cdd71511433e812d3500d67913
 EBUILD qtserialport-6.6.3.ebuild 392 BLAKE2B 65750c8281a3febc2289e59f64f7eeb0eca466b773521e7ef801f0d3918b8d813cf59882bb1ab46ff3e962e1ba8b4c52033138dafa3ec10756daf689acd6dbe9 SHA512 b5ef4491f2babf2e5e775d537123aa1139d32a469c834832d264b61cf5f0c72a4fc59c0b32b41bccea2080cea52565cbb5aa8677c4a4079d6bb1b237f02a1c58
-EBUILD qtserialport-6.6.9999.ebuild 392 BLAKE2B 65750c8281a3febc2289e59f64f7eeb0eca466b773521e7ef801f0d3918b8d813cf59882bb1ab46ff3e962e1ba8b4c52033138dafa3ec10756daf689acd6dbe9 SHA512 b5ef4491f2babf2e5e775d537123aa1139d32a469c834832d264b61cf5f0c72a4fc59c0b32b41bccea2080cea52565cbb5aa8677c4a4079d6bb1b237f02a1c58
 EBUILD qtserialport-6.7.0_rc2.ebuild 392 BLAKE2B 65750c8281a3febc2289e59f64f7eeb0eca466b773521e7ef801f0d3918b8d813cf59882bb1ab46ff3e962e1ba8b4c52033138dafa3ec10756daf689acd6dbe9 SHA512 b5ef4491f2babf2e5e775d537123aa1139d32a469c834832d264b61cf5f0c72a4fc59c0b32b41bccea2080cea52565cbb5aa8677c4a4079d6bb1b237f02a1c58
 EBUILD qtserialport-6.7.9999.ebuild 392 BLAKE2B 65750c8281a3febc2289e59f64f7eeb0eca466b773521e7ef801f0d3918b8d813cf59882bb1ab46ff3e962e1ba8b4c52033138dafa3ec10756daf689acd6dbe9 SHA512 b5ef4491f2babf2e5e775d537123aa1139d32a469c834832d264b61cf5f0c72a4fc59c0b32b41bccea2080cea52565cbb5aa8677c4a4079d6bb1b237f02a1c58
 EBUILD qtserialport-6.9999.ebuild 392 BLAKE2B 65750c8281a3febc2289e59f64f7eeb0eca466b773521e7ef801f0d3918b8d813cf59882bb1ab46ff3e962e1ba8b4c52033138dafa3ec10756daf689acd6dbe9 SHA512 b5ef4491f2babf2e5e775d537123aa1139d32a469c834832d264b61cf5f0c72a4fc59c0b32b41bccea2080cea52565cbb5aa8677c4a4079d6bb1b237f02a1c58
diff --git a/dev-qt/qtserialport/qtserialport-6.6.9999.ebuild b/dev-qt/qtserialport/qtserialport-6.6.9999.ebuild
deleted file mode 100644
index 95b360fac6cf..000000000000
--- a/dev-qt/qtserialport/qtserialport-6.6.9999.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# 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 a3007e1ee3ac..ec5648003c1b 100644
--- a/dev-qt/qtshadertools/Manifest
+++ b/dev-qt/qtshadertools/Manifest
@@ -3,7 +3,6 @@ DIST qtshadertools-everywhere-src-6.6.3.tar.xz 1054688 BLAKE2B 7a35015e7ad0073cc
 DIST qtshadertools-everywhere-src-6.7.0-rc2.tar.xz 1110712 BLAKE2B 1ce9587c1dab67c59507cc468cf839a6cebf712096ddd7566babfe39bd0f9ccdd03d4e5bdcb3ff2c456503ec8bc23ea48f49d9a19fa12bcec0a38fd227517271 SHA512 191b9ee224d84bb7739d2feb8596204c6a0e24ce2cb3150ce7678b34babe7badb1092997642d252518f94b6e4e6cbcd86c232d274d39aa4f1b93161cfc64f9ab
 EBUILD qtshadertools-6.6.2.ebuild 370 BLAKE2B b7ae3cdbce349e0d2107a491b4d5bceac0eb06b364f8e1086a03dcb8807ed880fc304ffac0c50d8b78c2780c4f1c169a0250c762f1de0f360738e207b043a267 SHA512 874e04757efb2adda82fb807626d513d7209572bded2a8cd6a8edd905ab5faecc9f43e13a54f5bacad8bb882092a0c584650547d4003f9601e830b8a570c1bb0
 EBUILD qtshadertools-6.6.3.ebuild 372 BLAKE2B 5df971b0ae0b09780b3044442b9d87f64edc54714fa84f8a503d502cc8f6fb5724a4d67286357ecb9a625409b623ebc751bcbba99dea18e636a44c9d7f264d7f SHA512 9eceea3120720b1e8b86b069592156db111ad647b853a93e5eb555a3e7a71b0ae29e57f0f5e225c553a01b50f73e8e77a74fbaf6a7e155e5c5b9f7dc2412e084
-EBUILD qtshadertools-6.6.9999.ebuild 372 BLAKE2B 5df971b0ae0b09780b3044442b9d87f64edc54714fa84f8a503d502cc8f6fb5724a4d67286357ecb9a625409b623ebc751bcbba99dea18e636a44c9d7f264d7f SHA512 9eceea3120720b1e8b86b069592156db111ad647b853a93e5eb555a3e7a71b0ae29e57f0f5e225c553a01b50f73e8e77a74fbaf6a7e155e5c5b9f7dc2412e084
 EBUILD qtshadertools-6.7.0_rc2.ebuild 372 BLAKE2B 5df971b0ae0b09780b3044442b9d87f64edc54714fa84f8a503d502cc8f6fb5724a4d67286357ecb9a625409b623ebc751bcbba99dea18e636a44c9d7f264d7f SHA512 9eceea3120720b1e8b86b069592156db111ad647b853a93e5eb555a3e7a71b0ae29e57f0f5e225c553a01b50f73e8e77a74fbaf6a7e155e5c5b9f7dc2412e084
 EBUILD qtshadertools-6.7.9999.ebuild 372 BLAKE2B 5df971b0ae0b09780b3044442b9d87f64edc54714fa84f8a503d502cc8f6fb5724a4d67286357ecb9a625409b623ebc751bcbba99dea18e636a44c9d7f264d7f SHA512 9eceea3120720b1e8b86b069592156db111ad647b853a93e5eb555a3e7a71b0ae29e57f0f5e225c553a01b50f73e8e77a74fbaf6a7e155e5c5b9f7dc2412e084
 EBUILD qtshadertools-6.9999.ebuild 372 BLAKE2B 5df971b0ae0b09780b3044442b9d87f64edc54714fa84f8a503d502cc8f6fb5724a4d67286357ecb9a625409b623ebc751bcbba99dea18e636a44c9d7f264d7f SHA512 9eceea3120720b1e8b86b069592156db111ad647b853a93e5eb555a3e7a71b0ae29e57f0f5e225c553a01b50f73e8e77a74fbaf6a7e155e5c5b9f7dc2412e084
diff --git a/dev-qt/qtshadertools/qtshadertools-6.6.9999.ebuild b/dev-qt/qtshadertools/qtshadertools-6.6.9999.ebuild
deleted file mode 100644
index 68dae044e31f..000000000000
--- a/dev-qt/qtshadertools/qtshadertools-6.6.9999.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# 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}"
diff --git a/dev-qt/qtspeech/Manifest b/dev-qt/qtspeech/Manifest
index ae0b7ad9bf0c..8679ab0ac241 100644
--- a/dev-qt/qtspeech/Manifest
+++ b/dev-qt/qtspeech/Manifest
@@ -9,7 +9,6 @@ EBUILD qtspeech-5.15.12.ebuild 730 BLAKE2B c3941cd7399ec7d5cdffd2ad65611bc094c64
 EBUILD qtspeech-5.15.13.ebuild 735 BLAKE2B 95212de3670143fbadf97423af5dc5fdc25aefa791bd7a50d7593829aaa7943717b1509a2d40b0026a0f5f0705b263d7fc0fd0f4479dd12c81fc67deaf34d0a4 SHA512 6669cbebac5d8a27b5f47e55060ce5252922eb1d62a43ff595ef2f7f07e89fdab9f44cfa25382c5a319bbb1debc50e0fee127fd9db48591c144246eacd2aeb27
 EBUILD qtspeech-6.6.2.ebuild 1364 BLAKE2B 72c329cb72f4ef4690cef22793d4745b6eaf8ec3887a2244865a31b215d7cdb35b8bbd3e5c81390b83f046449f889055200df77f6feef550a6bc63105abb3d02 SHA512 68a75d4a93517c4ad62953cfa3dc1bcaa932122ec3ba0555e38035e3456083f3c520951f7d6c0be9be8429b139bf81fd4a17bd5dff85f000af68915087061ba2
 EBUILD qtspeech-6.6.3.ebuild 1383 BLAKE2B e0cc466527e97a7eddb6980e23eed042346e149ef59e72624d9557f7537e043c4de337ba3b054416d950501b2f4e22f2670c8c339bc1649b9a013699ae8554a7 SHA512 cc4c0f1b07fd4bbdcda3bd5c0ba8ba2b3c6b764632ca4a12fd3105e2f8d8a69201ccc306283acad3c9610186606978292ed34fba891fa0758e31803e830c5949
-EBUILD qtspeech-6.6.9999.ebuild 1366 BLAKE2B 166ce3e6ae3bf75b9ac597124f05b414fb7802ae59c4d2092207ff0a58385d92fcf6ac4ff9c55673cc0109bc1c362cd0ddaf03d775dacbc867e03c3541251cd4 SHA512 7ead7061fafbc1be0940d439a87901993a3904aab6b42f8a1b23e211101755152417c924a75882130ab3edb7b6d6d77e45464091c562ed39a00b8eeec2ab676d
 EBUILD qtspeech-6.7.0_rc2.ebuild 1366 BLAKE2B 166ce3e6ae3bf75b9ac597124f05b414fb7802ae59c4d2092207ff0a58385d92fcf6ac4ff9c55673cc0109bc1c362cd0ddaf03d775dacbc867e03c3541251cd4 SHA512 7ead7061fafbc1be0940d439a87901993a3904aab6b42f8a1b23e211101755152417c924a75882130ab3edb7b6d6d77e45464091c562ed39a00b8eeec2ab676d
 EBUILD qtspeech-6.7.9999.ebuild 1366 BLAKE2B 166ce3e6ae3bf75b9ac597124f05b414fb7802ae59c4d2092207ff0a58385d92fcf6ac4ff9c55673cc0109bc1c362cd0ddaf03d775dacbc867e03c3541251cd4 SHA512 7ead7061fafbc1be0940d439a87901993a3904aab6b42f8a1b23e211101755152417c924a75882130ab3edb7b6d6d77e45464091c562ed39a00b8eeec2ab676d
 EBUILD qtspeech-6.9999.ebuild 1366 BLAKE2B 166ce3e6ae3bf75b9ac597124f05b414fb7802ae59c4d2092207ff0a58385d92fcf6ac4ff9c55673cc0109bc1c362cd0ddaf03d775dacbc867e03c3541251cd4 SHA512 7ead7061fafbc1be0940d439a87901993a3904aab6b42f8a1b23e211101755152417c924a75882130ab3edb7b6d6d77e45464091c562ed39a00b8eeec2ab676d
diff --git a/dev-qt/qtspeech/qtspeech-6.6.9999.ebuild b/dev-qt/qtspeech/qtspeech-6.6.9999.ebuild
deleted file mode 100644
index 867d3ddc19b8..000000000000
--- a/dev-qt/qtspeech/qtspeech-6.6.9999.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 2023-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit qt6-build
-
-DESCRIPTION="Text-to-speech library for the Qt6 framework"
-
-if [[ ${QT6_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm64 ~loong"
-fi
-
-IUSE="flite qml +speechd"
-# can build with neither, but then it is just mock tts and may be confusing
-REQUIRED_USE="|| ( flite speechd )"
-
-# TODO: tests are known failing with clang and needs looking into, albeit
-# it is still usable at runtime save for applications segfaulting on exit
-# similarly to QTBUG-90626 (not that this has in-tree revdeps as of writing
-# of this). Restricting because also seen this result in hanging. Note that
-# qtspeech:6 is still somewhat new (started in 6.4.0), and should review
-# status on new major versions.
-RESTRICT="test"
-
-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 213595d8ea23..a4c6d4fa1dbc 100644
--- a/dev-qt/qtsvg/Manifest
+++ b/dev-qt/qtsvg/Manifest
@@ -9,7 +9,6 @@ EBUILD qtsvg-5.15.12.ebuild 496 BLAKE2B 973507084399af01f2f442cbfd3a6c9dfe91c818
 EBUILD qtsvg-5.15.13.ebuild 502 BLAKE2B 358b9357afa590a6ed6b39c3b7cc15646f2d4c7446b9b20289fed55ef393d14a3b6d940c6853e6fb29ff539c19733bfbdf79b2ed99f88e05c08ff236f01d17ee SHA512 2e928f12b9bb0510a7db953086e7ef99b560c62fde7a5c37654c9d309b8ac2d77395e9a88db5e9114e4c6832f9f0c70887451a57fd5a849e1431987d6130da7b
 EBUILD qtsvg-6.6.2.ebuild 391 BLAKE2B 8a6bc4b73cf1fdba0ea8b7986099ca22e5ec5e193e44762465ecb2042a3e9ce43c5f61175b4338b6cca29f4844dd4a067ef35f95e0b6d5153efd2ca0a80982c9 SHA512 02c4d36c3586ac2cb2750bdc97bf7b5d6d81523ecafaa98decf792412d56d8db666301e58b337ac9fafed8bc02072b2e5123d8117e4c21ebb57a4273d7560700
 EBUILD qtsvg-6.6.3.ebuild 393 BLAKE2B 590aebdab4891eb74fe461de8bb0170b15423d201eab166f794e87d04d7bdcb0e60f5317b7550e3c397046770b55949d69d48d1ea4fe117a3c17238348199fa9 SHA512 5bda049f2ae5e3f013a01034dabba7459d844cbc006a9d0463213db8e119c24d5056d40c838833fb4b82ea2ac8acedfb4a0f92fe011f2c768b45c6ce0bd1528b
-EBUILD qtsvg-6.6.9999.ebuild 393 BLAKE2B 590aebdab4891eb74fe461de8bb0170b15423d201eab166f794e87d04d7bdcb0e60f5317b7550e3c397046770b55949d69d48d1ea4fe117a3c17238348199fa9 SHA512 5bda049f2ae5e3f013a01034dabba7459d844cbc006a9d0463213db8e119c24d5056d40c838833fb4b82ea2ac8acedfb4a0f92fe011f2c768b45c6ce0bd1528b
 EBUILD qtsvg-6.7.0_rc2.ebuild 393 BLAKE2B 590aebdab4891eb74fe461de8bb0170b15423d201eab166f794e87d04d7bdcb0e60f5317b7550e3c397046770b55949d69d48d1ea4fe117a3c17238348199fa9 SHA512 5bda049f2ae5e3f013a01034dabba7459d844cbc006a9d0463213db8e119c24d5056d40c838833fb4b82ea2ac8acedfb4a0f92fe011f2c768b45c6ce0bd1528b
 EBUILD qtsvg-6.7.9999.ebuild 393 BLAKE2B 590aebdab4891eb74fe461de8bb0170b15423d201eab166f794e87d04d7bdcb0e60f5317b7550e3c397046770b55949d69d48d1ea4fe117a3c17238348199fa9 SHA512 5bda049f2ae5e3f013a01034dabba7459d844cbc006a9d0463213db8e119c24d5056d40c838833fb4b82ea2ac8acedfb4a0f92fe011f2c768b45c6ce0bd1528b
 EBUILD qtsvg-6.9999.ebuild 393 BLAKE2B 590aebdab4891eb74fe461de8bb0170b15423d201eab166f794e87d04d7bdcb0e60f5317b7550e3c397046770b55949d69d48d1ea4fe117a3c17238348199fa9 SHA512 5bda049f2ae5e3f013a01034dabba7459d844cbc006a9d0463213db8e119c24d5056d40c838833fb4b82ea2ac8acedfb4a0f92fe011f2c768b45c6ce0bd1528b
diff --git a/dev-qt/qtsvg/qtsvg-6.6.9999.ebuild b/dev-qt/qtsvg/qtsvg-6.6.9999.ebuild
deleted file mode 100644
index 566af04442ed..000000000000
--- a/dev-qt/qtsvg/qtsvg-6.6.9999.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 2021-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit qt6-build
-
-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}"
diff --git a/dev-qt/qttools/Manifest b/dev-qt/qttools/Manifest
index a23122e52aeb..ea554a02e13d 100644
--- a/dev-qt/qttools/Manifest
+++ b/dev-qt/qttools/Manifest
@@ -3,7 +3,6 @@ DIST qttools-everywhere-src-6.6.3.tar.xz 8596272 BLAKE2B 375a018d3fff0ef52e7e8e3
 DIST qttools-everywhere-src-6.7.0-rc2.tar.xz 9013380 BLAKE2B f6b9b83af390f3c2f851dc8e99ae6a045752a77f9878a1c096c35a034515680d27e65ca3ccf6d558de74804eb82f1a1c2e92377db1de014581685f44d05cb5ce SHA512 23b8a88397f89d1aaf80495d15bc34d3ebc54ef14097065bb2c013d4c408407a24fcc901b0c2691c2bec758309bea8f3c53be551960e58255b2e3858b817e3af
 EBUILD qttools-6.6.2.ebuild 4542 BLAKE2B 97b1c6bc9be1c42bbea95bbfc1f16793050aa919103fff63a7be786301bd396f16a00a76817feedeace43f766a3d9bba4ad9d9d1c99e4655c62483b392725843 SHA512 a6380a6dfe0d156e03ad68caa350aad1e7d72c1d9cd7f808ae1d27538d79e0d4ad8fe06f6a03532f848bd0bb3093d76d7a1d9323658ba516fce686b8d9d2c706
 EBUILD qttools-6.6.3.ebuild 4617 BLAKE2B 43df100437250e26e3a42d89c9debc0306fdd197881844ba9ba356c3af3de37570c49ef7c3c6083edeeaadd5747c8f7a39a9d653cc6647446cb3a7b3a9a48ab0 SHA512 67740fa1ba6776955b6b08b965342589068f8d8313e29e8073ab87f5759a38cdce4a9ff04797e0837d220cd89006bb2de9d78bc69b2d92b32018a1380d85527a
-EBUILD qttools-6.6.9999.ebuild 4617 BLAKE2B 43df100437250e26e3a42d89c9debc0306fdd197881844ba9ba356c3af3de37570c49ef7c3c6083edeeaadd5747c8f7a39a9d653cc6647446cb3a7b3a9a48ab0 SHA512 67740fa1ba6776955b6b08b965342589068f8d8313e29e8073ab87f5759a38cdce4a9ff04797e0837d220cd89006bb2de9d78bc69b2d92b32018a1380d85527a
 EBUILD qttools-6.7.0_rc2.ebuild 4647 BLAKE2B afebd788adca5f69928e1133b31bbd62868f9faed44672490573fc45ab001df93410247c699b017a952f9f597aebc1c297eef3bedc4af4775cbc0ecc3aeb79ac SHA512 7cfac939d123eca6572166b2db8eeeb8e8bb6a6f89bb9f9a1a1cadd618dd8ba9e09c3889c10e65b37fffa5c103bb37e8189847dcbebd6f07839d6a3a3342ffa1
 EBUILD qttools-6.7.9999.ebuild 4647 BLAKE2B afebd788adca5f69928e1133b31bbd62868f9faed44672490573fc45ab001df93410247c699b017a952f9f597aebc1c297eef3bedc4af4775cbc0ecc3aeb79ac SHA512 7cfac939d123eca6572166b2db8eeeb8e8bb6a6f89bb9f9a1a1cadd618dd8ba9e09c3889c10e65b37fffa5c103bb37e8189847dcbebd6f07839d6a3a3342ffa1
 EBUILD qttools-6.9999.ebuild 4647 BLAKE2B afebd788adca5f69928e1133b31bbd62868f9faed44672490573fc45ab001df93410247c699b017a952f9f597aebc1c297eef3bedc4af4775cbc0ecc3aeb79ac SHA512 7cfac939d123eca6572166b2db8eeeb8e8bb6a6f89bb9f9a1a1cadd618dd8ba9e09c3889c10e65b37fffa5c103bb37e8189847dcbebd6f07839d6a3a3342ffa1
diff --git a/dev-qt/qttools/qttools-6.6.9999.ebuild b/dev-qt/qttools/qttools-6.6.9999.ebuild
deleted file mode 100644
index db9c412f9118..000000000000
--- a/dev-qt/qttools/qttools-6.6.9999.ebuild
+++ /dev/null
@@ -1,153 +0,0 @@
-# Copyright 2021-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-LLVM_COMPAT=( {15..18} )
-LLVM_OPTIONAL=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 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 )
-"
-
-# behaves very badly when qttools is not already installed, also
-# other more minor issues (clang tests flaky depending on version,
-# and 3rdparty/ tries to FetchContent gtest)
-RESTRICT="test"
-
-RDEPEND="
-	~dev-qt/qtbase-${PV}:6[network,widgets?]
-	assistant? ( ~dev-qt/qtbase-${PV}:6[sql,sqlite] )
-	clang? (
-		$(llvm_gen_dep '
-			sys-devel/clang:${LLVM_SLOT}=
-			sys-devel/llvm:${LLVM_SLOT}=
-		')
-	)
-	designer? (
-		~dev-qt/qtbase-${PV}:6[xml,zstd=]
-		zstd? ( app-arch/zstd:= )
-	)
-	qdbus? ( ~dev-qt/qtbase-${PV}:6[dbus,xml] )
-	qml? ( ~dev-qt/qtdeclarative-${PV}:6[widgets?] )
-	qtdiag? ( ~dev-qt/qtbase-${PV}:6[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)
-
-		$(usev designer -DQT_UNITY_BUILD=OFF) # fails to build (QTBUG-122634)
-	)
-
-	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 ff274633be93..50bbf1b98278 100644
--- a/dev-qt/qttranslations/Manifest
+++ b/dev-qt/qttranslations/Manifest
@@ -7,7 +7,6 @@ EBUILD qttranslations-5.15.12.ebuild 379 BLAKE2B 4e8592ec1a5ee9571ebf1eb9fc40b2b
 EBUILD qttranslations-5.15.13.ebuild 385 BLAKE2B b85c05c072735b13b4e2d111bc3f1b71978c74dac911f876e52b3b40d9d371aa578c3ca23b780b07942ef943b04b17d626d01943af84b07bfbd9e9efc2fa926c SHA512 4f512b391fbffe1645a2e7cd2a8a017ecd39a7f915f4ef868790857f7d79a9d3b762e8101375c9bcef8498437beb0d083b39a679a7a6215de1ba5cf03b027915
 EBUILD qttranslations-6.6.2.ebuild 384 BLAKE2B bde32b7078402b722dfabd9d846c51ab1732dc2f5ac21913cd1f2b68db3d7657e686fd4942073158dcf38d151cf78a62692c6020171158b22b5d4a8e5cf552d5 SHA512 8a8a9a4ed6e96e72a1af5be1e282a9632026c3993ecae868dacbb0d7ed83616a7a6c0bb87bcccd4bcf4545df5546ca47e873b917b8df867d136f30c2dafabc3e
 EBUILD qttranslations-6.6.3.ebuild 386 BLAKE2B 7ff68b0a857ae216303bf14134f9c61f2793c3d3c943c7925ca8ba65439fb4fc211e3bf73887777b554168bf60b24c136241af59a58e2ee2b2139137bbbfb766 SHA512 ba1b140054b82bfecbb868d94c5332198609e389ab5e8505926fdc71adf9473590461e685a405c51b3629f9df0543ce5d63a0422cac161912fdd8e81a3ff3bbc
-EBUILD qttranslations-6.6.9999.ebuild 386 BLAKE2B 7ff68b0a857ae216303bf14134f9c61f2793c3d3c943c7925ca8ba65439fb4fc211e3bf73887777b554168bf60b24c136241af59a58e2ee2b2139137bbbfb766 SHA512 ba1b140054b82bfecbb868d94c5332198609e389ab5e8505926fdc71adf9473590461e685a405c51b3629f9df0543ce5d63a0422cac161912fdd8e81a3ff3bbc
 EBUILD qttranslations-6.7.0_rc2.ebuild 386 BLAKE2B 7ff68b0a857ae216303bf14134f9c61f2793c3d3c943c7925ca8ba65439fb4fc211e3bf73887777b554168bf60b24c136241af59a58e2ee2b2139137bbbfb766 SHA512 ba1b140054b82bfecbb868d94c5332198609e389ab5e8505926fdc71adf9473590461e685a405c51b3629f9df0543ce5d63a0422cac161912fdd8e81a3ff3bbc
 EBUILD qttranslations-6.7.9999.ebuild 386 BLAKE2B 7ff68b0a857ae216303bf14134f9c61f2793c3d3c943c7925ca8ba65439fb4fc211e3bf73887777b554168bf60b24c136241af59a58e2ee2b2139137bbbfb766 SHA512 ba1b140054b82bfecbb868d94c5332198609e389ab5e8505926fdc71adf9473590461e685a405c51b3629f9df0543ce5d63a0422cac161912fdd8e81a3ff3bbc
 EBUILD qttranslations-6.9999.ebuild 386 BLAKE2B 7ff68b0a857ae216303bf14134f9c61f2793c3d3c943c7925ca8ba65439fb4fc211e3bf73887777b554168bf60b24c136241af59a58e2ee2b2139137bbbfb766 SHA512 ba1b140054b82bfecbb868d94c5332198609e389ab5e8505926fdc71adf9473590461e685a405c51b3629f9df0543ce5d63a0422cac161912fdd8e81a3ff3bbc
diff --git a/dev-qt/qttranslations/qttranslations-6.6.9999.ebuild b/dev-qt/qttranslations/qttranslations-6.6.9999.ebuild
deleted file mode 100644
index 816f945a5646..000000000000
--- a/dev-qt/qttranslations/qttranslations-6.6.9999.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 2021-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-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 0e8b79b4ec5e..79a7f61d83a8 100644
--- a/dev-qt/qtvirtualkeyboard/Manifest
+++ b/dev-qt/qtvirtualkeyboard/Manifest
@@ -7,7 +7,6 @@ EBUILD qtvirtualkeyboard-5.15.12.ebuild 1215 BLAKE2B 69170c58bb99c493fc045c0901a
 EBUILD qtvirtualkeyboard-5.15.13.ebuild 1218 BLAKE2B 888d8fcf4f555cc30dda025441a340a8f8df1ba2efbf031a4f449f216e6a2f6863430f89a7ee405dde565afb08eb7618a1be94b67ff9721138848ce71f242ac0 SHA512 75bdbe2cd5b866d49fbfda1b657aad4f5edbfd7394caf65f782513617a64083a2fe5c04d0de15d426bcd5edcffe762297a330c19edc7601e25e355ce3da67010
 EBUILD qtvirtualkeyboard-6.6.2.ebuild 1101 BLAKE2B aef0afbd7c303a2ee6cb44f34c18a2fa11d960c5b1d60d653cd810f32b5630702305fd2d95fd61da23e21305621f8d0b8914a5151d123a98c8a6e4548565fa71 SHA512 82fc1baa8f078a1c255e9f69589a42c74b038186cb4a8499e1d9dd95a3fcee9a4d790ecb63af85497df3fcf03751846efd9e9a436e16953e63f8613568e5cf02
 EBUILD qtvirtualkeyboard-6.6.3.ebuild 1119 BLAKE2B 965c61b2630fc8b25993eb5563055a4972ae551716ab3f46f90fcb73b8fd1fc685867fe8ac2a242df9906268c73522a946d9c3d93987f46a647444cb5810a949 SHA512 0ba4ab450806e5188d571a2eeaa2b7f31fc08dccc1cb80d8c651eda9471e45b83c094d955914546330c6c181acd48af31fdb8a35a9e7971ae404dfba5719cd87
-EBUILD qtvirtualkeyboard-6.6.9999.ebuild 1102 BLAKE2B 26d87fdae6f6f01a7495e2eb9da88fec2bc2f438b27a8b4e424055ca223c257b36dc1be5b1e2bf98667ab47f0562a0cf5e68bf3d59f1bb3869f6a0cc8e4b8112 SHA512 4cebd1f576f1b5575dfa857d8a3fef03e1c2552fcb0325cf3e5000bcc83e1a9efba6cd51776aac1cd15fa8323a1f15431c6d7123a3fe2c55f68bd18737344fb2
 EBUILD qtvirtualkeyboard-6.7.0_rc2.ebuild 1102 BLAKE2B 26d87fdae6f6f01a7495e2eb9da88fec2bc2f438b27a8b4e424055ca223c257b36dc1be5b1e2bf98667ab47f0562a0cf5e68bf3d59f1bb3869f6a0cc8e4b8112 SHA512 4cebd1f576f1b5575dfa857d8a3fef03e1c2552fcb0325cf3e5000bcc83e1a9efba6cd51776aac1cd15fa8323a1f15431c6d7123a3fe2c55f68bd18737344fb2
 EBUILD qtvirtualkeyboard-6.7.9999.ebuild 1102 BLAKE2B 26d87fdae6f6f01a7495e2eb9da88fec2bc2f438b27a8b4e424055ca223c257b36dc1be5b1e2bf98667ab47f0562a0cf5e68bf3d59f1bb3869f6a0cc8e4b8112 SHA512 4cebd1f576f1b5575dfa857d8a3fef03e1c2552fcb0325cf3e5000bcc83e1a9efba6cd51776aac1cd15fa8323a1f15431c6d7123a3fe2c55f68bd18737344fb2
 EBUILD qtvirtualkeyboard-6.9999.ebuild 1102 BLAKE2B 26d87fdae6f6f01a7495e2eb9da88fec2bc2f438b27a8b4e424055ca223c257b36dc1be5b1e2bf98667ab47f0562a0cf5e68bf3d59f1bb3869f6a0cc8e4b8112 SHA512 4cebd1f576f1b5575dfa857d8a3fef03e1c2552fcb0325cf3e5000bcc83e1a9efba6cd51776aac1cd15fa8323a1f15431c6d7123a3fe2c55f68bd18737344fb2
diff --git a/dev-qt/qtvirtualkeyboard/qtvirtualkeyboard-6.6.9999.ebuild b/dev-qt/qtvirtualkeyboard/qtvirtualkeyboard-6.6.9999.ebuild
deleted file mode 100644
index f01f882be219..000000000000
--- a/dev-qt/qtvirtualkeyboard/qtvirtualkeyboard-6.6.9999.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# 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 ~loong"
-fi
-
-IUSE="+spell"
-
-RDEPEND="
-	~dev-qt/qtbase-${PV}:6[gui]
-	~dev-qt/qtdeclarative-${PV}:6
-	~dev-qt/qtsvg-${PV}:6
-	spell? ( app-text/hunspell:= )
-"
-DEPEND="${RDEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		$(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/qtwayland/Manifest b/dev-qt/qtwayland/Manifest
index c40ed6145fc8..7e5164a0eb5a 100644
--- a/dev-qt/qtwayland/Manifest
+++ b/dev-qt/qtwayland/Manifest
@@ -10,7 +10,6 @@ EBUILD qtwayland-5.15.12-r1.ebuild 1214 BLAKE2B 4d974a96e807dfbad6bf480bb6faf022
 EBUILD qtwayland-5.15.13.ebuild 1220 BLAKE2B 242495aedae55f8841f0b8ef9fab0dfc31be2640780231ec7f38932da38545091920711371778e5ac2d050bd923be2617c3b9b759449a4f3a4b92f0a314d9f0a SHA512 eb594ce8f52da2543f8c269881bfe1ecf4527d346caf5c6922fd7ed9619e07a225318834e661982bcadf01f09ca919b41f955b71579903e450468b7433e39e34
 EBUILD qtwayland-6.6.2-r1.ebuild 1277 BLAKE2B 91a13825970d4c1f88a2ad64bf44390bd96c3279b76a982edd256c6450dc218d0b02da158d57170f8a96381e5fbddce8718795cc423d1f380fbfd84bc19b4267 SHA512 2754c9e85f34808b292de92488014e31da1f42c9ba0183e418151c3fda80093136b936972dba20ef8f04a4d29e9f365942457f70866bad09ee3c8d25efea5728
 EBUILD qtwayland-6.6.3.ebuild 1221 BLAKE2B 9db919f7d7b6bcc5391ffd55a987f98bd69a1dab5791c7bc34fab38feb8cdd02d9e14a836095034f5cda4c17f82ed58dfd60665b96a7323ad070df9be4ade84d SHA512 8519a1de975696d7d21e9eaacaaee9102f3594dd2d1b2b11db14fbf52f961acc5daf2e8ac7b67c76ba5745e96ed4a6cb749c47194a3df636afb7ccd1d4f4f4a0
-EBUILD qtwayland-6.6.9999.ebuild 1221 BLAKE2B 9db919f7d7b6bcc5391ffd55a987f98bd69a1dab5791c7bc34fab38feb8cdd02d9e14a836095034f5cda4c17f82ed58dfd60665b96a7323ad070df9be4ade84d SHA512 8519a1de975696d7d21e9eaacaaee9102f3594dd2d1b2b11db14fbf52f961acc5daf2e8ac7b67c76ba5745e96ed4a6cb749c47194a3df636afb7ccd1d4f4f4a0
 EBUILD qtwayland-6.7.0_rc2.ebuild 1229 BLAKE2B a2ef0eece20a69fae358c8c0e22dd05c7d5a04cdd508e1ecb90883c87a6bc365db6443413e7a2150282d26ba8666361b281bd261f5f7a34b0bff24abf96bb723 SHA512 9465226c56e239182b87812bf532ba63e2632830d24e5b7aff53160ba587834bdb7faf9dde05da61084e0a44551cbbbd5599f0988ed92c0e0bc77a016a0ce289
 EBUILD qtwayland-6.7.9999.ebuild 1229 BLAKE2B a2ef0eece20a69fae358c8c0e22dd05c7d5a04cdd508e1ecb90883c87a6bc365db6443413e7a2150282d26ba8666361b281bd261f5f7a34b0bff24abf96bb723 SHA512 9465226c56e239182b87812bf532ba63e2632830d24e5b7aff53160ba587834bdb7faf9dde05da61084e0a44551cbbbd5599f0988ed92c0e0bc77a016a0ce289
 EBUILD qtwayland-6.9999.ebuild 1229 BLAKE2B a2ef0eece20a69fae358c8c0e22dd05c7d5a04cdd508e1ecb90883c87a6bc365db6443413e7a2150282d26ba8666361b281bd261f5f7a34b0bff24abf96bb723 SHA512 9465226c56e239182b87812bf532ba63e2632830d24e5b7aff53160ba587834bdb7faf9dde05da61084e0a44551cbbbd5599f0988ed92c0e0bc77a016a0ce289
diff --git a/dev-qt/qtwayland/qtwayland-6.6.9999.ebuild b/dev-qt/qtwayland/qtwayland-6.6.9999.ebuild
deleted file mode 100644
index daa91a6d626a..000000000000
--- a/dev-qt/qtwayland/qtwayland-6.6.9999.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# 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 qml vulkan"
-
-RDEPEND="
-	dev-libs/wayland
-	~dev-qt/qtbase-${PV}:6[accessibility=,gui,opengl,vulkan=]
-	media-libs/libglvnd
-	x11-libs/libxkbcommon
-	compositor? (
-		qml? ( ~dev-qt/qtdeclarative-${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
-)
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package qml Qt6Quick)
-		$(qt_feature compositor wayland_server)
-	)
-
-	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 5bc4019aafc4..ff1812f60f26 100644
--- a/dev-qt/qtwebchannel/Manifest
+++ b/dev-qt/qtwebchannel/Manifest
@@ -9,7 +9,6 @@ EBUILD qtwebchannel-5.15.12.ebuild 599 BLAKE2B 73cf6f6f51eadeaada9e9a50fd4ca14f1
 EBUILD qtwebchannel-5.15.13.ebuild 604 BLAKE2B 58db74102a72af51e33e8228c3d6f23d7a6173c2dae338074f812eeaa134d5ba8f0f5a8f8fab0b9d2cc964c1c7ef528159fc4d3ed5318b6304e5d511a95d6900 SHA512 3459d6f0c1dacc9f494e82f5ab76c0e29a5c11fecdec26fff823fcad959296a9f643a10648e827e18fe41946f97390f1b2f91e77f92308055f111d0417ebcda7
 EBUILD qtwebchannel-6.6.2.ebuild 525 BLAKE2B af6b403ea7afd606b9cb53b8620eceb719c5342fe3fc1432c8a119294eeb315ef683ce09d122b93ef732a0b9b14de2b80e32b07309ddd430eaedcc095758a64d SHA512 9952c68f95748cd8fd2c7094983938a5e8946a00268c0892c2b41b277355e19a12d0e9d3338ce2bd617f96ab297e7f3f5c9ac225bc3f7a56627e64dfe973bc57
 EBUILD qtwebchannel-6.6.3.ebuild 549 BLAKE2B 5c1e30c0a89113facc5e002ca5d42a1492961e11169ea500e93cac6c5bc340f17f45880e6785e447768c15e1189ddb29d826d5598a56501849341bff7a5325ca SHA512 5b99dd48027a9cb58a7a93bf8d27d55db677ecb6a50ca06f6a1b7ff1d8817ccef58e7b1bfe7e92d16da363d17961b841e0876e9f5ac150457f26e25a3c825ae6
-EBUILD qtwebchannel-6.6.9999.ebuild 527 BLAKE2B 9acc4b5d500faa8a066e24ffbe8b716c45cd88b5e2cd8c018be2f6850d66ec9ed52c876d649452e343d2f7634a5f39e7d0d26f119b485d78723f414c6a7f40ab SHA512 669d159fcbfe9b6263798fc8b60fcbaa90c2876fff028c23ae3c9f1a1eb632e8850ace82769ec7058b53fcc0acfa1183436a424b85fd5e6b1f35b090e2e347f1
 EBUILD qtwebchannel-6.7.0_rc2.ebuild 527 BLAKE2B 9acc4b5d500faa8a066e24ffbe8b716c45cd88b5e2cd8c018be2f6850d66ec9ed52c876d649452e343d2f7634a5f39e7d0d26f119b485d78723f414c6a7f40ab SHA512 669d159fcbfe9b6263798fc8b60fcbaa90c2876fff028c23ae3c9f1a1eb632e8850ace82769ec7058b53fcc0acfa1183436a424b85fd5e6b1f35b090e2e347f1
 EBUILD qtwebchannel-6.7.9999.ebuild 527 BLAKE2B 9acc4b5d500faa8a066e24ffbe8b716c45cd88b5e2cd8c018be2f6850d66ec9ed52c876d649452e343d2f7634a5f39e7d0d26f119b485d78723f414c6a7f40ab SHA512 669d159fcbfe9b6263798fc8b60fcbaa90c2876fff028c23ae3c9f1a1eb632e8850ace82769ec7058b53fcc0acfa1183436a424b85fd5e6b1f35b090e2e347f1
 EBUILD qtwebchannel-6.9999.ebuild 527 BLAKE2B 9acc4b5d500faa8a066e24ffbe8b716c45cd88b5e2cd8c018be2f6850d66ec9ed52c876d649452e343d2f7634a5f39e7d0d26f119b485d78723f414c6a7f40ab SHA512 669d159fcbfe9b6263798fc8b60fcbaa90c2876fff028c23ae3c9f1a1eb632e8850ace82769ec7058b53fcc0acfa1183436a424b85fd5e6b1f35b090e2e347f1
diff --git a/dev-qt/qtwebchannel/qtwebchannel-6.6.9999.ebuild b/dev-qt/qtwebchannel/qtwebchannel-6.6.9999.ebuild
deleted file mode 100644
index 196c658b4733..000000000000
--- a/dev-qt/qtwebchannel/qtwebchannel-6.6.9999.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# 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 ~arm64 ~loong"
-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-${PV}: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 3bf624798893..2f30b9da0640 100644
--- a/dev-qt/qtwebengine/Manifest
+++ b/dev-qt/qtwebengine/Manifest
@@ -18,8 +18,7 @@ EBUILD qtwebengine-5.15.12_p20240122.ebuild 8737 BLAKE2B bd97671fb3f4434bd649da7
 EBUILD qtwebengine-5.15.13_p20240322.ebuild 7287 BLAKE2B 1ad5fd5f92121cb8941a0facf649110ce9cf06de841e8168788b0cd7bfea311834adec4fa87fc3d0561f1aac369d303b79fc54747dc176da8b91a77e8f0cf32f SHA512 84d5dbc13931c158d768a7a07a78ca2383aebf7c7baebdcedf16403a1a48fe37cd9aacb66db76ee57320945fcfe6c8f23abc6d7930de43a1c2e9fbf37c11b47d
 EBUILD qtwebengine-6.6.2.ebuild 9404 BLAKE2B bada4c8cfbf518a600835b2cc19efb21e3a34909fae7c37814ace181c8312ff2e8ef6cf431fe6a98c73261be29acd4713a7c4d3cae845dca8f1df8a9ce76fd69 SHA512 2d5c4638a51c3a678c45ae98da9a9d0958321e8fd36dc2cf4e0506fcbf104a12969e0c79cd142e8b25e6b8aa642f92cb321ee364121eddffa933410b96cb06bf
 EBUILD qtwebengine-6.6.3.ebuild 9435 BLAKE2B 7462144a4e4c91f2f7387a036a2c6854a379fff2f03ebee3c41bb04b67cdeb4f27da83d2eb830119583e010a2d53fd219a616adeef5ba95bcd2b8ef5aee1601c SHA512 5163355fa6e5a3c0b7fc2b12af3732a2d16e4840364fcc98cb45264400d96198a883a35ced40ea2f48bc70b963f47263295d2a37353626f4a19784e27760447c
-EBUILD qtwebengine-6.6.9999.ebuild 9435 BLAKE2B 7462144a4e4c91f2f7387a036a2c6854a379fff2f03ebee3c41bb04b67cdeb4f27da83d2eb830119583e010a2d53fd219a616adeef5ba95bcd2b8ef5aee1601c SHA512 5163355fa6e5a3c0b7fc2b12af3732a2d16e4840364fcc98cb45264400d96198a883a35ced40ea2f48bc70b963f47263295d2a37353626f4a19784e27760447c
 EBUILD qtwebengine-6.7.0_rc2.ebuild 9831 BLAKE2B c98e5b9f93a99229e3b05d687991ebbf2ee4109be016aa99303a6eee9162c625db96742199f8f5df4928246f614c268eb26f95ddee4a4fa82d89e102c42100fc SHA512 4cfbd1745bc614c61ed3885a9a3a0c42c00dbc7b88007b1a33b88f78450922cff08001bae0257bd5e1961c3abb734ae7127d414758c5ee217c69f3af074ee3fb
-EBUILD qtwebengine-6.7.9999.ebuild 9787 BLAKE2B c0119d3abb55e1c8f91dea8837260dbf1386ed117c881e5525dd720e59e595f91fc167901e26c57f5fc0b96777cbe18a89070e6c99ba9629c8f34c607b0e57dd SHA512 bd5f1465a3271b0a5f01f089e94b2ec497f63284fe810cc3e5153d81aefb1aa25e706874215308c0c4448139ef7efedbe0331579ea870229087daae6583672c6
-EBUILD qtwebengine-6.9999.ebuild 9746 BLAKE2B 2a4bfdb5dd0ed4b638fa80f74f6706b830f3d7e7a8298491ca1b7a8f4a3c836d02b388236c707111166d659f8845707f00e93ccd3369c6fba91f076e35a793b1 SHA512 e5a9ed64389bb1fb45e593ed9448ce8ab3526c9f1421f81e82b2e7510263c1fcdcdb35d3dbf8052cd11339e203b1809e6d3b88041ef38f859e2d8d33bac4b84a
+EBUILD qtwebengine-6.7.9999.ebuild 9919 BLAKE2B e0422e8752bca5d665b3688e9360e1842eb5aeac9fa988c90a2a6a983150b4493cbf34a2500bb1a4ff138aab5461857210b009bd978a8e8feb84211b80a1a2e2 SHA512 5866b5a6aa7db1711d0fd04878ff567772d808201ecc9da707d1b73384d51d7e6a77965e2864a7f47391b540ceb7295552d15e0bae75f01c1763d92fba866813
+EBUILD qtwebengine-6.9999.ebuild 9834 BLAKE2B f58f17fe7553e5bc766c114bfbd42db1192ba7d7d664d4ed4c4e8a0b13cc4c42dca3596968c6d5b7b72bd6c2a3c6ea30dea0d63de54c7de032c0ecb16c279864 SHA512 fea4b0b4e5330ff441b2d1bf8857e24881201e0dceaac8e89a9e7226e46576555ff93081f72710aca13fb9f75ecb769445c933c58c94acb3409052578bda4afb
 MISC metadata.xml 1236 BLAKE2B 9a47d6cb2641ee53f22926095457c11f8da65a3705863a3ae0496d5bb656ac65acb744b5420deb95afee6ac9f141933b4f45690459e92c71089fe72727854a28 SHA512 9a640a386cc03804858fc02b24299896c03eff53a07db00862bab9d7dd259ca839e890921fcf222c8275cad16b418e423e7e485c03e74e01ab86979553251b4c
diff --git a/dev-qt/qtwebengine/qtwebengine-6.6.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-6.6.9999.ebuild
deleted file mode 100644
index 378b562a6fb0..000000000000
--- a/dev-qt/qtwebengine/qtwebengine-6.6.9999.ebuild
+++ /dev/null
@@ -1,314 +0,0 @@
-# Copyright 2021-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..12} )
-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.6-patchset-9.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 +widgets
-"
-REQUIRED_USE="
-	designer? ( qml widgets )
-"
-
-# dlopen: krb5, libva, pciutils, udev
-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/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/openjpeg:2=
-	media-libs/opus
-	media-libs/tiff:=
-	sys-apps/dbus
-	sys-apps/pciutils
-	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/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 )
-	pulseaudio? ( media-libs/libpulse[glib] )
-	qml? ( ~dev-qt/qtdeclarative-${PV}:6 )
-	screencast? (
-		dev-libs/glib:2
-		media-libs/mesa[gbm(+)]
-		media-video/pipewire:=
-		x11-libs/libdrm
-	)
-	system-icu? ( dev-libs/icu:= )
-	vaapi? (
-		media-libs/libva:=[X]
-		media-libs/mesa[gbm(+)]
-		x11-libs/libdrm
-	)
-	!vaapi? ( media-libs/libvpx:= )
-	widgets? ( ~dev-qt/qtdeclarative-${PV}:6[widgets] )
-"
-DEPEND="
-	${RDEPEND}
-	media-libs/libglvnd
-	x11-base/xorg-proto
-	x11-libs/libxshmfence
-	screencast? ( media-libs/libepoxy[egl(+)] )
-	pdfium? ( net-print/cups )
-	test? (
-		widgets? ( app-text/poppler[cxx(+)] )
-	)
-	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
-	"${FILESDIR}"/${PN}-6.6.2-clang18.patch
-)
-
-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=7G
-	local CHECKREQS_DISK_USR=220M
-
-	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 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
-		-DQT_FEATURE_webengine_ozone_x11=ON # needed, cannot do optional X yet
-		-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, may revisit
-		# (see discussions in https://github.com/gentoo/gentoo/pull/32281)
-		-DQT_FEATURE_webengine_system_re2=OFF
-
-		# bundled is currently required when using vaapi (forced regardless)
-		$(qt_feature !vaapi webengine_system_libvpx)
-
-		# not necessary to pass these (default), but in case detection fails
-		$(printf -- '-DQT_FEATURE_webengine_system_%s=ON ' \
-			freetype glib harfbuzz lcms2 libevent libjpeg \
-			libopenjpeg2 libpci libpng libtiff libwebp \
-			libxml minizip opus poppler snappy zlib)
-
-		# TODO: fixup gn cross, or package dev-qt/qtwebengine-gn with =ON
-		-DINSTALL_GN=OFF
-	)
-
-	local mygnargs=(
-		# prefer no dlopen where possible
-		link_pulseaudio=true
-		rtc_link_pipewire=true
-	)
-
-	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 NINJA 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_loadsignals
-		tst_qquickwebengineview
-		tst_qwebengineglobalsettings
-		tst_qwebengineview
-		# certs verfication seems flaky and gives expiration warnings
-		tst_qwebengineclientcertificatestore
-		# test is misperformed when qtbase is built USE=-test?
-		tst_touchinput
-	)
-
-	# 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/"
-}
-
-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.7.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-6.7.9999.ebuild
index dcc7ec6d9b87..e8636461bcc4 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.7.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.7.9999.ebuild
@@ -113,6 +113,7 @@ PATCHES=( "${WORKDIR}"/patches/${PN} )
 PATCHES+=(
 	# add extras as needed here, may merge in set if carries across versions
 	"${FILESDIR}"/${PN}-6.7.0-clang18.patch
+	"${FILESDIR}"/${PN}-6.7.0-x11-header.patch
 )
 
 python_check_deps() {
@@ -302,6 +303,10 @@ 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() {
diff --git a/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild
index 1e77e0077e41..a7523d65072f 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild
@@ -301,6 +301,10 @@ 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() {
diff --git a/dev-qt/qtwebsockets/Manifest b/dev-qt/qtwebsockets/Manifest
index b47090234608..bfd122f1547e 100644
--- a/dev-qt/qtwebsockets/Manifest
+++ b/dev-qt/qtwebsockets/Manifest
@@ -9,7 +9,6 @@ EBUILD qtwebsockets-5.15.12.ebuild 578 BLAKE2B a2f9c91925d8c60877cb1913fe32b4789
 EBUILD qtwebsockets-5.15.13.ebuild 583 BLAKE2B 895095a6d35d546b3e1125d5f9faf522449341a2110cc297bbf71e716d8cac1cc9b6e95d3617fcfd9a801a918e82dca10f7894cc5c30ec5743a9e76d80d95441 SHA512 b86e4a4ad96a2ccfcb4223fa381b69f031fed01fc967013c9c146cdeda5e9157d8564669f9582120d820dd3ca775cad16313935fbfa116af4ac1ee0db04cb1a5
 EBUILD qtwebsockets-6.6.2.ebuild 528 BLAKE2B a446e67deba184fecfce7037dc5943e84eb12a8f7d41e30a078214795b26b89373a0f6a80cf0c5bce62efc9f6ddcfc6515e87bf649526338c54851b63d0e53c5 SHA512 2e2dfde3da9b156307cfe09f6d0fbd81345b0e57c691890c92222c6968fd3964c750a1f69b12cda924ea95edefe969488be230b348e86b3311698b1921c1053f
 EBUILD qtwebsockets-6.6.3.ebuild 552 BLAKE2B 0715c8925466028d2be27c8986f1d2c6eb35f4cbf317b810e73b1fd6cd98a9a7202275f5c637c725f234588c44ec340c9ca1227a60e1b5fb5466aba2c3caef47 SHA512 1b54c792f02287dfa55bea7d5d97822be55e76a66b505c24894fab6e8cee11fc5ba9f7efefa38f46b6fbbc41ea9b178b4e655e797bb1f4aa42744ea57bcf0111
-EBUILD qtwebsockets-6.6.9999.ebuild 530 BLAKE2B adb3e915a64d449b15c2d543497da5542f12ba8a5a73c3ca0176bd9c0ff0d54d6f34f1194a2a0f0d46e8fe563cc9f5b216f01ea78dd22e22086593e5ce080abe SHA512 848a8bce93d9a6fe71ce50fc2592380627d05fb4b501cc6e2a016034a5cbe89d5fa353db4297246efbe7f8a1d3ed7bdb7ea9420ee840b31be5724c33230e6965
 EBUILD qtwebsockets-6.7.0_rc2.ebuild 530 BLAKE2B adb3e915a64d449b15c2d543497da5542f12ba8a5a73c3ca0176bd9c0ff0d54d6f34f1194a2a0f0d46e8fe563cc9f5b216f01ea78dd22e22086593e5ce080abe SHA512 848a8bce93d9a6fe71ce50fc2592380627d05fb4b501cc6e2a016034a5cbe89d5fa353db4297246efbe7f8a1d3ed7bdb7ea9420ee840b31be5724c33230e6965
 EBUILD qtwebsockets-6.7.9999.ebuild 530 BLAKE2B adb3e915a64d449b15c2d543497da5542f12ba8a5a73c3ca0176bd9c0ff0d54d6f34f1194a2a0f0d46e8fe563cc9f5b216f01ea78dd22e22086593e5ce080abe SHA512 848a8bce93d9a6fe71ce50fc2592380627d05fb4b501cc6e2a016034a5cbe89d5fa353db4297246efbe7f8a1d3ed7bdb7ea9420ee840b31be5724c33230e6965
 EBUILD qtwebsockets-6.9999.ebuild 530 BLAKE2B adb3e915a64d449b15c2d543497da5542f12ba8a5a73c3ca0176bd9c0ff0d54d6f34f1194a2a0f0d46e8fe563cc9f5b216f01ea78dd22e22086593e5ce080abe SHA512 848a8bce93d9a6fe71ce50fc2592380627d05fb4b501cc6e2a016034a5cbe89d5fa353db4297246efbe7f8a1d3ed7bdb7ea9420ee840b31be5724c33230e6965
diff --git a/dev-qt/qtwebsockets/qtwebsockets-6.6.9999.ebuild b/dev-qt/qtwebsockets/qtwebsockets-6.6.9999.ebuild
deleted file mode 100644
index 579c0f9dceb5..000000000000
--- a/dev-qt/qtwebsockets/qtwebsockets-6.6.9999.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# 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 ~arm64 ~loong"
-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 0fdbd067d311..eb59144b3dde 100644
--- a/dev-qt/qtwebview/Manifest
+++ b/dev-qt/qtwebview/Manifest
@@ -7,7 +7,6 @@ EBUILD qtwebview-5.15.12.ebuild 476 BLAKE2B d12a6e096e160e6707bd1c7a9a6d98e66734
 EBUILD qtwebview-5.15.13.ebuild 466 BLAKE2B 3de1ddf6099acf699e183addd1610d49f1548966c74530a405aa010e9ff8a28452b3301d0b5690f4b5d203289c05f0b5a1f34b2504b4a360117ae50c25060f7a SHA512 afadfad0adbf27a87cc2ceb25d70c8e2fd5cbf6c31735bde617b509a7d6c371ec1739cd089e79f4a9a7e97563a9dd080916748a23842b2694331ebe7db3b6fb7
 EBUILD qtwebview-6.6.2.ebuild 418 BLAKE2B 276a32fc1b99879b384a1fd53c2ea61575f3efa1d92ae97fe2ef994d638ed4b82faaa392c9d85f1f9326dabb5c75c845b9f86bedcc514768dd74bc1cea32ac77 SHA512 e51cd67e2621b9385f92bbcf903a90cf17ec651cdbfac79a7a3e3138ab5ef30c98a6fc5641245cb67ebee22f6e2329dffb6ff57ca4693c7175d6b0da0e209941
 EBUILD qtwebview-6.6.3.ebuild 419 BLAKE2B 0ffe8260517528ef08882841326fd6e1fa12cabb95f748c8dabff45e7dbb4b56e4555316005640f22518fbd625c69c7889b284fb55fca7f56f413376a3c0257b SHA512 4f5b2c8c2d5d765ad0f61d41301e00e7f90a8f8f363b4155bcfadeb69c690a11d260fd26eb54427eb950b070ebf13de62b68e55e6e146dceff67231c93c26405
-EBUILD qtwebview-6.6.9999.ebuild 414 BLAKE2B 37d06c6da7ecc13cdc9ba704acfc9e78a4d222ba679c090bcc94098bd81998ad10eab990b3d89a73471630437edc288a49450aeac12f7eb1ddc9aa4b8a188551 SHA512 4409b79ab5eacce5f621e181f0a173d4c2de92bce1d94dafe2dfb7dd3f2e1ccce06e30a610d5275d5bbe0530514267ace610e874a2f94ec622d157dada687ac3
 EBUILD qtwebview-6.7.0_rc2.ebuild 419 BLAKE2B 0ffe8260517528ef08882841326fd6e1fa12cabb95f748c8dabff45e7dbb4b56e4555316005640f22518fbd625c69c7889b284fb55fca7f56f413376a3c0257b SHA512 4f5b2c8c2d5d765ad0f61d41301e00e7f90a8f8f363b4155bcfadeb69c690a11d260fd26eb54427eb950b070ebf13de62b68e55e6e146dceff67231c93c26405
 EBUILD qtwebview-6.7.9999.ebuild 414 BLAKE2B 37d06c6da7ecc13cdc9ba704acfc9e78a4d222ba679c090bcc94098bd81998ad10eab990b3d89a73471630437edc288a49450aeac12f7eb1ddc9aa4b8a188551 SHA512 4409b79ab5eacce5f621e181f0a173d4c2de92bce1d94dafe2dfb7dd3f2e1ccce06e30a610d5275d5bbe0530514267ace610e874a2f94ec622d157dada687ac3
 EBUILD qtwebview-6.9999.ebuild 414 BLAKE2B 37d06c6da7ecc13cdc9ba704acfc9e78a4d222ba679c090bcc94098bd81998ad10eab990b3d89a73471630437edc288a49450aeac12f7eb1ddc9aa4b8a188551 SHA512 4409b79ab5eacce5f621e181f0a173d4c2de92bce1d94dafe2dfb7dd3f2e1ccce06e30a610d5275d5bbe0530514267ace610e874a2f94ec622d157dada687ac3
diff --git a/dev-qt/qtwebview/qtwebview-6.6.9999.ebuild b/dev-qt/qtwebview/qtwebview-6.6.9999.ebuild
deleted file mode 100644
index 81210cfc2b80..000000000000
--- a/dev-qt/qtwebview/qtwebview-6.6.9999.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 2023 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"
-fi
-
-RDEPEND="
-	~dev-qt/qtbase-${PV}:6[gui]
-	~dev-qt/qtdeclarative-${PV}:6
-	~dev-qt/qtwebengine-${PV}:6[qml]
-"
-DEPEND="${RDEPEND}"