gentoo resync : 26.08.2021

4 files changed, 104 insertions, 0 deletions

diff --git a/dev-qt/qtconcurrent/Manifest b/dev-qt/qtconcurrent/Manifest
index af445dc58de9..7788f4ae1d8d 100644
--- a/dev-qt/qtconcurrent/Manifest
+++ b/dev-qt/qtconcurrent/Manifest
@@ -1,4 +1,8 @@
+AUX qtconcurrent-5.15.2-gcc11.patch 1709 BLAKE2B ee8a0a0a591fcbd242406bc37a5b29959d4a82cba78dd5650b60e0526316a1ac511c2f4e053db29d365394f38cf481772e659f194576f58aa2cb4d50ba240c51 SHA512 895c35ee745ff34cc939463c1d0b433d4bcf53c78af3b6c14304608ff282cb77ef292c63a1368885c7b3db5ec7c4acbff1827a014f08a768fdc50fc87dc64222
+DIST qtbase-5.15.2-c2ea67ec.tar.gz 67964503 BLAKE2B 2f55d1913d840a9150912074e81b7ebc38d86dbe259a51f65924868d97ed0cd5852fd6387e85933e956b0bd80404284b9e0f01506080f154751c0e1cf27ba398 SHA512 40eeaca1698613ab0c756053b58737cbef9fceed7cf7007aec5b558f992675a25d304ec83afdc7eab34bb854149d4e0ce61f2cc03003b553b4fc8a786f258e17
 DIST qtbase-5.15.2-gcc11.patch.xz 1208 BLAKE2B a2e5764b723adda991eca5b84cf8e15437a4832febd12e3c93cdc394931af666e17c01e229e9be7e0efc446a955cc26388c0f93cadfcabd93cc6b6f03bb41eb0 SHA512 da3a41ea5d9573a029946d26b26d51d6dce9c8b91db6d78ca71d8343d3ceb5010d21750dcb45abb663e227b5f068985ff4ed51da07efd17c64cc8dd5aef8f3e4
 DIST qtbase-everywhere-src-5.15.2.tar.xz 50179672 BLAKE2B 0e4bdaab43cf59664bde89f87ea260c39acc2ef866d8629d41d9c326cab0ab68bcd943c86a472ae74bc9fb0b7ad50795ccb66275bb6b77d1fcf0a38b5662cb42 SHA512 a549bfaf867d746ff744ab224eb65ac1bdcdac7e8457dfa379941b2b225a90442fcfc1e1175b9afb1f169468f8130b7ab917c67be67156520a4bfb5c92d304f9
