--- claws-mail-3.7.5.ebuild	2010-03-11 13:05:51.000000000 -0800
+++ claws-mail-3.7.5-r1.ebuild	2010-04-10 02:57:36.191249324 -0700
@@ -1,8 +1,10 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/claws-mail/claws-mail-3.7.5.ebuild,v 1.5 2010/03/11 20:39:27 maekke Exp $
+# $Header: $
 
-inherit eutils multilib
+EAPI="2"
+
+inherit eutils multilib autotools
 
 DESCRIPTION="An email client (and news reader) based on GTK+"
 HOMEPAGE="http://www.claws-mail.org/"
@@ -12,7 +14,7 @@
 SLOT="0"
 LICENSE="GPL-3"
 KEYWORDS="alpha amd64 hppa ~ppc ~ppc64 sparc x86 ~x86-fbsd"
-IUSE="bogofilter crypt dbus dillo doc gnome gnutls imap ipv6 ldap nntp pda session smime spamassassin spell ssl startup-notification xface"
+IUSE="bogofilter crypt dbus dillo doc gnome +gnutls +imap ipv6 ldap nntp pda session smime spamassassin spell ssl startup-notification xface"
 
 COMMONDEPEND=">=x11-libs/gtk+-2.6
 	pda? ( >=app-pda/jpilot-0.99 )
@@ -42,16 +44,28 @@
 
 PLUGIN_NAMES="acpi-notifier archive att-remover attachwarner bsfilter cachesaver fancy fetchinfo gtkhtml mailmbox newmail notification perl rssyl spam_report tnef_parse vcalendar"
 
-src_compile() {
-	local myconf="--disable-libetpan --disable-gnutls"
+src_prepare() {
+	# fix configure check for >libetpan-0.57 (bug #314181)
+	epatch "${FILESDIR}"/${P}-fix-libetpan-check.patch
+	eautoreconf
+}
 
+src_configure() {
+	local myconf
 	# libetpan is needed if user wants nntp or imap functionality
-	use imap && myconf="${myconf} --enable-libetpan"
-	use nntp && myconf="${myconf} --enable-libetpan"
+	if use imap || use nntp; then
+		myconf="--enable-libetpan"
+	else
+		myconf="--disable-libetpan"
+	fi
+
 	# The usage of openssl was discarded once and USE=ssl is mapped to
 	# USE=gnutls now.  Maybe USE=ssl can fade out sometime
-	use ssl && myconf="${myconf} --enable-gnutls"
-	use gnutls && myconf="${myconf} --enable-gnutls"
+	if use ssl || use gnutls; then
+		myconf="${myconf} --enable-gnutls"
+	else
+		myconf="${myconf} --disable-gnutls"
+	fi
 
 	econf \
 		$(use_enable gnome gnomeprint) \
@@ -73,9 +87,7 @@
 		$(use_enable smime smime-plugin) \
 		--docdir=/usr/share/doc/${PF} \
 		--enable-trayicon-plugin \
-		--disable-maemo ${myconf} || die
-
-	emake || die
+		--disable-maemo ${myconf}
 }
 
 src_install() {