new upstream release. fixes bug #122779 and bug #123145.

(Portage version: 2.0.54)

6 files changed, 125 insertions, 16 deletions

diff --git a/mail-client/sylpheed/ChangeLog b/mail-client/sylpheed/ChangeLog
index 0adc036e3fe4..351c1b5b0c40 100644
--- a/mail-client/sylpheed/ChangeLog
+++ b/mail-client/sylpheed/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for mail-client/sylpheed
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/sylpheed/ChangeLog,v 1.165 2006/02/07 09:47:51 hattya Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/sylpheed/ChangeLog,v 1.166 2006/02/18 14:41:25 hattya Exp $
+
+*sylpheed-2.2.0 (18 Feb 2006)
+
+  18 Feb 2006; Akinori Hattori <hattya@gentoo.org>
+  +files/sylpheed-2.2-replace-aspell-with-enchant.diff,
+  -sylpheed-2.2.0_beta8.ebuild, +sylpheed-2.2.0.ebuild:
+  new upstream release. fixes bug #122779 and bug #123145.
 
 *sylpheed-2.2.0_beta8 (07 Feb 2006)
 
diff --git a/mail-client/sylpheed/Manifest b/mail-client/sylpheed/Manifest
index 46a0d00b9c5c..b4776d7bc3d8 100644
--- a/mail-client/sylpheed/Manifest
+++ b/mail-client/sylpheed/Manifest
@@ -1,9 +1,10 @@
 MD5 082b8e620aa40e96744a3fa6e5aeed9d ChangeLog 30539
 MD5 4d08519a369aeb7229167e0d1d7e75a8 files/digest-sylpheed-2.0.4 68
-MD5 e5a7ae59de90e79c2647faf446cb560a files/digest-sylpheed-2.2.0_beta8 73
+MD5 6b71dbeb45c82f1bb30f96347c10921f files/digest-sylpheed-2.2.0 68
 MD5 01498a2c484618f1d4c663eac986c55e files/sylpheed-2.1-shared-mime-info.diff 1637
+MD5 0f4074345f62ede519f0b65730e4b762 files/sylpheed-2.2-replace-aspell-with-enchant.diff 3197
 MD5 4cbec71671b7349c904f860a12fee5d9 files/sylpheed-namespace.diff 550
 MD5 f4242298cfab21456442bfe52505d2b8 files/sylpheed-procmime.diff 1119
 MD5 126ca8f672f0296d2f1e6830e6729a91 metadata.xml 231
 MD5 38118ad46ff05a99e88f44780bf8ff9c sylpheed-2.0.4.ebuild 1445
