gentoo resync : 25.11.2020

3 files changed, 12 insertions, 58 deletions

diff --git a/kde-misc/kio-gdrive/Manifest b/kde-misc/kio-gdrive/Manifest
index 0a96f4c2edd7..fe127926edf3 100644
--- a/kde-misc/kio-gdrive/Manifest
+++ b/kde-misc/kio-gdrive/Manifest
@@ -1,5 +1,3 @@
-DIST kio-gdrive-1.3.0.tar.xz 51668 BLAKE2B a5c9bc347e5b40998449b613e8ad73c362d82d2486a1e91527f84acc5473d603b3cca422bd7c67cff28e49b08803904fdf752bec742bae752e868b8a84321684 SHA512 b0a6be2b59512d3faf6c677c6f3ffdcc9a38fff3a41d0bc6a29566008d7da3ab524fb189ddd219308a8ac8244fbed67c01da480e8193ed0aeb815fe64d72988a
-DIST kio-gdrive-20.08.1.tar.xz 57056 BLAKE2B e5804b035c8db7eef0e8e0f1809cb62e5f0f5fd07aa7a35f62384ff0e18ade24bf4acdc088611b6ee5b7822480b51227d0a3421f79b1f2966e3c079a2cf3ec32 SHA512 3b1b0ca114b72182e36dbfcd166f32bc2e1a128d031d4d95825ffa088b25fe7266dbafb812f64e89c033d4d56f20dcca8da19ae0861e97fc4e08512880f77274
-EBUILD kio-gdrive-1.3.0.ebuild 1069 BLAKE2B 258a60d0c4a8cb207b1799a4e8bbe05c0d75f616377d4eccfeb02b317c8cc4a06c6cd03b4f4c217e7fde0b822feb4a5e18044365c66f23b4385f6548fdc76622 SHA512 8900f71af6c32a24cbd232cb1c9bfc3189919ac4a0f682fd057480e4296dae6891ea97a26ea376e50d9cfc8a1ce342a53d338ba8a329ca62498399fd64fca9f1
-EBUILD kio-gdrive-20.08.1.ebuild 1050 BLAKE2B db4a9e73a22fb1dcf249c8b29dd700bc2209c49e6fa15f8667e6992313563b1d4922947919e31d58a30d5dc0ed7cb2e26a2c5f906d1fea40860d1ecfc8610656 SHA512 8b3cca5eaa2f2e7879abeea2201542b25565e867d11fbb2bed31f7bf1678115327e6842b6297e9e6966475ce0d197195da10ac8bb5ec3a6acfacc66d43c8c556
+DIST kio-gdrive-20.08.3.tar.xz 57968 BLAKE2B 3f17f957dbae9899eaead570e891f42717bc865deb834055ff8eb881ee4d02baea7caf63825912520f0d3107a810d4fc17df7e0839975dbf40f620c6a8cfb956 SHA512 1255eb4a1955c1862ce7e85908c38c637733d98ca71eb54eaa1986d9ec7e81097f453681b820e9c1a294ba876038fc70a6f0a94cf54353b305e880ea1e573db4
+EBUILD kio-gdrive-20.08.3.ebuild 1130 BLAKE2B 6346e4c036e18658f8597a28f9917dabaa5e1ab56d5fdcaae3c40cb535cd3663879c2000b73bb195ad04bdc0a7728ddd20595c1e98e1ec7ad77321ade10024d3 SHA512 182e67e070fa8a63d57af349a74bd04e772e51d4947eba2572d70922e5eea8a74b084fd228aba19f7ab02d0dc1facf1af8b57a7cc47a92a0f6309f764fce9a1a
 MISC metadata.xml 402 BLAKE2B 80f60bca3fa59b7e22727709066453e1002c786c2eda688aa437f86fd99d73aa4b8c35a22571d3f774c55d16b1a4267fb0242253fd38a45890701755cca72afa SHA512 2c94ff5a07cb0a89d93cf798ee2b9a9f163f448e9d6d3185c06d58b42c1a9ef480adfafd540a021d4f9ebab6bb78e979c74e9a83867abff13f66b2b35eaafd21
diff --git a/kde-misc/kio-gdrive/kio-gdrive-1.3.0.ebuild b/kde-misc/kio-gdrive/kio-gdrive-1.3.0.ebuild
deleted file mode 100644
index 3778ffc71683..000000000000
--- a/kde-misc/kio-gdrive/kio-gdrive-1.3.0.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-ECM_TEST="optional"
-KFMIN=5.60.0
-QTMIN=5.12.3
-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
-
-LICENSE="GPL-2+"
-SLOT="5"
-IUSE="+kaccounts"
-
-BDEPEND="dev-util/intltool"
-RDEPEND="
-	>=dev-qt/qtwidgets-${QTMIN}: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-20.03.90:5 )
-	!kaccounts? ( dev-libs/qtkeychain:=[qt5(+)] )
-"
-DEPEND="${RDEPEND}
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-"
-
-DOCS=( README.md )
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package kaccounts KAccounts)
-	)
-	ecm_src_configure
-}
diff --git a/kde-misc/kio-gdrive/kio-gdrive-20.08.1.ebuild b/kde-misc/kio-gdrive/kio-gdrive-20.08.3.ebuild
index ff0a142385e5..ff89c6625633 100644
--- a/kde-misc/kio-gdrive/kio-gdrive-20.08.1.ebuild
+++ b/kde-misc/kio-gdrive/kio-gdrive-20.08.3.ebuild
@@ -8,20 +8,21 @@ ECM_TEST="optional"
 KDE_ORG_CATEGORY="network"
 KDE_RELEASE_SERVICE="true"
 PVCUT=$(ver_cut 1-3)
-KFMIN=5.72.0
-QTMIN=5.14.2
+KFMIN=5.74.0
+QTMIN=5.15.1
 inherit ecm kde.org
 
 DESCRIPTION="KIO Slave for Google Drive service"
-HOMEPAGE="https://kde.org/applications/internet/org.kde.kio_gdrive"
+HOMEPAGE="https://apps.kde.org/en/kio_gdrive"
 
 LICENSE="GPL-2+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
 IUSE="+kaccounts"
 
 BDEPEND="dev-util/intltool"
-RDEPEND="
+COMMON_DEPEND="
+	>=dev-qt/qtgui-${QTMIN}:5
 	>=dev-qt/qtwidgets-${QTMIN}:5
 	>=kde-apps/libkgapi-19.08.0:5
 	>=kde-frameworks/kcoreaddons-${KFMIN}:5
@@ -31,10 +32,12 @@ RDEPEND="
 	kaccounts? ( >=kde-apps/kaccounts-integration-${PVCUT}:5 )
 	!kaccounts? ( dev-libs/qtkeychain:=[qt5(+)] )
 "
-DEPEND="${RDEPEND}
-	>=dev-qt/qtgui-${QTMIN}:5
+DEPEND="${COMMON_DEPEND}
 	>=dev-qt/qtnetwork-${QTMIN}:5
 "
+RDEPEND="${COMMON_DEPEND}
+	kaccounts? ( >=kde-apps/kaccounts-providers-${PVCUT}:5 )
+"
 
 DOCS=( README.md )