Updating liguros repo

55 files changed, 157 insertions, 128 deletions

diff --git a/dev-python/brotlicffi/brotlicffi-0.8.0.ebuild b/dev-python/brotlicffi/brotlicffi-0.8.0.ebuild
index dd97a1ceec0e..5b671d1a5fef 100644
--- a/dev-python/brotlicffi/brotlicffi-0.8.0.ebuild
+++ b/dev-python/brotlicffi/brotlicffi-0.8.0.ebuild
@@ -11,7 +11,9 @@ inherit distutils-r1
 BROTLI_BUNDLED_COMMIT="46c1a881b41bb638c76247558aa04b1591af3aa7"
 
 DESCRIPTION="Python binding to the Brotli library"
-HOMEPAGE="https://github.com/python-hyper/brotlipy/ https://pypi.python.org/pypi/brotlipy"
+HOMEPAGE="
+	https://github.com/python-hyper/brotlicffi/
+	https://pypi.org/project/brotlicffi/"
 SRC_URI="
 	https://github.com/python-hyper/${PN}/archive/v${PV}.tar.gz
 		-> ${P}.gh.tar.gz
diff --git a/dev-python/brotlicffi/metadata.xml b/dev-python/brotlicffi/metadata.xml
index 76e7dba25fee..b91e95614807 100644
--- a/dev-python/brotlicffi/metadata.xml
+++ b/dev-python/brotlicffi/metadata.xml
@@ -5,5 +5,9 @@
 		<email>python@gentoo.org</email>
 		<name>Python</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="pypi">brotlicffi</remote-id>
+		<remote-id type="github">python-hyper/brotlicffi</remote-id>
+	</upstream>
 	<origin>gentoo-staging</origin>
 </pkgmetadata>
diff --git a/dev-python/citeproc-py/citeproc-py-0.4.0-r1.ebuild b/dev-python/citeproc-py/citeproc-py-0.4.0-r1.ebuild
index 7d6889fa2eee..790acca88277 100644
--- a/dev-python/citeproc-py/citeproc-py-0.4.0-r1.ebuild
+++ b/dev-python/citeproc-py/citeproc-py-0.4.0-r1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python3_{6,7,8,9,10} )
 inherit distutils-r1
 
 DESCRIPTION="Yet another Python CSL Processor"
-HOMEPAGE="https://pypi.python.org/pypi/citeproc-py"
+HOMEPAGE="https://pypi.org/project/citeproc-py/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD-2"
diff --git a/dev-python/dbutils/dbutils-1.3.ebuild b/dev-python/dbutils/dbutils-1.3.ebuild
index 4e2f11919d14..4bf310874cce 100644
--- a/dev-python/dbutils/dbutils-1.3.ebuild
+++ b/dev-python/dbutils/dbutils-1.3.ebuild
@@ -13,8 +13,8 @@ MY_P="${MY_PN}-${PV}"
 
 DESCRIPTION="Database connections for multi-threaded environments"
 HOMEPAGE="
-	https://cito.github.io/DBUtils/
-	https://github.com/Cito/DBUtils
+	https://webwareforpython.github.io/DBUtils/
+	https://github.com/WebwareForPython/DBUtils/
 	https://pypi.org/project/DBUtils/
 "
 SRC_URI="mirror://pypi/${P:0:1}/${PN}/${MY_P}.tar.gz"
diff --git a/dev-python/dbutils/dbutils-2.0.ebuild b/dev-python/dbutils/dbutils-2.0.ebuild
index ef833525a8ab..6d021204f41b 100644
--- a/dev-python/dbutils/dbutils-2.0.ebuild
+++ b/dev-python/dbutils/dbutils-2.0.ebuild
@@ -13,8 +13,8 @@ MY_P="${MY_PN}-${PV}"
 
 DESCRIPTION="Database connections for multi-threaded environments"
 HOMEPAGE="
-	https://cito.github.io/DBUtils/
-	https://github.com/Cito/DBUtils
+	https://webwareforpython.github.io/DBUtils/
+	https://github.com/WebwareForPython/DBUtils/
 	https://pypi.org/project/DBUtils/
 "
 SRC_URI="mirror://pypi/${P:0:1}/${PN}/${MY_P}.tar.gz"
diff --git a/dev-python/dbutils/metadata.xml b/dev-python/dbutils/metadata.xml
index 7f593fd5f87a..577b4a8d32d4 100644
--- a/dev-python/dbutils/metadata.xml
+++ b/dev-python/dbutils/metadata.xml
@@ -1,22 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>lssndrbarbieri@gmail.com</email>
-    <name>Alessandro Barbieri</name>
-  </maintainer>
-  <maintainer type="project">
-    <email>proxy-maint@gentoo.org</email>
-    <name>Proxy Maintainers</name>
-  </maintainer>
-  <longdescription lang="en">
-DBUtils is a suite of tools providing solid, persistent and pooled connections
-to a database that can be used in all kinds of multi-threaded environments
-like Webware for Python or other web application servers. The suite supports
-DB-API 2 compliant database interfaces and the classic PyGreSQL interface.
-  </longdescription>
-  <upstream>
-    <remote-id type="github">Cito/DBUtils</remote-id>
-  </upstream>
+	<maintainer type="person">
+		<email>lssndrbarbieri@gmail.com</email>
+		<name>Alessandro Barbieri</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<longdescription lang="en">
+		DBUtils is a suite of tools providing solid, persistent and pooled connections
+		to a database that can be used in all kinds of multi-threaded environments
+		like Webware for Python or other web application servers. The suite supports
+		DB-API 2 compliant database interfaces and the classic PyGreSQL interface.
+	</longdescription>
+	<upstream>
+		<remote-id type="github">WebwareForPython/DBUtils</remote-id>
+		<remote-id type="pypi">DBUtils</remote-id>
+	</upstream>
 	<origin>gentoo-staging</origin>
 </pkgmetadata>
