summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xbin/ebuild.sh42
-rwxr-xr-xbin/isolated-functions.sh2
-rw-r--r--doc/package/ebuild/eapi/2.docbook58
3 files changed, 8 insertions, 94 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
diff --git a/doc/package/ebuild/eapi/2.docbook b/doc/package/ebuild/eapi/2.docbook
index b1c6ae511..ceec15ccf 100644
--- a/doc/package/ebuild/eapi/2.docbook
+++ b/doc/package/ebuild/eapi/2.docbook
@@ -203,64 +203,6 @@ src_compile() {
</tbody>
</tgroup>
</table>
- <para>
- The default phase functions for a particular EAPI are also
- accessible as functions having names that start with 'eapi'
- followed by the EAPI value. For example, a call to a function
- named eapi0_src_compile is equivalent to a call to the
- default src_compile implementation that is provided with EAPI 0.
- </para>
- <table><title>Default EAPI Phase Functions</title>
- <tgroup cols='1' align='left' >
- <colspec colname='name'/>
- <thead>
- <row>
- <entry>Function Name</entry>
- </row>
- </thead>
- <tbody>
- <row>
- <entry>eapi0_pkg_nofetch</entry>
- </row>
- <row>
- <entry>eapi0_src_unpack</entry>
- </row>
- <row>
- <entry>eapi0_src_compile</entry>
- </row>
- <row>
- <entry>eapi0_src_test</entry>
- </row>
- <row>
- <entry>eapi1_pkg_nofetch</entry>
- </row>
- <row>
- <entry>eapi1_src_unpack</entry>
- </row>
- <row>
- <entry>eapi1_src_compile</entry>
- </row>
- <row>
- <entry>eapi1_src_test</entry>
- </row>
- <row>
- <entry>eapi2_pkg_nofetch</entry>
- </row>
- <row>
- <entry>eapi2_src_unpack</entry>
- </row>
- <row>
- <entry>eapi2_src_configure</entry>
- </row>
- <row>
- <entry>eapi2_src_compile</entry>
- </row>
- <row>
- <entry>eapi2_src_test</entry>
- </row>
- </tbody>
- </tgroup>
- </table>
</section>
<section id='package-ebuild-eapi-2-phases-default-function-alias'>
<title>Default Phase Function Alias</title>