diff options
| author | Zac Medico <zmedico@gentoo.org> | 2008-08-08 12:02:51 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2008-08-08 12:02:51 +0000 |
| commit | 60d81bf66b9c4da25be357a32053c81d31d2f9a3 (patch) | |
| tree | 675083a9e84dc81035939a32190d01be92863e8a /bin | |
| parent | 07103829a1bf0d6faed52a5ac3bf7130967e3726 (diff) | |
| download | portage-60d81bf66b9c4da25be357a32053c81d31d2f9a3.tar.gz portage-60d81bf66b9c4da25be357a32053c81d31d2f9a3.tar.bz2 portage-60d81bf66b9c4da25be357a32053c81d31d2f9a3.zip | |
Rename the eapi2_pre2_* functions to just eapi2_* and document all the
new eapi* functions.
svn path=/main/trunk/; revision=11351
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/ebuild.sh | 16 | ||||
| -rwxr-xr-x | bin/isolated-functions.sh | 2 |
2 files changed, 9 insertions, 9 deletions
diff --git a/bin/ebuild.sh b/bin/ebuild.sh index 734dd0ad6..c829eac83 100755 --- a/bin/ebuild.sh +++ b/bin/ebuild.sh @@ -1435,7 +1435,7 @@ _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_pre1 ; do + 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\" }" @@ -1472,12 +1472,12 @@ _ebuild_phase_funcs() { eapi1_src_test () { _eapi0_src_test "$@" ; } eapi1_src_install () { _eapi0_src_install "$@" ; } - eapi2_pre2_pkg_nofetch () { _eapi0_pkg_nofetch "$@" ; } - eapi2_pre2_src_unpack () { _eapi0_src_unpack "$@" ; } - eapi2_pre2_src_configure () { _eapi2_src_configure "$@" ; } - eapi2_pre2_src_compile () { _eapi2_src_compile "$@" ; } - eapi2_pre2_src_test () { _eapi0_src_test "$@" ; } - eapi2_pre2_src_install () { _eapi0_src_install "$@" ; } + eapi2_pkg_nofetch () { _eapi0_pkg_nofetch "$@" ; } + eapi2_src_unpack () { _eapi0_src_unpack "$@" ; } + eapi2_src_configure () { _eapi2_src_configure "$@" ; } + eapi2_src_compile () { _eapi2_src_compile "$@" ; } + eapi2_src_test () { _eapi0_src_test "$@" ; } + eapi2_src_install () { _eapi0_src_install "$@" ; } for x in $default_phases ; do eval "default_$x() { eapi${eapi}_$x \"\$@\" ; }" @@ -1491,7 +1491,7 @@ _ebuild_phase_funcs() { eval "default_$x() { die \"default_$x() is not supported in phase $default_func\" }" - for y in 0 1 2_pre2 ; do + 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\" }" diff --git a/bin/isolated-functions.sh b/bin/isolated-functions.sh index 85a478e6b..e52c9fd7c 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_configure \ src_compile src_test src_install pkg_preinst pkg_postinst \ pkg_prerm pkg_postrm ; do - unset -f {,_}default_$x {,_}eapi{0,1,2,2_pre1,2_pre2}_$x + unset -f {,_}default_$x {,_}eapi{0,1,2}_$x done unset x |