Gentoo Archives: gentoo-commits

From: Davide Pesavento <pesa@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/qt:master commit in: eclass/
Date: Sun, 22 Jun 2014 18:28:20
Message-Id: 1403461606.5a8c47c59332c1a7d63cca6878575b61ea22773f.pesa@gentoo
1 commit: 5a8c47c59332c1a7d63cca6878575b61ea22773f
2 Author: Davide Pesavento <pesa <AT> gentoo <DOT> org>
3 AuthorDate: Sun Jun 22 18:26:46 2014 +0000
4 Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org>
5 CommitDate: Sun Jun 22 18:26:46 2014 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=5a8c47c5
7
8 [qt4-build-multilib] Provide qt_native_use() convenience function.
9
10 ---
11 eclass/qt4-build-multilib.eclass | 18 ++++++++++++++----
12 1 file changed, 14 insertions(+), 4 deletions(-)
13
14 diff --git a/eclass/qt4-build-multilib.eclass b/eclass/qt4-build-multilib.eclass
15 index efa501c..c4a5562 100644
16 --- a/eclass/qt4-build-multilib.eclass
17 +++ b/eclass/qt4-build-multilib.eclass
18 @@ -470,14 +470,24 @@ qt4-build-multilib_pkg_postrm() {
19 # @FUNCTION: qt_use
20 # @USAGE: <flag> [feature] [enableval]
21 # @DESCRIPTION:
22 -# This will echo "-${enableval}-${feature}" if <flag> is enabled, or
23 -# "-no-${feature}" if it's disabled. If [feature] is not specified,
24 -# <flag> will be used for that. If [enableval] is not specified, the
25 -# "-${enableval}" prefix is omitted.
26 +# Outputs "-${enableval}-${feature}" if <flag> is enabled, "-no-${feature}"
27 +# otherwise. If [feature] is not specified, <flag> is used in its place.
28 +# If [enableval] is not specified, the "-${enableval}" prefix is omitted.
29 qt_use() {
30 use "$1" && echo "${3:+-$3}-${2:-$1}" || echo "-no-${2:-$1}"
31 }
32
33 +# @FUNCTION: qt_native_use
34 +# @USAGE: <flag> [feature] [enableval]
35 +# @DESCRIPTION:
36 +# Outputs "-${enableval}-${feature}" if <flag> is enabled and we are currently
37 +# building for the native ABI, "-no-${feature}" otherwise. If [feature] is not
38 +# specified, <flag> is used in its place. If [enableval] is not specified,
39 +# the "-${enableval}" prefix is omitted.
40 +qt_native_use() {
41 + multilib_is_native_abi && use "$1" && echo "${3:+-$3}-${2:-$1}" || echo "-no-${2:-$1}"
42 +}
43 +
44
45 ###### Internal functions ######