Version bump. Clean up old revisions. Make ewarn display a bit more logical, bug #330875.

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

5 files changed, 60 insertions, 53 deletions

diff --git a/mail-client/balsa/ChangeLog b/mail-client/balsa/ChangeLog
index 5f01aa55e816..c08924601608 100644
--- a/mail-client/balsa/ChangeLog
+++ b/mail-client/balsa/ChangeLog
@@ -1,6 +1,14 @@
 # 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.102 2010/06/29 16:04:45 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/balsa/ChangeLog,v 1.103 2010/08/30 20:40:11 eva Exp $
+
+*balsa-2.4.8 (30 Aug 2010)
+
+  30 Aug 2010; Gilles Dartiguelongue <eva@gentoo.org>
+  -balsa-2.4.1-r1.ebuild, -files/balsa-2.4.1-vcard.patch,
+  balsa-2.4.7.ebuild, +balsa-2.4.8.ebuild:
+  Version bump. Clean up old revisions. Make ewarn display a bit more
+  logical, bug #330875.
 
   29 Jun 2010; Samuli Suominen <ssuominen@gentoo.org> balsa-2.4.7.ebuild,
   +files/balsa-2.4.7-asneeded.patch:
diff --git a/mail-client/balsa/Manifest b/mail-client/balsa/Manifest
index 9b41061506a7..34e0d11c12d0 100644
--- a/mail-client/balsa/Manifest
+++ b/mail-client/balsa/Manifest
@@ -1,9 +1,18 @@
-AUX balsa-2.4.1-vcard.patch 581 RMD160 9efe72c102d8746c1f53ebde04b52b9dd6497775 SHA1 3e75bfebd6110bb85bdc2f2d7a93550feb2a1877 SHA256 c3c8ed63deb660b3f8cafbcc996f369fc2e1f766060e3ba9801865e616188ba9
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX balsa-2.4.7-asneeded.patch 216 RMD160 22b35d2ef74038e19a28fe816bffe86e6871c180 SHA1 98f7db14052e543539948574287d1f0a8b581092 SHA256 f7a75bdf30b3c828e8e012fab33c645073687d56efaca66ce599441d686e1d05
 AUX balsa-2.4.7-build-failure-notify.patch 946 RMD160 756119e9f4f7f0877b3b43a1778a7b4cb9b0a7ce SHA1 14e6ee41935c282900aee89010f38d8ef530aa7c SHA256 a40003889650f4d91e75cc44376f47c40a53a78b72f18825fdb646a4fedc1873
-DIST balsa-2.4.1.tar.bz2 3057983 RMD160 846905d9754fb5c4d3438c81078e79d61989cc99 SHA1 fc8a0ee154b22505607a82c886ccb074c28ac499 SHA256 06d9807c4135a468a5def531585ead9ea0948b206794e848efe234aa02df39d5
 DIST balsa-2.4.7.tar.bz2 2926482 RMD160 4679e66423387fe16f6e3192aa61f60740c9a18a SHA1 def4bd033c0f0bfbfb8f1b2a748cabe420e57038 SHA256 581326a68a52f8344c900ca47d862536821bc5864c38b09cb6c333722a212952
-EBUILD balsa-2.4.1-r1.ebuild 2559 RMD160 a83ff8142f91f79e1ca9a4a468002f02fe209bb4 SHA1 20fdfa335d74a3dde99240b67fd5c73e67d2ffe0 SHA256 282b428fc1b91f5e6cf67f5cb569c67b99a5d446319e7c8e01eb550b0878ff39
-EBUILD balsa-2.4.7.ebuild 2988 RMD160 35f541efec84db25608a82b6603e281eab93bd3c SHA1 a543da2d4e9b4edb667fa2d79f58d06941166410 SHA256 31e5f68dfabfc24e86343748c042f8469140cb943828466ed79f11458ea6dcda
-MISC ChangeLog 23807 RMD160 8a5964a2c07baecb47e8edd7b2e882cf728481ea SHA1 56e1018c3435bc2bc46665778bfdef76d89470e8 SHA256 1f3917d5549b7babd2f4acfb6e6cc86dd200bab7727dc847ffcd694769363038
+DIST balsa-2.4.8.tar.bz2 3150866 RMD160 d1723f99c4d27f722d48300863be539a5dad606a SHA1 809d44a82505ca19cb202923f0683f47c8252b70 SHA256 9b313920b754656f6c668f29675fd5630b001f4a3405f00fd9bf58d9b1f213cf
+EBUILD balsa-2.4.7.ebuild 3022 RMD160 962278743834c3e9eaad0b90e88d15e8886e4e20 SHA1 15f827c4ec0bc210bf60e9d3138704be40bf3b5e SHA256 994d6c5d2616f3f335879bcbd158f660e004388f02b367b07c147bf9cc537e33
+EBUILD balsa-2.4.8.ebuild 2671 RMD160 ed353f02b8938e205f72e7e3765de2a2bdbe4eef SHA1 a6d056ca23e80b68200b04aca80bb95acae072da SHA256 6022b433ff1aef7d0b995853c0dcdc20299ef8eb7f76e433ff6733d58fe2a13e
+MISC ChangeLog 24079 RMD160 b69e420ae9fd536a42c24e65b480ee2f58cd05fb SHA1 5030aaca0a8eb9391f5634ff46ad8f9cac6c8dff SHA256 a4ed19db4c5b2424f15dcdda52d7c2444063913d2bb2bf0da4a7f655fcad725d
 MISC metadata.xml 458 RMD160 75720f401492866e5d0c5659c53779856f6a47e9 SHA1 c678d1933c2161e59e783520548d7c69bb505049 SHA256 fe906fdde4dd35e9815a37479abbec9a15bd2854bbaa7bc648645ed3c73663ef
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.15 (GNU/Linux)
+
+iEYEARECAAYFAkx8FzIACgkQ1fmVwcYIWAZ7yQCdGKPfeCzBYB5EAGmRGcpnGPLe
+AW8AoKb4IltibMPpVGelNmbhg+PNAYPC
+=QreH
+-----END PGP SIGNATURE-----
diff --git a/mail-client/balsa/balsa-2.4.7.ebuild b/mail-client/balsa/balsa-2.4.7.ebuild
index 28f65968cf66..2f8b0333c707 100644
--- a/mail-client/balsa/balsa-2.4.7.ebuild
+++ b/mail-client/balsa/balsa-2.4.7.ebuild
@@ -1,6 +1,6 @@
 # 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.7 2010/06/29 16:04:45 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/balsa/balsa-2.4.7.ebuild,v 1.8 2010/08/30 20:40:11 eva Exp $
 
 EAPI="2"
 GCONF_DEBUG="no"
