gentoo auto-resync : 28:03:2023 - 09:49:10

author: V3n3RiX <venerix@koprulu.sector> 2023-03-28 09:49:11 +0100
committer: V3n3RiX <venerix@koprulu.sector> 2023-03-28 09:49:11 +0100
commit: 115dcc7054f5934a2c8e26fd8a8eed5f3e29e9ce (patch)
tree: c31afe35699960753f76770d6b0b4ea48af9f686 /dev-qt
parent: e292b671b113c2cc012beddad93a3df4f9410698 (diff)
59 files changed, 753 insertions, 1445 deletions
diff --git a/dev-qt/Manifest.gz b/dev-qt/Manifest.gz
index de0754ac1f60..11648ad5dea7 100644
--- a/dev-qt/Manifest.gz
+++ b/dev-qt/Manifest.gz
diff --git a/dev-qt/qt5compat/Manifest b/dev-qt/qt5compat/Manifest
index 07e2fc31a27c..6776c996b2de 100644
--- a/dev-qt/qt5compat/Manifest
+++ b/dev-qt/qt5compat/Manifest
@@ -1,5 +1,3 @@
-DIST qt5compat-everywhere-src-6.4.2.tar.xz 14638200 BLAKE2B 518d254012f65e2f73dbef362abaf5e2890f6b8a97a0e6211b65a92e2e64d149b0fafd39a7f7a9d2f87a6deda04286a0eb2ced56810fb894d5305da5a81f5edf SHA512 8aa49cbbe92e628be3b502bbf0a9668b7664829a12c8cf0eced816cda880d034d567f287d2a1bd1efb7d693b3de7e583d2c2d69e2437cdeda737c67d7949ca56
 DIST qt5compat-everywhere-src-6.4.3.tar.xz 14638428 BLAKE2B 70afd4ff347fc58a4b67ce15d7ccaa542084eeeda672c5f33feedd550cb21a7d93bab192b24ab9b8330aad2a9cfee9f9b47f908cde5667a444f44e0882ceab60 SHA512 22e3d6360afdb83b4bd122153cf3bba09d8593dbdd65ccf5b80e032b9de437f868b05c7170e636fd6bd8f42dd1eb56b07f21b73fd0c4a5437fcb72aa070d830b
-EBUILD qt5compat-6.4.2.ebuild 358 BLAKE2B aab99f2828cd5855a96cd9faa547326a7d5ab822b046992e869caf648dd9d2ff5acce124ba012b3a9231d7da66cc316c7e94f3dd48ae4157f8ad74347763085e SHA512 8aed9d94121bad08c4d0d216612bbb94ccbd58d8b0f64d0ad213ae977707b63b9d95d95edebeb0353f4a0f0ed37a9fb962f637434e01837ad6528c052bbd062e
 EBUILD qt5compat-6.4.3.ebuild 358 BLAKE2B aab99f2828cd5855a96cd9faa547326a7d5ab822b046992e869caf648dd9d2ff5acce124ba012b3a9231d7da66cc316c7e94f3dd48ae4157f8ad74347763085e SHA512 8aed9d94121bad08c4d0d216612bbb94ccbd58d8b0f64d0ad213ae977707b63b9d95d95edebeb0353f4a0f0ed37a9fb962f637434e01837ad6528c052bbd062e
 MISC metadata.xml 482 BLAKE2B 651a49dc4a07f5e5a9c21990868e666d98acdea7d7b0b2c0e4c98eafc3da72c803d380e4abda30f33250f7bbd7654df713833ccdddcb975cbad6f92e488f643b SHA512 192c670abd7da29645513bf1d9297d942efdc49f5cf170861e7689fda47f51daa47f10c7c81c3b045366e0259179c6839ff7747197c9d792e8d0fd1a5818973e
