commit: 44996b2672f7bbfb463f80dcf924317093bf5beb
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: Fri Oct 23 17:25:38 2015 +0000
URL: https://gitweb.gentoo.org/proj/pms.git/commit/?id=44996b26
EAPI 6 has eapply_user.
Bug: 475288
eapi-differences.tex | 4 ++++
pkg-mgr-commands.tex | 16 ++++++++++++----
2 files changed, 16 insertions(+), 4 deletions(-)
diff --git a/eapi-differences.tex b/eapi-differences.tex
index b910b76..74014df 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 df5289a..a55e064 100644
--- a/pkg-mgr-commands.tex
+++ b/pkg-mgr-commands.tex
@@ -153,6 +153,13 @@ Ebuilds must not run any of these commands once the
current phase function has r
according to Algorithm~\ref{alg:eapply}. If applying the patches fails, it
aborts the build
using \t{die}, unless run using \t{nonfatal}, in which case it returns
non-zero exit status.
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 command as a no-op. Only available in
EAPIs listed in
+ table~\ref{tab:patch-commands} as supporting \t{eapply\_user}. In EAPIs
where it is supported,
+ \t{eapply\_user} must be called exactly once in the \t{src\_prepare} phase.
\end{description}
\begin{algorithm}
@@ -195,13 +202,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}
