From fcc5224904648a8e6eb528d7603154160a20022f Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 2 Feb 2022 01:39:05 +0000 Subject: gentoo resync : 02.02.2022 --- eclass/user.eclass | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'eclass/user.eclass') diff --git a/eclass/user.eclass b/eclass/user.eclass index d03d31819fcc..581704eae815 100644 --- a/eclass/user.eclass +++ b/eclass/user.eclass @@ -1,22 +1,19 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # @ECLASS: user.eclass # @MAINTAINER: # base-system@gentoo.org (Linux) # Michał Górny (NetBSD) -# @SUPPORTED_EAPIS: 5 6 7 8 +# @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. -if [[ -z ${_USER_ECLASS} ]]; then -_USER_ECLASS=1 - -case ${EAPI:-0} in - 5|6|7) ;; +case ${EAPI} in + 6|7) ;; 8) if [[ ${CATEGORY} != acct-* ]]; then eerror "In EAPI ${EAPI}, packages must not inherit user.eclass" @@ -29,6 +26,9 @@ case ${EAPI:-0} in *) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;; esac +if [[ -z ${_USER_ECLASS} ]]; then +_USER_ECLASS=1 + inherit user-info # @FUNCTION: _assert_pkg_ebuild_phase -- cgit v1.2.3