From d934827bf44b7cfcf6711964418148fa60877668 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 25 Nov 2020 22:39:15 +0000 Subject: gentoo resync : 25.11.2020 --- eclass/user.eclass | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to 'eclass/user.eclass') diff --git a/eclass/user.eclass b/eclass/user.eclass index b70698356a3a..f8993b827741 100644 --- a/eclass/user.eclass +++ b/eclass/user.eclass @@ -6,6 +6,7 @@ # base-system@gentoo.org (Linux) # Michał Górny (NetBSD) # @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. @@ -13,6 +14,19 @@ if [[ -z ${_USER_ECLASS} ]]; then _USER_ECLASS=1 +case ${EAPI:-0} in + 0|1|2|3|4|5|6|7) ;; + *) + 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 + ;; +esac + inherit user-info # @FUNCTION: _assert_pkg_ebuild_phase -- cgit v1.2.3