From 0b7b28e37cfcc867598f0a952e08917a956ccecb Mon Sep 17 00:00:00 2001
From: Ulrich Mueller <ulm@gentoo.org>
Date: Wed, 1 Dec 2010 22:22:25 +0100
Subject: [PATCH] MERGE_TYPE variable in EAPI 4, bug 347351.

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

diff --git a/eapi-differences.tex b/eapi-differences.tex
index 2cc4349..1cd028e 100644
--- a/eapi-differences.tex
+++ b/eapi-differences.tex
@@ -100,6 +100,9 @@ Use dependencies & \compactfeatureref{use-deps} &
 \t{KV} & \compactfeatureref{kv} &
     Yes & Yes & Yes & Yes & No \\
 
+\t{MERGE\_TYPE} & \compactfeatureref{merge-type} &
+    No & No & No & No & Yes \\
+
 \t{REPLACING\_VERSIONS} & \compactfeatureref{replace-version-vars} &
     No & No & No & No & Yes \\
 
@@ -216,6 +219,7 @@ EAPI 4 is EAPI 3 with the following changes:
 \item \t{AA} is gone, \featureref{aa}.
 \item \t{KV} is gone, \featureref{kv}.
 \item \t{USE} is calculated differently, \featureref{profile-iuse-injection}.
+\item \t{MERGE\_TYPE}, \featureref{merge-type}.
 \item \t{REPLACING\_VERSIONS} and \t{REPLACED\_BY\_VERSION}, \featureref{replace-version-vars}.
 \item Utilities now die on failure, \featureref{die-on-failure}, unless called under \t{nonfatal},
     \featureref{nonfatal}
diff --git a/ebuild-env-vars.tex b/ebuild-env-vars.tex
index f96b203..87333f2 100644
--- a/ebuild-env-vars.tex
+++ b/ebuild-env-vars.tex
@@ -180,6 +180,13 @@ variable.
     \featurelabel{kv} The version of the running kernel at the time the ebuild was first executed,
     as returned by the \t{uname~-r} command or equivalent.  May be modified by ebuilds.  Only for
     EAPIs listed in table~\ref{tab:env-vars-table} as supporting \t{KV}. \\
+\t{MERGE\_TYPE} &
+    \t{pkg\_*} &
+    No &
+    \featurelabel{merge-type} The type of package that is being merged. Possible values are:
+    \t{source} if building and installing a package from source, \t{binary} if installing a binary
+    package, and \t{buildonly} if building a binary package without installing it. Only for EAPIs
+    listed in table~\ref{tab:env-vars-table} as supporting \t{MERGE\_TYPE}. \\
 \t{REPLACING\_VERSIONS} &
     \t{pkg\_*} (see text) &
     Yes &
@@ -198,19 +205,20 @@ variable.
 \end{landscape}
 
 \begin{centertable}{EAPIs supporting various env variables} \label{tab:env-vars-table}
-    \begin{tabular}{ l l l l l }
+    \begin{tabular}{ 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}?}} \\
         \midrule
-    \t{0} & Yes & Yes & No & No \\
-    \t{1} & Yes & Yes & No & No \\
-    \t{2} & Yes & Yes & No & No \\
-    \t{3} & Yes & Yes & No & No \\
-    \t{4} & No & No & Yes & Yes \\
+    \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 \\
     \bottomrule
     \end{tabular}
 \end{centertable}
-- 
1.7.3.2