gentoo resync : 03.11.2021

5 files changed, 2 insertions, 86 deletions

diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz
index 02f3d1cec0d1..d24c98efbd91 100644
--- a/app-crypt/Manifest.gz
+++ b/app-crypt/Manifest.gz
diff --git a/app-crypt/minisign/Manifest b/app-crypt/minisign/Manifest
index 4444cf5cc84c..2e95df34c6f4 100644
--- a/app-crypt/minisign/Manifest
+++ b/app-crypt/minisign/Manifest
@@ -1,6 +1,6 @@
 DIST minisign-0.10.tar.gz 18242 BLAKE2B 8b71f01ced4be00c38937e7db5ace2c7e348410a9381f6cc27374827fa0a9da70cca96153af199880ccd5f2265e18a7f21d074f877e0e21ca797bbba2bf5cbf5 SHA512 6a38500ed896c17b100bca47443f9806debe6e44d3ce09189f5f8913a41d4913434397175d1caa770fb0cc0918078dfc71c01b82b9bf919fdfba00434f4ce100
 DIST minisign-0.9.tar.gz 15664 BLAKE2B f9f358a27b069e752894326932a8c5c51f308ade49ed7088a5f693b4e8327639fc5578607f348994a7ab7484091ed93190894c1965cadbbbf2a27e939ccc117b SHA512 7970f3e72ff759f3f02416de5d6035e1c8dd4e92ea718083cc5091c7e2355b59c4e178c60ca934985ba1e1afcd970967d4fb39a434ba54b140f3fc9be661253d
 EBUILD minisign-0.10.ebuild 733 BLAKE2B 5964c8b791b2aef2ab987f43e90228ecaf13fe43006e06b5e2b855f5aea2db6b1418f3f907cc2e7304757d0811eacded3fc8a51882deebfca6f3878d97b04e68 SHA512 f54b9f43eca688a7ded56ff9223d9d9751dccc5e228e2b9fccdff6d9319f87b610893ec9e93c84ce0e5649bac0cce0cb511b5b2263fba75593057a1993650ed6
-EBUILD minisign-0.9.ebuild 725 BLAKE2B 798e077e132d183b8d40828c4c8d0b3f938fca4bba0e15eda0d91d6a6079feaba8776773fa4ef0f97949bf441156967484bed025abc0db8ce571f196472b915c SHA512 b165c58b237545ffa24aa670bb604b1bec3590543872611671c2a087af0b7045b264ac476eaea9a9ae47b82009b56eae5512e6f5fa0b7c410f9573fe22e1d6be
+EBUILD minisign-0.9.ebuild 724 BLAKE2B 78273548aaba81f4221fe6d525775481ef8b912d42cbea54d42cfa544ffacd33d448671667e4ad65dc3e6eb8aa8f79f5bf94bcaeb8a68d7b2f9936b48b422bd4 SHA512 eba83e8eded368671613f9a4c32eec752b82972baf6bd892f5f5849ae6d0b4fcb7a6321d6d004fea0fab9bb8339e4dcef63e099dc170ba32cb8a92b9c9622e35
 EBUILD minisign-9999.ebuild 733 BLAKE2B 5964c8b791b2aef2ab987f43e90228ecaf13fe43006e06b5e2b855f5aea2db6b1418f3f907cc2e7304757d0811eacded3fc8a51882deebfca6f3878d97b04e68 SHA512 f54b9f43eca688a7ded56ff9223d9d9751dccc5e228e2b9fccdff6d9319f87b610893ec9e93c84ce0e5649bac0cce0cb511b5b2263fba75593057a1993650ed6
 MISC metadata.xml 682 BLAKE2B a3a405073dbad7ea7c570ae8eccef230b2f3baf389d0210e6ba1afb57e0b3504172225b1cb3a957812ed08bf2b8080b1b4dcb13ab982eccc8bdc15377a90cffa SHA512 8e88cae8452b76db2c57e86f6c50a5859964cb3e7e3f6a574990fbebd74d512a57015ed53c966ca714c7545d43160412c8aca9e954180333c6ecce81df8c4b51
