From 2ed3fd4de6584dd715d835d3860e7c7a5a5cd732 Mon Sep 17 00:00:00 2001
From: "Liguros - Gitlab CI/CD [develop]" <gitlab@liguros.net>
Date: Thu, 16 Sep 2021 01:39:39 +0000
Subject: Adding metadata

---
 dev-python/Faker/Faker-8.13.2.ebuild               |  29 ++++++
 dev-python/Faker/Manifest                          |   1 +
 dev-python/agate-sql/Manifest                      |   1 +
 dev-python/agate-sql/agate-sql-0.5.8.ebuild        |  34 +++++++
 dev-python/agate-sql/metadata.xml                  |   4 +
 dev-python/asyncstdlib/Manifest                    |   1 +
 dev-python/asyncstdlib/asyncstdlib-3.10.1.ebuild   |  22 +++++
 dev-python/black/Manifest                          |   1 +
 dev-python/black/black-21.9_beta0.ebuild           |  59 ++++++++++++
 dev-python/breathe/Manifest                        |   1 +
 dev-python/breathe/breathe-4.31.0.ebuild           |  30 +++++++
 dev-python/hypothesis/Manifest                     |   1 +
 dev-python/hypothesis/hypothesis-6.21.3.ebuild     |  62 +++++++++++++
 dev-python/notebook/Manifest                       |   1 +
 dev-python/notebook/notebook-6.4.4.ebuild          | 100 +++++++++++++++++++++
 dev-python/progressbar2/Manifest                   |   1 +
 dev-python/progressbar2/progressbar2-3.53.3.ebuild |  33 +++++++
 dev-python/requests-cache/Manifest                 |   2 +
 .../requests-cache/requests-cache-0.7.5.ebuild     |  54 +++++++++++
 .../requests-cache/requests-cache-0.8.1.ebuild     |  54 +++++++++++
 dev-python/ruamel-yaml/Manifest                    |   4 +-
 dev-python/ruamel-yaml/ruamel-yaml-0.17.11.ebuild  |  47 ----------
 dev-python/ruamel-yaml/ruamel-yaml-0.17.13.ebuild  |  47 ----------
 dev-python/ruamel-yaml/ruamel-yaml-0.17.14.ebuild  |  47 ----------
 dev-python/ruamel-yaml/ruamel-yaml-0.17.16.ebuild  |  47 ++++++++++
 dev-python/subprocess-tee/Manifest                 |   1 +
 .../subprocess-tee/subprocess-tee-0.3.4.ebuild     |  40 +++++++++
 dev-python/yamlpath/Manifest                       |   2 +-
 dev-python/yamlpath/yamlpath-3.6.0.ebuild          |  56 ------------
 dev-python/yamlpath/yamlpath-3.6.1.ebuild          |  56 ++++++++++++
 dev-python/zeroconf/Manifest                       |   1 +
 dev-python/zeroconf/zeroconf-0.36.3.ebuild         |  35 ++++++++
 32 files changed, 673 insertions(+), 201 deletions(-)
 create mode 100644 dev-python/Faker/Faker-8.13.2.ebuild
 create mode 100644 dev-python/agate-sql/agate-sql-0.5.8.ebuild
 create mode 100644 dev-python/asyncstdlib/asyncstdlib-3.10.1.ebuild
 create mode 100644 dev-python/black/black-21.9_beta0.ebuild
 create mode 100644 dev-python/breathe/breathe-4.31.0.ebuild
 create mode 100644 dev-python/hypothesis/hypothesis-6.21.3.ebuild
 create mode 100644 dev-python/notebook/notebook-6.4.4.ebuild
 create mode 100644 dev-python/progressbar2/progressbar2-3.53.3.ebuild
 create mode 100644 dev-python/requests-cache/requests-cache-0.7.5.ebuild
 create mode 100644 dev-python/requests-cache/requests-cache-0.8.1.ebuild
 delete mode 100644 dev-python/ruamel-yaml/ruamel-yaml-0.17.11.ebuild
 delete mode 100644 dev-python/ruamel-yaml/ruamel-yaml-0.17.13.ebuild
 delete mode 100644 dev-python/ruamel-yaml/ruamel-yaml-0.17.14.ebuild
 create mode 100644 dev-python/ruamel-yaml/ruamel-yaml-0.17.16.ebuild
 create mode 100644 dev-python/subprocess-tee/subprocess-tee-0.3.4.ebuild
 delete mode 100644 dev-python/yamlpath/yamlpath-3.6.0.ebuild
 create mode 100644 dev-python/yamlpath/yamlpath-3.6.1.ebuild
 create mode 100644 dev-python/zeroconf/zeroconf-0.36.3.ebuild

(limited to 'dev-python')

