summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xbin/ebuild.sh16
-rwxr-xr-xbin/isolated-functions.sh2
-rw-r--r--doc/package/ebuild/eapi/2.docbook87
3 files changed, 94 insertions, 11 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
diff --git a/doc/package/ebuild/eapi/2.docbook b/doc/package/ebuild/eapi/2.docbook
index 275ab71ef..cf511893a 100644
--- a/doc/package/ebuild/eapi/2.docbook
+++ b/doc/package/ebuild/eapi/2.docbook
@@ -155,13 +155,96 @@
<sect3 id='package-ebuild-eapi-2-phases-default-functions'>
<title>Default Phase Functions</title>
<para>
- Each of the default src_* phase functions is now accessible
- via a function having a name that begins with default_ and
+ The default pkg_nofetch and src_* phase functions are now
+ accessible via a function having a name
+ that begins with default_ and
ends with the respective phase function name. For example,
a call to a function with the name default_src_compile is
equivalent to a call to the default src_compile
implementation.
</para>
+ <table><title>Default Phase Functions</title>
+ <tgroup cols='1' align='left' >
+ <colspec colname='name'/>
+ <thead>
+ <row>
+ <entry>Function Name</entry>
+ </row>
+ </thead>
+ <tbody>
+ <row>
+ <entry>default_pkg_nofetch</entry>
+ </row>
+ <row>
+ <entry>default_src_unpack</entry>
+ </row>
+ <row>
+ <entry>default_src_compile</entry>
+ </row>
+ <row>
+ <entry>default_src_test</entry>
+ </row>
+ </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>
</sect3>
<sect3 id='package-ebuild-eapi-2-phases-default-function-alias'>
<title>Default Phase Function Alias</title>