gentoo auto-resync : 20:02:2023 - 02:17:29

29 files changed, 125 insertions, 52 deletions

diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index 51e9ab2db8be..56fcc4831622 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/cppy/Manifest b/dev-python/cppy/Manifest
index e5c330842d46..2f70ea434c44 100644
--- a/dev-python/cppy/Manifest
+++ b/dev-python/cppy/Manifest
@@ -1,3 +1,3 @@
 DIST cppy-1.2.1.tar.gz 18040 BLAKE2B f828fd6e7b401ea2f7672ade94acd8014e77890d68cf09c4f189f4c8776875130db185a7458016dd20f8b3eae536ad6794a79a0aab6894092b26ea341e73e309 SHA512 4215051ce848faccfabcfbd840a343bc81d1ef0321ff0837354560dc6208cc235a6a130bab96f8fe42d5f630d1dfc20795928c64f6204a49e8f04b3fda8f9c90
-EBUILD cppy-1.2.1-r1.ebuild 625 BLAKE2B c750cf149edb3cadead5410d3b13bee6c86c9c840996e0f51ed2c7f2a854a16552121e45d4f85e6bae95f742a1e1d0e548cf2141e2f17f2571acbbfaefa5e872 SHA512 0fa0fc4481fec8b3157fa9809961ffec6582a84eb502f8e4015ac074b8453c08eb64acd7b85e65c1e007e993af61c620bea60a63a1958b54d4aa851e91995bc1
+EBUILD cppy-1.2.1-r1.ebuild 584 BLAKE2B c7d5de56f1cc7f03323a6ef3de8e585f180426e2d67282e869934c68356ddb5a744a776f9de046ee14bff7dfd03135890fa45dfb00e82d28f0b2ff3e1541a26e SHA512 96fd406e3f53201479ad9829e046a7b67ecf258dd3a2c2578f1e5acb2b02e35cbc3ba636fe01327ac4a9c441812c8f08a1dad46debd91586f1da11f174650d66
 MISC metadata.xml 602 BLAKE2B fc0deb89e55e63a036cc7eee611ded9481592777d978e9bdaec313b838574bbc7a21bd71e28f99121d2166f28fd2f0cc6d37786790a75344467708fc7203ab8e SHA512 61f35eb674dc1eef1258dcc8ebe128c004f3843bc17bdb828b83d5f719430746922518494686d13825c4e0644fbd4d0f907e78c1b6405e9547dab7ae2ed653c8
diff --git a/dev-python/cppy/cppy-1.2.1-r1.ebuild b/dev-python/cppy/cppy-1.2.1-r1.ebuild
index 4adffed54306..9b6fa30b9a0d 100644
--- a/dev-python/cppy/cppy-1.2.1-r1.ebuild
+++ b/dev-python/cppy/cppy-1.2.1-r1.ebuild
@@ -4,13 +4,12 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{9..11} pypy3 )
 
-inherit distutils-r1
+inherit distutils-r1 pypi
 
 DESCRIPTION="C++ header library which makes it easier to write Python extension modules"
 HOMEPAGE="https://pypi.org/project/cppy/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
diff --git a/dev-python/cycler/Manifest b/dev-python/cycler/Manifest
index e559ab5f9dff..ae697f298f70 100644
--- a/dev-python/cycler/Manifest
+++ b/dev-python/cycler/Manifest
@@ -1,3 +1,3 @@
 DIST cycler-0.11.0.gh.tar.gz 19028 BLAKE2B 7726067db988e40b833ebcef4a9122fd91753925af829a0023c08081ea7f315b84fd3a5d13731dba72d2820159da45698200ca8649b65b854d48e1a114e31d81 SHA512 cdf91b861d20710b3d77ad105e54668fafa4be69e566d6a09683c638a35aa423b542a141ca0bbffd7a6cd30c8e2a629d578be88648ab9f38a0c43405f2f39613
-EBUILD cycler-0.11.0-r1.ebuild 638 BLAKE2B d9f2c78794dc7255fcd89cd296b27b2e17411575b74246f78bde9ff6b46c557cc186f55623ecb8789e386ee1b7dee6a304c9024627e37a10d0027dd1cff061b5 SHA512 77dd02a51cbfa4d6eba703584681668016aa50074c34955086b43dca627308b13fcdbbf511b5dca27445f3ec98327250ca93288429f7afea7cda69ea63b41059
+EBUILD cycler-0.11.0-r1.ebuild 648 BLAKE2B 45520cd49b68db566faddc936c1c1be4e29ec99fe36e091158e3823fdd25f6745d08b27c299d067c12c0f325fe9c0a3324c6868fcbe9b92f38f32c6d2f622b41 SHA512 3ace63d17b1e5ee2ccfc234eb677ad9767d3d94e71a1a527fa54c2d8140a3385149a497512a91f583bcf4bbfb919f30ed137117129557fcac7b1c0f2640f0b21
 MISC metadata.xml 391 BLAKE2B 087752331eded830e84cb7448a9cd8f76a2ddce5e2be49901fca0b9de609af343bf2d6387a49a5b8344f0d5ce79077e0ec4f5bfd5283a550a43f715abdb114da SHA512 8b0f74d46825b7ade0f76faf9539ef13cfff9e946e973c1371ed5ae4404563ca1339657804acdaad5bfbf3d6c5041f0e6bd95893f8d6d9e1b1db67431bc07a0b
diff --git a/dev-python/cycler/cycler-0.11.0-r1.ebuild b/dev-python/cycler/cycler-0.11.0-r1.ebuild
index bdd6447c1339..b1e827887ad2 100644
--- a/dev-python/cycler/cycler-0.11.0-r1.ebuild
+++ b/dev-python/cycler/cycler-0.11.0-r1.ebuild
@@ -4,17 +4,20 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{9..11} pypy3 )
+
 inherit distutils-r1
 
 DESCRIPTION="Composable style cycles"
 HOMEPAGE="
 	https://matplotlib.org/cycler/
 	https://pypi.org/project/cycler/
-	https://github.com/matplotlib/cycler"
+	https://github.com/matplotlib/cycler/
+"
 SRC_URI="
 	https://github.com/matplotlib/cycler/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz"
+		-> ${P}.gh.tar.gz
+"
 
 SLOT="0"
 LICENSE="BSD"
