On Sun, 10 Jul 2022, Anna wrote:
On 2022-07-09 23:37, Conrad Kostecki wrote:
I would like to inform you all, that GLEP-81 migration has been
finally done. All existing packages got migrated and no ones left.
Great work, thank you!
What to do with user.eclass now? It's already marked @DEPRECATED, do
we want it @DEAD and eventually removed?
The eclass dies in EAPI 8 if called from an ebuild outside the acct-*
category. We could extend this to EAPIs 6 and 7 (but it might cause
problems for overlays).
Also, not sure if the @DEPRECATED tag should be used for an eclass that
is still indirectly inherited by other eclasses.
How about attached patch?
Ulrich
From 49006bdb82f321c359dcf8f0f78893ccdf0e6be7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ulrich=20M=C3=BCller?= <
[email protected]>
Date: Sun, 10 Jul 2022 09:14:19 +0200
Subject: [PATCH] user.eclass: Warn about eclass usage in all EAPIs MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Remove @DEPRECATED tag because this is not a removal candidate.
Signed-off-by: Ulrich M=C3=BCller <
[email protected]>
=2D--
eclass/user.eclass | 24 +++++++++++++-----------
1 file changed, 13 insertions(+), 11 deletions(-)
diff --git a/eclass/user.eclass b/eclass/user.eclass
index d5b827d2e76b..b4f63ffab4a2 100644
=2D-- a/eclass/user.eclass
+++ b/eclass/user.eclass
@@ -7,25 +7,27 @@
# Micha=C5=82 G=C3=B3rny <
[email protected]> (NetBSD)
# @SUPPORTED_EAPIS: 6 7 8
# @BLURB: user management in ebuilds
=2D# @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.
=20
case ${EAPI} in
=2D 6|7) ;;
=2D 8)
=2D if [[ ${CATEGORY} !=3D acct-* ]]; then
=2D eerror "In EAPI ${EAPI}, packages must not inherit user.eclass"
=2D eerror "unless they are in the acct-user or acct-group category."
=2D eerror "Migrate your package to GLEP 81 user/group management,"
=2D eerror "or inherit user-info if you need only the query functions."
=2D die "Invalid \"inherit user\" in EAPI ${EAPI}"
=2D fi
=2D ;;
+ 6|7|8) ;;
*) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
esac
=20
+if [[ ${CATEGORY} !=3D 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} !=3D [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=3D1
=20
=2D-=20
2.35.1
-----BEGIN PGP SIGNATURE-----
iQFDBAEBCAAtFiEEtDnZ1O9xIP68rzDbUYgzUIhBXi4FAmLKfx4PHHVsbUBnZW50 b28ub3JnAAoJEFGIM1CIQV4u714H/0V3/nK98qgsooALOK6+7bcqK+LVAafzrK3v OShg4B7Vfd0e2eZjGAfHG1fbCwiJFqfM7evRbs4rrcKHn1XcebtJo9CFhUyLp3tZ IJTNSQsAow0gYQ6zHFZLT3oHWlrNY8mFZcQbuzrkmVkSA78y2dQp2RVI10Hv/jZ2 WkZxG5UlCvee53XGTEtb865wQ/SmrW85ZbGem6A84pmCGijx6XPOaucusEB6vY1B IWsaFGep3TG9iw9wIb6Pjfqw6RExBECipYTkfhZfRyx0e+drIRs3JxCGGJP5LqjH y2akuGqFkLH+BMabeFON1ivhCRrSC3LCAeUPYZ/+WLWEOjDv7xU=
=veSr
-----END PGP SIGNATURE-----
--- SoupGate-Win32 v1.05
* Origin: fsxNet Usenet Gateway (21:1/5)