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

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

commit:     c5fead5404423a92e7239410a55bcbb9942fc83c
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 16 11:22:22 2015 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Fri Oct 23 17:25:37 2015 +0000
URL:        https://gitweb.gentoo.org/proj/pms.git/commit/?id=c5fead54

EAPI 6: Bash version is 4.2.

Bug: 431340

 eapi-differences.tex    |  4 ++++
 ebuild-env-commands.tex |  6 ++----
 ebuild-format.tex       | 27 +++++++++++++++++++++------
 3 files changed, 27 insertions(+), 10 deletions(-)

diff --git a/eapi-differences.tex b/eapi-differences.tex
index d4bac27..e2c16ed 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 \\
 
@@ -308,6 +311,7 @@ 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}.
 \end{compactitem}
 
 \ChangeWhenAddingAnEAPI{6}

diff --git a/ebuild-env-commands.tex b/ebuild-env-commands.tex
index 54e12ec..353febb 100644
--- a/ebuild-env-commands.tex
+++ b/ebuild-env-commands.tex
@@ -23,10 +23,8 @@ dependencies must be used to ensure their presence.
 
 The following commands must always be available in the ebuild environment:
 \begin{compactitem}
-\item All builtin commands in GNU bash, version 3.2\footnote{The required bash version was
-    retroactively updated from 3.0 to 3.2 in November 2009
-    (see \url{https://projects.gentoo.org/council/meeting-logs/20091109.txt}).%
-    \label{fn:bash3.2}}.
+\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.

diff --git a/ebuild-format.tex b/ebuild-format.tex
index b623b97..346a9da 100644
--- a/ebuild-format.tex
+++ b/ebuild-format.tex
@@ -1,12 +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 3.2 or later, see footnote~\ref{fn:bash3.2} on
-page~\pageref{fn:bash3.2}. 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 :