Version bump. Fix a couple of crashers and security issues. Also fix automagic USE flags, bug #301850.

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

5 files changed, 129 insertions, 7 deletions

diff --git a/mail-client/balsa/ChangeLog b/mail-client/balsa/ChangeLog
index 46bf41033981..7cf21a6e48ea 100644
--- a/mail-client/balsa/ChangeLog
+++ b/mail-client/balsa/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for mail-client/balsa
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/balsa/ChangeLog,v 1.93 2010/02/01 20:17:42 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/balsa/ChangeLog,v 1.94 2010/03/10 23:46:25 eva Exp $
+
+*balsa-2.4.7 (10 Mar 2010)
+
+  10 Mar 2010; Gilles Dartiguelongue <eva@gentoo.org> +balsa-2.4.7.ebuild,
+  metadata.xml:
+  Version bump. Fix a couple of crashers and security issues. Also fix
+  automagic USE flags, bug #301850.
 
   01 Feb 2010; Markos Chandras <hwoarang@gentoo.org> balsa-2.4.1-r1.ebuild:
   Stable on amd64 wrt bug #278718
diff --git a/mail-client/balsa/Manifest b/mail-client/balsa/Manifest
index b5188a522d49..99a6f2916f24 100644
--- a/mail-client/balsa/Manifest
+++ b/mail-client/balsa/Manifest
@@ -1,10 +1,22 @@
+-----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.1.tar.bz2 3057983 RMD160 846905d9754fb5c4d3438c81078e79d61989cc99 SHA1 fc8a0ee154b22505607a82c886ccb074c28ac499 SHA256 06d9807c4135a468a5def531585ead9ea0948b206794e848efe234aa02df39d5
 DIST balsa-2.4.2.tar.bz2 3079414 RMD160 711f1c270f6c78fbd4b7be656035bbec75a29e7f SHA1 c1dcc907ef2d8f51adcd0257f374a322dadb7ce8 SHA256 48bde6ff926fcc5d47853b87242cc890bdb21b5c74a2454a2b5c0269e9340090
+DIST balsa-2.4.7.tar.bz2 2926482 RMD160 4679e66423387fe16f6e3192aa61f60740c9a18a SHA1 def4bd033c0f0bfbfb8f1b2a748cabe420e57038 SHA256 581326a68a52f8344c900ca47d862536821bc5864c38b09cb6c333722a212952
 EBUILD balsa-2.3.28.ebuild 2465 RMD160 4aa2959ac44307c954f19b22570c8db5de01c78f SHA1 06238cd9d61eb620aae8ed240cbb33249b091b7a SHA256 c7c618b8de877f434c69748ae7b14b198f569fc313004bcc8bc209403f6889a6
 EBUILD balsa-2.4.1-r1.ebuild 2559 RMD160 a83ff8142f91f79e1ca9a4a468002f02fe209bb4 SHA1 20fdfa335d74a3dde99240b67fd5c73e67d2ffe0 SHA256 282b428fc1b91f5e6cf67f5cb569c67b99a5d446319e7c8e01eb550b0878ff39
 EBUILD balsa-2.4.1.ebuild 2472 RMD160 a869d975611951e8cbf92a7141d324333e06396a SHA1 0518baf907024e1617bacb49ebeb8c5e99291277 SHA256 346182ac964454a7002841c5944f35eb284daf7ab4a70f1f6c9d820d90214696
 EBUILD balsa-2.4.2.ebuild 2366 RMD160 a71a8640b9e3a8e4a11cb4443fb93a3016a4cf60 SHA1 6a6946a9088183926c020739cac36abc99e81c42 SHA256 969699abee5d96120988d82661deeef6ef7c4d7c88cd2e76cc8774d5b5adbbdd
