prune old versions and remove useless eclass from inherit

(Portage version: 2.1.3.9)

19 files changed, 17 insertions, 1060 deletions

diff --git a/mail-client/balsa/ChangeLog b/mail-client/balsa/ChangeLog
index 992815151701..28911d194988 100644
--- a/mail-client/balsa/ChangeLog
+++ b/mail-client/balsa/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for mail-client/balsa
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/balsa/ChangeLog,v 1.56 2007/09/25 17:49:02 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/balsa/ChangeLog,v 1.57 2007/09/30 20:48:26 eva Exp $
+
+  30 Sep 2007; Gilles Dartiguelongue <eva@gentoo.org>
+  -files/balsa-2.2.6-deprecation.fix.patch,
+  -files/balsa-2.3.4-icon-cache.patch,
+  -files/balsa-gtk+-2.4-deprecation-fix.patch,
+  -files/balsa-sqlite3-fix.patch, -files/balsa-ssl.patch,
+  -balsa-2.0.15-r2.ebuild, -balsa-2.2.6-r3.ebuild, -balsa-2.2.6-r4.ebuild,
+  -balsa-2.3.4-r1.ebuild, -balsa-2.3.8.ebuild, balsa-2.3.13.ebuild,
+  balsa-2.3.16.ebuild, balsa-2.3.20.ebuild:
+  pruning old versions and removing useless eclass from inherit
 
   25 Sep 2007; Raúl Porcel <armin76@gentoo.org> balsa-2.3.20.ebuild:
   sparc stable wrt security #193179
diff --git a/mail-client/balsa/balsa-2.0.15-r2.ebuild b/mail-client/balsa/balsa-2.0.15-r2.ebuild
deleted file mode 100644
index 2169e8bb0078..000000000000
--- a/mail-client/balsa/balsa-2.0.15-r2.ebuild
+++ /dev/null
@@ -1,78 +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/balsa/balsa-2.0.15-r2.ebuild,v 1.12 2007/03/16 06:30:40 seemant Exp $
-
-inherit gnome2 eutils
-
-IUSE="ssl gtkhtml perl ldap crypt"
-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="net-mail/mailbase
-	>=dev-libs/glib-2
-	>=x11-libs/gtk+-2
-	>=gnome-base/libgnome-2
-	>=gnome-base/libgnomeui-2
-	>=gnome-base/gnome-vfs-2
-	>=gnome-base/libgnomeprint-2.1.4
-	>=gnome-base/libgnomeprintui-2.1.4
-	>=net-libs/libesmtp-0.8.11
-	virtual/aspell-dict
-	ssl? ( dev-libs/openssl )
-	perl? ( >=dev-libs/libpcre-3.4 )
-	gtkhtml? ( =gnome-extra/gtkhtml-2* )
-	ldap? ( net-nds/openldap )
-	crypt? ( ~app-crypt/gpgme-0.3.14 )
-	crypt? ( sys-devel/autoconf )"
-
-DEPEND="dev-util/pkgconfig
-	>=app-text/scrollkeeper-0.1.4
-	>=sys-apps/sed-4
-	${RDEPEND}"
-
-src_unpack()
-{
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/balsa-gtk+-2.4-deprecation-fix.patch
-}
-
-src_compile() {
-	local myconf
-
-	export GPGME_CONFIG=${ROOT}/usr/bin/gpgme3-config
-	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
-
-	libmutt/configure \
-		--prefix=/usr \
-		--host=${CHOST} \
-		--with-mailpath=/var/mail || die "configure libmutt failed"
-
-	# threads diabled because of 17079
-	econf \
-		`use_with ssl` \
-		`use_enable gtkhtml` \
-		`use_enable perl pcre` \
-		`use_with ldap` \
-		`use_with crypt gpgme` \
-		--disable-threads || die "configure balsa failed"
-
-	emake || die "emake failed"
-}
-
-src_install() {
-	gnome2_src_install scrollkeeper_localstate_dir=${D}/var/lib/scrollkeeper/
-}
-
-DOCS="AUTHORS COPYING ChangeLog HACKING INSTALL NEWS README TODO docs/*"
diff --git a/mail-client/balsa/balsa-2.2.6-r3.ebuild b/mail-client/balsa/balsa-2.2.6-r3.ebuild
deleted file mode 100644
index 4cdb7ccd2c1d..000000000000
--- a/mail-client/balsa/balsa-2.2.6-r3.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2006 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.2 2006/01/12 23:37:34 compnerd 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/gtkhtml-3.2*
-			=gnome-extra/gtkhtml-3.0*
-			=gnome-extra/gtkhtml-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/balsa-2.2.6-r4.ebuild b/mail-client/balsa/balsa-2.2.6-r4.ebuild
deleted file mode 100644
index 7ffd03422a73..000000000000
--- a/mail-client/balsa/balsa-2.2.6-r4.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2006 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-r4.ebuild,v 1.2 2006/01/12 23:37:34 compnerd 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/gtkhtml-3.2*
-			=gnome-extra/gtkhtml-3.0*
-			=gnome-extra/gtkhtml-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
-}
-
-src_install() {
-	gnome2_src_install scrollkeeper_localstate_dir=${D}/var/lib/scrollkeeper/
-}
-
-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/balsa-2.3.13.ebuild b/mail-client/balsa/balsa-2.3.13.ebuild
index b4dd79fb829a..b27656924c17 100644
--- a/mail-client/balsa/balsa-2.3.13.ebuild
+++ b/mail-client/balsa/balsa-2.3.13.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/balsa/balsa-2.3.13.ebuild,v 1.7 2007/05/30 15:38:23 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/balsa/balsa-2.3.13.ebuild,v 1.8 2007/09/30 20:48:26 eva Exp $
 
