commit: 02225dc1f8b3f27ac232d08d3e6397697d19cd6a Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Wed Feb 28 08:51:30 2024 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Wed Feb 28 09:08:51 2024 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=02225dc1
kde-misc/kio-gdrive: Port 24.02 to KF6, block kio-gdrive:5[-kf6compat(-)] Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> kde-misc/kio-gdrive/kio-gdrive-24.02.0.ebuild | 33 ++++++++++------------ .../kio-gdrive/kio-gdrive-24.02.49.9999.ebuild | 33 ++++++++++------------ kde-misc/kio-gdrive/kio-gdrive-9999.ebuild | 1 + 3 files changed, 31 insertions(+), 36 deletions(-) diff --git a/kde-misc/kio-gdrive/kio-gdrive-24.02.0.ebuild b/kde-misc/kio-gdrive/kio-gdrive-24.02.0.ebuild index 5ff81ded0f..3987cb040e 100644 --- a/kde-misc/kio-gdrive/kio-gdrive-24.02.0.ebuild +++ b/kde-misc/kio-gdrive/kio-gdrive-24.02.0.ebuild @@ -6,37 +6,34 @@ EAPI=8 ECM_HANDBOOK="forceoptional" ECM_TEST="optional" KDE_ORG_CATEGORY="network" -KFMIN=5.113.0 -QTMIN=5.15.9 +KFMIN=6.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="5" +SLOT="6" KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86" IUSE="+share" COMMON_DEPEND=" - >=dev-qt/qtgui-${QTMIN}:5 - >=dev-qt/qtwidgets-${QTMIN}: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 - share? ( >=kde-frameworks/purpose-${KFMIN}:5 ) + >=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/qtnetwork-${QTMIN}:5 + >=dev-qt/qtbase-${QTMIN}:6[network] " RDEPEND="${COMMON_DEPEND} - kde-apps/kaccounts-providers:5 + !${CATEGORY}/${PN}:5[-kf6compat(-)] + kde-apps/kaccounts-providers:6 " BDEPEND="dev-util/intltool" @@ -44,7 +41,7 @@ DOCS=( README.md ) src_configure() { local mycmakeargs=( - $(cmake_use_find_package share KF5Purpose) + $(cmake_use_find_package share KF6Purpose) ) ecm_src_configure } diff --git a/kde-misc/kio-gdrive/kio-gdrive-24.02.49.9999.ebuild b/kde-misc/kio-gdrive/kio-gdrive-24.02.49.9999.ebuild index 5ac41e8993..5e755dc696 100644 --- a/kde-misc/kio-gdrive/kio-gdrive-24.02.49.9999.ebuild +++ b/kde-misc/kio-gdrive/kio-gdrive-24.02.49.9999.ebuild @@ -6,37 +6,34 @@ EAPI=8 ECM_HANDBOOK="forceoptional" ECM_TEST="optional" KDE_ORG_CATEGORY="network" -KFMIN=5.113.0 -QTMIN=5.15.9 +KFMIN=5.249.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="5" +SLOT="6" KEYWORDS="" IUSE="+share" COMMON_DEPEND=" - >=dev-qt/qtgui-${QTMIN}:5 - >=dev-qt/qtwidgets-${QTMIN}: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 - share? ( >=kde-frameworks/purpose-${KFMIN}:5 ) + >=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/qtnetwork-${QTMIN}:5 + >=dev-qt/qtbase-${QTMIN}:6[network] " RDEPEND="${COMMON_DEPEND} - kde-apps/kaccounts-providers:5 + !${CATEGORY}/${PN}:5[-kf6compat(-)] + kde-apps/kaccounts-providers:6 " BDEPEND="dev-util/intltool" @@ -44,7 +41,7 @@ DOCS=( README.md ) src_configure() { local mycmakeargs=( - $(cmake_use_find_package share KF5Purpose) + $(cmake_use_find_package share KF6Purpose) ) ecm_src_configure } diff --git a/kde-misc/kio-gdrive/kio-gdrive-9999.ebuild b/kde-misc/kio-gdrive/kio-gdrive-9999.ebuild index f246113cc4..5e755dc696 100644 --- a/kde-misc/kio-gdrive/kio-gdrive-9999.ebuild +++ b/kde-misc/kio-gdrive/kio-gdrive-9999.ebuild @@ -32,6 +32,7 @@ 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"
