From d8ec6c80675ccfb046ba5aaf29fc2f245ed0acbd Mon Sep 17 00:00:00 2001 From: Michał Górny Date: Wed, 18 Nov 2015 22:44:54 +0100 Subject: 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 256c893f3b17..f9cff5cc35e5 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 -- cgit v1.2.3-65-gdbad