gentoo Easter resync : 12.04.2020

3 files changed, 2 insertions, 88 deletions

diff --git a/app-crypt/qca/Manifest b/app-crypt/qca/Manifest
index 24a6a15bb8cc..24395343234d 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.2.1.tar.xz 691676 BLAKE2B d5bcc0d6e791811e1efcdbf2e09916fe40ad682b0e59b2993c73a5bd79e09fc28facdec81259a982bee05223c8dfce78b9a6b729ca4e566c0901a13b91575379 SHA512 3a0e8aa7cf3ea9a7244facaf1d521ebca2753af37636e7bf5f21c57ae880ac9682ae7d6d9fa5ce41b73568ff9538214956b89cd41228c2cb828d9068c2031a9c
 DIST qca-2.3.0.tar.xz 729504 BLAKE2B 71cf9dfae00066c14e1055da1fa1a8e1210f538b1addfde1b99a9b26b1e8f7dd61e289d0f505b5ec04d5f4745216d4fd0f8be8f8de9e9cbf74123907ba703d0e SHA512 ca9251868e073834562fa62ffc64b3e7817c9ddadc6bc3fb99cf8b5c8d859969562170a98874be9590c617b2dd8e5590d2c83792554f54bb880c677902db22fe
-EBUILD qca-2.2.1.ebuild 1833 BLAKE2B 64c2b736ebff641da4e54b6a46babee9076299122e7ca930d359c657f5f486fe4410856bafc6e862f2de110bc61be81073b4ecb62dd669dfb73e3374bdcf5fcd SHA512 38d71d80a624012431f6ff8b160fd9abbfd66db36119fcf72b20c4b3f5b0111d833f80c66505a1dbbe690b4736299373668ad63b829f92e3a11ca9b97ac45213
-EBUILD qca-2.3.0.ebuild 1846 BLAKE2B 9ea57312678c2e1ccd0f83c693b7eef865862756ea9ffbb5b0ac757f8fef43de7d190054f7b7a894258841dfdf0cb6ed61b4b5857bbfc7bb5d85cdf9ceaccb82 SHA512 0b1ec052cef38004ab5bbce03d7110eef216b915da85f9d3f4a0c4d84a32cb0a6e97b35c4e3df29e086953103a2c2efb7941946a3e18758c1b9ebacd3436617f
+EBUILD qca-2.3.0.ebuild 1843 BLAKE2B 36af2fd6df968e9bbfe1d29ef496e2db1248b6b1a4cf3d2e3fe71de6c2d8e7ab3f0ae520a370b672a80797504fe47d3044b2b683eda76848ddcf3fd69f9d8a08 SHA512 c17288cb2b6c9e6328255cc3aaea39a3bf17569753a966d7be30d248e26ee3300e5954d0c768cad10ab5f0b5b50b62f96ad6a4519dd0c1e143afc6803ad82f01
 MISC metadata.xml 745 BLAKE2B ff8e25b082d3c642fce099df1a218a4936bdc862a96fd237303d040c477544cf6368d23cc5de414d95f021e9c6ec475879225ab201f7c6d6711c04153ac53140 SHA512 6b82494b8dfe0d36da9818a6dcf775252dbb7051430232ccc2519c449cc2877da6478ca98f5b7a982a7660a869a0b8ae7a814fb18108ff42fed9712a9253e867
diff --git a/app-crypt/qca/qca-2.2.1.ebuild b/app-crypt/qca/qca-2.2.1.ebuild
deleted file mode 100644
index 0f23610c98fb..000000000000
--- a/app-crypt/qca/qca-2.2.1.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit 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:0
-		dev-libs/pkcs11-helper
-	)
-	sasl? ( dev-libs/cyrus-sasl:2 )
-	ssl? ( >=dev-libs/openssl-1.0.1:0= )
-"
-DEPEND="${RDEPEND}
-	test? (
-		dev-qt/qtnetwork:5
-		dev-qt/qttest:5
-	)
-"
-
-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
-}
diff --git a/app-crypt/qca/qca-2.3.0.ebuild b/app-crypt/qca/qca-2.3.0.ebuild
index adf2da003f33..b954f235e01f 100644
--- a/app-crypt/qca/qca-2.3.0.ebuild
+++ b/app-crypt/qca/qca-2.3.0.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 )"