stardict version bump. contrary to gentoo-china overlay espeak plugin is enabled here.

svn path=/; revision=59

13 files changed, 38 insertions, 239 deletions

diff --git a/app-dicts/stardict/Manifest b/app-dicts/stardict/Manifest
index 3ed2b0e..5b06ffb 100644
--- a/app-dicts/stardict/Manifest
+++ b/app-dicts/stardict/Manifest
@@ -1,41 +1,16 @@
-AUX stardict-3.0.0-espeak_Initialize.patch 574 RMD160 894d596dd658235f970b09c3b39ab14af0d653ea SHA1 ab9a33fa014f34bef7c3970e8b474e736e14a2fd SHA256 2744e7317af153462b4c687f87d24b3d8043c5fc6fbf41e149bd17e94fcc9211
-MD5 5ce283625ec432f8484e851807b74674 files/stardict-3.0.0-espeak_Initialize.patch 574
-RMD160 894d596dd658235f970b09c3b39ab14af0d653ea files/stardict-3.0.0-espeak_Initialize.patch 574
-SHA256 2744e7317af153462b4c687f87d24b3d8043c5fc6fbf41e149bd17e94fcc9211 files/stardict-3.0.0-espeak_Initialize.patch 574
-AUX stardict-3.0.0-patch.1.diff 459 RMD160 d8d3de801eedbab337fab87d7cb1e60be2517805 SHA1 85f56191176cd16fa2c13e951ce05f7bfb708c33 SHA256 cad6dcbb615b90d4e14e7578f53efcf8c78c3f36d7ba20a66dedef3a260510c5
-MD5 84ce24da92d1b4b2b79fa940eae38d13 files/stardict-3.0.0-patch.1.diff 459
-RMD160 d8d3de801eedbab337fab87d7cb1e60be2517805 files/stardict-3.0.0-patch.1.diff 459
-SHA256 cad6dcbb615b90d4e14e7578f53efcf8c78c3f36d7ba20a66dedef3a260510c5 files/stardict-3.0.0-patch.1.diff 459
-AUX stardict-3.0.0-patch.2.diff 437 RMD160 d9646f83be101ba59a46ae9788476489e189acc8 SHA1 ab237e4cdf0d4c756984aa5d98b442e7b24ee858 SHA256 ceadb424eac50182ee535f7bc762d8b0ce1e0aad4040744aefbdc1d1f72b0329
-MD5 9683986db03fc494154fccf0ed9e53c8 files/stardict-3.0.0-patch.2.diff 437
-RMD160 d9646f83be101ba59a46ae9788476489e189acc8 files/stardict-3.0.0-patch.2.diff 437
-SHA256 ceadb424eac50182ee535f7bc762d8b0ce1e0aad4040744aefbdc1d1f72b0329 files/stardict-3.0.0-patch.2.diff 437
-AUX stardict-3.0.0-patch.3.diff 851 RMD160 cb367c6469d8d0b81120058069d880c653d084c1 SHA1 3d1c3f83a5f321ce4ba84d08a490114bca133bba SHA256 7d9ec18305dfce3a021e2e053b7bcb3f2a18207dc9930e36e53d7584d3a4c9d6
-MD5 72a0009b78f91dadf67693922acad750 files/stardict-3.0.0-patch.3.diff 851
-RMD160 cb367c6469d8d0b81120058069d880c653d084c1 files/stardict-3.0.0-patch.3.diff 851
-SHA256 7d9ec18305dfce3a021e2e053b7bcb3f2a18207dc9930e36e53d7584d3a4c9d6 files/stardict-3.0.0-patch.3.diff 851
-AUX stardict-3.0.0-patch.4.diff 1660 RMD160 b1c87549288bea3a9143751b0b035d4b2f827489 SHA1 8013057422f6b08baddd624bb4eed22bba5e96ad SHA256 1e7503ff0f73f6ce4339d185e44f73b4fc999e40b09114b13dfb2d1233c24a52
-MD5 d44c1882a9f49a1bb0ac2d0ceb15be7e files/stardict-3.0.0-patch.4.diff 1660
-RMD160 b1c87549288bea3a9143751b0b035d4b2f827489 files/stardict-3.0.0-patch.4.diff 1660
-SHA256 1e7503ff0f73f6ce4339d185e44f73b4fc999e40b09114b13dfb2d1233c24a52 files/stardict-3.0.0-patch.4.diff 1660
-AUX stardict-gentoo.patch 547 RMD160 2098f21b51f1c27f37a772c49b8696a5bcb1a291 SHA1 0c8cfe57f6b9b5c87c4f472b88317c59a1c3df18 SHA256 0f9e70dd4979d64f816610dfdef84879bca3e67f6b66659b627caea1f702def3
-MD5 40e8df6800d5f7bf138a3a6692854a56 files/stardict-gentoo.patch 547
-RMD160 2098f21b51f1c27f37a772c49b8696a5bcb1a291 files/stardict-gentoo.patch 547
-SHA256 0f9e70dd4979d64f816610dfdef84879bca3e67f6b66659b627caea1f702def3 files/stardict-gentoo.patch 547
-AUX stardict-gtk24.patch 1210 RMD160 8d6d4fe16305ef22fb2e7e7251efa74794434a69 SHA1 1b795e419247163c3d342e5a5da813a11e1b21ba SHA256 bd392354067da7800adedb20708ccc82f68c56a1107a90838726d1ae6c9fc0af
-MD5 9f2bc974d89734beae9aa192bafc68ef files/stardict-gtk24.patch 1210
-RMD160 8d6d4fe16305ef22fb2e7e7251efa74794434a69 files/stardict-gtk24.patch 1210
-SHA256 bd392354067da7800adedb20708ccc82f68c56a1107a90838726d1ae6c9fc0af files/stardict-gtk24.patch 1210
-DIST stardict-20071021.tar.bz2 1724417 RMD160 0ad5a98803c64cb22652889dbd4ce015075088d9 SHA1 4dfa9d3b748b590d9441bce19337a0162d687a1a SHA256 505d3685319814645c5778c17afc90e3ab26575b71dc2a5df95c2093d617ec00
-DIST stardict-3.0.0.tar.bz2 1911973 RMD160 8d303ef0be71df262c52a0543cceb8c3f045f4b4 SHA1 3408104c1975b063697392ff8a78cc315a4c9471 SHA256 b5b9535e8795eca7982573d6b06cffc41c21b592e39a131caacfeeb3a0dad25c
-EBUILD stardict-3.0.0.ebuild 2055 RMD160 355bd93d8e2b09ac29be6d8e59a0e3b961ee90ff SHA1 7f6b810e21352b4f5f8ef85a419c0c97a060831f SHA256 ae4e5576df2e0bcba7c49e915b2a89a523607564d34fc7478dc02021117a61ee
-MD5 c9653215b5bbfc1406d4a374ce675642 stardict-3.0.0.ebuild 2055
-RMD160 355bd93d8e2b09ac29be6d8e59a0e3b961ee90ff stardict-3.0.0.ebuild 2055
-SHA256 ae4e5576df2e0bcba7c49e915b2a89a523607564d34fc7478dc02021117a61ee stardict-3.0.0.ebuild 2055
-EBUILD stardict-3.0.0_p20071021.ebuild 2356 RMD160 4aff1a1b208af5203d123ba8f002b6ef85d64cf9 SHA1 61795195caeb90987672503613716e6a3f286f07 SHA256 9a26870060a06e3d9226df2102f83caf11f2167b13c5a1242a811ca05f0161f7
-MD5 f05ed63b89b482d45d989e4deb13fd19 stardict-3.0.0_p20071021.ebuild 2356
-RMD160 4aff1a1b208af5203d123ba8f002b6ef85d64cf9 stardict-3.0.0_p20071021.ebuild 2356
-SHA256 9a26870060a06e3d9226df2102f83caf11f2167b13c5a1242a811ca05f0161f7 stardict-3.0.0_p20071021.ebuild 2356
+AUX stardict-3.0.1-configure.in-EST.diff 459 RMD160 d8d3de801eedbab337fab87d7cb1e60be2517805 SHA1 85f56191176cd16fa2c13e951ce05f7bfb708c33 SHA256 cad6dcbb615b90d4e14e7578f53efcf8c78c3f36d7ba20a66dedef3a260510c5
+MD5 84ce24da92d1b4b2b79fa940eae38d13 files/stardict-3.0.1-configure.in-EST.diff 459
+RMD160 d8d3de801eedbab337fab87d7cb1e60be2517805 files/stardict-3.0.1-configure.in-EST.diff 459
+SHA256 cad6dcbb615b90d4e14e7578f53efcf8c78c3f36d7ba20a66dedef3a260510c5 files/stardict-3.0.1-configure.in-EST.diff 459
+AUX stardict-3.0.1-gconf-m4.diff 1720 RMD160 e4fea58f8730207a2de6d64f33c563f2fb758011 SHA1 a1fff45ee0ee30fa27ac9e512c9a9b7539117d9b SHA256 dac7841720aa693fc65150beff507120346b1a6b1040a33baf26cb7485cf5939
+MD5 30cdee6040b055f37d0302db802e4f9a files/stardict-3.0.1-gconf-m4.diff 1720
+RMD160 e4fea58f8730207a2de6d64f33c563f2fb758011 files/stardict-3.0.1-gconf-m4.diff 1720
+SHA256 dac7841720aa693fc65150beff507120346b1a6b1040a33baf26cb7485cf5939 files/stardict-3.0.1-gconf-m4.diff 1720
+DIST stardict-3.0.1.tar.bz2 1964195 RMD160 296d73bd9acdbb53c21a4fb17e608a25f01b76de SHA1 a0357e88105eaf7d6a4aa4803bf8617759bf0315 SHA256 504b3a7748933b9bd998cb85f37d4fa0a8575306643ffe6a9742450e66cd556f
+EBUILD stardict-3.0.1-r2.ebuild 1989 RMD160 f1f18286ce0862bb007fde2597fb408aec4d7ffe SHA1 74657e863646a3969efe21d00808e32c9652fe1e SHA256 1346a11e69a8f004e45512451724f9892aa68489f6640b6cb803010f821d273e
+MD5 9dfee3d19f09ed0d91ff87fdd471400b stardict-3.0.1-r2.ebuild 1989
+RMD160 f1f18286ce0862bb007fde2597fb408aec4d7ffe stardict-3.0.1-r2.ebuild 1989
+SHA256 1346a11e69a8f004e45512451724f9892aa68489f6640b6cb803010f821d273e stardict-3.0.1-r2.ebuild 1989
 MISC ChangeLog 5323 RMD160 7162fcdaa9c34fa80f0bdfc3aae264fcefc6795c SHA1 15a3899da9226d5d48620197aff8ae874d13515a SHA256 adffe9d15656f980b91f20a88cb8f060fa61c84b170b12bf54aedfbd8ff48587
 MD5 3cd161f18639377cc914c64d67544bbd ChangeLog 5323
 RMD160 7162fcdaa9c34fa80f0bdfc3aae264fcefc6795c ChangeLog 5323
