gentoo resync : 12.05.2022

5 files changed, 9 insertions, 156 deletions

diff --git a/kde-apps/kdepim-runtime/Manifest b/kde-apps/kdepim-runtime/Manifest
index 5363c2c091ef..b9cb27db1f71 100644
--- a/kde-apps/kdepim-runtime/Manifest
+++ b/kde-apps/kdepim-runtime/Manifest
@@ -1,7 +1,5 @@
-AUX kdepim-runtime-21.08.3-CVE-2020-15954.patch 3482 BLAKE2B 055f2b568348ba9443f84c6d24a0da8ead918e7b1f67f73d6645e887b003353cdc297d25d5a2e42d00dff7e80133451e81417337fca7c6023b1747a12eef0a5e SHA512 a86881edd2aaa9a1cb8a1ef23eb2c549b0b8b9e2d7dbdd2d992bab7b6f2b947244746c781108914c27ee5863912f8a1717a23bf153b2a4fdff3846f70f16fd70
-AUX kdepim-runtime-21.08.3-disable-google-sync-contacts.patch 1112 BLAKE2B 17b4116016e1a3ad6df8b7618e6d7232213c5bb26c7d1554566b72f25f4714c50a2d3e134616f4e59bb494b2f49501920c9494d45e74b9244f7bb25adf5839d7 SHA512 a55ed1a88065176e0e7af582ea9ffc360231c64051a7de0dc1bbc01539203de81f8ca84e0a71e7a80eadf8f27517623c33ff2cebfe6e1f74a5081b6e13398c48
-DIST kdepim-runtime-21.08.3.tar.xz 1824164 BLAKE2B c1c367b45e306891e581b493b550061dd7f765299246baf170119f35e3aa5baf37bf595fb184e0ca74c72e6640829f6b6739c44bcd3ddbfe60d04a2d9194002b SHA512 d13bb98663372aafeaa34dab785ed1f09d9a3974cdb680c123978bbbc22ee721b5ff26332aedbddf638c0cb5847b94e9d60d24599210e1cadfde514b7a7c6454
 DIST kdepim-runtime-21.12.3.tar.xz 1807324 BLAKE2B ee0efc479cf7fd4442aef18c4def2e77ca10a5fc5df893ac28e4e7af9b1e4f0e670ddc019a7a5d21ad80e19dfe3bb3c37bd9700371d2cd86517d4ad58c7105d3 SHA512 40bd88dc7c0b458b37af80d20ab24796d5819384a256f94b86200dc12d7b93eb945a5b9f16ff7bb432dc2072f061060ee2dcbe5676b975dc12e53687b18434b3
