gentoo resync : 22.01.2021

6 files changed, 36 insertions, 3 deletions

diff --git a/kde-apps/Manifest.gz b/kde-apps/Manifest.gz
index b03534008ed0..133258e43d83 100644
--- a/kde-apps/Manifest.gz
+++ b/kde-apps/Manifest.gz
diff --git a/kde-apps/libkgapi/Manifest b/kde-apps/libkgapi/Manifest
index ee56e0fba54f..65eb47cd5938 100644
--- a/kde-apps/libkgapi/Manifest
+++ b/kde-apps/libkgapi/Manifest
@@ -1,6 +1,7 @@
 AUX libkgapi-20.08.3-fix-contactfetchjobtest-w-qt-5.15.patch 1048 BLAKE2B 749a388aff619216b076975bcddaccfb13f33a41606e3ca93dd7bf53264269460ab38ff1493bdd3e1085cf57c13186b82da0cad079b7e0725e43d39a49156444 SHA512 55f0a8a18334d5f0d9dfc1fad782ae723f53a663aa505ee87876a2f233cfba57b7721615dbbeb00162d1219983ddcbf3bc96452e8fe3dcacc23d9b92fea89ed7
+AUX libkgapi-20.12.1-remember-gmail-auth-token.patch 962 BLAKE2B 713eda482ccf851a2e814c8350993a745fc9cb42fd1d974f96df757dd1bad0941598c97fb1a1539cba4815705fded28e4abcaa992382c8a5d2766d8b345d2fbf SHA512 1a37ae3be31a0ee9ef37a73da0aa83178722cbbf7aac372ef471b8069f4a771306ef421e622692130d8778651f6df29d9a4467c9d10eb73047047fdf48bc7ef6
 DIST libkgapi-20.08.3.tar.xz 242676 BLAKE2B 86b04cea376eb46081632fb571bdb3a67f4f44f3dd6c8a3af0144598634417ee39defb445324f33969420718daa999f43c5ea5d9c01634a0ec944bf457219fd7 SHA512 de7062632660777074f4d0d8b754b072c7f2b0550260e994d1db3e99d8f258f2507ad605d91cb6c465794ced92b740a742ab99947737edea73fd928c087d4388
 DIST libkgapi-20.12.1.tar.xz 246024 BLAKE2B 108f811919bbf0c857a7f4ab42a4f58e698fed050b5129757db8a6093e83e09b1d41fc49a8a485cbc6878462c9f116de01e8edfbcf08d107bb401f4aca5cd296 SHA512 1cf6d9cd923bd4311abaf3fe8feb348970fe01c837845fb9980ed914d2a9d0b3dd3093ce81cfd281fba22622e9756a94da8124959c4ec71389494088965652a9
 EBUILD libkgapi-20.08.3-r1.ebuild 964 BLAKE2B c0b64df147b671cd0195741608dd6ff4371ebff462501607379b7d3a2feb8d4445d0ee149113776acd79714077a1b589e6b8353aa870076302c5e45bd71ae2a6 SHA512 bbf84ea6f0e690c627fdde90be1206e2f8f8b62b56e4072a23b4459db3808914093fa258d6c7a11d1171f3a2cdd4246a88572d556b76345c196772606b97124b
-EBUILD libkgapi-20.12.1.ebuild 763 BLAKE2B 186504179a196c8f8b950b640603ff6358d3647c922d690597d7826949fdebec1d0c1c1e767861432b457cc25d51160e2dd7b579ca688e8eafe1ed7b62af884b SHA512 9cd9c265970c31a8a703295cc4c93aa7271e22cdf88b551a12f4600c21a88127769cc8f167afb0a3aee3f28595bd70d6087ead9e4aca31823c31abf906fef72b
+EBUILD libkgapi-20.12.1-r1.ebuild 844 BLAKE2B 58f252055fb30c36367839aed3cbbfef8345da0510a456df989eefe2ee4dfbc2876531f7c1e8c43ce69fe17cc0efb84dbae1e563283acaab42ed40ceb4348b4f SHA512 c0c314fd7517c9d7f26defa906279b898734492e10847e0112de0808e79034481a8f4b6ebd36c8ab1ddd0c422961414a39d6e7db4b96a58b35f1bf1a27ab80f5
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/libkgapi/files/libkgapi-20.12.1-remember-gmail-auth-token.patch b/kde-apps/libkgapi/files/libkgapi-20.12.1-remember-gmail-auth-token.patch
new file mode 100644
index 000000000000..4d777f1475f1
--- /dev/null
+++ b/kde-apps/libkgapi/files/libkgapi-20.12.1-remember-gmail-auth-token.patch
@@ -0,0 +1,30 @@
+From d81d247026ac993ac5717ca471c7fcf1778951f2 Mon Sep 17 00:00:00 2001
+From: Antonio Rojas <arojas@archlinux.org>
+Date: Wed, 6 Jan 2021 15:54:52 +0100
+Subject: [PATCH] Don't reset account scopes if not necessary
+
+This triggers unnecesary authentication prompts
+
+BUG: 429406
+---
+ src/core/accountmanager.cpp | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/src/core/accountmanager.cpp b/src/core/accountmanager.cpp
+index b9af6c1..f68563e 100644
+--- a/src/core/accountmanager.cpp
++++ b/src/core/accountmanager.cpp
+@@ -81,7 +81,9 @@ public:
+                     currentScopes.push_back(requestedScope);
+                 }
+             }
+-            account->setScopes(currentScopes);
++            if (currentScopes != account->scopes()) {
++                account->setScopes(currentScopes);
++            }
+         }
+         auto *job = new AuthJob(account, apiKey, apiSecret);
+         job->setUsername(account->accountName());
+-- 
+GitLab
+
diff --git a/kde-apps/libkgapi/libkgapi-20.12.1.ebuild b/kde-apps/libkgapi/libkgapi-20.12.1-r1.ebuild
index 950dc581ce22..07016b6b5f89 100644
--- a/kde-apps/libkgapi/libkgapi-20.12.1.ebuild
+++ b/kde-apps/libkgapi/libkgapi-20.12.1-r1.ebuild
@@ -31,3 +31,5 @@ DEPEND="
 	>=kde-frameworks/kwallet-${KFMIN}:5
 "
 RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}/${P}-remember-gmail-auth-token.patch" ) # KDE-Bug 429406
