Adding metadata

43 files changed, 410 insertions, 625 deletions

diff --git a/dev-python/boto3/Manifest b/dev-python/boto3/Manifest
index c745dda40cd2..567eeb6eaa4c 100644
--- a/dev-python/boto3/Manifest
+++ b/dev-python/boto3/Manifest
@@ -8,3 +8,4 @@ DIST boto3-1.20.43.tar.gz 463424 BLAKE2B 6d67a86d4d0577b2e9d30335ddb1286f25bc866
 DIST boto3-1.20.44.tar.gz 463921 BLAKE2B 1276bbddbf1be9e30142ef1ccc24a69e885d1bdf35ce1c136105d1c08b6a24820c965827c6bc569c747efb5dbb8e64b611b3ac2bc63bcb714f8d6748e424f927 SHA512 de223aa34efd81d26287204e9159368ee77bd91e3fd457896d801bc1517ed4b32f5a16d1441f053f90e232beb473c51bee88f591db5746cf5b8049f044c29811
 DIST boto3-1.20.45.tar.gz 464557 BLAKE2B f021696e14a2bd82325c666a3ef8266ae3e19564cda9792a2436079b24810949af86f6d1a328850f58c9f53be261ee67c6282adc1cd846df0a37d686835c92fa SHA512 293e89a96601c15f78efc2a7c9dd91bf1db6944deebdb50e093b075540bafd1da5ea82d9719bfc36b205b0cfdb5052f3f69cc504bef089e980ead68f39326d85
 DIST boto3-1.20.46.tar.gz 464857 BLAKE2B 40eb0f2c298821530028c84f90d8acd9757a4b6c74e8355ca644ee2a87297d7ba3b70a2614e83c83befe0f6e3b64e0f1e023cc2fc3edbf3deb40f86382265338 SHA512 3ad8808ace2ce24eba54c60aa1ece5b904a2138a1497ec5c180a9aa1bef95cd61e2eabf26614d35690ae790cb56400afb6e32d0c005911e0eb42deaee7dc2602
+DIST boto3-1.20.47.tar.gz 465774 BLAKE2B ab615d29d79b209671808770968c38c2ef26b83ae48d1e18c3129c2886a274ae8a9fc7680fa851f205c28161bd16b20eef075c1a6cdbc5cfaf835c7ead974313 SHA512 c3a84ba9df6670879605e9085ea7aa15077d9f1c30117de6e9cd9cbb427a6a06097a388feb80a0ebc7ad1f422a40df402986d3dc9b004abf5252dab16524c761
diff --git a/dev-python/boto3/boto3-1.20.47.ebuild b/dev-python/boto3/boto3-1.20.47.ebuild
new file mode 100644
index 000000000000..ed44d35fedd6
--- /dev/null
+++ b/dev-python/boto3/boto3-1.20.47.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+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 ~riscv ~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 pytest
+
+python_prepare_all() {
+	# don't lock versions to narrow ranges
+	sed -e '/botocore/ d' \
+		-e '/jmespath/ d' \
+		-e '/s3transfer/ d' \
+		-i setup.py || die
+
+	# do not rely on bundled deps in botocore (sic!)
+	find -name '*.py' -exec sed -i \
+		-e 's:from botocore[.]vendored import:import:' \
+		-e 's:from botocore[.]vendored[.]:from :' \
+		{} + || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	epytest tests/{functional,unit}
+}
diff --git a/dev-python/botocore/Manifest b/dev-python/botocore/Manifest
index 13ea44065edc..5d82df89c8fb 100644
--- a/dev-python/botocore/Manifest
+++ b/dev-python/botocore/Manifest
@@ -8,3 +8,4 @@ DIST botocore-1.23.43.tar.gz 8739652 BLAKE2B 5520a9933ab87769c8459a0925822e36eba
 DIST botocore-1.23.44.tar.gz 8741781 BLAKE2B e76dcbf7a57421e4df3afa9317a1fcc66c0f7e00a3112384537daafb349648e38ec7cc6fb4b808fbfe69a6c6cfd30f04bbefb7fcc246d2b647ea4fc78aa17378 SHA512 59562e8ef5e18465a1981c188a84112326ab5f7d7ed4f72eacea3a88d43d615c8b3514d7bf6a2daf92ac29dc8bb24f8f878c318c8f463cd1ceb7e237f18dfc26
 DIST botocore-1.23.45.tar.gz 8742820 BLAKE2B af2304abeb8be458ad46c957e7865ad37b3ffc0f2adf3b412cf2713235c0f5a31005da7630b7d882cdde56c2ea34bbe2562104b8399f2f4b7965d48c9a4276e3 SHA512 bddedc8bb2b70758b1508b1c9f62c82016b2e397b95732243ad3c994cb2fbcf19ed29c8f7bd295498d31b385bf4ad2975cf7733e57c9cbeadbe290e042ea2c0f
 DIST botocore-1.23.46.tar.gz 8743469 BLAKE2B 804e4ea772bbc74a12645fa5b5e1056115aa232eba0a21f347686143721a0a5e5d2bebe3841ff68fd0a3e464fa8fe88cb78e349c33eb22172b7481d1b5de7b28 SHA512 241d44bb509847e97744a0d4b8e38f44eba1f0e0b11d36b3194cd85b06b5a841dd5bee91b4602ddf3bc36c6945638104f22ca0083150fb5331f4c62a9e22c947
+DIST botocore-1.23.47.tar.gz 8757185 BLAKE2B 7d80ec4a869ed9c86b47a1fe8a7e9913381d56164827c9ffd8911c3c4f715867a6200c4a6cea5d8941e747ab72dbd61bfc4282aa5109a9f28679b47a9563c0ea SHA512 c69b4e4192e5acd85bb0664762e2d9eee7d317b48bb7071047dcbf58efdea7f96cc6915f71e83c134df795e810a4e507ff35702434785c92f9eadf6509b9e9a2
diff --git a/dev-python/botocore/botocore-1.23.47.ebuild b/dev-python/botocore/botocore-1.23.47.ebuild
new file mode 100644
index 000000000000..c44cf37adbf0
--- /dev/null
+++ b/dev-python/botocore/botocore-1.23.47.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+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 ~riscv ~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/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 pytest
+
+src_prepare() {
+	# unpin deps
+	sed -i -e "s:>=.*':':" setup.py || die
+
+	# unbundle deps
+	rm -r botocore/vendored || die
+	find -name '*.py' -exec sed -i \
+		-e 's:from botocore[.]vendored import:import:' \
+		-e 's:from botocore[.]vendored[.]:from :' \
+		{} + || die
+
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# rely on bundled six
+		tests/functional/test_six_imports.py::test_no_bare_six_imports
+		tests/functional/test_six_threading.py::test_six_thread_safety
+	)
+
+	epytest tests/{functional,unit}
+}
diff --git a/dev-python/clang-python/Manifest b/dev-python/clang-python/Manifest
index dd7644d62981..20315e2d7eee 100644
--- a/dev-python/clang-python/Manifest
+++ b/dev-python/clang-python/Manifest
@@ -1,4 +1,4 @@
 DIST llvmorg-11.1.0.tar.gz 122776532 BLAKE2B ca842ff4afff8f44c82b5e7383962a9c45ca1c93b64fa4c6ebcd70a1d3849dbad2b8e4e24fba02d144c6266d7fab3607ebc6999b28c229cb35256cf40f26a985 SHA512 9a8ce022a935eed42fa71a224f2a207122aadcbef58ee855fdb4825f879e7d028e4dcff22c19b9d336db1c8bf63fb84372d44981acf84615f757e54306c92b81
 DIST llvmorg-12.0.1.tar.gz 134259748 BLAKE2B f41de787bc73ff2edfda1b22cc8602be6f65f37dd9e4c8888533cfa8c3ccdcf4f108aaab9de23ab0ab987966eb160f2a553a0bdff99461e71ddd5bfcd086090d SHA512 6eb0dc18e2c25935fabfdfc48b0114be0939158dfdef7b85b395fe2e71042672446af0e68750aae003c9847d10d1f63316fe95d3df738d18f249174292b1b9e1
 DIST llvmorg-13.0.0.tar.gz 147270176 BLAKE2B 628f316b580e1edf3a58d4825b724df759e6ed2a4116802470c04562caefc392fa325c91f388036365a2e45a9595cca6d3557fab12984fc8bcfef29c9116d822 SHA512 8004c05d32b9720fb3391783621690c1df9bd1e97e72cbff9192ed88a84b0acd303b61432145fa917b5b5e548c8cee29b24ef8547dcc8677adf4816e7a8a0eb2
