From: Zac Medico <zmedico@gentoo.org>
Date: Sat, 4 Dec 2010 19:46:55 +0000 (-0800)
Subject: doebuild: set MERGE_TYPE for ebuild(1)
X-Git-Tag: v2.2.0_alpha7~8
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=b6366471b6d257c504db70350ae8ea37906afab0;p=portage.git

doebuild: set MERGE_TYPE for ebuild(1)
---

diff --git a/pym/portage/package/ebuild/doebuild.py b/pym/portage/package/ebuild/doebuild.py
index e1f34e755..6a232f364 100644
--- a/pym/portage/package/ebuild/doebuild.py
+++ b/pym/portage/package/ebuild/doebuild.py
@@ -39,7 +39,8 @@ from portage.data import portage_gid, portage_uid, secpass, \
 	uid, userpriv_groups
 from portage.dbapi.virtual import fakedbapi
 from portage.dep import Atom, paren_enclose, use_reduce
-from portage.eapi import eapi_exports_KV, eapi_exports_replace_vars, \
+from portage.eapi import eapi_exports_KV, eapi_exports_merge_type, \
+	eapi_exports_replace_vars, \
 	eapi_has_src_prepare_and_src_configure, eapi_has_pkg_pretend
 from portage.elog import elog_process
 from portage.elog.messages import eerror, eqawarn
@@ -638,6 +639,13 @@ def doebuild(myebuild, mydo, myroot, mysettings, debug=0, listonly=0,
 			if rval != os.EX_OK:
 				return rval
 
+		if eapi_exports_merge_type(mysettings["EAPI"]) and \
+			"MERGE_TYPE" not in mysettings.configdict["pkg"]:
+			if tree == "porttree":
+				mysettings.configdict["pkg"]["MERGE_TYPE"] = "source"
+			elif tree == "bintree":
+				mysettings.configdict["pkg"]["MERGE_TYPE"] = "binary"
+
 		if eapi_exports_replace_vars(mysettings["EAPI"]) and \
 			(mydo in ("pretend", "setup") or \
 			("noauto" not in features and not returnpid and \