gentoo resync : 16.01.2021

13 files changed, 421 insertions, 114 deletions

diff --git a/dev-qt/Manifest.gz b/dev-qt/Manifest.gz
index a7219610b394..7439997369a7 100644
--- a/dev-qt/Manifest.gz
+++ b/dev-qt/Manifest.gz
diff --git a/dev-qt/qtcore/Manifest b/dev-qt/qtcore/Manifest
index 2e54086302aa..40ba83b707b7 100644
--- a/dev-qt/qtcore/Manifest
+++ b/dev-qt/qtcore/Manifest
@@ -1,8 +1,10 @@
 AUX qtcore-5.14.1-cmake-macro-backward-compat.patch 2555 BLAKE2B 5fe2b70232722416cb85ecce8a0742b57503c520482aa0386042f43d4cf20926a874b9a92f90c656cfe0bf93883c286b6b08c0ad2568f3a6746c776dcf208995 SHA512 c7ba0bfa6d462504ba9421abfb7f502265fd8c6bd7469326612925cd7b7667daba3350f714aa5a516aa83e5352ec6d18fc02af9ebf5494af10a4b6f8f7c47d5b
 AUX qtcore-5.15.1-timezone-1.patch 9484 BLAKE2B aa36362fcc6ea1ab144e97dfa1e023e4fbad64f8702e817ee2431ac271aefd637609d14a265c2d6e58bedbdb3f635b4b979c9bf1463a29370ae05bb2610e131b SHA512 1edfe267827225279b0ecad60a5a350b825ed9bd84574d0e5470e71bac75668c0655aa0db2f001e26e331f85e0cf0a68412ba5a9541581bf39a0e954313672b2
 AUX qtcore-5.15.1-timezone-2.patch 1933 BLAKE2B 479f82c90d2132291bc298491d61d7144e08a6db8b36d7d1a89f368c894e41902ae964aaa2819010c485dc5aedd937f2dd00b4efa99d3393d11368e0ea258481 SHA512 c978ffadf15629ab562a53cc24d31e33f4df861962b927ea37061747cb74a7b677d7ae3a617b526c4f48085fe73ebb89fbf5a44748433426dd74e5691a238097
-AUX qtcore-5.15.2-fix-stack-smashing.patch 4444 BLAKE2B ecd005a59f156324b8a0da854b0635a43d30855d8f97cff4c787cdf3b8ef2d84da967a643c6a5b8008e1d53ab8089febd849ddd2da38affb6c73a142a48016fd SHA512 e781861d02f7487b93bff1a45a7e5cca82824b998b99e80bef233711557eda5107eea16562afd6fb1d57bac3790b2d7229b97430c1be94fd46d9237358550969
+DIST qtbase-5.15.2-38ad2f39.tar.gz 67969272 BLAKE2B 9071c96e8162d8141676f63aab82ca61ba29039e79066939fb74501187ae95cca34c924f1105827411f021efca2f40a62b7acde845d0d463604b234a3a8f8370 SHA512 df4f2dce732f62c797f77c266e268097f32a5d7605b3464c9a76d323d8ec069c902994df6afa28823d3c03f5d4ca0295cac47e28773b25e2f9387e3475f52f82
 DIST qtbase-5.15.2-7c6c0030.tar.gz 67967537 BLAKE2B 623b99942e9df9bc8ac436a21503060845f9e3532aa0e02ccd927762382be26091878fbe092e80c0ac68bead51d09647e40e0cf61361d62ad226ed46b221132b SHA512 eb88b21764591246c5f04f63405dbfcd39afb737e96bb29c7721644b9aba3ea95df24ed9699acfd03a8c088ee72efec1fb0267aef8d665d5ec72ee75fc08ecdc
+DIST qtbase-5.15.2-f4ac0b55.tar.gz 67967554 BLAKE2B 3e1ece861c195cdaa688f22cac7bbfdb3cce73ac575f72c8adc916face612307553d98da7b757c44980b1ed0ebf5a9ecaa2e993b41e775f511e32bd515c1ca54 SHA512 6160e02505e4d3f9fbd55f442e0a7a4d906feb576c891600232937bc212660b5c8a41072347d9f78dd0a1ca9357af514b5df2b341e181b2c823b36a912e583fa
 EBUILD qtcore-5.15.2-r11.ebuild 2325 BLAKE2B 8cbabcd9be308995f05c847446e11376bada59ef7f937fad98b906b83b1f50417fbd7cd612903c129eaa66db1fb8d835d157cc4e506c5b430ef291d710e15c26 SHA512 66e9558247d8c71bfd6d784ad4fa9e46639a50a1d073ae438062891de769cee24081b797f8c8b5d0ca915090acb1d2a52177105eed2a637702ea18761bd4c3f4
