diff options
| -rw-r--r-- | mail-client/balsa/ChangeLog | 10 | ||||
| -rw-r--r-- | mail-client/balsa/balsa-2.4.7.ebuild | 6 | ||||
| -rw-r--r-- | mail-client/balsa/balsa-2.4.8.ebuild (renamed from mail-client/balsa/balsa-2.4.1-r1.ebuild) | 62 | ||||
| -rw-r--r-- | mail-client/balsa/files/balsa-2.4.1-vcard.patch | 16 |
4 files changed, 46 insertions, 48 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/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)); - |