-DIST llvmorg-13.0.1-rc3.tar.gz 147302323 BLAKE2B 9ac2f97568062d7dd618295a68d6e14898fcd69e2bb66290b999ceb8c12132371f4e9b59d8ba2b252e5e5cb249045676b24fc50c117b2afae20abab98f426582 SHA512 88a04ad02af2d41ec21c7a62bad21ee0e627b7276a16795875afd062ed29ac7fb4aadec5b5e48785a6502c9fd797a4b67d648a21f193c9f7602112870b10a3d1
+DIST llvmorg-13.0.1.tar.gz 147290251 BLAKE2B 2a44b012a672501761d0c27c6b3a315b69bfef0cd13b078a7e7d2fccc4a9c8c0f2bee0f164c4271c9106b0a99cb06e8b64986f66253b613336719fb86b82541b SHA512 9a8cb5d11964ba88b7624f19ec861fb28701f23956ea3c92f6ac644332d5f41fde97bd8933dd3ee70ed378058c252fa3a3887c8d1af90d219970c2b27691166f
diff --git a/dev-python/clang-python/clang-python-13.0.1_rc3.ebuild b/dev-python/clang-python/clang-python-13.0.1.ebuild
index c9856c7e47f9..c567dda189b8 100644
--- a/dev-python/clang-python/clang-python-13.0.1_rc3.ebuild
+++ b/dev-python/clang-python/clang-python-13.0.1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://llvm.org/"
 
 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
 SLOT="0"
-KEYWORDS=""
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 IUSE="test"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 RESTRICT="!test? ( test )"
diff --git a/dev-python/django/Manifest b/dev-python/django/Manifest
index db183c7584a1..b3b6b83101b3 100644
--- a/dev-python/django/Manifest
+++ b/dev-python/django/Manifest
@@ -1,12 +1,6 @@
-DIST Django-2.2.26.checksum.txt 2561 BLAKE2B a974c7d5c8cef76e781e4fa1559725cc7d77de3d16b08ec20d034b38cb39a986b62397532bbc81d4414b3eae8a5487a9fef9615eed73946a54a2b43cdf34a6ad SHA512 7c1d3e04913237ed0dc9955eedd02cfb5113b9536ed0b471d873269ec82099561714a061b74bf212c2e99bbe47e6cf72e639358a2f9134f751fdd7cd53e6ce17
-DIST Django-2.2.26.tar.gz 9207984 BLAKE2B abd520bc5681b8450e51c4248eb97558daa6a87f74915bea8857843a5ea9be6bf3a04c9f5871c35d2076adb644da266c7b88ac39bb2837ff1eaa71f885bd08bf SHA512 2005b081e7347f6f8fd4837219043bd1728cd85aca00c62a16432f63272abec7d30b7461675708fa0f55e3273af5bbd67c26d31934f8a4a38f48e65ea721916f
 DIST Django-2.2.27.checksum.txt 2556 BLAKE2B 770dc5670d0d4aebcfd1956d644b9d7e4e5bf0b511649ae072de1b8ec8d2ea12dbc48563f5372979dead9e729abd9b5174c99323a14170876b1f1b5e61de96f6 SHA512 fb76f2bef6e6d0a3002298e4eeec5b335bfdc365ae55f0c26dcb050d369864c504dd32d40ac3b49897d56bc0dadc10136b588361ddf3598ffdc03830a97e1d63
 DIST Django-2.2.27.tar.gz 9185716 BLAKE2B 26d509c722c62b5bf784331466a97ad1b961715572da9e6add4be1bdc7cf999c0ec7c763d9bc8ab2fc1ca35a48783feaf748c3c9388ae9f5f3e393972deea734 SHA512 0db670651a820b49d855e38a336c0c6990ce4701bb686c5e8a292ccb03342e995c61c2c628b1d625d2715404e969fc31c256e5bf0fd6c1ff714d1c1c1ee30bff
-DIST Django-3.2.11.checksum.txt 2561 BLAKE2B ece4f40d4d368e2e5ad3cc3ed6072aa8d1693b47d68b76020059508bfc10a30f6291f5e84c68bb959fa973c4e060bf4fd408beefaedc13b68e81b721cb78aab3 SHA512 4f2c12088cfb69f547ba687e9cac34b68a9bd28c793482430bda078f51e780b1272de7ec7816dc31d2fa93bf1c68973f847d67c01414fc8bf07fa6f6ea09dc39
-DIST Django-3.2.11.tar.gz 9821958 BLAKE2B 8f83db578e31c3cbeca67bd826b4c639b346e449de83aba6ddf6bf4eef1fc58ebcbbddf91227012e592516d7796d9f3cc468ae4ce51d684b4aa0a417bb39ddb1 SHA512 ea1ca9a76afcd7e20d0ce518efc0497bbd11f4ab7ed20bd4490561bfcfc6c80db8922a22d8aca94c1dc2743e7366b28a0ae76c3d64f55afc142c38a744dd5120
 DIST Django-3.2.12.checksum.txt 2556 BLAKE2B 7ae6e41305b5b07969ddad3474a0819359dff888fc3bdc1c5000ded1b9b726a7c55aa7aaffc85184558edcc6c12b617c8270cc569fa8e645622206631979a9c2 SHA512 5098dde440a15ad066fa7927943f4ec66bb925798afcb42101c5cf50b8148301866c39ad37ebb5db9d7f9e195953337c03dc6fa2c49758716f969ee2ce414d24
 DIST Django-3.2.12.tar.gz 9812448 BLAKE2B 39b6e7e8f50b79d7be62be171eb358ab815c9dd630b8b2ad2cf085c42c79a6a8c92914fae3c471f41578e65fa09f011f959dd0794c804e7b30cfbc9411cf4f4b SHA512 fc8ad3af019b268d514cc5240cac9c6b2fbf3a169c7933e8ab2da92e9cfed72df7a2784a8d92eaec8105bc9c245763acd307178bdf662e5d51407e72ae9d8683
-DIST Django-4.0.1.checksum.txt 2552 BLAKE2B 123a613af7ff1ccb423c11086501a4419d86cf07c0ae7a4751f12d32f1592916e72e3e47cee13192944a3fc05ce5ee7ac81038118e346545536f313a10783de6 SHA512 979a7c5efafd4d8923d6c769ddd7d73c67482c33fd1a76c64d75aee0a03399e35703e7cbde9f5ad25baab969c33ab53690400e39c879e54066a146944e5d0ee1
-DIST Django-4.0.1.tar.gz 9995484 BLAKE2B af05ec1ec1d079e383efc590de78413b7fd769e7f03c5d4bdcfd26f193a46f783b4c3428558f5d3281cab9a7fa8be4cfecdc4edaf1bea72f37e8e983b3c061f1 SHA512 7753c516b080c10673c3a95e8ec4af00984aeed5f288e4d6e7ab1efd461222a343701b21cfd27bc61ee4e63df5ce3f3be49398490a995f6839e63b40c3fe306c
 DIST Django-4.0.2.checksum.txt 2547 BLAKE2B 532139126846e1758bbe7b4dc4ad4aad6c6b3607e298f4373366239637ceca7d01a26472b2a87917e64db7140d28a76c1f5fbb396e7022b1a42b723551770d1f SHA512 eddd8ac31fc60f803f1e6f975c079e84e5ef997e8ac93b7dcf3573bd0c5d057adeb6f092acaecb200529044d81aa2db9849c1c13525678c8c2bd27bd14d6b280
 DIST Django-4.0.2.tar.gz 9996300 BLAKE2B 422b0bb000e7f62a854dc8fa686001acc3f629ded462d2520fad9486a9c8eb5d501d29c6a9f30f63ff8da128ded6f40281439371eb688fb9bc95f2377c5ca0f7 SHA512 c64b25aa69b826805cc7a3efcd63ae41bbc31a61e68cdbda90e6bcec6bd8e2c5fc47b82176d0c1708f55d2c7b082c71939b89cb0621fcf1929d1475e3d393a97
