13 files changed, 431 insertions, 124 deletions
diff --git a/dev-qt/Manifest.gz b/dev-qt/Manifest.gz
index b505db80b983..2538d4b35069 100644
--- a/dev-qt/Manifest.gz
+++ b/dev-qt/Manifest.gz
diff --git a/dev-qt/qtcore/Manifest b/dev-qt/qtcore/Manifest
index 9e2f8568f193..448f9a2d731b 100644
--- a/dev-qt/qtcore/Manifest
+++ b/dev-qt/qtcore/Manifest
@@ -1,5 +1,7 @@
 DIST qtbase-5.15-gentoo-patchset-4.tar.xz 4884 BLAKE2B ef1f11ea63084b834e19a9bd4c4a146e0d47f10e6c1f540a23db64ba6b0d42f46d63f54f93587deae9ac528f6824fa0e88177fe109a53aaee7d8328d49e364cd SHA512 1ae6630cef6bead9187aaaf7c420566b2c1f946bfa22cb983c52267c098e9b1c7b82c99204cbd3eed5eb6ebde0359726e260fd449618802735af465ca39f0a1d
 DIST qtbase-5.15.10-gentoo-kde-1.tar.xz 725208 BLAKE2B 14e82b0f26d0e0de47e9e3c4c54dd6649f983b9468c9f5790fb206a823a77ef22fc02546e39ff0ba68aa589ba811629bb4c4615223af9e8bec7c7b96ae13bef6 SHA512 efc93c451577f6389ffd58690ce2e1a2d2f3b85072cb8d542c5db0ddee2b60e80f2f937fb815a63db9973cc88ef35f8adc47a5ec98c2ec0b01ac5320ac635a5b
+DIST qtbase-5.15.10-gentoo-kde-2.tar.xz 740184 BLAKE2B 0b76c6515425b45de65993a54e6b72afc620300c711e75720fd1283b964aee564a780845f52c033794f6fdca9a13ca863e52a91f7eda5d436f9a668356af82b2 SHA512 474fd27c13cd1b58c688c063ca119769cda9a5de8c97ae04fba81cba9e176126ac71107c6536cf825617c27aadcaf53732d4181c772fbae3c04988f85490fd74
 DIST qtbase-everywhere-opensource-src-5.15.10.tar.xz 50422688 BLAKE2B 2a625296967bef17d491a3ec8fbb4a3beaf00180a2cda728e485f796c801241798bd85dd06d57ca9fef26c591fe9910a2fcb83a67bbc17640b7393d280b9ce53 SHA512 94ac739d76dd9fff54cde46e818fee6c6763f8b207b759108455febff84c9dfeb48ea7807451d7248cbfd8af24c2a1263c34dcbd2be055136e39325e32725eef
+EBUILD qtcore-5.15.10-r1.ebuild 2981 BLAKE2B f99598299bcfb6eb125ac0f652571dcb326070344d624d28eef509894f250f77c75d2170c6c3acd134606f7dd09c277837a196bf258b5fe8fbcc8bc146e6af59 SHA512 211270cc6f6e9773a79eed1d6b707c9c874394fa0b6410dd68bb7cd97c12c2bb7965687f183da00d7f38e3a4b8a2b4d75559f7a3000b2c564bb3fe2dbdc62f94
 EBUILD qtcore-5.15.10.ebuild 2975 BLAKE2B 436e6eaef560c409acb5c2c489ff7c8539020bd0b296c1f18c19769edf245d069f249c526490b6455710b2714d55bdff4bf4df4637c163816d5913741ce71a7f SHA512 0056e42266ec7107c8c3ab637c0fe6234d34ddea5c83ed58508b2c1847e94fdad4ad89a1278342323a6f5093afb53bf25dba4e706741cb53b3c975223f086d6a
 MISC metadata.xml 833 BLAKE2B 79b441c34e55017f23dd85cdb062ef4cbcfce05dff74936de887256ba8b9b596632b570b55b7014c38467829751771bb116f067cd6a246a11309f20b67fb55f0 SHA512 f1ffedc2ad17d198ba14a9a93e6c8dd35a7709e6f1e07dae606c16c05868f2f8e696f25fa5cf2602ed50f41eb5a914ff0d652b9ac37163e5130ddbfb475a1ff5
