gentoo resync : 05.12.2021

3 files changed, 36 insertions, 5 deletions

diff --git a/dev-python/nltk/Manifest b/dev-python/nltk/Manifest
index 174566e1a305..b8d52fbf59e4 100644
--- a/dev-python/nltk/Manifest
+++ b/dev-python/nltk/Manifest
@@ -1,4 +1,5 @@
 AUX nltk-3.6.2-metadata.patch 1166 BLAKE2B b87a79ec16da57add95b83857c285a1d3e4907b90e9a430750f2189579b9531d1d455837506f99251468a6b53a250e5d6ed1da298cffd1805f4818d7d303bc5d SHA512 d382da1e8cee0eef56c5e85bb4a57b7ee4f150a4f42043977351b940653eddec55e67d9c404b282f7591170a7f970648b496c88d383073f8b218fdd97323f121
+AUX nltk-3.6.5-test.patch 1178 BLAKE2B 18d498e60c47fab60eebd20ae8625d6a36235c78f538bf4f505fa84cec4f62c86ed187ac3598f6cc23b8b8ab0da3d4e55ace5a3b04b639431d4a33fbf987ece8 SHA512 f2333b42c1f744a9cf69d0048b1b56f26735da427b4669c27121b6418d116a3fc25cba92141d3d5f8f890eba683afdf6d92cd6296518928d11e0ea791b79ce20
 DIST nltk-3.6.2.tar.gz 2819833 BLAKE2B 9796822c35c524432e9790d0890b4388fbaa85b659e5415037422a22e8edbaf20775196b4416f441d62592b387066de9f7741b988c0d463349fc5c906bfd75b2 SHA512 3fd2cba52377613f35f6574f859482de987f969cfc8d4243a859be365ab1bd8300f9013dcedc6caeff7aa7fc035b331a47b557027209ca9a85b0cc7fbde44d6d
 DIST nltk-3.6.3.tar.gz 2824924 BLAKE2B fcab6647f43f4bf139857e9f4202aee688f564851976ed6a183e47361451fae771318346724e41f198b82cebdd5a47f151aaf932099143ef6faa2a77430fbfb4 SHA512 fe7244967df018670501304d1a8aa50a0f4d42bb0c73cc5e202eeab6a0f5da1eaed9b961f6026e3b8ae4b0393d788bcb58b263ba22a3ce6f5644022736035f98
 DIST nltk-3.6.4.tar.gz 2828051 BLAKE2B f757c9c6d0b5ab6105e90e1a46fc6671d5f661f9b1b58026ccb43c00ff4969a98cbc2005670e0a81218ef4d18e45c37bb380c53be4ca60984344b11a0c8dbc54 SHA512 ba9acaa596c7f9246cd2f8da37b58146021dc2c246306fab68a37ef833a5a346b1aa7033d43b9e72b52aeda1cf8e303c7c690d1ca439f6f58dc673aa63a37298
@@ -6,5 +7,5 @@ DIST nltk-3.6.5.tar.gz 2830237 BLAKE2B 9396e916fa847af727f1ca52075aed0bf70826651
 EBUILD nltk-3.6.2-r1.ebuild 1634 BLAKE2B 85e25a760e7c94b0b4cf463d7ab89eb34a7d235a984dbed139da6cc0f151449f670a46edd3831e7866c16a37aa3fd569aac82317ec5b07bea00712f35c83038c SHA512 02a73f3ec7e43072b6200f9b65e28a1bbdc63efa23ee79508c8eb3caa25aa7f265562561ae54bf9e35dcc92e52ba98b698e89f82303949da016186c1fafb9602
 EBUILD nltk-3.6.3.ebuild 1588 BLAKE2B 8f84fa992e8b0c66338d34f070525b0dffb12ee67db46afee7f15e9816bbf543f1545e011b033baca9b21b162d2b1a11d7b9377fd638a92810d899657f51d53d SHA512 a56930b8055184d820bdbcd2a3bcdbe056957d9707319b31b0282514471a41ca539e406da318001b647e2b50daa1ed075eeacee529270c58969ee9570522f0b3
 EBUILD nltk-3.6.4.ebuild 1588 BLAKE2B 8f84fa992e8b0c66338d34f070525b0dffb12ee67db46afee7f15e9816bbf543f1545e011b033baca9b21b162d2b1a11d7b9377fd638a92810d899657f51d53d SHA512 a56930b8055184d820bdbcd2a3bcdbe056957d9707319b31b0282514471a41ca539e406da318001b647e2b50daa1ed075eeacee529270c58969ee9570522f0b3
