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 BC9D815808B for ; Mon, 9 Sep 2024 14:40:04 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 764C3E29F5; Mon, 9 Sep 2024 14:40:03 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (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 5B703E29F5 for ; Mon, 9 Sep 2024 14:40:03 +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)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 0D089342FF9 for ; Mon, 9 Sep 2024 14:40:02 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B9D581F42 for ; Mon, 9 Sep 2024 14:39:58 +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: <1725892770.ce1293d2437263ef7ce8d54c00114197786af0f8.asturm@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: kde-misc/kio-gdrive-common/ X-VCS-Repository: proj/kde X-VCS-Files: kde-misc/kio-gdrive-common/kio-gdrive-common-24.08.49.9999.ebuild kde-misc/kio-gdrive-common/kio-gdrive-common-9999.ebuild X-VCS-Directories: kde-misc/kio-gdrive-common/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: ce1293d2437263ef7ce8d54c00114197786af0f8 X-VCS-Branch: master Date: Mon, 9 Sep 2024 14:39:58 +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: 42cecfac-c45a-44d4-af92-24b2621a69cf X-Archives-Hash: 3faf17ff0796149c92309350c859527f commit: ce1293d2437263ef7ce8d54c00114197786af0f8 Author: Andreas Sturmlechner gentoo org> AuthorDate: Mon Sep 9 14:39:30 2024 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Mon Sep 9 14:39:30 2024 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=ce1293d2 kde-misc/kio-gdrive-common: Drop kde-apps/kaccounts-integration:5 support Signed-off-by: Andreas Sturmlechner gentoo.org> .../kio-gdrive-common-24.08.49.9999.ebuild | 13 ++----------- kde-misc/kio-gdrive-common/kio-gdrive-common-9999.ebuild | 13 ++----------- 2 files changed, 4 insertions(+), 22 deletions(-) diff --git a/kde-misc/kio-gdrive-common/kio-gdrive-common-24.08.49.9999.ebuild b/kde-misc/kio-gdrive-common/kio-gdrive-common-24.08.49.9999.ebuild index d2f0a8a641..eefb73a676 100644 --- a/kde-misc/kio-gdrive-common/kio-gdrive-common-24.08.49.9999.ebuild +++ b/kde-misc/kio-gdrive-common/kio-gdrive-common-24.08.49.9999.ebuild @@ -6,12 +6,8 @@ EAPI=8 ECM_HANDBOOK="true" KDE_ORG_CATEGORY="network" KDE_ORG_NAME="${PN/-common/}" -KF5_BDEPEND=( "|| ( - kde-apps/kaccounts-integration:6[qt5] - kde-apps/kaccounts-integration:5 -)" ) +KF5_BDEPEND=( "kde-apps/kaccounts-integration:6[qt5(-)]" ) KF6_BDEPEND=( "kde-apps/kaccounts-integration:6" ) -KFMIN=5.115.0 inherit ecm-common gear.kde.org LICENSE="GPL-2+" @@ -34,12 +30,7 @@ ecm-common-check_deps() { ecm-common_inject_heredoc() { cat >> CMakeLists.txt <<- _EOF_ || die - if(KFSLOT STREQUAL "6") - find_package(KAccounts6 REQUIRED) - else() - find_package(KAccounts REQUIRED) - endif() - + find_package(KAccounts6 REQUIRED) kaccounts_add_service(\${CMAKE_CURRENT_SOURCE_DIR}/kaccounts/google-drive.service.in) _EOF_ } diff --git a/kde-misc/kio-gdrive-common/kio-gdrive-common-9999.ebuild b/kde-misc/kio-gdrive-common/kio-gdrive-common-9999.ebuild index d2f0a8a641..eefb73a676 100644 --- a/kde-misc/kio-gdrive-common/kio-gdrive-common-9999.ebuild +++ b/kde-misc/kio-gdrive-common/kio-gdrive-common-9999.ebuild @@ -6,12 +6,8 @@ EAPI=8 ECM_HANDBOOK="true" KDE_ORG_CATEGORY="network" KDE_ORG_NAME="${PN/-common/}" -KF5_BDEPEND=( "|| ( - kde-apps/kaccounts-integration:6[qt5] - kde-apps/kaccounts-integration:5 -)" ) +KF5_BDEPEND=( "kde-apps/kaccounts-integration:6[qt5(-)]" ) KF6_BDEPEND=( "kde-apps/kaccounts-integration:6" ) -KFMIN=5.115.0 inherit ecm-common gear.kde.org LICENSE="GPL-2+" @@ -34,12 +30,7 @@ ecm-common-check_deps() { ecm-common_inject_heredoc() { cat >> CMakeLists.txt <<- _EOF_ || die - if(KFSLOT STREQUAL "6") - find_package(KAccounts6 REQUIRED) - else() - find_package(KAccounts REQUIRED) - endif() - + find_package(KAccounts6 REQUIRED) kaccounts_add_service(\${CMAKE_CURRENT_SOURCE_DIR}/kaccounts/google-drive.service.in) _EOF_ }