Version bump wrt #351416 by "zvasylvv". Remove unnecessary runtime depend for festival and resort to pkg_postinst() message wrt #330351 by Andrew Savchenko. Fix building with GLIB >= 2.31 wrt #396219 by Oschtan. USE="tools" to install utilities which have been moved to the main package since 3.0.3 wrt #292773 by "andcycle-gentoo.bugs". Punt any reference to esound... read the ChangeLog

(Portage version: 2.2.0_alpha84/cvs/Linux x86_64)

6 files changed, 168 insertions, 2 deletions

diff --git a/app-text/stardict/ChangeLog b/app-text/stardict/ChangeLog
index 0abac87fd31d..5129f7a1139e 100644
--- a/app-text/stardict/ChangeLog
+++ b/app-text/stardict/ChangeLog
@@ -1,6 +1,19 @@
 # ChangeLog for app-text/stardict
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/stardict/ChangeLog,v 1.10 2011/09/21 23:55:12 dirtyepic Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/stardict/ChangeLog,v 1.11 2012/01/08 17:33:33 ssuominen Exp $
+
+*stardict-3.0.3 (08 Jan 2012)
+
+  08 Jan 2012; Samuli Suominen <ssuominen@gentoo.org> +stardict-3.0.3.ebuild,
+  +files/stardict-3.0.3-correct-glib-include.patch,
+  +files/stardict-3.0.3-entry.patch, +files/stardict-3.0.3-gcc46.patch,
+  metadata.xml:
+  Version bump wrt #351416 by "zvasylvv". Remove unnecessary runtime depend for
+  festival and resort to pkg_postinst() message wrt #330351 by Andrew
+  Savchenko. Fix building with GLIB >= 2.31 wrt #396219 by Oschtan. USE="tools"
+  to install utilities which have been moved to the main package since 3.0.3
+  wrt #292773 by "andcycle-gentoo.bugs". Punt any reference to esound wrt
+  #246174 by Yu Yuwei.
 
   22 Sep 2011; Ryan Hill <dirtyepic@gentoo.org> stardict-3.0.1-r3.ebuild,
   +files/stardict-3.0.1-gcc46.patch:
diff --git a/app-text/stardict/files/stardict-3.0.3-correct-glib-include.patch b/app-text/stardict/files/stardict-3.0.3-correct-glib-include.patch
new file mode 100644
index 000000000000..fd89243938eb
--- /dev/null
+++ b/app-text/stardict/files/stardict-3.0.3-correct-glib-include.patch
@@ -0,0 +1,13 @@
+http://bugs.gentoo.org/396219
+
+--- dict/src/tomboykeybinder.h
++++ dict/src/tomboykeybinder.h
+@@ -21,7 +21,7 @@
+ #ifndef __TOMBOY_KEY_BINDER_H__
+ #define __TOMBOY_KEY_BINDER_H__
+ 
+-#include <glib/gtypes.h>
++#include <glib.h>
+ 
+ G_BEGIN_DECLS
+ 
diff --git a/app-text/stardict/files/stardict-3.0.3-entry.patch b/app-text/stardict/files/stardict-3.0.3-entry.patch
new file mode 100644
index 000000000000..38182b0c8e0b
--- /dev/null
+++ b/app-text/stardict/files/stardict-3.0.3-entry.patch
@@ -0,0 +1,20 @@
+warning: key "Encoding" in group "Desktop Entry" is deprecated
+error: value "stardict.png" for key "Icon" in group "Desktop Entry" is an icon name with an extension, but there should be no extension
+error: value "Dictionary" in key "Categories" in group "Desktop Entry" requires another category to be present among the following categories: Office;TextTools
+
+--- dict/data/stardict.desktop.in
++++ dict/data/stardict.desktop.in
+@@ -1,11 +1,10 @@
+ [Desktop Entry]
+-Encoding=UTF-8
+ _Name=StarDict
+ _Comment=Lookup words
+ Exec=stardict
+ Terminal=false
+ Type=Application
+-Icon=stardict.png
++Icon=stardict
+ StartupNotify=true
+-Categories=Utility;Dictionary;
++Categories=Utility;Office;TextTools;Dictionary;
+ X-GNOME-DocPath=stardict/stardict.xml
diff --git a/app-text/stardict/files/stardict-3.0.3-gcc46.patch b/app-text/stardict/files/stardict-3.0.3-gcc46.patch
new file mode 100644
index 000000000000..d85bc0de5ce0
--- /dev/null
+++ b/app-text/stardict/files/stardict-3.0.3-gcc46.patch
@@ -0,0 +1,13 @@
+http://bugs.gentoo.org/362299
+
+--- dict/stardict-plugins/stardict-wordnet-plugin/scene.h
++++ dict/stardict-plugins/stardict-wordnet-plugin/scene.h
+@@ -25,6 +25,8 @@
+ #ifndef __PHYSICS_H__
+ #define __PHYSICS_H__
+ 
++#include <cstddef>
++
+ #include "partic.h"
+ #include "spring.h"
+ 
diff --git a/app-text/stardict/metadata.xml b/app-text/stardict/metadata.xml
index ccb068646e6f..c1f41ef6ab9f 100644
--- a/app-text/stardict/metadata.xml
+++ b/app-text/stardict/metadata.xml
@@ -19,5 +19,6 @@
 		 <flag name='qqwry'>Enable QQWry plugin, which provides information (in
 			 Chinese language) about geographical positions, owner, etc. for IP
 			 addresses</flag>
