stable on x86. update to EAPI 4.

Package-Manager: portage-2.1.10.3/cvs/Linux i686

9 files changed, 64 insertions, 240 deletions

diff --git a/mail-client/sylpheed/ChangeLog b/mail-client/sylpheed/ChangeLog
index 4cb8b85f1422..cb7fe17b256a 100644
--- a/mail-client/sylpheed/ChangeLog
+++ b/mail-client/sylpheed/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for mail-client/sylpheed
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/sylpheed/ChangeLog,v 1.290 2011/05/07 16:45:02 hattya Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/sylpheed/ChangeLog,v 1.291 2011/08/13 11:23:51 hattya Exp $
+
+  13 Aug 2011; Akinori Hattori <hattya@gentoo.org>
+  files/sylpheed-2.1-shared-mime-info.diff, files/sylpheed-2.4-firefox.diff,
+  sylpheed-2.6.0.ebuild, -files/sylpheed-2.7-shared-mime-info.diff,
+  -sylpheed-3.0.3.ebuild, -files/sylpheed-3.0-enchant.diff,
+  sylpheed-3.1.1.ebuild:
+  stable on x86. update to EAPI 4.
 
   07 May 2011; Akinori Hattori <hattya@gentoo.org> -sylpheed-3.0.2.ebuild,
   sylpheed-3.0.3.ebuild:
diff --git a/mail-client/sylpheed/Manifest b/mail-client/sylpheed/Manifest
index 646cee5c5aff..808c9a55cb7e 100644
--- a/mail-client/sylpheed/Manifest
+++ b/mail-client/sylpheed/Manifest
@@ -1,13 +1,19 @@
-AUX sylpheed-2.1-shared-mime-info.diff 1637 RMD160 8439c41dbd570dfc37f7a0c268a47c1d263c6dcc SHA1 851f35dd097a26fc245a43117f95839c01f1ff1d SHA256 f1a8ee5c6597a8b31eb8abfdcd5775a56d0c2b4f1fe180abf9c04805d067ea72
-AUX sylpheed-2.4-firefox.diff 612 RMD160 67c11c67c4c4b506215780a28d462f729d28fd21 SHA1 499d8de33f4daf252efeadb362ebceb52217b648 SHA256 cc9b955cb5f6b0276265caff123a13345439ee5a5ca6ab49303f5e141ba359d8
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX sylpheed-2.1-shared-mime-info.diff 1321 RMD160 c6534cd0df3b559dc3f1de3b45cd3c60d800e267 SHA1 d00e96d612cefd6894567f84d129e24a0c733a16 SHA256 fba8fb53254a90b09e5da73a490a598364438e3e83cebbc88ff5232eae9d4ca0
+AUX sylpheed-2.4-firefox.diff 462 RMD160 cdfac916670401f1679e1208a452197185b09c2a SHA1 197a341215d66fe95807eab93e086837100d371b SHA256 1a371c6a2c97459ca1922a48e35a172e2033cc620ea6e2faa8a05aa132a0ccaa
 AUX sylpheed-2.5-enchant.diff 657 RMD160 60a9f01e855283860606ff39d7efceab24f94f22 SHA1 8c2a0b08ab739dc35d57edcbb6a3a29f5c25f6b0 SHA256 b47b4829cfe20215c6daf3a80a2b3ba1afbf529ca3212986246316e9655fefab
-AUX sylpheed-2.7-shared-mime-info.diff 1537 RMD160 281d4e57483ec5a4ea47b0449b2da643d9ec1393 SHA1 d828c1aa80cccc4c6ca00daf21b35fc1fbee6889 SHA256 9cf57d8e0750df6ef11a3107c119295fa1cc721e029be3fb4777e004b2174428
-AUX sylpheed-3.0-enchant.diff 1048 RMD160 8f92c0558d3feb95c2f9d7ae114dcd577a948031 SHA1 0f9df320f135af1c9291f45844826548fd1c6639 SHA256 378aa234254738b95f25869f44a647493ddb1d708ac4deadb0424f8b6f016b87
 DIST sylpheed-2.6.0.tar.bz2 2833188 RMD160 a4eb3b11d297dce1c42c23ceb553680b0942d75c SHA1 122fe608b5a7cb5a262da65908b1f5cf67a0123f SHA256 121b9f69d5501be2caa8419d5cf1351436db4b43af9f2083b07e59f1def31f51