-EBUILD qtcore-5.15.2-r12.ebuild 2474 BLAKE2B 607f1c9bf4e232cc378d42d857cf84f18ddbf6c2a15035c95828b0ce05d7ea51a52ce978610378367535471252033e150b109fdb5a675e30057ac41d9181da3d SHA512 7cc1dec37b123d47ec2cdea4ffeb9a7dc0967f6f12d17b29a55a44c80f61551f3264b58988e03b8d548bbced227ec3202bc4e8750c52fc04597bce5a207a85ef
+EBUILD qtcore-5.15.2-r13.ebuild 2331 BLAKE2B 387048a47070b5c741421931677a981c0f972417128f37a828a7e5ebad19542875199caad87d9587ee58c7b1ab546aa22c5259125c3592064518292b10becbac SHA512 23739928c09ee359908ec1297ad7844dc653925d2e9b978da22aedab95e41a17940b4b858445e0865550e48e86176f6552862c333818cfa9ad349fc17652d178
+EBUILD qtcore-5.15.2-r14.ebuild 2331 BLAKE2B 03110db1e78f93a0a996ff478559fc2553df761af5badc924378a18a7464f35f09153f37e1923b377cd014a25486193e074ae418218419bdba86bf323bbdf0a4 SHA512 0fde78d3b88edda574734fb98217af5de5977f0803d8f78b103468497af99dff1e6c91490aa2c0550969ee67a8ecdd59f443fdb34c903eefa18c2963d55ea395
 MISC metadata.xml 833 BLAKE2B 79b441c34e55017f23dd85cdb062ef4cbcfce05dff74936de887256ba8b9b596632b570b55b7014c38467829751771bb116f067cd6a246a11309f20b67fb55f0 SHA512 f1ffedc2ad17d198ba14a9a93e6c8dd35a7709e6f1e07dae606c16c05868f2f8e696f25fa5cf2602ed50f41eb5a914ff0d652b9ac37163e5130ddbfb475a1ff5
