[gentoo-pms] [PATCH 01/22] Add an EAPI 6 identical to EAPI 5.

[Ulrich Müller]

---
 dependencies.tex        |  15 ++++--
 eapi-differences.tex    | 122 +++++++++++++++++++++++++++---------------------
 eapis.tex               |   4 +-
 ebuild-env-commands.tex |   3 +-
 ebuild-env-vars.tex     |  12 +++--
 ebuild-functions.tex    |  28 +++++++----
 ebuild-vars.tex         |  12 +++--
 merge.tex               |   3 +-
 pkg-mgr-commands.tex    |  45 ++++++++++++------
 pms.tex                 |   4 +-
 profile-variables.tex   |   3 +-
 profiles.tex            |   3 +-
 12 files changed, 156 insertions(+), 98 deletions(-)

diff --git a/dependencies.tex b/dependencies.tex
index fcfce9b..8d3facb 100644
--- a/dependencies.tex
+++ b/dependencies.tex
@@ -88,7 +88,7 @@ be surrounded on both sides by whitespace, except at the start and end of the st
 
 In particular, note that whitespace is not optional.
 
-\ChangeWhenAddingAnEAPI{5}
+\ChangeWhenAddingAnEAPI{6}
 \begin{centertable}{EAPIs supporting \t{SRC\_URI} arrows} \label{tab:uri-arrows-table}
     \begin{tabular}{ l l }
         \toprule
@@ -101,11 +101,12 @@ In particular, note that whitespace is not optional.
     \t{3} & Yes \\
     \t{4} & Yes \\
     \t{5} & Yes \\
+    \t{6} & Yes \\
     \bottomrule
     \end{tabular}
 \end{centertable}
 
-\ChangeWhenAddingAnEAPI{5}
+\ChangeWhenAddingAnEAPI{6}
 \begin{centertable}{EAPIs supporting \t{REQUIRED\_USE ??}\ groups} \label{tab:at-most-one-of-table}
     \begin{tabular}{ l l }
         \toprule
@@ -118,6 +119,7 @@ In particular, note that whitespace is not optional.
     \t{3} & No \\
     \t{4} & No \\
     \t{5} & Yes \\
+    \t{6} & Yes \\
     \bottomrule
     \end{tabular}
 \end{centertable}
@@ -188,7 +190,7 @@ manager must warn or error if this feature is used with an EAPI not supporting u
 
 \note Order is important. The slot restriction must come before use dependencies.
 
-\ChangeWhenAddingAnEAPI{5}
+\ChangeWhenAddingAnEAPI{6}
 \begin{centertable}{Support for \t{SLOT} dependencies and sub-slots in EAPIs}
     \label{tab:slot-deps-table}
     \begin{tabular}{ l l l }
@@ -203,11 +205,12 @@ manager must warn or error if this feature is used with an EAPI not supporting u
     \t{3} & Named only & No \\
     \t{4} & Named only & No \\
     \t{5} & Named and operator & Yes \\
+    \t{6} & Named and operator & Yes \\
     \bottomrule
     \end{tabular}
 \end{centertable}
 
-\ChangeWhenAddingAnEAPI{5}
+\ChangeWhenAddingAnEAPI{6}
 \begin{centertable}{EAPIs supporting \t{USE} dependencies} \label{tab:use-deps-table}
     \begin{tabular}{ l l }
         \toprule
@@ -220,6 +223,7 @@ manager must warn or error if this feature is used with an EAPI not supporting u
     \t{3} & 2-style \\
     \t{4} & 4-style \\
     \t{5} & 4-style \\
+    \t{6} & 4-style \\
     \bottomrule
     \end{tabular}
 \end{centertable}
@@ -258,7 +262,7 @@ ignored by the package manager, so long as any blocked package will be uninstall
 strong block must not be ignored. The mapping from one or two exclamation marks to strength is
 described in table~\ref{tab:bang-strength-table}.
 
-\ChangeWhenAddingAnEAPI{5}
+\ChangeWhenAddingAnEAPI{6}
 \begin{centertable}{Exclamation mark strengths for EAPIs} \label{tab:bang-strength-table}
     \begin{tabular}{ l l l }
         \toprule
@@ -272,6 +276,7 @@ described in table~\ref{tab:bang-strength-table}.
     \t{3} & Weak & Strong \\
     \t{4} & Weak & Strong \\
     \t{5} & Weak & Strong \\
+    \t{6} & Weak & Strong \\
     \bottomrule
     \end{tabular}
 \end{centertable}
diff --git a/eapi-differences.tex b/eapi-differences.tex
index 255f428..0a8f9e1 100644
--- a/eapi-differences.tex
+++ b/eapi-differences.tex
@@ -2,10 +2,10 @@
 
 \note This chapter is informative and for convenience only. Refer to the main text for specifics.
 
