* In helpers_die arguments, display ${0##*/} instead of $0 since $0

  is needlessly long.
* When calling helpers_die from a function, use ${FUNCNAME[0]} in
  arguments instead of $0.

32 files changed, 78 insertions, 78 deletions

diff --git a/bin/ebuild-helpers/dobin b/bin/ebuild-helpers/dobin
index fc0b0359f..e385455d7 100755
--- a/bin/ebuild-helpers/dobin
+++ b/bin/ebuild-helpers/dobin
@@ -1,16 +1,16 @@
 #!/bin/bash
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 source "${PORTAGE_BIN_PATH:-/usr/lib/portage/bin}"/isolated-functions.sh
 
 if [[ $# -lt 1 ]] ; then
-	helpers_die "$0: at least one argument needed"
+	helpers_die "${0##*/}: at least one argument needed"
 	exit 1
 fi
 
 if [[ ! -d ${D}${DESTTREE}/bin ]] ; then
-	install -d "${D}${DESTTREE}/bin" || { helpers_die "$0: failed to install ${D}${DESTTREE}/bin"; exit 2; }
+	install -d "${D}${DESTTREE}/bin" || { helpers_die "${0##*/}: failed to install ${D}${DESTTREE}/bin"; exit 2; }
 fi
 
 ret=0
@@ -25,5 +25,5 @@ for x in "$@" ; do
 	((ret|=$?))
 done
 
-[[ $ret -ne 0 ]] && helpers_die "$0 failed"
+[[ $ret -ne 0 ]] && helpers_die "${0##*/} failed"
 exit ${ret}
diff --git a/bin/ebuild-helpers/doconfd b/bin/ebuild-helpers/doconfd
index 749372a4a..e14600022 100755
--- a/bin/ebuild-helpers/doconfd
+++ b/bin/ebuild-helpers/doconfd
@@ -1,10 +1,10 @@
 #!/bin/bash
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 if [[ $# -lt 1 ]] ; then
 	source "${PORTAGE_BIN_PATH:-/usr/lib/portage/bin}"/isolated-functions.sh
-	helpers_die "$0: at least one argument needed"
+	helpers_die "${0##*/}: at least one argument needed"
 	exit 1
 fi
 
diff --git a/bin/ebuild-helpers/dodir b/bin/ebuild-helpers/dodir
index 58303b2fc..f40bee7e4 100755
--- a/bin/ebuild-helpers/dodir
+++ b/bin/ebuild-helpers/dodir
@@ -1,10 +1,10 @@
 #!/bin/bash
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 source "${PORTAGE_BIN_PATH:-/usr/lib/portage/bin}"/isolated-functions.sh
 
 install -d ${DIROPTIONS} "${@/#/${D}/}"
 ret=$?
-[[ $ret -ne 0 ]] && helpers_die "$0 failed"
+[[ $ret -ne 0 ]] && helpers_die "${0##*/} failed"
 exit $ret
diff --git a/bin/ebuild-helpers/dodoc b/bin/ebuild-helpers/dodoc
index 6d750c939..29b690112 100755
--- a/bin/ebuild-helpers/dodoc
+++ b/bin/ebuild-helpers/dodoc
@@ -1,5 +1,5 @@
 #!/bin/bash
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 source "${PORTAGE_BIN_PATH:-/usr/lib/portage/bin}"/isolated-functions.sh
@@ -25,5 +25,5 @@ for x in "$@" ; do
 	fi
 done
 
-[[ $ret -ne 0 ]] && helpers_die "$0 failed"
+[[ $ret -ne 0 ]] && helpers_die "${0##*/} failed"
 exit ${ret}
diff --git a/bin/ebuild-helpers/doenvd b/bin/ebuild-helpers/doenvd
index bd21f5aea..28ab5d234 100755
--- a/bin/ebuild-helpers/doenvd
+++ b/bin/ebuild-helpers/doenvd
@@ -1,10 +1,10 @@
 #!/bin/bash
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 if [[ $# -lt 1 ]] ; then
 	source "${PORTAGE_BIN_PATH:-/usr/lib/portage/bin}"/isolated-functions.sh
-	helpers_die "$0: at least one argument needed"
+	helpers_die "${0##*/}: at least one argument needed"
 	exit 1
 fi
 
diff --git a/bin/ebuild-helpers/doexe b/bin/ebuild-helpers/doexe
index 191e7f918..360800e02 100755
--- a/bin/ebuild-helpers/doexe
+++ b/bin/ebuild-helpers/doexe
@@ -1,11 +1,11 @@
 #!/bin/bash
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 source "${PORTAGE_BIN_PATH:-/usr/lib/portage/bin}"/isolated-functions.sh
 
 if [[ $# -lt 1 ]] ; then
-	helpers_die "$0: at least one argument needed"
+	helpers_die "${0##*/}: at least one argument needed"
 	exit 1
 fi
 
@@ -39,5 +39,5 @@ done
 
 rm -rf "$TMP"
 
-[[ $ret -ne 0 ]] && helpers_die "$0 failed"
+[[ $ret -ne 0 ]] && helpers_die "${0##*/} failed"
 exit $ret
diff --git a/bin/ebuild-helpers/dohtml b/bin/ebuild-helpers/dohtml
index cb29dc3f3..630629a4b 100755
--- a/bin/ebuild-helpers/dohtml
+++ b/bin/ebuild-helpers/dohtml
@@ -10,5 +10,5 @@ PYTHONPATH=$PORTAGE_PYM_PATH${PYTHONPATH:+:}$PYTHONPATH \
 	"${PORTAGE_PYTHON:-/usr/bin/python}" "$PORTAGE_BIN_PATH/dohtml.py" "$@"
 
 ret=$?
-[[ $ret -ne 0 ]] && helpers_die "$0 failed"
+[[ $ret -ne 0 ]] && helpers_die "${0##*/} failed"
 exit $ret
diff --git a/bin/ebuild-helpers/doinfo b/bin/ebuild-helpers/doinfo
index 2c3d1e071..54fb8dac2 100755
--- a/bin/ebuild-helpers/doinfo
+++ b/bin/ebuild-helpers/doinfo
@@ -10,7 +10,7 @@ if [[ -z $1 ]] ; then
 fi
 
 if [[ ! -d ${D}usr/share/info ]] ; then
-	install -d "${D}usr/share/info" || { helpers_die "$0: failed to install ${D}usr/share/info"; exit 1; }
+	install -d "${D}usr/share/info" || { helpers_die "${0##*/}: failed to install ${D}usr/share/info"; exit 1; }
 fi
 
 install -m0644 "$@" "${D}usr/share/info"
@@ -19,6 +19,6 @@ if [ $rval -ne 0 ] ; then
 	for x in "$@" ; do
 		[ -e "$x" ] || echo "!!! ${0##*/}: $x does not exist" 1>&2
 	done
-	helpers_die "$0 failed"
+	helpers_die "${0##*/} failed"
 fi
 exit $rval
diff --git a/bin/ebuild-helpers/doinitd b/bin/ebuild-helpers/doinitd
index 8ea51f1ee..b711e190a 100755
--- a/bin/ebuild-helpers/doinitd
+++ b/bin/ebuild-helpers/doinitd
@@ -1,10 +1,10 @@
 #!/bin/bash
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 if [[ $# -lt 1 ]] ; then
 	source "${PORTAGE_BIN_PATH:-/usr/lib/portage/bin}"/isolated-functions.sh
-	helpers_die "$0: at least one argument needed"
+	helpers_die "${0##*/}: at least one argument needed"
 	exit 1
 fi
 
diff --git a/bin/ebuild-helpers/doins b/bin/ebuild-helpers/doins
index c59b9bcfd..bbc4e97b6 100755
--- a/bin/ebuild-helpers/doins
+++ b/bin/ebuild-helpers/doins
@@ -1,5 +1,5 @@
 #!/bin/bash
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 source "${PORTAGE_BIN_PATH:-/usr/lib/portage/bin}"/isolated-functions.sh
@@ -21,7 +21,7 @@ if [[ ${INSDESTTREE#${D}} != "${INSDESTTREE}" ]]; then
 	vecho "You should not use \${D} with helpers." 1>&2
 	vecho "  --> ${INSDESTTREE}" 1>&2
 	vecho "-------------------------------------------------------" 1>&2
-	helpers_die "$0 used with \${D}"
+	helpers_die "${0##*/} used with \${D}"
 	exit 1
 fi
 
@@ -127,4 +127,4 @@ for x in "$@" ; do
 	fi
 done
 rm -rf "$TMP"
-[[ $failed -ne 0 || $success -eq 0 ]] && { helpers_die "$0 failed"; exit 1; } || exit 0
+[[ $failed -ne 0 || $success -eq 0 ]] && { helpers_die "${0##*/} failed"; exit 1; } || exit 0
diff --git a/bin/ebuild-helpers/dolib b/bin/ebuild-helpers/dolib
index 821e1321e..87ade425a 100755
--- a/bin/ebuild-helpers/dolib
+++ b/bin/ebuild-helpers/dolib
@@ -1,5 +1,5 @@
 #!/bin/bash
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 source "${PORTAGE_BIN_PATH:-/usr/lib/portage/bin}"/isolated-functions.sh
@@ -16,11 +16,11 @@ libdir="${D}${DESTTREE}/${CONF_LIBDIR}"
 
 
 if [[ $# -lt 1 ]] ; then
-	helpers_die "$0: at least one argument needed"
+	helpers_die "${0##*/}: at least one argument needed"
 	exit 1
 fi
 if [[ ! -d ${libdir} ]] ; then
-	install -d "${libdir}" || { helpers_die "$0: failed to install ${libdir}"; exit 1; }
+	install -d "${libdir}" || { helpers_die "${0##*/}: failed to install ${libdir}"; exit 1; }
 fi
 
 ret=0
@@ -39,5 +39,5 @@ for x in "$@" ; do
 	((ret|=$?))
 done
 
-[[ $ret -ne 0 ]] && helpers_die "$0 failed"
+[[ $ret -ne 0 ]] && helpers_die "${0##*/} failed"
 exit ${ret}
diff --git a/bin/ebuild-helpers/doman b/bin/ebuild-helpers/doman
index 0d95c18ba..1862f83e1 100755
--- a/bin/ebuild-helpers/doman
+++ b/bin/ebuild-helpers/doman
@@ -1,11 +1,11 @@
 #!/bin/bash
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 source "${PORTAGE_BIN_PATH:-/usr/lib/portage/bin}"/isolated-functions.sh
 
 if [[ $# -lt 1 ]] ; then
-	helpers_die "$0: at least one argument needed"
+	helpers_die "${0##*/}: at least one argument needed"
 	exit 1
 fi
 
@@ -60,5 +60,5 @@ for x in "$@" ; do
 	fi
 done
 
-[[ $ret -ne 0 ]] && helpers_die "$0 failed"
+[[ $ret -ne 0 ]] && helpers_die "${0##*/} failed"
 exit ${ret}
diff --git a/bin/ebuild-helpers/domo b/bin/ebuild-helpers/domo
index 43f78d010..4737f44e1 100755
--- a/bin/ebuild-helpers/domo
+++ b/bin/ebuild-helpers/domo
@@ -1,5 +1,5 @@
 #!/bin/bash
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 source "${PORTAGE_BIN_PATH:-/usr/lib/portage/bin}"/isolated-functions.sh
@@ -30,5 +30,5 @@ for x in "$@" ; do
 	((ret|=$?))
 done
 
-[[ $ret -ne 0 ]] && helpers_die "$0 failed"
+[[ $ret -ne 0 ]] && helpers_die "${0##*/} failed"
 exit $ret
diff --git a/bin/ebuild-helpers/dosbin b/bin/ebuild-helpers/dosbin
index a16015ed6..87a30914a 100755
--- a/bin/ebuild-helpers/dosbin
+++ b/bin/ebuild-helpers/dosbin
@@ -1,16 +1,16 @@
 #!/bin/bash
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 source "${PORTAGE_BIN_PATH:-/usr/lib/portage/bin}"/isolated-functions.sh
 
 if [[ $# -lt 1 ]] ; then
-	helpers_die "$0: at least one argument needed"
+	helpers_die "${0##*/}: at least one argument needed"
 	exit 1
 fi
 
 if [[ ! -d ${D}${DESTTREE}/sbin ]] ; then
-	install -d "${D}${DESTTREE}/sbin" || { helpers_die "$0: failed to install ${D}${DESTTREE}/sbin"; exit 2; }
+	install -d "${D}${DESTTREE}/sbin" || { helpers_die "${0##*/}: failed to install ${D}${DESTTREE}/sbin"; exit 2; }
 fi
 
 ret=0
@@ -25,5 +25,5 @@ for x in "$@" ; do
 	((ret|=$?))
 done
 
-[[ $ret -ne 0 ]] && helpers_die "$0 failed"
+[[ $ret -ne 0 ]] && helpers_die "${0##*/} failed"
 exit ${ret}
diff --git a/bin/ebuild-helpers/dosym b/bin/ebuild-helpers/dosym
index 1015a28e5..500dad094 100755
--- a/bin/ebuild-helpers/dosym
+++ b/bin/ebuild-helpers/dosym
@@ -1,11 +1,11 @@
 #!/bin/bash
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 source "${PORTAGE_BIN_PATH:-/usr/lib/portage/bin}"/isolated-functions.sh
 
 if [[ $# -ne 2 ]] ; then
-	helpers_die "$0: two arguments needed"
+	helpers_die "${0##*/}: two arguments needed"
 	exit 1
 fi
 
@@ -14,5 +14,5 @@ destdir=${2%/*}
 
 ln -snf "$1" "${D}$2"
 ret=$?
-[[ $ret -ne 0 ]] && helpers_die "$0 failed"
+[[ $ret -ne 0 ]] && helpers_die "${0##*/} failed"
 exit $ret
diff --git a/bin/ebuild-helpers/ecompress b/bin/ebuild-helpers/ecompress
index 8e6fc9c8d..ef01cd4e0 100755
--- a/bin/ebuild-helpers/ecompress
+++ b/bin/ebuild-helpers/ecompress
@@ -1,5 +1,5 @@
 #!/bin/bash
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 source "${PORTAGE_BIN_PATH:-/usr/lib/portage/bin}"/isolated-functions.sh
@@ -97,7 +97,7 @@ case $1 in
 		shift
 		touch "${@/%/.ecompress.file}"
 		ret=$?
-		[[ $ret -ne 0 ]] && helpers_die "$0 failed"
+		[[ $ret -ne 0 ]] && helpers_die "${0##*/} failed"
 		exit $ret
 		;;
 	--dequeue)
@@ -147,7 +147,7 @@ case $1 in
 		# Finally, let's actually do some real work
 		"${PORTAGE_COMPRESS}" ${PORTAGE_COMPRESS_FLAGS} "$@"
 		ret=$?
-		[[ $ret -ne 0 ]] && helpers_die "$0 failed"
+		[[ $ret -ne 0 ]] && helpers_die "${0##*/} failed"
 		exit $ret
 		;;
 esac
diff --git a/bin/ebuild-helpers/ecompressdir b/bin/ebuild-helpers/ecompressdir
index fdecaf0a2..6cbb53f9a 100755
--- a/bin/ebuild-helpers/ecompressdir
+++ b/bin/ebuild-helpers/ecompressdir
@@ -1,5 +1,5 @@
 #!/bin/bash
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 source "${PORTAGE_BIN_PATH:-/usr/lib/portage/bin}"/isolated-functions.sh
@@ -23,7 +23,7 @@ case $1 in
 		set -- "${@/#/${D}}"
 		touch "$@"
 		ret=$?
-		[[ $ret -ne 0 ]] && helpers_die "$0 failed"
+		[[ $ret -ne 0 ]] && helpers_die "${0##*/} failed"
 		exit $?
 		;;
 	--dequeue)
@@ -135,5 +135,5 @@ for dir in "$@" ; do
 	restore_skip_dirs
 done
 
-[[ $ret -ne 0 ]] && helpers_die "$0 failed"
+[[ $ret -ne 0 ]] && helpers_die "${0##*/} failed"
 exit ${ret}
diff --git a/bin/ebuild-helpers/emake b/bin/ebuild-helpers/emake
index b019bfe97..ca1901ef9 100755
--- a/bin/ebuild-helpers/emake
+++ b/bin/ebuild-helpers/emake
@@ -25,5 +25,5 @@ fi
 
 ${MAKE:-make} ${MAKEOPTS} ${EXTRA_EMAKE} "$@"
 ret=$?
-[[ $ret -ne 0 ]] && helpers_die "$0 failed"
+[[ $ret -ne 0 ]] && helpers_die "${0##*/} failed"
 exit $ret
diff --git a/bin/ebuild-helpers/fowners b/bin/ebuild-helpers/fowners
index 95a49fdad..4cc6bfacc 100755
--- a/bin/ebuild-helpers/fowners
+++ b/bin/ebuild-helpers/fowners
@@ -1,5 +1,5 @@
 #!/bin/bash
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 source "${PORTAGE_BIN_PATH:-/usr/lib/portage/bin}"/isolated-functions.sh
@@ -9,5 +9,5 @@ source "${PORTAGE_BIN_PATH:-/usr/lib/portage/bin}"/isolated-functions.sh
 slash="/"
 chown "${@/#${slash}/${D}${slash}}"
 ret=$?
-[[ $ret -ne 0 ]] && helpers_die "$0 failed"
+[[ $ret -ne 0 ]] && helpers_die "${0##*/} failed"
 exit $ret
diff --git a/bin/ebuild-helpers/fperms b/bin/ebuild-helpers/fperms
index cdd409a05..0260bdc47 100755
--- a/bin/ebuild-helpers/fperms
+++ b/bin/ebuild-helpers/fperms
@@ -1,5 +1,5 @@
 #!/bin/bash
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 source "${PORTAGE_BIN_PATH:-/usr/lib/portage/bin}"/isolated-functions.sh
@@ -9,5 +9,5 @@ source "${PORTAGE_BIN_PATH:-/usr/lib/portage/bin}"/isolated-functions.sh
 slash="/"
 chmod "${@/#${slash}/${D}${slash}}"
 ret=$?
-[[ $ret -ne 0 ]] && helpers_die "$0 failed"
+[[ $ret -ne 0 ]] && helpers_die "${0##*/} failed"
 exit $ret
diff --git a/bin/ebuild-helpers/newbin b/bin/ebuild-helpers/newbin
index 7bfb19407..30f19b062 100755
--- a/bin/ebuild-helpers/newbin
+++ b/bin/ebuild-helpers/newbin
@@ -1,11 +1,11 @@
 #!/bin/bash
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 source "${PORTAGE_BIN_PATH:-/usr/lib/portage/bin}"/isolated-functions.sh
 
 if [[ -z ${T} ]] || [[ -z ${2} ]] ; then
-	helpers_die "$0: Need two arguments, old file and new file"
+	helpers_die "${0##*/}: Need two arguments, old file and new file"
 	exit 1
 fi
 
diff --git a/bin/ebuild-helpers/newconfd b/bin/ebuild-helpers/newconfd
index 68a7ed76b..5752cfa7b 100755
--- a/bin/ebuild-helpers/newconfd
+++ b/bin/ebuild-helpers/newconfd
@@ -1,11 +1,11 @@
 #!/bin/bash
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 source "${PORTAGE_BIN_PATH:-/usr/lib/portage/bin}"/isolated-functions.sh
 
 if [[ -z ${T} ]] || [[ -z ${2} ]] ; then
-	helpers_die "$0: Need two arguments, old file and new file"
+	helpers_die "${0##*/}: Need two arguments, old file and new file"
 	exit 1
 fi
 
diff --git a/bin/ebuild-helpers/newdoc b/bin/ebuild-helpers/newdoc
index 1a353784d..f97ce0d67 100755
--- a/bin/ebuild-helpers/newdoc
+++ b/bin/ebuild-helpers/newdoc
@@ -1,11 +1,11 @@
 #!/bin/bash
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 source "${PORTAGE_BIN_PATH:-/usr/lib/portage/bin}"/isolated-functions.sh
 
 if [[ -z ${T} ]] || [[ -z ${2} ]] ; then
-	helpers_die "$0: Need two arguments, old file and new file"
+	helpers_die "${0##*/}: Need two arguments, old file and new file"
 	exit 1
 fi
 
diff --git a/bin/ebuild-helpers/newenvd b/bin/ebuild-helpers/newenvd
index c7a073202..83c556e7e 100755
--- a/bin/ebuild-helpers/newenvd
+++ b/bin/ebuild-helpers/newenvd
@@ -1,11 +1,11 @@
 #!/bin/bash
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 source "${PORTAGE_BIN_PATH:-/usr/lib/portage/bin}"/isolated-functions.sh
 
 if [[ -z ${T} ]] || [[ -z ${2} ]] ; then
-	helpers_die "$0: Need two arguments, old file and new file"
+	helpers_die "${0##*/}: Need two arguments, old file and new file"
 	exit 1
 fi
 
diff --git a/bin/ebuild-helpers/newexe b/bin/ebuild-helpers/newexe
index b2173fbfb..92dbe9f07 100755
--- a/bin/ebuild-helpers/newexe
+++ b/bin/ebuild-helpers/newexe
@@ -1,11 +1,11 @@
 #!/bin/bash
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 source "${PORTAGE_BIN_PATH:-/usr/lib/portage/bin}"/isolated-functions.sh
 
 if [[ -z ${T} ]] || [[ -z ${2} ]] ; then
-	helpers_die "$0: Need two arguments, old file and new file"
+	helpers_die "${0##*/}: Need two arguments, old file and new file"
 	exit 1
 fi
 
diff --git a/bin/ebuild-helpers/newinitd b/bin/ebuild-helpers/newinitd
index 384942604..fc6003ac2 100755
--- a/bin/ebuild-helpers/newinitd
+++ b/bin/ebuild-helpers/newinitd
@@ -1,11 +1,11 @@
 #!/bin/bash
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 source "${PORTAGE_BIN_PATH:-/usr/lib/portage/bin}"/isolated-functions.sh
 
 if [[ -z ${T} ]] || [[ -z ${2} ]] ; then
-	helpers_die "$0: Need two arguments, old file and new file"
+	helpers_die "${0##*/}: Need two arguments, old file and new file"
 	exit 1
 fi
 
diff --git a/bin/ebuild-helpers/newins b/bin/ebuild-helpers/newins
index 3d4870f8d..9da212fb5 100755
--- a/bin/ebuild-helpers/newins
+++ b/bin/ebuild-helpers/newins
@@ -1,11 +1,11 @@
 #!/bin/bash
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 source "${PORTAGE_BIN_PATH:-/usr/lib/portage/bin}"/isolated-functions.sh
 
 if [[ -z ${T} ]] || [[ -z ${2} ]] ; then
-	helpers_die "$0: Need two arguments, old file and new file"
+	helpers_die "${0##*/}: Need two arguments, old file and new file"
 	exit 1
 fi
 
@@ -22,12 +22,12 @@ case "$EAPI" in
 	*)
 		cp -P "$1" "$T/$2"
 		ret=$?
-		[[ $ret -ne 0 ]] && helpers_die "$0 failed"
+		[[ $ret -ne 0 ]] && helpers_die "${0##*/} failed"
 		exit $ret
 		;;
 esac
 doins "${T}/${2}"
 ret=$?
 rm -rf "${T}/${2}"
-[[ $ret -ne 0 ]] && helpers_die "$0 failed"
+[[ $ret -ne 0 ]] && helpers_die "${0##*/} failed"
 exit $ret
diff --git a/bin/ebuild-helpers/newlib.a b/bin/ebuild-helpers/newlib.a
index cdc908245..eef4104be 100755
--- a/bin/ebuild-helpers/newlib.a
+++ b/bin/ebuild-helpers/newlib.a
@@ -1,11 +1,11 @@
 #!/bin/bash
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 source "${PORTAGE_BIN_PATH:-/usr/lib/portage/bin}"/isolated-functions.sh
 
 if [[ -z ${T} ]] || [[ -z ${2} ]] ; then
-	helpers_die "$0: Need two arguments, old file and new file"
+	helpers_die "${0##*/}: Need two arguments, old file and new file"
 	exit 1
 fi
 
diff --git a/bin/ebuild-helpers/newlib.so b/bin/ebuild-helpers/newlib.so
index cd1469325..c8696f330 100755
--- a/bin/ebuild-helpers/newlib.so
+++ b/bin/ebuild-helpers/newlib.so
@@ -1,11 +1,11 @@
 #!/bin/bash
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 source "${PORTAGE_BIN_PATH:-/usr/lib/portage/bin}"/isolated-functions.sh
 
 if [[ -z ${T} ]] || [[ -z ${2} ]] ; then
-	helpers_die "$0: Need two arguments, old file and new file"
+	helpers_die "${0##*/}: Need two arguments, old file and new file"
 	exit 1
 fi
 
diff --git a/bin/ebuild-helpers/newman b/bin/ebuild-helpers/newman
index fdc2fe629..ffb8a2de1 100755
--- a/bin/ebuild-helpers/newman
+++ b/bin/ebuild-helpers/newman
@@ -1,11 +1,11 @@
 #!/bin/bash
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 source "${PORTAGE_BIN_PATH:-/usr/lib/portage/bin}"/isolated-functions.sh
 
 if [[ -z ${T} ]] || [[ -z ${2} ]] ; then
-	helpers_die "$0: Need two arguments, old file and new file"
+	helpers_die "${0##*/}: Need two arguments, old file and new file"
 	exit 1
 fi
 
diff --git a/bin/ebuild-helpers/newsbin b/bin/ebuild-helpers/newsbin
index 4d21549af..82242aa95 100755
--- a/bin/ebuild-helpers/newsbin
+++ b/bin/ebuild-helpers/newsbin
@@ -1,11 +1,11 @@
 #!/bin/bash
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 source "${PORTAGE_BIN_PATH:-/usr/lib/portage/bin}"/isolated-functions.sh
 
 if [[ -z ${T} ]] || [[ -z ${2} ]] ; then
-	helpers_die "$0: Need two arguments, old file and new file"
+	helpers_die "${0##*/}: Need two arguments, old file and new file"
 	exit 1
 fi
 
diff --git a/bin/ebuild.sh b/bin/ebuild.sh
index 8813bd6d0..432da6465 100755
--- a/bin/ebuild.sh
+++ b/bin/ebuild.sh
@@ -780,7 +780,7 @@ into() {
 			install -d "${D}${DESTTREE}"
 			local ret=$?
 			if [[ $ret -ne 0 ]] ; then
-				helpers_die "$0 failed"
+				helpers_die "${FUNCNAME[0]} failed"
 				return $ret
 			fi
 		fi
@@ -796,7 +796,7 @@ insinto() {
 			install -d "${D}${INSDESTTREE}"
 			local ret=$?
 			if [[ $ret -ne 0 ]] ; then
-				helpers_die "$0 failed"
+				helpers_die "${FUNCNAME[0]} failed"
 				return $ret
 			fi
 		fi
@@ -812,7 +812,7 @@ exeinto() {
 			install -d "${D}${_E_EXEDESTTREE_}"
 			local ret=$?
 			if [[ $ret -ne 0 ]] ; then
-				helpers_die "$0 failed"
+				helpers_die "${FUNCNAME[0]} failed"
 				return $ret
 			fi
 		fi
@@ -828,7 +828,7 @@ docinto() {
 			install -d "${D}usr/share/doc/${PF}/${_E_DOCDESTTREE_}"
 			local ret=$?
 			if [[ $ret -ne 0 ]] ; then
-				helpers_die "$0 failed"
+				helpers_die "${FUNCNAME[0]} failed"
 				return $ret
 			fi
 		fi