@@ -44,9 +19,6 @@ MISC metadata.xml 157 RMD160 1305e8c09c6d49c0db2a18bb50b045460c124ebe SHA1 87468
 MD5 8210d6f935850078086b42115e906b33 metadata.xml 157
 RMD160 1305e8c09c6d49c0db2a18bb50b045460c124ebe metadata.xml 157
 SHA256 c3c089740b31ec0f4d7fbc3bf2d6bb8460ccfd0694f01bf91b22a2e1930d6d5d metadata.xml 157
-MD5 1ef5995a5341f1bdbf289aa6c4809a70 files/digest-stardict-3.0.0 250
-RMD160 c6267eeeaeeb6c1939d4db742d5eb803ca6b33be files/digest-stardict-3.0.0 250
-SHA256 974133def5958d4ded9f5f4bd89a2998dd35dcb13a0d640457b0c35d78de28d6 files/digest-stardict-3.0.0 250
-MD5 0acdebf65272f8bf3b36f4c5f4469655 files/digest-stardict-3.0.0_p20071021 259
-RMD160 b1538829b13fd5ea3531bead27afa6aca7a8247e files/digest-stardict-3.0.0_p20071021 259
-SHA256 4dbccfacb8b3405b10a1e7906a64a0ae8702f7cf1803177f3b2745070ae2d9cc files/digest-stardict-3.0.0_p20071021 259
+MD5 bcfbec75a842d6d82693196415ecb8b9 files/digest-stardict-3.0.1-r2 250
+RMD160 15793ac40add260d4b02710aa2c9dd92a1fc5f9a files/digest-stardict-3.0.1-r2 250
+SHA256 25bbc2947a3ff5167208d92557e5319e3a97632b9844130a7408d3b966cb59d9 files/digest-stardict-3.0.1-r2 250
diff --git a/app-dicts/stardict/files/digest-stardict-3.0.0 b/app-dicts/stardict/files/digest-stardict-3.0.0
deleted file mode 100644
index 3341244..0000000
--- a/app-dicts/stardict/files/digest-stardict-3.0.0
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 23bbfd0a75baab5d0def5596f19b80cb stardict-3.0.0.tar.bz2 1911973
-RMD160 8d303ef0be71df262c52a0543cceb8c3f045f4b4 stardict-3.0.0.tar.bz2 1911973
-SHA256 b5b9535e8795eca7982573d6b06cffc41c21b592e39a131caacfeeb3a0dad25c stardict-3.0.0.tar.bz2 1911973
diff --git a/app-dicts/stardict/files/digest-stardict-3.0.0_p20071021 b/app-dicts/stardict/files/digest-stardict-3.0.0_p20071021
deleted file mode 100644
index 3681ae9..0000000
--- a/app-dicts/stardict/files/digest-stardict-3.0.0_p20071021
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 54c91acad4840fab006e7b57d53d47fd stardict-20071021.tar.bz2 1724417
-RMD160 0ad5a98803c64cb22652889dbd4ce015075088d9 stardict-20071021.tar.bz2 1724417
-SHA256 505d3685319814645c5778c17afc90e3ab26575b71dc2a5df95c2093d617ec00 stardict-20071021.tar.bz2 1724417
diff --git a/app-dicts/stardict/files/digest-stardict-3.0.1-r2 b/app-dicts/stardict/files/digest-stardict-3.0.1-r2
new file mode 100644
index 0000000..b77a7b6
--- /dev/null
+++ b/app-dicts/stardict/files/digest-stardict-3.0.1-r2
@@ -0,0 +1,3 @@
+MD5 93bb2d7825bc9d52a4f9ba4c1c506d1d stardict-3.0.1.tar.bz2 1964195
+RMD160 296d73bd9acdbb53c21a4fb17e608a25f01b76de stardict-3.0.1.tar.bz2 1964195
+SHA256 504b3a7748933b9bd998cb85f37d4fa0a8575306643ffe6a9742450e66cd556f stardict-3.0.1.tar.bz2 1964195
diff --git a/app-dicts/stardict/files/stardict-3.0.0-espeak_Initialize.patch b/app-dicts/stardict/files/stardict-3.0.0-espeak_Initialize.patch
deleted file mode 100644
index 35348ba..0000000
--- a/app-dicts/stardict/files/stardict-3.0.0-espeak_Initialize.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./stardict-plugins/stardict-espeak-tts-plugin/stardict_espeak.cpp.orig	2007-10-21 22:14:36.000000000 +0400
-+++ ./stardict-plugins/stardict-espeak-tts-plugin/stardict_espeak.cpp	2007-10-21 22:14:44.000000000 +0400
-@@ -88,7 +88,7 @@
- 
- bool stardict_tts_plugin_init(StarDictTtsPlugInObject *obj)
- {
--	espeak_Initialize(AUDIO_OUTPUT_PLAYBACK, 0, NULL, 0);
-+	espeak_Initialize(AUDIO_OUTPUT_PLAYBACK, 0, NULL);
- 	std::string res = get_cfg_filename();
- 	if (!g_file_test(res.c_str(), G_FILE_TEST_EXISTS)) {
- 		g_file_set_contents(res.c_str(), "[espeak]\nvoice=\n", -1, NULL);
diff --git a/app-dicts/stardict/files/stardict-3.0.0-patch.2.diff b/app-dicts/stardict/files/stardict-3.0.0-patch.2.diff
deleted file mode 100644
index 60f8760..0000000
--- a/app-dicts/stardict/files/stardict-3.0.0-patch.2.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.in.orig	2007-08-13 20:44:31.000000000 +0800
-+++ configure.in	2007-08-13 22:12:33.000000000 +0800
-@@ -192,7 +192,7 @@
- elif test "x${enable_maemo_support}" = "xyes" ; then
-   DEP_MODULES="gtk+-2.0 >= 2.6 gconf-2.0 >= 2.6 hildon-libs >= 0.12"
- elif test "x${enable_gnome_support}" = "xno" ; then
--  DEP_MODULES="gtk+-2.0 >= 2.6"
-+  DEP_MODULES="gtk+-2.0 >= 2.6 gthread-2.0"
- else
-   DEP_MODULES="libgnomeui-2.0 >= 2.2.0"
- fi
diff --git a/app-dicts/stardict/files/stardict-3.0.0-patch.3.diff b/app-dicts/stardict/files/stardict-3.0.0-patch.3.diff
deleted file mode 100644
index b6ebda9..0000000
--- a/app-dicts/stardict/files/stardict-3.0.0-patch.3.diff
+++ /dev/null
@@ -1,20 +0,0 @@
---- stardict-3.0.0/src/prefsdlg.cpp.orig	2007-08-14 02:22:40.000000000 +0800
-+++ stardict-3.0.0/src/prefsdlg.cpp	2007-08-14 02:24:47.000000000 +0800
-@@ -726,7 +726,7 @@
- 	GtkWidget *vbox1 = gtk_vbox_new(false, 6);
- 	gtk_box_pack_start(GTK_BOX(vbox),vbox1,false,false, 0);
- 
--	GtkWidget *check_button;
-+	GtkWidget *check_button, *label;
- 	check_button = gtk_check_button_new_with_mnemonic(_("_Enable sound event."));
- 	bool enable=
- 		conf->get_bool_at("dictionary/enable_sound_event");
-@@ -748,7 +748,7 @@
- 	gtk_box_pack_start(GTK_BOX(vbox1), hbox2, FALSE, FALSE, 0);
- #endif
- 
--	GtkWidget *label = gtk_label_new(_("RealPeopleTTS search path:"));
-+	label = gtk_label_new(_("RealPeopleTTS search path:"));
- 	gtk_misc_set_alignment(GTK_MISC(label), 0, .5);
- 	gtk_box_pack_start(GTK_BOX(vbox1),label,false,false,0);
- 	tts_textview = gtk_text_view_new();
diff --git a/app-dicts/stardict/files/stardict-3.0.0-patch.1.diff b/app-dicts/stardict/files/stardict-3.0.1-configure.in-EST.diff
index 286da76..286da76 100644
--- a/app-dicts/stardict/files/stardict-3.0.0-patch.1.diff
+++ b/app-dicts/stardict/files/stardict-3.0.1-configure.in-EST.diff
diff --git a/app-dicts/stardict/files/stardict-3.0.0-patch.4.diff b/app-dicts/stardict/files/stardict-3.0.1-gconf-m4.diff
index dc9b4fd..fc412ec 100644
--- a/app-dicts/stardict/files/stardict-3.0.0-patch.4.diff
+++ b/app-dicts/stardict/files/stardict-3.0.1-gconf-m4.diff
@@ -1,8 +1,6 @@
-diff --git a/m4/gconf-2.m4 b/m4/gconf-2.m4
-new file mode 100644
-index 0000000..aca7c7d
---- /dev/null
-+++ b/m4/gconf-2.m4
+diff -urN stardict-3.0.0.orig/m4/gconf-2.m4 stardict-3.0.0/m4/gconf-2.m4
+--- m4/gconf-2.m4	1970-01-01 08:00:00.000000000 +0800
++++ m4/gconf-2.m4	2007-11-10 14:48:00.000000000 +0800
 @@ -0,0 +1,39 @@
 +dnl AM_GCONF_SOURCE_2
 +dnl Defines GCONF_SCHEMA_CONFIG_SOURCE which is where you should install schemas
diff --git a/app-dicts/stardict/files/stardict-gentoo.patch b/app-dicts/stardict/files/stardict-gentoo.patch
deleted file mode 100644
index 3a94d96..0000000
--- a/app-dicts/stardict/files/stardict-gentoo.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -p -r zh-stardict-1.3/src/image.h zh-stardict-1.3.fix/src/image.h
-*** zh-stardict-1.3/src/image.h	2000-05-26 09:33:16.000000000 +0800
---- zh-stardict-1.3.fix/src/image.h	2002-10-12 06:34:04.000000000 +0800
-***************
-*** 17,23 ****
-  #ifndef IMAGE_H
-  #define IMAGE_H
-  
-! #include <stdiostream.h>
-  #include <stdlib.h>
-  #include <memory.h>
-  #include <string.h>
---- 17,24 ----
-  #ifndef IMAGE_H
-  #define IMAGE_H
-  
-! //#include <stdiostream.h>
-! #include <iostream.h>
-  #include <stdlib.h>
-  #include <memory.h>
-  #include <string.h>
diff --git a/app-dicts/stardict/files/stardict-gtk24.patch b/app-dicts/stardict/files/stardict-gtk24.patch
deleted file mode 100644
index bc79052..0000000
--- a/app-dicts/stardict/files/stardict-gtk24.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-diff -ruN stardict-2.4.2.old/src/Makefile.am stardict-2.4.2/src/Makefile.am
---- stardict-2.4.2.old/src/Makefile.am	2004-04-22 15:37:45.326039331 -0700
-+++ stardict-2.4.2/src/Makefile.am	2004-04-22 15:40:13.902664279 -0700
-@@ -9,12 +9,7 @@
- 	-DGNOME_ICONDIR=\""$(datadir)/pixmaps"\"		\
- 	-DSTARDICT_LOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\"		\
- 	-DSTARDICT_DATA_DIR=\""$(datadir)/stardict"\"		\
--	-DG_DISABLE_DEPRECATED					\
--	-DGDK_DISABLE_DEPRECATED				\
--	-DGTK_DISABLE_DEPRECATED				\
--	-DGDK_PIXBUF_DISABLE_DEPRECATED				\
--	-DGNOME_DISABLE_DEPRECATED
--
-+	
- 
- stardict_LDFLAGS = 
- 
-diff -ruN stardict-2.4.2.old/src/Makefile.in stardict-2.4.2/src/Makefile.in
---- stardict-2.4.2.old/src/Makefile.in	2004-04-22 15:37:45.332037580 -0700
-+++ stardict-2.4.2/src/Makefile.in	2004-04-22 15:40:13.902664279 -0700
-@@ -141,13 +141,7 @@
- 	-DGNOME_ICONDIR=\""$(datadir)/pixmaps"\"		\
- 	-DSTARDICT_LOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\"		\
- 	-DSTARDICT_DATA_DIR=\""$(datadir)/stardict"\"		\
--	-DG_DISABLE_DEPRECATED					\
--	-DGDK_DISABLE_DEPRECATED				\
--	-DGTK_DISABLE_DEPRECATED				\
--	-DGDK_PIXBUF_DISABLE_DEPRECATED				\
--	-DGNOME_DISABLE_DEPRECATED
--
--
-+	
- stardict_LDFLAGS = 
- 
- stardict_LDADD = \
diff --git a/app-dicts/stardict/stardict-3.0.0_p20071021.ebuild b/app-dicts/stardict/stardict-3.0.0_p20071021.ebuild
deleted file mode 100644
index 9d3138d..0000000
--- a/app-dicts/stardict/stardict-3.0.0_p20071021.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-dicts/stardict/stardict-2.4.8.ebuild,v 1.4 2007/07/11 05:41:18 mr_bones_ Exp $
-
-inherit gnome2 eutils autotools
-
-# NOTE: Even though the *.dict.dz are the same as dictd/freedict's files,
-#       their indexes seem to be in a different format. So we'll keep them
-#       seperate for now.
-
-IUSE="festival espeak gnome gucharmap spell"
-DESCRIPTION="A GNOME2 international dictionary supporting fuzzy and glob style matching"
-HOMEPAGE="http://stardict.sourceforge.net/ http://cosoft.org.cn/projects/stardict/"
-SRC_URI="theor.ran.gpi.ru/${PN}-${PV#*_p}.tar.bz2"
-
-RESTRICT="test"
-LICENSE="GPL-2"
-SLOT="0"
-# when adding keywords, remember to add to stardict.eclass
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
-
-RDEPEND="gnome? ( >=gnome-base/libbonobo-2.2.0
-		>=gnome-base/libgnome-2.2.0
-		>=gnome-base/libgnomeui-2.2.0
-		>=gnome-base/gconf-2
-		>=gnome-base/orbit-2.6
-		app-text/scrollkeeper )
-	spell? ( app-text/enchant )
-	gucharmap? ( >=gnome-extra/gucharmap-1.4.0 )
-	festival? ( =app-accessibility/festival-1.96_beta
-		=app-accessibility/speech-tools-1.2.96_beta )
-	espeak? ( >=app-accessibility/espeak-1.27 )
-	>=sys-libs/zlib-1.1.4
-	>=x11-libs/gtk+-2.6"
-
-DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.22
-	dev-util/pkgconfig"
-
-S=${WORKDIR}/${PN}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/stardict-3.0.0-patch.1.diff
-	epatch "${FILESDIR}"/stardict-3.0.0-patch.4.diff
-	# Apply the following patch to compile with espeak-1.26
-	#epatch "${FILESDIR}"/stardict-3.0.0-espeak_Initialize.patch
-	# We call ./configure by ourselfs later
-	sed -i -e "/configure/d" autogen.sh
-	./autogen.sh
-#	AT_M4DIR="m4" eautoreconf
-	gnome2_omf_fix
-}
-
-src_compile() {
-	export PKG_CONFIG=$(type -P pkg-config)
-	G2CONF="$(use_enable gnome gnome-support) 
-		$(use_enable spell)
-		$(use_enable gucharmap)
-		$(use_enable festival)
-		$(use_enable espeak)"
-	gnome2_src_compile
-}
-
-pkg_postinst() {
-	elog "You will now need to install stardict dictionary files. If"
-	elog "you have not, execute the below to get a list of dictionaries:"
-	elog
-	elog "  emerge -s stardict-"
-	elog
-	ewarn "If you upgraded from 2.4.1 or lower and use your own dictionary"
-	ewarn "files, you'll need to run: /usr/share/stardict/tools/stardict_dict_update"
-}
diff --git a/app-dicts/stardict/stardict-3.0.0.ebuild b/app-dicts/stardict/stardict-3.0.1-r2.ebuild
index 23acca3..4259e2b 100644
--- a/app-dicts/stardict/stardict-3.0.0.ebuild
+++ b/app-dicts/stardict/stardict-3.0.1-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-dicts/stardict/stardict-2.4.8.ebuild,v 1.4 2007/07/11 05:41:18 mr_bones_ Exp $
+# $Header$
 
 inherit gnome2 eutils autotools
 
