Bump stardict

8 files changed, 40 insertions, 130 deletions

diff --git a/app-text/stardict/ChangeLog b/app-text/stardict/ChangeLog
index e1197b58..1fb8fdf3 100644
--- a/app-text/stardict/ChangeLog
+++ b/app-text/stardict/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  14 Jun 2014; Martin Väth <martin@mvath.de>:
+  Bump from main tree. Remove old ebuild
+
   31 May 2013; Martin Väth <martin@mvath.de>:
   Fix linking without gnome-doc-util. Pull stability from main tree.
 
diff --git a/app-text/stardict/Manifest b/app-text/stardict/Manifest
index 28152385..933aa72c 100644
--- a/app-text/stardict/Manifest
+++ b/app-text/stardict/Manifest
@@ -1,3 +1,3 @@
 DIST QQWry.Dat.bz2 4114875 SHA256 3eda90ee8ea13ec88767336b078d2dfe2c971d6a31df60f409d526e3e29a4f83
 DIST WyabdcRealPeopleTTS.tar.bz2 84329208 SHA256 96a398eaef3e84f6f23e61683e6439913a4d44055e695dd4a1936f9340d64870
-DIST stardict-3.0.3.tar.bz2 9147947 SHA256 9ba10a5b3dcdd02b81c7a138dac15903a6bc2355856f60338f3775e371472b73 SHA512 de0f283659646fb1615e8de0e0b8f1ad431ee8d4f80778cab07436e7b8c981766e13c48e65d88715300fe2a6fcad0f344e6a832f65f94f197121796d8cf192b3 WHIRLPOOL 46d879b2699a8e35242947829901151a74acb5012c1f00144e8dac1b936f476fe1b667fd51e47e885ba7459c946ffd5b7e129f0af6e8f417dca0e3e7d08c6bc8
+DIST stardict-3.0.4.tar.bz2 8961622 SHA256 c38b9d953fe0b2380a8aed4c98cb121ad83aff91a32af3c665198d8268b1dce8 SHA512 a1cbf58202b5430b0869955bfb7df961debab12abf55022f7c07537246c81dc182c3be50fa66273c13c289471c15afba74d15933cb202ae292f4388aa2fb6fd5 WHIRLPOOL b0476e5f38862e4c2a747206a8f1d8c55dc889d1138961390aa9f415ec310cabce242e7a4f484a4c260a004e3a8a152726cf936f0ec030586ddcd91979912aa0
diff --git a/app-text/stardict/files/stardict-3.0.3-compositelookup_cpp.patch b/app-text/stardict/files/stardict-3.0.3-compositelookup_cpp.patch
deleted file mode 100644
index 86825555..00000000
--- a/app-text/stardict/files/stardict-3.0.3-compositelookup_cpp.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-This patch is from OpenSUSE .src.rpm for the following crash on startup:
-
-ERROR:compositelookup.cpp:53:void CompositeLookup::send_net_dict_request(const string&, const string&): assertion failed: (NetDictRequests.end() == std::find(NetDictRequests.begin(), NetDictRequests.end(), request))
-
---- dict/src/lib/compositelookup.cpp
-+++ dict/src/lib/compositelookup.cpp
-@@ -50,8 +50,10 @@
- void CompositeLookup::send_net_dict_request(const std::string& dict_id, const std::string& key)
- {
- 	NetDictRequest request(dict_id, key);
--	g_assert(NetDictRequests.end() == std::find(NetDictRequests.begin(), NetDictRequests.end(), request));
--	NetDictRequests.push_back(request);
-+	if(NetDictRequests.end() == std::find(NetDictRequests.begin(), NetDictRequests.end(), request))
-+	{
-+	  NetDictRequests.push_back(request);
-+	}
- }
- 
- /* returns true if got expected response */
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
deleted file mode 100644
index fd892439..00000000
--- a/app-text/stardict/files/stardict-3.0.3-correct-glib-include.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-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
deleted file mode 100644
index 38182b0c..00000000
--- a/app-text/stardict/files/stardict-3.0.3-entry.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-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
deleted file mode 100644
index d85bc0de..00000000
--- a/app-text/stardict/files/stardict-3.0.3-gcc46.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-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/files/stardict-3.0.3-overflow.patch b/app-text/stardict/files/stardict-3.0.3-overflow.patch
deleted file mode 100644
index 48249010..00000000
--- a/app-text/stardict/files/stardict-3.0.3-overflow.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-This patch is stardict-tools-3.0.3-destbufferoverflow.patch from OpenSUSE .src.rpm for:
-
-warning: call to ‘__fgets_chk_warn’ declared with attribute warning: fgets called with bigger size than length of destination buffer [enabled by default]
-
---- tools/src/myspell2dic.c
-+++ tools/src/myspell2dic.c
-@@ -132,7 +132,7 @@ if (argc<3) 
- 
- fprintf(stderr, "Enter grammar language [Spanish]: ");
- fflush(stderr);
--fgets(lang, 100, stdin);
-+fgets(lang, 50, stdin);
- if ((p=strchr(lang, '\n'))!=NULL) *p=0;
- if (*lang==0) strcpy(lang, "Spanish");
- 
---- tools/src/ooo2dict.c
-+++ tools/src/ooo2dict.c
-@@ -71,7 +71,7 @@ current2=malloc(10000);
- 
- fprintf(stderr, "Enter thesaurus language [WordNet_English]: ");
- fflush(stderr);
--fgets(lang, 100, stdin);
-+fgets(lang, 50, stdin);
- if ((p=strchr(lang, '\n'))!=NULL) *p=0;
- if (*lang==0) strcpy(lang, "WordNet_English");
- F=fopen((argc>1)? argv[1]: "/usr/share/myspell/dicts/th_en_US_v2.dat", "rt");
diff --git a/app-text/stardict/stardict-3.0.3-r3.ebuild b/app-text/stardict/stardict-3.0.4.ebuild
index 933f0e55..2c798a74 100644
--- a/app-text/stardict/stardict-3.0.3-r3.ebuild
+++ b/app-text/stardict/stardict-3.0.4.ebuild
@@ -2,14 +2,14 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
+EAPI=5
+
 # 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.
 
 # NOTE: Festival plugin crashes, bug 188684. Disable for now.
 
