commit: 2d4df2a6859bd37663808223013e6e8c53f36fae Author: Ulrich Müller <ulm <AT> gentoo <DOT> org> AuthorDate: Sun Jul 10 15:58:59 2022 +0000 Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org> CommitDate: Sun Jul 10 15:59:31 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2d4df2a6
Revert "user.eclass: Warn about eclass usage in all EAPIs" This reverts commit b700ccbb4da1e341e4a1b9874b53efeb88223ff6. Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org> eclass/user.eclass | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/eclass/user.eclass b/eclass/user.eclass index b4f63ffab4a2..d5b827d2e76b 100644 --- a/eclass/user.eclass +++ b/eclass/user.eclass @@ -7,27 +7,25 @@ # Michał Górny <[email protected]> (NetBSD) # @SUPPORTED_EAPIS: 6 7 8 # @BLURB: user management in ebuilds +# @DEPRECATED: acct-user/acct-group packages # @DESCRIPTION: # The user eclass contains a suite of functions that allow ebuilds # to quickly make sure users in the installed system are sane. case ${EAPI} in - 6|7|8) ;; + 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." + eerror "Migrate your package to GLEP 81 user/group management," + eerror "or inherit user-info if you need only the query functions." + die "Invalid \"inherit user\" in EAPI ${EAPI}" + fi + ;; *) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;; esac -if [[ ${CATEGORY} != acct-* ]]; then - eerror "Packages must not inherit user.eclass unless they are" - eerror "in the acct-user or acct-group category." - eerror "Migrate your package to GLEP 81 user/group management," - eerror "or inherit user-info if you need only the query functions." - if [[ ${EAPI} != [67] ]]; then - die "Invalid \"inherit user\"" - else - eerror "This message will become fatal in EAPI ${EAPI} on 2023-01-01" - fi -fi - if [[ -z ${_USER_ECLASS} ]]; then _USER_ECLASS=1
