Remove everything related to the eapi* default phase functions since they

are not included in the current EAPI 2 draft.

svn path=/main/trunk/; revision=11515

1 files changed, 7 insertions, 35 deletions

diff --git a/bin/ebuild.sh b/bin/ebuild.sh
index 13e0e2243..2d87d404a 100755
--- a/bin/ebuild.sh
+++ b/bin/ebuild.sh
@@ -1448,11 +1448,6 @@ _ebuild_phase_funcs() {
 				eval "default_$x() {
 					die \"default_$x() is not supported with EAPI='$eapi' during phase $phase_func\"
 				}"
-				for y in 0 1 2 ; do
-					eval "eapi${y}_$x() {
-						die \"eapi${y}_$x() is not supported with EAPI='$eapi' during phase $phase_func\"
-					}"
-				done
 			done
 
 			eval "default() {
@@ -1471,35 +1466,17 @@ _ebuild_phase_funcs() {
 
 			if hasq $phase_func $default_phases ; then
 
-				eapi0_pkg_nofetch   () { _eapi0_pkg_nofetch   "$@" ; }
-				eapi0_src_unpack    () { _eapi0_src_unpack    "$@" ; }
-				eapi0_src_prepare   () { die "$FUNCNAME is not supported" ; }
-				eapi0_src_configure () { die "$FUNCNAME is not supported" ; }
-				eapi0_src_compile   () { _eapi0_src_compile   "$@" ; }
-				eapi0_src_test      () { _eapi0_src_test      "$@" ; }
-				eapi0_src_install   () { die "$FUNCNAME is not supported" ; }
-
-				eapi1_pkg_nofetch   () { _eapi0_pkg_nofetch   "$@" ; }
-				eapi1_src_unpack    () { _eapi0_src_unpack    "$@" ; }
-				eapi1_src_prepare   () { die "$FUNCNAME is not supported" ; }
-				eapi1_src_configure () { die "$FUNCNAME is not supported" ; }
-				eapi1_src_compile   () { _eapi1_src_compile   "$@" ; }
-				eapi1_src_test      () { _eapi0_src_test      "$@" ; }
-				eapi1_src_install   () { die "$FUNCNAME is not supported" ; }
-
-				eapi2_pkg_nofetch   () { _eapi0_pkg_nofetch   "$@" ; }
-				eapi2_src_unpack    () { _eapi0_src_unpack    "$@" ; }
-				eapi2_src_prepare   () { true ; }
-				eapi2_src_configure () { _eapi2_src_configure "$@" ; }
-				eapi2_src_compile   () { _eapi2_src_compile   "$@" ; }
-				eapi2_src_test      () { _eapi0_src_test      "$@" ; }
-				eapi2_src_install   () { die "$FUNCNAME is not supported" ; }
+				_eapi2_pkg_nofetch   () { _eapi0_pkg_nofetch          "$@" ; }
+				_eapi2_src_unpack    () { _eapi0_src_unpack           "$@" ; }
+				_eapi2_src_prepare   () { true                             ; }
+				_eapi2_src_test      () { _eapi0_src_test             "$@" ; }
+				_eapi2_src_install   () { die "$FUNCNAME is not supported" ; }
 
 				for x in $default_phases ; do
-					eval "default_$x() { eapi2_$x \"\$@\" ; }"
+					eval "default_$x() { _eapi2_$x \"\$@\" ; }"
 				done
 
-				eval "default() { eapi2_$phase_func \"\$@\" ; }"
+				eval "default() { _eapi2_$phase_func \"\$@\" ; }"
 
 			else
 
@@ -1507,11 +1484,6 @@ _ebuild_phase_funcs() {
 					eval "default_$x() {
 						die \"default_$x() is not supported in phase $default_func\"
 					}"
-					for y in 0 1 2 ; do
-						eval "eapi${y}_$x() {
-							die \"eapi${y}_$x() is not supported with EAPI='$eapi' during phase $phase_func\"
-						}"
-					done
 				done
 
 				eval "default() {