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 0346F158099 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 146992BC047; 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 ED1E32BC047 for ; Sat, 25 Nov 2023 23:34:29 +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 3B0D334081F 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 92A7A13E5 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.3c980b4f715ca6f362e2e1c47f2c6cc26fe300f2.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: 3c980b4f715ca6f362e2e1c47f2c6cc26fe300f2 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: a2167e77-8e28-4fcc-89c9-e790710a0f0b X-Archives-Hash: d449462d4136f5764bc277508da1bf96 commit: 3c980b4f715ca6f362e2e1c47f2c6cc26fe300f2 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun Jan 8 11:11:15 2023 +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=3c980b4f frameworks.kde.org.eclass: Switch 5.9999 to kf5 branch See also: https://mail.kde.org/pipermail/kde-frameworks-devel/2023-January/123124.html Signed-off-by: Andreas Sturmlechner gentoo.org> eclass/frameworks.kde.org.eclass | 43 ++++++++++++++++++++++++---------------- 1 file changed, 26 insertions(+), 17 deletions(-) diff --git a/eclass/frameworks.kde.org.eclass b/eclass/frameworks.kde.org.eclass index 5201464a76c8..af8e7b86f5a2 100644 --- a/eclass/frameworks.kde.org.eclass +++ b/eclass/frameworks.kde.org.eclass @@ -50,23 +50,32 @@ KDE_ORG_SCHEDULE_URI+="/Frameworks" # Helper variable to construct release group specific SRC_URI. _KDE_SRC_URI="mirror://kde/" -if [[ ${KDE_BUILD_TYPE} != live && -z ${KDE_ORG_COMMIT} ]]; then - _KDE_SRC_URI+="stable/frameworks/$(ver_cut 1-2)/" - case ${KDE_ORG_NAME} in - kdelibs4support | \ - kdesignerplugin | \ - kdewebkit | \ - khtml | \ - kjs | \ - kjsembed | \ - kmediaplayer | \ - kross | \ - kxmlrpcclient) - _KDE_SRC_URI+="portingAids/" - ;; - esac +case ${KDE_BUILD_TYPE} in + live) + if [[ ${PV} == 5.9999 ]]; then + EGIT_BRANCH="kf5" + fi + ;; + *) + if [[ -z ${KDE_ORG_COMMIT} ]]; then + _KDE_SRC_URI+="stable/frameworks/$(ver_cut 1-2)/" + case ${KDE_ORG_NAME} in + kdelibs4support | \ + kdesignerplugin | \ + kdewebkit | \ + khtml | \ + kjs | \ + kjsembed | \ + kmediaplayer | \ + kross | \ + kxmlrpcclient) + _KDE_SRC_URI+="portingAids/" + ;; + esac - SRC_URI="${_KDE_SRC_URI}${KDE_ORG_NAME}-${PV}.tar.xz" -fi + SRC_URI="${_KDE_SRC_URI}${KDE_ORG_NAME}-${PV}.tar.xz" + fi + ;; +esac fi