Gentoo Archives: gentoo-dev

From: "Michał Górny" <mgorny@g.o>
To: gentoo-dev@l.g.o
Cc: "Michał Górny" <mgorny@g.o>
Subject: [gentoo-dev] [PATCH 22/29] distutils-r1.eclass: Use default_src_prepare to apply patches in EAPI 6
Date: Sun, 22 Nov 2015 20:03:24
Message-Id: 1448221870-17269-23-git-send-email-mgorny@gentoo.org
In Reply to: [gentoo-dev] [PATCHES] Clean-up & EAPI 6 support for python-r1 suite by "Michał Górny"
1 ---
2 eclass/distutils-r1.eclass | 9 ++++++---
3 1 file changed, 6 insertions(+), 3 deletions(-)
4
5 diff --git a/eclass/distutils-r1.eclass b/eclass/distutils-r1.eclass
6 index 256c893..f9cff5c 100644
7 --- a/eclass/distutils-r1.eclass
8 +++ b/eclass/distutils-r1.eclass
9 @@ -312,9 +312,12 @@ _distutils-r1_disable_ez_setup() {
10 distutils-r1_python_prepare_all() {
11 debug-print-function ${FUNCNAME} "${@}"
12
13 - [[ ${PATCHES} ]] && epatch "${PATCHES[@]}"
14 -
15 - epatch_user
16 + if [[ ${EAPI} != [45] ]]; then
17 + default
18 + else
19 + [[ ${PATCHES} ]] && epatch "${PATCHES[@]}"
20 + epatch_user
21 + fi
22
23 # by default, use in-source build if python_prepare() is used
24 if [[ ! ${DISTUTILS_IN_SOURCE_BUILD+1} ]]; then
25 --
26 2.6.3