Version bump and add optional numpy support. Thanks to Corentin LABBE. Bugs #532608 and 528320

Package-Manager: portage-2.2.15/cvs/Linux x86_64
Manifest-Sign-Key: 0x09BF4F54C2BA7F3C!

5 files changed, 63 insertions, 16 deletions

diff --git a/dev-python/nltk/ChangeLog b/dev-python/nltk/ChangeLog
index 163e5fed5a87..ca6f832d27db 100644
--- a/dev-python/nltk/ChangeLog
+++ b/dev-python/nltk/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-python/nltk
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/nltk/ChangeLog,v 1.16 2014/04/02 15:14:13 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/nltk/ChangeLog,v 1.17 2014/12/22 10:17:58 hwoarang Exp $
+
+*nltk-3.0.0 (22 Dec 2014)
+
+  22 Dec 2014; Markos Chandras <hwoarang@gentoo.org> +nltk-3.0.0.ebuild,
+  metadata.xml, nltk-2.0.4.ebuild:
+  Version bump and add optional numpy support. Thanks to Corentin LABBE. Bugs
+  #532608 and 528320
 
 *nltk-2.0.4 (02 Apr 2014)
 
diff --git a/dev-python/nltk/Manifest b/dev-python/nltk/Manifest
index 52308382dcba..9d56d1e773ae 100644
--- a/dev-python/nltk/Manifest
+++ b/dev-python/nltk/Manifest
@@ -5,20 +5,30 @@ DIST nltk-2.0.1.tar.gz 949079 SHA256 c69b1e7a2d3e1da8334b3760be55cae4d0a8108b748
 DIST nltk-2.0.1rc1.zip 1095096 SHA256 ab26d1a93b783c26bd234ecaeef250b8a5f35b601810d0b78e24c52e749627e7 SHA512 a3b414349f1ecdc422a6181daac65b904f3654046eb4b6ff41c43a2048c727bb90dd28597b027eafa7c9aa064c17af2140182602ccd81b512a778af44150e5e2 WHIRLPOOL 1a5e02b8f6c4339272865ec8dff14bd495e7e7396e0566a291106c22348a160299d999e5bffa2a1521af0fbee4f5dc33e83d3969b396b6aa40821d3e4692ead3
 DIST nltk-2.0.4.tar.gz 955978 SHA256 a554d6b9c5c7c8b597a090d8848a6f78c6fc4665ae43c9a6a6d6a5b207d98c65 SHA512 1a1923f8819016926ad37337077a87782b1b244eb52c93b0b977946a3549a82b8b0cc4eb886f801d283b6df6f55fa8020db435dae9303371cda1dc1f8c40bc88 WHIRLPOOL b0affed720034261de343c4f7a09cc1a977e695ddeb7cd592d3d7b7c960728025336b8ece5667dda090593498d33d4e64b05b1bd3d8336e0f487d5ff2da82f80
 DIST nltk-2.0b9.zip 1043217 SHA256 bdbe3503f22d0766054d920a0b8d05697dcd576540231c2b6a4949ad5c9281d9 SHA512 5af22190f07a16873a522c41a7ef4ba5130f22d06d623ec85b9fd24c787e41fe3a10c69fb05c41a0c4fa5dd4478ad56ea9f5edeb6cb7e4be475c457e951e9f4e WHIRLPOOL 8c189a60112dd679ed966e179d44dd295ec9c0c96c7628c6eb49ae8a1f02af0f85ca7a7afc3b9a97619db8ff2714b55ff32c2bf11ad030fd76f2b4696782a2e0
