From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 3B7FE158094 for ; Sun, 10 Jul 2022 13:03:37 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2B567E0C10; Sun, 10 Jul 2022 13:03:36 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 09D1BE0C10 for ; Sun, 10 Jul 2022 13:03:36 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 19CDC340ED6 for ; Sun, 10 Jul 2022 13:03:35 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 77BE3105 for ; Sun, 10 Jul 2022 13:03:33 +0000 (UTC) From: "Ulrich Müller" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ulrich Müller" Message-ID: <1657458204.b700ccbb4da1e341e4a1b9874b53efeb88223ff6.ulm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: eclass/ X-VCS-Repository: repo/gentoo X-VCS-Files: eclass/user.eclass X-VCS-Directories: eclass/ X-VCS-Committer: ulm X-VCS-Committer-Name: Ulrich Müller X-VCS-Revision: b700ccbb4da1e341e4a1b9874b53efeb88223ff6 X-VCS-Branch: master Date: Sun, 10 Jul 2022 13:03:33 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: f6ff543a-2307-4668-9f23-18e4827b5b9f X-Archives-Hash: 49b5558d8171c05b93f9ed9b2e575fbf commit: b700ccbb4da1e341e4a1b9874b53efeb88223ff6 Author: Ulrich Müller gentoo org> AuthorDate: Sun Jul 10 07:14:19 2022 +0000 Commit: Ulrich Müller gentoo org> CommitDate: Sun Jul 10 13:03:24 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b700ccbb 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 gentoo.org> 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 --- a/eclass/user.eclass +++ b/eclass/user.eclass @@ -7,25 +7,27 @@ # Michał Górny (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