-EBUILD nltk-3.6.5.ebuild 1588 BLAKE2B 8f84fa992e8b0c66338d34f070525b0dffb12ee67db46afee7f15e9816bbf543f1545e011b033baca9b21b162d2b1a11d7b9377fd638a92810d899657f51d53d SHA512 a56930b8055184d820bdbcd2a3bcdbe056957d9707319b31b0282514471a41ca539e406da318001b647e2b50daa1ed075eeacee529270c58969ee9570522f0b3
+EBUILD nltk-3.6.5.ebuild 1573 BLAKE2B f7a727c64cfdc6304534c42311cea15e3111dda24b6aed909a12b2be8acb994a7e3fa4352e8422ac1855715615aa1a33e823d8f818dd259b02de950886859efb SHA512 62b52f1a52bc7ef661a592ecdd867b7a6782db4c38d12a9f4ca5162976fd2d6ecfdb5f2e24ab82602505917ed2340ff21f0bc86ab43ba0f1b432dd694e28f387
 MISC metadata.xml 430 BLAKE2B 9c67c091a126c4af98c56de2d8227c1da65fbfad00671825642daefa117d711475b804bd90d72345e43d519a9219e195c1de1579dd6d60f6663c9813fc9c0d81 SHA512 5707c61031544a51e298d9c4c70685011f06b9d65c2370ecba6ecc23491c92fcc30988b6c0c28cb16f21eddebe412fff978a8f9661e5e95b9cff249f81420018
diff --git a/dev-python/nltk/files/nltk-3.6.5-test.patch b/dev-python/nltk/files/nltk-3.6.5-test.patch
new file mode 100644
index 000000000000..ea4d9512fa74
--- /dev/null
+++ b/dev-python/nltk/files/nltk-3.6.5-test.patch
@@ -0,0 +1,28 @@
+From 9502cb3b5e43a787a16bc2f63ec34c69f9b151c6 Mon Sep 17 00:00:00 2001
+From: Tom Aarsen <Cubiegamedev@gmail.com>
+Date: Tue, 19 Oct 2021 16:49:36 +0200
+Subject: [PATCH] Skip doctest for printing out stopword languages
+
+People with outdated nltk_data will fail these tests, and this test is very vulnerable to updates in nltk_data
+---
+ nltk/test/corpus.doctest | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/nltk/test/corpus.doctest b/nltk/test/corpus.doctest
+index 536ef452f..47a6fea2f 100644
+--- a/nltk/test/corpus.doctest
++++ b/nltk/test/corpus.doctest
+@@ -385,8 +385,8 @@ examples illustrate the use of the wordlist corpora:
+     >>> words.words('en')
+     ['A', 'a', 'aa', 'aal', 'aalii', 'aam', 'Aani', 'aardvark', 'aardwolf', ...]
+ 
+-    >>> stopwords.fileids()
+-    ['arabic', 'azerbaijani', 'danish', 'dutch', 'english', 'finnish', 'french', ...]
++    >>> stopwords.fileids() # doctest: +SKIP
++    ['arabic', 'azerbaijani', 'bengali', 'danish', 'dutch', 'english', 'finnish', 'french', ...]
+     >>> sorted(stopwords.words('portuguese'))
+     ['a', 'ao', 'aos', 'aquela', 'aquelas', 'aquele', 'aqueles', ...]
+     >>> names.fileids()
+-- 
+2.34.1
+
diff --git a/dev-python/nltk/nltk-3.6.5.ebuild b/dev-python/nltk/nltk-3.6.5.ebuild
index 11dd1a3283d2..43948dca5fb9 100644
--- a/dev-python/nltk/nltk-3.6.5.ebuild
+++ b/dev-python/nltk/nltk-3.6.5.ebuild
@@ -14,7 +14,7 @@ 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-solaris"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
 IUSE="tk"
 
 RDEPEND="
@@ -33,20 +33,22 @@ BDEPEND="
 		dev-python/twython[${PYTHON_USEDEP}]
 		sci-libs/scikit-learn[${PYTHON_USEDEP}]
 		dev-python/scipy[${PYTHON_USEDEP}]
+		dev-python/matplotlib[${PYTHON_USEDEP}]
 	)"
 PDEPEND="dev-python/nltk-data"
 
 distutils_enable_tests pytest
 
 src_prepare() {
+	local PATCHES=(
+		"${FILESDIR}"/${P}-test.patch
+	)
+
 	# 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
 }