From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id E717A13835A for ; Sat, 30 Jan 2021 10:04:35 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3B9E4E0ADB; Sat, 30 Jan 2021 10:04:35 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id D6BB6E0ADB for ; Sat, 30 Jan 2021 10:04:34 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id C40B5340E70 for ; Sat, 30 Jan 2021 10:04:33 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 66199476 for ; Sat, 30 Jan 2021 10:04:32 +0000 (UTC) From: "Andrew Ammerlaan" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andrew Ammerlaan" Message-ID: <1612001014.555121f6fd88b94cc3afacd27841d36f06a08cb6.andrewammerlaan@gentoo> Subject: [gentoo-commits] proj/sci:master commit in: eclass/ X-VCS-Repository: proj/sci X-VCS-Files: eclass/numeric-int64-multibuild.eclass X-VCS-Directories: eclass/ X-VCS-Committer: andrewammerlaan X-VCS-Committer-Name: Andrew Ammerlaan X-VCS-Revision: 555121f6fd88b94cc3afacd27841d36f06a08cb6 X-VCS-Branch: master Date: Sat, 30 Jan 2021 10:04:32 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 453a5dda-ad66-4f58-b6f7-9b6ca8fa8aa7 X-Archives-Hash: 3a471e0204792a86c10c16ef0d56ec31 commit: 555121f6fd88b94cc3afacd27841d36f06a08cb6 Author: Andrew Ammerlaan riseup net> AuthorDate: Sat Jan 30 10:03:34 2021 +0000 Commit: Andrew Ammerlaan riseup 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 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