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

["Ulrich Mueller" <ulm@gentoo.org>]

commit:     0baa17305a680cc62a629ccd8350a40b68aca9de
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 29 06:11:26 2012 +0000
Commit:     Ulrich Mueller <ulm <AT> gentoo <DOT> org>
CommitDate: Wed Aug 29 06:11:26 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/pms.git;a=commit;h=0baa1730

Revert "IMAGE is removed in EAPI 5."

This reverts commit 489a60deede1a0d78edb545e97b0e17addaa6ab4.

Conflicts:
	eapi-differences.tex
	ebuild-env-vars.tex

---
 eapi-differences.tex |    4 ----
 ebuild-env-vars.tex  |   20 +++++++++-----------
 2 files changed, 9 insertions(+), 15 deletions(-)

diff --git a/eapi-differences.tex b/eapi-differences.tex
index f35afc9..4c1cd5f 100644
--- a/eapi-differences.tex
+++ b/eapi-differences.tex
@@ -121,9 +121,6 @@ Parallel tests & \compactfeatureref{parallel-tests} &
 \t{KV} & \compactfeatureref{kv} &
     Yes & Yes & Yes & Yes & No & No \\
 
-\t{IMAGE} & \compactfeatureref{image} &
-    Yes & Yes & Yes & Yes & Yes & No \\
-
 \t{MERGE\_TYPE} & \compactfeatureref{merge-type} &
     No & No & No & No & Yes & Yes \\
 
@@ -278,7 +275,6 @@ EAPI 5 is EAPI 4 with the following changes:
 \item Slot operator dependencies, \featureref{slot-operator-deps}.
 \item \t{src\_test} supports parallel tests, \featureref{parallel-tests}.
 \item \t{USE} is calculated differently, \featureref{profile-iuse-injection}.
-\item \t{IMAGE} is gone, \featureref{image}.
 \item \t{REQUIRED\_USE} now supports \t{??} groups, \featureref{at-most-one-of}.
 \item \t{SLOT} now supports an optional sub-slot part, \featureref{sub-slot}.
 \item \t{apply\_user\_patches} function, with \t{src\_prepare} changes,

diff --git a/ebuild-env-vars.tex b/ebuild-env-vars.tex
index 55cdb14..8064a75 100644
--- a/ebuild-env-vars.tex
+++ b/ebuild-env-vars.tex
@@ -154,8 +154,7 @@ variable.
 \t{IMAGE}\footnote{Deprecated in favour of \t{D}.} &
     \t{pkg\_preinst}, \t{pkg\_postinst} &
     Yes &
-    \featurelabel{image} Equal to \t{D}. Only for EAPIs listed in table~\ref{tab:removed-env-vars-table} as
-    supporting \t{IMAGE}. \\
+    Equal to \t{D}. \\
 \t{INSDESTTREE} &
     \t{src\_install} &
     No &
@@ -247,19 +246,18 @@ variable.
 
 \ChangeWhenAddingAnEAPI{5}
 \begin{centertable}{EAPIs supporting various removed env variables} \label{tab:removed-env-vars-table}
-    \begin{tabular}{ l l l l }
+    \begin{tabular}{ l l l }
         \toprule
         \multicolumn{1}{c}{\textbf{EAPI}} &
         \multicolumn{1}{c}{\textbf{\t{AA}?}} &
-        \multicolumn{1}{c}{\textbf{\t{KV}?}} &
-        \multicolumn{1}{c}{\textbf{\t{IMAGE}?}} \\
+        \multicolumn{1}{c}{\textbf{\t{KV}?}} \\
         \midrule
-    \t{0} & Yes & Yes & Yes \\
-    \t{1} & Yes & Yes & Yes \\
-    \t{2} & Yes & Yes & Yes \\
-    \t{3} & Yes & Yes & Yes \\
-    \t{4} & No & No & Yes \\
-    \t{5} & No & No & No \\
+    \t{0} & Yes & Yes \\
+    \t{1} & Yes & Yes \\
+    \t{2} & Yes & Yes \\
+    \t{3} & Yes & Yes \\
+    \t{4} & No & No \\
+    \t{5} & No & No \\
     \bottomrule
     \end{tabular}
 \end{centertable}