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.edb669663d753b599673f2ddda5987a9b93be437.ulm@gentoo
1 commit: edb669663d753b599673f2ddda5987a9b93be437
2 Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
3 AuthorDate: Mon Feb 21 18:30:11 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=edb66966
7
8 EAPI 9 profile parent files can contain comments
9
10 Bug: https://bugs.gentoo.org/470094
11 Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>
12
13 eapi-differences.tex | 5 ++++-
14 profiles.tex | 20 +++++++++++++++++++-
15 2 files changed, 23 insertions(+), 2 deletions(-)
16
17 diff --git a/eapi-differences.tex b/eapi-differences.tex
18 index 7bf3f2c..b83da4e 100644
19 --- a/eapi-differences.tex
20 +++ b/eapi-differences.tex
21 @@ -47,6 +47,9 @@ for a complete table of previous EAPIs.}
22 Less strict filenames in \t{updates} & \compactfeatureref{updates-filenames} &
23 No & No & No & Yes & Yes \\
24
25 +Comments in profiles \t{parent} file & \compactfeatureref{parent-comments} &
26 + No & No & No & No & Yes \\
27 +
28 Profile files as directories & \compactfeatureref{profile-file-dirs} &
29 No & No & Yes & Yes & Yes \\
30
31 @@ -405,7 +408,7 @@ EAPI 8 is EAPI 7 with the following changes:
32 EAPI 9 is EAPI 8 with the following changes:
33
34 \begin{compactitem}
35 -\item None
36 +\item Comments in profiles \t{parent} file, \featureref{parent-comments}.
37 \end{compactitem}
38
39 \ChangeWhenAddingAnEAPI{9}
40
41 diff --git a/profiles.tex b/profiles.tex
42 index 8d8226a..6fa8a1c 100644
43 --- a/profiles.tex
44 +++ b/profiles.tex
45 @@ -25,7 +25,25 @@ first, left to right, with duplicate parent paths being sourced for every time t
46 It is illegal for a profile's parent tree to contain cycles. Package manager behaviour upon
47 encountering a cycle is undefined.
48
49 -This file must not contain comments, blank lines or make use of line continuations.
50 +This file must not make use of line continuations.
51 +
52 +\featurelabel{parent-comments} For EAPIs listed in table~\ref{tab:profile-parent-comments} as
53 +allowing comments, blank lines and lines beginning with a \t{\#} are discarded. For other EAPIs,
54 +this file must not contain comments or blank lines.
55 +
56 +\ChangeWhenAddingAnEAPI{9}
57 +\begin{centertable}{EAPIs allowing comments in \t{parent} file}
58 + \label{tab:profile-parent-comments}
59 + \begin{tabular}{ll}
60 + \toprule
61 + \multicolumn{1}{c}{\textbf{EAPI}} &
62 + \multicolumn{1}{c}{\textbf{Allows comments?}} \\
63 + \midrule
64 + 0, 1, 2, 3, 4, 5, 6, 7, 8 & No \\
65 + 9 & Yes \\
66 + \bottomrule
67 + \end{tabular}
68 +\end{centertable}
69
70 \subsection{The eapi file}
71 \label{sec:profile-eapi}