gentoo auto-resync : 21:03:2023 - 12:39:52

35 files changed, 188 insertions, 134 deletions

diff --git a/dev-python/Faker/Faker-18.2.0.ebuild b/dev-python/Faker/Faker-18.2.0.ebuild
new file mode 100644
index 000000000000..f1e5f5fe409a
--- /dev/null
+++ b/dev-python/Faker/Faker-18.2.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYPI_NO_NORMALIZE=1
+PYTHON_COMPAT=( python3_{9..11} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="A Python package that generates fake data for you"
+HOMEPAGE="
+	https://github.com/joke2k/faker/
+	https://pypi.org/project/Faker/
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>=dev-python/python-dateutil-2.4.2[${PYTHON_USEDEP}]
+	!dev-ruby/faker
+"
+BDEPEND="
+	test? (
+		dev-python/freezegun[${PYTHON_USEDEP}]
+		dev-python/pillow[${PYTHON_USEDEP},tiff]
+		dev-python/validators[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/Faker/Manifest b/dev-python/Faker/Manifest
index ae727a11c0e6..74b560bed029 100644
--- a/dev-python/Faker/Manifest
+++ b/dev-python/Faker/Manifest
@@ -1,3 +1,5 @@
 DIST Faker-17.6.0.tar.gz 1654373 BLAKE2B 69a1d3bcd12188f7d9c0af61d57c62489434fc2fb6a4fea3c45a98d7395c3df83926d260672790d3b88f4b6bcf780e5b842e10b7efb500d503159869505bf4b2 SHA512 a879fb7e0c82693d4d3062b32382eb6d1f3c556c7d2e4c28168cba43c560bf17ebb84b94692ba7db738871251990feca8ccbf271c6e08c61847b76b84deb9680
+DIST Faker-18.2.0.tar.gz 1661956 BLAKE2B e8d7f9cc7cb5d5fd8fe9400311a54613557e072d504bd34944cffa777720484ec950854a6f7ddac8193afec560beaee86661a83a80b10de329db038f5a302d13 SHA512 799251ed4cffa0af3159856846f376bd0c0bb0233188cdcf72e7e5fdbb60841a56ca6ccd696c6a79d13f3dfb7a17e95b904c467d49d02eac4d1eeec6c89ef9f1
 EBUILD Faker-17.6.0.ebuild 682 BLAKE2B 6e4f513383d927ae62995083ce32a75635a14844754fcaaa52313a7aaa98118e82f018a82c381a5347a2df0ddf9e7bc68f78438fbd4336b8cd51562bf335b9d8 SHA512 83e54f767935b0a45f0f50b4df871213cf7cd968fd73c9c1502895fe4fe1d0f533fb249c478aa89b78414f8198b6b2d123931c0096e1582fa5e8a76bf3767069
+EBUILD Faker-18.2.0.ebuild 683 BLAKE2B ed6805e59f23a4bc570266b7f6e806d8861a1caedd84cf7eaffff58932fe5347469a303402748e82fcc02734d78356d076dfe1b054bc0b33c6e546e295382b18 SHA512 4ea11d603431b14a105c5b67b56ab168bb6fae6ea40760bbeb53076fdbd8e98452c7f8e53e3657911423f33af76b910c5c4bb10fbf365e9c68a3b5e571f5aa44
 MISC metadata.xml 498 BLAKE2B c9b7885dc7d34f2263068624a6b07ac6f1ec8078cc11abb6137612ba57edffefc48dae2708284aa83ecc941ebb2d3b8a87a143648e404a0683e75bb6c078f4e2 SHA512 0b385bbbfbb026803526e43c6c43965ff75f42d3ab133603708b187686aac29de508856e5e8ae7622a66b99032efa97f95c21625e10d074c858d8aff7446a312
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index 17480fed6592..b394331940b8 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/flask-script/Manifest b/dev-python/flask-script/Manifest
deleted file mode 100644
index f8fbcd972d18..000000000000
--- a/dev-python/flask-script/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX flask-script-2.0.6-flask_script-everywhere.patch 1368 BLAKE2B 0d387cce36afdfb67bb91661df23884a7782d26ec5979121664afc84f48e780b7d1498b6233779980d3fd51f672a7fd5a6e097bef946a8599e189863d2be1ad3 SHA512 9694070e86a47f405d7bdd3e4c37df56e2fcbc86f64adea07d10c4e5be6856a6631eac5af43cd372bf13475b8dc9ab57f263f10dbb62621365fdf17d4e4efb64
-DIST Flask-Script-2.0.6.tar.gz 43146 BLAKE2B 146a65fce432063e67e5b6221a0c2437f2a8df1e2b72a5e14fb382dc51ef3f0755e4d8a0a67831c6c2c61d07acc332e8c87b7c9df3443a9f22aa2eeb580c4086 SHA512 03c51213be8e2b86f1f4450565cf4d7e3d9d7257ac017bd53830be57620d581f43bcfe959ef7b621af722c688c56495229aad3dd9654c8a8a5905db0105275fc
-EBUILD flask-script-2.0.6.ebuild 762 BLAKE2B 34402eed92d219f0ec7e0cdcec878c388720e1ece1e5b55bd32762537962402a547f08f772c3f691685e209006b3c16fe6aee06ccdde5627e3a9c18d139694fe SHA512 c099546f23f290bfca368649ec0a7e47ec0d6f822e866bfe2bc45757745a30ad9f10e572743a8297df0c6b6b4fc6b3725ddb733a7c1d6af3344c49ba6d8dbeaf
-MISC metadata.xml 400 BLAKE2B db7b5774057f1b3369d685ff1df8260e1db30f5d67b4b6de1b3c3f583bc3b76d830c5888e1a2bc5929137b3ac19cd2dd531a75d839337399060eb9227a185094 SHA512 6ab132e0fc3426b8b97527ea546555aee3ddfb21fc31b9521fefbf4074c97c82302054a7353c4a061f10fbd068a5ef76aab892d43b9157742c6c01250e9907cb
diff --git a/dev-python/flask-script/files/flask-script-2.0.6-flask_script-everywhere.patch b/dev-python/flask-script/files/flask-script-2.0.6-flask_script-everywhere.patch
deleted file mode 100644
index 04259c89a420..000000000000
--- a/dev-python/flask-script/files/flask-script-2.0.6-flask_script-everywhere.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From: anthraxx <levente@leventepolyak.net>
-Date: Wed, 6 Sep 2017 12:03:22 +0200
-Subject: [PATCH] using flask_script everywhere instead of flask.ext.script
-
---- a/docs/index.rst
-+++ b/docs/index.rst
-@@ -577,7 +577,7 @@ Then the user can register the sub-manager to their primary Manager (within mana
- 
-     manager = Manager(app)
- 
--    from flask.ext.database import manager as database_manager
-+    from flask_database import manager as database_manager
-     manager.add_command("database", database_manager)
- 
- The commands will then be available::
---- a/tests.py
-+++ b/tests.py
-@@ -5,8 +5,8 @@
- import unittest
- 
- from flask import Flask
--from flask.ext.script._compat import StringIO, text_type
--from flask.ext.script import Command, Manager, Option, prompt, prompt_bool, prompt_choices
-+from flask_script._compat import StringIO, text_type
-+from flask_script import Command, Manager, Option, prompt, prompt_bool, prompt_choices
- 
- from pytest import raises
- 
---- a/flask_script/__init__.py
-+++ b/flask_script/__init__.py
-@@ -12,9 +12,8 @@ from collections import OrderedDict
- import argparse
- 
- from flask import Flask
--from flask._compat import text_type
- 
--from ._compat import iteritems
-+from ._compat import iteritems, text_type
- from .commands import Group, Option, Command, Server, Shell
- from .cli import prompt, prompt_pass, prompt_bool, prompt_choices
- 
diff --git a/dev-python/flask-script/flask-script-2.0.6.ebuild b/dev-python/flask-script/flask-script-2.0.6.ebuild
deleted file mode 100644
index 75cde2804c8f..000000000000
--- a/dev-python/flask-script/flask-script-2.0.6.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{9..10} )
-inherit distutils-r1
-
-MY_PN="Flask-Script"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Flask support for writing external scripts"
-HOMEPAGE="https://flask-script.readthedocs.io/en/latest/
-	https://flask-script.readthedocs.io/en/latest/
-	https://pypi.org/project/Flask-Script/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND=">=dev-python/flask-0.10.1-r1[${PYTHON_USEDEP}]"
-
-PATCHES=( "${FILESDIR}/${P}-flask_script-everywhere.patch" )
-
-distutils_enable_tests pytest
-distutils_enable_sphinx docs
-
-python_test() {
-	epytest tests.py
-}
diff --git a/dev-python/flask-script/metadata.xml b/dev-python/flask-script/metadata.xml
deleted file mode 100644
index cfed05c5f3a6..000000000000
--- a/dev-python/flask-script/metadata.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>python@gentoo.org</email>
-		<name>Python</name>
-	</maintainer>
-	<stabilize-allarches/>
-	<upstream>
-		<remote-id type="pypi">Flask-Script</remote-id>
-		<remote-id type="github">smurfix/flask-script</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/imageio/Manifest b/dev-python/imageio/Manifest
index 02dd449fa6bd..ea2ef1df43d9 100644
--- a/dev-python/imageio/Manifest
+++ b/dev-python/imageio/Manifest
@@ -1,6 +1,8 @@
 AUX imageio-2.22.0-block-download.patch 1211 BLAKE2B c01e3fd7db7463bc11bf331384a21becfc3160d4880a2fd09e47bf0927d97e46787097f50a489b83c2626078b60a0cf8a0d896040981e78c107f1783c8e84c26 SHA512 170261b9fb07ccb7f7a7e058335326df1f72c8d098076bf6ca048a7ca6bac95ddb512b9e41740c385430bc25613249455203addd59931af4e70298e772303964
 DIST imageio-2.26.0.gh.tar.gz 403652 BLAKE2B 2f1948b1cee03ef4fdd71489923a1ea5b0c364fb5f000d79e1d309042184a6bb267a323bd19fce85bf47857245eb4be5283f0b3df65857d7cac57c24930ea409 SHA512 6ad8ce0395033571c0d918dbe03ffeab0e43b29d402bc91a229d3ffd689eae3d01aa09dec386d03fe028f6138887883cfda4e0a769f523ba9f6c3e3041a0cb7f
+DIST imageio-2.26.1.gh.tar.gz 404916 BLAKE2B 683ffb38c089e691c9647785f28fed616e8b60795a05fa29a684d30fff35e6021888b4f4ea75d8035dbfc3c3f5e84c241eefdf7d4a08555bdf78de7433a1fc11 SHA512 90976423d967b7cd0874fcf6ed3c7d51db6fea450859a1a1a302aabb7d971b65cceec0fdaf8e23f99a3fcceaea827c090e01b4b7ad8e7813e8db33150c14ba29
 DIST imageio-chelsea.png 221294 BLAKE2B 58537d7a1678fa5be4cc899e5bacd925bfc180eb4ae691330a53749a49ff544e979609b529ed27e5c1fc9efe4bc050ca1ce49b777f4016fb1d66affd926ef9d3 SHA512 48470cdb843eed4dfa6673811c09c5aac9869ee23dd36be0c6b653d9f108d61d21b148c2a4435aaa6604887ba030e5bbc5e35d378da876366445dfc2d0ba4e27
 DIST imageio-cockatoo.mp4 728751 BLAKE2B 45b22cd517c1cb7c0cd12f8865facaca6a847047aea716e49633cf2b1dc13826f94787c8a8f9dd5f48c6a896f5d37794c0058da1bde9e1469f196916476dbfa2 SHA512 e9cb7c25de8019c59ba4090cf10ab29f2b5d62ada37a877081ca07d2ecfe010036222ae843b41bbcc843130d97fa5e14421de252639e9481df1d1c27b19add49
 EBUILD imageio-2.26.0.ebuild 2071 BLAKE2B 10ff98b2b56ca3e3ecc2b34a0196efb3512e7e17b7b79e3abdda530552fc790e32ac033b07d9875acf85578a35eb22f67de6c5304db850fdf1eb549312b75d6f SHA512 a381707af28eb925fb71c51bd88233039cd9abd7fd347bec4ecd64542a4c4ddb8628d1a5aec89aaf3f4f01ef12f0b77229a1f0bc9e0a4de35a646fddc77379e7
+EBUILD imageio-2.26.1.ebuild 2071 BLAKE2B 10ff98b2b56ca3e3ecc2b34a0196efb3512e7e17b7b79e3abdda530552fc790e32ac033b07d9875acf85578a35eb22f67de6c5304db850fdf1eb549312b75d6f SHA512 a381707af28eb925fb71c51bd88233039cd9abd7fd347bec4ecd64542a4c4ddb8628d1a5aec89aaf3f4f01ef12f0b77229a1f0bc9e0a4de35a646fddc77379e7
 MISC metadata.xml 702 BLAKE2B 646c6a83e6d8e345fddb9cbc42a83c1193b9590937cd652e293d03e6e9d4b240a69e6e86399f5edc9ef05f96d1d4c3713dfa65f8b13984f4483b2ce76a239429 SHA512 5e1e4db52fed55ab837c70ddb9ec81a7ce0b062064e2d33cb5771cd81d50a1a2164e446531c32a405bb9319acd736141765dcd00e36d6db770434a656ad925e1
diff --git a/dev-python/imageio/imageio-2.26.1.ebuild b/dev-python/imageio/imageio-2.26.1.ebuild
new file mode 100644
index 000000000000..30875e33909b
--- /dev/null
+++ b/dev-python/imageio/imageio-2.26.1.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..11} )
+
+inherit distutils-r1
+
+BIN_COMMIT=224074bca448815e421a59266864c23041531a42
+DESCRIPTION="Python library for reading and writing image data"
+HOMEPAGE="
+	https://imageio.readthedocs.io/en/stable/
+	https://github.com/imageio/imageio/
+	https://pypi.org/project/imageio/
+"
+SRC_URI="
+	https://github.com/imageio/imageio/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+	test? (
+		https://github.com/imageio/imageio-binaries/raw/${BIN_COMMIT}/images/chelsea.png
+			-> ${PN}-chelsea.png
+		https://github.com/imageio/imageio-binaries/raw/${BIN_COMMIT}/images/cockatoo.mp4
+			-> ${PN}-cockatoo.mp4
+	)
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+# over 50% of tests rely on Internet
+PROPERTIES="test_network"
+RESTRICT="test"
+
+RDEPEND="
+	>=dev-python/numpy-1.20.0[${PYTHON_USEDEP}]
+	>=dev-python/pillow-8.3.2[${PYTHON_USEDEP}]
+	media-libs/freeimage
+"
+# requests for fsspec[github]
+BDEPEND="
+	test? (
+		dev-python/fsspec[${PYTHON_USEDEP}]
+		dev-python/imageio-ffmpeg[${PYTHON_USEDEP}]
+		dev-python/psutil[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+		dev-python/tifffile[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	local PATCHES=(
+		# block silently downloading vulnerable libraries from the Internet
+		"${FILESDIR}"/imageio-2.22.0-block-download.patch
+	)
+
+	if use test; then
+		mkdir -p "${HOME}"/.imageio/images || die
+		local i
+		for i in chelsea.png cockatoo.mp4; do
+			cp "${DISTDIR}/${PN}-${i}" "${HOME}/.imageio/images/${i}" || die
+		done
+	fi
+
+	distutils-r1_src_prepare
+}
+
+EPYTEST_DESELECT=(
+	# Fails because of system installed freeimage
+	tests/test_core.py::test_findlib2
+	# Tries to download ffmpeg binary ?!
+	tests/test_ffmpeg.py::test_get_exe_installed
+	# blocked by our patch
+	tests/test_core.py::test_fetching
+	tests/test_core.py::test_request
+	# known broken
+	# https://github.com/imageio/imageio/issues/890
+	tests/test_freeimage.py::test_exr_write
+)
diff --git a/dev-python/pychromecast/Manifest b/dev-python/pychromecast/Manifest
index 528e65c8f7fb..81a953ef8dcf 100644
--- a/dev-python/pychromecast/Manifest
+++ b/dev-python/pychromecast/Manifest
@@ -1,3 +1,3 @@
 DIST PyChromecast-13.0.4.tar.gz 51996 BLAKE2B 11dad948443e9e5957de6b22cf6c1d33d19030d53cecddd9be5595dc82bb108e4746c382bae5c6d22d5219bcb90ed5bed7ca94c714ec7bbe7ad1330a1ee3cf2f SHA512 2f9bd925e452448a387a04babc0d71a35fc83edd30142cdd129479b5b20cf7aa9691a8d46f45edf5f12fd6f3052564c2956dd241eaf1a1c468b8399b065286ec
-EBUILD pychromecast-13.0.4.ebuild 627 BLAKE2B dd784277ae6be89e87b8dc5cfcf9484e67fc554782ea0d49b203188466bf7791518e9d2a7e36450964d12a3fcb3f4c31203c0a67c7bdcee6b214b6e383f54170 SHA512 5ffed4f86b979d89088b9e1c751bff2c5bb402058bcad529d5cc848015131993dd37d41c86627fa944b210d950884e5663ae4da44355e4a3614e2c088a6bcffe
+EBUILD pychromecast-13.0.4.ebuild 620 BLAKE2B aa9be36c5d86a0ed29b9a69cfe7413aad43a2f1d62c4ffa5c000f7392adc95956fb16b743699f1fe307157e6b5250e847b310819584779538515ef350bd221f7 SHA512 5ef0898253e0e3dea9adcadcca287728ac071bf7cbd0c07376561a55593476ae536034c6e7bf545bce12775b1cc6791c90acb2c0c58b9934e0b28634310f0a44
 MISC metadata.xml 426 BLAKE2B c6ba55f1c61ac177a8cc1aaa78831d0d848bdfffc787197f1e24944329280f7c93be5b26ea2d4cd65a07b9ec0f192ac23f6a3a2470b5d707fc9f3063cb8bd869 SHA512 968632d3dc5e9a9dfaec80485b52124efeae5fb315f56a53d5168f3f51f4c4d6d7b4b74281b67fb6a41bafc19decf2afe73d42858a10a7fed4b49b0624cd54ca
diff --git a/dev-python/pychromecast/pychromecast-13.0.4.ebuild b/dev-python/pychromecast/pychromecast-13.0.4.ebuild
index 60fbf00b21ea..bd0d54534c96 100644
--- a/dev-python/pychromecast/pychromecast-13.0.4.ebuild
+++ b/dev-python/pychromecast/pychromecast-13.0.4.ebuild
@@ -3,14 +3,18 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{9..10} )
 DISTUTILS_USE_PEP517=setuptools
-inherit distutils-r1
+PYPI_NO_NORMALIZE=1
+PYPI_PN=PyChromecast
+PYTHON_COMPAT=( python3_{9..10} )
+
+inherit distutils-r1 pypi
 
 DESCRIPTION="Python module to talk to Google Chromecast"
-HOMEPAGE="https://github.com/home-assistant-libs/pychromecast"
-S="${WORKDIR}/PyChromecast-${PV}"
-SRC_URI="mirror://pypi/P/PyChromecast/PyChromecast-${PV}.tar.gz"
+HOMEPAGE="
+	https://github.com/home-assistant-libs/pychromecast/
+	https://pypi.org/project/PyChromecast/
+"
 
 LICENSE="MIT"
 SLOT="0"
@@ -19,4 +23,5 @@ KEYWORDS="amd64 x86"
 RDEPEND="
 	>=dev-python/casttube-0.2.0[${PYTHON_USEDEP}]
 	>=dev-python/protobuf-python-3.19.1[${PYTHON_USEDEP}]
-	>=dev-python/zeroconf-0.25.1[${PYTHON_USEDEP}]"
+	>=dev-python/zeroconf-0.25.1[${PYTHON_USEDEP}]
+"
diff --git a/dev-python/sh/Manifest b/dev-python/sh/Manifest
index 66b852f2d32a..628aa2d3029b 100644
--- a/dev-python/sh/Manifest
+++ b/dev-python/sh/Manifest
@@ -1,3 +1,5 @@
 DIST sh-2.0.2.tar.gz 345351 BLAKE2B 7b1cd213f097b0893b96fbe7c5dd96a3716b6e8fcac5da49a091bbeb4f75ea2c9f7a23237d91e1a6df9fe2c1ba8ea778dad505981cfcc1ef1893404cdb030500 SHA512 dc02a69366d1140112ccf26093bbfd7d719671caf5dd6e093a5f7ef9de3428b44e9aa539e857ef72981a688cb4b40eb47aa2060c18e6074b614a1a5c2c430d83
+DIST sh-2.0.3.tar.gz 345365 BLAKE2B f818f84c71992fcfb653b757872da89a0007a873c639b3b0438a794bdfbd455e2ac22ef035b657b35da23e6890761ce7f161a02e3e0f847ee5209cec5fe911a4 SHA512 4d3bc20b2175b2507f0081af0b83faaf5eb97d131a24abaafb333a56e45d2cdb9167c3568bb40c6a6ea79b9836e335cb0d5bec2d036ce619eb312916d69fa72d
 EBUILD sh-2.0.2.ebuild 504 BLAKE2B d7712a8b9bde33e09ec603c0e93e44f1c49edd1e64a6f8708417f0d89e8b31cf5c7e9455904e7d5f7e4e6236c76c13adf83eec60f350225c303136abe894089b SHA512 d5df52a84734c5c2fec67ab60c8fe19efce8ca33354817533f2431f8885ed3a8e8bdbfca89062c7d1fed5f13f18e25c96b6edc06fb76ce11bbb55a723d3ee063
+EBUILD sh-2.0.3.ebuild 512 BLAKE2B 84bde6535d158a58cc4c10c6d02e11e806162b50cd211c59f593e40fff621e5efaacd2d75c23094daeca91c52fbddd3cd1feb1bc5214e25367b683bc80acb416 SHA512 893f407f6b5b856bb55d3f880ed2f592ea8ab852118c2584b49dd88db9013ca62c1418817231f35ebd7b02556ad38a7515cc710f2962be4ca532686220caef3b
 MISC metadata.xml 803 BLAKE2B 086d1696b7c03a1a4ac9d89164b507fd7caeed3163c15b4263772399641a3f82ca364a277fef6ede78bb3d8776ec7181f316ee8070ac5bb9290e7233f69514b0 SHA512 bceee86f0df9e0042815b9d24dd75659c7548f345dee2e1e1f586cf28f605d59a7ffe759f2cdbc8da6f6fb620b7f66b1763992b35e943ed47c3e1b739eaa3a2c
diff --git a/dev-python/sh/sh-2.0.3.ebuild b/dev-python/sh/sh-2.0.3.ebuild
new file mode 100644
index 000000000000..e05aec059c1e
--- /dev/null
+++ b/dev-python/sh/sh-2.0.3.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=poetry
+PYTHON_COMPAT=( pypy3 python3_{9..11} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Python subprocess interface"
+HOMEPAGE="
+	https://github.com/amoffat/sh/
+	https://pypi.org/project/sh/
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+distutils_enable_tests unittest
diff --git a/dev-python/zc-lockfile/Manifest b/dev-python/zc-lockfile/Manifest
index db69f8e155ae..99d1329eaa35 100644
--- a/dev-python/zc-lockfile/Manifest
+++ b/dev-python/zc-lockfile/Manifest
@@ -3,5 +3,5 @@ DIST zc.lockfile-3.0.post1.tar.gz 10190 BLAKE2B 80f732b758581b25f7d45c843b73b359
 DIST zc.lockfile-3.0.tar.gz 10043 BLAKE2B 9435f9999f976e6bfd6302b3d24960e21992f54755c6dadd9f0392254ff89b474039d7502c81c9667b4bb741300ced33bca35634f8990840809692cb025cb7f5 SHA512 65662d03933b0e295d69971a74a1d1ddf67086287bd98752d6d23d793130b0c612413c0dba365f7fa2213a5ef0981fc20bccbde304dc36a4092ad1f702ee9429
 EBUILD zc-lockfile-2.0-r1.ebuild 1098 BLAKE2B ecb9cb1eb75e0241c6a7b441c58757d01e25072943a12e66174d75879bda410b4190d287e5b44d55cbfcc9f94f989e6cb4b77a4657707e506f4fa4b9129dae90 SHA512 37a3eab995ae4cbb5061ca3d5decbf152815bf878c4e54c515a4b2d94d07a6f425c4ec2660b77c387a2fd7a07433d98a2d1bf500cce83c32cea7bdeb3ab46f91
 EBUILD zc-lockfile-3.0.ebuild 1086 BLAKE2B b71b61031d645a05490b81aaee609fb70504cfeb7acb9b8ce6f863e00b3cbb4f1b29fc60ea2b2dbd66382e6c74226753836bf46d54add5c94a170b22d3bbaf65 SHA512 d070f29fe9cb87feb50bcc850969805733da16cc8e788f9d0b912a356f062032fc7d5ab9893c93caafadbf59009d4a70a5693312cd45c41f77df0a81649c6071
-EBUILD zc-lockfile-3.0_p1.ebuild 1102 BLAKE2B fc5d06780ea2cd3acbb291bbc2dbaf5c9f91814992abff1e3391c70bd1a212a61bdcd824170d4519d7cfd01dbbe6a1860ed9922e0e1f663545149481d14578f2 SHA512 9fe2c34c3638214ea4550d2f70a80f8549a3c3f90a86d6d60c081c7d6cd268d0213bfdd8b387c1f241a370da8fad34992890cf195b5838035a1f67b85eec5ae1
+EBUILD zc-lockfile-3.0_p1.ebuild 1047 BLAKE2B a80e380d5792ea1ffbdf60df85b5c3cd688581222771ae21e44db4081b9b0030b57f0d69075ba98513593c04baf5791d0a9b3d0a53e32bd3b5932c66f8ed2c4e SHA512 5553385f3abda3ecdd0ffebcac7930381ac65767d1fde41cbfd2e932a31c974c82be042f087ca452afc8047b90e3d4c12c40dfb45ea4be4191329ef1d56cd62e
 MISC metadata.xml 490 BLAKE2B 83ea2053e029d9373261556a5b77af2ccab69294cbc6465029365293a893eee3ac7ae9e3b5b282e46ff27a6aa859c74a76f401e52b3dd62f6d4646c1c8bd4c2b SHA512 98bbbb79c61aa6f3b725676a77381b505d7738e40dd64a590b44f10d9496c346edb64595b39cb586cf2fe8f7d5cc96fb3b3410ec023d648cf96d92ce30130636
diff --git a/dev-python/zc-lockfile/zc-lockfile-3.0_p1.ebuild b/dev-python/zc-lockfile/zc-lockfile-3.0_p1.ebuild
index db027ffcd598..7a435eac5dfe 100644
--- a/dev-python/zc-lockfile/zc-lockfile-3.0_p1.ebuild
+++ b/dev-python/zc-lockfile/zc-lockfile-3.0_p1.ebuild
@@ -4,6 +4,8 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
+PYPI_NO_NORMALIZE=1
+PYPI_PN=${PN/-/.}
 PYTHON_COMPAT=( python3_{9..11} pypy3 )
 
 inherit distutils-r1 pypi
@@ -13,8 +15,6 @@ HOMEPAGE="
 	https://github.com/zopefoundation/zc.lockfile/
 	https://pypi.org/project/zc.lockfile/
 "
-SRC_URI="$(pypi_sdist_url --no-normalize "${PN/-/.}")"
-S=${WORKDIR}/${PN/-/.}-${PV/_p/.post}
 
 LICENSE="ZPL"
 SLOT="0"
diff --git a/dev-python/zope-component/Manifest b/dev-python/zope-component/Manifest
index 0b71600b20c9..38e745013d6b 100644
--- a/dev-python/zope-component/Manifest
+++ b/dev-python/zope-component/Manifest
@@ -1,3 +1,3 @@
 DIST zope.component-5.1.0.tar.gz 90238 BLAKE2B 411f1704f3e4c9a716508595ef75f1908b757f776b0ebe7677e38e678eb13e2cd5579441b94082e504f2dbc05c41e49fe0e2d1dcad406baafbc6b0733cb85008 SHA512 6695365b0313a24184d0d3b6e10ce0eda108e3e832c97709a4285bf1e76289a71223611d930a4cc3d3b5c2c766a5cfddb3cf616a64848eeccc6f3ac09316f3d1
-EBUILD zope-component-5.1.0.ebuild 1235 BLAKE2B 6826ab839f62cfe99ab717ac117aea44acff58ccc4b4943f60f49942ef3d9e23e6f4db2c54867edd37a9356a8b98bcdb773c5155837d1a7a94475104b918bfd4 SHA512 e2a0b6f56bcbc9b005f99dd41e5817a35a45368f80973bf27d6874cf628c352bf70c8742bf73ce181c22c0aefb068204a208223002519a0c90d91c4da4c2a07b
+EBUILD zope-component-5.1.0.ebuild 1196 BLAKE2B 306104ef7da0d49a691d5ab9d804d9e118622278dc83a25e0662e0d83d6ad55b470959618b95ac7e14ae281931f931ee58a65ed36a94f54d756e8eec4dc9a742 SHA512 cf166634a3f9de0fdf0defb96a967c35d791571309370e49e74c59ae3e4f70f325fe55e2dd6bf6c2c91a0ae055efcaf3cf0149b8c9c5ff5ebd5c1429b01164ef
 MISC metadata.xml 411 BLAKE2B a02a8232c9878cc8c569bf818b81e1b0c2d3cd5e18386f14d8fa228a12c9745a68644e362189ccca52673ca6071f196ebd4603d6f12d6de7839e732f63e4d2ef SHA512 ce4f88684c8c16affe79487c03e5ff4d06fa26c27dc6dc4ffebae514bf498b1f794fbe86f038ea342f08e6ec62eb3722ed118134bca27b0110ef43b155c4cadf
diff --git a/dev-python/zope-component/zope-component-5.1.0.ebuild b/dev-python/zope-component/zope-component-5.1.0.ebuild
index 62c89b36eddd..ce60a9d8260d 100644
--- a/dev-python/zope-component/zope-component-5.1.0.ebuild
+++ b/dev-python/zope-component/zope-component-5.1.0.ebuild
@@ -4,6 +4,8 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
+PYPI_NO_NORMALIZE=1
+PYPI_PN=${PN/-/.}
 PYTHON_COMPAT=( python3_{9..11} )
 
 inherit distutils-r1 pypi
@@ -13,8 +15,6 @@ HOMEPAGE="
 	https://pypi.org/project/zope.component/
 	https://github.com/zopefoundation/zope.component/
 "
-SRC_URI="$(pypi_sdist_url --no-normalize "${PN/-/.}")"
-S=${WORKDIR}/${P/-/.}
 
 LICENSE="ZPL"
 SLOT="0"
diff --git a/dev-python/zope-configuration/Manifest b/dev-python/zope-configuration/Manifest
index 853a5ab06c17..509b53d41dfb 100644
--- a/dev-python/zope-configuration/Manifest
+++ b/dev-python/zope-configuration/Manifest
@@ -1,3 +1,3 @@
 DIST zope.configuration-4.4.1.tar.gz 83825 BLAKE2B 9cf55417710c364611f0548cd1249dfb61d16c4f1a5f8f3918b2f9f38ba9904698317b922dccf736ab83f2b9cdd2bb4f7ca7330cd311d00e8d48afbd29f9cd86 SHA512 61e3e5cc6220c3ef86881d49c09b208d12491a5d7f5d82810ff1713f68ff1657dfb505b511e78e86b39d204c4ff8bc687695ad8b2ed816b457b52f913c70669b
-EBUILD zope-configuration-4.4.1-r2.ebuild 1234 BLAKE2B 811226b7fca54d9d19287a9e468f433b496fd47001bb22bede0ca215f8c055c39e54579871b86fa83f9a87f35509be9cb4cf24da5f1d49a9d702d12e35979836 SHA512 1025ad35ed0f83cdc5742606a7eca8a91da02c2d359ca3f59f6fa787e3c76e9c04f757369db5ac5547e843231c8bb9ecc2c9002b401c898d2b0418af9f74c748
+EBUILD zope-configuration-4.4.1-r2.ebuild 1195 BLAKE2B c8799f03a4b89adecb1242121329b939c20593406129c0bb8f605dec92bff474df4af5597c5a91403caba402ab333830f9d4113d0b2afdcd24f9619b452a850c SHA512 b579c624259c2078aad1a805b8f46fbddee5a732b18ae390de03f713f2b4e5c0fab5b2a978c90681080abcc718bb188ad44f2e93922768197f2c96dd4aca8467
 MISC metadata.xml 671 BLAKE2B ebe65df9424a7f5e93a1095224dcbed784cdcef2f463dd9ee6e9580883ff93ea11e72463a897d5a1756c7f5c4f6c9fff562ba5d30dd8de8913aec58547ce3280 SHA512 e72a1d422e9c322fd92bd53f4bd8a5d9f0e5505fdb18dec30b9605d8ef5b943c1893f0fa78398fb8610fd7f3b9bcee5a602a3ce1cef8821239cd9681a340dbeb
diff --git a/dev-python/zope-configuration/zope-configuration-4.4.1-r2.ebuild b/dev-python/zope-configuration/zope-configuration-4.4.1-r2.ebuild
index 429f753d9587..8da5c016419b 100644
--- a/dev-python/zope-configuration/zope-configuration-4.4.1-r2.ebuild
+++ b/dev-python/zope-configuration/zope-configuration-4.4.1-r2.ebuild
@@ -4,6 +4,8 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
+PYPI_NO_NORMALIZE=1
+PYPI_PN=${PN/-/.}
 PYTHON_COMPAT=( python3_{9..11} )
 
 inherit distutils-r1 pypi
@@ -14,8 +16,6 @@ HOMEPAGE="
 	https://github.com/zopefoundation/zope.configuration/
 	https://zopeconfiguration.readthedocs.io/en/latest/
 "
-SRC_URI="$(pypi_sdist_url --no-normalize "${PN/-/.}")"
-S=${WORKDIR}/${P/-/.}
 
 LICENSE="ZPL"
 SLOT="0"
diff --git a/dev-python/zope-deprecation/Manifest b/dev-python/zope-deprecation/Manifest
index a353024e216e..085c64b57278 100644
--- a/dev-python/zope-deprecation/Manifest
+++ b/dev-python/zope-deprecation/Manifest
@@ -1,3 +1,3 @@
 DIST zope.deprecation-4.4.0.tar.gz 24737 BLAKE2B 993959f47e7808ad9d024d5df9d141cdbce3a1a3c281acc0d90bdb20747743936411714b52a29fcac6968cea50d5ab54820954f74c3f59081ce98f097715b9a3 SHA512 62371dc45fad6715f24cdcac1d25b559ed5248da774b5ecd215fb4d0b6fc0ab655bfb9e0fbceda964e8ffb7d70536e43f8fcf09d9f2742904717a6473869fa4a
-EBUILD zope-deprecation-4.4.0-r2.ebuild 910 BLAKE2B 89ada9aad45b04add2b75fa43f42aec8bf8c7752326928b9bad7089e1f3fd6ec48da473354cde8a8a967d515d803c1d36ace6ae299d100ee3018a5b6ab39392e SHA512 1895a90b35cd8e52e9f3af50651b02a33970da578d2113caf0639ad41cca6a4a62151640881260bc88dbdd190f0f3fa7bd950e79ca6ddba9a390f96e7c136499
+EBUILD zope-deprecation-4.4.0-r2.ebuild 871 BLAKE2B 69c3a101d2aa0c9fea50c1f7ee546efae55b4146a10dbacc79b3db5089e7790f90ec414c9ccd236973e59de875d2819775b416c04f73ea15fcb8e326506b6208 SHA512 daac67805718173b1202100ecde201af282541a8bbff82367697c26a4ecaaaae32397c33912634226b4a18a5c89f5f82257b999461fdd05fe8bcba304b60dfb1
 MISC metadata.xml 393 BLAKE2B 3a9283473a2a27feff409049cf8efa86ccb89585e74d73afd0bc2ec21f4b4801b2e331ade960885a7d23c50bea831b91b1a6a232687e005614bdb5e24d371919 SHA512 a196fce434c1df3bf4184c115425f698d15f8aee6eeabba64a2277247f6e731c87a2411702d415f127a1237ea2de0a2a25895b09e989d7b38a68816132b6131e
diff --git a/dev-python/zope-deprecation/zope-deprecation-4.4.0-r2.ebuild b/dev-python/zope-deprecation/zope-deprecation-4.4.0-r2.ebuild
index 5204ed4ef0c0..65881298bae8 100644
--- a/dev-python/zope-deprecation/zope-deprecation-4.4.0-r2.ebuild
+++ b/dev-python/zope-deprecation/zope-deprecation-4.4.0-r2.ebuild
@@ -4,6 +4,8 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
+PYPI_NO_NORMALIZE=1
+PYPI_PN=${PN/-/.}
 PYTHON_COMPAT=( python3_{9..11} pypy3 )
 
 inherit distutils-r1 pypi
@@ -13,8 +15,6 @@ HOMEPAGE="
 	https://pypi.org/project/zope.deprecation/
 	https://github.com/zopefoundation/zope.deprecation/
 "
-SRC_URI="$(pypi_sdist_url --no-normalize "${PN/-/.}")"
-S=${WORKDIR}/${P/-/.}
 
 LICENSE="ZPL"
 SLOT="0"
diff --git a/dev-python/zope-event/Manifest b/dev-python/zope-event/Manifest
index 34e1c0be4eef..21d72bbe437a 100644
--- a/dev-python/zope-event/Manifest
+++ b/dev-python/zope-event/Manifest
@@ -1,3 +1,3 @@
 DIST zope.event-4.6.tar.gz 17430 BLAKE2B ca0706390a9dc32fa3d855014b94094a1008b1f7d82a325aab6008ca116c5267c8d0def244e25adf4164abcc308367a5916358665bb16fc8a0a24eb40586b30e SHA512 0042ef679ba95f1306d11fa23c0b48c59b018c8630cefb2e245ca77f4979b314d338cf1f6d2b12376d59c0eee172180d217965d54676504530a8af0c6c128547
-EBUILD zope-event-4.6.ebuild 1111 BLAKE2B da041f9c63b7bfc29a18026dce8c9d6b4629fa6cf743e8c56d52601ec0da4baea6abea2c07cbd65eeab3a20f96f387fa404ee8bf6d62fb7a36ba60eb483ca084 SHA512 3ae5b33c058ab305f8b343a6f1b9c54c9260113dc811f5a7930f0736fd5b28bf58c7982eaa39d331dcff9cb7f9925c08021ed17d9c6c4648e81e551bfd627a57
+EBUILD zope-event-4.6.ebuild 1072 BLAKE2B bd6663e63111ac31f33d0c9963eec8045a13a92fcee8a0de8538450cdd77c6efbbf6cdc170a6da2ed29736ab7737797d6570b71e81ab8ccdfa7cc9260ced892b SHA512 1dc526218691ae3975a83eb1ce76e997b15e417d3f2d0507caf230ac6bd25ba08d4a0bd2dce0b0438683c36613a967e0093124a5881b9de28e1b696591234391
 MISC metadata.xml 403 BLAKE2B 37821470ec3195c00fca52ec6b7bd13a0bf433746a450b36e6b572da978db6faf908da2b8dd83d2411f24da8a58d65f8cb2e7e75960cf547ba2e9e394e5fcb90 SHA512 8d21846b80d0c0f153103ec237184cd05db306286ffc1a6ed495b90a52737a2346777c4b0713339244f177e89e18f6a051a507a8a7eda2c514c1b7896d7aedb0
diff --git a/dev-python/zope-event/zope-event-4.6.ebuild b/dev-python/zope-event/zope-event-4.6.ebuild
index 18e2eec4af9a..3f9089dc2625 100644
--- a/dev-python/zope-event/zope-event-4.6.ebuild
+++ b/dev-python/zope-event/zope-event-4.6.ebuild
@@ -4,6 +4,8 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
+PYPI_NO_NORMALIZE=1
+PYPI_PN=${PN/-/.}
 PYTHON_COMPAT=( python3_{9..11} pypy3 )
 
 inherit distutils-r1 pypi
@@ -13,8 +15,6 @@ HOMEPAGE="
 	https://pypi.org/project/zope.event/
 	https://github.com/zopefoundation/zope.event/
 "
-SRC_URI="$(pypi_sdist_url --no-normalize "${PN/-/.}")"
-S=${WORKDIR}/${P/-/.}
 
 LICENSE="ZPL"
 SLOT="0"
diff --git a/dev-python/zope-exceptions/Manifest b/dev-python/zope-exceptions/Manifest
index 503da4eeac5e..044e6b06de59 100644
--- a/dev-python/zope-exceptions/Manifest
+++ b/dev-python/zope-exceptions/Manifest
@@ -1,3 +1,3 @@
 DIST zope.exceptions-4.6.tar.gz 30876 BLAKE2B 9cc9a040269aa2f813018670e3692c9897fbea3a346b37e72fc54e72fb33dbaf0f14c192a76a7c40f57674caee4e17e86aec5f1d60e1c0e6a801d859d9629189 SHA512 d28a4434b27f6611040b290dcece26c1880982853092c89d5a8d74093cb9339a62834d7c3949d5ea28c4d3fc01c6f36180df22031cded6e4c963acfff65c2ec4
-EBUILD zope-exceptions-4.6.ebuild 987 BLAKE2B eceb00072670011e9b69c02cfdaaaaead08ad308548da4b8d3a4b497dfaa4670ef23c98dd0977e52ea759b67c6cfd044075f00f83c470bd91c4dffb5fce65967 SHA512 3aaa3d1b6835c46ea5ad8053e06ab7a2094096bd9877da227a03494f3767fb37b52baa602f73882f7a58953422b11bad490e5501298d3916af5077f79f5e4960
+EBUILD zope-exceptions-4.6.ebuild 948 BLAKE2B e4bf728dbe6c83fd2a13b18ee88a2e4d8414a1efdb7867a7c57dfc1d8e53d92f4b72d34bf3b33a7e6a4c4e999c352b1d7c936e29e3e1c170f9239cb48e0b5657 SHA512 4a846dd1dd609ac76f3529d4d8c3dfc2877d6e6b961960a4c8e16d1c7c241844425f07d368a5b30cf3117bd73a8309b90b5040497e4338332c13f90547234b80
 MISC metadata.xml 413 BLAKE2B 3bed6e3e8732f8e04efffe7ea279eaedbfef2fa2d011f1881fdfa814406b0ed5e5a926eeb1a0e66858c1f0524d5c1d1948313c50c53d9fce6cc4596ddea9f87f SHA512 ec4b63a6791605b6c66649026a10d0bc445849b801e9e6350c1bb06b7a244c86aa558830ba39dc1a3d35b3dc2d650d1a52cbe7f84c912f5f7711fe6ec6bf55c4
diff --git a/dev-python/zope-exceptions/zope-exceptions-4.6.ebuild b/dev-python/zope-exceptions/zope-exceptions-4.6.ebuild
index 55d8d703c531..dfe63480f383 100644
--- a/dev-python/zope-exceptions/zope-exceptions-4.6.ebuild
+++ b/dev-python/zope-exceptions/zope-exceptions-4.6.ebuild
@@ -4,6 +4,8 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
+PYPI_NO_NORMALIZE=1
+PYPI_PN=${PN/-/.}
 PYTHON_COMPAT=( python3_{9..11} pypy3 )
 
 inherit distutils-r1 pypi
@@ -13,8 +15,6 @@ HOMEPAGE="
 	https://pypi.org/project/zope.exceptions/
 	https://github.com/zopefoundation/zope.exceptions/
 "
-SRC_URI="$(pypi_sdist_url --no-normalize "${PN/-/.}")"
-S=${WORKDIR}/${P/-/.}
 
 LICENSE="ZPL"
 SLOT="0"
diff --git a/dev-python/zope-hookable/Manifest b/dev-python/zope-hookable/Manifest
index 35413c3a42f6..3f8880714a13 100644
--- a/dev-python/zope-hookable/Manifest
+++ b/dev-python/zope-hookable/Manifest
@@ -1,3 +1,3 @@
 DIST zope.hookable-5.4.tar.gz 25390 BLAKE2B 6421e21d03cc4f7ab55c327b2b07d26e8873567d8730382bdc51cff8131e452c72b8a8accbda5698b7b63006c923823f1689800d7145601dab0af66def42c705 SHA512 aaa1c15927b19c6785de31171d7856b3e60755965538f923b26bba7048e6816749587b55a4dbbe555822021fc77d8ffd2705c4bbcf79016f4bbdc5c75c8ffdad
-EBUILD zope-hookable-5.4.ebuild 1042 BLAKE2B 5af435cd01ff176ee03b5b060e2741053a4526648cec3c4161e77acdd1363fc5415eaf4d0788a44c8027d59ee14cf44ed034eda56125bc598ccfcb2ab72dd484 SHA512 aea0a921e1252386c49a16eb092f030fe14955cd4caff7d5ce6aa68caca020e26f8ccd59e2c0fd9913f0aae5ca98b6afa65f432e919be87a1bbeef7fd9bfeb68
+EBUILD zope-hookable-5.4.ebuild 901 BLAKE2B dd86dda7c695096707f37a9737ae99efa25aef95ae3af480324786e7abdb3c74f3c48b6a35970437ddef3da74e22f9ded23abda0b3033fe3e997b82bae9ec461 SHA512 af83521476e3b4216f73565aab605d3782e1ca3c831d42fff4559e5e5e57e738b19fd6f0c5425b91771ea635ee296cacb530cb8b5a1c91b9db4cfabbcfdc0e5e
 MISC metadata.xml 363 BLAKE2B 292afad5ddaa2ae9ea128a842934b751d16d84aebd617a9e5f6c2165245137f11089670fc78791ce46ccb260c5acbf0527030889d709725f6f89532f3972c0c2 SHA512 40afd7e868b05d352bc5f268d056f3550e924e22b07b1f0e41afd25429017cb28fd5b6caf565df04bfcecf5cc1c183d12a122a906affd813542ef32cbbc230a3
diff --git a/dev-python/zope-hookable/zope-hookable-5.4.ebuild b/dev-python/zope-hookable/zope-hookable-5.4.ebuild
index 79b926d6e252..98c7d3214033 100644
--- a/dev-python/zope-hookable/zope-hookable-5.4.ebuild
+++ b/dev-python/zope-hookable/zope-hookable-5.4.ebuild
@@ -4,6 +4,8 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
+PYPI_NO_NORMALIZE=1
+PYPI_PN=${PN/-/.}
 PYTHON_COMPAT=( python3_{9..11} )
 
 inherit distutils-r1 pypi
@@ -13,12 +15,6 @@ HOMEPAGE="
 	https://pypi.org/project/zope.hookable/
 	https://github.com/zopefoundation/zope.hookable/
 "
-SRC_URI="
-	https://github.com/zopefoundation/zope.hookable/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-SRC_URI="$(pypi_sdist_url --no-normalize "${PN/-/.}")"
-S=${WORKDIR}/${P/-/.}
 
 LICENSE="ZPL"
 SLOT="0"
diff --git a/dev-python/zope-i18nmessageid/Manifest b/dev-python/zope-i18nmessageid/Manifest
index d6fa5d5b159c..4efe4b3b2046 100644
--- a/dev-python/zope-i18nmessageid/Manifest
+++ b/dev-python/zope-i18nmessageid/Manifest
@@ -1,3 +1,3 @@
 DIST zope.i18nmessageid-5.1.1.tar.gz 30589 BLAKE2B aa87ecc7b757c2f3ff877ea908df102477b5f888067a6bf98aab6467adaf7baa713c5b413f528cc0010b4082d03b48d069537dbf223713ed914982eb8f040433 SHA512 4762dc67d4b665ede25eaaeae1458257fef994207a887f128fb5c64685bcde08bc17e24890cf36a14febb57295813c9152f14aeea854493e4197702bb4e3d719
-EBUILD zope-i18nmessageid-5.1.1.ebuild 1007 BLAKE2B 713b701c70dd56f7e6180a696819723707278f6eba2b9b50733ad3afabf26f9be376ca4fef66b49b6617b58203b4e890325e052ef8c5c00d1b534bb1ac06832f SHA512 04909c54603588944e81e5f6604eece6dbbb4bf1de6d777562b4948080e77311dacce52815d60dc0f836087efa02760bd96598b792fb38ae4738993cb9be1a68
+EBUILD zope-i18nmessageid-5.1.1.ebuild 968 BLAKE2B f4b7bf4b4ae8d0a3752864e42e06bdf36a5d52ed3491296965328b097324c9950702d3b8de9e5ea8cd6fe360c9824282b800c11952102708aac85d0b80e7095a SHA512 ca440b35aeb346fb23fa757d2e85cb23ae6cc9901d4008ce0930a79eb23ad43f5949d84a5565a3e0743db07324f90e8a1a25c526ce60ba0e084c24a3d704cc87
 MISC metadata.xml 488 BLAKE2B 2b413d726016bdcf199974f77972d7800a4d5f169463d9587f9d0563ee94f8f0cdafb9c384c387b7bf9c2f1814807a8ab32fae796275bc51d624133788df44c8 SHA512 3459883a636540739ecea197d7ebd1429dd6e8fb20d0df2337691e1742995edf50dd0fee6340695b6dc493d0d5fd7ea8d3f55277172cd7385df0b057f376fdbb
diff --git a/dev-python/zope-i18nmessageid/zope-i18nmessageid-5.1.1.ebuild b/dev-python/zope-i18nmessageid/zope-i18nmessageid-5.1.1.ebuild
index a8dfb51618a9..0e68b5c7c893 100644
--- a/dev-python/zope-i18nmessageid/zope-i18nmessageid-5.1.1.ebuild
+++ b/dev-python/zope-i18nmessageid/zope-i18nmessageid-5.1.1.ebuild
@@ -4,6 +4,8 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
+PYPI_NO_NORMALIZE=1
+PYPI_PN=${PN/-/.}
 PYTHON_COMPAT=( python3_{9..11} pypy3 )
 
 inherit distutils-r1 pypi
@@ -13,8 +15,6 @@ HOMEPAGE="
 	https://pypi.org/project/zope.i18nmessageid/
 	https://github.com/zopefoundation/zope.i18nmessageid/
 "
-SRC_URI="$(pypi_sdist_url --no-normalize "${PN/-/.}")"
-S=${WORKDIR}/${P/-/.}
 
 LICENSE="ZPL"
 SLOT="0"
diff --git a/dev-python/zope-interface/Manifest b/dev-python/zope-interface/Manifest
index d82f5d1db211..f7f39072273d 100644
--- a/dev-python/zope-interface/Manifest
+++ b/dev-python/zope-interface/Manifest
@@ -2,5 +2,5 @@ AUX 5.1.0-drop-coverage.patch 571 BLAKE2B d5f334b7f5ec5df710174f9a3768c2d7400cef
 DIST zope.interface-5.5.2.tar.gz 300533 BLAKE2B 04b348492d5af729eebc6b1abc6dc7bd4a28931c5d65d03261bc4a77a39e97c4cbcf319ea0b5a960ddab7bd1056481e741d2b69cf6c21bea4bf3885b757aa1bd SHA512 ecc20df9b84c91f7a03ce7be087abcd6288f77b2e04f6974ece5b86a222944baf0dc0a2aa49063c74dc7c4d47c474fd01f512c7686164806d48f360667581205
 DIST zope.interface-6.0.tar.gz 246297 BLAKE2B e1aac8346d639527808f0f54a9a81a68ca9474d5169f6a07599b3e345ff50fc5e9379df62591cbcdc781e73d151f7c7d993b9e392ea11b21e609030fb805ab70 SHA512 ed6bc98a61c91c34cfd8e24a8545e462fdffab13bc77a8144714a9cdd3bc7f4b873a50597a64f50b3c811f57218e1f2c78ceb267e52ae0ab5c136f082caa0612
 EBUILD zope-interface-5.5.2.ebuild 1277 BLAKE2B 2cf80c7bc92b3a4ae18dfda2f2944405f5c4f77b5dc7235592326cd1b9734bf68ddb7f58d05e1d8b563002d1857927952a5b313f5ea65c06fdbaec7917535ef5 SHA512 3ba00240f8e8a5f6b8e6abec1a00190b0bfbf5bb6257abc2fe455fc6ee4fc62ab032279b7439b65c11aaf151c3dbcccf01a8ed34237418f8ccd338e135853f51
-EBUILD zope-interface-6.0.ebuild 1248 BLAKE2B a49aea48459301ccb4ec6994dbf505c5f40491d53d6ddb12e06db408be7913b9d048e65e157c67728309e1c681a99a3c13955f159cc24ec4e495c430abbabb4d SHA512 d4f3132bb5fee6f342770d78db06c73f82f037509ce1a72d950c7a930d5fe937b9897ed1bf43932c1063c3140434f9c0acd4750f4785a21b4de4bb371d4c35fe
+EBUILD zope-interface-6.0.ebuild 1209 BLAKE2B fc3f19ee5d0b93f97a467746a439f42317bd4b3b0c847be2938afff3cdee8e7cfe2f947096865f89a846a68fdd92f4f491c35877310bb24a4cd907093f5dc7b4 SHA512 d3c4863b6ee9b6df9ccc836722d3399a1a82bc9854ced7a85d5e56c37788f706ea19d9a50984e7c5c3091c4c5681c212b05c1261f8d080953c9b6b993c7e0637
 MISC metadata.xml 387 BLAKE2B 1d5e2a8f2fcd2c8fcb423f8a123d2d17a0456cd4003489358abd8baf74d3ea9ddfa04af94b9ef67b329520b5ee9bc3084343e824f3fbf7420f14372d43581dbc SHA512 258f0bd291cd42f6374bd331c3b906f149ff455dd264716eefc63487710d95f8b388ecb34be5733dbd7a0e185f449cc18fce04b46521a2d19fd9766e7dc0ed82
diff --git a/dev-python/zope-interface/zope-interface-6.0.ebuild b/dev-python/zope-interface/zope-interface-6.0.ebuild
index 71c1fab1a966..9e89f69efab2 100644
--- a/dev-python/zope-interface/zope-interface-6.0.ebuild
+++ b/dev-python/zope-interface/zope-interface-6.0.ebuild
@@ -4,6 +4,8 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
+PYPI_NO_NORMALIZE=1
+PYPI_PN=${PN/-/.}
 PYTHON_COMPAT=( python3_{9..11} pypy3 )
 
 inherit distutils-r1 pypi
@@ -13,8 +15,6 @@ HOMEPAGE="
 	https://github.com/zopefoundation/zope.interface/
 	https://pypi.org/project/zope.interface/
 "
-SRC_URI="$(pypi_sdist_url --no-normalize "${PN/-/.}")"
-S=${WORKDIR}/${P/-/.}
 
 LICENSE="ZPL"
 SLOT="0"
diff --git a/dev-python/zope-schema/Manifest b/dev-python/zope-schema/Manifest
index 0e4a37893360..fdb0d94d548e 100644
--- a/dev-python/zope-schema/Manifest
+++ b/dev-python/zope-schema/Manifest
@@ -1,3 +1,3 @@
 DIST zope.schema-7.0.1.tar.gz 108737 BLAKE2B ca0d280186ebdaf53abc28bdb1684e31f97e4f4f9d235604702c2652bd4fa0a027d947f375ecee7aba598f072ce140908aaab3b107d6c743d6ee929db5de2fb5 SHA512 a8da9ac2e7239d15ed6cef83b4f500bca989c9ef2b7f1cd06ce532c260a8b8488b6fa42a6b2cfaeee505db87d3235f81815dc7eb80401c9e482141f8bf717e62
-EBUILD zope-schema-7.0.1.ebuild 1130 BLAKE2B 1099aaaff36441bc044201064260ad794f58a70aee4610a2fef2a0584fdb0b6d7eb99fac19c0bd66fd81653679a4349bc8543f2513947725bdcead42c2e76455 SHA512 2bda2a0908fe51a30a689b5fb2805fc81b9e941e49b0ea1a2a51c3ebcf39c550938fc7b88c2b647f0f8f3daed3f5d6f00a441602fdd9b6723d61e113c9d0d0f8
+EBUILD zope-schema-7.0.1.ebuild 1091 BLAKE2B bde3930fef05bf260c7d1095f7482010d9ed3c881f99697b9a7d962511d991d049201590583e88ead6867999a627ad555255dd214f7a9bd591404859fc4dc24c SHA512 7a8645faf26dc8af5b218d3cafd343365597024f363de0dd0a66fafd723f5167c1a6cd228dc427d409d3c1ab3bfa9c6a267c14ba86b2761c1e4b2e46c3ac8906
 MISC metadata.xml 498 BLAKE2B d5386b7a400de71c5c02d2b9788682d35dd34eaa6a132aea45432aa2d53ec47e54fee9f880cf6cc5abd8184e28cef0795fe2f58dfd47f619b4120ce914bd7c45 SHA512 5a8021ec0348af5929d3284f172f5b5fb26007df9064f5571a0cdb07c1259c24b9b352eb048811f5e4f68ab75b9fabeba49c93a0cdd6e8655b509a248447b794
diff --git a/dev-python/zope-schema/zope-schema-7.0.1.ebuild b/dev-python/zope-schema/zope-schema-7.0.1.ebuild
index 9bc480a73519..6ff494d3e0f2 100644
--- a/dev-python/zope-schema/zope-schema-7.0.1.ebuild
+++ b/dev-python/zope-schema/zope-schema-7.0.1.ebuild
@@ -4,6 +4,8 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
+PYPI_NO_NORMALIZE=1
+PYPI_PN=${PN/-/.}
 PYTHON_COMPAT=( python3_{9..11} pypy3 )
 
 inherit distutils-r1 pypi
@@ -13,8 +15,6 @@ HOMEPAGE="
 	https://pypi.org/project/zope.schema/
 	https://github.com/zopefoundation/zope.schema/
 "
-SRC_URI="$(pypi_sdist_url --no-normalize "${PN/-/.}")"
-S=${WORKDIR}/${P/-/.}
 
 LICENSE="ZPL"
 SLOT="0"
diff --git a/dev-python/zope-testing/Manifest b/dev-python/zope-testing/Manifest
index 7c9081a60129..76d09173a347 100644
--- a/dev-python/zope-testing/Manifest
+++ b/dev-python/zope-testing/Manifest
@@ -1,3 +1,3 @@
 DIST zope.testing-5.0.1.tar.gz 41745 BLAKE2B c3ab3ba7a15a050a29e41c26df3426dc3dd48d98b60e55015680c6aa86fccbbf44718d17643189a1978c51605eb774c108e0056a1e21023b99ca633a2abd7788 SHA512 357d1c0eb761dba4e0e964a51dbc4368c00c9133a011467a2bb3629a2c5c28ccb3886caad215288b99cda1de25fd7ead674068f275649d94a32dc42d19d78caf
-EBUILD zope-testing-5.0.1.ebuild 1303 BLAKE2B a86e4b1880c58230c8b9f1c2e6b0b7c87c296fb3a1c84a11531f4590f5a314da4a72a2c6f2c02a050cb9a9836c6c6f664d59b754e0144c13b306dd9702180030 SHA512 352b1eb9abac3d72f78ddc37fea6974a17ef6e0f8c68044ba7e331b390ddeac94dc5e13bbbf3df2e03de58292ea1baa04bc3ccd59c77751d66a7e27e56672c15
+EBUILD zope-testing-5.0.1.ebuild 1264 BLAKE2B 2bcee7e515d818ea8e826fb0a587bdbb01e7ace57f4083cb1a2f66fc221531a5fbbc266e15b74cdb27e35ac169d0064e2bab5af979ae1b59bc899c7011d0f8bd SHA512 a3b9c9aaaae43e7983653e1754e9d0e855805100db85f43725b980048eafa2961fc7e309e583625f1f4359e004444a4fa09fda6408b5f62d1a8f38efcb12bcee
 MISC metadata.xml 407 BLAKE2B a3792d048bb4472d3d22458ced65e08f25a2a0314858ae86a7dc6573989b3f49139f4452d19c073890443fbc5b09c681bc612057637aa548d88e1f0f7501182d SHA512 a61142f2fe381939bd26c4cbd66512df42b42374331fd56c36a4dc9640b634c8c21d5680ed9c621b05b401446415ea145100b2334cffd3f579916a95f3857f47
diff --git a/dev-python/zope-testing/zope-testing-5.0.1.ebuild b/dev-python/zope-testing/zope-testing-5.0.1.ebuild
index 0111e1a87bf7..e73c26009fbb 100644
--- a/dev-python/zope-testing/zope-testing-5.0.1.ebuild
+++ b/dev-python/zope-testing/zope-testing-5.0.1.ebuild
@@ -4,6 +4,8 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
+PYPI_NO_NORMALIZE=1
+PYPI_PN=${PN/-/.}
 PYTHON_COMPAT=( python3_{9..11} pypy3 )
 
 inherit distutils-r1 pypi
@@ -13,8 +15,6 @@ HOMEPAGE="
 	https://pypi.org/project/zope.testing/
 	https://github.com/zopefoundation/zope.testing/
 "
-SRC_URI="$(pypi_sdist_url --no-normalize "${PN/-/.}")"
-S=${WORKDIR}/${P/-/.}
 
 LICENSE="ZPL"
 SLOT="0"