bump to 2.3.22

(Portage version: 2.1.4_rc14)

7 files changed, 36 insertions, 114 deletions

diff --git a/mail-client/balsa/ChangeLog b/mail-client/balsa/ChangeLog
index 0cb482f21c3a..b092b289ea92 100644
--- a/mail-client/balsa/ChangeLog
+++ b/mail-client/balsa/ChangeLog
@@ -1,6 +1,13 @@
 # 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.58 2007/10/10 15:22:32 remi Exp $
+# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/mail-client/balsa/ChangeLog,v 1.59 2008/01/03 22:54:02 eva Exp $
+
+*balsa-2.3.22 (03 Jan 2008)
+
+  03 Jan 2008; Gilles Dartiguelongue <eva@gentoo.org> metadata.xml,
+  -balsa-2.3.13.ebuild, -balsa-2.3.16.ebuild, +balsa-2.3.22.ebuild:
+  bump to 2.3.22, notably adds rubrica addressbook support
+  pruning old releases with security issues
 
   10 Oct 2007; Rémi Cardona <remi@gentoo.org> balsa-2.3.13.ebuild,
   balsa-2.3.16.ebuild, balsa-2.3.20.ebuild:
diff --git a/mail-client/balsa/balsa-2.3.13.ebuild b/mail-client/balsa/balsa-2.3.13.ebuild
deleted file mode 100644
index c4a42b4c7fd9..000000000000
--- a/mail-client/balsa/balsa-2.3.13.ebuild
+++ /dev/null
@@ -1,89 +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.3.13.ebuild,v 1.9 2007/10/10 15:22:32 remi 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 xface"
-
-RDEPEND=">=dev-libs/glib-2.0
-		 >=x11-libs/gtk+-2.4
-		 >=dev-libs/gmime-2.1.19
-		 >=net-libs/libesmtp-1.0.3
-		 >=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-1.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
-				=x11-libs/gtksourceview-1*
-			   )
-		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-5.0 )
-		sqlite? ( >=dev-db/sqlite-2.8 )
-		ssl? ( dev-libs/openssl )
-		xface? ( >=media-libs/compface-1.5.1 )"
-DEPEND="${RDEPEND}
-		dev-util/intltool
-		dev-util/pkgconfig
-		gnome? ( >=app-text/scrollkeeper-0.1.4 )
-		doc? ( dev-util/gtk-doc )"
-
-DOCS="AUTHORS ChangeLog HACKING NEWS README TODO docs/*"
-USE_DESTDIR="1"
-
-pkg_setup() {
-	# threads are currently broken with gpgme
-	G2CONF="--disable-threads"
-
-	if use xface ; then
-		G2CONF="${G2CONF} --with-compface"
-	else
-		G2CONF="${G2CONF} --without-compface"
-	fi
-
-	if use crypt ; then
-		G2CONF="${G2CONF} --with-gpgme=gpgme-config"
-	else
-		G2CONF="${G2CONF} --without-gpgme"
-	fi
-
-	if use gnome ; then
-		G2CONF="${G2CONF} --with-gtksourceview"
-	else
-		G2CONF="${G2CONF} --without-gtksourceview"
-	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)"
-}
diff --git a/mail-client/balsa/balsa-2.3.16.ebuild b/mail-client/balsa/balsa-2.3.22.ebuild
index 5aea66170532..76ac39ac857a 100644
--- a/mail-client/balsa/balsa-2.3.16.ebuild
+++ b/mail-client/balsa/balsa-2.3.22.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 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.3 2007/10/10 15:22:32 remi Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/balsa/balsa-2.3.22.ebuild,v 1.1 2008/01/03 22:54:02 eva Exp $
 
 inherit gnome2
 
@@ -12,7 +12,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
 # Doesn't currently build with -gnome
-IUSE="crypt doc gtkhtml gtkspell kerberos ldap libnotify pcre sqlite ssl xface"
+IUSE="crypt doc gtkhtml gtkspell kerberos ldap libnotify pcre rubrica sqlite ssl xface"
 
 RDEPEND=">=dev-libs/glib-2.0
 		 >=x11-libs/gtk+-2.10
@@ -25,10 +25,10 @@ RDEPEND=">=dev-libs/glib-2.0
 		   sys-devel/gettext
 		   net-mail/mailbase
 		crypt? ( >=app-crypt/gpgme-1.0 )
-				>=gnome-base/libgnome-2.0
-				>=gnome-base/libgnomeui-2.0
-				>=gnome-base/gnome-vfs-2.0
-				=x11-libs/gtksourceview-1*
+		>=gnome-base/libgnome-2.0
+		>=gnome-base/libgnomeui-2.0
+		>=gnome-base/gnome-vfs-2.0
+		=x11-libs/gtksourceview-1*
 		gtkhtml? ( gnome-extra/gtkhtml )
 		sqlite? ( >=dev-db/sqlite-2.8 )
 		libnotify? ( x11-libs/libnotify )
