diff options
| author | Zac Medico <zmedico@gentoo.org> | 2009-02-09 09:02:46 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2009-02-09 09:02:46 +0000 |
| commit | 4dc2dd7ee258cd06972c375fb6785a6a89d391d6 (patch) | |
| tree | bec81b90b0b0be32936d4181e5a4b3a6722ded89 | |
| parent | 7e2ea092be5eb4001cb7787b7528e0a379834ec2 (diff) | |
| download | portage-4dc2dd7ee258cd06972c375fb6785a6a89d391d6.tar.gz portage-4dc2dd7ee258cd06972c375fb6785a6a89d391d6.tar.bz2 portage-4dc2dd7ee258cd06972c375fb6785a6a89d391d6.zip | |
Remove support for deprecated 2_pre* EAPI values.
svn path=/main/trunk/; revision=12594
| -rwxr-xr-x | bin/ebuild.sh | 6 | ||||
| -rw-r--r-- | pym/_emerge/__init__.py | 5 | ||||
| -rw-r--r-- | pym/portage/__init__.py | 6 |
3 files changed, 7 insertions, 10 deletions
diff --git a/bin/ebuild.sh b/bin/ebuild.sh index 93558f39e..20bf0d389 100755 --- a/bin/ebuild.sh +++ b/bin/ebuild.sh @@ -1378,11 +1378,11 @@ _ebuild_arg_to_phase() { phase_func=src_unpack ;; prepare) - ! hasq $eapi 0 1 2_pre1 2_pre2 && \ + ! hasq $eapi 0 1 && \ phase_func=src_prepare ;; configure) - ! hasq $eapi 0 1 2_pre1 && \ + ! hasq $eapi 0 1 && \ phase_func=src_configure ;; compile) @@ -1428,7 +1428,7 @@ _ebuild_phase_funcs() { case $eapi in - 0|1|2_pre1) + 0|1) if [[ $(type -t src_compile) != function ]] ; then case $eapi in 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 |