-inherit gnome2 eutils autotools
+inherit gnome2
 
 DESCRIPTION="Email client for GNOME"
 HOMEPAGE="http://balsa.gnome.org"
diff --git a/mail-client/balsa/balsa-2.3.16.ebuild b/mail-client/balsa/balsa-2.3.16.ebuild
index 0f541c75f9e4..e93218ba5c0f 100644
--- a/mail-client/balsa/balsa-2.3.16.ebuild
+++ b/mail-client/balsa/balsa-2.3.16.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/balsa/balsa-2.3.16.ebuild,v 1.1 2007/05/30 16:16:20 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/balsa/balsa-2.3.16.ebuild,v 1.2 2007/09/30 20:48:26 eva Exp $
 
-inherit gnome2 eutils autotools
+inherit gnome2
 
 DESCRIPTION="Email client for GNOME"
 HOMEPAGE="http://balsa.gnome.org"
diff --git a/mail-client/balsa/balsa-2.3.20.ebuild b/mail-client/balsa/balsa-2.3.20.ebuild
index 8a666c6dc797..7ef38c9542ef 100644
--- a/mail-client/balsa/balsa-2.3.20.ebuild
+++ b/mail-client/balsa/balsa-2.3.20.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/balsa/balsa-2.3.20.ebuild,v 1.6 2007/09/25 17:49:02 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/balsa/balsa-2.3.20.ebuild,v 1.7 2007/09/30 20:48:26 eva Exp $
 
-inherit gnome2 eutils autotools
+inherit gnome2
 
 DESCRIPTION="Email client for GNOME"
 HOMEPAGE="http://balsa.gnome.org"
