Add vcard parsing patch, bug #283764.

Package-Manager: portage-2.2_rc40/cvs/Linux x86_64

4 files changed, 134 insertions, 2 deletions

diff --git a/mail-client/balsa/ChangeLog b/mail-client/balsa/ChangeLog
index 0d86cd0aad29..91202a0cd8aa 100644
--- a/mail-client/balsa/ChangeLog
+++ b/mail-client/balsa/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for mail-client/balsa
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/balsa/ChangeLog,v 1.86 2009/08/28 12:25:44 klausman Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/balsa/ChangeLog,v 1.87 2009/09/14 21:00:24 eva Exp $
+
+*balsa-2.4.1-r1 (14 Sep 2009)
+
+  14 Sep 2009; Gilles Dartiguelongue <eva@gentoo.org>
+  +balsa-2.4.1-r1.ebuild, +files/balsa-2.4.1-vcard.patch:
+  Add vcard parsing patch, bug #283764.
 
   26 Aug 2009; Tobias Klausmann <klausman@gentoo.org> balsa-2.4.1.ebuild:
   Stable on alpha, bug #278718
diff --git a/mail-client/balsa/Manifest b/mail-client/balsa/Manifest
index 5dfc7790a351..995b298b5bf7 100644
--- a/mail-client/balsa/Manifest
+++ b/mail-client/balsa/Manifest
@@ -1,8 +1,20 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX balsa-2.4.1-vcard.patch 581 RMD160 9efe72c102d8746c1f53ebde04b52b9dd6497775 SHA1 3e75bfebd6110bb85bdc2f2d7a93550feb2a1877 SHA256 c3c8ed63deb660b3f8cafbcc996f369fc2e1f766060e3ba9801865e616188ba9
 DIST balsa-2.3.28.tar.bz2 3066523 RMD160 0c2fe9b4ccf8d260ca055c70b0b0957063f3f5cd SHA1 6e1db8d9bb8a68c93e327e78dd1943c720d8dbdc SHA256 c9160312fd9b3f7aa71d0a77450a1b2637f786c040133cc60a53a780f99fa58c
 DIST balsa-2.4.0.tar.bz2 3050040 RMD160 e2d228ad6250f721a562a344722379a97c535de8 SHA1 d044042404b549d8cc9a19dfb68da5add921616d SHA256 f34f8eabb463815adbf18d78883e2e61c5ad0020e087152a4c7a604fcd5754ea
 DIST balsa-2.4.1.tar.bz2 3057983 RMD160 846905d9754fb5c4d3438c81078e79d61989cc99 SHA1 fc8a0ee154b22505607a82c886ccb074c28ac499 SHA256 06d9807c4135a468a5def531585ead9ea0948b206794e848efe234aa02df39d5
 EBUILD balsa-2.3.28.ebuild 2465 RMD160 4aa2959ac44307c954f19b22570c8db5de01c78f SHA1 06238cd9d61eb620aae8ed240cbb33249b091b7a SHA256 c7c618b8de877f434c69748ae7b14b198f569fc313004bcc8bc209403f6889a6
 EBUILD balsa-2.4.0.ebuild 2403 RMD160 778abb5d8de7db95c2f5a1d86a7e3f7a4f17e21a SHA1 286475b9556c6e86d41015df1272b97b4283ace4 SHA256 ab08c8741d29cfb6d8fbe27ff2ad14b9a7a255f0a5d15e25f9f98ff68f8eb368
+EBUILD balsa-2.4.1-r1.ebuild 2551 RMD160 9131d14bce0b0ac143819e829f3631bb4d73ae6f SHA1 6b154cfbf36bb3bffbdfab4b518c1a7028f4e815 SHA256 7919c8abfde00ab8482f24a32c01ee0b2aa81bb7da6e2993f67e007c82e70fae
 EBUILD balsa-2.4.1.ebuild 2475 RMD160 4f10c9ece140f27cfe997d62674c811d883c11a9 SHA1 7128cc72e456a42f4df67a97df98dbbeca3ff98c SHA256 09f756112cd747b0e4fa808a558b721e5ac13e7e3113622db329963383286a04
