new release

(Portage version: 2.1_pre4-r1)

8 files changed, 1002 insertions, 12 deletions

diff --git a/app-text/gnome-spell/ChangeLog b/app-text/gnome-spell/ChangeLog
index 25f24d1f3fd9..da17a5a00762 100644
--- a/app-text/gnome-spell/ChangeLog
+++ b/app-text/gnome-spell/ChangeLog
@@ -1,6 +1,16 @@
 # 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.66 2005/12/09 17:21:13 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/gnome-spell/ChangeLog,v 1.67 2006/04/02 14:09:56 foser Exp $
+
+*gnome-spell-1.0.7 (27 Mar 2006)
+
+  27 Mar 2006; Marinus Schraal <foser@gentoo.org> gnome-spell-1.0.7.ebuild
+  files/gnome-spell-1.0.7-enchant.patch, files/gnome-spell-1.0.7-combo.patch,
+  files/gnome-spell-1.0.7-debug.patch, files/gnome-spell-1.0.7-remove_gnome_h.patch :
+  New release (#127142)
+  Update enchant & combo patch, require enchant 1.2.4
+  Add patch to enable debug output
+  Add patch to remove gnome.h inclusion, together with combo patch removes libgnomeui dep
 
   09 Dec 2005; <dang@gentoo.org> gnome-spell-1.0.6.ebuild:
   Marked stable on amd64
diff --git a/app-text/gnome-spell/Manifest b/app-text/gnome-spell/Manifest
index 79f5451b6298..16164ea4dc2b 100644
--- a/app-text/gnome-spell/Manifest
+++ b/app-text/gnome-spell/Manifest
@@ -1,22 +1,60 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 b52760c26d72d7952cae3e22ecadd8a4 ChangeLog 8361
+MD5 a27a349582a14361b9ff96aad8135ff0 ChangeLog 8473
+RMD160 165bc923c57a1b1c4b7a7ad695280aba91c777f9 ChangeLog 8473
+SHA256 de2763b92a36998b81645b02c564fe71cff5559ef787834721b4566383404fdd ChangeLog 8473
 MD5 c9d55e535778f7a2386f5bba1c2cfcf7 files/digest-gnome-spell-0.5 68
+RMD160 b19bd894fb01b54932a93232438116f109d59cba files/digest-gnome-spell-0.5 68
+SHA256 1bfc88619b07d09684704314524f0042560dc78d3e664ef25d72bf26fbb2d668 files/digest-gnome-spell-0.5 68
 MD5 959c92eeb724ca5380e81f09805df109 files/digest-gnome-spell-1.0.5-r2 70
+RMD160 84d82af6a601e21d590fbf96434e801bc197aa5e files/digest-gnome-spell-1.0.5-r2 70
+SHA256 17a61f94e0dcee29292edfd8acefa295339ff9fa35b1bbc0f2133e63a8f68d95 files/digest-gnome-spell-1.0.5-r2 70
 MD5 60b79a4908f65bef8d5bc1765fb61c4a files/digest-gnome-spell-1.0.6 70
+RMD160 73df5c2bb38fa8eb679f66f9e2de3c3f9d1a51de files/digest-gnome-spell-1.0.6 70
+SHA256 15909fa710c31bcae845eba8f91d0eaa2342c567f0fe6ed8de59dc3dc70d0964 files/digest-gnome-spell-1.0.6 70
+MD5 658219434579dc54d92842515701df84 files/digest-gnome-spell-1.0.7 256
+RMD160 c998e61f0c5856d5ab11ce0038d17f1e043f1b08 files/digest-gnome-spell-1.0.7 256
+SHA256 499583c90d872bdc4596b77e7db2475d4b92e922e57374b77c5a40e8f1d29ee0 files/digest-gnome-spell-1.0.7 256
+MD5 658219434579dc54d92842515701df84 files/digest-gnome-spell-1.0.7-r1 256
+RMD160 c998e61f0c5856d5ab11ce0038d17f1e043f1b08 files/digest-gnome-spell-1.0.7-r1 256
+SHA256 499583c90d872bdc4596b77e7db2475d4b92e922e57374b77c5a40e8f1d29ee0 files/digest-gnome-spell-1.0.7-r1 256
 MD5 a2f04eb1ad051e0c06e703901869afca files/gnome-spell-1.0.5-enchant.patch 18757
+RMD160 9bf735a278857ca5771f66bc22dd4587ee30696e files/gnome-spell-1.0.5-enchant.patch 18757
+SHA256 cbedfbbc279da893c872f38566ad79e404582cb9e0326b9f0e0121ebdd3c82b2 files/gnome-spell-1.0.5-enchant.patch 18757
 MD5 b0296719b38481284f42227002eeb1a4 files/gnome-spell-1.0.5-gtk24.patch 13886
+RMD160 5a7a5fb217f950c5b109438e4716a8fd8c553ddd files/gnome-spell-1.0.5-gtk24.patch 13886
+SHA256 b8a7ce22008d06983fa44af0182e19f2fd8f9bda27aa98d5754d22ce70e51aad files/gnome-spell-1.0.5-gtk24.patch 13886
 MD5 312bf5d650d4960f7f2077f477892dc7 files/gnome-spell-1.0.6-combo.patch 12895
+RMD160 cd2728616f4949828370bd6105e858cc2fb111ce files/gnome-spell-1.0.6-combo.patch 12895
+SHA256 e1cff89cf6d5da26ba26454ff16c12cf3fd6e0b02dac574f9adf796b1288291d files/gnome-spell-1.0.6-combo.patch 12895
 MD5 62828aa3cfc3de6aaa8604520ee943d8 files/gnome-spell-1.0.6-enchant.patch 16509
+RMD160 fb0494f84a7b5c1993d757c589af4644e933a755 files/gnome-spell-1.0.6-enchant.patch 16509
+SHA256 eb4af82346c06b71671fc1d463d4d69805b8fbb6430f6881316dfd5d56034012 files/gnome-spell-1.0.6-enchant.patch 16509
+MD5 94a75fa3ccc33e552eb79a810db5dade files/gnome-spell-1.0.7-debug.patch 384
+RMD160 43eb9911b2bde894cdaa49f096f45c858eeb5ab5 files/gnome-spell-1.0.7-debug.patch 384
+SHA256 a01b2762468f4759d8a4e0cb50bec860abb23292819b1ea22e7611d5c721b253 files/gnome-spell-1.0.7-debug.patch 384
+MD5 e15f541ec691fa266bb76638bb2668ae files/gnome-spell-1.0.7-enchant.patch 15149
+RMD160 a99a41a1c3162445d37a713fa1dfe1dd09b5ad7f files/gnome-spell-1.0.7-enchant.patch 15149
+SHA256 faf6e0d9f8b54018ab732023ca0ee49048a11b8c9012163d34228f8b65670963 files/gnome-spell-1.0.7-enchant.patch 15149
+MD5 d4baf868f8d69edcec0494d494a7d380 files/gnome-spell-enchant.diff 15470
+RMD160 e6f12675f4f8fdade0418d643b7d7477281fba48 files/gnome-spell-enchant.diff 15470
+SHA256 b88f840a64e515ad987c4b031291503a4cd0881072ddc540f2959e4e1c524095 files/gnome-spell-enchant.diff 15470
+MD5 830e78e6bd8bd064eaa72014a660672e files/gtkspell-enchant.diff 11788
+RMD160 cde15880f8ccb7054c6d39d1b0d59b822a4c9c74 files/gtkspell-enchant.diff 11788
+SHA256 2c56091940a849c7c4a745c8998bca83d0ab20ed449133b733333806f32926ac files/gtkspell-enchant.diff 11788
 MD5 6e7d79a7385f1722c083fcfb4fe61660 gnome-spell-0.5.ebuild 1082
+RMD160 f939d5ce57eeae4d1a7530f9c395ea4a0f5aba75 gnome-spell-0.5.ebuild 1082
+SHA256 92f0c11320f5b6e1e2fff31c4aff96453a861728ce817ded9c202a10b55a1264 gnome-spell-0.5.ebuild 1082
 MD5 c4c9a0a1cb931a6c1ca3bf7fc93a2e51 gnome-spell-1.0.5-r2.ebuild 1021
+RMD160 fa79f39538b65cbee99f096aaef7a8f88f613f68 gnome-spell-1.0.5-r2.ebuild 1021
+SHA256 32d4f24d11ec5e5bc9b31118eb204145ffa33aec5658d154c7453dcc76bd8941 gnome-spell-1.0.5-r2.ebuild 1021
 MD5 e75b67bc2e646d264c8fcbda88d053bb gnome-spell-1.0.6.ebuild 1263
+RMD160 a2450ab0de4c914b56fce45032cc096fbd18950e gnome-spell-1.0.6.ebuild 1263
+SHA256 46feb77cc000ce49951f06e7c79cb4f1d6f34917ac1d9b8a441c6ffe55436e99 gnome-spell-1.0.6.ebuild 1263
+MD5 de6567d0a7a975a58c97f06299a0ffce gnome-spell-1.0.7-r1.ebuild 1298
+RMD160 6cde26fed393c9e8d1bd43cc6d5fb9c1342ee54e gnome-spell-1.0.7-r1.ebuild 1298
+SHA256 8c2b6a420a04e3c76defabfe3ecd79bca67b65503fc3bfa67d75a8c5ad585f4e gnome-spell-1.0.7-r1.ebuild 1298
+MD5 fed4cb359babac8068192481f1cf6e61 gnome-spell-1.0.7.ebuild 1298
+RMD160 7e33b22b2b7ad3db819bcd8da3ae8c9d9df0aca0 gnome-spell-1.0.7.ebuild 1298
+SHA256 41e82946cd581a4d779932874c0ad5fcd76922c1dc476cf2a8162a838847cf5f gnome-spell-1.0.7.ebuild 1298
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2-ecc0.1.6 (GNU/Linux)
-
-iD8DBQFDmbz6omPajV0RnrERAtB7AJwOr0HJj1Ech7Iusa01Fa2TFmusfgCfX+CR
-hQF5wtROtVwAaqqgkAISIOA=
-=U0MB
------END PGP SIGNATURE-----
+RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e metadata.xml 158
+SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1 metadata.xml 158
diff --git a/app-text/gnome-spell/files/digest-gnome-spell-1.0.7 b/app-text/gnome-spell/files/digest-gnome-spell-1.0.7
new file mode 100644
index 000000000000..385b439247a1
--- /dev/null
+++ b/app-text/gnome-spell/files/digest-gnome-spell-1.0.7
@@ -0,0 +1,3 @@
+MD5 da3ad2c664afd06a0c56c84d5055f8ad gnome-spell-1.0.7.tar.bz2 331063
+RMD160 e5c0593be77bfffa609eaa3f52653bc09a130667 gnome-spell-1.0.7.tar.bz2 331063
+SHA256 c7c621cf3cf2aeacdd8a7d998eb8cc70590bd0427e3aabecbdece9906cb5ca6b gnome-spell-1.0.7.tar.bz2 331063
diff --git a/app-text/gnome-spell/files/gnome-spell-1.0.7-combo.patch b/app-text/gnome-spell/files/gnome-spell-1.0.7-combo.patch
new file mode 100644
index 000000000000..5cf4c8090da2
--- /dev/null
+++ b/app-text/gnome-spell/files/gnome-spell-1.0.7-combo.patch
@@ -0,0 +1,350 @@
+diff -x '*~' -uNr gnome-spell-1.0.7/gnome-spell/control.c gnome-spell-1.0.7.patched/gnome-spell/control.c
+--- gnome-spell-1.0.7/gnome-spell/control.c	2006-01-20 00:37:50.000000000 +0100
++++ gnome-spell-1.0.7.patched/gnome-spell/control.c	2006-03-31 20:10:10.000000000 +0200
+@@ -23,19 +23,19 @@
+ #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 <libgnome/gnome-init.h>
+-#include <libgnomeui/gnome-entry.h>
+ #include <glade/glade.h>
+ #include <bonobo/bonobo-control.h>
+ #include <bonobo/bonobo-property-bag-client.h>
+@@ -67,7 +67,6 @@
+ 	GtkWidget *button_back;
+ 
+ 	GtkWidget *combo_add;
+-	GtkWidget *entry_add;
+ 	GList *abbrevs;
+ 	GList *langs;
+ } SpellControlData;
+@@ -140,7 +139,7 @@
+ }
+ 
+ static void
+-set_entry_add (SpellControlData *cd)
++set_combo_add (SpellControlData *cd)
+ {
+ 	
+ 	CORBA_sequence_GNOME_Spell_Language *language_seq;
+@@ -153,12 +152,16 @@
+ 
+ 		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);
++		gtk_combo_box_set_active (GTK_COMBO_BOX (cd->combo_add), 0);
+ 	}
+ 	CORBA_exception_free (&ev);
+ }
+@@ -166,15 +169,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;
+ }
+@@ -268,7 +267,7 @@
+ 	GNOME_Spell_Dictionary_setLanguage (cd->dict, cd->language, &ev);
+ 	CORBA_exception_free (&ev);
+ 
+-	set_entry_add (cd);
++	set_combo_add (cd);
+ }
+ 
+ static void
+@@ -344,8 +343,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 -x '*~' -uNr gnome-spell-1.0.7/gnome-spell/spell-checker.glade gnome-spell-1.0.7.patched/gnome-spell/spell-checker.glade
+--- gnome-spell-1.0.7/gnome-spell/spell-checker.glade	2004-08-25 11:47:58.000000000 +0200
++++ gnome-spell-1.0.7.patched/gnome-spell/spell-checker.glade	2006-03-31 20:05:32.000000000 +0200
+@@ -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.7-debug.patch b/app-text/gnome-spell/files/gnome-spell-1.0.7-debug.patch
new file mode 100644
index 000000000000..38e062f88cb7
--- /dev/null
+++ b/app-text/gnome-spell/files/gnome-spell-1.0.7-debug.patch
@@ -0,0 +1,11 @@
+--- gnome-spell/dictionary.c.nopatch	2006-03-31 18:33:15.000000000 +0200
++++ gnome-spell/dictionary.c	2006-03-31 18:32:44.000000000 +0200
+@@ -38,7 +38,7 @@
+ 
+ static BonoboObjectClass                  *dictionary_parent_class;
+ 
+-#define DICT_DEBUG(x)
++#define DICT_DEBUG(x) x
+ #define GNOME_SPELL_GCONF_DIR "/GNOME/Spell"
+ 
+ static void release_engines (GNOMESpellDictionary *dict);
diff --git a/app-text/gnome-spell/files/gnome-spell-1.0.7-enchant.patch b/app-text/gnome-spell/files/gnome-spell-1.0.7-enchant.patch
new file mode 100644
index 000000000000..323ec523a106
--- /dev/null
+++ b/app-text/gnome-spell/files/gnome-spell-1.0.7-enchant.patch
@@ -0,0 +1,492 @@
+? INSTALL
+? autom4te.cache
+? depcomp
+? gnome-spell-enchant.diff
+? gnome-spell-zip
+? intltool-extract
+? intltool-extract.in
+? intltool-merge
+? intltool-merge.in
+? intltool-update
+? intltool-update.in
+? missing
+? mkinstalldirs
+? stamp-h1
+? gnome-spell/GNOME_Spell.server
+? gnome-spell/GNOME_Spell.server.in
+Index: configure.in
+===================================================================
+RCS file: /cvs/gnome/gnome-spell/configure.in,v
+retrieving revision 1.86
+diff -u -p -u -p -r1.86 configure.in
+--- configure.in	10 Feb 2006 12:08:11 -0000	1.86
++++ configure.in	31 Mar 2006 19:11:50 -0000
+@@ -68,34 +68,6 @@ AC_DEFINE_UNQUOTED(API_VERSION, "${API_V
+ 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
+ 
+@@ -104,7 +76,7 @@ AC_SUBST(CFLAGS)
+ 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="libgnome-2.0 >= 1.112.1 libbonoboui-2.0 >= 1.112.1 libglade-2.0 >= 1.99.9 enchant >= 1.2.2"
+ PKG_CHECK_MODULES(GNOME_SPELL, $GNOME_SPELL_MODULES)
+ AC_SUBST(GNOME_SPELL_CFLAGS)
+ AC_SUBST(GNOME_SPELL_LIBS)
+Index: gnome-spell/Makefile.am
+===================================================================
+RCS file: /cvs/gnome/gnome-spell/gnome-spell/Makefile.am,v
+retrieving revision 1.34
+diff -u -p -u -p -r1.34 Makefile.am
+--- gnome-spell/Makefile.am	19 Jan 2006 23:37:50 -0000	1.34
++++ gnome-spell/Makefile.am	31 Mar 2006 19:11:50 -0000
+@@ -7,13 +7,11 @@ END =
+ 
+ INCLUDES =                                              \
+         -I$(srcdir)                                     \
+-	$(ASPELL_INC)					\
+ 	-DPREFIX=\""$(prefix)"\"			\
+         -DGNOMEDATADIR=\""$(datadir)"\"         	\
+         -DGNOMELOCALEDIR=\""$(datadir)/locale"\"        \
+ 	-DGLADE_DATADIR=\"$(gladedir)\"			\
+ 	-DPLUGIN_DIR=\""$(PLUGIN_DIR)"\"		\
+-	-DASPELL_DICT=\""$(ASPELL_DICT)"\"		\
+ 	$(GNOME_SPELL_CFLAGS)				\
+ 	$(END)
+ 
+@@ -55,7 +53,6 @@ libgnome_spell_idl_la_SOURCES =	\
+ libgnome_spell_component_la_LDFLAGS = -release $(API_VERSION) $(NO_UNDEFINED)
+ libgnome_spell_component_la_LIBADD = 		\
+ 	libgnome-spell-idl.la		\
+-	$(ASPELL_LIBS)		\
+ 	$(GNOME_SPELL_LIBS)			\
+ 	$(END)
+ 
+@@ -69,7 +66,6 @@ libgnome_spell_component_la_SOURCES =		\
+ 
+ test_gnome_spell_component_LDADD =		\
+ 	libgnome-spell-idl.la		\
+-	$(ASPELL_LIBS)				\
+ 	$(GNOME_SPELL_LIBS)			\
+ 	$(END)
+ 
+Index: gnome-spell/dictionary.c
+===================================================================
+RCS file: /cvs/gnome/gnome-spell/gnome-spell/dictionary.c,v
+retrieving revision 1.39
+diff -u -p -u -p -r1.39 dictionary.c
+--- gnome-spell/dictionary.c	5 Feb 2006 21:31:09 -0000	1.39
++++ gnome-spell/dictionary.c	31 Mar 2006 19:11:51 -0000
+@@ -36,6 +36,13 @@
+ #include "Spell.h"
+ #include "dictionary.h"
+ 
++#include <enchant.h>
++
++typedef struct {
++	EnchantBroker * config;
++	EnchantDict   * speller;
++} SpellEngine;
++
+ static BonoboObjectClass                  *dictionary_parent_class;
+ 
+ #define DICT_DEBUG(x)
+@@ -72,12 +79,24 @@ gnome_spell_dictionary_init (GObject *ob
+ {
+ 	GNOMESpellDictionary *dict = GNOME_SPELL_DICTIONARY (object);
+ 
+-	dict->changed = TRUE;
+ 	dict->engines = NULL;
+ 	dict->languages = g_hash_table_new (g_str_hash, g_str_equal);
+ 	dict->engines_ht = g_hash_table_new (NULL, NULL);
+ }
+ 
++static char **
++dup_string_list (char ** str_list, size_t list_len)
++{
++	char ** new_str_list;
++	size_t i;
++
++	new_str_list = g_new0 (char *, list_len + 1);
++	for (i = 0; i < list_len; i++)
++		new_str_list [i] = g_strdup (str_list [i]);
++
++	return new_str_list;
++}
++
+ static void
+ dictionary_finalize (GObject *object)
+ {
+@@ -93,15 +112,16 @@ dictionary_finalize (GObject *object)
+ }
+ 
+ static SpellEngine *
+-new_engine (const gchar *language)
++new_engine (const gchar *language, CORBA_Environment *ev)
+ {
+ 	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->changed = TRUE;
++	se->config = enchant_broker_init ();
++	se->speller = enchant_broker_request_dict (se->config, language);
++
++	if(se->speller == NULL)
++		raise_error (ev, enchant_broker_get_error (se->config));
+ 
+ 	return se;
+ }
+@@ -129,9 +149,9 @@ release_engines (GNOMESpellDictionary *d
+ 		SpellEngine *se = dict->engines->data;
+ 
+ 		if (se->speller)
+-			delete_aspell_speller (se->speller);
++			enchant_broker_free_dict (se->config, se->speller);
+ 		if (se->config)
+-			delete_aspell_config (se->config);
++			enchant_broker_free (se->config);
+ 		g_free (se);
+ 		dict->engines = g_slist_remove (dict->engines, se);
+ 	}
+@@ -140,7 +160,6 @@ release_engines (GNOMESpellDictionary *d
+ 	g_hash_table_foreach_remove (dict->languages, remove_engine_ht, NULL);
+ 
+ 	dict->engines = NULL;
+-	dict->changed = TRUE;
+ }
+ 
+ static LangInfo known_languages [] = {
+@@ -355,28 +374,29 @@ static GSList *
+ get_languages_real (gint *ln)
+ {
+ 	GSList *langs;
+-	AspellCanHaveError *err;
+-	AspellConfig  *config;
+-	AspellSpeller *speller;
+-	gint i;
++	EnchantBroker *broker;
++	gint i, nb_langs;
+ 
+ 	DICT_DEBUG (printf ("get_languages_real\n"));
+ 
++	/* todo: this could probably be better done by enchant_broker_list_dicts(), but let's keep
++	   the initial code change to a minimum */
++
++	broker = enchant_broker_init ();
+ 	langs = NULL;
+-	*ln = 0;
++	nb_langs = 0;
+ 	for (i=0; i < G_N_ELEMENTS (known_languages); i++) {
+-		config = new_aspell_config ();
+-		aspell_config_replace (config, "language-tag", known_languages [i].abbreviation);
+-		err = new_aspell_speller (config);
+-		if (aspell_error_number (err) == 0) {
+-			speller = to_aspell_speller (err);
++		if (enchant_broker_dict_exists (broker, known_languages [i].abbreviation)) {
+ 			DICT_DEBUG (printf ("Language: %s\n", known_languages [i].name));
+-			delete_aspell_speller (speller);
+ 			langs = g_slist_prepend (langs, GINT_TO_POINTER (i));
+-			(*ln) ++;
++			nb_langs++;
+ 		}
+ 	}
+ 
++	*ln = nb_langs;
++
++	enchant_broker_free (broker);
++
+ 	return langs;
+ }
+ 
+@@ -405,16 +425,13 @@ get_languages (gint *ln)
+ {
+ 	GSList *langs, *l;
+ 	GConfClient *gc;
+-	time_t mtime;
+-	struct stat buf;
+ 	gint i, kl;
+ 
+ 	gc = gconf_client_get_default ();
+ 
+-	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 != G_N_ELEMENTS(known_languages)) {
++	if (kl != G_N_ELEMENTS(known_languages)) {
+ 		GString *str;
+ 		langs = get_languages_real (ln);
+ 
+@@ -425,7 +442,7 @@ get_languages (gint *ln)
+ 			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 "/known_languages", G_N_ELEMENTS(known_languages), NULL);
+ 		g_string_free (str, TRUE);
+ 		gnome_config_sync ();
+@@ -504,59 +521,19 @@ impl_gnome_spell_dictionary_set_language
+ 			SpellEngine *se;
+ 			
+ 			one_language = g_strndup (begin, len);
+-			se = new_engine (one_language);
++			se = new_engine (one_language, ev);
+ 			dict->engines = g_slist_prepend (dict->engines, se);
+ 			g_hash_table_insert (dict->languages, one_language, se);
+ 			g_hash_table_insert (dict->engines_ht, se, g_strdup (one_language));
+-
+-			dict->changed = TRUE;
+-		}
+-	}
+-}
+-
+-static void
+-update_engine (SpellEngine *se, CORBA_Environment * ev)
+-{
+-	AspellCanHaveError *err;
+-
+-	DICT_DEBUG (printf ("Dictionary: creating new aspell 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));
+-		} else {
+-			se->speller = to_aspell_speller (err);
+-			se->changed = FALSE;
+ 		}
+ 	}
+ }
+ 
+-static void
+-update_engines (GNOMESpellDictionary *dict, CORBA_Environment * ev)
+-{
+-	g_return_if_fail (IS_GNOME_SPELL_DICTIONARY (dict));
+-
+-	if (dict->changed) {
+-		GSList *l;
+-
+-		for (l = dict->engines; l; l = l->next) {
+-			update_engine ((SpellEngine *) l->data, ev);
+-		}
+-
+-		dict->changed = FALSE;
+-	}
+-}
+-
+ static CORBA_boolean
+ engine_check_word (SpellEngine *se, const gchar *word, CORBA_Environment *ev)
+ {
+-	CORBA_boolean result = CORBA_TRUE;
+-	gint aspell_result;
++	CORBA_boolean result = CORBA_FALSE;
++	gint enchant_result;
+ 
+ #ifndef G_DISABLE_CHECKS
+ 	g_return_val_if_fail (se->speller, CORBA_TRUE);
+@@ -564,12 +541,12 @@ engine_check_word (SpellEngine *se, cons
+ 	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));
++	enchant_result = enchant_dict_check (se->speller, word, strlen (word));
++	if (enchant_result == 0)
++		result = CORBA_TRUE;
++	if (enchant_result == -1) {
++		g_warning ("enchant error: %s\n", enchant_dict_get_error (se->speller));
++		raise_error (ev, enchant_dict_get_error (se->speller));
+ 	}
+ 
+ 	return result;
+@@ -592,7 +569,6 @@ impl_gnome_spell_dictionary_check_word (
+ 	if (!strcmp (word, "Ximian"))
+ 		return CORBA_TRUE;
+ 
+-	update_engines (dict, ev);
+ 	for (l = dict->engines; l; l = l->next) {
+ 		if (((SpellEngine *) l->data)->speller) {
+ 			valid_speller = TRUE;
+@@ -621,11 +597,10 @@ impl_gnome_spell_dictionary_add_word_to_
+ 	if (!word)
+ 		return;
+ #endif
+-	update_engines (dict, ev);
+ 	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));
+ 	}
+ }
+ 
+@@ -642,13 +617,11 @@ impl_gnome_spell_dictionary_add_word_to_
+ 	if (!word || !language)
+ 		return;
+ #endif
+-	update_engines (dict, ev);
+ 	DICT_DEBUG (printf ("Dictionary add_word_to_personal: %s (%s)\n", word, language));
+ 	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_pwl (se->speller, word, strlen (word));
+ 		DICT_DEBUG (printf ("Added and saved.\n"));
+ 	}
+ }
+@@ -666,14 +639,12 @@ impl_gnome_spell_dictionary_set_correcti
+ 	if (!word || !replacement)
+ 		return;
+ #endif
+-	update_engines (dict, ev);
+ 	DICT_DEBUG (printf ("Dictionary correction: %s <-- %s\n", word, replacement));
+ 	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"));
+ 	}
+ }
+@@ -683,8 +654,8 @@ impl_gnome_spell_dictionary_get_suggesti
+ 					     const CORBA_char *word, CORBA_Environment *ev)
+ {
+ 	GNOMESpellDictionary  *dict = GNOME_SPELL_DICTIONARY (bonobo_object_from_servant (servant));
+-	const AspellWordList  *suggestions;
+-	AspellStringEnumeration *elements;
++	char **suggestions;
++	size_t number_of_suggestions;
+ 	GNOME_Spell_StringSeq *seq = NULL;
+ 	GSList *l, *suggestion_list = NULL;
+ 	gint i, len, pos;
+@@ -696,17 +667,19 @@ impl_gnome_spell_dictionary_get_suggesti
+ 		return NULL;
+ #endif
+ 	DICT_DEBUG (printf ("Dictionary correction: %s\n", word));
+-	update_engines (dict, ev);
+ 
+ 	len = 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);
++			suggestions = enchant_dict_suggest (se->speller, word, strlen (word), &number_of_suggestions);
++			suggestion_list = g_slist_prepend (suggestion_list, 
++							   (gpointer) dup_string_list (suggestions, number_of_suggestions));
++			len += 2*number_of_suggestions;
+ 			suggestion_list = g_slist_prepend (suggestion_list, engine_to_language (dict, se));
++			suggestion_list = g_slist_prepend (suggestion_list, GINT_TO_POINTER (number_of_suggestions));
++			enchant_dict_free_string_list (se->speller, suggestions);
+ 		}
+ 	}
+ 
+@@ -723,17 +696,18 @@ impl_gnome_spell_dictionary_get_suggesti
+ 		gint list_len;
+ 		gchar *language;
+ 
++		list_len = 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);
++		suggestions = (char **) l->data;
+ 		for (i = 0; i < list_len; i ++, pos ++) {
+-			seq->_buffer [pos] = CORBA_string_dup (aspell_string_enumeration_next (elements));
++			seq->_buffer [pos] = CORBA_string_dup (suggestions [i]);
+ 			pos ++;
+ 			seq->_buffer [pos] = CORBA_string_dup (language);
+ 		}
+-		delete_aspell_string_enumeration (elements);
++
++		g_strfreev (suggestions);
+ 	}
+ 	CORBA_sequence_set_release (seq, CORBA_TRUE);
+ 	g_slist_free (suggestion_list);
+Index: gnome-spell/dictionary.h
+===================================================================
+RCS file: /cvs/gnome/gnome-spell/gnome-spell/dictionary.h,v
+retrieving revision 1.8
+diff -u -p -u -p -r1.8 dictionary.h
+--- gnome-spell/dictionary.h	5 Feb 2006 21:31:09 -0000	1.8
++++ gnome-spell/dictionary.h	31 Mar 2006 19:11:51 -0000
+@@ -26,7 +26,6 @@
+ G_BEGIN_DECLS
+ 
+ #include <bonobo/bonobo-object.h>
+-#include <aspell.h>
+ 
+ #define GNOME_SPELL_DICTIONARY_TYPE        (gnome_spell_dictionary_get_type ())
+ #define GNOME_SPELL_DICTIONARY(o)          (G_TYPE_CHECK_INSTANCE_CAST ((o), \
+@@ -37,12 +36,6 @@ G_BEGIN_DECLS
+ #define IS_GNOME_SPELL_DICTIONARY_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), GNOME_SPELL_DICTIONARY_TYPE))
+ 
+ typedef struct {
+-	AspellConfig  *config;
+-	AspellSpeller *speller;
+-	gboolean       changed;
+-} SpellEngine;
+-
+-typedef struct {
+ 	gchar *abbreviation;
+ 	gchar *name;
+ } LangInfo;
+@@ -50,7 +43,6 @@ typedef struct {
+ typedef struct {
+ 	BonoboObject parent;
+ 
+-	gboolean changed;
+ 	GSList *engines;
+ 	GHashTable *languages;
+ 	GHashTable *engines_ht;
diff --git a/app-text/gnome-spell/files/gnome-spell-1.0.7-remove_gnome_h.patch b/app-text/gnome-spell/files/gnome-spell-1.0.7-remove_gnome_h.patch
new file mode 100644
index 000000000000..cba0172fcbf2
--- /dev/null
+++ b/app-text/gnome-spell/files/gnome-spell-1.0.7-remove_gnome_h.patch
@@ -0,0 +1,22 @@
+diff -x '*~' -uNr gnome-spell-1.0.7/gnome-spell/spell-factory.c gnome-spell-1.0.7.patched/gnome-spell/spell-factory.c
+--- gnome-spell-1.0.7/gnome-spell/spell-factory.c	2003-03-24 13:33:39.000000000 +0100
++++ gnome-spell-1.0.7.patched/gnome-spell/spell-factory.c	2006-04-02 15:56:06.000000000 +0200
+@@ -22,7 +22,6 @@
+  */
+ 
+ #include <config.h>
+-#include <gnome.h>
+ #include <bonobo.h>
+ #include <bonobo/bonobo-shlib-factory.h>
+ #include <glade/glade.h>
+diff -x '*~' -uNr gnome-spell-1.0.7/gnome-spell/test-spell.c gnome-spell-1.0.7.patched/gnome-spell/test-spell.c
+--- gnome-spell-1.0.7/gnome-spell/test-spell.c	2003-03-06 17:37:36.000000000 +0100
++++ gnome-spell-1.0.7.patched/gnome-spell/test-spell.c	2006-04-02 15:57:05.000000000 +0200
+@@ -22,7 +22,6 @@
+ */
+ 
+ #include <config.h>
+-#include <gnome.h>
+ #include <bonobo.h>
+ #include "Spell.h"
+ 
diff --git a/app-text/gnome-spell/gnome-spell-1.0.7.ebuild b/app-text/gnome-spell/gnome-spell-1.0.7.ebuild
new file mode 100644
index 000000000000..6c9871c5feb2
--- /dev/null
+++ b/app-text/gnome-spell/gnome-spell-1.0.7.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2006 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.7.ebuild,v 1.1 2006/04/02 14:09:57 foser 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 debug"
+
+RDEPEND=">=gnome-base/libgnome-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.2.4"
+
+DEPEND="${RDEPEND}
+	dev-util/intltool
+	dev-util/pkgconfig
+	sys-devel/gettext
+	>=sys-devel/autoconf-2.59"
+
+DOCS="AUTHORS ChangeLog NEWS README"
+
+pkg_setup() {
+
+	G2CONF="${G2CONF} $(use_enable static)"
+
+}
+
+src_unpack() {
+
+	unpack ${A}
+	cd ${S}
+
+	# note that the combo and enchant patch are intertwined
+	# the enchant patch changes libgnomeui dep to libgnome
+	# made possible by the combo patch
+	# Marinus Schraal <foser@gentoo.org> - 02 Apr 2006
+
+	# Use enchant backend instead of aspell
+	epatch ${FILESDIR}/${P}-enchant.patch
+	# replace gtkentry with gtkcombo widget
+	epatch ${FILESDIR}/${P}-combo.patch
+	epatch ${FILESDIR}/${P}-remove_gnome_h.patch
+
+	use debug && epatch ${FILESDIR}/${P}-debug.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
+
+}