diff --git a/dev-python/django/django-2.2.26.ebuild b/dev-python/django/django-2.2.26.ebuild
deleted file mode 100644
index e45580009a2a..000000000000
--- a/dev-python/django/django-2.2.26.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-PYTHON_REQ_USE='sqlite?,threads(+)'
-
-inherit bash-completion-r1 distutils-r1 optfeature verify-sig
-
-MY_P=${P^}
-DESCRIPTION="High-level Python web framework"
-HOMEPAGE="https://www.djangoproject.com/ https://pypi.org/project/Django/"
-SRC_URI="
-	https://media.djangoproject.com/releases/$(ver_cut 1-2)/${MY_P}.tar.gz
-	verify-sig? ( https://media.djangoproject.com/pgp/${MY_P}.checksum.txt )"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="BSD"
-# admin fonts: Roboto (media-fonts/roboto)
-LICENSE+=" Apache-2.0"
-# admin icons, jquery, xregexp.js
-LICENSE+=" MIT"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-IUSE="doc sqlite test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/pytz[${PYTHON_USEDEP}]
-	>=dev-python/sqlparse-0.2.2[${PYTHON_USEDEP}]"
-BDEPEND="
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? (
-		$(python_gen_impl_dep sqlite)
-		${RDEPEND}
-		dev-python/docutils[${PYTHON_USEDEP}]
-		dev-python/jinja[${PYTHON_USEDEP}]
-		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/pillow[webp,${PYTHON_USEDEP}]
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-		dev-python/selenium[${PYTHON_USEDEP}]
-		dev-python/tblib[${PYTHON_USEDEP}]
-		sys-devel/gettext
-	)
-	verify-sig? ( sec-keys/openpgp-keys-django )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.0.7-bashcomp.patch
-)
-
-distutils_enable_sphinx docs --no-autodoc
-
-VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/django.asc
-
-src_unpack() {
-	if use verify-sig; then
-		cd "${DISTDIR}" || die
-		verify-sig_verify_signed_checksums \
-			"${MY_P}.checksum.txt" sha256 "${MY_P}.tar.gz"
-		cd "${WORKDIR}" || die
-	fi
-
-	default
-}
-
-python_test() {
-	# Tests have non-standard assumptions about PYTHONPATH,
-	# and don't work with ${BUILD_DIR}/lib.
-	PYTHONPATH=. "${EPYTHON}" tests/runtests.py --settings=test_sqlite -v2 ||
-		die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	newbashcomp extras/django_bash_completion ${PN}-admin
-	bashcomp_alias ${PN}-admin django-admin.py
-
-	distutils-r1_python_install_all
-}
-
-pkg_postinst() {
-	optfeature_header "Additional Backend support can be enabled via:"
-	optfeature "MySQL backend support" dev-python/mysqlclient
-	optfeature "PostgreSQL backend support" dev-python/psycopg:2
-	optfeature_header
-	optfeature "GEO Django" "sci-libs/gdal[geos]"
-	optfeature "Memcached support" dev-python/pylibmc dev-python/python-memcached
-	optfeature "ImageField Support" dev-python/pillow
-	optfeature "Password encryption" dev-python/bcrypt
-	optfeature "High-level abstractions for Django forms" dev-python/django-formtools
-}
diff --git a/dev-python/django/django-2.2.27.ebuild b/dev-python/django/django-2.2.27.ebuild
index fb1444891d0b..e45580009a2a 100644
--- a/dev-python/django/django-2.2.27.ebuild
+++ b/dev-python/django/django-2.2.27.ebuild
@@ -22,7 +22,7 @@ LICENSE+=" Apache-2.0"
 # admin icons, jquery, xregexp.js
 LICENSE+=" MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="doc sqlite test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/django/django-3.2.11.ebuild b/dev-python/django/django-3.2.11.ebuild
deleted file mode 100644
index 6eadcef02ca5..000000000000
--- a/dev-python/django/django-3.2.11.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-PYTHON_REQ_USE='sqlite?,threads(+)'
-
-inherit bash-completion-r1 distutils-r1 optfeature verify-sig
-
-MY_P=${P^}
-DESCRIPTION="High-level Python web framework"
-HOMEPAGE="https://www.djangoproject.com/ https://pypi.org/project/Django/"
-SRC_URI="
-	https://media.djangoproject.com/releases/$(ver_cut 1-2)/${MY_P}.tar.gz
-	verify-sig? ( https://media.djangoproject.com/pgp/${MY_P}.checksum.txt )"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="BSD"
-# admin fonts: Roboto (media-fonts/roboto)
-LICENSE+=" Apache-2.0"
-# admin icons, jquery, xregexp.js
-LICENSE+=" MIT"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv ~sparc x86 ~x64-macos"
-IUSE="doc sqlite test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/asgiref-3.3.4[${PYTHON_USEDEP}]
-	dev-python/pytz[${PYTHON_USEDEP}]
-	>=dev-python/sqlparse-0.2.2[${PYTHON_USEDEP}]"
-BDEPEND="
-	test? (
-		$(python_gen_impl_dep sqlite)
-		${RDEPEND}
-		dev-python/docutils[${PYTHON_USEDEP}]
-		dev-python/jinja[${PYTHON_USEDEP}]
-		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/pillow[webp,${PYTHON_USEDEP}]
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-		dev-python/selenium[${PYTHON_USEDEP}]
-		dev-python/tblib[${PYTHON_USEDEP}]
-		sys-devel/gettext
-		!!<dev-python/ipython-7.21.0-r1
-		!!=dev-python/ipython-7.22.0-r0
-	)
-	verify-sig? ( >=sec-keys/openpgp-keys-django-20201201 )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.1-bashcomp.patch
-)
-
-distutils_enable_sphinx docs --no-autodoc
-
-VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/django.asc
-
-src_unpack() {
-	if use verify-sig; then
-		cd "${DISTDIR}" || die
-		verify-sig_verify_signed_checksums \
-			"${MY_P}.checksum.txt" sha256 "${MY_P}.tar.gz"
-		cd "${WORKDIR}" || die
-	fi
-
-	default
-}
-
-python_prepare_all() {
-	# Fails because of warnings
-	sed -i 's/test_dumpdata_proxy_with_concrete/_&/' tests/fixtures/tests.py
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	# Tests have non-standard assumptions about PYTHONPATH,
-	# and don't work with ${BUILD_DIR}/lib.
-	PYTHONPATH=. "${EPYTHON}" tests/runtests.py --settings=test_sqlite -v2 ||
-		die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	newbashcomp extras/django_bash_completion ${PN}-admin
-	bashcomp_alias ${PN}-admin django-admin.py
-
-	distutils-r1_python_install_all
-}
-
-pkg_postinst() {
-	optfeature_header "Additional Backend support can be enabled via:"
-	optfeature "MySQL backend support" dev-python/mysqlclient
-	optfeature "PostgreSQL backend support" dev-python/psycopg:2
-	optfeature_header
-	optfeature "GEO Django" "sci-libs/gdal[geos]"
-	optfeature "Memcached support" dev-python/pylibmc dev-python/python-memcached
-	optfeature "ImageField Support" dev-python/pillow
-	optfeature "Password encryption" dev-python/bcrypt
-	optfeature "High-level abstractions for Django forms" dev-python/django-formtools
-}
diff --git a/dev-python/django/django-3.2.12.ebuild b/dev-python/django/django-3.2.12.ebuild
index 5e3cf5165b23..6eadcef02ca5 100644
--- a/dev-python/django/django-3.2.12.ebuild
+++ b/dev-python/django/django-3.2.12.ebuild
@@ -22,7 +22,7 @@ LICENSE+=" Apache-2.0"
 # admin icons, jquery, xregexp.js
 LICENSE+=" MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
+KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv ~sparc x86 ~x64-macos"
 IUSE="doc sqlite test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/django/django-4.0.1.ebuild b/dev-python/django/django-4.0.1.ebuild