diff --git a/dev-python/django-debug-toolbar/django-debug-toolbar-3.1.ebuild b/dev-python/django-debug-toolbar/django-debug-toolbar-3.1.ebuild
index cd6c7849bf74..7af13115d451 100644
--- a/dev-python/django-debug-toolbar/django-debug-toolbar-3.1.ebuild
+++ b/dev-python/django-debug-toolbar/django-debug-toolbar-3.1.ebuild
@@ -10,8 +10,8 @@ inherit distutils-r1
 DESCRIPTION="A configurable set of panels that display debug information"
 HOMEPAGE="
 	https://pypi.org/project/django-debug-toolbar/
-	https://github.com/django-debug-toolbar/django-debug-toolbar/"
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	https://github.com/jazzband/django-debug-toolbar/"
+SRC_URI="https://github.com/jazzband/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 SLOT="0"
 LICENSE="BSD"
diff --git a/dev-python/django-debug-toolbar/metadata.xml b/dev-python/django-debug-toolbar/metadata.xml
index 5c824c5c7379..e7dc96317ad6 100644
--- a/dev-python/django-debug-toolbar/metadata.xml
+++ b/dev-python/django-debug-toolbar/metadata.xml
@@ -1,12 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>python@gentoo.org</email>
-    <name>Python</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">django-debug-toolbar/django-debug-toolbar</remote-id>
-  </upstream>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">jazzband/django-debug-toolbar</remote-id>
+		<remote-id type="pypi">django-debug-toolbar</remote-id>
+	</upstream>
 	<origin>gentoo-staging</origin>
 </pkgmetadata>
diff --git a/dev-python/docutils/docutils-0.16-r1.ebuild b/dev-python/docutils/docutils-0.16-r1.ebuild
index 99a5ed906924..ae41906ef53c 100644
--- a/dev-python/docutils/docutils-0.16-r1.ebuild
+++ b/dev-python/docutils/docutils-0.16-r1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="Python Documentation Utilities"
-HOMEPAGE="https://docutils.sourceforge.net/ https://pypi.org/project/docutils/"
+HOMEPAGE="https://docutils.sourceforge.io/ https://pypi.org/project/docutils/"
 #SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
diff --git a/dev-python/falcon/falcon-2.0.0.ebuild b/dev-python/falcon/falcon-2.0.0.ebuild
index 1eb48565d0fb..d4ebef552918 100644
--- a/dev-python/falcon/falcon-2.0.0.ebuild
+++ b/dev-python/falcon/falcon-2.0.0.ebuild
@@ -9,7 +9,7 @@ inherit distutils-r1
 
 DESCRIPTION="A supersonic micro-framework for building cloud APIs"
 HOMEPAGE="https://falconframework.org/ https://pypi.org/project/falcon/"
-SRC_URI="https://github.com/racker/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/falconry/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
diff --git a/dev-python/falcon/metadata.xml b/dev-python/falcon/metadata.xml
index 1f461c070a4a..c9fa86ef91bb 100644
--- a/dev-python/falcon/metadata.xml
+++ b/dev-python/falcon/metadata.xml
@@ -1,15 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>rafaelmartins@gentoo.org</email>
-    <name>Rafael G. Martins</name>
-  </maintainer>
-  <use>
-    <flag name="cython">Build cython-based python modules</flag>
-  </use>
-  <upstream>
-    <remote-id type="github">racker/falcon</remote-id>
-  </upstream>
+	<maintainer type="person">
+		<email>rafaelmartins@gentoo.org</email>
+		<name>Rafael G. Martins</name>
+	</maintainer>
+	<use>
+		<flag name="cython">Build cython-based python modules</flag>
+	</use>
+	<upstream>
+		<remote-id type="github">falconry/falcon</remote-id>
+		<remote-id type="pypi">falcon</remote-id>
+	</upstream>
 	<origin>gentoo-staging</origin>
 </pkgmetadata>
diff --git a/dev-python/flask-compress/flask-compress-1.8.0.ebuild b/dev-python/flask-compress/flask-compress-1.8.0.ebuild
index 369e9ea023d2..a7df5d065c59 100644
--- a/dev-python/flask-compress/flask-compress-1.8.0.ebuild
+++ b/dev-python/flask-compress/flask-compress-1.8.0.ebuild
@@ -11,7 +11,7 @@ MY_PN="Flask-Compress"
 MY_P="${MY_PN}-${PV}"
 
 DESCRIPTION="Compress responses in your Flask app with gzip"
-HOMEPAGE="https://pypi.org/project/Flask-Compress"
+HOMEPAGE="https://pypi.org/project/Flask-Compress/"
 SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 S="${WORKDIR}/${MY_P}"
 
diff --git a/dev-python/genson/genson-1.1.0.ebuild b/dev-python/genson/genson-1.1.0.ebuild
index 94acc6c71b32..3cecca1e1550 100644
--- a/dev-python/genson/genson-1.1.0.ebuild
+++ b/dev-python/genson/genson-1.1.0.ebuild
@@ -10,7 +10,7 @@ DISTUTILS_USE_SETUPTOOLS=rdepend
 inherit distutils-r1
 
 DESCRIPTION="GenSON is a powerful, user-friendly JSON Schema generator built in Python"
