migrate (many) to inherit pypi instead of pypi mirror

Signed-off-by: Stephen L Arnold <sarnold@vctlabs.com>
VCTLabs · Jul 16, 2023 · acfd520 · acfd520
1 parent 48894f1
commit acfd520
Show file tree

Hide file tree

Showing 10 changed files with 34 additions and 41 deletions.
diff --git a/dev-python/decor/decor-2.0.1.ebuild b/dev-python/decor/decor-2.0.1.ebuild
@@ -1,17 +1,14 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="7"
-PYTHON_COMPAT=( python3_{8..10} )
+EAPI="8"
+PYTHON_COMPAT=( python3_{9..11} )
+PYPI_PN="py${PN}"
 
-inherit distutils-r1
-
-MY_PN="py${PN}"
-MY_P="${MY_PN}-${PV}"
+inherit distutils-r1 pypi
 
 DESCRIPTION="Easy-peasy Python decorators"
 HOMEPAGE="https://github.com/mplanchard/pydecor"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"

diff --git a/dev-python/esptool/esptool-2.0.1.ebuild b/dev-python/esptool/esptool-2.0.1.ebuild
@@ -5,11 +5,10 @@ EAPI=7
 
 PYTHON_COMPAT=( python3_{8..10} )
 
-inherit distutils-r1
+inherit distutils-r1 pypi
 
 DESCRIPTION="ESP8266 ROM Bootloader utility"
 HOMEPAGE="https://pypi.python.org/pypi/esptool"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 

diff --git a/dev-python/msgpack/msgpack-0.6.2.ebuild b/dev-python/msgpack/msgpack-0.6.2.ebuild
@@ -1,16 +1,15 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
+EAPI=8
+PYTHON_COMPAT=( python3_{9..11} pypy3 )
 
-inherit distutils-r1
+inherit distutils-r1 pypi
 
 DESCRIPTION="MessagePack (de)serializer for Python"
 HOMEPAGE="https://msgpack.org
 	https://github.com/msgpack/msgpack-python/
 	https://pypi.org/project/msgpack/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"

diff --git a/dev-python/pymavlink/pymavlink-2.4.29.ebuild b/dev-python/pymavlink/pymavlink-2.4.29.ebuild
@@ -3,12 +3,11 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
+PYTHON_COMPAT=( python3_{9..11} )
+inherit distutils-r1 pypi
 
 DESCRIPTION="MAVLink protocol streams and log files in Python"
 HOMEPAGE="https://pypi.org/project/pymavlink/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-3"
 SLOT="0"

diff --git a/dev-python/rst2pdf/rst2pdf-0.100.ebuild b/dev-python/rst2pdf/rst2pdf-0.100.ebuild
@@ -1,16 +1,15 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 PYTHON_COMPAT=( python3_{9..11} )
 DISTUTILS_USE_PEP517=setuptools
 
-inherit distutils-r1
+inherit distutils-r1 pypi
 
 DESCRIPTION="Tool for transforming reStructuredText to PDF using ReportLab"
 HOMEPAGE="https://rst2pdf.org/ https://pypi.org/project/rst2pdf/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"

diff --git a/dev-python/sphinxcontrib-apidoc/sphinxcontrib-apidoc-0.3.0-r1.ebuild b/dev-python/sphinxcontrib-apidoc/sphinxcontrib-apidoc-0.3.0-r1.ebuild
@@ -4,16 +4,17 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
+PYPI_NO_NORMALIZE=1
+PYPI_PN=sphinxcontrib-apidoc
+PYTHON_COMPAT=( python3_{9..11} )
 
-inherit distutils-r1
+inherit distutils-r1 pypi
 
 DESCRIPTION="Sphinx extension for running sphinx-apidoc on each build"
 HOMEPAGE="
 	https://pypi.org/project/sphinxcontrib-apidoc/
 	https://github.com/sphinx-contrib/apidoc/
 "
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"

diff --git a/media-gfx/svg2rlg/svg2rlg-0.3.ebuild b/media-gfx/svg2rlg/svg2rlg-0.3.ebuild
@@ -1,10 +1,11 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
-PYTHON_COMPAT=( python3_{8..10} )
+EAPI=8
 
-inherit distutils-r1
+PYTHON_COMPAT=( python3_{9..11} )
+
+inherit distutils-r1 pypi
 
 DESCRIPTION="Converts SVG files to PDFs or reportlab graphics"
 HOMEPAGE="https://github.com/sarnold/svg2rlg https://pypi.python.org/pypi/svg2rlg/"
@@ -14,7 +15,6 @@ if [[ ${PV} = 9999* ]]; then
 	EGIT_BRANCH="master"
 	inherit git-r3
 else
-	SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
 

diff --git a/media-gfx/svg2rlg/svg2rlg-0.4.0.ebuild b/media-gfx/svg2rlg/svg2rlg-0.4.0.ebuild
@@ -1,11 +1,12 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
+
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{9..11} )
 
-inherit distutils-r1
+inherit distutils-r1 pypi
 
 DESCRIPTION="Converts SVG files to PDFs or reportlab graphics"
 HOMEPAGE="https://github.com/sarnold/svg2rlg https://pypi.python.org/pypi/svg2rlg/"

diff --git a/net-proxy/pyforwarder/pyforwarder-0.12.35.ebuild b/net-proxy/pyforwarder/pyforwarder-0.12.35.ebuild
@@ -1,14 +1,13 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
-PYTHON_COMPAT=( python3_{8..10} )
+EAPI=8
+PYPI_PN="forwarder"
+PYTHON_COMPAT=( python3_{9..11} )
+MY_P="${PYPI_PN}-${PV}"
 
 inherit distutils-r1
 
-MY_PN="forwarder"
-MY_P="${MY_PN}-${PV}"
-
 DESCRIPTION="A python raw socket proxy with optional SSL/TLS termination"
 HOMEPAGE="https://github.com/pe2mbs/pyforwarder/wiki"
 
@@ -17,9 +16,9 @@ if [[ ${PV} = 9999* ]]; then
 	EGIT_BRANCH="master"
 	inherit git-r3
 else
-	SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 	S="${WORKDIR}/${MY_P}"
+	inherit pypi
 fi
 
 LICENSE="GPL-2"

diff --git a/net-proxy/pyforwarder/pyforwarder-9999.ebuild b/net-proxy/pyforwarder/pyforwarder-9999.ebuild
@@ -1,14 +1,13 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
-PYTHON_COMPAT=( python3_{8..10} )
+EAPI=8
+PYPI_PN="forwarder"
+PYTHON_COMPAT=( python3_{9..11} )
+MY_P="${PYPI_PN}-${PV}"
 
 inherit distutils-r1
 
-MY_PN="forwarder"
-MY_P="${MY_PN}-${PV}"
-
 DESCRIPTION="A python raw socket proxy with optional SSL/TLS termination"
 HOMEPAGE="https://github.com/pe2mbs/pyforwarder/wiki"
 
@@ -17,9 +16,9 @@ if [[ ${PV} = 9999* ]]; then
 	EGIT_BRANCH="master"
 	inherit git-r3
 else
-	SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 	S="${WORKDIR}/${MY_P}"
+	inherit pypi
 fi
 
 LICENSE="GPL-2"