Gentoo Archives: gentoo-commits

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