@@ -36,6 +36,7 @@ RDEPEND=">=dev-libs/glib-2.0
 		!gtkspell? ( virtual/aspell-dict )
 		kerberos? ( app-crypt/mit-krb5 )
 		ldap? ( net-nds/openldap )
+		rubrica? ( dev-libs/libxml2 )
 		pcre? ( >=dev-libs/libpcre-5.0 )
 		ssl? ( dev-libs/openssl )
 		xface? ( >=media-libs/compface-1.5.1 )"
@@ -46,11 +47,10 @@ DEPEND="${RDEPEND}
 		doc? ( dev-util/gtk-doc )"
 
 DOCS="AUTHORS ChangeLog HACKING NEWS README TODO docs/*"
-USE_DESTDIR="1"
 
 pkg_setup() {
 	# threads are currently broken with gpgme
-	G2CONF="--disable-threads"
+	G2CONF="${G2CONF} --disable-threads"
 
 	if use xface ; then
 		G2CONF="${G2CONF} --with-compface"
@@ -76,11 +76,13 @@ pkg_setup() {
 		G2CONF="${G2CONF} --without-gtkhtml"
 	fi
 
-	G2CONF="${G2CONF} 					\
-			$(use_with gtkspell) 		\
-			$(use_with kerberos gss) 	\
-			$(use_with ldap) 			\
-			$(use_enable pcre) 			\
-			$(use_with sqlite) 			\
-			$(use_with ssl)"
+	G2CONF="${G2CONF}
+		$(use_with rubrica)
+		$(use_with gtkspell)
+		$(use_with kerberos gss)
+		$(use_with ldap)
+		$(use_enable pcre)
+		$(use_with sqlite)
+		$(use_with ssl)"
 }
+
diff --git a/mail-client/balsa/files/digest-balsa-2.3.13 b/mail-client/balsa/files/digest-balsa-2.3.13
deleted file mode 100644
index 34078cf834cb..000000000000
--- a/mail-client/balsa/files/digest-balsa-2.3.13
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 a1c7fe3454243f1719a19fcdb0905948 balsa-2.3.13.tar.bz2 2504314
-RMD160 de5b86c4f92bde136f4c6cc92ba59dae47dc45f3 balsa-2.3.13.tar.bz2 2504314
-SHA256 e11b26389e57705b226abcc87a94a6ddbc17a729e861fdf3dd0d842871c927ab balsa-2.3.13.tar.bz2 2504314
diff --git a/mail-client/balsa/files/digest-balsa-2.3.16 b/mail-client/balsa/files/digest-balsa-2.3.16
deleted file mode 100644
index 9a1d2c917971..000000000000
--- a/mail-client/balsa/files/digest-balsa-2.3.16
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 c2919b9d30b8df9f917740230212435b balsa-2.3.16.tar.bz2 2550609
-RMD160 c087541520d80c2ac6d26426e2ba6dcce0f54bd6 balsa-2.3.16.tar.bz2 2550609
-SHA256 ddd58f9ffc3a147f1256850b09eab964f95a8fc7c625a0a446547baa74c19232 balsa-2.3.16.tar.bz2 2550609
diff --git a/mail-client/balsa/files/digest-balsa-2.3.22 b/mail-client/balsa/files/digest-balsa-2.3.22
new file mode 100644
index 000000000000..8b286065d7a1
--- /dev/null
+++ b/mail-client/balsa/files/digest-balsa-2.3.22
@@ -0,0 +1,3 @@
+MD5 0f9b8dbdd26a1916dcc92f0767e8b4e4 balsa-2.3.22.tar.bz2 2597097
+RMD160 e65292494d7a5807e1fb99e3dc2cff78d5c471e2 balsa-2.3.22.tar.bz2 2597097
+SHA256 4c054430ea0ecf48f6c8fcb240d597eaeb7fdbdd757c427dcae633ca2ebf937b balsa-2.3.22.tar.bz2 2597097
diff --git a/mail-client/balsa/metadata.xml b/mail-client/balsa/metadata.xml
index da6fd63d0085..2fd233451181 100644
--- a/mail-client/balsa/metadata.xml
+++ b/mail-client/balsa/metadata.xml
@@ -1,5 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnome</herd>
+	<herd>gnome</herd>
+	<use>
+		<flag name='crypt'>Adds support for GnuPG encryption</flag>
+		<flag name='rubrica'>Adds support for <pkg>app-office/rubrica</pkg>
+			addressbook</flag>
+	</use>
 </pkgmetadata>