-HOMEPAGE="https://pypi.org/project/genson https://github.com/wolverdude/genson"
+HOMEPAGE="https://pypi.org/project/genson/ https://github.com/wolverdude/GenSON/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/greenstalk/greenstalk-1.0.1.ebuild b/dev-python/greenstalk/greenstalk-1.0.1.ebuild
index 95fbf12533dd..fb98ebb9ea85 100644
--- a/dev-python/greenstalk/greenstalk-1.0.1.ebuild
+++ b/dev-python/greenstalk/greenstalk-1.0.1.ebuild
@@ -7,8 +7,8 @@ PYTHON_COMPAT=( python3_{6,7,8,9,10} )
 inherit distutils-r1
 
 DESCRIPTION="A Python 3 client for the beanstalkd work queue"
-HOMEPAGE="https://greenstalk.readthedocs.io/ https://github.com/mayhewj/greenstalk"
-SRC_URI="https://github.com/mayhewj/greenstalk/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+HOMEPAGE="https://greenstalk.readthedocs.io/ https://github.com/justinmayhew/greenstalk"
+SRC_URI="https://github.com/justinmayhew/greenstalk/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
diff --git a/dev-python/greenstalk/metadata.xml b/dev-python/greenstalk/metadata.xml
index 7f7c754c1718..e57de6e5e4f9 100644
--- a/dev-python/greenstalk/metadata.xml
+++ b/dev-python/greenstalk/metadata.xml
@@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <!-- maintainer-needed -->
-  <upstream>
-    <remote-id type="pypi">mayhewj/greenstalk</remote-id>
-  </upstream>
+	<!-- maintainer-needed -->
+	<upstream>
+		<remote-id type="pypi">greenstalk</remote-id>
+		<remote-id type="github">justinmayhew/greenstalk</remote-id>
+	</upstream>
 	<origin>gentoo-staging</origin>
 </pkgmetadata>
diff --git a/dev-python/h11/h11-0.11.0.ebuild b/dev-python/h11/h11-0.11.0.ebuild
index 7a4245a8dbd7..70036ff9e16c 100644
--- a/dev-python/h11/h11-0.11.0.ebuild
+++ b/dev-python/h11/h11-0.11.0.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python3_{6,7,8,9,10} )
 inherit distutils-r1
 
 DESCRIPTION="A pure-Python implementation of HTTP/1.1 inspired by hyper-h2"
-HOMEPAGE="https://github.com/python-hyper/h11 https://pypi.python.org/pypi/h11"
+HOMEPAGE="https://github.com/python-hyper/h11/ https://pypi.org/project/h11/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/humanfriendly/humanfriendly-8.2.ebuild b/dev-python/humanfriendly/humanfriendly-8.2.ebuild
index ca272829ba46..f81369bb9283 100644
--- a/dev-python/humanfriendly/humanfriendly-8.2.ebuild
+++ b/dev-python/humanfriendly/humanfriendly-8.2.ebuild
@@ -11,9 +11,9 @@ DISTUTILS_USE_SETUPTOOLS=rdepend
 inherit distutils-r1
 
 DESCRIPTION="Human friendly output for text interfaces using Python"
-HOMEPAGE="https://pypi.org/project/humanfriendly
-	https://github.com/xolox/python-humanfriendly
-	https://humanfriendly.readthedocs.org"
+HOMEPAGE="https://pypi.org/project/humanfriendly/
+	https://github.com/xolox/python-humanfriendly/
+	https://humanfriendly.readthedocs.io/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
diff --git a/dev-python/latexcodec/latexcodec-2.0.0.ebuild b/dev-python/latexcodec/latexcodec-2.0.0.ebuild
index d7baecdf5e06..6715006d5701 100644
--- a/dev-python/latexcodec/latexcodec-2.0.0.ebuild
+++ b/dev-python/latexcodec/latexcodec-2.0.0.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python3_{6,7,8,9,10} )
 inherit distutils-r1
 
 DESCRIPTION="Lexer and codec to work with LaTeX code in Python"
-HOMEPAGE="https://github.com/mcmtroffaes/latexcodec/ https://pypi.org/project/pybtex/"
+HOMEPAGE="https://github.com/mcmtroffaes/latexcodec/ https://pypi.org/project/latexcodec/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/oauthlib/metadata.xml b/dev-python/oauthlib/metadata.xml
index c6a5fafa8ef4..9afe975945c2 100644
--- a/dev-python/oauthlib/metadata.xml
+++ b/dev-python/oauthlib/metadata.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>python@gentoo.org</email>
-    <name>Python</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="pypi">oauthlib</remote-id>
-    <remote-id type="github">oauthlib/oauthlib</remote-id>
-  </upstream>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">oauthlib</remote-id>
+		<remote-id type="github">oauthlib/oauthlib</remote-id>
+	</upstream>
 	<origin>gentoo-staging</origin>
 </pkgmetadata>
diff --git a/dev-python/oauthlib/oauthlib-3.1.0.ebuild b/dev-python/oauthlib/oauthlib-3.1.0.ebuild
index 71efa847a215..ebf70c1ed533 100644
--- a/dev-python/oauthlib/oauthlib-3.1.0.ebuild
+++ b/dev-python/oauthlib/oauthlib-3.1.0.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python3_{6,7,8,9,10} )
 inherit distutils-r1
 
 DESCRIPTION="Spec-compliant and thorough implementation of the OAuth request-signing logic"
