From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-788630-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
by finch.gentoo.org (Postfix) with ESMTP id 8F0081389F5
for <garchives@archives.gentoo.org>; Thu, 2 Apr 2015 16:11:09 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 26B2BE097E;
Thu, 2 Apr 2015 16:11:00 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id 94D1CE097E
for <gentoo-commits@lists.gentoo.org>; Thu, 2 Apr 2015 16:10:59 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id BE75E340917
for <gentoo-commits@lists.gentoo.org>; Thu, 2 Apr 2015 16:10:58 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 1FB5815136
for <gentoo-commits@lists.gentoo.org>; Thu, 2 Apr 2015 16:10:49 +0000 (UTC)
From: "Ulrich Müller" <ulm@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Ulrich Müller" <ulm@gentoo.org>
Message-ID: <1427990885.b24d7753ee295a6487bdd332f98bb7e108808a12.ulm@gentoo>
Subject: [gentoo-commits] proj/pms:eapi-6 commit in: /
X-VCS-Repository: proj/pms
X-VCS-Files: pkg-mgr-commands.tex
X-VCS-Directories: /
X-VCS-Committer: ulm
X-VCS-Committer-Name: Ulrich Müller
X-VCS-Revision: b24d7753ee295a6487bdd332f98bb7e108808a12
X-VCS-Branch: eapi-6
Date: Thu, 2 Apr 2015 16:10:49 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Archives-Salt: 240dd072-521b-4c08-aac3-568240f0dfee
X-Archives-Hash: 88ac5c66361f28c9ee4c2cc15e78003b
commit: b24d7753ee295a6487bdd332f98bb7e108808a12
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 23 13:21:05 2015 +0000
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Thu Apr 2 16:08:05 2015 +0000
URL: https://gitweb.gentoo.org/proj/pms.git/commit/?id=b24d7753
Merge several EAPI feature tables.
Merges the three tables for misc functions (default, einstalldocs,
and get_libdir), as well as the two tables for usex and in_iuse.
pkg-mgr-commands.tex | 80 +++++++++++++++-------------------------------------
1 file changed, 22 insertions(+), 58 deletions(-)
diff --git a/pkg-mgr-commands.tex b/pkg-mgr-commands.tex
index cb13893..d4c19d6 100644
--- a/pkg-mgr-commands.tex
+++ b/pkg-mgr-commands.tex
@@ -714,10 +714,10 @@ table~\ref{tab:use-list-strictness}.
respectively; \t{\$\{arg4\}} and \t{\$\{arg5\}} default to the empty string. If the USE flag is
set, outputs \t{\$\{arg2\}\$\{arg4\}}. Otherwise, outputs \t{\$\{arg3\}\$\{arg5\}}.
The condition is inverted if the flag name is prefixed with~\t{!}.
- Only available in EAPIs listed in table~\ref{tab:usex-table} as supporting \t{usex}.
+ Only available in EAPIs listed in table~\ref{tab:use-list-functions} as supporting \t{usex}.
\item[in\_iuse] \featurelabel{in-iuse} Returns shell true (0) if the first argument (a \t{USE} flag
name) is included in \t{IUSE\_EFFECTIVE}, false otherwise. Only available in EAPIs listed in
- table~\ref{tab:in-iuse} as supporting \t{in\_iuse}.
+ table~\ref{tab:use-list-functions} as supporting \t{in\_iuse}.
\end{description}
\ChangeWhenAddingAnEAPI{6}
@@ -749,29 +749,17 @@ table~\ref{tab:use-list-strictness}.
\end{centertable}
\ChangeWhenAddingAnEAPI{6}
-\begin{centertable}{EAPIs supporting \t{usex}}
- \label{tab:usex-table}
- \begin{tabular}{ l l }
- \toprule
- \multicolumn{1}{c}{\textbf{EAPI}} &
- \multicolumn{1}{c}{\textbf{Supports \t{usex}?}} \\
- \midrule
- 0, 1, 2, 3, 4 & No \\
- 5, 6 & Yes \\
- \bottomrule
- \end{tabular}
-\end{centertable}
-
-\ChangeWhenAddingAnEAPI{6}
-\begin{centertable}{EAPIs supporting \t{in\_iuse}}
- \label{tab:in-iuse}
- \begin{tabular}{ l l }
+\begin{centertable}{EAPIs supporting \t{usex} and \t{in\_iuse}}
+ \label{tab:use-list-functions}
+ \begin{tabular}{ l l l }
\toprule
\multicolumn{1}{c}{\textbf{EAPI}} &
- \multicolumn{1}{c}{\textbf{Supports \t{in\_iuse}?}} \\
+ \multicolumn{1}{c}{\textbf{\t{usex}?}} &
+ \multicolumn{1}{c}{\textbf{\t{in\_iuse}?}} \\
\midrule
- 0, 1, 2, 3, 4, 5 & No \\
- 6 & Yes \\
+ 0, 1, 2, 3, 4 & No & No \\
+ 5 & Yes & No \\
+ 6 & Yes & Yes \\
\bottomrule
\end{tabular}
\end{centertable}
@@ -890,16 +878,16 @@ has returned.
\featurelabel{default-func} Calls the \t{default\_} function for the current phase (see
section~\ref{sec:default-phase-funcs}). Must not be called if the \t{default\_} function does
not exist for the current phase in the current EAPI\@. Only available in EAPIs listed in
- table~\ref{tab:default-function-table}.
+ table~\ref{tab:misc-commands} as supporting \t{default}.
\item[einstalldocs] \featurelabel{einstalldocs} Takes no arguments. Installs the files specified
by the \t{DOCS} and \t{HTML\_DOCS} variables or a default set of files, according to
Algorithm~\ref{alg:einstalldocs}. If called using \t{nonfatal} and any of the called commands
returns a non-zero exit status, returns immediately with the same exit status. Only available
- in EAPIs listed in table~\ref{tab:einstalldocs} as supporting \t{einstalldocs}.
+ in EAPIs listed in table~\ref{tab:misc-commands} as supporting \t{einstalldocs}.
\item[get\_libdir] \featurelabel{get-libdir} Prints the libdir name obtained according to
- Algorithm~\ref{alg:get-libdir}. Only available in EAPIs listed in table~\ref{tab:get-libdir}
+ Algorithm~\ref{alg:get-libdir}. Only available in EAPIs listed in table~\ref{tab:misc-commands}
as supporting \t{get\_libdir}.
\end{description}
@@ -946,42 +934,18 @@ has returned.
\end{algorithm}
\ChangeWhenAddingAnEAPI{6}
-\begin{centertable}{EAPIs supporting the \t{default} function}
- \label{tab:default-function-table}
- \begin{tabular}{ l l }
- \toprule
- \multicolumn{1}{c}{\textbf{EAPI}} &
- \multicolumn{1}{c}{\textbf{Supports \t{default} function?}} \\
- \midrule
- 0, 1 & No \\
- 2, 3, 4, 5, 6 & Yes \\
- \bottomrule
- \end{tabular}
-\end{centertable}
-
-\ChangeWhenAddingAnEAPI{6}
-\begin{centertable}{EAPIs supporting \t{einstalldocs}}
- \label{tab:einstalldocs}
- \begin{tabular}{ l l }
- \toprule
- \multicolumn{1}{c}{\textbf{EAPI}} &
- \multicolumn{1}{c}{\textbf{Supports \t{einstalldocs}?}} \\
- \midrule
- 0, 1, 2, 3, 4, 5 & No \\
- 6 & Yes \\
- \bottomrule
- \end{tabular}
-\end{centertable}
-
-\begin{centertable}{EAPIs supporting \t{get\_libdir}}
- \label{tab:get-libdir}
- \begin{tabular}{ l l }
+\begin{centertable}{Misc commands for EAPIs}
+ \label{tab:misc-commands}
+ \begin{tabular}{ l l l l }
\toprule
\multicolumn{1}{c}{\textbf{EAPI}} &
- \multicolumn{1}{c}{\textbf{Supports \t{get\_libdir}?}} \\
+ \multicolumn{1}{c}{\textbf{\t{default}?}} &
+ \multicolumn{1}{c}{\textbf{\t{einstalldocs}?}} &
+ \multicolumn{1}{c}{\textbf{\t{get\_libdir}?}} \\
\midrule
- 0, 1, 2, 3, 4, 5 & No \\
- 6 & Yes \\
+ 0, 1 & No & No & No \\
+ 2, 3, 4, 5 & Yes & No & No \\
+ 6 & Yes & Yes & Yes \\
\bottomrule
\end{tabular}
\end{centertable}