--- /usr/portage/media-sound/bpmdetect/bpmdetect-0.6.1.ebuild	2009-06-03 21:08:52.000000000 +0100
+++ bpmdetect-0.6.1.ebuild	2010-11-12 13:50:47.109000031 +0000
@@ -3,7 +3,7 @@
 # $Header: /var/cvsroot/gentoo-x86/media-sound/bpmdetect/bpmdetect-0.6.1.ebuild,v 1.2 2009/06/03 19:37:07 ssuominen Exp $
 
 EAPI=2
-inherit eutils multilib
+inherit eutils multilib toolchain-funcs
 
 DESCRIPTION="Automatic BPM detection utility"
 HOMEPAGE="http://sourceforge.net/projects/bpmdetect"
@@ -27,12 +27,13 @@
 
 src_prepare() {
 	epatch "${FILESDIR}"/${P}-gcc44_and_fmodex_path.patch
-	sed -i -e "s:-O2:${CXXFLAGS}:" src/SConscript || die "sed failed"
+	epatch "${FILESDIR}"/${P}-SConscript.patch
 }
 
 src_configure() { :; }
 
 src_compile() {
+	tc-export CC CXX
 	export QTDIR="/usr/$(get_libdir)"
 	scons prefix=/usr || die "scons failed"
 }