From e1bc0b8512d80d4b80f8e5b1a96a9ec6af1433d7 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Wed, 11 Mar 2009 03:49:16 +0000 Subject: Remove support for deprecated 2_pre* EAPI values. (trunk r12594) svn path=/main/branches/2.1.6/; revision=12875 --- pym/_emerge/__init__.py | 5 +---- pym/portage/__init__.py | 6 +++--- 2 files changed, 4 insertions(+), 7 deletions(-) (limited to 'pym') diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py index 179c908aa..57509825b 100644 --- a/pym/_emerge/__init__.py +++ b/pym/_emerge/__init__.py @@ -2827,12 +2827,9 @@ class EbuildExecuter(CompositeTask): pkg = self.pkg phases = self._phases eapi = pkg.metadata["EAPI"] - if eapi in ("0", "1", "2_pre1"): + if eapi in ("0", "1"): # skip src_prepare and src_configure phases = phases[2:] - elif eapi in ("2_pre2",): - # skip src_prepare - phases = phases[1:] for phase in phases: ebuild_phases.add(EbuildPhase(background=self.background, diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py index 0f27e2b39..3331ae83b 100644 --- a/pym/portage/__init__.py +++ b/pym/portage/__init__.py @@ -4530,10 +4530,10 @@ def spawnebuild(mydo, actionmap, mysettings, debug, alwaysdep=0, eapi = mysettings["EAPI"] - if mydo == "configure" and eapi in ("0", "1", "2_pre1"): + if mydo == "configure" and eapi in ("0", "1"): return os.EX_OK - if mydo == "prepare" and eapi in ("0", "1", "2_pre1", "2_pre2"): + if mydo == "prepare" and eapi in ("0", "1"): return os.EX_OK kwargs = actionmap[mydo]["args"] @@ -4809,7 +4809,7 @@ def _spawn_misc_sh(mysettings, commands, **kwargs): eerror(l, phase=mydo, key=mysettings.mycpv) return rval -_deprecated_eapis = frozenset(["2_pre3", "2_pre2", "2_pre1"]) +_deprecated_eapis = frozenset() def _eapi_is_deprecated(eapi): return eapi in _deprecated_eapis -- cgit v1.2.3-1-g7c22