diff options
| author |   Repository mirror & CI <repomirrorci@gentoo.org> | 2022-07-10 16:16:35 +0000 |
|---|---|---|
| committer | Repository mirror & CI <repomirrorci@gentoo.org> | 2022-07-10 16:16:35 +0000 |
| commit | fcc43582463c2ee079b7edb73275d54a3bc4ba2f (patch) | |
| tree | 388e4ee74a1728898cdb505aeda39038fcc6d93e | |
| parent | 2022-07-10 16:02:03 UTC (diff) | |
| parent | Revert "user.eclass: Warn about eclass usage in all EAPIs" (diff) | |
| download | gentoo-fcc43582463c2ee079b7edb73275d54a3bc4ba2f.tar.gz gentoo-fcc43582463c2ee079b7edb73275d54a3bc4ba2f.tar.bz2 gentoo-fcc43582463c2ee079b7edb73275d54a3bc4ba2f.zip | |
Merge updates from master
| -rw-r--r-- | eclass/user.eclass | 24 |
1 files 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 <mgorny@gentoo.org> (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 |