cleanups for last 2 commits

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

diff --git a/app-text/stardict/Manifest b/app-text/stardict/Manifest
index 00bd726c6a67b06595cb6f1450f920d955ef06e7..cd3fd64327c987ab07de31bd80991c3178806a37 100644 (file)
--- a/app-text/stardict/Manifest
+++ b/app-text/stardict/Manifest
@@ -21,17 +21,17 @@ DIST stardict-3.0.1.tar.bz2 1964195 RMD160 296d73bd9acdbb53c21a4fb17e608a25f01b7
 DIST stardict-3.0.3.tar.bz2 9147947 RMD160 4c63f3cf439a7c34829b371e75c16db97fb35fd1 SHA1 5043c0918963cd4d40e6d6289353f295766ec74f SHA256 9ba10a5b3dcdd02b81c7a138dac15903a6bc2355856f60338f3775e371472b73
 EBUILD stardict-3.0.1-r2.ebuild 3022 RMD160 d75d427d66563eb47d6950e78175ffac644b9f20 SHA1 013fe46caed49f9dc936f4a1d75ba4892f0bc807 SHA256 20830c859142f16a68d0e577266b3c30225abb8d8755825f623c76d52b3d94fc
 EBUILD stardict-3.0.1-r3.ebuild 3103 RMD160 41155f59f3fd97eab8b3f126d7f13d0ddc0f0ac8 SHA1 f2d8258dd8dca1e0a674442e25f5d01fa396dbfc SHA256 8083f1ba8062d4dadc2026206202e65977e79b9478bb26dc6597329228775361
-EBUILD stardict-3.0.3.ebuild 2950 RMD160 6eb3475b0babe3fe6de4a0e3a823bf27c8fa589a SHA1 5179337a8e2af7a05831f8891d3426a887258fbd SHA256 e2db0d3a0a3d604f5fc60f5564ec7f4088c0a26681ae332e8423bdc7b0927833
+EBUILD stardict-3.0.3.ebuild 2959 RMD160 b66cf5449619815b075a6e39d9fc7c74945e172f SHA1 97b840f21666818141106ca0a67074b1699f22f6 SHA256 5c545b1a0e9de1afa5a58ee2e6ae6b287681c83e86abd5713d89dd61bed0e735
 MISC ChangeLog 11726 RMD160 c60217e428caf6ba631eb10002f031d2d64adb05 SHA1 4d484df04ad135104261929da9d19a8e89dd5014 SHA256 949a99a951fa7a7b4ad461146bf3d85e18eaaec1c8ccdd57c60ad6a75164743d
-MISC metadata.xml 1095 RMD160 7efb9c133d3ccec819d92589682009ed42d6c0da SHA1 28d771674c12a2943fc4b7d129328475cd0d9ebc SHA256 6efd7622d5daf308d3bc645a3c69ded6f7004d811f201897416a8557ea7b723b
+MISC metadata.xml 1118 RMD160 61e3ee3d4ea189024ce2f7fa5c59ac8b758cae82 SHA1 755adaa6d7aad1cea44eb4de65df3156adc59a46 SHA256 c6f8ba52202b6c8383cff2cd2ee0f4fda1a29c9019488fd1cb4369ef400a95a9
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQEcBAEBAgAGBQJPCdVZAAoJEEdUh39IaPFNSfcIAIHCUUrpv3yL9q7rE0YpZ8AZ
-Ix4FukMMeU2kWiD9MqE+23kVEsQXF8n475aWHTgX4toQmaRNMCiN6dzqRFhyRNiM
-WP64PzwFFE3odETnYWERHpyMcHCEgKaabOGqrWO3T84Sj/NacUwGfbEFC/snNwUo
-Hn16rhzvQ4rE2jRF2bRV3Ti45RAGkKjun/1diQRphNVgsBPJyVggYf5tmgBXLHjT
-R6EFv2ErrPX2OJsh3UMio6wrXOf7jf52TXUtBZ8igOgjrD7s0kOkyh4/VtmN1qsp
-E3RBA2rnGHvdvfi8vkSM78EL5dMp2ZZlJ0OS3oibK6dnGfy2V5ePQEp6slsFM34=
-=sa7Y
+iQEcBAEBAgAGBQJPCdYKAAoJEEdUh39IaPFN4MsH/RrqmqWP6XbPQfmETvrFiZWr
+RzFUuLExqwSBGYx752K2XyKtK6ol23YhS5NTF2PCJh9DOGbYRPWX8IOXKDoSnRpd
+1GBspE8LDCEapMq4E7qhM1HdajEwv40KpVX3Z49W+75Lkiy0y/Ens0jomsSGDb1G
+RH0FuXjGTi3H+1zlbk23zJZnnMtR3bD55JC6jYCAN+AWTGtIGuxbaEpZnu6t5zeu
+LLULQvBhcIFMRCF1mlSag8tCO8q6ZdB0Z9j5JY+NQn11/8LTrRVvu42i0BQwnHEM
+1wptT4BNpbTV1aFZQsQSxSKeiklDhFqGwGEhTFFAKgs36ZzubmhJixZPVb2d2oo=
+=gG+2
 -----END PGP SIGNATURE-----

diff --git a/app-text/stardict/metadata.xml b/app-text/stardict/metadata.xml
index c1f41ef6ab9fef625e91aba0fe8d866d48ab17c9..d21237818d52c0e4a4b39712f15265eb0cfdf7c1 100644 (file)
--- a/app-text/stardict/metadata.xml
+++ b/app-text/stardict/metadata.xml
@@ -9,6 +9,7 @@
         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='festival'>Enable text to speech synthesizer using festival
@@ -19,6 +20,5 @@
                 <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
index e76644820eb88de4b85d8be898fb94a3fd39b66f..acc691a08142fb253f55212569810e8000044f56 100644 (file)
--- a/app-text/stardict/stardict-3.0.3.ebuild
+++ b/app-text/stardict/stardict-3.0.3.ebuild
@@ -1,6 +1,6 @@
 # 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.2 2012/01/08 17:43:03 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/stardict/stardict-3.0.3.ebuild,v 1.3 2012/01/08 17:46:01 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
@@ -18,12 +18,17 @@ SRC_URI="http://${PN}-3.googlecode.com/files/${P}.tar.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"
+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
@@ -32,12 +37,7 @@ COMMON_DEPEND=">=dev-libs/glib-2.16
                >=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
-               )"
+       spell? ( >=app-text/enchant-1.2 )"
 RDEPEND="${COMMON_DEPEND}
        espeak? ( >=app-accessibility/espeak-1.29 )"
 DEPEND="${COMMON_DEPEND}
@@ -59,7 +59,7 @@ src_prepare() {
 
 src_configure() {
        econf \
-               $(use_enable tools) \
+               $(use_enable editor tools) \
                --disable-scrollkeeper \
                $(use_enable spell) \
                $(use_enable gucharmap) \