commit: de26dfceff864a2ad343531f3683961042dea398 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Thu May 18 20:28:51 2023 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> 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 <asturm <AT> 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) ;;