+DIST nltk-3.0.0.tar.gz 962855 SHA256 ddfe202ab2d2aa270477f3c9658565d9759bd23be4bb6793cc3e02729e90f039 SHA512 e76c228a457a503af07e6219d60852411be0dfa8865fa408f493fd7012af0479f6b500645a3f3bfdbfaf64285dc8dd9b5f865161f8fe8822fb81662917c78fd6 WHIRLPOOL 1c17ead0578f81baf09019afc539bd8f4d35d1c16e06185222e45ca27eb5362ac46ab0f7cb4135d3250d87a3ed9e56d3f7cd5c823e2f663d75501ded9174febf
 EBUILD nltk-2.0.1.ebuild 677 SHA256 be93a4a8c55526abb76d023080c826e158f8ff65719a1049e460e711d7b04f9c SHA512 9b5cd3ab9156c282d6198b50241e7191c771a8ce1cbfe19ce85fecb5dcdc83e01d842e0af82138d12cbeea527783e69f29e41e918ca30f3e0c1745d664f86fa3 WHIRLPOOL a5608ac98962be47d6889f6c34e2de6fe8c87f9f540afe50ef86ba3c24cb4f658240572938bff20b761b8bd2de3d5441c57d4ed3ba6fdba65b00355f44e75a2b
 EBUILD nltk-2.0.1_rc1.ebuild 698 SHA256 ad46357956606040198f3572298e47e8129ca1f5d10cabdbbda91282dee52973 SHA512 d8996c73699d1cc3d397dced885864e11f1b18e959fd6d971b17ee1c5f1ca6bf67ecf572b28b68913f5670c34e9aef70ea4b1f0f89e8ffe419a0a17178b07ed3 WHIRLPOOL 5e3635d08cdb4508344f913f2387c9f4bd724aa8c862316f9cedf44b2673f01e652df5a0771836cfba3d27ec25c9dd19027e983f67f86737afcf35ec8bfaccf5
-EBUILD nltk-2.0.4.ebuild 686 SHA256 3da0d693f4da42209627e91d5305e33733a3c967c7e77e4b7126d9476ff52b6a SHA512 774031fb06ab6e54acd04d8cedb572c86640a1b5eed7b6ce58d4e8d21a8805d7b509342c7a0408a6f111571e122ad74f97818e14a47ceb757a22f44865626355 WHIRLPOOL 3e517fc729c0aa5063eae670d5bf2f3a31e81dc0702fe813856373e0d4246f56ee2d095366495aa69edd6a2095025504a20d4cc3c60246295deadef849412e16
+EBUILD nltk-2.0.4.ebuild 715 SHA256 365f0feecd699ff1cb0b639c51ad815e34db3bee2bb7fea010669d8ee789fa2f SHA512 124eed9bae44d0b1e566d04f3ce5c377c1b3acc1c267ab1fadc6a008fa454fda2ecb53c4af98c354b1424c004f54227e9d70a42d4743e01be18620d3a2a334c2 WHIRLPOOL 188088168dbf4f0270291b0dcbd75c64d0fc60ff7ee2795eb4d1e5b0b8e5f0debdeaf982e0ffd6d747d32a12b31c6a84f69d152ff00552af55babc41b08e1657
 EBUILD nltk-2.0_beta9.ebuild 697 SHA256 1358ce0da2ad4c64164d5ac142c1f4fa27694eee2c908cd1ca2aaead84d5e86d SHA512 bd749142ebcbcd49669ff7c9ed7a62b8d7604f9b4bfdca56afea8b8c37999c069cc975c21aa6e6ae211c6c41b7e0584f57160dd28e639c94d236e9a6c7927126 WHIRLPOOL 7e398ece66c8f997f57b29bae1e43ff50e2586f2c695bed81c50f4edcc5b2e45de171de491227c8357028d46b68f4d915e9e701a38567987cc01fc07e7b07b27
