Version bump, drop old

(Portage version: 2.1.11.37/cvs/Linux x86_64, signed Manifest commit with key A188FBD4)

4 files changed, 28 insertions, 181 deletions

diff --git a/mail-client/balsa/ChangeLog b/mail-client/balsa/ChangeLog
index b306baf87ecf..e49f3b0d479f 100644
--- a/mail-client/balsa/ChangeLog
+++ b/mail-client/balsa/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for mail-client/balsa
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/balsa/ChangeLog,v 1.120 2012/10/28 15:56:20 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/balsa/ChangeLog,v 1.121 2012/12/24 21:06:46 pacho Exp $
+
+*balsa-2.4.13 (24 Dec 2012)
+
+  24 Dec 2012; Pacho Ramos <pacho@gentoo.org> +balsa-2.4.13.ebuild,
+  -balsa-2.4.11.ebuild, -balsa-2.4.8.ebuild,
+  -files/balsa-2.4.8-libnotify-0.7.patch:
+  Version bump, drop old
 
   28 Oct 2012; Raúl Porcel <armin76@gentoo.org> balsa-2.4.12.ebuild:
   alpha/sparc stable wrt #427544
diff --git a/mail-client/balsa/balsa-2.4.11.ebuild b/mail-client/balsa/balsa-2.4.13.ebuild
index 777cb4f95f59..d3e90717c22b 100644
--- a/mail-client/balsa/balsa-2.4.11.ebuild
+++ b/mail-client/balsa/balsa-2.4.13.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/balsa/balsa-2.4.11.ebuild,v 1.2 2012/05/04 08:42:23 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/balsa/balsa-2.4.13.ebuild,v 1.1 2012/12/24 21:06:46 pacho Exp $
 
-EAPI="4"
+EAPI="5"
 GCONF_DEBUG="no"
 
 inherit eutils gnome2
@@ -20,14 +20,14 @@ IUSE="crypt gnome gtkhtml +gtkspell kerberos ldap libnotify networkmanager rubri
 # TODO: esmtp can be optional
 RDEPEND=">=dev-libs/glib-2.16:2
 	>=x11-libs/gtk+-2.18:2
-	dev-libs/gmime:2.4
+	dev-libs/gmime:2.6
 	dev-libs/libunique:1
-	>=net-libs/libesmtp-1.0.3
+	>=net-libs/libesmtp-1.0.3:=
 	net-mail/mailbase
-	media-libs/libcanberra[gtk]
+	media-libs/libcanberra:=[gtk]
 	x11-themes/hicolor-icon-theme
 	x11-themes/gnome-icon-theme
-	crypt? ( >=app-crypt/gpgme-1.0 )
+	crypt? ( >=app-crypt/gpgme-1.0:= )
 	gnome? (
 		>=gnome-base/orbit-2
 		>=gnome-base/libbonobo-2.0
@@ -37,8 +37,8 @@ RDEPEND=">=dev-libs/glib-2.16:2
 		>=gnome-base/gnome-keyring-2.20
 		>=x11-libs/gtksourceview-2.10:2.0 )
 	gtkhtml? ( >=gnome-extra/gtkhtml-3.14:3.14 )
-	sqlite? ( >=dev-db/sqlite-2.8 )
-	libnotify? ( >=x11-libs/libnotify-0.7 )
+	sqlite? ( >=dev-db/sqlite-2.8:= )
+	libnotify? ( >=x11-libs/libnotify-0.7:= )
 	gtkspell? (
 		app-text/gtkspell:2
 		app-text/enchant )
@@ -47,9 +47,9 @@ RDEPEND=">=dev-libs/glib-2.16:2
 	ldap? ( net-nds/openldap )
 	networkmanager? ( >=net-misc/networkmanager-0.7 )
 	rubrica? ( dev-libs/libxml2:2 )
-	ssl? ( dev-libs/openssl )
+	ssl? ( dev-libs/openssl:= )
 	webkit? ( >=net-libs/webkit-gtk-1.5.1:2 )
-	xface? ( >=media-libs/compface-1.5.1 )"
+	xface? ( >=media-libs/compface-1.5.1:= )"
 DEPEND="${RDEPEND}
 	dev-util/intltool
 	virtual/pkgconfig
@@ -59,30 +59,30 @@ DEPEND="${RDEPEND}
 
 REQUIRED_USE="gtkhtml? ( !webkit )"
 