diff --git a/dev-qt/qtcore/files/qtcore-5.15.2-fix-stack-smashing.patch b/dev-qt/qtcore/files/qtcore-5.15.2-fix-stack-smashing.patch
deleted file mode 100644
index cfc187251ccb..000000000000
--- a/dev-qt/qtcore/files/qtcore-5.15.2-fix-stack-smashing.patch
+++ /dev/null
@@ -1,105 +0,0 @@
-From 463c338b09710609e0dc82f67e03c829a7b83788 Mon Sep 17 00:00:00 2001
-From: Allan Sandfeld Jensen <allan.jensen@qt.io>
-Date: Fri, 14 May 2021 10:43:11 +0200
-Subject: [PATCH] Avoid mixing atomic futex changes and QAtomic
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Either the mix of futex and atomic, or the mix of 32-bit futex and
-64-bit atomic doesn't work. In any case, the existing code leads to
-bad behavior.
-
-* asturm 2021-11-19: Also threw the typo fix from 587e3bb0 into the mix.
-
-Pick-to: 6.1 5.15
-Fixes: QTBUG-92188
-Change-Id: Icc6ba28d6e2465c373d00e84f4da2b92c037e797
-Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
-Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
-(cherry picked from commit 2d9cc639a4a7a5e97979a6034364bd67dfa10c23)
----
- src/corelib/thread/qsemaphore.cpp | 46 ++++++++++++-------------------
- 1 file changed, 17 insertions(+), 29 deletions(-)
-
-diff --git a/src/corelib/thread/qsemaphore.cpp b/src/corelib/thread/qsemaphore.cpp
-index d4fb756b94..1d01fc1b28 100644
---- a/src/corelib/thread/qsemaphore.cpp
-+++ b/src/corelib/thread/qsemaphore.cpp
-@@ -357,47 +357,31 @@ void QSemaphore::release(int n)
-         quintptr prevValue = u.fetchAndAddRelease(nn);
-         if (futexNeedsWake(prevValue)) {
- #ifdef FUTEX_OP
--            if (!futexHasWaiterCount) {
--                /*
--                   On 32-bit systems, all waiters are waiting on the same address,
--                   so we'll wake them all and ask the kernel to clear the high bit.
--
--                   atomic {
--                      int oldval = u;
--                      u = oldval & ~(1 << 31);
--                      futexWake(u, INT_MAX);
--                      if (oldval == 0)       // impossible condition
--                          futexWake(u, INT_MAX);
--                   }
--                */
--                quint32 op = FUTEX_OP_ANDN | FUTEX_OP_OPARG_SHIFT;
--                quint32 oparg = 31;
--                quint32 cmp = FUTEX_OP_CMP_EQ;
--                quint32 cmparg = 0;
--                futexWakeOp(u, INT_MAX, INT_MAX, u, FUTEX_OP(op, oparg, cmp, cmparg));
--            } else {
-+            if (futexHasWaiterCount) {
-                 /*
-                    On 64-bit systems, the single-token waiters wait on the low half
-                    and the multi-token waiters wait on the upper half. So we ask
-                    the kernel to wake up n single-token waiters and all multi-token
--                   waiters (if any), then clear the multi-token wait bit.
-+                   waiters (if any), and clear the multi-token wait bit.
- 
-                    atomic {
-                       int oldval = *upper;
--                      *upper = oldval & ~(1 << 31);
-+                      *upper = oldval | 0;
-                       futexWake(lower, n);
--                      if (oldval < 0)   // sign bit set
-+                      if (oldval != 0)   // always true
-                           futexWake(upper, INT_MAX);
-                    }
-                 */
--                quint32 op = FUTEX_OP_ANDN | FUTEX_OP_OPARG_SHIFT;
--                quint32 oparg = 31;
--                quint32 cmp = FUTEX_OP_CMP_LT;
-+                quint32 op = FUTEX_OP_OR;
-+                quint32 oparg = 0;
-+                quint32 cmp = FUTEX_OP_CMP_NE;
-                 quint32 cmparg = 0;
-+                u.fetchAndAndRelease(futexNeedsWakeAllBit - 1);
-                 futexWakeOp(*futexLow32(&u), n, INT_MAX, *futexHigh32(&u), FUTEX_OP(op, oparg, cmp, cmparg));
-+                return;
-             }
--#else
--            // Unset the bit and wake everyone. There are two possibibilies
-+#endif
-+            // Unset the bit and wake everyone. There are two possibilities
-             // under which a thread can set the bit between the AND and the
-             // futexWake:
-             // 1) it did see the new counter value, but it wasn't enough for
-@@ -405,8 +389,12 @@ void QSemaphore::release(int n)
-             // 2) it did not see the new counter value, in which case its
-             //    futexWait will fail.
-             u.fetchAndAndRelease(futexNeedsWakeAllBit - 1);
--            futexWakeAll(u);
--#endif
-+            if (futexHasWaiterCount) {
-+                futexWakeAll(*futexLow32(&u));
-+                futexWakeAll(*futexHigh32(&u));
-+            } else {
-+                futexWakeAll(u);
-+            }
-         }
-         return;
-     }
--- 
-2.34.0
-
diff --git a/dev-qt/qtcore/qtcore-5.15.2-r12.ebuild b/dev-qt/qtcore/qtcore-5.15.2-r13.ebuild
index 005fd2c6c0fd..0b8f86d5973a 100644
--- a/dev-qt/qtcore/qtcore-5.15.2-r12.ebuild
+++ b/dev-qt/qtcore/qtcore-5.15.2-r13.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-KDE_ORG_COMMIT=7c6c0030cf80ef7b9ace42996b0e0c3a72f76860
+KDE_ORG_COMMIT=38ad2f39daec09168728033969265834b6a2d924
 QT5_MODULE="qtbase"
 inherit linux-info qt5-build
 
@@ -48,8 +48,6 @@ QT5_GENTOO_PRIVATE_CONFIG=(
 PATCHES=(
 	"${FILESDIR}"/${PN}-5.14.1-cmake-macro-backward-compat.patch # bug 703306
 	"${FILESDIR}"/${PN}-5.15.1-timezone-{1,2}.patch # bug 737914
-	# See also: https://invent.kde.org/qt/qt/qtbase/-/merge_requests/81
-	"${FILESDIR}"/${P}-fix-stack-smashing.patch # bug 824286, KDE-bug 445719
 )
 
 pkg_pretend() {
diff --git a/dev-qt/qtcore/qtcore-5.15.2-r14.ebuild b/dev-qt/qtcore/qtcore-5.15.2-r14.ebuild
new file mode 100644
index 000000000000..363ceb67039c
--- /dev/null
+++ b/dev-qt/qtcore/qtcore-5.15.2-r14.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+KDE_ORG_COMMIT=f4ac0b55c37f2b594ffbe639db43dac365825c7c
+QT5_MODULE="qtbase"
+inherit linux-info qt5-build
+
+DESCRIPTION="Cross-platform application development framework"
+SLOT=5/${QT5_PV}
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+fi
+
+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}
+	>=dev-qt/qtchooser-66-r1
+"
+
+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
+)
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-5.14.1-cmake-macro-backward-compat.patch # bug 703306
+	"${FILESDIR}"/${PN}-5.15.1-timezone-{1,2}.patch # bug 737914
+)
+
+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
+
+	qt5-build_src_prepare
+}
+
+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
+
+	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 f0f6ee86de65..97761ec22b08 100644
--- a/dev-qt/qtgui/Manifest
+++ b/dev-qt/qtgui/Manifest
@@ -1,5 +1,7 @@
 AUX qt-5.12-gcc-avx2.patch 1038 BLAKE2B cb54308c8ef4df9efaa8727ba292b7e959ae069237f8dbc6c7432556c4697f0263dca098f348b0afe94cc93359f929c564c8201a60d585b5907b6bd497369e24 SHA512 0eb51d41996bf42bc896eef53d2e335777c6c6f56fe027581f8b636a57759c98b3f08a5330c9fdeb0054aaa1955024140b161fd19c6457cc66fe68414b1cd8ff
 AUX qtgui-5.14.1-cmake-macro-backward-compat.patch 2555 BLAKE2B 5fe2b70232722416cb85ecce8a0742b57503c520482aa0386042f43d4cf20926a874b9a92f90c656cfe0bf93883c286b6b08c0ad2568f3a6746c776dcf208995 SHA512 c7ba0bfa6d462504ba9421abfb7f502265fd8c6bd7469326612925cd7b7667daba3350f714aa5a516aa83e5352ec6d18fc02af9ebf5494af10a4b6f8f7c47d5b