-HOMEPAGE="https://github.com/ioauthlib/oauthlib https://pypi.org/project/oauthlib/"
+HOMEPAGE="https://github.com/oauthlib/oauthlib https://pypi.org/project/oauthlib/"
 SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/oslo-rootwrap/oslo-rootwrap-6.2.0.ebuild b/dev-python/oslo-rootwrap/oslo-rootwrap-6.2.0.ebuild
index 8915054b6c05..cb5a469279e4 100644
--- a/dev-python/oslo-rootwrap/oslo-rootwrap-6.2.0.ebuild
+++ b/dev-python/oslo-rootwrap/oslo-rootwrap-6.2.0.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python3_{6,7,8,9,10} )
 inherit distutils-r1
 
 DESCRIPTION="Allows fine filtering of shell commands to run as root from OpenStack services"
-HOMEPAGE="https://pypi.org/project/oslo.config/"
+HOMEPAGE="https://pypi.org/project/oslo.rootwrap/"
 SRC_URI="mirror://pypi/${PN:0:1}/oslo.rootwrap/oslo.rootwrap-${PV}.tar.gz"
 S="${WORKDIR}/oslo.rootwrap-${PV}"
 
diff --git a/dev-python/pep8/metadata.xml b/dev-python/pep8/metadata.xml
index fd0daa67babf..bc17840387d0 100644
--- a/dev-python/pep8/metadata.xml
+++ b/dev-python/pep8/metadata.xml
@@ -8,7 +8,7 @@
   <stabilize-allarches/>
   <upstream>
     <remote-id type="pypi">pep8</remote-id>
-    <remote-id type="github">jcrocholl/pep8</remote-id>
+    <remote-id type="github">PyCQA/pycodestyle</remote-id>
   </upstream>
 	<origin>gentoo-staging</origin>
 </pkgmetadata>
diff --git a/dev-python/pep8/pep8-1.7.1.ebuild b/dev-python/pep8/pep8-1.7.1.ebuild
index 2933e768fea1..b29324222e94 100644
--- a/dev-python/pep8/pep8-1.7.1.ebuild
+++ b/dev-python/pep8/pep8-1.7.1.ebuild
@@ -9,7 +9,7 @@ PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="Python style guide checker"
-HOMEPAGE="https://github.com/PyCQA/pep8 https://pypi.org/project/pep8/"
+HOMEPAGE="https://github.com/PyCQA/pycodestyle/ https://pypi.org/project/pep8/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/prometheus_client/metadata.xml b/dev-python/prometheus_client/metadata.xml
index c8007adaa2ad..010fa63b8d8b 100644
--- a/dev-python/prometheus_client/metadata.xml
+++ b/dev-python/prometheus_client/metadata.xml
@@ -1,12 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>python@gentoo.org</email>
-    <name>Python</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">prometheus/client_python</remote-id>
-  </upstream>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">prometheus/client_python</remote-id>
+		<remote-id type="pypi">prometheus-client</remote-id>
+	</upstream>
 	<origin>gentoo-staging</origin>
 </pkgmetadata>
diff --git a/dev-python/prometheus_client/prometheus_client-0.9.0.ebuild b/dev-python/prometheus_client/prometheus_client-0.9.0.ebuild
index 1c9c4d6524aa..b708b9c0744b 100644
--- a/dev-python/prometheus_client/prometheus_client-0.9.0.ebuild
+++ b/dev-python/prometheus_client/prometheus_client-0.9.0.ebuild
@@ -7,8 +7,8 @@ PYTHON_COMPAT=( python3_{6,7,8,9,10} )
 inherit distutils-r1
 
 DESCRIPTION="Python client for the Prometheus monitoring system"
-HOMEPAGE="https://pypi.org/project/prometheus_client/
-	https://github.com/prometheus/client_python"
+HOMEPAGE="https://pypi.org/project/prometheus-client/
+	https://github.com/prometheus/client_python/"
 SRC_URI="https://github.com/prometheus/client_python/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 S="${WORKDIR}/client_python-${PV}"
 
diff --git a/dev-python/pyasn1-modules/metadata.xml b/dev-python/pyasn1-modules/metadata.xml
index b97caf5b681c..e7047b4f3151 100644
--- a/dev-python/pyasn1-modules/metadata.xml
+++ b/dev-python/pyasn1-modules/metadata.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>python@gentoo.org</email>
-    <name>Python</name>
-  </maintainer>
-  <stabilize-allarches/>
-  <upstream>
-    <remote-id type="pypi">pyasn1-modules</remote-id>
-    <remote-id type="sourceforge">pyasn1</remote-id>
-  </upstream>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<stabilize-allarches/>
+	<upstream>
+		<remote-id type="pypi">pyasn1-modules</remote-id>
+		<remote-id type="github">etingof/pyasn1-modules</remote-id>
+	</upstream>
 	<origin>gentoo-staging</origin>
 </pkgmetadata>
diff --git a/dev-python/pyasn1-modules/pyasn1-modules-0.2.8-r1.ebuild b/dev-python/pyasn1-modules/pyasn1-modules-0.2.8-r1.ebuild
index 5b1107ffbe41..0d74d7fd93a3 100644
--- a/dev-python/pyasn1-modules/pyasn1-modules-0.2.8-r1.ebuild
+++ b/dev-python/pyasn1-modules/pyasn1-modules-0.2.8-r1.ebuild
@@ -8,7 +8,9 @@ PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="pyasn1 modules"
-HOMEPAGE="https://snmplabs.com/pyasn1/ https://github.com/etingof/pyasn1-modules/"
+HOMEPAGE="
+	https://pypi.org/project/pyasn1-modules/
+	https://github.com/etingof/pyasn1-modules/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD-2"
diff --git a/dev-python/pyasn1/metadata.xml b/dev-python/pyasn1/metadata.xml
index 56a4086cc174..197f4e9ecfdc 100644
--- a/dev-python/pyasn1/metadata.xml
+++ b/dev-python/pyasn1/metadata.xml
@@ -8,7 +8,6 @@
   <stabilize-allarches/>
   <upstream>
     <remote-id type="pypi">pyasn1</remote-id>
