Version bump, drop support for gtkhtml slot that is unmaintained for ages and will be removed soon, drop old.

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

4 files changed, 118 insertions, 125 deletions

diff --git a/mail-client/balsa/ChangeLog b/mail-client/balsa/ChangeLog
index d64ba671363c..f82c871d05da 100644
--- a/mail-client/balsa/ChangeLog
+++ b/mail-client/balsa/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for mail-client/balsa
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/balsa/ChangeLog,v 1.126 2013/04/01 18:24:59 ago Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/mail-client/balsa/ChangeLog,v 1.127 2014/06/22 15:42:14 pacho Exp $
+
+*balsa-2.4.14 (22 Jun 2014)
+
+  22 Jun 2014; Pacho Ramos <pacho@gentoo.org> +balsa-2.4.14.ebuild,
+  -balsa-2.4.12.ebuild:
+  Version bump, drop support for gtkhtml slot that is unmaintained for ages and
+  will be removed soon, drop old.
 
   01 Apr 2013; Agostino Sarubbo <ago@gentoo.org> balsa-2.4.13.ebuild:
   Stable for sparc, wrt bug #458984
diff --git a/mail-client/balsa/Manifest b/mail-client/balsa/Manifest
index d6b5802f8673..35bdaddc68e1 100644
--- a/mail-client/balsa/Manifest
+++ b/mail-client/balsa/Manifest
@@ -2,26 +2,16 @@
 Hash: SHA256
 
 AUX balsa-2.4.11-doc-fixes.patch 11963 SHA256 4c909aa8ab1ea3577378fc8251e5094ecd61dd2aa7cfcf20c012966659481f22 SHA512 303ddec33c167703ca87a8af2939cded15f1e8d9aed22ecd30446edd94b7d5a8d1058c81afc34aedfe1656d7a49e9a86961d444025070b8b76d9ec7def8a68ac WHIRLPOOL d4e0b8a43eb2013d5f66c1feaaa18d955a9e341605511a0182f9f804b55858994cd00cef8c5382d918c42447c7088d8c3f8b0389e030ac71c424c153d4911917
-DIST balsa-2.4.12.tar.bz2 4104426 SHA256 3f72fc69bb7fecb59e64c4cb88dc5083ed58dc76c9345b22d6c15af2c6b1e3c4 SHA512 eec2faae6c0d942ccc0a3a1c66cc3a1eaf57695c86b3baedd18e528b06133518ff6cd6110ac67e5b50f2fed298b442b05964b8bb9a524ff6aab0f11e61a407ef WHIRLPOOL 5d8fdb70a8d366a0fa65af51a3a888ae005ab1e53ac802ea03ab47e3c51381126bd0dab3aa43e1e2d0c92906bc0df86f90e3664c667fbfad56ced2d03cd4a37c
 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
+DIST balsa-2.4.14.tar.bz2 4092848 SHA256 9de197c3adf2cfa1ddf8c3b6da11e5b06f58b27a917e064de34621d5f9210522 SHA512 e33b8a59b70861827f063a4336d2055169d719707e774d50443e6dc6884d99c23a36c42e1acfd99485bfe864e710dd0f635adc76697a911339cf8b6870a64c3d WHIRLPOOL 43e0ad0356fb5e4f1840daa33bce40ae1dc89c0864cf04ab7b50e604d0589014e28199e2b694fcb48d1c7cc54e1bac6bc912aa93033a24852d9c68a20555d8ab
 EBUILD balsa-2.4.13.ebuild 2647 SHA256 f0307beda11600df1acaee1c076ab98c957d3b05c8da2b6e176b69a9a618613b SHA512 6d74338c22fb222c6247a25a1791ff9e482422e54d935fc355088ebffcde6c844c0da1c198594b2d6691e21cbc72d246108f456df20a92027f0439cfec75df17 WHIRLPOOL 52e3c09475716938fd29ec7ea5f7c727794ac3bb1bf1720ed15c5c915a2048b7f5b379b1d164cf4a5301a84dcebdbca26650e4c45f2c7ef7daf0d3e53b426601