@@ -10,7 +10,7 @@ inherit gnome2 eutils autotools
 
 IUSE="festival espeak gnome gucharmap spell"
 DESCRIPTION="A GNOME2 international dictionary supporting fuzzy and glob style matching"
-HOMEPAGE="http://stardict.sourceforge.net/ http://cosoft.org.cn/projects/stardict/"
+HOMEPAGE="http://stardict.sourceforge.net/"
 SRC_URI="mirror://sourceforge/stardict/${P}.tar.bz2"
 
 RESTRICT="test"
@@ -19,7 +19,7 @@ SLOT="0"
 # when adding keywords, remember to add to stardict.eclass
 KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
 
-RDEPEND="gnome? ( >=gnome-base/libbonobo-2.2.0
+DEP="gnome? ( >=gnome-base/libbonobo-2.2.0
 		>=gnome-base/libgnome-2.2.0
 		>=gnome-base/libgnomeui-2.2.0
 		>=gnome-base/gconf-2
@@ -27,31 +27,35 @@ RDEPEND="gnome? ( >=gnome-base/libbonobo-2.2.0
 		app-text/scrollkeeper )
 	spell? ( app-text/enchant )
 	gucharmap? ( >=gnome-extra/gucharmap-1.4.0 )
-	festival? ( =app-accessibility/festival-1.96_beta
-		=app-accessibility/speech-tools-1.2.96_beta )
-	espeak? ( ~app-accessibility/espeak-1.26 )
 	>=sys-libs/zlib-1.1.4
-	>=x11-libs/gtk+-2.6"
+	>=x11-libs/gtk+-2.12"
 
-DEPEND="${RDEPEND}
+RDEPEND="${DEP}
+	espeak? ( >=app-accessibility/espeak-1.29 )
+	festival? ( =app-accessibility/festival-1.96_beta )"
+
+DEPEND="${DEP}
 	>=dev-util/intltool-0.22
 	dev-util/pkgconfig"
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/${P}-*.diff
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-configure.in-EST.diff
+	epatch "${FILESDIR}"/${P}-gconf-m4.diff
 	AT_M4DIR="m4" eautoreconf
 	gnome2_omf_fix
 }
 
 src_compile() {
 	export PKG_CONFIG=$(type -P pkg-config)
-	G2CONF="$(use_enable gnome gnome-support) 
+	G2CONF="$(use_enable gnome gnome-support)
 		$(use_enable spell)
 		$(use_enable gucharmap)
+		$(use_enable espeak espeak)
 		$(use_enable festival)
-		$(use_enable espeak)"
+		--disable-advertisement
+		--disable-updateinfo"
 	gnome2_src_compile
 }