--- valgrind-3.2.0.ebuild.old	2006-06-07 11:24:49.000000000 +0200
+++ valgrind-3.2.0.ebuild	2006-06-11 09:47:22.000000000 +0200
@@ -32,13 +32,10 @@
 	sed -i -e "s:doc/valgrind/:doc/${P}/:" docs/Makefile.am
 
 	einfo "Regenerating autotools files..."
 	autoconf || die "autoconf failed"
 	automake || die "automake failed"
-
-	# fix for amd64 no-multilib profile till valgrind 3.2.0 is out (bug #114407)
-	use amd64 && (has_multilib_profile || epatch "${FILESDIR}/valgrind-3.1.0-amd64-nomultilib-fix.patch")
 }
 
 src_compile() {
 	local myconf
 
@@ -55,10 +52,13 @@
 	replace-flags -ggdb3 -ggdb2
 
 	# Optionally build in X suppression files
 	use X && myconf="--with-x" || myconf="--with-x=no"
 
+	# fix for amd64 no-multilib profile till valgrind 3.2.0 is out (bug #114407)
+	if use amd64; then has_multilib_profile || myconf="${myconf} --enable-only64bit"; fi
+
 	econf ${myconf} || die "Configure failed!"
 	emake || die "Make failed!"
 }
 
 src_install() {