gentoo auto-resync : 24:10:2023 - 14:40:32

10 files changed, 246 insertions, 30 deletions

diff --git a/dev-qt/Manifest.gz b/dev-qt/Manifest.gz
index 1f6ee9fa6e18..de4afeb5878b 100644
--- a/dev-qt/Manifest.gz
+++ b/dev-qt/Manifest.gz
diff --git a/dev-qt/qtcore/Manifest b/dev-qt/qtcore/Manifest
index 2ff723aa1156..c5d12af56502 100644
--- a/dev-qt/qtcore/Manifest
+++ b/dev-qt/qtcore/Manifest
@@ -1,8 +1,10 @@
 DIST qtbase-5.15-gentoo-patchset-4.tar.xz 4884 BLAKE2B ef1f11ea63084b834e19a9bd4c4a146e0d47f10e6c1f540a23db64ba6b0d42f46d63f54f93587deae9ac528f6824fa0e88177fe109a53aaee7d8328d49e364cd SHA512 1ae6630cef6bead9187aaaf7c420566b2c1f946bfa22cb983c52267c098e9b1c7b82c99204cbd3eed5eb6ebde0359726e260fd449618802735af465ca39f0a1d
 DIST qtbase-5.15.10-gentoo-kde-3.tar.xz 747604 BLAKE2B 1d0f0be400504ef5e6f3c9cb5284ed85bf5bbf8b83f7d631fc06fb1622ef1b9750da9bda25b05e9426f64dabdad242181789785bbcdcf25c05abb931170e142a SHA512 6a65d717a9bfda7707c4b92bb42c9a7c4b587a31683cb911f6972bb0f149c83cdd827c25a6b0af791368f2c1b2471aab98618006d02b82ead10bd6bfe51f08f5
 DIST qtbase-5.15.11-gentoo-kde-1.tar.xz 324008 BLAKE2B 3ccd8645b5b727e4794fe4cb605d3db97159bf196b8e3e342ade364b701d6eb41e8e83ed608ec996480d7a82a43ddac098844dcecc9f122d63e9072abc21e9db SHA512 d145af982de89a34eaa15c5dc48ed927b5757e6a6d9bfa064a5cef40618465d7d6139ecaccb71944eac43926b977031034f6c22d4986f1e4a704007de9cb325d
+DIST qtbase-5.15.11-gentoo-kde-2.tar.xz 327120 BLAKE2B 38cf4106d620b28ab690de52dce7bbcf2da9de1009a0b126a68e19949013458ba788edd92a050410f9e33522be77e09eeeb95d4d696c3e482156dce5e120ee70 SHA512 235fb3baf660c551415300b5cc8a0d6091c7edd0a6f2c28bfb4e14bc63ada50203c0108cd8bd84b931860ee196cf83f68ec82a34509515c439ab989d80167d26
 DIST qtbase-everywhere-opensource-src-5.15.10.tar.xz 50422688 BLAKE2B 2a625296967bef17d491a3ec8fbb4a3beaf00180a2cda728e485f796c801241798bd85dd06d57ca9fef26c591fe9910a2fcb83a67bbc17640b7393d280b9ce53 SHA512 94ac739d76dd9fff54cde46e818fee6c6763f8b207b759108455febff84c9dfeb48ea7807451d7248cbfd8af24c2a1263c34dcbd2be055136e39325e32725eef
 DIST qtbase-everywhere-opensource-src-5.15.11.tar.xz 50825756 BLAKE2B 663d370d46a17939b984ef4c541414b81acdb98a2b7e67bb202c46891f9675e921723a025cef88b54b6111f235d94e273b97e1b55e2ca52b91e3eebca5ff7161 SHA512 4136092eec7bdceba661eee0187b7952ed6ba819148295979c0fd0392c17b0178165fa20136bdf460509a815c96f43892403294ba6e5322c54c51459c358fb7f
 EBUILD qtcore-5.15.10-r2.ebuild 2981 BLAKE2B 0543d84102e1aed41bbfce2ec6a19be9f637755bb182fc9df8310d0b6fe45afff0343985f7f4dc49e7756566b6991bcb25c6852ec7d8f43dbda8d816b71f698c SHA512 2aa8ce69bf67fa62ef1cdbef750a7658907f9262ac806028a20ed5dda90be46e2ac4175553e961c3877920e38d770f6d50c8d08adb3c975b68eefc8149077ae0
