Adding metadata

18 files changed, 171 insertions, 511 deletions

diff --git a/dev-python/paramiko/Manifest b/dev-python/paramiko/Manifest
index ff1059f9a778..66da142511d7 100644
--- a/dev-python/paramiko/Manifest
+++ b/dev-python/paramiko/Manifest
@@ -1 +1,2 @@
 DIST paramiko-2.8.0.tar.gz 332217 BLAKE2B fcd691159b0306204064806881f8a42e7310fe23daf22c5de5ce8124d1496d48606247ab03c7657ff01560f801121a35011e0e615c5e142c41d191568f5b2300 SHA512 15f6e1cab9afdf3285804ce09b3af6c20ffc1f8e50d2549272f0ea545d1fdc858e72c7cba085db85c69aad2033655ae2f025e8ed2bd0dff574bcc03156bdb6ed
+DIST paramiko-2.9.0.tar.gz 344160 BLAKE2B b3436934143971b8a16f6100b6d1633b8ce37303d9be16fd228d7c8c83849e3ef8875cb5d3a3cfa8f08e9e72822ed1dfd310782f1fea0b32051758030b7a1f70 SHA512 3385f837ad36131f4508021b4ee0f073f293c0c1005768071becdfa0b9897dc7dd05467009329160f1eee709d32da72fe9e45fb6d61ea099f64748b00cffce14
diff --git a/dev-python/paramiko/paramiko-2.9.0.ebuild b/dev-python/paramiko/paramiko-2.9.0.ebuild
new file mode 100644
index 000000000000..113b2f366666
--- /dev/null
+++ b/dev-python/paramiko/paramiko-2.9.0.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="SSH2 protocol library"
+HOMEPAGE="https://www.paramiko.org/ https://github.com/paramiko/paramiko/ https://pypi.org/project/paramiko/"
+# pypi tarballs are missing test data
+#SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris"
+IUSE="examples server"
+
+RDEPEND="
+	>=dev-python/bcrypt-3.1.3[${PYTHON_USEDEP}]
+	>=dev-python/cryptography-2.5[${PYTHON_USEDEP}]
+	>=dev-python/pynacl-1.0.1[${PYTHON_USEDEP}]
+	>=dev-python/pyasn1-0.1.7[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx sites/docs
+distutils_enable_tests pytest
+
+src_prepare() {
+	local PATCHES=(
+		"${FILESDIR}/${PN}-2.7.1-tests.patch"
+	)
+
+	if ! use server; then
+		PATCHES+=( "${FILESDIR}/${PN}-2.4.2-disable-server.patch" )
+	fi
+	distutils-r1_src_prepare
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	if use examples; then
+		docinto examples
+		dodoc -r demos/*
+	fi
+}
diff --git a/dev-python/plumbum/Manifest b/dev-python/plumbum/Manifest
index 27a2355f66d4..3f99c0c5476b 100644
--- a/dev-python/plumbum/Manifest
+++ b/dev-python/plumbum/Manifest
@@ -1,2 +1,3 @@
 DIST plumbum-1.7.0.tar.gz 318890 BLAKE2B 19ae8a37dff38ac3d263d9400e44ac174c46ff8cef92cf45b9ea31d6d344543fba66de3fd0fcd15acc205af5939f11be6c56e6cd9ca39a666f92f18dcd29b9f7 SHA512 0a12891278c12bb98b8bbb825448375240ee347eb3ca166b9cbb4da3e083979d947a7bf0a843fd9a0b7c9a13d09f24e988ee877f29420a3f29f40e387eec8826
 DIST plumbum-1.7.1.tar.gz 323014 BLAKE2B 28d9616c3bcb13f1e9cf9c47b4533c62caf630d7eab998e86023256b568f8f038444f8741bb902ed999f04f480bc09159aab075d184f497b00a452bfac57c996 SHA512 d6648acce8e84045cd8c2fc4a90c427fd5ab5a39e49e7a1f10b20ffbca20cc42636183325501e5b577631e4f1c5a1b3e7cae12ec6b89ff853e5a50946c15f3c7
+DIST plumbum-1.7.2.tar.gz 323051 BLAKE2B a16d9210606ac67abd425fcff109d40836dc969729cc5bf78a5d224c0beabf09d56d35f17809994d758153c6e18e4af91403f7ae0111912447367be68f6592c1 SHA512 77e75988255ca78fa5c253c6d076d63f8f9250a2b153ef23e40f35315e255ea09403d854a19bb265fd658bb9e5f0f705dc7530ecacc40b4b48e33acdf50dddf9
diff --git a/dev-python/plumbum/plumbum-1.7.2.ebuild b/dev-python/plumbum/plumbum-1.7.2.ebuild
new file mode 100644
index 000000000000..72ad7ed16e86
--- /dev/null
+++ b/dev-python/plumbum/plumbum-1.7.2.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+inherit distutils-r1 optfeature
+
+DESCRIPTION="A library for shell script-like programs in python"
+HOMEPAGE="https://plumbum.readthedocs.io/en/latest/ https://github.com/tomerfiliba/plumbum"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+BDEPEND="
+	test? (
+		dev-python/psutil[${PYTHON_USEDEP}]
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+		dev-python/pytest-timeout[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+	# Need sshd running
+	tests/test_remote.py
+	tests/test_utils.py
+	# Windows specific
+	tests/test_putty.py
+	# Needs sudo without password
+	tests/test_sudo.py
+	# Wrong assumptions about env handling
+	tests/test_env.py::TestEnv::test_change_env
+	tests/test_env.py::TestEnv::test_dictlike
+	tests/test_local.py::TestLocalPath::test_iterdir
+)
+
+src_prepare() {
+	sed -e '/addopts/d' -i setup.cfg || die
+	distutils-r1_src_prepare
+}
+
+pkg_postinst() {
+	optfeature "remote commands via ssh" dev-python/paramiko
+	optfeature "progress bars in jupyter" dev-python/ipywidgets
+	optfeature "colored output in jupyter" dev-python/ipython
+	optfeature "images on the command line" dev-python/pillow
+}
diff --git a/dev-python/pyrqlite/Manifest b/dev-python/pyrqlite/Manifest
index 09d1aa5eaa02..ba4a64616039 100644
--- a/dev-python/pyrqlite/Manifest
+++ b/dev-python/pyrqlite/Manifest
@@ -1,3 +1,4 @@
 DIST pyrqlite-2.1-python3.10-test_support.patch 1017 BLAKE2B 50353be2d15d1a468328c3f7f40c4d8512975b0c8e8e458aac219b4d207cd8819bcd98417585b81322eb9c241adb1d389b7b161c775734db396bcd16dce2886a SHA512 b88a220af27fbedc259f10d6d8af436f2b6d5533f17550c8f90b3bd4a64c81319b4922d748d3b0baa9ae1e1bd1390349fd8b21fc1f8e48b707ee074f93b830f4
 DIST pyrqlite-2.1-rqlite-6.7.0-ephemeral.py 3284 BLAKE2B 97029bf48fe8902909cd463718b64399f6736a09a463233d7a577c6c3afbc8709315364f6c7af90d3d40ebcb2cfcbb8ba7ec2b0589a80bfbc8e7ec130603c4aa SHA512 15c96c52c2528f9ecad8ddd6cff0a05a3684654aff5d99c86615d49279dc43cd0c1dee89b0fac33876e793f54bbb51a403b3678a278dbdd9329fe031156a4576
+DIST pyrqlite-2.1.1.tar.gz 19538 BLAKE2B fba6caa68eb6d806ea807d40f36edafb0872e724a087cdb7736f79699692d0d492e05a8a7407467f92ec8e30df4a6ea1ed44bc12bec35ffc4753878335fa4275 SHA512 9fc404a480f42592ebbedef82f748707741e28de199be9381680db506dac4e3ce757d1058874ca06cf8f0dd1ec0e7b6411a4585f332a9fe7d8977071e492bd31
 DIST pyrqlite-2.1.tar.gz 19069 BLAKE2B f5ce9c1201632e81ba6f7f41e3ef54bd5fff354c869e73879e8b324ad12aea6476eb197119a22ba15d58c9ab3503435b0110ce9bfe2c21d16fe10b44afbe486a SHA512 6a63860378021b29ec0e8d81cf2c3534c97cec2c65d60e8ac2ec9b0a7900efb9a9a63546da44d8be89570eae2fd47eca4004167d11438b2dd9eb6bc68e646bad
diff --git a/dev-python/pyrqlite/pyrqlite-2.1.1.ebuild b/dev-python/pyrqlite/pyrqlite-2.1.1.ebuild
new file mode 100644
index 000000000000..9cb585f756a9
--- /dev/null
+++ b/dev-python/pyrqlite/pyrqlite-2.1.1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+inherit distutils-r1
+
+DESCRIPTION="Python client for rqlite"
+HOMEPAGE="https://github.com/rqlite/pyrqlite"
+SRC_URI="https://github.com/rqlite/pyrqlite/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+BDEPEND="test? ( >=dev-db/rqlite-6.7.0 )"
+RESTRICT+=" !test? ( test )"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	sed -e "s:^__version__ = .*:__version__ = '${PV}':" -i src/${PN}/constants.py || die
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/redis-py/Manifest b/dev-python/redis-py/Manifest
index 60c1bce0736f..5f684546ee7f 100644
--- a/dev-python/redis-py/Manifest
+++ b/dev-python/redis-py/Manifest
@@ -1,2 +1 @@
-DIST redis-py-3.5.3.tar.gz 141112 BLAKE2B b953d553a3cfa2d6ba6f5aa35dfaf93865acbfad0e901a96082c3b1c027dc23b6ceedde185f24e86772522fbbf4f0a4d18e115a6b40aff6a65450bbe397d5c07 SHA512 eae6ac6b3e0f1366a9c29e5e2d9a5210e4627e62e3006159b1c290f36cd9c1c2c12cafe0944f7a010e04632b517874f230aa9411491993b7ecf2080546217206
 DIST redis-py-4.0.2.tar.gz 2262717 BLAKE2B 7db99843b4ee354b0841de1cacca001901b0614868e6cd545edb0f3705b7dc7d7a0ee755e2184ec1fb080a845a2f193ff5ab5a4dd99006eed6b9a1c89fbee131 SHA512 3f73ddd2ceb551fa447cfb4ecdc1d393957bbfd8c184ae3d357f9f47fff860f1c4684ec0fc3cb85fea530454456c17a98a2a56e592bef4cd9ad17bb405c1a0f7
diff --git a/dev-python/redis-py/files/redis-py-3.5.3-fix-user-tests.patch b/dev-python/redis-py/files/redis-py-3.5.3-fix-user-tests.patch
deleted file mode 100644
index 36ff4b0bf60a..000000000000
--- a/dev-python/redis-py/files/redis-py-3.5.3-fix-user-tests.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-diff --git a/tests/test_commands.py b/tests/test_commands.py
-index 65e877c..448d30c 100644
---- a/tests/test_commands.py
-+++ b/tests/test_commands.py
-@@ -105,25 +105,24 @@ class TestRedisCommands(object):
- 
-         # test enabled=False
-         assert r.acl_setuser(username, enabled=False, reset=True)
--        assert r.acl_getuser(username) == {
--            'categories': ['-@all'],
--            'commands': [],
--            'enabled': False,
--            'flags': ['off'],
--            'keys': [],
--            'passwords': [],
--        }
-+        acl = r.acl_getuser(username)
-+        assert acl['categories'] == ['-@all']
-+        assert acl['commands'] == []
-+        assert acl['keys'] == []
-+        assert acl['passwords'] == []
-+        assert 'off' in acl['flags']
-+        assert acl['enabled'] is False
- 
-         # test nopass=True
-         assert r.acl_setuser(username, enabled=True, reset=True, nopass=True)
--        assert r.acl_getuser(username) == {
--            'categories': ['-@all'],
--            'commands': [],
--            'enabled': True,
--            'flags': ['on', 'nopass'],
--            'keys': [],
--            'passwords': [],
--        }
-+        acl = r.acl_getuser(username)
-+        assert acl['categories'] == ['-@all']
-+        assert acl['commands'] == []
-+        assert acl['keys'] == []
-+        assert acl['passwords'] == []
-+        assert 'on' in acl['flags']
-+        assert 'nopass' in acl['flags']
-+        assert acl['enabled'] is True
- 
-         # test all args
-         assert r.acl_setuser(username, enabled=True, reset=True,
-@@ -135,7 +134,7 @@ class TestRedisCommands(object):
-         assert set(acl['categories']) == set(['-@all', '+@set', '+@hash'])
-         assert set(acl['commands']) == set(['+get', '+mget', '-hset'])
-         assert acl['enabled'] is True
--        assert acl['flags'] == ['on']
-+        assert 'on' in acl['flags']
-         assert set(acl['keys']) == set([b'cache:*', b'objects:*'])
-         assert len(acl['passwords']) == 2
- 
-@@ -154,7 +153,7 @@ class TestRedisCommands(object):
-         assert set(acl['categories']) == set(['-@all', '+@set', '+@hash'])
-         assert set(acl['commands']) == set(['+get', '+mget'])
-         assert acl['enabled'] is True
--        assert acl['flags'] == ['on']
-+        assert 'on' in acl['flags']
-         assert set(acl['keys']) == set([b'cache:*', b'objects:*'])
-         assert len(acl['passwords']) == 2
- 
-@@ -193,7 +192,7 @@ class TestRedisCommands(object):
- 
-         assert r.acl_setuser(username, enabled=False, reset=True)
-         users = r.acl_list()
--        assert 'user %s off -@all' % username in users
-+        assert len(users) == 2
- 
-     @skip_if_server_version_lt(REDIS_6_VERSION)
-     def test_acl_setuser_categories_without_prefix_fails(self, r, request):
diff --git a/dev-python/redis-py/redis-py-3.5.3.ebuild b/dev-python/redis-py/redis-py-3.5.3.ebuild
deleted file mode 100644
index c2fc4676ae7c..000000000000
--- a/dev-python/redis-py/redis-py-3.5.3.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
-
-inherit distutils-r1
-
-MY_PN="redis"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Python client for Redis key-value store"
-HOMEPAGE="https://github.com/andymccurdy/redis-py"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
-
-BDEPEND="
-	test? (
-		dev-db/redis
-		dev-python/mock[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=(
-	# https://github.com/andymccurdy/redis-py/issues/1459
-	"${FILESDIR}/${P}-fix-user-tests.patch"
-)
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	distutils-r1_python_prepare_all
-
-	# Make sure that tests will be used from BUILD_DIR rather than cwd.
-	mv tests tests-hidden || die
-
-	# Correct local import patch syntax
-	sed \
-		-e 's:from .conftest:from conftest:' \
-		-e 's:from .test_pubsub:from test_pubsub:' \
-		-i tests-hidden/test_*.py \
-		|| die
-}
-
-python_compile() {
-	distutils-r1_python_compile
-
-	if use test; then
-		cp -r tests-hidden "${BUILD_DIR}"/tests || die
-	fi
-}
-
-src_test() {
-	local redis_pid="${T}"/redis.pid
-	local redis_port=6379
-	local redis_test_config="
-		daemonize yes
-		pidfile ${redis_pid}
-		port ${redis_port}
-		bind 127.0.0.1
-	"
-
-	# 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.
-	elog "Spawning Redis"
-	elog "NOTE: Port ${redis_port} must be free"
-	"${EPREFIX}"/usr/sbin/redis-server - <<< "${redis_test_config}" || die
-
-	# Run the tests
-	distutils-r1_src_test
-
-	# Clean up afterwards
-	kill "$(<"${redis_pid}")" || die
-}
diff --git a/dev-python/redis-py/redis-py-4.0.2.ebuild b/dev-python/redis-py/redis-py-4.0.2.ebuild
index 2320fd534b26..ead9795fd481 100644
--- a/dev-python/redis-py/redis-py-4.0.2.ebuild
+++ b/dev-python/redis-py/redis-py-4.0.2.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 arm arm64 ~hppa ppc ppc64 sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 sparc x86"
 
 RDEPEND="
 	dev-python/deprecated[${PYTHON_USEDEP}]"
diff --git a/dev-python/setuptools/Manifest b/dev-python/setuptools/Manifest
index c4900e28f90d..7528c397b80c 100644
--- a/dev-python/setuptools/Manifest
+++ b/dev-python/setuptools/Manifest
@@ -6,8 +6,4 @@ DIST setuptools-59.4.0.tar.gz 2281497 BLAKE2B 8267d6d4c373f44659b22155848fe064c7
 DIST setuptools-59.5.0.tar.gz 2281671 BLAKE2B 51b3435a1d7962a06f7cf07c31487a1404274a54a1fae0567c3953686cbf3b3160327a56c599e80ce70fe8f56dc817fc76d0e4371d3622b5c6235b0fdc555980 SHA512 2ad0aa7c05d9664d0bdc17d93ba518903f14f0e8fe568bcc4615f8a651e3e35843d2747200e20a796f250f1bcebfa057c94b7942875aa1badd770ca12e847c32
 DIST setuptools-59.6.0.tar.gz 2281973 BLAKE2B 1e7ffc94626684f7e82a1bbba14889af052898f87f79205618fb76d78252397d3fb555778cb3920d2eed55bc1ee2c95ceec9206940269a4ba35b3bc44eb91226 SHA512 25472ec7c167e07113c6645880952458969b146766b64224ec8f40dfc2a29b23e47104b63e806292ec81ee4e9dbbdc4663228f39b4412b586cba644f69b52309
 DIST setuptools-59.8.0.tar.gz 2282358 BLAKE2B 2f1b49285fc70420e24f958c4955200ef0407a7f3aa52fd581a165fd47c7bbde8366c26963f1bbb36f0f77797c12cbb9016fdc69e1a5cc696bb67aacca16d140 SHA512 d906558b498bda8abf28831224502c6f0290a4cdbf087fe07af8321dba3dfd1e19fa5b4a820033e54c4561b82ea8ec54c287b4fd657892ed28c2a7de91a9107e
-DIST setuptools-60.0.0.tar.gz 2282339 BLAKE2B ad9a78df348c71d4374ccd773495cc3bfd6d02c214a327eece5daea06538c6a7a55975b22175afb6e67692a0945a7d48cd7b317040c7b5c4878a030505d5dbb1 SHA512 088c3dc38485ca16441d38e3404bce7d822f3ef8e48588101e9e93209905d8b1e1676de1131e2fd993a95caed0fcb3681386fbb7b679712ad0632cdbbcc04f51
-DIST setuptools-60.0.2.tar.gz 2284789 BLAKE2B b3763673e65ae7e6e7d8d2e7bb5d4b72e348a873496d5d0ffdb85daa2a65280fdd71be411132ee92717fd5f3437e10c36d244b0389d0a845b8f1ecd6f2094514 SHA512 1323c5993fcb1d8f23c6fc88d217af59d08d0130d06e84d38f0ac5ed6e3bf6d5595027a8f9430f3441d9a065686562d79b413ed32771276410a31f3addcde116
-DIST setuptools-60.0.3.tar.gz 2284909 BLAKE2B 39fab878aa5d9ae4712088a96548cf3312070c6bca59d6fb22642bc5fb9919acf1ad151c63f812a5bdddffdb657fff9631330d93685e9a54e569daaa5b3f2760 SHA512 3020182f30f85eef07952085aed90db42e205abe754eb130327651edd3fdb7fcca52b0654d6c7bc69e5b33920549675f2325bebdc4c71425e212275f49572a10
-DIST setuptools-60.0.4.tar.gz 2282600 BLAKE2B bc2e9c38f9646babce1144cfc1751c034fa2783149ad47c8365a4a2e56b4176b6f0e7a44d1cb5567c34b792cb85b52a7553be09eee34d8f079e67f0a09fb54a6 SHA512 f3dae0e4ac9553a35864978db24041f26b7ea05ba07a7f791a30d3910b23d50eb44b75b9f06f1644c0409344aff153b09417b520957d01bccf6413cdaecf9ced
-DIST setuptools-60.0.5.tar.gz 2285236 BLAKE2B 75255465933957e5e8a6cab84d27c0bbab506c70db80c4bfad5d81c61f5ef331fd3d0eec7769cc7da35f670f120d571d455dab40abbaf88e95cec83349a97e6f SHA512 0a92953b9650a06b30b1c3dc8e24ea462ccdd78b177ce0f372dc62cf8395d3df2e25b53d74d174b86e1b44e7ee1dc1852ab6c49d9f78972acd551b692fcc4b49
+DIST setuptools-60.1.0.tar.gz 2281751 BLAKE2B d6302564ccb841232561c479959d2ed412888b49c07f774f194214ded659d7d45c5328570318ded9ff7eb81fc08e20b8be576f7a38099cfb855833955bbdb3a6 SHA512 9dba9022be345f5e0c9a915cfd8a24b441e813e703c817f40cd36236d1de1af8a5227acd886ca5910f1900e0c6ed5836f181117c11486009588a9777d6855032
diff --git a/dev-python/setuptools/setuptools-60.0.0.ebuild b/dev-python/setuptools/setuptools-60.0.0.ebuild
deleted file mode 100644
index 38e2e6e81691..000000000000
--- a/dev-python/setuptools/setuptools-60.0.0.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# please keep this ebuild at EAPI 7 -- sys-apps/portage dep
-EAPI=7
-
-# Set to 'manual' to avoid triggering install QA check
-DISTUTILS_USE_SETUPTOOLS=manual
-PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
-PYTHON_REQ_USE="xml(+)"
-
-inherit distutils-r1 multiprocessing
-
-CPY_PATCHSET="python-gentoo-patches-3.10.0_p1"
-DESCRIPTION="Collection of extensions to Distutils"
-HOMEPAGE="https://github.com/pypa/setuptools https://pypi.org/project/setuptools/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
-	https://dev.gentoo.org/~floppym/python/${CPY_PATCHSET}.tar.xz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	test? (
-		$(python_gen_cond_dep '
-			dev-python/jaraco-envs[${PYTHON_USEDEP}]
-			>=dev-python/jaraco-path-3.2.0[${PYTHON_USEDEP}]
-			dev-python/mock[${PYTHON_USEDEP}]
-			dev-python/pip[${PYTHON_USEDEP}]
-			dev-python/sphinx[${PYTHON_USEDEP}]
-			dev-python/pytest[${PYTHON_USEDEP}]
-			dev-python/pytest-fixture-config[${PYTHON_USEDEP}]
-			dev-python/pytest-virtualenv[${PYTHON_USEDEP}]
-			dev-python/pytest-xdist[${PYTHON_USEDEP}]
-			>=dev-python/virtualenv-20[${PYTHON_USEDEP}]
-			dev-python/wheel[${PYTHON_USEDEP}]
-		' python3_{8..10} pypy3)
-	)
-"
-PDEPEND="
-	>=dev-python/certifi-2016.9.26[${PYTHON_USEDEP}]
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]"
-
-# Force in-source build because build system modifies sources.
-DISTUTILS_IN_SOURCE_BUILD=1
-
-DOCS=( {CHANGES,README}.rst )
-
-src_prepare() {
-	# apply distutils patches to the bundled distutils
-	pushd setuptools/_distutils >/dev/null || die
-	# TODO: distutils C++ patch?
-	eapply -p3 "${WORKDIR}/${CPY_PATCHSET}/0006-distutils-make-OO-enable-both-opt-1-and-opt-2-optimi.patch"
-	popd >/dev/null || die
-
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	# keep in sync with python_gen_cond_dep above!
-	has "${EPYTHON}" python3.{8..10} pypy3 || continue
-
-	distutils_install_for_testing
-	local EPYTEST_DESELECT=(
-		# network
-		setuptools/tests/test_distutils_adoption.py
-		'setuptools/tests/test_virtualenv.py::test_pip_upgrade_from_source[None]'
-		# unhappy with pytest-xdist?
-		setuptools/tests/test_easy_install.py::TestUserInstallTest::test_local_index
-		# TODO
-		setuptools/tests/test_easy_install.py::TestSetupRequires::test_setup_requires_with_allow_hosts
-		setuptools/tests/test_test.py::test_tests_are_run_once
-	)
-
-	# test_easy_install raises a SandboxViolation due to ${HOME}/.pydistutils.cfg
-	# It tries to sandbox the test in a tempdir
-	HOME="${PWD}" epytest \
-		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")" setuptools
-}
-
-python_install() {
-	export DISTRIBUTE_DISABLE_VERSIONED_EASY_INSTALL_SCRIPT=1
-	distutils-r1_python_install
-}
diff --git a/dev-python/setuptools/setuptools-60.0.2.ebuild b/dev-python/setuptools/setuptools-60.0.2.ebuild
deleted file mode 100644
index 38e2e6e81691..000000000000
--- a/dev-python/setuptools/setuptools-60.0.2.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# please keep this ebuild at EAPI 7 -- sys-apps/portage dep
-EAPI=7
-
-# Set to 'manual' to avoid triggering install QA check
-DISTUTILS_USE_SETUPTOOLS=manual
-PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
-PYTHON_REQ_USE="xml(+)"
-
-inherit distutils-r1 multiprocessing
-
-CPY_PATCHSET="python-gentoo-patches-3.10.0_p1"
-DESCRIPTION="Collection of extensions to Distutils"
-HOMEPAGE="https://github.com/pypa/setuptools https://pypi.org/project/setuptools/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
-	https://dev.gentoo.org/~floppym/python/${CPY_PATCHSET}.tar.xz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	test? (
-		$(python_gen_cond_dep '
-			dev-python/jaraco-envs[${PYTHON_USEDEP}]
-			>=dev-python/jaraco-path-3.2.0[${PYTHON_USEDEP}]
-			dev-python/mock[${PYTHON_USEDEP}]
-			dev-python/pip[${PYTHON_USEDEP}]
-			dev-python/sphinx[${PYTHON_USEDEP}]
-			dev-python/pytest[${PYTHON_USEDEP}]
-			dev-python/pytest-fixture-config[${PYTHON_USEDEP}]
-			dev-python/pytest-virtualenv[${PYTHON_USEDEP}]
-			dev-python/pytest-xdist[${PYTHON_USEDEP}]
-			>=dev-python/virtualenv-20[${PYTHON_USEDEP}]
-			dev-python/wheel[${PYTHON_USEDEP}]
-		' python3_{8..10} pypy3)
-	)
-"
-PDEPEND="
-	>=dev-python/certifi-2016.9.26[${PYTHON_USEDEP}]
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]"
-
-# Force in-source build because build system modifies sources.
-DISTUTILS_IN_SOURCE_BUILD=1
-
-DOCS=( {CHANGES,README}.rst )
-
-src_prepare() {
-	# apply distutils patches to the bundled distutils
-	pushd setuptools/_distutils >/dev/null || die
-	# TODO: distutils C++ patch?
-	eapply -p3 "${WORKDIR}/${CPY_PATCHSET}/0006-distutils-make-OO-enable-both-opt-1-and-opt-2-optimi.patch"
-	popd >/dev/null || die
-
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	# keep in sync with python_gen_cond_dep above!
-	has "${EPYTHON}" python3.{8..10} pypy3 || continue
-
-	distutils_install_for_testing
-	local EPYTEST_DESELECT=(
-		# network
-		setuptools/tests/test_distutils_adoption.py
-		'setuptools/tests/test_virtualenv.py::test_pip_upgrade_from_source[None]'
-		# unhappy with pytest-xdist?
-		setuptools/tests/test_easy_install.py::TestUserInstallTest::test_local_index
-		# TODO
-		setuptools/tests/test_easy_install.py::TestSetupRequires::test_setup_requires_with_allow_hosts
-		setuptools/tests/test_test.py::test_tests_are_run_once
-	)
-
-	# test_easy_install raises a SandboxViolation due to ${HOME}/.pydistutils.cfg
-	# It tries to sandbox the test in a tempdir
-	HOME="${PWD}" epytest \
-		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")" setuptools
-}
-
-python_install() {
-	export DISTRIBUTE_DISABLE_VERSIONED_EASY_INSTALL_SCRIPT=1
-	distutils-r1_python_install
-}
diff --git a/dev-python/setuptools/setuptools-60.0.4.ebuild b/dev-python/setuptools/setuptools-60.0.4.ebuild
deleted file mode 100644
index d386091769f9..000000000000
--- a/dev-python/setuptools/setuptools-60.0.4.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# please keep this ebuild at EAPI 7 -- sys-apps/portage dep
-EAPI=7
-
-# Set to 'manual' to avoid triggering install QA check
-DISTUTILS_USE_SETUPTOOLS=manual
-PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
-PYTHON_REQ_USE="xml(+)"
-
-inherit distutils-r1 multiprocessing
-
-CPY_PATCHSET="python-gentoo-patches-3.10.0_p1"
-DESCRIPTION="Collection of extensions to Distutils"
-HOMEPAGE="https://github.com/pypa/setuptools https://pypi.org/project/setuptools/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
-	https://dev.gentoo.org/~floppym/python/${CPY_PATCHSET}.tar.xz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	test? (
-		$(python_gen_cond_dep '
-			dev-python/jaraco-envs[${PYTHON_USEDEP}]
-			>=dev-python/jaraco-path-3.2.0[${PYTHON_USEDEP}]
-			dev-python/mock[${PYTHON_USEDEP}]
-			dev-python/pip[${PYTHON_USEDEP}]
-			dev-python/sphinx[${PYTHON_USEDEP}]
-			dev-python/pytest[${PYTHON_USEDEP}]
-			dev-python/pytest-fixture-config[${PYTHON_USEDEP}]
-			dev-python/pytest-virtualenv[${PYTHON_USEDEP}]
-			dev-python/pytest-xdist[${PYTHON_USEDEP}]
-			>=dev-python/virtualenv-20[${PYTHON_USEDEP}]
-			dev-python/wheel[${PYTHON_USEDEP}]
-		' python3_{8..10} pypy3)
-	)
-"
-PDEPEND="
-	>=dev-python/certifi-2016.9.26[${PYTHON_USEDEP}]
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]"
-
-# Force in-source build because build system modifies sources.
-DISTUTILS_IN_SOURCE_BUILD=1
-
-DOCS=( {CHANGES,README}.rst )
-
-src_prepare() {
-	# apply distutils patches to the bundled distutils
-	pushd setuptools/_distutils >/dev/null || die
-	# TODO: distutils C++ patch?
-	eapply -p3 "${WORKDIR}/${CPY_PATCHSET}/0006-distutils-make-OO-enable-both-opt-1-and-opt-2-optimi.patch"
-	popd >/dev/null || die
-
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local -x SETUPTOOLS_USE_DISTUTILS=stdlib
-
-	# keep in sync with python_gen_cond_dep above!
-	has "${EPYTHON}" python3.{8..10} pypy3 || continue
-
-	distutils_install_for_testing
-	local EPYTEST_DESELECT=(
-		# network
-		setuptools/tests/test_distutils_adoption.py
-		'setuptools/tests/test_virtualenv.py::test_pip_upgrade_from_source[None]'
-		# unhappy with pytest-xdist?
-		setuptools/tests/test_easy_install.py::TestUserInstallTest::test_local_index
-		# TODO
-		setuptools/tests/test_easy_install.py::TestSetupRequires::test_setup_requires_with_allow_hosts
-		setuptools/tests/test_test.py::test_tests_are_run_once
-	)
-
-	# test_easy_install raises a SandboxViolation due to ${HOME}/.pydistutils.cfg
-	# It tries to sandbox the test in a tempdir
-	HOME="${PWD}" epytest \
-		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")" setuptools
-}
-
-python_install() {
-	export DISTRIBUTE_DISABLE_VERSIONED_EASY_INSTALL_SCRIPT=1
-	distutils-r1_python_install
-}
diff --git a/dev-python/setuptools/setuptools-60.0.5.ebuild b/dev-python/setuptools/setuptools-60.0.5.ebuild
deleted file mode 100644
index d386091769f9..000000000000
--- a/dev-python/setuptools/setuptools-60.0.5.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# please keep this ebuild at EAPI 7 -- sys-apps/portage dep
-EAPI=7
-
-# Set to 'manual' to avoid triggering install QA check
-DISTUTILS_USE_SETUPTOOLS=manual
-PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
-PYTHON_REQ_USE="xml(+)"
-
-inherit distutils-r1 multiprocessing
-
-CPY_PATCHSET="python-gentoo-patches-3.10.0_p1"
-DESCRIPTION="Collection of extensions to Distutils"
-HOMEPAGE="https://github.com/pypa/setuptools https://pypi.org/project/setuptools/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
-	https://dev.gentoo.org/~floppym/python/${CPY_PATCHSET}.tar.xz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	test? (
-		$(python_gen_cond_dep '
-			dev-python/jaraco-envs[${PYTHON_USEDEP}]
-			>=dev-python/jaraco-path-3.2.0[${PYTHON_USEDEP}]
-			dev-python/mock[${PYTHON_USEDEP}]
-			dev-python/pip[${PYTHON_USEDEP}]
-			dev-python/sphinx[${PYTHON_USEDEP}]
-			dev-python/pytest[${PYTHON_USEDEP}]
-			dev-python/pytest-fixture-config[${PYTHON_USEDEP}]
-			dev-python/pytest-virtualenv[${PYTHON_USEDEP}]
-			dev-python/pytest-xdist[${PYTHON_USEDEP}]
-			>=dev-python/virtualenv-20[${PYTHON_USEDEP}]
-			dev-python/wheel[${PYTHON_USEDEP}]
-		' python3_{8..10} pypy3)
-	)
-"
-PDEPEND="
-	>=dev-python/certifi-2016.9.26[${PYTHON_USEDEP}]
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]"
-
-# Force in-source build because build system modifies sources.
-DISTUTILS_IN_SOURCE_BUILD=1
-
-DOCS=( {CHANGES,README}.rst )
-
-src_prepare() {
-	# apply distutils patches to the bundled distutils
-	pushd setuptools/_distutils >/dev/null || die
-	# TODO: distutils C++ patch?
-	eapply -p3 "${WORKDIR}/${CPY_PATCHSET}/0006-distutils-make-OO-enable-both-opt-1-and-opt-2-optimi.patch"
-	popd >/dev/null || die
-
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local -x SETUPTOOLS_USE_DISTUTILS=stdlib
-
-	# keep in sync with python_gen_cond_dep above!
-	has "${EPYTHON}" python3.{8..10} pypy3 || continue
-
-	distutils_install_for_testing
-	local EPYTEST_DESELECT=(
-		# network
-		setuptools/tests/test_distutils_adoption.py
-		'setuptools/tests/test_virtualenv.py::test_pip_upgrade_from_source[None]'
-		# unhappy with pytest-xdist?
-		setuptools/tests/test_easy_install.py::TestUserInstallTest::test_local_index
-		# TODO
-		setuptools/tests/test_easy_install.py::TestSetupRequires::test_setup_requires_with_allow_hosts
-		setuptools/tests/test_test.py::test_tests_are_run_once
-	)
-
-	# test_easy_install raises a SandboxViolation due to ${HOME}/.pydistutils.cfg
-	# It tries to sandbox the test in a tempdir
-	HOME="${PWD}" epytest \
-		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")" setuptools
-}
-
-python_install() {
-	export DISTRIBUTE_DISABLE_VERSIONED_EASY_INSTALL_SCRIPT=1
-	distutils-r1_python_install
-}
diff --git a/dev-python/setuptools/setuptools-60.0.3.ebuild b/dev-python/setuptools/setuptools-60.1.0.ebuild
index d386091769f9..d386091769f9 100644
--- a/dev-python/setuptools/setuptools-60.0.3.ebuild
+++ b/dev-python/setuptools/setuptools-60.1.0.ebuild
diff --git a/dev-python/zeroconf/Manifest b/dev-python/zeroconf/Manifest
index 013774fed1bf..ed06e3ebfc44 100644
--- a/dev-python/zeroconf/Manifest
+++ b/dev-python/zeroconf/Manifest
@@ -1 +1,2 @@
 DIST python-zeroconf-0.36.13.gh.tar.gz 131067 BLAKE2B 5d5641071ed5842652542f28dbf4bd1478bf1c908ce838790d251af9612dc4fa174cc69b42852f9cd80660d0fd29b4a4ad26a3cfc311a72216eae1a9e1c9c2d6 SHA512 2c7aa4d78617ab69f2862deb6bc1c5492feaccadf364f3f8c960bcb1e0d1ecd8eca3bc17474b4be9c131d88117d65044f12f4171f3e08edfbbaa00291f28828c
+DIST python-zeroconf-0.38.1.gh.tar.gz 133094 BLAKE2B dae802e19b8b9488fc71cf482578be53c99bbb58580de987522e068b8d4042ac093225035bf5f7c2318c9a90bf5404e42f315cae095b0b4455ebd769facdcd81 SHA512 c60f03100c83e9327a910ad84aec768fb890453c21f9baf0fbbec96f0077c602c5e806e8a6047b87108f6d257942305a2ce76c984935ed3c000d83d2c44bb8d6
diff --git a/dev-python/zeroconf/zeroconf-0.38.1.ebuild b/dev-python/zeroconf/zeroconf-0.38.1.ebuild
new file mode 100644
index 000000000000..727d5570c1fd
--- /dev/null
+++ b/dev-python/zeroconf/zeroconf-0.38.1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+inherit distutils-r1
+
+MY_P=python-zeroconf-${PV}
+DESCRIPTION="Pure Python Multicast DNS Service Discovery Library (Bonjour/Avahi compatible)"
+HOMEPAGE="
+	https://github.com/jstasiak/python-zeroconf/
+	https://pypi.org/project/zeroconf/"
+SRC_URI="
+	https://github.com/jstasiak/python-zeroconf/archive/${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND=">=dev-python/ifaddr-0.1.7[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+	# network
+	tests/test_core.py::Framework::test_close_multiple_times
+	tests/test_core.py::Framework::test_launch_and_close
+	tests/test_core.py::Framework::test_launch_and_close_context_manager
+	tests/test_core.py::Framework::test_launch_and_close_v4_v6
+	tests/test_core.py::Framework::test_launch_and_close_v6_only
+	tests/services/test_types.py::ServiceTypesQuery::test_integration_with_listener_ipv6
+)