1 |
commit: 02a0c1ab2cd8fde0313adc17a73831912dde6d8b |
2 |
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Nov 1 16:37:29 2017 +0000 |
4 |
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Mar 29 17:35:20 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/pms.git/commit/?id=02a0c1ab |
7 |
|
8 |
dependencies.tex: Describe similar dep groups only once. |
9 |
|
10 |
Any-of, exactly-one-of, and at-most-one-of groups have similar format, |
11 |
so there is no need to repeat the same description three times. |
12 |
|
13 |
dependencies.tex | 17 +++++------------ |
14 |
1 file changed, 5 insertions(+), 12 deletions(-) |
15 |
|
16 |
diff --git a/dependencies.tex b/dependencies.tex |
17 |
index 093a30b..f019348 100644 |
18 |
--- a/dependencies.tex |
19 |
+++ b/dependencies.tex |
20 |
@@ -70,18 +70,11 @@ be surrounded on both sides by whitespace, except at the start and end of the st |
21 |
of (a dependency item of any kind followed by whitespace), followed by a close parenthesis. |
22 |
More formally: \t{any-of} \t{::=} \t{'||' whitespace '(' whitespace (item whitespace)+ ')'}. |
23 |
Permitted in \t{DEPEND}, \t{RDEPEND}, \t{PDEPEND}, \t{LICENSE}, \t{REQUIRED_USE}. |
24 |
-\item An exactly-one-of group, which consists of the string \t{\textasciicircum\textasciicircum}, |
25 |
- followed by whitespace, followed by an open parenthesis, followed by whitespace, followed by |
26 |
- one or more of (a dependency item of any kind followed by whitespace), followed by a close |
27 |
- parenthesis. More formally: \t{exactly-one-of} \t{::=} \t{'\textasciicircum\textasciicircum' |
28 |
- whitespace '(' whitespace (item whitespace)+ ')'}. |
29 |
- Permitted in \t{REQUIRED_USE}. |
30 |
-\item \featurelabel{at-most-one-of} An at-most-one-of group, which consists of the string \t{??}, |
31 |
- followed by whitespace, followed by an open parenthesis, followed by whitespace, followed by |
32 |
- one or more of (a dependency item of any kind followed by whitespace), followed by a close |
33 |
- parenthesis. More formally: \t{at-most-one-of} \t{::=} \t{'??'\ whitespace '(' whitespace |
34 |
- (item whitespace)+ ')'}. Permitted in \t{REQUIRED_USE} in EAPIs listed in |
35 |
- table~\ref{tab:at-most-one-of-table} as supporting \t{REQUIRED_USE ??}\ groups. |
36 |
+\item An exactly-one-of group, which has the same format as the any-of group, but begins with the |
37 |
+ string \t{\textasciicircum\textasciicircum} instead. Permitted in \t{REQUIRED_USE}. |
38 |
+\item \featurelabel{at-most-one-of} An at-most-one-of group, which has the same format as the |
39 |
+ any-of group, but begins with the string \t{??}\ instead. Permitted in \t{REQUIRED_USE} in |
40 |
+ EAPIs listed in table~\ref{tab:at-most-one-of-table} as supporting \t{REQUIRED_USE ??}\ groups. |
41 |
\item A use-conditional group, which consists of an optional exclamation mark, followed by |
42 |
a use flag name, followed by a question mark, followed by whitespace, followed by |
43 |
an open parenthesis, followed by whitespace, followed by one or more of (a dependency item |