--- bin/ebuild.sh.orig	2006-11-17 11:50:57.947240000 +0100
+++ bin/ebuild.sh	2006-11-17 11:42:08.047237000 +0100
@@ -1207,7 +1207,7 @@
 		umask 002
 		(	echo 'unset ENV'
 			set | egrep -v '^(BASH_VERSINFO|EUID|PPID|SHELLOPTS|UID)='
-			export -p | grep -v 'declare -rx'
+			export -p | sed -e 's:^declare -rx:declare -x:'
 			shopt -p
 			echo "export PS1='EBUILD ${PN} $1 \$ '" 
 			echo 'unset ENV'
@@ -1215,6 +1215,7 @@
 			# it needs to be 'export VAR=val'.
 			# is this a bash-bug or intentional ?
 			echo "trap 'umask 002; ( set ; export -p | sed -e \"s:declare -x:export:\" ) > ${T}/ebuildshell-environment-outcome' 0"
+			echo "type $1"
 		) > ${T}/ebuildshell-environment
 		chown portage:portage "${T}/ebuildshell-environment" &>/dev/null
 		chmod g+w "${T}/ebuildshell-environment" &>/dev/null