gentoo resync : 20.03.2022

4 files changed, 36 insertions, 5 deletions

diff --git a/kde-apps/kdepim-runtime/Manifest b/kde-apps/kdepim-runtime/Manifest
index 5bad229fb5e8..b11036637686 100644
--- a/kde-apps/kdepim-runtime/Manifest
+++ b/kde-apps/kdepim-runtime/Manifest
@@ -1,6 +1,7 @@
 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.1.tar.xz 1807168 BLAKE2B 333a144fd71647c11321c6b4d17f949170244d41109a4c19b94a94fe08ee33dd001ad266639e6f47341351d349353c1343fb7745f704602d94fd0d5c542a767f SHA512 f120a6199f643fb0485464c71dbc6e063960338f906c67790c37fecff9c523057c4f24cbff9df423ca1b5501cd9c59ee71077185780fde815d6a4ae6352318a1
-EBUILD kdepim-runtime-21.08.3-r1.ebuild 2559 BLAKE2B 5f33099e32f243f5b4eaf07eae5303ea891cc734ae3672b4fae014591848ddcad72939d1fe239c7af086d2155a07551f528febd522e9ddc817c59e9029fca519 SHA512 32ff7d171a0da855cf48938b5e05d92a920ff36212737c868921146e7bf506de2445bec4a8a9942a9ed6fbcf84506754aab05fe50698c1c19a5365e0b9cef278
-EBUILD kdepim-runtime-21.12.1.ebuild 2468 BLAKE2B 756b3c870cf283589ef252fd1e77681c3e20a54b6c4007a0ec819066b2a728e2254ce4b8afebd900f79d9d3440b5bb9878c3388aa924db15b2e3e8a87b9c5455 SHA512 9fdd89b69886c24e289223839d8f62a6856f725c485e31e6a292d23c2946aa4becb53891b777dbc82a643f5edf84aed43f8c9c47552136a726e7fdb60469a105
+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 2468 BLAKE2B 756b3c870cf283589ef252fd1e77681c3e20a54b6c4007a0ec819066b2a728e2254ce4b8afebd900f79d9d3440b5bb9878c3388aa924db15b2e3e8a87b9c5455 SHA512 9fdd89b69886c24e289223839d8f62a6856f725c485e31e6a292d23c2946aa4becb53891b777dbc82a643f5edf84aed43f8c9c47552136a726e7fdb60469a105
 MISC metadata.xml 392 BLAKE2B d284f1f6d15ec099b824fc8aae970cceca3e558cbd7e4dc4b1ca93911394fd57834785936d1ca6626b4b4ff6b71613cd872b93e45b8701104978f80d8170e9e9 SHA512 872b0653ecebb83d93e152d510808ad85502024f5c162bb5c40a94aa76cddac615c0e930c04313c53a9e0a1a5c4b383829e302bb34647db46a698b47edc7fbdb
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
new file mode 100644
index 000000000000..7270d6e42aaf
--- /dev/null
+++ b/kde-apps/kdepim-runtime/files/kdepim-runtime-21.08.3-disable-google-sync-contacts.patch
@@ -0,0 +1,27 @@
+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.08.3-r1.ebuild b/kde-apps/kdepim-runtime/kdepim-runtime-21.08.3-r2.ebuild
index 6fb5200ce177..14f5ed037fc1 100644
--- a/kde-apps/kdepim-runtime/kdepim-runtime-21.08.3-r1.ebuild
+++ b/kde-apps/kdepim-runtime/kdepim-runtime-21.08.3-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -80,7 +80,10 @@ DEPEND="${RDEPEND}
 "
 BDEPEND="dev-libs/libxslt"
 
-PATCHES=( "${FILESDIR}"/${P}-CVE-2020-15954.patch ) # bug 734126
+PATCHES=(
+	"${FILESDIR}"/${P}-CVE-2020-15954.patch # bug 734126
+	"${FILESDIR}"/${P}-disable-google-sync-contacts.patch
+)
 
 src_configure() {
 	local mycmakeargs=(
diff --git a/kde-apps/kdepim-runtime/kdepim-runtime-21.12.1.ebuild b/kde-apps/kdepim-runtime/kdepim-runtime-21.12.3.ebuild
index 53293d3f6d15..53293d3f6d15 100644
--- a/kde-apps/kdepim-runtime/kdepim-runtime-21.12.1.ebuild
+++ b/kde-apps/kdepim-runtime/kdepim-runtime-21.12.3.ebuild