diff --git a/mail-client/balsa/balsa-2.3.4-r1.ebuild b/mail-client/balsa/balsa-2.3.4-r1.ebuild
deleted file mode 100644
index 129a88790f5a..000000000000
--- a/mail-client/balsa/balsa-2.3.4-r1.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/balsa/balsa-2.3.4-r1.ebuild,v 1.2 2006/01/12 23:37:34 compnerd Exp $
-
-inherit gnome2 eutils
-
-IUSE="doc ssl gtkhtml gnome 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? (
-		>=gnome-base/libgnome-2.0
-		>=gnome-base/libgnomeui-2.0
-		>=gnome-base/gnome-vfs-2.0
-		>=gnome-base/libbonobo-2.0
-		>=gnome-base/libgnomeprint-2.1.4
-		>=gnome-base/libgnomeprintui-2.1.4
-	)
-	>=dev-libs/gmime-2.1.9
-	>=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/gtkhtml-3.6*
-			=gnome-extra/gtkhtml-3.2*
-			=gnome-extra/gtkhtml-3.0*
-			=gnome-extra/gtkhtml-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
-	gnome? ( >=app-text/scrollkeeper-0.1.4 )
-	doc? ( dev-util/gtk-doc )
-	"
-
-USE_DESTDIR="1"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/balsa-2.3.4-icon-cache.patch
-}
-
-src_install() {
-	gnome2_src_install scrollkeeper_localstate_dir=${D}/var/lib/scrollkeeper/
-}
-
-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_with gnome) \
-		$(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/balsa-2.3.8.ebuild b/mail-client/balsa/balsa-2.3.8.ebuild
deleted file mode 100644
index 50a5db6d2102..000000000000
--- a/mail-client/balsa/balsa-2.3.8.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/balsa/balsa-2.3.8.ebuild,v 1.1 2006/01/21 21:26:53 compnerd Exp $
-
-inherit gnome2
-
-DESCRIPTION="Email client for GNOME"
-HOMEPAGE="http://balsa.gnome.org"
-SRC_URI="http://balsa.gnome.org/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
-IUSE="crypt doc gnome gtkhtml gtkspell kerberos ldap pcre sqlite ssl threads"
-
-RDEPEND=">=dev-libs/glib-2.0
-		 >=x11-libs/gtk+-2.4
-		 >=dev-libs/gmime-2.1.9
-		 >=net-libs/libesmtp-1.0-r1
-		 >=gnome-base/orbit-2
-		 >=gnome-base/libbonobo-2.0
-		   x11-themes/hicolor-icon-theme
-		   sys-devel/libtool
-		   sys-devel/gettext
-		   net-mail/mailbase
-		crypt? ( >=app-crypt/gpgme-0.9.0 )
-		gnome? (
-				>=gnome-base/libgnome-2.0
-				>=gnome-base/libgnomeui-2.0
-				>=gnome-base/gnome-vfs-2.0
-				>=gnome-base/libgnomeprint-2.1.4
-				>=gnome-base/libgnomeprintui-2.1.4
-			   )
-		gtkhtml? ( =gnome-extra/gtkhtml-2* )
-		gtkspell? ( =app-text/gtkspell-2* )
-		!gtkspell? ( virtual/aspell-dict )
-		kerberos? ( app-crypt/mit-krb5 )
-		ldap? ( net-nds/openldap )
-		pcre? ( >=dev-libs/libpcre-3.4 )
-		sqlite? ( >=dev-db/sqlite-2.8 )
-		ssl? ( dev-libs/openssl )"
-DEPEND="${RDEPEND}
-		dev-util/intltool
-		dev-util/pkgconfig
-		gnome? ( >=app-text/scrollkeeper-0.1.4 )
-		doc? ( dev-util/gtk-doc )"
-
-DOCS="AUTHORS COPYING ChangeLog HACKING INSTALL NEWS README TODO docs/*"
-USE_DESTDIR="1"
-
-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=2"
-	else
-		G2CONF="${G2CONF} --without-gtkhtml"
-	fi
-
-	G2CONF="${G2CONF} 					\
-			$(use_with gnome) 			\
-			$(use_with gtkspell) 		\
-			$(use_with kerberos gss) 	\
-			$(use_with ldap) 			\
-			$(use_enable pcre) 			\
-			$(use_with sqlite) 			\
-			$(use_with ssl) 			\
-			$(use_enable threads)"
-}
-
-src_install() {
-	gnome2_src_install scrollkeeper_localstate_dir=${D}/var/lib/scrollkeeper/
-}
diff --git a/mail-client/balsa/files/balsa-2.2.6-deprecation.fix.patch b/mail-client/balsa/files/balsa-2.2.6-deprecation.fix.patch
deleted file mode 100644
index 1d332d9769e4..000000000000
--- a/mail-client/balsa/files/balsa-2.2.6-deprecation.fix.patch
+++ /dev/null
@@ -1,96 +0,0 @@
---- balsa-2.2.6.orig/libbalsa/Makefile.am	2005-03-27 21:49:44.951892656 -0500
-+++ balsa-2.2.6/libbalsa/Makefile.am	2005-03-27 21:52:24.558628744 -0500
-@@ -129,15 +129,7 @@
- 	-I${top_srcdir}/libbalsa/imap \
- 	$(BALSA_CFLAGS)
- 
--DEFS =                                   \
--       -DG_DISABLE_DEPRECATED            \
--       -DGDK_DISABLE_DEPRECATED          \
--       -DGDK_PIXBUF_DISABLE_DEPRECATED   \
--       -DGNOME_DISABLE_DEPRECATED        \
--       -DGNOME_DISABLE_DEPRECATED_SOURCE \
--       -DGNOME_VFS_DISABLE_DEPRECATED    \
--       -DGTK_DISABLE_DEPRECATED          \
--       -DPANGO_DISABLE_DEPRECATED
-+DEFS =
- 
- #Signal marshallers
- marshal_prefix = libbalsa
---- balsa-2.2.6.orig/libbalsa/Makefile.in	2005-03-27 21:49:44.951892656 -0500
-+++ balsa-2.2.6/libbalsa/Makefile.in	2005-03-27 21:52:46.696263312 -0500
-@@ -156,15 +156,6 @@
- CXXFLAGS = @CXXFLAGS@
- CYGPATH_W = @CYGPATH_W@
- DATADIRNAME = @DATADIRNAME@
--DEFS = \
--       -DG_DISABLE_DEPRECATED            \
--       -DGDK_DISABLE_DEPRECATED          \
--       -DGDK_PIXBUF_DISABLE_DEPRECATED   \
--       -DGNOME_DISABLE_DEPRECATED        \
--       -DGNOME_DISABLE_DEPRECATED_SOURCE \
--       -DGNOME_VFS_DISABLE_DEPRECATED    \
--       -DGTK_DISABLE_DEPRECATED          \
--       -DPANGO_DISABLE_DEPRECATED
- 
- DEPDIR = @DEPDIR@
- ECHO = @ECHO@
---- balsa-2.2.6.orig/libinit_balsa/Makefile.am	2005-03-27 21:49:44.923896912 -0500
-+++ balsa-2.2.6/libinit_balsa/Makefile.am	2005-03-27 21:53:13.864133168 -0500
-@@ -23,6 +23,4 @@
- 	-I$(top_srcdir)/src \
-         $(BALSA_CFLAGS)
- 
--DEFS = -DG_DISABLE_DEPRECATED   \
--       -DGTK_DISABLE_DEPRECATED \
--       -DGNOME_DISABLE_DEPRECATED
-+DEFS =
---- balsa-2.2.6.orig/libinit_balsa/Makefile.in	2005-03-27 21:49:44.924896760 -0500
-+++ balsa-2.2.6/libinit_balsa/Makefile.in	2005-03-27 21:53:43.276661784 -0500
-@@ -108,9 +108,6 @@
- CXXFLAGS = @CXXFLAGS@
- CYGPATH_W = @CYGPATH_W@
- DATADIRNAME = @DATADIRNAME@
--DEFS = -DG_DISABLE_DEPRECATED   \
--       -DGTK_DISABLE_DEPRECATED \
--       -DGNOME_DISABLE_DEPRECATED
- 
- DEPDIR = @DEPDIR@
- ECHO = @ECHO@
---- balsa-2.2.6.orig/src/Makefile.am	2005-03-27 21:49:44.886902536 -0500
-+++ balsa-2.2.6/src/Makefile.am	2005-03-27 21:54:10.076587576 -0500
-@@ -82,15 +82,7 @@
- 	-I$(top_srcdir)/libbalsa \
- 	$(BALSA_CFLAGS)
- 
--DEFS =                                   \
--       -DG_DISABLE_DEPRECATED            \
--       -DGDK_DISABLE_DEPRECATED          \
--       -DGDK_PIXBUF_DISABLE_DEPRECATED   \
--       -DGNOME_DISABLE_DEPRECATED        \
--       -DGNOME_DISABLE_DEPRECATED_SOURCE \
--       -DGNOME_VFS_DISABLE_DEPRECATED    \
--       -DGTK_DISABLE_DEPRECATED          \
--       -DPANGO_DISABLE_DEPRECATED
-+DEFS =
- 
- balsa_LDADD = \
- 	$(top_builddir)/libinit_balsa/libinit_balsa.a \
---- balsa-2.2.6.orig/src/Makefile.in	2005-03-27 21:49:44.887902384 -0500
-+++ balsa-2.2.6/src/Makefile.in	2005-03-27 21:54:27.291970440 -0500
-@@ -137,15 +137,6 @@
- CXXFLAGS = @CXXFLAGS@
- CYGPATH_W = @CYGPATH_W@
- DATADIRNAME = @DATADIRNAME@
--DEFS = \
--       -DG_DISABLE_DEPRECATED            \
--       -DGDK_DISABLE_DEPRECATED          \
--       -DGDK_PIXBUF_DISABLE_DEPRECATED   \
--       -DGNOME_DISABLE_DEPRECATED        \
--       -DGNOME_DISABLE_DEPRECATED_SOURCE \
--       -DGNOME_VFS_DISABLE_DEPRECATED    \
--       -DGTK_DISABLE_DEPRECATED          \
--       -DPANGO_DISABLE_DEPRECATED
- 
- DEPDIR = @DEPDIR@
- ECHO = @ECHO@
diff --git a/mail-client/balsa/files/balsa-2.3.4-icon-cache.patch b/mail-client/balsa/files/balsa-2.3.4-icon-cache.patch
deleted file mode 100644
index 6af0c682bb1b..000000000000
--- a/mail-client/balsa/files/balsa-2.3.4-icon-cache.patch
+++ /dev/null
@@ -1,8 +0,0 @@
---- balsa-2.3.4/images/Makefile.am	2005-03-24 07:10:21.000000000 -0500
-+++ balsa-2.3.4.new/images/Makefile.am	2005-07-06 21:27:51.000000000 -0400
-@@ -21,5 +21,4 @@
- install-data-hook:
- 	if test -x "$(GTK_UPDATE_ICON_CACHE)" ; then                    \
- 		$(GTK_UPDATE_ICON_CACHE) $(DESTDIR)$(BALSA_DATA_PREFIX)/hicolor ; \
--		$(GTK_UPDATE_ICON_CACHE) $(DESTDIR)$(HICOLOR_ICON_DIR) ;          \
- 	fi
diff --git a/mail-client/balsa/files/balsa-gtk+-2.4-deprecation-fix.patch b/mail-client/balsa/files/balsa-gtk+-2.4-deprecation-fix.patch
deleted file mode 100644
index c6202892785b..000000000000
--- a/mail-client/balsa/files/balsa-gtk+-2.4-deprecation-fix.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-diff -ruN balsa-2.0.15.orig/libbalsa/Makefile.am balsa-2.0.15/libbalsa/Makefile.am
---- balsa-2.0.15.orig/libbalsa/Makefile.am	2004-03-29 22:16:49.000000000 -0800
-+++ balsa-2.0.15/libbalsa/Makefile.am	2004-03-29 22:46:32.166802264 -0800
-@@ -85,9 +85,6 @@
- 	$(BALSA_CFLAGS)
- 
- DEFS = -DLIBMUTT                \
--       -DG_DISABLE_DEPRECATED   \
--       -DGTK_DISABLE_DEPRECATED \
--       -DGNOME_DISABLE_DEPRECATED
- 
- #Signal marshallers
- marshal_prefix = libbalsa
-diff -ruN balsa-2.0.15.orig/libbalsa/Makefile.in balsa-2.0.15/libbalsa/Makefile.in
---- balsa-2.0.15.orig/libbalsa/Makefile.in	2004-03-29 22:16:49.000000000 -0800
-+++ balsa-2.0.15/libbalsa/Makefile.in	2004-03-29 22:46:19.337752576 -0800
-@@ -211,11 +211,7 @@
- 
- 
- DEFS = -DLIBMUTT                \
--       -DG_DISABLE_DEPRECATED   \
--       -DGTK_DISABLE_DEPRECATED \
--       -DGNOME_DISABLE_DEPRECATED
--
--
-+       
- #Signal marshallers
- marshal_prefix = libbalsa
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-diff -ruN balsa-2.0.15.orig/libinit_balsa/Makefile.am balsa-2.0.15/libinit_balsa/Makefile.am
---- balsa-2.0.15.orig/libinit_balsa/Makefile.am	2004-03-29 22:16:49.000000000 -0800
-+++ balsa-2.0.15/libinit_balsa/Makefile.am	2004-03-29 22:46:45.912712568 -0800
-@@ -22,6 +22,4 @@
- 	-I$(top_srcdir)/src \
-         $(BALSA_CFLAGS)
- 
--DEFS = -DG_DISABLE_DEPRECATED   \
--       -DGTK_DISABLE_DEPRECATED \
--       -DGNOME_DISABLE_DEPRECATED
-+DEFS = 
-diff -ruN balsa-2.0.15.orig/libinit_balsa/Makefile.in balsa-2.0.15/libinit_balsa/Makefile.in
---- balsa-2.0.15.orig/libinit_balsa/Makefile.in	2004-03-29 22:16:49.000000000 -0800
-+++ balsa-2.0.15/libinit_balsa/Makefile.in	2004-03-29 22:35:52.123103696 -0800
-@@ -147,10 +147,6 @@
-         $(BALSA_CFLAGS)
- 
- 
--DEFS = -DG_DISABLE_DEPRECATED   \
--       -DGTK_DISABLE_DEPRECATED \
--       -DGNOME_DISABLE_DEPRECATED
--
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = ../config.h
- CONFIG_CLEAN_FILES = 
-diff -ruN balsa-2.0.15.orig/src/Makefile.am balsa-2.0.15/src/Makefile.am
---- balsa-2.0.15.orig/src/Makefile.am	2004-03-29 22:16:49.000000000 -0800
-+++ balsa-2.0.15/src/Makefile.am	2004-03-29 22:46:57.936884616 -0800
-@@ -105,6 +105,4 @@
- $(CORBA_SRCLIST): $(idl_DATA)
- 		$(ORBIT_IDL) $(idl_DATA)
- 
--DEFS = -DG_DISABLE_DEPRECATED   \
--       -DGTK_DISABLE_DEPRECATED \
--       -DGNOME_DISABLE_DEPRECATED
-+DEFS = 
-diff -ruN balsa-2.0.15.orig/src/Makefile.in balsa-2.0.15/src/Makefile.in
---- balsa-2.0.15.orig/src/Makefile.in	2004-03-29 22:16:49.000000000 -0800
-+++ balsa-2.0.15/src/Makefile.in	2004-03-29 22:35:15.024743504 -0800
-@@ -223,11 +223,7 @@
- 
- 
- BALSA_ORB_SRCLIST = orbit-glue.c 
--
--DEFS = -DG_DISABLE_DEPRECATED   \
--       -DGTK_DISABLE_DEPRECATED \
--       -DGNOME_DISABLE_DEPRECATED
--
-+      
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = ../config.h
- CONFIG_CLEAN_FILES = 
diff --git a/mail-client/balsa/files/balsa-sqlite3-fix.patch b/mail-client/balsa/files/balsa-sqlite3-fix.patch
deleted file mode 100644
index 5416f834b19c..000000000000
--- a/mail-client/balsa/files/balsa-sqlite3-fix.patch
+++ /dev/null
@@ -1,443 +0,0 @@
---- 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 15:30:37.000000000 -0400
-@@ -166,7 +166,11 @@
- libbalsa_address_book_gpe_close_db(LibBalsaAddressBookGpe * ab)
- {
-     if (ab->db) {
-+#ifdef HAVE_SQLITE3
-+	sqlite3_close(ab->db);
-+#else                           /* HAVE_SQLITE3 */
- 	sqlite_close(ab->db);
-+#endif                          /* HAVE_SQLITE3 */
- 	ab->db = NULL;
-     }
- }
-@@ -174,7 +178,9 @@
- /*
-  * Opens the SQLite db
-  */
-+#ifndef HAVE_SQLITE3
- #define DB_NAME "/.gpe/contacts"
-+#endif                          /* HAVE_SQLITE3 */
- static const char *schema_str =
- "create table contacts (urn INTEGER NOT NULL, tag TEXT NOT NULL, "
- "value TEXT NOT NULL)";
-@@ -185,6 +191,26 @@
- static int
- libbalsa_address_book_gpe_open_db(LibBalsaAddressBookGpe * ab)
- {
-+#ifdef HAVE_SQLITE3
-+    gchar *dir, *name;
-+    int r;
-+
-+    dir = g_build_filename(g_get_home_dir(), ".gpe", NULL);
-+    mkdir(dir, S_IRUSR|S_IWUSR|S_IXUSR);
-+    name = g_build_filename(dir, "contacts", NULL);
-+    g_free(dir);
-+    r = sqlite3_open(name, &ab->db);
-+    g_free(name);
-+
-+    if (r != SQLITE_OK) {
-+        printf("Cannot open: %s\n", sqlite3_errmsg(ab->db));
-+        sqlite3_close(ab->db);
-+        ab->db = NULL;
-+        return 0;
-+    }
-+    sqlite3_exec(ab->db, schema_str,  NULL, NULL, NULL);
-+    sqlite3_exec(ab->db, schema2_str, NULL, NULL, NULL);
-+#else                           /* HAVE_SQLITE3 */
-     gchar *name, *errmsg = NULL;
- 
-     ASSURE_GPE_DIR;
-@@ -198,6 +224,7 @@
-     }
-     sqlite_exec (ab->db, schema_str,  NULL, NULL, NULL);
-     sqlite_exec (ab->db, schema2_str, NULL, NULL, NULL);
-+#endif                          /* HAVE_SQLITE3 */
- 
-     return 1;
- }
-@@ -277,9 +304,17 @@
-     guint uid = atoi(argv[0]);
- 
-     /* follow read_entry_data. FIXME: error reporting */
-+#ifdef HAVE_SQLITE3
-+    gchar *sql =
-+        sqlite3_mprintf("select tag,value from contacts where urn=%d",
-+                        uid);
-+    sqlite3_exec(gc->gpe->db, sql, gpe_read_attr, a, NULL);
-+    sqlite3_free(sql);
-+#else                           /* HAVE_SQLITE3 */
-     sqlite_exec_printf (gc->gpe->db,
-                         "select tag,value from contacts where urn=%d",
-                         gpe_read_attr, a, NULL, uid);
-+#endif                          /* HAVE_SQLITE3 */
-     if(!a->address_list) { /* entry without address: ignore! */
-         g_object_unref(a);
-         return 0;
-@@ -323,6 +358,27 @@
-     gc.closure  = closure;
-     gc.gpe      = gpe_ab;
-     /* FIXME: error reporting */
-+#ifdef HAVE_SQLITE3
-+{
-+    if (filter && *filter) {
-+        gchar *sql =
-+            sqlite3_mprintf("select distinct urn from contacts where "
-+                            "(upper(tag)='FAMILY_NAME' or"
-+                            " upper(tag)='GIVEN_NAME' or"
-+                            " upper(tag)='NAME' or"
-+                            " upper(tag)='WORK.EMAIL' or"
-+                            " upper(tag)='HOME.EMAIL') "
-+                            "and value LIKE '%q%%'",
-+                            filter);
-+        r = sqlite3_exec(gpe_ab->db, sql, gpe_read_address, &gc, &err);
-+        sqlite3_free(sql);
-+    } else {
-+        r = sqlite3_exec(gpe_ab->db,
-+                         "select distinct urn from contacts_urn",
-+                         gpe_read_address, &gc, &err);
-+    }
-+}
-+#else                           /* HAVE_SQLITE3 */
-     if(filter && *filter) {
-         r = sqlite_exec_printf
-             (gpe_ab->db, 
-@@ -336,6 +392,7 @@
-         r = sqlite_exec(gpe_ab->db, "select distinct urn from contacts_urn",
-                         gpe_read_address, &gc, &err);
-     }
-+#endif                          /* HAVE_SQLITE3 */
- 
-     if(r != SQLITE_OK) {
-         printf("r=%d err=%s\n", r, err);
-@@ -351,10 +408,19 @@
-     return ret;
- }
- 
-+#ifdef HAVE_SQLITE3
-+#define INSERT_ATTR(db,id,attr,val) \
-+ do { if( (val) && *(val)) {\
-+ sql = sqlite3_mprintf("insert into contacts values ('%d', '%q', '%q')",\
-+                       (id), (attr), (val));\
-+ sqlite3_exec((db), sql, NULL, NULL, NULL);\
-+ sqlite3_free(sql);}} while(0)
-+#else                           /* HAVE_SQLITE3 */
- #define INSERT_ATTR(db,id,attr,val) \
-  do { if( (val) && *(val)) {\
-  sqlite_exec_printf((db), "insert into contacts values ('%d', '%q', '%q')",\
-                     NULL, NULL, NULL, (id), (attr), (val));}} while(0);
-+#endif                          /* HAVE_SQLITE3 */
- 
- static LibBalsaABErr
- libbalsa_address_book_gpe_add_address(LibBalsaAddressBook *ab,
-@@ -364,6 +430,9 @@
-     int r;
-     guint id;
-     char *err = NULL;
-+#ifdef HAVE_SQLITE3
-+    gchar *sql;
-+#endif                          /* HAVE_SQLITE3 */
- 
-     g_return_val_if_fail(address, LBABERR_CANNOT_WRITE);
-     g_return_val_if_fail(address->address_list, LBABERR_CANNOT_WRITE);
-@@ -372,8 +441,13 @@
-         if(!libbalsa_address_book_gpe_open_db(gpe_ab))
- 	    return LBABERR_CANNOT_CONNECT;
-     }
-+#ifdef HAVE_SQLITE3
-+    r = sqlite3_exec(gpe_ab->db, "insert into contacts_urn values (NULL)",
-+                     NULL, NULL, &err);
-+#else                           /* HAVE_SQLITE3 */
-     r = sqlite_exec(gpe_ab->db, "insert into contacts_urn values (NULL)",
-                     NULL, NULL, &err);
-+#endif                          /* HAVE_SQLITE3 */
-     if (r != SQLITE_OK) {
-         libbalsa_address_book_set_status(ab, g_strdup(err));
-         free(err);
-@@ -381,7 +455,11 @@
-     }
-     /* FIXME: duplicate detection! */
- 
-+#ifdef HAVE_SQLITE3
-+    id = sqlite3_last_insert_rowid(gpe_ab->db);
-+#else                           /* HAVE_SQLITE3 */
-     id = sqlite_last_insert_rowid(gpe_ab->db);
-+#endif                          /* HAVE_SQLITE3 */
-     INSERT_ATTR(gpe_ab->db,id, "NAME",        address->full_name);
-     INSERT_ATTR(gpe_ab->db,id, "GIVEN_NAME",  address->first_name);
-     INSERT_ATTR(gpe_ab->db,id, "FAMILY_NAME", address->last_name);
-@@ -389,11 +467,56 @@
-     INSERT_ATTR(gpe_ab->db,id, "WORK.ORGANIZATION", address->organization);
-     INSERT_ATTR(gpe_ab->db,id, "WORK.EMAIL",
-                 (char*)address->address_list->data);
-+#ifdef HAVE_SQLITE3
-+    sql = sqlite3_mprintf("insert into contacts values "
-+                          "('%d', 'MODIFIED', %d)",
-+                          id, time(NULL));
-+    sqlite3_exec(gpe_ab->db, sql, NULL, NULL, NULL);
-+    sqlite3_free(sql);
-+#else                           /* HAVE_SQLITE3 */
-     sqlite_exec_printf(gpe_ab->db, "insert into contacts values "
-                        "('%d', 'MODIFIED', %d)", NULL, NULL, NULL,
-                        id, time(NULL));
-+#endif                          /* HAVE_SQLITE3 */
-     return LBABERR_OK;
- }
-+#ifdef HAVE_SQLITE3
-+static gchar *
-+db_delete_by_uid(sqlite3 * db, guint uid)
-+{
-+    int r;
-+    gchar *err;
-+    gchar *sql;
-+
-+    if (sqlite3_exec(db, "begin transaction", NULL, NULL, &err) !=
-+        SQLITE_OK)
-+        return err;
-+
-+    sql = sqlite3_mprintf("delete from contacts where urn='%d'", uid);
-+    r = sqlite3_exec(db, sql, NULL, NULL, &err);
-+    sqlite3_free(sql);
-+    if (r != SQLITE_OK) {
-+        sqlite3_exec(db, "rollback transaction", NULL, NULL, NULL);
-+        return err;
-+    }
-+
-+    sql = sqlite3_mprintf("delete from contacts_urn where urn='%d'", uid);
-+    r = sqlite3_exec(db, sql, NULL, NULL, &err);
-+    sqlite3_free(sql);
-+    if (r != SQLITE_OK) {
-+        sqlite3_exec(db, "rollback transaction", NULL, NULL, NULL);
-+        return err;
-+    }
-+
-+    if (sqlite3_exec(db, "commit transaction", NULL, NULL, &err) !=
-+        SQLITE_OK) {
-+        sqlite3_exec(db, "rollback transaction", NULL, NULL, NULL);
-+        return err;
-+    }
-+
-+    return NULL;
-+}
-+#else                           /* HAVE_SQLITE3 */
- static gchar*
- db_delete_by_uid(sqlite *db, guint uid)
- {
-@@ -414,6 +537,7 @@
-     sqlite_exec(db, "rollback transaction", NULL, NULL, NULL);
-     return err;
- }
-+#endif                          /* HAVE_SQLITE3 */
- 
- static LibBalsaABErr
- libbalsa_address_book_gpe_remove_address(LibBalsaAddressBook *ab,
-@@ -445,12 +569,22 @@
- /** libbalsa_address_book_gpe_modify_address:
-     modify given address.
- */
-+#ifdef HAVE_SQLITE3
-+#define INSERT_ATTR_R(db,id,attr,val) \
-+ if ((val) && *(val)) {\
-+ sql = sqlite3_mprintf("insert into contacts values ('%d', '%q', '%q')",\
-+                       (id), (attr), (val));\
-+ r = sqlite3_exec((db), sql, NULL, NULL, &err);\
-+ sqlite3_free(sql);\
-+ if (r != SQLITE_OK) goto rollback;}
-+#else                           /* HAVE_SQLITE3 */
- #define INSERT_ATTR_R(db,id,attr,val) \
-  if( (val) && *(val)) {\
-  if( (r=sqlite_exec_printf \
-          ((db), "insert into contacts values ('%d', '%q', '%q')",\
-                     NULL, NULL, &err, (id), (attr), (val))) != SQLITE_OK)\
-     goto rollback;}
-+#endif                          /* HAVE_SQLITE3 */
- 
- static LibBalsaABErr
- libbalsa_address_book_gpe_modify_address(LibBalsaAddressBook *ab,
-@@ -461,6 +595,9 @@
-     guint uid;
-     int r;
-     char *err;
-+#ifdef HAVE_SQLITE3
-+    gchar *sql;
-+#endif                          /* HAVE_SQLITE3 */
- 
-     g_return_val_if_fail(address, LBABERR_CANNOT_WRITE);
-     g_return_val_if_fail(address->address_list, LBABERR_CANNOT_WRITE);
-@@ -475,6 +612,26 @@
-     g_return_val_if_fail(uid, LBABERR_CANNOT_WRITE);
- 
-     /* do the real work here */
-+#ifdef HAVE_SQLITE3
-+    if ((r = sqlite3_exec(gpe_ab->db, "begin transaction",
-+                          NULL, NULL, &err)) != SQLITE_OK) {
-+        libbalsa_address_book_set_status(ab, g_strdup(err));
-+        free(err);              /* failed, so soon!? */
-+        return LBABERR_CANNOT_WRITE;
-+    }
-+
-+    sql = sqlite3_mprintf("delete from contacts where urn='%d' and "
-+                          "(upper(tag)='NAME' or"
-+                          " upper(tag)='GIVEN_NAME' or"
-+                          " upper(tag)='NICKNAME' or"
-+                          " upper(tag)='WORK.ORGANIZATION' or"
-+                          " upper(tag)='WORK.EMAIL' or"
-+                          " upper(tag)='MODIFIED')", uid);
-+    r = sqlite3_exec(gpe_ab->db, sql, NULL, NULL, &err);
-+    sqlite3_free(sql);
-+    if (r != SQLITE_OK)
-+        goto rollback;
-+#else                           /* HAVE_SQLITE3 */
-     if( (r=sqlite_exec(gpe_ab->db, "begin transaction",
-                        NULL, NULL, &err)) != SQLITE_OK) {
-         libbalsa_address_book_set_status(ab, g_strdup(err));
-@@ -490,6 +647,7 @@
-           "upper(tag)='WORK.EMAIL' or upper(tag)='MODIFIED')",
-           NULL, NULL, &err, uid)) != SQLITE_OK)
-         goto rollback;
-+#endif                          /* HAVE_SQLITE3 */
-     INSERT_ATTR_R(gpe_ab->db,uid, "NAME",        newval->full_name);
-     INSERT_ATTR_R(gpe_ab->db,uid, "GIVEN_NAME",  newval->first_name);
-     INSERT_ATTR_R(gpe_ab->db,uid, "FAMILY_NAME", newval->last_name);
-@@ -497,6 +655,18 @@
-     INSERT_ATTR_R(gpe_ab->db,uid, "WORK.ORGANIZATION", newval->organization);
-     INSERT_ATTR_R(gpe_ab->db,uid, "WORK.EMAIL",
-                 (char*)newval->address_list->data);
-+#ifdef HAVE_SQLITE3
-+    sql = sqlite3_mprintf("insert into contacts values "
-+                          "('%d', 'MODIFIED', %d)", uid, time(NULL));
-+    r = sqlite3_exec(gpe_ab->db, sql, NULL, NULL, &err);
-+    sqlite3_free(sql);
-+    if (r != SQLITE_OK)
-+        goto rollback;
-+
-+    if (sqlite3_exec(gpe_ab->db, "commit transaction", NULL, NULL, &err) ==
-+        SQLITE_OK)
-+        return LBABERR_OK;
-+#else                           /* HAVE_SQLITE3 */
-     if( (r=sqlite_exec_printf(gpe_ab->db, "insert into contacts values "
-                               "('%d', 'MODIFIED', %d)", NULL, NULL, &err,
-                               uid, time(NULL))) != SQLITE_OK)
-@@ -504,17 +674,26 @@
-     
-     if( (r=sqlite_exec(gpe_ab->db, "commit transaction", NULL,
-                        NULL, &err)) == SQLITE_OK) return LBABERR_OK;
-+#endif                          /* HAVE_SQLITE3 */
- 
-  rollback:
-     libbalsa_address_book_set_status(ab, g_strdup(err));
-     free(err);
-+#ifdef HAVE_SQLITE3
-+    sqlite3_exec(gpe_ab->db, "rollback transaction", NULL, NULL, NULL);
-+#else                           /* HAVE_SQLITE3 */
-     sqlite_exec(gpe_ab->db, "rollback transaction", NULL, NULL, NULL);
-+#endif                          /* HAVE_SQLITE3 */
- 
-     return LBABERR_CANNOT_WRITE;
- }
- 
- struct gpe_completion_closure {
-+#ifdef HAVE_SQLITE3
-+    sqlite3 *db;
-+#else                           /* HAVE_SQLITE3 */
-     sqlite *db;
-+#endif                          /* HAVE_SQLITE3 */
-     const gchar *prefix;
-     gchar **new_prefix;
-     GList *res;
-@@ -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;
-+#ifdef HAVE_SQLITE3
-+    if (prefix) {
-+        gchar *sql = sqlite3_mprintf(query, prefix);
-+        r = sqlite3_exec(gpe_ab->db, sql, gpe_read_completion, &gcc, &err);
-+        sqlite3_free(sql);
-+    } else
-+        r = sqlite3_exec(gpe_ab->db,
-+                         "select distinct urn from contacts_urn",
-+                         gpe_read_completion, &gcc, &err);
-+#else                           /* HAVE_SQLITE3 */
-     if(prefix)
-         r = sqlite_exec_printf(gpe_ab->db, query,
-                                gpe_read_completion, &gcc, &err,
-@@ -608,6 +805,7 @@
-     else
-         r = sqlite_exec(gpe_ab->db, "select distinct urn from contacts_urn",
-                         gpe_read_completion, &gcc, &err);
-+#endif                          /* HAVE_SQLITE3 */
-     if(err) {
-         printf("r=%d err=%s\n", r, err);
-         free(err);
diff --git a/mail-client/balsa/files/balsa-ssl.patch b/mail-client/balsa/files/balsa-ssl.patch
deleted file mode 100644
index 7edc13cace72..000000000000
--- a/mail-client/balsa/files/balsa-ssl.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- balsa-2.2.6/libbalsa/mailbox_pop3.c	2004-10-30 05:35:58.000000000 -0400
-+++ balsa-2.2.6.new/libbalsa/mailbox_pop3.c	2005-05-23 09:00:40.994706080 -0400
-@@ -532,6 +532,7 @@
-     
-     pop = pop_new();
-     pop_set_option(pop, IMAP_POP_OPT_FILTER_CR, TRUE);
-+    pop_set_option(pop, IMAP_POP_OPT_OVER_SSL, server->use_ssl);
-     pop_set_option(pop, IMAP_POP_OPT_DISABLE_APOP, m->disable_apop);
-     pop_set_tls_mode(pop, tls_mode);
-     pop_set_timeout(pop, 60000); /* wait 1.5 minute for packets */
diff --git a/mail-client/balsa/files/digest-balsa-2.0.15-r2 b/mail-client/balsa/files/digest-balsa-2.0.15-r2
deleted file mode 100644
index cbc5e1711bfd..000000000000
--- a/mail-client/balsa/files/digest-balsa-2.0.15-r2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 dc00a4bd622c4a0c5d6b7dca397d4371 balsa-2.0.15.tar.bz2 2786211
-RMD160 87caf8de51bfae9b7f769645b43d87a31e617943 balsa-2.0.15.tar.bz2 2786211
-SHA256 1b8e13982a1b1f6273c3c07d4237b9375721c90ed25bae00b7b60251868e2a53 balsa-2.0.15.tar.bz2 2786211
diff --git a/mail-client/balsa/files/digest-balsa-2.2.6-r3 b/mail-client/balsa/files/digest-balsa-2.2.6-r3
deleted file mode 100644
index ae79389170e6..000000000000
--- a/mail-client/balsa/files/digest-balsa-2.2.6-r3
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 6179fadbfc5cca642dac081519acef25 balsa-2.2.6.tar.bz2 2913847
-RMD160 88bf8e9a404729d600f0cbddf16ab972c96eb343 balsa-2.2.6.tar.bz2 2913847
-SHA256 87ea412aab7bc6633dac567d13817e25edeadde5cc3acd3d3b9a485ee208cc1f balsa-2.2.6.tar.bz2 2913847
diff --git a/mail-client/balsa/files/digest-balsa-2.2.6-r4 b/mail-client/balsa/files/digest-balsa-2.2.6-r4
deleted file mode 100644
index ae79389170e6..000000000000
--- a/mail-client/balsa/files/digest-balsa-2.2.6-r4
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 6179fadbfc5cca642dac081519acef25 balsa-2.2.6.tar.bz2 2913847
-RMD160 88bf8e9a404729d600f0cbddf16ab972c96eb343 balsa-2.2.6.tar.bz2 2913847
-SHA256 87ea412aab7bc6633dac567d13817e25edeadde5cc3acd3d3b9a485ee208cc1f balsa-2.2.6.tar.bz2 2913847
diff --git a/mail-client/balsa/files/digest-balsa-2.3.4-r1 b/mail-client/balsa/files/digest-balsa-2.3.4-r1
deleted file mode 100644
index 5646974565a8..000000000000
--- a/mail-client/balsa/files/digest-balsa-2.3.4-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 12b1ffb936ac679468adb33b422b72d8 balsa-2.3.4.tar.bz2 3137183
-RMD160 7bd2ce4b3c934f845d18407e0b0b22726972b2ef balsa-2.3.4.tar.bz2 3137183
-SHA256 0476d5081318fa4f03f0e583f801939ba67fa049666b147cd6f28243db95714b balsa-2.3.4.tar.bz2 3137183
diff --git a/mail-client/balsa/files/digest-balsa-2.3.8 b/mail-client/balsa/files/digest-balsa-2.3.8
deleted file mode 100644
index 6bf223ef1c40..000000000000
--- a/mail-client/balsa/files/digest-balsa-2.3.8
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 517c0a1cbd4dc85ec06a6c7b0f522ffa balsa-2.3.8.tar.bz2 3206115
-RMD160 54abdc822b0e29c0b9697ba70fec059bbc0004a4 balsa-2.3.8.tar.bz2 3206115
-SHA256 bc4c72ac1043d428fbd04313beb0b3ba2bb861b3cb34025e3158b957e29603b9 balsa-2.3.8.tar.bz2 3206115