1 |
commit: 859659f02761fd59c93bd8206a72a12e749ecbec |
2 |
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun May 16 12:05:17 2021 +0000 |
4 |
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue May 18 05:44:15 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/pms.git/commit/?id=859659f0 |
7 |
|
8 |
EAPI 8: useq, hasv and hasq are banned |
9 |
|
10 |
Bug: https://bugs.gentoo.org/199722 |
11 |
Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org> |
12 |
|
13 |
eapi-differences.tex | 11 +++++++++++ |
14 |
pkg-mgr-commands.tex | 37 ++++++++++++++++++++++++++++++------- |
15 |
2 files changed, 41 insertions(+), 7 deletions(-) |
16 |
|
17 |
diff --git a/eapi-differences.tex b/eapi-differences.tex |
18 |
index 5319bf0..913935d 100644 |
19 |
--- a/eapi-differences.tex |
20 |
+++ b/eapi-differences.tex |
21 |
@@ -233,6 +233,15 @@ Most utilities die & \compactfeatureref{die-on-failure} & |
22 |
\t{libopts} & \compactfeatureref{banned-commands} & |
23 |
Yes & Yes & Yes & Banned & Banned \\ |
24 |
|
25 |
+\t{useq} & \compactfeatureref{banned-commands} & |
26 |
+ Yes & Yes & Yes & Yes & Banned \\ |
27 |
+ |
28 |
+\t{hasv} & \compactfeatureref{banned-commands} & |
29 |
+ Yes & Yes & Yes & Yes & Banned \\ |
30 |
+ |
31 |
+\t{hasq} & \compactfeatureref{banned-commands} & |
32 |
+ Yes & Yes & Yes & Yes & Banned \\ |
33 |
+ |
34 |
Query command options & \compactfeatureref{pm-query-options} & |
35 |
None & \t{-{}-host-root} & \t{-{}-host-root} & \t{-b}, \t{-d}, \t{-r} & |
36 |
\t{-b}, \t{-d}, \t{-r} \\ |
37 |
@@ -499,6 +508,8 @@ EAPI 8 is EAPI 7 with the following changes: |
38 |
\item \t{IDEPEND}, \featureref{idepend}. |
39 |
\item Different \t{src_prepare} implementation, \featureref{src-prepare-8}. |
40 |
\item \t{PROPERTIES}, \t{RESTRICT} accumulated across eclasses, \featureref{accumulate-vars}. |
41 |
+\item \t{useq} banned, \featureref{banned-commands}. |
42 |
+\item \t{hasv} and \t{hasq} banned, \featureref{banned-commands}. |
43 |
\end{compactitem} |
44 |
|
45 |
\ChangeWhenAddingAnEAPI{8} |
46 |
|
47 |
diff --git a/pkg-mgr-commands.tex b/pkg-mgr-commands.tex |
48 |
index f401472..d535e00 100644 |
49 |
--- a/pkg-mgr-commands.tex |
50 |
+++ b/pkg-mgr-commands.tex |
51 |
@@ -55,7 +55,7 @@ called, the package manager must abort the build process indicating an error. |
52 |
|
53 |
\ChangeWhenAddingAnEAPI{8} |
54 |
\begin{centertable}{Banned commands} |
55 |
- \label{tab:banned-commands-table} |
56 |
+ \label{tab:banned-commands-1} |
57 |
\begin{tabular}{lllllll} |
58 |
\toprule |
59 |
\multicolumn{1}{c}{\textbf{EAPI}} & |
60 |
@@ -74,6 +74,23 @@ called, the package manager must abort the build process indicating an error. |
61 |
7, 8 & Yes & Yes & Yes & Yes & Yes & Yes \\ |
62 |
\bottomrule |
63 |
\end{tabular} |
64 |
+ % Don't start a new table environment, or the two parts may end up on different pages |
65 |
+ \vspace{\floatsep} |
66 |
+ \caption{Banned commands (continued)} |
67 |
+ \label{tab:banned-commands-2} |
68 |
+ \begin{tabular}{llll} |
69 |
+ \toprule |
70 |
+ \multicolumn{1}{c}{\textbf{EAPI}} & |
71 |
+ \multicolumn{3}{c}{\textbf{Command banned?}} \\ |
72 |
+ \multicolumn{1}{c}{} & |
73 |
+ \multicolumn{1}{c}{\textbf{\t{useq}}} & |
74 |
+ \multicolumn{1}{c}{\textbf{\t{hasv}}} & |
75 |
+ \multicolumn{1}{c}{\textbf{\t{hasq}}} \\ |
76 |
+ \midrule |
77 |
+ 0, 1, 2, 3, 4, 5, 6, 7 & No & No & No \\ |
78 |
+ 8 & Yes & Yes & Yes \\ |
79 |
+ \bottomrule |
80 |
+ \end{tabular} |
81 |
\end{centertable} |
82 |
|
83 |
\subsection{Sandbox commands} |
84 |
@@ -387,7 +404,7 @@ commands once the current phase function has returned. |
85 |
\item[einstall] A shortcut for the command given in listing~\ref{lst:einstall}. Any arguments given |
86 |
to \t{einstall} are passed verbatim to \t{emake}, as shown. Failure behaviour is EAPI dependent |
87 |
as per section~\ref{sec:failure-behaviour}. |
88 |
- In EAPIs listed in table~\ref{tab:banned-commands-table}, this command is banned as per |
89 |
+ In EAPIs listed in table~\ref{tab:banned-commands-1}, this command is banned as per |
90 |
section~\ref{sec:banned-commands}. |
91 |
|
92 |
The variable \t{ED} is defined as in table~\ref{tab:defined-vars} and depends on the use of an |
93 |
@@ -465,7 +482,7 @@ the current phase function has returned. |
94 |
\item[dohard] Takes two parameters. Creates a hardlink from the second to the first. Both paths are |
95 |
relative to the staging directory including the offset-prefix \t{ED} in offset-prefix aware |
96 |
EAPIs, or just the staging directory \t{D} in offset-prefix agnostic EAPIs. In EAPIs listed |
97 |
- in table~\ref{tab:banned-commands-table}, this command is banned as per |
98 |
+ in table~\ref{tab:banned-commands-1}, this command is banned as per |
99 |
section~\ref{sec:banned-commands}. |
100 |
|
101 |
\item[doheader] \featurelabel{doheader} Installs the given header files into \t{/usr/include/}, |
102 |
@@ -493,7 +510,7 @@ the current phase function has returned. |
103 |
offset-prefix. |
104 |
\end{compactdesc} |
105 |
|
106 |
- In EAPIs listed in table~\ref{tab:banned-commands-table}, this command is banned as per |
107 |
+ In EAPIs listed in table~\ref{tab:banned-commands-1}, this command is banned as per |
108 |
section~\ref{sec:banned-commands}. |
109 |
Failure behaviour is EAPI dependent as per section~\ref{sec:failure-behaviour}. |
110 |
|
111 |
@@ -524,7 +541,7 @@ the current phase function has returned. |
112 |
|
113 |
\item[dolib] As for \t{dolib.a} except that the default install mode can be overriden with |
114 |
the \t{install} options set by the most recent \t{libopts} call. In EAPIs listed |
115 |
- in table~\ref{tab:banned-commands-table}, this command is banned as per |
116 |
+ in table~\ref{tab:banned-commands-1}, this command is banned as per |
117 |
section~\ref{sec:banned-commands}. |
118 |
|
119 |
\begin{algorithm} |
120 |
@@ -732,7 +749,7 @@ function has returned. |
121 |
\item[exeopts] As \t{insopts}, for \t{doexe} et al. |
122 |
|
123 |
\item[libopts] As \t{insopts}, for \t{dolib} et al. |
124 |
- In EAPIs listed in table~\ref{tab:banned-commands-table}, this command is banned as |
125 |
+ In EAPIs listed in table~\ref{tab:banned-commands-1}, this command is banned as |
126 |
per section~\ref{sec:banned-commands}. |
127 |
|
128 |
\end{description} |
129 |
@@ -841,6 +858,8 @@ table~\ref{tab:use-list-strictness}. |
130 |
\item[usev] The same as \t{use}, but also prints the flag name if the condition |
131 |
is met. |
132 |
\item[useq] Deprecated synonym for \t{use}. |
133 |
+ In EAPIs listed in table~\ref{tab:banned-commands-2}, this command is banned as per |
134 |
+ section~\ref{sec:banned-commands}. |
135 |
\item[use_with] \featurelabel{use-with} Has one-, two-, and three-argument forms. The first |
136 |
argument is a USE flag name, the second a \t{configure} option name (\t{\$\{opt\}}), defaulting |
137 |
to the same as the first argument if not provided, and the third is a string value |
138 |
@@ -915,7 +934,11 @@ These functions check whitespace-separated lists for a particular value. |
139 |
\item[has] Returns shell true (0) if the first argument (a word) is found in the list of subsequent |
140 |
arguments, false otherwise. Guaranteed quiet. |
141 |
\item[hasv] The same as \t{has}, but also prints the first argument if found. |
142 |
+ In EAPIs listed in table~\ref{tab:banned-commands-2}, this command is banned as per |
143 |
+ section~\ref{sec:banned-commands}. |
144 |
\item[hasq] Deprecated synonym for \t{has}. |
145 |
+ In EAPIs listed in table~\ref{tab:banned-commands-2}, this command is banned as per |
146 |
+ section~\ref{sec:banned-commands}. |
147 |
\end{description} |
148 |
|
149 |
\subsection{Version manipulation and comparison commands} |
150 |
@@ -1010,7 +1033,7 @@ has returned. |
151 |
agnostic EAPIs) a file which exists, then \t{sed} is run with the current expression on that |
152 |
file. Otherwise, the current expression is set to the text of the argument. The initial value |
153 |
of the expression is \t{s:\$\{ED\}::g} in offset-prefix aware EAPIs and \t{s:\$\{D\}::g} in |
154 |
- offset-prefix agnostic EAPIs. In EAPIs listed in table~\ref{tab:banned-commands-table}, this |
155 |
+ offset-prefix agnostic EAPIs. In EAPIs listed in table~\ref{tab:banned-commands-1}, this |
156 |
command is banned as per section~\ref{sec:banned-commands}. |
157 |
|
158 |
\item[unpack] Unpacks one or more source archives, in order, into the current directory. |