gentoo auto-resync : 06:12:2022 - 21:11:24

9 files changed, 17 insertions, 40 deletions

diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index 69ac5ecbf824..2820adf3fade 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/canonicaljson/Manifest b/dev-python/canonicaljson/Manifest
index 47bdcfa3c204..fe06c80bc87e 100644
--- a/dev-python/canonicaljson/Manifest
+++ b/dev-python/canonicaljson/Manifest
@@ -1,5 +1,3 @@
-DIST canonicaljson-1.6.3.gh.tar.gz 10400 BLAKE2B 9d97ad9f8c0803fdfd1f4d2f85291fb175d19be23fb9c3bdf717030b9dae30f810329118c484cdf9dab5d77f01ea41b08653559fa188c90305126bdf3f4e5f9d SHA512 4b2cb7524425b8a4dde2359273f60110ca01081d31b0add158f106ff1f8874366978d6a15baed53a948503d4013b87a0b75ad7f6e8ea6ce42f3f9fc95672280f
 DIST canonicaljson-1.6.4.gh.tar.gz 10408 BLAKE2B 4d55bb90cd4bbd5e019ffd0d505651c99dc6b296e9c0a52582265438586890cd6b663116ba0b66807b7a665c54eea001e039ca86c2fef9175b72a318a11a79a7 SHA512 7be1300c17d51f917b1e81931f6d0dd681b1eef9b7f4e82ba3ae683609d74fd924eb3a832c8261611f556c190329748966bf15abe34bc1d22f2ecdf29372b560
-EBUILD canonicaljson-1.6.3.ebuild 606 BLAKE2B 03a03d128b260bb43c081a6e70fc771d6478b2880d37832bc81fd52cc0e0b9a343273963c9d62634e2e81ec54b16a29f3dadcdaa6c636efb6457386c4ce05d2b SHA512 af5c6138a30308a8693104fcef490bf2732f60f7d97d753f3775ec15fc2ce2bc128e136bbcb57b72de6662688c0bd0a9185719c8df84b5b08cc7d14d7e9689e1
 EBUILD canonicaljson-1.6.4.ebuild 609 BLAKE2B e486da1f4e5d19262d2144c9c388e55274ce4ae3e7c6175ad89512b3020e8be05ef5cb2cdb54155ca50b35958adcf6f4b56b9ce99708d7787d7ebc23ae996c75 SHA512 380c813a663dcf9b3a136492cd88e71e7e050fc64789e9379127b938a4b8df013e552ef5966c9414f86edb6cbec78c60bfa34e67bd2fbea006b8dfa1e803940a
 MISC metadata.xml 562 BLAKE2B 09eeef3180d91d94572ed2095300f0a9638110d9fe6e2ebd9ab1bac29a10062dd630088ccc5774d49ecb1a83ee3f76f711b7c7166cd56497586fda6261114f8b SHA512 e459cb2290e3d64f41ebaf72ee51ab70c6a1638860a8be30e77451cbda03cbfa50a77088d2369d1fdf1c4984c8c04ac35c5e4005af3f429c1d2697beca6ef0b7
diff --git a/dev-python/canonicaljson/canonicaljson-1.6.3.ebuild b/dev-python/canonicaljson/canonicaljson-1.6.3.ebuild
deleted file mode 100644
index ef2341b08bb7..000000000000
--- a/dev-python/canonicaljson/canonicaljson-1.6.3.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="Canonical JSON"
-HOMEPAGE="
-	https://github.com/matrix-org/python-canonicaljson/
-	https://pypi.org/project/canonicaljson/
-"
-SRC_URI="
-	https://github.com/matrix-org/python-canonicaljson/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-S="${WORKDIR}/python-${P}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~ppc64"
-
-RDEPEND="dev-python/simplejson[${PYTHON_USEDEP}]"
-
-distutils_enable_tests unittest
diff --git a/dev-python/nbclient/Manifest b/dev-python/nbclient/Manifest
index fc771c42902b..60c3c9ab396b 100644
--- a/dev-python/nbclient/Manifest
+++ b/dev-python/nbclient/Manifest
@@ -1,5 +1,5 @@
 DIST nbclient-0.7.0.gh.tar.gz 78253 BLAKE2B 473dcef140c8e1fc8f1e97fa30859b9b9fc2dfd6f951ae52db8ab11febbb3de7f60d129424827983a2c05579cd2340e9d4e1a9d0e452a7678497fc1c7176ecf3 SHA512 93d22e2b4fe1740798b812bb4890bf2fe2c7fdd337e34b50eac3140ead73d443cdb326948b2e8511b6ccad61c7daf1efd8e7cc3664b6b1ad9dda0894ca84fff5
 DIST nbclient-0.7.2.gh.tar.gz 76883 BLAKE2B d90b9dd7b15757a44c86084b68b916aab663c0e20a5c1012bda9f86a0ec1104a01cd78d27bc6e510eceeee12f2356a312d8080e1568e4c54dd2e916af85dc304 SHA512 17f1bfbfa156688e895ab1a0d0f74903f43c62a373a40cfcc50a654d86ebbaeb5ed101562716140a3878a9667bb131c49e06caf2e3127160700baf181cd1c29b
 EBUILD nbclient-0.7.0.ebuild 1478 BLAKE2B 60bf2d52e8a8dff8469d21ce72786a29c6aebd19e667c9e46044b0faf96ba5bb30eeb57a11dbb7aaff685a1833f7c7ba9ed21ec7f11673d274fb37247816af9f SHA512 f18306d5364c3187f97e48327808e0ee4e2c490bf0961c1e92238f8e8734aa37409ad51edb04c97ad9c89ac528a85865ef114e18fdb57dc877c32679a1fb182a
