Gentoo Archives: gentoo-pms

From: "Ulrich Müller" <ulm@g.o>
To: gentoo-pms@l.g.o
Subject: [gentoo-pms] [PATCH 1/2] dependencies.tex: Describe similar dep groups only once.
Date: Thu, 29 Mar 2018 17:53:34
Message-Id: 23229.10261.823434.540409@a1i15.kph.uni-mainz.de
1 Any-of, exactly-one-of, and at-most-one-of groups have similar format,
2 so there is no need to repeat the same description three times.
3 ---
4
5 This was in the eapi-7 branch previously, but it is really an
6 editorial change that belongs in master. There should be no effective
7 change of the specification.
8
9 dependencies.tex | 17 +++++------------
10 1 file changed, 5 insertions(+), 12 deletions(-)
11
12 diff --git a/dependencies.tex b/dependencies.tex
13 index 093a30b..f019348 100644
14 --- a/dependencies.tex
15 +++ b/dependencies.tex
16 @@ -70,18 +70,11 @@ be surrounded on both sides by whitespace, except at the start and end of the st
17 of (a dependency item of any kind followed by whitespace), followed by a close parenthesis.
18 More formally: \t{any-of} \t{::=} \t{'||' whitespace '(' whitespace (item whitespace)+ ')'}.
19 Permitted in \t{DEPEND}, \t{RDEPEND}, \t{PDEPEND}, \t{LICENSE}, \t{REQUIRED_USE}.
20 -\item An exactly-one-of group, which consists of the string \t{\textasciicircum\textasciicircum},
21 - followed by whitespace, followed by an open parenthesis, followed by whitespace, followed by
22 - one or more of (a dependency item of any kind followed by whitespace), followed by a close
23 - parenthesis. More formally: \t{exactly-one-of} \t{::=} \t{'\textasciicircum\textasciicircum'
24 - whitespace '(' whitespace (item whitespace)+ ')'}.
25 - Permitted in \t{REQUIRED_USE}.
26 -\item \featurelabel{at-most-one-of} An at-most-one-of group, which consists of the string \t{??},
27 - followed by whitespace, followed by an open parenthesis, followed by whitespace, followed by
28 - one or more of (a dependency item of any kind followed by whitespace), followed by a close
29 - parenthesis. More formally: \t{at-most-one-of} \t{::=} \t{'??'\ whitespace '(' whitespace
30 - (item whitespace)+ ')'}. Permitted in \t{REQUIRED_USE} in EAPIs listed in
31 - table~\ref{tab:at-most-one-of-table} as supporting \t{REQUIRED_USE ??}\ groups.
32 +\item An exactly-one-of group, which has the same format as the any-of group, but begins with the
33 + string \t{\textasciicircum\textasciicircum} instead. Permitted in \t{REQUIRED_USE}.
34 +\item \featurelabel{at-most-one-of} An at-most-one-of group, which has the same format as the
35 + any-of group, but begins with the string \t{??}\ instead. Permitted in \t{REQUIRED_USE} in
36 + EAPIs listed in table~\ref{tab:at-most-one-of-table} as supporting \t{REQUIRED_USE ??}\ groups.
37 \item A use-conditional group, which consists of an optional exclamation mark, followed by
38 a use flag name, followed by a question mark, followed by whitespace, followed by
39 an open parenthesis, followed by whitespace, followed by one or more of (a dependency item
40 --
41 2.16.3