summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAkinori Hattori <hattya@gentoo.org>2010-04-11 08:32:23 +0000
committerAkinori Hattori <hattya@gentoo.org>2010-04-11 08:32:23 +0000
commit130cb3bfa1f1746cd8882877ed01e4c125098f0b (patch)
tree35dc0b618d65a72a0ea1a79ba0745a2532a3dc5f
parentcleaned out old ebuild(s). (diff)
downloadgentoo-2-130cb3bfa1f1746cd8882877ed01e4c125098f0b.tar.gz
gentoo-2-130cb3bfa1f1746cd8882877ed01e4c125098f0b.tar.bz2
gentoo-2-130cb3bfa1f1746cd8882877ed01e4c125098f0b.zip
cleaned out old ebuild(s).
(Portage version: 2.1.7.17/cvs/Linux i686)
-rw-r--r--mail-client/sylpheed/ChangeLog7
-rw-r--r--mail-client/sylpheed/files/sylpheed-2.2-replace-aspell-with-enchant.diff102
-rw-r--r--mail-client/sylpheed/sylpheed-2.4.8.ebuild77
3 files changed, 6 insertions, 180 deletions
diff --git a/mail-client/sylpheed/ChangeLog b/mail-client/sylpheed/ChangeLog
index 30ad6cca9d5c..ad7b9f731338 100644
--- a/mail-client/sylpheed/ChangeLog
+++ b/mail-client/sylpheed/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for mail-client/sylpheed
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/sylpheed/ChangeLog,v 1.282 2010/03/13 16:03:24 hattya Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/sylpheed/ChangeLog,v 1.283 2010/04/11 08:32:23 hattya Exp $
+
+ 11 Apr 2010; Akinori Hattori <hattya@gentoo.org>
+ -files/sylpheed-2.2-replace-aspell-with-enchant.diff,
+ -sylpheed-2.4.8.ebuild:
+ cleaned out old ebuild(s).
13 Mar 2010; Akinori Hattori <hattya@gentoo.org> -sylpheed-2.7.0.ebuild,
sylpheed-2.7.1.ebuild:
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
deleted file mode 100644
index 16ddb979a38b..000000000000
--- a/mail-client/sylpheed/files/sylpheed-2.2-replace-aspell-with-enchant.diff
+++ /dev/null
@@ -1,102 +0,0 @@
-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.4.8.ebuild b/mail-client/sylpheed/sylpheed-2.4.8.ebuild
deleted file mode 100644
index 587eb0692286..000000000000
--- a/mail-client/sylpheed/sylpheed-2.4.8.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/sylpheed/sylpheed-2.4.8.ebuild,v 1.12 2009/07/04 09:55:05 hattya Exp $
-
-inherit autotools eutils
-
-IUSE="crypt ipv6 ldap nls pda spell ssl xface"
-
-DESCRIPTION="A lightweight email client and newsreader"
-HOMEPAGE="http://sylpheed.sraoss.jp/"
-SRC_URI="http://sylpheed.sraoss.jp/${PN}/v${PV%.*}/${P}.tar.bz2"
-
-LICENSE="GPL-2 LGPL-2.1"
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86"
-SLOT="0"
-
-COMMON_DEPEND=">=x11-libs/gtk+-2.4
- 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 )"
-DEPEND="${COMMON_DEPEND}
- dev-util/pkgconfig
- xface? ( >=media-libs/compface-1.4 )"
-RDEPEND="${COMMON_DEPEND}
- app-misc/mime-types
- x11-misc/shared-mime-info"
-
-AT_M4DIR="ac"
-
-src_unpack() {
-
- unpack ${A}
- cd "${S}"
-
- epatch "${FILESDIR}"/${PN}-2.[124]-*.diff
-
- use crypt || cp ac/missing/gpgme.m4 ac
-
- # remove "-I m4" from aclocal arguments
- sed -i "/^ACLOCAL_AMFLAGS/d" Makefile.am
-
- eautoreconf
-
-}
-
-src_compile() {
-
- local htmldir=/usr/share/doc/${PF}/html
-
- econf \
- $(use_enable crypt gpgme) \
- $(use_enable ipv6) \
- $(use_enable ldap) \
- $(use_enable nls) \
- $(use_enable pda jpilot) \
- $(use_enable spell gtkspell) \
- $(use_enable ssl) \
- $(use_enable xface compface) \
- --with-manualdir=${htmldir}/manual \
- --with-faqdir=${htmldir}/faq \
- || die
- emake || die
-
-}
-
-src_install() {
-
- emake DESTDIR="${D}" install || die
-
- dodoc AUTHORS ChangeLog* NEWS* README* TODO*
- doicon *.png
- domenu *.desktop
-
-}