diff --git a/kde-apps/spectacle/Manifest b/kde-apps/spectacle/Manifest
index cf7621ca7fdb..beaac4733f73 100644
--- a/kde-apps/spectacle/Manifest
+++ b/kde-apps/spectacle/Manifest
@@ -1,6 +1,6 @@
 DIST spectacle-20.08.3.tar.xz 1156220 BLAKE2B 3ebf54668fda63db6c1d938beedd287d7570749a6f9c6de89752d42abb7fe75687a6e3135a0fcd8f86b741a286518040627b2da0fc96ba029dfd1e1ede9a04ef SHA512 baae34ae4c7b3811e008ae8c1c2d6d6603fd39533279cc3ed79d4a38fa6cb3879ece30bc9ed1b1a5163691dcb2adea7e8cd3d655788f680feb94c38ad53610ac
 DIST spectacle-20.12.1.tar.xz 1163912 BLAKE2B 5ba6ff90e9f98a711eaf99b04f4bc6799a1bedf7c91c836657b51fb204cb7607ea219fc9c6b2c343b4c21ac980d42be3094e409833e81c0e1db4fa5f15cd169a SHA512 7df1907ed350d19d48e522c7a591e3d4464a60d18b9f88242713062ea9a68aa966221fd2e6c3548cf0cc325fa7a7e9ec0c3d9856edf95c2cdcf74b950f10ba60
 EBUILD spectacle-20.08.3.ebuild 1584 BLAKE2B 376e19a3c18b18179f6d3b20cea9c1826169aa6e81ff3739ba5cc25418cdec1990f2e85d68e5a0236dd03d1b2f813ee11e5edab097bc9a749e7778594a6cd87e SHA512 8eb0e28f8817101a1399d3e5e878a288a6b986bbe3b0e6939b2667f4fa8f17545cfed77814f1bba8b2e540b53243dd0ce78481a8160f575d851fb2d9867b9ab5
-EBUILD spectacle-20.12.1-r1.ebuild 1956 BLAKE2B 2a9ceea05d9eeb09fda7c77c23c312ada1cc7dac5030b27766551772ee21bb20f907575854ffa0c0c34f24e8e08919b5139970044fc24355336f9a59335ef050 SHA512 291f5fb0c346379f978b16a2e9e27b8c5f7764f87fb9f44d392aa76622aebb3b4fe3beb334b205c53734293939c45ab9aefd17bc15e85080f3402f5226e63ce1
+EBUILD spectacle-20.12.1-r1.ebuild 1963 BLAKE2B 11612be512cdf9724b2a0667e3895aca86e5dfda6659e767691cafe506ea9479ab3e9fb99110d56f2f4a0beea19e14d5e773d6c9b16e2569f72de08782fb7e3f SHA512 34bdb2250583436f0fb9c8bc3703ba58c26aaf08216b820902b7083c9de78e624a8c06410520f19f05a598705650661cfbcd4b23574e2af5f21dfd5e74bb0db5
 EBUILD spectacle-20.12.1.ebuild 1713 BLAKE2B 39009bd94ddb6fe01e947be5c9d7b701794214b82d4034761918ade0f808b23bce8f43febc45f834ced80088be6d7385145d80bbe645f95bf16a73edc7c84b38 SHA512 c15a8e2238f9bb445c404e627aecacbf7d3106a4888dbe1cd547a70ebd01c6238994bbda443f79085495f0a9d274ae422468798d32d577f4293e1efd7561c8e3
 MISC metadata.xml 558 BLAKE2B 304071c16927d1f17fb0b30c3bc71ac9cf707a9cb06816957a8382b3eaac9083d3456b142bc3e0dc745588f14641e461c20b13840258997c85b84bbdaa5659e8 SHA512 0cc62fa4faa18491636dd37eea421cfc880e8997101420e15a876e070c6c14369063f6785d1f0474b3d79fc42860455fe4ffcb90db9f7a61e0492500d19aaa44
diff --git a/kde-apps/spectacle/spectacle-20.12.1-r1.ebuild b/kde-apps/spectacle/spectacle-20.12.1-r1.ebuild
index 3dca38ceeac7..3fc21616ca70 100644
--- a/kde-apps/spectacle/spectacle-20.12.1-r1.ebuild
+++ b/kde-apps/spectacle/spectacle-20.12.1-r1.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://apps.kde.org/en/spectacle"
 
 LICENSE="LGPL-2+ handbook? ( FDL-1.3 ) kipi? ( GPL-2+ )"
 SLOT="5"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE="+annotate kipi share"
 
 # TODO: Qt5Svg leaking from media-libs/kimageannotator