-EBUILD kdepim-runtime-21.08.3-r2.ebuild 2615 BLAKE2B b03b62e0b2156d013808c563c111def281a42ee9af6e546509570e52eb5c36ebe3fd900cbe872f3e9acc687ab6e6911c7ee6fd665bc52b85842878b030cf10bd SHA512 afade258938a6dca9e7f75f684fb73127631f2d57448ef120ae9f64f6d18477f4566fad9ff80e524c5776665e4414de719e9cc1892aa51dee377b2a9b2696a25
-EBUILD kdepim-runtime-21.12.3.ebuild 2466 BLAKE2B 842b520556740a45b146a9fafe92ce658f38d3c92c651ded2d6981af708be70d8448760b963c517f60854932b2a18f4d1df975701dfd69b18ea3261c828ed300 SHA512 e7f6c9a9f073be0d2929983bec63668af88589b2ef1af62256e825eeeef27af6abe49e82895174ff2aa6a13e9dc01efc913ef6e497e77124cc8717ec60c288f8
+DIST kdepim-runtime-22.04.0.tar.xz 1771044 BLAKE2B 0dc4f8fd1b20dcb5d0109e1e81bea5c84a6a77e6c7f4cce7e4e4c139d48047f607efd59cf9acdee5e68e0d2357ea8f9d96cd06dbaea8ae93d3aefd6247167c7b SHA512 da7605d167ecbdff637c1f9fbe12b2f0ab226204a01ff6531056a47da16c949fe2ad118b1d0b65357cad93e392a47d64d4b72f9bb4aad3f3185c81e1fd4ce720
+EBUILD kdepim-runtime-21.12.3.ebuild 2465 BLAKE2B db83c1d71ca3e698a2e2360ec2e7a964cb1c300d7da5f5212bd2ed97a18b7604830ed7060067a62d4baf98388771f78307c9e3e7a4f171e04d16e04af35bb88b SHA512 4603790c539d1adebf0cb81f82e32988091bbf5dc287f8a3da3d6ffed069b4317c10d626e3925dec7cfc0ef9eed38fb3f62d284f18672e095b3a5b9c40c975df
+EBUILD kdepim-runtime-22.04.0.ebuild 2435 BLAKE2B 857d8302b5cea01981f36cf20bf1a3f1ecbfcb1468ca975792b2f42998d23d867c0b22dafef003b7dbdb3c18eb990d6866427f35d562df5c5e523d224eada172 SHA512 8e9e8ed0194c73e25540ba16e72bc94ae2e0de17b00041b9ace0ef327f62d03ccc7d269fadcb3807be1e50e8fb47bb588068b401a078c9f9ccbb79305553a407
 MISC metadata.xml 392 BLAKE2B d284f1f6d15ec099b824fc8aae970cceca3e558cbd7e4dc4b1ca93911394fd57834785936d1ca6626b4b4ff6b71613cd872b93e45b8701104978f80d8170e9e9 SHA512 872b0653ecebb83d93e152d510808ad85502024f5c162bb5c40a94aa76cddac615c0e930c04313c53a9e0a1a5c4b383829e302bb34647db46a698b47edc7fbdb
