Remove remnants of parse-eapi-glep-55.

diff --git a/pym/portage/const.py b/pym/portage/const.py
index 883f5f42fa0f2da6876470bed356612cc17c54fd..2a0e90a9bb45113d603f7aba5479421cda37ac52 100644 (file)
--- 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 77aec8da539e683fa726214b282b2e20e6a2852e..e1f34e7553c9d7bdc2d24b5f4a910633cd69d5cd 100644 (file)
--- 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'),