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 4713015810D for ; Fri, 19 May 2023 19:33:24 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 7F01DE088B; Fri, 19 May 2023 19:33:23 +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 6413BE088B for ; Fri, 19 May 2023 19:33:23 +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 32DD8340CDF for ; Fri, 19 May 2023 19:33:22 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 8067CA68 for ; Fri, 19 May 2023 19:33:20 +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: <1684441731.de26dfceff864a2ad343531f3683961042dea398.asturm@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: eclass/ X-VCS-Repository: proj/kde X-VCS-Files: eclass/ecm.eclass X-VCS-Directories: eclass/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: de26dfceff864a2ad343531f3683961042dea398 X-VCS-Branch: master Date: Fri, 19 May 2023 19:33:20 +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: 00140453-5763-4ede-958b-be85d393f434 X-Archives-Hash: b4997b93359f4bc2c0486fba0ba78cda commit: de26dfceff864a2ad343531f3683961042dea398 Author: Andreas Sturmlechner gentoo org> AuthorDate: Thu May 18 20:28:51 2023 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Thu May 18 20:28:51 2023 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=de26dfce ecm.eclass: Add SLOT=6 dependencies if KFMIN is >=5.240 Signed-off-by: Andreas Sturmlechner gentoo.org> eclass/ecm.eclass | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/eclass/ecm.eclass b/eclass/ecm.eclass index 125b47b42e..ef59ddfbce 100644 --- a/eclass/ecm.eclass +++ b/eclass/ecm.eclass @@ -145,7 +145,7 @@ fi # Minimum version of Frameworks to require. Default value for kde-frameworks # is ${PV} and 5.82.0 baseline for everything else. This is not going to be # changed unless we also bump EAPI, which usually implies (rev-)bumping. -# Version will also be used to differentiate between KF5/Qt5 and KF6/Qt6. +# If set to >=5.240, KF6/Qt6 will be assumed thus SLOT=6 dependencies added. if [[ ${CATEGORY} = kde-frameworks ]]; then : "${KFMIN:=$(ver_cut 1-2)}" fi @@ -156,7 +156,9 @@ fi # @DESCRIPTION: # KDE Frameworks and Qt slot dependency, implied by KFMIN version. : "${_KFSLOT:=5}" -[[ ${KFMIN/.*} == 6 ]] && _KFSLOT=6 +if [[ ${KFMIN/.*} == 6 ]] || $(ver_test ${KFMIN} -ge 5.240); then + _KFSLOT=6 +fi case ${ECM_NONGUI} in true) ;;