Version bump, drop old

Package-Manager: portage-2.1.11.37/cvs/Linux x86_64
Manifest-Sign-Key: 0xA188FBD4

5 files changed, 34 insertions, 190 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/Manifest b/mail-client/balsa/Manifest
index 2c828071365a..7fbda612ec6d 100644
--- a/mail-client/balsa/Manifest
+++ b/mail-client/balsa/Manifest
@@ -2,19 +2,16 @@
 Hash: SHA256
 
 AUX balsa-2.4.11-doc-fixes.patch 11963 SHA256 4c909aa8ab1ea3577378fc8251e5094ecd61dd2aa7cfcf20c012966659481f22 SHA512 303ddec33c167703ca87a8af2939cded15f1e8d9aed22ecd30446edd94b7d5a8d1058c81afc34aedfe1656d7a49e9a86961d444025070b8b76d9ec7def8a68ac WHIRLPOOL d4e0b8a43eb2013d5f66c1feaaa18d955a9e341605511a0182f9f804b55858994cd00cef8c5382d918c42447c7088d8c3f8b0389e030ac71c424c153d4911917
-AUX balsa-2.4.8-libnotify-0.7.patch 1417 SHA256 dce3a2223a9dfe1a866a3c6e27eed770af33925809dc68e0b9764d659d7797ad SHA512 1e82eab5a6301ad7eed0150a6a66215910a4cb5c6ec6b9a0743dc6e11c0ea85e01c9ea319ccb4d3c597b9535e6f802cf8b2b165ae05a5feeb88fd96b60ccd80a WHIRLPOOL e50b970b394a13750d89a4d6d31ce1bf4ca797e625b55661b467c73ffff8c87245ef5ccf481233c2ec67fe22277462449b16bb7541944095f3baeda7e053c591
-DIST balsa-2.4.11.tar.bz2 4076223 SHA256 41160c8c107aaecacbe29974b39f2cc1ef649793cf7af9c58d5eed4120bb2888
 DIST balsa-2.4.12.tar.bz2 4104426 SHA256 3f72fc69bb7fecb59e64c4cb88dc5083ed58dc76c9345b22d6c15af2c6b1e3c4 SHA512 eec2faae6c0d942ccc0a3a1c66cc3a1eaf57695c86b3baedd18e528b06133518ff6cd6110ac67e5b50f2fed298b442b05964b8bb9a524ff6aab0f11e61a407ef WHIRLPOOL 5d8fdb70a8d366a0fa65af51a3a888ae005ab1e53ac802ea03ab47e3c51381126bd0dab3aa43e1e2d0c92906bc0df86f90e3664c667fbfad56ced2d03cd4a37c
-DIST balsa-2.4.8.tar.bz2 3150866 SHA256 9b313920b754656f6c668f29675fd5630b001f4a3405f00fd9bf58d9b1f213cf SHA512 aea72a4831df59cf3213efdf4aa6ef9212e4e9287c4a0844848d5affc4039717cd3ea9053604b4e84712450b254b81a2cf136635f0c4fc80babb8095902a4e62 WHIRLPOOL 43e35429bf365714d31be88fb5b80723f172a39597afa780e82d7b155318966d1c52a54f53efd151a7c8ee745f6dd287cb4e0454de02bbb9eb336e80089fa221
-EBUILD balsa-2.4.11.ebuild 2696 SHA256 df90512b3107b728af03cb513646f4af0068c56ced2d2f5728255ac5cdab33f3 SHA512 49bc38d61171228d5cce949795bc7d31ec5a402c03944176f1677722ae516651b133bcd74f9884f361d4d0579dd6a2ee354547ec1bb7267dde4188c236cce0bf WHIRLPOOL 5914612e6a0f17ac180c56566f22351387d8a25b543732f1265ae5baa19937633eb8f3d6637bad04cd42020f31cee2c050a63f27f3329d64629781798dcfd03d
+DIST balsa-2.4.13.tar.bz2 4108408 SHA256 99194e39cec02191672f53a0ef9841eadfee57e27179befde26b1c80c173fa6d SHA512 6d125593eacc4ffaeaed316ff8d5ebbe27670a7e4feb5aab16f5c539f8d3e671add8a4a606ef4873e8b1ea0837f601fa08d77d028cc21ae83385e5ddbc215bdd WHIRLPOOL 2d48354b6cbf65dc5c83d0f358076040e4a4debb9b73ea96a57e3f764c6ca3465587c11319df29524ce5874ba2f3aded819936bd57ba439db8fe63388244113f
 EBUILD balsa-2.4.12.ebuild 2700 SHA256 b1788432f8dcef43a0c58f045997a26d22171e43b52fce440033e755d38ae3c1 SHA512 8e748877705bfd22ca22bc057fe6450de2b16a746169b5fb609026cb307cb1260af7d1f8e71b21ef0b8face749da18ef3e02201d421db00527ac2d98b06af8f2 WHIRLPOOL 89242a95299638bfa74dc0c336dcef61b57547109058619479a19b5f56a8ed3baacbb9c0c60c8b1c54c86952e4df286c0dfa010e6d3c08a3d81bd949488beeca
