1 |
--- |
2 |
eapi-differences.tex | 3 ++- |
3 |
ebuild-functions.tex | 17 ++++++++++++++++- |
4 |
2 files changed, 18 insertions(+), 2 deletions(-) |
5 |
|
6 |
diff --git a/eapi-differences.tex b/eapi-differences.tex |
7 |
index 30ed46b..452349e 100644 |
8 |
--- a/eapi-differences.tex |
9 |
+++ b/eapi-differences.tex |
10 |
@@ -105,7 +105,7 @@ Parallel tests & \compactfeatureref{parallel-tests} & |
11 |
No & No & No & Yes & Yes \\ |
12 |
|
13 |
\t{src\_install} style & \compactfeatureref{src-install} & |
14 |
- no-op & no-op & 4 & 4 & 4 \\ |
15 |
+ no-op & no-op & 4 & 4 & 6 \\ |
16 |
|
17 |
\t{pkg\_info} & \compactfeatureref{pkg-info} & |
18 |
Installed & Installed & Both & Both & Both \\ |
19 |
@@ -345,6 +345,7 @@ EAPI 6 is EAPI 5 with the following changes: |
20 |
\begin{compactitem} |
21 |
\item Profile \t{package*} and \t{use*} can be directories, \featureref{profile-file-dirs}. |
22 |
\item Default \t{src\_prepare} no longer a no-op, \featureref{src-prepare-6}. |
23 |
+\item Different \t{src\_install} implementation, \featureref{src-install-6}. |
24 |
\item Bash version is 4.2, \featureref{bash-version}. |
25 |
\item \t{failglob} is enabled in global scope, \featureref{failglob}. |
26 |
\item \t{einstall} banned, \featureref{banned-commands}. |
27 |
diff --git a/ebuild-functions.tex b/ebuild-functions.tex |
28 |
index 1f996f0..bf16f9e 100644 |
29 |
--- a/ebuild-functions.tex |
30 |
+++ b/ebuild-functions.tex |
31 |
@@ -326,6 +326,20 @@ src_install() { |
32 |
} |
33 |
\end{verbatim} |
34 |
|
35 |
+\featurelabel{src-install-6} For EAPIs listed in table~\ref{tab:src-install-table} as using format |
36 |
+6, the default implementation used when the ebuild lacks the \t{src\_install} function shall behave |
37 |
+as: |
38 |
+ |
39 |
+\begin{verbatim} |
40 |
+src_install() { |
41 |
+ if [[ -f Makefile ]] || [[ -f GNUmakefile ]] || [[ -f makefile ]]; then |
42 |
+ emake DESTDIR="${D}" install |
43 |
+ fi |
44 |
+ |
45 |
+ einstalldocs |
46 |
+} |
47 |
+\end{verbatim} |
48 |
+ |
49 |
For other EAPIs, the default implementation used when the ebuild lacks the \t{src\_install} function |
50 |
is a no-op. |
51 |
|
52 |
@@ -338,7 +352,8 @@ is a no-op. |
53 |
\multicolumn{1}{c}{\textbf{Format}} \\ |
54 |
\midrule |
55 |
0, 1, 2, 3 & no-op \\ |
56 |
- 4, 5, 6 & 4 \\ |
57 |
+ 4, 5 & 4 \\ |
58 |
+ 6 & 6 \\ |
59 |
\bottomrule |
60 |
\end{tabular} |
61 |
\end{centertable} |
62 |
-- |
63 |
2.6.1 |