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

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

commit:     f46831afd3b8df081f3d5bc572a705fcb1e994d8
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: Mon Feb 16 12:45:00 2015 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/pms.git;a=commit;h=f46831af

EAPI 6: Bash version is 4.2.

See bug 431340.

---
 eapi-differences.tex    |  5 ++++-
 ebuild-env-commands.tex | 24 ++++++++++++------------
 ebuild-format.tex       | 11 ++++++-----
 3 files changed, 22 insertions(+), 18 deletions(-)

diff --git a/eapi-differences.tex b/eapi-differences.tex
index 6a7aa00..f1255f3 100644
--- a/eapi-differences.tex
+++ b/eapi-differences.tex
@@ -139,6 +139,9 @@ 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{find} is GNU? & \compactfeatureref{gnu-find} &
     Undefined & Undefined & Undefined & Yes & Yes \\
 
@@ -304,7 +307,7 @@ EAPI 5 is EAPI 4 with the following changes:
 EAPI 6 is EAPI 5 with the following changes:
 
 \begin{compactitem}
-\item None
+\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 afa06b7..6eca0c9 100644
--- a/ebuild-env-commands.tex
+++ b/ebuild-env-commands.tex
@@ -23,9 +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{http://www.gentoo.org/proj/en/council/meeting-logs/20091109.txt}).\label{fn:bash3.2}}.
+\item \featurelabel{bash-version} All builtin commands in GNU bash, version as listed in
+    table~\ref{tab:system-commands-table}.
 \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.
@@ -35,19 +34,20 @@ The following commands must always be available in the ebuild environment:
 \end{compactitem}
 
 \ChangeWhenAddingAnEAPI{6}
-\begin{centertable}{\t{find} implementation for EAPIs} \label{tab:system-commands-table}
-    \begin{tabular}{ l l }
+\begin{centertable}{System commands for EAPIs} \label{tab:system-commands-table}
+    \begin{tabular}{ l l l }
         \toprule
             \multicolumn{1}{c}{\textbf{EAPI}} &
+            \multicolumn{1}{c}{\textbf{Bash version}} &
             \multicolumn{1}{c}{\textbf{GNU \t{find}?}} \\
             \midrule
-    \t{0} & Undefined \\
-    \t{1} & Undefined \\
-    \t{2} & Undefined \\
-    \t{3} & Undefined \\
-    \t{4} & Undefined \\
-    \t{5} & Yes \\
-    \t{6} & Yes \\
+    \t{0} & 3.2 & Undefined \\
+    \t{1} & 3.2 & Undefined \\
+    \t{2} & 3.2 & Undefined \\
+    \t{3} & 3.2 & Undefined \\
+    \t{4} & 3.2 & Undefined \\
+    \t{5} & 3.2 & Yes \\
+    \t{6} & 4.2 & Yes \\
     \bottomrule
     \end{tabular}
 \end{centertable}

diff --git a/ebuild-format.tex b/ebuild-format.tex
index befe679..3c57e5f 100644
--- a/ebuild-format.tex
+++ b/ebuild-format.tex
@@ -2,11 +2,12 @@
 \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.
+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.
 
 % vim: set filetype=tex fileencoding=utf8 et tw=100 spell spelllang=en :