summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Müller <ulm@gentoo.org>2022-07-10 09:14:19 +0200
committerUlrich Müller <ulm@gentoo.org>2022-07-10 15:03:24 +0200
commitb700ccbb4da1e341e4a1b9874b53efeb88223ff6 (patch)
tree25a12c9326a948a10aba7db0873e98e352a72d86 /eclass/user.eclass
parentnet-misc/streamlink: remove unneeded build env var (diff)
downloadgentoo-b700ccbb4da1e341e4a1b9874b53efeb88223ff6.tar.gz
gentoo-b700ccbb4da1e341e4a1b9874b53efeb88223ff6.tar.bz2
gentoo-b700ccbb4da1e341e4a1b9874b53efeb88223ff6.zip
user.eclass: Warn about eclass usage in all EAPIs
Remove @DEPRECATED tag because this is not a removal candidate. Signed-off-by: Ulrich Müller <ulm@gentoo.org>
Diffstat (limited to 'eclass/user.eclass')
-rw-r--r--eclass/user.eclass24
1 files changed, 13 insertions, 11 deletions
diff --git a/eclass/user.eclass b/eclass/user.eclass
index d5b827d2e76b..b4f63ffab4a2 100644
--- a/eclass/user.eclass
+++ b/eclass/user.eclass
@@ -7,25 +7,27 @@
# 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)
- 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
- ;;
+ 6|7|8) ;;
*) 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