-DIST sylpheed-3.0.3.tar.bz2 2988634 RMD160 bf235147f660d5301623941f86c3680b63c24620 SHA1 b12f7dbe40de408717229e2b6a4a2ac3218c5985 SHA256 9625525564542cdf65cf929a691a80513a549baf0f9b89c37e26948255648f75
 DIST sylpheed-3.1.1.tar.bz2 3234408 RMD160 c341b8cba926d9e7bc60e07398f0766da6774e73 SHA1 1217c528f2362311922518a89b4d4866bfa09cd0 SHA256 c4801601013326dcf53512552f8a903dc7289aa56ae9bd7e28e103c5aae19b9f
-EBUILD sylpheed-2.6.0.ebuild 1636 RMD160 6aae94fd381e972363ea7da15c9da41eb24e6e9d SHA1 02a4480502b407acd5f0be84ced46c905dd7270f SHA256 1e2a69e4ad97c6e3f19be2d229bf25c5b6cfc65a7689ba64f65c06ccaadf093f
-EBUILD sylpheed-3.0.3.ebuild 1643 RMD160 6289f61b584909da06afc94418a5e76adb41d287 SHA1 58f3fb7d93789dbab2245302df6094a3ffe3b385 SHA256 0b55abf362c3feab4ea612e4bd13aca90f66b32db9f4ebfbc073e5ddfbc794ec
-EBUILD sylpheed-3.1.1.ebuild 1613 RMD160 5f5edb44514279d25d1abbb10772c7d2c09d3ca1 SHA1 9a4a761c51ba49b2ed45ce3e1c3a86cfa4c6cdbb SHA256 88ac3a52cf40104cb873ebb0c9e4e50025290e6b11e14e19dde8dafb444eae78
-MISC ChangeLog 45778 RMD160 f4d597014192351f1865ce482406ef220e44b9d9 SHA1 0aa5cb905a12ca8dddaf8f0620fd8a07ac07923f SHA256 612a96874625aa2e9341175d4e1f5777746e0db4e953912015afc78877114de3
+EBUILD sylpheed-2.6.0.ebuild 1514 RMD160 294dbf6b7ada57c46214f437dee0788007c35968 SHA1 fb41aaf607f33d38b2f9ae337680bd8d3dbbbad8 SHA256 0b5dc4502a5cc44a7d40781d718aee44a3e23a868ec4e5c56dd581392f799f04
+EBUILD sylpheed-3.1.1.ebuild 1453 RMD160 8754925179619c81b874272ab27aff3b9fdb552f SHA1 bad9e07c481fbd153ada9f480999bc06b05809b3 SHA256 1a3152369e4e0deaf3bae60c3c42f3c9534297bfc72a25e4e3da2e922e9eb1ca
+MISC ChangeLog 46095 RMD160 e99ff3642109550cca5e67df0ede27a148814deb SHA1 826ac96c8def8c50bb5737f676299a4d45c5cf45 SHA256 6caa3aa31132c987a3c3f6bbb7670b036158e3acd7fe3f9ec3b9d0913d2ea88e
 MISC metadata.xml 339 RMD160 a2956f18abd8c76fa16702bbbd18052b17eef412 SHA1 955fea53cc8a0e171611a3ef0301ac4a8f4381c6 SHA256 ba4beec56bd0eaed052b930e04b2a31aec70c619a91fdee00ecfa33f2d4c8c1d
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iEYEARECAAYFAk5GXtUACgkQL46suuyRem2DggCfbX53UCyIHEH9l6a3Hya+CjSz
+DqQAni5BvT+YkxVVb1HfpIXe6k/I8VMV
+=gxGV
+-----END PGP SIGNATURE-----
diff --git a/mail-client/sylpheed/files/sylpheed-2.1-shared-mime-info.diff b/mail-client/sylpheed/files/sylpheed-2.1-shared-mime-info.diff
index d16352d58eec..449b907ccd8c 100644
--- a/mail-client/sylpheed/files/sylpheed-2.1-shared-mime-info.diff
+++ b/mail-client/sylpheed/files/sylpheed-2.1-shared-mime-info.diff
@@ -1,6 +1,5 @@
-diff -urN sylpheed-2.1.3.orig/libsylph/Makefile.am sylpheed-2.1.3/libsylph/Makefile.am
---- sylpheed-2.1.3.orig/libsylph/Makefile.am	2005-09-08 16:24:49.000000000 +0900
-+++ sylpheed-2.1.3/libsylph/Makefile.am	2005-10-02 20:56:56.940000000 +0900
+--- sylpheed-2.1.3.orig/libsylph/Makefile.am
++++ sylpheed-2.1.3/libsylph/Makefile.am
 @@ -1,7 +1,8 @@
  
  AM_CPPFLAGS = \
