gentoo resync : 31.05.2021

3 files changed, 44 insertions, 1 deletions

diff --git a/dev-python/nltk/Manifest b/dev-python/nltk/Manifest
index 9d6c8093f088..d65d4fb33b03 100644
--- a/dev-python/nltk/Manifest
+++ b/dev-python/nltk/Manifest
@@ -1,7 +1,8 @@
+AUX nltk-3.6.2-metadata.patch 1166 BLAKE2B b87a79ec16da57add95b83857c285a1d3e4907b90e9a430750f2189579b9531d1d455837506f99251468a6b53a250e5d6ed1da298cffd1805f4818d7d303bc5d SHA512 d382da1e8cee0eef56c5e85bb4a57b7ee4f150a4f42043977351b940653eddec55e67d9c404b282f7591170a7f970648b496c88d383073f8b218fdd97323f121
 DIST nltk-3.5.tar.gz 2805844 BLAKE2B d2494d831cf5503ac938b203e405ebae606166dbb907655113d3a5267bd54f03b6d8d5ac9e545fefd0b7855ce0c985064c9e746e402c540e19546e2d11ec151e SHA512 056ae219af607c158f1f2adc6fb9b4f402721778c13bf5ebc178deaf631142ad3e571d8b1fd96145067833cbeac4db25fc07c3fd032188c2d8ee7e5d7bd824f6
 DIST nltk-3.6.1.tar.gz 2820223 BLAKE2B 74ae44376e8f59e4ccfd4bdb5d6f535a8480733a2fdc6a8f1117a551f64d9f6404ca237bd27cd4a4a9d32443d38179c7a1c824e00e808868d45e468ab84eb1bd SHA512 ab0e8abc938fa0bfadc3f02dc583749775a6c06d2d2ee30692ccd9c118277fd79cfed02f858d4347dacbe87f146cb8f9af1203a8d68685f131da5f6b127b86cb
 DIST nltk-3.6.2.tar.gz 2819833 BLAKE2B 9796822c35c524432e9790d0890b4388fbaa85b659e5415037422a22e8edbaf20775196b4416f441d62592b387066de9f7741b988c0d463349fc5c906bfd75b2 SHA512 3fd2cba52377613f35f6574f859482de987f969cfc8d4243a859be365ab1bd8300f9013dcedc6caeff7aa7fc035b331a47b557027209ca9a85b0cc7fbde44d6d
 EBUILD nltk-3.5.ebuild 1658 BLAKE2B b78651baeef0a8715ad9eaa33c7e8b240aa285a24e34f5e67fda72b2ec3021248a46e0de36a1d41f8b7debeca53515943bff736323071b0e3da625bca96c1c1b SHA512 1aa2310c120f22af4f5099de7b07ad9851da3bb732bf11851d00e29fc042302bd922d50c3f827b4753685c1e23dbc95740f9dd08d9c2ca0d941dfd7bd0b2ab40
 EBUILD nltk-3.6.1.ebuild 1620 BLAKE2B f6e0423ca7ac08bff5fa08ebc0013b4fd9975822c4d37b399943fc06bc79fbc99a99da8758d13ecf75e96771c209f00df2daa45ced7b768dd1fcbe929b66bb3d SHA512 86e1d0682913de2b7a5e9f9cdb631c230857353ca92dcfa1227df82459b7e67cc2cc871dfc3533970b24e6e7d6d8982bab1245c9f3faeca21ab00fa46d5443de
-EBUILD nltk-3.6.2.ebuild 1620 BLAKE2B f6e0423ca7ac08bff5fa08ebc0013b4fd9975822c4d37b399943fc06bc79fbc99a99da8758d13ecf75e96771c209f00df2daa45ced7b768dd1fcbe929b66bb3d SHA512 86e1d0682913de2b7a5e9f9cdb631c230857353ca92dcfa1227df82459b7e67cc2cc871dfc3533970b24e6e7d6d8982bab1245c9f3faeca21ab00fa46d5443de
+EBUILD nltk-3.6.2-r1.ebuild 1668 BLAKE2B 9ffd88dc5f8c27227920b90833678fb434a8db384eda00849b7fcb70920875debf5643ce9826a562a9a9c0404c75e27fb74808871412c887f746c764d2733a39 SHA512 7439225ac3fc2f0b0b2b4a674dac70ae0a830818f02222bd1cabe61b10eefd7c88a0555dc17c77dd7b4dfb59102b943075652d5c38835602451a1e8f5a7a699e
 MISC metadata.xml 405 BLAKE2B fe64d9154b1ae508bc30bf6aa0f5f6daf1b72f1f08cd9a57ac4421d93d889609eb1a656b8e95671e0235cbd8d0bbe1ddba1ec1eaa78d97b10d8cbff9225cc7c4 SHA512 a57e3953db801948b62deb294b66421e209c75995715d23483b75afe150144a821f0f88d4faad2564aed8bdd1ecf61153431c5f2fb8e42b6d017ec1c9762b3a4
diff --git a/dev-python/nltk/files/nltk-3.6.2-metadata.patch b/dev-python/nltk/files/nltk-3.6.2-metadata.patch
new file mode 100644
index 000000000000..32d4c183000b
--- /dev/null
+++ b/dev-python/nltk/files/nltk-3.6.2-metadata.patch
@@ -0,0 +1,38 @@
+From f8d834d9ac1e5b26f04cebd8ca6f07ed15935e70 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Sat, 29 May 2021 18:32:53 +0200
+Subject: [PATCH] setup.py: fix python_requires
+
+Fix python_requires to specify a valid version.  Apparently, combining
+>= and .* is disallowed, and I'm pretty sure 'just' >=3.5 means
+the same.
+
+To reproduce the problem, you can:
+
+    $ pip install nltk distlib
+    $ python -c "import distlib.database; \
+      distlib.database.DistributionPath().get_distribution('nltk')"
+
+which yields a (not very readable) error of:
+
+    ValueError: '.*' not allowed for '>=' constraints
+---
+ setup.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/setup.py b/setup.py
+index 49dc08098..7be160494 100644
+--- a/setup.py
++++ b/setup.py
+@@ -108,7 +108,7 @@ natural language processing.  NLTK requires Python 3.5, 3.6, 3.7, 3.8, or 3.9.""
+         "Topic :: Text Processing :: Linguistic",
+     ],
+     package_data={"nltk": ["test/*.doctest", "VERSION"]},
+-    python_requires='>=3.5.*',
++    python_requires='>=3.5',
+     install_requires=[
+         "click",
+         "joblib",
+-- 
+2.31.1
+
diff --git a/dev-python/nltk/nltk-3.6.2.ebuild b/dev-python/nltk/nltk-3.6.2-r1.ebuild
index d03c61527233..c11ff6910967 100644
--- a/dev-python/nltk/nltk-3.6.2.ebuild
+++ b/dev-python/nltk/nltk-3.6.2-r1.ebuild
@@ -39,6 +39,10 @@ PDEPEND="dev-python/nltk-data"
 
 distutils_enable_tests pytest
 
+PATCHES=(
+	"${FILESDIR}"/${P}-metadata.patch
+)
+
 src_prepare() {
 	# requires unpackaged pycrfsuite
 	sed -i -e '/>>>/s@$@ # doctest: +SKIP@' nltk/tag/crf.py || die