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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 24CE113835A for ; Fri, 23 Apr 2021 20:27:09 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 55456E0841; Fri, 23 Apr 2021 20:27:08 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 0674EE0841 for ; Fri, 23 Apr 2021 20:27:07 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id EBD88340E9E for ; Fri, 23 Apr 2021 20:27:05 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id A564259C for ; Fri, 23 Apr 2021 20:27:04 +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: <1619209608.104515216fbb9ac5bc27ebc7c8395019a7bc82e0.asturm@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: eclass/ X-VCS-Repository: proj/kde X-VCS-Files: eclass/kde.org.eclass X-VCS-Directories: eclass/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 104515216fbb9ac5bc27ebc7c8395019a7bc82e0 X-VCS-Branch: master Date: Fri, 23 Apr 2021 20:27:04 +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: 73e4d441-a865-425a-8899-7cc3520097ef X-Archives-Hash: 327dbf3c316eed9dd2ec4ea36d955fda commit: 104515216fbb9ac5bc27ebc7c8395019a7bc82e0 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sat Apr 17 14:33:37 2021 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Fri Apr 23 20:26:48 2021 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=10451521 kde.org.eclass: Add KDE_ORG_COMMIT to provide invent.kde.org snapshots Signed-off-by: Andreas Sturmlechner gentoo.org> eclass/kde.org.eclass | 25 +++++++++++++++++++------ 1 file changed, 19 insertions(+), 6 deletions(-) diff --git a/eclass/kde.org.eclass b/eclass/kde.org.eclass index fee743ed13..596322f4b1 100644 --- a/eclass/kde.org.eclass +++ b/eclass/kde.org.eclass @@ -86,6 +86,13 @@ readonly KDE_ORG_CATEGORIES # category on invent.kde.org, with "kde" as fallback value. : ${KDE_ORG_CATEGORY:=${KDE_ORG_CATEGORIES[${CATEGORY}]:-kde}} +# @ECLASS-VARIABLE: KDE_ORG_COMMIT +# @DEFAULT_UNSET +# @DESCRIPTION: +# If set, instead of a regular release tarball, pull tar.gz snapshot from an +# invent.kde.org repository identified by KDE_ORG_CATEGORY and KDE_ORG_NAME +# at the desired COMMIT ID. + # @ECLASS-VARIABLE: KDE_ORG_NAME # @DESCRIPTION: # If unset, default value is set to ${PN}. @@ -214,7 +221,13 @@ _kde.org_calculate_src_uri() { esac fi - SRC_URI="${_src_uri}${KDE_ORG_NAME}-${PV}.tar.xz" + if [[ -n ${KDE_ORG_COMMIT} ]]; then + SRC_URI="https://invent.kde.org/${KDE_ORG_CATEGORY}/${KDE_ORG_NAME}/-/" + SRC_URI+="archive/${KDE_ORG_COMMIT}/${KDE_ORG_NAME}-${KDE_ORG_COMMIT}.tar.gz" + SRC_URI+=" -> ${KDE_ORG_NAME}-${PV}-${KDE_ORG_COMMIT:0:8}.tar.gz" + else + SRC_URI="${_src_uri}${KDE_ORG_NAME}-${PV}.tar.xz" + fi if _kde.org_is_unreleased ; then RESTRICT+=" fetch" @@ -260,14 +273,14 @@ case ${KDE_BUILD_TYPE} in *) _kde.org_calculate_src_uri debug-print "${LINENO} ${ECLASS} ${FUNCNAME}: SRC_URI is ${SRC_URI}" + if [[ -n ${KDE_ORG_COMMIT} ]]; then + S=${WORKDIR}/${KDE_ORG_NAME}-${KDE_ORG_COMMIT} + else + S=${WORKDIR}/${KDE_ORG_NAME}-${PV} + fi ;; esac - -if [[ ${KDE_BUILD_TYPE} = release ]]; then - S=${WORKDIR}/${KDE_ORG_NAME}-${PV} -fi - # @FUNCTION: kde.org_pkg_nofetch # @DESCRIPTION: # Intended for use in the KDE overlay. If this package matches something in