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 874A81388C0 for ; Sun, 28 Feb 2016 18:30:11 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0B07221C00F; Sun, 28 Feb 2016 18:30:11 +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 9B2AA21C00F for ; Sun, 28 Feb 2016 18:30:10 +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 CFAC5340914 for ; Sun, 28 Feb 2016 18:30:09 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 6BFE51B9F for ; Sun, 28 Feb 2016 18:30:02 +0000 (UTC) From: "Michał Górny" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michał Górny" Message-ID: <1456684196.7e1e020f135c2cf75f4f4bccac151bbdfff429d6.mgorny@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: eclass/ X-VCS-Repository: repo/gentoo X-VCS-Files: eclass/waf-utils.eclass X-VCS-Directories: eclass/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 7e1e020f135c2cf75f4f4bccac151bbdfff429d6 X-VCS-Branch: master Date: Sun, 28 Feb 2016 18:30:02 +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: 56584f29-af26-41d2-9d88-185a9ad88778 X-Archives-Hash: 302aca08f269f1ee89274e9c47f6bf29 commit: 7e1e020f135c2cf75f4f4bccac151bbdfff429d6 Author: Michał Górny gentoo org> AuthorDate: Sun Feb 28 18:29:02 2016 +0000 Commit: Michał Górny gentoo org> CommitDate: Sun Feb 28 18:29:56 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7e1e020f waf-utils.eclass: Do not inherit eutils in EAPI 6+ eclass/waf-utils.eclass | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/eclass/waf-utils.eclass b/eclass/waf-utils.eclass index aebd327..7372e8d 100644 --- a/eclass/waf-utils.eclass +++ b/eclass/waf-utils.eclass @@ -15,7 +15,8 @@ # waf-based packages much easier. # Its main features are support of common portage default settings. -inherit eutils multilib toolchain-funcs multiprocessing +[[ ${EAPI} == [45] ]] && inherit eutils +inherit multilib toolchain-funcs multiprocessing case ${EAPI:-0} in 4|5|6) EXPORT_FUNCTIONS src_configure src_compile src_install ;;