--- stardict-3.0.3-r2.ebuild	2012-07-29 21:01:06.000000000 +0400
+++ stardict-3.0.4.ebuild	2013-08-24 23:29:00.000000000 +0400
@@ -6,9 +6,7 @@
 #       their indexes seem to be in a different format. So we'll keep them
 #       seperate for now.
 
-# NOTE: Festival plugin crashes, bug 188684. Disable for now.
-
-EAPI=4
+EAPI=5
 
 GNOME2_LA_PUNT=yes
 GCONF_DEBUG=no
@@ -23,10 +21,12 @@
 
 LICENSE="CPL-1.0 GPL-3 LGPL-2"
 SLOT="0"
-KEYWORDS="amd64 ppc ppc64 sparc x86"
-IUSE="espeak gnome gucharmap qqwry pronounce spell tools"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="+dictdotcn espeak -festival gnome +gucharmap +htmlparse +spell
+	-gpe +powerwordparse pronounce qqwry tools +updateinfo +wikiparse
+	+wordnet +xdxfparse"
 
-COMMON_DEPEND=">=dev-libs/glib-2.16
+COMMON_DEPEND="dev-libs/glib:2
 	dev-libs/libsigc++:2
 	sys-libs/zlib
 	>=x11-libs/gtk+-2.20:2
@@ -36,7 +36,10 @@
 		>=gnome-base/libgnomeui-2
 		>=gnome-base/gconf-2
 		>=gnome-base/orbit-2
+		app-text/scrollkeeper
+		app-text/gnome-doc-utils
 		)
+	gpe? ( gpe-base/libgpewidget )
 	gucharmap? ( >=gnome-extra/gucharmap-2.22.1:0 )
 	spell? ( >=app-text/enchant-1.2 )
 	tools? (
@@ -45,41 +48,65 @@
 		virtual/mysql
 		)"
 RDEPEND="${COMMON_DEPEND}
-	espeak? ( >=app-accessibility/espeak-1.29 )"
+	espeak? ( >=app-accessibility/espeak-1.29 )
+	festival? ( app-accessibility/festival )"
 DEPEND="${COMMON_DEPEND}
 	app-text/docbook-xml-dtd:4.3
 	app-text/gnome-doc-utils
 	dev-libs/libxslt
+	dev-libs/libsigc++
 	dev-util/intltool
 	virtual/pkgconfig
 	sys-devel/gettext"
 
 RESTRICT="test"
+src_prepare(){
+	# FIXME: check sigc++
+	epatch "${FILESDIR}"/${PN}-3.0.3-zlib-1.2.5.2.patch \
+		"${FILESDIR}"/${P}-fix-glib-thread.patch \
+		"${FILESDIR}"/${P}-gmodule-underlinking.patch
 
-pkg_setup() {
-	G2CONF="$(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"
+	epatch_user
+	gnome2_src_prepare
 }
 
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${P}-correct-glib-include.patch \
-		"${FILESDIR}"/${P}-entry.patch \
-		"${FILESDIR}"/${P}-gcc46.patch \
-		"${FILESDIR}"/${P}-compositelookup_cpp.patch \
-		"${FILESDIR}"/${P}-overflow.patch \
-		"${FILESDIR}"/${P}-zlib-1.2.5.2.patch
-
-	gnome2_src_prepare
+# FIXME	--disable-schemas-install"
+src_configure(){
+	G2CONF="
+		--enable-dict
+		--disable-option-checking
+		--disable-esd-support
+		--disable-advertisement
+		--disable-updateinfo
+		--disable-maemo-support
+		--disable-darwin-support
+		$(use_enable dictdotcn)
+		$(use_enable espeak)
+		$(use_enable festival)
+		$(use_enable gnome gnome-support)
+		$(use_enable gpe gpe-support)
+		$(use_enable gucharmap)
+		$(use_enable htmlparse)
+		$(use_enable powerwordparse)
+		$(use_enable qqwry)
+		$(use_enable spell)
+		$(use_enable tools)
+		$(use_enable updateinfo)
+		$(use_enable wikiparse)
+		$(use_enable wordnet)
+		$(use_enable xdxfparse)
+		"
+	if use gnome ; then
+		G2CONF+="--enable-scrollkeeper"
+	else
+		G2CONF+="--disable-scrollkeeper"
+	fi
+	if use gucharmap ; then
+		G2CONF+="--enable-deprecations"
+	else
+		G2CONF+="--disable-deprecations"
+	fi
+	gnome2_src_configure
 }
 
 src_install() {