diff options
| -rw-r--r-- | pym/portage/const.py | 2 | ||||
| -rw-r--r-- | pym/portage/package/ebuild/doebuild.py | 9 |
2 files changed, 3 insertions, 8 deletions
diff --git a/pym/portage/const.py b/pym/portage/const.py index 1698c50cd..3dbe2df4a 100644 --- a/pym/portage/const.py +++ b/pym/portage/const.py @@ -94,7 +94,7 @@ SUPPORTED_FEATURES = frozenset([ "metadata-transfer", "mirror", "multilib-strict", "news", "noauto", "noclean", "nodoc", "noinfo", "noman", "nostrip", "notitles", "parallel-fetch", "parse-eapi-ebuild-head", - "parse-eapi-glep-55", "prelink-checksums", "preserve-libs", + "prelink-checksums", "preserve-libs", "protect-owned", "python-trace", "sandbox", "selinux", "sesandbox", "severe", "sfperms", "sign", "skiprocheck", "split-elog", "split-log", "splitdebug", diff --git a/pym/portage/package/ebuild/doebuild.py b/pym/portage/package/ebuild/doebuild.py index 77aec8da5..e1f34e755 100644 --- a/pym/portage/package/ebuild/doebuild.py +++ b/pym/portage/package/ebuild/doebuild.py @@ -217,13 +217,8 @@ def doebuild_environment(myebuild, mydo, myroot=None, settings=None, if noiselimit < 0: mysettings["PORTAGE_QUIET"] = "1" - if mydo == 'depend' and \ - 'EAPI' not in mysettings.configdict['pkg']: - - if eapi is not None: - # From parse-eapi-glep-55 above. - pass - elif 'parse-eapi-ebuild-head' in mysettings.features: + if mydo == 'depend' and 'EAPI' not in mysettings.configdict['pkg']: + if eapi is None and 'parse-eapi-ebuild-head' in mysettings.features: eapi = _parse_eapi_ebuild_head( codecs.open(_unicode_encode(ebuild_path, encoding=_encodings['fs'], errors='strict'), |