diff options
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/ebuild.sh | 42 | ||||
| -rwxr-xr-x | bin/isolated-functions.sh | 2 |
2 files changed, 8 insertions, 36 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() { diff --git a/bin/isolated-functions.sh b/bin/isolated-functions.sh index 0345bbead..831ed5332 100755 --- a/bin/isolated-functions.sh +++ b/bin/isolated-functions.sh @@ -546,7 +546,7 @@ save_ebuild_env() { for x in pkg_setup pkg_nofetch src_unpack src_prepare src_configure \ src_compile src_test src_install pkg_preinst pkg_postinst \ pkg_prerm pkg_postrm ; do - unset -f {,_}default_$x {,_}eapi{0,1,2}_$x + unset -f _default_$x _eapi{0,1,2}_$x done unset x |