-EBUILD nbclient-0.7.2.ebuild 1592 BLAKE2B bb24d47e5c6447d71efffb72eecac055a31c69eba7161a04c53ef80b3f551ad6d24ee5a32373f0fb7d95917ee1199dc723fbc22f53ace33c174d86ef2b59f606 SHA512 c004647d0ca6c17164aaa40897c8a69e9327191d6b125790f4fbf4a369f2f271cddaab1d247b48e1c2e22103811cc38917815e1c3968d6e008e2b5569398c54a
+EBUILD nbclient-0.7.2.ebuild 1594 BLAKE2B 87770cbb6c33ce9e1e65a9f26b07d6043b30fcd44e04cc5bb790c212a1ec67b27d66f3211d1f45a83dc59c7c8f7199506c759f3502cbe6b22fa076c6669ff614 SHA512 1749c10983e3725cd791d813ad90c3a2066f75084e8e5d569fc8398b7e399b5d14d64b71b8c9a5c48c0f4d06356c3e5faeb6e69e401388569100af274a878814
 MISC metadata.xml 405 BLAKE2B d1efa5f7bb2a959bdbc6093b1bd3930e6cdb9bffbe872c6775c15dfc1024ae24d6bcb4651c8e1fb06242b17d6a86f683de3b528bbf1a60b5656a90c1f4ac81b7 SHA512 5b0de690d37dd5928e3bfd0b380336d154cced094e342b41dfd16d0caddd2b792a2158b209404a36461cf4d1b12d836024eae2aedf15093b90f4e363382b38bf
diff --git a/dev-python/nbclient/nbclient-0.7.2.ebuild b/dev-python/nbclient/nbclient-0.7.2.ebuild
index aa4b8ee54615..5d2064b2b009 100644
--- a/dev-python/nbclient/nbclient-0.7.2.ebuild
+++ b/dev-python/nbclient/nbclient-0.7.2.ebuild
@@ -26,7 +26,7 @@ KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc
 RDEPEND="
 	>=dev-python/jupyter_client-6.1.12[${PYTHON_USEDEP}]
 	>=dev-python/jupyter_core-4.12[${PYTHON_USEDEP}]
-	<dev-python/jupyter_core-5.0[${PYTHON_USEDEP}]
+	!=dev-python/jupyter_core-5.0*[${PYTHON_USEDEP}]
 	>=dev-python/nbformat-5.0[${PYTHON_USEDEP}]
 	>=dev-python/traitlets-5.3[${PYTHON_USEDEP}]
 "