-    <remote-id type="sourceforge">pyasn1</remote-id>
     <remote-id type="github">etingof/pyasn1</remote-id>
   </upstream>
 	<origin>gentoo-staging</origin>
diff --git a/dev-python/pyasn1/pyasn1-0.4.8-r1.ebuild b/dev-python/pyasn1/pyasn1-0.4.8-r1.ebuild
index ab984f505c67..0e3ce5f167e1 100644
--- a/dev-python/pyasn1/pyasn1-0.4.8-r1.ebuild
+++ b/dev-python/pyasn1/pyasn1-0.4.8-r1.ebuild
@@ -8,7 +8,9 @@ PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="ASN.1 library for Python"
-HOMEPAGE="https://snmplabs.com/pyasn1/"
+HOMEPAGE="
+	https://pypi.org/project/pyasn1/
+	https://github.com/etingof/pyasn1/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD-2"
diff --git a/dev-python/pyinotify/pyinotify-0.9.6.ebuild b/dev-python/pyinotify/pyinotify-0.9.6.ebuild
index 33cfbaa84287..0830473f9470 100644
--- a/dev-python/pyinotify/pyinotify-0.9.6.ebuild
+++ b/dev-python/pyinotify/pyinotify-0.9.6.ebuild
@@ -10,10 +10,9 @@ inherit distutils-r1
 
 DESCRIPTION="Python module used for monitoring filesystems events"
 HOMEPAGE="
-	http://trac.dbzteam.org/pyinotify
 	https://pypi.org/project/pyinotify/
 	https://github.com/seb-m/pyinotify/"
-SRC_URI="http://seb.dbzteam.org/pub/pyinotify/releases/${P}.tar.gz"
+SRC_URI="https://seb.dbzteam.org/pub/pyinotify/releases/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
diff --git a/dev-python/pykerberos/pykerberos-1.3.0-r1.ebuild b/dev-python/pykerberos/pykerberos-1.3.0-r1.ebuild
index f57fd258bf7b..01fe644e84a5 100644
--- a/dev-python/pykerberos/pykerberos-1.3.0-r1.ebuild
+++ b/dev-python/pykerberos/pykerberos-1.3.0-r1.ebuild
@@ -10,7 +10,7 @@ inherit distutils-r1
 MY_P=PyKerberos-${PV}
 DESCRIPTION="A high-level Python wrapper for Kerberos/GSSAPI operations"
 HOMEPAGE="
-	https://trac.calendarserver.org/wiki/PyKerberos
+	https://www.calendarserver.org/PyKerberos.html
 	https://github.com/apple/ccs-pykerberos/
 	https://pypi.org/project/kerberos/"
 SRC_URI="
diff --git a/dev-python/pymssql/pymssql-2.1.3.ebuild b/dev-python/pymssql/pymssql-2.1.3.ebuild
index f334eae80880..11aef4751ddc 100644
--- a/dev-python/pymssql/pymssql-2.1.3.ebuild
+++ b/dev-python/pymssql/pymssql-2.1.3.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python3_{6,7,8,9,10} )
 inherit distutils-r1
 
 DESCRIPTION="Simple MSSQL python extension module"
-HOMEPAGE="https://www.pymssql.org/ https://pypi.python.org/pypi/pymssql"
+HOMEPAGE="https://www.pymssql.org/ https://pypi.org/project/pymssql/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
diff --git a/dev-python/pysnmp-mibs/pysnmp-mibs-0.1.6.ebuild b/dev-python/pysnmp-mibs/pysnmp-mibs-0.1.6.ebuild
index b30eff5369f8..a2d98eb82225 100644
--- a/dev-python/pysnmp-mibs/pysnmp-mibs-0.1.6.ebuild
+++ b/dev-python/pysnmp-mibs/pysnmp-mibs-0.1.6.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python3_{6,7,8,9,10} )
 inherit distutils-r1
 
 DESCRIPTION="SNMP framework in Python - MIBs"
-HOMEPAGE="https://snmplabs.com/pysnmp/ https://github.com/etingof/pysnmp-mibs"
+HOMEPAGE="https://github.com/etingof/pysnmp-mibs"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/pysnmp/pysnmp-4.4.12-r1.ebuild b/dev-python/pysnmp/pysnmp-4.4.12-r1.ebuild
index d174c813267f..8822354db6e7 100644
--- a/dev-python/pysnmp/pysnmp-4.4.12-r1.ebuild
+++ b/dev-python/pysnmp/pysnmp-4.4.12-r1.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python3_{6,7,8,9,10} )
 inherit distutils-r1
 
 DESCRIPTION="Python SNMP library"
-HOMEPAGE="https://snmplabs.com/pysnmp/ https://pypi.org/project/pysnmp/ https://github.com/etingof/pysnmp"
+HOMEPAGE="https://pypi.org/project/pysnmp/ https://github.com/etingof/pysnmp"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/pysnmp/pysnmp-999999.ebuild b/dev-python/pysnmp/pysnmp-999999.ebuild
index 2a3b4dca8318..442902128270 100644
--- a/dev-python/pysnmp/pysnmp-999999.ebuild
+++ b/dev-python/pysnmp/pysnmp-999999.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python3_{6,7,8,9,10} )
 inherit distutils-r1 git-r3
 
 DESCRIPTION="Python SNMP library"
