| 1 |
commit: b8475c6b50beaf3081a9417d27c4e6d8dfcb1f11 |
| 2 |
Author: Davide Pesavento <pesa <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Nov 22 22:47:32 2015 +0000 |
| 4 |
Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Nov 22 22:47:32 2015 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=b8475c6b |
| 7 |
|
| 8 |
qmake-utils.eclass: stop inheriting unneeded multilib in EAPI 6 |
| 9 |
|
| 10 |
eclass/qmake-utils.eclass | 3 ++- |
| 11 |
1 file changed, 2 insertions(+), 1 deletion(-) |
| 12 |
|
| 13 |
diff --git a/eclass/qmake-utils.eclass b/eclass/qmake-utils.eclass |
| 14 |
index a5d3756..d300fd2 100644 |
| 15 |
--- a/eclass/qmake-utils.eclass |
| 16 |
+++ b/eclass/qmake-utils.eclass |
| 17 |
@@ -17,7 +17,8 @@ |
| 18 |
if [[ -z ${_QMAKE_UTILS_ECLASS} ]]; then |
| 19 |
_QMAKE_UTILS_ECLASS=1 |
| 20 |
|
| 21 |
-inherit eutils multilib toolchain-funcs |
| 22 |
+[[ ${EAPI:-0} == [012345] ]] && inherit multilib |
| 23 |
+inherit eutils toolchain-funcs |
| 24 |
|
| 25 |
# @FUNCTION: qt4_get_bindir |
| 26 |
# @DESCRIPTION: |
Archives