diff --git a/dev-qt/qtcore/qtcore-5.15.10-r1.ebuild b/dev-qt/qtcore/qtcore-5.15.10-r1.ebuild
new file mode 100644
index 000000000000..f42cc15498c0
--- /dev/null
+++ b/dev-qt/qtcore/qtcore-5.15.10-r1.ebuild
@@ -0,0 +1,120 @@
+# 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=2
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+fi
+
+QT5_MODULE="qtbase"
+inherit linux-info flag-o-matic qt5-build
+
+DESCRIPTION="Cross-platform application development framework"
+SLOT=5/${QT5_PV}
+
+IUSE="icu old-kernel systemd"
+
+DEPEND="
+	dev-libs/double-conversion:=
+	dev-libs/glib:2
+	dev-libs/libpcre2[pcre16,unicode]
+	sys-libs/zlib:=
+	icu? ( dev-libs/icu:= )
+	!icu? ( virtual/libiconv )
+	systemd? ( sys-apps/systemd:= )
+"
+RDEPEND="${DEPEND}"
+
+QT5_TARGET_SUBDIRS=(
+	src/tools/bootstrap
+	src/tools/moc
+	src/tools/rcc
+	src/corelib
+	src/tools/qlalr
+	doc
+)
+
+QT5_GENTOO_PRIVATE_CONFIG=(
+	!:network
+	!:sql
+	!:testlib
+	!:xml
+)
+
+pkg_pretend() {
+	use kernel_linux || return
+	get_running_version
+	if kernel_is -lt 4 11 && ! use old-kernel; then
+		ewarn "The running kernel is older than 4.11. USE=old-kernel is needed for"
+		ewarn "dev-qt/qtcore to function on this kernel properly. Bugs #669994, #672856"
+	fi
+}
+
+src_prepare() {
+	# don't add -O3 to CXXFLAGS, bug 549140
+	sed -i -e '/CONFIG\s*+=/s/optimize_full//' src/corelib/corelib.pro || die
+
+	# fix missing qt_version_tag symbol w/ LTO, bug 674382
+	sed -i -e 's/^gcc:ltcg/gcc/' src/corelib/global/global.pri || die
+
+	# Broken with FORTIFY_SOURCE=3
+	# Our toolchain sets F_S=2 by default w/ >= -O2, so we need
+	# to unset F_S first, then explicitly set 2, to negate any default
+	# and anything set by the user if they're choosing 3 (or if they've
+	# modified GCC to set 3).
+	#
+	# Refs:
+	# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=105078
+	# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=105709
+	# https://bugreports.qt.io/browse/QTBUG-103782
+	# bug #847145
+	if is-flagq '-O[23]' || is-flagq '-Ofast' ; then
+		# We can't unconditionally do this b/c we fortify needs
+		# some level of optimisation.
+		filter-flags -D_FORTIFY_SOURCE=3
+		# (Qt doesn't seem to respect CPPFLAGS?)
+		append-flags -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2
+	fi
+
+	qt5-build_src_prepare
+
+	# workaround for a79a370c (...0090-Annotate-QMutex-...patch) adding a header
+	qt5_syncqt_version
+}
+
+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 66354b7ef013..dcd2f03862d0 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.10-gentoo-kde-2.tar.xz 25376 BLAKE2B 90978286216648900b2d0654d0b5ef5c0c2e05d94bcadedbda58b03861b6ac0aea7bfe34c55c90bbdfe0f088e35a5ebbb3284523ffce04d1a0a93cdac5cc9312 SHA512 d34761a994977b8b3be43f71377441362c9075b970d83b7af9625a9c51dd588ea47637bb30fd50ff4d215ce97ed15f49607f958b5f18dd2281640c031dce01e8
 DIST qtdeclarative-5.15.10-gentoo-kde-3.tar.xz 26396 BLAKE2B 07ad0b115316e8eeaa1b9348cb6e742684b11d4d45087e763679938d43d77f90261a905037b07429d78933d7b7c487d3c1f7f1caedfdb5f6b512f4e20f55d946 SHA512 4d44ffaee5a3b1b01e5959f9c94a3daeda1528e4b7c0f267b11efac5a686c257b1f742ef38040a3ebad167faba0f61ffa2afc03d943770a9a9a005bd52ef99f6
 DIST qtdeclarative-everywhere-opensource-src-5.15.10.tar.xz 21596352 BLAKE2B 4259b55b1406694cf10d5ff1c4bc2501b47a7a7ea4a09eeb77c08fa1417d5f8d028df1a0753af0d1ef52d7aa1331343c56b6c72adf462a6d1a1d5097c288ad8f SHA512 378fc41a31edb52d85fd5e37fe6c086e35b5d5d759ceacc49cf7981a8a38d25ae5f2ca27d99547bd1db381f32128e7947800e2a01a857177707cc2a9980373a8
 DIST qtdeclarative-everywhere-src-6.5.2.tar.xz 35552840 BLAKE2B 048da9ab9433034ede21b51458cd3c7bd09d5364c8e2e65a02905bdc107d456ba0cbf2f9ea459324462c455fb33ef5f9b7bbbbe79e669100c82274476c10b34c SHA512 e6fd9dddbab72ee2e323d8ae0f4ac438b935477ad50b3e069a307993e94b289648d29ee265ac535e1396e4c1ba4bdf7e16b0cdf89a17df8d0a43bbe94f7316ef
-EBUILD qtdeclarative-5.15.10-r1.ebuild 1543 BLAKE2B 4f4d321275787c9e01f85022e3687f2ecd6d96ab6dbd848aa7255d72b9644822bf669ff63d3c98f942e07d36cc6aab65e337a298f0ca5abb0a659843960424a6 SHA512 819e891879cb938d9f7753246a174524ba0dd721314d7c199f086db604f0f5a508a570bffcea0a4f07c75cf814320292279fe64b2f765cc217e919901b70315b
 EBUILD qtdeclarative-5.15.10-r2.ebuild 1537 BLAKE2B ea417da488314eed547e9637796d153a358c8cec1645242338f6fa67605b45a886b9f91de62db4483f1a69b704ce852879948c097c66cdeb4f6e777a81c264f6 SHA512 a34ae5b04825f751715975dc927824b6ba4726564647e50d84f27bc1dc1d8c8a6dde27b02e568b01ee21f6a8476ac27d9db9b72fd3b3a4175be7043e89d7435c
 EBUILD qtdeclarative-6.5.2.ebuild 521 BLAKE2B f353152ff22805e1bf694df508c61f40bcf67b72e256bc4bc9cdc6f41dd7df855f6f28389ccfc6d4ad8254db4f7e27347b0413d7f946595452993111f1bd94fe SHA512 80299b3c62f099f5f71fdcfb17fba7f7a2b429747b29f24b67b4fd6be3ff53e74b4793e6b2fa3eb68524779c5a160a747c7ee1580bf3d2b738c0f17582728ea8
 MISC metadata.xml 744 BLAKE2B ef479ad28d7560fc3abd2e743e8994a6a843bc1a4d0644ac037a4fa481f71a6ee73fbf99073769d20fcb245e6432556bc00707d3ecec1fb709ae2622fc9c5e31 SHA512 27d3e595647800c62e1275f2b5bfae0f2644fce547175cd5f63c4907c2313298b988f5378761868d2761c3edf396cfcf4d0c733032026e7ea0a9bf7ba367ecda
