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 81289158020 for ; Sun, 11 Dec 2022 21:24:42 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1AB46E08E5; Sun, 11 Dec 2022 21:24:38 +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)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id F0E98E089C for ; Sun, 11 Dec 2022 21:24:37 +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 0D5F93411CB for ; Sun, 11 Dec 2022 21:24:37 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D38117F0 for ; Sun, 11 Dec 2022 21:24:33 +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: <1670793864.cafeb032b276db836c7ca1b53c05f6d9748d1bbb.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: cafeb032b276db836c7ca1b53c05f6d9748d1bbb X-VCS-Branch: master Date: Sun, 11 Dec 2022 21:24:33 +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: 4743b4d7-8f7d-4829-bf41-4d455ce25c6a X-Archives-Hash: 19565c2bd416a41a997acc2bf7771370 commit: cafeb032b276db836c7ca1b53c05f6d9748d1bbb Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun Dec 11 17:57:31 2022 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun Dec 11 21:24:24 2022 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=cafeb032 frameworks.kde.org.eclass: Support KF6, don't change KF5 live slot Signed-off-by: Andreas Sturmlechner gentoo.org> eclass/frameworks.kde.org.eclass | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/eclass/frameworks.kde.org.eclass b/eclass/frameworks.kde.org.eclass index 876c05c9b6..d4dff92c04 100644 --- a/eclass/frameworks.kde.org.eclass +++ b/eclass/frameworks.kde.org.eclass @@ -35,8 +35,15 @@ 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 +_SUBSLOT=${PV} +[[ ${KDE_BUILD_TYPE} == release ]] && _SUBSLOT=$(ver_cut 1-2) +if [[ ${PV/.*} == 5 ]]; then + _SLOT=5 + [[ ${KDE_BUILD_TYPE} == live ]] && _SUBSLOT=9999 +fi +SLOT=${_SLOT}/${_SUBSLOT} +unset _SLOT _SUBSLOT # @ECLASS_VARIABLE: KDE_ORG_SCHEDULE_URI # @INTERNAL