commit: e723e48c301be94928656fb64e672320c06103ed Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Wed Aug 21 22:01:51 2024 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Wed Aug 21 22:01:51 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e723e48c
kde-misc/kio-gdrive: Allow kde-apps/kaccounts-integration:5 again ... by conditionalising 24.02 compat patch, in order to be able to stabilise. Bug: https://bugs.gentoo.org/938291 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> kde-misc/kio-gdrive/kio-gdrive-23.08.5-r2.ebuild | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/kde-misc/kio-gdrive/kio-gdrive-23.08.5-r2.ebuild b/kde-misc/kio-gdrive/kio-gdrive-23.08.5-r2.ebuild index c91c6d257c47..629c3fcbffcc 100644 --- a/kde-misc/kio-gdrive/kio-gdrive-23.08.5-r2.ebuild +++ b/kde-misc/kio-gdrive/kio-gdrive-23.08.5-r2.ebuild @@ -21,7 +21,10 @@ IUSE="kf6compat +share" COMMON_DEPEND=" >=dev-qt/qtgui-${QTMIN}:5 >=dev-qt/qtwidgets-${QTMIN}:5 - kde-apps/kaccounts-integration:6[qt5] + || ( + kde-apps/kaccounts-integration:6[qt5] + >=kde-apps/kaccounts-integration-23.08:5 + ) kde-apps/libkgapi:5 >=kde-frameworks/kcoreaddons-${KFMIN}:5 >=kde-frameworks/ki18n-${KFMIN}:5 @@ -46,9 +49,10 @@ ECM_REMOVE_FROM_INSTALL=( /usr/share/remoteview/gdrive-network.desktop ) -PATCHES=( "${FILESDIR}/${P}-kaccounts-integration-24.02.patch" ) - src_prepare() { + if has_version -b "kde-apps/kaccounts-integration:6[qt5]"; then + PATCHES+=( "${FILESDIR}/${P}-kaccounts-integration-24.02.patch" ) + fi ecm_src_prepare ecm_punt_po_install }
