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 B8584158013 for ; Fri, 15 Dec 2023 06:52:21 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9DEA52BC03A; Fri, 15 Dec 2023 06:52:14 +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)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 713DB2BC03A for ; Fri, 15 Dec 2023 06:52:14 +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)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 1C32E33FEF1 for ; Fri, 15 Dec 2023 06:52:12 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B7B3414C5 for ; Fri, 15 Dec 2023 06:52:09 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1702623039.2fa125d055dcfebe34acf09ea04ff89c42eeb19b.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: eclass/ X-VCS-Repository: repo/gentoo X-VCS-Files: eclass/ninja-utils.eclass X-VCS-Directories: eclass/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 2fa125d055dcfebe34acf09ea04ff89c42eeb19b X-VCS-Branch: master Date: Fri, 15 Dec 2023 06:52:09 +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: ebb7d115-20e6-4f6b-827b-fbcb25056147 X-Archives-Hash: 059a9abc747e17810b77cc32ca3ef733 commit: 2fa125d055dcfebe34acf09ea04ff89c42eeb19b Author: Sam James gentoo org> AuthorDate: Fri Dec 15 06:50:39 2023 +0000 Commit: Sam James gentoo org> CommitDate: Fri Dec 15 06:50:39 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2fa125d0 ninja-utils.eclass: use app-alternatives/ninja Needed now that it's stable. Bug: https://bugs.gentoo.org/919969 Closes: https://bugs.gentoo.org/917623 Signed-off-by: Sam James gentoo.org> eclass/ninja-utils.eclass | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/eclass/ninja-utils.eclass b/eclass/ninja-utils.eclass index 859938cb3047..8b42c5849522 100644 --- a/eclass/ninja-utils.eclass +++ b/eclass/ninja-utils.eclass @@ -55,17 +55,7 @@ _NINJA_UTILS_ECLASS=1 inherit multiprocessing -case "${NINJA}" in - ninja) - NINJA_DEPEND=">=dev-util/ninja-1.8.2" - ;; - samu) - NINJA_DEPEND="dev-util/samurai" - ;; - *) - NINJA_DEPEND="" - ;; -esac +NINJA_DEPEND="app-alternatives/ninja" # @FUNCTION: get_NINJAOPTS # @DESCRIPTION: @@ -84,7 +74,14 @@ get_NINJAOPTS() { # by the supplied arguments. This function dies if ninja fails. It # also supports being called via 'nonfatal'. eninja() { - [[ -n "${NINJA_DEPEND}" ]] || ewarn "Unknown value '${NINJA}' for \${NINJA}" + case "${NINJA}" in + ninja|samu) + ;; + *) + ewarn "Unknown value '${NINJA}' for \${NINJA}" + ;; + esac + local v case "${NINJA_VERBOSE}" in OFF) ;;