--- /usr/portage/sys-devel/gcc/gcc-3.1.ebuild	Fri May 17 10:42:30 2002
+++ /usr/portage/sys-devel/gcc/gcc-3.1.ebuild	Fri May 17 16:51:36 2002
@@ -32,11 +32,13 @@ 
 	if [ -z "`use build`" ] && \
 	   [ -z "`use bootstrap`" ] && \
 	   [ "`gcc --version | cut -f1 -d.`" -ne 3 ] && \
-	   [ "${profile/gcc3}" = "${profile}" ] && \
+	   [ "${profile/-gcc3}" = "${profile}" ] && \
 	   [ "${GCCBUILD}" != "default" ]
 	then
+		einfo "${BAD}Building multipls${NORMAL}"
 		return 0
 	else
+		einfo "${GOOD}Not building multiple${NORMAL}"
 		return 1
 	fi	  
 }
@@ -60,10 +62,11 @@ 
 	cd ${S}
 	#fixes the build system to properly do the transformation
 	#of the binaries (thanks to Mandrake)
-	if build_multiple
-	then
-		patch -p1 <${FILESDIR}/gcc3-program-transform.patch || die
-	fi
+	#5/17/02 - This patch appears to be in the gcc-3.1.0 release
+	#if build_multiple
+	#then
+	#	patch -p1 <${FILESDIR}/gcc3-program-transform.patch || die
+	#fi
 
 	#fixup libtool to correctly generate .la files with portage
 	patch <${FILESDIR}/libtool-1.4.1-portage.patch-v3 || die