-HOMEPAGE="https://snmplabs.com/pysnmp/ https://pypi.org/project/pysnmp/	https://github.com/etingof/pysnmp"
+HOMEPAGE="https://pypi.org/project/pysnmp/	https://github.com/etingof/pysnmp"
 EGIT_REPO_URI="https://github.com/etingof/pysnmp"
 
 LICENSE="BSD"
diff --git a/dev-python/pytest-describe/metadata.xml b/dev-python/pytest-describe/metadata.xml
index ed98feb0166d..e88f4a99a1aa 100644
--- a/dev-python/pytest-describe/metadata.xml
+++ b/dev-python/pytest-describe/metadata.xml
@@ -7,7 +7,7 @@
 	</maintainer>
 	<upstream>
 		<remote-id type="pypi">pytest-describe</remote-id>
-		<remote-id type="github">ropez/pytest-describe</remote-id>
+		<remote-id type="github">pytest-dev/pytest-describe</remote-id>
 	</upstream>
 	<origin>gentoo-staging</origin>
 </pkgmetadata>
diff --git a/dev-python/pytest-describe/pytest-describe-1.0.0.ebuild b/dev-python/pytest-describe/pytest-describe-1.0.0.ebuild
index 7a20fd8ba33a..317eaca04461 100644
--- a/dev-python/pytest-describe/pytest-describe-1.0.0.ebuild
+++ b/dev-python/pytest-describe/pytest-describe-1.0.0.ebuild
@@ -8,8 +8,8 @@ PYTHON_COMPAT=( python3_{6,7,8,9,10} )
 inherit distutils-r1
 
 DESCRIPTION="Describe-style plugin for pytest"
-HOMEPAGE="https://github.com/pytest-dev/pytest-describe
-	https://pypi.org/project/pytest-describe"
+HOMEPAGE="https://github.com/pytest-dev/pytest-describe/
+	https://pypi.org/project/pytest-describe/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/pytest-flakes/pytest-flakes-4.0.0.ebuild b/dev-python/pytest-flakes/pytest-flakes-4.0.0.ebuild
index 2d8ed50322d1..8888bc8aab16 100644
--- a/dev-python/pytest-flakes/pytest-flakes-4.0.0.ebuild
+++ b/dev-python/pytest-flakes/pytest-flakes-4.0.0.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="Collection of small Python functions & classes"
-HOMEPAGE="https://pypi.org/project/python-utils/"
+HOMEPAGE="https://pypi.org/project/pytest-flakes/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/pytest-ordering/metadata.xml b/dev-python/pytest-ordering/metadata.xml
index f75856b0885f..e91f4b823964 100644
--- a/dev-python/pytest-ordering/metadata.xml
+++ b/dev-python/pytest-ordering/metadata.xml
@@ -11,7 +11,7 @@
 		<name>Proxy Maintainers</name>
 	</maintainer>
 	<upstream>
-		<remote-id type="github">https://github.com/ftobia/pytest-ordering</remote-id>
+		<remote-id type="github">ftobia/pytest-ordering</remote-id>
 		<remote-id type="pypi">pytest-ordering</remote-id>
 	</upstream>
 	<origin>gentoo-staging</origin>
diff --git a/dev-python/pytest-ordering/pytest-ordering-0.6.ebuild b/dev-python/pytest-ordering/pytest-ordering-0.6.ebuild
index 2c49ffdc8799..5671186cccc5 100644
--- a/dev-python/pytest-ordering/pytest-ordering-0.6.ebuild
+++ b/dev-python/pytest-ordering/pytest-ordering-0.6.ebuild
@@ -9,8 +9,8 @@ inherit distutils-r1
 
 DESCRIPTION="pytest plugin to run your tests in a specific order"
 HOMEPAGE="
-	https://github.com/ftobia/pytest-ordering
-	https://pypi.org/project/pytest-ordering
+	https://github.com/ftobia/pytest-ordering/
+	https://pypi.org/project/pytest-ordering/
 "
 SRC_URI="https://github.com/ftobia/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
diff --git a/dev-python/pytest-qt/pytest-qt-3.3.0.ebuild b/dev-python/pytest-qt/pytest-qt-3.3.0.ebuild
index 45d5bd813ba9..30c0ff87696e 100644
--- a/dev-python/pytest-qt/pytest-qt-3.3.0.ebuild
+++ b/dev-python/pytest-qt/pytest-qt-3.3.0.ebuild
@@ -8,7 +8,9 @@ PYTHON_COMPAT=( python3_{6,7,8,9,10} )
 inherit distutils-r1 virtualx
 
 DESCRIPTION="pytest plugin for PyQt4 or PyQt5 applications"
