commit: 147894288c01c6146b4ebe684bab100c917994ad Author: David Michael <fedora.dm0 <AT> gmail <DOT> com> AuthorDate: Thu Jun 24 15:49:41 2021 +0000 Commit: David Seifert <soap <AT> gentoo <DOT> org> CommitDate: Thu Jun 24 15:49:41 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=14789428
user.eclass: EAPI 8 support Also drop support for EAPIs 0-4 to match user-info.eclass. Signed-off-by: David Michael <fedora.dm0 <AT> gmail.com> Signed-off-by: David Seifert <soap <AT> gentoo.org> eclass/user.eclass | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/eclass/user.eclass b/eclass/user.eclass index e1f87a383ad..d03d31819fc 100644 --- a/eclass/user.eclass +++ b/eclass/user.eclass @@ -5,7 +5,7 @@ # @MAINTAINER: # base-sys...@gentoo.org (Linux) # Michał Górny <mgo...@gentoo.org> (NetBSD) -# @SUPPORTED_EAPIS: 0 1 2 3 4 5 6 7 +# @SUPPORTED_EAPIS: 5 6 7 8 # @BLURB: user management in ebuilds # @DEPRECATED: acct-user/acct-group packages # @DESCRIPTION: @@ -16,8 +16,8 @@ if [[ -z ${_USER_ECLASS} ]]; then _USER_ECLASS=1 case ${EAPI:-0} in - 0|1|2|3|4|5|6|7) ;; - *) + 5|6|7) ;; + 8) if [[ ${CATEGORY} != acct-* ]]; then eerror "In EAPI ${EAPI}, packages must not inherit user.eclass" eerror "unless they are in the acct-user or acct-group category." @@ -26,6 +26,7 @@ case ${EAPI:-0} in die "Invalid \"inherit user\" in EAPI ${EAPI}" fi ;; + *) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;; esac inherit user-info