pesa 15/06/16 17:47:24 Modified: ChangeLog qmake-utils.eclass Log: Use use_if_iuse().
Revision Changes Path 1.1666 eclass/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1666&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1666&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1665&r2=1.1666 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v retrieving revision 1.1665 retrieving revision 1.1666 diff -u -r1.1665 -r1.1666 --- ChangeLog 15 Jun 2015 21:09:06 -0000 1.1665 +++ ChangeLog 16 Jun 2015 17:47:24 -0000 1.1666 @@ -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.1665 2015/06/15 21:09:06 chewi Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1666 2015/06/16 17:47:24 pesa Exp $ + + 16 Jun 2015; Davide Pesavento <p...@gentoo.org> qmake-utils.eclass: + Use use_if_iuse(). 15 Jun 2015; James Le Cuirot <ch...@gentoo.org> java-utils-2.eclass: Add java-pkg_addres function for adding resource files to an existing jar. 1.10 eclass/qmake-utils.eclass file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qmake-utils.eclass?rev=1.10&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qmake-utils.eclass?rev=1.10&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qmake-utils.eclass?r1=1.9&r2=1.10 Index: qmake-utils.eclass =================================================================== RCS file: /var/cvsroot/gentoo-x86/eclass/qmake-utils.eclass,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- qmake-utils.eclass 31 May 2015 12:51:07 -0000 1.9 +++ qmake-utils.eclass 16 Jun 2015 17:47:24 -0000 1.10 @@ -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/qmake-utils.eclass,v 1.9 2015/05/31 12:51:07 pesa Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/qmake-utils.eclass,v 1.10 2015/06/16 17:47:24 pesa Exp $ # @ECLASS: qmake-utils.eclass # @MAINTAINER: @@ -141,14 +141,13 @@ 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 @@ 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 @@ 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 @@ QMAKE_LFLAGS_DEBUG= \ "$@" - # was qmake successful? if ! eend $? ; then echo eerror "Running qmake has failed! (see above for details)"