diff --git a/kde-apps/kdepim-runtime/files/kdepim-runtime-21.08.3-CVE-2020-15954.patch b/kde-apps/kdepim-runtime/files/kdepim-runtime-21.08.3-CVE-2020-15954.patch
deleted file mode 100644
index 14ba90537025..000000000000
--- a/kde-apps/kdepim-runtime/files/kdepim-runtime-21.08.3-CVE-2020-15954.patch
+++ /dev/null
@@ -1,110 +0,0 @@
-From 35447bd04e8c12afac524e1c4556ef3db088e014 Mon Sep 17 00:00:00 2001
-From: Laurent Montel <montel@kde.org>
-Date: Fri, 12 Nov 2021 13:09:22 +0100
-Subject: [PATCH] Fix POP3 setup wizard defaults to unencrypted connections.
-
-Now I check encrypt support when I create resource.
-So if resource support starttls it will set option for it.
-
-BUG: 423426
-FIXED-IN: 5.19.0
----
- resources/pop3/wizard/pop3wizard.es | 73 ++++++++++++++++++++++++-----
- 1 file changed, 61 insertions(+), 12 deletions(-)
-
-diff --git a/resources/pop3/wizard/pop3wizard.es b/resources/pop3/wizard/pop3wizard.es
-index 5864db5d2..6bcf9a1dd 100644
---- a/resources/pop3/wizard/pop3wizard.es
-+++ b/resources/pop3/wizard/pop3wizard.es
-@@ -1,5 +1,5 @@
- /*
--    SPDX-FileCopyrightText: 2009 Montel Laurent <montel@kde.org>
-+    SPDX-FileCopyrightText: 2009-2021 Montel Laurent <montel@kde.org>
- 
-     SPDX-License-Identifier: LGPL-2.0-or-later
- */
-@@ -30,21 +30,70 @@ function validateInput()
-   }
- }
- 
-+var stage = 1;
-+
- function setup()
- {
--  var pop3Res = SetupManager.createResource( "akonadi_pop3_resource" );
--  pop3Res.setOption( "Host", page.widget().incommingAddress.text.trim() );
--  pop3Res.setOption( "Login", page.widget().userName.text.trim() );
--  pop3Res.setOption( "Password", SetupManager.password() );
-+  if ( stage == 1 ) {
-+    ServerTest.test( page.widget().incommingAddress.text.trim(), "pop" );
-+  } else {
-+    ServerTest.test( page.widget().outgoingAddress.text.trim(), "smtp" );
-+  }
-+}
-+
-+function testResultFail()
-+{
-+  testOk( -1 );
-+}
- 
--  var smtp = SetupManager.createTransport( "smtp" );
--  smtp.setName( SetupManager.name() );
--  smtp.setHost( page.widget().outgoingAddress.text.trim() );
--  smtp.setEncryption( "SSL" );
-+function testOk( arg )
-+{
-+  if (stage == 1) {
-+    SetupManager.openWallet();
-+    var pop3Res = SetupManager.createResource( "akonadi_pop3_resource" );
-+    var server = page.widget().incommingAddress.text.trim();
-+    pop3Res.setOption( "Host", server );
-+    pop3Res.setOption( "Login", page.widget().userName.text.trim() );
-+    pop3Res.setOption( "Password", SetupManager.password() );
-+
-+    if ( arg == "ssl" ) {
-+      pop3Res.setOption( "Port", 995 );
-+      pop3Res.setOption( "UseTLS", true );
-+    } else if ( arg == "tls" ) { // tls is really STARTTLS
-+      pop3Res.setOption( "Port", 110 );
-+      pop3Res.setOption( "UseTLS", true );
-+    } else if ( arg == "none" ) {
-+      pop3Res.setOption( "Port", 110 );
-+    } else {
-+      pop3Res.setOption( "Port", 110 );
-+    }
-+
-+    stage = 2;
-+    setup();
-+  } else {
-+    var smtp = SetupManager.createTransport( "smtp" );
-+    smtp.setName( page.widget().outgoingAddress.text.trim() );
-+    smtp.setHost( page.widget().outgoingAddress.text.trim() );
-+    if ( arg == "ssl" ) {
-+      smtp.setEncryption( "SSL" );
-+    } else if ( arg == "tls" ) {
-+      smtp.setEncryption( "TLS" );
-+    } else {
-+      smtp.setEncryption( "None" );
-+    }
-+    smtp.setUsername( page.widget().userName.text );
-+    smtp.setPassword( SetupManager.password() );
-+    SetupManager.execute();
-+  }
-+}
- 
--  SetupManager.execute();
-+try {
-+  ServerTest.testFail.connect( testResultFail );
-+  ServerTest.testResult.connect( testOk );
-+  page.widget().incommingAddress.textChanged.connect( validateInput );
-+  page.pageLeftNext.connect( setup );
-+} catch ( e ) {
-+  print( e );
- }
- 
--page.widget().incommingAddress.textChanged.connect( serverChanged );
--page.pageLeftNext.connect( setup );
- validateInput();
--- 
-GitLab
-
diff --git a/kde-apps/kdepim-runtime/files/kdepim-runtime-21.08.3-disable-google-sync-contacts.patch b/kde-apps/kdepim-runtime/files/kdepim-runtime-21.08.3-disable-google-sync-contacts.patch
deleted file mode 100644
index 7270d6e42aaf..000000000000
--- a/kde-apps/kdepim-runtime/files/kdepim-runtime-21.08.3-disable-google-sync-contacts.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 624ef213e50ae4712bfe2a254c5f444caaacfa22 Mon Sep 17 00:00:00 2001
-From: Laurent Montel <montel@kde.org>
-Date: Mon, 7 Feb 2022 06:58:43 +0100
-Subject: [PATCH] Apply patch for disable sync contact as it don't ported yet.
-
-BUG:449024
----
- resources/google-groupware/googleresource.cpp | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/resources/google-groupware/googleresource.cpp b/resources/google-groupware/googleresource.cpp
-index 62b08fab0..a0d74e738 100644
---- a/resources/google-groupware/googleresource.cpp
-+++ b/resources/google-groupware/googleresource.cpp
-@@ -104,7 +104,9 @@ GoogleResource::GoogleResource(const QString &id)
-     m_freeBusyHandler = std::make_unique<FreeBusyHandler>(m_iface, m_settings);
-     m_handlers.clear();
-     m_handlers.push_back(GenericHandler::Ptr(new CalendarHandler(m_iface, m_settings)));
-+#ifdef DISABLE_UNTIL_LIBKGAPI_PORTED
-     m_handlers.push_back(GenericHandler::Ptr(new ContactHandler(m_iface, m_settings)));
-+#endif
-     m_handlers.push_back(GenericHandler::Ptr(new TaskHandler(m_iface, m_settings)));
- 
-     new SettingsAdaptor(m_settings);
--- 
-GitLab
-
diff --git a/kde-apps/kdepim-runtime/kdepim-runtime-21.12.3.ebuild b/kde-apps/kdepim-runtime/kdepim-runtime-21.12.3.ebuild
index f07def6ca6ac..f6a99ceb81a6 100644
--- a/kde-apps/kdepim-runtime/kdepim-runtime-21.12.3.ebuild
+++ b/kde-apps/kdepim-runtime/kdepim-runtime-21.12.3.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://apps.kde.org/kontact/"
 
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="5"
-KEYWORDS="amd64 ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
 IUSE="speech"
 
 RESTRICT="test"