deleted file mode 100644
index 4adbc6132a0e..000000000000
--- a/dev-python/django/django-4.0.1.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-PYTHON_REQ_USE='sqlite?,threads(+)'
-
-inherit bash-completion-r1 distutils-r1 optfeature verify-sig
-
-MY_P=${P^}
-DESCRIPTION="High-level Python web framework"
-HOMEPAGE="https://www.djangoproject.com/ https://pypi.org/project/Django/"
-SRC_URI="
-	https://media.djangoproject.com/releases/$(ver_cut 1-2)/${MY_P}.tar.gz
-	verify-sig? ( https://media.djangoproject.com/pgp/${MY_P}.checksum.txt )"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="BSD"
-# admin fonts: Roboto (media-fonts/roboto)
-LICENSE+=" Apache-2.0"
-# admin icons, jquery, xregexp.js
-LICENSE+=" MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
-IUSE="doc sqlite test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/asgiref-3.4.1[${PYTHON_USEDEP}]
-	>=dev-python/sqlparse-0.2.2[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		dev-python/backports-zoneinfo[${PYTHON_USEDEP}]
-	' python3_8 pypy3)"
-BDEPEND="
-	test? (
-		$(python_gen_impl_dep sqlite)
-		${RDEPEND}
-		dev-python/docutils[${PYTHON_USEDEP}]
-		dev-python/jinja[${PYTHON_USEDEP}]
-		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/pillow[webp,${PYTHON_USEDEP}]
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-		dev-python/selenium[${PYTHON_USEDEP}]
-		dev-python/tblib[${PYTHON_USEDEP}]
-		sys-devel/gettext
-		!!<dev-python/ipython-7.21.0-r1
-		!!=dev-python/ipython-7.22.0-r0
-	)
-	verify-sig? ( >=sec-keys/openpgp-keys-django-20201201 )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-4.0-bashcomp.patch
-)
-
-distutils_enable_sphinx docs --no-autodoc
-
-VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/django.asc
-
-src_unpack() {
-	if use verify-sig; then
-		cd "${DISTDIR}" || die
-		verify-sig_verify_signed_checksums \
-			"${MY_P}.checksum.txt" sha256 "${MY_P}.tar.gz"
-		cd "${WORKDIR}" || die
-	fi
-
-	default
-}
-
-python_prepare_all() {
-	# Fails because of warnings
-	sed -i 's/test_dumpdata_proxy_with_concrete/_&/' tests/fixtures/tests.py
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	# Tests have non-standard assumptions about PYTHONPATH,
-	# and don't work with ${BUILD_DIR}/lib.
-	PYTHONPATH=. "${EPYTHON}" tests/runtests.py --settings=test_sqlite -v2 ||
-		die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	newbashcomp extras/django_bash_completion ${PN}-admin
-	bashcomp_alias ${PN}-admin django-admin.py
-
-	distutils-r1_python_install_all
-}
-
-pkg_postinst() {
-	optfeature_header "Additional Backend support can be enabled via:"
-	optfeature "MySQL backend support" dev-python/mysqlclient
-	optfeature "PostgreSQL backend support" dev-python/psycopg:2
-	optfeature_header
-	optfeature "GEO Django" "sci-libs/gdal[geos]"
-	optfeature "Memcached support" dev-python/pylibmc dev-python/python-memcached
-	optfeature "ImageField Support" dev-python/pillow
-	optfeature "Password encryption" dev-python/bcrypt
-	optfeature "High-level abstractions for Django forms" dev-python/django-formtools
-}
diff --git a/dev-python/django/django-4.0.2.ebuild b/dev-python/django/django-4.0.2.ebuild
index 4adbc6132a0e..5aa3cb7f150d 100644
--- a/dev-python/django/django-4.0.2.ebuild
+++ b/dev-python/django/django-4.0.2.ebuild
@@ -22,7 +22,7 @@ LICENSE+=" Apache-2.0"
 # admin icons, jquery, xregexp.js
 LICENSE+=" MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
+KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv ~sparc x86 ~x64-macos"
 IUSE="doc sqlite test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/entrypoints/Manifest b/dev-python/entrypoints/Manifest
index 94566c081650..6b344114f99b 100644
--- a/dev-python/entrypoints/Manifest
+++ b/dev-python/entrypoints/Manifest
@@ -1 +1,2 @@
 DIST entrypoints-0.3.tar.gz 12315 BLAKE2B f548d98eeb9dcf5760b26f66e5dec0849c9a9027cd68447c07a585e7b80f79a7c66712d0dd270b6960db167d26f9cf0c9c221edd21f2692c2221d36e952ede65 SHA512 aa1274362d3a4b00266103319ca51aa266605b4999c89a9d0673eb61bfae9e646cb0ec6b86c95544493f6fe048385a2c7641d64adca8f45815546fb1e663c858
+DIST entrypoints-0.4.tar.gz 13974 BLAKE2B 95bfe3deeee183f000722be63114e7eafe12ce9994e3ad02fccde7ee8dca3d10cc491e438bc9330fe9e16dbe1664d7a9fd9ef5712ebca989e3304e1dee7a55ce SHA512 874858c240199b9a209e00bde609b33335d199d21a959e51bb875240e2a35ada036380097218e9cd50d5d1dbf9de52638a069cb605ea8e8952db4a5afa3ffd42
diff --git a/dev-python/entrypoints/entrypoints-0.4.ebuild b/dev-python/entrypoints/entrypoints-0.4.ebuild
new file mode 100644
index 000000000000..923a8ef33f32
--- /dev/null
+++ b/dev-python/entrypoints/entrypoints-0.4.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=flit
+PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Discover and load entry points from installed packages"
+HOMEPAGE="https://github.com/takluyver/entrypoints"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+
+distutils_enable_tests pytest
diff --git a/dev-python/google-api-core/Manifest b/dev-python/google-api-core/Manifest
index 5395a2279f24..263698e4ec8a 100644
--- a/dev-python/google-api-core/Manifest
+++ b/dev-python/google-api-core/Manifest
@@ -1 +1,2 @@
 DIST google-api-core-2.3.1.tar.gz 156495 BLAKE2B fdc7f7d8457b96947181eee9992c5e51bbd18f9740a0415a32d4d0f45ade9c0c784e01f0aa78fe0dbbf3717ee860e78d6b4d1c5f154361afbf919abe033e5380 SHA512 ab1c333727e666f920d81186e6213d440052021d952efcb47eac487d10ab33a2e1116278925e54bfb3468de70c18837a0e241ba3426af09728ea59a725789a29
+DIST google-api-core-2.5.0.tar.gz 160336 BLAKE2B 5a3050dcb2e58c068c67cd6263b297ea84e4a47784c750e7ed87077bf46314730698eda2eaa8305a99a55b539b8886dfbbeeb9dc9838748fa941db6785212f36 SHA512 92b570195db21dded50b220e350e518c13101ab3e247bcbb3d3f5701e722c6dc81312443889360fdef1485edf1d5ef486bfeecf56092844cea81b61c7c527728
diff --git a/dev-python/google-api-core/google-api-core-2.5.0.ebuild b/dev-python/google-api-core/google-api-core-2.5.0.ebuild
new file mode 100644
index 000000000000..6552e4167278
--- /dev/null
+++ b/dev-python/google-api-core/google-api-core-2.5.0.ebuild
@@ -0,0 +1,61 @@
+# Copyright 2020-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Core Library for Google Client Libraries"
+HOMEPAGE="https://github.com/googleapis/python-api-core/
+	https://googleapis.dev/python/google-api-core/latest/index.html"
+SRC_URI="https://github.com/googleapis/${PN//google/python}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${P//google/python}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-python/namespace-google[${PYTHON_USEDEP}]
+	dev-python/protobuf-python[${PYTHON_USEDEP}]
+	dev-python/googleapis-common-protos[${PYTHON_USEDEP}]
+	>=dev-python/google-auth-1.25.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.18.0[${PYTHON_USEDEP}]
+	<dev-python/requests-3[${PYTHON_USEDEP}]
+"
+# grpcio support is broken if grpcio-status is not installed,
+# and we do not package the latter
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/proto-plus[${PYTHON_USEDEP}]
+		dev-python/rsa[${PYTHON_USEDEP}]
+		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+	# failing due to missing grpcio-status
+	tests/asyncio/test_grpc_helpers_async.py::test_wrap_unary_errors
+	tests/asyncio/test_grpc_helpers_async.py::test_wrap_stream_errors_raised
+	tests/asyncio/test_grpc_helpers_async.py::test_wrap_stream_errors_read
+	tests/asyncio/test_grpc_helpers_async.py::test_wrap_stream_errors_aiter
+	tests/asyncio/test_grpc_helpers_async.py::test_wrap_stream_errors_write
+	tests/unit/test_grpc_helpers.py::test_wrap_unary_errors
+	tests/unit/test_grpc_helpers.py::Test_StreamingResponseIterator::test___next___w_rpc_error
+	tests/unit/test_grpc_helpers.py::test_wrap_stream_errors_invocation
+	tests/unit/test_grpc_helpers.py::test_wrap_stream_errors_iterator_initialization
+	tests/unit/test_grpc_helpers.py::test_wrap_stream_errors_during_iteration
+	# TODO
+	tests/unit/test_operation.py::test_exception_with_error_code
+)
+
+python_install_all() {
+	distutils-r1_python_install_all
+	find "${D}" -name '*.pth' -delete || die
+}
diff --git a/dev-python/lit/Manifest b/dev-python/lit/Manifest
index dd7644d62981..20315e2d7eee 100644
--- a/dev-python/lit/Manifest
+++ b/dev-python/lit/Manifest
@@ -1,4 +1,4 @@
 DIST llvmorg-11.1.0.tar.gz 122776532 BLAKE2B ca842ff4afff8f44c82b5e7383962a9c45ca1c93b64fa4c6ebcd70a1d3849dbad2b8e4e24fba02d144c6266d7fab3607ebc6999b28c229cb35256cf40f26a985 SHA512 9a8ce022a935eed42fa71a224f2a207122aadcbef58ee855fdb4825f879e7d028e4dcff22c19b9d336db1c8bf63fb84372d44981acf84615f757e54306c92b81
 DIST llvmorg-12.0.1.tar.gz 134259748 BLAKE2B f41de787bc73ff2edfda1b22cc8602be6f65f37dd9e4c8888533cfa8c3ccdcf4f108aaab9de23ab0ab987966eb160f2a553a0bdff99461e71ddd5bfcd086090d SHA512 6eb0dc18e2c25935fabfdfc48b0114be0939158dfdef7b85b395fe2e71042672446af0e68750aae003c9847d10d1f63316fe95d3df738d18f249174292b1b9e1
 DIST llvmorg-13.0.0.tar.gz 147270176 BLAKE2B 628f316b580e1edf3a58d4825b724df759e6ed2a4116802470c04562caefc392fa325c91f388036365a2e45a9595cca6d3557fab12984fc8bcfef29c9116d822 SHA512 8004c05d32b9720fb3391783621690c1df9bd1e97e72cbff9192ed88a84b0acd303b61432145fa917b5b5e548c8cee29b24ef8547dcc8677adf4816e7a8a0eb2
