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 43B0A15808B for ; Mon, 11 Apr 2022 09:42:00 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D5506E0970; Mon, 11 Apr 2022 09:41:57 +0000 (UTC) Received: from smtp.gentoo.org (mail.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) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 00487E0A96 for ; Mon, 11 Apr 2022 09:41:56 +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 D27BD3414B9 for ; Mon, 11 Apr 2022 09:41:54 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 436B4397 for ; Mon, 11 Apr 2022 09:41:53 +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: <1649670003.3931b905b44d3728eebfba8097ef6030fc1beac3.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: 3931b905b44d3728eebfba8097ef6030fc1beac3 X-VCS-Branch: dev Date: Mon, 11 Apr 2022 09:41:53 +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: b64b20de-a2d5-469d-b7f4-f88f2ec93e5f X-Archives-Hash: 5fa12709ed2c8c1018de8c6a60f99ea0 commit: 3931b905b44d3728eebfba8097ef6030fc1beac3 Author: Anna (cybertailor) Vyalkova sysrq in> AuthorDate: Fri Apr 8 13:21:55 2022 +0000 Commit: Anna Vyalkova sysrq in> CommitDate: Mon Apr 11 09:40:03 2022 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=3931b905 boinc.eclass: fix inherit guard usage Signed-off-by: Anna (cybertailor) Vyalkova sysrq.in> eclass/boinc.eclass | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/eclass/boinc.eclass b/eclass/boinc.eclass index f2c28b628..cf5cd8515 100644 --- a/eclass/boinc.eclass +++ b/eclass/boinc.eclass @@ -9,14 +9,12 @@ # @DESCRIPTION: # This eclass provides helper functions to build BOINC applications and libraries. -inherit autotools toolchain-funcs - case ${EAPI} in 8) ;; *) die "${ECLASS}: EAPI ${EAPI} unsupported." esac -# @ECLASS-VARIABLE: BOINC_SUBMODULE +# @ECLASS_VARIABLE: BOINC_SUBMODULE # @PRE_INHERIT # @DEFAULT_UNSET # @DESCRIPTION: @@ -26,7 +24,7 @@ esac # # If unset, no functions will be exported. -# @ECLASS-VARIABLE: BOINC_S +# @ECLASS_VARIABLE: BOINC_S # @DEFAULT_UNSET # @DESCRIPTION: # If defined this variable determines the source directory name after @@ -34,6 +32,12 @@ esac # variable supports a wildcard mechanism to help with github tarballs # that contain the commit hash as part of the directory name. +if [[ ! ${_BOINC_ECLASS} ]]; then + +inherit autotools toolchain-funcs + +fi + if [[ ${BOINC_SUBMODULE} ]]; then EXPORT_FUNCTIONS src_unpack src_prepare src_configure fi @@ -72,7 +76,7 @@ get_boinc_src() { } -# @ECLASS-VARIABLE: BOINC_BUILD_DIR +# @ECLASS_VARIABLE: BOINC_BUILD_DIR # @OUTPUT_VARIABLE # @DESCRIPTION: # Temporary build directory, where BOINC sources are located.