| 1 |
commit: 147894288c01c6146b4ebe684bab100c917994ad |
| 2 |
Author: David Michael <fedora.dm0 <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Thu Jun 24 15:49:41 2021 +0000 |
| 4 |
Commit: David Seifert <soap <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Jun 24 15:49:41 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=14789428 |
| 7 |
|
| 8 |
user.eclass: EAPI 8 support |
| 9 |
|
| 10 |
Also drop support for EAPIs 0-4 to match user-info.eclass. |
| 11 |
|
| 12 |
Signed-off-by: David Michael <fedora.dm0 <AT> gmail.com> |
| 13 |
Signed-off-by: David Seifert <soap <AT> gentoo.org> |
| 14 |
|
| 15 |
eclass/user.eclass | 7 ++++--- |
| 16 |
1 file changed, 4 insertions(+), 3 deletions(-) |
| 17 |
|
| 18 |
diff --git a/eclass/user.eclass b/eclass/user.eclass |
| 19 |
index e1f87a383ad..d03d31819fc 100644 |
| 20 |
--- a/eclass/user.eclass |
| 21 |
+++ b/eclass/user.eclass |
| 22 |
@@ -5,7 +5,7 @@ |
| 23 |
# @MAINTAINER: |
| 24 |
# base-system@g.o (Linux) |
| 25 |
# Michał Górny <mgorny@g.o> (NetBSD) |
| 26 |
-# @SUPPORTED_EAPIS: 0 1 2 3 4 5 6 7 |
| 27 |
+# @SUPPORTED_EAPIS: 5 6 7 8 |
| 28 |
# @BLURB: user management in ebuilds |
| 29 |
# @DEPRECATED: acct-user/acct-group packages |
| 30 |
# @DESCRIPTION: |
| 31 |
@@ -16,8 +16,8 @@ if [[ -z ${_USER_ECLASS} ]]; then |
| 32 |
_USER_ECLASS=1 |
| 33 |
|
| 34 |
case ${EAPI:-0} in |
| 35 |
- 0|1|2|3|4|5|6|7) ;; |
| 36 |
- *) |
| 37 |
+ 5|6|7) ;; |
| 38 |
+ 8) |
| 39 |
if [[ ${CATEGORY} != acct-* ]]; then |
| 40 |
eerror "In EAPI ${EAPI}, packages must not inherit user.eclass" |
| 41 |
eerror "unless they are in the acct-user or acct-group category." |
| 42 |
@@ -26,6 +26,7 @@ case ${EAPI:-0} in |
| 43 |
die "Invalid \"inherit user\" in EAPI ${EAPI}" |
| 44 |
fi |
| 45 |
;; |
| 46 |
+ *) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;; |
| 47 |
esac |
| 48 |
|
| 49 |
inherit user-info |
Archives