-HOMEPAGE="https://pypi.org/project/pytest-qt https://github.com/pytest-dev/pytest-qt"
+HOMEPAGE="
+	https://pypi.org/project/pytest-qt/
+	https://github.com/pytest-dev/pytest-qt/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/python-etcd/metadata.xml b/dev-python/python-etcd/metadata.xml
index e79e2f6c3f4d..e4e2e29f8ec1 100644
--- a/dev-python/python-etcd/metadata.xml
+++ b/dev-python/python-etcd/metadata.xml
@@ -1,14 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <upstream>
-    <bugs-to>https://github.com/jplana/python-etcd/issues</bugs-to>
-    <changelog>https://raw.githubusercontent.com/jplana/python-etcd/master/NEWS.txt</changelog>
-    <doc>http://python-etcd.readthedocs.org/</doc>
-    <remote-id type="github">jplana/python-etcd</remote-id>
-  </upstream>
-  <maintainer type="person">
-    <email>zmedico@gentoo.org</email>
-  </maintainer>
+	<upstream>
+		<bugs-to>https://github.com/jplana/python-etcd/issues</bugs-to>
+		<changelog>https://raw.githubusercontent.com/jplana/python-etcd/master/NEWS.txt</changelog>
+		<doc>https://python-etcd.readthedocs.io/</doc>
+		<remote-id type="github">jplana/python-etcd</remote-id>
+		<remote-id type="pypi">python-etcd</remote-id>
+	</upstream>
+	<maintainer type="person">
+		<email>zmedico@gentoo.org</email>
+	</maintainer>
 	<origin>gentoo-staging</origin>
 </pkgmetadata>
diff --git a/dev-python/python-etcd/python-etcd-0.4.5-r1.ebuild b/dev-python/python-etcd/python-etcd-0.4.5-r1.ebuild
index 5c9ef76dd57e..366c9b79a05f 100644
--- a/dev-python/python-etcd/python-etcd-0.4.5-r1.ebuild
+++ b/dev-python/python-etcd/python-etcd-0.4.5-r1.ebuild
@@ -8,7 +8,9 @@ PYTHON_COMPAT=( python3_{6,7,8,9,10} )
 inherit distutils-r1
 
 DESCRIPTION="A python client for etcd"
-HOMEPAGE="https://github.com/jplana/python-etcd https://pypi.org/project/python-etcd/"
+HOMEPAGE="
+	https://github.com/jplana/python-etcd/
+	https://pypi.org/project/python-etcd/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/pyzmq/pyzmq-20.0.0.ebuild b/dev-python/pyzmq/pyzmq-20.0.0.ebuild
index 4571ecf2e3b0..0959a38f03f4 100644
--- a/dev-python/pyzmq/pyzmq-20.0.0.ebuild
+++ b/dev-python/pyzmq/pyzmq-20.0.0.ebuild
@@ -10,7 +10,7 @@ inherit flag-o-matic distutils-r1 toolchain-funcs
 
 DESCRIPTION="Lightweight and super-fast messaging library built on top of the ZeroMQ library"
 HOMEPAGE="
-	https://www.zeromq.org/bindings:python
+	https://zeromq.org/languages/python/
 	https://pypi.org/project/pyzmq/
 	https://github.com/zeromq/pyzmq/"
 SRC_URI="
diff --git a/dev-python/scripttest/metadata.xml b/dev-python/scripttest/metadata.xml
index 9732c7084a46..2d6ddb9ffb33 100644
--- a/dev-python/scripttest/metadata.xml
+++ b/dev-python/scripttest/metadata.xml
@@ -6,7 +6,8 @@
 		<name>Python</name>
 	</maintainer>
 	<upstream>
-		<remote-id type="pypi">ScriptTest</remote-id>
+		<remote-id type="pypi">scripttest</remote-id>
+		<remote-id type="github">pypa/scripttest</remote-id>
 	</upstream>
 	<origin>gentoo-staging</origin>
 </pkgmetadata>
diff --git a/dev-python/scripttest/scripttest-1.3.0-r1.ebuild b/dev-python/scripttest/scripttest-1.3.0-r1.ebuild
index 8460c1edcb74..b200c1bed488 100644
--- a/dev-python/scripttest/scripttest-1.3.0-r1.ebuild
+++ b/dev-python/scripttest/scripttest-1.3.0-r1.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="A very small text templating language"
-HOMEPAGE="https://pypi.org/project/ScriptTest/
+HOMEPAGE="https://pypi.org/project/scripttest/
 	https://github.com/pypa/scripttest"
 # pypi tarball lacks tests
 SRC_URI="https://github.com/pypa/scripttest/archive/${PV}.tar.gz -> ${P}.tar.gz"
diff --git a/dev-python/subvertpy/subvertpy-0.10.1.ebuild b/dev-python/subvertpy/subvertpy-0.10.1.ebuild
index 771b05cad72e..27c021019e6d 100644
--- a/dev-python/subvertpy/subvertpy-0.10.1.ebuild
+++ b/dev-python/subvertpy/subvertpy-0.10.1.ebuild
@@ -9,7 +9,9 @@ PYTHON_COMPAT=( python3_{6,7,8,9,10} )
 inherit distutils-r1
 
 DESCRIPTION="Alternative Python bindings for Subversion"
-HOMEPAGE="https://jelmer.uk/code/subvertpy/ https://pypi.org/project/subvertpy"
+HOMEPAGE="
+	https://jelmer.uk/code/subvertpy/
+	https://pypi.org/project/subvertpy/"
 SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
 
 LICENSE="|| ( LGPL-2.1 LGPL-3 )"
diff --git a/dev-python/towncrier/metadata.xml b/dev-python/towncrier/metadata.xml
index bcc76ca67f42..ffc92dbfd185 100644
--- a/dev-python/towncrier/metadata.xml
+++ b/dev-python/towncrier/metadata.xml
@@ -7,6 +7,7 @@
 	</maintainer>
 	<upstream>
 		<remote-id type="pypi">towncrier</remote-id>