-DOCS="AUTHORS ChangeLog HACKING NEWS README TODO docs/*"
+src_prepare() {
+	DOCS="AUTHORS ChangeLog HACKING NEWS README TODO docs/*"
 
-pkg_setup() {
 	if use crypt ; then
-		G2CONF="${G2CONF} --with-gpgme=gpgme-config"
+		G2CONF+=" --with-gpgme=gpgme-config"
 	else
-		G2CONF="${G2CONF} --without-gpgme"
+		G2CONF+=" --without-gpgme"
 	fi
 
 	if use webkit || use gtkhtml; then
 		if use gtkhtml ; then
-			G2CONF="${G2CONF} --with-html-widget=gtkhtml3"
+			G2CONF+=" --with-html-widget=gtkhtml3"
 		else
-			G2CONF="${G2CONF} --with-html-widget=webkit"
+			G2CONF+=" --with-html-widget=webkit"
 		fi
 	else
-		G2CONF="${G2CONF} --with-html-widget=no"
+		G2CONF+=" --with-html-widget=no"
 	fi
 
-	G2CONF="${G2CONF}
+	G2CONF+="
 		--disable-pcre
 		--enable-gregex
 		--enable-threads
-		--with-gmime=2.4
+		--with-gmime=2.6
 		--with-unique
 		--with-canberra
 		$(use_with gnome)
@@ -96,11 +96,9 @@ pkg_setup() {
 		$(use_with sqlite)
 		$(use_with ssl)
 		$(use_with xface compface)"
-}
 
-src_prepare() {
 	# Fix documentation
-	epatch "${FILESDIR}/${P}-doc-fixes.patch"
+	epatch "${FILESDIR}/${PN}-2.4.11-doc-fixes.patch"
 
 	gnome2_src_prepare
 }
diff --git a/mail-client/balsa/balsa-2.4.8.ebuild b/mail-client/balsa/balsa-2.4.8.ebuild
deleted file mode 100644
index 5a8d4cb6b511..000000000000
--- a/mail-client/balsa/balsa-2.4.8.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/balsa/balsa-2.4.8.ebuild,v 1.11 2012/05/04 08:42:23 jdhore 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 gnome gtkhtml +gtkspell kerberos ldap libnotify networkmanager rubrica sqlite ssl webkit xface"
-
-# TODO: esmtp can be optional
-RDEPEND=">=dev-libs/glib-2.16:2
-	>=x11-libs/gtk+-2.18:2
-	dev-libs/gmime:2.4
-	dev-libs/libunique:1
-	>=net-libs/libesmtp-1.0.3
-	net-mail/mailbase
-	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
-		>=gnome-base/libbonobo-2.0
-		>=gnome-base/libgnome-2.0
-		>=gnome-base/libgnomeui-2.0
-		>=gnome-base/gconf-2.0:2
-		>=gnome-base/gnome-keyring-2.20
-		>=x11-libs/gtksourceview-2.10:2.0 )
-	gtkhtml? ( >=gnome-extra/gtkhtml-3.14:3.14 )
-	sqlite? ( >=dev-db/sqlite-2.8 )
-	libnotify? ( x11-libs/libnotify )
-	gtkspell? (
-		app-text/gtkspell:2
-		app-text/enchant )
-	!gtkspell? ( app-text/aspell )
-	kerberos? ( app-crypt/mit-krb5 )
-	ldap? ( net-nds/openldap )
-	networkmanager? ( >=net-misc/networkmanager-0.7 )
-	rubrica? ( dev-libs/libxml2:2 )
-	ssl? ( dev-libs/openssl )
-	webkit? ( >=net-libs/webkit-gtk-1.1.14:2 )
-	xface? ( >=media-libs/compface-1.5.1 )"
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	virtual/pkgconfig
-	sys-devel/gettext
-	>=app-text/scrollkeeper-0.1.4
-	app-text/gnome-doc-utils"
-
-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."
-	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} --with-html-widget=no"
-	fi
-
-	G2CONF="${G2CONF}
-		--disable-pcre
-		--enable-gregex
-		--enable-threads
-		--with-gmime=2.4
-		--with-unique
-		--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() {
-	epatch "${FILESDIR}"/${P}-libnotify-0.7.patch
-	gnome2_src_prepare
-}
diff --git a/mail-client/balsa/files/balsa-2.4.8-libnotify-0.7.patch b/mail-client/balsa/files/balsa-2.4.8-libnotify-0.7.patch
deleted file mode 100644
index 0cef7f54ac8f..000000000000
--- a/mail-client/balsa/files/balsa-2.4.8-libnotify-0.7.patch
+++ /dev/null
@@ -1,51 +0,0 @@
---- libbalsa/information.c
-+++ libbalsa/information.c
-@@ -27,6 +27,9 @@
- 
- #ifdef HAVE_NOTIFY
- #include <libnotify/notify.h>
-+#ifndef NOTIFY_CHECK_VERSION
-+#define NOTIFY_CHECK_VERSION(x,y,z) 0
-+#endif
- #include <gtk/gtk.h>
- #endif
- #include <string.h>
-@@ -122,7 +125,11 @@
-         g_free(msg);
- 
-         note =
-+#if NOTIFY_CHECK_VERSION (0, 7, 0)
-+            notify_notification_new("Balsa", escaped->str, icon_str);
-+#else
-             notify_notification_new("Balsa", escaped->str, icon_str, NULL);
-+#endif
-         g_string_free(escaped, TRUE);
- 
-         notify_notification_set_timeout(note, 7000);    /* 7 seconds */
---- src/main-window.c
-+++ src/main-window.c
-@@ -85,6 +85,12 @@
- 
- #define MAILBOX_DATA "mailbox_data"
- 
-+#ifdef HAVE_NOTIFY
-+#ifndef NOTIFY_CHECK_VERSION
-+#define NOTIFY_CHECK_VERSION(x,y,z) 0
-+#endif
-+#endif
-+
- enum {
-     OPEN_MAILBOX_NODE,
-     CLOSE_MAILBOX_NODE,
-@@ -3406,7 +3412,11 @@
-         } else {
-             num_total = num_new;
-             balsa_app.main_window->new_mail_note =
-+#if NOTIFY_CHECK_VERSION (0, 7, 0)
-+                notify_notification_new("Balsa", NULL, NULL);
-+#else
-                 notify_notification_new("Balsa", NULL, NULL, NULL);
-+#endif
-             g_object_add_weak_pointer(G_OBJECT(balsa_app.main_window->
-                                                new_mail_note),
-                                       (gpointer) & balsa_app.main_window->