diff --git a/dev-python/nltk-data/Manifest b/dev-python/nltk-data/Manifest
index c6ce6a9b6e7e..518ca1c53315 100644
--- a/dev-python/nltk-data/Manifest
+++ b/dev-python/nltk-data/Manifest
@@ -109,5 +109,5 @@ DIST nltk-wordnet31-20211221.zip 11058667 BLAKE2B fb2dca62f602e05226dd62802f42e5
 DIST nltk-wordnet_ic-20200312.zip 12056682 BLAKE2B c2dc2a646015b23699a72f636b588ec5718c70e6941d9d56863257e1e0396c8cf59ac1dc6ed74e5d7f0c2ee9129d63221a03967bf66a3d335e99160f295ed44d SHA512 1c94451a13af6c76bff60a0cab2e70402a3d9abd2e8fc62a5473f24ab4229feb0afe4faa8d389734697a6cf86d2c8b1dc700bb3afa3cbc279b75d7e0ec19fc6d
 DIST nltk-words-20200312.zip 757777 BLAKE2B eaaaaab6c26e206e9b6ce45daf779e3cc6706a06132afeabf013026d0009caee2d678f3c4ea9125b9654f7143bef29ec7a5706b79e5650ea556c6821b7754e6f SHA512 2810f05d3fc7ee6b6f8636fa1ff7b4e8c8cdac12b415cc54d15c69102290122ea138ec4fa36cb483f790c1ac10b0f83ae4c2c3e0e8df7e67e90e962ee5dbb0be
 DIST nltk-ycoe-20200312.zip 477 BLAKE2B 574835aa011a06a06363e26facd6a6f583a1dc1cac2de39adff59d8ab48eefac030b43d935a2f79af855259f2a9a571193dae2811589483af97406ff05c76c9e SHA512 e39ce165074d10ff63cb84ea52905d7ecb937797c8123ed113c5609afe1f63ac44d04d48a681002c4eac21dc9076ac74164b886c6f9ce42f3a102c38d1e8e756
-EBUILD nltk-data-20221108.ebuild 4797 BLAKE2B f6c60bf78d5035c3cb4e91d5ad9b095700e33827a1f3e9166d0c9be276e99106b81eedcbca1b99a3b5da36afe3bf04878af6a96ee0b93c2087716556bb44c974 SHA512 630ed2f02b83f7d7631a33ecc755994689985b11d0839ac9fd029662e54ec781a4bdf3e4df85e4605788197ab82196c948062d240e143910afdb3bf6641f20cf
+EBUILD nltk-data-20221108.ebuild 4844 BLAKE2B 777e0fc86b117218f987a292a37d464ea042ce9040349e0e4a147d25b537e1ff06b463551592e1ea393c6575dc935e5ae0f404b1d67bf60af4cfd41a125c74d4 SHA512 e59423a867f6a6216d81cf8d871f2c5357539c6ce6482d62bd0f89e8c9da64f85577f5d236a9911100730e7a710f33be9b66ee00f1835bfabc570abdd1cd00dc
 MISC metadata.xml 390 BLAKE2B e8f39395d8770de8e0e4c13fd51641c4f4a33935dc9e266a899d50cf9f42780e7682177a81f8902b20255114696d790e1c8aae8fdacd25afe8e6057d68d1b554 SHA512 6f173c8a058d6ae48c8316e00bfcd94e7f297667f729ebdab16733e6ae60ca43918e3e5f992faec07ab53c9682293f4543dbaf06045dfd6ff76cbedc8271afdd
diff --git a/dev-python/nltk-data/nltk-data-20221108.ebuild b/dev-python/nltk-data/nltk-data-20221108.ebuild
index 44624c3de360..94c3c1e478d7 100644
--- a/dev-python/nltk-data/nltk-data-20221108.ebuild
+++ b/dev-python/nltk-data/nltk-data-20221108.ebuild
@@ -9,6 +9,7 @@ DESCRIPTION="Data files for NLTK"
 HOMEPAGE="https://www.nltk.org/nltk_data/"
 
 # at least some of the files have poorly documented licenses
+# https://github.com/nltk/nltk_data/issues/102
 # TODO: create a USE flag for free-ish subset
 LICENSE="all-rights-reserved"
 SLOT="0"
diff --git a/dev-python/redis-py/Manifest b/dev-python/redis-py/Manifest
index 86a4b8a1d453..a0aaa32a257d 100644
--- a/dev-python/redis-py/Manifest
+++ b/dev-python/redis-py/Manifest
@@ -3,5 +3,5 @@ DIST redis-py-4.3.5.gh.tar.gz 4620696 BLAKE2B 2eaa40fc0ad624c4b8444054dcfea70ba1
 DIST redis-py-4.4.0.gh.tar.gz 4637656 BLAKE2B 40b0909c27cefb399353cc2d1d82d7ad3d64e4b3e5ae001ffef9c198d0e65d906f5772a0ac33b599c7fb6ffc5dfad461bb4b9042c5c4fb23dfbfceb0a7facbc0 SHA512 8992f160de7817c48893f3a8588d5c0398dcfb91830a61b4218206adc88185acb102b072507d3064b4a7aade5c957267e5d0e6912510bb106eea834cf9250fab
 EBUILD redis-py-4.3.4.ebuild 1761 BLAKE2B 34745dde86f9477eabadfaa7119608dbf4d8fecd4f4f0ca5ef379b4b5e358d4d73dc4a5625f46a35431ad893f923bf69721a672df263cbcbe19266d151c88a0e SHA512 49db4fe89644c425139a5ebde1ef8c33c0806bda52c602a1c9665fcc96e36cf824798a4dbf4751a239da6a30b71eb7a4e5d4c6e44587a027549b3ff6ac5abcf9
 EBUILD redis-py-4.3.5.ebuild 1719 BLAKE2B acd412fd7b3c46b46e6b6338038031e970e8e43a8532b347ca2c362022749215a5d01373e06001fd226eb54d40b73771d67c51434992c20c26a285816daddc6e SHA512 53d1d2017efc2ea7ebb4b1653663bdddf159adc469fd72c13f411b90bcaf62863d78c0759fa8da04d58d017894838ca49736d913f87b95fa1376590b8423d64a
