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
