Adding metadata

author: Liguros - Gitlab CI/CD [develop] <gitlab@liguros.net> 2021-09-10 07:09:04 +0000
committer: Liguros - Gitlab CI/CD [develop] <gitlab@liguros.net> 2021-09-10 07:09:04 +0000
commit: a30a448aff4f450deba8f0bfc4fca47aaf67663a (patch)
tree: bcf0ae861600503ba0e53907d4a66c7820e44732 /dev-python
parent: ea69f9cb1eba5e9fdead50428ff2bc672fe3f218 (diff)
download: baldeagleos-repo-a30a448aff4f450deba8f0bfc4fca47aaf67663a.tar.gz
baldeagleos-repo-a30a448aff4f450deba8f0bfc4fca47aaf67663a.tar.xz
baldeagleos-repo-a30a448aff4f450deba8f0bfc4fca47aaf67663a.zip
90 files changed, 1245 insertions, 84 deletions
diff --git a/dev-python/PyRSS2Gen/PyRSS2Gen-1.1-r1.ebuild b/dev-python/PyRSS2Gen/PyRSS2Gen-1.1-r1.ebuild
index b9c17e2dd2de..f5b491a3fefd 100644
--- a/dev-python/PyRSS2Gen/PyRSS2Gen-1.1-r1.ebuild
+++ b/dev-python/PyRSS2Gen/PyRSS2Gen-1.1-r1.ebuild
@@ -2,6 +2,7 @@
 # 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
diff --git a/dev-python/PyRSS2Gen/metadata.xml b/dev-python/PyRSS2Gen/metadata.xml
index 154176348f08..d116e39e16c5 100644
--- a/dev-python/PyRSS2Gen/metadata.xml
+++ b/dev-python/PyRSS2Gen/metadata.xml
@@ -9,4 +9,5 @@
   <remote-id type="pypi">PyRSS2Gen</remote-id>
  </upstream>
  <origin>gentoo-staging</origin>
+ <stabilize-allarches/>
 </pkgmetadata>
 \ No newline at end of file
diff --git a/dev-python/PyUtilib/PyUtilib-6.0.0.ebuild b/dev-python/PyUtilib/PyUtilib-6.0.0.ebuild
index 6c9007827289..cb1496477150 100644
--- a/dev-python/PyUtilib/PyUtilib-6.0.0.ebuild
+++ b/dev-python/PyUtilib/PyUtilib-6.0.0.ebuild
@@ -3,7 +3,6 @@
 
 EAPI=7
 
-DISTUTILS_USE_SETUPTOOLS=rdepend
 PYTHON_COMPAT=( python3_{6,7,8,9,10} )
 DISTUTILS_IN_SOURCE_BUILD=1
 
@@ -18,6 +17,9 @@ LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
+RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
+BDEPEND="test? ( dev-python/nose[${PYTHON_USEDEP}] )"
+
 PATCHES=(
 	"${FILESDIR}/PyUtilib-6.0.0-tests.patch"
 )
@@ -36,5 +38,12 @@ python_test() {
 	local -x PYTHONPATH="${PWD}:${TEST_DIR}/lib" \
 		COLUMNS=80
 
+	if [[ ${EPYTHON} == python3.10 ]]; then
+		# Fix for very small output change of expected output in new version
+		sed -e 's/optional arguments/options/' -i \
+			"${BUILD_DIR}/../doc/workflow/examples/"*.txt \
+			pyutilib/misc/tests/test_config.py || die
+	fi
+
 	eunittest
 }
diff --git a/dev-python/PyUtilib/metadata.xml b/dev-python/PyUtilib/metadata.xml
index 849a21c4772c..1e6177cf3a09 100644
--- a/dev-python/PyUtilib/metadata.xml
+++ b/dev-python/PyUtilib/metadata.xml
@@ -12,4 +12,5 @@
   <remote-id type="pypi">PyUtilib</remote-id>
  </upstream>
  <origin>gentoo-staging</origin>
+ <stabilize-allarches/>
 </pkgmetadata>
 \ No newline at end of file