-MD5 7cba2b69d883c28b38f00eabea474c0d sylpheed-2.2.0_beta8.ebuild 1484
+MD5 01374cdf075cfbe663368f0c71ba1fed sylpheed-2.2.0.ebuild 1369
diff --git a/mail-client/sylpheed/files/digest-sylpheed-2.2.0 b/mail-client/sylpheed/files/digest-sylpheed-2.2.0
new file mode 100644
index 000000000000..39400a210767
--- /dev/null
+++ b/mail-client/sylpheed/files/digest-sylpheed-2.2.0
@@ -0,0 +1 @@
+MD5 da23e5c6ef869c4fe847ea9207f40ddf sylpheed-2.2.0.tar.bz2 2492789
diff --git a/mail-client/sylpheed/files/digest-sylpheed-2.2.0_beta8 b/mail-client/sylpheed/files/digest-sylpheed-2.2.0_beta8
deleted file mode 100644
index 1aed47487744..000000000000
--- a/mail-client/sylpheed/files/digest-sylpheed-2.2.0_beta8
+++ /dev/null
@@ -1 +0,0 @@
-MD5 2f7f3d5a7aa2b0344683388b4b518602 sylpheed-2.2.0beta8.tar.bz2 2500520
diff --git a/mail-client/sylpheed/files/sylpheed-2.2-replace-aspell-with-enchant.diff b/mail-client/sylpheed/files/sylpheed-2.2-replace-aspell-with-enchant.diff
new file mode 100644
index 000000000000..16ddb979a38b
--- /dev/null
+++ b/mail-client/sylpheed/files/sylpheed-2.2-replace-aspell-with-enchant.diff
@@ -0,0 +1,102 @@
+diff -ur sylpheed-2.2.0.orig/src/compose.c sylpheed-2.2.0/src/compose.c
+--- sylpheed-2.2.0.orig/src/compose.c	2006-02-07 11:53:05.000000000 +0900
++++ sylpheed-2.2.0/src/compose.c	2006-02-15 23:40:01.000000000 +0900
+@@ -64,7 +64,7 @@
+ #if USE_GTKSPELL
+ #  include <gtk/gtkradiomenuitem.h>
+ #  include <gtkspell/gtkspell.h>
+-#  include <aspell.h>
++#  include <enchant/enchant.h>
+ #endif
+ 
+ #include <stdio.h>
+@@ -459,6 +459,9 @@
+ 					 GtkWidget	*widget);
+ static void compose_set_spell_lang_cb	(GtkWidget	*widget,
+ 					 gpointer	 data);
++static void compose_list_dicts_cb	(const char *lang_tag,
++					const char *provider_name, const char *provider_desc,
++					const char *provider_file, void *user_data);
+ #endif
+ 
+ static void compose_attach_drag_received_cb (GtkWidget		*widget,
+@@ -4874,33 +4877,34 @@
+ }
+ 
+ #if USE_GTKSPELL
++static void compose_list_dicts_cb(const char *lang_tag,
++				const char *provider_name, const char *provider_desc,
++				const char *provider_file, void *user_data)
++{
++	GQueue *queue = (GQueue *)user_data;
++
++	if (g_queue_index(queue, (gconstpointer)lang_tag) == -1) {
++		g_queue_push_tail(queue, g_strdup(lang_tag));
++	}
++}
++
+ static void compose_set_spell_lang_menu(Compose *compose)
+ {
+-	AspellConfig *config;
+-	AspellDictInfoList *dlist;
+-	AspellDictInfoEnumeration *dels;
+-	const AspellDictInfo *entry;
++	EnchantBroker *broker;
++	GQueue *langs;
+ 	GSList *dict_list = NULL, *menu_list = NULL, *cur;
+ 	GtkWidget *menu;
+ 	gboolean lang_set = FALSE;
+ 
+-	config = new_aspell_config();
+-	dlist = get_aspell_dict_info_list(config);
+-	delete_aspell_config(config);
+-
+-	dels = aspell_dict_info_list_elements(dlist);
+-	while ((entry = aspell_dict_info_enumeration_next(dels)) != 0) {
+-		dict_list = g_slist_append(dict_list, (gchar *)entry->name);
+-		if (compose->spell_lang != NULL &&
+-		    g_ascii_strcasecmp(compose->spell_lang, entry->name) == 0)
+-			lang_set = TRUE;
+-	}
+-	delete_aspell_dict_info_enumeration(dels);
++	broker = enchant_broker_init();
++	langs = g_queue_new();
++	enchant_broker_list_dicts(broker, compose_list_dicts_cb, langs);
++	enchant_broker_free(broker);
+ 
+ 	menu = gtk_menu_new();
+ 
+-	for (cur = dict_list; cur != NULL; cur = cur->next) {
+-		gchar *dict = (gchar *)cur->data;
++	while (g_queue_get_length(langs) > 0) {
++		gchar *dict = g_queue_pop_head(langs);
+ 		GtkWidget *item;
+ 
+ 		if (dict == NULL) continue;
+@@ -4910,13 +4914,16 @@
+ 			(GTK_RADIO_MENU_ITEM(item));
+ 		if (compose->spell_lang != NULL &&
+ 		    g_ascii_strcasecmp(compose->spell_lang, dict) == 0)
++		{
+ 			gtk_check_menu_item_set_active
+ 				(GTK_CHECK_MENU_ITEM(item), TRUE);
++			lang_set = TRUE;
++		}
+ 		gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);
+ 		g_signal_connect(G_OBJECT(item), "activate",
+ 				 G_CALLBACK(compose_set_spell_lang_cb),
+ 				 compose);     
+-		g_object_set_data(G_OBJECT(item), "spell-lang", dict);
++		g_object_set_data_full(G_OBJECT(item), "spell-lang", dict, g_free);
+ 		gtk_widget_show(item);
+ 
+ 		if (!lang_set && g_ascii_strcasecmp("en", dict) == 0)
+@@ -4924,6 +4931,8 @@
+ 				(GTK_CHECK_MENU_ITEM(item), TRUE);
+ 	}
+ 
++	g_queue_free(langs);
++
+ 	gtk_widget_show(menu);
+ 	gtk_menu_item_set_submenu(GTK_MENU_ITEM(compose->spell_menu), menu);
+ }
diff --git a/mail-client/sylpheed/sylpheed-2.2.0_beta8.ebuild b/mail-client/sylpheed/sylpheed-2.2.0.ebuild
index a2c0521c880e..cfd34d5c4885 100644
--- a/mail-client/sylpheed/sylpheed-2.2.0_beta8.ebuild
+++ b/mail-client/sylpheed/sylpheed-2.2.0.ebuild
@@ -1,29 +1,27 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/sylpheed/sylpheed-2.2.0_beta8.ebuild,v 1.1 2006/02/07 09:47:51 hattya Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/sylpheed/sylpheed-2.2.0.ebuild,v 1.1 2006/02/18 14:41:25 hattya Exp $
 
 inherit eutils
 
