Gentoo Archives: gentoo-dev

From: David Seifert <soap@g.o>
To: gentoo-dev@l.g.o
Cc: David Seifert <soap@g.o>
Subject: [gentoo-dev] [PATCH 04/12] user.eclass: canonical variable ordering
Date: Sat, 29 Jan 2022 17:33:06
Message-Id: 20220129173130.2533280-4-soap@gentoo.org
In Reply to: [gentoo-dev] [PATCH 01/12] toolchain.eclass: remove EAPI 5 and 6 by David Seifert
1 Signed-off-by: David Seifert <soap@g.o>
2 ---
3 eclass/user.eclass | 6 +++---
4 1 file changed, 3 insertions(+), 3 deletions(-)
5
6 diff --git a/eclass/user.eclass b/eclass/user.eclass
7 index 9373b361d59..581704eae81 100644
8 --- a/eclass/user.eclass
9 +++ b/eclass/user.eclass
10 @@ -12,9 +12,6 @@
11 # The user eclass contains a suite of functions that allow ebuilds
12 # to quickly make sure users in the installed system are sane.
13
14 -if [[ -z ${_USER_ECLASS} ]]; then
15 -_USER_ECLASS=1
16 -
17 case ${EAPI} in
18 6|7) ;;
19 8)
20 @@ -29,6 +26,9 @@ case ${EAPI} in
21 *) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
22 esac
23
24 +if [[ -z ${_USER_ECLASS} ]]; then
25 +_USER_ECLASS=1
26 +
27 inherit user-info
28
29 # @FUNCTION: _assert_pkg_ebuild_phase
30 --
31 2.35.0