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 4D2B515808B for ; Mon, 11 Apr 2022 09:41:59 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id DDF1BE0A6E; 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 D2D6BE08F1 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 CFD92341452 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 1D424D0 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.6d8aacbe58de94ea8ed04e6078b5c159907f99b4.cybertailor@gentoo> Subject: [gentoo-commits] repo/proj/guru:dev commit in: eclass/ X-VCS-Repository: repo/proj/guru X-VCS-Files: eclass/qbs.eclass X-VCS-Directories: eclass/ X-VCS-Committer: cybertailor X-VCS-Committer-Name: Anna Vyalkova X-VCS-Revision: 6d8aacbe58de94ea8ed04e6078b5c159907f99b4 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: 26826c59-0ae1-434e-8711-3c7db7af9065 X-Archives-Hash: fdf512610920f1126b29f7304baa56ac commit: 6d8aacbe58de94ea8ed04e6078b5c159907f99b4 Author: Anna (cybertailor) Vyalkova sysrq in> AuthorDate: Fri Apr 8 13:15:56 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=6d8aacbe qbs.eclass: fix inherit guard usage Signed-off-by: Anna (cybertailor) Vyalkova sysrq.in> eclass/qbs.eclass | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/eclass/qbs.eclass b/eclass/qbs.eclass index 6c3f06310..af5709e26 100644 --- a/eclass/qbs.eclass +++ b/eclass/qbs.eclass @@ -12,16 +12,22 @@ # @DESCRIPTION: # Utility eclass providing wrapper functions for Qbs build system. -if [[ ! ${_QBS_ECLASS} ]]; then - -case ${EAPI} in +case ${EAPI:-0} in 8) ;; - *) die "${ECLASS}: EAPI ${EAPI} unsupported." + *) die "${ECLASS}: EAPI ${EAPI:-0} unsupported." esac +if [[ ! ${_QBS_ECLASS} ]]; then + inherit multiprocessing toolchain-funcs qmake-utils -# @ECLASS-VARIABLE: QBS_COMMAND_ECHO_MODE +fi + +EXPORT_FUNCTIONS src_configure src_compile src_install + +if [[ ! ${_QBS_ECLASS} ]]; then + +# @ECLASS_VARIABLE: QBS_COMMAND_ECHO_MODE # @USER_VARIABLE # @DESCRIPTION: # Determines what kind of output to show when executing commands. Possible @@ -38,8 +44,6 @@ inherit multiprocessing toolchain-funcs qmake-utils BDEPEND="dev-util/qbs" -EXPORT_FUNCTIONS src_configure src_compile src_install - # @FUNCTION: eqbs # @USAGE: [...] # @DESCRIPTION: