gentoo resync : 25.11.2020

4 files changed, 6 insertions, 128 deletions

diff --git a/kde-apps/kdepim-runtime/Manifest b/kde-apps/kdepim-runtime/Manifest
index 49d5fa893d64..0d74b061c2b2 100644
--- a/kde-apps/kdepim-runtime/Manifest
+++ b/kde-apps/kdepim-runtime/Manifest
@@ -1,6 +1,3 @@
-AUX kdepim-runtime-20.04.3-CVE-2020-15954.patch 891 BLAKE2B 842b8bdf564a18b70fba9f5135e56e1ea351bb4e4f3afd22f49be32b9eae89cee18272ab20b2c34d4b6c23405f33978bfdf5fa460477dd41c8c430ea796147bf SHA512 3c30ec3e482683b78384704f3c67d41beeb5b59bc8d2815998bc5b197d3fb3c94c14aabc27db35e681a7bd39b071da7a4a150143dddf7629c1440e71e74689a6
-DIST kdepim-runtime-20.04.3.tar.xz 1739888 BLAKE2B 514bd4167e961a079397df11331abcf7a308071306f53be18386106eb14cca99c5c984f9bc69d1f361cb7f93d2b41a1568175f889df48f513b4d89d94f906afe SHA512 2b6e88a61606a833fc7376e9f28f347261c8a7000baf91cb2f0ff2a7df465c8a642c64aabf0e1d064859cab2daf0ef84116f47c043d3cdcea0bfbbe102c12d19
-DIST kdepim-runtime-20.08.1.tar.xz 1753944 BLAKE2B 87ad8d744f1a28e576d799b49e671b65b649ed34d38779657a1fb1d7651023e16c1d6824aca92d54f0089cf18bf38a9553a929178cd8d76581df553157034b55 SHA512 b67d736d8395e9f37d0eff33f8588ff9af614740fc564a067b76bf8d1ec420d5e23f540b6f2288e5645401c26d525b0e1279dfa2a6bb9bbadcd87aa45239532a
-EBUILD kdepim-runtime-20.04.3-r1.ebuild 2487 BLAKE2B 32a190fa8205041ea0cda1482f2bb1bb4f34e0b5b1c08b2f0440d4a6a0e0dc72e89d822f2608fdba717fedf91112a9d76d80f1e2828e3b8ec186e663f8cfc689 SHA512 43551419111d8f6e274f4c9c11a49e521ba80d06618306a55a76e25344e620956ea6450f95d4a74444f359aef5122b71cded0aaeeb6ca010a807f26eeb7edbc9
-EBUILD kdepim-runtime-20.08.1.ebuild 2498 BLAKE2B e189f8c7c23504968a4afbb92cf2e787ecff8682e9abeeaf9eec8ebb0dd58c33e1ed83f8bdfa4af6de1323c646b5ffbfa18104bf1e65f2d35b261704753951d8 SHA512 1231b4c2881b5099f7f50a1dca0d2a0d8abce74575f6f4b0b52dd86f21888ab6b76bfc339aa2b96c12cfa99f64f9277ca5d4bea6993155b933f7f9e13994e55f
+DIST kdepim-runtime-20.08.3.tar.xz 1754672 BLAKE2B 6cfba7756489bbf86025637fa0943342359f081771843b73394c822f62ed7b5aef70546acef200544ac5037d603836c718ca7e81e8ef25808767fb4462cfc386 SHA512 98a3623b3973e7b7c194ef1ef986012e0dfddb4c74c3fddba23cac928a73e6f6b634883407ec56ec6f613f8830112389f3c9eb19c89a2164178f2063be72d623
+EBUILD kdepim-runtime-20.08.3.ebuild 2482 BLAKE2B 0b4317882c72cba2a02f637f4d39cda59780c0db6b7cfbb89a2ccd0b093a46360794cb6947f61b5f10771a6a0268f24efc7a6fae878a123fb6a33b2268c4d728 SHA512 1b8b3d2c3d26e457ac08f89fa0a3b1737cf277d43b49159d879a6bdfd4b4af77c262f5e093878e8fd98662167a9c26adfc56281f9e211ae198229b28efd7777b
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kdepim-runtime/files/kdepim-runtime-20.04.3-CVE-2020-15954.patch b/kde-apps/kdepim-runtime/files/kdepim-runtime-20.04.3-CVE-2020-15954.patch
deleted file mode 100644
index 92fec0bbcfcb..000000000000
--- a/kde-apps/kdepim-runtime/files/kdepim-runtime-20.04.3-CVE-2020-15954.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From bd64ab29116aa7318fdee7f95878ff97580162f2 Mon Sep 17 00:00:00 2001
-From: Laurent Montel <montel@kde.org>
-Date: Tue, 28 Jul 2020 13:35:24 +0200
-Subject: [PATCH] Fix Bug 423426 - POP3 setup wizard defaults to unencrypted
- connections
-
-Make sure to use TLS when we create it
-CCBUG: 423426
----
- resources/pop3/wizard/pop3wizard.es | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/resources/pop3/wizard/pop3wizard.es b/resources/pop3/wizard/pop3wizard.es
-index 81d511d0a..aa83d0abf 100644
---- a/resources/pop3/wizard/pop3wizard.es
-+++ b/resources/pop3/wizard/pop3wizard.es
-@@ -53,7 +53,7 @@ function setup()
-   var smtp = SetupManager.createTransport( "smtp" );
-   smtp.setName( SetupManager.name() );
-   smtp.setHost( page.widget().outgoingAddress.text.trim() );
--  smtp.setEncryption( "NONE" );
-+  smtp.setEncryption( "SSL" );
- 
-   SetupManager.execute();
- }
--- 
-GitLab
-
diff --git a/kde-apps/kdepim-runtime/kdepim-runtime-20.04.3-r1.ebuild b/kde-apps/kdepim-runtime/kdepim-runtime-20.04.3-r1.ebuild
deleted file mode 100644
index ef1bad9bfc43..000000000000
--- a/kde-apps/kdepim-runtime/kdepim-runtime-20.04.3-r1.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-ECM_TEST="forceoptional"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.70.0
-QTMIN=5.14.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Runtime plugin collection to extend the functionality of KDE PIM"
-HOMEPAGE="https://kde.org/applications/office/org.kde.kontact"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="5"
-KEYWORDS="amd64 arm64 x86"
-IUSE=""
-
-# TODO kolab
-BDEPEND="
-	dev-libs/libxslt
-"
-RDEPEND="
-	>=app-crypt/qca-2.3.0:2
-	dev-libs/cyrus-sasl:2
-	dev-libs/libical:=
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtnetworkauth-${QTMIN}:5
-	>=dev-qt/qtspeech-${QTMIN}:5
-	>=dev-qt/qtwebengine-${QTMIN}:5[widgets]
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	>=kde-apps/akonadi-${PVCUT}:5
-	>=kde-apps/akonadi-calendar-${PVCUT}:5
-	>=kde-apps/akonadi-contacts-${PVCUT}:5
-	>=kde-apps/akonadi-mime-${PVCUT}:5
-	>=kde-apps/akonadi-notes-${PVCUT}:5
-	>=kde-apps/kalarmcal-${PVCUT}:5
-	>=kde-apps/kcalutils-${PVCUT}:5
-	|| (
-		>=kde-frameworks/kdav-${KFMIN}:5
-		>=kde-apps/kdav-${PVCUT}:5
-	)
-	>=kde-apps/kidentitymanagement-${PVCUT}:5
-	>=kde-apps/kimap-${PVCUT}:5
-	>=kde-apps/kmailtransport-${PVCUT}:5
-	>=kde-apps/kmbox-${PVCUT}:5
-	>=kde-apps/kmime-${PVCUT}:5
-	>=kde-apps/libkgapi-${PVCUT}:5
-	>=kde-apps/pimcommon-${PVCUT}:5
-	>=kde-frameworks/kcalendarcore-${KFMIN}:5
-	>=kde-frameworks/kcodecs-${KFMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcontacts-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kholidays-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kitemmodels-${KFMIN}:5
-	>=kde-frameworks/kjobwidgets-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/knotifyconfig-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/ktextwidgets-${KFMIN}:5
-	>=kde-frameworks/kwallet-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-"
-DEPEND="${RDEPEND}
-	>=dev-qt/qtxmlpatterns-${QTMIN}:5
-	test? ( >=kde-apps/kimap-${PVCUT}:5[test] )
-"
-
-RESTRICT+=" test"
-
-PATCHES=( "${FILESDIR}/${P}-CVE-2020-15954.patch" )
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_DISABLE_FIND_PACKAGE_Libkolabxml=ON
-	)
-	ecm_src_configure
-}
diff --git a/kde-apps/kdepim-runtime/kdepim-runtime-20.08.1.ebuild b/kde-apps/kdepim-runtime/kdepim-runtime-20.08.3.ebuild
index e58043c57743..3512281b89c8 100644
--- a/kde-apps/kdepim-runtime/kdepim-runtime-20.08.1.ebuild
+++ b/kde-apps/kdepim-runtime/kdepim-runtime-20.08.3.ebuild
@@ -6,17 +6,17 @@ EAPI=7
 ECM_HANDBOOK="forceoptional"
 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
 
 DESCRIPTION="Runtime plugin collection to extend the functionality of KDE PIM"
-HOMEPAGE="https://kde.org/applications/office/org.kde.kontact"
+HOMEPAGE="https://apps.kde.org/en/kontact"
 
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
 IUSE=""
 
 # TODO kolab