gentoo auto-resync : 16:08:2023 - 21:30:25

18 files changed, 10 insertions, 645 deletions

diff --git a/dev-qt/Manifest.gz b/dev-qt/Manifest.gz
index ac4de572e2c3..85baf879730c 100644
--- a/dev-qt/Manifest.gz
+++ b/dev-qt/Manifest.gz
diff --git a/dev-qt/qtcore/Manifest b/dev-qt/qtcore/Manifest
index c165f3df81ff..ddf257cb7f68 100644
--- a/dev-qt/qtcore/Manifest
+++ b/dev-qt/qtcore/Manifest
@@ -1,7 +1,5 @@
 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 2985 BLAKE2B 31040eed77cc4905f2c6e63ad9dbbb978128d2fee20759792926c0cc4501cb232ea082fd3795455607ad9019db619b7af44b6cc5bfdc53d8af601cb25cdcb583 SHA512 c63d89773251a6a490ce32817cd2d8ab02a7d0f226c41938ae46751ec685d930a748ed6d16774388c9e341a60abd83ccf80d63b5bea19b42b394cf60306b764f
-EBUILD qtcore-5.15.10.ebuild 2891 BLAKE2B 0031f98f7c3e6ce30d21cef70a94e47d83f4cb800482d999dafe71daab1a867a09a3bca23bc324037e92e2312136351cde16c92a5d0592b8ddfca944ef15d41b SHA512 79f67f2eefcf504d70fa13a05d867945de57d84487d1b27457eaf80b07bf02744e271ef55c223b899a844f4d173994cd057b3985e97bc48228c7c8c65dca9e81
+EBUILD qtcore-5.15.10-r1.ebuild 2981 BLAKE2B a8d5c6c309aac1fe6423e11944ebc16c14cc77d91ff5fb26e89fadd0bbc628b14162fb19766a0812c737e88c11a715187de4483edec3ab0a66c59d35b86f47a1 SHA512 e5344f59af2fa9c8c985893dc65d83718590ea55d8b16867d39f8b8bfe3428a67d8d472ffdc41c9fb524d0cd6294ce793f13655be5a44437fbc7e44d433104e9
 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
index 8f91c644b257..b1e429badcfd 100644
--- a/dev-qt/qtcore/qtcore-5.15.10-r1.ebuild
+++ b/dev-qt/qtcore/qtcore-5.15.10-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 if [[ ${PV} != *9999* ]]; then
 	QT5_KDEPATCHSET_REV=2
-	KEYWORDS="~amd64 arm arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86"
 fi
 
 QT5_MODULE="qtbase"
diff --git a/dev-qt/qtcore/qtcore-5.15.10.ebuild b/dev-qt/qtcore/qtcore-5.15.10.ebuild
deleted file mode 100644
index 606b3ffff929..000000000000
--- a/dev-qt/qtcore/qtcore-5.15.10.ebuild
+++ /dev/null
@@ -1,119 +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
-
-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 tc-enables-fortify-source ; then
-		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/qtgui/Manifest b/dev-qt/qtgui/Manifest
index e493cf9afbcd..d09721a9026a 100644
--- a/dev-qt/qtgui/Manifest
+++ b/dev-qt/qtgui/Manifest
@@ -1,7 +1,5 @@
 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 3868 BLAKE2B 4185ff527ed0d247af117611c5882d22b2d51e5c7858dfa5ca2eace9d9c8b3c669ec558fcd55310c4a96ae9708c74ab3415779bdb9bbad7e5f58925c0eb32cca SHA512 b23c8d5c5d4e9b4b8f7304eb023c30471e5aab7d6c7e752417803b3f7a0652fd5650bba12fd7fc85e303c0ab5972b93261206c397c1454961d5addfda59392f1
-EBUILD qtgui-5.15.10.ebuild 3864 BLAKE2B f8a7f4a2ea9e992bbb61305f52c21a9ea835d7aca14bc970cfd65df21f348cede9b029e9b9cfcc452177a2a4bcf3a0330b2f7c3b249adf1fe910f6469a93148c SHA512 5b0e0e0371e2bbe33657b83f7503ff5b19511c98218a47c77fc040a4c8cf18773e32ce85c0b2d143581d64cae187bdbd56c7100c1fe4543fafe81ca29794f6ab
+EBUILD qtgui-5.15.10-r1.ebuild 3864 BLAKE2B 757feeaf342c568ee6877d17ae10b28e3ad1d76231d2b2a80650c6d72b95cfc0496a9e8d2da62d72320ef896e70d934bffbf7669c0e5b3b2e3f97305bef1de6e SHA512 82cf10d5b9943c8aac5a0c41a484eb83def360f0999d659d38470cc5d0b205c459638c8575c3fe153fbc2056bb41d12dca95471300ee605767a8c55cca7b3ee5
 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
