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 6564015806E for ; Sat, 20 May 2023 20:20:17 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8403EE0815; Sat, 20 May 2023 20:20:16 +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 5DA70E0815 for ; Sat, 20 May 2023 20:20:16 +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 50E4B340CB4 for ; Sat, 20 May 2023 20:20:15 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 837B2A65 for ; Sat, 20 May 2023 20:20:13 +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: <1684613917.e4640674ee8579dfa2c330c94cc737a1ec41de37.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: e4640674ee8579dfa2c330c94cc737a1ec41de37 X-VCS-Branch: master Date: Sat, 20 May 2023 20:20:13 +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: 45484cb4-7564-4106-aa85-4b4fe37b1db8 X-Archives-Hash: 2d0e2027f687e65963555bedaa092f24 commit: e4640674ee8579dfa2c330c94cc737a1ec41de37 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sat May 20 20:18:37 2023 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Sat May 20 20:18:37 2023 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=e4640674 ecm.eclass: Need to exclude KDE Frameworks 5.9999 from KFMIN>=5.240 check Signed-off-by: Andreas Sturmlechner gentoo.org> eclass/ecm.eclass | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/eclass/ecm.eclass b/eclass/ecm.eclass index fdd5ba92b8..542993b6ec 100644 --- a/eclass/ecm.eclass +++ b/eclass/ecm.eclass @@ -156,8 +156,14 @@ fi # @DESCRIPTION: # KDE Frameworks and Qt slot dependency, implied by KFMIN version. : "${_KFSLOT:=5}" -if [[ ${KFMIN/.*} == 6 ]] || $(ver_test ${KFMIN} -ge 5.240); then - _KFSLOT=6 +if [[ ${CATEGORY} == kde-frameworks ]]; then + if [[ ${PV} != 5.9999 ]] && $(ver_test ${KFMIN} -ge 5.240); then + _KFSLOT=6 + fi +else + if [[ ${KFMIN/.*} == 6 ]] || $(ver_test ${KFMIN} -ge 5.240); then + _KFSLOT=6 + fi fi case ${ECM_NONGUI} in