-DIST llvmorg-13.0.1-rc3.tar.gz 147302323 BLAKE2B 9ac2f97568062d7dd618295a68d6e14898fcd69e2bb66290b999ceb8c12132371f4e9b59d8ba2b252e5e5cb249045676b24fc50c117b2afae20abab98f426582 SHA512 88a04ad02af2d41ec21c7a62bad21ee0e627b7276a16795875afd062ed29ac7fb4aadec5b5e48785a6502c9fd797a4b67d648a21f193c9f7602112870b10a3d1
+DIST llvmorg-13.0.1.tar.gz 147290251 BLAKE2B 2a44b012a672501761d0c27c6b3a315b69bfef0cd13b078a7e7d2fccc4a9c8c0f2bee0f164c4271c9106b0a99cb06e8b64986f66253b613336719fb86b82541b SHA512 9a8cb5d11964ba88b7624f19ec861fb28701f23956ea3c92f6ac644332d5f41fde97bd8933dd3ee70ed378058c252fa3a3887c8d1af90d219970c2b27691166f
diff --git a/dev-python/lit/lit-13.0.1_rc3.ebuild b/dev-python/lit/lit-13.0.1.ebuild
index 82f7494d65ef..d8872736a5c3 100644
--- a/dev-python/lit/lit-13.0.1_rc3.ebuild
+++ b/dev-python/lit/lit-13.0.1.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://llvm.org/"
 
 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
 SLOT="0"
-KEYWORDS=""
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/nuitka/Manifest b/dev-python/nuitka/Manifest
index f813f3e57563..e54b21ef7d2b 100644
--- a/dev-python/nuitka/Manifest
+++ b/dev-python/nuitka/Manifest
@@ -1,5 +1,2 @@
-DIST Nuitka-0.6.19.1.tar.gz 3727050 BLAKE2B 70cde9f6c7254cc229dc534736c1445f9fc813a1463705e0116021107c6b6909c9ac1e35bf7b0b452cd6b6d23b2c4e4103e8427c44d6d3c3273f7f70ad5daeee SHA512 83c5a6c2c547f139cd947c804f646b37f0fbaaa44a53b1cc42366170f91de138d63b5eeb2fa2e37ba9a24cb34c1faeb8e86c09cb08e829aa6d3607931c2eebbf
-DIST Nuitka-0.6.19.2.tar.gz 3727729 BLAKE2B f74512ab2b57ab66b62e7a67fed8366971fe23103297ab5361685b19408445dac7335e3086f0ce236c7346bcf4d8dfcf828040412e4868e82f06c03e6ea52fd0 SHA512 a92b24168e16054399692d0984dd417b181d2bb920825eabaa64798933b481e188827b5bbae040d329e67b09002b21ce471ce1352b12ac46ab2b8fec97523aa5
-DIST Nuitka-0.6.19.3.tar.gz 3727905 BLAKE2B 7c49bf77100ef28a306bf746b4ba13db07da403ba428b3e770ca3a2efbe384db1f5b66b8858640e2b4cdc5a8034be3f55a57fdc2e175d47bdd24638c379e7afe SHA512 0e9b4805ad2b27338ec03fd121d2787add54795f777b184379eb722e5bff3ce64a64c4802464cb3c11a4be579b03ff89b32995646954a389f1a75fef0069ae12
 DIST Nuitka-0.6.19.4.tar.gz 3728051 BLAKE2B 561dd0657b0f5f7c10da18d4b78be09337c998951542c767e2888648a76e1332d71b83952cff3aa6fb64ceb5c6f1103f26fa9d9b0661c7b8cdf76c20d75cf51f SHA512 3b7a5a5d5191b93ee96e9cb98822a26462c6a4c5fdbc7abaf9553238653e2debc986a1b307c62ffcaccc8618adadb5c794d436f75c957c733d8471612820c7be
-DIST Nuitka-0.6.19.tar.gz 3739123 BLAKE2B c2e9a6417ff65927c3246849d614fdebb8bcf323b6496dae81f7cef3ab86a22ad21d3fe3eb19c74ea7f228310e3b1b985cea56201efe71c1b0d8ff64998973c0 SHA512 2d8f8c0d95f6d85c7969879ddbe2375ae190bfc1466a21c442e9e109ed7759ecf0bdcc2f29ec8fed5462df52e1b1e69a0e10574d8e7f52b1dfef7f7ae9626c75
+DIST Nuitka-0.6.19.5.tar.gz 3728119 BLAKE2B 8300356499e53185cd2b6a547b8deef818bfd2c775e8ee2517bc79d741f81af1a7745b2eac018d0df3b329b7d4719dbac71159d6efd6ef35ccff4c63daf8e4cc SHA512 bc6b7d41af7bfdeb236143640ab1dc6ea0b811f85eaf10c8d232907d53c9643be25b4c0cdc3946204d6501c7009f8e79f36b5b6318d36a6e77052d9e2c1ec986
diff --git a/dev-python/nuitka/nuitka-0.6.19.1.ebuild b/dev-python/nuitka/nuitka-0.6.19.1.ebuild
deleted file mode 100644
index 2c7af01367e2..000000000000
--- a/dev-python/nuitka/nuitka-0.6.19.1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2022 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 flag-o-matic optfeature
-
-DESCRIPTION="Python to native compiler"
-HOMEPAGE="https://www.nuitka.net"
-SRC_URI="https://nuitka.net/releases/${P^}.tar.gz"
-S="${WORKDIR}/${P^}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-util/scons[${PYTHON_USEDEP}]"
-BDEPEND="
-	${RDEPEND}
-	test? ( dev-util/ccache )
-"
-
-DOCS=( Changelog.pdf Developer_Manual.pdf README.pdf )
-
-distutils-r1_src_prepare() {
-	# remove vendored version of SCons that is Python2 only
-	# this should be removed when upstream removes support for Python2
-	rm -vR "${S}/${PN}/build/inline_copy/lib/scons-2.3.2/SCons"  || die
-	eapply_user
-}
-
-python_install() {
-	distutils-r1_python_install
-	python_optimize
-	doman doc/nuitka3.1 doc/nuitka3-run.1
-}
-
-python_test() {
-	append-ldflags -Wl,--no-warn-search-mismatch
-	./tests/basics/run_all.py search || die
-}
-
-pkg_postinst() {
-	optfeature "support for stand-alone executables" app-admin/chrpath
-}
diff --git a/dev-python/nuitka/nuitka-0.6.19.2.ebuild b/dev-python/nuitka/nuitka-0.6.19.2.ebuild
deleted file mode 100644
index 2c7af01367e2..000000000000
--- a/dev-python/nuitka/nuitka-0.6.19.2.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2022 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 flag-o-matic optfeature
-
-DESCRIPTION="Python to native compiler"
-HOMEPAGE="https://www.nuitka.net"
-SRC_URI="https://nuitka.net/releases/${P^}.tar.gz"
-S="${WORKDIR}/${P^}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-util/scons[${PYTHON_USEDEP}]"
-BDEPEND="
-	${RDEPEND}
-	test? ( dev-util/ccache )
-"
-
-DOCS=( Changelog.pdf Developer_Manual.pdf README.pdf )
-
-distutils-r1_src_prepare() {
-	# remove vendored version of SCons that is Python2 only
-	# this should be removed when upstream removes support for Python2
-	rm -vR "${S}/${PN}/build/inline_copy/lib/scons-2.3.2/SCons"  || die
-	eapply_user
-}
-
-python_install() {
-	distutils-r1_python_install
-	python_optimize
-	doman doc/nuitka3.1 doc/nuitka3-run.1
-}
-
-python_test() {
-	append-ldflags -Wl,--no-warn-search-mismatch
-	./tests/basics/run_all.py search || die
-}
-
-pkg_postinst() {
-	optfeature "support for stand-alone executables" app-admin/chrpath
-}
diff --git a/dev-python/nuitka/nuitka-0.6.19.3.ebuild b/dev-python/nuitka/nuitka-0.6.19.5.ebuild
index 2c7af01367e2..d40fe11f9db3 100644
--- a/dev-python/nuitka/nuitka-0.6.19.3.ebuild
+++ b/dev-python/nuitka/nuitka-0.6.19.5.ebuild
@@ -3,7 +3,9 @@
 
 EAPI=8
 
