From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-848029-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
by finch.gentoo.org (Postfix) with ESMTP id 85AE11384B4
for <garchives@archives.gentoo.org>; Sun, 22 Nov 2015 09:01:46 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 050F721C03A;
Sun, 22 Nov 2015 09:01:28 +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 C734921C038
for <gentoo-commits@lists.gentoo.org>; Sun, 22 Nov 2015 09:01:25 +0000 (UTC)
Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84])
(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id 08D72340875
for <gentoo-commits@lists.gentoo.org>; Sun, 22 Nov 2015 09:01:25 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 04A1D1470
for <gentoo-commits@lists.gentoo.org>; Sun, 22 Nov 2015 09:01:21 +0000 (UTC)
From: "Michał Górny" <mgorny@gentoo.org>
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" <mgorny@gentoo.org>
Message-ID: <1448182812.623d447bfd845cbd9a1c2effb6c3094e1ed88e55.mgorny@gentoo>
Subject: [gentoo-commits] repo/gentoo:python-eapi6 commit in: eclass/
X-VCS-Repository: repo/gentoo
X-VCS-Files: eclass/distutils-r1.eclass
X-VCS-Directories: eclass/
X-VCS-Committer: mgorny
X-VCS-Committer-Name: Michał Górny
X-VCS-Revision: 623d447bfd845cbd9a1c2effb6c3094e1ed88e55
X-VCS-Branch: python-eapi6
Date: Sun, 22 Nov 2015 09:01:21 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Archives-Salt: f2f7d914-d265-4199-8280-37882be9315f
X-Archives-Hash: b9ad7d8fdceb23583a6e5e03006c5ac2
commit: 623d447bfd845cbd9a1c2effb6c3094e1ed88e55
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 18 22:02:39 2015 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Nov 22 09:00:12 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=623d447b
distutils-r1.eclass: Remove unnecessary eutils inherit in EAPI 6
eclass/distutils-r1.eclass | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/eclass/distutils-r1.eclass b/eclass/distutils-r1.eclass
index 1f0b74a..7cb37c8 100644
--- a/eclass/distutils-r1.eclass
+++ b/eclass/distutils-r1.eclass
@@ -79,7 +79,8 @@ esac
if [[ ! ${_DISTUTILS_R1} ]]; then
-inherit eutils toolchain-funcs
+[[ ${EAPI} == [45] ]] && inherit eutils
+inherit toolchain-funcs
if [[ ! ${DISTUTILS_SINGLE_IMPL} ]]; then
inherit multiprocessing python-r1