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 0FEA71384B4 for ; Sat, 28 Nov 2015 19:10:08 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C716421C11E; Sat, 28 Nov 2015 19:09:55 +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 2EF7C21C123 for ; Sat, 28 Nov 2015 19:09: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 4FCEB340923 for ; Sat, 28 Nov 2015 19:09:52 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 4D16FFD6 for ; Sat, 28 Nov 2015 19:09:48 +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: <1448737746.d8ec6c80675ccfb046ba5aaf29fc2f245ed0acbd.mgorny@gentoo> Subject: [gentoo-commits] repo/gentoo:master 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: d8ec6c80675ccfb046ba5aaf29fc2f245ed0acbd X-VCS-Branch: master Date: Sat, 28 Nov 2015 19:09: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: 1147346e-7c53-4b0d-b7be-1599bfdfee95 X-Archives-Hash: 933b52bfc7b93e2e37f425e3b698b396 commit: d8ec6c80675ccfb046ba5aaf29fc2f245ed0acbd Author: Michał Górny gentoo org> AuthorDate: Wed Nov 18 21:44:54 2015 +0000 Commit: Michał Górny gentoo org> CommitDate: Sat Nov 28 19:09:06 2015 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d8ec6c80 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