gentoo resync : 25.04.2020

4 files changed, 59 insertions, 37 deletions

diff --git a/dev-python/nltk/Manifest b/dev-python/nltk/Manifest
index bac7758b33fc..0d8f2e4b8bdd 100644
--- a/dev-python/nltk/Manifest
+++ b/dev-python/nltk/Manifest
@@ -1,6 +1,6 @@
 AUX nltk-3.4.5-corpus-tests.patch 1625 BLAKE2B d070e7295ccdda93eae813de2ddd1c6ab3832722ddb815287cc1aa05ee5a3e6619be796d0dbc63a1c389a6f3a8b4eb9630564c2139bc636302d07c2212c446f1 SHA512 495179ae7ce022d1733508013d7a74c01f258a918047337b9d454bdc6f4a2b49a9fa2b77891a0af317ef6b1706802ab90e7c9bd2936fe5dc6f67371dd705c1f2
-DIST nltk-3.2.5.tar.gz 1188856 BLAKE2B 316e5955d2f90c351673ee9d3f0cc159babbcae08104518db62e796b422dcbf51668001b06b5d5dc399613d4db0ed39ff7dd15ad15d6f6c64e10c73a4d53bc06 SHA512 967b209ce3dde5296dafac16b91bff3894ff1a3f073c76974fd9193912597c82d2d1c50d4419052da77ab66f798f230f725b83f31368a95cacf94d46e45055de
 DIST nltk-3.4.5.tar.gz 2821481 BLAKE2B 9d3d6df9a951b4dfbfec335386ba0fb13c484c74a066141ebdfdb541fbec421dd72163d4028e239abd58f95a73e0eef5861574fa9955e4ee11f2c4598c895f59 SHA512 0ca24cd2154e47a8c50fe8e2426fa01c80904ece4100b07cdb4e5835e423e31968e96f0e750e1936f1e758a608596c560aaaee05b844b334f6179249db05f969
-EBUILD nltk-3.2.5.ebuild 816 BLAKE2B a52f29769758d3c96bd8a5c00b0264d945c18f7332c056efe8c0fcef2c6abdeea5f10b6502f5e47516b712f95f51d6f51a3395b3d2863479bc509b27cb26930b SHA512 7b7028ca38290e275a6436c3d1b69f884df1252f55c5d5af0b6f1c241371d2c214c46d08d0680b10fd57b63840dbd683bf32c1c6417b3ab569362b0d0b65d140
+DIST nltk-3.5.tar.gz 2805844 BLAKE2B d2494d831cf5503ac938b203e405ebae606166dbb907655113d3a5267bd54f03b6d8d5ac9e545fefd0b7855ce0c985064c9e746e402c540e19546e2d11ec151e SHA512 056ae219af607c158f1f2adc6fb9b4f402721778c13bf5ebc178deaf631142ad3e571d8b1fd96145067833cbeac4db25fc07c3fd032188c2d8ee7e5d7bd824f6
 EBUILD nltk-3.4.5.ebuild 1568 BLAKE2B 4b70352c021c9cbd1d18e38e0cf19ddfcd848071c849fcf6c3d22344d60ac1c1f13e9f364ada4dad5c2c7ac9e5ebbb018b8eacba205ef9b7d8380af8c57d4ebd SHA512 204776e7d1d90548be3e8acb4db7f09a98f53d55a25050300e434754197eb17241b9549079756a1b9e8c6915f875156f4176f4208f6350251f7d6ee366d69cd7
