Version bump: 1.0.6. Removing obsolete ebuilds

Package-Manager: portage-2.0.51.22-r1

10 files changed, 917 insertions, 85 deletions

diff --git a/app-text/gnome-spell/ChangeLog b/app-text/gnome-spell/ChangeLog
index f1c577f14caa..6b08add22709 100644
--- a/app-text/gnome-spell/ChangeLog
+++ b/app-text/gnome-spell/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-text/gnome-spell
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/gnome-spell/ChangeLog,v 1.57 2005/06/09 09:09:07 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/gnome-spell/ChangeLog,v 1.58 2005/07/07 21:13:24 leonardop Exp $
+
+*gnome-spell-1.0.6 (07 Jul 2005)
+
+  07 Jul 2005; Leonardo Boshell <leonardop@gentoo.org>
+  gnome-spell-1.0.6.ebuild, files/gnome-spell-1.0.6-enchant.patch,
+  files/gnome-spell-1.0.6-combo.patch:
+  New release. Added 'static' USE flag. Ported patches to this version.
 
   09 Jun 2005; Markus Rothe <corsair@gentoo.org>
   gnome-spell-1.0.5-r2.ebuild:
diff --git a/app-text/gnome-spell/Manifest b/app-text/gnome-spell/Manifest
index 4184f4a976b3..c48ca2dc5dfe 100644
--- a/app-text/gnome-spell/Manifest
+++ b/app-text/gnome-spell/Manifest
@@ -1,12 +1,12 @@
-MD5 7de0f2d0a01961c4fec4cf027c934b9a ChangeLog 7313
+MD5 02ede1fcad7028a0c0e4854e792f474b ChangeLog 7583
 MD5 6e7d79a7385f1722c083fcfb4fe61660 gnome-spell-0.5.ebuild 1082
-MD5 7bef892c83fbc8c8c6544f6850ba370e gnome-spell-1.0.5-r1.ebuild 938
+MD5 589b090e3f7b54f2a6dc34d9089b4bb8 gnome-spell-1.0.6.ebuild 1276
 MD5 c4c9a0a1cb931a6c1ca3bf7fc93a2e51 gnome-spell-1.0.5-r2.ebuild 1021
-MD5 d480101b0586b8bc13725ba964e83a39 gnome-spell-1.0.5.ebuild 1044
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 MD5 c9d55e535778f7a2386f5bba1c2cfcf7 files/digest-gnome-spell-0.5 68
-MD5 959c92eeb724ca5380e81f09805df109 files/digest-gnome-spell-1.0.5 70
-MD5 959c92eeb724ca5380e81f09805df109 files/digest-gnome-spell-1.0.5-r1 70
+MD5 60b79a4908f65bef8d5bc1765fb61c4a files/digest-gnome-spell-1.0.6 70
 MD5 959c92eeb724ca5380e81f09805df109 files/digest-gnome-spell-1.0.5-r2 70
 MD5 a2f04eb1ad051e0c06e703901869afca files/gnome-spell-1.0.5-enchant.patch 18757
 MD5 b0296719b38481284f42227002eeb1a4 files/gnome-spell-1.0.5-gtk24.patch 13886