diff --git a/dev-python/argparse-manpage/argparse-manpage-1.5-r1.ebuild b/dev-python/argparse-manpage/argparse-manpage-1.5-r1.ebuild
index 80e2ab7e02e8..5e4ba410dcf3 100644
--- a/dev-python/argparse-manpage/argparse-manpage-1.5-r1.ebuild
+++ b/dev-python/argparse-manpage/argparse-manpage-1.5-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/praiskup/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~sparc ~x86"
 
 PATCHES=(
 	"${FILESDIR}/${P}-remove-six-dep.patch"
diff --git a/dev-python/asyncstdlib/Manifest b/dev-python/asyncstdlib/Manifest
index 33b3fa606274..b3c008784e0a 100644
--- a/dev-python/asyncstdlib/Manifest
+++ b/dev-python/asyncstdlib/Manifest
@@ -1,2 +1,3 @@
+DIST asyncstdlib-3.10.0.gh.tar.gz 45242 BLAKE2B 12fb7f96d9c7c6e7ddad67b6c25b805de95812f902e14935a11440c4c55437f550df18c388727d21745b99e6db97917849547fdf726a89c62136ce1d01b8545b SHA512 9e930fa906139d664575d7f41d4e5ddf7da62e02bc946efeadadf6631ae63c15ca2ac1b5793172424f9ad916d32bbd4a741de5844b247c2fa506b63431711933
 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.0.ebuild b/dev-python/asyncstdlib/asyncstdlib-3.10.0.ebuild
new file mode 100644
index 000000000000..5da889edab48
--- /dev/null
+++ b/dev-python/asyncstdlib/asyncstdlib-3.10.0.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/blurb/blurb-1.0.7.ebuild b/dev-python/blurb/blurb-1.0.7.ebuild
index 56a789309522..0bf5f6f5fdc7 100644
--- a/dev-python/blurb/blurb-1.0.7.ebuild
+++ b/dev-python/blurb/blurb-1.0.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2018 Sony Interactive Entertainment Inc.
+# Copyright 2018-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
diff --git a/dev-python/blurb/blurb-1.0.8.ebuild b/dev-python/blurb/blurb-1.0.8.ebuild
index d077072a98ea..4f3840d42f3c 100644
--- a/dev-python/blurb/blurb-1.0.8.ebuild
+++ b/dev-python/blurb/blurb-1.0.8.ebuild
@@ -1,9 +1,8 @@
-# Copyright 2018 Sony Interactive Entertainment Inc.
+# Copyright 2018-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-DISTUTILS_USE_SETUPTOOLS=rdepend
 PYTHON_COMPAT=( python3_{6,7,8,9,10} )
 inherit distutils-r1
 
@@ -18,3 +17,14 @@ KEYWORDS="~amd64 ~x86"
 PATCHES=(
 	"${FILESDIR}/blurb-setuptools.patch"
 )
+
+src_prepare() {
+	distutils-r1_src_prepare
+
+	# Tests expect to be run from github repo, in which code is inside dir
+	ln -s . blurb || die
+}
+
+python_test() {
+	"${EPYTHON}" -m blurb test || die "Tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/boto3/Manifest b/dev-python/boto3/Manifest
index 6a3a202c3d41..f0399450e511 100644
--- a/dev-python/boto3/Manifest
+++ b/dev-python/boto3/Manifest
@@ -5,4 +5,5 @@ DIST boto3-1.18.35.tar.gz 410165 BLAKE2B 1d32525175ee490b1b4029fc9c682afd789f850
 DIST boto3-1.18.36.tar.gz 410432 BLAKE2B 08d73bb8d8f16040f62fa5fb5e40855e201cd3bc24e0ffd0fdebbbf69a4ec05a0a93a6e1f08a61cebb1661542eda9783c36c098e07fd9b2f0d3c6ecc0ece1aea SHA512 16cc41de99ee216991dcb42d4ad92b08a834efdeaeba1fb18edd68dc3c0d1d04bb25b858f15f68286308a9dba0b800fc9c392b6b807c562660431425351e89e5
 DIST boto3-1.18.37.tar.gz 411095 BLAKE2B fafa31a06c52b1f35290ab4e6af7eb6e0bf16704da57b959b61edb8e5621bc036b1723ab084653e1177cbef008f3b4728546b7dfe78d572f600eda681e8e3feb SHA512 8536652e95ba7affdf701f76ab4674f6fddcc1b123e3476dc272f582cde236dfd920459c6cd644465e638ea0d6abf982e2ef77320cf1e7a4f5f6ef8b01e36227
 DIST boto3-1.18.38.tar.gz 411294 BLAKE2B d857299e4f622bedcdf106ad662e3ce9c937dfa6834f4fbd307925c8662876ea4fbd5553711f36c57d63eec76af93407a72ff8c796e1775e96380b120970102c SHA512 9e474efb5811bc83a2e53039a989b23594c03983b0fa3b75d3340a40403545b11d5f78bb83934471d4cf4660bffe31bc5966b188522dc08df28795611a12ba63
+DIST boto3-1.18.39.tar.gz 411636 BLAKE2B 1ff636a4749965644ae55f2b4a9ea085dc130da1c72e26680300e7751a9e10dc0fc654ba101a5f22eda9223a30d0b3f274e40a635c2760abe0eca94a3d024389 SHA512 3de98749d2bb0bb5dd9aa8fa4bcfbac24ef5536ffe1e967b4ff0d0d709f7d929da6c817136aa315e8148fb72540054b9592eaba28a937dc3a8a092ea75e01ef9
 DIST boto3-1.18.7.tar.gz 395640 BLAKE2B 6a9fa1dd55644806fe93271805f35fbe0c4cb65d1de08dded2d2f57fcefa96e32c4ebe7b60743c52c0898222bc06d33dbd03d304bbef327b88022450a7943e2c SHA512 20e7fedab7d061ab02f391e9baf36cb554e7f194f38d24d5a75f76715b2acf1b51b6adce5d8cf5a2a0d29df73566db00b8813a219d45a194d9a8eb93d0dab570
diff --git a/dev-python/boto3/boto3-1.18.39.ebuild b/dev-python/boto3/boto3-1.18.39.ebuild
new file mode 100644
index 000000000000..bee358e1c595
--- /dev/null
+++ b/dev-python/boto3/boto3-1.18.39.ebuild
@@ -0,0 +1,57 @@
+# 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="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 c46ffc0def8b..74be14658358 100644
--- a/dev-python/botocore/Manifest
+++ b/dev-python/botocore/Manifest
@@ -5,4 +5,5 @@ DIST botocore-1.21.35.tar.gz 8122175 BLAKE2B 976ceaeb93a838337403b334e4ff4747e72
 DIST botocore-1.21.36.tar.gz 8120799 BLAKE2B 3150e1efeca3173001f22e5e577ec4d9872af93608b3854f184455d11c1132bede7626b4f2a1ee79a70c1029578cac908914ef17e9d8675af1556454c270cb34 SHA512 1e69693580ebb311bc6be76ce92a11e3ecd33872dcd72c7add6dae696b231a39a3db6a6290930585445f442b7a5ba09445f0f176cd1d1ff21dde3efd054c0f0b
 DIST botocore-1.21.37.tar.gz 8123057 BLAKE2B 0e7c50bd5263db120f051e3d14c1a2f71db679c69cf22ca22f31a4e971d0aafe583b62e3d04083b5646663a87055bef73369d34b9ae825da25fe2bf4a76e58de SHA512 a81604b173216bce93b81a874b5f4defc84c9d1766f90c0fcd8b2ce9fa03867f11a08a6405f5e70006f10645a3729c2843c3f9c59bf37f901a5c07e73865f05c
 DIST botocore-1.21.38.tar.gz 8145897 BLAKE2B fef3847b2f2b1423438ac7922d850d132c313bb2c1eac4c73b31ee48100f1096c218730b30b2255f14bdbcab945a5dc851898cc00c89b692c45404e6c2f902c2 SHA512 2f9d32424f6f8e9829e7c111a83ec8176c72647be9253057cacc6fb89a2f3c2bded8d81d7704df45998daa4721a3391a6d510ac8e5052eb7caf7323f37be95c9
+DIST botocore-1.21.39.tar.gz 8146744 BLAKE2B 93e972da60e9fbd0c8cb5b65beac26c252b78762cec1a4c1018e64cc002ccab5468e8a510615efde23f7dfdbba601cc3842a004eef369ffe0afba29ea843530e SHA512 546a8c34752acd2a768cb6d7953a1a451f6c5f47a3ed8af9c7533d6a7bb3ff2e20df615aaa1bffa85ff137d4573a4ecdb5ffca2aa8d5c7d8555bf43c3a30871c
 DIST botocore-1.21.7.tar.gz 7977343 BLAKE2B 19c5bf5de40ab131585e30bb85486fcffc3428808811b312b33578174ce31a691f4f4d955462120f05d2aad2cd5e5772789704eee641760fb67099aa3cddc9b5 SHA512 db1bb36faa6857a1cc717e5d591954415bb948178ee2be90ab9c32c11b1fb45c5b5aff87dfacd907c2f11bc7cdd2cd4de2ee9c847fa8cda4e5f0814a828b1019
diff --git a/dev-python/botocore/botocore-1.21.39.ebuild b/dev-python/botocore/botocore-1.21.39.ebuild
new file mode 100644
index 000000000000..5684261bd4b3
--- /dev/null
+++ b/dev-python/botocore/botocore-1.21.39.ebuild
@@ -0,0 +1,59 @@
+# 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="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/clang-python/clang-python-12.0.1.ebuild b/dev-python/clang-python/clang-python-12.0.1.ebuild
index 84a0731ade28..79dd59fdcdf5 100644
--- a/dev-python/clang-python/clang-python-12.0.1.ebuild
+++ b/dev-python/clang-python/clang-python-12.0.1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://llvm.org/"
 
 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~x86"
 IUSE="test"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 RESTRICT="!test? ( test )"
diff --git a/dev-python/collective-checkdocs/collective-checkdocs-0.2-r1.ebuild b/dev-python/collective-checkdocs/collective-checkdocs-0.2-r1.ebuild
index dd0bb02c84c7..9b4d46d42590 100644
--- a/dev-python/collective-checkdocs/collective-checkdocs-0.2-r1.ebuild
+++ b/dev-python/collective-checkdocs/collective-checkdocs-0.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
diff --git a/dev-python/debugpy/Manifest b/dev-python/debugpy/Manifest
index f429037ba87b..0a861ef12953 100644
--- a/dev-python/debugpy/Manifest
+++ b/dev-python/debugpy/Manifest
@@ -1 +1,2 @@
 DIST debugpy-1.4.1.tar.gz 6687670 BLAKE2B c7761f354700d366d49365b0294ba1f07f357283c7527fc961c702bf99d808835741a899909e37092026c81ff19f6d96ef09c06512c8315ccad158b6e8e47697 SHA512 aef7779cb3a1af76b5cd3d6e8c7e0b78ffe08d1ebe25cf617ca3eb00966d5b3920358809c018f5f1f9eb56b913211134acfdba7d4c0d0174e4d6cfdae058d5f5
+DIST debugpy-1.4.2.tar.gz 6673987 BLAKE2B c61d09bc036f3a12e343be3d81b2e834bd69d33df80a6b9e4111d11a2eaea221feea3ac093ca06ad1a840dcab7d53d7b321276c4103420f34adac7a4a4ac8141 SHA512 7c0908ab9202cebb020ca72c558f3c1abc28b44fb968cce4387750f18e67198ad52dd6743061888610ed733e0f7334f986c2655ec7b0a2631acc4919cd9e6c20
diff --git a/dev-python/debugpy/debugpy-1.4.2.ebuild b/dev-python/debugpy/debugpy-1.4.2.ebuild
new file mode 100644
index 000000000000..ec94342bc61b
--- /dev/null
+++ b/dev-python/debugpy/debugpy-1.4.2.ebuild
@@ -0,0 +1,44 @@
+# 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="An implementation of the Debug Adapter Protocol for Python"
+HOMEPAGE="https://github.com/microsoft/debugpy/ https://pypi.org/project/debugpy/"
+SRC_URI="https://github.com/microsoft/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS=""
+
+# There is not enough time in the universe for this test suite
+RESTRICT="test"
+
+BDEPEND="test? ( dev-python/pytest-timeout[${PYTHON_USEDEP}] )"
+
+RDEPEND="dev-python/pydevd[${PYTHON_USEDEP}]"
+
+PATCHES=(
+	"${FILESDIR}/${P}-unbundle-pydevd.patch"
+)
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# Drop unnecessary and unrecognized option
+	# __main__.py: error: unrecognized arguments: -n8
+	# Do not timeout
+	sed -i \
+		-e 's/-n8//g' \
+		-e '/timeout/d' \
+		pytest.ini || die
+
+	# Unbundle dev-python/pydevd
+	rm -r src/debugpy/_vendored || die
+
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/debugpy/files/debugpy-1.4.2-unbundle-pydevd.patch b/dev-python/debugpy/files/debugpy-1.4.2-unbundle-pydevd.patch
new file mode 100644
index 000000000000..7047877ef279
--- /dev/null
+++ b/dev-python/debugpy/files/debugpy-1.4.2-unbundle-pydevd.patch
@@ -0,0 +1,78 @@
+diff --git a/setup.py b/setup.py
+index ee5bbba..f69dc95 100644
+--- a/setup.py
++++ b/setup.py
+@@ -21,12 +21,10 @@ del sys.path[0]
+ 
+ sys.path.insert(0, os.path.join(os.path.dirname(os.path.abspath(__file__)), "src"))
+ import debugpy
+-import debugpy._vendored
+ 
+ del sys.path[0]
+ 
+ 
+-PYDEVD_ROOT = debugpy._vendored.project_root("pydevd")
+ DEBUGBY_ROOT = os.path.dirname(os.path.abspath(debugpy.__file__))
+ 
+ 
+@@ -36,27 +34,6 @@ def get_buildplatform():
+     return None
+ 
+ 
+-def cython_build():
+-    print("Compiling extension modules (set SKIP_CYTHON_BUILD=1 to omit)")
+-    subprocess.call(
+-        [
+-            sys.executable,
+-            os.path.join(PYDEVD_ROOT, "setup_cython.py"),
+-            "build_ext",
+-            "-i",
+-        ]
+-    )
+-
+-
+-def iter_vendored_files():
+-    # Add pydevd files as data files for this package. They are not
+-    # treated as a package of their own, because we don't actually
+-    # want to provide pydevd - just use our own copy internally.
+-    for project in debugpy._vendored.list_all():
+-        for filename in debugpy._vendored.iter_packaging_files(project):
+-            yield filename
+-
+-
+ # bdist_wheel determines whether the package is pure or not based on ext_modules.
+ # However, all pydevd native modules are prebuilt and packaged as data, so they
+ # should not be in the list.
+@@ -121,8 +98,6 @@ with open("DESCRIPTION.md", "r") as fh:
+ 
+ 
+ if __name__ == "__main__":
+-    if not os.getenv("SKIP_CYTHON_BUILD"):
+-        cython_build()
+ 
+     extras = {}
+     platforms = get_buildplatform()
+@@ -165,11 +140,9 @@ if __name__ == "__main__":
+             "debugpy.common",
+             "debugpy.launcher",
+             "debugpy.server",
+-            "debugpy._vendored",
+         ],
+         package_data={
+             "debugpy": ["ThirdPartyNotices.txt"],
+-            "debugpy._vendored": list(iter_vendored_files()),
+         },
+         ext_modules=ExtModules(),
+         has_ext_modules=lambda: True,
+diff --git a/src/debugpy/server/__init__.py b/src/debugpy/server/__init__.py
+index e6a1ad6..a79a86b 100644
+--- a/src/debugpy/server/__init__.py
++++ b/src/debugpy/server/__init__.py
+@@ -3,7 +3,3 @@
+ # for license information.
+ 
+ from __future__ import absolute_import, division, print_function, unicode_literals
+-
+-# "force_pydevd" must be imported first to ensure (via side effects)
+-# that the debugpy-vendored copy of pydevd gets used.
+-import debugpy._vendored.force_pydevd  # noqa
diff --git a/dev-python/dictdiffer/dictdiffer-0.9.0.ebuild b/dev-python/dictdiffer/dictdiffer-0.9.0.ebuild
index a43db3912167..997d277b4309 100644
--- a/dev-python/dictdiffer/dictdiffer-0.9.0.ebuild
+++ b/dev-python/dictdiffer/dictdiffer-0.9.0.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 sparc ~x86"
 SLOT="0"
 
 BDEPEND="
diff --git a/dev-python/doit/doit-0.33.1.ebuild b/dev-python/doit/doit-0.33.1.ebuild
index ea419d7e0c7a..df1dff5d36fb 100644
--- a/dev-python/doit/doit-0.33.1.ebuild
+++ b/dev-python/doit/doit-0.33.1.ebuild
@@ -4,8 +4,6 @@
 EAPI=7
 
 PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
 inherit bash-completion-r1 distutils-r1
 
 DESCRIPTION="Automation tool"
diff --git a/dev-python/fuzzywuzzy/fuzzywuzzy-0.18.0.ebuild b/dev-python/fuzzywuzzy/fuzzywuzzy-0.18.0.ebuild
index 64eb381cdb6e..3e6414c068d8 100644
--- a/dev-python/fuzzywuzzy/fuzzywuzzy-0.18.0.ebuild
+++ b/dev-python/fuzzywuzzy/fuzzywuzzy-0.18.0.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="Fuzzy string matching in python"
 HOMEPAGE="https://github.com/seatgeek/fuzzywuzzy"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 sparc ~x86"
 LICENSE="GPL-2"
 SLOT="0"
 
diff --git a/dev-python/ghp-import/ghp-import-2.0.1.ebuild b/dev-python/ghp-import/ghp-import-2.0.1.ebuild
index f4d45816ecb8..b571d608a3ff 100644
--- a/dev-python/ghp-import/ghp-import-2.0.1.ebuild
+++ b/dev-python/ghp-import/ghp-import-2.0.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~riscv x86"
 
 RDEPEND="
 	>=dev-python/python-dateutil-2.8.1[${PYTHON_USEDEP}]
diff --git a/dev-python/json5/Manifest b/dev-python/json5/Manifest
new file mode 100644
index 000000000000..5556fd234b47
--- /dev/null
+++ b/dev-python/json5/Manifest
@@ -0,0 +1 @@
+DIST json5-0.9.6.tar.gz 109927 BLAKE2B 91e01250a6a4bb3f2f8baa6a425b0721fac3888366c36de7aeed3f82123a48d91b06a1fb7458ef93f99a9bbf9f6b81e7d665a64f52652c495df99bb7af0d5cfd SHA512 6e1d8bc602ab7a13e4b495dc27df438b55f7474284af3a828f3fcae51f4b595e5a7d3be9693cdea4930721e2205db966392ba154d7b80ba7b9b6c9a7c0e7f7af
diff --git a/dev-python/json5/json5-0.9.6.ebuild b/dev-python/json5/json5-0.9.6.ebuild
new file mode 100644
index 000000000000..1f8b0933fc60
--- /dev/null
+++ b/dev-python/json5/json5-0.9.6.ebuild
@@ -0,0 +1,19 @@
+# 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="A Python implementation of the JSON5 data format"
+HOMEPAGE="https://github.com/dpranke/pyjson5"
+SRC_URI="https://github.com/dpranke/pyjson5/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/py${P}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+distutils_enable_tests pytest
diff --git a/dev-python/json5/metadata.xml b/dev-python/json5/metadata.xml
new file mode 100644
index 000000000000..500f06e58a6b
--- /dev/null
+++ b/dev-python/json5/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+  <email>sci@gentoo.org</email>
+  <name>Gentoo Science Project</name>
+ </maintainer>
+ <upstream>
+  <remote-id type="pypi">json5</remote-id>
+ </upstream>
+ <origin>gentoo-staging</origin>
+ <stabilize-allarches/>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/dev-python/jupyter-lsp/Manifest b/dev-python/jupyter-lsp/Manifest
new file mode 100644
index 000000000000..c6dd6f2c8386
--- /dev/null
+++ b/dev-python/jupyter-lsp/Manifest
@@ -0,0 +1 @@
+DIST jupyter-lsp-1.4.1.tar.gz 35738 BLAKE2B 8eee0567c6700cf3a518e14a0fb01614fd3ff2abd913d33fe765439de391bae0de706d1e6284bb2bc537da7e4380ff812cc341b28e18af0db50473e37b6711c1 SHA512 c23d4343075a3f13ab19147bf1294443a3852fa7b5b9f888c860de9972a1d17b5398b66348c81a6c6a07aa5c3b4615d9edb4f5d53545a926c3f0d1294cf70da7
diff --git a/dev-python/jupyter-lsp/jupyter-lsp-1.4.1.ebuild b/dev-python/jupyter-lsp/jupyter-lsp-1.4.1.ebuild
new file mode 100644
index 000000000000..04864d4e6b56
--- /dev/null
+++ b/dev-python/jupyter-lsp/jupyter-lsp-1.4.1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+
+inherit distutils-r1 optfeature
+
+DESCRIPTION="Multi-Language Server WebSocket proxy for Jupyter Notebook/Lab"
+HOMEPAGE="https://github.com/krassowski/jupyterlab-lsp"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+
+# TODO: Find out what is going on here
+# asyncio.exceptions.TimeoutError
+RESTRICt="test"
+
+RDEPEND="
+	dev-python/entrypoints[${PYTHON_USEDEP}]
+	>=dev-python/jupyter_server-1.1.2[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# Do not depend on pytest-cov or flake8
+	sed -i -e '/--cov/d' -e '/--flake8/d' setup.cfg || die
+	# R lsp server not packaged
+	sed -i -e 's:test_r_package_detection:_&:' \
+		jupyter_lsp/tests/test_detect.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	mv "${ED}/usr/etc" "${ED}/etc" || die
+}
+
+pkg_postinst() {
+	optfeature "Language server for Python" dev-python/python-lsp-server
+}
diff --git a/dev-python/jupyter-lsp/metadata.xml b/dev-python/jupyter-lsp/metadata.xml
new file mode 100644
index 000000000000..30c1a4cc9b2f
--- /dev/null
+++ b/dev-python/jupyter-lsp/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+  <email>sci@gentoo.org</email>
+  <name>Gentoo Science Project</name>
+ </maintainer>
+ <upstream>
+  <remote-id type="pypi">jupyter-lsp</remote-id>
+ </upstream>
+ <origin>gentoo-staging</origin>
+ <stabilize-allarches/>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/dev-python/jupyter_server/Manifest b/dev-python/jupyter_server/Manifest
index cddf518ea5ab..8b3dbe97a79f 100644
--- a/dev-python/jupyter_server/Manifest
+++ b/dev-python/jupyter_server/Manifest
@@ -1 +1,2 @@
+DIST jupyter_server-1.11.0.tar.gz 419795 BLAKE2B 992bcadfd10cebc9d2c14ecc1489af91c161edc4fd8386d4b3e30c087737b3de723b5fa8d7f2cbb537e6f20568e6ed15f110e70781bc90cdc699fe6374ed3277 SHA512 9c8afb86af3669270e3103485500b635eb2dda35d731fb1adf3db997bb76ac61a769858525aacc6fb32ede7a299f0fc21991d0b64d009f506af232733b47b141
 DIST jupyter_server-1.8.0.tar.gz 408312 BLAKE2B db385085a1a660d707cc84570627e754dc19105af5157bc42e259822c9e98364ab77a9a16403d9b43757a6e175102632e83dd21466dff3487101771b51fdeb5f SHA512 3c4c9d64b7f0e26a79b38bc95106e062f1c363a13fc3b32c3897bbb15a7d91a64e46926b35c07f8c5bd440f55e3d01ec57c54c8b244969b6af7f7e18347030cd
diff --git a/dev-python/jupyter_server/jupyter_server-1.11.0.ebuild b/dev-python/jupyter_server/jupyter_server-1.11.0.ebuild
new file mode 100644
index 000000000000..ded3319e853a
--- /dev/null
+++ b/dev-python/jupyter_server/jupyter_server-1.11.0.ebuild
@@ -0,0 +1,61 @@
+# 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="Core services, APIs, and REST endpoints to Jupyter web applications"
+HOMEPAGE="https://jupyter.org"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	dev-python/jinja[${PYTHON_USEDEP}]
+	>=www-servers/tornado-6.1[${PYTHON_USEDEP}]
+	>=dev-python/pyzmq-17[${PYTHON_USEDEP}]
+	dev-python/argon2-cffi[${PYTHON_USEDEP}]
+	dev-python/ipython_genutils[${PYTHON_USEDEP}]
+	>=dev-python/traitlets-4.2.1[${PYTHON_USEDEP}]
+	>=dev-python/jupyter_core-4.6.0[${PYTHON_USEDEP}]
+	>=dev-python/jupyter_client-6.1.1[${PYTHON_USEDEP}]
+	dev-python/nbformat[${PYTHON_USEDEP}]
+	dev-python/nbconvert[${PYTHON_USEDEP}]
+	dev-python/send2trash[${PYTHON_USEDEP}]
+	>=dev-python/terminado-0.8.3[${PYTHON_USEDEP}]
+	dev-python/prometheus_client[${PYTHON_USEDEP}]
+	dev-python/anyio[${PYTHON_USEDEP}]
+	dev-python/websocket-client[${PYTHON_USEDEP}]
+	dev-python/requests-unixsocket[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/ipykernel[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+		dev-python/pytest-tornasync[${PYTHON_USEDEP}]
+		dev-python/pytest-console-scripts[${PYTHON_USEDEP}]
+	)"
+
+# TODO: Package 'myst_parser'
+# distutils_enable_sphinx docs/source
+# 	dev-python/pydata-sphinx-theme
+distutils_enable_tests --install pytest
+
+python_prepare_all() {
+	# Defining 'pytest_plugins' in a non-top-level conftest is no longer supported:
+	mv jupyter_server/conftest.py . || die
+
+	# This fails if your terminal is zsh (and maybe other non-bash as well?)
+	sed -i \
+		-e 's:est_terminal_create_with_cwd:_&:' \
+		-e 's:test_culling:_&:' \
+		jupyter_server/tests/test_terminal.py || die
+
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/jupyterlab-lsp/Manifest b/dev-python/jupyterlab-lsp/Manifest
new file mode 100644
index 000000000000..6301d36cfb31
--- /dev/null
+++ b/dev-python/jupyterlab-lsp/Manifest
@@ -0,0 +1 @@
+DIST jupyterlab-lsp-3.8.1.tar.gz 249073 BLAKE2B 1ab252fdc8868e997432704869f189fa814c292f7f34ec9f382bf94f4de65d35530f61ea7605176f2356e5b99db812746b78348cb27845c0168afb0498b93f2b SHA512 61840c2d206d3a107d43b97d222d76959d577ef63e0835a249e7201e50b6ce5f0abf067d0d4be928b9b451809e2e6e75803cf4450f71441018495fa17500067c
diff --git a/dev-python/jupyterlab-lsp/jupyterlab-lsp-3.8.1.ebuild b/dev-python/jupyterlab-lsp/jupyterlab-lsp-3.8.1.ebuild
new file mode 100644
index 000000000000..6797d3f1c21d
--- /dev/null
+++ b/dev-python/jupyterlab-lsp/jupyterlab-lsp-3.8.1.ebuild
@@ -0,0 +1,22 @@
+# 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="Coding assistance for JupyterLab with Language Server Protocol"
+HOMEPAGE="https://github.com/krassowski/jupyterlab-lsp"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	>=dev-python/jupyterlab-3.0.0[${PYTHON_USEDEP}]
+	<dev-python/jupyterlab-4.0.0[${PYTHON_USEDEP}]
+	>=dev-python/jupyter-lsp-1.4.0[${PYTHON_USEDEP}]
+"
diff --git a/dev-python/jupyterlab-lsp/metadata.xml b/dev-python/jupyterlab-lsp/metadata.xml
new file mode 100644
index 000000000000..512913c0f67a
--- /dev/null
+++ b/dev-python/jupyterlab-lsp/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+  <email>sci@gentoo.org</email>
+  <name>Gentoo Science Project</name>
+ </maintainer>
+ <upstream>
+  <remote-id type="pypi">jupyterlab-lsp</remote-id>
+ </upstream>
+ <origin>gentoo-staging</origin>
+ <stabilize-allarches/>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/dev-python/jupyterlab/Manifest b/dev-python/jupyterlab/Manifest
new file mode 100644
index 000000000000..1a0995cc00ba
--- /dev/null
+++ b/dev-python/jupyterlab/Manifest
@@ -0,0 +1 @@
+DIST jupyterlab-3.1.10.tar.gz 10997693 BLAKE2B 290276a24a92dce18ec97fca1bc20dfa79ffe9f905c49fe2e30606732fb892f15dfa9068ec53ed0ce7bfe274240f1857c381954b63c9ed1e6473715a57caa9b2 SHA512 c8e8dc850818fddee2354165bf49ca5c6c6d3daf9ed2f2c3d804c5e7f5f7c919ae613cceb686d7e4e60c6d1d5074223bee2c6ef6c6cf37346a280675a74e0e67
diff --git a/dev-python/jupyterlab/jupyterlab-3.1.10-r1.ebuild b/dev-python/jupyterlab/jupyterlab-3.1.10-r1.ebuild
new file mode 100644
index 000000000000..061f2b5dcb39
--- /dev/null
+++ b/dev-python/jupyterlab/jupyterlab-3.1.10-r1.ebuild
@@ -0,0 +1,42 @@
+# 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="JupyterLab computational environment"
+HOMEPAGE="https://jupyter.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD MIT GPL-3 Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+# TODO: package openapi et al
+RESTRICT="test"
+
+BDEPEND="dev-python/jupyter_packaging[${PYTHON_USEDEP}]"
+
+RDEPEND="
+	dev-python/ipython[${PYTHON_USEDEP}]
+	dev-python/packaging[${PYTHON_USEDEP}]
+	dev-python/jupyter_core[${PYTHON_USEDEP}]
+	dev-python/jupyterlab_server[${PYTHON_USEDEP}]
+	dev-python/jupyter_server[${PYTHON_USEDEP}]
+	dev-python/nbclassic[${PYTHON_USEDEP}]
+	>=dev-python/jinja-2.1[${PYTHON_USEDEP}]
+	>=www-servers/tornado-6.1[${PYTHON_USEDEP}]
+	net-libs/nodejs
+"
+
+distutils_enable_tests pytest
+# TODO: package myst_parser
+#distutils_enable_sphinx docs/source dev-python/sphinx_rtd_theme
+
+python_install_all() {
+	distutils-r1_python_install_all
+	mv "${ED}/usr/etc" "${ED}/etc" || die
+}
diff --git a/dev-python/jupyterlab/metadata.xml b/dev-python/jupyterlab/metadata.xml
new file mode 100644
index 000000000000..092a4a91680b
--- /dev/null
+++ b/dev-python/jupyterlab/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+  <email>sci@gentoo.org</email>
+  <name>Gentoo Science Project</name>
+ </maintainer>
+ <upstream>
+  <remote-id type="pypi">jupyterlab</remote-id>
+ </upstream>
+ <origin>gentoo-staging</origin>
+ <stabilize-allarches/>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/dev-python/jupyterlab_server/Manifest b/dev-python/jupyterlab_server/Manifest
new file mode 100644
index 000000000000..e263568f7ace
--- /dev/null
+++ b/dev-python/jupyterlab_server/Manifest
@@ -0,0 +1 @@
+DIST jupyterlab_server-2.7.2.tar.gz 54056 BLAKE2B d8cee398053237d3289dde30ae8baae78590cd248591111624f1d853e077cb327f4d2d775a8ecca2333bc8c84afa1737a394334ce3805aea8bfdf80152970549 SHA512 7183a0bb3c02bd0788ca02604f1e8e5d068218be506634547ba44f18ff4ae7cad7b0c724f106ad23ee476260377cfe418e6b0d57ee25584b5f6a6c33e01df92d
diff --git a/dev-python/jupyterlab_server/jupyterlab_server-2.7.2.ebuild b/dev-python/jupyterlab_server/jupyterlab_server-2.7.2.ebuild
new file mode 100644
index 000000000000..8ac6578dedb6
--- /dev/null
+++ b/dev-python/jupyterlab_server/jupyterlab_server-2.7.2.ebuild
@@ -0,0 +1,44 @@
+# 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="Server components for JupyterLab and JupyterLab like applications"
+HOMEPAGE="https://jupyter.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+
+# TODO: package openapi et al
+RESTRICT="test"
+
+RDEPEND="
+	dev-python/Babel[${PYTHON_USEDEP}]
+	>=dev-python/entrypoints-0.2.2[${PYTHON_USEDEP}]
+	>=dev-python/jinja-2.10[${PYTHON_USEDEP}]
+	dev-python/json5[${PYTHON_USEDEP}]
+	>=dev-python/jsonschema-3.0.1[${PYTHON_USEDEP}]
+	dev-python/packaging[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/jupyter_server[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+# TODO: package myst_parser
+#distutils_enable_sphinx docs/source dev-python/pydata-sphinx-theme
+
+python_prepare_all() {
+	# Do not depend on pytest-cov
+	sed -i -e '/addopts/d' pyproject.toml || die
+
+	# Defining 'pytest_plugins' in a non-top-level conftest is no longer supported:
+	mv ${PN}/tests/conftest.py . || die
+
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/jupyterlab_server/metadata.xml b/dev-python/jupyterlab_server/metadata.xml
new file mode 100644
index 000000000000..627728b505a9
--- /dev/null
+++ b/dev-python/jupyterlab_server/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+  <email>sci@gentoo.org</email>
+  <name>Gentoo Science Project</name>
+ </maintainer>
+ <upstream>
+  <remote-id type="pypi">jupyterlab-server</remote-id>
+ </upstream>
+ <origin>gentoo-staging</origin>
+ <stabilize-allarches/>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/dev-python/lazr-config/lazr-config-2.2.2.ebuild b/dev-python/lazr-config/lazr-config-2.2.2.ebuild
index 18be756d1dad..ff8b1d3d557b 100644
--- a/dev-python/lazr-config/lazr-config-2.2.2.ebuild
+++ b/dev-python/lazr-config/lazr-config-2.2.2.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://code.launchpad.net/lazr.config"
 SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz"
 S="${WORKDIR}/${MY_PN}-${PV}"
 
-LICENSE="Apache-2.0"
+LICENSE="LGPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
diff --git a/dev-python/lazr-config/lazr-config-2.2.3.ebuild b/dev-python/lazr-config/lazr-config-2.2.3.ebuild
index 18be756d1dad..73fd50155820 100644
--- a/dev-python/lazr-config/lazr-config-2.2.3.ebuild
+++ b/dev-python/lazr-config/lazr-config-2.2.3.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 PYTHON_COMPAT=( python3_{6,7,8,9,10} )
 DISTUTILS_USE_SETUPTOOLS=rdepend
@@ -15,10 +15,20 @@ HOMEPAGE="https://code.launchpad.net/lazr.config"
 SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz"
 S="${WORKDIR}/${MY_PN}-${PV}"
 
-LICENSE="Apache-2.0"
+LICENSE="LGPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
 RDEPEND="
+	dev-python/lazr-delegates[${PYTHON_USEDEP}]
+	dev-python/namespace-lazr[${PYTHON_USEDEP}]
 	dev-python/zope-interface[${PYTHON_USEDEP}]
-	dev-python/lazr-delegates[${PYTHON_USEDEP}]"
+"
+
+distutils_enable_tests pytest
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	find "${ED}" -name '*.pth' -delete || die
+}
diff --git a/dev-python/lazr-config/metadata.xml b/dev-python/lazr-config/metadata.xml
index c70cdfbac61f..ccab09c3c254 100644
--- a/dev-python/lazr-config/metadata.xml
+++ b/dev-python/lazr-config/metadata.xml
@@ -12,4 +12,5 @@
   <remote-id type="pypi">lazr.config</remote-id>
  </upstream>
  <origin>gentoo-staging</origin>
+ <stabilize-allarches/>
 </pkgmetadata>
 \ No newline at end of file
diff --git a/dev-python/lazr-delegates/lazr-delegates-2.0.4.ebuild b/dev-python/lazr-delegates/lazr-delegates-2.0.4.ebuild
index e8a12b17769b..9cc27de5e957 100644
--- a/dev-python/lazr-delegates/lazr-delegates-2.0.4.ebuild
+++ b/dev-python/lazr-delegates/lazr-delegates-2.0.4.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 PYTHON_COMPAT=( python3_{6,7,8,9,10} )
 DISTUTILS_USE_SETUPTOOLS=rdepend
@@ -15,13 +15,20 @@ HOMEPAGE="https://code.launchpad.net/lazr.delegates"
 SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz"
 S="${WORKDIR}/${MY_PN}-${PV}"
 
-LICENSE="Apache-2.0"
+LICENSE="LGPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
 RDEPEND="
-	dev-python/zope-interface[${PYTHON_USEDEP}]
+	dev-python/namespace-lazr[${PYTHON_USEDEP}]
 	dev-python/nose[${PYTHON_USEDEP}]
+	dev-python/zope-interface[${PYTHON_USEDEP}]
 "
 
 distutils_enable_tests pytest
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	find "${ED}" -name '*.pth' -delete || die
+}
diff --git a/dev-python/lazr-delegates/metadata.xml b/dev-python/lazr-delegates/metadata.xml
index 3a944d694c4e..36636545869e 100644
--- a/dev-python/lazr-delegates/metadata.xml
+++ b/dev-python/lazr-delegates/metadata.xml
@@ -12,4 +12,5 @@
   <remote-id type="pypi">lazr.delegates</remote-id>
  </upstream>
  <origin>gentoo-staging</origin>
+ <stabilize-allarches/>
 </pkgmetadata>
 \ No newline at end of file
diff --git a/dev-python/lit/lit-12.0.1.ebuild b/dev-python/lit/lit-12.0.1.ebuild
index 12fc694b16b8..c0723ae75ecc 100644
--- a/dev-python/lit/lit-12.0.1.ebuild
+++ b/dev-python/lit/lit-12.0.1.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://llvm.org/"
 
 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~riscv ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/markups/markups-3.1.2.ebuild b/dev-python/markups/markups-3.1.2.ebuild
index b9d50f29f82b..77dc0479d075 100644
--- a/dev-python/markups/markups-3.1.2.ebuild
+++ b/dev-python/markups/markups-3.1.2.ebuild
@@ -35,3 +35,4 @@ BDEPEND="
 "
 
 distutils_enable_tests unittest
+distutils_enable_sphinx docs
diff --git a/dev-python/mdx_gh_links/mdx_gh_links-0.2.ebuild b/dev-python/mdx_gh_links/mdx_gh_links-0.2.ebuild
index 180df71cd7af..0bc98cdd8222 100644
--- a/dev-python/mdx_gh_links/mdx_gh_links-0.2.ebuild
+++ b/dev-python/mdx_gh_links/mdx_gh_links-0.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~riscv x86"
 
 RDEPEND="
 	dev-python/markdown[${PYTHON_USEDEP}]
diff --git a/dev-python/mergedeep/mergedeep-1.3.4.ebuild b/dev-python/mergedeep/mergedeep-1.3.4.ebuild
index 49b501b25314..8a71bf48ea18 100644
--- a/dev-python/mergedeep/mergedeep-1.3.4.ebuild
+++ b/dev-python/mergedeep/mergedeep-1.3.4.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/clarketm/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~riscv x86"
 
 distutils_enable_tests pytest
 distutils_enable_sphinx docs/source dev-python/alabaster dev-python/recommonmark
diff --git a/dev-python/mkdocs-bootstrap/mkdocs-bootstrap-1.1-r1.ebuild b/dev-python/mkdocs-bootstrap/mkdocs-bootstrap-1.1-r1.ebuild
index b84a55099085..6bd909d81eee 100644
--- a/dev-python/mkdocs-bootstrap/mkdocs-bootstrap-1.1-r1.ebuild
+++ b/dev-python/mkdocs-bootstrap/mkdocs-bootstrap-1.1-r1.ebuild
@@ -17,4 +17,4 @@ LICENSE="BSD"
 SLOT="0"
 KEYWORDS="amd64 x86"
 
-DEPEND="dev-python/mkdocs"
+RDEPEND="dev-python/mkdocs"
diff --git a/dev-python/mkdocs-bootswatch/mkdocs-bootswatch-1.1-r1.ebuild b/dev-python/mkdocs-bootswatch/mkdocs-bootswatch-1.1-r1.ebuild
index 3c0e0e1db9c3..5a767256ebff 100644
--- a/dev-python/mkdocs-bootswatch/mkdocs-bootswatch-1.1-r1.ebuild
+++ b/dev-python/mkdocs-bootswatch/mkdocs-bootswatch-1.1-r1.ebuild
@@ -17,4 +17,4 @@ LICENSE="BSD"
 SLOT="0"
 KEYWORDS="amd64 x86"
 
-DEPEND="dev-python/mkdocs"
+RDEPEND="dev-python/mkdocs"
diff --git a/dev-python/mkdocs-git-revision-date-localized-plugin/mkdocs-git-revision-date-localized-plugin-0.9.3.ebuild b/dev-python/mkdocs-git-revision-date-localized-plugin/mkdocs-git-revision-date-localized-plugin-0.9.3.ebuild
index 5c7fa823ca39..6620d6fcd369 100644
--- a/dev-python/mkdocs-git-revision-date-localized-plugin/mkdocs-git-revision-date-localized-plugin-0.9.3.ebuild
+++ b/dev-python/mkdocs-git-revision-date-localized-plugin/mkdocs-git-revision-date-localized-plugin-0.9.3.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 PYTHON_COMPAT=( python3_{6,7,8,9,10} )
 
diff --git a/dev-python/mkdocs-material-extensions/mkdocs-material-extensions-1.0.3.ebuild b/dev-python/mkdocs-material-extensions/mkdocs-material-extensions-1.0.3.ebuild
index fe2da2928d5e..8d22623c287e 100644
--- a/dev-python/mkdocs-material-extensions/mkdocs-material-extensions-1.0.3.ebuild
+++ b/dev-python/mkdocs-material-extensions/mkdocs-material-extensions-1.0.3.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 PYTHON_COMPAT=( python3_{6,7,8,9,10} )
 
diff --git a/dev-python/mkdocs-redirects/Manifest b/dev-python/mkdocs-redirects/Manifest
index 6416987b2203..0afbac606735 100644
--- a/dev-python/mkdocs-redirects/Manifest
+++ b/dev-python/mkdocs-redirects/Manifest
@@ -1,2 +1,3 @@
 DIST mkdocs-redirects-1.0.1.tar.gz 5772 BLAKE2B e48a35b18690c040efcca2e3e6a97650a3f951b89d537537b54b297e61c590099c6891dd1d64f21dd4efcc4a20d3d709a2815280c2846324f9f57b5a953a31bb SHA512 e3eb31ce920aceab2e4c93988853fc0e63ba789db229ac798791061b26252416c5c68b2c221f82e3a08ce7522e6b2aa58ca606b9a31653f782e31c415861f7d0
+DIST mkdocs-redirects-1.0.3.gh.tar.gz 6395 BLAKE2B 6e6b319cacd5039550755b1796d09c5377b65174b9e0f2dab7e47b37626bfdeda4f9c52ecc7eb3adeec31f4c28c408bcbc4f8461b16c8f02cfb60bdf929d776a SHA512 7977e92e1e8e29a7ef3f3644060d1d872bb67c2386d1880799b95e7d505834ff629bf70824301972f10af39ad8c60e8813f28ca3165ddb9b150af359bce361c9
 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-r1.ebuild b/dev-python/mkdocs-redirects/mkdocs-redirects-1.0.3-r1.ebuild
new file mode 100644
index 000000000000..8233e5dfc576
--- /dev/null
+++ b/dev-python/mkdocs-redirects/mkdocs-redirects-1.0.3-r1.ebuild
@@ -0,0 +1,34 @@
+# 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
+
+# Upstream forgot to tag the release, and no tests on pypi tarball
+COMMIT="07ef89796ec97be3c6ea2681441992d5d4bfa87b"
+
+DESCRIPTION="Plugin for Mkdocs page redirects"
+HOMEPAGE="
+	https://github.com/datarobot/mkdocs-redirects
+	https://pypi.org/project/mkdocs-redirects/
+"
+SRC_URI="
+	https://github.com/datarobot/mkdocs-redirects/archive/${COMMIT}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+S="${WORKDIR}/${PN}-${COMMIT}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>=dev-python/mkdocs-1.0.4[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/twine[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/mkdocs-redirects/mkdocs-redirects-1.0.3.ebuild b/dev-python/mkdocs-redirects/mkdocs-redirects-1.0.3.ebuild
index 41c4157bd386..7a88543d4c43 100644
--- a/dev-python/mkdocs-redirects/mkdocs-redirects-1.0.3.ebuild
+++ b/dev-python/mkdocs-redirects/mkdocs-redirects-1.0.3.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~riscv x86"
 
 RDEPEND="
 	>=dev-python/mkdocs-1.0.4[${PYTHON_USEDEP}]
diff --git a/dev-python/mkdocs/mkdocs-1.2.2.ebuild b/dev-python/mkdocs/mkdocs-1.2.2.ebuild
index 4942349de282..9fab7aa84fed 100644
--- a/dev-python/mkdocs/mkdocs-1.2.2.ebuild
+++ b/dev-python/mkdocs/mkdocs-1.2.2.ebuild
@@ -4,8 +4,6 @@
 EAPI=7
 
 PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
 inherit distutils-r1
 
 DESCRIPTION="Project documentation with Markdown"
@@ -14,7 +12,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~riscv x86"
 
 IUSE="doc"
 
diff --git a/dev-python/namespace-lazr/metadata.xml b/dev-python/namespace-lazr/metadata.xml
new file mode 100644
index 000000000000..853174b8f2ab
--- /dev/null
+++ b/dev-python/namespace-lazr/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+  <email>python@gentoo.org</email>
+  <name>Python</name>
+ </maintainer>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/dev-python/namespace-lazr/namespace-lazr-1.ebuild b/dev-python/namespace-lazr/namespace-lazr-1.ebuild
new file mode 100644
index 000000000000..3103a908c70a
--- /dev/null
+++ b/dev-python/namespace-lazr/namespace-lazr-1.ebuild
@@ -0,0 +1,31 @@
+# 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 python-r1
+
+DESCRIPTION="Namespace package declaration for lazr"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Python/Namespace_packages"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	${PYTHON_DEPS}"
+DEPEND="${PYTHON_DEPS}"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+src_unpack() {
+	mkdir -p "${S}"/lazr || die
+	cat > "${S}"/lazr/__init__.py <<-EOF || die
+		__import__('pkg_resources').declare_namespace(__name__)
+	EOF
+}
+
+src_install() {
+	python_foreach_impl python_domodule lazr
+}
diff --git a/dev-python/nbclassic/Manifest b/dev-python/nbclassic/Manifest
new file mode 100644
index 000000000000..550a66503bca
--- /dev/null
+++ b/dev-python/nbclassic/Manifest
@@ -0,0 +1 @@
+DIST nbclassic-0.3.1.tar.gz 25761 BLAKE2B 0bdb02d68dd73283cf228c7a4964592ebea9884f9f68571d5ea3715a44236cab1dd68f7e42fe62f82f18f5937a55c3f222bffed5be2b4e8b31c596e6c357e28f SHA512 351aa10652f286a2a6be68d8331b24f200138bd65c777884b1a70aa9d991da0a39a4bc77eefb6f74e47edf708653780d81a3805c28dffb43d32716998e4c38f5
diff --git a/dev-python/nbclassic/metadata.xml b/dev-python/nbclassic/metadata.xml
new file mode 100644
index 000000000000..8f7779e344d6
--- /dev/null
+++ b/dev-python/nbclassic/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+  <email>sci@gentoo.org</email>
+  <name>Gentoo Science Project</name>
+ </maintainer>
+ <upstream>
+  <remote-id type="pypi">nbclassic</remote-id>
+ </upstream>
+ <origin>gentoo-staging</origin>
+ <stabilize-allarches/>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/dev-python/nbclassic/nbclassic-0.3.1.ebuild b/dev-python/nbclassic/nbclassic-0.3.1.ebuild
new file mode 100644
index 000000000000..50dbccdc2ac1
--- /dev/null
+++ b/dev-python/nbclassic/nbclassic-0.3.1.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="Jupyter Notebook as a Jupyter Server Extension"
+HOMEPAGE="https://jupyter.org/"
+SRC_URI="https://github.com/jupyterlab/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	dev-python/jupyter_server[${PYTHON_USEDEP}]
+	dev-python/notebook[${PYTHON_USEDEP}]
+"
+
+BDEPEND="
+	test? (
+		dev-python/pytest-console-scripts[${PYTHON_USEDEP}]
+		dev-python/pytest-tornasync[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/netaddr/netaddr-0.8.0.ebuild b/dev-python/netaddr/netaddr-0.8.0.ebuild
index 1ed58e458945..537d8f0b3635 100644
--- a/dev-python/netaddr/netaddr-0.8.0.ebuild
+++ b/dev-python/netaddr/netaddr-0.8.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/netaddr/netaddr/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
 IUSE="cli"
 
 RDEPEND="
diff --git a/dev-python/prettytable/prettytable-0.7.2-r1.ebuild b/dev-python/prettytable/prettytable-0.7.2-r1.ebuild
index 3b8158dd7e59..4d8229fe0ad1 100644
--- a/dev-python/prettytable/prettytable-0.7.2-r1.ebuild
+++ b/dev-python/prettytable/prettytable-0.7.2-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/P/PrettyTable/${P}.tar.bz2"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ppc64 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/pydevd/Manifest b/dev-python/pydevd/Manifest
new file mode 100644
index 000000000000..70b8a69447da
--- /dev/null
+++ b/dev-python/pydevd/Manifest
@@ -0,0 +1 @@
+DIST pydev_debugger_2_5_0.tar.gz 4140556 BLAKE2B 8630fc35138b3bb768b8a62a2f1388a1144baa9207aec49717c3c04843a393b130dfaef3266ad8fce5a5aa3af4e25d4441b075da0aa36ec1a8716db5ba5ac56c SHA512 7ebf1a5405a376fb19fb4bab0f4874e6be273d3c095338d8a2bfad433b0ec306918b2c650bd20dc5ffd835dd01e7398da2b66607a66dad931f98764f572e0be8
diff --git a/dev-python/pydevd/metadata.xml b/dev-python/pydevd/metadata.xml
new file mode 100644
index 000000000000..5c4f312b1204
--- /dev/null
+++ b/dev-python/pydevd/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+  <email>sci@gentoo.org</email>
+  <name>Gentoo Science Project</name>
+ </maintainer>
+ <upstream>
+  <remote-id type="pypi">pydevd</remote-id>
+ </upstream>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/dev-python/pydevd/pydevd-2.5.0.ebuild b/dev-python/pydevd/pydevd-2.5.0.ebuild
new file mode 100644
index 000000000000..c8bc9ec06c0c
--- /dev/null
+++ b/dev-python/pydevd/pydevd-2.5.0.ebuild
@@ -0,0 +1,53 @@
+# 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="PyDev.Debugger (used in PyDev, PyCharm and VSCode Python)"
+HOMEPAGE="https://github.com/fabioz/PyDev.Debugger/"
+SRC_URI="https://github.com/fabioz/PyDev.Debugger/archive/refs/tags/pydev_debugger_${PV//./_}.tar.gz"
+S="${WORKDIR}/PyDev.Debugger-pydev_debugger_${PV//./_}"
+
+LICENSE="EPL-1.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+BDEPEND="test? ( dev-python/untangle[${PYTHON_USEDEP}] )"
+
+distutils_enable_tests pytest
+
+# These files are included pre-built in the sources
+# TODO: Investigate what this is and if/how we can compile this properly
+QA_PREBUILT="
+	/usr/lib/python*/site-packages/pydevd_attach_to_process/attach_linux_*.so
+"
+
+python_prepare_all() {
+	# AssertionError: TimeoutError (note: error trying to dump threads on timeout).
+	# TODO: investigate and fix this
+	sed -i \
+		-e 's:test_case_qthread4:_&:' \
+		-e 's:test_path_translation:_&:' \
+		-e 's:test_asyncio_step_over_basic:_&:' \
+		-e 's:test_asyncio_step_over_end_of_function:_&:' \
+		-e 's:test_asyncio_step_in:_&:' \
+		-e 's:test_asyncio_step_return:_&:' \
+		tests_python/test_debugger.py || die
+	sed -i \
+		-e 's:test_evaluate_exception_trace:_&:' \
+		-e 's:test_path_translation_and_source_reference:_&:' \
+		tests_python/test_debugger_json.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	# Remove this duplicate that is installed directly to /usr/
+	# These files are also correctly installed to the python site-packages dir
+	rm -r "${ED}/usr/pydevd_attach_to_process"
+}
diff --git a/dev-python/pytest-console-scripts/Manifest b/dev-python/pytest-console-scripts/Manifest
new file mode 100644
index 000000000000..2d4349eda3b8
--- /dev/null
+++ b/dev-python/pytest-console-scripts/Manifest
@@ -0,0 +1 @@
+DIST pytest-console-scripts-1.2.0.tar.gz 13976 BLAKE2B 1452ecfdc47d3341d8f3f30d49f371ae89d6138d56e4dc3a230f6a3803c6c36f542df40e2785c99c3cfd5080fa03b5b3d4926bb742dc99bd2127d47305fbf788 SHA512 07c9baab85035265ab6a21cc0c754b076dba87f08e1ab51319ef47a0a8af0b44f7d42422014c68cf93ed28b508138a70e14b968707cc831682885b3ca8106aa7
diff --git a/dev-python/pytest-console-scripts/metadata.xml b/dev-python/pytest-console-scripts/metadata.xml
new file mode 100644
index 000000000000..ee65143e7fb6
--- /dev/null
+++ b/dev-python/pytest-console-scripts/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+  <email>sci@gentoo.org</email>
+  <name>Gentoo Science Project</name>
+ </maintainer>
+ <upstream>
+  <remote-id type="pypi">pytest-console-scripts</remote-id>
+ </upstream>
+ <origin>gentoo-staging</origin>
+ <stabilize-allarches/>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/dev-python/pytest-console-scripts/pytest-console-scripts-1.2.0.ebuild b/dev-python/pytest-console-scripts/pytest-console-scripts-1.2.0.ebuild
new file mode 100644
index 000000000000..97aa6424308c
--- /dev/null
+++ b/dev-python/pytest-console-scripts/pytest-console-scripts-1.2.0.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} )
+
+inherit distutils-r1
+
+DESCRIPTION="Pytest plugin for testing console scripts"
+HOMEPAGE="https://github.com/kvas-it/pytest-console-scripts"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	>=dev-python/pytest-4.0.0[${PYTHON_USEDEP}]
+	>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests --install pytest
+
+python_prepare_all() {
+	# allow newer setuptools_scm
+	sed -i -e 's/setuptools_scm<6/setuptools_scm/g' setup.py || die
+
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/pytest-ordering/pytest-ordering-0.6.ebuild b/dev-python/pytest-ordering/pytest-ordering-0.6.ebuild
index 4a924899aef8..768c96d086eb 100644
--- a/dev-python/pytest-ordering/pytest-ordering-0.6.ebuild
+++ b/dev-python/pytest-ordering/pytest-ordering-0.6.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/ftobia/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 sparc x86"
 
 RDEPEND="<dev-python/pytest-6[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/pytest-tornasync/Manifest b/dev-python/pytest-tornasync/Manifest
new file mode 100644
index 000000000000..591d86f01ace
--- /dev/null
+++ b/dev-python/pytest-tornasync/Manifest
@@ -0,0 +1 @@
+DIST pytest-tornasync-0.6.0.post2.tar.gz 6201 BLAKE2B 6b6a2f941e649fb33373ef39b9d848d68a8af0f5e0d1a5e4496a9160e8e63ea108832437e87382c8203bb2c75673fad37b4ebd76157913199eb1661cd0216591 SHA512 2e258913b17a5442d18928833ee7e9771b6dbd148dbf251a7661432a54d4b9f9f3a7c396134eb544c0e3ce0af48c99d2d632399ac6ebdcf148187a7a523f4974
diff --git a/dev-python/pytest-tornasync/metadata.xml b/dev-python/pytest-tornasync/metadata.xml
new file mode 100644
index 000000000000..36621b48198d
--- /dev/null
+++ b/dev-python/pytest-tornasync/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+  <email>sci@gentoo.org</email>
+  <name>Gentoo Science Project</name>
+ </maintainer>
+ <upstream>
+  <remote-id type="pypi">pytest-tornasync</remote-id>
+ </upstream>
+ <origin>gentoo-staging</origin>
+ <stabilize-allarches/>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/dev-python/pytest-tornasync/pytest-tornasync-0.6.0_p2.ebuild b/dev-python/pytest-tornasync/pytest-tornasync-0.6.0_p2.ebuild
new file mode 100644
index 000000000000..d61e64891744
--- /dev/null
+++ b/dev-python/pytest-tornasync/pytest-tornasync-0.6.0_p2.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
+
+DESCRIPTION="Pytest plugin for testing Python 3.5+ Tornado code"
+HOMEPAGE="https://github.com/eukaryote/pytest-tornasync"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P//_p/.post}.tar.gz"
+S="${WORKDIR}/${P//_p/.post}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+# TODO: fix this
+# E   ImportError: cannot import name 'MESSAGE' from 'test'
+RESTRICT="test"
+
+RDEPEND="
+	>=dev-python/pytest-3.0[${PYTHON_USEDEP}]
+	>=www-servers/tornado-5.0[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# Do not install the license file
+	sed -i -e '/LICENSE/d' setup.py || die
+
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/python-levenshtein/python-levenshtein-0.12.1.ebuild b/dev-python/python-levenshtein/python-levenshtein-0.12.1.ebuild
index f4463fdb38af..b2d7524aaf14 100644
--- a/dev-python/python-levenshtein/python-levenshtein-0.12.1.ebuild
+++ b/dev-python/python-levenshtein/python-levenshtein-0.12.1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 sparc x86"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 
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
index 6791c5317f00..3fa0bf19754d 100644
--- a/dev-python/pyyaml_env_tag/pyyaml_env_tag-0.1.ebuild
+++ b/dev-python/pyyaml_env_tag/pyyaml_env_tag-0.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~riscv x86"
 
 RDEPEND="
 	dev-python/pyyaml[${PYTHON_USEDEP}]
diff --git a/dev-python/sphinx-autodoc-typehints/sphinx-autodoc-typehints-1.12.0.ebuild b/dev-python/sphinx-autodoc-typehints/sphinx-autodoc-typehints-1.12.0.ebuild
index 8eb2fa7a19e7..09fb29ec68c5 100644
--- a/dev-python/sphinx-autodoc-typehints/sphinx-autodoc-typehints-1.12.0.ebuild
+++ b/dev-python/sphinx-autodoc-typehints/sphinx-autodoc-typehints-1.12.0.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 sparc ~x86"
 SLOT="0"
 
 BDEPEND="
diff --git a/dev-python/sphinxcontrib-programoutput/sphinxcontrib-programoutput-0.17.ebuild b/dev-python/sphinxcontrib-programoutput/sphinxcontrib-programoutput-0.17.ebuild
index 097da66c86bc..b2f6bc8612c4 100644
--- a/dev-python/sphinxcontrib-programoutput/sphinxcontrib-programoutput-0.17.ebuild
+++ b/dev-python/sphinxcontrib-programoutput/sphinxcontrib-programoutput-0.17.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	dev-python/namespace-sphinxcontrib[${PYTHON_USEDEP}]
diff --git a/dev-python/sphobjinv/sphobjinv-2.1.ebuild b/dev-python/sphobjinv/sphobjinv-2.1.ebuild
index 647db5c6eeca..de7c3be168ae 100644
--- a/dev-python/sphobjinv/sphobjinv-2.1.ebuild
+++ b/dev-python/sphobjinv/sphobjinv-2.1.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 SRC_URI="https://github.com/bskinn/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 sparc ~x86"
 SLOT="0"
 
 # This requires pytest-check, but that does not work at all, even if it
diff --git a/dev-python/stapler/metadata.xml b/dev-python/stapler/metadata.xml
index 4ba8c9cb7acf..c6dd23294bbf 100644
--- a/dev-python/stapler/metadata.xml
+++ b/dev-python/stapler/metadata.xml
@@ -9,4 +9,5 @@
   <remote-id type="pypi">stapler</remote-id>
  </upstream>
  <origin>gentoo-staging</origin>
+ <stabilize-allarches/>
 </pkgmetadata>
 \ No newline at end of file
diff --git a/dev-python/stapler/stapler-1.0.0_p20200531-r1.ebuild b/dev-python/stapler/stapler-1.0.0_p20200531-r2.ebuild
index 19d2ea5b162d..d7848bff1586 100644
--- a/dev-python/stapler/stapler-1.0.0_p20200531-r1.ebuild
+++ b/dev-python/stapler/stapler-1.0.0_p20200531-r2.ebuild
@@ -1,18 +1,19 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 PYTHON_COMPAT=( python3_{6,7,8,9,10} )
 DISTUTILS_USE_SETUPTOOLS=pyproject.toml
 
-inherit distutils-r1 vcs-snapshot
+inherit distutils-r1
 
 COMMIT="1cabc85521e2badfc1e0d690086e286e701c2d9e"
 
 DESCRIPTION="Suite of tools for PDF files manipulation written in Python"
 HOMEPAGE="https://github.com/hellerbarde/stapler"
 SRC_URI="https://github.com/hellerbarde/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-${COMMIT}"
 
 LICENSE="BSD"
 SLOT="0"
@@ -22,6 +23,4 @@ RDEPEND="
 	dev-python/PyPDF2[${PYTHON_USEDEP}]
 "
 
-DEPEND="
-	${RDEPEND}
-"
+distutils_enable_tests unittest
diff --git a/dev-python/stdio-mgr/stdio-mgr-1.0.1.ebuild b/dev-python/stdio-mgr/stdio-mgr-1.0.1.ebuild
index 4f2b6c05d0d4..f753daaf0275 100644
--- a/dev-python/stdio-mgr/stdio-mgr-1.0.1.ebuild
+++ b/dev-python/stdio-mgr/stdio-mgr-1.0.1.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="
 SRC_URI="https://github.com/bskinn/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 sparc ~x86"
 SLOT="0"
 
 RDEPEND=">=dev-python/attrs-17.1[${PYTHON_USEDEP}]"
diff --git a/dev-python/tekore/Manifest b/dev-python/tekore/Manifest
index 18eb751ff376..d12017d7dc63 100644
--- a/dev-python/tekore/Manifest
+++ b/dev-python/tekore/Manifest
@@ -1 +1,2 @@
 DIST tekore-3.7.1.tar.gz 258235 BLAKE2B e04edfab294ac3dac1fb086f296bf3fcc463cdad981d435fdd19ec812f1bb2ff79cacaa94d5105dc1070dd56602cc9a502537c68020cb27b2eb5b3c93788f193 SHA512 ed315a0b5b071265d2ba12d996bedafdea87286fd1beecc14d247176f2bdd2245e0220fb186ce4bd6eec2bc13a764f74b067ce1e546d8c30e618a4bdc3bf02e0
+DIST tekore-4.0.0.tar.gz 259755 BLAKE2B 5c4c990c14187c20ef3566d1bc0cf32e50fe108d90b59126e2d56105b6fe053ca02c98e7ad7a4fa09345792106e956873a0f42b8492420bd74898557c6d97f23 SHA512 7e5cf6044a6a7045257b9b9830fe4bdb6fb175240b295da3f93cb0557150536655ddf44ab551b52182815fc517b8e43ee704b1061db1284426574e741f7d9a56
diff --git a/dev-python/tekore/tekore-4.0.0.ebuild b/dev-python/tekore/tekore-4.0.0.ebuild
new file mode 100644
index 000000000000..b8001c8c693f
--- /dev/null
+++ b/dev-python/tekore/tekore-4.0.0.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="Spotify Web API client"
+HOMEPAGE="
+	https://tekore.readthedocs.io
+	https://github.com/felix-hilden/tekore
+"
+SRC_URI="https://github.com/felix-hilden/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+KEYWORDS="~amd64"
+SLOT="0"
+
+RDEPEND="
+	<dev-python/httpx-0.20[${PYTHON_USEDEP}]
+"
+
+BDEPEND="
+	test? (
+		>=dev-python/pytest-asyncio-0.11[${PYTHON_USEDEP}]
+	)
+"
+
+DOCS=( readme.rst )
+
+distutils_enable_tests pytest
+distutils_enable_sphinx docs/src \
+	dev-python/sphinx_rtd_theme \
+	dev-python/sphinx-autodoc-typehints
+
+EPYTEST_DESELECT=(
+	# Internet
+	tests/auth/expiring.py::TestCredentialsOnline::test_bad_arguments_raises_error
+)
diff --git a/dev-python/tempita/files/tempita-0.5.3-2to3.patch b/dev-python/tempita/files/tempita-0.5.3-2to3.patch
new file mode 100644
index 000000000000..d2aaae6546c1
--- /dev/null
+++ b/dev-python/tempita/files/tempita-0.5.3-2to3.patch
@@ -0,0 +1,233 @@
+commit d886499651add63bbb944c25fc56a276cc2a7884
+Author: Louis Sautier <sautier.louis@gmail.com>
+Date:   Thu Sep 9 23:35:03 2021 +0200
+
+    Stop using deprecated 2to3 option for setuptools
+
+diff --git a/setup.py b/setup.py
+index f575020..678b555 100644
+--- a/setup.py
++++ b/setup.py
+@@ -36,5 +36,4 @@ more to learn about it.
+       test_suite='nose.collector',
+       include_package_data=True,
+       zip_safe=True,
+-      use_2to3=True,
+       )
+diff --git a/tempita/__init__.py b/tempita/__init__.py
+index acc2fd9..a3cb8a1 100755
+--- a/tempita/__init__.py
++++ b/tempita/__init__.py
+@@ -35,9 +35,9 @@ import os
+ import re
+ import sys
+ import tokenize
+-from cStringIO import StringIO
++from io import StringIO
+ from html import escape
+-from urllib import quote as url_quote
++from urllib.parse import quote as url_quote
+ from tempita._looper import looper
+ from tempita.compat3 import bytes, basestring_, next, is_unicode, coerce_text
+ 
+@@ -103,7 +103,7 @@ class Template(object):
+             delimiters = (self.default_namespace['start_braces'],
+                           self.default_namespace['end_braces'])
+         else:
+-            assert len(delimiters) == 2 and all([isinstance(delimeter, basestring)
++            assert len(delimiters) == 2 and all([isinstance(delimeter, str)
+                                                  for delimeter in delimiters])
+             self.default_namespace = self.__class__.default_namespace.copy()
+             self.default_namespace['start_braces'] = delimiters[0]
+@@ -198,7 +198,7 @@ class Template(object):
+                 position=None, name=self.name)
+         templ = self.get_template(inherit_template, self)
+         self_ = TemplateObject(self.name)
+-        for name, value in defs.iteritems():
++        for name, value in defs.items():
+             setattr(self_, name, value)
+         self_.body = body
+         ns = ns.copy()
+@@ -294,7 +294,7 @@ class Template(object):
+         try:
+             try:
+                 value = eval(code, self.default_namespace, ns)
+-            except SyntaxError, e:
++            except SyntaxError as e:
+                 raise SyntaxError(
+                     'invalid syntax in expression: %s' % code)
+             return value
+@@ -306,12 +306,12 @@ class Template(object):
+             else:
+                 arg0 = coerce_text(e)
+             e.args = (self._add_line_info(arg0, pos),)
+-            raise exc_info[0], e, exc_info[2]
++            raise exc_info[0](e).with_traceback(exc_info[2])
+ 
+     def _exec(self, code, ns, pos):
+         __traceback_hide__ = True
+         try:
+-            exec code in self.default_namespace, ns
++            exec(code, self.default_namespace, ns)
+         except:
+             exc_info = sys.exc_info()
+             e = exc_info[1]
+@@ -319,7 +319,7 @@ class Template(object):
+                 e.args = (self._add_line_info(e.args[0], pos),)
+             else:
+                 e.args = (self._add_line_info(None, pos),)
+-            raise exc_info[0], e, exc_info[2]
++            raise exc_info[0](e).with_traceback(exc_info[2])
+ 
+     def _repr(self, value, pos):
+         __traceback_hide__ = True
+@@ -328,7 +328,7 @@ class Template(object):
+                 return ''
+             if self._unicode:
+                 try:
+-                    value = unicode(value)
++                    value = str(value)
+                 except UnicodeDecodeError:
+                     value = bytes(value)
+             else:
+@@ -341,7 +341,7 @@ class Template(object):
+             exc_info = sys.exc_info()
+             e = exc_info[1]
+             e.args = (self._add_line_info(e.args[0], pos),)
+-            raise exc_info[0], e, exc_info[2]
++            raise exc_info[0](e).with_traceback(exc_info[2])
+         else:
+             if self._unicode and isinstance(value, bytes):
+                 if not self.default_encoding:
+@@ -350,7 +350,7 @@ class Template(object):
+                         '(no default_encoding provided)' % value)
+                 try:
+                     value = value.decode(self.default_encoding)
+-                except UnicodeDecodeError, e:
++                except UnicodeDecodeError as e:
+                     raise UnicodeDecodeError(
+                         e.encoding,
+                         e.object,
+@@ -387,7 +387,7 @@ def paste_script_template_renderer(content, vars, filename=None):
+ class bunch(dict):
+ 
+     def __init__(self, **kw):
+-        for name, value in kw.iteritems():
++        for name, value in kw.items():
+             setattr(self, name, value)
+ 
+     def __setattr__(self, name, value):
+@@ -410,7 +410,7 @@ class bunch(dict):
+ 
+     def __repr__(self):
+         items = [
+-            (k, v) for k, v in self.iteritems()]
++            (k, v) for k, v in self.items()]
+         items.sort()
+         return '<%s %s>' % (
+             self.__class__.__name__,
+@@ -463,7 +463,7 @@ def url(v):
+ 
+ 
+ def attr(**kw):
+-    kw = list(kw.iteritems())
++    kw = list(kw.items())
+     kw.sort()
+     parts = []
+     for name, value in kw:
+@@ -545,7 +545,7 @@ class TemplateDef(object):
+         values = {}
+         sig_args, var_args, var_kw, defaults = self._func_signature
+         extra_kw = {}
+-        for name, value in kw.iteritems():
++        for name, value in kw.items():
+             if not var_kw and name not in sig_args:
+                 raise TypeError(
+                     'Unexpected argument %s' % name)
+@@ -568,7 +568,7 @@ class TemplateDef(object):
+                 raise TypeError(
+                     'Extra position arguments: %s'
+                     % ', '.join(repr(v) for v in args))
+-        for name, value_expr in defaults.iteritems():
++        for name, value_expr in defaults.items():
+             if name not in values:
+                 values[name] = self._template._eval(
+                     value_expr, self._ns, self._pos)
+@@ -614,7 +614,7 @@ class _Empty(object):
+         return 'Empty'
+ 
+     def __unicode__(self):
+-        return u''
++        return ''
+ 
+     def __iter__(self):
+         return iter(())
+@@ -1164,7 +1164,7 @@ def fill_command(args=None):
+         vars.update(os.environ)
+     for value in args:
+         if '=' not in value:
+-            print('Bad argument: %r' % value)
++            print(('Bad argument: %r' % value))
+             sys.exit(2)
+         name, value = value.split('=', 1)
+         if name.startswith('py:'):
+diff --git a/tempita/_looper.py b/tempita/_looper.py
+index 6784c7c..70aded7 100644
+--- a/tempita/_looper.py
++++ b/tempita/_looper.py
+@@ -7,9 +7,9 @@ These can be awkward to manage in a normal Python loop, but using the
+ looper you can get a better sense of the context.  Use like::
+ 
+     >>> for loop, item in looper(['a', 'b', 'c']):
+-    ...     print loop.number, item
++    ...     print(loop.number, item)
+     ...     if not loop.last:
+-    ...         print '---'
++    ...         print('---')
+     1 a
+     ---
+     2 b
+@@ -161,3 +161,4 @@ class loop_pos(object):
+             return getter(item) != getter(other)
+         else:
+             return item[getter] != other[getter]
++
+diff --git a/tempita/compat3.py b/tempita/compat3.py
+index 5e18fa0..f17f588 100644
+--- a/tempita/compat3.py
++++ b/tempita/compat3.py
+@@ -4,7 +4,7 @@ __all__ = ['b', 'basestring_', 'bytes', 'next', 'is_unicode']
+ 
+ if sys.version < "3":
+     b = bytes = str
+-    basestring_ = basestring
++    basestring_ = str
+ else:
+ 
+     def b(s):
+@@ -18,14 +18,14 @@ text = str
+ if sys.version < "3":
+ 
+     def next(obj):
+-        return obj.next()
++        return obj.__next__()
+ else:
+     next = next
+ 
+ if sys.version < "3":
+ 
+     def is_unicode(obj):
+-        return isinstance(obj, unicode)
++        return isinstance(obj, str)
+ else:
+ 
+     def is_unicode(obj):
+@@ -39,7 +39,7 @@ def coerce_text(v):
+         else:
+             attr = '__str__'
+         if hasattr(v, attr):
+-            return unicode(v)
++            return str(v)
+         else:
+             return bytes(v)
+     return v
diff --git a/dev-python/tempita/files/tempita-0.5.3-pypy-tests.patch b/dev-python/tempita/files/tempita-0.5.3-pypy-tests.patch
deleted file mode 100644
index cdef27276be5..000000000000
--- a/dev-python/tempita/files/tempita-0.5.3-pypy-tests.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff --git a/docs/index.txt b/docs/index.txt
-index 6d943f6..afe3aa2 100644
---- a/docs/index.txt
-+++ b/docs/index.txt
-@@ -82,7 +82,7 @@ error (the name will be displayed)::
-     >>> tmpl.substitute()
-     Traceback (most recent call last):
-         ...
--    NameError: name 'name' is not defined at line 1 column 6 in file tmpl
-+    NameError:... name 'name' is not defined at line 1 column 6 in file tmpl
- 
- You can also give a namespace to use by default, which
- ``.substitute(...)`` will augment::
-diff --git a/tests/test_template.txt b/tests/test_template.txt
-index 9564a9a..d9eb55d 100644
---- a/tests/test_template.txt
-+++ b/tests/test_template.txt
-@@ -144,7 +144,7 @@ for a variable, if no value is given::
-     >>> sub('{{x}}')
-     Traceback (most recent call last):
-         ...
--    NameError: name 'x' is not defined at line 1 column 3
-+    NameError:... name 'x' is not defined at line 1 column 3
- 
- And comments work::
- 
diff --git a/dev-python/tempita/tempita-0.5.3-r3.ebuild b/dev-python/tempita/tempita-0.5.3-r3.ebuild
index 9c4b6d78c1d4..a2a5b046358f 100644
--- a/dev-python/tempita/tempita-0.5.3-r3.ebuild
+++ b/dev-python/tempita/tempita-0.5.3-r3.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
 # The package uses pkg_resources
@@ -20,22 +20,19 @@ S="${WORKDIR}/ianb-${PN}-${MY_COMMIT}"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-RESTRICT="!test? ( test )"
 
 RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-BDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
-"
+BDEPEND="${RDEPEND}"
 
 PATCHES=(
-	"${FILESDIR}/${P}-pypy-tests.patch"
 	# cgi.escape has been removed in Python 3.9
 	"${FILESDIR}/${P}-cgi-escape.patch"
+	# The 2to3 option for setuptools is deprecated
+	"${FILESDIR}/${P}-2to3.patch"
 )
 
 distutils_enable_sphinx docs
+distutils_enable_tests pytest
 
 python_prepare_all() {
 	# Remove reference to a non-existent CSS file
@@ -45,8 +42,5 @@ python_prepare_all() {
 }
 
 python_test() {
-	# We need to append to sys.path, otherwise pytest imports
-	# the module from ${S} (before it was 2to3'd)
-	pytest --import-mode=append -vv tests/test_template.txt docs/index.txt \
-		|| die "Tests failed with ${EPYTHON}"
+	epytest tests/test_template.txt docs/index.txt
 }
diff --git a/dev-python/timeout-decorator/timeout-decorator-0.5.0.ebuild b/dev-python/timeout-decorator/timeout-decorator-0.5.0.ebuild
index 9fa0ce963aef..fe29c26c01fe 100644
--- a/dev-python/timeout-decorator/timeout-decorator-0.5.0.ebuild
+++ b/dev-python/timeout-decorator/timeout-decorator-0.5.0.ebuild
@@ -20,6 +20,6 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 sparc x86"
 
 distutils_enable_tests pytest
diff --git a/dev-python/untangle/Manifest b/dev-python/untangle/Manifest
new file mode 100644
index 000000000000..6dfdf4d8abdf
--- /dev/null
+++ b/dev-python/untangle/Manifest
@@ -0,0 +1 @@
+DIST untangle-1.1.1.tar.gz 3089 BLAKE2B d8b8ffe1adb2acbcdcde8e6f67231315b9f318c9e8e1496dfa23b0ac6dd68651e75e2d2e67f6d7d521002ad6b0e9c4cc30c155685b9df60b6b223d137add0632 SHA512 252c3d0ed8d004660adad8f37a179a4d1b2b46e9d7127aee59b596eac3f65684a7a8b5b881bec97ddaf5470aa678df407b903209eaa069a40f53dc2dde9a94b2
diff --git a/dev-python/untangle/metadata.xml b/dev-python/untangle/metadata.xml
new file mode 100644
index 000000000000..3cc1114b544c
--- /dev/null
+++ b/dev-python/untangle/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+  <email>sci@gentoo.org</email>
+  <name>Gentoo Science Project</name>
+ </maintainer>
+ <upstream>
+  <remote-id type="pypi">untangle</remote-id>
+ </upstream>
+ <origin>gentoo-staging</origin>
+ <stabilize-allarches/>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/dev-python/untangle/untangle-1.1.1.ebuild b/dev-python/untangle/untangle-1.1.1.ebuild
new file mode 100644
index 000000000000..837bc2f6dc5d
--- /dev/null
+++ b/dev-python/untangle/untangle-1.1.1.ebuild
@@ -0,0 +1,16 @@
+# 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="Convert XML documents into Python objects"
+HOMEPAGE="https://github.com/stchris/untangle"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
author	Liguros - Gitlab CI/CD [develop] <gitlab@liguros.net>	2021-09-10 07:09:04 +0000
committer	Liguros - Gitlab CI/CD [develop] <gitlab@liguros.net>	2021-09-10 07:09:04 +0000
commit	a30a448aff4f450deba8f0bfc4fca47aaf67663a (patch)
tree	bcf0ae861600503ba0e53907d4a66c7820e44732 /dev-python
parent	ea69f9cb1eba5e9fdead50428ff2bc672fe3f218 (diff)
download	baldeagleos-repo-a30a448aff4f450deba8f0bfc4fca47aaf67663a.tar.gz baldeagleos-repo-a30a448aff4f450deba8f0bfc4fca47aaf67663a.tar.xz baldeagleos-repo-a30a448aff4f450deba8f0bfc4fca47aaf67663a.zip