+DIST qtbase-5.15.2-38ad2f39.tar.gz 67969272 BLAKE2B 9071c96e8162d8141676f63aab82ca61ba29039e79066939fb74501187ae95cca34c924f1105827411f021efca2f40a62b7acde845d0d463604b234a3a8f8370 SHA512 df4f2dce732f62c797f77c266e268097f32a5d7605b3464c9a76d323d8ec069c902994df6afa28823d3c03f5d4ca0295cac47e28773b25e2f9387e3475f52f82
 DIST qtbase-5.15.2-7c6c0030.tar.gz 67967537 BLAKE2B 623b99942e9df9bc8ac436a21503060845f9e3532aa0e02ccd927762382be26091878fbe092e80c0ac68bead51d09647e40e0cf61361d62ad226ed46b221132b SHA512 eb88b21764591246c5f04f63405dbfcd39afb737e96bb29c7721644b9aba3ea95df24ed9699acfd03a8c088ee72efec1fb0267aef8d665d5ec72ee75fc08ecdc
 EBUILD qtgui-5.15.2-r15.ebuild 4047 BLAKE2B 94f623f9000cb7f047603a8fbbe87f58e2032a304a74928f7dbe57f199d702c02652207561a1f9ea02c75d7d464a0225daea49c991a6546eac3f8b18e50c8e86 SHA512 3a5942c08b470da4b410cbdc12b12ded5ec1404b57fc7db279232549221cc10b090fe0604b48d36e3bd6324a53d27a8179bcbf60908d65fe6965561573b448c6
+EBUILD qtgui-5.15.2-r16.ebuild 4053 BLAKE2B a3e8aa388a3092995c8f4e9a2780093a97540453d9d5e4c7501f62ec450affd1db48d12fa02e1e9903c63b46a05c122403128bc76a304b2e074235e3328ba2b8 SHA512 beb06ca164998fab4b28edaa23233a87a3ed93d616f40331ea29c0897aed161dd3e3e8ea7793508e4145c3f2082b96b3f4043abb0c92c6319bbf9bf8fdf58053
 MISC metadata.xml 1387 BLAKE2B a370bc2dc77b3efcca29b46e9690b1b5e5c08c5fbfcf06211c1a384c9b998517b4da4357b1cc33998d4f480f9c5481e41b42f3b20f8f72d2635b317ed1d5b412 SHA512 ffa4622291427193109a83d422ff53f373fc3eb7449855849f0f39091383abc30fbfcb88a7d53e29bf2d39e1ec1c40f7aac7433b4d7c0aeefd48983047e912d5
