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 6EE4715806E for ; Thu, 18 May 2023 15:56:11 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9717EE07EC; Thu, 18 May 2023 15:56:10 +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 75788E07EC for ; Thu, 18 May 2023 15:56:10 +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 1AC66340B57 for ; Thu, 18 May 2023 15:56:09 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 633B5A65 for ; Thu, 18 May 2023 15:56:07 +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: <1684425289.0dcbe478843b99daf634f28cbf9395eef408ba79.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: 0dcbe478843b99daf634f28cbf9395eef408ba79 X-VCS-Branch: master Date: Thu, 18 May 2023 15:56:07 +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: 86d8e67d-feb0-4509-b192-a24ab533747a X-Archives-Hash: 057cc45704bad49d827829a1e247d3b4 commit: 0dcbe478843b99daf634f28cbf9395eef408ba79 Author: Andreas Sturmlechner gentoo org> AuthorDate: Thu May 18 15:48:46 2023 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Thu May 18 15:54:49 2023 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=0dcbe478 frameworks.kde.org.eclass: Fixup for KF6 support Signed-off-by: Andreas Sturmlechner gentoo.org> eclass/frameworks.kde.org.eclass | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/eclass/frameworks.kde.org.eclass b/eclass/frameworks.kde.org.eclass index 81ac235d01..456902d39c 100644 --- a/eclass/frameworks.kde.org.eclass +++ b/eclass/frameworks.kde.org.eclass @@ -37,10 +37,13 @@ HOMEPAGE="https://develop.kde.org/products/frameworks/" _SLOT=6 _SUBSLOT=${PV} -[[ ${KDE_BUILD_TYPE} == release ]] && _SUBSLOT=$(ver_cut 1-2) +if [[ ${KDE_BUILD_TYPE} == release ]]; then + _SUBSLOT=$(ver_cut 1-2) +else + _SUBSLOT=9999 +fi if [[ ${PV/.*} == 5 ]]; then _SLOT=5 - [[ ${KDE_BUILD_TYPE} == live ]] && _SUBSLOT=9999 fi SLOT=${_SLOT}/${_SUBSLOT} unset _SLOT _SUBSLOT @@ -59,7 +62,9 @@ _KDE_SRC_URI="mirror://kde/" case ${KDE_BUILD_TYPE} in live) - [[ ${PV} == 5.9999 ]] && EGIT_BRANCH="kf5" + if [[ ${PV} == 5.9999 ]]; then + EGIT_BRANCH="kf5" + fi ;; *) if [[ -z ${KDE_ORG_COMMIT} ]]; then