gentoo auto-resync : 24:01:2023 - 12:57:16

120 files changed, 0 insertions, 3328 deletions

diff --git a/dev-qt/Manifest.gz b/dev-qt/Manifest.gz
index e79438196918..e69fa2eefb57 100644
--- a/dev-qt/Manifest.gz
+++ b/dev-qt/Manifest.gz
diff --git a/dev-qt/assistant/Manifest b/dev-qt/assistant/Manifest
index 5ac86a98fbd0..a55f64c84c53 100644
--- a/dev-qt/assistant/Manifest
+++ b/dev-qt/assistant/Manifest
@@ -1,7 +1,4 @@
-DIST qttools-5.15.7-gentoo-kde-1.tar.xz 1016 BLAKE2B 2269c02954d34a2862585228b2e3a3536a4b6f37b93c170571afa83d5e9c601684d1bf3d961d8be84acf8af074f4fdf929614c03ba262de8056af778bd41ac71 SHA512 0ac735a9e54fa147a495403e710a75aaf3ab4d2cb51a5db783d7b4b401bc2d6f46bb451d3afaa0efef57fe0dbd1aad95ab3262d88eafeb1f533314132cf400e6
 DIST qttools-5.15.8-gentoo-kde-1.tar.xz 1020 BLAKE2B 1585a66678f318e38b50b17a52f3efd1b53c9c13ceaf63a21fb532ad55790d1f8a5829a10d064de0a7d6efce47bc672916c580b5222f43c35f7869371fc91857 SHA512 e1333e15b1d2f546f6c2164a7da0ef684c024cfa48b847d5671716fa789fdab7e1ed50f3be6efe09e56578c62dd6029aa1fa1546d34b53bba9894445b58aa860
-DIST qttools-everywhere-opensource-src-5.15.7.tar.xz 8900816 BLAKE2B c414cd92eeb7b3cc1b90c1bbb77409ba4e6f33b36cef9376a49068d8698461f211f062d5a7e80321e62ae2dd84f476252658ce3f0239d710945378d8ddfb01d4 SHA512 40176727d8c8430171483fd5815c1f84b8fc4d1a1b26b943c817e9a14cfe2d155c76039593f68f45b7e9276189968f3b37e1b17fd99adda7664582bf30a3935a
 DIST qttools-everywhere-opensource-src-5.15.8.tar.xz 8898368 BLAKE2B ea99e5bdf86d6d48fabd45bf55a48e5604d1a1e938a12838d3a928449d41354c4986401e7f159718432004f7357e28c88d7939f32bc2942bda1cb3abb8e28c33 SHA512 1248b61e21d1bab30c6f8380af0b83ffd2c5f4e75b2906f561f8aae3a8be2e426ca4ffa28164d64a90cc75c570652229847c7009b7aec63c6ba8e977dbdd4f4f
-EBUILD assistant-5.15.7.ebuild 1304 BLAKE2B 6f979f699f9c6da5f4a63fd0671691914b77c08eb3ff4daefd03f4b61419788d510ac332e9e7816ab45aa0395d03379c0bc51af0573f46aec0c3efd3b45f51fa SHA512 48c7977b8b9a46eae7afaf49abfd7b2afcb179576dc31e7f3eb6a35cab0ee536a87b38fda1501dba0b870d8d6f794bdc8537a18af71b1b891e7423046a4c19e5
 EBUILD assistant-5.15.8.ebuild 1304 BLAKE2B a8346fafdd8d94ad7da1f46ef1ba63bdff287c9a50b3fce4cb1eeeecb810b7e1117323bb503c83f54e7237f1d920d9d43f9e5ec4cde95e9403be0e1e3da69080 SHA512 b11a0b125b33f8760db75d31f65a46d7928502eda6bee6cd9a4b6518386fa753612a0a673d685a30ff87d1c8fc0b6ff37b99c33f47de48a7afdebfecdea5c5f3
 MISC metadata.xml 482 BLAKE2B 651a49dc4a07f5e5a9c21990868e666d98acdea7d7b0b2c0e4c98eafc3da72c803d380e4abda30f33250f7bbd7654df713833ccdddcb975cbad6f92e488f643b SHA512 192c670abd7da29645513bf1d9297d942efdc49f5cf170861e7689fda47f51daa47f10c7c81c3b045366e0259179c6839ff7747197c9d792e8d0fd1a5818973e
diff --git a/dev-qt/assistant/assistant-5.15.7.ebuild b/dev-qt/assistant/assistant-5.15.7.ebuild
deleted file mode 100644
index 8139f52a3136..000000000000
--- a/dev-qt/assistant/assistant-5.15.7.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-if [[ ${PV} != *9999* ]]; then
-	QT5_KDEPATCHSET_REV=1
-	KEYWORDS="amd64 ~arm arm64 ~hppa ppc64 ~sparc x86"
-fi
-
-QT5_MODULE="qttools"
-inherit desktop qt5-build xdg-utils
-
-DESCRIPTION="Tool for viewing on-line documentation in Qt help file format"
-
-IUSE=""
-
-DEPEND="
-	=dev-qt/qtcore-${QT5_PV}*:5=
-	=dev-qt/qtgui-${QT5_PV}*[png]
-	=dev-qt/qthelp-${QT5_PV}*
-	=dev-qt/qtnetwork-${QT5_PV}*
-	=dev-qt/qtprintsupport-${QT5_PV}*
-	=dev-qt/qtsql-${QT5_PV}*[sqlite]
-	=dev-qt/qtwidgets-${QT5_PV}*
-"
-RDEPEND="${DEPEND}
-	!dev-qt/${PN}:5
-	!<dev-qt/qtchooser-66-r2
-"
-
-QT5_TARGET_SUBDIRS=(
-	src/assistant/assistant
-)
-
-src_prepare() {
-	sed -e "s/qtHaveModule(webkitwidgets)/false/g" \
-		-i src/assistant/assistant/assistant.pro || die
-
-	qt5-build_src_prepare
-}
-
-src_install() {
-	qt5-build_src_install
-	qt5_symlink_binary_to_path assistant
-
-	doicon -s 32 src/assistant/assistant/images/assistant.png
-	newicon -s 128 src/assistant/assistant/images/assistant-128.png assistant.png
-	make_desktop_entry "${QT5_BINDIR}"/assistant 'Qt 5 Assistant' assistant 'Qt;Development;Documentation'
-}
-
-pkg_postinst() {
-	qt5-build_pkg_postinst
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	qt5-build_pkg_postrm
-	xdg_icon_cache_update
-}
diff --git a/dev-qt/designer/Manifest b/dev-qt/designer/Manifest
index 6acc36929e2a..2dca5548e4c3 100644
--- a/dev-qt/designer/Manifest
+++ b/dev-qt/designer/Manifest
@@ -1,7 +1,4 @@
-DIST qttools-5.15.7-gentoo-kde-1.tar.xz 1016 BLAKE2B 2269c02954d34a2862585228b2e3a3536a4b6f37b93c170571afa83d5e9c601684d1bf3d961d8be84acf8af074f4fdf929614c03ba262de8056af778bd41ac71 SHA512 0ac735a9e54fa147a495403e710a75aaf3ab4d2cb51a5db783d7b4b401bc2d6f46bb451d3afaa0efef57fe0dbd1aad95ab3262d88eafeb1f533314132cf400e6
 DIST qttools-5.15.8-gentoo-kde-1.tar.xz 1020 BLAKE2B 1585a66678f318e38b50b17a52f3efd1b53c9c13ceaf63a21fb532ad55790d1f8a5829a10d064de0a7d6efce47bc672916c580b5222f43c35f7869371fc91857 SHA512 e1333e15b1d2f546f6c2164a7da0ef684c024cfa48b847d5671716fa789fdab7e1ed50f3be6efe09e56578c62dd6029aa1fa1546d34b53bba9894445b58aa860
-DIST qttools-everywhere-opensource-src-5.15.7.tar.xz 8900816 BLAKE2B c414cd92eeb7b3cc1b90c1bbb77409ba4e6f33b36cef9376a49068d8698461f211f062d5a7e80321e62ae2dd84f476252658ce3f0239d710945378d8ddfb01d4 SHA512 40176727d8c8430171483fd5815c1f84b8fc4d1a1b26b943c817e9a14cfe2d155c76039593f68f45b7e9276189968f3b37e1b17fd99adda7664582bf30a3935a
 DIST qttools-everywhere-opensource-src-5.15.8.tar.xz 8898368 BLAKE2B ea99e5bdf86d6d48fabd45bf55a48e5604d1a1e938a12838d3a928449d41354c4986401e7f159718432004f7357e28c88d7939f32bc2942bda1cb3abb8e28c33 SHA512 1248b61e21d1bab30c6f8380af0b83ffd2c5f4e75b2906f561f8aae3a8be2e426ca4ffa28164d64a90cc75c570652229847c7009b7aec63c6ba8e977dbdd4f4f
-EBUILD designer-5.15.7.ebuild 1322 BLAKE2B fccaa0983cbcaa1cf3bedf0ca5e9fd9c513f1778cd7d6daa5c975ea45ff568e98c115bd7cd926619c377d6fec98597e649baae8be52af4ba648b3576d4970773 SHA512 da2036faf979ecf4b74a6fba4e7547dd689a7c1fb53b0d263bb205ae20c27b5d27d925c0133e9921c5d630fbcb0049de1e5ed7e1ffe0a2904dc6d7cc6fc37009
 EBUILD designer-5.15.8.ebuild 1322 BLAKE2B c91457e4c5f542c5d3e4599d4d0c51de785541ec4418adecb5611dde64a5eea71987e6f559c22291e134568f5b4b1d1c762e6e0c6773bb3863ba028ed86e9531 SHA512 f139c7cf3d6a97c41e96a4a0ec961627940d2a43b5a889672dfd1d6936a065b5f0f39ffd7e8e319b95a795ede6bb774e307feba9212763cfbf2aa087b43d8682
 MISC metadata.xml 565 BLAKE2B ff18f784bf09ba4add0fe5a9966a07ba2694dd84046bc528b22bcfd643a7e57be99235bd98eca4e58f68636f9fe6c8e274aabf82ed2055c6a4c70d10c60864ed SHA512 357d80b857e508aeceefcb45ab3757ce24d6ec3e1fd67642f2cbedf496748f89ab5a9726eb974bea8d5b1693601a965571913f79b1325aeaf9020183882ba16d
diff --git a/dev-qt/designer/designer-5.15.7.ebuild b/dev-qt/designer/designer-5.15.7.ebuild
deleted file mode 100644
index 49b83c5ed277..000000000000
--- a/dev-qt/designer/designer-5.15.7.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-if [[ ${PV} != *9999* ]]; then
-	QT5_KDEPATCHSET_REV=1
-	KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv x86"
-fi
-
-QT5_MODULE="qttools"
-inherit desktop qt5-build xdg-utils
-
-DESCRIPTION="WYSIWYG tool for designing and building graphical user interfaces with QtWidgets"
-
-IUSE="declarative"
-
-DEPEND="
-	=dev-qt/qtcore-${QT5_PV}*:5=
-	=dev-qt/qtgui-${QT5_PV}*:5=[png]
-	=dev-qt/qtnetwork-${QT5_PV}*
-	=dev-qt/qtprintsupport-${QT5_PV}*
-	=dev-qt/qtwidgets-${QT5_PV}*
-	=dev-qt/qtxml-${QT5_PV}*
-	declarative? ( =dev-qt/qtdeclarative-${QT5_PV}*[widgets] )
-"
-RDEPEND="${DEPEND}"
-
-QT5_TARGET_SUBDIRS=(
-	src/designer
-)
-
-src_prepare() {
-	qt_use_disable_mod declarative quickwidgets \
-		src/designer/src/plugins/plugins.pro
-
-	sed -e "s/qtHaveModule(webkitwidgets)/false/g" \
-		-i src/designer/src/plugins/plugins.pro || die
-
-	qt5-build_src_prepare
-}
-
-src_install() {
-	qt5-build_src_install
-	qt5_symlink_binary_to_path designer 5
-
-	doicon -s 128 src/designer/src/designer/images/designer.png
-	make_desktop_entry "${QT5_BINDIR}"/designer 'Qt 5 Designer' designer 'Qt;Development;GUIDesigner'
-}
-
-pkg_postinst() {
-	qt5-build_pkg_postinst
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	qt5-build_pkg_postrm
-	xdg_icon_cache_update
-}
diff --git a/dev-qt/linguist-tools/Manifest b/dev-qt/linguist-tools/Manifest
index 1776392ff3bc..0b457c146701 100644
--- a/dev-qt/linguist-tools/Manifest
+++ b/dev-qt/linguist-tools/Manifest
@@ -1,7 +1,4 @@
-DIST qttools-5.15.7-gentoo-kde-1.tar.xz 1016 BLAKE2B 2269c02954d34a2862585228b2e3a3536a4b6f37b93c170571afa83d5e9c601684d1bf3d961d8be84acf8af074f4fdf929614c03ba262de8056af778bd41ac71 SHA512 0ac735a9e54fa147a495403e710a75aaf3ab4d2cb51a5db783d7b4b401bc2d6f46bb451d3afaa0efef57fe0dbd1aad95ab3262d88eafeb1f533314132cf400e6
 DIST qttools-5.15.8-gentoo-kde-1.tar.xz 1020 BLAKE2B 1585a66678f318e38b50b17a52f3efd1b53c9c13ceaf63a21fb532ad55790d1f8a5829a10d064de0a7d6efce47bc672916c580b5222f43c35f7869371fc91857 SHA512 e1333e15b1d2f546f6c2164a7da0ef684c024cfa48b847d5671716fa789fdab7e1ed50f3be6efe09e56578c62dd6029aa1fa1546d34b53bba9894445b58aa860
-DIST qttools-everywhere-opensource-src-5.15.7.tar.xz 8900816 BLAKE2B c414cd92eeb7b3cc1b90c1bbb77409ba4e6f33b36cef9376a49068d8698461f211f062d5a7e80321e62ae2dd84f476252658ce3f0239d710945378d8ddfb01d4 SHA512 40176727d8c8430171483fd5815c1f84b8fc4d1a1b26b943c817e9a14cfe2d155c76039593f68f45b7e9276189968f3b37e1b17fd99adda7664582bf30a3935a
 DIST qttools-everywhere-opensource-src-5.15.8.tar.xz 8898368 BLAKE2B ea99e5bdf86d6d48fabd45bf55a48e5604d1a1e938a12838d3a928449d41354c4986401e7f159718432004f7357e28c88d7939f32bc2942bda1cb3abb8e28c33 SHA512 1248b61e21d1bab30c6f8380af0b83ffd2c5f4e75b2906f561f8aae3a8be2e426ca4ffa28164d64a90cc75c570652229847c7009b7aec63c6ba8e977dbdd4f4f
-EBUILD linguist-tools-5.15.7.ebuild 722 BLAKE2B 65fec8751ef9f3fe2bf40a1b7f91ef5956c374bbf4b6b4c4ba45b647ff519a640a72bd0bac93ac30e6b820995972465927aad09f82b279cafc0376a14c90bd8b SHA512 dceadfb143c26a2fdee916862b7d950c5b261552acceab33c81fe238da345f6e07d53913d070b4ac5a677d4b4ffec999980e5083bb80097a33cee485d6f5873e
 EBUILD linguist-tools-5.15.8.ebuild 722 BLAKE2B cf53532a6adf8836728f9ae0ce4c592107042f4079cec0af41987e944f69c2a0c096531ab4c2e1002c56a73577db27442e76192fc538849164236909769a8f25 SHA512 1e6ca9494ed3b86c9001cd5611c60d1801f9fce7a42a1f621b8d8270f0d67a2927973678fba6ac12ce8a8311cd36bc425d679516582117d9eda9e6e84795048e
 MISC metadata.xml 553 BLAKE2B 0306175072e5a0abff04f61eca76aa56daba272d1308419efd9ab80c4693eb795012b4e45a4cc102f6a9ec842105a805d9c5e75f84ae8007508a4d7d807d444b SHA512 d1edc09cbb7d757cd72b9b3dce980e0fede2cf69a83b78a072d81aea97692cb235227213cf02aa8207f33bc4a510a63baee359d5e8669ea7e0e5268dcd522e79
diff --git a/dev-qt/linguist-tools/linguist-tools-5.15.7.ebuild b/dev-qt/linguist-tools/linguist-tools-5.15.7.ebuild
deleted file mode 100644
index bb8da289e35d..000000000000
--- a/dev-qt/linguist-tools/linguist-tools-5.15.7.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-if [[ ${PV} != *9999* ]]; then
-	QT5_KDEPATCHSET_REV=1
-	KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86"
-fi
-
-QT5_MODULE="qttools"
-inherit qt5-build
-
-DESCRIPTION="Tools for working with Qt translation data files"
-
-IUSE="qml"
-
-DEPEND="
-	=dev-qt/qtcore-${QT5_PV}*:5=
-	=dev-qt/qtxml-${QT5_PV}*
-	qml? ( =dev-qt/qtdeclarative-${QT5_PV}* )
-"
-RDEPEND="${DEPEND}"
-
-QT5_TARGET_SUBDIRS=(
-	src/linguist
-)
-
-src_prepare() {
-	sed -i -e '/SUBDIRS += linguist/d' \
-		src/linguist/linguist.pro || die
-
-	qt_use_disable_mod qml qmldevtools-private \
-		src/linguist/lupdate/lupdate.pro
-
-	qt5-build_src_prepare
-}
diff --git a/dev-qt/linguist/Manifest b/dev-qt/linguist/Manifest
index 2219217fa77f..a16dec5cd375 100644
--- a/dev-qt/linguist/Manifest
+++ b/dev-qt/linguist/Manifest
@@ -1,7 +1,4 @@
-DIST qttools-5.15.7-gentoo-kde-1.tar.xz 1016 BLAKE2B 2269c02954d34a2862585228b2e3a3536a4b6f37b93c170571afa83d5e9c601684d1bf3d961d8be84acf8af074f4fdf929614c03ba262de8056af778bd41ac71 SHA512 0ac735a9e54fa147a495403e710a75aaf3ab4d2cb51a5db783d7b4b401bc2d6f46bb451d3afaa0efef57fe0dbd1aad95ab3262d88eafeb1f533314132cf400e6
 DIST qttools-5.15.8-gentoo-kde-1.tar.xz 1020 BLAKE2B 1585a66678f318e38b50b17a52f3efd1b53c9c13ceaf63a21fb532ad55790d1f8a5829a10d064de0a7d6efce47bc672916c580b5222f43c35f7869371fc91857 SHA512 e1333e15b1d2f546f6c2164a7da0ef684c024cfa48b847d5671716fa789fdab7e1ed50f3be6efe09e56578c62dd6029aa1fa1546d34b53bba9894445b58aa860
-DIST qttools-everywhere-opensource-src-5.15.7.tar.xz 8900816 BLAKE2B c414cd92eeb7b3cc1b90c1bbb77409ba4e6f33b36cef9376a49068d8698461f211f062d5a7e80321e62ae2dd84f476252658ce3f0239d710945378d8ddfb01d4 SHA512 40176727d8c8430171483fd5815c1f84b8fc4d1a1b26b943c817e9a14cfe2d155c76039593f68f45b7e9276189968f3b37e1b17fd99adda7664582bf30a3935a
 DIST qttools-everywhere-opensource-src-5.15.8.tar.xz 8898368 BLAKE2B ea99e5bdf86d6d48fabd45bf55a48e5604d1a1e938a12838d3a928449d41354c4986401e7f159718432004f7357e28c88d7939f32bc2942bda1cb3abb8e28c33 SHA512 1248b61e21d1bab30c6f8380af0b83ffd2c5f4e75b2906f561f8aae3a8be2e426ca4ffa28164d64a90cc75c570652229847c7009b7aec63c6ba8e977dbdd4f4f
-EBUILD linguist-5.15.7.ebuild 1104 BLAKE2B a99683e7209b578058973f725d064f92e3956c99f191b612248b1adbf7e1ad95b6e9cf1e797abddc10d5d14215ebca6b9e80ff05de93180ff178f4a5bab6c728 SHA512 8197cdae85e1b735d3de92ea0b4c15a7b4f95dc41fc949e15c82ec0ecbc5a6d35c6a6e78d1ebef2b125a8cac9b8d46767c6baa99d084131e0ad1166654cec7e7
 EBUILD linguist-5.15.8.ebuild 1104 BLAKE2B 9bfca39b022b73027a2da3ab1d4dbab4794e73a98e0167ba4e0ac84c71df32e0b0e19c7376401dd753f5dbf8096e96120960c4299e1a2d5aed1176ec6e4b1468 SHA512 7b4556d5fbbb9fb8563aa1f28ba4a4d52aabe9b3662f16fcc3cd863e6839e77c187be96fa870cf0be059d4f475218c44d2c01b39245d27fb8a90732889d3b419
 MISC metadata.xml 482 BLAKE2B 651a49dc4a07f5e5a9c21990868e666d98acdea7d7b0b2c0e4c98eafc3da72c803d380e4abda30f33250f7bbd7654df713833ccdddcb975cbad6f92e488f643b SHA512 192c670abd7da29645513bf1d9297d942efdc49f5cf170861e7689fda47f51daa47f10c7c81c3b045366e0259179c6839ff7747197c9d792e8d0fd1a5818973e
diff --git a/dev-qt/linguist/linguist-5.15.7.ebuild b/dev-qt/linguist/linguist-5.15.7.ebuild
deleted file mode 100644
index af85c8c0ceec..000000000000
--- a/dev-qt/linguist/linguist-5.15.7.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-if [[ ${PV} != *9999* ]]; then
-	QT5_KDEPATCHSET_REV=1
-	KEYWORDS="amd64 ~arm arm64 ~hppa ppc64 x86"
-fi
-
-QT5_MODULE="qttools"
-inherit desktop qt5-build xdg-utils
-
-DESCRIPTION="Graphical tool for translating Qt applications"
-
-IUSE=""
-
-DEPEND="
-	=dev-qt/designer-${QT5_PV}*
-	=dev-qt/qtcore-${QT5_PV}*:5=
-	=dev-qt/qtgui-${QT5_PV}*:5=[png]
-	=dev-qt/qtprintsupport-${QT5_PV}*
-	=dev-qt/qtwidgets-${QT5_PV}*
-	=dev-qt/qtxml-${QT5_PV}*
-"
-RDEPEND="${DEPEND}
-	!dev-qt/${PN}:5
-	!<dev-qt/qtchooser-66-r2
-"
-
-QT5_TARGET_SUBDIRS=(
-	src/linguist/linguist
-)
-
-src_install() {
-	qt5-build_src_install
-	qt5_symlink_binary_to_path linguist
-
-	local size
-	for size in 16 32 48 64 128; do
-		newicon -s ${size} src/linguist/linguist/images/icons/linguist-${size}-32.png linguist.png
-	done
-	make_desktop_entry "${QT5_BINDIR}"/linguist 'Qt 5 Linguist' linguist 'Qt;Development;Translation'
-}
-
-pkg_postinst() {
-	qt5-build_pkg_postinst
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	qt5-build_pkg_postrm
-	xdg_icon_cache_update
-}
diff --git a/dev-qt/pixeltool/Manifest b/dev-qt/pixeltool/Manifest
index 68fa90153edd..3a079695b7a2 100644
--- a/dev-qt/pixeltool/Manifest
+++ b/dev-qt/pixeltool/Manifest
@@ -1,7 +1,4 @@
-DIST qttools-5.15.7-gentoo-kde-1.tar.xz 1016 BLAKE2B 2269c02954d34a2862585228b2e3a3536a4b6f37b93c170571afa83d5e9c601684d1bf3d961d8be84acf8af074f4fdf929614c03ba262de8056af778bd41ac71 SHA512 0ac735a9e54fa147a495403e710a75aaf3ab4d2cb51a5db783d7b4b401bc2d6f46bb451d3afaa0efef57fe0dbd1aad95ab3262d88eafeb1f533314132cf400e6
 DIST qttools-5.15.8-gentoo-kde-1.tar.xz 1020 BLAKE2B 1585a66678f318e38b50b17a52f3efd1b53c9c13ceaf63a21fb532ad55790d1f8a5829a10d064de0a7d6efce47bc672916c580b5222f43c35f7869371fc91857 SHA512 e1333e15b1d2f546f6c2164a7da0ef684c024cfa48b847d5671716fa789fdab7e1ed50f3be6efe09e56578c62dd6029aa1fa1546d34b53bba9894445b58aa860
-DIST qttools-everywhere-opensource-src-5.15.7.tar.xz 8900816 BLAKE2B c414cd92eeb7b3cc1b90c1bbb77409ba4e6f33b36cef9376a49068d8698461f211f062d5a7e80321e62ae2dd84f476252658ce3f0239d710945378d8ddfb01d4 SHA512 40176727d8c8430171483fd5815c1f84b8fc4d1a1b26b943c817e9a14cfe2d155c76039593f68f45b7e9276189968f3b37e1b17fd99adda7664582bf30a3935a
 DIST qttools-everywhere-opensource-src-5.15.8.tar.xz 8898368 BLAKE2B ea99e5bdf86d6d48fabd45bf55a48e5604d1a1e938a12838d3a928449d41354c4986401e7f159718432004f7357e28c88d7939f32bc2942bda1cb3abb8e28c33 SHA512 1248b61e21d1bab30c6f8380af0b83ffd2c5f4e75b2906f561f8aae3a8be2e426ca4ffa28164d64a90cc75c570652229847c7009b7aec63c6ba8e977dbdd4f4f
-EBUILD pixeltool-5.15.7.ebuild 595 BLAKE2B eeb58e29fc5096b77c50e98914ec41d7aa50638785eea846c16ca7da557ff8aacbcbe32252d2801c618f01ce079e1f2e4b991c12ee50e08c0ef328eb3e268391 SHA512 aeab5fe9b3a571c60c561b01d7b4f1ca399ccd25e85c20cca9b25b7f47457be39e22ad5806612b584cb78effc231d9bc9c6f455d8c2a3907328af5021b9742e0
 EBUILD pixeltool-5.15.8.ebuild 595 BLAKE2B a174492684a223813005021ce331bd499e734dacb768227b04e927d8c93e8f6193cb07cf516332c5d785733ea716cdaa5b546214de01794a55e0e6fe90861004 SHA512 9908b6ca3522f57ef598c11c6cfd1870ed61c6c16115504f5aed4d950191a67d6cb941f160a527ec5e54683ace2fd3ba928a66be1029fd3359717b585c73869e
 MISC metadata.xml 482 BLAKE2B 651a49dc4a07f5e5a9c21990868e666d98acdea7d7b0b2c0e4c98eafc3da72c803d380e4abda30f33250f7bbd7654df713833ccdddcb975cbad6f92e488f643b SHA512 192c670abd7da29645513bf1d9297d942efdc49f5cf170861e7689fda47f51daa47f10c7c81c3b045366e0259179c6839ff7747197c9d792e8d0fd1a5818973e
diff --git a/dev-qt/pixeltool/pixeltool-5.15.7.ebuild b/dev-qt/pixeltool/pixeltool-5.15.7.ebuild
deleted file mode 100644
index 1f54961e0433..000000000000
--- a/dev-qt/pixeltool/pixeltool-5.15.7.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-if [[ ${PV} != *9999* ]]; then
-	QT5_KDEPATCHSET_REV=1
-	KEYWORDS="amd64 ~arm arm64 ~hppa ppc64 ~sparc x86"
-fi
-
-QT5_MODULE="qttools"
-inherit qt5-build
-
-DESCRIPTION="Qt screen magnifier"
-
-IUSE=""
-
-DEPEND="
-	=dev-qt/qtcore-${QT5_PV}*:5=
-	=dev-qt/qtgui-${QT5_PV}*:5=[png]
-	=dev-qt/qtwidgets-${QT5_PV}*
-"
-RDEPEND="${DEPEND}
-	!dev-qt/${PN}:5
-	!<dev-qt/qtchooser-66-r2
-"
-
-QT5_TARGET_SUBDIRS=(
-	src/pixeltool
-)
-
-src_install() {
-	qt5-build_src_install
-	qt5_symlink_binary_to_path pixeltool
-}
diff --git a/dev-qt/qdbus/Manifest b/dev-qt/qdbus/Manifest
index bd2f8f380770..2e3ac1e190f3 100644
--- a/dev-qt/qdbus/Manifest
+++ b/dev-qt/qdbus/Manifest
@@ -1,7 +1,4 @@
-DIST qttools-5.15.7-gentoo-kde-1.tar.xz 1016 BLAKE2B 2269c02954d34a2862585228b2e3a3536a4b6f37b93c170571afa83d5e9c601684d1bf3d961d8be84acf8af074f4fdf929614c03ba262de8056af778bd41ac71 SHA512 0ac735a9e54fa147a495403e710a75aaf3ab4d2cb51a5db783d7b4b401bc2d6f46bb451d3afaa0efef57fe0dbd1aad95ab3262d88eafeb1f533314132cf400e6
 DIST qttools-5.15.8-gentoo-kde-1.tar.xz 1020 BLAKE2B 1585a66678f318e38b50b17a52f3efd1b53c9c13ceaf63a21fb532ad55790d1f8a5829a10d064de0a7d6efce47bc672916c580b5222f43c35f7869371fc91857 SHA512 e1333e15b1d2f546f6c2164a7da0ef684c024cfa48b847d5671716fa789fdab7e1ed50f3be6efe09e56578c62dd6029aa1fa1546d34b53bba9894445b58aa860
-DIST qttools-everywhere-opensource-src-5.15.7.tar.xz 8900816 BLAKE2B c414cd92eeb7b3cc1b90c1bbb77409ba4e6f33b36cef9376a49068d8698461f211f062d5a7e80321e62ae2dd84f476252658ce3f0239d710945378d8ddfb01d4 SHA512 40176727d8c8430171483fd5815c1f84b8fc4d1a1b26b943c817e9a14cfe2d155c76039593f68f45b7e9276189968f3b37e1b17fd99adda7664582bf30a3935a
 DIST qttools-everywhere-opensource-src-5.15.8.tar.xz 8898368 BLAKE2B ea99e5bdf86d6d48fabd45bf55a48e5604d1a1e938a12838d3a928449d41354c4986401e7f159718432004f7357e28c88d7939f32bc2942bda1cb3abb8e28c33 SHA512 1248b61e21d1bab30c6f8380af0b83ffd2c5f4e75b2906f561f8aae3a8be2e426ca4ffa28164d64a90cc75c570652229847c7009b7aec63c6ba8e977dbdd4f4f
-EBUILD qdbus-5.15.7.ebuild 631 BLAKE2B 07197f18c943b2e543722c5c21f69ca9e94e37c4468e5a075b936cd8cd4cc8f5e3c1bceea73e664d754ec00728e77b0ccf9af0a58c628fa655a53f676161e95d SHA512 8866b33cc8c4086d5bbc9cda19e1e4d57c5c43fdc40392cee2dcfc424eb499c7c6e2c348f032100912f682d067db29af3b2aa33a0ad7dd4f0f9a2ac0c8e54694
 EBUILD qdbus-5.15.8.ebuild 631 BLAKE2B 649206d6647fd0162af4d9b540489918d0cfaf18832e581f473f70b692d4de1b63cc5e00962bec1fcd72543282c004206562cd72b5a3e717466e5d84baaf8d8f SHA512 390f0a5dbd4b2ae8831633cb490f3aa57e6d39467e57673e306d44c12a9fd951263007aaca856e97c729eee8ea698e61eed5497430564bc613a832c81801987f
 MISC metadata.xml 482 BLAKE2B 651a49dc4a07f5e5a9c21990868e666d98acdea7d7b0b2c0e4c98eafc3da72c803d380e4abda30f33250f7bbd7654df713833ccdddcb975cbad6f92e488f643b SHA512 192c670abd7da29645513bf1d9297d942efdc49f5cf170861e7689fda47f51daa47f10c7c81c3b045366e0259179c6839ff7747197c9d792e8d0fd1a5818973e
diff --git a/dev-qt/qdbus/qdbus-5.15.7.ebuild b/dev-qt/qdbus/qdbus-5.15.7.ebuild
deleted file mode 100644
index 4e193e172cfd..000000000000
--- a/dev-qt/qdbus/qdbus-5.15.7.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-if [[ ${PV} != *9999* ]]; then
-	QT5_KDEPATCHSET_REV=1
-	KEYWORDS="amd64 ~arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86"
-fi
-
-QT5_MODULE="qttools"
-inherit qt5-build
-
-DESCRIPTION="Interface to Qt applications communicating over D-Bus"
-
-IUSE=""
-
-DEPEND="
-	=dev-qt/qtcore-${QT5_PV}*
-	=dev-qt/qtdbus-${QT5_PV}*
-	=dev-qt/qtxml-${QT5_PV}*
-"
-RDEPEND="${DEPEND}
-	!dev-qt/${PN}:5
-	!<dev-qt/qtchooser-66-r2
-"
-
-QT5_TARGET_SUBDIRS=(
-	src/qdbus/qdbus
-)
-
-src_install() {
-	qt5-build_src_install
-	qt5_symlink_binary_to_path qdbus
-}
diff --git a/dev-qt/qdbusviewer/Manifest b/dev-qt/qdbusviewer/Manifest
index c55f0ab6c494..b741fb32e381 100644
--- a/dev-qt/qdbusviewer/Manifest
+++ b/dev-qt/qdbusviewer/Manifest
@@ -1,7 +1,4 @@
-DIST qttools-5.15.7-gentoo-kde-1.tar.xz 1016 BLAKE2B 2269c02954d34a2862585228b2e3a3536a4b6f37b93c170571afa83d5e9c601684d1bf3d961d8be84acf8af074f4fdf929614c03ba262de8056af778bd41ac71 SHA512 0ac735a9e54fa147a495403e710a75aaf3ab4d2cb51a5db783d7b4b401bc2d6f46bb451d3afaa0efef57fe0dbd1aad95ab3262d88eafeb1f533314132cf400e6
 DIST qttools-5.15.8-gentoo-kde-1.tar.xz 1020 BLAKE2B 1585a66678f318e38b50b17a52f3efd1b53c9c13ceaf63a21fb532ad55790d1f8a5829a10d064de0a7d6efce47bc672916c580b5222f43c35f7869371fc91857 SHA512 e1333e15b1d2f546f6c2164a7da0ef684c024cfa48b847d5671716fa789fdab7e1ed50f3be6efe09e56578c62dd6029aa1fa1546d34b53bba9894445b58aa860
-DIST qttools-everywhere-opensource-src-5.15.7.tar.xz 8900816 BLAKE2B c414cd92eeb7b3cc1b90c1bbb77409ba4e6f33b36cef9376a49068d8698461f211f062d5a7e80321e62ae2dd84f476252658ce3f0239d710945378d8ddfb01d4 SHA512 40176727d8c8430171483fd5815c1f84b8fc4d1a1b26b943c817e9a14cfe2d155c76039593f68f45b7e9276189968f3b37e1b17fd99adda7664582bf30a3935a
 DIST qttools-everywhere-opensource-src-5.15.8.tar.xz 8898368 BLAKE2B ea99e5bdf86d6d48fabd45bf55a48e5604d1a1e938a12838d3a928449d41354c4986401e7f159718432004f7357e28c88d7939f32bc2942bda1cb3abb8e28c33 SHA512 1248b61e21d1bab30c6f8380af0b83ffd2c5f4e75b2906f561f8aae3a8be2e426ca4ffa28164d64a90cc75c570652229847c7009b7aec63c6ba8e977dbdd4f4f
-EBUILD qdbusviewer-5.15.7.ebuild 1079 BLAKE2B c129b8eefade3dc8f6c35e081323d5a8a2948ce8187aaa0b20f0050268dc9566050d10ee583df7455638847e10c4ddfd8b7b5143e28ff5af0ba1a2a18a7ee7e1 SHA512 ef4d8c921ce9d879b8db4cb62e434d0078b09cc22df2a2f1d0c8ca9e599319699e7701d89bfa5104b82ae90907ccfae842c022ae540d8ac85fed2b98f7a754e7
 EBUILD qdbusviewer-5.15.8.ebuild 1079 BLAKE2B 107f58b45cbafd223f56eb30c16f862c22be9ad8ea6a945461c164137e72cb1c1c440335d7a59fec2cdaba6a4d5e5302aae62a45945db155d4798e0c8734ded6 SHA512 fa547968df29ad8eb9682755b641111e2cdaf3117fa3855b26c6fe0e00f0b26db3d6680239b40cb89d20373cea082325261effa6801b623dbd5e26f341a162ac
 MISC metadata.xml 482 BLAKE2B 651a49dc4a07f5e5a9c21990868e666d98acdea7d7b0b2c0e4c98eafc3da72c803d380e4abda30f33250f7bbd7654df713833ccdddcb975cbad6f92e488f643b SHA512 192c670abd7da29645513bf1d9297d942efdc49f5cf170861e7689fda47f51daa47f10c7c81c3b045366e0259179c6839ff7747197c9d792e8d0fd1a5818973e
diff --git a/dev-qt/qdbusviewer/qdbusviewer-5.15.7.ebuild b/dev-qt/qdbusviewer/qdbusviewer-5.15.7.ebuild
deleted file mode 100644
index 1ddd1f1d412b..000000000000
--- a/dev-qt/qdbusviewer/qdbusviewer-5.15.7.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-if [[ ${PV} != *9999* ]]; then
-	QT5_KDEPATCHSET_REV=1
-	KEYWORDS="amd64 ~arm arm64 ~hppa ppc64 ~sparc x86"
-fi
-
-QT5_MODULE="qttools"
-inherit desktop qt5-build xdg-utils
-
-DESCRIPTION="Graphical tool that lets you introspect D-Bus objects and messages"
-
-IUSE=""
-
-DEPEND="
-	=dev-qt/qtcore-${QT5_PV}*
-	=dev-qt/qtdbus-${QT5_PV}*
-	=dev-qt/qtgui-${QT5_PV}*
-	=dev-qt/qtwidgets-${QT5_PV}*
-	=dev-qt/qtxml-${QT5_PV}*
-"
-RDEPEND="${DEPEND}
-	!dev-qt/${PN}:5
-	!<dev-qt/qtchooser-66-r2
-"
-
-QT5_TARGET_SUBDIRS=(
-	src/qdbus/qdbusviewer
-)
-
-src_install() {
-	qt5-build_src_install
-	qt5_symlink_binary_to_path qdbusviewer
-
-	doicon -s 32 src/qdbus/qdbusviewer/images/qdbusviewer.png
-	newicon -s 128 src/qdbus/qdbusviewer/images/qdbusviewer-128.png qdbusviewer.png
-	make_desktop_entry "${QT5_BINDIR}"/qdbusviewer 'Qt 5 QDBusViewer' qdbusviewer 'Qt;Development'
-}
-
-pkg_postinst() {
-	qt5-build_pkg_postinst
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	qt5-build_pkg_postrm
-	xdg_icon_cache_update
-}
diff --git a/dev-qt/qdoc/Manifest b/dev-qt/qdoc/Manifest
index 4d95e9d8f077..e7cf7229b0be 100644
--- a/dev-qt/qdoc/Manifest
+++ b/dev-qt/qdoc/Manifest
@@ -1,7 +1,4 @@
-DIST qttools-5.15.7-gentoo-kde-1.tar.xz 1016 BLAKE2B 2269c02954d34a2862585228b2e3a3536a4b6f37b93c170571afa83d5e9c601684d1bf3d961d8be84acf8af074f4fdf929614c03ba262de8056af778bd41ac71 SHA512 0ac735a9e54fa147a495403e710a75aaf3ab4d2cb51a5db783d7b4b401bc2d6f46bb451d3afaa0efef57fe0dbd1aad95ab3262d88eafeb1f533314132cf400e6
 DIST qttools-5.15.8-gentoo-kde-1.tar.xz 1020 BLAKE2B 1585a66678f318e38b50b17a52f3efd1b53c9c13ceaf63a21fb532ad55790d1f8a5829a10d064de0a7d6efce47bc672916c580b5222f43c35f7869371fc91857 SHA512 e1333e15b1d2f546f6c2164a7da0ef684c024cfa48b847d5671716fa789fdab7e1ed50f3be6efe09e56578c62dd6029aa1fa1546d34b53bba9894445b58aa860
-DIST qttools-everywhere-opensource-src-5.15.7.tar.xz 8900816 BLAKE2B c414cd92eeb7b3cc1b90c1bbb77409ba4e6f33b36cef9376a49068d8698461f211f062d5a7e80321e62ae2dd84f476252658ce3f0239d710945378d8ddfb01d4 SHA512 40176727d8c8430171483fd5815c1f84b8fc4d1a1b26b943c817e9a14cfe2d155c76039593f68f45b7e9276189968f3b37e1b17fd99adda7664582bf30a3935a
 DIST qttools-everywhere-opensource-src-5.15.8.tar.xz 8898368 BLAKE2B ea99e5bdf86d6d48fabd45bf55a48e5604d1a1e938a12838d3a928449d41354c4986401e7f159718432004f7357e28c88d7939f32bc2942bda1cb3abb8e28c33 SHA512 1248b61e21d1bab30c6f8380af0b83ffd2c5f4e75b2906f561f8aae3a8be2e426ca4ffa28164d64a90cc75c570652229847c7009b7aec63c6ba8e977dbdd4f4f
-EBUILD qdoc-5.15.7.ebuild 838 BLAKE2B b5e4e82bf77507a784b2f2e9e25a695b825f46fe85f55efbd7a99353bf3999095657d252b616ef4ad03a4078b9d3070dcf2351107afff97631d08c05b698e5ff SHA512 2c98e605746abff64cb720762a466418e210ad0840d34eef4047127e6f6e2997c9e743743edef261bc87a9513df2cdbad446123827cb37ba648ca806dc5129a6
 EBUILD qdoc-5.15.8.ebuild 838 BLAKE2B a28186636b1f45d5c5ed659fa747f48e1fb8f6704badbb82f1c200f6b468bd7f671e8e71d80b113ac18d96cbae1afc7dc45bf10ff485c5dfaef4ee922349574a SHA512 918320b63fc1845bb182c9bce78162771253be7b3f6752152535f3086a1b67ff6bc48b1d4b06a378092f3e9acd7f14d19c6eeddae28222d30f0bb8a33c9a5416
 MISC metadata.xml 553 BLAKE2B 6512e790088d4b7a76a22edfb8e278399315d3136239d5ea1e37ba5fcdd761fec2a1a30504882e7660b5ced6d582ad37cb9cfc68775e8593d638a4594f693339 SHA512 40075da7d634cc291dcc15c00d1fc63debc6704443fcc0c5d3d06d227b8cf86f89884ea43eb3a1cf8a722a6b260cf9cb6cd7f88c0b14babe301e4344533d472e
diff --git a/dev-qt/qdoc/qdoc-5.15.7.ebuild b/dev-qt/qdoc/qdoc-5.15.7.ebuild
deleted file mode 100644
index a47a982b0923..000000000000
--- a/dev-qt/qdoc/qdoc-5.15.7.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-if [[ ${PV} != *9999* ]]; then
-	QT5_KDEPATCHSET_REV=1
-	KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
-fi
-
-QT5_MODULE="qttools"
-inherit qt5-build
-
-DESCRIPTION="Qt documentation generator"
-
-IUSE="qml"
-
-DEPEND="
-	=dev-qt/qtcore-${QT5_PV}*:5=
-	sys-devel/clang:=
-	qml? ( =dev-qt/qtdeclarative-${QT5_PV}* )
-"
-RDEPEND="${DEPEND}"
-
-QT5_TARGET_SUBDIRS=(
-	src/qdoc
-)
-
-src_prepare() {
-	qt_use_disable_mod qml qmldevtools-private \
-		src/qdoc/qdoc.pro
-
-	qt5-build_src_prepare
-}
-
-src_configure() {
-	# qt5_tools_configure() not enough here, needs another fix, bug 676948
-	mkdir -p "${QT5_BUILD_DIR}"/src/qdoc || die
-	qt5_qmake "${QT5_BUILD_DIR}"
-	cp src/qdoc/qtqdoc-config.pri "${QT5_BUILD_DIR}"/src/qdoc || die
-
-	qt5-build_src_configure
-}
diff --git a/dev-qt/qt3d/Manifest b/dev-qt/qt3d/Manifest
index 830e744e30f4..a7678b37f40d 100644
--- a/dev-qt/qt3d/Manifest
+++ b/dev-qt/qt3d/Manifest
@@ -1,6 +1,3 @@
-DIST qt3d-5.15.7-gentoo-kde-1.tar.xz 4992 BLAKE2B b16c9cbdabd9420ee9dccfd10b15be99e409fdd1ae4382cabe135e8df1dc1b75f8933e014e72b7119beb50689107ff079ffd7d558ce17226c81796713cb2cb61 SHA512 205d61b879275bf8cfb8409bb8f4710ba9308cfab965439abd9c23b1eb161cb44cbf6c169517ac1b0636cc86abcdd238dec0ed49b763b6238bdf543e2b14a79a
-DIST qt3d-everywhere-opensource-src-5.15.7.tar.xz 81929060 BLAKE2B b04e78e6424b6ba466f116c89c0fb79ee9e2dc5948c3ab6ec8bd4847f3bc955d259c68cafda0d00e19cf2a531018ab40ad784ee6f7e15dfc1b9600a8f07e4b8d SHA512 557afedecc8b8ea30f47ac17b1cfc2192ff46b79f2633c22e0d28ee65413e1e9f3145dea074f76300ea5e455a78e1980db071de106facb8c0c12f16ecf06ea4a
 DIST qt3d-everywhere-opensource-src-5.15.8.tar.xz 118248320 BLAKE2B b25680717ca3ceee8b86d7508ad2e3d4d45ce4c4d48ea1461261ee608a32b7439870b94abd7d1f014a693c639a31f6a61b18bde8320c62631c5e225e67d8f259 SHA512 3b7b9e2009c9cb9a8c1246651d7c2446bdc4ef73abea9199204fde64575ddbe4dbbab599c030347b26ef1600f354e0d940abb946c952968ca19b26b25bf580b6
-EBUILD qt3d-5.15.7.ebuild 967 BLAKE2B 435704355557fa3b286abb0b5672459f9befca8f9a41cc5004d1aa6f8bbb2da16ecf6216cdb53bc388ad065d6d7c802356b87d17678b5a89ef20cf7b8d220cc1 SHA512 2d5574ab422a84fec32785891c7e1385de3bcb49bc253237202c0adfd0df0bae957f56016bf585aaa72137550a75a68d0f7671798d8240530c58d76df7f959eb
 EBUILD qt3d-5.15.8.ebuild 948 BLAKE2B aefde923b2946495d82760f4a446bb53d21bde558cd2ae500afeb92b7435aa24ebcdb0fdadb4e54bf198e679bdc72bf5303417c77c9bbec99c68eea1d387b56b SHA512 3750f03d8d4937fdc1407325016835ba8885679e8cc3100b537102091fcd6c59cd0db120f7b4db8199c8ce00ad65107634539f41d11d9edc25be9728be2111be
 MISC metadata.xml 700 BLAKE2B 3f7d01ca331e1f43b3333f86f10901e6fdb6fb8482d9d0cebbd9c5d498b2a5971c7a17fe78aefe23d31eccfcf64eaee8b581f8f749ecb6c0eba286608d6c75e0 SHA512 3f6c2d8f227760e9e14f873147fc79bc5027cac6d5dc134c9ac071fd30c7fba39afad272829f8ae446682c3a1a5ba80b056b263963dcbdf308b0f55337563394
diff --git a/dev-qt/qt3d/qt3d-5.15.7.ebuild b/dev-qt/qt3d/qt3d-5.15.7.ebuild
deleted file mode 100644
index 5788022310bf..000000000000
--- a/dev-qt/qt3d/qt3d-5.15.7.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-if [[ ${PV} != *9999* ]]; then
-	QT5_KDEPATCHSET_REV=1
-	KEYWORDS="amd64 ~arm arm64 ~riscv x86"
-fi
-inherit qt5-build
-
-DESCRIPTION="3D rendering module for the Qt5 framework"
-
-# TODO: tools
-IUSE="gamepad gles2-only qml vulkan"
-
-RDEPEND="
-	=dev-qt/qtconcurrent-${QT5_PV}*
-	=dev-qt/qtcore-${QT5_PV}*
-	=dev-qt/qtgui-${QT5_PV}*:5=[vulkan=]
-	=dev-qt/qtnetwork-${QT5_PV}*
-	>=media-libs/assimp-4.0.0:=
-	gamepad? ( =dev-qt/qtgamepad-${QT5_PV}* )
-	qml? ( =dev-qt/qtdeclarative-${QT5_PV}*[gles2-only=] )
-"
-DEPEND="${RDEPEND}
-	vulkan? ( dev-util/vulkan-headers )
-"
-
-src_prepare() {
-	rm -r src/3rdparty/assimp/{code,contrib,include} || die
-
-	qt_use_disable_mod gamepad gamepad src/input/frontend/frontend.pri
-	qt_use_disable_mod qml quick src/src.pro
-
-	qt5-build_src_prepare
-}
-
-src_configure() {
-	local myqmakeargs=(
-		--
-		-system-assimp
-	)
-	qt5-build_src_configure
-}
diff --git a/dev-qt/qtbluetooth/Manifest b/dev-qt/qtbluetooth/Manifest
index 1990761e3510..3b9bee157cef 100644
--- a/dev-qt/qtbluetooth/Manifest
+++ b/dev-qt/qtbluetooth/Manifest
@@ -1,7 +1,4 @@
-DIST qtconnectivity-5.15.7-gentoo-kde-1.tar.xz 3388 BLAKE2B 0ef3d7072b383e5f7c6a0e46d453dad3d77977f990d554e5011ab1137ce191f40ac120981f3502ce5dd6d940fa26a281ef06efe6b6577ae0e55748c7daadcaa6 SHA512 f2bdb986d3c5d3a45d6e651e78250b9d3bca6ff1655691e684d5c0abe6d6658c3a44cd067e44845d95c6040b2df64dd05b6c09ef5ef0b8bf43b07fcd1fbc05a3
 DIST qtconnectivity-5.15.8-gentoo-kde-1.tar.xz 3388 BLAKE2B 4bb7a04f4727ded42483ad58bfe16fc74ad441423bef641ba03219992c94818ec99a9850a64be8e69f497701867fba502ba468ab6ac3809e5476083b7df3daa3 SHA512 8950506d4f03780187ace868d6133ef9087c980db941c9e10b5d9d926c927d7d3bdafd5988f7f325160d0959a35a5fe5a2723fb1948e90c993e54e39beb2c0cc
-DIST qtconnectivity-everywhere-opensource-src-5.15.7.tar.xz 2820492 BLAKE2B 436472ddcc71deca47145230a22a3b513b2620ec35ccd15f116904e4ae6739c5916ad0a3d3a5586b17e538ce9757b4ae52619d31250a0f82deeea75547a09ee7 SHA512 22a8a9cc0214f0b6560d487553c65183496ca7738642663e64973368c852cf053b3c4b39ba80569dd2b7e308d955dd2de7d3a8ef5ab1cba3a2fd3859de35af5f
 DIST qtconnectivity-everywhere-opensource-src-5.15.8.tar.xz 2822448 BLAKE2B eb6a05aaf3b0f71df7e122f46444d971ca38d7927a71725b2e3cc3b39566f136fbd765b0072a27c214b43b230bad57deddf6c0cc57b3691331cc80645aa6984b SHA512 d600e7b600a8cc204333b69bbbd37bc6f4d578bf50406a705c9bc9b04a0399461c8cc8e3bf89a8e0a8820897e9d586d77543570de6229a0cfed312b422b9fda6
-EBUILD qtbluetooth-5.15.7.ebuild 692 BLAKE2B c9308115aa96e1af3ccf7b6eef74756cf1be4ffe9da551d9d846d45f765dfe29ef421ec2d049cbfe249d0bcf7738a413086ee3107e02719f608e5c2df4be2d52 SHA512 329ab03743612fca8f1fab595a838f2a6d6f83de908cd4af3520e0e319569667ce602303910bde6da895bbba182cf55c3eba5dd14fa68d9122acdcc9b8d143a5
 EBUILD qtbluetooth-5.15.8.ebuild 692 BLAKE2B 4af9aa0de9cf6e818b91455ad24bcf8ef43ba11fbd065296e913f03d3d2be710b60e5b3a70dde4bcbc9586ae89dae6eb834076d4efbfbfdc7b357bdc1f620e94 SHA512 51a05f1fe96bf9c26063748220eec461f46913359d998d4608908fab21eb272da9441c3bed99a40589461b7a1e27da9dcc5c3750cab2528afdfa949c7c858045
 MISC metadata.xml 562 BLAKE2B 89a71be78fc40c86d01afd963f8a8519410086f36b572707e8029ea58e900d7e9563eb1b94fec26c2e078395bfa9ef20149fd8c0b2a5d6c3699198890215ebe7 SHA512 85467596f68320b2cd8440f9587f88992d36915b906a5b9139b29e07a9db9ca31853ae7c379bf90e9178e407ab3e526187ed761cd8cfa155658491ef68bbcf30
diff --git a/dev-qt/qtbluetooth/qtbluetooth-5.15.7.ebuild b/dev-qt/qtbluetooth/qtbluetooth-5.15.7.ebuild
deleted file mode 100644
index 69765e46ed68..000000000000
--- a/dev-qt/qtbluetooth/qtbluetooth-5.15.7.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-if [[ ${PV} != *9999* ]]; then
-	QT5_KDEPATCHSET_REV=1
-	KEYWORDS="amd64 arm arm64 ~loong ~ppc64 ~riscv x86"
-fi
-
-QT5_MODULE="qtconnectivity"
-inherit qt5-build
-
-DESCRIPTION="Bluetooth support library for the Qt5 framework"
-
-IUSE="qml"
-
-DEPEND="
-	=dev-qt/qtconcurrent-${QT5_PV}*
-	=dev-qt/qtcore-${QT5_PV}*:5=
-	=dev-qt/qtdbus-${QT5_PV}*
-	=dev-qt/qtnetwork-${QT5_PV}*
-	>=net-wireless/bluez-5:=
-	qml? ( =dev-qt/qtdeclarative-${QT5_PV}* )
-"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	sed -i -e 's/nfc//' src/src.pro || die
-
-	qt_use_disable_mod qml quick src/src.pro
-
-	qt5-build_src_prepare
-}
diff --git a/dev-qt/qtcharts/Manifest b/dev-qt/qtcharts/Manifest
index a7489e9175b5..ef8e4cc53d90 100644
--- a/dev-qt/qtcharts/Manifest
+++ b/dev-qt/qtcharts/Manifest
@@ -1,8 +1,6 @@
-DIST qtcharts-everywhere-opensource-src-5.15.7.tar.xz 4254304 BLAKE2B d71077eeaa75f71b766414e007c5460f2e3f05934967b6616a11aa156ee59da2e47aaad01d422f7bc3b668f2f4eca074a958b3151f18aa3963fecc7cd5b07003 SHA512 fd0c9a282edb60a08b72e8453ccd316de70da34111a85369239f54f00808d08b9aca77f73c6ecfe3f33a6678c9c74eb2310c21a9522d6dec6ce940a8e030c688
 DIST qtcharts-everywhere-opensource-src-5.15.8.tar.xz 4254148 BLAKE2B b47fbd092d30a9a18f31072c485e30bd25b3a88bcd3260ceb2e9fa3e3df04dc2a74775f5520cbb3f115956cc68ca44f7da3653138fa209e35256e1b6f108082b SHA512 1c57e2f92d33c038ddf17fa5f8863b474f229fb2d8f2eb16e8f48455c98b3f500d3a7d73423c0512b6c44ad33227fac3fca624bfcdbc4bbcf64da54f79b4ac7b
 DIST qtcharts-everywhere-src-6.4.0.tar.xz 4387060 BLAKE2B 8c948ef461961986c64263e5c5fca73e00ad272787e1d3b7bf38b8b072293bcdf102a080733a0dfb4c419f2af429ca6a40850ef2c8b68afda34f83f28bdbfaf2 SHA512 63f231d553fad0f5801c4abeeae0864dba3160c703e49be2ef49e7484d979621b27544408c59c903e8ac89bdf5aae6472f9e8b1d49f50951db257b52c5e60947
 DIST qtcharts-everywhere-src-6.4.2.tar.xz 4387080 BLAKE2B 5ea177f2c7cf121bfe1569e73898e812f23ac337e3567625e0d602715f95ea9eccc253369e693f206b7cbcc9a64d23a94a0467a2919be9755bcf2b7263fa3d0c SHA512 b3ee07e4a745d0bf657cc0b7419df3511446a2f7fbfa5cf98e7ae0af479214528bb19fea7b9f68f5a3f975b89b2df10cb0c7a6b709170b5d910bc38466c4b35e
-EBUILD qtcharts-5.15.7.ebuild 572 BLAKE2B fd7a93f78b7a3f0cacf0174cea5c1719a96c43ee331d395a9d8eacec44238945e3b974987acdfc7a906ef4cadaa2d1ef11a74e3776faad29351fa458d781c71d SHA512 c48869e1b917b4feebc3815015a635b0fbefcda328e48bbcba7e77763e3a24e70999a59b21c9f864f4fe804e6c2200426a20e68c05ddcbbaf90a3d241026dd2f
 EBUILD qtcharts-5.15.8.ebuild 572 BLAKE2B 8b157c6f720fd9befa6b1cd25fbe018b72936c88b3b47b3744e9080bb48c78f46538df11f52498237b01967fc7c26ffaf172f24a7a1ca1e8107269aa61951bd3 SHA512 42a14766f3898d45ce51b03680f7751dad7c0cf250e7b7de7af3ab012f5168bf2aa1969d701243af5038049042e4d57d7eb66b79899048c917b4358ab9ceb4d2
 EBUILD qtcharts-6.4.0.ebuild 364 BLAKE2B 6cad72c7487171d07a89ec88315e2f09f584aec63423b99df35734def284f1bda256769fad4e930e7f7abfb907197df31451fba86f70f9ed33dc6549920a4da5 SHA512 7cf4bfb7b78aed957a0dc106d4795c64a53945c97a841f7886a5647cd94e311fe605001decbe9bb56eca55c4f139e63b8a6c5223625886a6912a6ff89e4614a7
 EBUILD qtcharts-6.4.2.ebuild 364 BLAKE2B b637c8d9924182c03b7998406c3ccbfd71be22400c4b4aad50cd5bd10b17c4d510a737dd1a2b0f582cdcc408c0e2852fc8402196bf2ecb3929d49a19d30a7efe SHA512 2daf6d829c87ecf1938d8a7447feef5d5e8bdd42075ad3571014c40c192293461235ae4cd1161cccf02ac94d1c7330b26b49f06b5294745e7d22f0f97750a716
diff --git a/dev-qt/qtcharts/qtcharts-5.15.7.ebuild b/dev-qt/qtcharts/qtcharts-5.15.7.ebuild
deleted file mode 100644
index eceeb5069391..000000000000
--- a/dev-qt/qtcharts/qtcharts-5.15.7.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit qt5-build
-
-DESCRIPTION="Chart component library for the Qt5 framework"
-LICENSE="GPL-3"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 ~arm arm64 ~loong ppc ppc64 ~riscv x86"
-fi
-
-IUSE="qml"
-
-DEPEND="
-	=dev-qt/qtcore-${QT5_PV}*
-	=dev-qt/qtgui-${QT5_PV}*
-	=dev-qt/qtwidgets-${QT5_PV}*
-	qml? ( =dev-qt/qtdeclarative-${QT5_PV}* )
-"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	qt_use_disable_mod qml quick \
-		src/src.pro
-
-	qt5-build_src_prepare
-}
diff --git a/dev-qt/qtconcurrent/Manifest b/dev-qt/qtconcurrent/Manifest
index 4bd7a4b83da1..db9c98402c69 100644
--- a/dev-qt/qtconcurrent/Manifest
+++ b/dev-qt/qtconcurrent/Manifest
@@ -1,9 +1,5 @@
-DIST qtbase-5.15-gentoo-patchset-2.tar.xz 3844 BLAKE2B 6dcb69398cf8a6b1be737e8c7bf1041529c4e704ca892cef10ba3bc5ce435c903607b64e981cf8aa12c785b3e423aa1d52bce1f67ec1bd8dbb1421dfb6f62700 SHA512 b7fd7e17bcab2f9803c7bfc0473082ee4640299c23ce8da943ef80ed181e880ebc9157bcebde28077e80e6f907aa14a59c42416b3e32f49baebd54fbe5a37497
 DIST qtbase-5.15-gentoo-patchset-3.tar.xz 3856 BLAKE2B 0752426f9bc2dfa1ab2bc246b29f5d00305df05175a7801d7d5eddacfa46fcb605d9a317547edc01d3ef339f6effc2fcee7549cb7aecced37f0098166c70dbe2 SHA512 2515bea53232e76ca3e40bdaf1dd52fdf452052a2f40002ee91360d1fcceea3c5c2f5a8d2a3bfc0f9c2bacd61460a632c5b351accd73fd37b64985593219148e
-DIST qtbase-5.15.7-gentoo-kde-1.tar.xz 798056 BLAKE2B 3c7fefa65ab6de25c2c82261ad0f1371e32acd4bd4b3303f20a5ebf36d19690df94290d102c65e4941a6c51a5d5f2db0253bafca5ac85cf480f7434405cb2671 SHA512 20ab17220489009c98d7f783a02614507e157974c7cb16f47d50d3954ccd1cd065562effc393df6e07c9ba6ad8ccd4e6b3f0bf5b5b890183b8631b8b570bf064
 DIST qtbase-5.15.8-gentoo-kde-1.tar.xz 780764 BLAKE2B 6abb00127113595cbb0a0caf58eb6323423ca41cbde6262a63762aded12861b6c051c9548c9ce2d11ab073e8930c11b609c05579eba34d56201fb7187c78ee23 SHA512 8b59ba61e7364c78d5bf728b4d8c9bd0f8e1ed973f1a84cd40330b06195b246e052ec087067336ff5d4e80a12168a25e0bd47fd88d837c00f106d8cdeba0c016
-DIST qtbase-everywhere-opensource-src-5.15.7.tar.xz 50260196 BLAKE2B 69029a910af0e3bfe742b5870334406e03274b0677ef47f9c7c10f730ff031bae49bd21a686497215505b19a183ca395c275d8afefaaa903125297f8e693bb4d SHA512 316de71fba1d5dd91354155dcd0f77e1ce2a798f8296a8699a795ea5e86ad10b6e233299775a92e23328290f3e041240585947e89ee7bd39eb464c5f0ffec343
 DIST qtbase-everywhere-opensource-src-5.15.8.tar.xz 50259432 BLAKE2B cb1b790a384a5cad9a95fdc448e275d48a68c6ee2addf08b40f9963cc5762fd7ab15852dea8392dc76da39f1565c1e23ddb5875c280f0177e802082f4b4f7f2b SHA512 29e8877bafdbc908072209f1b27a5040b022e2b71f17f4ab4cecd570adeae21597f9af7f1d38758760f3cb30376eeb15c5f066bf02c6e9a9e3a4d07f967046ce
-EBUILD qtconcurrent-5.15.7.ebuild 467 BLAKE2B 3382a0209e9ec1f382e7c56bb72506b3ec4c993eed2329b42a4c5ddaca2c7b7d7e0d8e14833700662fb406ab89543545c4fd2d5b9155daacb39aafc5b487cf76 SHA512 9aad5c791fa59a40f882a6a4d665b97510c9760bf619cd97d2b7c34c653835ef6372faf0e1a47eb270239cdc7188c1d27bc7f37f7db166dc861b63b289795880
 EBUILD qtconcurrent-5.15.8.ebuild 467 BLAKE2B e2ad04164432baa96b3a1853d2ee3b1960349d8908367953899d1cd0a05d0d8a49b5ce04eb319c736ef7db3d4f99baae425532be7df67375cee6fae9ef367b6b SHA512 c7b6b8dd95bb8a61627502b96783a885ab6d936fcb603657dce4b011b625615b8ad590b85dcac980d1de38f010737e88ed447eb5ec2f0ce51686b265df845157
 MISC metadata.xml 482 BLAKE2B 651a49dc4a07f5e5a9c21990868e666d98acdea7d7b0b2c0e4c98eafc3da72c803d380e4abda30f33250f7bbd7654df713833ccdddcb975cbad6f92e488f643b SHA512 192c670abd7da29645513bf1d9297d942efdc49f5cf170861e7689fda47f51daa47f10c7c81c3b045366e0259179c6839ff7747197c9d792e8d0fd1a5818973e
diff --git a/dev-qt/qtconcurrent/qtconcurrent-5.15.7.ebuild b/dev-qt/qtconcurrent/qtconcurrent-5.15.7.ebuild
deleted file mode 100644
index 3143b6f61cb2..000000000000
--- a/dev-qt/qtconcurrent/qtconcurrent-5.15.7.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-if [[ ${PV} != *9999* ]]; then
-	QT5_KDEPATCHSET_REV=1
-	KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86"
-fi
-
-QT5_MODULE="qtbase"
-inherit qt5-build
-
-DESCRIPTION="Multi-threading concurrence support library for the Qt5 framework"
-
-IUSE=""
-
-DEPEND="=dev-qt/qtcore-${QT5_PV}*:5="
-RDEPEND="${DEPEND}"
-
-QT5_TARGET_SUBDIRS=(
-	src/concurrent
-)
diff --git a/dev-qt/qtcore/Manifest b/dev-qt/qtcore/Manifest
index 37e498c2ceb1..6dd7fc9e8f05 100644
--- a/dev-qt/qtcore/Manifest
+++ b/dev-qt/qtcore/Manifest
@@ -1,11 +1,7 @@
 AUX qtcore-5.15.8-fix-crash-w-debug.patch 1427 BLAKE2B 3ef8d7e4fcd2969e6ce3931e0bd07fe7d410d18834bb2de7a760949dd4c822bb9942a4245d720a2736c4927ea536bc0a41efe3ac7e0913dd9b7ca35eb27d313b SHA512 dfdd1f30057498b0f3043faa84fda1239b17ecc02c3838a329cad46b157e91cb2cbbe488eeeebd761b0449e4c045e8a47e7354d081453bf6fe7f35a6989f30da
-DIST qtbase-5.15-gentoo-patchset-2.tar.xz 3844 BLAKE2B 6dcb69398cf8a6b1be737e8c7bf1041529c4e704ca892cef10ba3bc5ce435c903607b64e981cf8aa12c785b3e423aa1d52bce1f67ec1bd8dbb1421dfb6f62700 SHA512 b7fd7e17bcab2f9803c7bfc0473082ee4640299c23ce8da943ef80ed181e880ebc9157bcebde28077e80e6f907aa14a59c42416b3e32f49baebd54fbe5a37497
 DIST qtbase-5.15-gentoo-patchset-3.tar.xz 3856 BLAKE2B 0752426f9bc2dfa1ab2bc246b29f5d00305df05175a7801d7d5eddacfa46fcb605d9a317547edc01d3ef339f6effc2fcee7549cb7aecced37f0098166c70dbe2 SHA512 2515bea53232e76ca3e40bdaf1dd52fdf452052a2f40002ee91360d1fcceea3c5c2f5a8d2a3bfc0f9c2bacd61460a632c5b351accd73fd37b64985593219148e
-DIST qtbase-5.15.7-gentoo-kde-1.tar.xz 798056 BLAKE2B 3c7fefa65ab6de25c2c82261ad0f1371e32acd4bd4b3303f20a5ebf36d19690df94290d102c65e4941a6c51a5d5f2db0253bafca5ac85cf480f7434405cb2671 SHA512 20ab17220489009c98d7f783a02614507e157974c7cb16f47d50d3954ccd1cd065562effc393df6e07c9ba6ad8ccd4e6b3f0bf5b5b890183b8631b8b570bf064
 DIST qtbase-5.15.8-gentoo-kde-3.tar.xz 782344 BLAKE2B 115814a4d90ac286540cf6e50bd2b57baa8e0e327fc73c3ab06fe43ecd95e1e3739faecee5db112d95d17e4fb84494ad5557e70251f2c60142166715294bf366 SHA512 d50b0f02476ded9f053093ec15c5204a0ec664794dcc324996685f09400a2cbc76dc3fd0ebfc247ebd42fbe203b7d4c904e975fc985bf7928e43c6cd65f04f34
-DIST qtbase-everywhere-opensource-src-5.15.7.tar.xz 50260196 BLAKE2B 69029a910af0e3bfe742b5870334406e03274b0677ef47f9c7c10f730ff031bae49bd21a686497215505b19a183ca395c275d8afefaaa903125297f8e693bb4d SHA512 316de71fba1d5dd91354155dcd0f77e1ce2a798f8296a8699a795ea5e86ad10b6e233299775a92e23328290f3e041240585947e89ee7bd39eb464c5f0ffec343
 DIST qtbase-everywhere-opensource-src-5.15.8.tar.xz 50259432 BLAKE2B cb1b790a384a5cad9a95fdc448e275d48a68c6ee2addf08b40f9963cc5762fd7ab15852dea8392dc76da39f1565c1e23ddb5875c280f0177e802082f4b4f7f2b SHA512 29e8877bafdbc908072209f1b27a5040b022e2b71f17f4ab4cecd570adeae21597f9af7f1d38758760f3cb30376eeb15c5f066bf02c6e9a9e3a4d07f967046ce
-EBUILD qtcore-5.15.7.ebuild 2983 BLAKE2B 178a91512604dbb9f4e2741a6d13c36ce01873c4e744bdec5e547c9e1f21eec505c42f07897cecf9090886d1b39b371392be9c558531dbe833e86d869aff1960 SHA512 e063324dd6f1d386f99564960e2046947c439d5a4053daff053103d8c19357a412383485046ba69d64fcf13e8c5ecad057f931291d63efca14e1a2e7314a2668
 EBUILD qtcore-5.15.8-r1.ebuild 3070 BLAKE2B 610fccc1d08332b4ca2b1681906812fa1ca3b900ff487dfbd83fb4c0cafc5aa3accea3cd4450a3b7d46d261faf7fe7308a45642e73f84b37a9d16ea3af34afdb SHA512 d19b28d91138bfce589907ba79b67a0db2d3b248640050851017343f0400a1ccfeffa6f414d2849fc38c901893cad95c5bae0cd3e5eb22fa5f7ae94c252a10dc
 EBUILD qtcore-5.15.8-r2.ebuild 3194 BLAKE2B 92d43b2ce123f36845f69e2c45624d78cdc00d64d4c378ee62ee35bf576208550a710b4d6d11b59f58bc6a49255857a2c59a0fb16b54a1cd910218fa94b9cd15 SHA512 dd94327d908cab92e8b3b7f5bcaaac3a3a2aca6ceebda40e4d87fe0a088ec0fdcaba06aae2ada4791243fb710ed3f556468fcaf32dae68af7c1cd73394f36ee4
 MISC metadata.xml 833 BLAKE2B 79b441c34e55017f23dd85cdb062ef4cbcfce05dff74936de887256ba8b9b596632b570b55b7014c38467829751771bb116f067cd6a246a11309f20b67fb55f0 SHA512 f1ffedc2ad17d198ba14a9a93e6c8dd35a7709e6f1e07dae606c16c05868f2f8e696f25fa5cf2602ed50f41eb5a914ff0d652b9ac37163e5130ddbfb475a1ff5
diff --git a/dev-qt/qtcore/qtcore-5.15.7.ebuild b/dev-qt/qtcore/qtcore-5.15.7.ebuild
deleted file mode 100644
index 5400baec4cf3..000000000000
--- a/dev-qt/qtcore/qtcore-5.15.7.ebuild
+++ /dev/null
@@ -1,120 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-if [[ ${PV} != *9999* ]]; then
-	QT5_KDEPATCHSET_REV=1
-	KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86"
-fi
-
-QT5_MODULE="qtbase"
-inherit linux-info flag-o-matic qt5-build
-
-DESCRIPTION="Cross-platform application development framework"
-SLOT=5/${QT5_PV}
-
-IUSE="icu old-kernel systemd"
-
-DEPEND="
-	dev-libs/double-conversion:=
-	dev-libs/glib:2
-	dev-libs/libpcre2[pcre16,unicode]
-	sys-libs/zlib:=
-	icu? ( dev-libs/icu:= )
-	!icu? ( virtual/libiconv )
-	systemd? ( sys-apps/systemd:= )
-"
-RDEPEND="${DEPEND}"
-
-QT5_TARGET_SUBDIRS=(
-	src/tools/bootstrap
-	src/tools/moc
-	src/tools/rcc
-	src/corelib
-	src/tools/qlalr
-	doc
-)
-
-QT5_GENTOO_PRIVATE_CONFIG=(
-	!:network
-	!:sql
-	!:testlib
-	!:xml
-)
-
-pkg_pretend() {
-	use kernel_linux || return
-	get_running_version
-	if kernel_is -lt 4 11 && ! use old-kernel; then
-		ewarn "The running kernel is older than 4.11. USE=old-kernel is needed for"
-		ewarn "dev-qt/qtcore to function on this kernel properly. Bugs #669994, #672856"
-	fi
-}
-
-src_prepare() {
-	# don't add -O3 to CXXFLAGS, bug 549140
-	sed -i -e '/CONFIG\s*+=/s/optimize_full//' src/corelib/corelib.pro || die
-
-	# fix missing qt_version_tag symbol w/ LTO, bug 674382
-	sed -i -e 's/^gcc:ltcg/gcc/' src/corelib/global/global.pri || die
-
-	# Broken with FORTIFY_SOURCE=3
-	# Our toolchain sets F_S=2 by default w/ >= -O2, so we need
-	# to unset F_S first, then explicitly set 2, to negate any default
-	# and anything set by the user if they're choosing 3 (or if they've
-	# modified GCC to set 3).
-	#
-	# Refs:
-	# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=105078
-	# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=105709
-	# https://bugreports.qt.io/browse/QTBUG-103782
-	# bug #847145
-	if is-flagq '-O[23]' || is-flagq '-Ofast' ; then
-		# We can't unconditionally do this b/c we fortify needs
-		# some level of optimisation.
-		filter-flags -D_FORTIFY_SOURCE=3
-		# (Qt doesn't seem to respect CPPFLAGS?)
-		append-flags -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2
-	fi
-
-	qt5-build_src_prepare
-
-	# workaround for 0171-Annotate-QMutex-...patch adding a header
-	perl bin/syncqt.pl -version ${PV} || die
-}
-
-src_configure() {
-	local myconf=(
-		$(qt_use icu)
-		$(qt_use !icu iconv)
-		$(qt_use systemd journald)
-	)
-	use old-kernel && myconf+=(
-		-no-feature-renameat2 # needs Linux 3.16, bug 669994
-		-no-feature-getentropy # needs Linux 3.17, bug 669994
-		-no-feature-statx # needs Linux 4.11, bug 672856
-	)
-	qt5-build_src_configure
-}
-
-src_install() {
-	qt5-build_src_install
-	qt5_symlink_binary_to_path qmake 5
-
-	local flags=(
-		DBUS FREETYPE IMAGEFORMAT_JPEG IMAGEFORMAT_PNG
-		OPENGL OPENSSL SSL WIDGETS
-	)
-
-	for flag in ${flags[@]}; do
-		cat >> "${D}"/${QT5_HEADERDIR}/QtCore/qconfig.h <<- _EOF_ || die
-
-			#if defined(QT_NO_${flag}) && defined(QT_${flag})
-			# undef QT_NO_${flag}
-			#elif !defined(QT_NO_${flag}) && !defined(QT_${flag})
-			# define QT_NO_${flag}
-			#endif
-		_EOF_
-	done
-}
diff --git a/dev-qt/qtdatavis3d/Manifest b/dev-qt/qtdatavis3d/Manifest
index 84fb981c8ea1..c3b278e01be8 100644
--- a/dev-qt/qtdatavis3d/Manifest
+++ b/dev-qt/qtdatavis3d/Manifest
@@ -1,5 +1,3 @@
-DIST qtdatavis3d-everywhere-opensource-src-5.15.7.tar.xz 5193632 BLAKE2B 895a59ae89658a6a9e730e9c71c7cb5ed65aebf4c455d6b80131b9b8984ac5f8affd06ff712915060b61f66b813e2ab12d54046efbac86578189cef9b03940b9 SHA512 df07e33031dfd8759c49a3b1116f61242e3d1c731d52deb26745e3d575b8b429fd8806122445f03de6f24b7f65fc170d71338c42ff524093b846a3b00d32908c
 DIST qtdatavis3d-everywhere-opensource-src-5.15.8.tar.xz 5193552 BLAKE2B 0defdc5f4ec84a6b0e1a84567ff54b1ad082e1df114dc302f9a968bc4c9342f91f930a50ee7089cb635c003148b22075a76eab3929103916b1fc84cf347a74fc SHA512 607359e2489ed33b12f56ace2aedef71e1342d88835d4f81346008f180c8ee74d3f2897e812b7bc9ac6c586908a9ee426d61e226c4faab3baa9d162a604665cc
-EBUILD qtdatavis3d-5.15.7.ebuild 662 BLAKE2B 16392c29ef9a10f0d33eb1d84fa058b0c658d250069c18f16568aa94ff16e0fee2211f76a89708dbd70cffcf9c22ce7c58c1746cff1ffc113b10cf08fcffee94 SHA512 88c3b0f0840c97329030b3f0090ceebcce71db5a6c9d8d4f252695bcbaba967215c19335843900f3c4807c0d618ceb00d043a5e71b35a25d4dafb46f3224b413
 EBUILD qtdatavis3d-5.15.8.ebuild 662 BLAKE2B 76170297a3c074f732a7dd3fe74d4ff573db9c9dd7a70a7b26321def960ad158fba8c27a0347ba42b5ab0c2db61b05d0a4e9a0ed652c505553cdf966a5cfcc8d SHA512 3060f027fb5596478bd52db4cd61c8a43bdd4b406f25005cea49afade61ab7112631c0f9a03684587368618b36b36f600f65fce01f3d853447c3215205887b60
 MISC metadata.xml 562 BLAKE2B 89a71be78fc40c86d01afd963f8a8519410086f36b572707e8029ea58e900d7e9563eb1b94fec26c2e078395bfa9ef20149fd8c0b2a5d6c3699198890215ebe7 SHA512 85467596f68320b2cd8440f9587f88992d36915b906a5b9139b29e07a9db9ca31853ae7c379bf90e9178e407ab3e526187ed761cd8cfa155658491ef68bbcf30
diff --git a/dev-qt/qtdatavis3d/qtdatavis3d-5.15.7.ebuild b/dev-qt/qtdatavis3d/qtdatavis3d-5.15.7.ebuild
deleted file mode 100644
index 4ac3606b0fd2..000000000000
--- a/dev-qt/qtdatavis3d/qtdatavis3d-5.15.7.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit qt5-build
-
-DESCRIPTION="3D data visualization library for the Qt5 framework"
-LICENSE="GPL-3"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 ~arm arm64 x86"
-fi
-
-IUSE="gles2-only qml"
-
-DEPEND="
-	=dev-qt/qtcore-${QT5_PV}*
-	=dev-qt/qtgui-${QT5_PV}*[gles2-only=]
-	qml? ( =dev-qt/qtdeclarative-${QT5_PV}*[gles2-only=] )
-"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	# eliminate bogus dependency on qtwidgets
-	sed -i -e '/requires.*widgets/d' qtdatavis3d.pro || die
-
-	qt_use_disable_mod qml quick \
-		src/src.pro
-
-	qt5-build_src_prepare
-}
diff --git a/dev-qt/qtdbus/Manifest b/dev-qt/qtdbus/Manifest
index 71cfe80947b4..7116b250b9a1 100644
--- a/dev-qt/qtdbus/Manifest
+++ b/dev-qt/qtdbus/Manifest
@@ -1,9 +1,5 @@
-DIST qtbase-5.15-gentoo-patchset-2.tar.xz 3844 BLAKE2B 6dcb69398cf8a6b1be737e8c7bf1041529c4e704ca892cef10ba3bc5ce435c903607b64e981cf8aa12c785b3e423aa1d52bce1f67ec1bd8dbb1421dfb6f62700 SHA512 b7fd7e17bcab2f9803c7bfc0473082ee4640299c23ce8da943ef80ed181e880ebc9157bcebde28077e80e6f907aa14a59c42416b3e32f49baebd54fbe5a37497
 DIST qtbase-5.15-gentoo-patchset-3.tar.xz 3856 BLAKE2B 0752426f9bc2dfa1ab2bc246b29f5d00305df05175a7801d7d5eddacfa46fcb605d9a317547edc01d3ef339f6effc2fcee7549cb7aecced37f0098166c70dbe2 SHA512 2515bea53232e76ca3e40bdaf1dd52fdf452052a2f40002ee91360d1fcceea3c5c2f5a8d2a3bfc0f9c2bacd61460a632c5b351accd73fd37b64985593219148e
-DIST qtbase-5.15.7-gentoo-kde-1.tar.xz 798056 BLAKE2B 3c7fefa65ab6de25c2c82261ad0f1371e32acd4bd4b3303f20a5ebf36d19690df94290d102c65e4941a6c51a5d5f2db0253bafca5ac85cf480f7434405cb2671 SHA512 20ab17220489009c98d7f783a02614507e157974c7cb16f47d50d3954ccd1cd065562effc393df6e07c9ba6ad8ccd4e6b3f0bf5b5b890183b8631b8b570bf064
 DIST qtbase-5.15.8-gentoo-kde-1.tar.xz 780764 BLAKE2B 6abb00127113595cbb0a0caf58eb6323423ca41cbde6262a63762aded12861b6c051c9548c9ce2d11ab073e8930c11b609c05579eba34d56201fb7187c78ee23 SHA512 8b59ba61e7364c78d5bf728b4d8c9bd0f8e1ed973f1a84cd40330b06195b246e052ec087067336ff5d4e80a12168a25e0bd47fd88d837c00f106d8cdeba0c016
-DIST qtbase-everywhere-opensource-src-5.15.7.tar.xz 50260196 BLAKE2B 69029a910af0e3bfe742b5870334406e03274b0677ef47f9c7c10f730ff031bae49bd21a686497215505b19a183ca395c275d8afefaaa903125297f8e693bb4d SHA512 316de71fba1d5dd91354155dcd0f77e1ce2a798f8296a8699a795ea5e86ad10b6e233299775a92e23328290f3e041240585947e89ee7bd39eb464c5f0ffec343
 DIST qtbase-everywhere-opensource-src-5.15.8.tar.xz 50259432 BLAKE2B cb1b790a384a5cad9a95fdc448e275d48a68c6ee2addf08b40f9963cc5762fd7ab15852dea8392dc76da39f1565c1e23ddb5875c280f0177e802082f4b4f7f2b SHA512 29e8877bafdbc908072209f1b27a5040b022e2b71f17f4ab4cecd570adeae21597f9af7f1d38758760f3cb30376eeb15c5f066bf02c6e9a9e3a4d07f967046ce
-EBUILD qtdbus-5.15.7.ebuild 705 BLAKE2B cf479be70237c47dd99c164eb4bc873d57bac882dbd9a133b0adcc2156203ac38d275a367b0c493a46f53bfda7f4f494b5eb2fe38266fe0a985aaeb0f8beab7e SHA512 fb05252e1cae1db92d8a2d1da9ff0720b5c7e8c43a512195ecd9010195037d211f01247723cff54298e64e97e9a62750cf1a949d0e68785a46a5bf3e32aab746
 EBUILD qtdbus-5.15.8.ebuild 705 BLAKE2B 3bdddf199b6c94f2545ffca68fb92f599500ad9ea89e7653bf7f927260d37582465a5e65ef360692fb9dddf1e4b6ec8789bf46db73bf66bb18636e8fa95f5915 SHA512 3671eb35367921bf1ddc009c4821de77044b96fec2799f85fd26d7d1664fcdcd73ef29b97f9515d3f5d8dbafc8f241537bc497d466fb4110c1d72143f858a520
 MISC metadata.xml 482 BLAKE2B 651a49dc4a07f5e5a9c21990868e666d98acdea7d7b0b2c0e4c98eafc3da72c803d380e4abda30f33250f7bbd7654df713833ccdddcb975cbad6f92e488f643b SHA512 192c670abd7da29645513bf1d9297d942efdc49f5cf170861e7689fda47f51daa47f10c7c81c3b045366e0259179c6839ff7747197c9d792e8d0fd1a5818973e
diff --git a/dev-qt/qtdbus/qtdbus-5.15.7.ebuild b/dev-qt/qtdbus/qtdbus-5.15.7.ebuild
deleted file mode 100644
index 8fc666e2518d..000000000000
--- a/dev-qt/qtdbus/qtdbus-5.15.7.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-if [[ ${PV} != *9999* ]]; then
-	QT5_KDEPATCHSET_REV=1
-	KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86"
-fi
-
-QT5_MODULE="qtbase"
-inherit qt5-build
-
-DESCRIPTION="Qt5 module for inter-process communication over the D-Bus protocol"
-
-IUSE=""
-
-DEPEND="
-	=dev-qt/qtcore-${QT5_PV}*:5=
-	sys-apps/dbus
-"
-RDEPEND="${DEPEND}"
-
-QT5_TARGET_SUBDIRS=(
-	src/dbus
-	src/tools/qdbusxml2cpp
-	src/tools/qdbuscpp2xml
-)
-
-QT5_GENTOO_CONFIG=(
-	:dbus
-	:dbus-linked:
-)
-
-QT5_GENTOO_PRIVATE_CONFIG=(
-	:dbus
-	:dbus-linked
-)
-
-src_configure() {
-	local myconf=(
-		-dbus-linked
-	)
-	qt5-build_src_configure
-}
diff --git a/dev-qt/qtdeclarative/Manifest b/dev-qt/qtdeclarative/Manifest
index 583d117f9631..332b15974a19 100644
--- a/dev-qt/qtdeclarative/Manifest
+++ b/dev-qt/qtdeclarative/Manifest
@@ -1,13 +1,8 @@
 AUX qtdeclarative-5.14.2-QQuickItemView-fix-maxXY-extent.patch 1566 BLAKE2B b6436c9be0a7de092635e1fc3999c3142fc3e916cbcc69f472691bbd559f611b4d5741f3627c47162a5ac86126382507add72a25a121235e856b1de802ee19be SHA512 dd5193f8d8a051238dabf63306cc77e3a5696fc12241c27f35cadfd30763ddfeb2af7d640849dcc7a810b7087173b8e9af17341ea1b68440906f2c2f1f96fee3
-AUX qtdeclarative-5.15.7-a11y-track-item-enabled-state.patch 2084 BLAKE2B de9f0a8ed12b0ab50ff3d1aa54b30497a10967d3faa73014cfc4c388b2d0801b3bc09341c505719b09e8f2a4412b59536b400baf7b5db06ba84776daae095413 SHA512 c6c40614fc815cbd0e389e7acfb29ea8fae832ad580eb16b5f56d0d34d63491ce254e1a8adff03fe167b3c8063d98a26cfa90331908bff780bdc208ac7f4a419
-DIST qtdeclarative-5.15.7-gentoo-kde-1.tar.xz 24768 BLAKE2B 4595a64432e7c05eb51d9b565189d7f1d76e4d372db4247f1c21f8b4a655a0243c2487203ea669ac88143bb3f3d5dad969370d56522b046bc8fcc28d6597e124 SHA512 96859b52ccc453379c9137587176a26f99f2d4339bbf9008f8268585e77852339b32ffd86b57715109d573b5c6e2ad4963638ae946359d5b46e7a2e570ab2c64
 DIST qtdeclarative-5.15.8-gentoo-kde-1.tar.xz 19932 BLAKE2B e889597ce322d642f0a1a60fd47b23a34b7d40585ab34841cfbce2225c24a4c56075698a3c9b9b93eb8dce80f2a42140269b84538a6c2817997221404892c180 SHA512 88c9483fca6eb10ecf4810dac369260b7d85372a1b698ea9587201398f65d442b6f8bd87603a277acc71f94e6f7cff2cca750888261a3b31c2734c09415d1fd3
-DIST qtdeclarative-everywhere-opensource-src-5.15.7.tar.xz 21591224 BLAKE2B bdb11b3929419a80a3ccd4bbcbc38c17069f1ddbfe5a8bb06345afda7d1cec66396b262b8e2783227912fca90c62b83b388922f631fb284b3b4476c43882276a SHA512 909721a7c756ad3f55fa30b539ddd7f459449edc599883a4e04acbe6f1cecaf44b3a5f2b3b17adb83adaf8cd3e1e5e7e09829b30b0df3dacb1e203892b996508
 DIST qtdeclarative-everywhere-opensource-src-5.15.8.tar.xz 21592984 BLAKE2B 623264ffcca9f623896d73ce946cc0f621bdae50b520e454b59a1888a2c767f0ff089f69ed1c5e028d01fd28ae447add826fb09c615718af61e787fa1849b16e SHA512 c611cc1d25b7eea1da3e5932d253d024459044d8fff6a31066033ea5867dd20aeb183b2d2ba8a2ca71cf263fc1921126509212dd43ab680134e7a9df8d937d73
 DIST qtdeclarative-everywhere-src-6.4.0.tar.xz 30538764 BLAKE2B 919081ba8a29a07daa01084388454a3d5f814e12ff5d1a4d3b647650e4bd6a839876baee1ab09e664e55e814338dbf675e70e4c44c28842a363c8f2dcf1a2b18 SHA512 6d43c09a14e2ca236fc50166ed477e37084e89a67a04d914f30f31662a18a4e6d0433cb9b2f0654ba9ffcbcd7abcb5dadcb7b12f0ef5928fc11b10925ee6f41e
 DIST qtdeclarative-everywhere-src-6.4.2.tar.xz 30564432 BLAKE2B b445672bfd91978855d11eac953c01902522ffe5c3bb48296f926be6234ee7dccfbb3386478633b81a44cbb067ef2078cf3c05a0b7358ae15e635c0d5ab9ccc6 SHA512 76742b8b0902802c1d7615c8b7948b245a535c5f9574893d0fc5f8e09cb914578c1243be23dee37f98bd037e9407f82bc71b22b688067aaa68efcec1db8f922a
-EBUILD qtdeclarative-5.15.7-r1.ebuild 1610 BLAKE2B fb5ee9b274033a2f7ed65b6d9c19c2d0acba95c635453902a0195009d2d4d06c6e2af3f782b362928755ba596250b53db65959b54f6ccb9f8fc25cafae556d74 SHA512 6c10bc91abff5e5ee5f57184eccc496ac2181b93d11cd066fca6cc1e87a6761c4945fa8b03fb7f2bf18aededae72b27c4a98fafba6661d1c12f989a45ed5faba
-EBUILD qtdeclarative-5.15.7.ebuild 1537 BLAKE2B 6a289e389c041d25520253d5bbaa0bf428abbed7bb0ecaf25df696276729b3879955b78eeeccf55303cf3ee2b49fa51a1e0426d9dd75901bcf67148c22b617db SHA512 9ce75f2f9dc0141bc351ac57492b2cb1c98eabc81a7245d6b3de5050e87d5335e08def97690a5e695dac95b4f0e337f3d41b259e0f8d2d21290bfb0e3ce9bdae
 EBUILD qtdeclarative-5.15.8-r2.ebuild 1537 BLAKE2B 6a289e389c041d25520253d5bbaa0bf428abbed7bb0ecaf25df696276729b3879955b78eeeccf55303cf3ee2b49fa51a1e0426d9dd75901bcf67148c22b617db SHA512 9ce75f2f9dc0141bc351ac57492b2cb1c98eabc81a7245d6b3de5050e87d5335e08def97690a5e695dac95b4f0e337f3d41b259e0f8d2d21290bfb0e3ce9bdae
 EBUILD qtdeclarative-6.4.0.ebuild 521 BLAKE2B 17d493bcf062e1d208438aaa85ad814af01546be1476569a9620f7d29270e94d3d8d253d38fb50781b45e83cd4a137262e860eac4a5452c8492f54f7dc8e5dd3 SHA512 bd7b10e8ac12a2deaf5751edb2a7e39ac2530aab69191dd3a1e0c7a35e6038e7f8a96ac7cc1f22fa8377cc1c2de14148f1ec9f767823832fbca59ea7c98d61d5
 EBUILD qtdeclarative-6.4.2.ebuild 521 BLAKE2B f353152ff22805e1bf694df508c61f40bcf67b72e256bc4bc9cdc6f41dd7df855f6f28389ccfc6d4ad8254db4f7e27347b0413d7f946595452993111f1bd94fe SHA512 80299b3c62f099f5f71fdcfb17fba7f7a2b429747b29f24b67b4fd6be3ff53e74b4793e6b2fa3eb68524779c5a160a747c7ee1580bf3d2b738c0f17582728ea8
diff --git a/dev-qt/qtdeclarative/files/qtdeclarative-5.15.7-a11y-track-item-enabled-state.patch b/dev-qt/qtdeclarative/files/qtdeclarative-5.15.7-a11y-track-item-enabled-state.patch
deleted file mode 100644
index e41838a34e30..000000000000
--- a/dev-qt/qtdeclarative/files/qtdeclarative-5.15.7-a11y-track-item-enabled-state.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From f697f2e1a4c5f60f3f09ae7d2e3d3dcd20854aef Mon Sep 17 00:00:00 2001
-From: Harald Sitter <sitter@kde.org>
-Date: Mon, 28 Nov 2022 14:59:33 +0100
-Subject: [PATCH 1/2] a11y: track item enabled state
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-disabled items are neither enabled nor focusable
-
-Change-Id: I4f286c7b85605d5ad6fa787d1f5cfcce1297d268
-Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
-Reviewed-by: Jan Arve Sæther <jan-arve.saether@qt.io>
-(cherry picked from commit 20fd2902a6d7bdb4a3306005d2718ca5a8fef96d)
----
- src/quick/accessible/qaccessiblequickitem.cpp | 4 ++++
- src/quick/items/qquickitem.cpp                | 9 +++++++++
- 2 files changed, 13 insertions(+)
-
-diff --git a/src/quick/accessible/qaccessiblequickitem.cpp b/src/quick/accessible/qaccessiblequickitem.cpp
-index eb3df4d4cd..78e2ab302c 100644
---- a/src/quick/accessible/qaccessiblequickitem.cpp
-+++ b/src/quick/accessible/qaccessiblequickitem.cpp
-@@ -210,6 +210,10 @@ QAccessible::State QAccessibleQuickItem::state() const
-     if (role() == QAccessible::EditableText)
-         if (auto ti = qobject_cast<QQuickTextInput *>(item()))
-             state.passwordEdit = ti->echoMode() != QQuickTextInput::Normal;
-+    if (!item()->isEnabled()) {
-+        state.focusable = false;
-+        state.disabled = true;
-+    }
-     return state;
- }
- 
-diff --git a/src/quick/items/qquickitem.cpp b/src/quick/items/qquickitem.cpp
-index 4cf73ff73d..dec0ae19ae 100644
---- a/src/quick/items/qquickitem.cpp
-+++ b/src/quick/items/qquickitem.cpp
-@@ -6174,6 +6174,15 @@ void QQuickItemPrivate::setEffectiveEnableRecur(QQuickItem *scope, bool newEffec
-     }
- 
-     itemChange(QQuickItem::ItemEnabledHasChanged, effectiveEnable);
-+#if QT_CONFIG(accessibility)
-+    if (isAccessible) {
-+        QAccessible::State changedState;
-+        changedState.disabled = true;
-+        changedState.focusable = true;
-+        QAccessibleStateChangeEvent ev(q, changedState);
-+        QAccessible::updateAccessibility(&ev);
-+    }
-+#endif
-     emit q->enabledChanged();
- }
- 
--- 
-2.38.1
-
diff --git a/dev-qt/qtdeclarative/qtdeclarative-5.15.7-r1.ebuild b/dev-qt/qtdeclarative/qtdeclarative-5.15.7-r1.ebuild
deleted file mode 100644
index f865ec6efb2f..000000000000
--- a/dev-qt/qtdeclarative/qtdeclarative-5.15.7-r1.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 2009-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-if [[ ${PV} != *9999* ]]; then
-	QT5_KDEPATCHSET_REV=1
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
-fi
-
-PYTHON_COMPAT=( python3_{9..11} )
-inherit flag-o-matic python-any-r1 qt5-build
-
-DESCRIPTION="The QML and Quick modules for the Qt5 framework"
-
-IUSE="gles2-only +jit localstorage vulkan +widgets"
-
-# qtgui[gles2-only=] is needed because of bug 504322
-DEPEND="
-	=dev-qt/qtcore-${QT5_PV}*
-	=dev-qt/qtgui-${QT5_PV}*:5=[gles2-only=,vulkan=]
-	=dev-qt/qtnetwork-${QT5_PV}*
-	=dev-qt/qttest-${QT5_PV}*
-	media-libs/libglvnd
-	localstorage? ( =dev-qt/qtsql-${QT5_PV}* )
-	widgets? ( =dev-qt/qtwidgets-${QT5_PV}*[gles2-only=] )
-"
-RDEPEND="${DEPEND}"
-BDEPEND="${PYTHON_DEPS}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-5.14.2-QQuickItemView-fix-maxXY-extent.patch" # QTBUG-83890
-	"${FILESDIR}/${P}-a11y-track-item-enabled-state.patch" # kde/5.15
-)
-
-src_prepare() {
-	qt_use_disable_mod localstorage sql \
-		src/imports/imports.pro
-
-	qt_use_disable_mod widgets widgets \
-		src/src.pro \
-		src/qmltest/qmltest.pro \
-		tests/auto/auto.pro \
-		tools/tools.pro \
-		tools/qmlscene/qmlscene.pro \
-		tools/qml/qml.pro
-
-	qt5-build_src_prepare
-}
-
-src_configure() {
-	replace-flags "-Os" "-O2" # bug 840861
-
-	local myqmakeargs=(
-		--
-		-qml-debug
-		$(qt_use jit feature-qml-jit)
-	)
-	qt5-build_src_configure
-}
-
-src_install() {
-	qt5-build_src_install
-	qt5_symlink_binary_to_path qml 5
-	qt5_symlink_binary_to_path qmleasing 5
-	qt5_symlink_binary_to_path qmlpreview 5
-	qt5_symlink_binary_to_path qmlscene 5
-}
diff --git a/dev-qt/qtdeclarative/qtdeclarative-5.15.7.ebuild b/dev-qt/qtdeclarative/qtdeclarative-5.15.7.ebuild
deleted file mode 100644
index ef4219df3a48..000000000000
--- a/dev-qt/qtdeclarative/qtdeclarative-5.15.7.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 2009-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-if [[ ${PV} != *9999* ]]; then
-	QT5_KDEPATCHSET_REV=1
-	KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86"
-fi
-
-PYTHON_COMPAT=( python3_{9..11} )
-inherit flag-o-matic python-any-r1 qt5-build
-
-DESCRIPTION="The QML and Quick modules for the Qt5 framework"
-
-IUSE="gles2-only +jit localstorage vulkan +widgets"
-
-# qtgui[gles2-only=] is needed because of bug 504322
-DEPEND="
-	=dev-qt/qtcore-${QT5_PV}*
-	=dev-qt/qtgui-${QT5_PV}*:5=[gles2-only=,vulkan=]
-	=dev-qt/qtnetwork-${QT5_PV}*
-	=dev-qt/qttest-${QT5_PV}*
-	media-libs/libglvnd
-	localstorage? ( =dev-qt/qtsql-${QT5_PV}* )
-	widgets? ( =dev-qt/qtwidgets-${QT5_PV}*[gles2-only=] )
-"
-RDEPEND="${DEPEND}"
-BDEPEND="${PYTHON_DEPS}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-5.14.2-QQuickItemView-fix-maxXY-extent.patch" # QTBUG-83890
-)
-
-src_prepare() {
-	qt_use_disable_mod localstorage sql \
-		src/imports/imports.pro
-
-	qt_use_disable_mod widgets widgets \
-		src/src.pro \
-		src/qmltest/qmltest.pro \
-		tests/auto/auto.pro \
-		tools/tools.pro \
-		tools/qmlscene/qmlscene.pro \
-		tools/qml/qml.pro
-
-	qt5-build_src_prepare
-}
-
-src_configure() {
-	replace-flags "-Os" "-O2" # bug 840861
-
-	local myqmakeargs=(
-		--
-		-qml-debug
-		$(qt_use jit feature-qml-jit)
-	)
-	qt5-build_src_configure
-}
-
-src_install() {
-	qt5-build_src_install
-	qt5_symlink_binary_to_path qml 5
-	qt5_symlink_binary_to_path qmleasing 5
-	qt5_symlink_binary_to_path qmlpreview 5
-	qt5_symlink_binary_to_path qmlscene 5
-}
diff --git a/dev-qt/qtdiag/Manifest b/dev-qt/qtdiag/Manifest
index c5ef185befae..83d939e77e57 100644
--- a/dev-qt/qtdiag/Manifest
+++ b/dev-qt/qtdiag/Manifest
@@ -1,7 +1,4 @@
-DIST qttools-5.15.7-gentoo-kde-1.tar.xz 1016 BLAKE2B 2269c02954d34a2862585228b2e3a3536a4b6f37b93c170571afa83d5e9c601684d1bf3d961d8be84acf8af074f4fdf929614c03ba262de8056af778bd41ac71 SHA512 0ac735a9e54fa147a495403e710a75aaf3ab4d2cb51a5db783d7b4b401bc2d6f46bb451d3afaa0efef57fe0dbd1aad95ab3262d88eafeb1f533314132cf400e6
 DIST qttools-5.15.8-gentoo-kde-1.tar.xz 1020 BLAKE2B 1585a66678f318e38b50b17a52f3efd1b53c9c13ceaf63a21fb532ad55790d1f8a5829a10d064de0a7d6efce47bc672916c580b5222f43c35f7869371fc91857 SHA512 e1333e15b1d2f546f6c2164a7da0ef684c024cfa48b847d5671716fa789fdab7e1ed50f3be6efe09e56578c62dd6029aa1fa1546d34b53bba9894445b58aa860
-DIST qttools-everywhere-opensource-src-5.15.7.tar.xz 8900816 BLAKE2B c414cd92eeb7b3cc1b90c1bbb77409ba4e6f33b36cef9376a49068d8698461f211f062d5a7e80321e62ae2dd84f476252658ce3f0239d710945378d8ddfb01d4 SHA512 40176727d8c8430171483fd5815c1f84b8fc4d1a1b26b943c817e9a14cfe2d155c76039593f68f45b7e9276189968f3b37e1b17fd99adda7664582bf30a3935a
 DIST qttools-everywhere-opensource-src-5.15.8.tar.xz 8898368 BLAKE2B ea99e5bdf86d6d48fabd45bf55a48e5604d1a1e938a12838d3a928449d41354c4986401e7f159718432004f7357e28c88d7939f32bc2942bda1cb3abb8e28c33 SHA512 1248b61e21d1bab30c6f8380af0b83ffd2c5f4e75b2906f561f8aae3a8be2e426ca4ffa28164d64a90cc75c570652229847c7009b7aec63c6ba8e977dbdd4f4f
-EBUILD qtdiag-5.15.7.ebuild 834 BLAKE2B ff23e233f466433227049d810c35dcdc1fc6736614397e3c996d3f7f0f6b19787357effd60cadc89d3fef1158b33df9b948063483e70d7e7bea57624b7da26b8 SHA512 6e13ce6a34045b04f2ee940175bc78eb554f9b70fcc15cc4046f6cfb04a8b334b378c6ca3bcda80f1bef987c40588732ffd3c746d3c164d3d493e0ec0950d0a2
 EBUILD qtdiag-5.15.8.ebuild 834 BLAKE2B f9fe490617bbfa844309eef0088b4885aa2d87893705c9f627bcb9b14f227a6eef2a9e2accd4fb6ba724e042cc5b5acf232fa1e910b8e6d5821ec39792103c88 SHA512 d890121782beebef37f72d8e92af82df360fdf539a8a1858364ec623661c45759a4ea8ee229dbc8a80e542ff5a1b364310649e050e4140673a40db1efb9248b6
 MISC metadata.xml 616 BLAKE2B c2e815f14a4c3967140cfeed9d4266b668217994cbdbc58300e3736b428f05449d83ae6ed746bb29debaaa1ab8371a37c054d03395be1f7b66e23c3209449a20 SHA512 8747ad7226372dc06c7e6b44afa0c5cf20a7fb877974c67bf4f599b6ffafff292f3c8a2a80243f6243dcc4c158034dc731451e3af9af8790a302c43ae83907fa
diff --git a/dev-qt/qtdiag/qtdiag-5.15.7.ebuild b/dev-qt/qtdiag/qtdiag-5.15.7.ebuild
deleted file mode 100644
index 8c71d4de4059..000000000000
--- a/dev-qt/qtdiag/qtdiag-5.15.7.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-if [[ ${PV} != *9999* ]]; then
-	QT5_KDEPATCHSET_REV=1
-	KEYWORDS="amd64 ~arm ~hppa ~ppc64 ~sparc x86"
-fi
-
-QT5_MODULE="qttools"
-inherit qt5-build
-
-DESCRIPTION="Tool for reporting diagnostic information about Qt and its environment"
-
-IUSE="+network +widgets"
-
-DEPEND="
-	=dev-qt/qtcore-${QT5_PV}*:5=
-	=dev-qt/qtgui-${QT5_PV}*:5=
-	network? ( =dev-qt/qtnetwork-${QT5_PV}*[ssl] )
-	widgets? ( =dev-qt/qtwidgets-${QT5_PV}* )
-"
-RDEPEND="${DEPEND}"
-
-QT5_TARGET_SUBDIRS=(
-	src/qtdiag
-)
-
-src_prepare() {
-	qt_use_disable_mod network network \
-		src/qtdiag/qtdiag.pro
-
-	qt_use_disable_mod widgets widgets \
-		src/qtdiag/qtdiag.pro
-
-	qt5-build_src_prepare
-}
-
-src_install() {
-	qt5-build_src_install
-	qt5_symlink_binary_to_path qtdiag 5
-}
diff --git a/dev-qt/qtgamepad/Manifest b/dev-qt/qtgamepad/Manifest
index d25b82da92f2..3cdf132f48ad 100644
--- a/dev-qt/qtgamepad/Manifest
+++ b/dev-qt/qtgamepad/Manifest
@@ -1,5 +1,3 @@
-DIST qtgamepad-everywhere-opensource-src-5.15.7.tar.xz 388800 BLAKE2B dfc8802399d590172adbe08555596b3f64e97e004617480f8df29acf406721e5c2e9bf8ba0fca7685ee471d8cad90efbfb88502f6c456e3f5f05d57f92795e2b SHA512 e7269096dbbb3238d7009f5a5e686bce02987a81cef4282d7aa52848916cec67c73c4dfb16cf48a9f46fa9f3c509a789d5622bdf9823df299f1a8c7c67d5b27f
 DIST qtgamepad-everywhere-opensource-src-5.15.8.tar.xz 388800 BLAKE2B da3d71b7c66e57df56974e8432e50cfd9a6fa6940b86ff1489febd488bf9e7d33990f0c740072ed66bc4cf6ef42ed98480ccf50cdf47afa5eaa3a08828549e9d SHA512 f1002906dd53f4c6108b1a7965454e9d30f433b954f90218927b943eb65a63a280f00eea78d21847f91789923e3211a7b8aa599c32157873d1f42153d2e309db
-EBUILD qtgamepad-5.15.7.ebuild 723 BLAKE2B d7e60c8426952fb74e5a2aff6d3c540c7d48d8c7a6be20d8e0ab3e58537cc089e8a1acd973c76f66c6a9ee8e047a98bf1d7d8b94c8447feba863c60c621d2c33 SHA512 9704ffd0c87d89e81f3b4cf57c1a80454865498118423822e5d62391547475d9cdf7adf2dda6edc4ac6916d4d071e1fb4f53df1a26f104cef68e1399b036903d
 EBUILD qtgamepad-5.15.8.ebuild 723 BLAKE2B 7745ad56d8a08e2bcb6a81b812d11c872b091aa98b89d3923eaa74cb974c33d21ef7831ef31886988d5e1bc4de74676ad0ea54259e2de27e342d595d01c9795a SHA512 39f9f29be82b74c10e1e06d69c30d29b9360bfb1b6af49981cf3eed567b50f5880444b8fb48c1e08c897ceca180e28890005b1a3258bc4f9abfa0959457d9ead
 MISC metadata.xml 613 BLAKE2B 02cac703ee9a9083829e963e9bc97424b58a36949b8237157976d9628f9623f806dee434e5eea3b63a1f2a4ac06509a3d0f0cd094590f12cb3b97ee09f9d6cf1 SHA512 9304973708ee729dc06cef8ac5b206a21ada747ca4efb36e2fc21007da61bfaf43947319be20b0ce73411f5eda2d13a4b226503c12b1d094d5f9180e84579432
diff --git a/dev-qt/qtgamepad/qtgamepad-5.15.7.ebuild b/dev-qt/qtgamepad/qtgamepad-5.15.7.ebuild
deleted file mode 100644
index eaf359db97b6..000000000000
--- a/dev-qt/qtgamepad/qtgamepad-5.15.7.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit qt5-build
-
-DESCRIPTION="Qt module to support gamepad hardware"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 ~arm arm64 ~riscv x86"
-fi
-
-IUSE="evdev qml sdl"
-
-DEPEND="
-	=dev-qt/qtcore-${QT5_PV}*
-	=dev-qt/qtgui-${QT5_PV}*[evdev?]
-	evdev? ( virtual/libudev:= )
-	qml? ( =dev-qt/qtdeclarative-${QT5_PV}* )
-	sdl? ( media-libs/libsdl2 )
-"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	qt_use_disable_mod qml quick \
-		src/src.pro
-
-	qt_use_disable_config evdev evdev \
-		src/plugins/gamepads/gamepads.pro
-
-	qt_use_disable_config sdl sdl2 \
-		src/plugins/gamepads/gamepads.pro
-
-	qt5-build_src_prepare
-}
diff --git a/dev-qt/qtgraphicaleffects/Manifest b/dev-qt/qtgraphicaleffects/Manifest
index f24b3a8351a1..7b09919e361d 100644
--- a/dev-qt/qtgraphicaleffects/Manifest
+++ b/dev-qt/qtgraphicaleffects/Manifest
@@ -1,5 +1,3 @@
-DIST qtgraphicaleffects-everywhere-opensource-src-5.15.7.tar.xz 14043560 BLAKE2B d399095f4dd2553525535dd3fd2503e57746c7e53578dbdcbb4d42ac3df3b7c2f8e12b36222868fbfe585844988ec41d0ad8a0df78758a1a3badd0b879cd3853 SHA512 c733253e6c0ee6049dffbcd2ce4fdb5095e7c0eb87dae5d7eb3b4c2ee8ff5329c99e5ff8949bf4613b00aefdb34a9869eb7099e23e8e45ce721d30cc6eba2207
 DIST qtgraphicaleffects-everywhere-opensource-src-5.15.8.tar.xz 14043772 BLAKE2B 412b37dde627cf7c57a4738e365b842d771c3e3898cced1ceac9dc29143295f61a63b6445a69658a005ddfe49c2e1b8508e5f9291a7eecd485217631afcce322 SHA512 bac9d18492b7ce0092ae9e3b27bcbc2fa421531eb76b3f4c69d20eeaa0520201eca850a2cc692c38f00b8efb24015cd28f53bd892b350e3c1d1337003b399c28
-EBUILD qtgraphicaleffects-5.15.7.ebuild 473 BLAKE2B 14aa2cf1c4ea3f411576fc7c6063ea12833910408d433a5ba86086bf2a323a7644fec6742ac6c9d529bb9a9dee96ebda4e16953193ff29a63e8bafe66c1b481b SHA512 143efcda92eeae569e2a9e944cc537b7f33f9a2ef3f5daee6f7f80c90c4ffc81cd42b51e8a8c16c42f6a452de7dac156ed042f1f6d0034face231a4d0bd1ced4
 EBUILD qtgraphicaleffects-5.15.8.ebuild 473 BLAKE2B b0926014983109be4aa0be482cb09248ff582c836588774397a0e6c94b4d98c768b20744f649094b1f8c2f2dff19d19c76aa9482242747064e038389ed22c05b SHA512 8cfc850bc53f4e12d908f9e509a7175892aed0eca0ccb75d109d895a82f4610c3cb579a88236abc9e3594ea1555a6ba2f2a411c7c1f32320e326f2cba28d1093
 MISC metadata.xml 482 BLAKE2B 651a49dc4a07f5e5a9c21990868e666d98acdea7d7b0b2c0e4c98eafc3da72c803d380e4abda30f33250f7bbd7654df713833ccdddcb975cbad6f92e488f643b SHA512 192c670abd7da29645513bf1d9297d942efdc49f5cf170861e7689fda47f51daa47f10c7c81c3b045366e0259179c6839ff7747197c9d792e8d0fd1a5818973e
diff --git a/dev-qt/qtgraphicaleffects/qtgraphicaleffects-5.15.7.ebuild b/dev-qt/qtgraphicaleffects/qtgraphicaleffects-5.15.7.ebuild
deleted file mode 100644
index e0a0261886fb..000000000000
--- a/dev-qt/qtgraphicaleffects/qtgraphicaleffects-5.15.7.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-VIRTUALX_REQUIRED="test"
-inherit qt5-build
-
-DESCRIPTION="Set of QML types for adding visual effects to user interfaces"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 ~arm arm64 ~hppa ~loong ppc ppc64 ~riscv x86"
-fi
-
-IUSE=""
-
-RDEPEND="
-	=dev-qt/qtcore-${QT5_PV}*
-	=dev-qt/qtdeclarative-${QT5_PV}*
-	=dev-qt/qtgui-${QT5_PV}*
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-qt/qtgui/Manifest b/dev-qt/qtgui/Manifest
index 90ffc6ece591..4a81e7d59bef 100644
--- a/dev-qt/qtgui/Manifest
+++ b/dev-qt/qtgui/Manifest
@@ -1,13 +1,5 @@
-AUX qtgui-5.15.7-fix-no-dbus.patch 3559 BLAKE2B 96c96aa3aee90d2569d86d136646f2929f639d8702ebb5a2faafaaa2a69942d3cb1272044efb4b0b0d8925e8e4867570580b8ff184d03c8b5c19c49e962ecb65 SHA512 6fdef29afc2638d18363c5ae5c403eea65f09e5dfe3a622d5961626221400f0f034086748b72a6b2b84350349d94aae1cb3c7bffb66adf5f70490e440b9be154
-AUX qtgui-5.15.7-fix-wrong-to-linear-conversion.patch 1801 BLAKE2B 14e9fc93edd5cc02a978962e9b35847f5af7a26b2bc27bd9bf67f71b9db7ec01d172660de0817ca44f1936055a1a2385c7395c85a4a70b06da9fc063119d9917 SHA512 9ec38861a924e6170829d0aa4e886bf6be4ded8454d97a52923f2d78a5ee38121ebe29c043bf020f86de62b3eb74a92f3f31fb8698e93d1e7dc7b95a7d7dd6a3
-AUX qtgui-5.15.7-xcb-correctly-disconnect-xsettings-callbacks.patch 2463 BLAKE2B d6216187d8416d3e4515470a899093cf36df4f89ba69bb13340d68cec990b018923fbe8813b2d215638a6ad62f515c0b8a383a76b8072916c0b687208e8af005 SHA512 8131948123f95c01ebe524d518addcb62385ba0a65cd308559dc9ac6e971db45b966dd9ca7fe3861c2d3d23ab1ff815ef6365eaaf9262da5b3c03406a1845c40
-DIST qtbase-5.15-gentoo-patchset-2.tar.xz 3844 BLAKE2B 6dcb69398cf8a6b1be737e8c7bf1041529c4e704ca892cef10ba3bc5ce435c903607b64e981cf8aa12c785b3e423aa1d52bce1f67ec1bd8dbb1421dfb6f62700 SHA512 b7fd7e17bcab2f9803c7bfc0473082ee4640299c23ce8da943ef80ed181e880ebc9157bcebde28077e80e6f907aa14a59c42416b3e32f49baebd54fbe5a37497
 DIST qtbase-5.15-gentoo-patchset-3.tar.xz 3856 BLAKE2B 0752426f9bc2dfa1ab2bc246b29f5d00305df05175a7801d7d5eddacfa46fcb605d9a317547edc01d3ef339f6effc2fcee7549cb7aecced37f0098166c70dbe2 SHA512 2515bea53232e76ca3e40bdaf1dd52fdf452052a2f40002ee91360d1fcceea3c5c2f5a8d2a3bfc0f9c2bacd61460a632c5b351accd73fd37b64985593219148e
-DIST qtbase-5.15.7-gentoo-kde-1.tar.xz 798056 BLAKE2B 3c7fefa65ab6de25c2c82261ad0f1371e32acd4bd4b3303f20a5ebf36d19690df94290d102c65e4941a6c51a5d5f2db0253bafca5ac85cf480f7434405cb2671 SHA512 20ab17220489009c98d7f783a02614507e157974c7cb16f47d50d3954ccd1cd065562effc393df6e07c9ba6ad8ccd4e6b3f0bf5b5b890183b8631b8b570bf064
 DIST qtbase-5.15.8-gentoo-kde-3.tar.xz 782344 BLAKE2B 115814a4d90ac286540cf6e50bd2b57baa8e0e327fc73c3ab06fe43ecd95e1e3739faecee5db112d95d17e4fb84494ad5557e70251f2c60142166715294bf366 SHA512 d50b0f02476ded9f053093ec15c5204a0ec664794dcc324996685f09400a2cbc76dc3fd0ebfc247ebd42fbe203b7d4c904e975fc985bf7928e43c6cd65f04f34
-DIST qtbase-everywhere-opensource-src-5.15.7.tar.xz 50260196 BLAKE2B 69029a910af0e3bfe742b5870334406e03274b0677ef47f9c7c10f730ff031bae49bd21a686497215505b19a183ca395c275d8afefaaa903125297f8e693bb4d SHA512 316de71fba1d5dd91354155dcd0f77e1ce2a798f8296a8699a795ea5e86ad10b6e233299775a92e23328290f3e041240585947e89ee7bd39eb464c5f0ffec343
 DIST qtbase-everywhere-opensource-src-5.15.8.tar.xz 50259432 BLAKE2B cb1b790a384a5cad9a95fdc448e275d48a68c6ee2addf08b40f9963cc5762fd7ab15852dea8392dc76da39f1565c1e23ddb5875c280f0177e802082f4b4f7f2b SHA512 29e8877bafdbc908072209f1b27a5040b022e2b71f17f4ab4cecd570adeae21597f9af7f1d38758760f3cb30376eeb15c5f066bf02c6e9a9e3a4d07f967046ce
-EBUILD qtgui-5.15.7-r1.ebuild 4201 BLAKE2B 755f2eabe8e26b6df401f0606600275082af68ee546c730805ac953de7bc0ac982d6413eca144574f8fccb526ef84f44b3fcd13144548e99f60cc6939618e377 SHA512 f2c80c7d048bc404f584e554c4425e861cc14bc25d4b04f6a64911746dcf3ad89fbd26bdd6a09b1320ad64c2543371b6249ca52706234b774ad67d7851941116
-EBUILD qtgui-5.15.7.ebuild 4127 BLAKE2B a2c2ef7b2974ca40d3488f66431e0d71492528fc0cf11bc72b8f454e6a9e6d27ed63511e8ab080376e06833611a0a76779fc82dd1446f6c390dbdf93cb162272 SHA512 cdf03610b8ef78a8d57d8352399aab0d1f5567cd76c742c1fc4a84e7642fa2d3256e1337696a328dc76c5f25670b8366a299e2577b7bf12bf80a2cbe738d6623
 EBUILD qtgui-5.15.8-r1.ebuild 3836 BLAKE2B a5216fc2e7a1ee2c146a89c79de2ea69f1300025740ba34fd076da437416c0e4a6b761e4e85699ec60b9a266482147b79f8e0874acf064af6685998b62b45072 SHA512 54409e756b9362237bc50b40f73d00da5b3d859002036ffb32ab59de9f29c05349300b1a386313738c7a99c6336fab1d920e714c93e94aad67d3de45ac2a84e3
 MISC metadata.xml 1387 BLAKE2B a370bc2dc77b3efcca29b46e9690b1b5e5c08c5fbfcf06211c1a384c9b998517b4da4357b1cc33998d4f480f9c5481e41b42f3b20f8f72d2635b317ed1d5b412 SHA512 ffa4622291427193109a83d422ff53f373fc3eb7449855849f0f39091383abc30fbfcb88a7d53e29bf2d39e1ec1c40f7aac7433b4d7c0aeefd48983047e912d5
diff --git a/dev-qt/qtgui/files/qtgui-5.15.7-fix-no-dbus.patch b/dev-qt/qtgui/files/qtgui-5.15.7-fix-no-dbus.patch
deleted file mode 100644
index 74aa5a213cfa..000000000000
--- a/dev-qt/qtgui/files/qtgui-5.15.7-fix-no-dbus.patch
+++ /dev/null
@@ -1,94 +0,0 @@
-From 6b95957de0ca356e566ac82924b28544effb3579 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Fri, 9 Sep 2022 20:13:13 +0200
-Subject: [PATCH] Replace #if QT_CONFIG(dbus) with #ifndef QT_NO_DBUS
-
-Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
----
- src/gui/kernel/qguiapplication.cpp                 |  2 +-
- .../services/genericunix/qgenericunixservices.cpp  | 14 +++++++-------
- 2 files changed, 8 insertions(+), 8 deletions(-)
-
-diff --git a/src/gui/kernel/qguiapplication.cpp b/src/gui/kernel/qguiapplication.cpp
-index 87643a3a39..e191420303 100644
---- a/src/gui/kernel/qguiapplication.cpp
-+++ b/src/gui/kernel/qguiapplication.cpp
-@@ -263,7 +263,7 @@ static void initThemeHints()
- 
- static bool checkNeedPortalSupport()
- {
--#if QT_CONFIG(dbus)
-+#ifndef QT_NO_DBUS
-     return !QStandardPaths::locate(QStandardPaths::RuntimeLocation, QLatin1String("flatpak-info")).isEmpty() || qEnvironmentVariableIsSet("SNAP");
- #else
-     return false;
-diff --git a/src/platformsupport/services/genericunix/qgenericunixservices.cpp b/src/platformsupport/services/genericunix/qgenericunixservices.cpp
-index 2abe039126..69ff0de916 100644
---- a/src/platformsupport/services/genericunix/qgenericunixservices.cpp
-+++ b/src/platformsupport/services/genericunix/qgenericunixservices.cpp
-@@ -54,7 +54,7 @@
- #include <QtGui/QGuiApplication>
- #include <QtGui/QWindow>
- 
--#if QT_CONFIG(dbus)
-+#ifndef QT_NO_DBUS
- // These QtCore includes are needed for xdg-desktop-portal support
- #include <QtCore/private/qcore_unix_p.h>
- 
-@@ -185,7 +185,7 @@ static inline bool launch(const QString &launcher, const QUrl &url)
-     return ok;
- }
- 
--#if QT_CONFIG(dbus)
-+#ifndef QT_NO_DBUS
- static inline bool checkNeedPortalSupport()
- {
-     return !QStandardPaths::locate(QStandardPaths::RuntimeLocation, QLatin1String("flatpak-info")).isEmpty() || qEnvironmentVariableIsSet("SNAP");
-@@ -392,7 +392,7 @@ private:
- 
- QGenericUnixServices::QGenericUnixServices()
- {
--#if QT_CONFIG(dbus)
-+#ifndef QT_NO_DBUS
-     if (qEnvironmentVariableIntValue("QT_NO_XDG_DESKTOP_PORTAL") > 0) {
-         return;
-     }
-@@ -417,7 +417,7 @@ QGenericUnixServices::QGenericUnixServices()
- 
- QPlatformServiceColorPicker *QGenericUnixServices::colorPicker(QWindow *parent)
- {
--#if QT_CONFIG(dbus)
-+#ifndef QT_NO_DBUS
-     // Make double sure that we are in a wayland environment. In particular check
-     // WAYLAND_DISPLAY so also XWayland apps benefit from portal-based color picking.
-     // Outside wayland we'll rather rely on other means than the XDG desktop portal.
-@@ -441,7 +441,7 @@ QByteArray QGenericUnixServices::desktopEnvironment() const
- bool QGenericUnixServices::openUrl(const QUrl &url)
- {
-     if (url.scheme() == QLatin1String("mailto")) {
--#if QT_CONFIG(dbus)
-+#ifndef QT_NO_DBUS
-         if (checkNeedPortalSupport()) {
-             QDBusError error = xdgDesktopPortalSendEmail(url);
-             if (isPortalReturnPermanent(error))
-@@ -453,7 +453,7 @@ bool QGenericUnixServices::openUrl(const QUrl &url)
-         return openDocument(url);
-     }
- 
--#if QT_CONFIG(dbus)
-+#ifndef QT_NO_DBUS
-     if (checkNeedPortalSupport()) {
-         QDBusError error = xdgDesktopPortalOpenUrl(url);
-         if (isPortalReturnPermanent(error))
-@@ -470,7 +470,7 @@ bool QGenericUnixServices::openUrl(const QUrl &url)
- 
- bool QGenericUnixServices::openDocument(const QUrl &url)
- {
--#if QT_CONFIG(dbus)
-+#ifndef QT_NO_DBUS
-     if (checkNeedPortalSupport()) {
-         QDBusError error = xdgDesktopPortalOpenFile(url);
-         if (isPortalReturnPermanent(error))
--- 
-2.38.1
-
diff --git a/dev-qt/qtgui/files/qtgui-5.15.7-fix-wrong-to-linear-conversion.patch b/dev-qt/qtgui/files/qtgui-5.15.7-fix-wrong-to-linear-conversion.patch
deleted file mode 100644
index e0ae71f90f3c..000000000000
--- a/dev-qt/qtgui/files/qtgui-5.15.7-fix-wrong-to-linear-conversion.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From a9e67318e6a8924c4b5461656bcc6a80720ae899 Mon Sep 17 00:00:00 2001
-From: Allan Sandfeld Jensen <allan.jensen@qt.io>
-Date: Tue, 6 Dec 2022 10:42:59 +0100
-Subject: [PATCH] Fix wrong to linear conversion
-
-Causing bad rendering of gamma corrected text on non-standard image
-format paint devices.
-
-Pick-to: 6.4 6.2 5.15
-Fixes: QTBUG-109169
-Change-Id: I6d95e9a42b9ccac609071123dd4535d25e225a29
-Reviewed-by: Fabian Vogt <fabian@ritter-vogt.de>
-Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
-(cherry picked from commit a09c33e1f7b5999a16bce9dd23ef8ca33d519210)
----
- src/gui/painting/qcolortrclut_p.h | 1 +
- src/gui/painting/qdrawhelper.cpp  | 2 +-
- 2 files changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/src/gui/painting/qcolortrclut_p.h b/src/gui/painting/qcolortrclut_p.h
-index 76a6a60803..24fd522e6c 100644
---- a/src/gui/painting/qcolortrclut_p.h
-+++ b/src/gui/painting/qcolortrclut_p.h
-@@ -118,6 +118,7 @@ public:
-         return QRgba64::fromRgba64(r, g, b, qAlpha(rgb32) * 257);
- #endif
-     }
-+    QRgba64 toLinear64(QRgba64) const = delete;
- 
-     QRgb toLinear(QRgb rgb32) const
-     {
-diff --git a/src/gui/painting/qdrawhelper.cpp b/src/gui/painting/qdrawhelper.cpp
-index a61793508a..5ba2d277b7 100644
---- a/src/gui/painting/qdrawhelper.cpp
-+++ b/src/gui/painting/qdrawhelper.cpp
-@@ -6091,7 +6091,7 @@ static inline void alphargbblend_argb32(quint32 *dst, uint coverage, const QRgba
- static inline void rgbBlendPixel(QRgba64 &dst, int coverage, QRgba64 slinear, const QColorTrcLut *colorProfile)
- {
-     // Do a gammacorrected RGB alphablend...
--    const QRgba64 dlinear = colorProfile ? colorProfile->toLinear64(dst) : dst;
-+    const QRgba64 dlinear = colorProfile ? colorProfile->toLinear(dst) : dst;
- 
-     QRgba64 blend = rgbBlend(dlinear, slinear, coverage);
- 
--- 
-2.38.1
-
diff --git a/dev-qt/qtgui/files/qtgui-5.15.7-xcb-correctly-disconnect-xsettings-callbacks.patch b/dev-qt/qtgui/files/qtgui-5.15.7-xcb-correctly-disconnect-xsettings-callbacks.patch
deleted file mode 100644
index 5692ecc5379e..000000000000
--- a/dev-qt/qtgui/files/qtgui-5.15.7-xcb-correctly-disconnect-xsettings-callbacks.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-From c78370cabc56668f45bdc2e96eaa8a1565d52c85 Mon Sep 17 00:00:00 2001
-From: David Edmundson <kde@davidedmundson.co.uk>
-Date: Mon, 17 Oct 2022 22:18:58 +0100
-Subject: [PATCH] xcb: correctly disconnect xsettings callbacks
-
-registerCallbackForProperty can be initialized without us completely
-initialializing a GTK theme. We need a different guard for the
-destructor.
-
-(part cherry-picked from 012132c60d625b2de0039bdda3c22a0a8fe2dfe5)
----
- src/plugins/platforms/xcb/qxcbcursor.cpp | 8 +++++---
- src/plugins/platforms/xcb/qxcbcursor.h   | 1 +
- 2 files changed, 6 insertions(+), 3 deletions(-)
-
-diff --git a/src/plugins/platforms/xcb/qxcbcursor.cpp b/src/plugins/platforms/xcb/qxcbcursor.cpp
-index 4210bf428e..0670b6ebce 100644
---- a/src/plugins/platforms/xcb/qxcbcursor.cpp
-+++ b/src/plugins/platforms/xcb/qxcbcursor.cpp
-@@ -300,7 +300,7 @@ QXcbCursorCacheKey::QXcbCursorCacheKey(const QCursor &c)
- #endif // !QT_NO_CURSOR
- 
- QXcbCursor::QXcbCursor(QXcbConnection *conn, QXcbScreen *screen)
--    : QXcbObject(conn), m_screen(screen), m_gtkCursorThemeInitialized(false)
-+    : QXcbObject(conn), m_screen(screen), m_gtkCursorThemeInitialized(false), m_callbackForPropertyRegistered(false)
- {
- #if QT_CONFIG(cursor)
-     // see NUM_BITMAPS in libXcursor/src/xcursorint.h
-@@ -343,7 +343,7 @@ QXcbCursor::~QXcbCursor()
- {
-     xcb_connection_t *conn = xcb_connection();
- 
--    if (m_gtkCursorThemeInitialized) {
-+    if (m_callbackForPropertyRegistered) {
-         m_screen->xSettings()->removeCallbackForHandle(this);
-     }
- 
-@@ -562,8 +562,10 @@ xcb_cursor_t QXcbCursor::createFontCursor(int cshape)
-     xcb_cursor_t cursor = XCB_NONE;
- 
- #if QT_CONFIG(xcb_xlib) && QT_CONFIG(library)
--    if (m_screen->xSettings()->initialized())
-+    if (m_screen->xSettings()->initialized()) {
-         m_screen->xSettings()->registerCallbackForProperty("Gtk/CursorThemeName",cursorThemePropertyChanged,this);
-+        m_callbackForPropertyRegistered = true;
-+    }
- 
-     // Try Xcursor first
-     if (cshape >= 0 && cshape <= Qt::LastCursor) {
-diff --git a/src/plugins/platforms/xcb/qxcbcursor.h b/src/plugins/platforms/xcb/qxcbcursor.h
-index 0b238823f0..82fb47e55d 100644
---- a/src/plugins/platforms/xcb/qxcbcursor.h
-+++ b/src/plugins/platforms/xcb/qxcbcursor.h
-@@ -122,6 +122,7 @@ private:
-                                            void *handle);
- #endif
-     bool m_gtkCursorThemeInitialized;
-+    bool m_callbackForPropertyRegistered;
- };
- 
- QT_END_NAMESPACE
--- 
-GitLab
-
diff --git a/dev-qt/qtgui/qtgui-5.15.7-r1.ebuild b/dev-qt/qtgui/qtgui-5.15.7-r1.ebuild
deleted file mode 100644
index 8c0d97088139..000000000000
--- a/dev-qt/qtgui/qtgui-5.15.7-r1.ebuild
+++ /dev/null
@@ -1,186 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-if [[ ${PV} != *9999* ]]; then
-	QT5_KDEPATCHSET_REV=1
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
-fi
-
-QT5_MODULE="qtbase"
-inherit qt5-build
-
-DESCRIPTION="The GUI module and platform plugins for the Qt5 framework"
-
-SLOT=5/${QT5_PV} # bug 707658
-IUSE="accessibility dbus egl eglfs evdev gles2-only ibus jpeg +libinput
-	linuxfb +png tslib tuio +udev vnc vulkan wayland +X"
-REQUIRED_USE="
-	|| ( eglfs linuxfb vnc X )
-	accessibility? ( dbus X )
-	eglfs? ( egl )
-	ibus? ( dbus )
-	libinput? ( udev )
-	X? ( gles2-only? ( egl ) )
-"
-
-RDEPEND="
-	dev-libs/glib:2
-	=dev-qt/qtcore-${QT5_PV}*:5=
-	dev-util/gtk-update-icon-cache
-	media-libs/fontconfig
-	media-libs/freetype:2
-	media-libs/harfbuzz:=
-	sys-libs/zlib:=
-	dbus? ( =dev-qt/qtdbus-${QT5_PV}* )
-	eglfs? (
-		media-libs/mesa[gbm(+)]
-		x11-libs/libdrm
-	)
-	evdev? ( sys-libs/mtdev )
-	jpeg? ( media-libs/libjpeg-turbo:= )
-	gles2-only? ( media-libs/libglvnd )
-	!gles2-only? ( media-libs/libglvnd[X] )
-	libinput? (
-		dev-libs/libinput:=
-		x11-libs/libxkbcommon
-	)
-	png? ( media-libs/libpng:= )
-	tslib? ( >=x11-libs/tslib-1.21 )
-	tuio? ( =dev-qt/qtnetwork-${QT5_PV}* )
-	udev? ( virtual/libudev:= )
-	vnc? ( =dev-qt/qtnetwork-${QT5_PV}* )
-	vulkan? ( dev-util/vulkan-headers )
-	X? (
-		x11-libs/libICE
-		x11-libs/libSM
-		x11-libs/libX11
-		x11-libs/libxcb:=
-		x11-libs/libxkbcommon[X]
-		x11-libs/xcb-util-image
-		x11-libs/xcb-util-keysyms
-		x11-libs/xcb-util-renderutil
-		x11-libs/xcb-util-wm
-	)
-"
-DEPEND="${RDEPEND}
-	evdev? ( sys-kernel/linux-headers )
-	linuxfb? ( sys-kernel/linux-headers )
-	udev? ( sys-kernel/linux-headers )
-"
-PDEPEND="
-	ibus? ( app-i18n/ibus )
-	wayland? ( =dev-qt/qtwayland-${QT5_PV}* )
-"
-
-QT5_TARGET_SUBDIRS=(
-	src/tools/qvkgen
-	src/gui
-	src/openglextensions
-	src/platformheaders
-	src/platformsupport
-	src/plugins/generic
-	src/plugins/imageformats
-	src/plugins/platforms
-	src/plugins/platforminputcontexts
-)
-
-QT5_GENTOO_CONFIG=(
-	accessibility:accessibility-atspi-bridge
-	egl:egl:
-	eglfs:eglfs:
-	eglfs:eglfs_egldevice:
-	eglfs:eglfs_gbm:
-	evdev:evdev:
-	evdev:mtdev:
-	:fontconfig:
-	:system-freetype:FREETYPE
-	!:no-freetype:
-	gles2-only::OPENGL_ES
-	gles2-only:opengles2:OPENGL_ES_2
-	!:no-gui:
-	:system-harfbuzz:
-	!:no-harfbuzz:
-	jpeg:system-jpeg:IMAGEFORMAT_JPEG
-	!jpeg:no-jpeg:
-	libinput
-	libinput:xkbcommon:
-	:opengl
-	png:png:
-	png:system-png:IMAGEFORMAT_PNG
-	!png:no-png:
-	tslib:tslib:
-	udev:libudev:
-	vulkan:vulkan:
-	X:xcb:
-	X:xcb-glx:
-	X:xcb-plugin:
-	X:xcb-render:
-	X:xcb-sm:
-	X:xcb-xlib:
-	X:xcb-xinput:
-)
-
-QT5_GENTOO_PRIVATE_CONFIG=(
-	:gui
-)
-
-PATCHES=(
-	"${FILESDIR}/${P}-fix-wrong-to-linear-conversion.patch" # kde/5.15
-	# Approved but pending rebase:
-	# https://invent.kde.org/qt/qt/qtbase/-/merge_requests/211
-	"${FILESDIR}/${P}-xcb-correctly-disconnect-xsettings-callbacks.patch"
-	# Downstream workaround the fact that QT_CONFIG(dbus) does not work for us:
-	"${FILESDIR}/${P}-fix-no-dbus.patch"
-)
-
-src_prepare() {
-	# don't add -O3 to CXXFLAGS, bug 549140
-	sed -i -e '/CONFIG\s*+=/s/optimize_full//' src/gui/gui.pro || die
-
-	# egl_x11 is activated when both egl and X are enabled
-	use egl && QT5_GENTOO_CONFIG+=(X:egl_x11:) || QT5_GENTOO_CONFIG+=(egl:egl_x11:)
-
-	qt_use_disable_config dbus dbus \
-		src/platformsupport/themes/genericunix/genericunix.pri
-
-	qt_use_disable_config tuio tuiotouch src/plugins/generic/generic.pro
-
-	qt_use_disable_mod ibus dbus \
-		src/plugins/platforminputcontexts/platforminputcontexts.pro
-
-	use vnc || sed -i -e '/SUBDIRS += vnc/d' \
-		src/plugins/platforms/platforms.pro || die
-
-	qt5-build_src_prepare
-}
-
-src_configure() {
-	local myconf=(
-		$(usev dbus -dbus-linked)
-		$(qt_use egl)
-		$(qt_use eglfs)
-		$(usev eglfs '-gbm -kms')
-		$(qt_use evdev)
-		$(qt_use evdev mtdev)
-		-fontconfig
-		-system-freetype
-		-gui
-		-system-harfbuzz
-		$(qt_use jpeg libjpeg system)
-		$(qt_use libinput)
-		$(qt_use linuxfb)
-		-opengl $(usex gles2-only es2 desktop)
-		$(qt_use png libpng system)
-		$(qt_use tslib)
-		$(qt_use udev libudev)
-		$(qt_use vulkan)
-		$(qt_use X xcb)
-		$(usev X '-xcb-xlib')
-	)
-	if use libinput || use X; then
-		myconf+=( -xkbcommon )
-	fi
-	qt5-build_src_configure
-}
diff --git a/dev-qt/qtgui/qtgui-5.15.7.ebuild b/dev-qt/qtgui/qtgui-5.15.7.ebuild
deleted file mode 100644
index 653c73a5460e..000000000000
--- a/dev-qt/qtgui/qtgui-5.15.7.ebuild
+++ /dev/null
@@ -1,185 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-if [[ ${PV} != *9999* ]]; then
-	QT5_KDEPATCHSET_REV=1
-	KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86"
-fi
-
-QT5_MODULE="qtbase"
-inherit qt5-build
-
-DESCRIPTION="The GUI module and platform plugins for the Qt5 framework"
-
-SLOT=5/${QT5_PV} # bug 707658
-IUSE="accessibility dbus egl eglfs evdev gles2-only ibus jpeg +libinput
-	linuxfb +png tslib tuio +udev vnc vulkan wayland +X"
-REQUIRED_USE="
-	|| ( eglfs linuxfb vnc X )
-	accessibility? ( dbus X )
-	eglfs? ( egl )
-	ibus? ( dbus )
-	libinput? ( udev )
-	X? ( gles2-only? ( egl ) )
-"
-
-RDEPEND="
-	dev-libs/glib:2
-	=dev-qt/qtcore-${QT5_PV}*:5=
-	dev-util/gtk-update-icon-cache
-	media-libs/fontconfig
-	media-libs/freetype:2
-	media-libs/harfbuzz:=
-	sys-libs/zlib:=
-	dbus? ( =dev-qt/qtdbus-${QT5_PV}* )
-	eglfs? (
-		media-libs/mesa[gbm(+)]
-		x11-libs/libdrm
-	)
-	evdev? ( sys-libs/mtdev )
-	jpeg? ( media-libs/libjpeg-turbo:= )
-	gles2-only? ( media-libs/libglvnd )
-	!gles2-only? ( media-libs/libglvnd[X] )
-	libinput? (
-		dev-libs/libinput:=
-		x11-libs/libxkbcommon
-	)
-	png? ( media-libs/libpng:= )
-	tslib? ( >=x11-libs/tslib-1.21 )
-	tuio? ( =dev-qt/qtnetwork-${QT5_PV}* )
-	udev? ( virtual/libudev:= )
-	vnc? ( =dev-qt/qtnetwork-${QT5_PV}* )
-	vulkan? ( dev-util/vulkan-headers )
-	X? (
-		x11-libs/libICE
-		x11-libs/libSM
-		x11-libs/libX11
-		x11-libs/libxcb:=
-		x11-libs/libxkbcommon[X]
-		x11-libs/xcb-util-image
-		x11-libs/xcb-util-keysyms
-		x11-libs/xcb-util-renderutil
-		x11-libs/xcb-util-wm
-	)
-"
-DEPEND="${RDEPEND}
-	evdev? ( sys-kernel/linux-headers )
-	linuxfb? ( sys-kernel/linux-headers )
-	udev? ( sys-kernel/linux-headers )
-"
-PDEPEND="
-	ibus? ( app-i18n/ibus )
-	wayland? ( =dev-qt/qtwayland-${QT5_PV}* )
-"
-
-QT5_TARGET_SUBDIRS=(
-	src/tools/qvkgen
-	src/gui
-	src/openglextensions
-	src/platformheaders
-	src/platformsupport
-	src/plugins/generic
-	src/plugins/imageformats
-	src/plugins/platforms
-	src/plugins/platforminputcontexts
-)
-
-QT5_GENTOO_CONFIG=(
-	accessibility:accessibility-atspi-bridge
-	egl:egl:
-	eglfs:eglfs:
-	eglfs:eglfs_egldevice:
-	eglfs:eglfs_gbm:
-	evdev:evdev:
-	evdev:mtdev:
-	:fontconfig:
-	:system-freetype:FREETYPE
-	!:no-freetype:
-	gles2-only::OPENGL_ES
-	gles2-only:opengles2:OPENGL_ES_2
-	!:no-gui:
-	:system-harfbuzz:
-	!:no-harfbuzz:
-	jpeg:system-jpeg:IMAGEFORMAT_JPEG
-	!jpeg:no-jpeg:
-	libinput
-	libinput:xkbcommon:
-	:opengl
-	png:png:
-	png:system-png:IMAGEFORMAT_PNG
-	!png:no-png:
-	tslib:tslib:
-	udev:libudev:
-	vulkan:vulkan:
-	X:xcb:
-	X:xcb-glx:
-	X:xcb-plugin:
-	X:xcb-render:
-	X:xcb-sm:
-	X:xcb-xlib:
-	X:xcb-xinput:
-)
-
-QT5_GENTOO_PRIVATE_CONFIG=(
-	:gui
-)
-
-PATCHES=(
-	# Approved but pending rebase:
-	# https://invent.kde.org/qt/qt/qtbase/-/merge_requests/211
-	"${FILESDIR}/${P}-xcb-correctly-disconnect-xsettings-callbacks.patch"
-	# Downstream workaround the fact that QT_CONFIG(dbus) does not work for us:
-	"${FILESDIR}/${P}-fix-no-dbus.patch"
-)
-
-src_prepare() {
-	# don't add -O3 to CXXFLAGS, bug 549140
-	sed -i -e '/CONFIG\s*+=/s/optimize_full//' src/gui/gui.pro || die
-
-	# egl_x11 is activated when both egl and X are enabled
-	use egl && QT5_GENTOO_CONFIG+=(X:egl_x11:) || QT5_GENTOO_CONFIG+=(egl:egl_x11:)
-
-	qt_use_disable_config dbus dbus \
-		src/platformsupport/themes/genericunix/genericunix.pri
-
-	qt_use_disable_config tuio tuiotouch src/plugins/generic/generic.pro
-
-	qt_use_disable_mod ibus dbus \
-		src/plugins/platforminputcontexts/platforminputcontexts.pro
-
-	use vnc || sed -i -e '/SUBDIRS += vnc/d' \
-		src/plugins/platforms/platforms.pro || die
-
-	qt5-build_src_prepare
-}
-
-src_configure() {
-	local myconf=(
-		$(usev dbus -dbus-linked)
-		$(qt_use egl)
-		$(qt_use eglfs)
-		$(usev eglfs '-gbm -kms')
-		$(qt_use evdev)
-		$(qt_use evdev mtdev)
-		-fontconfig
-		-system-freetype
-		-gui
-		-system-harfbuzz
-		$(qt_use jpeg libjpeg system)
-		$(qt_use libinput)
-		$(qt_use linuxfb)
-		-opengl $(usex gles2-only es2 desktop)
-		$(qt_use png libpng system)
-		$(qt_use tslib)
-		$(qt_use udev libudev)
-		$(qt_use vulkan)
-		$(qt_use X xcb)
-		$(usev X '-xcb-xlib')
-	)
-	if use libinput || use X; then
-		myconf+=( -xkbcommon )
-	fi
-	qt5-build_src_configure
-}
diff --git a/dev-qt/qthelp/Manifest b/dev-qt/qthelp/Manifest
index d0737771aa7a..af820e074137 100644
--- a/dev-qt/qthelp/Manifest
+++ b/dev-qt/qthelp/Manifest
@@ -1,8 +1,5 @@
 AUX qthelp-5.15.4-bogusdep.patch 779 BLAKE2B 1d939de92a719cc26b154ae6522ea12b304e3e0499125164e12eefa137df878eda56f0ee81b2448f0f4dee7a80468e616580e93c698c8f1847bc0296a63476bb SHA512 1b4a6f02f35ef038fa61a8cbc218fc758c34bc249f5a2da59f46209cc39c0e886bbd95a0b430588c49185eeeeaae70aafe58317a396a2455655fd073aff8626b
-DIST qttools-5.15.7-gentoo-kde-1.tar.xz 1016 BLAKE2B 2269c02954d34a2862585228b2e3a3536a4b6f37b93c170571afa83d5e9c601684d1bf3d961d8be84acf8af074f4fdf929614c03ba262de8056af778bd41ac71 SHA512 0ac735a9e54fa147a495403e710a75aaf3ab4d2cb51a5db783d7b4b401bc2d6f46bb451d3afaa0efef57fe0dbd1aad95ab3262d88eafeb1f533314132cf400e6
 DIST qttools-5.15.8-gentoo-kde-1.tar.xz 1020 BLAKE2B 1585a66678f318e38b50b17a52f3efd1b53c9c13ceaf63a21fb532ad55790d1f8a5829a10d064de0a7d6efce47bc672916c580b5222f43c35f7869371fc91857 SHA512 e1333e15b1d2f546f6c2164a7da0ef684c024cfa48b847d5671716fa789fdab7e1ed50f3be6efe09e56578c62dd6029aa1fa1546d34b53bba9894445b58aa860
-DIST qttools-everywhere-opensource-src-5.15.7.tar.xz 8900816 BLAKE2B c414cd92eeb7b3cc1b90c1bbb77409ba4e6f33b36cef9376a49068d8698461f211f062d5a7e80321e62ae2dd84f476252658ce3f0239d710945378d8ddfb01d4 SHA512 40176727d8c8430171483fd5815c1f84b8fc4d1a1b26b943c817e9a14cfe2d155c76039593f68f45b7e9276189968f3b37e1b17fd99adda7664582bf30a3935a
 DIST qttools-everywhere-opensource-src-5.15.8.tar.xz 8898368 BLAKE2B ea99e5bdf86d6d48fabd45bf55a48e5604d1a1e938a12838d3a928449d41354c4986401e7f159718432004f7357e28c88d7939f32bc2942bda1cb3abb8e28c33 SHA512 1248b61e21d1bab30c6f8380af0b83ffd2c5f4e75b2906f561f8aae3a8be2e426ca4ffa28164d64a90cc75c570652229847c7009b7aec63c6ba8e977dbdd4f4f
-EBUILD qthelp-5.15.7.ebuild 744 BLAKE2B 81b5358e319ecb69d4700063a5ac3ea75d0a33007676ad084670626cb913b9e3b2e02cc52afd5ca8877db3efd8c1b83758c2b4fb2099575d7a8e3eba68ac7abf SHA512 fc6e720c9ad7a290a5edd9eaa4993ae87223ab1676ebefb983bf1a96227b05016ac22119182058b8527b6b0647d5bb73bf179afc8631254f220ba4fb7d15f051
 EBUILD qthelp-5.15.8.ebuild 744 BLAKE2B 561bfdb33f642e247c8960643f2f609da5f527c187a53a11ce1ef742c5cfc62cf4ff84bb941f6bebf4ff0c62257379b1e534109a77890d2da08b80b19417a48e SHA512 e6995d54e4707aacd4c07980e624bc5b5a5c887ad2ec04fc2346aea5e24161b456d4c90e9420d85e0e05d79c9379eb9bb002fa5d42b22d8c2fcfa85cf7a4898e
 MISC metadata.xml 482 BLAKE2B 651a49dc4a07f5e5a9c21990868e666d98acdea7d7b0b2c0e4c98eafc3da72c803d380e4abda30f33250f7bbd7654df713833ccdddcb975cbad6f92e488f643b SHA512 192c670abd7da29645513bf1d9297d942efdc49f5cf170861e7689fda47f51daa47f10c7c81c3b045366e0259179c6839ff7747197c9d792e8d0fd1a5818973e
diff --git a/dev-qt/qthelp/qthelp-5.15.7.ebuild b/dev-qt/qthelp/qthelp-5.15.7.ebuild
deleted file mode 100644
index 70cba8b6ddf3..000000000000
--- a/dev-qt/qthelp/qthelp-5.15.7.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-if [[ ${PV} != *9999* ]]; then
-	QT5_KDEPATCHSET_REV=1
-	KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86"
-fi
-
-QT5_MODULE="qttools"
-inherit qt5-build
-
-DESCRIPTION="Qt5 module for integrating online documentation into applications"
-
-IUSE=""
-
-DEPEND="
-	=dev-qt/qtcore-${QT5_PV}*:5=
-	=dev-qt/qtgui-${QT5_PV}*
-	=dev-qt/qtsql-${QT5_PV}*[sqlite]
-	=dev-qt/qtwidgets-${QT5_PV}*
-"
-RDEPEND="${DEPEND}"
-
-# https://invent.kde.org/qt/qt/qttools/-/merge_requests/2
-PATCHES=( "${FILESDIR}/${PN}-5.15.4-bogusdep.patch" )
-
-QT5_TARGET_SUBDIRS=(
-	src/assistant/help
-	src/assistant/qcollectiongenerator
-	src/assistant/qhelpgenerator
-)
diff --git a/dev-qt/qtimageformats/Manifest b/dev-qt/qtimageformats/Manifest
index ecc9ca33e7b1..72ddf5880643 100644
--- a/dev-qt/qtimageformats/Manifest
+++ b/dev-qt/qtimageformats/Manifest
@@ -1,10 +1,7 @@
-DIST qtimageformats-5.15.7-gentoo-kde-1.tar.xz 4996 BLAKE2B 6d7d3fe4ef38f3e10227ebade69033c90c361982663265a70f457885521c339dd3ac2e6eecb1c081aeb802cdeee72f72fe52c069493155ccc1d7844a4b55c492 SHA512 2f5ccf7b3712497e47427caf7adeec2bacfa301fb2dfed8b4bb9140372771e24585a3d4d4bebd586912ecc05f4830451ecb22a9233ba873d8160bf9bb3f55ea1
 DIST qtimageformats-5.15.8-gentoo-kde-1.tar.xz 5000 BLAKE2B 1d1a5054267bf8e28051e4bdd6e2cb62f59dfc386d3d888071bab74fe818b7daec46baf9f9cd7d8bfad3e179c2d2c811e983008a7451255cf450f733988f3bb8 SHA512 68da3c1ee6f33dfdadd6e1ec7bca6a7c0f16671ebed232a4c12aac4d4fe2e61295901082362efd0b4e69c5576b35370a92063630da251bd71ff7d275825400d9
-DIST qtimageformats-everywhere-opensource-src-5.15.7.tar.xz 1842728 BLAKE2B 12eba086a2a216addfbdddc07d3171e7f9901a2fd0cdf30bc37b9f70a62cfc82f0443d42d1f0ab4c777332ee791fadf52579f72d7ddab50ff9f2152e0b6c7310 SHA512 6e899aa975856eb2b9b113dbcf75692fedfbb31559ecf09dd128886d77dcde68848403144e1f0e73b9b9f909a46e082f24a29db2fcc5bc5810bb93a88ad7150d
 DIST qtimageformats-everywhere-opensource-src-5.15.8.tar.xz 1843016 BLAKE2B 55f4a0b212e63483d23a8a962ffafd826994088e00025291a502d371540e2d88217f5caeea03d40347ff756033b47ffa71e1e250673b977013b7dd5d190b0e7c SHA512 e601a1ebd0881e59c1f87df748faf63df12f552fe668d16af27a58421848ba4de822b4dc3fc54f23c17b818408b6af2edbfb0b59c29e7da8a272d25ac51d7cdd
 DIST qtimageformats-everywhere-src-6.4.0.tar.xz 1861400 BLAKE2B be2d99999a29b5876981d0768d63dab6a70181a1643be73e83cb7bf6771bd35462165e1a848206d4f69018c3388118f4bd94a336ff28ab19dbc75973eb86463b SHA512 3a7302cfbe9187ffb753c7171c62bbf43223c9c876bb0df20de8b593d51ef775bffeff124d269ed8d4ce7e1fb3d55790acd75bce0b5d5bfa223e5e83dfb41f01
 DIST qtimageformats-everywhere-src-6.4.2.tar.xz 1938812 BLAKE2B 65d1e5e7c415397cb411acc60fdb7ba316e986de30eb23a14c92f4fa6d3280bbb7aab2e592fd6d360052ba757472e8fd0aa35212fa3be545e07a4714bfe93ac7 SHA512 2bda0001295d1a27ee3018d7a7236525ee41f7de33d58805a71277b5a7d8f9506687a7bb9d6630e32cbcb89e340048591e9f9d29833a3bb4d8168c4779dc5320
-EBUILD qtimageformats-5.15.7-r1.ebuild 698 BLAKE2B ace4fa78fd6283dea8df5ef4648a65c8bb2341e7651c2a75bbc36abf33da76b66a342eb13ce362d3d3faa0025e61e3c3767b01ce9a8d06add28b7ceff4056424 SHA512 5a85379b914d9ced5615438db12fa2c7f06ca441aea9b98fd1fcb6bca7e827ffa56d88400fb4b5f74e8fcb1c39360c6441280629dc3daa91657b90fc7857f8bd
 EBUILD qtimageformats-5.15.8.ebuild 698 BLAKE2B ad1a859438729b83988a8ca0a97b2e75b295f0f077a8cc93b2157f828238623e16d60fd4de835ce1b93851d55c4cfb308868ea76cd61ba5db04f733f11c61f76 SHA512 a74183f207d9008a88b0fc9140349c56f555d613ae6c12b9c0615c440ce982ad7739ae61bc079352a14f66198d00dc7d04abe5e5bf6dd4b358cc45ea71f8af43
 EBUILD qtimageformats-6.4.0-r1.ebuild 633 BLAKE2B 1d17b7e376cdab0291450c0fce5da50f5ce7882670f3a6e02b4660ba2f6ffdfba8e4c8df51f15cd77ca8567e0fb01ab56af6f1772ec6d36a96cf5f20ffa0c227 SHA512 47d854a16b2af5c5fe487a8d4ca8052c49f3e5fbb4ffeccea85bec59d2926d640812e15aeab89d0ee807a8efa5c2e2aa85e1e089ed48568f827fb167ee8665d3
 EBUILD qtimageformats-6.4.2.ebuild 633 BLAKE2B 11de4650840755a4b30608ebbcd7db6bcfa2cb18c9e5cbfa12768233fe307e8038e0647062fc4d3a3a30be75515268e300c1859e2a846280f177de5e9a8f7ef3 SHA512 e41c878b72d2fe1e1d38b37265c7aab66c7a183285053aec604541149e81d7300f20901cbfe9ab6537fec168adcc7a9e0bda809db0ed3ea96412bbfa835424f2
diff --git a/dev-qt/qtimageformats/qtimageformats-5.15.7-r1.ebuild b/dev-qt/qtimageformats/qtimageformats-5.15.7-r1.ebuild
deleted file mode 100644
index c29d2fe6359f..000000000000
--- a/dev-qt/qtimageformats/qtimageformats-5.15.7-r1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-if [[ ${PV} != *9999* ]]; then
-	QT5_KDEPATCHSET_REV=1
-	KEYWORDS="amd64 ~arm arm64 ~hppa ppc64 ~riscv ~sparc x86"
-fi
-
-inherit qt5-build
-
-DESCRIPTION="Additional format plugins for the Qt image I/O system"
-
-IUSE="mng"
-
-DEPEND="
-	=dev-qt/qtcore-${QT5_PV}*
-	=dev-qt/qtgui-${QT5_PV}*
-	media-libs/libwebp:=
-	media-libs/tiff:=
-	mng? ( media-libs/libmng:= )
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	sed -e 's/qtConfig(jasper)/false:/' \
-		-i src/plugins/imageformats/imageformats.pro || die
-	qt_use_disable_config mng mng src/plugins/imageformats/imageformats.pro
-
-	qt5-build_src_configure
-}
diff --git a/dev-qt/qtlocation/Manifest b/dev-qt/qtlocation/Manifest
index eb9b14c481c2..77bbe98d71a5 100644
--- a/dev-qt/qtlocation/Manifest
+++ b/dev-qt/qtlocation/Manifest
@@ -1,7 +1,4 @@
-DIST qtlocation-5.15.7-gentoo-kde-1.tar.xz 3948 BLAKE2B fcbac7c87e8c5f470f523c153b6caec2de66ccb7be6f8b0bdbf042d957a88626b4a46848eb6c6442b8199851b908f91241db72f7762816519ef27327f232927d SHA512 396c31cbf3f80c268ebcbf26de8cbfa2d51a355ef4d7824545f7d2fe98ccb5203b61cca9650cfae2793250006b2a5fa514b9bc19fff5650b86ac38a8ba9b9948
 DIST qtlocation-5.15.8-gentoo-kde-1.tar.xz 3952 BLAKE2B 6084d14533ca2ba44249db817f1f0bb93e526fc14e4f4f32d9c99f7b231e25449b111bf9e08b8dca95928d3ac29f63a8e42cbd51d9cd0700344aad6982dd2ff9 SHA512 868e96a2a84bfb0e068957968c07b3558bef2c12517c5971b11e1b536a92ae80d0ca399355f8fadc0fcef2b272b77e6b30951f96ec7fbe174bb5a053567d2c9e
-DIST qtlocation-everywhere-opensource-src-5.15.7.tar.xz 6559220 BLAKE2B 635be1ec133a6dd7dbf071922090b6acfe4c02503275ac2539cd4e099dc518ac43654be54e5fa17d292fcdb9edf88a11a1eeec7e37faa752deb6671bef86abba SHA512 fc4579b14f7f4836ef550d80b867c2655f52da34b0637dce4d83b10f2f7a836530a8f2a6b0f1a41c38e5e391c5d8e2431818e9813fd9d597f67704fcfbfb2f7e
 DIST qtlocation-everywhere-opensource-src-5.15.8.tar.xz 6559180 BLAKE2B 1b8feb5da8d564a6605d9106ec6399aea23a4f0b43f495baf61e14266e90d2d73cd310fb6d8514730867acba1aa26efb3072c213f22f19f72c2f554d76ab281b SHA512 a337fade917150c13fa2ea22ad1949f41541cea4ceb1f732ab53c20c2f19a63dcfc6f9f544ca64fdb5703d3ac8d2ec6e832f1f199a32e73a2f6c51febf53f514
-EBUILD qtlocation-5.15.7.ebuild 1146 BLAKE2B 9f5bfde5953389b5a05831e81b59f3623838db196a579d3956c0440dafa04b78bc5ab8cbce1820ed6223e03a739bd0cc3199c4fa5174b4e58c6b460ab72301a6 SHA512 1c6116205a01f93306a5324aa48695d5c3b558e3ecc47f5830e8da4dca06c25f527aa97046ddfe340899de7f0d0da29b86286568e2dcc42d7c3a44ca918c0859
 EBUILD qtlocation-5.15.8.ebuild 1146 BLAKE2B 141a6df9553c0cd1d6531c52acc25c376a6081fc3499f8ca968f6edf502531e564f47b3be09ee6f55d3121c32e7b4f92077c286c7b58d45ed1cd239fc4d687dc SHA512 f269471f3a9100f3d059134573dfc88465896e6d2dba9c2b89f93a66428dfd1ea1c9fe005653f9d588ad7961d68f1091642e6a72a5ff639016068b8c39c6d31b
 MISC metadata.xml 482 BLAKE2B 651a49dc4a07f5e5a9c21990868e666d98acdea7d7b0b2c0e4c98eafc3da72c803d380e4abda30f33250f7bbd7654df713833ccdddcb975cbad6f92e488f643b SHA512 192c670abd7da29645513bf1d9297d942efdc49f5cf170861e7689fda47f51daa47f10c7c81c3b045366e0259179c6839ff7747197c9d792e8d0fd1a5818973e
diff --git a/dev-qt/qtlocation/qtlocation-5.15.7.ebuild b/dev-qt/qtlocation/qtlocation-5.15.7.ebuild
deleted file mode 100644
index 7c1d3ad7c981..000000000000
--- a/dev-qt/qtlocation/qtlocation-5.15.7.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-if [[ ${PV} != *9999* ]]; then
-	QT5_KDEPATCHSET_REV=1
-	KEYWORDS="amd64 arm arm64 ppc64 ~riscv x86"
-fi
-
-inherit qt5-build
-
-DESCRIPTION="Location (places, maps, navigation) library for the Qt5 framework"
-
-IUSE=""
-
-RDEPEND="
-	dev-libs/icu:=
-	=dev-qt/qtcore-${QT5_PV}*
-	=dev-qt/qtdeclarative-${QT5_PV}*
-	=dev-qt/qtgui-${QT5_PV}*
-	=dev-qt/qtnetwork-${QT5_PV}*
-	=dev-qt/qtpositioning-${QT5_PV}*[qml]
-	=dev-qt/qtsql-${QT5_PV}*
-	sys-libs/zlib
-"
-DEPEND="${RDEPEND}
-	=dev-qt/qtconcurrent-${QT5_PV}*
-"
-
-QT5_TARGET_SUBDIRS=(
-	src/3rdparty/clipper
-	src/3rdparty/poly2tri
-	src/3rdparty/clip2tri
-	src/3rdparty/mapbox-gl-native
-	src/location
-	src/imports/location
-	src/imports/locationlabs
-	src/plugins/geoservices
-)
-
-src_configure() {
-	# src/plugins/geoservices requires files that are only generated when
-	# qmake is run in the root directory. Bug 633776.
-	mkdir -p "${QT5_BUILD_DIR}"/src/location || die
-	qt5_qmake "${QT5_BUILD_DIR}"
-	cp "${S}"/src/location/qtlocation-config.pri "${QT5_BUILD_DIR}"/src/location || die
-	qt5-build_src_configure
-}
diff --git a/dev-qt/qtmultimedia/Manifest b/dev-qt/qtmultimedia/Manifest
index e4d4c6c2989b..7d94b8e760e4 100644
--- a/dev-qt/qtmultimedia/Manifest
+++ b/dev-qt/qtmultimedia/Manifest
@@ -1,11 +1,8 @@
 AUX qtmultimedia-5.15.2-no-qtopengl.patch 445 BLAKE2B 9224c90ef5a57b0da8c5ea5a51eb03d4702824fbb435101d5d9d559bdc4d30ece2de7457ed1bb80ca7f028a0b1a5abfa7436501d5d30c87680fb46707de17f53 SHA512 2f3dbb4dcbcedd01e3d911cf1f665e78dc08b383a5c8f2e17f96072330242e7463e6e403159f90f60b799110371ca923f502619548d5db3fd264af4298e4b587
-DIST qtmultimedia-5.15.7-gentoo-kde-1.tar.xz 1324 BLAKE2B 72d45c094a2fd82517cbc992d1bad79dde9ef7ddb6c7ea71c9517dc12dce7bf54b16a37641f7bb73eac13526b8487ccc223febf6e0fcd4023e059b0bb658211f SHA512 f26cf52a497f16bbc7e5750ea47f193ca18957ca34b4747be7b1819434c92b09d90ef58db3a8cd65edd97cd1b9f09833225003b7a90bc49582ef9f8600c8ee16
 DIST qtmultimedia-5.15.8-gentoo-kde-1.tar.xz 1328 BLAKE2B ebebf55efbcb94a78fd93dd5312862a465a83bca2494bc04492595523a06afca1de050e12a08ac3a0ed437d7fdfed6223bda9d553de1c2fd7a148df9fc00ce7f SHA512 e83bbad3b46ecab048e97a0facc8374bedb3cf80b0b9eeb4151f9dddd9a79bd2292e49bc2942a5d060fe00f6cd497dc709975cd0451a49ac99beb6f6824fb835
-DIST qtmultimedia-everywhere-opensource-src-5.15.7.tar.xz 3830832 BLAKE2B fc5d537ffcfad975ceea9b993e5ed436fac55afdf63060378427a17aa62b856bd1b82b67ec898b34ee5925a2773e1a051631cd646219d270fa2f1518b5bf83f1 SHA512 f6f5b5d3522aa99b52b720d34fedbff935cf0ac0371576845d3f6a01d0db6d1fd19b17353e2abf2e7916b3d3a3f1c741b0aa7ea810cfc827c0dc3affe0e93150
 DIST qtmultimedia-everywhere-opensource-src-5.15.8.tar.xz 3833148 BLAKE2B 3e418a9949517ee42dfda6b51e1e03cd7f4eda7321aed5894eef91562dc6a10caa4654a0c9578a70b74c093e8570488282349abd735b6a79f4b3caaf7f60e250 SHA512 d448a612845e0afb896d6d0292506a8fae7da0b735ee4d139ab69123c93e67723aa41280dea7e704df89e43b849e7f6da3eeea1de94eee167b43d7c35a1a39cd
 DIST qtmultimedia-everywhere-src-6.4.0.tar.xz 5936088 BLAKE2B 7e469db96e145a4bc496daa6547685c84e199a8942452b406a3e661e9da2b8d4306b41fc82551e9257f6f41d2d269cc7a359b6087111d092073b8cdaf683a2c1 SHA512 fd5f0d73374290ecf70d30395b2ddbb05439979a29b5e6b37a1ac40338ffe602ea62b7bb8f3c053b2da35fa9c4101bd6e0a12ee9479c04bb2d63c527c77cb685
 DIST qtmultimedia-everywhere-src-6.4.2.tar.xz 5938092 BLAKE2B e232f277160dad1a3b32eff284e05264be8dd0e8247a78873ad422f86167aaf20ea21f7c39d07eb2240b56a0a371e7d38dce95054ae9c840a5d948625583eb25 SHA512 3d89ef97e9c58e9e6de61d3410d382cd2427835d26993a79368790b2aeff572fe1924d4cf9468fe3b7be232f99acb24668fe4d42df654df04af8f3d03d18f851
-EBUILD qtmultimedia-5.15.7.ebuild 1569 BLAKE2B cd5b0a5d2192606efc279eb4c6d844a31990191eef57aaa6e5567f11cd3f4ca1c867e51808f4d68b3079de61f0cb076c7457ed890d607c83964a484ab7aedb12 SHA512 41a6cda07c628a0debe286acb63db0e4468dea36edd090486bb1da1255aad7c50225949abdc4810ff0c3f921adfe287301602c7fd8c8f9bed6662378a603a9f9
 EBUILD qtmultimedia-5.15.8.ebuild 1569 BLAKE2B b7eeabacb879f077f0db4fb02fd9115eff24dee71731e6e1892e0d51ccc03ba5bcad41ad65f19df19583e71e8ba1ffeb6542c1f919560088d8cefe7eef085228 SHA512 b9d4cb637cd6ae1d8785472f7b62c8f80de4bef1e4762335af2c417953c75cb0c32eda13580ecbc863cad8f4c9b6bbfbeceeafb05b69bded4ca61c9a77c32f03
 EBUILD qtmultimedia-6.4.0.ebuild 772 BLAKE2B b7b5c93328dfc5b019eabfabd2f70fdb8e23b481903a49f9d018ba4a1ee371260fa516b842e41321b1c67e27d31f7bb447abccf53b0b2ee77af947c390c0fb2c SHA512 4a7a64a3cad73ec1373605b7effb34c39eb91f8f7e722d37b63c0f7c77745eb1ab4e5cae0fdb471cbfc3c70e57331f76a17cb8bb727c35a862f9323004d9b55b
 EBUILD qtmultimedia-6.4.2.ebuild 772 BLAKE2B 992e1c2af7e095cefcfa4d5be13479b0921246582787b3adf2e69afd113f2da43c67cb97c2aa4ed848f1587389d58e6e3b08114c4310a10a180ddb838e6fe598 SHA512 aaf6d58763fb8892f54885dc9e83d7c524b41a3a71a0a06d7a01a4e5a7f0791cb8be1ad5de490e4b0d4c391b3a05d265dd9f9e93dc32d68eb94293a71b8c24b5
diff --git a/dev-qt/qtmultimedia/qtmultimedia-5.15.7.ebuild b/dev-qt/qtmultimedia/qtmultimedia-5.15.7.ebuild
deleted file mode 100644
index bafdb436a786..000000000000
--- a/dev-qt/qtmultimedia/qtmultimedia-5.15.7.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-if [[ ${PV} != *9999* ]]; then
-	QT5_KDEPATCHSET_REV=1
-	KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86"
-fi
-
-inherit qt5-build
-
-DESCRIPTION="Multimedia (audio, video, radio, camera) library for the Qt5 framework"
-
-IUSE="alsa gles2-only gstreamer openal pulseaudio qml widgets"
-
-RDEPEND="
-	=dev-qt/qtcore-${QT5_PV}*
-	=dev-qt/qtgui-${QT5_PV}*[gles2-only=]
-	=dev-qt/qtnetwork-${QT5_PV}*
-	alsa? ( media-libs/alsa-lib )
-	gstreamer? (
-		dev-libs/glib:2
-		media-libs/gstreamer:1.0
-		media-libs/gst-plugins-bad:1.0
-		media-libs/gst-plugins-base:1.0
-	)
-	pulseaudio? ( media-libs/libpulse[glib] )
-	qml? (
-		=dev-qt/qtdeclarative-${QT5_PV}*
-		gles2-only? ( =dev-qt/qtgui-${QT5_PV}*[egl] )
-		openal? ( media-libs/openal )
-	)
-	widgets? (
-		=dev-qt/qtwidgets-${QT5_PV}*[gles2-only=]
-		media-libs/libglvnd
-	)
-"
-DEPEND="${RDEPEND}
-	gstreamer? ( x11-base/xorg-proto )
-"
-
-PATCHES=( "${FILESDIR}/${PN}-5.15.2-no-qtopengl.patch" )
-
-src_prepare() {
-	sed -i -e '/CONFIG\s*+=/ s/optimize_full//' \
-		src/multimedia/multimedia.pro || die
-
-	qt_use_disable_config openal openal \
-		src/imports/imports.pro
-
-	qt_use_disable_mod qml quick \
-		src/src.pro \
-		src/plugins/plugins.pro
-
-	qt_use_disable_mod widgets widgets \
-		src/src.pro \
-		src/gsttools/gsttools.pro \
-		src/plugins/gstreamer/common.pri
-
-	qt5-build_src_prepare
-}
-
-src_configure() {
-	local myqmakeargs=(
-		--
-		$(qt_use alsa)
-		$(qt_use gstreamer)
-		$(qt_use pulseaudio)
-	)
-	qt5-build_src_configure
-}
diff --git a/dev-qt/qtnetwork/Manifest b/dev-qt/qtnetwork/Manifest
index 24a116a6698e..ed715a99ab5d 100644
--- a/dev-qt/qtnetwork/Manifest
+++ b/dev-qt/qtnetwork/Manifest
@@ -1,9 +1,5 @@
-DIST qtbase-5.15-gentoo-patchset-2.tar.xz 3844 BLAKE2B 6dcb69398cf8a6b1be737e8c7bf1041529c4e704ca892cef10ba3bc5ce435c903607b64e981cf8aa12c785b3e423aa1d52bce1f67ec1bd8dbb1421dfb6f62700 SHA512 b7fd7e17bcab2f9803c7bfc0473082ee4640299c23ce8da943ef80ed181e880ebc9157bcebde28077e80e6f907aa14a59c42416b3e32f49baebd54fbe5a37497
 DIST qtbase-5.15-gentoo-patchset-3.tar.xz 3856 BLAKE2B 0752426f9bc2dfa1ab2bc246b29f5d00305df05175a7801d7d5eddacfa46fcb605d9a317547edc01d3ef339f6effc2fcee7549cb7aecced37f0098166c70dbe2 SHA512 2515bea53232e76ca3e40bdaf1dd52fdf452052a2f40002ee91360d1fcceea3c5c2f5a8d2a3bfc0f9c2bacd61460a632c5b351accd73fd37b64985593219148e
-DIST qtbase-5.15.7-gentoo-kde-1.tar.xz 798056 BLAKE2B 3c7fefa65ab6de25c2c82261ad0f1371e32acd4bd4b3303f20a5ebf36d19690df94290d102c65e4941a6c51a5d5f2db0253bafca5ac85cf480f7434405cb2671 SHA512 20ab17220489009c98d7f783a02614507e157974c7cb16f47d50d3954ccd1cd065562effc393df6e07c9ba6ad8ccd4e6b3f0bf5b5b890183b8631b8b570bf064
 DIST qtbase-5.15.8-gentoo-kde-3.tar.xz 782344 BLAKE2B 115814a4d90ac286540cf6e50bd2b57baa8e0e327fc73c3ab06fe43ecd95e1e3739faecee5db112d95d17e4fb84494ad5557e70251f2c60142166715294bf366 SHA512 d50b0f02476ded9f053093ec15c5204a0ec664794dcc324996685f09400a2cbc76dc3fd0ebfc247ebd42fbe203b7d4c904e975fc985bf7928e43c6cd65f04f34
-DIST qtbase-everywhere-opensource-src-5.15.7.tar.xz 50260196 BLAKE2B 69029a910af0e3bfe742b5870334406e03274b0677ef47f9c7c10f730ff031bae49bd21a686497215505b19a183ca395c275d8afefaaa903125297f8e693bb4d SHA512 316de71fba1d5dd91354155dcd0f77e1ce2a798f8296a8699a795ea5e86ad10b6e233299775a92e23328290f3e041240585947e89ee7bd39eb464c5f0ffec343
 DIST qtbase-everywhere-opensource-src-5.15.8.tar.xz 50259432 BLAKE2B cb1b790a384a5cad9a95fdc448e275d48a68c6ee2addf08b40f9963cc5762fd7ab15852dea8392dc76da39f1565c1e23ddb5875c280f0177e802082f4b4f7f2b SHA512 29e8877bafdbc908072209f1b27a5040b022e2b71f17f4ab4cecd570adeae21597f9af7f1d38758760f3cb30376eeb15c5f066bf02c6e9a9e3a4d07f967046ce
-EBUILD qtnetwork-5.15.7.ebuild 1601 BLAKE2B 459d50f53cc46f81dfb3fcc34db25ea7413acfc12760505d19c277560b89a56b26a99b5b6307b2bb3ff57de293a12894a626a4069af423440a4bf3a7839fa082 SHA512 978e17f4b8e1b018fc8b9cd57f28d1177c70219805996f6a126e90a5496f3b59b0010b85dc2a3fe2b2c669d1b1ac60b82a4c428459f068e68f81746a21314af2
 EBUILD qtnetwork-5.15.8-r1.ebuild 1601 BLAKE2B 149f335ace57a5a5d6b64b32881fa3ab38c560070e5aa6aea3861a40bafe15236cf0c16b1eae70a0395485905a29ef22c934a6f287e2a47a6fb48aabee3990e1 SHA512 769a43a6ee97182cfdef29ac8d33d4560c385a7b7605409b1dd06c486560f4eaefe9bf2ba90518fddb4fce1b8c9d19b659c23bedb030ce64d0d744b5f565f375
 MISC metadata.xml 877 BLAKE2B eefc4aa477bcc6ffb2a2fb0711861a9bd7c79af5c5febe0205da57a3fae7206f3ae96dffb8b57e15dfe2f1e26891691886e02984654556d3d53a269dde5ce757 SHA512 dad0239dceb378c1ad4f52c287fb5d61cc248ac533a3df3673b30c0f332eb5cd3a34255052afe2a42084bf1c1d6a1ee501723e43eb268ab5e215fb37f90bcf36
diff --git a/dev-qt/qtnetwork/qtnetwork-5.15.7.ebuild b/dev-qt/qtnetwork/qtnetwork-5.15.7.ebuild
deleted file mode 100644
index 6cdfb3eccb1a..000000000000
--- a/dev-qt/qtnetwork/qtnetwork-5.15.7.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-if [[ ${PV} != *9999* ]]; then
-	QT5_KDEPATCHSET_REV=1
-	KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86"
-fi
-
-QT5_MODULE="qtbase"
-inherit qt5-build
-
-DESCRIPTION="Network abstraction library for the Qt5 framework"
-
-IUSE="connman gssapi libproxy networkmanager sctp +ssl"
-
-DEPEND="
-	=dev-qt/qtcore-${QT5_PV}*:5=
-	sys-libs/zlib:=
-	connman? ( =dev-qt/qtdbus-${QT5_PV}* )
-	gssapi? ( virtual/krb5 )
-	libproxy? ( net-libs/libproxy )
-	networkmanager? ( =dev-qt/qtdbus-${QT5_PV}* )
-	sctp? ( kernel_linux? ( net-misc/lksctp-tools ) )
-	ssl? ( >=dev-libs/openssl-1.1.1:0= )
-"
-RDEPEND="${DEPEND}
-	connman? ( net-misc/connman )
-	networkmanager? ( net-misc/networkmanager )
-"
-
-QT5_TARGET_SUBDIRS=(
-	src/network
-	src/plugins/bearer/generic
-)
-
-QT5_GENTOO_CONFIG=(
-	libproxy:libproxy:
-	ssl::SSL
-	ssl::OPENSSL
-	ssl:openssl-linked:LINKED_OPENSSL
-)
-
-QT5_GENTOO_PRIVATE_CONFIG=(
-	:network
-)
-
-pkg_setup() {
-	use connman && QT5_TARGET_SUBDIRS+=(src/plugins/bearer/connman)
-	use networkmanager && QT5_TARGET_SUBDIRS+=(src/plugins/bearer/networkmanager)
-}
-
-src_configure() {
-	local myconf=(
-		$(usev connman -dbus-linked)
-		$(qt_use gssapi feature-gssapi)
-		$(qt_use libproxy)
-		$(usev networkmanager -dbus-linked)
-		$(qt_use sctp)
-		$(usev ssl -openssl-linked)
-	)
-	qt5-build_src_configure
-}
-
-src_install() {
-	qt5-build_src_install
-
-	# workaround for bug 652650
-	if use ssl; then
-		sed -e "/^#define QT_LINKED_OPENSSL/s/$/ true/" \
-			-i "${D}${QT5_HEADERDIR}"/Gentoo/${PN}-qconfig.h || die
-	fi
-}
diff --git a/dev-qt/qtnetworkauth/Manifest b/dev-qt/qtnetworkauth/Manifest
index 8cb03a7836d6..0f28eb72d476 100644
--- a/dev-qt/qtnetworkauth/Manifest
+++ b/dev-qt/qtnetworkauth/Manifest
@@ -1,8 +1,6 @@
-DIST qtnetworkauth-everywhere-opensource-src-5.15.7.tar.xz 143592 BLAKE2B d3982c647386b167cd5a994be33a1442a0f284c876e79f3219a1d8309afde68a409c286bcfd3f23b81887321704dd15e4ad4561b4b71a7e0d83854368841f0ad SHA512 43c4f9dd0847504de3db9e75b669d70853377721230fd0dd3d958bdf2e730e4f5a19c1946eb2f658bc978814b48d977693dea1280ea8050dbbe05bc79a481b60
 DIST qtnetworkauth-everywhere-opensource-src-5.15.8.tar.xz 143564 BLAKE2B d3fb7dd18714c4ef82a082df948c9b39aca4969751eec2c4a79257fe14bdb1e70d8ef829fa886935347e3b9a56febad24ff4b4dd4c3c0c35963c4939a787f118 SHA512 1680d6ec84b2fba24c837ff808c5b9e13b73a84c7353f6d533e10986f23f879e0d3ce9cc4ce84000b4cfbd5904e12d975210977f5376b070075c2ec814eb2baf
 DIST qtnetworkauth-everywhere-src-6.4.0.tar.xz 144928 BLAKE2B 468ca604f81c3592fc0ffbf6df314cb044a2c5ad53f6464cec069e6a9bae017f35d3e1fa4abe97794e15efa86785ea09e6c733e991e90fb4c868982d074bf46c SHA512 fdefb6ec3477f8da9e78419414f850d94baddfa83b7252c402cde91dabee7cdc51eeee6e761bbadb07d37cef4525131adfd4bdeadb25e977934d4be1a85d8d57
 DIST qtnetworkauth-everywhere-src-6.4.2.tar.xz 144784 BLAKE2B 45c0aea5880cc036038396fbd967ba03e05c5ad5273f801adc27cb699d526db59fdbab7a11fa00da1afe5a7847dff1cd83fe3c998034e433df80157300afa4f2 SHA512 2a5155cc98f710b5bdb6cb56fca79732dbe8ca37901b4148bc6273a48a7b48dbe846eb2559e8221d52a98723b6bbd5e87d725af22f215985677857fd50064bcc
-EBUILD qtnetworkauth-5.15.7.ebuild 402 BLAKE2B c8ca356b8863d197ec4f0a0077f28780fcbf03a22145d6cb3053f6b7739767447046ca98b89644fb5f9bba95cda67b0a2e9b9f0a1552b91d46d66d2e017d3f87 SHA512 8da9b85349bdf422963698005eb44a044cbde09fe18d6710e17967ae378c86babb43c5e4fe44b8301d187a687f413e81d7597eb9a53ef63ef594f2e2c627aa0e
 EBUILD qtnetworkauth-5.15.8.ebuild 402 BLAKE2B f6aada3fab2a9a22353930bcc8c96fd46806ccc46792a9bf770a812245a9b246722101f40c0ac9a8b3fe115a94f38c4d32e988cd23f0f28133ea08e858b95414 SHA512 63a5ddf86500089e2f7fa44ebb585a11bf257222a9a9b96fa8985b5acb56301a8680f04ec0ee4cee0bd9dcd3761031da704f71bd18dfe7c88aeb9fcc308d222b
 EBUILD qtnetworkauth-6.4.0.ebuild 337 BLAKE2B 67e0405e916d52cb8b9d16ab0685a1e09e6d97791668e3297fd9325f7cb964dfca0b1ed68a79b071a758b4c4318de3843e1c29b0aafe2b686ff63eeb3d5552c9 SHA512 37560c6e6343d511d59c2df40382cd7f4e7702b983877154ddc80d17d572e20e9a68ea0cff990065986c4f7370af96d0aad53d4d91bb3a5039794adc80744acb
 EBUILD qtnetworkauth-6.4.2.ebuild 337 BLAKE2B b9d2380c3f88cd04c9ae3c64e799fe978be6d05d6debd960d31018aca0bf67fd7831b17bbb4ed9a917477817b2eb011bbd9141e6b8f4d649179019146de03105 SHA512 11f4aa6fb4fdb30132c344e9fbab81006cba7cc8cf8b5c81339c837940f928a3752ad05d367500811f87f3a606ee432b717cce1dfdf801e6c293e112158cc514
diff --git a/dev-qt/qtnetworkauth/qtnetworkauth-5.15.7.ebuild b/dev-qt/qtnetworkauth/qtnetworkauth-5.15.7.ebuild
deleted file mode 100644
index 7ead57ade6af..000000000000
--- a/dev-qt/qtnetworkauth/qtnetworkauth-5.15.7.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit qt5-build
-
-DESCRIPTION="Network authorization library for the Qt5 framework"
-LICENSE="GPL-3"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86"
-fi
-
-IUSE=""
-
-DEPEND="
-	=dev-qt/qtcore-${QT5_PV}*
-	=dev-qt/qtnetwork-${QT5_PV}*
-"
-RDEPEND="${DEPEND}"
diff --git a/dev-qt/qtopengl/Manifest b/dev-qt/qtopengl/Manifest
index 6d389c67b6a1..6529c6600f9e 100644
--- a/dev-qt/qtopengl/Manifest
+++ b/dev-qt/qtopengl/Manifest
@@ -1,9 +1,5 @@
-DIST qtbase-5.15-gentoo-patchset-2.tar.xz 3844 BLAKE2B 6dcb69398cf8a6b1be737e8c7bf1041529c4e704ca892cef10ba3bc5ce435c903607b64e981cf8aa12c785b3e423aa1d52bce1f67ec1bd8dbb1421dfb6f62700 SHA512 b7fd7e17bcab2f9803c7bfc0473082ee4640299c23ce8da943ef80ed181e880ebc9157bcebde28077e80e6f907aa14a59c42416b3e32f49baebd54fbe5a37497
 DIST qtbase-5.15-gentoo-patchset-3.tar.xz 3856 BLAKE2B 0752426f9bc2dfa1ab2bc246b29f5d00305df05175a7801d7d5eddacfa46fcb605d9a317547edc01d3ef339f6effc2fcee7549cb7aecced37f0098166c70dbe2 SHA512 2515bea53232e76ca3e40bdaf1dd52fdf452052a2f40002ee91360d1fcceea3c5c2f5a8d2a3bfc0f9c2bacd61460a632c5b351accd73fd37b64985593219148e
-DIST qtbase-5.15.7-gentoo-kde-1.tar.xz 798056 BLAKE2B 3c7fefa65ab6de25c2c82261ad0f1371e32acd4bd4b3303f20a5ebf36d19690df94290d102c65e4941a6c51a5d5f2db0253bafca5ac85cf480f7434405cb2671 SHA512 20ab17220489009c98d7f783a02614507e157974c7cb16f47d50d3954ccd1cd065562effc393df6e07c9ba6ad8ccd4e6b3f0bf5b5b890183b8631b8b570bf064
 DIST qtbase-5.15.8-gentoo-kde-1.tar.xz 780764 BLAKE2B 6abb00127113595cbb0a0caf58eb6323423ca41cbde6262a63762aded12861b6c051c9548c9ce2d11ab073e8930c11b609c05579eba34d56201fb7187c78ee23 SHA512 8b59ba61e7364c78d5bf728b4d8c9bd0f8e1ed973f1a84cd40330b06195b246e052ec087067336ff5d4e80a12168a25e0bd47fd88d837c00f106d8cdeba0c016
-DIST qtbase-everywhere-opensource-src-5.15.7.tar.xz 50260196 BLAKE2B 69029a910af0e3bfe742b5870334406e03274b0677ef47f9c7c10f730ff031bae49bd21a686497215505b19a183ca395c275d8afefaaa903125297f8e693bb4d SHA512 316de71fba1d5dd91354155dcd0f77e1ce2a798f8296a8699a795ea5e86ad10b6e233299775a92e23328290f3e041240585947e89ee7bd39eb464c5f0ffec343
 DIST qtbase-everywhere-opensource-src-5.15.8.tar.xz 50259432 BLAKE2B cb1b790a384a5cad9a95fdc448e275d48a68c6ee2addf08b40f9963cc5762fd7ab15852dea8392dc76da39f1565c1e23ddb5875c280f0177e802082f4b4f7f2b SHA512 29e8877bafdbc908072209f1b27a5040b022e2b71f17f4ab4cecd570adeae21597f9af7f1d38758760f3cb30376eeb15c5f066bf02c6e9a9e3a4d07f967046ce
-EBUILD qtopengl-5.15.7.ebuild 681 BLAKE2B 0b5489aa59df56bc9797280e595b2d657bb151a88ab2975c3dc992a68fbb6de27a42c23857ae695172cf2ce8ff837a2931b26f0139030359fd13c7f46f028d36 SHA512 ba6ddecd3a343fcda02c59c555e537c9d907a7fdb9967a39854882fd4d29e4436ac8f7ed88fc36aca04a115620d5fa68485ac07774cdd1cff4721283edcf086b
 EBUILD qtopengl-5.15.8.ebuild 681 BLAKE2B 38ff1848a7e3775d35d4ffe8258599fdb65ed8a66b15dd561c52bd3364b0aee62f5f67b02f68132305ae4e432835888db27282d8e26f03c7d46914e63286bf23 SHA512 b3cc280f0d5f5e1bff84a992615f5ed12640208e664158aff322362ab38876c7077fc574fc9ea032f4648767467466dee2e3448688d20a525ebc90e929a9ab5f
 MISC metadata.xml 482 BLAKE2B 651a49dc4a07f5e5a9c21990868e666d98acdea7d7b0b2c0e4c98eafc3da72c803d380e4abda30f33250f7bbd7654df713833ccdddcb975cbad6f92e488f643b SHA512 192c670abd7da29645513bf1d9297d942efdc49f5cf170861e7689fda47f51daa47f10c7c81c3b045366e0259179c6839ff7747197c9d792e8d0fd1a5818973e
diff --git a/dev-qt/qtopengl/qtopengl-5.15.7.ebuild b/dev-qt/qtopengl/qtopengl-5.15.7.ebuild
deleted file mode 100644
index 635745fc6dee..000000000000
--- a/dev-qt/qtopengl/qtopengl-5.15.7.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-if [[ ${PV} != *9999* ]]; then
-	QT5_KDEPATCHSET_REV=1
-	KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86"
-fi
-
-QT5_MODULE="qtbase"
-VIRTUALX_REQUIRED="test"
-inherit qt5-build
-
-DESCRIPTION="OpenGL support library for the Qt5 framework (deprecated)"
-
-IUSE="gles2-only"
-
-DEPEND="
-	=dev-qt/qtcore-${QT5_PV}*:5=
-	=dev-qt/qtgui-${QT5_PV}*[gles2-only=]
-	=dev-qt/qtwidgets-${QT5_PV}*[gles2-only=]
-"
-RDEPEND="${DEPEND}"
-
-QT5_TARGET_SUBDIRS=(
-	src/opengl
-)
-
-src_configure() {
-	local myconf=(
-		-opengl $(usex gles2-only es2 desktop)
-	)
-	qt5-build_src_configure
-}
diff --git a/dev-qt/qtpaths/Manifest b/dev-qt/qtpaths/Manifest
index 457197ab62c7..b54ebdc9783b 100644
--- a/dev-qt/qtpaths/Manifest
+++ b/dev-qt/qtpaths/Manifest
@@ -1,7 +1,4 @@
-DIST qttools-5.15.7-gentoo-kde-1.tar.xz 1016 BLAKE2B 2269c02954d34a2862585228b2e3a3536a4b6f37b93c170571afa83d5e9c601684d1bf3d961d8be84acf8af074f4fdf929614c03ba262de8056af778bd41ac71 SHA512 0ac735a9e54fa147a495403e710a75aaf3ab4d2cb51a5db783d7b4b401bc2d6f46bb451d3afaa0efef57fe0dbd1aad95ab3262d88eafeb1f533314132cf400e6
 DIST qttools-5.15.8-gentoo-kde-1.tar.xz 1020 BLAKE2B 1585a66678f318e38b50b17a52f3efd1b53c9c13ceaf63a21fb532ad55790d1f8a5829a10d064de0a7d6efce47bc672916c580b5222f43c35f7869371fc91857 SHA512 e1333e15b1d2f546f6c2164a7da0ef684c024cfa48b847d5671716fa789fdab7e1ed50f3be6efe09e56578c62dd6029aa1fa1546d34b53bba9894445b58aa860
-DIST qttools-everywhere-opensource-src-5.15.7.tar.xz 8900816 BLAKE2B c414cd92eeb7b3cc1b90c1bbb77409ba4e6f33b36cef9376a49068d8698461f211f062d5a7e80321e62ae2dd84f476252658ce3f0239d710945378d8ddfb01d4 SHA512 40176727d8c8430171483fd5815c1f84b8fc4d1a1b26b943c817e9a14cfe2d155c76039593f68f45b7e9276189968f3b37e1b17fd99adda7664582bf30a3935a
 DIST qttools-everywhere-opensource-src-5.15.8.tar.xz 8898368 BLAKE2B ea99e5bdf86d6d48fabd45bf55a48e5604d1a1e938a12838d3a928449d41354c4986401e7f159718432004f7357e28c88d7939f32bc2942bda1cb3abb8e28c33 SHA512 1248b61e21d1bab30c6f8380af0b83ffd2c5f4e75b2906f561f8aae3a8be2e426ca4ffa28164d64a90cc75c570652229847c7009b7aec63c6ba8e977dbdd4f4f
-EBUILD qtpaths-5.15.7.ebuild 515 BLAKE2B 1c3318a13980f0561ba934363058f66b5fd365cad0838f7ed0ea00897cc52f88925004eaeff2659b9e18f96d058f37ae300be30b618dc6200a529e2799753959 SHA512 d57843eb7a83d9c1496684ffcca4f40e9945227a715ddc735cbf22674d09da597fb9aed2b77e3ff8332b6030adbfda0d192a6664a501d78f9b6bbb0780d35ab6
 EBUILD qtpaths-5.15.8.ebuild 515 BLAKE2B d380c0ccdc0e96c559ecdb1c1a10d32452f474622cd7f7ae21def1aac4ee99c8f6b3b59dbab8cb717a29d02261cb6849b3cfcdfdc8fd6bf339a48a5a3be7784a SHA512 2043e0f07b18d984c15bfb29a47fa194e9b1a969a9ffffa144bedd592f218fba93263c1396bb447072371fb0a0b83e007a9569fbb05fb93cdcdc205233c68406
 MISC metadata.xml 482 BLAKE2B 651a49dc4a07f5e5a9c21990868e666d98acdea7d7b0b2c0e4c98eafc3da72c803d380e4abda30f33250f7bbd7654df713833ccdddcb975cbad6f92e488f643b SHA512 192c670abd7da29645513bf1d9297d942efdc49f5cf170861e7689fda47f51daa47f10c7c81c3b045366e0259179c6839ff7747197c9d792e8d0fd1a5818973e
diff --git a/dev-qt/qtpaths/qtpaths-5.15.7.ebuild b/dev-qt/qtpaths/qtpaths-5.15.7.ebuild
deleted file mode 100644
index d0cdb22614ef..000000000000
--- a/dev-qt/qtpaths/qtpaths-5.15.7.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-if [[ ${PV} != *9999* ]]; then
-	QT5_KDEPATCHSET_REV=1
-	KEYWORDS="amd64 ~arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86"
-fi
-
-QT5_MODULE="qttools"
-inherit qt5-build
-
-DESCRIPTION="Command line client to QStandardPaths"
-
-IUSE=""
-
-DEPEND="=dev-qt/qtcore-${QT5_PV}*"
-RDEPEND="${DEPEND}"
-
-QT5_TARGET_SUBDIRS=(
-	src/qtpaths
-)
-
-src_install() {
-	qt5-build_src_install
-	qt5_symlink_binary_to_path qtpaths 5
-}
diff --git a/dev-qt/qtplugininfo/Manifest b/dev-qt/qtplugininfo/Manifest
index 7c8f87bffaec..603224d88bbe 100644
--- a/dev-qt/qtplugininfo/Manifest
+++ b/dev-qt/qtplugininfo/Manifest
@@ -1,7 +1,4 @@
-DIST qttools-5.15.7-gentoo-kde-1.tar.xz 1016 BLAKE2B 2269c02954d34a2862585228b2e3a3536a4b6f37b93c170571afa83d5e9c601684d1bf3d961d8be84acf8af074f4fdf929614c03ba262de8056af778bd41ac71 SHA512 0ac735a9e54fa147a495403e710a75aaf3ab4d2cb51a5db783d7b4b401bc2d6f46bb451d3afaa0efef57fe0dbd1aad95ab3262d88eafeb1f533314132cf400e6
 DIST qttools-5.15.8-gentoo-kde-1.tar.xz 1020 BLAKE2B 1585a66678f318e38b50b17a52f3efd1b53c9c13ceaf63a21fb532ad55790d1f8a5829a10d064de0a7d6efce47bc672916c580b5222f43c35f7869371fc91857 SHA512 e1333e15b1d2f546f6c2164a7da0ef684c024cfa48b847d5671716fa789fdab7e1ed50f3be6efe09e56578c62dd6029aa1fa1546d34b53bba9894445b58aa860
-DIST qttools-everywhere-opensource-src-5.15.7.tar.xz 8900816 BLAKE2B c414cd92eeb7b3cc1b90c1bbb77409ba4e6f33b36cef9376a49068d8698461f211f062d5a7e80321e62ae2dd84f476252658ce3f0239d710945378d8ddfb01d4 SHA512 40176727d8c8430171483fd5815c1f84b8fc4d1a1b26b943c817e9a14cfe2d155c76039593f68f45b7e9276189968f3b37e1b17fd99adda7664582bf30a3935a
 DIST qttools-everywhere-opensource-src-5.15.8.tar.xz 8898368 BLAKE2B ea99e5bdf86d6d48fabd45bf55a48e5604d1a1e938a12838d3a928449d41354c4986401e7f159718432004f7357e28c88d7939f32bc2942bda1cb3abb8e28c33 SHA512 1248b61e21d1bab30c6f8380af0b83ffd2c5f4e75b2906f561f8aae3a8be2e426ca4ffa28164d64a90cc75c570652229847c7009b7aec63c6ba8e977dbdd4f4f
-EBUILD qtplugininfo-5.15.7.ebuild 383 BLAKE2B 7f3d6f6d71ff1b3578c78d7c9ba56cfe2f75175d463cf889b24ff408e923e91fe6dc3c1034c197c90f7fef977b59c314e0b273bbeb298e5b28f6d79ffeea4e2e SHA512 6cb8e7293c6949217b2a3d6089eb81125744f89c90874dc7bec2798c4a553a6f450df1a6c3e896e8748804d4e4042b645076fe4f0579f7f11f4c5f89aa6b12bb
 EBUILD qtplugininfo-5.15.8.ebuild 383 BLAKE2B e3e21c381469145f77903f850710847dfd9395f7430e44ffed02b306176965732b47236c777c3c800abb0c4b31c245f172127f953a3f5f18248dd9a7cd8adc30 SHA512 edf6af643d27a2abc21039290fbc69699f7ae20da1b76dd145e26e568de8e447ec79810fe78c75bdbfad1903ab5514d80e0037f39d5364c2b6a34b2ae285832e
 MISC metadata.xml 482 BLAKE2B 651a49dc4a07f5e5a9c21990868e666d98acdea7d7b0b2c0e4c98eafc3da72c803d380e4abda30f33250f7bbd7654df713833ccdddcb975cbad6f92e488f643b SHA512 192c670abd7da29645513bf1d9297d942efdc49f5cf170861e7689fda47f51daa47f10c7c81c3b045366e0259179c6839ff7747197c9d792e8d0fd1a5818973e
diff --git a/dev-qt/qtplugininfo/qtplugininfo-5.15.7.ebuild b/dev-qt/qtplugininfo/qtplugininfo-5.15.7.ebuild
deleted file mode 100644
index 2ed8e0849725..000000000000
--- a/dev-qt/qtplugininfo/qtplugininfo-5.15.7.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-if [[ ${PV} != *9999* ]]; then
-	QT5_KDEPATCHSET_REV=1
-	KEYWORDS="~amd64 ~x86"
-fi
-
-QT5_MODULE="qttools"
-inherit qt5-build
-
-DESCRIPTION="Qt5 plugin metadata dumper"
-
-IUSE=""
-
-DEPEND="=dev-qt/qtcore-${QT5_PV}*"
-RDEPEND="${DEPEND}"
-
-QT5_TARGET_SUBDIRS=(
-	src/qtplugininfo
-)
diff --git a/dev-qt/qtpositioning/Manifest b/dev-qt/qtpositioning/Manifest
index ab448ac45f7a..96984bc66183 100644
--- a/dev-qt/qtpositioning/Manifest
+++ b/dev-qt/qtpositioning/Manifest
@@ -1,8 +1,6 @@
-DIST qtlocation-everywhere-opensource-src-5.15.7.tar.xz 6559220 BLAKE2B 635be1ec133a6dd7dbf071922090b6acfe4c02503275ac2539cd4e099dc518ac43654be54e5fa17d292fcdb9edf88a11a1eeec7e37faa752deb6671bef86abba SHA512 fc4579b14f7f4836ef550d80b867c2655f52da34b0637dce4d83b10f2f7a836530a8f2a6b0f1a41c38e5e391c5d8e2431818e9813fd9d597f67704fcfbfb2f7e
 DIST qtlocation-everywhere-opensource-src-5.15.8.tar.xz 6559180 BLAKE2B 1b8feb5da8d564a6605d9106ec6399aea23a4f0b43f495baf61e14266e90d2d73cd310fb6d8514730867acba1aa26efb3072c213f22f19f72c2f554d76ab281b SHA512 a337fade917150c13fa2ea22ad1949f41541cea4ceb1f732ab53c20c2f19a63dcfc6f9f544ca64fdb5703d3ac8d2ec6e832f1f199a32e73a2f6c51febf53f514
 DIST qtpositioning-everywhere-src-6.4.0.tar.xz 1491860 BLAKE2B 07d9ed3a62ea8b91931749fe5064e3556cc5a6de2d38f428a99a4112c726e16ae01a70a769e353110e74287fb1a5d6090dc011e407b5dc2deeda8e0a7fd2a619 SHA512 298c484ed3e5f4d11c0e865005f8c0ddf422c8bbe9ff725fe01a8960403c55cfbc96ded62e77af4b14e549349501b7555f169e7a4b99435cecfc4b57b5a2b5cb
 DIST qtpositioning-everywhere-src-6.4.2.tar.xz 1493780 BLAKE2B c3b287cea7c41e77228daffca45fa590abe7b242c02107ec5c2884fa95777c5d8a21cec26bcda9c5ef42b2b9eb5ce014a3ad9116269843499c4e107f65e7fd51 SHA512 3f45416c10b437572167374cf1450d8ff138f16028e2f338ea4458de4cd05ba71b7de286f7ffacd8b1808ee78b41afb975cb168a0d27077c981dc1bef1e4d412
-EBUILD qtpositioning-5.15.7.ebuild 877 BLAKE2B 75a04fbccef261c3f2668c5a9439224dfd548b221537fbf112a66dd7ae525500a6ef2f632ddb4aa323d5e6782c482c807afffbd84e044277bcf3b21b31e54435 SHA512 95910ccef00911d0af5cb1eaf68edb86bb53ec84ccb42332adcaa71b9c49b4c65af8c20b95ed2307043f12ea0e6151e25a59387487a1ea613d25e393f4048934
 EBUILD qtpositioning-5.15.8.ebuild 877 BLAKE2B 901e07cc2a16f98840d7361b5db7611406a275116728fe65f28012e03b90f9b797291508623e8ab5a28a10c88d2f8e917145e149ed494355706e12f9b44260d7 SHA512 79aee05d67010aecd2a0d4c802a39bea7f4d63a1a2009ade3df0343e8081c568a374728c818539a23f37e17acd98f47de1cdf825263fb25fcb5bf0988dc13db6
 EBUILD qtpositioning-6.4.0.ebuild 407 BLAKE2B fbda79a88b7903862e1c556c3b4bd0b7515e10f3eedb4e6325c777e53c3639b19f90b3736fb90f7ad9b3f7b9691709d3e927365b4740a74d0f2a5c34d921d4e9 SHA512 1437f9a95a0f344b4da1ffba30a517a6d25302b5c13fdf1e7de5a3e4457cf794af21a294834dd7a0a4e8f076363c3adb3ede94ccf973783a519ab7f300bcce2b
 EBUILD qtpositioning-6.4.2.ebuild 407 BLAKE2B 3716cd42cd651a9bcb3377f4c1b7c2b5b0d3ed96868f12e0761fc63d382796b06c03765d3e852c50be529943e8d9b5cc434ffcdf4d5ee2927ba368c382b141b1 SHA512 d02b98de4f1dc0136eaf9962d8d1eb9cbd1338657a3d903777e8e0da37535eb451fd3c3eae27135c9a3fa274abf4f34f6752dfd9305c86fb87fd64d47e1d6148
diff --git a/dev-qt/qtpositioning/qtpositioning-5.15.7.ebuild b/dev-qt/qtpositioning/qtpositioning-5.15.7.ebuild
deleted file mode 100644
index f16cef187642..000000000000
--- a/dev-qt/qtpositioning/qtpositioning-5.15.7.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-QT5_MODULE="qtlocation"
-inherit qt5-build
-
-DESCRIPTION="Physical position determination library for the Qt5 framework"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86"
-fi
-
-IUSE="geoclue +qml"
-
-RDEPEND="
-	=dev-qt/qtcore-${QT5_PV}*
-	geoclue? ( =dev-qt/qtdbus-${QT5_PV}* )
-	qml? ( =dev-qt/qtdeclarative-${QT5_PV}* )
-"
-DEPEND="${RDEPEND}"
-PDEPEND="
-	geoclue? ( app-misc/geoclue:2.0 )
-"
-
-QT5_TARGET_SUBDIRS=(
-	src/3rdparty/clipper
-	src/3rdparty/poly2tri
-	src/3rdparty/clip2tri
-	src/positioning
-	src/plugins/position/positionpoll
-)
-
-pkg_setup() {
-	use geoclue && QT5_TARGET_SUBDIRS+=( src/plugins/position/geoclue2 )
-	use qml && QT5_TARGET_SUBDIRS+=(
-		src/positioningquick
-		src/imports/positioning
-	)
-}
diff --git a/dev-qt/qtprintsupport/Manifest b/dev-qt/qtprintsupport/Manifest
index 7079b3d3f6a8..f30f4ec46b6c 100644
--- a/dev-qt/qtprintsupport/Manifest
+++ b/dev-qt/qtprintsupport/Manifest
@@ -1,9 +1,5 @@
-DIST qtbase-5.15-gentoo-patchset-2.tar.xz 3844 BLAKE2B 6dcb69398cf8a6b1be737e8c7bf1041529c4e704ca892cef10ba3bc5ce435c903607b64e981cf8aa12c785b3e423aa1d52bce1f67ec1bd8dbb1421dfb6f62700 SHA512 b7fd7e17bcab2f9803c7bfc0473082ee4640299c23ce8da943ef80ed181e880ebc9157bcebde28077e80e6f907aa14a59c42416b3e32f49baebd54fbe5a37497
 DIST qtbase-5.15-gentoo-patchset-3.tar.xz 3856 BLAKE2B 0752426f9bc2dfa1ab2bc246b29f5d00305df05175a7801d7d5eddacfa46fcb605d9a317547edc01d3ef339f6effc2fcee7549cb7aecced37f0098166c70dbe2 SHA512 2515bea53232e76ca3e40bdaf1dd52fdf452052a2f40002ee91360d1fcceea3c5c2f5a8d2a3bfc0f9c2bacd61460a632c5b351accd73fd37b64985593219148e
-DIST qtbase-5.15.7-gentoo-kde-1.tar.xz 798056 BLAKE2B 3c7fefa65ab6de25c2c82261ad0f1371e32acd4bd4b3303f20a5ebf36d19690df94290d102c65e4941a6c51a5d5f2db0253bafca5ac85cf480f7434405cb2671 SHA512 20ab17220489009c98d7f783a02614507e157974c7cb16f47d50d3954ccd1cd065562effc393df6e07c9ba6ad8ccd4e6b3f0bf5b5b890183b8631b8b570bf064
 DIST qtbase-5.15.8-gentoo-kde-1.tar.xz 780764 BLAKE2B 6abb00127113595cbb0a0caf58eb6323423ca41cbde6262a63762aded12861b6c051c9548c9ce2d11ab073e8930c11b609c05579eba34d56201fb7187c78ee23 SHA512 8b59ba61e7364c78d5bf728b4d8c9bd0f8e1ed973f1a84cd40330b06195b246e052ec087067336ff5d4e80a12168a25e0bd47fd88d837c00f106d8cdeba0c016
-DIST qtbase-everywhere-opensource-src-5.15.7.tar.xz 50260196 BLAKE2B 69029a910af0e3bfe742b5870334406e03274b0677ef47f9c7c10f730ff031bae49bd21a686497215505b19a183ca395c275d8afefaaa903125297f8e693bb4d SHA512 316de71fba1d5dd91354155dcd0f77e1ce2a798f8296a8699a795ea5e86ad10b6e233299775a92e23328290f3e041240585947e89ee7bd39eb464c5f0ffec343
 DIST qtbase-everywhere-opensource-src-5.15.8.tar.xz 50259432 BLAKE2B cb1b790a384a5cad9a95fdc448e275d48a68c6ee2addf08b40f9963cc5762fd7ab15852dea8392dc76da39f1565c1e23ddb5875c280f0177e802082f4b4f7f2b SHA512 29e8877bafdbc908072209f1b27a5040b022e2b71f17f4ab4cecd570adeae21597f9af7f1d38758760f3cb30376eeb15c5f066bf02c6e9a9e3a4d07f967046ce
-EBUILD qtprintsupport-5.15.7.ebuild 821 BLAKE2B ab023f667e5bb001f97d3c1dad188454009458c8e79447ec52f8cff56afea5a2cb092098ddff13493772c3c00fcd2e21e06f433706f974c59a27d7a042421b84 SHA512 f0e19b377cbfd32d489d10940be8d18a93c28c89587d651bc48cd0dcb9f1d9e960ff927b03396510a7173c8184ed66902eb40f1738c9d6f28cb968ecb9a254de
 EBUILD qtprintsupport-5.15.8.ebuild 821 BLAKE2B 2a6c1c5ba9ed3195e60d87d97907ac493e248025442d9f19d0d393b67bb75630127d2f03e48d5ec70a3952cdb2ebdb6e6c831720a77e056d6718f1a97e7af261 SHA512 90fd858e040d7f5876ff2ed64436275d03903f282e8f41416ff6caff1b20fa2785f76bfdc563f8dde0047bb21d68354b9509ca512739ec15f8b0856e5a40dce9
 MISC metadata.xml 482 BLAKE2B 651a49dc4a07f5e5a9c21990868e666d98acdea7d7b0b2c0e4c98eafc3da72c803d380e4abda30f33250f7bbd7654df713833ccdddcb975cbad6f92e488f643b SHA512 192c670abd7da29645513bf1d9297d942efdc49f5cf170861e7689fda47f51daa47f10c7c81c3b045366e0259179c6839ff7747197c9d792e8d0fd1a5818973e
diff --git a/dev-qt/qtprintsupport/qtprintsupport-5.15.7.ebuild b/dev-qt/qtprintsupport/qtprintsupport-5.15.7.ebuild
deleted file mode 100644
index 63d92c1c6799..000000000000
--- a/dev-qt/qtprintsupport/qtprintsupport-5.15.7.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-if [[ ${PV} != *9999* ]]; then
-	QT5_KDEPATCHSET_REV=1
-	KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86"
-fi
-
-QT5_MODULE="qtbase"
-VIRTUALX_REQUIRED="test"
-inherit qt5-build
-
-DESCRIPTION="Printing support library for the Qt5 framework"
-
-IUSE="cups gles2-only"
-
-RDEPEND="
-	=dev-qt/qtcore-${QT5_PV}*:5=
-	=dev-qt/qtgui-${QT5_PV}*[gles2-only=]
-	=dev-qt/qtwidgets-${QT5_PV}*[gles2-only=]
-	cups? ( net-print/cups )
-"
-DEPEND="${RDEPEND}
-	test? ( =dev-qt/qtnetwork-${QT5_PV}* )
-"
-
-QT5_TARGET_SUBDIRS=(
-	src/printsupport
-	src/plugins/printsupport
-)
-
-QT5_GENTOO_CONFIG=(
-	cups
-)
-
-src_configure() {
-	local myconf=(
-		$(qt_use cups)
-		-opengl $(usex gles2-only es2 desktop)
-	)
-	qt5-build_src_configure
-}
diff --git a/dev-qt/qtquickcontrols/Manifest b/dev-qt/qtquickcontrols/Manifest
index 6407122e18f7..268d6d5d49aa 100644
--- a/dev-qt/qtquickcontrols/Manifest
+++ b/dev-qt/qtquickcontrols/Manifest
@@ -1,5 +1,3 @@
-DIST qtquickcontrols-everywhere-opensource-src-5.15.7.tar.xz 5984700 BLAKE2B 2023d11fee051ec481c45fa00e41e91ac12bfb6c86e6b574cf59c5f57dd78a46d6043f160db0a4b5d61f220421d175e6f948bdc02a141a6c890d5a623d7fdcb2 SHA512 111b8ce5e6fa95b885b70bdd35e761c33e061cbc09879368aee9ee63dc4c3188bb5fac2c4f3022ac935879ee91ef0d0ab2b5da2e5792d07c3a798472a490f654
 DIST qtquickcontrols-everywhere-opensource-src-5.15.8.tar.xz 5985268 BLAKE2B bd32fa8a90e90c299a73e2af237736e4576055f69e9b6b82fdb4e88ae7fa6a59c847e603567bf618e2132e474d679a420a9f29256727eec1d994bd4022e36f0a SHA512 4b93b1cc69f455bc0e3e06e9702a25791f1dcd9f3b5454ce791ab66cbc5a9ad2f3a91cf664bc2e66369c64d8d52555a02262bc8333866f1d5ff9335de1ea4040
-EBUILD qtquickcontrols-5.15.7.ebuild 772 BLAKE2B 5a0b15247d2282a640ea0f2c73cc9ee740beae151692e52ecff63997cd8308361e810bd4507208801b1f282a9632e3d69be1c35727412c092f6e07d4a0f021cd SHA512 7a9602d5b087d94eac3cad04ea9d9f76bc7d6bdb7817684240511e9a5f1cea6912ef0197d3a511640f8c9a8afed2e562861b457ecfd2df5cd003989d338a7b82
 EBUILD qtquickcontrols-5.15.8.ebuild 772 BLAKE2B 1d54d2adfb72539c4d2898390588bc75348b048144d05a659f052fc5a3206b01df79016c6bd141f9b3e684b81c1fd96e5f081dbd61732583eedcac12f49eb09a SHA512 569773cc8039061e538c937051507fe9a96a73bd2b56bfa7aea006be150204304ac31210628740cc8725cc85b0ea71dfe0d856a350e391351f61aef1325549cd
 MISC metadata.xml 552 BLAKE2B 8294b8e326a177905eb8b0510295d6b3cc97818c836b6b5d2940b78a5ecccc743c8818436fee3f3a61b2f984560c6fe6346d44e1e6b4fa27a7cf5a9a84f20dd4 SHA512 25f93b07946f9319e9762b9ba6c9adb5ca6348a71ebd5710c0f1690a75ca7f93af8967f323a9e11e7af04fd970a92fedf3ec30d962f85516c7b44f1ea749dbbf
diff --git a/dev-qt/qtquickcontrols/qtquickcontrols-5.15.7.ebuild b/dev-qt/qtquickcontrols/qtquickcontrols-5.15.7.ebuild
deleted file mode 100644
index 44cf0849362b..000000000000
--- a/dev-qt/qtquickcontrols/qtquickcontrols-5.15.7.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit qt5-build
-
-DESCRIPTION="Set of Qt Quick controls to create complete user interfaces (deprecated)"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 ~arm arm64 ~hppa ~loong ppc ppc64 ~riscv x86"
-fi
-
-IUSE="+widgets"
-
-DEPEND="
-	=dev-qt/qtcore-${QT5_PV}*
-	=dev-qt/qtdeclarative-${QT5_PV}*
-	=dev-qt/qtgui-${QT5_PV}*
-	widgets? ( =dev-qt/qtwidgets-${QT5_PV}* )
-"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	qt_use_disable_mod widgets widgets \
-		src/src.pro \
-		src/controls/Private/private.pri \
-		tests/auto/activeFocusOnTab/activeFocusOnTab.pro \
-		tests/auto/controls/controls.pro \
-		tests/auto/testplugin/testplugin.pro
-
-	qt5-build_src_prepare
-}
diff --git a/dev-qt/qtquickcontrols2/Manifest b/dev-qt/qtquickcontrols2/Manifest
index 10ed6b7c4cfc..a39722d1e632 100644
--- a/dev-qt/qtquickcontrols2/Manifest
+++ b/dev-qt/qtquickcontrols2/Manifest
@@ -1,9 +1,4 @@
-DIST qtquickcontrols2-5.15.7-gentoo-kde-1.tar.xz 8132 BLAKE2B 90e9b608477168e919ea30d4571620592d993f04338fb4a0e00f7b8d846bc82978960cd4861dfe4c8d2e366b2e3f9b36848342ad496326f2cba09036eb0f5033 SHA512 bd35612f1afe7ae46a3aea4b2bb1c8c39592ba426c484c5e3b6108fd473df3903153efcc5846e8d909a575e7406325806efbb685662047a43f6079eba8059454
-DIST qtquickcontrols2-5.15.7-gentoo-kde-2.tar.xz 8720 BLAKE2B 16cc913e19cc1fc3c777859af2a8f5d30d26d94f94ef94d9b417c0162aeae0c73064f24ab26323f06d765484f27e30b954d2c4df69202ba42dd5da824091a55e SHA512 3b8351ef284335548ee9fb8f38ea0c8482369bafa44ec46d7b315617e144a5c9754fa0307a49623341cb664dba4bff15ebec89a7554c773b22957bf4157792ee
 DIST qtquickcontrols2-5.15.8-gentoo-kde-1.tar.xz 8700 BLAKE2B 5a1295fd88552e2ff35c23d06b1c04fcf12df796d5dc4a18dff5ebc8840083abec9f387172d215aba764703228434a426cb3924ca9cd35a606b5d52726743607 SHA512 23aa9b84ecc154647208a9b6a4069c5997a50e73108640957a81ca2bb8def0e14298a4ed53c5c6df2167445cd485bfd71937f1b5ff430c90d6d208cc7c8cf022
-DIST qtquickcontrols2-everywhere-opensource-src-5.15.7.tar.xz 8291644 BLAKE2B 031043f97b3eac00e0e979e0fa42870593f07959b735559ccd6b7732a43f19731d69c434b2c38a8fe3342cdc1e3a5d54b37924228be0628394d113d5924734e0 SHA512 f49e330593b23ab9e84874a7cee1583df9355dd68d7c25e57fba080997b860b86f9003190e5d9a5b393efcb143fd20866daf2c8088a769e3094d6cf9607febd5
 DIST qtquickcontrols2-everywhere-opensource-src-5.15.8.tar.xz 8292476 BLAKE2B f4ec2762e16d033fa64b0a3ee96ce2ba422be3811b981928212b807a53bc27d5fd0eafdaabf1e74f4cbb2988d9749ae8d566b596a5df4b865c2db1db673fffe8 SHA512 d42fd70f1d9d1d951e5a8eee886311bf70f0c9b21718b3b76b87ee38fee010c654abc82259e73883c9aca36dafcefb25e5297bf34213cafe4da6a68c4f45d816
-EBUILD qtquickcontrols2-5.15.7-r1.ebuild 659 BLAKE2B 3dfe42c56eba8bfa7efe7f7f941a449a756a59ae1efe1abad396702cdef24b2b1f84139c1b37c4a3b8e5dc72bf2f2d1dc67dd2560cc7f801e967640751514796 SHA512 17e3e31c2b247df80d1fa7b7f7eb98a1d5f0d0be4e87f3f4383529e4b0e42d52bdd53cd33d2b6eb1d1433af5576a15920d07ba8d1ec9d1cdcccff64af3952748
-EBUILD qtquickcontrols2-5.15.7.ebuild 656 BLAKE2B 6b365a208f290401e9bddeb9e1cd2f0e94cb01473459defc4fd7c2953036bc099ad617544c3a360feb10533139c729f2f330233a0cf111f73021cbcf11c8fb51 SHA512 573f1bdb3eb3338301ae86a176a83c85d6a18eb23b76c1f24e97d9039ac97343c0c231f6af07a8f2381280cd2f8029bf60f3c8e1885888fbc97d4632d402358f
 EBUILD qtquickcontrols2-5.15.8.ebuild 656 BLAKE2B d340d7dd1d33423edc225f091606502d6fe19010376e23e2ae8a0af2dd3fe86409fade53b51b2e7cf0b35effa3983bccbae50f5512e6ce5c2e168bd80800a6bc SHA512 c90a27549714a059b1012808921aaf224282bf2a15c585b55971dfdc85f1754102300d55e0de73dd74ce55be292e83f321f277b2bdf59915f47acfac3468759a
 MISC metadata.xml 552 BLAKE2B 8294b8e326a177905eb8b0510295d6b3cc97818c836b6b5d2940b78a5ecccc743c8818436fee3f3a61b2f984560c6fe6346d44e1e6b4fa27a7cf5a9a84f20dd4 SHA512 25f93b07946f9319e9762b9ba6c9adb5ca6348a71ebd5710c0f1690a75ca7f93af8967f323a9e11e7af04fd970a92fedf3ec30d962f85516c7b44f1ea749dbbf
diff --git a/dev-qt/qtquickcontrols2/qtquickcontrols2-5.15.7-r1.ebuild b/dev-qt/qtquickcontrols2/qtquickcontrols2-5.15.7-r1.ebuild
deleted file mode 100644
index 0c4cd5241fff..000000000000
--- a/dev-qt/qtquickcontrols2/qtquickcontrols2-5.15.7-r1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-if [[ ${PV} != *9999* ]]; then
-	QT5_KDEPATCHSET_REV=2
-	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
-fi
-
-inherit qt5-build
-
-DESCRIPTION="Set of next generation Qt Quick controls for the Qt5 framework"
-
-IUSE="widgets"
-
-DEPEND="
-	=dev-qt/qtcore-${QT5_PV}*
-	=dev-qt/qtdeclarative-${QT5_PV}*
-	=dev-qt/qtgui-${QT5_PV}*
-	widgets? ( =dev-qt/qtwidgets-${QT5_PV}* )
-"
-RDEPEND="${DEPEND}
-	=dev-qt/qtgraphicaleffects-${QT5_PV}*
-"
-
-src_prepare() {
-	qt_use_disable_mod widgets widgets \
-		src/imports/platform/platform.pro
-
-	qt5-build_src_prepare
-}
diff --git a/dev-qt/qtquickcontrols2/qtquickcontrols2-5.15.7.ebuild b/dev-qt/qtquickcontrols2/qtquickcontrols2-5.15.7.ebuild
deleted file mode 100644
index fc9c6f791079..000000000000
--- a/dev-qt/qtquickcontrols2/qtquickcontrols2-5.15.7.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-if [[ ${PV} != *9999* ]]; then
-	QT5_KDEPATCHSET_REV=1
-	KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86"
-fi
-
-inherit qt5-build
-
-DESCRIPTION="Set of next generation Qt Quick controls for the Qt5 framework"
-
-IUSE="widgets"
-
-DEPEND="
-	=dev-qt/qtcore-${QT5_PV}*
-	=dev-qt/qtdeclarative-${QT5_PV}*
-	=dev-qt/qtgui-${QT5_PV}*
-	widgets? ( =dev-qt/qtwidgets-${QT5_PV}* )
-"
-RDEPEND="${DEPEND}
-	=dev-qt/qtgraphicaleffects-${QT5_PV}*
-"
-
-src_prepare() {
-	qt_use_disable_mod widgets widgets \
-		src/imports/platform/platform.pro
-
-	qt5-build_src_prepare
-}
diff --git a/dev-qt/qtquicktimeline/Manifest b/dev-qt/qtquicktimeline/Manifest
index 2c62fb6d19a2..a43ed9bb59bf 100644
--- a/dev-qt/qtquicktimeline/Manifest
+++ b/dev-qt/qtquicktimeline/Manifest
@@ -1,8 +1,6 @@
-DIST qtquicktimeline-everywhere-opensource-src-5.15.7.tar.xz 104372 BLAKE2B 36637e92a295477626324fc89311e7c0c7b7ce378166776c66ede1153afa1ef8fc8d3d43cb923daa0a264b6c2cb7f9795c5c80fa062dd238dd63b3d0efac32b9 SHA512 e6d99b022527eb72a901cb69830a71ee931239e00c515cbef709240a94e8a8e239e7402ff40784e0123e22e1ee94ad548071353bde16fb1a9362176bbd1c8db6
 DIST qtquicktimeline-everywhere-opensource-src-5.15.8.tar.xz 104348 BLAKE2B 8b02c97e0c0c01c0e398d64d8dbeeeea8a47964c1d9b0ce1357b34d71553b3fb2401f545b1e1c161ed6ca198ed8105c6ac9528e9a46d44ea17d7d4489a97dbd1 SHA512 c05f94ac61613a46494f871d5b4fbbd184f9924dc66f4a82438fc9fb6248b4afb0936f925a033739215096efd6b4a240a34078216999d40c50846ea96cf9dc61
 DIST qtquicktimeline-everywhere-src-6.4.0.tar.xz 112976 BLAKE2B b2370293362dc0cfb7c231788332ff740842318a654db4a8efce475f9b5e5f1bcb72e7777e91ecd1e5f0ac92a9a65c427e69790339173351aebf6cb43ce34521 SHA512 3818056b6f1b16ec443e895ce07582717331b768c036d073735c52b7ce385d8b53a93a9748eaa915885916e9267de7c4e731a5b01dfd5d643b0a594ed58ca577
 DIST qtquicktimeline-everywhere-src-6.4.2.tar.xz 113008 BLAKE2B 9352c836502ed57af049ff06fc8b0dc6be0a0ac05c8a0a5a84fad86e28a149ad3756534dbe48b994e10466e249575e6816d5b4d33a4a26990b39787ac273bf5b SHA512 dd7f9b09312f7f94e18aa127f49d389eac183cc03f80d01dcd0faa5db2852d0bb12a9f6070543ede93b986649f455e90c4288d992bcd024f82213782f9bfda5e
-EBUILD qtquicktimeline-5.15.7.ebuild 367 BLAKE2B 9277628f8ddc066de3a200293cc02dcaa1c58127af081ed739a55cde5d0e9284ce76132d9392bb14aef54cf6167c6645d5c0af9136bf30a17bd9061561ba165f SHA512 0c4c90b683682a5e0a775f13f598b479344c51f5ee034275abd11dc23b7b4571e7b2f2a387a65211b22b73aec7c3e1b089e9b23f422e16765539a5b3516c0fe4
 EBUILD qtquicktimeline-5.15.8.ebuild 367 BLAKE2B 610cca42b4a262f7b3c1d9943187d179af7ba673232108dfd154d5c355af691f445f5eb39261ca5bd25d4788318beff0f58cb6042a4433a45d5e9d2108b30f75 SHA512 231e521de5b8274c074de45306b7f8a72085e7d4f10a7f9e6decf4d358fc82b991cb01c0163aaa96bc54b56ad0f7d2c0c2e71c24f51baea9c95809d0c40c3efa
 EBUILD qtquicktimeline-6.4.0.ebuild 349 BLAKE2B f70e5d683ac95ad1bf23b39a50e8457f571704ec65b20364b7d3224d50001d3203b889cf88b8ae9e6e05e4b45297560550fa1094243e1a92d6419ba421f728e3 SHA512 f2465a785aa935116843fa6adaea44dd54c4b3ef2ba6c2291cbc12f4ae8a33b77852bd81f3f8ae3f709a1d2cfe9e35295ccb8ff755e96bce84a3fb8fe968dc19
 EBUILD qtquicktimeline-6.4.2.ebuild 349 BLAKE2B 87abc1b15b3f35c9aaa0422bf73321342981ff72d9e2eac71746fb12488a9740f472306a9dc1e7ef04624df47d169a15baee90c66a537432055c1a220e1d2b38 SHA512 40bcd48c890001940463e12a49eff06f600a5dddfe039518b142ce83ccef86d01a2421af8beda249c7c81cc4c9845b6f00e8cdf2a4e74abbec91f25556928504
diff --git a/dev-qt/qtquicktimeline/qtquicktimeline-5.15.7.ebuild b/dev-qt/qtquicktimeline/qtquicktimeline-5.15.7.ebuild
deleted file mode 100644
index f0aff5d0626f..000000000000
--- a/dev-qt/qtquicktimeline/qtquicktimeline-5.15.7.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit qt5-build
-
-DESCRIPTION="Qt module for keyframe-based timeline construction"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~x86"
-fi
-
-DEPEND="
-	=dev-qt/qtcore-${QT5_PV}*
-	=dev-qt/qtdeclarative-${QT5_PV}*
-"
-RDEPEND="${DEPEND}"
diff --git a/dev-qt/qtscript/Manifest b/dev-qt/qtscript/Manifest
index fa9e2a26286e..1b5097feef02 100644
--- a/dev-qt/qtscript/Manifest
+++ b/dev-qt/qtscript/Manifest
@@ -1,5 +1,3 @@
-DIST qtscript-everywhere-opensource-src-5.15.7.tar.xz 2665808 BLAKE2B d4c1d0519a60947d6eaddad0c4845350a52ff036e76f5797252e359719d4d6e5c92a3ec224ce8f7b5ada989cbf1ec84dbb380d258a5a59d7d58e8ef2ae32329b SHA512 448ce8f8e7f669ee7eadff7abbfa2e9a80ed56cc7c4916391e385728bc96d406b8d98d7c2916c09cd2c0fa2c834b16854960eb96ed49cc81f05c183104141c7c
 DIST qtscript-everywhere-opensource-src-5.15.8.tar.xz 2665424 BLAKE2B 9992c7cfc60f3889d23273651d14aa46b527155b3632b0a53bc2417ee9597acf7ae166c9bd50568fb327a073918072e85fbf1d3288d6af866acfe7c6a1bbb850 SHA512 977bb6d134c499e010d96383fd2e81c10c2864af305770353b378af1eb81debe6bd4cfa304b296ce100af87155066ce7a09b68d83c74de6e4113e2b01a1c5638
-EBUILD qtscript-5.15.7.ebuild 685 BLAKE2B 3fc07079a14a52774b26208963f00d6737646e1fcd05b7d3cba2a40abc2374e0a453f53cfdfe25c5c20b093262041466becc4d6d48f0ca5971b9687a4045807a SHA512 fdfb34d567c21db9113cb9638379ac0b9f6c6ea5f8fb2ddca0e3dfb084be9790729c655a23fe94c0f00b582f4cc3cf95d11a2d5358af65891a903a9d3d3997c2
 EBUILD qtscript-5.15.8.ebuild 685 BLAKE2B 8fce470e213da03bb8cd26bc2b8039467119d93249a3b63cfbd0b76c5115a7a64b10e6cf84e10e51431b5a6a9881e02547c44ca18b1d9e945761a3a2c541751b SHA512 b5002b066d0a77a68cbd5ab31944d1065a65634fcc9845efd2c41e9e85f9887abdebd8e5d288db24ab262b176e86b2832e24d8843b264c505b3edf0e99b57c41
 MISC metadata.xml 583 BLAKE2B 5389c382561f060259c9eb626a98fa6d1861a33cffb3ca62899cfb6f1b020d6841314edd05c4fd0e5f05593f6015af8826f1d087078754a3dd31ae72be7da4aa SHA512 f8d07eb515db1b455670371655c572aac73653a2d1af68d8a226ecfeaf77b62737114a66bc41375cf7f32d575df792a685298487a90c650b6c6dfb4a7c113181
diff --git a/dev-qt/qtscript/qtscript-5.15.7.ebuild b/dev-qt/qtscript/qtscript-5.15.7.ebuild
deleted file mode 100644
index 579e5614509f..000000000000
--- a/dev-qt/qtscript/qtscript-5.15.7.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit qt5-build
-
-DESCRIPTION="Application scripting library for the Qt5 framework (deprecated)"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 ~arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86"
-fi
-
-IUSE="+jit scripttools"
-
-DEPEND="
-	=dev-qt/qtcore-${QT5_PV}*
-	scripttools? (
-		=dev-qt/qtgui-${QT5_PV}*
-		=dev-qt/qtwidgets-${QT5_PV}*
-	)
-"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	qt_use_disable_mod scripttools widgets \
-		src/src.pro
-
-	qt5-build_src_prepare
-}
-
-src_configure() {
-	local myqmakeargs=(
-		JAVASCRIPTCORE_JIT=$(usex jit)
-	)
-	qt5-build_src_configure
-}
diff --git a/dev-qt/qtscxml/Manifest b/dev-qt/qtscxml/Manifest
index 42c10af28818..7227976fd4d8 100644
--- a/dev-qt/qtscxml/Manifest
+++ b/dev-qt/qtscxml/Manifest
@@ -1,5 +1,3 @@
-DIST qtscxml-everywhere-opensource-src-5.15.7.tar.xz 436832 BLAKE2B 1ea08582ab5c64157cb1ac34fdfa66c7f96897007cd0d27dd64834dc9c0d7ee5634636d009bea07d5ba140daa11e4f5ff7f3f948c4e1efafb6b90d5d23f8b1f3 SHA512 ff3fd21b0bba3f092d236d875559d4e992180a2d9e8ffd8a628a5c82518329c99587eeddd90fdd10c340d1bc4c9077a4d439be1a3d7aa0dfe3f1a557ee934bd3
 DIST qtscxml-everywhere-opensource-src-5.15.8.tar.xz 436864 BLAKE2B ada2ac54eaef077da132929a658a461151e5b1c15a02874b80da6334eb5fdca5737126e5caff308fccd0bec96cd07a36b188113b8d26beb7dab9d1e9278598e8 SHA512 f1e560e3091eb60b70e5b7ab187511708d16c1b2e8a0c1a6d7a95358eb3ed998bdf0e57b7855e38a773509805790603e3e8e64627f52f05f305d8a29108db9f2
-EBUILD qtscxml-5.15.7.ebuild 398 BLAKE2B d97708b7ba07f13cb55fa5f0f3f291b432b34db2125cdd06f56ab43b1d2d312ab4b07f3ad2a7eb062e61a8f7b42dc6268ae969ac2f23fd3b65fd7a4bec0f2dc6 SHA512 07cf036cbf059263719cbbca7447642e9329f22684d874280d7e68ba3fc9a3d18c24e9d7c776812ff6276433199c71250d800e0173880cbd022082a77dbd47d6
 EBUILD qtscxml-5.15.8.ebuild 398 BLAKE2B 27b0f98657fad702cb2b14ad1c69bc80b9c42e5680ed3ba2db0e79bb9884c0f7e4960c3c4bea26a6e5577476030b52c172f327cb6b6ecd9ec72ec6b5d306725d SHA512 62f3dd6a55d8f8dc8af4d1e0f7ded88f8efd3fe1ada7a7f585bdd488c3599f160a9efbc52a014cb5016e11a13856dfabbc236cb4257bae8bbb18137bc02e22ce
 MISC metadata.xml 482 BLAKE2B 651a49dc4a07f5e5a9c21990868e666d98acdea7d7b0b2c0e4c98eafc3da72c803d380e4abda30f33250f7bbd7654df713833ccdddcb975cbad6f92e488f643b SHA512 192c670abd7da29645513bf1d9297d942efdc49f5cf170861e7689fda47f51daa47f10c7c81c3b045366e0259179c6839ff7747197c9d792e8d0fd1a5818973e
diff --git a/dev-qt/qtscxml/qtscxml-5.15.7.ebuild b/dev-qt/qtscxml/qtscxml-5.15.7.ebuild
deleted file mode 100644
index a778e477a992..000000000000
--- a/dev-qt/qtscxml/qtscxml-5.15.7.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit qt5-build
-
-DESCRIPTION="State Chart XML (SCXML) support library for the Qt5 framework"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 ~arm arm64 ~riscv x86"
-fi
-
-IUSE=""
-
-DEPEND="
-	=dev-qt/qtcore-${QT5_PV}*
-	=dev-qt/qtdeclarative-${QT5_PV}*
-"
-RDEPEND="${DEPEND}"
diff --git a/dev-qt/qtsensors/Manifest b/dev-qt/qtsensors/Manifest
index e99b934b2d8b..0fd899d316c5 100644
--- a/dev-qt/qtsensors/Manifest
+++ b/dev-qt/qtsensors/Manifest
@@ -1,5 +1,3 @@
-DIST qtsensors-everywhere-opensource-src-5.15.7.tar.xz 2059352 BLAKE2B 37057cef183c1cc5a0ffd8839955059d5a4fa9de2adc1bc60abb0566a09c0adfe926b2a211c88668d88027f08816729f1881c4d00c4f7739e1f71f849f8d184b SHA512 dca0b149f086b0a949809bdc78f1551b27036608802a04f274d7bec38e5eb53ac2c3d78cda83f6d447aa6fc9490bdc19135e925c429cd9ea7290dae27bf00fcd
 DIST qtsensors-everywhere-opensource-src-5.15.8.tar.xz 2058928 BLAKE2B f6af6fe7c26d54af9785d54eab76b7ac274723f648b885e723fd048f5870fe6f550dd57125c6fdfd0ad9e814be66155a0342fa73327b0e58b105ca891b5d10af SHA512 333bc05dd3bf4ba8ca4069279bf5e73f59475dd0d6e0411f16dc796f4cceb4354a7730be931ad868ef7052ebf8e36e151155dbe6576e9f33a38494bb589611d9
-EBUILD qtsensors-5.15.7.ebuild 566 BLAKE2B 814dd717a226d667ea5bd6f2d43223304daa270eac7ca5002bd3eedfacef94791ac832e13f2d3b61d47eff6c72f8b0d5a2f611f8f7a94e9859129e49c4472d11 SHA512 7abaf8705a0cd03abc6a8cd7357a7d0b8162bcc37f28e97136297969e9965c88325d199b64c2ef18b81d717df5db329293e645d36f985d73d2db1be37464780c
 EBUILD qtsensors-5.15.8.ebuild 566 BLAKE2B e798853d8e80272c044a99cec1afc8bb006ce73552d642d7b9852a55b3e018875fdf8bcdcef2a001ecbfbafd0cc2e36350d41bf93bce93e35b7a5e081a607ed8 SHA512 1927fa1e7693842aa7c08e604bc3033bdfabf28411ca6d748ac8a26f432187f14b8c10dc9a5a51b631b71d7f81048c893d700110fcb2888da02268b4529e7e4c
 MISC metadata.xml 542 BLAKE2B 45db7e0814cd2ecae2053ed664d6af55c1f2c175eeceba4364fc37c558ddb51c8e28309722e8c2404441ca009613c045ddf7e501d4b5ed27d208c027c3aa1573 SHA512 5bc7be4d72823fdb716ce7eee0c36eb2a5fe7ea9a59a95792727efbddbe474fb44dfa0286a3064ee674a41d8d5415fd48c717735b6818cf3c28e1d60193f3ce1
diff --git a/dev-qt/qtsensors/qtsensors-5.15.7.ebuild b/dev-qt/qtsensors/qtsensors-5.15.7.ebuild
deleted file mode 100644
index 25a0a7fb01ad..000000000000
--- a/dev-qt/qtsensors/qtsensors-5.15.7.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit qt5-build
-
-DESCRIPTION="Hardware sensor access library for the Qt5 framework"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~sparc x86"
-fi
-
-# TODO: simulator
-IUSE="qml"
-
-RDEPEND="
-	=dev-qt/qtcore-${QT5_PV}*
-	=dev-qt/qtdbus-${QT5_PV}*
-	qml? ( =dev-qt/qtdeclarative-${QT5_PV}* )
-"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	qt_use_disable_mod qml quick \
-		src/src.pro
-
-	qt5-build_src_prepare
-}
diff --git a/dev-qt/qtserialbus/Manifest b/dev-qt/qtserialbus/Manifest
index d1e97891981d..3300bb632b84 100644
--- a/dev-qt/qtserialbus/Manifest
+++ b/dev-qt/qtserialbus/Manifest
@@ -1,5 +1,3 @@
-DIST qtserialbus-everywhere-opensource-src-5.15.7.tar.xz 358400 BLAKE2B 3b89d33fc96ae374b4193e6d70d9e29c68afd873d7c1783ce1b821dbba06f284b8138540d8f46e3385da843461f80dbaa911ddc1e7e8d02ea14858a43fff5abf SHA512 b67a409e48c28e91dc53bbf29716209ab37b75e0e54d54002c4eec10aa2209252cf5fb37b3c6b1004ec800a4dcd5313b6beda46167ed64dbabe6bd5e1b9be4b0
 DIST qtserialbus-everywhere-opensource-src-5.15.8.tar.xz 358400 BLAKE2B a3b1f0f20f3cc9a49851a04838715f532a7e7ddcc2d711d7d52babe19153fc3309b8ed6d236ae0d4ea1bbb07e2a6a3feb9d4fb64c9fad9b7c464f5b3e8807fff SHA512 7877834f775d98464a5a220348ba395b91d6c4ce0cb794f2cd56d0878e8a7a36a1aff69abbcaa231a4ee42950b2b9db9db578d27dacaa48382522b0dd9bbe88a
-EBUILD qtserialbus-5.15.7.ebuild 430 BLAKE2B 7970edf0e0fdfcf05f8d4108cb9cd6c98d32bc38eaa063f1b44e18bcaf939ee7dde16f61262570a50ca820273f890413dac1713396f78c8e62dc731e2c472068 SHA512 60a20b83efe552b946f7f086d61354804bdaf232b12cfabe22d3b4ec02958ed1c3e42f3bd3cb81d817e3a8d3b9db29818a5f8429c85e795d66e14149e139a526
 EBUILD qtserialbus-5.15.8.ebuild 430 BLAKE2B 0ef2ee6be68f796c34583c56e53e0490a87e539c7c8ae247cf7d5749e01a6794f3f03ee5df8912db288d4d4d8c2428cdc5c2cdba076e5758ed9c2580c0691d1b SHA512 dff82f6d97f2b21809bbc2078b07e88d513672bf4fa4547037aae8da14c7485f4a5e27a7305a5b0462990553a662b5c133e1bff2a52ba97e4bedc4e1cdd9aaf5
 MISC metadata.xml 482 BLAKE2B 651a49dc4a07f5e5a9c21990868e666d98acdea7d7b0b2c0e4c98eafc3da72c803d380e4abda30f33250f7bbd7654df713833ccdddcb975cbad6f92e488f643b SHA512 192c670abd7da29645513bf1d9297d942efdc49f5cf170861e7689fda47f51daa47f10c7c81c3b045366e0259179c6839ff7747197c9d792e8d0fd1a5818973e
diff --git a/dev-qt/qtserialbus/qtserialbus-5.15.7.ebuild b/dev-qt/qtserialbus/qtserialbus-5.15.7.ebuild
deleted file mode 100644
index 1931b8c79e71..000000000000
--- a/dev-qt/qtserialbus/qtserialbus-5.15.7.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit qt5-build
-
-DESCRIPTION="Qt module to access CAN, ModBus, and other industrial serial buses and protocols"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~x86"
-fi
-
-IUSE=""
-
-DEPEND="
-	=dev-qt/qtcore-${QT5_PV}*
-	=dev-qt/qtnetwork-${QT5_PV}*
-	=dev-qt/qtserialport-${QT5_PV}*
-"
-RDEPEND="${DEPEND}"
diff --git a/dev-qt/qtserialport/Manifest b/dev-qt/qtserialport/Manifest
index 25c785f84fff..d7131f34e5e4 100644
--- a/dev-qt/qtserialport/Manifest
+++ b/dev-qt/qtserialport/Manifest
@@ -1,8 +1,6 @@
-DIST qtserialport-everywhere-opensource-src-5.15.7.tar.xz 323144 BLAKE2B 937604c858b5b502162044a9f2f45f54b4e25cbc38f29fd6313075f0344ef05a288d9d4fdb9fd7165599b766e6dad0c7178358520a2d9ffd7011242c9c535206 SHA512 80d17988676d0c8985406a13ad97d4b9ed1c00af8c84f6fa550f5a1057fbe0988993aa6ccc9cceb058104ecd9526314d33f4efab27b62f45981456c4f052cccf
 DIST qtserialport-everywhere-opensource-src-5.15.8.tar.xz 323200 BLAKE2B 30d0620c7101a38fe2253ee13845eec7a78dfad8d597d6798235c82ca2a916647b23e0ac9395530c53ab22dc9cdf5ee6a59bfe1a0b689152cf11602a131526fd SHA512 974ae97ec9bdbb4bcecc80a07c343efe4ed686c968810e76fb0e4cd62165949c30d57a37035ac08916850cc2d207fabc0aa09e593184e65fc6d74b36bfbdc444
 DIST qtserialport-everywhere-src-6.4.0.tar.xz 318952 BLAKE2B 806ae200c6a253eefadfff368d6e559129ce2158fea26fa8005eb8d0b3b594d5d68591bbede8b767462731d6557107ad280a721e12fcef88be7dd5ed6aa7c65f SHA512 b2e78302f9ec55b52dfab6f8086a63444f0c6d8ac8dd3b5b39a32c24c8e01d4799b5539144f6e9f4a376c36bcfe4f15c0b9eb5933d45ccc4433e881b9e15b182
 DIST qtserialport-everywhere-src-6.4.2.tar.xz 319000 BLAKE2B b83869a762eceef9def1a1206343b7c3004ea84e274a8059a3872ba5416e30d7d2f494b49458eea855fa4c6a2163a1933e61eaa40c8377f14b369c9f3fad055f SHA512 d8b33d89e78abf34766f8d37d114641e2aec90ebe7d82dd1246f453b87b266545b1679450fd8f3ab7967a348fda098179b63a6d9ec34eb5ce56d8e8b242a251f
-EBUILD qtserialport-5.15.7.ebuild 565 BLAKE2B 8971c6ad4853c976f8b63f1631de233f633cc763c87dc1fb5522d2f401e1974ce4738f630f6ed9b51db8347dca47df3237e58db37d93f1831e1efd953a726f47 SHA512 f53904ae78be82094284b744993cf469f62a68e0a82514f4d7517623a5ec8247c042288da3330824a5b16ea583a0096df4838b0f3fbf4af109c3bfcf6ef60753
 EBUILD qtserialport-5.15.8.ebuild 565 BLAKE2B 380cc83e92be8bd256a5e652a5018380da908a30a20a8676c3701caea63dba343b99edd1f67458ebb5556ca49cac3f0b766b0237c66b01e7b8087246ecda4bdd SHA512 acfee3720971a49241a821201849b840e1d019ed768e58da252a5e519bd142d9166e4551330ed8d21184a1b899d8175dbe1bf251f4a938d13d971514ca4063df
 EBUILD qtserialport-6.4.0.ebuild 354 BLAKE2B 9c1001bc6a2db28b5610d642b0ec09501dc40db0d5858cf321b8eac1f825ffcebe3a48d04f3324d0216f2d56a97c06f7832cb570d82bfe1c5846a896f1f4e2f7 SHA512 47be4c3c4cab44e3df6e6d9ff6d0bf83f03861a01e1e2baf1718f3a6ce5f1e119c779dc7579330dc14eee417c12077fcc28f91a1881101170fe7742061764e96
 EBUILD qtserialport-6.4.2.ebuild 354 BLAKE2B c466c01402820d11e4f2423c21d0569c62e4b64f1fc04a0be37654d42fea6cbb8f71303f8eca98e20a7f3c22fc63d28ac11b0a0b3cfeb1037800e81f50fda09a SHA512 be88e72c9bfdc86c3786fc729681c62885bc291483dc9a53b4000217e8d569929a5e5ff035785bab7fedbbdf2c609a2e241a5bd89b7d4c9970fde3c11c6acb39
diff --git a/dev-qt/qtserialport/qtserialport-5.15.7.ebuild b/dev-qt/qtserialport/qtserialport-5.15.7.ebuild
deleted file mode 100644
index 16783d11f7b7..000000000000
--- a/dev-qt/qtserialport/qtserialport-5.15.7.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit qt5-build
-
-DESCRIPTION="Serial port abstraction library for the Qt5 framework"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86"
-fi
-
-IUSE=""
-
-DEPEND="
-	=dev-qt/qtcore-${QT5_PV}*
-	virtual/libudev:=
-"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	# make sure we link against libudev
-	sed -i -e 's/:qtConfig(libudev)//' \
-		src/serialport/serialport-lib.pri || die
-
-	qt5-build_src_prepare
-}
diff --git a/dev-qt/qtspeech/Manifest b/dev-qt/qtspeech/Manifest
index a48c84f0c9bb..a8ab202997c6 100644
--- a/dev-qt/qtspeech/Manifest
+++ b/dev-qt/qtspeech/Manifest
@@ -1,7 +1,4 @@
-DIST qtspeech-5.15.7-gentoo-kde-1.tar.xz 1036 BLAKE2B c469a591ad538b24aaf17ce8b9b35e878511dfec5f6a555b5b6336c924b181651a898914d5d7e09d7cdb04686ed12021f3b6b6e1b8c6b5bd21af80325d77f8b9 SHA512 c9842af963fad013d760e00afb5703b7953de7ad43d06987f43f8f3678c5f5496a987ba35762b6738b499fa5c148bdf2f85e3a6df408807cc5229959ee73caaf
 DIST qtspeech-5.15.8-gentoo-kde-1.tar.xz 1032 BLAKE2B 1c65df9530d5a8b56249aabacf22faeb0f015a2f668aed442ee17588efee041d5262f73c201b561e87f6c434dee0ff49e3fa51403f1fd2b096b923c0b4cd7102 SHA512 ae1b42931ce11702bb447de1530148c29ec3fc680778b43034f2001db375d9fb049fd17d8937520bf59cb466bf34ff7ffaaccd8fa590473cbfad2181e6a4ba28
-DIST qtspeech-everywhere-opensource-src-5.15.7.tar.xz 103572 BLAKE2B 580b0756e3c08dbe2ab86ad09a31b06e5f3ffa6fa3db0173bde269e6462fec7211f79c55b94dbac90b23f96a8c004ca1bd46d74dbfc1996b3e4c459ab013f2d4 SHA512 3db8edbf16366bcb155aa254483f059f0d6c6af769ff4e2bb87061c7c352fdbb30b63e4644e287a116292fa4f5f6f6c148b99fc9d39ded14e337f014a6aa66ea
 DIST qtspeech-everywhere-opensource-src-5.15.8.tar.xz 103728 BLAKE2B f771a0e9ac4ea9520542ade764480c1c3d280a24b424f01ffb31db7a8ba0a6fc98009369edafbe7bdbbc18089d92beda18eb62da43da640b7833f154aef619e7 SHA512 01b625f44ea0ce799ab338f76ca17701025f288b0e83d8d36f5ad0f8b1fd505bb3fa109ace6942c19b0d5734e01aae1c69b28f7da98f986066dcd0ae0d175cee
-EBUILD qtspeech-5.15.7.ebuild 730 BLAKE2B e6e72c65ac4f511ee409d32d17d5e1a3900c260e5991c3f101c77a54ede3d4bc7d4c53abe82292ee0fe611397d11517f0cee1b3cc5f5349e191b91eba05d54e8 SHA512 b82deb466a2b6a633f095b8101e37c373a48be2c0ffd8a6cf12b0d14021887b805029b91f66ea725f52ab076a72b405c93d7d8a6ee8cd47c5f6e29bce8dd1beb
 EBUILD qtspeech-5.15.8.ebuild 730 BLAKE2B 9ca79158cacdb395d0e845f8504a1846889bae0eb116af6255016b2b88f6ab30b5d511575e13561c3cc3941dc9bc3e8832472d90d1ac0471af2cc55bf64d5dde SHA512 4222158b97630d34ede62e8d0116834442fe72509ed0763fec33ce0306ba1689afec8e57ce732e140410e31a42bf6403c8ec6fc2dd3aefb8895058d8d3c44323
 MISC metadata.xml 614 BLAKE2B 93e681cc8d9a330c55a86b22fd190c98c9d834cdf85755c4e61365e288f51fa31854788df2ed2a73aab1736b47f0e7e79f8cb6ec504d74614a0e068d8b783365 SHA512 780dc74110dc359d3764fa7f3a1e4c60f1e05f51cfeb377de8ab043d95c8154535657e46e5f026b66dcc612a1f36e007ae2d531622766518a108bd58407dc2f9
diff --git a/dev-qt/qtspeech/qtspeech-5.15.7.ebuild b/dev-qt/qtspeech/qtspeech-5.15.7.ebuild
deleted file mode 100644
index 30ccfc997cb1..000000000000
--- a/dev-qt/qtspeech/qtspeech-5.15.7.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-if [[ ${PV} != *9999* ]]; then
-	QT5_KDEPATCHSET_REV=1
-	KEYWORDS="amd64 arm arm64 ~loong ppc64 ~riscv x86"
-fi
-
-inherit qt5-build
-
-DESCRIPTION="Text-to-speech library for the Qt5 framework"
-
-IUSE="alsa flite"
-
-RDEPEND="
-	>=app-accessibility/speech-dispatcher-0.8.7
-	=dev-qt/qtcore-${QT5_PV}*
-	flite? (
-		>=app-accessibility/flite-2[alsa?]
-		=dev-qt/qtmultimedia-${QT5_PV}*[alsa?]
-		alsa? ( media-libs/alsa-lib )
-	)
-"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	qt_use_disable_config flite flite \
-		src/plugins/tts/tts.pro
-
-	qt_use_disable_config alsa flite_alsa \
-		src/plugins/tts/flite/flite.pro
-
-	qt5-build_src_prepare
-}
diff --git a/dev-qt/qtsql/Manifest b/dev-qt/qtsql/Manifest
index 202cb637372b..9527a93983de 100644
--- a/dev-qt/qtsql/Manifest
+++ b/dev-qt/qtsql/Manifest
@@ -1,9 +1,5 @@
-DIST qtbase-5.15-gentoo-patchset-2.tar.xz 3844 BLAKE2B 6dcb69398cf8a6b1be737e8c7bf1041529c4e704ca892cef10ba3bc5ce435c903607b64e981cf8aa12c785b3e423aa1d52bce1f67ec1bd8dbb1421dfb6f62700 SHA512 b7fd7e17bcab2f9803c7bfc0473082ee4640299c23ce8da943ef80ed181e880ebc9157bcebde28077e80e6f907aa14a59c42416b3e32f49baebd54fbe5a37497
 DIST qtbase-5.15-gentoo-patchset-3.tar.xz 3856 BLAKE2B 0752426f9bc2dfa1ab2bc246b29f5d00305df05175a7801d7d5eddacfa46fcb605d9a317547edc01d3ef339f6effc2fcee7549cb7aecced37f0098166c70dbe2 SHA512 2515bea53232e76ca3e40bdaf1dd52fdf452052a2f40002ee91360d1fcceea3c5c2f5a8d2a3bfc0f9c2bacd61460a632c5b351accd73fd37b64985593219148e
-DIST qtbase-5.15.7-gentoo-kde-1.tar.xz 798056 BLAKE2B 3c7fefa65ab6de25c2c82261ad0f1371e32acd4bd4b3303f20a5ebf36d19690df94290d102c65e4941a6c51a5d5f2db0253bafca5ac85cf480f7434405cb2671 SHA512 20ab17220489009c98d7f783a02614507e157974c7cb16f47d50d3954ccd1cd065562effc393df6e07c9ba6ad8ccd4e6b3f0bf5b5b890183b8631b8b570bf064
 DIST qtbase-5.15.8-gentoo-kde-1.tar.xz 780764 BLAKE2B 6abb00127113595cbb0a0caf58eb6323423ca41cbde6262a63762aded12861b6c051c9548c9ce2d11ab073e8930c11b609c05579eba34d56201fb7187c78ee23 SHA512 8b59ba61e7364c78d5bf728b4d8c9bd0f8e1ed973f1a84cd40330b06195b246e052ec087067336ff5d4e80a12168a25e0bd47fd88d837c00f106d8cdeba0c016
-DIST qtbase-everywhere-opensource-src-5.15.7.tar.xz 50260196 BLAKE2B 69029a910af0e3bfe742b5870334406e03274b0677ef47f9c7c10f730ff031bae49bd21a686497215505b19a183ca395c275d8afefaaa903125297f8e693bb4d SHA512 316de71fba1d5dd91354155dcd0f77e1ce2a798f8296a8699a795ea5e86ad10b6e233299775a92e23328290f3e041240585947e89ee7bd39eb464c5f0ffec343
 DIST qtbase-everywhere-opensource-src-5.15.8.tar.xz 50259432 BLAKE2B cb1b790a384a5cad9a95fdc448e275d48a68c6ee2addf08b40f9963cc5762fd7ab15852dea8392dc76da39f1565c1e23ddb5875c280f0177e802082f4b4f7f2b SHA512 29e8877bafdbc908072209f1b27a5040b022e2b71f17f4ab4cecd570adeae21597f9af7f1d38758760f3cb30376eeb15c5f066bf02c6e9a9e3a4d07f967046ce
-EBUILD qtsql-5.15.7.ebuild 1260 BLAKE2B 2aaa838f9f1d96d54f9c56fc159a989724fca732e452f3f1410e6301ffe3482b2ffcb5368cc2e7822b0946933ecc6eda124783632079f4d2c38e3346cd01802e SHA512 d6b89670e6d392f409797d447edbd855fa53c2ecd178f22e0f4b7364ab4ea609c3aaff2331491a3df77ea520257460df460ba0de07f231ee1c94bd866bd75dfc
 EBUILD qtsql-5.15.8.ebuild 1260 BLAKE2B ab11a2826f1b72ed2f025844b610077093d8c58cf23424b151d996cbdd2f3e166323155f769c2f1d9de152a4b8c3a4e9679e14907e0480328af5424a78b7b0c1 SHA512 17d08dd34218396024ecd09540cb2ccdf2d92008b04a9143000f47f02aa56d0ca7652a3a431cfb43c5fda88c3305eca9580b749e5876532d077183463de0801c
 MISC metadata.xml 482 BLAKE2B 651a49dc4a07f5e5a9c21990868e666d98acdea7d7b0b2c0e4c98eafc3da72c803d380e4abda30f33250f7bbd7654df713833ccdddcb975cbad6f92e488f643b SHA512 192c670abd7da29645513bf1d9297d942efdc49f5cf170861e7689fda47f51daa47f10c7c81c3b045366e0259179c6839ff7747197c9d792e8d0fd1a5818973e
diff --git a/dev-qt/qtsql/qtsql-5.15.7.ebuild b/dev-qt/qtsql/qtsql-5.15.7.ebuild
deleted file mode 100644
index 398b6399049c..000000000000
--- a/dev-qt/qtsql/qtsql-5.15.7.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-if [[ ${PV} != *9999* ]]; then
-	QT5_KDEPATCHSET_REV=1
-	KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86"
-fi
-
-QT5_MODULE="qtbase"
-inherit qt5-build
-
-DESCRIPTION="SQL abstraction library for the Qt5 framework"
-
-SLOT=5/${QT5_PV} # bug 639140
-IUSE="freetds mysql oci8 odbc postgres +sqlite"
-REQUIRED_USE="
-	|| ( freetds mysql oci8 odbc postgres sqlite )
-"
-
-DEPEND="
-	=dev-qt/qtcore-${QT5_PV}*:5=
-	freetds? ( dev-db/freetds )
-	mysql? ( dev-db/mysql-connector-c:= )
-	oci8? ( dev-db/oracle-instantclient:=[sdk] )
-	odbc? ( dev-db/unixODBC )
-	postgres? ( dev-db/postgresql:* )
-	sqlite? ( dev-db/sqlite:3 )
-"
-RDEPEND="${DEPEND}"
-
-QT5_TARGET_SUBDIRS=(
-	src/sql
-	src/plugins/sqldrivers
-)
-
-QT5_GENTOO_PRIVATE_CONFIG=(
-	:sql
-)
-
-src_configure() {
-	local myconf=(
-		$(qt_use freetds  sql-tds    plugin)
-		$(qt_use mysql    sql-mysql  plugin)
-		$(qt_use oci8     sql-oci    plugin)
-		$(qt_use odbc     sql-odbc   plugin)
-		$(qt_use postgres sql-psql   plugin)
-		$(qt_use sqlite   sql-sqlite plugin)
-		$(usev sqlite -system-sqlite)
-	)
-
-	use oci8 && myconf+=("-I${ORACLE_HOME}/include" "-L${ORACLE_HOME}/$(get_libdir)")
-
-	qt5-build_src_configure
-}
diff --git a/dev-qt/qtsvg/Manifest b/dev-qt/qtsvg/Manifest
index 4fe48991b288..1bec955c8a98 100644
--- a/dev-qt/qtsvg/Manifest
+++ b/dev-qt/qtsvg/Manifest
@@ -1,10 +1,7 @@
-DIST qtsvg-5.15.7-gentoo-kde-1.tar.xz 6056 BLAKE2B e6816824a2aea5c9e38d151c7400cb232e0882eb88191e75164d731521b1f30cc90cb614fd8483e94345dd6b518b305cb47dc94ddc6a62626b63b358f726c40a SHA512 79b9497f707102a2e83dccc3e61bcf1386390c18ed715109a7d6f9d4a94b10635224b9bee8d5e558e5e629bdb28601e018ffe126aa6032b05951fec54d5ba4be
 DIST qtsvg-5.15.8-gentoo-kde-1.tar.xz 4944 BLAKE2B c111addb333f09c32e247d63587cb90fa1b0f85fc26528d4e41b3bd5175715d775df422a2a2b8ae4f6ce2cf354212c48abf8e8c5831b01f66d9afb463d7cef07 SHA512 e3e08d6aa6fa57d4a521e84aac22611a4faab65d2609c7982ae5fd2da89a10a77a90049447168bb423030de9e41c3ecbd5fdc52cb3ecf60ba66d83372cf2d306
-DIST qtsvg-everywhere-opensource-src-5.15.7.tar.xz 1889560 BLAKE2B a2b3cb3d04d0c521f3937781d8e4b7905f9238d190f7481b90839701c3540d3738d2f6675ffd86d81212e7bc5e9c82cdba6f2a19c8a2b339469a1078580d67a3 SHA512 56f3e4518be16f8f1a189e3fe4f3c93905546690e1be52d16e3d0f87000f692119b41cf3fd5bf1584d80bc69855726c9fd16f6dd5b601b57bf60c1afe9420116
 DIST qtsvg-everywhere-opensource-src-5.15.8.tar.xz 1888824 BLAKE2B a412b271bcf70407bec4eeb0e6ae2f5df716b7efc8ac3142e12a43209a92199bdf798288e39dcc05627ae043b10896b4bceaaebe1362da8d2f6d147073c9797a SHA512 a110a815e7399fc96b0197b96e9c6dec289b9a2c38393711ccfc536c087791009f8452e222f9364b5b133930fa4dea77d7bea2f250511c0511a1a76aa511dcda
 DIST qtsvg-everywhere-src-6.4.0.tar.xz 1726036 BLAKE2B b18473cfef70b159ae40942bc88103a082f6e6e05b7e3e4b1cb310702123be0f4f9cc2f052ebed09904069b586f46adce3116480cb5ee3abbede5bed41a763c4 SHA512 f3a6b3bda1c0a3395528f99b5f7b9647a19aeeda0f97dc96bfb551b9c134a50166d1d58d7d63a411a84bcb482580c6907b2c231d570794a482f42126cec9dd89
 DIST qtsvg-everywhere-src-6.4.2.tar.xz 1726708 BLAKE2B 1194352d1956b5ad8817105f03a68d263466487e821a9e7741491c67eefeb215bcfacefec51f654fde747e8d534a398b248fc0c36638a629626fcdc6ca3feff6 SHA512 9b9de3f19a6c98d61ec1b4ba1883aada3b57db8e2ce56a493b6d7c639ed49a43f51c16b11f65cf8ee7ba8c8f4c61e1eedebb99c8645acfcc934048f2eb76fe64
-EBUILD qtsvg-5.15.7.ebuild 496 BLAKE2B 44be46e2de2089c4ec94a00bfa47c00cc5d289a2c1e893c641bb5c2eb74db311952ce063321a35a6880231a4510903246208778abeaf77bda7e5ddbf13bc13e2 SHA512 ce189dc5ad275e6f93e639e7135ecd43c46e8be9dd3ed500d876125cbb29d35ea6ce18f1745e79e97d9eac2952dfe0206d724753dbcad0a704a598b16311d395
 EBUILD qtsvg-5.15.8.ebuild 496 BLAKE2B a9a417892487c84120f966f2bd06d84f7348e069ec3917aca6c88c33345109bf127802e01fae1da95a5945fc7e44db8f3a2f3b7f6b699fcfbcc3367b082f2563 SHA512 b94101d98d128f952a0bdc6b14e04c76e492d6925e06d6c0d97d077f908196d944169a196a28e4aac384c261c93a6b5fa2dd94646c4186b392fd1ec57f885e15
 EBUILD qtsvg-6.4.0.ebuild 342 BLAKE2B 09c0c3a8014981af4f44da56fc0b5f0d79924f21ae7188f32c59905e0561e071bc403945aaa88d37317ead2d788bfb9a2b58c46dae88f56fe0c2f3f0802b5207 SHA512 432c136765f20e6f2f418e5cb851d2d77fac85d20dda139f59dc088b552f7b89e7d518d506b17ea2094e084445ebf7b27b2a4eed4243d0ce308e3787f90333f9
 EBUILD qtsvg-6.4.2.ebuild 342 BLAKE2B 9e9ecaf7a291e80c41e1698e0e8cb4798422e17f95ca4bef5e9523c81db42fd2cd971f193d12b999401f96c8293b54fe8b8d5bbf33f636b3d31e78c3e6b65c92 SHA512 f9f43ca3a2b52c25bbc6ed1438fcbe8458e3b47cda7a08c060cb5dd27315dce0434aa6d542ff58070de2ede5f703f2d951f60bb35827638a5ff52ffc4e2c69fe
diff --git a/dev-qt/qtsvg/qtsvg-5.15.7.ebuild b/dev-qt/qtsvg/qtsvg-5.15.7.ebuild
deleted file mode 100644
index 318bc230ed75..000000000000
--- a/dev-qt/qtsvg/qtsvg-5.15.7.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-if [[ ${PV} != *9999* ]]; then
-	QT5_KDEPATCHSET_REV=1
-	KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86"
-fi
-
-inherit qt5-build
-
-DESCRIPTION="SVG rendering library for the Qt5 framework"
-
-IUSE=""
-
-RDEPEND="
-	=dev-qt/qtcore-${QT5_PV}*
-	=dev-qt/qtgui-${QT5_PV}*
-	=dev-qt/qtwidgets-${QT5_PV}*
-	sys-libs/zlib:=
-"
-DEPEND="${RDEPEND}
-	test? ( =dev-qt/qtxml-${QT5_PV}* )
-"
diff --git a/dev-qt/qttest/Manifest b/dev-qt/qttest/Manifest
index c4b53546d31b..b88f26674c3a 100644
--- a/dev-qt/qttest/Manifest
+++ b/dev-qt/qttest/Manifest
@@ -1,9 +1,5 @@
-DIST qtbase-5.15-gentoo-patchset-2.tar.xz 3844 BLAKE2B 6dcb69398cf8a6b1be737e8c7bf1041529c4e704ca892cef10ba3bc5ce435c903607b64e981cf8aa12c785b3e423aa1d52bce1f67ec1bd8dbb1421dfb6f62700 SHA512 b7fd7e17bcab2f9803c7bfc0473082ee4640299c23ce8da943ef80ed181e880ebc9157bcebde28077e80e6f907aa14a59c42416b3e32f49baebd54fbe5a37497
 DIST qtbase-5.15-gentoo-patchset-3.tar.xz 3856 BLAKE2B 0752426f9bc2dfa1ab2bc246b29f5d00305df05175a7801d7d5eddacfa46fcb605d9a317547edc01d3ef339f6effc2fcee7549cb7aecced37f0098166c70dbe2 SHA512 2515bea53232e76ca3e40bdaf1dd52fdf452052a2f40002ee91360d1fcceea3c5c2f5a8d2a3bfc0f9c2bacd61460a632c5b351accd73fd37b64985593219148e
-DIST qtbase-5.15.7-gentoo-kde-1.tar.xz 798056 BLAKE2B 3c7fefa65ab6de25c2c82261ad0f1371e32acd4bd4b3303f20a5ebf36d19690df94290d102c65e4941a6c51a5d5f2db0253bafca5ac85cf480f7434405cb2671 SHA512 20ab17220489009c98d7f783a02614507e157974c7cb16f47d50d3954ccd1cd065562effc393df6e07c9ba6ad8ccd4e6b3f0bf5b5b890183b8631b8b570bf064
 DIST qtbase-5.15.8-gentoo-kde-1.tar.xz 780764 BLAKE2B 6abb00127113595cbb0a0caf58eb6323423ca41cbde6262a63762aded12861b6c051c9548c9ce2d11ab073e8930c11b609c05579eba34d56201fb7187c78ee23 SHA512 8b59ba61e7364c78d5bf728b4d8c9bd0f8e1ed973f1a84cd40330b06195b246e052ec087067336ff5d4e80a12168a25e0bd47fd88d837c00f106d8cdeba0c016
-DIST qtbase-everywhere-opensource-src-5.15.7.tar.xz 50260196 BLAKE2B 69029a910af0e3bfe742b5870334406e03274b0677ef47f9c7c10f730ff031bae49bd21a686497215505b19a183ca395c275d8afefaaa903125297f8e693bb4d SHA512 316de71fba1d5dd91354155dcd0f77e1ce2a798f8296a8699a795ea5e86ad10b6e233299775a92e23328290f3e041240585947e89ee7bd39eb464c5f0ffec343
 DIST qtbase-everywhere-opensource-src-5.15.8.tar.xz 50259432 BLAKE2B cb1b790a384a5cad9a95fdc448e275d48a68c6ee2addf08b40f9963cc5762fd7ab15852dea8392dc76da39f1565c1e23ddb5875c280f0177e802082f4b4f7f2b SHA512 29e8877bafdbc908072209f1b27a5040b022e2b71f17f4ab4cecd570adeae21597f9af7f1d38758760f3cb30376eeb15c5f066bf02c6e9a9e3a4d07f967046ce
-EBUILD qttest-5.15.7.ebuild 575 BLAKE2B 75155f5aa58707a96cbcbc6262e75d1f1e18c633bad1ee4487a672c08e627142cff61458e90097fc556e777647ab904079b1510d95a56d97f40c2d6fa7e4387b SHA512 4e1a717383f245968aed1855cfc8c9fba8dbda30c8537db3881d260ec6b700230861cc6f2c4c14e0c9985934f3dc87a3cebb7df6bccf49e5503b1738e8a45442
 EBUILD qttest-5.15.8.ebuild 575 BLAKE2B 4ad78b66a4202969b64b267105eaa1ed8a8485e1f4b506c0ef29e6034cfa096c21c9390bd4202064e75375f7a100856c0ac50ee6ef8e8def65826f3e4395b60b SHA512 61b2e64fbb2aab878415f433ece090af1be043ced5513f9e31d9827ecc77ddaf09767bb1fabadab4d70d51d3d16b2ba06dd7a019865aae00ee761a5210cc9eda
 MISC metadata.xml 482 BLAKE2B 651a49dc4a07f5e5a9c21990868e666d98acdea7d7b0b2c0e4c98eafc3da72c803d380e4abda30f33250f7bbd7654df713833ccdddcb975cbad6f92e488f643b SHA512 192c670abd7da29645513bf1d9297d942efdc49f5cf170861e7689fda47f51daa47f10c7c81c3b045366e0259179c6839ff7747197c9d792e8d0fd1a5818973e
diff --git a/dev-qt/qttest/qttest-5.15.7.ebuild b/dev-qt/qttest/qttest-5.15.7.ebuild
deleted file mode 100644
index bfe5cdb99b47..000000000000
--- a/dev-qt/qttest/qttest-5.15.7.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-if [[ ${PV} != *9999* ]]; then
-	QT5_KDEPATCHSET_REV=1
-	KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86"
-fi
-
-QT5_MODULE="qtbase"
-VIRTUALX_REQUIRED="test"
-inherit qt5-build
-
-DESCRIPTION="Unit testing library for the Qt5 framework"
-
-IUSE=""
-
-RDEPEND="=dev-qt/qtcore-${QT5_PV}*:5="
-DEPEND="${RDEPEND}
-	test? (
-		=dev-qt/qtgui-${QT5_PV}*
-		=dev-qt/qtxml-${QT5_PV}*
-	)
-"
-
-QT5_TARGET_SUBDIRS=(
-	src/testlib
-)
-
-QT5_GENTOO_PRIVATE_CONFIG=(
-	:testlib
-)
diff --git a/dev-qt/qttranslations/Manifest b/dev-qt/qttranslations/Manifest
index bb363db5ea99..52def4851f58 100644
--- a/dev-qt/qttranslations/Manifest
+++ b/dev-qt/qttranslations/Manifest
@@ -1,5 +1,3 @@
-DIST qttranslations-everywhere-opensource-src-5.15.7.tar.xz 1634636 BLAKE2B a95b1cb5718f2274f0c85648af8b34490ffc7fda25d9ec75ad01ebcb17749572fcb75412874b9477e173533179c637deb9a338cc9fc24305cc61abed1964cebb SHA512 0a0db22f4035b2f8421c8d0fcc4587e2511c883f90624efae56a7481eb0f9ebde0fd4e678ff95e628ed30335a59a38b47e524e7c3dee9f7751fea7003953b4a3
 DIST qttranslations-everywhere-opensource-src-5.15.8.tar.xz 1634516 BLAKE2B af00a2147ff44629e259eb4e93140268a82117c996ea49ef8ab90cce3d7277877ca58ab9e679abaa136f054ec21a75d8c2e86a83729b6df38b95cd06df662fbc SHA512 384767c1726db54935c982452b03002e209f4b090b3374c725617a3f5f3af70e8d895b7826039fa04f537fd4e0491a143190fb580298c74edaad0d72b8545917
-EBUILD qttranslations-5.15.7.ebuild 379 BLAKE2B 80f34e5be6f6390b9fde709ee00dec42ed5b78d28c90ecef7db7deaca968080dc850330a6edb960792b4a3242cab31359172c78e8edd2e12453cc51c6a7f28dd SHA512 b23d29e1af7d12506b68e4d352593d31f4975c3e707150b250e9ff7f55fe19f477284764f969df518640936be2da09aea9a6f0b75f88afddf22116097692c78b
 EBUILD qttranslations-5.15.8.ebuild 379 BLAKE2B f7a1f63d58d4a09bdf92cf91f2ec0c546a8626cddc7bcc9d55c70eab8db038d3ae6912e0909f660099af7d4998e99353d0eda9d98da253f7021b8008c1d30b41 SHA512 bf741516c6b8ad79fac401a29befc1004926ce203460b0c5f261744c70db5bcc0047b9af8f36153668b1680fefcbd80f50840623d5379be43ce059e1373c4506
 MISC metadata.xml 482 BLAKE2B 651a49dc4a07f5e5a9c21990868e666d98acdea7d7b0b2c0e4c98eafc3da72c803d380e4abda30f33250f7bbd7654df713833ccdddcb975cbad6f92e488f643b SHA512 192c670abd7da29645513bf1d9297d942efdc49f5cf170861e7689fda47f51daa47f10c7c81c3b045366e0259179c6839ff7747197c9d792e8d0fd1a5818973e
diff --git a/dev-qt/qttranslations/qttranslations-5.15.7.ebuild b/dev-qt/qttranslations/qttranslations-5.15.7.ebuild
deleted file mode 100644
index c409d273d836..000000000000
--- a/dev-qt/qttranslations/qttranslations-5.15.7.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-if [[ ${PV} != *9999* ]]; then
-	KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86"
-fi
-
-inherit qt5-build
-
-DESCRIPTION="Translation files for the Qt5 framework"
-
-IUSE=""
-
-DEPEND="=dev-qt/qtcore-${QT5_PV}*"
-BDEPEND="=dev-qt/linguist-tools-${QT5_PV}*"
diff --git a/dev-qt/qtvirtualkeyboard/Manifest b/dev-qt/qtvirtualkeyboard/Manifest
index 6639c39a5379..625080cdf7f4 100644
--- a/dev-qt/qtvirtualkeyboard/Manifest
+++ b/dev-qt/qtvirtualkeyboard/Manifest
@@ -1,5 +1,3 @@
-DIST qtvirtualkeyboard-everywhere-opensource-src-5.15.7.tar.xz 10965436 BLAKE2B 9055512cd4c726c97d39c93665eb44ed7f90d9f35aee203ff50554e58ea347b852b118ffb5fb41b8636f70f004a033a593d229aa391a6c53e8a816db8fd4e1c4 SHA512 c9dba2ea41850693217617b881e6ff85765e328cf37bf020012f4852c768266713961376706722385cbb39167be62df34f7531c189d9638d9024c9865fd339a1
 DIST qtvirtualkeyboard-everywhere-opensource-src-5.15.8.tar.xz 10965644 BLAKE2B bf2298bef0d240ff94f303bd9b5b1764473ca0aaa0c5f0cc1566e1b2830d6c07bf059b58fc9f02a8c9f503b143b453ca50f2dfdff794f9e94db7e112a95717eb SHA512 b2f4dddf67556d5d83ee5d0587909ebc745daa9b161b2a12e7e2135b37229b35c7ee2e3a30296f805e5e83648828c973aa2e62e130f2bac739fd228cea38a327
-EBUILD qtvirtualkeyboard-5.15.7.ebuild 1215 BLAKE2B 226396b322a3c046d2850e2db2c9c7a4ff99fb43ac05028852e64c3bf6dbe73010331dc100d3f7d8ba25bfb64813186e62d2fa3af2858a4bb893a7f83c11cfc3 SHA512 901e4484128ae593f5bf44d7f205cfee31ccf5046a9c46f780015839ad814b34b1f2ac1b0373c6dac091fa39f0ab983d5ce883224cc28a1cd33b4d738dca5288
 EBUILD qtvirtualkeyboard-5.15.8.ebuild 1215 BLAKE2B 5efc9c8205dd9bb16aeee41108fabdb91b0c279e1dd4a6438f59db0396ceee80b567cf2d26eaba12f2ecbf4d864073aa2e2541e21296d6137587a530e93c014f SHA512 dc3502caa1b1a6170ea77f54d44133794ebd226b46ff0eca1735eece767c5b4f291084114c556eb8064fb040f1abe77fecfba70ad9e9526de09dee5c4de1a36e
 MISC metadata.xml 580 BLAKE2B 18223136bcc07b46ab272ff282bcdce54dad6e6d97fe39b5431850a8960992a16eed32a580980748368ff120ea50ada55be823ba1e16950856462979835562fb SHA512 e865c0a030aeffbf270300806f99d1b2ff4ca148b3e1a3a901df25d1193e84d63a99b643da033a469dfbdbc99e559f71addc7671487c92d94e9019e742977020
diff --git a/dev-qt/qtvirtualkeyboard/qtvirtualkeyboard-5.15.7.ebuild b/dev-qt/qtvirtualkeyboard/qtvirtualkeyboard-5.15.7.ebuild
deleted file mode 100644
index 059567962a29..000000000000
--- a/dev-qt/qtvirtualkeyboard/qtvirtualkeyboard-5.15.7.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-if [[ ${PV} != *9999* ]]; then
-	KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86"
-fi
-
-inherit qt5-build
-
-DESCRIPTION="Customizable input framework and virtual keyboard for Qt"
-
-# TODO: unbundle libraries for more layouts
-IUSE="handwriting +spell +X"
-
-DEPEND="
-	=dev-qt/qtcore-${QT5_PV}*
-	=dev-qt/qtdeclarative-${QT5_PV}*
-	=dev-qt/qtgui-${QT5_PV}*
-	=dev-qt/qtsvg-${QT5_PV}*
-	spell? ( app-text/hunspell:= )
-	X? ( x11-libs/libxcb:= )
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	local myqmakeargs=(
-		$(usev handwriting CONFIG+=lipi-toolkit)
-		$(usev !spell CONFIG+=disable-hunspell)
-		$(usev !X CONFIG+=disable-desktop)
-		CONFIG+="lang-ar_AR lang-bg_BG lang-cs_CZ lang-da_DK lang-de_DE \
-			lang-el_GR lang-en_GB lang-en_US lang-es_ES lang-es_MX \
-			lang-et_EE lang-fa_FA lang-fi_FI lang-fr_CA lang-fr_FR \
-			lang-he_IL lang-hi_IN lang-hr_HR lang-hu_HU lang-id_ID \
-			lang-it_IT lang-ms_MY lang-nb_NO lang-nl_NL lang-pl_PL \
-			lang-pt_BR lang-pt_PT lang-ro_RO lang-ru_RU lang-sk_SK \
-			lang-sl_SI lang-sq_AL lang-sr_SP lang-sv_SE lang-tr_TR \
-			lang-uk_UA lang-vi_VN"
-	)
-	qt5-build_src_configure
-}
diff --git a/dev-qt/qtwayland/Manifest b/dev-qt/qtwayland/Manifest
index 5fe49e81c638..249d5bb16c81 100644
--- a/dev-qt/qtwayland/Manifest
+++ b/dev-qt/qtwayland/Manifest
@@ -1,14 +1,7 @@
-DIST qtwayland-5.15.7-gentoo-kde-1.tar.xz 42912 BLAKE2B e616cdb5aef13b6350658de2d6922109b7d827536afce98d67f7b1936c91de7521a6b4f8997926334cb77e1009fd4e27e4e0aef5c78cf9ba5a6c964797d2b1e1 SHA512 23be3f4e1612a557f1eb0c17cb158897b48910e336765b6c2e06ed892b67f368dfd4ba916373bbed9d3650a1e1f39b3768db39632b4763ad103515b32a86c0c2
-DIST qtwayland-5.15.7-gentoo-kde-2.tar.xz 43720 BLAKE2B b80db3b4113ea2b80709595a7762d185576f9017e6dc089c99613cb03aad569e53bee3ca083b9ec9866c6835aee5f35cf3240cd3a681a1e038ae0fa18f62bd03 SHA512 947e2862524f83ca7f4ca6e5eee16162642cf510929ef9dad642408fe023d9b27fe88ee21cf1bd498c318ae39a278d02ae85c8aae0a552f30823a9a244250dc4
-DIST qtwayland-5.15.7-gentoo-kde-3.tar.xz 44552 BLAKE2B bbe009f17546d975a128e68a604da853d74ce840ead2952ee465a7b4a43f8e2c6392079e73da14b184119e0f47f10293628a6fcf4115b4b19879cce592c01a1f SHA512 ed49d4cf724afd9819ffcda9a0c25aba96f422d72d3e172b882683cf650a01966a032ae1241e3bc7258717515ddc6f9b240003ec8886d5a01b2cf4f1d0c856b6
 DIST qtwayland-5.15.8-gentoo-kde-1.tar.xz 44488 BLAKE2B bfdd7c2959eb99e115eaf01d617464359a549513958c997dd8b1a86bda755dec44d24b6619650bf385b2894a2001a712a344b093fc94e8cde40ac9c20323903e SHA512 3cd52fc78f2451c38c6d2b0dd958895016a94b255e38ff3909f40e4bcb1ef760332fde4cffd32ab11e868ce0afe6629f325613c88b8fd85ca28f1583194ce229
-DIST qtwayland-everywhere-opensource-src-5.15.7.tar.xz 568024 BLAKE2B ed2031ea40c5618c2390865807ef33eae42a3231098f1959f0a7e9e3b8e8d70f4461647aaa11afeade0528aa4d14049b03cc566552a13dd4d1b5773ec3d16061 SHA512 a004a82ec2b4f132d597ae3c82b4079671ecdfeed09c455073e552197da2b9f921c85bef2b40be76e87e61d5ec1e7ab39ed232be26b27d9aed6e938c659965a3
 DIST qtwayland-everywhere-opensource-src-5.15.8.tar.xz 568268 BLAKE2B b4e982015e25104b3270b48a180b5726ba85e83fd9616422422d8729dc09bc94bbeecfe2096e388eadb0930e4abfdd3b0349eba2bd1d8f742f0c74b5e72aeac5 SHA512 6c6e9dc20f98d71abd7dba54ff278bf4535e70f86bfc4e6dd46c1af7c87777f045a6aba02bba3eb786f7cf383da5fb72b03e1e6ec636c8be0cde0e4e5b7b5b2d
 DIST qtwayland-everywhere-src-6.4.0.tar.xz 836088 BLAKE2B 3efc506e1a0bc63182397d483bf352e21d39c75a7360ee3fe839527451950875748aea5cf62207ffef38b845a12c2bbbefde918d14333d1b194a4ea39b82670f SHA512 745fcc84c936c3f2fa7382291b5013679f9e57d6c680f1d352b0a132ba7cbaaea1495211f8fc4f1af85a81c711794987e4e05284d3ac06c94e92e9b601dae924
 DIST qtwayland-everywhere-src-6.4.2.tar.xz 836720 BLAKE2B d8a6b84712081097775f083f3887c18eb001fd2beba32b2abc930ec3b932f6f19b347fe2fde3b98f35c1e7e31661974b13468fb176e73bdf557a330c80d847fd SHA512 29d3f3e7fade666bcd3145106f1d782122ac3fcf94811d25917c9f45af0dc8cddb3c2149545344d91e86f86490029555758ed2e180f241703251c22c7ec15122
-EBUILD qtwayland-5.15.7-r1.ebuild 1008 BLAKE2B 6c530af0c321eec7d3ebabc7304bb5803b97983d0bd6b7ec032f09b91ad2456bd7300e505c931870e0b3449ed4c5afa0bf8eb0ea45ad2cd3529265dc1d722488 SHA512 a4f711eb5c1cc2c39182826abecffb3d279b61ff82eb92c2d5c9f10c5c28efad05688a0a9b771d48e147801082cfe67dbe5522cb7b5b2bf28caedbcfbce01e52
-EBUILD qtwayland-5.15.7-r2.ebuild 1008 BLAKE2B 9ca1e394a5b76939dc6d2e4d3d0e56b6f64e7ee126dc7af909bfb36b22b26b361f1d812a9e577af17588cb90b17c8e7ae2bb5a5f716b09a6a69df5da1f54befe SHA512 6247eeab4684891212098d51b84a8ef1df693070daa6b2c53679cbccc6bed2895dbd64b90d84f82ee7c6350a6e6e214b99b1d9293599b2e85d75fb0760369628
-EBUILD qtwayland-5.15.7.ebuild 1002 BLAKE2B 7a4945b847da1f25bcb4f6c1deced1caced106e08ef96a26e54601448a839b4e14dac349cc6594b977bc5673520a5578cbb108e962a737f7d72eb15eaf19f08c SHA512 cb5bc1170be1a8e27b61805155749e627bd93f09402b23400622c8f43ee8fd3b5007e9bf5fb93682809ee049f93f8714dd2c27e0c05921c35cb7a26a5f0785de
 EBUILD qtwayland-5.15.8.ebuild 1002 BLAKE2B 4a77721f71912a69ac8da399cf959dccbf1141a7ba4f2a10e64a5bbfac97be16925a271767a227d84756aa256d0a419a4575a65c98ab402c5fd8bba3991868b6 SHA512 4591113cdcb1cc58cd2740d555243b4ffea4c507a2ef3ce3a06c2982dec8da850256d78347a1843b16455d313f4175d421451f93b6fd00bf387be1f86a01ea7b
 EBUILD qtwayland-6.4.0.ebuild 438 BLAKE2B ecb43b4035f97bde672b22faf6a1aa7a5fd0860db6bf871b4055c97b1c199840e2ba84b6720a69a3a2ff5bc8222abaead3a6ba53c282e83b1c3c114cd075115a SHA512 c9512430e1085f3e60a4fcab21036ac8aa393eb442ec2ebcc7f4161958316a9131bddbdb422fb2018f190ec99d5d51d2ba02a28503c220cc5e2c16e904445190
 EBUILD qtwayland-6.4.2.ebuild 438 BLAKE2B b419dc79923c1f81cf59b47d3f95cf43372260430cd16593089229011756c78663d062ce5b23464df27753427257bcea89ed745c0f8f0a4a1b7e7328dad60441 SHA512 a6d1cd0314a2dbcd74e3a4cc3ba2cba7b4145331c0b7617fe387cbeea4d9cb0643ab20d897df6953a21274771d3e64a6e99dce79bf41d33383508fb7b037c32e
diff --git a/dev-qt/qtwayland/qtwayland-5.15.7-r1.ebuild b/dev-qt/qtwayland/qtwayland-5.15.7-r1.ebuild
deleted file mode 100644
index 70185ea5e611..000000000000
--- a/dev-qt/qtwayland/qtwayland-5.15.7-r1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-if [[ ${PV} != *9999* ]]; then
-	QT5_KDEPATCHSET_REV=2
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
-fi
-
-inherit qt5-build
-
-DESCRIPTION="Wayland platform plugin for Qt"
-
-SLOT=5/${QT5_PV} # bug 815646
-IUSE="vulkan X"
-
-DEPEND="
-	dev-libs/wayland
-	=dev-qt/qtcore-${QT5_PV}*:5=
-	=dev-qt/qtdeclarative-${QT5_PV}*:5=
-	=dev-qt/qtgui-${QT5_PV}*:5=[egl,libinput,vulkan=,X?]
-	media-libs/libglvnd
-	vulkan? ( dev-util/vulkan-headers )
-	X? (
-		=dev-qt/qtgui-${QT5_PV}*[-gles2-only]
-		x11-libs/libX11
-		x11-libs/libXcomposite
-	)
-"
-RDEPEND="${DEPEND}"
-BDEPEND="dev-util/wayland-scanner"
-
-src_configure() {
-	local myqmakeargs=(
-		--
-		$(qt_use vulkan feature-wayland-vulkan-server-buffer)
-		$(qt_use X feature-xcomposite-egl)
-		$(qt_use X feature-xcomposite-glx)
-	)
-	qt5-build_src_configure
-}
-
-src_install() {
-	qt5-build_src_install
-	rm "${D}${QT5_BINDIR}"/qtwaylandscanner || die
-}
diff --git a/dev-qt/qtwayland/qtwayland-5.15.7-r2.ebuild b/dev-qt/qtwayland/qtwayland-5.15.7-r2.ebuild
deleted file mode 100644
index 54a7ae528c62..000000000000
--- a/dev-qt/qtwayland/qtwayland-5.15.7-r2.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-if [[ ${PV} != *9999* ]]; then
-	QT5_KDEPATCHSET_REV=3
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
-fi
-
-inherit qt5-build
-
-DESCRIPTION="Wayland platform plugin for Qt"
-
-SLOT=5/${QT5_PV} # bug 815646
-IUSE="vulkan X"
-
-DEPEND="
-	dev-libs/wayland
-	=dev-qt/qtcore-${QT5_PV}*:5=
-	=dev-qt/qtdeclarative-${QT5_PV}*:5=
-	=dev-qt/qtgui-${QT5_PV}*:5=[egl,libinput,vulkan=,X?]
-	media-libs/libglvnd
-	vulkan? ( dev-util/vulkan-headers )
-	X? (
-		=dev-qt/qtgui-${QT5_PV}*[-gles2-only]
-		x11-libs/libX11
-		x11-libs/libXcomposite
-	)
-"
-RDEPEND="${DEPEND}"
-BDEPEND="dev-util/wayland-scanner"
-
-src_configure() {
-	local myqmakeargs=(
-		--
-		$(qt_use vulkan feature-wayland-vulkan-server-buffer)
-		$(qt_use X feature-xcomposite-egl)
-		$(qt_use X feature-xcomposite-glx)
-	)
-	qt5-build_src_configure
-}
-
-src_install() {
-	qt5-build_src_install
-	rm "${D}${QT5_BINDIR}"/qtwaylandscanner || die
-}
diff --git a/dev-qt/qtwayland/qtwayland-5.15.7.ebuild b/dev-qt/qtwayland/qtwayland-5.15.7.ebuild
deleted file mode 100644
index c5b4b0acdba2..000000000000
--- a/dev-qt/qtwayland/qtwayland-5.15.7.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-if [[ ${PV} != *9999* ]]; then
-	QT5_KDEPATCHSET_REV=1
-	KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86"
-fi
-
-inherit qt5-build
-
-DESCRIPTION="Wayland platform plugin for Qt"
-
-SLOT=5/${QT5_PV} # bug 815646
-IUSE="vulkan X"
-
-DEPEND="
-	dev-libs/wayland
-	=dev-qt/qtcore-${QT5_PV}*:5=
-	=dev-qt/qtdeclarative-${QT5_PV}*:5=
-	=dev-qt/qtgui-${QT5_PV}*:5=[egl,libinput,vulkan=,X?]
-	media-libs/libglvnd
-	vulkan? ( dev-util/vulkan-headers )
-	X? (
-		=dev-qt/qtgui-${QT5_PV}*[-gles2-only]
-		x11-libs/libX11
-		x11-libs/libXcomposite
-	)
-"
-RDEPEND="${DEPEND}"
-BDEPEND="dev-util/wayland-scanner"
-
-src_configure() {
-	local myqmakeargs=(
-		--
-		$(qt_use vulkan feature-wayland-vulkan-server-buffer)
-		$(qt_use X feature-xcomposite-egl)
-		$(qt_use X feature-xcomposite-glx)
-	)
-	qt5-build_src_configure
-}
-
-src_install() {
-	qt5-build_src_install
-	rm "${D}${QT5_BINDIR}"/qtwaylandscanner || die
-}
diff --git a/dev-qt/qtwaylandscanner/Manifest b/dev-qt/qtwaylandscanner/Manifest
index 6fd8ca3cc3c9..2030cd79dd7a 100644
--- a/dev-qt/qtwaylandscanner/Manifest
+++ b/dev-qt/qtwaylandscanner/Manifest
@@ -1,5 +1,3 @@
-DIST qtwayland-everywhere-opensource-src-5.15.7.tar.xz 568024 BLAKE2B ed2031ea40c5618c2390865807ef33eae42a3231098f1959f0a7e9e3b8e8d70f4461647aaa11afeade0528aa4d14049b03cc566552a13dd4d1b5773ec3d16061 SHA512 a004a82ec2b4f132d597ae3c82b4079671ecdfeed09c455073e552197da2b9f921c85bef2b40be76e87e61d5ec1e7ab39ed232be26b27d9aed6e938c659965a3
 DIST qtwayland-everywhere-opensource-src-5.15.8.tar.xz 568268 BLAKE2B b4e982015e25104b3270b48a180b5726ba85e83fd9616422422d8729dc09bc94bbeecfe2096e388eadb0930e4abfdd3b0349eba2bd1d8f742f0c74b5e72aeac5 SHA512 6c6e9dc20f98d71abd7dba54ff278bf4535e70f86bfc4e6dd46c1af7c87777f045a6aba02bba3eb786f7cf383da5fb72b03e1e6ec636c8be0cde0e4e5b7b5b2d
-EBUILD qtwaylandscanner-5.15.7.ebuild 501 BLAKE2B 0ac3644489597447c10b522c4c0f3728cbbf2a3707a2693b3fbe49069a3631b758ec4e1852e47c191cb8f9da0dbb57be190af12c06b68c17e4e6df6e06005720 SHA512 2467890339340c370fd4d66f31ea21e4fb01328faf1fa4cbfaabd9b87f8aa5a06513614e91283f01df19dcedcdd76f3e686697b68c44730442b555efad8f6602
 EBUILD qtwaylandscanner-5.15.8.ebuild 501 BLAKE2B 35d756a902245e8169243b5784698968b8df3c7f6c4b56296cd7a740f0d79d34c4e821c65a002f1cb3086b73b71483e636e554227a4521e884bc8ab6b743b2bb SHA512 4f960ba2f7f569d8c02b7aaa1e0b75402b65bd68d23c9fe27ede4237d4c2dedb41cf635e1b2b05b40ae0feff912bdfcaf111c3aa951c55aa7216ed2ec168307f
 MISC metadata.xml 352 BLAKE2B 7354be163c38b0299856f17a85621782e367e3186e0cece5d55a29d4848ba95a7d0ebc4e1614b9ffa3de21bad70c7c7ecc86fd81a0cb83038c619a1e763fc211 SHA512 cc03c3e78ee03f9be941ce1b54ee4ffa5655c933d2cd4c2bcc252a447632ed0587d41c4d07b9e1738aed5526b4f0b934342cb99d196ba3b0f49b762bf1de7c7b
diff --git a/dev-qt/qtwaylandscanner/qtwaylandscanner-5.15.7.ebuild b/dev-qt/qtwaylandscanner/qtwaylandscanner-5.15.7.ebuild
deleted file mode 100644
index abdeb44b6b2f..000000000000
--- a/dev-qt/qtwaylandscanner/qtwaylandscanner-5.15.7.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-QT5_MODULE="qtwayland"
-inherit qt5-build
-
-DESCRIPTION="Tool that generates certain boilerplate C++ code from Wayland protocol xml spec"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86"
-fi
-
-DEPEND="=dev-qt/qtcore-${QT5_PV}*:5="
-RDEPEND="${DEPEND}
-	!<dev-qt/qtwayland-5.15.3:5
-"
-
-QT5_TARGET_SUBDIRS=(
-	src/qtwaylandscanner
-)
diff --git a/dev-qt/qtwebchannel/Manifest b/dev-qt/qtwebchannel/Manifest
index a81878ac30be..a3dd0623e3bc 100644
--- a/dev-qt/qtwebchannel/Manifest
+++ b/dev-qt/qtwebchannel/Manifest
@@ -1,10 +1,7 @@
-DIST qtwebchannel-5.15.7-gentoo-kde-1.tar.xz 5804 BLAKE2B c3641d01d677fbc667389aaf68584f45db9f904fcca877c15b861666f0343e0c0f26a0d9bcbff7c53910eb838014fe058d21d9a6c66c0ef47ca32cc637bb44b3 SHA512 fd2d6b407eee92617db2ddcc19db99adfb3d5b19619ec6908b48a6c3f9285032268aa4fc6b8ddc037b68459fcc476bca7919858dadd2aabed2d1d3bb8be31fc8
 DIST qtwebchannel-5.15.8-gentoo-kde-1.tar.xz 5800 BLAKE2B c10ff2974e4e6c30e268f0da752331871aa81bd5253c52c20a823e9556b358cb8e3e8bf33e220f32dd55c7ac1fe2cece879e2573bbaa1e0c196bf719f846246e SHA512 712382e78283c43ad2ef45f19951ed9bc27f9a76c1a3e5c163110289a2dbaca7853b24d910e0c3ed5c3a39cdeb055f89fd095fcd96c98549fcee9f1b762866d8
-DIST qtwebchannel-everywhere-opensource-src-5.15.7.tar.xz 210860 BLAKE2B 80eccee6b024132a4a8f88440037e8b42875ddecf3a351cdaed443d023183a5aa757b8e60589b55f344ae57b410c1ed366889b2be6915ecef7466dbc9f719ba5 SHA512 fe846db6c345bf13fe28b3541df36b6ad397d57fd382a9b2d3685d01f2c6da0cf51173b23416eebd9ab52d82e7af4c45b0305d50cd63d79adee061b5a63efd8f
 DIST qtwebchannel-everywhere-opensource-src-5.15.8.tar.xz 210788 BLAKE2B db577036db30d3334cf18f8e3e3c7d63ad0df2331fcf77f15e8f7f6c50470d29497098f5d13ef49d9cd5fb5c241297a45b864e698666c4246b6acfaef4a717ac SHA512 d607b74f6f433be874e42808259fdc6fa69e1ec754544e1f7d614b6a65ed266cdba76e0a7cd535d65045bc708045c8757c1b3826c7885bc08a787458b60ae1cc
 DIST qtwebchannel-everywhere-src-6.4.0.tar.xz 213096 BLAKE2B 04450f13d6af7996624c5c1e1f1b7f3c6a8ee64088086da3b237c1e1775ac90fad5a7a13ed1213d321f9703565c7ca42cf899dae675a616dd25fa6abad6e7f8a SHA512 5e668869646e9a4a115680004180948777c9cc2b4e6cc3afb4be74e298ec1e7338f61643ac1f46649d39f65e3f50de05d2b635d77bf211105e91dd0d5324fff6
 DIST qtwebchannel-everywhere-src-6.4.2.tar.xz 213124 BLAKE2B ddb51b69728624d88b6ba1952786a1797cc6b61544303d31d862042e87198a5cf0c02b6a5613c18a251b8e7597f34cb52729fdac0cb65c63e4f49c638ff6b333 SHA512 5cde582d77c55bdf4d69a31f04b293c267da00f6a18ab0d677ea1b9b6348cddca8fb9ad453128607f5dc191aeb5e685d8d8fbcade0affeb54ec2fd06035a5c75
-EBUILD qtwebchannel-5.15.7.ebuild 599 BLAKE2B f48e51cbd6686299a61f4132025e1992f4e659fa8d496213e52d4c6f21224376bae35ee8e43745d98e6e3198a7a0ee45e988d0b580cc6134c95d92badcb05c70 SHA512 e9fd462c2d001acf26ed35f58b3e56602441c2271432d37448ff08f1bf35878a65cb56f35faf3dff0d27c789b02a5cee7d4094c3a0ac43c6b38eb2eb456110e9
 EBUILD qtwebchannel-5.15.8.ebuild 599 BLAKE2B c61043201e33bea4827e7726a31ef0f631bba2799aaf76f9aa849d58f2b958e9053a6d73438906c92ef5ff160cf69cf568692ba566fa55d513154c7fbb385a31 SHA512 62b65e38d50d9d337a4e6979ff758211350f720c4b7072d02213133a88e017f8996f69aabd0a22a495c0c86b5e6c19a4117f771ce1f58877413fcd57613e4dc8
 EBUILD qtwebchannel-6.4.0.ebuild 353 BLAKE2B 25d0b8ce3de471d920fda2109ed42f7da27428964a233b1d41024b3b2e18d4a54b3b2f78e2338ad728f8c031b66dec935ed6fb188c477eb17305298a995dbe59 SHA512 48f6edae6126ce01d638b5cf494960ca90c36d9eca8438411717ac952cd0c8d5dacb1e6ed4f568c89fb8bd0612dc01e2b2cdad996679057a97ecce6f690e58ed
 EBUILD qtwebchannel-6.4.2.ebuild 353 BLAKE2B 8acf032c4f6a40fe3d5b4698bdb480ce1535050c18de467654afda382f3c8ba8665116d728f41a6209ba0dacbfaa270cc9b7ed1e43d6ace9cb9d65e7a968d1dc SHA512 e2f8854c859d70482c8086f75435362200271d5e9b2a80a1eeaf1e90cd70e860d8fc8b8132e7afe76fb83afe3f123a2ce036ad05b65a0cf7f44ec46bfcbc34d9
diff --git a/dev-qt/qtwebchannel/qtwebchannel-5.15.7.ebuild b/dev-qt/qtwebchannel/qtwebchannel-5.15.7.ebuild
deleted file mode 100644
index 7c31b60dfd49..000000000000
--- a/dev-qt/qtwebchannel/qtwebchannel-5.15.7.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-if [[ ${PV} != *9999* ]]; then
-	QT5_KDEPATCHSET_REV=1
-	KEYWORDS="amd64 arm arm64 ~loong ~ppc ppc64 ~riscv x86"
-fi
-
-inherit qt5-build
-
-DESCRIPTION="Qt5 module for integrating C++ and QML applications with HTML/JavaScript clients"
-
-IUSE="qml"
-
-DEPEND="
-	=dev-qt/qtcore-${QT5_PV}*
-	qml? ( =dev-qt/qtdeclarative-${QT5_PV}* )
-"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	qt_use_disable_mod qml quick src/src.pro
-	qt_use_disable_mod qml qml src/webchannel/webchannel.pro
-
-	qt5-build_src_prepare
-}
diff --git a/dev-qt/qtwebengine/Manifest b/dev-qt/qtwebengine/Manifest
index d21f33438b96..9e4a9ed3a772 100644
--- a/dev-qt/qtwebengine/Manifest
+++ b/dev-qt/qtwebengine/Manifest
@@ -14,11 +14,9 @@ AUX qtwebengine-6.4.0-no-websocket-intercept.patch 1582 BLAKE2B ca612dfe68ea051b
 DIST qtwebengine-5.15.2-r1-chromium87-ppc64le.tar.xz 28784 BLAKE2B aa101d14446f3282fda8932cc75a249d88b79319f0886d95777292776d94ac5f4fc114c3893b2801fbba6abb14f381172bb14b15b5ffef12413db3a16e4d1ca6 SHA512 3324e0076eb18e2ae2248428d2730cfb3413761514b2bb57e25b8db79248aaaa8098d9f7cebfa08f1a3b39b1d0a382aafed75c5ae8273918909335957921305e
 DIST qtwebengine-5.15.2_p20211019-jumbo-build.patch.bz2 2930 BLAKE2B fca1d1406874d04eafb64bb4d8730512a6307ba44fb99d76f428ca1bd4a303758e0c3bd8f92a59f7bcf62e5b767c5a8ed239028bdb74ad7a8b62abf88d38c101 SHA512 61cbfbe4ff340b75ea8d356e031e932ac03fe65dd009999ff897ca4b0185d1d989490daf75ffeaaabb3e92c870c11c7ff8ad2cd6372f5363b3d774b8ecca6d89
 DIST qtwebengine-5.15.3_p20220406-patchset.tar.xz 35480 BLAKE2B ce6aeebbb3255196611130d04ee7a3907ba45d6d2a283f2433e2176cf67e473e74137b180de0a9998762cc54439bb06825815e81e9f95f9413ce2956ac9308b7 SHA512 47e29a1429dce2db324929af91c8ef8421c75ae48f5a491db71b434f8017a5b1e7475e9938989e331e8e012220852848565242e09747892e1a8a8d3ab7386840
-DIST qtwebengine-5.15.7_p20221122.tar.xz 319323408 BLAKE2B f0f7d566e84a78bae964bf34ccb305d51ae3c0b73bea2b382edca373a5240ab63ce6d90a1f81c8e70fd1f1eb05f9985fccbdae36958afe9dd8fa9c95a72775e0 SHA512 42665d2d7d227aeb04b9f7af0728ea5b07978e221b858fd2855595ad588d709bacbea18ab9e0c3a023579e5e3b80cdf6d3ff721573631ee43626bd37fb424225
 DIST qtwebengine-5.15.8_p20230112.tar.xz 320881876 BLAKE2B 681fb4e2c6dfb80f1f2839092bbbd891a0a0d68f6b31dbdfe8693b8ea9a0ecd9611ba692b0565f32fc2ad199de715cf61e333d796df618572f79d9ed88545ffb SHA512 1806e7a3134579a5cfc0c932cc95ffb15edc515c2ff32b01eee9de8245938f95301610cd7b57451a07a9e38451111973b88c1d64a03f1371e58106bf202b143e
 DIST qtwebengine-everywhere-src-6.4.0.tar.xz 440346968 BLAKE2B ffe9ad9f71034d14f016a71bf3e6034853d5c2b17a3ab3e8aefc1c3a79896363eb2ce41446f16e126ec313608619900ee7ac41750978c28f135df5bbc2e0be5c SHA512 a024781c675c60ca746abb6cd977872b51e3f4a7ff9f934450b82e9b19883c68c0c6c630c28997624f0caceed3c43e8b0658419ecb18cf08fa9081275bedd2a7
 DIST qtwebengine-everywhere-src-6.4.2.tar.xz 440538956 BLAKE2B df94e0e8e22d11614d0d35002c0e404e6735d75e7b43bef1bfd3d5e1230a997625fe8471d8a9154798cc1f9b9c296c2b697ec70fba0428d509d1352d6d3fafee SHA512 47b184a690d4fa5ccccaa3533903068df7b28825aeb16b7c75e3c7cc29fe0cfdf07501c5f0311926c22852f626b0cd59c836d44527261dc7d5c1efbf7e15439b
-EBUILD qtwebengine-5.15.7_p20221122.ebuild 9297 BLAKE2B 4c3e83550efe4ebfcefa74134f02731fc0f6bf8dd1d8a02f139f525ea0f7314dab03e4c6b65a13bfcb43d8f10776693df65f30618d6073d96f0bd607065b83b3 SHA512 2d1fbb46015ce1d72a027e1f3b3d98a62b04488b04a3278df33f04971bf75eff35cc1c1f274fe9f850436ea0d8ce09384c846ea703fb38364c7d79eae70772ca
 EBUILD qtwebengine-5.15.8_p20230112.ebuild 9439 BLAKE2B 12e667326ac1f2298f328f4e19a414a318e169c56b510e3e4aa75c230c9c0121299aee8fa99af931bec50762f0f00339352cacc055f7c37973c7cd6eaebebf88 SHA512 810f35e47758ac166cecca74e01aa501d8498b97aa4e4a63c69eac544ac5b834e101b97ac644c13290924610f9d64c5b343ad741b84a14963955b62ed3ffb479
 EBUILD qtwebengine-6.4.0.ebuild 7497 BLAKE2B c0d10eaf3623173ffd44dc8c4b9d87b207e5085cc45e0c3d6068fd306eefa739d635b1ab406d625c87efc7be6c020941a693f45e719e5a871e4b99083ad08102 SHA512 e05d72be1d82b232e5dd98f8dd35cfa6e662c5b63103a1db6112788e440e577a0dc625007ad983f403e2001b2cf7ebaa5423fde09d3f085562159f9e768470a3
 EBUILD qtwebengine-6.4.2.ebuild 7414 BLAKE2B 6d25d60291c227c6bf52adaef94d8b13aafc98a3946472d191c8311e42fe8afd9b3799510afa58ea01a83a393adcaffef4842ef7df5f5ffdaa73b5344ede59a4 SHA512 f5947f1440041ec126b571d570c6cb13ed8f27d0deb703945a47491735ae2ac04e0d5cbda6bec23d6233de7583a757220910d113058535835367615c1284eeed
diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.7_p20221122.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.7_p20221122.ebuild
deleted file mode 100644
index af5c7e8c0a98..000000000000
--- a/dev-qt/qtwebengine/qtwebengine-5.15.7_p20221122.ebuild
+++ /dev/null
@@ -1,282 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..10} )
-PYTHON_REQ_USE="xml(+)"
-inherit check-reqs estack flag-o-matic multiprocessing python-any-r1 qt5-build toolchain-funcs
-
-DESCRIPTION="Library for rendering dynamic web content in Qt5 C++ and QML applications"
-HOMEPAGE="https://www.qt.io/"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-	if [[ ${PV} == ${QT5_PV}_p* ]]; then
-		SRC_URI="https://dev.gentoo.org/~asturm/distfiles/${P}.tar.xz"
-		S="${WORKDIR}/${P}"
-		QT5_BUILD_DIR="${S}_build"
-	fi
-else
-	EGIT_BRANCH="5.15"
-	EGIT_REPO_URI=(
-		"https://code.qt.io/qt/${QT5_MODULE}.git"
-		"https://github.com/qt/${QT5_MODULE}.git"
-	)
-	inherit git-r3
-fi
-
-# ppc64 patchset based on https://github.com/chromium-ppc64le releases
-SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-5.15.2_p20211019-jumbo-build.patch.bz2
-	https://dev.gentoo.org/~asturm/distfiles/${PN}-5.15.3_p20220406-patchset.tar.xz
-	ppc64? ( https://dev.gentoo.org/~gyakovlev/distfiles/${PN}-5.15.2-r1-chromium87-ppc64le.tar.xz )"
-
-IUSE="alsa bindist designer geolocation +jumbo-build kerberos pulseaudio screencast +system-ffmpeg +system-icu widgets"
-REQUIRED_USE="designer? ( widgets )"
-
-RDEPEND="
-	app-arch/snappy:=
-	dev-libs/glib:2
-	dev-libs/nspr
-	dev-libs/nss
-	dev-libs/expat
-	dev-libs/libevent:=
-	dev-libs/libxml2[icu]
-	dev-libs/libxslt
-	dev-libs/re2:=
-	=dev-qt/qtcore-${QT5_PV}*
-	=dev-qt/qtdeclarative-${QT5_PV}*
-	=dev-qt/qtgui-${QT5_PV}*
-	=dev-qt/qtnetwork-${QT5_PV}*
-	=dev-qt/qtprintsupport-${QT5_PV}*
-	=dev-qt/qtwebchannel-${QT5_PV}*[qml]
-	media-libs/fontconfig
-	media-libs/freetype
-	media-libs/harfbuzz:=
-	media-libs/lcms:2
-	media-libs/libjpeg-turbo:=
-	media-libs/libpng:0=
-	>=media-libs/libvpx-1.5:=[svc(+)]
-	media-libs/libwebp:=
-	media-libs/opus
-	sys-apps/dbus
-	sys-apps/pciutils
-	sys-libs/zlib[minizip]
-	virtual/libudev
-	x11-libs/libdrm
-	x11-libs/libX11
-	x11-libs/libXcomposite
-	x11-libs/libXcursor
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXi
-	x11-libs/libxkbfile
-	x11-libs/libXrandr
-	x11-libs/libXrender
-	x11-libs/libXScrnSaver
-	x11-libs/libXtst
-	alsa? ( media-libs/alsa-lib )
-	designer? ( =dev-qt/designer-${QT5_PV}* )
-	geolocation? ( =dev-qt/qtpositioning-${QT5_PV}* )
-	kerberos? ( virtual/krb5 )
-	pulseaudio? ( media-libs/libpulse )
-	screencast? ( media-video/pipewire:= )
-	system-ffmpeg? ( media-video/ffmpeg:0= )
-	system-icu? ( >=dev-libs/icu-69.1:= )
-	widgets? (
-		=dev-qt/qtdeclarative-${QT5_PV}*[widgets]
-		=dev-qt/qtwidgets-${QT5_PV}*
-	)
-"
-DEPEND="${RDEPEND}
-	media-libs/libglvnd
-"
-BDEPEND="${PYTHON_DEPS}
-	dev-util/gperf
-	dev-util/ninja
-	dev-util/re2c
-	net-libs/nodejs[ssl]
-	sys-devel/bison
-	sys-devel/flex
-	ppc64? ( >=dev-util/gn-0.1807 )
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-5.15.2-disable-fatal-warnings.patch" # downstream, bug 695446
-	"${FILESDIR}/${PN}-5.15.3_p20220505-extra-gn.patch" # downstream, bug 774186
-	"${FILESDIR}/${PN}-5.15.2_p20210224-chromium-87-v8-icu68.patch" # downstream, bug 757606
-	"${FILESDIR}/${PN}-5.15.2_p20210224-disable-git.patch" # downstream snapshot fix
-	"${FILESDIR}/${PN}-5.15.2_p20211015-pdfium-system-lcms2.patch" # by Debian, QTBUG-61746
-	"${FILESDIR}/${PN}-5.15.3_p20220329-clang14.patch" # by FreeBSD, bug 836604
-	"${FILESDIR}/${PN}-5.15.3_p20220406-gcc12-includes.patch" # by openSUSE, bug 840326
-	"${WORKDIR}/${PN}-5.15.2_p20211019-jumbo-build.patch" # bug 813957
-	"${WORKDIR}/${PN}-5.15.3_p20220406-patchset" # bug 698988 (py2--), pipewire-3
-)
-
-qtwebengine_check-reqs() {
-	# bug #307861
-	eshopts_push -s extglob
-	if is-flagq '-g?(gdb)?([1-9])'; then
-		ewarn "You have enabled debug info (probably have -g or -ggdb in your CFLAGS/CXXFLAGS)."
-		ewarn "You may experience really long compilation times and/or increased memory usage."
-		ewarn "If compilation fails, please try removing -g/-ggdb before reporting a bug."
-	fi
-	eshopts_pop
-
-	[[ ${MERGE_TYPE} == binary ]] && return
-
-	# (check-reqs added for bug #570534)
-	#
-	# Estimate the amount of RAM required
-	# Multiplier is *10 because Bash doesn't do floating point maths.
-	# Let's crudely assume ~2GB per compiler job for GCC.
-	local multiplier=20
-
-	# And call it ~1.5GB for Clang.
-	if tc-is-clang ; then
-		multiplier=15
-	fi
-
-	local CHECKREQS_DISK_BUILD="7G"
-	local CHECKREQS_DISK_USR="150M"
-	if ! has "distcc" ${FEATURES} ; then
-		# bug #830661
-		# Not super realistic to come up with good estimates for distcc right now
-		local CHECKREQS_MEMORY=$(($(makeopts_jobs)*multiplier/10))G
-	fi
-
-	check-reqs_${EBUILD_PHASE_FUNC}
-}
-
-pkg_pretend() {
-	qtwebengine_check-reqs
-}
-
-pkg_setup() {
-	qtwebengine_check-reqs
-	python-any-r1_pkg_setup
-}
-
-src_unpack() {
-	case ${QT5_BUILD_TYPE} in
-		live)    git-r3_src_unpack ;&
-		release) default ;;
-	esac
-}
-
-src_prepare() {
-	if [[ ${PV} == ${QT5_PV}_p* ]]; then
-		# This is made from git, and for some reason will fail w/o .git directories.
-		mkdir -p .git src/3rdparty/chromium/.git || die
-	fi
-	# We need to make sure this integrates well into Qt 5.15.3 installation.
-	# Otherwise revdeps fail w/o heavy changes. This is the simplest way to do it.
-	# See also: https://www.qt.io/blog/building-qt-webengine-against-other-qt-versions
-	sed -E "/^MODULE_VERSION/s/5\.15\.[0-9]+/${QT5_PV}/" -i .qmake.conf || die
-
-	# QTBUG-88657 - jumbo-build could still make trouble
-	if ! use jumbo-build; then
-		sed -i -e 's|use_jumbo_build=true|use_jumbo_build=false|' \
-			src/buildtools/config/common.pri || die
-	fi
-
-	# bug 620444 - ensure local headers are used
-	find "${S}" -type f -name "*.pr[fio]" | \
-		xargs sed -i -e 's|INCLUDEPATH += |&$${QTWEBENGINE_ROOT}_build/include $${QTWEBENGINE_ROOT}/include |' || die
-
-	if use system-icu; then
-		# Sanity check to ensure that bundled copy of ICU is not used.
-		# Whole src/3rdparty/chromium/third_party/icu directory cannot be deleted because
-		# src/3rdparty/chromium/third_party/icu/BUILD.gn is used by build system.
-		# If usage of headers of bundled copy of ICU occurs, then lists of shim headers in
-		# shim_headers("icui18n_shim") and shim_headers("icuuc_shim") in
-		# src/3rdparty/chromium/third_party/icu/BUILD.gn should be updated.
-		local file
-		while read file; do
-			echo "#error This file should not be used!" > "${file}" || die
-		done < <(find src/3rdparty/chromium/third_party/icu -type f "(" -name "*.c" -o -name "*.cpp" -o -name "*.h" ")" 2>/dev/null)
-	fi
-
-	# src/3rdparty/gn fails with libc++ due to passing of `-static-libstdc++`
-	if tc-is-clang ; then
-		if has_version 'sys-devel/clang[default-libcxx(-)]' || has_version 'sys-devel/clang-common[default-libcxx(-)]' ; then
-			eapply "${FILESDIR}/${PN}-5.15.2_p20210521-clang-libc++.patch"
-		fi
-	fi
-
-	if use system-ffmpeg && has_version '>=media-video/ffmpeg-5'; then
-		eapply "${FILESDIR}/${PN}-5.15.3_p20220406-ffmpeg5.patch" # by Archlinux, bug 831437
-	fi
-
-	qt_use_disable_config alsa webengine-alsa src/buildtools/config/linux.pri
-	qt_use_disable_config pulseaudio webengine-pulseaudio src/buildtools/config/linux.pri
-
-	qt_use_disable_mod designer webenginewidgets src/plugins/plugins.pro
-
-	qt_use_disable_mod widgets widgets src/src.pro
-
-	qt5-build_src_prepare
-
-	# we need to generate ppc64 stuff because upstream does not ship it yet
-	if use ppc64; then
-		einfo "Patching for ppc64le and generating build files"
-		eapply "${FILESDIR}/qtwebengine-5.15.2-enable-ppc64.patch"
-		pushd src/3rdparty/chromium > /dev/null || die
-		eapply -p0 "${WORKDIR}/${PN}-ppc64le"
-		popd > /dev/null || die
-		pushd src/3rdparty/chromium/third_party/libvpx > /dev/null || die
-		mkdir -vp source/config/linux/ppc64 || die
-		mkdir -p source/libvpx/test || die
-		touch source/libvpx/test/test.mk || die
-		# clang-format is used to re-format sources
-		# but we'd rather make it a no-op than introduce a clang dependency
-		# https://bugs.gentoo.org/849458
-		clang-format() { : ; }
-		export -f clang-format || die
-		./generate_gni.sh || die
-		popd >/dev/null || die
-	fi
-}
-
-src_configure() {
-	export NINJA_PATH=/usr/bin/ninja
-	export NINJAFLAGS="${NINJAFLAGS:--j$(makeopts_jobs "${MAKEOPTS}" 999) -l$(makeopts_loadavg "${MAKEOPTS}" 0) -v}"
-
-	local myqmakeargs=(
-		--
-		-no-build-qtpdf
-		-printing-and-pdf
-		-system-opus
-		-system-webp
-		$(qt_use alsa)
-		$(qt_use !bindist proprietary-codecs)
-		$(qt_use geolocation webengine-geolocation)
-		$(qt_use kerberos webengine-kerberos)
-		$(qt_use pulseaudio)
-		$(usex screencast -webengine-webrtc-pipewire '')
-		$(usex system-ffmpeg -system-ffmpeg -qt-ffmpeg)
-		$(qt_use system-icu webengine-icu)
-	)
-	qt5-build_src_configure
-}
-
-src_install() {
-	qt5-build_src_install
-
-	# bug 601472
-	if [[ ! -f ${D}${QT5_LIBDIR}/libQt5WebEngine.so ]]; then
-		die "${CATEGORY}/${PF} failed to build anything. Please report to https://bugs.gentoo.org/"
-	fi
-}
-
-pkg_preinst() {
-	elog "This version of Qt WebEngine is based on Chromium version 87.0.4280.144,"
-	elog "with additional security fixes from newer versions. 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 "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 "tldr: Your web browsing experience will be compromised."
-}
diff --git a/dev-qt/qtwebsockets/Manifest b/dev-qt/qtwebsockets/Manifest
index d2195dd1428c..002ccaa46bc9 100644
--- a/dev-qt/qtwebsockets/Manifest
+++ b/dev-qt/qtwebsockets/Manifest
@@ -1,10 +1,7 @@
-DIST qtwebsockets-5.15.7-gentoo-kde-1.tar.xz 1532 BLAKE2B 78bddf100ad1e99785d33e1cfe4063d1af7eeecaceeab68372888f26fe9ccfeb97e8f6f0446c855d055fb5f0b3d14aa06411e1337cff798104193641ed4f4890 SHA512 3f264380b8922360cd91d08337ee116085bf34e92c82bf4e62c020e853fd688d455f8ffaae611d2f18e76440ff463bc96565d55dafb788950fd14a23d4a7e180
 DIST qtwebsockets-5.15.8-gentoo-kde-2.tar.xz 2028 BLAKE2B 60e13ca18f5f32de3d344b293c4601fb83166c10f2d51e2fc19135dc54cb5cbbcfacff86ee4c630d5fd988ec40f9bbb20d3c67e485de1e0bacdbd68cbcaee092 SHA512 175326b9e193bd38da5ab0d45cf91121797f1d21a2a2a9ad72692af76c95d38b8ffbde2af845dbd9647ad38274e20b06c28d4dbc548bc7bf39be0724403c6e00
-DIST qtwebsockets-everywhere-opensource-src-5.15.7.tar.xz 260784 BLAKE2B 1693a687b44a548d5d76ba6c5c59badffbe581769ff8cedd0735d13001806b03391667cbd31c306cec17558728ae2fbf46605da58ed8d45edd476b8f82459bd3 SHA512 b7e48e8cedfb71c33193fae5c6039b2ca042d4acdcf77beb52703be1e39f86c4ca37f3b9182c50c280cedb587eec4980f35387aa77e8454d901fd775c9f88dd5
 DIST qtwebsockets-everywhere-opensource-src-5.15.8.tar.xz 260804 BLAKE2B 256274508c9676f407826a04613c1d2e5d9f213aaef6853e2d873e6fb4ab5fc5d2aff762b0a74fb880ed581486c20d513e74ff6edb3358821c2bc663221b1498 SHA512 d44f8beab7536882cb4c8b9250a9e39a274b549b0ff6ea003f16c614a9e5f1bef7d0526acacd3d4382dea9ddc86be1631903df72a605b4cde06aa109320fe05f
 DIST qtwebsockets-everywhere-src-6.4.0.tar.xz 266400 BLAKE2B cbe11902a3743e54aea2e75141360fc18d57d44ffed7e862de80ce374fe35b94862d12d3408328c80ced07cae24f6df0064303947b7c4b0a758866cc911b4f0a SHA512 dc2e86332a7c493afa66c3844443c3a5dbe830786f1127a0eac66594bb254ba1294389c24221d1984044caddc4afa1e4f9832382b403c7c9a8bf5c9dd21d53d0
 DIST qtwebsockets-everywhere-src-6.4.2.tar.xz 267456 BLAKE2B b0d3c7ace2007185486c81a8aff31ae6195aed165d7df0466e1e87775a721325fc337723923f8c1104fb52afaf75efa02ec5c9cfa5ce7597da9669993b52a5be SHA512 3d9b9a800151385e30a54289606ed430e322a8e8f4401b57a28fd194ccd0346b13151155b9c50780233dc89e6b3a639f1c30fe5fc7c71dc1d614398be4f9315c
-EBUILD qtwebsockets-5.15.7.ebuild 578 BLAKE2B a9159029b6df6674aa2ecd93a2db751c6d55a6a34ed6edbeb5cdff554167ab841ea1c5d699f0ea8b76d54eaedc91524caeb113d2bdfe884684c7bff63c060691 SHA512 5ed5d04828680ca5cb666c2a0aa9c1369448746fa17f2b6f03a50cc086f4a1328f0fd54d7697e996c16022bf57be2043f553d46a27d09c001f92119331cf22f5
 EBUILD qtwebsockets-5.15.8-r1.ebuild 578 BLAKE2B 7fdd1091164c81cdf972e95caacfcd2520c7201597ed16580b91a11c3a26af86bf97a45ec95cffbf6348ee80b563b05497083d99e0eea7ac23c5c634f5ab93ba SHA512 f46ea8af383efb3c0b4e9a671296e4b585bc6bde71abede3b8eb6303e203af3e74228f110cf8544113d24178ff11abbe5f111e18ee4c301f212af7dbac0027aa
 EBUILD qtwebsockets-6.4.0.ebuild 370 BLAKE2B 34f5c1e43cc6bab1d586f1462794399c47abab7c43a542f4fd38f23ada93c3a31c9509910282c4dcd34a1e4462cbf4b788b8738ea130fd3797d5ea5ac32f5d0d SHA512 7c00e905728c2fda7d00a11e4541d25ddbcf14dfe0a048086793b26e5d78383147e86f5e95358fdfb7302029ea929327f037d922534cc2be14137b1c0cfe3599
 EBUILD qtwebsockets-6.4.2.ebuild 370 BLAKE2B e65adfc17559000bea71d0ccc60f8aea62c926cf25d53bd1fb151c45cd40a2217d0257722110f4fc1c0b72188c1f3a80d244014c0355ccbc57ba384c28d1f1b8 SHA512 eae0d900b94e583514d1958dac60f1ecfd7da80c2b45b6accad4946af435d872a1e8102a4ae5bf3bdd91f53c585e5fcb09c7d3bc8e0c6b8408a338da2b186b17
diff --git a/dev-qt/qtwebsockets/qtwebsockets-5.15.7.ebuild b/dev-qt/qtwebsockets/qtwebsockets-5.15.7.ebuild
deleted file mode 100644
index 64f5160be5bd..000000000000
--- a/dev-qt/qtwebsockets/qtwebsockets-5.15.7.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-if [[ ${PV} != *9999* ]]; then
-	QT5_KDEPATCHSET_REV=1
-	KEYWORDS="amd64 arm arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~sparc x86"
-fi
-
-inherit qt5-build
-
-DESCRIPTION="Implementation of the WebSocket protocol for the Qt5 framework"
-
-IUSE="qml +ssl"
-
-DEPEND="
-	=dev-qt/qtcore-${QT5_PV}*
-	=dev-qt/qtnetwork-${QT5_PV}*[ssl=]
-	qml? ( =dev-qt/qtdeclarative-${QT5_PV}* )
-
-"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	qt_use_disable_mod qml quick src/src.pro
-
-	qt5-build_src_prepare
-}
diff --git a/dev-qt/qtwebview/Manifest b/dev-qt/qtwebview/Manifest
index 610d28ff5592..a8aca9300657 100644
--- a/dev-qt/qtwebview/Manifest
+++ b/dev-qt/qtwebview/Manifest
@@ -1,5 +1,3 @@
-DIST qtwebview-everywhere-opensource-src-5.15.7.tar.xz 135408 BLAKE2B f6f7c288243f665053d5741a262f91941b00674290eff5d96aa2e481a67d52bcbc4cafd0867305c88d571ac8355f0cf70c3764ce4173241b0056833f1b7384c9 SHA512 7f1befd10507efc010e4f1c459a0971aa32f288202e6151815885deb89462d20ac6182e4976cecc47e39ac8e7eb545e50c5eeac963b57fc66dab5a84e5ab587b
 DIST qtwebview-everywhere-opensource-src-5.15.8.tar.xz 135372 BLAKE2B 73afdaf656ee9084bc1e462a56475c900c894c9df3a33af899f35a3fc5d66b3b375d6ab04c84f42cdc163bcfa22c1175571f4465a11190a82b1a00617f166a62 SHA512 1afa2c5b7e4a0f422986ac982345d398af9cf468c2e8690205e5d7a820b0eb8c44e4a6d711735d039a05c44c1c6c4f41faf7bfe4cb2bbbd248b278a3e6c72cb5
-EBUILD qtwebview-5.15.7.ebuild 478 BLAKE2B b4398748705f32864d52a4a590c06d28468eba941a57b8fa2d872e40fbeb2ea59316815d349a8658430915e92591ddac02a64df309a8e06bea6c8bc90d4b6aaa SHA512 a86b0bc60b4ad7b507e2daf780c610676c9d28ac85573aa2876c9c06b5cb927e842bd9a07838ecaabf4af8a5e9b348404f47a4b443181d87d851ef9690823dab
 EBUILD qtwebview-5.15.8.ebuild 475 BLAKE2B da1ce2dcebd4d6976e64c2d53eb3cbf048a8d4daf8ccb7c01db49d925c4fcfa1f3b16ce2aac96dc3b2d4720d80789c3453a0d299cb3d5a943c34652b32370c63 SHA512 f493da1c8828390583feddc6cb7835c1459d598886d7aef490a38d26b72694df1b01637201a32ff8ac6834e8482c1ff04df0eb49f3eca9241c448fe4a67a2b01
 MISC metadata.xml 482 BLAKE2B 651a49dc4a07f5e5a9c21990868e666d98acdea7d7b0b2c0e4c98eafc3da72c803d380e4abda30f33250f7bbd7654df713833ccdddcb975cbad6f92e488f643b SHA512 192c670abd7da29645513bf1d9297d942efdc49f5cf170861e7689fda47f51daa47f10c7c81c3b045366e0259179c6839ff7747197c9d792e8d0fd1a5818973e
diff --git a/dev-qt/qtwebview/qtwebview-5.15.7.ebuild b/dev-qt/qtwebview/qtwebview-5.15.7.ebuild
deleted file mode 100644
index 19d0efa48278..000000000000
--- a/dev-qt/qtwebview/qtwebview-5.15.7.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit qt5-build
-
-DESCRIPTION="Module for displaying web content in a QML application using the Qt5 framework"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-fi
-
-IUSE=""
-
-DEPEND="
-	=dev-qt/qtcore-${QT5_PV}*
-	=dev-qt/qtdeclarative-${QT5_PV}*
-	=dev-qt/qtgui-${QT5_PV}*
-	=dev-qt/qtwebengine-${QT5_PV}*:5
-"
-RDEPEND="${DEPEND}"
diff --git a/dev-qt/qtwidgets/Manifest b/dev-qt/qtwidgets/Manifest
index e81440d87565..5f1112f31212 100644
--- a/dev-qt/qtwidgets/Manifest
+++ b/dev-qt/qtwidgets/Manifest
@@ -1,9 +1,5 @@
-DIST qtbase-5.15-gentoo-patchset-2.tar.xz 3844 BLAKE2B 6dcb69398cf8a6b1be737e8c7bf1041529c4e704ca892cef10ba3bc5ce435c903607b64e981cf8aa12c785b3e423aa1d52bce1f67ec1bd8dbb1421dfb6f62700 SHA512 b7fd7e17bcab2f9803c7bfc0473082ee4640299c23ce8da943ef80ed181e880ebc9157bcebde28077e80e6f907aa14a59c42416b3e32f49baebd54fbe5a37497
 DIST qtbase-5.15-gentoo-patchset-3.tar.xz 3856 BLAKE2B 0752426f9bc2dfa1ab2bc246b29f5d00305df05175a7801d7d5eddacfa46fcb605d9a317547edc01d3ef339f6effc2fcee7549cb7aecced37f0098166c70dbe2 SHA512 2515bea53232e76ca3e40bdaf1dd52fdf452052a2f40002ee91360d1fcceea3c5c2f5a8d2a3bfc0f9c2bacd61460a632c5b351accd73fd37b64985593219148e
-DIST qtbase-5.15.7-gentoo-kde-1.tar.xz 798056 BLAKE2B 3c7fefa65ab6de25c2c82261ad0f1371e32acd4bd4b3303f20a5ebf36d19690df94290d102c65e4941a6c51a5d5f2db0253bafca5ac85cf480f7434405cb2671 SHA512 20ab17220489009c98d7f783a02614507e157974c7cb16f47d50d3954ccd1cd065562effc393df6e07c9ba6ad8ccd4e6b3f0bf5b5b890183b8631b8b570bf064
 DIST qtbase-5.15.8-gentoo-kde-1.tar.xz 780764 BLAKE2B 6abb00127113595cbb0a0caf58eb6323423ca41cbde6262a63762aded12861b6c051c9548c9ce2d11ab073e8930c11b609c05579eba34d56201fb7187c78ee23 SHA512 8b59ba61e7364c78d5bf728b4d8c9bd0f8e1ed973f1a84cd40330b06195b246e052ec087067336ff5d4e80a12168a25e0bd47fd88d837c00f106d8cdeba0c016
-DIST qtbase-everywhere-opensource-src-5.15.7.tar.xz 50260196 BLAKE2B 69029a910af0e3bfe742b5870334406e03274b0677ef47f9c7c10f730ff031bae49bd21a686497215505b19a183ca395c275d8afefaaa903125297f8e693bb4d SHA512 316de71fba1d5dd91354155dcd0f77e1ce2a798f8296a8699a795ea5e86ad10b6e233299775a92e23328290f3e041240585947e89ee7bd39eb464c5f0ffec343
 DIST qtbase-everywhere-opensource-src-5.15.8.tar.xz 50259432 BLAKE2B cb1b790a384a5cad9a95fdc448e275d48a68c6ee2addf08b40f9963cc5762fd7ab15852dea8392dc76da39f1565c1e23ddb5875c280f0177e802082f4b4f7f2b SHA512 29e8877bafdbc908072209f1b27a5040b022e2b71f17f4ab4cecd570adeae21597f9af7f1d38758760f3cb30376eeb15c5f066bf02c6e9a9e3a4d07f967046ce
-EBUILD qtwidgets-5.15.7.ebuild 1200 BLAKE2B eeab9132fae69b4f1df9b2f0c8bac4623269622a75aa9218de536509e3b8fa2c4c0961c93b89a0e49c2c80eab1e5983b8353c17b627ddd2019cc64bd0d09079d SHA512 6a5955f65b514bdb06a3857279d7ddaf1d2e67b138893b3b8564ec43b1aef7e2426435a7292f6ed5a167e634d089f7d9e878eb7aed48326e24e3fbde8495488e
 EBUILD qtwidgets-5.15.8.ebuild 1200 BLAKE2B 2bc1142dc7261140c06366e41c370464735ec597938eb5fe82176546733e14ab7f8b413ed7f2d3315d2b69d7d9e3b6d3741139ca684b8705a0fce71feca290b2 SHA512 ffa0a95e59423a680a9a4a7761c5bd391ef84b1ca718203175185185f3bde56516acaad6f852280ff8f06590f1ba6a7f3d94537014c84a50fdcd5868a203463d
 MISC metadata.xml 559 BLAKE2B 3ea80a5e419db32987d68d7e5033fa75fa0ff22b31b0842fd7ead902172cbe83650b0bbdf8657a57e428726e7cdf114d9011bd16066c080bc5f6ecb3f691d42c SHA512 51172365a186fbca09651bfd751284960dda4036390af2afab9812a7ae3fabdd9d60a336dee3cfc5e3d133a0216bf77e29660b9cdee2f0bcd2ce43c27297bdb1
diff --git a/dev-qt/qtwidgets/qtwidgets-5.15.7.ebuild b/dev-qt/qtwidgets/qtwidgets-5.15.7.ebuild
deleted file mode 100644
index 7325376f249e..000000000000
--- a/dev-qt/qtwidgets/qtwidgets-5.15.7.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-if [[ ${PV} != *9999* ]]; then
-	QT5_KDEPATCHSET_REV=1
-	KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86"
-fi
-
-QT5_MODULE="qtbase"
-inherit qt5-build
-
-DESCRIPTION="Set of components for creating classic desktop-style UIs for the Qt5 framework"
-
-# keep IUSE defaults in sync with qtgui
-IUSE="dbus gles2-only gtk +png +X"
-REQUIRED_USE="gtk? ( dbus )"
-
-DEPEND="
-	=dev-qt/qtcore-${QT5_PV}*:5=
-	=dev-qt/qtgui-${QT5_PV}*:5=[gles2-only=,png=,X?]
-	dbus? ( =dev-qt/qtdbus-${QT5_PV}* )
-	gtk? (
-		dev-libs/glib:2
-		=dev-qt/qtgui-${QT5_PV}*:5=[dbus]
-		x11-libs/gtk+:3
-		x11-libs/libX11
-		x11-libs/pango
-	)
-"
-RDEPEND="${DEPEND}"
-
-QT5_TARGET_SUBDIRS=(
-	src/tools/uic
-	src/widgets
-	src/plugins/platformthemes
-)
-
-QT5_GENTOO_CONFIG=(
-	dbus:xdgdesktopportal:
-	gtk:gtk3:
-	::widgets
-	!:no-widgets:
-)
-
-QT5_GENTOO_PRIVATE_CONFIG=(
-	:widgets
-)
-
-src_configure() {
-	local myconf=(
-		-opengl $(usex gles2-only es2 desktop)
-		$(usev dbus -dbus-linked)
-		$(qt_use gtk)
-		-gui
-		$(qt_use png libpng system)
-		-widgets
-		$(qt_use X xcb)
-		$(usev X '-xcb-xlib -xkbcommon')
-	)
-	qt5-build_src_configure
-}
diff --git a/dev-qt/qtx11extras/Manifest b/dev-qt/qtx11extras/Manifest
index afe85e6ef9f5..aa07f5a750aa 100644
--- a/dev-qt/qtx11extras/Manifest
+++ b/dev-qt/qtx11extras/Manifest
@@ -1,5 +1,3 @@
-DIST qtx11extras-everywhere-opensource-src-5.15.7.tar.xz 145672 BLAKE2B 3990b3a3c02ac22d31b70c3c44884a3ba5db594c1776530489e6be41ac9b5fe97e8e0e469341f03e300144d4db6c669fda1aa758c734581ac6c32a1f72b2cb4e SHA512 e368a1e14d4007edf642de7efb027f783cd816247c01629a68fddcb0e5c3ae1a412ea66e00a021c82de5f22e7afb1883bf7aaca03067c38346a92a26ae61ae06
 DIST qtx11extras-everywhere-opensource-src-5.15.8.tar.xz 145692 BLAKE2B 1499791b2f119cffe60dfbfb7c9633f90d9d59b0c3c92392d1f35261d8ceffbddbc7b30a1521f0d15387522409b4941b91b20eb8ec4caab9db030760a7de6d8b SHA512 a7b2cd611ec863b43cbf16a09868a9543b4dfc3c40b21c23317a3520345a9464e2ad34f884f3619fa67fdf563bc2d1a8b31d97d063766a8988454ee4a8c8e1fd
-EBUILD qtx11extras-5.15.7.ebuild 459 BLAKE2B 9369420be8b473cf8ce400e31ab2649ea755109cdec4929d20c7175ebb1a98770225cb9822f09df1c0926fc2d8b2499f5742d09c52e97e4af27b8b349afceb71 SHA512 dd3890acfa3e346a6dd48da61f06681d720915ee4dd3e44b25a9156125702fc5c20a882b4ed84e82dd337d09fe4836b222898fb54317be0b1bd63b5a8d8b1b1b
 EBUILD qtx11extras-5.15.8.ebuild 459 BLAKE2B f1e1f7e45d1d4b3e165855d11539dce6a0cb1c600328bc2630c2311b48075d81e3698b0b3fa44ebea06ff00fa52f7c337f8b54256b344bf2136a09268b6c16a4 SHA512 b06c033f629022a9309d809184905c8cd621c6c5d5e08b87ef5fa3eec4df26555ac8944dc067a61ba96d8a8865bfdd4b73bad0bd43eef71e53efb6a2c0d8c6dc
 MISC metadata.xml 482 BLAKE2B 651a49dc4a07f5e5a9c21990868e666d98acdea7d7b0b2c0e4c98eafc3da72c803d380e4abda30f33250f7bbd7654df713833ccdddcb975cbad6f92e488f643b SHA512 192c670abd7da29645513bf1d9297d942efdc49f5cf170861e7689fda47f51daa47f10c7c81c3b045366e0259179c6839ff7747197c9d792e8d0fd1a5818973e
diff --git a/dev-qt/qtx11extras/qtx11extras-5.15.7.ebuild b/dev-qt/qtx11extras/qtx11extras-5.15.7.ebuild
deleted file mode 100644
index a99515d6cfff..000000000000
--- a/dev-qt/qtx11extras/qtx11extras-5.15.7.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit qt5-build
-
-DESCRIPTION="Linux/X11-specific support library for the Qt5 framework"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86"
-fi
-
-IUSE=""
-
-RDEPEND="
-	=dev-qt/qtcore-${QT5_PV}*
-	=dev-qt/qtgui-${QT5_PV}*[X]
-"
-DEPEND="${RDEPEND}
-	test? ( =dev-qt/qtwidgets-${QT5_PV}* )
-"
diff --git a/dev-qt/qtxml/Manifest b/dev-qt/qtxml/Manifest
index 5f904e9ccf0f..76b0c77da6a0 100644
--- a/dev-qt/qtxml/Manifest
+++ b/dev-qt/qtxml/Manifest
@@ -1,9 +1,5 @@
-DIST qtbase-5.15-gentoo-patchset-2.tar.xz 3844 BLAKE2B 6dcb69398cf8a6b1be737e8c7bf1041529c4e704ca892cef10ba3bc5ce435c903607b64e981cf8aa12c785b3e423aa1d52bce1f67ec1bd8dbb1421dfb6f62700 SHA512 b7fd7e17bcab2f9803c7bfc0473082ee4640299c23ce8da943ef80ed181e880ebc9157bcebde28077e80e6f907aa14a59c42416b3e32f49baebd54fbe5a37497
 DIST qtbase-5.15-gentoo-patchset-3.tar.xz 3856 BLAKE2B 0752426f9bc2dfa1ab2bc246b29f5d00305df05175a7801d7d5eddacfa46fcb605d9a317547edc01d3ef339f6effc2fcee7549cb7aecced37f0098166c70dbe2 SHA512 2515bea53232e76ca3e40bdaf1dd52fdf452052a2f40002ee91360d1fcceea3c5c2f5a8d2a3bfc0f9c2bacd61460a632c5b351accd73fd37b64985593219148e
-DIST qtbase-5.15.7-gentoo-kde-1.tar.xz 798056 BLAKE2B 3c7fefa65ab6de25c2c82261ad0f1371e32acd4bd4b3303f20a5ebf36d19690df94290d102c65e4941a6c51a5d5f2db0253bafca5ac85cf480f7434405cb2671 SHA512 20ab17220489009c98d7f783a02614507e157974c7cb16f47d50d3954ccd1cd065562effc393df6e07c9ba6ad8ccd4e6b3f0bf5b5b890183b8631b8b570bf064
 DIST qtbase-5.15.8-gentoo-kde-1.tar.xz 780764 BLAKE2B 6abb00127113595cbb0a0caf58eb6323423ca41cbde6262a63762aded12861b6c051c9548c9ce2d11ab073e8930c11b609c05579eba34d56201fb7187c78ee23 SHA512 8b59ba61e7364c78d5bf728b4d8c9bd0f8e1ed973f1a84cd40330b06195b246e052ec087067336ff5d4e80a12168a25e0bd47fd88d837c00f106d8cdeba0c016
-DIST qtbase-everywhere-opensource-src-5.15.7.tar.xz 50260196 BLAKE2B 69029a910af0e3bfe742b5870334406e03274b0677ef47f9c7c10f730ff031bae49bd21a686497215505b19a183ca395c275d8afefaaa903125297f8e693bb4d SHA512 316de71fba1d5dd91354155dcd0f77e1ce2a798f8296a8699a795ea5e86ad10b6e233299775a92e23328290f3e041240585947e89ee7bd39eb464c5f0ffec343
 DIST qtbase-everywhere-opensource-src-5.15.8.tar.xz 50259432 BLAKE2B cb1b790a384a5cad9a95fdc448e275d48a68c6ee2addf08b40f9963cc5762fd7ab15852dea8392dc76da39f1565c1e23ddb5875c280f0177e802082f4b4f7f2b SHA512 29e8877bafdbc908072209f1b27a5040b022e2b71f17f4ab4cecd570adeae21597f9af7f1d38758760f3cb30376eeb15c5f066bf02c6e9a9e3a4d07f967046ce
-EBUILD qtxml-5.15.7.ebuild 525 BLAKE2B bfceacf70fba7151318fdcd2a1ea93755d1629d6d39cb16d0003836f44247b7f54f68ecbf9d0720f0088f2af1803ae5dcc08ae84c5a35950cd672146df040cf2 SHA512 8554f384bc5282592ea5e52aa0a05f00155afa1f9dc084b4fdb2daee74d2009921b5ffcc8f6994ad1020db91f54857f6b27ab81f7fe94b4bb36b47f2ebedc3ad
 EBUILD qtxml-5.15.8.ebuild 525 BLAKE2B fbdd6a3735f16c73fd025e8f7fe610011fe8f4fc545ff2ef4e4d3f5f7d1785676eeba17e74bfee2212570d5f09718c4410ebdc0fca10f702c627b032c7b2dbf4 SHA512 e7688982c68d59f6a451df4a56d31bf7748a4f9df1acef67de670d9b3f8eb6ecd0844df99e51d77719144fcdf7ffe9a9ce4b068247756bbcffe45828d8deaea2
 MISC metadata.xml 482 BLAKE2B 651a49dc4a07f5e5a9c21990868e666d98acdea7d7b0b2c0e4c98eafc3da72c803d380e4abda30f33250f7bbd7654df713833ccdddcb975cbad6f92e488f643b SHA512 192c670abd7da29645513bf1d9297d942efdc49f5cf170861e7689fda47f51daa47f10c7c81c3b045366e0259179c6839ff7747197c9d792e8d0fd1a5818973e
diff --git a/dev-qt/qtxml/qtxml-5.15.7.ebuild b/dev-qt/qtxml/qtxml-5.15.7.ebuild
deleted file mode 100644
index c8ebc6ed7ec4..000000000000
--- a/dev-qt/qtxml/qtxml-5.15.7.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-if [[ ${PV} != *9999* ]]; then
-	QT5_KDEPATCHSET_REV=1
-	KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86"
-fi
-
-QT5_MODULE="qtbase"
-inherit qt5-build
-
-DESCRIPTION="Implementation of SAX and DOM for the Qt5 framework"
-
-IUSE=""
-
-RDEPEND="=dev-qt/qtcore-${QT5_PV}*:5="
-DEPEND="${RDEPEND}
-	test? ( =dev-qt/qtnetwork-${QT5_PV}* )
-"
-
-QT5_TARGET_SUBDIRS=(
-	src/xml
-)
-
-QT5_GENTOO_PRIVATE_CONFIG=(
-	:xml
-)
diff --git a/dev-qt/qtxmlpatterns/Manifest b/dev-qt/qtxmlpatterns/Manifest
index 864958794e8e..4a55a3a27951 100644
--- a/dev-qt/qtxmlpatterns/Manifest
+++ b/dev-qt/qtxmlpatterns/Manifest
@@ -1,5 +1,3 @@
-DIST qtxmlpatterns-everywhere-opensource-src-5.15.7.tar.xz 5215136 BLAKE2B 519f202142bb23e8c82c970233f8cf1b438e4ce7b5f0d9484f5a41a977729065d1e1cdc7dd2a2d24caf807ddb7dd96b06d2346ae367a3b6df49885b0daefc5e5 SHA512 28b506dedde18a05861e6cf2d8f530436da873ab5ece5db164baab4deffac2a3bbff6e6a5052da795cb9f2abd2ce55256e2d68127aa6f11d4611137dafa85fa4
 DIST qtxmlpatterns-everywhere-opensource-src-5.15.8.tar.xz 5210520 BLAKE2B 7a812012a4c1c08cbb63ef7da78ded596d8c6640bd52379a19d177638b6672e121c611bdb95220b34577945fda4b6dae781cf8353c406cb0b5f6b97daff53201 SHA512 150a1425b763d42d8fa8f06a520ed5280ac6d7874e5ef0b617bd5a452ea1899d96909a4d04bae030256f7acc8a76f6f434a7aafd0a0756abf3f1534ef4a0a0b6
-EBUILD qtxmlpatterns-5.15.7.ebuild 808 BLAKE2B 2c686a6a8b5382b6a0885a6b230bf7a6de1f400afc5ba33a15313ac4fd5ebc169784a175d3ae4d223cc2e63947777f9d8d236debc2343eb611cbbb9edfc8c842 SHA512 cb0659f57d7283e5b1174c64170284e06495fd98de769634877b17100371cd7b4fe30c3b7b2ff9d772ae16fd486cb54edf08745fd09c8eea2df2370c984a60d4
 EBUILD qtxmlpatterns-5.15.8.ebuild 808 BLAKE2B ef039715c4b5ce13e0667c1674069fbf650aa588c756a663cec7e589366220f1d8fda1d357deba8b129e3a68f29b42598adbd1708a50d0cad533897090ee8caf SHA512 4697ce50c1ef059088d0448dfa78c1fe93e8a06363e232caa2b32fe49c36dcd014d2585145037ede28c442ece84e1ba6e8114272b509889c4d67116df7da2502
 MISC metadata.xml 590 BLAKE2B 2f67cb5fc0572aa19ed1775ac6a1cf2de7aae77141a76f81ad00d9620c0ba4238c1058ed53bd6332f8862f24cb59f3f23984df84d062c295868f3914ad8efb8f SHA512 50bbcf3579ec5613429e2a7c613e41ccd79d04f0ed7bb2e5db1ae22868aea8922f0b3509bc4fe91ab7cbc9ad6b86bb536993638d3562d811203814e64e2ae22b
diff --git a/dev-qt/qtxmlpatterns/qtxmlpatterns-5.15.7.ebuild b/dev-qt/qtxmlpatterns/qtxmlpatterns-5.15.7.ebuild
deleted file mode 100644
index d36a6f02253f..000000000000
--- a/dev-qt/qtxmlpatterns/qtxmlpatterns-5.15.7.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit qt5-build
-
-DESCRIPTION="XPath, XQuery, XSLT, and XML Schema validation library for the Qt5 framework"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86"
-fi
-
-IUSE="qml"
-
-DEPEND="
-	=dev-qt/qtcore-${QT5_PV}*
-	=dev-qt/qtnetwork-${QT5_PV}*
-	qml? ( =dev-qt/qtdeclarative-${QT5_PV}* )
-"
-RDEPEND="${DEPEND}
-	!<dev-qt/qtchooser-66-r2
-"
-
-src_prepare() {
-	qt_use_disable_mod qml qml \
-		src/src.pro \
-		src/imports/imports.pro
-
-	qt_use_disable_mod qml quick tests/auto/auto.pro
-
-	qt5-build_src_prepare
-}
-
-src_install() {
-	qt5-build_src_install
-	qt5_symlink_binary_to_path xmlpatterns
-	qt5_symlink_binary_to_path xmlpatternsvalidator
-}