gentoo resync : 25.08.2020

4 files changed, 15 insertions, 123 deletions

diff --git a/kde-misc/kio-gdrive/Manifest b/kde-misc/kio-gdrive/Manifest
index 07d371f14766..36c2739edac4 100644
--- a/kde-misc/kio-gdrive/Manifest
+++ b/kde-misc/kio-gdrive/Manifest
@@ -1,6 +1,5 @@
-AUX kio-gdrive-1.2.6-refresh-credentials.patch 4224 BLAKE2B f70a40eef14d31f296effb554308303fe9b82c21b8e3c3a56020d5548dfbd9a967ef27d24ac4b44398c681db64dabff87a088ad3e47fe9e5f962af2080471f31 SHA512 8fc99adb52f1e9b9c49c94357103a51d3de367ea1d5a98afe361910307fe1a424b9f0c5fb0ec1e5f0cc2183ac87f2d6cb1730ed12fecc76b68e8860317dfbedf
-DIST kio-gdrive-1.2.7.tar.xz 46748 BLAKE2B 308c7d8d55c4eef175e2ef6030f1fbcdb59fdc6cd33f6c0bd5c35efe7bd21cf7f6cf7293b355f30b7b05effae79b91e357cc5a93ed866db850953f392bd65e0f SHA512 f1eedad2cd244e38f6cdf397e9488cb7f31fe7c4b17825f3b0882ff46f7f62f087e7b2bc59db434b4a55641920b8b03f3dec6adf7031ccc2277c7a0b166f9c80
 DIST kio-gdrive-1.3.0.tar.xz 51668 BLAKE2B a5c9bc347e5b40998449b613e8ad73c362d82d2486a1e91527f84acc5473d603b3cca422bd7c67cff28e49b08803904fdf752bec742bae752e868b8a84321684 SHA512 b0a6be2b59512d3faf6c677c6f3ffdcc9a38fff3a41d0bc6a29566008d7da3ab524fb189ddd219308a8ac8244fbed67c01da480e8193ed0aeb815fe64d72988a
-EBUILD kio-gdrive-1.2.7-r1.ebuild 1227 BLAKE2B 095b7909158ccce7a930a508a67593ccfe88afa272ec82fe1698bcad9f61e4681dc07941f716fdfcbbdaec686553b05bb8be805c19bda08218d1b7789db1d6af SHA512 bcece19ec575eadcd98ef32cfcf7bce9e80c54e709e5904a436921f18fa47ae34d594801f3334e60c9524bcc19cc6f331e6aff3645f02d3205dc4420c45e56b8
-EBUILD kio-gdrive-1.3.0.ebuild 1072 BLAKE2B 79d8f31c01a5d2d58649ca7b9c3be1e84e2f7243ac2fa257b463525cf661cd180031d04b164dc20aa798e6f9b89c3f66c0b404696498fd19f87319bb50792c40 SHA512 b25b7b09fe6611c0f2a4c3a585c2aa32360818092687309c90bfceae283e7004881f7f19f736b4a793072c1d1d2e44a3183ebb8a6acdf7451690c6f3e8796dfc
+DIST kio-gdrive-20.08.0.tar.xz 57016 BLAKE2B 079c79d2de151b3dcc073006d925bb3d00b48993dab02720bccdf0e2d0051b78826741cd12bcb3bfeb429cbf67bc9ae2f94d55deb54ba0b67681564d5e12f145 SHA512 ac96dae7bc3700e5a7a681d043596a964ea167ce79d74f0a8ed159912573ebd6df56c6072b87a5c7e1eef8dc6b4aef2e8264989c0c946dfa1aa5fee26d752075
+EBUILD kio-gdrive-1.3.0.ebuild 1069 BLAKE2B 258a60d0c4a8cb207b1799a4e8bbe05c0d75f616377d4eccfeb02b317c8cc4a06c6cd03b4f4c217e7fde0b822feb4a5e18044365c66f23b4385f6548fdc76622 SHA512 8900f71af6c32a24cbd232cb1c9bfc3189919ac4a0f682fd057480e4296dae6891ea97a26ea376e50d9cfc8a1ce342a53d338ba8a329ca62498399fd64fca9f1
+EBUILD kio-gdrive-20.08.0.ebuild 1050 BLAKE2B db4a9e73a22fb1dcf249c8b29dd700bc2209c49e6fa15f8667e6992313563b1d4922947919e31d58a30d5dc0ed7cb2e26a2c5f906d1fea40860d1ecfc8610656 SHA512 8b3cca5eaa2f2e7879abeea2201542b25565e867d11fbb2bed31f7bf1678115327e6842b6297e9e6966475ce0d197195da10ac8bb5ec3a6acfacc66d43c8c556
 MISC metadata.xml 402 BLAKE2B 80f60bca3fa59b7e22727709066453e1002c786c2eda688aa437f86fd99d73aa4b8c35a22571d3f774c55d16b1a4267fb0242253fd38a45890701755cca72afa SHA512 2c94ff5a07cb0a89d93cf798ee2b9a9f163f448e9d6d3185c06d58b42c1a9ef480adfafd540a021d4f9ebab6bb78e979c74e9a83867abff13f66b2b35eaafd21