@@ -11,9 +10,8 @@ diff -urN sylpheed-2.1.3.orig/libsylph/Makefile.am sylpheed-2.1.3/libsylph/Makef
  
  INCLUDES = $(GLIB_CFLAGS) -I$(top_srcdir) -I$(includedir)
  
-diff -urN sylpheed-2.1.3.orig/libsylph/procmime.c sylpheed-2.1.3/libsylph/procmime.c
---- sylpheed-2.1.3.orig/libsylph/procmime.c	2005-09-22 20:18:02.000000000 +0900
-+++ sylpheed-2.1.3/libsylph/procmime.c	2005-10-02 20:57:55.920000000 +0900
+--- sylpheed-2.1.3.orig/libsylph/procmime.c
++++ sylpheed-2.1.3/libsylph/procmime.c
 @@ -1051,6 +1051,9 @@
  		g_free(dir);
  		mime_type_list = g_list_concat(mime_type_list, list);
diff --git a/mail-client/sylpheed/files/sylpheed-2.4-firefox.diff b/mail-client/sylpheed/files/sylpheed-2.4-firefox.diff
index 79ee3159af01..7e7da03940be 100644
--- a/mail-client/sylpheed/files/sylpheed-2.4-firefox.diff
+++ b/mail-client/sylpheed/files/sylpheed-2.4-firefox.diff
@@ -1,6 +1,5 @@
-diff -Naur sylpheed-2.4.1.orig/libsylph/defs.h sylpheed-2.4.1/libsylph/defs.h
---- sylpheed-2.4.1.orig/libsylph/defs.h	2006-09-22 11:58:56.000000000 +0900
-+++ sylpheed-2.4.1/libsylph/defs.h	2007-05-07 17:25:18.000000000 +0900
+--- sylpheed-2.4.1.orig/libsylph/defs.h
++++ sylpheed-2.4.1/libsylph/defs.h
 @@ -92,7 +92,7 @@
  /* #define DEFAULT_INC_PATH	"/usr/bin/imget" */
  /* #define DEFAULT_INC_PROGRAM	"imget" */