diff --git a/kde-apps/kdepim-runtime/kdepim-runtime-21.08.3-r2.ebuild b/kde-apps/kdepim-runtime/kdepim-runtime-22.04.0.ebuild
index 14f5ed037fc1..21ed42c3f8c8 100644
--- a/kde-apps/kdepim-runtime/kdepim-runtime-21.08.3-r2.ebuild
+++ b/kde-apps/kdepim-runtime/kdepim-runtime-22.04.0.ebuild
@@ -6,7 +6,7 @@ EAPI=8
 ECM_HANDBOOK="optional"
 ECM_TEST="forceoptional"
 PVCUT=$(ver_cut 1-3)
-KFMIN=5.84.0
+KFMIN=5.92.0
 QTMIN=5.15.2
 VIRTUALX_REQUIRED="test"
 inherit ecm kde.org
@@ -16,8 +16,8 @@ HOMEPAGE="https://apps.kde.org/kontact/"
 
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
-IUSE=""
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+IUSE="speech"
 
 RESTRICT="test"
 
@@ -31,7 +31,6 @@ RDEPEND="
 	>=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
@@ -40,8 +39,6 @@ RDEPEND="
 	>=kde-apps/akonadi-contacts-${PVCUT}:5
 	>=kde-apps/akonadi-mime-${PVCUT}:5
 	>=kde-apps/akonadi-notes-${PVCUT}:5
-	>=kde-apps/grantleetheme-${PVCUT}:5
-	>=kde-apps/kalarmcal-${PVCUT}:5
 	>=kde-apps/kcalutils-${PVCUT}:5
 	>=kde-apps/kidentitymanagement-${PVCUT}:5
 	>=kde-apps/kimap-${PVCUT}:5
@@ -51,7 +48,6 @@ RDEPEND="
 	>=kde-apps/kmime-${PVCUT}:5
 	>=kde-apps/libkdepim-${PVCUT}:5
 	>=kde-apps/libkgapi-${PVCUT}:5
-	>=kde-apps/pimcommon-${PVCUT}:5
 	>=kde-frameworks/kcalendarcore-${KFMIN}:5
 	>=kde-frameworks/kcmutils-${KFMIN}:5
 	>=kde-frameworks/kcodecs-${KFMIN}:5
@@ -73,21 +69,17 @@ RDEPEND="
 	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
 	>=kde-frameworks/kwindowsystem-${KFMIN}:5
 	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	speech? ( >=dev-qt/qtspeech-${QTMIN}:5 )
 "
 DEPEND="${RDEPEND}
 	>=dev-qt/qtxmlpatterns-${QTMIN}:5
 	test? ( >=kde-apps/kimap-${PVCUT}:5[test] )
 "
-BDEPEND="dev-libs/libxslt"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-CVE-2020-15954.patch # bug 734126
-	"${FILESDIR}"/${P}-disable-google-sync-contacts.patch
-)
 
 src_configure() {
 	local mycmakeargs=(
 		-DCMAKE_DISABLE_FIND_PACKAGE_Libkolabxml=ON
+		$(cmake_use_find_package speech Qt5TextToSpeech)
 	)
 	ecm_src_configure
 }