-\ChangeWhenAddingAnEAPI{5}
+\ChangeWhenAddingAnEAPI{6}
 \begin{landscape}
 \newcolumntype{P}[1]{>{\setlength{\rightskip}{0pt plus 1fil}}p{#1}}
-\begin{longtable}{llP{5em}P{5em}P{6em}P{6em}P{6em}P{6em}}
+\begin{longtable}{llP{5em}P{5em}P{6em}P{6em}P{6em}P{6em}P{6em}}
 \caption{Features in EAPIs}\\
 \toprule
 \multicolumn{1}{c}{\b{Feature}} &
@@ -18,7 +18,8 @@
 \multicolumn{1}{c}{2} &
 \multicolumn{1}{c}{3} &
 \multicolumn{1}{c}{4} &
-\multicolumn{1}{c}{5} \\
+\multicolumn{1}{c}{5} &
+\multicolumn{1}{c}{6} \\
 \midrule
 \endfirsthead
 \midrule
@@ -32,7 +33,8 @@
 \multicolumn{1}{c}{2} &
 \multicolumn{1}{c}{3} &
 \multicolumn{1}{c}{4} &
-\multicolumn{1}{c}{5} \\
+\multicolumn{1}{c}{5} &
+\multicolumn{1}{c}{6} \\
 \midrule
 \endhead
 \midrule
@@ -41,67 +43,67 @@
 \endlastfoot
 
 Stable use masking/forcing & \compactfeatureref{stablemask} &
-    No & No & No & No & No & Yes \\
+    No & No & No & No & No & Yes & Yes \\
 
 \t{IUSE} defaults & \compactfeatureref{iuse-defaults} &
-    No & Yes & Yes & Yes & Yes & Yes \\
+    No & Yes & Yes & Yes & Yes & Yes & Yes \\
 
 \t{REQUIRED\_USE} & \compactfeatureref{required-use} &
-    No & No & No & No & Yes & Yes \\
+    No & No & No & No & Yes & Yes & Yes \\
 
 \t{PROPERTIES} & \compactfeatureref{properties} &
-    Optionally & Optionally & Optionally & Optionally & Yes & Yes \\
+    Optionally & Optionally & Optionally & Optionally & Yes & Yes & Yes \\
 
 \t{RDEPEND=DEPEND} & \compactfeatureref{rdepend-depend} &
-    Yes & Yes & Yes & Yes & No & No \\
+    Yes & Yes & Yes & Yes & No & No & No \\
 
 \t{DEFINED\_PHASES} & \compactfeatureref{defined-phases} &
-    Optionally & Optionally & Optionally & Optionally & Yes & Yes \\
+    Optionally & Optionally & Optionally & Optionally & Yes & Yes & Yes \\
 
 \t{??\ ( )} groups & \compactfeatureref{at-most-one-of} &
-    No & No & No & No & No & Yes \\
+    No & No & No & No & No & Yes & Yes \\
 
 \t{SRC\_URI} arrows & \compactfeatureref{src-uri-arrows} &
-    No & No & Yes & Yes & Yes & Yes \\
+    No & No & Yes & Yes & Yes & Yes & Yes \\
 
 Slot dependencies & \compactfeatureref{slot-deps} &
-    No & Named & Named & Named & Named & Named and Operator \\
+    No & Named & Named & Named & Named & Named and Operator & Named and Operator \\
 
 Sub-slots & \compactfeatureref{sub-slot} &
-    No & No & No & No & No & Yes \\
+    No & No & No & No & No & Yes & Yes \\
 
 Use dependencies & \compactfeatureref{use-deps} &
-    No & No & 2-style & 2-style & 4-style & 4-style \\
+    No & No & 2-style & 2-style & 4-style & 4-style & 4-style \\
 
 \t{!} blockers & \compactfeatureref{bang-strength} &
-    Unspecified & Unspecified & Weak & Weak & Weak & Weak \\
+    Unspecified & Unspecified & Weak & Weak & Weak & Weak & Weak \\
 
 \t{!!} blockers & \compactfeatureref{bang-strength} &
-    Forbidden & Forbidden & Strong & Strong & Strong & Strong \\
+    Forbidden & Forbidden & Strong & Strong & Strong & Strong & Strong \\
 
 \t{S} to \t{WORKDIR} fallback & \compactfeatureref{s-workdir-fallback} &
-    Always & Always & Always & Always & Conditional & Conditional \\
+    Always & Always & Always & Always & Conditional & Conditional & Conditional \\
 
 \t{pkg\_pretend} & \compactfeatureref{pkg-pretend} &
-    No & No & No & No & Yes & Yes \\
+    No & No & No & No & Yes & Yes & Yes \\
 
 \t{src\_prepare} & \compactfeatureref{src-prepare} &
-    No & No & Yes & Yes & Yes & Yes \\
+    No & No & Yes & Yes & Yes & Yes & Yes \\
 
 \t{src\_configure} & \compactfeatureref{src-configure} &
-    No & No & Yes & Yes & Yes & Yes \\
+    No & No & Yes & Yes & Yes & Yes & Yes \\
 
 \t{src\_compile} style & \compactfeatureref{src-compile} &
-    0 & 1 & 2 & 2 & 2 & 2 \\
+    0 & 1 & 2 & 2 & 2 & 2 & 2 \\
 
 Parallel tests & \compactfeatureref{parallel-tests} &
-    No & No & No & No & No & Yes \\
+    No & No & No & No & No & Yes & Yes \\
 
 \t{src\_install} style & \compactfeatureref{src-install} &
-    no-op & no-op & no-op & no-op & 4 & 4 \\
+    no-op & no-op & no-op & no-op & 4 & 4 & 4 \\
 
 \t{pkg\_info} & \compactfeatureref{pkg-info} &
-    Installed & Installed & Installed & Installed & Both & Both \\
+    Installed & Installed & Installed & Installed & Both & Both & Both \\
 
 \t{default\_} phase functions & \compactfeatureref{default-phase-funcs} &
     None & None &
@@ -110,91 +112,95 @@ Parallel tests & \compactfeatureref{parallel-tests} &
     \t{pkg\_nofetch}, \t{src\_unpack}, \t{src\_prepare}, \t{src\_configure},
         \t{src\_compile}, \t{src\_install}, \t{src\_test} &
     \t{pkg\_nofetch}, \t{src\_unpack}, \t{src\_prepare}, \t{src\_configure},
+        \t{src\_compile}, \t{src\_install}, \t{src\_test} &
+    \t{pkg\_nofetch}, \t{src\_unpack}, \t{src\_prepare}, \t{src\_configure},
         \t{src\_compile}, \t{src\_install}, \t{src\_test} \\
 
 \t{AA} & \compactfeatureref{aa} &
-    Yes & Yes & Yes & Yes & No & No \\
+    Yes & Yes & Yes & Yes & No & No & No \\
 
 \t{KV} & \compactfeatureref{kv} &
-    Yes & Yes & Yes & Yes & No & No \\
+    Yes & Yes & Yes & Yes & No & No & No \\
 
 \t{EBUILD\_PHASE\_FUNC} & \compactfeatureref{ebuild-phase-func} &
-    No & No & No & No & No & Yes \\
+    No & No & No & No & No & Yes & Yes \\
 
 \t{MERGE\_TYPE} & \compactfeatureref{merge-type} &
-    No & No & No & No & Yes & Yes \\
+    No & No & No & No & Yes & Yes & Yes \\
 
 Profile \t{IUSE} injection & \compactfeatureref{profile-iuse-inject} &
-    No & No & No & No & No & Yes \\
+    No & No & No & No & No & Yes & Yes \\
 
 \t{REPLACING\_VERSIONS} & \compactfeatureref{replace-version-vars} &
-    No & No & No & No & Yes & Yes \\
+    No & No & No & No & Yes & Yes & Yes \\
 
 \t{REPLACED\_BY\_VERSION} & \compactfeatureref{replace-version-vars} &
-    No & No & No & No & Yes & Yes \\
+    No & No & No & No & Yes & Yes & Yes \\
 
 \t{EPREFIX}, \t{ED}, \t{EROOT} & \compactfeatureref{offset-prefix-vars} &
-    No & No & No & Yes & Yes & Yes \\
+    No & No & No & Yes & Yes & Yes & Yes \\
 
 \t{find} is GNU? & \compactfeatureref{gnu-find} &
-    Undefined & Undefined & Undefined & Undefined & Undefined & Yes \\
+    Undefined & Undefined & Undefined & Undefined & Undefined & Yes & Yes \\
 
 Most utilities die & \compactfeatureref{die-on-failure} &
-    No & No & No & No & Yes & Yes \\
+    No & No & No & No & Yes & Yes & Yes \\
 
 \t{nonfatal} & \compactfeatureref{nonfatal} &
-    No & No & No & No & Yes & Yes \\
+    No & No & No & No & Yes & Yes & Yes \\
 
 \t{dohard} & \compactfeatureref{banned-commands} &
-    Yes & Yes & Yes & Yes & Banned & Banned \\
+    Yes & Yes & Yes & Yes & Banned & Banned & Banned \\
 
 \t{dosed} & \compactfeatureref{banned-commands} &
-    Yes & Yes & Yes & Yes & Banned & Banned \\
+    Yes & Yes & Yes & Yes & Banned & Banned & Banned \\
 
 Option \t{-{}-host-root} & \compactfeatureref{host-root-option} &
-    No & No & No & No & No & Yes \\
+    No & No & No & No & No & Yes & Yes \\
 
 \t{econf} arguments & \compactfeatureref{econf-options} &
-    &  &  &  & disable dependency tracking & disable dependency tracking, disable silent rules \\
+    &  &  &  & disable dependency tracking &
+    disable dependency tracking, disable silent rules &
+    disable dependency tracking, disable silent rules \\
 
 \t{dodoc -r} & \compactfeatureref{dodoc} &
-    No & No & No & No & Yes & Yes \\
+    No & No & No & No & Yes & Yes & Yes \\
 
 \t{doheader} & \compactfeatureref{doheader} &
-    No & No & No & No & No & Yes \\
+    No & No & No & No & No & Yes & Yes \\
 
 \t{doins} handles symlinks & \compactfeatureref{doins} &
-    No & No & No & No & Yes & Yes \\
+    No & No & No & No & Yes & Yes & Yes \\
 
 \t{doman} languages & \compactfeatureref{doman-langs} &
-    No & No & Yes & Yes & Yes & Yes \\
+    No & No & Yes & Yes & Yes & Yes & Yes \\
 
 \t{doman -i18n} precedence & \compactfeatureref{doman-langs} &
-    N/A & N/A & No & No & Yes & Yes \\
+    N/A & N/A & No & No & Yes & Yes & Yes \\
 
 \t{new*} support stdin & \compactfeatureref{newfoo-stdin} &
-    No & No & No & No & No & Yes \\
+    No & No & No & No & No & Yes & Yes \\
 
 Controllable compression & \compactfeatureref{docompress} &
-    No & No & No & No & Yes & Yes \\
+    No & No & No & No & Yes & Yes & Yes \\
 
 \t{docompress} & \compactfeatureref{docompress} &
-    No & No & No & No & Yes & Yes \\
+    No & No & No & No & Yes & Yes & Yes \\
 
 \t{use\_with} empty third arg & \compactfeatureref{use-with} &
-    No & No & No & No & Yes & Yes \\
+    No & No & No & No & Yes & Yes & Yes \\
 
 \t{usex} & \compactfeatureref{usex} &
-    No & No & No & No & No & Yes \\
+    No & No & No & No & No & Yes & Yes \\
 
 \t{unpack} support for \t{xz}? & \compactfeatureref{unpack-extensions} &
-    No & No & No & Yes & Yes & Yes \\
+    No & No & No & Yes & Yes & Yes & Yes \\
 
 \t{default} function & \compactfeatureref{default-func} &
-    No & No & Yes & Yes & Yes & Yes \\
+    No & No & Yes & Yes & Yes & Yes & Yes \\
 
 File mtimes preserved & \compactfeatureref{mtime-preserve} &
-    Undefined & Undefined & Undefined & Yes & Yes & Yes \\
+    Undefined & Undefined & Undefined & Yes & Yes & Yes & Yes \\
 
 \end{longtable}
 \end{landscape}
@@ -294,7 +300,15 @@ EAPI 5 is EAPI 4 with the following changes:
 \item \t{usex} support, \featureref{usex}.
 \end{compactitem}
 
-\ChangeWhenAddingAnEAPI{5}
+\section*{EAPI 6}
+
+EAPI 6 is EAPI 5 with the following changes:
+
+\begin{compactitem}
+\item None
+\end{compactitem}
+
+\ChangeWhenAddingAnEAPI{6}
 
 % vim: set filetype=tex fileencoding=utf8 et tw=100 spell spelllang=en :
 
diff --git a/eapis.tex b/eapis.tex
index 6b03d2b..bb860f4 100644
--- a/eapis.tex
+++ b/eapis.tex
@@ -19,7 +19,7 @@ EAPIs are also used for profile directories, as described in section~\ref{sec:pr
 
 The following EAPIs are defined by this specification:
 
-\ChangeWhenAddingAnEAPI{5}
+\ChangeWhenAddingAnEAPI{6}
 \begin{description}
 \item[0] The `original' base EAPI.
 \item[1] EAPI `1' contains a number of extensions to EAPI `0'. Except where explicitly noted, it is
@@ -32,6 +32,8 @@ The following EAPIs are defined by this specification:
     in all other ways identical to EAPI `3'.
 \item[5] EAPI `5' contains a number of extensions to EAPI `4'. Except where explicitly noted, it is
     in all other ways identical to EAPI `4'.
+\item[6] EAPI `6' contains a number of extensions to EAPI `5'. Except where explicitly noted, it is
+    in all other ways identical to EAPI `5'.
 \end{description}
 
 Except where explicitly noted, everything in this specification
diff --git a/ebuild-env-commands.tex b/ebuild-env-commands.tex
index 20771bd..8b2c146 100644
--- a/ebuild-env-commands.tex
+++ b/ebuild-env-commands.tex
@@ -35,7 +35,7 @@ The following commands must always be available in the ebuild environment:
     table~\ref{tab:system-commands-table} as requiring GNU find.
 \end{compactitem}
 
-\ChangeWhenAddingAnEAPI{5}
+\ChangeWhenAddingAnEAPI{6}
 \begin{centertable}{\t{find} implementation for EAPIs} \label{tab:system-commands-table}
     \begin{tabular}{ l l }
         \toprule
@@ -48,6 +48,7 @@ The following commands must always be available in the ebuild environment:
     \t{3} & Undefined \\
     \t{4} & Undefined \\
     \t{5} & Yes \\
+    \t{6} & Yes \\
     \bottomrule
     \end{tabular}
 \end{centertable}
diff --git a/ebuild-env-vars.tex b/ebuild-env-vars.tex
index d387aca..8946157 100644
--- a/ebuild-env-vars.tex
+++ b/ebuild-env-vars.tex
@@ -225,7 +225,7 @@ variable.
 \end{longtable}
 \end{landscape}
 
-\ChangeWhenAddingAnEAPI{5}
+\ChangeWhenAddingAnEAPI{6}
 \begin{centertable}{EAPIs supporting various added env variables} \label{tab:added-env-vars-table}
     \begin{tabular}{ l l l l l }
         \toprule
@@ -241,11 +241,12 @@ variable.
     \t{3} & No & No & No & No \\
     \t{4} & Yes & Yes & Yes & No \\
     \t{5} & Yes & Yes & Yes & Yes \\
+    \t{6} & Yes & Yes & Yes & Yes \\
     \bottomrule
     \end{tabular}
 \end{centertable}
 
-\ChangeWhenAddingAnEAPI{5}
+\ChangeWhenAddingAnEAPI{6}
 \begin{centertable}{EAPIs supporting various removed env variables} \label{tab:removed-env-vars-table}
     \begin{tabular}{ l l l }
         \toprule
@@ -259,11 +260,12 @@ variable.
     \t{3} & Yes & Yes \\
     \t{4} & No & No \\
     \t{5} & No & No \\
+    \t{6} & No & No \\
     \bottomrule
     \end{tabular}
 \end{centertable}
 
-\ChangeWhenAddingAnEAPI{5}
+\ChangeWhenAddingAnEAPI{6}
 \begin{centertable}{EAPIs supporting offset-prefix env variables}
     \label{tab:offset-env-vars-table}
     \begin{tabular}{ l l l l }
@@ -279,6 +281,7 @@ variable.
         \t{3} & Yes & Yes & Yes \\
         \t{4} & Yes & Yes & Yes \\
         \t{5} & Yes & Yes & Yes \\
+        \t{6} & Yes & Yes & Yes \\
         \bottomrule
     \end{tabular}
 \end{centertable}
@@ -379,7 +382,7 @@ contain at most one value.
 \subsection{Offset-prefix variables \t{EPREFIX}, \t{EROOT} and \t{ED}}
 \label{sec:offset-vars}
 
-\ChangeWhenAddingAnEAPI{5}
+\ChangeWhenAddingAnEAPI{6}
 \begin{centertable}{EAPIs supporting offset-prefix}
     \label{tab:offset-support-table}
     \begin{tabular}{ l l }
@@ -393,6 +396,7 @@ contain at most one value.
         \t{3} & Yes \\
         \t{4} & Yes \\
         \t{5} & Yes \\
+        \t{6} & Yes \\
         \bottomrule
     \end{tabular}
 \end{centertable}
diff --git a/ebuild-functions.tex b/ebuild-functions.tex
index 480ccda..60bd1e5 100644
--- a/ebuild-functions.tex
+++ b/ebuild-functions.tex
@@ -44,7 +44,7 @@ fallback to \t{WORKDIR} is used:
     in \t{DEFINED\_PHASES}.
 \end{compactitem}
 
-\ChangeWhenAddingAnEAPI{5}
+\ChangeWhenAddingAnEAPI{6}
 \begin{centertable}{EAPIs with \t{S} to \t{WORKDIR} fallbacks} \label{tab:s-fallback-table}
     \begin{tabular}{ l l }
         \toprule
@@ -57,6 +57,7 @@ fallback to \t{WORKDIR} is used:
     \t{3} & Always \\
     \t{4} & Conditional error \\
     \t{5} & Conditional error \\
+    \t{6} & Conditional error \\
     \bottomrule
     \end{tabular}
 \end{centertable}
@@ -79,7 +80,7 @@ before the next phase is executed.
 
 \t{pkg\_pretend} must not write to the filesystem.
 
-\ChangeWhenAddingAnEAPI{5}
+\ChangeWhenAddingAnEAPI{6}
 \begin{centertable}{EAPIs supporting \t{pkg\_pretend}} \label{tab:pkg-pretend-table}
     \begin{tabular}{ l l }
         \toprule
@@ -92,6 +93,7 @@ before the next phase is executed.
     \t{3} & No \\
     \t{4} & Yes \\
     \t{5} & Yes \\
+    \t{6} & Yes \\
     \bottomrule
     \end{tabular}
 \end{centertable}
@@ -135,7 +137,7 @@ implementation does nothing.
 The initial working directory is \t{S}, with an error or fallback to \t{WORKDIR} as discussed in
 section~\ref{sec:s-to-workdir-fallback}.
 
-\ChangeWhenAddingAnEAPI{5}
+\ChangeWhenAddingAnEAPI{6}
 \begin{centertable}{EAPIs supporting \t{src\_prepare}} \label{tab:src-prepare-table}
     \begin{tabular}{ l l }
         \toprule
@@ -148,6 +150,7 @@ section~\ref{sec:s-to-workdir-fallback}.
     \t{3} & Yes \\
     \t{4} & Yes \\
     \t{5} & Yes \\
+    \t{6} & Yes \\
     \bottomrule
     \end{tabular}
 \end{centertable}
@@ -172,7 +175,7 @@ src_configure() {
 }
 \end{verbatim}
 
-\ChangeWhenAddingAnEAPI{5}
+\ChangeWhenAddingAnEAPI{6}
 \begin{centertable}{EAPIs supporting \t{src\_configure}} \label{tab:src-configure-table}
     \begin{tabular}{ l l }
         \toprule
@@ -185,6 +188,7 @@ src_configure() {
     \t{3} & Yes \\
     \t{4} & Yes \\
     \t{5} & Yes \\
+    \t{6} & Yes \\
     \bottomrule
     \end{tabular}
 \end{centertable}
@@ -240,7 +244,7 @@ src_compile() {
 }
 \end{verbatim}
 
-\ChangeWhenAddingAnEAPI{5}
+\ChangeWhenAddingAnEAPI{6}
 \begin{centertable}{\t{src\_compile} behaviour for EAPIs} \label{tab:src-compile-table}
     \begin{tabular}{ l l }
         \toprule
@@ -253,6 +257,7 @@ src_compile() {
     \t{3} & 2 \\
     \t{4} & 2 \\
     \t{5} & 2 \\
+    \t{6} & 2 \\
     \bottomrule
     \end{tabular}
 \end{centertable}
@@ -275,7 +280,7 @@ parallel tests, the \t{emake} command must be called with option \t{-j1}.
 The \t{src\_test} function may be disabled by \t{RESTRICT}\@. See section~\ref{sec:restrict}. It may
 be disabled by user too, using a PM-specific mechanism.
 
-\ChangeWhenAddingAnEAPI{5}
+\ChangeWhenAddingAnEAPI{6}
 \begin{centertable}{\t{src\_test} behaviour for EAPIs} \label{tab:src-test-table}
     \begin{tabular}{ l l }
         \toprule
@@ -288,6 +293,7 @@ be disabled by user too, using a PM-specific mechanism.
     \t{3} & No \\
     \t{4} & No \\
     \t{5} & Yes \\
+    \t{6} & Yes \\
     \bottomrule
     \end{tabular}
 \end{centertable}
@@ -328,7 +334,7 @@ src_install() {
 For other EAPIs, the default implementation used when the ebuild lacks the \t{src\_install} function
 is a no-op.
 
-\ChangeWhenAddingAnEAPI{5}
+\ChangeWhenAddingAnEAPI{6}
 \begin{centertable}{\t{src\_install} behaviour for EAPIs} \label{tab:src-install-table}
     \begin{tabular}{ l l }
         \toprule
@@ -341,6 +347,7 @@ is a no-op.
     \t{3} & no-op \\
     \t{4} & 4 \\
     \t{5} & 4 \\
+    \t{6} & 4 \\
     \bottomrule
     \end{tabular}
 \end{centertable}
@@ -404,7 +411,7 @@ that dependencies may not be installed.
 
 \t{pkg\_info} must not write to the filesystem.
 
-\ChangeWhenAddingAnEAPI{5}
+\ChangeWhenAddingAnEAPI{6}
 \begin{centertable}{EAPIs supporting \t{pkg\_info} on non-installed packages} \label{tab:pkg-info-table}
     \begin{tabular}{ l l }
         \toprule
@@ -417,6 +424,7 @@ that dependencies may not be installed.
     \t{3} & No \\
     \t{4} & Yes \\
     \t{5} & Yes \\
+    \t{6} & Yes \\
     \bottomrule
     \end{tabular}
 \end{centertable}
@@ -439,7 +447,7 @@ named \t{default\_}(phase) that behaves as the default implementation for that E
 when executing any ebuild phase listed in the table. Ebuilds must not call these functions except
 when in the phase in question.
 
-\ChangeWhenAddingAnEAPI{5}
+\ChangeWhenAddingAnEAPI{6}
 \begin{centertable}{EAPIs supporting \t{default\_} phase functions} \label{tab:default-phase-function-table}
     \begin{tabular}{ l >{\setlength{\rightskip}{0pt plus 1fil}}p{30em} }
         \toprule
@@ -456,6 +464,8 @@ when in the phase in question.
         \t{src\_compile}, \t{src\_install}, \t{src\_test} \\
     \t{5} & \t{pkg\_nofetch}, \t{src\_unpack}, \t{src\_prepare}, \t{src\_configure},
         \t{src\_compile}, \t{src\_install}, \t{src\_test} \\
+    \t{6} & \t{pkg\_nofetch}, \t{src\_unpack}, \t{src\_prepare}, \t{src\_configure},
+        \t{src\_compile}, \t{src\_install}, \t{src\_test} \\
     \bottomrule
     \end{tabular}
 \end{centertable}
diff --git a/ebuild-vars.tex b/ebuild-vars.tex
index 9842557..0bba597 100644
--- a/ebuild-vars.tex
+++ b/ebuild-vars.tex
@@ -84,7 +84,7 @@ Ebuilds may define any of the following variables:
 \item[PDEPEND] See section~\ref{sec:dependencies}.
 \end{description}
 
-\ChangeWhenAddingAnEAPI{5}
+\ChangeWhenAddingAnEAPI{6}
 \begin{centertable}{EAPIs supporting \t{IUSE} defaults} \label{tab:iuse-defaults-table}
     \begin{tabular}{ l l }
         \toprule
@@ -97,11 +97,12 @@ Ebuilds may define any of the following variables:
     \t{3} & Yes \\
     \t{4} & Yes \\
     \t{5} & Yes \\
+    \t{6} & Yes \\
     \bottomrule
     \end{tabular}
 \end{centertable}
 
-\ChangeWhenAddingAnEAPI{5}
+\ChangeWhenAddingAnEAPI{6}
 \begin{centertable}{EAPIs supporting various ebuild-defined variables}
 \label{tab:optional-vars-table}
     \begin{tabular}{ l l l }
@@ -116,6 +117,7 @@ Ebuilds may define any of the following variables:
     \t{3} & Optionally & No \\
     \t{4} & Yes & Yes \\
     \t{5} & Yes & Yes \\
+    \t{6} & Yes & Yes \\
     \bottomrule
     \end{tabular}
 \end{centertable}
@@ -183,7 +185,7 @@ any \t{DEPEND} or \t{RDEPEND} set in an eclass does not change the implicit \t{R
 the ebuild portion, and any \t{DEPEND} value set in an eclass does not get treated as being part of
 \t{RDEPEND}.
 
-\ChangeWhenAddingAnEAPI{5}
+\ChangeWhenAddingAnEAPI{6}
 \begin{centertable}{EAPIs with \t{RDEPEND=DEPEND} Default} \label{tab:rdepend-depend-table}
     \begin{tabular}{ l l }
         \toprule
@@ -196,6 +198,7 @@ the ebuild portion, and any \t{DEPEND} value set in an eclass does not get treat
     \t{3} & Yes \\
     \t{4} & No \\
     \t{5} & No \\
+    \t{6} & No \\
     \bottomrule
     \end{tabular}
 \end{centertable}
@@ -229,7 +232,7 @@ this variable defined, and must treat an empty string as ``this information is n
 \note Thus, by extension of section~\ref{sec:metadata-invariance}, phase functions must not be defined
 based upon any variant condition.
 
-\ChangeWhenAddingAnEAPI{5}
+\ChangeWhenAddingAnEAPI{6}
 \begin{centertable}{EAPIs supporting \t{DEFINED\_PHASES}} \label{tab:defined-phases-table}
     \begin{tabular}{ l l }
         \toprule
@@ -242,6 +245,7 @@ based upon any variant condition.
     \t{3} & Optionally \\
     \t{4} & Yes \\
     \t{5} & Yes \\
+    \t{6} & Yes \\
     \bottomrule
     \end{tabular}
 \end{centertable}
diff --git a/merge.tex b/merge.tex
index c212294..1180c8c 100644
--- a/merge.tex
+++ b/merge.tex
@@ -86,7 +86,7 @@ held under the original image directory.
 In other EAPIs, the behaviour with respect to file modification times
 is undefined.
 
-\ChangeWhenAddingAnEAPI{5}
+\ChangeWhenAddingAnEAPI{6}
 \begin{centertable}{Preservation of file modification times (mtimes)}
     \label{tab:mtime-preserve}
     \begin{tabular}{ l l }
@@ -100,6 +100,7 @@ is undefined.
     \t{3} & Yes \\
     \t{4} & Yes \\
     \t{5} & Yes \\
+    \t{6} & Yes \\
     \bottomrule
     \end{tabular}
 \end{centertable}
diff --git a/pkg-mgr-commands.tex b/pkg-mgr-commands.tex
index 1884a5c..c614664 100644
--- a/pkg-mgr-commands.tex
+++ b/pkg-mgr-commands.tex
@@ -23,7 +23,7 @@ The following commands affect this behaviour:
     table~\ref{tab:commands-die-table} as supporting \t{nonfatal}.
 \end{description}
 
-\ChangeWhenAddingAnEAPI{5}
+\ChangeWhenAddingAnEAPI{6}
 \begin{centertable}{EAPI Command Failure Behaviour} \label{tab:commands-die-table}
     \begin{tabular}{ l l l }
         \toprule
@@ -37,6 +37,7 @@ The following commands affect this behaviour:
     \t{3} & Non-zero exit & No \\
     \t{4} & Aborts & Yes \\
     \t{5} & Aborts & Yes \\
+    \t{6} & Aborts & Yes \\
     \bottomrule
     \end{tabular}
 \end{centertable}
@@ -47,7 +48,7 @@ The following commands affect this behaviour:
 \featurelabel{banned-commands} Some commands are banned in some EAPIs. If a banned command is
 called, the package manager must abort the build process indicating an error.
 
-\ChangeWhenAddingAnEAPI{5}
+\ChangeWhenAddingAnEAPI{6}
 \begin{centertable}{Banned commands} \label{tab:banned-commands-table}
     \begin{tabular}{ l l l }
         \toprule
@@ -63,6 +64,7 @@ called, the package manager must abort the build process indicating an error.
     \t{3} & No & No \\
     \t{4} & Yes & Yes \\
     \t{5} & Yes & Yes \\
+    \t{6} & Yes & Yes \\
     \bottomrule
     \end{tabular}
 \end{centertable}
@@ -159,7 +161,7 @@ current phase function has returned.
         in the output of \t{configure -{}-help}.
     \end{itemize}
 
-    \ChangeWhenAddingAnEAPI{5}
+    \ChangeWhenAddingAnEAPI{6}
     \begin{centertable}{Extra \t{econf} arguments for EAPIs} \label{tab:econf-options-table}
         \begin{tabular}{ l l l }
             \toprule
@@ -173,6 +175,7 @@ current phase function has returned.
         \t{3} & No & No \\
         \t{4} & Yes & No \\
         \t{5} & Yes & Yes \\
+        \t{6} & Yes & Yes \\
         \bottomrule
         \end{tabular}
     \end{centertable}
@@ -436,7 +439,7 @@ can be extended or reduced (see below). The options that can be passed to \t{doh
 
 \end{description}
 
-\ChangeWhenAddingAnEAPI{5}
+\ChangeWhenAddingAnEAPI{6}
 \begin{centertable}{EAPIs supporting \t{dodoc -r}} \label{tab:dodoc-table}
     \begin{tabular}{ l l }
         \toprule
@@ -449,11 +452,12 @@ can be extended or reduced (see below). The options that can be passed to \t{doh
     \t{3} & No \\
     \t{4} & Yes \\
     \t{5} & Yes \\
+    \t{6} & Yes \\
     \bottomrule
     \end{tabular}
 \end{centertable}
 
-\ChangeWhenAddingAnEAPI{5}
+\ChangeWhenAddingAnEAPI{6}
 \begin{centertable}{EAPIs supporting \t{doheader} and \t{newheader}} \label{tab:doheader-table}
     \begin{tabular}{ l l }
         \toprule
@@ -466,11 +470,12 @@ can be extended or reduced (see below). The options that can be passed to \t{doh
     \t{3} & No \\
     \t{4} & No \\
     \t{5} & Yes \\
+    \t{6} & Yes \\
     \bottomrule
     \end{tabular}
 \end{centertable}
 
-\ChangeWhenAddingAnEAPI{5}
+\ChangeWhenAddingAnEAPI{6}
 \begin{centertable}{EAPIs supporting symlinks for \t{doins}} \label{tab:doins-table}
     \begin{tabular}{ l l }
         \toprule
@@ -483,11 +488,12 @@ can be extended or reduced (see below). The options that can be passed to \t{doh
     \t{3} & No \\
     \t{4} & Yes \\
     \t{5} & Yes \\
+    \t{6} & Yes \\
     \bottomrule
     \end{tabular}
 \end{centertable}
 
-\ChangeWhenAddingAnEAPI{5}
+\ChangeWhenAddingAnEAPI{6}
 \begin{centertable}{\t{doman} language support options for EAPIs}
     \label{tab:doman-table}
     \begin{tabular}{ l l l }
@@ -502,11 +508,12 @@ can be extended or reduced (see below). The options that can be passed to \t{doh
     \t{3} & Yes & No \\
     \t{4} & Yes & Yes \\
     \t{5} & Yes & Yes \\
+    \t{6} & Yes & Yes \\
     \bottomrule
     \end{tabular}
 \end{centertable}
 
-\ChangeWhenAddingAnEAPI{5}
+\ChangeWhenAddingAnEAPI{6}
 \begin{centertable}{EAPIs supporting stdin for \t{new*} commands} \label{tab:newfoo-stdin-table}
     \begin{tabular}{ l l }
         \toprule
@@ -519,11 +526,12 @@ can be extended or reduced (see below). The options that can be passed to \t{doh
     \t{3} & No \\
     \t{4} & No \\
     \t{5} & Yes \\
+    \t{6} & Yes \\
     \bottomrule
     \end{tabular}
 \end{centertable}
 
-\ChangeWhenAddingAnEAPI{5}
+\ChangeWhenAddingAnEAPI{6}
 \begin{centertable}{EAPIs supporting \t{-{}-host-root} for \t{*\_version} commands}
     \label{tab:foo-version-host-root-table}
     \begin{tabular}{ l l }
@@ -537,6 +545,7 @@ can be extended or reduced (see below). The options that can be passed to \t{doh
     \t{3} & No \\
     \t{4} & No \\
     \t{5} & Yes \\
+    \t{6} & Yes \\
     \bottomrule
     \end{tabular}
 \end{centertable}
@@ -626,7 +635,7 @@ exclusion list. Otherwise, add each argument to the inclusion list. Only availab
 in table~\ref{tab:compression-table} as supporting \t{docompress}.
 \end{description}
 
-\ChangeWhenAddingAnEAPI{5}
+\ChangeWhenAddingAnEAPI{6}
 \begin{centertable}{EAPIs supporting controllable compression} \label{tab:compression-table}
     \begin{tabular}{ l l l }
         \toprule
@@ -640,6 +649,7 @@ in table~\ref{tab:compression-table} as supporting \t{docompress}.
     \t{3} & No & No \\
     \t{4} & Yes & Yes \\
     \t{5} & Yes & Yes \\
+    \t{6} & Yes & Yes \\
     \bottomrule
     \end{tabular}
 \end{centertable}
@@ -678,7 +688,7 @@ either behaviour is undefined or it is an error as decided by table~\ref{tab:use
     Only available in EAPIs listed in table~\ref{tab:usex-table} as supporting \t{usex}.
 \end{description}
 
-\ChangeWhenAddingAnEAPI{5}
+\ChangeWhenAddingAnEAPI{6}
 \begin{centertable}{EAPI Behaviour for Use Queries not in IUSE\_EFFECTIVE} \label{tab:use-list-strictness}
     \begin{tabular}{ l l }
         \toprule
@@ -691,11 +701,12 @@ either behaviour is undefined or it is an error as decided by table~\ref{tab:use
     \t{3} & Undefined \\
     \t{4} & Error \\
     \t{5} & Error \\
+    \t{6} & Error \\
     \bottomrule
     \end{tabular}
 \end{centertable}
 
-\ChangeWhenAddingAnEAPI{5}
+\ChangeWhenAddingAnEAPI{6}
 \begin{centertable}{EAPIs supporting empty third argument in \t{use\_with} and \t{use\_enable}}
     \label{tab:use-with-third-arg}
     \begin{tabular}{ l l }
@@ -709,11 +720,12 @@ either behaviour is undefined or it is an error as decided by table~\ref{tab:use
     \t{3} & No \\
     \t{4} & Yes \\
     \t{5} & Yes \\
+    \t{6} & Yes \\
     \bottomrule
     \end{tabular}
 \end{centertable}
 
-\ChangeWhenAddingAnEAPI{5}
+\ChangeWhenAddingAnEAPI{6}
 \begin{centertable}{EAPIs supporting \t{usex}} \label{tab:usex-table}
     \begin{tabular}{ l l }
         \toprule
@@ -726,6 +738,7 @@ either behaviour is undefined or it is an error as decided by table~\ref{tab:use
     \t{3} & No \\
     \t{4} & No \\
     \t{5} & Yes \\
+    \t{6} & Yes \\
     \bottomrule
     \end{tabular}
 \end{centertable}
@@ -796,7 +809,7 @@ has returned.
     It is up to the ebuild to ensure that the relevant external utilities are available, whether by
     being in the system set or via dependencies.
 
-\ChangeWhenAddingAnEAPI{5}
+\ChangeWhenAddingAnEAPI{6}
 \begin{centertable}{\t{unpack} extensions for EAPIs} \label{tab:unpack-extensions-table}
     \begin{tabular}{ l l }
         \toprule
@@ -809,6 +822,7 @@ has returned.
     \t{3} & Yes \\
     \t{4} & Yes \\
     \t{5} & Yes \\
+    \t{6} & Yes \\
     \bottomrule
     \end{tabular}
 \end{centertable}
@@ -822,7 +836,7 @@ has returned.
     table~\ref{tab:default-function-table}.
 \end{description}
 
-\ChangeWhenAddingAnEAPI{5}
+\ChangeWhenAddingAnEAPI{6}
 \begin{centertable}{EAPIs supporting the \t{default} function} \label{tab:default-function-table}
     \begin{tabular}{ l l }
         \toprule
@@ -835,6 +849,7 @@ has returned.
     \t{3} & Yes \\
     \t{4} & Yes \\
     \t{5} & Yes \\
+    \t{6} & Yes \\
     \bottomrule
     \end{tabular}
 \end{centertable}
diff --git a/pms.tex b/pms.tex
index ae86b43..c96fc05 100644
--- a/pms.tex
+++ b/pms.tex
@@ -21,8 +21,8 @@
     pdfkeywords={Gentoo, package manager, specification},
 }
 
-\CurrentEAPIIs{5}
-\ChangeWhenAddingAnEAPI{5}
+\CurrentEAPIIs{6}
+\ChangeWhenAddingAnEAPI{6}
 
 \begin{document}
 \maketitle
diff --git a/profile-variables.tex b/profile-variables.tex
index 6eca502..4c5496c 100644
--- a/profile-variables.tex
+++ b/profile-variables.tex
@@ -33,7 +33,7 @@ Other variables, except where they affect only package-manager-specific function
 Portage's \t{FEATURES} variable), must not be treated incrementally---later definitions shall
 completely override those in parent profiles.
 
-\ChangeWhenAddingAnEAPI{5}
+\ChangeWhenAddingAnEAPI{6}
 \begin{centertable}{Profile-defined \t{IUSE} injection for EAPIs} \label{tab:profile-iuse-injection-table}
     \begin{tabular}{ l l }
         \toprule
@@ -46,6 +46,7 @@ completely override those in parent profiles.
     \t{3} & No \\
     \t{4} & No \\
     \t{5} & Yes \\
+    \t{6} & Yes \\
     \bottomrule
     \end{tabular}
 \end{centertable}
diff --git a/profiles.tex b/profiles.tex
index a7a8527..1048162 100644
--- a/profiles.tex
+++ b/profiles.tex
@@ -125,7 +125,7 @@ only act on packages that are merged due to a stable keyword in the sense of
 subsection~\ref{sec:keywords}. Thus, these files can be used to restrict the feature set deemed
 stable in a package.
 
-\ChangeWhenAddingAnEAPI{5}
+\ChangeWhenAddingAnEAPI{6}
 \begin{centertable}{Profile directory support for masking/forcing use flags in stable
 versions only}\label{tab:profile-stablemask}
     \begin{tabular}{ l l }
@@ -139,6 +139,7 @@ versions only}\label{tab:profile-stablemask}
     \t{3} & No \\
     \t{4} & No \\
     \t{5} & Yes \\
+    \t{6} & Yes \\
     \bottomrule
     \end{tabular}
 \end{centertable}
-- 
2.6.1