diff --git a/mail-client/sylpheed/files/sylpheed-2.7-shared-mime-info.diff b/mail-client/sylpheed/files/sylpheed-2.7-shared-mime-info.diff
deleted file mode 100644
index 4e0783dc0214..000000000000
--- a/mail-client/sylpheed/files/sylpheed-2.7-shared-mime-info.diff
+++ /dev/null
@@ -1,55 +0,0 @@
-Index: libsylph/procmime.c
-===================================================================
---- libsylph/procmime.c	(revision 2195)
-+++ libsylph/procmime.c	(working copy)
-@@ -1483,6 +1483,9 @@
- 		g_free(dir);
- 		mime_type_list = g_list_concat(mime_type_list, list);
- 
-+		list = procmime_get_mime_type_list(DATADIR "/mime/globs");
-+		mime_type_list = g_list_concat(mime_type_list, list);
-+
- 		if (!mime_type_list) {
- 			debug_print("mime.types not found\n");
- 			return NULL;
-@@ -1535,7 +1538,7 @@
- 		g_strstrip(buf);
- 
- 		p = buf;
--		while (*p && !g_ascii_isspace(*p)) p++;
-+		while (*p && !g_ascii_isspace(*p) && *p != ':') p++;
- 		if (*p) {
- 			*p = '\0';
- 			p++;
-@@ -1548,7 +1551,7 @@
- 		mime_type->type = g_strdup(buf);
- 		mime_type->sub_type = g_strdup(delim + 1);
- 
--		while (*p && g_ascii_isspace(*p)) p++;
-+		while (*p && (g_ascii_isspace(*p) || *p == '*' || *p == '.')) p++;
- 		if (*p)
- 			mime_type->extension = g_strdup(p);
- 		else
-@@ -1560,7 +1563,7 @@
- 	fclose(fp);
- 
- 	if (!list)
--		g_warning("Can't read mime.types\n");
-+		g_warning("Can't read %s\n", file);
- 
- 	return list;
- }
-Index: libsylph/Makefile.am
-===================================================================
---- libsylph/Makefile.am	(revision 2195)
-+++ libsylph/Makefile.am	(working copy)
-@@ -2,7 +2,8 @@
- AM_CPPFLAGS = \
- 	-DG_LOG_DOMAIN=\"LibSylph\" \
- 	-DSYSCONFDIR=\""$(sysconfdir)"\" \
--	-DLOCALEDIR=\""$(localedir)"\"
-+	-DLOCALEDIR=\""$(localedir)"\" \
-+	-DDATADIR=\""$(datadir)"\"
- 
- INCLUDES = $(GLIB_CFLAGS) -I$(top_srcdir) -I$(includedir)
- 
diff --git a/mail-client/sylpheed/files/sylpheed-3.0-enchant.diff b/mail-client/sylpheed/files/sylpheed-3.0-enchant.diff
deleted file mode 100644
index 42b88a4e378b..000000000000
--- a/mail-client/sylpheed/files/sylpheed-3.0-enchant.diff
+++ /dev/null
@@ -1,26 +0,0 @@
-Index: configure.in
-===================================================================
---- configure.in	(revision 2433)
-+++ configure.in	(working copy)
-@@ -284,16 +284,12 @@
- 		AC_MSG_RESULT(yes)
- 		CFLAGS="$CFLAGS `$PKG_CONFIG --cflags gtkspell-2.0`"
- 		LIBS="$LIBS `$PKG_CONFIG --libs gtkspell-2.0`"
--		if $PKG_CONFIG --atleast-version 2.0.13 gtkspell-2.0 ; then
--			AC_DEFINE(USE_ENCHANT, 1, Use Enchant with GtkSpell)
-+		AC_DEFINE(USE_ENCHANT, 1, Use Enchant with GtkSpell)
- 
--			dnl Workaroud for zemberek crash
--			if $PKG_CONFIG --atleast-version 1.4.2 enchant ; then
--				CFLAGS="$CFLAGS `$PKG_CONFIG --cflags dbus-glib-1`"
--				LIBS="$LIBS `$PKG_CONFIG --libs dbus-glib-1`"
--			fi
--		elif $PKG_CONFIG --atleast-version 2.0.12 gtkspell-2.0 ; then
--			LIBS="$LIBS -laspell"
-+		dnl Workaroud for zemberek crash
-+		if $PKG_CONFIG --atleast-version 1.4.2 enchant ; then
-+			CFLAGS="$CFLAGS `$PKG_CONFIG --cflags dbus-glib-1`"
-+			LIBS="$LIBS `$PKG_CONFIG --libs dbus-glib-1`"
- 		fi
- 		AC_DEFINE(USE_GTKSPELL, 1, Use GtkSpell in editor)
- 	else
diff --git a/mail-client/sylpheed/sylpheed-2.6.0.ebuild b/mail-client/sylpheed/sylpheed-2.6.0.ebuild
index cf16f5f897fe..e523e85d7153 100644
--- a/mail-client/sylpheed/sylpheed-2.6.0.ebuild
+++ b/mail-client/sylpheed/sylpheed-2.6.0.ebuild
@@ -1,54 +1,44 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/sylpheed/sylpheed-2.6.0.ebuild,v 1.9 2011/03/23 20:44:48 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/sylpheed/sylpheed-2.6.0.ebuild,v 1.10 2011/08/13 11:23:51 hattya Exp $
 
-EAPI="1"
+EAPI="4"
 
 inherit autotools eutils
 
-IUSE="crypt ipv6 ldap 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 LGPL-2.1"
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
 SLOT="0"
+KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
+IUSE="crypt ipv6 ldap nls pda spell ssl xface"
 
-COMMON_DEPEND=">=x11-libs/gtk+-2.4:2
-	nls? ( >=sys-devel/gettext-0.12.1 )
-	crypt? ( >=app-crypt/gpgme-0.4.5 )
-	ldap? ( >=net-nds/openldap-2.0.11 )
+CDEPEND="x11-libs/gtk+:2
+	nls? ( sys-devel/gettext )
+	crypt? ( app-crypt/gpgme )
+	ldap? ( net-nds/openldap )
 	pda? ( app-pda/jpilot )
 	spell? ( app-text/gtkspell )
 	ssl? ( dev-libs/openssl )"
-DEPEND="${COMMON_DEPEND}
-	dev-util/pkgconfig
-	xface? ( >=media-libs/compface-1.4 )"
-RDEPEND="${COMMON_DEPEND}
+RDEPEND="${CDEPEND}
 	app-misc/mime-types
 	x11-misc/shared-mime-info"
+DEPEND="${CDEPEND}
+	dev-util/pkgconfig
+	xface? ( media-libs/compface )"
 
 AT_M4DIR="ac"
 
-src_unpack() {
-
-	unpack ${A}
-	cd "${S}"
-
+src_prepare() {
 	epatch "${FILESDIR}"/${PN}-2.[145]-*.diff
-
 	use crypt || cp ac/missing/gpgme.m4 ac
-
 	eautoreconf
-
 }
 
-src_compile() {
-
+src_configure() {
 	local htmldir=/usr/share/doc/${PF}/html
-
 	econf \
 		$(use_enable crypt gpgme) \
 		$(use_enable ipv6) \
@@ -59,18 +49,13 @@ src_compile() {
 		$(use_enable ssl) \
 		$(use_enable xface compface) \
 		--with-manualdir=${htmldir}/manual \
-		--with-faqdir=${htmldir}/faq \
-		|| die
-	emake || die
-
+		--with-faqdir=${htmldir}/faq
 }
 
 src_install() {
-
-	emake DESTDIR="${D}" install || die
-
+	emake DESTDIR="${D}" install
 	dodoc AUTHORS ChangeLog* NEWS* README* TODO*
+
 	doicon *.png
 	domenu *.desktop
-
 }
diff --git a/mail-client/sylpheed/sylpheed-3.0.3.ebuild b/mail-client/sylpheed/sylpheed-3.0.3.ebuild
deleted file mode 100644
index c97d435c0b97..000000000000
--- a/mail-client/sylpheed/sylpheed-3.0.3.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/sylpheed/sylpheed-3.0.3.ebuild,v 1.3 2011/05/07 16:45:02 hattya Exp $
-
-EAPI="2"
-
-inherit autotools eutils
-
-IUSE="crypt ipv6 ldap 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 LGPL-2.1"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
-SLOT="0"
-
-COMMON_DEPEND=">=x11-libs/gtk+-2.4:2
-	nls? ( >=sys-devel/gettext-0.12.1 )
-	crypt? ( >=app-crypt/gpgme-1 )
-	ldap? ( net-nds/openldap )
-	pda? ( app-pda/jpilot )
-	spell? ( app-text/gtkspell )
-	ssl? ( dev-libs/openssl )"
-DEPEND="${COMMON_DEPEND}
-	dev-util/pkgconfig
-	xface? ( >=media-libs/compface-1.4 )"
-RDEPEND="${COMMON_DEPEND}
-	app-misc/mime-types
-	net-misc/curl
-	x11-misc/shared-mime-info"
-
-AT_M4DIR="ac"
-
-src_prepare() {
-
-	epatch "${FILESDIR}"/${PN}-2.7-*.diff
-	epatch "${FILESDIR}"/${PN}-3.*.diff
-
-	use crypt || cp ac/missing/gpgme.m4 ac
-
-	eautoreconf
-
-}
-
-src_configure() {
-
-	local htmldir=/usr/share/doc/${PF}/html
-
-	econf \
-		$(use_enable crypt gpgme) \
-		$(use_enable ipv6) \
-		$(use_enable ldap) \
-		$(use_enable pda jpilot) \
-		$(use_enable spell gtkspell) \
-		$(use_enable ssl) \
-		$(use_enable xface compface) \
-		--with-manualdir=${htmldir}/manual \
-		--with-faqdir=${htmldir}/faq \
-		--disable-updatecheck \
-		|| die
-
-}
-
-src_install() {
-
-	emake DESTDIR="${D}" install || die
-
-	dodoc AUTHORS ChangeLog* NEWS* README* TODO*
-	doicon *.png
-	domenu *.desktop
-
-}
diff --git a/mail-client/sylpheed/sylpheed-3.1.1.ebuild b/mail-client/sylpheed/sylpheed-3.1.1.ebuild
index aff4b7af293a..4dc7ac477f20 100644
--- a/mail-client/sylpheed/sylpheed-3.1.1.ebuild
+++ b/mail-client/sylpheed/sylpheed-3.1.1.ebuild
@@ -1,50 +1,38 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/sylpheed/sylpheed-3.1.1.ebuild,v 1.1 2011/05/07 14:51:33 hattya Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/sylpheed/sylpheed-3.1.1.ebuild,v 1.2 2011/08/13 11:23:51 hattya Exp $
 
-EAPI="3"
-
-inherit autotools eutils
-
-IUSE="crypt ipv6 ldap nls oniguruma pda spell ssl xface"
+EAPI="4"
 
 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 LGPL-2.1"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
+IUSE="crypt ipv6 ldap nls oniguruma pda spell ssl xface"
 
-COMMON_DEPEND=">=x11-libs/gtk+-2.4:2
-	nls? ( >=sys-devel/gettext-0.12.1 )
-	crypt? ( >=app-crypt/gpgme-1 )
+CDEPEND="x11-libs/gtk+:2
+	nls? ( sys-devel/gettext )
+	crypt? ( app-crypt/gpgme )
 	ldap? ( net-nds/openldap )
 	oniguruma? ( dev-libs/oniguruma )
 	pda? ( app-pda/jpilot )
-	spell? ( app-text/gtkspell )
+	spell? (
+		app-text/gtkspell
+		dev-libs/dbus-glib
+	)
 	ssl? ( dev-libs/openssl )"
-DEPEND="${COMMON_DEPEND}
-	dev-util/pkgconfig
-	xface? ( >=media-libs/compface-1.4 )"
-RDEPEND="${COMMON_DEPEND}
+RDEPEND="${CDEPEND}
 	app-misc/mime-types
 	net-misc/curl"
-
-AT_M4DIR="ac"
-
-src_prepare() {
-
-	use crypt || cp ac/missing/gpgme.m4 ac
-
-	eautoreconf
-
-}
+DEPEND="${CDEPEND}
+	dev-util/pkgconfig
+	xface? ( media-libs/compface )"
 
 src_configure() {
-
 	local htmldir=/usr/share/doc/${PF}/html
-
 	econf \
 		$(use_enable crypt gpgme) \
 		$(use_enable ipv6) \
@@ -56,17 +44,13 @@ src_configure() {
 		$(use_enable xface compface) \
 		--with-manualdir=${htmldir}/manual \
 		--with-faqdir=${htmldir}/faq \
-		--disable-updatecheck \
-		|| die
-
+		--disable-updatecheck
 }
 
 src_install() {
-
-	emake DESTDIR="${D}" install || die
-
+	emake DESTDIR="${D}" install
 	dodoc AUTHORS ChangeLog* NEWS* README* TODO*
+
 	doicon *.png
 	domenu *.desktop
-
 }