Use hunspell as default (much better solution than dict-based spellcheck) -> dropping hunspell useflag. Remove ispell as whole as it is way worse than aspell.

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

4 files changed, 32 insertions, 26 deletions

diff --git a/net-irc/rbot/ChangeLog b/net-irc/rbot/ChangeLog
index 4552e509cc67..f1d640ca9433 100644
--- a/net-irc/rbot/ChangeLog
+++ b/net-irc/rbot/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-irc/rbot
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/rbot/ChangeLog,v 1.50 2012/04/18 19:05:07 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/rbot/ChangeLog,v 1.51 2012/04/24 13:35:41 scarabeus Exp $
+
+  24 Apr 2012; Tomáš Chvátal <scarabeus@gentoo.org> rbot-0.9.15.ebuild,
+  rbot-9999-r10.ebuild:
+  Use hunspell as default (much better solution than dict-based spellcheck) ->
+  dropping hunspell useflag. Remove ispell as whole as it is way worse than
+  aspell.
 
   18 Apr 2012; Raúl Porcel <armin76@gentoo.org> rbot-0.9.10-r1.ebuild,
   rbot-0.9.15.ebuild:
diff --git a/net-irc/rbot/Manifest b/net-irc/rbot/Manifest
index 4c2cbef2b20c..12792e3b6882 100644
--- a/net-irc/rbot/Manifest
+++ b/net-irc/rbot/Manifest
@@ -8,14 +8,24 @@ AUX rbot.init2 1446 RMD160 c02a5576ff4dfee7cc6158fc52c79d650ac04e8b SHA1 893ce0e
 DIST rbot-0.9.10.gem 387584 RMD160 a29dd55aa894fac89b2cc0a05f694df8c7e1489c SHA1 53c85bf45239fc572fcc6e4d68bb9601a0d5df6e SHA256 3433783e2be481d63072c5ef03dd4f61b09bee0520c306607ad1e0fa46b8a4b5
 DIST rbot-0.9.15.tgz 709338 RMD160 20a6c19d1c2addfe084dbb5accab468e29ca0d08 SHA1 643a931fc523787b85739f9b1fccda3948d0e15f SHA256 f5f41b6760ad22a7057cf81c661b93ad59152fcc94374ef2c8c0e96f821a7f0b
 EBUILD rbot-0.9.10-r1.ebuild 635 RMD160 fb5e24b553291d77498590004f1101beb5c0f877 SHA1 5ab395c0dd02fac91b06e69a19ecd2d022f11407 SHA256 937c69a442c3a6525164efa2a915e92b23d7656a05a0e127223c7088e36bfa1b
-EBUILD rbot-0.9.15.ebuild 4667 RMD160 dc6fd9a6d38c45cc41271203012c619e641000f9 SHA1 1c98925248125501f39136b6d00790192bbcfee0 SHA256 d04a62622fa4e0191e13c1f62f6f621a0f65d8a021f0206b186a694d3eb9cc9a
-EBUILD rbot-9999-r10.ebuild 4670 RMD160 b4e38244912719b1854245933091609ba3230387 SHA1 7290d08cc8c6838f3b178db4dcc970dfd9f1b184 SHA256 79f42b12a3c203eca49c0a5857621a913aee004eb08c1da7dbcad0c84626f588
-MISC ChangeLog 8717 RMD160 781cea94ce719c2636d3b23ff56f51bda1d22adf SHA1 f5fa390417ef3c92fc76b239b2a76fd23f60b423 SHA256 8a82539bac56c6b04b4445fa4e7556dd2e3061447e1ce4170a374311d08fca31
+EBUILD rbot-0.9.15.ebuild 4548 RMD160 500d5ac2e6ea0ef8e42c158f33623032a0769434 SHA1 f2e41d6ea880bad7904fa05d0f60cb4241785ad0 SHA256 8fcdefe7d19e39af29891fed3fcd9921ba17a36a79e7a0d79d5859750631ebd9
+EBUILD rbot-9999-r10.ebuild 4552 RMD160 84f472b21123b362e13dcd6d6b2b718e155dd12a SHA1 c9675dd000178948429a07c461bd5a09e756b8eb SHA256 07e4f681e83ae3fc29b0c0e2a7130284f6e190e79f411e64ce471c0332100b27
+MISC ChangeLog 8984 RMD160 c04de16e3f1194f6f6a19cc775c6e4d3b95a3109 SHA1 46f5a603e663c93ebefec2b063996aa599bcf471 SHA256 49721e3d276c5b2bb183ba5d8ffac997ffcf3a15fe65475f9dbe4ebadcc63fb0
 MISC metadata.xml 3129 RMD160 0fb1197e68e3cddb6f1a44f725d075c1370924cd SHA1 f93a2258e36b84336dbbbd347e0a222e81849a73 SHA256 1041e878f79c428834fcd1f3e3d6062e1f48223648c52963dadeb1eeb0a0574e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk+PEGkACgkQuQc30/atMkCBVQCfXux34ou2ehNz48Z7lEb3wAZ0
