From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-847444-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 DF3881384B4
for <garchives@archives.gentoo.org>; Thu, 19 Nov 2015 07:28:26 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 7CB8F21C037;
Thu, 19 Nov 2015 07:28:14 +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 0AFB921C037
for <gentoo-commits@lists.gentoo.org>; Thu, 19 Nov 2015 07:28:09 +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 4A53B340A1E
for <gentoo-commits@lists.gentoo.org>; Thu, 19 Nov 2015 07:28:03 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id DD3E21470
for <gentoo-commits@lists.gentoo.org>; Thu, 19 Nov 2015 07:27:58 +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: <1447918024.e13b0e340aa33b8faae8e48287e263a029b84e81.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: e13b0e340aa33b8faae8e48287e263a029b84e81
X-VCS-Branch: python-eapi6
Date: Thu, 19 Nov 2015 07:27:58 +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: 3397aa65-0d39-4046-88ab-3affee0d9a14
X-Archives-Hash: f0ab8f09a5de9a5d2c5ddd0fd98d6add
commit: e13b0e340aa33b8faae8e48287e263a029b84e81
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 18 21:44:54 2015 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Nov 19 07:27:04 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e13b0e34
distutils-r1.eclass: Use default_src_prepare to apply patches in EAPI 6
eclass/distutils-r1.eclass | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/eclass/distutils-r1.eclass b/eclass/distutils-r1.eclass
index 256c893..f9cff5c 100644
--- a/eclass/distutils-r1.eclass
+++ b/eclass/distutils-r1.eclass
@@ -312,9 +312,12 @@ _distutils-r1_disable_ez_setup() {
distutils-r1_python_prepare_all() {
debug-print-function ${FUNCNAME} "${@}"
- [[ ${PATCHES} ]] && epatch "${PATCHES[@]}"
-
- epatch_user
+ if [[ ${EAPI} != [45] ]]; then
+ default
+ else
+ [[ ${PATCHES} ]] && epatch "${PATCHES[@]}"
+ epatch_user
+ fi
# by default, use in-source build if python_prepare() is used
if [[ ! ${DISTUTILS_IN_SOURCE_BUILD+1} ]]; then