Index: ebuild.sh
===================================================================
RCS file: /var/cvsroot/gentoo-src/portage/bin/ebuild.sh,v
retrieving revision 1.174
diff -u -b -B -w -p -r1.174 ebuild.sh
--- ebuild.sh	22 Jun 2004 13:07:47 -0000	1.174
+++ ebuild.sh	27 Jun 2004 00:37:58 -0000
@@ -408,7 +408,15 @@ unpack() {
 }
 
 econf() {
+	local x
 	if [ -x ./configure ]; then
+		if ! hasq noautoconfig $FEATURES ; then
+			[ -e /usr/share/gnuconfig/ -a -x /bin/basename ] &&
+				for x in $(find ${S} -name config.guess -o -name config.sub) ; do
+					echo "econf updating $x with /usr/share/gnuconfig/$(basename ${x})"
+					cp /usr/share/gnuconfig/$(basename ${x}) ${x}
+				done
+		fi
 		if [ ! -z "${CBUILD}" ]; then
 			EXTRA_ECONF="--build=${CBUILD} ${EXTRA_ECONF}"
 		fi