-MISC ChangeLog 26824 SHA256 2469facd83a43d9bff515c0cee0b9b546e64abc8c9b54c45a517208c4cade06b SHA512 bcfbd607cd4bff54c2da93711de7ae31ad85151b047bc8340575ce5c25143d88aba2f793d077059d372303f9eea459de0bc12e920aa604d6451acf1d2c685010 WHIRLPOOL 0062868c7be7dd985b24e75a6d65cfaa2b8d137043d9c69c791aca7b1a8887034afad07b420aeab592484905888018ce40c9dd02d206d4ad0a45e97038fb6ed8
+EBUILD balsa-2.4.14.ebuild 2535 SHA256 053f4b94c25291c3ddeeb58a39fa0be086e2e303f6bdc5614a37688036bba20b SHA512 b61a079897b6615816dbcec04cbf6133d046bea80068b30f95c36c817b4a41468c1921d895d8890522cf64e9d876f04fe8dde6be3c5842f7b5fa204a575a725b WHIRLPOOL ddbadb13f14abbf87ab0438e1adb6cd24f632b31cedea91611aa4ea6f185dce6e671cf0efd7d9b69ea8190e715a6cd579145fbb4714c6da1602efb3a9e1e0283
+MISC ChangeLog 27062 SHA256 d6ab0fb7c90579f6d691c94af70d9fbbae6094198dc738eb687f1c4fe51331eb SHA512 2f9fe52b6f2a98d56b96b3ad1cb1a1c914c788eda0cb0ce02c97215591da449bd63d64f1308e93ed37a2d401dd306b4079b19e16f02402caacba54386a8cc496 WHIRLPOOL ac7881a4cf1b4accf064442bc3052ee4e738273c0f5577e181c87fcdbe53daed426dc500cfe9e1d7a982ae24512f6215d2c65b91a79e0e91a68fe990a3085e39
 MISC metadata.xml 395 SHA256 fa52883e7722ffb442de48690c2acf846538b353f1d69f352b6b3b414c9ab4ce SHA512 d610e2536bf8bb224bf79d8d402dad6e0c8b30480df8ea3998b22068f37f6d2cc78bf72d0a77e9acc3087de8a12e9bc27688b36c1153f7904fef7ea7d6cc150c WHIRLPOOL 8346612c8fe79d663366fd6e6953d5df80442d9598c2b13f725bc83d642d871f1b6905dce8982377271a145132fd42b70c47cebabce3cd7f1176b38b9458cd3b
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJRWdD/AAoJELp701BxlEWf1mgP/0VPeB1CyE7QPqKyHySn+F1n
-dcd6PbuxlwdQDf0UGjJ62OZ8azODXZX33vA1N4nG0+5LLucFA3i8VGKrxXetzMsH
-V8csoIg5pdJ+Q9xQwhe27ZZVVf98HoCYw1jpGQaS8BR7CQkP5WHXiiW7GB+sZWMv
-t7CR5HrKCmeU2OZ2F3jLXSSVIXs8YeO5OdYImUO4PiipQkSLE28Kc4UM2jm/iGmo
-b1tOawIXzx0BbDcceuLjJYAgb/naYYVwJ3jryzzvCETqHXcH4X2isSBfNe3nnigf
-GpC3U35JlCxl1fboOr3LaWapWQvYGD5EzPNJuh43Ab/NBK8HjmTJ706Djd1j2bTV
-B3qYWt1/veFbNXoxg1rRmybSuh6LNuX3wP164Ulrzhr+9ixn0lNYog7e2b/SXySn
-fquedts2J4ER79vwQ3NOcjRTrse/aa4Od5ZcIZbPdYvRPhbBa83YRg/L3QEZ93L9
-VjeMslSwZRhZsL8LZ7yOxB9V4Fj29ZQI5w/XAr1lDomXeNhWfU5m2OUqI/nIP4TS
-MMKb08eH2zDFUW4C4HOSSXxK/aiRV+d45umvF/hRj1gzHYeMyc12yrxlaxuVfMmZ
-/9KgBrVft1f/vKkkCHTajzQPcz2pP5wGm35jrRFejvAcKjObNFiOoWS66g8K+HFJ
-sO7MQAvSX5gMkI2RpbXa
-=AOcn
+iEYEAREIAAYFAlOm+VcACgkQCaWpQKGI+9T3xgCdEhUoLsHYpAmK3HpmOr1WQhJr
+yWAAnjyp+jbBkgaKCxyGKGP3kq9q3qLT
+=Ik/j
 -----END PGP SIGNATURE-----
diff --git a/mail-client/balsa/balsa-2.4.12.ebuild b/mail-client/balsa/balsa-2.4.12.ebuild
deleted file mode 100644
index 6fa9accee3cd..000000000000
--- a/mail-client/balsa/balsa-2.4.12.ebuild
+++ /dev/null
@@ -1,106 +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.12.ebuild,v 1.5 2012/10/28 15:56:20 armin76 Exp $
-
-EAPI="4"
-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.6
-	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-0.7 )
-	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.5.1: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"
-
-REQUIRED_USE="gtkhtml? ( !webkit )"
-
-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
-		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.6
-		--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() {
-	# Fix documentation
-	epatch "${FILESDIR}/${PN}-2.4.11-doc-fixes.patch"
-
-	gnome2_src_prepare
-}
diff --git a/mail-client/balsa/balsa-2.4.14.ebuild b/mail-client/balsa/balsa-2.4.14.ebuild
new file mode 100644
index 000000000000..46ca2552045f
--- /dev/null
+++ b/mail-client/balsa/balsa-2.4.14.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mail-client/balsa/balsa-2.4.14.ebuild,v 1.1 2014/06/22 15:42:14 pacho Exp $
+
+EAPI="5"
+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 +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.6
+	dev-libs/libunique:1
+	>=net-libs/libesmtp-1.0.3:=
+	net-mail/mailbase
+	media-libs/libcanberra:=[gtk]
+	x11-themes/hicolor-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 )
+	sqlite? ( >=dev-db/sqlite-2.8:= )
+	libnotify? ( >=x11-libs/libnotify-0.7:= )
+	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.5.1: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
+"
+
+src_prepare() {
+	# Fix documentation
+	epatch "${FILESDIR}/${PN}-2.4.11-doc-fixes.patch"
+	gnome2_src_prepare
+}
+
+src_configure() {
+	local myconf
+	DOCS="AUTHORS ChangeLog HACKING NEWS README TODO docs/*"
+
+	if use crypt ; then
+		myconf+=" --with-gpgme=gpgme-config"
+	else
+		myconf+=" --without-gpgme"
+	fi
+
+	if use webkit; then
+		myconf+=" --with-html-widget=webkit"
+	else
+		myconf+=" --with-html-widget=no"
+	fi
+
+	gnome2_src_configure \
+		--disable-pcre \
+		--enable-gregex \
+		--enable-threads \
+		--with-gmime=2.6 \
+		--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) \
+		${myconf}
+}