From: Michał Górny <mgorny@gentoo.org>
Date: Sun, 15 May 2016 09:25:51 +0000 (+0200)
Subject: distutils-r1.eclass: Do not apply patches if DISTUTILS_OPTIONAL is used
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=9f10af2ddb28388fb8150ae545f1f028ad998dce;p=gentoo.git

distutils-r1.eclass: Do not apply patches if DISTUTILS_OPTIONAL is used

Do not apply PATCHES and user patches (either via the EAPI 6 default or
pre-EAPI 5 code) when DISTUTILS_OPTIONAL is being used. In this case,
distutils functions are usually called conditionally, in a subdirectory,
while both PATCHES and user patches are usually intended to be applied
top-level.

There is no ebuild relying on distutils-r1_src_prepare applying patches
with DISTUTILS_OPTIONAL. In fact, there are ebuilds which work around
this behavior.
---

diff --git a/eclass/distutils-r1.eclass b/eclass/distutils-r1.eclass
index e8de5ad6c4eb..afd29ed272ff 100644
--- a/eclass/distutils-r1.eclass
+++ b/eclass/distutils-r1.eclass
@@ -315,11 +315,13 @@ _distutils-r1_disable_ez_setup() {
 distutils-r1_python_prepare_all() {
 	debug-print-function ${FUNCNAME} "${@}"
 
-	if [[ ${EAPI} != [45] ]]; then
-		default
-	else
-		[[ ${PATCHES} ]] && epatch "${PATCHES[@]}"
-		epatch_user
+	if [[ ! ${DISTUTILS_OPTIONAL} ]]; then
+		if [[ ${EAPI} != [45] ]]; then
+			default
+		else
+			[[ ${PATCHES} ]] && epatch "${PATCHES[@]}"
+			epatch_user
+		fi
 	fi
 
 	# by default, use in-source build if python_prepare() is used