+DISTUTILS_USE_PEP517=setuptools
 PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+
 inherit distutils-r1 flag-o-matic optfeature
 
 DESCRIPTION="Python to native compiler"
@@ -28,13 +30,12 @@ DOCS=( Changelog.pdf Developer_Manual.pdf README.pdf )
 distutils-r1_src_prepare() {
 	# remove vendored version of SCons that is Python2 only
 	# this should be removed when upstream removes support for Python2
-	rm -vR "${S}/${PN}/build/inline_copy/lib/scons-2.3.2/SCons"  || die
+	rm -vR "${PN}/build/inline_copy/lib/scons-2.3.2/SCons" || die
 	eapply_user
 }
 
 python_install() {
 	distutils-r1_python_install
-	python_optimize
 	doman doc/nuitka3.1 doc/nuitka3-run.1
 }
 
diff --git a/dev-python/nuitka/nuitka-0.6.19.ebuild b/dev-python/nuitka/nuitka-0.6.19.ebuild
deleted file mode 100644
index 2c7af01367e2..000000000000
--- a/dev-python/nuitka/nuitka-0.6.19.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2022 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 flag-o-matic optfeature
-
-DESCRIPTION="Python to native compiler"
-HOMEPAGE="https://www.nuitka.net"
-SRC_URI="https://nuitka.net/releases/${P^}.tar.gz"
-S="${WORKDIR}/${P^}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-util/scons[${PYTHON_USEDEP}]"
-BDEPEND="
-	${RDEPEND}
-	test? ( dev-util/ccache )
-"
-
-DOCS=( Changelog.pdf Developer_Manual.pdf README.pdf )
-
-distutils-r1_src_prepare() {
-	# remove vendored version of SCons that is Python2 only
-	# this should be removed when upstream removes support for Python2
-	rm -vR "${S}/${PN}/build/inline_copy/lib/scons-2.3.2/SCons"  || die
-	eapply_user
-}
-
-python_install() {
-	distutils-r1_python_install
-	python_optimize
-	doman doc/nuitka3.1 doc/nuitka3-run.1
-}
-
-python_test() {
-	append-ldflags -Wl,--no-warn-search-mismatch
-	./tests/basics/run_all.py search || die
-}
-
-pkg_postinst() {
-	optfeature "support for stand-alone executables" app-admin/chrpath
-}
diff --git a/dev-python/pyGPG/pyGPG-0.2.ebuild b/dev-python/pyGPG/pyGPG-0.2.ebuild
index 604dd86b5697..3ae2751eb384 100644
--- a/dev-python/pyGPG/pyGPG-0.2.ebuild
+++ b/dev-python/pyGPG/pyGPG-0.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
diff --git a/dev-python/pylama/Manifest b/dev-python/pylama/Manifest
index b1300a657fd4..79d41547fa4b 100644
--- a/dev-python/pylama/Manifest
+++ b/dev-python/pylama/Manifest
@@ -1,4 +1,2 @@
-DIST pylama-7.7.1.tar.gz 34740 BLAKE2B a4bd5aed40c2c4e7bdb9f9968030f0954f0309cff80567b2252ee9576fdb4598714286bda63c22676789d4919662430ef2729089faa70b5cb590784eb47ef1f0 SHA512 298fabffcdf38e3e868e3965de87a0e761bc9dfcfe33320b53057c4e05598bcc22045481ec16ccb8df27f49ea41d6fef82b69fe7327905f93ce74d9350682cf0
-DIST pylama-8.0.6.tar.gz 34223 BLAKE2B 690a0a1197f6512e9511083aa079843f2ca99c9bdb5d74756531db79f7d39e8e0f60a0955b24bc7739edce0376eb79821a796978fb2365789a97628f03f240f8 SHA512 5bc75e5b2a0b141dbe2ca993d13833914980c735b84f3df766bf750909af1eeaba0d554845d8c09f0d8186ff48c8330d9ffa5b565a577ef6506f32672a2c9209
 DIST pylama-8.3.6.tar.gz 36190 BLAKE2B f0c9944d3aa205c9f52fdfab6b47ad5ad08f1865db22eef20add0652fcb4355f878026aad9f1babbfcb4f98c13bc5cbaa069d9d7b5c7a775d994a8952f8a8cc5 SHA512 c279f3005e354be448f42addcfeae6025e1dd4acf84e5de0c3ae707ceac4f98e43a07f43be347b26bfb8db4167945db1db547ed7bd9eb73ca78bbc92d26fdfff
 DIST pylama-8.3.7.tar.gz 36264 BLAKE2B 8092320c039b5cd45a379a2718443cf03f5cef931767ae765c90096e3b23d5b7242034009eecb40413f05e2de2fd72a4285a91ebbc1fb474d232cffc9c992b94 SHA512 acfab9584e7bd8b146350e6af83975e91391e39c00a0fea23d4e55f46dd684b519088ed68c90e335e334e8526aecab2ad2286a0c082d26a4b867eadcbd8866c8
diff --git a/dev-python/pylama/pylama-7.7.1-r1.ebuild b/dev-python/pylama/pylama-7.7.1-r1.ebuild
deleted file mode 100644
index eef7e85b8a99..000000000000
--- a/dev-python/pylama/pylama-7.7.1-r1.ebuild
+++ /dev/null
@@ -1,49 +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="Code audit tool for python"
-HOMEPAGE="https://github.com/klen/pylama"
-SRC_URI="https://github.com/klen/pylama/archive/${PV}.tar.gz -> ${P}.tar.gz"
-# pypi tarball excludes unit tests
-#SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-
-RDEPEND="
-	>=dev-python/mccabe-0.5.2[${PYTHON_USEDEP}]
-	dev-python/pycodestyle[${PYTHON_USEDEP}]
-	dev-python/pydocstyle[${PYTHON_USEDEP}]
-	dev-python/pyflakes[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mypy[${PYTHON_USEDEP}]
-		dev-vcs/git
-	)
-"
-
-distutils_enable_sphinx docs
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	sed -e "s|exclude=\['plugins'\]|exclude=['plugins', 'tests']|" -i setup.py || die
-	sed -e 's|^\(def\) \(test_ignore_select\)|\1 _\2|' -i tests/test_config.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# Disable eradicate until it is fixed:
-		# https://github.com/klen/pylama/issues/190
-		tests/test_linters.py::test_eradicate
-	)
-	epytest tests
-}
diff --git a/dev-python/pylama/pylama-8.0.6.ebuild b/dev-python/pylama/pylama-8.0.6.ebuild
deleted file mode 100644
index 9860262e2732..000000000000
--- a/dev-python/pylama/pylama-8.0.6.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-inherit distutils-r1
-
-DESCRIPTION="Code audit tool for python"
-HOMEPAGE="https://github.com/klen/pylama"
-SRC_URI="https://github.com/klen/pylama/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="
-	>=dev-python/mccabe-0.6.1[${PYTHON_USEDEP}]
-	>=dev-python/pycodestyle-2.8.0[${PYTHON_USEDEP}]
-	>=dev-python/pydocstyle-6.1.1[${PYTHON_USEDEP}]
-	>=dev-python/pyflakes-2.4.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/eradicate[${PYTHON_USEDEP}]
-		dev-python/mypy[${PYTHON_USEDEP}]
-		dev-python/pylint[${PYTHON_USEDEP}]
-		dev-python/radon[${PYTHON_USEDEP}]
-		dev-vcs/git
-	)
-"
-
-distutils_enable_sphinx docs
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	# not packaged
-	tests/test_linters.py::test_quotes
-	tests/test_linters.py::test_vulture
-)
diff --git a/dev-python/pypy3-exe-bin/Manifest b/dev-python/pypy3-exe-bin/Manifest
index 97afdaccad78..81100e37808c 100644
--- a/dev-python/pypy3-exe-bin/Manifest
+++ b/dev-python/pypy3-exe-bin/Manifest
@@ -2,3 +2,5 @@ DIST pypy3-exe-7.3.7-1.amd64.xpak 12149428 BLAKE2B 468fe50d8b607793438bc59179acb
 DIST pypy3-exe-7.3.7-1.x86.xpak 9221421 BLAKE2B fc24f93533127f48ffc5974dfd3eb4611442489aee6318ccb911a2f3e3d234bc44c659309006ffe55eb6de3a00915fa3aaf6dc50e4efb1adb668d0d38281cf3c SHA512 9322a25ad230615cc96b81448a0591f730a5d09b57c02259412d427290934074baeb48f58f3829d393137252d5cf1b3f0fdd3b50d9194d69ea3ab38fbe83abac
 DIST pypy3-exe-7.3.8_rc1-1.amd64.xpak 12424506 BLAKE2B 32d4c9a8f82ff1940608848cf497124bf628eebcc14f8a118819afca22b0055d010440c657c546449bd4fdc17d4d1933b5d236ab8a6e21cf1aea48a09412c3e6 SHA512 0e8c8b6d287bea00666f53f4fea7d339d5954ebca078ca3f30f0764ab8825da0655464c7c02bac26d6eca66e7915d97d8e4c1ba86e01a408eb9f0741e470f52c
 DIST pypy3-exe-7.3.8_rc1-1.x86.xpak 9226302 BLAKE2B 98efa1ae5f77d0dfb7eb9189a0088177df80271bf41069e14e221e2d8bf645b65b518b8aed43903df5562f1cd9626583dada1c0e617e8ab0c4481d61adc4c8f1 SHA512 f42131ecb9fbea76f250f3f2772e21fd2e562df8c043eb480bfb8d16e837ea24bd8c5db7d70c5d5d97eb9f22c00f39216989876bd19efc76e3854025a5bbf317