diff --git a/app-crypt/minisign/minisign-0.9.ebuild b/app-crypt/minisign/minisign-0.9.ebuild
index 5760d2c7b88e..19f80e60bbd4 100644
--- a/app-crypt/minisign/minisign-0.9.ebuild
+++ b/app-crypt/minisign/minisign-0.9.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == "9999" ]]; then
 	EGIT_REPO_URI="https://github.com/jedisct1/${PN}.git"
 else
 	SRC_URI="https://github.com/jedisct1/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 fi
 
 LICENSE="ISC"
diff --git a/app-crypt/qca/Manifest b/app-crypt/qca/Manifest
index b38b1e5ddc34..507786b2d7e8 100644
--- a/app-crypt/qca/Manifest
+++ b/app-crypt/qca/Manifest
@@ -1,6 +1,4 @@
 AUX qca-disable-pgp-test.patch 446 BLAKE2B a98d5951d7b89c65787d7d586a5504949c51271ebe09c5e19b90a2e24f24fb6d03d6c1f76d7ad4234354bc2507cf7031c716b3b2bf8243b8c1d85065079dded4 SHA512 30bb6d31b9392166d6bbae39da2eeb1788ac9cccffb801b074468a3606a6e1a56d6a41ee276d3b8b8d39112bf6aea7025f07f4810bb835102bd00521ee9eb104
-DIST qca-2.3.3.tar.xz 736456 BLAKE2B f0812fd33bd19293c8034e48bcf214d2d70dc1397860779c2c145fe841365384a8eb6bad9859520d32104010acb0cefb97e3a974b9852a37ca8039d52d9dbd03 SHA512 9a262350502daa1dd10802a7a24f0e4712d87d4ddcf752452a51caa8694a30835672f54f8e600aa8dc4afdac9ef073641deed52a24423e304d18ad2b83deeca6
 DIST qca-2.3.4.tar.xz 737072 BLAKE2B 64e698135f02bf115269203d44a53d40449be1620487340551c1e45f66f042132beb2cfa2363d1249f92de3ffd670f1807219cb3ce3d6e7c05afd8c22242b703 SHA512 af27338b5c018d39c8c745b63691dec3914e29ff79347ab338f4391ee1dc9832d158b222bc9ef6c7681cf4b2893a38829a4daadf1d53622d6947de2efeb880a8
-EBUILD qca-2.3.3.ebuild 1854 BLAKE2B 080d8e3610ce39fa9b8cda3108059b55fc2f6eae2e068b286b7281d21406b401b03dab0eed05db163f7dc11fdf4904f9968d2f8de5412f1005ec724f62d04eb8 SHA512 4afc045a2f21942c51e89efa0c459284d33460e06a09972bcd38e86608a57d28ac558a2c88fb8cc90b39d4eac3999ecc3b828b9858691aea090baa474d4b6767
 EBUILD qca-2.3.4.ebuild 1853 BLAKE2B 37ad07793ee537d3f28e3a67d4e6c07cb0f87e84358e868acea86975825bf2228810679009dd5df62ca066f4b3ad6775bde949261628690a1eb85fa2c515dc9c SHA512 f5276260db5db6e80e2629e7f4f573d1e6e46dcebd9b1c8c0a65d8e950c1ab46078a09bf8d369814115764cd4ca85047cc0907238dbffe5a4066a35893a28136
 MISC metadata.xml 832 BLAKE2B 9044b545fa732c5f86c7dbb026630b4946a538ba77369eae28e894bf636ca60f6a31d7aad258fa19aee4c433d6d5a8e2a34a7c2850eef3a40d44261e592032b0 SHA512 b01bfe83343fdc265abc25922300cdc67f556a9a6f6db16918b0b3ee44c4e83db524695c5cb8952278f3e1f2e5d60a49bcc9312b35ab95f0ecc42e03764fb6bd
diff --git a/app-crypt/qca/qca-2.3.3.ebuild b/app-crypt/qca/qca-2.3.3.ebuild
deleted file mode 100644
index 128911e0db60..000000000000
--- a/app-crypt/qca/qca-2.3.3.ebuild
+++ /dev/null
@@ -1,82 +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 ~riscv ~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 )"
-
-RDEPEND="
-	>=dev-qt/qtcore-5.14: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
-	)
-"
-BDEPEND="doc? ( app-doc/doxygen )"
-
-PATCHES=( "${FILESDIR}/${PN}-disable-pgp-test.patch" )
-
-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
-}