gentoo resync : 28.04.2021

4 files changed, 2 insertions, 122 deletions

diff --git a/app-crypt/qca/Manifest b/app-crypt/qca/Manifest
index d84734e30259..56785c94989d 100644
--- a/app-crypt/qca/Manifest
+++ b/app-crypt/qca/Manifest
@@ -1,9 +1,6 @@
-AUX qca-2.3.1-gcc11.patch 634 BLAKE2B 1bf5bc7404629800ddf120e902fa53c1a5b40afeb0dbc6565eb4249675beb71da52f9cec379c747ecb78c5e1b35113b874c6d31b2f22e97df7de1887956262a8 SHA512 3fb59a882df92f35b77b86892f913cc709cfb8b2d0f9d0002867517e2c8d3b9d5fa04e9eece44b83a8121329ecf3b9be926e75f51be9e66c1cfed80f9e1a4c83
 AUX qca-2.3.2-cmsut-signverify_message_invalid-fails-randomly.patch 1195 BLAKE2B 87f2a73355ccd147db01de639ba9211c3d6169d3fff4f16c52ef4a76e61be47a8769baaa5898265941d3f49bcc9a79579d4150b6d4091aa1414494fcc94bca43 SHA512 65e7925811123da0c886a0a1706f590efce3fe3e969566e3c8446b5fd70498c0603812ae413739d6e7f8c05349af5b2a51af9d72d9b2e28cfcb11980c1cf6704
 AUX qca-2.3.2-openssl-1.1.1i-empty-msg-verification.patch 1816 BLAKE2B 80dfcff3a0fc5121cbbe956fe847fb6141a778b0c3e479fefc9c0f26b727bdf7957576f32f38324ac5c465d69f4f19d48a5951daa50ae6a613eeaf6aa5d67d97 SHA512 eda5ec8abba1c4d7f8c455ed65c0a865926a74a909897c01c08d08b33f7033b8de7c8aa91adc6497518936a97cc4d7372947eafea2e67617275611a16d89c8d4
 AUX qca-disable-pgp-test.patch 446 BLAKE2B a98d5951d7b89c65787d7d586a5504949c51271ebe09c5e19b90a2e24f24fb6d03d6c1f76d7ad4234354bc2507cf7031c716b3b2bf8243b8c1d85065079dded4 SHA512 30bb6d31b9392166d6bbae39da2eeb1788ac9cccffb801b074468a3606a6e1a56d6a41ee276d3b8b8d39112bf6aea7025f07f4810bb835102bd00521ee9eb104
-DIST qca-2.3.1.tar.xz 725984 BLAKE2B a99121dd95822ef5e1057dc9ad9250bb14486f42b0571936453644bc7c5649f16cbc918fa04d4a5af2c62bc35cc672159a84e27a86e685cfe320518a42076052 SHA512 092704a8d7c5973f05c82584ea55b4f8f874965aea943277e50fde873913a9bdad6a51ea74fc0036bbb632a13141cb4c030504229c06779890286205929f6021
 DIST qca-2.3.2.tar.xz 735500 BLAKE2B 559b27c48c756f2b4f4f206d2157c90ae4856610f1539b4162a2bffe7fffe19b5c768d3d3f9d0486d2098fb403eb64372515815f49fd428d22dfc0405d99e435 SHA512 da6415a097c99b878f45730c1dd1e0bfc7f96858ad7018918ac7c2ae2eca830cb73e131173b1018ee4caa6c3a504b80c8ad28f8f9448c2fd1593161c2ac8aad4
-EBUILD qca-2.3.1.ebuild 1889 BLAKE2B a3f974d1dfbaf491f215819ff0c82b1c88a3d8945bd5445982cfc8b72f6a9f71a683162004b638f1372b60c58953d61075bdc2300369eb9bc53e615b78e3dec8 SHA512 d4753b751dab9a281d1d33caefc29415f14380145e9026fb76fa31979874cf80c9ca1925e8233beb6f703753ae96aa328b22e2ad3859127f4e5995ae3cc5914c
-EBUILD qca-2.3.2.ebuild 1998 BLAKE2B 6c37a17b1cf25a50d63cd97b36fc14d4ffffb6674512b889db56ce27aca1fb593eaaa75bee1c362e3e9377699b6cb9d06ed3d01b242c70841b47bc78301cc642 SHA512 d1af7d62c9af880f21ad5cc148083836d08856429ba4088b0b84a78abdf8717e14333e745a39877d9963ef227c60e216cf85a0d7af15f3acd9304808cdb7ade7
+EBUILD qca-2.3.2.ebuild 1995 BLAKE2B f054015be5f10231bd5c491412d2abb0b9ad1c94158e88cfd8bd6db6ef6128428822c03af21c189f1df04cfa8833d331a8174fa9804c1b0b560d3d0b6e77d92d SHA512 ae7417c07673b4755651236964ceea2d5bc4ef69ad1ff78affbeaabb357caaafb0f4400ea41ed428de380111760ab46e0611e852e883406862cd878fb77c3f10
 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
