update to sqlite3 patch, run autoheader

(Portage version: 2.0.51.19)

5 files changed, 164 insertions, 51 deletions

diff --git a/mail-client/balsa/ChangeLog b/mail-client/balsa/ChangeLog
index 1b022468cc31..9f025c76d59c 100644
--- a/mail-client/balsa/ChangeLog
+++ b/mail-client/balsa/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for mail-client/balsa
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/balsa/ChangeLog,v 1.28 2005/05/24 16:03:36 allanonjl Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/balsa/ChangeLog,v 1.29 2005/05/24 19:43:52 allanonjl Exp $
+
+*balsa-2.2.6-r3 (24 May 2005)
+
+  24 May 2005; John N. Laliberte <allanonjl@gentoo.org>
+  files/balsa-sqlite3-fix.patch, +balsa-2.2.6-r3.ebuild:
+  update to sqlite3 patch, run autoheader
 
 *balsa-2.2.6-r2 (24 May 2005)
 
diff --git a/mail-client/balsa/Manifest b/mail-client/balsa/Manifest
index 30705a02f023..89328d45365d 100644
--- a/mail-client/balsa/Manifest
+++ b/mail-client/balsa/Manifest
@@ -1,11 +1,12 @@
 MD5 3d8ea268bc011e284d19acc46e831802 balsa-2.0.15-r2.ebuild 1804
 MD5 f9b75f07316fa4c916016a2f92ed0cb2 balsa-2.2.6-r1.ebuild 1768
 MD5 3f9307f7f2f95feab10f1647ee53773d balsa-2.2.6.ebuild 1726
+MD5 2c84519f6c0adfd0be1cf7382df5bf7e balsa-2.2.6-r3.ebuild 1877
 MD5 63f89a65fc88a9d4b338339ce95eb3a3 balsa-2.2.6-r2.ebuild 1816
 MD5 d4f6dbc31e378077014bb877a6be7feb balsa-1.4.3.ebuild 1700
 MD5 8e5a472d0d8c511678a199a70ff10b6e ChangeLog 12728
 MD5 f4713bbf77ae895c7ff6c022a7a2f542 metadata.xml 222
-MD5 d585dbb93b819887a6b96323007a5d43 files/balsa-sqlite3-fix.patch 15086
+MD5 481c442eb3eb11f09e588578bdac4968 files/balsa-sqlite3-fix.patch 15975
 MD5 f723c65b41c5410c4402b0c5aa2fabd9 files/balsa-ssl.patch 502
 MD5 6214786af3a3095a1e721302f10228f2 files/gtk+2.4-2.patch 1542
 MD5 7640c6a66bb87af1486164581e95296d files/balsa-1.4.0-gentoo.diff 830
@@ -15,4 +16,5 @@ MD5 6bad789bbe40ec51339b6c85735d88e5 files/digest-balsa-2.2.6 65
 MD5 cb6019030e00d143459011755f8f525f files/balsa-2.2.6-deprecation.fix.patch 3352
 MD5 6bad789bbe40ec51339b6c85735d88e5 files/digest-balsa-2.2.6-r1 65
 MD5 6bad789bbe40ec51339b6c85735d88e5 files/digest-balsa-2.2.6-r2 65
+MD5 6bad789bbe40ec51339b6c85735d88e5 files/digest-balsa-2.2.6-r3 65
 MD5 aa4090173ee51cb5766ef1b3a6d6f379 files/digest-balsa-2.0.15-r2 66
