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

[Ulrich Müller]

commit:     c82042d29a03defbb639050e5b3d265f74cbbee6
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 23 18:38:37 2015 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Sun Aug 30 18:57:33 2015 +0000
URL:        https://gitweb.gentoo.org/proj/pms.git/commit/?id=c82042d2

EAPI 6 has eapply_user.

See bug 475288.

 eapi-differences.tex |  4 ++++
 pkg-mgr-commands.tex | 15 +++++++++++----
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/eapi-differences.tex b/eapi-differences.tex
index 7502c1e..be8563c 100644
--- a/eapi-differences.tex
+++ b/eapi-differences.tex
@@ -175,6 +175,9 @@ Option \t{-{}-host-root} & \compactfeatureref{host-root-option} &
 \t{eapply} & \compactfeatureref{eapply} &
     No & No & No & No & Yes \\
 
+\t{eapply\_user} & \compactfeatureref{eapply-user} &
+    No & No & No & No & Yes \\
+
 \t{econf} arguments & \compactfeatureref{econf-options} &
     &  & disable dependency tracking &
     disable dependency tracking, disable silent rules &
@@ -328,6 +331,7 @@ EAPI 6 is EAPI 5 with the following changes:
 \item \t{einstall} banned, \featureref{banned-commands}.
 \item \t{die} and \t{assert} called with \t{-n} respect \t{nonfatal}, \featureref{nonfatal-die}.
 \item \t{eapply} support, \featureref{eapply}.
+\item \t{eapply\_user} support, \featureref{eapply-user}.
 \end{compactitem}
 
 \ChangeWhenAddingAnEAPI{6}

diff --git a/pkg-mgr-commands.tex b/pkg-mgr-commands.tex
index ced5704..048be14 100644
--- a/pkg-mgr-commands.tex
+++ b/pkg-mgr-commands.tex
@@ -150,6 +150,12 @@ Ebuilds must not run any of these commands once the current phase function has r
 \begin{description}
 \item[eapply] \featurelabel{eapply}
     Only available in EAPIs listed in table~\ref{tab:patch-commands} as supporting \t{eapply}.
+
+\item[eapply\_user] \featurelabel{eapply-user} Takes no arguments. Package managers supporting it
+    apply user-provided patches to the source tree in the current working directory. Exact behaviour
+    is implementation defined and beyond the scope of this specification. Package managers not
+    supporting it must implement the function as a no-op. Only available in EAPIs listed in
+    table~\ref{tab:patch-commands} as supporting \t{eapply\_user}.
 \end{description}
 
 \begin{algorithm}
@@ -162,13 +168,14 @@ Ebuilds must not run any of these commands once the current phase function has r
 \ChangeWhenAddingAnEAPI{6}
 \begin{centertable}{Patch commands for EAPIs}
     \label{tab:patch-commands}
-    \begin{tabular}{ l l }
+    \begin{tabular}{ l l l }
       \toprule
       \multicolumn{1}{c}{\textbf{EAPI}} &
-      \multicolumn{1}{c}{\textbf{\t{eapply}?}} \\
+      \multicolumn{1}{c}{\textbf{\t{eapply}?}} &
+      \multicolumn{1}{c}{\textbf{\t{eapply\_user}?}} \\
       \midrule
-      0, 1, 2, 3, 4, 5  & No  \\
-      6                 & Yes \\
+      0, 1, 2, 3, 4, 5  & No  & No  \\
+      6                 & Yes & Yes \\
       \bottomrule
     \end{tabular}
 \end{centertable}