*/*: replace uses of mirror://pypi/ with pypi.eclass

Signed-off-by: YiFei Zhu <zhuyifei1999@gmail.com>
2026-04-07 03:10:15 -04:00 · 2023-05-21 12:40:23 -07:00
parent c982ad6c0f
commit 8239a20364
37 changed files with 71 additions and 108 deletions
--- a/dev-python/asyncpg/asyncpg-0.26.0.ebuild
+++ b/dev-python/asyncpg/asyncpg-0.26.0.ebuild
@@ -5,11 +5,10 @@ EAPI=8

 PYTHON_COMPAT=( python3_{10..11} )  # doesn't build with pypy3
 DISTUTILS_USE_PEP517=setuptools
-inherit distutils-r1
+inherit distutils-r1 pypi

 DESCRIPTION="A fast PostgreSQL Database Client Library for Python/asyncio"
 HOMEPAGE="https://github.com/MagicStack/asyncpg"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"

 LICENSE="Apache-2.0"
 SLOT="0"
--- a/dev-python/azure-storage-blob/azure-storage-blob-12.14.1.ebuild
+++ b/dev-python/azure-storage-blob/azure-storage-blob-12.14.1.ebuild
@@ -5,14 +5,15 @@ EAPI=8

 PYTHON_COMPAT=( python3_{10..11} )
 DISTUTILS_USE_PEP517=setuptools
-inherit distutils-r1
+PYPI_NO_NORMALIZE=1
+inherit distutils-r1 pypi

 DESCRIPTION="Microsoft Azure Blob Storage Client Library for Python"
 HOMEPAGE="
 	https://pypi.org/project/azure-storage-blob/
 	https://github.com/Azure/azure-sdk-for-python
 "
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
+SRC_URI="$(pypi_sdist_url --no-normalize ${PN} ${PV} .zip)"

 LICENSE="MIT"
 SLOT="0"
--- a/dev-python/browserstack-local-python/browserstack-local-python-1.2.3.ebuild
+++ b/dev-python/browserstack-local-python/browserstack-local-python-1.2.3.ebuild
@@ -3,19 +3,17 @@

 EAPI=8

-MYP="${P/-python/}"
-MYPN="${PN/-python/}"
+PYPI_PN="${PN/-python/}"
+PYPI_NO_NORMALIZE=1
 PYTHON_COMPAT=( python3_{10..11} pypy3 )

-inherit distutils-r1
+inherit distutils-r1 pypi

 DESCRIPTION="Python bindings for BrowserStack Local"
 HOMEPAGE="
 	https://github.com/browserstack/browserstack-local-python
 	https://pypi.org/project/browserstack-local/
 "
-SRC_URI="mirror://pypi/${MYPN:0:1}/${MYPN}/${MYP}.tar.gz"
-S="${WORKDIR}/${MYP}"
 KEYWORDS="~amd64"
 LICENSE="MIT"
 SLOT="0"
--- a/dev-python/cx-oracle/cx-oracle-8.3.0.ebuild
+++ b/dev-python/cx-oracle/cx-oracle-8.3.0.ebuild
@@ -4,18 +4,16 @@
 EAPI="8"

 PYTHON_COMPAT=( python3_10 )
+PYPI_PN="cx_Oracle"
+PYPI_NO_NORMALIZE=1

-inherit distutils-r1
-
-MY_PN="cx_Oracle"
-MY_P=${MY_PN}-${PV}
+inherit distutils-r1 pypi

 DESCRIPTION="Python interface to Oracle"
 HOMEPAGE="
 	https://oracle.github.io/python-cx_Oracle/
 	https://pypi.org/project/cx-Oracle/
 "
-SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"

 LICENSE="BSD"
 SLOT="0"
@@ -29,8 +27,6 @@ RESTRICT="test"
 DEPEND="dev-db/oracle-instantclient"
 RDEPEND="${DEPEND}"

-S=${WORKDIR}/${MY_P}
-
 python_prepare_all() {
 	# do not install LICENSE and README to /usr/
 	sed -i -e '/data_files/d' setup.py || die
--- a/dev-python/decopatch/decopatch-1.4.9.ebuild
+++ b/dev-python/decopatch/decopatch-1.4.9.ebuild
@@ -9,11 +9,10 @@ DISTUTILS_USE_PEP517=setuptools
 DOCS_BUILDER="mkdocs"
 DOCS_DEPEND="dev-python/mkdocs-material"

-inherit distutils-r1 docs
+inherit distutils-r1 docs pypi

 DESCRIPTION="Create decorators easily in python"
 HOMEPAGE="https://pypi.org/project/decopatch/ https://github.com/smarie/python-decopatch"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"

 LICENSE="BSD"
 SLOT="0"
--- a/dev-python/googletrans/googletrans-4.0.0_rc1.ebuild
+++ b/dev-python/googletrans/googletrans-4.0.0_rc1.ebuild
@@ -3,12 +3,12 @@

 EAPI=8
 PYTHON_COMPAT=( python3_10 pypy3 )
-inherit distutils-r1
+inherit distutils-r1 pypi

 MY_PV=${PV/_/}
 DESCRIPTION="Free Google Translate API for Python. Translates totally free of charge."
 HOMEPAGE="https://pypi.org/project/googletrans/ https://github.com/ssut/py-googletrans"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${PN}-${MY_PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="$(pypi_sdist_url --no-normalize ${PN} ${MY_PV}) -> ${P}.tar.gz"
 S="${WORKDIR}/${PN}-${MY_PV}"

 LICENSE="MIT"
--- a/dev-python/i3ipc/i3ipc-2.2.1.ebuild
+++ b/dev-python/i3ipc/i3ipc-2.2.1.ebuild
@@ -5,11 +5,10 @@ EAPI=7

 PYTHON_COMPAT=( python3_10 )

-inherit distutils-r1
+inherit distutils-r1 pypi

 DESCRIPTION="An improved Python library to control i3wm and sway."
 HOMEPAGE="https://github.com/altdesktop/i3ipc-python"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"

 LICENSE="BSD"
 SLOT="0"
--- a/dev-python/insipid-sphinx-theme/insipid-sphinx-theme-0.4.0.ebuild
+++ b/dev-python/insipid-sphinx-theme/insipid-sphinx-theme-0.4.0.ebuild
@@ -4,15 +4,15 @@
 EAPI=8

 DISTUTILS_USE_PEP517=setuptools
+PYPI_NO_NORMALIZE=1
 PYTHON_COMPAT=( pypy3 python3_{10..11} )
-inherit distutils-r1
+inherit distutils-r1 pypi

 DESCRIPTION="An insipid Sphinx theme"
 HOMEPAGE="
 	https://pypi.org/project/insipid-sphinx-theme/
 	https://github.com/mgeier/insipid-sphinx-theme
 "
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"

 LICENSE="BSD-2"
 SLOT="0"
--- a/dev-python/mastodon-py/mastodon-py-1.8.0.ebuild
+++ b/dev-python/mastodon-py/mastodon-py-1.8.0.ebuild
@@ -5,7 +5,9 @@ EAPI=8

 DISTUTILS_USE_PEP517=setuptools
 PYTHON_COMPAT=( python3_{10..11} )
-inherit distutils-r1 optfeature
+PYPI_NO_NORMALIZE=1
+PYPI_PN="Mastodon.py"
+inherit distutils-r1 optfeature pypi

 MY_PN="Mastodon.py"
 MY_P="${MY_PN}-${PV}"
@@ -14,8 +16,6 @@ HOMEPAGE="
 	https://pypi.org/project/Mastodon.py/
 	https://github.com/halcy/Mastodon.py
 "
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"

 LICENSE="MIT"
 SLOT="0"
--- a/dev-python/msrest/msrest-0.7.1.ebuild
+++ b/dev-python/msrest/msrest-0.7.1.ebuild
@@ -6,11 +6,11 @@ EAPI=8
 PYTHON_COMPAT=( python3_{10..11} )
 PYTHON_REQ_USE="xml(+)"
 DISTUTILS_USE_PEP517=setuptools
-inherit distutils-r1 optfeature
+inherit distutils-r1 optfeature pypi

 DESCRIPTION="AutoRest swagger generator Python client runtime"
 HOMEPAGE="https://github.com/Azure/msrest-for-python"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
+SRC_URI="$(pypi_sdist_url ${PN} ${PV} .zip)"

 LICENSE="MIT"
 SLOT="0"
--- a/dev-python/os-api-ref/os-api-ref-2.3.0.ebuild
+++ b/dev-python/os-api-ref/os-api-ref-2.3.0.ebuild
@@ -5,15 +5,15 @@ EAPI=8

 EPYTEST_DESELECT=( os_api_ref/tests/test_microversions.py::TestMicroversions::test_parameters_table )
 PYTHON_COMPAT=( python3_10 )
+PYPI_NO_NORMALIZE=1

-inherit distutils-r1
+inherit distutils-r1 pypi

 DESCRIPTION="Sphinx Extensions to support API reference sites in OpenStack"
 HOMEPAGE="
 	https://opendev.org/openstack/os-api-ref
 	https://pypi.org/project/os-api-ref/
 "
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"

 LICENSE="Apache-2.0"
 SLOT="0"
--- a/dev-python/pydispatcher/pydispatcher-2.0.7.ebuild
+++ b/dev-python/pydispatcher/pydispatcher-2.0.7.ebuild
@@ -5,13 +5,12 @@ EAPI=8

 PYTHON_COMPAT=( python3_{10..11} )
 DISTUTILS_USE_PEP517=setuptools
-inherit distutils-r1
+PYPI_PN="PyDispatcher"
+PYPI_NO_NORMALIZE=1
+inherit distutils-r1 pypi

 DESCRIPTION="Multi-producer-multi-consumer signal dispatching mechanism"
 HOMEPAGE="https://github.com/mcfletch/pydispatcher"
-MY_P=PyDispatcher
-SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_P}/${MY_P}-${PV}.tar.gz"
-S=${WORKDIR}/${MY_P}-${PV}

 LICENSE="BSD"
 SLOT="0"
--- a/dev-python/pymeeus/pymeeus-0.5.11.ebuild
+++ b/dev-python/pymeeus/pymeeus-0.5.11.ebuild
@@ -5,7 +5,9 @@ EAPI=8

 PYTHON_COMPAT=( python3_{10..11} pypy3 )
 DISTUTILS_USE_PEP517=setuptools
-inherit distutils-r1
+PYPI_PN="PyMeeus"
+PYPI_NO_NORMALIZE=1
+inherit distutils-r1 pypi

 MY_PN="PyMeeus"
 MY_P="${MY_PN}-${PV}"
@@ -14,8 +16,6 @@ HOMEPAGE="
 	https://pypi.org/project/PyMeeus/
 	https://github.com/architest/pymeeus
 "
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"

 LICENSE="LGPL-3"
 SLOT="0"
--- a/dev-python/pymeeus/pymeeus-0.5.12.ebuild
+++ b/dev-python/pymeeus/pymeeus-0.5.12.ebuild
@@ -5,17 +5,15 @@ EAPI=8

 PYTHON_COMPAT=( python3_{10..11} pypy3 )
 DISTUTILS_USE_PEP517=setuptools
-inherit distutils-r1
+PYPI_PN="PyMeeus"
+PYPI_NO_NORMALIZE=1
+inherit distutils-r1 pypi

-MY_PN="PyMeeus"
-MY_P="${MY_PN}-${PV}"
 DESCRIPTION="Python implementation of Jean Meeus astronomical routines"
 HOMEPAGE="
 	https://pypi.org/project/PyMeeus/
 	https://github.com/architest/pymeeus
 "
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"

 LICENSE="LGPL-3"
 SLOT="0"
--- a/dev-python/pytest-cases/pytest-cases-3.6.13.ebuild
+++ b/dev-python/pytest-cases/pytest-cases-3.6.13.ebuild
@@ -5,15 +5,15 @@ EAPI=8

 PYTHON_COMPAT=( python3_{10..11} )
 DISTUTILS_USE_PEP517=setuptools
+PYPI_NO_NORMALIZE=1

 DOCS_BUILDER="mkdocs"
 DOCS_DEPEND="dev-python/mkdocs-material"

-inherit distutils-r1 docs
+inherit distutils-r1 docs pypi

 DESCRIPTION="Separate test code from test cases in pytest"
 HOMEPAGE="https://pypi.org/project/pytest-cases/ https://github.com/smarie/python-pytest-cases"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"

 LICENSE="BSD"
 SLOT="0"
--- a/dev-python/pytest-click/pytest-click-1.1.0.ebuild
+++ b/dev-python/pytest-click/pytest-click-1.1.0.ebuild
@@ -5,17 +5,13 @@ EAPI=8

 DISTUTILS_USE_PEP517=setuptools
 PYTHON_COMPAT=( pypy3 python3_{10..11} )
-inherit distutils-r1
+inherit distutils-r1 pypi

-MY_PN="${PN//-/_}"
-MY_P="${MY_PN}-${PV}"
 DESCRIPTION="Pytest plugin for Click"
 HOMEPAGE="
 	https://pypi.org/project/pytest-click/
 	https://github.com/Stranger6667/pytest-click
 "
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"

 LICENSE="MIT"
 SLOT="0"
--- a/dev-python/python-http-client/Manifest
+++ b/dev-python/python-http-client/Manifest
@@ -1 +1 @@
-DIST python-http-client-3.3.5.tar.gz 7852 BLAKE2B 6ebcd545b3dfe06e9daf4c0c373d91f9a8ecbf9dc411b579794bbbfa5047bb388ff2fa7d1ba04cf71c64a9af5b1da2283d8ed5b5b0a3dca49f4db5cd7f569d57 SHA512 54fe0d871be4d9743d5601c218d20c513a88eac8f91afa0222daf8d585819dabe3b9fdaf63e0810e46fe94dbf72185af7460f7c39ebf00312fd8eb7411a90f75
+DIST python_http_client-3.3.5.tar.gz 7852 BLAKE2B 6ebcd545b3dfe06e9daf4c0c373d91f9a8ecbf9dc411b579794bbbfa5047bb388ff2fa7d1ba04cf71c64a9af5b1da2283d8ed5b5b0a3dca49f4db5cd7f569d57 SHA512 54fe0d871be4d9743d5601c218d20c513a88eac8f91afa0222daf8d585819dabe3b9fdaf63e0810e46fe94dbf72185af7460f7c39ebf00312fd8eb7411a90f75
--- a/dev-python/python-http-client/python-http-client-3.3.5.ebuild
+++ b/dev-python/python-http-client/python-http-client-3.3.5.ebuild
@@ -5,14 +5,10 @@ EAPI=8

 PYTHON_COMPAT=( python3_{10..11} )

-inherit distutils-r1
+inherit distutils-r1 pypi

 DESCRIPTION="HTTP REST client, simplified for Python"
 HOMEPAGE="https://github.com/sendgrid/python-http-client https://pypi.org/project/python-http-client/"
-MY_PN=${PN//-/_}
-MY_P=${MY_PN}-${PV}
-SRC_URI="mirror://pypi/${P:0:1}/${MY_PN}/${MY_P}.tar.gz -> ${P}.tar.gz"
-S=${WORKDIR}/${MY_PN}-${PV}

 LICENSE="MIT"
 SLOT="0"
@@ -34,4 +30,3 @@ python_test() {
 }

 distutils_enable_tests pytest
-
--- a/dev-python/readability-lxml/readability-lxml-0.6.1.ebuild
+++ b/dev-python/readability-lxml/readability-lxml-0.6.1.ebuild
@@ -4,11 +4,11 @@
 EAPI=7

 PYTHON_COMPAT=( python3_{10..11} )
-inherit distutils-r1
+PYPI_NO_NORMALIZE=1
+inherit distutils-r1 pypi

 DESCRIPTION="fast html to text parser (article readability tool)"
 HOMEPAGE="https://github.com/buriy/python-readability"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"

 LICENSE="Apache-2.0"
 SLOT="0"
--- a/dev-python/sphinx-argparse-cli/sphinx-argparse-cli-1.9.0.ebuild
+++ b/dev-python/sphinx-argparse-cli/sphinx-argparse-cli-1.9.0.ebuild
@@ -5,14 +5,10 @@ EAPI=8

 DISTUTILS_USE_PEP517=setuptools
 PYTHON_COMPAT=( python3_{10..11} ) # no pypy3 support
-inherit distutils-r1
+inherit distutils-r1 pypi

-MY_PN="${PN//-/_}"
-MY_P="${MY_PN}-${PV}"
 DESCRIPTION="Render CLI arguments (sub-commands friendly) defined by argparse module"
 HOMEPAGE="https://github.com/tox-dev/sphinx-argparse-cli https://pypi.org/project/sphinx-argparse-cli/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"

 LICENSE="MIT"
 SLOT="0"
--- a/dev-python/sphinx-click/sphinx-click-4.1.0.ebuild
+++ b/dev-python/sphinx-click/sphinx-click-4.1.0.ebuild
@@ -3,16 +3,16 @@

 EAPI=8

+PYPI_NO_NORMALIZE=1
 PYTHON_COMPAT=( python3_{10..11} pypy3 )

-inherit distutils-r1
+inherit distutils-r1 pypi

 DESCRIPTION="Sphinx plugin to automatically document click-based applications"
 HOMEPAGE="
 	https://github.com/click-contrib/sphinx-click
 	https://pypi.org/project/sphinx-click/
 "
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"

 LICENSE="MIT"
 KEYWORDS="~amd64"
--- a/dev-python/sphinx-sitemap/sphinx-sitemap-2.2.1.ebuild
+++ b/dev-python/sphinx-sitemap/sphinx-sitemap-2.2.1.ebuild
@@ -5,14 +5,14 @@ EAPI=8

 PYTHON_COMPAT=( python3_{10..11} pypy3 )
 DISTUTILS_USE_PEP517=setuptools
-inherit distutils-r1
+PYPI_NO_NORMALIZE=1
+inherit distutils-r1 pypi

 DESCRIPTION="Sitemap generator for Sphinx"
 HOMEPAGE="
 	https://pypi.org/project/sphinx-sitemap/
 	https://github.com/jdillard/sphinx-sitemap
 "
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"

 LICENSE="MIT"
 SLOT="0"
--- a/dev-python/srt/srt-3.5.1.ebuild
+++ b/dev-python/srt/srt-3.5.1.ebuild
@@ -5,11 +5,10 @@ EAPI=8

 PYTHON_COMPAT=( python3_{10..11} )

-inherit distutils-r1
+inherit distutils-r1 pypi

 DESCRIPTION="A tiny library for parsing, modifying, and composing SRT files"
 HOMEPAGE="https://github.com/cdown/srt"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"

 LICENSE="MIT"
 SLOT="0"
--- a/dev-python/stdlibs/stdlibs-2022.3.16.ebuild
+++ b/dev-python/stdlibs/stdlibs-2022.3.16.ebuild
@@ -6,11 +6,10 @@ EAPI=8
 DISTUTILS_USE_PEP517=flit
 PYTHON_COMPAT=( python3_{10..11} )

-inherit distutils-r1
+inherit distutils-r1 pypi

 DESCRIPTION="What's in the Python stdlib"
 HOMEPAGE="https://github.com/omnilib/stdlibs/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"

 LICENSE="MIT"
 SLOT="0"
--- a/dev-python/types-paramiko/types-paramiko-2.10.0.ebuild
+++ b/dev-python/types-paramiko/types-paramiko-2.10.0.ebuild
@@ -3,16 +3,16 @@

 EAPI=8

+PYPI_NO_NORMALIZE=1
 PYTHON_COMPAT=( python3_{10..11} pypy3 )

-inherit distutils-r1
+inherit distutils-r1 pypi

 DESCRIPTION="Typing stubs for paramiko"
 HOMEPAGE="
 	https://pypi.org/project/types-paramiko/
 	https://github.com/python/typeshed/tree/master/stubs/paramiko
 "
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"

 SLOT="0"
 LICENSE="Apache-2.0"
--- a/dev-python/types-python-dateutil/types-python-dateutil-2.8.17.ebuild
+++ b/dev-python/types-python-dateutil/types-python-dateutil-2.8.17.ebuild
@@ -3,16 +3,16 @@

 EAPI=8

+PYPI_NO_NORMALIZE=1
 PYTHON_COMPAT=( python3_{10..11} pypy3 )

-inherit distutils-r1
+inherit distutils-r1 pypi

 DESCRIPTION="Typing stubs for python-dateutil"
 HOMEPAGE="
 	https://pypi.org/project/types-python-dateutil/
 	https://github.com/python/typeshed/tree/master/stubs/python-dateutil
 "
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"

 SLOT="0"
 LICENSE="Apache-2.0"
--- a/dev-python/types-pytz/types-pytz-2021.3.8.ebuild
+++ b/dev-python/types-pytz/types-pytz-2021.3.8.ebuild
@@ -3,16 +3,16 @@

 EAPI=8

+PYPI_NO_NORMALIZE=1
 PYTHON_COMPAT=( python3_{10..11} pypy3 )

-inherit distutils-r1
+inherit distutils-r1 pypi

 DESCRIPTION="Typing stubs for pytz"
 HOMEPAGE="
 	https://pypi.org/project/types-pytz/
 	https://github.com/python/typeshed/tree/master/stubs/pytz
 "
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"

 SLOT="0"
 LICENSE="Apache-2.0"
--- a/dev-python/ufoNormalizer/ufoNormalizer-0.6.1.ebuild
+++ b/dev-python/ufoNormalizer/ufoNormalizer-0.6.1.ebuild
@@ -3,16 +3,13 @@

 EAPI=8

-MY_PN="${PN,,}"
-MY_P="${MY_PN}-${PV}"
 PYTHON_COMPAT=( python3_{10..11} pypy3 )

-inherit distutils-r1
+inherit distutils-r1 pypi

 DESCRIPTION="A tool that will normalize the XML and other data inside of a UFO"
 HOMEPAGE="https://github.com/unified-font-object/ufoNormalizer"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.zip"
-S="${WORKDIR}/${MY_P}"
+SRC_URI="$(pypi_sdist_url ${PN} ${PV} .zip)"

 SLOT="0"
 LICENSE="BSD"
--- a/dev-python/w3lib/w3lib-2.0.1.ebuild
+++ b/dev-python/w3lib/w3lib-2.0.1.ebuild
@@ -5,7 +5,7 @@ EAPI=8

 PYTHON_COMPAT=( python3_{10..11} pypy3 )
 DISTUTILS_USE_PEP517=setuptools
-inherit distutils-r1
+inherit distutils-r1 pypi

 DESCRIPTION="Library of web-related functions"
 HOMEPAGE="
@@ -13,7 +13,6 @@ HOMEPAGE="
 	https://pypi.org/project/w3lib/
 	https://github.com/scrapy/w3lib
 "
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"

 LICENSE="BSD"
 SLOT=0
--- a/dev-util/FoBiS/FoBiS-3.0.5-r1.ebuild
+++ b/dev-util/FoBiS/FoBiS-3.0.5-r1.ebuild
@@ -5,12 +5,13 @@ EAPI=8

 DISTUTILS_USE_PEP517=setuptools
 PYTHON_COMPAT=( python3_{10..11} )
+PYPI_PN="${PN}.py"
+PYPI_NO_NORMALIZE=1

-inherit distutils-r1
+inherit distutils-r1 pypi

 DESCRIPTION="FoBiS.py, a Fortran Building System for poor men"
 HOMEPAGE="https://github.com/szaghi/FoBiS"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}.py/${PN}.py-${PV}.tar.gz -> ${P}.tar.gz"

 LICENSE="GPL-3"
 SLOT="0"
@@ -18,8 +19,6 @@ KEYWORDS="~amd64 ~x86"

 IUSE="graphviz"

-S="${WORKDIR}/${PN}.py-${PV}"
-
 RDEPEND="
 	graphviz? ( dev-python/graphviz[${PYTHON_USEDEP}] )
 "
--- a/dev-util/FoBiS/Manifest
+++ b/dev-util/FoBiS/Manifest
@@ -1 +1 @@
-DIST FoBiS-3.0.5.tar.gz 49171 BLAKE2B c65726e84e5eb55d741aeb04f5cf44e94796af2b6539695f1b7a19f56ccfa2ece45d9bd4fabdd224a9d8e113f8e7f5e1258c52ad5f1837b23896a4e4edef971a SHA512 8f0e495cd73f81685b05fd5d491ef21e533a0caba6be5b1a892a15f5f22a625faf038af3f43a700fb6ff4f26d753b50137527fbd380dd17fca6ea1943369c84b
+DIST FoBiS.py-3.0.5.tar.gz 49171 BLAKE2B c65726e84e5eb55d741aeb04f5cf44e94796af2b6539695f1b7a19f56ccfa2ece45d9bd4fabdd224a9d8e113f8e7f5e1258c52ad5f1837b23896a4e4edef971a SHA512 8f0e495cd73f81685b05fd5d491ef21e533a0caba6be5b1a892a15f5f22a625faf038af3f43a700fb6ff4f26d753b50137527fbd380dd17fca6ea1943369c84b
--- a/dev-util/reuse/reuse-1.1.0.ebuild
+++ b/dev-util/reuse/reuse-1.1.0.ebuild
@@ -5,7 +5,7 @@ EAPI=8

 PYTHON_COMPAT=( python3_{10..11} )
 DISTUTILS_USE_PEP517=poetry
-inherit distutils-r1
+inherit distutils-r1 pypi

 DESCRIPTION="A tool for compliance with the REUSE recommendations"
 HOMEPAGE="
@@ -13,7 +13,6 @@ HOMEPAGE="
 	https://pypi.org/project/reuse/
 	https://github.com/fsfe/reuse-tool
 "
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"

 LICENSE="Apache-2.0 CC0-1.0 CC-BY-SA-4.0 GPL-3+"
 SLOT="0"
--- a/games-misc/gay/gay-1.2.8.ebuild
+++ b/games-misc/gay/gay-1.2.8.ebuild
@@ -5,11 +5,10 @@ EAPI=8

 PYTHON_COMPAT=( python3_{10..11} pypy3 )
 DISTUTILS_USE_PEP517=setuptools
-inherit distutils-r1
+inherit distutils-r1 pypi

 DESCRIPTION="Colour your text / terminal to be more gay"
 HOMEPAGE="https://pypi.org/project/gay/ https://github.com/ms-jpq/gay"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"

 LICENSE="MIT"
 SLOT="0"
--- a/net-misc/fedigroup/fedigroup-1.0.6.ebuild
+++ b/net-misc/fedigroup/fedigroup-1.0.6.ebuild
@@ -6,17 +6,15 @@ EAPI=8
 PYTHON_COMPAT=( python3_{10..11} )
 DISTUTILS_USE_PEP517=setuptools
 DISTUTILS_SINGLE_IMPL=1
-inherit distutils-r1
+PYPI_PN="${PN}.py"
+PYPI_NO_NORMALIZE=1
+inherit distutils-r1 pypi

-MY_PN="${PN}.py"
-MY_P="${MY_PN}-${PV}"
 DESCRIPTION="Emulate group accounts on Mastodon/Pleroma"
 HOMEPAGE="
 	https://pypi.org/project/fedigroup.py/
 	https://github.com/uanet-exception/fedigroup.py
 "
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"

 LICENSE="GPL-3+"
 SLOT="0"
--- a/net-misc/fedigroup/fedigroup-1.0.8.ebuild
+++ b/net-misc/fedigroup/fedigroup-1.0.8.ebuild
@@ -6,17 +6,15 @@ EAPI=8
 PYTHON_COMPAT=( python3_{10..11} )
 DISTUTILS_USE_PEP517=setuptools
 DISTUTILS_SINGLE_IMPL=1
-inherit distutils-r1
+PYPI_PN="${PN}.py"
+PYPI_NO_NORMALIZE=1
+inherit distutils-r1 pypi

-MY_PN="${PN}.py"
-MY_P="${MY_PN}-${PV}"
 DESCRIPTION="Emulate group accounts on Mastodon/Pleroma"
 HOMEPAGE="
 	https://pypi.org/project/fedigroup.py/
 	https://github.com/uanet-exception/fedigroup.py
 "
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"

 LICENSE="GPL-3+"
 SLOT="0"
--- a/net-voip/discover-overlay/discover-overlay-0.4.5.ebuild
+++ b/net-voip/discover-overlay/discover-overlay-0.4.5.ebuild
@@ -5,12 +5,12 @@ EAPI=8

 PYTHON_COMPAT=( python3_10 )
 DISTUTILS_USE_PEP517=setuptools
+PYPI_NO_NORMALIZE=1

-inherit distutils-r1
+inherit distutils-r1 pypi

 DESCRIPTION="Yet another Discord overlay for Linux written in Python using GTK3"
 HOMEPAGE="https://github.com/trigg/Discover"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"

 LICENSE="GPL-3"
 SLOT="0"
--- a/net-voip/discover-overlay/discover-overlay-0.5.4.ebuild
+++ b/net-voip/discover-overlay/discover-overlay-0.5.4.ebuild
@@ -5,12 +5,12 @@ EAPI=8

 PYTHON_COMPAT=( python3_10 )
 DISTUTILS_USE_PEP517=setuptools
+PYPI_NO_NORMALIZE=1

-inherit distutils-r1
+inherit distutils-r1 pypi

 DESCRIPTION="Yet another Discord overlay for Linux written in Python using GTK3"
 HOMEPAGE="https://github.com/trigg/Discover"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"

 LICENSE="GPL-3"
 SLOT="0"