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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id F2780138359 for ; Wed, 4 Nov 2020 20:47:49 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 37677E0967; Wed, 4 Nov 2020 20:47:49 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 22440E0967 for ; Wed, 4 Nov 2020 20:47:49 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 4A464340E53 for ; Wed, 4 Nov 2020 20:47:48 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C11E0397 for ; Wed, 4 Nov 2020 20:47:46 +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: <1604522819.7ed6eeff7cb9d9bd295129804bf6776b50a47b27.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: 7ed6eeff7cb9d9bd295129804bf6776b50a47b27 X-VCS-Branch: master Date: Wed, 4 Nov 2020 20:47:46 +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: 95003647-4511-443c-8f1d-a88ef1d2695f X-Archives-Hash: c38f4a4df99bfdf9ffffc430058090de commit: 7ed6eeff7cb9d9bd295129804bf6776b50a47b27 Author: Ulrich Müller gentoo org> AuthorDate: Sun Oct 25 15:32:49 2020 +0000 Commit: Ulrich Müller gentoo org> CommitDate: Wed Nov 4 20:46:59 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7ed6eeff user.eclass: Deprecate general use for future EAPIs. No functional difference for existing EAPIs. Reviewed-by: David Seifert gentoo.org> Reviewed-by: Michał Górny gentoo.org> Reviewed-by: Andreas K. Hüttel gentoo.org> Signed-off-by: Ulrich Müller gentoo.org> eclass/user.eclass | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/eclass/user.eclass b/eclass/user.eclass index b70698356a3..abbbb661b4b 100644 --- a/eclass/user.eclass +++ b/eclass/user.eclass @@ -13,6 +13,19 @@ if [[ -z ${_USER_ECLASS} ]]; then _USER_ECLASS=1 +case ${EAPI:-0} in + 0|1|2|3|4|5|6|7) ;; + *) + 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 + ;; +esac + inherit user-info # @FUNCTION: _assert_pkg_ebuild_phase