index c4d1b2a4a5bc..822d34e5032b 100644
--- a/dev-qt/qtgui/qtgui-5.15.10-r1.ebuild
+++ b/dev-qt/qtgui/qtgui-5.15.10-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 if [[ ${PV} != *9999* ]]; then
 	QT5_KDEPATCHSET_REV=2
-	KEYWORDS="~amd64 arm arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86"
 fi
 
 QT5_MODULE="qtbase"
diff --git a/dev-qt/qtgui/qtgui-5.15.10.ebuild b/dev-qt/qtgui/qtgui-5.15.10.ebuild
deleted file mode 100644
index ab60b1cc6d3d..000000000000
--- a/dev-qt/qtgui/qtgui-5.15.10.ebuild
+++ /dev/null
@@ -1,178 +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
-
-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 2d92c1553e43..df428f03ee03 100644
--- a/dev-qt/qtnetwork/Manifest
+++ b/dev-qt/qtnetwork/Manifest
@@ -1,9 +1,7 @@
-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 1188 BLAKE2B 1f2041c719dfc4cea369a0d563d2eb835c6767c25c7d2c8d2fe670502cde747d8a61cf31a60b494bed840c625f06d62544773e889ba29d712d83d47aebbbb1b8 SHA512 12e9646d81dcd816d6a62f1e6ff0ca9abe9cdc3d18542be1f7e1afb489cecdf8659a651ba053a52fed949a8656ecfd788e5bb0ec57f301b1169262b06bda9310
+EBUILD qtnetwork-5.15.10-r3.ebuild 1184 BLAKE2B d48b6815cb9bd130bd5aee83bbad57475b855feb99bc8a9381873815c24d1bdbf68dfb4ad92a1caa33c2f2b960906fd6f5e720507a8591ad00edf7bc745ce988 SHA512 57df9d3ad6dc76250d0732d7f63d12ac6e962aea47452a5a07d7a54877e3ba3bbe0ebf60dfb1c58bc6f3f0cf756289287b91cbae769d2cba941e79ae958d9e98
 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/files/qtnetwork-5.15.10-ssl-upgr-default-DH-params.patch b/dev-qt/qtnetwork/files/qtnetwork-5.15.10-ssl-upgr-default-DH-params.patch
