[gentoo-commits] proj/qt:master commit in: eclass/

[Michael Palimaka]

commit:     0d69aee6e54be232930c76b88366e2bf4add3f85
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Fri May 26 23:23:52 2017 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> 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