From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-844893-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
by finch.gentoo.org (Postfix) with ESMTP id 9AE051384B4
for <garchives@archives.gentoo.org>; Sun, 8 Nov 2015 19:37:11 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id C82F421C014;
Sun, 8 Nov 2015 19:36:59 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id DE46EE0863
for <gentoo-commits@lists.gentoo.org>; Sun, 8 Nov 2015 19:36:57 +0000 (UTC)
Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84])
(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id 3413F3405CF
for <gentoo-commits@lists.gentoo.org>; Sun, 8 Nov 2015 19:36:57 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 64C3E22D5
for <gentoo-commits@lists.gentoo.org>; Sun, 8 Nov 2015 19:36:53 +0000 (UTC)
From: "Ulrich Müller" <ulm@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Ulrich Müller" <ulm@gentoo.org>
Message-ID: <1447010960.828b7750f46055953617acfd8dd95e71c9b1381c.ulm@gentoo>
Subject: [gentoo-commits] proj/pms:eapi-6 commit in: /
X-VCS-Repository: proj/pms
X-VCS-Files: eapi-differences.tex ebuild-functions.tex
X-VCS-Directories: /
X-VCS-Committer: ulm
X-VCS-Committer-Name: Ulrich Müller
X-VCS-Revision: 828b7750f46055953617acfd8dd95e71c9b1381c
X-VCS-Branch: eapi-6
Date: Sun, 8 Nov 2015 19:36:53 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Archives-Salt: dabe4985-c8b3-416f-9da1-b1645a871306
X-Archives-Hash: a7d052aae92fe10527cdd4f7b18422e5
commit: 828b7750f46055953617acfd8dd95e71c9b1381c
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 Nov 8 19:29:20 2015 +0000
URL: https://gitweb.gentoo.org/proj/pms.git/commit/?id=828b7750
EAPI 6 has a different src_install implementation.
eapi-differences.tex | 3 ++-
ebuild-functions.tex | 19 ++++++++++++++++++-
2 files changed, 20 insertions(+), 2 deletions(-)
diff --git a/eapi-differences.tex b/eapi-differences.tex
index b9734e4..adf2615 100644
--- a/eapi-differences.tex
+++ b/eapi-differences.tex
@@ -104,7 +104,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 \\
@@ -341,6 +341,7 @@ EAPI 6 is EAPI 5 with the following changes:
\begin{compactitem}
\item Bash version is 4.2, \featureref{bash-version}.
\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 \t{failglob} is enabled in global scope, \featureref{failglob}.
\item \t{einstall} banned, \featureref{banned-commands}.
\item \t{die} and \t{assert} called with \t{-n} respect \t{nonfatal}, \featureref{nonfatal-die}.
diff --git a/ebuild-functions.tex b/ebuild-functions.tex
index 34a6a3c..6983ddb 100644
--- a/ebuild-functions.tex
+++ b/ebuild-functions.tex
@@ -347,6 +347,22 @@ src_install() {
\end{verbatim}
\end{listing}
+\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{listing}[H]
+\caption{src\_install, format~6} \label{lst:src-install-6}
+\begin{verbatim}
+src_install() {
+ if [[ -f Makefile ]] || [[ -f GNUmakefile ]] || [[ -f makefile ]]; then
+ emake DESTDIR="${D}" install
+ fi
+ einstalldocs
+}
+\end{verbatim}
+\end{listing}
+
For other EAPIs, the default implementation used when the ebuild lacks the \t{src\_install} function
is a no-op.
@@ -359,7 +375,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}