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) server-digest SHA256) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 3BD3015ACB3 for ; Thu, 6 Apr 2023 14:09:22 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 45902E0886; Thu, 6 Apr 2023 14:09:21 +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 2B160E0886 for ; Thu, 6 Apr 2023 14:09:21 +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 EB427340F41 for ; Thu, 6 Apr 2023 14:09:19 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 4DA03A1E for ; Thu, 6 Apr 2023 14:09:18 +0000 (UTC) From: "Anna Vyalkova" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Anna Vyalkova" Message-ID: <1680786526.b23d08e5a23afd91df710807d66097b4daf2b677.cybertailor@gentoo> Subject: [gentoo-commits] repo/proj/guru:dev commit in: eclass/ X-VCS-Repository: repo/proj/guru X-VCS-Files: eclass/boinc.eclass X-VCS-Directories: eclass/ X-VCS-Committer: cybertailor X-VCS-Committer-Name: Anna Vyalkova X-VCS-Revision: b23d08e5a23afd91df710807d66097b4daf2b677 X-VCS-Branch: dev Date: Thu, 6 Apr 2023 14:09:18 +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: ee944019-a209-4519-8e26-08b904506e1f X-Archives-Hash: 94139b7818e6eab54f93cb69e3653935 commit: b23d08e5a23afd91df710807d66097b4daf2b677 Author: Anna (cybertailor) Vyalkova sysrq in> AuthorDate: Thu Apr 6 13:05:33 2023 +0000 Commit: Anna Vyalkova sysrq in> CommitDate: Thu Apr 6 13:08:46 2023 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=b23d08e5 boinc.eclass: update boinc_require_source * Add 'wrapper' and 'vboxwrapper' to release types * Clean up code Signed-off-by: Anna (cybertailor) Vyalkova sysrq.in> eclass/boinc.eclass | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/eclass/boinc.eclass b/eclass/boinc.eclass index 73aa24fe7..a90f19dd7 100644 --- a/eclass/boinc.eclass +++ b/eclass/boinc.eclass @@ -45,7 +45,7 @@ fi if [[ ! ${_BOINC_ECLASS} ]]; then # @FUNCTION: get_boinc_src -# @USAGE: [client|server] +# @USAGE: [client|server|vboxwrapper|wrapper] # @RETURN: SRC_URI snippet or temporary build directory for given BOINC release get_boinc_src() { debug-print-function ${FUNCNAME} "${@}"] @@ -55,18 +55,20 @@ get_boinc_src() { local RELEASE_MINOR=$(ver_cut 1-2 ${RELEASE_PATCH}) local RELEASE_TYPE=${3:-client} - local SUFFIX= + local TAG case ${RELEASE_TYPE} in - server) SUFFIX="-server" ;; - client) ;; - *) die "${FUNCNAME}: unknown release type '${RELEASE_TYPE}'" + client|server) + TAG="${RELEASE_TYPE}_release/${RELEASE_MINOR}/${RELEASE_PATCH}" ;; + vboxwrapper|wrapper) + TAG="${RELEASE_TYPE}/${RELEASE_PATCH}" ;; + *) + die "${FUNCNAME}: unknown release type '${RELEASE_TYPE}'" esac - local _SRC_URI="https://github.com/BOINC/boinc/archive/" - _SRC_URI+="${RELEASE_TYPE}_release/${RELEASE_MINOR}/${RELEASE_PATCH}.tar.gz" - _SRC_URI+=" -> boinc${SUFFIX}-${RELEASE_PATCH}.tar.gz" + local _SRC_URI="https://github.com/BOINC/boinc/archive/refs/tags/${TAG}.tar.gz" + _SRC_URI+=" -> boinc-${RELEASE_TYPE}-${RELEASE_PATCH}.tar.gz" - local _S="${WORKDIR}/boinc-${RELEASE_TYPE}_release-${RELEASE_MINOR}-${RELEASE_PATCH}" + local _S="${WORKDIR}/boinc-${TAG////-}" case ${query_var} in SRC_URI) echo "${_SRC_URI}" ;; @@ -82,7 +84,7 @@ get_boinc_src() { # Temporary build directory, where BOINC sources are located. # @FUNCTION: boinc_require_source -# @USAGE: [boinc version] [client|server] +# @USAGE: [boinc version] [client|server|vboxwrapper|wrapper] # @DESCRIPTION: # Set up SRC_URI and S for building application within BOINC source tree. #