Adding metadata

70 files changed, 1030 insertions, 73 deletions

diff --git a/dev-python/Faker/Faker-8.7.0.ebuild b/dev-python/Faker/Faker-8.7.0.ebuild
new file mode 100644
index 000000000000..0473bf2016c8
--- /dev/null
+++ b/dev-python/Faker/Faker-8.7.0.ebuild
@@ -0,0 +1,28 @@
+# 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} )
+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 824d550d7251..3e7b71a90391 100644
--- a/dev-python/Faker/Manifest
+++ b/dev-python/Faker/Manifest
@@ -1,2 +1,3 @@
 DIST Faker-8.5.1.tar.gz 1147272 BLAKE2B 5842f7ea74cb5eb02bd149e95fbff3d6a75bb007e1e9de98a808854c37b59bd337f17617c4dd8cd899a6740babd4a501bb09bf840cfbbb689c529517ff30271d SHA512 a787bbf4bacd06e7af777e4f10714167d7e9e8ad743cf99d51a3a4c312ded8e5085559f667ab6fca3a6df87650feabf88b0ec647e049c26576e65b3a77191ad4
 DIST Faker-8.6.0.tar.gz 1147647 BLAKE2B 6d3903ec2d75bae963879485572f7781455ff2411f34626ba21627e1b4d59295e983530ef6c8172dd3d6332eed511af3190c4e84dd345a08d5b5746217acb26b SHA512 fa2012d87184d53e91d067f30d107d2731eef72838e74ab82845c61d3074828392e4efd12051b16ae52c251fe9eb58b98df8bd55e81eca0a9e1940b1f74b2e7f
+DIST Faker-8.7.0.tar.gz 1147940 BLAKE2B 9f0548472aa3ac092c2cf63da73fc456207da9ff4e405373ff7d2c8e02afff75912e1c3ac03a1d87981d66dfdb7ca611ae9ab2c8638c610032486e09ea37930f SHA512 cd75674aa959854701d2ba47f5f0638be730dbe1e4e6a6f9d551b100a65b8fc53cd9a5b1568a473bcf7c8044d2a3bd4ce7b621c8e7bc0bf002a5eb5afa5a6b96
diff --git a/dev-python/bitarray/Manifest b/dev-python/bitarray/Manifest
index 3e33ee475229..28015adcad40 100644
--- a/dev-python/bitarray/Manifest
+++ b/dev-python/bitarray/Manifest
@@ -1,2 +1,2 @@
-DIST bitarray-2.0.1.tar.gz 69368 BLAKE2B 4acc490998e058e3882db2d58ad80b8c275999f49a7a76604091beae8015e7290691f6b34947c3376795b9dc5643592ab7fd09ef5a482a29e4e154616926e444 SHA512 091a0e7b1ddbdb804241eb4f51c9167dcfefb55d5bcef1eaa617ac77593a58113b47f57be83ceed47a91bc5d8d15a8a2e6053a10243323b9f7c0908444ab03af
 DIST bitarray-2.1.0.tar.gz 71169 BLAKE2B 8d82d49ac309605d989d29d492dbb94dd59c633f0987220ed28bbca7d2c3b0c4566ce147d0f65893c5dfaf1c2f702870d95181dfaa969050e13bcd4a9664ef51 SHA512 e91200b8829b63f297a1882fab293ac007991740a739587ba473abce183aa79a85e08db8a0fca5729b6e1d3e130965b2f14dc40acccf12d3231852498e2fb141
+DIST bitarray-2.1.1.tar.gz 72522 BLAKE2B 28afebad24c574706f3cc57d1b82890d8e98a2ba745765a1a8d9e60a630a1e1e6e467bdd7b953c4c75b08b302658f7704d83a8e01b351c1e99e66ebd52fbbf83 SHA512 d690e266d1ac9f8fba6f2dd2770b80d1fbb2a53baf2ba759c946a2d371d9804e5bfd6792fc2a64809fc10e78563e106c2d357474fa515423fdcd6964a8191718
diff --git a/dev-python/bitarray/bitarray-2.0.1.ebuild b/dev-python/bitarray/bitarray-2.1.1.ebuild
index 012b3f886892..012b3f886892 100644
--- a/dev-python/bitarray/bitarray-2.0.1.ebuild
+++ b/dev-python/bitarray/bitarray-2.1.1.ebuild
diff --git a/dev-python/boto3/Manifest b/dev-python/boto3/Manifest
index 59d4f6987829..f416c2a947f6 100644
--- a/dev-python/boto3/Manifest
+++ b/dev-python/boto3/Manifest
@@ -14,3 +14,4 @@ DIST boto3-1.17.89.tar.gz 379572 BLAKE2B 8a067aa757974cc3399de29173a6fcf99d35196
 DIST boto3-1.17.90.tar.gz 379938 BLAKE2B 72392968678576505a4c80f62ca0b3f7cf086a7c739a918b6d39d7c8b05a2a1b9648d7028126bb6c2893da44bc9bd5367089beb12a187d48c09712f2b6d7a95a SHA512 75f2d02c1256a2a60a4f87d774d5a339e556180482419c21774ec41a5980fd0149e7d66f52cb408035b394550bbbdcb2710de1fd6f948cccd91064e5d94f20ca
 DIST boto3-1.17.91.tar.gz 380247 BLAKE2B 8017241fce7337ed88f8da35ad914081d7b4a83c7ad78c6b1aea1408909f438c4b86c64501b5aa5c8522476bb9962ed94089b51ed89794062e7d937dbe0063b5 SHA512 d8a083911cfb930e7a7b1fe587fd33f7cf9a523683685e4929b63a8dde8502178d44091c6b8885a40052f03e7b8fd6a48e332ff5cff3a12fa7290d922eff9fe0
 DIST boto3-1.17.92.tar.gz 381619 BLAKE2B ea7f1d7fbc1481d22f5e5bce9d051e9d825de215fd9efc9396c9d11723eac70e422b68d9f72a429ddd0bfe9976ad0e6e3c7e7bff74af388996c3e48ac6f383fc SHA512 a96d57eb19e794b4b7a1d4b1ee142f601ca5a10ba7c20500dd3e570131904874fe470cb1ef7146f7eb4ba189a91f9b42dd58acb0c8d54216352c03ae173f8092
+DIST boto3-1.17.93.tar.gz 382205 BLAKE2B c665f3a98ffffd3a146914e5c061ec222def64ffffcf2bfcf1fabd86ba5be89d61fe4201b81134fd415b80710ed7d4261ed26eb71fec9c64525f4c2f3ff88533 SHA512 bb1f3264cfa4717f32343553f5af1d35dc7bab813d968775456239a758111cbc7eb6514df42cc3675f1d693f5bae33c048fcdae98c348d3aa54cbb6e98d88f70
diff --git a/dev-python/boto3/boto3-1.17.93.ebuild b/dev-python/boto3/boto3-1.17.93.ebuild
new file mode 100644
index 000000000000..76a508785b03
--- /dev/null
+++ b/dev-python/boto3/boto3-1.17.93.ebuild
@@ -0,0 +1,56 @@
+# 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="The AWS SDK for Python"
+HOMEPAGE="https://github.com/boto/boto3"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/boto/boto3"
+	inherit git-r3
+	BOTOCORE_PV=${PV}
+else
+	SRC_URI="https://github.com/boto/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+	# botocore is x.(y+3).z
+	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
+fi
+
+RDEPEND="
+	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
+	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
+	>=dev-python/s3transfer-0.3.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx docs/source \
+	'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests nose
+
+python_prepare_all() {
+	# don't lock versions to narrow ranges
+	sed -e '/botocore/ d' \
+		-e '/jmespath/ d' \
+		-e '/s3transfer/ d' \
+		-i setup.py || die
+
+	# prevent an infinite loop
+	rm tests/functional/docs/test_smoke.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	nosetests -v tests/unit/ tests/functional/ || die "test failed under ${EPYTHON}"
+}
diff --git a/dev-python/botocore/Manifest b/dev-python/botocore/Manifest
index d87bee99bb5c..c84fca9a69e1 100644
--- a/dev-python/botocore/Manifest
+++ b/dev-python/botocore/Manifest
@@ -14,3 +14,4 @@ DIST botocore-1.20.89.tar.gz 7808318 BLAKE2B cc160b85d7e85267aa4bd7140c8f90b33dc
 DIST botocore-1.20.90.tar.gz 7810567 BLAKE2B f34ce1e4ed16254585a90e3ba1674a35909169a0a73a216e0b5d60609567133ce1257fc3b48a21e3c707b42db546612f40263e20fb68eba1e01cc3560ed5ef15 SHA512 4765abfe9913bb214d1c4aeacc00f5b5745322121bbb1e652705fbd63a9801476e513596078f833306834047f42b39edc9de31939f02860476fdb825f4b654b1
 DIST botocore-1.20.91.tar.gz 7822478 BLAKE2B d76b3a944f951a9722e59d28218e24eacbcc9282235df6adbbf9ac01b12dc96e446a7dbec06ab08433513a3f1dd1f39ac8db85c4aa3cfcd99348fa57e85b2246 SHA512 730b664b050db5df7c9f9f3ab89e7c7f541b0c921a0a6f38f4d0d7a4594f89b61929d5251799c2cf08bda1107567c636d036379b328db788178ae7af18157366
 DIST botocore-1.20.92.tar.gz 7826845 BLAKE2B 8568b8be7440807fae48f735198059356764c7f36db1dfcf73801379ea90b728bb02a086e19a202bb5b3a7c05886edbc22ca729a1ea43ac1f38ad96b64a6c28b SHA512 0cba710b28086b4e83c6269e74ca3531b26497d438e28b8ea285f7fbee0da43545134d22fe5fb300d3c77d9c933882b1f00cde797c470e6af73553c191cebd66
+DIST botocore-1.20.93.tar.gz 7827854 BLAKE2B 6297172731db3367d5d769c38de4d8ba8e36eb8c1e870d8f31c3175944d32f52d4e51f69d533853d0c8ea2c0bd2dbacb971a12aa18537bf099c9812481108d9f SHA512 2d38de5fd92bd17df029f93254e8ea26fcf1cefda274d479cdbe8919c862d32c0a18cca165fe65c4125adbbaecc1909dc8da576a0b0fc7d47dc72cd3fd3db6cf
diff --git a/dev-python/botocore/botocore-1.20.93.ebuild b/dev-python/botocore/botocore-1.20.93.ebuild
new file mode 100644
index 000000000000..ca62b7dad65f
--- /dev/null
+++ b/dev-python/botocore/botocore-1.20.93.ebuild
@@ -0,0 +1,59 @@
+# 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="Low-level, data-driven core of boto 3"
+HOMEPAGE="https://github.com/boto/botocore"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/boto/botocore"
+	inherit git-r3
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+fi
+
+RDEPEND="
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/jmespath[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/jsonschema[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/1.8.6-tests-pass-all-env-vars-to-cmd-runner.patch"
+)
+
+distutils_enable_sphinx docs/source \
+	'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests nose
+
+src_prepare() {
+	# unpin deps
+	sed -i -e "s:>=.*':':" setup.py || die
+	# very unstable
+	sed -i -e 's:test_stress_test_token_bucket:_&:' \
+		tests/functional/retries/test_bucket.py || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	# note: suites need to be run separately as one of the unit tests
+	# seems to be leaking mocks and breaking a few functional tests
+	nosetests -v tests/unit ||
+		die "unit tests failed under ${EPYTHON}"
+	nosetests -v tests/functional ||
+		die "functional tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/cerberus/metadata.xml b/dev-python/cerberus/metadata.xml
index fb68e8faff74..0cf9a2385b23 100644
--- a/dev-python/cerberus/metadata.xml
+++ b/dev-python/cerberus/metadata.xml
@@ -10,4 +10,5 @@
   <remote-id type="pypi">Cerberus</remote-id>
  </upstream>
  <origin>gentoo-staging</origin>
+ <stabilize-allarches/>
 </pkgmetadata>
\ No newline at end of file
diff --git a/dev-python/click-help-colors/Manifest b/dev-python/click-help-colors/Manifest
new file mode 100644
index 000000000000..93313e11804a
--- /dev/null
+++ b/dev-python/click-help-colors/Manifest
@@ -0,0 +1 @@
+DIST click-help-colors-0.9.tar.gz 100701 BLAKE2B 838507658aec9cea962d1f373bd771871837d1fe274c70fe4555efbd4e1825203d8728457c5836a482add26e86d4eed83b962811602864d43bf8174f49bd89cd SHA512 02cca02a5cec6b3b23fdeee4aef921cac1cf83d85bea8eb04dd100955dc27b2e4d098bad2f49694c0aa6548135fb979a1fd054525dcec27077f461a034d62a87
diff --git a/dev-python/click-help-colors/click-help-colors-0.9.ebuild b/dev-python/click-help-colors/click-help-colors-0.9.ebuild
new file mode 100644
index 000000000000..95453873a8f9
--- /dev/null
+++ b/dev-python/click-help-colors/click-help-colors-0.9.ebuild
@@ -0,0 +1,26 @@
+# 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="Colorization of help messages in Click"
+HOMEPAGE="https://github.com/click-contrib/click-help-colors"
+SRC_URI="https://github.com/click-contrib/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="examples"
+
+RDEPEND="<dev-python/click-9[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
+
+python_install_all() {
+	use examples && dodoc -r examples
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/click-help-colors/metadata.xml b/dev-python/click-help-colors/metadata.xml
new file mode 100644
index 000000000000..d5df123300c9
--- /dev/null
+++ b/dev-python/click-help-colors/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+  <email>marecki@gentoo.org</email>
+  <name>Marek Szuba</name>
+ </maintainer>
+ <upstream>
+  <remote-id type="github">click-contrib/click-help-colors</remote-id>
+  <remote-id type="pypi">click-help-colors</remote-id>
+ </upstream>
+ <origin>gentoo-staging</origin>
+ <stabilize-allarches/>
+</pkgmetadata>
\ No newline at end of file
diff --git a/dev-python/coloredlogs/Manifest b/dev-python/coloredlogs/Manifest
index 33c860803bc3..b338c23d8ef1 100644
--- a/dev-python/coloredlogs/Manifest
+++ b/dev-python/coloredlogs/Manifest
@@ -1 +1,2 @@
 DIST coloredlogs-14.0.tar.gz 275863 BLAKE2B 0a8c026220955397378ad2b43a69c89c5710a09e2d9ed81a3f25408c60e171f4b8f78239696a0bc1b51fc3dd9bfca80df63e1f1d7afb6bee0046209a089e0d6d SHA512 3434a95f3216d19af5d7a48324e5afd5e975f92d9f6b99f40df2c0a635f1738e0bc6d7277a549a42a0fec5a8601f82908c4b0205ceeb3666f49210f66fe58671
+DIST coloredlogs-15.0.1.tar.gz 278520 BLAKE2B 446aea9adfc8a1ea7f2e5b4a0279d124a3e174feec4a6d9346059fa00fbcb2717d6480392051cc44f0c1f66e022cfc03238acae59b9496e9f70695d99143dfd6 SHA512 577af26af8d27bca3f10e6aaa257245aba608cc3832985ba57bcb2b590b10bf054796a2210749c15ee1b1a17623e007e4ac3ba17bed6af95544f85f5dfafaf21
diff --git a/dev-python/coloredlogs/coloredlogs-15.0.1.ebuild b/dev-python/coloredlogs/coloredlogs-15.0.1.ebuild
new file mode 100644
index 000000000000..9302ecddc71d
--- /dev/null
+++ b/dev-python/coloredlogs/coloredlogs-15.0.1.ebuild
@@ -0,0 +1,43 @@
+# 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
+
+DESCRIPTION="Colored stream handler for the logging module"
+HOMEPAGE="
+	https://pypi.org/project/coloredlogs/
+	https://github.com/xolox/python-coloredlogs
+	https://coloredlogs.readthedocs.io/en/latest/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	>=dev-python/humanfriendly-9.1[${PYTHON_USEDEP}]"
+BDEPEND="
+	test? (
+		dev-python/capturer[${PYTHON_USEDEP}]
+		dev-python/coverage[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/verboselogs[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=( "${FILESDIR}/coloredlogs-14.0-fix-install-prefix.patch" )
+
+distutils_enable_sphinx docs
+distutils_enable_tests pytest
+
+python_test() {
+	# test_cli_conversion requires the package to be installed
+	distutils_install_for_testing
+	# test_auto_install fails because the pth file isn't being loaded
+	epytest coloredlogs/tests.py \
+		--deselect coloredlogs/tests.py::ColoredLogsTestCase::test_auto_install
+}
diff --git a/dev-python/diskcache/diskcache-5.2.1.ebuild b/dev-python/diskcache/diskcache-5.2.1.ebuild
index 6a456401a372..7c808d24016c 100644
--- a/dev-python/diskcache/diskcache-5.2.1.ebuild
+++ b/dev-python/diskcache/diskcache-5.2.1.ebuild
@@ -18,7 +18,7 @@ S=${WORKDIR}/python-diskcache-${PV}
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86 ~amd64-linux ~x86-linux"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/fasteners/fasteners-0.16.2.ebuild b/dev-python/fasteners/fasteners-0.16.2.ebuild
index aff32a37a45e..be5a9848b120 100644
--- a/dev-python/fasteners/fasteners-0.16.2.ebuild
+++ b/dev-python/fasteners/fasteners-0.16.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
 
 RDEPEND="
 	dev-python/six[${PYTHON_USEDEP}]"
diff --git a/dev-python/ghp-import/Manifest b/dev-python/ghp-import/Manifest
new file mode 100644
index 000000000000..6e0cb8ac9e7c
--- /dev/null
+++ b/dev-python/ghp-import/Manifest
@@ -0,0 +1 @@
+DIST ghp-import-2.0.1.tar.gz 11158 BLAKE2B c091d193cbfd44d90e62fe843775412a74f7962228130ba381ca07f5af93ea2296e989cffd025fd7d6a50ae5e526afe69fb00f49a6780b9b2f49ee8f06e2d3e1 SHA512 8e53b1a516a8d9780159d57b3973ebe02bbc4f60788470ec823c99608c2b026f5c43a12796506adf039420f06964a11d9e7e318cf9ea10df167faddd8b6f9707
diff --git a/dev-python/ghp-import/ghp-import-2.0.1.ebuild b/dev-python/ghp-import/ghp-import-2.0.1.ebuild
new file mode 100644
index 000000000000..81a75df35f9f
--- /dev/null
+++ b/dev-python/ghp-import/ghp-import-2.0.1.ebuild
@@ -0,0 +1,20 @@
+# 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="Copy your docs directly to the gh-pages branch"
+HOMEPAGE="https://github.com/c-w/ghp-import"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>=dev-python/python-dateutil-2.8.1[${PYTHON_USEDEP}]
+"
diff --git a/dev-python/ghp-import/metadata.xml b/dev-python/ghp-import/metadata.xml
new file mode 100644
index 000000000000..4bb00de03772
--- /dev/null
+++ b/dev-python/ghp-import/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+  <email>andrewammerlaan@gentoo.org</email>
+  <name>Andrew Ammerlaan</name>
+ </maintainer>
+ <upstream>
+  <remote-id type="github">c-w/ghp-import</remote-id>
+  <remote-id type="pypi">ghp-import</remote-id>
+ </upstream>
+ <origin>gentoo-staging</origin>
+ <stabilize-allarches/>
+</pkgmetadata>
\ No newline at end of file
diff --git a/dev-python/humanfriendly/Manifest b/dev-python/humanfriendly/Manifest
index e5765ca7382c..239b104a0b72 100644
--- a/dev-python/humanfriendly/Manifest
+++ b/dev-python/humanfriendly/Manifest
@@ -1,2 +1,3 @@
 DIST humanfriendly-8.2.tar.gz 358747 BLAKE2B bc5824e94ea94df6ee93ea44d273ccb856f50b69e52ae6293afaedf06c9f00c67e064f0c85edd88be9954bb258334b1b9af4ab88efc5b352f3efe8d322fc55c1 SHA512 123d8592e6613a70421740648bb8998733b118927a0bd6182af848612e46eec8e35cae95168219c9b7672bed8e18e1c4a493a80248eabe47f8a4cb1813c8b591
 DIST humanfriendly-9.1.tar.gz 359616 BLAKE2B c67ca9498ff4a0dac237c8f1c81ae88882a7ab162e2cfd663cd50a066dbcfe045424bdf4dcc1df473f5fc41f0c1b8c0f2aca9883aa21915281618ba332c579a3 SHA512 859a9ff01abe0671a23a63e73c9c09c0f92151e96ec38dd5695c75f99fa436e186835cb8a16f59b82d5216b9c427ea0abd419b470b067f8032fe984776f02a8f
+DIST humanfriendly-9.2.tar.gz 360080 BLAKE2B 39aa17315a87938468f2d6e94b0287f07864476c4179c40504126c65f7042c96113a9d60f481a6a03913ae5c8cfde2c87476e0d403c964aa65abceb0f55633f1 SHA512 2abb8d7d4dfb84d625e82f3475bea5045c32f548a45999dca97d39e5bc0cd704a9ab45e0b6b87c0d419b447680a3e71e2d9c8cb14ba19117c7ac9b2f56297f00
diff --git a/dev-python/humanfriendly/humanfriendly-9.2.ebuild b/dev-python/humanfriendly/humanfriendly-9.2.ebuild
new file mode 100644
index 000000000000..6d2d2a2bc046
--- /dev/null
+++ b/dev-python/humanfriendly/humanfriendly-9.2.ebuild
@@ -0,0 +1,35 @@
+# 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 )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="Human friendly output for text interfaces using Python"
+HOMEPAGE="https://pypi.org/project/humanfriendly/
+	https://github.com/xolox/python-humanfriendly/
+	https://humanfriendly.readthedocs.io/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+
+BDEPEND="
+	test? (
+		dev-python/capturer[${PYTHON_USEDEP}]
+		>=dev-python/coloredlogs-15.0.1[${PYTHON_USEDEP}]
+		dev-python/docutils[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+distutils_enable_sphinx docs
+
+python_test() {
+	epytest humanfriendly/tests.py
+}
diff --git a/dev-python/incremental/incremental-21.3.0.ebuild b/dev-python/incremental/incremental-21.3.0.ebuild
index 425bafd3b59e..0d263bf3c563 100644
--- a/dev-python/incremental/incremental-21.3.0.ebuild
+++ b/dev-python/incremental/incremental-21.3.0.ebuild
@@ -16,7 +16,14 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
-IUSE=""
+IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/twisted[${PYTHON_USEDEP}] )"
+
+python_test() {
+	distutils_install_for_testing
+	trial incremental || die "Tests failed on ${EPYTHON}"
+}
diff --git a/dev-python/js2py/js2py-0.70_p20210218.ebuild b/dev-python/js2py/js2py-0.70_p20210218.ebuild
index 5d79d98249f3..17401bdcfc98 100644
--- a/dev-python/js2py/js2py-0.70_p20210218.ebuild
+++ b/dev-python/js2py/js2py-0.70_p20210218.ebuild
@@ -23,12 +23,16 @@ SRC_URI="https://github.com/PiotrDabkowski/${MY_PN}/archive/${MY_COMMIT}.tar.gz
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	>=dev-python/pyjsparser-2.5.1[${PYTHON_USEDEP}]
 	>=dev-python/tzlocal-1.2.0[${PYTHON_USEDEP}]
 	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
 "
+BDEPEND="test? ( ${RDEPEND} )"
 
 S="${WORKDIR}/${MY_PN}-${MY_COMMIT}"
 
diff --git a/dev-python/mergedeep/Manifest b/dev-python/mergedeep/Manifest
new file mode 100644
index 000000000000..5d042f5ffaaa
--- /dev/null
+++ b/dev-python/mergedeep/Manifest
@@ -0,0 +1 @@
+DIST mergedeep-1.3.4.tar.gz 26627 BLAKE2B 334f5ec6948185e3f7758e079e65d92fb04dd3ae3bb208cb8fc67d2fd2d90ce16fecb28562d42eea75db978d9d323983efb85abbf7e5ff18e40c95fb066c47e7 SHA512 24cb1dbae9be715045b66b6d3a3c3deb98a41176ff2fae405f254baeebf5f45b69c948f7780b67762e613e20b5df3c5987e730c5cd91fe7dd1fbda6408906559
diff --git a/dev-python/mergedeep/mergedeep-1.3.4.ebuild b/dev-python/mergedeep/mergedeep-1.3.4.ebuild
new file mode 100644
index 000000000000..be5281ecea40
--- /dev/null
+++ b/dev-python/mergedeep/mergedeep-1.3.4.ebuild
@@ -0,0 +1,19 @@
+# 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="A deep merge tool for Python"
+HOMEPAGE="https://github.com/clarketm/mergedeep/"
+SRC_URI="https://github.com/clarketm/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+distutils_enable_tests pytest
+distutils_enable_sphinx docs/source dev-python/alabaster dev-python/recommonmark
diff --git a/dev-python/mergedeep/metadata.xml b/dev-python/mergedeep/metadata.xml
new file mode 100644
index 000000000000..d72e8f0e46ae
--- /dev/null
+++ b/dev-python/mergedeep/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+  <email>andrewammerlaan@gentoo.org</email>
+  <name>Andrew Ammerlaan</name>
+ </maintainer>
+ <upstream>
+  <remote-id type="github">clarketm/mergedeep</remote-id>
+  <remote-id type="pypi">mergedeep</remote-id>
+ </upstream>
+ <origin>gentoo-staging</origin>
+ <stabilize-allarches/>
+</pkgmetadata>
\ No newline at end of file
diff --git a/dev-python/mkdocs-git-revision-date-localized-plugin/Manifest b/dev-python/mkdocs-git-revision-date-localized-plugin/Manifest
index a379f1b932fb..479cefa6b596 100644
--- a/dev-python/mkdocs-git-revision-date-localized-plugin/Manifest
+++ b/dev-python/mkdocs-git-revision-date-localized-plugin/Manifest
@@ -1,2 +1,3 @@
 DIST mkdocs-git-revision-date-localized-plugin-0.8.tar.gz 364352 BLAKE2B cfd1709b5c9e1f99ca1a2d8d194634afde6d57aecaca1d2cb70edc21c28d0b210c3497a4214d6a95592bc5a7aad3b88d96b275427f3218aa198ab7b3ae8f364a SHA512 84f19aa13189b74f18f98433939935052f1d757f66972d4f1cc1bfd14b614f8fd57b0ac0dcf41fcb678eb8dddba93ddc78dc776d6a81977d096920128d31f58e
+DIST mkdocs-git-revision-date-localized-plugin-0.9.2.tar.gz 367301 BLAKE2B ac4d69117dea856a209d144e452cf408ee3d111eaa8a9825602b9f8d604a79143e96a51e67b74e430eecc6ee33335161e409149220a8b216f3b47f22e7a49f12 SHA512 11714323a6e300d0d8d05198f617019158dc48ba43e8a685f52702da7f52558f1358dfce294dcd421ba9d59131c17e4d6ea6ff483397055dee62dffb76032d4c
 DIST mkdocs-git-revision-date-localized-plugin-0.9.tar.gz 367850 BLAKE2B 0bf02b9de2b9ee8c4ae36548ffab85a9c880fc89dd5a4f39961093e36fc0b87b53dce8269400c804fed67f5a3a3a2ec45e6486ec80706be0651b9ceefe7de6af SHA512 488cd20e7ce8cd8df4c277f3626b8d628ce58090791a1b7e36efbdcacf6bf434bd4bc3e73f0402fdc8cb60767e6d63fac56a56b0dfd4728d6a49438caf5ad3d2
diff --git a/dev-python/mkdocs-git-revision-date-localized-plugin/mkdocs-git-revision-date-localized-plugin-0.9.2.ebuild b/dev-python/mkdocs-git-revision-date-localized-plugin/mkdocs-git-revision-date-localized-plugin-0.9.2.ebuild
new file mode 100644
index 000000000000..abaa9a6ae5ed
--- /dev/null
+++ b/dev-python/mkdocs-git-revision-date-localized-plugin/mkdocs-git-revision-date-localized-plugin-0.9.2.ebuild
@@ -0,0 +1,55 @@
+# 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} )
+
+DOCS_BUILDER="mkdocs"
+DOCS_DEPEND="dev-python/mkdocs-material"
+
+inherit distutils-r1 docs
+
+DESCRIPTION="Display the localized date of the last git modification of a markdown file"
+HOMEPAGE="
+	https://github.com/timvink/mkdocs-git-revision-date-localized-plugin/
+	https://pypi.org/project/mkdocs-git-revision-date-localized-plugin/
+"
+SRC_URI="https://github.com/timvink/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>=dev-python/Babel-2.7.0[${PYTHON_USEDEP}]
+	dev-python/GitPython[${PYTHON_USEDEP}]
+	>=dev-python/mkdocs-1.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/click[${PYTHON_USEDEP}]
+		dev-python/mkdocs-material[${PYTHON_USEDEP}]
+		dev-vcs/git
+	)
+	doc? ( dev-vcs/git )
+"
+
+distutils_enable_tests --install pytest
+
+python_prepare_all() {
+	# mkdocs-git-revision-date-localized-plugin's tests need git repo
+	if use test || use doc; then
+		git init -q || die
+		git config --global user.email "you@example.com" || die
+		git config --global user.name "Your Name" || die
+		git add . || die
+		git commit -qm 'init' || die
+	fi
+
+	# The release tarball is missing some required file
+	# FileNotFoundError: [Errno 2] No such file or directory:
+	rm tests/test_builds.py || die
+
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/mkdocs-material/Manifest b/dev-python/mkdocs-material/Manifest
index d7b673fcc845..4957720c6ff3 100644
--- a/dev-python/mkdocs-material/Manifest
+++ b/dev-python/mkdocs-material/Manifest
@@ -2,3 +2,4 @@ DIST mkdocs-material-6.2.5.tar.gz 5373656 BLAKE2B 7e04a4a284c0749264be819a0b42bc
 DIST mkdocs-material-7.0.6.tar.gz 6224144 BLAKE2B 87945b12c8f922fac925cae603ab2cf3a30ee6f707c4960826116d0e24e59f24cccb0319f19b245785f7f764326cc54db880aa7517491e9df6f70a4fd38a3f66 SHA512 8c88f57e2daca9e7d1d466b6bf78c67936c98dc1a871156ae9c29266cd6bf31c73b908b220e2a99f4c1cd77edb5a7fd6f5460885e997189bf02bb75d048273ac
 DIST mkdocs-material-7.1.0.tar.gz 6084658 BLAKE2B 33a83d6ae358bb79b035dd8ba2bf662de3475057c0248b3618a3c468052c6c3047c89d972286310996758318c25ed1dc69d361727163f6e0b8d6420449662f38 SHA512 2bdb98b980e34a6d7a98a96b6b7c1ad869df31dde4cc712bf848105c7f8ff7faebcd0f3c17c9b26697661a40ce15137f60b7eccb64ff968d00209eb26ac788f6
 DIST mkdocs-material-7.1.1.tar.gz 6080208 BLAKE2B a67742ce923dc7bbefbb5638156f5a2f703bd54af96e59b1c580264ae3096d0a823df6cd88151f2c446a97b578bc4a620d694323f5a81cc33836181dad203214 SHA512 ab6b9b4b08268c15b42cf9d5d26ea0bc91151efb1b478602b495f603335792fcd1f9058ecc52767cb861969ab1db7aff2681653db35cb739173b56f7f32f9c65
+DIST mkdocs-material-7.1.7.tar.gz 6359705 BLAKE2B c3faaa59a5e0d848be646e206aba47318e8210d50b0ffd2a092fc4c2736fee8756b41ac91a421ed6f3e874b2beba0508d2273fecefa3bbb70cef5fe1707f3f9c SHA512 4e55ee7a04401830530ecf02439c3de64bfc388847e396414ed6f3f6f12a9db8a73175144772da76836c23e08a2e5b73077b9bb69a2b56a6cc3e2200940081a7
diff --git a/dev-python/mkdocs-material/mkdocs-material-7.1.7.ebuild b/dev-python/mkdocs-material/mkdocs-material-7.1.7.ebuild
new file mode 100644
index 000000000000..67616a73b383
--- /dev/null
+++ b/dev-python/mkdocs-material/mkdocs-material-7.1.7.ebuild
@@ -0,0 +1,33 @@
+# 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} )
+
+DOCS_BUILDER="mkdocs"
+DOCS_DEPEND="
+	dev-python/mkdocs-minify-plugin
+	dev-python/mkdocs-redirects
+"
+
+inherit distutils-r1 docs
+
+DESCRIPTION="A Material Design theme for MkDocs"
+HOMEPAGE="
+	https://github.com/squidfunk/mkdocs-material
+	https://pypi.org/project/mkdocs-material
+"
+SRC_URI="https://github.com/squidfunk/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>=dev-python/markdown-3.2[${PYTHON_USEDEP}]
+	>=dev-python/mkdocs-1.1[${PYTHON_USEDEP}]
+	>=dev-python/pygments-2.4[${PYTHON_USEDEP}]
+	>=dev-python/pymdown-extensions-7.0[${PYTHON_USEDEP}]
+	>=dev-python/mkdocs-material-extensions-1.0[${PYTHON_USEDEP}]
+"
diff --git a/dev-python/mkdocs-redirects/Manifest b/dev-python/mkdocs-redirects/Manifest
index dffce1a98b69..6416987b2203 100644
--- a/dev-python/mkdocs-redirects/Manifest
+++ b/dev-python/mkdocs-redirects/Manifest
@@ -1 +1,2 @@
 DIST mkdocs-redirects-1.0.1.tar.gz 5772 BLAKE2B e48a35b18690c040efcca2e3e6a97650a3f951b89d537537b54b297e61c590099c6891dd1d64f21dd4efcc4a20d3d709a2815280c2846324f9f57b5a953a31bb SHA512 e3eb31ce920aceab2e4c93988853fc0e63ba789db229ac798791061b26252416c5c68b2c221f82e3a08ce7522e6b2aa58ca606b9a31653f782e31c415861f7d0
+DIST mkdocs-redirects-1.0.3.tar.gz 5148 BLAKE2B 438e2751b4570e8347b06a67d86b0afbb99c9204cb0732719e3301d09ac70f268b0302dc9876d7dbb11f24a3dd4a6eba94c3fb3c765c21e934d72442a1ea37b2 SHA512 c33837473211e9ad13da23789f23242182c4f07fe662b448c17d3976f8eb6ee9acdd69ecb7836c025471862c3ff27c8e3bf9a7178596ec8abd940912d48ae9a7
diff --git a/dev-python/mkdocs-redirects/mkdocs-redirects-1.0.3.ebuild b/dev-python/mkdocs-redirects/mkdocs-redirects-1.0.3.ebuild
new file mode 100644
index 000000000000..1abe88d37668
--- /dev/null
+++ b/dev-python/mkdocs-redirects/mkdocs-redirects-1.0.3.ebuild
@@ -0,0 +1,24 @@
+# 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="Plugin for Mkdocs page redirects"
+HOMEPAGE="
+	https://github.com/datarobot/mkdocs-redirects
+	https://pypi.org/project/mkdocs-redirects/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>=dev-python/mkdocs-1.0.4[${PYTHON_USEDEP}]
+	dev-python/twine[${PYTHON_USEDEP}]
+"
diff --git a/dev-python/mkdocs/Manifest b/dev-python/mkdocs/Manifest
index 05f2d1a46f5f..99a2771b8655 100644
--- a/dev-python/mkdocs/Manifest
+++ b/dev-python/mkdocs/Manifest
@@ -1 +1,2 @@
 DIST mkdocs-1.1.2.tar.gz 6987352 BLAKE2B 98bf604aa15eac693368e77e6658c3906909a0cdc323772550a65c35cc301929cdc136919a612438563cefd74c9076b2e273cb89e3ffbe04bff2a419e6e36513 SHA512 bf0e5ba8a15524ebe433fce9f2d16404922850ca562339d60e7860e243f9523321cbab5dca1f276a71d3158c7b1bfadfa25b134da50ef1cedc0b1a9658b6f10c
+DIST mkdocs-1.2.1.tar.gz 6918891 BLAKE2B a17fc551735de28391809971fdf8973c5adf23e512286041eab73bde02ae9ae597e357f4dcbb3fa9ea90a4b47e12a8390c3626641e89da45770b4df6f9d66029 SHA512 c1f9c3a46fd2c5d6819ea069bd48a82cbf5816bc1586a88e9eb776b2376106d9d5f8a0d9a70a9f9f56e39e9f29eaa3cbfa26a8c588acf568bde86f4028af9796
diff --git a/dev-python/mkdocs/mkdocs-1.2.1.ebuild b/dev-python/mkdocs/mkdocs-1.2.1.ebuild
new file mode 100644
index 000000000000..2898c61db8e6
--- /dev/null
+++ b/dev-python/mkdocs/mkdocs-1.2.1.ebuild
@@ -0,0 +1,75 @@
+# 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} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+DESCRIPTION="Project documentation with Markdown"
+HOMEPAGE="https://www.mkdocs.org https://github.com/mkdocs/mkdocs"
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="doc"
+
+BDEPEND="
+	doc? (
+		$(python_gen_any_dep '
+			dev-python/mdx_gh_links[${PYTHON_USEDEP}]
+			dev-python/mkdocs-redirects[${PYTHON_USEDEP}]
+		')
+	)
+"
+
+RDEPEND="
+	>=dev-python/Babel-2.9.0[${PYTHON_USEDEP}]
+	>=dev-python/click-3.3[${PYTHON_USEDEP}]
+	>=dev-python/jinja-2.10.1[${PYTHON_USEDEP}]
+	>=dev-python/markdown-3.2.1[${PYTHON_USEDEP}]
+	>=dev-python/pyyaml-3.10[${PYTHON_USEDEP}]
+	>=dev-python/watchdog-2.0[${PYTHON_USEDEP}]
+	>=dev-python/ghp-import-1.0[${PYTHON_USEDEP}]
+	>=dev-python/pyyaml_env_tag-0.1[${PYTHON_USEDEP}]
+	>=dev-python/importlib_metadata-3.10[${PYTHON_USEDEP}]
+	>=dev-python/packaging-20.5[${PYTHON_USEDEP}]
+	>=dev-python/mergedeep-1.3.4[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests --install nose
+
+python_prepare_all() {
+	# Tests fails if additional themes are installed
+	sed -i -e 's:test_get_themes:_&:' \
+		mkdocs/tests/utils/utils_tests.py || die
+
+	# Skip this network test, "does not appear to be an IPv4 or IPv6 address"
+	sed -i -e 's/test_IP_normalization/_&/' \
+		mkdocs/tests/config/config_options_tests.py || die
+
+	# livereload has been dropped in this release, this test is a remnant
+	rm mkdocs/tests/livereload_tests.py || die
+
+	# fix apparent typo in test (importing wrong thing)
+	sed -i -e 's/from localization import/from mkdocs.localization import/g' \
+		mkdocs/tests/theme_tests.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	default
+	if use doc; then
+		# cannot just do mkdocs build, because that fails if
+		# the package isn't already installed
+		python -m mkdocs build || die "Failed to make docs"
+		# Colliding files found by ecompress:
+		rm site/sitemap.xml.gz || die
+		HTML_DOCS=( "site/." )
+	fi
+}
diff --git a/dev-python/mkdocs_pymdownx_material_extras/Manifest b/dev-python/mkdocs_pymdownx_material_extras/Manifest
index d62d02cc5e4a..18b657d49e10 100644
--- a/dev-python/mkdocs_pymdownx_material_extras/Manifest
+++ b/dev-python/mkdocs_pymdownx_material_extras/Manifest
@@ -1,3 +1,4 @@
 DIST mkdocs_pymdownx_material_extras-1.0.7.tar.gz 17995 BLAKE2B a7a8715ec07b9ef5551eadb37e618f45ca2f8f3c707aa5269eb7d2587db70ba29cfaa8027bb606c4264bbf93d7b3950d7a5dc03640b71afc677658b044d064fa SHA512 33fe8fddd0ee5856fdfb02068e2698f26a8db139458d7736715b776fbc2d8ae8ccb3170dbb786c52338e4e7a1612006046eb429f2268469f6f2bb5ba7f8e256d
 DIST mkdocs_pymdownx_material_extras-1.1.3.tar.gz 40029 BLAKE2B faa17e6e4d27a5d5e34a98a6830e34b934f8623fafb87a73051eb424cf95d29c5dd185bbfbbe49dd3e93eeee00a8310ac0543d480ab70e5abee4047b1cecc774 SHA512 340818ebcd8f9cf175e5049028d0932a0d6208de3d8f86cf5ea47747680079c6b9b3bf27e0c32ee10ee6a1bc7ab8ffc6cc3aa48470be43ed32adfde74f44d5dd
 DIST mkdocs_pymdownx_material_extras-1.2.2.tar.gz 40542 BLAKE2B 583b06830fc230e28b0a8ed465c5c2c69700aa0707dfefea33bedbf87c00265ae5ce4bf9e3789a34b4ec195aef85e370b1f01470ba80c384669abf225486a312 SHA512 3db8aa9b22d24d0e374e5ef298685bb35c0a6b6b1916be12c756d540daac6e482d60c0dc7ce9662a8a05a71c1c75be9b8e0c0b8e7a25f495e2d652d91556ee7c
+DIST mkdocs_pymdownx_material_extras-1.4.0.tar.gz 41238 BLAKE2B d30f4d90822298c82bf9d7c5467d2f022664adee9c910eac82b2b35a740b29a4b01e4e5b61677ccfa98cdd9691032f67b9004065a405712b1d997b70615fec23 SHA512 a3131052d2b2d5619a487edcc5ea8b7b5386a4671ac210028fa72525610a0e86117ccaf3b095f64d2438c49e135a721d8312cae1c44de16bb699822e54b958a6
diff --git a/dev-python/mkdocs_pymdownx_material_extras/mkdocs_pymdownx_material_extras-1.4.0.ebuild b/dev-python/mkdocs_pymdownx_material_extras/mkdocs_pymdownx_material_extras-1.4.0.ebuild
new file mode 100644
index 000000000000..b0e80951e470
--- /dev/null
+++ b/dev-python/mkdocs_pymdownx_material_extras/mkdocs_pymdownx_material_extras-1.4.0.ebuild
@@ -0,0 +1,22 @@
+# 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="Custom alterations based on Mkdocs-Material"
+HOMEPAGE="
+	https://github.com/facelessuser/mkdocs_pymdownx_material_extras
+	https://pypi.org/project/mkdocs-pymdownx-material-extras"
+SRC_URI="https://github.com/facelessuser/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>=dev-python/mkdocs-material-5.0.2[${PYTHON_USEDEP}]
+"
diff --git a/dev-python/pytest-plus/Manifest b/dev-python/pytest-plus/Manifest
new file mode 100644
index 000000000000..1b1dc87fd5ca
--- /dev/null
+++ b/dev-python/pytest-plus/Manifest
@@ -0,0 +1 @@
+DIST pytest-plus-0.2.tar.gz 8210 BLAKE2B b8a28e72cfb4e10daa021528de9b5df2e9eb0bc4e911557c7c14a0825284787e94992132c0b74881867a41b55a67785c60b9b87a1594ad33fb57ebac8de391a6 SHA512 e16a03433cb6eb30b6881bec99482bc65cb7d1fa3d0db855befe666c0645d4b5ec02debde9dec4322ed0a0b77d3ac3f1cabda0cf98f375ffd68dc29fb55f5139
diff --git a/dev-python/pytest-plus/metadata.xml b/dev-python/pytest-plus/metadata.xml
new file mode 100644
index 000000000000..a9e1fc3c9b26
--- /dev/null
+++ b/dev-python/pytest-plus/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+  <email>marecki@gentoo.org</email>
+  <name>Marek Szuba</name>
+ </maintainer>
+ <upstream>
+  <remote-id type="github">pytest-dev/pytest-plus</remote-id>
+  <remote-id type="pypi">pytest-plus</remote-id>
+ </upstream>
+ <origin>gentoo-staging</origin>
+ <stabilize-allarches/>
+</pkgmetadata>
\ No newline at end of file
diff --git a/dev-python/pytest-plus/pytest-plus-0.2.ebuild b/dev-python/pytest-plus/pytest-plus-0.2.ebuild
new file mode 100644
index 000000000000..8e40b5dd7a4a
--- /dev/null
+++ b/dev-python/pytest-plus/pytest-plus-0.2.ebuild
@@ -0,0 +1,23 @@
+# 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="PyTest Plus Plugin - extends pytest functionality"
+HOMEPAGE="https://github.com/pytest-dev/pytest-plus"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="dev-python/more-itertools[${PYTHON_USEDEP}]
+	dev-python/pytest[${PYTHON_USEDEP}]"
+BDEPEND="dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	dev-python/setuptools_scm_git_archive[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
diff --git a/dev-python/pytest-qt/Manifest b/dev-python/pytest-qt/Manifest
index 4357596288ec..157ce3b2bc9b 100644
--- a/dev-python/pytest-qt/Manifest
+++ b/dev-python/pytest-qt/Manifest
@@ -1,2 +1,3 @@
 DIST pytest-qt-3.3.0.tar.gz 113439 BLAKE2B 1eb486d2d44825058577306ed3b9ade34e6cbad0d90038fe314114bb22c82ae069c9fe66c170591de6c97bad99f5f9e0021c8b3dc38c858b8293a22c448bed74 SHA512 8b3ce7b62621c55fb319966b162cb60663c5ef290f34e62e6a9329e67f530c2bde1329ae0b045b15c99ae14f5f6a5fef9ee930475fa700922c50ee725adf7983
 DIST pytest-qt-4.0.0.tar.gz 113333 BLAKE2B 69c2c8c823b55c44150c7beb0754e90866c7659912dbc0d99ee29904b0a20eadf26939709a5d120d0b95e23bcb99310415932e87934ae84571c55e3ffd07c284 SHA512 cfdde2e82b42979313d96f9a14bdafea0d4d5d5b64b4785ac73b74e36bfb892ab7b5ec6eb1c4e540ec00ccec6739e8bd9a3ffb610f204f6cfe97061f57a3971a
+DIST pytest-qt-4.0.1.tar.gz 113473 BLAKE2B b77438ea2e6f71566daa50628d481671bc5ece0cffe2c67d689e780274884d70d94d70305c92775e5d9bba7fe09431ce7116aa5823234675237149726178ba43 SHA512 4f6d9057d5c6ebf439d0f69a341b3d7a4297e3eea251f85c82cf5ecc7aca1419b7a2ab0e846852661a0a2236af6225518b3ae691bb014fb56dbc1d39106db4cc
diff --git a/dev-python/pytest-qt/pytest-qt-4.0.1.ebuild b/dev-python/pytest-qt/pytest-qt-4.0.1.ebuild
new file mode 100644
index 000000000000..12b4ebe82256
--- /dev/null
+++ b/dev-python/pytest-qt/pytest-qt-4.0.1.ebuild
@@ -0,0 +1,59 @@
+# 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 virtualx
+
+DESCRIPTION="pytest plugin for PyQt5 and PySide2 applications"
+HOMEPAGE="
+	https://pypi.org/project/pytest-qt/
+	https://github.com/pytest-dev/pytest-qt/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="dev-python/QtPy[gui,testlib,widgets(+),${PYTHON_USEDEP}]"
+BDEPEND="
+	test? (
+		dev-python/PyQt5[gui,testlib,widgets,${PYTHON_USEDEP}]
+		$(python_gen_cond_dep '
+			dev-python/pyside2[gui,testlib,widgets,${PYTHON_USEDEP}]
+			' python3_{8..9} )
+	)
+"
+
+distutils_enable_tests --install pytest
+distutils_enable_sphinx docs dev-python/sphinx_rtd_theme
+
+python_prepare_all() {
+	# This show window test does not work inside the emerge env, as we cannot show windows.
+	# pytestqt.exceptions.TimeoutError: widget <PyQt5.QtWidgets.QWidget object at 0x7f57d8527af8> not activated in 1000 ms.
+	sed -i -e 's:test_wait_window:_&:' tests/test_basics.py || die
+
+	# This is not going to work since we want to test both implementations
+	# and therefore pull in both and explicitly set PYTEST_QT_API
+	sed -i -e 's:test_qt_api_ini_config_with_envvar:_&:' \
+		-e 's:test_qt_api_ini_config:_&:' \
+		tests/test_basics.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+src_test() {
+	virtx python_foreach_impl python_test
+}
+
+python_test() {
+	distutils_install_for_testing
+	PYTEST_QT_API="pyqt5" epytest
+	if [[ "${EPYTHON}" == "python3.10" ]]; then
+		return
+	else
+		PYTEST_QT_API="pyside2" epytest
+	fi
+}
diff --git a/dev-python/pytest-testinfra/Manifest b/dev-python/pytest-testinfra/Manifest
new file mode 100644
index 000000000000..37bc260fa2e1
--- /dev/null
+++ b/dev-python/pytest-testinfra/Manifest
@@ -0,0 +1 @@
+DIST pytest-testinfra-6.3.0.tar.gz 76309 BLAKE2B 95b4a6ac5ea3c3db2afdd537209bfeb2c188ec7c7935b73e831733fbbf2540b8769d1187338b3b9c9da997cd653e800004e7199537d95530967cd73a15cb2c2e SHA512 ff0add6bdadac92f6f997a94734d69d39598bc8d1f7689a6b269e59bc886825fcf8a42968c2d34a9ad7e77ed0112bf4044afede8e0dca2bbddc76c9c5612ae92
diff --git a/dev-python/pytest-testinfra/metadata.xml b/dev-python/pytest-testinfra/metadata.xml
new file mode 100644
index 000000000000..a399c602b237
--- /dev/null
+++ b/dev-python/pytest-testinfra/metadata.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+  <email>marecki@gentoo.org</email>
+  <name>Marek Szuba</name>
+ </maintainer>
+ <longdescription>
+		With Testinfra you can write unit tests in Python to test actual state of your servers
+		configured by management tools like Salt, Ansible, Puppet, Chef and so on.
+
+		Testinfra aims to be a Serverspec equivalent in Python.
+	</longdescription>
+ <upstream>
+  <remote-id type="github">pytest-dev/pytest-testinfra</remote-id>
+  <remote-id type="pypi">pytest-testinfra</remote-id>
+ </upstream>
+ <origin>gentoo-staging</origin>
+ <stabilize-allarches/>
+</pkgmetadata>
\ No newline at end of file
diff --git a/dev-python/pytest-testinfra/pytest-testinfra-6.3.0.ebuild b/dev-python/pytest-testinfra/pytest-testinfra-6.3.0.ebuild
new file mode 100644
index 000000000000..1caaae00e3d7
--- /dev/null
+++ b/dev-python/pytest-testinfra/pytest-testinfra-6.3.0.ebuild
@@ -0,0 +1,32 @@
+# 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="Write unit tests in Python to test actual state of your servers"
+HOMEPAGE="https://github.com/pytest-dev/pytest-testinfra"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="dev-python/pytest[${PYTHON_USEDEP}]"
+BDEPEND="dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? (
+		app-admin/ansible[${PYTHON_USEDEP}]
+		app-admin/salt[${PYTHON_USEDEP}]
+		dev-python/paramiko[${PYTHON_USEDEP}]
+		dev-python/pywinrm[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
+
+pkg_postinst() {
+	elog "For the list of available connection back-ends and their dependencies,"
+	elog "please consult https://testinfra.readthedocs.io/en/latest/backends.html"
+}
diff --git a/dev-python/pytest-verbose-parametrize/Manifest b/dev-python/pytest-verbose-parametrize/Manifest
new file mode 100644
index 000000000000..c5d68a728927
--- /dev/null
+++ b/dev-python/pytest-verbose-parametrize/Manifest
@@ -0,0 +1 @@
+DIST pytest-verbose-parametrize-1.7.0.tar.gz 12301 BLAKE2B 908d8c9d82861783931dc25c6b522e13f252e4b04e01a2f6a0e646cd63720816242ef143041abf0aa6b67fb574d5f84d05029edd11e589728b0e5b63f92f898e SHA512 ac81cdf002d60b4af916c4beb4c832c9c39dc9dcfa3eea7385b093f9ea18391cbf968a4e908abdb23523a7cb1e294dce2017083414e61eef6762f157319e2cf4
diff --git a/dev-python/pytest-verbose-parametrize/files/pytest-verbose-parametrize-1.7.0_collections-abc.patch b/dev-python/pytest-verbose-parametrize/files/pytest-verbose-parametrize-1.7.0_collections-abc.patch
new file mode 100644
index 000000000000..f4b0720c3600
--- /dev/null
+++ b/dev-python/pytest-verbose-parametrize/files/pytest-verbose-parametrize-1.7.0_collections-abc.patch
@@ -0,0 +1,8 @@
+--- a/pytest_verbose_parametrize.py
++++ b/pytest_verbose_parametrize.py
+@@ -1,4 +1,4 @@
+-from collections import Iterable
++from collections.abc import Iterable
+ from six import string_types, text_type
+ 
+ 
diff --git a/dev-python/pytest-verbose-parametrize/metadata.xml b/dev-python/pytest-verbose-parametrize/metadata.xml
new file mode 100644
index 000000000000..0b1dbcea1856
--- /dev/null
+++ b/dev-python/pytest-verbose-parametrize/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+  <email>marecki@gentoo.org</email>
+  <name>Marek Szuba</name>
+ </maintainer>
+ <upstream>
+  <remote-id type="github">man-group/pytest-plugins</remote-id>
+  <remote-id type="pypi">pytest-verbose-parametrize</remote-id>
+ </upstream>
+ <origin>gentoo-staging</origin>
+ <stabilize-allarches/>
+</pkgmetadata>
\ No newline at end of file
diff --git a/dev-python/pytest-verbose-parametrize/pytest-verbose-parametrize-1.7.0.ebuild b/dev-python/pytest-verbose-parametrize/pytest-verbose-parametrize-1.7.0.ebuild
new file mode 100644
index 000000000000..54545446218b
--- /dev/null
+++ b/dev-python/pytest-verbose-parametrize/pytest-verbose-parametrize-1.7.0.ebuild
@@ -0,0 +1,36 @@
+# 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="More descriptive parametrized-test IDs for py.test"
+HOMEPAGE="https://github.com/man-group/pytest-plugins https://pypi.org/project/pytest-verbose-parametrize/"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+# The test suite is borked, some of the tests are extremely sensitive to Python
+# verbosity level whereas others act differently depending on whether the package
+# has previously been installed or not.
+RESTRICT="test"
+
+RDEPEND="dev-python/pytest[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]"
+BDEPEND="dev-python/setuptools-git[${PYTHON_USEDEP}]
+	test? (
+		dev-python/coverage[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pytest-virtualenv[${PYTHON_USEDEP}]
+	)"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.7.0_collections-abc.patch
+)
+
+distutils_enable_tests pytest
diff --git a/dev-python/pyvirtualdisplay/Manifest b/dev-python/pyvirtualdisplay/Manifest
index 1328590a1f46..a00827c2d8e1 100644
--- a/dev-python/pyvirtualdisplay/Manifest
+++ b/dev-python/pyvirtualdisplay/Manifest
@@ -1 +1,2 @@
 DIST PyVirtualDisplay-2.1.tar.gz 40798 BLAKE2B 315bb794b81948357919e98637b6276cca11739d019333c873a2b9c3d28d0bbece6996a70fe619f7acae658bcbaa2743dbbdfb23b7b8515c3a40858a83b07712 SHA512 f95a1622adfa1198d7f35757110e923e45bbfc18b31945c9efedb578e1a27fc91ffec403cc68269b2414837260b2b56ae9a58323ed5020af962757722d7a4517
+DIST PyVirtualDisplay-2.2.tar.gz 40882 BLAKE2B 8fb2227928c8475994e4e54a42dada2b1921678adcec562d9658e01edc0e356aea714cc9a507c93be66d9c61dceeaadde4f22cc636504f4403e985ac2df96248 SHA512 33567d12fc63359869e4baa2413794e9caacd147a5b6ffe2ca79e1292f6174ff7e04371fac5737002fccc6654d0a5dd44907fac774b666ca10588185c5c5f7cc
diff --git a/dev-python/pyvirtualdisplay/pyvirtualdisplay-2.2.ebuild b/dev-python/pyvirtualdisplay/pyvirtualdisplay-2.2.ebuild
new file mode 100644
index 000000000000..a004b5db0532
--- /dev/null
+++ b/dev-python/pyvirtualdisplay/pyvirtualdisplay-2.2.ebuild
@@ -0,0 +1,42 @@
+# 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
+
+MY_P=PyVirtualDisplay-${PV}
+DESCRIPTION="Python wrapper for Xvfb, Xephyr and Xvnc"
+HOMEPAGE="https://github.com/ponty/PyVirtualDisplay"
+SRC_URI="
+	https://github.com/ponty/PyVirtualDisplay/archive/${PV}.tar.gz
+		-> ${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+# pyvirtualdisplay.smartdisplay.DisplayTimeoutError: Timeout! elapsed time:60.3 timeout:60
+# tests hang in xvfb
+RESTRICT="test"
+
+RDEPEND="dev-python/easyprocess[${PYTHON_USEDEP}]"
+BDEPEND="
+	test? (
+		$(python_gen_cond_dep \
+			'dev-python/backports-tempfile[${PYTHON_USEDEP}]' python3_7 python3_8 )
+		dev-python/entrypoint2[${PYTHON_USEDEP}]
+		dev-python/path-py[${PYTHON_USEDEP}]
+		dev-python/pillow[${PYTHON_USEDEP}]
+		dev-python/psutil[${PYTHON_USEDEP}]
+		dev-python/pyscreenshot[${PYTHON_USEDEP}]
+		~dev-python/vncdotool-0.13.0[${PYTHON_USEDEP}]
+		x11-apps/xmessage
+		x11-base/xorg-server[xvfb,xephyr]
+		x11-misc/x11vnc
+	)"
+
+distutils_enable_tests pytest
diff --git a/dev-python/pywinrm/Manifest b/dev-python/pywinrm/Manifest
new file mode 100644
index 000000000000..d59d8d398cdc
--- /dev/null
+++ b/dev-python/pywinrm/Manifest
@@ -0,0 +1 @@
+DIST pywinrm-0.4.2.tar.gz 37842 BLAKE2B cf9eb683b77f9a2cc2da9343ebcbbd27404024aea23784721fbea0bce4f8a2359c3647e81bb5fce7f9317bcd8d84cef2c5ec76b17d15153348e66897a6fe1319 SHA512 c5ff02606d6c887ef199cf814d931575728947bbbbff3c2ae7e52bed355408df06ea9351a4ae0b47a947a05ca3476054e501b3abcfca5a36643ef4cd6855a0e4
diff --git a/dev-python/pywinrm/files/pywinrm-0.4.2_test-installation.patch b/dev-python/pywinrm/files/pywinrm-0.4.2_test-installation.patch
new file mode 100644
index 000000000000..d7f38f7163dd
--- /dev/null
+++ b/dev-python/pywinrm/files/pywinrm-0.4.2_test-installation.patch
@@ -0,0 +1,11 @@
+--- a/setup.py
++++ b/setup.py
+@@ -21,7 +21,7 @@
+     author_email='alexey.diyan@gmail.com',
+     url='http://github.com/diyan/pywinrm/',
+     license='MIT license',
+-    packages=find_packages(),
++    packages=find_packages(exclude=('winrm.tests',)),
+     package_data={'winrm.tests': ['*.ps1']},
+     install_requires=['xmltodict', 'requests>=2.9.1', 'requests_ntlm>=0.3.0', 'six'],
+     extras_require={
diff --git a/dev-python/pywinrm/metadata.xml b/dev-python/pywinrm/metadata.xml
new file mode 100644
index 000000000000..d81413db5eff
--- /dev/null
+++ b/dev-python/pywinrm/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+  <email>marecki@gentoo.org</email>
+  <name>Marek Szuba</name>
+ </maintainer>
+ <upstream>
+  <remote-id type="github">diyan/pywinrm</remote-id>
+  <remote-id type="pypi">pywinrm</remote-id>
+ </upstream>
+ <origin>gentoo-staging</origin>
+ <stabilize-allarches/>
+</pkgmetadata>
\ No newline at end of file
diff --git a/dev-python/pywinrm/pywinrm-0.4.2.ebuild b/dev-python/pywinrm/pywinrm-0.4.2.ebuild
new file mode 100644
index 000000000000..08af07150d90
--- /dev/null
+++ b/dev-python/pywinrm/pywinrm-0.4.2.ebuild
@@ -0,0 +1,33 @@
+# 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 the Windows Remote Management (WinRM) service"
+HOMEPAGE="https://github.com/diyan/pywinrm/"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="kerberos"
+
+RDEPEND="dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/requests-ntlm[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/xmltodict[${PYTHON_USEDEP}]
+	kerberos? (
+		<dev-python/pykerberos-2.0.0[${PYTHON_USEDEP}]
+		dev-python/requests-credssp[${PYTHON_USEDEP}]
+	)"
+BDEPEND="test? ( dev-python/mock[${PYTHON_USEDEP}] )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.4.2_test-installation.patch
+)
+
+distutils_enable_tests pytest
diff --git a/dev-python/pyyaml_env_tag/Manifest b/dev-python/pyyaml_env_tag/Manifest
new file mode 100644
index 000000000000..f164431c4296
--- /dev/null
+++ b/dev-python/pyyaml_env_tag/Manifest
@@ -0,0 +1 @@
+DIST pyyaml_env_tag-0.1.tar.gz 5631 BLAKE2B 2302f3fd7c33347b1e451f466b13fbad53f2b77ee305ce844cd5b5bf40e633de95f4604eb27660c5f61aca21845e6f70e40a0ab52386a44d9b4e9be3ec7a7f29 SHA512 7d3dbc08fb338b3de5bbe657fa8a98a330d7ac7962ac2ea6513ade362b36deaaad8d9e82eb018454d73fd26d90003861a3ffee9abc2e9ac51dea4ba315b5c1f9
diff --git a/dev-python/pyyaml_env_tag/metadata.xml b/dev-python/pyyaml_env_tag/metadata.xml
new file mode 100644
index 000000000000..e530f91fd2f8
--- /dev/null
+++ b/dev-python/pyyaml_env_tag/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+  <email>andrewammerlaan@gentoo.org</email>
+  <name>Andrew Ammerlaan</name>
+ </maintainer>
+ <upstream>
+  <remote-id type="github">waylan/pyyaml-env-tag</remote-id>
+  <remote-id type="pypi">pyyaml_env_tag</remote-id>
+ </upstream>
+ <origin>gentoo-staging</origin>
+ <stabilize-allarches/>
+</pkgmetadata>
\ No newline at end of file
diff --git a/dev-python/pyyaml_env_tag/pyyaml_env_tag-0.1.ebuild b/dev-python/pyyaml_env_tag/pyyaml_env_tag-0.1.ebuild
new file mode 100644
index 000000000000..18ac2448e2b3
--- /dev/null
+++ b/dev-python/pyyaml_env_tag/pyyaml_env_tag-0.1.ebuild
@@ -0,0 +1,23 @@
+# 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} )
+DISTUTILS_USE_SETUPTOOLS=no
+
+inherit distutils-r1
+
+DESCRIPTION="A custom YAML tag for referencing environment variables in YAML files"
+HOMEPAGE="https://github.com/waylan/pyyaml-env-tag"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/qstylizer/Manifest b/dev-python/qstylizer/Manifest
index f1956f81d591..bb9ebc356aae 100644
--- a/dev-python/qstylizer/Manifest
+++ b/dev-python/qstylizer/Manifest
@@ -1 +1,2 @@
 DIST qstylizer-0.1.10.tar.gz 20683 BLAKE2B aa12addac6cbe1ebf043d70189683feda87db3a8c2aa3604a04a969f638647ba32eaf7d156559b8af151136aaca784f26025746d9f3e574ad6eb777801bcf44a SHA512 1a747c2a0d5ce0acd220f528bc54c84c723f50bf39fc8d818f6a5475105319f46700d2f00bc5c0f14de8f0caaee0ab8904a379a3e697ca68d00ef62ec3408b2b
+DIST qstylizer-0.2.0.tar.gz 20710 BLAKE2B 1d751efd74e36e665823b64cfd51760bea489ac3916b7ab206d9c9f1fe9adbc0df2dfd9666a79e20c805dabcaa6f3cf4d11074943e0a54b7a6aa93a815c796cf SHA512 094d9c9c14d2000c2c2f2b428cd82a57424507c6df83aa21af3ab7b90e9006761ed131262a2e70a1c4aa4dcea87ac6d07f9137bc224967139467b3f4796ab158
diff --git a/dev-python/qstylizer/qstylizer-0.2.0.ebuild b/dev-python/qstylizer/qstylizer-0.2.0.ebuild
new file mode 100644
index 000000000000..0a302f455998
--- /dev/null
+++ b/dev-python/qstylizer/qstylizer-0.2.0.ebuild
@@ -0,0 +1,52 @@
+# 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="Stylesheet Generator for PyQt5/PySide2"
+HOMEPAGE="https://github.com/blambright/qstylizer"
+SRC_URI="https://github.com/blambright/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>=dev-python/tinycss2-0.5[${PYTHON_USEDEP}]
+	<dev-python/tinycss2-2[${PYTHON_USEDEP}]
+	>=dev-python/inflection-0.3.0[${PYTHON_USEDEP}]
+	<dev-python/inflection-1[${PYTHON_USEDEP}]
+"
+
+BDEPEND="
+	dev-python/pbr[${PYTHON_USEDEP}]
+	dev-vcs/git
+	test? (
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+distutils_enable_sphinx doc dev-python/sphinx_rtd_theme dev-python/sphinxcontrib-autoprogram
+
+python_prepare_all() {
+	# Exception: Versioning for this project requires either an sdist tarball, or access to an
+	# upstream git repository. It's also possible that there is a mismatch between the package
+	# name in setup.cfg and the argument given to pbr.version.VersionInfo. Project name qstylizer
+	# was given, but was not able to be found.
+	#
+	# There are no tarballs on PyPI, so we do this as a workaround
+	git init -q || die
+	git config user.email "larry@gentoo.org" || die
+	git config user.name "Larry the Cow" || die
+	git add . || die
+	git commit -m "init" || die
+	git tag -a "${PV}" -m "${PV}" || die
+
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/spyder-kernels/Manifest b/dev-python/spyder-kernels/Manifest
index 6d31380096bc..06b80e9e2c80 100644
--- a/dev-python/spyder-kernels/Manifest
+++ b/dev-python/spyder-kernels/Manifest
@@ -1,3 +1,2 @@
 DIST spyder-kernels-1.10.2-gh.tar.gz 78924 BLAKE2B 47f0ec284f54590ee9c5a43caeeea61b644fccc6d6222dfbf85187beb9cc141504082dbf50d1d85f5315c8e8e46b9f810253d904b594bb4c52677271b0f7f12d SHA512 4bcbc2646493f384a3f5fad1cc2a42bbe1d06c5225362beb995a73e3c1abe482f3855d844c449b07631b4ffda99492ccbd3cbe69c515ed38d6a98913bea90e2d
-DIST spyder-kernels-2.0.3-gh.tar.gz 80089 BLAKE2B c439317be60237fb1c0c110a46ca17ad6a7ec0f978e2bbc01d98a260ec2654b81a334059f8b349dec002a2f3c8d9e5279b7f208fe88ccaaaba52d171eb5ca487 SHA512 dd406640db545732e23ef5e1f0fbb6c1756dd651e49152d2d804b8e0ddcdc0f9ede04a48df861faf2153125c4971c515eb5edd327d93a19926e12b02737b9a66
 DIST spyder-kernels-2.0.4-gh.tar.gz 80671 BLAKE2B 1ef5fdef54742f6c673f30c9bf174f32e20bdf31e71107883785ad2353749712cc0f607662b8246ad0b831b5cf43fe94fe24ae72a9f477ede5743c8d76af5b7d SHA512 1b448bdbe4a6b483203fe4a474e39c880e164cdf35d71eebd3ae79367785892043bf73180b4c1c9051ae75d0e7b59e845ef079d31582479c710ad43a2fe11599
diff --git a/dev-python/spyder-kernels/spyder-kernels-2.0.3.ebuild b/dev-python/spyder-kernels/spyder-kernels-2.0.3.ebuild
deleted file mode 100644
index 0e0405c61674..000000000000
--- a/dev-python/spyder-kernels/spyder-kernels-2.0.3.ebuild
+++ /dev/null
@@ -1,53 +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} )
-
-inherit distutils-r1
-
-DESCRIPTION="Kernels used by spyder on its ipython console"
-HOMEPAGE="https://github.com/spyder-ide/spyder-kernels/
-	https://pypi.org/project/spyder-kernels/"
-SRC_URI="https://github.com/spyder-ide/${PN}/archive/v${PV}.tar.gz -> ${P}-gh.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	dev-python/cloudpickle[${PYTHON_USEDEP}]
-	<dev-python/decorator-5[${PYTHON_USEDEP}]
-	>=dev-python/ipykernel-5.3.0[${PYTHON_USEDEP}]
-	>=dev-python/ipython-7.6.0[${PYTHON_USEDEP}]
-	<dev-python/ipython-7.23.0[${PYTHON_USEDEP}]
-	>=dev-python/jupyter_client-5.3.4[${PYTHON_USEDEP}]
-	>=dev-python/pyzmq-17[${PYTHON_USEDEP}]
-	>=dev-python/wurlitzer-1.0.3[${PYTHON_USEDEP}]
-"
-
-BDEPEND="
-	test? (
-		dev-python/cython[${PYTHON_USEDEP}]
-		dev-python/dask[${PYTHON_USEDEP}]
-		dev-python/flaky[${PYTHON_USEDEP}]
-		dev-python/matplotlib[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/pandas[${PYTHON_USEDEP}]
-		dev-python/scipy[${PYTHON_USEDEP}]
-		dev-python/xarray[${PYTHON_USEDEP}]
-		dev-python/pillow[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local deselect=(
-		# we no longer package distributed
-		spyder_kernels/console/tests/test_console_kernel.py::test_dask_multiprocessing
-	)
-
-	epytest ${deselect[@]/#/--deselect }
-}
diff --git a/dev-python/spyder/Manifest b/dev-python/spyder/Manifest
index cb3f4ac563a6..fe331f3b1322 100644
--- a/dev-python/spyder/Manifest
+++ b/dev-python/spyder/Manifest
@@ -1,4 +1,4 @@
 DIST spyder-4.2.5.tar.gz 11539071 BLAKE2B 9d7a98da018aae934803d640995fe2dfa6bbb20bfc7140bd00f5e7a00a09c47922fefd8df84f4b217a50176ee190515da6f4cbf498a03cae68e2ac4f5ec70664 SHA512 081b047a45b7522a69b1b21a221ab5cdef47f87f36ed4423ff63297d205f924c1627517c50622acb2d10efa094bc506fed4ec88f861775d3f58e81ac6ef017ac
-DIST spyder-5.0.3.tar.gz 20586502 BLAKE2B b8223273b638b57827f17037c47bb7bf53f19978fe9db343e354f557f4da17cfa03a36c013cab68b8b91b66495316a12d9652d864b8b089a495668b667a26b8c SHA512 c9b7c3a6755bc14ae84d8cd2c4166620a6fd1e83c097e2766f9f5190057775e4e3e9ba192d9eeb1cc434be11ac392f767239ae2d98cf40d95ffda4cf7cbeb358
-DIST spyder-docs-588cdf55cceffea7a3f31d98c0720bfe7df34b72.tar.gz 75780347 BLAKE2B c344ee0798e5780bfac5a8483c2992dfdddba5222fdd4a7c5603514bc612cc7300ec0cb49ebdcce6633d0cca8a5a36cfb5a2105c7f91febb5982dc2ea40fb86c SHA512 72f4644e872c57e229da8958a125bf405fa073ff99071b3555d97d8f8f71dc7b9f0dffbe61adf886e6bf3191894c639dd408d8dc76d65bc170bf7578b5b05558
+DIST spyder-5.0.4.tar.gz 20606964 BLAKE2B 20042d3d9b10da32aafe4036332608faa4bee458f36fb9359237cf2fd0651db68d8c7fb2a1bf653a350dcbd92fde856a4d37b4a8f85a37dffc6f8f31c750cbb3 SHA512 221c7b545d932a5c70f3f179b188f6ad9c2b1c632771f6766cba32115d1df56135708adbe2417c2236dc4b4fe847a734eaf1fb2920cad5b5e94969c308792d93
 DIST spyder-docs-78b25754c69a20643258821146e398ad5535c920.tar.gz 69167467 BLAKE2B d2815d552002f329b5fac59329fba3b3b0cd592bcbdacc0878966919e44dbab29548533661e60a1b9b8fd763d57d1e4c2f761782ace1b0a814a5f0cec1f66af9 SHA512 10764367fd5f830d7a3620b9d9e7ec4ab74539c1f48326c0c40f7caff74a50401addc7609fe1558c57dac4649d0a214c0d2d77cecd100bd8574151134e49634d
+DIST spyder-docs-b317961de7600fc906d862238f344b3a315d28b1.tar.gz 80326831 BLAKE2B 0e9bb5d52c3cc1615f74f31a2c87be9fca5431bd19975594e147b5f9f3082f16f0cdfc476402533a0950bd928fda55de6c3850ed3a2780f1439fe88e349bf0f2 SHA512 8a1fe8e88c029402743c15b720e2e889fdbb73999a1035e81e5b3f998992515e041e14d8e361e23e7ec8a02cf30706349d12e9e0b37df9d1d7554b926831af78
diff --git a/dev-python/spyder/spyder-5.0.3-r2.ebuild b/dev-python/spyder/spyder-5.0.4.ebuild
index acda1d84c75e..d935b172a70d 100644
--- a/dev-python/spyder/spyder-5.0.3-r2.ebuild
+++ b/dev-python/spyder/spyder-5.0.4.ebuild
@@ -9,7 +9,7 @@ DISTUTILS_USE_SETUPTOOLS=rdepend
 inherit optfeature xdg distutils-r1
 
 # Commit of documentation to fetch
-DOCS_PV="588cdf55cceffea7a3f31d98c0720bfe7df34b72"
+DOCS_PV="b317961de7600fc906d862238f344b3a315d28b1"
 
 DESCRIPTION="The Scientific Python Development Environment"
 HOMEPAGE="
@@ -19,8 +19,7 @@ HOMEPAGE="
 "
 SRC_URI="
 	https://github.com/spyder-ide/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	https://github.com/spyder-ide/${PN}-docs/archive/${DOCS_PV}.tar.gz ->
-		${PN}-docs-${DOCS_PV}.tar.gz
+	https://github.com/spyder-ide/${PN}-docs/archive/${DOCS_PV}.tar.gz -> ${PN}-docs-${DOCS_PV}.tar.gz
 "
 
 LICENSE="MIT"
@@ -67,12 +66,11 @@ RDEPEND="
 	>=dev-python/QtPy-1.5.0[${PYTHON_USEDEP},pyqt5(+),svg,webengine]
 	>=sci-libs/rtree-0.9.7[${PYTHON_USEDEP}]
 	>=dev-python/sphinx-0.6.6[${PYTHON_USEDEP}]
-	>=dev-python/spyder-kernels-2.0.3[${PYTHON_USEDEP}]
+	>=dev-python/spyder-kernels-2.0.4[${PYTHON_USEDEP}]
 	<dev-python/spyder-kernels-2.1.0[${PYTHON_USEDEP}]
 	>=dev-python/textdistance-4.2.0[${PYTHON_USEDEP}]
 	>=dev-python/three-merge-0.1.1[${PYTHON_USEDEP}]
 	>=dev-python/watchdog-0.10.3[${PYTHON_USEDEP}]
-	<dev-python/watchdog-2.0.0[${PYTHON_USEDEP}]
 "
 
 # python-language-server[all] deps
@@ -102,7 +100,7 @@ BDEPEND="
 		dev-python/pytest-lazy-fixture[${PYTHON_USEDEP}]
 		dev-python/pytest-mock[${PYTHON_USEDEP}]
 		dev-python/pytest-ordering[${PYTHON_USEDEP}]
-		dev-python/pytest-qt[${PYTHON_USEDEP}]
+		<dev-python/pytest-qt-4[${PYTHON_USEDEP}]
 		dev-python/pytest-xvfb[${PYTHON_USEDEP}]
 		dev-python/pyyaml[${PYTHON_USEDEP}]
 		dev-python/scipy[${PYTHON_USEDEP}]
diff --git a/dev-python/subprocess-tee/Manifest b/dev-python/subprocess-tee/Manifest
new file mode 100644
index 000000000000..cb2773b8f7ab
--- /dev/null
+++ b/dev-python/subprocess-tee/Manifest
@@ -0,0 +1 @@
+DIST subprocess-tee-0.3.2.tar.gz 14975 BLAKE2B 3198832f4c8bbf90e83038e39017cff1efc61ede84aded8220214e388a088777bdb861c044cddbf4b07c7b3172f8164e8bbf82b33de68d1fefea0f81bbacdfc9 SHA512 e681abc27623a3e05031bc05dc15e34f82c9cb544cd16742855411a9edb11fe8e38f9d11f8e651681d04081f121a47c38ebd172d70d282c8110a62699ef687d6
diff --git a/dev-python/subprocess-tee/metadata.xml b/dev-python/subprocess-tee/metadata.xml
new file mode 100644
index 000000000000..cd43c3ad819f
--- /dev/null
+++ b/dev-python/subprocess-tee/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+  <email>marecki@gentoo.org</email>
+  <name>Marek Szuba</name>
+ </maintainer>
+ <upstream>
+  <remote-id type="github">pycontribs/subprocess-tee</remote-id>
+  <remote-id type="pypi">subprocess-tee</remote-id>
+ </upstream>
+ <origin>gentoo-staging</origin>
+ <stabilize-allarches/>
+</pkgmetadata>
\ No newline at end of file
diff --git a/dev-python/subprocess-tee/subprocess-tee-0.3.2.ebuild b/dev-python/subprocess-tee/subprocess-tee-0.3.2.ebuild
new file mode 100644
index 000000000000..730031aa5953
--- /dev/null
+++ b/dev-python/subprocess-tee/subprocess-tee-0.3.2.ebuild
@@ -0,0 +1,38 @@
+# 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="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
+
+# 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
+}
+
+# TODO: do not install subprocess_tee.test
diff --git a/dev-python/watchdog/metadata.xml b/dev-python/watchdog/metadata.xml
index b47d5055d510..876e68079596 100644
--- a/dev-python/watchdog/metadata.xml
+++ b/dev-python/watchdog/metadata.xml
@@ -10,5 +10,4 @@
   <remote-id type="github">gorakhargosh/watchdog</remote-id>
  </upstream>
  <origin>gentoo-staging</origin>
- <stabilize-allarches/>
 </pkgmetadata>
\ No newline at end of file
diff --git a/dev-python/xapp/Manifest b/dev-python/xapp/Manifest
index 79694f0320a5..c49c5f657088 100644
--- a/dev-python/xapp/Manifest
+++ b/dev-python/xapp/Manifest
@@ -1,2 +1,2 @@
 DIST xapp-2.0.2.tar.gz 19946 BLAKE2B fde2f4f30fa1dbb5d4778d82bcfb347a5b8f89635df6c298d0dc509a194c528b653a1cbe4537c878bde4a8b987852ca51e37a70b6c35f96c9882c5b1b277dd36 SHA512 2b5d2a259e55384426940e6284ec9f964f4f0220b8cb364606c938ef6e1717d40ddbc3730732dddc86d460f624ac6161fe5ab55c276aedba9187a79d9d53a60e
-DIST xapp-2.2.0.tar.gz 20706 BLAKE2B 136ce77c15413fc96651d741992de09c618ef76c8adce6c1927100329401d3721256e5e3a6399a9bcdc79dc2a4cf224a579eea43ccbdd0740f3a1aa07edc3994 SHA512 169c8d6f5b94e58fea49e9bcc3b532ee0268e6a66d79257da2b113e6c4bfa5bc44b7cb03a08556372580667acbceca033e82140085e9367fd3bf97507257f26c
+DIST xapp-2.2.1.tar.gz 20739 BLAKE2B 11f3b8964aedc726235d1c9350b159ed5cc0e859f33d6390d06e8df225eb86d0d6a392d16023a460ae0dad69f4a65b3cc8c3a759e8a4e5abab491a6d71ea8ab9 SHA512 2c03a6201404d7c792e12b10241309c912ca6b1daaa56aa0867ddbb16af053f110e4cb05da969b1800678d60acc0e6d19fc097581e6b195fff9f68acb48505ff
diff --git a/dev-python/xapp/metadata.xml b/dev-python/xapp/metadata.xml
index b305e8ffdb62..5d248bcb2f23 100644
--- a/dev-python/xapp/metadata.xml
+++ b/dev-python/xapp/metadata.xml
@@ -2,10 +2,6 @@
 <!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
  <maintainer type="person">
-  <email>olivier.laurantin@laposte.net</email>
-  <name>Olivier Laurantin</name>
- </maintainer>
- <maintainer type="person">
   <email>sparky@bluefang-logic.com</email>
   <name>Matthew Turnbull</name>
  </maintainer>
diff --git a/dev-python/xapp/xapp-2.2.0.ebuild b/dev-python/xapp/xapp-2.2.1.ebuild
index 9252f6269483..9252f6269483 100644
--- a/dev-python/xapp/xapp-2.2.0.ebuild
+++ b/dev-python/xapp/xapp-2.2.1.ebuild