--- libetpan-0.57-r1.ebuild	2010-01-10 11:37:03.000000000 -0800
+++ libetpan-0.58.ebuild	2010-04-08 03:54:16.101496760 -0700
@@ -1,6 +1,10 @@
 # Copyright 1999-2010 Gentoo Foundation
 # 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 $
+# $Header: $
+
+EAPI="2"
+
+inherit eutils autotools
 
 DESCRIPTION="A portable, efficient middleware for different kinds of mail access."
 HOMEPAGE="http://libetpan.sourceforge.net"
@@ -17,15 +21,13 @@
 	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() {
+	# Fixes for bug #286620 (db-4.8 detection) and debug flag handling
+	epatch "${FILESDIR}"/${P}-configure-fixes.patch
+	eautoreconf
 }
 
-src_compile() {
+src_configure() {
 	local sslconf
 
 	if use ssl; then
@@ -45,31 +47,17 @@
 	# in Prefix emake uses SHELL=${BASH}, export CONFIG_SHELL to the same so
 	# libtool recognises it as valid shell (bug #300211)
 	use prefix && export CONFIG_SHELL=${BASH}
-	# The configure script contains an error, in that it doesn't check the
-	# argument of --enable-{debug,optim}, hence --disable-debug results in
-	# --enable-debug=no, which isn't checked and debugging flags are blindly
-	# injected.  So, avoid passing --disable-debug when we don't need it.
+
 	econf \
-		$(use debug && echo --enable-debug) \
+		$(use_enable debug) \
 		$(use_enable berkdb db) \
 		$(use_with sasl) \
 		$(use_enable ipv6) \
 		$(use_enable liblockfile lockfile) \
-		${sslconf} \
-		|| die "econf failed"
-
-	emake || die "emake failed"
+		${sslconf}
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die
+	emake DESTDIR="${D}" install || die "emake install failed"
 	dodoc NEWS ChangeLog
 }
-
-pkg_postinst() {
-	echo
-	ewarn "The soname for libetpan has changed after libetpan-0.53."
-	ewarn "If you have upgraded from that or earlier version, it is recommended to run"
-	ewarn "revdep-rebuild to fix any linking errors caused by this change."
-	echo
-}