[gentoo-dev] [PATCH 1/3] Move wrapping conditionals to the wrapping functions.

[Michał Górny]

This way, we don't have to repeat them in each eclass involved, and we
make use of the low-level functions easier.
---
 eclass/cmake-multilib.eclass   | 9 +++------
 eclass/multilib-build.eclass   | 4 ++++
 eclass/multilib-minimal.eclass | 8 +++-----
 3 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/eclass/cmake-multilib.eclass b/eclass/cmake-multilib.eclass
index 02d6008..a6711bf 100644
--- a/eclass/cmake-multilib.eclass
+++ b/eclass/cmake-multilib.eclass
@@ -50,12 +50,9 @@ cmake-multilib_src_install() {
        cmake-multilib_secure_install() {
                cmake-utils_src_install "${@}"
 
-               # Do multilib magic only when >1 ABI is used.
-               if [[ ${#MULTIBUILD_VARIANTS[@]} -gt 1 ]]; then
-                       multilib_prepare_wrappers
-                       # Make sure all headers are the same for each ABI.
-                       multilib_check_headers
-               fi
+               multilib_prepare_wrappers
+               # Make sure all headers are the same for each ABI.
+               multilib_check_headers
        }
 
        multilib_foreach_abi cmake-multilib_secure_install "${@}"
diff --git a/eclass/multilib-build.eclass b/eclass/multilib-build.eclass
index 0ba54bf..02f9634 100644
--- a/eclass/multilib-build.eclass
+++ b/eclass/multilib-build.eclass
@@ -295,6 +295,8 @@ multilib_prepare_wrappers() {
 
        [[ ${#} -le 1 ]] || die "${FUNCNAME}: too many arguments"
 
+       [[ ${#MULTIBUILD_VARIANTS[@]} -le 1 ]] && return
+
        local root=${1:-${ED}}
        local f
 
@@ -419,6 +421,8 @@ multilib_install_wrappers() {
 
        [[ ${#} -le 1 ]] || die "${FUNCNAME}: too many arguments"
 
+       [[ ${#MULTIBUILD_VARIANTS[@]} -le 1 ]] && return
+
        local root=${1:-${ED}}
 
        if [[ -d "${ED}"/tmp/multilib-include ]]; then
diff --git a/eclass/multilib-minimal.eclass b/eclass/multilib-minimal.eclass
index 2fec9cf..4647127 100644
--- a/eclass/multilib-minimal.eclass
+++ b/eclass/multilib-minimal.eclass
@@ -108,11 +108,9 @@ multilib-minimal_src_install() {
                                emake DESTDIR="${D}" install
                        fi
                fi
-               # Do multilib magic only when >1 ABI is used.
-               if [[ ${#MULTIBUILD_VARIANTS[@]} -gt 1 ]]; then
-                       multilib_prepare_wrappers
-                       multilib_check_headers
-               fi
+
+               multilib_prepare_wrappers
+               multilib_check_headers
                popd >/dev/null || die
        }
        multilib_foreach_abi multilib-minimal_abi_src_install
-- 
1.9.2