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 2D762158099 for ; Sat, 25 Nov 2023 23:34:31 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 211922BC056; Sat, 25 Nov 2023 23:34:30 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 0BF702BC056 for ; Sat, 25 Nov 2023 23:34:30 +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 4B7CC340861 for ; Sat, 25 Nov 2023 23:34:29 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id A587313E6 for ; Sat, 25 Nov 2023 23:34:27 +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: <1700955204.5c3bfa331387b445ac36c3fe71ec6c956e9ffe6c.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: eclass/ X-VCS-Repository: repo/gentoo X-VCS-Files: eclass/frameworks.kde.org.eclass X-VCS-Directories: eclass/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 5c3bfa331387b445ac36c3fe71ec6c956e9ffe6c X-VCS-Branch: master Date: Sat, 25 Nov 2023 23:34:27 +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: d2991b89-0b8c-442a-84f1-856e29255cd7 X-Archives-Hash: 63e1ee6d2ba518868bc1df0215f5bba7 commit: 5c3bfa331387b445ac36c3fe71ec6c956e9ffe6c Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun Dec 11 17:57:31 2022 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Sat Nov 25 23:33:24 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5c3bfa33 frameworks.kde.org.eclass: Support KF6, set ECM to SLOT=0 Define SLOT=6 properly for >=5.240, excluding 5.9999 git master was set to 5.240 for KF6 ports, unstable KF6 releases use numbers 5.245 and above. Signed-off-by: Andreas Sturmlechner gentoo.org> eclass/frameworks.kde.org.eclass | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/eclass/frameworks.kde.org.eclass b/eclass/frameworks.kde.org.eclass index af8e7b86f5a2..5d54b736c91b 100644 --- a/eclass/frameworks.kde.org.eclass +++ b/eclass/frameworks.kde.org.eclass @@ -35,8 +35,19 @@ inherit kde.org HOMEPAGE="https://develop.kde.org/products/frameworks/" -SLOT=5/${PV} -[[ ${KDE_BUILD_TYPE} == release ]] && SLOT=$(ver_cut 1)/$(ver_cut 1-2) +SLOT=6 +if [[ ${PV} == 5.9999 ]] || ver_test ${PV} -lt 5.240; then + SLOT=5 +fi +if [[ ${PN} == extra-cmake-modules ]]; then + SLOT=0 +else + if [[ ${KDE_BUILD_TYPE} == release ]]; then + SLOT=${SLOT}/$(ver_cut 1-2) + else + SLOT=${SLOT}/9999 + fi +fi # @ECLASS_VARIABLE: KDE_ORG_SCHEDULE_URI # @INTERNAL