From 4dc2dd7ee258cd06972c375fb6785a6a89d391d6 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Mon, 9 Feb 2009 09:02:46 +0000 Subject: Remove support for deprecated 2_pre* EAPI values. svn path=/main/trunk/; revision=12594 --- 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 036d9a0d8..cbd46b1d4 100644 --- a/pym/_emerge/__init__.py +++ b/pym/_emerge/__init__.py @@ -2846,12 +2846,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 5ac305817..f5646491f 100644 --- a/pym/portage/__init__.py +++ b/pym/portage/__init__.py @@ -4540,10 +4540,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"] @@ -4819,7 +4819,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