--- /usr/lib/portage/bin/ebuild.sh	2006-06-06 10:04:28.000000000 +0200
+++ /files/ebuild.sh	2006-06-08 09:32:09.000000000 +0200
@@ -247,7 +247,7 @@
 }
 
 diefunc() {
-	local funcname="$1" lineno="$2" exitcode="$3"
+	local funcname="$1" lineno="$2" exitcode="$3" overlay
 	shift 3
 	echo >&2
 	echo "!!! ERROR: $CATEGORY/$PF failed." >&2
@@ -256,6 +256,11 @@
 	echo >&2
 	echo "!!! ${*:-(no error message)}" >&2
 	echo "!!! If you need support, post the topmost build error, and the call stack if relevant." >&2
+	for overlay in ${PORTDIR_OVERLAY}; do
+		if [ "$(echo ${EBUILD} | sed -e "s:/[^/]*/[^/]*/[^/]*.ebuild::")" == "$overlay" ]; then
+			echo "!!! You are using the "$overlay" Portage Overlay - Please disable it before reporting bugs"
+		fi
+	done
 	echo >&2
 	if [ "${EBUILD_PHASE/depend}" == "${EBUILD_PHASE}" ]; then
 		local x