-MISC ChangeLog 21629 RMD160 96d380fd547cb4f630696cf2a9527c0a1fd4ecd3 SHA1 7946f66c2349a41698c766e69bb77ca5d292826a SHA256 00e13b69b84ead210798203baaf45ee917bf45ba636824d90aa6081f370a2a0a
+MISC ChangeLog 21808 RMD160 13a4138ff05e6f59da22c20c721e08261e32958b SHA1 a6eb2b7a1721a7aac9ca0846752f729fb1507c8c SHA256 a9f4ca5bb21484e514aeff6689abb80da261fcb6a017855b72ea6a9e66e6c30a
 MISC metadata.xml 395 RMD160 b98efee7c7c9345ce407812b3e099cfa771e7b4d SHA1 f58a59cb397081f9c9c0b08d8222d9a8818766e1 SHA256 fa52883e7722ffb442de48690c2acf846538b353f1d69f352b6b3b414c9ab4ce
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.11 (GNU/Linux)
+
+iEYEARECAAYFAkquru4ACgkQ1fmVwcYIWAb/OACguPCJdB3j1lIyvyhH8DlXOy8U
+l0UAoOANKDm88DmGw1+Pc6cECb1Y/+KF
+=qbBg
+-----END PGP SIGNATURE-----
diff --git a/mail-client/balsa/balsa-2.4.1-r1.ebuild b/mail-client/balsa/balsa-2.4.1-r1.ebuild
new file mode 100644
index 000000000000..303b8184c9e7
--- /dev/null
+++ b/mail-client/balsa/balsa-2.4.1-r1.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mail-client/balsa/balsa-2.4.1-r1.ebuild,v 1.1 2009/09/14 21:00:24 eva Exp $
+
+EAPI="2"
+
+inherit gnome2
+
+DESCRIPTION="Email client for GNOME"
+HOMEPAGE="http://pawsa.fedorapeople.org/balsa/"
+SRC_URI="http://pawsa.fedorapeople.org/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
+# Doesn't currently build with -gnome
+IUSE="crypt doc gnome gtkhtml +gtkspell kerberos ldap libnotify rubrica sqlite ssl xface"
+
+RDEPEND=">=dev-libs/glib-2.16
+	>=x11-libs/gtk+-2.14
+	dev-libs/gmime:2.4
+	>=net-libs/libesmtp-1.0.3
+	x11-themes/hicolor-icon-theme
+	net-mail/mailbase
+	dev-libs/libunique
+	crypt? ( >=app-crypt/gpgme-1.0 )
+	gnome? (
+		>=gnome-base/orbit-2
+		>=gnome-base/libbonobo-2.0
+		>=gnome-base/libgnome-2.0
+		>=gnome-base/libgnomeui-2.0
+		>=gnome-base/gconf-2.0
+		>=gnome-base/gnome-keyring-2.20
+		>=x11-libs/gtksourceview-2 )
+	gtkhtml? ( >=gnome-extra/gtkhtml-3.14 )
+	sqlite? ( >=dev-db/sqlite-2.8 )
+	libnotify? ( x11-libs/libnotify )
+	gtkspell? ( =app-text/gtkspell-2* )
+	!gtkspell? ( virtual/aspell-dict )
+	kerberos? ( app-crypt/mit-krb5 )
+	ldap? ( net-nds/openldap )
+	rubrica? ( dev-libs/libxml2 )
+	ssl? ( dev-libs/openssl )
+	xface? ( >=media-libs/compface-1.5.1 )"
+DEPEND="${RDEPEND}
+	dev-util/intltool
+	dev-util/pkgconfig
+	sys-devel/gettext
+	>=app-text/scrollkeeper-0.1.4
+	app-text/gnome-doc-utils
+	doc? ( dev-util/gtk-doc )"
+
+DOCS="AUTHORS ChangeLog HACKING NEWS README TODO docs/*"
+
+pkg_setup() {
+	if use crypt ; then
+		G2CONF="${G2CONF} --with-gpgme=gpgme-config"
+	else
+		G2CONF="${G2CONF} --without-gpgme"
+	fi
+
+	if use gtkhtml ; then
+		G2CONF="${G2CONF} --with-gtkhtml=3"
+	else
+		G2CONF="${G2CONF} --without-gtkhtml"
+	fi
+
+	# canberra support is considered experimental
+	G2CONF="${G2CONF}
+		--disable-pcre
+		--enable-gregex
+		--enable-threads
+		--with-unique
+		--without-canberra
+		$(use_with gnome)
+		$(use_with gnome gtksourceview)
+		$(use_with gtkspell)
+		$(use_with kerberos gss)
+		$(use_with ldap)
+		$(use_with libnotify)
+		$(use_with rubrica)
+		$(use_with sqlite)
+		$(use_with ssl)
+		$(use_with xface compface)"
+}
+
+src_prepare() {
+	gnome2_src_prepare
+
+	# Fix ingest of vcards, bug #283764
+	epatch "${FILESDIR}/${P}-vcard.patch"
+
+	# Remove disable deprecated statement
+	sed -i -e '/DISABLE_DEPRECATED/d' \
+		libinit_balsa/Makefile.am libinit_balsa/Makefile.in \
+		libbalsa/Makefile.am libbalsa/Makefile.in \
+		src/Makefile.am src/Makefile.in || die "sed failed"
+}
diff --git a/mail-client/balsa/files/balsa-2.4.1-vcard.patch b/mail-client/balsa/files/balsa-2.4.1-vcard.patch
new file mode 100644
index 000000000000..b12d63132528
--- /dev/null
+++ b/mail-client/balsa/files/balsa-2.4.1-vcard.patch
@@ -0,0 +1,16 @@
+diff --git a/libbalsa/address-book-vcard.c b/libbalsa/address-book-vcard.c
+index 16ef81a..679c766 100644
+--- a/libbalsa/address-book-vcard.c
++++ b/libbalsa/address-book-vcard.c
+@@ -331,8 +331,8 @@ libbalsa_address_book_vcard_parse_address(FILE * stream,
+ 	/*
+ 	 * fetch all e-mail fields
+ 	 */
+-	if (g_ascii_strncasecmp(string, "EMAIL;", 6) == 0) {
+-	    gchar *ptr = strchr(string+6, ':');
++	if (g_ascii_strncasecmp(string, "EMAIL", 5) == 0) {
++	    gchar *ptr = strchr(string + 5, ':');
+ 	    if (ptr) {
+ 		address_list =
+ 		    g_list_prepend(address_list, g_strdup(ptr + 1));
+