[gentoo-commits] repo/gentoo:master commit in: eclass/

[Davide Pesavento]

commit:     2340956cb0c43c86e039829712bbed6eae30fb93
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Fri May 26 23:23:52 2017 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Fri May 26 23:23:52 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2340956c

qmake-utils.eclass: avoid dependency on eutils

 eclass/qmake-utils.eclass | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/eclass/qmake-utils.eclass b/eclass/qmake-utils.eclass
index 76dc31b2372..cb5b1598330 100644
--- a/eclass/qmake-utils.eclass
+++ b/eclass/qmake-utils.eclass
@@ -17,7 +17,7 @@ if [[ -z ${_QMAKE_UTILS_ECLASS} ]]; then
 _QMAKE_UTILS_ECLASS=1
 
 [[ ${EAPI:-0} == [012345] ]] && inherit multilib
-inherit eutils toolchain-funcs
+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