-MISC ChangeLog 22555 RMD160 8780a7f717ca4758b84a2687fb47a60f11f59391 SHA1 9e0f45ee1f857467e5cad9e226ee45fea144cf94 SHA256 adbe413f863167e54ebc2c3da5e3951cf6ab3af79317902db24d3e7621c4e551
-MISC metadata.xml 395 RMD160 b98efee7c7c9345ce407812b3e099cfa771e7b4d SHA1 f58a59cb397081f9c9c0b08d8222d9a8818766e1 SHA256 fa52883e7722ffb442de48690c2acf846538b353f1d69f352b6b3b414c9ab4ce
+EBUILD balsa-2.4.7.ebuild 2693 RMD160 54892e5616bafc88a40af280ce8d739107a618f6 SHA1 1688cfa1e94c2810e4ea045d01d2cc37f1199623 SHA256 ec0e7dd855cd23b492bc3d0e95a12b0931c5d1c1493474ea4b8fafbabec3e9d4
+MISC ChangeLog 22777 RMD160 57b261371359163abc16e435adabbc507213db0e SHA1 7dcc238c801a2d365b41bd6741a1cc49308c27f8 SHA256 33493497a5b06ab941db14b00458afc14195d75703bbb72442c6956d21f1b0df
+MISC metadata.xml 458 RMD160 75720f401492866e5d0c5659c53779856f6a47e9 SHA1 c678d1933c2161e59e783520548d7c69bb505049 SHA256 fe906fdde4dd35e9815a37479abbec9a15bd2854bbaa7bc648645ed3c73663ef
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.14 (GNU/Linux)
+
+iEYEARECAAYFAkuYL1YACgkQ1fmVwcYIWAam4ACfd5p28g1Nt79dhgkWEgTU5vLO
+TuIAn0O4lpKlo3BCTjaj9Jdlc0MNWVRs
+=Ayal
+-----END PGP SIGNATURE-----
diff --git a/mail-client/balsa/balsa-2.4.7.ebuild b/mail-client/balsa/balsa-2.4.7.ebuild
new file mode 100644
index 000000000000..dec717970ee3
--- /dev/null
+++ b/mail-client/balsa/balsa-2.4.7.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mail-client/balsa/balsa-2.4.7.ebuild,v 1.1 2010/03/10 23:46:25 eva Exp $
+
+EAPI="2"
+GCONF_DEBUG="no"
+
+inherit eutils 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 networkmanager rubrica sqlite ssl webkit xface"
+
+# TODO: esmtp can be optional, webkit/canberra support
+RDEPEND=">=dev-libs/glib-2.16
+	>=x11-libs/gtk+-2.18
+	dev-libs/gmime:2.4
+	>=net-libs/libesmtp-1.0.3
+	x11-themes/hicolor-icon-theme
+	x11-themes/gnome-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*
+		app-text/enchant )
+	!gtkspell? ( virtual/aspell-dict )
+	kerberos? ( app-crypt/mit-krb5 )
+	ldap? ( net-nds/openldap )
+	networkmanager? ( >=net-misc/networkmanager-0.7 )
+	rubrica? ( dev-libs/libxml2 )
+	ssl? ( dev-libs/openssl )
+	webkit? ( >=net-libs/webkit-gtk-1.1.14 )
+	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 webkit || use gtkhtml ; then
+		ewarn "Only one html widget can be enabled at the same time."
+		ewarn "Selecting gtkhtml by default."
+
+		if use gtkhtml ; then
+			G2CONF="${G2CONF} --with-html-widget=gtkhtml3"
+		else
+			G2CONF="${G2CONF} --with-html-widget=webkit"
+		fi
+	else
+		G2CONF="${G2CONF} --with-html-widget=no"
+	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 networkmanager nm)
+		$(use_with rubrica)
+		$(use_with sqlite)
+		$(use_with ssl)
+		$(use_with xface compface)"
+}
diff --git a/mail-client/balsa/metadata.xml b/mail-client/balsa/metadata.xml
index 65f17b1489b3..0cfc63235000 100644
--- a/mail-client/balsa/metadata.xml
+++ b/mail-client/balsa/metadata.xml
@@ -7,5 +7,6 @@
 		<flag name='gtkspell'>Use gtkspell for dictionary support</flag>
 		<flag name='rubrica'>Adds support for <pkg>app-office/rubrica</pkg>
 			addressbook</flag>
+		<flag name="webkit">Enable webkit based html renderer</flag>
 	</use>
 </pkgmetadata>
