Index: ebuild.sh
===================================================================
--- ebuild.sh	(revision 4491)
+++ ebuild.sh	(working copy)
@@ -256,6 +256,13 @@
 	echo "!!! ${*:-(no error message)}" >&2
 	echo "!!! If you need support, post the topmost build error, and the call stack if relevant." >&2
 	echo >&2
+	if [ -n "${ECLASS_SOURCES}" ] ; then
+		echo "This ebuild used the following eclasses from overlays:"
+		for x in ${ECLASS_SOURCES} ; do
+			echo "${x}"
+		done
+	fi
+
 	if [ "${EBUILD_PHASE/depend}" == "${EBUILD_PHASE}" ]; then
 		local x
 		for x in $EBUILD_DEATH_HOOKS; do
@@ -1181,6 +1188,9 @@
 				olocation="${overlay}/eclass/${1}.eclass"
 				if [ -e "$olocation" ]; then
 					location="${olocation}"
+					if ! hasq "${location}" "${ECLASS_SOURCES}" ; then
+						ECLASS_SOURCES="${ECLASS_SOURCES} ${location}"
+					fi
 					debug-print "  eclass exists: ${location}"
 				fi
 			done