--- net-libs/libetpan/libetpan-0.57-r1.ebuild	2010-01-10 20:37:03.000000000 +0100
+++ net-libs/libetpan/libetpan-0.57-r1.ebuild	2010-03-20 19:14:51.152801062 +0100
@@ -2,6 +2,10 @@ 
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/net-libs/libetpan/libetpan-0.57-r1.ebuild,v 1.2 2010/01/10 18:50:26 a3li Exp $
 
+EAPI="2"
+
+inherit autotools eutils
+
 DESCRIPTION="A portable, efficient middleware for different kinds of mail access."
 HOMEPAGE="http://libetpan.sourceforge.net"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
@@ -17,15 +21,12 @@ 
 	sasl? ( dev-libs/cyrus-sasl )
 	liblockfile? ( net-libs/liblockfile )"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	# temp fix for bug #286620, also look for db-4.8, upstream will likely fix
-	# this in their next release
-	sed -i -e '/db-4.7 db-4.6/s/db-4.7/db-4.8 db-4.7/' configure || die
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-QA.patch
+	eautoreconf
 }
 
-src_compile() {
+src_configure() {
 	local sslconf
 
 	if use ssl; then
@@ -57,8 +58,6 @@ 
 		$(use_enable liblockfile lockfile) \
 		${sslconf} \
 		|| die "econf failed"
-
-	emake || die "emake failed"
 }
 
 src_install() {