deleted file mode 100644
index cd4eaab86880..000000000000
--- a/app-crypt/qca/files/qca-2.3.1-gcc11.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-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
deleted file mode 100644
index 4414a43132be..000000000000
--- a/app-crypt/qca/qca-2.3.1.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kde.org cmake qmake-utils
-
-DESCRIPTION="Qt Cryptographic Architecture (QCA)"
-HOMEPAGE="https://userbase.kde.org/QCA"
-SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
-
-LICENSE="LGPL-2.1"
-SLOT="2"
-KEYWORDS="amd64 ~arm arm64 ~hppa ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
-IUSE="botan debug doc examples gcrypt gpg logger nss pkcs11 sasl softstore +ssl test"
-
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	doc? ( app-doc/doxygen )
-"
-RDEPEND="
-	dev-qt/qtcore:5
-	botan? ( dev-libs/botan:= )
-	gcrypt? ( dev-libs/libgcrypt:= )
-	gpg? ( app-crypt/gnupg )
-	nss? ( dev-libs/nss )
-	pkcs11? (
-		>=dev-libs/openssl-1.1
-		dev-libs/pkcs11-helper
-	)
-	sasl? ( dev-libs/cyrus-sasl:2 )
-	ssl? ( >=dev-libs/openssl-1.1:0= )
-"
-DEPEND="${RDEPEND}
-	test? (
-		dev-qt/qtnetwork:5
-		dev-qt/qttest:5
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-disable-pgp-test.patch"
-	"${FILESDIR}/${P}-gcc11.patch" # bug 764047
-)
-
-qca_plugin_use() {
-	echo -DWITH_${2:-$1}_PLUGIN=$(usex "$1")
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DQCA_FEATURE_INSTALL_DIR="${EPREFIX}$(qt5_get_mkspecsdir)/features"
-		-DQCA_PLUGINS_INSTALL_DIR="${EPREFIX}$(qt5_get_plugindir)"
-		$(qca_plugin_use botan)
-		$(qca_plugin_use gcrypt)
-		$(qca_plugin_use gpg gnupg)
-		$(qca_plugin_use logger)
-		$(qca_plugin_use nss)
-		$(qca_plugin_use pkcs11)
-		$(qca_plugin_use sasl cyrus-sasl)
-		$(qca_plugin_use softstore)
-		$(qca_plugin_use ssl ossl)
-		-DBUILD_TESTS=$(usex test)
-	)
-	cmake_src_configure
-}
-
-src_test() {
-	local -x QCA_PLUGIN_PATH="${BUILD_DIR}/lib/qca"
-	cmake_src_test
-}
-
-src_install() {
-	cmake_src_install
-
-	if use doc; then
-		pushd "${BUILD_DIR}" >/dev/null || die
-		doxygen Doxyfile || die
-		dodoc -r apidocs/html
-		popd >/dev/null || die
-	fi
-
-	if use examples; then
-		dodoc -r "${S}"/examples
-	fi
-}
diff --git a/app-crypt/qca/qca-2.3.2.ebuild b/app-crypt/qca/qca-2.3.2.ebuild
index 2d0ade08ff78..8d66157373c0 100644
--- a/app-crypt/qca/qca-2.3.2.ebuild
+++ b/app-crypt/qca/qca-2.3.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
 
 LICENSE="LGPL-2.1"
 SLOT="2"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
+KEYWORDS="amd64 ~arm arm64 ~hppa ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
 IUSE="botan debug doc examples gcrypt gpg logger nss pkcs11 sasl softstore +ssl test"
 
 RESTRICT="!test? ( test )"