Remove support for deprecated 2_pre* EAPI values. (trunk r12594)

svn path=/main/branches/2.1.6/; revision=12875

diff --git a/bin/ebuild.sh b/bin/ebuild.sh
index 93558f39e2ec2dccfa716a1a1052b01d5a13fa06..20bf0d389d059294f87de75bb9c52ce80253402b 100755 (executable)
--- 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 179c908aa2461353d2b0a11c917fe626292cb6df..57509825bff10c97dbd01eaac1ae0391621e9b38 100644 (file)
--- 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 0f27e2b39aaf869611888a21b9f5789340132eff..3331ae83b301495389a9740553e134846b879888 100644 (file)
--- 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