From: Zac Medico <zmedico@gentoo.org>
Date: Wed, 12 Sep 2012 06:33:26 +0000 (-0700)
Subject: save-ebuild-env: don't filter apply_user_patches
X-Git-Tag: v2.2.0_alpha126~3
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=d52a8a54012d0cfb5b2cd4128b9cda58eeddef33;p=portage.git

save-ebuild-env: don't filter apply_user_patches

Except for EAPI 5_pre1.
---

diff --git a/bin/save-ebuild-env.sh b/bin/save-ebuild-env.sh
index 6d6ed41b6..cdc7c42ea 100644
--- a/bin/save-ebuild-env.sh
+++ b/bin/save-ebuild-env.sh
@@ -46,7 +46,7 @@ save_ebuild_env() {
 	done
 	unset x
 
-	unset -f apply_user_patches assert assert_sigpipe_ok \
+	unset -f assert assert_sigpipe_ok \
 		dump_trace die diefunc \
 		quiet_mode vecho elog_base eqawarn elog \
 		esyslog einfo einfon ewarn eerror ebegin _eend eend KV_major \
@@ -78,6 +78,10 @@ save_ebuild_env() {
 		*) unset -f usex ;;
 	esac
 
+	case "${EAPI}" in
+		5_pre1) unset -f apply_user_patches ;;
+	esac
+
 	# portage config variables and variables set directly by portage
 	unset ACCEPT_LICENSE BAD BRACKET BUILD_PREFIX COLS \
 		DISTCC_DIR DISTDIR DOC_SYMLINKS_DIR \