Old versions modified to preclude gpgme-0.3.14-r1 from a dependancy. New version added to support gpgme-0.3.14-r1 - Fixes bugs #53942, #60540, #60684

9 files changed, 160 insertions, 21 deletions

diff --git a/mail-client/sylpheed/ChangeLog b/mail-client/sylpheed/ChangeLog
index 9aea3d2ebfd5..a2839f29ae5f 100644
--- a/mail-client/sylpheed/ChangeLog
+++ b/mail-client/sylpheed/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for mail-client/sylpheed
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/sylpheed/ChangeLog,v 1.25 2004/08/22 18:52:22 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/sylpheed/ChangeLog,v 1.26 2004/08/27 13:22:19 dragonheart Exp $
+
+*sylpheed-0.9.12-r3 (27 Aug 2004)
+
+  27 Aug 2004; <dan@gentoo.org> sylpheed-0.9.10-r1.ebuild,
+  sylpheed-0.9.11.ebuild, sylpheed-0.9.12-r1.ebuild,
+  sylpheed-0.9.12-r2.ebuild, +sylpheed-0.9.12-r3.ebuild:
+  Old versions modified to preclude gpgme-0.3.14-r1 from a dependancy. New
+  version added to support gpgme-0.3.14-r1 - Fixes bugs #53942, #60540, #60684
 
   22 Aug 2004; Bryan Østergaard <kloeri@gentoo.org> sylpheed-0.9.12.ebuild:
   Stable on alpha.
diff --git a/mail-client/sylpheed/Manifest b/mail-client/sylpheed/Manifest
index d80eeba79503..0e13a0f92067 100644
--- a/mail-client/sylpheed/Manifest
+++ b/mail-client/sylpheed/Manifest
@@ -1,22 +1,24 @@
+MD5 e3b134fdbd12b09dd7a9bae4c68538cb ChangeLog 12192
+MD5 126ca8f672f0296d2f1e6830e6729a91 metadata.xml 231
 MD5 0fbe0fdc78bb40ce2761f1c90e1b56d7 sylpheed-0.9.10-r1.ebuild 1614
-MD5 8183b67a3bb885d8e70b45064c83b01c sylpheed-0.9.12-r2.ebuild 2056
-MD5 c9da44749ebbd133a0783ae3fab1111b sylpheed-0.9.7.ebuild 1706
 MD5 fad0f0af1cacf1116d997ddbdea93dda sylpheed-0.9.11.ebuild 1617
 MD5 70802173c256dec3b56f72c8ad6d0357 sylpheed-0.9.4.ebuild 1683
-MD5 47ed51e3b3dcbb08b93c83f48c2a3f79 sylpheed-0.9.12-r1.ebuild 2017
+MD5 c9da44749ebbd133a0783ae3fab1111b sylpheed-0.9.7.ebuild 1706
 MD5 801db9e7913f7a30a30b28ae5f80ea11 sylpheed-0.9.8.ebuild 1550
-MD5 e3b134fdbd12b09dd7a9bae4c68538cb ChangeLog 12192
+MD5 47ed51e3b3dcbb08b93c83f48c2a3f79 sylpheed-0.9.12-r1.ebuild 2017
 MD5 451e7cc54f144f095c6031434982717c sylpheed-0.9.12.ebuild 1774
-MD5 126ca8f672f0296d2f1e6830e6729a91 metadata.xml 231
+MD5 8183b67a3bb885d8e70b45064c83b01c sylpheed-0.9.12-r2.ebuild 2056
+MD5 db72d26904533efb4980612b4d11598d sylpheed-0.9.12-r3.ebuild 2202
+MD5 54b7f8281a74665ddcd19c166763dda2 files/digest-sylpheed-0.9.12 69
+MD5 ce1c3d8a2d9d18309762912c51486210 files/digest-sylpheed-0.9.10-r1 69
+MD5 cc155b38424780b974f40b662322b2dc files/digest-sylpheed-0.9.11 69
 MD5 cae6de9566012ff2a026e2fdc0124c53 files/digest-sylpheed-0.9.4 68
