From: Anthony G. Basile <blueness@gentoo.org>
Date: Sun, 9 Aug 2015 09:26:04 +0000 (-0400)
Subject: sys-libs/musl: fix epatch_user.  Bug #557042.
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=5be178908d0d2714c1c8e44a3259341e4ebbf573;p=gentoo.git

sys-libs/musl: fix epatch_user.  Bug #557042.

Package-Manager: portage-2.2.20
---

diff --git a/sys-libs/musl/musl-1.1.10-r1.ebuild b/sys-libs/musl/musl-1.1.10-r1.ebuild
index 3357f91f306c..d6830e228e37 100644
--- a/sys-libs/musl/musl-1.1.10-r1.ebuild
+++ b/sys-libs/musl/musl-1.1.10-r1.ebuild
@@ -58,12 +58,11 @@ pkg_setup() {
 		*) die "Use sys-devel/crossdev to build a musl toolchain" ;;
 		esac
 	fi
-
-	epatch_user
 }
 
 src_prepare() {
 	epatch "${FILESDIR}"/${P}-uselocale-0-fix.diff
+	epatch_user
 }
 
 src_configure() {
diff --git a/sys-libs/musl/musl-9999.ebuild b/sys-libs/musl/musl-9999.ebuild
index 6d1ca35631a6..f7c9ef03dd2e 100644
--- a/sys-libs/musl/musl-9999.ebuild
+++ b/sys-libs/musl/musl-9999.ebuild
@@ -58,7 +58,9 @@ pkg_setup() {
 		*) die "Use sys-devel/crossdev to build a musl toolchain" ;;
 		esac
 	fi
+}
 
+src_prepare() {
 	epatch_user
 }