diff --git a/mail-client/evolution/Manifest b/mail-client/evolution/Manifest
index 2adfff1d4442..2da3ff7e60cb 100644
--- a/mail-client/evolution/Manifest
+++ b/mail-client/evolution/Manifest
@@ -8,14 +8,16 @@ AUX evolution-2.28.0-automagic-plugins.patch 5196 RMD160 0c1c58267db1e8a1322c5bc
 AUX evolution-2.28.0-delete-key.patch 2416 RMD160 e8ce7b415f7dba764c82fa11e19ffdbe4e209bc7 SHA1 7e82210d842d5a523fbcdcc4ab31fe29d2fe62ad SHA256 8d6d6b41d594aa48dc8d1fb8e422d01d23ec191cdd2ca5eb77e4d0e98d5b7ae8
 DIST evolution-2.26.3.tar.bz2 36427464 RMD160 f2b3aa2275095feb2af406022c0a6bc8a381e8d5 SHA1 d0e247ccb903a57a5e6fe23cfb04535ea141e9fb SHA256 e37f8d21a8aa201e9a3d91a110ec9d4dc3feae978be45b0c16cf93adacd5605b
 DIST evolution-2.28.2.tar.bz2 29735192 RMD160 6e5f5ae60563fdaa9daa4c78f780cfa556770043 SHA1 19e970417cc91c82a5279cfe5dd7262d9d4c3319 SHA256 1f4a50127e3af085b0a074dcdfa0595bdf8925aeee295901c33805c3ff0c2603
+DIST evolution-2.28.3.1.tar.bz2 29765375 RMD160 442c7b472caf94ba0aa1abbe253b810d15911a4f SHA1 412c8be73e483444ad69a4ad8c15b0db9520fe0a SHA256 9fda41b0994b1bb8d119f594597f77bb4af1a883588a39f7a81ec7a2eb18f5fd
 EBUILD evolution-2.26.3.ebuild 4542 RMD160 a439bd8ca822a28d8c18b139e49bdebd83a2a8a9 SHA1 2560b0c6d9b8cc1296875b242762b3dbf3873a2c SHA256 7f9bdd20a5f0033652191208a5f0ab5888ebca07156364ea5b9a25a306c33d34
 EBUILD evolution-2.28.2.ebuild 4850 RMD160 da6f92127bb9a5075bb57f80f75b9585d224a606 SHA1 2922d281fe2b0fd3eaf6f7febe9e62a303089103 SHA256 101d810ebcf586828b967afeaababeb37f9c53e4d5836b64ef9a6638d06e8ac7
-MISC ChangeLog 67281 RMD160 4ff4be665f94bd3d5871e29ee0220ae82c8ab55f SHA1 52f52e382d52870271ed32521dc4ff2618f51f80 SHA256 b50101b39902d51db9f9b6b028e4a3a577a4c1daff49dd5bafd43ee832b34829
+EBUILD evolution-2.28.3.1.ebuild 4852 RMD160 98d2957aec5a4c86da59ba96240a846b87d4af2e SHA1 2e23d98f9cb38a595cec3dccc70300e3f204fb2c SHA256 bb454fe3aafae597283d9627633abb636c1f6daad9d28620df05f1053b9644eb
+MISC ChangeLog 67460 RMD160 a0b70123169c8f9871f57d61b6a2690d4d5f6d58 SHA1 7892184aa2ae9b9e11e4f8fa81c7fc814f67b014 SHA256 22a87c39832f582e54c9b272cad238119acd0c8900c652e536cccae6ab4a71dc
 MISC metadata.xml 1461 RMD160 a54b702777b629e801eb07e83c3151d020b2db2c SHA1 1db2d57540fd6732e6ad356e746f8c14f7411750 SHA256 1768837d6848092351ece0bff37f4db820dcb9cf9efcd21e596a71ad97892035
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.14 (GNU/Linux)
 
-iEYEARECAAYFAkuFrKgACgkQ1fmVwcYIWAYtmwCg4hFck+2eTclNPcSKXJTbgiv1
-0mIAoOdb9q18xulr5ZcrMNd6kYumQltR
-=zplU
+iEYEARECAAYFAkuYL5kACgkQ1fmVwcYIWAbESACfeQZcpOA76GGlPHHtJwmB69KA
+cyIAoIXps7nG36xCH4JwSm9unpy1XGUv
+=PPFM
 -----END PGP SIGNATURE-----