1 |
commit: 92d5586a5522db487b6dab304dc3fc3a113daaeb |
2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Sep 30 23:06:39 2017 +0000 |
4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Oct 1 07:11:35 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/pms.git/commit/?id=92d5586a |
7 |
|
8 |
[WIP] EAPI 7 bans all-of groups in REQUIRED_USE. |
9 |
|
10 |
Reword the allowed variable list for the all-of group to account for |
11 |
additional restrictions of EAPI 7. The use in REQUIRED_USE is banned |
12 |
explicitly as it leads to ambiguity in automatic solver actions. |
13 |
The use in SRC_URI becomes meaningless given that it is only permitted |
14 |
inside any-of, and any-of is not permitted there. |
15 |
|
16 |
[TODO: add label & update eapi-differences] |
17 |
|
18 |
Bug: https://bugs.gentoo.org/632000 |
19 |
|
20 |
dependencies.tex | 20 ++++++++++++++++++-- |
21 |
1 file changed, 18 insertions(+), 2 deletions(-) |
22 |
|
23 |
diff --git a/dependencies.tex b/dependencies.tex |
24 |
index fd142bb..dca4a21 100644 |
25 |
--- a/dependencies.tex |
26 |
+++ b/dependencies.tex |
27 |
@@ -87,8 +87,9 @@ be surrounded on both sides by whitespace, except at the start and end of the st |
28 |
\item An all-of group, which consists of an open parenthesis, followed by whitespace, |
29 |
followed by zero or more of (a dependency item of any kind followed by whitespace), followed |
30 |
by a close parenthesis. More formally: |
31 |
- \t{all-of} \t{::=} \t{'(' whitespace (item whitespace)* ')'}. Permitted in all specification |
32 |
- style variables. Permitted inside groups listed in table~\ref{tab:depend-nesting}. |
33 |
+ \t{all-of} \t{::=} \t{'(' whitespace (item whitespace)* ')'}. Permitted in variables listed |
34 |
+ in table~\ref{tab:depend-group-variables}. Permitted inside groups listed |
35 |
+ in table~\ref{tab:depend-nesting}. |
36 |
\item An any-of group, which consists of the string \t{||}, followed by whitespace, |
37 |
followed by an open parenthesis, followed by whitespace, followed by zero or more |
38 |
of (a dependency item of any kind followed by whitespace), followed by a close parenthesis. |
39 |
@@ -188,6 +189,21 @@ In particular, note that whitespace is not optional. |
40 |
\end{tabular} |
41 |
\end{centertable} |
42 |
|
43 |
+\ChangeWhenAddingAnEAPI{7} |
44 |
+\begin{centertable}{EAPI-specific group use restrictions} |
45 |
+ \label{tab:depend-group-variables} |
46 |
+ \begin{tabular}{ll} |
47 |
+ \toprule |
48 |
+ \multicolumn{1}{c}{\textbf{EAPI}} & |
49 |
+ \multicolumn{1}{c}{\textbf{all-of}} \\ |
50 |
+ & \multicolumn{1}{c}{\textbf{permitted inside}} \\ |
51 |
+ \midrule |
52 |
+ 0, 1, 2, 3, 4, 5, 6 & all specification style variables \\ |
53 |
+ 7 & \t{DEPEND}, \t{RDEPEND}, \t{PDEPEND}, \t{LICENSE} \\ |
54 |
+ \bottomrule |
55 |
+ \end{tabular} |
56 |
+\end{centertable} |
57 |
+ |
58 |
\subsection{All-of dependency specifications} |
59 |
|
60 |
In an all-of group, all of the child elements must be matched. |