+EBUILD qtcore-5.15.11-r1.ebuild 2912 BLAKE2B 2d8fdc398e4aa98c0b3d54cbba9bdc94279dbf50a7a2a624fba18df26d79ebdcbcaf5609a9fd9979e35b4b7086a3eec1fa24a5e25e3ecd2ed25b7b10a2d8745c SHA512 a590c48823fcb4bed68c9667e8d47daab7357c08512b9b817ea60ec054ffb0d64bd14335a27b7c810781037934de2e68824477817e94695f0c4a5a8105ec5a5c
 EBUILD qtcore-5.15.11.ebuild 2912 BLAKE2B 2c0e8a27cb89fef8046da46bd4e7faac5fc9d1814c16a28bf78fb56c6f6ee5237264a04aae30488ea6fcea66e1d7474e106ec090828a8864fa2df9177c16b760 SHA512 707fbb67066a5283feffb6d4781e829e995ac320400305d9fcd0ece3e377692972970f99ceea0e16b3233ef9423460d37712951c68fb08e4d48e39d1d01c93f5
 MISC metadata.xml 663 BLAKE2B 2a9d7749bb4a5df86a251ae2bb4cdc82dac5be037ddf3b5f752b85a6a01821b1e635448b4ab4d4178a70d15a1d2bd8bb2bfd9c883e08e6e6c75c48a36ccaf7e7 SHA512 07c32117c1218f1bcd9878737519af088ec52888eb09d0ec99b44ec1b4eacd2c8c8d29804549f046e9afcb01336efcc40f55498bf79dc270eb0626bbfdd334cc