diff --git a/dev-qt/qtgui/qtgui-5.15.2-r16.ebuild b/dev-qt/qtgui/qtgui-5.15.2-r16.ebuild
new file mode 100644
index 000000000000..3d8b468b1913
--- /dev/null
+++ b/dev-qt/qtgui/qtgui-5.15.2-r16.ebuild
@@ -0,0 +1,184 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+KDE_ORG_COMMIT=38ad2f39daec09168728033969265834b6a2d924
+QT5_MODULE="qtbase"
+inherit qt5-build
+
+DESCRIPTION="The GUI module and platform plugins for the Qt5 framework"
+SLOT=5/${QT5_PV} # bug 707658
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+fi
+
+IUSE="accessibility dbus egl eglfs evdev +gif 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? ( virtual/jpeg )
+	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:=[xkb]
+		x11-libs/libxkbcommon[X]
+		x11-libs/xcb-util-image
+		x11-libs/xcb-util-keysyms
+		x11-libs/xcb-util-renderutil
+		x11-libs/xcb-util-wm
+	)
+"
+DEPEND="${RDEPEND}
+	evdev? ( sys-kernel/linux-headers )
+	linuxfb? ( sys-kernel/linux-headers )
+	udev? ( sys-kernel/linux-headers )
+"
+PDEPEND="
+	ibus? ( app-i18n/ibus )
+	wayland? ( =dev-qt/qtwayland-${QT5_PV}* )
+"
+
+QT5_TARGET_SUBDIRS=(
+	src/tools/qvkgen
+	src/gui
+	src/openglextensions
+	src/platformheaders
+	src/platformsupport
+	src/plugins/generic
+	src/plugins/imageformats
+	src/plugins/platforms
+	src/plugins/platforminputcontexts
+)
+
+QT5_GENTOO_CONFIG=(
+	accessibility:accessibility-atspi-bridge
+	egl:egl:
+	eglfs:eglfs:
+	eglfs:eglfs_egldevice:
+	eglfs:eglfs_gbm:
+	evdev:evdev:
+	evdev:mtdev:
+	:fontconfig:
+	:system-freetype:FREETYPE
+	!:no-freetype:
+	!gif:no-gif:
+	gles2-only::OPENGL_ES
+	gles2-only:opengles2:OPENGL_ES_2
+	!:no-gui:
+	:system-harfbuzz:
+	!:no-harfbuzz:
+	jpeg:system-jpeg:IMAGEFORMAT_JPEG
+	!jpeg:no-jpeg:
+	libinput
+	libinput:xkbcommon:
+	:opengl
+	png:png:
+	png:system-png:IMAGEFORMAT_PNG
+	!png:no-png:
+	tslib:tslib:
+	udev:libudev:
+	vulkan:vulkan:
+	X:xcb:
+	X:xcb-glx:
+	X:xcb-plugin:
+	X:xcb-render:
+	X:xcb-sm:
+	X:xcb-xlib:
+	X:xcb-xinput:
+)
+
+QT5_GENTOO_PRIVATE_CONFIG=(
+	:gui
+)
+
+PATCHES=(
+	"${FILESDIR}/qt-5.12-gcc-avx2.patch" # bug 672946
+	"${FILESDIR}/${PN}-5.14.1-cmake-macro-backward-compat.patch" # bug 703306
+)
+
+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
+		$(usev !gif -no-gif)
+		-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 4cbff204eae9..c628e50cbd1f 100644
--- a/dev-qt/qtnetwork/Manifest
+++ b/dev-qt/qtnetwork/Manifest
@@ -1,5 +1,7 @@
+DIST qtbase-5.15.2-38ad2f39.tar.gz 67969272 BLAKE2B 9071c96e8162d8141676f63aab82ca61ba29039e79066939fb74501187ae95cca34c924f1105827411f021efca2f40a62b7acde845d0d463604b234a3a8f8370 SHA512 df4f2dce732f62c797f77c266e268097f32a5d7605b3464c9a76d323d8ec069c902994df6afa28823d3c03f5d4ca0295cac47e28773b25e2f9387e3475f52f82
 DIST qtbase-5.15.2-7c6c0030.tar.gz 67967537 BLAKE2B 623b99942e9df9bc8ac436a21503060845f9e3532aa0e02ccd927762382be26091878fbe092e80c0ac68bead51d09647e40e0cf61361d62ad226ed46b221132b SHA512 eb88b21764591246c5f04f63405dbfcd39afb737e96bb29c7721644b9aba3ea95df24ed9699acfd03a8c088ee72efec1fb0267aef8d665d5ec72ee75fc08ecdc
 DIST qtbase-5.15.2-a4f9e569.tar.gz 67964648 BLAKE2B 2be7351221c46846ef37308a0238aa4a39369da63fe5c3be5e142ff700c80e125821c06b43c9e4e949bd9f285222a60888303aef956c9b427a9a6c8ee3bc6b1a SHA512 b4be8132a1d7119fd9728f7bf2d72cdd27d2092e7f178a1f15707204f5ffade7ce505c897fd658bb19274bdd6238b2eb16f7fcfedff2567877dc3458b4091388
 EBUILD qtnetwork-5.15.2-r11.ebuild 1661 BLAKE2B 72d1089771b6546c2425872e547420e7c4326af64b21f92b7008633fa36e7cbd0f064a339f486ad7ebcfefac76e136242273b9b902aacac92cd2fc1933a1af15 SHA512 e08756281594e069079dcb3fa2688c93a42a30f3efec0f7cfa1662edfc2bd5b444db75be2f47ac341192d44fef3610692eb76f2cbe048c2a2cb48756c52daa25
 EBUILD qtnetwork-5.15.2-r13.ebuild 1640 BLAKE2B 6bda08ead6e9a2a4db7c11934f414ca44fcf590f1dbaea4100f52d6ca1b4778cf0df392e03d15f3c23248dd5087a14b210f32ea4488a0372a0739c1f2917d972 SHA512 d7f1a7456a9259859d4177b90e1da469c55ef637f1ef51c89b6083b683c28092fc333ba6d6cd38a426a93fe1cea12f72a34d6bb555da83c8ac03c0e0e47eef36