-2QsAn319Kw377Ijt4iSD76adifK9rbMa
-=gQ05
+iQIcBAEBAgAGBQJPlqw7AAoJEOSiRoyO7jvofbgP/RCOHjmbElsOuZkMnTJkOGC8
+nqSbMWWnrJ5geJ/Az5zxizsETCXpEyWmJ+8dvRb+pqIl1LUfDjLsFJVvezxxqHc2
+qjwqcZkcPpd4vrdELDrv0Ap5yUGuNuKe3oLXcyN1ngu+X5bN5H97vKiKEs50E/Ba
+720vbjTJ2pnT8pu3++QwZXQVPSfGmgFcqvlkcKeD6nv5nfcUw3MUwF3sSSEXueDU
+NkAZM5QXfvZVskJ/XvK1trHRcsEyr6uSdQe4XuTcHXF3cvX6xehB5hXBuXECkAyg
+4Lh7H9SZK0bEjFAPbNiBVKAjp/sqZp89rnLGTVNb5Xz3a4CFfTL//G/72tW+TFh0
++t1iVYqb5a7G48iybNJuslM1J28N7bdF4a+ThGMBUcDwdk9O9KMbWCBA1lcynagc
+Br5Eml0IVxGSiXLx9AtY4EpgFinbY6Rir89shX4a6rxs+8kyACWtMkTc5cmdL96R
+adENAVBQ8iewFKUUbwP8eoIVmak87jnmy1o2LTpv4PrLiHzNHNoMZZA48BfklHcb
+bnZ9vgMvCKF2LNSIGadgWApZWqZWGHt2bJtqgEDIHQDnt4zkA7AlP2jZtBtQgzqy
+unTmMQZgobtCfTQSZCsGOWDQhkbbaV8mJuN4XxnrZ9NmVRqRZd0IM5uTPiAqGiNq
+yhPY65xDuOwIoL1arM5n
+=G9zK
 -----END PGP SIGNATURE-----
diff --git a/net-irc/rbot/rbot-0.9.15.ebuild b/net-irc/rbot/rbot-0.9.15.ebuild
index 06a57244c928..a4dbbb1d505d 100644
--- a/net-irc/rbot/rbot-0.9.15.ebuild
+++ b/net-irc/rbot/rbot-0.9.15.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/net-irc/rbot/rbot-0.9.15.ebuild,v 1.5 2012/04/18 19:05:07 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/rbot/rbot-0.9.15.ebuild,v 1.6 2012/04/24 13:35:41 scarabeus Exp $
 
 EAPI="2"
 # ruby19 needs ruby-gettext on 19 first
@@ -16,7 +16,7 @@ LICENSE="GPL-2 as-is"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc x86 ~x86-fbsd"
 IUSE="spell aspell timezone translator shorturl nls dict figlet
-	fortune cal host toilet hunspell"
+	fortune cal host toilet"
 ILINGUAS="zh_CN zh_TW ru nl de fi fr it ja"
 
 for lang in $ILINGUAS; do
@@ -26,10 +26,7 @@ done
 RDEPEND="
 	spell? (
 		aspell? ( app-text/aspell )
-		!aspell? (
-			hunspell? ( app-text/hunspell )
-			!hunspell? ( app-text/ispell )
-		)
+		!aspell? ( app-text/hunspell )
 	)
 	figlet? ( app-misc/figlet )
 	toilet? ( app-misc/toilet )
@@ -73,14 +70,12 @@ all_ruby_compile() {
 			|| rbot_conf "$2" /bin/false
 	}
 
-	local spell_program="/usr/bin/ispell"
+	local spell_program="/usr/bin/hunspell -i"
 	if use !spell; then
 		disable_rbot_plugin spell
 		spell_program="/bin/false"
 	elif use aspell; then
 		spell_program="/usr/bin/ispell-aspell"
-	elif use hunspell; then
-		spell_program="/usr/bin/hunspell -i"
 	fi
 
 	rbot_conf spell.program "${spell_program}"
diff --git a/net-irc/rbot/rbot-9999-r10.ebuild b/net-irc/rbot/rbot-9999-r10.ebuild
index 2db75cbbf940..373e78ac7c96 100644
--- a/net-irc/rbot/rbot-9999-r10.ebuild
+++ b/net-irc/rbot/rbot-9999-r10.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/rbot/rbot-9999-r10.ebuild,v 1.6 2011/09/21 08:54:22 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/rbot/rbot-9999-r10.ebuild,v 1.7 2012/04/24 13:35:41 scarabeus Exp $
 
 inherit ruby eutils
 
@@ -13,7 +13,7 @@ LICENSE="GPL-2 as-is"
 SLOT="0"
 KEYWORDS=""
 IUSE="spell aspell timezone translator shorturl nls dict figlet
-	fortune cal host toilet hunspell"
+	fortune cal host toilet"
 ILINGUAS="zh_CN zh_TW ru nl de fr it ja"
 
 for lang in $ILINGUAS; do
@@ -25,10 +25,7 @@ RDEPEND=">=dev-lang/ruby-1.8
 	timezone? ( dev-ruby/tzinfo )
 	spell? (
 		aspell? ( app-text/aspell )
-		!aspell? (
-			hunspell? ( app-text/hunspell )
-			!hunspell? ( app-text/ispell )
-		)
+		!aspell? ( app-text/hunspell )
 	)
 	translator? ( dev-ruby/mechanize )
 	shorturl? ( dev-ruby/shorturl )
@@ -87,14 +84,12 @@ src_compile() {
 			|| rbot_conf "$2" /bin/false
 	}
 
-	local spell_program="/usr/bin/ispell"
+	local spell_program="/usr/bin/hunspell -i"
 	if use !spell; then
 		disable_rbot_plugin spell
 		spell_program="/bin/false"
 	elif use aspell; then
 		spell_program="/usr/bin/ispell-aspell"
-	elif use hunspell; then
-		spell_program="/usr/bin/hunspell -i"
 	fi
 
 	rbot_conf spell.program "${spell_program}"