From 6a25131892f7c2c499d38689e86835b919e8eaf4 Mon Sep 17 00:00:00 2001 From: Davide Pesavento Date: Sun, 22 Nov 2015 23:49:56 +0100 Subject: [PATCH] qmake-utils.eclass: stop inheriting unneeded multilib in EAPI 6 --- eclass/qmake-utils.eclass | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/eclass/qmake-utils.eclass b/eclass/qmake-utils.eclass index a5d37566ad15..d300fd22b39c 100644 --- a/eclass/qmake-utils.eclass +++ b/eclass/qmake-utils.eclass @@ -17,7 +17,8 @@ if [[ -z ${_QMAKE_UTILS_ECLASS} ]]; then _QMAKE_UTILS_ECLASS=1 -inherit eutils multilib toolchain-funcs +[[ ${EAPI:-0} == [012345] ]] && inherit multilib +inherit eutils toolchain-funcs # @FUNCTION: qt4_get_bindir # @DESCRIPTION: -- 2.26.2