+DIST pypy3-exe-7.3.8_rc1_p2-1.amd64.xpak 12426733 BLAKE2B b57e4cb06e539b79f08f6f7b17de855265f317d46d391eb35a8aaff2031146a7c3bcce6ece24f3d08eb47918c2be4ae4b10c7dd3eb35c6f1a409cf57c4db040b SHA512 ded505bdc02a467d60359cae79321a1b99c333cbfc242eef8a15d966c12d87806e16c9e9a98435b3759ac8eefd286946e0a1c32907620daa2ee35aef9385096b
+DIST pypy3-exe-7.3.8_rc1_p2-1.x86.xpak 9212249 BLAKE2B 7de30c5cd8bc3d04fa9a7bac7251b5ef54b038a76a42df60f2aabade65b9b9f4b0199cda45c61dd2d775d8a2c964efbc1ded54a014242dee984b7922108df993 SHA512 b9dd7135f33a14f4f2684762a7590d77a4fb6c0711f7bc86570d031f1e7bd9abf69fbbf9f33a841eff04666af0f94d39f0c2aaebe1fefb7de846a9d115673abe
diff --git a/dev-python/pypy3-exe-bin/pypy3-exe-bin-7.3.8_rc1_p2.ebuild b/dev-python/pypy3-exe-bin/pypy3-exe-bin-7.3.8_rc1_p2.ebuild
new file mode 100644
index 000000000000..9170699865c0
--- /dev/null
+++ b/dev-python/pypy3-exe-bin/pypy3-exe-bin-7.3.8_rc1_p2.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit pax-utils
+
+MY_P=pypy3-exe-${PV}-1
+DESCRIPTION="PyPy3 executable (pre-built version)"
+HOMEPAGE="https://www.pypy.org/"
+SRC_URI="
+	amd64? (
+		https://dev.gentoo.org/~mgorny/binpkg/amd64/pypy/dev-python/pypy3-exe/${MY_P}.xpak
+			-> ${MY_P}.amd64.xpak
+	)
+	x86? (
+		https://dev.gentoo.org/~mgorny/binpkg/x86/pypy/dev-python/pypy3-exe/${MY_P}.xpak
+			-> ${MY_P}.x86.xpak
+	)"
+S="${WORKDIR}"
+
+LICENSE="MIT"
+SLOT="3.9-${PV%_p*}"
+KEYWORDS=""
+
+RDEPEND=">=sys-libs/zlib-1.1.3:0/1
+	|| (
+		dev-libs/libffi-compat:7
+		dev-libs/libffi:0/7
+	)
+	virtual/libintl:0/0
+	dev-libs/expat:0/0
+	app-arch/bzip2:0/1
+	sys-libs/ncurses:0/6
+	!dev-python/pypy-exe:${SLOT}"
+
+PYPY_PV=${PV%_p*}
+QA_PREBUILT="
+	usr/bin/pypy3.9-c-${PYPY_PV}"
+
+src_unpack() {
+	ebegin "Unpacking ${MY_P}.${ARCH}.xpak"
+	tar -x < <(xz -c -d --single-stream "${DISTDIR}/${MY_P}.${ARCH}.xpak")
+	eend ${?} || die "Unpacking ${MY_P} failed"
+}
+
+src_install() {
+	insinto /
+	doins -r usr
+	fperms +x "/usr/bin/pypy3.9-c-${PYPY_PV}"
+	pax-mark m "${ED}/usr/bin/pypy3.9-c-${PYPY_PV}"
+}
diff --git a/dev-python/pytables/pytables-3.7.0.ebuild b/dev-python/pytables/pytables-3.7.0.ebuild
index 48d268328a58..569208e6f2db 100644
--- a/dev-python/pytables/pytables-3.7.0.ebuild
+++ b/dev-python/pytables/pytables-3.7.0.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="examples test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/python3-xapp/metadata.xml b/dev-python/python3-xapp/metadata.xml
index dc97a3474aeb..0d618616ba59 100644
--- a/dev-python/python3-xapp/metadata.xml
+++ b/dev-python/python3-xapp/metadata.xml
@@ -1,15 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
- <maintainer type="person">
-  <email>sparky@bluefang-logic.com</email>
-  <name>Matthew Turnbull</name>
- </maintainer>
  <maintainer type="project">
-  <email>proxy-maint@gentoo.org</email>
-  <name>Proxy Maintainers</name>
+  <email>core@liguros.net</email>
+  <name>Development</name>
  </maintainer>
  
- <origin>gentoo-staging</origin>
- <stabilize-allarches/>
+ <origin>binaryden-overlay</origin>
 </pkgmetadata>
\ No newline at end of file
diff --git a/dev-python/python3-xapp/python3-xapp-2.2.1-r1.ebuild b/dev-python/python3-xapp/python3-xapp-2.2.1-r1.ebuild
index 0799060eb343..01dcaa0ca1e3 100644
--- a/dev-python/python3-xapp/python3-xapp-2.2.1-r1.ebuild
+++ b/dev-python/python3-xapp/python3-xapp-2.2.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/linuxmint/python3-xapp/archive/${PV}.tar.gz -> ${P}.
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/dev-python/python3-xapp/python3-xapp-2.2.1.ebuild b/dev-python/python3-xapp/python3-xapp-2.2.1.ebuild
deleted file mode 100644
index bd191c45bc7d..000000000000
--- a/dev-python/python3-xapp/python3-xapp-2.2.1.ebuild
+++ /dev/null
@@ -1,25 +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="Python bindings for x11-libs/xapp"
-HOMEPAGE="https://github.com/linuxmint/python3-xapp"
-SRC_URI="https://github.com/linuxmint/python3-xapp/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~riscv x86"
-IUSE=""
-
-DEPEND="
-	>=x11-libs/xapp-2.2.0[introspection]
-"
-RDEPEND="
-	${DEPEND}
-	dev-python/psutil[${PYTHON_USEDEP}]
-"
diff --git a/dev-python/responses/Manifest b/dev-python/responses/Manifest
index 0549c9f303eb..88f917927baf 100644
--- a/dev-python/responses/Manifest
+++ b/dev-python/responses/Manifest
@@ -1,2 +1,3 @@
 DIST responses-0.16.0.tar.gz 41943 BLAKE2B cca1d4d0f5bf6980776a9373ac51f5305d8db439eb1c1dca61985704da2dc8d62839e2aa1fde30f9e8aaaf785c0e7cdae56662270ced0627ff1c236c3cf252ad SHA512 b2363cd7c9aad84bfce814fe815663babfe584fa390f95a1d5e01118c8749e98777bf283a7200ea96a7ce5fa1ad6d85ee329e4bd999f3dca0317476b7e976f12
 DIST responses-0.17.0.tar.gz 45064 BLAKE2B dcfa702209df3d62fc3fcc2fd012fa15a75c9a7b9757b99c886265de582924452746b3ed86da7b293897b489ceb48dbf99e74bc008d4aa3932714aed3676ae08 SHA512 238c7b4926857c13a4192bbb38eb0dbd65d110ae86c19c59c1504bdfc912fefebdc3e59c7646ce4f0228a1a080201b11d336bae56fc190665f816c6251de579c
