1 |
commit: a3d09ea27eb191a4b38d507203ae018446165200 |
2 |
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Mar 23 13:21:05 2015 +0000 |
4 |
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Aug 30 18:57:34 2015 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/pms.git/commit/?id=a3d09ea2 |
7 |
|
8 |
Merge several EAPI feature tables. |
9 |
|
10 |
Merges the three tables for misc functions (default, einstalldocs, |
11 |
and get_libdir), as well as the two tables for usex and in_iuse. |
12 |
|
13 |
pkg-mgr-commands.tex | 80 +++++++++++++++------------------------------------- |
14 |
1 file changed, 22 insertions(+), 58 deletions(-) |
15 |
|
16 |
diff --git a/pkg-mgr-commands.tex b/pkg-mgr-commands.tex |
17 |
index 77cf338..dbdbdfd 100644 |
18 |
--- a/pkg-mgr-commands.tex |
19 |
+++ b/pkg-mgr-commands.tex |
20 |
@@ -715,10 +715,10 @@ table~\ref{tab:use-list-strictness}. |
21 |
respectively; \t{\$\{arg4\}} and \t{\$\{arg5\}} default to the empty string. If the USE flag is |
22 |
set, outputs \t{\$\{arg2\}\$\{arg4\}}. Otherwise, outputs \t{\$\{arg3\}\$\{arg5\}}. |
23 |
The condition is inverted if the flag name is prefixed with~\t{!}. |
24 |
- Only available in EAPIs listed in table~\ref{tab:usex-table} as supporting \t{usex}. |
25 |
+ Only available in EAPIs listed in table~\ref{tab:use-list-functions} as supporting \t{usex}. |
26 |
\item[in\_iuse] \featurelabel{in-iuse} Returns shell true (0) if the first argument (a \t{USE} flag |
27 |
name) is included in \t{IUSE\_EFFECTIVE}, false otherwise. Only available in EAPIs listed in |
28 |
- table~\ref{tab:in-iuse} as supporting \t{in\_iuse}. |
29 |
+ table~\ref{tab:use-list-functions} as supporting \t{in\_iuse}. |
30 |
\end{description} |
31 |
|
32 |
\ChangeWhenAddingAnEAPI{6} |
33 |
@@ -750,29 +750,17 @@ table~\ref{tab:use-list-strictness}. |
34 |
\end{centertable} |
35 |
|
36 |
\ChangeWhenAddingAnEAPI{6} |
37 |
-\begin{centertable}{EAPIs supporting \t{usex}} |
38 |
- \label{tab:usex-table} |
39 |
- \begin{tabular}{ l l } |
40 |
- \toprule |
41 |
- \multicolumn{1}{c}{\textbf{EAPI}} & |
42 |
- \multicolumn{1}{c}{\textbf{Supports \t{usex}?}} \\ |
43 |
- \midrule |
44 |
- 0, 1, 2, 3, 4 & No \\ |
45 |
- 5, 6 & Yes \\ |
46 |
- \bottomrule |
47 |
- \end{tabular} |
48 |
-\end{centertable} |
49 |
- |
50 |
-\ChangeWhenAddingAnEAPI{6} |
51 |
-\begin{centertable}{EAPIs supporting \t{in\_iuse}} |
52 |
- \label{tab:in-iuse} |
53 |
- \begin{tabular}{ l l } |
54 |
+\begin{centertable}{EAPIs supporting \t{usex} and \t{in\_iuse}} |
55 |
+ \label{tab:use-list-functions} |
56 |
+ \begin{tabular}{ l l l } |
57 |
\toprule |
58 |
\multicolumn{1}{c}{\textbf{EAPI}} & |
59 |
- \multicolumn{1}{c}{\textbf{Supports \t{in\_iuse}?}} \\ |
60 |
+ \multicolumn{1}{c}{\textbf{\t{usex}?}} & |
61 |
+ \multicolumn{1}{c}{\textbf{\t{in\_iuse}?}} \\ |
62 |
\midrule |
63 |
- 0, 1, 2, 3, 4, 5 & No \\ |
64 |
- 6 & Yes \\ |
65 |
+ 0, 1, 2, 3, 4 & No & No \\ |
66 |
+ 5 & Yes & No \\ |
67 |
+ 6 & Yes & Yes \\ |
68 |
\bottomrule |
69 |
\end{tabular} |
70 |
\end{centertable} |
71 |
@@ -891,16 +879,16 @@ has returned. |
72 |
\featurelabel{default-func} Calls the \t{default\_} function for the current phase (see |
73 |
section~\ref{sec:default-phase-funcs}). Must not be called if the \t{default\_} function does |
74 |
not exist for the current phase in the current EAPI\@. Only available in EAPIs listed in |
75 |
- table~\ref{tab:default-function-table}. |
76 |
+ table~\ref{tab:misc-commands} as supporting \t{default}. |
77 |
|
78 |
\item[einstalldocs] \featurelabel{einstalldocs} Takes no arguments. Installs the files specified |
79 |
by the \t{DOCS} and \t{HTML\_DOCS} variables or a default set of files, according to |
80 |
Algorithm~\ref{alg:einstalldocs}. If called using \t{nonfatal} and any of the called commands |
81 |
returns a non-zero exit status, returns immediately with the same exit status. Only available |
82 |
- in EAPIs listed in table~\ref{tab:einstalldocs} as supporting \t{einstalldocs}. |
83 |
+ in EAPIs listed in table~\ref{tab:misc-commands} as supporting \t{einstalldocs}. |
84 |
|
85 |
\item[get\_libdir] \featurelabel{get-libdir} Prints the libdir name obtained according to |
86 |
- Algorithm~\ref{alg:get-libdir}. Only available in EAPIs listed in table~\ref{tab:get-libdir} |
87 |
+ Algorithm~\ref{alg:get-libdir}. Only available in EAPIs listed in table~\ref{tab:misc-commands} |
88 |
as supporting \t{get\_libdir}. |
89 |
\end{description} |
90 |
|
91 |
@@ -947,42 +935,18 @@ has returned. |
92 |
\end{algorithm} |
93 |
|
94 |
\ChangeWhenAddingAnEAPI{6} |
95 |
-\begin{centertable}{EAPIs supporting the \t{default} function} |
96 |
- \label{tab:default-function-table} |
97 |
- \begin{tabular}{ l l } |
98 |
- \toprule |
99 |
- \multicolumn{1}{c}{\textbf{EAPI}} & |
100 |
- \multicolumn{1}{c}{\textbf{Supports \t{default} function?}} \\ |
101 |
- \midrule |
102 |
- 0, 1 & No \\ |
103 |
- 2, 3, 4, 5, 6 & Yes \\ |
104 |
- \bottomrule |
105 |
- \end{tabular} |
106 |
-\end{centertable} |
107 |
- |
108 |
-\ChangeWhenAddingAnEAPI{6} |
109 |
-\begin{centertable}{EAPIs supporting \t{einstalldocs}} |
110 |
- \label{tab:einstalldocs} |
111 |
- \begin{tabular}{ l l } |
112 |
- \toprule |
113 |
- \multicolumn{1}{c}{\textbf{EAPI}} & |
114 |
- \multicolumn{1}{c}{\textbf{Supports \t{einstalldocs}?}} \\ |
115 |
- \midrule |
116 |
- 0, 1, 2, 3, 4, 5 & No \\ |
117 |
- 6 & Yes \\ |
118 |
- \bottomrule |
119 |
- \end{tabular} |
120 |
-\end{centertable} |
121 |
- |
122 |
-\begin{centertable}{EAPIs supporting \t{get\_libdir}} |
123 |
- \label{tab:get-libdir} |
124 |
- \begin{tabular}{ l l } |
125 |
+\begin{centertable}{Misc commands for EAPIs} |
126 |
+ \label{tab:misc-commands} |
127 |
+ \begin{tabular}{ l l l l } |
128 |
\toprule |
129 |
\multicolumn{1}{c}{\textbf{EAPI}} & |
130 |
- \multicolumn{1}{c}{\textbf{Supports \t{get\_libdir}?}} \\ |
131 |
+ \multicolumn{1}{c}{\textbf{\t{default}?}} & |
132 |
+ \multicolumn{1}{c}{\textbf{\t{einstalldocs}?}} & |
133 |
+ \multicolumn{1}{c}{\textbf{\t{get\_libdir}?}} \\ |
134 |
\midrule |
135 |
- 0, 1, 2, 3, 4, 5 & No \\ |
136 |
- 6 & Yes \\ |
137 |
+ 0, 1 & No & No & No \\ |
138 |
+ 2, 3, 4, 5 & Yes & No & No \\ |
139 |
+ 6 & Yes & Yes & Yes \\ |
140 |
\bottomrule |
141 |
\end{tabular} |
142 |
\end{centertable} |