From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 3B0AB1382C5 for ; Sat, 17 Mar 2018 01:04:41 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3BBE5E0880; Sat, 17 Mar 2018 01:04:40 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 10B05E0880 for ; Sat, 17 Mar 2018 01:04:39 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id C7FE0335C75 for ; Sat, 17 Mar 2018 01:04:38 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 28950232 for ; Sat, 17 Mar 2018 01:04:37 +0000 (UTC) From: "Michael Palimaka" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michael Palimaka" Message-ID: <1521248669.0d69aee6e54be232930c76b88366e2bf4add3f85.kensington@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: kensington X-VCS-Committer-Name: Michael Palimaka X-VCS-Revision: 0d69aee6e54be232930c76b88366e2bf4add3f85 X-VCS-Branch: master Date: Sat, 17 Mar 2018 01:04: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: 2a203c53-ca4c-49ca-a696-3dfb54cc15d1 X-Archives-Hash: ff4d9a05fd22ece30816890eeb1d5d91 commit: 0d69aee6e54be232930c76b88366e2bf4add3f85 Author: Davide Pesavento gentoo org> AuthorDate: Fri May 26 23:23:52 2017 +0000 Commit: Michael Palimaka gentoo org> CommitDate: Sat Mar 17 01:04:29 2018 +0000 URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=0d69aee6 qmake-utils.eclass: avoid dependency on eutils for EAPI < 6 eclass/qmake-utils.eclass | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/eclass/qmake-utils.eclass b/eclass/qmake-utils.eclass index 76dc31b2..74ceca4a 100644 --- a/eclass/qmake-utils.eclass +++ b/eclass/qmake-utils.eclass @@ -16,8 +16,8 @@ if [[ -z ${_QMAKE_UTILS_ECLASS} ]]; then _QMAKE_UTILS_ECLASS=1 -[[ ${EAPI:-0} == [012345] ]] && inherit multilib -inherit eutils toolchain-funcs +[[ ${EAPI:-0} == [012345] ]] && inherit eutils multilib +inherit estack toolchain-funcs # @FUNCTION: qt4_get_bindir # @DESCRIPTION: @@ -184,7 +184,7 @@ eqmake4() { # 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 + if in_iuse debug && use debug; then config_add=debug config_remove=release fi