--- sylpheed-2.4.0.ebuild	2007-05-07 17:30:23.000000000 +0900
+++ sylpheed-2.4.1.ebuild	2007-05-07 19:13:36.000000000 +0900
@@ -1,17 +1,17 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/sylpheed/sylpheed-2.4.0.ebuild,v 1.10 2007/05/06 10:49:20 hattya Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/sylpheed/sylpheed-2.4.0.ebuild,v 1.9 2007/05/05 12:37:10 jer Exp $
 
-inherit autotools eutils
+inherit autotools eutils flag-o-matic
 
-IUSE="crypt ipv6 ldap nls pda spell ssl xface"
+IUSE="crypt ipv6 ldap maildir nls pda spell ssl xface"
 
 DESCRIPTION="A lightweight email client and newsreader"
 HOMEPAGE="http://sylpheed.sraoss.jp/"
 SRC_URI="http://sylpheed.sraoss.jp/${PN}/v${PV%.*}/${P}.tar.bz2"
 
-LICENSE="GPL-2"
-KEYWORDS="~alpha amd64 hppa ia64 ppc ppc64 sparc x86"
+LICENSE="GPL-2 LGPL-2.1"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 SLOT="0"
 
 DEPEND=">=x11-libs/gtk+-2.4
@@ -42,6 +42,7 @@
 }
 
 src_compile() {
+	use maildir && append-flags '-D_PATH_MAILDIR=\"".maildir"\"'
 
 	econf \
 		`use_enable crypt gpgme` \
@@ -52,21 +53,19 @@
 		`use_enable spell gtkspell` \
 		`use_enable ssl` \
 		`use_enable xface compface` \
-		|| die
+		--with-manualdir=/usr/share/doc/${PF}/html/manual \
+		--with-faqdir=/usr/share/doc/${PF}/html/faq || die
 	emake || die
 
 }
 
 src_install() {
 
-	emake DESTDIR="${D}" install
+	emake DESTDIR="${D}" install || die
 
-	dodir /usr/share/pixmaps
-	insinto /usr/share/pixmaps
-	doins *.png
+	doicon *.png
 
-	insinto /usr/share/applications
-	doins sylpheed.desktop
+	domenu sylpheed.desktop
 
 	dodoc AUTHORS ChangeLog* NEWS* README* TODO*