From: Davide Pesavento <pesa@gentoo.org>
Date: Fri, 26 May 2017 23:23:52 +0000 (+0200)
Subject: qmake-utils.eclass: avoid dependency on eutils
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=2340956cb0c43c86e039829712bbed6eae30fb93;p=gentoo.git

qmake-utils.eclass: avoid dependency on eutils
---

diff --git a/eclass/qmake-utils.eclass b/eclass/qmake-utils.eclass
index 76dc31b23729..cb5b15983307 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