+		 <flag name='tools'>Build and install tools</flag>
 	</use>
 </pkgmetadata>
diff --git a/app-text/stardict/stardict-3.0.3.ebuild b/app-text/stardict/stardict-3.0.3.ebuild
new file mode 100644
index 000000000000..acf3557719e6
--- /dev/null
+++ b/app-text/stardict/stardict-3.0.3.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/stardict/stardict-3.0.3.ebuild,v 1.1 2012/01/08 17:33:33 ssuominen Exp $
+
+# 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.
+
+EAPI=4
+inherit eutils
+
+DESCRIPTION="A international dictionary supporting fuzzy and glob style matching"
+HOMEPAGE="http://code.google.com/p/stardict-3/"
+SRC_URI="http://${PN}-3.googlecode.com/files/${P}.tar.bz2
+	pronounce? ( http://${PN}-3.googlecode.com/files/WyabdcRealPeopleTTS.tar.bz2 )
+	qqwry? ( mirror://gentoo/QQWry.Dat.bz2 )"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="espeak gnome gucharmap qqwry pronounce spell tools"
+
+COMMON_DEPEND=">=dev-libs/glib-2.16
+	dev-libs/libsigc++:2
+	sys-libs/zlib
+	>=x11-libs/gtk+-2.20:2
+	gnome? (
+		>=gnome-base/libbonobo-2
+		>=gnome-base/libgnome-2
+		>=gnome-base/libgnomeui-2
+		>=gnome-base/gconf-2
+		>=gnome-base/orbit-2
+		)
+	gucharmap? ( >=gnome-extra/gucharmap-2.22.1:0 )
+	spell? ( >=app-text/enchant-1.2 )
+	tools? (
+		dev-libs/libpcre
+		dev-libs/libxml2
+		virtual/mysql
+		)"
+RDEPEND="${COMMON_DEPEND}
+	espeak? ( >=app-accessibility/espeak-1.29 )"
+DEPEND="${COMMON_DEPEND}
+	app-text/docbook-xml-dtd:4.3
+	app-text/gnome-doc-utils
+	dev-libs/libxslt
+	dev-util/intltool
+	dev-util/pkgconfig
+	sys-devel/gettext"
+
+RESTRICT="test"
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${P}-correct-glib-include.patch \
+		"${FILESDIR}"/${P}-entry.patch \
+		"${FILESDIR}"/${P}-gcc46.patch
+}
+
+src_configure() {
+	econf \
+		$(use_enable tools) \
+		--disable-scrollkeeper \
+		$(use_enable spell) \
+		$(use_enable gucharmap) \
+		--disable-festival \
+		$(use_enable espeak) \
+		$(use_enable qqwry) \
+		--disable-updateinfo \
+		$(use_enable gnome gnome-support) \
+		--disable-gpe-support \
+		--disable-schemas-install
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	dodoc dict/doc/{Documentation,FAQ,HACKING,HowToCreateDictionary,Skins,StarDictFileFormat,Translation}
+
+	if use qqwry; then
+		insinto /usr/share/stardict/data
+		doins ../QQWry.Dat
+	fi
+
+	if use pronounce; then
+		docinto WyabdcRealPeopleTTS
+		dodoc ../WyabdcRealPeopleTTS/{README,readme.txt}
+		rm -f ../WyabdcRealPeopleTTS/{README,readme.txt}
+		insinto /usr/share
+		doins -r ../WyabdcRealPeopleTTS
+	fi
+
+	find "${ED}" -name '*.la' -exec rm -f {} +
+}
+
+pkg_postinst() {
+	elog "Note: festival text to speech (TTS) plugin is not built. To use festival"
+	elog 'TTS plugin, please, emerge festival and 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-"
+}