From 38423c67c8a23f6a1bc42038193182e2da3116eb Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 25 Apr 2020 11:37:10 +0100 Subject: gentoo resync : 25.04.2020 --- kde-misc/kio-gdrive/Manifest | 5 +- ...-gdrive-1.2.7-kaccounts-integration-20.04.patch | 97 ---------------------- kde-misc/kio-gdrive/kio-gdrive-1.2.7-r1.ebuild | 52 ++++++++++++ kde-misc/kio-gdrive/kio-gdrive-1.2.7.ebuild | 58 ------------- kde-misc/kio-gdrive/kio-gdrive-1.3.0.ebuild | 47 +++++++++++ 5 files changed, 102 insertions(+), 157 deletions(-) delete mode 100644 kde-misc/kio-gdrive/files/kio-gdrive-1.2.7-kaccounts-integration-20.04.patch create mode 100644 kde-misc/kio-gdrive/kio-gdrive-1.2.7-r1.ebuild delete mode 100644 kde-misc/kio-gdrive/kio-gdrive-1.2.7.ebuild create mode 100644 kde-misc/kio-gdrive/kio-gdrive-1.3.0.ebuild (limited to 'kde-misc/kio-gdrive') diff --git a/kde-misc/kio-gdrive/Manifest b/kde-misc/kio-gdrive/Manifest index f73bad16827e..bfca979fefce 100644 --- a/kde-misc/kio-gdrive/Manifest +++ b/kde-misc/kio-gdrive/Manifest @@ -1,5 +1,6 @@ AUX kio-gdrive-1.2.6-refresh-credentials.patch 4224 BLAKE2B f70a40eef14d31f296effb554308303fe9b82c21b8e3c3a56020d5548dfbd9a967ef27d24ac4b44398c681db64dabff87a088ad3e47fe9e5f962af2080471f31 SHA512 8fc99adb52f1e9b9c49c94357103a51d3de367ea1d5a98afe361910307fe1a424b9f0c5fb0ec1e5f0cc2183ac87f2d6cb1730ed12fecc76b68e8860317dfbedf -AUX kio-gdrive-1.2.7-kaccounts-integration-20.04.patch 3116 BLAKE2B 53ef65fff7e28afb813582131f69e8317eddff5689c6e2c046d62015163ab27d406697df8b75c1f1c120b56bcacd49f9502ff5c724ad6e02f0353e0f207bcd79 SHA512 f4eedfe7c2e83f7efe426797f27ea17cad5c9996cedddd341c190c3073e4a45a06d402603b15f4ea992a3a60d624b50d2cd48bd04202d39151cf4d7f3addb6b1 DIST kio-gdrive-1.2.7.tar.xz 46748 BLAKE2B 308c7d8d55c4eef175e2ef6030f1fbcdb59fdc6cd33f6c0bd5c35efe7bd21cf7f6cf7293b355f30b7b05effae79b91e357cc5a93ed866db850953f392bd65e0f SHA512 f1eedad2cd244e38f6cdf397e9488cb7f31fe7c4b17825f3b0882ff46f7f62f087e7b2bc59db434b4a55641920b8b03f3dec6adf7031ccc2277c7a0b166f9c80 -EBUILD kio-gdrive-1.2.7.ebuild 1383 BLAKE2B 758f52b4a494feb1f9dad578fce05caf322599af76a19e3c7482bd2bf12ae02e1677f77375c6fccc48c7ecb5f3bad98de982f8c0b00c5c51afaf5f5a2322816f SHA512 84dbfa0d327837bf40b57ee6024e22805b307ab77359c37de4fd8a302f1090aae996dd62ab781e7f31d84f3b1dfda26a587b818748850a1a705aa88fc9b6afef +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 1060 BLAKE2B 8d91b3cb32cde49dfcde778c4004c31d1c3dbcac1b5cd2c5307c85b5c09054e07b13ae72d0287d3fdad2435a9048acbba04d473d3cf85921caf086cebe145980 SHA512 60f5e2ef713e6bfea74c7e0bc1c8dc3990068b8cd0628d061cfebd806f2674fd026db3291597a424d4c395934fe2a9017b6a0a4753cbf407a765ba2f285dbe49 MISC metadata.xml 402 BLAKE2B 80f60bca3fa59b7e22727709066453e1002c786c2eda688aa437f86fd99d73aa4b8c35a22571d3f774c55d16b1a4267fb0242253fd38a45890701755cca72afa SHA512 2c94ff5a07cb0a89d93cf798ee2b9a9f163f448e9d6d3185c06d58b42c1a9ef480adfafd540a021d4f9ebab6bb78e979c74e9a83867abff13f66b2b35eaafd21 diff --git a/kde-misc/kio-gdrive/files/kio-gdrive-1.2.7-kaccounts-integration-20.04.patch b/kde-misc/kio-gdrive/files/kio-gdrive-1.2.7-kaccounts-integration-20.04.patch deleted file mode 100644 index bc6e7536e82b..000000000000 --- a/kde-misc/kio-gdrive/files/kio-gdrive-1.2.7-kaccounts-integration-20.04.patch +++ /dev/null @@ -1,97 +0,0 @@ -From 088fe1964fcf7150eb85dc66cbe3670489729f15 Mon Sep 17 00:00:00 2001 -From: Nicolas Fella -Date: Mon, 16 Mar 2020 10:39:08 +0100 -Subject: Adapt to new KAccounts plugin system - -Summary: KAccounts was ported from QPluginLoader to KPluginLoader in D27633. Adapt the KAccounts plugin to stay compatible - -Test Plan: Added a google account. Got a notification that my drive can now be used - -Reviewers: #kio_gdrive, elvisangelaccio - -Reviewed By: #kio_gdrive, elvisangelaccio - -Differential Revision: https://phabricator.kde.org/D27656 ---- - kaccounts/CMakeLists.txt | 1 + - kaccounts/kaccountsplugin.cpp | 10 ++++++++-- - kaccounts/kaccountsplugin.h | 5 +---- - kaccounts/kaccountsplugin.json | 12 ++++++++++++ - 4 files changed, 22 insertions(+), 6 deletions(-) - create mode 100644 kaccounts/kaccountsplugin.json - -diff --git a/kaccounts/CMakeLists.txt b/kaccounts/CMakeLists.txt -index 2a7e796..bb26513 100644 ---- a/kaccounts/CMakeLists.txt -+++ b/kaccounts/CMakeLists.txt -@@ -4,6 +4,7 @@ find_package(Intltool REQUIRED) - kaccounts_add_service(${CMAKE_CURRENT_SOURCE_DIR}/google-drive.service.in) - - kcoreaddons_add_plugin(kaccounts_gdrive -+ JSON kaccountsplugin.json - SOURCES kaccountsplugin.cpp - INSTALL_NAMESPACE kaccounts/daemonplugins) - -diff --git a/kaccounts/kaccountsplugin.cpp b/kaccounts/kaccountsplugin.cpp -index 5499f13..3e6fb7c 100644 ---- a/kaccounts/kaccountsplugin.cpp -+++ b/kaccounts/kaccountsplugin.cpp -@@ -25,8 +25,12 @@ - #include - #include - --GoogleDrivePlugin::GoogleDrivePlugin(QObject *parent) -- : KAccountsDPlugin(parent) -+#include -+ -+K_PLUGIN_CLASS_WITH_JSON(GoogleDrivePlugin, "kaccountsplugin.json") -+ -+GoogleDrivePlugin::GoogleDrivePlugin(QObject *parent, const QVariantList &args) -+ : KAccountsDPlugin(parent, args) - { - } - -@@ -72,3 +76,5 @@ void GoogleDrivePlugin::onServiceDisabled(const Accounts::AccountId accountId, c - Q_UNUSED(accountId) - Q_UNUSED(service) - } -+ -+#include "kaccountsplugin.moc" -diff --git a/kaccounts/kaccountsplugin.h b/kaccounts/kaccountsplugin.h -index 82ae739..8613041 100644 ---- a/kaccounts/kaccountsplugin.h -+++ b/kaccounts/kaccountsplugin.h -@@ -24,11 +24,8 @@ - class GoogleDrivePlugin : public KAccountsDPlugin - { - Q_OBJECT -- Q_PLUGIN_METADATA(IID "org.kde.kaccounts.DPlugin") -- Q_INTERFACES(KAccountsDPlugin) -- - public: -- GoogleDrivePlugin(QObject *parent = nullptr); -+ explicit GoogleDrivePlugin(QObject *parent, const QVariantList &args); - - public slots: - void onAccountCreated(const Accounts::AccountId accountId, const Accounts::ServiceList &serviceList) override; -diff --git a/kaccounts/kaccountsplugin.json b/kaccounts/kaccountsplugin.json -new file mode 100644 -index 0000000..89e8142 ---- /dev/null -+++ b/kaccounts/kaccountsplugin.json -@@ -0,0 +1,12 @@ -+{ -+ "KPlugin": { -+ "Description": "Integrate KIO gdrive", -+ "EnabledByDefault": true, -+ "Icon": "system-file-manager", -+ "Id": "kaccounts_kio_gdrive", -+ "License": "GPL", -+ "Name": "KIO gdrive", -+ "Version": "0.1" -+ } -+} -+ --- -cgit v1.1 - diff --git a/kde-misc/kio-gdrive/kio-gdrive-1.2.7-r1.ebuild b/kde-misc/kio-gdrive/kio-gdrive-1.2.7-r1.ebuild new file mode 100644 index 000000000000..e7eb5ed98d46 --- /dev/null +++ b/kde-misc/kio-gdrive/kio-gdrive-1.2.7-r1.ebuild @@ -0,0 +1,52 @@ +# 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" +COMMON_DEPEND=" + >=dev-qt/qtwidgets-${QTMIN}:5 + =kde-apps/libkgapi-19.12*: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? ( dev-libs/qtkeychain:=[qt5(+)] ) +" +DEPEND="${COMMON_DEPEND} + >=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) + ) + ecm_src_configure +} diff --git a/kde-misc/kio-gdrive/kio-gdrive-1.2.7.ebuild b/kde-misc/kio-gdrive/kio-gdrive-1.2.7.ebuild deleted file mode 100644 index a36f78862b12..000000000000 --- a/kde-misc/kio-gdrive/kio-gdrive-1.2.7.ebuild +++ /dev/null @@ -1,58 +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" -COMMON_DEPEND=" - >=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:5 ) - !kaccounts? ( dev-libs/qtkeychain:=[qt5(+)] ) -" -DEPEND="${COMMON_DEPEND} - >=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_prepare() { - has_version ">=kde-apps/kaccounts-providers-20.03.80" && - PATCHES+=( "${FILESDIR}"/${P}-kaccounts-integration-20.04.patch ) - ecm_src_prepare -} - -src_configure() { - local mycmakeargs=( - $(cmake_use_find_package kaccounts KAccounts) - ) - ecm_src_configure -} diff --git a/kde-misc/kio-gdrive/kio-gdrive-1.3.0.ebuild b/kde-misc/kio-gdrive/kio-gdrive-1.3.0.ebuild new file mode 100644 index 000000000000..98af0d68e46e --- /dev/null +++ b/kde-misc/kio-gdrive/kio-gdrive-1.3.0.ebuild @@ -0,0 +1,47 @@ +# 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" +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 +} -- cgit v1.2.3