+EBUILD qtconcurrent-5.15.2-r1.ebuild 640 BLAKE2B 6b92535edb473b634658302c1863569c147b9271e016a77c88bed6bec845612f520fb68f426476600e3473ff66c87ffb1420015aba12ccb606d8dd330639022a SHA512 01ad79d9fd101c42eba17851270ef6058f167204e515016b47bbf8001fffce94c23ee909c496ac73d5d38c0a71ac03c1ccf0dc006082516114343164b4e2d2bb
+EBUILD qtconcurrent-5.15.2-r10.ebuild 510 BLAKE2B 0fcb89440457be88a2b74faa4c2cbd73f7ee772bcbf6b6bf940b74f7ed62989a1e312271af795e6cee8098123acfe2e8b2fc8ca48452a6113e1a11cb3583c4f4 SHA512 8855c7b09da4234e02359b515f0cde02917d8482257c1883b22a6e4407e7fc82dfd762815f9579b6ba3e2322f33758c47f0f9f2bb7f1eb1b7581fcddd1067105
 EBUILD qtconcurrent-5.15.2.ebuild 593 BLAKE2B 44f6a1c8dac390908bb2d5d8f9ffaabd96333ffc07a680ec4ae65a0d4ddd737c24eb376d99afb9cffef954d7b0daa2fa4436c80ea839a43db71f4fc6edf30f7e SHA512 abca397ab254a2d3fcecf6d7ba04814f15184a1589c3fa2e26c8c4bb2fa965f2b9437ad2a0874fea44ea97490320e8589f596b26c91a0af17a10cbd30f16b296
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qtconcurrent/files/qtconcurrent-5.15.2-gcc11.patch b/dev-qt/qtconcurrent/files/qtconcurrent-5.15.2-gcc11.patch
new file mode 100644
index 000000000000..b27ac767b064
--- /dev/null
+++ b/dev-qt/qtconcurrent/files/qtconcurrent-5.15.2-gcc11.patch
@@ -0,0 +1,45 @@
+https://bugs.gentoo.org/764977
+https://invent.kde.org/qt/qt/qtbase/-/commit/c9543da6998b0827fb75ffe22327c99e2da7d364
+
+From c9543da6998b0827fb75ffe22327c99e2da7d364 Mon Sep 17 00:00:00 2001
+From: Sona Kurazyan <sona.kurazyan@qt.io>
+Date: Wed, 17 Mar 2021 16:04:00 +0100
+Subject: [PATCH] Remove the unnecessary template parameter from the class
+ specialization
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+This seems to cause errors when compiling with gcc-11. Although this is
+most likely a compiler bug, specifiying the template parameter type in
+this case isn't necessary.
+
+Fixes: QTBUG-91909
+Fixes: QTBUG-90568
+Change-Id: Ib231257ccb2e16cc533f23ca5840d31e26a66d53
+Reviewed-by: MÃ¥rten Nordheim <marten.nordheim@qt.io>
+(cherry picked from commit 659f7a06e91c04b239e3f4c0bcfccbe3581af1c3)
+Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
+(cherry picked from commit 049e14870c13235cd066758f29c42dc96c1ccdf8)
+---
+ src/concurrent/qtconcurrentthreadengine.h | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/concurrent/qtconcurrentthreadengine.h b/src/concurrent/qtconcurrentthreadengine.h
+index af413707e4..a4c8548cc4 100644
+--- a/src/concurrent/qtconcurrentthreadengine.h
++++ b/src/concurrent/qtconcurrentthreadengine.h
+@@ -247,8 +247,8 @@ template <>
+ class ThreadEngineStarter<void> : public ThreadEngineStarterBase<void>
+ {
+ public:
+-    ThreadEngineStarter<void>(ThreadEngine<void> *_threadEngine)
+-    :ThreadEngineStarterBase<void>(_threadEngine) {}
++    ThreadEngineStarter(ThreadEngine<void> *_threadEngine)
++        : ThreadEngineStarterBase<void>(_threadEngine) {}
+ 
+     void startBlocking()
+     {
+-- 
+GitLab
+
diff --git a/dev-qt/qtconcurrent/qtconcurrent-5.15.2-r1.ebuild b/dev-qt/qtconcurrent/qtconcurrent-5.15.2-r1.ebuild
new file mode 100644
index 000000000000..f0ecb6cd1f63
--- /dev/null
+++ b/dev-qt/qtconcurrent/qtconcurrent-5.15.2-r1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+QT5_MODULE="qtbase"
+inherit qt5-build
+
+DESCRIPTION="Multi-threading concurrence support library for the Qt5 framework"
+SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/qtbase-${PV}-gcc11.patch.xz"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86"
+fi
+
+IUSE=""
+
+DEPEND="
+	~dev-qt/qtcore-${PV}:5=
+"
+RDEPEND="${DEPEND}"
+
+QT5_TARGET_SUBDIRS=(
+	src/concurrent
+)
+
+PATCHES=(
+	"${WORKDIR}"/qtbase-${PV}-gcc11.patch # bug 752012
+	"${FILESDIR}"/${P}-gcc11.patch # bug #764977
+)
diff --git a/dev-qt/qtconcurrent/qtconcurrent-5.15.2-r10.ebuild b/dev-qt/qtconcurrent/qtconcurrent-5.15.2-r10.ebuild
new file mode 100644
index 000000000000..1cff28e1874a
--- /dev/null
+++ b/dev-qt/qtconcurrent/qtconcurrent-5.15.2-r10.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+KDE_ORG_COMMIT=c2ea67ecefe049f6e9bb8f910d7f9c60319d8619
+QT5_MODULE="qtbase"
+inherit qt5-build
+
+DESCRIPTION="Multi-threading concurrence support library for the Qt5 framework"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+fi
+
+IUSE=""
+
+DEPEND="
+	~dev-qt/qtcore-${PV}:5=
+"
+RDEPEND="${DEPEND}"
+
+QT5_TARGET_SUBDIRS=(
+	src/concurrent
+)