gentoo resync : 12.05.2022

4 files changed, 8 insertions, 61 deletions

diff --git a/kde-apps/kimap/Manifest b/kde-apps/kimap/Manifest
index 7aaeaca4c26f..6c8e8bcbacea 100644
--- a/kde-apps/kimap/Manifest
+++ b/kde-apps/kimap/Manifest
@@ -1,6 +1,5 @@
-AUX kimap-21.08.3-CVE-2021-38373.patch 1878 BLAKE2B 9eec46fab80e30fd42eb20f7fc130890d0a73548effa31656f3e1a4f83cffc8095affa30bfafe10ddad12f872c41e4bd6046f3754b957c8921402b59f3c74bd3 SHA512 c1150bf87a9f1abe75a3b6c56f3b2f6f8c6b88beed5f8158cea57a5cef1ffd16498c6ea761d22ee0a776d5c570dcc4184264770e9f8e16cc772860c20092a719
-DIST kimap-21.08.3.tar.xz 127416 BLAKE2B 688ae70e9b4c280798b42cfed5cbd5dc6afd7ad48081294d0b66a2712fb420bc2b972527dfd5c128b826d97b6b9f75298229c357cb4668fc32720e731513a24d SHA512 65feaddd6ee0a965dda73036c4adf2e20e56a4abf4bf93f1ec5da03c53701991126ab2d65647c92048c56f1bcd45ea8b429ed99ddc08efdd54846a0d1222db83
 DIST kimap-21.12.3.tar.xz 128428 BLAKE2B 9fabbfc3caf270d85123e6a357bd364cf51bdc8d628a929312145be80d835a6f258a853405ab53881f6746866ca5e1a271fdfe107cdf31623898f20d5ae36ab7 SHA512 12638a1882ea59845976ba68235bc6bdf2b2d4394c26b65a580dff850a5c75e9893fb162f2f8357b446c26c30a155d3826453f171c934109ac49b1220216ba10