-EBUILD redis-py-4.4.0.ebuild 1740 BLAKE2B 2b27c4974c15ec83214271b2af415394b6b2776c73bb740c7096ea721c3eb1fa453047466ca9b4847a69ec0b44df400b8051e8303b70e924139eefba2b7e9175 SHA512 79bbfa9350e6c66b797ff7f9513e80288b8d713f21776e3fefa4d1c8a795d44396578f02c5aaff5fe97190089431070cc3deace596d45609e6b74bb8fa0844e4
+EBUILD redis-py-4.4.0.ebuild 1748 BLAKE2B d8947413670056df529e6ebf26f6e3c0bdd0dcaedb8436c1d427f80b2ef895e0173e97dd1dc3010d6ba666a1eb258e4989dda5909daf0064640343318f1e4b2a SHA512 04c0793d1308c39f1d93e8525996a53a193033f7c8f42b7ed4f33955772762e38ce91fa825e51279d8fc1c5180c14e0182f51c91aab68f39106214efef821682
 MISC metadata.xml 506 BLAKE2B 0e5747e826132dd365bdf6d3a63f0936ed476bc69c4c4d55126e692039046f51f69b193ead0baa181090b11f69ab2a49220d8f906f9fe3fc18331b76ff9e0b0f SHA512 725d650bfe345b132588930a18ade44182ec07f6697d2fd8806dc208ab1556939926e8899fc6d43691101d971f9c1e011fb8a5675fdde4698dbf4c230db15c75
diff --git a/dev-python/redis-py/redis-py-4.4.0.ebuild b/dev-python/redis-py/redis-py-4.4.0.ebuild
index 928539d1ddbb..39794f5a9cfe 100644
--- a/dev-python/redis-py/redis-py-4.4.0.ebuild
+++ b/dev-python/redis-py/redis-py-4.4.0.ebuild
@@ -27,7 +27,7 @@ RDEPEND="
 "
 BDEPEND="
 	test? (
-		<dev-db/redis-7
+		dev-db/redis
 		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
 		dev-python/pytest-timeout[${PYTHON_USEDEP}]
 	)
@@ -41,6 +41,8 @@ python_test() {
 		tests/test_pubsub.py::TestPubSubDeadlock::test_pubsub_deadlock
 		# TODO
 		tests/test_commands.py::TestRedisCommands::test_acl_list
+		# redis-7 different return
+		tests/test_commands.py::TestRedisCommands::test_xautoclaim
 	)
 
 	# TODO: try to run more servers?
@@ -51,17 +53,22 @@ src_test() {
 	local redis_pid="${T}"/redis.pid
 	local redis_port=6379
 
+	if has_version ">=dev-db/redis-7"; then
+		local extra_conf="
+			enable-debug-command yes
+			enable-module-command yes
+		"
+	fi
+
 	# Spawn Redis itself for testing purposes
-	# NOTE: On sam@'s machine, spawning Redis can hang in the sandbox.
-	# I'm not restricting tests yet because this doesn't happen for anyone else AFAICT.
 	einfo "Spawning Redis"
 	einfo "NOTE: Port ${redis_port} must be free"
-	# "${EPREFIX}"/usr/sbin/redis-server - <<< "${redis_test_config}" || die
 	"${EPREFIX}"/usr/sbin/redis-server - <<- EOF || die "Unable to start redis server"
 		daemonize yes
 		pidfile ${redis_pid}
 		port ${redis_port}
-		bind 127.0.0.1
+		bind 127.0.0.1 ::1
+		${extra_conf}
 	EOF
 
 	# Run the tests