diff --git a/dev-qt/qtdeclarative/qtdeclarative-5.15.10-r1.ebuild b/dev-qt/qtdeclarative/qtdeclarative-5.15.10-r1.ebuild
deleted file mode 100644
index 27750dcfd317..000000000000
--- a/dev-qt/qtdeclarative/qtdeclarative-5.15.10-r1.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 2009-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-if [[ ${PV} != *9999* ]]; then
-	QT5_KDEPATCHSET_REV=2
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
-fi
-
-PYTHON_COMPAT=( python3_{8..11} )
-inherit flag-o-matic python-any-r1 qt5-build
-
-DESCRIPTION="The QML and Quick modules for the Qt5 framework"
-
-IUSE="gles2-only +jit localstorage vulkan +widgets"
-
-# qtgui[gles2-only=] is needed because of bug 504322
-DEPEND="
-	=dev-qt/qtcore-${QT5_PV}*
-	=dev-qt/qtgui-${QT5_PV}*:5=[gles2-only=,vulkan=]
-	=dev-qt/qtnetwork-${QT5_PV}*
-	=dev-qt/qttest-${QT5_PV}*
-	media-libs/libglvnd
-	localstorage? ( =dev-qt/qtsql-${QT5_PV}* )
-	widgets? ( =dev-qt/qtwidgets-${QT5_PV}*[gles2-only=] )
-"
-RDEPEND="${DEPEND}"
-BDEPEND="${PYTHON_DEPS}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-5.14.2-QQuickItemView-fix-maxXY-extent.patch" # QTBUG-83890
-)
-
-src_prepare() {
-	qt_use_disable_mod localstorage sql \
-		src/imports/imports.pro
-
-	qt_use_disable_mod widgets widgets \
-		src/src.pro \
-		src/qmltest/qmltest.pro \
-		tests/auto/auto.pro \
-		tools/tools.pro \
-		tools/qmlscene/qmlscene.pro \
-		tools/qml/qml.pro
-
-	qt5-build_src_prepare
-}
-
-src_configure() {
-	replace-flags "-Os" "-O2" # bug 840861
-
-	local myqmakeargs=(
-		--
-		-qml-debug
-		$(qt_use jit feature-qml-jit)
-	)
-	qt5-build_src_configure
-}
-
-src_install() {
-	qt5-build_src_install
-	qt5_symlink_binary_to_path qml 5
-	qt5_symlink_binary_to_path qmleasing 5
-	qt5_symlink_binary_to_path qmlpreview 5
-	qt5_symlink_binary_to_path qmlscene 5
-}
diff --git a/dev-qt/qtgui/Manifest b/dev-qt/qtgui/Manifest
index a862ff803a7d..f50890e13ff7 100644
--- a/dev-qt/qtgui/Manifest
+++ b/dev-qt/qtgui/Manifest
@@ -1,5 +1,7 @@
 DIST qtbase-5.15-gentoo-patchset-4.tar.xz 4884 BLAKE2B ef1f11ea63084b834e19a9bd4c4a146e0d47f10e6c1f540a23db64ba6b0d42f46d63f54f93587deae9ac528f6824fa0e88177fe109a53aaee7d8328d49e364cd SHA512 1ae6630cef6bead9187aaaf7c420566b2c1f946bfa22cb983c52267c098e9b1c7b82c99204cbd3eed5eb6ebde0359726e260fd449618802735af465ca39f0a1d
 DIST qtbase-5.15.10-gentoo-kde-1.tar.xz 725208 BLAKE2B 14e82b0f26d0e0de47e9e3c4c54dd6649f983b9468c9f5790fb206a823a77ef22fc02546e39ff0ba68aa589ba811629bb4c4615223af9e8bec7c7b96ae13bef6 SHA512 efc93c451577f6389ffd58690ce2e1a2d2f3b85072cb8d542c5db0ddee2b60e80f2f937fb815a63db9973cc88ef35f8adc47a5ec98c2ec0b01ac5320ac635a5b
+DIST qtbase-5.15.10-gentoo-kde-2.tar.xz 740184 BLAKE2B 0b76c6515425b45de65993a54e6b72afc620300c711e75720fd1283b964aee564a780845f52c033794f6fdca9a13ca863e52a91f7eda5d436f9a668356af82b2 SHA512 474fd27c13cd1b58c688c063ca119769cda9a5de8c97ae04fba81cba9e176126ac71107c6536cf825617c27aadcaf53732d4181c772fbae3c04988f85490fd74
 DIST qtbase-everywhere-opensource-src-5.15.10.tar.xz 50422688 BLAKE2B 2a625296967bef17d491a3ec8fbb4a3beaf00180a2cda728e485f796c801241798bd85dd06d57ca9fef26c591fe9910a2fcb83a67bbc17640b7393d280b9ce53 SHA512 94ac739d76dd9fff54cde46e818fee6c6763f8b207b759108455febff84c9dfeb48ea7807451d7248cbfd8af24c2a1263c34dcbd2be055136e39325e32725eef
+EBUILD qtgui-5.15.10-r1.ebuild 3870 BLAKE2B 008f7d523d0d546e264d43bcc2c64b5bab65f9be88e538bff56e62ba35251baf210efb5896d06dea1605e9d2f35c6490ed2a7c7b2e080128c2dd82044ad773ea SHA512 fdc4b29dc6f037c4729e5d1cb050cb8797472a82b27dd248c4611b2f9e9c4bf01468535bb231bf47303212ee1c8dc37f4dd633d14f108c9032645498617630ab
 EBUILD qtgui-5.15.10.ebuild 3864 BLAKE2B f8a7f4a2ea9e992bbb61305f52c21a9ea835d7aca14bc970cfd65df21f348cede9b029e9b9cfcc452177a2a4bcf3a0330b2f7c3b249adf1fe910f6469a93148c SHA512 5b0e0e0371e2bbe33657b83f7503ff5b19511c98218a47c77fc040a4c8cf18773e32ce85c0b2d143581d64cae187bdbd56c7100c1fe4543fafe81ca29794f6ab
 MISC metadata.xml 1332 BLAKE2B 9e3b90622029fb3c2345b61a3d5d5c55c9e364f2872cdcbd74d34c2af41a692e8e6e03396799c0ce2ec74d3b0dc3e86e755502217f25a18d6e822389ec8481b7 SHA512 1eb4740fcbdceed313e24e019424d08239539eede918f41964ab092d85ec9f78665a40922f92467eceaf1ac7632c0b12c5368884f7128b8b119550c3c87b5e67