-IUSE="crypt gnome ipv6 ldap nls pda ssl xface"
-
-MY_P=${P/_/}
+IUSE="crypt gnome ipv6 ldap nls pda spell ssl xface"
 
 DESCRIPTION="A lightweight email client and newsreader"
 HOMEPAGE="http://sylpheed.good-day.net/"
-SRC_URI="http://sylpheed.good-day.net/${PN}/v${PV%.*}beta/${MY_P}.tar.bz2"
+SRC_URI="http://sylpheed.good-day.net/${PN}/v${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 SLOT="0"
-S="${WORKDIR}/${MY_P}"
 
 PROVIDE="virtual/sylpheed"
 
 DEPEND=">=x11-libs/gtk+-2.4
-	!amd64? ( nls? ( >=sys-devel/gettext-0.12.1 ) )
+	nls? ( >=sys-devel/gettext-0.12.1 )
 	crypt? ( >=app-crypt/gpgme-0.4.5 )
 	ldap? ( >=net-nds/openldap-2.0.11 )
 	pda? ( app-pda/jpilot )
+	spell? ( app-text/gtkspell )
 	ssl? ( dev-libs/openssl )
 	xface? ( >=media-libs/compface-1.4 )"
 RDEPEND="${DEPEND}
@@ -35,7 +33,7 @@ src_unpack() {
 	unpack ${A}
 
 	cd ${S}
-	epatch ${FILESDIR}/${PN}-2.1-shared-mime-info.diff
+	epatch ${FILESDIR}/${PN}-2.*.diff
 	automake
 
 }
@@ -43,12 +41,13 @@ src_unpack() {
 src_compile() {
 
 	econf \
-		`use_enable nls` \
-		`use_enable ssl` \
 		`use_enable crypt gpgme` \
-		`use_enable pda jpilot` \
-		`use_enable ldap` \
 		`use_enable ipv6` \
+		`use_enable ldap` \
+		`use_enable nls` \
+		`use_enable pda jpilot` \
+		`use_enable spell gtkspell` \
+		`use_enable ssl` \
 		`use_enable xface compface` \
 		|| die