gentoo resync : 29.01.2021

3 files changed, 37 insertions, 3 deletions

diff --git a/app-crypt/qca/Manifest b/app-crypt/qca/Manifest
index 306adb379d94..e5b534205ea5 100644
--- a/app-crypt/qca/Manifest
+++ b/app-crypt/qca/Manifest
@@ -1,4 +1,5 @@
+AUX qca-2.3.1-gcc11.patch 634 BLAKE2B 1bf5bc7404629800ddf120e902fa53c1a5b40afeb0dbc6565eb4249675beb71da52f9cec379c747ecb78c5e1b35113b874c6d31b2f22e97df7de1887956262a8 SHA512 3fb59a882df92f35b77b86892f913cc709cfb8b2d0f9d0002867517e2c8d3b9d5fa04e9eece44b83a8121329ecf3b9be926e75f51be9e66c1cfed80f9e1a4c83
 AUX qca-disable-pgp-test.patch 446 BLAKE2B a98d5951d7b89c65787d7d586a5504949c51271ebe09c5e19b90a2e24f24fb6d03d6c1f76d7ad4234354bc2507cf7031c716b3b2bf8243b8c1d85065079dded4 SHA512 30bb6d31b9392166d6bbae39da2eeb1788ac9cccffb801b074468a3606a6e1a56d6a41ee276d3b8b8d39112bf6aea7025f07f4810bb835102bd00521ee9eb104
 DIST qca-2.3.1.tar.xz 725984 BLAKE2B a99121dd95822ef5e1057dc9ad9250bb14486f42b0571936453644bc7c5649f16cbc918fa04d4a5af2c62bc35cc672159a84e27a86e685cfe320518a42076052 SHA512 092704a8d7c5973f05c82584ea55b4f8f874965aea943277e50fde873913a9bdad6a51ea74fc0036bbb632a13141cb4c030504229c06779890286205929f6021
-EBUILD qca-2.3.1.ebuild 1843 BLAKE2B 36af2fd6df968e9bbfe1d29ef496e2db1248b6b1a4cf3d2e3fe71de6c2d8e7ab3f0ae520a370b672a80797504fe47d3044b2b683eda76848ddcf3fd69f9d8a08 SHA512 c17288cb2b6c9e6328255cc3aaea39a3bf17569753a966d7be30d248e26ee3300e5954d0c768cad10ab5f0b5b50b62f96ad6a4519dd0c1e143afc6803ad82f01
+EBUILD qca-2.3.1.ebuild 1889 BLAKE2B a3f974d1dfbaf491f215819ff0c82b1c88a3d8945bd5445982cfc8b72f6a9f71a683162004b638f1372b60c58953d61075bdc2300369eb9bc53e615b78e3dec8 SHA512 d4753b751dab9a281d1d33caefc29415f14380145e9026fb76fa31979874cf80c9ca1925e8233beb6f703753ae96aa328b22e2ad3859127f4e5995ae3cc5914c
 MISC metadata.xml 745 BLAKE2B ff8e25b082d3c642fce099df1a218a4936bdc862a96fd237303d040c477544cf6368d23cc5de414d95f021e9c6ec475879225ab201f7c6d6711c04153ac53140 SHA512 6b82494b8dfe0d36da9818a6dcf775252dbb7051430232ccc2519c449cc2877da6478ca98f5b7a982a7660a869a0b8ae7a814fb18108ff42fed9712a9253e867
diff --git a/app-crypt/qca/files/qca-2.3.1-gcc11.patch b/app-crypt/qca/files/qca-2.3.1-gcc11.patch
new file mode 100644
index 000000000000..cd4eaab86880
--- /dev/null
+++ b/app-crypt/qca/files/qca-2.3.1-gcc11.patch
@@ -0,0 +1,30 @@
+From f015cc64889035c084138864e2e030ece19c257b Mon Sep 17 00:00:00 2001
+From: Jeff Law <law@redhat.com>
+Date: Dec 04 2020 03:55:48 +0000
+Subject: Fix missing includes for gcc-11
+
+
+diff --git a/src/qca_cert.cpp b/src/qca_cert.cpp
+index 5e73d98..225aecd 100644
+--- a/src/qca_cert.cpp
++++ b/src/qca_cert.cpp
+@@ -19,6 +19,7 @@
+  *
+  */
+ 
++#include <memory>
+ #include "qca_cert.h"
+ 
+ #include "qca_publickey.h"
+diff --git a/src/qca_default.cpp b/src/qca_default.cpp
+index fd35702..db87e87 100644
+--- a/src/qca_default.cpp
++++ b/src/qca_default.cpp
+@@ -19,6 +19,7 @@
+  *
+  */
+ 
++#include <memory>
+ #include "qca_core.h"
+ 
+ #include <QMutex>
diff --git a/app-crypt/qca/qca-2.3.1.ebuild b/app-crypt/qca/qca-2.3.1.ebuild
index b954f235e01f..4414a43132be 100644
--- a/app-crypt/qca/qca-2.3.1.ebuild
+++ b/app-crypt/qca/qca-2.3.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -39,7 +39,10 @@ DEPEND="${RDEPEND}
 	)
 "
 
-PATCHES=( "${FILESDIR}/${PN}-disable-pgp-test.patch" )
+PATCHES=(
+	"${FILESDIR}/${PN}-disable-pgp-test.patch"
+	"${FILESDIR}/${P}-gcc11.patch" # bug 764047
+)
 
 qca_plugin_use() {
 	echo -DWITH_${2:-$1}_PLUGIN=$(usex "$1")