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

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

commit:     489a60deede1a0d78edb545e97b0e17addaa6ab4
Author:     Ciaran McCreesh <ciaran.mccreesh <AT> googlemail <DOT> com>
AuthorDate: Sun May  6 16:52:55 2012 +0000
Commit:     Ulrich Mueller <ulm <AT> gentoo <DOT> org>
CommitDate: Thu May 17 10:31:29 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/pms.git;a=commit;h=489a60de

IMAGE is removed in EAPI 5.

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

diff --git a/eapi-differences.tex b/eapi-differences.tex
index e617811..e94684e 100644
--- a/eapi-differences.tex
+++ b/eapi-differences.tex
@@ -109,6 +109,9 @@ Use dependencies & \compactfeatureref{use-deps} &
 \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 \\
 
@@ -251,6 +254,7 @@ EAPI 5 is EAPI 4 with the following changes:
 \item \t{econf} adds \t{-{}-disable-silent-rules}, \featureref{econf-options}.
 \item Slot operator dependencies, \featureref{slot-operator-deps}.
 \item \t{USE} is calculated differently, \featureref{profile-iuse-injection}.
+\item \t{IMAGE} is gone, \featureref{image}.
 \end{compactitem}
 
 \ChangeWhenAddingAnEAPI{5}

diff --git a/ebuild-env-vars.tex b/ebuild-env-vars.tex
index 450542a..fdffa42 100644
--- a/ebuild-env-vars.tex
+++ b/ebuild-env-vars.tex
@@ -154,7 +154,8 @@ variable.
 \t{IMAGE}\footnote{Deprecated in favour of \t{D}.} &
     \t{pkg\_preinst}, \t{pkg\_postinst} &
     Yes &
-    Equal to \t{D}. \\
+    \featurelabel{image} Equal to \t{D}. Only for EAPIs listed in table~\ref{tab:env-vars-table} as
+    supporting \t{IMAGE}. \\
 \t{INSDESTTREE} &
     \t{src\_install} &
     No &
@@ -216,21 +217,22 @@ variable.
 
 \ChangeWhenAddingAnEAPI{5}
 \begin{centertable}{EAPIs supporting various env variables} \label{tab:env-vars-table}
-    \begin{tabular}{ l l l l l l }
+    \begin{tabular}{ l l l l 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{MERGE\_TYPE}?}} &
         \multicolumn{1}{c}{\textbf{\t{REPLACING\_VERSIONS}?}} &
-        \multicolumn{1}{c}{\textbf{\t{REPLACED\_BY\_VERSION}?}} \\
+        \multicolumn{1}{c}{\textbf{\t{REPLACED\_BY\_VERSION}?}} &
+        \multicolumn{1}{c}{\textbf{\t{IMAGE}?}} \\
         \midrule
-    \t{0} & Yes & Yes & No & No & No \\
-    \t{1} & Yes & Yes & No & No & No \\
-    \t{2} & Yes & Yes & No & No & No \\
-    \t{3} & Yes & Yes & No & No & No \\
-    \t{4} & No & No & Yes & Yes & Yes \\
-    \t{5} & No & No & Yes & Yes & Yes \\
+    \t{0} & Yes & Yes & No & No & No & Yes \\
+    \t{1} & Yes & Yes & No & No & No & Yes \\
+    \t{2} & Yes & Yes & No & No & No & Yes \\
+    \t{3} & Yes & Yes & No & No & No & Yes \\
+    \t{4} & No & No & Yes & Yes & Yes & Yes \\
+    \t{5} & No & No & Yes & Yes & Yes & No \\
     \bottomrule
     \end{tabular}
 \end{centertable}