+EBUILD qtnetwork-5.15.2-r14.ebuild 1646 BLAKE2B 0a7829d6604d07a63639bd78967759057014d590d5ce9d5d10e4db3fc7fa975bc17b85953833364e7d4507f3d96d67362d97639eb8d539862742bb3933a2c166 SHA512 bd6b77fee78a61ed9e0b25f7c8634e4d641e264d803f945dd1f9fac400f0a6b2b43130424b720f29399afcf752c0625827f7a42c2af99487646cc97e08feedd0
 MISC metadata.xml 958 BLAKE2B 7d9b64c45710ec4b80132463178d63563b09fdb7c79f527a84017faa524f6f45f5ff566abea92f8cee5f9c62c7d6bb505d3789520559fd3864f402c18c35f771 SHA512 11948c91b244c607f2cd84c8165db6794be18d0f465ae27ed02086fcc1f8b3755e451b8203f447a05f53437cb04c8e4859de8e077f85360fe87ce846939408c1
diff --git a/dev-qt/qtnetwork/qtnetwork-5.15.2-r14.ebuild b/dev-qt/qtnetwork/qtnetwork-5.15.2-r14.ebuild
new file mode 100644
index 000000000000..466b55f77a43
--- /dev/null
+++ b/dev-qt/qtnetwork/qtnetwork-5.15.2-r14.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+KDE_ORG_COMMIT=38ad2f39daec09168728033969265834b6a2d924
+QT5_MODULE="qtbase"
+inherit qt5-build
+
+DESCRIPTION="Network abstraction library for the Qt5 framework"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+fi
+
+IUSE="connman gssapi libproxy networkmanager sctp +ssl"
+
+DEPEND="
+	=dev-qt/qtcore-${QT5_PV}*:5=
+	sys-libs/zlib:=
+	connman? ( =dev-qt/qtdbus-${QT5_PV}* )
+	gssapi? ( virtual/krb5 )
+	libproxy? ( net-libs/libproxy )
+	networkmanager? ( =dev-qt/qtdbus-${QT5_PV}* )
+	sctp? ( kernel_linux? ( net-misc/lksctp-tools ) )
+	ssl? ( >=dev-libs/openssl-1.1.1:0= )
+"
+RDEPEND="${DEPEND}
+	connman? ( net-misc/connman )
+	networkmanager? ( net-misc/networkmanager )
+"
+
+QT5_TARGET_SUBDIRS=(
+	src/network
+	src/plugins/bearer/generic
+)
+
+QT5_GENTOO_CONFIG=(
+	libproxy:libproxy:
+	ssl::SSL
+	ssl::OPENSSL
+	ssl:openssl-linked:LINKED_OPENSSL
+)
+
+QT5_GENTOO_PRIVATE_CONFIG=(
+	:network
+)
+
+pkg_setup() {
+	use connman && QT5_TARGET_SUBDIRS+=(src/plugins/bearer/connman)
+	use networkmanager && QT5_TARGET_SUBDIRS+=(src/plugins/bearer/networkmanager)
+}
+
+src_configure() {
+	local myconf=(
+		$(usev connman -dbus-linked)
+		$(qt_use gssapi feature-gssapi)
+		$(qt_use libproxy)
+		$(usev networkmanager -dbus-linked)
+		$(qt_use sctp)
+		$(usev ssl -openssl-linked)
+	)
+	qt5-build_src_configure
+}
+
+src_install() {
+	qt5-build_src_install
+
+	# workaround for bug 652650
+	if use ssl; then
+		sed -e "/^#define QT_LINKED_OPENSSL/s/$/ true/" \
+			-i "${D}${QT5_HEADERDIR}"/Gentoo/${PN}-qconfig.h || die
+	fi
+}
diff --git a/dev-qt/qtsvg/Manifest b/dev-qt/qtsvg/Manifest
index e57a58030ecf..ad10098169f1 100644
--- a/dev-qt/qtsvg/Manifest
+++ b/dev-qt/qtsvg/Manifest
@@ -1,5 +1,5 @@
-DIST qtsvg-5.15.2-0cb681ea.tar.gz 2779754 BLAKE2B 80abdc1b9bd41bee97e8fbcb64927a8d1b42d7189d0a2f8754650383d9092be62c93eb084a59fa71e2a73f06a9eb69e09a52dc8b927e1715fcbe5f544c28726d SHA512 4e2472997b78ac7bfc586e6b89fb36f2f3771540c0740af9896dde95a2d52d5b52e589f1b65a9f9776a700a9072165b4b5313f901d22af81435d3d39c4fff283
 DIST qtsvg-5.15.2-24128cdf.tar.gz 2779708 BLAKE2B 5e52a0b1c7b3e21ab58b2e6e091c8fc85d5432e247313f74bd8c4d8899cd2634e3242d5d328174d3702544d050504dd3870c1c075a2b7a87c268c371c95b0c76 SHA512 c0840608ff66b0f335f8e5d883a5f8c113de91608ea8b613743c4881a103ff1c9981337c29a0e272ca2bccd4077df9cd8fde320e09eec1e8f6a3eead5cb75198
