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

["Ulrich Mueller" <ulm@gentoo.org>]

commit:     a50e3dc1250328b3c912b22a9b0ebdaaefbab7e1
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 11 20:36:04 2012 +0000
Commit:     Ulrich Mueller <ulm <AT> gentoo <DOT> org>
CommitDate: Tue Sep 11 20:36:04 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/pms.git;a=commit;h=a50e3dc1

Revert "EAPI 5 has apply_user_patches"

User patches have been rejected for EAPI 5 in today's council meeting.

This reverts commit a8bf7862967cce36b7f1b408934a774126da2538.

Conflicts:
	eapi-differences.tex

---
 eapi-differences.tex |    5 -----
 ebuild-functions.tex |   30 +++++++++++-------------------
 pkg-mgr-commands.tex |   26 --------------------------
 3 files changed, 11 insertions(+), 50 deletions(-)

diff --git a/eapi-differences.tex b/eapi-differences.tex
index 2c04dd7..9a9ebc2 100644
--- a/eapi-differences.tex
+++ b/eapi-differences.tex
@@ -91,9 +91,6 @@ Use dependencies & \compactfeatureref{use-deps} &
 \t{src\_prepare} & \compactfeatureref{src-prepare} &
     No & No & Yes & Yes & Yes & Yes \\
 
-\t{apply\_user\_patches} & \compactfeatureref{apply-user-patches} &
-    No & No & No & No & No & Yes \\
-
 \t{src\_configure} & \compactfeatureref{src-configure} &
     No & No & Yes & Yes & Yes & Yes \\
 
@@ -289,8 +286,6 @@ EAPI 5 is EAPI 4 with the following changes:
 \item \t{USE} is calculated differently, \featureref{profile-iuse-injection}.
 \item \t{REQUIRED\_USE} now supports \t{??} groups, \featureref{at-most-one-of}.
 \item \t{SLOT} now supports an optional sub-slot part, \featureref{sub-slot}.
-\item \t{apply\_user\_patches} function, with \t{src\_prepare} changes,
-    \featureref{apply-user-patches}.
 \item \t{EBUILD\_PHASE\_FUNC}, \featureref{ebuild-phase-func}.
 \item \t{find} is guaranteed to be GNU, \featureref{gnu-find}.
 \item \t{best\_version} and \t{has\_version} support the \t{-{}-host-root} option,

diff --git a/ebuild-functions.tex b/ebuild-functions.tex
index 9836e33..1f2ab68 100644
--- a/ebuild-functions.tex
+++ b/ebuild-functions.tex
@@ -127,35 +127,27 @@ src_unpack() {
 \label{sec:src-prepare-function}
 
 \featurelabel{src-prepare} The \t{src\_prepare} function is only called for EAPIs listed in
-table~\ref{tab:src-prepare-table} as supporting it. For EAPIs whose behaviour is listed as
-\t{no-op}, the default implementation does nothing. For EAPIs listed as using format 5, the default
-implementation shall behave as:
+table~\ref{tab:src-prepare-table} as supporting it.
 
-\begin{verbatim}
-src_prepare() {
-    apply_user_patches
-}
-\end{verbatim}
-
-Furthermore, for these EAPIs, if the function is overridden, it shall be a fatal error if the
-\t{apply\_user\_patches} command has not been called at least once by the end of the phase.
+The \t{src\_prepare} function can be used for post-unpack source preparation. The default
+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}
-\begin{centertable}{\t{src\_prepare} behaviour for EAPIs} \label{tab:src-prepare-table}
+\begin{centertable}{EAPIs supporting \t{src\_prepare}} \label{tab:src-prepare-table}
     \begin{tabular}{ l l }
         \toprule
         \multicolumn{1}{c}{\textbf{EAPI}} &
-        \multicolumn{1}{c}{\textbf{Format}} \\
+        \multicolumn{1}{c}{\textbf{Supports \t{src\_prepare}?}} \\
         \midrule
-    \t{0} & Unsupported \\
-    \t{1} & Unsupported \\
-    \t{2} & no-op \\
-    \t{3} & no-op \\
-    \t{4} & no-op \\
-    \t{5} & 5 \\
+    \t{0} & No \\
+    \t{1} & No \\
+    \t{2} & Yes \\
+    \t{3} & Yes \\
+    \t{4} & Yes \\
+    \t{5} & Yes \\
     \bottomrule
     \end{tabular}
 \end{centertable}

diff --git a/pkg-mgr-commands.tex b/pkg-mgr-commands.tex
index e4134e9..3d2833d 100644
--- a/pkg-mgr-commands.tex
+++ b/pkg-mgr-commands.tex
@@ -808,32 +808,6 @@ has returned.
     \end{tabular}
 \end{centertable}
 
-\item[apply\_user\_patches]
-    \featurelabel{apply-user-patches} This function is called to indicate to the package manager
-    that now would be a suitable time to apply any user patches to the work directory. This function
-    must return zero if it is possible that any changes were made to the work directory, and may
-    return non-zero if no changes were made. This function must be called at least once in
-    \t{src\_prepare}; if the function is called more than once, it is expected that any effects that
-    it has shall only be executed once, and that its return value shall only be zero once. Only
-    available in EAPIs listed in table~\ref{tab:apply-user-patches-table}.
-
-\ChangeWhenAddingAnEAPI{5}
-\begin{centertable}{\t{apply\_user\_patches} support for EAPIs} \label{tab:apply-user-patches-table}
-    \begin{tabular}{ l l }
-        \toprule
-            \multicolumn{1}{c}{\textbf{EAPI}} &
-            \multicolumn{1}{c}{\textbf{\t{apply\_user\_patches} support?}} \\
-            \midrule
-    \t{0} & No \\
-    \t{1} & No \\
-    \t{2} & No \\
-    \t{3} & No \\
-    \t{4} & No \\
-    \t{5} & Yes \\
-    \bottomrule
-    \end{tabular}
-\end{centertable}
-
 \item[inherit] See section~\ref{sec:inherit}.
 
 \item[default]