-EBUILD balsa-2.4.8.ebuild 2777 SHA256 af693d219a02490a5e345560295011453f178b6bc5162b9c420eec3eef8e5c8b SHA512 82d701eb6d5cf7ab44ce787168a6185320af5677700d781da3ec465f3e7e550a5b677f708272c14514d468a9eceb866e65ae9e2af96c3d4c1511cc5e5f0e96e8 WHIRLPOOL 6bf5b557e4eb1b4cb21eb92d39b31709171f16c361bad9b9eb7547e56c62fa6523ab4830978f91d52beaf3814e9f930a4a0e42c584b4342e5970cfb887cbca79
-MISC ChangeLog 26087 SHA256 140654b2dd17a848cc06ee21c752f3e2a83c16db2b4ad92de94ddcda19979b03 SHA512 d218978c2831c8c945faeccd9b9b81190ed1936f2a8359a62eb70166bed347cc81dec6a382bbac819188ca7b8a7382ef4e68a7272f44b68991c205e4cabb9534 WHIRLPOOL b3694670a0ff5b929c25e7728756d5435f978bd66b8142a15a869648e2ddee8280a70193222d6fa66138fbd2c50fae95dc91482c686fd1bdf7bc730d09cb4c11
+EBUILD balsa-2.4.13.ebuild 2654 SHA256 e078a7b91cdc6995d714843c904729423460f6dcfdf5cca6f056f7a3b195b409 SHA512 922c0a4abe7754bd672d61974b6616c5ada985723f4daee293e6cf26dd6872bc3d0621ed4d2a439e7be4aca9997eb560d6bc3fb7dc95a7bfd07c3847131a41c3 WHIRLPOOL 2dea4f67120e85c2a4da2f3c3f669d592be44459aa42db3c655fe0d75d613cd74205ad57710a913e519d17501bc008b1e022aee7ab0d7e59bfb8f28b88353d45
+MISC ChangeLog 26295 SHA256 ccb73c6c5cff1b42c83ffc42668a8a41b1f565c44e4ef97ba46f3bcc1f02e35f SHA512 365b3097e657e2e825acbe2358e183ee6ecb5b85ea2ac010b2f1aa3b565d24830ad5ff2b8dcc9d107be6d5eb632a771fb84a6d9ea3205b2e18e9eb648b2563c0 WHIRLPOOL 7cf8914ec62cedb81e1c1ead3aa0b72f521855c26e1f1d2b8cc0c15dfb13295d7a237a1866952a53d36c83d45e4dfb3b5ec0c85f6f75c0d09b74d6c7f484a969
 MISC metadata.xml 395 SHA256 fa52883e7722ffb442de48690c2acf846538b353f1d69f352b6b3b414c9ab4ce SHA512 d610e2536bf8bb224bf79d8d402dad6e0c8b30480df8ea3998b22068f37f6d2cc78bf72d0a77e9acc3087de8a12e9bc27688b36c1153f7904fef7ea7d6cc150c WHIRLPOOL 8346612c8fe79d663366fd6e6953d5df80442d9598c2b13f725bc83d642d871f1b6905dce8982377271a145132fd42b70c47cebabce3cd7f1176b38b9458cd3b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlCNVaYACgkQuQc30/atMkDcJQCfasZ6kXmTu5CBOZO5d2rRNJhI
-ViAAoIPS+q69kVcpygoEiAB7q9j6fjZA
-=15i2
+iEYEAREIAAYFAlDYw+cACgkQCaWpQKGI+9Q+9QCeKTYJscXss/YX25udYA+z0MO9
+uUsAn2GrUMGpgrLrsovfalFItSx+MsTJ
+=PigE
 -----END PGP SIGNATURE-----
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->