Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status
summaryrefslogtreecommitdiff
path: root/kde-misc/kio-gdrive
diff options
context:
space:
mode:
Diffstat (limited to 'kde-misc/kio-gdrive')
-rw-r--r--kde-misc/kio-gdrive/Manifest4
-rw-r--r--kde-misc/kio-gdrive/files/kio-gdrive-23.08.5-kaccounts-integration-24.02.patch53
-rw-r--r--kde-misc/kio-gdrive/kio-gdrive-22.04.2.ebuild52
-rw-r--r--kde-misc/kio-gdrive/kio-gdrive-23.08.5-r1.ebuild67
-rw-r--r--kde-misc/kio-gdrive/kio-gdrive-23.08.5.ebuild (renamed from kde-misc/kio-gdrive/kio-gdrive-21.12.3.ebuild)28
-rw-r--r--kde-misc/kio-gdrive/kio-gdrive-24.02.2.ebuild47
-rw-r--r--kde-misc/kio-gdrive/metadata.xml2
7 files changed, 183 insertions, 70 deletions
diff --git a/kde-misc/kio-gdrive/Manifest b/kde-misc/kio-gdrive/Manifest
index 229ff90a80c3..c88e018d50ae 100644
--- a/kde-misc/kio-gdrive/Manifest
+++ b/kde-misc/kio-gdrive/Manifest
@@ -1,2 +1,2 @@
-DIST kio-gdrive-21.12.3.tar.xz 71128 BLAKE2B 31139ab720a06bdb65057b41ea56c96234965e1c0f325ae37bfa506ca5db0ac56ad81496890afda1423c77905d25168ddef8d1d0cddf3c58ebab635cf60ce28a SHA512 cb2cbc10ff14aa00c1a5b64ada1dfce6bdc7070f27b39613b6ec1d9f147a5d73356329f72c6db4eca783537550e78610b257d549f013e7ad122fec917b2165c0
-DIST kio-gdrive-22.04.2.tar.xz 72036 BLAKE2B 9e0a158bb62a66bc6f43cab5d925f681ca2296cfd9a9333d6ba895f42548989913840edc0ec4c88b73958ac766c201619603061cb26ef47d8facd74618bf27bf SHA512 343501f91ef306864c39203d97f2a652ee66f1746c2fc345f39ab0c93e08bd13ed6eae42c35a9a5c665bae9c267170b7520aadb595e2e76dafb0de3ee6def00c
+DIST kio-gdrive-23.08.5.tar.xz 79452 BLAKE2B 7fab730a2781a0cf534beda35a48a2663cdd9e067759991e277775d1d5a492596cbdf9b3427e67da0d10415bf717ba46dd0d3d11c143de3733065e836b4fb345 SHA512 9535e64997b026aa6a5b6a092986486f726151948614f76c1f044e9fab6c0651f861776e928613a757c656fdd12cbba529dd63d04e1f58d5a43966b8d9d448c8
+DIST kio-gdrive-24.02.2.tar.xz 80812 BLAKE2B 6b12bb4d660f8d1ef95aedb0a5ad5392aff2976b0e5c8c24c55efd9b52b836c3119d2af376f4aef47d9d30b0a0958dd528183371ef7f015f0b9179aa9a27d905 SHA512 d91a3aea2f69ab68251b53edccafbbc914edbd865fee837d26b2f3428559d983cd50c536436d91479a957242ff2f35c03f4d8e13661398acf594ce0d5a880269
diff --git a/kde-misc/kio-gdrive/files/kio-gdrive-23.08.5-kaccounts-integration-24.02.patch b/kde-misc/kio-gdrive/files/kio-gdrive-23.08.5-kaccounts-integration-24.02.patch
new file mode 100644
index 000000000000..329b0f7ac503
--- /dev/null
+++ b/kde-misc/kio-gdrive/files/kio-gdrive-23.08.5-kaccounts-integration-24.02.patch
@@ -0,0 +1,53 @@
+From f3a8d9dbc22d3743e03b1b0092baa3b060a1c001 Mon Sep 17 00:00:00 2001
+From: Nicolas Fella <nicolas.fella@gmx.de>
+Date: Sun, 10 Dec 2023 22:27:46 +0100
+Subject: [PATCH] Adapt to KAccounts API change
+
+---
+ kaccounts/kaccountsplugin.cpp | 2 +-
+ kaccounts/kaccountsplugin.h | 2 +-
+ src/kaccountsmanager.cpp | 2 +-
+ 3 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/kaccounts/kaccountsplugin.cpp b/kaccounts/kaccountsplugin.cpp
+index 676bc4a..9ba2d17 100644
+--- a/kaccounts/kaccountsplugin.cpp
++++ b/kaccounts/kaccountsplugin.cpp
+@@ -18,7 +18,7 @@
+ K_PLUGIN_CLASS_WITH_JSON(GoogleDrivePlugin, "kaccountsplugin.json")
+
+ GoogleDrivePlugin::GoogleDrivePlugin(QObject *parent, const QVariantList &args)
+- : KAccountsDPlugin(parent, args)
++ : KAccounts::KAccountsDPlugin(parent, args)
+ {
+ }
+
+diff --git a/kaccounts/kaccountsplugin.h b/kaccounts/kaccountsplugin.h
+index d330c64..748feac 100644
+--- a/kaccounts/kaccountsplugin.h
++++ b/kaccounts/kaccountsplugin.h
+@@ -9,7 +9,7 @@
+
+ #include <KAccounts/KAccountsDPlugin>
+
+-class GoogleDrivePlugin : public KAccountsDPlugin
++class GoogleDrivePlugin : public KAccounts::KAccountsDPlugin
+ {
+ Q_OBJECT
+ public:
+diff --git a/src/kaccountsmanager.cpp b/src/kaccountsmanager.cpp
+index 6660a4e..c6d4273 100644
+--- a/src/kaccountsmanager.cpp
++++ b/src/kaccountsmanager.cpp
+@@ -151,7 +151,7 @@ void KAccountsManager::loadAccounts()
+
+ AccountPtr KAccountsManager::getAccountCredentials(Accounts::AccountId id, const QString& displayName)
+ {
+- auto job = new GetCredentialsJob(id, nullptr);
++ auto job = new KAccounts::GetCredentialsJob(id, nullptr);
+ job->exec();
+ if (job->error()) {
+ qCWarning(GDRIVE) << "GetCredentialsJob failed:" << job->errorString();
+--
+GitLab
+
diff --git a/kde-misc/kio-gdrive/kio-gdrive-22.04.2.ebuild b/kde-misc/kio-gdrive/kio-gdrive-22.04.2.ebuild
deleted file mode 100644
index dd9f15769327..000000000000
--- a/kde-misc/kio-gdrive/kio-gdrive-22.04.2.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_HANDBOOK="forceoptional"
-ECM_TEST="optional"
-KDE_GEAR="true"
-KDE_ORG_CATEGORY="network"
-KFMIN=5.92.0
-QTMIN=5.15.3
-inherit ecm kde.org
-
-DESCRIPTION="KIO Slave for Google Drive service"
-HOMEPAGE="https://apps.kde.org/kio_gdrive/"
-
-LICENSE="GPL-2+"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE="+kaccounts +share"
-
-REQUIRED_USE="share? ( kaccounts )"
-
-COMMON_DEPEND="
- >=dev-qt/qtgui-${QTMIN}:5
- >=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.08.3:5 )
- !kaccounts? ( dev-libs/qtkeychain:=[qt5(+)] )
- share? ( >=kde-frameworks/purpose-${KFMIN}:5 )
-"
-DEPEND="${COMMON_DEPEND}
- >=dev-qt/qtnetwork-${QTMIN}:5
-"
-RDEPEND="${COMMON_DEPEND}
- kaccounts? ( >=kde-apps/kaccounts-providers-20.08.3:5 )
-"
-BDEPEND="dev-util/intltool"
-
-DOCS=( README.md )
-
-src_configure() {
- local mycmakeargs=(
- $(cmake_use_find_package kaccounts KAccounts)
- $(cmake_use_find_package share KF5Purpose)
- )
- ecm_src_configure
-}
diff --git a/kde-misc/kio-gdrive/kio-gdrive-23.08.5-r1.ebuild b/kde-misc/kio-gdrive/kio-gdrive-23.08.5-r1.ebuild
new file mode 100644
index 000000000000..86ad6360a782
--- /dev/null
+++ b/kde-misc/kio-gdrive/kio-gdrive-23.08.5-r1.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="forceoptional"
+ECM_TEST="optional"
+KDE_ORG_CATEGORY="network"
+KFMIN=5.106.0
+QTMIN=5.15.9
+inherit ecm gear.kde.org
+
+DESCRIPTION="KIO worker for Google Drive service"
+HOMEPAGE="https://apps.kde.org/kio_gdrive/"
+
+LICENSE="GPL-2+"
+SLOT="5"
+KEYWORDS="~amd64"
+IUSE="kf6compat +share"
+
+COMMON_DEPEND="
+ >=dev-qt/qtgui-${QTMIN}:5
+ >=dev-qt/qtwidgets-${QTMIN}:5
+ kde-apps/kaccounts-integration:6[qt5]
+ kde-apps/libkgapi:5
+ >=kde-frameworks/kcoreaddons-${KFMIN}:5
+ >=kde-frameworks/ki18n-${KFMIN}:5
+ >=kde-frameworks/kio-${KFMIN}:5
+ >=kde-frameworks/knotifications-${KFMIN}:5
+ share? ( >=kde-frameworks/purpose-${KFMIN}:5 )
+"
+DEPEND="${COMMON_DEPEND}
+ >=dev-qt/qtnetwork-${QTMIN}:5
+"
+RDEPEND="${COMMON_DEPEND}
+ kde-apps/kaccounts-providers:*
+ kf6compat? ( kde-misc/kio-gdrive:6 )
+"
+BDEPEND="dev-util/intltool"
+
+DOCS=( README.md )
+
+PATCHES=( "${FILESDIR}/${P}-kaccounts-integration-24.02.patch" )
+
+src_configure() {
+ local mycmakeargs=(
+ $(cmake_use_find_package share KF5Purpose)
+ )
+ ecm_src_configure
+}
+
+src_install() {
+ ecm_src_install
+
+ if use kf6compat; then
+ rm "${D}"/usr/share/accounts/services/kde/google-drive.service \
+ "${D}"/usr/share/metainfo/org.kde.kio_gdrive.metainfo.xml \
+ "${D}"/usr/share/remoteview/gdrive-network.desktop || die
+ if use handbook; then
+ rm -r "${D}"/usr/share/help || die
+ fi
+ if use share; then
+ rm -r "${D}"/usr/share/purpose/purpose_gdrive_config.qml || die
+ fi
+ rm -r "${D}"/usr/share/locale || die
+ fi
+}
diff --git a/kde-misc/kio-gdrive/kio-gdrive-21.12.3.ebuild b/kde-misc/kio-gdrive/kio-gdrive-23.08.5.ebuild
index 91f97aa438eb..2c96475d1507 100644
--- a/kde-misc/kio-gdrive/kio-gdrive-21.12.3.ebuild
+++ b/kde-misc/kio-gdrive/kio-gdrive-23.08.5.ebuild
@@ -1,43 +1,42 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
ECM_HANDBOOK="forceoptional"
ECM_TEST="optional"
-KDE_GEAR="true"
KDE_ORG_CATEGORY="network"
-KFMIN=5.88.0
-QTMIN=5.15.2
-inherit ecm kde.org
+KFMIN=5.106.0
+QTMIN=5.15.9
+inherit ecm gear.kde.org
-DESCRIPTION="KIO Slave for Google Drive service"
+DESCRIPTION="KIO worker for Google Drive service"
HOMEPAGE="https://apps.kde.org/kio_gdrive/"
LICENSE="GPL-2+"
SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
-IUSE="+kaccounts +share"
-
-REQUIRED_USE="share? ( kaccounts )"
+KEYWORDS="amd64 arm64 ~x86"
+IUSE="+share"
COMMON_DEPEND="
>=dev-qt/qtgui-${QTMIN}:5
>=dev-qt/qtwidgets-${QTMIN}:5
- >=kde-apps/libkgapi-19.08.0:5
+ || (
+ kde-apps/kaccounts-integration:6[qt5]
+ kde-apps/kaccounts-integration:5
+ )
+ kde-apps/libkgapi: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.08.3:5 )
- !kaccounts? ( dev-libs/qtkeychain:=[qt5(+)] )
share? ( >=kde-frameworks/purpose-${KFMIN}:5 )
"
DEPEND="${COMMON_DEPEND}
>=dev-qt/qtnetwork-${QTMIN}:5
"
RDEPEND="${COMMON_DEPEND}
- kaccounts? ( >=kde-apps/kaccounts-providers-20.08.3:5 )
+ kde-apps/kaccounts-providers:5
"
BDEPEND="dev-util/intltool"
@@ -45,7 +44,6 @@ DOCS=( README.md )
src_configure() {
local mycmakeargs=(
- $(cmake_use_find_package kaccounts KAccounts)
$(cmake_use_find_package share KF5Purpose)
)
ecm_src_configure
diff --git a/kde-misc/kio-gdrive/kio-gdrive-24.02.2.ebuild b/kde-misc/kio-gdrive/kio-gdrive-24.02.2.ebuild
new file mode 100644
index 000000000000..b21d30509b41
--- /dev/null
+++ b/kde-misc/kio-gdrive/kio-gdrive-24.02.2.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="forceoptional"
+ECM_TEST="optional"
+KDE_ORG_CATEGORY="network"
+KFMIN=6.0.0
+QTMIN=6.6.2
+inherit ecm gear.kde.org
+
+DESCRIPTION="KIO worker for Google Drive service"
+HOMEPAGE="https://apps.kde.org/kio_gdrive/"
+
+LICENSE="GPL-2+"
+SLOT="6"
+KEYWORDS="~amd64"
+IUSE="+share"
+
+COMMON_DEPEND="
+ >=dev-qt/qtbase-${QTMIN}:6[gui,widgets]
+ kde-apps/kaccounts-integration:6
+ kde-apps/libkgapi:6
+ >=kde-frameworks/kcoreaddons-${KFMIN}:6
+ >=kde-frameworks/ki18n-${KFMIN}:6
+ >=kde-frameworks/kio-${KFMIN}:6
+ >=kde-frameworks/knotifications-${KFMIN}:6
+ share? ( >=kde-frameworks/purpose-${KFMIN}:6 )
+"
+DEPEND="${COMMON_DEPEND}
+ >=dev-qt/qtbase-${QTMIN}:6[network]
+"
+RDEPEND="${COMMON_DEPEND}
+ !${CATEGORY}/${PN}:5[-kf6compat(-)]
+ kde-apps/kaccounts-providers:6
+"
+BDEPEND="dev-util/intltool"
+
+DOCS=( README.md )
+
+src_configure() {
+ local mycmakeargs=(
+ $(cmake_use_find_package share KF6Purpose)
+ )
+ ecm_src_configure
+}
diff --git a/kde-misc/kio-gdrive/metadata.xml b/kde-misc/kio-gdrive/metadata.xml
index 35ead628e97b..3517d3c77ec1 100644
--- a/kde-misc/kio-gdrive/metadata.xml
+++ b/kde-misc/kio-gdrive/metadata.xml
@@ -9,7 +9,7 @@
<bugs-to>https://bugs.kde.org/</bugs-to>
</upstream>
<use>
- <flag name="kaccounts">Use <pkg>kde-apps/kaccounts-integration</pkg> backend (default) instead of <pkg>dev-libs/qtkeychain</pkg></flag>
+ <flag name="kf6compat">Disable components colliding with KF6, depend on KF6 components instead</flag>
<flag name="share">Enable support for a share menu using <pkg>kde-frameworks/purpose</pkg></flag>
</use>
</pkgmetadata>