diff --git a/dev-python/kiwisolver/Manifest b/dev-python/kiwisolver/Manifest
index 7ee3196657c0..1517009ab98b 100644
--- a/dev-python/kiwisolver/Manifest
+++ b/dev-python/kiwisolver/Manifest
@@ -1,3 +1,5 @@
+AUX kiwisolver-1.4.4-pypy3-tests.patch 1001 BLAKE2B ebb5318a74bdd878c58234b0d71f4adb96e7180624588e24862005fb07cc834ce1da060d9ce543af5f5bc5408b3565f04b4bfd53eee9d1dd93cfd3c03908801a SHA512 2333bfdf39f65648a988a2abd7e3b1f02a24fea73dab3a155351035be8a3f3cad09a4bcdaaa4524ea7080b3774e1a573fd10e51107466765007c7914b02cf1bd
 DIST kiwi-1.4.4.gh.tar.gz 91343 BLAKE2B a5e345509e7294eaf89e1361c035b3ef5d672d335682dbb426196d22876762b1f729cc728300f731a42afbfdf2828591f83cc53daf28e8d4c451a1b246b4800f SHA512 9a7ed487bb28f8c430543dc21ea59156078c129fd29b1382f1578368e72f312f4e813eb4501e4c9387647b42b085b93d4bd27d0e846f1396fa4ce68fd9e9ba5f
+EBUILD kiwisolver-1.4.4-r1.ebuild 948 BLAKE2B 630ee793fe56aa5295ce777d69692a31189afc4f9e027c811a84625eafa07b329adfa47f2c752abe28acdc59456eed3acc5689c0d52e5198e7e5999a8670ec9c SHA512 2a2321dae77d271f9d486cd9703997fc0804e0666929f8fbbf8c739ea4a4b94ee77d43722e3dcff25439d263ad522683c50d5a2684c34b153e2eed8585fedc88
 EBUILD kiwisolver-1.4.4.ebuild 876 BLAKE2B c12505b827d2ad38b9f77cc8f1a20a40df4dad77a6514a0903908d0e0c812fadbe68b64cb8f25cfec91c8557030bf63e37dc1e0baa5b012a3f227adc5603752c SHA512 d6b367fc0d26a7ded41a4c897e0d7859e7b90bf2c68b5dce44e1a617995c8b47aea54462add04adee95ff7991af9d69a7afa4df7be1ae6393c4479f06d80b672
 MISC metadata.xml 366 BLAKE2B d724248e9950219de4990e67822a16781e1a28f41d863fde04b3e1212b982a86819636a621b6e23089b76042ebbb23e0944a88ef9ab4c4abe62103f12197e5c2 SHA512 526fe3a81426edfc4c050631133799d948d1becb016319e954491090b9f3f6d410958db7027b5c2e2386b40c783f8c984b2588cda56e3ac58f3d2b1a5a8af0f0
diff --git a/dev-python/kiwisolver/files/kiwisolver-1.4.4-pypy3-tests.patch b/dev-python/kiwisolver/files/kiwisolver-1.4.4-pypy3-tests.patch
new file mode 100644
index 000000000000..705855f02f61
--- /dev/null
+++ b/dev-python/kiwisolver/files/kiwisolver-1.4.4-pypy3-tests.patch
@@ -0,0 +1,30 @@
+Patch provided upstream as https://github.com/nucleic/kiwi/pull/158
+from issue created at https://github.com/nucleic/kiwi/issues/157
+
+commit ad1c62f046dc14c1e85e4e1c1b8e175eda08838e
+Author: Jérôme Carretero <cJ-kiwisolver@zougloub.eu>
+Date:   Fri Feb 17 18:40:45 2023 -0500
+
+    py: tests: make tests run under PyPy
+
+diff --git a/py/tests/test_expression.py b/py/tests/test_expression.py
+index 671dd7f..6b5d8e5 100644
+--- a/py/tests/test_expression.py
++++ b/py/tests/test_expression.py
+@@ -8,6 +8,7 @@
+ import gc
+ import math
+ import operator
++import sys
+ from typing import Tuple
+ 
+ import pytest
+@@ -264,4 +265,7 @@ def test_expression_rich_compare_operations(op, symbol) -> None:
+     else:
+         with pytest.raises(TypeError) as excinfo:
+             op(e1, e2)
+-        assert "kiwisolver.Expression" in excinfo.exconly()
++        if "PyPy" in sys.version:
++            assert "Expression" in excinfo.exconly()
++        else:
++            assert "kiwisolver.Expression" in excinfo.exconly()
diff --git a/dev-python/kiwisolver/kiwisolver-1.4.4-r1.ebuild b/dev-python/kiwisolver/kiwisolver-1.4.4-r1.ebuild
new file mode 100644
index 000000000000..67d18ec3f1e7
--- /dev/null
+++ b/dev-python/kiwisolver/kiwisolver-1.4.4-r1.ebuild
@@ -0,0 +1,44 @@
+# 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_{9..11} pypy3 )
+
+inherit distutils-r1
+
+MY_P=kiwi-${PV}
+DESCRIPTION="An efficient C++ implementation of the Cassowary constraint solving algorithm"
+HOMEPAGE="
+	https://github.com/nucleic/kiwi/
+	https://pypi.org/project/kiwisolver/
+"
+SRC_URI="
+	https://github.com/nucleic/kiwi/archive/${PV}.tar.gz -> ${MY_P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="Clear-BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+COMMON_DEPEND="
+	>=dev-python/cppy-1.2.0[${PYTHON_USEDEP}]
+"
+
+RDEPEND="
+	${COMMON_DEPEND}
+"
+BDEPEND="
+	${COMMON_DEPEND}
+	>=dev-python/setuptools_scm-3.4.3[${PYTHON_USEDEP}]
+"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-1.4.4-pypy3-tests.patch"
+)
+
+distutils_enable_tests pytest
+
+export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
diff --git a/dev-python/numpy/Manifest b/dev-python/numpy/Manifest
index dcf7b1f3af7b..1ac18a704401 100644
--- a/dev-python/numpy/Manifest
+++ b/dev-python/numpy/Manifest
@@ -2,5 +2,5 @@ AUX numpy-1.22.0-no-hardcode-blasv2.patch 2710 BLAKE2B 71da07805e25acc58120da2b8
 DIST numpy-1.24.0.tar.gz 10897101 BLAKE2B 59e2b913f90de76589d8fbb2f07e2d389012c7f6ce9bd641bc4837776465ce9c41c34f19f92bee55d4bae6245c1d2c84315b359ef0b089fd68d31cd7e7ec44b1 SHA512 3b4e6255b8d39e8504a50ecd3c2ba09d5b16d3f6c70b23b67e4dbf03d1fe390c55030f46090341d39a1ee8228c61ad6212fdc6e4579fcec9e26b4dbe70268661
 DIST numpy-1.24.2.tar.gz 10906862 BLAKE2B e48f65eab709f0c57ec378d813a7b65bcaca6d5960b559d6db1c60726e5cf12517f4b2e1636b0ff815a2109925edccba200270db5170fd0aff5fd635919165ac SHA512 145fd7fb3919a185f75076d51b92c54a7fb1b776b637752ca15fdee15b239d6a517ef1bb8cded7c92e059cf6cda0146c24943c042d19b791e81125bc0ad4b820
 EBUILD numpy-1.24.0.ebuild 4274 BLAKE2B 57ebcd94b9c33477d87500f8b8e9c98faa5a3ec00e855a3215863249b2c7810eb7198e9aa13db0859abad4c4f6b4171419e62022c73144011bfd143bde054424 SHA512 84c221d759a2c80e9c27f34d10b17b82e845d40d0213a73a65957829e38f78b86fedaccbd28dc0d94474976363d5fc1e6b2faab0807fdcfeceb09efa1ce2ed58
