gentoo resync : 25.11.2020

4 files changed, 5 insertions, 144 deletions

diff --git a/kde-apps/kmail-account-wizard/Manifest b/kde-apps/kmail-account-wizard/Manifest
index 5bd9a4addf86..0ffb39ffc35c 100644
--- a/kde-apps/kmail-account-wizard/Manifest
+++ b/kde-apps/kmail-account-wizard/Manifest
@@ -1,6 +1,3 @@
-AUX kmail-account-wizard-20.04.3-CVE-2020-15954.patch 2790 BLAKE2B be3a02e7d3c12d121196a0230c42094a2f9cf6ad562adcd3de2693a7702c1fa1df6c4ceb3f7e20547b83627350db0d8566688ef9f9c62d18691ef2ae46aae3d7 SHA512 d680fdd9cc506cadbf3f62e639acbf152a958230fb0b5b014a99af9fa0a25f54aaf95cb005b213dbdb005f3f41012319154594b79e68162ea4b5dcd436df4a2c
-DIST kmail-account-wizard-20.04.3.tar.xz 158132 BLAKE2B 237e1d9535c1dde19ad21ceed08177da0d98cc773a96785afaa14a8e780573f30ad4ab9ba946314ce440093923acc3dbc91406c598f02b017556a74d9fe8df52 SHA512 71a305dcf51fe20d700c181f0a13981bae243e2a3d9080e58cc4ec24a1adc625f500936656b732fd419cfbfef9258af1ace45789c7756687a22788fc5d9da296
-DIST kmail-account-wizard-20.08.1.tar.xz 160400 BLAKE2B 7c4b803ce018ac039e38d3f9aaafa6ae26452bb0af699c9b1e69e8b6ac384dfd85ae47c035202dfd6dc77f4d081c3882ea6d280d487b019b5c1708a98aa04d7e SHA512 04a61fd9f1bfd4d8373ac94bcfdd694871295c6e57564f21ffa130f6c3e815a7af6782275c35da8d5f8b1906699afc94ff0b236df1e4860a6e4e0e8c6bdade8f
-EBUILD kmail-account-wizard-20.04.3-r1.ebuild 1632 BLAKE2B db3fe8cef0f2c010ccd9b1dcbf8984ec79ce5f7901984c993326c823eaf33cb616817378e2d0a915eb7bef4f41931cbcadb47a2687a6d3401348f78d27a041b4 SHA512 e9b0d0426be1b930ac49a336e8d028ca38099e1692cf7d8f4b2210aafe9ac8e7cc856f8cda088a33370f78b53d4671a28868bdb04a1d9e6650a0a030ea0e2fbc
-EBUILD kmail-account-wizard-20.08.1.ebuild 1582 BLAKE2B 301c1a58e408a9567cd88a7947b9eeb0a7a32e463f8aa14a7692399e12889210f41975aae3c2ae440916c54d71b0ef62fd56af1d73d3ada3fcda4635a989fd92 SHA512 b374197fb6b084ec5efde7cf603a3c049b6b6c8ce6d3c155d4620a58dc795c63bfa0ec85cd5df2303e12806ebf7241be4eff528293bee44596e2737b59de5e33
+DIST kmail-account-wizard-20.08.3.tar.xz 161832 BLAKE2B 01e23924f4728e8a24a83a17a49ef556f125fadeae5da01df57eb0bc3446d387cded535946b33051fc814be06ae46ab240c811c07cad2c238efc71f789bbc38b SHA512 5526e55c8ec49473f41245cf5ebf18997ff4db20637d92fa6db8e20f353a95f255ec69ae03b6eeb9b0ff09180e78260af7392806f931f10bc105dc2dd5f102e4
+EBUILD kmail-account-wizard-20.08.3.ebuild 1586 BLAKE2B a2545eb3ad4d82b0471fade12b881920797f52018f118da9711a75f07861be27f69126e241dc2b50308e8917598133d4c4035832805681f77a00dd2acdcfd937 SHA512 2b8796f653254b85bec6e4d31c3b93604adc8a467a9f31fd0252482348a366204c1b84e0da36fe4d93969c7ecfe30af5d9f53d2039853cf25abb0e44cb6e3b07
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kmail-account-wizard/files/kmail-account-wizard-20.04.3-CVE-2020-15954.patch b/kde-apps/kmail-account-wizard/files/kmail-account-wizard-20.04.3-CVE-2020-15954.patch
deleted file mode 100644
index a1c63e3a3a1d..000000000000
--- a/kde-apps/kmail-account-wizard/files/kmail-account-wizard-20.04.3-CVE-2020-15954.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-From a64d80e523edce7d3d59c26834973418fae042f6 Mon Sep 17 00:00:00 2001
-From: Laurent Montel <montel@kde.org>
-Date: Tue, 28 Jul 2020 13:52:19 +0200
-Subject: [PATCH] Show info about encryption/authentication settings
-
-CCBUG: 423426
----
- src/transport.cpp | 18 +++++++++++++++---
- src/transport.h   |  2 ++
- 2 files changed, 17 insertions(+), 3 deletions(-)
-
-diff --git a/src/transport.cpp b/src/transport.cpp
-index 567df31..26344ef 100644
---- a/src/transport.cpp
-+++ b/src/transport.cpp
-@@ -53,14 +53,16 @@ static const StringValueTable<MailTransport::Transport::EnumAuthenticationType>
- static const int authenticationTypeEnumSize = sizeof(authenticationTypeEnum) / sizeof(*authenticationTypeEnum);
- 
- template<typename T>
--static typename T::value_type stringToValue(const T *table, const int tableSize, const QString &string)
-+static typename T::value_type stringToValue(const T *table, const int tableSize, const QString &string, bool &valid)
- {
-     const QString ref = string.toLower();
-     for (int i = 0; i < tableSize; ++i) {
-         if (ref == QLatin1String(table[i].name)) {
-+            valid = true;
-             return table[i].value;
-         }
-     }
-+    valid = false;
-     return table[0].value; // TODO: error handling
- }
- 
-@@ -98,6 +100,7 @@ void Transport::create()
-     mt->setAuthenticationType(m_auth);
-     m_transportId = mt->id();
-     mt->save();
-+    Q_EMIT info(i18n("Mail transport uses '%1' encryption and '%2' authentication.", m_encrStr, m_authStr));
-     MailTransport::TransportManager::self()->addTransport(mt);
-     MailTransport::TransportManager::self()->setDefaultTransport(mt->id());
-     if (m_editMode) {
-@@ -154,12 +157,21 @@ void Transport::setPassword(const QString &password)
- 
- void Transport::setEncryption(const QString &encryption)
- {
--    m_encr = stringToValue(encryptionEnum, encryptionEnumSize, encryption);
-+    bool valid;
-+    m_encr = stringToValue(encryptionEnum, encryptionEnumSize, encryption, valid);
-+    if (valid) {
-+        m_encrStr = encryption;
-+    }
- }
- 
- void Transport::setAuthenticationType(const QString &authType)
- {
--    m_auth = stringToValue(authenticationTypeEnum, authenticationTypeEnumSize, authType);
-+    bool valid;
-+    m_auth = stringToValue(authenticationTypeEnum, authenticationTypeEnumSize, authType, valid);
-+    if (valid) {
-+        m_authStr = authType;
-+    }
-+
- }
- 
- int Transport::transportId() const
-diff --git a/src/transport.h b/src/transport.h
-index 3773b04..6415bf9 100644
---- a/src/transport.h
-+++ b/src/transport.h
-@@ -53,6 +53,8 @@ private:
-     QString m_password;
-     MailTransport::Transport::EnumEncryption::type m_encr;
-     MailTransport::Transport::EnumAuthenticationType::type m_auth;
-+    QString m_encrStr;
-+    QString m_authStr;
- 
-     bool m_editMode;
- };
--- 
-GitLab
-
diff --git a/kde-apps/kmail-account-wizard/kmail-account-wizard-20.04.3-r1.ebuild b/kde-apps/kmail-account-wizard/kmail-account-wizard-20.04.3-r1.ebuild
deleted file mode 100644
index 3ba6a85d5258..000000000000
--- a/kde-apps/kmail-account-wizard/kmail-account-wizard-20.04.3-r1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional" # FIXME: Check back for doc in release
-ECM_TEST="forceoptional"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.70.0
-QTMIN=5.14.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Assistant for KMail accounts configuration"
-HOMEPAGE+=" https://userbase.kde.org/KMail/Account_Wizard"
-
-LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
-SLOT="5"
-KEYWORDS="amd64 arm64 x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	>=kde-apps/akonadi-${PVCUT}:5
-	>=kde-apps/kidentitymanagement-${PVCUT}:5
-	>=kde-apps/kldap-${PVCUT}:5
-	>=kde-apps/kmailtransport-${PVCUT}:5
-	>=kde-apps/libkdepim-${PVCUT}:5
-	>=kde-apps/libkleo-${PVCUT}:5
-	>=kde-apps/pimcommon-${PVCUT}:5
-	>=kde-frameworks/kcmutils-${KFMIN}:5
-	>=kde-frameworks/kcodecs-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kitemviews-${KFMIN}:5
-	>=kde-frameworks/knewstuff-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/knotifyconfig-${KFMIN}:5
-	>=kde-frameworks/kross-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/ktexteditor-${KFMIN}:5
-	>=kde-frameworks/kwallet-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=( "${FILESDIR}/${P}-CVE-2020-15954.patch" )
diff --git a/kde-apps/kmail-account-wizard/kmail-account-wizard-20.08.1.ebuild b/kde-apps/kmail-account-wizard/kmail-account-wizard-20.08.3.ebuild
index e975d950f12e..f321712f3835 100644
--- a/kde-apps/kmail-account-wizard/kmail-account-wizard-20.08.1.ebuild
+++ b/kde-apps/kmail-account-wizard/kmail-account-wizard-20.08.3.ebuild
@@ -6,8 +6,8 @@ EAPI=7
 ECM_HANDBOOK="forceoptional" # FIXME: Check back for doc in release
 ECM_TEST="forceoptional"
 PVCUT=$(ver_cut 1-3)
-KFMIN=5.72.0
-QTMIN=5.14.2
+KFMIN=5.74.0
+QTMIN=5.15.1
 VIRTUALX_REQUIRED="test"
 inherit ecm kde.org
 
@@ -16,7 +16,7 @@ HOMEPAGE+=" https://userbase.kde.org/KMail/Account_Wizard"
 
 LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
 IUSE=""
 
 DEPEND="