From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 811C5138CDB for ; Thu, 11 Jun 2015 00:21:46 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id F4102E087E; Thu, 11 Jun 2015 00:21:40 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 90883E087E for ; Thu, 11 Jun 2015 00:21:40 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 63AED340C96 for ; Thu, 11 Jun 2015 00:21:39 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 4F3569A2 for ; Thu, 11 Jun 2015 00:21:37 +0000 (UTC) From: "Davide Pesavento" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Davide Pesavento" Message-ID: <1433982067.4e6b7334a6b4e7ab026a8e49edb04250ebb429cd.pesa@gentoo> Subject: [gentoo-commits] proj/qt:master commit in: eclass/ X-VCS-Repository: proj/qt X-VCS-Files: eclass/qt4-build-multilib.eclass X-VCS-Directories: eclass/ X-VCS-Committer: pesa X-VCS-Committer-Name: Davide Pesavento X-VCS-Revision: 4e6b7334a6b4e7ab026a8e49edb04250ebb429cd X-VCS-Branch: master Date: Thu, 11 Jun 2015 00:21:37 +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-Archives-Salt: b0086a02-39d7-4d5a-9440-fa0e88c52639 X-Archives-Hash: f93f4c614004373aeb02fb9249aadc45 commit: 4e6b7334a6b4e7ab026a8e49edb04250ebb429cd Author: Davide Pesavento gentoo org> AuthorDate: Thu Jun 11 00:21:07 2015 +0000 Commit: Davide Pesavento gentoo org> CommitDate: Thu Jun 11 00:21:07 2015 +0000 URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=4e6b7334 [qt4-build-multilib.eclass] Use usex(). eclass/qt4-build-multilib.eclass | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/eclass/qt4-build-multilib.eclass b/eclass/qt4-build-multilib.eclass index 5b6cc95..078b61c 100644 --- a/eclass/qt4-build-multilib.eclass +++ b/eclass/qt4-build-multilib.eclass @@ -368,7 +368,7 @@ qt4_multilib_src_configure() { -nomake demos # disable rpath on non-prefix (bugs 380415 and 417169) - $(use prefix || echo -no-rpath) + $(usex prefix '' -no-rpath) # verbosity of the configure and build phases -verbose $(${QT4_VERBOSE_BUILD} || echo -silent) @@ -531,22 +531,30 @@ qt4-build-multilib_pkg_postrm() { # @FUNCTION: qt_use # @USAGE: [feature] [enableval] # @DESCRIPTION: +# is the name of a flag in IUSE. +# # Outputs "-${enableval}-${feature}" if is enabled, "-no-${feature}" # otherwise. If [feature] is not specified, is used in its place. # If [enableval] is not specified, the "-${enableval}" prefix is omitted. qt_use() { - use "$1" && echo "${3:+-$3}-${2:-$1}" || echo "-no-${2:-$1}" + [[ $# -ge 1 ]] || die "${FUNCNAME}() requires at least one argument" + + usex "$1" "${3:+-$3}-${2:-$1}" "-no-${2:-$1}" } # @FUNCTION: qt_native_use # @USAGE: [feature] [enableval] # @DESCRIPTION: +# is the name of a flag in IUSE. +# # Outputs "-${enableval}-${feature}" if is enabled and we are currently # building for the native ABI, "-no-${feature}" otherwise. If [feature] is not # specified, is used in its place. If [enableval] is not specified, # the "-${enableval}" prefix is omitted. qt_native_use() { - multilib_is_native_abi && use "$1" && echo "${3:+-$3}-${2:-$1}" || echo "-no-${2:-$1}" + [[ $# -ge 1 ]] || die "${FUNCNAME}() requires at least one argument" + + multilib_is_native_abi && qt_use "$@" || echo "-no-${2:-$1}" }