+DIST qtsvg-5.15.2-728012f7.tar.gz 2779740 BLAKE2B 6db82739d576dbb2d5958e48ee917dce9ce10fdf7af8b561f0c71ef3a90b97935e89f443ed1a95c827d85d87ffbb53595c27057f75bdac11939ba2bc9ef47f36 SHA512 ccf16606ff0abc9dce1279d58bd85489d0b1205da953842e12e8a9dad895c53a4420e4bd1aeafca1291f6721e2cc5c1a1178ad1d329832d21cc165646e8448d5
 EBUILD qtsvg-5.15.2-r11.ebuild 535 BLAKE2B abf9b0983cf4b988af93bdbfcf2630675f04399dab050d31b2e0efa4075f529ea6583d58304aa53e80f4efbdd4df9b5e20b97bdb3cbffb9d23d30081bcc17e8f SHA512 00a809f635a1ff84881f780dcc5d4dfcba1d90320a886f4c3928fd3f12a6e26d493fc45c66caaa261153e980c812da58774c7a032d11c4fcaea225428e3be1d5
-EBUILD qtsvg-5.15.2-r12.ebuild 541 BLAKE2B 92aedf0a4ca1bdef01cc1ade3e8d15c0a0f3f2b8a2246e3fa6e557299cdfbcbd375a2eafca1a8b306b131e752b8f13a3bea2b2f39008a6f5ac4cb92de0f55269 SHA512 fe183bb2e740251a9bfd9aa4e5e091fe53b409aee8be622d5c134657b16be8147d3c8a6ed07f3c28c7f91cce6531a3979144365058b2d9f42735527dabf0c093
+EBUILD qtsvg-5.15.2-r13.ebuild 541 BLAKE2B d910718ea476cc2cee47b96b0ca7e836eed57910f89ddfbf5125b29af17e61dd2694d5e8f6740919ebc1f791820641cbd5148720a4f1c40fea31d9aa4980d69a SHA512 0753d70c0000961d34235e3c524a48f7b7651bb27e9d02f51c121cf75ff1f4f812ff48b4f37d18812f43d26d753982128e624a14e2f181515e988ed9391adffb
 MISC metadata.xml 482 BLAKE2B 651a49dc4a07f5e5a9c21990868e666d98acdea7d7b0b2c0e4c98eafc3da72c803d380e4abda30f33250f7bbd7654df713833ccdddcb975cbad6f92e488f643b SHA512 192c670abd7da29645513bf1d9297d942efdc49f5cf170861e7689fda47f51daa47f10c7c81c3b045366e0259179c6839ff7747197c9d792e8d0fd1a5818973e
diff --git a/dev-qt/qtsvg/qtsvg-5.15.2-r12.ebuild b/dev-qt/qtsvg/qtsvg-5.15.2-r13.ebuild
index b9bd656a8e8f..9c6578062f69 100644
--- a/dev-qt/qtsvg/qtsvg-5.15.2-r12.ebuild
+++ b/dev-qt/qtsvg/qtsvg-5.15.2-r13.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-KDE_ORG_COMMIT=0cb681eacca0f757702fa409bb05d3d3650aba4e
+KDE_ORG_COMMIT=728012f7762ecd5762d493f8796907c6456f31e7
 inherit qt5-build
 
 DESCRIPTION="SVG rendering library for the Qt5 framework"
