From 6ec700e140ac8679907032af18df831677c421c9 Mon Sep 17 00:00:00 2001
From: Zac Medico <zmedico@gentoo.org>
Date: Fri, 13 Aug 2010 12:49:16 -0700
Subject: Setup EBUILD_MASTER_PID at the bottom, for scripts that source
 ebuild.sh.

---
 bin/ebuild.sh | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/bin/ebuild.sh b/bin/ebuild.sh
index 73a610b7e..9af7e3867 100755
--- a/bin/ebuild.sh
+++ b/bin/ebuild.sh
@@ -2240,5 +2240,9 @@ elif [[ -n $EBUILD_SH_ARGS ]] ; then
 	exit $?
 fi
 
+# Subshell/helper die support (must export for the die helper).
+export EBUILD_MASTER_PID=$BASHPID
+trap 'exit 1' SIGTERM
+
 # Do not exit when ebuild.sh is sourced by other scripts.
 true
-- 
cgit v1.2.3-1-g7c22