diff --git a/dev-python/Faker/Faker-8.13.2.ebuild b/dev-python/Faker/Faker-8.13.2.ebuild
new file mode 100644
index 000000000000..1f1f09ada79c
--- /dev/null
+++ b/dev-python/Faker/Faker-8.13.2.ebuild
@@ -0,0 +1,29 @@
+# Copyright 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
+
+DESCRIPTION="A Python package that generates fake data for you"
+HOMEPAGE="https://github.com/joke2k/faker"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>=dev-python/python-dateutil-2.4.2[${PYTHON_USEDEP}]
+	>=dev-python/text-unidecode-1.3[${PYTHON_USEDEP}]
+	!dev-ruby/faker"
+BDEPEND="
+	test? (
+		dev-python/freezegun[${PYTHON_USEDEP}]
+		dev-python/pillow[${PYTHON_USEDEP},tiff]
+		dev-python/random2[${PYTHON_USEDEP}]
+		dev-python/validators[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
diff --git a/dev-python/Faker/Manifest b/dev-python/Faker/Manifest
index 5ecddc1878cb..3af16bf3a842 100644
--- a/dev-python/Faker/Manifest
+++ b/dev-python/Faker/Manifest
@@ -1,2 +1,3 @@
 DIST Faker-8.12.0.tar.gz 1151218 BLAKE2B b55d1b1bac6a580c51fdd3f87919cbcea107aff309bce4d2092ec77046dc40c67650f3c53d176147b6b433008e7487dae9e096eb9ba6c8722ec54ce5d6d39449 SHA512 5df90c0976cb8b5e96f4c6645a984e813130fd22f25b5fb99b7cd28b6e079eec54b19f8ca643b795be15f41b9f5b677e89db1379615479983f0b5519a6dd56b4
 DIST Faker-8.12.1.tar.gz 1151131 BLAKE2B fd59a337ed95429b34b2f9c1530a9db6ef4ec921d1c194e90e794ea6316fd8c79b8f2aa416ad8806cd2f4c31cca8d1d2cf60209a6bb4a75a708345a0bfb0a572 SHA512 e359b015d4908130b12ca6dd8c7e4801011de383eececb62f3ac76cb621cad1c9a873c5de989932405f7a30b33aef8969fb9788a331620db3d6c3ad1e5a657c4
+DIST Faker-8.13.2.tar.gz 1162423 BLAKE2B 595bac7a9a3031a46342ff19cfc1ef89bd7a5267dad3b1a18bda5cb3d96168eb0fda03adab940d35e499771ac1fc78e837631fe048fc374e0dcdcb62ac0a2002 SHA512 7da38c7bcf7b1b7364161092a38a2a9624ede6fed6e0bd9c8aec7acff83d4377bfef3e3ce2af48ea04d37eed0e880357bd40bca6eb81d19cdb876d66de249b04
diff --git a/dev-python/agate-sql/Manifest b/dev-python/agate-sql/Manifest
index 64da99d361e5..550bbfd0fd4b 100644
--- a/dev-python/agate-sql/Manifest
+++ b/dev-python/agate-sql/Manifest
@@ -1 +1,2 @@
 DIST agate-sql-0.5.7.tar.gz 14975 BLAKE2B 7890d5c21d89dd216a7a4c906189e1e44111bd96ef3476f0e6dc4c842dc3f25d537ee398f3c8e720d43e64001fa0ea93940d4a54ee31605eea9e8ae9aa4dec37 SHA512 df7e1d5975d9af0722f4bfa67f1e8679ed46759f8aaa5c76614ed5280c8347f727517568ba377c21dd8eb349f93b7a6d308959ae69bfedd125e6d99bd7bd9dcf
+DIST agate-sql-0.5.8.tar.gz 15182 BLAKE2B 4228c5cbb8fd35b9cd97ffb590fa603e290eb2e5ace9676156ff388f653419080691b29caa4a76c16ea585c91d8126bae3dd500e8438b450737ae55309cf77f7 SHA512 1a793a24561061f5100f24834af65dca943c964cf4aed1504336cafed3d52a95b4787f21ba804b0f2265d5670cabfaa40b7f3d02c120486186cf6e03e7a2938e
diff --git a/dev-python/agate-sql/agate-sql-0.5.8.ebuild b/dev-python/agate-sql/agate-sql-0.5.8.ebuild
new file mode 100644
index 000000000000..69354a51d247
--- /dev/null
+++ b/dev-python/agate-sql/agate-sql-0.5.8.ebuild
@@ -0,0 +1,34 @@
+# Copyright 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
+
+DESCRIPTION="Adds SQL read/write support to agate."
+HOMEPAGE="https://github.com/wireservice/agate-sql https://pypi.org/project/agate-sql/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="+xml"
+
+# Other packages have BDEPEND="test? ( dev-python/agate-sql[xml] )"
+AGATE_VERSION_DEP=">=dev-python/agate-1.5.0"
+TEST_AGAINST_RDEPEND="xml? ( ${AGATE_VERSION_DEP}[xml,${PYTHON_USEDEP}] )"
+RDEPEND="
+	${AGATE_VERSION_DEP}[${PYTHON_USEDEP}]
+	>=dev-python/sqlalchemy-1.0.8[${PYTHON_USEDEP}]
+
+	${TEST_AGAINST_RDEPEND}
+"
+BDEPEND="test? ( ${AGATE_VERSION_DEP}[xml,${PYTHON_USEDEP}] )"
+
+distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+	# requires crate
+	tests/test_agatesql.py::TestSQL::test_to_sql_create_statement_with_dialects
+)
diff --git a/dev-python/agate-sql/metadata.xml b/dev-python/agate-sql/metadata.xml
index 232191c180f2..e92aabc826bc 100644
--- a/dev-python/agate-sql/metadata.xml
+++ b/dev-python/agate-sql/metadata.xml
@@ -4,6 +4,10 @@
  <maintainer type="person">
   <email>zmedico@gentoo.org</email>
  </maintainer>
+ <maintainer type="project">
+  <email>python@gentoo.org</email>
+  <name>Python</name>
+ </maintainer>
  <upstream>
   <remote-id type="pypi">agate-sql</remote-id>
   <changelog>https://github.com/wireservice/agate-sql/blob/master/CHANGELOG.rst</changelog>
diff --git a/dev-python/asyncstdlib/Manifest b/dev-python/asyncstdlib/Manifest
index b3c008784e0a..de424f10d2d0 100644
--- a/dev-python/asyncstdlib/Manifest
+++ b/dev-python/asyncstdlib/Manifest
@@ -1,3 +1,4 @@
 DIST asyncstdlib-3.10.0.gh.tar.gz 45242 BLAKE2B 12fb7f96d9c7c6e7ddad67b6c25b805de95812f902e14935a11440c4c55437f550df18c388727d21745b99e6db97917849547fdf726a89c62136ce1d01b8545b SHA512 9e930fa906139d664575d7f41d4e5ddf7da62e02bc946efeadadf6631ae63c15ca2ac1b5793172424f9ad916d32bbd4a741de5844b247c2fa506b63431711933
+DIST asyncstdlib-3.10.1.gh.tar.gz 45230 BLAKE2B daefacbb5712d200dc61d99cbf0deaa50925cfe2e8203f01a8083531d762b838d9603110a07ac1e1a00f17f1bb8ee7dc1a759d35949570fe134d21c4e48993ae SHA512 05e0e64f8262cf3ba6f8e784490597397e0d6a74f2052da80bb531df557dd3143c032589c429a407049ed04b093757c7a09674c66110befd6ab66b0edf883909
 DIST asyncstdlib-3.9.1.gh.tar.gz 40224 BLAKE2B 8d1e564c9f5ac10c7f05dfa3933f695ae458685550fb67401f3bd0d1294ef0b170f5b385cdcf63c0096854538219a0dea77d4d80bd801f1a9b15f5ad3f2c562a SHA512 de7860d84cee7bfdc974a0677cc231323c86238bcb0bfd2f32a62b7356042aad647ee8d627393be35c5a134855d5f76967143ad8347df9d6258f46bc2b43a62a
 DIST asyncstdlib-3.9.2.gh.tar.gz 41963 BLAKE2B da40c23bacc58c1347aca94107e3026829d9b27645eddc47fc46a96cab4be7baa9ed3c31f6f0045b884130d4316394d6a0b6b44818b42b6e6c512c641847d556 SHA512 f5268451325b48b967747b5e1ffe4e773a5aae82c6d481781e6c95f483d972da2b3806c1117067256d22efaba1238787898667a6a50ac4b2512dac4b5343d2a2
diff --git a/dev-python/asyncstdlib/asyncstdlib-3.10.1.ebuild b/dev-python/asyncstdlib/asyncstdlib-3.10.1.ebuild
new file mode 100644
index 000000000000..5da889edab48
--- /dev/null
+++ b/dev-python/asyncstdlib/asyncstdlib-3.10.1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_SETUPTOOLS=pyproject.toml
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+inherit distutils-r1
+
+DESCRIPTION="The missing async toolbox"
+HOMEPAGE="
+	https://github.com/maxfischer2781/asyncstdlib/
+	https://pypi.org/project/asyncstdlib/"
+SRC_URI="
+	https://github.com/maxfischer2781/asyncstdlib/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+distutils_enable_tests pytest
diff --git a/dev-python/black/Manifest b/dev-python/black/Manifest
index 111fcee34bc9..e4d9a1bfbc0f 100644
--- a/dev-python/black/Manifest
+++ b/dev-python/black/Manifest
@@ -1,3 +1,4 @@
 DIST black-20.8b1.tar.gz 1092546 BLAKE2B 5a0a755222617d8d551b627c91670ecc32a9330cc1197900a9d21b071d0d99ddd32e09786becfc577407ab402f6da3d8683a59a9deaea1f6b4f07b9e1e4ecbed SHA512 53d6f6a6f47027e5bdfd3909471c993480034c8aa8ae395792565b8d79fb4e3a44299ea529652c0ccabf4309d645db9179bf54efc06fee20517f479e91cec838
 DIST black-21.7b0.tar.gz 1148431 BLAKE2B 34dcd2fd45b914433d6290c10bb07b44277cb490ef884c44ec00cb5495fadd2e649099dd356c4063d0fff5a6477609b11db73e1dc94d88106c56a3ca9b087c90 SHA512 7e6ee4e185080802c9dfc6eeb73b52b2489283c4bcbc086366f50ffb8ea3e0f4bdfedac9a5906be6ec119e65050741c71591c394f0c361a1d75b3ff4061945c1
 DIST black-21.8b0.tar.gz 1167978 BLAKE2B e7df398d09b71389069991bf0872a97d8a8c0b13ddeec12ee8f08ae9d9716a3d47447727d2759d475f10d323df151b8bb2353f3fd60c99eccb1e912554ebbe7b SHA512 ed38dbf0c881fee7da74f0d6bfe4ea0f85b5bed30d37abde2fd728e33f94ceaaa27b7107cfe763c19bdaea57fcbf54bcae82ce8bdcabc29035cdc85a8e10ab00
+DIST black-21.9b0.tar.gz 1167869 BLAKE2B 31933de69cc34e23e14b0fdba33da844697816cd3917227c1a16c4d1595435d3715405f7f1df820953e83c30c3947448389a703ee662548226dfc2d278b87844 SHA512 0c8025d64ef9e5da8ad73b1f265b912bcb3d8cb00d8a426a39dd4c70505a77150e02a7f26e3d6842456eea367da9fad29d08f586b175d57d66a09cf389442ed0
diff --git a/dev-python/black/black-21.9_beta0.ebuild b/dev-python/black/black-21.9_beta0.ebuild
new file mode 100644
index 000000000000..a6fdb13d6ba8
--- /dev/null
+++ b/dev-python/black/black-21.9_beta0.ebuild
@@ -0,0 +1,59 @@
+# Copyright 2020-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
+
+MY_PV="${PV//_beta/b}"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="The uncompromising Python code formatter"
+HOMEPAGE="https://black.readthedocs.io/en/stable/ https://github.com/psf/black"
+SRC_URI="https://github.com/psf/${PN}/archive/${MY_PV}.tar.gz -> ${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
+
+RDEPEND="
+	>=dev-python/click-8.0.0[${PYTHON_USEDEP}]
+	>=dev-python/mypy_extensions-0.4.3[${PYTHON_USEDEP}]
+	>=dev-python/platformdirs-2[${PYTHON_USEDEP}]
+	dev-python/regex[${PYTHON_USEDEP}]
+	<dev-python/pathspec-1[${PYTHON_USEDEP}]
+	<dev-python/tomli-2[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	dev-python/toml[${PYTHON_USEDEP}]
+	test? (
+		dev-python/aiohttp[${PYTHON_USEDEP}]
+		dev-python/aiohttp-cors[${PYTHON_USEDEP}]
+		dev-python/colorama[${PYTHON_USEDEP}]
+		dev-python/parameterized[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+export SETUPTOOLS_SCM_PRETEND_VERSION=${MY_PV}
+
+src_prepare() {
+	# remove unnecessary bind that worked around broken 6.1.0/6.2.0 releases
+	sed -i -e '/setuptools_scm/s:~=:>=:' setup.cfg || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	cp "${S}"/src/black_primer/primer.json \
+		"${BUILD_DIR}"/lib/black_primer/primer.json || die
+	distutils_install_for_testing
+	epytest -m "not python2"
+}
+
+pkg_postinst() {
+	optfeature "blackd - HTTP API for black" dev-python/aiohttp dev-python/aiohttp-cors
+}
diff --git a/dev-python/breathe/Manifest b/dev-python/breathe/Manifest
index 45a78921e9e0..2f6e107b164b 100644
--- a/dev-python/breathe/Manifest
+++ b/dev-python/breathe/Manifest
@@ -1 +1,2 @@
 DIST breathe-4.30.0.tar.gz 190892 BLAKE2B 19723ed2f979eedcab73a9920c37cf6d3f6e02ff08703d601cc38fe55ecbac28b8ef8d319205723fce75b5e679a75fbd8e712dc134358e1ba6c23dfcb999a472 SHA512 fa09ee687a8e67fa480865a0d33affd9aa0ab48b0cb5b685731ec393045d8c9e1ae0622a1315f805449d712e99e6982ed229bb79314c69f69da0c705d075f7f9
+DIST breathe-4.31.0.tar.gz 193629 BLAKE2B d883f5d8ec339e3bb3db7382e17b27445f4ac05039aaa6ecc29fb38db51e95483c559e78cf642e70bea975c42b1ef2ed48d8804fd9557f7693139b7f5639dc3d SHA512 f6fd7db50ca68cad64d150fcb76227deb282c08109c38b343749f8ce9ee607ccddf767e3020328a61a7570e7a0c1159607148b773bc0b695e87d6b17a6068eac
diff --git a/dev-python/breathe/breathe-4.31.0.ebuild b/dev-python/breathe/breathe-4.31.0.ebuild
new file mode 100644
index 000000000000..4ecdb9705bc6
--- /dev/null
+++ b/dev-python/breathe/breathe-4.31.0.ebuild
@@ -0,0 +1,30 @@
+# 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
+
+DESCRIPTION="Sphinx Doxygen renderer"
+HOMEPAGE="
+	https://breathe.readthedocs.io/en/latest/
+	https://github.com/michaeljones/breathe/"
+SRC_URI="https://github.com/michaeljones/breathe/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	app-doc/doxygen
+	dev-python/docutils[${PYTHON_USEDEP}]
+	>=dev-python/sphinx-3.0.0[${PYTHON_USEDEP}]
+	dev-texlive/texlive-bibtexextra
+	dev-texlive/texlive-fontsextra
+	dev-texlive/texlive-fontutils
+	dev-texlive/texlive-latex
+	dev-texlive/texlive-latexextra
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/hypothesis/Manifest b/dev-python/hypothesis/Manifest
index d4b09c8c3371..3a880ab50371 100644
--- a/dev-python/hypothesis/Manifest
+++ b/dev-python/hypothesis/Manifest
@@ -7,3 +7,4 @@ DIST hypothesis-python-6.20.0.tar.gz 9146238 BLAKE2B 88009c7369209f8781644a97558
 DIST hypothesis-python-6.20.1.tar.gz 9146416 BLAKE2B ae3e10ffe2853009b8d698e0eae391e05632ba1a3d889dbfb498b8f46c18ec16477daefa9052dc6711f3239f9e83ffc7d52c6ad0c554492a00a55417b583afe7 SHA512 8d23bd0311cd8e81d7fd3851f4a72cc92bea4a07943475d8be9bac9dc9d5096f0d7d5e8ed8b14e64dbdb3c49b7d2c7ecc8d85dfe30d5e6f9f0ed96570ce4ddb0
 DIST hypothesis-python-6.21.0.tar.gz 9162663 BLAKE2B a5a2fbb7b377e6cf769c3454ca89615551164e1b0dae24abee15191fcdff2eb1f01b9462c7aff68a7ea801477105bdfe5f6a33f098eb506325031d3511914ae5 SHA512 7d91d83580403da3afac0f4e0a72935c63d7da2ff28429423a3001b0a19a1b6216fe36eb526e91fe9e7f0cae481aa3f446695f7407ec2201c5f8abc6e3ea19a8
 DIST hypothesis-python-6.21.1.tar.gz 9162836 BLAKE2B af52db17d51801d03496036f14b9b1e79667de64b4d5df925bffe00f67e11fb652f0e027bf250d3f4286e113052b3413b75fcd6c8922702924ca0eb9c46849dd SHA512 4e9d994e1323ee90cd4555ae3f310bcf4661079b287e000a65fbda7771e02c265c387df3bbbd0425d54b342de4fb20632b6a35842bc7a66affbdda159048359b
+DIST hypothesis-python-6.21.3.tar.gz 9165503 BLAKE2B ee57b10021d5a8fd4731563e41e2583c879efd602779f5dfaa21a549b34bece29ebdd8386bcb637039b1c679a634f61ff68128c7d1e427ef4ca5ff571197b401 SHA512 0446df21f467cbabc6918a68b8a678db458ac798adaaf57090a756ff3a9b749dee550e77e1f78292d4bfe6f24caac175b104b4f4f1607521776c497649ac9c66
diff --git a/dev-python/hypothesis/hypothesis-6.21.3.ebuild b/dev-python/hypothesis/hypothesis-6.21.3.ebuild
new file mode 100644
index 000000000000..8b48444a4699
--- /dev/null
+++ b/dev-python/hypothesis/hypothesis-6.21.3.ebuild
@@ -0,0 +1,62 @@
+# 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} pypy3 )
+PYTHON_REQ_USE="threads(+),sqlite"
+
+inherit distutils-r1 multiprocessing optfeature
+
+DESCRIPTION="A library for property based testing"
+HOMEPAGE="https://github.com/HypothesisWorks/hypothesis https://pypi.org/project/hypothesis/"
+SRC_URI="https://github.com/HypothesisWorks/${PN}/archive/${PN}-python-${PV}.tar.gz"
+S="${WORKDIR}/${PN}-${PN}-python-${PV}/${PN}-python"
+
+LICENSE="MPL-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+IUSE="cli"
+
+RDEPEND="
+	>=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
+	>=dev-python/sortedcontainers-2.1.0[${PYTHON_USEDEP}]
+	cli? (
+		$(python_gen_cond_dep '
+			dev-python/black[${PYTHON_USEDEP}]
+			dev-python/click[${PYTHON_USEDEP}]
+		' python3_{7..9})
+	)
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pexpect[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+		!!<dev-python/typing-3.7.4.1
+	)
+"
+
+distutils_enable_tests --install pytest
+
+python_prepare() {
+	if ! use cli || ! has "${EPYTHON}" python3.{7..9}; then
+		sed -i -e '/console_scripts/d' setup.py || die
+	fi
+}
+
+python_test() {
+	distutils_install_for_testing
+	epytest tests/cover tests/pytest tests/quality \
+		-p no:pytest-describe \
+		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
+}
+
+pkg_postinst() {
+	optfeature "datetime support" dev-python/pytz
+	optfeature "dateutil support" dev-python/python-dateutil
+	optfeature "numpy support" dev-python/numpy
+	optfeature "django support" dev-python/django dev-python/pytz
+	optfeature "pandas support" dev-python/pandas
+	optfeature "pytest support" dev-python/pytest
+}
diff --git a/dev-python/notebook/Manifest b/dev-python/notebook/Manifest
index 011dcb032108..9b94ebd2d7a2 100644
--- a/dev-python/notebook/Manifest
+++ b/dev-python/notebook/Manifest
@@ -1,2 +1,3 @@
 DIST notebook-6.4.2.tar.gz 14133763 BLAKE2B 2c4f9677b014f484f7c975344f6e3aa29476b3b3bf2dd329ee527be653573f199c6d66078bc1f0787227414fb818df8df3d38e5f1bea9d3f2605f796a391cb37 SHA512 d9914c2924b7a0837295a7cfe2bdf551e1d71f35bab43bd6d12e798562c7e103f28cfdff6692e6ac5de394867071b8e1eae7a26bfd0a76b4a9304b7bea29f119
 DIST notebook-6.4.3.tar.gz 14344061 BLAKE2B a6d12df889015801a47061b40c320f659adda19cdf37832de1fd2b0257e7b1e22439aa4fd7663595c798b4b04c8c8e720a3799bcb20b93a0229ccf26622eee04 SHA512 14bb5c1a858c2d48f19f6a9907c4e3a053e77586a9ce78f3116752a02c39056bfa02fac5ef37404b742861a66751ca765b1d329a530b09752cf54fa464ab565b
+DIST notebook-6.4.4.tar.gz 14349204 BLAKE2B 3ea06a6433933e0de34be33bc681776a17fec05da643268a262f65146bd707f08ea6acbfe1154ba9158ac76211de78552daec22293a54ba5e0edb848790ccbbd SHA512 c78869b7d75244409cb890d43d05eb5391c27e0de29874f48aef1c22379cdcb5dc7f69969eccd6c0f1ed057ed17f85d39e43cd482866dfe6277b6a981eee39f6
diff --git a/dev-python/notebook/notebook-6.4.4.ebuild b/dev-python/notebook/notebook-6.4.4.ebuild
new file mode 100644
index 000000000000..ab76cfbdd90a
--- /dev/null
+++ b/dev-python/notebook/notebook-6.4.4.ebuild
@@ -0,0 +1,100 @@
+# 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 xdg-utils
+
+DESCRIPTION="Jupyter Interactive Notebook"
+HOMEPAGE="https://jupyter.org"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	>=dev-libs/mathjax-2.4
+	dev-python/argon2-cffi[${PYTHON_USEDEP}]
+	dev-python/jinja[${PYTHON_USEDEP}]
+	>=dev-python/terminado-0.8.3[${PYTHON_USEDEP}]
+	>=www-servers/tornado-6.0[${PYTHON_USEDEP}]
+	dev-python/ipython_genutils[${PYTHON_USEDEP}]
+	>=dev-python/traitlets-4.2.1[${PYTHON_USEDEP}]
+	>=dev-python/jupyter_core-4.6.1[${PYTHON_USEDEP}]
+	>=dev-python/pyzmq-17[${PYTHON_USEDEP}]
+	>=dev-python/jupyter_client-5.3.4[${PYTHON_USEDEP}]
+	dev-python/nbformat[${PYTHON_USEDEP}]
+	>=dev-python/nbconvert-4.2.0[${PYTHON_USEDEP}]
+	dev-python/ipykernel[${PYTHON_USEDEP}]
+	dev-python/send2trash[${PYTHON_USEDEP}]
+	dev-python/prometheus_client[${PYTHON_USEDEP}]"
+
+# sphinx 2+ seems to have a problem with its github plugin. temporarily adding
+# a version constraint.
+BDEPEND="
+	test? (
+		dev-python/requests[${PYTHON_USEDEP}]
+		dev-python/requests-unixsocket[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}"-5.7.0-no-mathjax.patch
+)
+
+distutils_enable_tests --install pytest
+
+python_prepare_all() {
+	# disable bundled mathjax
+	sed -i 's/^.*MathJax.*$//' bower.json || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	local deselect=(
+		# trash doesn't seem to work for us
+		notebook/services/contents/tests/test_contents_api.py::APITest::test_checkpoints_follow_file
+		notebook/services/contents/tests/test_contents_api.py::APITest::test_delete
+		notebook/services/contents/tests/test_contents_api.py::GenericFileCheckpointsAPITest::test_checkpoints_follow_file
+		notebook/services/contents/tests/test_contents_api.py::GenericFileCheckpointsAPITest::test_delete
+		notebook/services/contents/tests/test_contents_api.py::GenericFileCheckpointsAPITest::test_delete_dirs
+		notebook/services/contents/tests/test_contents_api.py::GenericFileCheckpointsAPITest::test_delete_non_empty_dir
+		notebook/services/contents/tests/test_manager.py::TestContentsManager::test_delete
+		notebook/services/contents/tests/test_manager.py::TestContentsManagerNoAtomic::test_delete
+		# TODO
+		notebook/services/kernels/tests/test_kernels_api.py::KernelAPITest::test_connections
+		notebook/services/kernels/tests/test_kernels_api.py::AsyncKernelAPITest::test_connections
+		notebook/services/kernels/tests/test_kernels_api.py::KernelCullingTest::test_culling
+	)
+
+	# selenium tests require geckodriver
+	epytest --ignore notebook/tests/selenium ${deselect[@]/#/--deselect }
+}
+
+python_install() {
+	distutils-r1_python_install
+
+	ln -sf \
+		"${EPREFIX}/usr/share/mathjax" \
+		"${D}$(python_get_sitedir)/notebook/static/components/MathJax" || die
+}
+
+pkg_preinst() {
+	# remove old mathjax folder if present
+	rm -rf "${EROOT}"/usr/lib*/python*/site-packages/notebook/static/components/MathJax || die
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+}
diff --git a/dev-python/progressbar2/Manifest b/dev-python/progressbar2/Manifest
index 91e1ccfb2905..06d3c6e07672 100644
--- a/dev-python/progressbar2/Manifest
+++ b/dev-python/progressbar2/Manifest
@@ -1 +1,2 @@
 DIST progressbar2-3.53.1.tar.gz 44741 BLAKE2B 80f406adf42c5c57ecad87002426115e1254339d5cd310dd42f560f48a1123702dffbba8f26114a01f2bd5be75a29cb12cc1c091d5554509b6282ceb2b66fb76 SHA512 4817bbb45d0f51ee2b3feceec56b3177ed5d0561894a13eea53a30e8b9aad5805483b5b669af93f3fd0cc958984b8a5c2a14ba3591e0a85be12180d057bc2f81
+DIST progressbar2-3.53.3.tar.gz 240718 BLAKE2B 01f0d0cf6c546855d2cac10cc1164fb68308b60e1095499f8838d7c82127860235f65d742a137db5acdce6ac50e65aff7580a6f6a344942d4c78375cc23085b4 SHA512 6399d8fa8270fc0241969d94ce284161516b42c0fdc3fbf2dfe8a0dfcca72933d23ec9b99c4118cebbca376f5821337aacd11fcee6eee5988d6caf73d1f3112d
diff --git a/dev-python/progressbar2/progressbar2-3.53.3.ebuild b/dev-python/progressbar2/progressbar2-3.53.3.ebuild
new file mode 100644
index 000000000000..a7334941e357
--- /dev/null
+++ b/dev-python/progressbar2/progressbar2-3.53.3.ebuild
@@ -0,0 +1,33 @@
+# 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} pypy3 )
+inherit distutils-r1
+
+DESCRIPTION="Text progressbar library for python"
+HOMEPAGE="https://progressbar-2.readthedocs.io/ https://pypi.org/project/progressbar2/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-python/python-utils[${PYTHON_USEDEP}]
+	!dev-python/progressbar
+"
+BDEPEND="
+	test? ( dev-python/freezegun[${PYTHON_USEDEP}] )"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	sed -i -e '/cov/d' pytest.ini || die
+	default
+}
+
+python_test() {
+	PYTHONDONTWRITEBYTECODE=1 epytest tests
+}
diff --git a/dev-python/requests-cache/Manifest b/dev-python/requests-cache/Manifest
index 5be3e760ee26..d707c4a20b5a 100644
--- a/dev-python/requests-cache/Manifest
+++ b/dev-python/requests-cache/Manifest
@@ -3,4 +3,6 @@ DIST requests-cache-0.7.1.gh.tar.gz 959455 BLAKE2B ce41514f21dc0708e437f70b92eb9
 DIST requests-cache-0.7.2.gh.tar.gz 962215 BLAKE2B 0f66548b4c37c14347021a4675d0165b9f9648dc9842f1d94c9507c096f6ef359f7109f88ac369de2de263673542f42d6e4a7402449354aee900970331f87cea SHA512 1712f3568ec4c8c41988c9d2ca07e72b1a66efceb596d814219b5eb9bb0c05448ee33b4634ec39fb03634032a6bfaaf877b297be7f92f540788dba40b4c202df
 DIST requests-cache-0.7.3.gh.tar.gz 1182825 BLAKE2B bc2b936f3b13388c23c344119a0ae2dc8efae3ba243e3a176ac27a7affb9b1c691e99ee88dfa61823a5c517ea898f144c7a9450867ea611c8518a0ecb3d77287 SHA512 fca494438001d14b0edce2cf93f51f65a0bf363d31bf1c70d1a4b2f214fe7bfc6f6f6fc97d21357fcfb9ab38c83d76cabe9c0ff4703171679ce509bd9f55753f
 DIST requests-cache-0.7.4.gh.tar.gz 1254975 BLAKE2B f0df6ac156665f8eed8850e153bfa3738d8c6677ff1613a54fcbf3208861c590e5e0ede3d5c30eeda36dcd709390402a020e03a0180e701e0751c5c982903a35 SHA512 684a3182135b6a31816629c8b4a174b52a629e964a5862573df1ac6e9e9b5cb807d1661a3a6daf8cc4b2a0f6778bd780d822a2f6c409242aa090c6565adf0aab
+DIST requests-cache-0.7.5.gh.tar.gz 1254930 BLAKE2B 7dec609d8e5d5570247bc45c33763bc35006104082235575feb336d1d386a36d18ef1e4403703aa532bc5c8e1f7cf4f741aa91bb94be4bd1fd85fe7cc9adb9b1 SHA512 656791e54f7c8dfd6518054434aa4dd03e5ce027fb36b38675d99284536abefb11883f53c6ec2f11e3f8efb473f0d1e9cede100eac82005ee023b7778848f588
 DIST requests-cache-0.8.0.gh.tar.gz 1642151 BLAKE2B e341707b2473438a8c4155350bce3e0fc712537692991e23965aa6504e8eed735caae8b103896bd324882a8f73f13f36b23b329c3c155864c1b7665c6bcc4e2a SHA512 b9f1769f70b33f128aacf05a2251f9d2511649a4e80cb702c14ac3fcbfaf72d1049a5792a295286b6969985320a0d5a87ef81bfe3bacbbc200042ba51889b7ea
+DIST requests-cache-0.8.1.gh.tar.gz 1540290 BLAKE2B ac9d7cdaa553400484776236b13f356e4e80a7c3aa5e63563dad860302cb421b7ceeb61e80af436cf9559467c4b2cd5e8363ae05e703661b88bf3ac04601ee30 SHA512 245ee7059afab50f32af9c8831fe11c14d5bd53fe6bbf02e5844974e0e5ea6c33e005f234485f245ee418ae03277c6e2cc41046a385ff138e58785cf37b119ea
diff --git a/dev-python/requests-cache/requests-cache-0.7.5.ebuild b/dev-python/requests-cache/requests-cache-0.7.5.ebuild
new file mode 100644
index 000000000000..5c2349760cbf
--- /dev/null
+++ b/dev-python/requests-cache/requests-cache-0.7.5.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_SETUPTOOLS=pyproject.toml
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+PYTHON_REQ_USE="sqlite"
+
+inherit distutils-r1
+
+HOMEPAGE="
+	https://pypi.org/project/requests-cache/
+	https://github.com/reclosedev/requests-cache/"
+DESCRIPTION="Persistent cache for requests library"
+SRC_URI="
+	https://github.com/reclosedev/requests-cache/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-python/cattrs[${PYTHON_USEDEP}]
+	dev-python/itsdangerous[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.0.0[${PYTHON_USEDEP}]
+	>=dev-python/url-normalize-1.4[${PYTHON_USEDEP}]"
+BDEPEND="
+	test? (
+		dev-python/pytest-httpbin[${PYTHON_USEDEP}]
+		dev-python/requests-mock[${PYTHON_USEDEP}]
+		dev-python/responses[${PYTHON_USEDEP}]
+		dev-python/timeout-decorator[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local EPYTEST_IGNORE=(
+		# These require extra servers running
+		tests/integration/test_dynamodb.py
+		tests/integration/test_gridfs.py
+		tests/integration/test_mongodb.py
+		tests/integration/test_redis.py
+	)
+	local EPYTEST_DESELECT=(
+		# Requires Internet access
+		tests/integration/test_compat.py::test_version_upgrade
+	)
+
+	local -x USE_PYTEST_HTTPBIN=true
+	epytest
+}
diff --git a/dev-python/requests-cache/requests-cache-0.8.1.ebuild b/dev-python/requests-cache/requests-cache-0.8.1.ebuild
new file mode 100644
index 000000000000..5c2349760cbf
--- /dev/null
+++ b/dev-python/requests-cache/requests-cache-0.8.1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_SETUPTOOLS=pyproject.toml
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+PYTHON_REQ_USE="sqlite"
+
+inherit distutils-r1
+
+HOMEPAGE="
+	https://pypi.org/project/requests-cache/
+	https://github.com/reclosedev/requests-cache/"
+DESCRIPTION="Persistent cache for requests library"
+SRC_URI="
+	https://github.com/reclosedev/requests-cache/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-python/cattrs[${PYTHON_USEDEP}]
+	dev-python/itsdangerous[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.0.0[${PYTHON_USEDEP}]
+	>=dev-python/url-normalize-1.4[${PYTHON_USEDEP}]"
+BDEPEND="
+	test? (
+		dev-python/pytest-httpbin[${PYTHON_USEDEP}]
+		dev-python/requests-mock[${PYTHON_USEDEP}]
+		dev-python/responses[${PYTHON_USEDEP}]
+		dev-python/timeout-decorator[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local EPYTEST_IGNORE=(
+		# These require extra servers running
+		tests/integration/test_dynamodb.py
+		tests/integration/test_gridfs.py
+		tests/integration/test_mongodb.py
+		tests/integration/test_redis.py
+	)
+	local EPYTEST_DESELECT=(
+		# Requires Internet access
+		tests/integration/test_compat.py::test_version_upgrade
+	)
+
+	local -x USE_PYTEST_HTTPBIN=true
+	epytest
+}
diff --git a/dev-python/ruamel-yaml/Manifest b/dev-python/ruamel-yaml/Manifest
index d846063a321c..457d7cb07428 100644
--- a/dev-python/ruamel-yaml/Manifest
+++ b/dev-python/ruamel-yaml/Manifest
@@ -1,5 +1,3 @@
 DIST ruamel-yaml-0.17.10.tar.xz 183116 BLAKE2B 2795f470a3f7da609780109dfac502a5b47184f465c68420f467209275c8857418a4ec7424e130df2e7acef614d93f91551910eceb06cd9e49b365bb23d2a015 SHA512 3cd2598fa37564c44c74720e72babcd2252b2dbcdde626bdcf771b591da5d2852d90bb1f22428e28cd7ec38304be2a437aa0569ffbd3ebb526b2b79a955bc88d
-DIST ruamel.yaml-0.17.11.tar.xz 183476 BLAKE2B 02a1693d3a20f44b7f82668918a53d06f9fa5c0cff6f149fe51de3fbb3551e823f3a7a2f0f4e818f43e2974eaf95c4219d53738bad78544c6bb1f19d85457715 SHA512 8f24b33592c37fd1d370cb6367a3652e72df3d88c7a14fff187aaa8622b9bbd77e780193fcd920916eca7f627dd37c87eb9b987d091c944ff08ef25ee4567b45
-DIST ruamel.yaml-0.17.13.tar.xz 183676 BLAKE2B 7b1be322f99a9cf6b4c5eb9722e4e425641c686574e6bafbed06e094e54ad93ea858c38779bb9f8c4fbc03916fcf7a65c4a3f4514bd8f10c46a8f6d112785350 SHA512 285572292e91702b6ad1e383fdc4f6434297f36ee9949859d2f5a21d23090957d9aabe323f505594fa10dc42822c3384b017c6ea7c3b04633925a291324392a6
-DIST ruamel.yaml-0.17.14.tar.xz 183784 BLAKE2B cc223db89073aa3ba722a8b9a438c118cc4ef2e44f93b3768275776ee5440cbf1de0b1dc4d26ac3c51560c45711df0113076e885e2cc368f542ba02e51608d65 SHA512 5dfd608a79900ec74d570af9af22304d99dce19ce28ed32cb5f53ee71ec31033555da18fb3afe8d52291eb3a6320a91838e9e128047e359f4eea19f6105c76b4
 DIST ruamel.yaml-0.17.15.tar.xz 183820 BLAKE2B 901c08d05994a45cb9d8e7071244332c7b3f30fb83f22f9f2f9cfb769ec99ebc39fbdbcf652bc8e7ae8e5b9918aafbc229bcfcbeb1b7d64bd4bed2f8fe0d9ee7 SHA512 cd2fd4d0e2aba1f3f90bd54b355fa603045e913f90c7e460bcc4630619db027b1283af77c613fdc029f48300d8822ca349fb169e30679a1dd86beb1a3f75c49f
+DIST ruamel.yaml-0.17.16.tar.xz 183884 BLAKE2B 3f7b0995cfa49ed9e19b5dafbddc7514f58ab23186410b4a718027112be471d9136675259800e0136b21ad6d1645c364f14ac071dc10d12a5f60aefdc05bc56f SHA512 7da1e5c229b78ecdccd648fb6a734095c0a1e0848eaf46af93e6ce69f5e065cdd07eb65217f8b3e4c82ce383dc11de07a1345026c6782aa26c4ad0f5a85fd80f
diff --git a/dev-python/ruamel-yaml/ruamel-yaml-0.17.11.ebuild b/dev-python/ruamel-yaml/ruamel-yaml-0.17.11.ebuild
deleted file mode 100644
index 269c1607ce72..000000000000
--- a/dev-python/ruamel-yaml/ruamel-yaml-0.17.11.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# 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} pypy3 )
-inherit distutils-r1
-
-MY_P="${P/-/.}"
-DESCRIPTION="YAML parser/emitter that supports roundtrip comment preservation"
-HOMEPAGE="
-	https://pypi.org/project/ruamel.yaml/
-	https://sourceforge.net/p/ruamel-yaml/"
-# PyPI tarballs do not include tests
-SRC_URI="mirror://sourceforge/ruamel-dl-tagged-releases/${MY_P}.tar.xz"
-S="${WORKDIR}"/${MY_P}
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
-
-RDEPEND="
-	dev-python/namespace-ruamel[${PYTHON_USEDEP}]
-	dev-python/ruamel-yaml-clib[${PYTHON_USEDEP}]"
-BDEPEND="
-	test? (
-		dev-python/ruamel-std-pathlib[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
-
-# Old PyYAML tests from lib/ require special set-up and are invoked indirectly
-# via test_z_olddata, tell pytest itself to leave the subdir alone.
-python_test() {
-	local deselect=()
-
-	[[ ${EPYTHON} == pypy3 ]] && deselect+=(
-		_test/test_deprecation.py::test_collections_deprecation
-	)
-
-	epytest --ignore _test/lib/ ${deselect[@]/#/--deselect }
-}
-
-python_install() {
-	distutils-r1_python_install --single-version-externally-managed
-	find "${ED}" -name '*.pth' -delete || die
-}
diff --git a/dev-python/ruamel-yaml/ruamel-yaml-0.17.13.ebuild b/dev-python/ruamel-yaml/ruamel-yaml-0.17.13.ebuild
deleted file mode 100644
index 269c1607ce72..000000000000
--- a/dev-python/ruamel-yaml/ruamel-yaml-0.17.13.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# 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} pypy3 )
-inherit distutils-r1
-
-MY_P="${P/-/.}"
-DESCRIPTION="YAML parser/emitter that supports roundtrip comment preservation"
-HOMEPAGE="
-	https://pypi.org/project/ruamel.yaml/
-	https://sourceforge.net/p/ruamel-yaml/"
-# PyPI tarballs do not include tests
-SRC_URI="mirror://sourceforge/ruamel-dl-tagged-releases/${MY_P}.tar.xz"
-S="${WORKDIR}"/${MY_P}
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
-
-RDEPEND="
-	dev-python/namespace-ruamel[${PYTHON_USEDEP}]
-	dev-python/ruamel-yaml-clib[${PYTHON_USEDEP}]"
-BDEPEND="
-	test? (
-		dev-python/ruamel-std-pathlib[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
-
-# Old PyYAML tests from lib/ require special set-up and are invoked indirectly
-# via test_z_olddata, tell pytest itself to leave the subdir alone.
-python_test() {
-	local deselect=()
-
-	[[ ${EPYTHON} == pypy3 ]] && deselect+=(
-		_test/test_deprecation.py::test_collections_deprecation
-	)
-
-	epytest --ignore _test/lib/ ${deselect[@]/#/--deselect }
-}
-
-python_install() {
-	distutils-r1_python_install --single-version-externally-managed
-	find "${ED}" -name '*.pth' -delete || die
-}
diff --git a/dev-python/ruamel-yaml/ruamel-yaml-0.17.14.ebuild b/dev-python/ruamel-yaml/ruamel-yaml-0.17.14.ebuild
deleted file mode 100644
index 269c1607ce72..000000000000
--- a/dev-python/ruamel-yaml/ruamel-yaml-0.17.14.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# 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} pypy3 )
-inherit distutils-r1
-
-MY_P="${P/-/.}"
-DESCRIPTION="YAML parser/emitter that supports roundtrip comment preservation"
-HOMEPAGE="
-	https://pypi.org/project/ruamel.yaml/
-	https://sourceforge.net/p/ruamel-yaml/"
-# PyPI tarballs do not include tests
-SRC_URI="mirror://sourceforge/ruamel-dl-tagged-releases/${MY_P}.tar.xz"
-S="${WORKDIR}"/${MY_P}
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
-
-RDEPEND="
-	dev-python/namespace-ruamel[${PYTHON_USEDEP}]
-	dev-python/ruamel-yaml-clib[${PYTHON_USEDEP}]"
-BDEPEND="
-	test? (
-		dev-python/ruamel-std-pathlib[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
-
-# Old PyYAML tests from lib/ require special set-up and are invoked indirectly
-# via test_z_olddata, tell pytest itself to leave the subdir alone.
-python_test() {
-	local deselect=()
-
-	[[ ${EPYTHON} == pypy3 ]] && deselect+=(
-		_test/test_deprecation.py::test_collections_deprecation
-	)
-
-	epytest --ignore _test/lib/ ${deselect[@]/#/--deselect }
-}
-
-python_install() {
-	distutils-r1_python_install --single-version-externally-managed
-	find "${ED}" -name '*.pth' -delete || die
-}
diff --git a/dev-python/ruamel-yaml/ruamel-yaml-0.17.16.ebuild b/dev-python/ruamel-yaml/ruamel-yaml-0.17.16.ebuild
new file mode 100644
index 000000000000..269c1607ce72
--- /dev/null
+++ b/dev-python/ruamel-yaml/ruamel-yaml-0.17.16.ebuild
@@ -0,0 +1,47 @@
+# 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} pypy3 )
+inherit distutils-r1
+
+MY_P="${P/-/.}"
+DESCRIPTION="YAML parser/emitter that supports roundtrip comment preservation"
+HOMEPAGE="
+	https://pypi.org/project/ruamel.yaml/
+	https://sourceforge.net/p/ruamel-yaml/"
+# PyPI tarballs do not include tests
+SRC_URI="mirror://sourceforge/ruamel-dl-tagged-releases/${MY_P}.tar.xz"
+S="${WORKDIR}"/${MY_P}
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+RDEPEND="
+	dev-python/namespace-ruamel[${PYTHON_USEDEP}]
+	dev-python/ruamel-yaml-clib[${PYTHON_USEDEP}]"
+BDEPEND="
+	test? (
+		dev-python/ruamel-std-pathlib[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
+
+# Old PyYAML tests from lib/ require special set-up and are invoked indirectly
+# via test_z_olddata, tell pytest itself to leave the subdir alone.
+python_test() {
+	local deselect=()
+
+	[[ ${EPYTHON} == pypy3 ]] && deselect+=(
+		_test/test_deprecation.py::test_collections_deprecation
+	)
+
+	epytest --ignore _test/lib/ ${deselect[@]/#/--deselect }
+}
+
+python_install() {
+	distutils-r1_python_install --single-version-externally-managed
+	find "${ED}" -name '*.pth' -delete || die
+}
diff --git a/dev-python/subprocess-tee/Manifest b/dev-python/subprocess-tee/Manifest
index cb2773b8f7ab..d3173fa08715 100644
--- a/dev-python/subprocess-tee/Manifest
+++ b/dev-python/subprocess-tee/Manifest
@@ -1 +1,2 @@
 DIST subprocess-tee-0.3.2.tar.gz 14975 BLAKE2B 3198832f4c8bbf90e83038e39017cff1efc61ede84aded8220214e388a088777bdb861c044cddbf4b07c7b3172f8164e8bbf82b33de68d1fefea0f81bbacdfc9 SHA512 e681abc27623a3e05031bc05dc15e34f82c9cb544cd16742855411a9edb11fe8e38f9d11f8e651681d04081f121a47c38ebd172d70d282c8110a62699ef687d6
+DIST subprocess-tee-0.3.4.tar.gz 16013 BLAKE2B 6a98caa111a73ef7062f26796dd3e919d05103ae4de88e2c5ce3acc04d9fbde6b31e39a1cee1984fd8d59b8168ab33faf7ff15c916d52a226ff2cb760fd8c796 SHA512 6a97ddc75b7e7954bb7f5f3bf05807e8dd892869cc13e60344c5f40363bdff4ec5441f829cfbcb8c3c4ab7f7b2697c0b1d4a871be8164acd7cfb6fea5032ae4b
diff --git a/dev-python/subprocess-tee/subprocess-tee-0.3.4.ebuild b/dev-python/subprocess-tee/subprocess-tee-0.3.4.ebuild
new file mode 100644
index 000000000000..8547a8d7e83f
--- /dev/null
+++ b/dev-python/subprocess-tee/subprocess-tee-0.3.4.ebuild
@@ -0,0 +1,40 @@
+# 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
+
+DESCRIPTION="subprocess.run replacement with tee(1)-like output"
+HOMEPAGE="https://github.com/pycontribs/subprocess-tee"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+BDEPEND="dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	dev-python/setuptools_scm_git_archive[${PYTHON_USEDEP}]
+	test? (
+		$(python_gen_cond_dep '
+			dev-python/enrich[${PYTHON_USEDEP}]
+		' python3_{8,9})
+	)"
+
+distutils_enable_tests pytest
+# Depends on app-admin/ansible-molecule, which pulls in A LOT of other
+# ebuilds - including subprocess-tee itself. Too much trouble for a single
+# test if you ask me.
+EPYTEST_DESELECT=( "src/${PN/-/_}/test/test_func.py::test_molecule" )
+
+# dev-python/{,en}rich ebuilds do not support python3_10 yet.
+# We test fine (modulo some deprecation warnings) against 3.10 under tox, though.
+python_test() {
+	if [[ ${EPYTHON} == "python3.10" ]]; then
+		ewarn "Skipping tests for ${EPYTHON} due to missing dependencies"
+		return 0
+	fi
+	distutils-r1_python_test
+}
diff --git a/dev-python/yamlpath/Manifest b/dev-python/yamlpath/Manifest
index 66b3b1648fbe..4fb29dcb8eb1 100644
--- a/dev-python/yamlpath/Manifest
+++ b/dev-python/yamlpath/Manifest
@@ -1 +1 @@
-DIST yamlpath-3.6.0.tar.gz 214052 BLAKE2B 6b969a8c6e63f879e9c9f17f4542a48e55987835f99f10867577d93107813b684cfa0bf647f6d11b8ef8f02438e7e72f847eb0a29761a169950f8a5c6ee0ec5b SHA512 377cd281b4e7df251bbb298977c258e1a547ce4726ad321e5bf500242884049d3e052b83b83b72d477111fe121bd483d5122427498a5ebf784ab6d86d92d6ed6
+DIST yamlpath-3.6.1.tar.gz 214053 BLAKE2B 5c72ffc4e4307f1a3fea7a697782c432402acc1ee929de34a702188d51287fd7187b688354533163b7101dc17ed394f0e2681a1a194807f00762bf6c71387292 SHA512 8ef8e1931118ed881d52b6d7f589b1c671694c211cb1c988e7e6945b7ff5408163bd402f52c1815b453bf8ccc61e8b8ed5c19a00be076d8e76e0a037461a12e2
diff --git a/dev-python/yamlpath/yamlpath-3.6.0.ebuild b/dev-python/yamlpath/yamlpath-3.6.0.ebuild
deleted file mode 100644
index 8e5362e754d8..000000000000
--- a/dev-python/yamlpath/yamlpath-3.6.0.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1
-
-DESCRIPTION="Command-line processors for YAML/JSON/Compatible data."
-HOMEPAGE="https://github.com/wwkimball/yamlpath https://github.com/wwkimball/yamlpath/wiki"
-SRC_URI="https://github.com/wwkimball/yamlpath/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-RESTRICT="test"
-RDEPEND="
-	dev-python/ruamel-yaml[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	${RDEPEND}
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
-"
-
-python_prepare_all() {
-	local sed_args
-
-	sed_args=(
-		-e 's|\("ruamel\.yaml\)[^"]*|\1|'
-		-e '/pytest-cov/d'
-		-e '/pytest-console-scripts/d'
-	)
-	sed "${sed_args[@]}" -i setup.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	PYTHONPATH="${S}" py.test -v tests || die "Tests failed under ${EPYTHON}"
-}
-
-yamlpath_post_src_install() {
-	local sitedir=$(python_get_sitedir)
-	[[ -d ${D}${sitedir} ]] || die "${D}${sitedir}: No such directory"
-	insinto "${sitedir}/yamlpath"
-	doins -r "${S}/yamlpath/patches"
-	python_optimize "${D}${sitedir}" || die
-}
-
-src_install() {
-	find "${WORKDIR}" -name tests -print0 | xargs -0 rm -rf || die
-	distutils-r1_src_install
-
-	python_foreach_impl yamlpath_post_src_install
-}
diff --git a/dev-python/yamlpath/yamlpath-3.6.1.ebuild b/dev-python/yamlpath/yamlpath-3.6.1.ebuild
new file mode 100644
index 000000000000..fe072351325c
--- /dev/null
+++ b/dev-python/yamlpath/yamlpath-3.6.1.ebuild
@@ -0,0 +1,56 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+DISTUTILS_USE_SETUPTOOLS=bdepend
+
+inherit distutils-r1
+
+DESCRIPTION="Command-line processors for YAML/JSON/Compatible data."
+HOMEPAGE="https://github.com/wwkimball/yamlpath https://github.com/wwkimball/yamlpath/wiki"
+SRC_URI="https://github.com/wwkimball/yamlpath/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+RESTRICT="test"
+RDEPEND="
+	dev-python/ruamel-yaml[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	${RDEPEND}
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
+"
+
+python_prepare_all() {
+	local sed_args
+
+	sed_args=(
+		-e 's|\("ruamel\.yaml\)[^"]*|\1|'
+		-e '/pytest-cov/d'
+		-e '/pytest-console-scripts/d'
+	)
+	sed "${sed_args[@]}" -i setup.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	PYTHONPATH="${S}" py.test -v tests || die "Tests failed under ${EPYTHON}"
+}
+
+yamlpath_post_src_install() {
+	local sitedir=$(python_get_sitedir)
+	[[ -d ${D}${sitedir} ]] || die "${D}${sitedir}: No such directory"
+	insinto "${sitedir}/yamlpath"
+	doins -r "${S}/yamlpath/patches"
+	python_optimize "${D}${sitedir}" || die
+}
+
+src_install() {
+	find "${WORKDIR}" -name tests -print0 | xargs -0 rm -rf || die
+	distutils-r1_src_install
+
+	python_foreach_impl yamlpath_post_src_install
+}
diff --git a/dev-python/zeroconf/Manifest b/dev-python/zeroconf/Manifest
index 2e3cf73d59ee..d8e01bbbaf27 100644
--- a/dev-python/zeroconf/Manifest
+++ b/dev-python/zeroconf/Manifest
@@ -2,3 +2,4 @@ DIST python-zeroconf-0.33.4.gh.tar.gz 121380 BLAKE2B a1a8ac266aaded65337aa9d5c26
 DIST python-zeroconf-0.35.1.gh.tar.gz 127099 BLAKE2B dc09dadaeaac64d8517de407ddcfffc4152e366430c492d4ab562c56afa3264c33a26373f249bbddd969bb28dbc5c1b7513e59c0ebb728c12a77fb9d428e4f0a SHA512 27386cd425928821080c9c6fd2babdcfc001cc4583ef4c699169e3818f6bb8536f712cf7959e6003a6aaf40e85b5337a8a5abcfdf686455dee577cfa61270fb7
 DIST python-zeroconf-0.36.1.gh.tar.gz 128104 BLAKE2B a5f2fdf35dd8c51e727ad1f4cd9ba442f2b99fd7ecc6ce0ce9cb0331997f445be90bba17571cec5ec0f59b64268241abacb5aee39134427098902b8d592494c6 SHA512 c568dd836a101a47ef74318154cd6c7fe2eb93c674450596f8e6ec4b7cfb66740126cc994b8f4d98458dd64a16c971ebab29b0877366396b8f5fabd03341107c
 DIST python-zeroconf-0.36.2.gh.tar.gz 129052 BLAKE2B 4bdc4ac13064e162590af12da2d89cd566fbe749f1b11ebef210b2adbe7e33e75ff0e95d3ed11f7d045e016fff525c9a7b9124804d741160b0073016f4757d09 SHA512 2f2a7a87afa07907ed3aa3cd79d2f2e9b61e82193301f219f0505831349b003bca1ae2b6fc1dc71fcf6cb9cfb849413f9766ef88e3955fc569ad84fb9e5e5b60
+DIST python-zeroconf-0.36.3.gh.tar.gz 128887 BLAKE2B 57fa2359f5086eff9069334738db7515607309849b5d1e6bedfa16a7d24a12c068cf139d6885a85c418bf22c1033fa437670be6cce09b758af6d073f3cb37123 SHA512 a93799713ee7c4d507b350b4074bca23556275b1a1a14795a621f2cd9c10cf711fd80333e5685dae753207db265ab454a5bfe965cf44de77121bccd5ce8e1625
diff --git a/dev-python/zeroconf/zeroconf-0.36.3.ebuild b/dev-python/zeroconf/zeroconf-0.36.3.ebuild
new file mode 100644
index 000000000000..727d5570c1fd
--- /dev/null
+++ b/dev-python/zeroconf/zeroconf-0.36.3.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
+)
-- 
cgit v1.3