+MD5 62828aa3cfc3de6aaa8604520ee943d8 files/gnome-spell-1.0.6-enchant.patch 16509
+MD5 312bf5d650d4960f7f2077f477892dc7 files/gnome-spell-1.0.6-combo.patch 12895
diff --git a/app-text/gnome-spell/files/digest-gnome-spell-1.0.5 b/app-text/gnome-spell/files/digest-gnome-spell-1.0.5
deleted file mode 100644
index 6c195de55995..000000000000
--- a/app-text/gnome-spell/files/digest-gnome-spell-1.0.5
+++ /dev/null
@@ -1 +0,0 @@
-MD5 ba4dd33cb150b670756e456066bd7434 gnome-spell-1.0.5.tar.bz2 216628
diff --git a/app-text/gnome-spell/files/digest-gnome-spell-1.0.5-r1 b/app-text/gnome-spell/files/digest-gnome-spell-1.0.5-r1
deleted file mode 100644
index 6c195de55995..000000000000
--- a/app-text/gnome-spell/files/digest-gnome-spell-1.0.5-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 ba4dd33cb150b670756e456066bd7434 gnome-spell-1.0.5.tar.bz2 216628
diff --git a/app-text/gnome-spell/files/digest-gnome-spell-1.0.6 b/app-text/gnome-spell/files/digest-gnome-spell-1.0.6
new file mode 100644
index 000000000000..16fb717df6a9
--- /dev/null
+++ b/app-text/gnome-spell/files/digest-gnome-spell-1.0.6
@@ -0,0 +1 @@
+MD5 a32e5f98c3f3a9964d698be26f371b90 gnome-spell-1.0.6.tar.bz2 315357
diff --git a/app-text/gnome-spell/files/gnome-spell-1.0.6-combo.patch b/app-text/gnome-spell/files/gnome-spell-1.0.6-combo.patch
new file mode 100644
index 000000000000..39da74d7e697
--- /dev/null
+++ b/app-text/gnome-spell/files/gnome-spell-1.0.6-combo.patch
@@ -0,0 +1,348 @@
+diff -NurdB gnome-spell-1.0.6/gnome-spell/control.c gnome-spell-1.0.6-patched/gnome-spell/control.c
+--- gnome-spell-1.0.6/gnome-spell/control.c	2005-01-24 13:06:09.000000000 -0500
++++ gnome-spell-1.0.6-patched/gnome-spell/control.c	2005-07-07 03:44:45.000000000 -0500
+@@ -23,18 +23,18 @@
+ #include <config.h>
+ #include <string.h>
+ #include <glib.h>
++#include <gtk/gtkcombobox.h>
+ #include <gtk/gtkliststore.h>
+ #include <gtk/gtkmain.h>
+ #include <gtk/gtktreeview.h>
+ #include <gtk/gtktreeselection.h>
+ #include <gtk/gtkcellrenderertext.h>
+-#include <gtk/gtkentry.h>
+ #include <gtk/gtklabel.h>
+ #include <gtk/gtkmenu.h>
+ #include <gtk/gtkmenuitem.h>
++#include <gtk/gtktable.h>
+ #include <gtk/gtkwindow.h>
+ #include <libgnome/gnome-i18n.h>
+-#include <libgnomeui/gnome-entry.h>
+ #include <glade/glade.h>
+ #include <bonobo/bonobo-control.h>
+ #include <bonobo/bonobo-property-bag-client.h>
+@@ -66,7 +66,6 @@
+ 	GtkWidget *button_back;
+ 
+ 	GtkWidget *combo_add;
+-	GtkWidget *entry_add;
+ 	GList *abbrevs;
+ 	GList *langs;
+ } SpellControlData;
+@@ -139,7 +138,7 @@
+ }
+ 
+ static void
+-set_entry_add (SpellControlData *cd)
++set_combo_add (SpellControlData *cd)
+ {
+ 	
+ 	CORBA_sequence_GNOME_Spell_Language *language_seq;
+@@ -152,12 +151,15 @@
+ 
+ 		abbrevs_langs_clear (cd);
+ 		for (i = 0, n = 1; i < language_seq->_length; i++) {
++			gchar *lang;
++
+ 			if (strstr (cd->language, language_seq->_buffer[i].abbreviation)) {
+-				cd->langs = g_list_append (cd->langs, g_strdup (_(language_seq->_buffer[i].name)));
++				lang = g_strdup (_(language_seq->_buffer[i].name));
++				cd->langs = g_list_append (cd->langs, lang);
++				gtk_combo_box_append_text (GTK_COMBO_BOX (cd->combo_add), lang);
+ 				cd->abbrevs = g_list_append (cd->abbrevs, g_strdup (language_seq->_buffer[i].abbreviation));
+ 			}
+ 		}
+-		gtk_combo_set_popdown_strings (GTK_COMBO (cd->combo_add), cd->langs);
+ 	}
+ 	CORBA_exception_free (&ev);
+ }
+@@ -165,15 +167,11 @@
+ static gchar *
+ get_abbrev (SpellControlData *cd)
+ {
+-	GList *l, *a;
+-	const gchar *text;
+-
+-	text = gtk_entry_get_text (GTK_ENTRY (cd->entry_add));
++	gint idx;
+ 
+-	if (text)
+-		for (l = cd->langs, a = cd->abbrevs; l && a; l = l->next, a = a->next)
+-			if (!strcmp (text, l->data))
+-				return (gchar *) a->data;
++	idx = gtk_combo_box_get_active (GTK_COMBO_BOX (cd->combo_add));
++	if (idx >= 0)
++		return g_list_nth_data (cd->abbrevs, idx);
+ 
+ 	return NULL;
+ }
+@@ -267,7 +265,7 @@
+ 	GNOME_Spell_Dictionary_setLanguage (cd->dict, cd->language, &ev);
+ 	CORBA_exception_free (&ev);
+ 
+-	set_entry_add (cd);
++	set_combo_add (cd);
+ }
+ 
+ static void
+@@ -343,8 +341,9 @@
+ 	cd->button_ignore  = glade_xml_get_widget (xml, "button_ignore");
+ 	cd->button_skip    = glade_xml_get_widget (xml, "button_skip");
+ 	cd->button_back    = glade_xml_get_widget (xml, "button_back");
+-	cd->combo_add      = glade_xml_get_widget (xml, "combo_add");
+-	cd->entry_add      = glade_xml_get_widget (xml, "entry_add");
++	cd->combo_add      = gtk_combo_box_new_text ();
++	gtk_widget_show (cd->combo_add);
++	gtk_table_attach_defaults (GTK_TABLE (table), cd->combo_add, 0, 1, 3, 4);
+ 
+ 	g_signal_connect (cd->button_replace, "clicked", G_CALLBACK (clicked_replace), cd);
+ 	g_signal_connect (cd->button_add, "clicked", G_CALLBACK (clicked_add), cd);
+diff -NurdB gnome-spell-1.0.6/gnome-spell/spell-checker.glade gnome-spell-1.0.6-patched/gnome-spell/spell-checker.glade
+--- gnome-spell-1.0.6/gnome-spell/spell-checker.glade	2005-01-24 13:06:09.000000000 -0500
++++ gnome-spell-1.0.6-patched/gnome-spell/spell-checker.glade	2005-07-07 03:44:45.000000000 -0500
+@@ -2,6 +2,7 @@
+ <!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd">
+ 
+ <glade-interface>
++<requires lib="gnome"/>
+ 
+ <widget class="GtkDialog" id="Spell dialog">
+   <property name="visible">True</property>
+@@ -11,6 +12,11 @@
+   <property name="modal">False</property>
+   <property name="resizable">True</property>
+   <property name="destroy_with_parent">False</property>
++  <property name="decorated">True</property>
++  <property name="skip_taskbar_hint">False</property>
++  <property name="skip_pager_hint">False</property>
++  <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property>
++  <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
+   <property name="has_separator">True</property>
+ 
+   <child internal-child="vbox">
+@@ -32,6 +38,7 @@
+ 	      <property name="label" translatable="yes">Replace</property>
+ 	      <property name="use_underline">True</property>
+ 	      <property name="relief">GTK_RELIEF_NORMAL</property>
++	      <property name="focus_on_click">True</property>
+ 	      <property name="response_id">0</property>
+ 	    </widget>
+ 	  </child>
+@@ -44,6 +51,7 @@
+ 	      <property name="label" translatable="yes">Remember</property>
+ 	      <property name="use_underline">True</property>
+ 	      <property name="relief">GTK_RELIEF_NORMAL</property>
++	      <property name="focus_on_click">True</property>
+ 	      <property name="response_id">0</property>
+ 	    </widget>
+ 	  </child>
+@@ -56,6 +64,7 @@
+ 	      <property name="label" translatable="yes">Ignore</property>
+ 	      <property name="use_underline">True</property>
+ 	      <property name="relief">GTK_RELIEF_NORMAL</property>
++	      <property name="focus_on_click">True</property>
+ 	      <property name="response_id">0</property>
+ 	    </widget>
+ 	  </child>
+@@ -68,6 +77,7 @@
+ 	      <property name="label">gtk-go-forward</property>
+ 	      <property name="use_stock">True</property>
+ 	      <property name="relief">GTK_RELIEF_NORMAL</property>
++	      <property name="focus_on_click">True</property>
+ 	      <property name="response_id">0</property>
+ 	    </widget>
+ 	  </child>
+@@ -80,6 +90,7 @@
+ 	      <property name="label">gtk-close</property>
+ 	      <property name="use_stock">True</property>
+ 	      <property name="relief">GTK_RELIEF_NORMAL</property>
++	      <property name="focus_on_click">True</property>
+ 	      <property name="response_id">0</property>
+ 	    </widget>
+ 	  </child>
+@@ -264,6 +275,7 @@
+ 			  <property name="label" translatable="yes">D_ictionaries</property>
+ 			  <property name="use_underline">True</property>
+ 			  <property name="relief">GTK_RELIEF_NORMAL</property>
++			  <property name="focus_on_click">True</property>
+ 			</widget>
+ 		      </child>
+ 
+@@ -274,6 +286,7 @@
+ 			  <property name="label" translatable="yes">_Describe</property>
+ 			  <property name="use_underline">True</property>
+ 			  <property name="relief">GTK_RELIEF_NORMAL</property>
++			  <property name="focus_on_click">True</property>
+ 			</widget>
+ 		      </child>
+ 
+@@ -284,6 +297,7 @@
+ 			  <property name="label" translatable="yes">Describe _all</property>
+ 			  <property name="use_underline">True</property>
+ 			  <property name="relief">GTK_RELIEF_NORMAL</property>
++			  <property name="focus_on_click">True</property>
+ 			</widget>
+ 		      </child>
+ 
+@@ -295,6 +309,7 @@
+ 			  <property name="label" translatable="yes">_Help</property>
+ 			  <property name="use_underline">True</property>
+ 			  <property name="relief">GTK_RELIEF_NORMAL</property>
++			  <property name="focus_on_click">True</property>
+ 			</widget>
+ 		      </child>
+ 		    </widget>
+@@ -362,6 +377,11 @@
+   <property name="modal">False</property>
+   <property name="resizable">True</property>
+   <property name="destroy_with_parent">False</property>
++  <property name="decorated">True</property>
++  <property name="skip_taskbar_hint">False</property>
++  <property name="skip_pager_hint">False</property>
++  <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property>
++  <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
+ 
+   <child>
+     <widget class="GtkTable" id="simple_control">
+@@ -471,6 +491,7 @@
+ 		  <property name="has_default">True</property>
+ 		  <property name="can_focus">True</property>
+ 		  <property name="relief">GTK_RELIEF_NORMAL</property>
++		  <property name="focus_on_click">True</property>
+ 
+ 		  <child>
+ 		    <widget class="GtkAlignment" id="alignment1">
+@@ -479,6 +500,10 @@
+ 		      <property name="yalign">0.5</property>
+ 		      <property name="xscale">0</property>
+ 		      <property name="yscale">0</property>
++		      <property name="top_padding">0</property>
++		      <property name="bottom_padding">0</property>
++		      <property name="left_padding">0</property>
++		      <property name="right_padding">0</property>
+ 
+ 		      <child>
+ 			<widget class="GtkHBox" id="hbox3">
+@@ -536,6 +561,7 @@
+ 		  <property name="can_default">True</property>
+ 		  <property name="can_focus">True</property>
+ 		  <property name="relief">GTK_RELIEF_NORMAL</property>
++		  <property name="focus_on_click">True</property>
+ 
+ 		  <child>
+ 		    <widget class="GtkAlignment" id="alignment3">
+@@ -544,6 +570,10 @@
+ 		      <property name="yalign">0.5</property>
+ 		      <property name="xscale">0</property>
+ 		      <property name="yscale">0</property>
++		      <property name="top_padding">0</property>
++		      <property name="bottom_padding">0</property>
++		      <property name="left_padding">0</property>
++		      <property name="right_padding">0</property>
+ 
+ 		      <child>
+ 			<widget class="GtkHBox" id="hbox5">
+@@ -601,6 +631,7 @@
+ 		  <property name="can_default">True</property>
+ 		  <property name="can_focus">True</property>
+ 		  <property name="relief">GTK_RELIEF_NORMAL</property>
++		  <property name="focus_on_click">True</property>
+ 
+ 		  <child>
+ 		    <widget class="GtkAlignment" id="alignment5">
+@@ -609,6 +640,10 @@
+ 		      <property name="yalign">0.5</property>
+ 		      <property name="xscale">0</property>
+ 		      <property name="yscale">0</property>
++		      <property name="top_padding">0</property>
++		      <property name="bottom_padding">0</property>
++		      <property name="left_padding">0</property>
++		      <property name="right_padding">0</property>
+ 
+ 		      <child>
+ 			<widget class="GtkHBox" id="hbox7">
+@@ -666,6 +701,7 @@
+ 		  <property name="can_default">True</property>
+ 		  <property name="can_focus">True</property>
+ 		  <property name="relief">GTK_RELIEF_NORMAL</property>
++		  <property name="focus_on_click">True</property>
+ 
+ 		  <child>
+ 		    <widget class="GtkAlignment" id="alignment4">
+@@ -674,6 +710,10 @@
+ 		      <property name="yalign">0.5</property>
+ 		      <property name="xscale">0</property>
+ 		      <property name="yscale">0</property>
++		      <property name="top_padding">0</property>
++		      <property name="bottom_padding">0</property>
++		      <property name="left_padding">0</property>
++		      <property name="right_padding">0</property>
+ 
+ 		      <child>
+ 			<widget class="GtkHBox" id="hbox6">
+@@ -748,6 +788,7 @@
+ 	  <property name="can_default">True</property>
+ 	  <property name="can_focus">True</property>
+ 	  <property name="relief">GTK_RELIEF_NORMAL</property>
++	  <property name="focus_on_click">True</property>
+ 
+ 	  <child>
+ 	    <widget class="GtkAlignment" id="alignment2">
+@@ -756,6 +797,10 @@
+ 	      <property name="yalign">0.5</property>
+ 	      <property name="xscale">0</property>
+ 	      <property name="yscale">0</property>
++	      <property name="top_padding">0</property>
++	      <property name="bottom_padding">0</property>
++	      <property name="left_padding">0</property>
++	      <property name="right_padding">0</property>
+ 
+ 	      <child>
+ 		<widget class="GtkHBox" id="hbox4">
+@@ -814,45 +859,6 @@
+ 	  <property name="y_options"></property>
+ 	</packing>
+       </child>
+-
+-      <child>
+-	<widget class="GtkCombo" id="combo_add">
+-	  <property name="visible">True</property>
+-	  <property name="value_in_list">True</property>
+-	  <property name="allow_empty">False</property>
+-	  <property name="case_sensitive">True</property>
+-	  <property name="enable_arrow_keys">True</property>
+-	  <property name="enable_arrows_always">False</property>
+-
+-	  <child internal-child="entry">
+-	    <widget class="GtkEntry" id="entry_add">
+-	      <property name="visible">True</property>
+-	      <property name="can_focus">True</property>
+-	      <property name="editable">True</property>
+-	      <property name="visibility">True</property>
+-	      <property name="max_length">0</property>
+-	      <property name="text" translatable="yes"></property>
+-	      <property name="has_frame">True</property>
+-	      <property name="invisible_char" translatable="yes">*</property>
+-	      <property name="activates_default">False</property>
+-	    </widget>
+-	  </child>
+-
+-	  <child internal-child="list">
+-	    <widget class="GtkList" id="combo-list1">
+-	      <property name="visible">True</property>
+-	      <property name="selection_mode">GTK_SELECTION_BROWSE</property>
+-	    </widget>
+-	  </child>
+-	</widget>
+-	<packing>
+-	  <property name="left_attach">0</property>
+-	  <property name="right_attach">1</property>
+-	  <property name="top_attach">3</property>
+-	  <property name="bottom_attach">4</property>
+-	  <property name="y_options"></property>
+-	</packing>
+-      </child>
+     </widget>
+   </child>
+ </widget>
diff --git a/app-text/gnome-spell/files/gnome-spell-1.0.6-enchant.patch b/app-text/gnome-spell/files/gnome-spell-1.0.6-enchant.patch
new file mode 100644
index 000000000000..4c8d4a4a58cd
--- /dev/null
+++ b/app-text/gnome-spell/files/gnome-spell-1.0.6-enchant.patch
@@ -0,0 +1,505 @@
+diff -NurdB gnome-spell-1.0.6/README gnome-spell-1.0.6-patched/README
+--- gnome-spell-1.0.6/README	2005-01-24 13:06:08.000000000 -0500
++++ gnome-spell-1.0.6-patched/README	2005-07-07 02:22:09.000000000 -0500
+@@ -3,7 +3,7 @@
+ 
+ Gnome Spell is GNOME/Bonobo component for spell checking. In current 0.1 version
+ it contains GNOME::Spell::Dictionary object, which provides spell checking dictionary
+-(see Spell.idl for exact API definition). It's based on pspell package, which is required
++(see Spell.idl for exact API definition). It's based on Enchant package, which is required
+ to build gnome-spell.
+ 
+ Dictionary object could be used for live spell checking. Look in test-spell.c or
+@@ -12,19 +12,18 @@
+ In future it will be expanded by implementation of GNOME::Spell::Checker object (see
+ also Spell.idl) and also by spell checking dialog control with appropriate interface.
+ 
+-Pspell build
++Enchant build
+ ------------
+ 
+-From my experience with pspell I recommend you to build pspell/aspell this way:
++From my experience with Enchant I recommend you to build it this way:
+ 
+-	1) build and install pspell
+-	2) build and install aspell
++	1) build and install Pspell, Aspell
++	2) build and install Enchant
+ 	4) build and install GNOME Spell
+ 
+-You could get Pspell and Aspell from:
++You could get Enchant from:
+ 
+-	http://pspell.sourceforge.net/
+-	http://aspell.sourceforge.net/
++	http://www.abisource.com/enchant/
+ 
+ End
+ ---
+diff -NurdB gnome-spell-1.0.6/configure.in gnome-spell-1.0.6-patched/configure.in
+--- gnome-spell-1.0.6/configure.in	2005-01-24 13:06:08.000000000 -0500
++++ gnome-spell-1.0.6-patched/configure.in	2005-07-07 02:22:09.000000000 -0500
+@@ -46,34 +46,6 @@
+ AC_SUBST(API_VERSION)
+ 
+ dnl
+-dnl aspell
+-dnl
+-
+-AC_ARG_WITH(aspell-prefix, [  --with-aspell-prefix=DIR
+-                          specify under which prefix aspell is installed.], with_aspell_prefix="$withval", )
+-
+-if test "x$with_aspell_prefix" != "x"; then
+-   saved_LDFLAGS=$LDFLAGS
+-   LDFLAGS="-L$with_aspell_prefix/lib "$LDFLAGS
+-   ASPELL_INC="-I$with_aspell_prefix/include"
+-   ASPELL_LIBS="-L$with_aspell_prefix/lib -laspell"
+-   ASPELL_DATA="$with_aspell_prefix/lib/aspell"
+-else
+-   LDFLAGS="-L`aspell config prefix`/lib "$LDFLAGS
+-   ASPELL_INC="-I`aspell config prefix`/include"
+-   ASPELL_LIBS="-L`aspell config prefix`/lib -laspell"
+-   ASPELL_DICT="`aspell config dict-dir`"
+-fi
+-AC_CHECK_LIB(aspell,new_aspell_config,,AC_MSG_ERROR([gnome-spell cannot be built without aspell library]),)
+-if test "x$with_aspell_prefix" != "x"; then
+-   LDFLAGS=$saved_LDFLAGS
+-fi
+-
+-AC_SUBST(ASPELL_DICT)
+-AC_SUBST(ASPELL_INC)
+-AC_SUBST(ASPELL_LIBS)
+-
+-dnl
+ dnl flags
+ dnl
+ 
+@@ -82,7 +54,7 @@
+ AC_SUBST(CPPFLAGS)
+ AC_SUBST(LDFLAGS)
+ 
+-GNOME_SPELL_MODULES="libgnomeui-2.0 >= 1.112.1 libbonoboui-2.0 >= 1.112.1 libglade-2.0 >= 1.99.9"
++GNOME_SPELL_MODULES="libgnomeui-2.0 >= 1.112.1 libbonoboui-2.0 >= 1.112.1 libglade-2.0 >= 1.99.9 enchant >= 0.4.0 gtk+-2.0 >= 2.3.0"
+ PKG_CHECK_MODULES(GNOME_SPELL, $GNOME_SPELL_MODULES)
+ AC_SUBST(GNOME_SPELL_CFLAGS)
+ AC_SUBST(GNOME_SPELL_LIBS)
+diff -NurdB gnome-spell-1.0.6/gnome-spell/Makefile.am gnome-spell-1.0.6-patched/gnome-spell/Makefile.am
+--- gnome-spell-1.0.6/gnome-spell/Makefile.am	2005-01-24 13:58:22.000000000 -0500
++++ gnome-spell-1.0.6-patched/gnome-spell/Makefile.am	2005-07-07 02:31:59.000000000 -0500
+@@ -7,12 +7,10 @@
+ 
+ INCLUDES =                                              \
+         -I$(srcdir)                                     \
+-	$(ASPELL_INC)					\
+         -DGNOMEDATADIR=\""$(datadir)"\"         	\
+         -DGNOMELOCALEDIR=\""$(datadir)/locale"\"        \
+ 	-DGLADE_DATADIR=\"$(gladedir)\"			\
+ 	-DPLUGIN_DIR=\""$(PLUGIN_DIR)"\"		\
+-	-DASPELL_DICT=\""$(ASPELL_DICT)"\"		\
+ 	$(GNOME_SPELL_CFLAGS)				\
+ 	$(END)
+ 
+@@ -54,7 +52,6 @@
+ libgnome_spell_component_la_LDFLAGS = -release $(API_VERSION)
+ libgnome_spell_component_la_LIBADD = 		\
+ 	libgnome-spell-idl.la		\
+-	$(ASPELL_LIBS)		\
+ 	$(GNOME_SPELL_LIBS)			\
+ 	$(END)
+ 
+@@ -68,7 +65,6 @@
+ 
+ test_gnome_spell_component_LDADD =		\
+ 	libgnome-spell-idl.la		\
+-	$(ASPELL_LIBS)				\
+ 	$(GNOME_SPELL_LIBS)			\
+ 	$(END)
+ 
+diff -NurdB gnome-spell-1.0.6/gnome-spell/dictionary.c gnome-spell-1.0.6-patched/gnome-spell/dictionary.c
+--- gnome-spell-1.0.6/gnome-spell/dictionary.c	2005-01-24 13:06:09.000000000 -0500
++++ gnome-spell-1.0.6-patched/gnome-spell/dictionary.c	2005-07-07 03:04:01.000000000 -0500
+@@ -55,13 +55,30 @@
+ 	return (SpellEngine *) language ? g_hash_table_lookup (dict->engines_ht, language) : NULL;
+ }
+ 
++/* replace any 1 hyphen with an underscore. converts en-US to en_US */
++static gchar *
++normalize_language (const gchar * language)
++{
++	gchar * dup, * hyphen;
++
++	dup = g_strdup (language);
++	hyphen = strchr (dup, '-');
++	if (hyphen)
++		*hyphen = '_';
++	return dup;
++}
++
+ static void
+ raise_error (CORBA_Environment * ev, const gchar *s)
+ {
+ 	GNOME_Spell_Dictionary_Error *exception;
+ 	exception = GNOME_Spell_Dictionary_Error__alloc ();
+-		
+-	exception->error = CORBA_string_dup (s);
++	
++	if (s != NULL)
++		exception->error = CORBA_string_dup (s);
++	else
++		exception->error = _("Unknown error");
++
+ 	CORBA_exception_set (ev, CORBA_USER_EXCEPTION,
+ 			     ex_GNOME_Spell_Dictionary_Error,
+ 			     exception);
+@@ -76,6 +93,7 @@
+ 	dict->engines = NULL;
+ 	dict->languages = g_hash_table_new (g_str_hash, g_str_equal);
+ 	dict->engines_ht = g_hash_table_new (NULL, NULL);
++	dict->broker = enchant_broker_init ();
+ }
+ 
+ static void
+@@ -88,6 +106,7 @@
+ 	dictionary->languages = NULL;
+ 	g_hash_table_destroy (dictionary->engines_ht);
+ 	dictionary->engines_ht = NULL;
++	enchant_broker_free (dictionary->broker);
+ 
+ 	G_OBJECT_CLASS (dictionary_parent_class)->finalize (object);
+ }
+@@ -98,9 +117,7 @@
+ 	SpellEngine *se;
+ 
+ 	se = g_new0 (SpellEngine, 1);
+-	se->config = new_aspell_config ();
+-	aspell_config_replace (se->config, "language-tag", language);
+-	aspell_config_replace (se->config, "encoding", "utf-8");
++	se->lang = normalize_language (language);
+ 	se->changed = TRUE;
+ 
+ 	return se;
+@@ -129,9 +146,9 @@
+ 		SpellEngine *se = dict->engines->data;
+ 
+ 		if (se->speller)
+-			delete_aspell_speller (se->speller);
+-		if (se->config)
+-			delete_aspell_config (se->config);
++			enchant_broker_free_dict (dict->broker, se->speller);
++		if (se->lang)
++			g_free (se->lang);
+ 		g_free (se);
+ 		dict->engines = g_slist_remove (dict->engines, se);
+ 	}
+@@ -190,33 +207,44 @@
+ 	NULL
+ };
+ 
++static void
++dict_describe (const char *lang_tag, const char *provider_name,
++	const char *provider_desc, const char *provider_file, void *user_data)
++{
++	printf ("%s | %s | %s | %s\n", lang_tag, provider_name, provider_desc, provider_file);
++}
++
+ static GSList *
+ get_languages_real (gint *ln)
+ {
++	EnchantBroker *broker;
++	gchar  *lang;
+ 	GSList *langs;
+-	AspellCanHaveError *err;
+-	AspellConfig  *config;
+-	AspellSpeller *speller;
+ 	gint i;
+ 
+ 	DICT_DEBUG (printf ("get_languages_real\n"));
+ 
+ 	langs = NULL;
+ 	*ln = 0;
++
++	broker = enchant_broker_init ();
++
+ 	for (i=0; known_languages [i]; i++) {
+-		config = new_aspell_config ();
+-		aspell_config_replace (config, "language-tag", known_languages [i]);
++		lang = normalize_language (known_languages [i]);
+ 		i++;
+-		err = new_aspell_speller (config);
+-		if (aspell_error_number (err) == 0) {
+-			speller = to_aspell_speller (err);
+-			DICT_DEBUG (printf ("Language: %s\n", known_languages [i]));
+-			delete_aspell_speller (speller);
++
++		if (enchant_broker_dict_exists (broker, lang)) {
++			DICT_DEBUG (enchant_dict_describe (dict, dict_describe, NULL));
++			DICT_DEBUG (printf ("Language: %s (%s)\n", known_languages [i], lang));
+ 			langs = g_slist_prepend (langs, GINT_TO_POINTER (i - 1));
+ 			(*ln) ++;
+ 		}
++
++		g_free (lang);
+ 	}
+ 
++	enchant_broker_free (broker);
++
+ 	return langs;
+ }
+ 
+@@ -227,8 +255,6 @@
+ 	GSList *langs = NULL;
+ 	gint i, lang_num;
+ 
+-	/* printf ("get_languages_load\n"); */
+-
+ 	str = g_string_new (NULL);
+ 	*ln = gconf_client_get_int (gc, GNOME_SPELL_GCONF_DIR "/languages", NULL);
+ 	for (i = 0; i < *ln; i++) {
+@@ -246,7 +272,6 @@
+ 	GSList *langs, *l;
+ 	GConfClient *gc;
+ 	time_t mtime;
+-	struct stat buf;
+ 	gint i, kl;
+ 
+ 	gc = gconf_client_get_default ();
+@@ -254,7 +279,7 @@
+ 	mtime = gconf_client_get_int (gc, GNOME_SPELL_GCONF_DIR "/mtime", NULL);
+ 	kl = gconf_client_get_int (gc, GNOME_SPELL_GCONF_DIR "/known_languages", NULL);
+ 
+- 	if (stat (ASPELL_DICT, &buf) || buf.st_mtime != mtime || kl != KNOWN_LANGUAGES) {
++ 	if (kl != KNOWN_LANGUAGES) { /* TODO: find a way to get this list generation to happen less often */
+ 		GString *str;
+ 		langs = get_languages_real (ln);
+ 
+@@ -265,7 +290,7 @@
+ 			gconf_client_set_int (gc, str->str, GPOINTER_TO_INT (l->data), NULL);
+ 			l = l->next;
+ 		}
+-		gconf_client_set_int (gc, GNOME_SPELL_GCONF_DIR "/mtime", buf.st_mtime, NULL);
++		gconf_client_set_int (gc, GNOME_SPELL_GCONF_DIR "/mtime", time (NULL), NULL);
+ 		gconf_client_set_int (gc, GNOME_SPELL_GCONF_DIR "/known_languages", KNOWN_LANGUAGES, NULL);
+ 		g_string_free (str, TRUE);
+ 		gnome_config_sync ();
+@@ -355,22 +380,18 @@
+ }
+ 
+ static void
+-update_engine (SpellEngine *se, CORBA_Environment * ev)
++update_engine (GNOMESpellDictionary *dict, SpellEngine *se, CORBA_Environment * ev)
+ {
+-	AspellCanHaveError *err;
+-
+-	DICT_DEBUG (printf ("Dictionary: creating new aspell speller\n"));
++	DICT_DEBUG (printf ("Dictionary: creating new enchant speller\n"));
+ 
+ 	if (se->changed) {
+ 		if (se->speller)
+-			delete_aspell_speller (se->speller);
+-		err = new_aspell_speller (se->config);
+-		if (aspell_error_number (err) != 0) {
+-			g_warning ("aspell error: %s\n", aspell_error_message (err));
+-			se->speller = NULL;
+-			raise_error (ev, aspell_error_message (err));
++			enchant_broker_free_dict (dict->broker, se->speller);
++		se->speller = enchant_broker_request_dict (dict->broker, se->lang);
++		if (se->speller == NULL) {
++			g_warning ("enchant error: %s\n", se->lang);
++			raise_error (ev, enchant_broker_get_error (dict->broker));
+ 		} else {
+-			se->speller = to_aspell_speller (err);
+ 			se->changed = FALSE;
+ 		}
+ 	}
+@@ -385,7 +406,7 @@
+ 		GSList *l;
+ 
+ 		for (l = dict->engines; l; l = l->next) {
+-			update_engine ((SpellEngine *) l->data, ev);
++			update_engine (dict, (SpellEngine *) l->data, ev);
+ 		}
+ 
+ 		dict->changed = FALSE;
+@@ -395,24 +416,16 @@
+ static CORBA_boolean
+ engine_check_word (SpellEngine *se, const gchar *word, CORBA_Environment *ev)
+ {
+-	CORBA_boolean result = CORBA_TRUE;
+-	gint aspell_result;
+-
+ #ifndef G_DISABLE_CHECKS
+ 	g_return_val_if_fail (se->speller, CORBA_TRUE);
+ #else
+ 	if (!se->speller)
+ 		return CORBA_TRUE;
+ #endif
+-	aspell_result = aspell_speller_check (se->speller, word, strlen (word));
+-	if (aspell_result == 0)
+-		result = CORBA_FALSE;
+-	if (aspell_result == -1) {
+-		g_warning ("aspell error: %s\n", aspell_speller_error_message (se->speller));
+-		raise_error (ev, aspell_speller_error_message (se->speller));
+-	}
+ 
+-	return result;
++	if (enchant_dict_check (se->speller, word, strlen (word)) == 0)
++		return CORBA_TRUE;
++	return CORBA_FALSE;
+ }
+ 
+ static CORBA_boolean
+@@ -465,7 +478,7 @@
+ 	DICT_DEBUG (printf ("Dictionary add_word_to_session: %s\n", word));
+ 	for (l = dict->engines; l; l = l->next) {
+ 		if (((SpellEngine *) l->data)->speller)
+-			aspell_speller_add_to_session (((SpellEngine *) l->data)->speller, word, strlen (word));
++			enchant_dict_add_to_session (((SpellEngine *) l->data)->speller, word, strlen (word));
+ 	}
+ }
+ 
+@@ -487,8 +500,7 @@
+ 	se = (SpellEngine *) g_hash_table_lookup (dict->languages, language);
+ 
+ 	if (se && se->speller) {
+-		aspell_speller_add_to_personal (se->speller, word, strlen (word));
+-		aspell_speller_save_all_word_lists (se->speller);
++		enchant_dict_add_to_personal (se->speller, word, strlen (word));
+ 		DICT_DEBUG (printf ("Added and saved.\n"));
+ 	}
+ }
+@@ -511,9 +523,8 @@
+ 	se = (SpellEngine *) g_hash_table_lookup (dict->languages, language);
+ 
+ 	if (se && se->speller) {
+-		aspell_speller_store_replacement (se->speller, word, strlen (word),
+-						  replacement, strlen (replacement));
+-		aspell_speller_save_all_word_lists (se->speller);
++		enchant_dict_store_replacement (se->speller, word, strlen (word),
++						replacement, strlen (replacement));
+ 		DICT_DEBUG (printf ("Set and saved.\n"));
+ 	}
+ }
+@@ -523,12 +534,13 @@
+ 					     const CORBA_char *word, CORBA_Environment *ev)
+ {
+ 	GNOMESpellDictionary  *dict = GNOME_SPELL_DICTIONARY (bonobo_object_from_servant (servant));
+-	const AspellWordList  *suggestions;
+-	AspellStringEnumeration *elements;
+ 	GNOME_Spell_StringSeq *seq = NULL;
+ 	GSList *l, *suggestion_list = NULL;
+ 	gint i, len, pos;
+ 
++	char **suggestions;
++	size_t n_suggs, total_suggs;
++
+ #ifndef G_DISABLE_CHECKS
+ 	g_return_val_if_fail (word, NULL);
+ #else
+@@ -539,14 +551,20 @@
+ 	update_engines (dict, ev);
+ 
+ 	len = 0;
++	total_suggs = 0;
+ 	for (l = dict->engines; l; l = l->next) {
+ 		SpellEngine *se = (SpellEngine *) l->data;
+ 
+ 		if (se->speller) {
+-			suggestions  = aspell_speller_suggest (se->speller, word, strlen (word));
+-			suggestion_list = g_slist_prepend (suggestion_list, (gpointer) suggestions);
+-			len += 2*aspell_word_list_size (suggestions);
+-			suggestion_list = g_slist_prepend (suggestion_list, engine_to_language (dict, se));
++			suggestions  = enchant_dict_suggest (se->speller, word, strlen (word), &n_suggs);
++			if (suggestions && n_suggs) {
++				total_suggs += n_suggs;
++				suggestion_list = g_slist_prepend (suggestion_list, (gpointer) suggestions);
++				suggestion_list = g_slist_prepend (suggestion_list, engine_to_language (dict, se));
++				suggestion_list = g_slist_prepend (suggestion_list, GINT_TO_POINTER (n_suggs));
++				suggestion_list = g_slist_prepend (suggestion_list, (gpointer) se->speller);
++				len += 2*n_suggs;
++			}
+ 		}
+ 	}
+ 
+@@ -560,20 +578,25 @@
+ 
+ 	pos = 0;
+ 	for (l = suggestion_list; l; l = l->next) {
+-		gint list_len;
+ 		gchar *language;
++		EnchantDict * en_dict;
++
++		en_dict = (EnchantDict *)l->data;
++		l = l->next;
++
++		n_suggs = GPOINTER_TO_INT (l->data);
++		l = l->next;
+ 
+ 		language = (gchar *) l->data;
+ 		l = l->next;
+-		suggestions = (const AspellWordList  *) l->data;
+-		elements = aspell_word_list_elements (suggestions);
+-		list_len = aspell_word_list_size (suggestions);
+-		for (i = 0; i < list_len; i ++, pos ++) {
+-			seq->_buffer [pos] = CORBA_string_dup (aspell_string_enumeration_next (elements));
++		suggestions = (char  **) l->data;
++
++		for (i = 0; i < n_suggs; i ++, pos ++) {
++			seq->_buffer [pos] = CORBA_string_dup (suggestions[i]);
+ 			pos ++;
+ 			seq->_buffer [pos] = CORBA_string_dup (language);
+ 		}
+-		delete_aspell_string_enumeration (elements);
++		enchant_dict_free_suggestions (en_dict, suggestions);
+ 	}
+ 	CORBA_sequence_set_release (seq, CORBA_TRUE);
+ 	g_slist_free (suggestion_list);
+diff -NurdB gnome-spell-1.0.6/gnome-spell/dictionary.h gnome-spell-1.0.6-patched/gnome-spell/dictionary.h
+--- gnome-spell-1.0.6/gnome-spell/dictionary.h	2005-01-24 13:06:09.000000000 -0500
++++ gnome-spell-1.0.6-patched/gnome-spell/dictionary.h	2005-07-07 02:22:09.000000000 -0500
+@@ -26,7 +26,7 @@
+ G_BEGIN_DECLS
+ 
+ #include <bonobo/bonobo-object.h>
+-#include <aspell.h>
++#include <enchant.h>
+ 
+ #define GNOME_SPELL_DICTIONARY_TYPE        (gnome_spell_dictionary_get_type ())
+ #define GNOME_SPELL_DICTIONARY(o)          (G_TYPE_CHECK_INSTANCE_CAST ((o), \
+@@ -37,8 +37,8 @@
+ #define IS_GNOME_SPELL_DICTIONARY_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), GNOME_SPELL_DICTIONARY_TYPE))
+ 
+ typedef struct {
+-	AspellConfig  *config;
+-	AspellSpeller *speller;
++	EnchantDict   *speller;
++	gchar         *lang;
+ 	gboolean       changed;
+ } SpellEngine;
+ 
+@@ -49,6 +49,8 @@
+ 	GSList *engines;
+ 	GHashTable *languages;
+ 	GHashTable *engines_ht;
++
++	EnchantBroker * broker;
+ } GNOMESpellDictionary;
+ 
+ typedef struct {
+diff -NurdB gnome-spell-1.0.6/gnome-spell.spec.in gnome-spell-1.0.6-patched/gnome-spell.spec.in
+--- gnome-spell-1.0.6/gnome-spell.spec.in	2005-01-24 13:06:08.000000000 -0500
++++ gnome-spell-1.0.6-patched/gnome-spell.spec.in	2005-07-07 02:22:09.000000000 -0500
+@@ -7,12 +7,10 @@
+ Source:		ftp://ftp.gnome.org/pub/GNOME/unstable/sources/%{name}/%{name}-%{version}.tar.gz
+ Summary:	The spelling component for bonobo
+ Group:		System Environment/Libraries
+-Requires:	aspell >= 0.28
+-Requires:	pspell >= 0.12
++Requires:	enchant >= 0.3.0
+ Requires:	bonobo >= 0.28
+ Requires:	gal >= 0.7.99.5
+-BuildRequires:  aspell-devel >= 0.28
+-BuildRequires:  pspell-devel >= 0.12
++BuildRequires:  enchant-devel >= 0.3.0
+ BuildRequires:  bonobo-devel >= 0.28
+ BuildRequires:  libglade-devel
+ BuildRequires:	gal-devel >= 0.7.99.5
diff --git a/app-text/gnome-spell/gnome-spell-1.0.5-r1.ebuild b/app-text/gnome-spell/gnome-spell-1.0.5-r1.ebuild
deleted file mode 100644
index 1355b9c81e23..000000000000
--- a/app-text/gnome-spell/gnome-spell-1.0.5-r1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/gnome-spell/gnome-spell-1.0.5-r1.ebuild,v 1.12 2005/01/01 16:16:32 eradicator Exp $
-
-inherit gnome.org gnome2 libtool eutils
-
-DESCRIPTION="Gnome spellchecking component"
-HOMEPAGE="http://www.gnome.org/"
-
-LICENSE="GPL-2"
-SLOT="1"
-KEYWORDS="~x86 ~sparc ppc ~alpha ~hppa amd64"
-IUSE=""
-
-RDEPEND=">=gnome-base/libgnomeui-2.2
-	>=gnome-base/libbonoboui-2.0
-	>=gnome-base/libglade-2.0
-	>=gnome-base/libbonobo-2.0
-	>=gnome-base/orbit-2.0
-	>=app-text/enchant-1"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	sys-devel/gettext
-	>=dev-lang/perl-5.6.0
-	>=sys-devel/autoconf-2.58"
-
-DOCS="AUTHORS ChangeLog NEWS README"
-
-src_unpack() {
-	unpack ${A}
-
-	cd ${S}
-	epatch ${FILESDIR}/${P}-enchant.patch
-
-	WANT_AUTOCONF=2.5 autoconf || die "autoconf failed"
-	WANT_AUTOMAKE=1.4 automake || die "automake failed"
-}
diff --git a/app-text/gnome-spell/gnome-spell-1.0.5.ebuild b/app-text/gnome-spell/gnome-spell-1.0.5.ebuild
deleted file mode 100644
index 978e7242780d..000000000000
--- a/app-text/gnome-spell/gnome-spell-1.0.5.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/gnome-spell/gnome-spell-1.0.5.ebuild,v 1.15 2005/01/01 16:16:32 eradicator Exp $
-
-IUSE=""
-
-inherit gnome.org gnome2 libtool debug # because this an unstable package
-
-DESCRIPTION="Gnome spellchecking component."
-HOMEPAGE="http://www.gnome.org/"
-
-KEYWORDS="x86 sparc ppc alpha hppa"
-SLOT="1"
-LICENSE="GPL-2"
-
-RDEPEND=">=gnome-base/libgnomeui-2.2
-	>=gnome-base/libbonoboui-2.0
-	>=gnome-base/libglade-2.0
-	>=gnome-base/libbonobo-2.0
-	>=gnome-base/orbit-2.0
-	virtual/aspell-dict"
-
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	sys-devel/gettext
-	>=dev-lang/perl-5.6.0"
-
-# the control-center capplet seems to be missing
-# so gnome-base/control-center-2.0 dep removed
-
-src_unpack(){
-	unpack ${A}
-
-	cd ${S}/gnome-spell
-	sed -e 's:-DGTK_DISABLE_DEPRECATED=1: :g' -i Makefile.in
-	sed -e 's:-DGTK_DISABLE_DEPRECATED=1: :g' -i Makefile.am
-}
-
-DOCS="AUTHORS COPYING ChangeLog NEWS README"
-SCROLLKEEPER_UPDATE="0"
diff --git a/app-text/gnome-spell/gnome-spell-1.0.6.ebuild b/app-text/gnome-spell/gnome-spell-1.0.6.ebuild
new file mode 100644
index 000000000000..f4d789568f40
--- /dev/null
+++ b/app-text/gnome-spell/gnome-spell-1.0.6.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/gnome-spell/gnome-spell-1.0.6.ebuild,v 1.1 2005/07/07 21:13:24 leonardop Exp $
+
+inherit libtool eutils gnome2
+
+DESCRIPTION="Gnome spellchecking component"
+HOMEPAGE="http://www.gnome.org/"
+
+LICENSE="GPL-2"
+SLOT="1"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="static"
+
+RDEPEND=">=gnome-base/libgnomeui-1.112.1
+	>=gnome-base/libbonoboui-1.112.1
+	>=gnome-base/libglade-1.99.9
+	>=gnome-base/libbonobo-2.0
+	>=gnome-base/orbit-2
+	>=x11-libs/gtk+-2.4
+	>=app-text/enchant-1"
+DEPEND="${RDEPEND}
+	dev-util/intltool
+	dev-util/pkgconfig
+	sys-devel/gettext
+	>=sys-devel/autoconf-2.59"
+
+DOCS="AUTHORS ChangeLog NEWS README"
+
+USE_DESTDIR="1"
+
+G2CONF="${G2CONF} $(use_enable static)"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	# Use enchant backend instead of aspell
+	epatch ${FILESDIR}/${P}-enchant.patch
+	epatch ${FILESDIR}/${P}-combo.patch
+
+	einfo "Runnig aclocal"
+	aclocal || die "aclocal failed"
+	einfo "Running autoconf"
+	WANT_AUTOCONF=2.5 autoconf || die "autoconf failed"
+	einfo "Running automake"
+	WANT_AUTOMAKE=1.9 automake || die "automake failed"
+	einfo "Running libtoolize"
+	libtoolize --copy --force
+}