diff --git a/dev-qt/qt5compat/qt5compat-6.4.2.ebuild b/dev-qt/qt5compat/qt5compat-6.4.2.ebuild
deleted file mode 100644
index e930872d0c3d..000000000000
--- a/dev-qt/qt5compat/qt5compat-6.4.2.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit qt6-build
-
-DESCRIPTION="Qt module containing the unsupported Qt 5 APIs"
-
-if [[ ${QT6_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64"
-fi
-
-DEPEND="
-	=dev-qt/qtbase-${PV}*[gui,network]
-	=dev-qt/qtdeclarative-${PV}*
-"
-RDEPEND="${DEPEND}"
diff --git a/dev-qt/qtbase/Manifest b/dev-qt/qtbase/Manifest
index 31d8e3088d52..b3931ad64d02 100644
--- a/dev-qt/qtbase/Manifest
+++ b/dev-qt/qtbase/Manifest
@@ -1,6 +1,3 @@
-AUX qtbase-6-march.patch 1985 BLAKE2B 0ef98173d63ad882489ed37256971a4213807c88d8863f37593e73451d258d23c491ffcb59d068f3843b358cca3cdc803c9813c774df4f9b63fe1e76d6db8d53 SHA512 11137df13f9145fed72a4d157ef7fd9d9db15650c6519695743756c24605f3a32279fba0621165ec78f5b3349a5481e9ba723973f5c03545d3b37bc0c84bc78f
-DIST qtbase-everywhere-src-6.4.2.tar.xz 47987188 BLAKE2B 5d25d8b912ba775faa5855ad4326cbd19580cc7f98b997a9bbdb4a2216550a60b2c8a7a2ef1741a5dfd66ebde0d1cf5d0394215474c39c7779648b03c3892812 SHA512 b00cce7bfc29d3a34c9a2f08db147c4bfd962e178916d60033e1845b25eaeaa4fbd42f5c1d7e39453ddb412a4e91c22c8eae52745eda8a47e35a691054d5496e
 DIST qtbase-everywhere-src-6.4.3.tar.xz 48078536 BLAKE2B 36d693535479677ca319485634c3eea9dc3c8e8870c8e3cab7693cab601f26c6f792ec056b66488db290defc771b65cdffdea16b420a24ea55e5c4f250119a70 SHA512 a2d0779ba7ee8b8b78f5dc8db06177d04d50463fea7cad0b7785721acfc33dbbbaa1a7bfc052edb90ba1d11b488c30004daa43b6924a97126b9b8f82ad1a7f43
-EBUILD qtbase-6.4.2.ebuild 4969 BLAKE2B f60db5e9adf74a653734311049ac38e1cf057033c5e9113afc2352a000cac177375e9f216fcb037ec3271e15d061d4990c406cbfd12553e5693c3deedef19efb SHA512 1c8de19016f36bb0fd41b32dff570ec13c8efccf48ef207f74b53cafabf167355758b27f70d3e306988f0ef5c233c1ea619ee6862f2d39cc87f7441e7a699a88
 EBUILD qtbase-6.4.3.ebuild 4902 BLAKE2B 748a446df419923ce9ed5c0efcc5546ef7d6353dbc06d4f458c36eca68d4f87d30a2686c9d1debaa97d3cd931878e06ba5175462f1b3c503c98b364c1779d84f SHA512 dca6f7eb38366deb28c5ce79a5d5555974c05edaedf422cc9b8e3ccffc1cde7e653c01b0fe03b5f568fb8519c824c1d49e0b48d3270fa3f816ec286cda98b3f8
 MISC metadata.xml 1817 BLAKE2B 8f5b89970837847b5a81326445309f706316943d65ab909c0f0407e95dd5770d9d02a16ad1380a8b1eaee3d251bdc79fba4fee49be688f6db84c1c598de959e0 SHA512 1e650288d6f9e53560163e911ac9f80017e35eaed6b77031f66996e7f7bc3811735e5d9fccd6cddead4c5aaa88ccc032277bb4db45df227ca3a34a643d41c918
diff --git a/dev-qt/qtbase/files/qtbase-6-march.patch b/dev-qt/qtbase/files/qtbase-6-march.patch
deleted file mode 100644
index 2c5cb0a010cb..000000000000
--- a/dev-qt/qtbase/files/qtbase-6-march.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-https://bugreports.qt.io/browse/QTBUG-111698
-https://bugs.gentoo.org/898644
-
-From 5fe96c901cd1ecd3e53acedeb97efd38b6af49a4 Mon Sep 17 00:00:00 2001
-From: Mike Gilbert <floppym@gentoo.org>
-Date: Wed, 1 Mar 2023 21:31:22 -0500
-Subject: [PATCH] Don't error on partial support for x86-64 v3/v4
-
-Bug: https://bugs.gentoo.org/898644
----
- src/corelib/global/qsimd_p.h | 12 ++----------
- 1 file changed, 2 insertions(+), 10 deletions(-)
-
-diff --git a/src/corelib/global/qsimd_p.h b/src/corelib/global/qsimd_p.h
-index 1d12902a0a..1449d75d5c 100644
---- a/src/corelib/global/qsimd_p.h
-+++ b/src/corelib/global/qsimd_p.h
-@@ -227,11 +227,7 @@ asm(
- // macOS's fat binaries support the "x86_64h" sub-architecture and the GNU libc
- // ELF loader also supports a "haswell/" subdir (e.g., /usr/lib/haswell).
- #  define ARCH_HASWELL_MACROS       (__AVX2__ + __BMI2__ + __FMA__ + __LZCNT__)
--#  if ARCH_HASWELL_MACROS != 0
--#    if ARCH_HASWELL_MACROS != 4
--#      error "Please enable all x86-64-v3 extensions; you probably want to use -march=haswell or -march=x86-64-v3 instead of -mavx2"
--#    endif
--static_assert(ARCH_HASWELL_MACROS, "Undeclared identifiers indicate which features are missing.");
-+#  if ARCH_HASWELL_MACROS == 4
- #    define __haswell__       1
- #  endif
- #  undef ARCH_HASWELL_MACROS
-@@ -243,11 +239,7 @@ static_assert(ARCH_HASWELL_MACROS, "Undeclared identifiers indicate which featur
- // with AVX512 support and it includes all of these too.
- //
- #  define ARCH_SKX_MACROS           (__AVX512F__ + __AVX512BW__ + __AVX512CD__ + __AVX512DQ__ + __AVX512VL__)
--#  if ARCH_SKX_MACROS != 0
--#    if ARCH_SKX_MACROS != 5
--#      error "Please enable all x86-64-v4 extensions; you probably want to use -march=skylake-avx512 or -march=x86-64-v4 instead of -mavx512f"
--#    endif
--static_assert(ARCH_SKX_MACROS, "Undeclared identifiers indicate which features are missing.");
-+#  if ARCH_SKX_MACROS == 5
- #    define __skylake_avx512__  1
- #  endif
- #  undef ARCH_SKX_MACROS
--- 
-2.39.2
-
diff --git a/dev-qt/qtbase/qtbase-6.4.2.ebuild b/dev-qt/qtbase/qtbase-6.4.2.ebuild
deleted file mode 100644
index c6545a5f1a0c..000000000000
--- a/dev-qt/qtbase/qtbase-6.4.2.ebuild
+++ /dev/null
@@ -1,189 +0,0 @@
-# Copyright 2021-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit qt6-build
-
-DESCRIPTION="Cross-platform application development framework"
-
-if [[ ${QT6_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64"
-fi
-
-# Qt Modules
-IUSE="+concurrent +dbus +gui +network +sql opengl +widgets +xml zstd"
-REQUIRED_USE="
-	opengl? ( gui )
-	widgets? ( gui )
-	X? ( || ( evdev libinput ) )
-"
-
-QTGUI_IUSE="accessibility egl eglfs evdev gles2-only +jpeg +libinput tslib tuio vulkan +X"
-QTNETWORK_IUSE="brotli gssapi libproxy sctp +ssl vnc"
-QTSQL_IUSE="freetds mysql oci8 odbc postgres +sqlite"
-IUSE+=" ${QTGUI_IUSE} ${QTNETWORK_IUSE} ${QTSQL_IUSE} cups gtk icu systemd +udev"
-# QtPrintSupport = QtGui + QtWidgets enabled.
-# ibus = xkbcommon + dbus, and xkbcommon needs either libinput or X
-REQUIRED_USE+="
-	$(printf '%s? ( gui ) ' ${QTGUI_IUSE//+/})
-	$(printf '%s? ( network ) ' ${QTNETWORK_IUSE//+/})
-	$(printf '%s? ( sql ) ' ${QTSQL_IUSE//+/})
-	accessibility? ( dbus X )
-	cups? ( gui widgets )
-	eglfs? ( egl )
-	gtk? ( widgets )
-	gui? ( || ( eglfs X ) || ( libinput X ) )
-	libinput? ( udev )
-	sql? ( || ( freetds mysql oci8 odbc postgres sqlite ) )
-	vnc? ( gui )
-	X? ( gles2-only? ( egl ) )
-"
-
-# TODO:
-# qtimageformats: mng not done yet, qtimageformats.git upstream commit 9443239c
-# qtnetwork: connman, networkmanager
-DEPEND="
-	app-crypt/libb2
-	dev-libs/double-conversion:=
-	dev-libs/glib:2
-	dev-libs/libpcre2:=[pcre16,unicode]
-	dev-util/gtk-update-icon-cache
-	media-libs/fontconfig
-	>=media-libs/freetype-2.6.1:2
-	>=media-libs/harfbuzz-1.6.0:=
-	media-libs/tiff:=
-	>=sys-apps/dbus-1.4.20
-	sys-libs/zlib:=
-	brotli? ( app-arch/brotli:= )
-	evdev? ( sys-libs/mtdev )
-	freetds? ( dev-db/freetds )
-	gles2-only? ( media-libs/libglvnd )
-	!gles2-only? ( media-libs/libglvnd[X] )
-	gssapi? ( virtual/krb5 )
-	gtk? (
-		x11-libs/gtk+:3
-		x11-libs/libX11
-		x11-libs/pango
-	)
-	gui? ( media-libs/libpng:= )
-	icu? ( dev-libs/icu:= )
-	!icu? ( virtual/libiconv )
-	jpeg? ( media-libs/libjpeg-turbo:= )
-	libinput? (
-		dev-libs/libinput:=
-		>=x11-libs/libxkbcommon-0.5.0
-	)
-	libproxy? ( net-libs/libproxy )
-	mysql? ( dev-db/mysql-connector-c:= )
-	oci8? ( dev-db/oracle-instantclient:=[sdk] )
-	odbc? ( dev-db/unixODBC )
-	postgres? ( dev-db/postgresql:* )
-	sctp? ( kernel_linux? ( net-misc/lksctp-tools ) )
-	sqlite? ( dev-db/sqlite:3 )
-	ssl? ( dev-libs/openssl:= )
-	systemd? ( sys-apps/systemd:= )
-	tslib? ( >=x11-libs/tslib-1.21 )
-	udev? ( virtual/libudev:= )
-	vulkan? ( dev-util/vulkan-headers )
-	X? (
-		x11-libs/libdrm
-		x11-libs/libICE
-		x11-libs/libSM
-		x11-libs/libX11
-		>=x11-libs/libxcb-1.12:=
-		>=x11-libs/libxkbcommon-0.5.0[X]
-		x11-libs/xcb-util-image
-		x11-libs/xcb-util-keysyms
-		x11-libs/xcb-util-renderutil
-		x11-libs/xcb-util-wm
-	)
-	zstd? ( app-arch/zstd:= )
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/qtbase-6-march.patch"
-)
-
-src_configure() {
-	local mycmakeargs=(
-		-DINSTALL_ARCHDATADIR=${QT6_ARCHDATADIR}
-		-DINSTALL_BINDIR=${QT6_BINDIR}
-		-DINSTALL_DATADIR=${QT6_DATADIR}
-		-DINSTALL_DOCDIR=${QT6_DOCDIR}
-		-DINSTALL_EXAMPLESDIR=${QT6_EXAMPLESDIR}
-		-DINSTALL_INCLUDEDIR=${QT6_HEADERDIR}
-		-DINSTALL_LIBDIR=${QT6_LIBDIR}
-		-DINSTALL_LIBEXECDIR=${QT6_LIBEXECDIR}
-		-DINSTALL_MKSPECSDIR=${QT6_ARCHDATADIR}/mkspecs
-		-DINSTALL_PLUGINSDIR=${QT6_PLUGINDIR}
-		-DINSTALL_QMLDIR=${QT6_QMLDIR}
-		-DINSTALL_SYSCONFDIR=${QT6_SYSCONFDIR}
-		-DINSTALL_TRANSLATIONSDIR=${QT6_TRANSLATIONDIR}
-		-DQT_FEATURE_androiddeployqt=OFF
-		$(qt_feature concurrent)
-		$(qt_feature dbus)
-		$(qt_feature gui)
-		$(qt_feature gui testlib)
-		$(qt_feature icu)
-		$(qt_feature network)
-		$(qt_feature sql)
-		$(qt_feature systemd journald)
-		$(qt_feature udev libudev)
-		$(qt_feature xml)
-		$(qt_feature zstd)
-	)
-	use gui && mycmakeargs+=(
-		$(qt_feature accessibility accessibility_atspi_bridge)
-		$(qt_feature egl)
-		$(qt_feature eglfs eglfs_egldevice)
-		$(qt_feature eglfs eglfs_gbm)
-		$(qt_feature evdev)
-		$(qt_feature evdev mtdev)
-		-DQT_FEATURE_gif=ON
-		$(qt_feature jpeg)
-		$(qt_feature opengl)
-		$(qt_feature gles2-only opengles2)
-		$(qt_feature libinput)
-		$(qt_feature tslib)
-		$(qt_feature tuio tuiotouch)
-		$(qt_feature vulkan)
-		$(qt_feature widgets)
-		$(qt_feature X xcb)
-		$(qt_feature X xcb_xlib)
-	)
-	use widgets && mycmakeargs+=(
-		$(qt_feature cups)
-		$(qt_feature gtk gtk3)
-	)
-	if use libinput || use X; then
-		mycmakeargs+=( -DQT_FEATURE_xkbcommon=ON )
-	fi
-	use network && mycmakeargs+=(
-		$(qt_feature brotli)
-		$(qt_feature gssapi)
-		$(qt_feature libproxy)
-		$(qt_feature sctp)
-		$(qt_feature ssl openssl)
-		$(qt_feature vnc)
-	)
-	use sql && mycmakeargs+=(
-		$(qt_feature freetds sql_tds)
-		$(qt_feature mysql sql_mysql)
-		$(qt_feature oci8 sql_oci)
-		$(qt_feature odbc sql_odbc)
-		$(qt_feature postgres sql_psql)
-		$(qt_feature sqlite sql_sqlite)
-		$(qt_feature sqlite system_sqlite)
-	)
-
-	qt6-build_src_configure
-}
-
-src_install() {
-	qt6-build_src_install
-
-	# https://bugs.gentoo.org/863395
-	dosym ../$(get_libdir)/qt6/bin/qmake /usr/bin/qmake6
-}
diff --git a/dev-qt/qtbluetooth/Manifest b/dev-qt/qtbluetooth/Manifest
index 5c06c29b000a..ed5b84341335 100644
--- a/dev-qt/qtbluetooth/Manifest
+++ b/dev-qt/qtbluetooth/Manifest
@@ -1,6 +1,4 @@
-DIST qtconnectivity-5.15.8-gentoo-kde-1.tar.xz 3388 BLAKE2B 4bb7a04f4727ded42483ad58bfe16fc74ad441423bef641ba03219992c94818ec99a9850a64be8e69f497701867fba502ba468ab6ac3809e5476083b7df3daa3 SHA512 8950506d4f03780187ace868d6133ef9087c980db941c9e10b5d9d926c927d7d3bdafd5988f7f325160d0959a35a5fe5a2723fb1948e90c993e54e39beb2c0cc
 DIST qtconnectivity-5.15.8-gentoo-kde-2.tar.xz 5520 BLAKE2B e847c894f1318d5bc01bea7c8c668f23a725582908ae61d70a258c29c259f3bf79aaf4784cf4c57e08eb3a01e598be6698871e71e8d76cba6affce3164f7920f SHA512 b89e979f372de7a88294dfa7c917b3d736110da7c73c5576bcb0fec8216d206b3da9bed61b7c13d63f677b6547f0fdb06b3e44b014eeafcf6987777d49764ea9
 DIST qtconnectivity-everywhere-opensource-src-5.15.8.tar.xz 2822448 BLAKE2B eb6a05aaf3b0f71df7e122f46444d971ca38d7927a71725b2e3cc3b39566f136fbd765b0072a27c214b43b230bad57deddf6c0cc57b3691331cc80645aa6984b SHA512 d600e7b600a8cc204333b69bbbd37bc6f4d578bf50406a705c9bc9b04a0399461c8cc8e3bf89a8e0a8820897e9d586d77543570de6229a0cfed312b422b9fda6
-EBUILD qtbluetooth-5.15.8-r1.ebuild 694 BLAKE2B 35f95f363984c9f1f93b21c5e94ddaf90904a8db2875a2ab39d5197080aec6102add84d41d2cf028167773ae9d15f390f30fad0c2740dd7d6b91bfb2ec711fb7 SHA512 6874034f4194965e2c85be8681be5f35a810f5a7cbc4c1d3fb0f9abb40692f3d16fb6d38458e50ecf387748ab07ba6d2d349d56dee2a97164cfedb61d3de29be
-EBUILD qtbluetooth-5.15.8.ebuild 692 BLAKE2B 4af9aa0de9cf6e818b91455ad24bcf8ef43ba11fbd065296e913f03d3d2be710b60e5b3a70dde4bcbc9586ae89dae6eb834076d4efbfbfdc7b357bdc1f620e94 SHA512 51a05f1fe96bf9c26063748220eec461f46913359d998d4608908fab21eb272da9441c3bed99a40589461b7a1e27da9dcc5c3750cab2528afdfa949c7c858045
+EBUILD qtbluetooth-5.15.8-r1.ebuild 692 BLAKE2B ecb1016bee2ecdf45dc6e7cf67a5a7ef39b995b72ee8c2bcd6eb1975e32123c183c82f088d20d876603dd5e0a06314ac570b3654ade08f7dc3a5853d576b459c SHA512 90f5b57d1d4530b89f038a1587b54d2e07ba054816d5f551106fc1a6177de5671024d207c8584858fe22275d36d328fef613d887ae11ca7e79f0b20ebdde1b31
 MISC metadata.xml 562 BLAKE2B 89a71be78fc40c86d01afd963f8a8519410086f36b572707e8029ea58e900d7e9563eb1b94fec26c2e078395bfa9ef20149fd8c0b2a5d6c3699198890215ebe7 SHA512 85467596f68320b2cd8440f9587f88992d36915b906a5b9139b29e07a9db9ca31853ae7c379bf90e9178e407ab3e526187ed761cd8cfa155658491ef68bbcf30
diff --git a/dev-qt/qtbluetooth/qtbluetooth-5.15.8-r1.ebuild b/dev-qt/qtbluetooth/qtbluetooth-5.15.8-r1.ebuild
index 37702f9cf833..e93c73abecb0 100644
--- a/dev-qt/qtbluetooth/qtbluetooth-5.15.8-r1.ebuild
+++ b/dev-qt/qtbluetooth/qtbluetooth-5.15.8-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 if [[ ${PV} != *9999* ]]; then
 	QT5_KDEPATCHSET_REV=2
-	KEYWORDS="~amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86"
+	KEYWORDS="amd64 arm arm64 ~loong ~ppc64 ~riscv x86"
 fi
 
 QT5_MODULE="qtconnectivity"
diff --git a/dev-qt/qtbluetooth/qtbluetooth-5.15.8.ebuild b/dev-qt/qtbluetooth/qtbluetooth-5.15.8.ebuild
deleted file mode 100644
index d07e55bbc316..000000000000
--- a/dev-qt/qtbluetooth/qtbluetooth-5.15.8.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-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 ~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 cb2fa1fa71a5..c0909da16613 100644
--- a/dev-qt/qtcharts/Manifest
+++ b/dev-qt/qtcharts/Manifest
@@ -1,7 +1,5 @@
 DIST qtcharts-everywhere-opensource-src-5.15.8.tar.xz 4254148 BLAKE2B b47fbd092d30a9a18f31072c485e30bd25b3a88bcd3260ceb2e9fa3e3df04dc2a74775f5520cbb3f115956cc68ca44f7da3653138fa209e35256e1b6f108082b SHA512 1c57e2f92d33c038ddf17fa5f8863b474f229fb2d8f2eb16e8f48455c98b3f500d3a7d73423c0512b6c44ad33227fac3fca624bfcdbc4bbcf64da54f79b4ac7b
-DIST qtcharts-everywhere-src-6.4.2.tar.xz 4387080 BLAKE2B 5ea177f2c7cf121bfe1569e73898e812f23ac337e3567625e0d602715f95ea9eccc253369e693f206b7cbcc9a64d23a94a0467a2919be9755bcf2b7263fa3d0c SHA512 b3ee07e4a745d0bf657cc0b7419df3511446a2f7fbfa5cf98e7ae0af479214528bb19fea7b9f68f5a3f975b89b2df10cb0c7a6b709170b5d910bc38466c4b35e
 DIST qtcharts-everywhere-src-6.4.3.tar.xz 4386856 BLAKE2B 6085c66dedd26c5712c462dfe4a55246b5d694a46f31afa72eabe1f47fe3d9834b782343dbe1166c7100732f085601688decab7de087e5b34b5522df368f198e SHA512 369e5e69596a0fc4be1c3ab936d32e3690d2efe5bf28344ef71022af209813a5f1435f11ad7ed42f3dd825471d2e2d38c33564bfa514ddf8dc173b708afa3994
 EBUILD qtcharts-5.15.8.ebuild 572 BLAKE2B 8b157c6f720fd9befa6b1cd25fbe018b72936c88b3b47b3744e9080bb48c78f46538df11f52498237b01967fc7c26ffaf172f24a7a1ca1e8107269aa61951bd3 SHA512 42a14766f3898d45ce51b03680f7751dad7c0cf250e7b7de7af3ab012f5168bf2aa1969d701243af5038049042e4d57d7eb66b79899048c917b4358ab9ceb4d2
-EBUILD qtcharts-6.4.2.ebuild 364 BLAKE2B b637c8d9924182c03b7998406c3ccbfd71be22400c4b4aad50cd5bd10b17c4d510a737dd1a2b0f582cdcc408c0e2852fc8402196bf2ecb3929d49a19d30a7efe SHA512 2daf6d829c87ecf1938d8a7447feef5d5e8bdd42075ad3571014c40c192293461235ae4cd1161cccf02ac94d1c7330b26b49f06b5294745e7d22f0f97750a716
 EBUILD qtcharts-6.4.3.ebuild 364 BLAKE2B b637c8d9924182c03b7998406c3ccbfd71be22400c4b4aad50cd5bd10b17c4d510a737dd1a2b0f582cdcc408c0e2852fc8402196bf2ecb3929d49a19d30a7efe SHA512 2daf6d829c87ecf1938d8a7447feef5d5e8bdd42075ad3571014c40c192293461235ae4cd1161cccf02ac94d1c7330b26b49f06b5294745e7d22f0f97750a716
 MISC metadata.xml 562 BLAKE2B 89a71be78fc40c86d01afd963f8a8519410086f36b572707e8029ea58e900d7e9563eb1b94fec26c2e078395bfa9ef20149fd8c0b2a5d6c3699198890215ebe7 SHA512 85467596f68320b2cd8440f9587f88992d36915b906a5b9139b29e07a9db9ca31853ae7c379bf90e9178e407ab3e526187ed761cd8cfa155658491ef68bbcf30
diff --git a/dev-qt/qtcharts/qtcharts-6.4.2.ebuild b/dev-qt/qtcharts/qtcharts-6.4.2.ebuild
deleted file mode 100644
index 92c6cf414b07..000000000000
--- a/dev-qt/qtcharts/qtcharts-6.4.2.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit qt6-build
-
-DESCRIPTION="Chart component library for the Qt6 framework"
-
-if [[ ${QT6_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64"
-fi
-
-DEPEND="
-	=dev-qt/qtbase-${PV}*[gui,opengl,widgets]
-	=dev-qt/qtdeclarative-${PV}*
-"
-RDEPEND="${DEPEND}"
diff --git a/dev-qt/qtcore/Manifest b/dev-qt/qtcore/Manifest
index 425fee901aca..9fdcae2de110 100644
--- a/dev-qt/qtcore/Manifest
+++ b/dev-qt/qtcore/Manifest
@@ -1,5 +1,7 @@
 DIST qtbase-5.15-gentoo-patchset-3.tar.xz 3856 BLAKE2B 0752426f9bc2dfa1ab2bc246b29f5d00305df05175a7801d7d5eddacfa46fcb605d9a317547edc01d3ef339f6effc2fcee7549cb7aecced37f0098166c70dbe2 SHA512 2515bea53232e76ca3e40bdaf1dd52fdf452052a2f40002ee91360d1fcceea3c5c2f5a8d2a3bfc0f9c2bacd61460a632c5b351accd73fd37b64985593219148e
 DIST qtbase-5.15.8-gentoo-kde-5.tar.xz 793372 BLAKE2B f486a0275fdf4da28a88ba40b7e6f227267fa05e8f466f734f720e792de1796501d5f1fb4427a84ca2d709bfa07abd695ad59210f7fd11227b1bf465484736b8 SHA512 f51d7ee2d121acda1141b9816197afc57ac0176a12acc08a93c2a793694afb734f8f1ad280a5bf95170cf912e32edb4a6612befeb4198fec78a7e50bbb6a61cd
+DIST qtbase-5.15.8-gentoo-kde-6.tar.xz 796880 BLAKE2B 014fd9c9693fe1a5adc54f1d147db4bbb4bf6f5fbde5950a9586a6868d16b63b83cf24821c33fd2a325d6b70a1fa655b0fc0da7ef74ae175e278ebda1f8c9aa4 SHA512 910a7e42e13f33b53984b4f61c58e53c1cf0accfa9eb1e143cc011882fff6cab14fa7c66562396b3a929f5ec6ecf56724d74df34ac15f32cc4d8ae6cb8da797b
 DIST qtbase-everywhere-opensource-src-5.15.8.tar.xz 50259432 BLAKE2B cb1b790a384a5cad9a95fdc448e275d48a68c6ee2addf08b40f9963cc5762fd7ab15852dea8392dc76da39f1565c1e23ddb5875c280f0177e802082f4b4f7f2b SHA512 29e8877bafdbc908072209f1b27a5040b022e2b71f17f4ab4cecd570adeae21597f9af7f1d38758760f3cb30376eeb15c5f066bf02c6e9a9e3a4d07f967046ce
 EBUILD qtcore-5.15.8-r3.ebuild 3101 BLAKE2B 8210baf74e0b5540a0cf5626a343a71486bb916e5a8d233b9c73598a926fbf018b48fa489ec60f7219388862bdec0af1aeb3ec242ca768eba93c07cba97f9ed1 SHA512 535109e632ff78bd42cd468015a4622d67a230eddd03bf9c970dad50b4fdf52968bb99b5162fbc510bc2e5ff702cfe4b7911ecf2342013efdc82949995d62604
+EBUILD qtcore-5.15.8-r4.ebuild 3107 BLAKE2B fe3e2a30efcd42176f3d41d77e9fbb837bdcfa098bf30aa3cbb9ff46598d32890c4b71d1e623340f4947c32985651d4fcaad2a2a0272664e866bbfe4c5bb923d SHA512 9ed7ccb069bf037cac68445710037929f746d3363df6fd5b975d971bbe073ec039d363d86144179b77fa2897b4d20277daaa2f69e8038170db4eae9477bcec70
 MISC metadata.xml 833 BLAKE2B 79b441c34e55017f23dd85cdb062ef4cbcfce05dff74936de887256ba8b9b596632b570b55b7014c38467829751771bb116f067cd6a246a11309f20b67fb55f0 SHA512 f1ffedc2ad17d198ba14a9a93e6c8dd35a7709e6f1e07dae606c16c05868f2f8e696f25fa5cf2602ed50f41eb5a914ff0d652b9ac37163e5130ddbfb475a1ff5
diff --git a/dev-qt/qtcore/qtcore-5.15.8-r4.ebuild b/dev-qt/qtcore/qtcore-5.15.8-r4.ebuild
new file mode 100644
index 000000000000..0f9acb2db2e4
--- /dev/null
+++ b/dev-qt/qtcore/qtcore-5.15.8-r4.ebuild
@@ -0,0 +1,123 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+if [[ ${PV} != *9999* ]]; then
+	QT5_KDEPATCHSET_REV=6
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+fi
+
+QT5_MODULE="qtbase"
+inherit linux-info flag-o-matic toolchain-funcs 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
+
+	# Leads to miscompiled qtcore, bug #865339
+	tc-is-clang && append-flags -fno-stack-clash-protection
+
+	qt5-build_src_prepare
+
+	# workaround for 0148-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/qtdeclarative/Manifest b/dev-qt/qtdeclarative/Manifest
index bde2f5e01b82..55b0628cdab1 100644
--- a/dev-qt/qtdeclarative/Manifest
+++ b/dev-qt/qtdeclarative/Manifest
@@ -1,9 +1,7 @@
 AUX qtdeclarative-5.14.2-QQuickItemView-fix-maxXY-extent.patch 1566 BLAKE2B b6436c9be0a7de092635e1fc3999c3142fc3e916cbcc69f472691bbd559f611b4d5741f3627c47162a5ac86126382507add72a25a121235e856b1de802ee19be SHA512 dd5193f8d8a051238dabf63306cc77e3a5696fc12241c27f35cadfd30763ddfeb2af7d640849dcc7a810b7087173b8e9af17341ea1b68440906f2c2f1f96fee3
 DIST qtdeclarative-5.15.8-gentoo-kde-1.tar.xz 19932 BLAKE2B e889597ce322d642f0a1a60fd47b23a34b7d40585ab34841cfbce2225c24a4c56075698a3c9b9b93eb8dce80f2a42140269b84538a6c2817997221404892c180 SHA512 88c9483fca6eb10ecf4810dac369260b7d85372a1b698ea9587201398f65d442b6f8bd87603a277acc71f94e6f7cff2cca750888261a3b31c2734c09415d1fd3
 DIST qtdeclarative-everywhere-opensource-src-5.15.8.tar.xz 21592984 BLAKE2B 623264ffcca9f623896d73ce946cc0f621bdae50b520e454b59a1888a2c767f0ff089f69ed1c5e028d01fd28ae447add826fb09c615718af61e787fa1849b16e SHA512 c611cc1d25b7eea1da3e5932d253d024459044d8fff6a31066033ea5867dd20aeb183b2d2ba8a2ca71cf263fc1921126509212dd43ab680134e7a9df8d937d73
-DIST qtdeclarative-everywhere-src-6.4.2.tar.xz 30564432 BLAKE2B b445672bfd91978855d11eac953c01902522ffe5c3bb48296f926be6234ee7dccfbb3386478633b81a44cbb067ef2078cf3c05a0b7358ae15e635c0d5ab9ccc6 SHA512 76742b8b0902802c1d7615c8b7948b245a535c5f9574893d0fc5f8e09cb914578c1243be23dee37f98bd037e9407f82bc71b22b688067aaa68efcec1db8f922a
 DIST qtdeclarative-everywhere-src-6.4.3.tar.xz 30556972 BLAKE2B a8020e59f9195e83e211db2dbb6054e66e51349f278a4bc3a24719591764b78983fbf2ead40c80f58f1feddf1ff43033c6216bf9690910169bd54fa1d8473c96 SHA512 ba1a477d4e388e93cdbf76c594650b431fbea1212af110fda994fa1ebca0d6cf2dba699c995744deba71bad2a9c45d214b671ddef01a995d7c6c82c61ef82aa2
 EBUILD qtdeclarative-5.15.8-r2.ebuild 1537 BLAKE2B 6a289e389c041d25520253d5bbaa0bf428abbed7bb0ecaf25df696276729b3879955b78eeeccf55303cf3ee2b49fa51a1e0426d9dd75901bcf67148c22b617db SHA512 9ce75f2f9dc0141bc351ac57492b2cb1c98eabc81a7245d6b3de5050e87d5335e08def97690a5e695dac95b4f0e337f3d41b259e0f8d2d21290bfb0e3ce9bdae
-EBUILD qtdeclarative-6.4.2.ebuild 521 BLAKE2B f353152ff22805e1bf694df508c61f40bcf67b72e256bc4bc9cdc6f41dd7df855f6f28389ccfc6d4ad8254db4f7e27347b0413d7f946595452993111f1bd94fe SHA512 80299b3c62f099f5f71fdcfb17fba7f7a2b429747b29f24b67b4fd6be3ff53e74b4793e6b2fa3eb68524779c5a160a747c7ee1580bf3d2b738c0f17582728ea8
 EBUILD qtdeclarative-6.4.3.ebuild 521 BLAKE2B f353152ff22805e1bf694df508c61f40bcf67b72e256bc4bc9cdc6f41dd7df855f6f28389ccfc6d4ad8254db4f7e27347b0413d7f946595452993111f1bd94fe SHA512 80299b3c62f099f5f71fdcfb17fba7f7a2b429747b29f24b67b4fd6be3ff53e74b4793e6b2fa3eb68524779c5a160a747c7ee1580bf3d2b738c0f17582728ea8
 MISC metadata.xml 799 BLAKE2B d83b1968260ec3b1de9c62454382de42f214c985171c04f98377cd7e1c3a167b5a7707b328d0ffd700e525e7bfa82780907d7358df350a0a9922f36cac940d17 SHA512 b798e3e434f485c82fb058939e864a98dd86b5c2d5df902de256e461d37371291bf0159f31ff474be36d129effb0556e27eb5a5e95ab850fd987fa30f8caecf1
diff --git a/dev-qt/qtdeclarative/qtdeclarative-6.4.2.ebuild b/dev-qt/qtdeclarative/qtdeclarative-6.4.2.ebuild
deleted file mode 100644
index 8c9a771cc98e..000000000000
--- a/dev-qt/qtdeclarative/qtdeclarative-6.4.2.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 2021-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit qt6-build
-
-DESCRIPTION="Qt Declarative (Quick 2)"
-
-if [[ ${QT6_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64"
-fi
-
-IUSE="opengl +sql +widgets"
-
-DEPEND="
-	=dev-qt/qtbase-${PV}*[network,opengl=,sql=,widgets=]
-	=dev-qt/qtshadertools-${PV}*
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		$(qt_feature opengl)
-		$(qt_feature sql)
-		$(qt_feature widgets)
-	)
-
-	qt6-build_src_configure
-}
diff --git a/dev-qt/qtgui/Manifest b/dev-qt/qtgui/Manifest
index 9fc1efe539b7..4342b4b261fa 100644
--- a/dev-qt/qtgui/Manifest
+++ b/dev-qt/qtgui/Manifest
@@ -1,5 +1,7 @@
 DIST qtbase-5.15-gentoo-patchset-3.tar.xz 3856 BLAKE2B 0752426f9bc2dfa1ab2bc246b29f5d00305df05175a7801d7d5eddacfa46fcb605d9a317547edc01d3ef339f6effc2fcee7549cb7aecced37f0098166c70dbe2 SHA512 2515bea53232e76ca3e40bdaf1dd52fdf452052a2f40002ee91360d1fcceea3c5c2f5a8d2a3bfc0f9c2bacd61460a632c5b351accd73fd37b64985593219148e
 DIST qtbase-5.15.8-gentoo-kde-5.tar.xz 793372 BLAKE2B f486a0275fdf4da28a88ba40b7e6f227267fa05e8f466f734f720e792de1796501d5f1fb4427a84ca2d709bfa07abd695ad59210f7fd11227b1bf465484736b8 SHA512 f51d7ee2d121acda1141b9816197afc57ac0176a12acc08a93c2a793694afb734f8f1ad280a5bf95170cf912e32edb4a6612befeb4198fec78a7e50bbb6a61cd
+DIST qtbase-5.15.8-gentoo-kde-6.tar.xz 796880 BLAKE2B 014fd9c9693fe1a5adc54f1d147db4bbb4bf6f5fbde5950a9586a6868d16b63b83cf24821c33fd2a325d6b70a1fa655b0fc0da7ef74ae175e278ebda1f8c9aa4 SHA512 910a7e42e13f33b53984b4f61c58e53c1cf0accfa9eb1e143cc011882fff6cab14fa7c66562396b3a929f5ec6ecf56724d74df34ac15f32cc4d8ae6cb8da797b
 DIST qtbase-everywhere-opensource-src-5.15.8.tar.xz 50259432 BLAKE2B cb1b790a384a5cad9a95fdc448e275d48a68c6ee2addf08b40f9963cc5762fd7ab15852dea8392dc76da39f1565c1e23ddb5875c280f0177e802082f4b4f7f2b SHA512 29e8877bafdbc908072209f1b27a5040b022e2b71f17f4ab4cecd570adeae21597f9af7f1d38758760f3cb30376eeb15c5f066bf02c6e9a9e3a4d07f967046ce
 EBUILD qtgui-5.15.8-r3.ebuild 3836 BLAKE2B 6b35db18970ba14fdddfaf066c32d4463572e95e3210993a364cc32b0f1c7e88340efcca888bb1e6a49cddc84fc837c3f22b836761a5b8bd733b2eafb01e3859 SHA512 580277345d941089306cf416d143ee0cb6c03b83d9a0dd939ff4e66c784fcb1ef3067a3692b50d1b59453ae1ad5d269aee5d1cdc3be5e206c6ed4cdb19cbb454
+EBUILD qtgui-5.15.8-r4.ebuild 3842 BLAKE2B 61d69b6b00f2427a8b4c25b249442404baae909b3aaa6c0093ca1f8982d16980bdee9634b4d76c5c4ca80b3922fba2142649815fb319e363a51f4d2ab85f8db8 SHA512 477c95e0f3d17d1f4e00b39ec983455d690d7d2efeea77400f20a66bc225a712c87d621f36ac3f81f02c68f970ab60be4791ee2bf2ba048b5584045abff4624e
 MISC metadata.xml 1387 BLAKE2B a370bc2dc77b3efcca29b46e9690b1b5e5c08c5fbfcf06211c1a384c9b998517b4da4357b1cc33998d4f480f9c5481e41b42f3b20f8f72d2635b317ed1d5b412 SHA512 ffa4622291427193109a83d422ff53f373fc3eb7449855849f0f39091383abc30fbfcb88a7d53e29bf2d39e1ec1c40f7aac7433b4d7c0aeefd48983047e912d5
diff --git a/dev-qt/qtgui/qtgui-5.15.8-r4.ebuild b/dev-qt/qtgui/qtgui-5.15.8-r4.ebuild
new file mode 100644
index 000000000000..9e6464df2a92
--- /dev/null
+++ b/dev-qt/qtgui/qtgui-5.15.8-r4.ebuild
@@ -0,0 +1,177 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+if [[ ${PV} != *9999* ]]; then
+	QT5_KDEPATCHSET_REV=6
+	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
+)
+
+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/qtimageformats/Manifest b/dev-qt/qtimageformats/Manifest
index c420fd8b1abe..6a811be6f38c 100644
--- a/dev-qt/qtimageformats/Manifest
+++ b/dev-qt/qtimageformats/Manifest
@@ -1,10 +1,6 @@
-DIST qtimageformats-5.15.8-gentoo-kde-1.tar.xz 5000 BLAKE2B 1d1a5054267bf8e28051e4bdd6e2cb62f59dfc386d3d888071bab74fe818b7daec46baf9f9cd7d8bfad3e179c2d2c811e983008a7451255cf450f733988f3bb8 SHA512 68da3c1ee6f33dfdadd6e1ec7bca6a7c0f16671ebed232a4c12aac4d4fe2e61295901082362efd0b4e69c5576b35370a92063630da251bd71ff7d275825400d9
 DIST qtimageformats-5.15.8-gentoo-kde-2.tar.xz 6964 BLAKE2B 934e35ef39ba3e41d87842d5883cfef1e21f36fa3abbe20851cef33c4b652eab74b4dc704b926aaaecf6927183a36167c0879593511bf143749e51cea82feee9 SHA512 a5d1e3ef2706e4d28f0f72199f422c3c41b11836bbafee6800cfb498e242c3587c8d076ca1770e5b88e1b18590ef0a3e0bb98328aa87524c6f4c7ac385b995bb
 DIST qtimageformats-everywhere-opensource-src-5.15.8.tar.xz 1843016 BLAKE2B 55f4a0b212e63483d23a8a962ffafd826994088e00025291a502d371540e2d88217f5caeea03d40347ff756033b47ffa71e1e250673b977013b7dd5d190b0e7c SHA512 e601a1ebd0881e59c1f87df748faf63df12f552fe668d16af27a58421848ba4de822b4dc3fc54f23c17b818408b6af2edbfb0b59c29e7da8a272d25ac51d7cdd
-DIST qtimageformats-everywhere-src-6.4.2.tar.xz 1938812 BLAKE2B 65d1e5e7c415397cb411acc60fdb7ba316e986de30eb23a14c92f4fa6d3280bbb7aab2e592fd6d360052ba757472e8fd0aa35212fa3be545e07a4714bfe93ac7 SHA512 2bda0001295d1a27ee3018d7a7236525ee41f7de33d58805a71277b5a7d8f9506687a7bb9d6630e32cbcb89e340048591e9f9d29833a3bb4d8168c4779dc5320
 DIST qtimageformats-everywhere-src-6.4.3.tar.xz 1962440 BLAKE2B c03c82d8a2ec1608e61ba5ca09078fabe055e700ab8d9462f48c62b9e8e3ee6dc0b90edee2400a418bca96dd8037cce0e64a14701c4dc788f5400a56093f257d SHA512 8e165986394c184520412533fbe088577d3a5661fecee8ef7938467ad329da28aa2771721f7ed84c75f1878426d24a17812aee3c492da68618cf6bbcc5580a36
-EBUILD qtimageformats-5.15.8-r1.ebuild 698 BLAKE2B ad1a859438729b83988a8ca0a97b2e75b295f0f077a8cc93b2157f828238623e16d60fd4de835ce1b93851d55c4cfb308868ea76cd61ba5db04f733f11c61f76 SHA512 a74183f207d9008a88b0fc9140349c56f555d613ae6c12b9c0615c440ce982ad7739ae61bc079352a14f66198d00dc7d04abe5e5bf6dd4b358cc45ea71f8af43
-EBUILD qtimageformats-5.15.8-r2.ebuild 699 BLAKE2B 96d447d7e97fa06c728a01a9c8d0a283c346716cf4a42161f0f8bdff3c1707fd2afd43a85bbc57ebd893122ed05cc71c3af6e5f170d65b3ec1160d6d699048f9 SHA512 5f33f1cda063f6f8f357bb92210f7a1667b723f83c81a630fb8d524de7761e45d0bed815fbb5c0d29b82b5b868cba3b64eacff415f6ccf309eff45a6bcac3aa6
-EBUILD qtimageformats-6.4.2.ebuild 633 BLAKE2B 11de4650840755a4b30608ebbcd7db6bcfa2cb18c9e5cbfa12768233fe307e8038e0647062fc4d3a3a30be75515268e300c1859e2a846280f177de5e9a8f7ef3 SHA512 e41c878b72d2fe1e1d38b37265c7aab66c7a183285053aec604541149e81d7300f20901cbfe9ab6537fec168adcc7a9e0bda809db0ed3ea96412bbfa835424f2
+EBUILD qtimageformats-5.15.8-r2.ebuild 698 BLAKE2B ef59b51820973e03dfb7869cb4a09d97dcbeac42d53ce9f675b1a70ff1958f836c2bdf579a206317cca726ccabc85c958dc480cef0405d336aebac227aa38bf9 SHA512 83faf26415c4083fdac0b9418f00aacdbff4e747a5b1af90ff0c02e42f3e1b33a992262f760c9afbc0a2dfd07b99f3d18858231d8f2257b23d49d01b78ded07c
 EBUILD qtimageformats-6.4.3.ebuild 633 BLAKE2B 11de4650840755a4b30608ebbcd7db6bcfa2cb18c9e5cbfa12768233fe307e8038e0647062fc4d3a3a30be75515268e300c1859e2a846280f177de5e9a8f7ef3 SHA512 e41c878b72d2fe1e1d38b37265c7aab66c7a183285053aec604541149e81d7300f20901cbfe9ab6537fec168adcc7a9e0bda809db0ed3ea96412bbfa835424f2
 MISC metadata.xml 482 BLAKE2B 651a49dc4a07f5e5a9c21990868e666d98acdea7d7b0b2c0e4c98eafc3da72c803d380e4abda30f33250f7bbd7654df713833ccdddcb975cbad6f92e488f643b SHA512 192c670abd7da29645513bf1d9297d942efdc49f5cf170861e7689fda47f51daa47f10c7c81c3b045366e0259179c6839ff7747197c9d792e8d0fd1a5818973e
diff --git a/dev-qt/qtimageformats/qtimageformats-5.15.8-r1.ebuild b/dev-qt/qtimageformats/qtimageformats-5.15.8-r1.ebuild
deleted file mode 100644
index c546fdded876..000000000000
--- a/dev-qt/qtimageformats/qtimageformats-5.15.8-r1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-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 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/qtimageformats/qtimageformats-5.15.8-r2.ebuild b/dev-qt/qtimageformats/qtimageformats-5.15.8-r2.ebuild
index 2f7d3fe90cfb..a77bab547c05 100644
--- a/dev-qt/qtimageformats/qtimageformats-5.15.8-r2.ebuild
+++ b/dev-qt/qtimageformats/qtimageformats-5.15.8-r2.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 if [[ ${PV} != *9999* ]]; then
 	QT5_KDEPATCHSET_REV=2
-	KEYWORDS="~amd64 ~arm arm64 ~hppa ppc64 ~riscv ~sparc x86"
+	KEYWORDS="amd64 ~arm arm64 ~hppa ppc64 ~riscv ~sparc x86"
 fi
 
 inherit qt5-build
diff --git a/dev-qt/qtimageformats/qtimageformats-6.4.2.ebuild b/dev-qt/qtimageformats/qtimageformats-6.4.2.ebuild
deleted file mode 100644
index ffa831e51aa5..000000000000
--- a/dev-qt/qtimageformats/qtimageformats-6.4.2.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit qt6-build
-
-DESCRIPTION="Additional format plugins for the Qt image I/O system"
-
-if [[ ${QT6_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64"
-fi
-
-IUSE="mng"
-
-DEPEND="
-	=dev-qt/qtbase-${PV}*[gui]
-	media-libs/libwebp:=
-	media-libs/tiff:=
-	mng? ( media-libs/libmng:= )
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		-DQT_FEATURE_jasper=OFF
-		$(qt_feature mng)
-		-DQT_FEATURE_tiff=ON
-		-DQT_FEATURE_webp=ON
-		-DQT_FEATURE_system_tiff=ON
-		-DQT_FEATURE_system_webp=ON
-	)
-
-	qt6-build_src_configure
-}
diff --git a/dev-qt/qtmultimedia/Manifest b/dev-qt/qtmultimedia/Manifest
index 71bab8d73ee7..72d0c2f7d223 100644
--- a/dev-qt/qtmultimedia/Manifest
+++ b/dev-qt/qtmultimedia/Manifest
@@ -1,9 +1,7 @@
 AUX qtmultimedia-5.15.2-no-qtopengl.patch 445 BLAKE2B 9224c90ef5a57b0da8c5ea5a51eb03d4702824fbb435101d5d9d559bdc4d30ece2de7457ed1bb80ca7f028a0b1a5abfa7436501d5d30c87680fb46707de17f53 SHA512 2f3dbb4dcbcedd01e3d911cf1f665e78dc08b383a5c8f2e17f96072330242e7463e6e403159f90f60b799110371ca923f502619548d5db3fd264af4298e4b587
 DIST qtmultimedia-5.15.8-gentoo-kde-1.tar.xz 1328 BLAKE2B ebebf55efbcb94a78fd93dd5312862a465a83bca2494bc04492595523a06afca1de050e12a08ac3a0ed437d7fdfed6223bda9d553de1c2fd7a148df9fc00ce7f SHA512 e83bbad3b46ecab048e97a0facc8374bedb3cf80b0b9eeb4151f9dddd9a79bd2292e49bc2942a5d060fe00f6cd497dc709975cd0451a49ac99beb6f6824fb835
 DIST qtmultimedia-everywhere-opensource-src-5.15.8.tar.xz 3833148 BLAKE2B 3e418a9949517ee42dfda6b51e1e03cd7f4eda7321aed5894eef91562dc6a10caa4654a0c9578a70b74c093e8570488282349abd735b6a79f4b3caaf7f60e250 SHA512 d448a612845e0afb896d6d0292506a8fae7da0b735ee4d139ab69123c93e67723aa41280dea7e704df89e43b849e7f6da3eeea1de94eee167b43d7c35a1a39cd
-DIST qtmultimedia-everywhere-src-6.4.2.tar.xz 5938092 BLAKE2B e232f277160dad1a3b32eff284e05264be8dd0e8247a78873ad422f86167aaf20ea21f7c39d07eb2240b56a0a371e7d38dce95054ae9c840a5d948625583eb25 SHA512 3d89ef97e9c58e9e6de61d3410d382cd2427835d26993a79368790b2aeff572fe1924d4cf9468fe3b7be232f99acb24668fe4d42df654df04af8f3d03d18f851
 DIST qtmultimedia-everywhere-src-6.4.3.tar.xz 5941312 BLAKE2B 968dee6e258621b81d61c8fdc16ca069027d778b6d6c3ca5bd7590c8c7b72210df6217bf7cfc4c6520085b4bc3baf8edec003f9eb844191f90940897a3f25a87 SHA512 1e3d6d9d78acf10863fe2d4624ed044d86149fe8a72c8c47150975eff6f76edcb8a7d4dcdb73ab127ed3cc4414b7f7100b0e9e9c633e50c90ef3c0d36134d9b5
 EBUILD qtmultimedia-5.15.8.ebuild 1569 BLAKE2B b7eeabacb879f077f0db4fb02fd9115eff24dee71731e6e1892e0d51ccc03ba5bcad41ad65f19df19583e71e8ba1ffeb6542c1f919560088d8cefe7eef085228 SHA512 b9d4cb637cd6ae1d8785472f7b62c8f80de4bef1e4762335af2c417953c75cb0c32eda13580ecbc863cad8f4c9b6bbfbeceeafb05b69bded4ca61c9a77c32f03
-EBUILD qtmultimedia-6.4.2.ebuild 772 BLAKE2B 992e1c2af7e095cefcfa4d5be13479b0921246582787b3adf2e69afd113f2da43c67cb97c2aa4ed848f1587389d58e6e3b08114c4310a10a180ddb838e6fe598 SHA512 aaf6d58763fb8892f54885dc9e83d7c524b41a3a71a0a06d7a01a4e5a7f0791cb8be1ad5de490e4b0d4c391b3a05d265dd9f9e93dc32d68eb94293a71b8c24b5
 EBUILD qtmultimedia-6.4.3.ebuild 772 BLAKE2B 992e1c2af7e095cefcfa4d5be13479b0921246582787b3adf2e69afd113f2da43c67cb97c2aa4ed848f1587389d58e6e3b08114c4310a10a180ddb838e6fe598 SHA512 aaf6d58763fb8892f54885dc9e83d7c524b41a3a71a0a06d7a01a4e5a7f0791cb8be1ad5de490e4b0d4c391b3a05d265dd9f9e93dc32d68eb94293a71b8c24b5
 MISC metadata.xml 718 BLAKE2B d3acc9acd94e1da1ab42aae7d809442769d2d5896aca86124daf5e7d9e7140d98f3898809266fcc2aaff5eafa333e90f41f333b2615a558c1cfb52020a452d6d SHA512 ff422b18cf9870677a9cfc7c9f89b976f3c4e3bd16ae5323ee380f3804ea0ff1fac9054022ae9d272e79454c893cea31961cde5bb4d2fc4ea1795e85614122db
diff --git a/dev-qt/qtmultimedia/qtmultimedia-6.4.2.ebuild b/dev-qt/qtmultimedia/qtmultimedia-6.4.2.ebuild
deleted file mode 100644
index 07b0a8706fd5..000000000000
--- a/dev-qt/qtmultimedia/qtmultimedia-6.4.2.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 2021-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit qt6-build
-
-DESCRIPTION="Qt Multimedia"
-
-if [[ ${QT6_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64"
-fi
-
-IUSE="gstreamer"
-
-RDEPEND="
-	=dev-qt/qtbase-${PV}*[gui,network,widgets]
-	=dev-qt/qtdeclarative-${PV}*
-	=dev-qt/qtshadertools-${PV}*
-	=dev-qt/qtsvg-${PV}*
-	gstreamer? (
-		dev-libs/glib:2
-		media-libs/gstreamer:1.0
-		media-libs/gst-plugins-bad:1.0
-		media-libs/gst-plugins-base:1.0
-		media-libs/libglvnd
-	)
-"
-DEPEND="${RDEPEND}
-	gstreamer? ( x11-base/xorg-proto )
-"
-
-src_configure() {
-	# TODO: linux_v4l automagic
-	local mycmakeargs=(
-		-DQT_FEATURE_alsa=off
-		-DQT_FEATURE_pulseaudio=off
-		$(qt_feature gstreamer)
-	)
-
-	qt6-build_src_configure
-}
diff --git a/dev-qt/qtnetwork/Manifest b/dev-qt/qtnetwork/Manifest
index ed715a99ab5d..a1467e47a445 100644
--- a/dev-qt/qtnetwork/Manifest
+++ b/dev-qt/qtnetwork/Manifest
@@ -1,5 +1,5 @@
 DIST qtbase-5.15-gentoo-patchset-3.tar.xz 3856 BLAKE2B 0752426f9bc2dfa1ab2bc246b29f5d00305df05175a7801d7d5eddacfa46fcb605d9a317547edc01d3ef339f6effc2fcee7549cb7aecced37f0098166c70dbe2 SHA512 2515bea53232e76ca3e40bdaf1dd52fdf452052a2f40002ee91360d1fcceea3c5c2f5a8d2a3bfc0f9c2bacd61460a632c5b351accd73fd37b64985593219148e
-DIST qtbase-5.15.8-gentoo-kde-3.tar.xz 782344 BLAKE2B 115814a4d90ac286540cf6e50bd2b57baa8e0e327fc73c3ab06fe43ecd95e1e3739faecee5db112d95d17e4fb84494ad5557e70251f2c60142166715294bf366 SHA512 d50b0f02476ded9f053093ec15c5204a0ec664794dcc324996685f09400a2cbc76dc3fd0ebfc247ebd42fbe203b7d4c904e975fc985bf7928e43c6cd65f04f34
+DIST qtbase-5.15.8-gentoo-kde-6.tar.xz 796880 BLAKE2B 014fd9c9693fe1a5adc54f1d147db4bbb4bf6f5fbde5950a9586a6868d16b63b83cf24821c33fd2a325d6b70a1fa655b0fc0da7ef74ae175e278ebda1f8c9aa4 SHA512 910a7e42e13f33b53984b4f61c58e53c1cf0accfa9eb1e143cc011882fff6cab14fa7c66562396b3a929f5ec6ecf56724d74df34ac15f32cc4d8ae6cb8da797b
 DIST qtbase-everywhere-opensource-src-5.15.8.tar.xz 50259432 BLAKE2B cb1b790a384a5cad9a95fdc448e275d48a68c6ee2addf08b40f9963cc5762fd7ab15852dea8392dc76da39f1565c1e23ddb5875c280f0177e802082f4b4f7f2b SHA512 29e8877bafdbc908072209f1b27a5040b022e2b71f17f4ab4cecd570adeae21597f9af7f1d38758760f3cb30376eeb15c5f066bf02c6e9a9e3a4d07f967046ce
-EBUILD qtnetwork-5.15.8-r1.ebuild 1601 BLAKE2B 149f335ace57a5a5d6b64b32881fa3ab38c560070e5aa6aea3861a40bafe15236cf0c16b1eae70a0395485905a29ef22c934a6f287e2a47a6fb48aabee3990e1 SHA512 769a43a6ee97182cfdef29ac8d33d4560c385a7b7605409b1dd06c486560f4eaefe9bf2ba90518fddb4fce1b8c9d19b659c23bedb030ce64d0d744b5f565f375
+EBUILD qtnetwork-5.15.8-r1.ebuild 1601 BLAKE2B a818051bce6c4692e25a8a3a8cec6bc50d3bd044c9c7061af4f1e3aa4ae47300d7aec513004e822b5085f96a01e4eedfb238a21397238a071948ba7817ad104f SHA512 df891de4e05ea00942e3b1d42d2eb86f23fc4763d5fcb9034ec5d0750ad163637e01814eadb4dcb39677313a15b0a01cc08c0a18f7f6c24b4093ce474f58376c
 MISC metadata.xml 877 BLAKE2B eefc4aa477bcc6ffb2a2fb0711861a9bd7c79af5c5febe0205da57a3fae7206f3ae96dffb8b57e15dfe2f1e26891691886e02984654556d3d53a269dde5ce757 SHA512 dad0239dceb378c1ad4f52c287fb5d61cc248ac533a3df3673b30c0f332eb5cd3a34255052afe2a42084bf1c1d6a1ee501723e43eb268ab5e215fb37f90bcf36
diff --git a/dev-qt/qtnetwork/qtnetwork-5.15.8-r1.ebuild b/dev-qt/qtnetwork/qtnetwork-5.15.8-r1.ebuild
index e531e5fa1abb..e4ae00ebe309 100644
--- a/dev-qt/qtnetwork/qtnetwork-5.15.8-r1.ebuild
+++ b/dev-qt/qtnetwork/qtnetwork-5.15.8-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 if [[ ${PV} != *9999* ]]; then
-	QT5_KDEPATCHSET_REV=3
+	QT5_KDEPATCHSET_REV=6
 	KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86"
 fi
 
diff --git a/dev-qt/qtnetworkauth/Manifest b/dev-qt/qtnetworkauth/Manifest
index cff4b65cb342..05fa2022068a 100644
--- a/dev-qt/qtnetworkauth/Manifest
+++ b/dev-qt/qtnetworkauth/Manifest
@@ -1,7 +1,5 @@
 DIST qtnetworkauth-everywhere-opensource-src-5.15.8.tar.xz 143564 BLAKE2B d3fb7dd18714c4ef82a082df948c9b39aca4969751eec2c4a79257fe14bdb1e70d8ef829fa886935347e3b9a56febad24ff4b4dd4c3c0c35963c4939a787f118 SHA512 1680d6ec84b2fba24c837ff808c5b9e13b73a84c7353f6d533e10986f23f879e0d3ce9cc4ce84000b4cfbd5904e12d975210977f5376b070075c2ec814eb2baf
-DIST qtnetworkauth-everywhere-src-6.4.2.tar.xz 144784 BLAKE2B 45c0aea5880cc036038396fbd967ba03e05c5ad5273f801adc27cb699d526db59fdbab7a11fa00da1afe5a7847dff1cd83fe3c998034e433df80157300afa4f2 SHA512 2a5155cc98f710b5bdb6cb56fca79732dbe8ca37901b4148bc6273a48a7b48dbe846eb2559e8221d52a98723b6bbd5e87d725af22f215985677857fd50064bcc
 DIST qtnetworkauth-everywhere-src-6.4.3.tar.xz 145000 BLAKE2B e6bc69987bb103a07707844c08cd2e0976e09340044a7eac44c1760e05ffbf9db1d12c03f1f476a3100d178fad35e781bddb6a20686afe242d8be4da1d3d957e SHA512 ccb488646f450541ce8546463c99d45d567339f676948e62c013fc0d7588af408c617bb0bec1d122b3fcb42e79d5ce04f5f779ad6d515fa9f223af70f06c84d9
 EBUILD qtnetworkauth-5.15.8.ebuild 402 BLAKE2B f6aada3fab2a9a22353930bcc8c96fd46806ccc46792a9bf770a812245a9b246722101f40c0ac9a8b3fe115a94f38c4d32e988cd23f0f28133ea08e858b95414 SHA512 63a5ddf86500089e2f7fa44ebb585a11bf257222a9a9b96fa8985b5acb56301a8680f04ec0ee4cee0bd9dcd3761031da704f71bd18dfe7c88aeb9fcc308d222b
-EBUILD qtnetworkauth-6.4.2.ebuild 337 BLAKE2B b9d2380c3f88cd04c9ae3c64e799fe978be6d05d6debd960d31018aca0bf67fd7831b17bbb4ed9a917477817b2eb011bbd9141e6b8f4d649179019146de03105 SHA512 11f4aa6fb4fdb30132c344e9fbab81006cba7cc8cf8b5c81339c837940f928a3752ad05d367500811f87f3a606ee432b717cce1dfdf801e6c293e112158cc514
 EBUILD qtnetworkauth-6.4.3.ebuild 337 BLAKE2B b9d2380c3f88cd04c9ae3c64e799fe978be6d05d6debd960d31018aca0bf67fd7831b17bbb4ed9a917477817b2eb011bbd9141e6b8f4d649179019146de03105 SHA512 11f4aa6fb4fdb30132c344e9fbab81006cba7cc8cf8b5c81339c837940f928a3752ad05d367500811f87f3a606ee432b717cce1dfdf801e6c293e112158cc514
 MISC metadata.xml 482 BLAKE2B 651a49dc4a07f5e5a9c21990868e666d98acdea7d7b0b2c0e4c98eafc3da72c803d380e4abda30f33250f7bbd7654df713833ccdddcb975cbad6f92e488f643b SHA512 192c670abd7da29645513bf1d9297d942efdc49f5cf170861e7689fda47f51daa47f10c7c81c3b045366e0259179c6839ff7747197c9d792e8d0fd1a5818973e
diff --git a/dev-qt/qtnetworkauth/qtnetworkauth-6.4.2.ebuild b/dev-qt/qtnetworkauth/qtnetworkauth-6.4.2.ebuild
deleted file mode 100644
index 90c313132402..000000000000
--- a/dev-qt/qtnetworkauth/qtnetworkauth-6.4.2.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit qt6-build
-
-DESCRIPTION="Network authorization library for the Qt6 framework"
-
-if [[ ${QT6_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64"
-fi
-
-DEPEND="
-	=dev-qt/qtbase-${PV}*[network,widgets]
-"
-RDEPEND="${DEPEND}"
diff --git a/dev-qt/qtpositioning/Manifest b/dev-qt/qtpositioning/Manifest
index e82ebab3c15e..fb02cd3066c2 100644
--- a/dev-qt/qtpositioning/Manifest
+++ b/dev-qt/qtpositioning/Manifest
@@ -1,7 +1,5 @@
 DIST qtlocation-everywhere-opensource-src-5.15.8.tar.xz 6559180 BLAKE2B 1b8feb5da8d564a6605d9106ec6399aea23a4f0b43f495baf61e14266e90d2d73cd310fb6d8514730867acba1aa26efb3072c213f22f19f72c2f554d76ab281b SHA512 a337fade917150c13fa2ea22ad1949f41541cea4ceb1f732ab53c20c2f19a63dcfc6f9f544ca64fdb5703d3ac8d2ec6e832f1f199a32e73a2f6c51febf53f514
-DIST qtpositioning-everywhere-src-6.4.2.tar.xz 1493780 BLAKE2B c3b287cea7c41e77228daffca45fa590abe7b242c02107ec5c2884fa95777c5d8a21cec26bcda9c5ef42b2b9eb5ce014a3ad9116269843499c4e107f65e7fd51 SHA512 3f45416c10b437572167374cf1450d8ff138f16028e2f338ea4458de4cd05ba71b7de286f7ffacd8b1808ee78b41afb975cb168a0d27077c981dc1bef1e4d412
 DIST qtpositioning-everywhere-src-6.4.3.tar.xz 1494352 BLAKE2B 07535cf8f53fb2d4a103ffb25f5d80343c01bf69eb7fb78debe6713ca5bbc6fdad760b4c97f4a3c394e3270f0e5345b03c87474e3aad183135cd0b8cd15301b1 SHA512 ad8fa75430ef94596673de15c1067bcf648c76a5e938348b26ee44dae97f17c3d36e5a283a9ee78760be57df3d1390f36f476e47f26928dd72e466e469c795a7
 EBUILD qtpositioning-5.15.8.ebuild 877 BLAKE2B 901e07cc2a16f98840d7361b5db7611406a275116728fe65f28012e03b90f9b797291508623e8ab5a28a10c88d2f8e917145e149ed494355706e12f9b44260d7 SHA512 79aee05d67010aecd2a0d4c802a39bea7f4d63a1a2009ade3df0343e8081c568a374728c818539a23f37e17acd98f47de1cdf825263fb25fcb5bf0988dc13db6
-EBUILD qtpositioning-6.4.2.ebuild 407 BLAKE2B 3716cd42cd651a9bcb3377f4c1b7c2b5b0d3ed96868f12e0761fc63d382796b06c03765d3e852c50be529943e8d9b5cc434ffcdf4d5ee2927ba368c382b141b1 SHA512 d02b98de4f1dc0136eaf9962d8d1eb9cbd1338657a3d903777e8e0da37535eb451fd3c3eae27135c9a3fa274abf4f34f6752dfd9305c86fb87fd64d47e1d6148
 EBUILD qtpositioning-6.4.3.ebuild 407 BLAKE2B 3716cd42cd651a9bcb3377f4c1b7c2b5b0d3ed96868f12e0761fc63d382796b06c03765d3e852c50be529943e8d9b5cc434ffcdf4d5ee2927ba368c382b141b1 SHA512 d02b98de4f1dc0136eaf9962d8d1eb9cbd1338657a3d903777e8e0da37535eb451fd3c3eae27135c9a3fa274abf4f34f6752dfd9305c86fb87fd64d47e1d6148
 MISC metadata.xml 639 BLAKE2B e49b21d1ca752b501e8fd6421e3166f490fd5b304ad04edae73db2634189b63bc3ee321d358ce2ca1b412ec0c1c608327aefc92658b27f28f5ff15b2e41fe31b SHA512 275f24bb9566eace9bb35aea94925088131784b094835fbd4cdfbdc050ec9c411091fa73496de59d28a5d137986a0a6b4ad1cccf06db2e72fb86f31da6b1cc10
diff --git a/dev-qt/qtpositioning/qtpositioning-6.4.2.ebuild b/dev-qt/qtpositioning/qtpositioning-6.4.2.ebuild
deleted file mode 100644
index 60873b452acc..000000000000
--- a/dev-qt/qtpositioning/qtpositioning-6.4.2.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 2021-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit qt6-build
-
-DESCRIPTION="Physical position determination library for the Qt6 framework"
-
-if [[ ${QT6_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64"
-fi
-
-DEPEND="
-	=dev-qt/qtbase-${PV}*[dbus,gui,widgets]
-	=dev-qt/qtdeclarative-${PV}*
-	=dev-qt/qtserialport-${PV}*
-"
-RDEPEND="${DEPEND}"
diff --git a/dev-qt/qtquick3d/Manifest b/dev-qt/qtquick3d/Manifest
index 51ae2510001a..29d571bf0cc8 100644
--- a/dev-qt/qtquick3d/Manifest
+++ b/dev-qt/qtquick3d/Manifest
@@ -1,5 +1,3 @@
-DIST qtquick3d-everywhere-src-6.4.2.tar.xz 42804964 BLAKE2B 6634b27675468887bb0f91e48405eb4dcf063f5f64848ce23af1c64a89a2a853666a9627c1f41dc5fad38916600fbefde3ca5fce1268ae6d6c1bf157709cc63d SHA512 286606571f45a0464a57893880f805a2510ebea9a3cfb92e5225eeb3f9435b2c4d4919ce53c45dcea6ed8f7a9e84dd4afa0a5f631dbc26b3723da637260bb6af
 DIST qtquick3d-everywhere-src-6.4.3.tar.xz 44048520 BLAKE2B 1c93fe90c071323ccc77f18893d669c1abf63edaec442f710c61f358ed2440c8f4c54f037ceab232ce2cd6d3f1bc6f10748e8bf99634b422ce3d1b6aaa2e3ef0 SHA512 511c8585ea8686b1e1cf2e3dd47ac5650ba312d583da7e86dc86aaff6769a5751e3d75ff3fd07664098ba6488f75c9dab68d060b0394ad0182c35c44b5306970
-EBUILD qtquick3d-6.4.2.ebuild 667 BLAKE2B 0cafb500af3c6ee81e35aa86ee82a2d891a4e5537382858d998c865dec646721f698176d523371e4bdbe124dc684900ec08d6a786e0822ca72a3aebecd2bfac6 SHA512 27467129bed7575cdaf45ec48087cce9bc4c5915fc12164dbe710d8096735083ae8fdd671ca184c163194f95dc6c91264fc66623ee1e43ab83dc9e866fe50139
 EBUILD qtquick3d-6.4.3.ebuild 667 BLAKE2B 0cafb500af3c6ee81e35aa86ee82a2d891a4e5537382858d998c865dec646721f698176d523371e4bdbe124dc684900ec08d6a786e0822ca72a3aebecd2bfac6 SHA512 27467129bed7575cdaf45ec48087cce9bc4c5915fc12164dbe710d8096735083ae8fdd671ca184c163194f95dc6c91264fc66623ee1e43ab83dc9e866fe50139
 MISC metadata.xml 482 BLAKE2B 651a49dc4a07f5e5a9c21990868e666d98acdea7d7b0b2c0e4c98eafc3da72c803d380e4abda30f33250f7bbd7654df713833ccdddcb975cbad6f92e488f643b SHA512 192c670abd7da29645513bf1d9297d942efdc49f5cf170861e7689fda47f51daa47f10c7c81c3b045366e0259179c6839ff7747197c9d792e8d0fd1a5818973e
diff --git a/dev-qt/qtquick3d/qtquick3d-6.4.2.ebuild b/dev-qt/qtquick3d/qtquick3d-6.4.2.ebuild
deleted file mode 100644
index 92a82e63dc8d..000000000000
--- a/dev-qt/qtquick3d/qtquick3d-6.4.2.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 2021-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit qt6-build
-
-DESCRIPTION="Qt module and API for defining 3D content in Qt QuickTools"
-
-if [[ ${QT6_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64"
-elif [[ ${QT6_BUILD_TYPE} == live ]]; then
-	# Don't clone qtquick3d-assimp.
-	EGIT_SUBMODULES=()
-fi
-
-DEPEND="
-	=dev-qt/qtbase-${PV}*[concurrent,network,widgets]
-	=dev-qt/qtdeclarative-${PV}*
-	=dev-qt/qtshadertools-${PV}*
-	=dev-qt/qtquicktimeline-${PV}*
-	media-libs/assimp:=
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		-DQT_FEATURE_system_assimp=ON
-	)
-
-	qt6-build_src_configure
-}
diff --git a/dev-qt/qtquicktimeline/Manifest b/dev-qt/qtquicktimeline/Manifest
index a25fcc5dde68..6a3b176c33a4 100644
--- a/dev-qt/qtquicktimeline/Manifest
+++ b/dev-qt/qtquicktimeline/Manifest
@@ -1,7 +1,5 @@
 DIST qtquicktimeline-everywhere-opensource-src-5.15.8.tar.xz 104348 BLAKE2B 8b02c97e0c0c01c0e398d64d8dbeeeea8a47964c1d9b0ce1357b34d71553b3fb2401f545b1e1c161ed6ca198ed8105c6ac9528e9a46d44ea17d7d4489a97dbd1 SHA512 c05f94ac61613a46494f871d5b4fbbd184f9924dc66f4a82438fc9fb6248b4afb0936f925a033739215096efd6b4a240a34078216999d40c50846ea96cf9dc61
-DIST qtquicktimeline-everywhere-src-6.4.2.tar.xz 113008 BLAKE2B 9352c836502ed57af049ff06fc8b0dc6be0a0ac05c8a0a5a84fad86e28a149ad3756534dbe48b994e10466e249575e6816d5b4d33a4a26990b39787ac273bf5b SHA512 dd7f9b09312f7f94e18aa127f49d389eac183cc03f80d01dcd0faa5db2852d0bb12a9f6070543ede93b986649f455e90c4288d992bcd024f82213782f9bfda5e
 DIST qtquicktimeline-everywhere-src-6.4.3.tar.xz 113348 BLAKE2B 2b905923479646bced55ee939e7f090d46f708014a2e64e015566a403942f0a27e7bd20020c1055cfdf73d95f47e710d3a11d97ce035895fd068fece681441f0 SHA512 8310e0b360859e59157b5968647a5bb82bfd09f2f61c1b289669e551781e8fd1285f3efb8ed1324013ad14b192f0d9963c8584cfec98a136c82f5956ac1de9ae
 EBUILD qtquicktimeline-5.15.8.ebuild 367 BLAKE2B 610cca42b4a262f7b3c1d9943187d179af7ba673232108dfd154d5c355af691f445f5eb39261ca5bd25d4788318beff0f58cb6042a4433a45d5e9d2108b30f75 SHA512 231e521de5b8274c074de45306b7f8a72085e7d4f10a7f9e6decf4d358fc82b991cb01c0163aaa96bc54b56ad0f7d2c0c2e71c24f51baea9c95809d0c40c3efa
-EBUILD qtquicktimeline-6.4.2.ebuild 349 BLAKE2B 87abc1b15b3f35c9aaa0422bf73321342981ff72d9e2eac71746fb12488a9740f472306a9dc1e7ef04624df47d169a15baee90c66a537432055c1a220e1d2b38 SHA512 40bcd48c890001940463e12a49eff06f600a5dddfe039518b142ce83ccef86d01a2421af8beda249c7c81cc4c9845b6f00e8cdf2a4e74abbec91f25556928504
 EBUILD qtquicktimeline-6.4.3.ebuild 349 BLAKE2B 87abc1b15b3f35c9aaa0422bf73321342981ff72d9e2eac71746fb12488a9740f472306a9dc1e7ef04624df47d169a15baee90c66a537432055c1a220e1d2b38 SHA512 40bcd48c890001940463e12a49eff06f600a5dddfe039518b142ce83ccef86d01a2421af8beda249c7c81cc4c9845b6f00e8cdf2a4e74abbec91f25556928504
 MISC metadata.xml 383 BLAKE2B 8f734db19973b4ebfe57cf9417f7fbf6db00ca254cf2410e336c2f252aff7e85500d5fdb944e511a48bf08ebb3ee74e729073f567b9d7558efb19024f7c1e10e SHA512 c0c9a947c7ab5edce2487560d6d9c215966ba5804e370557f2d2a35d67bc6c1ac8a04afdaac8c733cc66be0977835826ecd817248b83c01f4230f8824fbc41a1
diff --git a/dev-qt/qtquicktimeline/qtquicktimeline-6.4.2.ebuild b/dev-qt/qtquicktimeline/qtquicktimeline-6.4.2.ebuild
deleted file mode 100644
index 3b0370aab04e..000000000000
--- a/dev-qt/qtquicktimeline/qtquicktimeline-6.4.2.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 2021-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit qt6-build
-
-DESCRIPTION="Qt module for keyframe-based timeline construction"
-
-if [[ ${QT6_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64"
-fi
-
-DEPEND="
-	=dev-qt/qtbase-${PV}*
-	=dev-qt/qtdeclarative-${PV}*
-"
-RDEPEND="${DEPEND}"
diff --git a/dev-qt/qtserialport/Manifest b/dev-qt/qtserialport/Manifest
index 1fc7526827cb..834d3635fd65 100644
--- a/dev-qt/qtserialport/Manifest
+++ b/dev-qt/qtserialport/Manifest
@@ -1,7 +1,5 @@
 DIST qtserialport-everywhere-opensource-src-5.15.8.tar.xz 323200 BLAKE2B 30d0620c7101a38fe2253ee13845eec7a78dfad8d597d6798235c82ca2a916647b23e0ac9395530c53ab22dc9cdf5ee6a59bfe1a0b689152cf11602a131526fd SHA512 974ae97ec9bdbb4bcecc80a07c343efe4ed686c968810e76fb0e4cd62165949c30d57a37035ac08916850cc2d207fabc0aa09e593184e65fc6d74b36bfbdc444
-DIST qtserialport-everywhere-src-6.4.2.tar.xz 319000 BLAKE2B b83869a762eceef9def1a1206343b7c3004ea84e274a8059a3872ba5416e30d7d2f494b49458eea855fa4c6a2163a1933e61eaa40c8377f14b369c9f3fad055f SHA512 d8b33d89e78abf34766f8d37d114641e2aec90ebe7d82dd1246f453b87b266545b1679450fd8f3ab7967a348fda098179b63a6d9ec34eb5ce56d8e8b242a251f
 DIST qtserialport-everywhere-src-6.4.3.tar.xz 319400 BLAKE2B bfdaf61f1cd7dcb3d931a5c06e21575d38f5e265746998227459193638a4a285c6138ce78fa0766f84a9030fc807edb390de85d530980406d04ff083af8fa62a SHA512 4871035b714732e7a40579c9a31b0cd955ec9360a996bbffeb16781a89b8df55d9be4408947832f2c6c39646f4d3b64cfb0bf91a83fc73e1808defd108048cd4
 EBUILD qtserialport-5.15.8.ebuild 565 BLAKE2B 380cc83e92be8bd256a5e652a5018380da908a30a20a8676c3701caea63dba343b99edd1f67458ebb5556ca49cac3f0b766b0237c66b01e7b8087246ecda4bdd SHA512 acfee3720971a49241a821201849b840e1d019ed768e58da252a5e519bd142d9166e4551330ed8d21184a1b899d8175dbe1bf251f4a938d13d971514ca4063df
-EBUILD qtserialport-6.4.2.ebuild 354 BLAKE2B c466c01402820d11e4f2423c21d0569c62e4b64f1fc04a0be37654d42fea6cbb8f71303f8eca98e20a7f3c22fc63d28ac11b0a0b3cfeb1037800e81f50fda09a SHA512 be88e72c9bfdc86c3786fc729681c62885bc291483dc9a53b4000217e8d569929a5e5ff035785bab7fedbbdf2c609a2e241a5bd89b7d4c9970fde3c11c6acb39
 EBUILD qtserialport-6.4.3.ebuild 354 BLAKE2B c466c01402820d11e4f2423c21d0569c62e4b64f1fc04a0be37654d42fea6cbb8f71303f8eca98e20a7f3c22fc63d28ac11b0a0b3cfeb1037800e81f50fda09a SHA512 be88e72c9bfdc86c3786fc729681c62885bc291483dc9a53b4000217e8d569929a5e5ff035785bab7fedbbdf2c609a2e241a5bd89b7d4c9970fde3c11c6acb39
 MISC metadata.xml 482 BLAKE2B 651a49dc4a07f5e5a9c21990868e666d98acdea7d7b0b2c0e4c98eafc3da72c803d380e4abda30f33250f7bbd7654df713833ccdddcb975cbad6f92e488f643b SHA512 192c670abd7da29645513bf1d9297d942efdc49f5cf170861e7689fda47f51daa47f10c7c81c3b045366e0259179c6839ff7747197c9d792e8d0fd1a5818973e
diff --git a/dev-qt/qtserialport/qtserialport-6.4.2.ebuild b/dev-qt/qtserialport/qtserialport-6.4.2.ebuild
deleted file mode 100644
index bf569254cd0a..000000000000
--- a/dev-qt/qtserialport/qtserialport-6.4.2.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 2021-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit qt6-build
-
-DESCRIPTION="Serial port abstraction library for the Qt6 framework"
-
-if [[ ${QT6_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64"
-fi
-
-DEPEND="
-	=dev-qt/qtbase-${PV}*[gui,widgets]
-	virtual/libudev:=
-"
-RDEPEND="${DEPEND}"
diff --git a/dev-qt/qtshadertools/Manifest b/dev-qt/qtshadertools/Manifest
index 30484f9b47b7..71ef7ab9105b 100644
--- a/dev-qt/qtshadertools/Manifest
+++ b/dev-qt/qtshadertools/Manifest
@@ -1,5 +1,3 @@
-DIST qtshadertools-everywhere-src-6.4.2.tar.xz 1001392 BLAKE2B c284b1302debec2313151ac199f52c7e53f94a047a9141615eb42d8a54fb5a3ade8db5023021beffb024609fe1f7527eadd998a0407e170c52f6ad27dc1f7335 SHA512 ba35c07c253b0c009be297173996327c3bfc27711112d5190f4a7b7c4b5af2f0ee339ed35107139d65a751646a911b499afff2faa04ccd7802b3d7e7aa38ce10
 DIST qtshadertools-everywhere-src-6.4.3.tar.xz 1001780 BLAKE2B aae5cb54f219bc1868b002eef3417d1215dbfe55a357ce6143e4eb7b4bb38ba92eec9411d80f9f4aef2b43205243ba5b4733b76e36272478752dc0121f676604 SHA512 11d6111c4b645d2d31b19c6cf788726546f484bd9c6a3940bdb2ce82f76eecf56a47655065fb87bf488a12968ea26e48e4c0c8b3ff9d702339bd497bef31630e
-EBUILD qtshadertools-6.4.2.ebuild 314 BLAKE2B 315c0b8587baa11c5617ba89725807911c0a85e7b25bfd9bf4b6b6a0fd3b463acd9dcc623473a4bed6fd3af1380e8843483390d59469ad37c9a497be579947d7 SHA512 ac316a5580819aebd7b94e2ed7d97baaeb2d054faa0d6d0c21b65bc5b2eeb90feb0a8a9fa66a92e6dd275dbb5e153f7728a930fbeca2d1abe3d17d210e74254c
 EBUILD qtshadertools-6.4.3.ebuild 314 BLAKE2B 315c0b8587baa11c5617ba89725807911c0a85e7b25bfd9bf4b6b6a0fd3b463acd9dcc623473a4bed6fd3af1380e8843483390d59469ad37c9a497be579947d7 SHA512 ac316a5580819aebd7b94e2ed7d97baaeb2d054faa0d6d0c21b65bc5b2eeb90feb0a8a9fa66a92e6dd275dbb5e153f7728a930fbeca2d1abe3d17d210e74254c
 MISC metadata.xml 482 BLAKE2B 651a49dc4a07f5e5a9c21990868e666d98acdea7d7b0b2c0e4c98eafc3da72c803d380e4abda30f33250f7bbd7654df713833ccdddcb975cbad6f92e488f643b SHA512 192c670abd7da29645513bf1d9297d942efdc49f5cf170861e7689fda47f51daa47f10c7c81c3b045366e0259179c6839ff7747197c9d792e8d0fd1a5818973e
diff --git a/dev-qt/qtshadertools/qtshadertools-6.4.2.ebuild b/dev-qt/qtshadertools/qtshadertools-6.4.2.ebuild
deleted file mode 100644
index 88a20ffbb689..000000000000
--- a/dev-qt/qtshadertools/qtshadertools-6.4.2.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 2021-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit qt6-build
-
-DESCRIPTION="Qt APIs and Tools for Graphics Pipelines"
-
-if [[ ${QT6_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64"
-fi
-
-DEPEND="
-	=dev-qt/qtbase-${PV}*[gui]
-"
-RDEPEND="${DEPEND}"
diff --git a/dev-qt/qtsql/Manifest b/dev-qt/qtsql/Manifest
index c2f3408ce2c4..38d2ceb58d22 100644
--- a/dev-qt/qtsql/Manifest
+++ b/dev-qt/qtsql/Manifest
@@ -1,6 +1,5 @@
-AUX qtsql-5.15.8-CVE-2023-24607.patch 15526 BLAKE2B 086a75d8622f4ddaeb6d567c78139e8bed0e2672dc4bab2be0963ecca05780aaf6eb8a6c3c50a77c7d1f71d66e0393a143ba97d21757e213c531ebe7007c41b6 SHA512 ffd2e171b7a8e359beab9f61566b718cc7f544ebb5da0e9ff0bc537509fdf8af8c2a1e17484f34502bef7254a20ae55d3678f1bca1ec0b1dcc7bbd088371f7f0
 DIST qtbase-5.15-gentoo-patchset-3.tar.xz 3856 BLAKE2B 0752426f9bc2dfa1ab2bc246b29f5d00305df05175a7801d7d5eddacfa46fcb605d9a317547edc01d3ef339f6effc2fcee7549cb7aecced37f0098166c70dbe2 SHA512 2515bea53232e76ca3e40bdaf1dd52fdf452052a2f40002ee91360d1fcceea3c5c2f5a8d2a3bfc0f9c2bacd61460a632c5b351accd73fd37b64985593219148e
-DIST qtbase-5.15.8-gentoo-kde-5.tar.xz 793372 BLAKE2B f486a0275fdf4da28a88ba40b7e6f227267fa05e8f466f734f720e792de1796501d5f1fb4427a84ca2d709bfa07abd695ad59210f7fd11227b1bf465484736b8 SHA512 f51d7ee2d121acda1141b9816197afc57ac0176a12acc08a93c2a793694afb734f8f1ad280a5bf95170cf912e32edb4a6612befeb4198fec78a7e50bbb6a61cd
+DIST qtbase-5.15.8-gentoo-kde-6.tar.xz 796880 BLAKE2B 014fd9c9693fe1a5adc54f1d147db4bbb4bf6f5fbde5950a9586a6868d16b63b83cf24821c33fd2a325d6b70a1fa655b0fc0da7ef74ae175e278ebda1f8c9aa4 SHA512 910a7e42e13f33b53984b4f61c58e53c1cf0accfa9eb1e143cc011882fff6cab14fa7c66562396b3a929f5ec6ecf56724d74df34ac15f32cc4d8ae6cb8da797b
 DIST qtbase-everywhere-opensource-src-5.15.8.tar.xz 50259432 BLAKE2B cb1b790a384a5cad9a95fdc448e275d48a68c6ee2addf08b40f9963cc5762fd7ab15852dea8392dc76da39f1565c1e23ddb5875c280f0177e802082f4b4f7f2b SHA512 29e8877bafdbc908072209f1b27a5040b022e2b71f17f4ab4cecd570adeae21597f9af7f1d38758760f3cb30376eeb15c5f066bf02c6e9a9e3a4d07f967046ce
-EBUILD qtsql-5.15.8-r1.ebuild 1313 BLAKE2B 4caaf8988fede992a9302875a858462bb5fd76658859c5dbe96e2192d80216fc925588724318e7f3ab7128c6d267288508e495c75596e97b2d02e0f00f8da708 SHA512 15a3c13dc24c5dc2ffa99f4c8de515e4c2c9c031f4c53775cd00dfc6fbdc2de64224dedfafa7b2e6de518e44f97657c449a1f6174408bfe882a11575055649c6
+EBUILD qtsql-5.15.8-r1.ebuild 1260 BLAKE2B e0511026fbfdd2dd75d2535c2ad435768231c401c5b85c4ab64b075a39b5a541a4cd09b091fac5aa02161cda7cecb1ca6675f8c7b9ecc659ba65ad0866ae24be SHA512 2e8c7ffa831281c8b72f5bfacc7700ac94f1b7df7f68f77179e4f97a782e03dc166f909c98e784189143d66849baa330adf18e08e450b7b42fb3b1467b48d553
 MISC metadata.xml 482 BLAKE2B 651a49dc4a07f5e5a9c21990868e666d98acdea7d7b0b2c0e4c98eafc3da72c803d380e4abda30f33250f7bbd7654df713833ccdddcb975cbad6f92e488f643b SHA512 192c670abd7da29645513bf1d9297d942efdc49f5cf170861e7689fda47f51daa47f10c7c81c3b045366e0259179c6839ff7747197c9d792e8d0fd1a5818973e
diff --git a/dev-qt/qtsql/files/qtsql-5.15.8-CVE-2023-24607.patch b/dev-qt/qtsql/files/qtsql-5.15.8-CVE-2023-24607.patch
deleted file mode 100644
index 3cdb9116465b..000000000000
--- a/dev-qt/qtsql/files/qtsql-5.15.8-CVE-2023-24607.patch
+++ /dev/null
@@ -1,341 +0,0 @@
-From ec1c9c116a16f2cd15587dc861e5d178010b3f99 Mon Sep 17 00:00:00 2001
-From: Albert Astals Cid <aacid@kde.org>
-Date: Wed, 8 Feb 2023 18:16:58 +0100
-Subject: [PATCH] Apply CVE-2023-24607-qtbase-5.15.diff
-
-Change-Id: Ic77ce0e279a8ed6d7aac3bf4f0d1a56ad9dde40c
----
- src/plugins/sqldrivers/odbc/qsql_odbc.cpp | 206 +++++++++++++---------
- 1 file changed, 118 insertions(+), 88 deletions(-)
-
-diff --git a/src/plugins/sqldrivers/odbc/qsql_odbc.cpp b/src/plugins/sqldrivers/odbc/qsql_odbc.cpp
-index 5f51de3843..6cac60d03d 100644
---- a/src/plugins/sqldrivers/odbc/qsql_odbc.cpp
-+++ b/src/plugins/sqldrivers/odbc/qsql_odbc.cpp
-@@ -92,23 +92,39 @@ inline static QString fromSQLTCHAR(const QVarLengthArray<SQLTCHAR>& input, int s
-     return result;
- }
- 
-+template <size_t SizeOfChar = sizeof(SQLTCHAR)>
-+void toSQLTCHARImpl(QVarLengthArray<SQLTCHAR> &result, const QString &input); // primary template undefined
-+
-+template <typename Container>
-+void do_append(QVarLengthArray<SQLTCHAR> &result, const Container &c)
-+{
-+    result.append(reinterpret_cast<const SQLTCHAR *>(c.data()), c.size());
-+}
-+
-+template <>
-+void toSQLTCHARImpl<1>(QVarLengthArray<SQLTCHAR> &result, const QString &input)
-+{
-+    const auto u8 = input.toUtf8();
-+    do_append(result, u8);
-+}
-+
-+template <>
-+void toSQLTCHARImpl<2>(QVarLengthArray<SQLTCHAR> &result, const QString &input)
-+{
-+    do_append(result, input);
-+}
-+
-+template <>
-+void toSQLTCHARImpl<4>(QVarLengthArray<SQLTCHAR> &result, const QString &input)
-+{
-+    const auto u32 = input.toUcs4();
-+    do_append(result, u32);
-+}
-+
- inline static QVarLengthArray<SQLTCHAR> toSQLTCHAR(const QString &input)
- {
-     QVarLengthArray<SQLTCHAR> result;
--    result.resize(input.size());
--    switch(sizeof(SQLTCHAR)) {
--        case 1:
--            memcpy(result.data(), input.toUtf8().data(), input.size());
--            break;
--        case 2:
--            memcpy(result.data(), input.unicode(), input.size() * 2);
--            break;
--        case 4:
--            memcpy(result.data(), input.toUcs4().data(), input.size() * 4);
--            break;
--        default:
--            qCritical("sizeof(SQLTCHAR) is %d. Don't know how to handle this.", int(sizeof(SQLTCHAR)));
--    }
-+    toSQLTCHARImpl(result, input);
-     result.append(0); // make sure it's null terminated, doesn't matter if it already is, it does if it isn't.
-     return result;
- }
-@@ -763,6 +779,14 @@ QChar QODBCDriverPrivate::quoteChar()
-     return quote;
- }
- 
-+static SQLRETURN qt_string_SQLSetConnectAttr(SQLHDBC handle, SQLINTEGER attr, const QString &val)
-+{
-+    auto encoded = toSQLTCHAR(val);
-+    return SQLSetConnectAttr(handle, attr,
-+                             encoded.data(),
-+                             SQLINTEGER(encoded.size() * sizeof(SQLTCHAR))); // size in bytes
-+}
-+
- 
- bool QODBCDriverPrivate::setConnectionOptions(const QString& connOpts)
- {
-@@ -798,10 +822,7 @@ bool QODBCDriverPrivate::setConnectionOptions(const QString& connOpts)
-             v = val.toUInt();
-             r = SQLSetConnectAttr(hDbc, SQL_ATTR_LOGIN_TIMEOUT, (SQLPOINTER) size_t(v), 0);
-         } else if (opt.toUpper() == QLatin1String("SQL_ATTR_CURRENT_CATALOG")) {
--            val.utf16(); // 0 terminate
--            r = SQLSetConnectAttr(hDbc, SQL_ATTR_CURRENT_CATALOG,
--                                    toSQLTCHAR(val).data(),
--                                    val.length()*sizeof(SQLTCHAR));
-+            r = qt_string_SQLSetConnectAttr(hDbc, SQL_ATTR_CURRENT_CATALOG, val);
-         } else if (opt.toUpper() == QLatin1String("SQL_ATTR_METADATA_ID")) {
-             if (val.toUpper() == QLatin1String("SQL_TRUE")) {
-                 v = SQL_TRUE;
-@@ -816,10 +837,7 @@ bool QODBCDriverPrivate::setConnectionOptions(const QString& connOpts)
-             v = val.toUInt();
-             r = SQLSetConnectAttr(hDbc, SQL_ATTR_PACKET_SIZE, (SQLPOINTER) size_t(v), 0);
-         } else if (opt.toUpper() == QLatin1String("SQL_ATTR_TRACEFILE")) {
--            val.utf16(); // 0 terminate
--            r = SQLSetConnectAttr(hDbc, SQL_ATTR_TRACEFILE,
--                                    toSQLTCHAR(val).data(),
--                                    val.length()*sizeof(SQLTCHAR));
-+            r = qt_string_SQLSetConnectAttr(hDbc, SQL_ATTR_TRACEFILE, val);
-         } else if (opt.toUpper() == QLatin1String("SQL_ATTR_TRACE")) {
-             if (val.toUpper() == QLatin1String("SQL_OPT_TRACE_OFF")) {
-                 v = SQL_OPT_TRACE_OFF;
-@@ -1022,9 +1040,12 @@ bool QODBCResult::reset (const QString& query)
-         return false;
-     }
- 
--    r = SQLExecDirect(d->hStmt,
--                       toSQLTCHAR(query).data(),
--                       (SQLINTEGER) query.length());
-+    {
-+        auto encoded = toSQLTCHAR(query);
-+        r = SQLExecDirect(d->hStmt,
-+                          encoded.data(),
-+                          SQLINTEGER(encoded.size()));
-+    }
-     if (r != SQL_SUCCESS && r != SQL_SUCCESS_WITH_INFO && r!= SQL_NO_DATA) {
-         setLastError(qMakeError(QCoreApplication::translate("QODBCResult",
-                      "Unable to execute statement"), QSqlError::StatementError, d));
-@@ -1371,9 +1392,12 @@ bool QODBCResult::prepare(const QString& query)
-         return false;
-     }
- 
--    r = SQLPrepare(d->hStmt,
--                    toSQLTCHAR(query).data(),
--                    (SQLINTEGER) query.length());
-+    {
-+        auto encoded = toSQLTCHAR(query);
-+        r = SQLPrepare(d->hStmt,
-+                       encoded.data(),
-+                       SQLINTEGER(encoded.size()));
-+    }
- 
-     if (r != SQL_SUCCESS) {
-         setLastError(qMakeError(QCoreApplication::translate("QODBCResult",
-@@ -1401,7 +1425,7 @@ bool QODBCResult::exec()
-         SQLCloseCursor(d->hStmt);
- 
-     QVector<QVariant>& values = boundValues();
--    QVector<QByteArray> tmpStorage(values.count(), QByteArray()); // holds temporary buffers
-+    QVector<QByteArray> tmpStorage(values.count(), QByteArray()); // targets for SQLBindParameter()
-     QVarLengthArray<SQLLEN, 32> indicators(values.count());
-     memset(indicators.data(), 0, indicators.size() * sizeof(SQLLEN));
- 
-@@ -1580,35 +1604,36 @@ bool QODBCResult::exec()
-             case QVariant::String:
-                 if (d->unicode) {
-                     QByteArray &ba = tmpStorage[i];
--                    QString str = val.toString();
-+                    {
-+                        const auto encoded = toSQLTCHAR(val.toString());
-+                        ba = QByteArray(reinterpret_cast<const char *>(encoded.data()),
-+                                        encoded.size() * sizeof(SQLTCHAR));
-+                    }
-+
-                     if (*ind != SQL_NULL_DATA)
--                        *ind = str.length() * sizeof(SQLTCHAR);
--                    int strSize = str.length() * sizeof(SQLTCHAR);
-+                        *ind = ba.size();
- 
-                     if (bindValueType(i) & QSql::Out) {
--                        const QVarLengthArray<SQLTCHAR> a(toSQLTCHAR(str));
--                        ba = QByteArray((const char *)a.constData(), a.size() * sizeof(SQLTCHAR));
-                         r = SQLBindParameter(d->hStmt,
-                                             i + 1,
-                                             qParamType[bindValueType(i) & QSql::InOut],
-                                             SQL_C_TCHAR,
--                                            strSize > 254 ? SQL_WLONGVARCHAR : SQL_WVARCHAR,
-+                                            ba.size() > 254 ? SQL_WLONGVARCHAR : SQL_WVARCHAR,
-                                             0, // god knows... don't change this!
-                                             0,
--                                            ba.data(),
-+                                            const_cast<char *>(ba.constData()), // don't detach
-                                             ba.size(),
-                                             ind);
-                         break;
-                     }
--                    ba = QByteArray ((const char *)toSQLTCHAR(str).constData(), str.size()*sizeof(SQLTCHAR));
-                     r = SQLBindParameter(d->hStmt,
-                                           i + 1,
-                                           qParamType[bindValueType(i) & QSql::InOut],
-                                           SQL_C_TCHAR,
--                                          strSize > 254 ? SQL_WLONGVARCHAR : SQL_WVARCHAR,
--                                          strSize,
-+                                          ba.size() > 254 ? SQL_WLONGVARCHAR : SQL_WVARCHAR,
-+                                          ba.size(),
-                                           0,
--                                          const_cast<char *>(ba.constData()),
-+                                          const_cast<char *>(ba.constData()), // don't detach
-                                           ba.size(),
-                                           ind);
-                     break;
-@@ -1716,10 +1741,11 @@ bool QODBCResult::exec()
-             case QVariant::String:
-                 if (d->unicode) {
-                     if (bindValueType(i) & QSql::Out) {
--                        const QByteArray &first = tmpStorage.at(i);
--                        QVarLengthArray<SQLTCHAR> array;
--                        array.append((const SQLTCHAR *)first.constData(), first.size());
--                        values[i] = fromSQLTCHAR(array, first.size()/sizeof(SQLTCHAR));
-+                        const QByteArray &bytes = tmpStorage.at(i);
-+                        const auto strSize = bytes.size() / int(sizeof(SQLTCHAR));
-+                        QVarLengthArray<SQLTCHAR> string(strSize);
-+                        memcpy(string.data(), bytes.data(), strSize * sizeof(SQLTCHAR));
-+                        values[i] = fromSQLTCHAR(string);
-                     }
-                     break;
-                 }
-@@ -1966,14 +1992,16 @@ bool QODBCDriver::open(const QString & db,
-     SQLSMALLINT cb;
-     QVarLengthArray<SQLTCHAR> connOut(1024);
-     memset(connOut.data(), 0, connOut.size() * sizeof(SQLTCHAR));
--    r = SQLDriverConnect(d->hDbc,
--                          NULL,
--                          toSQLTCHAR(connQStr).data(),
--                          (SQLSMALLINT)connQStr.length(),
--                          connOut.data(),
--                          1024,
--                          &cb,
--                          /*SQL_DRIVER_NOPROMPT*/0);
-+    {
-+        auto encoded = toSQLTCHAR(connQStr);
-+        r = SQLDriverConnect(d->hDbc,
-+                             nullptr,
-+                             encoded.data(), SQLSMALLINT(encoded.size()),
-+                             connOut.data(),
-+                             1024,
-+                             &cb,
-+                             /*SQL_DRIVER_NOPROMPT*/0);
-+    }
- 
-     if (r != SQL_SUCCESS && r != SQL_SUCCESS_WITH_INFO) {
-         setLastError(qMakeError(tr("Unable to connect"), QSqlError::ConnectionError, d));
-@@ -2352,17 +2380,15 @@ QStringList QODBCDriver::tables(QSql::TableType type) const
-     if (tableType.isEmpty())
-         return tl;
- 
--    QString joinedTableTypeString = tableType.join(QLatin1Char(','));
-+    {
-+        auto joinedTableTypeString = toSQLTCHAR(tableType.join(u','));
- 
--    r = SQLTables(hStmt,
--                   NULL,
--                   0,
--                   NULL,
--                   0,
--                   NULL,
--                   0,
--                   toSQLTCHAR(joinedTableTypeString).data(),
--                   joinedTableTypeString.length() /* characters, not bytes */);
-+        r = SQLTables(hStmt,
-+                      nullptr, 0,
-+                      nullptr, 0,
-+                      nullptr, 0,
-+                      joinedTableTypeString.data(), joinedTableTypeString.size());
-+    }
- 
-     if (r != SQL_SUCCESS)
-         qSqlWarning(QLatin1String("QODBCDriver::tables Unable to execute table list"), d);
-@@ -2436,28 +2462,30 @@ QSqlIndex QODBCDriver::primaryIndex(const QString& tablename) const
-                         SQL_ATTR_CURSOR_TYPE,
-                         (SQLPOINTER)SQL_CURSOR_FORWARD_ONLY,
-                         SQL_IS_UINTEGER);
--    r = SQLPrimaryKeys(hStmt,
--                        catalog.length() == 0 ? NULL : toSQLTCHAR(catalog).data(),
--                        catalog.length(),
--                        schema.length() == 0 ? NULL : toSQLTCHAR(schema).data(),
--                        schema.length(),
--                        toSQLTCHAR(table).data(),
--                        table.length() /* in characters, not in bytes */);
-+    {
-+        auto c = toSQLTCHAR(catalog);
-+        auto s = toSQLTCHAR(schema);
-+        auto t = toSQLTCHAR(table);
-+        r = SQLPrimaryKeys(hStmt,
-+                           catalog.isEmpty() ? nullptr : c.data(), c.size(),
-+                           schema.isEmpty()  ? nullptr : s.data(), s.size(),
-+                           t.data(), t.size());
-+    }
- 
-     // if the SQLPrimaryKeys() call does not succeed (e.g the driver
-     // does not support it) - try an alternative method to get hold of
-     // the primary index (e.g MS Access and FoxPro)
-     if (r != SQL_SUCCESS) {
--            r = SQLSpecialColumns(hStmt,
--                        SQL_BEST_ROWID,
--                        catalog.length() == 0 ? NULL : toSQLTCHAR(catalog).data(),
--                        catalog.length(),
--                        schema.length() == 0 ? NULL : toSQLTCHAR(schema).data(),
--                        schema.length(),
--                        toSQLTCHAR(table).data(),
--                        table.length(),
--                        SQL_SCOPE_CURROW,
--                        SQL_NULLABLE);
-+        auto c = toSQLTCHAR(catalog);
-+        auto s = toSQLTCHAR(schema);
-+        auto t = toSQLTCHAR(table);
-+        r = SQLSpecialColumns(hStmt,
-+                              SQL_BEST_ROWID,
-+                              catalog.isEmpty() ? nullptr : c.data(), c.size(),
-+                              schema.isEmpty()  ? nullptr : s.data(), s.size(),
-+                              t.data(), t.size(),
-+                              SQL_SCOPE_CURROW,
-+                              SQL_NULLABLE);
- 
-             if (r != SQL_SUCCESS) {
-                 qSqlWarning(QLatin1String("QODBCDriver::primaryIndex: Unable to execute primary key list"), d);
-@@ -2538,15 +2566,17 @@ QSqlRecord QODBCDriver::record(const QString& tablename) const
-                         SQL_ATTR_CURSOR_TYPE,
-                         (SQLPOINTER)SQL_CURSOR_FORWARD_ONLY,
-                         SQL_IS_UINTEGER);
--    r =  SQLColumns(hStmt,
--                     catalog.length() == 0 ? NULL : toSQLTCHAR(catalog).data(),
--                     catalog.length(),
--                     schema.length() == 0 ? NULL : toSQLTCHAR(schema).data(),
--                     schema.length(),
--                     toSQLTCHAR(table).data(),
--                     table.length(),
--                     NULL,
--                     0);
-+    {
-+        auto c = toSQLTCHAR(catalog);
-+        auto s = toSQLTCHAR(schema);
-+        auto t = toSQLTCHAR(table);
-+        r =  SQLColumns(hStmt,
-+                        catalog.isEmpty() ? nullptr : c.data(), c.size(),
-+                        schema.isEmpty()  ? nullptr : s.data(), s.size(),
-+                        t.data(), t.size(),
-+                        nullptr,
-+                        0);
-+    }
-     if (r != SQL_SUCCESS)
-         qSqlWarning(QLatin1String("QODBCDriver::record: Unable to execute column list"), d);
- 
--- 
-GitLab
-
diff --git a/dev-qt/qtsql/qtsql-5.15.8-r1.ebuild b/dev-qt/qtsql/qtsql-5.15.8-r1.ebuild
index 6ef89508857d..450028984ede 100644
--- a/dev-qt/qtsql/qtsql-5.15.8-r1.ebuild
+++ b/dev-qt/qtsql/qtsql-5.15.8-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 if [[ ${PV} != *9999* ]]; then
-	QT5_KDEPATCHSET_REV=5
+	QT5_KDEPATCHSET_REV=6
 	KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86"
 fi
 
@@ -39,8 +39,6 @@ QT5_GENTOO_PRIVATE_CONFIG=(
 	:sql
 )
 
-PATCHES=( "${FILESDIR}/${P}-CVE-2023-24607.patch" )
-
 src_configure() {
 	local myconf=(
 		$(qt_use freetds  sql-tds    plugin)
diff --git a/dev-qt/qtsvg/Manifest b/dev-qt/qtsvg/Manifest
index 4cadfa37bed2..e2e3050d6cf1 100644
--- a/dev-qt/qtsvg/Manifest
+++ b/dev-qt/qtsvg/Manifest
@@ -1,8 +1,6 @@
 DIST qtsvg-5.15.8-gentoo-kde-1.tar.xz 4944 BLAKE2B c111addb333f09c32e247d63587cb90fa1b0f85fc26528d4e41b3bd5175715d775df422a2a2b8ae4f6ce2cf354212c48abf8e8c5831b01f66d9afb463d7cef07 SHA512 e3e08d6aa6fa57d4a521e84aac22611a4faab65d2609c7982ae5fd2da89a10a77a90049447168bb423030de9e41c3ecbd5fdc52cb3ecf60ba66d83372cf2d306
 DIST qtsvg-everywhere-opensource-src-5.15.8.tar.xz 1888824 BLAKE2B a412b271bcf70407bec4eeb0e6ae2f5df716b7efc8ac3142e12a43209a92199bdf798288e39dcc05627ae043b10896b4bceaaebe1362da8d2f6d147073c9797a SHA512 a110a815e7399fc96b0197b96e9c6dec289b9a2c38393711ccfc536c087791009f8452e222f9364b5b133930fa4dea77d7bea2f250511c0511a1a76aa511dcda
-DIST qtsvg-everywhere-src-6.4.2.tar.xz 1726708 BLAKE2B 1194352d1956b5ad8817105f03a68d263466487e821a9e7741491c67eefeb215bcfacefec51f654fde747e8d534a398b248fc0c36638a629626fcdc6ca3feff6 SHA512 9b9de3f19a6c98d61ec1b4ba1883aada3b57db8e2ce56a493b6d7c639ed49a43f51c16b11f65cf8ee7ba8c8f4c61e1eedebb99c8645acfcc934048f2eb76fe64
 DIST qtsvg-everywhere-src-6.4.3.tar.xz 1726464 BLAKE2B 06a6911980abe0a756ca0901a1ca00145632b6ab724e8e8211bb9130e65d47f60bbb8732e437c197176ec9886b3b0003578508606feb956497a6089e94fd98d7 SHA512 75c20eff54f45e5a501ea965677b708e211a3fa435d3304868ca1b6e3cf0b4ef89e61631e4936b1ef789a06be1d3d43ec9db64be2498159eecfde1cce21e76c0
 EBUILD qtsvg-5.15.8.ebuild 496 BLAKE2B a9a417892487c84120f966f2bd06d84f7348e069ec3917aca6c88c33345109bf127802e01fae1da95a5945fc7e44db8f3a2f3b7f6b699fcfbcc3367b082f2563 SHA512 b94101d98d128f952a0bdc6b14e04c76e492d6925e06d6c0d97d077f908196d944169a196a28e4aac384c261c93a6b5fa2dd94646c4186b392fd1ec57f885e15
-EBUILD qtsvg-6.4.2.ebuild 342 BLAKE2B 9e9ecaf7a291e80c41e1698e0e8cb4798422e17f95ca4bef5e9523c81db42fd2cd971f193d12b999401f96c8293b54fe8b8d5bbf33f636b3d31e78c3e6b65c92 SHA512 f9f43ca3a2b52c25bbc6ed1438fcbe8458e3b47cda7a08c060cb5dd27315dce0434aa6d542ff58070de2ede5f703f2d951f60bb35827638a5ff52ffc4e2c69fe
 EBUILD qtsvg-6.4.3.ebuild 342 BLAKE2B 9e9ecaf7a291e80c41e1698e0e8cb4798422e17f95ca4bef5e9523c81db42fd2cd971f193d12b999401f96c8293b54fe8b8d5bbf33f636b3d31e78c3e6b65c92 SHA512 f9f43ca3a2b52c25bbc6ed1438fcbe8458e3b47cda7a08c060cb5dd27315dce0434aa6d542ff58070de2ede5f703f2d951f60bb35827638a5ff52ffc4e2c69fe
 MISC metadata.xml 482 BLAKE2B 651a49dc4a07f5e5a9c21990868e666d98acdea7d7b0b2c0e4c98eafc3da72c803d380e4abda30f33250f7bbd7654df713833ccdddcb975cbad6f92e488f643b SHA512 192c670abd7da29645513bf1d9297d942efdc49f5cf170861e7689fda47f51daa47f10c7c81c3b045366e0259179c6839ff7747197c9d792e8d0fd1a5818973e
diff --git a/dev-qt/qtsvg/qtsvg-6.4.2.ebuild b/dev-qt/qtsvg/qtsvg-6.4.2.ebuild
deleted file mode 100644
index 960a981395e2..000000000000
--- a/dev-qt/qtsvg/qtsvg-6.4.2.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 2021-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit qt6-build
-
-DESCRIPTION="SVG rendering library for the Qt6 framework"
-
-if [[ ${QT6_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64"
-fi
-
-DEPEND="
-	=dev-qt/qtbase-${PV}*[gui,widgets]
-	sys-libs/zlib:=
-"
-RDEPEND="${DEPEND}"
diff --git a/dev-qt/qttools/Manifest b/dev-qt/qttools/Manifest
index bdfbee364685..92d541d1e404 100644
--- a/dev-qt/qttools/Manifest
+++ b/dev-qt/qttools/Manifest
@@ -1,5 +1,3 @@
-DIST qttools-everywhere-src-6.4.2.tar.xz 8740276 BLAKE2B ea376587d3385afa620c917dbf06d3f9a8303f19388f001ae0e441ce392ae401f80893a788b3a4162575913046d922f7c9606cec85d6786860190c4b996ab201 SHA512 303da2e7d58d213b8a5d4f4e36c7903b57ea8011f711cfb598b79414a6da1e3cc5e47a26a34ff1bdf82e07cb4f5274bd45297b880c380e6a3de3df42837a2c2c
 DIST qttools-everywhere-src-6.4.3.tar.xz 8738280 BLAKE2B 3da253fabc4025f36ef6a0a0a946b026288d5bc921794ecb9dd71a51113ca067ad7dc2b4f4ff85bb75f999d06639f8c9b85e3139d045ee46aaa05fc432285033 SHA512 24dc02b760d4b1640eac539c9d0dfff9fe516332e5932f43456140daa3044c1e748731a883cc4f80e94626602241d040341e2af27efd470e7d6f50a908660382
-EBUILD qttools-6.4.2.ebuild 1197 BLAKE2B 8f6b3572287e9eed612dc835e127564570938b956c8720d14ac123303684f4999cc6a0399c999d4769796fd0dd1dcedb915487bb802afcb9c2ec3cb3fb556d39 SHA512 f0c2896e185eccf8769fef78c9f789ea1636f162b8bef9f09296562baedf215dad326ec2ccf38996a8694e7b32cabfd765f695ef9d88c5d0c371ceda1c96df70
 EBUILD qttools-6.4.3.ebuild 1813 BLAKE2B c6d451c11e08829ac924812276d9827303d35f28c8482c5e264700c74146dba9100019ce423262855ff5a7ad40eda0deb427f4098d035e11e21a8202ac3eec4b SHA512 38cdebe2703aff3c9ba43ef874fc9efb7370ecc0cfe0eccb8b94c14c01570e1352ee01b27e66138e03e2074739ad72edda3a74934cc69f0165518dfe7a0ed727
 MISC metadata.xml 1094 BLAKE2B 0d4a81302d083669c9a2fe16e1bb7d11d2c421037eb90fa052a77db35b304f51d0d7c85d18c90527a7a546dcb0fbe72d318a26cacfc2c738967553f4e953f12f SHA512 02e76ec2ffca69115e904129f77aca35bbd9c33058636d969175c7c4e738eba61c5bceb2901ca6d3b8e6a6868f4de85b968dedd6513f2e938594574a2f4633ce
diff --git a/dev-qt/qttools/qttools-6.4.2.ebuild b/dev-qt/qttools/qttools-6.4.2.ebuild
deleted file mode 100644
index c81e52762d90..000000000000
--- a/dev-qt/qttools/qttools-6.4.2.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 2021-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit qt6-build
-
-DESCRIPTION="Qt Tools Collection"
-
-if [[ ${QT6_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64"
-fi
-
-IUSE="
-	assistant designer distancefieldgenerator +linguist pixeltool
-	qdbus qdoc qtattributionsscanner qtdiag qtplugininfo
-"
-
-DEPEND="
-	=dev-qt/qtbase-${PV}*[network]
-	assistant? ( =dev-qt/qtbase-${PV}*[sql,widgets] )
-	designer? ( =dev-qt/qtbase-${PV}*[widgets] )
-	distancefieldgenerator? (
-		=dev-qt/qtbase-${PV}*[widgets]
-		=dev-qt/qtdeclarative-${PV}*
-	)
-	pixeltool? ( =dev-qt/qtbase-${PV}*[widgets] )
-	qdbus? ( =dev-qt/qtbase-${PV}*[widgets] )
-	qdoc? ( sys-devel/clang:= )
-	qtdiag? ( =dev-qt/qtbase-${PV}*[opengl,widgets] )
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		$(qt_feature assistant)
-		-DQT_FEATURE_commandlineparser=ON
-		$(qt_feature designer)
-		$(qt_feature distancefieldgenerator)
-		$(qt_feature linguist)
-		$(qt_feature pixeltool)
-		$(qt_feature qdbus)
-		$(qt_feature qdoc clang)
-		$(qt_feature qtattributionsscanner)
-		$(qt_feature qtdiag)
-		$(qt_feature qtplugininfo)
-		-DQT_FEATURE_thread=ON
-	)
-
-	qt6-build_src_configure
-}
diff --git a/dev-qt/qtwayland/Manifest b/dev-qt/qtwayland/Manifest
index 907e05302a56..360cc14bfd61 100644
--- a/dev-qt/qtwayland/Manifest
+++ b/dev-qt/qtwayland/Manifest
@@ -1,10 +1,6 @@
-DIST qtwayland-5.15.8-gentoo-kde-1.tar.xz 44488 BLAKE2B bfdd7c2959eb99e115eaf01d617464359a549513958c997dd8b1a86bda755dec44d24b6619650bf385b2894a2001a712a344b093fc94e8cde40ac9c20323903e SHA512 3cd52fc78f2451c38c6d2b0dd958895016a94b255e38ff3909f40e4bcb1ef760332fde4cffd32ab11e868ce0afe6629f325613c88b8fd85ca28f1583194ce229
 DIST qtwayland-5.15.8-gentoo-kde-3.tar.xz 47636 BLAKE2B b57cef6d4ce70747b74062e26459e4957c8df2c1c588b00580e175982b09c8cf172968d4d0bc95576e0e76f2640188d3beef4986d33ef4b79d209bf4a4cdbb45 SHA512 bd23c644f6e957ce7c0aacbe08112deb992608f5546889f765b333fc6094e34bc7329859d66bfbdbd56ebb5d77b82958ff3fc6614780c80573e85bb96f59eae6
 DIST qtwayland-everywhere-opensource-src-5.15.8.tar.xz 568268 BLAKE2B b4e982015e25104b3270b48a180b5726ba85e83fd9616422422d8729dc09bc94bbeecfe2096e388eadb0930e4abfdd3b0349eba2bd1d8f742f0c74b5e72aeac5 SHA512 6c6e9dc20f98d71abd7dba54ff278bf4535e70f86bfc4e6dd46c1af7c87777f045a6aba02bba3eb786f7cf383da5fb72b03e1e6ec636c8be0cde0e4e5b7b5b2d
-DIST qtwayland-everywhere-src-6.4.2.tar.xz 836720 BLAKE2B d8a6b84712081097775f083f3887c18eb001fd2beba32b2abc930ec3b932f6f19b347fe2fde3b98f35c1e7e31661974b13468fb176e73bdf557a330c80d847fd SHA512 29d3f3e7fade666bcd3145106f1d782122ac3fcf94811d25917c9f45af0dc8cddb3c2149545344d91e86f86490029555758ed2e180f241703251c22c7ec15122
 DIST qtwayland-everywhere-src-6.4.3.tar.xz 836240 BLAKE2B 30e3a3847328006eb580d043880556e7eeadd165fd599ab3921810360e2e2dffdea23e5aea4282cdf58b8d12f1392d70840016a187f561b3cbd6f704b1d7553d SHA512 15d74d057c09a734dd10617d018f4dc54e6be4fef5dc96d6eefd6b3f47952bbdb98bc39cbc9545c7ae1a9ec87a512a72d2f019ee47210bfab8cbae0cf01e4ae4
-EBUILD qtwayland-5.15.8-r3.ebuild 1004 BLAKE2B 778aba56b8a28492582e4186d1d9626c81cc9c4347e7b3221a026e1ce1220d1ac78605166175cac2d5bbcd7e98f5e092489c824c990c86f7d0da2f94d3535580 SHA512 787774fa372b3ec7cbd8f3abf38d6f622f4e3b521ec4cdccfeaad0c855eea456285fb1d22932dc1f12d0774d62ac61bab39325fea52f62bfea692ed44024fff8
-EBUILD qtwayland-5.15.8.ebuild 1002 BLAKE2B 4a77721f71912a69ac8da399cf959dccbf1141a7ba4f2a10e64a5bbfac97be16925a271767a227d84756aa256d0a419a4575a65c98ab402c5fd8bba3991868b6 SHA512 4591113cdcb1cc58cd2740d555243b4ffea4c507a2ef3ce3a06c2982dec8da850256d78347a1843b16455d313f4175d421451f93b6fd00bf387be1f86a01ea7b
-EBUILD qtwayland-6.4.2.ebuild 438 BLAKE2B b419dc79923c1f81cf59b47d3f95cf43372260430cd16593089229011756c78663d062ce5b23464df27753427257bcea89ed745c0f8f0a4a1b7e7328dad60441 SHA512 a6d1cd0314a2dbcd74e3a4cc3ba2cba7b4145331c0b7617fe387cbeea4d9cb0643ab20d897df6953a21274771d3e64a6e99dce79bf41d33383508fb7b037c32e
+EBUILD qtwayland-5.15.8-r3.ebuild 1002 BLAKE2B a7bdae0b7a75b8478865e7d0221b62cae60268082ae42641795d7f6943e5f83d962f066ca7c7c594cf8836006c3c8368d2e4505ea63880e25e4d0d2949e081bb SHA512 0b559c13304298aa39ee15ef696d11ed76386de39df95db01f1d62c82f7f5c7d40751f57e5a3e3a6a5e7ab03e81fbff71e84daa52bad4cbece2fc17a6b0eafbc
 EBUILD qtwayland-6.4.3.ebuild 438 BLAKE2B b419dc79923c1f81cf59b47d3f95cf43372260430cd16593089229011756c78663d062ce5b23464df27753427257bcea89ed745c0f8f0a4a1b7e7328dad60441 SHA512 a6d1cd0314a2dbcd74e3a4cc3ba2cba7b4145331c0b7617fe387cbeea4d9cb0643ab20d897df6953a21274771d3e64a6e99dce79bf41d33383508fb7b037c32e
 MISC metadata.xml 584 BLAKE2B ad42909b120209835e121a29de558d338bae4348eb55e69a94e8ac8b54f26564df0a750839bef9418ae8056a0d24f234615247a610b8287f5b0fbffbc60193f2 SHA512 86fd81d63b19fc6e95bdcb92e9da9b03861248a4e78e9de36aca6996e61644ab8bce7a60ca22ee7ad86fefc9b407a1fd0136240b8fdfa3c40a149444ab1dcbe2
diff --git a/dev-qt/qtwayland/qtwayland-5.15.8-r3.ebuild b/dev-qt/qtwayland/qtwayland-5.15.8-r3.ebuild
index 671283a597f5..364fa200e67e 100644
--- a/dev-qt/qtwayland/qtwayland-5.15.8-r3.ebuild
+++ b/dev-qt/qtwayland/qtwayland-5.15.8-r3.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 if [[ ${PV} != *9999* ]]; then
 	QT5_KDEPATCHSET_REV=3
-	KEYWORDS="~amd64 ~arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86"
+	KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86"
 fi
 
 inherit qt5-build
diff --git a/dev-qt/qtwayland/qtwayland-5.15.8.ebuild b/dev-qt/qtwayland/qtwayland-5.15.8.ebuild
deleted file mode 100644
index 7bceb1714d8f..000000000000
--- a/dev-qt/qtwayland/qtwayland-5.15.8.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-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
-
-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-6.4.2.ebuild b/dev-qt/qtwayland/qtwayland-6.4.2.ebuild
deleted file mode 100644
index b1250c60de99..000000000000
--- a/dev-qt/qtwayland/qtwayland-6.4.2.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit qt6-build
-
-DESCRIPTION="Wayland platform plugin for Qt"
-
-if [[ ${QT6_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64"
-fi
-
-BDEPEND="dev-util/wayland-scanner"
-DEPEND="
-	dev-libs/wayland
-	=dev-qt/qtbase-${PV}*[gui,opengl]
-	=dev-qt/qtdeclarative-${PV}*
-	media-libs/libglvnd
-	x11-libs/libxkbcommon
-"
-RDEPEND="${DEPEND}"
diff --git a/dev-qt/qtwebchannel/Manifest b/dev-qt/qtwebchannel/Manifest
index a009e63136ef..3bebf0b5e356 100644
--- a/dev-qt/qtwebchannel/Manifest
+++ b/dev-qt/qtwebchannel/Manifest
@@ -1,8 +1,6 @@
 DIST qtwebchannel-5.15.8-gentoo-kde-1.tar.xz 5800 BLAKE2B c10ff2974e4e6c30e268f0da752331871aa81bd5253c52c20a823e9556b358cb8e3e8bf33e220f32dd55c7ac1fe2cece879e2573bbaa1e0c196bf719f846246e SHA512 712382e78283c43ad2ef45f19951ed9bc27f9a76c1a3e5c163110289a2dbaca7853b24d910e0c3ed5c3a39cdeb055f89fd095fcd96c98549fcee9f1b762866d8
 DIST qtwebchannel-everywhere-opensource-src-5.15.8.tar.xz 210788 BLAKE2B db577036db30d3334cf18f8e3e3c7d63ad0df2331fcf77f15e8f7f6c50470d29497098f5d13ef49d9cd5fb5c241297a45b864e698666c4246b6acfaef4a717ac SHA512 d607b74f6f433be874e42808259fdc6fa69e1ec754544e1f7d614b6a65ed266cdba76e0a7cd535d65045bc708045c8757c1b3826c7885bc08a787458b60ae1cc
-DIST qtwebchannel-everywhere-src-6.4.2.tar.xz 213124 BLAKE2B ddb51b69728624d88b6ba1952786a1797cc6b61544303d31d862042e87198a5cf0c02b6a5613c18a251b8e7597f34cb52729fdac0cb65c63e4f49c638ff6b333 SHA512 5cde582d77c55bdf4d69a31f04b293c267da00f6a18ab0d677ea1b9b6348cddca8fb9ad453128607f5dc191aeb5e685d8d8fbcade0affeb54ec2fd06035a5c75
 DIST qtwebchannel-everywhere-src-6.4.3.tar.xz 213316 BLAKE2B c026006d72d50a3f61dc20f8456a23eb2cdf4d3b1230b2495457d8fa985a861ff4161da0157f9150f7e044a49aeeba4d01c104e865e8b2c4a709bc5f7732b604 SHA512 6bab95a2df742c6ff023a72a3b192e7c5e56e23834dc7513aadc09d5ce0fadabf4b5590a9911b1dc8c83a7e1c984c4ac57c6957a3fa168de10af5d540d7d6af3
 EBUILD qtwebchannel-5.15.8.ebuild 599 BLAKE2B c61043201e33bea4827e7726a31ef0f631bba2799aaf76f9aa849d58f2b958e9053a6d73438906c92ef5ff160cf69cf568692ba566fa55d513154c7fbb385a31 SHA512 62b65e38d50d9d337a4e6979ff758211350f720c4b7072d02213133a88e017f8996f69aabd0a22a495c0c86b5e6c19a4117f771ce1f58877413fcd57613e4dc8
-EBUILD qtwebchannel-6.4.2.ebuild 353 BLAKE2B 8acf032c4f6a40fe3d5b4698bdb480ce1535050c18de467654afda382f3c8ba8665116d728f41a6209ba0dacbfaa270cc9b7ed1e43d6ace9cb9d65e7a968d1dc SHA512 e2f8854c859d70482c8086f75435362200271d5e9b2a80a1eeaf1e90cd70e860d8fc8b8132e7afe76fb83afe3f123a2ce036ad05b65a0cf7f44ec46bfcbc34d9
 EBUILD qtwebchannel-6.4.3.ebuild 353 BLAKE2B 8acf032c4f6a40fe3d5b4698bdb480ce1535050c18de467654afda382f3c8ba8665116d728f41a6209ba0dacbfaa270cc9b7ed1e43d6ace9cb9d65e7a968d1dc SHA512 e2f8854c859d70482c8086f75435362200271d5e9b2a80a1eeaf1e90cd70e860d8fc8b8132e7afe76fb83afe3f123a2ce036ad05b65a0cf7f44ec46bfcbc34d9
 MISC metadata.xml 562 BLAKE2B 89a71be78fc40c86d01afd963f8a8519410086f36b572707e8029ea58e900d7e9563eb1b94fec26c2e078395bfa9ef20149fd8c0b2a5d6c3699198890215ebe7 SHA512 85467596f68320b2cd8440f9587f88992d36915b906a5b9139b29e07a9db9ca31853ae7c379bf90e9178e407ab3e526187ed761cd8cfa155658491ef68bbcf30
diff --git a/dev-qt/qtwebchannel/qtwebchannel-6.4.2.ebuild b/dev-qt/qtwebchannel/qtwebchannel-6.4.2.ebuild
deleted file mode 100644
index e82c78f55aca..000000000000
--- a/dev-qt/qtwebchannel/qtwebchannel-6.4.2.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 2021-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit qt6-build
-
-DESCRIPTION="Qt WebChannel"
-
-if [[ ${QT6_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64"
-fi
-
-DEPEND="
-	=dev-qt/qtbase-${PV}*[concurrent]
-	=dev-qt/qtdeclarative-${PV}*
-	=dev-qt/qtwebsockets-${PV}*
-"
-RDEPEND="${DEPEND}"
diff --git a/dev-qt/qtwebengine/Manifest b/dev-qt/qtwebengine/Manifest
index 946c32b999cc..931dedef95f9 100644
--- a/dev-qt/qtwebengine/Manifest
+++ b/dev-qt/qtwebengine/Manifest
@@ -10,13 +10,12 @@ AUX qtwebengine-5.15.3_p20220406-gcc12-includes.patch 1139 BLAKE2B ba451fcef0dd2
 AUX qtwebengine-5.15.3_p20220505-extra-gn.patch 458 BLAKE2B 0595f06d31fd83a04cc0ef9fb7567374c28c4d09c8774e6584d288aa18c2386efe699bd1d155fdee96f5960d3575baff6a6aa7a694d0c953401f80add9daf6c3 SHA512 81498f04c1ad4d73e888bba31fb1129e24990bcddb1d68111b004bba2e4fdab91698b3fe1d01bd94a0bf904e52f614cddc4ba6f70ffaf6a1d45e37a53e583629
 AUX qtwebengine-5.15.8_p20230106-v8-opcode-constexpr.patch 1911 BLAKE2B fb59f9ae06031bd52460856951653e193ee9a2d6f965fe0aab940822d8a7a90aea830ba9548a5879ac8644b5b80fb1ffbaf14dfb91de44e07c2ef4f5c470db6d SHA512 c490c2650f061e584523b06d28b3986a2ba940a478fa0aff1f1f4891495423c5dd432cc96a690ad02871e8e626d77978aaa9b97b4a8d0122e0638849e4225b3c
 AUX qtwebengine-5.15.8_p20230106-widevine.patch 4482 BLAKE2B 25cb06e27d51011df57b63053bc97f20bf0062167d0915b2d4da5b5b7164b5f35ef66b19da69acd3fac16bf9264e85e5d69987a6c38284033c77058b9146ea20 SHA512 f05969ce3355ca23cdaad822e052f4a12350598cd9a5bf5af72f9f10e1cf43bbbc86f2af3b5e27cd6a9198bd025a7afddb4db35444542d57c9963f3f47a6de97
+AUX qtwebengine-5.15.8_p20230112-gcc13.patch 13359 BLAKE2B d53cfd67c5e72a9f6f3d5e99c1ec6d5b90d9a4fdb5d462bc5d4e44e0c70b27fff2ab0128ea8f07a4f21429ddb33a3ec94b59b1459ebc6930290409e7cfdda6b7 SHA512 7bd8089a7fcd4603b0af41d3ff1c6be22d8074c6e5a2463884304cca94565ce720c30826678dd73509d042b0ae11ea213cbe9e8244c1dcd0c3fc6305cbe77de2
 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.8_p20230112.tar.xz 320881876 BLAKE2B 681fb4e2c6dfb80f1f2839092bbbd891a0a0d68f6b31dbdfe8693b8ea9a0ecd9611ba692b0565f32fc2ad199de715cf61e333d796df618572f79d9ed88545ffb SHA512 1806e7a3134579a5cfc0c932cc95ffb15edc515c2ff32b01eee9de8245938f95301610cd7b57451a07a9e38451111973b88c1d64a03f1371e58106bf202b143e
-DIST qtwebengine-everywhere-src-6.4.2.tar.xz 440538956 BLAKE2B df94e0e8e22d11614d0d35002c0e404e6735d75e7b43bef1bfd3d5e1230a997625fe8471d8a9154798cc1f9b9c296c2b697ec70fba0428d509d1352d6d3fafee SHA512 47b184a690d4fa5ccccaa3533903068df7b28825aeb16b7c75e3c7cc29fe0cfdf07501c5f0311926c22852f626b0cd59c836d44527261dc7d5c1efbf7e15439b
 DIST qtwebengine-everywhere-src-6.4.3.tar.xz 440562844 BLAKE2B 86155ffbb12bef9dad461c2bb0dc4fce53b269c6f9f61cd1ec49cc25bb0516dcfc903ce8b48751c9c47614d448c2cd290f3f313d5fdfe0a3643534fa7e2e9f3f SHA512 e9e8bdeac942350bf779a9fabfb59ffdfec366ec23cb1c58fa416a777c9399bfa9828107f6a1c079414a8aa52a35d0547e3bd673053d994e19308e11733e0d39
-EBUILD qtwebengine-5.15.8_p20230112.ebuild 9440 BLAKE2B e07a42c70a32e2d89bab03ba76b8d5ee435fa705c904558bbab992910a2557439454a3de6d2f73a80685be01790512870096f2b754f026e987bc9e420dfd66da SHA512 d1425b52dc2e4567084fab3d21418eb92490648b2ddd0a36d58a5ea6b8302e5bb20817756d9969312699d7cdefd9e988e65e762193382bae32ac52183003d5fd
-EBUILD qtwebengine-6.4.2.ebuild 7414 BLAKE2B 6d25d60291c227c6bf52adaef94d8b13aafc98a3946472d191c8311e42fe8afd9b3799510afa58ea01a83a393adcaffef4842ef7df5f5ffdaa73b5344ede59a4 SHA512 f5947f1440041ec126b571d570c6cb13ed8f27d0deb703945a47491735ae2ac04e0d5cbda6bec23d6233de7583a757220910d113058535835367615c1284eeed
+EBUILD qtwebengine-5.15.8_p20230112.ebuild 9539 BLAKE2B da7abf15aef811b8d1339e72a3b3a820b745fe942c5d35099cb76924aaa01f71441792b02f92aeb436e3a57437c4cd394110403fbd844ad24786d4d9037b029c SHA512 4e001b9fc77762ba864931a4a55e3e4032fc8f217b357bbb7a0bfa67de4a54a6bb2f2b071daa1f9cbbae781f47d446263fbe5266f0c8cdf2657913ef332bb07c
 EBUILD qtwebengine-6.4.3.ebuild 7634 BLAKE2B b7a9e50c5653c8fbe50d180e48de9c52c6135ffe23869d58b9b703b52e667c24afe918b365fe9c0397834d4688d54fca1432985f6f5b848a3d21416ce880f3a6 SHA512 a10a58f330d9dbb480107cfe67fe79747c98fb70451c14e87430759ce49e902cad791cdd919cf1218baeba67dabe3a1835d64d70495f5522758e7657bdaa4d0f
 MISC metadata.xml 1258 BLAKE2B 450cb9e683a52475729881c910e7b0b79587d3d672d4eb90613b91194ec19ab7c0fb86bf4ff4bf631686ed3cad49859eed07405b1f7d6129f40b5f4edba68e43 SHA512 971dbe74479e6bf3ed3cda00724bb4a60d6382c4020ee6ce3a730646a69af0a66785fb135706a2a0cc00ff3190674e724aa3def03f43c8e9ed5e5d317ae271f0
diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.15.8_p20230112-gcc13.patch b/dev-qt/qtwebengine/files/qtwebengine-5.15.8_p20230112-gcc13.patch
new file mode 100644
index 000000000000..b9df5b0fe445
--- /dev/null
+++ b/dev-qt/qtwebengine/files/qtwebengine-5.15.8_p20230112-gcc13.patch
@@ -0,0 +1,431 @@
+Upstream:
+- https://codereview.qt-project.org/c/qt/qtwebengine-chromium/+/468198
+
+Gentoo bugs:
+- https://bugs.gentoo.org/889724
+- https://bugs.gentoo.org/895196
+- https://bugs.gentoo.org/898902
+- https://bugs.gentoo.org/898634 (bundled abseil)
+
+Based on the following from Fedora:
+- https://src.fedoraproject.org/rpms/qt5-qtwebengine/c/14bbdcc0567223a4c96421ab2dfe2a668831ec98?branch=rawhide
+- https://src.fedoraproject.org/rpms/qt5-qtwebengine/c/9a37c86a90d1d3c0684aa1428657fc7ed22390ac?branch=rawhide
+- https://src.fedoraproject.org/rpms/qt5-qtwebengine/c/5dc49e01024ab2adae3705d14a9be76d706b7e52?branch=rawhide
+- Whole thing: https://src.fedoraproject.org/rpms/qt5-qtwebengine/raw/rawhide/f/qtwebengine-fix-build.patch
+--- a/src/3rdparty/chromium/base/debug/profiler.h
++++ b/src/3rdparty/chromium/base/debug/profiler.h
+@@ -5,6 +5,7 @@
+ #ifndef BASE_DEBUG_PROFILER_H_
+ #define BASE_DEBUG_PROFILER_H_
+ 
++#include <cstdint>
+ #include <stddef.h>
+ 
+ #include <string>
+--- a/src/3rdparty/chromium/base/debug/stack_trace.h
++++ b/src/3rdparty/chromium/base/debug/stack_trace.h
+@@ -7,6 +7,7 @@
+ 
+ #include <stddef.h>
+ 
++#include <cstdint>
+ #include <iosfwd>
+ #include <string>
+ 
+--- a/src/3rdparty/chromium/cc/trees/target_property.cc
++++ b/src/3rdparty/chromium/cc/trees/target_property.cc
+@@ -4,6 +4,8 @@
+ 
+ #include "cc/trees/target_property.h"
+ 
++#include <cstdint>
++
+ namespace cc {
+ 
+ static_assert(TargetProperty::LAST_TARGET_PROPERTY < kMaxTargetPropertyIndex,
+--- a/src/3rdparty/chromium/content/public/browser/browsing_data_remover_delegate.h
++++ b/src/3rdparty/chromium/content/public/browser/browsing_data_remover_delegate.h
+@@ -5,6 +5,7 @@
+ #ifndef CONTENT_PUBLIC_BROWSER_BROWSING_DATA_REMOVER_DELEGATE_H_
+ #define CONTENT_PUBLIC_BROWSER_BROWSING_DATA_REMOVER_DELEGATE_H_
+ 
++#include <cstdint>
+ #include <string>
+ #include <vector>
+ #include "base/callback_forward.h"
+--- a/src/3rdparty/chromium/device/base/synchronization/one_writer_seqlock.cc
++++ b/src/3rdparty/chromium/device/base/synchronization/one_writer_seqlock.cc
+@@ -4,6 +4,8 @@
+ 
+ #include "device/base/synchronization/one_writer_seqlock.h"
+ 
++#include <cstdint>
++
+ namespace device {
+ 
+ OneWriterSeqLock::OneWriterSeqLock() : sequence_(0) {}
+--- a/src/3rdparty/chromium/device/bluetooth/public/cpp/bluetooth_uuid.h
++++ b/src/3rdparty/chromium/device/bluetooth/public/cpp/bluetooth_uuid.h
+@@ -5,6 +5,7 @@
+ #ifndef DEVICE_BLUETOOTH_PUBLIC_CPP_BLUETOOTH_UUID_H_
+ #define DEVICE_BLUETOOTH_PUBLIC_CPP_BLUETOOTH_UUID_H_
+ 
++#include <cstdint>
+ #include <string>
+ #include <vector>
+ 
+--- a/src/3rdparty/chromium/extensions/browser/api/audio/audio_device_id_calculator.h
++++ b/src/3rdparty/chromium/extensions/browser/api/audio/audio_device_id_calculator.h
+@@ -5,6 +5,7 @@
+ #ifndef EXTENSIONS_BROWSER_API_AUDIO_AUDIO_DEVICE_ID_CALCULATOR_H_
+ #define EXTENSIONS_BROWSER_API_AUDIO_AUDIO_DEVICE_ID_CALCULATOR_H_
+ 
++#include <cstdint>
+ #include <map>
+ #include <string>
+ 
+--- a/src/3rdparty/chromium/extensions/common/constants.h
++++ b/src/3rdparty/chromium/extensions/common/constants.h
+@@ -11,6 +11,8 @@
+ #include "components/version_info/channel.h"
+ #include "ui/base/layout.h"
+ 
++#include <cstdint>
++
+ namespace extensions {
+ 
+ // Scheme we serve extension content from.
+--- a/src/3rdparty/chromium/gpu/command_buffer/common/webgpu_cmd_enums.h
++++ b/src/3rdparty/chromium/gpu/command_buffer/common/webgpu_cmd_enums.h
+@@ -5,6 +5,8 @@
+ #ifndef GPU_COMMAND_BUFFER_COMMON_WEBGPU_CMD_ENUMS_H_
+ #define GPU_COMMAND_BUFFER_COMMON_WEBGPU_CMD_ENUMS_H_
+ 
++#include <cstdint>
++
+ namespace gpu {
+ namespace webgpu {
+ 
+--- a/src/3rdparty/chromium/gpu/command_buffer/common/webgpu_cmd_format.h
++++ b/src/3rdparty/chromium/gpu/command_buffer/common/webgpu_cmd_format.h
+@@ -5,6 +5,7 @@
+ #ifndef GPU_COMMAND_BUFFER_COMMON_WEBGPU_CMD_FORMAT_H_
+ #define GPU_COMMAND_BUFFER_COMMON_WEBGPU_CMD_FORMAT_H_
+ 
++#include <cstdint>
+ #include <string.h>
+ 
+ #include "gpu/command_buffer/common/gl2_types.h"
+--- a/src/3rdparty/chromium/gpu/command_buffer/service/shared_context_state.h
++++ b/src/3rdparty/chromium/gpu/command_buffer/service/shared_context_state.h
+@@ -5,6 +5,7 @@
+ #ifndef GPU_COMMAND_BUFFER_SERVICE_SHARED_CONTEXT_STATE_H_
+ #define GPU_COMMAND_BUFFER_SERVICE_SHARED_CONTEXT_STATE_H_
+ 
++#include <cstdint>
+ #include <memory>
+ #include <vector>
+ 
+--- a/src/3rdparty/chromium/gpu/config/device_perf_info.h
++++ b/src/3rdparty/chromium/gpu/config/device_perf_info.h
+@@ -5,6 +5,7 @@
+ #ifndef GPU_CONFIG_DEVICE_PERF_INFO_H_
+ #define GPU_CONFIG_DEVICE_PERF_INFO_H_
+ 
++#include <cstdint>
+ #include <string>
+ #include <vector>
+ 
+--- a/src/3rdparty/chromium/gpu/config/gpu_feature_info.h
++++ b/src/3rdparty/chromium/gpu/config/gpu_feature_info.h
+@@ -5,6 +5,7 @@
+ #ifndef GPU_CONFIG_GPU_FEATURE_INFO_H_
+ #define GPU_CONFIG_GPU_FEATURE_INFO_H_
+ 
++#include <cstdint>
+ #include <string>
+ #include <vector>
+ 
+--- a/src/3rdparty/chromium/gpu/config/gpu_preferences.h
++++ b/src/3rdparty/chromium/gpu/config/gpu_preferences.h
+@@ -5,6 +5,7 @@
+ #ifndef GPU_CONFIG_GPU_PREFERENCES_H_
+ #define GPU_CONFIG_GPU_PREFERENCES_H_
+ 
++#include <cstdint>
+ #include <stddef.h>
+ #include <string>
+ #include <vector>
+--- a/src/3rdparty/chromium/gpu/config/gpu_util.h
++++ b/src/3rdparty/chromium/gpu/config/gpu_util.h
+@@ -5,6 +5,8 @@
+ #ifndef GPU_CONFIG_GPU_UTIL_H_
+ #define GPU_CONFIG_GPU_UTIL_H_
+ 
++#include <cstdint>
++
+ #include "build/build_config.h"
+ #include "gpu/config/gpu_feature_info.h"
+ #include "gpu/gpu_export.h"
+--- a/src/3rdparty/chromium/net/base/parse_number.h
++++ b/src/3rdparty/chromium/net/base/parse_number.h
+@@ -9,6 +9,8 @@
+ #include "base/strings/string_piece.h"
+ #include "net/base/net_export.h"
+ 
++#include <cstdint>
++
+ // This file contains utility functions for parsing numbers, in the context of
+ // network protocols.
+ //
+--- a/src/3rdparty/chromium/net/cookies/cookie_inclusion_status.h
++++ b/src/3rdparty/chromium/net/cookies/cookie_inclusion_status.h
+@@ -5,6 +5,7 @@
+ #ifndef NET_COOKIES_COOKIE_INCLUSION_STATUS_H_
+ #define NET_COOKIES_COOKIE_INCLUSION_STATUS_H_
+ 
++#include <cstdint>
+ #include <string>
+ #include <vector>
+ 
+--- a/src/3rdparty/chromium/pdf/document_attachment_info.h
++++ b/src/3rdparty/chromium/pdf/document_attachment_info.h
+@@ -7,6 +7,8 @@
+ 
+ #include "base/strings/string16.h"
+ 
++#include <cstdint>
++
+ namespace chrome_pdf {
+ 
+ struct DocumentAttachmentInfo {
+--- a/src/3rdparty/chromium/ppapi/utility/completion_callback_factory_thread_traits.h
++++ b/src/3rdparty/chromium/ppapi/utility/completion_callback_factory_thread_traits.h
+@@ -38,6 +38,10 @@ namespace pp {
+ /// As a further optimization, we can add support for this later.
+ class ThreadSafeThreadTraits {
+  public:
++
++  typedef pp::Lock Lock;
++  typedef pp::AutoLock AutoLock;
++
+   class RefCount {
+    public:
+     /// Default constructor. In debug mode, this checks that the object is being
+@@ -67,8 +71,6 @@ class ThreadSafeThreadTraits {
+     int32_t ref_;
+   };
+ 
+-  typedef pp::Lock Lock;
+-  typedef pp::AutoLock AutoLock;
+ };
+ 
+ /// The non-thread-safe version of thread traits. Using this class as the
+--- a/src/3rdparty/chromium/third_party/abseil-cpp/absl/strings/internal/str_format/extension.h
++++ b/src/3rdparty/chromium/third_party/abseil-cpp/absl/strings/internal/str_format/extension.h
+@@ -19,6 +19,7 @@
+ #include <limits.h>
+ 
+ #include <cstddef>
++#include <cstdint>
+ #include <cstring>
+ #include <ostream>
+ 
+--- a/src/3rdparty/chromium/third_party/angle/include/GLSLANG/ShaderVars.h
++++ b/src/3rdparty/chromium/third_party/angle/include/GLSLANG/ShaderVars.h
+@@ -12,6 +12,7 @@
+ 
+ #include <algorithm>
+ #include <array>
++#include <cstdint>
+ #include <string>
+ #include <vector>
+ 
+--- a/src/3rdparty/chromium/third_party/angle/src/common/angleutils.h
++++ b/src/3rdparty/chromium/third_party/angle/src/common/angleutils.h
+@@ -15,6 +15,7 @@
+ #    include "absl/container/flat_hash_map.h"
+ #endif  // defined(ANGLE_USE_ABSEIL)
+ 
++#include <cstdint>
+ #include <climits>
+ #include <cstdarg>
+ #include <cstddef>
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/minidump_descriptor.h
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/minidump_descriptor.h
+@@ -33,6 +33,7 @@
+ #include <assert.h>
+ #include <sys/types.h>
+ 
++#include <cstdint>
+ #include <string>
+ 
+ #include "client/linux/handler/microdump_extra_info.h"
+--- a/src/3rdparty/chromium/third_party/libgav1/src/src/utils/threadpool.cc
++++ b/src/3rdparty/chromium/third_party/libgav1/src/src/utils/threadpool.cc
+@@ -30,6 +30,7 @@
+ #include <cstddef>
+ #include <cstdint>
+ #include <cstring>
++#include <cstdio>
+ #include <new>
+ #include <utility>
+ 
+--- a/src/3rdparty/chromium/third_party/pdfium/constants/annotation_flags.h
++++ b/src/3rdparty/chromium/third_party/pdfium/constants/annotation_flags.h
+@@ -5,6 +5,8 @@
+ #ifndef CONSTANTS_ANNOTATION_FLAGS_H_
+ #define CONSTANTS_ANNOTATION_FLAGS_H_
+ 
++#include <cstdint>
++
+ namespace pdfium {
+ namespace annotation_flags {
+ 
+--- a/src/3rdparty/chromium/third_party/perfetto/include/perfetto/ext/base/uuid.h
++++ b/src/3rdparty/chromium/third_party/perfetto/include/perfetto/ext/base/uuid.h
+@@ -18,6 +18,7 @@
+ #define INCLUDE_PERFETTO_EXT_BASE_UUID_H_
+ 
+ #include <array>
++#include <cstdint>
+ #include <string>
+ 
+ #include "perfetto/ext/base/optional.h"
+--- a/src/3rdparty/chromium/third_party/perfetto/src/trace_processor/importers/proto/proto_importer_module.h
++++ b/src/3rdparty/chromium/third_party/perfetto/src/trace_processor/importers/proto/proto_importer_module.h
+@@ -21,6 +21,8 @@
+ #include "perfetto/trace_processor/status.h"
+ #include "src/trace_processor/trace_blob_view.h"
+ 
++#include <cstdint>
++
+ namespace perfetto {
+ 
+ namespace protos {
+--- a/src/3rdparty/chromium/third_party/skia/src/utils/SkParseColor.cpp
++++ b/src/3rdparty/chromium/third_party/skia/src/utils/SkParseColor.cpp
+@@ -9,6 +9,9 @@
+ #include "include/utils/SkParse.h"
+ 
+ #include <algorithm> // std::lower_bound
++#include <algorithm>
++#include <cstring>
++#include <iterator>
+ 
+ static constexpr const char* gColorNames[] = {
+     "aliceblue",
+--- a/src/3rdparty/chromium/third_party/webrtc/call/rtp_demuxer.h
++++ b/src/3rdparty/chromium/third_party/webrtc/call/rtp_demuxer.h
+@@ -11,6 +11,7 @@
+ #ifndef CALL_RTP_DEMUXER_H_
+ #define CALL_RTP_DEMUXER_H_
+ 
++#include <cstdint>
+ #include <map>
+ #include <set>
+ #include <string>
+--- a/src/3rdparty/chromium/third_party/webrtc/rtc_base/third_party/base64/base64.h
++++ b/src/3rdparty/chromium/third_party/webrtc/rtc_base/third_party/base64/base64.h
+@@ -12,6 +12,7 @@
+ #ifndef RTC_BASE_THIRD_PARTY_BASE64_BASE64_H_
+ #define RTC_BASE_THIRD_PARTY_BASE64_BASE64_H_
+ 
++#include <cstdint>
+ #include <string>
+ #include <vector>
+ 
+--- a/src/3rdparty/chromium/third_party/xcbproto/src/src/present.xml
++++ b/src/3rdparty/chromium/third_party/xcbproto/src/src/present.xml
+@@ -89,7 +89,7 @@ OF THIS SOFTWARE.
+     </reply>
+   </request>
+ 
+-  <request name="Pixmap" opcode="1">
++  <request name="PresentPixmap" opcode="1">
+     <required_start_align align="8" />
+     <field type="WINDOW" name="window" />
+     <field type="PIXMAP" name="pixmap" />
+--- a/src/3rdparty/chromium/ui/events/gesture_event_details.h
++++ b/src/3rdparty/chromium/ui/events/gesture_event_details.h
+@@ -5,6 +5,7 @@
+ #ifndef UI_EVENTS_GESTURE_DETECTION_GESTURE_EVENT_DETAILS_H_
+ #define UI_EVENTS_GESTURE_DETECTION_GESTURE_EVENT_DETAILS_H_
+ 
++#include <cstdint>
+ #include <string.h>
+ 
+ #include "base/check_op.h"
+--- a/src/3rdparty/chromium/ui/events/types/scroll_types.h
++++ b/src/3rdparty/chromium/ui/events/types/scroll_types.h
+@@ -5,6 +5,8 @@
+ #ifndef UI_EVENTS_TYPES_SCROLL_TYPES_H_
+ #define UI_EVENTS_TYPES_SCROLL_TYPES_H_
+ 
++#include <cstdint>
++
+ namespace ui {
+ 
+ enum class ScrollGranularity : uint8_t {
+--- a/src/3rdparty/chromium/ui/gl/gl_surface_glx.cc
++++ b/src/3rdparty/chromium/ui/gl/gl_surface_glx.cc
+@@ -4,6 +4,7 @@
+ 
+ #include "ui/gl/gl_surface_glx.h"
+ 
++#include <cstdint>
+ #include <utility>
+ 
+ #include "base/bind.h"
+--- a/src/3rdparty/chromium/ui/gl/gl_surface_glx.h
++++ b/src/3rdparty/chromium/ui/gl/gl_surface_glx.h
+@@ -5,6 +5,7 @@
+ #ifndef UI_GL_GL_SURFACE_GLX_H_
+ #define UI_GL_GL_SURFACE_GLX_H_
+ 
++#include <cstdint>
+ #include <stdint.h>
+ 
+ #include <memory>
+--- a/src/3rdparty/chromium/v8/src/base/logging.h
++++ b/src/3rdparty/chromium/v8/src/base/logging.h
+@@ -5,6 +5,7 @@
+ #ifndef V8_BASE_LOGGING_H_
+ #define V8_BASE_LOGGING_H_
+ 
++#include <cstdint>
+ #include <cstring>
+ #include <sstream>
+ #include <string>
+--- a/src/3rdparty/chromium/v8/src/base/macros.h
++++ b/src/3rdparty/chromium/v8/src/base/macros.h
+@@ -5,6 +5,7 @@
+ #ifndef V8_BASE_MACROS_H_
+ #define V8_BASE_MACROS_H_
+ 
++#include <cstdint>
+ #include <limits>
+ #include <type_traits>
+ 
+--- a/src/3rdparty/chromium/v8/src/inspector/v8-string-conversions.h
++++ b/src/3rdparty/chromium/v8/src/inspector/v8-string-conversions.h
+@@ -5,6 +5,7 @@
+ #ifndef V8_INSPECTOR_V8_STRING_CONVERSIONS_H_
+ #define V8_INSPECTOR_V8_STRING_CONVERSIONS_H_
+ 
++#include <cstdint>
+ #include <string>
+ 
+ // Conversion routines between UT8 and UTF16, used by string-16.{h,cc}. You may
+--- a/src/core/browsing_data_remover_delegate_qt.h
++++ b/src/core/browsing_data_remover_delegate_qt.h
+@@ -42,6 +42,8 @@
+ 
+ #include "content/public/browser/browsing_data_remover_delegate.h"
+ 
++#include <cstdint>
++
+ namespace QtWebEngineCore {
+ 
+ class BrowsingDataRemoverDelegateQt : public content::BrowsingDataRemoverDelegate {
+
diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.8_p20230112.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.8_p20230112.ebuild
index eacf340d227b..a9eb384e9067 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.15.8_p20230112.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.15.8_p20230112.ebuild
@@ -114,6 +114,7 @@ PATCHES=(
 	"${WORKDIR}/${PN}-5.15.3_p20220406-patchset" # bug 698988 (py2--), pipewire-3
 	"${FILESDIR}/${PN}-5.15.8_p20230106-v8-opcode-constexpr.patch" # bug 889042
 	"${FILESDIR}/${PN}-5.15.8_p20230106-widevine.patch" # bug 888783
+	"${FILESDIR}/${PN}-5.15.8_p20230112-gcc13.patch" # bug 889724, bug 895196, bug 898902, bug 898634
 )
 
 qtwebengine_check-reqs() {
diff --git a/dev-qt/qtwebengine/qtwebengine-6.4.2.ebuild b/dev-qt/qtwebengine/qtwebengine-6.4.2.ebuild
deleted file mode 100644
index c1a7dff6aa69..000000000000
--- a/dev-qt/qtwebengine/qtwebengine-6.4.2.ebuild
+++ /dev/null
@@ -1,243 +0,0 @@
-# Copyright 2021-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-PYTHON_REQ_USE="xml(+)"
-CHROMIUM_VER="102.0.5005.177"
-CHROMIUM_PATCHES_VER="108.0.5359.94"
-
-inherit check-reqs estack flag-o-matic multiprocessing python-any-r1 qt6-build
-
-DESCRIPTION="Library for rendering dynamic web content in Qt6 C++ and QML applications"
-
-if [[ ${QT6_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64"
-fi
-
-IUSE="
-	alsa bindist designer geolocation +jumbo-build kerberos pulseaudio screencast
-	+system-ffmpeg +system-icu widgets
-"
-REQUIRED_USE="designer? ( widgets )"
-
-BDEPEND="
-	$(python_gen_any_dep 'dev-python/html5lib[${PYTHON_USEDEP}]')
-	dev-util/gperf
-	dev-util/ninja
-	dev-util/re2c
-	net-libs/nodejs[ssl]
-	sys-devel/bison
-	sys-devel/flex
-"
-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/qtdeclarative-${PV}*
-	=dev-qt/qtwebchannel-${PV}*
-	media-libs/fontconfig
-	media-libs/freetype
-	media-libs/harfbuzz:=
-	media-libs/lcms:2
-	media-libs/libjpeg-turbo:=
-	media-libs/libpng:=
-	>=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/libxcb:=
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXi
-	x11-libs/libxkbcommon
-	x11-libs/libxkbfile
-	x11-libs/libXrandr
-	x11-libs/libXrender
-	x11-libs/libXScrnSaver
-	x11-libs/libxshmfence:=
-	x11-libs/libXtst
-	alsa? ( media-libs/alsa-lib )
-	geolocation? ( =dev-qt/qtpositioning-${PV}* )
-	kerberos? ( virtual/krb5 )
-	pulseaudio? ( media-libs/libpulse:= )
-	screencast? ( media-video/pipewire:= )
-	system-ffmpeg? ( media-video/ffmpeg:= )
-	system-icu? ( >=dev-libs/icu-69.1:= )
-	widgets? (
-		=dev-qt/qtbase-${PV}*[widgets]
-	)
-"
-DEPEND="${RDEPEND}
-	media-libs/libglvnd
-"
-
-python_check_deps() {
-	python_has_version "dev-python/html5lib[${PYTHON_USEDEP}]"
-}
-
-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
-}
-
-pkg_preinst() {
-	elog "This version of Qt WebEngine is based on Chromium version ${CHROMIUM_VER}, with"
-	elog "additional security fixes up to ${CHROMIUM_PATCHES_VER}. Extensive as it is, the"
-	elog "list of backports is impossible to evaluate, but always bound to be behind"
-	elog "Chromium's release schedule."
-	elog "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."
-}
-
-src_unpack() {
-	# bug 307861
-	eshopts_push -s extglob
-	if is-flagq '-g?(gdb)?([1-9])'; then
-		ewarn
-		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."
-		ewarn
-	fi
-	eshopts_pop
-
-	case ${QT6_BUILD_TYPE} in
-		live)    git-r3_src_unpack ;&
-		release) default ;;
-	esac
-}
-
-src_prepare() {
-	# bug 620444 - ensure local headers are used
-	find . -type f -name "*.pr[fio]" -exec \
-		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
-
-	qt6-build_src_prepare
-}
-
-src_configure() {
-	export NINJA_PATH="${BROOT}"/usr/bin/ninja
-	export NINJAFLAGS="${NINJAFLAGS:--j$(makeopts_jobs) -l$(makeopts_loadavg "${MAKEOPTS}" 0) -v}"
-
-	local mycmakeargs=(
-		#-DQT_FEATURE_accessibility=off
-		#-DQT_FEATURE_force_asserts=off
-		#-DQT_FEATURE_opengl=off
-		#-DQT_FEATURE_printer=off
-		-DQT_FEATURE_qtpdf_build=off
-		-DQT_FEATURE_qtpdf_quick_build=off
-		-DQT_FEATURE_qtpdf_widgets_build=off
-		-DQT_FEATURE_qtwebengine_build=on
-		-DQT_FEATURE_qtwebengine_quick_build=on
-		-DQT_FEATURE_qtwebengine_widgets_build=on
-		#-DQT_FEATURE_ssl=off
-		#-DQT_FEATURE_static=off
-		#-DQT_FEATURE_system_zlib=off
-		#-DQT_FEATURE_system_png=off
-		#-DQT_FEATURE_system_jpeg=off
-		#-DQT_FEATURE_system_freetype=off
-		#-DQT_FEATURE_system_harfbuzz=off
-		#-DQT_FEATURE_use_gold_linker=off
-		#-DQT_FEATURE_use_lld_linker=off
-		-DQT_FEATURE_webengine_embedded_build=off
-		-DQT_FEATURE_webengine_extensions=on
-		#-DQT_FEATURE_webengine_full_debug_info=$(usex debug)
-		-DQT_FEATURE_webengine_geolocation=$(usex geolocation on off)
-		-DQT_FEATURE_webengine_jumbo_build=$(usex jumbo-build)
-		#-DQT_FEATURE_webengine_jumbo_file_merge_limit
-		-DQT_FEATURE_webengine_kerberos=$(usex kerberos on off)
-		-DQT_FEATURE_webengine_native_spellchecker=off
-		-DQT_FEATURE_webengine_ozone_x11=on
-		-DQT_FEATURE_webengine_pepper_plugins=on
-		-DQT_FEATURE_webengine_proprietary_codecs=$(usex bindist off on)
-		-DQT_FEATURE_webengine_printing_and_pdf=on
-		-DQT_FEATURE_webengine_sanitizer=on
-		-DQT_FEATURE_webengine_spellchecker=on
-		-DQT_FEATURE_webengine_system_opus=on
-		-DQT_FEATURE_webengine_system_libwebp=on
-		-DQT_FEATURE_webengine_system_alsa=$(usex alsa on off)
-		-DQT_FEATURE_webengine_system_ffmpeg=$(usex system-ffmpeg)
-		-DQT_FEATURE_webengine_system_icu=$(usex system-icu)
-		-DQT_FEATURE_webengine_system_libevent=on
-		-DQT_FEATURE_webengine_system_libpci=on
-		-DQT_FEATURE_webengine_system_libpng=on
-		-DQT_FEATURE_webengine_system_pulseaudio=$(usex pulseaudio on off)
-		-DQT_FEATURE_webengine_system_zlib=on
-		-DQT_FEATURE_webengine_webchannel=on
-		-DQT_FEATURE_webengine_webrtc=on
-		-DQT_FEATURE_webengine_webrtc_pipewire=$(usex screencast on off)
-		#-DQT_FEATURE_xcb=off
-	)
-
-	qt6-build_src_configure
-}
diff --git a/dev-qt/qtwebsockets/Manifest b/dev-qt/qtwebsockets/Manifest
index 4c1729011d53..3e6e764c7410 100644
--- a/dev-qt/qtwebsockets/Manifest
+++ b/dev-qt/qtwebsockets/Manifest
@@ -1,8 +1,6 @@
 DIST qtwebsockets-5.15.8-gentoo-kde-2.tar.xz 2028 BLAKE2B 60e13ca18f5f32de3d344b293c4601fb83166c10f2d51e2fc19135dc54cb5cbbcfacff86ee4c630d5fd988ec40f9bbb20d3c67e485de1e0bacdbd68cbcaee092 SHA512 175326b9e193bd38da5ab0d45cf91121797f1d21a2a2a9ad72692af76c95d38b8ffbde2af845dbd9647ad38274e20b06c28d4dbc548bc7bf39be0724403c6e00
 DIST qtwebsockets-everywhere-opensource-src-5.15.8.tar.xz 260804 BLAKE2B 256274508c9676f407826a04613c1d2e5d9f213aaef6853e2d873e6fb4ab5fc5d2aff762b0a74fb880ed581486c20d513e74ff6edb3358821c2bc663221b1498 SHA512 d44f8beab7536882cb4c8b9250a9e39a274b549b0ff6ea003f16c614a9e5f1bef7d0526acacd3d4382dea9ddc86be1631903df72a605b4cde06aa109320fe05f
-DIST qtwebsockets-everywhere-src-6.4.2.tar.xz 267456 BLAKE2B b0d3c7ace2007185486c81a8aff31ae6195aed165d7df0466e1e87775a721325fc337723923f8c1104fb52afaf75efa02ec5c9cfa5ce7597da9669993b52a5be SHA512 3d9b9a800151385e30a54289606ed430e322a8e8f4401b57a28fd194ccd0346b13151155b9c50780233dc89e6b3a639f1c30fe5fc7c71dc1d614398be4f9315c
 DIST qtwebsockets-everywhere-src-6.4.3.tar.xz 267624 BLAKE2B 4b33f472b7ef3745fe7e85cb942203de6139d3e0e2a553e92bb3659473e9ae12d6f7460da78da925189b202a65df69788882c7bb3ab0fd9b432d376082774091 SHA512 231135ac75f704aeebe5286cd30640bacb6192f08785ac94fe848d6d5164597db314054c9d48a2300e9967c609681802b82055ab6bf806b3a351d891d3855bf3
 EBUILD qtwebsockets-5.15.8-r1.ebuild 578 BLAKE2B 7fdd1091164c81cdf972e95caacfcd2520c7201597ed16580b91a11c3a26af86bf97a45ec95cffbf6348ee80b563b05497083d99e0eea7ac23c5c634f5ab93ba SHA512 f46ea8af383efb3c0b4e9a671296e4b585bc6bde71abede3b8eb6303e203af3e74228f110cf8544113d24178ff11abbe5f111e18ee4c301f212af7dbac0027aa
-EBUILD qtwebsockets-6.4.2.ebuild 370 BLAKE2B e65adfc17559000bea71d0ccc60f8aea62c926cf25d53bd1fb151c45cd40a2217d0257722110f4fc1c0b72188c1f3a80d244014c0355ccbc57ba384c28d1f1b8 SHA512 eae0d900b94e583514d1958dac60f1ecfd7da80c2b45b6accad4946af435d872a1e8102a4ae5bf3bdd91f53c585e5fcb09c7d3bc8e0c6b8408a338da2b186b17
 EBUILD qtwebsockets-6.4.3.ebuild 370 BLAKE2B e65adfc17559000bea71d0ccc60f8aea62c926cf25d53bd1fb151c45cd40a2217d0257722110f4fc1c0b72188c1f3a80d244014c0355ccbc57ba384c28d1f1b8 SHA512 eae0d900b94e583514d1958dac60f1ecfd7da80c2b45b6accad4946af435d872a1e8102a4ae5bf3bdd91f53c585e5fcb09c7d3bc8e0c6b8408a338da2b186b17
 MISC metadata.xml 542 BLAKE2B 45db7e0814cd2ecae2053ed664d6af55c1f2c175eeceba4364fc37c558ddb51c8e28309722e8c2404441ca009613c045ddf7e501d4b5ed27d208c027c3aa1573 SHA512 5bc7be4d72823fdb716ce7eee0c36eb2a5fe7ea9a59a95792727efbddbe474fb44dfa0286a3064ee674a41d8d5415fd48c717735b6818cf3c28e1d60193f3ce1
diff --git a/dev-qt/qtwebsockets/qtwebsockets-6.4.2.ebuild b/dev-qt/qtwebsockets/qtwebsockets-6.4.2.ebuild
deleted file mode 100644
index abdcffa9a067..000000000000
--- a/dev-qt/qtwebsockets/qtwebsockets-6.4.2.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 2021-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit qt6-build
-
-DESCRIPTION="Implementation of the WebSocket protocol for the Qt6 framework"
-
-if [[ ${QT6_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64"
-fi
-
-DEPEND="
-	=dev-qt/qtbase-${PV}*[network]
-	=dev-qt/qtdeclarative-${PV}*
-"
-RDEPEND="${DEPEND}"
diff --git a/dev-qt/qtwidgets/Manifest b/dev-qt/qtwidgets/Manifest
index cb69fb5b7ef1..b7d19df12e6a 100644
--- a/dev-qt/qtwidgets/Manifest
+++ b/dev-qt/qtwidgets/Manifest
@@ -1,9 +1,9 @@
-AUX qtwidgets-5.15.8-QTBUG-104917.patch 2256 BLAKE2B d8c311af0e3b0829b33e7a7f3042d1d98945c96deecca5aada63639cf422d471756c346c5c5d4655c398160068fde6a63a54934f5f390a8555c1851af67cbb84 SHA512 368480f5ed2333036013bb2cfdcde44c9284b559a9d637e077477e2511f3fdd3a175f3aafce9ab48fd58269b2b2f38c54048a13fbf43a97272d68e9596f2429b
 AUX qtwidgets-5.15.8-QTBUG-106569.patch 1986 BLAKE2B f8030cf8c3f683517d36a80fd3b8da575b74801adba771b8f267745877a809d92ff5f23fac0bde08efdcabc431338829cf96cb6d13eb4d43552a0bb7e3d7868e SHA512 19b6643361683c852d817d850108055ae86a27f658b0fd7dfa5b98bfe47374113ad4c149a120b48d25444d7d54ce645b01c3a94d4f980fc0055f2269961bbe48
 DIST qtbase-5.15-gentoo-patchset-3.tar.xz 3856 BLAKE2B 0752426f9bc2dfa1ab2bc246b29f5d00305df05175a7801d7d5eddacfa46fcb605d9a317547edc01d3ef339f6effc2fcee7549cb7aecced37f0098166c70dbe2 SHA512 2515bea53232e76ca3e40bdaf1dd52fdf452052a2f40002ee91360d1fcceea3c5c2f5a8d2a3bfc0f9c2bacd61460a632c5b351accd73fd37b64985593219148e
 DIST qtbase-5.15.8-gentoo-kde-5.tar.xz 793372 BLAKE2B f486a0275fdf4da28a88ba40b7e6f227267fa05e8f466f734f720e792de1796501d5f1fb4427a84ca2d709bfa07abd695ad59210f7fd11227b1bf465484736b8 SHA512 f51d7ee2d121acda1141b9816197afc57ac0176a12acc08a93c2a793694afb734f8f1ad280a5bf95170cf912e32edb4a6612befeb4198fec78a7e50bbb6a61cd
+DIST qtbase-5.15.8-gentoo-kde-6.tar.xz 796880 BLAKE2B 014fd9c9693fe1a5adc54f1d147db4bbb4bf6f5fbde5950a9586a6868d16b63b83cf24821c33fd2a325d6b70a1fa655b0fc0da7ef74ae175e278ebda1f8c9aa4 SHA512 910a7e42e13f33b53984b4f61c58e53c1cf0accfa9eb1e143cc011882fff6cab14fa7c66562396b3a929f5ec6ecf56724d74df34ac15f32cc4d8ae6cb8da797b
 DIST qtbase-everywhere-opensource-src-5.15.8.tar.xz 50259432 BLAKE2B cb1b790a384a5cad9a95fdc448e275d48a68c6ee2addf08b40f9963cc5762fd7ab15852dea8392dc76da39f1565c1e23ddb5875c280f0177e802082f4b4f7f2b SHA512 29e8877bafdbc908072209f1b27a5040b022e2b71f17f4ab4cecd570adeae21597f9af7f1d38758760f3cb30376eeb15c5f066bf02c6e9a9e3a4d07f967046ce
 EBUILD qtwidgets-5.15.8-r2.ebuild 1200 BLAKE2B 81fb29cbaccc25e1ee0a094551410909e1869ee23c85d1c86c05beb0c9f93046a1672a7619ba4a41fad91f59db5e6cba250d82263a57c960695cd69d5c713b60 SHA512 95a331bbaa646d7bbf48a183434300a64e887cb51a1c5a3bf2683267d4f99d479639fe394d043dfe00996933382c2c7f2f886638c9d9dcd404085138ae5bf2ca
 EBUILD qtwidgets-5.15.8-r3.ebuild 1253 BLAKE2B da2efc3cd5815a3abe41aab2e9ce54ab309d22983f71d7790c911463ce574def908f02469b4a91fc0ea2be001fb52117535845c2df9c8db2be1d07000a56fb69 SHA512 050efc3b7bcfebf988f9ae73ccdc7512ccebca2cebf0865fb85c377fa16e5bcad217d6ede9b8ec9e4b0a7dd1ce39b44fd1abd7e536be1de06ed1734c4a8be6f8
-EBUILD qtwidgets-5.15.8-r4.ebuild 1314 BLAKE2B 4bbfed4cfd4aa2b328265a0c41f91a48104e3dd8806d3e204e8996ccd8548b18961d37d44d5a4e2264ab8884096227d0c87b98a53de10fa48fd1808a574fe60a SHA512 78f9ca3efd656b1aecb893bcf9d9862b70b35de0a3c96d8efc2e11729740f79f47a5f03151457ac9f7aaa09e3081477add753f5fc4e76e1ca3719c6abbb70d7e
+EBUILD qtwidgets-5.15.8-r4.ebuild 1206 BLAKE2B 19adde31e27352891be060d2eac7d7939ab98815e2230a64ae83d6fc9a56d405d4a979051d03693dec170788950009cd6074829553b57fe038ac6d2aa6c583e7 SHA512 0b34b199305325c1a181ddc59b0f3b7ba6e1cf324537b6edda38ce58319f8e0f3f30103294cc3fee97723b2465947335dbcac24ac8685bca8e1793f0f56a1067
 MISC metadata.xml 559 BLAKE2B 3ea80a5e419db32987d68d7e5033fa75fa0ff22b31b0842fd7ead902172cbe83650b0bbdf8657a57e428726e7cdf114d9011bd16066c080bc5f6ecb3f691d42c SHA512 51172365a186fbca09651bfd751284960dda4036390af2afab9812a7ae3fabdd9d60a336dee3cfc5e3d133a0216bf77e29660b9cdee2f0bcd2ce43c27297bdb1
diff --git a/dev-qt/qtwidgets/files/qtwidgets-5.15.8-QTBUG-104917.patch b/dev-qt/qtwidgets/files/qtwidgets-5.15.8-QTBUG-104917.patch
deleted file mode 100644
index fae665b14d2e..000000000000
--- a/dev-qt/qtwidgets/files/qtwidgets-5.15.8-QTBUG-104917.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From 38c54b3ff58972fa16810740fc43933620b6dc0d Mon Sep 17 00:00:00 2001
-From: Axel Spoerl <axel.spoerl@qt.io>
-Date: Wed, 27 Jul 2022 15:17:03 +0200
-Subject: [PATCH] Add nullptr guard in
- QStyleSheetStyle::drawPrimitive(PE_PanelLineEdit)
-
-Drawing PE_PanelLineEdit in QStyleSheetStyle with the default argument
-widget = nullptr causes a segfault.
-
-drawPrimitive tries to fall back to a container widget's render rule
-and therefore calls containerWidget() - which crashes when called with
-nullptr.
-
-Container widget fallback is pointless when drawPrimitive() is called
-with widget == nullptr. This patch skips it in that case.
-
-Fixes: QTBUG-104917
-Pick-to: 6.4 6.3 6.2
-Change-Id: I09e57dccfebb81a308944c233846d5b9ef58819e
-Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
-(cherry picked from commit effc8be3ce848770a093d51d5651908c375e83f8)
----
- src/widgets/styles/qstylesheetstyle.cpp | 15 +++++++++------
- 1 file changed, 9 insertions(+), 6 deletions(-)
-
-diff --git a/src/widgets/styles/qstylesheetstyle.cpp b/src/widgets/styles/qstylesheetstyle.cpp
-index 9fcb8ba522..50fdee0f69 100644
---- a/src/widgets/styles/qstylesheetstyle.cpp
-+++ b/src/widgets/styles/qstylesheetstyle.cpp
-@@ -4449,12 +4449,15 @@ void QStyleSheetStyle::drawPrimitive(PrimitiveElement pe, const QStyleOption *op
- 
-     case PE_PanelLineEdit:
-         if (const QStyleOptionFrame *frm = qstyleoption_cast<const QStyleOptionFrame *>(opt)) {
--            QWidget *container = containerWidget(w);
--            if (container != w) {
--                QRenderRule containerRule = renderRule(container, opt);
--                if (!containerRule.hasNativeBorder() || !containerRule.baseStyleCanDraw())
--                    return;
--                rule = containerRule;
-+            // Fall back to container widget's render rule
-+            if (w) {
-+                QWidget *container = containerWidget(w);
-+                if (container != w) {
-+                    QRenderRule containerRule = renderRule(container, opt);
-+                    if (!containerRule.hasNativeBorder() || !containerRule.baseStyleCanDraw())
-+                        return;
-+                    rule = containerRule;
-+                }
-             }
- 
-             if (rule.hasNativeBorder()) {
--- 
-2.40.0
-
diff --git a/dev-qt/qtwidgets/qtwidgets-5.15.8-r4.ebuild b/dev-qt/qtwidgets/qtwidgets-5.15.8-r4.ebuild
index 45c06643f187..a445122d69a2 100644
--- a/dev-qt/qtwidgets/qtwidgets-5.15.8-r4.ebuild
+++ b/dev-qt/qtwidgets/qtwidgets-5.15.8-r4.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 if [[ ${PV} != *9999* ]]; then
-	QT5_KDEPATCHSET_REV=5
+	QT5_KDEPATCHSET_REV=6
 	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
 fi
 
@@ -48,11 +48,6 @@ QT5_GENTOO_PRIVATE_CONFIG=(
 	:widgets
 )
 
-PATCHES=(
-	"${FILESDIR}/${P}-QTBUG-106569.patch"
-	"${FILESDIR}/${P}-QTBUG-104917.patch" # KDE-bug 467373
-)
-
 src_configure() {
 	local myconf=(
 		-opengl $(usex gles2-only es2 desktop)
author	V3n3RiX <venerix@koprulu.sector>	2023-03-28 09:49:11 +0100
committer	V3n3RiX <venerix@koprulu.sector>	2023-03-28 09:49:11 +0100
commit	115dcc7054f5934a2c8e26fd8a8eed5f3e29e9ce (patch)
tree	c31afe35699960753f76770d6b0b4ea48af9f686 /dev-qt
parent	e292b671b113c2cc012beddad93a3df4f9410698 (diff)