summaryrefslogtreecommitdiff
path: root/dev-python
diff options
context:
space:
mode:
authorLiguros - Gitlab CI/CD [develop] <gitlab@liguros.net>2023-03-23 17:07:03 +0000
committerLiguros - Gitlab CI/CD [develop] <gitlab@liguros.net>2023-03-23 17:07:03 +0000
commit54791427304a270e25a084e5c9b2db0004980cc7 (patch)
tree8a99f974523085cd538ed4daa8921bafc7210cd8 /dev-python
parentf19c1c8d1f93902af7de387b967764d743daebac (diff)
downloadbaldeagleos-repo-54791427304a270e25a084e5c9b2db0004980cc7.tar.gz
baldeagleos-repo-54791427304a270e25a084e5c9b2db0004980cc7.tar.xz
baldeagleos-repo-54791427304a270e25a084e5c9b2db0004980cc7.zip
Adding metadata
Diffstat (limited to 'dev-python')
-rw-r--r--dev-python/DAWG-Python/DAWG-Python-0.7.2.ebuild4
-rw-r--r--dev-python/EbookLib/EbookLib-0.17.1.ebuild4
-rw-r--r--dev-python/SLPP/SLPP-1.2.3.ebuild4
-rw-r--r--dev-python/SQLAlchemy-Utils/SQLAlchemy-Utils-0.39.0.ebuild4
-rw-r--r--dev-python/TakeTheTime/TakeTheTime-0.3.1.ebuild4
-rw-r--r--dev-python/XenAPI/XenAPI-2.14-r1.ebuild4
-rw-r--r--dev-python/anyascii/anyascii-0.3.1.ebuild4
-rw-r--r--dev-python/asyncpg/asyncpg-0.27.0.ebuild3
-rw-r--r--dev-python/avro/avro-1.11.0.ebuild3
-rw-r--r--dev-python/axisregistry/axisregistry-0.3.11.ebuild3
-rw-r--r--dev-python/babelfont/babelfont-3.0.0_alpha9.ebuild5
-rw-r--r--dev-python/base58/base58-2.1.1.ebuild3
-rw-r--r--dev-python/betamax-serializers/betamax-serializers-0.2.1.ebuild4
-rw-r--r--dev-python/betterproto/Manifest2
-rw-r--r--dev-python/betterproto/betterproto-2.0.0_beta4.ebuild (renamed from dev-python/python-betterproto/python-betterproto-2.0.0_beta4.ebuild)15
-rw-r--r--dev-python/betterproto/betterproto-2.0.0_beta5.ebuild52
-rw-r--r--dev-python/betterproto/betterproto-9999.ebuild (renamed from dev-python/python-betterproto/python-betterproto-9999.ebuild)11
-rw-r--r--dev-python/betterproto/files/betterproto-2.0.0b4-fix-tests.patch1086
-rw-r--r--dev-python/betterproto/metadata.xml (renamed from dev-python/python-betterproto/metadata.xml)0
-rw-r--r--dev-python/bidict/bidict-0.22.0.ebuild3
-rw-r--r--dev-python/bitbox02/bitbox02-5.3.0.ebuild3
-rw-r--r--dev-python/blurhash/blurhash-1.1.4.ebuild3
-rw-r--r--dev-python/compreffor/compreffor-0.5.2.ebuild5
-rw-r--r--dev-python/coveralls/coveralls-3.3.1.ebuild3
-rw-r--r--dev-python/curio/curio-1.6.ebuild3
-rw-r--r--dev-python/daff/daff-1.3.46.ebuild3
-rw-r--r--dev-python/daiquiri/daiquiri-3.0.1.ebuild3
-rw-r--r--dev-python/darkdetect/darkdetect-0.8.0.ebuild3
-rw-r--r--dev-python/decopatch/decopatch-1.4.10.ebuild3
-rw-r--r--dev-python/devtools/Manifest2
-rw-r--r--dev-python/devtools/devtools-0.10.0-r1.ebuild (renamed from dev-python/devtools/devtools-0.10.0.ebuild)25
-rw-r--r--dev-python/etcd3/etcd3-0.12.0.ebuild3
-rw-r--r--dev-python/etcd3gw/etcd3gw-1.0.2.ebuild3
-rw-r--r--dev-python/fastavro/fastavro-1.7.0.ebuild3
-rw-r--r--dev-python/filecheck/filecheck-0.0.22.ebuild3
-rw-r--r--dev-python/findpython/Manifest1
-rw-r--r--dev-python/findpython/findpython-0.2.4.ebuild25
-rw-r--r--dev-python/findpython/metadata.xml10
-rw-r--r--dev-python/futurist/futurist-2.4.1.ebuild3
-rw-r--r--dev-python/gabbi/gabbi-2.7.1.ebuild3
-rw-r--r--dev-python/gemcall/gemcall-0.9.ebuild3
-rw-r--r--dev-python/gflanguages/gflanguages-0.4.0-r1.ebuild3
-rw-r--r--dev-python/glicko2/glicko2-2.0.0-r2.ebuild3
-rw-r--r--dev-python/glyphtools/glyphtools-0.8.0.ebuild3
-rw-r--r--dev-python/googletransx/googletransx-2.4.2-r2.ebuild3
-rw-r--r--dev-python/graphql-core/graphql-core-3.1.6.ebuild4
-rw-r--r--dev-python/graphql-relay/graphql-relay-3.1.0.ebuild4
-rw-r--r--dev-python/guidata/guidata-2.3.0.ebuild3
-rw-r--r--dev-python/hypothesmith/hypothesmith-0.2.0.ebuild3
-rw-r--r--dev-python/i3ipc/i3ipc-2.2.1-r1.ebuild3
-rw-r--r--dev-python/injector/injector-0.18.4.ebuild3
-rw-r--r--dev-python/insipid-sphinx-theme/insipid-sphinx-theme-0.4.1.ebuild4
-rw-r--r--dev-python/iuliia/iuliia-0.11.5.ebuild3
-rw-r--r--dev-python/jplephem/jplephem-2.16.ebuild3
-rw-r--r--dev-python/jsonpath-rw-ext/jsonpath-rw-ext-1.2.2.ebuild4
-rw-r--r--dev-python/langdetect/langdetect-1.0.9.ebuild3
-rw-r--r--dev-python/libusb1/libusb1-2.0.1.ebuild3
-rw-r--r--dev-python/markdown-include/Manifest2
-rw-r--r--dev-python/markdown-include/markdown-include-0.7.0.ebuild24
-rw-r--r--dev-python/markdown-include/markdown-include-0.8.0.ebuild27
-rw-r--r--dev-python/markdown-include/markdown-include-0.8.1.ebuild4
-rw-r--r--dev-python/markdownify/markdownify-0.11.6.ebuild3
-rw-r--r--dev-python/mkdocs-exclude/mkdocs-exclude-1.0.2-r1.ebuild (renamed from dev-python/mkdocs-exclude/mkdocs-exclude-1.0.2.ebuild)12
-rw-r--r--dev-python/mkdocs-render-swagger-plugin/mkdocs-render-swagger-plugin-0.0.4.ebuild4
-rw-r--r--dev-python/mkdocs-swagger-ui-tag/Manifest2
-rw-r--r--dev-python/mkdocs-swagger-ui-tag/mkdocs-swagger-ui-tag-0.6.1.ebuild (renamed from dev-python/mkdocs-swagger-ui-tag/mkdocs-swagger-ui-tag-0.5.2.ebuild)0
-rw-r--r--dev-python/moreorless/moreorless-0.4.0.ebuild3
-rw-r--r--dev-python/opentracing/opentracing-2.4.0.ebuild3
-rw-r--r--dev-python/osprofiler/osprofiler-3.4.3.ebuild3
-rw-r--r--dev-python/parsel/parsel-1.7.0.ebuild3
-rw-r--r--dev-python/pdm/Manifest1
-rw-r--r--dev-python/pdm/metadata.xml10
-rw-r--r--dev-python/pdm/pdm-2.4.9.ebuild70
-rw-r--r--dev-python/persist-queue/persist-queue-0.8.0.ebuild4
-rw-r--r--dev-python/pg8000/pg8000-1.29.2.ebuild3
-rw-r--r--dev-python/pifpaf/pifpaf-3.1.5.ebuild3
-rw-r--r--dev-python/playsound/playsound-1.3.0.ebuild3
-rw-r--r--dev-python/portio/portio-0.5-r1.ebuild3
-rw-r--r--dev-python/py3nvml/py3nvml-0.2.6.ebuild3
-rw-r--r--dev-python/pyfiglet/pyfiglet-0.8_p1.ebuild13
-rw-r--r--dev-python/pygaljs/pygaljs-1.0.2-r1.ebuild3
-rw-r--r--dev-python/pymemcache/pymemcache-4.0.0.ebuild3
-rw-r--r--dev-python/pymorphy2-dicts-ru/pymorphy2-dicts-ru-2.4.417127.4579844.ebuild4
-rw-r--r--dev-python/pymorphy2-dicts-uk/pymorphy2-dicts-uk-2.4.1.1.1460299261.ebuild4
-rw-r--r--dev-python/pymorphy2-dicts/pymorphy2-dicts-2.4.393442.3710985.ebuild4
-rw-r--r--dev-python/pymorphy2/pymorphy2-0.9.1.ebuild3
-rw-r--r--dev-python/pyodbc/pyodbc-4.0.32.ebuild3
-rw-r--r--dev-python/pyqtdarktheme/pyqtdarktheme-2.1.0.ebuild3
-rw-r--r--dev-python/pytest-harvest/pytest-harvest-1.10.4.ebuild4
-rw-r--r--dev-python/pytest-steps/pytest-steps-1.8.0.ebuild4
-rw-r--r--dev-python/python-betterproto/Manifest1
-rw-r--r--dev-python/python-pidfile/python-pidfile-3.0.0-r1.ebuild4
-rw-r--r--dev-python/python-socketio/python-socketio-5.1.0.ebuild4
-rw-r--r--dev-python/pywebview/pywebview-3.7.2.ebuild3
-rw-r--r--dev-python/redbaron/redbaron-0.9.2.ebuild3
-rw-r--r--dev-python/requests-wsgi-adapter/Manifest1
-rw-r--r--dev-python/requests-wsgi-adapter/metadata.xml10
-rw-r--r--dev-python/requests-wsgi-adapter/requests-wsgi-adapter-0.4.1.ebuild20
-rw-r--r--dev-python/rstcheck/rstcheck-6.1.1.ebuild3
-rw-r--r--dev-python/rstr/rstr-3.2.0.ebuild3
-rw-r--r--dev-python/schema/schema-0.7.5.ebuild3
-rw-r--r--dev-python/scramp/scramp-1.4.4.ebuild3
-rw-r--r--dev-python/scrapy/Manifest3
-rw-r--r--dev-python/scrapy/scrapy-2.5.1.ebuild58
-rw-r--r--dev-python/scrapy/scrapy-2.6.2.ebuild59
-rw-r--r--dev-python/scrapy/scrapy-2.6.3.ebuild59
-rw-r--r--dev-python/scrapy/scrapy-2.8.0.ebuild4
-rw-r--r--dev-python/sendgrid/sendgrid-6.9.7.ebuild3
-rw-r--r--dev-python/shellingham/Manifest1
-rw-r--r--dev-python/shellingham/metadata.xml10
-rw-r--r--dev-python/shellingham/shellingham-1.5.0.ebuild19
-rw-r--r--dev-python/signalstickers-client/signalstickers-client-3.2.0.ebuild4
-rw-r--r--dev-python/sphinx-click/sphinx-click-4.2.0.ebuild4
-rw-r--r--dev-python/sphinxcontrib-katex/sphinxcontrib-katex-0.9.4.ebuild4
-rw-r--r--dev-python/srt/srt-3.5.2.ebuild3
-rw-r--r--dev-python/starkbank-ecdsa/starkbank-ecdsa-2.2.0.ebuild4
-rw-r--r--dev-python/stdlibs/stdlibs-2022.6.8.ebuild3
-rw-r--r--dev-python/stringcase/stringcase-1.2.0.ebuild3
-rw-r--r--dev-python/tempus-themes/tempus-themes-2.3.0.20220206.ebuild4
-rw-r--r--dev-python/testrepository/testrepository-0.0.20-r200.ebuild3
-rw-r--r--dev-python/timeslot/timeslot-0.1.2.ebuild3
-rw-r--r--dev-python/trailrunner/trailrunner-1.2.1.ebuild3
-rw-r--r--dev-python/transaction/transaction-3.0.1-r1.ebuild3
-rw-r--r--dev-python/types-paramiko/types-paramiko-2.11.1.ebuild4
-rw-r--r--dev-python/types-python-dateutil/types-python-dateutil-2.8.18.ebuild4
-rw-r--r--dev-python/types-pytz/types-pytz-2022.1.1.ebuild4
-rw-r--r--dev-python/types-requests/types-requests-2.28.0.ebuild4
-rw-r--r--dev-python/types-urllib3/types-urllib3-1.26.15.ebuild4
-rw-r--r--dev-python/typing_inspect/typing_inspect-0.7.1.ebuild3
-rw-r--r--dev-python/ufmt/ufmt-1.3.3.ebuild3
-rw-r--r--dev-python/ufo2ft/ufo2ft-2.27.0.ebuild3
-rw-r--r--dev-python/uhashring/uhashring-2.1.ebuild3
-rw-r--r--dev-python/unearth/Manifest1
-rw-r--r--dev-python/unearth/metadata.xml10
-rw-r--r--dev-python/unearth/unearth-0.8.1.ebuild36
-rw-r--r--dev-python/usort/usort-1.0.2.ebuild3
-rw-r--r--dev-python/wsgi_intercept/wsgi_intercept-1.10.0.ebuild3
-rw-r--r--dev-python/xattr/xattr-0.9.9.ebuild3
-rw-r--r--dev-python/yaql/yaql-2.0.0.ebuild3
-rw-r--r--dev-python/youseedee/youseedee-0.3.0.ebuild3
140 files changed, 1540 insertions, 490 deletions
diff --git a/dev-python/DAWG-Python/DAWG-Python-0.7.2.ebuild b/dev-python/DAWG-Python/DAWG-Python-0.7.2.ebuild
index 509d88899cdb..3106555270b0 100644
--- a/dev-python/DAWG-Python/DAWG-Python-0.7.2.ebuild
+++ b/dev-python/DAWG-Python/DAWG-Python-0.7.2.ebuild
@@ -5,14 +5,14 @@ EAPI=8
PYTHON_COMPAT=( python3_{7,8,9,10,11} pypy3 )
DISTUTILS_USE_PEP517=setuptools
-inherit distutils-r1
+PYPI_NO_NORMALIZE=1
+inherit distutils-r1 pypi
DESCRIPTION="Pure-python reader for DAWGs (DAFSAs) created by dawgdic C++ library."
HOMEPAGE="
https://github.com/pytries/DAWG-Python
https://pypi.org/project/DAWG-Python/
"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
diff --git a/dev-python/EbookLib/EbookLib-0.17.1.ebuild b/dev-python/EbookLib/EbookLib-0.17.1.ebuild
index 8b0283435e24..8ed9379e20e7 100644
--- a/dev-python/EbookLib/EbookLib-0.17.1.ebuild
+++ b/dev-python/EbookLib/EbookLib-0.17.1.ebuild
@@ -5,11 +5,11 @@ EAPI=8
PYTHON_COMPAT=( python3_{7,8,9,10,11} )
DISTUTILS_USE_PEP517=setuptools
-inherit distutils-r1
+PYPI_NO_NORMALIZE=1
+inherit distutils-r1 pypi
DESCRIPTION="Ebook library which can handle EPUB2/EPUB3 and Kindle format"
HOMEPAGE="https://github.com/aerkalov/ebooklib https://pypi.org/project/EbookLib/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="AGPL-3"
SLOT="0"
diff --git a/dev-python/SLPP/SLPP-1.2.3.ebuild b/dev-python/SLPP/SLPP-1.2.3.ebuild
index 285b9a71ecfd..9fcf282f47ad 100644
--- a/dev-python/SLPP/SLPP-1.2.3.ebuild
+++ b/dev-python/SLPP/SLPP-1.2.3.ebuild
@@ -5,14 +5,14 @@ EAPI=8
PYTHON_COMPAT=( python3_{7,8,9,10,11} )
DISTUTILS_USE_PEP517=setuptools
-inherit distutils-r1
+PYPI_NO_NORMALIZE=1
+inherit distutils-r1 pypi
DESCRIPTION="Simple lua-python parser"
HOMEPAGE="
https://github.com/SirAnthony/slpp
https://pypi.org/project/SLPP/
"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
diff --git a/dev-python/SQLAlchemy-Utils/SQLAlchemy-Utils-0.39.0.ebuild b/dev-python/SQLAlchemy-Utils/SQLAlchemy-Utils-0.39.0.ebuild
index 2a576f173e96..a06bb43a8535 100644
--- a/dev-python/SQLAlchemy-Utils/SQLAlchemy-Utils-0.39.0.ebuild
+++ b/dev-python/SQLAlchemy-Utils/SQLAlchemy-Utils-0.39.0.ebuild
@@ -5,14 +5,14 @@ EAPI=8
PYTHON_COMPAT=( python3_{7,8,9,10,11} )
DISTUTILS_USE_PEP517=setuptools
-inherit distutils-r1
+PYPI_NO_NORMALIZE=1
+inherit distutils-r1 pypi
DESCRIPTION="Various utility functions and datatypes for SQLAlchemy"
HOMEPAGE="
https://github.com/kvesteri/sqlalchemy-utils
https://pypi.org/project/SQLAlchemy-Utils/
"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
SLOT="0"
LICENSE="BSD"
diff --git a/dev-python/TakeTheTime/TakeTheTime-0.3.1.ebuild b/dev-python/TakeTheTime/TakeTheTime-0.3.1.ebuild
index 9cde12cebc72..f94dfc333585 100644
--- a/dev-python/TakeTheTime/TakeTheTime-0.3.1.ebuild
+++ b/dev-python/TakeTheTime/TakeTheTime-0.3.1.ebuild
@@ -5,13 +5,13 @@ EAPI=8
PYTHON_COMPAT=( python3_{7,8,9,10,11} pypy3 )
DISTUTILS_USE_PEP517=setuptools
-inherit distutils-r1
+PYPI_NO_NORMALIZE=1
+inherit distutils-r1 pypi
DESCRIPTION="Take The Time, a super-neat Python library for timing chunks of code"
HOMEPAGE="https://github.com/ErikBjare/TakeTheTime"
LICENSE="MIT"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
KEYWORDS="~amd64"
SLOT="0"
diff --git a/dev-python/XenAPI/XenAPI-2.14-r1.ebuild b/dev-python/XenAPI/XenAPI-2.14-r1.ebuild
index b12abf8f403f..249b98aa22dc 100644
--- a/dev-python/XenAPI/XenAPI-2.14-r1.ebuild
+++ b/dev-python/XenAPI/XenAPI-2.14-r1.ebuild
@@ -3,9 +3,10 @@
EAPI=8
+PYPI_NO_NORMALIZE=1
PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-inherit distutils-r1
+inherit distutils-r1 pypi
DESCRIPTION="Xen API SDK, for communication with Citrix XenServer and Xen Cloud Platform"
HOMEPAGE="
@@ -13,7 +14,6 @@ HOMEPAGE="
https://github.com/xapi-project/xen-api
https://pypi.org/project/XenAPI/
"
-SRC_URI="mirror://pypi/X/${PN}/${P}.tar.gz"
LICENSE="LGPL-2"
SLOT="0"
diff --git a/dev-python/anyascii/anyascii-0.3.1.ebuild b/dev-python/anyascii/anyascii-0.3.1.ebuild
index f9d889781a0b..4cd07c7f9a9d 100644
--- a/dev-python/anyascii/anyascii-0.3.1.ebuild
+++ b/dev-python/anyascii/anyascii-0.3.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2022 Gentoo Authors
+# Copyright 2022-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -16,7 +16,7 @@ if [[ ${PV} == *9999 ]]; then
inherit git-r3
EGIT_REPO_URI="https://github.com/anyascii/anyascii.git"
else
- SRC_URI="https://files.pythonhosted.org/packages/source/a/anyascii/${P}.tar.gz"
+ inherit pypi
KEYWORDS="~amd64 ~arm64"
fi
diff --git a/dev-python/asyncpg/asyncpg-0.27.0.ebuild b/dev-python/asyncpg/asyncpg-0.27.0.ebuild
index 97ffcd30232a..8b1fafa84fb7 100644
--- a/dev-python/asyncpg/asyncpg-0.27.0.ebuild
+++ b/dev-python/asyncpg/asyncpg-0.27.0.ebuild
@@ -5,11 +5,10 @@ EAPI=8
PYTHON_COMPAT=( python3_{7,8,9,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"
diff --git a/dev-python/avro/avro-1.11.0.ebuild b/dev-python/avro/avro-1.11.0.ebuild
index 298d38d9748d..0a9cb5401c72 100644
--- a/dev-python/avro/avro-1.11.0.ebuild
+++ b/dev-python/avro/avro-1.11.0.ebuild
@@ -5,14 +5,13 @@ EAPI=8
PYTHON_COMPAT=( python3_{7,8,9,10,11} pypy3 )
-inherit distutils-r1
+inherit distutils-r1 pypi
DESCRIPTION="Apache Avro is a data serialization system"
HOMEPAGE="
https://pypi.org/project/avro/
https://avro.apache.org
"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
diff --git a/dev-python/axisregistry/axisregistry-0.3.11.ebuild b/dev-python/axisregistry/axisregistry-0.3.11.ebuild
index 1efa90db084f..287c49c8715b 100644
--- a/dev-python/axisregistry/axisregistry-0.3.11.ebuild
+++ b/dev-python/axisregistry/axisregistry-0.3.11.ebuild
@@ -6,14 +6,13 @@ EAPI=8
PYTHON_COMPAT=( python3_{10..11} )
DISTUTILS_USE_PEP517=setuptools
-inherit distutils-r1
+inherit distutils-r1 pypi
DESCRIPTION="A Python API to access data from the Google Fonts variable fonts Axis Registry"
HOMEPAGE="
https://github.com/googlefonts/axisregistry
https://pypi.org/project/axisregistry/
"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="Apache-2.0"
KEYWORDS="~amd64"
diff --git a/dev-python/babelfont/babelfont-3.0.0_alpha9.ebuild b/dev-python/babelfont/babelfont-3.0.0_alpha9.ebuild
index c2aa8a3d849e..d862e91eaba4 100644
--- a/dev-python/babelfont/babelfont-3.0.0_alpha9.ebuild
+++ b/dev-python/babelfont/babelfont-3.0.0_alpha9.ebuild
@@ -4,18 +4,15 @@
EAPI=8
DISTUTILS_USE_PEP517=poetry
-MYP="${P/_alpha/a}"
PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-inherit distutils-r1
+inherit distutils-r1 pypi
DESCRIPTION="Interrogate and manipulate UFO, TTF and OTF fonts with a common interface"
HOMEPAGE="
https://github.com/simoncozens/babelfont
https://pypi.org/project/babelfont/
"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MYP}.tar.gz"
-S="${WORKDIR}/${MYP}"
KEYWORDS="~amd64"
LICENSE="MIT"
diff --git a/dev-python/base58/base58-2.1.1.ebuild b/dev-python/base58/base58-2.1.1.ebuild
index febaaeea5c6a..199e1cef15dc 100644
--- a/dev-python/base58/base58-2.1.1.ebuild
+++ b/dev-python/base58/base58-2.1.1.ebuild
@@ -4,11 +4,10 @@
EAPI=8
PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-inherit distutils-r1
+inherit distutils-r1 pypi
DESCRIPTION="Base58 and Base58Check implementation"
HOMEPAGE="https://github.com/keis/base58"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
diff --git a/dev-python/betamax-serializers/betamax-serializers-0.2.1.ebuild b/dev-python/betamax-serializers/betamax-serializers-0.2.1.ebuild
index 564258222bd8..1d343f34f28a 100644
--- a/dev-python/betamax-serializers/betamax-serializers-0.2.1.ebuild
+++ b/dev-python/betamax-serializers/betamax-serializers-0.2.1.ebuild
@@ -5,11 +5,11 @@ EAPI=8
PYTHON_COMPAT=( python3_{7,8,9,10,11} pypy3 )
DISTUTILS_USE_PEP517=setuptools
-inherit distutils-r1 optfeature
+PYPI_NO_NORMALIZE=1
+inherit distutils-r1 optfeature pypi
DESCRIPTION="A set of third-party serializers for Betamax"
HOMEPAGE="https://pypi.org/project/betamax-serializers/ https://gitlab.com/betamax/serializers"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
diff --git a/dev-python/betterproto/Manifest b/dev-python/betterproto/Manifest
new file mode 100644
index 000000000000..11fc008e0550
--- /dev/null
+++ b/dev-python/betterproto/Manifest
@@ -0,0 +1,2 @@
+DIST betterproto-2.0.0_beta4.gh.tar.gz 137744 BLAKE2B 55cde21cca516ae935d8ff99303e3dcf78d952c470eaac2f91b5fa1dc20069e0ad150a0b59518d450c897547a3b3025d9ad683294adca5be6d66f06ba8034615 SHA512 10fc514e7a6d1ab87dd44e00d75d8f48752fa1ece26ccc671eeac502164aee2b8e4a30ec908e4abbb4b1c6671c72fc982764d74ccd0ac0f099d3533dcde64352
+DIST betterproto-2.0.0_beta5.gh.tar.gz 122701 BLAKE2B 6083afab1759653c53f97fd0d65b96941588e7038bc24138d486105fe6d419eb79ca6b8d585263237b02fa40b626560c272c114db15fe5f649e499ba5d6798ab SHA512 b40ecd77ff731d1b157debcc81361aa11a8c94d8198e9e99e94014b883d1f8f34fec86a071de3db06edda37afa5813a5c04f6e29ff75d23da6b0ba1f990f827d
diff --git a/dev-python/python-betterproto/python-betterproto-2.0.0_beta4.ebuild b/dev-python/betterproto/betterproto-2.0.0_beta4.ebuild
index ca652f23ae20..fbf35f9cec00 100644
--- a/dev-python/python-betterproto/python-betterproto-2.0.0_beta4.ebuild
+++ b/dev-python/betterproto/betterproto-2.0.0_beta4.ebuild
@@ -15,11 +15,15 @@ if [[ ${PV} == 9999 ]]; then
EGIT_REPO_URI="https://github.com/danielgtaylor/python-betterproto"
else
MY_PV="${PV/_beta/b}"
- S="${WORKDIR}/${PN}-${MY_PV}"
- SRC_URI="https://github.com/danielgtaylor/${PN}/archive/refs/tags/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+ S="${WORKDIR}/python-${PN}-${MY_PV}"
+ SRC_URI="https://github.com/danielgtaylor/python-${PN}/archive/refs/tags/v${MY_PV}.tar.gz -> ${P}.gh.tar.gz"
KEYWORDS="~amd64 ~x86"
fi
+PATCHES=(
+ "${FILESDIR}/betterproto-2.0.0b4-fix-tests.patch"
+ )
+
LICENSE="MIT"
SLOT="0"
@@ -42,13 +46,8 @@ distutils_enable_tests pytest
distutils_enable_sphinx docs \
'>=dev-python/sphinx-rtd-theme-0.5.0'
-python_prepare() {
- default
- python_fix_shebang tests/generate.py src/betterproto/plugin/main.py
-}
-
python_test() {
- "${EPYTHON}" -m tests.generate -v
+ "${EPYTHON}" -m tests.generate
epytest
}
diff --git a/dev-python/betterproto/betterproto-2.0.0_beta5.ebuild b/dev-python/betterproto/betterproto-2.0.0_beta5.ebuild
new file mode 100644
index 000000000000..4f365acf2a0f
--- /dev/null
+++ b/dev-python/betterproto/betterproto-2.0.0_beta5.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=poetry
+PYTHON_COMPAT=( python3_{7,8,9,10,11} )
+
+inherit distutils-r1 optfeature
+
+DESCRIPTION="Better Protobuf / gRPC Support for Python"
+HOMEPAGE="https://github.com/danielgtaylor/python-betterproto"
+if [[ ${PV} == 9999 ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/danielgtaylor/python-betterproto"
+else
+ MY_PV="${PV/_beta/b}"
+ S="${WORKDIR}/python-${PN}-${MY_PV}"
+ SRC_URI="https://github.com/danielgtaylor/python-${PN}/archive/refs/tags/v${MY_PV}.tar.gz -> ${P}.gh.tar.gz"
+ KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+
+RDEPEND="
+ >=dev-python/grpclib-0.4.1[${PYTHON_USEDEP}]
+ >=dev-python/python-dateutil-2.8.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+ test? (
+ >=dev-python/black-19.3[${PYTHON_USEDEP}]
+ >=dev-python/isort-5.10.1[${PYTHON_USEDEP}]
+ >=dev-python/jinja-3.0.3[${PYTHON_USEDEP}]
+ >=dev-python/grpcio-tools-1.40.0[${PYTHON_USEDEP}]
+ >=dev-python/pytest-mock-3.1.1[${PYTHON_USEDEP}]
+ >=dev-python/pytest-asyncio-0.12.0[${PYTHON_USEDEP}]
+ )
+"
+
+distutils_enable_tests pytest
+distutils_enable_sphinx docs \
+ '>=dev-python/sphinx-rtd-theme-0.5.0'
+
+python_test() {
+ "${EPYTHON}" -m tests.generate
+ epytest
+}
+
+pkg_postinst() {
+ optfeature "protoc compilation support" "dev-python/black dev-python/isort dev-python/grpcio-tools dev-python/jinja"
+}
diff --git a/dev-python/python-betterproto/python-betterproto-9999.ebuild b/dev-python/betterproto/betterproto-9999.ebuild
index ca652f23ae20..5e9ff20f515b 100644
--- a/dev-python/python-betterproto/python-betterproto-9999.ebuild
+++ b/dev-python/betterproto/betterproto-9999.ebuild
@@ -15,8 +15,8 @@ if [[ ${PV} == 9999 ]]; then
EGIT_REPO_URI="https://github.com/danielgtaylor/python-betterproto"
else
MY_PV="${PV/_beta/b}"
- S="${WORKDIR}/${PN}-${MY_PV}"
- SRC_URI="https://github.com/danielgtaylor/${PN}/archive/refs/tags/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+ S="${WORKDIR}/python-${PN}-${MY_PV}"
+ SRC_URI="https://github.com/danielgtaylor/python-${PN}/archive/refs/tags/v${MY_PV}.tar.gz -> ${P}.tar.gz"
KEYWORDS="~amd64 ~x86"
fi
@@ -42,13 +42,8 @@ distutils_enable_tests pytest
distutils_enable_sphinx docs \
'>=dev-python/sphinx-rtd-theme-0.5.0'
-python_prepare() {
- default
- python_fix_shebang tests/generate.py src/betterproto/plugin/main.py
-}
-
python_test() {
- "${EPYTHON}" -m tests.generate -v
+ "${EPYTHON}" -m tests.generate
epytest
}
diff --git a/dev-python/betterproto/files/betterproto-2.0.0b4-fix-tests.patch b/dev-python/betterproto/files/betterproto-2.0.0b4-fix-tests.patch
new file mode 100644
index 000000000000..f97267741cb1
--- /dev/null
+++ b/dev-python/betterproto/files/betterproto-2.0.0b4-fix-tests.patch
@@ -0,0 +1,1086 @@
+From bd69862a0200eee369ddd44ab2a28e0066ca582d Mon Sep 17 00:00:00 2001
+From: Arun Babu Neelicattu <arun.neelicattu@gmail.com>
+Date: Thu, 3 Mar 2022 14:34:53 +0100
+Subject: [PATCH] test input: use explicit package declaration (#345)
+
+---
+ .github/workflows/ci.yml | 5 ++---
+ tests/conftest.py | 10 ++++++++++
+ tests/generate.py | 2 +-
+ tests/grpc/test_grpclib_client.py | 4 ++--
+ tests/grpc/thing_service.py | 2 +-
+ tests/inputs/bool/bool.proto | 2 ++
+ tests/inputs/bytes/bytes.proto | 2 ++
+ tests/inputs/casing/casing.proto | 2 ++
+ .../casing_message_field_uppercase.proto | 2 ++
+ tests/inputs/deprecated/deprecated.proto | 2 ++
+ tests/inputs/deprecated_field/deprecated_field.proto | 2 ++
+ tests/inputs/double/double.proto | 2 ++
+ tests/inputs/empty_repeated/empty_repeated.proto | 2 ++
+ tests/inputs/enum/enum.proto | 2 ++
+ tests/inputs/example/example.proto | 2 ++
+ tests/inputs/example_service/test_example_service.py | 2 +-
+ .../field_name_identical_to_type.proto | 2 ++
+ tests/inputs/fixed/fixed.proto | 2 ++
+ tests/inputs/float/float.proto | 2 ++
+ .../google_impl_behavior_equivalence.proto | 2 ++
+ tests/inputs/googletypes/googletypes.proto | 2 ++
+ .../googletypes_response/googletypes_response.proto | 2 ++
+ .../googletypes_response_embedded.proto | 2 ++
+ .../googletypes_service_returns_empty.proto | 2 ++
+ .../googletypes_service_returns_googletype.proto | 2 ++
+ .../googletypes_struct/googletypes_struct.proto | 2 ++
+ .../inputs/googletypes_value/googletypes_value.proto | 2 ++
+ .../import_capitalized_package/capitalized.proto | 2 +-
+ tests/inputs/import_capitalized_package/test.proto | 2 ++
+ .../import_child_package_from_package/child.proto | 2 +-
+ .../import_child_package_from_package.proto | 2 ++
+ .../package_message.proto | 2 +-
+ .../inputs/import_child_package_from_root/child.proto | 2 +-
+ .../import_child_package_from_root.proto | 2 ++
+ .../import_circular_dependency.proto | 2 ++
+ tests/inputs/import_circular_dependency/other.proto | 2 +-
+ tests/inputs/import_circular_dependency/root.proto | 2 ++
+ tests/inputs/import_cousin_package/cousin.proto | 2 +-
+ tests/inputs/import_cousin_package/test.proto | 2 +-
+ .../import_cousin_package_same_name/cousin.proto | 2 +-
+ .../inputs/import_cousin_package_same_name/test.proto | 2 +-
+ .../import_packages_same_name.proto | 2 ++
+ tests/inputs/import_packages_same_name/posts_v1.proto | 2 +-
+ tests/inputs/import_packages_same_name/users_v1.proto | 2 +-
+ .../import_parent_package_from_child.proto | 2 +-
+ .../parent_package_message.proto | 2 +-
+ .../inputs/import_root_package_from_child/child.proto | 2 +-
+ .../inputs/import_root_package_from_child/root.proto | 2 ++
+ .../import_root_sibling/import_root_sibling.proto | 2 ++
+ tests/inputs/import_root_sibling/sibling.proto | 2 ++
+ .../child_package_request_message.proto | 2 +-
+ .../import_service_input_message.proto | 2 ++
+ .../request_message.proto | 2 ++
+ tests/inputs/int32/int32.proto | 2 ++
+ tests/inputs/map/map.proto | 2 ++
+ tests/inputs/mapmessage/mapmessage.proto | 2 ++
+ .../namespace_builtin_types.proto | 2 ++
+ .../namespace_keywords/namespace_keywords.proto | 2 ++
+ tests/inputs/nested/nested.proto | 2 ++
+ tests/inputs/nested2/nested2.proto | 2 ++
+ tests/inputs/nested2/package.proto | 2 +-
+ tests/inputs/nestedtwice/nestedtwice.proto | 2 ++
+ tests/inputs/oneof/oneof.proto | 2 ++
+ .../oneof_default_value_serialization.proto | 2 ++
+ tests/inputs/oneof_empty/oneof_empty.proto | 2 ++
+ tests/inputs/oneof_enum/oneof_enum.proto | 2 ++
+ .../proto3_field_presence/proto3_field_presence.proto | 2 ++
+ .../proto3_field_presence_oneof.proto | 2 ++
+ tests/inputs/recursivemessage/recursivemessage.proto | 2 ++
+ tests/inputs/ref/ref.proto | 2 ++
+ tests/inputs/repeated/repeated.proto | 2 ++
+ .../repeated_duration_timestamp.proto | 2 ++
+ tests/inputs/repeatedpacked/repeatedpacked.proto | 2 ++
+ tests/inputs/service_separate_packages/messages.proto | 2 +-
+ tests/inputs/service_separate_packages/service.proto | 2 +-
+ tests/inputs/signed/signed.proto | 2 ++
+ tests/test_features.py | 2 +-
+ tests/test_inputs.py | 11 +----------
+ 78 files changed, 141 insertions(+), 37 deletions(-)
+
+diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
+index 02f5ea9..120bfa8 100644
+--- a/.github/workflows/ci.yml
++++ b/.github/workflows/ci.yml
+@@ -13,6 +13,7 @@ jobs:
+ name: ${{ matrix.os }} / ${{ matrix.python-version }}
+ runs-on: ${{ matrix.os }}-latest
+ strategy:
++ fail-fast: false
+ matrix:
+ os: [Ubuntu, MacOS, Windows]
+ python-version: ['3.6.7', '3.7', '3.8', '3.9', '3.10']
+@@ -56,9 +57,7 @@ jobs:
+
+ - name: Install dependencies
+ shell: bash
+- run: |
+- poetry run python -m pip install pip -U
+- poetry install
++ run: poetry install
+
+ - name: Generate code from proto files
+ shell: bash
+diff --git a/tests/conftest.py b/tests/conftest.py
+index 6ab4f03..c6b256d 100644
+--- a/tests/conftest.py
++++ b/tests/conftest.py
+@@ -1,3 +1,6 @@
++import copy
++import sys
++
+ import pytest
+
+
+@@ -10,3 +13,10 @@ def pytest_addoption(parser):
+ @pytest.fixture(scope="session")
+ def repeat(request):
+ return request.config.getoption("repeat")
++
++
++@pytest.fixture
++def reset_sys_path():
++ original = copy.deepcopy(sys.path)
++ yield
++ sys.path = original
+diff --git a/tests/generate.py b/tests/generate.py
+index 1d7d3e9..8599804 100755
+--- a/tests/generate.py
++++ b/tests/generate.py
+@@ -78,7 +78,7 @@ async def generate_test_case_output(
+ """
+
+ test_case_output_path_reference = output_path_reference.joinpath(test_case_name)
+- test_case_output_path_betterproto = output_path_betterproto.joinpath(test_case_name)
++ test_case_output_path_betterproto = output_path_betterproto
+
+ os.makedirs(test_case_output_path_reference, exist_ok=True)
+ os.makedirs(test_case_output_path_betterproto, exist_ok=True)
+diff --git a/tests/grpc/test_grpclib_client.py b/tests/grpc/test_grpclib_client.py
+index dc13885..28ce56f 100644
+--- a/tests/grpc/test_grpclib_client.py
++++ b/tests/grpc/test_grpclib_client.py
+@@ -7,12 +7,12 @@ import grpclib.server
+ import asyncio
+ import sys
+
+-from tests.output_betterproto.service.service import (
++from tests.output_betterproto.service import (
+ DoThingRequest,
+ DoThingResponse,
+ GetThingRequest,
+ TestStub as ThingServiceClient,
+ )
+ import grpclib
+ import grpclib.metadata
+
+diff --git a/tests/grpc/thing_service.py b/tests/grpc/thing_service.py
+index ae05852..835d6f1 100644
+--- a/tests/grpc/thing_service.py
++++ b/tests/grpc/thing_service.py
+@@ -1,4 +1,4 @@
+-from tests.output_betterproto.service.service import (
++from tests.output_betterproto.service import (
+ DoThingResponse,
+ DoThingRequest,
+ GetThingRequest,
+diff --git a/tests/inputs/bool/bool.proto b/tests/inputs/bool/bool.proto
+index 237e7db..77836b8 100644
+--- a/tests/inputs/bool/bool.proto
++++ b/tests/inputs/bool/bool.proto
+@@ -1,5 +1,7 @@
+ syntax = "proto3";
+
++package bool;
++
+ message Test {
+ bool value = 1;
+ }
+diff --git a/tests/inputs/bytes/bytes.proto b/tests/inputs/bytes/bytes.proto
+index de677e3..9895468 100644
+--- a/tests/inputs/bytes/bytes.proto
++++ b/tests/inputs/bytes/bytes.proto
+@@ -1,5 +1,7 @@
+ syntax = "proto3";
+
++package bytes;
++
+ message Test {
+ bytes data = 1;
+ }
+diff --git a/tests/inputs/casing/casing.proto b/tests/inputs/casing/casing.proto
+index ca458b5..2023d93 100644
+--- a/tests/inputs/casing/casing.proto
++++ b/tests/inputs/casing/casing.proto
+@@ -1,5 +1,7 @@
+ syntax = "proto3";
+
++package casing;
++
+ enum my_enum {
+ ZERO = 0;
+ ONE = 1;
+diff --git a/tests/inputs/casing_message_field_uppercase/casing_message_field_uppercase.proto b/tests/inputs/casing_message_field_uppercase/casing_message_field_uppercase.proto
+index 9964dfa..c6d42c3 100644
+--- a/tests/inputs/casing_message_field_uppercase/casing_message_field_uppercase.proto
++++ b/tests/inputs/casing_message_field_uppercase/casing_message_field_uppercase.proto
+@@ -1,5 +1,7 @@
+ syntax = "proto3";
+
++package casing_message_field_uppercase;
++
+ message Test {
+ int32 UPPERCASE = 1;
+ int32 UPPERCASE_V2 = 2;
+diff --git a/tests/inputs/deprecated/deprecated.proto b/tests/inputs/deprecated/deprecated.proto
+index aa1f818..d7102d0 100644
+--- a/tests/inputs/deprecated/deprecated.proto
++++ b/tests/inputs/deprecated/deprecated.proto
+@@ -1,5 +1,7 @@
+ syntax = "proto3";
+
++package deprecated;
++
+ // Some documentation about the Test message.
+ message Test {
+ // Some documentation about the value.
+diff --git a/tests/inputs/deprecated_field/deprecated_field.proto b/tests/inputs/deprecated_field/deprecated_field.proto
+index 04de1a9..d303c8d 100644
+--- a/tests/inputs/deprecated_field/deprecated_field.proto
++++ b/tests/inputs/deprecated_field/deprecated_field.proto
+@@ -1,5 +1,7 @@
+ syntax = "proto3";
+
++package deprecated_field;
++
+ // Some documentation about the Test message.
+ message Test {
+ // Some documentation about the value.
+diff --git a/tests/inputs/double/double.proto b/tests/inputs/double/double.proto
+index 88525d9..66aea95 100644
+--- a/tests/inputs/double/double.proto
++++ b/tests/inputs/double/double.proto
+@@ -1,5 +1,7 @@
+ syntax = "proto3";
+
++package double;
++
+ message Test {
+ double count = 1;
+ }
+diff --git a/tests/inputs/empty_repeated/empty_repeated.proto b/tests/inputs/empty_repeated/empty_repeated.proto
+index 3be831a..f787301 100644
+--- a/tests/inputs/empty_repeated/empty_repeated.proto
++++ b/tests/inputs/empty_repeated/empty_repeated.proto
+@@ -1,5 +1,7 @@
+ syntax = "proto3";
+
++package empty_repeated;
++
+ message MessageA {
+ repeated float values = 1;
+ }
+diff --git a/tests/inputs/enum/enum.proto b/tests/inputs/enum/enum.proto
+index a2dfe43..97e12b4 100644
+--- a/tests/inputs/enum/enum.proto
++++ b/tests/inputs/enum/enum.proto
+@@ -1,5 +1,7 @@
+ syntax = "proto3";
+
++package enum;
++
+ // Tests that enums are correctly serialized and that it correctly handles skipped and out-of-order enum values
+ message Test {
+ Choice choice = 1;
+diff --git a/tests/inputs/example/example.proto b/tests/inputs/example/example.proto
+index 3111058..56bd364 100644
+--- a/tests/inputs/example/example.proto
++++ b/tests/inputs/example/example.proto
+@@ -39,6 +39,8 @@
+
+ syntax = "proto2";
+
++package example;
++
+ // package google.protobuf;
+
+ option go_package = "google.golang.org/protobuf/types/descriptorpb";
+diff --git a/tests/inputs/example_service/test_example_service.py b/tests/inputs/example_service/test_example_service.py
+index a770ed5..49c58f6 100644
+--- a/tests/inputs/example_service/test_example_service.py
++++ b/tests/inputs/example_service/test_example_service.py
+@@ -2,8 +2,8 @@ from typing import AsyncIterable, AsyncIterator
+
+ import pytest
+ from grpclib.testing import ChannelFor
+
+-from tests.output_betterproto.example_service.example_service import (
++from tests.output_betterproto.example_service import (
+ TestBase,
+ TestStub,
+ ExampleRequest,
+diff --git a/tests/inputs/field_name_identical_to_type/field_name_identical_to_type.proto b/tests/inputs/field_name_identical_to_type/field_name_identical_to_type.proto
+index 50fd590..81a0fc4 100644
+--- a/tests/inputs/field_name_identical_to_type/field_name_identical_to_type.proto
++++ b/tests/inputs/field_name_identical_to_type/field_name_identical_to_type.proto
+@@ -1,5 +1,7 @@
+ syntax = "proto3";
+
++package field_name_identical_to_type;
++
+ // Tests that messages may contain fields with names that are identical to their python types (PR #294)
+
+ message Test {
+diff --git a/tests/inputs/fixed/fixed.proto b/tests/inputs/fixed/fixed.proto
+index 50dad84..0f0ffb4 100644
+--- a/tests/inputs/fixed/fixed.proto
++++ b/tests/inputs/fixed/fixed.proto
+@@ -1,5 +1,7 @@
+ syntax = "proto3";
+
++package fixed;
++
+ message Test {
+ fixed32 foo = 1;
+ sfixed32 bar = 2;
+diff --git a/tests/inputs/float/float.proto b/tests/inputs/float/float.proto
+index 79922af..fea12b3 100644
+--- a/tests/inputs/float/float.proto
++++ b/tests/inputs/float/float.proto
+@@ -1,5 +1,7 @@
+ syntax = "proto3";
+
++package float;
++
+ // Some documentation about the Test message.
+ message Test {
+ double positive = 1;
+diff --git a/tests/inputs/google_impl_behavior_equivalence/google_impl_behavior_equivalence.proto b/tests/inputs/google_impl_behavior_equivalence/google_impl_behavior_equivalence.proto
+index 31b6bd3..5357a7c 100644
+--- a/tests/inputs/google_impl_behavior_equivalence/google_impl_behavior_equivalence.proto
++++ b/tests/inputs/google_impl_behavior_equivalence/google_impl_behavior_equivalence.proto
+@@ -1,5 +1,7 @@
+ syntax = "proto3";
+
++package google_impl_behavior_equivalence;
++
+ message Foo{
+ int64 bar = 1;
+ }
+diff --git a/tests/inputs/googletypes/googletypes.proto b/tests/inputs/googletypes/googletypes.proto
+index ba3db12..ef8cb4a 100644
+--- a/tests/inputs/googletypes/googletypes.proto
++++ b/tests/inputs/googletypes/googletypes.proto
+@@ -1,5 +1,7 @@
+ syntax = "proto3";
+
++package googletypes;
++
+ import "google/protobuf/duration.proto";
+ import "google/protobuf/timestamp.proto";
+ import "google/protobuf/wrappers.proto";
+diff --git a/tests/inputs/googletypes_response/googletypes_response.proto b/tests/inputs/googletypes_response/googletypes_response.proto
+index 9b0be5c..8917d1c 100644
+--- a/tests/inputs/googletypes_response/googletypes_response.proto
++++ b/tests/inputs/googletypes_response/googletypes_response.proto
+@@ -1,5 +1,7 @@
+ syntax = "proto3";
+
++package googletypes_response;
++
+ import "google/protobuf/wrappers.proto";
+
+ // Tests that wrapped values can be used directly as return values
+diff --git a/tests/inputs/googletypes_response_embedded/googletypes_response_embedded.proto b/tests/inputs/googletypes_response_embedded/googletypes_response_embedded.proto
+index 89ae4cc..47284e3 100644
+--- a/tests/inputs/googletypes_response_embedded/googletypes_response_embedded.proto
++++ b/tests/inputs/googletypes_response_embedded/googletypes_response_embedded.proto
+@@ -1,5 +1,7 @@
+ syntax = "proto3";
+
++package googletypes_response_embedded;
++
+ import "google/protobuf/wrappers.proto";
+
+ // Tests that wrapped values are supported as part of output message
+diff --git a/tests/inputs/googletypes_service_returns_empty/googletypes_service_returns_empty.proto b/tests/inputs/googletypes_service_returns_empty/googletypes_service_returns_empty.proto
+index c454691..2153ad5 100644
+--- a/tests/inputs/googletypes_service_returns_empty/googletypes_service_returns_empty.proto
++++ b/tests/inputs/googletypes_service_returns_empty/googletypes_service_returns_empty.proto
+@@ -1,5 +1,7 @@
+ syntax = "proto3";
+
++package googletypes_service_returns_empty;
++
+ import "google/protobuf/empty.proto";
+
+ service Test {
+diff --git a/tests/inputs/googletypes_service_returns_googletype/googletypes_service_returns_googletype.proto b/tests/inputs/googletypes_service_returns_googletype/googletypes_service_returns_googletype.proto
+index 49b2a55..457707b 100644
+--- a/tests/inputs/googletypes_service_returns_googletype/googletypes_service_returns_googletype.proto
++++ b/tests/inputs/googletypes_service_returns_googletype/googletypes_service_returns_googletype.proto
+@@ -1,5 +1,7 @@
+ syntax = "proto3";
+
++package googletypes_service_returns_googletype;
++
+ import "google/protobuf/empty.proto";
+ import "google/protobuf/struct.proto";
+
+diff --git a/tests/inputs/googletypes_struct/googletypes_struct.proto b/tests/inputs/googletypes_struct/googletypes_struct.proto
+index 1dbd64a..2b8b5c5 100644
+--- a/tests/inputs/googletypes_struct/googletypes_struct.proto
++++ b/tests/inputs/googletypes_struct/googletypes_struct.proto
+@@ -1,5 +1,7 @@
+ syntax = "proto3";
+
++package googletypes_struct;
++
+ import "google/protobuf/struct.proto";
+
+ message Test {
+diff --git a/tests/inputs/googletypes_value/googletypes_value.proto b/tests/inputs/googletypes_value/googletypes_value.proto
+index 379d336..d5089d5 100644
+--- a/tests/inputs/googletypes_value/googletypes_value.proto
++++ b/tests/inputs/googletypes_value/googletypes_value.proto
+@@ -1,5 +1,7 @@
+ syntax = "proto3";
+
++package googletypes_value;
++
+ import "google/protobuf/struct.proto";
+
+ // Tests that fields of type google.protobuf.Value can contain arbitrary JSON-values.
+diff --git a/tests/inputs/import_capitalized_package/capitalized.proto b/tests/inputs/import_capitalized_package/capitalized.proto
+index 0b73bab..e80c95c 100644
+--- a/tests/inputs/import_capitalized_package/capitalized.proto
++++ b/tests/inputs/import_capitalized_package/capitalized.proto
+@@ -1,7 +1,7 @@
+ syntax = "proto3";
+
+
+-package Capitalized;
++package import_capitalized_package.Capitalized;
+
+ message Message {
+
+diff --git a/tests/inputs/import_capitalized_package/test.proto b/tests/inputs/import_capitalized_package/test.proto
+index f94bbc9..38c9b2d 100644
+--- a/tests/inputs/import_capitalized_package/test.proto
++++ b/tests/inputs/import_capitalized_package/test.proto
+@@ -1,5 +1,7 @@
+ syntax = "proto3";
+
++package import_capitalized_package;
++
+ import "capitalized.proto";
+
+ // Tests that we can import from a package with a capital name, that looks like a nested type, but isn't.
+diff --git a/tests/inputs/import_child_package_from_package/child.proto b/tests/inputs/import_child_package_from_package/child.proto
+index 0865fc8..d99c7c3 100644
+--- a/tests/inputs/import_child_package_from_package/child.proto
++++ b/tests/inputs/import_child_package_from_package/child.proto
+@@ -1,6 +1,6 @@
+ syntax = "proto3";
+
+-package package.childpackage;
++package import_child_package_from_package.package.childpackage;
+
+ message ChildMessage {
+
+diff --git a/tests/inputs/import_child_package_from_package/import_child_package_from_package.proto b/tests/inputs/import_child_package_from_package/import_child_package_from_package.proto
+index 0d09132..66e0aa8 100644
+--- a/tests/inputs/import_child_package_from_package/import_child_package_from_package.proto
++++ b/tests/inputs/import_child_package_from_package/import_child_package_from_package.proto
+@@ -1,5 +1,7 @@
+ syntax = "proto3";
+
++package import_child_package_from_package;
++
+ import "package_message.proto";
+
+ // Tests generated imports when a message in a package refers to a message in a nested child package.
+diff --git a/tests/inputs/import_child_package_from_package/package_message.proto b/tests/inputs/import_child_package_from_package/package_message.proto
+index 943282c..79d66f3 100644
+--- a/tests/inputs/import_child_package_from_package/package_message.proto
++++ b/tests/inputs/import_child_package_from_package/package_message.proto
+@@ -2,7 +2,7 @@ syntax = "proto3";
+
+ import "child.proto";
+
+-package package;
++package import_child_package_from_package.package;
+
+ message PackageMessage {
+ package.childpackage.ChildMessage c = 1;
+diff --git a/tests/inputs/import_child_package_from_root/child.proto b/tests/inputs/import_child_package_from_root/child.proto
+index c874e14..2a46d5f 100644
+--- a/tests/inputs/import_child_package_from_root/child.proto
++++ b/tests/inputs/import_child_package_from_root/child.proto
+@@ -1,6 +1,6 @@
+ syntax = "proto3";
+
+-package childpackage;
++package import_child_package_from_root.childpackage;
+
+ message Message {
+
+diff --git a/tests/inputs/import_child_package_from_root/import_child_package_from_root.proto b/tests/inputs/import_child_package_from_root/import_child_package_from_root.proto
+index d0c111f..6299831 100644
+--- a/tests/inputs/import_child_package_from_root/import_child_package_from_root.proto
++++ b/tests/inputs/import_child_package_from_root/import_child_package_from_root.proto
+@@ -1,5 +1,7 @@
+ syntax = "proto3";
+
++package import_child_package_from_root;
++
+ import "child.proto";
+
+ // Tests generated imports when a message in root refers to a message in a child package.
+diff --git a/tests/inputs/import_circular_dependency/import_circular_dependency.proto b/tests/inputs/import_circular_dependency/import_circular_dependency.proto
+index 7d02aad..8b159e2 100644
+--- a/tests/inputs/import_circular_dependency/import_circular_dependency.proto
++++ b/tests/inputs/import_circular_dependency/import_circular_dependency.proto
+@@ -1,5 +1,7 @@
+ syntax = "proto3";
+
++package import_circular_dependency;
++
+ import "root.proto";
+ import "other.proto";
+
+diff --git a/tests/inputs/import_circular_dependency/other.proto b/tests/inputs/import_circular_dependency/other.proto
+index 2b936a9..833b869 100644
+--- a/tests/inputs/import_circular_dependency/other.proto
++++ b/tests/inputs/import_circular_dependency/other.proto
+@@ -1,7 +1,7 @@
+ syntax = "proto3";
+
+ import "root.proto";
+-package other;
++package import_circular_dependency.other;
+
+ message OtherPackageMessage {
+ RootPackageMessage rootPackageMessage = 1;
+diff --git a/tests/inputs/import_circular_dependency/root.proto b/tests/inputs/import_circular_dependency/root.proto
+index 63d15bf..7383947 100644
+--- a/tests/inputs/import_circular_dependency/root.proto
++++ b/tests/inputs/import_circular_dependency/root.proto
+@@ -1,5 +1,7 @@
+ syntax = "proto3";
+
++package import_circular_dependency;
++
+ message RootPackageMessage {
+
+ }
+diff --git a/tests/inputs/import_cousin_package/cousin.proto b/tests/inputs/import_cousin_package/cousin.proto
+index 4361545..2870dfe 100644
+--- a/tests/inputs/import_cousin_package/cousin.proto
++++ b/tests/inputs/import_cousin_package/cousin.proto
+@@ -1,6 +1,6 @@
+ syntax = "proto3";
+
+-package cousin.cousin_subpackage;
++package import_cousin_package.cousin.cousin_subpackage;
+
+ message CousinMessage {
+ }
+diff --git a/tests/inputs/import_cousin_package/test.proto b/tests/inputs/import_cousin_package/test.proto
+index 53f3b7f..89ec3d8 100644
+--- a/tests/inputs/import_cousin_package/test.proto
++++ b/tests/inputs/import_cousin_package/test.proto
+@@ -1,6 +1,6 @@
+ syntax = "proto3";
+
+-package test.subpackage;
++package import_cousin_package.test.subpackage;
+
+ import "cousin.proto";
+
+diff --git a/tests/inputs/import_cousin_package_same_name/cousin.proto b/tests/inputs/import_cousin_package_same_name/cousin.proto
+index 9253b95..84b6a40 100644
+--- a/tests/inputs/import_cousin_package_same_name/cousin.proto
++++ b/tests/inputs/import_cousin_package_same_name/cousin.proto
+@@ -1,6 +1,6 @@
+ syntax = "proto3";
+
+-package cousin.subpackage;
++package import_cousin_package_same_name.cousin.subpackage;
+
+ message CousinMessage {
+ }
+diff --git a/tests/inputs/import_cousin_package_same_name/test.proto b/tests/inputs/import_cousin_package_same_name/test.proto
+index fe31b5f..7b420d3 100644
+--- a/tests/inputs/import_cousin_package_same_name/test.proto
++++ b/tests/inputs/import_cousin_package_same_name/test.proto
+@@ -1,6 +1,6 @@
+ syntax = "proto3";
+
+-package test.subpackage;
++package import_cousin_package_same_name.test.subpackage;
+
+ import "cousin.proto";
+
+diff --git a/tests/inputs/import_packages_same_name/import_packages_same_name.proto b/tests/inputs/import_packages_same_name/import_packages_same_name.proto
+index c1f28e9..dff7efe 100644
+--- a/tests/inputs/import_packages_same_name/import_packages_same_name.proto
++++ b/tests/inputs/import_packages_same_name/import_packages_same_name.proto
+@@ -1,5 +1,7 @@
+ syntax = "proto3";
+
++package import_packages_same_name;
++
+ import "users_v1.proto";
+ import "posts_v1.proto";
+
+diff --git a/tests/inputs/import_packages_same_name/posts_v1.proto b/tests/inputs/import_packages_same_name/posts_v1.proto
+index 506bf11..d3b9b1c 100644
+--- a/tests/inputs/import_packages_same_name/posts_v1.proto
++++ b/tests/inputs/import_packages_same_name/posts_v1.proto
+@@ -1,6 +1,6 @@
+ syntax = "proto3";
+
+-package posts.v1;
++package import_packages_same_name.posts.v1;
+
+ message Post {
+
+diff --git a/tests/inputs/import_packages_same_name/users_v1.proto b/tests/inputs/import_packages_same_name/users_v1.proto
+index 6e46ba8..d3a17e9 100644
+--- a/tests/inputs/import_packages_same_name/users_v1.proto
++++ b/tests/inputs/import_packages_same_name/users_v1.proto
+@@ -1,6 +1,6 @@
+ syntax = "proto3";
+
+-package users.v1;
++package import_packages_same_name.users.v1;
+
+ message User {
+
+diff --git a/tests/inputs/import_parent_package_from_child/import_parent_package_from_child.proto b/tests/inputs/import_parent_package_from_child/import_parent_package_from_child.proto
+index c43c1bc..edc4736 100644
+--- a/tests/inputs/import_parent_package_from_child/import_parent_package_from_child.proto
++++ b/tests/inputs/import_parent_package_from_child/import_parent_package_from_child.proto
+@@ -2,7 +2,7 @@ syntax = "proto3";
+
+ import "parent_package_message.proto";
+
+-package parent.child;
++package import_parent_package_from_child.parent.child;
+
+ // Tests generated imports when a message refers to a message defined in its parent package
+
+diff --git a/tests/inputs/import_parent_package_from_child/parent_package_message.proto b/tests/inputs/import_parent_package_from_child/parent_package_message.proto
+index cea3066..fb3fd31 100644
+--- a/tests/inputs/import_parent_package_from_child/parent_package_message.proto
++++ b/tests/inputs/import_parent_package_from_child/parent_package_message.proto
+@@ -1,6 +1,6 @@
+ syntax = "proto3";
+
+-package parent;
++package import_parent_package_from_child.parent;
+
+ message ParentPackageMessage {
+ }
+diff --git a/tests/inputs/import_root_package_from_child/child.proto b/tests/inputs/import_root_package_from_child/child.proto
+index d2b29cc..bd51967 100644
+--- a/tests/inputs/import_root_package_from_child/child.proto
++++ b/tests/inputs/import_root_package_from_child/child.proto
+@@ -1,6 +1,6 @@
+ syntax = "proto3";
+
+-package child;
++package import_root_package_from_child.child;
+
+ import "root.proto";
+
+diff --git a/tests/inputs/import_root_package_from_child/root.proto b/tests/inputs/import_root_package_from_child/root.proto
+index 650b29b..6ae955a 100644
+--- a/tests/inputs/import_root_package_from_child/root.proto
++++ b/tests/inputs/import_root_package_from_child/root.proto
+@@ -1,5 +1,7 @@
+ syntax = "proto3";
+
++package import_root_package_from_child;
++
+
+ message RootMessage {
+ }
+diff --git a/tests/inputs/import_root_sibling/import_root_sibling.proto b/tests/inputs/import_root_sibling/import_root_sibling.proto
+index 1d671b8..759e606 100644
+--- a/tests/inputs/import_root_sibling/import_root_sibling.proto
++++ b/tests/inputs/import_root_sibling/import_root_sibling.proto
+@@ -1,5 +1,7 @@
+ syntax = "proto3";
+
++package import_root_sibling;
++
+ import "sibling.proto";
+
+ // Tests generated imports when a message in the root package refers to another message in the root package
+diff --git a/tests/inputs/import_root_sibling/sibling.proto b/tests/inputs/import_root_sibling/sibling.proto
+index 870baff..6b6ba2e 100644
+--- a/tests/inputs/import_root_sibling/sibling.proto
++++ b/tests/inputs/import_root_sibling/sibling.proto
+@@ -1,5 +1,7 @@
+ syntax = "proto3";
+
++package import_root_sibling;
++
+ message SiblingMessage {
+
+ }
+diff --git a/tests/inputs/import_service_input_message/child_package_request_message.proto b/tests/inputs/import_service_input_message/child_package_request_message.proto
+index 6380db2..54fc112 100644
+--- a/tests/inputs/import_service_input_message/child_package_request_message.proto
++++ b/tests/inputs/import_service_input_message/child_package_request_message.proto
+@@ -1,6 +1,6 @@
+ syntax = "proto3";
+
+-package child;
++package import_service_input_message.child;
+
+ message ChildRequestMessage {
+ int32 child_argument = 1;
+diff --git a/tests/inputs/import_service_input_message/import_service_input_message.proto b/tests/inputs/import_service_input_message/import_service_input_message.proto
+index 7ca9c46..cbf48fa 100644
+--- a/tests/inputs/import_service_input_message/import_service_input_message.proto
++++ b/tests/inputs/import_service_input_message/import_service_input_message.proto
+@@ -1,5 +1,7 @@
+ syntax = "proto3";
+
++package import_service_input_message;
++
+ import "request_message.proto";
+ import "child_package_request_message.proto";
+
+diff --git a/tests/inputs/import_service_input_message/request_message.proto b/tests/inputs/import_service_input_message/request_message.proto
+index 5bfceed..36a6e78 100644
+--- a/tests/inputs/import_service_input_message/request_message.proto
++++ b/tests/inputs/import_service_input_message/request_message.proto
+@@ -1,5 +1,7 @@
+ syntax = "proto3";
+
++package import_service_input_message;
++
+ message RequestMessage {
+ int32 argument = 1;
+ }
+\ No newline at end of file
+diff --git a/tests/inputs/int32/int32.proto b/tests/inputs/int32/int32.proto
+index cae0dc7..4721c23 100644
+--- a/tests/inputs/int32/int32.proto
++++ b/tests/inputs/int32/int32.proto
+@@ -1,5 +1,7 @@
+ syntax = "proto3";
+
++package int32;
++
+ // Some documentation about the Test message.
+ message Test {
+ // Some documentation about the count.
+diff --git a/tests/inputs/map/map.proto b/tests/inputs/map/map.proto
+index 669e287..ecef3cc 100644
+--- a/tests/inputs/map/map.proto
++++ b/tests/inputs/map/map.proto
+@@ -1,5 +1,7 @@
+ syntax = "proto3";
+
++package map;
++
+ message Test {
+ map<string, int32> counts = 1;
+ }
+diff --git a/tests/inputs/mapmessage/mapmessage.proto b/tests/inputs/mapmessage/mapmessage.proto
+index 07dcce5..2c704a4 100644
+--- a/tests/inputs/mapmessage/mapmessage.proto
++++ b/tests/inputs/mapmessage/mapmessage.proto
+@@ -1,5 +1,7 @@
+ syntax = "proto3";
+
++package mapmessage;
++
+ message Test {
+ map<string, Nested> items = 1;
+ }
+diff --git a/tests/inputs/namespace_builtin_types/namespace_builtin_types.proto b/tests/inputs/namespace_builtin_types/namespace_builtin_types.proto
+index 636bb55..71cb029 100644
+--- a/tests/inputs/namespace_builtin_types/namespace_builtin_types.proto
++++ b/tests/inputs/namespace_builtin_types/namespace_builtin_types.proto
+@@ -1,5 +1,7 @@
+ syntax = "proto3";
+
++package namespace_builtin_types;
++
+ // Tests that messages may contain fields with names that are python types
+
+ message Test {
+diff --git a/tests/inputs/namespace_keywords/namespace_keywords.proto b/tests/inputs/namespace_keywords/namespace_keywords.proto
+index 6d1a7c5..ac3e5c5 100644
+--- a/tests/inputs/namespace_keywords/namespace_keywords.proto
++++ b/tests/inputs/namespace_keywords/namespace_keywords.proto
+@@ -1,5 +1,7 @@
+ syntax = "proto3";
+
++package namespace_keywords;
++
+ // Tests that messages may contain fields that are Python keywords
+ //
+ // Generated with Python 3.7.6
+diff --git a/tests/inputs/nested/nested.proto b/tests/inputs/nested/nested.proto
+index 98bafd9..043cee0 100644
+--- a/tests/inputs/nested/nested.proto
++++ b/tests/inputs/nested/nested.proto
+@@ -1,5 +1,7 @@
+ syntax = "proto3";
+
++package nested;
++
+ // A test message with a nested message inside of it.
+ message Test {
+ // This is the nested type.
+diff --git a/tests/inputs/nested2/nested2.proto b/tests/inputs/nested2/nested2.proto
+index 3e39918..cd6510c 100644
+--- a/tests/inputs/nested2/nested2.proto
++++ b/tests/inputs/nested2/nested2.proto
+@@ -1,5 +1,7 @@
+ syntax = "proto3";
+
++package nested2;
++
+ import "package.proto";
+
+ message Game {
+diff --git a/tests/inputs/nested2/package.proto b/tests/inputs/nested2/package.proto
+index 4466256..e12abb1 100644
+--- a/tests/inputs/nested2/package.proto
++++ b/tests/inputs/nested2/package.proto
+@@ -1,6 +1,6 @@
+ syntax = "proto3";
+
+-package equipment;
++package nested2.equipment;
+
+ message Weapon {
+
+diff --git a/tests/inputs/nestedtwice/nestedtwice.proto b/tests/inputs/nestedtwice/nestedtwice.proto
+index 7e9c206..9a54a86 100644
+--- a/tests/inputs/nestedtwice/nestedtwice.proto
++++ b/tests/inputs/nestedtwice/nestedtwice.proto
+@@ -1,5 +1,7 @@
+ syntax = "proto3";
+
++package nestedtwice;
++
+ message Test {
+ message Top {
+ message Middle {
+diff --git a/tests/inputs/oneof/oneof.proto b/tests/inputs/oneof/oneof.proto
+index 1f9c4b2..21aa6c6 100644
+--- a/tests/inputs/oneof/oneof.proto
++++ b/tests/inputs/oneof/oneof.proto
+@@ -1,5 +1,7 @@
+ syntax = "proto3";
+
++package oneof;
++
+ message Test {
+ oneof foo {
+ int32 pitied = 1;
+diff --git a/tests/inputs/oneof_default_value_serialization/oneof_default_value_serialization.proto b/tests/inputs/oneof_default_value_serialization/oneof_default_value_serialization.proto
+index 44163c7..f7ac6fe 100644
+--- a/tests/inputs/oneof_default_value_serialization/oneof_default_value_serialization.proto
++++ b/tests/inputs/oneof_default_value_serialization/oneof_default_value_serialization.proto
+@@ -1,5 +1,7 @@
+ syntax = "proto3";
+
++package oneof_default_value_serialization;
++
+ import "google/protobuf/duration.proto";
+ import "google/protobuf/timestamp.proto";
+ import "google/protobuf/wrappers.proto";
+diff --git a/tests/inputs/oneof_empty/oneof_empty.proto b/tests/inputs/oneof_empty/oneof_empty.proto
+index 45ca371..ca51d5a 100644
+--- a/tests/inputs/oneof_empty/oneof_empty.proto
++++ b/tests/inputs/oneof_empty/oneof_empty.proto
+@@ -1,5 +1,7 @@
+ syntax = "proto3";
+
++package oneof_empty;
++
+ message Nothing {}
+
+ message MaybeNothing {
+diff --git a/tests/inputs/oneof_enum/oneof_enum.proto b/tests/inputs/oneof_enum/oneof_enum.proto
+index dfe19d4..906abcb 100644
+--- a/tests/inputs/oneof_enum/oneof_enum.proto
++++ b/tests/inputs/oneof_enum/oneof_enum.proto
+@@ -1,5 +1,7 @@
+ syntax = "proto3";
+
++package oneof_enum;
++
+ message Test {
+ oneof action {
+ Signal signal = 1;
+diff --git a/tests/inputs/proto3_field_presence/proto3_field_presence.proto b/tests/inputs/proto3_field_presence/proto3_field_presence.proto
+index d647843..f28123d 100644
+--- a/tests/inputs/proto3_field_presence/proto3_field_presence.proto
++++ b/tests/inputs/proto3_field_presence/proto3_field_presence.proto
+@@ -1,3 +1,5 @@
+ syntax = "proto3";
+
++package proto3_field_presence;
++
+ message InnerTest {
+diff --git a/tests/inputs/proto3_field_presence_oneof/proto3_field_presence_oneof.proto b/tests/inputs/proto3_field_presence_oneof/proto3_field_presence_oneof.proto
+index c4dc9d4..caa76ec 100644
+--- a/tests/inputs/proto3_field_presence_oneof/proto3_field_presence_oneof.proto
++++ b/tests/inputs/proto3_field_presence_oneof/proto3_field_presence_oneof.proto
+@@ -1,5 +1,7 @@
+ syntax = "proto3";
+
++package proto3_field_presence_oneof;
++
+ message Test {
+ oneof kind {
+ Nested nested = 1;
+diff --git a/tests/inputs/recursivemessage/recursivemessage.proto b/tests/inputs/recursivemessage/recursivemessage.proto
+index f988316..1da2b57 100644
+--- a/tests/inputs/recursivemessage/recursivemessage.proto
++++ b/tests/inputs/recursivemessage/recursivemessage.proto
+@@ -1,5 +1,7 @@
+ syntax = "proto3";
+
++package recursivemessage;
++
+ message Test {
+ string name = 1;
+ Test child = 2;
+diff --git a/tests/inputs/ref/ref.proto b/tests/inputs/ref/ref.proto
+index e09fb15..6945590 100644
+--- a/tests/inputs/ref/ref.proto
++++ b/tests/inputs/ref/ref.proto
+@@ -1,5 +1,7 @@
+ syntax = "proto3";
+
++package ref;
++
+ import "repeatedmessage.proto";
+
+ message Test {
+diff --git a/tests/inputs/repeated/repeated.proto b/tests/inputs/repeated/repeated.proto
+index 42c1132..4f3c788 100644
+--- a/tests/inputs/repeated/repeated.proto
++++ b/tests/inputs/repeated/repeated.proto
+@@ -1,5 +1,7 @@
+ syntax = "proto3";
+
++package repeated;
++
+ message Test {
+ repeated string names = 1;
+ }
+diff --git a/tests/inputs/repeated_duration_timestamp/repeated_duration_timestamp.proto b/tests/inputs/repeated_duration_timestamp/repeated_duration_timestamp.proto
+index 7b7bf36..38f1eaa 100644
+--- a/tests/inputs/repeated_duration_timestamp/repeated_duration_timestamp.proto
++++ b/tests/inputs/repeated_duration_timestamp/repeated_duration_timestamp.proto
+@@ -1,5 +1,7 @@
+ syntax = "proto3";
+
++package repeated_duration_timestamp;
++
+ import "google/protobuf/duration.proto";
+ import "google/protobuf/timestamp.proto";
+
+diff --git a/tests/inputs/repeatedpacked/repeatedpacked.proto b/tests/inputs/repeatedpacked/repeatedpacked.proto
+index ea86dde..a037d1b 100644
+--- a/tests/inputs/repeatedpacked/repeatedpacked.proto
++++ b/tests/inputs/repeatedpacked/repeatedpacked.proto
+@@ -1,5 +1,7 @@
+ syntax = "proto3";
+
++package repeatedpacked;
++
+ message Test {
+ repeated int32 counts = 1;
+ repeated sint64 signed = 2;
+diff --git a/tests/inputs/service_separate_packages/messages.proto b/tests/inputs/service_separate_packages/messages.proto
+index add0ed8..270b188 100644
+--- a/tests/inputs/service_separate_packages/messages.proto
++++ b/tests/inputs/service_separate_packages/messages.proto
+@@ -3,7 +3,7 @@ syntax = "proto3";
+ import "google/protobuf/duration.proto";
+ import "google/protobuf/timestamp.proto";
+
+-package things.messages;
++package service_separate_packages.things.messages;
+
+ message DoThingRequest {
+ string name = 1;
+diff --git a/tests/inputs/service_separate_packages/service.proto b/tests/inputs/service_separate_packages/service.proto
+index 48acc25..950eab4 100644
+--- a/tests/inputs/service_separate_packages/service.proto
++++ b/tests/inputs/service_separate_packages/service.proto
+@@ -2,7 +2,7 @@ syntax = "proto3";
+
+ import "messages.proto";
+
+-package things.service;
++package service_separate_packages.things.service;
+
+ service Test {
+ rpc DoThing (things.messages.DoThingRequest) returns (things.messages.DoThingResponse);
+diff --git a/tests/inputs/signed/signed.proto b/tests/inputs/signed/signed.proto
+index 23fc9ee..b40aad4 100644
+--- a/tests/inputs/signed/signed.proto
++++ b/tests/inputs/signed/signed.proto
+@@ -1,5 +1,7 @@
+ syntax = "proto3";
+
++package signed;
++
+ message Test {
+ // todo: rename fields after fixing bug where 'signed_32_positive' will map to 'signed_32Positive' as output json
+ sint32 signed32 = 1; // signed_32_positive
+diff --git a/tests/test_features.py b/tests/test_features.py
+index 0fedce2..7dc3f35 100644
+--- a/tests/test_features.py
++++ b/tests/test_features.py
+@@ -480,7 +480,7 @@ def test_iso_datetime_list():
+
+
+ def test_enum_service_argument__expected_default_value():
+- from tests.output_betterproto.service.service import ThingType, TestStub
++ from tests.output_betterproto.service import ThingType, TestStub
+
+ sig = signature(TestStub.do_thing)
+ assert sig.parameters["type"].default == ThingType.UNKNOWN
+diff --git a/tests/test_inputs.py b/tests/test_inputs.py
+index dbcf197..278a4da 100644
+--- a/tests/test_inputs.py
++++ b/tests/test_inputs.py
+@@ -23,8 +23,6 @@ from tests.util import (
+ # break things because we can't properly reset the symbol database.
+ os.environ["PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION"] = "python"
+
+-from google.protobuf import symbol_database
+-from google.protobuf.descriptor_pool import DescriptorPool
+ from google.protobuf.json_format import Parse
+
+
+@@ -125,14 +123,9 @@ def dict_replace_nans(input_dict: Dict[Any, Any]) -> Dict[Any, Any]:
+
+
+ @pytest.fixture
+-def test_data(request):
++def test_data(request, reset_sys_path):
+ test_case_name = request.param
+
+- # Reset the internal symbol database so we can import the `Test` message
+- # multiple times. Ugh.
+- sym = symbol_database.Default()
+- sym.pool = DescriptorPool()
+-
+ reference_module_root = os.path.join(
+ *reference_output_package.split("."), test_case_name
+ )
+@@ -158,8 +151,6 @@ def test_data(request):
+ )
+ )
+
+- sys.path.remove(reference_module_root)
+-
+
+ @pytest.mark.parametrize("test_data", test_cases.messages, indirect=True)
+ def test_message_can_instantiated(test_data: TestData) -> None:
+--
+2.40.0
+
diff --git a/dev-python/python-betterproto/metadata.xml b/dev-python/betterproto/metadata.xml
index f52a95675fe8..f52a95675fe8 100644
--- a/dev-python/python-betterproto/metadata.xml
+++ b/dev-python/betterproto/metadata.xml
diff --git a/dev-python/bidict/bidict-0.22.0.ebuild b/dev-python/bidict/bidict-0.22.0.ebuild
index 59e2c1d074ff..07b7c1ad0cd9 100644
--- a/dev-python/bidict/bidict-0.22.0.ebuild
+++ b/dev-python/bidict/bidict-0.22.0.ebuild
@@ -4,11 +4,10 @@
EAPI=8
PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-inherit distutils-r1
+inherit distutils-r1 pypi
DESCRIPTION="The bidirectional mapping library for Python"
HOMEPAGE="https://github.com/jab/bidict https://pypi.org/project/bidict/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
LICENSE="MPL-2.0"
SLOT="0"
diff --git a/dev-python/bitbox02/bitbox02-5.3.0.ebuild b/dev-python/bitbox02/bitbox02-5.3.0.ebuild
index 1797919db1c5..17e99d985a69 100644
--- a/dev-python/bitbox02/bitbox02-5.3.0.ebuild
+++ b/dev-python/bitbox02/bitbox02-5.3.0.ebuild
@@ -4,11 +4,10 @@
EAPI=7
PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-inherit distutils-r1
+inherit distutils-r1 pypi
DESCRIPTION="Python API for communicating with the BitBox02 device"
HOMEPAGE="https://github.com/digitalbitbox/bitbox02-firmware"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
diff --git a/dev-python/blurhash/blurhash-1.1.4.ebuild b/dev-python/blurhash/blurhash-1.1.4.ebuild
index 44eade6e16a1..5765a964d98c 100644
--- a/dev-python/blurhash/blurhash-1.1.4.ebuild
+++ b/dev-python/blurhash/blurhash-1.1.4.ebuild
@@ -5,14 +5,13 @@ EAPI=8
PYTHON_COMPAT=( python3_{7,8,9,10,11} )
DISTUTILS_USE_PEP517=setuptools
-inherit distutils-r1
+inherit distutils-r1 pypi
DESCRIPTION="Pure-Python implementation of the blurhash algorithm"
HOMEPAGE="
https://pypi.org/project/blurhash/
https://github.com/halcy/blurhash-python
"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
diff --git a/dev-python/compreffor/compreffor-0.5.2.ebuild b/dev-python/compreffor/compreffor-0.5.2.ebuild
index 62030908339d..e523fdae87c5 100644
--- a/dev-python/compreffor/compreffor-0.5.2.ebuild
+++ b/dev-python/compreffor/compreffor-0.5.2.ebuild
@@ -5,16 +5,13 @@ EAPI=8
DISTUTILS_USE_PEP517=setuptools
PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-inherit distutils-r1
+inherit distutils-r1 pypi
-MY_P="${PN}-${PV/_p/.post}"
DESCRIPTION="A CFF table subroutinizer for FontTools"
HOMEPAGE="
https://github.com/googlefonts/compreffor
https://pypi.org/project/compreffor/
"
-SRC_URI="mirror://pypi/${MY_P:0:1}/${PN}/${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
KEYWORDS="~amd64"
LICENSE="Apache-2.0"
diff --git a/dev-python/coveralls/coveralls-3.3.1.ebuild b/dev-python/coveralls/coveralls-3.3.1.ebuild
index 4e24f2034a05..e81d31f97017 100644
--- a/dev-python/coveralls/coveralls-3.3.1.ebuild
+++ b/dev-python/coveralls/coveralls-3.3.1.ebuild
@@ -6,11 +6,10 @@ EAPI=8
PYTHON_COMPAT=( python3_{10..11} )
DISTUTILS_USE_PEP517=setuptools
-inherit distutils-r1
+inherit distutils-r1 pypi
DESCRIPTION="Show coverage stats online via coveralls.io"
HOMEPAGE="https://github.com/TheKevJames/coveralls-python"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
diff --git a/dev-python/curio/curio-1.6.ebuild b/dev-python/curio/curio-1.6.ebuild
index 270dd4a6dc0c..6c470792be7e 100644
--- a/dev-python/curio/curio-1.6.ebuild
+++ b/dev-python/curio/curio-1.6.ebuild
@@ -6,14 +6,13 @@ EAPI=8
PYTHON_COMPAT=( python3_{7,8,9,10,11} )
DISTUTILS_USE_PEP517=setuptools
-inherit distutils-r1
+inherit distutils-r1 pypi
DESCRIPTION="Curio is a coroutine-based library for concurrent systems programming"
HOMEPAGE="
https://github.com/dabeaz/curio
https://pypi.org/project/curio/
"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
IUSE="examples"
diff --git a/dev-python/daff/daff-1.3.46.ebuild b/dev-python/daff/daff-1.3.46.ebuild
index d537768515d7..005f7bd0efd8 100644
--- a/dev-python/daff/daff-1.3.46.ebuild
+++ b/dev-python/daff/daff-1.3.46.ebuild
@@ -5,11 +5,10 @@ EAPI=8
PYTHON_COMPAT=( python3_{7,8,9,10,11} pypy3 )
-inherit distutils-r1
+inherit distutils-r1 pypi
DESCRIPTION="The daff can produce and apply tabular diffs"
HOMEPAGE="https://github.com/paulfitz/daff"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
diff --git a/dev-python/daiquiri/daiquiri-3.0.1.ebuild b/dev-python/daiquiri/daiquiri-3.0.1.ebuild
index d8c559013ca4..b5ea15a9deea 100644
--- a/dev-python/daiquiri/daiquiri-3.0.1.ebuild
+++ b/dev-python/daiquiri/daiquiri-3.0.1.ebuild
@@ -5,14 +5,13 @@ EAPI=8
PYTHON_COMPAT=( python3_{7,8,9,10,11} pypy3 )
-inherit distutils-r1
+inherit distutils-r1 pypi
DESCRIPTION="Python library to easily setup basic logging functionality"
HOMEPAGE="
https://pypi.org/project/daiquiri/
https://github.com/jd/daiquiri
"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
diff --git a/dev-python/darkdetect/darkdetect-0.8.0.ebuild b/dev-python/darkdetect/darkdetect-0.8.0.ebuild
index 7e59088e993b..d7b703ffe48c 100644
--- a/dev-python/darkdetect/darkdetect-0.8.0.ebuild
+++ b/dev-python/darkdetect/darkdetect-0.8.0.ebuild
@@ -5,11 +5,10 @@ EAPI=7
PYTHON_COMPAT=( python3_{7,8,9,10,11} pypy3 )
DISTUTILS_USE_PEP517=setuptools
-inherit distutils-r1
+inherit distutils-r1 pypi
DESCRIPTION="Detect OS dark mode from Python"
HOMEPAGE="https://github.com/5yutan5/PyQtDarkTheme https://pypi.org/project/PyQtDarkTheme"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
diff --git a/dev-python/decopatch/decopatch-1.4.10.ebuild b/dev-python/decopatch/decopatch-1.4.10.ebuild
index 83a86e464f31..015de9753738 100644
--- a/dev-python/decopatch/decopatch-1.4.10.ebuild
+++ b/dev-python/decopatch/decopatch-1.4.10.ebuild
@@ -11,11 +11,10 @@ DOCS_DEPEND=(
dev-python/mkdocs-material
dev-python/regex
)
-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"
diff --git a/dev-python/devtools/Manifest b/dev-python/devtools/Manifest
index 55ede1dc50a1..cd7e574bdaf0 100644
--- a/dev-python/devtools/Manifest
+++ b/dev-python/devtools/Manifest
@@ -1 +1 @@
-DIST devtools-0.10.0.gh.tar.gz 68346 BLAKE2B acc45a46c0bb0685b35e4cd5d6bbdd2f6ad1c1f7365a7d51c0c56c1c5e2aef94711ec49c29157f1cd56ba172a2d3a48ccaeb7e3022ca01b3aa995e9dd6fa53d8 SHA512 3a2f31495b14c712f0c96c240612739bc8e7c693c348274e0a067ace5fcb898a4b77fa387484a7ea91fe238f14ada16b62a56745a6fbf467b9613d6377c2f95a
+DIST devtools-0.10.0.tar.gz 68374 BLAKE2B 81ffea515c8c11b591e2235a0ad6d61ea4c21bcd8ab33aa80cae2848da7de4bddb34e54be2e41c4122ef2c1b1a5d20c33f9c4181bef4101063af5619dbd66da8 SHA512 b7fe4cb57863b60bfd01280e24edeae77cc349c8719c8c5610e9e82c36d5de7b32ff978ca0c6254787c98a6d25642d576835e6798c5ea24fcd72a10b5d8aed70
diff --git a/dev-python/devtools/devtools-0.10.0.ebuild b/dev-python/devtools/devtools-0.10.0-r1.ebuild
index 1693d17883ca..9288ac3006e6 100644
--- a/dev-python/devtools/devtools-0.10.0.ebuild
+++ b/dev-python/devtools/devtools-0.10.0-r1.ebuild
@@ -6,36 +6,33 @@ EAPI=8
DISTUTILS_USE_PEP517=hatchling
PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-DOCS_BUILDER="mkdocs"
-DOCS_DEPEND="
+DOCS_BUILDER=mkdocs
+DOCS_DEPEND=(
dev-python/ansi2html
- dev-python/markdown
dev-python/markdown-include
dev-python/mkdocs-exclude
dev-python/mkdocs-material
- dev-python/pygments
-"
-
-inherit distutils-r1 docs
+)
-MYPN="python-${PN}"
-MYP="${MYPN}-${PV}"
+inherit distutils-r1 docs pypi
DESCRIPTION="Dev tools for python"
-HOMEPAGE="https://github.com/samuelcolvin/python-devtools"
-SRC_URI="https://github.com/samuelcolvin/${MYPN}/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz"
+HOMEPAGE="
+ https://pypi.org/project/devtools/
+ https://github.com/samuelcolvin/python-devtools
+"
RESTRICT="!test? ( test )"
LICENSE="MIT"
KEYWORDS="~amd64 ~x86"
SLOT="0"
-S="${WORKDIR}/${MYP}"
-
-DEPEND="
+RDEPEND="
dev-python/asttokens[${PYTHON_USEDEP}]
dev-python/executing[${PYTHON_USEDEP}]
dev-python/pygments[${PYTHON_USEDEP}]
+"
+BDEPEND="
test? (
dev-python/asyncpg[${PYTHON_USEDEP}]
dev-python/coverage[${PYTHON_USEDEP}]
diff --git a/dev-python/etcd3/etcd3-0.12.0.ebuild b/dev-python/etcd3/etcd3-0.12.0.ebuild
index 1a21cf7621aa..4c70c2d3d1b5 100644
--- a/dev-python/etcd3/etcd3-0.12.0.ebuild
+++ b/dev-python/etcd3/etcd3-0.12.0.ebuild
@@ -11,14 +11,13 @@ EPYTEST_DESELECT=(
)
PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-inherit distutils-r1
+inherit distutils-r1 pypi
DESCRIPTION="Python client for the etcd API v3"
HOMEPAGE="
https://pypi.org/project/etcd3/
https://github.com/kragniz/python-etcd3
"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
diff --git a/dev-python/etcd3gw/etcd3gw-1.0.2.ebuild b/dev-python/etcd3gw/etcd3gw-1.0.2.ebuild
index f57df10e7c3a..471dbbe2f28b 100644
--- a/dev-python/etcd3gw/etcd3gw-1.0.2.ebuild
+++ b/dev-python/etcd3gw/etcd3gw-1.0.2.ebuild
@@ -5,14 +5,13 @@ EAPI=8
PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-inherit distutils-r1
+inherit distutils-r1 pypi
DESCRIPTION="A python client for etcd3 grpc-gateway v3 API"
HOMEPAGE="
https://opendev.org/openstack/etcd3gw
https://pypi.org/project/etcd3gw/
"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
diff --git a/dev-python/fastavro/fastavro-1.7.0.ebuild b/dev-python/fastavro/fastavro-1.7.0.ebuild
index 977c14a4af03..5a29e84f81c6 100644
--- a/dev-python/fastavro/fastavro-1.7.0.ebuild
+++ b/dev-python/fastavro/fastavro-1.7.0.ebuild
@@ -5,14 +5,13 @@ EAPI=8
PYTHON_COMPAT=( python3_{7,8,9,10,11} )
DISTUTILS_USE_PEP517=setuptools
-inherit distutils-r1 optfeature
+inherit distutils-r1 optfeature pypi
DESCRIPTION="Fast read/write of AVRO files"
HOMEPAGE="
https://github.com/fastavro/fastavro
https://pypi.org/project/fastavro/
"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
TEST_S="${S}_test"
LICENSE="MIT"
diff --git a/dev-python/filecheck/filecheck-0.0.22.ebuild b/dev-python/filecheck/filecheck-0.0.22.ebuild
index 9f2b8147e83b..386b45642e42 100644
--- a/dev-python/filecheck/filecheck-0.0.22.ebuild
+++ b/dev-python/filecheck/filecheck-0.0.22.ebuild
@@ -6,11 +6,10 @@ EAPI=8
DISTUTILS_USE_PEP517=poetry
PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-inherit distutils-r1
+inherit distutils-r1 pypi
DESCRIPTION="Python port of LLVM's FileCheck, flexible pattern matching file verifier"
HOMEPAGE="https://pypi.org/project/filecheck/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
diff --git a/dev-python/findpython/Manifest b/dev-python/findpython/Manifest
new file mode 100644
index 000000000000..58ae65c03755
--- /dev/null
+++ b/dev-python/findpython/Manifest
@@ -0,0 +1 @@
+DIST findpython-0.2.4.tar.gz 16109 BLAKE2B 1f30682d5a68f03338ce57af8e37c89567e611142f1854baa2032eabee7f41eff3382be2a3ceaac4808db18a7ff65eb9af929c8dea16be772c4ba34f8b0ee2ea SHA512 7b4ea68c07eb81b18107b5976fd5ca32220d0299f08e5c87b94e0d92f1b0f4abe146be22320c9aa46a329877f83073793cf9953d6a40a5eb09c87a9dc9d02cd5
diff --git a/dev-python/findpython/findpython-0.2.4.ebuild b/dev-python/findpython/findpython-0.2.4.ebuild
new file mode 100644
index 000000000000..8cf9e7dd55fd
--- /dev/null
+++ b/dev-python/findpython/findpython-0.2.4.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=pdm
+PYTHON_COMPAT=( python3_{7,8,9,10,11} pypy3 )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="A utility to find python versions on your system"
+HOMEPAGE="
+ https://github.com/frostming/findpython/
+ https://pypi.org/project/findpython/
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+ dev-python/packaging[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/findpython/metadata.xml b/dev-python/findpython/metadata.xml
new file mode 100644
index 000000000000..a2cf3f904da1
--- /dev/null
+++ b/dev-python/findpython/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>falbrechtskirchinger@gmail.com</email>
+ <name>Florian Albrechtskirchinger</name>
+ </maintainer>
+
+ <origin>gentoo-guru-overlay</origin>
+</pkgmetadata> \ No newline at end of file
diff --git a/dev-python/futurist/futurist-2.4.1.ebuild b/dev-python/futurist/futurist-2.4.1.ebuild
index 1259c666eb01..9225ae3f130a 100644
--- a/dev-python/futurist/futurist-2.4.1.ebuild
+++ b/dev-python/futurist/futurist-2.4.1.ebuild
@@ -6,7 +6,7 @@ EAPI=8
DISTUTILS_USE_PEP517=setuptools
PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-inherit distutils-r1
+inherit distutils-r1 pypi
DESCRIPTION="Useful additions to futures, from the future"
HOMEPAGE="
@@ -14,7 +14,6 @@ HOMEPAGE="
https://pypi.org/project/futurist/
http://docs.openstack.org/developer/futurist
"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
diff --git a/dev-python/gabbi/gabbi-2.7.1.ebuild b/dev-python/gabbi/gabbi-2.7.1.ebuild
index 3972c863d3e5..872221bcceec 100644
--- a/dev-python/gabbi/gabbi-2.7.1.ebuild
+++ b/dev-python/gabbi/gabbi-2.7.1.ebuild
@@ -5,14 +5,13 @@ EAPI=8
PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-inherit distutils-r1
+inherit distutils-r1 pypi
DESCRIPTION="Declarative HTTP testing library"
HOMEPAGE="
https://github.com/cdent/gabbi
https://pypi.org/project/gabbi/
"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
SLOT="0"
LICENSE="Apache-2.0"
diff --git a/dev-python/gemcall/gemcall-0.9.ebuild b/dev-python/gemcall/gemcall-0.9.ebuild
index f5dc87cdb8a2..727a528c6f61 100644
--- a/dev-python/gemcall/gemcall-0.9.ebuild
+++ b/dev-python/gemcall/gemcall-0.9.ebuild
@@ -5,11 +5,10 @@ EAPI=8
PYTHON_COMPAT=( python3_{7,8,9,10,11} pypy3 )
DISTUTILS_USE_PEP517=setuptools
-inherit distutils-r1
+inherit distutils-r1 pypi
DESCRIPTION="A library and CLI tool for making gemini requests"
HOMEPAGE="https://notabug.org/tinyrabbit/gemcall/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
diff --git a/dev-python/gflanguages/gflanguages-0.4.0-r1.ebuild b/dev-python/gflanguages/gflanguages-0.4.0-r1.ebuild
index 80b0415720e2..bc2645ffb055 100644
--- a/dev-python/gflanguages/gflanguages-0.4.0-r1.ebuild
+++ b/dev-python/gflanguages/gflanguages-0.4.0-r1.ebuild
@@ -6,14 +6,13 @@ EAPI=8
PYTHON_COMPAT=( python3_{7,8,9,10,11} )
DISTUTILS_USE_PEP517=setuptools
-inherit distutils-r1
+inherit distutils-r1 pypi
DESCRIPTION="A python API for evaluating language support in the Google Fonts collection"
HOMEPAGE="
https://github.com/googlefonts/lang
https://pypi.org/project/gflanguages/
"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="Apache-2.0"
KEYWORDS="~amd64"
diff --git a/dev-python/glicko2/glicko2-2.0.0-r2.ebuild b/dev-python/glicko2/glicko2-2.0.0-r2.ebuild
index c36a55f8e663..099c981a730d 100644
--- a/dev-python/glicko2/glicko2-2.0.0-r2.ebuild
+++ b/dev-python/glicko2/glicko2-2.0.0-r2.ebuild
@@ -6,11 +6,10 @@ EAPI=8
DISTUTILS_USE_PEP517=setuptools
PYTHON_COMPAT=( python3_{7,8,9,10,11} pypy3 )
-inherit distutils-r1
+inherit distutils-r1 pypi
DESCRIPTION="glicko2 implementation in python"
HOMEPAGE="https://github.com/deepy/glicko2"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
diff --git a/dev-python/glyphtools/glyphtools-0.8.0.ebuild b/dev-python/glyphtools/glyphtools-0.8.0.ebuild
index 7e13623decf6..270cb87acf8c 100644
--- a/dev-python/glyphtools/glyphtools-0.8.0.ebuild
+++ b/dev-python/glyphtools/glyphtools-0.8.0.ebuild
@@ -5,11 +5,10 @@ EAPI=8
DISTUTILS_USE_PEP517=setuptools
PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-inherit distutils-r1
+inherit distutils-r1 pypi
DESCRIPTION="Routines for extracting information from fontTools glyphs"
HOMEPAGE="https://github.com/simoncozens/glyphtools"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="Apache-2.0"
KEYWORDS="~amd64"
diff --git a/dev-python/googletransx/googletransx-2.4.2-r2.ebuild b/dev-python/googletransx/googletransx-2.4.2-r2.ebuild
index cf0fbcddd6a8..afc8ef3c9f1f 100644
--- a/dev-python/googletransx/googletransx-2.4.2-r2.ebuild
+++ b/dev-python/googletransx/googletransx-2.4.2-r2.ebuild
@@ -5,11 +5,10 @@ EAPI=8
PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-inherit distutils-r1
+inherit distutils-r1 pypi
DESCRIPTION="Free Google Translate API for Python. Translates totally free of charge."
HOMEPAGE="https://pypi.org/project/googletransx/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
diff --git a/dev-python/graphql-core/graphql-core-3.1.6.ebuild b/dev-python/graphql-core/graphql-core-3.1.6.ebuild
index 5586b342e156..ea026e4ed530 100644
--- a/dev-python/graphql-core/graphql-core-3.1.6.ebuild
+++ b/dev-python/graphql-core/graphql-core-3.1.6.ebuild
@@ -3,13 +3,13 @@
EAPI=8
+PYPI_NO_NORMALIZE=1
PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-inherit distutils-r1
+inherit distutils-r1 pypi
DESCRIPTION="GraphQL for Python"
HOMEPAGE="https://github.com/graphql-python/graphql-core"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
diff --git a/dev-python/graphql-relay/graphql-relay-3.1.0.ebuild b/dev-python/graphql-relay/graphql-relay-3.1.0.ebuild
index 1c1a446fbcc3..b99e9f9f880e 100644
--- a/dev-python/graphql-relay/graphql-relay-3.1.0.ebuild
+++ b/dev-python/graphql-relay/graphql-relay-3.1.0.ebuild
@@ -3,13 +3,13 @@
EAPI=8
+PYPI_NO_NORMALIZE=1
PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-inherit distutils-r1
+inherit distutils-r1 pypi
DESCRIPTION="Relay library for graphql-core-next"
HOMEPAGE="https://github.com/graphql-python/graphql-relay-py"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
diff --git a/dev-python/guidata/guidata-2.3.0.ebuild b/dev-python/guidata/guidata-2.3.0.ebuild
index 7d35d0c0548e..0e27e665ea34 100644
--- a/dev-python/guidata/guidata-2.3.0.ebuild
+++ b/dev-python/guidata/guidata-2.3.0.ebuild
@@ -5,7 +5,7 @@ EAPI=8
PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-inherit distutils-r1
+inherit distutils-r1 pypi
DESCRIPTION="Library for user interfaces for easy dataset editing and display"
HOMEPAGE="https://pypi.python.org/pypi/guidata"
@@ -22,6 +22,5 @@ RDEPEND="
dev-python/QtPy[${PYTHON_USEDEP}]
"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
KEYWORDS="~amd64 ~x86"
diff --git a/dev-python/hypothesmith/hypothesmith-0.2.0.ebuild b/dev-python/hypothesmith/hypothesmith-0.2.0.ebuild
index deb2f19f39c1..5bec6a131f6b 100644
--- a/dev-python/hypothesmith/hypothesmith-0.2.0.ebuild
+++ b/dev-python/hypothesmith/hypothesmith-0.2.0.ebuild
@@ -5,11 +5,10 @@ EAPI=8
PYTHON_COMPAT=( python3_{7,8,9,10,11} ) # python3_11 depends on dev-python/libcst
-inherit distutils-r1
+inherit distutils-r1 pypi
DESCRIPTION="Hypothesis strategies for generating Python programs"
HOMEPAGE="https://github.com/Zac-HD/hypothesmith"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MPL-2.0"
SLOT="0"
diff --git a/dev-python/i3ipc/i3ipc-2.2.1-r1.ebuild b/dev-python/i3ipc/i3ipc-2.2.1-r1.ebuild
index f9a95af0584e..58163f3b024d 100644
--- a/dev-python/i3ipc/i3ipc-2.2.1-r1.ebuild
+++ b/dev-python/i3ipc/i3ipc-2.2.1-r1.ebuild
@@ -6,11 +6,10 @@ EAPI=8
DISTUTILS_USE_PEP517="setuptools"
PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-inherit distutils-r1 virtualx
+inherit distutils-r1 virtualx 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"
diff --git a/dev-python/injector/injector-0.18.4.ebuild b/dev-python/injector/injector-0.18.4.ebuild
index 8e1957b34401..81f5839c9e0d 100644
--- a/dev-python/injector/injector-0.18.4.ebuild
+++ b/dev-python/injector/injector-0.18.4.ebuild
@@ -4,14 +4,13 @@
EAPI=7
PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-inherit distutils-r1
+inherit distutils-r1 pypi
DESCRIPTION="Python dependency injection framework"
HOMEPAGE="
https://pypi.org/project/injector/
https://github.com/alecthomas/injector
"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
KEYWORDS="~amd64"
LICENSE="BSD"
diff --git a/dev-python/insipid-sphinx-theme/insipid-sphinx-theme-0.4.1.ebuild b/dev-python/insipid-sphinx-theme/insipid-sphinx-theme-0.4.1.ebuild
index e389de97ef5e..6f2e4095cc60 100644
--- a/dev-python/insipid-sphinx-theme/insipid-sphinx-theme-0.4.1.ebuild
+++ b/dev-python/insipid-sphinx-theme/insipid-sphinx-theme-0.4.1.ebuild
@@ -4,15 +4,15 @@
EAPI=8
DISTUTILS_USE_PEP517=setuptools
+PYPI_NO_NORMALIZE=1
PYTHON_COMPAT=( python3_{7,8,9,10,11} pypy3 )
-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"
diff --git a/dev-python/iuliia/iuliia-0.11.5.ebuild b/dev-python/iuliia/iuliia-0.11.5.ebuild
index d402e2bf26f5..a292e1f84fce 100644
--- a/dev-python/iuliia/iuliia-0.11.5.ebuild
+++ b/dev-python/iuliia/iuliia-0.11.5.ebuild
@@ -5,7 +5,7 @@ EAPI=8
PYTHON_COMPAT=( python3_{7,8,9,10,11} pypy3 )
DISTUTILS_USE_PEP517="flit"
-inherit distutils-r1
+inherit distutils-r1 pypi
DESCRIPTION="Transliterate Cyrillic to Latin in every possible way"
HOMEPAGE="
@@ -13,7 +13,6 @@ HOMEPAGE="
https://pypi.org/project/iuliia/
https://github.com/nalgeon/iuliia-py
"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
diff --git a/dev-python/jplephem/jplephem-2.16.ebuild b/dev-python/jplephem/jplephem-2.16.ebuild
index 575dad9338b9..580c8843f833 100644
--- a/dev-python/jplephem/jplephem-2.16.ebuild
+++ b/dev-python/jplephem/jplephem-2.16.ebuild
@@ -6,11 +6,10 @@ EAPI=7
DISTUTILS_USE_SETUPTOOLS=no
PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-inherit distutils-r1
+inherit distutils-r1 pypi
DESCRIPTION="Python version of NASA DE4xx ephemerides for Astronomical Alamanac"
HOMEPAGE="https://pypi.org/project/jplephem/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
diff --git a/dev-python/jsonpath-rw-ext/jsonpath-rw-ext-1.2.2.ebuild b/dev-python/jsonpath-rw-ext/jsonpath-rw-ext-1.2.2.ebuild
index 778fe4c54a1a..c47763f82510 100644
--- a/dev-python/jsonpath-rw-ext/jsonpath-rw-ext-1.2.2.ebuild
+++ b/dev-python/jsonpath-rw-ext/jsonpath-rw-ext-1.2.2.ebuild
@@ -7,16 +7,16 @@ EPYTEST_DESELECT=(
jsonpath_rw_ext/tests/test_jsonpath_rw_ext.py::TestJsonpath_rw_ext::test_fields_value
jsonpath_rw_ext/tests/test_jsonpath_rw_ext.py::TestJsonpath_rw_ext::test_shortcut_functions
)
+PYPI_NO_NORMALIZE=1
PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-inherit distutils-r1
+inherit distutils-r1 pypi
DESCRIPTION="Extensions for JSONPath RW"
HOMEPAGE="
https://pypi.org/project/jsonpath-rw-ext/
https://github.com/sileht/python-jsonpath-rw-ext
"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
SLOT="0"
LICENSE="Apache-2.0"
diff --git a/dev-python/langdetect/langdetect-1.0.9.ebuild b/dev-python/langdetect/langdetect-1.0.9.ebuild
index 5777e5514d2b..dea1bfb90a04 100644
--- a/dev-python/langdetect/langdetect-1.0.9.ebuild
+++ b/dev-python/langdetect/langdetect-1.0.9.ebuild
@@ -5,14 +5,13 @@ EAPI=8
PYTHON_COMPAT=( python3_{7,8,9,10,11} pypy3 )
DISTUTILS_USE_PEP517=setuptools
-inherit distutils-r1
+inherit distutils-r1 pypi
DESCRIPTION="Port of Google's language-detection library to Python"
HOMEPAGE="
https://pypi.org/project/langdetect/
https://github.com/Mimino666/langdetect
"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
diff --git a/dev-python/libusb1/libusb1-2.0.1.ebuild b/dev-python/libusb1/libusb1-2.0.1.ebuild
index 5392d1bff540..d3ea48421484 100644
--- a/dev-python/libusb1/libusb1-2.0.1.ebuild
+++ b/dev-python/libusb1/libusb1-2.0.1.ebuild
@@ -5,11 +5,10 @@ EAPI=8
PYTHON_COMPAT=( python3_{7,8,9,10,11} pypy3 )
-inherit distutils-r1
+inherit distutils-r1 pypi
DESCRIPTION="Pure-python wrapper for libusb-1.0"
HOMEPAGE="https://github.com/vpelletier/python-libusb1 https://pypi.org/project/libusb1/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="LGPL-2.1+"
SLOT="0"
diff --git a/dev-python/markdown-include/Manifest b/dev-python/markdown-include/Manifest
index 22e29f8b4a93..49765423bcdf 100644
--- a/dev-python/markdown-include/Manifest
+++ b/dev-python/markdown-include/Manifest
@@ -1,3 +1 @@
-DIST markdown-include-0.7.0.gh.tar.gz 16696 BLAKE2B 0816c25afe73f0046d9cf56ad6a985bf76ebd7b4f78f64db631697ffcd07f9e0550b2dd74411945e38c27965153be186a89d82c55aa7bf4570be47c1cfca2917 SHA512 2d4350ad87cc7e5dab116f4df7648d3a7ffc0c18e38b61ddfca9a6cf76a64bd1d41dcbf7525fd41c81cbc64abe1f776cd3ad9847e25fe790f16c4a024265390d
-DIST markdown-include-0.8.0.tar.gz 20208 BLAKE2B 62aeda968baaece8c95d3e73d9606b8206b6ac5f425a72ff1ecdd9e202a42f41d18ca2f3981efb9cbe5fb4aa37e22c97791cf1170ae1377f096a64404564efe0 SHA512 1288b66b3faf665d7886cb5d28372335286528b9bfbf5b7320128bf5ec21590533dbe4aa0466f339f24701da9f33cf3615ef5a7c227665513910bf26af9e6007
DIST markdown-include-0.8.1.tar.gz 21873 BLAKE2B 83090f66af6f6b7dfc441bce97a0ca91bed3f94274030297e5f46fe8d42d3b3e83afc9f981941870f5bf361bfb5edd54bdda4c5d85595cc5599375f5a2478490 SHA512 4ae155d7e114de9d8ca32c129fe5778e7fc9516321357d8e4d90fad651a1dcb54b1fb144bc51e981cf728f1632dc293ed8cc1e7d4219154a2350780ea6f9b7b2
diff --git a/dev-python/markdown-include/markdown-include-0.7.0.ebuild b/dev-python/markdown-include/markdown-include-0.7.0.ebuild
deleted file mode 100644
index 2c8e513cf7aa..000000000000
--- a/dev-python/markdown-include/markdown-include-0.7.0.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# 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_{7,8,9,10,11} )
-
-inherit distutils-r1
-
-DESCRIPTION="Syntax which allows for inclusion of contents of other Markdown docs"
-HOMEPAGE="https://github.com/cmacmackin/markdown-include"
-SRC_URI="https://github.com/cmacmackin/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.gh.tar.gz"
-
-LICENSE="GPL-3"
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-
-RDEPEND=">=dev-python/markdown-3.4[${PYTHON_USEDEP}]"
-
-src_prepare() {
- sed -i "s/description-file/description_file/" setup.cfg || die
- distutils-r1_src_prepare
-}
diff --git a/dev-python/markdown-include/markdown-include-0.8.0.ebuild b/dev-python/markdown-include/markdown-include-0.8.0.ebuild
deleted file mode 100644
index d380172040de..000000000000
--- a/dev-python/markdown-include/markdown-include-0.8.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# 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_{7,8,9,10,11} )
-
-inherit distutils-r1
-
-DESCRIPTION="Syntax which allows for inclusion of contents of other Markdown docs"
-HOMEPAGE="https://github.com/cmacmackin/markdown-include"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=dev-python/markdown-3.4[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
-
-src_prepare() {
- sed -i "s/description-file/description_file/" setup.cfg || die
- distutils-r1_src_prepare
-}
diff --git a/dev-python/markdown-include/markdown-include-0.8.1.ebuild b/dev-python/markdown-include/markdown-include-0.8.1.ebuild
index d380172040de..850091207776 100644
--- a/dev-python/markdown-include/markdown-include-0.8.1.ebuild
+++ b/dev-python/markdown-include/markdown-include-0.8.1.ebuild
@@ -4,13 +4,13 @@
EAPI=8
DISTUTILS_USE_PEP517=setuptools
+PYPI_NO_NORMALIZE=1
PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-inherit distutils-r1
+inherit distutils-r1 pypi
DESCRIPTION="Syntax which allows for inclusion of contents of other Markdown docs"
HOMEPAGE="https://github.com/cmacmackin/markdown-include"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="GPL-3"
KEYWORDS="~amd64 ~x86"
diff --git a/dev-python/markdownify/markdownify-0.11.6.ebuild b/dev-python/markdownify/markdownify-0.11.6.ebuild
index fafd7af47f0f..59e4656577a2 100644
--- a/dev-python/markdownify/markdownify-0.11.6.ebuild
+++ b/dev-python/markdownify/markdownify-0.11.6.ebuild
@@ -5,14 +5,13 @@ EAPI=8
PYTHON_COMPAT=( python3_{7,8,9,10,11} )
DISTUTILS_USE_PEP517=setuptools
-inherit distutils-r1
+inherit distutils-r1 pypi
DESCRIPTION="Convert HTML to Markdown"
HOMEPAGE="
https://pypi.org/project/markdownify/
https://github.com/matthewwithanm/python-markdownify
"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
diff --git a/dev-python/mkdocs-exclude/mkdocs-exclude-1.0.2.ebuild b/dev-python/mkdocs-exclude/mkdocs-exclude-1.0.2-r1.ebuild
index 4c6f8d75342d..6e6d20513ba4 100644
--- a/dev-python/mkdocs-exclude/mkdocs-exclude-1.0.2.ebuild
+++ b/dev-python/mkdocs-exclude/mkdocs-exclude-1.0.2-r1.ebuild
@@ -1,15 +1,19 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
PYTHON_COMPAT=( python3_{7,8,9,10,11} )
+DISTUTILS_USE_PEP517=setuptools
+PYPI_NO_NORMALIZE=1
-inherit distutils-r1
+inherit distutils-r1 pypi
DESCRIPTION="Lets you exclude files or trees from your output"
-HOMEPAGE="https://github.com/apenwarr/mkdocs-exclude"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+HOMEPAGE="
+ https://pypi.org/project/mkdocs-exclude/
+ https://github.com/apenwarr/mkdocs-exclude
+"
LICENSE="Apache-2.0"
KEYWORDS="~amd64 ~x86"
diff --git a/dev-python/mkdocs-render-swagger-plugin/mkdocs-render-swagger-plugin-0.0.4.ebuild b/dev-python/mkdocs-render-swagger-plugin/mkdocs-render-swagger-plugin-0.0.4.ebuild
index 8b595a87e453..b7fb86c3cc38 100644
--- a/dev-python/mkdocs-render-swagger-plugin/mkdocs-render-swagger-plugin-0.0.4.ebuild
+++ b/dev-python/mkdocs-render-swagger-plugin/mkdocs-render-swagger-plugin-0.0.4.ebuild
@@ -5,14 +5,14 @@ EAPI=8
PYTHON_COMPAT=( python3_{7,8,9,10,11} )
DISTUTILS_USE_PEP517=setuptools
-inherit distutils-r1
+PYPI_NO_NORMALIZE=1
+inherit distutils-r1 pypi
DESCRIPTION="MKDocs plugin for rendering swagger & openapi files"
HOMEPAGE="
https://pypi.org/project/mkdocs-render-swagger-plugin/
https://github.com/bharel/mkdocs-render-swagger-plugin
"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
diff --git a/dev-python/mkdocs-swagger-ui-tag/Manifest b/dev-python/mkdocs-swagger-ui-tag/Manifest
index 8792987bd57e..3f0d485906f2 100644
--- a/dev-python/mkdocs-swagger-ui-tag/Manifest
+++ b/dev-python/mkdocs-swagger-ui-tag/Manifest
@@ -1,2 +1,2 @@
-DIST mkdocs-swagger-ui-tag-0.5.2.gh.tar.gz 3577775 BLAKE2B 89a73486c0b9075d4695ff5d83d8df92391e3e1fdebcefec40150911d929b710b7754777c5413e84005960cb425e9e825d8345c0fab78b7bafa6b5732bc3d977 SHA512 5b8eac5fad9ed245e6a3dabebff65b1c4af8239091c2557f558383ad965496c711a05d40c5965b313efa022757f3ec52abe894ba984ec4bbf3737d7d16286476
DIST mkdocs-swagger-ui-tag-0.6.0.gh.tar.gz 3832872 BLAKE2B 6a5ecc6f011dc32c10b4953888c031d63deb4a7ec2c11f588815b23409f67e4c2dabe48bb0edd9ee2f73b0d62d57d9d2f768ca73d7a5f90426c530e62528f9c8 SHA512 f66c1a3e551afaf38928cf89f8e6ed7c210c8b8b8323b7e9fd63e95389335f3f92abd5678b0c0394d94b8898a52a41a38083f20a2eac131853a82def8b2bf502
+DIST mkdocs-swagger-ui-tag-0.6.1.gh.tar.gz 3839214 BLAKE2B 0aeef41cb9729a76da84ac616586fbbbbd0d264698a0f3f4475350987ac984fc6c257aac3a062ca200eabc451b4a807c600ec4357ee092b1328c545020aaccc9 SHA512 97a435d130232202af1382428d1f7fdc8b6dff5cec3fac1b39ac40afeb25f22ec698761e2f26a04f690e45fa3c0506a5fa87b782c6a1637eebe3f98ed6a7e4a5
diff --git a/dev-python/mkdocs-swagger-ui-tag/mkdocs-swagger-ui-tag-0.5.2.ebuild b/dev-python/mkdocs-swagger-ui-tag/mkdocs-swagger-ui-tag-0.6.1.ebuild
index e4e8b68d826f..e4e8b68d826f 100644
--- a/dev-python/mkdocs-swagger-ui-tag/mkdocs-swagger-ui-tag-0.5.2.ebuild
+++ b/dev-python/mkdocs-swagger-ui-tag/mkdocs-swagger-ui-tag-0.6.1.ebuild
diff --git a/dev-python/moreorless/moreorless-0.4.0.ebuild b/dev-python/moreorless/moreorless-0.4.0.ebuild
index 4f79f209798b..726f0a27a6e4 100644
--- a/dev-python/moreorless/moreorless-0.4.0.ebuild
+++ b/dev-python/moreorless/moreorless-0.4.0.ebuild
@@ -6,11 +6,10 @@ EAPI=8
DISTUTILS_USE_PEP517=setuptools
PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-inherit distutils-r1
+inherit distutils-r1 pypi
DESCRIPTION="Wrapper to make difflib.unified_diff more fun to use"
HOMEPAGE="https://github.com/thatch/moreorless"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
diff --git a/dev-python/opentracing/opentracing-2.4.0.ebuild b/dev-python/opentracing/opentracing-2.4.0.ebuild
index b524f5eb9088..4d5ed963a177 100644
--- a/dev-python/opentracing/opentracing-2.4.0.ebuild
+++ b/dev-python/opentracing/opentracing-2.4.0.ebuild
@@ -5,14 +5,13 @@ EAPI=8
PYTHON_COMPAT=( python3_{7,8,9,10,11} )
DISTUTILS_USE_PEP517=setuptools
-inherit distutils-r1
+inherit distutils-r1 pypi
DESCRIPTION="OpenTracing API for Python"
HOMEPAGE="
https://opentracing.io
https://github.com/opentracing/opentracing-python
"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
SLOT="0"
LICENSE="Apache-2.0"
diff --git a/dev-python/osprofiler/osprofiler-3.4.3.ebuild b/dev-python/osprofiler/osprofiler-3.4.3.ebuild
index a797f3f71d71..b303b6f69e07 100644
--- a/dev-python/osprofiler/osprofiler-3.4.3.ebuild
+++ b/dev-python/osprofiler/osprofiler-3.4.3.ebuild
@@ -14,7 +14,7 @@ EPYTEST_DESELECT=(
EPYTEST_IGNORE=( osprofiler/tests/unit/drivers/test_jaeger.py )
PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-inherit distutils-r1
+inherit distutils-r1 pypi
DESCRIPTION="OpenStack Profiler Library"
HOMEPAGE="
@@ -22,7 +22,6 @@ HOMEPAGE="
https://opendev.org/openstack/osprofiler
https://pypi.org/project/osprofiler/
"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
diff --git a/dev-python/parsel/parsel-1.7.0.ebuild b/dev-python/parsel/parsel-1.7.0.ebuild
index 9d04054f0c94..3ee60f296ad8 100644
--- a/dev-python/parsel/parsel-1.7.0.ebuild
+++ b/dev-python/parsel/parsel-1.7.0.ebuild
@@ -5,7 +5,7 @@ EAPI=8
PYTHON_COMPAT=( python3_{7,8,9,10,11} )
DISTUTILS_USE_PEP517=setuptools
-inherit distutils-r1
+inherit distutils-r1 pypi
DESCRIPTION="Utility to extract data from XML/HTML documents using XPath or CSS selectors"
HOMEPAGE="
@@ -13,7 +13,6 @@ HOMEPAGE="
https://pypi.org/project/parsel/
https://github.com/scrapy/parsel
"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
SLOT=0
diff --git a/dev-python/pdm/Manifest b/dev-python/pdm/Manifest
new file mode 100644
index 000000000000..1e98cd157227
--- /dev/null
+++ b/dev-python/pdm/Manifest
@@ -0,0 +1 @@
+DIST pdm-2.4.9.tar.gz 2883026 BLAKE2B f9b481562d257f54f67d768cb40d6371f97a38880cc4f30e2a8615bdc75baf050301df97ed95c66c2553919d36cac5111b7d8c0efad362e97925fc8064a876fb SHA512 1a8952c99e408c7a37d3f3f1e3655cfbe8674e323a21501cdfe7740580ddb8b854b69c9bec46d091027fe16a310929f58e43c26d28e10a5d0f3a81c356edd1fe
diff --git a/dev-python/pdm/metadata.xml b/dev-python/pdm/metadata.xml
new file mode 100644
index 000000000000..a2cf3f904da1
--- /dev/null
+++ b/dev-python/pdm/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>falbrechtskirchinger@gmail.com</email>
+ <name>Florian Albrechtskirchinger</name>
+ </maintainer>
+
+ <origin>gentoo-guru-overlay</origin>
+</pkgmetadata> \ No newline at end of file
diff --git a/dev-python/pdm/pdm-2.4.9.ebuild b/dev-python/pdm/pdm-2.4.9.ebuild
new file mode 100644
index 000000000000..d344210db12b
--- /dev/null
+++ b/dev-python/pdm/pdm-2.4.9.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=pdm
+PYTHON_COMPAT=( python3_{7,8,9,10,11} pypy3 )
+
+inherit bash-completion-r1 distutils-r1 pypi
+
+DESCRIPTION="Modern Python package and dependency manager supporting latest PEP standards"
+HOMEPAGE="
+ https://github.com/pdm-project/pdm/
+ https://pypi.org/project/pdm/
+"
+
+LICENSE="MIT"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+
+RDEPEND="
+ dev-python/blinker[${PYTHON_USEDEP}]
+ dev-python/certifi[${PYTHON_USEDEP}]
+ dev-python/packaging[${PYTHON_USEDEP}]
+ dev-python/platformdirs[${PYTHON_USEDEP}]
+ dev-python/rich[${PYTHON_USEDEP}]
+ dev-python/virtualenv[${PYTHON_USEDEP}]
+ dev-python/pyproject-hooks[${PYTHON_USEDEP}]
+ dev-python/requests-toolbelt[${PYTHON_USEDEP}]
+ dev-python/unearth[${PYTHON_USEDEP}]
+ dev-python/findpython[${PYTHON_USEDEP}]
+ dev-python/tomlkit[${PYTHON_USEDEP}]
+ dev-python/shellingham[${PYTHON_USEDEP}]
+ dev-python/python-dotenv[${PYTHON_USEDEP}]
+ <dev-python/resolvelib-1.0.0[${PYTHON_USEDEP}]
+ dev-python/installer[${PYTHON_USEDEP}]
+ dev-python/cachecontrol[${PYTHON_USEDEP}]
+
+ $(python_gen_cond_dep '
+ dev-python/tomli[${PYTHON_USEDEP}]
+ ' 3.10)
+"
+BDEPEND="
+ ${RDEPEND}
+ test? (
+ dev-python/pytest-mock[${PYTHON_USEDEP}]
+ dev-python/pytest-xdist[${PYTHON_USEDEP}]
+ dev-python/pytest-rerunfailures[${PYTHON_USEDEP}]
+ )
+"
+
+distutils_enable_tests pytest
+
+python_compile_all() {
+ PDM_CHECK_UPDATE=0 "${EPYTHON}" -m pdm completion bash > completion.bash || die
+ PDM_CHECK_UPDATE=0 "${EPYTHON}" -m pdm completion zsh > completion.zsh || die
+}
+
+python_test() {
+ epytest -m "not network"
+}
+
+python_install_all() {
+ distutils-r1_python_install_all
+
+ newbashcomp completion.bash pdm
+
+ insinto /usr/share/zsh/site-functions
+ newins completion.zsh _pdm
+}
diff --git a/dev-python/persist-queue/persist-queue-0.8.0.ebuild b/dev-python/persist-queue/persist-queue-0.8.0.ebuild
index 3c047f3731d4..e0a5cffe0d00 100644
--- a/dev-python/persist-queue/persist-queue-0.8.0.ebuild
+++ b/dev-python/persist-queue/persist-queue-0.8.0.ebuild
@@ -4,15 +4,15 @@
EAPI=8
DISTUTILS_USE_PEP517=setuptools
+PYPI_NO_NORMALIZE=1
PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-inherit distutils-r1
+inherit distutils-r1 pypi
DESCRIPTION="A thread-safe disk based persistent queue in Python"
HOMEPAGE="https://github.com/peter-wangxu/persist-queue"
LICENSE="BSD"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
KEYWORDS="~amd64"
SLOT="0"
diff --git a/dev-python/pg8000/pg8000-1.29.2.ebuild b/dev-python/pg8000/pg8000-1.29.2.ebuild
index bf878e1c7d61..6b6f44eb8d1e 100644
--- a/dev-python/pg8000/pg8000-1.29.2.ebuild
+++ b/dev-python/pg8000/pg8000-1.29.2.ebuild
@@ -5,14 +5,13 @@ EAPI=8
PYTHON_COMPAT=( python3_{7,8,9,10,11} )
DISTUTILS_USE_PEP517=setuptools
-inherit databases distutils-r1 edo
+inherit databases distutils-r1 edo pypi
DESCRIPTION="A Pure-Python PostgreSQL Driver"
HOMEPAGE="
https://github.com/tlocke/pg8000
https://pypi.org/project/pg8000/
"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
SLOT="0"
LICENSE="BSD"
diff --git a/dev-python/pifpaf/pifpaf-3.1.5.ebuild b/dev-python/pifpaf/pifpaf-3.1.5.ebuild
index 49036595ed59..cfba0967192e 100644
--- a/dev-python/pifpaf/pifpaf-3.1.5.ebuild
+++ b/dev-python/pifpaf/pifpaf-3.1.5.ebuild
@@ -6,14 +6,13 @@ EAPI=8
EPYTEST_DESELECT=( pifpaf/tests/test_cli.py::TestCli::test_non_existing_command )
PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-inherit distutils-r1
+inherit distutils-r1 pypi
DESCRIPTION="Python fixtures and daemon managing tools for functional testing"
HOMEPAGE="
https://pypi.org/project/pifpaf/
https://github.com/jd/pifpaf
"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
diff --git a/dev-python/playsound/playsound-1.3.0.ebuild b/dev-python/playsound/playsound-1.3.0.ebuild
index 9674b808039c..2d4e30ee92ba 100644
--- a/dev-python/playsound/playsound-1.3.0.ebuild
+++ b/dev-python/playsound/playsound-1.3.0.ebuild
@@ -3,11 +3,10 @@
EAPI=8
PYTHON_COMPAT=( python3_{7,8,9,10,11} pypy3 )
-inherit distutils-r1
+inherit distutils-r1 pypi
DESCRIPTION="Single function module with no dependencies for playing sounds."
HOMEPAGE="https://pypi.org/project/playsound/ https://github.com/TaylorSMarks/playsound"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
diff --git a/dev-python/portio/portio-0.5-r1.ebuild b/dev-python/portio/portio-0.5-r1.ebuild
index 625da0007a12..611dcb2525ee 100644
--- a/dev-python/portio/portio-0.5-r1.ebuild
+++ b/dev-python/portio/portio-0.5-r1.ebuild
@@ -6,14 +6,13 @@ EAPI=8
DISTUTILS_USE_SETUPTOOLS=no
PYTHON_COMPAT=( python3_{7,8,9,10,11} pypy3 )
-inherit distutils-r1
+inherit distutils-r1 pypi
DESCRIPTION="Python low level port I/O for Linux x86"
HOMEPAGE="
http://portio.inrim.it
https://pypi.org/project/portio/
"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="GPL-3"
SLOT="0"
diff --git a/dev-python/py3nvml/py3nvml-0.2.6.ebuild b/dev-python/py3nvml/py3nvml-0.2.6.ebuild
index fb3d4c7ee4e9..824ff7228b6c 100644
--- a/dev-python/py3nvml/py3nvml-0.2.6.ebuild
+++ b/dev-python/py3nvml/py3nvml-0.2.6.ebuild
@@ -4,14 +4,13 @@
EAPI=7
PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-inherit distutils-r1
+inherit distutils-r1 pypi
DESCRIPTION="Python 3 Bindings for the NVIDIA Management Library"
HOMEPAGE="
https://pypi.org/project/py3nvml/
https://github.com/fbcotter/py3nvml
"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
KEYWORDS="~amd64"
LICENSE="BSD"
diff --git a/dev-python/pyfiglet/pyfiglet-0.8_p1.ebuild b/dev-python/pyfiglet/pyfiglet-0.8_p1.ebuild
index 135b51ac216b..296763805922 100644
--- a/dev-python/pyfiglet/pyfiglet-0.8_p1.ebuild
+++ b/dev-python/pyfiglet/pyfiglet-0.8_p1.ebuild
@@ -1,18 +1,17 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
PYTHON_COMPAT=( python3_{7,8,9,10,11} pypy3 )
DISTUTILS_USE_PEP517=setuptools
-inherit distutils-r1
+inherit distutils-r1 pypi
-MY_PV="$(ver_cut 1-2).post$(ver_cut 4)"
-MY_P="${PN}-${MY_PV}"
DESCRIPTION="Pure-python FIGlet implementation"
-HOMEPAGE="https://pypi.org/project/pyfiglet/ https://github.com/pwaller/pyfiglet"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
+HOMEPAGE="
+ https://pypi.org/project/pyfiglet/
+ https://github.com/pwaller/pyfiglet
+"
LICENSE="MIT"
KEYWORDS="~amd64"
diff --git a/dev-python/pygaljs/pygaljs-1.0.2-r1.ebuild b/dev-python/pygaljs/pygaljs-1.0.2-r1.ebuild
index 91337e839da1..32ded6fa6f78 100644
--- a/dev-python/pygaljs/pygaljs-1.0.2-r1.ebuild
+++ b/dev-python/pygaljs/pygaljs-1.0.2-r1.ebuild
@@ -5,14 +5,13 @@ EAPI=8
PYTHON_COMPAT=( python3_{7,8,9,10,11} pypy3 )
DISTUTILS_USE_PEP517=setuptools
-inherit distutils-r1
+inherit distutils-r1 pypi
DESCRIPTION="Python package providing assets from https://github.com/Kozea/pygal.js"
HOMEPAGE="
https://github.com/ionelmc/python-pygaljs
https://pypi.org/project/pygaljs/
"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="LGPL-3+"
SLOT="0"
diff --git a/dev-python/pymemcache/pymemcache-4.0.0.ebuild b/dev-python/pymemcache/pymemcache-4.0.0.ebuild
index c44718b7f403..c33fcdec0f5f 100644
--- a/dev-python/pymemcache/pymemcache-4.0.0.ebuild
+++ b/dev-python/pymemcache/pymemcache-4.0.0.ebuild
@@ -5,14 +5,13 @@ EAPI=8
PYTHON_COMPAT=( python3_{7,8,9,10,11} )
DISTUTILS_USE_PEP517=setuptools
-inherit databases distutils-r1
+inherit databases distutils-r1 pypi
DESCRIPTION="A comprehensive, fast, pure-Python memcached client"
HOMEPAGE="
https://github.com/pinterest/pymemcache
https://pypi.org/project/pymemcache/
"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
diff --git a/dev-python/pymorphy2-dicts-ru/pymorphy2-dicts-ru-2.4.417127.4579844.ebuild b/dev-python/pymorphy2-dicts-ru/pymorphy2-dicts-ru-2.4.417127.4579844.ebuild
index cb0d8f761f52..a7555170400f 100644
--- a/dev-python/pymorphy2-dicts-ru/pymorphy2-dicts-ru-2.4.417127.4579844.ebuild
+++ b/dev-python/pymorphy2-dicts-ru/pymorphy2-dicts-ru-2.4.417127.4579844.ebuild
@@ -5,11 +5,11 @@ EAPI=7
PYTHON_COMPAT=( python3_{7,8,9,10,11} pypy3 )
DISTUTILS_USE_SETUPTOOLS=bdepend
-inherit distutils-r1
+PYPI_NO_NORMALIZE=1
+inherit distutils-r1 pypi
DESCRIPTION="Russian dictionary for PyMorphy2"
HOMEPAGE="https://pypi.org/project/pymorphy2-dicts-ru/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
diff --git a/dev-python/pymorphy2-dicts-uk/pymorphy2-dicts-uk-2.4.1.1.1460299261.ebuild b/dev-python/pymorphy2-dicts-uk/pymorphy2-dicts-uk-2.4.1.1.1460299261.ebuild
index 053e26e1cf51..4cdefe6fca83 100644
--- a/dev-python/pymorphy2-dicts-uk/pymorphy2-dicts-uk-2.4.1.1.1460299261.ebuild
+++ b/dev-python/pymorphy2-dicts-uk/pymorphy2-dicts-uk-2.4.1.1.1460299261.ebuild
@@ -5,11 +5,11 @@ EAPI=7
PYTHON_COMPAT=( python3_{7,8,9,10,11} pypy3 )
DISTUTILS_USE_SETUPTOOLS=bdepend
-inherit distutils-r1
+PYPI_NO_NORMALIZE=1
+inherit distutils-r1 pypi
DESCRIPTION="Ukrainian dictionary for PyMorphy2"
HOMEPAGE="https://pypi.org/project/pymorphy2-dicts-uk/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
diff --git a/dev-python/pymorphy2-dicts/pymorphy2-dicts-2.4.393442.3710985.ebuild b/dev-python/pymorphy2-dicts/pymorphy2-dicts-2.4.393442.3710985.ebuild
index a4c9ca69c9ba..b75ff0d1376d 100644
--- a/dev-python/pymorphy2-dicts/pymorphy2-dicts-2.4.393442.3710985.ebuild
+++ b/dev-python/pymorphy2-dicts/pymorphy2-dicts-2.4.393442.3710985.ebuild
@@ -5,11 +5,11 @@ EAPI=7
PYTHON_COMPAT=( python3_{7,8,9,10,11} pypy3 )
DISTUTILS_USE_SETUPTOOLS=bdepend
-inherit distutils-r1
+PYPI_NO_NORMALIZE=1
+inherit distutils-r1 pypi
DESCRIPTION="Russian dictionary for PyMorphy2"
HOMEPAGE="https://pypi.org/project/pymorphy2-dicts-ru/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
diff --git a/dev-python/pymorphy2/pymorphy2-0.9.1.ebuild b/dev-python/pymorphy2/pymorphy2-0.9.1.ebuild
index c06fe2c1fd44..6a39937f4b62 100644
--- a/dev-python/pymorphy2/pymorphy2-0.9.1.ebuild
+++ b/dev-python/pymorphy2/pymorphy2-0.9.1.ebuild
@@ -5,11 +5,10 @@ EAPI=7
PYTHON_COMPAT=( python3_{7,8,9,10,11} pypy3 )
DISTUTILS_USE_SETUPTOOLS=bdepend
-inherit distutils-r1
+inherit distutils-r1 pypi
DESCRIPTION="Morphological analyzer (POS tagger + inflection engine) for Russian language."
HOMEPAGE="https://github.com/kmike/pymorphy2 https://pypi.org/project/pymorphy2/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
DEPEND="
dev-python/docopt[${PYTHON_USEDEP}]
dev-python/pymorphy2-dicts-ru[${PYTHON_USEDEP}]
diff --git a/dev-python/pyodbc/pyodbc-4.0.32.ebuild b/dev-python/pyodbc/pyodbc-4.0.32.ebuild
index f7ea074acf1d..ee7ab9b8bc33 100644
--- a/dev-python/pyodbc/pyodbc-4.0.32.ebuild
+++ b/dev-python/pyodbc/pyodbc-4.0.32.ebuild
@@ -5,14 +5,13 @@ EAPI=8
PYTHON_COMPAT=( python3_{7,8,9,10,11} ) # pypy3 https://github.com/mkleehammer/pyodbc/issues/915
-inherit distutils-r1
+inherit distutils-r1 pypi
DESCRIPTION="Python ODBC library"
HOMEPAGE="
https://github.com/mkleehammer/pyodbc
https://pypi.org/project/pyodbc/
"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
diff --git a/dev-python/pyqtdarktheme/pyqtdarktheme-2.1.0.ebuild b/dev-python/pyqtdarktheme/pyqtdarktheme-2.1.0.ebuild
index 2844de957b68..fafddfc4d0cb 100644
--- a/dev-python/pyqtdarktheme/pyqtdarktheme-2.1.0.ebuild
+++ b/dev-python/pyqtdarktheme/pyqtdarktheme-2.1.0.ebuild
@@ -5,11 +5,10 @@ EAPI=7
PYTHON_COMPAT=( python3_{7,8,9,10,11} pypy3 )
DISTUTILS_USE_PEP517=poetry
-inherit distutils-r1
+inherit distutils-r1 pypi
DESCRIPTION="A flat dark theme for PySide and PyQt. "
HOMEPAGE="https://github.com/5yutan5/PyQtDarkTheme https://pypi.org/project/PyQtDarkTheme"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
DEPEND="
dev-python/darkdetect[${PYTHON_USEDEP}]
"
diff --git a/dev-python/pytest-harvest/pytest-harvest-1.10.4.ebuild b/dev-python/pytest-harvest/pytest-harvest-1.10.4.ebuild
index d47b4cdd0a18..6ed072598cd3 100644
--- a/dev-python/pytest-harvest/pytest-harvest-1.10.4.ebuild
+++ b/dev-python/pytest-harvest/pytest-harvest-1.10.4.ebuild
@@ -5,16 +5,16 @@ EAPI=8
PYTHON_COMPAT=( python3_{7,8,9,10,11} )
DISTUTILS_USE_PEP517=setuptools
+PYPI_NO_NORMALIZE=1
DOCS_BUILDER="mkdocs"
DOCS_DEPEND="dev-python/mkdocs-material"
DOCS_DIR="docs"
-inherit distutils-r1 docs
+inherit distutils-r1 docs pypi
DESCRIPTION="Store and retrieve data created during your pytest tests execution"
HOMEPAGE="https://pypi.org/project/pytest-harvest/ https://github.com/smarie/python-pytest-harvest"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
diff --git a/dev-python/pytest-steps/pytest-steps-1.8.0.ebuild b/dev-python/pytest-steps/pytest-steps-1.8.0.ebuild
index 709674ffdd2f..8c89608571f9 100644
--- a/dev-python/pytest-steps/pytest-steps-1.8.0.ebuild
+++ b/dev-python/pytest-steps/pytest-steps-1.8.0.ebuild
@@ -5,16 +5,16 @@ EAPI=8
PYTHON_COMPAT=( python3_{7,8,9,10,11} )
DISTUTILS_USE_PEP517=setuptools
+PYPI_NO_NORMALIZE=1
DOCS_BUILDER="mkdocs"
DOCS_DEPEND="dev-python/mkdocs-material"
DOCS_DIR="docs"
-inherit distutils-r1 docs
+inherit distutils-r1 docs pypi
DESCRIPTION="Create step-wise / incremental tests in pytest"
HOMEPAGE="https://pypi.org/project/pytest-steps/ https://github.com/smarie/python-pytest-steps"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
diff --git a/dev-python/python-betterproto/Manifest b/dev-python/python-betterproto/Manifest
deleted file mode 100644
index 07be9d4d8816..000000000000
--- a/dev-python/python-betterproto/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST python-betterproto-2.0.0_beta4.tar.gz 137744 BLAKE2B 55cde21cca516ae935d8ff99303e3dcf78d952c470eaac2f91b5fa1dc20069e0ad150a0b59518d450c897547a3b3025d9ad683294adca5be6d66f06ba8034615 SHA512 10fc514e7a6d1ab87dd44e00d75d8f48752fa1ece26ccc671eeac502164aee2b8e4a30ec908e4abbb4b1c6671c72fc982764d74ccd0ac0f099d3533dcde64352
diff --git a/dev-python/python-pidfile/python-pidfile-3.0.0-r1.ebuild b/dev-python/python-pidfile/python-pidfile-3.0.0-r1.ebuild
index 9828087ae018..86be6dc0d33a 100644
--- a/dev-python/python-pidfile/python-pidfile-3.0.0-r1.ebuild
+++ b/dev-python/python-pidfile/python-pidfile-3.0.0-r1.ebuild
@@ -3,13 +3,13 @@
EAPI=8
+PYPI_NO_NORMALIZE=1
PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-inherit distutils-r1
+inherit distutils-r1 pypi
DESCRIPTION="PIDFile context processor. Supported py2 and py3"
HOMEPAGE="https://github.com/mosquito/python-pidfile"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
diff --git a/dev-python/python-socketio/python-socketio-5.1.0.ebuild b/dev-python/python-socketio/python-socketio-5.1.0.ebuild
index 3f45d56ed0b6..434d8b24d089 100644
--- a/dev-python/python-socketio/python-socketio-5.1.0.ebuild
+++ b/dev-python/python-socketio/python-socketio-5.1.0.ebuild
@@ -3,15 +3,15 @@
EAPI=8
+PYPI_NO_NORMALIZE=1
PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-inherit distutils-r1
+inherit distutils-r1 pypi
DESCRIPTION="Python implementation of the Socket.IO realtime server."
HOMEPAGE="
https://python-socketio.readthedocs.org/
https://github.com/miguelgrinberg/python-socketio/
https://pypi.org/project/python-socketio"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
diff --git a/dev-python/pywebview/pywebview-3.7.2.ebuild b/dev-python/pywebview/pywebview-3.7.2.ebuild
index 951e8ef77878..e9885a23c4e0 100644
--- a/dev-python/pywebview/pywebview-3.7.2.ebuild
+++ b/dev-python/pywebview/pywebview-3.7.2.ebuild
@@ -6,11 +6,10 @@ EAPI=8
DISTUTILS_USE_PEP517=setuptools
PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-inherit distutils-r1
+inherit distutils-r1 pypi
DESCRIPTION="A lightweight cross-platform wrapper around a webview component"
HOMEPAGE="https://github.com/r0x0r/pywebview"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
diff --git a/dev-python/redbaron/redbaron-0.9.2.ebuild b/dev-python/redbaron/redbaron-0.9.2.ebuild
index 8013509d1ba7..eeb3da04d1e4 100644
--- a/dev-python/redbaron/redbaron-0.9.2.ebuild
+++ b/dev-python/redbaron/redbaron-0.9.2.ebuild
@@ -5,14 +5,13 @@ EAPI=7
PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-inherit distutils-r1
+inherit distutils-r1 pypi
DESCRIPTION="A FST for python to make writing refactoring code a realistic task"
HOMEPAGE="
https://redbaron.readthedocs.io/
https://github.com/PyCQA/redbaron
"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="LGPL-3"
SLOT="0"
diff --git a/dev-python/requests-wsgi-adapter/Manifest b/dev-python/requests-wsgi-adapter/Manifest
new file mode 100644
index 000000000000..71f3a17f5416
--- /dev/null
+++ b/dev-python/requests-wsgi-adapter/Manifest
@@ -0,0 +1 @@
+DIST requests-wsgi-adapter-0.4.1.tar.gz 3035 BLAKE2B 6c495a9af66ac8674b4fa14df4f089f82873159d082d12259fdb3ceece2b95c239115b8557de34dbb07efec861d367562aba4d0bebd12500dbbeb446e05d378c SHA512 8557743b668bdcbb414e4a4afb254573aebdd378a22b0d64392ad669ca2cef91c6f1fbc60cefa8bc0f23a072ffcaa0ffffec7cbbb1c6dfc430068af16192d7ee
diff --git a/dev-python/requests-wsgi-adapter/metadata.xml b/dev-python/requests-wsgi-adapter/metadata.xml
new file mode 100644
index 000000000000..a2cf3f904da1
--- /dev/null
+++ b/dev-python/requests-wsgi-adapter/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>falbrechtskirchinger@gmail.com</email>
+ <name>Florian Albrechtskirchinger</name>
+ </maintainer>
+
+ <origin>gentoo-guru-overlay</origin>
+</pkgmetadata> \ No newline at end of file
diff --git a/dev-python/requests-wsgi-adapter/requests-wsgi-adapter-0.4.1.ebuild b/dev-python/requests-wsgi-adapter/requests-wsgi-adapter-0.4.1.ebuild
new file mode 100644
index 000000000000..1c36feb146b3
--- /dev/null
+++ b/dev-python/requests-wsgi-adapter/requests-wsgi-adapter-0.4.1.ebuild
@@ -0,0 +1,20 @@
+# 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_{7,8,9,10,11} pypy3 )
+PYPI_NO_NORMALIZE=1
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="WSGI Transport Adapter for Requests"
+HOMEPAGE="
+ https://github.com/seanbrant/requests-wsgi-adapter/
+ https://pypi.org/project/requests-wsgi-adapter/
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
diff --git a/dev-python/rstcheck/rstcheck-6.1.1.ebuild b/dev-python/rstcheck/rstcheck-6.1.1.ebuild
index e89d62d725a4..ef6a6c20c85b 100644
--- a/dev-python/rstcheck/rstcheck-6.1.1.ebuild
+++ b/dev-python/rstcheck/rstcheck-6.1.1.ebuild
@@ -6,11 +6,10 @@ EAPI=8
DISTUTILS_USE_PEP517=poetry
PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-inherit distutils-r1
+inherit distutils-r1 pypi
DESCRIPTION="Checks syntax of reStructuredText and code blocks nested within it"
HOMEPAGE="https://github.com/rstcheck/rstcheck"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
diff --git a/dev-python/rstr/rstr-3.2.0.ebuild b/dev-python/rstr/rstr-3.2.0.ebuild
index a7f7e24fbb75..52d07b5667a9 100644
--- a/dev-python/rstr/rstr-3.2.0.ebuild
+++ b/dev-python/rstr/rstr-3.2.0.ebuild
@@ -6,14 +6,13 @@ EAPI=8
DISTUTILS_USE_PEP517=setuptools
PYTHON_COMPAT=( python3_{7,8,9,10,11} pypy3 )
-inherit distutils-r1
+inherit distutils-r1 pypi
DESCRIPTION="Easily generate random strings of various types"
HOMEPAGE="
https://github.com/leapfrogonline/rstr
https://pypi.org/project/rstr/
"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
SLOT=0
diff --git a/dev-python/schema/schema-0.7.5.ebuild b/dev-python/schema/schema-0.7.5.ebuild
index cf1679f59ff3..62e9da2b16b2 100644
--- a/dev-python/schema/schema-0.7.5.ebuild
+++ b/dev-python/schema/schema-0.7.5.ebuild
@@ -6,11 +6,10 @@ EAPI=8
DISTUTILS_USE_PEP517="setuptools"
PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-inherit distutils-r1
+inherit distutils-r1 pypi
DESCRIPTION="Python module to validate and convert data structures"
HOMEPAGE="https://github.com/keleshev/schema"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
KEYWORDS="~amd64"
LICENSE="MIT"
SLOT="0"
diff --git a/dev-python/scramp/scramp-1.4.4.ebuild b/dev-python/scramp/scramp-1.4.4.ebuild
index f19bd7f534b8..7d0cf4c12ef7 100644
--- a/dev-python/scramp/scramp-1.4.4.ebuild
+++ b/dev-python/scramp/scramp-1.4.4.ebuild
@@ -5,14 +5,13 @@ EAPI=8
PYTHON_COMPAT=( python3_{7,8,9,10,11} pypy3 )
DISTUTILS_USE_PEP517=setuptools
-inherit distutils-r1
+inherit distutils-r1 pypi
DESCRIPTION="A pure-Python implementation of the SCRAM authentication protocol."
HOMEPAGE="
https://pypi.org/project/scramp/
https://github.com/tlocke/scramp
"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
SLOT="0"
LICENSE="MIT"
diff --git a/dev-python/scrapy/Manifest b/dev-python/scrapy/Manifest
index 82662d417cd8..2584b3dc263f 100644
--- a/dev-python/scrapy/Manifest
+++ b/dev-python/scrapy/Manifest
@@ -1,4 +1 @@
-DIST scrapy-2.5.1.tar.gz 1276985 BLAKE2B 7e4a43391a8dd4f641d188c7a89d26d52bc51aae3eb8340e02c9de2477bc6458f80b3a8ba16f6a17a9ec1debb85fe558fb7c1c48358fd923e02864758ea75fa5 SHA512 4285272412b4c474707e864ece701990435d206b0a1ef28cb9f99cff87a02e6b0323e744e96f15878a3b433a7efe4be413d24068bb252f00f9ab1b0a980d844a
-DIST scrapy-2.6.2.tar.gz 1312436 BLAKE2B 4cfa85a624d22145a306abb1ea17b12ba662f7f5bef51572f6a26670dfae059dc8b80a92eec6efb42d31175732e410f126ad4bd1c0904928bfcc284288ce9b5b SHA512 4442c26a42df1c2e91ab6f8391568ba4e774b938a915f05492572d7ef196760101fc4c1ae4e17fc79cba574dd5696fee842672ec613d6fdb1167f9965972afd5
-DIST scrapy-2.6.3.tar.gz 1312210 BLAKE2B 48dd845eda2bf96a2c69f5fb95fd2cdd9203e16d50251a46cedf38e5241de21aa01099b735bb79bdee4cc8687c32bf7724779a01de8eca2f8ff1c1d95d04a749 SHA512 4248fdde8e71e8045811ef1ce78bf30939a705d1d0a075025e79f15ceca357391345e24a7990bf63e9c98b5ee099b95535fc134f49175c0275bef5393da2a5c8
DIST scrapy-2.8.0.tar.gz 1345516 BLAKE2B 9a02d50cfde6c829e6c9064f29b75de4fb97139759b7822e20914ad3edfae104df3b4d65452f58bae6f4b7af4407ed87c6dc59000e5285e823637e54f1412102 SHA512 c758e8aad459aad5f447e6e721afd3c8e8f5743c8a0961d7562ecea9735444a2a2b7fd1b4c443fd3623fcb9bd3db5fdd108aa6fe7fa629a36229a3175eabac7d
diff --git a/dev-python/scrapy/scrapy-2.5.1.ebuild b/dev-python/scrapy/scrapy-2.5.1.ebuild
deleted file mode 100644
index 4c62c4ae5eca..000000000000
--- a/dev-python/scrapy/scrapy-2.5.1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-inherit distutils-r1
-
-DESCRIPTION="A high-level Web Crawling and Web Scraping framework"
-HOMEPAGE="https://scrapy.org/"
-SRC_URI="https://github.com/scrapy/scrapy/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT=0
-KEYWORDS="~amd64"
-
-# The 'PyDispatcher>=2.0.5' distribution was not found and is required by Scrapy
-# https://bugs.gentoo.org/684734
-RDEPEND="${PYTHON_DEPS}
- dev-python/cssselect[${PYTHON_USEDEP}]
- dev-python/cryptography[${PYTHON_USEDEP}]
- <dev-python/priority-2.0.0[${PYTHON_USEDEP}]
- <dev-python/h2-4.0.0[${PYTHON_USEDEP}]
- dev-python/itemadapter[${PYTHON_USEDEP}]
- dev-python/itemloaders[${PYTHON_USEDEP}]
- dev-python/lxml[${PYTHON_USEDEP}]
- dev-python/parsel[${PYTHON_USEDEP}]
- dev-python/protego[${PYTHON_USEDEP}]
- >=dev-python/pydispatcher-2.0.5[${PYTHON_USEDEP}]
- dev-python/pyopenssl[${PYTHON_USEDEP}]
- dev-python/queuelib[${PYTHON_USEDEP}]
- dev-python/service_identity[${PYTHON_USEDEP}]
- dev-python/six[${PYTHON_USEDEP}]
- >=dev-python/twisted-17.9.0[${PYTHON_USEDEP}]
- dev-python/w3lib[${PYTHON_USEDEP}]
- dev-python/zope-interface[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
- test? (
- dev-python/testfixtures[${PYTHON_USEDEP}]
- dev-python/uvloop[${PYTHON_USEDEP}]
- )
-"
-
-distutils_enable_tests pytest
-
-PATCHES=( "${FILESDIR}/${PN}-2.5.1-no-doctest.patch" )
-
-python_test() {
- py.test -vv --ignore=docs \
- --ignore="tests/test_proxy_connect.py" \
- --ignore="tests/test_utils_display.py" \
- --ignore="tests/test_command_check.py" \
- --ignore="tests/test_feedexport.py" \
- --ignore="tests/test_pipeline_files.py" \
- --ignore="tests/test_pipeline_images.py" \
- --ignore="tests/test_squeues.py" || die
-}
diff --git a/dev-python/scrapy/scrapy-2.6.2.ebuild b/dev-python/scrapy/scrapy-2.6.2.ebuild
deleted file mode 100644
index 309c58a4223b..000000000000
--- a/dev-python/scrapy/scrapy-2.6.2.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-inherit distutils-r1
-
-DESCRIPTION="A high-level Web Crawling and Web Scraping framework"
-HOMEPAGE="https://scrapy.org/"
-SRC_URI="https://github.com/scrapy/scrapy/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT=0
-KEYWORDS="~amd64"
-
-# The 'PyDispatcher>=2.0.5' distribution was not found and is required by Scrapy
-# https://bugs.gentoo.org/684734
-RDEPEND="${PYTHON_DEPS}
- dev-python/cssselect[${PYTHON_USEDEP}]
- dev-python/cryptography[${PYTHON_USEDEP}]
- <dev-python/priority-2.0.0[${PYTHON_USEDEP}]
- <dev-python/h2-4.0.0[${PYTHON_USEDEP}]
- dev-python/itemadapter[${PYTHON_USEDEP}]
- dev-python/itemloaders[${PYTHON_USEDEP}]
- dev-python/lxml[${PYTHON_USEDEP}]
- dev-python/parsel[${PYTHON_USEDEP}]
- dev-python/protego[${PYTHON_USEDEP}]
- >=dev-python/pydispatcher-2.0.5[${PYTHON_USEDEP}]
- dev-python/pyopenssl[${PYTHON_USEDEP}]
- dev-python/queuelib[${PYTHON_USEDEP}]
- dev-python/service_identity[${PYTHON_USEDEP}]
- dev-python/six[${PYTHON_USEDEP}]
- dev-python/tldextract[${PYTHON_USEDEP}]
- >=dev-python/twisted-17.9.0[${PYTHON_USEDEP}]
- dev-python/w3lib[${PYTHON_USEDEP}]
- dev-python/zope-interface[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
- test? (
- dev-python/testfixtures[${PYTHON_USEDEP}]
- dev-python/uvloop[${PYTHON_USEDEP}]
- )
-"
-
-distutils_enable_tests pytest
-
-PATCHES=( "${FILESDIR}/${PN}-2.5.1-no-doctest.patch" )
-
-python_test() {
- py.test -vv --ignore=docs \
- --ignore="tests/test_proxy_connect.py" \
- --ignore="tests/test_utils_display.py" \
- --ignore="tests/test_command_check.py" \
- --ignore="tests/test_feedexport.py" \
- --ignore="tests/test_pipeline_files.py" \
- --ignore="tests/test_pipeline_images.py" \
- --ignore="tests/test_squeues.py" || die
-}
diff --git a/dev-python/scrapy/scrapy-2.6.3.ebuild b/dev-python/scrapy/scrapy-2.6.3.ebuild
deleted file mode 100644
index 8b466d0129ee..000000000000
--- a/dev-python/scrapy/scrapy-2.6.3.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-inherit distutils-r1
-
-DESCRIPTION="A high-level Web Crawling and Web Scraping framework"
-HOMEPAGE="https://scrapy.org/"
-SRC_URI="https://github.com/scrapy/scrapy/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT=0
-KEYWORDS="~amd64"
-
-# The 'PyDispatcher>=2.0.5' distribution was not found and is required by Scrapy
-# https://bugs.gentoo.org/684734
-RDEPEND="${PYTHON_DEPS}
- dev-python/cssselect[${PYTHON_USEDEP}]
- dev-python/cryptography[${PYTHON_USEDEP}]
- <dev-python/priority-2.0.0[${PYTHON_USEDEP}]
- <dev-python/h2-4.0.0[${PYTHON_USEDEP}]
- dev-python/itemadapter[${PYTHON_USEDEP}]
- dev-python/itemloaders[${PYTHON_USEDEP}]
- dev-python/lxml[${PYTHON_USEDEP}]
- dev-python/parsel[${PYTHON_USEDEP}]
- dev-python/protego[${PYTHON_USEDEP}]
- >=dev-python/pydispatcher-2.0.5[${PYTHON_USEDEP}]
- dev-python/pyopenssl[${PYTHON_USEDEP}]
- dev-python/queuelib[${PYTHON_USEDEP}]
- dev-python/service_identity[${PYTHON_USEDEP}]
- dev-python/six[${PYTHON_USEDEP}]
- dev-python/tldextract[${PYTHON_USEDEP}]
- >=dev-python/twisted-17.9.0[${PYTHON_USEDEP}]
- dev-python/w3lib[${PYTHON_USEDEP}]
- dev-python/zope-interface[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
- test? (
- dev-python/testfixtures[${PYTHON_USEDEP}]
- dev-python/uvloop[${PYTHON_USEDEP}]
- )
-"
-
-distutils_enable_tests pytest
-
-PATCHES=( "${FILESDIR}/${PN}-2.5.1-no-doctest.patch" )
-
-python_test() {
- py.test -vv --ignore=docs \
- --ignore="tests/test_proxy_connect.py" \
- --ignore="tests/test_utils_display.py" \
- --ignore="tests/test_command_check.py" \
- --ignore="tests/test_feedexport.py" \
- --ignore="tests/test_pipeline_files.py" \
- --ignore="tests/test_pipeline_images.py" \
- --ignore="tests/test_squeues.py" || die
-}
diff --git a/dev-python/scrapy/scrapy-2.8.0.ebuild b/dev-python/scrapy/scrapy-2.8.0.ebuild
index 9bd5fafdfa1f..c97146d0eca5 100644
--- a/dev-python/scrapy/scrapy-2.8.0.ebuild
+++ b/dev-python/scrapy/scrapy-2.8.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -21,7 +21,7 @@ RDEPEND="${PYTHON_DEPS}
dev-python/cssselect[${PYTHON_USEDEP}]
dev-python/cryptography[${PYTHON_USEDEP}]
<dev-python/priority-2.0.0[${PYTHON_USEDEP}]
- <dev-python/h2-4.0.0[${PYTHON_USEDEP}]
+ dev-python/h2[${PYTHON_USEDEP}]
dev-python/itemadapter[${PYTHON_USEDEP}]
dev-python/itemloaders[${PYTHON_USEDEP}]
dev-python/lxml[${PYTHON_USEDEP}]
diff --git a/dev-python/sendgrid/sendgrid-6.9.7.ebuild b/dev-python/sendgrid/sendgrid-6.9.7.ebuild
index f3860ef44710..39befc55c3a7 100644
--- a/dev-python/sendgrid/sendgrid-6.9.7.ebuild
+++ b/dev-python/sendgrid/sendgrid-6.9.7.ebuild
@@ -5,11 +5,10 @@ EAPI=8
PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-inherit distutils-r1
+inherit distutils-r1 pypi
DESCRIPTION="Twilio SendGrid library for Python"
HOMEPAGE="https://github.com/sendgrid/sendgrid-python/ https://pypi.org/project/sendgrid/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
diff --git a/dev-python/shellingham/Manifest b/dev-python/shellingham/Manifest
new file mode 100644
index 000000000000..7d0e5e07e654
--- /dev/null
+++ b/dev-python/shellingham/Manifest
@@ -0,0 +1 @@
+DIST shellingham-1.5.0.tar.gz 8974 BLAKE2B 07ae56303d046d224d84ab39816171c6c8a440182528857bbbd10075cd074882b0a984ddc6f6d9b0165b4f4461204568e088a6238129d5cf096d62898d00fd88 SHA512 1772cf807f37feb2ea9301aca9c84149b7d718b70daccfe80c8dfd90b20461ab22c11798b240c63c12861d544a99dca4671d560da68e757bf9acb02a62242afe
diff --git a/dev-python/shellingham/metadata.xml b/dev-python/shellingham/metadata.xml
new file mode 100644
index 000000000000..a2cf3f904da1
--- /dev/null
+++ b/dev-python/shellingham/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>falbrechtskirchinger@gmail.com</email>
+ <name>Florian Albrechtskirchinger</name>
+ </maintainer>
+
+ <origin>gentoo-guru-overlay</origin>
+</pkgmetadata> \ No newline at end of file
diff --git a/dev-python/shellingham/shellingham-1.5.0.ebuild b/dev-python/shellingham/shellingham-1.5.0.ebuild
new file mode 100644
index 000000000000..5b74cbbe6a8d
--- /dev/null
+++ b/dev-python/shellingham/shellingham-1.5.0.ebuild
@@ -0,0 +1,19 @@
+# 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_{7,8,9,10,11} pypy3 )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Tool to Detect Surrounding Shell"
+HOMEPAGE="
+ https://github.com/sarugaku/shellingham/
+ https://pypi.org/project/shellingham/
+"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
diff --git a/dev-python/signalstickers-client/signalstickers-client-3.2.0.ebuild b/dev-python/signalstickers-client/signalstickers-client-3.2.0.ebuild
index faaddc20dc00..1cddc18a86e8 100644
--- a/dev-python/signalstickers-client/signalstickers-client-3.2.0.ebuild
+++ b/dev-python/signalstickers-client/signalstickers-client-3.2.0.ebuild
@@ -4,13 +4,13 @@
EAPI=8
DISTUTILS_USE_PEP517=setuptools
+PYPI_NO_NORMALIZE=1
PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-inherit distutils-r1
+inherit distutils-r1 pypi
DESCRIPTION="A Python client for the Signal stickers API"
HOMEPAGE="https://github.com/signalstickers/signalstickers-client"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="LGPL-3"
SLOT="0"
diff --git a/dev-python/sphinx-click/sphinx-click-4.2.0.ebuild b/dev-python/sphinx-click/sphinx-click-4.2.0.ebuild
index d7965cd76a91..396fbe6ef6be 100644
--- a/dev-python/sphinx-click/sphinx-click-4.2.0.ebuild
+++ b/dev-python/sphinx-click/sphinx-click-4.2.0.ebuild
@@ -3,16 +3,16 @@
EAPI=8
+PYPI_NO_NORMALIZE=1
PYTHON_COMPAT=( python3_{7,8,9,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"
diff --git a/dev-python/sphinxcontrib-katex/sphinxcontrib-katex-0.9.4.ebuild b/dev-python/sphinxcontrib-katex/sphinxcontrib-katex-0.9.4.ebuild
index d3c192b9ac9e..68efb9217fb9 100644
--- a/dev-python/sphinxcontrib-katex/sphinxcontrib-katex-0.9.4.ebuild
+++ b/dev-python/sphinxcontrib-katex/sphinxcontrib-katex-0.9.4.ebuild
@@ -4,13 +4,13 @@
EAPI=8
DISTUTILS_USE_PEP517=setuptools
+PYPI_NO_NORMALIZE=1
PYTHON_COMPAT=( python3_{7,8,9,10,11} pypy3 )
-inherit distutils-r1
+inherit distutils-r1 pypi
DESCRIPTION="KaTeX Sphinx extension for rendering of math in HTML pages"
HOMEPAGE="https://github.com/hagenw/sphinxcontrib-katex"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
diff --git a/dev-python/srt/srt-3.5.2.ebuild b/dev-python/srt/srt-3.5.2.ebuild
index 2e4f55d55473..c7ce475ac48d 100644
--- a/dev-python/srt/srt-3.5.2.ebuild
+++ b/dev-python/srt/srt-3.5.2.ebuild
@@ -6,11 +6,10 @@ EAPI=8
PYTHON_COMPAT=( python3_{7,8,9,10,11} )
DISTUTILS_USE_PEP517=setuptools
-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"
diff --git a/dev-python/starkbank-ecdsa/starkbank-ecdsa-2.2.0.ebuild b/dev-python/starkbank-ecdsa/starkbank-ecdsa-2.2.0.ebuild
index 9a16d1c36017..ca36f1d237fd 100644
--- a/dev-python/starkbank-ecdsa/starkbank-ecdsa-2.2.0.ebuild
+++ b/dev-python/starkbank-ecdsa/starkbank-ecdsa-2.2.0.ebuild
@@ -3,13 +3,13 @@
EAPI=8
+PYPI_NO_NORMALIZE=1
PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-inherit distutils-r1
+inherit distutils-r1 pypi
DESCRIPTION="A lightweight and fast pure python ECDSA library"
HOMEPAGE="https://github.com/starkbank/ecdsa-python/ https://pypi.org/project/starkbank-ecdsa/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
diff --git a/dev-python/stdlibs/stdlibs-2022.6.8.ebuild b/dev-python/stdlibs/stdlibs-2022.6.8.ebuild
index b232bb64dc49..947c12607c5a 100644
--- a/dev-python/stdlibs/stdlibs-2022.6.8.ebuild
+++ b/dev-python/stdlibs/stdlibs-2022.6.8.ebuild
@@ -6,11 +6,10 @@ EAPI=8
DISTUTILS_USE_PEP517=flit
PYTHON_COMPAT=( python3_{7,8,9,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"
diff --git a/dev-python/stringcase/stringcase-1.2.0.ebuild b/dev-python/stringcase/stringcase-1.2.0.ebuild
index 30248a18599f..3519c628dba5 100644
--- a/dev-python/stringcase/stringcase-1.2.0.ebuild
+++ b/dev-python/stringcase/stringcase-1.2.0.ebuild
@@ -7,11 +7,10 @@ PYTHON_COMPAT=( python3_{7,8,9,10,11} )
DISTUTILS_USE_SETUPTOOLS=no
-inherit distutils-r1
+inherit distutils-r1 pypi
DESCRIPTION="Convert string cases between camel case, pascal case, snake case etc."
HOMEPAGE="https://github.com/okunishinishi/python-stringcase"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
diff --git a/dev-python/tempus-themes/tempus-themes-2.3.0.20220206.ebuild b/dev-python/tempus-themes/tempus-themes-2.3.0.20220206.ebuild
index 3cf912c5fee4..1c193bf4393f 100644
--- a/dev-python/tempus-themes/tempus-themes-2.3.0.20220206.ebuild
+++ b/dev-python/tempus-themes/tempus-themes-2.3.0.20220206.ebuild
@@ -4,15 +4,15 @@
EAPI=8
DISTUTILS_USE_PEP517=setuptools
+PYPI_NO_NORMALIZE=1
PYTHON_COMPAT=( python3_{7,8,9,10,11} pypy3 )
-inherit distutils-r1
+inherit distutils-r1 pypi
DESCRIPTION="Accessible themes for Pygments"
HOMEPAGE="
https://pypi.org/project/tempus-themes/
https://gitlab.com/protesilaos/tempus-themes-generator
"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="GPL-3+"
SLOT="0"
diff --git a/dev-python/testrepository/testrepository-0.0.20-r200.ebuild b/dev-python/testrepository/testrepository-0.0.20-r200.ebuild
index fbc4e13484a4..5b0ff63dd107 100644
--- a/dev-python/testrepository/testrepository-0.0.20-r200.ebuild
+++ b/dev-python/testrepository/testrepository-0.0.20-r200.ebuild
@@ -67,7 +67,7 @@ EPYTEST_DESELECT=(
PYTHON_COMPAT=( python3_{7,8,9,10,11} pypy3 )
PYTHON_REQ_USE="threads(+)"
-inherit distutils-r1
+inherit distutils-r1 pypi
DESCRIPTION="A repository of test results"
HOMEPAGE="
@@ -75,7 +75,6 @@ HOMEPAGE="
https://pypi.org/project/testrepository/
https://github.com/testing-cabal/testrepository
"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="Apache-2.0 BSD"
SLOT="0"
diff --git a/dev-python/timeslot/timeslot-0.1.2.ebuild b/dev-python/timeslot/timeslot-0.1.2.ebuild
index 2bf62f9b12cd..ed439b4aa808 100644
--- a/dev-python/timeslot/timeslot-0.1.2.ebuild
+++ b/dev-python/timeslot/timeslot-0.1.2.ebuild
@@ -6,13 +6,12 @@ EAPI=8
DISTUTILS_USE_PEP517=poetry
PYTHON_COMPAT=( python3_{7,8,9,10,11} pypy3 )
-inherit distutils-r1
+inherit distutils-r1 pypi
DESCRIPTION="Time slots/intervals with an arbitrary start and stop"
HOMEPAGE="https://github.com/ErikBjare/timeslot"
LICENSE="MIT"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
KEYWORDS="~amd64"
SLOT="0"
diff --git a/dev-python/trailrunner/trailrunner-1.2.1.ebuild b/dev-python/trailrunner/trailrunner-1.2.1.ebuild
index de38d226a2f2..1f0669cf41fc 100644
--- a/dev-python/trailrunner/trailrunner-1.2.1.ebuild
+++ b/dev-python/trailrunner/trailrunner-1.2.1.ebuild
@@ -6,11 +6,10 @@ EAPI=8
DISTUTILS_USE_PEP517=flit
PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-inherit distutils-r1
+inherit distutils-r1 pypi
DESCRIPTION="Walk paths and run things"
HOMEPAGE="https://github.com/omnilib/trailrunner"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
diff --git a/dev-python/transaction/transaction-3.0.1-r1.ebuild b/dev-python/transaction/transaction-3.0.1-r1.ebuild
index 2fe454113666..7b43fa34ae8a 100644
--- a/dev-python/transaction/transaction-3.0.1-r1.ebuild
+++ b/dev-python/transaction/transaction-3.0.1-r1.ebuild
@@ -6,14 +6,13 @@ EAPI=8
DISTUTILS_USE_PEP517=setuptools
PYTHON_COMPAT=( python3_{7,8,9,10,11} pypy3 )
-inherit distutils-r1
+inherit distutils-r1 pypi
DESCRIPTION="Transaction management for Python"
HOMEPAGE="
https://pypi.python.org/pypi/transaction
https://github.com/zopefoundation/transaction
"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="ZPL"
SLOT="0"
diff --git a/dev-python/types-paramiko/types-paramiko-2.11.1.ebuild b/dev-python/types-paramiko/types-paramiko-2.11.1.ebuild
index d940c4c70f36..7ee0e8bd43f8 100644
--- a/dev-python/types-paramiko/types-paramiko-2.11.1.ebuild
+++ b/dev-python/types-paramiko/types-paramiko-2.11.1.ebuild
@@ -3,16 +3,16 @@
EAPI=8
+PYPI_NO_NORMALIZE=1
PYTHON_COMPAT=( python3_{7,8,9,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"
diff --git a/dev-python/types-python-dateutil/types-python-dateutil-2.8.18.ebuild b/dev-python/types-python-dateutil/types-python-dateutil-2.8.18.ebuild
index 48ac31b7e4bc..9808e0e3c957 100644
--- a/dev-python/types-python-dateutil/types-python-dateutil-2.8.18.ebuild
+++ b/dev-python/types-python-dateutil/types-python-dateutil-2.8.18.ebuild
@@ -3,16 +3,16 @@
EAPI=8
+PYPI_NO_NORMALIZE=1
PYTHON_COMPAT=( python3_{7,8,9,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"
diff --git a/dev-python/types-pytz/types-pytz-2022.1.1.ebuild b/dev-python/types-pytz/types-pytz-2022.1.1.ebuild
index 2d0aa20486b0..b7d074578374 100644
--- a/dev-python/types-pytz/types-pytz-2022.1.1.ebuild
+++ b/dev-python/types-pytz/types-pytz-2022.1.1.ebuild
@@ -3,16 +3,16 @@
EAPI=8
+PYPI_NO_NORMALIZE=1
PYTHON_COMPAT=( python3_{7,8,9,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"
diff --git a/dev-python/types-requests/types-requests-2.28.0.ebuild b/dev-python/types-requests/types-requests-2.28.0.ebuild
index 69be77be8216..5e3023a2f2fa 100644
--- a/dev-python/types-requests/types-requests-2.28.0.ebuild
+++ b/dev-python/types-requests/types-requests-2.28.0.ebuild
@@ -3,16 +3,16 @@
EAPI=8
+PYPI_NO_NORMALIZE=1
PYTHON_COMPAT=( python3_{7,8,9,10,11} pypy3 )
-inherit distutils-r1
+inherit distutils-r1 pypi
DESCRIPTION="Typing stubs for requests"
HOMEPAGE="
https://pypi.org/project/types-requests/
https://github.com/python/typeshed/tree/master/stubs/requests
"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
SLOT="0"
LICENSE="Apache-2.0"
diff --git a/dev-python/types-urllib3/types-urllib3-1.26.15.ebuild b/dev-python/types-urllib3/types-urllib3-1.26.15.ebuild
index d757028b0bc7..103a8f449934 100644
--- a/dev-python/types-urllib3/types-urllib3-1.26.15.ebuild
+++ b/dev-python/types-urllib3/types-urllib3-1.26.15.ebuild
@@ -3,16 +3,16 @@
EAPI=8
+PYPI_NO_NORMALIZE=1
PYTHON_COMPAT=( python3_{7,8,9,10,11} pypy3 )
-inherit distutils-r1
+inherit distutils-r1 pypi
DESCRIPTION="Typing stubs for urllib3"
HOMEPAGE="
https://pypi.org/project/types-urllib3/
https://github.com/python/typeshed/tree/master/stubs/urllib3
"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
SLOT="0"
LICENSE="Apache-2.0"
diff --git a/dev-python/typing_inspect/typing_inspect-0.7.1.ebuild b/dev-python/typing_inspect/typing_inspect-0.7.1.ebuild
index af3a599ddc29..717944d75912 100644
--- a/dev-python/typing_inspect/typing_inspect-0.7.1.ebuild
+++ b/dev-python/typing_inspect/typing_inspect-0.7.1.ebuild
@@ -5,11 +5,10 @@ EAPI=8
PYTHON_COMPAT=( python3_{7,8,9,10,11} ) # python3_11 depends on dev-python/mypy_extensions
-inherit distutils-r1
+inherit distutils-r1 pypi
DESCRIPTION="Runtime inspection utilities for Python typing module"
HOMEPAGE="https://github.com/ilevkivskyi/typing_inspect"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
diff --git a/dev-python/ufmt/ufmt-1.3.3.ebuild b/dev-python/ufmt/ufmt-1.3.3.ebuild
index c1a2518c98d2..8c80340e218b 100644
--- a/dev-python/ufmt/ufmt-1.3.3.ebuild
+++ b/dev-python/ufmt/ufmt-1.3.3.ebuild
@@ -6,11 +6,10 @@ EAPI=8
DISTUTILS_USE_PEP517=flit
PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-inherit distutils-r1
+inherit distutils-r1 pypi
DESCRIPTION="Safe, atomic formatting with black and usort"
HOMEPAGE="https://github.com/omnilib/ufmt/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
diff --git a/dev-python/ufo2ft/ufo2ft-2.27.0.ebuild b/dev-python/ufo2ft/ufo2ft-2.27.0.ebuild
index 37546f212a7c..e4e736dce2c3 100644
--- a/dev-python/ufo2ft/ufo2ft-2.27.0.ebuild
+++ b/dev-python/ufo2ft/ufo2ft-2.27.0.ebuild
@@ -4,14 +4,13 @@
EAPI=8
PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-inherit distutils-r1
+inherit distutils-r1 pypi
DESCRIPTION="A bridge from UFOs to FontTool objects"
HOMEPAGE="
https://github.com/googlefonts/ufo2ft
https://pypi.org/project/ufo2ft/
"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
KEYWORDS="~amd64"
diff --git a/dev-python/uhashring/uhashring-2.1.ebuild b/dev-python/uhashring/uhashring-2.1.ebuild
index 88fe1c083481..1dc03704bad6 100644
--- a/dev-python/uhashring/uhashring-2.1.ebuild
+++ b/dev-python/uhashring/uhashring-2.1.ebuild
@@ -5,11 +5,10 @@ EAPI=8
PYTHON_COMPAT=( python3_{7,8,9,10,11} pypy3 )
-inherit distutils-r1
+inherit distutils-r1 pypi
DESCRIPTION="Full featured consistent hashing python library compatible with ketama"
HOMEPAGE="https://github.com/ultrabug/uhashring"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
diff --git a/dev-python/unearth/Manifest b/dev-python/unearth/Manifest
new file mode 100644
index 000000000000..c7bc563f97a7
--- /dev/null
+++ b/dev-python/unearth/Manifest
@@ -0,0 +1 @@
+DIST unearth-0.8.1.tar.gz 269300 BLAKE2B bbdfc83d5b25386e49bc21e25c5a0f8daf7d31f0afa8828576b06b366a093589ba23f5a7cc36a3ac47a254bd0734eeb8da9f14d0844d5a43b163dc9551c1cb8e SHA512 b4ffe0c79092622c8c7fff1b3b648fa741408d0e18925cbf39a2e662500cf3e976b745bd4a6bcbdeb879f71fe9efdf074719186ee9036a296ec10589e14fd3ab
diff --git a/dev-python/unearth/metadata.xml b/dev-python/unearth/metadata.xml
new file mode 100644
index 000000000000..a2cf3f904da1
--- /dev/null
+++ b/dev-python/unearth/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>falbrechtskirchinger@gmail.com</email>
+ <name>Florian Albrechtskirchinger</name>
+ </maintainer>
+
+ <origin>gentoo-guru-overlay</origin>
+</pkgmetadata> \ No newline at end of file
diff --git a/dev-python/unearth/unearth-0.8.1.ebuild b/dev-python/unearth/unearth-0.8.1.ebuild
new file mode 100644
index 000000000000..f0683d69a152
--- /dev/null
+++ b/dev-python/unearth/unearth-0.8.1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=pdm
+PYTHON_COMPAT=( python3_{7,8,9,10,11} pypy3 )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="A utility to fetch and download python packages"
+HOMEPAGE="
+ https://github.com/frostming/unearth/
+ https://pypi.org/project/unearth/
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+ dev-python/packaging[${PYTHON_USEDEP}]
+ dev-python/requests[${PYTHON_USEDEP}]
+"
+
+BDEPEND="
+ ${RDEPEND}
+ test? (
+ dev-python/pytest-httpserver[${PYTHON_USEDEP}]
+ dev-python/flask[${PYTHON_USEDEP}]
+ dev-python/requests-wsgi-adapter[${PYTHON_USEDEP}]
+ dev-python/trustme[${PYTHON_USEDEP}]
+ )
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/usort/usort-1.0.2.ebuild b/dev-python/usort/usort-1.0.2.ebuild
index 3f4e16ab6071..6aa8711994a1 100644
--- a/dev-python/usort/usort-1.0.2.ebuild
+++ b/dev-python/usort/usort-1.0.2.ebuild
@@ -6,11 +6,10 @@ EAPI=8
DISTUTILS_USE_PEP517=setuptools
PYTHON_COMPAT=( python3_{7,8,9,10,11} ) # python3_11 depends on dev-python/libcst
-inherit distutils-r1
+inherit distutils-r1 pypi
DESCRIPTION="Safe, minimal import sorting for Python projects"
HOMEPAGE="https://github.com/facebookexperimental/usort/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
diff --git a/dev-python/wsgi_intercept/wsgi_intercept-1.10.0.ebuild b/dev-python/wsgi_intercept/wsgi_intercept-1.10.0.ebuild
index 53353c05bb8d..849fa775f867 100644
--- a/dev-python/wsgi_intercept/wsgi_intercept-1.10.0.ebuild
+++ b/dev-python/wsgi_intercept/wsgi_intercept-1.10.0.ebuild
@@ -5,14 +5,13 @@ EAPI=8
PYTHON_COMPAT=( python3_{7,8,9,10,11} pypy3 )
-inherit distutils-r1
+inherit distutils-r1 pypi
DESCRIPTION="wsgi_intercept installs a WSGI application in place of a real URI for testing"
HOMEPAGE="
https://pypi.org/project/wsgi-intercept/
https://github.com/cdent/wsgi-intercept
"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
SLOT="0"
LICENSE="MIT"
diff --git a/dev-python/xattr/xattr-0.9.9.ebuild b/dev-python/xattr/xattr-0.9.9.ebuild
index d8d175d098b1..b61c5816ce1b 100644
--- a/dev-python/xattr/xattr-0.9.9.ebuild
+++ b/dev-python/xattr/xattr-0.9.9.ebuild
@@ -5,11 +5,10 @@ EAPI=8
PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-inherit distutils-r1
+inherit distutils-r1 pypi
DESCRIPTION="Python wrapper for extended filesystem attributes"
HOMEPAGE="https://github.com/xattr/xattr"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
SLOT="0"
LICENSE="Apache-2.0"
diff --git a/dev-python/yaql/yaql-2.0.0.ebuild b/dev-python/yaql/yaql-2.0.0.ebuild
index 3358b2d5eb96..0935494991f2 100644
--- a/dev-python/yaql/yaql-2.0.0.ebuild
+++ b/dev-python/yaql/yaql-2.0.0.ebuild
@@ -5,7 +5,7 @@ EAPI=8
PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-inherit distutils-r1
+inherit distutils-r1 pypi
DESCRIPTION="YAQL: Yet Another Query Language"
HOMEPAGE="
@@ -14,7 +14,6 @@ HOMEPAGE="
https://launchpad.net/yaql
https://opendev.org/openstack/yaql
"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
diff --git a/dev-python/youseedee/youseedee-0.3.0.ebuild b/dev-python/youseedee/youseedee-0.3.0.ebuild
index 00a83b6f53d2..0e07d63e2497 100644
--- a/dev-python/youseedee/youseedee-0.3.0.ebuild
+++ b/dev-python/youseedee/youseedee-0.3.0.ebuild
@@ -5,11 +5,10 @@ EAPI=8
PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-inherit distutils-r1
+inherit distutils-r1 pypi
DESCRIPTION="Interface to the Unicode Character Database"
HOMEPAGE="https://github.com/simoncozens/youseedee"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
KEYWORDS="~amd64"
LICENSE="MIT"