From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 5521F15852A for ; Wed, 21 Aug 2024 22:02:59 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A31E9E2A92; Wed, 21 Aug 2024 22:02:58 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 8E5CDE2A92 for ; Wed, 21 Aug 2024 22:02:58 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id BDEDC340C7C for ; Wed, 21 Aug 2024 22:02:57 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 2B78111B6 for ; Wed, 21 Aug 2024 22:02:56 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1724277711.e723e48c301be94928656fb64e672320c06103ed.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: kde-misc/kio-gdrive/ X-VCS-Repository: repo/gentoo X-VCS-Files: kde-misc/kio-gdrive/kio-gdrive-23.08.5-r2.ebuild X-VCS-Directories: kde-misc/kio-gdrive/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: e723e48c301be94928656fb64e672320c06103ed X-VCS-Branch: master Date: Wed, 21 Aug 2024 22:02:56 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 9edab525-65b0-4a7c-af40-03a1bac8428d X-Archives-Hash: d27aad8f5bc08e9708152b3f549a7ea2 commit: e723e48c301be94928656fb64e672320c06103ed Author: Andreas Sturmlechner gentoo org> AuthorDate: Wed Aug 21 22:01:51 2024 +0000 Commit: Andreas Sturmlechner gentoo 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 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 }