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

[Ulrich Müller]

commit:     32ce34e9934e530d5c09ee78acb0b3f666f10e6f
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 23 11:37:13 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=32ce34e9

EAPI 6 has a different src_install implementation.

 eapi-differences.tex |  3 ++-
 ebuild-functions.tex | 17 ++++++++++++++++-
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/eapi-differences.tex b/eapi-differences.tex
index 30ed46b..452349e 100644
--- a/eapi-differences.tex
+++ b/eapi-differences.tex
@@ -105,7 +105,7 @@ Parallel tests & \compactfeatureref{parallel-tests} &
     No & No & No & Yes & Yes \\
 
 \t{src\_install} style & \compactfeatureref{src-install} &
-    no-op & no-op & 4 & 4 & 4 \\
+    no-op & no-op & 4 & 4 & 6 \\
 
 \t{pkg\_info} & \compactfeatureref{pkg-info} &
     Installed & Installed & Both & Both & Both \\
@@ -345,6 +345,7 @@ EAPI 6 is EAPI 5 with the following changes:
 \begin{compactitem}
 \item Profile \t{package*} and \t{use*} can be directories, \featureref{profile-file-dirs}.
 \item Default \t{src\_prepare} no longer a no-op, \featureref{src-prepare-6}.
+\item Different \t{src\_install} implementation, \featureref{src-install-6}.
 \item Bash version is 4.2, \featureref{bash-version}.
 \item \t{failglob} is enabled in global scope, \featureref{failglob}.
 \item \t{einstall} banned, \featureref{banned-commands}.

diff --git a/ebuild-functions.tex b/ebuild-functions.tex
index 1f996f0..bf16f9e 100644
--- a/ebuild-functions.tex
+++ b/ebuild-functions.tex
@@ -326,6 +326,20 @@ src_install() {
 }
 \end{verbatim}
 
+\featurelabel{src-install-6} For EAPIs listed in table~\ref{tab:src-install-table} as using format
+6, the default implementation used when the ebuild lacks the \t{src\_install} function shall behave
+as:
+
+\begin{verbatim}
+src_install() {
+    if [[ -f Makefile ]] || [[ -f GNUmakefile ]] || [[ -f makefile ]]; then
+        emake DESTDIR="${D}" install
+    fi
+
+    einstalldocs
+}
+\end{verbatim}
+
 For other EAPIs, the default implementation used when the ebuild lacks the \t{src\_install} function
 is a no-op.
 
@@ -338,7 +352,8 @@ is a no-op.
       \multicolumn{1}{c}{\textbf{Format}} \\
       \midrule
       0, 1, 2, 3        & no-op \\
-      4, 5, 6           & 4     \\
+      4, 5              & 4     \\
+      6                 & 6     \\
       \bottomrule
     \end{tabular}
 \end{centertable}