Bump stardict. Make repoman happy

4 files changed, 21 insertions, 22 deletions

diff --git a/app-text/stardict/ChangeLog b/app-text/stardict/ChangeLog
index 1fb8fdf3..e254b2d9 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: $
 
+  24 Seo 2014; Martin Väth <martin@mvath.de>:
+  Version bump. Remove old ebuild
+
   14 Jun 2014; Martin Väth <martin@mvath.de>:
   Bump from main tree. Remove old ebuild
 
diff --git a/app-text/stardict/Manifest b/app-text/stardict/Manifest
index 933aa72c..11efb9fd 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.4.tar.bz2 8961622 SHA256 c38b9d953fe0b2380a8aed4c98cb121ad83aff91a32af3c665198d8268b1dce8 SHA512 a1cbf58202b5430b0869955bfb7df961debab12abf55022f7c07537246c81dc182c3be50fa66273c13c289471c15afba74d15933cb202ae292f4388aa2fb6fd5 WHIRLPOOL b0476e5f38862e4c2a747206a8f1d8c55dc889d1138961390aa9f415ec310cabce242e7a4f484a4c260a004e3a8a152726cf936f0ec030586ddcd91979912aa0
+DIST QQWry.Dat.bz2 4114875 SHA256 3eda90ee8ea13ec88767336b078d2dfe2c971d6a31df60f409d526e3e29a4f83 SHA512 46fd677359a2144429eb9d16131ca6b19db1c086fa93e275aa3d702d3024a65d54064df931d1ed2ba5b0c1f7d9595a284f2a8995d9cd5aac96a45216422dc9ae WHIRLPOOL 456bab65658a8af76160f162fc66868c8a74653a88a1a115e2a20dd90ba9ae8a93b1aa1ee9856cc811d1b1229ca910868ea5db764a119ae9b31cbabf962cab5f
+DIST WyabdcRealPeopleTTS.tar.bz2 84329208 SHA256 96a398eaef3e84f6f23e61683e6439913a4d44055e695dd4a1936f9340d64870 SHA512 1553e62c139ecb005bb04163147d94aa58e4ba7f9ee3172b760c6e4776587c12bf816c42e0131c82195b7c738ec9ee5082f39b974790f5cacd522367919beaa0 WHIRLPOOL 210c121c25c7726cee62c2f2beb3186f0799d68c5537442eda967694f176cbbbc6d09a8c3759de093226e283ae651348ed7173a9f93bbf776325fb656e19720c
+DIST stardict-3.0.5.tar.bz2 9353864 SHA256 1e71fefd8637d6ae797347f771fbb44ff5cb925ad1dd5fa17c6e988c4a0bcce8 SHA512 6b4244b697c3496c50bee1dc455ee31920665052f7c562c6d882701a3660c761b22e802e0a72fdf2a8912838a3f0379c2dccccfb490c30e5f4f8eaba6d3e9adf WHIRLPOOL a1a75ce6bb39e66f18c3841f1287d990ebb3a94eb532f77622ca9e5537bab962a8c89f0ad536a46a5d5d77a3d0bc5ff99541f43a8ae967c52a7c622ffa9366e1
diff --git a/app-text/stardict/metadata.xml b/app-text/stardict/metadata.xml
index 9a88150c..ea6a8b5e 100644
--- a/app-text/stardict/metadata.xml
+++ b/app-text/stardict/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>app-dicts</herd>
+<maintainer><email>maintainer-needed@gentoo.org</email></maintainer>
 	 <longdescription>
 	 StarDict is an international dictionary Software. It has powerful features
 	 such as "Glob-style pattern matching", "Scan selection word," "Fuzzy
@@ -11,6 +11,7 @@
 	 <use>
 		 <flag name='espeak'>Enable text to speech synthesizer using espeak
 			 engine</flag>
+		 <flag name='gnome2'>Enable deprecated gnome2 support</flag>
 		 <flag name='gucharmap'>Enable gucharmap dictionary plugin</flag>
 		 <flag name='pronounce'>Install WyabdcRealPeopleTTS package (it is just
 			 many .wav files) to make StarDict pronounce English words</flag>
diff --git a/app-text/stardict/stardict-3.0.4.ebuild b/app-text/stardict/stardict-3.0.5.ebuild
index 2c798a74..7ad17945 100644
--- a/app-text/stardict/stardict-3.0.4.ebuild
+++ b/app-text/stardict/stardict-3.0.5.ebuild
@@ -16,23 +16,23 @@ GCONF_DEBUG=no
 inherit autotools eutils gnome2
 
 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
+HOMEPAGE="http://stardict-4.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}-4/${P}.tar.bz2
 	pronounce? ( http://${PN}-3.googlecode.com/files/WyabdcRealPeopleTTS.tar.bz2 )
 	qqwry? ( mirror://gentoo/QQWry.Dat.bz2 )"
 
 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="espeak gnome gnome2 gucharmap qqwry pronounce spell tools"
 
 RESTRICT="test"
 
-COMMON_DEPEND=">=dev-libs/glib-2.16
-	dev-libs/libsigc++:2
-	sys-libs/zlib
-	>=x11-libs/gtk+-2.20:2
-	gnome? (
+COMMON_DEPEND=">=dev-libs/glib-2.16:2=
+	dev-libs/libsigc++:2=
+	sys-libs/zlib:=
+	>=x11-libs/gtk+-2.20:2=
+	gnome2? (
 		>=gnome-base/libbonobo-2
 		>=gnome-base/libgnome-2
 		>=gnome-base/libgnomeui-2
@@ -42,8 +42,8 @@ COMMON_DEPEND=">=dev-libs/glib-2.16
 	gucharmap? ( >=gnome-extra/gucharmap-2.22.1:0 )
 	spell? ( >=app-text/enchant-1.2 )
 	tools? (
-		dev-libs/libpcre
-		dev-libs/libxml2
+		dev-libs/libpcre:=
+		dev-libs/libxml2:=
 		virtual/mysql
 		)"
 RDEPEND="${COMMON_DEPEND}
@@ -59,10 +59,6 @@ DEPEND="${COMMON_DEPEND}
 	virtual/pkgconfig"
 
 src_prepare() {
-	# 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],[:],[:])/' \
@@ -77,7 +73,6 @@ src_prepare() {
 				dict/src/lib/Makefile.am
 			eautoreconf
 	fi
-
 	gnome2_src_prepare
 }
 
@@ -91,7 +86,7 @@ src_configure() {
 		$(use_enable espeak) \
 		$(use_enable qqwry) \
 		--disable-updateinfo \
-		$(use_enable gnome gnome-support) \
+		$(use_enable gnome2 gnome-support) \
 		--disable-gpe-support \
 		--disable-schemas-install
 }
@@ -125,7 +120,7 @@ src_install() {
 			${PN}2txt ${PN}-verify fest2dict i2e2dict downloadwiki
 			ooo2dict myspell2dic exc2i2e dictbuilder tabfile2sql KangXi Unihan
 			xiaoxuetang-ja wubi ydp2dict wordnet lingvosound2resdb
-			resdatabase2dir dir2resdatabase ${PN}-index ${PN}-text2bin
+			resdatabase2dir dir2resdatabase ${PN}-index sd2foldoc ${PN}-text2bin
 			${PN}-bin2text ${PN}-repair"
 
 		for app in ${apps}; do