Gentoo Archives: gentoo-commits

From: "Michał Górny" <mgorny@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: eclass/
Date: Sun, 28 Feb 2016 18:30:11
Message-Id: 1456684196.7e1e020f135c2cf75f4f4bccac151bbdfff429d6.mgorny@gentoo
1 commit: 7e1e020f135c2cf75f4f4bccac151bbdfff429d6
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Sun Feb 28 18:29:02 2016 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Sun Feb 28 18:29:56 2016 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7e1e020f
7
8 waf-utils.eclass: Do not inherit eutils in EAPI 6+
9
10 eclass/waf-utils.eclass | 3 ++-
11 1 file changed, 2 insertions(+), 1 deletion(-)
12
13 diff --git a/eclass/waf-utils.eclass b/eclass/waf-utils.eclass
14 index aebd327..7372e8d 100644
15 --- a/eclass/waf-utils.eclass
16 +++ b/eclass/waf-utils.eclass
17 @@ -15,7 +15,8 @@
18 # waf-based packages much easier.
19 # Its main features are support of common portage default settings.
20
21 -inherit eutils multilib toolchain-funcs multiprocessing
22 +[[ ${EAPI} == [45] ]] && inherit eutils
23 +inherit multilib toolchain-funcs multiprocessing
24
25 case ${EAPI:-0} in
26 4|5|6) EXPORT_FUNCTIONS src_configure src_compile src_install ;;