diff --git a/dev-qt/qtgui/qtgui-5.15.10-r1.ebuild b/dev-qt/qtgui/qtgui-5.15.10-r1.ebuild
new file mode 100644
index 000000000000..52d837fdb16d
--- /dev/null
+++ b/dev-qt/qtgui/qtgui-5.15.10-r1.ebuild
@@ -0,0 +1,178 @@
+# 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=2
+	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 )
+	X? ( x11-base/xorg-proto )
+"
+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/qtnetwork/Manifest b/dev-qt/qtnetwork/Manifest
index 7e22c3d6ae4a..245b8af5fcda 100644
--- a/dev-qt/qtnetwork/Manifest
+++ b/dev-qt/qtnetwork/Manifest
@@ -1,7 +1,9 @@
 AUX qtnetwork-5.15.10-ssl-upgr-default-DH-params.patch 4618 BLAKE2B 51ca56a407d055533e80c7639d385e959517a1983fddb0635e2441769c29d9b02ea9eb60ad18030185fde7e2babdfd18afb5a17d1a0365c0ff6c564519f44c0f SHA512 1e94f218a3d0e7580900712635a19d3162cadbbc77b62b91d1c195f0cd11ac90be0b90821fb9e48887e2ad3c1f4e49fee1ac33c291a587f595baaa8d72ea6b9d
 DIST qtbase-5.15-gentoo-patchset-4.tar.xz 4884 BLAKE2B ef1f11ea63084b834e19a9bd4c4a146e0d47f10e6c1f540a23db64ba6b0d42f46d63f54f93587deae9ac528f6824fa0e88177fe109a53aaee7d8328d49e364cd SHA512 1ae6630cef6bead9187aaaf7c420566b2c1f946bfa22cb983c52267c098e9b1c7b82c99204cbd3eed5eb6ebde0359726e260fd449618802735af465ca39f0a1d
 DIST qtbase-5.15.10-gentoo-kde-1.tar.xz 725208 BLAKE2B 14e82b0f26d0e0de47e9e3c4c54dd6649f983b9468c9f5790fb206a823a77ef22fc02546e39ff0ba68aa589ba811629bb4c4615223af9e8bec7c7b96ae13bef6 SHA512 efc93c451577f6389ffd58690ce2e1a2d2f3b85072cb8d542c5db0ddee2b60e80f2f937fb815a63db9973cc88ef35f8adc47a5ec98c2ec0b01ac5320ac635a5b
+DIST qtbase-5.15.10-gentoo-kde-2.tar.xz 740184 BLAKE2B 0b76c6515425b45de65993a54e6b72afc620300c711e75720fd1283b964aee564a780845f52c033794f6fdca9a13ca863e52a91f7eda5d436f9a668356af82b2 SHA512 474fd27c13cd1b58c688c063ca119769cda9a5de8c97ae04fba81cba9e176126ac71107c6536cf825617c27aadcaf53732d4181c772fbae3c04988f85490fd74
 DIST qtbase-everywhere-opensource-src-5.15.10.tar.xz 50422688 BLAKE2B 2a625296967bef17d491a3ec8fbb4a3beaf00180a2cda728e485f796c801241798bd85dd06d57ca9fef26c591fe9910a2fcb83a67bbc17640b7393d280b9ce53 SHA512 94ac739d76dd9fff54cde46e818fee6c6763f8b207b759108455febff84c9dfeb48ea7807451d7248cbfd8af24c2a1263c34dcbd2be055136e39325e32725eef
 EBUILD qtnetwork-5.15.10-r2.ebuild 1249 BLAKE2B 4f6f60347ffb721f0f1c5220d7533481d46f18a8d7259b24f95a33a159716e90debef1f55fc70f09ec6c72bd8d259982f14487c5a9c74cfbc294263348dba6c2 SHA512 7471abd2f2ad3e43ecc8c8ae3b19cbe73c1915fbe30629279e955b0047e3715c260bff7b052afee126d0084c7c20d1d0c04c00ede1406c5eaa54bd23bb939ba8
+EBUILD qtnetwork-5.15.10-r3.ebuild 1190 BLAKE2B c6f38e5a7d2a8e8c2a36c17c2f2599d27aabecbe42f77e668e432884b69950f2d5f210918f7e639eacdda0725198b88847c6976522ac6666487bcbc8c1d25c30 SHA512 1a17aaad8238bdd8f56d4062b8480a558b027331e74815253f10730267023e569f0e5da4912abb61386d771242a45d89baf7a2149743bd5465928c3cf9506ebd
 EBUILD qtnetwork-5.15.10.ebuild 1607 BLAKE2B 8c336a9117dd3289b8cc2c91fc6cce82cb9072612b65c5f5df79e402f1b765f20d9ada4e208f0143fe7e40c1f8c830837586104429244706135f02fa11facd63 SHA512 2f0f7f0bb1570e6e4501a29dd0fd6a96d1d44c2e01a354a78364f93a3cdcb7e47262f5f065fc629d3037306dfd8170fe552d677d894f1a507ff71aca47c41d4a
 MISC metadata.xml 690 BLAKE2B 3e1cccd88cb778d868aa5aa650d9114a79eaf7b5961dc6222b2da3e5c7536a43c7481b6d56bb9176b36ed2560ccb0712635146872f370fdc1e319286133a1651 SHA512 e402ad3b586e305a6f7ee99f24edd505b1e76f7a957108fc252a4a1af8978ac113b9b1c56e4fb0bfb696bcf29a1295f52af6614924f0e3ae2d7f71810a3be707
diff --git a/dev-qt/qtnetwork/qtnetwork-5.15.10-r3.ebuild b/dev-qt/qtnetwork/qtnetwork-5.15.10-r3.ebuild
new file mode 100644
index 000000000000..7234cac13297
--- /dev/null
+++ b/dev-qt/qtnetwork/qtnetwork-5.15.10-r3.ebuild
@@ -0,0 +1,62 @@
+# 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=2
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+fi
+
+QT5_MODULE="qtbase"
+inherit qt5-build
+
+DESCRIPTION="Network abstraction library for the Qt5 framework"
+
+IUSE="gssapi libproxy sctp +ssl"
+
+DEPEND="
+	=dev-qt/qtcore-${QT5_PV}*:5=
+	sys-libs/zlib:=
+	gssapi? ( virtual/krb5 )
+	libproxy? ( net-libs/libproxy )
+	sctp? ( kernel_linux? ( net-misc/lksctp-tools ) )
+	ssl? ( >=dev-libs/openssl-1.1.1:0= )
+"
+RDEPEND="${DEPEND}"
+
+QT5_TARGET_SUBDIRS=(
+	src/network
+	src/plugins/bearer/generic
+)
+
+QT5_GENTOO_CONFIG=(
+	libproxy:libproxy:
+	ssl::SSL
+	ssl::OPENSSL
+	ssl:openssl-linked:LINKED_OPENSSL
+)
+
+QT5_GENTOO_PRIVATE_CONFIG=(
+	:network
+)
+
+src_configure() {
+	local myconf=(
+		$(qt_use gssapi feature-gssapi)
+		$(qt_use libproxy)
+		$(qt_use sctp)
+		$(usev ssl -openssl-linked)
+	)
+	qt5-build_src_configure
+}
+
+src_install() {
+	qt5-build_src_install
+
+	# workaround for bug 652650
+	if use ssl; then
+		sed -e "/^#define QT_LINKED_OPENSSL/s/$/ true/" \
+			-i "${D}${QT5_HEADERDIR}"/Gentoo/${PN}-qconfig.h || die
+	fi
+}
diff --git a/dev-qt/qtwayland/Manifest b/dev-qt/qtwayland/Manifest
index cc5ec2a747d1..a40dd9f0e6ca 100644
--- a/dev-qt/qtwayland/Manifest
+++ b/dev-qt/qtwayland/Manifest
@@ -5,6 +5,5 @@ DIST qtwayland-5.15.10-gentoo-kde-1.tar.xz 42480 BLAKE2B 3902ecb713b8f35922b0d19
 DIST qtwayland-everywhere-opensource-src-5.15.10.tar.xz 568552 BLAKE2B c5cd4ed5ff78befb5bb49f9eb809562c418b2469aa0fa23728a1de46d57f42788bba3f87a54c8dda2ee0900c76b84213d1111fd86159dc5e6707f7b67ed386de SHA512 214b1fec7dfd815d148a7485f7811e623b06d172e58e4ee3167264a4e4b8f4aeec11474e574f91652a0bd3a48476a6747cad468f1e5035c49a55a96fc1400899
 DIST qtwayland-everywhere-src-6.5.2.tar.xz 1059356 BLAKE2B 4708b78ff5c8e413edaa4d4400317f58dd068273a5eef7caf1500abf8afbe4e9ac405b6854691ef93265a7eeb0cfb7406024826a0b7c7ba3f8149218af67fd48 SHA512 520d109402f1d629481029a3b1eaab740e66135db4069c34651172bb2ad821b22de60e9956a96331d2f32a4522fc52c6a4ba99b474092d755760cad08c776477
 EBUILD qtwayland-5.15.10-r1.ebuild 1414 BLAKE2B 90162d26eccdf63926cfd4bfce884e4cf43a10c8e3464e3f2d89bf50f831e77269508a7e33205a28337c230d2f9db611d587b9d2e88c0d49e954ad8eb814a965 SHA512 ef9ff3968554384e4f5d4a8ec92dd8efa0ff1464007fa308d2b34b8a3987e70383b56acf3e4cba659727045abf0fb8bfe1461b6dec4f15a1b53b592c25c2bedf
