In doebuild_environment, ensure that cached $KV from the backupenv does not

leak into the environment for EAPI >= 3.

svn path=/main/trunk/; revision=13658

diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py
index 1e2c9ceeb5b37364e6f55bf6a7a227c0d21d6a2b..f73d0cbb6711a309becc05ddba1bd15e9b587233 100644 (file)
--- a/pym/portage/__init__.py
+++ b/pym/portage/__init__.py
@@ -5428,6 +5428,8 @@ def doebuild_environment(myebuild, mydo, myroot, mysettings, debug, use_cache, m
                else:
                        mysettings["KV"]=""
                mysettings.backup_changes("KV")
+       elif eapi not in ("0", "1", "2"):
+               mysettings.pop("KV", None)
 
        # Allow color.map to control colors associated with einfo, ewarn, etc...
        mycolors = []