+DIST responses-0.18.0.tar.gz 45885 BLAKE2B 1503f38adc6aada9130a08720781565200d6b1b36c6c482f0f74280d80527b0faba451bd03ccdbfaa816f2dbadae337e47cffc271f0cca416804b13eabe80d9a SHA512 c443c01c0bf5d8aba4159817bf5ec6b3e83fc02db0349f6aa138afe74c9cba72347561c02511994b1aa3dc54d77ba4c1c89ccb73197ecaeec9244d919cabd3ae
diff --git a/dev-python/responses/responses-0.18.0.ebuild b/dev-python/responses/responses-0.18.0.ebuild
new file mode 100644
index 000000000000..47363f41a941
--- /dev/null
+++ b/dev-python/responses/responses-0.18.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Utility for mocking out the Python Requests library"
+HOMEPAGE="https://github.com/getsentry/responses"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	<dev-python/requests-3[${PYTHON_USEDEP}]
+	>=dev-python/urllib3-1.25.10[${PYTHON_USEDEP}]
+"
+
+BDEPEND="
+	test? (
+		dev-python/pytest-localserver[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/s3transfer/Manifest b/dev-python/s3transfer/Manifest
index 964f3edcdc80..d08bd63ca8d3 100644
--- a/dev-python/s3transfer/Manifest
+++ b/dev-python/s3transfer/Manifest
@@ -1 +1,2 @@
 DIST s3transfer-0.5.0.tar.gz 133535 BLAKE2B 2ce9235fbffc4c42682345873becac6f0d574ac44de523e10178bf7d115b261acbd1753b1a41ca301b72fa96a6a93314572fe12ea4d286a325a0a36e3cf56b36 SHA512 e34d115d149f8f9715fa0147521eec63a5fd672ee513d690248fbca73003cf4c9e43775bd5b3616f7ad3a6734993a1c8b2ba789394d338a8ac4c841a0e51999c
+DIST s3transfer-0.5.1.tar.gz 134278 BLAKE2B e67a726743af4f75e3e22519addeaa4437020ec26e0deec67d003d96307865cb624d7da272618114b168c32f26f595a27ed823b2905f47b1c2e5e187a68457cb SHA512 1bdcb9adfa795b524e36369e9128b1bd39d0b14f51862aba779a1eebe0569283da58138da52e031073d8c1199441083771c7f6e0657e0e1da9cd0d767450d52f
diff --git a/dev-python/s3transfer/s3transfer-0.5.1.ebuild b/dev-python/s3transfer/s3transfer-0.5.1.ebuild
new file mode 100644
index 000000000000..0418c7d9e5b1
--- /dev/null
+++ b/dev-python/s3transfer/s3transfer-0.5.1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+
+inherit distutils-r1
+
+DESCRIPTION="An Amazon S3 Transfer Manager"
+HOMEPAGE="https://github.com/boto/s3transfer"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	dev-python/botocore[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	# do not rely on bundled deps in botocore (sic!)
+	find -name '*.py' -exec sed -i \
+		-e 's:from botocore[.]vendored import:import:' \
+		-e 's:from botocore[.]vendored[.]:from :' \
+		{} + || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	epytest tests/{unit,functional}
+}
diff --git a/dev-python/twine/Manifest b/dev-python/twine/Manifest
index 33dfb19f6a54..c9396c74d67c 100644
--- a/dev-python/twine/Manifest
+++ b/dev-python/twine/Manifest
@@ -1 +1,2 @@
 DIST twine-3.7.0.tar.gz 212591 BLAKE2B 116d96a058cb53e0626747aaeae40c63fd6ece4ed8ef537c3890f99226f34827b65e5e894f5f04a24999d5ca2bcf182505e08075c4ff8b979d7be71e05f645ef SHA512 d7ddfdfcbaa7a5e3eba3657a06da090eeecbf373646e64d659f420fae4ba10c16c2c02e85bdf9c1f050b86177f19c85aa20183ad9d546cb053a11d60db0851f3
+DIST twine-3.8.0.tar.gz 213157 BLAKE2B c7c013a01b0f1f5ec24c76ebfea2c645da07eae0bb816978a37ed95bca4a2193cea627bdddefcd4beaadbe4bd7ee51315b309fbf06555cc75d509bc61578ac7d SHA512 d6ede7241d4825665054811ad657916281426eda6ee88f0e83295b5498876830b6c69284056e409539c792c24ebeb5af2eedf45108261490a72812b9e86e08f2
diff --git a/dev-python/twine/twine-3.8.0.ebuild b/dev-python/twine/twine-3.8.0.ebuild
new file mode 100644
index 000000000000..6f599dd2ec8d
--- /dev/null
+++ b/dev-python/twine/twine-3.8.0.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
+inherit distutils-r1
+
+DESCRIPTION="Collection of utilities for publishing packages on PyPI"
+HOMEPAGE="https://twine.readthedocs.io/ https://github.com/pypa/twine https://pypi.org/project/twine/"
+SRC_URI="https://github.com/pypa/twine/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
+
+RDEPEND="
+	>=dev-python/colorama-0.4.3[${PYTHON_USEDEP}]
+	>=dev-python/importlib_metadata-3.6[${PYTHON_USEDEP}]
+	>=dev-python/keyring-15.1[${PYTHON_USEDEP}]
+	>=dev-python/pkginfo-1.8.1[${PYTHON_USEDEP}]
+	>=dev-python/readme_renderer-21.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.20.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-toolbelt-0.8.0[${PYTHON_USEDEP}]
+	>=dev-python/rfc3986-1.4.0[${PYTHON_USEDEP}]
+	>=dev-python/tqdm-4.14[${PYTHON_USEDEP}]
+	>=dev-python/urllib3-1.26.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? (
+		dev-python/jaraco-envs[${PYTHON_USEDEP}]
+		dev-python/jaraco-functools[${PYTHON_USEDEP}]
+		dev-python/munch[${PYTHON_USEDEP}]
+		dev-python/portend[${PYTHON_USEDEP}]
+		dev-python/pretend[${PYTHON_USEDEP}]
+		dev-python/pypiserver[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# requires internet
+	rm -f tests/test_integration.py || die
+	# pytest-socket dep relevant only to test_integration, and upstream
+	# disables it anyway
+	sed -i -e '/--disable-socket/d' pytest.ini || die
+	sed -i -e '/--cov/d' pytest.ini || die
+
+	distutils-r1_python_prepare_all
+	export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
+}
diff --git a/dev-python/xapp/Manifest b/dev-python/xapp/Manifest
deleted file mode 100644
index df9ec09218ad..000000000000
--- a/dev-python/xapp/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-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
deleted file mode 100644
index 0d618616ba59..000000000000
--- a/dev-python/xapp/metadata.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
-  <email>core@liguros.net</email>
-  <name>Development</name>
- </maintainer>
- 
- <origin>binaryden-overlay</origin>
-</pkgmetadata>
\ No newline at end of file
diff --git a/dev-python/xapp/xapp-2.2.1-r1.ebuild b/dev-python/xapp/xapp-2.2.1-r1.ebuild
deleted file mode 100644
index 9252f6269483..000000000000
--- a/dev-python/xapp/xapp-2.2.1-r1.ebuild
+++ /dev/null
@@ -1,27 +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="Python bindings for x11-libs/xapps"
-HOMEPAGE="https://github.com/linuxmint/python3-xapp"
-SRC_URI="https://github.com/linuxmint/python3-xapp/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=x11-libs/xapps-2.2.0[introspection]
-"
-RDEPEND="
-	${DEPEND}
-	dev-python/psutil[${PYTHON_USEDEP}]
-"
-
-S="${WORKDIR}/python3-xapp-${PV}"