Add vcard parsing patch, bug #283764.

(Portage version: 2.2_rc40/cvs/Linux x86_64)

3 files changed, 121 insertions, 1 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/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));
+