diff options
Diffstat (limited to 'pym/portage/package/ebuild/config.py')
| -rw-r--r-- | pym/portage/package/ebuild/config.py | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/pym/portage/package/ebuild/config.py b/pym/portage/package/ebuild/config.py index 1a749fc0e..b63cff145 100644 --- a/pym/portage/package/ebuild/config.py +++ b/pym/portage/package/ebuild/config.py @@ -34,7 +34,8 @@ from portage.dbapi import dbapi from portage.dbapi.porttree import portdbapi from portage.dbapi.vartree import vartree from portage.dep import Atom, isvalidatom, match_from_list, use_reduce -from portage.eapi import eapi_exports_AA, eapi_supports_prefix, eapi_exports_replace_vars +from portage.eapi import eapi_exports_AA, eapi_exports_merge_type, \ + eapi_supports_prefix, eapi_exports_replace_vars from portage.env.loaders import KeyValuePairFileLoader from portage.exception import InvalidDependString, PortageException from portage.localization import _ @@ -2103,6 +2104,9 @@ class config(object): if not eapi_exports_AA(eapi): mydict.pop("AA", None) + if not eapi_exports_merge_type(eapi): + mydict.pop("MERGE_TYPE", None) + # Prefix variables are supported starting with EAPI 3. if phase == 'depend' or eapi is None or not eapi_supports_prefix(eapi): mydict.pop("ED", None) |