pesa 15/06/11 18:33:54 Modified: ChangeLog qt4-build-multilib.eclass Log: Use usex().
Revision Changes Path 1.1652 eclass/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1652&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1652&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1651&r2=1.1652 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v retrieving revision 1.1651 retrieving revision 1.1652 diff -u -r1.1651 -r1.1652 --- ChangeLog 10 Jun 2015 18:08:02 -0000 1.1651 +++ ChangeLog 11 Jun 2015 18:33:54 -0000 1.1652 @@ -1,6 +1,9 @@ # ChangeLog for eclass directory # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1651 2015/06/10 18:08:02 grknight Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1652 2015/06/11 18:33:54 pesa Exp $ + + 11 Jun 2015; Davide Pesavento <p...@gentoo.org> qt4-build-multilib.eclass: + Use usex(). 10 Jun 2015; <grkni...@gentoo.org> mysql-multilib.eclass: Resolve cirucular dependency for bug 551686; Make USE=cluster die early for 1.20 eclass/qt4-build-multilib.eclass file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt4-build-multilib.eclass?rev=1.20&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt4-build-multilib.eclass?rev=1.20&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt4-build-multilib.eclass?r1=1.19&r2=1.20 Index: qt4-build-multilib.eclass =================================================================== RCS file: /var/cvsroot/gentoo-x86/eclass/qt4-build-multilib.eclass,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- qt4-build-multilib.eclass 9 Jun 2015 21:12:50 -0000 1.19 +++ qt4-build-multilib.eclass 11 Jun 2015 18:33:54 -0000 1.20 @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build-multilib.eclass,v 1.19 2015/06/09 21:12:50 pesa Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build-multilib.eclass,v 1.20 2015/06/11 18:33:54 pesa Exp $ # @ECLASS: qt4-build-multilib.eclass # @MAINTAINER: @@ -368,7 +368,7 @@ -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 @@ # @FUNCTION: qt_use # @USAGE: <flag> [feature] [enableval] # @DESCRIPTION: +# <flag> is the name of a flag in IUSE. +# # Outputs "-${enableval}-${feature}" if <flag> is enabled, "-no-${feature}" # otherwise. If [feature] is not specified, <flag> 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: <flag> [feature] [enableval] # @DESCRIPTION: +# <flag> is the name of a flag in IUSE. +# # Outputs "-${enableval}-${feature}" if <flag> is enabled and we are currently # building for the native ABI, "-no-${feature}" otherwise. If [feature] is not # specified, <flag> 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}" }
