diff options
author | Arfrever Frehtes Taifersar Arahesis <Arfrever@Gentoo.Org> | 2010-11-06 21:44:45 +0100 |
---|---|---|
committer | Zac Medico <zmedico@gentoo.org> | 2010-11-23 17:41:56 -0800 |
commit | 40c85cb8bdc54c154d915b1df39449a2f12705a5 (patch) | |
tree | 60ae2fd67acf32eb797f7869e1b8711ebfe7c6b6 | |
parent | c61d6a745029b688e4cbdd95499c6898569417c0 (diff) | |
download | portage-40c85cb8bdc54c154d915b1df39449a2f12705a5.tar.gz portage-40c85cb8bdc54c154d915b1df39449a2f12705a5.tar.bz2 portage-40c85cb8bdc54c154d915b1df39449a2f12705a5.zip |
Remove remnants of parse-eapi-glep-55.
-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 883f5f42f..2a0e90a9b 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'), |