commit: cd3afa14b3d87ce785038c55dbcf04e9affd25b7
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 9 11:11:42 2024 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Nov 9 11:11:42 2024 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=cd3afa14
kde-frameworks/purpose-kaccounts-services: Drop KF5 backwards compat
kde-apps/kaccounts-integration:5 is gone, kaccounts-integration:6[qt5]
pulls in KF6 already, and kde-frameworks/purpose:5[kaccounts] is masked
anyway on everything non-{amd64,arm64}.
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../purpose-kaccounts-services-9999.ebuild | 15 ++-------------
1 file changed, 2 insertions(+), 13 deletions(-)
diff --git
a/kde-frameworks/purpose-kaccounts-services/purpose-kaccounts-services-9999.ebuild
b/kde-frameworks/purpose-kaccounts-services/purpose-kaccounts-services-9999.ebuild
index 6dd4ddc0d1..531a2d8619 100644
---
a/kde-frameworks/purpose-kaccounts-services/purpose-kaccounts-services-9999.ebuild
+++
b/kde-frameworks/purpose-kaccounts-services/purpose-kaccounts-services-9999.ebuild
@@ -7,9 +7,6 @@ EAPI=8
ECM_I18N="false"
ECM_HANDBOOK="false"
KDE_ORG_NAME="${PN/-kaccounts-services/}"
-KF5_BDEPEND=( "kde-apps/kaccounts-integration:6[qt5]" )
-KF6_BDEPEND=( "kde-apps/kaccounts-integration:6" )
-KFMIN=5.115.0
inherit ecm-common frameworks.kde.org
DESCRIPTION="KAccounts generated service files for nextcloud and google
services"
@@ -23,19 +20,11 @@ RDEPEND="
!<kde-frameworks/purpose-5.116.0-r2:5
!<kde-frameworks/purpose-6.5.0-r1:6
"
-
-ecm-common-check_deps() {
- return $(has_version -b "kde-apps/kaccounts-integration:6")
-}
+BDEPEND="kde-apps/kaccounts-integration:6"
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}/src/plugins/nextcloud/nextcloud-upload.service.in)
kaccounts_add_service(\${CMAKE_CURRENT_SOURCE_DIR}/src/plugins/youtube/google-youtube.service.in)
_EOF_