diff --git a/dev-qt/qtwayland/Manifest b/dev-qt/qtwayland/Manifest
index 7f206b3bd4d8..1f0959026812 100644
--- a/dev-qt/qtwayland/Manifest
+++ b/dev-qt/qtwayland/Manifest
@@ -1,4 +1,6 @@
 AUX qtwayland-5.15.2-fix-crash-when-iterating-through-outputs.patch 1471 BLAKE2B d1f46af1c39967a04f10f887dc02c055fff30e8e88349ec1a009090df8ce27899c8c08e1c9cbb4584fb0861e734f4e3ae74ad994f8d902de4bd2dcc6523ec765 SHA512 1c231dd3b86e75e92ae488a176ae8c0317b9e889dc2a21c239a97823ca4eb8deab6a0e6c4011050d8a01f5414b2c70e962de9b974a05ffe96e8dd44630fd9fea
+DIST qtwayland-5.15.2-867540b9.tar.gz 830061 BLAKE2B b831288d6a3e671631b4df00eb1edb72e35128f3ed5a73983b3e15193f554fddcd0337deb832d44b795d2e37f0601fe35b8b0fcb5986bcc44154d172f3a54193 SHA512 b834802811d9f65559ef5e7468189b53c666e390aa09edeb490e5fee2dece13082b11da0f8b5924b89f7dc8e1eba375a485940f4dfbf0445f3d1e96033e33f24
 DIST qtwayland-5.15.2-eb422ab5.tar.gz 829140 BLAKE2B e913e481741b23873a88db32896c7f3445a2ddee2dc9cfdf8e132fdd79021de369506e32ce9ed50977fb1c42d624169b7d67c9247f7609276e699e5ab3a9462e SHA512 b5094b00feab5909b4de6382a3633fc321d5f5fbc34e4cbde1f364123b24990df95cef5c34a90f73dca67b0578e0da71b894f771ebbd8d152dcdc71b114d9773
 EBUILD qtwayland-5.15.2-r16.ebuild 1051 BLAKE2B c55f2cecbb7b982b335c4faab58b08de69c52f72516da981c72dae5f6dbe8c7bb75623161b223670022fd323ff3ef9f7c4d85246a7940bb30b2835534cca2099 SHA512 a245da56e2acd5a90dd5c820f50e3676c90bb38a46de9caafe24138e031b796264944f0f0241bab744b6f33535a5b49d840d8bbc54109159cc59a8d1bfcebe8b
+EBUILD qtwayland-5.15.2-r17.ebuild 960 BLAKE2B 940c976529f89627d69e6d580539df17584d4696d933f503db9c0d0e99603a2e69cd695fe97a6cfa03de95290a563d1b17624b946088782ff24faed9cb676d80 SHA512 489ae7eb3b6754eb3f86e4fca9bd23ebb6f3ce8bbc3f9d1dd42c40bd81e1ffdb87ff69ddb42ceebaa3121816dfeda7b7976c47ffaa1823717cdfe3f9645e77fe
 MISC metadata.xml 584 BLAKE2B ad42909b120209835e121a29de558d338bae4348eb55e69a94e8ac8b54f26564df0a750839bef9418ae8056a0d24f234615247a610b8287f5b0fbffbc60193f2 SHA512 86fd81d63b19fc6e95bdcb92e9da9b03861248a4e78e9de36aca6996e61644ab8bce7a60ca22ee7ad86fefc9b407a1fd0136240b8fdfa3c40a149444ab1dcbe2
diff --git a/dev-qt/qtwayland/qtwayland-5.15.2-r17.ebuild b/dev-qt/qtwayland/qtwayland-5.15.2-r17.ebuild
new file mode 100644
index 000000000000..658532095a0c
--- /dev/null
+++ b/dev-qt/qtwayland/qtwayland-5.15.2-r17.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+KDE_ORG_COMMIT=867540b9d913760a847ff67c8694d817c821f2c2
+inherit qt5-build
+
+DESCRIPTION="Wayland platform plugin for Qt"
+SLOT=5/${QT5_PV} # bug 815646
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+fi
+
+IUSE="vulkan X"
+
+DEPEND="
+	dev-libs/wayland
+	=dev-qt/qtcore-${QT5_PV}*:5=
+	=dev-qt/qtdeclarative-${QT5_PV}*:5=
+	=dev-qt/qtgui-${QT5_PV}*:5=[egl,libinput,vulkan=,X?]
+	media-libs/libglvnd
+	vulkan? ( dev-util/vulkan-headers )
+	X? (
+		=dev-qt/qtgui-${QT5_PV}*[-gles2-only]
+		x11-libs/libX11
+		x11-libs/libXcomposite
+	)
+"
+RDEPEND="${DEPEND}"
+BDEPEND="
+	dev-util/wayland-scanner
+"
+
+src_configure() {
+	local myqmakeargs=(
+		--
+		$(qt_use vulkan feature-wayland-vulkan-server-buffer)
+		$(qt_use X feature-xcomposite-egl)
+		$(qt_use X feature-xcomposite-glx)
+	)
+	qt5-build_src_configure
+}