[gentoo-pms] [PATCH] Not all phases have a default_ in EAPI 2

[gentoo-pms] [PATCH] Not all phases have a default_ in EAPI 2

[David Leverton]

---
 eapi-differences.tex |    8 +++++---
 ebuild-functions.tex |   25 ++++++++++++++-----------
 pkg-mgr-commands.tex |    5 +++--
 3 files changed, 22 insertions(+), 16 deletions(-)

diff --git a/eapi-differences.tex b/eapi-differences.tex
index bf98e95..1a41f0a 100644
--- a/eapi-differences.tex
+++ b/eapi-differences.tex
@@ -143,8 +143,9 @@ Use dependencies & table~\ref{use-deps-table} & No & No &
     \IFKDEBUILDCOLOUR{Installed} \\
 }{}
 
-\t{default\_} phase functions & table~\ref{default-phase-function-table} & No & No &
-    \IFANYKDEBUILDELSE{\IFKDEBUILDCOLOUR{No} &}{} Yes \\
+\t{default\_} phase functions & table~\ref{default-phase-function-table} & None & None &
+    \IFANYKDEBUILDELSE{\IFKDEBUILDCOLOUR{None} &}{} \parbox[t]{1in}{\t{pkg\_nofetch}, \t{src\_unpack},
+    \t{src\_prepare}, \t{src\_configure}, \t{src\_compile}, \t{src\_test}} \\
 
 \IFANYKDEBUILDELSE{
     \IFKDEBUILDCOLOUR{\t{dohard}} &
@@ -243,7 +244,8 @@ EAPI 2 is EAPI 1 with the following changes:
 \item \t{src\_prepare}, table~\ref{src-prepare-table}.
 \item \t{src\_configure}, table~\ref{src-configure-table}.
 \item Different \t{src\_compile} implementation, table~\ref{src-compile-table}.
-\item \t{default\_} phase functions, table~\ref{default-phase-function-table}.
+\item \t{default\_} phase functions for phases \t{pkg\_nofetch}, \t{src\_unpack}, \t{src\_prepare},
+    \t{src\_configure}, \t{src\_compile} and \t{src\_test}; table~\ref{default-phase-function-table}.
 \item \t{doman} languages support, table~\ref{doman-table}.
 \item \t{default} function, table~\ref{default-function-table}.
 \end{compactitem}
diff --git a/ebuild-functions.tex b/ebuild-functions.tex
index bc654ad..98e3fd4 100644
--- a/ebuild-functions.tex
+++ b/ebuild-functions.tex
@@ -349,10 +349,11 @@ source files from their respective locations, with notes concerning licensing if
 \t{pkg\_nofetch} must require no write access to any part of the filesystem.
 
 \subsection{\t{default\_} Phase Functions}
+\label{default-phase-functions}
 
 In EAPIs listed in table~\ref{default-phase-function-table} as supporting \t{default\_} phase
-functions, a function named \t{default\_\$\{EBUILD\_PHASE\}} that behaves as the default
-implementation for that EAPI shall be defined when executing any given \t{EBUILD\_PHASE}. Ebuilds
+functions, a function named \t{default\_}(phase) that behaves as the default
+implementation for that EAPI shall be defined when executing any ebuild phase listed in the table. Ebuilds
 must not call these functions except when in the phase in question.
 
 \begin{centertable}{EAPIs supporting \t{default\_} phase functions} \label{default-phase-function-table}
@@ -361,23 +362,25 @@ must not call these functions except when in the phase in question.
     \begin{tabular}{ l l }
         \toprule
             \multicolumn{1}{c}{\textbf{EAPI}} &
-            \multicolumn{1}{c}{\textbf{Supports \t{default\_} phase functions?}} \\
+            \multicolumn{1}{c}{\textbf{Supports \t{default\_} functions in phases}} \\
             \midrule
-    \t{0} & No \\
-    \t{1} & No \\
-    \t{kdebuild-1} & No \\
-    \t{2} & Yes \\
+    \t{0} & None \\
+    \t{1} & None \\
+    \t{kdebuild-1} & None \\
+    \t{2} & \parbox[t]{3in}{\t{pkg\_nofetch}, \t{src\_unpack}, \t{src\_prepare}, \t{src\_configure},
+        \t{src\_compile}, \t{src\_test}} \\
     \bottomrule
     \end{tabular}
 }{
     \begin{tabular}{ l l }
         \toprule
             \multicolumn{1}{c}{\textbf{EAPI}} &
-            \multicolumn{1}{c}{\textbf{Supports \t{default\_} phase functions?}} \\
+            \multicolumn{1}{c}{\textbf{Supports \t{default\_} functions in phases}} \\
             \midrule
-    \t{0} & No \\
-    \t{1} & No \\
-    \t{2} & Yes \\
+    \t{0} & None \\
+    \t{1} & None \\
+    \t{2} & \parbox[t]{3in}{\t{pkg\_nofetch}, \t{src\_unpack}, \t{src\_prepare}, \t{src\_configure},
+        \t{src\_compile}, \t{src\_test}} \\
     \bottomrule
     \end{tabular}
 }
diff --git a/pkg-mgr-commands.tex b/pkg-mgr-commands.tex
index 875bddb..f960651 100644
--- a/pkg-mgr-commands.tex
+++ b/pkg-mgr-commands.tex
@@ -460,8 +460,9 @@ has returned.
 
 \item[inherit] See section~\ref{inherit}.
 
-\item[default] Calls the \t{default\_\$\{EBUILD\_PHASE\}} function. Only available in EAPIs listed in
-    table~\ref{default-function-table}.
+\item[default] Calls the \t{default\_} function for the current phase (see section~\ref{default-phase-functions}).
+    Must not be called if the \t{default\_} function does not exist for the current phase in the current EAPI.
+    Only available in EAPIs listed in table~\ref{default-function-table}.
 \end{description}
 
 \begin{centertable}{EAPIs supporting the \t{default} function} \label{default-function-table}
-- 
1.6.0.2

Re: [gentoo-pms] [PATCH] Not all phases have a default_ in EAPI 2

[Ciaran McCreesh]

[-- Attachment #1: Type: text/plain, Size: 322 bytes --]

On Thu, 16 Oct 2008 13:58:34 +0100
David Leverton <levertond@googlemail.com> wrote:
>  eapi-differences.tex |    8 +++++---
>  ebuild-functions.tex |   25 ++++++++++++++-----------
>  pkg-mgr-commands.tex |    5 +++--
>  3 files changed, 22 insertions(+), 16 deletions(-)

Applied, thanks.

-- 
Ciaran McCreesh

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 197 bytes --]