diff --git a/kde-misc/kio-gdrive/files/kio-gdrive-1.2.6-refresh-credentials.patch b/kde-misc/kio-gdrive/files/kio-gdrive-1.2.6-refresh-credentials.patch
deleted file mode 100644
index 2d5958827866..000000000000
--- a/kde-misc/kio-gdrive/files/kio-gdrive-1.2.6-refresh-credentials.patch
+++ /dev/null
@@ -1,101 +0,0 @@
-From 4ded388b2b2672f5f7fb953a0150a69fcfaa7cb0 Mon Sep 17 00:00:00 2001
-From: David Barchiesi <david@barchie.si>
-Date: Mon, 8 Jul 2019 09:54:08 +0200
-Subject: Re get Google credentials from KAccounts when a refresh is needed.
-
-Summary: Currently, when the Google access token in use expires, the KIO slave silently ignores refreshing the token (only 'not implemented' gets logged) and fails all subsequent api requests. This patch prevents the slave from breaking by requesting new credentials from KAccounts.
-
-Test Plan: Open a Google Drive folder in Dolphin, wait until accounts token needs a refresh, open another Google Drive folder. The folder loads because a new access token was requested.
-
-Reviewers: elvisangelaccio
-
-Reviewed By: elvisangelaccio
-
-Subscribers: mck182, elvisangelaccio
-
-Differential Revision: https://phabricator.kde.org/D22009
----
- src/kaccountsmanager.cpp | 45 ++++++++++++++++++++++++++++++++-------------
- src/kaccountsmanager.h   |  2 ++
- 2 files changed, 34 insertions(+), 13 deletions(-)
-
-diff --git a/src/kaccountsmanager.cpp b/src/kaccountsmanager.cpp
-index 08272df..dc35852 100644
---- a/src/kaccountsmanager.cpp
-+++ b/src/kaccountsmanager.cpp
-@@ -85,8 +85,19 @@ AccountPtr KAccountsManager::createAccount()
- 
- AccountPtr KAccountsManager::refreshAccount(const AccountPtr &account)
- {
--    Q_UNUSED(account)
--    qCWarning(GDRIVE) << Q_FUNC_INFO << "not implemented.";
-+    const QString accountName = account->accountName();
-+    for (auto it = m_accounts.constBegin(); it != m_accounts.constEnd(); ++it) {
-+        if (it.value()->accountName() != accountName) {
-+            continue;
-+        }
-+
-+        const auto id = it.key();
-+        qCDebug(GDRIVE) << "Refreshing" << accountName;
-+        auto gapiAccount = getAccountCredentials(id, accountName);
-+        m_accounts.insert(id, gapiAccount);
-+        return gapiAccount;
-+    }
-+
-     return {};
- }
- 
-@@ -143,19 +154,27 @@ void KAccountsManager::loadAccounts()
-             }
-             qCDebug(GDRIVE) << account->displayName() << "supports gdrive!";
- 
--            auto job = new GetCredentialsJob(id, nullptr);
--            job->exec();
-+            auto gapiAccount = getAccountCredentials(id, account->displayName());
-+            m_accounts.insert(id, gapiAccount);
-+        }
-+    }
-+}
- 
--            auto gapiAccount = AccountPtr(new Account(account->displayName(),
--                                                      job->credentialsData().value(QStringLiteral("AccessToken")).toString(),
--                                                      job->credentialsData().value(QStringLiteral("RefreshToken")).toString()));
-+AccountPtr KAccountsManager::getAccountCredentials(Accounts::AccountId id, const QString& displayName)
-+{
-+    auto job = new GetCredentialsJob(id, nullptr);
-+    job->exec();
- 
--            const auto scopes = job->credentialsData().value(QStringLiteral("Scope")).toStringList();
--            for (const auto &scope : scopes) {
--                gapiAccount->addScope(QUrl::fromUserInput(scope));
--            }
-+    auto gapiAccount = AccountPtr(new Account(displayName,
-+                                              job->credentialsData().value(QStringLiteral("AccessToken")).toString(),
-+                                              job->credentialsData().value(QStringLiteral("RefreshToken")).toString()));
- 
--            m_accounts.insert(id, gapiAccount);
--        }
-+    const auto scopes = job->credentialsData().value(QStringLiteral("Scope")).toStringList();
-+    for (const auto &scope : scopes) {
-+        gapiAccount->addScope(QUrl::fromUserInput(scope));
-     }
-+
-+    qCDebug(GDRIVE) << "Got account credentials for:" << gapiAccount->accountName() << ", accessToken:" << gapiAccount->accessToken() << ", refreshToken:" << gapiAccount->refreshToken();
-+
-+    return gapiAccount;
- }
-diff --git a/src/kaccountsmanager.h b/src/kaccountsmanager.h
-index 235d11a..d2dbc43 100644
---- a/src/kaccountsmanager.h
-+++ b/src/kaccountsmanager.h
-@@ -40,6 +40,8 @@ public:
- private:
-     void loadAccounts();
- 
-+    KGAPI2::AccountPtr getAccountCredentials(Accounts::AccountId id, const QString& displayName);
-+
-     QMap<Accounts::AccountId, KGAPI2::AccountPtr> m_accounts;
- };
- 
--- 
-cgit v1.1
diff --git a/kde-misc/kio-gdrive/kio-gdrive-1.3.0.ebuild b/kde-misc/kio-gdrive/kio-gdrive-1.3.0.ebuild
index 1283f3246810..3778ffc71683 100644
--- a/kde-misc/kio-gdrive/kio-gdrive-1.3.0.ebuild
+++ b/kde-misc/kio-gdrive/kio-gdrive-1.3.0.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://phabricator.kde.org/project/profile/72/"
 
 if [[ ${KDE_BUILD_TYPE} != live ]] ; then
 	SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm64 ~x86"
