[gentoo-commits] repo/gentoo:master commit in: eclass/

[Michał Górny]

commit:     d8ec6c80675ccfb046ba5aaf29fc2f245ed0acbd
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: 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