Gentoo Archives: gentoo-commits

From: "Ulrich Müller" <ulm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/pms:eapi-9 commit in: /
Date: Thu, 18 Aug 2022 15:53:13
Message-Id: 1660837914.213db65b0d49478c981bc9d80afa7ff5d74eb705.ulm@gentoo
1 commit: 213db65b0d49478c981bc9d80afa7ff5d74eb705
2 Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
3 AuthorDate: Mon Feb 21 18:32:43 2022 +0000
4 Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
5 CommitDate: Thu Aug 18 15:51:54 2022 +0000
6 URL: https://gitweb.gentoo.org/proj/pms.git/commit/?id=213db65b
7
8 EAPI 9 profile EAPI defaults to top-level
9
10 Bug: https://bugs.gentoo.org/806181
11 Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>
12
13 eapi-differences.tex | 5 +++++
14 profiles.tex | 23 +++++++++++++++++++++--
15 2 files changed, 26 insertions(+), 2 deletions(-)
16
17 diff --git a/eapi-differences.tex b/eapi-differences.tex
18 index b83da4e..d292bc7 100644
19 --- a/eapi-differences.tex
20 +++ b/eapi-differences.tex
21 @@ -50,6 +50,9 @@ Less strict filenames in \t{updates} & \compactfeatureref{updates-filenames} &
22 Comments in profiles \t{parent} file & \compactfeatureref{parent-comments} &
23 No & No & No & No & Yes \\
24
25 +Default EAPI for profiles & \compactfeatureref{profile-eapi-default} &
26 + 0 & 0 & 0 & 0 & Top-level \\
27 +
28 Profile files as directories & \compactfeatureref{profile-file-dirs} &
29 No & No & Yes & Yes & Yes \\
30
31 @@ -409,6 +412,8 @@ EAPI 9 is EAPI 8 with the following changes:
32
33 \begin{compactitem}
34 \item Comments in profiles \t{parent} file, \featureref{parent-comments}.
35 +\item Different default EAPI for profiles, \featureref{profile-eapi-default}.
36 +
37 \end{compactitem}
38
39 \ChangeWhenAddingAnEAPI{9}
40
41 diff --git a/profiles.tex b/profiles.tex
42 index 6fa8a1c..de59f0a 100644
43 --- a/profiles.tex
44 +++ b/profiles.tex
45 @@ -50,8 +50,27 @@ this file must not contain comments or blank lines.
46 A profile directory may contain an \t{eapi} file. This file, if it exists, must contain a single
47 line with the name of an EAPI\@. This specifies the EAPI to use when handling the directory in
48 question; a package manager must not attempt to use any profile using a directory which requires an
49 -EAPI it does not support. If no \t{eapi} file is present, EAPI 0 shall be used. The EAPI is neither
50 -inherited via the \t{parent} file nor in subdirectories.
51 +EAPI it does not support.
52 +
53 +\featurelabel{profile-eapi-default} If no \t{eapi} file is present, the default depends on the EAPI
54 +of the top-level profiles directory (see section~\ref{sec:profiles-dir}). That EAPI shall be used
55 +if table~\ref{tab:profile-eapi-default} lists it as ``top-level''. Otherwise, EAPI 0 shall be used.
56 +
57 +The EAPI is neither inherited via the \t{parent} file nor in subdirectories.
58 +
59 +\ChangeWhenAddingAnEAPI{9}
60 +\begin{centertable}{Default EAPI for profiles}
61 + \label{tab:profile-eapi-default}
62 + \begin{tabular}{ll}
63 + \toprule
64 + \multicolumn{1}{c}{\textbf{EAPI}} &
65 + \multicolumn{1}{c}{\textbf{Default EAPI?}} \\
66 + \midrule
67 + 0, 1, 2, 3, 4, 5, 6, 7, 8 & 0 \\
68 + 9 & Top-level \\
69 + \bottomrule
70 + \end{tabular}
71 +\end{centertable}
72
73 \subsection{deprecated}
74 If a profile contains a file named \t{deprecated}, it is treated as such. The first line of this