Version bump, finally startdict-3.0.1 is in the tree. Thank you Zhang Le, jjmmma, Pro and others for work in bug #188684! Fixed compile problem and popup window "jumping away" problem, bug #188827 and #195882, thank Ed Catmur, Evgeniy Dushistov and other people for help, fix and investigations of these bugs.

Package-Manager: portage-2.1.4.4

8 files changed, 144 insertions, 12 deletions

diff --git a/app-dicts/stardict/ChangeLog b/app-dicts/stardict/ChangeLog
index 35893dc9e1dd..e5043391bb0b 100644
--- a/app-dicts/stardict/ChangeLog
+++ b/app-dicts/stardict/ChangeLog
@@ -1,6 +1,20 @@
 # ChangeLog for app-dicts/stardict
-# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-dicts/stardict/ChangeLog,v 1.35 2007/08/30 12:22:44 phreak Exp $
+# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-dicts/stardict/ChangeLog,v 1.36 2008/02/25 14:45:56 pva Exp $
+
+*stardict-3.0.1 (25 Feb 2008)
+*stardict-2.4.8-r1 (25 Feb 2008)
+
+  25 Feb 2008; <pva@gentoo.org>
+  +files/stardict-2.4.8-ClipboardReceivedCallback.patch,
+  +files/stardict-2.4.8-floatwin-disappear.patch, metadata.xml,
+  stardict-2.4.2.ebuild, -stardict-2.4.8.ebuild, +stardict-2.4.8-r1.ebuild,
+  +stardict-3.0.1.ebuild:
+  Version bump, finally startdict-3.0.1 is in the tree. Thank you Zhang Le,
+  jjmmma, Pro and others for work in bug #188684! Fixed compile problem and
+  popup window "jumping away" problem, bug #188827 and #195882, thank Ed
+  Catmur, Evgeniy Dushistov and other people for help, fix and investigations
+  of these bugs.
 
   30 Aug 2007; Christian Heim <phreak@gentoo.org> metadata.xml:
   Removing liquidx from metadata due to his retirement (see #171155 for
diff --git a/app-dicts/stardict/Manifest b/app-dicts/stardict/Manifest
index e454847c9811..af7fbd2b4f0a 100644
--- a/app-dicts/stardict/Manifest
+++ b/app-dicts/stardict/Manifest
@@ -1,10 +1,14 @@
+AUX stardict-2.4.8-ClipboardReceivedCallback.patch 669 RMD160 051e058f3c5cb174ecb461d4ae67115eca26c5e7 SHA1 d65226bef41e19b85114869a434c635b4cdee515 SHA256 c38927160ed618728db391033397801ffd1850c0aeaa98caa4cf4441a668d459
+AUX stardict-2.4.8-floatwin-disappear.patch 591 RMD160 334bc9fce6f765c17ac38c0bbf95ed2b1ba86803 SHA1 ad7ff07266de13c958bcdad08538a2327d1fc255 SHA256 a9b6d4269bc546004fa0535b5562b733de6f502483deb9346f1a40fe4a3026f6
 AUX stardict-gentoo.patch 547 RMD160 2098f21b51f1c27f37a772c49b8696a5bcb1a291 SHA1 0c8cfe57f6b9b5c87c4f472b88317c59a1c3df18 SHA256 0f9e70dd4979d64f816610dfdef84879bca3e67f6b66659b627caea1f702def3
 AUX stardict-gtk24.patch 1210 RMD160 8d6d4fe16305ef22fb2e7e7251efa74794434a69 SHA1 1b795e419247163c3d342e5a5da813a11e1b21ba SHA256 bd392354067da7800adedb20708ccc82f68c56a1107a90838726d1ae6c9fc0af
 DIST stardict-2.4.2.tar.bz2 702901 RMD160 0e86a66eb9ea290aaada87bf44d0919aecd02ee0 SHA1 50d49dafec6f66a3d75ec89363596baeaf61b5b3 SHA256 84854f328496420ce7a0f901a275503759f92c674a4bc2aa6ae74aa19b4a5882
 DIST stardict-2.4.6.tar.bz2 1088338 RMD160 e929363686ec3ce0fa728f50c3405938db957280 SHA1 92b5bef53f2f69a05c06eb4462995209b0400895 SHA256 994e6311379a268aa60df0c45cc762d6000d3594db172b4d1c4728b3dca0f816
 DIST stardict-2.4.8.tar.bz2 1235020 RMD160 ba4655dae9004fae97ccab7a345b70f7b0481087 SHA1 cbb312281f7a01290de4c2a213635deee8bc8a92 SHA256 160dd1dfe46ae0b9d44f9059a40eee71ff389be498aa4478355ff4640969680f
-EBUILD stardict-2.4.2.ebuild 1770 RMD160 bc73385a7c65662eef1837635d5a7b2788e9cabe SHA1 b228b5f331b8b3a63dc5c7c260d504e4651d9d28 SHA256 983cac62179b667a6eb06dea47d198513faba6884be24f946fe729273cdf4689
+DIST stardict-3.0.1.tar.bz2 1964195 RMD160 296d73bd9acdbb53c21a4fb17e608a25f01b76de SHA1 a0357e88105eaf7d6a4aa4803bf8617759bf0315 SHA256 504b3a7748933b9bd998cb85f37d4fa0a8575306643ffe6a9742450e66cd556f
+EBUILD stardict-2.4.2.ebuild 1768 RMD160 837f066e45852b5d4532cf1728503c0db0a1f209 SHA1 419a3325be6e7319c2cf1619594494597afc9ac4 SHA256 c6ef044f9b26728db59e53d9aacaced64734f00ec88dbfe9529729dbfd5371a0
 EBUILD stardict-2.4.6-r1.ebuild 1838 RMD160 f6bc9d843959d052c55752907cb4345704b4df4d SHA1 311151b71d38c526ff3b3d678d203d60c267e24f SHA256 8d98471e65175d0b934c5f4b44cec6eb89a1e72bc1c07c0de63b65f2996c2a5f
-EBUILD stardict-2.4.8.ebuild 1880 RMD160 e82fbf0f85dc6b8639e214a4046acc5ef00ab282 SHA1 c5af1a26e0764cb39efcfd16e5a6934d6e425056 SHA256 ad942b68d884cdbcef24786774fea313f9a04e084cdf7ab7289197688d38909a
-MISC ChangeLog 5284 RMD160 5cbe24665846b1bcbb21cfd7965d07223d4eab04 SHA1 5d927de243d423daaefd61b8dccc764d11060070 SHA256 de9157130680e6404a34e28a07da42664fda8b0f92a1f64f3d3078486296e2ca
-MISC metadata.xml 157 RMD160 1305e8c09c6d49c0db2a18bb50b045460c124ebe SHA1 874689ae30dfe223d487e0e6a5e0a0dbf06a69f4 SHA256 c3c089740b31ec0f4d7fbc3bf2d6bb8460ccfd0694f01bf91b22a2e1930d6d5d
+EBUILD stardict-2.4.8-r1.ebuild 2004 RMD160 f10d91f1eef5073c50e7b65c05bc73d6ee42192e SHA1 894fae723fa6a9e0f53b7a846796e0317ad26a4e SHA256 46b4b61edae1375bdccf916bfaa2d9b0af333655af017d01eb36882907c2bb6a
+EBUILD stardict-3.0.1.ebuild 2231 RMD160 84ef54aadbbff36ee83d768a25896a81940f3111 SHA1 8d58a3620b465237093b89b2afec6107066018dc SHA256 51220921d06e710568ae8f56f702c5b3a6d3acafc90b19cfbb838b5374f7d158
+MISC ChangeLog 5921 RMD160 c3ab6f4b803a4f42b320d932433ea83e60bd5f98 SHA1 725575d9fd25317ae07238359ae1c54af2808f14 SHA256 c6a7828c8ab8bc89f2e58dfc62b6bf27e575fec60f8adcbf2e7ac1329cd5518e
+MISC metadata.xml 246 RMD160 847d6318340c97dfec7e2319040ef00aa46b15eb SHA1 da1ad8fbc01a83d78ce30ee358972d6805b4c559 SHA256 726bff7a01be74d06c9da2e7d223327e1246bf186f98c494465ac974f88e239e
diff --git a/app-dicts/stardict/files/stardict-2.4.8-ClipboardReceivedCallback.patch b/app-dicts/stardict/files/stardict-2.4.8-ClipboardReceivedCallback.patch
new file mode 100644
index 000000000000..630da35e83ff
--- /dev/null
+++ b/app-dicts/stardict/files/stardict-2.4.8-ClipboardReceivedCallback.patch
@@ -0,0 +1,20 @@
+--- trunk/src/mainwin.h	2006/08/08 12:44:42	1
++++ trunk/src/mainwin.h	2006/08/09 19:00:35	2
+@@ -68,8 +68,6 @@
+ 	static void on_main_menu_about_activate(GtkMenuItem *menuitem, TopWin *oTopWin);
+ 	static void on_main_menu_quit_activate(GtkMenuItem *menuitem, TopWin *oTopWin);
+ 
+-	static void ClipboardReceivedCallback(GtkClipboard *clipboard, const gchar *text, gpointer data);
+-
+ 	void LoadHistory(void);
+ 	void SaveHistory(void);
+ public:
+@@ -97,7 +95,7 @@
+ 	bool HasFocus() {
+     return GTK_WIDGET_HAS_FOCUS(GTK_COMBO(WordCombo)->entry);
+   }
+-
++	static void ClipboardReceivedCallback(GtkClipboard *clipboard, const gchar *text, gpointer data);
+ };
+ 
+ class ListWin
diff --git a/app-dicts/stardict/files/stardict-2.4.8-floatwin-disappear.patch b/app-dicts/stardict/files/stardict-2.4.8-floatwin-disappear.patch
new file mode 100644
index 000000000000..44f92ee9884a
--- /dev/null
+++ b/app-dicts/stardict/files/stardict-2.4.8-floatwin-disappear.patch
@@ -0,0 +1,13 @@
+Index: stardict-2.4.8/src/floatwin.cpp
+===================================================================
+--- stardict-2.4.8.orig/src/floatwin.cpp
++++ stardict-2.4.8/src/floatwin.cpp
+@@ -788,7 +788,7 @@ gboolean FloatWin::vButtonReleaseCallbac
+ 
+ gboolean FloatWin::vMotionNotifyCallback (GtkWidget * widget, GdkEventMotion * event , FloatWin *oFloatWin)
+ {
+-	if (event->window == oFloatWin->FloatWindow->window || (event->state & GDK_BUTTON1_MASK))
++	if (event->state & GDK_BUTTON1_MASK)
+ 	{
+ 		gint x,y;
+ 		x = oFloatWin->press_window_x + (gint)(event->x_root) - oFloatWin->press_x_root;
diff --git a/app-dicts/stardict/metadata.xml b/app-dicts/stardict/metadata.xml
index aef01fc3d591..9ec38e237a80 100644
--- a/app-dicts/stardict/metadata.xml
+++ b/app-dicts/stardict/metadata.xml
@@ -2,4 +2,8 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>cjk</herd>
+	<maintainer>
+		<email>pva@gentoo.org</email>
+		<name>Peter Volkov</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/app-dicts/stardict/stardict-2.4.2.ebuild b/app-dicts/stardict/stardict-2.4.2.ebuild
index 0469d4f2c3d7..73d7fafc25c6 100644
--- a/app-dicts/stardict/stardict-2.4.2.ebuild
+++ b/app-dicts/stardict/stardict-2.4.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-dicts/stardict/stardict-2.4.2.ebuild,v 1.16 2007/07/11 05:41:18 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-dicts/stardict/stardict-2.4.2.ebuild,v 1.17 2008/02/25 14:45:56 pva Exp $
 
 inherit gnome2 eutils
 
@@ -37,14 +37,14 @@ src_unpack() {
 	gnome2_omf_fix
 
 	# Fix gtk-2.4 deprecation issues
-	epatch ${FILESDIR}/stardict-gtk24.patch
+	epatch "${FILESDIR}"/stardict-gtk24.patch
 }
 
 src_install() {
 	gnome2_src_install
 	# dictionary index generation files
 	exeinto /usr/share/stardict/tools
-	doexe ${S}/src/tools/{dictd2dic,directory2dict,olddic2newdic,oxford2dic,pydict2dict,wquick2dict,stardict_dict_update}
+	doexe "${S}"/src/tools/{dictd2dic,directory2dict,olddic2newdic,oxford2dic,pydict2dict,wquick2dict,stardict_dict_update}
 }
 
 pkg_postinst() {
diff --git a/app-dicts/stardict/stardict-2.4.8.ebuild b/app-dicts/stardict/stardict-2.4.8-r1.ebuild
index dd4dd5125012..b7d3b494f85a 100644
--- a/app-dicts/stardict/stardict-2.4.8.ebuild
+++ b/app-dicts/stardict/stardict-2.4.8-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 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: /var/cvsroot/gentoo-x86/app-dicts/stardict/stardict-2.4.8-r1.ebuild,v 1.1 2008/02/25 14:45:56 pva Exp $
 
 inherit gnome2 eutils
 
@@ -35,6 +35,10 @@ DEPEND="${RDEPEND}
 
 src_unpack() {
 	unpack ${A}
+
+	cd "${S}"/src
+	epatch "${FILESDIR}"/${P}-ClipboardReceivedCallback.patch
+	epatch "${FILESDIR}"/${P}-floatwin-disappear.patch
 	gnome2_omf_fix
 }
 
diff --git a/app-dicts/stardict/stardict-3.0.1.ebuild b/app-dicts/stardict/stardict-3.0.1.ebuild
new file mode 100644
index 000000000000..1915118bbdaa
--- /dev/null
+++ b/app-dicts/stardict/stardict-3.0.1.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-dicts/stardict/stardict-3.0.1.ebuild,v 1.1 2008/02/25 14:45:56 pva 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/"
+SRC_URI="mirror://sourceforge/stardict/${P}.tar.bz2"
+
+RESTRICT="test"
+LICENSE="GPL-2"
+SLOT="0"
+# when adding keywords, remember to add to stardict.eclass
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+
+DEP="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 )
+	>=sys-libs/zlib-1.1.4
+	>=x11-libs/gtk+-2.12"
+
+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}-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)
+	# Festival plugin crashes, bug 188684. Disable for now.
+	G2CONF="$(use_enable gnome gnome-support)
+		$(use_enable spell)
+		$(use_enable gucharmap)
+		$(use_enable espeak espeak)
+		--disable-festival
+		--disable-advertisement
+		--disable-updateinfo"
+	gnome2_src_compile
+}
+
+pkg_postinst() {
+	elog "Note: festival text to speach (TTS) plugin is not built. To use festival"
+	elog 'TTS plugin, please, enable "Use TTS program." at:'
+	elog '"Preferences -> Dictionary -> Sound" and fill in "Commandline" with:'
+	elog '"echo %s | festival --tts"'
+	elog
+	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-"
+}