Fixed naming the proper default sub-phase and declaring 'edefault'
in python_prepare_all().
---
gx86/eclass/distutils-r1.eclass | 22 ++++++++++++++++++++++
1 file changed, 22 insertions(+)
diff --git a/gx86/eclass/distutils-r1.eclass b/gx86/eclass/distutils-r1.eclass
index 47b5b97..e5c2a3a 100644
--- a/gx86/eclass/distutils-r1.eclass
+++ b/gx86/eclass/distutils-r1.eclass
@@ -206,6 +206,20 @@ fi
# }
# @CODE
+# @FUNCTION: edefault
+# @USAGE: [<args>...]
+# @DESCRIPTION:
+# Runs the default distutils-r1 sub-phase implementation for the current
+# sub-phase. Available only in distutils-r1 sub-phases.
+#
+# Example:
+# @CODE
+# python_install_all() {
+# use doc && local HTML_DOCS=( doc/html/. )
+# edefault # == distutils-r1_python_install_all
+# }
+# @CODE
+
# @FUNCTION: esetup.py
# @USAGE: [<args>...]
# @DESCRIPTION:
@@ -515,8 +529,12 @@ distutils-r1_run_phase() {
mkdir -p "${TMPDIR}" || die
+ eval "edefault() { distutils-r1_${1}; }"
+
"${@}"
+ unset -f edefault
+
if [[ ${DISTUTILS_IN_SOURCE_BUILD} && ! ${DISTUTILS_SINGLE_IMPL} ]]
then
popd >/dev/null || die
@@ -579,7 +597,11 @@ distutils-r1_src_prepare() {
# common preparations
if declare -f python_prepare_all >/dev/null; then
+ eval "edefault() { distutils-r1_python_prepare_all; }"
+
python_prepare_all
+
+ unset -f edefault
else
distutils-r1_python_prepare_all
fi
--
1.8.2.1
