--- buffer-1.19-r2.ebuild	2010-12-03 00:58:07.000000000 +0100
+++ buffer-1.19-r2.ebuild	2010-12-03 01:19:29.586210281 +0100
@@ -2,6 +2,8 @@ 
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/sys-block/buffer/buffer-1.19-r2.ebuild,v 1.4 2010/12/02 23:58:07 xmw Exp $
 
+EAPI=2
+
 inherit eutils flag-o-matic toolchain-funcs
 
 DESCRIPTION="a tapedrive tool for speeding up reading from and writing to tape"
@@ -10,25 +12,24 @@ 
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ppc ~sparc x86"
+KEYWORDS="~amd64 ~arm ~ppc ~sparc ~x86"
 IUSE=""
 
 DEPEND=""
 
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/${PV}-deb-gentoo.patch
-	make clean || die "make clean failed"
+src_prepare() {
+	epatch "${FILESDIR}"/${PV}-deb-gentoo.patch
+	epatch "${FILESDIR}"/${PV}-LDFLAGS.patch
+	emake clean || die
 }
 
 src_compile() {
 	append-lfs-flags
-	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" || die "make failed"
+	emake CC="$(tc-getCC)" || die
 }
 
 src_install() {
 	dobin buffer || die
-	dodoc README
-	newman buffer.man buffer.1
+	dodoc README || die
+	newman buffer.man buffer.1 || die
 }