+		<remote-id type="github">twisted/towncrier</remote-id>
 	</upstream>
 	<origin>gentoo-staging</origin>
 </pkgmetadata>
diff --git a/dev-python/towncrier/towncrier-19.2.0.ebuild b/dev-python/towncrier/towncrier-19.2.0.ebuild
index 5c103f37b4b7..e8b9618f2c48 100644
--- a/dev-python/towncrier/towncrier-19.2.0.ebuild
+++ b/dev-python/towncrier/towncrier-19.2.0.ebuild
@@ -8,8 +8,8 @@ PYTHON_COMPAT=( python3_{6,7,8,9,10} )
 inherit distutils-r1
 
 DESCRIPTION="Building newsfiles for your project"
-HOMEPAGE="https://github.com/hawkowl/towncrier"
-SRC_URI="https://github.com/hawkowl/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+HOMEPAGE="https://github.com/twisted/towncrier"
+SRC_URI="https://github.com/twisted/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
diff --git a/dev-python/typing-extensions/metadata.xml b/dev-python/typing-extensions/metadata.xml
index 56736bb044ec..ddcfdd492f14 100644
--- a/dev-python/typing-extensions/metadata.xml
+++ b/dev-python/typing-extensions/metadata.xml
@@ -7,7 +7,8 @@
 	</maintainer>
 	<stabilize-allarches/>
 	<upstream>
-		<remote-id type="pypi">typing</remote-id>
+		<remote-id type="pypi">typing-extensions</remote-id>
+		<remote-id type="github">python/typing</remote-id>
 	</upstream>
 	<origin>gentoo-staging</origin>
 </pkgmetadata>
diff --git a/dev-python/typing-extensions/typing-extensions-3.7.4.3.ebuild b/dev-python/typing-extensions/typing-extensions-3.7.4.3.ebuild
index 8c3e5a559dcd..9591f69afcba 100644
--- a/dev-python/typing-extensions/typing-extensions-3.7.4.3.ebuild
+++ b/dev-python/typing-extensions/typing-extensions-3.7.4.3.ebuild
@@ -11,7 +11,9 @@ MY_PN=${PN/-/_}
 MY_P=${MY_PN}-${PV}
 
 DESCRIPTION="Type Hint extensions from Python 3.8 backported"
-HOMEPAGE="https://pypi.org/project/typing_extensions/ https://github.com/python/typing"
+HOMEPAGE="
+	https://pypi.org/project/typing-extensions/
+	https://github.com/python/typing/"
 SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 S=${WORKDIR}/${MY_P}
 
diff --git a/dev-python/verboselogs/verboselogs-1.7.ebuild b/dev-python/verboselogs/verboselogs-1.7.ebuild
index da44c25e94d0..ebf08e4f1602 100644
--- a/dev-python/verboselogs/verboselogs-1.7.ebuild
+++ b/dev-python/verboselogs/verboselogs-1.7.ebuild
@@ -8,8 +8,8 @@ PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="Verbose logging for Python's logging module"
-HOMEPAGE="https://pypi.org/project/verboselogs
-	https://github.com/xolox/python-verboselogs"
+HOMEPAGE="https://pypi.org/project/verboselogs/
+	https://github.com/xolox/python-verboselogs/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
diff --git a/dev-python/wsproto/wsproto-1.0.0.ebuild b/dev-python/wsproto/wsproto-1.0.0.ebuild
index 79b10d2619fa..68a0ea902145 100644
--- a/dev-python/wsproto/wsproto-1.0.0.ebuild
+++ b/dev-python/wsproto/wsproto-1.0.0.ebuild
@@ -8,7 +8,9 @@ PYTHON_COMPAT=( python3_{6,7,8,9,10} )
 inherit distutils-r1
 
 DESCRIPTION="WebSockets state-machine based protocol implementation"
-HOMEPAGE="https://github.com/python-hyper/wsproto https://pypi.python.org/pypi/wsproto"
+HOMEPAGE="
+	https://github.com/python-hyper/wsproto/
+	https://pypi.org/project/wsproto/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/wurlitzer/wurlitzer-2.0.1.ebuild b/dev-python/wurlitzer/wurlitzer-2.0.1.ebuild
index f62af17ea7b2..151e2f577a39 100644
--- a/dev-python/wurlitzer/wurlitzer-2.0.1.ebuild
+++ b/dev-python/wurlitzer/wurlitzer-2.0.1.ebuild
@@ -8,7 +8,9 @@ PYTHON_COMPAT=( python3_{6,7,8,9,10} )
 inherit distutils-r1
 
 DESCRIPTION="Capture C-level stdout/stderr in Python"
-HOMEPAGE="https://github.com/minrk/wurlitzer https://pypi.org/project/wurlitzer"
+HOMEPAGE="
+	https://github.com/minrk/wurlitzer/
+	https://pypi.org/project/wurlitzer/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/zconfig/zconfig-3.5.0.ebuild b/dev-python/zconfig/zconfig-3.5.0.ebuild
index 84c0fbd3a095..46c541c4d412 100644
--- a/dev-python/zconfig/zconfig-3.5.0.ebuild
+++ b/dev-python/zconfig/zconfig-3.5.0.ebuild
@@ -12,7 +12,7 @@ MY_PN="ZConfig"
 MY_P="${MY_PN}-${PV}"
 
 DESCRIPTION="A configuration library supporting a hierarchical schema-driven configuration model"
-HOMEPAGE="https://pypi.python.org/pypi/ZConfig"
+HOMEPAGE="https://pypi.org/project/ZConfig/"
 SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="ZPL"