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 d33c0b61ea1f96970b8c2be4e49cb104e84cfe49..37e5f2de054a0d7d1d1aee5e4c2cfa99f5d06345 100644 (file)
--- 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 d8883cbdbdb2c9aec964f451fa68671552a03452..37438a5d917f31579978ddc62dc95af0c3ec6b2f 100644 (file)
--- 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 \