From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id AF8851388C1 for ; Sun, 22 Nov 2015 22:48:55 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B970121C00E; Sun, 22 Nov 2015 22:48:53 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 5B60A21C00E for ; Sun, 22 Nov 2015 22:48:53 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id F0491340821 for ; Sun, 22 Nov 2015 22:48:50 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 2511BA7F for ; Sun, 22 Nov 2015 22:48:48 +0000 (UTC) From: "Davide Pesavento" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Davide Pesavento" Message-ID: <1448232452.b8475c6b50beaf3081a9417d27c4e6d8dfcb1f11.pesa@gentoo> Subject: [gentoo-commits] proj/qt:master commit in: eclass/ X-VCS-Repository: proj/qt X-VCS-Files: eclass/qmake-utils.eclass X-VCS-Directories: eclass/ X-VCS-Committer: pesa X-VCS-Committer-Name: Davide Pesavento X-VCS-Revision: b8475c6b50beaf3081a9417d27c4e6d8dfcb1f11 X-VCS-Branch: master Date: Sun, 22 Nov 2015 22:48:48 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: ea05f779-9097-4a2f-8f52-8d4c6cee8cb6 X-Archives-Hash: d4dd3f3c94e7238c28921dbace17f67e commit: b8475c6b50beaf3081a9417d27c4e6d8dfcb1f11 Author: Davide Pesavento gentoo org> AuthorDate: Sun Nov 22 22:47:32 2015 +0000 Commit: Davide Pesavento gentoo org> CommitDate: Sun Nov 22 22:47:32 2015 +0000 URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=b8475c6b 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 a5d3756..d300fd2 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: