gentoo resync : 25.11.2020

4 files changed, 41 insertions, 44 deletions

diff --git a/kde-apps/libkgapi/Manifest b/kde-apps/libkgapi/Manifest
index 99af64dac7d1..6fadbdc44492 100644
--- a/kde-apps/libkgapi/Manifest
+++ b/kde-apps/libkgapi/Manifest
@@ -1,5 +1,4 @@
-DIST libkgapi-20.04.3.tar.xz 239764 BLAKE2B 3ed567dc8e9af9287c726a5592a579e35e10bd5aa5f7a3cc56eaf779b118d09abf96c1d608a7e20df7291f96a944d160c89795d9292ea6b991c967651bdd1c37 SHA512 2867e9b3492f721068e43dfd6d58ddccc0d7378e0f5613fad135c380060ccbf2906b1cb187ec65ae3800cf3ba12329a3d7627f6aa1f29fe94a67845b96362d66
-DIST libkgapi-20.08.1.tar.xz 242364 BLAKE2B 92e394b93fb14ba1753721e0cbad3dea766bdc63760c37e3d579301fb271e9d29117ba55d2e3db532e08994b7eca698c9d41d57af28c347d393fb6f1e84fd6a8 SHA512 f51a8bd46d8934990a48011548b042178d852c3348b454f5cfaf00ffe2953a0b1b28467c12acb5fe132246150a08456626f4145846c6f0c2017148f4b35eadbc
-EBUILD libkgapi-20.04.3.ebuild 873 BLAKE2B fa1eeb73542c9e89d64489b11645aecc0f92d49a93947417342c1f79992bb92bcae582b75b5db97f554b38e5154894294900610b99c9b98a74b1ff4f13367e40 SHA512 a8b235cc378b379f7662b53f308fbb87bac768bf601a16810384f4a88193ef9be5ae158607392451afaf4048bef33d7cc5ebab6b43996cb8ee36d4e115bfd6d0
-EBUILD libkgapi-20.08.1.ebuild 876 BLAKE2B aeb7bc9f2057316840eb107d84ab39b1f8ef2a8a85d7c4bbd752668210589b3c3936273d06368a23f72fd4e162c039ca66b44600c8b70e26495881eda66cd624 SHA512 fd06714e1702597e0e98430a23604f04fe9e8f92418829b7dedf53b0116b0e8a6509a6f379e3868bb5fcea8203f3d629f6cacc1a358242d1452ddb4edad15f60
+AUX libkgapi-20.08.3-fix-contactfetchjobtest-w-qt-5.15.patch 1048 BLAKE2B 749a388aff619216b076975bcddaccfb13f33a41606e3ca93dd7bf53264269460ab38ff1493bdd3e1085cf57c13186b82da0cad079b7e0725e43d39a49156444 SHA512 55f0a8a18334d5f0d9dfc1fad782ae723f53a663aa505ee87876a2f233cfba57b7721615dbbeb00162d1219983ddcbf3bc96452e8fe3dcacc23d9b92fea89ed7
+DIST libkgapi-20.08.3.tar.xz 242676 BLAKE2B 86b04cea376eb46081632fb571bdb3a67f4f44f3dd6c8a3af0144598634417ee39defb445324f33969420718daa999f43c5ea5d9c01634a0ec944bf457219fd7 SHA512 de7062632660777074f4d0d8b754b072c7f2b0550260e994d1db3e99d8f258f2507ad605d91cb6c465794ced92b740a742ab99947737edea73fd928c087d4388
+EBUILD libkgapi-20.08.3.ebuild 966 BLAKE2B 5d42eaa020215cba834808cf9e0799fd2f516176f1109bc2577af7526d1ffadbf88d5dc59baed8b918de6f640ea4f34559eb3611855cd586cc86613dcc9774da SHA512 30f125a74bc493a157307e8444f8ce307a66b9d42e83ddbee5484f111ce297ddc472b0088c29a14e7b5d302d57cb394779bf678c7574792520eda85cf772af68
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/libkgapi/files/libkgapi-20.08.3-fix-contactfetchjobtest-w-qt-5.15.patch b/kde-apps/libkgapi/files/libkgapi-20.08.3-fix-contactfetchjobtest-w-qt-5.15.patch
new file mode 100644
index 000000000000..42cd78136ad1
--- /dev/null
+++ b/kde-apps/libkgapi/files/libkgapi-20.08.3-fix-contactfetchjobtest-w-qt-5.15.patch
@@ -0,0 +1,31 @@
+From 570c0fd731af9ca4cead249d1db6133acc21f7c1 Mon Sep 17 00:00:00 2001
+From: David Barchiesi <david@barchie.si>
+Date: Mon, 24 Aug 2020 12:04:17 +0200
+Subject: [PATCH] Remove duplicate "gContact$groupMembershipInfo" value in mock
+ fetch response.
+
+BUG: 419629
+---
+ autotests/contacts/data/contact1_fetch_response.txt | 6 ------
+ 1 file changed, 6 deletions(-)
+
+diff --git a/autotests/contacts/data/contact1_fetch_response.txt b/autotests/contacts/data/contact1_fetch_response.txt
+index 7b22c91..89fc0e1 100644
+--- a/autotests/contacts/data/contact1_fetch_response.txt
++++ b/autotests/contacts/data/contact1_fetch_response.txt
+@@ -44,12 +44,6 @@ Content-type: application/json; charset=UTF-8
+       "$t": "2018-03-25T16:37:29.565Z"
+     }, 
+     "xmlns$gd": "http://schemas.google.com/g/2005", 
+-    "gContact$groupMembershipInfo": [
+-      {
+-        "deleted": "false", 
+-        "href": "http://www.google.com/m8/feeds/groups/MockAccount/base/6"
+-      }
+-    ], 
+     "gd$structuredPostalAddress": [
+       {
+         "gd$country": {
+-- 
+GitLab
+
diff --git a/kde-apps/libkgapi/libkgapi-20.08.1.ebuild b/kde-apps/libkgapi/libkgapi-20.08.1.ebuild
deleted file mode 100644
index 324e342e02f5..000000000000
--- a/kde-apps/libkgapi/libkgapi-20.08.1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_TEST="true"
-KFMIN=5.72.0
-QTMIN=5.14.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Library for accessing Google calendar and contact resources"
-HOMEPAGE="https://api.kde.org/kdepim/libkgapi/html/index.html"
-
-LICENSE="LGPL-2.1+"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="nls"
-
-BDEPEND="
-	nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 )
-"
-DEPEND="
-	dev-libs/cyrus-sasl:2
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtwebengine-${QTMIN}:5[widgets]
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	>=kde-frameworks/kcalendarcore-${KFMIN}:5
-	>=kde-frameworks/kcontacts-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-"
-RDEPEND="${DEPEND}
-	!<kde-apps/kdepim-runtime-18.07.80:5
-"
diff --git a/kde-apps/libkgapi/libkgapi-20.04.3.ebuild b/kde-apps/libkgapi/libkgapi-20.08.3.ebuild
index 9809db55e196..536782245214 100644
--- a/kde-apps/libkgapi/libkgapi-20.04.3.ebuild
+++ b/kde-apps/libkgapi/libkgapi-20.08.3.ebuild
@@ -4,8 +4,8 @@
 EAPI=7
 
 ECM_TEST="true"
-KFMIN=5.70.0
-QTMIN=5.14.2
+KFMIN=5.74.0
+QTMIN=5.15.1
 VIRTUALX_REQUIRED="test"
 inherit ecm kde.org
 
@@ -14,7 +14,7 @@ HOMEPAGE="https://api.kde.org/kdepim/libkgapi/html/index.html"
 
 LICENSE="LGPL-2.1+"
 SLOT="5"
-KEYWORDS="amd64 arm64 x86"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
 IUSE="nls"
 
 BDEPEND="
@@ -35,3 +35,7 @@ DEPEND="
 RDEPEND="${DEPEND}
 	!<kde-apps/kdepim-runtime-18.07.80:5
 "
+
+PATCHES=(
+	"${FILESDIR}/${P}-fix-contactfetchjobtest-w-qt-5.15.patch" # bug 754159
+)