Gentoo Archives: gentoo-commits

From: David Seifert <soap@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: eclass/
Date: Thu, 24 Jun 2021 15:50:25
Message-Id: 1624549787.84980841c249b53f55168c5ed1eb1812c42d875e.soap@gentoo
1 commit: 84980841c249b53f55168c5ed1eb1812c42d875e
2 Author: David Michael <fedora.dm0 <AT> gmail <DOT> com>
3 AuthorDate: Thu Jun 24 15:49:47 2021 +0000
4 Commit: David Seifert <soap <AT> gentoo <DOT> org>
5 CommitDate: Thu Jun 24 15:49:47 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=84980841
7
8 acct-user.eclass: EAPI 8 support
9
10 Update the documentation to describe how to depend on GLEP 81
11 packages with EAPI 8. There is no NSS module for resolving the
12 accounts installed in $SYSROOT, so acct-* packages might also need
13 need to be in $BROOT e.g. for fowners which directly calls chown.
14
15 - BDEPEND so the build system can resolve names when building
16 packages in nonempty $SYSROOT at src_install time.
17
18 - IDEPEND so the build system can resolve names when installing
19 binary packages in nonempty $ROOT at pkg_preinst time.
20
21 - RDEPEND so the target system can use the accounts.
22
23 Closes: https://github.com/gentoo/gentoo/pull/21377
24 Signed-off-by: David Michael <fedora.dm0 <AT> gmail.com>
25 Signed-off-by: David Seifert <soap <AT> gentoo.org>
26
27 eclass/acct-user.eclass | 19 ++++++++++---------
28 1 file changed, 10 insertions(+), 9 deletions(-)
29
30 diff --git a/eclass/acct-user.eclass b/eclass/acct-user.eclass
31 index ee4358b5c75..cf47470c155 100644
32 --- a/eclass/acct-user.eclass
33 +++ b/eclass/acct-user.eclass
34 @@ -1,4 +1,4 @@
35 -# Copyright 2019-2020 Gentoo Authors
36 +# Copyright 2019-2021 Gentoo Authors
37 # Distributed under the terms of the GNU General Public License v2
38
39 # @ECLASS: acct-user.eclass
40 @@ -7,7 +7,7 @@
41 # @AUTHOR:
42 # Michael Orlitzky <mjo@g.o>
43 # Michał Górny <mgorny@g.o>
44 -# @SUPPORTED_EAPIS: 7
45 +# @SUPPORTED_EAPIS: 7 8
46 # @BLURB: Eclass used to create and maintain a single user entry
47 # @DESCRIPTION:
48 # This eclass represents and creates a single user entry. The name
49 @@ -26,24 +26,25 @@
50 # contents:
51 #
52 # @CODE
53 -# EAPI=7
54 +# EAPI=8
55 # inherit acct-user
56 # ACCT_USER_ID=200
57 # ACCT_USER_GROUPS=( foo )
58 # acct-user_add_deps
59 # @CODE
60 #
61 -# Then you add appropriate dependency to your package. The dependency
62 -# type(s) should be:
63 -# - DEPEND (+ RDEPEND) if the user is already needed at build time,
64 -# - RDEPEND if it is needed at install time (e.g. you 'fowners' files
65 -# in pkg_preinst) or run time.
66 +# Then you add appropriate dependencies to your package. Note that
67 +# the build system might need to resolve names, too. The dependency
68 +# type(s) should be: BDEPEND if the user must be resolvable at build
69 +# time (e.g. 'fowners' uses it in src_install), IDEPEND if it must be
70 +# resolvable at install time (e.g. 'fowners' uses it in pkg_preinst),
71 +# and RDEPEND in every case.
72
73 if [[ -z ${_ACCT_USER_ECLASS} ]]; then
74 _ACCT_USER_ECLASS=1
75
76 case ${EAPI:-0} in
77 - 7) ;;
78 + 7|8) ;;
79 *) die "EAPI=${EAPI:-0} not supported";;
80 esac