| 1 |
commit: 0baa17305a680cc62a629ccd8350a40b68aca9de |
| 2 |
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Aug 29 06:11:26 2012 +0000 |
| 4 |
Commit: Ulrich Mueller <ulm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Aug 29 06:11:26 2012 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/pms.git;a=commit;h=0baa1730 |
| 7 |
|
| 8 |
Revert "IMAGE is removed in EAPI 5." |
| 9 |
|
| 10 |
This reverts commit 489a60deede1a0d78edb545e97b0e17addaa6ab4. |
| 11 |
|
| 12 |
Conflicts: |
| 13 |
eapi-differences.tex |
| 14 |
ebuild-env-vars.tex |
| 15 |
|
| 16 |
--- |
| 17 |
eapi-differences.tex | 4 ---- |
| 18 |
ebuild-env-vars.tex | 20 +++++++++----------- |
| 19 |
2 files changed, 9 insertions(+), 15 deletions(-) |
| 20 |
|
| 21 |
diff --git a/eapi-differences.tex b/eapi-differences.tex |
| 22 |
index f35afc9..4c1cd5f 100644 |
| 23 |
--- a/eapi-differences.tex |
| 24 |
+++ b/eapi-differences.tex |
| 25 |
@@ -121,9 +121,6 @@ Parallel tests & \compactfeatureref{parallel-tests} & |
| 26 |
\t{KV} & \compactfeatureref{kv} & |
| 27 |
Yes & Yes & Yes & Yes & No & No \\ |
| 28 |
|
| 29 |
-\t{IMAGE} & \compactfeatureref{image} & |
| 30 |
- Yes & Yes & Yes & Yes & Yes & No \\ |
| 31 |
- |
| 32 |
\t{MERGE\_TYPE} & \compactfeatureref{merge-type} & |
| 33 |
No & No & No & No & Yes & Yes \\ |
| 34 |
|
| 35 |
@@ -278,7 +275,6 @@ EAPI 5 is EAPI 4 with the following changes: |
| 36 |
\item Slot operator dependencies, \featureref{slot-operator-deps}. |
| 37 |
\item \t{src\_test} supports parallel tests, \featureref{parallel-tests}. |
| 38 |
\item \t{USE} is calculated differently, \featureref{profile-iuse-injection}. |
| 39 |
-\item \t{IMAGE} is gone, \featureref{image}. |
| 40 |
\item \t{REQUIRED\_USE} now supports \t{??} groups, \featureref{at-most-one-of}. |
| 41 |
\item \t{SLOT} now supports an optional sub-slot part, \featureref{sub-slot}. |
| 42 |
\item \t{apply\_user\_patches} function, with \t{src\_prepare} changes, |
| 43 |
|
| 44 |
diff --git a/ebuild-env-vars.tex b/ebuild-env-vars.tex |
| 45 |
index 55cdb14..8064a75 100644 |
| 46 |
--- a/ebuild-env-vars.tex |
| 47 |
+++ b/ebuild-env-vars.tex |
| 48 |
@@ -154,8 +154,7 @@ variable. |
| 49 |
\t{IMAGE}\footnote{Deprecated in favour of \t{D}.} & |
| 50 |
\t{pkg\_preinst}, \t{pkg\_postinst} & |
| 51 |
Yes & |
| 52 |
- \featurelabel{image} Equal to \t{D}. Only for EAPIs listed in table~\ref{tab:removed-env-vars-table} as |
| 53 |
- supporting \t{IMAGE}. \\ |
| 54 |
+ Equal to \t{D}. \\ |
| 55 |
\t{INSDESTTREE} & |
| 56 |
\t{src\_install} & |
| 57 |
No & |
| 58 |
@@ -247,19 +246,18 @@ variable. |
| 59 |
|
| 60 |
\ChangeWhenAddingAnEAPI{5} |
| 61 |
\begin{centertable}{EAPIs supporting various removed env variables} \label{tab:removed-env-vars-table} |
| 62 |
- \begin{tabular}{ l l l l } |
| 63 |
+ \begin{tabular}{ l l l } |
| 64 |
\toprule |
| 65 |
\multicolumn{1}{c}{\textbf{EAPI}} & |
| 66 |
\multicolumn{1}{c}{\textbf{\t{AA}?}} & |
| 67 |
- \multicolumn{1}{c}{\textbf{\t{KV}?}} & |
| 68 |
- \multicolumn{1}{c}{\textbf{\t{IMAGE}?}} \\ |
| 69 |
+ \multicolumn{1}{c}{\textbf{\t{KV}?}} \\ |
| 70 |
\midrule |
| 71 |
- \t{0} & Yes & Yes & Yes \\ |
| 72 |
- \t{1} & Yes & Yes & Yes \\ |
| 73 |
- \t{2} & Yes & Yes & Yes \\ |
| 74 |
- \t{3} & Yes & Yes & Yes \\ |
| 75 |
- \t{4} & No & No & Yes \\ |
| 76 |
- \t{5} & No & No & No \\ |
| 77 |
+ \t{0} & Yes & Yes \\ |
| 78 |
+ \t{1} & Yes & Yes \\ |
| 79 |
+ \t{2} & Yes & Yes \\ |
| 80 |
+ \t{3} & Yes & Yes \\ |
| 81 |
+ \t{4} & No & No \\ |
| 82 |
+ \t{5} & No & No \\ |
| 83 |
\bottomrule |
| 84 |
\end{tabular} |
| 85 |
\end{centertable} |
Archives