[gentoo-commits] proj/sci:master commit in: eclass/

[Andrew Ammerlaan]

commit:     555121f6fd88b94cc3afacd27841d36f06a08cb6
Author:     Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
AuthorDate: Sat Jan 30 10:03:34 2021 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
CommitDate: Sat Jan 30 10:03:34 2021 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=555121f6

eclass/numeric-int64-multibuild.eclass: use_if_iuse is deprecated

Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> riseup.net>

 eclass/numeric-int64-multibuild.eclass | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/eclass/numeric-int64-multibuild.eclass 
b/eclass/numeric-int64-multibuild.eclass
index f720356a3..6ed9c1158 100644
--- a/eclass/numeric-int64-multibuild.eclass
+++ b/eclass/numeric-int64-multibuild.eclass
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: numeric-int64-multilib.eclass
@@ -122,9 +122,9 @@ numeric-int64_get_module_name() {
        fi
        # choose posix threads over openmp when the two are set
        # yet to see the need of having the two profiles simultaneously
-       if use_if_iuse threads; then
+       if in_iuse threads && use threads; then
                module_name+="-threads"
-       elif use_if_iuse openmp; then
+       elif in_iuse openmp && use openmp; then
                module_name+="-openmp"
        fi
        echo "${module_name}"
@@ -239,7 +239,7 @@ numeric-int64_get_multibuild_int_variants() {
        debug-print-function ${FUNCNAME} "${@}"
        local MULTIBUILD_VARIANTS=( int32 ) variant
 
-       use_if_iuse int64 && MULTIBUILD_VARIANTS+=( int64 )
+       in_iuse int64 && use int64 && MULTIBUILD_VARIANTS+=( int64 )
 
        echo "${MULTIBUILD_VARIANTS[@]}"
 }
@@ -251,7 +251,7 @@ numeric-int64_get_multibuild_int_variants() {
 numeric-int64_get_multibuild_variants() {
        debug-print-function ${FUNCNAME} "${@}"
        local MULTIBUILD_VARIANTS=$(numeric-int64_get_multibuild_int_variants)
-       if use_if_iuse static-libs; then
+       if in_iuse static-libs && use static-libs; then
                for variant in ${MULTIBUILD_VARIANTS[@]}; do
                        MULTIBUILD_VARIANTS+=( static_${variant} )
                done