-EBUILD qtwayland-5.15.10.ebuild 1257 BLAKE2B e1d7fc2d838ac7f95fa4132967f05cb11dad6f10cf80e947a5bebaf762b225ad415e4378409910899b8948ccf17bf582eed025407e4d7b18e68e8c8a2c53a17d SHA512 867d80826da07db5bafc98136616b8217dfb26eeea9ed76cdaf641022819da2d6ebd4f8331dfd44f4b74ebf80a956e77b0c382d23ab6c499d5d04964f9f66ae7
 EBUILD qtwayland-6.5.2.ebuild 442 BLAKE2B 844f06e4063c17dd8b3e0a8835aeda220a0ade9d07213a42abbc38d37b3e1b6fa71423e07e2ef66d0628a9bb4afa9656c68dd9d7fb73b3e3a597e6d573f84587 SHA512 9f6235b34e56466eea51dd3513f53d0387d4a068a9f429ecb84f90f32f257967e2940e6d48a6029c6a2118915fd5592d14e73a6ef5aeac8e4429a6b2fc4ef8bf
 MISC metadata.xml 584 BLAKE2B ad42909b120209835e121a29de558d338bae4348eb55e69a94e8ac8b54f26564df0a750839bef9418ae8056a0d24f234615247a610b8287f5b0fbffbc60193f2 SHA512 86fd81d63b19fc6e95bdcb92e9da9b03861248a4e78e9de36aca6996e61644ab8bce7a60ca22ee7ad86fefc9b407a1fd0136240b8fdfa3c40a149444ab1dcbe2
diff --git a/dev-qt/qtwayland/qtwayland-5.15.10.ebuild b/dev-qt/qtwayland/qtwayland-5.15.10.ebuild
deleted file mode 100644
index 94ba7b8fe442..000000000000
--- a/dev-qt/qtwayland/qtwayland-5.15.10.ebuild
+++ /dev/null
@@ -1,54 +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"
-
-PATCHES=(
-	# QTBUG-97037, pending upstream:
-	# https://invent.kde.org/qt/qt/qtwayland/-/merge_requests/71
-	"${FILESDIR}/${PN}-5.15.9-fix-mouse-stuck-in-pressed-state-after-DnD.patch"
-	"${FILESDIR}/${P}-send-release-button-event-on-pointer-leave.patch"
-)
-
-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/qtwidgets/Manifest b/dev-qt/qtwidgets/Manifest
index 08bd36df306f..552fc94d2d8d 100644
--- a/dev-qt/qtwidgets/Manifest
+++ b/dev-qt/qtwidgets/Manifest
@@ -1,5 +1,7 @@
 DIST qtbase-5.15-gentoo-patchset-4.tar.xz 4884 BLAKE2B ef1f11ea63084b834e19a9bd4c4a146e0d47f10e6c1f540a23db64ba6b0d42f46d63f54f93587deae9ac528f6824fa0e88177fe109a53aaee7d8328d49e364cd SHA512 1ae6630cef6bead9187aaaf7c420566b2c1f946bfa22cb983c52267c098e9b1c7b82c99204cbd3eed5eb6ebde0359726e260fd449618802735af465ca39f0a1d
 DIST qtbase-5.15.10-gentoo-kde-1.tar.xz 725208 BLAKE2B 14e82b0f26d0e0de47e9e3c4c54dd6649f983b9468c9f5790fb206a823a77ef22fc02546e39ff0ba68aa589ba811629bb4c4615223af9e8bec7c7b96ae13bef6 SHA512 efc93c451577f6389ffd58690ce2e1a2d2f3b85072cb8d542c5db0ddee2b60e80f2f937fb815a63db9973cc88ef35f8adc47a5ec98c2ec0b01ac5320ac635a5b
