From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1573730-garchives=archives.gentoo.org@lists.gentoo.org>
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 10A2A158099
for <garchives@archives.gentoo.org>; Sat, 25 Nov 2023 23:34:58 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 573252BC07C;
Sat, 25 Nov 2023 23:34:57 +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 409042BC037
for <gentoo-commits@lists.gentoo.org>; Sat, 25 Nov 2023 23:34:57 +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))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id 789F1340871
for <gentoo-commits@lists.gentoo.org>; Sat, 25 Nov 2023 23:34:56 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 0D68E13E5
for <gentoo-commits@lists.gentoo.org>; Sat, 25 Nov 2023 23:34:55 +0000 (UTC)
From: "Andreas Sturmlechner" <asturm@gentoo.org>
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" <asturm@gentoo.org>
Message-ID: <1700954747.3988b47f84f5051001afbfa6b30b5c97c4fd72ea.asturm@gentoo>
Subject: [gentoo-commits] proj/kde:master commit in: eclass/
X-VCS-Repository: proj/kde
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: 3988b47f84f5051001afbfa6b30b5c97c4fd72ea
X-VCS-Branch: master
Date: Sat, 25 Nov 2023 23:34:55 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: 448ba2d7-ed5e-4b38-944e-06883175ab48
X-Archives-Hash: a768c771ecf6c5c57bc3f49f11b8a0c0
commit: 3988b47f84f5051001afbfa6b30b5c97c4fd72ea
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 15 21:33:29 2023 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Nov 25 23:25:47 2023 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=3988b47f
frameworks.kde.org.eclass: Define SLOT=6 for >=5.240, set ECM to SLOT=0
Exclude 5.9999 from SLOT=6.
git master was set to 5.240 for KF6 ports, unstable KF6 releases use
numbers 5.245 and above.
Also do it with less lines and no intermediate vars.
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
eclass/frameworks.kde.org.eclass | 21 +++++++++++----------
1 file changed, 11 insertions(+), 10 deletions(-)
diff --git a/eclass/frameworks.kde.org.eclass b/eclass/frameworks.kde.org.eclass
index 456902d39c..5d54b736c9 100644
--- a/eclass/frameworks.kde.org.eclass
+++ b/eclass/frameworks.kde.org.eclass
@@ -35,18 +35,19 @@ inherit kde.org
HOMEPAGE="https://develop.kde.org/products/frameworks/"
-_SLOT=6
-_SUBSLOT=${PV}
-if [[ ${KDE_BUILD_TYPE} == release ]]; then
- _SUBSLOT=$(ver_cut 1-2)
-else
- _SUBSLOT=9999
+SLOT=6
+if [[ ${PV} == 5.9999 ]] || ver_test ${PV} -lt 5.240; then
+ SLOT=5
fi
-if [[ ${PV/.*} == 5 ]]; then
- _SLOT=5
+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
-SLOT=${_SLOT}/${_SUBSLOT}
-unset _SLOT _SUBSLOT
# @ECLASS_VARIABLE: KDE_ORG_SCHEDULE_URI
# @INTERNAL