From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 07F5C13888F for ; Fri, 23 Oct 2015 17:31:14 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 71912E0886; Fri, 23 Oct 2015 17:30:57 +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 C9FB3E0882 for ; Fri, 23 Oct 2015 17:30:54 +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 1CE18340B46 for ; Fri, 23 Oct 2015 17:30:54 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C3D2416AA for ; Fri, 23 Oct 2015 17:30:49 +0000 (UTC) From: "Ulrich Müller" 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" Message-ID: <1445621139.fb5cad2237b8276ee3bcba5721792eb387b7a62b.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: fb5cad2237b8276ee3bcba5721792eb387b7a62b X-VCS-Branch: eapi-6 Date: Fri, 23 Oct 2015 17:30:49 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 07517826-75d3-45a7-90b7-4afa7f097642 X-Archives-Hash: ce5a458f9579234ebe7644c7027562bc commit: fb5cad2237b8276ee3bcba5721792eb387b7a62b Author: Ulrich Müller gentoo org> AuthorDate: Mon Mar 23 11:37:13 2015 +0000 Commit: Ulrich Müller gentoo org> CommitDate: Fri Oct 23 17:25:39 2015 +0000 URL: https://gitweb.gentoo.org/proj/pms.git/commit/?id=fb5cad22 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 114e87e..51a21d1 100644 --- a/eapi-differences.tex +++ b/eapi-differences.tex @@ -108,7 +108,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 \\ @@ -346,6 +346,7 @@ EAPI 6 is EAPI 5 with the following changes: \item Profile \t{package*} and \t{use*} can be directories, \featureref{profile-file-dirs}. \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 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}