commit: ce1293d2437263ef7ce8d54c00114197786af0f8
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 9 14:39:30 2024 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> 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 <asturm <AT> 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_
}
