--- flac-1.2.1-r2.ebuild.orig	2008-02-21 14:55:25 +0000
+++ flac-1.2.1-r2.ebuild	2008-02-21 14:56:16 +0000
@@ -19,7 +19,6 @@
 DEPEND="${RDEPEND}
 	x86? ( dev-lang/nasm )
 	sys-apps/gawk
-	sys-devel/gettext
 	dev-util/pkgconfig"
 
 src_unpack() {
@@ -30,13 +29,10 @@
 	# ldflag asneeded on non glibc systems. Fix
 	# broken asm causing text relocations.
 	epatch "${FILESDIR}"/${P}-asneeded.patch
-	epatch "${FILESDIR}"/${P}-cflags.patch
 	epatch "${FILESDIR}"/${P}-asm.patch
 
 	# Fix build with gcc 4.3, bug #199579
 	epatch "${FILESDIR}/${P}-gcc-4.3-includes.patch"
-
-	AT_M4DIR="m4" eautoreconf
 }
 
 src_compile() {
@@ -50,7 +46,7 @@
 		--disable-dependency-tracking \
 		--disable-xmms-plugin
 
-	emake || die "emake failed."
+	emake CFLAGS="$CFLAGS" || die "emake failed."
 }
 
 src_install() {