From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1285370-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id 303A01382C5
for <garchives@archives.gentoo.org>; Mon, 24 May 2021 04:37:27 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 5DFEBE07FE;
Mon, 24 May 2021 04:37:26 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id 3D634E07FE
for <gentoo-commits@lists.gentoo.org>; Mon, 24 May 2021 04:37:26 +0000 (UTC)
Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id E6E14335E2E
for <gentoo-commits@lists.gentoo.org>; Mon, 24 May 2021 04:37:24 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 9E2F2793
for <gentoo-commits@lists.gentoo.org>; Mon, 24 May 2021 04:37:23 +0000 (UTC)
From: "Zac Medico" <zmedico@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Zac Medico" <zmedico@gentoo.org>
Message-ID: <1621831005.fc728f5d4ab0dd58ef9cd940397a8990bb066d15.zmedico@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: zmedico
X-VCS-Committer-Name: Zac Medico
X-VCS-Revision: fc728f5d4ab0dd58ef9cd940397a8990bb066d15
X-VCS-Branch: master
Date: Mon, 24 May 2021 04:37:23 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: 3cae5455-23a9-4b2c-9b6c-e35416a8550e
X-Archives-Hash: d625e7e63bf3d40e6bcc8e7ade33a26b
commit: fc728f5d4ab0dd58ef9cd940397a8990bb066d15
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed May 12 12:26:32 2021 +0000
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Mon May 24 04:36:45 2021 +0000
URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=fc728f5d
Require bash-5.0 in EAPI 8
Bug: https://bugs.gentoo.org/636652
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
Signed-off-by: Zac Medico <zmedico <AT> gentoo.org>
bin/eapi.sh | 6 +++++-
bin/ebuild.sh | 2 ++
2 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/bin/eapi.sh b/bin/eapi.sh
index a999c68e6..7c2a5b1b2 100644
--- a/bin/eapi.sh
+++ b/bin/eapi.sh
@@ -277,7 +277,11 @@ ___eapi_bash_3_2() {
}
___eapi_bash_4_2() {
- ! ___eapi_bash_3_2 "$@"
+ [[ ${1-${EAPI-0}} =~ ^(6|7)$ ]]
+}
+
+___eapi_bash_5_0() {
+ true
}
___eapi_has_ENV_UNSET() {
diff --git a/bin/ebuild.sh b/bin/ebuild.sh
index bf070080d..72990edc5 100755
--- a/bin/ebuild.sh
+++ b/bin/ebuild.sh
@@ -23,6 +23,8 @@ __check_bash_version() {
maj=3 min=2
elif ___eapi_bash_4_2 ; then
maj=4 min=2
+ elif ___eapi_bash_5_0 ; then
+ maj=5 min=0
else
return
fi