From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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 finch.gentoo.org (Postfix) with ESMTPS id B780515827B for ; Sun, 17 Aug 2025 19:06:11 +0000 (UTC) Received: from lists.gentoo.org (bobolink.gentoo.org [140.211.166.189]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519) (No client certificate requested) (Authenticated sender: relay-lists.gentoo.org@gentoo.org) by smtp.gentoo.org (Postfix) with ESMTPSA id 965C0340EF8 for ; Sun, 17 Aug 2025 19:06:11 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id BC3AA110560; Sun, 17 Aug 2025 19:06:06 +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) (No client certificate requested) by bobolink.gentoo.org (Postfix) with ESMTPS id B56E1110560 for ; Sun, 17 Aug 2025 19:06:06 +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 69E333408A2 for ; Sun, 17 Aug 2025 19:06:06 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 7BBA2317B for ; Sun, 17 Aug 2025 19:06:04 +0000 (UTC) From: "Ulrich Müller" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ulrich Müller" Message-ID: <1755457235.1ca082e48f5e80acf0962f6c5759f62e99fef4a5.ulm@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: bin/ X-VCS-Repository: proj/portage X-VCS-Files: bin/eapi.sh bin/ebuild.sh X-VCS-Directories: bin/ X-VCS-Committer: ulm X-VCS-Committer-Name: Ulrich Müller X-VCS-Revision: 1ca082e48f5e80acf0962f6c5759f62e99fef4a5 X-VCS-Branch: master Date: Sun, 17 Aug 2025 19:06: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: b4985b81-9983-4a50-a9c5-d28737bcd890 X-Archives-Hash: b6d82ef2a86330813ee1157476cbb0f7 commit: 1ca082e48f5e80acf0962f6c5759f62e99fef4a5 Author: Ulrich Müller gentoo org> AuthorDate: Mon Jun 9 07:59:46 2025 +0000 Commit: Ulrich Müller gentoo org> CommitDate: Sun Aug 17 19:00:35 2025 +0000 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=1ca082e4 EAPI 9: Bash version is 5.2 Signed-off-by: Ulrich Müller gentoo.org> bin/eapi.sh | 3 ++- bin/ebuild.sh | 4 +++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/bin/eapi.sh b/bin/eapi.sh index 6a7927f8b4..8618815b8d 100644 --- a/bin/eapi.sh +++ b/bin/eapi.sh @@ -80,7 +80,8 @@ ___eapi_usev_has_second_arg() [[ ${1-${EAPI-0} ___eapi_bash_3_2() [[ ${1-${EAPI-0}} == [0-5] ]] ___eapi_bash_4_2() [[ ${1-${EAPI-0}} == [67] ]] -___eapi_bash_5_0() [[ ${1-${EAPI-0}} != [0-7] ]] +___eapi_bash_5_0() [[ ${1-${EAPI-0}} == 8 ]] +___eapi_bash_5_2() [[ ${1-${EAPI-0}} != [0-8] ]] ___eapi_enables_failglob_in_global_scope() [[ ${1-${EAPI-0}} != [0-5] ]] ___eapi_has_ENV_UNSET() [[ ${1-${EAPI-0}} != [0-6] ]] ___eapi_has_strict_keepdir() [[ ${1-${EAPI-0}} != [0-7] ]] diff --git a/bin/ebuild.sh b/bin/ebuild.sh index 6a12d65a7c..593c18ef5a 100755 --- a/bin/ebuild.sh +++ b/bin/ebuild.sh @@ -1,5 +1,5 @@ #!/usr/bin/env bash -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # Prevent aliases from causing portage to act inappropriately. @@ -26,6 +26,8 @@ __check_bash_version() { maj=4 min=2 elif ___eapi_bash_5_0 ; then maj=5 min=0 + elif ___eapi_bash_5_2 ; then + maj=5 min=2 else return fi