1 |
commit: 6ee30de07a867350c9ac74a84f19b3793ed9cef3 |
2 |
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Feb 17 15:00:52 2015 +0000 |
4 |
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Aug 30 18:57:32 2015 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/pms.git/commit/?id=6ee30de0 |
7 |
|
8 |
Reformat EAPI tables to be more compact. |
9 |
|
10 |
Combine all lines with identical behaviour for different EAPIs. |
11 |
Also use consistent indentation for tables in the LaTeX source. |
12 |
|
13 |
dependencies.tex | 113 +++++++--------- |
14 |
ebuild-env-commands.tex | 22 ++- |
15 |
ebuild-env-vars.tex | 95 ++++++------- |
16 |
ebuild-functions.tex | 207 ++++++++++++----------------- |
17 |
ebuild-vars.tex | 89 +++++-------- |
18 |
merge.tex | 19 +-- |
19 |
pkg-mgr-commands.tex | 345 ++++++++++++++++++++---------------------------- |
20 |
profile-variables.tex | 22 ++- |
21 |
profiles.tex | 23 ++-- |
22 |
9 files changed, 383 insertions(+), 552 deletions(-) |
23 |
|
24 |
diff --git a/dependencies.tex b/dependencies.tex |
25 |
index dcb381f..5a5c68f 100644 |
26 |
--- a/dependencies.tex |
27 |
+++ b/dependencies.tex |
28 |
@@ -89,38 +89,30 @@ be surrounded on both sides by whitespace, except at the start and end of the st |
29 |
In particular, note that whitespace is not optional. |
30 |
|
31 |
\ChangeWhenAddingAnEAPI{6} |
32 |
-\begin{centertable}{EAPIs supporting \t{SRC\_URI} arrows} \label{tab:uri-arrows-table} |
33 |
+\begin{centertable}{EAPIs supporting \t{SRC\_URI} arrows} |
34 |
+ \label{tab:uri-arrows-table} |
35 |
\begin{tabular}{ l l } |
36 |
- \toprule |
37 |
- \multicolumn{1}{c}{\textbf{EAPI}} & |
38 |
- \multicolumn{1}{c}{\textbf{Supports \t{SRC\_URI} arrows?}} \\ |
39 |
- \midrule |
40 |
- \t{0} & No \\ |
41 |
- \t{1} & No \\ |
42 |
- \t{2} & Yes \\ |
43 |
- \t{3} & Yes \\ |
44 |
- \t{4} & Yes \\ |
45 |
- \t{5} & Yes \\ |
46 |
- \t{6} & Yes \\ |
47 |
- \bottomrule |
48 |
+ \toprule |
49 |
+ \multicolumn{1}{c}{\textbf{EAPI}} & |
50 |
+ \multicolumn{1}{c}{\textbf{Supports \t{SRC\_URI} arrows?}} \\ |
51 |
+ \midrule |
52 |
+ 0, 1 & No \\ |
53 |
+ 2, 3, 4, 5, 6 & Yes \\ |
54 |
+ \bottomrule |
55 |
\end{tabular} |
56 |
\end{centertable} |
57 |
|
58 |
\ChangeWhenAddingAnEAPI{6} |
59 |
-\begin{centertable}{EAPIs supporting \t{REQUIRED\_USE ??}\ groups} \label{tab:at-most-one-of-table} |
60 |
+\begin{centertable}{EAPIs supporting \t{REQUIRED\_USE ??}\ groups} |
61 |
+ \label{tab:at-most-one-of-table} |
62 |
\begin{tabular}{ l l } |
63 |
- \toprule |
64 |
- \multicolumn{1}{c}{\textbf{EAPI}} & |
65 |
- \multicolumn{1}{c}{\textbf{Supports \t{REQUIRED\_USE ??}\ groups?}} \\ |
66 |
- \midrule |
67 |
- \t{0} & No \\ |
68 |
- \t{1} & No \\ |
69 |
- \t{2} & No \\ |
70 |
- \t{3} & No \\ |
71 |
- \t{4} & No \\ |
72 |
- \t{5} & Yes \\ |
73 |
- \t{6} & Yes \\ |
74 |
- \bottomrule |
75 |
+ \toprule |
76 |
+ \multicolumn{1}{c}{\textbf{EAPI}} & |
77 |
+ \multicolumn{1}{c}{\textbf{Supports \t{REQUIRED\_USE ??}\ groups?}} \\ |
78 |
+ \midrule |
79 |
+ 0, 1, 2, 3, 4 & No \\ |
80 |
+ 5, 6 & Yes \\ |
81 |
+ \bottomrule |
82 |
\end{tabular} |
83 |
\end{centertable} |
84 |
|
85 |
@@ -194,37 +186,30 @@ manager must warn or error if this feature is used with an EAPI not supporting u |
86 |
\begin{centertable}{Support for \t{SLOT} dependencies and sub-slots in EAPIs} |
87 |
\label{tab:slot-deps-table} |
88 |
\begin{tabular}{ l l l } |
89 |
- \toprule |
90 |
- \multicolumn{1}{c}{\textbf{EAPI}} & |
91 |
- \multicolumn{1}{c}{\textbf{Supports \t{SLOT} dependencies?}} & |
92 |
- \multicolumn{1}{c}{\textbf{Supports sub-slots?}} \\ |
93 |
- \midrule |
94 |
- \t{0} & No & No \\ |
95 |
- \t{1} & Named only & No \\ |
96 |
- \t{2} & Named only & No \\ |
97 |
- \t{3} & Named only & No \\ |
98 |
- \t{4} & Named only & No \\ |
99 |
- \t{5} & Named and operator & Yes \\ |
100 |
- \t{6} & Named and operator & Yes \\ |
101 |
- \bottomrule |
102 |
+ \toprule |
103 |
+ \multicolumn{1}{c}{\textbf{EAPI}} & |
104 |
+ \multicolumn{1}{c}{\textbf{Supports \t{SLOT} dependencies?}} & |
105 |
+ \multicolumn{1}{c}{\textbf{Supports sub-slots?}} \\ |
106 |
+ \midrule |
107 |
+ 0 & No & No \\ |
108 |
+ 1, 2, 3, 4 & Named only & No \\ |
109 |
+ 5, 6 & Named and operator & Yes \\ |
110 |
+ \bottomrule |
111 |
\end{tabular} |
112 |
\end{centertable} |
113 |
|
114 |
\ChangeWhenAddingAnEAPI{6} |
115 |
-\begin{centertable}{EAPIs supporting \t{USE} dependencies} \label{tab:use-deps-table} |
116 |
+\begin{centertable}{EAPIs supporting \t{USE} dependencies} |
117 |
+ \label{tab:use-deps-table} |
118 |
\begin{tabular}{ l l } |
119 |
- \toprule |
120 |
- \multicolumn{1}{c}{\textbf{EAPI}} & |
121 |
- \multicolumn{1}{c}{\textbf{Supports \t{USE} dependencies?}} \\ |
122 |
- \midrule |
123 |
- \t{0} & No \\ |
124 |
- \t{1} & No \\ |
125 |
- \t{2} & 2-style \\ |
126 |
- \t{3} & 2-style \\ |
127 |
- \t{4} & 4-style \\ |
128 |
- \t{5} & 4-style \\ |
129 |
- \t{6} & 4-style \\ |
130 |
- \bottomrule |
131 |
+ \toprule |
132 |
+ \multicolumn{1}{c}{\textbf{EAPI}} & |
133 |
+ \multicolumn{1}{c}{\textbf{Supports \t{USE} dependencies?}} \\ |
134 |
+ \midrule |
135 |
+ 0, 1 & No \\ |
136 |
+ 2, 3 & 2-style \\ |
137 |
+ 4, 5, 6 & 4-style \\ |
138 |
+ \bottomrule |
139 |
\end{tabular} |
140 |
\end{centertable} |
141 |
|
142 |
@@ -262,21 +247,17 @@ strong block must not be ignored. The mapping from one or two exclamation marks |
143 |
described in table~\ref{tab:bang-strength-table}. |
144 |
|
145 |
\ChangeWhenAddingAnEAPI{6} |
146 |
-\begin{centertable}{Exclamation mark strengths for EAPIs} \label{tab:bang-strength-table} |
147 |
+\begin{centertable}{Exclamation mark strengths for EAPIs} |
148 |
+ \label{tab:bang-strength-table} |
149 |
\begin{tabular}{ l l l } |
150 |
- \toprule |
151 |
- \multicolumn{1}{c}{\textbf{EAPI}} & |
152 |
- \multicolumn{1}{c}{\textbf{\t{!}}} & |
153 |
- \multicolumn{1}{c}{\textbf{\t{!!}}} \\ |
154 |
- \midrule |
155 |
- \t{0} & Unspecified & Forbidden \\ |
156 |
- \t{1} & Unspecified & Forbidden \\ |
157 |
- \t{2} & Weak & Strong \\ |
158 |
- \t{3} & Weak & Strong \\ |
159 |
- \t{4} & Weak & Strong \\ |
160 |
- \t{5} & Weak & Strong \\ |
161 |
- \t{6} & Weak & Strong \\ |
162 |
- \bottomrule |
163 |
+ \toprule |
164 |
+ \multicolumn{1}{c}{\textbf{EAPI}} & |
165 |
+ \multicolumn{1}{c}{\textbf{\t{!}}} & |
166 |
+ \multicolumn{1}{c}{\textbf{\t{!!}}} \\ |
167 |
+ \midrule |
168 |
+ 0, 1 & Unspecified & Forbidden \\ |
169 |
+ 2, 3, 4, 5, 6 & Weak & Strong \\ |
170 |
+ \bottomrule |
171 |
\end{tabular} |
172 |
\end{centertable} |
173 |
|
174 |
|
175 |
diff --git a/ebuild-env-commands.tex b/ebuild-env-commands.tex |
176 |
index 8b2c146..54e12ec 100644 |
177 |
--- a/ebuild-env-commands.tex |
178 |
+++ b/ebuild-env-commands.tex |
179 |
@@ -36,20 +36,16 @@ The following commands must always be available in the ebuild environment: |
180 |
\end{compactitem} |
181 |
|
182 |
\ChangeWhenAddingAnEAPI{6} |
183 |
-\begin{centertable}{\t{find} implementation for EAPIs} \label{tab:system-commands-table} |
184 |
+\begin{centertable}{\t{find} implementation for EAPIs} |
185 |
+ \label{tab:system-commands-table} |
186 |
\begin{tabular}{ l l } |
187 |
- \toprule |
188 |
- \multicolumn{1}{c}{\textbf{EAPI}} & |
189 |
- \multicolumn{1}{c}{\textbf{GNU \t{find}?}} \\ |
190 |
- \midrule |
191 |
- \t{0} & Undefined \\ |
192 |
- \t{1} & Undefined \\ |
193 |
- \t{2} & Undefined \\ |
194 |
- \t{3} & Undefined \\ |
195 |
- \t{4} & Undefined \\ |
196 |
- \t{5} & Yes \\ |
197 |
- \t{6} & Yes \\ |
198 |
- \bottomrule |
199 |
+ \toprule |
200 |
+ \multicolumn{1}{c}{\textbf{EAPI}} & |
201 |
+ \multicolumn{1}{c}{\textbf{GNU \t{find}?}} \\ |
202 |
+ \midrule |
203 |
+ 0, 1, 2, 3, 4 & Undefined \\ |
204 |
+ 5, 6 & Yes \\ |
205 |
+ \bottomrule |
206 |
\end{tabular} |
207 |
\end{centertable} |
208 |
|
209 |
|
210 |
diff --git a/ebuild-env-vars.tex b/ebuild-env-vars.tex |
211 |
index 8946157..74c54b6 100644 |
212 |
--- a/ebuild-env-vars.tex |
213 |
+++ b/ebuild-env-vars.tex |
214 |
@@ -226,42 +226,35 @@ variable. |
215 |
\end{landscape} |
216 |
|
217 |
\ChangeWhenAddingAnEAPI{6} |
218 |
-\begin{centertable}{EAPIs supporting various added env variables} \label{tab:added-env-vars-table} |
219 |
+\begin{centertable}{EAPIs supporting various added env variables} |
220 |
+ \label{tab:added-env-vars-table} |
221 |
\begin{tabular}{ l l l l l } |
222 |
- \toprule |
223 |
- \multicolumn{1}{c}{\textbf{EAPI}} & |
224 |
- \multicolumn{1}{c}{\textbf{\t{MERGE\_TYPE}?}} & |
225 |
- \multicolumn{1}{c}{\textbf{\t{REPLACING\_VERSIONS}?}} & |
226 |
- \multicolumn{1}{c}{\textbf{\t{REPLACED\_BY\_VERSION}?}} & |
227 |
- \multicolumn{1}{c}{\textbf{\t{EBUILD\_PHASE\_FUNC}?}} \\ |
228 |
- \midrule |
229 |
- \t{0} & No & No & No & No \\ |
230 |
- \t{1} & No & No & No & No \\ |
231 |
- \t{2} & No & No & No & No \\ |
232 |
- \t{3} & No & No & No & No \\ |
233 |
- \t{4} & Yes & Yes & Yes & No \\ |
234 |
- \t{5} & Yes & Yes & Yes & Yes \\ |
235 |
- \t{6} & Yes & Yes & Yes & Yes \\ |
236 |
- \bottomrule |
237 |
+ \toprule |
238 |
+ \multicolumn{1}{c}{\textbf{EAPI}} & |
239 |
+ \multicolumn{1}{c}{\textbf{\t{MERGE\_TYPE}?}} & |
240 |
+ \multicolumn{1}{c}{\textbf{\t{REPLACING\_VERSIONS}?}} & |
241 |
+ \multicolumn{1}{c}{\textbf{\t{REPLACED\_BY\_VERSION}?}} & |
242 |
+ \multicolumn{1}{c}{\textbf{\t{EBUILD\_PHASE\_FUNC}?}} \\ |
243 |
+ \midrule |
244 |
+ 0, 1, 2, 3 & No & No & No & No \\ |
245 |
+ 4 & Yes & Yes & Yes & No \\ |
246 |
+ 5, 6 & Yes & Yes & Yes & Yes \\ |
247 |
+ \bottomrule |
248 |
\end{tabular} |
249 |
\end{centertable} |
250 |
|
251 |
\ChangeWhenAddingAnEAPI{6} |
252 |
-\begin{centertable}{EAPIs supporting various removed env variables} \label{tab:removed-env-vars-table} |
253 |
+\begin{centertable}{EAPIs supporting various removed env variables} |
254 |
+ \label{tab:removed-env-vars-table} |
255 |
\begin{tabular}{ l l l } |
256 |
- \toprule |
257 |
- \multicolumn{1}{c}{\textbf{EAPI}} & |
258 |
- \multicolumn{1}{c}{\textbf{\t{AA}?}} & |
259 |
- \multicolumn{1}{c}{\textbf{\t{KV}?}} \\ |
260 |
- \midrule |
261 |
- \t{0} & Yes & Yes \\ |
262 |
- \t{1} & Yes & Yes \\ |
263 |
- \t{2} & Yes & Yes \\ |
264 |
- \t{3} & Yes & Yes \\ |
265 |
- \t{4} & No & No \\ |
266 |
- \t{5} & No & No \\ |
267 |
- \t{6} & No & No \\ |
268 |
- \bottomrule |
269 |
+ \toprule |
270 |
+ \multicolumn{1}{c}{\textbf{EAPI}} & |
271 |
+ \multicolumn{1}{c}{\textbf{\t{AA}?}} & |
272 |
+ \multicolumn{1}{c}{\textbf{\t{KV}?}} \\ |
273 |
+ \midrule |
274 |
+ 0, 1, 2, 3 & Yes & Yes \\ |
275 |
+ 4, 5, 6 & No & No \\ |
276 |
+ \bottomrule |
277 |
\end{tabular} |
278 |
\end{centertable} |
279 |
|
280 |
@@ -269,20 +262,15 @@ variable. |
281 |
\begin{centertable}{EAPIs supporting offset-prefix env variables} |
282 |
\label{tab:offset-env-vars-table} |
283 |
\begin{tabular}{ l l l l } |
284 |
- \toprule |
285 |
- \multicolumn{1}{c}{\textbf{EAPI}} & |
286 |
- \multicolumn{1}{c}{\textbf{\t{EPREFIX}?}} & |
287 |
- \multicolumn{1}{c}{\textbf{\t{EROOT}?}} & |
288 |
- \multicolumn{1}{c}{\textbf{\t{ED}?}} \\ |
289 |
- \midrule |
290 |
- \t{0} & No & No & No \\ |
291 |
- \t{1} & No & No & No \\ |
292 |
- \t{2} & No & No & No \\ |
293 |
- \t{3} & Yes & Yes & Yes \\ |
294 |
- \t{4} & Yes & Yes & Yes \\ |
295 |
- \t{5} & Yes & Yes & Yes \\ |
296 |
- \t{6} & Yes & Yes & Yes \\ |
297 |
- \bottomrule |
298 |
+ \toprule |
299 |
+ \multicolumn{1}{c}{\textbf{EAPI}} & |
300 |
+ \multicolumn{1}{c}{\textbf{\t{EPREFIX}?}} & |
301 |
+ \multicolumn{1}{c}{\textbf{\t{EROOT}?}} & |
302 |
+ \multicolumn{1}{c}{\textbf{\t{ED}?}} \\ |
303 |
+ \midrule |
304 |
+ 0, 1, 2 & No & No & No \\ |
305 |
+ 3, 4, 5, 6 & Yes & Yes & Yes \\ |
306 |
+ \bottomrule |
307 |
\end{tabular} |
308 |
\end{centertable} |
309 |
|
310 |
@@ -386,18 +374,13 @@ contain at most one value. |
311 |
\begin{centertable}{EAPIs supporting offset-prefix} |
312 |
\label{tab:offset-support-table} |
313 |
\begin{tabular}{ l l } |
314 |
- \toprule |
315 |
- \multicolumn{1}{c}{\textbf{EAPI}} & |
316 |
- \multicolumn{1}{c}{\textbf{Supports offset-prefix?}}\\ |
317 |
- \midrule |
318 |
- \t{0} & No \\ |
319 |
- \t{1} & No \\ |
320 |
- \t{2} & No \\ |
321 |
- \t{3} & Yes \\ |
322 |
- \t{4} & Yes \\ |
323 |
- \t{5} & Yes \\ |
324 |
- \t{6} & Yes \\ |
325 |
- \bottomrule |
326 |
+ \toprule |
327 |
+ \multicolumn{1}{c}{\textbf{EAPI}} & |
328 |
+ \multicolumn{1}{c}{\textbf{Supports offset-prefix?}}\\ |
329 |
+ \midrule |
330 |
+ 0, 1, 2 & No \\ |
331 |
+ 3, 4, 5, 6 & Yes \\ |
332 |
+ \bottomrule |
333 |
\end{tabular} |
334 |
\end{centertable} |
335 |
|
336 |
|
337 |
diff --git a/ebuild-functions.tex b/ebuild-functions.tex |
338 |
index 60bd1e5..23f02b4 100644 |
339 |
--- a/ebuild-functions.tex |
340 |
+++ b/ebuild-functions.tex |
341 |
@@ -45,20 +45,16 @@ fallback to \t{WORKDIR} is used: |
342 |
\end{compactitem} |
343 |
|
344 |
\ChangeWhenAddingAnEAPI{6} |
345 |
-\begin{centertable}{EAPIs with \t{S} to \t{WORKDIR} fallbacks} \label{tab:s-fallback-table} |
346 |
+\begin{centertable}{EAPIs with \t{S} to \t{WORKDIR} fallbacks} |
347 |
+ \label{tab:s-fallback-table} |
348 |
\begin{tabular}{ l l } |
349 |
- \toprule |
350 |
- \multicolumn{1}{c}{\textbf{EAPI}} & |
351 |
- \multicolumn{1}{c}{\textbf{Fallback to \t{WORKDIR} permitted?}} \\ |
352 |
- \midrule |
353 |
- \t{0} & Always \\ |
354 |
- \t{1} & Always \\ |
355 |
- \t{2} & Always \\ |
356 |
- \t{3} & Always \\ |
357 |
- \t{4} & Conditional error \\ |
358 |
- \t{5} & Conditional error \\ |
359 |
- \t{6} & Conditional error \\ |
360 |
- \bottomrule |
361 |
+ \toprule |
362 |
+ \multicolumn{1}{c}{\textbf{EAPI}} & |
363 |
+ \multicolumn{1}{c}{\textbf{Fallback to \t{WORKDIR} permitted?}} \\ |
364 |
+ \midrule |
365 |
+ 0, 1, 2, 3 & Always \\ |
366 |
+ 4, 5, 6 & Conditional error \\ |
367 |
+ \bottomrule |
368 |
\end{tabular} |
369 |
\end{centertable} |
370 |
|
371 |
@@ -81,20 +77,16 @@ before the next phase is executed. |
372 |
\t{pkg\_pretend} must not write to the filesystem. |
373 |
|
374 |
\ChangeWhenAddingAnEAPI{6} |
375 |
-\begin{centertable}{EAPIs supporting \t{pkg\_pretend}} \label{tab:pkg-pretend-table} |
376 |
+\begin{centertable}{EAPIs supporting \t{pkg\_pretend}} |
377 |
+ \label{tab:pkg-pretend-table} |
378 |
\begin{tabular}{ l l } |
379 |
- \toprule |
380 |
- \multicolumn{1}{c}{\textbf{EAPI}} & |
381 |
- \multicolumn{1}{c}{\textbf{Supports \t{pkg\_pretend}?}} \\ |
382 |
- \midrule |
383 |
- \t{0} & No \\ |
384 |
- \t{1} & No \\ |
385 |
- \t{2} & No \\ |
386 |
- \t{3} & No \\ |
387 |
- \t{4} & Yes \\ |
388 |
- \t{5} & Yes \\ |
389 |
- \t{6} & Yes \\ |
390 |
- \bottomrule |
391 |
+ \toprule |
392 |
+ \multicolumn{1}{c}{\textbf{EAPI}} & |
393 |
+ \multicolumn{1}{c}{\textbf{Supports \t{pkg\_pretend}?}} \\ |
394 |
+ \midrule |
395 |
+ 0, 1, 2, 3 & No \\ |
396 |
+ 4, 5, 6 & Yes \\ |
397 |
+ \bottomrule |
398 |
\end{tabular} |
399 |
\end{centertable} |
400 |
|
401 |
@@ -138,20 +130,16 @@ The initial working directory is \t{S}, with an error or fallback to \t{WORKDIR} |
402 |
section~\ref{sec:s-to-workdir-fallback}. |
403 |
|
404 |
\ChangeWhenAddingAnEAPI{6} |
405 |
-\begin{centertable}{EAPIs supporting \t{src\_prepare}} \label{tab:src-prepare-table} |
406 |
+\begin{centertable}{EAPIs supporting \t{src\_prepare}} |
407 |
+ \label{tab:src-prepare-table} |
408 |
\begin{tabular}{ l l } |
409 |
- \toprule |
410 |
- \multicolumn{1}{c}{\textbf{EAPI}} & |
411 |
- \multicolumn{1}{c}{\textbf{Supports \t{src\_prepare}?}} \\ |
412 |
- \midrule |
413 |
- \t{0} & No \\ |
414 |
- \t{1} & No \\ |
415 |
- \t{2} & Yes \\ |
416 |
- \t{3} & Yes \\ |
417 |
- \t{4} & Yes \\ |
418 |
- \t{5} & Yes \\ |
419 |
- \t{6} & Yes \\ |
420 |
- \bottomrule |
421 |
+ \toprule |
422 |
+ \multicolumn{1}{c}{\textbf{EAPI}} & |
423 |
+ \multicolumn{1}{c}{\textbf{Supports \t{src\_prepare}?}} \\ |
424 |
+ \midrule |
425 |
+ 0, 1 & No \\ |
426 |
+ 2, 3, 4, 5, 6 & Yes \\ |
427 |
+ \bottomrule |
428 |
\end{tabular} |
429 |
\end{centertable} |
430 |
|
431 |
@@ -176,20 +164,16 @@ src_configure() { |
432 |
\end{verbatim} |
433 |
|
434 |
\ChangeWhenAddingAnEAPI{6} |
435 |
-\begin{centertable}{EAPIs supporting \t{src\_configure}} \label{tab:src-configure-table} |
436 |
+\begin{centertable}{EAPIs supporting \t{src\_configure}} |
437 |
+ \label{tab:src-configure-table} |
438 |
\begin{tabular}{ l l } |
439 |
- \toprule |
440 |
- \multicolumn{1}{c}{\textbf{EAPI}} & |
441 |
- \multicolumn{1}{c}{\textbf{Supports \t{src\_configure}?}} \\ |
442 |
- \midrule |
443 |
- \t{0} & No \\ |
444 |
- \t{1} & No \\ |
445 |
- \t{2} & Yes \\ |
446 |
- \t{3} & Yes \\ |
447 |
- \t{4} & Yes \\ |
448 |
- \t{5} & Yes \\ |
449 |
- \t{6} & Yes \\ |
450 |
- \bottomrule |
451 |
+ \toprule |
452 |
+ \multicolumn{1}{c}{\textbf{EAPI}} & |
453 |
+ \multicolumn{1}{c}{\textbf{Supports \t{src\_configure}?}} \\ |
454 |
+ \midrule |
455 |
+ 0, 1 & No \\ |
456 |
+ 2, 3, 4, 5, 6 & Yes \\ |
457 |
+ \bottomrule |
458 |
\end{tabular} |
459 |
\end{centertable} |
460 |
|
461 |
@@ -245,20 +229,17 @@ src_compile() { |
462 |
\end{verbatim} |
463 |
|
464 |
\ChangeWhenAddingAnEAPI{6} |
465 |
-\begin{centertable}{\t{src\_compile} behaviour for EAPIs} \label{tab:src-compile-table} |
466 |
+\begin{centertable}{\t{src\_compile} behaviour for EAPIs} |
467 |
+ \label{tab:src-compile-table} |
468 |
\begin{tabular}{ l l } |
469 |
- \toprule |
470 |
- \multicolumn{1}{c}{\textbf{EAPI}} & |
471 |
- \multicolumn{1}{c}{\textbf{Format}} \\ |
472 |
- \midrule |
473 |
- \t{0} & 0 \\ |
474 |
- \t{1} & 1 \\ |
475 |
- \t{2} & 2 \\ |
476 |
- \t{3} & 2 \\ |
477 |
- \t{4} & 2 \\ |
478 |
- \t{5} & 2 \\ |
479 |
- \t{6} & 2 \\ |
480 |
- \bottomrule |
481 |
+ \toprule |
482 |
+ \multicolumn{1}{c}{\textbf{EAPI}} & |
483 |
+ \multicolumn{1}{c}{\textbf{Format}} \\ |
484 |
+ \midrule |
485 |
+ 0 & 0 \\ |
486 |
+ 1 & 1 \\ |
487 |
+ 2, 3, 4, 5, 6 & 2 \\ |
488 |
+ \bottomrule |
489 |
\end{tabular} |
490 |
\end{centertable} |
491 |
|
492 |
@@ -281,20 +262,16 @@ The \t{src\_test} function may be disabled by \t{RESTRICT}\@. See section~\ref{s |
493 |
be disabled by user too, using a PM-specific mechanism. |
494 |
|
495 |
\ChangeWhenAddingAnEAPI{6} |
496 |
-\begin{centertable}{\t{src\_test} behaviour for EAPIs} \label{tab:src-test-table} |
497 |
+\begin{centertable}{\t{src\_test} behaviour for EAPIs} |
498 |
+ \label{tab:src-test-table} |
499 |
\begin{tabular}{ l l } |
500 |
- \toprule |
501 |
- \multicolumn{1}{c}{\textbf{EAPI}} & |
502 |
- \multicolumn{1}{c}{\textbf{Supports parallel tests?}} \\ |
503 |
- \midrule |
504 |
- \t{0} & No \\ |
505 |
- \t{1} & No \\ |
506 |
- \t{2} & No \\ |
507 |
- \t{3} & No \\ |
508 |
- \t{4} & No \\ |
509 |
- \t{5} & Yes \\ |
510 |
- \t{6} & Yes \\ |
511 |
- \bottomrule |
512 |
+ \toprule |
513 |
+ \multicolumn{1}{c}{\textbf{EAPI}} & |
514 |
+ \multicolumn{1}{c}{\textbf{Supports parallel tests?}} \\ |
515 |
+ \midrule |
516 |
+ 0, 1, 2, 3, 4 & No \\ |
517 |
+ 5, 6 & Yes \\ |
518 |
+ \bottomrule |
519 |
\end{tabular} |
520 |
\end{centertable} |
521 |
|
522 |
@@ -335,20 +312,16 @@ For other EAPIs, the default implementation used when the ebuild lacks the \t{sr |
523 |
is a no-op. |
524 |
|
525 |
\ChangeWhenAddingAnEAPI{6} |
526 |
-\begin{centertable}{\t{src\_install} behaviour for EAPIs} \label{tab:src-install-table} |
527 |
+\begin{centertable}{\t{src\_install} behaviour for EAPIs} |
528 |
+ \label{tab:src-install-table} |
529 |
\begin{tabular}{ l l } |
530 |
- \toprule |
531 |
- \multicolumn{1}{c}{\textbf{EAPI}} & |
532 |
- \multicolumn{1}{c}{\textbf{Format}} \\ |
533 |
- \midrule |
534 |
- \t{0} & no-op \\ |
535 |
- \t{1} & no-op \\ |
536 |
- \t{2} & no-op \\ |
537 |
- \t{3} & no-op \\ |
538 |
- \t{4} & 4 \\ |
539 |
- \t{5} & 4 \\ |
540 |
- \t{6} & 4 \\ |
541 |
- \bottomrule |
542 |
+ \toprule |
543 |
+ \multicolumn{1}{c}{\textbf{EAPI}} & |
544 |
+ \multicolumn{1}{c}{\textbf{Format}} \\ |
545 |
+ \midrule |
546 |
+ 0, 1, 2, 3 & no-op \\ |
547 |
+ 4, 5, 6 & 4 \\ |
548 |
+ \bottomrule |
549 |
\end{tabular} |
550 |
\end{centertable} |
551 |
|
552 |
@@ -412,20 +385,16 @@ that dependencies may not be installed. |
553 |
\t{pkg\_info} must not write to the filesystem. |
554 |
|
555 |
\ChangeWhenAddingAnEAPI{6} |
556 |
-\begin{centertable}{EAPIs supporting \t{pkg\_info} on non-installed packages} \label{tab:pkg-info-table} |
557 |
+\begin{centertable}{EAPIs supporting \t{pkg\_info} on non-installed packages} |
558 |
+ \label{tab:pkg-info-table} |
559 |
\begin{tabular}{ l l } |
560 |
- \toprule |
561 |
- \multicolumn{1}{c}{\textbf{EAPI}} & |
562 |
- \multicolumn{1}{c}{\textbf{Supports \t{pkg\_info} on non-installed packages?}} \\ |
563 |
- \midrule |
564 |
- \t{0} & No \\ |
565 |
- \t{1} & No \\ |
566 |
- \t{2} & No \\ |
567 |
- \t{3} & No \\ |
568 |
- \t{4} & Yes \\ |
569 |
- \t{5} & Yes \\ |
570 |
- \t{6} & Yes \\ |
571 |
- \bottomrule |
572 |
+ \toprule |
573 |
+ \multicolumn{1}{c}{\textbf{EAPI}} & |
574 |
+ \multicolumn{1}{c}{\textbf{Supports \t{pkg\_info} on non-installed packages?}} \\ |
575 |
+ \midrule |
576 |
+ 0, 1, 2, 3 & No \\ |
577 |
+ 4, 5, 6 & Yes \\ |
578 |
+ \bottomrule |
579 |
\end{tabular} |
580 |
\end{centertable} |
581 |
|
582 |
@@ -448,25 +417,19 @@ when executing any ebuild phase listed in the table. Ebuilds must not call these |
583 |
when in the phase in question. |
584 |
|
585 |
\ChangeWhenAddingAnEAPI{6} |
586 |
-\begin{centertable}{EAPIs supporting \t{default\_} phase functions} \label{tab:default-phase-function-table} |
587 |
+\begin{centertable}{EAPIs supporting \t{default\_} phase functions} |
588 |
+ \label{tab:default-phase-function-table} |
589 |
\begin{tabular}{ l >{\setlength{\rightskip}{0pt plus 1fil}}p{30em} } |
590 |
- \toprule |
591 |
- \multicolumn{1}{c}{\textbf{EAPI}} & |
592 |
- \multicolumn{1}{c}{\textbf{Supports \t{default\_} functions in phases}} \\ |
593 |
- \midrule |
594 |
- \t{0} & None \\ |
595 |
- \t{1} & None \\ |
596 |
- \t{2} & \t{pkg\_nofetch}, \t{src\_unpack}, \t{src\_prepare}, \t{src\_configure}, |
597 |
- \t{src\_compile}, \t{src\_test} \\ |
598 |
- \t{3} & \t{pkg\_nofetch}, \t{src\_unpack}, \t{src\_prepare}, \t{src\_configure}, |
599 |
- \t{src\_compile}, \t{src\_test} \\ |
600 |
- \t{4} & \t{pkg\_nofetch}, \t{src\_unpack}, \t{src\_prepare}, \t{src\_configure}, |
601 |
- \t{src\_compile}, \t{src\_install}, \t{src\_test} \\ |
602 |
- \t{5} & \t{pkg\_nofetch}, \t{src\_unpack}, \t{src\_prepare}, \t{src\_configure}, |
603 |
- \t{src\_compile}, \t{src\_install}, \t{src\_test} \\ |
604 |
- \t{6} & \t{pkg\_nofetch}, \t{src\_unpack}, \t{src\_prepare}, \t{src\_configure}, |
605 |
- \t{src\_compile}, \t{src\_install}, \t{src\_test} \\ |
606 |
- \bottomrule |
607 |
+ \toprule |
608 |
+ \multicolumn{1}{c}{\textbf{EAPI}} & |
609 |
+ \multicolumn{1}{c}{\textbf{Supports \t{default\_} functions in phases}} \\ |
610 |
+ \midrule |
611 |
+ 0, 1 & None \\ |
612 |
+ 2, 3 & \t{pkg\_nofetch}, \t{src\_unpack}, \t{src\_prepare}, \t{src\_configure}, |
613 |
+ \t{src\_compile}, \t{src\_test} \\ |
614 |
+ 4, 5, 6 & \t{pkg\_nofetch}, \t{src\_unpack}, \t{src\_prepare}, \t{src\_configure}, |
615 |
+ \t{src\_compile}, \t{src\_install}, \t{src\_test} \\ |
616 |
+ \bottomrule |
617 |
\end{tabular} |
618 |
\end{centertable} |
619 |
|
620 |
|
621 |
diff --git a/ebuild-vars.tex b/ebuild-vars.tex |
622 |
index 0bba597..dac0990 100644 |
623 |
--- a/ebuild-vars.tex |
624 |
+++ b/ebuild-vars.tex |
625 |
@@ -85,40 +85,31 @@ Ebuilds may define any of the following variables: |
626 |
\end{description} |
627 |
|
628 |
\ChangeWhenAddingAnEAPI{6} |
629 |
-\begin{centertable}{EAPIs supporting \t{IUSE} defaults} \label{tab:iuse-defaults-table} |
630 |
+\begin{centertable}{EAPIs supporting \t{IUSE} defaults} |
631 |
+ \label{tab:iuse-defaults-table} |
632 |
\begin{tabular}{ l l } |
633 |
- \toprule |
634 |
- \multicolumn{1}{c}{\textbf{EAPI}} & |
635 |
- \multicolumn{1}{c}{\textbf{Supports \t{IUSE} defaults?}} \\ |
636 |
- \midrule |
637 |
- \t{0} & No \\ |
638 |
- \t{1} & Yes \\ |
639 |
- \t{2} & Yes \\ |
640 |
- \t{3} & Yes \\ |
641 |
- \t{4} & Yes \\ |
642 |
- \t{5} & Yes \\ |
643 |
- \t{6} & Yes \\ |
644 |
- \bottomrule |
645 |
+ \toprule |
646 |
+ \multicolumn{1}{c}{\textbf{EAPI}} & |
647 |
+ \multicolumn{1}{c}{\textbf{Supports \t{IUSE} defaults?}} \\ |
648 |
+ \midrule |
649 |
+ 0 & No \\ |
650 |
+ 1, 2, 3, 4, 5, 6 & Yes \\ |
651 |
+ \bottomrule |
652 |
\end{tabular} |
653 |
\end{centertable} |
654 |
|
655 |
\ChangeWhenAddingAnEAPI{6} |
656 |
\begin{centertable}{EAPIs supporting various ebuild-defined variables} |
657 |
-\label{tab:optional-vars-table} |
658 |
+ \label{tab:optional-vars-table} |
659 |
\begin{tabular}{ l l l } |
660 |
- \toprule |
661 |
- \multicolumn{1}{c}{\textbf{EAPI}} & |
662 |
- \multicolumn{1}{c}{\textbf{Supports \t{PROPERTIES}?}} & |
663 |
- \multicolumn{1}{c}{\textbf{Supports \t{REQUIRED\_USE}?}} \\ |
664 |
- \midrule |
665 |
- \t{0} & Optionally & No \\ |
666 |
- \t{1} & Optionally & No \\ |
667 |
- \t{2} & Optionally & No \\ |
668 |
- \t{3} & Optionally & No \\ |
669 |
- \t{4} & Yes & Yes \\ |
670 |
- \t{5} & Yes & Yes \\ |
671 |
- \t{6} & Yes & Yes \\ |
672 |
- \bottomrule |
673 |
+ \toprule |
674 |
+ \multicolumn{1}{c}{\textbf{EAPI}} & |
675 |
+ \multicolumn{1}{c}{\textbf{Supports \t{PROPERTIES}?}} & |
676 |
+ \multicolumn{1}{c}{\textbf{Supports \t{REQUIRED\_USE}?}} \\ |
677 |
+ \midrule |
678 |
+ 0, 1, 2, 3 & Optionally & No \\ |
679 |
+ 4, 5, 6 & Yes & Yes \\ |
680 |
+ \bottomrule |
681 |
\end{tabular} |
682 |
\end{centertable} |
683 |
|
684 |
@@ -186,20 +177,16 @@ the ebuild portion, and any \t{DEPEND} value set in an eclass does not get treat |
685 |
\t{RDEPEND}. |
686 |
|
687 |
\ChangeWhenAddingAnEAPI{6} |
688 |
-\begin{centertable}{EAPIs with \t{RDEPEND=DEPEND} Default} \label{tab:rdepend-depend-table} |
689 |
+\begin{centertable}{EAPIs with \t{RDEPEND=DEPEND} Default} |
690 |
+ \label{tab:rdepend-depend-table} |
691 |
\begin{tabular}{ l l } |
692 |
- \toprule |
693 |
- \multicolumn{1}{c}{\textbf{EAPI}} & |
694 |
- \multicolumn{1}{c}{\textbf{\t{RDEPEND=DEPEND}?}} \\ |
695 |
- \midrule |
696 |
- \t{0} & Yes \\ |
697 |
- \t{1} & Yes \\ |
698 |
- \t{2} & Yes \\ |
699 |
- \t{3} & Yes \\ |
700 |
- \t{4} & No \\ |
701 |
- \t{5} & No \\ |
702 |
- \t{6} & No \\ |
703 |
- \bottomrule |
704 |
+ \toprule |
705 |
+ \multicolumn{1}{c}{\textbf{EAPI}} & |
706 |
+ \multicolumn{1}{c}{\textbf{\t{RDEPEND=DEPEND}?}} \\ |
707 |
+ \midrule |
708 |
+ 0, 1, 2, 3 & Yes \\ |
709 |
+ 4, 5, 6 & No \\ |
710 |
+ \bottomrule |
711 |
\end{tabular} |
712 |
\end{centertable} |
713 |
|
714 |
@@ -233,20 +220,16 @@ this variable defined, and must treat an empty string as ``this information is n |
715 |
based upon any variant condition. |
716 |
|
717 |
\ChangeWhenAddingAnEAPI{6} |
718 |
-\begin{centertable}{EAPIs supporting \t{DEFINED\_PHASES}} \label{tab:defined-phases-table} |
719 |
+\begin{centertable}{EAPIs supporting \t{DEFINED\_PHASES}} |
720 |
+ \label{tab:defined-phases-table} |
721 |
\begin{tabular}{ l l } |
722 |
- \toprule |
723 |
- \multicolumn{1}{c}{\textbf{EAPI}} & |
724 |
- \multicolumn{1}{c}{\textbf{Supports \t{DEFINED\_PHASES}?}} \\ |
725 |
- \midrule |
726 |
- \t{0} & Optionally \\ |
727 |
- \t{1} & Optionally \\ |
728 |
- \t{2} & Optionally \\ |
729 |
- \t{3} & Optionally \\ |
730 |
- \t{4} & Yes \\ |
731 |
- \t{5} & Yes \\ |
732 |
- \t{6} & Yes \\ |
733 |
- \bottomrule |
734 |
+ \toprule |
735 |
+ \multicolumn{1}{c}{\textbf{EAPI}} & |
736 |
+ \multicolumn{1}{c}{\textbf{Supports \t{DEFINED\_PHASES}?}} \\ |
737 |
+ \midrule |
738 |
+ 0, 1, 2, 3 & Optionally \\ |
739 |
+ 4, 5, 6 & Yes \\ |
740 |
+ \bottomrule |
741 |
\end{tabular} |
742 |
\end{centertable} |
743 |
|
744 |
|
745 |
diff --git a/merge.tex b/merge.tex |
746 |
index 1180c8c..cd4b442 100644 |
747 |
--- a/merge.tex |
748 |
+++ b/merge.tex |
749 |
@@ -90,18 +90,13 @@ is undefined. |
750 |
\begin{centertable}{Preservation of file modification times (mtimes)} |
751 |
\label{tab:mtime-preserve} |
752 |
\begin{tabular}{ l l } |
753 |
- \toprule |
754 |
- \multicolumn{1}{c}{\textbf{EAPI}} & |
755 |
- \multicolumn{1}{c}{\textbf{mtimes preserved?}} \\ |
756 |
- \midrule |
757 |
- \t{0} & Undefined \\ |
758 |
- \t{1} & Undefined \\ |
759 |
- \t{2} & Undefined \\ |
760 |
- \t{3} & Yes \\ |
761 |
- \t{4} & Yes \\ |
762 |
- \t{5} & Yes \\ |
763 |
- \t{6} & Yes \\ |
764 |
- \bottomrule |
765 |
+ \toprule |
766 |
+ \multicolumn{1}{c}{\textbf{EAPI}} & |
767 |
+ \multicolumn{1}{c}{\textbf{mtimes preserved?}} \\ |
768 |
+ \midrule |
769 |
+ 0, 1, 2 & Undefined \\ |
770 |
+ 3, 4, 5, 6 & Yes \\ |
771 |
+ \bottomrule |
772 |
\end{tabular} |
773 |
\end{centertable} |
774 |
|
775 |
|
776 |
diff --git a/pkg-mgr-commands.tex b/pkg-mgr-commands.tex |
777 |
index db0fd90..038e9e6 100644 |
778 |
--- a/pkg-mgr-commands.tex |
779 |
+++ b/pkg-mgr-commands.tex |
780 |
@@ -24,21 +24,17 @@ The following commands affect this behaviour: |
781 |
\end{description} |
782 |
|
783 |
\ChangeWhenAddingAnEAPI{6} |
784 |
-\begin{centertable}{EAPI Command Failure Behaviour} \label{tab:commands-die-table} |
785 |
+\begin{centertable}{EAPI Command Failure Behaviour} |
786 |
+ \label{tab:commands-die-table} |
787 |
\begin{tabular}{ l l l } |
788 |
- \toprule |
789 |
- \multicolumn{1}{c}{\textbf{EAPI}} & |
790 |
- \multicolumn{1}{c}{\textbf{Command failure behaviour}} & |
791 |
- \multicolumn{1}{c}{\textbf{Supports \t{nonfatal}?}} \\ |
792 |
- \midrule |
793 |
- \t{0} & Non-zero exit & No \\ |
794 |
- \t{1} & Non-zero exit & No \\ |
795 |
- \t{2} & Non-zero exit & No \\ |
796 |
- \t{3} & Non-zero exit & No \\ |
797 |
- \t{4} & Aborts & Yes \\ |
798 |
- \t{5} & Aborts & Yes \\ |
799 |
- \t{6} & Aborts & Yes \\ |
800 |
- \bottomrule |
801 |
+ \toprule |
802 |
+ \multicolumn{1}{c}{\textbf{EAPI}} & |
803 |
+ \multicolumn{1}{c}{\textbf{Command failure behaviour}} & |
804 |
+ \multicolumn{1}{c}{\textbf{Supports \t{nonfatal}?}} \\ |
805 |
+ \midrule |
806 |
+ 0, 1, 2, 3 & Non-zero exit & No \\ |
807 |
+ 4, 5, 6 & Aborts & Yes \\ |
808 |
+ \bottomrule |
809 |
\end{tabular} |
810 |
\end{centertable} |
811 |
|
812 |
@@ -49,23 +45,19 @@ The following commands affect this behaviour: |
813 |
called, the package manager must abort the build process indicating an error. |
814 |
|
815 |
\ChangeWhenAddingAnEAPI{6} |
816 |
-\begin{centertable}{Banned commands} \label{tab:banned-commands-table} |
817 |
+\begin{centertable}{Banned commands} |
818 |
+ \label{tab:banned-commands-table} |
819 |
\begin{tabular}{ l l l } |
820 |
- \toprule |
821 |
- \multicolumn{1}{c}{\textbf{EAPI}} & |
822 |
- \multicolumn{2}{c}{\textbf{Command banned?}} \\ |
823 |
- \multicolumn{1}{c}{} & |
824 |
- \multicolumn{1}{c}{\textbf{\t{dohard}}} & |
825 |
- \multicolumn{1}{c}{\textbf{\t{dosed}}} \\ |
826 |
- \midrule |
827 |
- \t{0} & No & No \\ |
828 |
- \t{1} & No & No \\ |
829 |
- \t{2} & No & No \\ |
830 |
- \t{3} & No & No \\ |
831 |
- \t{4} & Yes & Yes \\ |
832 |
- \t{5} & Yes & Yes \\ |
833 |
- \t{6} & Yes & Yes \\ |
834 |
- \bottomrule |
835 |
+ \toprule |
836 |
+ \multicolumn{1}{c}{\textbf{EAPI}} & |
837 |
+ \multicolumn{2}{c}{\textbf{Command banned?}} \\ |
838 |
+ \multicolumn{1}{c}{} & |
839 |
+ \multicolumn{1}{c}{\textbf{\t{dohard}}} & |
840 |
+ \multicolumn{1}{c}{\textbf{\t{dosed}}} \\ |
841 |
+ \midrule |
842 |
+ 0, 1, 2, 3 & No & No \\ |
843 |
+ 4, 5, 6 & Yes & Yes \\ |
844 |
+ \bottomrule |
845 |
\end{tabular} |
846 |
\end{centertable} |
847 |
|
848 |
@@ -162,21 +154,18 @@ current phase function has returned. |
849 |
\end{itemize} |
850 |
|
851 |
\ChangeWhenAddingAnEAPI{6} |
852 |
- \begin{centertable}{Extra \t{econf} arguments for EAPIs} \label{tab:econf-options-table} |
853 |
+ \begin{centertable}{Extra \t{econf} arguments for EAPIs} |
854 |
+ \label{tab:econf-options-table} |
855 |
\begin{tabular}{ l l l } |
856 |
- \toprule |
857 |
- \multicolumn{1}{c}{\textbf{EAPI}} & |
858 |
- \multicolumn{1}{c}{\textbf{-{}-disable-dependency-tracking}?} & |
859 |
- \multicolumn{1}{c}{\textbf{-{}-disable-silent-rules}?} \\ |
860 |
- \midrule |
861 |
- \t{0} & No & No \\ |
862 |
- \t{1} & No & No \\ |
863 |
- \t{2} & No & No \\ |
864 |
- \t{3} & No & No \\ |
865 |
- \t{4} & Yes & No \\ |
866 |
- \t{5} & Yes & Yes \\ |
867 |
- \t{6} & Yes & Yes \\ |
868 |
- \bottomrule |
869 |
+ \toprule |
870 |
+ \multicolumn{1}{c}{\textbf{EAPI}} & |
871 |
+ \multicolumn{1}{c}{\textbf{-{}-disable-dependency-tracking?}} & |
872 |
+ \multicolumn{1}{c}{\textbf{-{}-disable-silent-rules?}} \\ |
873 |
+ \midrule |
874 |
+ 0, 1, 2, 3 & No & No \\ |
875 |
+ 4 & Yes & No \\ |
876 |
+ 5, 6 & Yes & Yes \\ |
877 |
+ \bottomrule |
878 |
\end{tabular} |
879 |
\end{centertable} |
880 |
|
881 |
@@ -440,56 +429,44 @@ can be extended or reduced (see below). The options that can be passed to \t{doh |
882 |
\end{description} |
883 |
|
884 |
\ChangeWhenAddingAnEAPI{6} |
885 |
-\begin{centertable}{EAPIs supporting \t{dodoc -r}} \label{tab:dodoc-table} |
886 |
+\begin{centertable}{EAPIs supporting \t{dodoc -r}} |
887 |
+ \label{tab:dodoc-table} |
888 |
\begin{tabular}{ l l } |
889 |
- \toprule |
890 |
- \multicolumn{1}{c}{\textbf{EAPI}} & |
891 |
- \multicolumn{1}{c}{\textbf{Supports \t{dodoc -r}?}} \\ |
892 |
- \midrule |
893 |
- \t{0} & No \\ |
894 |
- \t{1} & No \\ |
895 |
- \t{2} & No \\ |
896 |
- \t{3} & No \\ |
897 |
- \t{4} & Yes \\ |
898 |
- \t{5} & Yes \\ |
899 |
- \t{6} & Yes \\ |
900 |
- \bottomrule |
901 |
+ \toprule |
902 |
+ \multicolumn{1}{c}{\textbf{EAPI}} & |
903 |
+ \multicolumn{1}{c}{\textbf{Supports \t{dodoc -r}?}} \\ |
904 |
+ \midrule |
905 |
+ 0, 1, 2, 3 & No \\ |
906 |
+ 4, 5, 6 & Yes \\ |
907 |
+ \bottomrule |
908 |
\end{tabular} |
909 |
\end{centertable} |
910 |
|
911 |
\ChangeWhenAddingAnEAPI{6} |
912 |
-\begin{centertable}{EAPIs supporting \t{doheader} and \t{newheader}} \label{tab:doheader-table} |
913 |
+\begin{centertable}{EAPIs supporting \t{doheader} and \t{newheader}} |
914 |
+ \label{tab:doheader-table} |
915 |
\begin{tabular}{ l l } |
916 |
- \toprule |
917 |
- \multicolumn{1}{c}{\textbf{EAPI}} & |
918 |
- \multicolumn{1}{c}{\textbf{Supports \t{doheader} and \t{newheader}?}} \\ |
919 |
- \midrule |
920 |
- \t{0} & No \\ |
921 |
- \t{1} & No \\ |
922 |
- \t{2} & No \\ |
923 |
- \t{3} & No \\ |
924 |
- \t{4} & No \\ |
925 |
- \t{5} & Yes \\ |
926 |
- \t{6} & Yes \\ |
927 |
- \bottomrule |
928 |
+ \toprule |
929 |
+ \multicolumn{1}{c}{\textbf{EAPI}} & |
930 |
+ \multicolumn{1}{c}{\textbf{Supports \t{doheader} and \t{newheader}?}} \\ |
931 |
+ \midrule |
932 |
+ 0, 1, 2, 3, 4 & No \\ |
933 |
+ 5, 6 & Yes \\ |
934 |
+ \bottomrule |
935 |
\end{tabular} |
936 |
\end{centertable} |
937 |
|
938 |
\ChangeWhenAddingAnEAPI{6} |
939 |
-\begin{centertable}{EAPIs supporting symlinks for \t{doins}} \label{tab:doins-table} |
940 |
+\begin{centertable}{EAPIs supporting symlinks for \t{doins}} |
941 |
+ \label{tab:doins-table} |
942 |
\begin{tabular}{ l l } |
943 |
- \toprule |
944 |
- \multicolumn{1}{c}{\textbf{EAPI}} & |
945 |
- \multicolumn{1}{c}{\textbf{\t{doins} supports symlinks?}} \\ |
946 |
- \midrule |
947 |
- \t{0} & No \\ |
948 |
- \t{1} & No \\ |
949 |
- \t{2} & No \\ |
950 |
- \t{3} & No \\ |
951 |
- \t{4} & Yes \\ |
952 |
- \t{5} & Yes \\ |
953 |
- \t{6} & Yes \\ |
954 |
- \bottomrule |
955 |
+ \toprule |
956 |
+ \multicolumn{1}{c}{\textbf{EAPI}} & |
957 |
+ \multicolumn{1}{c}{\textbf{\t{doins} supports symlinks?}} \\ |
958 |
+ \midrule |
959 |
+ 0, 1, 2, 3 & No \\ |
960 |
+ 4, 5, 6 & Yes \\ |
961 |
+ \bottomrule |
962 |
\end{tabular} |
963 |
\end{centertable} |
964 |
|
965 |
@@ -497,37 +474,29 @@ can be extended or reduced (see below). The options that can be passed to \t{doh |
966 |
\begin{centertable}{\t{doman} language support options for EAPIs} |
967 |
\label{tab:doman-table} |
968 |
\begin{tabular}{ l l l } |
969 |
- \toprule |
970 |
- \multicolumn{1}{c}{\textbf{EAPI}} & |
971 |
- \multicolumn{1}{c}{\textbf{Language detection by filename?}} & |
972 |
- \multicolumn{1}{c}{\textbf{Option \t{-i18n} takes precedence?}} \\ |
973 |
- \midrule |
974 |
- \t{0} & No & Not applicable \\ |
975 |
- \t{1} & No & Not applicable \\ |
976 |
- \t{2} & Yes & No \\ |
977 |
- \t{3} & Yes & No \\ |
978 |
- \t{4} & Yes & Yes \\ |
979 |
- \t{5} & Yes & Yes \\ |
980 |
- \t{6} & Yes & Yes \\ |
981 |
- \bottomrule |
982 |
+ \toprule |
983 |
+ \multicolumn{1}{c}{\textbf{EAPI}} & |
984 |
+ \multicolumn{1}{c}{\textbf{Language detection by filename?}} & |
985 |
+ \multicolumn{1}{c}{\textbf{Option \t{-i18n} takes precedence?}} \\ |
986 |
+ \midrule |
987 |
+ 0, 1 & No & Not applicable \\ |
988 |
+ 2, 3 & Yes & No \\ |
989 |
+ 4, 5, 6 & Yes & Yes \\ |
990 |
+ \bottomrule |
991 |
\end{tabular} |
992 |
\end{centertable} |
993 |
|
994 |
\ChangeWhenAddingAnEAPI{6} |
995 |
-\begin{centertable}{EAPIs supporting stdin for \t{new*} commands} \label{tab:newfoo-stdin-table} |
996 |
+\begin{centertable}{EAPIs supporting stdin for \t{new*} commands} |
997 |
+ \label{tab:newfoo-stdin-table} |
998 |
\begin{tabular}{ l l } |
999 |
- \toprule |
1000 |
- \multicolumn{1}{c}{\textbf{EAPI}} & |
1001 |
- \multicolumn{1}{c}{\textbf{\t{new*} can read from stdin?}} \\ |
1002 |
- \midrule |
1003 |
- \t{0} & No \\ |
1004 |
- \t{1} & No \\ |
1005 |
- \t{2} & No \\ |
1006 |
- \t{3} & No \\ |
1007 |
- \t{4} & No \\ |
1008 |
- \t{5} & Yes \\ |
1009 |
- \t{6} & Yes \\ |
1010 |
- \bottomrule |
1011 |
+ \toprule |
1012 |
+ \multicolumn{1}{c}{\textbf{EAPI}} & |
1013 |
+ \multicolumn{1}{c}{\textbf{\t{new*} can read from stdin?}} \\ |
1014 |
+ \midrule |
1015 |
+ 0, 1, 2, 3, 4 & No \\ |
1016 |
+ 5, 6 & Yes \\ |
1017 |
+ \bottomrule |
1018 |
\end{tabular} |
1019 |
\end{centertable} |
1020 |
|
1021 |
@@ -535,18 +504,13 @@ can be extended or reduced (see below). The options that can be passed to \t{doh |
1022 |
\begin{centertable}{EAPIs supporting \t{-{}-host-root} for \t{*\_version} commands} |
1023 |
\label{tab:foo-version-host-root-table} |
1024 |
\begin{tabular}{ l l } |
1025 |
- \toprule |
1026 |
- \multicolumn{1}{c}{\textbf{EAPI}} & |
1027 |
- \multicolumn{1}{c}{\textbf{\t{*\_version} supports \t{-{}-host-root}?}} \\ |
1028 |
- \midrule |
1029 |
- \t{0} & No \\ |
1030 |
- \t{1} & No \\ |
1031 |
- \t{2} & No \\ |
1032 |
- \t{3} & No \\ |
1033 |
- \t{4} & No \\ |
1034 |
- \t{5} & Yes \\ |
1035 |
- \t{6} & Yes \\ |
1036 |
- \bottomrule |
1037 |
+ \toprule |
1038 |
+ \multicolumn{1}{c}{\textbf{EAPI}} & |
1039 |
+ \multicolumn{1}{c}{\textbf{\t{*\_version} supports \t{-{}-host-root}?}} \\ |
1040 |
+ \midrule |
1041 |
+ 0, 1, 2, 3, 4 & No \\ |
1042 |
+ 5, 6 & Yes \\ |
1043 |
+ \bottomrule |
1044 |
\end{tabular} |
1045 |
\end{centertable} |
1046 |
|
1047 |
@@ -636,21 +600,17 @@ in table~\ref{tab:compression-table} as supporting \t{docompress}. |
1048 |
\end{description} |
1049 |
|
1050 |
\ChangeWhenAddingAnEAPI{6} |
1051 |
-\begin{centertable}{EAPIs supporting controllable compression} \label{tab:compression-table} |
1052 |
+\begin{centertable}{EAPIs supporting controllable compression} |
1053 |
+ \label{tab:compression-table} |
1054 |
\begin{tabular}{ l l l } |
1055 |
- \toprule |
1056 |
- \multicolumn{1}{c}{\textbf{EAPI}} & |
1057 |
- \multicolumn{1}{c}{\textbf{Supports controllable compression?}} & |
1058 |
- \multicolumn{1}{c}{\textbf{Supports \t{docompress}?}} \\ |
1059 |
- \midrule |
1060 |
- \t{0} & No & No \\ |
1061 |
- \t{1} & No & No \\ |
1062 |
- \t{2} & No & No \\ |
1063 |
- \t{3} & No & No \\ |
1064 |
- \t{4} & Yes & Yes \\ |
1065 |
- \t{5} & Yes & Yes \\ |
1066 |
- \t{6} & Yes & Yes \\ |
1067 |
- \bottomrule |
1068 |
+ \toprule |
1069 |
+ \multicolumn{1}{c}{\textbf{EAPI}} & |
1070 |
+ \multicolumn{1}{c}{\textbf{Supports controllable compression?}} & |
1071 |
+ \multicolumn{1}{c}{\textbf{Supports \t{docompress}?}} \\ |
1072 |
+ \midrule |
1073 |
+ 0, 1, 2, 3 & No & No \\ |
1074 |
+ 4, 5, 6 & Yes & Yes \\ |
1075 |
+ \bottomrule |
1076 |
\end{tabular} |
1077 |
\end{centertable} |
1078 |
|
1079 |
@@ -689,20 +649,16 @@ either behaviour is undefined or it is an error as decided by table~\ref{tab:use |
1080 |
\end{description} |
1081 |
|
1082 |
\ChangeWhenAddingAnEAPI{6} |
1083 |
-\begin{centertable}{EAPI Behaviour for Use Queries not in IUSE\_EFFECTIVE} \label{tab:use-list-strictness} |
1084 |
+\begin{centertable}{EAPI Behaviour for Use Queries not in IUSE\_EFFECTIVE} |
1085 |
+ \label{tab:use-list-strictness} |
1086 |
\begin{tabular}{ l l } |
1087 |
- \toprule |
1088 |
- \multicolumn{1}{c}{\textbf{EAPI}} & |
1089 |
- \multicolumn{1}{c}{\textbf{Behaviour}} \\ |
1090 |
- \midrule |
1091 |
- \t{0} & Undefined \\ |
1092 |
- \t{1} & Undefined \\ |
1093 |
- \t{2} & Undefined \\ |
1094 |
- \t{3} & Undefined \\ |
1095 |
- \t{4} & Error \\ |
1096 |
- \t{5} & Error \\ |
1097 |
- \t{6} & Error \\ |
1098 |
- \bottomrule |
1099 |
+ \toprule |
1100 |
+ \multicolumn{1}{c}{\textbf{EAPI}} & |
1101 |
+ \multicolumn{1}{c}{\textbf{Behaviour}} \\ |
1102 |
+ \midrule |
1103 |
+ 0, 1, 2, 3 & Undefined \\ |
1104 |
+ 4, 5, 6 & Error \\ |
1105 |
+ \bottomrule |
1106 |
\end{tabular} |
1107 |
\end{centertable} |
1108 |
|
1109 |
@@ -710,36 +666,27 @@ either behaviour is undefined or it is an error as decided by table~\ref{tab:use |
1110 |
\begin{centertable}{EAPIs supporting empty third argument in \t{use\_with} and \t{use\_enable}} |
1111 |
\label{tab:use-with-third-arg} |
1112 |
\begin{tabular}{ l l } |
1113 |
- \toprule |
1114 |
- \multicolumn{1}{c}{\textbf{EAPI}} & |
1115 |
- \multicolumn{1}{c}{\textbf{Supports empty third argument?}} \\ |
1116 |
- \midrule |
1117 |
- \t{0} & No \\ |
1118 |
- \t{1} & No \\ |
1119 |
- \t{2} & No \\ |
1120 |
- \t{3} & No \\ |
1121 |
- \t{4} & Yes \\ |
1122 |
- \t{5} & Yes \\ |
1123 |
- \t{6} & Yes \\ |
1124 |
- \bottomrule |
1125 |
+ \toprule |
1126 |
+ \multicolumn{1}{c}{\textbf{EAPI}} & |
1127 |
+ \multicolumn{1}{c}{\textbf{Supports empty third argument?}} \\ |
1128 |
+ \midrule |
1129 |
+ 0, 1, 2, 3 & No \\ |
1130 |
+ 4, 5, 6 & Yes \\ |
1131 |
+ \bottomrule |
1132 |
\end{tabular} |
1133 |
\end{centertable} |
1134 |
|
1135 |
\ChangeWhenAddingAnEAPI{6} |
1136 |
-\begin{centertable}{EAPIs supporting \t{usex}} \label{tab:usex-table} |
1137 |
+\begin{centertable}{EAPIs supporting \t{usex}} |
1138 |
+ \label{tab:usex-table} |
1139 |
\begin{tabular}{ l l } |
1140 |
- \toprule |
1141 |
- \multicolumn{1}{c}{\textbf{EAPI}} & |
1142 |
- \multicolumn{1}{c}{\textbf{Supports \t{usex}?}} \\ |
1143 |
- \midrule |
1144 |
- \t{0} & No \\ |
1145 |
- \t{1} & No \\ |
1146 |
- \t{2} & No \\ |
1147 |
- \t{3} & No \\ |
1148 |
- \t{4} & No \\ |
1149 |
- \t{5} & Yes \\ |
1150 |
- \t{6} & Yes \\ |
1151 |
- \bottomrule |
1152 |
+ \toprule |
1153 |
+ \multicolumn{1}{c}{\textbf{EAPI}} & |
1154 |
+ \multicolumn{1}{c}{\textbf{Supports \t{usex}?}} \\ |
1155 |
+ \midrule |
1156 |
+ 0, 1, 2, 3, 4 & No \\ |
1157 |
+ 5, 6 & Yes \\ |
1158 |
+ \bottomrule |
1159 |
\end{tabular} |
1160 |
\end{centertable} |
1161 |
|
1162 |
@@ -809,23 +756,19 @@ has returned. |
1163 |
It is up to the ebuild to ensure that the relevant external utilities are available, whether by |
1164 |
being in the system set or via dependencies. |
1165 |
|
1166 |
-\ChangeWhenAddingAnEAPI{6} |
1167 |
-\begin{centertable}{\t{unpack} extensions for EAPIs} \label{tab:unpack-extensions-table} |
1168 |
- \begin{tabular}{ l l } |
1169 |
- \toprule |
1170 |
- \multicolumn{1}{c}{\textbf{EAPI}} & |
1171 |
- \multicolumn{1}{c}{\textbf{\t{.xz} and \t{.tar.xz}?}} \\ |
1172 |
- \midrule |
1173 |
- \t{0} & No \\ |
1174 |
- \t{1} & No \\ |
1175 |
- \t{2} & No \\ |
1176 |
- \t{3} & Yes \\ |
1177 |
- \t{4} & Yes \\ |
1178 |
- \t{5} & Yes \\ |
1179 |
- \t{6} & Yes \\ |
1180 |
- \bottomrule |
1181 |
- \end{tabular} |
1182 |
-\end{centertable} |
1183 |
+ \ChangeWhenAddingAnEAPI{6} |
1184 |
+ \begin{centertable}{\t{unpack} extensions for EAPIs} |
1185 |
+ \label{tab:unpack-extensions-table} |
1186 |
+ \begin{tabular}{ l l } |
1187 |
+ \toprule |
1188 |
+ \multicolumn{1}{c}{\textbf{EAPI}} & |
1189 |
+ \multicolumn{1}{c}{\textbf{\t{.xz} and \t{.tar.xz}?}} \\ |
1190 |
+ \midrule |
1191 |
+ 0, 1, 2 & No \\ |
1192 |
+ 3, 4, 5, 6 & Yes \\ |
1193 |
+ \bottomrule |
1194 |
+ \end{tabular} |
1195 |
+ \end{centertable} |
1196 |
|
1197 |
\item[inherit] See section~\ref{sec:inherit}. |
1198 |
|
1199 |
@@ -837,20 +780,16 @@ has returned. |
1200 |
\end{description} |
1201 |
|
1202 |
\ChangeWhenAddingAnEAPI{6} |
1203 |
-\begin{centertable}{EAPIs supporting the \t{default} function} \label{tab:default-function-table} |
1204 |
+\begin{centertable}{EAPIs supporting the \t{default} function} |
1205 |
+ \label{tab:default-function-table} |
1206 |
\begin{tabular}{ l l } |
1207 |
- \toprule |
1208 |
- \multicolumn{1}{c}{\textbf{EAPI}} & |
1209 |
- \multicolumn{1}{c}{\textbf{Supports \t{default} function?}} \\ |
1210 |
- \midrule |
1211 |
- \t{0} & No \\ |
1212 |
- \t{1} & No \\ |
1213 |
- \t{2} & Yes \\ |
1214 |
- \t{3} & Yes \\ |
1215 |
- \t{4} & Yes \\ |
1216 |
- \t{5} & Yes \\ |
1217 |
- \t{6} & Yes \\ |
1218 |
- \bottomrule |
1219 |
+ \toprule |
1220 |
+ \multicolumn{1}{c}{\textbf{EAPI}} & |
1221 |
+ \multicolumn{1}{c}{\textbf{Supports \t{default} function?}} \\ |
1222 |
+ \midrule |
1223 |
+ 0, 1 & No \\ |
1224 |
+ 2, 3, 4, 5, 6 & Yes \\ |
1225 |
+ \bottomrule |
1226 |
\end{tabular} |
1227 |
\end{centertable} |
1228 |
|
1229 |
|
1230 |
diff --git a/profile-variables.tex b/profile-variables.tex |
1231 |
index 4c5496c..61241d2 100644 |
1232 |
--- a/profile-variables.tex |
1233 |
+++ b/profile-variables.tex |
1234 |
@@ -34,20 +34,16 @@ Portage's \t{FEATURES} variable), must not be treated incrementally---later defi |
1235 |
completely override those in parent profiles. |
1236 |
|
1237 |
\ChangeWhenAddingAnEAPI{6} |
1238 |
-\begin{centertable}{Profile-defined \t{IUSE} injection for EAPIs} \label{tab:profile-iuse-injection-table} |
1239 |
+\begin{centertable}{Profile-defined \t{IUSE} injection for EAPIs} |
1240 |
+ \label{tab:profile-iuse-injection-table} |
1241 |
\begin{tabular}{ l l } |
1242 |
- \toprule |
1243 |
- \multicolumn{1}{c}{\textbf{EAPI}} & |
1244 |
- \multicolumn{1}{c}{\textbf{Supports profile-defined \t{IUSE} injection?}} \\ |
1245 |
- \midrule |
1246 |
- \t{0} & No \\ |
1247 |
- \t{1} & No \\ |
1248 |
- \t{2} & No \\ |
1249 |
- \t{3} & No \\ |
1250 |
- \t{4} & No \\ |
1251 |
- \t{5} & Yes \\ |
1252 |
- \t{6} & Yes \\ |
1253 |
- \bottomrule |
1254 |
+ \toprule |
1255 |
+ \multicolumn{1}{c}{\textbf{EAPI}} & |
1256 |
+ \multicolumn{1}{c}{\textbf{Supports profile-defined \t{IUSE} injection?}} \\ |
1257 |
+ \midrule |
1258 |
+ 0, 1, 2, 3, 4 & No \\ |
1259 |
+ 5, 6 & Yes \\ |
1260 |
+ \bottomrule |
1261 |
\end{tabular} |
1262 |
\end{centertable} |
1263 |
|
1264 |
|
1265 |
diff --git a/profiles.tex b/profiles.tex |
1266 |
index 4c5c598..0764270 100644 |
1267 |
--- a/profiles.tex |
1268 |
+++ b/profiles.tex |
1269 |
@@ -126,21 +126,16 @@ subsection~\ref{sec:keywords}. Thus, these files can be used to restrict the fea |
1270 |
stable in a package. |
1271 |
|
1272 |
\ChangeWhenAddingAnEAPI{6} |
1273 |
-\begin{centertable}{Profile directory support for masking/forcing use flags in stable |
1274 |
-versions only}\label{tab:profile-stablemask} |
1275 |
+\begin{centertable}{Profile directory support for masking/forcing use flags in stable versions only} |
1276 |
+ \label{tab:profile-stablemask} |
1277 |
\begin{tabular}{ l l } |
1278 |
- \toprule |
1279 |
- \multicolumn{1}{c}{\textbf{EAPI}} & |
1280 |
- \multicolumn{1}{c}{\textbf{Supports masking/forcing use flags in stable versions?}} \\ |
1281 |
- \midrule |
1282 |
- \t{0} & No \\ |
1283 |
- \t{1} & No \\ |
1284 |
- \t{2} & No \\ |
1285 |
- \t{3} & No \\ |
1286 |
- \t{4} & No \\ |
1287 |
- \t{5} & Yes \\ |
1288 |
- \t{6} & Yes \\ |
1289 |
- \bottomrule |
1290 |
+ \toprule |
1291 |
+ \multicolumn{1}{c}{\textbf{EAPI}} & |
1292 |
+ \multicolumn{1}{c}{\textbf{Supports masking/forcing use flags in stable versions?}} \\ |
1293 |
+ \midrule |
1294 |
+ 0, 1, 2, 3, 4 & No \\ |
1295 |
+ 5, 6 & Yes \\ |
1296 |
+ \bottomrule |
1297 |
\end{tabular} |
1298 |
\end{centertable} |