From: Yuta Satoh <nigoro.dev@gmail.com>
Date: Wed, 7 Dec 2016 11:01:55 +0000 (+0900)
Subject: eclass/freebsd.eclass: Changed to apply upstream patch on WORKDIR
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=d21141eec6d5f2d0645e17b77f94ed4224ee604b;p=gentoo.git

eclass/freebsd.eclass: Changed to apply upstream patch on WORKDIR
---

diff --git a/eclass/freebsd.eclass b/eclass/freebsd.eclass
index 8f6b204f1f30..774147007336 100644
--- a/eclass/freebsd.eclass
+++ b/eclass/freebsd.eclass
@@ -141,7 +141,13 @@ freebsd_do_patches() {
 			epatch "${x}"
 		done
 	fi
-	[[ ${#UPSTREAM_PATCHES[@]} -gt 0 ]] && epatch $(freebsd_upstream_patches -s)
+
+	# Upstream patches need to be applied on WORKDIR.
+	if [[ ${#UPSTREAM_PATCHES[@]} -gt 0 ]] ; then
+		cd "${WORKDIR}" || die
+		epatch $(freebsd_upstream_patches -s)
+		cd "${S}" || die
+	fi
 	epatch_user
 }