[gentoo-dev] [PATCH 4/4] distutils-r1: reuse multibuild_for_best_variant.

[Michał Górny]

---
 gx86/eclass/distutils-r1.eclass | 25 ++++---------------------
 1 file changed, 4 insertions(+), 21 deletions(-)

diff --git a/gx86/eclass/distutils-r1.eclass b/gx86/eclass/distutils-r1.eclass
index 40dae36..ba48a35 100644
--- a/gx86/eclass/distutils-r1.eclass
+++ b/gx86/eclass/distutils-r1.eclass
@@ -549,11 +549,6 @@ distutils-r1_run_phase() {
        then
                popd >/dev/null || die
        fi
-
-       # Store them for reuse.
-       _DISTUTILS_BEST_IMPL=(
-               "${EPYTHON}" "${PYTHON}" "${BUILD_DIR}" "${PYTHONPATH}"
-       )
 }
 
 # @FUNCTION: _distutils-r1_run_common_phase
@@ -567,23 +562,11 @@ distutils-r1_run_phase() {
 _distutils-r1_run_common_phase() {
        local DISTUTILS_ORIG_BUILD_DIR=${BUILD_DIR}
 
-       local EPYTHON=${_DISTUTILS_BEST_IMPL[0]}
-       local PYTHON=${_DISTUTILS_BEST_IMPL[1]}
-       local BUILD_DIR=${_DISTUTILS_BEST_IMPL[2]}
-       local PYTHONPATH=${_DISTUTILS_BEST_IMPL[3]}
-
-       export EPYTHON PYTHON PYTHONPATH
-
-       if [[ ${DISTUTILS_IN_SOURCE_BUILD} ]]; then
-               pushd "${BUILD_DIR}"/.. >/dev/null || die
-       fi
+       local MULTIBUILD_VARIANTS
+       _python_obtain_impls
 
-       einfo "common: running ${1}"
-       "${@}"
-
-       if [[ ${DISTUTILS_IN_SOURCE_BUILD} ]]; then
-               popd >/dev/null || die
-       fi
+       multibuild_for_best_variant _python_multibuild_wrapper \
+               distutils-r1_run_phase "${@}"
 }
 
 # @FUNCTION: _distutils-r1_run_foreach_impl
-- 
1.8.1.4