-MISC ChangeLog 2146 SHA256 2cabeaa894823a3ef051c90757b550c0416a8b81fa33e95f0ddedc12571ee401 SHA512 18557c33d05c4fef39bdaf981c509afa9f135f9f8f87c0e1ae21f21b9fd81070b0c806fcf920336d5c33e01636efbb301ff811c1a324863aa50f0402cedd7397 WHIRLPOOL dfb9a46fc839202daf9176d005e15a5a230645ef1238f2f9804d0b8c966d30e625b1188bbe7673620a8ab9f9958f926053fee629e278ef2fbeb78a78c54967d4
-MISC metadata.xml 439 SHA256 89a054ec1586a89c409976e9f918a6f79df71cdf36dbf7ab3b66ca63de1ed488 SHA512 69d760f93b9a69a8a1ecb1cd6eba4c6fe81423570a0d20a61e85322748d7fb5f69434c2cbcf16f696467a49b33a584bce944963f0016bc93235e35d1ddd94d04 WHIRLPOOL c5b275e77abb9009486fb800847a90b4718edc011c7ce8a581434abda4c27ffc478cabd1a90b4fe82ee01df5437ae88dd1b4f762e89a4587e7553972039c3df2
+EBUILD nltk-3.0.0.ebuild 719 SHA256 e3785b9793dd48ed3b9adba42ded6989d6436e1fccad6e511b83e00d50f9cd3e SHA512 b7d8a704053db1c0f459f41eed4f600975ac080af1f4ba0a2f2876c90eb83f61803892a7f66dee27fb117111d928b4e1f099a97f0d6be8d4718e7c1a9b6b909c WHIRLPOOL 2e9301536bac22af3d0203da60e4fb1ff63b68b26b7276f7e24d791aa752fb55bdce5ba95af6a271fa98bd5444db0d640bf8dfa812b26d081407c62ea111e032
+MISC ChangeLog 2383 SHA256 6ee3af65fd65dcf2fb7dba1edc0d848892a8ff5dd794044a2f97071037168a26 SHA512 723fd20f7fa7fb8752ee40b1457e7a234652dc757544b12dbdea5a6fb4304a54c34b4147e1e6d4d8378df845837617918905a6722c2f09641e81790cb07674a4 WHIRLPOOL 66fc80fa0fb477bc2139f1116c3f97e732dda983cda0351fd9cf65e9261c612a662421eb4642e91f745ba3e6978df4663c485de98347b306eb4988c0310e2544
+MISC metadata.xml 521 SHA256 6b38364f411e7537d19393da14eb612336914b40b009213b4cf100dcf7be77a6 SHA512 1da99074e88943167a389e4399a91947484ee8d41df0688d89fbcca83c0dd6b0af9b89725b92a39903661d9b59061c5dfea484d626e9497e837bfb5e00488c60 WHIRLPOOL 9db6208df20a4bfc7815531d9d1dd4caa416c900e009d3c62a91c444d09c8697a8a7c71f5abc207a71d28d7c6b0210f6b7d0b8a1b4b2016b61c211697350ec5b
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2
 
-iQEcBAEBCAAGBQJTPCktAAoJEJWyH81tNOV9fzoH/jmhe5NRYojOtIX7ApUfdCpB
-poyV8+BwJvcNyvJkr8jCTN0CZL7yrDfRLUosAP1qsG8mIH4om0rISFELSLTuZ8W1
-21ddRCxz5qiw7V6suctjtcz3j0lPLMO6VUWtQaBj2AyPHrCsncH/0QLsdPtm3t5h
-ZWgfQZOGxu0/ETzWrTT0fBpfV6n5Bhn15VnbRr75QwtxPXEIWe1+3KUiJ+5dOohE
-u9iOmY1rxYLtcEb6qmmZDey3DJP3vtZnRXFy8LMSkIgZ3M2uk2elWytxHNby0Y6d
-DqUoRGcOc5W5+OsxrsdGtxIf1Ge7ctIqWAhugeNJ9Omf2anw+BKipjqDCIKVckM=
-=ottc
+iQJ8BAEBCABmBQJUl+/bXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQzNTVDNDczOUYzRjJEMTRGNDRGMzU2RkMw
+OUJGNEY1NEMyQkE3RjNDAAoJEAm/T1TCun88CCAP/1qRBSWVgQ9XVZ5bz2NCPUCK
+XiWA1VqMEJbJjgSxqWGpxgrrLrBq41xmzKHIkNawiOR8SYubofyf6NVk+GX4A/s+
+dcQS7FGEVlJPxQl1yqO2OCVSU5bweCybFysDzU8LsIih3n2r4Lz0jmCDRq4DxnQZ
+iCEkOXuEXVx1lGCsGpWaY2LH9sI1fDy2+n08udZiJ4BJGIVUgI7rLo4lW7w0CD7D
+05k9Pno0fOylgbSYfYrwwHNm5UPOLfCamZoW9eZnr3kD2HII8V+5/hmXIKxYgYkq
+YzUd4XEnjd3aCqIhRrVYS2MzCFp6bbYfoDVRM6MiYmvKMRdXD10YfF6EPgKpxD8h
+/Tzh9ZDYjvk9P8H99tbErctVFqc7LPaqWiq3Cmo0NUbBLgtps3ZTMZaboxfjJLco
+hOvp3rlD6QXFDT7IiVDYfD0rB2tMXmsIJuOIOr0Y6BTtShpCjguA32Xp9EQFrwva
+aj/+bio4IOl8RmN82lRSjTzs6QVY3OQ0oIx5me7zwDCvWdd5oxkf6udFl3E5tE+P
+rr5r7PW6tKBl5zwTjEgFtxsdKj5PCzRAA5oD3Gfe6P/x13dnd9jvEeP3w55gGmRr
+QjJ43OXoWVBGltupOiYmCerkQQnN3qbpASrIB5ZgO2abrP5FzRu+L4eWn+qtv7ml
+15+uvXP7gjkPF3CvoEGi
+=SuI/
 -----END PGP SIGNATURE-----
diff --git a/dev-python/nltk/metadata.xml b/dev-python/nltk/metadata.xml
index 4830f7b32dc4..56c7faa75e74 100644
--- a/dev-python/nltk/metadata.xml
+++ b/dev-python/nltk/metadata.xml
@@ -8,6 +8,9 @@
 		<description>Maintainer. Assign bugs to him</description>
 	</maintainer>
 	<herd>python</herd>
+	<use>
+		<flag name="numpy">Use numpy for the saved word tokenizer</flag>
+	</use>
 	<upstream>
 		<remote-id type="google-code">nltk</remote-id>
 	</upstream>
diff --git a/dev-python/nltk/nltk-2.0.4.ebuild b/dev-python/nltk/nltk-2.0.4.ebuild
index c6a30405f76e..cfb292eea2a5 100644
--- a/dev-python/nltk/nltk-2.0.4.ebuild
+++ b/dev-python/nltk/nltk-2.0.4.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/nltk/nltk-2.0.4.ebuild,v 1.1 2014/04/02 15:14:13 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/nltk/nltk-2.0.4.ebuild,v 1.2 2014/12/22 10:17:58 hwoarang Exp $
 
 EAPI="5"
 
-PYTHON_COMPAT=( python2_{6,7} )
-PYTHON_REQ_USE="tk(+),xml(+)"
+PYTHON_COMPAT=( python{2_6,2_7} )
+PYTHON_REQ_USE="tk?,xml(+)"
 
 inherit distutils-r1
 
@@ -16,9 +16,10 @@ HOMEPAGE="http://nltk.org/"
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+IUSE="numpy tk"
 
 RDEPEND="${RDEPEND}
-	dev-python/numpy[${PYTHON_USEDEP}]
+	numpy? ( dev-python/numpy[${PYTHON_USEDEP}] )
 	dev-python/pyyaml[${PYTHON_USEDEP}]"
 
 DEPEND="${RDEPEND}
diff --git a/dev-python/nltk/nltk-3.0.0.ebuild b/dev-python/nltk/nltk-3.0.0.ebuild
new file mode 100644
index 000000000000..40ccf7e776a8
--- /dev/null
+++ b/dev-python/nltk/nltk-3.0.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/nltk/nltk-3.0.0.ebuild,v 1.1 2014/12/22 10:17:58 hwoarang Exp $
+
+EAPI="5"
+
+PYTHON_COMPAT=( python{2_6,2_7,3_4} )
+PYTHON_REQ_USE="tk?,xml(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="Natural Language Toolkit"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+HOMEPAGE="http://nltk.org/"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+IUSE="numpy tk"
+
+RDEPEND="${RDEPEND}
+	numpy? ( dev-python/numpy[${PYTHON_USEDEP}] )
+	dev-python/pyyaml[${PYTHON_USEDEP}]"
+
+DEPEND="${RDEPEND}
+	app-arch/unzip"