From: Brian Harring <ferringb@gmail.com>
Date: Fri, 14 Sep 2012 04:56:10 +0000 (-0700)
Subject: Drop diefunc protection.
X-Git-Tag: v2.2.0_alpha129~30
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=2bafee5c926a644e58099bb5dbb3eec7cd80518c;p=portage.git

Drop diefunc protection.

The last usage of it was added 67e88b82726a93eda^, 01/20/08; 4.5 years
later, the compatibility measure is no longer needed.
---

diff --git a/bin/isolated-functions.sh b/bin/isolated-functions.sh
index d33c0b61e..37e5f2de0 100644
--- a/bin/isolated-functions.sh
+++ b/bin/isolated-functions.sh
@@ -245,12 +245,6 @@ die() {
 	exit 1
 }
 
-# We need to implement diefunc() since environment.bz2 files contain
-# calls to it (due to alias expansion).
-diefunc() {
-	die "${@}"
-}
-
 quiet_mode() {
 	[[ ${PORTAGE_QUIET} -eq 1 ]]
 }
diff --git a/bin/save-ebuild-env.sh b/bin/save-ebuild-env.sh
index d8883cbdb..37438a5d9 100644
--- a/bin/save-ebuild-env.sh
+++ b/bin/save-ebuild-env.sh
@@ -47,7 +47,7 @@ save_ebuild_env() {
 	unset x
 
 	unset -f assert assert_sigpipe_ok \
-		dump_trace die diefunc \
+		dump_trace die \
 		quiet_mode vecho elog_base eqawarn elog \
 		esyslog einfo einfon ewarn eerror ebegin _eend eend KV_major \
 		KV_minor KV_micro KV_to_int get_KV unset_colors set_colors has \