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 31F1C138CED for ; Tue, 16 Jun 2015 17:42:27 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B480DE0783; Tue, 16 Jun 2015 17:42:20 +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 69508E0783 for ; Tue, 16 Jun 2015 17:42:20 +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 A2B57340A61 for ; Tue, 16 Jun 2015 17:42:19 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 5A95E9E1 for ; Tue, 16 Jun 2015 17:42:18 +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: <1434476506.a0f5885211ad0b2250d36489e5c5021f8fbc2dc4.pesa@gentoo> Subject: [gentoo-commits] proj/qt:master commit in: eclass/ X-VCS-Repository: proj/qt X-VCS-Files: eclass/qmake-utils.eclass X-VCS-Directories: eclass/ X-VCS-Committer: pesa X-VCS-Committer-Name: Davide Pesavento X-VCS-Revision: a0f5885211ad0b2250d36489e5c5021f8fbc2dc4 X-VCS-Branch: master Date: Tue, 16 Jun 2015 17:42:18 +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: 8843437e-b449-4a25-8a37-e98f87346471 X-Archives-Hash: 019b26c6576190b19baf83a7cf49db1d commit: a0f5885211ad0b2250d36489e5c5021f8fbc2dc4 Author: Davide Pesavento gentoo org> AuthorDate: Tue Jun 16 17:41:46 2015 +0000 Commit: Davide Pesavento gentoo org> CommitDate: Tue Jun 16 17:41:46 2015 +0000 URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=a0f58852 [qmake-utils.eclass] Use use_if_iuse(). eclass/qmake-utils.eclass | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/eclass/qmake-utils.eclass b/eclass/qmake-utils.eclass index 1f6e250..5822848 100644 --- a/eclass/qmake-utils.eclass +++ b/eclass/qmake-utils.eclass @@ -141,14 +141,13 @@ eqmake4() { local qmake_args=("$@") - # check if project file was passed as a first argument - # if not, then search for it + # Check if the project file name was passed as first argument. If not, look for candidates. local regexp='.*\.pro' if ! [[ ${1} =~ ${regexp} ]]; then local project_file=$(qmake-utils_find_pro_file) if [[ -z ${project_file} ]]; then echo - eerror "No project files found in '${PWD}'!" + eerror "No project files found in '${PWD}'" eerror "This shouldn't happen - please send a bug report to https://bugs.gentoo.org/" echo die "eqmake4 failed" @@ -156,13 +155,12 @@ eqmake4() { qmake_args+=("${project_file}") fi - # make sure CONFIG variable is correctly set - # for both release and debug builds - local config_add="release" - local config_remove="debug" - if has debug ${IUSE} && use debug; then - config_add="debug" - config_remove="release" + # Make sure the CONFIG variable is correctly set for both release and debug builds. + local config_add=release + local config_remove=debug + if use_if_iuse debug; then + config_add=debug + config_remove=release fi local awkscript='BEGIN { @@ -240,7 +238,6 @@ eqmake4() { QMAKE_LIBDIR_OPENGL="${EPREFIX}"/usr/$(get_libdir) \ "${qmake_args[@]}" - # was qmake successful? if ! eend $? ; then echo eerror "Running qmake has failed! (see above for details)" @@ -288,7 +285,6 @@ eqmake5() { QMAKE_LFLAGS_DEBUG= \ "$@" - # was qmake successful? if ! eend $? ; then echo eerror "Running qmake has failed! (see above for details)"