@@ -67,10 +67,12 @@ pkg_setup() {
 		G2CONF="${G2CONF} --without-gpgme"
 	fi
 
-	if use webkit || use gtkhtml ; then
+	if use webkit && use gtkhtml ; then
 		ewarn "Only one html widget can be enabled at the same time."
 		ewarn "Selecting gtkhtml by default."
+	fi
 
+	if use webkit || use gtkhtml; then
 		if use gtkhtml ; then
 			G2CONF="${G2CONF} --with-html-widget=gtkhtml3"
 		else
diff --git a/mail-client/balsa/balsa-2.4.1-r1.ebuild b/mail-client/balsa/balsa-2.4.8.ebuild
index f3eac3aa90b5..e67ae253e366 100644
--- a/mail-client/balsa/balsa-2.4.1-r1.ebuild
+++ b/mail-client/balsa/balsa-2.4.8.ebuild
@@ -1,10 +1,11 @@
 # 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.1-r1.ebuild,v 1.5 2010/02/01 20:17:42 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/balsa/balsa-2.4.8.ebuild,v 1.1 2010/08/30 20:40:11 eva Exp $
 
 EAPI="2"
+GCONF_DEBUG="no"
 
-inherit eutils gnome2
+inherit gnome2
 
 DESCRIPTION="Email client for GNOME"
 HOMEPAGE="http://pawsa.fedorapeople.org/balsa/"
@@ -12,17 +13,20 @@ SRC_URI="http://pawsa.fedorapeople.org/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~ppc sparc x86"
+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"
+IUSE="crypt gnome gtkhtml +gtkspell kerberos ldap libnotify networkmanager rubrica sqlite ssl webkit xface"
 
+# TODO: esmtp can be optional
 RDEPEND=">=dev-libs/glib-2.16
-	>=x11-libs/gtk+-2.14
+	>=x11-libs/gtk+-2.18
 	dev-libs/gmime:2.4
+	dev-libs/libunique
 	>=net-libs/libesmtp-1.0.3
-	x11-themes/hicolor-icon-theme
 	net-mail/mailbase
-	dev-libs/libunique
+	media-libs/libcanberra[gtk]
+	x11-themes/hicolor-icon-theme
+	x11-themes/gnome-icon-theme
 	crypt? ( >=app-crypt/gpgme-1.0 )
 	gnome? (
 		>=gnome-base/orbit-2
@@ -31,24 +35,27 @@ RDEPEND=">=dev-libs/glib-2.16
 		>=gnome-base/libgnomeui-2.0
 		>=gnome-base/gconf-2.0
 		>=gnome-base/gnome-keyring-2.20
-		>=x11-libs/gtksourceview-2 )
+		>=x11-libs/gtksourceview-2.10 )
 	gtkhtml? ( >=gnome-extra/gtkhtml-3.14 )
 	sqlite? ( >=dev-db/sqlite-2.8 )
 	libnotify? ( x11-libs/libnotify )
-	gtkspell? ( =app-text/gtkspell-2* )
+	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 )"
+	app-text/gnome-doc-utils"
 
 DOCS="AUTHORS ChangeLog HACKING NEWS README TODO docs/*"
 
@@ -59,40 +66,37 @@ pkg_setup() {
 		G2CONF="${G2CONF} --without-gpgme"
 	fi
 
-	if use gtkhtml ; then
-		G2CONF="${G2CONF} --with-gtkhtml=3"
+	if use webkit && use gtkhtml ; then
+		ewarn "Only one html widget can be enabled at the same time."
+		ewarn "Selecting gtkhtml by default."
+	fi
+
+	if use webkit || use gtkhtml; then
+		if use gtkhtml ; then
+			G2CONF="${G2CONF} --with-html-widget=gtkhtml3"
+		else
+			G2CONF="${G2CONF} --with-html-widget=webkit"
+		fi
 	else
-		G2CONF="${G2CONF} --without-gtkhtml"
+		G2CONF="${G2CONF} --with-html-widget=no"
 	fi
 
-	# canberra support is considered experimental
 	G2CONF="${G2CONF}
 		--disable-pcre
 		--enable-gregex
 		--enable-threads
+		--with-gmime=2.4
 		--with-unique
-		--without-canberra
+		--with-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)"
 }
-
-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
deleted file mode 100644
index b12d63132528..000000000000
--- a/mail-client/balsa/files/balsa-2.4.1-vcard.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-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));
-