-EBUILD numpy-1.24.2.ebuild 4352 BLAKE2B 24894e6421c86d7c9af0e4c994e1015b628dc44a471abd232deaea0ce60d1eb2e05fbfa3ebcf944862a4c5ec72d1eba41ebe7d2bf98f4fe6d87e0116393bcd26 SHA512 20060a6a7c8f9c3e2a08d31930a4b2036511162e204f72170bb4fb7ea5c39349b7d350a3acdfb116a0c7b3911cb6c8d255bbe34237100f144298a167c8a14231
+EBUILD numpy-1.24.2.ebuild 4400 BLAKE2B bb0598fa0c0a4fcdf9fe93e6e9ac8e3a6a6602a27f76592cdb533ce629eeccaf8e140edf4c2de996ab7a25eaf7eb5f3f83462c604c268765de1bbd0747da9510 SHA512 647a624d8bc269b8dcba49b3744185faac8cb3799836e74afe2b26ea3371d1476927b2906ef7bade0a7832773a4ea02cc0c66e04547ea65703a069cfb3f4b314
 MISC metadata.xml 932 BLAKE2B 7a4af31f613bab05ff542da48bf6ff1484d9df2459f559516e71329451dd739d3df0fead507c8033d94ab9ed516b68efe7f21819a8cd6ca303643d8c8bc34e86 SHA512 32cb8c1ab61521a02cbec38f6ea383f074e50d46aa3462ddcb85710f9d348e8e628cf2a5725e3cd921cc32f02885a1b5f02125639f0ec885384eeeff7f468a06
diff --git a/dev-python/numpy/numpy-1.24.2.ebuild b/dev-python/numpy/numpy-1.24.2.ebuild
index 5eb86c776c2a..623be07ee996 100644
--- a/dev-python/numpy/numpy-1.24.2.ebuild
+++ b/dev-python/numpy/numpy-1.24.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{9..11} pypy3 )
 PYTHON_REQ_USE="threads(+)"
 
 FORTRAN_NEEDED=lapack
