[gentoo-commits] proj/pms:eapi-6 commit in: /

["Ulrich Müller" <ulm@gentoo.org>]

commit:     de9c889d30de7beac8c89e69efe3baf2b3d8d6cd
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Wed Oct 21 16:44:23 2015 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Wed Oct 21 17:11:48 2015 +0000
URL:        https://gitweb.gentoo.org/proj/pms.git/commit/?id=de9c889d

fixup! EAPI 6: Bash version is 4.2.

 eapi-differences.tex    |  8 ++++----
 ebuild-env-commands.tex | 17 ++++++++---------
 ebuild-format.tex       | 28 +++++++++++++++++++++-------
 3 files changed, 33 insertions(+), 20 deletions(-)

diff --git a/eapi-differences.tex b/eapi-differences.tex
index d37d4ce..704fb35 100644
--- a/eapi-differences.tex
+++ b/eapi-differences.tex
@@ -47,6 +47,9 @@ of this document for a complete table of previous EAPIs.
 Stable use masking/forcing & \compactfeatureref{stablemask} &
     No & No & No & Yes & Yes \\
 
+Bash version & \compactfeatureref{bash-version} &
+    3.2 & 3.2 & 3.2 & 3.2 & 4.2 \\
+
 \t{IUSE} defaults & \compactfeatureref{iuse-defaults} &
     * & Yes & Yes & Yes & Yes \\
 
@@ -145,9 +148,6 @@ Profile \t{IUSE} injection & \compactfeatureref{profile-iuse-inject} &
 \t{EPREFIX}, \t{ED}, \t{EROOT} & \compactfeatureref{offset-prefix-vars} &
     No & Yes & Yes & Yes & Yes \\
 
-Bash version & \compactfeatureref{bash-version} &
-    3.2 & 3.2 & 3.2 & 3.2 & 4.2 \\
-
 \t{failglob} in global scope & \compactfeatureref{failglob} &
     No & No & No & No & Yes \\
 
@@ -347,9 +347,9 @@ EAPI 6 is EAPI 5 with the following changes:
 
 \begin{compactitem}
 \item Profile \t{package*} and \t{use*} can be directories, \featureref{profile-file-dirs}.
+\item Bash version is 4.2, \featureref{bash-version}.
 \item Default \t{src\_prepare} no longer a no-op, \featureref{src-prepare-6}.
 \item Different \t{src\_install} implementation, \featureref{src-install-6}.
-\item Bash version is 4.2, \featureref{bash-version}.
 \item \t{failglob} is enabled in global scope, \featureref{failglob}.
 \item \t{einstall} banned, \featureref{banned-commands}.
 \item \t{die} and \t{assert} called with \t{-n} respect \t{nonfatal}, \featureref{nonfatal-die}.

diff --git a/ebuild-env-commands.tex b/ebuild-env-commands.tex
index 4439d14..01d07b9 100644
--- a/ebuild-env-commands.tex
+++ b/ebuild-env-commands.tex
@@ -23,8 +23,8 @@ dependencies must be used to ensure their presence.
 
 The following commands must always be available in the ebuild environment:
 \begin{compactitem}
-\item \featurelabel{bash-version} All builtin commands in GNU bash, version as listed in
-    table~\ref{tab:system-commands-table}.
+\item All builtin commands in GNU bash, version as listed in table~\ref{tab:bash-version} on
+    page~\pageref{tab:bash-version}.
 \item \t{sed} must be available, and must support all forms of invocations valid for GNU sed
     version 4 or later.
 \item \t{patch} must be available, and must support all inputs valid for GNU patch.
@@ -42,16 +42,15 @@ during filename expansion result in an error when the ebuild is being sourced.
 \ChangeWhenAddingAnEAPI{6}
 \begin{centertable}{System commands for EAPIs}
     \label{tab:system-commands-table}
-    \begin{tabular}{ l l l l }
+    \begin{tabular}{ l l l }
       \toprule
       \multicolumn{1}{c}{\textbf{EAPI}} &
-      \multicolumn{1}{c}{\textbf{Bash version}} &
-      \multicolumn{1}{c}{\textbf{\t{failglob} in global scope?}} &
-      \multicolumn{1}{c}{\textbf{GNU \t{find}?}} \\
+      \multicolumn{1}{c}{\textbf{GNU \t{find}?}} &
+      \multicolumn{1}{c}{\textbf{\t{failglob} in global scope?}} \\
       \midrule
-      0, 1, 2, 3, 4     & 3.2 & No  & Undefined \\
-      5                 & 3.2 & No  & Yes       \\
-      6                 & 4.2 & Yes & Yes       \\
+      0, 1, 2, 3, 4     & Undefined & No  \\
+      5                 & Yes       & No  \\
+      6                 & Yes       & Yes \\
       \bottomrule
     \end{tabular}
 \end{centertable}

diff --git a/ebuild-format.tex b/ebuild-format.tex
index c741398..346a9da 100644
--- a/ebuild-format.tex
+++ b/ebuild-format.tex
@@ -1,13 +1,27 @@
 \chapter{Ebuild File Format}
 \label{sec:ebuild-format}
 
-The ebuild file format is in its basic form a subset of the format of a bash script. The interpreter
-is assumed to be GNU bash, version as listed in table~\ref{tab:system-commands-table} on
-page~\pageref{tab:system-commands-table}, or any later version. The file encoding must be UTF-8
-with Unix-style newlines. When sourced, the ebuild must define certain variables and functions
-(see sections~\ref{sec:ebuild-vars} and~\ref{sec:ebuild-functions} for specific information), and
-must not call any external programs, write anything to standard output or standard error, or modify
-the state of the system in any way.
+\featurelabel{bash-version} The ebuild file format is in its basic form a subset of the format of
+a bash script. The interpreter is assumed to be GNU bash, version as listed in
+table~\ref{tab:bash-version}, or any later version.
+The file encoding must be UTF-8 with Unix-style newlines. When sourced, the ebuild must define
+certain variables and functions (see sections~\ref{sec:ebuild-vars} and~\ref{sec:ebuild-functions}
+for specific information), and must not call any external programs, write anything to standard
+output or standard error, or modify the state of the system in any way.
+
+\ChangeWhenAddingAnEAPI{6}
+\begin{centertable}{Bash version}
+    \label{tab:bash-version}
+    \begin{tabular}{ l l }
+      \toprule
+      \multicolumn{1}{c}{\textbf{EAPI}} &
+      \multicolumn{1}{c}{\textbf{Bash version}} \\
+      \midrule
+      0, 1, 2, 3, 4, 5  & 3.2 \\
+      6                 & 4.2 \\
+      \bottomrule
+    \end{tabular}
+\end{centertable}
 
 % vim: set filetype=tex fileencoding=utf8 et tw=100 spell spelllang=en :