+MD5 58115ec502c767d6e20d4bf471ede6b6 files/digest-sylpheed-0.9.12-r2 151
 MD5 cd6d093a0935b35694616063e91a2bc1 files/digest-sylpheed-0.9.7 68
 MD5 dbd68b329d6860317fc8326b3dc9999e files/digest-sylpheed-0.9.8 68
 MD5 675221f844926806e120435f82df5fad files/sylpheed-0.9.12-64bit.patch 401
-MD5 4cbec71671b7349c904f860a12fee5d9 files/sylpheed-namespace.diff 550
-MD5 cc155b38424780b974f40b662322b2dc files/digest-sylpheed-0.9.11 69
-MD5 54b7f8281a74665ddcd19c166763dda2 files/digest-sylpheed-0.9.12 69
 MD5 f847bb1651a5b85decf13e2d8d01afe2 files/shared-mime.patch 649
-MD5 ce1c3d8a2d9d18309762912c51486210 files/digest-sylpheed-0.9.10-r1 69
-MD5 f6ea50485775c52818d8a704b476951c files/digest-sylpheed-0.9.12-r1 151
-MD5 dddf6be97ba2549701baf595fb5d1925 files/digest-sylpheed-0.9.12-r2 151
+MD5 4cbec71671b7349c904f860a12fee5d9 files/sylpheed-namespace.diff 550
 MD5 f4242298cfab21456442bfe52505d2b8 files/sylpheed-procmime.diff 1119
+MD5 f6ea50485775c52818d8a704b476951c files/digest-sylpheed-0.9.12-r1 151
+MD5 dddf6be97ba2549701baf595fb5d1925 files/digest-sylpheed-0.9.12-r3 151
diff --git a/mail-client/sylpheed/files/digest-sylpheed-0.9.12-r2 b/mail-client/sylpheed/files/digest-sylpheed-0.9.12-r2
index ba101577dc06..3dedb77e6769 100644
--- a/mail-client/sylpheed/files/digest-sylpheed-0.9.12-r2
+++ b/mail-client/sylpheed/files/digest-sylpheed-0.9.12-r2
@@ -1,2 +1,2 @@
 MD5 5deab7d65f8e19444902be3d82610e6b sylpheed-0.9.12.tar.bz2 2304925
-MD5 3daab3ce6be21e5a776bdf85ec163825 sylpheed-0.9.12-gtk2-20040622.diff.gz 192859
+MD5 54913718bc4b29ddf82a5885cc0b4755 sylpheed-0.9.12-gtk2-20040622.diff.gz 192859
diff --git a/mail-client/sylpheed/files/digest-sylpheed-0.9.12-r3 b/mail-client/sylpheed/files/digest-sylpheed-0.9.12-r3
new file mode 100644
index 000000000000..ba101577dc06
--- /dev/null
+++ b/mail-client/sylpheed/files/digest-sylpheed-0.9.12-r3
@@ -0,0 +1,2 @@
+MD5 5deab7d65f8e19444902be3d82610e6b sylpheed-0.9.12.tar.bz2 2304925
+MD5 3daab3ce6be21e5a776bdf85ec163825 sylpheed-0.9.12-gtk2-20040622.diff.gz 192859
diff --git a/mail-client/sylpheed/sylpheed-0.9.10-r1.ebuild b/mail-client/sylpheed/sylpheed-0.9.10-r1.ebuild
index 61c13a3366ac..48c3e9ce6207 100644
--- a/mail-client/sylpheed/sylpheed-0.9.10-r1.ebuild
+++ b/mail-client/sylpheed/sylpheed-0.9.10-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/sylpheed/sylpheed-0.9.10-r1.ebuild,v 1.5 2004/06/28 13:07:58 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/sylpheed/sylpheed-0.9.10-r1.ebuild,v 1.6 2004/08/27 13:22:19 dragonheart Exp $
 
 inherit eutils
 
@@ -21,7 +21,8 @@ DEPEND="=x11-libs/gtk+-1.2*
 	ssl? ( dev-libs/openssl )
 	pda? ( app-pda/jpilot )
 	ldap? ( >=net-nds/openldap-2.0.11 )
-	crypt? ( app-crypt/gnupg <app-crypt/gpgme-0.4 )
+	crypt? ( app-crypt/gnupg <app-crypt/gpgme-0.4
+		 !=app-crypt/gpgme-0.3.14-r1 )
 	gnome? ( media-libs/gdk-pixbuf )
 	imlib? ( media-libs/imlib )
 	xface? ( >=media-libs/compface-1.4 )"