diff --git a/mail-client/balsa/balsa-2.2.6-r3.ebuild b/mail-client/balsa/balsa-2.2.6-r3.ebuild
new file mode 100644
index 000000000000..d712013113df
--- /dev/null
+++ b/mail-client/balsa/balsa-2.2.6-r3.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mail-client/balsa/balsa-2.2.6-r3.ebuild,v 1.1 2005/05/24 19:43:52 allanonjl Exp $
+
+inherit gnome2 eutils
+
+IUSE="doc ssl gtkhtml pcre ldap crypt kerberos threads sqlite"
+DESCRIPTION="Email client for GNOME"
+SRC_URI="http://balsa.gnome.org/${P}.tar.bz2"
+HOMEPAGE="http://balsa.gnome.org"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
+
+RDEPEND=">=gnome-base/libgnome-2.0
+	>=gnome-base/libgnomeui-2.0
+	>=gnome-base/gnome-vfs-2.0
+	=dev-libs/gmime-2.1.9*
+	>=gnome-base/libbonobo-2.0
+	>=gnome-base/libgnomeprint-2.1.4
+	>=gnome-base/libgnomeprintui-2.1.4
+	>=x11-libs/gtk+-2
+	net-mail/mailbase
+	>=net-libs/libesmtp-1.0-r1
+	sys-devel/libtool
+	virtual/aspell-dict
+	ssl? ( dev-libs/openssl )
+	pcre? ( >=dev-libs/libpcre-3.4 )
+	gtkhtml? (
+		|| (
+			=gnome-extra/libgtkhtml-3.2*
+			=gnome-extra/libgtkhtml-3.0*
+			=gnome-extra/libgtkhtml-2*
+		)
+	)
+	ldap? ( net-nds/openldap )
+	kerberos? ( app-crypt/mit-krb5 )
+	sqlite? ( >=dev-db/sqlite-2.8 )
+	crypt? ( >=app-crypt/gpgme-0.9.0 )
+	"
+
+DEPEND="${RDEPEND}
+	dev-util/intltool
+	dev-util/pkgconfig
+	>=app-text/scrollkeeper-0.1.4
+	doc? ( dev-util/gtk-doc )
+	"
+
+USE_DESTDIR="1"
+
+src_unpack(){
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${P}-deprecation.fix.patch
+	epatch ${FILESDIR}/${PN}-ssl.patch
+	epatch ${FILESDIR}/${PN}-sqlite3-fix.patch
+
+	#aclocal
+	#libtoolize --copy --force
+	autoheader
+	autoconf
+	#automake
+}
+
+use crypt \
+	&& G2CONF="${G2CONF} --with-gpgme=gpgme-config" \
+	|| G2CONF="${G2CONF} --without-gpgme"
+
+G2CONF="${G2CONF} \
+		$(use_with ssl) \
+		$(use_with ldap) \
+		$(use_with sqlite) \
+		$(use_with kerberos gss) \
+		$(use_enable gtkhtml) \
+		$(use_enable threads) \
+		$(use_enable pcre) \
+		"
+
+DOCS="AUTHORS COPYING ChangeLog HACKING INSTALL NEWS README TODO docs/*"
diff --git a/mail-client/balsa/files/balsa-sqlite3-fix.patch b/mail-client/balsa/files/balsa-sqlite3-fix.patch
index c366b3d8f377..5416f834b19c 100644
--- a/mail-client/balsa/files/balsa-sqlite3-fix.patch
+++ b/mail-client/balsa/files/balsa-sqlite3-fix.patch
@@ -1,5 +1,51 @@
+--- balsa-2.2.6/libbalsa/address-book-gpe.h	2004-08-27 04:54:24.000000000 -0400
++++ balsa-2.2.6.new/libbalsa/address-book-gpe.h	2005-05-24 11:03:37.000000000 -0400
+@@ -29,7 +29,11 @@
+ 
+ #ifdef HAVE_SQLITE
+ 
++#ifdef HAVE_SQLITE3
++#include <sqlite3.h>
++#else                           /* HAVE_SQLITE3 */
+ #include <sqlite.h>
++#endif                          /* HAVE_SQLITE3 */
+ 
+ #include "address-book.h"
+ 
+@@ -44,7 +48,11 @@
+ 
+ struct _LibBalsaAddressBookGpe {
+     LibBalsaAddressBook parent;
++#ifdef HAVE_SQLITE3
++    sqlite3 *db;
++#else                           /* HAVE_SQLITE3 */
+     sqlite *db;
++#endif                          /* HAVE_SQLITE3 */
+ };
+ 
+ struct _LibBalsaAddressBookGpeClass {
+--- balsa-2.2.6/configure.in	2004-11-19 17:23:40.000000000 -0500
++++ balsa-2.2.6.new/configure.in	2005-05-24 13:50:12.000000000 -0400
+@@ -350,10 +350,13 @@
+ AC_MSG_CHECKING(whether to use SQLite)
+ if test x$with_sqlite != xno ; then
+ 	AC_MSG_RESULT([yes])
+-        PKG_CHECK_MODULES(SQLITE, [
+-        sqlite >= 2.8
+-        ])
+-        AC_DEFINE(HAVE_SQLITE,1,[If defined, enable GPE address book support.])
++     if $PKG_CONFIG --exists sqlite3 ; then
++      	         PKG_CHECK_MODULES(SQLITE, [sqlite3])
++   	         AC_DEFINE(HAVE_SQLITE3,1,[If defined, use sqlite3 api.])
++     else
++        PKG_CHECK_MODULES(SQLITE, [sqlite >= 2.8])
++     fi
++     AC_DEFINE(HAVE_SQLITE,1,[If defined, enable GPE address book support.])
+         BALSA_CFLAGS="$BALSA_CFLAGS $SQLITE_CFLAGS"
+         BALSA_LIBS="$BALSA_LIBS $SQLITE_LIBS"
+ else
 --- balsa-2.2.6/libbalsa/address-book-gpe.c	2004-11-07 14:41:58.000000000 -0500
-+++ balsa-2.2.6.new/libbalsa/address-book-gpe.c	2005-05-24 10:16:18.000000000 -0400
++++ balsa-2.2.6.new/libbalsa/address-book-gpe.c	2005-05-24 15:30:37.000000000 -0400
 @@ -166,7 +166,11 @@
  libbalsa_address_book_gpe_close_db(LibBalsaAddressBookGpe * ab)
  {
@@ -346,7 +392,31 @@
      const gchar *prefix;
      gchar **new_prefix;
      GList *res;
-@@ -601,6 +780,16 @@
+@@ -540,7 +719,14 @@
+     LibBalsaAddress * a= libbalsa_address_new();
+     guint uid = atoi(argv[0]);
+     gchar *tag = argv[1];
+-
++#ifdef HAVE_SQLITE3
++    gchar *sql;
++     /* follow read_entry_data. FIXME: error reporting */
++     sql = sqlite3_mprintf("select tag,value from contacts where urn=%d",
++                           uid);
++     sqlite3_exec(gc->db, sql, gpe_read_attr, a, NULL);
++     sqlite3_free(sql);
++#else
+     /* follow read_entry_data. FIXME: error reporting */
+     if(strstr(tag, "EMAIL") != NULL) { /* be extra cautious - return just one address */
+         sqlite_exec_printf
+@@ -555,6 +741,7 @@
+                             "select tag,value from contacts where urn=%d",
+                             gpe_read_attr, a, NULL, uid);
+     }
++#endif
+     if(!a->address_list) { /* entry without address: ignore! */
+         g_object_unref(a);
+         return 0;
+@@ -601,6 +788,16 @@
      gcc.prefix = prefix;
      gcc.new_prefix = new_prefix;
      gcc.res = NULL;
@@ -363,7 +433,7 @@
      if(prefix)
          r = sqlite_exec_printf(gpe_ab->db, query,
                                 gpe_read_completion, &gcc, &err,
-@@ -608,6 +797,7 @@
+@@ -608,6 +805,7 @@
      else
          r = sqlite_exec(gpe_ab->db, "select distinct urn from contacts_urn",
                          gpe_read_completion, &gcc, &err);
@@ -371,49 +441,3 @@
      if(err) {
          printf("r=%d err=%s\n", r, err);
          free(err);
---- balsa-2.2.6/libbalsa/address-book-gpe.h	2004-08-27 04:54:24.000000000 -0400
-+++ balsa-2.2.6.new/libbalsa/address-book-gpe.h	2005-05-24 11:03:37.000000000 -0400
-@@ -29,7 +29,11 @@
- 
- #ifdef HAVE_SQLITE
- 
-+#ifdef HAVE_SQLITE3
-+#include <sqlite3.h>
-+#else                           /* HAVE_SQLITE3 */
- #include <sqlite.h>
-+#endif                          /* HAVE_SQLITE3 */
- 
- #include "address-book.h"
- 
-@@ -44,7 +48,11 @@
- 
- struct _LibBalsaAddressBookGpe {
-     LibBalsaAddressBook parent;
-+#ifdef HAVE_SQLITE3
-+    sqlite3 *db;
-+#else                           /* HAVE_SQLITE3 */
-     sqlite *db;
-+#endif                          /* HAVE_SQLITE3 */
- };
- 
- struct _LibBalsaAddressBookGpeClass {
---- balsa-2.2.6/configure.in	2004-11-19 17:23:40.000000000 -0500
-+++ balsa-2.2.6.new/configure.in	2005-05-24 11:27:17.000000000 -0400
-@@ -350,10 +350,13 @@
- AC_MSG_CHECKING(whether to use SQLite)
- if test x$with_sqlite != xno ; then
- 	AC_MSG_RESULT([yes])
--        PKG_CHECK_MODULES(SQLITE, [
--        sqlite >= 2.8
--        ])
--        AC_DEFINE(HAVE_SQLITE,1,[If defined, enable GPE address book support.])
-+     if $PKG_CONFIG --exists sqlite3 ; then
-+      	         PKG_CHECK_MODULES(SQLITE, [sqlite3])
-+   	         AC_DEFINE(HAVE_SQLITE3,1,[If defined, use sqlite3 api.])
-+     else
-+        PKG_CHECK_MODULES(SQLITE, [sqlite >= 2.8])
-+	AC_DEFINE(HAVE_SQLITE,1,[If defined, enable GPE address book support.])
-+     fi
-         BALSA_CFLAGS="$BALSA_CFLAGS $SQLITE_CFLAGS"
-         BALSA_LIBS="$BALSA_LIBS $SQLITE_LIBS"
- else
diff --git a/mail-client/balsa/files/digest-balsa-2.2.6-r3 b/mail-client/balsa/files/digest-balsa-2.2.6-r3
new file mode 100644
index 000000000000..beeeb355c10c
--- /dev/null
+++ b/mail-client/balsa/files/digest-balsa-2.2.6-r3
@@ -0,0 +1 @@
+MD5 6179fadbfc5cca642dac081519acef25 balsa-2.2.6.tar.bz2 2913847