[gentoo-dev] [PATCH 5/7] multilib-minimal: reuse multibuild phase function handlers.

[Michał Górny]

---
 gx86/eclass/multilib-minimal.eclass | 54 ++++++++++++-------------------------
 1 file changed, 17 insertions(+), 37 deletions(-)

diff --git a/gx86/eclass/multilib-minimal.eclass b/gx86/eclass/multilib-minimal.eclass
index 2510578..2a707b1 100644
--- a/gx86/eclass/multilib-minimal.eclass
+++ b/gx86/eclass/multilib-minimal.eclass
@@ -45,53 +45,33 @@ multilib-minimal_src_configure() {
 	}
 	multilib_foreach_abi _multilib-minimal_mkdir
 
-	multilib-minimal_abi_src_configure() {
-		if declare -f multilib_src_configure >/dev/null ; then
-			multilib_src_configure
-		else
-			default_src_configure
-		fi
-	}
-
-	multilib_foreach_abi _multilib-minimal_wrap_phase multilib-minimal_abi_src_configure
+	local phase=$(multibuild_get_phase_function multilib_src_configure)
+	multilib_foreach_abi \
+		_multilib-minimal_wrap_phase "${phase:-default_src_configure}"
 }
 
 multilib-minimal_src_compile() {
-	multilib-minimal_abi_src_compile() {
-		if declare -f multilib_src_compile >/dev/null ; then
-			multilib_src_compile
-		else
-			default_src_compile
-		fi
-	}
-
-	multilib_foreach_abi _multilib-minimal_wrap_phase multilib-minimal_abi_src_compile
+	local phase=$(multibuild_get_phase_function multilib_src_compile)
+	multilib_foreach_abi \
+		_multilib-minimal_wrap_phase "${phase:-default_src_compile}"
 }
 
 multilib-minimal_src_test() {
-	multilib-minimal_abi_src_test() {
-		if declare -f multilib_src_test >/dev/null ; then
-			multilib_src_test
-		else
-			default_src_test
-		fi
-	}
-
-	multilib_foreach_abi _multilib-minimal_wrap_phase multilib-minimal_abi_src_test
+	local phase=$(multibuild_get_phase_function multilib_src_test)
+	multilib_foreach_abi \
+		_multilib-minimal_wrap_phase "${phase:-default_src_test}"
 }
 
 multilib-minimal_src_install() {
-	multilib-minimal_abi_src_install() {
-		if declare -f multilib_src_install >/dev/null ; then
-			multilib_src_install
-		else
-			default_src_install	
-		fi
+	_multilib-minimal_wrap_install_phase() {
+		_multilib-minimal_wrap_phase "${@}"
 		multilib_check_headers
 	}
-	multilib_foreach_abi _multilib-minimal_wrap_phase multilib-minimal_abi_src_install
 
-	if declare -f multilib_src_install_all >/dev/null ; then
-		multilib_src_install_all
-	fi
+	local phase=$(multibuild_get_phase_function multilib_src_install)
+	multilib_foreach_abi \
+		_multilib-minimal_wrap_install_phase "${phase:-default_src_install}"
+
+	phase=$(multibuild_get_phase_function multilib_src_install_all)
+	[[ ${phase} ]] && "${phase}"
 }
-- 
1.8.1.5