diff --git a/mail-client/sylpheed/sylpheed-0.9.11.ebuild b/mail-client/sylpheed/sylpheed-0.9.11.ebuild
index 9daf1f00513f..08d96046ed9f 100644
--- a/mail-client/sylpheed/sylpheed-0.9.11.ebuild
+++ b/mail-client/sylpheed/sylpheed-0.9.11.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/sylpheed/sylpheed-0.9.11.ebuild,v 1.5 2004/07/31 02:14:22 tgall Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/sylpheed/sylpheed-0.9.11.ebuild,v 1.6 2004/08/27 13:22:19 dragonheart Exp $
 
 inherit eutils
 
@@ -21,7 +21,8 @@ DEPEND="=x11-libs/gtk+-1.2*
 	ssl? ( dev-libs/openssl )
 	pda? ( app-pda/jpilot )
 	ldap? ( >=net-nds/openldap-2.0.11 )
-	crypt? ( app-crypt/gnupg <app-crypt/gpgme-0.4 )
+	crypt? ( app-crypt/gnupg <app-crypt/gpgme-0.4
+		 !=app-crypt/gpgme-0.3.14-r1 )
 	gnome? ( media-libs/gdk-pixbuf )
 	imlib? ( media-libs/imlib )
 	xface? ( >=media-libs/compface-1.4 )"
diff --git a/mail-client/sylpheed/sylpheed-0.9.12-r1.ebuild b/mail-client/sylpheed/sylpheed-0.9.12-r1.ebuild
index b671407e84b0..5e9513ad6965 100644
--- a/mail-client/sylpheed/sylpheed-0.9.12-r1.ebuild
+++ b/mail-client/sylpheed/sylpheed-0.9.12-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/sylpheed/sylpheed-0.9.12-r1.ebuild,v 1.2 2004/06/24 22:18:41 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/sylpheed/sylpheed-0.9.12-r1.ebuild,v 1.3 2004/08/27 13:22:19 dragonheart Exp $
 
 inherit eutils
 
@@ -29,7 +29,8 @@ DEPEND="gtk2? ( >=x11-libs/gtk+-2.2 )
 	ssl? ( dev-libs/openssl )
 	pda? ( app-pda/jpilot )
 	ldap? ( >=net-nds/openldap-2.0.11 )
-	crypt? ( <app-crypt/gpgme-0.4 )
+	crypt? ( <app-crypt/gpgme-0.4
+		!=app-crypt/gpgme-0.3.14-r1 )
 	xface? ( >=media-libs/compface-1.4 )"
 RDEPEND="${DEPEND}
 	app-misc/mime-types
diff --git a/mail-client/sylpheed/sylpheed-0.9.12-r2.ebuild b/mail-client/sylpheed/sylpheed-0.9.12-r2.ebuild
index a10079af1259..25f014e7ef98 100644
--- a/mail-client/sylpheed/sylpheed-0.9.12-r2.ebuild
+++ b/mail-client/sylpheed/sylpheed-0.9.12-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/sylpheed/sylpheed-0.9.12-r2.ebuild,v 1.3 2004/06/27 19:34:16 kugelfang Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/sylpheed/sylpheed-0.9.12-r2.ebuild,v 1.4 2004/08/27 13:22:19 dragonheart Exp $
 
 inherit eutils
 
@@ -29,7 +29,8 @@ DEPEND="gtk2? ( >=x11-libs/gtk+-2.2 )
 	ssl? ( dev-libs/openssl )
 	pda? ( app-pda/jpilot )
 	ldap? ( >=net-nds/openldap-2.0.11 )
-	crypt? ( <app-crypt/gpgme-0.4 )
+	crypt? ( <app-crypt/gpgme-0.4
+		 !=app-crypt/gpgme-0.3.14-r1 )
 	xface? ( >=media-libs/compface-1.4 )"
 RDEPEND="${DEPEND}
 	app-misc/mime-types
