old

Package-Manager: portage-2.2.0_alpha116/cvs/Linux x86_64

4 files changed, 19 insertions, 124 deletions

diff --git a/app-text/stardict/ChangeLog b/app-text/stardict/ChangeLog
index c78b825f9885..36c79eeaaafd 100644
--- a/app-text/stardict/ChangeLog
+++ b/app-text/stardict/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-text/stardict
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/stardict/ChangeLog,v 1.30 2012/07/29 16:45:05 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/stardict/ChangeLog,v 1.31 2012/07/30 09:46:31 ssuominen Exp $
+
+  30 Jul 2012; Samuli Suominen <ssuominen@gentoo.org>
+  -stardict-3.0.3-r1.ebuild, metadata.xml:
+  old
+
+  30 Jul 2012; Samuli Suominen <ssuominen@gentoo.org>
+  -stardict-3.0.3-r1.ebuild:
+  old
 
   29 Jul 2012; Raúl Porcel <armin76@gentoo.org> stardict-3.0.3-r2.ebuild:
   sparc stable wrt #416747
diff --git a/app-text/stardict/Manifest b/app-text/stardict/Manifest
index e6c14f420cf6..614340076c2a 100644
--- a/app-text/stardict/Manifest
+++ b/app-text/stardict/Manifest
@@ -10,14 +10,17 @@ AUX stardict-3.0.3-zlib-1.2.5.2.patch 1175 SHA256 4cf70114cbdb2f149890af4fc353e8
 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.3.tar.bz2 9147947 SHA256 9ba10a5b3dcdd02b81c7a138dac15903a6bc2355856f60338f3775e371472b73 SHA512 de0f283659646fb1615e8de0e0b8f1ad431ee8d4f80778cab07436e7b8c981766e13c48e65d88715300fe2a6fcad0f344e6a832f65f94f197121796d8cf192b3 WHIRLPOOL 46d879b2699a8e35242947829901151a74acb5012c1f00144e8dac1b936f476fe1b667fd51e47e885ba7459c946ffd5b7e129f0af6e8f417dca0e3e7d08c6bc8
-EBUILD stardict-3.0.3-r1.ebuild 3109 SHA256 1d967df4e110a33de832089ee9b3091d1aaab5bfe294ee1e603520cfc2dbc6da SHA512 5917ae1af10c09c3176f254a7b475081eaaba561568c30892769495d5fd66f5127a88a8e84e4ba78a30fb65d3f635a6449bc29eb6f0a78d76df733430d58ce28 WHIRLPOOL c5b886356b7c971f849ea9b54b04d502cd2c558f0e30eca39d1525c958fc1f6df40d05cef80d53ee3f5e537bc0e3b0365d7447c7f8fd78ee88890d215708b6b9
 EBUILD stardict-3.0.3-r2.ebuild 3978 SHA256 c7995cd0ac6a367ea559ab1566195e7216e90387740fe2b9a5e7ab9962b4ff82 SHA512 90030eb35894d6860d7737943a9d1cf1550512203b8877ccd4cf98eb39e4bb13c5b93502859e334946bd2f59eb82d0d7f0895d2bdfbd184786fab12f68e24529 WHIRLPOOL 980b72c0ca77429dd9eeef74583017828b6469c8fa4a5bcabe4da99966c3b5c3e01e308acc985e9c402232155adb5b257e8d8b06de9245388cf2f0bcf5052dea
