fixes bug #177078.

(Portage version: 2.1.2.2)

6 files changed, 8 insertions, 153 deletions

diff --git a/mail-client/sylpheed/ChangeLog b/mail-client/sylpheed/ChangeLog
index a428808365f1..e324f8e8c842 100644
--- a/mail-client/sylpheed/ChangeLog
+++ b/mail-client/sylpheed/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for mail-client/sylpheed
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/sylpheed/ChangeLog,v 1.227 2007/05/05 12:37:10 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/sylpheed/ChangeLog,v 1.228 2007/05/06 10:49:20 hattya Exp $
+
+  06 May 2007; Akinori Hattori <hattya@gentoo.org> -sylpheed-2.3.0.ebuild,
+  -sylpheed-2.3.1.ebuild, sylpheed-2.4.0.ebuild:
+  fixes bug #177078.
 
   05 May 2007; Jeroen Roovers <jer@gentoo.org> sylpheed-2.4.0.ebuild:
   Stable for HPPA (bug #176808).
diff --git a/mail-client/sylpheed/files/digest-sylpheed-2.3.0 b/mail-client/sylpheed/files/digest-sylpheed-2.3.0
deleted file mode 100644
index 99c03aaf6637..000000000000
--- a/mail-client/sylpheed/files/digest-sylpheed-2.3.0
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 e46f13162a7fc28120ed87ebfb304a57 sylpheed-2.3.0.tar.bz2 2623879
-RMD160 7960c3973a54e6b4c551abfc7fa46d2d5a43e5c2 sylpheed-2.3.0.tar.bz2 2623879
-SHA256 693194981892259737c8e2d2b5f375d96441643e44c3d27c21f1c1213423fb0b sylpheed-2.3.0.tar.bz2 2623879
diff --git a/mail-client/sylpheed/files/digest-sylpheed-2.3.1 b/mail-client/sylpheed/files/digest-sylpheed-2.3.1
deleted file mode 100644
index e61b578d3e48..000000000000
--- a/mail-client/sylpheed/files/digest-sylpheed-2.3.1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 12fb8622bc76b42a3bd6e734495ec4c3 sylpheed-2.3.1.tar.bz2 2614551
-RMD160 2ef027681b34641c32e2c962159fc990fd3c2ef3 sylpheed-2.3.1.tar.bz2 2614551
-SHA256 d08f4fe273c06d874bafd05c47e9e6433777fc9840372488bf0f5ec94e90cd7e sylpheed-2.3.1.tar.bz2 2614551
diff --git a/mail-client/sylpheed/sylpheed-2.3.0.ebuild b/mail-client/sylpheed/sylpheed-2.3.0.ebuild
deleted file mode 100644
index 577ed00a46a4..000000000000
--- a/mail-client/sylpheed/sylpheed-2.3.0.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# 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.3.0.ebuild,v 1.9 2007/04/01 12:59:06 hattya Exp $
-
-WANT_AUTOMAKE=1.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"
-KEYWORDS="~alpha amd64 hppa ia64 ppc ppc64 sparc x86"
-SLOT="0"
-
-DEPEND=">=x11-libs/gtk+-2.4
-	nls? ( >=sys-devel/gettext-0.12.1 )
-	crypt? ( >=app-crypt/gpgme-0.4.5 )
-	ldap? ( >=net-nds/openldap-2.0.11 )
-	pda? ( app-pda/jpilot )
-	spell? ( app-text/gtkspell )
-	ssl? ( dev-libs/openssl )
-	xface? ( >=media-libs/compface-1.4 )"
-RDEPEND="${DEPEND}
-	app-misc/mime-types
-	x11-misc/shared-mime-info"
-
-src_unpack() {
-
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}"/${PN}-2.*.diff
-
-	eautomake
-	elibtoolize
-
-}
-
-src_compile() {
-
-	econf \
-		`use_enable crypt gpgme` \
-		`use_enable ipv6` \
-		`use_enable ldap` \
-		`use_enable nls` \
-		`use_enable pda jpilot` \
-		`use_enable spell gtkspell` \
-		`use_enable ssl` \
-		`use_enable xface compface` \
-		|| die
-	emake || die
-
-}
-
-src_install() {
-
-	emake DESTDIR="${D}" install
-
-	dodir /usr/share/pixmaps
-	insinto /usr/share/pixmaps
-	doins *.png
-
-	insinto /usr/share/applications
-	doins sylpheed.desktop
-
-	dodoc AUTHORS ChangeLog* NEWS* README* TODO*
-
-}
diff --git a/mail-client/sylpheed/sylpheed-2.3.1.ebuild b/mail-client/sylpheed/sylpheed-2.3.1.ebuild
deleted file mode 100644
index cc777bc9940f..000000000000
--- a/mail-client/sylpheed/sylpheed-2.3.1.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# 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.3.1.ebuild,v 1.2 2007/04/01 12:59:06 hattya Exp $
-
-WANT_AUTOMAKE=1.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"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-SLOT="0"
-
-DEPEND=">=x11-libs/gtk+-2.4
-	nls? ( >=sys-devel/gettext-0.12.1 )
-	crypt? ( >=app-crypt/gpgme-0.4.5 )
-	ldap? ( >=net-nds/openldap-2.0.11 )
-	pda? ( app-pda/jpilot )
-	spell? ( app-text/gtkspell )
-	ssl? ( dev-libs/openssl )
-	xface? ( >=media-libs/compface-1.4 )"
-RDEPEND="${DEPEND}
-	app-misc/mime-types
-	x11-misc/shared-mime-info"
-
-src_unpack() {
-
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}"/${PN}-2.*.diff
-
-	eautomake
-	elibtoolize
-
-}
-
-src_compile() {
-
-	econf \
-		`use_enable crypt gpgme` \
-		`use_enable ipv6` \
-		`use_enable ldap` \
-		`use_enable nls` \
-		`use_enable pda jpilot` \
-		`use_enable spell gtkspell` \
-		`use_enable ssl` \
-		`use_enable xface compface` \
-		|| die
-	emake || die
-
-}
-
-src_install() {
-
-	emake DESTDIR="${D}" install
-
-	dodir /usr/share/pixmaps
-	insinto /usr/share/pixmaps
-	doins *.png
-
-	insinto /usr/share/applications
-	doins sylpheed.desktop
-
-	dodoc AUTHORS ChangeLog* NEWS* README* TODO*
-
-}
diff --git a/mail-client/sylpheed/sylpheed-2.4.0.ebuild b/mail-client/sylpheed/sylpheed-2.4.0.ebuild
index 9d5ab7126094..c574fe0740c9 100644
--- a/mail-client/sylpheed/sylpheed-2.4.0.ebuild
+++ b/mail-client/sylpheed/sylpheed-2.4.0.ebuild
@@ -1,6 +1,6 @@
 # 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.9 2007/05/05 12:37:10 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/sylpheed/sylpheed-2.4.0.ebuild,v 1.10 2007/05/06 10:49:20 hattya Exp $
 
 inherit autotools eutils
 
@@ -35,8 +35,9 @@ src_unpack() {
 
 	epatch "${FILESDIR}"/${PN}-2.*.diff
 
+	use crypt || cp ac/missing/gpgme.m4 ac
+
 	eautomake
-	elibtoolize
 
 }