+DIST qtbase-5.15.10-gentoo-kde-2.tar.xz 740184 BLAKE2B 0b76c6515425b45de65993a54e6b72afc620300c711e75720fd1283b964aee564a780845f52c033794f6fdca9a13ca863e52a91f7eda5d436f9a668356af82b2 SHA512 474fd27c13cd1b58c688c063ca119769cda9a5de8c97ae04fba81cba9e176126ac71107c6536cf825617c27aadcaf53732d4181c772fbae3c04988f85490fd74
 DIST qtbase-everywhere-opensource-src-5.15.10.tar.xz 50422688 BLAKE2B 2a625296967bef17d491a3ec8fbb4a3beaf00180a2cda728e485f796c801241798bd85dd06d57ca9fef26c591fe9910a2fcb83a67bbc17640b7393d280b9ce53 SHA512 94ac739d76dd9fff54cde46e818fee6c6763f8b207b759108455febff84c9dfeb48ea7807451d7248cbfd8af24c2a1263c34dcbd2be055136e39325e32725eef
 EBUILD qtwidgets-5.15.10-r1.ebuild 1203 BLAKE2B 73b92b4362a209529c2d8f03a68ce6b192937a3e278f61501c969c396781ce9a80576c03500f9f3f21b126183ddb991aa869d954ad2a14cc24d55fd042cbe5c1 SHA512 19a22957b9cb230a8b5d64a55bf1473a5a4750583a8f0c6aa8e6d344d42c2c0d824dd08dd5122a1813db60c21bd8ce62725717895974065e902d04e902d7d7d3
+EBUILD qtwidgets-5.15.10-r2.ebuild 1209 BLAKE2B c2381036698bc5ccf1f3f90464abba8408c189f56d4652d2c2533c02d46a9986b64bec89e3e3eb9419ac11cb32a38983d0bb27b2a9e23a4808926b9fe102e2e8 SHA512 2636e56d6fa1d92b636dd5f48231f66cae42ac9a6a22a8f87a041de5f4112dcb9bf75a7569eead07c86870c7687557cb85c00388f8eb70aa591ec54169dc3d16
 MISC metadata.xml 559 BLAKE2B 3ea80a5e419db32987d68d7e5033fa75fa0ff22b31b0842fd7ead902172cbe83650b0bbdf8657a57e428726e7cdf114d9011bd16066c080bc5f6ecb3f691d42c SHA512 51172365a186fbca09651bfd751284960dda4036390af2afab9812a7ae3fabdd9d60a336dee3cfc5e3d133a0216bf77e29660b9cdee2f0bcd2ce43c27297bdb1
diff --git a/dev-qt/qtwidgets/qtwidgets-5.15.10-r2.ebuild b/dev-qt/qtwidgets/qtwidgets-5.15.10-r2.ebuild
new file mode 100644
index 000000000000..1614b0a4eda4
--- /dev/null
+++ b/dev-qt/qtwidgets/qtwidgets-5.15.10-r2.ebuild
@@ -0,0 +1,63 @@
+# 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=2
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+fi
+
+QT5_MODULE="qtbase"
+inherit qt5-build
+
+DESCRIPTION="Set of components for creating classic desktop-style UIs for the Qt5 framework"
+
+# keep IUSE defaults in sync with qtgui
+IUSE="dbus gles2-only gtk +png +X"
+REQUIRED_USE="gtk? ( dbus )"
+
+DEPEND="
+	=dev-qt/qtcore-${QT5_PV}*:5=
+	=dev-qt/qtgui-${QT5_PV}*:5=[gles2-only=,png=,X?]
+	dbus? ( =dev-qt/qtdbus-${QT5_PV}* )
+	gtk? (
+		dev-libs/glib:2
+		=dev-qt/qtgui-${QT5_PV}*:5=[dbus]
+		x11-libs/gtk+:3[X]
+		x11-libs/libX11
+		x11-libs/pango
+	)
+"
+RDEPEND="${DEPEND}"
+
+QT5_TARGET_SUBDIRS=(
+	src/tools/uic
+	src/widgets
+	src/plugins/platformthemes
+)
+
+QT5_GENTOO_CONFIG=(
+	dbus:xdgdesktopportal:
+	gtk:gtk3:
+	::widgets
+	!:no-widgets:
+)
+
+QT5_GENTOO_PRIVATE_CONFIG=(
+	:widgets
+)
+
+src_configure() {
+	local myconf=(
+		-opengl $(usex gles2-only es2 desktop)
+		$(usev dbus -dbus-linked)
+		$(qt_use gtk)
+		-gui
+		$(qt_use png libpng system)
+		-widgets
+		$(qt_use X xcb)
+		$(usev X '-xcb-xlib -xkbcommon')
+	)
+	qt5-build_src_configure
+}