-MISC ChangeLog 14589 SHA256 6295cefc3c7dcf6e39b341b26ff98dab60195f175bb0344bee078ad7691bc300 SHA512 b703f5c697b84c7ec903e56286a42f6c4f5b412b111cd008a52011f861a26775c4c6b23d2f1f4409c2aa4e53f7e1b028aefeaf69ef8bfc285b1cde06b37131d5 WHIRLPOOL c9efe02b0081d761a8851f40785568defe2ab392a7868327416c553c5efef66b4eccc85a9297357960afc8d0607eb7e0719f47d04c8bb2162b3fff506d7bda2d
-MISC metadata.xml 1098 SHA256 103de0cc76a2f1540c57873d38f2bbe76ea02c0efa3d108348eff92b309a0036 SHA512 ba384e1b1b34b6d624f2da68a6b44cf10e0fc513c8a5f09ed513a7d80b35ce96f83cb6ff79134588c400075b5740bb6f64f47fe5233702f99a90e55935aab329 WHIRLPOOL b1bcc98042d4255b6cb559e0a95033c8c035567dc1816b361d020cfa34c8cc904f03c46735c21b3bd482895734b884738a59dccdff6332f1fd434f2dabe101be
+MISC ChangeLog 14785 SHA256 be02f8c16caf319b0d39c1558921d55f5fbbca7bd2411dd3da1949965535dd8e SHA512 7674b67511e9218de2a3f5bc2ef740ebec6bfb6beecbac706d4f2f5f6b370494ff5afe11c770f47f573cdf023eca3f62be7576bd43846adbae38766ca80bbb46 WHIRLPOOL 1d6825f57554a256c21b934ec948beb3443ce1a6bf62fab92232595ba2fcd74cde994b08ec313ef554fa1203508262ff470e12bb9f28b3879e27869ab61064f4
+MISC metadata.xml 1022 SHA256 c88c4c36b75643d7ba202b48f9f0e806305501a9fc4774b89af536afd0ee3f91 SHA512 d6ac690696a4643dcf451963ecb5c591fb9895e3326141e574edf2471ee88a8ada8d1c6bbc338f5318061b5bf95655f7f6d637c0d34877f846df6a2ad769f766 WHIRLPOOL 15eb0396e2998a65a3f1e7ffd117740f96002d5fc6f9ca848756ea54a0e4dee6dafacb253ad809b495a91a1f537fe9553fb7a83a4ef66003ce11b457c9a544ad
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEARECAAYFAlAVaJcACgkQuQc30/atMkCqeQCgmnxL4ZP/ct4pdC1AKuhVtaol
-8qoAniOS75bySi2+rbDOzx9oxniD97E5
-=E+9Y
+iQEcBAEBAgAGBQJQFlfTAAoJEEdUh39IaPFN4xYH/R7mvPfmNy/STFoDRgXU0APN
+ZYj7ljktfIc8bM1m1s4nbOIsporG4yCILAfdejBqSq0xX4kpO9SK+wAbpqmZCyHz
+LCeaTKYmq6PfJRm6A9NxQDh+flkmsRJ3U7VbNFUVde7up4cN9Gbmt50meigFPAVY
+B0jqKFfeS8GjpBKl2ey3EfEzK8nZe7JOb37zHCWTEX3fPaT55xPOCu8DbuxdCyxz
+prX+3B8huS3GreIkICPJjzAh3gyysgLcmKVqmUp7ZRg25GKZwqVJDfMMJF0beTQD
+nbHn0P30wBNpVt4g9rxp24OW7C1+LSijzPhRFCU7+//5AtrLoTZAyT+aYfrCAQs=
+=y5dH
 -----END PGP SIGNATURE-----
diff --git a/app-text/stardict/metadata.xml b/app-text/stardict/metadata.xml
index 57e7a9eaf2cb..9a88150c96d4 100644
--- a/app-text/stardict/metadata.xml
+++ b/app-text/stardict/metadata.xml
@@ -9,7 +9,6 @@
 	 as Full-text translation, Net Dict. 
 	 </longdescription>
 	 <use>
-		 <flag name='editor'>Build and install the stardict-editor utility</flag>
 		 <flag name='espeak'>Enable text to speech synthesizer using espeak
 			 engine</flag>
 		 <flag name='gucharmap'>Enable gucharmap dictionary plugin</flag>
diff --git a/app-text/stardict/stardict-3.0.3-r1.ebuild b/app-text/stardict/stardict-3.0.3-r1.ebuild
deleted file mode 100644
index 7f396a8bd1ba..000000000000
--- a/app-text/stardict/stardict-3.0.3-r1.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# 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-r1.ebuild,v 1.6 2012/05/04 03:33:16 jdhore 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.
-
-# NOTE: Festival plugin crashes, bug 188684. Disable for now.
-
-EAPI=4
-
-GNOME2_LA_PUNT=yes
-GCONF_DEBUG=no
-
-inherit 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
-	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="editor espeak gnome gucharmap qqwry pronounce spell"
-
-COMMON_DEPEND=">=dev-libs/glib-2.16
-	dev-libs/libsigc++:2
-	sys-libs/zlib
-	>=x11-libs/gtk+-2.20:2
-	editor? (
-		dev-libs/libpcre
-		dev-libs/libxml2
-		virtual/mysql
-		)
-	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 )"
-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
-	virtual/pkgconfig
-	sys-devel/gettext"
-
-RESTRICT="test"
-
-pkg_setup() {
-	G2CONF="$(use_enable editor 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_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
-
-	gnome2_src_prepare
-}
-
-src_install() {
-	gnome2_src_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
-}
-
-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-"
-
-	gnome2_pkg_postinst
-}