-EBUILD kimap-21.08.3-r1.ebuild 903 BLAKE2B d95e50888cc0bbc37b96a290aca69aef96b3f3d9f533e89306bb5f7f46cdec52d2e91f21c4b1aee43929d6c20b6a8a2f322e172692e0a6cbcba5fa345ec1bb3a SHA512 c4c20a09ec7d885c4251c42a62197a5d901b4ccd4cff510733bc2090856927189350abb83c33caed884b08203db459da0c1a43643c2fd8ff2db172e7f39188f2
-EBUILD kimap-21.12.3.ebuild 869 BLAKE2B 6f9fa06b0b806b61d4e2e8d1777612f1b8013d5115f98f3505b21ea685ab16aaf70124a212fed3dedce1f51e59dfc4d3be8ccf27725ce92dbb3121ac8bd609b9 SHA512 d5fae91097a7b7f464dedc0e660b91dbed6da49e3751d136121b14ae7b5f83f505dbaa0960050143985c1ceadeb780fc86a7cb405bd532e1d85c6feb70e7396a
+DIST kimap-22.04.0.tar.xz 130140 BLAKE2B 9233edf792402dd61b2d7c92c017a414439eb6463d5fb515fdc049209b67a5ba32e07c8606c7afa12d3c0193d4c115555c78c3475f6cd4c69083e9e64f07fe52 SHA512 9c36f4271b6deab05ce197b54163bdeeea3a73382b16ced10e9645e9f6f004d8bea6067f269ea92eb39ebd9d115e2d5a3d2bc94ad05f8469567299eeaa334460
+EBUILD kimap-21.12.3.ebuild 868 BLAKE2B f2765b258f0ec85794a8bfaf0d13b4ffb3d4ae0751ce950eff16d464c46a360bd0073cc25b82678195e9dd701120865652662b7e076c83e0488500074ae9ce01 SHA512 1d75b005a9d02c00fd34cf8df64d4f77d138a57174d457689b04c9e09464de6534f77352b185c2c9c13e986c5a5e5b375e73d0df7dcc8b331ae4ae0b16dd8453
+EBUILD kimap-22.04.0.ebuild 871 BLAKE2B 596ee09e28b1cd5a3cf35ab98dd3ecdc33bc1cc82423e71a58a04233a752acb3dca4eba1336b790086d795220d76dd389ab25e6bc7149827f6847bb0c74edbbd SHA512 bf1a62b219452110546ed2f481b9198865dd37e80763e1cc5fd3f587a58715d26bee19bf80a5ffdb9e64a4c3446cdbb412d3167c4ca32480ebf3a9719b7f4a0c
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-apps/kimap/files/kimap-21.08.3-CVE-2021-38373.patch b/kde-apps/kimap/files/kimap-21.08.3-CVE-2021-38373.patch
deleted file mode 100644
index 90d216b0b846..000000000000
--- a/kde-apps/kimap/files/kimap-21.08.3-CVE-2021-38373.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From 5aed4138567934c3be20cddb60fe6d7d4a10da0f Mon Sep 17 00:00:00 2001
-From: Volker Krause <vkrause@kde.org>
-Date: Mon, 15 Nov 2021 18:18:28 +0100
-Subject: [PATCH] Treat SSL handshake errors as fatal also when using STARTTLS
-
-This fixes the infinite SSL error dialog loop also when using
-STARTTLS, the previous fix was only effective for direct TLS
-connections.
-
-CCBUG: 423424
-(cherry picked from commit cbd3a03bc1d2cec48bb97570633940bbf94c34fa)
----
- src/loginjob.cpp | 22 +++++++++-------------
- 1 file changed, 9 insertions(+), 13 deletions(-)
-
-diff --git a/src/loginjob.cpp b/src/loginjob.cpp
-index 7d53187..b5fbede 100644
---- a/src/loginjob.cpp
-+++ b/src/loginjob.cpp
-@@ -552,19 +552,15 @@ void LoginJob::connectionLost()
- {
-     Q_D(LoginJob);
- 
--    // don't emit the result if the connection was lost before getting the tls result, as it can mean
--    // the TLS handshake failed and the socket was reconnected in normal mode
--    if (d->authState != LoginJobPrivate::StartTls) {
--        qCWarning(KIMAP_LOG) << "Connection to server lost " << d->m_socketError;
--        if (d->m_socketError == QAbstractSocket::SslHandshakeFailedError) {
--            setError(KJob::UserDefinedError);
--            setErrorText(i18n("SSL handshake failed."));
--            emitResult();
--        } else {
--            setError(ERR_COULD_NOT_CONNECT);
--            setErrorText(i18n("Connection to server lost."));
--            emitResult();
--        }
-+    qCWarning(KIMAP_LOG) << "Connection to server lost " << d->m_socketError;
-+    if (d->m_socketError == QAbstractSocket::SslHandshakeFailedError) {
-+        setError(KJob::UserDefinedError);
-+        setErrorText(i18n("SSL handshake failed."));
-+        emitResult();
-+    } else {
-+        setError(ERR_COULD_NOT_CONNECT);
-+        setErrorText(i18n("Connection to server lost."));
-+        emitResult();
-     }
- }
- 
--- 
-2.34.0
-
diff --git a/kde-apps/kimap/kimap-21.12.3.ebuild b/kde-apps/kimap/kimap-21.12.3.ebuild
index 4c15811c331f..9fd70eea05af 100644
--- a/kde-apps/kimap/kimap-21.12.3.ebuild
+++ b/kde-apps/kimap/kimap-21.12.3.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://api.kde.org/kdepim/kimap/html/index.html"
 
 LICENSE="GPL-2+"
 SLOT="5"
-KEYWORDS="amd64 ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/kde-apps/kimap/kimap-21.08.3-r1.ebuild b/kde-apps/kimap/kimap-22.04.0.ebuild
index 8d37f8edc147..f885a797946c 100644
--- a/kde-apps/kimap/kimap-21.08.3-r1.ebuild
+++ b/kde-apps/kimap/kimap-22.04.0.ebuild
@@ -1,11 +1,12 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
+ECM_QTHELP="true"
 ECM_TEST="forceoptional"
 PVCUT=$(ver_cut 1-3)
-KFMIN=5.84.0
+KFMIN=5.92.0
 QTMIN=5.15.2
 inherit ecm kde.org
 
@@ -14,7 +15,7 @@ HOMEPAGE="https://api.kde.org/kdepim/kimap/html/index.html"
 
 LICENSE="GPL-2+"
 SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
 IUSE=""
 
 RDEPEND="
@@ -31,8 +32,6 @@ DEPEND="${RDEPEND}
 	test? ( >=dev-qt/qtnetwork-${QTMIN}:5 )
 "
 
-PATCHES=( "${FILESDIR}/${P}-CVE-2021-38373.patch" )
-
 src_test() {
 	# tests cannot be run in parallel #605586
 	local myctestargs=(