| 1 |
commit: 2340956cb0c43c86e039829712bbed6eae30fb93 |
| 2 |
Author: Davide Pesavento <pesa <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri May 26 23:23:52 2017 +0000 |
| 4 |
Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri May 26 23:23:52 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2340956c |
| 7 |
|
| 8 |
qmake-utils.eclass: avoid dependency on eutils |
| 9 |
|
| 10 |
eclass/qmake-utils.eclass | 4 ++-- |
| 11 |
1 file changed, 2 insertions(+), 2 deletions(-) |
| 12 |
|
| 13 |
diff --git a/eclass/qmake-utils.eclass b/eclass/qmake-utils.eclass |
| 14 |
index 76dc31b2372..cb5b1598330 100644 |
| 15 |
--- a/eclass/qmake-utils.eclass |
| 16 |
+++ b/eclass/qmake-utils.eclass |
| 17 |
@@ -17,7 +17,7 @@ if [[ -z ${_QMAKE_UTILS_ECLASS} ]]; then |
| 18 |
_QMAKE_UTILS_ECLASS=1 |
| 19 |
|
| 20 |
[[ ${EAPI:-0} == [012345] ]] && inherit multilib |
| 21 |
-inherit eutils toolchain-funcs |
| 22 |
+inherit estack toolchain-funcs |
| 23 |
|
| 24 |
# @FUNCTION: qt4_get_bindir |
| 25 |
# @DESCRIPTION: |
| 26 |
@@ -184,7 +184,7 @@ eqmake4() { |
| 27 |
# Make sure the CONFIG variable is correctly set for both release and debug builds. |
| 28 |
local config_add=release |
| 29 |
local config_remove=debug |
| 30 |
- if use_if_iuse debug; then |
| 31 |
+ if in_iuse debug && use debug; then |
| 32 |
config_add=debug |
| 33 |
config_remove=release |
| 34 |
fi |
Archives