gentoo resync : 03.03.2021

4 files changed, 2 insertions, 76 deletions

diff --git a/kde-apps/libkgapi/Manifest b/kde-apps/libkgapi/Manifest
index 4ed95975c0c1..0d940885e8e2 100644
--- a/kde-apps/libkgapi/Manifest
+++ b/kde-apps/libkgapi/Manifest
@@ -1,6 +1,3 @@
-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
 DIST libkgapi-20.12.2.tar.xz 246020 BLAKE2B c934898d8832c0264919a313d25d6a74a7a377dbd5575926ea6bc6ebbe8870e37691b307b058b67a5ff09d9bbf2db759b4d98d93d347a239315500e7f95d5bdc SHA512 0350eaff72b192219553047781e1ae79bc794b9519095f812a1c8efe3e9d33c3dbb5d9db07bd28a39132adc4543627e2c46a866aec9f8710ef2d35cfb0a1f697
-EBUILD libkgapi-20.08.3-r1.ebuild 964 BLAKE2B c0b64df147b671cd0195741608dd6ff4371ebff462501607379b7d3a2feb8d4445d0ee149113776acd79714077a1b589e6b8353aa870076302c5e45bd71ae2a6 SHA512 bbf84ea6f0e690c627fdde90be1206e2f8f8b62b56e4072a23b4459db3808914093fa258d6c7a11d1171f3a2cdd4246a88572d556b76345c196772606b97124b
-EBUILD libkgapi-20.12.2.ebuild 763 BLAKE2B b80d1308df096b0ca2325260177be83b2c8e48cd98608ec150539e66c1de33419f58693dfbeecd6ae53038c58fb31bfa6030a1f7a4124645034fdd79ccb08e7a SHA512 a827eb73fddd9d4dbabcc1cae77c5eeffd5eadc11102cbba926e96ceab017524fb2a8015c3005930e4a314bb1e884ce3e956598ff084002e4d87b96ac515e901
+EBUILD libkgapi-20.12.2.ebuild 760 BLAKE2B 9d3b7ba26dec2806dfbbc083eb5ef4924b900aac5d25b9b297bf96b121f6d0f3065cebe1e5fa93e6912cc9d474145a4aa97559ed066020b6a58f02ba320a5f06 SHA512 f2e578e67177d5fee67e91a762c8edb318f7784a525454e4f365c54a19fa27f325a13345e1e4c2b22f034facbdfd39fac63d42d07bf9c69ab6f5324cc5162497
 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
deleted file mode 100644
index 42cd78136ad1..000000000000
--- a/kde-apps/libkgapi/files/libkgapi-20.08.3-fix-contactfetchjobtest-w-qt-5.15.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-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.3-r1.ebuild b/kde-apps/libkgapi/libkgapi-20.08.3-r1.ebuild
deleted file mode 100644
index 99b60fac04bf..000000000000
--- a/kde-apps/libkgapi/libkgapi-20.08.3-r1.ebuild
+++ /dev/null
@@ -1,40 +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.74.0
-QTMIN=5.15.1
-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 ~ppc64 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/kwallet-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/${P}-fix-contactfetchjobtest-w-qt-5.15.patch" # bug 754159
-)
diff --git a/kde-apps/libkgapi/libkgapi-20.12.2.ebuild b/kde-apps/libkgapi/libkgapi-20.12.2.ebuild
index 9f09231fc49a..1f8552178b95 100644
--- a/kde-apps/libkgapi/libkgapi-20.12.2.ebuild
+++ b/kde-apps/libkgapi/libkgapi-20.12.2.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://api.kde.org/kdepim/libkgapi/html/index.html"
 
 LICENSE="LGPL-2.1+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
 IUSE="nls"
 
 BDEPEND="