-MISC metadata.xml 455 BLAKE2B f7f64dd6f4755438db233c712dbde5cc3aae6f2cd154c207bbef0196569b458a8d26c35b92601e8e79af4cfee7f4f57029d9a892677c477a86bbd8c78fa1da16 SHA512 315f7c1822be51c6fc541323f0b977dc0bb60e129a6bd907cd47ac1247c88e906b3452f2ded4d2071c142fd1d710c674039c95036124177744ad68ecc5ca4bd8
+EBUILD nltk-3.5.ebuild 1559 BLAKE2B f40b0b1dc52d510c389085494ccc2246b5dca0ff21b66f622f0fcc51752011419c30ca2fff1e33ce3f27543b7d43b81f0893df21d50c67e9fe6a8dcd1a0faed4 SHA512 fb183a4935f1275d1d78170a0d295f7ea3fd20a245a238b637b562a54854f424f7a4a9c798d918d3f68ae5c768385db76e1421cf8a5859d95f15ead45d549ce3
+MISC metadata.xml 369 BLAKE2B 71cbdd71c636a0ad09350ff40d6f8852ccba6058d32b5ea7dfb2202d5909524fb78b4eff17b6af044ea65d67c67cb19cbc8fff1d20dcd9d4ed9906a0b5a49271 SHA512 7ee1d09e28699e68fc04a1ada4aa7fe091a1624cdf5e1be9568163829a0ae832bb26c58abb7509226c212f0d34d6ad549afb169a67167f1ae26b66ef431db65b
diff --git a/dev-python/nltk/metadata.xml b/dev-python/nltk/metadata.xml
index 4bca3859ebd0..7cfca4fc39ac 100644
--- a/dev-python/nltk/metadata.xml
+++ b/dev-python/nltk/metadata.xml
@@ -5,9 +5,6 @@
     <email>python@gentoo.org</email>
     <name>Python</name>
   </maintainer>
-  <use>
-    <flag name="numpy">Use numpy for the saved word tokenizer</flag>
-  </use>
   <upstream>
     <remote-id type="google-code">nltk</remote-id>
     <remote-id type="pypi">nltk</remote-id>
diff --git a/dev-python/nltk/nltk-3.2.5.ebuild b/dev-python/nltk/nltk-3.2.5.ebuild
deleted file mode 100644
index d683c2517e5d..000000000000
--- a/dev-python/nltk/nltk-3.2.5.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-PYTHON_COMPAT=( python3_6 )
-PYTHON_REQ_USE="sqlite,tk?,xml(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Natural Language Toolkit"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-HOMEPAGE="https://www.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 test tk"
-
-RDEPEND="numpy? ( dev-python/numpy[${PYTHON_USEDEP}] )
-	dev-python/six[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
-
-# currently requires linguistic data to be downloaded separately
-RESTRICT="test"
-
-python_test() {
-	nosetests || die "Tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/nltk/nltk-3.5.ebuild b/dev-python/nltk/nltk-3.5.ebuild
new file mode 100644
index 000000000000..c01b3203dde2
--- /dev/null
+++ b/dev-python/nltk/nltk-3.5.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_REQ_USE="sqlite,tk?,xml(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="Natural Language Toolkit"
+HOMEPAGE="https://www.nltk.org/ https://github.com/nltk/nltk/"
+SRC_URI="https://github.com/nltk/nltk/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+IUSE="tk"
+
+RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
+BDEPEND="
+	test? (
+		dev-python/joblib[${PYTHON_USEDEP}]
+		>=dev-python/nltk-data-20200312-r1
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/pyparsing[${PYTHON_USEDEP}]
+		dev-python/twython[${PYTHON_USEDEP}]
+		sci-libs/scikits_learn[${PYTHON_USEDEP}]
+		sci-libs/scipy[${PYTHON_USEDEP}]
+	)"
+PDEPEND="dev-python/nltk-data"
+
+distutils_enable_tests nose
+
+src_prepare() {
+	# requires unpackaged pycrfsuite
+	sed -i -e '/>>>/s@$@ # doctest: +SKIP@' nltk/tag/crf.py || die
+	# replace fetching from network with duplicate file URL
+	sed -e 's@https://raw.githubusercontent.com/nltk/nltk/develop/nltk/test/toy.cfg@nltk:grammars/sample_grammars/toy.cfg@' \
+		-i nltk/test/data.doctest || die
+	# requires X and hangs in Xvfb
+	sed -e 's:test_plot:_&:' \
+		-i nltk/test/unit/test_cfd_mutation.py || die
+
+	distutils-r1_src_prepare
+}
+
+src_test() {
+	cd nltk/test || die
+	distutils-r1_src_test
+}
+
+python_test() {
+	"${EPYTHON}" runtests.py -v || die "Tests failed with ${EPYTHON}"
+}