[gentoo-commits] portage r12875 - in main/branches/2.1.6: bin pym/_emerge pym/portage

[gentoo-commits] portage r12875 - in main/branches/2.1.6: bin pym/_emerge pym/portage

[Zac Medico (zmedico)]

Author: zmedico
Date: 2009-03-11 03:49:16 +0000 (Wed, 11 Mar 2009)
New Revision: 12875

Modified:
   main/branches/2.1.6/bin/ebuild.sh
   main/branches/2.1.6/pym/_emerge/__init__.py
   main/branches/2.1.6/pym/portage/__init__.py
Log:
Remove support for deprecated 2_pre* EAPI values. (trunk r12594)

Modified: main/branches/2.1.6/bin/ebuild.sh
===================================================================
--- main/branches/2.1.6/bin/ebuild.sh	2009-03-11 03:48:50 UTC (rev 12874)
+++ main/branches/2.1.6/bin/ebuild.sh	2009-03-11 03:49:16 UTC (rev 12875)
@@ -1378,11 +1378,11 @@
 			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 @@
 
 	case $eapi in
 
-		0|1|2_pre1)
+		0|1)
 
 			if [[ $(type -t src_compile) != function ]] ; then
 				case $eapi in

Modified: main/branches/2.1.6/pym/_emerge/__init__.py
===================================================================
--- main/branches/2.1.6/pym/_emerge/__init__.py	2009-03-11 03:48:50 UTC (rev 12874)
+++ main/branches/2.1.6/pym/_emerge/__init__.py	2009-03-11 03:49:16 UTC (rev 12875)
@@ -2827,12 +2827,9 @@
 		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,

Modified: main/branches/2.1.6/pym/portage/__init__.py
===================================================================
--- main/branches/2.1.6/pym/portage/__init__.py	2009-03-11 03:48:50 UTC (rev 12874)
+++ main/branches/2.1.6/pym/portage/__init__.py	2009-03-11 03:49:16 UTC (rev 12875)
@@ -4530,10 +4530,10 @@
 
 	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 @@
 			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