+	KEYWORDS="amd64 arm64 x86"
 fi
 
 LICENSE="GPL-2+"
diff --git a/kde-misc/kio-gdrive/kio-gdrive-1.2.7-r1.ebuild b/kde-misc/kio-gdrive/kio-gdrive-20.08.0.ebuild
index e7eb5ed98d46..ff0a142385e5 100644
--- a/kde-misc/kio-gdrive/kio-gdrive-1.2.7-r1.ebuild
+++ b/kde-misc/kio-gdrive/kio-gdrive-20.08.0.ebuild
@@ -5,45 +5,39 @@ EAPI=7
 
 ECM_HANDBOOK="forceoptional"
 ECM_TEST="optional"
-KFMIN=5.60.0
-QTMIN=5.12.3
+KDE_ORG_CATEGORY="network"
+KDE_RELEASE_SERVICE="true"
+PVCUT=$(ver_cut 1-3)
+KFMIN=5.72.0
+QTMIN=5.14.2
 inherit ecm kde.org
 
 DESCRIPTION="KIO Slave for Google Drive service"
-HOMEPAGE="https://phabricator.kde.org/project/profile/72/"
-
-if [[ ${KDE_BUILD_TYPE} != live ]] ; then
-	SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm64 x86"
-fi
+HOMEPAGE="https://kde.org/applications/internet/org.kde.kio_gdrive"
 
 LICENSE="GPL-2+"
 SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE="+kaccounts"
 
 BDEPEND="dev-util/intltool"
-COMMON_DEPEND="
+RDEPEND="
 	>=dev-qt/qtwidgets-${QTMIN}:5
-	=kde-apps/libkgapi-19.12*:5
+	>=kde-apps/libkgapi-19.08.0:5
 	>=kde-frameworks/kcoreaddons-${KFMIN}:5
 	>=kde-frameworks/ki18n-${KFMIN}:5
 	>=kde-frameworks/kio-${KFMIN}:5
 	>=kde-frameworks/knotifications-${KFMIN}:5
-	kaccounts? ( =kde-apps/kaccounts-integration-19.12*:5 )
+	kaccounts? ( >=kde-apps/kaccounts-integration-${PVCUT}:5 )
 	!kaccounts? ( dev-libs/qtkeychain:=[qt5(+)] )
 "
-DEPEND="${COMMON_DEPEND}
+DEPEND="${RDEPEND}
 	>=dev-qt/qtgui-${QTMIN}:5
 	>=dev-qt/qtnetwork-${QTMIN}:5
 "
-RDEPEND="${COMMON_DEPEND}
-	kaccounts? ( >=kde-apps/kaccounts-providers-19.08.0:5 )
-"
 
 DOCS=( README.md )
 
-PATCHES=( "${FILESDIR}"/${PN}-1.2.6-refresh-credentials.patch )
-
 src_configure() {
 	local mycmakeargs=(
 		$(cmake_use_find_package kaccounts KAccounts)