deleted file mode 100644
index 94f1325070d5..000000000000
--- a/dev-qt/qtnetwork/files/qtnetwork-5.15.10-ssl-upgr-default-DH-params.patch
+++ /dev/null
@@ -1,101 +0,0 @@
-From 05406c3f5f516d3148254c8294e8883c28a2c95a Mon Sep 17 00:00:00 2001
-From: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
-Date: Wed, 21 Jun 2023 13:30:35 +0200
-Subject: [PATCH] SSL: upgrade the default DH parameters
-
-We have been using as default DH parameters the 1024-bit MODP group.
-This is now considered insecure, and applications should use the
-2048-bit at a minimum [1]. This commit therefore replaces the parameters
-with the 2048-bit MODP group from [2].
-
-To double check the data, use openssl asn1parse to verify that the prime
-matches. For instance:
-
-1) put the encoded string in a `encoded.txt` file (c&p from the source,
-   removing the double quotes)
-2) put the hexadecimal value of the 2048-bit group in a `reference.txt`
-   file (c&p from [2])
-3) compare the output of openssl asn1parse with the reference. For
-   instance like this:
-
-    $ diff <(openssl asn1parse < encoded.txt | grep -m 1 INTEGER | perl -pe 's/.*://; s/\n//') <(perl -0777 -pe 's/\s//g' reference.txt) && echo OK
-    OK
-
-[1] https://datatracker.ietf.org/doc/html/rfc8247#section-2.4
-[2] https://datatracker.ietf.org/doc/html/rfc3526#section-3
-
-[ChangeLog][QtNetwork][QSslDiffieHellmanParameters] The default
-Diffie-Hellman parameters are now using the 2048-bit MODP group from
-RFC 3526.
-
-Pick-to: 6.6 6.5 6.2 5.15
-Change-Id: I47133cd78ba0e954b8f93a3da09fa2c760c9f7a8
-Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
-(cherry picked from commit 3ec24e329c9ef6802786a37f30ddd8982e903480)
----
- src/network/ssl/qsslconfiguration.cpp           | 12 ++++++++++--
- src/network/ssl/qssldiffiehellmanparameters.cpp | 13 +++++++------
- 2 files changed, 17 insertions(+), 8 deletions(-)
-
-diff --git a/src/network/ssl/qsslconfiguration.cpp b/src/network/ssl/qsslconfiguration.cpp
-index f5ce02807f..84a9187334 100644
---- a/src/network/ssl/qsslconfiguration.cpp
-+++ b/src/network/ssl/qsslconfiguration.cpp
-@@ -929,7 +929,11 @@ void QSslConfiguration::setPreSharedKeyIdentityHint(const QByteArray &hint)
-     Retrieves the current set of Diffie-Hellman parameters.
- 
-     If no Diffie-Hellman parameters have been set, the QSslConfiguration object
--    defaults to using the 1024-bit MODP group from RFC 2409.
-+    defaults to using the 2048-bit MODP group from RFC 3526.
-+
-+    \note The default parameters may change in future Qt versions.
-+    Please check the documentation of the \e{exact Qt version} that you
-+    are using in order to know what defaults that version uses.
-  */
- QSslDiffieHellmanParameters QSslConfiguration::diffieHellmanParameters() const
- {
-@@ -943,7 +947,11 @@ QSslDiffieHellmanParameters QSslConfiguration::diffieHellmanParameters() const
-     a server to \a dhparams.
- 
-     If no Diffie-Hellman parameters have been set, the QSslConfiguration object
--    defaults to using the 1024-bit MODP group from RFC 2409.
-+    defaults to using the 2048-bit MODP group from RFC 3526.
-+
-+    \note The default parameters may change in future Qt versions.
-+    Please check the documentation of the \e{exact Qt version} that you
-+    are using in order to know what defaults that version uses.
-  */
- void QSslConfiguration::setDiffieHellmanParameters(const QSslDiffieHellmanParameters &dhparams)
- {
-diff --git a/src/network/ssl/qssldiffiehellmanparameters.cpp b/src/network/ssl/qssldiffiehellmanparameters.cpp
-index 7807afaa30..7c2505a0be 100644
---- a/src/network/ssl/qssldiffiehellmanparameters.cpp
-+++ b/src/network/ssl/qssldiffiehellmanparameters.cpp
-@@ -68,17 +68,18 @@
- 
- QT_BEGIN_NAMESPACE
- 
--// The 1024-bit MODP group from RFC 2459 (Second Oakley Group)
-+// The 2048-bit MODP group from RFC 3526
- Q_AUTOTEST_EXPORT const char *qssl_dhparams_default_base64 =
--    "MIGHAoGBAP//////////yQ/aoiFowjTExmKLgNwc0SkCTgiKZ8x0Agu+pjsTmyJR"
--    "Sgh5jjQE3e+VGbPNOkMbMCsKbfJfFDdP4TVtbVHCReSFtXZiXn7G9ExC6aY37WsL"
--    "/1y29Aa37e44a/taiZ+lrp8kEXxLH+ZJKGZR7OZTgf//////////AgEC";
-+    "MIIBCAKCAQEA///////////JD9qiIWjCNMTGYouA3BzRKQJOCIpnzHQCC76mOxObIlFKCHmO"
-+    "NATd75UZs806QxswKwpt8l8UN0/hNW1tUcJF5IW1dmJefsb0TELppjftawv/XLb0Brft7jhr"
-+    "+1qJn6WunyQRfEsf5kkoZlHs5Fs9wgB8uKFjvwWY2kg2HFXTmmkWP6j9JM9fg2VdI9yjrZYc"
-+    "YvNWIIVSu57VKQdwlpZtZww1Tkq8mATxdGwIyhghfDKQXkYuNs474553LBgOhgObJ4Oi7Aei"
-+    "j7XFXfBvTFLJ3ivL9pVYFxg5lUl86pVq5RXSJhiY+gUQFXKOWoqsqmj//////////wIBAg==";
- 
- /*!
-     Returns the default QSslDiffieHellmanParameters used by QSslSocket.
- 
--    This is currently the 1024-bit MODP group from RFC 2459, also
--    known as the Second Oakley Group.
-+    This is currently the 2048-bit MODP group from RFC 3526.
- */
- QSslDiffieHellmanParameters QSslDiffieHellmanParameters::defaultParameters()
- {
--- 
-2.41.0
-
diff --git a/dev-qt/qtnetwork/qtnetwork-5.15.10-r2.ebuild b/dev-qt/qtnetwork/qtnetwork-5.15.10-r2.ebuild
deleted file mode 100644
index af527a8bcd60..000000000000
--- a/dev-qt/qtnetwork/qtnetwork-5.15.10-r2.ebuild
+++ /dev/null
@@ -1,64 +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
-
-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
-)
-
-PATCHES=( "${FILESDIR}/${P}-ssl-upgr-default-DH-params.patch" )
-
-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/qtnetwork/qtnetwork-5.15.10-r3.ebuild b/dev-qt/qtnetwork/qtnetwork-5.15.10-r3.ebuild
index 761559b940c5..6754d7382fb3 100644
--- a/dev-qt/qtnetwork/qtnetwork-5.15.10-r3.ebuild
+++ b/dev-qt/qtnetwork/qtnetwork-5.15.10-r3.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 if [[ ${PV} != *9999* ]]; then
 	QT5_KDEPATCHSET_REV=2
-	KEYWORDS="~amd64 arm arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86"
 fi
 
 QT5_MODULE="qtbase"
diff --git a/dev-qt/qtwayland/Manifest b/dev-qt/qtwayland/Manifest
index 4319735bc70e..5f6cb6833862 100644
--- a/dev-qt/qtwayland/Manifest
+++ b/dev-qt/qtwayland/Manifest
@@ -1,11 +1,8 @@
-AUX qtwayland-5.15.10-Destroy-frame-queue-before-display.patch 1607 BLAKE2B 4a408f62d1b330b9f3c404d17b7771c24015bdba3dd02386446652d30e6038db6e0b77aeeaeb32537a0afe10b2e7a2a2a69a9a8e7efe3b1ff03c72eb6fd85427 SHA512 39bbdf0b9e501e8b101af5f29783eb4432e7dcad97362efce1b97b95bd70334bbc5e4fb707a4fe350a4e04d8dbb520faba77a283eaf8ccf331af40c8f65ba7e9
 AUX qtwayland-5.15.10-QTBUG-95434-convert-cursor-bitmap.patch 2406 BLAKE2B 523c1a932b46c0dccef224a4ecb11e147e32bc6655373d09fa7c3f7d0ca76fbb69284ce764462d8c4261d13acdf6ef65e5a05fac6cf75c23e264ed66ac42d9e1 SHA512 18366b5ede089581a2c1b1a87dd4d5ce3eb5a29606cb36cd9eefe7a4ee2861dfe87fcb75c44d6237b35e87a3c8106f6e78a34244230e0e20f9a808509daa6e86
 AUX qtwayland-5.15.9-fix-mouse-stuck-in-pressed-state-after-DnD.patch 1451 BLAKE2B 63b053f96f4added309a96d33caea1f361087511cb82249864b4a9971794739903e4df1c240c0a42f71295bb0b4f0f48338e6fcadfe9549372d2b581cb2464b6 SHA512 9be539b99cba04e3009a4a61eb5890708f8cafb09161e2d11868bb3a687591d6d4758a13c469ca22b89380cf1a1950d844c25212ead7b64f45ac275db464a051
-DIST qtwayland-5.15.10-gentoo-kde-1.tar.xz 42480 BLAKE2B 3902ecb713b8f35922b0d19bef0b2ec340ca52feb4b61de629dfa6b344d7f550de3e509e265f4476eb907f78b55d5c50c21d9dfeeb7e2e8f680a43fffc911ed4 SHA512 6a131ca2db008a2d224ee6733f47d05a455a8487d38b45cf63882e98e2c29d8163ac5d2f2c2e043f03103bada6e212b5d33cbf11677f8ca2b86fdbf02fc2b239
 DIST qtwayland-5.15.10-gentoo-kde-2.tar.xz 43076 BLAKE2B 735ac875c0957de47f90d08931eaaaf8d53b1db0012c7d0a592c78ae78da56ffc8a1ba9bbac0577a78d4c05a92a22acef51a6afc95db54bea2d1a2a9658b67c4 SHA512 e0131bb1f2a09597a85d1d8a402bcb1d529cbc44f62e9be8dd8eba9c10007ca4f83572ca48052529b2325cdd8d886abed1f96ba4e00768e4b1c2febe1eb5ef91
 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-r3.ebuild 1345 BLAKE2B 16a6cfcd0d43cce18ceeb1b8dfb161e553136dc38712bcd94068dad50acb7ad2f5e2f710e0f0b39f5a44e47df67bf854d8cae26f41442e4f68d80fa0ed0ffbfb SHA512 5b3f5fc391892466f324bc16d1a617abc4b8e60ff26fe0b4316f72a61b747541953944b9e1fc5193b7693148bf55d73a132d893b3ce21828e3e3c6fddaa6a171
-EBUILD qtwayland-5.15.10-r4.ebuild 1357 BLAKE2B bed6276bda779f0155f9f01879ab26357de44410b8c276f40100750c106eaa77d417ab6af3f8a7fc17df644d6e4c9f3c87cd9ecadc9c3ad44586919ad20ef4f9 SHA512 77845fe0b2f430016314e90309d5e3cfd1c3f1469152146f31b632b47c1a366e4cc7caa2dd193ff01668505a0083765db4b7db78fb428e1f367f3211fc2faf2a
+EBUILD qtwayland-5.15.10-r4.ebuild 1353 BLAKE2B 3cab556185c182f4cd8ed280737e1434c51ec1c52719688a2ca5372d81baa5edca8675b22a7c0f9601f7dacec65f54e7e361fd851a2f226dcefaac38180bd9b5 SHA512 0ac3e896cc8c6c717e44dc3119b1c5cf3cc4cc6d22538f837699528c61e29e11a3969538b0518d21c7d7b1362ac81910e9508197076481a51b4bece379f7dca2
 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/files/qtwayland-5.15.10-Destroy-frame-queue-before-display.patch b/dev-qt/qtwayland/files/qtwayland-5.15.10-Destroy-frame-queue-before-display.patch
deleted file mode 100644
index 1fdf08dc7487..000000000000
--- a/dev-qt/qtwayland/files/qtwayland-5.15.10-Destroy-frame-queue-before-display.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-https://bugs.gentoo.org/910315
-https://invent.kde.org/qt/qt/qtwayland/-/merge_requests/73
-
-Reported downstream in Gentoo at https://bugs.gentoo.org/910315.
-
-`kde/5.15` has b981fc82eb37700353949c72d3fd6d0887c8c107 ('[PATCH 27/51] Reduce memory leakage')
-backported but this introduces a use-after-free because `wl_event_queue_destroy` must be called
-before `wl_display_disconnect`. So, just backport the upstream fix which sorts out the order.
-
-Upstream review: https://codereview.qt-project.org/c/qt/qtwayland/+/471416
-Upstream review (6.x): https://codereview.qt-project.org/c/qt/qtwayland/+/471528
-
-From 3a8613b91d2239aebc73b43562f929aa71af0de5 Mon Sep 17 00:00:00 2001
-From: David Redondo <qt@david-redondo.de>
-Date: Tue, 11 Apr 2023 14:27:27 +0200
-Subject: [PATCH] Destroy frame queue before display
-
-wl_event_queue_destroy accesses the display.
-Found by running a test under valgrind.
-
-Pick-to: 6.5
-Change-Id: Ic89cbd3b6e98b4fc9561b0e63b5fab4886a1ec50
-Reviewed-by: David Edmundson <davidedmundson@kde.org>
-(cherry picked from commit a76bf824fcd1cc3789f0d3454a0423c0241d9718)
---- a/src/client/qwaylanddisplay.cpp
-+++ b/src/client/qwaylanddisplay.cpp
-@@ -379,11 +379,12 @@ QWaylandDisplay::~QWaylandDisplay(void)
- #if QT_CONFIG(cursor)
-     qDeleteAll(mCursorThemes);
- #endif
--    if (mDisplay)
--        wl_display_disconnect(mDisplay);
- 
-     if (m_frameEventQueue)
-         wl_event_queue_destroy(m_frameEventQueue);
-+
-+    if (mDisplay)
-+        wl_display_disconnect(mDisplay);
- }
- 
- // Steps which is called just after constructor. This separates registry_global() out of the constructor
--- 
-2.41.0
diff --git a/dev-qt/qtwayland/qtwayland-5.15.10-r3.ebuild b/dev-qt/qtwayland/qtwayland-5.15.10-r3.ebuild
deleted file mode 100644
index cab77b1950fc..000000000000
--- a/dev-qt/qtwayland/qtwayland-5.15.10-r3.ebuild
+++ /dev/null
@@ -1,56 +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"
-	# bug #910315, pending upstream:
-	# https://invent.kde.org/qt/qt/qtwayland/-/merge_requests/73
-	"${FILESDIR}/${P}-Destroy-frame-queue-before-display.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/qtwayland/qtwayland-5.15.10-r4.ebuild b/dev-qt/qtwayland/qtwayland-5.15.10-r4.ebuild
index 42e95c1c6c20..88b6d7321d3a 100644
--- a/dev-qt/qtwayland/qtwayland-5.15.10-r4.ebuild
+++ b/dev-qt/qtwayland/qtwayland-5.15.10-r4.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 if [[ ${PV} != *9999* ]]; then
 	QT5_KDEPATCHSET_REV=2
-	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/qtwidgets/Manifest b/dev-qt/qtwidgets/Manifest
index 04d5c7de5132..f37f47145956 100644
--- a/dev-qt/qtwidgets/Manifest
+++ b/dev-qt/qtwidgets/Manifest
@@ -1,7 +1,5 @@
 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 1207 BLAKE2B a1a576f84086b51ebe10887181e0e6f89ad1c67136c0d314a16d1650d8cf1eeb7132dcc3b5d7c5ce61328fdf9e290e4c26990f3e0bc7a47ea40c3648d1c8b32d SHA512 e87c94807e29a099460d03bd5b87c8a9bbc414746d5738a37ed62365be9a1951b7f1f3ee08dbf028213300f34fb72f422d40b0ba0f3b01c83e433b8ea23bbdc1
+EBUILD qtwidgets-5.15.10-r2.ebuild 1203 BLAKE2B 5421b122e1c557089e2f461efe1aed2e3746f3d33439c836bb2c4d9bdba69a9cc97aa28e3f999dad39a94efbb7ef857c728193f8bc340a542f28e40a01d3fade SHA512 4e1017dee29b6597d9e9d3f3ab4601c6e01e7c8f66f0bbb88233a16843c97cfe8544c767a84a01fccb5c287145e5e427bc75b9afb58c7422ef2bdf92ef62d3ee
 MISC metadata.xml 559 BLAKE2B 3ea80a5e419db32987d68d7e5033fa75fa0ff22b31b0842fd7ead902172cbe83650b0bbdf8657a57e428726e7cdf114d9011bd16066c080bc5f6ecb3f691d42c SHA512 51172365a186fbca09651bfd751284960dda4036390af2afab9812a7ae3fabdd9d60a336dee3cfc5e3d133a0216bf77e29660b9cdee2f0bcd2ce43c27297bdb1
diff --git a/dev-qt/qtwidgets/qtwidgets-5.15.10-r1.ebuild b/dev-qt/qtwidgets/qtwidgets-5.15.10-r1.ebuild
deleted file mode 100644
index 37e22466f060..000000000000
--- a/dev-qt/qtwidgets/qtwidgets-5.15.10-r1.ebuild
+++ /dev/null
@@ -1,63 +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
-
-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
-}
diff --git a/dev-qt/qtwidgets/qtwidgets-5.15.10-r2.ebuild b/dev-qt/qtwidgets/qtwidgets-5.15.10-r2.ebuild
index 24113d660d55..41070bbe224d 100644
--- a/dev-qt/qtwidgets/qtwidgets-5.15.10-r2.ebuild
+++ b/dev-qt/qtwidgets/qtwidgets-5.15.10-r2.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 if [[ ${PV} != *9999* ]]; then
 	QT5_KDEPATCHSET_REV=2
-	KEYWORDS="~amd64 arm arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86"
 fi
 
 QT5_MODULE="qtbase"