diff options
Diffstat (limited to 'pym/portage/package')
| -rw-r--r-- | pym/portage/package/ebuild/config.py | 3 | ||||
| -rw-r--r-- | pym/portage/package/ebuild/doebuild.py | 6 |
2 files changed, 4 insertions, 5 deletions
diff --git a/pym/portage/package/ebuild/config.py b/pym/portage/package/ebuild/config.py index 38f15c081..32d65367e 100644 --- a/pym/portage/package/ebuild/config.py +++ b/pym/portage/package/ebuild/config.py @@ -776,9 +776,6 @@ class config(object): if bsd_chflags: self.features.add('chflags') - if 'parse-eapi-ebuild-head' in self.features: - portage._validate_cache_for_unsupported_eapis = False - self._iuse_implicit_match = _iuse_implicit_match_cache(self) self._validate_commands() diff --git a/pym/portage/package/ebuild/doebuild.py b/pym/portage/package/ebuild/doebuild.py index da30bda38..4f7d4a8a1 100644 --- a/pym/portage/package/ebuild/doebuild.py +++ b/pym/portage/package/ebuild/doebuild.py @@ -337,12 +337,14 @@ def doebuild_environment(myebuild, mydo, myroot=None, settings=None, # when uninstalling a package that has corrupt EAPI metadata. eapi = None if mydo == 'depend' and 'EAPI' not in mysettings.configdict['pkg']: - if eapi is None and 'parse-eapi-ebuild-head' in mysettings.features: + if eapi is None: with io.open(_unicode_encode(ebuild_path, encoding=_encodings['fs'], errors='strict'), mode='r', encoding=_encodings['content'], errors='replace') as f: - eapi = _parse_eapi_ebuild_head(f) + eapi, eapi_lineno = _parse_eapi_ebuild_head(f) + if eapi is None: + eapi = "0" if eapi is not None: if not eapi_is_supported(eapi): |