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: Sat, 28 Nov 2015 19:10:08
Message-Id: 1448737746.d8ec6c80675ccfb046ba5aaf29fc2f245ed0acbd.mgorny@gentoo
1 commit: d8ec6c80675ccfb046ba5aaf29fc2f245ed0acbd
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Wed Nov 18 21:44:54 2015 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Sat Nov 28 19:09:06 2015 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d8ec6c80
7
8 distutils-r1.eclass: Use default_src_prepare to apply patches in EAPI 6
9
10 eclass/distutils-r1.eclass | 9 ++++++---
11 1 file changed, 6 insertions(+), 3 deletions(-)
12
13 diff --git a/eclass/distutils-r1.eclass b/eclass/distutils-r1.eclass
14 index 256c893..f9cff5c 100644
15 --- a/eclass/distutils-r1.eclass
16 +++ b/eclass/distutils-r1.eclass
17 @@ -312,9 +312,12 @@ _distutils-r1_disable_ez_setup() {
18 distutils-r1_python_prepare_all() {
19 debug-print-function ${FUNCNAME} "${@}"
20
21 - [[ ${PATCHES} ]] && epatch "${PATCHES[@]}"
22 -
23 - epatch_user
24 + if [[ ${EAPI} != [45] ]]; then
25 + default
26 + else
27 + [[ ${PATCHES} ]] && epatch "${PATCHES[@]}"
28 + epatch_user
29 + fi
30
31 # by default, use in-source build if python_prepare() is used
32 if [[ ! ${DISTUTILS_IN_SOURCE_BUILD+1} ]]; then