@@ -36,7 +36,9 @@ BDEPEND="
 		virtual/pkgconfig
 	)
 	test? (
-		>=dev-python/cffi-1.14.0[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep '
+			>=dev-python/cffi-1.14.0[${PYTHON_USEDEP}]
+		' 'python*')
 		dev-python/charset_normalizer[${PYTHON_USEDEP}]
 		>=dev-python/hypothesis-5.8.0[${PYTHON_USEDEP}]
 		>=dev-python/pytz-2019.3[${PYTHON_USEDEP}]
diff --git a/dev-python/pip/Manifest b/dev-python/pip/Manifest
index 83cfdc04cd08..7873a7e18334 100644
--- a/dev-python/pip/Manifest
+++ b/dev-python/pip/Manifest
@@ -7,6 +7,6 @@ DIST setuptools-62.3.2-py3-none-any.whl 1225929 BLAKE2B 608952e201f749ebf557e396
 DIST virtualenv-16.7.12.gh.tar.gz 8906590 BLAKE2B a1f206769e4e5797562906162e492e44c4a72720e4f88a0362dc802ce2df20c65aaab6a72dce2238445601a10fae59bd90cd362217994d30911f105afd71c5fa SHA512 0278b33fb19f6553e70ad3dcffa6ea1a455ff435b216ac9b4fadff216b2932714faa2bb6027af3058010111d8511a5c2fcd424f31c9645be361603971f111c8e
 DIST wheel-0.36.2-py2.py3-none-any.whl 35046 BLAKE2B bc4e8dab7c74eea34d3b4a813b7eaf6295a99a396a861b6cdd76f743043e89140bad132bdd13e385e8945ce02e0798e1d3ac73fc1b23bde5b2a83e4bb4dd5cdc SHA512 6bb5119b4d3704fe1e3c1eaaa3124edab13f61b46f8a0a8e75974fac4e5b25d8b53606071a03a8d8990ad1cfe2ab247ddea260098df2c0c35ae965be47080284
 EBUILD pip-22.3.1.ebuild 4655 BLAKE2B e2af91203b0d626a9bfb773b564af43a0e07fd36fa724fe246979c40cbb580ac44534f2a3654c1d212fb15ac028d30ab339686b13715d4cc083c4e0090781fdb SHA512 df4a0c3a9b05c652d4db895e7f2ef4ec982f4eea972e2a999fab74885236da4d35ae0807ac2c5bf3ca757f6be9a157f2d7e0129460c2db2953a80797dbd6692a
-EBUILD pip-23.0.1.ebuild 4120 BLAKE2B 02e5d5c0c8a13b87bd12f67a107f8339bb7531cdbfd7df6ba6022f93798d40a0b040f6689bd84dfc5f67d74dfacc20e3201af1a7143ee17df6610c2eb92a9b1d SHA512 024491ba3fd41887ef9d4631279863a0c639131be4ad2eb0edacda293651f9ff6dd32fb921a9d2a64a3a8cd5924001e2667916b74d0cf69b8bb905fb0239ddc5
+EBUILD pip-23.0.1.ebuild 3752 BLAKE2B c83e186e2bc8f0e1d7f2b150ccb3029dc7e104712ea16a081803e718d8a2eadf601bddf6ccea6ce49d61c6ae02bf6dc740cf82e8a80bfd41190215d42168a72e SHA512 508eb95e06c01f5bccc4080aa52e85ce8d05ad53f68d25a21e6da4cc6a0ef985c6715c82f8176b2f0c07023b5d0d281b7afffa1188a04da57070025a18488302
 EBUILD pip-23.0.ebuild 4666 BLAKE2B 4eac229f22d51c20bfaa6eb5790994c1dddd15607c88169f9709c8701f20aef659a2e5a4eeda8ad642275e6c3e7996e2041b1a3fdd63832359ed0a0622173efd SHA512 673a27e7412afc8a09579d951c2ba29b731a7b378aa228c8b1adcced159a95ba6d95c6adec234cd8ea1b8574c3fe10b88b98961b65074655a6cc69d5a7fc1d1a
 MISC metadata.xml 392 BLAKE2B 94ea3de1220cb9ca64ae1186597789cc83a54adfe44695932c07dd5065df0e5f9ee5078a495e3a12563b36809d781d8ab86bb6c92c485c023199d92547b74f27 SHA512 603199f6547105f3bb64f4fcaf004e9ef62fa2e0f8ec6eab56078119684b0f5119161e0f164fe02b2cf6dd6b115588c9ef77d727eeb6d138e281f1cb0bcb5de9
diff --git a/dev-python/pip/pip-23.0.1.ebuild b/dev-python/pip/pip-23.0.1.ebuild
index 6fd14699751b..5ee61a89133b 100644
--- a/dev-python/pip/pip-23.0.1.ebuild
+++ b/dev-python/pip/pip-23.0.1.ebuild
@@ -89,15 +89,10 @@ python_test() {
 	local EPYTEST_DESELECT=(
 		tests/functional/test_inspect.py::test_inspect_basic
 		tests/functional/test_install.py::test_double_install_fail
-		tests/functional/test_list.py::test_multiple_exclude_and_normalization
 		# Internet
 		tests/functional/test_install.py::test_install_dry_run
-		tests/functional/test_install.py::test_install_editable_with_prefix_setup_cfg
-		tests/functional/test_install.py::test_editable_install__local_dir_no_setup_py_with_pyproject
 		tests/functional/test_install.py::test_editable_install__local_dir_setup_requires_with_pyproject
 		tests/functional/test_install.py::test_install_8559_wheel_package_present
-		# git: fatal: transport 'file' not allowed
-		tests/functional/test_install_vcs_git.py::test_check_submodule_addition
 		# TODO
 		tests/unit/test_network_auth.py::test_keyring_cli_get_password
 		tests/unit/test_network_auth.py::test_keyring_cli_set_password
diff --git a/dev-python/pybind11/Manifest b/dev-python/pybind11/Manifest
index 0ad5fc19b727..3259541f430b 100644
--- a/dev-python/pybind11/Manifest
+++ b/dev-python/pybind11/Manifest
@@ -1,5 +1,5 @@
 DIST pybind11-2.10.1.gh.tar.gz 727880 BLAKE2B d051220f33ce44ea6d174d64a2ecfad4f7452b0f5152035cfd36950875dc451e11e8352eb80c9c01b200176c0b09fa5274504ece524e699590deac64c44d57c6 SHA512 040f109ec870516acdaebc5133ccbba9e3ed7ff93214a66997cf4b8366c209322f3c902c283040826c7e585c3ea2259caf62d90d0b475bfa33d21e459dd54df1
 DIST pybind11-2.10.3.gh.tar.gz 740214 BLAKE2B 967b93cbf7d1f8faad25db9a4d3e84fd33b48429cdf527c167e65faad5c01df83a5634021cf99f07adf443855d9f6bb076f0cc67b0e6555e189b794a845b533a SHA512 3894400f04cd08e2dbb14b3d696339f0364434f1d6f8bb057338ac88157ec7491b2df1e1e46ebd5abccdcd5775c5e9238de6404f0db87f64f5a1802db3a5b18c
 EBUILD pybind11-2.10.1.ebuild 1235 BLAKE2B 34a0a01fd99fbe60ae9624f7239dacc187d9b26112e289dbb9a81dafa9b19670d62640bef0c79303f961a098c41518ec2d43a93469ca82f84c5d72b6065b58a2 SHA512 7eb56942e1c770942f3607d587077756fe9bbf3c6ade2bd1a4e0d504ba6766f6998baf76076d0b672412a6df361021841f7bbdf73fc5ebcace99167c70dec43d
-EBUILD pybind11-2.10.3.ebuild 1234 BLAKE2B d77a29245962c43a024879ebf2f24c4f476c85bb856fb1ac57fdacda0c56673f1ef978b58007630b98a534ad4e1fdeec9826a9488fa18213a6c2e8d6c2699cbf SHA512 b584873e892e2ebc9fe2b81e1a14acd49449f68a2667235ff0f137dc2e27d3463dcaeca8e7171050d2a59476f9d369831e3bd87812e00e3cfe222e7b5a7e1bd6
+EBUILD pybind11-2.10.3.ebuild 1240 BLAKE2B d01aff105a615f33f094a510d119b44872c121ab79ba36a95d307d298ec1a011ce2268296ff269670adddf7a32b1ff0f0de45b34ef494955e56c1351fe14672a SHA512 ad1415619b1f477c56d910b6ba24755a80934590440adcfcd41a354c6305188dc15958c3b3f4311ef6685b4a604649167c47492c1bb6738755b98a864efb959e
 MISC metadata.xml 475 BLAKE2B faf317a1197850acb0d16546a303bd50ee1bfe6fc3aaf592e6c147c6612fd20b809f1c911d79ca9a356cfa0c4166d2b155fcbd593f8b55e0d7dd75ff6444073b SHA512 5779adcc9f25c15fd999aa6c91d3144fc14535270e57925bfb8ac67f45448c144a142af2ea9a321ec6ffbf568713f663cef85a0be3d4a056e58b1782a5fc9a41
diff --git a/dev-python/pybind11/pybind11-2.10.3.ebuild b/dev-python/pybind11/pybind11-2.10.3.ebuild
index e3a1ad1fc6c6..07edb23f2631 100644
--- a/dev-python/pybind11/pybind11-2.10.3.ebuild
+++ b/dev-python/pybind11/pybind11-2.10.3.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{9..11} pypy3 )
 
 inherit cmake distutils-r1
 
diff --git a/dev-python/pygame/Manifest b/dev-python/pygame/Manifest
index 77183c47a60f..5757ac7fdc8c 100644
--- a/dev-python/pygame/Manifest
+++ b/dev-python/pygame/Manifest
@@ -4,5 +4,5 @@ DIST pygame-2.1.2.gh.tar.gz 6100415 BLAKE2B 4b81c2f0abc2c2c4732ddb8f8e6d4bffa516
 DIST pygame-2.1.3.gh.tar.gz 6517003 BLAKE2B 9f2062b24ef2e97995207fbf7572a8aa4d3475356e8646356758ad72b0b744fcf911adaa78bb730ed43c95fa23b8ed733a5573882bd83e112ae5e7e6ef099de9 SHA512 28f46826f58f73607b28c1411c6f2b71796cd4f98103df2dd47db842f578fe7f26dac01cb60d1cb00ac9dacfa62c6c3b913a244379ce70bd03265424e29052e6
 EBUILD pygame-2.1.2-r1.ebuild 2011 BLAKE2B 3d721d8ce7918067e94e2afb583e66d8f8d567b1d01d2b9827f1df5bf3e13e5ccf938bab043982f8d7ab379f36956153fd6ff65fdcb541f7fb2793bb8f83595b SHA512 489fbd4bac984cccb0be03dff55123228dde3002348273c176262eba6350300f5c27234bb60cd0723658ff1ef7964531e3533b8a3f75d2a496016c1752b05de6
 EBUILD pygame-2.1.2-r2.ebuild 2157 BLAKE2B 133a6d73be620e5001376d9d39cc02e1a0e818951359abe732416f44f2c5615affca5313025ac9f6ee8697680c086a2972a7717f23d5ee15730698fcd81497a5 SHA512 bf29df0a51dc388ff81eb88594fb0909ee9e74a28c3a24b8106493cd736de316e69f3653703287a883cd48170f5bc6935d84e5d486b19480bcd8aca132ad1837
-EBUILD pygame-2.1.3.ebuild 1976 BLAKE2B 66e8dbfa81472ecf5cba9554a4a69081c13cb27525bf2ddd355545af0722bb52502cad3a88c40704d6aee74b66f71350f04b6221c597a5855de6726d775c0373 SHA512 60b899c22e64df6d45217a916ef67f5eb17db20ef45bb5398d8deeb681310718ca275bc5e6b15354302482b774f8bc8097b4cb3de6eff53e4437b51c965639e5
+EBUILD pygame-2.1.3.ebuild 1982 BLAKE2B 581b21e496bd4c43e48d075ac3fa9556104682b930f39aceb0a88be6e82670d72e68693ac3fd297aa6bba10dcd85e9e05608862064ceca7bff573602597b940c SHA512 12bf3411ae28330672d9d70c92c353c35bb121e3da64142107a1aa06a3787b309f8e4ea0c21b1e7237576dcdcacc48b407764e3347780eaf5925913ec05808a6
 MISC metadata.xml 462 BLAKE2B 398db1c050bbf14a65ac770e980ca91269277ecb00d94457502532ef7c407145cc2438ead46d370d1195331fd3d2f9602ecbb381c9f178240d031d1c665a9324 SHA512 2e95b731a4cb49372e6af00bb059bd179dc167aaac07f412c51970cf27b0fdddda616fb59bbbd62101c1b6f272cc0263123e334df01ebf6d1697ef8b55b62fef
diff --git a/dev-python/pygame/pygame-2.1.3.ebuild b/dev-python/pygame/pygame-2.1.3.ebuild
index 855f68683bbc..fd31e5a5fe0e 100644
--- a/dev-python/pygame/pygame-2.1.3.ebuild
+++ b/dev-python/pygame/pygame-2.1.3.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{9..11} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/pyopengl/Manifest b/dev-python/pyopengl/Manifest
index 9ade44221ca2..52ec8f526fff 100644
--- a/dev-python/pyopengl/Manifest
+++ b/dev-python/pyopengl/Manifest
@@ -1,5 +1,5 @@
 DIST PyOpenGL-3.1.6.tar.gz 1903892 BLAKE2B 7d1109a09703a7113aa9cc02994662df77bea1da63e81a8adbdc812514b71e04bfa51dad9e48c0e0b98327e4f7deda7a8590c340a38127d38e91659f38739220 SHA512 b6f2f083df0fd7cf8f8a1077f42fa388bce94c0edde00ed6492104af8306c9925b74649cd2c222be4205b0892e7975de2f7591d0f0bcd9540eb53c0de95fec00
 DIST pyopengl-3.1.6-glut-font-egl.patch 1430 BLAKE2B 4b8962045b1efce2b4ec8ca759689d880e8df074e98c8c680172fd01d6cfbae33148cef41c46c7d1231674836d0009626ccedd873fcfe35f644fe9a2aaab2d5e SHA512 a0c491bca31cff312a2f431f89109cbf3aff276aee375325cacc5c6ebe37ad2119072ad7658e11b56efd62b18b8ed2642de999c79b0c999414e44c2b1ec7225b
-EBUILD pyopengl-3.1.6-r2.ebuild 1369 BLAKE2B afa9889a051536c0ddb2aecb6aac598e611860564ea2b5b1d54842ed6f28896dc04b1dd11a8e6bcfa2d190b0a3815a38f57cd6d500edf185ec8814f312d469ed SHA512 b09cfed2a25ed3f77dde5c97a53fee1c7e6ebca68d12b0a36139f92350f034da3a388e4e6f355c14c3f853e41b5ffe6554a047552fbb0d8c6860dca81d9a047c
+EBUILD pyopengl-3.1.6-r2.ebuild 1332 BLAKE2B 0a73635a53913a9995d5901d26b254932c7c51e517c92ebcb424b9c27a707243c37023190fc272356efa7e0759a8d48673f810477c23124dfef05fd5ac178547 SHA512 b5afbd53722b61f0bc42b26c4675f60bfe6861902b9c01e9753b62ae486f7143edef282e9954c316d562c9b2fbb658140d8fb0f581a8f35faed59fafc709bc22
 EBUILD pyopengl-3.1.6.ebuild 1141 BLAKE2B 450f7d3f7f29f578171e0b6e232ac52bcb5c63fdc7612c367e99605665dd0bddb8e9156c4b3255adf18cb9f5d33bfc907131dd11db34432689e8c9d92726008e SHA512 c3fb429e35962ccf58ee1b3112ed51979706db28c5cf75116e8207a01ecae690db46458a6e9af8507b301defbc91daf7426956778b2d54884ea6a4539d312638
 MISC metadata.xml 422 BLAKE2B c9ee324fb408e8d0856193fde1324109e77c97f28fff0dc83d9c903cf3e2385c3401d8f949d50fc2e2a9c41b79c421298e04fc79639b79352138f41aeafb7018 SHA512 bedbbc7fcafc2c625f79241e75faeafd0d3c37b4186b5ef8842e8612d9527a4991f208b1878b1f1e28f4056eab2104e7acb57814e39ee82c0208d6f93fbb7b85
diff --git a/dev-python/pyopengl/pyopengl-3.1.6-r2.ebuild b/dev-python/pyopengl/pyopengl-3.1.6-r2.ebuild
index 44ac3dc91257..b6e9981b895c 100644
--- a/dev-python/pyopengl/pyopengl-3.1.6-r2.ebuild
+++ b/dev-python/pyopengl/pyopengl-3.1.6-r2.ebuild
@@ -7,10 +7,7 @@ DISTUTILS_USE_PEP517=setuptools
 PYTHON_REQ_USE="tk?"
 PYTHON_COMPAT=( python3_{9..11} )
 
-inherit distutils-r1 virtualx
-
-MY_PN="PyOpenGL"
-MY_P="${MY_PN}-${PV}"
+inherit distutils-r1 pypi virtualx
 
 DESCRIPTION="Python OpenGL bindings"
 HOMEPAGE="
@@ -19,11 +16,11 @@ HOMEPAGE="
 	https://pypi.org/project/PyOpenGL/
 "
 SRC_URI="
-	mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz
+	$(pypi_sdist_url --no-normalize PyOpenGL)
 	https://github.com/mcfletch/pyopengl/commit/2d2457b4d565bce1c58b76b427e1f9027e8b4bcc.patch
 		-> ${P}-glut-font-egl.patch
 "
-S="${WORKDIR}/${MY_P}"
+S="${WORKDIR}/PyOpenGL-${PV}"
 
 LICENSE="BSD"
 SLOT="0"
diff --git a/dev-python/symengine/Manifest b/dev-python/symengine/Manifest
index 965885839ca5..fb7e929153b2 100644
--- a/dev-python/symengine/Manifest
+++ b/dev-python/symengine/Manifest
@@ -1,6 +1,7 @@
 AUX symengine-0.9.2-cmake-setuptools.patch 2629 BLAKE2B 625278ad90c6ed44c1ba99f8744d6b9a7c7da42d04c734385d53bc6b4e3b61aa1675159c7bb3048bb6a1b988b0836cfbe7818934c8171f3ae55dddc73a0189be SHA512 3f87c37ddf506c3a8aaf652d787f1c40e937ee2b2f17aece2c10d4a0218d67b52b1cc7c8ee3e504b2b1f8b87144e4b35c8a2ec061b054591c04ed0a7ed04b4d1
 AUX symengine-0.9.2-setuptools-61.patch 566 BLAKE2B 362c880be08c98da85b1ae2a13ca7cc422af5f07730eebc6d9eee6bbcab703df3baf88925e10a417e261eceb83ee36ff6b8e8b824bc1497e1a462b746712c317 SHA512 dc2c85d0a39a58bb0011aee4cc0852815568eb0a310f39ee0aa8b2500a6266ddab2cb03d7bbcf317897c64cf31f3909a40d12cba1c0392291ffdbb7b348b1c98
+DIST symengine.py-0.9.2.gh.tar.gz 110856 BLAKE2B 11330acc04970d367fe66787521776dbd803929d91802ea09d1bc54a96c8fd87e85114042f57fc8c007de2dcaa1b0503a8389ac677797cc2efc866d71d76d1db SHA512 ea9e8cb7dd789b551f5372c32b98365ab251bac838204b5c832783f9866c2774f5d411f2f59e5e60f17939a1c341702acfc3e3f7e77246330ab3cb74f5ba7cca
 DIST symengine.py-0.9.2.tar.gz 110856 BLAKE2B 11330acc04970d367fe66787521776dbd803929d91802ea09d1bc54a96c8fd87e85114042f57fc8c007de2dcaa1b0503a8389ac677797cc2efc866d71d76d1db SHA512 ea9e8cb7dd789b551f5372c32b98365ab251bac838204b5c832783f9866c2774f5d411f2f59e5e60f17939a1c341702acfc3e3f7e77246330ab3cb74f5ba7cca
 EBUILD symengine-0.9.2-r1.ebuild 1203 BLAKE2B b5b7a45528031359d386d35a5b79f82248027cfa80b4a8c1fbd86145791bafea52ccc1626ba594958f8b0b87cdce95559dc5835f74c85476bbc3a0979cfd6a23 SHA512 dc92dcd46f8b913c6a4d14a725bf1681dff6f595c16ea4845d03cd6cade9a970949a8d82e5a91073c466b8fb8dc84a5edb2a95485a18b002941d602758cbe05b
-EBUILD symengine-0.9.2-r2.ebuild 1205 BLAKE2B 7fe57b8e0d9f098d741ac34450fd05e2a22d6c61c75f24cce48dbdcb04b6d35a8804b68313c0214f5bdb4b02956583122a00bf62393f0f99a7e35af67fbde68b SHA512 672fa8f955ac436cdcde5a7914022aad8a14070a2b753f2297366ae5720577af6ad214f73c2012440fc2ed2ad5bea945c7c82a0629c3178d83219125eb465c72
+EBUILD symengine-0.9.2-r2.ebuild 1181 BLAKE2B f0459729f3c71a07e7a731230cd51cb718a0b9458783408ddf074e89bf0d88813d4890724c199154134fd4ab14d83a82f73711f3d654c07709e82ed1d1e8bbc7 SHA512 1b6a03b733f2acbdbce0c0ef104e6234a2dda77ca23ce978c64befa4116444cd83da7d4b45e9663bf52a22c37b9aed5f77e61ba9233f2bd95b51aaea7fbf3ed8
 MISC metadata.xml 505 BLAKE2B 9c9b44455691ec31e5eed2f355dc4633ba05548c6e00fe49e665ad7fd1867bd6a7345f84409ea14049cc01818ef67d7795afff4e01fe88c25b1977f4d6f0fbff SHA512 6a774984cef49d82908bced7cf61bb5550207503335ae09abd9c08cdde5396cbf123d7ed5d49934ccf7dbc5167f0c13f2e6ecf31bca9f5af0a2f7c46f22bf9df
diff --git a/dev-python/symengine/symengine-0.9.2-r2.ebuild b/dev-python/symengine/symengine-0.9.2-r2.ebuild
index d0dc5ac3c521..2d540508032a 100644
--- a/dev-python/symengine/symengine-0.9.2-r2.ebuild
+++ b/dev-python/symengine/symengine-0.9.2-r2.ebuild
@@ -10,11 +10,15 @@ inherit distutils-r1
 
 MY_P=${PN}.py-${PV}
 DESCRIPTION="Python wrappers to the symengine C++ library"
-HOMEPAGE="https://github.com/symengine/symengine.py/"
+HOMEPAGE="
+	https://github.com/symengine/symengine.py/
+	https://pypi.org/project/symengine/
+"
 SRC_URI="
 	https://github.com/symengine/symengine.py/archive/v${PV}.tar.gz
-		-> ${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
+		-> ${MY_P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}
 
 LICENSE="MIT"
 SLOT="0"
@@ -29,11 +33,13 @@ BDEPEND="
 "
 # See bug #786582 for symengine constraint
 # See also https://github.com/symengine/symengine.py/blob/master/symengine_version.txt
-RDEPEND="
+DEPEND="
 	dev-python/numpy[${PYTHON_USEDEP}]
 	>=sci-libs/symengine-$(ver_cut 1-2):=
 "
-DEPEND="${RDEPEND}"
+RDEPEND="
+	${DEPEND}
+"
 
 # the C library installs the same docs
 DOCS=()
@@ -49,8 +55,3 @@ python_test() {
 	cd "${BUILD_DIR}/install$(python_get_sitedir)" || die
 	epytest
 }
-
-python_install() {
-	distutils-r1_python_install
-	python_optimize
-}
diff --git a/dev-python/sympy/Manifest b/dev-python/sympy/Manifest
index 457714998a05..63ce85c3c58e 100644
--- a/dev-python/sympy/Manifest
+++ b/dev-python/sympy/Manifest
@@ -1,5 +1,5 @@
 AUX sympy-1.11-no-deprecated-threading-event-api.patch 1985 BLAKE2B bed11566b12fb49e7f52d176d536b15872a1b7cf8e570c17a068126f38cdf13f1d94d8f6c2d74e086d9e6c4ecfc6498613318f4e2f9f8a261224f1cc8bb4b908 SHA512 5df7337eb1c4bdc66b30a5a6db9047a9ed590fdcd7fb7cbc82a4c7342c4d2d047cbfd8549748ea3e0e4db8dc6e1ad97984fca87d85489dffe78599f7e2e29745
 DIST sympy-1.11.1.gh.tar.gz 13462495 BLAKE2B a45320d087057595d3574490c6dc07bcdf7870543e9adcbaca9abe293d84875c123bbc91a7263a87b0b71568dece4e1304b6bf76f60ae64e353520f0ca686b1f SHA512 6cc720b673cf31a2e8f56a5cae24ec15024ea43dee92196adb0a87f28561b5d2404fbbfd3d55a8414930a31d4d0f4a731d458ad528c8cbb03c37555f5c14ce4a
-EBUILD sympy-1.11.1-r1.ebuild 1808 BLAKE2B 4303cc7acd257733707711ece0886dccf48c73fffb9f953be320b0322f1fd820372f43da89e37ef12cb0854e38e1f522ff8d5c59a971bcf3f87bf345d3981f4b SHA512 c3b279aa371b1751cba7e59a991dadda8306701f2a9d24025a3e04dbf0b31eb314491a1cc58e4f12c525ecc320f783f99d940015b860ad47df10a2290f22774c
+EBUILD sympy-1.11.1-r2.ebuild 1805 BLAKE2B f2b52ac49b99d554105f557cfca025dd119c4946bfe1a460fb52273860f80544f1e3edcf491fca7c76da91b29f06d2937b9ee177d1dba23afb988a26224763d7 SHA512 f3a3f153198f044196dd1cee5da56f247b497f3b0a07bd9d658702612f02fc9f9e6bf00bcf357297fc768145f26108f574baff20cfa9a7c1fb80cb968c4246ae
 EBUILD sympy-1.11.1.ebuild 1686 BLAKE2B a2f2b3bf4de552715033b9e0944a5b5c21b3c2bc35c216a097264b7e60f3b71eaf90eb754be662862d1b91b3f5fa01cc64954cee02a5c94ba61eaeeb75e26d25 SHA512 b239558442e8bb7b41dfd2fde26ccefc2a041fb228e1c89f64e833be222f340066350293d3353c2ea5c63f77fc2a71cd40f073f278f6c6a4762b3449a228eb01
 MISC metadata.xml 1722 BLAKE2B 09837a8e4ed0d70cf62a2e5028d480ffd7d15d821220c771dec04380e9707da56625651a49ac656a7de27ee3e8f395091abe763d2d3c59cfe32bf363cdba60cf SHA512 fad83c852dd953709e20056b0da38a0f0504bc70a99d9a9fbf295d98ed462811ee6fcf755d5ad1aeb515fd62fafe35a609f6d2892af2ed921870b6f5c38edc5f
diff --git a/dev-python/sympy/sympy-1.11.1-r1.ebuild b/dev-python/sympy/sympy-1.11.1-r2.ebuild
index df5b5e24a757..ab9c1ba34620 100644
--- a/dev-python/sympy/sympy-1.11.1-r1.ebuild
+++ b/dev-python/sympy/sympy-1.11.1-r2.ebuild
@@ -30,7 +30,7 @@ RDEPEND="
 		png? ( app-text/dvipng )
 		pdf? ( app-text/ghostscript-gpl )
 	)
-	mathml? ( dev-libs/libxml2:2[${PYTHON_USEDEP}] )
+	mathml? ( dev-python/lxml[${PYTHON_USEDEP}] )
 	opengl? ( dev-python/pyopengl[${PYTHON_USEDEP}] )
 	pyglet? ( dev-python/pyglet[${PYTHON_USEDEP}] )
 	symengine? ( dev-python/symengine[${PYTHON_USEDEP}] )
diff --git a/dev-python/untangle/Manifest b/dev-python/untangle/Manifest
index d049c966bf79..1099ea61f48a 100644
--- a/dev-python/untangle/Manifest
+++ b/dev-python/untangle/Manifest
@@ -1,3 +1,3 @@
 DIST untangle-1.2.1.gh.tar.gz 24598 BLAKE2B b2f4c43de92dd0fcfcc8f805c91887cc85e9648c3ae83ad95f4c5949ee53c8cf8707e0f2a2e638e47df2b8076d80808116b7666c8e2476857aea5d6ed574186a SHA512 dd0f828b4e1e33bce7d6d735788d36410fb81d4a67b2b449bfd70670ab68df6f5589e12666f515322e998b0df9a0a5ed88130ec17eff86904e5293a5473385ee
-EBUILD untangle-1.2.1-r1.ebuild 645 BLAKE2B 969a415e51e7b499a47f29bcf0b9068ccb6fa6340811dbcc2cc9e1fe7cd0e7c8a555192fafe526c2f75b3ffe53c0f70b8a694a01371e7d9134941c1d89f9481e SHA512 dd8817a1810885550314bb2ca10146028d913b0e63dee852215673a09b27b2b80cadb4f8f168b9c7f740183e158ac18fb3c5d0fbcc3493e4e60153181c4f0ebb
+EBUILD untangle-1.2.1-r1.ebuild 651 BLAKE2B 4b9c60e3464003e228adad9a1ace9d811817cf0e623eb44cc08328c3914ea09a7598105d133f9593e621cd84a145a888edb390f089553562695219764d6a3523 SHA512 41b82aba5e3ae74b88c803f9c9dfac89fd1c17f5f45566940922ea56fd84db30e3d127db6357f2fd3793eb57a12b5e79335bc77ecae299740d577097f8793291
 MISC metadata.xml 506 BLAKE2B 03e5e8b0a9b742266e53ec581d01ace63c08617e07cf8a06f1a7a45e6964987a8369fda7415060e5d0672c66d6633318b617464a9d6bef697b73e3904c657bd1 SHA512 f119d2ef412fd2596b05fabf055121a357c779952d00e788f391930c8a294c550a917751c3de4f81d00d83a47e4a4009769ebc554af7c2fa8feed3350900c39f
diff --git a/dev-python/untangle/untangle-1.2.1-r1.ebuild b/dev-python/untangle/untangle-1.2.1-r1.ebuild
index c3a950140318..31bb4153f27a 100644
--- a/dev-python/untangle/untangle-1.2.1-r1.ebuild
+++ b/dev-python/untangle/untangle-1.2.1-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=poetry
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{9..11} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/xcffib/Manifest b/dev-python/xcffib/Manifest
index 3ac7eda94898..0f4eb9e92578 100644
--- a/dev-python/xcffib/Manifest
+++ b/dev-python/xcffib/Manifest
@@ -1,3 +1,3 @@
 DIST xcffib-1.2.0.tar.gz 88972 BLAKE2B a8d9be7c3149f696d06474aab85e9f7605d45e9861151192dbb7b51e48483f75adb721e17531432294d19d8d6498b66ba312702ea011e8470c3ac42ac0cd6e23 SHA512 7012833f2877edea92cdc15030543883e2a848264c034a81222626ad48a69fcdac8a88cec2e07e61a80102640baa7fbdf29bbf25e08e59fc896aada08533bb77
-EBUILD xcffib-1.2.0.ebuild 846 BLAKE2B fc3c63f369bfb2556cd1037f43388db5e41faaf4eb0fb8e393792801d7ef67a6d23a83f924756120a887f479078d75bc41cd9837b1d9c42b6e496da3d0252dd6 SHA512 b7822bd562ffc3d828129992b6f6f79955ec91879a9e7d5b736c5d6012960633ff8a6ee1a84afa83a53e6e9fa48325c462f06c95dc3d9be33cdfe7f1b9ac1ea2
+EBUILD xcffib-1.2.0.ebuild 805 BLAKE2B 273fcacfa407eaeddb2a1e05cd46580766fc03307a8224b5cee35f38131aa6d025bbc98dba2cc7c6545284f79b1115e4d40534764629b2ea90e69a1a0b206f2a SHA512 38aa6f5b01ffff693d5bcad5a199ad4eebfbed9508e9038618aa1651365dd9402d49cadae0983315b99947ed5052862067bcc825b873761fd6bcfffd75062de1
 MISC metadata.xml 374 BLAKE2B 7f2845d0839dff2568de08f86ce6b8387e76ff450467e14b5c291ad1f55256cb9eff1ff318973e54846ad394b56a3e1e6aa8574fcc0bc39a1c9f7d3b42a1109d SHA512 9403d3d706b5281d6abe2d2fca33b1a70983c7c205f8a5899ad0469fe9a1cd0ceb6c9b27916e1e152467d029d86fc9e6dc28f967bc108499ed901582ad1bbd00
diff --git a/dev-python/xcffib/xcffib-1.2.0.ebuild b/dev-python/xcffib/xcffib-1.2.0.ebuild
index ac03fa10604e..4e5502340699 100644
--- a/dev-python/xcffib/xcffib-1.2.0.ebuild
+++ b/dev-python/xcffib/xcffib-1.2.0.ebuild
@@ -3,17 +3,16 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{9..11} pypy3 )
 DISTUTILS_USE_PEP517=setuptools
 
-inherit distutils-r1
+inherit distutils-r1 pypi
 
 DESCRIPTION="A drop in replacement for xpyb, an XCB python binding"
 HOMEPAGE="
 	https://github.com/tych0/xcffib/
 	https://pypi.org/project/xcffib/
 "
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
diff --git a/dev-python/xlwt/Manifest b/dev-python/xlwt/Manifest
index 300a515ae259..c8eb0f5cde85 100644
--- a/dev-python/xlwt/Manifest
+++ b/dev-python/xlwt/Manifest
@@ -1,3 +1,3 @@
 DIST xlwt-1.3.0.tar.gz 153929 BLAKE2B f0edb823201e477aca23af1edaa2a7bcf95aeb5b9b191f4d9a8be9e052d68699887cd829c2304b26334fb3e92d4a1fc1d0dbfabb477889a1295255170408715c SHA512 e09c515bda7edadb9624b842796a537316c1e2e06f3e74aca5440a5797dbc259036539fd64ea61648a30894f4091d3be829411d36e6170894980728c798c5963
-EBUILD xlwt-1.3.0-r2.ebuild 822 BLAKE2B 70b3ba5d51b9a994ceb328572817a604b23d23092430576a2c0dc54b4b207398d37e9e1f58c7c54d068d1514d56dac7be5db4a37e7c4ff5073c05e557404e6b0 SHA512 b5e39f2d951437a3eae99bb2daec34d2421ad05b99365c9de0389bc456f2a6ec70c3aa85139129493b547d7ced3399da2d8c221f034ae7e99cf27ed3d73facc7
-MISC metadata.xml 684 BLAKE2B 7069281bea7b838c27970185e2cd1702da78b66083ec0bae258aaf694d0a6dc73053b4acdc53523341dbead4a8c91fe415cb0a9bdada435e29b7aeb1f1b739cf SHA512 b7daf40465334b500fb65a753f737b41f0b5fcafa58c90fbf693f48dbed8fbc8c6f044ba6af02ffc57303c7ea7aa40182afba75731148450054e700de69d7cde
+EBUILD xlwt-1.3.0-r2.ebuild 781 BLAKE2B 62e74134dc27b6239a356a4d32918feb0708ffb7369ebd21e7e6e9e14affa79cc4159fbb0e28a18626f0b51c43c59aaa99f08b4934e525091bf1e4b8413a4070 SHA512 e2d4695c93a24c9ba4f2b0f47964d86903fd5ab132552106cd49d182a66ffcefd7dca148aecfedb70cbc81c0245e8ba8ddc657ed4d1ec12b7d6a5b7194847d0c
+MISC metadata.xml 741 BLAKE2B d6ecdcb7f5a38ac8344e66823aa9271cc83ea03f2380b626e2dac7fd6b6b401bed71e748e3eaa0c0cfd384d0eb59151231b123eadcef69b31a79cde83884b5e6 SHA512 eb4ddcc6344319e9241662ecdfef96aeaefa75744cb2eea1dd5c9bd1a6d275f187c14b733e9390542edee417967ccad400cdf4604083e097487faf5c52597c21
diff --git a/dev-python/xlwt/metadata.xml b/dev-python/xlwt/metadata.xml
index be0063d5e711..9db189d161b5 100644
--- a/dev-python/xlwt/metadata.xml
+++ b/dev-python/xlwt/metadata.xml
@@ -14,6 +14,7 @@
 	</longdescription>
 	<stabilize-allarches/>
 	<upstream>
+		<remote-id type="github">python-excel/xlwt</remote-id>
 		<remote-id type="pypi">xlwt</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/xlwt/xlwt-1.3.0-r2.ebuild b/dev-python/xlwt/xlwt-1.3.0-r2.ebuild
index f8a5fdfa0e78..ff6960964f44 100644
--- a/dev-python/xlwt/xlwt-1.3.0-r2.ebuild
+++ b/dev-python/xlwt/xlwt-1.3.0-r2.ebuild
@@ -4,9 +4,9 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{9..11} pypy3 )
 
-inherit distutils-r1
+inherit distutils-r1 pypi
 
 DESCRIPTION="Python library to create spreadsheet files compatible with Excel"
 HOMEPAGE="
@@ -14,7 +14,6 @@ HOMEPAGE="
 	https://github.com/python-excel/xlwt/
 	https://pypi.org/project/xlwt/
 "
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"