diff --git a/mail-client/sylpheed/sylpheed-0.9.12-r3.ebuild b/mail-client/sylpheed/sylpheed-0.9.12-r3.ebuild
new file mode 100644
index 000000000000..a1c7481123e5
--- /dev/null
+++ b/mail-client/sylpheed/sylpheed-0.9.12-r3.ebuild
@@ -0,0 +1,123 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mail-client/sylpheed/sylpheed-0.9.12-r3.ebuild,v 1.1 2004/08/27 13:22:19 dragonheart Exp $
+
+inherit eutils
+
+IUSE="ssl xface ipv6 imlib nls gnome ldap crypt pda gtk2"
+
+GTK2_PATCHVER="20040622"
+
+DESCRIPTION="A lightweight email client and newsreader"
+HOMEPAGE="http://sylpheed.good-day.net/
+	http://sylpheed-gtk2.sf.net/"
+SRC_URI="http://sylpheed.good-day.net/${PN}/${P}.tar.bz2
+	gtk2? ( mirror://sourceforge/${PN}-gtk2/${P}-gtk2-${GTK2_PATCHVER}.diff.gz )"
+
+LICENSE="GPL-2"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~ia64 ~amd64"
+SLOT="0"
+
+PROVIDE="virtual/sylpheed"
+
+DEPEND="gtk2? ( >=x11-libs/gtk+-2.2 )
+	!gtk2? ( =x11-libs/gtk+-1.2*
+		gnome? ( media-libs/gdk-pixbuf )
+		imlib? ( media-libs/imlib )
+	)
+	!amd64? ( nls? ( =sys-devel/gettext-0.12.1* ) )
+	ssl? ( dev-libs/openssl )
+	pda? ( app-pda/jpilot )
+	ldap? ( >=net-nds/openldap-2.0.11 )
+	crypt? ( =app-crypt/gpgme-0.3.14-r1 )
+	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}-namespace.diff
+	epatch ${FILESDIR}/${PN}-procmime.diff
+	epatch ${FILESDIR}/${P}-64bit.patch
+
+	if use gtk2; then
+		epatch ${WORKDIR}/${P}-gtk2-${GTK2_PATCHVER}.diff
+	fi
+	! use crypt && cp ac/missing/gpgme.m4 ac
+	! use gnome && cp ac/missing/gdk-pixbuf.m4 ac
+	! use imlib && cp ac/missing/imlib.m4 ac
+
+	aclocal -I ac || die "aclocal failed"
+	libtoolize --force --copy || die "libtoolize died"
+	autoheader || die "autoheader died"
+
+	# had to do this to prevent failure.
+	if use gtk2;
+	then
+		aclocal -I ac || die "2nd aclocal failed"
+	fi
+	automake --add-missing --foreign --copy || die "automake failed"
+	autoconf || die "failed to autoconf"
+}
+
+src_compile() {
+
+	local myconf
+
+	# for gpgme support
+	export GPGME_CONFIG=${ROOT}/usr/bin/gpgme3-config
+
+	# For gnupg-1.9
+	if [ -x ${ROOT}/usr/bin/gpg ];
+	then
+		export GPG_PATH=${ROOT}/usr/bin/gpg
+	elif [ -x ${ROOT}/usr/bin/gpg2 ];
+	then
+		export GPG_PATH=${ROOT}/usr/bin/gpg2
+	fi
+
+	if use gtk2; then
+		myconf="--enable-gdk-pixbuf"
+
+	else
+		myconf="`use_enable imlib` `use_enable gnome gdk-pixbuf`"
+
+	fi
+
+	econf \
+		`use_enable nls` \
+		`use_enable ssl` \
+		`use_enable crypt gpgme` \
+		`use_enable pda jpilot` \
+		`use_enable ldap` \
+		`use_enable ipv6` \
+		`use_enable xface compface` \
+		${myconf} \
+		|| die
+
+	emake || die
+
+}
+
+src_install() {
+
+	einstall
+
+	dodir /usr/share/pixmaps
+	insinto /usr/share/pixmaps
+	doins *.png
+
+	if use gnome
+	then
+		dodir /usr/share/gnome/apps/Internet
+		insinto /usr/share/gnome/apps/Internet
+		doins sylpheed.desktop
+	fi
+
+	dodoc [A-Z][A-Z]* ChangeLog*
+
+}