diff --git a/dev-qt/qtcore/qtcore-5.15.11-r1.ebuild b/dev-qt/qtcore/qtcore-5.15.11-r1.ebuild
new file mode 100644
index 000000000000..6946f91771c2
--- /dev/null
+++ b/dev-qt/qtcore/qtcore-5.15.11-r1.ebuild
@@ -0,0 +1,119 @@
+# 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 toolchain-funcs qt5-build
+
+DESCRIPTION="Cross-platform application development framework"
+SLOT=5/${QT5_PV}
+
+IUSE="icu old-kernel"
+
+DEPEND="
+	dev-libs/double-conversion:=
+	dev-libs/glib:2
+	dev-libs/libpcre2[pcre16,unicode]
+	sys-libs/zlib:=
+	icu? ( dev-libs/icu:= )
+	!icu? ( virtual/libiconv )
+"
+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
+		# 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 (...Annotate-QMutex-...patch) adding a header
+	qt5_syncqt_version
+}
+
+src_configure() {
+	local myconf=(
+		$(qt_use icu)
+		$(qt_use !icu iconv)
+	)
+	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 ec1e8ea01c60..10ee4a195b10 100644
--- a/dev-qt/qtdeclarative/Manifest
+++ b/dev-qt/qtdeclarative/Manifest
@@ -1,12 +1,14 @@
 AUX qtdeclarative-5.14.2-QQuickItemView-fix-maxXY-extent.patch 1566 BLAKE2B b6436c9be0a7de092635e1fc3999c3142fc3e916cbcc69f472691bbd559f611b4d5741f3627c47162a5ac86126382507add72a25a121235e856b1de802ee19be SHA512 dd5193f8d8a051238dabf63306cc77e3a5696fc12241c27f35cadfd30763ddfeb2af7d640849dcc7a810b7087173b8e9af17341ea1b68440906f2c2f1f96fee3
 DIST qtdeclarative-5.15.10-gentoo-kde-4.tar.xz 30168 BLAKE2B b85f4986d4fc33259d5507c4f60e2843ef9c87f217b62773a93bd9abbdf449fff94d111c2406631a61d4fa2c44e5d30778b8c7dd2268aad2186ee3de69455ebd SHA512 9fcd07cfd422a73271edbfe5ccc62082658a4957dfaa0de767514d1ae57a9c9f310d0caeeee172ad2a62bd67d383c6a658d69b395b1193689097172423febafd
 DIST qtdeclarative-5.15.11-gentoo-kde-1.tar.xz 30596 BLAKE2B 52f8773fd3ae3014e73863cd38ca3ced02f5487ffbcad125d80b34a54b36c5b384346ee580ef4f041840ac6977de3295a5263f939ef40d6a986b69ff0f380e3a SHA512 31e6dbcf55b690accecd460c0a0564acfc348306b7ffb022971aa949a7521ac26f49f46c4a312a1256d60d4ec6321539c754cb39a484bbad35e581853dfb93da
+DIST qtdeclarative-5.15.11-gentoo-kde-2.tar.xz 31064 BLAKE2B 7e4390fc71b52cc12dc6b6189a655c164441d7ddfaaa689cc203a85f5dd210890f8587b38a324fa3a8123b79f522e2837be116a374a1eca605535207beabe6f0 SHA512 e54406a89e3b5d8484dfad6db3c95235e8da8bc81178f1f17ba2e1fc0dbd7633ed900c2ef4d546f2cc0eba9bd5f35ed676a45ea8a4c71b90042d6742dcdcc8d4
 DIST qtdeclarative-everywhere-opensource-src-5.15.10.tar.xz 21596352 BLAKE2B 4259b55b1406694cf10d5ff1c4bc2501b47a7a7ea4a09eeb77c08fa1417d5f8d028df1a0753af0d1ef52d7aa1331343c56b6c72adf462a6d1a1d5097c288ad8f SHA512 378fc41a31edb52d85fd5e37fe6c086e35b5d5d759ceacc49cf7981a8a38d25ae5f2ca27d99547bd1db381f32128e7947800e2a01a857177707cc2a9980373a8
 DIST qtdeclarative-everywhere-opensource-src-5.15.11.tar.xz 21601640 BLAKE2B 5bb4d6484c54593b3c65f00c070c52e384cd7ff7be115abf54d4b3883e78d42994a4dee502c073ae4738020ada0d375ae1a1b8bb346e13ee28e287c69daeefc5 SHA512 08f76c5a1253d6014e48ef8d8c53f65d3087efea0f614f36aa03f37882c6947109b17398ac491157c4fbd0c954762e819c2f074fa5a71e6990f16a54ec7224ae
 DIST qtdeclarative-everywhere-src-6.5.2.tar.xz 35552840 BLAKE2B 048da9ab9433034ede21b51458cd3c7bd09d5364c8e2e65a02905bdc107d456ba0cbf2f9ea459324462c455fb33ef5f9b7bbbbe79e669100c82274476c10b34c SHA512 e6fd9dddbab72ee2e323d8ae0f4ac438b935477ad50b3e069a307993e94b289648d29ee265ac535e1396e4c1ba4bdf7e16b0cdf89a17df8d0a43bbe94f7316ef
 DIST qtdeclarative-everywhere-src-6.5.3.tar.xz 34140352 BLAKE2B 36b2f8de9138a60e72d3116b905d266374f9f047ce0ebf6d24b967faa4de11243dc34aa86057ca2e6ee1f4da104b947000fb8473025ff2ea3757b0ee0a9b3907 SHA512 d3fc2f01de9940cf8715cf525bc0c68555c5dc519b4a78952682c23bfc9c09249fb651c6e4dddac128b7e96f07e0371d3040b8f8c5480c8c3fccc4f3bfec2640
 DIST qtdeclarative-everywhere-src-6.6.0.tar.xz 34331124 BLAKE2B 3367619a1a9decc09340c8332e8f4f2a619254517030a64407a7ce1334e0f57df472e53f167adcbbc979458ee060607d16a77bd40eace4f30d8b30ff35dc7e69 SHA512 6563d23d48c828a7895279c42befa2275b02301fa16906494ea84a9c80076ea5c7f1be773a52f483dab5d8304feedfd9c5df4ac83cd77284aacae0287760555a
 EBUILD qtdeclarative-5.15.10-r3.ebuild 1537 BLAKE2B de2f7248543a63478c8dcc81818d92ee71fbf2efc2a34293cb66ce25f29338be748a7f9a8fcb1d64fce96d1899adca4a6bc3b55cdffc425d3f471f05ae0491b6 SHA512 67fa6f671d0e66dc2cfd162a95ece76069f639f9be1e1535da4cbd8a97fd46a3a4a05990ed5919e4bc04dcaaac9a5ad87ce2a2be53d18422d314b2150946940d
+EBUILD qtdeclarative-5.15.11-r1.ebuild 1543 BLAKE2B 9d56cc850bc359fe541be946b11f887928220f4baf86275787c6404507dcdf895c477cb373a60579f80587df38905eaebe5222570cf616f049aa187cc4a7d085 SHA512 7118cc70b77223f0e1abf44ab2ee9d179c17a72a567f87970a11e12f22aac4964c241dc4ea63e0b777210ac2d8c63d7eeaffd89f74fa00e229ecb1d1d08577f9
 EBUILD qtdeclarative-5.15.11.ebuild 1543 BLAKE2B abd9329814e878933a3115dfa895114ed5c26e34de3a6487dd5353a1db7c1fbd6f70ba1124ec25e067d7edb01c215d774d6f71c023149c2261d000870c9adb7a SHA512 b73f64e7751f5c850ba436eb98fe30320a2454bf28a921d428e71eb1461b192e7fcb4a7ec525260de47174f6f68bcc0ca9eb6252adb689c12b235b8d13b3bddb
 EBUILD qtdeclarative-6.5.2-r1.ebuild 730 BLAKE2B 60e035c9f92f4913facc626e5dd2bb74b8affa77900ff5bde88527fdda0a47fd20d82b05a71e3d856d1766785e6e5eef32ddb947c0995e263becbce0406811de SHA512 15fa33988477b43e775948f7cb70638bd6cf88a19396cacddffc037f296eca9b6c6b657334d34405493574a7e30db09b50c64c9e5156dc960415db7f28c2846c
 EBUILD qtdeclarative-6.5.3.ebuild 731 BLAKE2B 8f01d8bd0cf7b53556a3ed559bc0ba3b36f37c47cc8629a0f8bdae6c5bab28d4ee9ded33e4e1fd8f917ca33cb399ac7fed0f4a2ece1b2350788312967f0b9259 SHA512 b09d4394d9ba23825f735edcd7607952cf5846650dd22890df968c172fa8f433d858a45f9236289163dc2b8942df68ea2dd2c1c7da6bf1eb89a331442c607eee
diff --git a/dev-qt/qtdeclarative/qtdeclarative-5.15.11-r1.ebuild b/dev-qt/qtdeclarative/qtdeclarative-5.15.11-r1.ebuild
new file mode 100644
index 000000000000..966a188714e1
--- /dev/null
+++ b/dev-qt/qtdeclarative/qtdeclarative-5.15.11-r1.ebuild
@@ -0,0 +1,67 @@
+# 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..12} )
+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 20500b988af1..3712660a298a 100644
--- a/dev-qt/qtgui/Manifest
+++ b/dev-qt/qtgui/Manifest
@@ -1,9 +1,8 @@
-AUX qtgui-5.15.11-xkbcommon160.patch 1206 BLAKE2B e6509084c74f9f638af7abd72abdea8fef19751e69db49abfedfc3e02bc0e47057227542989b61c8fbbc517e5a20d0a06108cdeb09bf2899bf45cb9d505a0896 SHA512 15485b5b8bc5968ccf053b8e65ddf3ad725ea3fc4b91d550d381808fb83270c5402d5d6da0a132e31ae40fb6a0b440ec2939a2197011b08ffc85099a0c1e051b
 DIST qtbase-5.15-gentoo-patchset-4.tar.xz 4884 BLAKE2B ef1f11ea63084b834e19a9bd4c4a146e0d47f10e6c1f540a23db64ba6b0d42f46d63f54f93587deae9ac528f6824fa0e88177fe109a53aaee7d8328d49e364cd SHA512 1ae6630cef6bead9187aaaf7c420566b2c1f946bfa22cb983c52267c098e9b1c7b82c99204cbd3eed5eb6ebde0359726e260fd449618802735af465ca39f0a1d
 DIST qtbase-5.15.10-gentoo-kde-3.tar.xz 747604 BLAKE2B 1d0f0be400504ef5e6f3c9cb5284ed85bf5bbf8b83f7d631fc06fb1622ef1b9750da9bda25b05e9426f64dabdad242181789785bbcdcf25c05abb931170e142a SHA512 6a65d717a9bfda7707c4b92bb42c9a7c4b587a31683cb911f6972bb0f149c83cdd827c25a6b0af791368f2c1b2471aab98618006d02b82ead10bd6bfe51f08f5
-DIST qtbase-5.15.11-gentoo-kde-1.tar.xz 324008 BLAKE2B 3ccd8645b5b727e4794fe4cb605d3db97159bf196b8e3e342ade364b701d6eb41e8e83ed608ec996480d7a82a43ddac098844dcecc9f122d63e9072abc21e9db SHA512 d145af982de89a34eaa15c5dc48ed927b5757e6a6d9bfa064a5cef40618465d7d6139ecaccb71944eac43926b977031034f6c22d4986f1e4a704007de9cb325d
+DIST qtbase-5.15.11-gentoo-kde-2.tar.xz 327120 BLAKE2B 38cf4106d620b28ab690de52dce7bbcf2da9de1009a0b126a68e19949013458ba788edd92a050410f9e33522be77e09eeeb95d4d696c3e482156dce5e120ee70 SHA512 235fb3baf660c551415300b5cc8a0d6091c7edd0a6f2c28bfb4e14bc63ada50203c0108cd8bd84b931860ee196cf83f68ec82a34509515c439ab989d80167d26
 DIST qtbase-everywhere-opensource-src-5.15.10.tar.xz 50422688 BLAKE2B 2a625296967bef17d491a3ec8fbb4a3beaf00180a2cda728e485f796c801241798bd85dd06d57ca9fef26c591fe9910a2fcb83a67bbc17640b7393d280b9ce53 SHA512 94ac739d76dd9fff54cde46e818fee6c6763f8b207b759108455febff84c9dfeb48ea7807451d7248cbfd8af24c2a1263c34dcbd2be055136e39325e32725eef
 DIST qtbase-everywhere-opensource-src-5.15.11.tar.xz 50825756 BLAKE2B 663d370d46a17939b984ef4c541414b81acdb98a2b7e67bb202c46891f9675e921723a025cef88b54b6111f235d94e273b97e1b55e2ca52b91e3eebca5ff7161 SHA512 4136092eec7bdceba661eee0187b7952ed6ba819148295979c0fd0392c17b0178165fa20136bdf460509a815c96f43892403294ba6e5322c54c51459c358fb7f
 EBUILD qtgui-5.15.10-r2.ebuild 3872 BLAKE2B 19970c0741aff635b84177f30b8e978f068ecf2902cc79c8f0ff8b7bb29a6666a3c8850041b0f6680b72c96a77a1fc5cf44ef71160aa5d9165452905c4147228 SHA512 282e91721fa55b15bcdd6d56bdccd59ae740893dc0601c6dbd368ffc2347ca071e82879aeba48e0fd4720fba6208f532d5001ce16f876e3c5ace875871f7efa6
-EBUILD qtgui-5.15.11.ebuild 3939 BLAKE2B 8f2c8a3730675763164c4322f370d491d276019166386bf1c160f8e7592d518fbc8566f846a4894409cfa94f9e16623008c225f9f014b2217e593cd62b9fb0d0 SHA512 9bf1f0daac35592388d9a8c9c733b698a8656fd145d0ddb3406b927ab0618d3cb40f62c4ed239518eee36dd23c3124edbff45a756feef5e3910116ca16b761ea
+EBUILD qtgui-5.15.11.ebuild 3878 BLAKE2B 04586a9b62228cfbb8393830a1c748d9db48bcf314b45c8c50c368af501d56e645e91d9e388cc05e06eaba0bd41f522ef3595354d7b5c9edb735d7b630884270 SHA512 7bc42e14b1ea308c98d8358c7d7fd7ea80dacd3f7248d387301748770a55840a8061a801d46c044d133223307e47cce9decce0ed9a61e5fd266989dbd2766afe
 MISC metadata.xml 1332 BLAKE2B 9e3b90622029fb3c2345b61a3d5d5c55c9e364f2872cdcbd74d34c2af41a692e8e6e03396799c0ce2ec74d3b0dc3e86e755502217f25a18d6e822389ec8481b7 SHA512 1eb4740fcbdceed313e24e019424d08239539eede918f41964ab092d85ec9f78665a40922f92467eceaf1ac7632c0b12c5368884f7128b8b119550c3c87b5e67
diff --git a/dev-qt/qtgui/files/qtgui-5.15.11-xkbcommon160.patch b/dev-qt/qtgui/files/qtgui-5.15.11-xkbcommon160.patch
deleted file mode 100644
index 0b5b3f964d57..000000000000
--- a/dev-qt/qtgui/files/qtgui-5.15.11-xkbcommon160.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-These were removed in libxkbcommon-1.6.0[1] and were apparently
-unnecesary. Usage results in build failure.
-
-Just a quick fix while waiting for what [2] comes up with.
-
-Update: will be fixed by [3], see also [4]
-
-[1] https://gitlab.freedesktop.org/xorg/proto/xorgproto/-/merge_requests/70
-[2] https://bugreports.qt.io/browse/QTBUG-117950
-[3] https://invent.kde.org/qt/qt/qtbase/-/merge_requests/290
-[4] https://bugs.gentoo.org/915510
---- a/src/platformsupport/input/xkbcommon/qxkbcommon.cpp
-+++ b/src/platformsupport/input/xkbcommon/qxkbcommon.cpp
-@@ -276,4 +276,4 @@
--        Xkb2Qt<XKB_KEY_dead_lowline,            Qt::Key_Dead_Lowline>,
--        Xkb2Qt<XKB_KEY_dead_aboveverticalline,  Qt::Key_Dead_Aboveverticalline>,
--        Xkb2Qt<XKB_KEY_dead_belowverticalline,  Qt::Key_Dead_Belowverticalline>,
--        Xkb2Qt<XKB_KEY_dead_longsolidusoverlay, Qt::Key_Dead_Longsolidusoverlay>,
-+        Xkb2Qt<0xfe90,                          Qt::Key_Dead_Lowline>,
-+        Xkb2Qt<0xfe91,                          Qt::Key_Dead_Aboveverticalline>,
-+        Xkb2Qt<0xfe92,                          Qt::Key_Dead_Belowverticalline>,
-+        Xkb2Qt<0xfe93,                          Qt::Key_Dead_Longsolidusoverlay>,
diff --git a/dev-qt/qtgui/qtgui-5.15.11.ebuild b/dev-qt/qtgui/qtgui-5.15.11.ebuild
index e8ef3f8a6ff9..65519037df3e 100644
--- a/dev-qt/qtgui/qtgui-5.15.11.ebuild
+++ b/dev-qt/qtgui/qtgui-5.15.11.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 if [[ ${PV} != *9999* ]]; then
-	QT5_KDEPATCHSET_REV=1
+	QT5_KDEPATCHSET_REV=2
 	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
 fi
 
@@ -127,10 +127,6 @@ QT5_GENTOO_PRIVATE_CONFIG=(
 	:gui
 )
 
-PATCHES=(
-	"${FILESDIR}"/${PN}-5.15.11-xkbcommon160.patch
-)
-
 src_prepare() {
 	# don't add -O3 to CXXFLAGS, bug 549140
 	sed -i -e '/CONFIG\s*+=/s/optimize_full//' src/gui/gui.pro || die
diff --git a/dev-qt/qtwayland/Manifest b/dev-qt/qtwayland/Manifest
index a3dc2cfb7738..a9082b37b5b0 100644
--- a/dev-qt/qtwayland/Manifest
+++ b/dev-qt/qtwayland/Manifest
@@ -2,6 +2,7 @@ AUX qtwayland-6.5.2-drag-drop-segfault.patch 1808 BLAKE2B 2305e54b77d0ffd357b75c
 DIST qtwayland-5.15.10-gentoo-kde-3.tar.xz 46984 BLAKE2B e0fa3708d1f91599d292d5c84e4285e165cfc14e6dfba420df487e33fb13fba3b19c4e722aa3c658eb6c33e775610a0d1363361a7dd7f67c1d2c275d852b9f4d SHA512 30333d9987311eeba7d970d75806a3fd3682856890b6c8bdf5048761f14c187dcaff45c9fed445a75c594772a2dd174eee39f550fcae25042bc7ab052e0743e1
 DIST qtwayland-5.15.10-gentoo-kde-4.tar.xz 48728 BLAKE2B 761c05a0abb119b5565a90436410bf3aed28419938380b074f630f66a72547797b692342c376381bded0fbf5833d56949e102f4e332822a5b99621335de2cc5d SHA512 fb865a0318ba08df637284b4272463b4325902e2c4704f26401c945831c675c51b36a5ca4925ee2934a62a98322b17def767ea48256097814a4598cb8a65a99f
 DIST qtwayland-5.15.11-gentoo-kde-1.tar.xz 47500 BLAKE2B 16a5f13ab03c14860f8b08d3aabf7ed5b8d60b5b3eae1fae31be805986947dbcd7d2ca13bf48dea21cfa8693b9921dc4724a73973aa50cf26a0104d97dcc75a5 SHA512 01ce97cb9fc142219a7e2fb05d84447728c1bd02a1fb0a181b5af7eb81f6f707a615be3985d094399d5d7974b2a6bcd27a2334e571cdd3e806b1e6432b7a70ec
+DIST qtwayland-5.15.11-gentoo-kde-2.tar.xz 48072 BLAKE2B 5587a010e168df2a3303673c4af4d62908c1847dfe563af6bbfa325c38c3de09dafddc7cf3bf55d1293f22716f146f30729eacea8f839b01e3b2b3bd0ba2dcf8 SHA512 8bd205896c4e81203aac98adbf7da209138b5b9423780506910552aa6fdb23f8c5f0b18fd94e90349f94725d13325348c010482e1afddfa0832b9d4ff3feb8bc
 DIST qtwayland-everywhere-opensource-src-5.15.10.tar.xz 568552 BLAKE2B c5cd4ed5ff78befb5bb49f9eb809562c418b2469aa0fa23728a1de46d57f42788bba3f87a54c8dda2ee0900c76b84213d1111fd86159dc5e6707f7b67ed386de SHA512 214b1fec7dfd815d148a7485f7811e623b06d172e58e4ee3167264a4e4b8f4aeec11474e574f91652a0bd3a48476a6747cad468f1e5035c49a55a96fc1400899
 DIST qtwayland-everywhere-opensource-src-5.15.11.tar.xz 569072 BLAKE2B 83b96ac4eb220aa924539a67b28bb20eff97256203f0c36efb0687b9266a2d0f3c69cec6648870e27431120bc1bd0eecf14dcc4f118e3d77ed78c1eb66298329 SHA512 b47a3358bc37f52dde0839940431e8049abfaa827722e6d57362b07547c35fe9fb422d28fd28c69a13f5773c24efc3eeea1e584372737a0151ed94bf4c5b9980
 DIST qtwayland-everywhere-src-6.5.2.tar.xz 1059356 BLAKE2B 4708b78ff5c8e413edaa4d4400317f58dd068273a5eef7caf1500abf8afbe4e9ac405b6854691ef93265a7eeb0cfb7406024826a0b7c7ba3f8149218af67fd48 SHA512 520d109402f1d629481029a3b1eaab740e66135db4069c34651172bb2ad821b22de60e9956a96331d2f32a4522fc52c6a4ba99b474092d755760cad08c776477
@@ -9,6 +10,7 @@ DIST qtwayland-everywhere-src-6.5.3.tar.xz 1059396 BLAKE2B f3b495e712a3eae53b0fe
 DIST qtwayland-everywhere-src-6.6.0.tar.xz 1125748 BLAKE2B e1024866761b1872ed762ef565cc4805e0dcea5a3319ec6d4aaf4d9e46477a0a4f1aea7b39faeb88ab10afa6b2fb5e0dd22a7864a3d18b479c87e345b34c7153 SHA512 e9cf63ccc71d4dc61b04a0f8a1a466e9ede09aa689c53c1ccc9db5233e324894bfd198c9204d8d93509c770a7a6612c8eb9981e0b3ee7428f8bf2dcbdc255109
 EBUILD qtwayland-5.15.10-r5.ebuild 1002 BLAKE2B a7bdae0b7a75b8478865e7d0221b62cae60268082ae42641795d7f6943e5f83d962f066ca7c7c594cf8836006c3c8368d2e4505ea63880e25e4d0d2949e081bb SHA512 0b559c13304298aa39ee15ef696d11ed76386de39df95db01f1d62c82f7f5c7d40751f57e5a3e3a6a5e7ab03e81fbff71e84daa52bad4cbece2fc17a6b0eafbc
 EBUILD qtwayland-5.15.10-r6.ebuild 1005 BLAKE2B 05561f3fd8cb8acdf5f2374fc917f0cf0ed954876823c96797cd87135b834278ed1f33155752bd7e652fda84b816030466574dbe79979dda8533d0a071bbc37e SHA512 abdbb2b08cb71f6f7487db28b9384522dec60e79e63832dde3b525710a0877bb1e47d08e48b757a76af5d166e3dc9a33f26a652d4e44fefa43e04bcfdd24960f
+EBUILD qtwayland-5.15.11-r1.ebuild 1215 BLAKE2B 7847296c5da80a81c69e20fcc5f98f1437de25b2f0e4a74c449a53346c3a055da90ed8b366bb4c2f71a4895211f72ebffc3a630f1e9bdbed00f1b590ccae68c6 SHA512 89c6b2f1ac9cff2d003092ef8ab4a16c0962d484d406a13f7c2356462dbe082fd8e675a7314f6c3adbb52f0802c64615172b93b44b453c0abe9b1c7b980df370
 EBUILD qtwayland-5.15.11.ebuild 1215 BLAKE2B 98bb1d3aa5561badb375a0d9ac0cec2cd18cc463c027b838656d67ff883dd9cd30f2f593a4a2cc914bf9c28ed1d23632eeb4b70a85db82215855ccba791b5e53 SHA512 0e546a73410a729a6e9f64a2555a49cc9c046c230528725c0014841cb0dd7882cc9cb40599af59ac0e871a1e3022155e7fdeedcb63fbedbc932864c795289bd7
 EBUILD qtwayland-6.5.2-r3.ebuild 1031 BLAKE2B 9f563231cb5f2fab8b768f1994e499424a31973f587090dd0f6bfe6c883839c0bddf4dd27da0ab79d80e61f3a4012c709860a806cb30ee8daa74d90f9924777c SHA512 80e6df7a01eda95cc3da63b32bc90834c702acc2bc9ff9c646898adfe4d9acc66400f28d96d61a5bdfbcedee5601a25f33296c9dbbfd3f3f9cef5459ea66d160
 EBUILD qtwayland-6.5.3.ebuild 967 BLAKE2B f3a45032c732127486f860df3fdfbff9913bf6cbd207c119262b97a5a51a58ad2ae14eca3f1d8c4312898eb9136d723f328be741f91589de80876b5ba2fef515 SHA512 524efe99de6af4d10f465e0b17187ebe57fdc0be06981b56dfa84c46f9aacd4d6f011673dbd5d1ac01cd08a964b7eb983c40826794a5342ee4cf8963d1b99e0e
diff --git a/dev-qt/qtwayland/qtwayland-5.15.11-r1.ebuild b/dev-qt/qtwayland/qtwayland-5.15.11-r1.ebuild
new file mode 100644
index 000000000000..bc6e8bd63338
--- /dev/null
+++ b/dev-qt/qtwayland/qtwayland-5.15.11-r1.ebuild
@@ -0,0 +1,51 @@
+# 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
+
+inherit qt5-build
+
+DESCRIPTION="Wayland platform plugin for Qt"
+
+SLOT=5/${QT5_PV} # bug 815646
+IUSE="compositor"
+
+RDEPEND="
+	dev-libs/wayland
+	=dev-qt/qtcore-${QT5_PV}*:5=
+	=dev-qt/qtgui-${QT5_PV}*:5=[egl,libinput]
+	media-libs/libglvnd
+	x11-libs/libxkbcommon
+	compositor? (
+		=dev-qt/qtdeclarative-${QT5_PV}*:5=
+		=dev-qt/qtgui-${QT5_PV}*:5=[vulkan]
+	)
+"
+DEPEND="${RDEPEND}
+	compositor? ( dev-util/vulkan-headers )
+"
+BDEPEND="dev-util/wayland-scanner"
+
+src_configure() {
+	local myqmakeargs=(
+		--
+		-no-feature-xcomposite-egl
+		-no-feature-xcomposite-glx
+		$(qt_use compositor feature-wayland-server)
+		$(qt_use compositor feature-wayland-dmabuf-server-buffer)
+		$(qt_use compositor feature-wayland-drm-egl-server-buffer)
+		$(qt_use compositor feature-wayland-shm-emulation-server-buffer)
+		$(qt_use compositor feature-wayland-vulkan-server-buffer)
+	)
+	qt5-build_src_configure
+}
+
+src_install() {
+	qt5-build_src_install
+	rm "${D}${QT5_BINDIR}"/qtwaylandscanner || die
+}