-EAPI=5
-
 GNOME2_LA_PUNT=yes
 GCONF_DEBUG=no
 
@@ -26,6 +26,8 @@ SLOT="0"
 KEYWORDS="amd64 ppc ppc64 sparc x86"
 IUSE="espeak gnome gucharmap qqwry pronounce spell tools"
 
+RESTRICT="test"
+
 COMMON_DEPEND=">=dev-libs/glib-2.16
 	dev-libs/libsigc++:2
 	sys-libs/zlib
@@ -53,34 +55,14 @@ DEPEND="${COMMON_DEPEND}
 		dev-libs/libxslt
 	)
 	dev-util/intltool
-	virtual/pkgconfig
-	sys-devel/gettext"
-
-RESTRICT="test"
-
-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"
-}
+	sys-devel/gettext
+	virtual/pkgconfig"
 
 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
-	epatch_user
+	# These 2 fixes have been upstreamized for upcoming 3.0.5 differently, so drop 'em:
+	epatch "${FILESDIR}"/${PN}-3.0.3-zlib-1.2.5.2.patch
+	sed -i -e '/DEP_MODULES/s:glib-2.0:gmodule-2.0 &:' dict/configure || die
+
 	if ! use gnome
 	then	sed -i \
 				-e 's/GNOME_DOC_INIT/GNOME_DOC_INIT([0.32],[:],[:])/' \
@@ -95,16 +77,32 @@ src_prepare() {
 				dict/src/lib/Makefile.am
 			eautoreconf
 	fi
+
 	gnome2_src_prepare
 }
 
+src_configure() {
+	gnome2_src_configure \
+		$(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() {
 	gnome2_src_install
 
 	dodoc dict/doc/{Documentation,FAQ,HACKING,HowToCreateDictionary,Skins,StarDictFileFormat,Translation}
 
 	if use qqwry; then
-		insinto /usr/share/stardict/data
+		insinto /usr/share/${PN}/data
 		doins ../QQWry.Dat
 	fi
 
@@ -116,19 +114,19 @@ src_install() {
 		doins -r ../WyabdcRealPeopleTTS
 	fi
 
-	# noinst_PROGRAMS with stardict_ prefix from tools/src/Makefile.am wrt #292773
+	# noinst_PROGRAMS with ${PN}_ prefix from tools/src/Makefile.am wrt #292773
 	if use tools; then
 		local app
-		local apps="pydict2dic olddic2newdic oxford2dic directory2dic dictd2dic
-			wquick2dic ec50 directory2treedic treedict2dir jdictionary mova
+		local apps="${PN}-editor pydict2dic olddic2newdic oxford2dic directory2dic
+			dictd2dic wquick2dic ec50 directory2treedic treedict2dir jdictionary mova
 			xmlinout soothill kanjidic2 powerword kdic 21tech 21shiji buddhist
-			tabfile cedict edict duden stardict-dict-update degb2utf frgb2utf
+			tabfile cedict edict duden ${PN}-dict-update degb2utf frgb2utf
 			jpgb2utf gmx2utf rucn kingsoft wikipedia wikipediaImage babylon
-			stardict2txt stardict-verify fest2dict i2e2dict downloadwiki
+			${PN}2txt ${PN}-verify fest2dict i2e2dict downloadwiki
 			ooo2dict myspell2dic exc2i2e dictbuilder tabfile2sql KangXi Unihan
 			xiaoxuetang-ja wubi ydp2dict wordnet lingvosound2resdb
-			resdatabase2dir dir2resdatabase stardict-index stardict-text2bin
-			stardict-bin2text stardict-repair"
+			resdatabase2dir dir2resdatabase ${PN}-index ${PN}-text2bin
+			${PN}-bin2text ${PN}-repair"
 
 		for app in ${apps}; do
 			newbin tools/src/${app} ${PN}_${app}
@@ -142,10 +140,10 @@ pkg_postinst() {
 	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 will now need to install ${PN} dictionary files. If"
 	elog "you have not, execute the below to get a list of dictionaries:"
 	elog
-	elog "  emerge -s stardict-"
+	elog "  emerge -s ${PN}-"
 
 	gnome2_pkg_postinst
 }