diff --git a/app-admin/supervisor/supervisor-3.1.4.ebuild b/app-admin/supervisor/supervisor-3.1.4.ebuild
index 1f774d43fdcde..78725722c4b3d 100644
--- a/app-admin/supervisor/supervisor-3.1.4.ebuild
+++ b/app-admin/supervisor/supervisor-3.1.4.ebuild
@@ -12,7 +12,7 @@ inherit distutils-r1
 MY_PV="${PV/_beta/b}"
 
 DESCRIPTION="A system for controlling process state under UNIX"
-HOMEPAGE="http://supervisord.org/ https://pypi.python.org/pypi/supervisor"
+HOMEPAGE="http://supervisord.org/ https://pypi.org/project/supervisor"
 SRC_URI="mirror://pypi/${P:0:1}/${PN}/${PN}-${MY_PV}.tar.gz"
 
 LICENSE="repoze ZPL BSD HPND GPL-2"
diff --git a/app-admin/supervisor/supervisor-3.3.3.ebuild b/app-admin/supervisor/supervisor-3.3.3.ebuild
index 7297e311db184..7b8ea8a006c41 100644
--- a/app-admin/supervisor/supervisor-3.3.3.ebuild
+++ b/app-admin/supervisor/supervisor-3.3.3.ebuild
@@ -12,7 +12,7 @@ inherit distutils-r1
 MY_PV="${PV/_beta/b}"
 
 DESCRIPTION="A system for controlling process state under UNIX"
-HOMEPAGE="http://supervisord.org/ https://pypi.python.org/pypi/supervisor"
+HOMEPAGE="http://supervisord.org/ https://pypi.org/project/supervisor"
 SRC_URI="mirror://pypi/${P:0:1}/${PN}/${PN}-${MY_PV}.tar.gz"
 
 LICENSE="repoze ZPL BSD HPND GPL-2"
diff --git a/app-backup/borgweb/borgweb-0.2.0-r2.ebuild b/app-backup/borgweb/borgweb-0.2.0-r2.ebuild
index e3b355a9bb843..33f9eadc3f0fb 100644
--- a/app-backup/borgweb/borgweb-0.2.0-r2.ebuild
+++ b/app-backup/borgweb/borgweb-0.2.0-r2.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python3_{4,5,6} )
 inherit distutils-r1
 
 DESCRIPTION="Browser-based user interface for BorgBackup"
-HOMEPAGE="https://pypi.python.org/pypi/borgweb"
+HOMEPAGE="https://pypi.org/project/borgweb"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/app-editors/editra/editra-0.7.20-r2.ebuild b/app-editors/editra/editra-0.7.20-r2.ebuild
index a105e915cbef8..4b7c94e4f6295 100644
--- a/app-editors/editra/editra-0.7.20-r2.ebuild
+++ b/app-editors/editra/editra-0.7.20-r2.ebuild
@@ -9,7 +9,7 @@ inherit eutils distutils-r1 fdo-mime
 MY_PN=${PN/e/E}
 
 DESCRIPTION="Multi-platform text editor supporting over 50 programming languages"
-HOMEPAGE="http://editra.org https://pypi.python.org/pypi/Editra"
+HOMEPAGE="http://editra.org https://pypi.org/project/Editra"
 SRC_URI="http://editra.org/uploads/src/${MY_PN}-${PV}.tar.gz"
 
 LICENSE="wxWinLL-3.1"
diff --git a/app-i18n/transifex-client/transifex-client-0.10.ebuild b/app-i18n/transifex-client/transifex-client-0.10.ebuild
index dcf31868d54a7..aacf51b512dc0 100644
--- a/app-i18n/transifex-client/transifex-client-0.10.ebuild
+++ b/app-i18n/transifex-client/transifex-client-0.10.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 )
 inherit distutils-r1
 
 DESCRIPTION="A command line interface for Transifex"
-HOMEPAGE="https://pypi.python.org/pypi/transifex-client http://www.transifex.net/"
+HOMEPAGE="https://pypi.org/project/transifex-client http://www.transifex.net/"
 SRC_URI="https://github.com/transifex/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
diff --git a/app-i18n/transifex-client/transifex-client-0.12.2.ebuild b/app-i18n/transifex-client/transifex-client-0.12.2.ebuild
index 543e6b76fbcd4..c2aa8411acd1d 100644
--- a/app-i18n/transifex-client/transifex-client-0.12.2.ebuild
+++ b/app-i18n/transifex-client/transifex-client-0.12.2.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5} )
 inherit distutils-r1
 
 DESCRIPTION="A command line interface for Transifex"
-HOMEPAGE="https://pypi.python.org/pypi/transifex-client http://www.transifex.net/"
+HOMEPAGE="https://pypi.org/project/transifex-client http://www.transifex.net/"
 SRC_URI="mirror://pypi/t/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
diff --git a/app-i18n/transifex-client/transifex-client-0.12.4.ebuild b/app-i18n/transifex-client/transifex-client-0.12.4.ebuild
index bdb1da08ea199..0ed9178bed174 100644
--- a/app-i18n/transifex-client/transifex-client-0.12.4.ebuild
+++ b/app-i18n/transifex-client/transifex-client-0.12.4.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5} )
 inherit distutils-r1
 
 DESCRIPTION="A command line interface for Transifex"
-HOMEPAGE="https://pypi.python.org/pypi/transifex-client http://www.transifex.net/"
+HOMEPAGE="https://pypi.org/project/transifex-client http://www.transifex.net/"
 SRC_URI="mirror://pypi/t/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
diff --git a/app-misc/asciinema/asciinema-1.4.0.ebuild b/app-misc/asciinema/asciinema-1.4.0.ebuild
index 207d700d9a1b0..8abaa26576208 100644
--- a/app-misc/asciinema/asciinema-1.4.0.ebuild
+++ b/app-misc/asciinema/asciinema-1.4.0.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python{3_4,3_5} )
 inherit distutils-r1
 
 DESCRIPTION="Command line recorder for asciinema.org service"
-HOMEPAGE="https://asciinema.org/ https://pypi.python.org/pypi/asciinema"
+HOMEPAGE="https://asciinema.org/ https://pypi.org/project/asciinema"
 SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3+"
diff --git a/app-misc/asciinema/asciinema-2.0.0.ebuild b/app-misc/asciinema/asciinema-2.0.0.ebuild
index 802f14de76151..8e58e51378337 100644
--- a/app-misc/asciinema/asciinema-2.0.0.ebuild
+++ b/app-misc/asciinema/asciinema-2.0.0.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python{3_4,3_5} )
 inherit distutils-r1
 
 DESCRIPTION="Command line recorder for asciinema.org service"
-HOMEPAGE="https://asciinema.org/ https://pypi.python.org/pypi/asciinema"
+HOMEPAGE="https://asciinema.org/ https://pypi.org/project/asciinema"
 SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3+"
diff --git a/app-misc/goobook/goobook-1.9.ebuild b/app-misc/goobook/goobook-1.9.ebuild
index bc1386f33d80b..4542ff94344e1 100644
--- a/app-misc/goobook/goobook-1.9.ebuild
+++ b/app-misc/goobook/goobook-1.9.ebuild
@@ -45,4 +45,4 @@ If you want to use goobook from mutt, add this in your .muttrc file:
 to query address book.
 
 You may find more information and advanced configuration tips at
-https://pypi.python.org/pypi/${PN}/${PV} in \"Configure/Mutt\" section"
+https://pypi.org/project/${PN}/${PV} in \"Configure/Mutt\" section"
diff --git a/app-misc/hachoir-metadata/hachoir-metadata-1.3.3-r1.ebuild b/app-misc/hachoir-metadata/hachoir-metadata-1.3.3-r1.ebuild
index 0a763ba01dead..4660f200b5bf3 100644
--- a/app-misc/hachoir-metadata/hachoir-metadata-1.3.3-r1.ebuild
+++ b/app-misc/hachoir-metadata/hachoir-metadata-1.3.3-r1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 )
 inherit distutils-r1
 
 DESCRIPTION="Program to extract metadata using Hachoir library"
-HOMEPAGE="https://web.archive.org/web/20161220105023/https://bitbucket.org/haypo/hachoir/wiki/hachoir-metadata https://pypi.python.org/pypi/hachoir-metadata"
+HOMEPAGE="https://web.archive.org/web/20161220105023/https://bitbucket.org/haypo/hachoir/wiki/hachoir-metadata https://pypi.org/project/hachoir-metadata"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
diff --git a/app-misc/hachoir-subfile/hachoir-subfile-0.5.3-r1.ebuild b/app-misc/hachoir-subfile/hachoir-subfile-0.5.3-r1.ebuild
index 1d2887f48a741..12fd6da2185d6 100644
--- a/app-misc/hachoir-subfile/hachoir-subfile-0.5.3-r1.ebuild
+++ b/app-misc/hachoir-subfile/hachoir-subfile-0.5.3-r1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 )
 inherit distutils-r1
 
 DESCRIPTION="Find subfile in any binary stream"
-HOMEPAGE="https://web.archive.org/web/20170502140945/https://bitbucket.org/haypo/hachoir/wiki/hachoir-subfile https://pypi.python.org/pypi/hachoir-subfile"
+HOMEPAGE="https://web.archive.org/web/20170502140945/https://bitbucket.org/haypo/hachoir/wiki/hachoir-subfile https://pypi.org/project/hachoir-subfile"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
diff --git a/app-misc/hachoir-urwid/hachoir-urwid-1.1-r1.ebuild b/app-misc/hachoir-urwid/hachoir-urwid-1.1-r1.ebuild
index 1274cc5ab5a45..55d30fce03b38 100644
--- a/app-misc/hachoir-urwid/hachoir-urwid-1.1-r1.ebuild
+++ b/app-misc/hachoir-urwid/hachoir-urwid-1.1-r1.ebuild
@@ -9,7 +9,7 @@ PYTHON_REQ_USE="ncurses"
 inherit distutils-r1
 
 DESCRIPTION="Binary file explorer using Hachoir and urwid libraries"
-HOMEPAGE="https://web.archive.org/web/20161220110246/https://bitbucket.org/haypo/hachoir/wiki/hachoir-urwid https://pypi.python.org/pypi/hachoir-urwid"
+HOMEPAGE="https://web.archive.org/web/20161220110246/https://bitbucket.org/haypo/hachoir/wiki/hachoir-urwid https://pypi.org/project/hachoir-urwid"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
diff --git a/app-misc/yq/yq-2.1.2.ebuild b/app-misc/yq/yq-2.1.2.ebuild
index f6430d90a5526..aa07895a1b256 100644
--- a/app-misc/yq/yq-2.1.2.ebuild
+++ b/app-misc/yq/yq-2.1.2.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
 inherit distutils-r1
 
 DESCRIPTION="Command-line YAML processor - jq wrapper for YAML documents"
-HOMEPAGE="https://yq.readthedocs.io/ https://github.com/kislyuk/yq/ https://pypi.python.org/pypi/yq"
+HOMEPAGE="https://yq.readthedocs.io/ https://github.com/kislyuk/yq/ https://pypi.org/project/yq"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 LICENSE="Apache-2.0"
 SLOT="0"
diff --git a/app-misc/yq/yq-2.3.0.ebuild b/app-misc/yq/yq-2.3.0.ebuild
index 2ead45746ee3e..b383dbdabe99c 100644
--- a/app-misc/yq/yq-2.3.0.ebuild
+++ b/app-misc/yq/yq-2.3.0.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
 inherit distutils-r1
 
 DESCRIPTION="Command-line YAML processor - jq wrapper for YAML documents"
-HOMEPAGE="https://yq.readthedocs.io/ https://github.com/kislyuk/yq/ https://pypi.python.org/pypi/yq"
+HOMEPAGE="https://yq.readthedocs.io/ https://github.com/kislyuk/yq/ https://pypi.org/project/yq"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 LICENSE="Apache-2.0"
 SLOT="0"
diff --git a/app-misc/yq/yq-2.3.3.ebuild b/app-misc/yq/yq-2.3.3.ebuild
index 2ead45746ee3e..b383dbdabe99c 100644
--- a/app-misc/yq/yq-2.3.3.ebuild
+++ b/app-misc/yq/yq-2.3.3.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
 inherit distutils-r1
 
 DESCRIPTION="Command-line YAML processor - jq wrapper for YAML documents"
-HOMEPAGE="https://yq.readthedocs.io/ https://github.com/kislyuk/yq/ https://pypi.python.org/pypi/yq"
+HOMEPAGE="https://yq.readthedocs.io/ https://github.com/kislyuk/yq/ https://pypi.org/project/yq"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 LICENSE="Apache-2.0"
 SLOT="0"
diff --git a/app-misc/yq/yq-2.3.4.ebuild b/app-misc/yq/yq-2.3.4.ebuild
index f6430d90a5526..aa07895a1b256 100644
--- a/app-misc/yq/yq-2.3.4.ebuild
+++ b/app-misc/yq/yq-2.3.4.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
 inherit distutils-r1
 
 DESCRIPTION="Command-line YAML processor - jq wrapper for YAML documents"
-HOMEPAGE="https://yq.readthedocs.io/ https://github.com/kislyuk/yq/ https://pypi.python.org/pypi/yq"
+HOMEPAGE="https://yq.readthedocs.io/ https://github.com/kislyuk/yq/ https://pypi.org/project/yq"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 LICENSE="Apache-2.0"
 SLOT="0"
diff --git a/app-office/taskcoach/taskcoach-1.4.3-r1.ebuild b/app-office/taskcoach/taskcoach-1.4.3-r1.ebuild
index 6471875088347..3a56421cce7f0 100644
--- a/app-office/taskcoach/taskcoach-1.4.3-r1.ebuild
+++ b/app-office/taskcoach/taskcoach-1.4.3-r1.ebuild
@@ -10,7 +10,7 @@ MY_PN="TaskCoach"
 MY_P="${MY_PN}-${PV}"
 
 DESCRIPTION="Simple personal tasks and todo lists manager"
-HOMEPAGE="http://www.taskcoach.org https://pypi.python.org/pypi/TaskCoach"
+HOMEPAGE="http://www.taskcoach.org https://pypi.org/project/TaskCoach"
 SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
 LICENSE="GPL-3"
 
diff --git a/app-text/doconce/doconce-1.3.ebuild b/app-text/doconce/doconce-1.3.ebuild
index 3653bc76b98df..065c118dc878a 100644
--- a/app-text/doconce/doconce-1.3.ebuild
+++ b/app-text/doconce/doconce-1.3.ebuild
@@ -6,7 +6,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5} )
 inherit distutils-r1
 
 DESCRIPTION="A markdown-like langauge to generate docs in html, LaTeX, and many other formats"
-HOMEPAGE="https://github.com/hplgit/doconce/ https://pypi.python.org/pypi/doconce/"
+HOMEPAGE="https://github.com/hplgit/doconce/ https://pypi.org/project/doconce/"
 SRC_URI="https://dev.gentoo.org/~grozin/${P}.tar.bz2"
 LICENSE="BSD"
 SLOT="0"
diff --git a/app-text/doconce/doconce-1.4.4.ebuild b/app-text/doconce/doconce-1.4.4.ebuild
index 5028993da1665..8752b80e9b249 100644
--- a/app-text/doconce/doconce-1.4.4.ebuild
+++ b/app-text/doconce/doconce-1.4.4.ebuild
@@ -6,7 +6,7 @@ PYTHON_COMPAT=( python2_7 python3_{5,6} )
 inherit distutils-r1
 
 DESCRIPTION="A markdown-like langauge to generate docs in html, LaTeX, and many other formats"
-HOMEPAGE="https://github.com/hplgit/doconce/ https://pypi.python.org/pypi/Doconce/"
+HOMEPAGE="https://github.com/hplgit/doconce/ https://pypi.org/project/Doconce/"
 SRC_URI="https://dev.gentoo.org/~grozin/${P}.tar.bz2"
 LICENSE="BSD"
 SLOT="0"
diff --git a/app-text/pdfminer/pdfminer-20131113.ebuild b/app-text/pdfminer/pdfminer-20131113.ebuild
index 2fc6b04b55395..737235045c344 100644
--- a/app-text/pdfminer/pdfminer-20131113.ebuild
+++ b/app-text/pdfminer/pdfminer-20131113.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 )
 inherit distutils-r1
 
 DESCRIPTION="Python tool for extracting information from PDF documents"
-HOMEPAGE="http://www.unixuser.org/~euske/python/pdfminer/ https://pypi.python.org/pypi/pdfminer/"
+HOMEPAGE="http://www.unixuser.org/~euske/python/pdfminer/ https://pypi.org/project/pdfminer/"
 SRC_URI="mirror://pypi/p/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/app-text/pdfminer/pdfminer-20140328-r1.ebuild b/app-text/pdfminer/pdfminer-20140328-r1.ebuild
index 37cc74f89fbdc..2fc3e5eeaed63 100644
--- a/app-text/pdfminer/pdfminer-20140328-r1.ebuild
+++ b/app-text/pdfminer/pdfminer-20140328-r1.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 pypy )
 inherit distutils-r1
 
 DESCRIPTION="Python tool for extracting information from PDF documents"
-HOMEPAGE="http://www.unixuser.org/~euske/python/pdfminer/ https://pypi.python.org/pypi/pdfminer/"
+HOMEPAGE="http://www.unixuser.org/~euske/python/pdfminer/ https://pypi.org/project/pdfminer/"
 SRC_URI="mirror://pypi/p/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/app-text/pdfminer/pdfminer-20140328.ebuild b/app-text/pdfminer/pdfminer-20140328.ebuild
index 421a92df759ac..3f0dbf03188cd 100644
--- a/app-text/pdfminer/pdfminer-20140328.ebuild
+++ b/app-text/pdfminer/pdfminer-20140328.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 pypy )
 inherit distutils-r1
 
 DESCRIPTION="Python tool for extracting information from PDF documents"
-HOMEPAGE="http://www.unixuser.org/~euske/python/pdfminer/ https://pypi.python.org/pypi/pdfminer/"
+HOMEPAGE="http://www.unixuser.org/~euske/python/pdfminer/ https://pypi.org/project/pdfminer/"
 SRC_URI="mirror://pypi/p/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/app-text/pelican/pelican-3.6.0.ebuild b/app-text/pelican/pelican-3.6.0.ebuild
index f4d5dbe819171..5f59a084fd77f 100644
--- a/app-text/pelican/pelican-3.6.0.ebuild
+++ b/app-text/pelican/pelican-3.6.0.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python{2_7,3_4} )
 inherit distutils-r1
 
 DESCRIPTION="A tool to generate a static blog, with restructured text or markdown input files"
-HOMEPAGE="http://blog.getpelican.com/ https://pypi.python.org/pypi/pelican"
+HOMEPAGE="http://blog.getpelican.com/ https://pypi.org/project/pelican"
 SRC_URI="https://github.com/getpelican/pelican/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="AGPL-3"
diff --git a/app-text/pelican/pelican-3.6.3.ebuild b/app-text/pelican/pelican-3.6.3.ebuild
index 96e0c0b7b937e..7be15bd02b486 100644
--- a/app-text/pelican/pelican-3.6.3.ebuild
+++ b/app-text/pelican/pelican-3.6.3.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5} )
 inherit distutils-r1
 
 DESCRIPTION="A tool to generate a static blog, with restructured text or markdown input files"
-HOMEPAGE="http://blog.getpelican.com/ https://pypi.python.org/pypi/pelican"
+HOMEPAGE="http://blog.getpelican.com/ https://pypi.org/project/pelican"
 SRC_URI="https://github.com/getpelican/pelican/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="AGPL-3"
diff --git a/app-text/pelican/pelican-3.7.0.ebuild b/app-text/pelican/pelican-3.7.0.ebuild
index 81ca84e73e894..e343bef922f7c 100644
--- a/app-text/pelican/pelican-3.7.0.ebuild
+++ b/app-text/pelican/pelican-3.7.0.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5} )
 inherit distutils-r1
 
 DESCRIPTION="A tool to generate a static blog, with restructured text or markdown input files"
-HOMEPAGE="http://blog.getpelican.com/ https://pypi.python.org/pypi/pelican"
+HOMEPAGE="http://blog.getpelican.com/ https://pypi.org/project/pelican"
 SRC_URI="https://github.com/getpelican/pelican/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="AGPL-3"
diff --git a/app-text/pelican/pelican-3.7.1.ebuild b/app-text/pelican/pelican-3.7.1.ebuild
index 955134e2669d7..8aaa1ebd965bb 100644
--- a/app-text/pelican/pelican-3.7.1.ebuild
+++ b/app-text/pelican/pelican-3.7.1.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5} )
 inherit distutils-r1
 
 DESCRIPTION="A tool to generate a static blog, with restructured text or markdown input files"
-HOMEPAGE="http://blog.getpelican.com/ https://pypi.python.org/pypi/pelican"
+HOMEPAGE="http://blog.getpelican.com/ https://pypi.org/project/pelican"
 SRC_URI="https://github.com/getpelican/pelican/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="AGPL-3"
diff --git a/app-text/pelican/pelican-9999.ebuild b/app-text/pelican/pelican-9999.ebuild
index d2af18c93768a..e14863151e957 100644
--- a/app-text/pelican/pelican-9999.ebuild
+++ b/app-text/pelican/pelican-9999.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5} )
 inherit distutils-r1 git-r3
 
 DESCRIPTION="A tool to generate a static blog, with restructured text or markdown input files"
-HOMEPAGE="http://blog.getpelican.com/ https://pypi.python.org/pypi/pelican"
+HOMEPAGE="http://blog.getpelican.com/ https://pypi.org/project/pelican"
 EGIT_REPO_URI="https://github.com/getpelican/pelican.git"
 EGIT_CHECKOUT_DIR="${WORKDIR}/${P}"
 
diff --git a/app-text/restview/restview-2.7.0.ebuild b/app-text/restview/restview-2.7.0.ebuild
index 88ffb5063445f..3197c7f674ad0 100644
--- a/app-text/restview/restview-2.7.0.ebuild
+++ b/app-text/restview/restview-2.7.0.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy )
 inherit distutils-r1
 
 DESCRIPTION="reStructuredText viewer"
-HOMEPAGE="https://mg.pov.lt/restview/ https://pypi.python.org/pypi/restview"
+HOMEPAGE="https://mg.pov.lt/restview/ https://pypi.org/project/restview"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
diff --git a/app-text/restview/restview-2.8.0.ebuild b/app-text/restview/restview-2.8.0.ebuild
index 88ffb5063445f..3197c7f674ad0 100644
--- a/app-text/restview/restview-2.8.0.ebuild
+++ b/app-text/restview/restview-2.8.0.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy )
 inherit distutils-r1
 
 DESCRIPTION="reStructuredText viewer"
-HOMEPAGE="https://mg.pov.lt/restview/ https://pypi.python.org/pypi/restview"
+HOMEPAGE="https://mg.pov.lt/restview/ https://pypi.org/project/restview"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
diff --git a/app-text/restview/restview-2.8.1.ebuild b/app-text/restview/restview-2.8.1.ebuild
index 8936274a1ef73..e44024334509b 100644
--- a/app-text/restview/restview-2.8.1.ebuild
+++ b/app-text/restview/restview-2.8.1.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy )
 inherit distutils-r1
 
 DESCRIPTION="reStructuredText viewer"
-HOMEPAGE="https://mg.pov.lt/restview/ https://pypi.python.org/pypi/restview"
+HOMEPAGE="https://mg.pov.lt/restview/ https://pypi.org/project/restview"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
diff --git a/dev-db/pgxnclient/pgxnclient-1.2-r1.ebuild b/dev-db/pgxnclient/pgxnclient-1.2-r1.ebuild
index 184b5fd16ecb8..ada063bf2787e 100644
--- a/dev-db/pgxnclient/pgxnclient-1.2-r1.ebuild
+++ b/dev-db/pgxnclient/pgxnclient-1.2-r1.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python{2_7,3_4} )
 inherit distutils-r1
 
 DESCRIPTION="PostgreSQL Extension Network Client"
-HOMEPAGE="http://pgxnclient.projects.postgresql.org/ https://pypi.python.org/pypi/${PN}"
+HOMEPAGE="http://pgxnclient.projects.postgresql.org/ https://pypi.org/project/${PN}"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
diff --git a/dev-db/pgxnclient/pgxnclient-1.2.1.ebuild b/dev-db/pgxnclient/pgxnclient-1.2.1.ebuild
index 1abdafe1a352b..0d91a8d786c9e 100644
--- a/dev-db/pgxnclient/pgxnclient-1.2.1.ebuild
+++ b/dev-db/pgxnclient/pgxnclient-1.2.1.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
 inherit distutils-r1
 
 DESCRIPTION="PostgreSQL Extension Network Client"
-HOMEPAGE="http://pgxnclient.projects.postgresql.org/ https://pypi.python.org/pypi/${PN}"
+HOMEPAGE="http://pgxnclient.projects.postgresql.org/ https://pypi.org/project/${PN}"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
diff --git a/dev-python/3to2/3to2-1.1.1-r1.ebuild b/dev-python/3to2/3to2-1.1.1-r1.ebuild
index d45b2e5c5e742..f4d854d52b8a6 100644
--- a/dev-python/3to2/3to2-1.1.1-r1.ebuild
+++ b/dev-python/3to2/3to2-1.1.1-r1.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
 inherit distutils-r1
 
 DESCRIPTION="Tool to refactor valid 3.x syntax into valid 2.x syntax"
-HOMEPAGE="https://pypi.python.org/pypi/3to2"
+HOMEPAGE="https://pypi.org/project/3to2"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
 
 LICENSE="Apache-1.1"
diff --git a/dev-python/3to2/3to2-1.1.1.ebuild b/dev-python/3to2/3to2-1.1.1.ebuild
index 445f48e5af2c4..49a0231dc1fda 100644
--- a/dev-python/3to2/3to2-1.1.1.ebuild
+++ b/dev-python/3to2/3to2-1.1.1.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5} )
 inherit distutils-r1
 
 DESCRIPTION="Tool to refactor valid 3.x syntax into valid 2.x syntax"
-HOMEPAGE="https://pypi.python.org/pypi/3to2"
+HOMEPAGE="https://pypi.org/project/3to2"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
 
 LICENSE="Apache-1.1"
diff --git a/dev-python/Babel/Babel-2.5.0.ebuild b/dev-python/Babel/Babel-2.5.0.ebuild
index b0c0c2fb8d6bb..a7bd48b1fd44c 100644
--- a/dev-python/Babel/Babel-2.5.0.ebuild
+++ b/dev-python/Babel/Babel-2.5.0.ebuild
@@ -9,7 +9,7 @@ PYTHON_REQ_USE="threads(+)"
 inherit distutils-r1
 
 DESCRIPTION="Collection of tools for internationalizing Python applications"
-HOMEPAGE="http://babel.edgewall.org/ https://pypi.python.org/pypi/Babel"
+HOMEPAGE="http://babel.edgewall.org/ https://pypi.org/project/Babel"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/Babel/Babel-2.5.3-r1.ebuild b/dev-python/Babel/Babel-2.5.3-r1.ebuild
index 70d214cb41445..e8c25b429ee1a 100644
--- a/dev-python/Babel/Babel-2.5.3-r1.ebuild
+++ b/dev-python/Babel/Babel-2.5.3-r1.ebuild
@@ -9,7 +9,7 @@ PYTHON_REQ_USE="threads(+)"
 inherit distutils-r1
 
 DESCRIPTION="Collection of tools for internationalizing Python applications"
-HOMEPAGE="http://babel.edgewall.org/ https://pypi.python.org/pypi/Babel"
+HOMEPAGE="http://babel.edgewall.org/ https://pypi.org/project/Babel"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/Babel/Babel-2.5.3.ebuild b/dev-python/Babel/Babel-2.5.3.ebuild
index dd04c227a16ae..57d86f760e2aa 100644
--- a/dev-python/Babel/Babel-2.5.3.ebuild
+++ b/dev-python/Babel/Babel-2.5.3.ebuild
@@ -9,7 +9,7 @@ PYTHON_REQ_USE="threads(+)"
 inherit distutils-r1
 
 DESCRIPTION="Collection of tools for internationalizing Python applications"
-HOMEPAGE="http://babel.edgewall.org/ https://pypi.python.org/pypi/Babel"
+HOMEPAGE="http://babel.edgewall.org/ https://pypi.org/project/Babel"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/BitVector/BitVector-3.4.4.ebuild b/dev-python/BitVector/BitVector-3.4.4.ebuild
index aa07104c408be..541e158595724 100644
--- a/dev-python/BitVector/BitVector-3.4.4.ebuild
+++ b/dev-python/BitVector/BitVector-3.4.4.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5} )
 inherit distutils-r1
 
 DESCRIPTION="A pure-Python memory-efficient packed representation for bit arrays"
-HOMEPAGE="https://engineering.purdue.edu/kak/dist/ https://pypi.python.org/pypi/BitVector"
+HOMEPAGE="https://engineering.purdue.edu/kak/dist/ https://pypi.org/project/BitVector"
 SRC_URI="https://engineering.purdue.edu/kak/dist/${P}.tar.gz"
 
 LICENSE="PSF-2"
diff --git a/dev-python/BitVector/BitVector-3.4.6.ebuild b/dev-python/BitVector/BitVector-3.4.6.ebuild
index 8c8eccd56866e..6cf249bd04bc1 100644
--- a/dev-python/BitVector/BitVector-3.4.6.ebuild
+++ b/dev-python/BitVector/BitVector-3.4.6.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5} )
 inherit distutils-r1
 
 DESCRIPTION="A pure-Python memory-efficient packed representation for bit arrays"
-HOMEPAGE="https://engineering.purdue.edu/kak/dist/ https://pypi.python.org/pypi/BitVector"
+HOMEPAGE="https://engineering.purdue.edu/kak/dist/ https://pypi.org/project/BitVector"
 SRC_URI="https://engineering.purdue.edu/kak/dist/${P}.tar.gz"
 
 LICENSE="PSF-2"
diff --git a/dev-python/BitVector/BitVector-3.4.7.ebuild b/dev-python/BitVector/BitVector-3.4.7.ebuild
index c9a9689084c54..286965d00b67d 100644
--- a/dev-python/BitVector/BitVector-3.4.7.ebuild
+++ b/dev-python/BitVector/BitVector-3.4.7.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_5,3_6} )
 inherit distutils-r1
 
 DESCRIPTION="A pure-Python memory-efficient packed representation for bit arrays"
-HOMEPAGE="https://engineering.purdue.edu/kak/dist/ https://pypi.python.org/pypi/BitVector"
+HOMEPAGE="https://engineering.purdue.edu/kak/dist/ https://pypi.org/project/BitVector"
 SRC_URI="https://engineering.purdue.edu/kak/dist/${P}.tar.gz"
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 RDEPEND=""
diff --git a/dev-python/CacheControl/CacheControl-0.11.5.ebuild b/dev-python/CacheControl/CacheControl-0.11.5.ebuild
index 2251e541e4738..c581347afc13d 100644
--- a/dev-python/CacheControl/CacheControl-0.11.5.ebuild
+++ b/dev-python/CacheControl/CacheControl-0.11.5.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
 inherit distutils-r1 eutils
 
 DESCRIPTION="The httplib2 caching algorithms packaged up for use with requests"
-HOMEPAGE="https://github.com/ionrock/cachecontrol https://pypi.python.org/pypi/cachecontrol/"
+HOMEPAGE="https://github.com/ionrock/cachecontrol https://pypi.org/project/cachecontrol/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/CacheControl/CacheControl-0.11.7.ebuild b/dev-python/CacheControl/CacheControl-0.11.7.ebuild
index 32bda26542db8..0693c285f35ad 100644
--- a/dev-python/CacheControl/CacheControl-0.11.7.ebuild
+++ b/dev-python/CacheControl/CacheControl-0.11.7.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
 inherit distutils-r1 eutils
 
 DESCRIPTION="The httplib2 caching algorithms packaged up for use with requests"
-HOMEPAGE="https://github.com/ionrock/cachecontrol https://pypi.python.org/pypi/cachecontrol/"
+HOMEPAGE="https://github.com/ionrock/cachecontrol https://pypi.org/project/cachecontrol/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/Coffin/Coffin-2.0.1.ebuild b/dev-python/Coffin/Coffin-2.0.1.ebuild
index 757933b9c612f..78a1915e62396 100644
--- a/dev-python/Coffin/Coffin-2.0.1.ebuild
+++ b/dev-python/Coffin/Coffin-2.0.1.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5} pypy )
 inherit distutils-r1
 
 DESCRIPTION="Jinja2 adapter for Django"
-HOMEPAGE="https://pypi.python.org/pypi/Coffin"
+HOMEPAGE="https://pypi.org/project/Coffin"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/Flask-KVSession/Flask-KVSession-0.6.1.ebuild b/dev-python/Flask-KVSession/Flask-KVSession-0.6.1.ebuild
index 2f0e3092540ce..7d5d3b83096f5 100644
--- a/dev-python/Flask-KVSession/Flask-KVSession-0.6.1.ebuild
+++ b/dev-python/Flask-KVSession/Flask-KVSession-0.6.1.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 )
 inherit distutils-r1
 
 DESCRIPTION="Transparent server-side session support for flask"
-HOMEPAGE="https://pypi.python.org/pypi/Flask-KVSession https://github.com/mbr/flask-kvsession"
+HOMEPAGE="https://pypi.org/project/Flask-KVSession https://github.com/mbr/flask-kvsession"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/Flask-KVSession/Flask-KVSession-0.6.2.ebuild b/dev-python/Flask-KVSession/Flask-KVSession-0.6.2.ebuild
index e70a5abc821cf..c873a2ca60a2b 100644
--- a/dev-python/Flask-KVSession/Flask-KVSession-0.6.2.ebuild
+++ b/dev-python/Flask-KVSession/Flask-KVSession-0.6.2.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 )
 inherit distutils-r1
 
 DESCRIPTION="Transparent server-side session support for flask"
-HOMEPAGE="https://pypi.python.org/pypi/Flask-KVSession https://github.com/mbr/flask-kvsession"
+HOMEPAGE="https://pypi.org/project/Flask-KVSession https://github.com/mbr/flask-kvsession"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/GridDataFormats/GridDataFormats-0.2.2.ebuild b/dev-python/GridDataFormats/GridDataFormats-0.2.2.ebuild
index 55117dc517590..8367c4c9bbd82 100644
--- a/dev-python/GridDataFormats/GridDataFormats-0.2.2.ebuild
+++ b/dev-python/GridDataFormats/GridDataFormats-0.2.2.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 )
 inherit distutils-r1
 
 DESCRIPTION="Reading and writing of data on regular grids in Python"
-HOMEPAGE="https://pypi.python.org/pypi/GridDataFormats"
+HOMEPAGE="https://pypi.org/project/GridDataFormats"
 SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
diff --git a/dev-python/GridDataFormats/GridDataFormats-0.2.5.ebuild b/dev-python/GridDataFormats/GridDataFormats-0.2.5.ebuild
index de2813acc0a11..7183fcb29b1d2 100644
--- a/dev-python/GridDataFormats/GridDataFormats-0.2.5.ebuild
+++ b/dev-python/GridDataFormats/GridDataFormats-0.2.5.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 )
 inherit distutils-r1
 
 DESCRIPTION="Reading and writing of data on regular grids in Python"
-HOMEPAGE="https://pypi.python.org/pypi/GridDataFormats https://github.com/MDAnalysis/GridDataFormats"
+HOMEPAGE="https://pypi.org/project/GridDataFormats https://github.com/MDAnalysis/GridDataFormats"
 SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
diff --git a/dev-python/MechanicalSoup/MechanicalSoup-0.6.0.ebuild b/dev-python/MechanicalSoup/MechanicalSoup-0.6.0.ebuild
index d1e1817b2c4f6..5e20cc4047e05 100644
--- a/dev-python/MechanicalSoup/MechanicalSoup-0.6.0.ebuild
+++ b/dev-python/MechanicalSoup/MechanicalSoup-0.6.0.ebuild
@@ -15,7 +15,7 @@ else
 fi
 
 DESCRIPTION="A python library for automating interaction with web sites"
-HOMEPAGE="https://pypi.python.org/pypi/MechanicalSoup"
+HOMEPAGE="https://pypi.org/project/MechanicalSoup"
 
 LICENSE="MIT"
 SLOT="0"
diff --git a/dev-python/Numdifftools/Numdifftools-0.9.12.ebuild b/dev-python/Numdifftools/Numdifftools-0.9.12.ebuild
index 3a5ad48cc3c92..8de31be44f0ec 100644
--- a/dev-python/Numdifftools/Numdifftools-0.9.12.ebuild
+++ b/dev-python/Numdifftools/Numdifftools-0.9.12.ebuild
@@ -11,7 +11,7 @@ MY_PN=numdifftools
 MY_P="${MY_PN}-${PV}"
 
 DESCRIPTION="Solves automatic numerical differentiation problems in one or more variables"
-HOMEPAGE="https://pypi.python.org/pypi/Numdifftools https://github.com/pbrod/numdifftools"
+HOMEPAGE="https://pypi.org/project/Numdifftools https://github.com/pbrod/numdifftools"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.zip"
 
 SLOT="0"
diff --git a/dev-python/Numdifftools/Numdifftools-0.9.13.ebuild b/dev-python/Numdifftools/Numdifftools-0.9.13.ebuild
index f480b978ef855..c8f3f623b3bcd 100644
--- a/dev-python/Numdifftools/Numdifftools-0.9.13.ebuild
+++ b/dev-python/Numdifftools/Numdifftools-0.9.13.ebuild
@@ -11,7 +11,7 @@ MY_PN=numdifftools
 MY_P="${MY_PN}-${PV}"
 
 DESCRIPTION="Solves automatic numerical differentiation problems in one or more variables"
-HOMEPAGE="https://pypi.python.org/pypi/Numdifftools https://github.com/pbrod/numdifftools"
+HOMEPAGE="https://pypi.org/project/Numdifftools https://github.com/pbrod/numdifftools"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.zip"
 
 SLOT="0"
diff --git a/dev-python/Numdifftools/Numdifftools-0.9.14.ebuild b/dev-python/Numdifftools/Numdifftools-0.9.14.ebuild
index 3d10d2f32fc78..650846454b901 100644
--- a/dev-python/Numdifftools/Numdifftools-0.9.14.ebuild
+++ b/dev-python/Numdifftools/Numdifftools-0.9.14.ebuild
@@ -11,7 +11,7 @@ MY_PN=numdifftools
 MY_P="${MY_PN}-${PV}"
 
 DESCRIPTION="Solves automatic numerical differentiation problems in one or more variables"
-HOMEPAGE="https://pypi.python.org/pypi/Numdifftools https://github.com/pbrod/numdifftools"
+HOMEPAGE="https://pypi.org/project/Numdifftools https://github.com/pbrod/numdifftools"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.zip"
 
 SLOT="0"
diff --git a/dev-python/Numdifftools/Numdifftools-0.9.17.ebuild b/dev-python/Numdifftools/Numdifftools-0.9.17.ebuild
index dd2afadc4eb7d..bab2a087f7a53 100644
--- a/dev-python/Numdifftools/Numdifftools-0.9.17.ebuild
+++ b/dev-python/Numdifftools/Numdifftools-0.9.17.ebuild
@@ -11,7 +11,7 @@ MY_PN=numdifftools
 MY_P="${MY_PN}-${PV}"
 
 DESCRIPTION="Solves automatic numerical differentiation problems in one or more variables"
-HOMEPAGE="https://pypi.python.org/pypi/Numdifftools https://github.com/pbrod/numdifftools"
+HOMEPAGE="https://pypi.org/project/Numdifftools https://github.com/pbrod/numdifftools"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.zip"
 
 SLOT="0"
diff --git a/dev-python/PyContracts/PyContracts-1.7.9.ebuild b/dev-python/PyContracts/PyContracts-1.7.9.ebuild
index 676c1d51fcb3f..b1d6e25a9b6bc 100644
--- a/dev-python/PyContracts/PyContracts-1.7.9.ebuild
+++ b/dev-python/PyContracts/PyContracts-1.7.9.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="Declare constraints on function parameters and return values"
-HOMEPAGE="http://andreacensi.github.com/contracts/ https://pypi.python.org/pypi/PyContracts/"
+HOMEPAGE="http://andreacensi.github.com/contracts/ https://pypi.org/project/PyContracts/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
diff --git a/dev-python/PyContracts/PyContracts-1.8.0.ebuild b/dev-python/PyContracts/PyContracts-1.8.0.ebuild
index 1d79830b0f321..dce0efc2d388e 100644
--- a/dev-python/PyContracts/PyContracts-1.8.0.ebuild
+++ b/dev-python/PyContracts/PyContracts-1.8.0.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="Declare constraints on function parameters and return values"
-HOMEPAGE="http://andreacensi.github.com/contracts/ https://pypi.python.org/pypi/PyContracts/"
+HOMEPAGE="http://andreacensi.github.com/contracts/ https://pypi.org/project/PyContracts/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
diff --git a/dev-python/PyDbLite/PyDbLite-3.0.4.ebuild b/dev-python/PyDbLite/PyDbLite-3.0.4.ebuild
index a55e711c04013..d0c41f54668d2 100644
--- a/dev-python/PyDbLite/PyDbLite-3.0.4.ebuild
+++ b/dev-python/PyDbLite/PyDbLite-3.0.4.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5} pypy pypy3)
 inherit distutils-r1
 
 DESCRIPTION="A fast, pure-Python in-memory database"
-HOMEPAGE="https://pypi.python.org/pypi/PyDbLite"
+HOMEPAGE="https://pypi.org/project/PyDbLite"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/PyECLib/PyECLib-1.5.0.ebuild b/dev-python/PyECLib/PyECLib-1.5.0.ebuild
index 7d57a5c8f14a3..888d7165dedf2 100644
--- a/dev-python/PyECLib/PyECLib-1.5.0.ebuild
+++ b/dev-python/PyECLib/PyECLib-1.5.0.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 )
 inherit distutils-r1 eutils multilib
 
 DESCRIPTION="Messaging API for RPC and notifications over different messaging transports"
-HOMEPAGE="https://pypi.python.org/pypi/PyECLib"
+HOMEPAGE="https://pypi.org/project/PyECLib"
 SRC_URI="mirror://pypi/p/pyeclib/pyeclib-${PV}.tar.gz"
 S="${WORKDIR}/pyeclib-${PV}"
 
diff --git a/dev-python/PyPDF2/PyPDF2-1.26.0.ebuild b/dev-python/PyPDF2/PyPDF2-1.26.0.ebuild
index 00942735a066a..9f803913a9b2a 100644
--- a/dev-python/PyPDF2/PyPDF2-1.26.0.ebuild
+++ b/dev-python/PyPDF2/PyPDF2-1.26.0.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
 inherit distutils-r1
 
 DESCRIPTION="Python library to work with pdf files"
-HOMEPAGE="https://pypi.python.org/pypi/${PN}/ https://github.com/mstamy2/PyPDF2"
+HOMEPAGE="https://pypi.org/project/${PN}/ https://github.com/mstamy2/PyPDF2"
 SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD-2"
diff --git a/dev-python/PyRSS2Gen/PyRSS2Gen-1.0.0-r1.ebuild b/dev-python/PyRSS2Gen/PyRSS2Gen-1.0.0-r1.ebuild
index 8ba6b616de54f..28824b8cfc922 100644
--- a/dev-python/PyRSS2Gen/PyRSS2Gen-1.0.0-r1.ebuild
+++ b/dev-python/PyRSS2Gen/PyRSS2Gen-1.0.0-r1.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 pypy )
 inherit distutils-r1
 
 DESCRIPTION="RSS feed generator written in Python"
-HOMEPAGE="http://www.dalkescientific.com/Python/PyRSS2Gen.html https://pypi.python.org/pypi/PyRSS2Gen"
+HOMEPAGE="http://www.dalkescientific.com/Python/PyRSS2Gen.html https://pypi.org/project/PyRSS2Gen"
 SRC_URI="http://www.dalkescientific.com/Python/${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/PyRSS2Gen/PyRSS2Gen-1.1.ebuild b/dev-python/PyRSS2Gen/PyRSS2Gen-1.1.ebuild
index 095b56540415a..7ea9acf03488b 100644
--- a/dev-python/PyRSS2Gen/PyRSS2Gen-1.1.ebuild
+++ b/dev-python/PyRSS2Gen/PyRSS2Gen-1.1.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy )
 inherit distutils-r1
 
 DESCRIPTION="RSS feed generator written in Python"
-HOMEPAGE="http://www.dalkescientific.com/Python/PyRSS2Gen.html https://pypi.python.org/pypi/PyRSS2Gen"
+HOMEPAGE="http://www.dalkescientific.com/Python/PyRSS2Gen.html https://pypi.org/project/PyRSS2Gen"
 SRC_URI="http://www.dalkescientific.com/Python/${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/PySDL2/PySDL2-0.9.6.ebuild b/dev-python/PySDL2/PySDL2-0.9.6.ebuild
index d761ef0b205c9..632d33c3ca3d7 100644
--- a/dev-python/PySDL2/PySDL2-0.9.6.ebuild
+++ b/dev-python/PySDL2/PySDL2-0.9.6.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python{2_7,3_{4,5,6}} )
 inherit distutils-r1
 
 DESCRIPTION="Python (ctypes) bindings for SDL2 libraries"
-HOMEPAGE="https://github.com/marcusva/py-sdl2 https://pypi.python.org/pypi/PySDL2"
+HOMEPAGE="https://github.com/marcusva/py-sdl2 https://pypi.org/project/PySDL2"
 SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
 
 LICENSE="|| ( public-domain CC0-1.0 ZLIB )"
diff --git a/dev-python/PySensors/PySensors-0.0.3.ebuild b/dev-python/PySensors/PySensors-0.0.3.ebuild
index 064dd0c8a2a6b..a2de3813d9038 100644
--- a/dev-python/PySensors/PySensors-0.0.3.ebuild
+++ b/dev-python/PySensors/PySensors-0.0.3.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 pypy )
 inherit distutils-r1
 
 DESCRIPTION="Python bindings to libsensors (via ctypes)"
-HOMEPAGE="https://pypi.python.org/pypi/PySensors/"
+HOMEPAGE="https://pypi.org/project/PySensors/"
 SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
diff --git a/dev-python/PySocks/PySocks-1.6.7.ebuild b/dev-python/PySocks/PySocks-1.6.7.ebuild
index 66fb0ebc9608b..44c20191af982 100644
--- a/dev-python/PySocks/PySocks-1.6.7.ebuild
+++ b/dev-python/PySocks/PySocks-1.6.7.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy{,3} )
 inherit distutils-r1
 
 DESCRIPTION="SOCKS client module"
-HOMEPAGE="https://github.com/Anorov/PySocks https://pypi.python.org/pypi/PySocks"
+HOMEPAGE="https://github.com/Anorov/PySocks https://pypi.org/project/PySocks"
 SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/PyZilla/PyZilla-0.1.0-r1.ebuild b/dev-python/PyZilla/PyZilla-0.1.0-r1.ebuild
index 22d8f5aaa9147..41a3d5ddb9a02 100644
--- a/dev-python/PyZilla/PyZilla-0.1.0-r1.ebuild
+++ b/dev-python/PyZilla/PyZilla-0.1.0-r1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 )
 inherit distutils-r1
 
 DESCRIPTION="Python wrapper for the BugZilla XML-RPC API"
-HOMEPAGE="https://pypi.python.org/pypi/PyZilla"
+HOMEPAGE="https://pypi.org/project/PyZilla"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
diff --git a/dev-python/ReParser/ReParser-1.4.3.ebuild b/dev-python/ReParser/ReParser-1.4.3.ebuild
index d32e469cd4418..4773ab4542a47 100644
--- a/dev-python/ReParser/ReParser-1.4.3.ebuild
+++ b/dev-python/ReParser/ReParser-1.4.3.ebuild
@@ -15,7 +15,7 @@ else
 fi
 
 DESCRIPTION="Simple regex-based lexer/parser for inline markup"
-HOMEPAGE="https://pypi.python.org/pypi/ReParser"
+HOMEPAGE="https://pypi.org/project/ReParser"
 
 LICENSE="MIT"
 SLOT="0"
diff --git a/dev-python/URLObject/URLObject-2.4.0.ebuild b/dev-python/URLObject/URLObject-2.4.0.ebuild
index 6a766ff291c3d..b5cd1dfb24fd3 100644
--- a/dev-python/URLObject/URLObject-2.4.0.ebuild
+++ b/dev-python/URLObject/URLObject-2.4.0.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_4} )
 inherit distutils-r1
 
 DESCRIPTION="A utility class for manipulating URLs"
-HOMEPAGE="https://pypi.python.org/pypi/URLObject"
+HOMEPAGE="https://pypi.org/project/URLObject"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/URLObject/URLObject-2.4.2-r1.ebuild b/dev-python/URLObject/URLObject-2.4.2-r1.ebuild
index a1fa7caa07bd2..286ebb6f7d5d8 100644
--- a/dev-python/URLObject/URLObject-2.4.2-r1.ebuild
+++ b/dev-python/URLObject/URLObject-2.4.2-r1.ebuild
@@ -9,7 +9,7 @@ inherit distutils-r1
 
 GITHUB_P=${P,,}
 DESCRIPTION="A utility class for manipulating URLs"
-HOMEPAGE="https://pypi.python.org/pypi/URLObject"
+HOMEPAGE="https://pypi.org/project/URLObject"
 # note: pypi tarball lacks tests
 # https://github.com/zacharyvoase/urlobject/issues/39
 SRC_URI="https://github.com/zacharyvoase/urlobject/archive/v${PV}.tar.gz -> ${GITHUB_P}.tar.gz"
diff --git a/dev-python/YURL/YURL-0.13.ebuild b/dev-python/YURL/YURL-0.13.ebuild
index 7fa3083f81d4e..10f5b821533a2 100644
--- a/dev-python/YURL/YURL-0.13.ebuild
+++ b/dev-python/YURL/YURL-0.13.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 )
 inherit distutils-r1
 
 DESCRIPTION="Yurl is the replacement of built in python urlparse module"
-HOMEPAGE="https://pypi.python.org/pypi/YURL"
+HOMEPAGE="https://pypi.org/project/YURL"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/aadict/aadict-0.2.3.ebuild b/dev-python/aadict/aadict-0.2.3.ebuild
index d1e53a1094561..391cafc019a80 100644
--- a/dev-python/aadict/aadict-0.2.3.ebuild
+++ b/dev-python/aadict/aadict-0.2.3.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="An auto-attribute dict (and a couple of other useful dict functions)"
-HOMEPAGE="https://github.com/metagriffin/aadict https://pypi.python.org/pypi/aadict"
+HOMEPAGE="https://github.com/metagriffin/aadict https://pypi.org/project/aadict"
 SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3+"
diff --git a/dev-python/abstract_rendering/abstract_rendering-0.5.1.ebuild b/dev-python/abstract_rendering/abstract_rendering-0.5.1.ebuild
index f9dc75c6e178c..4cb5e0487ddfd 100644
--- a/dev-python/abstract_rendering/abstract_rendering-0.5.1.ebuild
+++ b/dev-python/abstract_rendering/abstract_rendering-0.5.1.ebuild
@@ -10,7 +10,7 @@ inherit distutils-r1
 DESCRIPTION="Rendering as a binning process"
 HOMEPAGE="
 	https://github.com/JosephCottam/AbstractRendering
-	https://pypi.python.org/pypi/abstract_rendering
+	https://pypi.org/project/abstract_rendering
 "
 SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
diff --git a/dev-python/addons/addons-0.7.ebuild b/dev-python/addons/addons-0.7.ebuild
index d65e930301afd..ab68b7df33b26 100644
--- a/dev-python/addons/addons-0.7.ebuild
+++ b/dev-python/addons/addons-0.7.ebuild
@@ -9,7 +9,7 @@ inherit distutils-r1
 MY_PN="AddOns"
 
 DESCRIPTION="Dynamically extend other objects (formerly ObjectRoles)"
-HOMEPAGE="https://pypi.python.org/pypi/AddOns/"
+HOMEPAGE="https://pypi.org/project/AddOns/"
 SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.zip -> ${P}.zip"
 
 KEYWORDS="amd64 x86"
diff --git a/dev-python/aioeventlet/aioeventlet-0.5.1-r1.ebuild b/dev-python/aioeventlet/aioeventlet-0.5.1-r1.ebuild
index 0f954090531d0..5b4be83d762c9 100644
--- a/dev-python/aioeventlet/aioeventlet-0.5.1-r1.ebuild
+++ b/dev-python/aioeventlet/aioeventlet-0.5.1-r1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
 inherit distutils-r1
 
 DESCRIPTION="asyncio event loop scheduling callbacks in eventlet"
-HOMEPAGE="https://pypi.python.org/pypi/aioeventlet"
+HOMEPAGE="https://pypi.org/project/aioeventlet"
 SRC_URI="mirror://pypi/a/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
diff --git a/dev-python/aiohttp/aiohttp-1.3.3.ebuild b/dev-python/aiohttp/aiohttp-1.3.3.ebuild
index 739051416f147..0c0ccb308e777 100644
--- a/dev-python/aiohttp/aiohttp-1.3.3.ebuild
+++ b/dev-python/aiohttp/aiohttp-1.3.3.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python3_{4,5,6} )
 inherit distutils-r1 vcs-snapshot
 
 DESCRIPTION="http client/server for asyncio"
-HOMEPAGE="https://pypi.python.org/pypi/aiohttp"
+HOMEPAGE="https://pypi.org/project/aiohttp"
 SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz -> ${P}.tar.gz"
 EGIT_REPO_URI="https://github.com/aio-libs/aiohttp"
 
diff --git a/dev-python/aiohttp/aiohttp-1.3.5.ebuild b/dev-python/aiohttp/aiohttp-1.3.5.ebuild
index 739051416f147..0c0ccb308e777 100644
--- a/dev-python/aiohttp/aiohttp-1.3.5.ebuild
+++ b/dev-python/aiohttp/aiohttp-1.3.5.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python3_{4,5,6} )
 inherit distutils-r1 vcs-snapshot
 
 DESCRIPTION="http client/server for asyncio"
-HOMEPAGE="https://pypi.python.org/pypi/aiohttp"
+HOMEPAGE="https://pypi.org/project/aiohttp"
 SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz -> ${P}.tar.gz"
 EGIT_REPO_URI="https://github.com/aio-libs/aiohttp"
 
diff --git a/dev-python/aiohttp/aiohttp-2.3.10.ebuild b/dev-python/aiohttp/aiohttp-2.3.10.ebuild
index d29494b31f3b1..1fe286e155c90 100644
--- a/dev-python/aiohttp/aiohttp-2.3.10.ebuild
+++ b/dev-python/aiohttp/aiohttp-2.3.10.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python3_{4,5,6} )
 inherit distutils-r1 vcs-snapshot
 
 DESCRIPTION="http client/server for asyncio"
-HOMEPAGE="https://pypi.python.org/pypi/aiohttp"
+HOMEPAGE="https://pypi.org/project/aiohttp"
 SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz -> ${P}.tar.gz"
 EGIT_REPO_URI="https://github.com/aio-libs/aiohttp"
 
diff --git a/dev-python/aiohttp/aiohttp-2.3.2.ebuild b/dev-python/aiohttp/aiohttp-2.3.2.ebuild
index 669641f6390c0..1be5b8c105822 100644
--- a/dev-python/aiohttp/aiohttp-2.3.2.ebuild
+++ b/dev-python/aiohttp/aiohttp-2.3.2.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python3_{4,5,6} )
 inherit distutils-r1 vcs-snapshot
 
 DESCRIPTION="http client/server for asyncio"
-HOMEPAGE="https://pypi.python.org/pypi/aiohttp"
+HOMEPAGE="https://pypi.org/project/aiohttp"
 SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz -> ${P}.tar.gz"
 EGIT_REPO_URI="https://github.com/aio-libs/aiohttp"
 
diff --git a/dev-python/aiohttp/aiohttp-3.0.5.ebuild b/dev-python/aiohttp/aiohttp-3.0.5.ebuild
index 2fb47c689da72..4d5c721221b4e 100644
--- a/dev-python/aiohttp/aiohttp-3.0.5.ebuild
+++ b/dev-python/aiohttp/aiohttp-3.0.5.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python3_{5,6} )
 inherit distutils-r1
 
 DESCRIPTION="http client/server for asyncio"
-HOMEPAGE="https://pypi.python.org/pypi/aiohttp"
+HOMEPAGE="https://pypi.org/project/aiohttp"
 SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
diff --git a/dev-python/aiohttp/aiohttp-3.0.6.ebuild b/dev-python/aiohttp/aiohttp-3.0.6.ebuild
index 37ecc7609be52..5bbe4da31d8fe 100644
--- a/dev-python/aiohttp/aiohttp-3.0.6.ebuild
+++ b/dev-python/aiohttp/aiohttp-3.0.6.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python3_{5,6} )
 inherit distutils-r1
 
 DESCRIPTION="http client/server for asyncio"
-HOMEPAGE="https://pypi.python.org/pypi/aiohttp"
+HOMEPAGE="https://pypi.org/project/aiohttp"
 SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
diff --git a/dev-python/aldryn-boilerplates/aldryn-boilerplates-0.7.5.ebuild b/dev-python/aldryn-boilerplates/aldryn-boilerplates-0.7.5.ebuild
index f950f41697c99..45c65ce85385d 100644
--- a/dev-python/aldryn-boilerplates/aldryn-boilerplates-0.7.5.ebuild
+++ b/dev-python/aldryn-boilerplates/aldryn-boilerplates-0.7.5.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_{6,7} )
 inherit distutils-r1
 
 DESCRIPTION="Allows re-usable apps to provide sets of templates and staticfiles"
-HOMEPAGE="https://pypi.python.org/pypi/aldryn-boilerplates"
+HOMEPAGE="https://pypi.org/project/aldryn-boilerplates"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/aldryn-common/aldryn-common-1.0.4.ebuild b/dev-python/aldryn-common/aldryn-common-1.0.4.ebuild
index 8c54a7d53b792..1a2fae0854cea 100644
--- a/dev-python/aldryn-common/aldryn-common-1.0.4.ebuild
+++ b/dev-python/aldryn-common/aldryn-common-1.0.4.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 )
 inherit distutils-r1
 
 DESCRIPTION="django CMS plugins with common utilities"
-HOMEPAGE="https://pypi.python.org/pypi/aldryn-common"
+HOMEPAGE="https://pypi.org/project/aldryn-common"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/aldryn-search/aldryn-search-0.3.0.ebuild b/dev-python/aldryn-search/aldryn-search-0.3.0.ebuild
index f799ed83fa638..454fd4d8ef958 100644
--- a/dev-python/aldryn-search/aldryn-search-0.3.0.ebuild
+++ b/dev-python/aldryn-search/aldryn-search-0.3.0.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 )
 inherit distutils-r1
 
 DESCRIPTION="An extension to django CMS to provide multilingual Haystack indexes"
-HOMEPAGE="https://pypi.python.org/pypi/aldryn-search"
+HOMEPAGE="https://pypi.org/project/aldryn-search"
 SRC_URI="https://github.com/aldryn/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/algopy/algopy-0.5.3.ebuild b/dev-python/algopy/algopy-0.5.3.ebuild
index 8c997c0902063..e929ce230a600 100644
--- a/dev-python/algopy/algopy-0.5.3.ebuild
+++ b/dev-python/algopy/algopy-0.5.3.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5} )
 inherit distutils-r1
 
 DESCRIPTION="Taylor Arithmetic Computation and Algorithmic Differentiation"
-HOMEPAGE="https://pypi.python.org/pypi/algopy http://packages.python.org/algopy"
+HOMEPAGE="https://pypi.org/project/algopy http://packages.python.org/algopy"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
diff --git a/dev-python/aniso8601/aniso8601-1.3.0.ebuild b/dev-python/aniso8601/aniso8601-1.3.0.ebuild
index cfeacc131dbe4..0b1ad580e3809 100644
--- a/dev-python/aniso8601/aniso8601-1.3.0.ebuild
+++ b/dev-python/aniso8601/aniso8601-1.3.0.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="A library for parsing ISO 8601 strings"
-HOMEPAGE="https://bitbucket.org/nielsenb/aniso8601/ https://pypi.python.org/pypi/aniso8601/"
+HOMEPAGE="https://bitbucket.org/nielsenb/aniso8601/ https://pypi.org/project/aniso8601/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3+"
diff --git a/dev-python/aniso8601/aniso8601-3.0.0.ebuild b/dev-python/aniso8601/aniso8601-3.0.0.ebuild
index eed3a54c73ea2..7bdae256c6d52 100644
--- a/dev-python/aniso8601/aniso8601-3.0.0.ebuild
+++ b/dev-python/aniso8601/aniso8601-3.0.0.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="A library for parsing ISO 8601 strings"
-HOMEPAGE="https://bitbucket.org/nielsenb/aniso8601/ https://pypi.python.org/pypi/aniso8601/"
+HOMEPAGE="https://bitbucket.org/nielsenb/aniso8601/ https://pypi.org/project/aniso8601/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3+"
diff --git a/dev-python/ansi2html/ansi2html-1.1.1.ebuild b/dev-python/ansi2html/ansi2html-1.1.1.ebuild
index 4d9daf980e3e7..fa499b0c0c54c 100644
--- a/dev-python/ansi2html/ansi2html-1.1.1.ebuild
+++ b/dev-python/ansi2html/ansi2html-1.1.1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5} pypy )
 inherit distutils-r1
 
 DESCRIPTION="Convert text with ANSI color codes to HTML"
-HOMEPAGE="https://pypi.python.org/pypi/ansi2html https://github.com/ralphbean/ansi2html"
+HOMEPAGE="https://pypi.org/project/ansi2html https://github.com/ralphbean/ansi2html"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3+"
diff --git a/dev-python/ansi2html/ansi2html-1.2.0.ebuild b/dev-python/ansi2html/ansi2html-1.2.0.ebuild
index 226d154d1043b..8b9858129a5b5 100644
--- a/dev-python/ansi2html/ansi2html-1.2.0.ebuild
+++ b/dev-python/ansi2html/ansi2html-1.2.0.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5} pypy )
 inherit distutils-r1
 
 DESCRIPTION="Convert text with ANSI color codes to HTML"
-HOMEPAGE="https://pypi.python.org/pypi/ansi2html https://github.com/ralphbean/ansi2html"
+HOMEPAGE="https://pypi.org/project/ansi2html https://github.com/ralphbean/ansi2html"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3+"
diff --git a/dev-python/ansi2html/ansi2html-1.3.0.ebuild b/dev-python/ansi2html/ansi2html-1.3.0.ebuild
index e8c9113901fdd..5afc323380c93 100644
--- a/dev-python/ansi2html/ansi2html-1.3.0.ebuild
+++ b/dev-python/ansi2html/ansi2html-1.3.0.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5} pypy )
 inherit distutils-r1
 
 DESCRIPTION="Convert text with ANSI color codes to HTML"
-HOMEPAGE="https://pypi.python.org/pypi/ansi2html https://github.com/ralphbean/ansi2html"
+HOMEPAGE="https://pypi.org/project/ansi2html https://github.com/ralphbean/ansi2html"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-3+"
diff --git a/dev-python/ansi2html/ansi2html-1.4.2.ebuild b/dev-python/ansi2html/ansi2html-1.4.2.ebuild
index e8c9113901fdd..5afc323380c93 100644
--- a/dev-python/ansi2html/ansi2html-1.4.2.ebuild
+++ b/dev-python/ansi2html/ansi2html-1.4.2.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5} pypy )
 inherit distutils-r1
 
 DESCRIPTION="Convert text with ANSI color codes to HTML"
-HOMEPAGE="https://pypi.python.org/pypi/ansi2html https://github.com/ralphbean/ansi2html"
+HOMEPAGE="https://pypi.org/project/ansi2html https://github.com/ralphbean/ansi2html"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-3+"
diff --git a/dev-python/anyvc/anyvc-0.3.7.1-r1.ebuild b/dev-python/anyvc/anyvc-0.3.7.1-r1.ebuild
index b0d4c17e2bd58..4bd7048f31059 100644
--- a/dev-python/anyvc/anyvc-0.3.7.1-r1.ebuild
+++ b/dev-python/anyvc/anyvc-0.3.7.1-r1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 )
 inherit distutils-r1
 
 DESCRIPTION="Library to access any version control system"
-HOMEPAGE="https://pypi.python.org/pypi/anyvc"
+HOMEPAGE="https://pypi.org/project/anyvc"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
diff --git a/dev-python/apipkg/apipkg-1.4.ebuild b/dev-python/apipkg/apipkg-1.4.ebuild
index cb892f8db8522..d9a5e0a64622e 100644
--- a/dev-python/apipkg/apipkg-1.4.ebuild
+++ b/dev-python/apipkg/apipkg-1.4.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="namespace control and lazy-import mechanism"
-HOMEPAGE="https://pypi.python.org/pypi/apipkg"
+HOMEPAGE="https://pypi.org/project/apipkg"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/apptools/apptools-4.2.1.ebuild b/dev-python/apptools/apptools-4.2.1.ebuild
index 8084a69ab960c..5de917ec546c4 100644
--- a/dev-python/apptools/apptools-4.2.1.ebuild
+++ b/dev-python/apptools/apptools-4.2.1.ebuild
@@ -10,7 +10,7 @@ inherit distutils-r1 virtualx
 DESCRIPTION="Enthought Tool Suite: Application tools"
 HOMEPAGE="http://docs.enthought.com/apptools/
 	https://github.com/enthought/apptools
-	https://pypi.python.org/pypi/apptools"
+	https://pypi.org/project/apptools"
 SRC_URI="http://www.enthought.com/repo/ets/${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/apptools/apptools-4.3.0.ebuild b/dev-python/apptools/apptools-4.3.0.ebuild
index 306ed75365d06..3673b071602e7 100644
--- a/dev-python/apptools/apptools-4.3.0.ebuild
+++ b/dev-python/apptools/apptools-4.3.0.ebuild
@@ -10,7 +10,7 @@ inherit distutils-r1 virtualx
 DESCRIPTION="Enthought Tool Suite: Application tools"
 HOMEPAGE="http://docs.enthought.com/apptools/
 	https://github.com/enthought/apptools
-	https://pypi.python.org/pypi/apptools"
+	https://pypi.org/project/apptools"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/aquarium/aquarium-2.3-r1.ebuild b/dev-python/aquarium/aquarium-2.3-r1.ebuild
index 5b951c0883b94..1d1be6ad4b042 100644
--- a/dev-python/aquarium/aquarium-2.3-r1.ebuild
+++ b/dev-python/aquarium/aquarium-2.3-r1.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 )
 inherit distutils-r1
 
 DESCRIPTION="Aquarium web application framework"
-HOMEPAGE="http://aquarium.sourceforge.net/ https://pypi.python.org/pypi/aquarium"
+HOMEPAGE="http://aquarium.sourceforge.net/ https://pypi.org/project/aquarium"
 SRC_URI="mirror://sourceforge/aquarium/${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/argcomplete/argcomplete-1.4.1.ebuild b/dev-python/argcomplete/argcomplete-1.4.1.ebuild
index 1713ddf9103c1..c0e16311ef2f9 100644
--- a/dev-python/argcomplete/argcomplete-1.4.1.ebuild
+++ b/dev-python/argcomplete/argcomplete-1.4.1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5} )
 inherit distutils-r1 bash-completion-r1
 
 DESCRIPTION="Bash tab completion for argparse"
-HOMEPAGE="https://pypi.python.org/pypi/argcomplete"
+HOMEPAGE="https://pypi.org/project/argcomplete"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
diff --git a/dev-python/argcomplete/argcomplete-1.9.2.ebuild b/dev-python/argcomplete/argcomplete-1.9.2.ebuild
index d5626745f23f9..3510477d00124 100644
--- a/dev-python/argcomplete/argcomplete-1.9.2.ebuild
+++ b/dev-python/argcomplete/argcomplete-1.9.2.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5} pypy pypy3 )
 inherit bash-completion-r1 distutils-r1
 
 DESCRIPTION="Bash tab completion for argparse"
-HOMEPAGE="https://pypi.python.org/pypi/argcomplete"
+HOMEPAGE="https://pypi.org/project/argcomplete"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
diff --git a/dev-python/argcomplete/argcomplete-1.9.4.ebuild b/dev-python/argcomplete/argcomplete-1.9.4.ebuild
index a696b02ca808f..fc18ea9403725 100644
--- a/dev-python/argcomplete/argcomplete-1.9.4.ebuild
+++ b/dev-python/argcomplete/argcomplete-1.9.4.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5} pypy pypy3 )
 inherit bash-completion-r1 distutils-r1
 
 DESCRIPTION="Bash tab completion for argparse"
-HOMEPAGE="https://pypi.python.org/pypi/argcomplete"
+HOMEPAGE="https://pypi.org/project/argcomplete"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
diff --git a/dev-python/arpeggio/arpeggio-1.5.ebuild b/dev-python/arpeggio/arpeggio-1.5.ebuild
index 997a6ce25fff7..3569d2f712be5 100644
--- a/dev-python/arpeggio/arpeggio-1.5.ebuild
+++ b/dev-python/arpeggio/arpeggio-1.5.ebuild
@@ -10,7 +10,7 @@ inherit distutils-r1
 MY_PN=Arpeggio
 MY_P=${MY_PN}-${PV}
 DESCRIPTION="Parser interpreter based on PEG grammars"
-HOMEPAGE="https://pypi.python.org/pypi/Arpeggio https://github.com/igordejanovic/Arpeggio"
+HOMEPAGE="https://pypi.org/project/Arpeggio https://github.com/igordejanovic/Arpeggio"
 SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 # pypi tarball omits tests
 RESTRICT="test"
diff --git a/dev-python/arrayterator/arrayterator-1.0.1-r1.ebuild b/dev-python/arrayterator/arrayterator-1.0.1-r1.ebuild
index dd2cf2fc735a6..e7f6731325fd9 100644
--- a/dev-python/arrayterator/arrayterator-1.0.1-r1.ebuild
+++ b/dev-python/arrayterator/arrayterator-1.0.1-r1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 )
 inherit distutils-r1
 
 DESCRIPTION="A buffered iterator for reading big arrays in small contiguous blocks"
-HOMEPAGE="https://pypi.python.org/pypi/arrayterator"
+HOMEPAGE="https://pypi.org/project/arrayterator"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/asn1crypto/asn1crypto-0.22.0.ebuild b/dev-python/asn1crypto/asn1crypto-0.22.0.ebuild
index 7d17ec13ec63d..fb7ed03b778a3 100644
--- a/dev-python/asn1crypto/asn1crypto-0.22.0.ebuild
+++ b/dev-python/asn1crypto/asn1crypto-0.22.0.ebuild
@@ -9,7 +9,7 @@ PYTHON_REQ_USE="threads(+)"
 inherit distutils-r1
 
 DESCRIPTION="Python ASN.1 library with a focus on performance and a pythonic API"
-HOMEPAGE="https://github.com/wbond/asn1crypto/ https://pypi.python.org/pypi/asn1crypto/"
+HOMEPAGE="https://github.com/wbond/asn1crypto/ https://pypi.org/project/asn1crypto/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/asn1crypto/asn1crypto-0.24.0.ebuild b/dev-python/asn1crypto/asn1crypto-0.24.0.ebuild
index 336dff9411439..7278bb79a6199 100644
--- a/dev-python/asn1crypto/asn1crypto-0.24.0.ebuild
+++ b/dev-python/asn1crypto/asn1crypto-0.24.0.ebuild
@@ -9,7 +9,7 @@ PYTHON_REQ_USE="threads(+)"
 inherit distutils-r1
 
 DESCRIPTION="Python ASN.1 library with a focus on performance and a pythonic API"
-HOMEPAGE="https://github.com/wbond/asn1crypto/ https://pypi.python.org/pypi/asn1crypto/"
+HOMEPAGE="https://github.com/wbond/asn1crypto/ https://pypi.org/project/asn1crypto/"
 # pypi tarball does not have tests
 SRC_URI="https://github.com/wbond/asn1crypto/archive/${PV}.tar.gz -> ${P}.gh.tar.gz"
 
diff --git a/dev-python/asset/asset-0.6.11.ebuild b/dev-python/asset/asset-0.6.11.ebuild
index cb84e9863a95c..7abb928040f4e 100644
--- a/dev-python/asset/asset-0.6.11.ebuild
+++ b/dev-python/asset/asset-0.6.11.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_4 python3_5 python3_6 )
 inherit distutils-r1
 
 DESCRIPTION="A package resource and symbol loading helper library"
-HOMEPAGE="https://pypi.python.org/pypi/asset https://github.com/metagriffin/asset"
+HOMEPAGE="https://pypi.org/project/asset https://github.com/metagriffin/asset"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
diff --git a/dev-python/astng/astng-0.24.3-r1.ebuild b/dev-python/astng/astng-0.24.3-r1.ebuild
index 60ae67ad32e1d..f90029b97c7a9 100644
--- a/dev-python/astng/astng-0.24.3-r1.ebuild
+++ b/dev-python/astng/astng-0.24.3-r1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy )
 inherit distutils-r1
 
 DESCRIPTION="Abstract Syntax Tree for logilab packages"
-HOMEPAGE="https://www.logilab.org/project/logilab-astng https://pypi.python.org/pypi/logilab-astng"
+HOMEPAGE="https://www.logilab.org/project/logilab-astng https://pypi.org/project/logilab-astng"
 SRC_URI="ftp://ftp.logilab.org/pub/astng/logilab-${P}.tar.gz mirror://pypi/l/logilab-astng/logilab-${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
diff --git a/dev-python/astng/astng-0.24.3.ebuild b/dev-python/astng/astng-0.24.3.ebuild
index 88fa9e8837cd1..9466adb6d03db 100644
--- a/dev-python/astng/astng-0.24.3.ebuild
+++ b/dev-python/astng/astng-0.24.3.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy )
 inherit distutils-r1
 
 DESCRIPTION="Abstract Syntax Tree for logilab packages"
-HOMEPAGE="https://www.logilab.org/project/logilab-astng https://pypi.python.org/pypi/logilab-astng"
+HOMEPAGE="https://www.logilab.org/project/logilab-astng https://pypi.org/project/logilab-astng"
 SRC_URI="ftp://ftp.logilab.org/pub/astng/logilab-${P}.tar.gz mirror://pypi/l/logilab-astng/logilab-${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
diff --git a/dev-python/astor/astor-0.5.ebuild b/dev-python/astor/astor-0.5.ebuild
index 312f4548ffb46..27a770957e12d 100644
--- a/dev-python/astor/astor-0.5.ebuild
+++ b/dev-python/astor/astor-0.5.ebuild
@@ -8,7 +8,7 @@ inherit distutils-r1
 
 DESCRIPTION="Read/rewrite/write Python ASTs"
 SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-HOMEPAGE="https://pypi.python.org/pypi/astor"
+HOMEPAGE="https://pypi.org/project/astor"
 
 LICENSE="BSD"
 SLOT="0"
diff --git a/dev-python/astor/astor-0.6.ebuild b/dev-python/astor/astor-0.6.ebuild
index c71904c78448f..bd8d335b0e398 100644
--- a/dev-python/astor/astor-0.6.ebuild
+++ b/dev-python/astor/astor-0.6.ebuild
@@ -8,7 +8,7 @@ inherit distutils-r1
 
 DESCRIPTION="Read/rewrite/write Python ASTs"
 SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-HOMEPAGE="https://pypi.python.org/pypi/astor"
+HOMEPAGE="https://pypi.org/project/astor"
 
 LICENSE="BSD"
 SLOT="0"
diff --git a/dev-python/astroid/astroid-1.4.8.ebuild b/dev-python/astroid/astroid-1.4.8.ebuild
index a036950a54645..826ca56910855 100644
--- a/dev-python/astroid/astroid-1.4.8.ebuild
+++ b/dev-python/astroid/astroid-1.4.8.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
 inherit distutils-r1
 
 DESCRIPTION="Abstract Syntax Tree for logilab packages"
-HOMEPAGE="https://bitbucket.org/logilab/astroid https://pypi.python.org/pypi/astroid"
+HOMEPAGE="https://bitbucket.org/logilab/astroid https://pypi.org/project/astroid"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
diff --git a/dev-python/astroid/astroid-1.5.3.ebuild b/dev-python/astroid/astroid-1.5.3.ebuild
index 69627547ec309..5c6114d4514cc 100644
--- a/dev-python/astroid/astroid-1.5.3.ebuild
+++ b/dev-python/astroid/astroid-1.5.3.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
 inherit distutils-r1
 
 DESCRIPTION="Abstract Syntax Tree for logilab packages"
-HOMEPAGE="https://bitbucket.org/logilab/astroid https://pypi.python.org/pypi/astroid"
+HOMEPAGE="https://bitbucket.org/logilab/astroid https://pypi.org/project/astroid"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
diff --git a/dev-python/astroid/astroid-1.6.0.ebuild b/dev-python/astroid/astroid-1.6.0.ebuild
index a9a7862bca135..5d7d8f5be47b7 100644
--- a/dev-python/astroid/astroid-1.6.0.ebuild
+++ b/dev-python/astroid/astroid-1.6.0.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
 inherit distutils-r1
 
 DESCRIPTION="Abstract Syntax Tree for logilab packages"
-HOMEPAGE="https://github.com/PyCQA/astroid https://pypi.python.org/pypi/astroid"
+HOMEPAGE="https://github.com/PyCQA/astroid https://pypi.org/project/astroid"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
diff --git a/dev-python/async/async-0.6.2.ebuild b/dev-python/async/async-0.6.2.ebuild
index c764d41bff7ae..4737f3a827da8 100644
--- a/dev-python/async/async-0.6.2.ebuild
+++ b/dev-python/async/async-0.6.2.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_4 python3_5 python3_6 )
 inherit distutils-r1
 
 DESCRIPTION="Async Framework"
-HOMEPAGE="https://pypi.python.org/pypi/async"
+HOMEPAGE="https://pypi.org/project/async"
 SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/attrs/attrs-16.3.0-r1.ebuild b/dev-python/attrs/attrs-16.3.0-r1.ebuild
index 901e5a5b218f8..4c286fdba1538 100644
--- a/dev-python/attrs/attrs-16.3.0-r1.ebuild
+++ b/dev-python/attrs/attrs-16.3.0-r1.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="Attributes without boilerplate"
 HOMEPAGE="
 	https://github.com/hynek/attrs
 	https://attrs.readthedocs.org/
-	https://pypi.python.org/pypi/attrs"
+	https://pypi.org/project/attrs"
 SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/attrs/attrs-17.4.0.ebuild b/dev-python/attrs/attrs-17.4.0.ebuild
index c6a349367e556..b2af1ea18627a 100644
--- a/dev-python/attrs/attrs-17.4.0.ebuild
+++ b/dev-python/attrs/attrs-17.4.0.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="Attributes without boilerplate"
 HOMEPAGE="
 	https://github.com/hynek/attrs
 	https://attrs.readthedocs.org/
-	https://pypi.python.org/pypi/attrs"
+	https://pypi.org/project/attrs"
 SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/audioread/audioread-1.0.1-r1.ebuild b/dev-python/audioread/audioread-1.0.1-r1.ebuild
index 5c8a480f88b7d..59c1bcf8b7101 100644
--- a/dev-python/audioread/audioread-1.0.1-r1.ebuild
+++ b/dev-python/audioread/audioread-1.0.1-r1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
 inherit distutils-r1
 
 DESCRIPTION="Module for decoding audio files using whichever backend is available"
-HOMEPAGE="https://pypi.python.org/pypi/audioread"
+HOMEPAGE="https://pypi.org/project/audioread"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/authres/authres-0.800.ebuild b/dev-python/authres/authres-0.800.ebuild
index a0fe736507b74..b71e8a6ef4508 100644
--- a/dev-python/authres/authres-0.800.ebuild
+++ b/dev-python/authres/authres-0.800.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy )
 inherit distutils-r1
 
 DESCRIPTION="Authentication Results Header Module"
-HOMEPAGE="https://launchpad.net/authentication-results-python https://pypi.python.org/pypi/authres"
+HOMEPAGE="https://launchpad.net/authentication-results-python https://pypi.org/project/authres"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
diff --git a/dev-python/autobahn/autobahn-17.10.1.ebuild b/dev-python/autobahn/autobahn-17.10.1.ebuild
index e972f02ab7fd3..b83d36f975ae1 100644
--- a/dev-python/autobahn/autobahn-17.10.1.ebuild
+++ b/dev-python/autobahn/autobahn-17.10.1.ebuild
@@ -10,7 +10,7 @@ inherit distutils-r1 versionator
 MY_P="${PN}-$(replace_version_separator 3 -)"
 
 DESCRIPTION="WebSocket and WAMP for Twisted and Asyncio"
-HOMEPAGE="https://pypi.python.org/pypi/autobahn
+HOMEPAGE="https://pypi.org/project/autobahn
 	https://crossbar.io/autobahn/
 	https://github.com/crossbario/autobahn-python"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
diff --git a/dev-python/autobahn/autobahn-17.5.1-r2.ebuild b/dev-python/autobahn/autobahn-17.5.1-r2.ebuild
index dd4792841261f..9067dc563bade 100644
--- a/dev-python/autobahn/autobahn-17.5.1-r2.ebuild
+++ b/dev-python/autobahn/autobahn-17.5.1-r2.ebuild
@@ -10,7 +10,7 @@ inherit distutils-r1 versionator
 MY_P="${PN}-$(replace_version_separator 3 -)"
 
 DESCRIPTION="WebSocket and WAMP for Twisted and Asyncio"
-HOMEPAGE="https://pypi.python.org/pypi/autobahn
+HOMEPAGE="https://pypi.org/project/autobahn
 	https://crossbar.io/autobahn/
 	https://github.com/crossbario/autobahn-python"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
diff --git a/dev-python/autobahn/autobahn-17.9.1.ebuild b/dev-python/autobahn/autobahn-17.9.1.ebuild
index e972f02ab7fd3..b83d36f975ae1 100644
--- a/dev-python/autobahn/autobahn-17.9.1.ebuild
+++ b/dev-python/autobahn/autobahn-17.9.1.ebuild
@@ -10,7 +10,7 @@ inherit distutils-r1 versionator
 MY_P="${PN}-$(replace_version_separator 3 -)"
 
 DESCRIPTION="WebSocket and WAMP for Twisted and Asyncio"
-HOMEPAGE="https://pypi.python.org/pypi/autobahn
+HOMEPAGE="https://pypi.org/project/autobahn
 	https://crossbar.io/autobahn/
 	https://github.com/crossbario/autobahn-python"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
diff --git a/dev-python/autobahn/autobahn-17.9.2.ebuild b/dev-python/autobahn/autobahn-17.9.2.ebuild
index e972f02ab7fd3..b83d36f975ae1 100644
--- a/dev-python/autobahn/autobahn-17.9.2.ebuild
+++ b/dev-python/autobahn/autobahn-17.9.2.ebuild
@@ -10,7 +10,7 @@ inherit distutils-r1 versionator
 MY_P="${PN}-$(replace_version_separator 3 -)"
 
 DESCRIPTION="WebSocket and WAMP for Twisted and Asyncio"
-HOMEPAGE="https://pypi.python.org/pypi/autobahn
+HOMEPAGE="https://pypi.org/project/autobahn
 	https://crossbar.io/autobahn/
 	https://github.com/crossbario/autobahn-python"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
diff --git a/dev-python/autobahn/autobahn-18.3.1.ebuild b/dev-python/autobahn/autobahn-18.3.1.ebuild
index 3c170dc307fe3..f283332faf250 100644
--- a/dev-python/autobahn/autobahn-18.3.1.ebuild
+++ b/dev-python/autobahn/autobahn-18.3.1.ebuild
@@ -10,7 +10,7 @@ inherit distutils-r1 versionator
 MY_P="${PN}-$(replace_version_separator 3 -)"
 
 DESCRIPTION="WebSocket and WAMP for Twisted and Asyncio"
-HOMEPAGE="https://pypi.python.org/pypi/autobahn
+HOMEPAGE="https://pypi.org/project/autobahn
 	https://crossbar.io/autobahn/
 	https://github.com/crossbario/autobahn-python"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
diff --git a/dev-python/automat/automat-0.5.0.ebuild b/dev-python/automat/automat-0.5.0.ebuild
index baaf55c92d309..a77e5ca024cca 100644
--- a/dev-python/automat/automat-0.5.0.ebuild
+++ b/dev-python/automat/automat-0.5.0.ebuild
@@ -10,7 +10,7 @@ MYPN="Automat"
 MYP="${MYPN}-${PV}"
 
 DESCRIPTION="Self-service finite-state machines for the programmer on the go"
-HOMEPAGE="https://github.com/glyph/automat https://pypi.python.org/pypi/Automat"
+HOMEPAGE="https://github.com/glyph/automat https://pypi.org/project/Automat"
 SRC_URI="mirror://pypi/${MYPN:0:1}/${MYPN}/${MYP}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/automat/automat-0.6.0.ebuild b/dev-python/automat/automat-0.6.0.ebuild
index f9c1a0275999a..fea781427c2ac 100644
--- a/dev-python/automat/automat-0.6.0.ebuild
+++ b/dev-python/automat/automat-0.6.0.ebuild
@@ -10,7 +10,7 @@ MYPN="Automat"
 MYP="${MYPN}-${PV}"
 
 DESCRIPTION="Self-service finite-state machines for the programmer on the go"
-HOMEPAGE="https://github.com/glyph/automat https://pypi.python.org/pypi/Automat"
+HOMEPAGE="https://github.com/glyph/automat https://pypi.org/project/Automat"
 SRC_URI="mirror://pypi/${MYPN:0:1}/${MYPN}/${MYP}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/automaton/automaton-0.8.0.ebuild b/dev-python/automaton/automaton-0.8.0.ebuild
index e2daf3b32f740..5693fca7f162c 100644
--- a/dev-python/automaton/automaton-0.8.0.ebuild
+++ b/dev-python/automaton/automaton-0.8.0.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
 inherit distutils-r1
 
 DESCRIPTION="Friendly state machines for python."
-HOMEPAGE="https://pypi.python.org/pypi/automaton"
+HOMEPAGE="https://pypi.org/project/automaton"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
diff --git a/dev-python/automaton/automaton-1.12.1.ebuild b/dev-python/automaton/automaton-1.12.1.ebuild
index d42f8e0e393a9..0cd3480185dc2 100644
--- a/dev-python/automaton/automaton-1.12.1.ebuild
+++ b/dev-python/automaton/automaton-1.12.1.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 python3_4 python3_5 python3_6 )
 inherit distutils-r1
 
 DESCRIPTION="Friendly state machines for python."
-HOMEPAGE="https://pypi.python.org/pypi/automaton"
+HOMEPAGE="https://pypi.org/project/automaton"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
diff --git a/dev-python/autopep8/autopep8-1.3.2.ebuild b/dev-python/autopep8/autopep8-1.3.2.ebuild
index feb7d88b55a6f..5c04122e04004 100644
--- a/dev-python/autopep8/autopep8-1.3.2.ebuild
+++ b/dev-python/autopep8/autopep8-1.3.2.ebuild
@@ -9,7 +9,7 @@ PYTHON_REQ_USE="threads(+)"
 inherit distutils-r1
 
 DESCRIPTION="Automatically formats Python code to conform to the PEP 8 style guide"
-HOMEPAGE="https://github.com/hhatto/autopep8 https://pypi.python.org/pypi/autopep8"
+HOMEPAGE="https://github.com/hhatto/autopep8 https://pypi.org/project/autopep8"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/autopep8/autopep8-1.3.3.ebuild b/dev-python/autopep8/autopep8-1.3.3.ebuild
index 32c6043fa9529..938bf36e30c1e 100644
--- a/dev-python/autopep8/autopep8-1.3.3.ebuild
+++ b/dev-python/autopep8/autopep8-1.3.3.ebuild
@@ -9,7 +9,7 @@ PYTHON_REQ_USE="threads(+)"
 inherit distutils-r1
 
 DESCRIPTION="Automatically formats Python code to conform to the PEP 8 style guide"
-HOMEPAGE="https://github.com/hhatto/autopep8 https://pypi.python.org/pypi/autopep8"
+HOMEPAGE="https://github.com/hhatto/autopep8 https://pypi.org/project/autopep8"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/autopep8/autopep8-9999.ebuild b/dev-python/autopep8/autopep8-9999.ebuild
index 82b8a5ea9078c..fee2230def65e 100644
--- a/dev-python/autopep8/autopep8-9999.ebuild
+++ b/dev-python/autopep8/autopep8-9999.ebuild
@@ -8,7 +8,7 @@ PYTHON_REQ_USE="threads(+)"
 inherit distutils-r1 git-2
 
 DESCRIPTION="Automatically formats Python code to conform to the PEP 8 style guide"
-HOMEPAGE="https://github.com/hhatto/autopep8 https://pypi.python.org/pypi/autopep8"
+HOMEPAGE="https://github.com/hhatto/autopep8 https://pypi.org/project/autopep8"
 SRC_URI=""
 EGIT_REPO_URI="https://github.com/hhatto/${PN}.git"
 
diff --git a/dev-python/awscli/awscli-1.10.51.ebuild b/dev-python/awscli/awscli-1.10.51.ebuild
index e3944893caaef..0d128e1e1ec86 100644
--- a/dev-python/awscli/awscli-1.10.51.ebuild
+++ b/dev-python/awscli/awscli-1.10.51.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5} )
 inherit distutils-r1
 
 DESCRIPTION="Universal Command Line Environment for AWS"
-HOMEPAGE="https://pypi.python.org/pypi/awscli"
+HOMEPAGE="https://pypi.org/project/awscli"
 SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
diff --git a/dev-python/awscli/awscli-1.10.53.ebuild b/dev-python/awscli/awscli-1.10.53.ebuild
index e3944893caaef..0d128e1e1ec86 100644
--- a/dev-python/awscli/awscli-1.10.53.ebuild
+++ b/dev-python/awscli/awscli-1.10.53.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5} )
 inherit distutils-r1
 
 DESCRIPTION="Universal Command Line Environment for AWS"
-HOMEPAGE="https://pypi.python.org/pypi/awscli"
+HOMEPAGE="https://pypi.org/project/awscli"
 SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
diff --git a/dev-python/awscli/awscli-1.10.59.ebuild b/dev-python/awscli/awscli-1.10.59.ebuild
index e3944893caaef..0d128e1e1ec86 100644
--- a/dev-python/awscli/awscli-1.10.59.ebuild
+++ b/dev-python/awscli/awscli-1.10.59.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5} )
 inherit distutils-r1
 
 DESCRIPTION="Universal Command Line Environment for AWS"
-HOMEPAGE="https://pypi.python.org/pypi/awscli"
+HOMEPAGE="https://pypi.org/project/awscli"
 SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
diff --git a/dev-python/awscli/awscli-1.11.0.ebuild b/dev-python/awscli/awscli-1.11.0.ebuild
index d52c26c522bb2..f0d4235ecc883 100644
--- a/dev-python/awscli/awscli-1.11.0.ebuild
+++ b/dev-python/awscli/awscli-1.11.0.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5} )
 inherit distutils-r1
 
 DESCRIPTION="Universal Command Line Environment for AWS"
-HOMEPAGE="https://pypi.python.org/pypi/awscli"
+HOMEPAGE="https://pypi.org/project/awscli"
 SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
diff --git a/dev-python/awscli/awscli-1.11.154.ebuild b/dev-python/awscli/awscli-1.11.154.ebuild
index b4f55ea2c62f1..c5dcf73ed1a00 100644
--- a/dev-python/awscli/awscli-1.11.154.ebuild
+++ b/dev-python/awscli/awscli-1.11.154.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5} )
 inherit distutils-r1
 
 DESCRIPTION="Universal Command Line Environment for AWS"
-HOMEPAGE="https://pypi.python.org/pypi/awscli"
+HOMEPAGE="https://pypi.org/project/awscli"
 SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
diff --git a/dev-python/awscli/awscli-1.11.158.ebuild b/dev-python/awscli/awscli-1.11.158.ebuild
index b4f55ea2c62f1..c5dcf73ed1a00 100644
--- a/dev-python/awscli/awscli-1.11.158.ebuild
+++ b/dev-python/awscli/awscli-1.11.158.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5} )
 inherit distutils-r1
 
 DESCRIPTION="Universal Command Line Environment for AWS"
-HOMEPAGE="https://pypi.python.org/pypi/awscli"
+HOMEPAGE="https://pypi.org/project/awscli"
 SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
diff --git a/dev-python/awscli/awscli-1.11.81.ebuild b/dev-python/awscli/awscli-1.11.81.ebuild
index d52c26c522bb2..f0d4235ecc883 100644
--- a/dev-python/awscli/awscli-1.11.81.ebuild
+++ b/dev-python/awscli/awscli-1.11.81.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5} )
 inherit distutils-r1
 
 DESCRIPTION="Universal Command Line Environment for AWS"
-HOMEPAGE="https://pypi.python.org/pypi/awscli"
+HOMEPAGE="https://pypi.org/project/awscli"
 SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
diff --git a/dev-python/awscli/awscli-1.14.16.ebuild b/dev-python/awscli/awscli-1.14.16.ebuild
index 626a8269c9dd6..14819b4ab67cb 100644
--- a/dev-python/awscli/awscli-1.14.16.ebuild
+++ b/dev-python/awscli/awscli-1.14.16.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5} )
 inherit distutils-r1
 
 DESCRIPTION="Universal Command Line Environment for AWS"
-HOMEPAGE="https://pypi.python.org/pypi/awscli"
+HOMEPAGE="https://pypi.org/project/awscli"
 SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
diff --git a/dev-python/awscli/awscli-1.14.50.ebuild b/dev-python/awscli/awscli-1.14.50.ebuild
index 09f1db16250d4..bdc5b7aa5a65a 100644
--- a/dev-python/awscli/awscli-1.14.50.ebuild
+++ b/dev-python/awscli/awscli-1.14.50.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5} )
 inherit distutils-r1
 
 DESCRIPTION="Universal Command Line Environment for AWS"
-HOMEPAGE="https://pypi.python.org/pypi/awscli"
+HOMEPAGE="https://pypi.org/project/awscli"
 SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
diff --git a/dev-python/axiom/axiom-0.7.2.ebuild b/dev-python/axiom/axiom-0.7.2.ebuild
index 4acc9f2a7e40b..e9c17169d3013 100644
--- a/dev-python/axiom/axiom-0.7.2.ebuild
+++ b/dev-python/axiom/axiom-0.7.2.ebuild
@@ -8,7 +8,7 @@ PYTHON_REQ_USE="sqlite"
 inherit twisted-r1
 
 DESCRIPTION="Object database implemented on top of SQLite"
-HOMEPAGE="https://github.com/twisted/axiom https://pypi.python.org/pypi/Axiom"
+HOMEPAGE="https://github.com/twisted/axiom https://pypi.org/project/Axiom"
 SRC_URI="mirror://pypi/${TWISTED_PN:0:1}/${TWISTED_PN}/${TWISTED_P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/axiom/axiom-0.7.5.ebuild b/dev-python/axiom/axiom-0.7.5.ebuild
index 65bc7c38689b4..640644c91a7a3 100644
--- a/dev-python/axiom/axiom-0.7.5.ebuild
+++ b/dev-python/axiom/axiom-0.7.5.ebuild
@@ -8,7 +8,7 @@ PYTHON_REQ_USE="sqlite"
 inherit twisted-r1
 
 DESCRIPTION="Object database implemented on top of SQLite"
-HOMEPAGE="https://github.com/twisted/axiom https://pypi.python.org/pypi/Axiom"
+HOMEPAGE="https://github.com/twisted/axiom https://pypi.org/project/Axiom"
 SRC_URI="mirror://pypi/${TWISTED_PN:0:1}/${TWISTED_PN}/${TWISTED_P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/babelfish/babelfish-0.5.5-r1.ebuild b/dev-python/babelfish/babelfish-0.5.5-r1.ebuild
index 45a530fbae290..f478e9bb193f3 100644
--- a/dev-python/babelfish/babelfish-0.5.5-r1.ebuild
+++ b/dev-python/babelfish/babelfish-0.5.5-r1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy )
 inherit distutils-r1
 
 DESCRIPTION="Python library to work with countries and languages"
-HOMEPAGE="https://github.com/Diaoul/babelfish https://pypi.python.org/pypi/babelfish"
+HOMEPAGE="https://github.com/Diaoul/babelfish https://pypi.org/project/babelfish"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/babelfish/babelfish-9999.ebuild b/dev-python/babelfish/babelfish-9999.ebuild
index 9cdc6f9ff39c4..d1acbf41eb041 100644
--- a/dev-python/babelfish/babelfish-9999.ebuild
+++ b/dev-python/babelfish/babelfish-9999.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy )
 inherit distutils-r1 git-r3
 
 DESCRIPTION="Python library to work with countries and languages"
-HOMEPAGE="https://github.com/Diaoul/babelfish https://pypi.python.org/pypi/babelfish"
+HOMEPAGE="https://github.com/Diaoul/babelfish https://pypi.org/project/babelfish"
 EGIT_REPO_URI="https://github.com/Diaoul/${PN}.git"
 
 LICENSE="BSD"
diff --git a/dev-python/backports-abc/backports-abc-0.4.ebuild b/dev-python/backports-abc/backports-abc-0.4.ebuild
index 16df573270ad4..4b7bd71a7270e 100644
--- a/dev-python/backports-abc/backports-abc-0.4.ebuild
+++ b/dev-python/backports-abc/backports-abc-0.4.ebuild
@@ -11,7 +11,7 @@ MY_PN=${PN/-/_}
 MY_P=${MY_PN}-${PV}
 
 DESCRIPTION="Backport of Python 3.5's 'collections.abc' module"
-HOMEPAGE="https://github.com/cython/backports_abc https://pypi.python.org/pypi/backports_abc/"
+HOMEPAGE="https://github.com/cython/backports_abc https://pypi.org/project/backports_abc/"
 SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="PSF-2"
diff --git a/dev-python/backports-abc/backports-abc-0.5.ebuild b/dev-python/backports-abc/backports-abc-0.5.ebuild
index 828b179ba3612..a94847026e9a1 100644
--- a/dev-python/backports-abc/backports-abc-0.5.ebuild
+++ b/dev-python/backports-abc/backports-abc-0.5.ebuild
@@ -11,7 +11,7 @@ MY_PN=${PN/-/_}
 MY_P=${MY_PN}-${PV}
 
 DESCRIPTION="Backport of Python 3.5's 'collections.abc' module"
-HOMEPAGE="https://github.com/cython/backports_abc https://pypi.python.org/pypi/backports_abc/"
+HOMEPAGE="https://github.com/cython/backports_abc https://pypi.org/project/backports_abc/"
 SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="PSF-2"
diff --git a/dev-python/backports-csv/backports-csv-1.0.5.ebuild b/dev-python/backports-csv/backports-csv-1.0.5.ebuild
index f4ea47f10e5e3..0a7641ab95558 100644
--- a/dev-python/backports-csv/backports-csv-1.0.5.ebuild
+++ b/dev-python/backports-csv/backports-csv-1.0.5.ebuild
@@ -11,7 +11,7 @@ MY_PN=${PN/-/.}
 MY_P=${MY_PN}-${PV}
 
 DESCRIPTION="Backport of Python 3's 'csv' module"
-HOMEPAGE="https://github.com/ryanhiebert/backports.csv https://pypi.python.org/pypi/backports.csv/"
+HOMEPAGE="https://github.com/ryanhiebert/backports.csv https://pypi.org/project/backports.csv/"
 SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="PSF-2"
diff --git a/dev-python/backports-lzma/backports-lzma-0.0.10.ebuild b/dev-python/backports-lzma/backports-lzma-0.0.10.ebuild
index 04e71a2f6bb3e..b13250bc79f17 100644
--- a/dev-python/backports-lzma/backports-lzma-0.0.10.ebuild
+++ b/dev-python/backports-lzma/backports-lzma-0.0.10.ebuild
@@ -11,7 +11,7 @@ MY_PN=${PN/-/.}
 MY_P=${MY_PN}-${PV}
 
 DESCRIPTION="Backport of Python 3.3's lzma module for XZ/LZMA compressed files"
-HOMEPAGE="https://github.com/peterjc/backports.lzma/ https://pypi.python.org/pypi/backports.lzma/"
+HOMEPAGE="https://github.com/peterjc/backports.lzma/ https://pypi.org/project/backports.lzma/"
 SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/backports-lzma/backports-lzma-0.0.6.ebuild b/dev-python/backports-lzma/backports-lzma-0.0.6.ebuild
index eafe17743b957..5d5a9dbde4ed5 100644
--- a/dev-python/backports-lzma/backports-lzma-0.0.6.ebuild
+++ b/dev-python/backports-lzma/backports-lzma-0.0.6.ebuild
@@ -11,7 +11,7 @@ MY_PN=${PN/-/.}
 MY_P=${MY_PN}-${PV}
 
 DESCRIPTION="Backport of Python 3.3's lzma module for XZ/LZMA compressed files"
-HOMEPAGE="https://github.com/peterjc/backports.lzma/ https://pypi.python.org/pypi/backports.lzma/"
+HOMEPAGE="https://github.com/peterjc/backports.lzma/ https://pypi.org/project/backports.lzma/"
 SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/backports-lzma/backports-lzma-0.0.8.ebuild b/dev-python/backports-lzma/backports-lzma-0.0.8.ebuild
index 3672e2232c4f0..a2149d72d136c 100644
--- a/dev-python/backports-lzma/backports-lzma-0.0.8.ebuild
+++ b/dev-python/backports-lzma/backports-lzma-0.0.8.ebuild
@@ -11,7 +11,7 @@ MY_PN=${PN/-/.}
 MY_P=${MY_PN}-${PV}
 
 DESCRIPTION="Backport of Python 3.3's lzma module for XZ/LZMA compressed files"
-HOMEPAGE="https://github.com/peterjc/backports.lzma/ https://pypi.python.org/pypi/backports.lzma/"
+HOMEPAGE="https://github.com/peterjc/backports.lzma/ https://pypi.org/project/backports.lzma/"
 SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/backports-shutil_get_terminal_size/backports-shutil_get_terminal_size-1.0.0-r1.ebuild b/dev-python/backports-shutil_get_terminal_size/backports-shutil_get_terminal_size-1.0.0-r1.ebuild
index 722c9c871821e..1e2ab25acb17f 100644
--- a/dev-python/backports-shutil_get_terminal_size/backports-shutil_get_terminal_size-1.0.0-r1.ebuild
+++ b/dev-python/backports-shutil_get_terminal_size/backports-shutil_get_terminal_size-1.0.0-r1.ebuild
@@ -11,7 +11,7 @@ MY_PN="backports.shutil_get_terminal_size"
 MY_P="${MY_PN}-${PV}"
 
 DESCRIPTION="A backport of the get_terminal_size function from Python 3.3's shutil"
-HOMEPAGE="https://pypi.python.org/pypi/backports.shutil_get_terminal_size/ https://github.com/chrippa/backports.shutil_get_terminal_size"
+HOMEPAGE="https://pypi.org/project/backports.shutil_get_terminal_size/ https://github.com/chrippa/backports.shutil_get_terminal_size"
 SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 SLOT="0"
diff --git a/dev-python/backports-shutil_which/backports-shutil_which-3.5.1.ebuild b/dev-python/backports-shutil_which/backports-shutil_which-3.5.1.ebuild
index 0cd9c8c8822ac..abe245de1db72 100644
--- a/dev-python/backports-shutil_which/backports-shutil_which-3.5.1.ebuild
+++ b/dev-python/backports-shutil_which/backports-shutil_which-3.5.1.ebuild
@@ -11,7 +11,7 @@ MY_PN="backports.shutil_which"
 MY_P="${MY_PN}-${PV}"
 
 DESCRIPTION="Backport of shutil.which from Python 3.3"
-HOMEPAGE="https://pypi.python.org/pypi/backports.shutil_which/ https://github.com/minrk/backports.shutil_which"
+HOMEPAGE="https://pypi.org/project/backports.shutil_which/ https://github.com/minrk/backports.shutil_which"
 SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/backports-ssl-match-hostname/backports-ssl-match-hostname-3.5.0.1-r1.ebuild b/dev-python/backports-ssl-match-hostname/backports-ssl-match-hostname-3.5.0.1-r1.ebuild
index 4dd8fea7e3799..6c35269e40833 100644
--- a/dev-python/backports-ssl-match-hostname/backports-ssl-match-hostname-3.5.0.1-r1.ebuild
+++ b/dev-python/backports-ssl-match-hostname/backports-ssl-match-hostname-3.5.0.1-r1.ebuild
@@ -13,7 +13,7 @@ MY_PN=${MY_PN//-/_}
 MY_P=${MY_PN}-${PV}
 
 DESCRIPTION="Backport of the ssl.match_hostname function"
-HOMEPAGE="https://pypi.python.org/pypi/backports.ssl_match_hostname/"
+HOMEPAGE="https://pypi.org/project/backports.ssl_match_hostname/"
 SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="PYTHON"
diff --git a/dev-python/backports/backports-1.0.ebuild b/dev-python/backports/backports-1.0.ebuild
index 7bde284e08b86..f24a0fd50a3ae 100644
--- a/dev-python/backports/backports-1.0.ebuild
+++ b/dev-python/backports/backports-1.0.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy{,3} )
 inherit distutils-r1
 
 DESCRIPTION="Namespace for backported Python features"
-HOMEPAGE="https://bitbucket.org/brandon/backports https://pypi.python.org/pypi/backports/"
+HOMEPAGE="https://bitbucket.org/brandon/backports https://pypi.org/project/backports/"
 SRC_URI="https://dev.gentoo.org/~radhermit/dist/${P}.tar.gz"
 
 LICENSE="PYTHON"
diff --git a/dev-python/basemap/basemap-1.0.7-r1.ebuild b/dev-python/basemap/basemap-1.0.7-r1.ebuild
index 76c9e0b13bef2..13bc34601973b 100644
--- a/dev-python/basemap/basemap-1.0.7-r1.ebuild
+++ b/dev-python/basemap/basemap-1.0.7-r1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 )
 inherit distutils-r1 flag-o-matic
 
 DESCRIPTION="matplotlib toolkit to plot map projections"
-HOMEPAGE="https://matplotlib.org/basemap/ https://pypi.python.org/pypi/basemap"
+HOMEPAGE="https://matplotlib.org/basemap/ https://pypi.org/project/basemap"
 SRC_URI="mirror://sourceforge/matplotlib/${P}.tar.gz"
 
 IUSE="examples test"
diff --git a/dev-python/basemap/basemap-1.0.7-r2.ebuild b/dev-python/basemap/basemap-1.0.7-r2.ebuild
index 141f8ca4c397f..740a68fea772d 100644
--- a/dev-python/basemap/basemap-1.0.7-r2.ebuild
+++ b/dev-python/basemap/basemap-1.0.7-r2.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 )
 inherit distutils-r1 flag-o-matic
 
 DESCRIPTION="matplotlib toolkit to plot map projections"
-HOMEPAGE="https://matplotlib.org/basemap/ https://pypi.python.org/pypi/basemap"
+HOMEPAGE="https://matplotlib.org/basemap/ https://pypi.org/project/basemap"
 SRC_URI="mirror://sourceforge/matplotlib/${P}.tar.gz"
 
 IUSE="examples test"
diff --git a/dev-python/bashate/bashate-0.3.1.ebuild b/dev-python/bashate/bashate-0.3.1.ebuild
index e49ef7048d410..a07b21fba5fd7 100644
--- a/dev-python/bashate/bashate-0.3.1.ebuild
+++ b/dev-python/bashate/bashate-0.3.1.ebuild
@@ -11,7 +11,7 @@ RESTRICT="test"
 inherit distutils-r1
 
 DESCRIPTION="A pep8 equivalent for bash scripts"
-HOMEPAGE="https://pypi.python.org/pypi/bashate"
+HOMEPAGE="https://pypi.org/project/bashate"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
diff --git a/dev-python/batinfo/batinfo-0.3.ebuild b/dev-python/batinfo/batinfo-0.3.ebuild
index 091359c296f12..e4d4b202c6645 100644
--- a/dev-python/batinfo/batinfo-0.3.ebuild
+++ b/dev-python/batinfo/batinfo-0.3.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_{4,5}} pypy pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="A simple Python lib to retreive battery information"
-HOMEPAGE="https://github.com/nicolargo/batinfo https://pypi.python.org/pypi/batinfo"
+HOMEPAGE="https://github.com/nicolargo/batinfo https://pypi.org/project/batinfo"
 SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
diff --git a/dev-python/bcrypt/bcrypt-3.1.3.ebuild b/dev-python/bcrypt/bcrypt-3.1.3.ebuild
index ba02d54791934..39ac8dad25f76 100644
--- a/dev-python/bcrypt/bcrypt-3.1.3.ebuild
+++ b/dev-python/bcrypt/bcrypt-3.1.3.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
 inherit distutils-r1
 
 DESCRIPTION="Modern password hashing for software and servers"
-HOMEPAGE="https://github.com/pyca/bcrypt/ https://pypi.python.org/pypi/bcrypt/"
+HOMEPAGE="https://github.com/pyca/bcrypt/ https://pypi.org/project/bcrypt/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
diff --git a/dev-python/bcrypt/bcrypt-3.1.4.ebuild b/dev-python/bcrypt/bcrypt-3.1.4.ebuild
index 4e5976fdc3bed..b6d7ccfdfa8a3 100644
--- a/dev-python/bcrypt/bcrypt-3.1.4.ebuild
+++ b/dev-python/bcrypt/bcrypt-3.1.4.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
 inherit distutils-r1
 
 DESCRIPTION="Modern password hashing for software and servers"
-HOMEPAGE="https://github.com/pyca/bcrypt/ https://pypi.python.org/pypi/bcrypt/"
+HOMEPAGE="https://github.com/pyca/bcrypt/ https://pypi.org/project/bcrypt/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
diff --git a/dev-python/beaker/beaker-1.6.4-r1.ebuild b/dev-python/beaker/beaker-1.6.4-r1.ebuild
index 236d2b83db9cc..86c2bf9b7295d 100644
--- a/dev-python/beaker/beaker-1.6.4-r1.ebuild
+++ b/dev-python/beaker/beaker-1.6.4-r1.ebuild
@@ -12,7 +12,7 @@ MY_PN="Beaker"
 MY_P="${MY_PN}-${PV}"
 
 DESCRIPTION="A Session and Caching library with WSGI Middleware"
-HOMEPAGE="http://beaker.groovie.org/ https://pypi.python.org/pypi/Beaker"
+HOMEPAGE="http://beaker.groovie.org/ https://pypi.org/project/Beaker"
 SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/beaker/beaker-1.8.1.ebuild b/dev-python/beaker/beaker-1.8.1.ebuild
index 52927d4be2040..5bf10454427b4 100644
--- a/dev-python/beaker/beaker-1.8.1.ebuild
+++ b/dev-python/beaker/beaker-1.8.1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_{4,5}} )
 inherit distutils-r1
 
 DESCRIPTION="A Session and Caching library with WSGI Middleware"
-HOMEPAGE="https://github.com/bbangert/beaker https://pypi.python.org/pypi/Beaker"
+HOMEPAGE="https://github.com/bbangert/beaker https://pypi.org/project/Beaker"
 # pypi tarball lacks tests
 SRC_URI="https://github.com/bbangert/beaker/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
diff --git a/dev-python/beanstalkc/beanstalkc-0.4.0-r1.ebuild b/dev-python/beanstalkc/beanstalkc-0.4.0-r1.ebuild
index 912483f078766..f7e8aa4b0ea58 100644
--- a/dev-python/beanstalkc/beanstalkc-0.4.0-r1.ebuild
+++ b/dev-python/beanstalkc/beanstalkc-0.4.0-r1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 pypy )
 inherit distutils-r1
 
 DESCRIPTION="A simple beanstalkd client library"
-HOMEPAGE="https://github.com/earl/beanstalkc https://pypi.python.org/pypi/beanstalkc"
+HOMEPAGE="https://github.com/earl/beanstalkc https://pypi.org/project/beanstalkc"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
diff --git a/dev-python/beanstalkc/beanstalkc-0.4.0.ebuild b/dev-python/beanstalkc/beanstalkc-0.4.0.ebuild
index 0edc55a36c3c6..1fb32354eeeba 100644
--- a/dev-python/beanstalkc/beanstalkc-0.4.0.ebuild
+++ b/dev-python/beanstalkc/beanstalkc-0.4.0.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 )
 inherit distutils-r1
 
 DESCRIPTION="A simple beanstalkd client library"
-HOMEPAGE="https://github.com/earl/beanstalkc https://pypi.python.org/pypi/beanstalkc"
+HOMEPAGE="https://github.com/earl/beanstalkc https://pypi.org/project/beanstalkc"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
diff --git a/dev-python/beautifulsoup/beautifulsoup-3.2.1-r1.ebuild b/dev-python/beautifulsoup/beautifulsoup-3.2.1-r1.ebuild
index 7f5f5b9ba5ce2..462a34a35f086 100644
--- a/dev-python/beautifulsoup/beautifulsoup-3.2.1-r1.ebuild
+++ b/dev-python/beautifulsoup/beautifulsoup-3.2.1-r1.ebuild
@@ -10,7 +10,7 @@ MY_PN="BeautifulSoup"
 MY_P="${MY_PN}-${PV}"
 
 DESCRIPTION="HTML/XML parser for quick-turnaround applications like screen-scraping"
-HOMEPAGE="https://www.crummy.com/software/BeautifulSoup/ https://pypi.python.org/pypi/BeautifulSoup"
+HOMEPAGE="https://www.crummy.com/software/BeautifulSoup/ https://pypi.org/project/BeautifulSoup"
 SRC_URI="https://www.crummy.com/software/${MY_PN}/download/3.x/${MY_P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/beautifulsoup/beautifulsoup-4.5.1.ebuild b/dev-python/beautifulsoup/beautifulsoup-4.5.1.ebuild
index f6afbb69b4da7..2ff59864aee0e 100644
--- a/dev-python/beautifulsoup/beautifulsoup-4.5.1.ebuild
+++ b/dev-python/beautifulsoup/beautifulsoup-4.5.1.ebuild
@@ -12,7 +12,7 @@ MY_P=${MY_PN}-${PV}
 
 DESCRIPTION="Provides pythonic idioms for iterating, searching, and modifying an HTML/XML parse tree"
 HOMEPAGE="https://bugs.launchpad.net/beautifulsoup/
-	https://pypi.python.org/pypi/beautifulsoup4"
+	https://pypi.org/project/beautifulsoup4"
 SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/bert/bert-2.0.0.ebuild b/dev-python/bert/bert-2.0.0.ebuild
index 7e1bb786f7afd..09e59f1e8cc2f 100644
--- a/dev-python/bert/bert-2.0.0.ebuild
+++ b/dev-python/bert/bert-2.0.0.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5} )
 inherit distutils-r1
 
 DESCRIPTION="BERT Serialization Library"
-HOMEPAGE="https://pypi.python.org/pypi/bert"
+HOMEPAGE="https://pypi.org/project/bert"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
diff --git a/dev-python/billiard/billiard-3.3.0.23.ebuild b/dev-python/billiard/billiard-3.3.0.23.ebuild
index 1aacacb2ae699..4ee96e84df830 100644
--- a/dev-python/billiard/billiard-3.3.0.23.ebuild
+++ b/dev-python/billiard/billiard-3.3.0.23.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5} pypy pypy3 )
 inherit distutils-r1 flag-o-matic
 
 DESCRIPTION="Python multiprocessing fork"
-HOMEPAGE="https://pypi.python.org/pypi/billiard https://github.com/celery/billiard"
+HOMEPAGE="https://pypi.org/project/billiard https://github.com/celery/billiard"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/billiard/billiard-3.5.0.0.ebuild b/dev-python/billiard/billiard-3.5.0.0.ebuild
index c5b0093796809..f47d6ac951a3f 100644
--- a/dev-python/billiard/billiard-3.5.0.0.ebuild
+++ b/dev-python/billiard/billiard-3.5.0.0.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
 inherit distutils-r1 flag-o-matic
 
 DESCRIPTION="Python multiprocessing fork"
-HOMEPAGE="https://pypi.python.org/pypi/billiard https://github.com/celery/billiard"
+HOMEPAGE="https://pypi.org/project/billiard https://github.com/celery/billiard"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/billiard/billiard-3.5.0.2.ebuild b/dev-python/billiard/billiard-3.5.0.2.ebuild
index c5625cdcc13a5..c2dbb24089d88 100644
--- a/dev-python/billiard/billiard-3.5.0.2.ebuild
+++ b/dev-python/billiard/billiard-3.5.0.2.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
 inherit distutils-r1 flag-o-matic
 
 DESCRIPTION="Python multiprocessing fork"
-HOMEPAGE="https://pypi.python.org/pypi/billiard https://github.com/celery/billiard"
+HOMEPAGE="https://pypi.org/project/billiard https://github.com/celery/billiard"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/biplist/biplist-1.0.1.ebuild b/dev-python/biplist/biplist-1.0.1.ebuild
index 7a2b1df19f836..d15927d0d0d54 100644
--- a/dev-python/biplist/biplist-1.0.1.ebuild
+++ b/dev-python/biplist/biplist-1.0.1.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy )
 inherit distutils-r1
 
 DESCRIPTION="A binary plist parser/generator for Python"
-HOMEPAGE="https://pypi.python.org/pypi/biplist/ https://github.com/wooster/biplist"
+HOMEPAGE="https://pypi.org/project/biplist/ https://github.com/wooster/biplist"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 KEYWORDS="amd64 x86"
 IUSE="test"
diff --git a/dev-python/biplist/biplist-1.0.2.ebuild b/dev-python/biplist/biplist-1.0.2.ebuild
index d3a18dd6d5a8a..4591a179e9a97 100644
--- a/dev-python/biplist/biplist-1.0.2.ebuild
+++ b/dev-python/biplist/biplist-1.0.2.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy )
 inherit distutils-r1
 
 DESCRIPTION="A binary plist parser/generator for Python"
-HOMEPAGE="https://pypi.python.org/pypi/biplist/ https://github.com/wooster/biplist"
+HOMEPAGE="https://pypi.org/project/biplist/ https://github.com/wooster/biplist"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 KEYWORDS="~amd64 ~x86"
 IUSE="test"
diff --git a/dev-python/bitarray/bitarray-0.8.1.ebuild b/dev-python/bitarray/bitarray-0.8.1.ebuild
index 13dc3ca656d81..594f89e2d55e8 100644
--- a/dev-python/bitarray/bitarray-0.8.1.ebuild
+++ b/dev-python/bitarray/bitarray-0.8.1.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=(python{2_7,3_4,3_5,3_6})
 inherit distutils-r1
 
 DESCRIPTION="efficient arrays of booleans -- C extension"
-HOMEPAGE="https://github.com/ilanschnell/bitarray https://pypi.python.org/pypi/bitarray"
+HOMEPAGE="https://github.com/ilanschnell/bitarray https://pypi.org/project/bitarray"
 SRC_URI="mirror://pypi/b/${PN}/${P}.tar.gz"
 
 SLOT="0"
diff --git a/dev-python/bjoern/bjoern-1.3.2.ebuild b/dev-python/bjoern/bjoern-1.3.2.ebuild
index b9cc335571750..dacd8ac896f57 100644
--- a/dev-python/bjoern/bjoern-1.3.2.ebuild
+++ b/dev-python/bjoern/bjoern-1.3.2.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 )
 inherit distutils-r1
 
 DESCRIPTION="A screamingly fast Python WSGI server written in C"
-HOMEPAGE="https://github.com/jonashaag/bjoern https://pypi.python.org/pypi/bjoern/"
+HOMEPAGE="https://github.com/jonashaag/bjoern https://pypi.org/project/bjoern/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD-2"
diff --git a/dev-python/bjoern/bjoern-1.4.3.ebuild b/dev-python/bjoern/bjoern-1.4.3.ebuild
index 39a4def0e5280..4f7f95d7ae1b5 100644
--- a/dev-python/bjoern/bjoern-1.4.3.ebuild
+++ b/dev-python/bjoern/bjoern-1.4.3.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 )
 inherit distutils-r1
 
 DESCRIPTION="A screamingly fast Python WSGI server written in C"
-HOMEPAGE="https://github.com/jonashaag/bjoern https://pypi.python.org/pypi/bjoern/"
+HOMEPAGE="https://github.com/jonashaag/bjoern https://pypi.org/project/bjoern/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD-2"
diff --git a/dev-python/bleach/bleach-1.5.0.ebuild b/dev-python/bleach/bleach-1.5.0.ebuild
index d2ba5b19dee31..3ed216f9a575c 100644
--- a/dev-python/bleach/bleach-1.5.0.ebuild
+++ b/dev-python/bleach/bleach-1.5.0.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy{,3} )
 inherit distutils-r1
 
 DESCRIPTION="an easy whitelist-based HTML-sanitizing tool"
-HOMEPAGE="https://github.com/mozilla/bleach https://pypi.python.org/pypi/bleach"
+HOMEPAGE="https://github.com/mozilla/bleach https://pypi.org/project/bleach"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
diff --git a/dev-python/bleach/bleach-2.1.1.ebuild b/dev-python/bleach/bleach-2.1.1.ebuild
index 7d6101cf43a6d..d662a702cba11 100644
--- a/dev-python/bleach/bleach-2.1.1.ebuild
+++ b/dev-python/bleach/bleach-2.1.1.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy{,3} )
 inherit distutils-r1
 
 DESCRIPTION="an easy whitelist-based HTML-sanitizing tool"
-HOMEPAGE="https://github.com/mozilla/bleach https://pypi.python.org/pypi/bleach"
+HOMEPAGE="https://github.com/mozilla/bleach https://pypi.org/project/bleach"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
diff --git a/dev-python/bleach/bleach-2.1.3.ebuild b/dev-python/bleach/bleach-2.1.3.ebuild
index 7d6101cf43a6d..d662a702cba11 100644
--- a/dev-python/bleach/bleach-2.1.3.ebuild
+++ b/dev-python/bleach/bleach-2.1.3.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy{,3} )
 inherit distutils-r1
 
 DESCRIPTION="an easy whitelist-based HTML-sanitizing tool"
-HOMEPAGE="https://github.com/mozilla/bleach https://pypi.python.org/pypi/bleach"
+HOMEPAGE="https://github.com/mozilla/bleach https://pypi.org/project/bleach"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
diff --git a/dev-python/blessings/blessings-1.6-r1.ebuild b/dev-python/blessings/blessings-1.6-r1.ebuild
index 835c26c5e4ab9..c9fc69135b11b 100644
--- a/dev-python/blessings/blessings-1.6-r1.ebuild
+++ b/dev-python/blessings/blessings-1.6-r1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
 inherit distutils-r1
 
 DESCRIPTION="A thin, practical wrapper around terminal coloring, styling, and positioning"
-HOMEPAGE="https://github.com/erikrose/blessings https://pypi.python.org/pypi/blessings/"
+HOMEPAGE="https://github.com/erikrose/blessings https://pypi.org/project/blessings/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
diff --git a/dev-python/blessings/blessings-1.6.1.ebuild b/dev-python/blessings/blessings-1.6.1.ebuild
index c6a055d20985e..274a823d6ab1c 100644
--- a/dev-python/blessings/blessings-1.6.1.ebuild
+++ b/dev-python/blessings/blessings-1.6.1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
 inherit distutils-r1
 
 DESCRIPTION="A thin, practical wrapper around terminal coloring, styling, and positioning"
-HOMEPAGE="https://github.com/erikrose/blessings https://pypi.python.org/pypi/blessings/"
+HOMEPAGE="https://github.com/erikrose/blessings https://pypi.org/project/blessings/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
diff --git a/dev-python/blinker/blinker-1.4.ebuild b/dev-python/blinker/blinker-1.4.ebuild
index 05c3a1eed6231..9beb75b95c034 100644
--- a/dev-python/blinker/blinker-1.4.ebuild
+++ b/dev-python/blinker/blinker-1.4.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="Fast, simple object-to-object and broadcast signaling"
-HOMEPAGE="https://pythonhosted.org/blinker/ https://pypi.python.org/pypi/blinker"
+HOMEPAGE="https://pythonhosted.org/blinker/ https://pypi.org/project/blinker"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/blockcanvas/blockcanvas-4.0.3-r1.ebuild b/dev-python/blockcanvas/blockcanvas-4.0.3-r1.ebuild
index 34b773fc8de1a..93978429b5bb6 100644
--- a/dev-python/blockcanvas/blockcanvas-4.0.3-r1.ebuild
+++ b/dev-python/blockcanvas/blockcanvas-4.0.3-r1.ebuild
@@ -10,7 +10,7 @@ inherit distutils-r1 virtualx
 DESCRIPTION="Enthought Tool Suite: Numerical modeling"
 HOMEPAGE="http://docs.enthought.com/blockcanvas/
 	https://github.com/enthought/blockcanvas
-	https://pypi.python.org/pypi/blockcanvas"
+	https://pypi.org/project/blockcanvas"
 SRC_URI="http://www.enthought.com/repo/ets/${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/blockdiag/blockdiag-1.5.3-r1.ebuild b/dev-python/blockdiag/blockdiag-1.5.3-r1.ebuild
index 3f571f97e942d..073726ef8e148 100644
--- a/dev-python/blockdiag/blockdiag-1.5.3-r1.ebuild
+++ b/dev-python/blockdiag/blockdiag-1.5.3-r1.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
 inherit distutils-r1
 
 DESCRIPTION="blockdiag generates block-diagram image from text"
-HOMEPAGE="http://blockdiag.com/ https://pypi.python.org/pypi/blockdiag/ https://bitbucket.org/blockdiag/blockdiag/"
+HOMEPAGE="http://blockdiag.com/ https://pypi.org/project/blockdiag/ https://bitbucket.org/blockdiag/blockdiag/"
 SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
@@ -48,6 +48,6 @@ pkg_postinst() {
 	einfo "For additional functionality, install the following optional packages:"
 	einfo "    dev-python/reportlab for pdf format"
 	einfo "    media-gfx/imagemagick"
-	einfo "    wand: https://pypi.python.org/pypi/Wand"
+	einfo "    wand: https://pypi.org/project/Wand"
 	einfo "          Ctypes-based simple MagickWand API binding for Python"
 }
diff --git a/dev-python/bluelet/bluelet-0.2.0.ebuild b/dev-python/bluelet/bluelet-0.2.0.ebuild
index 87bcd6aafa8e5..4c0092ff93d69 100644
--- a/dev-python/bluelet/bluelet-0.2.0.ebuild
+++ b/dev-python/bluelet/bluelet-0.2.0.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
 inherit distutils-r1
 
 DESCRIPTION="Module for pure Python asynchronous I/O using coroutines"
-HOMEPAGE="https://pypi.python.org/pypi/bluelet"
+HOMEPAGE="https://pypi.org/project/bluelet"
 SRC_URI="https://github.com/sampsyo/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/bokeh/bokeh-0.11.1.ebuild b/dev-python/bokeh/bokeh-0.11.1.ebuild
index b8746d68cb55a..49eddd87ed27d 100644
--- a/dev-python/bokeh/bokeh-0.11.1.ebuild
+++ b/dev-python/bokeh/bokeh-0.11.1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5} )
 inherit distutils-r1
 
 DESCRIPTION="Statistical and novel interactive HTML plots for Python"
-HOMEPAGE="http://bokeh.pydata.org/ https://github.com/bokeh/bokeh http://pypi.python.org/pypi/bokeh"
+HOMEPAGE="http://bokeh.pydata.org/ https://github.com/bokeh/bokeh http://pypi.org/project/bokeh"
 SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/boto/boto-2.41.0.ebuild b/dev-python/boto/boto-2.41.0.ebuild
index 892bcceee51db..322e630e5def6 100644
--- a/dev-python/boto/boto-2.41.0.ebuild
+++ b/dev-python/boto/boto-2.41.0.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
 inherit distutils-r1
 
 DESCRIPTION="Amazon Web Services API"
-HOMEPAGE="https://github.com/boto/boto https://pypi.python.org/pypi/boto"
+HOMEPAGE="https://github.com/boto/boto https://pypi.org/project/boto"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/boto/boto-2.48.0.ebuild b/dev-python/boto/boto-2.48.0.ebuild
index 9ba557074b50e..a978bd9f93686 100644
--- a/dev-python/boto/boto-2.48.0.ebuild
+++ b/dev-python/boto/boto-2.48.0.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
 inherit distutils-r1
 
 DESCRIPTION="Amazon Web Services API"
-HOMEPAGE="https://github.com/boto/boto https://pypi.python.org/pypi/boto"
+HOMEPAGE="https://github.com/boto/boto https://pypi.org/project/boto"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/bottle/bottle-0.12.12.ebuild b/dev-python/bottle/bottle-0.12.12.ebuild
index 89f3fdcd1003e..ae590cf858568 100644
--- a/dev-python/bottle/bottle-0.12.12.ebuild
+++ b/dev-python/bottle/bottle-0.12.12.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
 inherit distutils-r1 eutils
 
 DESCRIPTION="A fast and simple micro-framework for small web-applications"
-HOMEPAGE="https://pypi.python.org/pypi/bottle http://bottlepy.org/"
+HOMEPAGE="https://pypi.org/project/bottle http://bottlepy.org/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/bottle/bottle-0.12.13.ebuild b/dev-python/bottle/bottle-0.12.13.ebuild
index 9284fe78bc19c..f855160cb8aa9 100644
--- a/dev-python/bottle/bottle-0.12.13.ebuild
+++ b/dev-python/bottle/bottle-0.12.13.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
 inherit distutils-r1 eutils
 
 DESCRIPTION="A fast and simple micro-framework for small web-applications"
-HOMEPAGE="https://pypi.python.org/pypi/bottle http://bottlepy.org/"
+HOMEPAGE="https://pypi.org/project/bottle http://bottlepy.org/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/bottleneck/bottleneck-0.8.0.ebuild b/dev-python/bottleneck/bottleneck-0.8.0.ebuild
index 122f38004509a..aae727b7e016d 100644
--- a/dev-python/bottleneck/bottleneck-0.8.0.ebuild
+++ b/dev-python/bottleneck/bottleneck-0.8.0.ebuild
@@ -11,7 +11,7 @@ MY_PN="Bottleneck"
 MY_P="${MY_PN}-${PV}"
 
 DESCRIPTION="Fast NumPy array functions written in Cython"
-HOMEPAGE="https://pypi.python.org/pypi/Bottleneck"
+HOMEPAGE="https://pypi.org/project/Bottleneck"
 SRC_URI="mirror://pypi/B/${MY_PN}/${MY_P}.tar.gz"
 
 SLOT="0"
diff --git a/dev-python/bottleneck/bottleneck-1.0.0.ebuild b/dev-python/bottleneck/bottleneck-1.0.0.ebuild
index e8418e14afd5a..f9e1b247d5d3f 100644
--- a/dev-python/bottleneck/bottleneck-1.0.0.ebuild
+++ b/dev-python/bottleneck/bottleneck-1.0.0.ebuild
@@ -11,7 +11,7 @@ MY_PN="Bottleneck"
 MY_P="${MY_PN}-${PV}"
 
 DESCRIPTION="Fast NumPy array functions written in Cython"
-HOMEPAGE="https://pypi.python.org/pypi/Bottleneck"
+HOMEPAGE="https://pypi.org/project/Bottleneck"
 SRC_URI="mirror://pypi/B/${MY_PN}/${MY_P}.tar.gz"
 
 SLOT="0"
diff --git a/dev-python/bpython/bpython-0.16-r1.ebuild b/dev-python/bpython/bpython-0.16-r1.ebuild
index fbd3731fa2a24..11285027b8f60 100644
--- a/dev-python/bpython/bpython-0.16-r1.ebuild
+++ b/dev-python/bpython/bpython-0.16-r1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
 inherit distutils-r1
 
 DESCRIPTION="Syntax highlighting and autocompletion for the Python interpreter"
-HOMEPAGE="https://www.bpython-interpreter.org/ https://github.com/bpython/bpython https://pypi.python.org/pypi/bpython"
+HOMEPAGE="https://www.bpython-interpreter.org/ https://github.com/bpython/bpython https://pypi.org/project/bpython"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/bpython/bpython-0.16.ebuild b/dev-python/bpython/bpython-0.16.ebuild
index 42d96450cbde4..847fd374b79f7 100644
--- a/dev-python/bpython/bpython-0.16.ebuild
+++ b/dev-python/bpython/bpython-0.16.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5} )
 inherit distutils-r1
 
 DESCRIPTION="Syntax highlighting and autocompletion for the Python interpreter"
-HOMEPAGE="https://www.bpython-interpreter.org/ https://github.com/bpython/bpython https://pypi.python.org/pypi/bpython"
+HOMEPAGE="https://www.bpython-interpreter.org/ https://github.com/bpython/bpython https://pypi.org/project/bpython"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/bpython/bpython-0.17.1.ebuild b/dev-python/bpython/bpython-0.17.1.ebuild
index d6cffa45f2b25..94cbeb694d22b 100644
--- a/dev-python/bpython/bpython-0.17.1.ebuild
+++ b/dev-python/bpython/bpython-0.17.1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
 inherit distutils-r1
 
 DESCRIPTION="Syntax highlighting and autocompletion for the Python interpreter"
-HOMEPAGE="https://www.bpython-interpreter.org/ https://github.com/bpython/bpython https://pypi.python.org/pypi/bpython"
+HOMEPAGE="https://www.bpython-interpreter.org/ https://github.com/bpython/bpython https://pypi.org/project/bpython"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/bpython/bpython-0.17.ebuild b/dev-python/bpython/bpython-0.17.ebuild
index d6cffa45f2b25..94cbeb694d22b 100644
--- a/dev-python/bpython/bpython-0.17.ebuild
+++ b/dev-python/bpython/bpython-0.17.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
 inherit distutils-r1
 
 DESCRIPTION="Syntax highlighting and autocompletion for the Python interpreter"
-HOMEPAGE="https://www.bpython-interpreter.org/ https://github.com/bpython/bpython https://pypi.python.org/pypi/bpython"
+HOMEPAGE="https://www.bpython-interpreter.org/ https://github.com/bpython/bpython https://pypi.org/project/bpython"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/bsddb3/bsddb3-6.1.1.ebuild b/dev-python/bsddb3/bsddb3-6.1.1.ebuild
index abc7b3f3f373f..21cb44c6d2ede 100644
--- a/dev-python/bsddb3/bsddb3-6.1.1.ebuild
+++ b/dev-python/bsddb3/bsddb3-6.1.1.ebuild
@@ -9,7 +9,7 @@ PYTHON_REQ_USE="threads(+)"
 inherit db-use distutils-r1 multilib
 
 DESCRIPTION="Python bindings for Berkeley DB"
-HOMEPAGE="https://www.jcea.es/programacion/pybsddb.htm https://pypi.python.org/pypi/bsddb3"
+HOMEPAGE="https://www.jcea.es/programacion/pybsddb.htm https://pypi.org/project/bsddb3"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/bsddb3/bsddb3-6.2.4.ebuild b/dev-python/bsddb3/bsddb3-6.2.4.ebuild
index 56a23da0e5da7..e1e36cb1f4cf5 100644
--- a/dev-python/bsddb3/bsddb3-6.2.4.ebuild
+++ b/dev-python/bsddb3/bsddb3-6.2.4.ebuild
@@ -9,7 +9,7 @@ PYTHON_REQ_USE="threads(+)"
 inherit db-use distutils-r1
 
 DESCRIPTION="Python bindings for Berkeley DB"
-HOMEPAGE="https://www.jcea.es/programacion/pybsddb.htm https://pypi.python.org/pypi/bsddb3"
+HOMEPAGE="https://www.jcea.es/programacion/pybsddb.htm https://pypi.org/project/bsddb3"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/buzhug/buzhug-1.8-r1.ebuild b/dev-python/buzhug/buzhug-1.8-r1.ebuild
index 85e223a523281..e4aeeb2ebeb61 100644
--- a/dev-python/buzhug/buzhug-1.8-r1.ebuild
+++ b/dev-python/buzhug/buzhug-1.8-r1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 )
 inherit distutils-r1
 
 DESCRIPTION="Fast, pure-Python database engine"
-HOMEPAGE="http://buzhug.sourceforge.net/ https://pypi.python.org/pypi/buzhug"
+HOMEPAGE="http://buzhug.sourceforge.net/ https://pypi.org/project/buzhug"
 SRC_URI="mirror://sourceforge/${PN}/${P}.zip"
 
 LICENSE="BSD"
diff --git a/dev-python/bytecodeassembler/bytecodeassembler-0.6.ebuild b/dev-python/bytecodeassembler/bytecodeassembler-0.6.ebuild
index 8a63991f09105..265661dc2eab3 100644
--- a/dev-python/bytecodeassembler/bytecodeassembler-0.6.ebuild
+++ b/dev-python/bytecodeassembler/bytecodeassembler-0.6.ebuild
@@ -9,7 +9,7 @@ inherit distutils-r1
 MY_PN="BytecodeAssembler"
 
 DESCRIPTION="Generate Python code objects by "assembling" bytecode"
-HOMEPAGE="https://pypi.python.org/pypi//BytecodeAssembler"
+HOMEPAGE="https://pypi.org/project//BytecodeAssembler"
 SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.zip -> ${P}.zip"
 
 KEYWORDS="amd64 x86"
diff --git a/dev-python/bz2file/bz2file-0.98.ebuild b/dev-python/bz2file/bz2file-0.98.ebuild
index 005da6e8e2bdf..f2ec09ca66504 100644
--- a/dev-python/bz2file/bz2file-0.98.ebuild
+++ b/dev-python/bz2file/bz2file-0.98.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 pypy )
 inherit distutils-r1
 
 DESCRIPTION="Replacement for bz2.BZ2File with features from newest CPython"
-HOMEPAGE="https://pypi.python.org/pypi/bz2file https://github.com/nvawda/bz2file"
+HOMEPAGE="https://pypi.org/project/bz2file https://github.com/nvawda/bz2file"
 SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
diff --git a/dev-python/cachetools/cachetools-1.1.5.ebuild b/dev-python/cachetools/cachetools-1.1.5.ebuild
index 3f953c75b8bd5..ac9af20aa9699 100644
--- a/dev-python/cachetools/cachetools-1.1.5.ebuild
+++ b/dev-python/cachetools/cachetools-1.1.5.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
 inherit distutils-r1
 
 DESCRIPTION="Extensible memoizing collections and decorators"
-HOMEPAGE="https://pypi.python.org/pypi/cachetools"
+HOMEPAGE="https://pypi.org/project/cachetools"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/cachetools/cachetools-2.0.0.ebuild b/dev-python/cachetools/cachetools-2.0.0.ebuild
index ae128ff5b3f04..de100961d66f0 100644
--- a/dev-python/cachetools/cachetools-2.0.0.ebuild
+++ b/dev-python/cachetools/cachetools-2.0.0.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
 inherit distutils-r1
 
 DESCRIPTION="Extensible memoizing collections and decorators"
-HOMEPAGE="https://pypi.python.org/pypi/cachetools"
+HOMEPAGE="https://pypi.org/project/cachetools"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/cachetools/cachetools-2.0.1.ebuild b/dev-python/cachetools/cachetools-2.0.1.ebuild
index ae128ff5b3f04..de100961d66f0 100644
--- a/dev-python/cachetools/cachetools-2.0.1.ebuild
+++ b/dev-python/cachetools/cachetools-2.0.1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
 inherit distutils-r1
 
 DESCRIPTION="Extensible memoizing collections and decorators"
-HOMEPAGE="https://pypi.python.org/pypi/cachetools"
+HOMEPAGE="https://pypi.org/project/cachetools"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/capturer/capturer-2.3.ebuild b/dev-python/capturer/capturer-2.3.ebuild
index 52d6f3a24dc79..4f98af431bd76 100644
--- a/dev-python/capturer/capturer-2.3.ebuild
+++ b/dev-python/capturer/capturer-2.3.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
 inherit distutils-r1
 
 DESCRIPTION="Easily capture stdout/stderr of the current process and subprocesses"
-HOMEPAGE="https://capturer.readthedocs.org/ https://pypi.python.org/pypi/capturer https://github.com/xolox/python-capturer"
+HOMEPAGE="https://capturer.readthedocs.org/ https://pypi.org/project/capturer https://github.com/xolox/python-capturer"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
diff --git a/dev-python/case/case-1.5.2-r1.ebuild b/dev-python/case/case-1.5.2-r1.ebuild
index e17d63becb5a4..46296c5770e89 100644
--- a/dev-python/case/case-1.5.2-r1.ebuild
+++ b/dev-python/case/case-1.5.2-r1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="Python unittest Utilities"
-HOMEPAGE="https://pypi.python.org/pypi/case https://github.com/celery/case"
+HOMEPAGE="https://pypi.org/project/case https://github.com/celery/case"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/case/case-1.5.3.ebuild b/dev-python/case/case-1.5.3.ebuild
index af944e8c1503a..67b887c892947 100644
--- a/dev-python/case/case-1.5.3.ebuild
+++ b/dev-python/case/case-1.5.3.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="Python unittest Utilities"
-HOMEPAGE="https://pypi.python.org/pypi/${PN} https://github.com/celery/${PN}"
+HOMEPAGE="https://pypi.org/project/${PN} https://github.com/celery/${PN}"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/castellan/castellan-0.12.2.ebuild b/dev-python/castellan/castellan-0.12.2.ebuild
index 1ce8247b5dec5..2bd53b73f73bf 100644
--- a/dev-python/castellan/castellan-0.12.2.ebuild
+++ b/dev-python/castellan/castellan-0.12.2.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
 inherit distutils-r1
 
 DESCRIPTION="Generic Key Manager interface for OpenStack"
-HOMEPAGE="https://pypi.python.org/pypi/castellan"
+HOMEPAGE="https://pypi.org/project/castellan"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
diff --git a/dev-python/castellan/castellan-0.17.0.ebuild b/dev-python/castellan/castellan-0.17.0.ebuild
index b741ec8ac6891..aa08f17422a4d 100644
--- a/dev-python/castellan/castellan-0.17.0.ebuild
+++ b/dev-python/castellan/castellan-0.17.0.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
 inherit distutils-r1
 
 DESCRIPTION="Generic Key Manager interface for OpenStack"
-HOMEPAGE="https://pypi.python.org/pypi/castellan"
+HOMEPAGE="https://pypi.org/project/castellan"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
diff --git a/dev-python/cbor/cbor-1.0.0.ebuild b/dev-python/cbor/cbor-1.0.0.ebuild
index c651b7d6be55c..a261a8ff04d46 100644
--- a/dev-python/cbor/cbor-1.0.0.ebuild
+++ b/dev-python/cbor/cbor-1.0.0.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
 inherit distutils-r1
 
 DESCRIPTION="RFC 7049 - Concise Binary Object Representation"
-HOMEPAGE="https://bitbucket.org/bodhisnarkva/cbor https://pypi.python.org/pypi/cbor"
+HOMEPAGE="https://bitbucket.org/bodhisnarkva/cbor https://pypi.org/project/cbor"
 SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
diff --git a/dev-python/celementtree/celementtree-1.0.5-r2.ebuild b/dev-python/celementtree/celementtree-1.0.5-r2.ebuild
index ffe294af978c6..aed6ec6530351 100644
--- a/dev-python/celementtree/celementtree-1.0.5-r2.ebuild
+++ b/dev-python/celementtree/celementtree-1.0.5-r2.ebuild
@@ -10,7 +10,7 @@ inherit distutils-r1
 MY_P="cElementTree-${PV}-20051216"
 
 DESCRIPTION="The cElementTree module is a C implementation of the ElementTree API"
-HOMEPAGE="http://effbot.org/zone/celementtree.htm https://pypi.python.org/pypi/cElementTree"
+HOMEPAGE="http://effbot.org/zone/celementtree.htm https://pypi.org/project/cElementTree"
 SRC_URI="http://effbot.org/downloads/${MY_P}.tar.gz"
 
 LICENSE="ElementTree"
diff --git a/dev-python/celery/celery-3.1.24-r1.ebuild b/dev-python/celery/celery-3.1.24-r1.ebuild
index 40dec9afa9c8a..40dc640e22da4 100644
--- a/dev-python/celery/celery-3.1.24-r1.ebuild
+++ b/dev-python/celery/celery-3.1.24-r1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5} )
 inherit distutils-r1 bash-completion-r1
 
 DESCRIPTION="Asynchronous task queue/job queue based on distributed message passing"
-HOMEPAGE="http://celeryproject.org/ https://pypi.python.org/pypi/celery"
+HOMEPAGE="http://celeryproject.org/ https://pypi.org/project/celery"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/celery/celery-4.0.2.ebuild b/dev-python/celery/celery-4.0.2.ebuild
index fc0a3fd8e298c..71008b17d9c48 100644
--- a/dev-python/celery/celery-4.0.2.ebuild
+++ b/dev-python/celery/celery-4.0.2.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
 inherit distutils-r1 bash-completion-r1
 
 DESCRIPTION="Asynchronous task queue/job queue based on distributed message passing"
-HOMEPAGE="http://celeryproject.org/ https://pypi.python.org/pypi/celery"
+HOMEPAGE="http://celeryproject.org/ https://pypi.org/project/celery"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/celery/celery-4.1.0.ebuild b/dev-python/celery/celery-4.1.0.ebuild
index 4b4b550110c59..01ad0576d19d1 100644
--- a/dev-python/celery/celery-4.1.0.ebuild
+++ b/dev-python/celery/celery-4.1.0.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
 inherit distutils-r1 bash-completion-r1
 
 DESCRIPTION="Asynchronous task queue/job queue based on distributed message passing"
-HOMEPAGE="http://celeryproject.org/ https://pypi.python.org/pypi/celery"
+HOMEPAGE="http://celeryproject.org/ https://pypi.org/project/celery"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/certifi/certifi-2016.9.26.ebuild b/dev-python/certifi/certifi-2016.9.26.ebuild
index 5a1633b1f3b99..9b9c95b4a5638 100644
--- a/dev-python/certifi/certifi-2016.9.26.ebuild
+++ b/dev-python/certifi/certifi-2016.9.26.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="Python package for providing Mozilla's CA Bundle"
-HOMEPAGE="http://certifi.io/ https://pypi.python.org/pypi/certifi"
+HOMEPAGE="http://certifi.io/ https://pypi.org/project/certifi"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
diff --git a/dev-python/certifi/certifi-2017.1.23.ebuild b/dev-python/certifi/certifi-2017.1.23.ebuild
index e6d923189be65..ed328310c5249 100644
--- a/dev-python/certifi/certifi-2017.1.23.ebuild
+++ b/dev-python/certifi/certifi-2017.1.23.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="Python package for providing Mozilla's CA Bundle"
-HOMEPAGE="http://certifi.io/ https://pypi.python.org/pypi/certifi"
+HOMEPAGE="http://certifi.io/ https://pypi.org/project/certifi"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
diff --git a/dev-python/certifi/certifi-2017.11.5.ebuild b/dev-python/certifi/certifi-2017.11.5.ebuild
index 906cb099e0b5c..ce0cebc75e577 100644
--- a/dev-python/certifi/certifi-2017.11.5.ebuild
+++ b/dev-python/certifi/certifi-2017.11.5.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="Python package for providing Mozilla's CA Bundle"
-HOMEPAGE="http://certifi.io/ https://pypi.python.org/pypi/certifi"
+HOMEPAGE="http://certifi.io/ https://pypi.org/project/certifi"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MPL-2.0"
diff --git a/dev-python/certifi/certifi-2017.4.17.ebuild b/dev-python/certifi/certifi-2017.4.17.ebuild
index a7fa755182ce3..b1bf9ff39c5d7 100644
--- a/dev-python/certifi/certifi-2017.4.17.ebuild
+++ b/dev-python/certifi/certifi-2017.4.17.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="Python package for providing Mozilla's CA Bundle"
-HOMEPAGE="http://certifi.io/ https://pypi.python.org/pypi/certifi"
+HOMEPAGE="http://certifi.io/ https://pypi.org/project/certifi"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
diff --git a/dev-python/certifi/certifi-2017.7.27.1.ebuild b/dev-python/certifi/certifi-2017.7.27.1.ebuild
index 906cb099e0b5c..ce0cebc75e577 100644
--- a/dev-python/certifi/certifi-2017.7.27.1.ebuild
+++ b/dev-python/certifi/certifi-2017.7.27.1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="Python package for providing Mozilla's CA Bundle"
-HOMEPAGE="http://certifi.io/ https://pypi.python.org/pypi/certifi"
+HOMEPAGE="http://certifi.io/ https://pypi.org/project/certifi"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MPL-2.0"
diff --git a/dev-python/cffi/cffi-1.11.2.ebuild b/dev-python/cffi/cffi-1.11.2.ebuild
index 63bcc3190973b..d16c9679d2a95 100644
--- a/dev-python/cffi/cffi-1.11.2.ebuild
+++ b/dev-python/cffi/cffi-1.11.2.ebuild
@@ -10,7 +10,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
 inherit distutils-r1
 
 DESCRIPTION="Foreign Function Interface for Python calling C code"
-HOMEPAGE="https://cffi.readthedocs.io/ https://pypi.python.org/pypi/cffi"
+HOMEPAGE="https://cffi.readthedocs.io/ https://pypi.org/project/cffi"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/cffi/cffi-1.11.4.ebuild b/dev-python/cffi/cffi-1.11.4.ebuild
index ec59ddce570b1..b476f44418b0c 100644
--- a/dev-python/cffi/cffi-1.11.4.ebuild
+++ b/dev-python/cffi/cffi-1.11.4.ebuild
@@ -10,7 +10,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
 inherit distutils-r1
 
 DESCRIPTION="Foreign Function Interface for Python calling C code"
-HOMEPAGE="https://cffi.readthedocs.io/ https://pypi.python.org/pypi/cffi"
+HOMEPAGE="https://cffi.readthedocs.io/ https://pypi.org/project/cffi"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/cffi/cffi-1.9.1.ebuild b/dev-python/cffi/cffi-1.9.1.ebuild
index ecbc3943b5c95..c9dee226807b9 100644
--- a/dev-python/cffi/cffi-1.9.1.ebuild
+++ b/dev-python/cffi/cffi-1.9.1.ebuild
@@ -10,7 +10,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
 inherit distutils-r1
 
 DESCRIPTION="Foreign Function Interface for Python calling C code"
-HOMEPAGE="https://cffi.readthedocs.io/ https://pypi.python.org/pypi/cffi"
+HOMEPAGE="https://cffi.readthedocs.io/ https://pypi.org/project/cffi"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/cfgparse/cfgparse-1.3-r1.ebuild b/dev-python/cfgparse/cfgparse-1.3-r1.ebuild
index 0835058e5954f..e73625570e328 100644
--- a/dev-python/cfgparse/cfgparse-1.3-r1.ebuild
+++ b/dev-python/cfgparse/cfgparse-1.3-r1.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 )
 inherit distutils-r1
 
 DESCRIPTION="Config File parser for Python"
-HOMEPAGE="http://cfgparse.sourceforge.net https://pypi.python.org/pypi/cfgparse"
+HOMEPAGE="http://cfgparse.sourceforge.net https://pypi.org/project/cfgparse"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
 
 LICENSE="PSF-2.3"
diff --git a/dev-python/chaco/chaco-4.5.0.ebuild b/dev-python/chaco/chaco-4.5.0.ebuild
index 380addf53b4cb..6014aa20d76a4 100644
--- a/dev-python/chaco/chaco-4.5.0.ebuild
+++ b/dev-python/chaco/chaco-4.5.0.ebuild
@@ -10,7 +10,7 @@ inherit distutils-r1 virtualx flag-o-matic
 DESCRIPTION="Enthought Tool Suite: Interactive plotting toolkit"
 HOMEPAGE="http://docs.enthought.com/chaco/
 	https://github.com/enthought/chaco
-	https://pypi.python.org/pypi/chaco"
+	https://pypi.org/project/chaco"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/chameleon/chameleon-2.25.ebuild b/dev-python/chameleon/chameleon-2.25.ebuild
index 0f7af7061eeb1..821a742744f18 100644
--- a/dev-python/chameleon/chameleon-2.25.ebuild
+++ b/dev-python/chameleon/chameleon-2.25.ebuild
@@ -11,7 +11,7 @@ MY_PN="Chameleon"
 MY_P="${MY_PN}-${PV}"
 
 DESCRIPTION="Fast HTML/XML template compiler for Python"
-HOMEPAGE="http://chameleon.repoze.org https://pypi.python.org/pypi/Chameleon"
+HOMEPAGE="http://chameleon.repoze.org https://pypi.org/project/Chameleon"
 SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="repoze"
diff --git a/dev-python/chardet/chardet-3.0.4.ebuild b/dev-python/chardet/chardet-3.0.4.ebuild
index 6b6d169dca6b5..a0433040f35a4 100644
--- a/dev-python/chardet/chardet-3.0.4.ebuild
+++ b/dev-python/chardet/chardet-3.0.4.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="Universal encoding detector"
-HOMEPAGE="https://github.com/chardet/chardet https://pypi.python.org/pypi/chardet"
+HOMEPAGE="https://github.com/chardet/chardet https://pypi.org/project/chardet"
 SRC_URI="https://github.com/chardet/chardet/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 # SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
diff --git a/dev-python/cheetah/cheetah-2.4.4-r1.ebuild b/dev-python/cheetah/cheetah-2.4.4-r1.ebuild
index f68e4546f575a..0752e881ecd6e 100644
--- a/dev-python/cheetah/cheetah-2.4.4-r1.ebuild
+++ b/dev-python/cheetah/cheetah-2.4.4-r1.ebuild
@@ -10,7 +10,7 @@ MY_PN="Cheetah"
 MY_P="${MY_PN}-${PV/_}"
 
 DESCRIPTION="Python-powered template engine and code generator"
-HOMEPAGE="http://www.cheetahtemplate.org/ https://rtyler.github.com/cheetah/ https://pypi.python.org/pypi/Cheetah"
+HOMEPAGE="http://www.cheetahtemplate.org/ https://rtyler.github.com/cheetah/ https://pypi.org/project/Cheetah"
 SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/cheroot/cheroot-6.0.0.ebuild b/dev-python/cheroot/cheroot-6.0.0.ebuild
index ba5b7abd2ea48..2522f6fc13299 100644
--- a/dev-python/cheroot/cheroot-6.0.0.ebuild
+++ b/dev-python/cheroot/cheroot-6.0.0.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="Cheroot is the high-performance, pure-Python HTTP server used by CherryPy."
-HOMEPAGE="http://www.cherrypy.org/ https://pypi.python.org/pypi/Cheroot https://github.com/cherrypy/cheroot"
+HOMEPAGE="http://www.cherrypy.org/ https://pypi.org/project/Cheroot https://github.com/cherrypy/cheroot"
 SRC_URI="mirror://pypi/C/${PN/c/C}/${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/cherrypy/cherrypy-13.1.0.ebuild b/dev-python/cherrypy/cherrypy-13.1.0.ebuild
index 19fbef165c1e3..3cb3232bd32d4 100644
--- a/dev-python/cherrypy/cherrypy-13.1.0.ebuild
+++ b/dev-python/cherrypy/cherrypy-13.1.0.ebuild
@@ -9,7 +9,7 @@ inherit distutils-r1
 MY_P="CherryPy-${PV}"
 
 DESCRIPTION="CherryPy is a pythonic, object-oriented HTTP framework"
-HOMEPAGE="http://www.cherrypy.org/ https://pypi.python.org/pypi/CherryPy"
+HOMEPAGE="http://www.cherrypy.org/ https://pypi.org/project/CherryPy"
 SRC_URI="mirror://pypi/C/CherryPy/${MY_P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/cherrypy/cherrypy-3.8.0.ebuild b/dev-python/cherrypy/cherrypy-3.8.0.ebuild
index 60c1baed6ec99..4083f06d4d80a 100644
--- a/dev-python/cherrypy/cherrypy-3.8.0.ebuild
+++ b/dev-python/cherrypy/cherrypy-3.8.0.ebuild
@@ -9,7 +9,7 @@ inherit distutils-r1
 MY_P="CherryPy-${PV}"
 
 DESCRIPTION="CherryPy is a pythonic, object-oriented HTTP framework"
-HOMEPAGE="http://www.cherrypy.org/ https://pypi.python.org/pypi/CherryPy"
+HOMEPAGE="http://www.cherrypy.org/ https://pypi.org/project/CherryPy"
 SRC_URI="mirror://pypi/C/CherryPy/${MY_P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/click-log/click-log-0.1.3.ebuild b/dev-python/click-log/click-log-0.1.3.ebuild
index 5bb650e9352b7..5b0403fe5abf7 100644
--- a/dev-python/click-log/click-log-0.1.3.ebuild
+++ b/dev-python/click-log/click-log-0.1.3.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python{2_7,3_4} )
 inherit distutils-r1
 
 DESCRIPTION="Logging integration for Click."
-HOMEPAGE="https://github.com/click-contrib/click-log https://pypi.python.org/pypi/click-log"
+HOMEPAGE="https://github.com/click-contrib/click-log https://pypi.org/project/click-log"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/click-log/click-log-0.1.4.ebuild b/dev-python/click-log/click-log-0.1.4.ebuild
index 8393885b7c542..354d68ea9dc25 100644
--- a/dev-python/click-log/click-log-0.1.4.ebuild
+++ b/dev-python/click-log/click-log-0.1.4.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python{2_7,3_4} )
 inherit distutils-r1
 
 DESCRIPTION="Logging integration for Click."
-HOMEPAGE="https://github.com/click-contrib/click-log https://pypi.python.org/pypi/click-log"
+HOMEPAGE="https://github.com/click-contrib/click-log https://pypi.org/project/click-log"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/click-log/click-log-0.1.8.ebuild b/dev-python/click-log/click-log-0.1.8.ebuild
index 9aafa8433b1c0..815b5575fca75 100644
--- a/dev-python/click-log/click-log-0.1.8.ebuild
+++ b/dev-python/click-log/click-log-0.1.8.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
 inherit distutils-r1
 
 DESCRIPTION="Logging integration for Click."
-HOMEPAGE="https://github.com/click-contrib/click-log https://pypi.python.org/pypi/click-log"
+HOMEPAGE="https://github.com/click-contrib/click-log https://pypi.org/project/click-log"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/click-log/click-log-0.2.1.ebuild b/dev-python/click-log/click-log-0.2.1.ebuild
index d1fba828b2f9a..bd1dada2488ec 100644
--- a/dev-python/click-log/click-log-0.2.1.ebuild
+++ b/dev-python/click-log/click-log-0.2.1.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
 inherit distutils-r1
 
 DESCRIPTION="Logging integration for Click."
-HOMEPAGE="https://github.com/click-contrib/click-log https://pypi.python.org/pypi/click-log"
+HOMEPAGE="https://github.com/click-contrib/click-log https://pypi.org/project/click-log"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/click-plugins/click-plugins-1.0.3.ebuild b/dev-python/click-plugins/click-plugins-1.0.3.ebuild
index 4eda8ac36e21c..e0a78f68be9f2 100644
--- a/dev-python/click-plugins/click-plugins-1.0.3.ebuild
+++ b/dev-python/click-plugins/click-plugins-1.0.3.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_{3,4,5,6}} )
 inherit distutils-r1
 
 DESCRIPTION="Module for click to enable registering CLI commands via setuptools entry-points"
-HOMEPAGE="https://pypi.python.org/pypi/click-plugins"
+HOMEPAGE="https://pypi.org/project/click-plugins"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/click-threading/click-threading-0.1.2.ebuild b/dev-python/click-threading/click-threading-0.1.2.ebuild
index 45c34890883ba..4e444c374fcfd 100644
--- a/dev-python/click-threading/click-threading-0.1.2.ebuild
+++ b/dev-python/click-threading/click-threading-0.1.2.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python{2_7,3_4} )
 inherit distutils-r1
 
 DESCRIPTION="Multithreaded Click apps made easy."
-HOMEPAGE="https://github.com/click-contrib/click-threading https://pypi.python.org/pypi/click-threading"
+HOMEPAGE="https://github.com/click-contrib/click-threading https://pypi.org/project/click-threading"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/click-threading/click-threading-0.3.0.ebuild b/dev-python/click-threading/click-threading-0.3.0.ebuild
index 5511d653a9a7a..7d8b8bafcd09e 100644
--- a/dev-python/click-threading/click-threading-0.3.0.ebuild
+++ b/dev-python/click-threading/click-threading-0.3.0.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
 inherit distutils-r1
 
 DESCRIPTION="Multithreaded Click apps made easy."
-HOMEPAGE="https://github.com/click-contrib/click-threading https://pypi.python.org/pypi/click-threading"
+HOMEPAGE="https://github.com/click-contrib/click-threading https://pypi.org/project/click-threading"
 SRC_URI="https://github.com/click-contrib/${PN}/archive/${PV}.tar.gz -> ${P}-gh.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/click/click-6.6.ebuild b/dev-python/click/click-6.6.ebuild
index e312f7b9c17fc..e20abfe6a2a79 100644
--- a/dev-python/click/click-6.6.ebuild
+++ b/dev-python/click/click-6.6.ebuild
@@ -9,7 +9,7 @@ inherit distutils-r1
 
 DESCRIPTION="A Python package for creating beautiful command line interfaces"
 SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-HOMEPAGE="http://click.pocoo.org/ https://pypi.python.org/pypi/click"
+HOMEPAGE="http://click.pocoo.org/ https://pypi.org/project/click"
 
 LICENSE="BSD"
 SLOT="0"
diff --git a/dev-python/click/click-6.7.ebuild b/dev-python/click/click-6.7.ebuild
index d3c9e5f244c15..f6e2cb5dd55e0 100644
--- a/dev-python/click/click-6.7.ebuild
+++ b/dev-python/click/click-6.7.ebuild
@@ -9,7 +9,7 @@ inherit distutils-r1
 
 DESCRIPTION="A Python package for creating beautiful command line interfaces"
 SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-HOMEPAGE="http://click.pocoo.org/ https://pypi.python.org/pypi/click"
+HOMEPAGE="http://click.pocoo.org/ https://pypi.org/project/click"
 
 LICENSE="BSD"
 SLOT="0"
diff --git a/dev-python/clientcookie/clientcookie-1.3.0-r1.ebuild b/dev-python/clientcookie/clientcookie-1.3.0-r1.ebuild
index 329d0d3a3664b..78f68f641ef46 100644
--- a/dev-python/clientcookie/clientcookie-1.3.0-r1.ebuild
+++ b/dev-python/clientcookie/clientcookie-1.3.0-r1.ebuild
@@ -9,7 +9,7 @@ inherit distutils-r1
 MY_P="ClientCookie-${PV}"
 
 DESCRIPTION="Python module for handling HTTP cookies on the client side"
-HOMEPAGE="http://wwwsearch.sourceforge.net/ClientCookie/ https://pypi.python.org/pypi/ClientCookie"
+HOMEPAGE="http://wwwsearch.sourceforge.net/ClientCookie/ https://pypi.org/project/ClientCookie"
 SRC_URI="http://wwwsearch.sourceforge.net/ClientCookie/src/${MY_P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/cloudpickle/cloudpickle-0.3.1.ebuild b/dev-python/cloudpickle/cloudpickle-0.3.1.ebuild
index 0ec8ddf622708..0a89f9d59e042 100644
--- a/dev-python/cloudpickle/cloudpickle-0.3.1.ebuild
+++ b/dev-python/cloudpickle/cloudpickle-0.3.1.ebuild
@@ -6,7 +6,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy )
 inherit eutils distutils-r1
 
 DESCRIPTION="Extended pickling support for Python objects"
-HOMEPAGE="https://pypi.python.org/pypi/cloudpickle/"
+HOMEPAGE="https://pypi.org/project/cloudpickle/"
 SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/codetools/codetools-4.2.0.ebuild b/dev-python/codetools/codetools-4.2.0.ebuild
index 796f4dd96a8c6..aa514e09c429b 100644
--- a/dev-python/codetools/codetools-4.2.0.ebuild
+++ b/dev-python/codetools/codetools-4.2.0.ebuild
@@ -9,7 +9,7 @@ inherit distutils-r1 virtualx
 DESCRIPTION="Enthought Tool Suite: Code analysis and execution tools"
 HOMEPAGE="http://docs.enthought.com/codetools/
 	https://github.com/enthought/codetools
-	https://pypi.python.org/pypi/codetools"
+	https://pypi.org/project/codetools"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 IUSE="test"
diff --git a/dev-python/colander/colander-1.3.1.ebuild b/dev-python/colander/colander-1.3.1.ebuild
index b2bf82392cad4..adab8e5e1d9f6 100644
--- a/dev-python/colander/colander-1.3.1.ebuild
+++ b/dev-python/colander/colander-1.3.1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="A simple schema-based serialization and deserialization library"
-HOMEPAGE="https://docs.pylonsproject.org/projects/colander/en/latest/ https://pypi.python.org/pypi/colander"
+HOMEPAGE="https://docs.pylonsproject.org/projects/colander/en/latest/ https://pypi.org/project/colander"
 MY_P=${P/_beta1/b1}
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
 
diff --git a/dev-python/collectd-rabbitmq/collectd-rabbitmq-1.19.0-r1.ebuild b/dev-python/collectd-rabbitmq/collectd-rabbitmq-1.19.0-r1.ebuild
index fa50b9b0c091c..9b342eb1c5880 100644
--- a/dev-python/collectd-rabbitmq/collectd-rabbitmq-1.19.0-r1.ebuild
+++ b/dev-python/collectd-rabbitmq/collectd-rabbitmq-1.19.0-r1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 )
 inherit distutils-r1
 
 DESCRIPTION="Collectd plugin to gather statistics from RabbitMQ"
-HOMEPAGE="https://pypi.python.org/pypi/collectd-rabbitmq"
+HOMEPAGE="https://pypi.org/project/collectd-rabbitmq"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 KEYWORDS="amd64"
 
diff --git a/dev-python/colorama/colorama-0.3.3.ebuild b/dev-python/colorama/colorama-0.3.3.ebuild
index d402e7518c2bd..6318e27c08abb 100644
--- a/dev-python/colorama/colorama-0.3.3.ebuild
+++ b/dev-python/colorama/colorama-0.3.3.ebuild
@@ -9,7 +9,7 @@ inherit distutils-r1
 
 DESCRIPTION="ANSI escape character sequences for colored terminal text & cursor positioning"
 HOMEPAGE="
-	https://pypi.python.org/pypi/colorama
+	https://pypi.org/project/colorama
 	https://github.com/tartley/colorama"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
diff --git a/dev-python/colorama/colorama-0.3.9.ebuild b/dev-python/colorama/colorama-0.3.9.ebuild
index 3dd40613fdd16..d64ab64e1af20 100644
--- a/dev-python/colorama/colorama-0.3.9.ebuild
+++ b/dev-python/colorama/colorama-0.3.9.ebuild
@@ -9,7 +9,7 @@ inherit distutils-r1
 
 DESCRIPTION="ANSI escape character sequences for colored terminal text & cursor positioning"
 HOMEPAGE="
-	https://pypi.python.org/pypi/colorama
+	https://pypi.org/project/colorama
 	https://github.com/tartley/colorama"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
diff --git a/dev-python/coloredlogs/coloredlogs-6.1.ebuild b/dev-python/coloredlogs/coloredlogs-6.1.ebuild
index 49ae56fe7514a..1df9545a08db4 100644
--- a/dev-python/coloredlogs/coloredlogs-6.1.ebuild
+++ b/dev-python/coloredlogs/coloredlogs-6.1.ebuild
@@ -9,7 +9,7 @@ inherit distutils-r1
 
 DESCRIPTION="Colored stream handler for the logging module"
 HOMEPAGE="
-	https://pypi.python.org/pypi/coloredlogs
+	https://pypi.org/project/coloredlogs
 	https://github.com/xolox/python-coloredlogs
 	http://coloredlogs.readthedocs.org"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
diff --git a/dev-python/colorlog/colorlog-2.7.0.ebuild b/dev-python/colorlog/colorlog-2.7.0.ebuild
index eea828124d7f7..3b1c2d81dda90 100644
--- a/dev-python/colorlog/colorlog-2.7.0.ebuild
+++ b/dev-python/colorlog/colorlog-2.7.0.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
 inherit distutils-r1
 
 DESCRIPTION="Log formatting with colors"
-HOMEPAGE="https://pypi.python.org/pypi/colorlog https://github.com/borntyping/python-colorlog"
+HOMEPAGE="https://pypi.org/project/colorlog https://github.com/borntyping/python-colorlog"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/columnize/columnize-0.3.5-r1.ebuild b/dev-python/columnize/columnize-0.3.5-r1.ebuild
index dd0bb72247433..fd1b2633d1342 100644
--- a/dev-python/columnize/columnize-0.3.5-r1.ebuild
+++ b/dev-python/columnize/columnize-0.3.5-r1.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 )
 inherit distutils-r1
 
 DESCRIPTION="Format a simple (i.e. not nested) list into aligned columns"
-HOMEPAGE="https://github.com/rocky/pycolumnize https://pypi.python.org/pypi/columnize"
+HOMEPAGE="https://github.com/rocky/pycolumnize https://pypi.org/project/columnize"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="PSF-2"
diff --git a/dev-python/columnize/columnize-0.3.9.ebuild b/dev-python/columnize/columnize-0.3.9.ebuild
index 06816336025aa..a6fc1df8fde03 100644
--- a/dev-python/columnize/columnize-0.3.9.ebuild
+++ b/dev-python/columnize/columnize-0.3.9.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
 inherit distutils-r1
 
 DESCRIPTION="Format a simple (i.e. not nested) list into aligned columns"
-HOMEPAGE="https://github.com/rocky/pycolumnize https://pypi.python.org/pypi/columnize"
+HOMEPAGE="https://github.com/rocky/pycolumnize https://pypi.org/project/columnize"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="PSF-2"
diff --git a/dev-python/common/common-0.1.2.ebuild b/dev-python/common/common-0.1.2.ebuild
index fb790dd7dfb60..644f3c82be60c 100644
--- a/dev-python/common/common-0.1.2.ebuild
+++ b/dev-python/common/common-0.1.2.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
 inherit distutils-r1
 
 DESCRIPTION="Common tools and data structures implemented in pure python"
-HOMEPAGE="https://pypi.python.org/pypi/common"
+HOMEPAGE="https://pypi.org/project/common"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
diff --git a/dev-python/configargparse/configargparse-0.11.0.ebuild b/dev-python/configargparse/configargparse-0.11.0.ebuild
index 234d651e595b0..dcb379a6e739f 100644
--- a/dev-python/configargparse/configargparse-0.11.0.ebuild
+++ b/dev-python/configargparse/configargparse-0.11.0.ebuild
@@ -10,7 +10,7 @@ MY_PN=ConfigArgParse
 MY_P=${MY_PN}-${PV}
 
 DESCRIPTION="Drop-in replacement for argparse supporting config files and env variables"
-HOMEPAGE="https://github.com/zorro3/ConfigArgParse https://pypi.python.org/pypi/ConfigArgParse"
+HOMEPAGE="https://github.com/zorro3/ConfigArgParse https://pypi.org/project/ConfigArgParse"
 SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/configargparse/configargparse-0.12.0.ebuild b/dev-python/configargparse/configargparse-0.12.0.ebuild
index 13c1e37edeac0..f990d5a35e2d4 100644
--- a/dev-python/configargparse/configargparse-0.12.0.ebuild
+++ b/dev-python/configargparse/configargparse-0.12.0.ebuild
@@ -10,7 +10,7 @@ MY_PN=ConfigArgParse
 MY_P=${MY_PN}-${PV}
 
 DESCRIPTION="Drop-in replacement for argparse supporting config files and env variables"
-HOMEPAGE="https://github.com/zorro3/ConfigArgParse https://pypi.python.org/pypi/ConfigArgParse"
+HOMEPAGE="https://github.com/zorro3/ConfigArgParse https://pypi.org/project/ConfigArgParse"
 SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/configobj/configobj-5.0.6.ebuild b/dev-python/configobj/configobj-5.0.6.ebuild
index 27d1111dc4d68..72795decba1e2 100644
--- a/dev-python/configobj/configobj-5.0.6.ebuild
+++ b/dev-python/configobj/configobj-5.0.6.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
 inherit distutils-r1
 
 DESCRIPTION="Simple config file reader and writer"
-HOMEPAGE="http://www.voidspace.org.uk/python/configobj.html https://pypi.python.org/pypi/configobj"
+HOMEPAGE="http://www.voidspace.org.uk/python/configobj.html https://pypi.org/project/configobj"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/configparser/configparser-3.3.0.2.ebuild b/dev-python/configparser/configparser-3.3.0.2.ebuild
index e428e301cff2f..fb1072dc4527c 100644
--- a/dev-python/configparser/configparser-3.3.0.2.ebuild
+++ b/dev-python/configparser/configparser-3.3.0.2.ebuild
@@ -7,7 +7,7 @@ inherit distutils-r1
 
 MY_PV=${PV%.*}r${PV##*.}
 DESCRIPTION="Backport of Python-3 built-in configparser"
-HOMEPAGE="https://pypi.python.org/pypi/configparser/"
+HOMEPAGE="https://pypi.org/project/configparser/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${PN}-${MY_PV}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/configparser/configparser-3.5.0-r1.ebuild b/dev-python/configparser/configparser-3.5.0-r1.ebuild
index 2197f83c683ed..80e71adaa9f27 100644
--- a/dev-python/configparser/configparser-3.5.0-r1.ebuild
+++ b/dev-python/configparser/configparser-3.5.0-r1.ebuild
@@ -6,7 +6,7 @@ PYTHON_COMPAT=( python2_7 pypy )
 inherit distutils-r1
 
 DESCRIPTION="Backport of Python-3 built-in configparser"
-HOMEPAGE="https://pypi.python.org/pypi/configparser/"
+HOMEPAGE="https://pypi.org/project/configparser/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/configparser/configparser-3.5.0.ebuild b/dev-python/configparser/configparser-3.5.0.ebuild
index 805c3ec869deb..ab81156bbe9a6 100644
--- a/dev-python/configparser/configparser-3.5.0.ebuild
+++ b/dev-python/configparser/configparser-3.5.0.ebuild
@@ -6,7 +6,7 @@ PYTHON_COMPAT=( python2_7 pypy )
 inherit distutils-r1
 
 DESCRIPTION="Backport of Python-3 built-in configparser"
-HOMEPAGE="https://pypi.python.org/pypi/configparser/"
+HOMEPAGE="https://pypi.org/project/configparser/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/constantly/constantly-15.1.0-r1.ebuild b/dev-python/constantly/constantly-15.1.0-r1.ebuild
index 7e4b4cced2d3d..8071c4dca36fe 100644
--- a/dev-python/constantly/constantly-15.1.0-r1.ebuild
+++ b/dev-python/constantly/constantly-15.1.0-r1.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
 inherit distutils-r1
 
 DESCRIPTION="Symbolic constants in Python"
-HOMEPAGE="https://github.com/twisted/constantly https://pypi.python.org/pypi/constantly"
+HOMEPAGE="https://github.com/twisted/constantly https://pypi.org/project/constantly"
 SRC_URI="https://github.com/twisted/constantly/archive/${PV}.tar.gz -> ${P}.gh.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/constantly/constantly-15.1.0.ebuild b/dev-python/constantly/constantly-15.1.0.ebuild
index 8b5a8b696e16a..d3497d5fba178 100644
--- a/dev-python/constantly/constantly-15.1.0.ebuild
+++ b/dev-python/constantly/constantly-15.1.0.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy)
 inherit distutils-r1
 
 DESCRIPTION="Symbolic constants in Python"
-HOMEPAGE="https://github.com/twisted/constantly https://pypi.python.org/pypi/constantly"
+HOMEPAGE="https://github.com/twisted/constantly https://pypi.org/project/constantly"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/construct/construct-2.8.17.ebuild b/dev-python/construct/construct-2.8.17.ebuild
index 84474d2334bab..c9a9aa0cae7db 100644
--- a/dev-python/construct/construct-2.8.17.ebuild
+++ b/dev-python/construct/construct-2.8.17.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5} )
 inherit distutils-r1
 
 DESCRIPTION="A powerful declarative parser for binary data"
-HOMEPAGE="http://construct.readthedocs.io/ https://pypi.python.org/pypi/construct"
+HOMEPAGE="http://construct.readthedocs.io/ https://pypi.org/project/construct"
 SRC_URI="https://github.com/construct/construct/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/construct/construct-2.8.21.ebuild b/dev-python/construct/construct-2.8.21.ebuild
index 70ec0fd0fff11..2064c6fe9e8b1 100644
--- a/dev-python/construct/construct-2.8.21.ebuild
+++ b/dev-python/construct/construct-2.8.21.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
 inherit distutils-r1
 
 DESCRIPTION="A powerful declarative parser for binary data"
-HOMEPAGE="http://construct.readthedocs.io/ https://pypi.python.org/pypi/construct"
+HOMEPAGE="http://construct.readthedocs.io/ https://pypi.org/project/construct"
 SRC_URI="https://github.com/construct/construct/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/contextlib2/contextlib2-0.5.4.ebuild b/dev-python/contextlib2/contextlib2-0.5.4.ebuild
index 0b8197e7e1dc3..99359f588b84c 100644
--- a/dev-python/contextlib2/contextlib2-0.5.4.ebuild
+++ b/dev-python/contextlib2/contextlib2-0.5.4.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy )
 inherit distutils-r1
 
 DESCRIPTION="Backports and enhancements for the contextlib module"
-HOMEPAGE="https://pypi.python.org/pypi/contextlib2"
+HOMEPAGE="https://pypi.org/project/contextlib2"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="PSF-2.4"
diff --git a/dev-python/contextlib2/contextlib2-0.5.5.ebuild b/dev-python/contextlib2/contextlib2-0.5.5.ebuild
index 436e5e4997cee..7ad279d0f8ad2 100644
--- a/dev-python/contextlib2/contextlib2-0.5.5.ebuild
+++ b/dev-python/contextlib2/contextlib2-0.5.5.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy{,3} )
 inherit distutils-r1
 
 DESCRIPTION="Backports and enhancements for the contextlib module"
-HOMEPAGE="https://pypi.python.org/pypi/contextlib2"
+HOMEPAGE="https://pypi.org/project/contextlib2"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="PSF-2.4"
diff --git a/dev-python/cosmolopy/cosmolopy-0.1.104-r1.ebuild b/dev-python/cosmolopy/cosmolopy-0.1.104-r1.ebuild
index 320cdb9bc988e..422b8182840fe 100644
--- a/dev-python/cosmolopy/cosmolopy-0.1.104-r1.ebuild
+++ b/dev-python/cosmolopy/cosmolopy-0.1.104-r1.ebuild
@@ -11,7 +11,7 @@ MY_PN=CosmoloPy
 MY_P=${MY_PN}-${PV}
 
 DESCRIPTION="Cosmology routines built on NumPy/SciPy"
-HOMEPAGE="https://roban.github.com/CosmoloPy/ https://pypi.python.org/pypi/CosmoloPy"
+HOMEPAGE="https://roban.github.com/CosmoloPy/ https://pypi.org/project/CosmoloPy"
 SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/couchdb-python/couchdb-python-1.1.ebuild b/dev-python/couchdb-python/couchdb-python-1.1.ebuild
index ad0a9c93f976c..5b4a7a8890375 100644
--- a/dev-python/couchdb-python/couchdb-python-1.1.ebuild
+++ b/dev-python/couchdb-python/couchdb-python-1.1.ebuild
@@ -11,7 +11,7 @@ MY_PN="CouchDB"
 MY_P="${MY_PN}-${PV}"
 
 DESCRIPTION="Python library for working with CouchDB"
-HOMEPAGE="https://github.com/djc/couchdb-python https://pypi.python.org/pypi/CouchDB"
+HOMEPAGE="https://github.com/djc/couchdb-python https://pypi.org/project/CouchDB"
 SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/coverage/coverage-4.2.ebuild b/dev-python/coverage/coverage-4.2.ebuild
index 61e628913751d..13862ea9395fc 100644
--- a/dev-python/coverage/coverage-4.2.ebuild
+++ b/dev-python/coverage/coverage-4.2.ebuild
@@ -9,7 +9,7 @@ PYTHON_REQ_USE="threads(+)"
 inherit distutils-r1
 
 DESCRIPTION="Code coverage measurement for Python"
-HOMEPAGE="http://nedbatchelder.com/code/coverage/ https://pypi.python.org/pypi/coverage"
+HOMEPAGE="http://nedbatchelder.com/code/coverage/ https://pypi.org/project/coverage"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/croniter/croniter-0.3.11.ebuild b/dev-python/croniter/croniter-0.3.11.ebuild
index 86580fd4d81c5..716e6ef1c29f5 100644
--- a/dev-python/croniter/croniter-0.3.11.ebuild
+++ b/dev-python/croniter/croniter-0.3.11.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
 inherit distutils-r1
 
 DESCRIPTION="Python module to provide iteration for datetime object"
-HOMEPAGE="https://github.com/kiorky/croniter https://pypi.python.org/pypi/croniter"
+HOMEPAGE="https://github.com/kiorky/croniter https://pypi.org/project/croniter"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/croniter/croniter-0.3.15.ebuild b/dev-python/croniter/croniter-0.3.15.ebuild
index dd97eb03c90c3..d92ef341c4be7 100644
--- a/dev-python/croniter/croniter-0.3.15.ebuild
+++ b/dev-python/croniter/croniter-0.3.15.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
 inherit distutils-r1
 
 DESCRIPTION="Python module to provide iteration for datetime object"
-HOMEPAGE="https://github.com/kiorky/croniter https://pypi.python.org/pypi/croniter"
+HOMEPAGE="https://github.com/kiorky/croniter https://pypi.org/project/croniter"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/croniter/croniter-0.3.17.ebuild b/dev-python/croniter/croniter-0.3.17.ebuild
index 7b852035ae2c1..8b88ce14558f6 100644
--- a/dev-python/croniter/croniter-0.3.17.ebuild
+++ b/dev-python/croniter/croniter-0.3.17.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
 inherit distutils-r1
 
 DESCRIPTION="Python module to provide iteration for datetime object"
-HOMEPAGE="https://github.com/kiorky/croniter https://pypi.python.org/pypi/croniter"
+HOMEPAGE="https://github.com/kiorky/croniter https://pypi.org/project/croniter"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/cryptography-vectors/cryptography-vectors-1.7.1.ebuild b/dev-python/cryptography-vectors/cryptography-vectors-1.7.1.ebuild
index 78377730dffcc..d116dec7d4962 100644
--- a/dev-python/cryptography-vectors/cryptography-vectors-1.7.1.ebuild
+++ b/dev-python/cryptography-vectors/cryptography-vectors-1.7.1.ebuild
@@ -11,7 +11,7 @@ MY_PN=${PN/-/_}
 MY_P=${MY_PN}-${PV}
 
 DESCRIPTION="Test vectors for the cryptography package"
-HOMEPAGE="https://pypi.python.org/pypi/cryptography-vectors/"
+HOMEPAGE="https://pypi.org/project/cryptography-vectors/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
 
 LICENSE="|| ( Apache-2.0 BSD )"
diff --git a/dev-python/cryptography-vectors/cryptography-vectors-2.0.2.ebuild b/dev-python/cryptography-vectors/cryptography-vectors-2.0.2.ebuild
index 2ec39af5a8854..522a34ffd3110 100644
--- a/dev-python/cryptography-vectors/cryptography-vectors-2.0.2.ebuild
+++ b/dev-python/cryptography-vectors/cryptography-vectors-2.0.2.ebuild
@@ -11,7 +11,7 @@ MY_PN=${PN/-/_}
 MY_P=${MY_PN}-${PV}
 
 DESCRIPTION="Test vectors for the cryptography package"
-HOMEPAGE="https://pypi.python.org/pypi/cryptography-vectors/"
+HOMEPAGE="https://pypi.org/project/cryptography-vectors/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
 
 LICENSE="|| ( Apache-2.0 BSD )"
diff --git a/dev-python/cryptography-vectors/cryptography-vectors-2.1.4.ebuild b/dev-python/cryptography-vectors/cryptography-vectors-2.1.4.ebuild
index 3b723507d7ed4..db8ef24cc6d54 100644
--- a/dev-python/cryptography-vectors/cryptography-vectors-2.1.4.ebuild
+++ b/dev-python/cryptography-vectors/cryptography-vectors-2.1.4.ebuild
@@ -11,7 +11,7 @@ MY_PN=${PN/-/_}
 MY_P=${MY_PN}-${PV}
 
 DESCRIPTION="Test vectors for the cryptography package"
-HOMEPAGE="https://pypi.python.org/pypi/cryptography-vectors/"
+HOMEPAGE="https://pypi.org/project/cryptography-vectors/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
 
 LICENSE="|| ( Apache-2.0 BSD )"
diff --git a/dev-python/cryptography/cryptography-1.7.1-r1.ebuild b/dev-python/cryptography/cryptography-1.7.1-r1.ebuild
index c6928ab74a34c..11cff7b6191c7 100644
--- a/dev-python/cryptography/cryptography-1.7.1-r1.ebuild
+++ b/dev-python/cryptography/cryptography-1.7.1-r1.ebuild
@@ -9,7 +9,7 @@ PYTHON_REQ_USE="threads(+)"
 inherit distutils-r1
 
 DESCRIPTION="Library providing cryptographic recipes and primitives"
-HOMEPAGE="https://github.com/pyca/cryptography/ https://pypi.python.org/pypi/cryptography/"
+HOMEPAGE="https://github.com/pyca/cryptography/ https://pypi.org/project/cryptography/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="|| ( Apache-2.0 BSD )"
diff --git a/dev-python/cryptography/cryptography-1.7.1.ebuild b/dev-python/cryptography/cryptography-1.7.1.ebuild
index 2f2ecc9b905e6..2646ca4511b3b 100644
--- a/dev-python/cryptography/cryptography-1.7.1.ebuild
+++ b/dev-python/cryptography/cryptography-1.7.1.ebuild
@@ -9,7 +9,7 @@ PYTHON_REQ_USE="threads(+)"
 inherit distutils-r1
 
 DESCRIPTION="Library providing cryptographic recipes and primitives"
-HOMEPAGE="https://github.com/pyca/cryptography/ https://pypi.python.org/pypi/cryptography/"
+HOMEPAGE="https://github.com/pyca/cryptography/ https://pypi.org/project/cryptography/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="|| ( Apache-2.0 BSD )"
diff --git a/dev-python/cryptography/cryptography-2.0.2-r1.ebuild b/dev-python/cryptography/cryptography-2.0.2-r1.ebuild
index 57b42e13bd36f..c69917dc3a695 100644
--- a/dev-python/cryptography/cryptography-2.0.2-r1.ebuild
+++ b/dev-python/cryptography/cryptography-2.0.2-r1.ebuild
@@ -9,7 +9,7 @@ PYTHON_REQ_USE="threads(+)"
 inherit distutils-r1 flag-o-matic
 
 DESCRIPTION="Library providing cryptographic recipes and primitives"
-HOMEPAGE="https://github.com/pyca/cryptography/ https://pypi.python.org/pypi/cryptography/"
+HOMEPAGE="https://github.com/pyca/cryptography/ https://pypi.org/project/cryptography/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="|| ( Apache-2.0 BSD )"
diff --git a/dev-python/cryptography/cryptography-2.1.4-r1.ebuild b/dev-python/cryptography/cryptography-2.1.4-r1.ebuild
index 27a23caab640a..211264255db07 100644
--- a/dev-python/cryptography/cryptography-2.1.4-r1.ebuild
+++ b/dev-python/cryptography/cryptography-2.1.4-r1.ebuild
@@ -9,7 +9,7 @@ PYTHON_REQ_USE="threads(+)"
 inherit distutils-r1 flag-o-matic
 
 DESCRIPTION="Library providing cryptographic recipes and primitives"
-HOMEPAGE="https://github.com/pyca/cryptography/ https://pypi.python.org/pypi/cryptography/"
+HOMEPAGE="https://github.com/pyca/cryptography/ https://pypi.org/project/cryptography/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="|| ( Apache-2.0 BSD )"
diff --git a/dev-python/cryptography/cryptography-2.1.4.ebuild b/dev-python/cryptography/cryptography-2.1.4.ebuild
index f646f58aab9fb..3a308b45eb4bf 100644
--- a/dev-python/cryptography/cryptography-2.1.4.ebuild
+++ b/dev-python/cryptography/cryptography-2.1.4.ebuild
@@ -9,7 +9,7 @@ PYTHON_REQ_USE="threads(+)"
 inherit distutils-r1 flag-o-matic
 
 DESCRIPTION="Library providing cryptographic recipes and primitives"
-HOMEPAGE="https://github.com/pyca/cryptography/ https://pypi.python.org/pypi/cryptography/"
+HOMEPAGE="https://github.com/pyca/cryptography/ https://pypi.org/project/cryptography/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="|| ( Apache-2.0 BSD )"
diff --git a/dev-python/cssselect/cssselect-0.9.1.ebuild b/dev-python/cssselect/cssselect-0.9.1.ebuild
index 9852fef53db74..edf096061d70e 100644
--- a/dev-python/cssselect/cssselect-0.9.1.ebuild
+++ b/dev-python/cssselect/cssselect-0.9.1.ebuild
@@ -9,7 +9,7 @@ inherit distutils-r1
 
 DESCRIPTION="parses CSS3 Selectors and translates them to XPath 1.0"
 HOMEPAGE="https://cssselect.readthedocs.io/en/latest/
-	https://pypi.python.org/pypi/cssselect"
+	https://pypi.org/project/cssselect"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/cssselect/cssselect-1.0.1.ebuild b/dev-python/cssselect/cssselect-1.0.1.ebuild
index 4470252dea861..e4af217e6fe22 100644
--- a/dev-python/cssselect/cssselect-1.0.1.ebuild
+++ b/dev-python/cssselect/cssselect-1.0.1.ebuild
@@ -9,7 +9,7 @@ inherit distutils-r1
 
 DESCRIPTION="parses CSS3 Selectors and translates them to XPath 1.0"
 HOMEPAGE="https://cssselect.readthedocs.io/en/latest/
-	https://pypi.python.org/pypi/cssselect"
+	https://pypi.org/project/cssselect"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/cssselect/cssselect-1.0.3.ebuild b/dev-python/cssselect/cssselect-1.0.3.ebuild
index bc56ed75caa84..12e72c73afbf9 100644
--- a/dev-python/cssselect/cssselect-1.0.3.ebuild
+++ b/dev-python/cssselect/cssselect-1.0.3.ebuild
@@ -9,7 +9,7 @@ inherit distutils-r1
 
 DESCRIPTION="parses CSS3 Selectors and translates them to XPath 1.0"
 HOMEPAGE="https://cssselect.readthedocs.io/en/latest/
-	https://pypi.python.org/pypi/cssselect
+	https://pypi.org/project/cssselect
 	https://github.com/scrapy/cssselect"
 SRC_URI="https://github.com/scrapy/cssselect/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
diff --git a/dev-python/cssselect2/cssselect2-0.2.0.ebuild b/dev-python/cssselect2/cssselect2-0.2.0.ebuild
index a2081c1b1f2d8..ad8559b907afa 100644
--- a/dev-python/cssselect2/cssselect2-0.2.0.ebuild
+++ b/dev-python/cssselect2/cssselect2-0.2.0.ebuild
@@ -9,7 +9,7 @@ inherit distutils-r1
 
 DESCRIPTION="parses CSS3 Selectors and translates them to XPath 1.0"
 HOMEPAGE="https://cssselect.readthedocs.io/en/latest/
-	https://pypi.python.org/pypi/cssselect"
+	https://pypi.org/project/cssselect"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/cssutils/cssutils-1.0.1.ebuild b/dev-python/cssutils/cssutils-1.0.1.ebuild
index dc4289b6fe2b9..df05bd96b105e 100644
--- a/dev-python/cssutils/cssutils-1.0.1.ebuild
+++ b/dev-python/cssutils/cssutils-1.0.1.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python{2_7,3_{4,5,6}} pypy )
 inherit distutils-r1
 
 DESCRIPTION="A CSS Cascading Style Sheets library"
-HOMEPAGE="https://pypi.python.org/pypi/cssutils/ https://bitbucket.org/cthedot/cssutils http://cthedot.de/cssutils/"
+HOMEPAGE="https://pypi.org/project/cssutils/ https://bitbucket.org/cthedot/cssutils http://cthedot.de/cssutils/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
diff --git a/dev-python/cssutils/cssutils-1.0.2.ebuild b/dev-python/cssutils/cssutils-1.0.2.ebuild
index c07182ec400ef..bcb2600b3e7f9 100644
--- a/dev-python/cssutils/cssutils-1.0.2.ebuild
+++ b/dev-python/cssutils/cssutils-1.0.2.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python{2_7,3_{4,5,6}} pypy )
 inherit distutils-r1
 
 DESCRIPTION="A CSS Cascading Style Sheets library"
-HOMEPAGE="https://pypi.python.org/pypi/cssutils/ https://bitbucket.org/cthedot/cssutils http://cthedot.de/cssutils/"
+HOMEPAGE="https://pypi.org/project/cssutils/ https://bitbucket.org/cthedot/cssutils http://cthedot.de/cssutils/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
diff --git a/dev-python/cycler/cycler-0.10.0.ebuild b/dev-python/cycler/cycler-0.10.0.ebuild
index 4dee2de120994..9841cf8ecde3a 100644
--- a/dev-python/cycler/cycler-0.10.0.ebuild
+++ b/dev-python/cycler/cycler-0.10.0.ebuild
@@ -12,7 +12,7 @@ MY_PN="Cycler"
 DESCRIPTION="Composable style cycles"
 HOMEPAGE="
 	https://matplotlib.org/cycler/
-	https://pypi.python.org/pypi/Cycler/
+	https://pypi.org/project/Cycler/
 	https://github.com/matplotlib/cycler"
 SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${P}.tar.gz"
 
diff --git a/dev-python/cython/cython-0.25.2.ebuild b/dev-python/cython/cython-0.25.2.ebuild
index f9dc1e2e26e4d..160a3b3f26f61 100644
--- a/dev-python/cython/cython-0.25.2.ebuild
+++ b/dev-python/cython/cython-0.25.2.ebuild
@@ -12,7 +12,7 @@ MY_PN="Cython"
 MY_P="${MY_PN}-${PV/_/}"
 
 DESCRIPTION="A Python to C compiler"
-HOMEPAGE="http://cython.org https://pypi.python.org/pypi/Cython"
+HOMEPAGE="http://cython.org https://pypi.org/project/Cython"
 SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0"
diff --git a/dev-python/cython/cython-0.26.1.ebuild b/dev-python/cython/cython-0.26.1.ebuild
index 7599fb5e7e1f6..dcf0672f4984d 100644
--- a/dev-python/cython/cython-0.26.1.ebuild
+++ b/dev-python/cython/cython-0.26.1.ebuild
@@ -12,7 +12,7 @@ MY_PN="Cython"
 MY_P="${MY_PN}-${PV/_/}"
 
 DESCRIPTION="A Python to C compiler"
-HOMEPAGE="http://cython.org https://pypi.python.org/pypi/Cython"
+HOMEPAGE="http://cython.org https://pypi.org/project/Cython"
 SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0"
diff --git a/dev-python/cytoolz/cytoolz-0.8.0.ebuild b/dev-python/cytoolz/cytoolz-0.8.0.ebuild
index 5290b6ba45bb4..12bae57742782 100644
--- a/dev-python/cytoolz/cytoolz-0.8.0.ebuild
+++ b/dev-python/cytoolz/cytoolz-0.8.0.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
 inherit distutils-r1
 
 DESCRIPTION="Cython implementation of Toolz: High performance functional utilities"
-HOMEPAGE="https://pypi.python.org/pypi/cytoolz"
+HOMEPAGE="https://pypi.org/project/cytoolz"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/cytoolz/cytoolz-0.8.2.ebuild b/dev-python/cytoolz/cytoolz-0.8.2.ebuild
index fb229fab00fd6..6f93312e55c9c 100644
--- a/dev-python/cytoolz/cytoolz-0.8.2.ebuild
+++ b/dev-python/cytoolz/cytoolz-0.8.2.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
 inherit distutils-r1
 
 DESCRIPTION="Cython implementation of Toolz: High performance functional utilities"
-HOMEPAGE="https://pypi.python.org/pypi/cytoolz"
+HOMEPAGE="https://pypi.org/project/cytoolz"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/d2to1/d2to1-0.2.12_p1.ebuild b/dev-python/d2to1/d2to1-0.2.12_p1.ebuild
index 070e6c3ae51e3..c6fa33a3399bc 100644
--- a/dev-python/d2to1/d2to1-0.2.12_p1.ebuild
+++ b/dev-python/d2to1/d2to1-0.2.12_p1.ebuild
@@ -10,7 +10,7 @@ inherit distutils-r1
 MY_P="${P/_p/.post}"
 
 DESCRIPTION="Allows using distutils2-like setup.cfg files for a package metadata"
-HOMEPAGE="https://pypi.python.org/pypi/d2to1 https://github.com/embray/d2to1"
+HOMEPAGE="https://pypi.org/project/d2to1 https://github.com/embray/d2to1"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/dap/dap-2.2.6.7-r1.ebuild b/dev-python/dap/dap-2.2.6.7-r1.ebuild
index cc9a0959438a1..c6b5fb43a0446 100644
--- a/dev-python/dap/dap-2.2.6.7-r1.ebuild
+++ b/dev-python/dap/dap-2.2.6.7-r1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 )
 inherit distutils-r1
 
 DESCRIPTION="Data Access Protocol client and server"
-HOMEPAGE="http://pydap.org https://pypi.python.org/pypi/dap https://pypi.python.org/pypi/Pydap"
+HOMEPAGE="http://pydap.org https://pypi.org/project/dap https://pypi.org/project/Pydap"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/dbutils/dbutils-1.1-r1.ebuild b/dev-python/dbutils/dbutils-1.1-r1.ebuild
index c8ccf617c124b..34896e18ca655 100644
--- a/dev-python/dbutils/dbutils-1.1-r1.ebuild
+++ b/dev-python/dbutils/dbutils-1.1-r1.ebuild
@@ -12,7 +12,7 @@ MY_P="${MY_PN}-${PV}"
 DESCRIPTION="Database connections for multi-threaded environments"
 HOMEPAGE="https://cito.github.io/DBUtils/
 	https://github.com/Cito/DBUtils
-	https://pypi.python.org/pypi/DBUtils"
+	https://pypi.org/project/DBUtils"
 SRC_URI="mirror://pypi/${P:0:1}/${PN}/${MY_P}.tar.gz"
 
 LICENSE="OSL-2.0"
diff --git a/dev-python/ddt/ddt-1.1.1.ebuild b/dev-python/ddt/ddt-1.1.1.ebuild
index 14c9db33ad236..28b98db37142b 100644
--- a/dev-python/ddt/ddt-1.1.1.ebuild
+++ b/dev-python/ddt/ddt-1.1.1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_{4,5,6}} )
 inherit distutils-r1
 
 DESCRIPTION="A library to multiply test cases"
-HOMEPAGE="https://pypi.python.org/pypi/ddt https://github.com/txels/ddt"
+HOMEPAGE="https://pypi.org/project/ddt https://github.com/txels/ddt"
 SRC_URI="mirror://pypi/d/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/decorator/decorator-4.1.2.ebuild b/dev-python/decorator/decorator-4.1.2.ebuild
index dc69f6e48097b..fa585aaa7936b 100644
--- a/dev-python/decorator/decorator-4.1.2.ebuild
+++ b/dev-python/decorator/decorator-4.1.2.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="Simplifies the usage of decorators for the average programmer"
-HOMEPAGE="https://github.com/micheles/decorator https://pypi.python.org/pypi/decorator"
+HOMEPAGE="https://github.com/micheles/decorator https://pypi.org/project/decorator"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/decorator/decorator-4.2.1.ebuild b/dev-python/decorator/decorator-4.2.1.ebuild
index dc69f6e48097b..fa585aaa7936b 100644
--- a/dev-python/decorator/decorator-4.2.1.ebuild
+++ b/dev-python/decorator/decorator-4.2.1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="Simplifies the usage of decorators for the average programmer"
-HOMEPAGE="https://github.com/micheles/decorator https://pypi.python.org/pypi/decorator"
+HOMEPAGE="https://github.com/micheles/decorator https://pypi.org/project/decorator"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/decoratortools/decoratortools-1.8-r1.ebuild b/dev-python/decoratortools/decoratortools-1.8-r1.ebuild
index f869b727359ea..2053c45630fbc 100644
--- a/dev-python/decoratortools/decoratortools-1.8-r1.ebuild
+++ b/dev-python/decoratortools/decoratortools-1.8-r1.ebuild
@@ -11,7 +11,7 @@ MY_PN="DecoratorTools"
 MY_P="${MY_PN}-${PV}"
 
 DESCRIPTION="Class, function, and metaclass decorators"
-HOMEPAGE="https://pypi.python.org/pypi/DecoratorTools"
+HOMEPAGE="https://pypi.org/project/DecoratorTools"
 SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.zip"
 
 LICENSE="|| ( PSF-2 ZPL )"
diff --git a/dev-python/deform/deform-0.9.9.ebuild b/dev-python/deform/deform-0.9.9.ebuild
index fdddfda7b83ae..ddfd8276ae23a 100644
--- a/dev-python/deform/deform-0.9.9.ebuild
+++ b/dev-python/deform/deform-0.9.9.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy )
 inherit distutils-r1
 
 DESCRIPTION="Another form generation library"
-HOMEPAGE="https://docs.pylonsproject.org/projects/deform/en/latest/ https://pypi.python.org/pypi/deform https://github.com/Pylons/deform"
+HOMEPAGE="https://docs.pylonsproject.org/projects/deform/en/latest/ https://pypi.org/project/deform https://github.com/Pylons/deform"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="repoze"
diff --git a/dev-python/defusedxml/defusedxml-0.5.0.ebuild b/dev-python/defusedxml/defusedxml-0.5.0.ebuild
index da34999e52053..9bb47fecfd723 100644
--- a/dev-python/defusedxml/defusedxml-0.5.0.ebuild
+++ b/dev-python/defusedxml/defusedxml-0.5.0.ebuild
@@ -9,7 +9,7 @@ PYTHON_REQ_USE="xml(+)"
 inherit distutils-r1
 
 DESCRIPTION="XML bomb protection for Python stdlib modules, an xml serialiser"
-HOMEPAGE="https://bitbucket.org/tiran/defusedxml https://pypi.python.org/pypi/defusedxml"
+HOMEPAGE="https://bitbucket.org/tiran/defusedxml https://pypi.org/project/defusedxml"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd"
 IUSE="examples"
diff --git a/dev-python/demjson/demjson-2.2.4.ebuild b/dev-python/demjson/demjson-2.2.4.ebuild
index d76340b540325..07d6ad5b8630e 100644
--- a/dev-python/demjson/demjson-2.2.4.ebuild
+++ b/dev-python/demjson/demjson-2.2.4.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5} pypy pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="encoder, decoder, and lint/validator for JSON (JavaScript Object Notation) compliant with RFC 4627"
-HOMEPAGE="http://deron.meranda.us/python/demjson/ https://pypi.python.org/pypi/demjson"
+HOMEPAGE="http://deron.meranda.us/python/demjson/ https://pypi.org/project/demjson"
 SRC_URI="http://deron.meranda.us/python/${PN}/dist/${P}.tar.gz"
 
 LICENSE="LGPL-3"
diff --git a/dev-python/detox/detox-0.11.ebuild b/dev-python/detox/detox-0.11.ebuild
index 79444a13712ad..c25ad9c152b16 100644
--- a/dev-python/detox/detox-0.11.ebuild
+++ b/dev-python/detox/detox-0.11.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_{4,5,6}} )
 inherit distutils-r1
 
 DESCRIPTION="distributed tox"
-HOMEPAGE="https://github.com/tox-dev/detox https://pypi.python.org/pypi/detox"
+HOMEPAGE="https://github.com/tox-dev/detox https://pypi.org/project/detox"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/dexml/dexml-0.5.1.ebuild b/dev-python/dexml/dexml-0.5.1.ebuild
index ca49a4bd648a5..8d8b45f902b92 100644
--- a/dev-python/dexml/dexml-0.5.1.ebuild
+++ b/dev-python/dexml/dexml-0.5.1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_{4,5,6}} pypy pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="Dead-simple Object-XML mapper for Python"
-HOMEPAGE="https://pypi.python.org/pypi/dexml"
+HOMEPAGE="https://pypi.org/project/dexml"
 SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/dicttoxml/dicttoxml-1.7.4.ebuild b/dev-python/dicttoxml/dicttoxml-1.7.4.ebuild
index ea8acad65ff57..755b4dc73df9e 100644
--- a/dev-python/dicttoxml/dicttoxml-1.7.4.ebuild
+++ b/dev-python/dicttoxml/dicttoxml-1.7.4.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
 inherit distutils-r1
 
 DESCRIPTION="Converts a Python dictionary or other data type to a valid XML string"
-HOMEPAGE="https://github.com/quandyfactory/dicttoxml https://pypi.python.org/pypi/dicttoxml/"
+HOMEPAGE="https://github.com/quandyfactory/dicttoxml https://pypi.org/project/dicttoxml/"
 SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
diff --git a/dev-python/diff-match-patch/diff-match-patch-20121119.ebuild b/dev-python/diff-match-patch/diff-match-patch-20121119.ebuild
index a0de8651a7435..eacebb921745c 100644
--- a/dev-python/diff-match-patch/diff-match-patch-20121119.ebuild
+++ b/dev-python/diff-match-patch/diff-match-patch-20121119.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy )
 inherit distutils-r1
 
 DESCRIPTION="Diff, match and patch algorithms for plain text"
-HOMEPAGE="https://pypi.python.org/pypi/diff-match-patch/"
+HOMEPAGE="https://pypi.org/project/diff-match-patch/"
 SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
diff --git a/dev-python/dill/dill-0.2.5.ebuild b/dev-python/dill/dill-0.2.5.ebuild
index 4f4dfadb17c2b..c01c5073b679a 100644
--- a/dev-python/dill/dill-0.2.5.ebuild
+++ b/dev-python/dill/dill-0.2.5.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{3,4,5,6} pypy )
 inherit distutils-r1
 
 DESCRIPTION="Serialize all of python (almost)"
-HOMEPAGE="https://pypi.python.org/pypi/dill"
+HOMEPAGE="https://pypi.org/project/dill"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tgz"
 
 LICENSE="BSD"
diff --git a/dev-python/dingus/dingus-0.3.4-r1.ebuild b/dev-python/dingus/dingus-0.3.4-r1.ebuild
index 85b1a70ff0c06..ee8118b58f18d 100644
--- a/dev-python/dingus/dingus-0.3.4-r1.ebuild
+++ b/dev-python/dingus/dingus-0.3.4-r1.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 pypy )
 inherit distutils-r1
 
 DESCRIPTION="A record-then-assert mocking library"
-HOMEPAGE="https://pypi.python.org/pypi/dingus/"
+HOMEPAGE="https://pypi.org/project/dingus/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/discogs-client/discogs-client-2.0.2.ebuild b/dev-python/discogs-client/discogs-client-2.0.2.ebuild
index 5399851696739..f610682e55110 100644
--- a/dev-python/discogs-client/discogs-client-2.0.2.ebuild
+++ b/dev-python/discogs-client/discogs-client-2.0.2.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 pypy )
 inherit distutils-r1
 
 DESCRIPTION="Official Python API client for Discogs"
-HOMEPAGE="https://github.com/discogs/discogs_client https://pypi.python.org/pypi/discogs-client"
+HOMEPAGE="https://github.com/discogs/discogs_client https://pypi.org/project/discogs-client"
 #SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 SRC_URI="https://github.com/discogs/${PN/-/_}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
diff --git a/dev-python/discogs-client/discogs-client-2.2.1.ebuild b/dev-python/discogs-client/discogs-client-2.2.1.ebuild
index 0b6a6c19032f3..6ccbc25fc36d8 100644
--- a/dev-python/discogs-client/discogs-client-2.2.1.ebuild
+++ b/dev-python/discogs-client/discogs-client-2.2.1.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python{2_7,3_{4,5,6}} )
 inherit distutils-r1
 
 DESCRIPTION="Official Python API client for Discogs"
-HOMEPAGE="https://github.com/discogs/discogs_client https://pypi.python.org/pypi/discogs-client"
+HOMEPAGE="https://github.com/discogs/discogs_client https://pypi.org/project/discogs-client"
 SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD-2"
diff --git a/dev-python/distlib/distlib-0.2.1.ebuild b/dev-python/distlib/distlib-0.2.1.ebuild
index 60240223b527d..74b04d71d5a81 100644
--- a/dev-python/distlib/distlib-0.2.1.ebuild
+++ b/dev-python/distlib/distlib-0.2.1.ebuild
@@ -9,7 +9,7 @@ PYTHON_REQ_USE="threads(+)"
 inherit distutils-r1
 
 DESCRIPTION="Distribution utilities"
-HOMEPAGE="https://pypi.python.org/pypi/distlib https://bitbucket.org/vinay.sajip/distlib https://github.com/vsajip/distlib"
+HOMEPAGE="https://pypi.org/project/distlib https://bitbucket.org/vinay.sajip/distlib https://github.com/vsajip/distlib"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
 
 SLOT="0"
diff --git a/dev-python/distlib/distlib-0.2.4.ebuild b/dev-python/distlib/distlib-0.2.4.ebuild
index 81c0a6d1676bf..cf22159a1cc29 100644
--- a/dev-python/distlib/distlib-0.2.4.ebuild
+++ b/dev-python/distlib/distlib-0.2.4.ebuild
@@ -9,7 +9,7 @@ PYTHON_REQ_USE="threads(+)"
 inherit distutils-r1
 
 DESCRIPTION="Distribution utilities"
-HOMEPAGE="https://pypi.python.org/pypi/distlib https://bitbucket.org/vinay.sajip/distlib https://github.com/vsajip/distlib"
+HOMEPAGE="https://pypi.org/project/distlib https://bitbucket.org/vinay.sajip/distlib https://github.com/vsajip/distlib"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
 
 SLOT="0"
diff --git a/dev-python/dj-database-url/dj-database-url-0.4.2.ebuild b/dev-python/dj-database-url/dj-database-url-0.4.2.ebuild
index f48d5a01d1fd9..e5b9cdc40f6a4 100644
--- a/dev-python/dj-database-url/dj-database-url-0.4.2.ebuild
+++ b/dev-python/dj-database-url/dj-database-url-0.4.2.ebuild
@@ -9,7 +9,7 @@ inherit distutils-r1
 
 DESCRIPTION="Use Database URLs in your Django Application"
 HOMEPAGE="
-	https://pypi.python.org/pypi/dj-database-url
+	https://pypi.org/project/dj-database-url
 	https://github.com/kennethreitz/dj-database-url"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
diff --git a/dev-python/django-appconf/django-appconf-1.0.1.ebuild b/dev-python/django-appconf/django-appconf-1.0.1.ebuild
index 92c6bd9ff805f..f836d297dd1e7 100644
--- a/dev-python/django-appconf/django-appconf-1.0.1.ebuild
+++ b/dev-python/django-appconf/django-appconf-1.0.1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
 inherit distutils-r1
 
 DESCRIPTION="A helper class for handling configuration defaults of packaged apps gracefully"
-HOMEPAGE="https://github.com/jezdez/django-appconf http://django-appconf.readthedocs.org/ https://pypi.python.org/pypi/django-appconf"
+HOMEPAGE="https://github.com/jezdez/django-appconf http://django-appconf.readthedocs.org/ https://pypi.org/project/django-appconf"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/django-auth-ldap/django-auth-ldap-1.2.2.ebuild b/dev-python/django-auth-ldap/django-auth-ldap-1.2.2.ebuild
index 017e164fbb9ab..e004e8ee61d72 100644
--- a/dev-python/django-auth-ldap/django-auth-ldap-1.2.2.ebuild
+++ b/dev-python/django-auth-ldap/django-auth-ldap-1.2.2.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 pypy )
 inherit distutils-r1
 
 DESCRIPTION="Django LDAP authentication backend"
-HOMEPAGE="https://pypi.python.org/pypi/django-auth-ldap https://bitbucket.org/psagers/django-auth-ldap/"
+HOMEPAGE="https://pypi.org/project/django-auth-ldap https://bitbucket.org/psagers/django-auth-ldap/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 KEYWORDS="amd64 x86"
diff --git a/dev-python/django-auth-ldap/django-auth-ldap-1.2.7.ebuild b/dev-python/django-auth-ldap/django-auth-ldap-1.2.7.ebuild
index f19cc78040889..80ef3a07be1c5 100644
--- a/dev-python/django-auth-ldap/django-auth-ldap-1.2.7.ebuild
+++ b/dev-python/django-auth-ldap/django-auth-ldap-1.2.7.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 pypy )
 inherit distutils-r1
 
 DESCRIPTION="Django LDAP authentication backend"
-HOMEPAGE="https://pypi.python.org/pypi/django-auth-ldap https://bitbucket.org/psagers/django-auth-ldap/"
+HOMEPAGE="https://pypi.org/project/django-auth-ldap https://bitbucket.org/psagers/django-auth-ldap/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 KEYWORDS="~amd64 ~x86"
diff --git a/dev-python/django-baker/django-baker-0.11-r2.ebuild b/dev-python/django-baker/django-baker-0.11-r2.ebuild
index cd08ed5ad5f85..fc19194f65a0e 100644
--- a/dev-python/django-baker/django-baker-0.11-r2.ebuild
+++ b/dev-python/django-baker/django-baker-0.11-r2.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
 inherit distutils-r1
 
 DESCRIPTION="Management command that generates views, forms, urls, admin, and templates for models"
-HOMEPAGE="https://pypi.python.org/pypi/django-baker https://github.com/krisfields/django-baker"
+HOMEPAGE="https://pypi.org/project/django-baker https://github.com/krisfields/django-baker"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
diff --git a/dev-python/django-classy-tags/django-classy-tags-0.7.2.ebuild b/dev-python/django-classy-tags/django-classy-tags-0.7.2.ebuild
index 7bbcb63319530..67c315059d048 100644
--- a/dev-python/django-classy-tags/django-classy-tags-0.7.2.ebuild
+++ b/dev-python/django-classy-tags/django-classy-tags-0.7.2.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_4} )
 inherit distutils-r1
 
 DESCRIPTION="Class based template tags for Django"
-HOMEPAGE="https://github.com/ojii/django-classy-tags https://pypi.python.org/pypi/django-classy-tags"
+HOMEPAGE="https://github.com/ojii/django-classy-tags https://pypi.org/project/django-classy-tags"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/django-classy-tags/django-classy-tags-0.8.0.ebuild b/dev-python/django-classy-tags/django-classy-tags-0.8.0.ebuild
index 6111c95884bb1..76df987602b99 100644
--- a/dev-python/django-classy-tags/django-classy-tags-0.8.0.ebuild
+++ b/dev-python/django-classy-tags/django-classy-tags-0.8.0.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_{3,4,5,6}} )
 inherit distutils-r1
 
 DESCRIPTION="Class based template tags for Django"
-HOMEPAGE="https://github.com/ojii/django-classy-tags https://pypi.python.org/pypi/django-classy-tags"
+HOMEPAGE="https://github.com/ojii/django-classy-tags https://pypi.org/project/django-classy-tags"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/django-crispy-forms/django-crispy-forms-1.6.0.ebuild b/dev-python/django-crispy-forms/django-crispy-forms-1.6.0.ebuild
index 083636da45308..80291768affd3 100644
--- a/dev-python/django-crispy-forms/django-crispy-forms-1.6.0.ebuild
+++ b/dev-python/django-crispy-forms/django-crispy-forms-1.6.0.ebuild
@@ -9,7 +9,7 @@ inherit distutils-r1
 
 DESCRIPTION="Best way to have Django DRY forms"
 HOMEPAGE="
-	https://pypi.python.org/pypi/django-crispy-forms/
+	https://pypi.org/project/django-crispy-forms/
 	https://github.com/maraujop/django-crispy-forms
 	https://django-crispy-forms.readthedocs.org/en/latest/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
diff --git a/dev-python/django-debug-toolbar/django-debug-toolbar-1.5.ebuild b/dev-python/django-debug-toolbar/django-debug-toolbar-1.5.ebuild
index b80879e83b4c9..abe075394d35b 100644
--- a/dev-python/django-debug-toolbar/django-debug-toolbar-1.5.ebuild
+++ b/dev-python/django-debug-toolbar/django-debug-toolbar-1.5.ebuild
@@ -9,7 +9,7 @@ inherit distutils-r1
 
 DESCRIPTION="A configurable set of panels that display debug information"
 HOMEPAGE="
-	https://pypi.python.org/pypi/django-debug-toolbar/
+	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"
 
diff --git a/dev-python/django-discover-runner/django-discover-runner-1.0.ebuild b/dev-python/django-discover-runner/django-discover-runner-1.0.ebuild
index 4f48bdc5583d2..0d00dd1dfdec2 100644
--- a/dev-python/django-discover-runner/django-discover-runner-1.0.ebuild
+++ b/dev-python/django-discover-runner/django-discover-runner-1.0.ebuild
@@ -8,7 +8,7 @@ inherit distutils-r1
 
 DESCRIPTION="A Django test runner based on unittest2's test discovery"
 HOMEPAGE="https://github.com/jezdez/django-discover-runner
-	https://pypi.python.org/pypi/django-discover-runner"
+	https://pypi.org/project/django-discover-runner"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/django-durationfield/django-durationfield-0.5.2.ebuild b/dev-python/django-durationfield/django-durationfield-0.5.2.ebuild
index 23c9e23b4cf29..1ccdc3bfdde50 100644
--- a/dev-python/django-durationfield/django-durationfield-0.5.2.ebuild
+++ b/dev-python/django-durationfield/django-durationfield-0.5.2.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_{6,7},3_{3,4}} )
 inherit distutils-r1
 
 DESCRIPTION="Reusable app for adding a DurationField to Django"
-HOMEPAGE="https://pypi.python.org/pypi/django-durationfield"
+HOMEPAGE="https://pypi.org/project/django-durationfield"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/django-durationfield/django-durationfield-0.5.4.ebuild b/dev-python/django-durationfield/django-durationfield-0.5.4.ebuild
index 5a796ae34645f..e2c8ccbff0bfa 100644
--- a/dev-python/django-durationfield/django-durationfield-0.5.4.ebuild
+++ b/dev-python/django-durationfield/django-durationfield-0.5.4.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_{6,7},3_{3,4,5,6}} )
 inherit distutils-r1
 
 DESCRIPTION="Reusable app for adding a DurationField to Django"
-HOMEPAGE="https://pypi.python.org/pypi/django-durationfield"
+HOMEPAGE="https://pypi.org/project/django-durationfield"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/django-evolution/django-evolution-0.7.4.ebuild b/dev-python/django-evolution/django-evolution-0.7.4.ebuild
index 72352a19cd9fd..b3143339cde7c 100644
--- a/dev-python/django-evolution/django-evolution-0.7.4.ebuild
+++ b/dev-python/django-evolution/django-evolution-0.7.4.ebuild
@@ -13,7 +13,7 @@ MY_P=${MY_PN}-${PV}
 RELEASE="0.7"
 
 DESCRIPTION="A Django application that will run cron jobs for other django apps"
-HOMEPAGE="https://pypi.python.org/pypi/django_evolution/"
+HOMEPAGE="https://pypi.org/project/django_evolution/"
 SRC_URI="http://downloads.reviewboard.org/releases/${PN}/${RELEASE}/${MY_P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/django-evolution/django-evolution-0.7.5.ebuild b/dev-python/django-evolution/django-evolution-0.7.5.ebuild
index 280f18145a395..d195984fb368f 100644
--- a/dev-python/django-evolution/django-evolution-0.7.5.ebuild
+++ b/dev-python/django-evolution/django-evolution-0.7.5.ebuild
@@ -13,7 +13,7 @@ MY_P=${MY_PN}-${PV}
 RELEASE="0.7"
 
 DESCRIPTION="A Django application that will run cron jobs for other django apps"
-HOMEPAGE="https://pypi.python.org/pypi/django_evolution/"
+HOMEPAGE="https://pypi.org/project/django_evolution/"
 SRC_URI="http://downloads.reviewboard.org/releases/${PN}/${RELEASE}/${MY_P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/django-filer/django-filer-1.2.0.ebuild b/dev-python/django-filer/django-filer-1.2.0.ebuild
index 636bc3e68c9a1..c4d705adbec56 100644
--- a/dev-python/django-filer/django-filer-1.2.0.ebuild
+++ b/dev-python/django-filer/django-filer-1.2.0.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_4} )
 inherit distutils-r1
 
 DESCRIPTION="File management application for django that makes handling of files and images"
-HOMEPAGE="https://pypi.python.org/pypi/django-filer"
+HOMEPAGE="https://pypi.org/project/django-filer"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/django-filer/django-filer-1.2.7.ebuild b/dev-python/django-filer/django-filer-1.2.7.ebuild
index 689e1625dbd8b..b1262d7e04efb 100644
--- a/dev-python/django-filer/django-filer-1.2.7.ebuild
+++ b/dev-python/django-filer/django-filer-1.2.7.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_{6,7},3_{4,5,6}} )
 inherit distutils-r1
 
 DESCRIPTION="File management application for django that makes handling of files and images"
-HOMEPAGE="https://pypi.python.org/pypi/django-filer"
+HOMEPAGE="https://pypi.org/project/django-filer"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/django-grappelli/django-grappelli-2.7.3.ebuild b/dev-python/django-grappelli/django-grappelli-2.7.3.ebuild
index 9c4cfe84f26bc..ae986a958640f 100644
--- a/dev-python/django-grappelli/django-grappelli-2.7.3.ebuild
+++ b/dev-python/django-grappelli/django-grappelli-2.7.3.ebuild
@@ -9,7 +9,7 @@ inherit distutils-r1
 
 DESCRIPTION="A jazzy skin for the Django Admin-Interface"
 HOMEPAGE="
-	https://pypi.python.org/pypi/django-grappelli
+	https://pypi.org/project/django-grappelli
 	https://django-grappelli.readthedocs.org
 	https://github.com/sehmaschine/django-grappelli"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
diff --git a/dev-python/django-international/django-international-0.0.6.ebuild b/dev-python/django-international/django-international-0.0.6.ebuild
index c87ed9a74b40d..0250d1d2d4f43 100644
--- a/dev-python/django-international/django-international-0.0.6.ebuild
+++ b/dev-python/django-international/django-international-0.0.6.ebuild
@@ -6,7 +6,7 @@ PYTHON_COMPAT=( python2_7 )
 inherit distutils-r1
 
 DESCRIPTION="Country and currency data for Django projects"
-HOMEPAGE="https://pypi.python.org/pypi/django-international https://bitbucket.org/monwara/django-international"
+HOMEPAGE="https://pypi.org/project/django-international https://bitbucket.org/monwara/django-international"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
diff --git a/dev-python/django-ldap-groups/django-ldap-groups-0.1.3-r1.ebuild b/dev-python/django-ldap-groups/django-ldap-groups-0.1.3-r1.ebuild
index 53cb862e90749..e432b241541f6 100644
--- a/dev-python/django-ldap-groups/django-ldap-groups-0.1.3-r1.ebuild
+++ b/dev-python/django-ldap-groups/django-ldap-groups-0.1.3-r1.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 )
 inherit distutils-r1
 
 DESCRIPTION="A reusable application for the Django web framework"
-HOMEPAGE="https://pypi.python.org/pypi/django-ldap-groups"
+HOMEPAGE="https://pypi.org/project/django-ldap-groups"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 KEYWORDS="amd64 x86"
diff --git a/dev-python/django-mptt/django-mptt-0.7.4.ebuild b/dev-python/django-mptt/django-mptt-0.7.4.ebuild
index e13e2c94b030a..7a6fc018d67f5 100644
--- a/dev-python/django-mptt/django-mptt-0.7.4.ebuild
+++ b/dev-python/django-mptt/django-mptt-0.7.4.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_4} )
 inherit distutils-r1
 
 DESCRIPTION="Utilities for implementing Modified Preorder Tree Traversal"
-HOMEPAGE="https://pypi.python.org/pypi/django-mptt"
+HOMEPAGE="https://pypi.org/project/django-mptt"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/django-mptt/django-mptt-0.8.4.ebuild b/dev-python/django-mptt/django-mptt-0.8.4.ebuild
index e1e5cac836182..bc515fe38413f 100644
--- a/dev-python/django-mptt/django-mptt-0.8.4.ebuild
+++ b/dev-python/django-mptt/django-mptt-0.8.4.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_{4,5,6}} )
 inherit distutils-r1
 
 DESCRIPTION="Utilities for implementing Modified Preorder Tree Traversal"
-HOMEPAGE="https://pypi.python.org/pypi/django-mptt"
+HOMEPAGE="https://pypi.org/project/django-mptt"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/django-oauth-plus/django-oauth-plus-2.2.8.ebuild b/dev-python/django-oauth-plus/django-oauth-plus-2.2.8.ebuild
index a3b9d827c5099..cbac8dd23554c 100644
--- a/dev-python/django-oauth-plus/django-oauth-plus-2.2.8.ebuild
+++ b/dev-python/django-oauth-plus/django-oauth-plus-2.2.8.ebuild
@@ -9,7 +9,7 @@ PYTHON_COMPAT=( python2_7 pypy )
 inherit distutils-r1
 
 DESCRIPTION="Support of OAuth 1.0a in Django using python-oauth2"
-HOMEPAGE="https://pypi.python.org/pypi/django-oauth-plus	http://code.welldev.org/django-oauth-plus/"
+HOMEPAGE="https://pypi.org/project/django-oauth-plus	http://code.welldev.org/django-oauth-plus/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/django-pipeline/django-pipeline-1.6.0.ebuild b/dev-python/django-pipeline/django-pipeline-1.6.0.ebuild
index 823a233eb199b..d190d7f179cbf 100644
--- a/dev-python/django-pipeline/django-pipeline-1.6.0.ebuild
+++ b/dev-python/django-pipeline/django-pipeline-1.6.0.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy )
 inherit distutils-r1
 
 DESCRIPTION="An asset packaging library for Django"
-HOMEPAGE="https://pypi.python.org/pypi/django-pipeline/ https://github.com/cyberdelia/django-pipeline"
+HOMEPAGE="https://pypi.org/project/django-pipeline/ https://github.com/cyberdelia/django-pipeline"
 
 # PyPi releases lack docs/ subdir:
 # https://github.com/cyberdelia/django-pipeline/pull/254
diff --git a/dev-python/django-recaptcha/django-recaptcha-1.0.5.ebuild b/dev-python/django-recaptcha/django-recaptcha-1.0.5.ebuild
index 6f66645fdf32c..25a9a73d37449 100644
--- a/dev-python/django-recaptcha/django-recaptcha-1.0.5.ebuild
+++ b/dev-python/django-recaptcha/django-recaptcha-1.0.5.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy )
 inherit distutils-r1
 
 DESCRIPTION="Django recaptcha form field/widget app"
-HOMEPAGE="https://github.com/praekelt/django-recaptcha https://pypi.python.org/pypi/django-recaptcha"
+HOMEPAGE="https://github.com/praekelt/django-recaptcha https://pypi.org/project/django-recaptcha"
 #SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 SRC_URI="https://github.com/praekelt/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
diff --git a/dev-python/django-registration/django-registration-1.0.ebuild b/dev-python/django-registration/django-registration-1.0.ebuild
index f33429b58dfd9..4133300b72c37 100644
--- a/dev-python/django-registration/django-registration-1.0.ebuild
+++ b/dev-python/django-registration/django-registration-1.0.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 )
 inherit distutils-r1
 
 DESCRIPTION="An extensible user-registration application for Django"
-HOMEPAGE="https://www.bitbucket.org/ubernostrum/django-registration/wiki/ https://pypi.python.org/pypi/django-registration"
+HOMEPAGE="https://www.bitbucket.org/ubernostrum/django-registration/wiki/ https://pypi.org/project/django-registration"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/django-sekizai/django-sekizai-0.10.0.ebuild b/dev-python/django-sekizai/django-sekizai-0.10.0.ebuild
index c8c00c3bfe075..f2223c14da5a1 100644
--- a/dev-python/django-sekizai/django-sekizai-0.10.0.ebuild
+++ b/dev-python/django-sekizai/django-sekizai-0.10.0.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_{3,4,5,6}} )
 inherit distutils-r1
 
 DESCRIPTION="Django Template Blocks with extra functionality"
-HOMEPAGE="https://github.com/ojii/django-sekizai https://pypi.python.org/pypi/django-sekizai"
+HOMEPAGE="https://github.com/ojii/django-sekizai https://pypi.org/project/django-sekizai"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/django-select2/django-select2-4.2.2.ebuild b/dev-python/django-select2/django-select2-4.2.2.ebuild
index df1503ebdff31..96b27cb5601ec 100644
--- a/dev-python/django-select2/django-select2-4.2.2.ebuild
+++ b/dev-python/django-select2/django-select2-4.2.2.ebuild
@@ -9,7 +9,7 @@ inherit distutils-r1
 MY_PN="Django-Select2"
 
 DESCRIPTION="A Django integration of Select2"
-HOMEPAGE="https://pypi.python.org/pypi/Django-Select2"
+HOMEPAGE="https://pypi.org/project/Django-Select2"
 SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
 
 S="${WORKDIR}/${MY_PN}-${PV}"
diff --git a/dev-python/django-select2/django-select2-5.5.0.ebuild b/dev-python/django-select2/django-select2-5.5.0.ebuild
index 354ff4e8d8e25..6969dc59b8773 100644
--- a/dev-python/django-select2/django-select2-5.5.0.ebuild
+++ b/dev-python/django-select2/django-select2-5.5.0.ebuild
@@ -10,7 +10,7 @@ inherit distutils-r1
 MY_PN="Django-Select2"
 
 DESCRIPTION="A Django integration of Select2"
-HOMEPAGE="https://pypi.python.org/pypi/Django-Select2"
+HOMEPAGE="https://pypi.org/project/Django-Select2"
 SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
 
 S="${WORKDIR}/${MY_PN}-${PV}"
diff --git a/dev-python/django-social-auth/django-social-auth-0.7.28.ebuild b/dev-python/django-social-auth/django-social-auth-0.7.28.ebuild
index 72a6faf6814b9..921ed48df310d 100644
--- a/dev-python/django-social-auth/django-social-auth-0.7.28.ebuild
+++ b/dev-python/django-social-auth/django-social-auth-0.7.28.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 )
 inherit distutils-r1
 
 DESCRIPTION="An easy to setup social authentication/authorization mechanism for Django projects"
-HOMEPAGE="https://pypi.python.org/pypi/django-social-auth/"
+HOMEPAGE="https://pypi.org/project/django-social-auth/"
 SRC_URI="https://github.com/omab/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 KEYWORDS="amd64 x86"
 IUSE="doc examples"
diff --git a/dev-python/django-sortedm2m/django-sortedm2m-1.3.0.ebuild b/dev-python/django-sortedm2m/django-sortedm2m-1.3.0.ebuild
index 60cd3c081bdfc..59aa4ba5f2758 100644
--- a/dev-python/django-sortedm2m/django-sortedm2m-1.3.0.ebuild
+++ b/dev-python/django-sortedm2m/django-sortedm2m-1.3.0.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_4} )
 inherit distutils-r1
 
 DESCRIPTION="Drop-in replacement for django's many to many field with sorted relations"
-HOMEPAGE="https://pypi.python.org/pypi/django-sortedm2m"
+HOMEPAGE="https://pypi.org/project/django-sortedm2m"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/django-sortedm2m/django-sortedm2m-1.3.2.ebuild b/dev-python/django-sortedm2m/django-sortedm2m-1.3.2.ebuild
index e187efd0072d9..a8999c83e18bc 100644
--- a/dev-python/django-sortedm2m/django-sortedm2m-1.3.2.ebuild
+++ b/dev-python/django-sortedm2m/django-sortedm2m-1.3.2.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5} )
 inherit distutils-r1
 
 DESCRIPTION="Drop-in replacement for django's many to many field with sorted relations"
-HOMEPAGE="https://pypi.python.org/pypi/django-sortedm2m"
+HOMEPAGE="https://pypi.org/project/django-sortedm2m"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/django-spurl/django-spurl-0.6.4.ebuild b/dev-python/django-spurl/django-spurl-0.6.4.ebuild
index e8dac12e7d778..96dccf955263b 100644
--- a/dev-python/django-spurl/django-spurl-0.6.4.ebuild
+++ b/dev-python/django-spurl/django-spurl-0.6.4.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
 inherit distutils-r1
 
 DESCRIPTION="A Django template library for manipulating URLs"
-HOMEPAGE="https://pypi.python.org/pypi/django-spurl"
+HOMEPAGE="https://pypi.org/project/django-spurl"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/django-standard-form/django-standard-form-1.1.1.ebuild b/dev-python/django-standard-form/django-standard-form-1.1.1.ebuild
index c5c4fd68c8dda..1c4a0932c0c2c 100644
--- a/dev-python/django-standard-form/django-standard-form-1.1.1.ebuild
+++ b/dev-python/django-standard-form/django-standard-form-1.1.1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_{6,7} )
 inherit distutils-r1
 
 DESCRIPTION="Quick and simple django templatetags for displaying forms"
-HOMEPAGE="https://pypi.python.org/pypi/django-standard-form"
+HOMEPAGE="https://pypi.org/project/django-standard-form"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/django-tables2/django-tables2-1.1.2.ebuild b/dev-python/django-tables2/django-tables2-1.1.2.ebuild
index f626ce0557ca1..a83ada7245595 100644
--- a/dev-python/django-tables2/django-tables2-1.1.2.ebuild
+++ b/dev-python/django-tables2/django-tables2-1.1.2.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5} pypy )
 inherit distutils-r1
 
 DESCRIPTION="Table/data-grid framework for Django"
-HOMEPAGE="https://pypi.python.org/pypi/django-tables2/ https://github.com/bradleyayers/django-tables2/"
+HOMEPAGE="https://pypi.org/project/django-tables2/ https://github.com/bradleyayers/django-tables2/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
diff --git a/dev-python/django-tagging/django-tagging-0.4.1.ebuild b/dev-python/django-tagging/django-tagging-0.4.1.ebuild
index 53e7d2d9bd84f..6d0f69a1a6590 100644
--- a/dev-python/django-tagging/django-tagging-0.4.1.ebuild
+++ b/dev-python/django-tagging/django-tagging-0.4.1.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
 inherit distutils-r1
 
 DESCRIPTION="Generic tagging application for Django"
-HOMEPAGE="https://pypi.python.org/pypi/django-tagging"
+HOMEPAGE="https://pypi.org/project/django-tagging"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/django-tastypie/django-tastypie-0.13.3.ebuild b/dev-python/django-tastypie/django-tastypie-0.13.3.ebuild
index 5cdbffff0d5c2..eacdb8aacc926 100644
--- a/dev-python/django-tastypie/django-tastypie-0.13.3.ebuild
+++ b/dev-python/django-tastypie/django-tastypie-0.13.3.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
 inherit distutils-r1
 
 DESCRIPTION="A flexible and capable API layer for django utilising serialisers"
-HOMEPAGE="https://pypi.python.org/pypi/django-tastypie/ https://github.com/toastdriven/django-tastypie"
+HOMEPAGE="https://pypi.org/project/django-tastypie/ https://github.com/toastdriven/django-tastypie"
 SRC_URI="https://github.com/toastdriven/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 KEYWORDS="~amd64 ~x86"
diff --git a/dev-python/django-tastypie/django-tastypie-0.9.15.ebuild b/dev-python/django-tastypie/django-tastypie-0.9.15.ebuild
index 1c2fb6c36ee26..693c2d4c385ca 100644
--- a/dev-python/django-tastypie/django-tastypie-0.9.15.ebuild
+++ b/dev-python/django-tastypie/django-tastypie-0.9.15.ebuild
@@ -9,7 +9,7 @@ inherit distutils-r1
 RESTRICT="test"
 
 DESCRIPTION="A flexible and capable API layer for django utilising serialisers"
-HOMEPAGE="https://pypi.python.org/pypi/django-tastypie/ https://github.com/toastdriven/django-tastypie"
+HOMEPAGE="https://pypi.org/project/django-tastypie/ https://github.com/toastdriven/django-tastypie"
 SRC_URI="https://github.com/toastdriven/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 KEYWORDS="amd64 x86"
diff --git a/dev-python/django-treebeard/django-treebeard-4.1.0.ebuild b/dev-python/django-treebeard/django-treebeard-4.1.0.ebuild
index 57a84875db9b9..09da81c6c34c5 100644
--- a/dev-python/django-treebeard/django-treebeard-4.1.0.ebuild
+++ b/dev-python/django-treebeard/django-treebeard-4.1.0.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
 inherit distutils-r1
 
 DESCRIPTION="Efficient tree implementations for Django 1.6+"
-HOMEPAGE="https://tabo.pe/projects/django-treebeard/ https://pypi.python.org/pypi/django-treebeard"
+HOMEPAGE="https://tabo.pe/projects/django-treebeard/ https://pypi.org/project/django-treebeard"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
diff --git a/dev-python/django-xslt/django-xslt-0.4.5-r1.ebuild b/dev-python/django-xslt/django-xslt-0.4.5-r1.ebuild
index ac5cf6036bc14..b1b0ac06235c6 100644
--- a/dev-python/django-xslt/django-xslt-0.4.5-r1.ebuild
+++ b/dev-python/django-xslt/django-xslt-0.4.5-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
 	test? ( https://dev.gentoo.org/~tampakrap/tarballs/${PN}-demoapp-0.4.5_p20120427.tar.bz2 )"
 
 DESCRIPTION="an XSLT template system for Django"
-HOMEPAGE="https://pypi.python.org/pypi/django-xslt/"
+HOMEPAGE="https://pypi.org/project/django-xslt/"
 KEYWORDS="amd64 x86"
 IUSE="test"
 
diff --git a/dev-python/django/django-1.10.7.ebuild b/dev-python/django/django-1.10.7.ebuild
index b8939f00361d3..dc83d0ea01b9c 100644
--- a/dev-python/django/django-1.10.7.ebuild
+++ b/dev-python/django/django-1.10.7.ebuild
@@ -13,7 +13,7 @@ MY_PN="Django"
 MY_P="${MY_PN}-${PV}"
 
 DESCRIPTION="High-level Python web framework"
-HOMEPAGE="https://www.djangoproject.com/ https://pypi.python.org/pypi/Django"
+HOMEPAGE="https://www.djangoproject.com/ https://pypi.org/project/Django"
 SRC_URI="
 	https://www.djangoproject.com/m/releases/$(get_version_component_range 1-2)/${MY_P}.tar.gz
 	mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz
diff --git a/dev-python/django/django-1.11.2.ebuild b/dev-python/django/django-1.11.2.ebuild
index 99e1b100bdec2..898efe13d9090 100644
--- a/dev-python/django/django-1.11.2.ebuild
+++ b/dev-python/django/django-1.11.2.ebuild
@@ -13,7 +13,7 @@ MY_PN="Django"
 MY_P="${MY_PN}-${PV}"
 
 DESCRIPTION="High-level Python web framework"
-HOMEPAGE="https://www.djangoproject.com/ https://pypi.python.org/pypi/Django"
+HOMEPAGE="https://www.djangoproject.com/ https://pypi.org/project/Django"
 SRC_URI="
 	https://www.djangoproject.com/m/releases/$(get_version_component_range 1-2)/${MY_P}.tar.gz
 	mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz
diff --git a/dev-python/django/django-1.4.22.ebuild b/dev-python/django/django-1.4.22.ebuild
index f0d4e9bbe7238..4ae2e0bf58cf2 100644
--- a/dev-python/django/django-1.4.22.ebuild
+++ b/dev-python/django/django-1.4.22.ebuild
@@ -11,7 +11,7 @@ inherit bash-completion-r1 distutils-r1 eutils versionator webapp
 MY_P="Django-${PV}"
 
 DESCRIPTION="High-level Python web framework"
-HOMEPAGE="https://www.djangoproject.com/ https://pypi.python.org/pypi/Django"
+HOMEPAGE="https://www.djangoproject.com/ https://pypi.org/project/Django"
 SRC_URI="https://www.djangoproject.com/m/releases/$(get_version_component_range 1-2)/${MY_P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/django/django-1.5.12.ebuild b/dev-python/django/django-1.5.12.ebuild
index 83e8a7feed7ca..c92e7e6234520 100644
--- a/dev-python/django/django-1.5.12.ebuild
+++ b/dev-python/django/django-1.5.12.ebuild
@@ -11,7 +11,7 @@ inherit bash-completion-r1 distutils-r1 versionator webapp
 MY_P="Django-${PV}"
 
 DESCRIPTION="High-level Python web framework"
-HOMEPAGE="https://www.djangoproject.com/ https://pypi.python.org/pypi/Django"
+HOMEPAGE="https://www.djangoproject.com/ https://pypi.org/project/Django"
 SRC_URI="https://www.djangoproject.com/m/releases/$(get_version_component_range 1-2)/${MY_P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/django/django-1.6.11.ebuild b/dev-python/django/django-1.6.11.ebuild
index 8809d4551554c..1f2e5600a2afd 100644
--- a/dev-python/django/django-1.6.11.ebuild
+++ b/dev-python/django/django-1.6.11.ebuild
@@ -13,7 +13,7 @@ inherit bash-completion-r1 distutils-r1 eutils versionator webapp
 MY_P="Django-${PV}"
 
 DESCRIPTION="High-level Python web framework"
-HOMEPAGE="https://www.djangoproject.com/ https://pypi.python.org/pypi/Django"
+HOMEPAGE="https://www.djangoproject.com/ https://pypi.org/project/Django"
 SRC_URI="https://www.djangoproject.com/m/releases/$(get_version_component_range 1-2)/${MY_P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/django/django-1.7.11.ebuild b/dev-python/django/django-1.7.11.ebuild
index b8483885ec544..621b774549b98 100644
--- a/dev-python/django/django-1.7.11.ebuild
+++ b/dev-python/django/django-1.7.11.ebuild
@@ -12,7 +12,7 @@ inherit bash-completion-r1 distutils-r1 eutils versionator webapp
 MY_P="Django-${PV}"
 
 DESCRIPTION="High-level Python web framework"
-HOMEPAGE="https://www.djangoproject.com/ https://pypi.python.org/pypi/Django"
+HOMEPAGE="https://www.djangoproject.com/ https://pypi.org/project/Django"
 SRC_URI="https://www.djangoproject.com/m/releases/$(get_version_component_range 1-2)/${MY_P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/django/django-1.8.18.ebuild b/dev-python/django/django-1.8.18.ebuild
index 0db18d35e730b..19b325373b77a 100644
--- a/dev-python/django/django-1.8.18.ebuild
+++ b/dev-python/django/django-1.8.18.ebuild
@@ -13,7 +13,7 @@ MY_PN="Django"
 MY_P="${MY_PN}-${PV}"
 
 DESCRIPTION="High-level Python web framework"
-HOMEPAGE="https://www.djangoproject.com/ https://pypi.python.org/pypi/Django"
+HOMEPAGE="https://www.djangoproject.com/ https://pypi.org/project/Django"
 SRC_URI="
 	https://www.djangoproject.com/m/releases/$(get_version_component_range 1-2)/${MY_P}.tar.gz
 	mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz
diff --git a/dev-python/django/django-1.9.13.ebuild b/dev-python/django/django-1.9.13.ebuild
index bbc36bf0bb264..a2e8fd4e4c440 100644
--- a/dev-python/django/django-1.9.13.ebuild
+++ b/dev-python/django/django-1.9.13.ebuild
@@ -13,7 +13,7 @@ MY_PN="Django"
 MY_P="${MY_PN}-${PV}"
 
 DESCRIPTION="High-level Python web framework"
-HOMEPAGE="https://www.djangoproject.com/ https://pypi.python.org/pypi/Django"
+HOMEPAGE="https://www.djangoproject.com/ https://pypi.org/project/Django"
 SRC_URI="
 	https://www.djangoproject.com/m/releases/$(get_version_component_range 1-2)/${MY_P}.tar.gz
 	mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz
diff --git a/dev-python/django_polymorphic/django_polymorphic-0.7.2.ebuild b/dev-python/django_polymorphic/django_polymorphic-0.7.2.ebuild
index 7d364044e5af6..00326505e0b6a 100644
--- a/dev-python/django_polymorphic/django_polymorphic-0.7.2.ebuild
+++ b/dev-python/django_polymorphic/django_polymorphic-0.7.2.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 )
 inherit distutils-r1
 
 DESCRIPTION="Seamless Polymorphic Inheritance for Django Models"
-HOMEPAGE="https://pypi.python.org/pypi/django-polymorphic"
+HOMEPAGE="https://pypi.org/project/django-polymorphic"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/django_polymorphic/django_polymorphic-0.9.2.ebuild b/dev-python/django_polymorphic/django_polymorphic-0.9.2.ebuild
index 2b78d2c4d5964..cb1dad0294f20 100644
--- a/dev-python/django_polymorphic/django_polymorphic-0.9.2.ebuild
+++ b/dev-python/django_polymorphic/django_polymorphic-0.9.2.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 )
 inherit distutils-r1
 
 DESCRIPTION="Seamless Polymorphic Inheritance for Django Models"
-HOMEPAGE="https://pypi.python.org/pypi/django-polymorphic"
+HOMEPAGE="https://pypi.org/project/django-polymorphic"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/django_polymorphic/django_polymorphic-1.2.ebuild b/dev-python/django_polymorphic/django_polymorphic-1.2.ebuild
index ef6b5345ef29b..5a263eed9e8ad 100644
--- a/dev-python/django_polymorphic/django_polymorphic-1.2.ebuild
+++ b/dev-python/django_polymorphic/django_polymorphic-1.2.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_{6,7},3_{2,3,4,5,6}} )
 inherit distutils-r1
 
 DESCRIPTION="Seamless Polymorphic Inheritance for Django Models"
-HOMEPAGE="https://pypi.python.org/pypi/django-polymorphic"
+HOMEPAGE="https://pypi.org/project/django-polymorphic"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P//_/-}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/djangocms-admin-style/djangocms-admin-style-1.2.7.ebuild b/dev-python/djangocms-admin-style/djangocms-admin-style-1.2.7.ebuild
index d2703bdc8e082..c771aa67805ca 100644
--- a/dev-python/djangocms-admin-style/djangocms-admin-style-1.2.7.ebuild
+++ b/dev-python/djangocms-admin-style/djangocms-admin-style-1.2.7.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_{3,4,5,6}} )
 inherit distutils-r1
 
 DESCRIPTION="Adds pretty CSS styles for the django CMS admin interface."
-HOMEPAGE="https://pypi.python.org/pypi/djangocms-admin-style"
+HOMEPAGE="https://pypi.org/project/djangocms-admin-style"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/djangocms-flash/djangocms-flash-0.2.0.ebuild b/dev-python/djangocms-flash/djangocms-flash-0.2.0.ebuild
index 92a82b6d95043..ff1203bc88719 100644
--- a/dev-python/djangocms-flash/djangocms-flash-0.2.0.ebuild
+++ b/dev-python/djangocms-flash/djangocms-flash-0.2.0.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_4} )
 inherit distutils-r1
 
 DESCRIPTION="Flash plugin for django CMS"
-HOMEPAGE="https://pypi.python.org/pypi/djangocms-flash"
+HOMEPAGE="https://pypi.org/project/djangocms-flash"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/djangocms-flash/djangocms-flash-0.3.0.ebuild b/dev-python/djangocms-flash/djangocms-flash-0.3.0.ebuild
index 9f18774a89a83..f68460ce98a12 100644
--- a/dev-python/djangocms-flash/djangocms-flash-0.3.0.ebuild
+++ b/dev-python/djangocms-flash/djangocms-flash-0.3.0.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_{6,7},3_{3,4,5,6}} )
 inherit distutils-r1
 
 DESCRIPTION="Flash plugin for django CMS"
-HOMEPAGE="https://pypi.python.org/pypi/djangocms-flash"
+HOMEPAGE="https://pypi.org/project/djangocms-flash"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/djangocms-inherit/djangocms-inherit-0.2.2.ebuild b/dev-python/djangocms-inherit/djangocms-inherit-0.2.2.ebuild
index f096aff9b76c7..c9612fb95df51 100644
--- a/dev-python/djangocms-inherit/djangocms-inherit-0.2.2.ebuild
+++ b/dev-python/djangocms-inherit/djangocms-inherit-0.2.2.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_{6,7},3_{3,4,5,6}} )
 inherit distutils-r1
 
 DESCRIPTION="Inherit plugin for django CMS"
-HOMEPAGE="https://pypi.python.org/pypi/djangocms-inherit"
+HOMEPAGE="https://pypi.org/project/djangocms-inherit"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/djangocms-link/djangocms-link-2.1.2.ebuild b/dev-python/djangocms-link/djangocms-link-2.1.2.ebuild
index 2b67d8e4ac65d..5828b91590797 100644
--- a/dev-python/djangocms-link/djangocms-link-2.1.2.ebuild
+++ b/dev-python/djangocms-link/djangocms-link-2.1.2.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
 inherit distutils-r1
 
 DESCRIPTION="Link plugin for django CMS"
-HOMEPAGE="https://pypi.python.org/pypi/djangocms-link"
+HOMEPAGE="https://pypi.org/project/djangocms-link"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/djangocms-picture/djangocms-picture-2.0.5.ebuild b/dev-python/djangocms-picture/djangocms-picture-2.0.5.ebuild
index b6c4dbec86309..6557a013161d1 100644
--- a/dev-python/djangocms-picture/djangocms-picture-2.0.5.ebuild
+++ b/dev-python/djangocms-picture/djangocms-picture-2.0.5.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
 inherit distutils-r1
 
 DESCRIPTION="Picture plugin for django CMS"
-HOMEPAGE="https://pypi.python.org/pypi/djangocms-picture"
+HOMEPAGE="https://pypi.org/project/djangocms-picture"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/djangocms-snippet/djangocms-snippet-1.9.1.ebuild b/dev-python/djangocms-snippet/djangocms-snippet-1.9.1.ebuild
index dff18c9618324..749ee0a1862bd 100644
--- a/dev-python/djangocms-snippet/djangocms-snippet-1.9.1.ebuild
+++ b/dev-python/djangocms-snippet/djangocms-snippet-1.9.1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_{3,4,5,6}} )
 inherit distutils-r1
 
 DESCRIPTION="Snippet plugin for django CMS"
-HOMEPAGE="https://pypi.python.org/pypi/djangocms-snippet"
+HOMEPAGE="https://pypi.org/project/djangocms-snippet"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/djangocms-teaser/djangocms-teaser-0.1.ebuild b/dev-python/djangocms-teaser/djangocms-teaser-0.1.ebuild
index bacf7ac9e2992..401309b48afcb 100644
--- a/dev-python/djangocms-teaser/djangocms-teaser-0.1.ebuild
+++ b/dev-python/djangocms-teaser/djangocms-teaser-0.1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_4} )
 inherit distutils-r1
 
 DESCRIPTION="Teaser plugin for django CMS"
-HOMEPAGE="https://pypi.python.org/pypi/djangocms-teaser"
+HOMEPAGE="https://pypi.org/project/djangocms-teaser"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/djangocms-teaser/djangocms-teaser-0.2.0.ebuild b/dev-python/djangocms-teaser/djangocms-teaser-0.2.0.ebuild
index a68702a525ad1..af8da6a6236a7 100644
--- a/dev-python/djangocms-teaser/djangocms-teaser-0.2.0.ebuild
+++ b/dev-python/djangocms-teaser/djangocms-teaser-0.2.0.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_{6,7},3_{3,4,5,6}} )
 inherit distutils-r1
 
 DESCRIPTION="Teaser plugin for django CMS"
-HOMEPAGE="https://pypi.python.org/pypi/djangocms-teaser"
+HOMEPAGE="https://pypi.org/project/djangocms-teaser"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/djangocms-text-ckeditor/djangocms-text-ckeditor-3.3.1.ebuild b/dev-python/djangocms-text-ckeditor/djangocms-text-ckeditor-3.3.1.ebuild
index 402cb27c0aa49..627206a90429b 100644
--- a/dev-python/djangocms-text-ckeditor/djangocms-text-ckeditor-3.3.1.ebuild
+++ b/dev-python/djangocms-text-ckeditor/djangocms-text-ckeditor-3.3.1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_{3,4}} )
 inherit distutils-r1
 
 DESCRIPTION="Text Plugin for django CMS with CKEditor support"
-HOMEPAGE="https://pypi.python.org/pypi/djangocms-text-ckeditor/"
+HOMEPAGE="https://pypi.org/project/djangocms-text-ckeditor/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/djangocms-text-ckeditor/djangocms-text-ckeditor-3.5.0.ebuild b/dev-python/djangocms-text-ckeditor/djangocms-text-ckeditor-3.5.0.ebuild
index 657b69467bc45..bfbfe4a2c59ae 100644
--- a/dev-python/djangocms-text-ckeditor/djangocms-text-ckeditor-3.5.0.ebuild
+++ b/dev-python/djangocms-text-ckeditor/djangocms-text-ckeditor-3.5.0.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_{3,4,5,6}} )
 inherit distutils-r1
 
 DESCRIPTION="Text Plugin for django CMS with CKEditor support"
-HOMEPAGE="https://pypi.python.org/pypi/djangocms-text-ckeditor/"
+HOMEPAGE="https://pypi.org/project/djangocms-text-ckeditor/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/djangocms-video/djangocms-video-2.0.2.ebuild b/dev-python/djangocms-video/djangocms-video-2.0.2.ebuild
index 684a277c492ab..c3ab5149496ea 100644
--- a/dev-python/djangocms-video/djangocms-video-2.0.2.ebuild
+++ b/dev-python/djangocms-video/djangocms-video-2.0.2.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
 inherit distutils-r1
 
 DESCRIPTION="Video plugin for django CMS"
-HOMEPAGE="https://pypi.python.org/pypi/djangocms-video"
+HOMEPAGE="https://pypi.org/project/djangocms-video"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/dnslib/dnslib-0.9.6.ebuild b/dev-python/dnslib/dnslib-0.9.6.ebuild
index de32ef40cb524..6fba07abeec65 100644
--- a/dev-python/dnslib/dnslib-0.9.6.ebuild
+++ b/dev-python/dnslib/dnslib-0.9.6.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5} pypy pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="Simple library to encode/decode DNS wire-format packets"
-HOMEPAGE="https://pypi.python.org/pypi/dnslib/"
+HOMEPAGE="https://pypi.org/project/dnslib/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/dnspython/dnspython-1.15.0-r1.ebuild b/dev-python/dnspython/dnspython-1.15.0-r1.ebuild
index 7476d250c25f0..40a26a5f763dc 100644
--- a/dev-python/dnspython/dnspython-1.15.0-r1.ebuild
+++ b/dev-python/dnspython/dnspython-1.15.0-r1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
 inherit distutils-r1
 
 DESCRIPTION="DNS toolkit for Python"
-HOMEPAGE="http://www.dnspython.org/ https://pypi.python.org/pypi/dnspython"
+HOMEPAGE="http://www.dnspython.org/ https://pypi.org/project/dnspython"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
 
 LICENSE="ISC"
diff --git a/dev-python/docopt/docopt-0.6.2-r2.ebuild b/dev-python/docopt/docopt-0.6.2-r2.ebuild
index 9c8f226312868..d9ac0337bc9a7 100644
--- a/dev-python/docopt/docopt-0.6.2-r2.ebuild
+++ b/dev-python/docopt/docopt-0.6.2-r2.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="Pythonic argument parser, that will make you smile"
-HOMEPAGE="https://pypi.python.org/pypi/docopt https://github.com/docopt/docopt"
+HOMEPAGE="https://pypi.org/project/docopt https://github.com/docopt/docopt"
 SRC_URI="
 	mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
 	https://github.com/docopt/docopt/archive/${PV}.tar.gz -> ${P}.tar.gz"
diff --git a/dev-python/doctest-ignore-unicode/doctest-ignore-unicode-0.1.2.ebuild b/dev-python/doctest-ignore-unicode/doctest-ignore-unicode-0.1.2.ebuild
index 7fd8b39e3499a..26182c731c7f6 100644
--- a/dev-python/doctest-ignore-unicode/doctest-ignore-unicode-0.1.2.ebuild
+++ b/dev-python/doctest-ignore-unicode/doctest-ignore-unicode-0.1.2.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="Add flag to ignore unicode literal prefixes in doctests"
-HOMEPAGE="https://pypi.python.org/pypi/doctest-ignore-unicode https://github.com/gnublade/doctest-ignore-unicode"
+HOMEPAGE="https://pypi.org/project/doctest-ignore-unicode https://github.com/gnublade/doctest-ignore-unicode"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
diff --git a/dev-python/docutils/docutils-0.11.ebuild b/dev-python/docutils/docutils-0.11.ebuild
index ad8c2c9824070..eb967062f5cf4 100644
--- a/dev-python/docutils/docutils-0.11.ebuild
+++ b/dev-python/docutils/docutils-0.11.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python{2_7,3_4} pypy )
 inherit distutils-r1
 
 DESCRIPTION="Python Documentation Utilities"
-HOMEPAGE="http://docutils.sourceforge.net/ https://pypi.python.org/pypi/docutils"
+HOMEPAGE="http://docutils.sourceforge.net/ https://pypi.org/project/docutils"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="BSD-2 GPL-3 public-domain"
diff --git a/dev-python/docutils/docutils-0.12.ebuild b/dev-python/docutils/docutils-0.12.ebuild
index 16f246c118f8a..01a17e3d0a173 100644
--- a/dev-python/docutils/docutils-0.12.ebuild
+++ b/dev-python/docutils/docutils-0.12.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="Python Documentation Utilities"
-HOMEPAGE="http://docutils.sourceforge.net/ https://pypi.python.org/pypi/docutils"
+HOMEPAGE="http://docutils.sourceforge.net/ https://pypi.org/project/docutils"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="BSD-2 GPL-3 public-domain"
diff --git a/dev-python/docutils/docutils-0.13.1.ebuild b/dev-python/docutils/docutils-0.13.1.ebuild
index 527811c366abd..dcd41b2dd7c6b 100644
--- a/dev-python/docutils/docutils-0.13.1.ebuild
+++ b/dev-python/docutils/docutils-0.13.1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="Python Documentation Utilities"
-HOMEPAGE="http://docutils.sourceforge.net/ https://pypi.python.org/pypi/docutils"
+HOMEPAGE="http://docutils.sourceforge.net/ https://pypi.org/project/docutils"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="BSD-2 GPL-3 public-domain"
diff --git a/dev-python/docutils/docutils-0.14.ebuild b/dev-python/docutils/docutils-0.14.ebuild
index 42fde788ce857..84b516e7eaab5 100644
--- a/dev-python/docutils/docutils-0.14.ebuild
+++ b/dev-python/docutils/docutils-0.14.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="Python Documentation Utilities"
-HOMEPAGE="http://docutils.sourceforge.net/ https://pypi.python.org/pypi/docutils"
+HOMEPAGE="http://docutils.sourceforge.net/ https://pypi.org/project/docutils"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="BSD-2 GPL-3 public-domain"
diff --git a/dev-python/doit/doit-0.23.0-r1.ebuild b/dev-python/doit/doit-0.23.0-r1.ebuild
index 1987991014c98..3f6094b10dc44 100644
--- a/dev-python/doit/doit-0.23.0-r1.ebuild
+++ b/dev-python/doit/doit-0.23.0-r1.ebuild
@@ -6,7 +6,7 @@ PYTHON_COMPAT=( python{2_7,3_4} pypy )
 inherit eutils distutils-r1
 
 DESCRIPTION="Automation tool"
-HOMEPAGE="http://python-doit.sourceforge.net/ https://pypi.python.org/pypi/doit"
+HOMEPAGE="http://python-doit.sourceforge.net/ https://pypi.org/project/doit"
 SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/doit/doit-0.29.0.ebuild b/dev-python/doit/doit-0.29.0.ebuild
index 2bef51932ca10..c4a6be8b9fbbc 100644
--- a/dev-python/doit/doit-0.29.0.ebuild
+++ b/dev-python/doit/doit-0.29.0.ebuild
@@ -8,7 +8,7 @@ inherit eutils distutils-r1
 RESTRICT="test" # can't work as it imports nonexistant modules from coverage
 
 DESCRIPTION="Automation tool"
-HOMEPAGE="http://python-doit.sourceforge.net/ https://pypi.python.org/pypi/doit"
+HOMEPAGE="http://python-doit.sourceforge.net/ https://pypi.org/project/doit"
 SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/dulwich/dulwich-0.18.5.ebuild b/dev-python/dulwich/dulwich-0.18.5.ebuild
index 65ebed3eb805e..5ea67c430be82 100644
--- a/dev-python/dulwich/dulwich-0.18.5.ebuild
+++ b/dev-python/dulwich/dulwich-0.18.5.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
 inherit distutils-r1
 
 DESCRIPTION="Pure-Python implementation of the Git file formats and protocols"
-HOMEPAGE="https://github.com/jelmer/dulwich/ https://pypi.python.org/pypi/dulwich"
+HOMEPAGE="https://github.com/jelmer/dulwich/ https://pypi.org/project/dulwich"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2+"
diff --git a/dev-python/dulwich/dulwich-0.18.6.ebuild b/dev-python/dulwich/dulwich-0.18.6.ebuild
index 1aedb3e5b4a7c..2207513463fb8 100644
--- a/dev-python/dulwich/dulwich-0.18.6.ebuild
+++ b/dev-python/dulwich/dulwich-0.18.6.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
 inherit distutils-r1
 
 DESCRIPTION="Pure-Python implementation of the Git file formats and protocols"
-HOMEPAGE="https://github.com/jelmer/dulwich/ https://pypi.python.org/pypi/dulwich"
+HOMEPAGE="https://github.com/jelmer/dulwich/ https://pypi.org/project/dulwich"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2+"
diff --git a/dev-python/easy-thumbnails/easy-thumbnails-2.2.ebuild b/dev-python/easy-thumbnails/easy-thumbnails-2.2.ebuild
index cf81fd69ce106..38ad877210e18 100644
--- a/dev-python/easy-thumbnails/easy-thumbnails-2.2.ebuild
+++ b/dev-python/easy-thumbnails/easy-thumbnails-2.2.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_4} )
 inherit distutils-r1
 
 DESCRIPTION="Easy thumbnails for Django"
-HOMEPAGE="https://pypi.python.org/pypi/easy-thumbnails"
+HOMEPAGE="https://pypi.org/project/easy-thumbnails"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/easy-thumbnails/easy-thumbnails-2.3.ebuild b/dev-python/easy-thumbnails/easy-thumbnails-2.3.ebuild
index 6c10e91af0429..2afa3c5517d4e 100644
--- a/dev-python/easy-thumbnails/easy-thumbnails-2.3.ebuild
+++ b/dev-python/easy-thumbnails/easy-thumbnails-2.3.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_{6,7},3_{3,4}} )
 inherit distutils-r1
 
 DESCRIPTION="Easy thumbnails for Django"
-HOMEPAGE="https://pypi.python.org/pypi/easy-thumbnails"
+HOMEPAGE="https://pypi.org/project/easy-thumbnails"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/easy-thumbnails/easy-thumbnails-2.4.1.ebuild b/dev-python/easy-thumbnails/easy-thumbnails-2.4.1.ebuild
index 998ed96990326..e440d88e828bd 100644
--- a/dev-python/easy-thumbnails/easy-thumbnails-2.4.1.ebuild
+++ b/dev-python/easy-thumbnails/easy-thumbnails-2.4.1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_{6,7},3_{3,4,5,6}} )
 inherit distutils-r1
 
 DESCRIPTION="Easy thumbnails for Django"
-HOMEPAGE="https://pypi.python.org/pypi/easy-thumbnails"
+HOMEPAGE="https://pypi.org/project/easy-thumbnails"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/ed25519ll/ed25519ll-0.6.ebuild b/dev-python/ed25519ll/ed25519ll-0.6.ebuild
index 00b37bc0e8378..c608a7772179e 100644
--- a/dev-python/ed25519ll/ed25519ll-0.6.ebuild
+++ b/dev-python/ed25519ll/ed25519ll-0.6.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_{4,5}} pypy pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="A low-level ctypes wrapper for Ed25519 digital signatures."
-HOMEPAGE="https://bitbucket.org/dholth/ed25519ll/ https://pypi.python.org/pypi/ed25519ll"
+HOMEPAGE="https://bitbucket.org/dholth/ed25519ll/ https://pypi.org/project/ed25519ll"
 SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/egenix-mx-base/egenix-mx-base-3.2.5.ebuild b/dev-python/egenix-mx-base/egenix-mx-base-3.2.5.ebuild
index 4328abeef7a4f..7ef17ed702f81 100644
--- a/dev-python/egenix-mx-base/egenix-mx-base-3.2.5.ebuild
+++ b/dev-python/egenix-mx-base/egenix-mx-base-3.2.5.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 )
 inherit distutils-r1
 
 DESCRIPTION="eGenix utils for Python"
-HOMEPAGE="https://www.egenix.com/products/python/mxBase https://pypi.python.org/pypi/egenix-mx-base"
+HOMEPAGE="https://www.egenix.com/products/python/mxBase https://pypi.org/project/egenix-mx-base"
 SRC_URI="https://downloads.egenix.com/python/${P}.tar.gz"
 
 LICENSE="eGenixPublic-1.1"
diff --git a/dev-python/egenix-mx-base/egenix-mx-base-3.2.8.ebuild b/dev-python/egenix-mx-base/egenix-mx-base-3.2.8.ebuild
index cb9bece597a10..9c1bb8b2cbf56 100644
--- a/dev-python/egenix-mx-base/egenix-mx-base-3.2.8.ebuild
+++ b/dev-python/egenix-mx-base/egenix-mx-base-3.2.8.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 )
 inherit distutils-r1
 
 DESCRIPTION="eGenix utils for Python"
-HOMEPAGE="https://www.egenix.com/products/python/mxBase https://pypi.python.org/pypi/egenix-mx-base"
+HOMEPAGE="https://www.egenix.com/products/python/mxBase https://pypi.org/project/egenix-mx-base"
 SRC_URI="https://downloads.egenix.com/python/${P}.tar.gz"
 
 LICENSE="eGenixPublic-1.1"
diff --git a/dev-python/egenix-mx-base/egenix-mx-base-3.2.9.ebuild b/dev-python/egenix-mx-base/egenix-mx-base-3.2.9.ebuild
index 354795949d8f8..a208c0766d24c 100644
--- a/dev-python/egenix-mx-base/egenix-mx-base-3.2.9.ebuild
+++ b/dev-python/egenix-mx-base/egenix-mx-base-3.2.9.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 )
 inherit distutils-r1
 
 DESCRIPTION="eGenix utils for Python"
-HOMEPAGE="https://www.egenix.com/products/python/mxBase https://pypi.python.org/pypi/egenix-mx-base"
+HOMEPAGE="https://www.egenix.com/products/python/mxBase https://pypi.org/project/egenix-mx-base"
 SRC_URI="https://downloads.egenix.com/python/${P}.tar.gz"
 
 LICENSE="eGenixPublic-1.1"
diff --git a/dev-python/elementtree/elementtree-1.2.6-r3.ebuild b/dev-python/elementtree/elementtree-1.2.6-r3.ebuild
index 3b36ea347bf0b..713df42564a0e 100644
--- a/dev-python/elementtree/elementtree-1.2.6-r3.ebuild
+++ b/dev-python/elementtree/elementtree-1.2.6-r3.ebuild
@@ -10,7 +10,7 @@ inherit distutils-r1
 MY_P="${P}-20050316"
 
 DESCRIPTION="A light-weight XML object model for Python"
-HOMEPAGE="http://effbot.org/zone/element-index.htm https://pypi.python.org/pypi/elementtree"
+HOMEPAGE="http://effbot.org/zone/element-index.htm https://pypi.org/project/elementtree"
 SRC_URI="http://effbot.org/downloads/${MY_P}.tar.gz"
 
 LICENSE="ElementTree"
diff --git a/dev-python/embedly/embedly-0.5.0-r1.ebuild b/dev-python/embedly/embedly-0.5.0-r1.ebuild
index f9d2fa8b3364d..368e573dbbc21 100644
--- a/dev-python/embedly/embedly-0.5.0-r1.ebuild
+++ b/dev-python/embedly/embedly-0.5.0-r1.ebuild
@@ -10,7 +10,7 @@ MY_PN="Embedly"
 MY_P="${MY_PN}-${PV}"
 
 DESCRIPTION="Python Library for Embedly"
-HOMEPAGE="https://github.com/embedly/embedly-python/ https://pypi.python.org/pypi/Embedly"
+HOMEPAGE="https://github.com/embedly/embedly-python/ https://pypi.org/project/Embedly"
 SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/enable/enable-4.4.1.ebuild b/dev-python/enable/enable-4.4.1.ebuild
index 55f024350dde7..6a01fbfe447e5 100644
--- a/dev-python/enable/enable-4.4.1.ebuild
+++ b/dev-python/enable/enable-4.4.1.ebuild
@@ -9,7 +9,7 @@ inherit distutils-r1 virtualx flag-o-matic
 
 DESCRIPTION="Enthought Tool Suite: Drawing and interaction packages"
 HOMEPAGE="http://docs.enthought.com/enable/
-	https://pypi.python.org/pypi/enable
+	https://pypi.org/project/enable
 	https://github.com/enthought/enable"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
diff --git a/dev-python/enable/enable-4.5.1.ebuild b/dev-python/enable/enable-4.5.1.ebuild
index e453e3a5ce632..5bc40465de846 100644
--- a/dev-python/enable/enable-4.5.1.ebuild
+++ b/dev-python/enable/enable-4.5.1.ebuild
@@ -9,7 +9,7 @@ inherit distutils-r1 virtualx flag-o-matic
 
 DESCRIPTION="Enthought Tool Suite: Drawing and interaction packages"
 HOMEPAGE="http://docs.enthought.com/enable/
-	https://pypi.python.org/pypi/enable
+	https://pypi.org/project/enable
 	https://github.com/enthought/enable"
 #SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 SRC_URI="https://github.com/enthought/enable/archive/${PV}.tar.gz -> ${P}.tar.gz"
diff --git a/dev-python/enaml/enaml-0.10.2.ebuild b/dev-python/enaml/enaml-0.10.2.ebuild
index d634aaa9aa07b..96a05aeea168e 100644
--- a/dev-python/enaml/enaml-0.10.2.ebuild
+++ b/dev-python/enaml/enaml-0.10.2.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 python3_{5,6} )
 inherit distutils-r1 flag-o-matic virtualx
 
 DESCRIPTION="Enthought Tool Suite: framework for writing declarative interfaces"
-HOMEPAGE="https://github.com/nucleic/enaml https://pypi.python.org/pypi/enaml"
+HOMEPAGE="https://github.com/nucleic/enaml https://pypi.org/project/enaml"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/enaml/enaml-0.9.8.ebuild b/dev-python/enaml/enaml-0.9.8.ebuild
index 141a0e63b4094..7c36eb826f98d 100644
--- a/dev-python/enaml/enaml-0.9.8.ebuild
+++ b/dev-python/enaml/enaml-0.9.8.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 )
 inherit distutils-r1 virtualx flag-o-matic
 
 DESCRIPTION="Enthought Tool Suite: framework for writing declarative interfaces"
-HOMEPAGE="https://github.com/nucleic/enaml https://pypi.python.org/pypi/enaml"
+HOMEPAGE="https://github.com/nucleic/enaml https://pypi.org/project/enaml"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/enum34/enum34-1.1.6.ebuild b/dev-python/enum34/enum34-1.1.6.ebuild
index 7d7eca3042cb3..cbfacaeada3b1 100644
--- a/dev-python/enum34/enum34-1.1.6.ebuild
+++ b/dev-python/enum34/enum34-1.1.6.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 pypy pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="Python 3.4 Enum backported"
-HOMEPAGE="https://pypi.python.org/pypi/enum34"
+HOMEPAGE="https://pypi.org/project/enum34"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/envisage/envisage-4.4.0.ebuild b/dev-python/envisage/envisage-4.4.0.ebuild
index 70842fd9e36b5..3b7c984bd7bc1 100644
--- a/dev-python/envisage/envisage-4.4.0.ebuild
+++ b/dev-python/envisage/envisage-4.4.0.ebuild
@@ -11,7 +11,7 @@ inherit distutils-r1 virtualx
 DESCRIPTION="Enthought Tool Suite: Extensible application framework"
 HOMEPAGE="http://docs.enthought.com/envisage/
 	https://github.com/enthought/envisage
-	https://pypi.python.org/pypi/envisage"
+	https://pypi.org/project/envisage"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/envoy/envoy-0.0.3-r1.ebuild b/dev-python/envoy/envoy-0.0.3-r1.ebuild
index 5a7c6b0ccf71d..da1b3213e724b 100644
--- a/dev-python/envoy/envoy-0.0.3-r1.ebuild
+++ b/dev-python/envoy/envoy-0.0.3-r1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy )
 inherit distutils-r1
 
 DESCRIPTION="Simple API for running external processes"
-HOMEPAGE="https://github.com/kennethreitz/envoy https://pypi.python.org/pypi/envoy"
+HOMEPAGE="https://github.com/kennethreitz/envoy https://pypi.org/project/envoy"
 SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/envoy/envoy-0.0.3.ebuild b/dev-python/envoy/envoy-0.0.3.ebuild
index c37fa098c9576..6b670b4ce9623 100644
--- a/dev-python/envoy/envoy-0.0.3.ebuild
+++ b/dev-python/envoy/envoy-0.0.3.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy )
 inherit distutils-r1
 
 DESCRIPTION="Simple API for running external processes"
-HOMEPAGE="https://github.com/kennethreitz/envoy https://pypi.python.org/pypi/envoy"
+HOMEPAGE="https://github.com/kennethreitz/envoy https://pypi.org/project/envoy"
 SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/enzyme/enzyme-0.4.1-r2.ebuild b/dev-python/enzyme/enzyme-0.4.1-r2.ebuild
index 69c23ce38739a..fad01dafc4a26 100644
--- a/dev-python/enzyme/enzyme-0.4.1-r2.ebuild
+++ b/dev-python/enzyme/enzyme-0.4.1-r2.ebuild
@@ -9,7 +9,7 @@ PYTHON_REQ_USE='xml(+)'
 inherit distutils-r1
 
 DESCRIPTION="Python video metadata parser"
-HOMEPAGE="https://github.com/Diaoul/enzyme https://pypi.python.org/pypi/enzyme"
+HOMEPAGE="https://github.com/Diaoul/enzyme https://pypi.org/project/enzyme"
 SRC_URI="
 	mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
 	test? ( mirror://sourceforge/matroska/test_files/matroska_test_w1_1.zip )
diff --git a/dev-python/enzyme/enzyme-9999.ebuild b/dev-python/enzyme/enzyme-9999.ebuild
index 3c717ab3550d6..907cfab57d784 100644
--- a/dev-python/enzyme/enzyme-9999.ebuild
+++ b/dev-python/enzyme/enzyme-9999.ebuild
@@ -9,7 +9,7 @@ PYTHON_REQ_USE='xml(+)'
 inherit distutils-r1 git-r3
 
 DESCRIPTION="Python video metadata parser"
-HOMEPAGE="https://github.com/Diaoul/enzyme https://pypi.python.org/pypi/enzyme"
+HOMEPAGE="https://github.com/Diaoul/enzyme https://pypi.org/project/enzyme"
 EGIT_REPO_URI="https://github.com/Diaoul/${PN}.git"
 SRC_URI="test? ( mirror://sourceforge/matroska/test_files/matroska_test_w1_1.zip )"
 
diff --git a/dev-python/epsilon/epsilon-0.7.0.ebuild b/dev-python/epsilon/epsilon-0.7.0.ebuild
index 0d7e44bcf2e9e..415800d236d36 100644
--- a/dev-python/epsilon/epsilon-0.7.0.ebuild
+++ b/dev-python/epsilon/epsilon-0.7.0.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 )
 inherit twisted-r1 eutils
 
 DESCRIPTION="Epsilon is a Python utilities package, most famous for its Time class"
-HOMEPAGE="https://github.com/twisted/epsilon https://pypi.python.org/pypi/Epsilon"
+HOMEPAGE="https://github.com/twisted/epsilon https://pypi.org/project/Epsilon"
 SRC_URI="mirror://pypi/${TWISTED_PN:0:1}/${TWISTED_PN}/${TWISTED_P}.tar.gz"
 
 KEYWORDS="amd64 ppc ppc64 sparc x86"
diff --git a/dev-python/epsilon/epsilon-0.7.1.ebuild b/dev-python/epsilon/epsilon-0.7.1.ebuild
index f52a5827fc019..aa493cd5e3eda 100644
--- a/dev-python/epsilon/epsilon-0.7.1.ebuild
+++ b/dev-python/epsilon/epsilon-0.7.1.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 )
 inherit twisted-r1
 
 DESCRIPTION="Epsilon is a Python utilities package, most famous for its Time class"
-HOMEPAGE="https://github.com/twisted/epsilon https://pypi.python.org/pypi/Epsilon"
+HOMEPAGE="https://github.com/twisted/epsilon https://pypi.org/project/Epsilon"
 SRC_URI="mirror://pypi/${TWISTED_PN:0:1}/${TWISTED_PN}/${TWISTED_P}.tar.gz"
 
 KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
diff --git a/dev-python/errorhandler/errorhandler-1.1.1-r2.ebuild b/dev-python/errorhandler/errorhandler-1.1.1-r2.ebuild
index 3fe7defcd780a..741be69b0a375 100644
--- a/dev-python/errorhandler/errorhandler-1.1.1-r2.ebuild
+++ b/dev-python/errorhandler/errorhandler-1.1.1-r2.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 pypy )
 inherit distutils-r1
 
 DESCRIPTION="Logging framework handler that tracks when messages above a certain level have been logged"
-HOMEPAGE="https://pypi.python.org/pypi/errorhandler"
+HOMEPAGE="https://pypi.org/project/errorhandler"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 KEYWORDS="amd64 x86"
diff --git a/dev-python/et_xmlfile/et_xmlfile-1.0.1.ebuild b/dev-python/et_xmlfile/et_xmlfile-1.0.1.ebuild
index b2589278828f1..9db27f1cc4498 100644
--- a/dev-python/et_xmlfile/et_xmlfile-1.0.1.ebuild
+++ b/dev-python/et_xmlfile/et_xmlfile-1.0.1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
 inherit distutils-r1
 
 DESCRIPTION="An implementation of lxml.xmlfile for the standard library"
-HOMEPAGE="https://pypi.python.org/pypi/et_xmlfile https://bitbucket.org/openpyxl/et_xmlfile"
+HOMEPAGE="https://pypi.org/project/et_xmlfile https://bitbucket.org/openpyxl/et_xmlfile"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
diff --git a/dev-python/ets/ets-4.4.1-r1.ebuild b/dev-python/ets/ets-4.4.1-r1.ebuild
index de96df138714b..575b79305e285 100644
--- a/dev-python/ets/ets-4.4.1-r1.ebuild
+++ b/dev-python/ets/ets-4.4.1-r1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 )
 inherit distutils-r1
 
 DESCRIPTION="Meta package for the Enthought Tool Suite"
-HOMEPAGE="https://pypi.python.org/pypi/ets
+HOMEPAGE="https://pypi.org/project/ets
 	https://github.com/enthought/ets"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
diff --git a/dev-python/etsdevtools/etsdevtools-4.0.2-r1.ebuild b/dev-python/etsdevtools/etsdevtools-4.0.2-r1.ebuild
index 0e10377ad8fc2..b5a27394bc87e 100644
--- a/dev-python/etsdevtools/etsdevtools-4.0.2-r1.ebuild
+++ b/dev-python/etsdevtools/etsdevtools-4.0.2-r1.ebuild
@@ -10,7 +10,7 @@ inherit distutils-r1 virtualx
 DESCRIPTION="Enthought Tool Suite: Tools to support Python development"
 HOMEPAGE="https://github.com/enthought/etsdevtools
 	http://docs.enthought.com/etsdevtools/
-	https://pypi.python.org/pypi/etsdevtools"
+	https://pypi.org/project/etsdevtools"
 SRC_URI="http://www.enthought.com/repo/ets/${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/etsproxy/etsproxy-0.1.2-r1.ebuild b/dev-python/etsproxy/etsproxy-0.1.2-r1.ebuild
index 19b2cdf745c61..5bb2131d3def9 100644
--- a/dev-python/etsproxy/etsproxy-0.1.2-r1.ebuild
+++ b/dev-python/etsproxy/etsproxy-0.1.2-r1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 )
 inherit distutils-r1
 
 DESCRIPTION="Enthought Tool Suite: Proxy modules for backwards compatibility"
-HOMEPAGE="https://pypi.python.org/pypi/etsproxy"
+HOMEPAGE="https://pypi.org/project/etsproxy"
 SRC_URI="http://www.enthought.com/repo/ets/${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/eunuchs/eunuchs-20050320.1-r1.ebuild b/dev-python/eunuchs/eunuchs-20050320.1-r1.ebuild
index f8a3ccf76bcf3..eba4fa8a57138 100644
--- a/dev-python/eunuchs/eunuchs-20050320.1-r1.ebuild
+++ b/dev-python/eunuchs/eunuchs-20050320.1-r1.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 pypy )
 inherit distutils-r1 eutils
 
 DESCRIPTION="Missing manly parts of UNIX API for Python"
-HOMEPAGE="http://www.inoi.fi/open/trac/eunuchs https://pypi.python.org/pypi/python-eunuchs"
+HOMEPAGE="http://www.inoi.fi/open/trac/eunuchs https://pypi.org/project/python-eunuchs"
 SRC_URI="mirror://debian/pool/main/e/${PN}/${PN}_${PV}.tar.gz"
 
 LICENSE="LGPL-2"
diff --git a/dev-python/eventlet/eventlet-0.18.4.ebuild b/dev-python/eventlet/eventlet-0.18.4.ebuild
index 4b00621ad2231..e098b10f43365 100644
--- a/dev-python/eventlet/eventlet-0.18.4.ebuild
+++ b/dev-python/eventlet/eventlet-0.18.4.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
 inherit distutils-r1
 
 DESCRIPTION="Highly concurrent networking library"
-HOMEPAGE="https://pypi.python.org/pypi/eventlet https://github.com/eventlet/eventlet/"
+HOMEPAGE="https://pypi.org/project/eventlet https://github.com/eventlet/eventlet/"
 SRC_URI="mirror://pypi/e/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/eventlet/eventlet-0.20.0-r1.ebuild b/dev-python/eventlet/eventlet-0.20.0-r1.ebuild
index b0366da9f319b..13da82e3981cb 100644
--- a/dev-python/eventlet/eventlet-0.20.0-r1.ebuild
+++ b/dev-python/eventlet/eventlet-0.20.0-r1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
 inherit distutils-r1
 
 DESCRIPTION="Highly concurrent networking library"
-HOMEPAGE="https://pypi.python.org/pypi/eventlet https://github.com/eventlet/eventlet/"
+HOMEPAGE="https://pypi.org/project/eventlet https://github.com/eventlet/eventlet/"
 SRC_URI="mirror://pypi/e/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/eventlet/eventlet-0.20.1-r1.ebuild b/dev-python/eventlet/eventlet-0.20.1-r1.ebuild
index b218597e04794..66d8972d424e8 100644
--- a/dev-python/eventlet/eventlet-0.20.1-r1.ebuild
+++ b/dev-python/eventlet/eventlet-0.20.1-r1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
 inherit distutils-r1
 
 DESCRIPTION="Highly concurrent networking library"
-HOMEPAGE="https://pypi.python.org/pypi/eventlet https://github.com/eventlet/eventlet/"
+HOMEPAGE="https://pypi.org/project/eventlet https://github.com/eventlet/eventlet/"
 SRC_URI="mirror://pypi/e/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/eventlet/eventlet-0.21.0-r1.ebuild b/dev-python/eventlet/eventlet-0.21.0-r1.ebuild
index a0881d9eaa477..8e8326375928b 100644
--- a/dev-python/eventlet/eventlet-0.21.0-r1.ebuild
+++ b/dev-python/eventlet/eventlet-0.21.0-r1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
 inherit distutils-r1
 
 DESCRIPTION="Highly concurrent networking library"
-HOMEPAGE="https://pypi.python.org/pypi/eventlet https://github.com/eventlet/eventlet/"
+HOMEPAGE="https://pypi.org/project/eventlet https://github.com/eventlet/eventlet/"
 SRC_URI="mirror://pypi/e/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/execnet/execnet-1.4.1.ebuild b/dev-python/execnet/execnet-1.4.1.ebuild
index fcc4e14e1cf0b..256f383e1107f 100644
--- a/dev-python/execnet/execnet-1.4.1.ebuild
+++ b/dev-python/execnet/execnet-1.4.1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="Rapid multi-Python deployment"
-HOMEPAGE="http://codespeak.net/execnet/ https://pypi.python.org/pypi/execnet/"
+HOMEPAGE="http://codespeak.net/execnet/ https://pypi.org/project/execnet/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/execnet/execnet-1.5.0.ebuild b/dev-python/execnet/execnet-1.5.0.ebuild
index 87bc2073c35c7..1041eb5b2767d 100644
--- a/dev-python/execnet/execnet-1.5.0.ebuild
+++ b/dev-python/execnet/execnet-1.5.0.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="Rapid multi-Python deployment"
-HOMEPAGE="http://codespeak.net/execnet/ https://pypi.python.org/pypi/execnet/"
+HOMEPAGE="http://codespeak.net/execnet/ https://pypi.org/project/execnet/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/extras/extras-0.0.3.ebuild b/dev-python/extras/extras-0.0.3.ebuild
index 9ed1426ad291a..61ad969a5a280 100644
--- a/dev-python/extras/extras-0.0.3.ebuild
+++ b/dev-python/extras/extras-0.0.3.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="Useful extra bits for Python that should be in the standard library"
-HOMEPAGE="https://github.com/testing-cabal/extras/ https://pypi.python.org/pypi/extras/"
+HOMEPAGE="https://github.com/testing-cabal/extras/ https://pypi.org/project/extras/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/extras/extras-1.0.0.ebuild b/dev-python/extras/extras-1.0.0.ebuild
index 257356669d3ee..7bc9faaaeffc0 100644
--- a/dev-python/extras/extras-1.0.0.ebuild
+++ b/dev-python/extras/extras-1.0.0.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_4 python3_5 python3_6 pypy pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="Useful extra bits for Python that should be in the standard library"
-HOMEPAGE="https://github.com/testing-cabal/extras/ https://pypi.python.org/pypi/extras/"
+HOMEPAGE="https://github.com/testing-cabal/extras/ https://pypi.org/project/extras/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/extremes/extremes-1.1.1.ebuild b/dev-python/extremes/extremes-1.1.1.ebuild
index f2be72d7bfccb..2f20ab4b8f557 100644
--- a/dev-python/extremes/extremes-1.1.1.ebuild
+++ b/dev-python/extremes/extremes-1.1.1.ebuild
@@ -8,7 +8,7 @@ inherit distutils-r1
 
 MY_PN="Extremes"
 DESCRIPTION="Production-quality 'Min' and 'Max' objects"
-HOMEPAGE="https://pypi.python.org/pypi/Extremes"
+HOMEPAGE="https://pypi.org/project/Extremes"
 SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.zip -> ${P}.zip"
 
 KEYWORDS="amd64 x86"
diff --git a/dev-python/fabric/fabric-1.10.0-r1.ebuild b/dev-python/fabric/fabric-1.10.0-r1.ebuild
index f855e6e81561f..a69cd2564a742 100644
--- a/dev-python/fabric/fabric-1.10.0-r1.ebuild
+++ b/dev-python/fabric/fabric-1.10.0-r1.ebuild
@@ -10,7 +10,7 @@ MY_PN="Fabric"
 MY_P="${MY_PN}-${PV}"
 
 DESCRIPTION="A simple pythonic tool for remote execution and deployment"
-HOMEPAGE="http://fabfile.org https://pypi.python.org/pypi/Fabric"
+HOMEPAGE="http://fabfile.org https://pypi.org/project/Fabric"
 SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
diff --git a/dev-python/fabric/fabric-1.12.0.ebuild b/dev-python/fabric/fabric-1.12.0.ebuild
index 36ca64ccbfef5..5b6908546f551 100644
--- a/dev-python/fabric/fabric-1.12.0.ebuild
+++ b/dev-python/fabric/fabric-1.12.0.ebuild
@@ -13,7 +13,7 @@ MY_P="${MY_PN}-${PV}"
 COMP_HASH="83d303e9fb352deaf4885b6db0781b3d9115e9c6"
 
 DESCRIPTION="A simple pythonic tool for remote execution and deployment"
-HOMEPAGE="http://fabfile.org https://pypi.python.org/pypi/Fabric"
+HOMEPAGE="http://fabfile.org https://pypi.org/project/Fabric"
 SRC_URI="
 	mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz
 	https://raw.githubusercontent.com/kbakulin/fabric-completion/${COMP_HASH}/fabric-completion.bash -> ${P}-completion.bash"
diff --git a/dev-python/fabric/fabric-1.14.0.ebuild b/dev-python/fabric/fabric-1.14.0.ebuild
index 36ca64ccbfef5..5b6908546f551 100644
--- a/dev-python/fabric/fabric-1.14.0.ebuild
+++ b/dev-python/fabric/fabric-1.14.0.ebuild
@@ -13,7 +13,7 @@ MY_P="${MY_PN}-${PV}"
 COMP_HASH="83d303e9fb352deaf4885b6db0781b3d9115e9c6"
 
 DESCRIPTION="A simple pythonic tool for remote execution and deployment"
-HOMEPAGE="http://fabfile.org https://pypi.python.org/pypi/Fabric"
+HOMEPAGE="http://fabfile.org https://pypi.org/project/Fabric"
 SRC_URI="
 	mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz
 	https://raw.githubusercontent.com/kbakulin/fabric-completion/${COMP_HASH}/fabric-completion.bash -> ${P}-completion.bash"
diff --git a/dev-python/falcon/falcon-0.1.6.ebuild b/dev-python/falcon/falcon-0.1.6.ebuild
index 68269102da333..6d74152901fff 100644
--- a/dev-python/falcon/falcon-0.1.6.ebuild
+++ b/dev-python/falcon/falcon-0.1.6.ebuild
@@ -11,7 +11,7 @@ PYTHON_COMPAT=( python2_7 pypy )
 inherit distutils-r1
 
 DESCRIPTION="A supersonic micro-framework for building cloud APIs"
-HOMEPAGE="http://falconframework.org/ https://pypi.python.org/pypi/falcon"
+HOMEPAGE="http://falconframework.org/ https://pypi.org/project/falcon"
 SRC_URI="https://github.com/racker/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
diff --git a/dev-python/falcon/falcon-0.1.7.ebuild b/dev-python/falcon/falcon-0.1.7.ebuild
index 0e647c8248121..614254801dc63 100644
--- a/dev-python/falcon/falcon-0.1.7.ebuild
+++ b/dev-python/falcon/falcon-0.1.7.ebuild
@@ -11,7 +11,7 @@ PYTHON_COMPAT=( python2_7 pypy )
 inherit distutils-r1
 
 DESCRIPTION="A supersonic micro-framework for building cloud APIs"
-HOMEPAGE="http://falconframework.org/ https://pypi.python.org/pypi/falcon"
+HOMEPAGE="http://falconframework.org/ https://pypi.org/project/falcon"
 SRC_URI="https://github.com/racker/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
diff --git a/dev-python/falcon/falcon-0.1.8.ebuild b/dev-python/falcon/falcon-0.1.8.ebuild
index 0eb150dc701c3..34ded6347e94f 100644
--- a/dev-python/falcon/falcon-0.1.8.ebuild
+++ b/dev-python/falcon/falcon-0.1.8.ebuild
@@ -11,7 +11,7 @@ PYTHON_COMPAT=( python{2_7,3_4} pypy )
 inherit distutils-r1
 
 DESCRIPTION="A supersonic micro-framework for building cloud APIs"
-HOMEPAGE="http://falconframework.org/ https://pypi.python.org/pypi/falcon"
+HOMEPAGE="http://falconframework.org/ https://pypi.org/project/falcon"
 SRC_URI="https://github.com/racker/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
diff --git a/dev-python/falcon/falcon-0.1.9.ebuild b/dev-python/falcon/falcon-0.1.9.ebuild
index 33a843d2c5173..7c359e2fbea7b 100644
--- a/dev-python/falcon/falcon-0.1.9.ebuild
+++ b/dev-python/falcon/falcon-0.1.9.ebuild
@@ -11,7 +11,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5} pypy )
 inherit distutils-r1
 
 DESCRIPTION="A supersonic micro-framework for building cloud APIs"
-HOMEPAGE="http://falconframework.org/ https://pypi.python.org/pypi/falcon"
+HOMEPAGE="http://falconframework.org/ https://pypi.org/project/falcon"
 SRC_URI="https://github.com/racker/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
diff --git a/dev-python/falcon/falcon-1.3.0.ebuild b/dev-python/falcon/falcon-1.3.0.ebuild
index 2696344e3cf43..1d13bb9362ea0 100644
--- a/dev-python/falcon/falcon-1.3.0.ebuild
+++ b/dev-python/falcon/falcon-1.3.0.ebuild
@@ -11,7 +11,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy )
 inherit distutils-r1
 
 DESCRIPTION="A supersonic micro-framework for building cloud APIs"
-HOMEPAGE="http://falconframework.org/ https://pypi.python.org/pypi/falcon"
+HOMEPAGE="http://falconframework.org/ https://pypi.org/project/falcon"
 SRC_URI="https://github.com/racker/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
diff --git a/dev-python/faulthandler/faulthandler-2.6.ebuild b/dev-python/faulthandler/faulthandler-2.6.ebuild
index e2c97d0e41ca8..8f42a8da66aa5 100644
--- a/dev-python/faulthandler/faulthandler-2.6.ebuild
+++ b/dev-python/faulthandler/faulthandler-2.6.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 )
 inherit distutils-r1
 
 DESCRIPTION="functions to dump Python tracebacks explicitly (on fault, user signal, timeout)"
-HOMEPAGE="https://github.com/haypo/faulthandler https://pypi.python.org/pypi/faulthandler"
+HOMEPAGE="https://github.com/haypo/faulthandler https://pypi.org/project/faulthandler"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD-2"
diff --git a/dev-python/faulthandler/faulthandler-3.0.ebuild b/dev-python/faulthandler/faulthandler-3.0.ebuild
index d996088ebc96b..e6edb4bc3d4de 100644
--- a/dev-python/faulthandler/faulthandler-3.0.ebuild
+++ b/dev-python/faulthandler/faulthandler-3.0.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 )
 inherit distutils-r1
 
 DESCRIPTION="functions to dump Python tracebacks explicitly (on fault, user signal, timeout)"
-HOMEPAGE="https://github.com/haypo/faulthandler https://pypi.python.org/pypi/faulthandler"
+HOMEPAGE="https://github.com/haypo/faulthandler https://pypi.org/project/faulthandler"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD-2"
diff --git a/dev-python/fdsend/fdsend-0.1.ebuild b/dev-python/fdsend/fdsend-0.1.ebuild
index c1200a06dc0dc..628d469d33d91 100644
--- a/dev-python/fdsend/fdsend-0.1.ebuild
+++ b/dev-python/fdsend/fdsend-0.1.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 pypy )
 inherit distutils-r1
 
 DESCRIPTION="flexible file descriptor passing"
-HOMEPAGE="https://pypi.python.org/pypi/fdsend/"
+HOMEPAGE="https://pypi.org/project/fdsend/"
 SRC_URI="http://pilcrow.madison.wi.us/sw/${P}.tar.gz"
 
 SLOT="0"
diff --git a/dev-python/fedmsg/fedmsg-0.18.3.ebuild b/dev-python/fedmsg/fedmsg-0.18.3.ebuild
index f59cd04664d71..875ae53228b8d 100644
--- a/dev-python/fedmsg/fedmsg-0.18.3.ebuild
+++ b/dev-python/fedmsg/fedmsg-0.18.3.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5} )
 inherit distutils-r1
 
 DESCRIPTION="Fedora Messaging Client API"
-HOMEPAGE="http://www.fedmsg.com/ https://pypi.python.org/pypi/fedmsg"
+HOMEPAGE="http://www.fedmsg.com/ https://pypi.org/project/fedmsg"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2+"
diff --git a/dev-python/feedgenerator/feedgenerator-1.9.ebuild b/dev-python/feedgenerator/feedgenerator-1.9.ebuild
index a74143a3add0a..38a1f77d79ff5 100644
--- a/dev-python/feedgenerator/feedgenerator-1.9.ebuild
+++ b/dev-python/feedgenerator/feedgenerator-1.9.ebuild
@@ -6,7 +6,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5} pypy )
 inherit distutils-r1
 
 DESCRIPTION="Standalone version of django.utils.feedgenerator"
-HOMEPAGE="https://pypi.python.org/pypi/feedgenerator"
+HOMEPAGE="https://pypi.org/project/feedgenerator"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/feedparser/feedparser-5.2.1.ebuild b/dev-python/feedparser/feedparser-5.2.1.ebuild
index d137f86feb0fe..402db9841423a 100644
--- a/dev-python/feedparser/feedparser-5.2.1.ebuild
+++ b/dev-python/feedparser/feedparser-5.2.1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy{,3} )
 inherit distutils-r1
 
 DESCRIPTION="Parse RSS and Atom feeds in Python"
-HOMEPAGE="https://github.com/kurtmckee/feedparser https://pypi.python.org/pypi/feedparser"
+HOMEPAGE="https://github.com/kurtmckee/feedparser https://pypi.org/project/feedparser"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 # sgmllib is licensed under PSF-2.
diff --git a/dev-python/figleaf/figleaf-0.6.1-r1.ebuild b/dev-python/figleaf/figleaf-0.6.1-r1.ebuild
index 0a9ad08bbc6dd..5d684405a5dc0 100644
--- a/dev-python/figleaf/figleaf-0.6.1-r1.ebuild
+++ b/dev-python/figleaf/figleaf-0.6.1-r1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 )
 inherit distutils-r1
 
 DESCRIPTION="Code coverage tool"
-HOMEPAGE="http://darcs.idyll.org/~t/projects/figleaf/doc/ https://pypi.python.org/pypi/figleaf"
+HOMEPAGE="http://darcs.idyll.org/~t/projects/figleaf/doc/ https://pypi.org/project/figleaf"
 SRC_URI="http://darcs.idyll.org/~t/projects/${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/filemagic/filemagic-1.6.ebuild b/dev-python/filemagic/filemagic-1.6.ebuild
index 0398d416e1775..6159d6015d53f 100644
--- a/dev-python/filemagic/filemagic-1.6.ebuild
+++ b/dev-python/filemagic/filemagic-1.6.ebuild
@@ -6,7 +6,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy )
 inherit distutils-r1
 
 DESCRIPTION="A Python API for libmagic, the library behind the Unix file command"
-HOMEPAGE="https://pypi.python.org/pypi/filemagic https://github.com/aliles/filemagic"
+HOMEPAGE="https://pypi.org/project/filemagic https://github.com/aliles/filemagic"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
diff --git a/dev-python/fixtures/fixtures-1.4.0.ebuild b/dev-python/fixtures/fixtures-1.4.0.ebuild
index 23ac413788938..732f127d05ca2 100644
--- a/dev-python/fixtures/fixtures-1.4.0.ebuild
+++ b/dev-python/fixtures/fixtures-1.4.0.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="Fixtures, reusable state for writing clean tests and more"
-HOMEPAGE="https://launchpad.net/python-fixtures https://pypi.python.org/pypi/fixtures"
+HOMEPAGE="https://launchpad.net/python-fixtures https://pypi.org/project/fixtures"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="|| ( Apache-2.0 BSD )"
diff --git a/dev-python/fixtures/fixtures-3.0.0.ebuild b/dev-python/fixtures/fixtures-3.0.0.ebuild
index 97dcd0f27e55a..17a95c509dc85 100644
--- a/dev-python/fixtures/fixtures-3.0.0.ebuild
+++ b/dev-python/fixtures/fixtures-3.0.0.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="Fixtures, reusable state for writing clean tests and more"
-HOMEPAGE="https://launchpad.net/python-fixtures https://pypi.python.org/pypi/fixtures"
+HOMEPAGE="https://launchpad.net/python-fixtures https://pypi.org/project/fixtures"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="|| ( Apache-2.0 BSD )"
diff --git a/dev-python/flake8/flake8-2.2.5.ebuild b/dev-python/flake8/flake8-2.2.5.ebuild
index 813b9c427bb67..c109afcefcb68 100644
--- a/dev-python/flake8/flake8-2.2.5.ebuild
+++ b/dev-python/flake8/flake8-2.2.5.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
 inherit distutils-r1
 
 DESCRIPTION="A wrapper around PyFlakes, pep8 & mccabe"
-HOMEPAGE="https://bitbucket.org/tarek/flake8 https://pypi.python.org/pypi/flake8"
+HOMEPAGE="https://bitbucket.org/tarek/flake8 https://pypi.org/project/flake8"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
diff --git a/dev-python/flake8/flake8-2.5.4.ebuild b/dev-python/flake8/flake8-2.5.4.ebuild
index e1546bdff4c62..43b584aa88806 100644
--- a/dev-python/flake8/flake8-2.5.4.ebuild
+++ b/dev-python/flake8/flake8-2.5.4.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
 inherit distutils-r1
 
 DESCRIPTION="A wrapper around PyFlakes, pep8 & mccabe"
-HOMEPAGE="https://bitbucket.org/tarek/flake8 https://pypi.python.org/pypi/flake8"
+HOMEPAGE="https://bitbucket.org/tarek/flake8 https://pypi.org/project/flake8"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
diff --git a/dev-python/flake8/flake8-3.5.0.ebuild b/dev-python/flake8/flake8-3.5.0.ebuild
index 5a53fa71257d1..f1ca5c709acae 100644
--- a/dev-python/flake8/flake8-3.5.0.ebuild
+++ b/dev-python/flake8/flake8-3.5.0.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy{,3} )
 inherit distutils-r1
 
 DESCRIPTION="A wrapper around PyFlakes, pep8 & mccabe"
-HOMEPAGE="https://gitlab.com/pycqa/flake8 https://pypi.python.org/pypi/flake8"
+HOMEPAGE="https://gitlab.com/pycqa/flake8 https://pypi.org/project/flake8"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/flaky/flaky-3.1.1.ebuild b/dev-python/flaky/flaky-3.1.1.ebuild
index 28da53e5255d0..d64b2dbb5ffd9 100644
--- a/dev-python/flaky/flaky-3.1.1.ebuild
+++ b/dev-python/flaky/flaky-3.1.1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy{,3} )
 inherit distutils-r1
 
 DESCRIPTION="Plugin for nose or py.test that automatically reruns flaky tests"
-HOMEPAGE="https://pypi.python.org/pypi/flaky https://github.com/box/flaky"
+HOMEPAGE="https://pypi.org/project/flaky https://github.com/box/flaky"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
diff --git a/dev-python/flaky/flaky-3.4.0.ebuild b/dev-python/flaky/flaky-3.4.0.ebuild
index 7e6dd78997745..67a47da94d815 100644
--- a/dev-python/flaky/flaky-3.4.0.ebuild
+++ b/dev-python/flaky/flaky-3.4.0.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy{,3} )
 inherit distutils-r1
 
 DESCRIPTION="Plugin for nose or py.test that automatically reruns flaky tests"
-HOMEPAGE="https://pypi.python.org/pypi/flaky https://github.com/box/flaky"
+HOMEPAGE="https://pypi.org/project/flaky https://github.com/box/flaky"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
diff --git a/dev-python/flask-admin/flask-admin-1.0.6.ebuild b/dev-python/flask-admin/flask-admin-1.0.6.ebuild
index 04b1b866af98b..f066aa0050121 100644
--- a/dev-python/flask-admin/flask-admin-1.0.6.ebuild
+++ b/dev-python/flask-admin/flask-admin-1.0.6.ebuild
@@ -12,7 +12,7 @@ MY_PN="Flask-Admin"
 MY_P="${MY_PN}-${PV}"
 
 DESCRIPTION="Simple and extensible admin interface framework for Flask"
-HOMEPAGE="https://pypi.python.org/pypi/Flask-Admin"
+HOMEPAGE="https://pypi.org/project/Flask-Admin"
 SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/flask-admin/flask-admin-1.5.0.ebuild b/dev-python/flask-admin/flask-admin-1.5.0.ebuild
index 655c35bfca6a9..9aef07d8acd37 100644
--- a/dev-python/flask-admin/flask-admin-1.5.0.ebuild
+++ b/dev-python/flask-admin/flask-admin-1.5.0.ebuild
@@ -12,7 +12,7 @@ MY_PN="Flask-Admin"
 MY_P="${MY_PN}-${PV}"
 
 DESCRIPTION="Simple and extensible admin interface framework for Flask"
-HOMEPAGE="https://pypi.python.org/pypi/Flask-Admin"
+HOMEPAGE="https://pypi.org/project/Flask-Admin"
 SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/flask-babelex/flask-babelex-0.9.3.ebuild b/dev-python/flask-babelex/flask-babelex-0.9.3.ebuild
index e1a7a94a45a8d..0ec54e9dfe519 100644
--- a/dev-python/flask-babelex/flask-babelex-0.9.3.ebuild
+++ b/dev-python/flask-babelex/flask-babelex-0.9.3.ebuild
@@ -10,7 +10,7 @@ MY_PN="Flask-BabelEx"
 MY_P="${MY_PN}-${PV}"
 
 DESCRIPTION="Adds i18n/l10n support to Flask applications"
-HOMEPAGE="https://github.com/mrjoes/flask-babelex https://pypi.python.org/pypi/Flask-BabelEx"
+HOMEPAGE="https://github.com/mrjoes/flask-babelex https://pypi.org/project/Flask-BabelEx"
 SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/flask-cors/flask-cors-1.8.0.ebuild b/dev-python/flask-cors/flask-cors-1.8.0.ebuild
index c9c3573f15dad..2ff16ca1d5bd0 100644
--- a/dev-python/flask-cors/flask-cors-1.8.0.ebuild
+++ b/dev-python/flask-cors/flask-cors-1.8.0.ebuild
@@ -18,7 +18,7 @@ else
 fi
 
 DESCRIPTION="A Flask extension for Cross Origin Resource Sharing (CORS)"
-HOMEPAGE="https://github.com/wcdolphin/flask-cors https://pypi.python.org/pypi/Flask-Cors"
+HOMEPAGE="https://github.com/wcdolphin/flask-cors https://pypi.org/project/Flask-Cors"
 
 LICENSE="MIT"
 SLOT="0"
diff --git a/dev-python/flask-cors/flask-cors-1.9.0.ebuild b/dev-python/flask-cors/flask-cors-1.9.0.ebuild
index 43b7653ba36ba..fa355aae91d7d 100644
--- a/dev-python/flask-cors/flask-cors-1.9.0.ebuild
+++ b/dev-python/flask-cors/flask-cors-1.9.0.ebuild
@@ -18,7 +18,7 @@ else
 fi
 
 DESCRIPTION="A Flask extension for Cross Origin Resource Sharing (CORS)"
-HOMEPAGE="https://github.com/wcdolphin/flask-cors https://pypi.python.org/pypi/Flask-Cors"
+HOMEPAGE="https://github.com/wcdolphin/flask-cors https://pypi.org/project/Flask-Cors"
 
 LICENSE="MIT"
 SLOT="0"
diff --git a/dev-python/flask-cors/flask-cors-2.1.0.ebuild b/dev-python/flask-cors/flask-cors-2.1.0.ebuild
index 8be49aee9b315..d4da672f29edf 100644
--- a/dev-python/flask-cors/flask-cors-2.1.0.ebuild
+++ b/dev-python/flask-cors/flask-cors-2.1.0.ebuild
@@ -18,7 +18,7 @@ else
 fi
 
 DESCRIPTION="A Flask extension for Cross Origin Resource Sharing (CORS)"
-HOMEPAGE="https://github.com/wcdolphin/flask-cors https://pypi.python.org/pypi/Flask-Cors"
+HOMEPAGE="https://github.com/wcdolphin/flask-cors https://pypi.org/project/Flask-Cors"
 
 LICENSE="MIT"
 SLOT="0"
diff --git a/dev-python/flask-dashed/flask-dashed-0.1b_p2.ebuild b/dev-python/flask-dashed/flask-dashed-0.1b_p2.ebuild
index 491007a057948..863405ab1ee45 100644
--- a/dev-python/flask-dashed/flask-dashed-0.1b_p2.ebuild
+++ b/dev-python/flask-dashed/flask-dashed-0.1b_p2.ebuild
@@ -11,7 +11,7 @@ MY_PV="${PV/_p/}"
 MY_P="${MY_PN}-${MY_PV}"
 
 DESCRIPTION="Admin app framework for flask"
-HOMEPAGE="http://jeanphix.me/${MY_PN}/ https://pypi.python.org/pypi/${MY_PN}"
+HOMEPAGE="http://jeanphix.me/${MY_PN}/ https://pypi.org/project/${MY_PN}"
 SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/flask-evolution/flask-evolution-0.5-r1.ebuild b/dev-python/flask-evolution/flask-evolution-0.5-r1.ebuild
index 10c90958bb7c0..e82eec1e5ae1a 100644
--- a/dev-python/flask-evolution/flask-evolution-0.5-r1.ebuild
+++ b/dev-python/flask-evolution/flask-evolution-0.5-r1.ebuild
@@ -10,7 +10,7 @@ MY_PN="Flask-Evolution"
 MY_P="${MY_PN}-${PV}"
 
 DESCRIPTION="Simple migrations for Flask/SQLAlchemy projects"
-HOMEPAGE="https://pypi.python.org/pypi/Flask-Evolution"
+HOMEPAGE="https://pypi.org/project/Flask-Evolution"
 SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/flask-evolution/flask-evolution-0.6.ebuild b/dev-python/flask-evolution/flask-evolution-0.6.ebuild
index 138f0fe1adaa5..f772f8a6836b2 100644
--- a/dev-python/flask-evolution/flask-evolution-0.6.ebuild
+++ b/dev-python/flask-evolution/flask-evolution-0.6.ebuild
@@ -10,7 +10,7 @@ MY_PN="Flask-Evolution"
 MY_P="${MY_PN}-${PV}"
 
 DESCRIPTION="Simple migrations for Flask/SQLAlchemy projects"
-HOMEPAGE="https://pypi.python.org/pypi/Flask-Evolution"
+HOMEPAGE="https://pypi.org/project/Flask-Evolution"
 SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/flask-login/flask-login-0.3.2-r1.ebuild b/dev-python/flask-login/flask-login-0.3.2-r1.ebuild
index 32b9e6928c519..a59d1fdd399ab 100644
--- a/dev-python/flask-login/flask-login-0.3.2-r1.ebuild
+++ b/dev-python/flask-login/flask-login-0.3.2-r1.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5} pypy )
 inherit distutils-r1
 
 DESCRIPTION="Login session support for Flask"
-HOMEPAGE="https://pypi.python.org/pypi/Flask-Login"
+HOMEPAGE="https://pypi.org/project/Flask-Login"
 SRC_URI="https://github.com/maxcountryman/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 # pypi tarball is missing tests
 
diff --git a/dev-python/flask-mail/flask-mail-0.9.1-r1.ebuild b/dev-python/flask-mail/flask-mail-0.9.1-r1.ebuild
index 3dd893b3ec99e..b5321ce0576ee 100644
--- a/dev-python/flask-mail/flask-mail-0.9.1-r1.ebuild
+++ b/dev-python/flask-mail/flask-mail-0.9.1-r1.ebuild
@@ -10,7 +10,7 @@ MY_PN="Flask-Mail"
 MY_P="${MY_PN}-${PV}"
 
 DESCRIPTION="Flask extension for sending email"
-HOMEPAGE="http://pythonhosted.org/Flask-Mail/ https://pypi.python.org/pypi/Flask-Mail"
+HOMEPAGE="http://pythonhosted.org/Flask-Mail/ https://pypi.org/project/Flask-Mail"
 SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/flask-migrate/flask-migrate-2.1.1.ebuild b/dev-python/flask-migrate/flask-migrate-2.1.1.ebuild
index 72ba319a064ec..fe5c63776eb75 100644
--- a/dev-python/flask-migrate/flask-migrate-2.1.1.ebuild
+++ b/dev-python/flask-migrate/flask-migrate-2.1.1.ebuild
@@ -10,7 +10,7 @@ MY_PN="Flask-Migrate"
 MY_P="${MY_PN}-${PV}"
 
 DESCRIPTION="SQLAlchemy database migrations for Flask applications using Alembic"
-HOMEPAGE="https://pypi.python.org/pypi/Flask-Migrate"
+HOMEPAGE="https://pypi.org/project/Flask-Migrate"
 SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/flask-mongoengine/flask-mongoengine-0.9.3.ebuild b/dev-python/flask-mongoengine/flask-mongoengine-0.9.3.ebuild
index 3c0dcc981a3a4..28d61b9549949 100644
--- a/dev-python/flask-mongoengine/flask-mongoengine-0.9.3.ebuild
+++ b/dev-python/flask-mongoengine/flask-mongoengine-0.9.3.ebuild
@@ -9,7 +9,7 @@ inherit distutils-r1
 RESTRICT="test" # requires running MongoDB server
 
 DESCRIPTION="Flask support for MongoDB and with WTF model forms"
-HOMEPAGE="https://pypi.python.org/pypi/flask-mongoengine/"
+HOMEPAGE="https://pypi.org/project/flask-mongoengine/"
 SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/flask-openid/flask-openid-1.2.4.ebuild b/dev-python/flask-openid/flask-openid-1.2.4.ebuild
index cae113a90ca1f..862fdc17cd4f9 100644
--- a/dev-python/flask-openid/flask-openid-1.2.4.ebuild
+++ b/dev-python/flask-openid/flask-openid-1.2.4.ebuild
@@ -10,7 +10,7 @@ MY_PN="Flask-OpenID"
 MY_P="${MY_PN}-${PV}"
 
 DESCRIPTION="OpenID support for Flask"
-HOMEPAGE="https://pypi.python.org/pypi/Flask-OpenID"
+HOMEPAGE="https://pypi.org/project/Flask-OpenID"
 SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/flask-openid/flask-openid-1.2.5.ebuild b/dev-python/flask-openid/flask-openid-1.2.5.ebuild
index ae474adbe382d..9a36d87e5e5ab 100644
--- a/dev-python/flask-openid/flask-openid-1.2.5.ebuild
+++ b/dev-python/flask-openid/flask-openid-1.2.5.ebuild
@@ -10,7 +10,7 @@ MY_PN="Flask-OpenID"
 MY_P="${MY_PN}-${PV}"
 
 DESCRIPTION="OpenID support for Flask"
-HOMEPAGE="https://pypi.python.org/pypi/Flask-OpenID"
+HOMEPAGE="https://pypi.org/project/Flask-OpenID"
 SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/flask-peewee/flask-peewee-0.6.5.ebuild b/dev-python/flask-peewee/flask-peewee-0.6.5.ebuild
index 08f05b45ad78a..d186dead915c3 100644
--- a/dev-python/flask-peewee/flask-peewee-0.6.5.ebuild
+++ b/dev-python/flask-peewee/flask-peewee-0.6.5.ebuild
@@ -9,7 +9,7 @@ inherit distutils-r1
 RESTRICT="test" # broken
 
 DESCRIPTION="Flask integration layer for the Peewee ORM"
-HOMEPAGE="https://pypi.python.org/pypi/Flask-Admin"
+HOMEPAGE="https://pypi.org/project/Flask-Admin"
 SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/flask-peewee/flask-peewee-0.6.7.ebuild b/dev-python/flask-peewee/flask-peewee-0.6.7.ebuild
index 0eb43f0f4aadf..41824e467daca 100644
--- a/dev-python/flask-peewee/flask-peewee-0.6.7.ebuild
+++ b/dev-python/flask-peewee/flask-peewee-0.6.7.ebuild
@@ -9,7 +9,7 @@ inherit distutils-r1
 RESTRICT="test" # broken
 
 DESCRIPTION="Flask integration layer for the Peewee ORM"
-HOMEPAGE="https://pypi.python.org/pypi/Flask-Admin"
+HOMEPAGE="https://pypi.org/project/Flask-Admin"
 SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/flask-principal/flask-principal-0.4.0-r1.ebuild b/dev-python/flask-principal/flask-principal-0.4.0-r1.ebuild
index 0532d9f272e97..9362cf93921d3 100644
--- a/dev-python/flask-principal/flask-principal-0.4.0-r1.ebuild
+++ b/dev-python/flask-principal/flask-principal-0.4.0-r1.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5} pypy )
 inherit distutils-r1
 
 DESCRIPTION="Identity management for flask"
-HOMEPAGE="http://pythonhosted.org/Flask-Principal/ https://pypi.python.org/pypi/Flask-Principal"
+HOMEPAGE="http://pythonhosted.org/Flask-Principal/ https://pypi.org/project/Flask-Principal"
 SRC_URI="https://github.com/mattupstate/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 # pypi tarball is missing tests
 
diff --git a/dev-python/flask-pymongo/flask-pymongo-0.3.0.ebuild b/dev-python/flask-pymongo/flask-pymongo-0.3.0.ebuild
index 9cd0a42821381..50c3c0091ed1a 100644
--- a/dev-python/flask-pymongo/flask-pymongo-0.3.0.ebuild
+++ b/dev-python/flask-pymongo/flask-pymongo-0.3.0.ebuild
@@ -10,7 +10,7 @@ MY_PN="Flask-PyMongo"
 MY_P="${MY_PN}-${PV}"
 
 DESCRIPTION="PyMongo support for Flask"
-HOMEPAGE="https://pypi.python.org/pypi/Flask-PyMongo"
+HOMEPAGE="https://pypi.org/project/Flask-PyMongo"
 SRC_URI="https://github.com/dcrosta/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 #SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
diff --git a/dev-python/flask-pymongo/flask-pymongo-0.4.1.ebuild b/dev-python/flask-pymongo/flask-pymongo-0.4.1.ebuild
index 08df937c350b2..a29ca91b49dec 100644
--- a/dev-python/flask-pymongo/flask-pymongo-0.4.1.ebuild
+++ b/dev-python/flask-pymongo/flask-pymongo-0.4.1.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5} )
 inherit distutils-r1
 
 DESCRIPTION="PyMongo support for Flask"
-HOMEPAGE="https://pypi.python.org/pypi/Flask-PyMongo"
+HOMEPAGE="https://pypi.org/project/Flask-PyMongo"
 SRC_URI="https://github.com/dcrosta/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/flask-script/flask-script-2.0.5-r1.ebuild b/dev-python/flask-script/flask-script-2.0.5-r1.ebuild
index 7f33642571c8f..b3bc617ce4657 100644
--- a/dev-python/flask-script/flask-script-2.0.5-r1.ebuild
+++ b/dev-python/flask-script/flask-script-2.0.5-r1.ebuild
@@ -12,7 +12,7 @@ MY_P="${MY_PN}-${PV}"
 DESCRIPTION="Flask support for writing external scripts"
 HOMEPAGE="https://flask-script.readthedocs.io/en/latest/
 	https://flask-script.readthedocs.io/en/latest/
-	https://pypi.python.org/pypi/Flask-Script"
+	https://pypi.org/project/Flask-Script"
 SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/flask-script/flask-script-2.0.6.ebuild b/dev-python/flask-script/flask-script-2.0.6.ebuild
index c4eca69a792fe..ef69bc840b4bd 100644
--- a/dev-python/flask-script/flask-script-2.0.6.ebuild
+++ b/dev-python/flask-script/flask-script-2.0.6.ebuild
@@ -12,7 +12,7 @@ MY_P="${MY_PN}-${PV}"
 DESCRIPTION="Flask support for writing external scripts"
 HOMEPAGE="https://flask-script.readthedocs.io/en/latest/
 	https://flask-script.readthedocs.io/en/latest/
-	https://pypi.python.org/pypi/Flask-Script"
+	https://pypi.org/project/Flask-Script"
 SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/flask-security/flask-security-1.7.5-r1.ebuild b/dev-python/flask-security/flask-security-1.7.5-r1.ebuild
index ac89b53a6a682..57793597185c5 100644
--- a/dev-python/flask-security/flask-security-1.7.5-r1.ebuild
+++ b/dev-python/flask-security/flask-security-1.7.5-r1.ebuild
@@ -10,7 +10,7 @@ MY_PN="Flask-Security"
 MY_P="${MY_PN}-${PV}"
 
 DESCRIPTION="Simple security for Flask apps"
-HOMEPAGE="http://pythonhosted.org/Flask-Security/ https://pypi.python.org/pypi/Flask-Security"
+HOMEPAGE="http://pythonhosted.org/Flask-Security/ https://pypi.org/project/Flask-Security"
 SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/flask-socketio/flask-socketio-2.9.2.ebuild b/dev-python/flask-socketio/flask-socketio-2.9.2.ebuild
index 195e82cc6d031..e42237625a379 100644
--- a/dev-python/flask-socketio/flask-socketio-2.9.2.ebuild
+++ b/dev-python/flask-socketio/flask-socketio-2.9.2.ebuild
@@ -8,7 +8,7 @@ inherit distutils-r1
 
 MY_PN="Flask-SocketIO"
 DESCRIPTION="Socket.IO integration for Flask applications."
-HOMEPAGE="https://flask-socketio.readthedocs.org/ https://github.com/miguelgrinberg/Flask-SocketIO/ https://pypi.python.org/pypi/Flask-SocketIO"
+HOMEPAGE="https://flask-socketio.readthedocs.org/ https://github.com/miguelgrinberg/Flask-SocketIO/ https://pypi.org/project/Flask-SocketIO"
 SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/flask-sphinx-themes/flask-sphinx-themes-1.0.1.ebuild b/dev-python/flask-sphinx-themes/flask-sphinx-themes-1.0.1.ebuild
index ab2570d7efc0b..3741db7dd47be 100644
--- a/dev-python/flask-sphinx-themes/flask-sphinx-themes-1.0.1.ebuild
+++ b/dev-python/flask-sphinx-themes/flask-sphinx-themes-1.0.1.ebuild
@@ -10,7 +10,7 @@ MY_PN="Flask-Sphinx-Themes"
 MY_P="${MY_PN}-${PV}"
 
 DESCRIPTION="Sphinx Themes for Flask related projects and Flask itself"
-HOMEPAGE="https://github.com/pallets/flask-sphinx-themes https://pypi.python.org/pypi/Flask-Sphinx-Themes"
+HOMEPAGE="https://github.com/pallets/flask-sphinx-themes https://pypi.org/project/Flask-Sphinx-Themes"
 SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/flask-sqlalchemy/flask-sqlalchemy-2.1.ebuild b/dev-python/flask-sqlalchemy/flask-sqlalchemy-2.1.ebuild
index 689d398f548ab..59c0ed602c17b 100644
--- a/dev-python/flask-sqlalchemy/flask-sqlalchemy-2.1.ebuild
+++ b/dev-python/flask-sqlalchemy/flask-sqlalchemy-2.1.ebuild
@@ -10,7 +10,7 @@ MY_PN="Flask-SQLAlchemy"
 MY_P="${MY_PN}-${PV}"
 
 DESCRIPTION="SQLAlchemy support for Flask applications"
-HOMEPAGE="https://pypi.python.org/pypi/Flask-SQLAlchemy"
+HOMEPAGE="https://pypi.org/project/Flask-SQLAlchemy"
 SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/flask-testing/flask-testing-0.4.2.ebuild b/dev-python/flask-testing/flask-testing-0.4.2.ebuild
index 0e13068c0c201..17224a7a0b93c 100644
--- a/dev-python/flask-testing/flask-testing-0.4.2.ebuild
+++ b/dev-python/flask-testing/flask-testing-0.4.2.ebuild
@@ -10,7 +10,7 @@ MY_PN="Flask-Testing"
 MY_P="${MY_PN}-${PV}"
 
 DESCRIPTION="Unit testing for Flask"
-HOMEPAGE="http://pythonhosted.org/Flask-Testing/ https://pypi.python.org/pypi/Flask-Testing/"
+HOMEPAGE="http://pythonhosted.org/Flask-Testing/ https://pypi.org/project/Flask-Testing/"
 SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/flask-testing/flask-testing-0.6.2.ebuild b/dev-python/flask-testing/flask-testing-0.6.2.ebuild
index 29041a15206a3..f37b1dc10c36e 100644
--- a/dev-python/flask-testing/flask-testing-0.6.2.ebuild
+++ b/dev-python/flask-testing/flask-testing-0.6.2.ebuild
@@ -10,7 +10,7 @@ MY_PN="Flask-Testing"
 MY_P="${MY_PN}-${PV}"
 
 DESCRIPTION="Unit testing for Flask"
-HOMEPAGE="http://pythonhosted.org/Flask-Testing/ https://pypi.python.org/pypi/Flask-Testing/"
+HOMEPAGE="http://pythonhosted.org/Flask-Testing/ https://pypi.org/project/Flask-Testing/"
 SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/flask-themes/flask-themes-0.1.3-r1.ebuild b/dev-python/flask-themes/flask-themes-0.1.3-r1.ebuild
index d9108085abac0..33ac475f98fcf 100644
--- a/dev-python/flask-themes/flask-themes-0.1.3-r1.ebuild
+++ b/dev-python/flask-themes/flask-themes-0.1.3-r1.ebuild
@@ -11,7 +11,7 @@ MY_P="${MY_PN}-${PV}"
 
 DESCRIPTION="Infrastructure for theming support in Flask applications"
 HOMEPAGE="https://pythonhosted.org/Flask-Themes/
-	https://pypi.python.org/pypi/Flask-Themes"
+	https://pypi.org/project/Flask-Themes"
 SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/flask-uploads/flask-uploads-0.2.0-r1.ebuild b/dev-python/flask-uploads/flask-uploads-0.2.0-r1.ebuild
index 9b040b5606dc6..0538695b27b1a 100644
--- a/dev-python/flask-uploads/flask-uploads-0.2.0-r1.ebuild
+++ b/dev-python/flask-uploads/flask-uploads-0.2.0-r1.ebuild
@@ -8,7 +8,7 @@ inherit distutils-r1
 
 DESCRIPTION="Flexible and efficient upload handling for Flask"
 HOMEPAGE="http://pythonhosted.org/Flask-Testing/
-	https://pypi.python.org/pypi/Flask-Testing/"
+	https://pypi.org/project/Flask-Testing/"
 SRC_URI="https://github.com/maxcountryman/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 # use the GitHub tarball since the pypi-tarball does not contain the tests
 
diff --git a/dev-python/flask-whooshalchemy/flask-whooshalchemy-0.8.ebuild b/dev-python/flask-whooshalchemy/flask-whooshalchemy-0.8.ebuild
index 7e2a6d7f8ac75..4e7f84b3142fe 100644
--- a/dev-python/flask-whooshalchemy/flask-whooshalchemy-0.8.ebuild
+++ b/dev-python/flask-whooshalchemy/flask-whooshalchemy-0.8.ebuild
@@ -10,7 +10,7 @@ MY_PN="Flask-WhooshAlchemy"
 MY_P="${MY_PN}-${PV}"
 
 DESCRIPTION="Whoosh extension to Flask/SQLAlchemy"
-HOMEPAGE="https://github.com/gyllstromk/Flask-WhooshAlchemy https://pypi.python.org/pypi/Flask-WhooshAlchemy"
+HOMEPAGE="https://github.com/gyllstromk/Flask-WhooshAlchemy https://pypi.org/project/Flask-WhooshAlchemy"
 SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/flask-wtf/flask-wtf-0.14.2.ebuild b/dev-python/flask-wtf/flask-wtf-0.14.2.ebuild
index 0ce2619b19314..71f34d57fe715 100644
--- a/dev-python/flask-wtf/flask-wtf-0.14.2.ebuild
+++ b/dev-python/flask-wtf/flask-wtf-0.14.2.ebuild
@@ -10,7 +10,7 @@ MY_PN="Flask-WTF"
 MY_P="${MY_PN}-${PV}"
 
 DESCRIPTION="Simple integration of Flask and WTForms"
-HOMEPAGE="http://pythonhosted.org/Flask-WTF/ https://pypi.python.org/pypi/Flask-WTF"
+HOMEPAGE="http://pythonhosted.org/Flask-WTF/ https://pypi.org/project/Flask-WTF"
 SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/flask-xml-rpc/flask-xml-rpc-0.1.2-r1.ebuild b/dev-python/flask-xml-rpc/flask-xml-rpc-0.1.2-r1.ebuild
index 6bdd2175c09cb..acbd6158b0f72 100644
--- a/dev-python/flask-xml-rpc/flask-xml-rpc-0.1.2-r1.ebuild
+++ b/dev-python/flask-xml-rpc/flask-xml-rpc-0.1.2-r1.ebuild
@@ -11,7 +11,7 @@ MY_P="${MY_PN}-${PV}"
 
 DESCRIPTION="XML-RPC support for Flask applications"
 HOMEPAGE="https://pythonhosted.org/Flask-XML-RPC/
-	https://pypi.python.org/pypi/Flask-XML-RPC"
+	https://pypi.org/project/Flask-XML-RPC"
 SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/flask/flask-9999.ebuild b/dev-python/flask/flask-9999.ebuild
index 6a024894089c6..51fbaecc3533d 100644
--- a/dev-python/flask/flask-9999.ebuild
+++ b/dev-python/flask/flask-9999.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="A microframework based on Werkzeug, Jinja2 and good intentions"
 MY_PN="Flask"
 MY_P="${MY_PN}-${PV}"
 SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
-HOMEPAGE="https://pypi.python.org/pypi/Flask"
+HOMEPAGE="https://pypi.org/project/Flask"
 
 LICENSE="BSD"
 SLOT="0"
diff --git a/dev-python/flexx/flexx-0.3.1.ebuild b/dev-python/flexx/flexx-0.3.1.ebuild
index a01479ab7052c..d6929e25899c5 100644
--- a/dev-python/flexx/flexx-0.3.1.ebuild
+++ b/dev-python/flexx/flexx-0.3.1.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="Pure Python toolkit for creating GUI's using web technology"
 HOMEPAGE="
 	https://flexx.readthedocs.org
 	https://github.com/zoofio/flexx
-	https://pypi.python.org/pypi/flexx"
+	https://pypi.org/project/flexx"
 SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.zip"
 
 LICENSE="BSD"
diff --git a/dev-python/flexx/flexx-0.4.1.ebuild b/dev-python/flexx/flexx-0.4.1.ebuild
index 45351a0575fe0..6f3975739360f 100644
--- a/dev-python/flexx/flexx-0.4.1.ebuild
+++ b/dev-python/flexx/flexx-0.4.1.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="Pure Python toolkit for creating GUI's using web technology"
 HOMEPAGE="
 	https://flexx.readthedocs.org
 	https://github.com/zoofio/flexx
-	https://pypi.python.org/pypi/flexx"
+	https://pypi.org/project/flexx"
 SRC_URI="https://github.com/zoofIO//${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/flower/flower-0.9.1-r1.ebuild b/dev-python/flower/flower-0.9.1-r1.ebuild
index 70e17db07d9ea..5b7f6b4ed963a 100644
--- a/dev-python/flower/flower-0.9.1-r1.ebuild
+++ b/dev-python/flower/flower-0.9.1-r1.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
 inherit distutils-r1 systemd user
 
 DESCRIPTION="Real-time monitor and web admin for Celery distributed task queue"
-HOMEPAGE="https://flower.readthedocs.org/ https://github.com/mher/flower/ https://pypi.python.org/pypi/flower"
+HOMEPAGE="https://flower.readthedocs.org/ https://github.com/mher/flower/ https://pypi.org/project/flower"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/foolscap/foolscap-0.11.0.ebuild b/dev-python/foolscap/foolscap-0.11.0.ebuild
index 5a4b05b9ddde4..c158d74fa1edc 100644
--- a/dev-python/foolscap/foolscap-0.11.0.ebuild
+++ b/dev-python/foolscap/foolscap-0.11.0.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 )
 inherit distutils-r1
 
 DESCRIPTION="RPC protocol for Twisted"
-HOMEPAGE="http://foolscap.lothar.com/trac https://pypi.python.org/pypi/foolscap"
+HOMEPAGE="http://foolscap.lothar.com/trac https://pypi.org/project/foolscap"
 SRC_URI="http://${PN}.lothar.com/releases/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/foolscap/foolscap-0.7.0.ebuild b/dev-python/foolscap/foolscap-0.7.0.ebuild
index 24f6c34c2be0d..5d8a03f6cf48b 100644
--- a/dev-python/foolscap/foolscap-0.7.0.ebuild
+++ b/dev-python/foolscap/foolscap-0.7.0.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 )
 inherit distutils-r1
 
 DESCRIPTION="RPC protocol for Twisted"
-HOMEPAGE="http://foolscap.lothar.com/trac https://pypi.python.org/pypi/foolscap"
+HOMEPAGE="http://foolscap.lothar.com/trac https://pypi.org/project/foolscap"
 SRC_URI="http://${PN}.lothar.com/releases/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/formencode/formencode-1.3.0-r2.ebuild b/dev-python/formencode/formencode-1.3.0-r2.ebuild
index b1ad55734adfa..7242aebf3e98a 100644
--- a/dev-python/formencode/formencode-1.3.0-r2.ebuild
+++ b/dev-python/formencode/formencode-1.3.0-r2.ebuild
@@ -10,7 +10,7 @@ MY_PN="FormEncode"
 MY_P="${MY_PN}-${PV}"
 
 DESCRIPTION="HTML form validation, generation, and conversion package"
-HOMEPAGE="http://formencode.org/ https://pypi.python.org/pypi/FormEncode"
+HOMEPAGE="http://formencode.org/ https://pypi.org/project/FormEncode"
 SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.zip"
 
 LICENSE="PSF-2"
diff --git a/dev-python/fpconst/fpconst-0.7.3-r1.ebuild b/dev-python/fpconst/fpconst-0.7.3-r1.ebuild
index 691afa20191e2..da792615a254d 100644
--- a/dev-python/fpconst/fpconst-0.7.3-r1.ebuild
+++ b/dev-python/fpconst/fpconst-0.7.3-r1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 pypy )
 inherit distutils-r1
 
 DESCRIPTION="Python Module for handling IEEE 754 floating point special values"
-HOMEPAGE="http://chaco.bst.rochester.edu:8080/statcomp/projects/RStatServer/fpconst/ https://pypi.python.org/pypi/fpconst https://sourceforge.net/projects/rsoap/files/"
+HOMEPAGE="http://chaco.bst.rochester.edu:8080/statcomp/projects/RStatServer/fpconst/ https://pypi.org/project/fpconst https://sourceforge.net/projects/rsoap/files/"
 SRC_URI="mirror://sourceforge/rsoap/${P}.tar.gz"
 
 KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
diff --git a/dev-python/frozen-flask/frozen-flask-0.11-r1.ebuild b/dev-python/frozen-flask/frozen-flask-0.11-r1.ebuild
index 3cf6179ffbec7..bc54f293fc299 100644
--- a/dev-python/frozen-flask/frozen-flask-0.11-r1.ebuild
+++ b/dev-python/frozen-flask/frozen-flask-0.11-r1.ebuild
@@ -10,7 +10,7 @@ MY_PN="Frozen-Flask"
 MY_P="${MY_PN}-${PV}"
 
 DESCRIPTION="Freezes a Flask application into a set of static files"
-HOMEPAGE="https://github.com/SimonSapin/Frozen-Flask https://pypi.python.org/pypi/Frozen-Flask"
+HOMEPAGE="https://github.com/SimonSapin/Frozen-Flask https://pypi.org/project/Frozen-Flask"
 SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/frozen-flask/frozen-flask-0.15.ebuild b/dev-python/frozen-flask/frozen-flask-0.15.ebuild
index f8c26e719d97b..ac5c20dd16bde 100644
--- a/dev-python/frozen-flask/frozen-flask-0.15.ebuild
+++ b/dev-python/frozen-flask/frozen-flask-0.15.ebuild
@@ -10,7 +10,7 @@ MY_PN="Frozen-Flask"
 MY_P="${MY_PN}-${PV}"
 
 DESCRIPTION="Freezes a Flask application into a set of static files"
-HOMEPAGE="https://github.com/SimonSapin/Frozen-Flask https://pypi.python.org/pypi/Frozen-Flask"
+HOMEPAGE="https://github.com/SimonSapin/Frozen-Flask https://pypi.org/project/Frozen-Flask"
 SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/fs/fs-0.5.4.ebuild b/dev-python/fs/fs-0.5.4.ebuild
index 875391fa2617a..f69d17684aed5 100644
--- a/dev-python/fs/fs-0.5.4.ebuild
+++ b/dev-python/fs/fs-0.5.4.ebuild
@@ -9,7 +9,7 @@ inherit distutils-r1 eutils
 
 DESCRIPTION="Filesystem abstraction layer"
 HOMEPAGE="
-	https://pypi.python.org/pypi/fs
+	https://pypi.org/project/fs
 	https://docs.pyfilesystem.org
 	https://www.willmcgugan.com/tag/fs/"
 SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
diff --git a/dev-python/fudge/fudge-0.9.6-r1.ebuild b/dev-python/fudge/fudge-0.9.6-r1.ebuild
index efd57493fb5e9..8e44dada1d7b2 100644
--- a/dev-python/fudge/fudge-0.9.6-r1.ebuild
+++ b/dev-python/fudge/fudge-0.9.6-r1.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 pypy )
 inherit distutils-r1
 
 DESCRIPTION="Replace real objects with fakes (mocks, stubs, etc) while testing"
-HOMEPAGE="http://farmdev.com/projects/fudge/ https://pypi.python.org/pypi/fudge"
+HOMEPAGE="http://farmdev.com/projects/fudge/ https://pypi.org/project/fudge"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/fudge/fudge-1.1.0.ebuild b/dev-python/fudge/fudge-1.1.0.ebuild
index e654880581474..ce249786eef25 100644
--- a/dev-python/fudge/fudge-1.1.0.ebuild
+++ b/dev-python/fudge/fudge-1.1.0.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy )
 inherit distutils-r1
 
 DESCRIPTION="Replace real objects with fakes (mocks, stubs, etc) while testing"
-HOMEPAGE="http://farmdev.com/projects/fudge/ https://pypi.python.org/pypi/fudge"
+HOMEPAGE="http://farmdev.com/projects/fudge/ https://pypi.org/project/fudge"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/funcparserlib/funcparserlib-0.3.6.ebuild b/dev-python/funcparserlib/funcparserlib-0.3.6.ebuild
index 454dc77657022..6f4b76334e912 100644
--- a/dev-python/funcparserlib/funcparserlib-0.3.6.ebuild
+++ b/dev-python/funcparserlib/funcparserlib-0.3.6.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy )
 inherit distutils-r1
 
 DESCRIPTION="Recursive descent parsing library based on functional combinators"
-HOMEPAGE="https://pypi.python.org/pypi/funcparserlib"
+HOMEPAGE="https://pypi.org/project/funcparserlib"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/funcsigs/funcsigs-0.4.ebuild b/dev-python/funcsigs/funcsigs-0.4.ebuild
index 5116da873ead6..6852a8f293a56 100644
--- a/dev-python/funcsigs/funcsigs-0.4.ebuild
+++ b/dev-python/funcsigs/funcsigs-0.4.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 pypy pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="Python function signatures from PEP362 for Python 2.7"
-HOMEPAGE="https://pypi.python.org/pypi/funcsigs"
+HOMEPAGE="https://pypi.org/project/funcsigs"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
diff --git a/dev-python/funcsigs/funcsigs-1.0.2-r1.ebuild b/dev-python/funcsigs/funcsigs-1.0.2-r1.ebuild
index 4f5a8db93d708..93dfbb991896b 100644
--- a/dev-python/funcsigs/funcsigs-1.0.2-r1.ebuild
+++ b/dev-python/funcsigs/funcsigs-1.0.2-r1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5} pypy{,3} )
 inherit distutils-r1
 
 DESCRIPTION="Python function signatures backport from PEP362 for Python 2.7-3.5"
-HOMEPAGE="https://pypi.python.org/pypi/funcsigs"
+HOMEPAGE="https://pypi.org/project/funcsigs"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
diff --git a/dev-python/functest/functest-0.8.8-r1.ebuild b/dev-python/functest/functest-0.8.8-r1.ebuild
index f0c3e936b6fc8..ee000f15fb7fe 100644
--- a/dev-python/functest/functest-0.8.8-r1.ebuild
+++ b/dev-python/functest/functest-0.8.8-r1.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 )
 inherit distutils-r1
 
 DESCRIPTION="Functest is a test tool/framework for testing in Python"
-HOMEPAGE="https://pypi.python.org/pypi/functest"
+HOMEPAGE="https://pypi.org/project/functest"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
diff --git a/dev-python/functools32/functools32-3.2.3.ebuild b/dev-python/functools32/functools32-3.2.3.ebuild
index 209aec37f98f0..731d0c6ee7f61 100644
--- a/dev-python/functools32/functools32-3.2.3.ebuild
+++ b/dev-python/functools32/functools32-3.2.3.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 pypy )
 inherit distutils-r1
 
 DESCRIPTION="Backport of the functools module from Python 3"
-HOMEPAGE="https://pypi.python.org/pypi/functools32 https://github.com/MiCHiLU/python-functools32"
+HOMEPAGE="https://pypi.org/project/functools32 https://github.com/MiCHiLU/python-functools32"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}-2.tar.gz"
 
 SLOT="0"
diff --git a/dev-python/fusil/fusil-1.5-r1.ebuild b/dev-python/fusil/fusil-1.5-r1.ebuild
index dc4064523370f..59ee083a3d243 100644
--- a/dev-python/fusil/fusil-1.5-r1.ebuild
+++ b/dev-python/fusil/fusil-1.5-r1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy )
 inherit distutils-r1 user
 
 DESCRIPTION="Python library to write fuzzing programs"
-HOMEPAGE="https://bitbucket.org/haypo/fusil/wiki/Home https://pypi.python.org/pypi/fusil"
+HOMEPAGE="https://bitbucket.org/haypo/fusil/wiki/Home https://pypi.org/project/fusil"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
diff --git a/dev-python/fusil/fusil-1.5.ebuild b/dev-python/fusil/fusil-1.5.ebuild
index 9a5f6f56b1970..789fb33ed2c6d 100644
--- a/dev-python/fusil/fusil-1.5.ebuild
+++ b/dev-python/fusil/fusil-1.5.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy )
 inherit distutils-r1 user
 
 DESCRIPTION="Fusil the fuzzer is a Python library used to write fuzzing programs"
-HOMEPAGE="https://bitbucket.org/haypo/fusil/wiki/Home https://pypi.python.org/pypi/fusil"
+HOMEPAGE="https://bitbucket.org/haypo/fusil/wiki/Home https://pypi.org/project/fusil"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
diff --git a/dev-python/futures/futures-3.1.1.ebuild b/dev-python/futures/futures-3.1.1.ebuild
index 457d34a147bf9..640d2a98fd23e 100644
--- a/dev-python/futures/futures-3.1.1.ebuild
+++ b/dev-python/futures/futures-3.1.1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 pypy )
 inherit distutils-r1
 
 DESCRIPTION="Backport of the concurrent.futures package from Python 3.2"
-HOMEPAGE="https://pypi.python.org/pypi/futures"
+HOMEPAGE="https://pypi.org/project/futures"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="PSF-2"
diff --git a/dev-python/futures/futures-3.2.0.ebuild b/dev-python/futures/futures-3.2.0.ebuild
index 365e46e9f9008..2ac6a2ae3c061 100644
--- a/dev-python/futures/futures-3.2.0.ebuild
+++ b/dev-python/futures/futures-3.2.0.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 pypy )
 inherit distutils-r1
 
 DESCRIPTION="Backport of the concurrent.futures package from Python 3.2"
-HOMEPAGE="https://github.com/agronholm/pythonfutures https://pypi.python.org/pypi/futures"
+HOMEPAGE="https://github.com/agronholm/pythonfutures https://pypi.org/project/futures"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="PSF-2"
diff --git a/dev-python/futurist/futurist-1.3.1.ebuild b/dev-python/futurist/futurist-1.3.1.ebuild
index d226756aac6e5..524e4fa43f94d 100644
--- a/dev-python/futurist/futurist-1.3.1.ebuild
+++ b/dev-python/futurist/futurist-1.3.1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_4 python3_5 python3_6 )
 inherit distutils-r1
 
 DESCRIPTION="Useful additions to futures, from the future"
-HOMEPAGE="https://pypi.python.org/pypi/futurist http://docs.openstack.org/developer/futurist"
+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"
diff --git a/dev-python/futurist/futurist-1.6.0.ebuild b/dev-python/futurist/futurist-1.6.0.ebuild
index 598228dbbeea9..8100cfe660507 100644
--- a/dev-python/futurist/futurist-1.6.0.ebuild
+++ b/dev-python/futurist/futurist-1.6.0.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_4 python3_5 python3_6 )
 inherit distutils-r1
 
 DESCRIPTION="Useful additions to futures, from the future"
-HOMEPAGE="https://pypi.python.org/pypi/futurist http://docs.openstack.org/developer/futurist"
+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"
diff --git a/dev-python/gcs-oauth2-boto-plugin/gcs-oauth2-boto-plugin-1.14.ebuild b/dev-python/gcs-oauth2-boto-plugin/gcs-oauth2-boto-plugin-1.14.ebuild
index 660f8c57b1eb3..2e4aaa7b132d6 100644
--- a/dev-python/gcs-oauth2-boto-plugin/gcs-oauth2-boto-plugin-1.14.ebuild
+++ b/dev-python/gcs-oauth2-boto-plugin/gcs-oauth2-boto-plugin-1.14.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5} )
 inherit distutils-r1
 
 DESCRIPTION="OAuth 2.0 plugin for Google Cloud Storage credentials in the Boto library"
-HOMEPAGE="https://pypi.python.org/pypi/gcs-oauth2-boto-plugin"
+HOMEPAGE="https://pypi.org/project/gcs-oauth2-boto-plugin"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
diff --git a/dev-python/gcs-oauth2-boto-plugin/gcs-oauth2-boto-plugin-1.8-r1.ebuild b/dev-python/gcs-oauth2-boto-plugin/gcs-oauth2-boto-plugin-1.8-r1.ebuild
index 690677bd60039..6961045f4ef65 100644
--- a/dev-python/gcs-oauth2-boto-plugin/gcs-oauth2-boto-plugin-1.8-r1.ebuild
+++ b/dev-python/gcs-oauth2-boto-plugin/gcs-oauth2-boto-plugin-1.8-r1.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 )
 inherit distutils-r1
 
 DESCRIPTION="OAuth 2.0 plugin for Google Cloud Storage credentials in the Boto library"
-HOMEPAGE="https://pypi.python.org/pypi/gcs-oauth2-boto-plugin"
+HOMEPAGE="https://pypi.org/project/gcs-oauth2-boto-plugin"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
diff --git a/dev-python/gdata/gdata-2.0.18.ebuild b/dev-python/gdata/gdata-2.0.18.ebuild
index d29a26b0004e9..aa2b3bfb22591 100644
--- a/dev-python/gdata/gdata-2.0.18.ebuild
+++ b/dev-python/gdata/gdata-2.0.18.ebuild
@@ -8,7 +8,7 @@ PYTHON_REQ_USE="ssl(+),xml(+)"
 inherit distutils-r1
 
 DESCRIPTION="Python client library for Google data APIs"
-HOMEPAGE="https://github.com/google/gdata-python-client https://pypi.python.org/pypi/gdata"
+HOMEPAGE="https://github.com/google/gdata-python-client https://pypi.org/project/gdata"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
diff --git a/dev-python/genshi/genshi-0.7-r1.ebuild b/dev-python/genshi/genshi-0.7-r1.ebuild
index 65360402e2c3d..3c8fece1e90df 100644
--- a/dev-python/genshi/genshi-0.7-r1.ebuild
+++ b/dev-python/genshi/genshi-0.7-r1.ebuild
@@ -9,7 +9,7 @@ inherit distutils-r1
 MY_P="Genshi-${PV}"
 
 DESCRIPTION="Python toolkit for stream-based generation of output for the web"
-HOMEPAGE="http://genshi.edgewall.org/ https://pypi.python.org/pypi/Genshi"
+HOMEPAGE="http://genshi.edgewall.org/ https://pypi.org/project/Genshi"
 SRC_URI="http://ftp.edgewall.com/pub/genshi/${MY_P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/genshi/genshi-0.7.ebuild b/dev-python/genshi/genshi-0.7.ebuild
index e522c7f9b7cdf..18ced74d9e4f2 100644
--- a/dev-python/genshi/genshi-0.7.ebuild
+++ b/dev-python/genshi/genshi-0.7.ebuild
@@ -9,7 +9,7 @@ inherit distutils-r1
 MY_P="Genshi-${PV}"
 
 DESCRIPTION="Python toolkit for stream-based generation of output for the web"
-HOMEPAGE="http://genshi.edgewall.org/ https://pypi.python.org/pypi/Genshi"
+HOMEPAGE="http://genshi.edgewall.org/ https://pypi.org/project/Genshi"
 SRC_URI="http://ftp.edgewall.com/pub/genshi/${MY_P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/genty/genty-1.3.2.ebuild b/dev-python/genty/genty-1.3.2.ebuild
index 9303686bcd49b..2519e7cbb94a0 100644
--- a/dev-python/genty/genty-1.3.2.ebuild
+++ b/dev-python/genty/genty-1.3.2.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy{,3} )
 inherit distutils-r1
 
 DESCRIPTION="Allows you to run a test with multiple data sets"
-HOMEPAGE="https://pypi.python.org/pypi/genty https://github.com/box/genty"
+HOMEPAGE="https://pypi.org/project/genty https://github.com/box/genty"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
diff --git a/dev-python/gevent-socketio/gevent-socketio-0.3.5_rc2-r1.ebuild b/dev-python/gevent-socketio/gevent-socketio-0.3.5_rc2-r1.ebuild
index 9705218f8f3d3..803dd7b336162 100644
--- a/dev-python/gevent-socketio/gevent-socketio-0.3.5_rc2-r1.ebuild
+++ b/dev-python/gevent-socketio/gevent-socketio-0.3.5_rc2-r1.ebuild
@@ -10,7 +10,7 @@ MY_PN="gevent-socketio"
 MY_P="${MY_PN}-${PV/_/-}"
 
 DESCRIPTION="SocketIO server based on the Gevent pywsgi server"
-HOMEPAGE="https://pypi.python.org/pypi/gevent-socketio/"
+HOMEPAGE="https://pypi.org/project/gevent-socketio/"
 SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/gevent-socketio/gevent-socketio-0.3.6.ebuild b/dev-python/gevent-socketio/gevent-socketio-0.3.6.ebuild
index 8e64f10b8dd40..211f7b5274dc0 100644
--- a/dev-python/gevent-socketio/gevent-socketio-0.3.6.ebuild
+++ b/dev-python/gevent-socketio/gevent-socketio-0.3.6.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 )
 inherit distutils-r1
 
 DESCRIPTION="SocketIO server based on the Gevent pywsgi server"
-HOMEPAGE="https://pypi.python.org/pypi/gevent-socketio/"
+HOMEPAGE="https://pypi.org/project/gevent-socketio/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/gevent-websocket/gevent-websocket-0.10.1.ebuild b/dev-python/gevent-websocket/gevent-websocket-0.10.1.ebuild
index aa464888f7659..f05ca86ad512c 100644
--- a/dev-python/gevent-websocket/gevent-websocket-0.10.1.ebuild
+++ b/dev-python/gevent-websocket/gevent-websocket-0.10.1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
 inherit distutils-r1
 
 DESCRIPTION="Websocket handler for the gevent pywsgi server"
-HOMEPAGE="https://pypi.python.org/pypi/gevent-websocket/"
+HOMEPAGE="https://pypi.org/project/gevent-websocket/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
diff --git a/dev-python/gevent-websocket/gevent-websocket-0.9.3.ebuild b/dev-python/gevent-websocket/gevent-websocket-0.9.3.ebuild
index f35bdec67865c..7929c4b33404b 100644
--- a/dev-python/gevent-websocket/gevent-websocket-0.9.3.ebuild
+++ b/dev-python/gevent-websocket/gevent-websocket-0.9.3.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 )
 inherit distutils-r1
 
 DESCRIPTION="Websocket handler for the gevent pywsgi server"
-HOMEPAGE="https://pypi.python.org/pypi/gevent-websocket/"
+HOMEPAGE="https://pypi.org/project/gevent-websocket/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
diff --git a/dev-python/gevent/gevent-1.0.1.ebuild b/dev-python/gevent/gevent-1.0.1.ebuild
index 4f67a4c5dee0d..ec966685ea7b1 100644
--- a/dev-python/gevent/gevent-1.0.1.ebuild
+++ b/dev-python/gevent/gevent-1.0.1.ebuild
@@ -11,7 +11,7 @@ MY_PV=${PV/_/}
 MY_P=${PN}-${MY_PV}
 
 DESCRIPTION="Python networking library that uses greenlet to provide synchronous API"
-HOMEPAGE="http://gevent.org/ https://pypi.python.org/pypi/gevent/"
+HOMEPAGE="http://gevent.org/ https://pypi.org/project/gevent/"
 SRC_URI="https://github.com/surfly/${PN}/releases/download/${MY_PV}/${MY_P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/gevent/gevent-1.2.1.ebuild b/dev-python/gevent/gevent-1.2.1.ebuild
index 04a34a956f3cf..f17ec0a2129e4 100644
--- a/dev-python/gevent/gevent-1.2.1.ebuild
+++ b/dev-python/gevent/gevent-1.2.1.ebuild
@@ -13,7 +13,7 @@ MY_PV=${PV/_beta/b}
 MY_P=${PN}-${MY_PV}
 
 DESCRIPTION="Coroutine-based network library"
-HOMEPAGE="http://gevent.org/ https://pypi.python.org/pypi/gevent/"
+HOMEPAGE="http://gevent.org/ https://pypi.org/project/gevent/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/gevent/gevent-1.2.2.ebuild b/dev-python/gevent/gevent-1.2.2.ebuild
index bb595bf37c289..21bfa221a5831 100644
--- a/dev-python/gevent/gevent-1.2.2.ebuild
+++ b/dev-python/gevent/gevent-1.2.2.ebuild
@@ -13,7 +13,7 @@ MY_PV=${PV/_beta/b}
 MY_P=${PN}-${MY_PV}
 
 DESCRIPTION="Coroutine-based network library"
-HOMEPAGE="http://gevent.org/ https://pypi.python.org/pypi/gevent/"
+HOMEPAGE="http://gevent.org/ https://pypi.org/project/gevent/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/git-python/git-python-1.0.2.ebuild b/dev-python/git-python/git-python-1.0.2.ebuild
index 407a96443c98d..9764e041c0209 100644
--- a/dev-python/git-python/git-python-1.0.2.ebuild
+++ b/dev-python/git-python/git-python-1.0.2.ebuild
@@ -13,7 +13,7 @@ MY_PV="${PV/_rc/.RC}"
 MY_P="${MY_PN}-${MY_PV}"
 
 DESCRIPTION="Library used to interact with Git repositories"
-HOMEPAGE="https://github.com/gitpython-developers/GitPython https://pypi.python.org/pypi/GitPython"
+HOMEPAGE="https://github.com/gitpython-developers/GitPython https://pypi.org/project/GitPython"
 SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/git-python/git-python-2.1.7.ebuild b/dev-python/git-python/git-python-2.1.7.ebuild
index d06e0a764c32a..d89b18c393513 100644
--- a/dev-python/git-python/git-python-2.1.7.ebuild
+++ b/dev-python/git-python/git-python-2.1.7.ebuild
@@ -13,7 +13,7 @@ MY_PV="${PV/_rc/.RC}"
 MY_P="${MY_PN}-${MY_PV}"
 
 DESCRIPTION="Library used to interact with Git repositories"
-HOMEPAGE="https://github.com/gitpython-developers/GitPython https://pypi.python.org/pypi/GitPython"
+HOMEPAGE="https://github.com/gitpython-developers/GitPython https://pypi.org/project/GitPython"
 SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/gitdb/gitdb-0.6.4.ebuild b/dev-python/gitdb/gitdb-0.6.4.ebuild
index e3c073b7f0e16..792806454da16 100644
--- a/dev-python/gitdb/gitdb-0.6.4.ebuild
+++ b/dev-python/gitdb/gitdb-0.6.4.ebuild
@@ -10,7 +10,7 @@ inherit distutils-r1
 DESCRIPTION="GitDB is a pure-Python git object database"
 HOMEPAGE="
 	https://github.com/gitpython-developers/gitdb
-	https://pypi.python.org/pypi/gitdb"
+	https://pypi.org/project/gitdb"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/gitdb2/gitdb2-2.0.3.ebuild b/dev-python/gitdb2/gitdb2-2.0.3.ebuild
index 9e2c2a240f585..77e4c9087b858 100644
--- a/dev-python/gitdb2/gitdb2-2.0.3.ebuild
+++ b/dev-python/gitdb2/gitdb2-2.0.3.ebuild
@@ -10,7 +10,7 @@ inherit distutils-r1
 DESCRIPTION="GitDB is a pure-Python git object database"
 HOMEPAGE="
 	https://github.com/gitpython-developers/gitdb
-	https://pypi.python.org/pypi/gitdb2"
+	https://pypi.org/project/gitdb2"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/globre/globre-0.1.4.ebuild b/dev-python/globre/globre-0.1.4.ebuild
index e5f0dd76320cb..10c320bd9ad77 100644
--- a/dev-python/globre/globre-0.1.4.ebuild
+++ b/dev-python/globre/globre-0.1.4.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_4 python3_5 python3_6 )
 inherit distutils-r1
 
 DESCRIPTION="A glob matching library, providing an interface similar to the 're' module"
-HOMEPAGE="https://pypi.python.org/pypi/globre https://github.com/metagriffin/globre"
+HOMEPAGE="https://pypi.org/project/globre https://github.com/metagriffin/globre"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
diff --git a/dev-python/gntp/gntp-1.0.1.ebuild b/dev-python/gntp/gntp-1.0.1.ebuild
index b7983a23981d1..2f726322b0bf0 100644
--- a/dev-python/gntp/gntp-1.0.1.ebuild
+++ b/dev-python/gntp/gntp-1.0.1.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
 inherit distutils-r1
 
 DESCRIPTION="Python library for working with the Growl Notification Transport Protocol"
-HOMEPAGE="https://github.com/kfdm/gntp https://pypi.python.org/pypi/gntp"
+HOMEPAGE="https://github.com/kfdm/gntp https://pypi.org/project/gntp"
 SRC_URI="mirror://pypi/g/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/google-auth-httplib2/google-auth-httplib2-0.0.2.ebuild b/dev-python/google-auth-httplib2/google-auth-httplib2-0.0.2.ebuild
index ca26a78531f76..6fae2a8369a95 100644
--- a/dev-python/google-auth-httplib2/google-auth-httplib2-0.0.2.ebuild
+++ b/dev-python/google-auth-httplib2/google-auth-httplib2-0.0.2.ebuild
@@ -10,7 +10,7 @@ inherit distutils-r1
 EGIT_COMMIT="607e86011141e8885b1f52826d57c8b5ff588ffc"
 MY_PN=google-auth-library-python-httplib2
 DESCRIPTION="httplib2 Transport for Google Auth"
-HOMEPAGE="https://pypi.python.org/pypi/google-auth-httplib2 https://github.com/GoogleCloudPlatform/google-auth-library-python-httplib2"
+HOMEPAGE="https://pypi.org/project/google-auth-httplib2 https://github.com/GoogleCloudPlatform/google-auth-library-python-httplib2"
 # PyPi tarball is missing unit tests
 #SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 SRC_URI="https://github.com/GoogleCloudPlatform/google-auth-library-python-httplib2/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
diff --git a/dev-python/google-auth/google-auth-1.0.1.ebuild b/dev-python/google-auth/google-auth-1.0.1.ebuild
index 6a57524baac76..2564d6ef7f2a9 100644
--- a/dev-python/google-auth/google-auth-1.0.1.ebuild
+++ b/dev-python/google-auth/google-auth-1.0.1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
 inherit distutils-r1
 
 DESCRIPTION="Google Authentication Library"
-HOMEPAGE="https://pypi.python.org/pypi/google-auth/"
+HOMEPAGE="https://pypi.org/project/google-auth/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
diff --git a/dev-python/google-auth/google-auth-1.1.0.ebuild b/dev-python/google-auth/google-auth-1.1.0.ebuild
index 64bf9f26fd10f..387b1546dc256 100644
--- a/dev-python/google-auth/google-auth-1.1.0.ebuild
+++ b/dev-python/google-auth/google-auth-1.1.0.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
 inherit distutils-r1
 
 DESCRIPTION="Google Authentication Library"
-HOMEPAGE="https://pypi.python.org/pypi/google-auth/"
+HOMEPAGE="https://pypi.org/project/google-auth/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
diff --git a/dev-python/gql/gql-0.1.0.ebuild b/dev-python/gql/gql-0.1.0.ebuild
index 2c583e085695a..8f3e259ed7a0c 100644
--- a/dev-python/gql/gql-0.1.0.ebuild
+++ b/dev-python/gql/gql-0.1.0.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 python3_{5,6} )
 inherit distutils-r1
 
 DESCRIPTION="GraphQL client for Python."
-HOMEPAGE="https://pypi.python.org/pypi/gql"
+HOMEPAGE="https://pypi.org/project/gql"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/graphcanvas/graphcanvas-4.0.2-r1.ebuild b/dev-python/graphcanvas/graphcanvas-4.0.2-r1.ebuild
index 5311b72bbcba6..1b7e44783438f 100644
--- a/dev-python/graphcanvas/graphcanvas-4.0.2-r1.ebuild
+++ b/dev-python/graphcanvas/graphcanvas-4.0.2-r1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 )
 inherit distutils-r1
 
 DESCRIPTION="Enthought Tool Suite: Interactive Graph (network) Visualization"
-HOMEPAGE="https://pypi.python.org/pypi/graphcanvas"
+HOMEPAGE="https://pypi.org/project/graphcanvas"
 SRC_URI="http://www.enthought.com/repo/ets/${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/graphy/graphy-1.0-r1.ebuild b/dev-python/graphy/graphy-1.0-r1.ebuild
index 38c81ab0bc194..e930458f25836 100644
--- a/dev-python/graphy/graphy-1.0-r1.ebuild
+++ b/dev-python/graphy/graphy-1.0-r1.ebuild
@@ -10,7 +10,7 @@ inherit distutils-r1
 MY_P=${PN}_${PV}
 
 DESCRIPTION="Simple Chart Library for Python"
-HOMEPAGE="https://pypi.python.org/pypi/Graphy"
+HOMEPAGE="https://pypi.org/project/Graphy"
 SRC_URI="https://${PN}.googlecode.com/files/${MY_P}.tar.bz2"
 
 LICENSE="Apache-2.0"
diff --git a/dev-python/greenlet/greenlet-0.4.12.ebuild b/dev-python/greenlet/greenlet-0.4.12.ebuild
index 72e97c6015eef..f6b8529726ebd 100644
--- a/dev-python/greenlet/greenlet-0.4.12.ebuild
+++ b/dev-python/greenlet/greenlet-0.4.12.ebuild
@@ -9,7 +9,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
 inherit distutils-r1 flag-o-matic
 
 DESCRIPTION="Lightweight in-process concurrent programming"
-HOMEPAGE="https://pypi.python.org/pypi/greenlet/"
+HOMEPAGE="https://pypi.org/project/greenlet/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/guessit/guessit-2.1.4.ebuild b/dev-python/guessit/guessit-2.1.4.ebuild
index b991bcb90ea8b..550085eb65c1d 100644
--- a/dev-python/guessit/guessit-2.1.4.ebuild
+++ b/dev-python/guessit/guessit-2.1.4.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
 inherit distutils-r1
 
 DESCRIPTION="Python library for guessing information from video filenames"
-HOMEPAGE="https://github.com/guessit-io/guessit https://pypi.python.org/pypi/guessit"
+HOMEPAGE="https://github.com/guessit-io/guessit https://pypi.org/project/guessit"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-3"
diff --git a/dev-python/guessit/guessit-9999.ebuild b/dev-python/guessit/guessit-9999.ebuild
index 7cc74ef41be76..575a56c8b76e0 100644
--- a/dev-python/guessit/guessit-9999.ebuild
+++ b/dev-python/guessit/guessit-9999.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
 inherit distutils-r1 git-r3
 
 DESCRIPTION="Python library for guessing information from video filenames"
-HOMEPAGE="https://github.com/guessit-io/guessit https://pypi.python.org/pypi/guessit"
+HOMEPAGE="https://github.com/guessit-io/guessit https://pypi.org/project/guessit"
 EGIT_REPO_URI="https://github.com/${PN}-io/${PN}.git"
 EGIT_BRANCH="develop"
 
diff --git a/dev-python/guppy/guppy-0.1.10-r1.ebuild b/dev-python/guppy/guppy-0.1.10-r1.ebuild
index 03fffb34e63e1..81dcd0eee3b38 100644
--- a/dev-python/guppy/guppy-0.1.10-r1.ebuild
+++ b/dev-python/guppy/guppy-0.1.10-r1.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 )
 inherit distutils-r1
 
 DESCRIPTION="Guppy-PE -- A Python Programming Environment"
-HOMEPAGE="http://guppy-pe.sourceforge.net/ https://pypi.python.org/pypi/guppy"
+HOMEPAGE="http://guppy-pe.sourceforge.net/ https://pypi.org/project/guppy"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/hachoir-core/hachoir-core-1.3.3-r1.ebuild b/dev-python/hachoir-core/hachoir-core-1.3.3-r1.ebuild
index 75901c4929b38..aa4fd3ba60516 100644
--- a/dev-python/hachoir-core/hachoir-core-1.3.3-r1.ebuild
+++ b/dev-python/hachoir-core/hachoir-core-1.3.3-r1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 pypy )
 inherit distutils-r1
 
 DESCRIPTION="Core of Hachoir framework: parse and edit binary files"
-HOMEPAGE="https://bitbucket.org/haypo/hachoir/wiki/hachoir-core https://pypi.python.org/pypi/hachoir-core"
+HOMEPAGE="https://bitbucket.org/haypo/hachoir/wiki/hachoir-core https://pypi.org/project/hachoir-core"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
diff --git a/dev-python/hachoir-parser/hachoir-parser-1.3.4-r1.ebuild b/dev-python/hachoir-parser/hachoir-parser-1.3.4-r1.ebuild
index 1ecec245b3928..d92d5a5369310 100644
--- a/dev-python/hachoir-parser/hachoir-parser-1.3.4-r1.ebuild
+++ b/dev-python/hachoir-parser/hachoir-parser-1.3.4-r1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 pypy )
 inherit distutils-r1
 
 DESCRIPTION="Package of Hachoir parsers used to open binary files"
-HOMEPAGE="https://bitbucket.org/haypo/hachoir/wiki/hachoir-parser https://pypi.python.org/pypi/hachoir-parser"
+HOMEPAGE="https://bitbucket.org/haypo/hachoir/wiki/hachoir-parser https://pypi.org/project/hachoir-parser"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
diff --git a/dev-python/hachoir-regex/hachoir-regex-1.0.5-r1.ebuild b/dev-python/hachoir-regex/hachoir-regex-1.0.5-r1.ebuild
index 994d5ca78c353..17a6069da1053 100644
--- a/dev-python/hachoir-regex/hachoir-regex-1.0.5-r1.ebuild
+++ b/dev-python/hachoir-regex/hachoir-regex-1.0.5-r1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 )
 inherit distutils-r1
 
 DESCRIPTION="Manipulation of regular expressions (regex)"
-HOMEPAGE="https://bitbucket.org/haypo/hachoir/wiki/hachoir-regex https://pypi.python.org/pypi/hachoir-regex"
+HOMEPAGE="https://bitbucket.org/haypo/hachoir/wiki/hachoir-regex https://pypi.org/project/hachoir-regex"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
diff --git a/dev-python/hcluster/hcluster-0.2.0-r1.ebuild b/dev-python/hcluster/hcluster-0.2.0-r1.ebuild
index aee97299e523c..402fb839f25db 100644
--- a/dev-python/hcluster/hcluster-0.2.0-r1.ebuild
+++ b/dev-python/hcluster/hcluster-0.2.0-r1.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 )
 inherit distutils-r1
 
 DESCRIPTION="Python hierarchical clustering package for Scipy"
-HOMEPAGE="https://pypi.python.org/pypi/hcluster"
+HOMEPAGE="https://pypi.org/project/hcluster"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/hcs-utils/hcs-utils-1.5.ebuild b/dev-python/hcs-utils/hcs-utils-1.5.ebuild
index 98685b1f7b47c..13a8bec895b13 100644
--- a/dev-python/hcs-utils/hcs-utils-1.5.ebuild
+++ b/dev-python/hcs-utils/hcs-utils-1.5.ebuild
@@ -8,7 +8,7 @@ inherit distutils-r1
 
 MY_P=${P/_rc/rc}
 DESCRIPTION="A library containing some useful snippets"
-HOMEPAGE="https://pypi.python.org/pypi/hcs_utils"
+HOMEPAGE="https://pypi.org/project/hcs_utils"
 SRC_URI="mirror://pypi/h/${PN/-/_}/${MY_P/-/_}.tar.gz"
 
 LICENSE="GPL-3"
diff --git a/dev-python/hcs-utils/hcs-utils-2.0.ebuild b/dev-python/hcs-utils/hcs-utils-2.0.ebuild
index 5d17911fb1d5b..9416d2946be02 100644
--- a/dev-python/hcs-utils/hcs-utils-2.0.ebuild
+++ b/dev-python/hcs-utils/hcs-utils-2.0.ebuild
@@ -8,7 +8,7 @@ inherit distutils-r1
 
 MY_P=${P/_rc/rc}
 DESCRIPTION="A library containing some useful snippets"
-HOMEPAGE="https://pypi.python.org/pypi/hcs_utils"
+HOMEPAGE="https://pypi.org/project/hcs_utils"
 SRC_URI="mirror://pypi/h/${PN/-/_}/${MY_P/-/_}.tar.gz"
 
 LICENSE="GPL-3"
diff --git a/dev-python/hgdistver/hgdistver-0.25.ebuild b/dev-python/hgdistver/hgdistver-0.25.ebuild
index 78544a7edb8b3..ae243c9c0a2fc 100644
--- a/dev-python/hgdistver/hgdistver-0.25.ebuild
+++ b/dev-python/hgdistver/hgdistver-0.25.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="utility lib to generate python package version infos from mercurial tags"
-HOMEPAGE="https://pypi.python.org/pypi/hgdistver"
+HOMEPAGE="https://pypi.org/project/hgdistver"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/hgtools/hgtools-6.5.1.ebuild b/dev-python/hgtools/hgtools-6.5.1.ebuild
index ed2c0a896a6b3..6d04e695fb509 100644
--- a/dev-python/hgtools/hgtools-6.5.1.ebuild
+++ b/dev-python/hgtools/hgtools-6.5.1.ebuild
@@ -9,7 +9,7 @@ RESTRICT="test"
 inherit distutils-r1 eutils
 
 DESCRIPTION="Classes and setuptools plugin for Mercurial repositories"
-HOMEPAGE="https://pypi.python.org/pypi/hgtools https://github.com/jaraco/hgtools"
+HOMEPAGE="https://pypi.org/project/hgtools https://github.com/jaraco/hgtools"
 SRC_URI="mirror://pypi/h/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
diff --git a/dev-python/hpack/hpack-2.3.0-r1.ebuild b/dev-python/hpack/hpack-2.3.0-r1.ebuild
index 3dda7d73fe81b..249a2a9754bce 100644
--- a/dev-python/hpack/hpack-2.3.0-r1.ebuild
+++ b/dev-python/hpack/hpack-2.3.0-r1.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy)
 inherit distutils-r1
 
 DESCRIPTION="Pure-Python HPACK header compression"
-HOMEPAGE="https://python-hyper.org/hpack/en/latest/ https://pypi.python.org/pypi/hpack"
+HOMEPAGE="https://python-hyper.org/hpack/en/latest/ https://pypi.org/project/hpack"
 SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/hpack/hpack-3.0.0.ebuild b/dev-python/hpack/hpack-3.0.0.ebuild
index d28a69c82daa8..eae4a7ed2f917 100644
--- a/dev-python/hpack/hpack-3.0.0.ebuild
+++ b/dev-python/hpack/hpack-3.0.0.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy)
 inherit distutils-r1
 
 DESCRIPTION="Pure-Python HPACK header compression"
-HOMEPAGE="https://python-hyper.org/hpack/en/latest/ https://pypi.python.org/pypi/hpack"
+HOMEPAGE="https://python-hyper.org/hpack/en/latest/ https://pypi.org/project/hpack"
 SRC_URI="https://github.com/python-hyper/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/html2text/html2text-2016.5.29.ebuild b/dev-python/html2text/html2text-2016.5.29.ebuild
index 46ddcd0140a1a..012759e922794 100644
--- a/dev-python/html2text/html2text-2016.5.29.ebuild
+++ b/dev-python/html2text/html2text-2016.5.29.ebuild
@@ -8,7 +8,7 @@ inherit distutils-r1
 
 DESCRIPTION="Turn HTML into equivalent Markdown-structured text"
 HOMEPAGE="https://github.com/html2text/html2text
-	https://github.com/Alir3z4/html2text https://pypi.python.org/pypi/html2text"
+	https://github.com/Alir3z4/html2text https://pypi.org/project/html2text"
 SRC_URI="https://github.com/Alir3z4/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3"
diff --git a/dev-python/html2text/html2text-2017.10.4.ebuild b/dev-python/html2text/html2text-2017.10.4.ebuild
index 45203c6e8c705..a0733a6057839 100644
--- a/dev-python/html2text/html2text-2017.10.4.ebuild
+++ b/dev-python/html2text/html2text-2017.10.4.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python{2_7,3_{4,5,6}} pypy{,3} )
 inherit distutils-r1
 
 DESCRIPTION="Turn HTML into equivalent Markdown-structured text"
-HOMEPAGE="https://github.com/Alir3z4/html2text https://pypi.python.org/pypi/html2text"
+HOMEPAGE="https://github.com/Alir3z4/html2text https://pypi.org/project/html2text"
 SRC_URI="https://github.com/Alir3z4/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3"
diff --git a/dev-python/html2text/html2text-2018.1.9.ebuild b/dev-python/html2text/html2text-2018.1.9.ebuild
index 442e8f362d3c4..217ed20796f65 100644
--- a/dev-python/html2text/html2text-2018.1.9.ebuild
+++ b/dev-python/html2text/html2text-2018.1.9.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python{2_7,3_{4,5,6}} pypy{,3} )
 inherit distutils-r1
 
 DESCRIPTION="Turn HTML into equivalent Markdown-structured text"
-HOMEPAGE="https://github.com/Alir3z4/html2text https://pypi.python.org/pypi/html2text"
+HOMEPAGE="https://github.com/Alir3z4/html2text https://pypi.org/project/html2text"
 SRC_URI="https://github.com/Alir3z4/${PN}/archive/${PV}.tar.gz -> ${P}-1.tar.gz"
 
 LICENSE="GPL-3"
diff --git a/dev-python/httpbin/httpbin-0.4.1.ebuild b/dev-python/httpbin/httpbin-0.4.1.ebuild
index de91fa13508ad..6fd15c6139325 100644
--- a/dev-python/httpbin/httpbin-0.4.1.ebuild
+++ b/dev-python/httpbin/httpbin-0.4.1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="HTTP Request and Response Service"
-HOMEPAGE="https://github.com/Runscope/httpbin https://pypi.python.org/pypi/httpbin"
+HOMEPAGE="https://github.com/Runscope/httpbin https://pypi.org/project/httpbin"
 SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/httplib2/httplib2-0.10.3-r1.ebuild b/dev-python/httplib2/httplib2-0.10.3-r1.ebuild
index 194c3a440d6bc..1ae8bbf849c83 100644
--- a/dev-python/httplib2/httplib2-0.10.3-r1.ebuild
+++ b/dev-python/httplib2/httplib2-0.10.3-r1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="A comprehensive HTTP client library"
-HOMEPAGE="https://pypi.python.org/pypi/httplib2 https://github.com/jcgregorio/httplib2"
+HOMEPAGE="https://pypi.org/project/httplib2 https://github.com/jcgregorio/httplib2"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/httreplay/httreplay-0.2.0.ebuild b/dev-python/httreplay/httreplay-0.2.0.ebuild
index c7280758ee1ea..f7485f5c5f559 100644
--- a/dev-python/httreplay/httreplay-0.2.0.ebuild
+++ b/dev-python/httreplay/httreplay-0.2.0.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5} pypy pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="A HTTP replay library for testing."
-HOMEPAGE="https://github.com/agriffis/httreplay https://pypi.python.org/pypi/httreplay"
+HOMEPAGE="https://github.com/agriffis/httreplay https://pypi.org/project/httreplay"
 SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/humanfriendly/humanfriendly-2.4.ebuild b/dev-python/humanfriendly/humanfriendly-2.4.ebuild
index c4b229c3b9d66..a4f9df8261990 100644
--- a/dev-python/humanfriendly/humanfriendly-2.4.ebuild
+++ b/dev-python/humanfriendly/humanfriendly-2.4.ebuild
@@ -9,7 +9,7 @@ PYTHON_REQ_USE="threads(+)"
 inherit distutils-r1
 
 DESCRIPTION="Human friendly output for text interfaces using Python"
-HOMEPAGE="https://pypi.python.org/pypi/humanfriendly https://humanfriendly.readthedocs.org"
+HOMEPAGE="https://pypi.org/project/humanfriendly https://humanfriendly.readthedocs.org"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
diff --git a/dev-python/hyper-h2/hyper-h2-2.5.1.ebuild b/dev-python/hyper-h2/hyper-h2-2.5.1.ebuild
index 528672a3e65ff..7373076821c8a 100644
--- a/dev-python/hyper-h2/hyper-h2-2.5.1.ebuild
+++ b/dev-python/hyper-h2/hyper-h2-2.5.1.ebuild
@@ -11,7 +11,7 @@ MY_PN="h2"
 DESCRIPTION="HTTP/2 State-Machine based protocol implementation"
 HOMEPAGE="https://python-hyper.org/h2/en/stable
 	https://github.com/python-hyper/hyper-h2
-	https://pypi.python.org/pypi/h2"
+	https://pypi.org/project/h2"
 SRC_URI="mirror://pypi/${P:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/hyper-h2/hyper-h2-3.0.1.ebuild b/dev-python/hyper-h2/hyper-h2-3.0.1.ebuild
index d514a4274ec8a..56916088d09ed 100644
--- a/dev-python/hyper-h2/hyper-h2-3.0.1.ebuild
+++ b/dev-python/hyper-h2/hyper-h2-3.0.1.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy)
 inherit distutils-r1
 
 DESCRIPTION="HTTP/2 State-Machine based protocol implementation"
-HOMEPAGE="https://python-hyper.org/h2/en/stable/ https://pypi.python.org/pypi/h2"
+HOMEPAGE="https://python-hyper.org/h2/en/stable/ https://pypi.org/project/h2"
 SRC_URI="https://github.com/python-hyper/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/hyperframe/hyperframe-4.0.1.ebuild b/dev-python/hyperframe/hyperframe-4.0.1.ebuild
index 02dd5890c7a55..4ee406bc71383 100644
--- a/dev-python/hyperframe/hyperframe-4.0.1.ebuild
+++ b/dev-python/hyperframe/hyperframe-4.0.1.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy)
 inherit distutils-r1
 
 DESCRIPTION="HTTP/2 framing layer for Python"
-HOMEPAGE="https://python-hyper.org/en/latest/ https://pypi.python.org/pypi/hyperframe"
+HOMEPAGE="https://python-hyper.org/en/latest/ https://pypi.org/project/hyperframe"
 SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/hyperframe/hyperframe-5.1.0.ebuild b/dev-python/hyperframe/hyperframe-5.1.0.ebuild
index 61146a0004686..764ea25d9d7f4 100644
--- a/dev-python/hyperframe/hyperframe-5.1.0.ebuild
+++ b/dev-python/hyperframe/hyperframe-5.1.0.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy)
 inherit distutils-r1
 
 DESCRIPTION="HTTP/2 framing layer for Python"
-HOMEPAGE="https://python-hyper.org/en/latest/ https://pypi.python.org/pypi/hyperframe"
+HOMEPAGE="https://python-hyper.org/en/latest/ https://pypi.org/project/hyperframe"
 SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/hyperlink/hyperlink-17.1.1.ebuild b/dev-python/hyperlink/hyperlink-17.1.1.ebuild
index 622dadb5bdccd..43992e66e7737 100644
--- a/dev-python/hyperlink/hyperlink-17.1.1.ebuild
+++ b/dev-python/hyperlink/hyperlink-17.1.1.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy)
 inherit distutils-r1
 
 DESCRIPTION="A featureful, correct URL for Python"
-HOMEPAGE="https://github.com/python-hyper/hyperlink https://pypi.python.org/pypi/hyperlink"
+HOMEPAGE="https://github.com/python-hyper/hyperlink https://pypi.org/project/hyperlink"
 SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD MIT"
diff --git a/dev-python/hyperlink/hyperlink-17.3.1.ebuild b/dev-python/hyperlink/hyperlink-17.3.1.ebuild
index c1eccb99b0029..6a990b39704a0 100644
--- a/dev-python/hyperlink/hyperlink-17.3.1.ebuild
+++ b/dev-python/hyperlink/hyperlink-17.3.1.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy)
 inherit distutils-r1
 
 DESCRIPTION="A featureful, correct URL for Python"
-HOMEPAGE="https://github.com/python-hyper/hyperlink https://pypi.python.org/pypi/hyperlink"
+HOMEPAGE="https://github.com/python-hyper/hyperlink https://pypi.org/project/hyperlink"
 SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD MIT"
diff --git a/dev-python/hypothesis/hypothesis-3.38.5.ebuild b/dev-python/hypothesis/hypothesis-3.38.5.ebuild
index 4869c0b7b9eb1..540270cf37c2b 100644
--- a/dev-python/hypothesis/hypothesis-3.38.5.ebuild
+++ b/dev-python/hypothesis/hypothesis-3.38.5.ebuild
@@ -9,7 +9,7 @@ PYTHON_REQ_USE="threads(+),sqlite"
 inherit distutils-r1 eutils
 
 DESCRIPTION="A library for property based testing"
-HOMEPAGE="https://github.com/HypothesisWorks/hypothesis-python https://pypi.python.org/pypi/hypothesis"
+HOMEPAGE="https://github.com/HypothesisWorks/hypothesis-python https://pypi.org/project/hypothesis"
 SRC_URI="https://github.com/HypothesisWorks/hypothesis-python/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MPL-2.0"
diff --git a/dev-python/hypothesis/hypothesis-3.44.26.ebuild b/dev-python/hypothesis/hypothesis-3.44.26.ebuild
index df6dfe53b3373..fe1e2a4369958 100644
--- a/dev-python/hypothesis/hypothesis-3.44.26.ebuild
+++ b/dev-python/hypothesis/hypothesis-3.44.26.ebuild
@@ -9,7 +9,7 @@ PYTHON_REQ_USE="threads(+),sqlite"
 inherit distutils-r1 eutils
 
 DESCRIPTION="A library for property based testing"
-HOMEPAGE="https://github.com/HypothesisWorks/hypothesis-python https://pypi.python.org/pypi/hypothesis"
+HOMEPAGE="https://github.com/HypothesisWorks/hypothesis-python https://pypi.org/project/hypothesis"
 SRC_URI="https://github.com/HypothesisWorks/hypothesis-python/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MPL-2.0"
diff --git a/dev-python/hypothesis/hypothesis-3.44.7.ebuild b/dev-python/hypothesis/hypothesis-3.44.7.ebuild
index 4869c0b7b9eb1..540270cf37c2b 100644
--- a/dev-python/hypothesis/hypothesis-3.44.7.ebuild
+++ b/dev-python/hypothesis/hypothesis-3.44.7.ebuild
@@ -9,7 +9,7 @@ PYTHON_REQ_USE="threads(+),sqlite"
 inherit distutils-r1 eutils
 
 DESCRIPTION="A library for property based testing"
-HOMEPAGE="https://github.com/HypothesisWorks/hypothesis-python https://pypi.python.org/pypi/hypothesis"
+HOMEPAGE="https://github.com/HypothesisWorks/hypothesis-python https://pypi.org/project/hypothesis"
 SRC_URI="https://github.com/HypothesisWorks/hypothesis-python/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MPL-2.0"
diff --git a/dev-python/hypothesis/hypothesis-3.45.3.ebuild b/dev-python/hypothesis/hypothesis-3.45.3.ebuild
index df6dfe53b3373..fe1e2a4369958 100644
--- a/dev-python/hypothesis/hypothesis-3.45.3.ebuild
+++ b/dev-python/hypothesis/hypothesis-3.45.3.ebuild
@@ -9,7 +9,7 @@ PYTHON_REQ_USE="threads(+),sqlite"
 inherit distutils-r1 eutils
 
 DESCRIPTION="A library for property based testing"
-HOMEPAGE="https://github.com/HypothesisWorks/hypothesis-python https://pypi.python.org/pypi/hypothesis"
+HOMEPAGE="https://github.com/HypothesisWorks/hypothesis-python https://pypi.org/project/hypothesis"
 SRC_URI="https://github.com/HypothesisWorks/hypothesis-python/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MPL-2.0"
diff --git a/dev-python/hypothesis/hypothesis-3.50.1.ebuild b/dev-python/hypothesis/hypothesis-3.50.1.ebuild
index df6dfe53b3373..fe1e2a4369958 100644
--- a/dev-python/hypothesis/hypothesis-3.50.1.ebuild
+++ b/dev-python/hypothesis/hypothesis-3.50.1.ebuild
@@ -9,7 +9,7 @@ PYTHON_REQ_USE="threads(+),sqlite"
 inherit distutils-r1 eutils
 
 DESCRIPTION="A library for property based testing"
-HOMEPAGE="https://github.com/HypothesisWorks/hypothesis-python https://pypi.python.org/pypi/hypothesis"
+HOMEPAGE="https://github.com/HypothesisWorks/hypothesis-python https://pypi.org/project/hypothesis"
 SRC_URI="https://github.com/HypothesisWorks/hypothesis-python/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MPL-2.0"
diff --git a/dev-python/hypothesis/hypothesis-3.6.0-r1.ebuild b/dev-python/hypothesis/hypothesis-3.6.0-r1.ebuild
index cfd208934d871..b9764635f66dc 100644
--- a/dev-python/hypothesis/hypothesis-3.6.0-r1.ebuild
+++ b/dev-python/hypothesis/hypothesis-3.6.0-r1.ebuild
@@ -9,7 +9,7 @@ PYTHON_REQ_USE="threads(+),sqlite"
 inherit distutils-r1 eutils
 
 DESCRIPTION="A library for property based testing"
-HOMEPAGE="https://github.com/DRMacIver/hypothesis https://pypi.python.org/pypi/hypothesis"
+HOMEPAGE="https://github.com/DRMacIver/hypothesis https://pypi.org/project/hypothesis"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MPL-2.0"
diff --git a/dev-python/idna-ssl/idna-ssl-1.0.0.ebuild b/dev-python/idna-ssl/idna-ssl-1.0.0.ebuild
index 916824a4f0f7f..f923e155efcbd 100644
--- a/dev-python/idna-ssl/idna-ssl-1.0.0.ebuild
+++ b/dev-python/idna-ssl/idna-ssl-1.0.0.ebuild
@@ -11,7 +11,7 @@ MY_PN=${PN/-/_}
 MY_P=${MY_PN}-${PV}
 
 DESCRIPTION="Patch ssl.match_hostname for Unicode(idna) domains support"
-HOMEPAGE="https://github.com/aio-libs/idna-ssl https://pypi.python.org/pypi/idna_ssl"
+HOMEPAGE="https://github.com/aio-libs/idna-ssl https://pypi.org/project/idna_ssl"
 SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 SLOT="0"
diff --git a/dev-python/idna-ssl/idna-ssl-1.0.1.ebuild b/dev-python/idna-ssl/idna-ssl-1.0.1.ebuild
index bb91e721918bd..da8aa8bc2750b 100644
--- a/dev-python/idna-ssl/idna-ssl-1.0.1.ebuild
+++ b/dev-python/idna-ssl/idna-ssl-1.0.1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python3_{4,5,6} )
 inherit distutils-r1
 
 DESCRIPTION="Patch ssl.match_hostname for Unicode(idna) domains support"
-HOMEPAGE="https://github.com/aio-libs/idna-ssl https://pypi.python.org/pypi/idna_ssl"
+HOMEPAGE="https://github.com/aio-libs/idna-ssl https://pypi.org/project/idna_ssl"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
diff --git a/dev-python/idna/idna-2.6.ebuild b/dev-python/idna/idna-2.6.ebuild
index ea37b9481f8fa..55f894ad6b49a 100644
--- a/dev-python/idna/idna-2.6.ebuild
+++ b/dev-python/idna/idna-2.6.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="Internationalized Domain Names in Applications (IDNA)"
-HOMEPAGE="https://github.com/kjd/idna https://pypi.python.org/pypi/idna"
+HOMEPAGE="https://github.com/kjd/idna https://pypi.org/project/idna"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
diff --git a/dev-python/ijson/ijson-2.3.ebuild b/dev-python/ijson/ijson-2.3.ebuild
index 999c8af9568c6..2c67689165907 100644
--- a/dev-python/ijson/ijson-2.3.ebuild
+++ b/dev-python/ijson/ijson-2.3.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
 inherit distutils-r1
 
 DESCRIPTION="Iterative JSON parser with a Pythonic interface"
-HOMEPAGE="https://github.com/isagalaev/ijson https://pypi.python.org/pypi/ijson/"
+HOMEPAGE="https://github.com/isagalaev/ijson https://pypi.org/project/ijson/"
 SRC_URI="https://github.com/isagalaev/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/imdbpy/imdbpy-5.0.ebuild b/dev-python/imdbpy/imdbpy-5.0.ebuild
index 1c075afaf2d06..80ec214e07511 100644
--- a/dev-python/imdbpy/imdbpy-5.0.ebuild
+++ b/dev-python/imdbpy/imdbpy-5.0.ebuild
@@ -10,7 +10,7 @@ MY_PN="IMDbPY"
 MY_P="${MY_PN}-${PV}"
 
 DESCRIPTION="Python package to access the IMDb movie database"
-HOMEPAGE="http://imdbpy.sourceforge.net/ https://pypi.python.org/pypi/IMDbPY"
+HOMEPAGE="http://imdbpy.sourceforge.net/ https://pypi.org/project/IMDbPY"
 SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
diff --git a/dev-python/incremental/incremental-16.10.1.ebuild b/dev-python/incremental/incremental-16.10.1.ebuild
index 8696bf422a807..ccda3bd2d2f18 100644
--- a/dev-python/incremental/incremental-16.10.1.ebuild
+++ b/dev-python/incremental/incremental-16.10.1.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy)
 inherit distutils-r1
 
 DESCRIPTION="Incremental is a small library that versions your Python projects"
-HOMEPAGE="https://github.com/hawkowl/incremental https://pypi.python.org/pypi/incremental"
+HOMEPAGE="https://github.com/hawkowl/incremental https://pypi.org/project/incremental"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/incremental/incremental-17.5.0.ebuild b/dev-python/incremental/incremental-17.5.0.ebuild
index 2793f58e15b0a..944fb1dd5cf66 100644
--- a/dev-python/incremental/incremental-17.5.0.ebuild
+++ b/dev-python/incremental/incremental-17.5.0.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy)
 inherit distutils-r1
 
 DESCRIPTION="Incremental is a small library that versions your Python projects"
-HOMEPAGE="https://github.com/hawkowl/incremental https://pypi.python.org/pypi/incremental"
+HOMEPAGE="https://github.com/hawkowl/incremental https://pypi.org/project/incremental"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/influxdb/influxdb-2.12.0.ebuild b/dev-python/influxdb/influxdb-2.12.0.ebuild
index 7ed39bd151f5c..47b318e74c08c 100644
--- a/dev-python/influxdb/influxdb-2.12.0.ebuild
+++ b/dev-python/influxdb/influxdb-2.12.0.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_{4,5}} )
 inherit distutils-r1
 
 DESCRIPTION="InfluxDB client"
-HOMEPAGE="https://github.com/influxdb/influxdb-python https://pypi.python.org/pypi/influxdb"
+HOMEPAGE="https://github.com/influxdb/influxdb-python https://pypi.org/project/influxdb"
 SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/iniparse/iniparse-0.4-r2.ebuild b/dev-python/iniparse/iniparse-0.4-r2.ebuild
index 4c4d1a47417f1..dd3b30034e3d2 100644
--- a/dev-python/iniparse/iniparse-0.4-r2.ebuild
+++ b/dev-python/iniparse/iniparse-0.4-r2.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
 inherit distutils-r1
 
 DESCRIPTION="Better INI parser for Python"
-HOMEPAGE="https://pypi.python.org/pypi/iniparse"
+HOMEPAGE="https://pypi.org/project/iniparse"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT PSF-2"
diff --git a/dev-python/intelhex/intelhex-2.0.ebuild b/dev-python/intelhex/intelhex-2.0.ebuild
index 9d563c8231fd5..d442613e6d2c8 100644
--- a/dev-python/intelhex/intelhex-2.0.ebuild
+++ b/dev-python/intelhex/intelhex-2.0.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5} )
 inherit distutils-r1
 
 DESCRIPTION="Python library for Intel HEX files manipulations"
-HOMEPAGE="https://pypi.python.org/pypi/IntelHex/ https://github.com/bialix/intelhex"
+HOMEPAGE="https://pypi.org/project/IntelHex/ https://github.com/bialix/intelhex"
 SRC_URI="mirror://pypi/I/IntelHex/${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/intervaltree/intervaltree-2.1.0.ebuild b/dev-python/intervaltree/intervaltree-2.1.0.ebuild
index 8e32eb6540194..6c5e19641c48e 100644
--- a/dev-python/intervaltree/intervaltree-2.1.0.ebuild
+++ b/dev-python/intervaltree/intervaltree-2.1.0.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
 inherit distutils-r1
 
 DESCRIPTION="Editable interval tree data structure for Python 2 and 3"
-HOMEPAGE="https://pypi.python.org/pypi/intervaltree"
+HOMEPAGE="https://pypi.org/project/intervaltree"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
diff --git a/dev-python/into/into-0.2.2.ebuild b/dev-python/into/into-0.2.2.ebuild
index ae24d10cdba93..b2a0f93ce4a26 100644
--- a/dev-python/into/into-0.2.2.ebuild
+++ b/dev-python/into/into-0.2.2.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
 inherit distutils-r1
 
 DESCRIPTION="Data migration utilities"
-HOMEPAGE="https://pypi.python.org/pypi/${PN}"
+HOMEPAGE="https://pypi.org/project/${PN}"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/invoke/invoke-0.22.1.ebuild b/dev-python/invoke/invoke-0.22.1.ebuild
index cec599ec9d1bf..1db8ec13df925 100644
--- a/dev-python/invoke/invoke-0.22.1.ebuild
+++ b/dev-python/invoke/invoke-0.22.1.ebuild
@@ -6,7 +6,7 @@ PYTHON_COMPAT=( python{2_7,3_5,3_6} )
 inherit distutils-r1
 
 DESCRIPTION="Pythonic task execution"
-HOMEPAGE="https://pypi.python.org/pypi/invoke/"
+HOMEPAGE="https://pypi.org/project/invoke/"
 SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 RDEPEND=""
diff --git a/dev-python/iocapture/iocapture-0.1.2-r1.ebuild b/dev-python/iocapture/iocapture-0.1.2-r1.ebuild
index 32d33181ccfeb..436cddac183d3 100644
--- a/dev-python/iocapture/iocapture-0.1.2-r1.ebuild
+++ b/dev-python/iocapture/iocapture-0.1.2-r1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy )
 inherit distutils-r1
 
 DESCRIPTION="Capture stdout,stderr easily"
-HOMEPAGE="https://pypi.python.org/pypi/iocapture/"
+HOMEPAGE="https://pypi.org/project/iocapture/"
 SRC_URI="https://github.com/oinume/iocapture/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 SLOT="0"
diff --git a/dev-python/iocapture/iocapture-0.1.2.ebuild b/dev-python/iocapture/iocapture-0.1.2.ebuild
index c1efb80fdfbc1..2649667df6928 100644
--- a/dev-python/iocapture/iocapture-0.1.2.ebuild
+++ b/dev-python/iocapture/iocapture-0.1.2.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5} pypy )
 inherit distutils-r1
 
 DESCRIPTION="Capture stdout,stderr easily"
-HOMEPAGE="https://pypi.python.org/pypi/iocapture/"
+HOMEPAGE="https://pypi.org/project/iocapture/"
 SRC_URI="https://github.com/oinume/iocapture/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 SLOT="0"
diff --git a/dev-python/ipaddr/ipaddr-2.1.11-r1.ebuild b/dev-python/ipaddr/ipaddr-2.1.11-r1.ebuild
index 8f9fd9de97889..e916bb6c56899 100644
--- a/dev-python/ipaddr/ipaddr-2.1.11-r1.ebuild
+++ b/dev-python/ipaddr/ipaddr-2.1.11-r1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy )
 inherit distutils-r1
 
 DESCRIPTION="Python IP address manipulation library"
-HOMEPAGE="https://github.com/google/ipaddr-py https://pypi.python.org/pypi/ipaddr"
+HOMEPAGE="https://github.com/google/ipaddr-py https://pypi.org/project/ipaddr"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
diff --git a/dev-python/ipcalc/ipcalc-1.1.3.ebuild b/dev-python/ipcalc/ipcalc-1.1.3.ebuild
index f89b7750f41f2..bdd86bb3f6f88 100644
--- a/dev-python/ipcalc/ipcalc-1.1.3.ebuild
+++ b/dev-python/ipcalc/ipcalc-1.1.3.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 pypy )
 inherit distutils-r1
 
 DESCRIPTION="IP subnet calculator"
-HOMEPAGE="https://pypi.python.org/pypi/ipcalc/"
+HOMEPAGE="https://pypi.org/project/ipcalc/"
 SRC_URI="mirror://pypi/i/${PN}/${P}.tar.gz"
 
 SLOT="0"
diff --git a/dev-python/ipcalc/ipcalc-1.99.0.ebuild b/dev-python/ipcalc/ipcalc-1.99.0.ebuild
index 6186c84469ba9..499414f177840 100644
--- a/dev-python/ipcalc/ipcalc-1.99.0.ebuild
+++ b/dev-python/ipcalc/ipcalc-1.99.0.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="IP subnet calculator"
-HOMEPAGE="https://pypi.python.org/pypi/ipcalc/"
+HOMEPAGE="https://pypi.org/project/ipcalc/"
 SRC_URI="https://github.com/tehmaze/${PN}/archive/${P}.tar.gz"
 
 SLOT="0"
diff --git a/dev-python/ipdb/ipdb-0.10.3.ebuild b/dev-python/ipdb/ipdb-0.10.3.ebuild
index 7bf6eb22eac36..17d15afc07c74 100644
--- a/dev-python/ipdb/ipdb-0.10.3.ebuild
+++ b/dev-python/ipdb/ipdb-0.10.3.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
 inherit distutils-r1
 
 DESCRIPTION="IPython-enabled pdb"
-HOMEPAGE="https://pypi.python.org/pypi/ipdb"
+HOMEPAGE="https://pypi.org/project/ipdb"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
diff --git a/dev-python/ipdbplugin/ipdbplugin-1.4.ebuild b/dev-python/ipdbplugin/ipdbplugin-1.4.ebuild
index ecddbd26416e7..6796b7e8efaa4 100644
--- a/dev-python/ipdbplugin/ipdbplugin-1.4.ebuild
+++ b/dev-python/ipdbplugin/ipdbplugin-1.4.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
 inherit distutils-r1
 
 DESCRIPTION="Nose plugin to use iPdb instead of Pdb when tests fail"
-HOMEPAGE="https://pypi.python.org/pypi/ipdbplugin"
+HOMEPAGE="https://pypi.org/project/ipdbplugin"
 
 if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3
diff --git a/dev-python/ipdbplugin/ipdbplugin-9999.ebuild b/dev-python/ipdbplugin/ipdbplugin-9999.ebuild
index ecddbd26416e7..6796b7e8efaa4 100644
--- a/dev-python/ipdbplugin/ipdbplugin-9999.ebuild
+++ b/dev-python/ipdbplugin/ipdbplugin-9999.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
 inherit distutils-r1
 
 DESCRIPTION="Nose plugin to use iPdb instead of Pdb when tests fail"
-HOMEPAGE="https://pypi.python.org/pypi/ipdbplugin"
+HOMEPAGE="https://pypi.org/project/ipdbplugin"
 
 if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3
diff --git a/dev-python/ipy/ipy-0.83.ebuild b/dev-python/ipy/ipy-0.83.ebuild
index 1a3aaa0c375fa..1a1d7cd4522db 100644
--- a/dev-python/ipy/ipy-0.83.ebuild
+++ b/dev-python/ipy/ipy-0.83.ebuild
@@ -11,7 +11,7 @@ MY_PN="IPy"
 MY_P="${MY_PN}-${PV}"
 
 DESCRIPTION="Class and tools for handling of IPv4 and IPv6 addresses and networks"
-HOMEPAGE="https://github.com/haypo/python-ipy/wiki https://pypi.python.org/pypi/IPy"
+HOMEPAGE="https://github.com/haypo/python-ipy/wiki https://pypi.org/project/IPy"
 SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/iso3166/iso3166-0.8.ebuild b/dev-python/iso3166/iso3166-0.8.ebuild
index 59573ef2f09a7..1ca0c0efc1fd7 100644
--- a/dev-python/iso3166/iso3166-0.8.ebuild
+++ b/dev-python/iso3166/iso3166-0.8.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5} pypy )
 inherit distutils-r1
 
 DESCRIPTION="Self-contained ISO 3166-1 country definitions."
-HOMEPAGE="https://pypi.python.org/pypi/iso3166 https://github.com/deactivated/python-iso3166"
+HOMEPAGE="https://pypi.org/project/iso3166 https://github.com/deactivated/python-iso3166"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/iso8601/iso8601-0.1.10.ebuild b/dev-python/iso8601/iso8601-0.1.10.ebuild
index 837331b4a9c79..4a983e73de76d 100644
--- a/dev-python/iso8601/iso8601-0.1.10.ebuild
+++ b/dev-python/iso8601/iso8601-0.1.10.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="Simple module to parse ISO 8601 dates"
-HOMEPAGE="https://pypi.python.org/pypi/iso8601"
+HOMEPAGE="https://pypi.org/project/iso8601"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/iso8601/iso8601-0.1.11.ebuild b/dev-python/iso8601/iso8601-0.1.11.ebuild
index 50e9f122ffc71..6ff7480fe0314 100644
--- a/dev-python/iso8601/iso8601-0.1.11.ebuild
+++ b/dev-python/iso8601/iso8601-0.1.11.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="Simple module to parse ISO 8601 dates"
-HOMEPAGE="https://pypi.python.org/pypi/iso8601"
+HOMEPAGE="https://pypi.org/project/iso8601"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/iso8601/iso8601-0.1.12.ebuild b/dev-python/iso8601/iso8601-0.1.12.ebuild
index 1b9600900d37a..e5df1e9b8970f 100644
--- a/dev-python/iso8601/iso8601-0.1.12.ebuild
+++ b/dev-python/iso8601/iso8601-0.1.12.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="Simple module to parse ISO 8601 dates"
-HOMEPAGE="https://pypi.python.org/pypi/iso8601"
+HOMEPAGE="https://pypi.org/project/iso8601"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/iso_639/iso_639-0.4.5.ebuild b/dev-python/iso_639/iso_639-0.4.5.ebuild
index 4205e19323fd8..320d919e08632 100644
--- a/dev-python/iso_639/iso_639-0.4.5.ebuild
+++ b/dev-python/iso_639/iso_639-0.4.5.ebuild
@@ -11,7 +11,7 @@ MY_P="${MY_PN}-${PV}"
 inherit distutils-r1
 
 DESCRIPTION="Python library for ISO 639 standard"
-HOMEPAGE="https://pypi.python.org/pypi/iso-639 https://github.com/noumar/iso639"
+HOMEPAGE="https://pypi.org/project/iso-639 https://github.com/noumar/iso639"
 SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="AGPL-3"
diff --git a/dev-python/isodate/isodate-0.5.4.ebuild b/dev-python/isodate/isodate-0.5.4.ebuild
index 333e8597362ab..24b7b9bd7a198 100644
--- a/dev-python/isodate/isodate-0.5.4.ebuild
+++ b/dev-python/isodate/isodate-0.5.4.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_{4,5,6}} pypy )
 inherit distutils-r1
 
 DESCRIPTION="ISO 8601 date/time/duration parser and formatter"
-HOMEPAGE="https://pypi.python.org/pypi/isodate"
+HOMEPAGE="https://pypi.org/project/isodate"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/isodate/isodate-0.6.0.ebuild b/dev-python/isodate/isodate-0.6.0.ebuild
index 1305ebd77484b..27777d58e6316 100644
--- a/dev-python/isodate/isodate-0.6.0.ebuild
+++ b/dev-python/isodate/isodate-0.6.0.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_{4,5,6}} pypy{,3} )
 inherit distutils-r1
 
 DESCRIPTION="ISO 8601 date/time/duration parser and formatter"
-HOMEPAGE="https://pypi.python.org/pypi/isodate"
+HOMEPAGE="https://pypi.org/project/isodate"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/isort/isort-4.2.5.ebuild b/dev-python/isort/isort-4.2.5.ebuild
index 57cf7ce352e01..f73b2bce1f84b 100644
--- a/dev-python/isort/isort-4.2.5.ebuild
+++ b/dev-python/isort/isort-4.2.5.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
 inherit distutils-r1
 
 DESCRIPTION="A python utility/library to sort imports"
-HOMEPAGE="https://pypi.python.org/pypi/isort"
+HOMEPAGE="https://pypi.org/project/isort"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/itsdangerous/itsdangerous-0.24.ebuild b/dev-python/itsdangerous/itsdangerous-0.24.ebuild
index 5a16979b1804f..3aa8e32d51511 100644
--- a/dev-python/itsdangerous/itsdangerous-0.24.ebuild
+++ b/dev-python/itsdangerous/itsdangerous-0.24.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="Various helpers to pass trusted data to untrusted environments and back"
-HOMEPAGE="http://pythonhosted.org/itsdangerous/ https://pypi.python.org/pypi/itsdangerous"
+HOMEPAGE="http://pythonhosted.org/itsdangerous/ https://pypi.org/project/itsdangerous"
 SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/jaraco-utils/jaraco-utils-10.0.2.ebuild b/dev-python/jaraco-utils/jaraco-utils-10.0.2.ebuild
index 9e37b474110bc..8beedb2fe4463 100644
--- a/dev-python/jaraco-utils/jaraco-utils-10.0.2.ebuild
+++ b/dev-python/jaraco-utils/jaraco-utils-10.0.2.ebuild
@@ -8,7 +8,7 @@ inherit distutils-r1
 
 MY_PN="jaraco.util"
 DESCRIPTION="General utility modules that supply commonly-used functionality"
-HOMEPAGE="https://pypi.python.org/pypi/jaraco.util"
+HOMEPAGE="https://pypi.org/project/jaraco.util"
 SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.zip"
 
 LICENSE="MIT"
diff --git a/dev-python/jaxml/jaxml-3.02-r1.ebuild b/dev-python/jaxml/jaxml-3.02-r1.ebuild
index dfaa543dc92bd..a2fa4e584e5b0 100644
--- a/dev-python/jaxml/jaxml-3.02-r1.ebuild
+++ b/dev-python/jaxml/jaxml-3.02-r1.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 pypy )
 inherit distutils-r1
 
 DESCRIPTION="XML generator written in Python"
-HOMEPAGE="http://www.librelogiciel.com/software/jaxml/action_Presentation https://pypi.python.org/pypi/jaxml"
+HOMEPAGE="http://www.librelogiciel.com/software/jaxml/action_Presentation https://pypi.org/project/jaxml"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
diff --git a/dev-python/jellyfish/jellyfish-0.5.6.ebuild b/dev-python/jellyfish/jellyfish-0.5.6.ebuild
index b73a765398e55..beeac583d8f8d 100644
--- a/dev-python/jellyfish/jellyfish-0.5.6.ebuild
+++ b/dev-python/jellyfish/jellyfish-0.5.6.ebuild
@@ -8,7 +8,7 @@ DISTUTILS_IN_SOURCE_BUILD=1
 inherit distutils-r1
 
 DESCRIPTION="Python module for doing approximate and phonetic matching of strings"
-HOMEPAGE="https://github.com/jamesturk/jellyfish https://pypi.python.org/pypi/jellyfish"
+HOMEPAGE="https://github.com/jamesturk/jellyfish https://pypi.org/project/jellyfish"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD-2"
diff --git a/dev-python/jinja/jinja-2.10.ebuild b/dev-python/jinja/jinja-2.10.ebuild
index 45e90ddca63ce..eaedaf9631907 100644
--- a/dev-python/jinja/jinja-2.10.ebuild
+++ b/dev-python/jinja/jinja-2.10.ebuild
@@ -9,7 +9,7 @@ PYTHON_REQ_USE="threads(+)"
 inherit eutils distutils-r1
 
 DESCRIPTION="A full-featured template engine for Python"
-HOMEPAGE="http://jinja.pocoo.org/ https://pypi.python.org/pypi/Jinja2"
+HOMEPAGE="http://jinja.pocoo.org/ https://pypi.org/project/Jinja2"
 
 # pypi tarball is missing tests
 SRC_URI="https://github.com/pallets/jinja/archive/${PV}.tar.gz -> ${P}.tar.gz"
diff --git a/dev-python/jinja/jinja-2.9.5.ebuild b/dev-python/jinja/jinja-2.9.5.ebuild
index 8618102dd4c6a..21fa78eb36c48 100644
--- a/dev-python/jinja/jinja-2.9.5.ebuild
+++ b/dev-python/jinja/jinja-2.9.5.ebuild
@@ -9,7 +9,7 @@ PYTHON_REQ_USE="threads(+)"
 inherit eutils distutils-r1
 
 DESCRIPTION="A full-featured template engine for Python"
-HOMEPAGE="http://jinja.pocoo.org/ https://pypi.python.org/pypi/Jinja2"
+HOMEPAGE="http://jinja.pocoo.org/ https://pypi.org/project/Jinja2"
 
 # pypi tarball is missing tests
 SRC_URI="https://github.com/pallets/jinja/archive/${PV}.tar.gz -> ${P}.tar.gz"
diff --git a/dev-python/jmespath/jmespath-0.9.3.ebuild b/dev-python/jmespath/jmespath-0.9.3.ebuild
index f24fbe278a09e..bd40e283cb924 100644
--- a/dev-python/jmespath/jmespath-0.9.3.ebuild
+++ b/dev-python/jmespath/jmespath-0.9.3.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy{,3} )
 inherit distutils-r1
 
 DESCRIPTION="JSON Matching Expressions"
-HOMEPAGE="https://github.com/boto/jmespath https://pypi.python.org/pypi/jmespath"
+HOMEPAGE="https://github.com/boto/jmespath https://pypi.org/project/jmespath"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/jonpy/jonpy-0.11.ebuild b/dev-python/jonpy/jonpy-0.11.ebuild
index e2e2b63695acc..3703a36d19409 100644
--- a/dev-python/jonpy/jonpy-0.11.ebuild
+++ b/dev-python/jonpy/jonpy-0.11.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 pypy )
 inherit distutils-r1
 
 DESCRIPTION="Powerful multi-threaded object-oriented CGI/FastCGI/mod_python/html-templating facilities"
-HOMEPAGE="http://jonpy.sourceforge.net/ https://pypi.python.org/pypi/jonpy"
+HOMEPAGE="http://jonpy.sourceforge.net/ https://pypi.org/project/jonpy"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/jonpy/jonpy-0.13.ebuild b/dev-python/jonpy/jonpy-0.13.ebuild
index c261966757bdb..7cc12ef1fb759 100644
--- a/dev-python/jonpy/jonpy-0.13.ebuild
+++ b/dev-python/jonpy/jonpy-0.13.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 pypy )
 inherit distutils-r1
 
 DESCRIPTION="Powerful multi-threaded object-oriented CGI/FastCGI/mod_python/html-templating facilities"
-HOMEPAGE="http://jonpy.sourceforge.net/ https://pypi.python.org/pypi/jonpy"
+HOMEPAGE="http://jonpy.sourceforge.net/ https://pypi.org/project/jonpy"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/jplephem/jplephem-2.6.ebuild b/dev-python/jplephem/jplephem-2.6.ebuild
index 5d51f85f53a67..cd2d789358475 100644
--- a/dev-python/jplephem/jplephem-2.6.ebuild
+++ b/dev-python/jplephem/jplephem-2.6.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
 inherit distutils-r1
 
 DESCRIPTION="Python version of NASA DE4xx ephemerides for Astronomical Alamanac"
-HOMEPAGE="https://pypi.python.org/pypi/jplephem"
+HOMEPAGE="https://pypi.org/project/jplephem"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/jsmin/jsmin-2.2.1.ebuild b/dev-python/jsmin/jsmin-2.2.1.ebuild
index a660652b32279..72fac8d737d90 100644
--- a/dev-python/jsmin/jsmin-2.2.1.ebuild
+++ b/dev-python/jsmin/jsmin-2.2.1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
 inherit distutils-r1
 
 DESCRIPTION="JavaScript minifier"
-HOMEPAGE="https://pypi.python.org/pypi/jsmin https://github.com/tikitu/jsmin/"
+HOMEPAGE="https://pypi.org/project/jsmin https://github.com/tikitu/jsmin/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 KEYWORDS="amd64 x86"
diff --git a/dev-python/json-tools/json-tools-0.4.0.ebuild b/dev-python/json-tools/json-tools-0.4.0.ebuild
index b80c38d3cf638..4e89f4881d51b 100644
--- a/dev-python/json-tools/json-tools-0.4.0.ebuild
+++ b/dev-python/json-tools/json-tools-0.4.0.ebuild
@@ -11,7 +11,7 @@ MY_PN="json_tools"
 MY_P="${MY_PN}-${PV}"
 
 DESCRIPTION="A set of tools to manipulate JSON: diff, patch, and pretty-printing"
-HOMEPAGE="https://pypi.python.org/pypi/json_tools https://bitbucket.org/vadim_semenov/json_tools"
+HOMEPAGE="https://pypi.org/project/json_tools https://bitbucket.org/vadim_semenov/json_tools"
 SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/json-tools/json-tools-0.4.1.ebuild b/dev-python/json-tools/json-tools-0.4.1.ebuild
index 5e621d566e82a..08760cf22ece5 100644
--- a/dev-python/json-tools/json-tools-0.4.1.ebuild
+++ b/dev-python/json-tools/json-tools-0.4.1.ebuild
@@ -11,7 +11,7 @@ MY_PN="json_tools"
 MY_P="${MY_PN}-${PV}"
 
 DESCRIPTION="A set of tools to manipulate JSON: diff, patch, and pretty-printing"
-HOMEPAGE="https://pypi.python.org/pypi/json_tools https://bitbucket.org/vadim_semenov/json_tools"
+HOMEPAGE="https://pypi.org/project/json_tools https://bitbucket.org/vadim_semenov/json_tools"
 SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/jsonfield/jsonfield-1.0.3.ebuild b/dev-python/jsonfield/jsonfield-1.0.3.ebuild
index 8922af1fcacb5..fc51285f25df0 100644
--- a/dev-python/jsonfield/jsonfield-1.0.3.ebuild
+++ b/dev-python/jsonfield/jsonfield-1.0.3.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
 inherit distutils-r1
 
 DESCRIPTION="Reusable Django field that allows you to store validated JSON in your model"
-HOMEPAGE="https://pypi.python.org/pypi/jsonfield https://github.com/bradjasper/django-jsonfield"
+HOMEPAGE="https://pypi.org/project/jsonfield https://github.com/bradjasper/django-jsonfield"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
diff --git a/dev-python/jsonmerge/jsonmerge-1.1.0.ebuild b/dev-python/jsonmerge/jsonmerge-1.1.0.ebuild
index 15ccdb315da01..0e5ff019a2695 100644
--- a/dev-python/jsonmerge/jsonmerge-1.1.0.ebuild
+++ b/dev-python/jsonmerge/jsonmerge-1.1.0.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
 inherit distutils-r1
 
 DESCRIPTION="Merge a series of JSON documents."
-HOMEPAGE="https://github.com/omergertel/jsonmerge/ https://pypi.python.org/pypi/jsonmerge/"
+HOMEPAGE="https://github.com/omergertel/jsonmerge/ https://pypi.org/project/jsonmerge/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/jsonmerge/jsonmerge-1.3.0.ebuild b/dev-python/jsonmerge/jsonmerge-1.3.0.ebuild
index 22627bb346c79..42c5b7bc21661 100644
--- a/dev-python/jsonmerge/jsonmerge-1.3.0.ebuild
+++ b/dev-python/jsonmerge/jsonmerge-1.3.0.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
 inherit distutils-r1
 
 DESCRIPTION="Merge a series of JSON documents"
-HOMEPAGE="https://github.com/avian2/jsonmerge/ https://pypi.python.org/pypi/jsonmerge/"
+HOMEPAGE="https://github.com/avian2/jsonmerge/ https://pypi.org/project/jsonmerge/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/jsonmerge/jsonmerge-1.4.0.ebuild b/dev-python/jsonmerge/jsonmerge-1.4.0.ebuild
index e6ef174e73424..ff1df63374fd6 100644
--- a/dev-python/jsonmerge/jsonmerge-1.4.0.ebuild
+++ b/dev-python/jsonmerge/jsonmerge-1.4.0.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
 inherit distutils-r1
 
 DESCRIPTION="Merge a series of JSON documents"
-HOMEPAGE="https://github.com/avian2/jsonmerge/ https://pypi.python.org/pypi/jsonmerge/"
+HOMEPAGE="https://github.com/avian2/jsonmerge/ https://pypi.org/project/jsonmerge/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/jsonpickle/jsonpickle-0.9.3.ebuild b/dev-python/jsonpickle/jsonpickle-0.9.3.ebuild
index c08f5614e2d2d..e2a2178cdee70 100644
--- a/dev-python/jsonpickle/jsonpickle-0.9.3.ebuild
+++ b/dev-python/jsonpickle/jsonpickle-0.9.3.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5} )
 inherit distutils-r1
 
 DESCRIPTION="Python library for serializing any arbitrary object graph into JSON"
-HOMEPAGE="https://github.com/jsonpickle/jsonpickle/ https://pypi.python.org/pypi/jsonpickle"
+HOMEPAGE="https://github.com/jsonpickle/jsonpickle/ https://pypi.org/project/jsonpickle"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/jsonpointer/jsonpointer-1.10.ebuild b/dev-python/jsonpointer/jsonpointer-1.10.ebuild
index 41e1a097a83ad..e1c897d142d6d 100644
--- a/dev-python/jsonpointer/jsonpointer-1.10.ebuild
+++ b/dev-python/jsonpointer/jsonpointer-1.10.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="Identify specific nodes in a JSON document (according to draft 08)"
-HOMEPAGE="https://github.com/stefankoegl/python-json-pointer https://pypi.python.org/pypi/jsonpointer/"
+HOMEPAGE="https://github.com/stefankoegl/python-json-pointer https://pypi.org/project/jsonpointer/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/jsonref/jsonref-0.1.ebuild b/dev-python/jsonref/jsonref-0.1.ebuild
index b065699eaea70..56024f070b19c 100644
--- a/dev-python/jsonref/jsonref-0.1.ebuild
+++ b/dev-python/jsonref/jsonref-0.1.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy)
 inherit eutils distutils-r1
 
 DESCRIPTION="An implementation of JSON Reference for Python"
-HOMEPAGE="https://github.com/gazpachoking/jsonref https://pypi.python.org/pypi/jsonref"
+HOMEPAGE="https://github.com/gazpachoking/jsonref https://pypi.org/project/jsonref"
 SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/jsonschema/jsonschema-2.3.0.ebuild b/dev-python/jsonschema/jsonschema-2.3.0.ebuild
index 93e3df5bb9cc6..14bcf727f4c80 100644
--- a/dev-python/jsonschema/jsonschema-2.3.0.ebuild
+++ b/dev-python/jsonschema/jsonschema-2.3.0.ebuild
@@ -6,7 +6,7 @@ PYTHON_COMPAT=(python{2_7,3_4} pypy)
 inherit distutils-r1
 
 DESCRIPTION="An implementation of JSON-Schema validation for Python"
-HOMEPAGE="https://pypi.python.org/pypi/jsonschema"
+HOMEPAGE="https://pypi.org/project/jsonschema"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/jsonschema/jsonschema-2.4.0.ebuild b/dev-python/jsonschema/jsonschema-2.4.0.ebuild
index 2a22eda882982..5a0208dd20238 100644
--- a/dev-python/jsonschema/jsonschema-2.4.0.ebuild
+++ b/dev-python/jsonschema/jsonschema-2.4.0.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=(python2_7 python3_{4,5,6} pypy )
 inherit distutils-r1
 
 DESCRIPTION="An implementation of JSON-Schema validation for Python"
-HOMEPAGE="https://pypi.python.org/pypi/jsonschema"
+HOMEPAGE="https://pypi.org/project/jsonschema"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/jsonschema/jsonschema-2.5.1-r2.ebuild b/dev-python/jsonschema/jsonschema-2.5.1-r2.ebuild
index 878115565f4d7..2bc2d72d29749 100644
--- a/dev-python/jsonschema/jsonschema-2.5.1-r2.ebuild
+++ b/dev-python/jsonschema/jsonschema-2.5.1-r2.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="An implementation of JSON-Schema validation for Python"
-HOMEPAGE="https://pypi.python.org/pypi/jsonschema https://github.com/Julian/jsonschema"
+HOMEPAGE="https://pypi.org/project/jsonschema https://github.com/Julian/jsonschema"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/jsonschema/jsonschema-2.6.0.ebuild b/dev-python/jsonschema/jsonschema-2.6.0.ebuild
index 7e4697fb931ca..ceb09cf502a2f 100644
--- a/dev-python/jsonschema/jsonschema-2.6.0.ebuild
+++ b/dev-python/jsonschema/jsonschema-2.6.0.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="An implementation of JSON-Schema validation for Python"
-HOMEPAGE="https://pypi.python.org/pypi/jsonschema https://github.com/Julian/jsonschema"
+HOMEPAGE="https://pypi.org/project/jsonschema https://github.com/Julian/jsonschema"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/kafka-python/kafka-python-1.1.1.ebuild b/dev-python/kafka-python/kafka-python-1.1.1.ebuild
index 04cec8c5c343d..34d1afe7d5761 100644
--- a/dev-python/kafka-python/kafka-python-1.1.1.ebuild
+++ b/dev-python/kafka-python/kafka-python-1.1.1.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 )
 inherit distutils-r1
 
 DESCRIPTION="Kafka protocol support in Python"
-HOMEPAGE="https://github.com/dpkp/kafka-python/ https://pypi.python.org/pypi/kafka-python/"
+HOMEPAGE="https://github.com/dpkp/kafka-python/ https://pypi.org/project/kafka-python/"
 SRC_URI="https://github.com/dpkp/kafka-python/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
diff --git a/dev-python/kafka-python/kafka-python-1.2.0.ebuild b/dev-python/kafka-python/kafka-python-1.2.0.ebuild
index 04cec8c5c343d..34d1afe7d5761 100644
--- a/dev-python/kafka-python/kafka-python-1.2.0.ebuild
+++ b/dev-python/kafka-python/kafka-python-1.2.0.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 )
 inherit distutils-r1
 
 DESCRIPTION="Kafka protocol support in Python"
-HOMEPAGE="https://github.com/dpkp/kafka-python/ https://pypi.python.org/pypi/kafka-python/"
+HOMEPAGE="https://github.com/dpkp/kafka-python/ https://pypi.org/project/kafka-python/"
 SRC_URI="https://github.com/dpkp/kafka-python/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
diff --git a/dev-python/kafka-python/kafka-python-1.2.1.ebuild b/dev-python/kafka-python/kafka-python-1.2.1.ebuild
index 04cec8c5c343d..34d1afe7d5761 100644
--- a/dev-python/kafka-python/kafka-python-1.2.1.ebuild
+++ b/dev-python/kafka-python/kafka-python-1.2.1.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 )
 inherit distutils-r1
 
 DESCRIPTION="Kafka protocol support in Python"
-HOMEPAGE="https://github.com/dpkp/kafka-python/ https://pypi.python.org/pypi/kafka-python/"
+HOMEPAGE="https://github.com/dpkp/kafka-python/ https://pypi.org/project/kafka-python/"
 SRC_URI="https://github.com/dpkp/kafka-python/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
diff --git a/dev-python/kafka-python/kafka-python-1.3.3.ebuild b/dev-python/kafka-python/kafka-python-1.3.3.ebuild
index 2a07e8db3922d..14fe36231c3d1 100644
--- a/dev-python/kafka-python/kafka-python-1.3.3.ebuild
+++ b/dev-python/kafka-python/kafka-python-1.3.3.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
 inherit distutils-r1
 
 DESCRIPTION="Kafka protocol support in Python"
-HOMEPAGE="https://github.com/dpkp/kafka-python/ https://pypi.python.org/pypi/kafka-python/"
+HOMEPAGE="https://github.com/dpkp/kafka-python/ https://pypi.org/project/kafka-python/"
 SRC_URI="https://github.com/dpkp/kafka-python/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
diff --git a/dev-python/kazoo/kazoo-2.2.1.ebuild b/dev-python/kazoo/kazoo-2.2.1.ebuild
index 178fd95b55f0d..8f452e984f6ea 100644
--- a/dev-python/kazoo/kazoo-2.2.1.ebuild
+++ b/dev-python/kazoo/kazoo-2.2.1.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
 inherit distutils-r1
 
 DESCRIPTION="A high-level Python library that makes it easier to use Apache Zookeeper"
-HOMEPAGE="https://kazoo.readthedocs.org/ https://github.com/python-zk/kazoo/ https://pypi.python.org/pypi/kazoo/"
+HOMEPAGE="https://kazoo.readthedocs.org/ https://github.com/python-zk/kazoo/ https://pypi.org/project/kazoo/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
diff --git a/dev-python/keepassx/keepassx-0.1.0-r1.ebuild b/dev-python/keepassx/keepassx-0.1.0-r1.ebuild
index 21e951ccb28ef..b60292579042e 100644
--- a/dev-python/keepassx/keepassx-0.1.0-r1.ebuild
+++ b/dev-python/keepassx/keepassx-0.1.0-r1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
 inherit distutils-r1
 
 DESCRIPTION="Python API and CLI for KeePassX"
-HOMEPAGE="https://github.com/jamesls/python-keepassx https://pypi.python.org/pypi/keepassx"
+HOMEPAGE="https://github.com/jamesls/python-keepassx https://pypi.org/project/keepassx"
 SRC_URI="https://github.com/jamesls/python-keepassx/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 SLOT="0"
diff --git a/dev-python/keyczar/keyczar-0.715.ebuild b/dev-python/keyczar/keyczar-0.715.ebuild
index b0646330be91f..5d1f82dde01e8 100644
--- a/dev-python/keyczar/keyczar-0.715.ebuild
+++ b/dev-python/keyczar/keyczar-0.715.ebuild
@@ -10,7 +10,7 @@ MY_PN=python-${PN}
 MY_P=${MY_PN}-${PV}
 
 DESCRIPTION="Toolkit for safe and simple cryptography"
-HOMEPAGE="http://www.keyczar.org https://pypi.python.org/pypi/python-keyczar/"
+HOMEPAGE="http://www.keyczar.org https://pypi.org/project/python-keyczar/"
 SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0"
diff --git a/dev-python/keyrings_alt/keyrings_alt-2.3.ebuild b/dev-python/keyrings_alt/keyrings_alt-2.3.ebuild
index e36f3a6ce5351..a4a545f8b35be 100644
--- a/dev-python/keyrings_alt/keyrings_alt-2.3.ebuild
+++ b/dev-python/keyrings_alt/keyrings_alt-2.3.ebuild
@@ -11,7 +11,7 @@ MY_PN="${PN/_/.}"
 MY_P="${MY_PN}-${PV}"
 
 DESCRIPTION="Alternate keyring implementations"
-HOMEPAGE="https://github.com/jaraco/keyrings.alt https://pypi.python.org/pypi/keyrings.alt"
+HOMEPAGE="https://github.com/jaraco/keyrings.alt https://pypi.org/project/keyrings.alt"
 SRC_URI="mirror://pypi/${P:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/kid/kid-0.9.6-r1.ebuild b/dev-python/kid/kid-0.9.6-r1.ebuild
index 444e86b9ea4d3..eaa6711d673a6 100644
--- a/dev-python/kid/kid-0.9.6-r1.ebuild
+++ b/dev-python/kid/kid-0.9.6-r1.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 )
 inherit distutils-r1
 
 DESCRIPTION="A simple and Pythonic XML template language"
-HOMEPAGE="http://www.kid-templating.org/ https://pypi.python.org/pypi/kid"
+HOMEPAGE="http://www.kid-templating.org/ https://pypi.org/project/kid"
 SRC_URI="http://www.kid-templating.org/dist/${PV}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/kitchen/kitchen-1.2.4.ebuild b/dev-python/kitchen/kitchen-1.2.4.ebuild
index fdf3cb4498c81..b92d4713e91bd 100644
--- a/dev-python/kitchen/kitchen-1.2.4.ebuild
+++ b/dev-python/kitchen/kitchen-1.2.4.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5} )
 inherit distutils-r1
 
 DESCRIPTION="A cornucopia of useful code"
-HOMEPAGE="https://pypi.python.org/pypi/kitchen"
+HOMEPAGE="https://pypi.org/project/kitchen"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2+"
diff --git a/dev-python/kiwi/kiwi-1.9.39.2.ebuild b/dev-python/kiwi/kiwi-1.9.39.2.ebuild
index e12ec8eb629eb..291127fd572d9 100644
--- a/dev-python/kiwi/kiwi-1.9.39.2.ebuild
+++ b/dev-python/kiwi/kiwi-1.9.39.2.ebuild
@@ -8,7 +8,7 @@ inherit distutils-r1 versionator virtualx
 
 DESCRIPTION="Kiwi is a pure Python framework and set of enhanced PyGTK widgets"
 HOMEPAGE="https://launchpad.net/kiwi
-	https://pypi.python.org/pypi/kiwi-gtk"
+	https://pypi.org/project/kiwi-gtk"
 MY_PN="${PN}-gtk"
 MY_P="${MY_PN}-${PV}"
 SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
diff --git a/dev-python/kiwi/kiwi-1.9.40.ebuild b/dev-python/kiwi/kiwi-1.9.40.ebuild
index c033f8e0c080b..ac9eb58012461 100644
--- a/dev-python/kiwi/kiwi-1.9.40.ebuild
+++ b/dev-python/kiwi/kiwi-1.9.40.ebuild
@@ -8,7 +8,7 @@ inherit distutils-r1 versionator virtualx
 
 DESCRIPTION="Kiwi is a pure Python framework and set of enhanced PyGTK widgets"
 HOMEPAGE="https://launchpad.net/kiwi
-	https://pypi.python.org/pypi/kiwi-gtk"
+	https://pypi.org/project/kiwi-gtk"
 MY_PN="${PN}-gtk"
 MY_P="${MY_PN}-${PV}"
 SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
diff --git a/dev-python/kombu/kombu-3.0.37-r1.ebuild b/dev-python/kombu/kombu-3.0.37-r1.ebuild
index e51e0846c5ffd..e36f103e82538 100644
--- a/dev-python/kombu/kombu-3.0.37-r1.ebuild
+++ b/dev-python/kombu/kombu-3.0.37-r1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5} pypy )
 inherit distutils-r1
 
 DESCRIPTION="AMQP Messaging Framework for Python"
-HOMEPAGE="https://pypi.python.org/pypi/kombu https://github.com/celery/kombu"
+HOMEPAGE="https://pypi.org/project/kombu https://github.com/celery/kombu"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/kombu/kombu-4.1.0-r1.ebuild b/dev-python/kombu/kombu-4.1.0-r1.ebuild
index b240e572196b7..ca357e340a44e 100644
--- a/dev-python/kombu/kombu-4.1.0-r1.ebuild
+++ b/dev-python/kombu/kombu-4.1.0-r1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
 inherit distutils-r1
 
 DESCRIPTION="AMQP Messaging Framework for Python"
-HOMEPAGE="https://pypi.python.org/pypi/kombu https://github.com/celery/kombu"
+HOMEPAGE="https://pypi.org/project/kombu https://github.com/celery/kombu"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/lazy-object-proxy/lazy-object-proxy-1.2.1.ebuild b/dev-python/lazy-object-proxy/lazy-object-proxy-1.2.1.ebuild
index 7a15268839146..009b071798828 100644
--- a/dev-python/lazy-object-proxy/lazy-object-proxy-1.2.1.ebuild
+++ b/dev-python/lazy-object-proxy/lazy-object-proxy-1.2.1.ebuild
@@ -10,7 +10,7 @@ inherit distutils-r1
 DESCRIPTION="A fast and thorough lazy object proxy"
 HOMEPAGE="
 	https://github.com/ionelmc/python-lazy-object-proxy
-	https://pypi.python.org/pypi/lazy-object-proxy
+	https://pypi.org/project/lazy-object-proxy
 	https://python-lazy-object-proxy.readthedocs.org/"
 SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
diff --git a/dev-python/lazy-object-proxy/lazy-object-proxy-1.3.1.ebuild b/dev-python/lazy-object-proxy/lazy-object-proxy-1.3.1.ebuild
index dd696262ad70a..d68dc142c979f 100644
--- a/dev-python/lazy-object-proxy/lazy-object-proxy-1.3.1.ebuild
+++ b/dev-python/lazy-object-proxy/lazy-object-proxy-1.3.1.ebuild
@@ -10,7 +10,7 @@ inherit distutils-r1
 DESCRIPTION="A fast and thorough lazy object proxy"
 HOMEPAGE="
 	https://github.com/ionelmc/python-lazy-object-proxy
-	https://pypi.python.org/pypi/lazy-object-proxy
+	https://pypi.org/project/lazy-object-proxy
 	https://python-lazy-object-proxy.readthedocs.org/"
 SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
diff --git a/dev-python/ldap3/ldap3-2.2.3.ebuild b/dev-python/ldap3/ldap3-2.2.3.ebuild
index 35f3ea68309b7..d76c51791353d 100644
--- a/dev-python/ldap3/ldap3-2.2.3.ebuild
+++ b/dev-python/ldap3/ldap3-2.2.3.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="A strictly RFC 4511 conforming LDAP V3 pure Python client"
-HOMEPAGE="https://github.com/cannatag/ldap3 https://pypi.python.org/pypi/ldap3"
+HOMEPAGE="https://github.com/cannatag/ldap3 https://pypi.org/project/ldap3"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-3"
diff --git a/dev-python/lesscpy/lesscpy-0.11.1.ebuild b/dev-python/lesscpy/lesscpy-0.11.1.ebuild
index 64bd846ea7aa7..7efcdb35e3de4 100644
--- a/dev-python/lesscpy/lesscpy-0.11.1.ebuild
+++ b/dev-python/lesscpy/lesscpy-0.11.1.ebuild
@@ -10,7 +10,7 @@ inherit distutils-r1
 RESTRICT="test"
 
 DESCRIPTION="A compiler written in Python for the LESS language"
-HOMEPAGE="https://pypi.python.org/pypi/lesscpy"
+HOMEPAGE="https://pypi.org/project/lesscpy"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
diff --git a/dev-python/lesscpy/lesscpy-0.13.0.ebuild b/dev-python/lesscpy/lesscpy-0.13.0.ebuild
index fe7989aca0991..35e5966d112ea 100644
--- a/dev-python/lesscpy/lesscpy-0.13.0.ebuild
+++ b/dev-python/lesscpy/lesscpy-0.13.0.ebuild
@@ -10,7 +10,7 @@ inherit distutils-r1
 RESTRICT="test"
 
 DESCRIPTION="A compiler written in Python for the LESS language"
-HOMEPAGE="https://pypi.python.org/pypi/lesscpy"
+HOMEPAGE="https://pypi.org/project/lesscpy"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
diff --git a/dev-python/lesscpy/lesscpy-0.9j.ebuild b/dev-python/lesscpy/lesscpy-0.9j.ebuild
index 73b241fcd6050..71ceaa3dc1b60 100644
--- a/dev-python/lesscpy/lesscpy-0.9j.ebuild
+++ b/dev-python/lesscpy/lesscpy-0.9j.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 )
 inherit distutils-r1
 
 DESCRIPTION="A compiler written in Python for the LESS language"
-HOMEPAGE="https://pypi.python.org/pypi/lesscpy"
+HOMEPAGE="https://pypi.org/project/lesscpy"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
diff --git a/dev-python/libarchive-c/libarchive-c-2.7.ebuild b/dev-python/libarchive-c/libarchive-c-2.7.ebuild
index a4db4ef059b3e..93fb57955c487 100644
--- a/dev-python/libarchive-c/libarchive-c-2.7.ebuild
+++ b/dev-python/libarchive-c/libarchive-c-2.7.ebuild
@@ -5,7 +5,7 @@ EAPI=5
 PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
 inherit distutils-r1
 DESCRIPTION="A Python interface to libarchive"
-HOMEPAGE="https://github.com/Changaco/python-libarchive-c/ https://pypi.python.org/pypi/libarchive-c/"
+HOMEPAGE="https://github.com/Changaco/python-libarchive-c/ https://pypi.org/project/libarchive-c/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 LICENSE="CC0-1.0"
 SLOT="0"
diff --git a/dev-python/librharris/librharris-0.1.14-r1.ebuild b/dev-python/librharris/librharris-0.1.14-r1.ebuild
index 5543f6e9d6628..5d13b4556bdff 100644
--- a/dev-python/librharris/librharris-0.1.14-r1.ebuild
+++ b/dev-python/librharris/librharris-0.1.14-r1.ebuild
@@ -10,7 +10,7 @@ MY_PN="lib_rharris"
 MY_P="${MY_PN}-${PV}"
 
 DESCRIPTION="Python Internet Programming Library"
-HOMEPAGE="https://pypi.python.org/pypi/lib_rharris"
+HOMEPAGE="https://pypi.org/project/lib_rharris"
 SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
diff --git a/dev-python/line_profiler/line_profiler-2.0.ebuild b/dev-python/line_profiler/line_profiler-2.0.ebuild
index 48e524a993c39..cd062b32d431b 100644
--- a/dev-python/line_profiler/line_profiler-2.0.ebuild
+++ b/dev-python/line_profiler/line_profiler-2.0.ebuild
@@ -10,7 +10,7 @@ inherit distutils-r1
 DESCRIPTION="Line-by-line profiler"
 HOMEPAGE="
 	https://github.com/rkern/line_profiler
-	https://pypi.python.org/pypi/line_profiler"
+	https://pypi.org/project/line_profiler"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 KEYWORDS="~amd64"
 
diff --git a/dev-python/line_profiler/line_profiler-2.1.2.ebuild b/dev-python/line_profiler/line_profiler-2.1.2.ebuild
index e1ffa748f5013..c5fbf69f645f7 100644
--- a/dev-python/line_profiler/line_profiler-2.1.2.ebuild
+++ b/dev-python/line_profiler/line_profiler-2.1.2.ebuild
@@ -10,7 +10,7 @@ inherit distutils-r1
 DESCRIPTION="Line-by-line profiler"
 HOMEPAGE="
 	https://github.com/rkern/line_profiler
-	https://pypi.python.org/pypi/line_profiler"
+	https://pypi.org/project/line_profiler"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 KEYWORDS="~amd64"
 
diff --git a/dev-python/llfuse/llfuse-1.3.2.ebuild b/dev-python/llfuse/llfuse-1.3.2.ebuild
index 8a32b03fd7a0a..f51dd392f83b3 100644
--- a/dev-python/llfuse/llfuse-1.3.2.ebuild
+++ b/dev-python/llfuse/llfuse-1.3.2.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy{,3} )
 inherit distutils-r1
 
 DESCRIPTION="Python bindings for the low-level FUSE API"
-HOMEPAGE="https://bitbucket.org/nikratio/python-llfuse/ https://pypi.python.org/pypi/llfuse"
+HOMEPAGE="https://bitbucket.org/nikratio/python-llfuse/ https://pypi.org/project/llfuse"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.bz2"
 
 LICENSE="LGPL-2"
diff --git a/dev-python/lockfile/lockfile-0.11.0-r1.ebuild b/dev-python/lockfile/lockfile-0.11.0-r1.ebuild
index f468b85dff61e..e4e0213f18979 100644
--- a/dev-python/lockfile/lockfile-0.11.0-r1.ebuild
+++ b/dev-python/lockfile/lockfile-0.11.0-r1.ebuild
@@ -9,7 +9,7 @@ PYTHON_REQ_USE="threads(+)"
 inherit distutils-r1
 
 DESCRIPTION="Platform-independent file locking module"
-HOMEPAGE="https://launchpad.net/pylockfile https://pypi.python.org/pypi/lockfile"
+HOMEPAGE="https://launchpad.net/pylockfile https://pypi.org/project/lockfile"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/lockfile/lockfile-0.12.2-r1.ebuild b/dev-python/lockfile/lockfile-0.12.2-r1.ebuild
index 27e49b9c0d323..76f2db772ff16 100644
--- a/dev-python/lockfile/lockfile-0.12.2-r1.ebuild
+++ b/dev-python/lockfile/lockfile-0.12.2-r1.ebuild
@@ -9,7 +9,7 @@ PYTHON_REQ_USE="threads(+)"
 inherit distutils-r1
 
 DESCRIPTION="Platform-independent file locking module"
-HOMEPAGE="https://launchpad.net/pylockfile https://pypi.python.org/pypi/lockfile"
+HOMEPAGE="https://launchpad.net/pylockfile https://pypi.org/project/lockfile"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/logbook/logbook-0.9.1.ebuild b/dev-python/logbook/logbook-0.9.1.ebuild
index d19c319ad1a1a..a4b48fb2bf461 100644
--- a/dev-python/logbook/logbook-0.9.1.ebuild
+++ b/dev-python/logbook/logbook-0.9.1.ebuild
@@ -10,7 +10,7 @@ inherit distutils-r1
 DESCRIPTION="A logging replacement for Python"
 HOMEPAGE="https://logbook.readthedocs.io/en/stable/
 	https://github.com/getlogbook/logbook
-	https://pypi.python.org/pypi/Logbook"
+	https://pypi.org/project/Logbook"
 SRC_URI="https://github.com/getlogbook/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/logbook/logbook-1.1.0.ebuild b/dev-python/logbook/logbook-1.1.0.ebuild
index c1dfbe9abb354..ed0c045abf4c6 100644
--- a/dev-python/logbook/logbook-1.1.0.ebuild
+++ b/dev-python/logbook/logbook-1.1.0.ebuild
@@ -10,7 +10,7 @@ inherit distutils-r1
 DESCRIPTION="A logging replacement for Python"
 HOMEPAGE="https://logbook.readthedocs.io/en/stable/
 	https://github.com/getlogbook/logbook
-	https://pypi.python.org/pypi/Logbook"
+	https://pypi.org/project/Logbook"
 SRC_URI="https://github.com/getlogbook/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/logilab-common/logilab-common-1.2.2.ebuild b/dev-python/logilab-common/logilab-common-1.2.2.ebuild
index 09cf50af8eab3..f31be4c88a6d6 100644
--- a/dev-python/logilab-common/logilab-common-1.2.2.ebuild
+++ b/dev-python/logilab-common/logilab-common-1.2.2.ebuild
@@ -9,7 +9,7 @@ PYTHON_REQ_USE="threads(+)"
 inherit distutils-r1
 
 DESCRIPTION="Useful miscellaneous modules used by Logilab projects"
-HOMEPAGE="https://www.logilab.org/project/logilab-common https://pypi.python.org/pypi/logilab-common"
+HOMEPAGE="https://www.logilab.org/project/logilab-common https://pypi.org/project/logilab-common"
 SRC_URI="ftp://ftp.logilab.org/pub/common/${P}.tar.gz mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
diff --git a/dev-python/logilab-common/logilab-common-1.4.1.ebuild b/dev-python/logilab-common/logilab-common-1.4.1.ebuild
index b0af95a607592..7ab8c0ea087e0 100644
--- a/dev-python/logilab-common/logilab-common-1.4.1.ebuild
+++ b/dev-python/logilab-common/logilab-common-1.4.1.ebuild
@@ -9,7 +9,7 @@ PYTHON_REQ_USE="threads(+)"
 inherit distutils-r1
 
 DESCRIPTION="Useful miscellaneous modules used by Logilab projects"
-HOMEPAGE="https://www.logilab.org/project/logilab-common https://pypi.python.org/pypi/logilab-common"
+HOMEPAGE="https://www.logilab.org/project/logilab-common https://pypi.org/project/logilab-common"
 SRC_URI="ftp://ftp.logilab.org/pub/common/${P}.tar.gz mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
diff --git a/dev-python/louie/louie-1.1-r1.ebuild b/dev-python/louie/louie-1.1-r1.ebuild
index 298e6a90a071b..f503cfc6aca5f 100644
--- a/dev-python/louie/louie-1.1-r1.ebuild
+++ b/dev-python/louie/louie-1.1-r1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 )
 inherit distutils-r1
 
 DESCRIPTION="Signal dispatching mechanism for Python"
-HOMEPAGE="https://pypi.python.org/pypi/Louie"
+HOMEPAGE="https://pypi.org/project/Louie"
 SRC_URI="mirror://pypi/L/${PN^}/${P^}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/lupy/lupy-0.2.1-r2.ebuild b/dev-python/lupy/lupy-0.2.1-r2.ebuild
index 6385bf816a0de..c4d802e25f444 100644
--- a/dev-python/lupy/lupy-0.2.1-r2.ebuild
+++ b/dev-python/lupy/lupy-0.2.1-r2.ebuild
@@ -10,7 +10,7 @@ MY_PN="Lupy"
 MY_P="${MY_PN}-${PV}"
 
 DESCRIPTION="Lupy is a is a full-text indexer and search engine written in Python"
-HOMEPAGE="https://pypi.python.org/pypi/Lupy"
+HOMEPAGE="https://pypi.org/project/Lupy"
 SRC_URI="mirror://sourceforge/lupy/${MY_P}.tar.gz"
 
 LICENSE="LGPL-2.1"
diff --git a/dev-python/lxml/lxml-3.8.0.ebuild b/dev-python/lxml/lxml-3.8.0.ebuild
index 224c7a410152c..fce2d34113877 100644
--- a/dev-python/lxml/lxml-3.8.0.ebuild
+++ b/dev-python/lxml/lxml-3.8.0.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
 inherit distutils-r1 eutils flag-o-matic toolchain-funcs
 
 DESCRIPTION="A Pythonic binding for the libxml2 and libxslt libraries"
-HOMEPAGE="http://lxml.de/ https://pypi.python.org/pypi/lxml/ https://github.com/lxml/lxml"
+HOMEPAGE="http://lxml.de/ https://pypi.org/project/lxml/ https://github.com/lxml/lxml"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD ElementTree GPL-2 PSF-2"
diff --git a/dev-python/lxml/lxml-4.1.1.ebuild b/dev-python/lxml/lxml-4.1.1.ebuild
index 5bb19ed6728c7..969f73a714a42 100644
--- a/dev-python/lxml/lxml-4.1.1.ebuild
+++ b/dev-python/lxml/lxml-4.1.1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
 inherit distutils-r1 eutils flag-o-matic toolchain-funcs
 
 DESCRIPTION="A Pythonic binding for the libxml2 and libxslt libraries"
-HOMEPAGE="http://lxml.de/ https://pypi.python.org/pypi/lxml/ https://github.com/lxml/lxml"
+HOMEPAGE="http://lxml.de/ https://pypi.org/project/lxml/ https://github.com/lxml/lxml"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD ElementTree GPL-2 PSF-2"
diff --git a/dev-python/lxml/lxml-4.2.0.ebuild b/dev-python/lxml/lxml-4.2.0.ebuild
index 83ea4f6e4d8fe..de12e66e97df5 100644
--- a/dev-python/lxml/lxml-4.2.0.ebuild
+++ b/dev-python/lxml/lxml-4.2.0.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
 inherit distutils-r1 eutils toolchain-funcs
 
 DESCRIPTION="A Pythonic binding for the libxml2 and libxslt libraries"
-HOMEPAGE="http://lxml.de/ https://pypi.python.org/pypi/lxml/ https://github.com/lxml/lxml"
+HOMEPAGE="http://lxml.de/ https://pypi.org/project/lxml/ https://github.com/lxml/lxml"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD ElementTree GPL-2 PSF-2"
diff --git a/dev-python/lz4/lz4-0.10.1.ebuild b/dev-python/lz4/lz4-0.10.1.ebuild
index 3e2cd6e23b118..674622adef40c 100644
--- a/dev-python/lz4/lz4-0.10.1.ebuild
+++ b/dev-python/lz4/lz4-0.10.1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy )
 inherit distutils-r1
 
 DESCRIPTION="LZ4 Bindings for Python"
-HOMEPAGE="https://pypi.python.org/pypi/lz4 https://github.com/python-lz4/python-lz4"
+HOMEPAGE="https://pypi.org/project/lz4 https://github.com/python-lz4/python-lz4"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
diff --git a/dev-python/lz4/lz4-0.8.2.ebuild b/dev-python/lz4/lz4-0.8.2.ebuild
index b75564adfb8ee..3f4c89a25b66e 100644
--- a/dev-python/lz4/lz4-0.8.2.ebuild
+++ b/dev-python/lz4/lz4-0.8.2.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy )
 inherit distutils-r1
 
 DESCRIPTION="LZ4 Bindings for Python"
-HOMEPAGE="https://pypi.python.org/pypi/lz4 https://github.com/steeve/python-lz4"
+HOMEPAGE="https://pypi.org/project/lz4 https://github.com/steeve/python-lz4"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
diff --git a/dev-python/m2crypto/m2crypto-0.24.0.ebuild b/dev-python/m2crypto/m2crypto-0.24.0.ebuild
index 4ddfa7e334e1f..8a2d95a812ad4 100644
--- a/dev-python/m2crypto/m2crypto-0.24.0.ebuild
+++ b/dev-python/m2crypto/m2crypto-0.24.0.ebuild
@@ -11,7 +11,7 @@ inherit distutils-r1
 MY_PN="M2Crypto"
 
 DESCRIPTION="M2Crypto: A Python crypto and SSL toolkit"
-HOMEPAGE="https://gitlab.com/m2crypto/m2crypto https://pypi.python.org/pypi/M2Crypto"
+HOMEPAGE="https://gitlab.com/m2crypto/m2crypto https://pypi.org/project/M2Crypto"
 SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/m2crypto/m2crypto-0.27.0-r1.ebuild b/dev-python/m2crypto/m2crypto-0.27.0-r1.ebuild
index a1f68b64503d1..fe1440bcf30c0 100644
--- a/dev-python/m2crypto/m2crypto-0.27.0-r1.ebuild
+++ b/dev-python/m2crypto/m2crypto-0.27.0-r1.ebuild
@@ -11,7 +11,7 @@ inherit distutils-r1
 MY_PN="M2Crypto"
 
 DESCRIPTION="M2Crypto: A Python crypto and SSL toolkit"
-HOMEPAGE="https://gitlab.com/m2crypto/m2crypto https://pypi.python.org/pypi/M2Crypto"
+HOMEPAGE="https://gitlab.com/m2crypto/m2crypto https://pypi.org/project/M2Crypto"
 SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/m2crypto/m2crypto-0.27.0.ebuild b/dev-python/m2crypto/m2crypto-0.27.0.ebuild
index 498725f20c616..b4d81c3e22e8d 100644
--- a/dev-python/m2crypto/m2crypto-0.27.0.ebuild
+++ b/dev-python/m2crypto/m2crypto-0.27.0.ebuild
@@ -11,7 +11,7 @@ inherit distutils-r1
 MY_PN="M2Crypto"
 
 DESCRIPTION="M2Crypto: A Python crypto and SSL toolkit"
-HOMEPAGE="https://gitlab.com/m2crypto/m2crypto https://pypi.python.org/pypi/M2Crypto"
+HOMEPAGE="https://gitlab.com/m2crypto/m2crypto https://pypi.org/project/M2Crypto"
 SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/m2r/m2r-0.1.12.ebuild b/dev-python/m2r/m2r-0.1.12.ebuild
index 58f6cb4990c3f..5e78522670005 100644
--- a/dev-python/m2r/m2r-0.1.12.ebuild
+++ b/dev-python/m2r/m2r-0.1.12.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy)
 inherit distutils-r1
 
 DESCRIPTION="Markdown to reStructuredText converter"
-HOMEPAGE="https://github.com/miyakogi/m2r https://pypi.python.org/pypi/m2r"
+HOMEPAGE="https://github.com/miyakogi/m2r https://pypi.org/project/m2r"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/m2r/m2r-0.1.5.ebuild b/dev-python/m2r/m2r-0.1.5.ebuild
index 1766205ff45a6..e7f654f004cf0 100644
--- a/dev-python/m2r/m2r-0.1.5.ebuild
+++ b/dev-python/m2r/m2r-0.1.5.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy)
 inherit distutils-r1
 
 DESCRIPTION="Markdown to reStructuredText converter"
-HOMEPAGE="https://github.com/miyakogi/m2r https://pypi.python.org/pypi/m2r"
+HOMEPAGE="https://github.com/miyakogi/m2r https://pypi.org/project/m2r"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/m2r/m2r-0.1.6.ebuild b/dev-python/m2r/m2r-0.1.6.ebuild
index 1766205ff45a6..e7f654f004cf0 100644
--- a/dev-python/m2r/m2r-0.1.6.ebuild
+++ b/dev-python/m2r/m2r-0.1.6.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy)
 inherit distutils-r1
 
 DESCRIPTION="Markdown to reStructuredText converter"
-HOMEPAGE="https://github.com/miyakogi/m2r https://pypi.python.org/pypi/m2r"
+HOMEPAGE="https://github.com/miyakogi/m2r https://pypi.org/project/m2r"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/m2secret/m2secret-0.1.1-r1.ebuild b/dev-python/m2secret/m2secret-0.1.1-r1.ebuild
index 97a7dd4371d02..d2476abeb1ad7 100644
--- a/dev-python/m2secret/m2secret-0.1.1-r1.ebuild
+++ b/dev-python/m2secret/m2secret-0.1.1-r1.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 )
 inherit distutils-r1
 
 DESCRIPTION="Encryption and decryption module and CLI utility"
-HOMEPAGE="http://www.heikkitoivonen.net/m2secret https://pypi.python.org/pypi/m2secret"
+HOMEPAGE="http://www.heikkitoivonen.net/m2secret https://pypi.org/project/m2secret"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
diff --git a/dev-python/maintboot/maintboot-0.1.0.ebuild b/dev-python/maintboot/maintboot-0.1.0.ebuild
index 35faf8b4ac934..bb1409eac0f55 100644
--- a/dev-python/maintboot/maintboot-0.1.0.ebuild
+++ b/dev-python/maintboot/maintboot-0.1.0.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
 inherit distutils-r1
 
 DESCRIPTION="Run maintenance tasks outside the OS"
-HOMEPAGE="https://pypi.python.org/pypi/maintboot"
+HOMEPAGE="https://pypi.org/project/maintboot"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
diff --git a/dev-python/mako/mako-1.0.3.ebuild b/dev-python/mako/mako-1.0.3.ebuild
index 78f35db7bd96a..84a95c5efc4a5 100644
--- a/dev-python/mako/mako-1.0.3.ebuild
+++ b/dev-python/mako/mako-1.0.3.ebuild
@@ -11,7 +11,7 @@ MY_PN="Mako"
 MY_P=${MY_PN}-${PV}
 
 DESCRIPTION="A Python templating language"
-HOMEPAGE="http://www.makotemplates.org/ https://pypi.python.org/pypi/Mako"
+HOMEPAGE="http://www.makotemplates.org/ https://pypi.org/project/Mako"
 SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/mako/mako-1.0.6.ebuild b/dev-python/mako/mako-1.0.6.ebuild
index 0193fc476f9d2..721910b10e224 100644
--- a/dev-python/mako/mako-1.0.6.ebuild
+++ b/dev-python/mako/mako-1.0.6.ebuild
@@ -11,7 +11,7 @@ MY_PN="Mako"
 MY_P=${MY_PN}-${PV}
 
 DESCRIPTION="A Python templating language"
-HOMEPAGE="http://www.makotemplates.org/ https://pypi.python.org/pypi/Mako"
+HOMEPAGE="http://www.makotemplates.org/ https://pypi.org/project/Mako"
 SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/mantissa/mantissa-0.7.0-r1.ebuild b/dev-python/mantissa/mantissa-0.7.0-r1.ebuild
index 540ee1e0510d4..2c045b5b1ee10 100644
--- a/dev-python/mantissa/mantissa-0.7.0-r1.ebuild
+++ b/dev-python/mantissa/mantissa-0.7.0-r1.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 )
 inherit twisted-r1
 
 DESCRIPTION="An extensible, multi-protocol, multi-user, interactive application server"
-HOMEPAGE="https://github.com/twisted/mantissa https://pypi.python.org/pypi/Mantissa"
+HOMEPAGE="https://github.com/twisted/mantissa https://pypi.org/project/Mantissa"
 SRC_URI="mirror://pypi/${TWISTED_PN:0:1}/${TWISTED_PN}/${TWISTED_P}.tar.gz"
 
 KEYWORDS="amd64 x86"
diff --git a/dev-python/mantissa/mantissa-0.8.4.ebuild b/dev-python/mantissa/mantissa-0.8.4.ebuild
index cde1fc09dc08f..9e336b4890432 100644
--- a/dev-python/mantissa/mantissa-0.8.4.ebuild
+++ b/dev-python/mantissa/mantissa-0.8.4.ebuild
@@ -8,7 +8,7 @@ inherit twisted-r1
 
 MY_PN="${PN/m/M}"
 DESCRIPTION="An extensible, multi-protocol, multi-user, interactive application server"
-HOMEPAGE="https://github.com/twisted/mantissa https://pypi.python.org/pypi/Mantissa"
+HOMEPAGE="https://github.com/twisted/mantissa https://pypi.org/project/Mantissa"
 SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz"
 
 KEYWORDS="~amd64 ~x86"
diff --git a/dev-python/manuel/manuel-1.8.0.ebuild b/dev-python/manuel/manuel-1.8.0.ebuild
index 965da71f9d49d..9f7dfb38bde43 100644
--- a/dev-python/manuel/manuel-1.8.0.ebuild
+++ b/dev-python/manuel/manuel-1.8.0.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_{4,5,6}} pypy )
 inherit distutils-r1
 
 DESCRIPTION="Manuel lets you build tested documentation"
-HOMEPAGE="https://github.com/benji-york/manuel/ https://pypi.python.org/pypi/manuel"
+HOMEPAGE="https://github.com/benji-york/manuel/ https://pypi.org/project/manuel"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
diff --git a/dev-python/markdown/markdown-2.6.5.ebuild b/dev-python/markdown/markdown-2.6.5.ebuild
index 737eaccafeb04..334909bae7f28 100644
--- a/dev-python/markdown/markdown-2.6.5.ebuild
+++ b/dev-python/markdown/markdown-2.6.5.ebuild
@@ -13,7 +13,7 @@ MY_P=${MY_PN}-${PV}
 DESCRIPTION="Python implementation of the markdown markup language"
 HOMEPAGE="
 	http://www.freewisdom.org/projects/python-markdown
-	https://pypi.python.org/pypi/Markdown
+	https://pypi.org/project/Markdown
 	https://pythonhosted.org/Markdown/
 	https://github.com/waylan/Python-Markdown"
 SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
diff --git a/dev-python/markdown/markdown-2.6.8.ebuild b/dev-python/markdown/markdown-2.6.8.ebuild
index 540d1eb788d96..c33d7cbb6f887 100644
--- a/dev-python/markdown/markdown-2.6.8.ebuild
+++ b/dev-python/markdown/markdown-2.6.8.ebuild
@@ -10,7 +10,7 @@ inherit distutils-r1
 DESCRIPTION="Python implementation of the markdown markup language"
 HOMEPAGE="
 	http://www.freewisdom.org/projects/python-markdown
-	https://pypi.python.org/pypi/Markdown
+	https://pypi.org/project/Markdown
 	https://pythonhosted.org/Markdown/
 	https://github.com/waylan/Python-Markdown"
 SRC_URI="mirror://pypi/M/${PN^}/${P^}.tar.gz"
diff --git a/dev-python/markdown/markdown-2.6.9.ebuild b/dev-python/markdown/markdown-2.6.9.ebuild
index f30420fc6e3c7..0e72a636e7b01 100644
--- a/dev-python/markdown/markdown-2.6.9.ebuild
+++ b/dev-python/markdown/markdown-2.6.9.ebuild
@@ -10,7 +10,7 @@ inherit distutils-r1
 DESCRIPTION="Python implementation of the markdown markup language"
 HOMEPAGE="
 	http://www.freewisdom.org/projects/python-markdown
-	https://pypi.python.org/pypi/Markdown
+	https://pypi.org/project/Markdown
 	https://pythonhosted.org/Markdown/
 	https://github.com/waylan/Python-Markdown"
 SRC_URI="mirror://pypi/M/${PN^}/${P^}.tar.gz"
diff --git a/dev-python/markups/markups-2.0.0.ebuild b/dev-python/markups/markups-2.0.0.ebuild
index fc0fe30f1e8cf..085c15605a742 100644
--- a/dev-python/markups/markups-2.0.0.ebuild
+++ b/dev-python/markups/markups-2.0.0.ebuild
@@ -14,7 +14,7 @@ DESCRIPTION="A wrapper around various text markups"
 HOMEPAGE="
 	http://pythonhosted.org/Markups/
 	https://github.com/retext-project/pymarkups
-	https://pypi.python.org/pypi/Markups"
+	https://pypi.org/project/Markups"
 SRC_URI="mirror://pypi/M/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/markupsafe/markupsafe-0.23.ebuild b/dev-python/markupsafe/markupsafe-0.23.ebuild
index f9f0a98c2345c..c2450e92a50f5 100644
--- a/dev-python/markupsafe/markupsafe-0.23.ebuild
+++ b/dev-python/markupsafe/markupsafe-0.23.ebuild
@@ -11,7 +11,7 @@ MY_PN="MarkupSafe"
 MY_P="${MY_PN}-${PV}"
 
 DESCRIPTION="Implements a XML/HTML/XHTML Markup safe string for Python"
-HOMEPAGE="https://pypi.python.org/pypi/MarkupSafe"
+HOMEPAGE="https://pypi.org/project/MarkupSafe"
 SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/maybe/maybe-0.3.0.ebuild b/dev-python/maybe/maybe-0.3.0.ebuild
index e43b5cb247440..50e461b91ede1 100644
--- a/dev-python/maybe/maybe-0.3.0.ebuild
+++ b/dev-python/maybe/maybe-0.3.0.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_{4,5}} )
 inherit distutils-r1
 
 DESCRIPTION="See what a program does before deciding whether you really want it to happen"
-HOMEPAGE="https://github.com/p-e-w/maybe http://pypi.python.org/pypi/maybe"
+HOMEPAGE="https://github.com/p-e-w/maybe http://pypi.org/project/maybe"
 SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
diff --git a/dev-python/maybe/maybe-0.4.0.ebuild b/dev-python/maybe/maybe-0.4.0.ebuild
index bdc5651f4a046..1754833545039 100644
--- a/dev-python/maybe/maybe-0.4.0.ebuild
+++ b/dev-python/maybe/maybe-0.4.0.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_{4,5}} )
 inherit distutils-r1
 
 DESCRIPTION="See what a program does before deciding whether you really want it to happen"
-HOMEPAGE="https://github.com/p-e-w/maybe http://pypi.python.org/pypi/maybe"
+HOMEPAGE="https://github.com/p-e-w/maybe http://pypi.org/project/maybe"
 SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
diff --git a/dev-python/mechanize/mechanize-0.2.5-r1.ebuild b/dev-python/mechanize/mechanize-0.2.5-r1.ebuild
index 4f730a62ff225..afaf6ff310f14 100644
--- a/dev-python/mechanize/mechanize-0.2.5-r1.ebuild
+++ b/dev-python/mechanize/mechanize-0.2.5-r1.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 pypy )
 inherit distutils-r1
 
 DESCRIPTION="Stateful programmatic web browsing in Python"
-HOMEPAGE="http://wwwsearch.sourceforge.net/mechanize/ https://pypi.python.org/pypi/mechanize"
+HOMEPAGE="http://wwwsearch.sourceforge.net/mechanize/ https://pypi.org/project/mechanize"
 SRC_URI="http://wwwsearch.sourceforge.net/${PN}/src/${P}.tar.gz"
 
 LICENSE="|| ( BSD ZPL )"
diff --git a/dev-python/medusa/medusa-0.5.4-r1.ebuild b/dev-python/medusa/medusa-0.5.4-r1.ebuild
index 9c4e3064c7214..fdebe9119efdd 100644
--- a/dev-python/medusa/medusa-0.5.4-r1.ebuild
+++ b/dev-python/medusa/medusa-0.5.4-r1.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 pypy )
 inherit distutils-r1
 
 DESCRIPTION="A framework for writing asynchronous long-running, high-performance network servers in Python"
-HOMEPAGE="http://www.amk.ca/python/code/medusa.html https://pypi.python.org/pypi/medusa"
+HOMEPAGE="http://www.amk.ca/python/code/medusa.html https://pypi.org/project/medusa"
 SRC_URI="http://www.amk.ca/files/python/${P}.tar.gz"
 
 LICENSE="PSF-2"
diff --git a/dev-python/meld3/meld3-1.0.2-r1.ebuild b/dev-python/meld3/meld3-1.0.2-r1.ebuild
index 52b56384968f9..422fd46f91d4d 100644
--- a/dev-python/meld3/meld3-1.0.2-r1.ebuild
+++ b/dev-python/meld3/meld3-1.0.2-r1.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5} pypy )
 inherit distutils-r1
 
 DESCRIPTION="meld3 is an HTML/XML templating engine"
-HOMEPAGE="https://github.com/supervisor/meld3 https://pypi.python.org/pypi/meld3"
+HOMEPAGE="https://github.com/supervisor/meld3 https://pypi.org/project/meld3"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="repoze"
diff --git a/dev-python/mem_top/mem_top-0.1.6.ebuild b/dev-python/mem_top/mem_top-0.1.6.ebuild
index 86128e13eb2ef..2fe232adce8ca 100644
--- a/dev-python/mem_top/mem_top-0.1.6.ebuild
+++ b/dev-python/mem_top/mem_top-0.1.6.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
 inherit distutils-r1
 
 DESCRIPTION="Shows top suspects for memory leaks in your Python program"
-HOMEPAGE="https://github.com/denis-ryzhkov/mem_top https://pypi.python.org/pypi/mem_top"
+HOMEPAGE="https://github.com/denis-ryzhkov/mem_top https://pypi.org/project/mem_top"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 LICENSE="MIT"
 SLOT="0"
diff --git a/dev-python/memory_profiler/memory_profiler-0.47.ebuild b/dev-python/memory_profiler/memory_profiler-0.47.ebuild
index 046f424b099d4..7efdfc3401261 100644
--- a/dev-python/memory_profiler/memory_profiler-0.47.ebuild
+++ b/dev-python/memory_profiler/memory_profiler-0.47.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
 inherit distutils-r1
 
 DESCRIPTION="A module for monitoring memory usage of a python program"
-HOMEPAGE="https://pypi.python.org/pypi/memory_profiler https://github.com/fabianp/memory_profiler"
+HOMEPAGE="https://pypi.org/project/memory_profiler https://github.com/fabianp/memory_profiler"
 SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/meteor-ejson/meteor-ejson-1.1.0.ebuild b/dev-python/meteor-ejson/meteor-ejson-1.1.0.ebuild
index ee378091c7e45..3cbffc84a00e3 100644
--- a/dev-python/meteor-ejson/meteor-ejson-1.1.0.ebuild
+++ b/dev-python/meteor-ejson/meteor-ejson-1.1.0.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5} )
 inherit distutils-r1
 
 DESCRIPTION="Encoder and Decoder for Extended JSON (EJSON) as used in Meteor and DDP"
-HOMEPAGE="https://pypi.python.org/pypi/meteor-ejson https://github.com/lyschoening/meteor-ejson-python"
+HOMEPAGE="https://pypi.org/project/meteor-ejson https://github.com/lyschoening/meteor-ejson-python"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
diff --git a/dev-python/mimerender/mimerender-0.6.0.ebuild b/dev-python/mimerender/mimerender-0.6.0.ebuild
index b8beb41045d6f..a05d3de4ff378 100644
--- a/dev-python/mimerender/mimerender-0.6.0.ebuild
+++ b/dev-python/mimerender/mimerender-0.6.0.ebuild
@@ -8,7 +8,7 @@ inherit distutils-r1
 
 DESCRIPTION="RESTful HTTP Content Negotiation for Flask, Bottle, web.py and webapp2"
 SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-HOMEPAGE="https://pypi.python.org/pypi/mimerender"
+HOMEPAGE="https://pypi.org/project/mimerender"
 
 LICENSE="BSD"
 SLOT="0"
diff --git a/dev-python/minimock/minimock-1.2.8-r1.ebuild b/dev-python/minimock/minimock-1.2.8-r1.ebuild
index e35d075291cfd..aecf9a2a0d814 100644
--- a/dev-python/minimock/minimock-1.2.8-r1.ebuild
+++ b/dev-python/minimock/minimock-1.2.8-r1.ebuild
@@ -10,7 +10,7 @@ MY_PN="MiniMock"
 MY_P="${MY_PN}-${PV}"
 
 DESCRIPTION="The simplest possible mock library"
-HOMEPAGE="https://pypi.python.org/pypi/MiniMock"
+HOMEPAGE="https://pypi.org/project/MiniMock"
 SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/mistune/mistune-0.7.2.ebuild b/dev-python/mistune/mistune-0.7.2.ebuild
index ef9e8215f3a36..c820f81f9be2d 100644
--- a/dev-python/mistune/mistune-0.7.2.ebuild
+++ b/dev-python/mistune/mistune-0.7.2.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="The fastest markdown parser in pure Python"
-HOMEPAGE="https://pypi.python.org/pypi/mistune https://github.com/lepture/mistune"
+HOMEPAGE="https://pypi.org/project/mistune https://github.com/lepture/mistune"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
diff --git a/dev-python/mistune/mistune-0.7.4.ebuild b/dev-python/mistune/mistune-0.7.4.ebuild
index 902ae2b7bd4bc..aeb63984e11be 100644
--- a/dev-python/mistune/mistune-0.7.4.ebuild
+++ b/dev-python/mistune/mistune-0.7.4.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="The fastest markdown parser in pure Python"
-HOMEPAGE="https://pypi.python.org/pypi/mistune https://github.com/lepture/mistune"
+HOMEPAGE="https://pypi.org/project/mistune https://github.com/lepture/mistune"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
diff --git a/dev-python/mmh3/mmh3-2.3.1.ebuild b/dev-python/mmh3/mmh3-2.3.1.ebuild
index c2c33078dcce0..f6a4c9722004e 100644
--- a/dev-python/mmh3/mmh3-2.3.1.ebuild
+++ b/dev-python/mmh3/mmh3-2.3.1.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5} )
 inherit distutils-r1
 
 DESCRIPTION="Python library for MurmurHash3, fast and robust hash functions."
-HOMEPAGE="https://pypi.python.org/pypi/mmh3"
+HOMEPAGE="https://pypi.org/project/mmh3"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="public-domain"
diff --git a/dev-python/mock/mock-1.0.1-r2.ebuild b/dev-python/mock/mock-1.0.1-r2.ebuild
index 80dac069dc75c..089fd9b90ce2a 100644
--- a/dev-python/mock/mock-1.0.1-r2.ebuild
+++ b/dev-python/mock/mock-1.0.1-r2.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="A Python Mocking and Patching Library for Testing"
-HOMEPAGE="http://www.voidspace.org.uk/python/mock/ https://pypi.python.org/pypi/mock"
+HOMEPAGE="http://www.voidspace.org.uk/python/mock/ https://pypi.org/project/mock"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/mocker/mocker-1.1.1-r1.ebuild b/dev-python/mocker/mocker-1.1.1-r1.ebuild
index 634d1f874b729..0248cfb70a49c 100644
--- a/dev-python/mocker/mocker-1.1.1-r1.ebuild
+++ b/dev-python/mocker/mocker-1.1.1-r1.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 pypy )
 inherit distutils-r1
 
 DESCRIPTION="Platform for Python test doubles: mocks, stubs, fakes, and dummies"
-HOMEPAGE="http://labix.org/mocker https://pypi.python.org/pypi/mocker"
+HOMEPAGE="http://labix.org/mocker https://pypi.org/project/mocker"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.bz2"
 
 LICENSE="BSD"
diff --git a/dev-python/mockldap/mockldap-0.2.3.ebuild b/dev-python/mockldap/mockldap-0.2.3.ebuild
index 757840f26170f..7423bba8ff0ac 100644
--- a/dev-python/mockldap/mockldap-0.2.3.ebuild
+++ b/dev-python/mockldap/mockldap-0.2.3.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 pypy )
 inherit distutils-r1 eutils
 
 DESCRIPTION="A simple mock implementation of python-ldap"
-HOMEPAGE="https://bitbucket.org/psagers/mockldap/ https://pypi.python.org/pypi/mockldap"
+HOMEPAGE="https://bitbucket.org/psagers/mockldap/ https://pypi.org/project/mockldap"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/mockldap/mockldap-0.2.6.ebuild b/dev-python/mockldap/mockldap-0.2.6.ebuild
index 73665424de59a..1b9498d2cf208 100644
--- a/dev-python/mockldap/mockldap-0.2.6.ebuild
+++ b/dev-python/mockldap/mockldap-0.2.6.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
 inherit distutils-r1 eutils
 
 DESCRIPTION="A simple mock implementation of python-ldap"
-HOMEPAGE="https://bitbucket.org/psagers/mockldap/ https://pypi.python.org/pypi/mockldap"
+HOMEPAGE="https://bitbucket.org/psagers/mockldap/ https://pypi.org/project/mockldap"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/morbid/morbid-0.8.7.3-r1.ebuild b/dev-python/morbid/morbid-0.8.7.3-r1.ebuild
index 7a7b5e72ddfac..fa8fe9956f49a 100644
--- a/dev-python/morbid/morbid-0.8.7.3-r1.ebuild
+++ b/dev-python/morbid/morbid-0.8.7.3-r1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 )
 inherit distutils-r1
 
 DESCRIPTION="A Twisted-based publish/subscribe messaging server that uses the STOMP protocol"
-HOMEPAGE="https://pypi.python.org/pypi/morbid"
+HOMEPAGE="https://pypi.org/project/morbid"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/more-itertools/more-itertools-3.0.0.ebuild b/dev-python/more-itertools/more-itertools-3.0.0.ebuild
index 55a44f00d6a9e..94db710e4d76d 100644
--- a/dev-python/more-itertools/more-itertools-3.0.0.ebuild
+++ b/dev-python/more-itertools/more-itertools-3.0.0.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python{2_7,3_{4,5,6}} pypy{,3} )
 inherit distutils-r1
 
 DESCRIPTION="More routines for operating on iterables, beyond itertools"
-HOMEPAGE="https://pypi.python.org/pypi/more-itertools"
+HOMEPAGE="https://pypi.org/project/more-itertools"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/mox/mox-0.5.3-r1.ebuild b/dev-python/mox/mox-0.5.3-r1.ebuild
index 5a83898fa8824..4fc5a09701acb 100644
--- a/dev-python/mox/mox-0.5.3-r1.ebuild
+++ b/dev-python/mox/mox-0.5.3-r1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 )
 inherit distutils-r1
 
 DESCRIPTION="A mock object framework for Python, loosely based on EasyMock for Java"
-HOMEPAGE="https://pypi.python.org/pypi/mox"
+HOMEPAGE="https://pypi.org/project/mox"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
diff --git a/dev-python/mpi4py/mpi4py-2.0.0.ebuild b/dev-python/mpi4py/mpi4py-2.0.0.ebuild
index f9ce3a4bae002..076e4f21c48fb 100644
--- a/dev-python/mpi4py/mpi4py-2.0.0.ebuild
+++ b/dev-python/mpi4py/mpi4py-2.0.0.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
 inherit distutils-r1
 
 DESCRIPTION="Message Passing Interface for Python"
-HOMEPAGE="https://bitbucket.org/mpi4py/ https://pypi.python.org/pypi/mpi4py"
+HOMEPAGE="https://bitbucket.org/mpi4py/ https://pypi.org/project/mpi4py"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/mpi4py/mpi4py-3.0.0.ebuild b/dev-python/mpi4py/mpi4py-3.0.0.ebuild
index 40d15c5ad74a3..ce8971862e3df 100644
--- a/dev-python/mpi4py/mpi4py-3.0.0.ebuild
+++ b/dev-python/mpi4py/mpi4py-3.0.0.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
 inherit distutils-r1
 
 DESCRIPTION="Message Passing Interface for Python"
-HOMEPAGE="https://bitbucket.org/mpi4py/ https://pypi.python.org/pypi/mpi4py"
+HOMEPAGE="https://bitbucket.org/mpi4py/ https://pypi.org/project/mpi4py"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/msgpack/msgpack-0.4.8.ebuild b/dev-python/msgpack/msgpack-0.4.8.ebuild
index d0d2cb0f53266..b0ba22bb6e057 100644
--- a/dev-python/msgpack/msgpack-0.4.8.ebuild
+++ b/dev-python/msgpack/msgpack-0.4.8.ebuild
@@ -12,7 +12,7 @@ MY_P="${MY_PN}-${PV}"
 DESCRIPTION="MessagePack (de)serializer for Python"
 HOMEPAGE="https://msgpack.org
 	https://github.com/msgpack/msgpack-python/
-	https://pypi.python.org/pypi/msgpack-python/"
+	https://pypi.org/project/msgpack-python/"
 SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0"
diff --git a/dev-python/msgpack/msgpack-0.5.1.ebuild b/dev-python/msgpack/msgpack-0.5.1.ebuild
index 2d29ace7e2ca8..73c9c38efe449 100644
--- a/dev-python/msgpack/msgpack-0.5.1.ebuild
+++ b/dev-python/msgpack/msgpack-0.5.1.ebuild
@@ -12,7 +12,7 @@ MY_P="${MY_PN}-${PV}"
 DESCRIPTION="MessagePack (de)serializer for Python"
 HOMEPAGE="https://msgpack.org
 	https://github.com/msgpack/msgpack-python/
-	https://pypi.python.org/pypi/msgpack-python/"
+	https://pypi.org/project/msgpack-python/"
 SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0"
diff --git a/dev-python/msgpack/msgpack-0.5.6.ebuild b/dev-python/msgpack/msgpack-0.5.6.ebuild
index 65965709753a2..74000584eb74c 100644
--- a/dev-python/msgpack/msgpack-0.5.6.ebuild
+++ b/dev-python/msgpack/msgpack-0.5.6.ebuild
@@ -9,7 +9,7 @@ inherit distutils-r1
 DESCRIPTION="MessagePack (de)serializer for Python"
 HOMEPAGE="https://msgpack.org
 	https://github.com/msgpack/msgpack-python/
-	https://pypi.python.org/pypi/msgpack/"
+	https://pypi.org/project/msgpack/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
diff --git a/dev-python/munkres/munkres-1.0.12.ebuild b/dev-python/munkres/munkres-1.0.12.ebuild
index aa28278832663..7180da29b0dd1 100644
--- a/dev-python/munkres/munkres-1.0.12.ebuild
+++ b/dev-python/munkres/munkres-1.0.12.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
 inherit distutils-r1
 
 DESCRIPTION="Module implementing munkres algorithm for the Assignment Problem"
-HOMEPAGE="https://pypi.python.org/pypi/munkres/"
+HOMEPAGE="https://pypi.org/project/munkres/"
 SRC_URI="https://github.com/bmc/munkres/archive/release-${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/munkres/munkres-1.0.5.4-r2.ebuild b/dev-python/munkres/munkres-1.0.5.4-r2.ebuild
index 6435ca693789b..c7d6bc0d8b59f 100644
--- a/dev-python/munkres/munkres-1.0.5.4-r2.ebuild
+++ b/dev-python/munkres/munkres-1.0.5.4-r2.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 )
 inherit distutils-r1
 
 DESCRIPTION="Module implementing munkres algorithm for the Assignment Problem"
-HOMEPAGE="https://pypi.python.org/pypi/munkres/"
+HOMEPAGE="https://pypi.org/project/munkres/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/munkres/munkres-1.0.8.ebuild b/dev-python/munkres/munkres-1.0.8.ebuild
index 7e17d8551f473..9c2543a962c1e 100644
--- a/dev-python/munkres/munkres-1.0.8.ebuild
+++ b/dev-python/munkres/munkres-1.0.8.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
 inherit distutils-r1
 
 DESCRIPTION="Module implementing munkres algorithm for the Assignment Problem"
-HOMEPAGE="https://pypi.python.org/pypi/munkres/"
+HOMEPAGE="https://pypi.org/project/munkres/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/mwlib-ext/mwlib-ext-0.13.2.ebuild b/dev-python/mwlib-ext/mwlib-ext-0.13.2.ebuild
index 6aa2127e6e65a..517b46b8df5e1 100644
--- a/dev-python/mwlib-ext/mwlib-ext-0.13.2.ebuild
+++ b/dev-python/mwlib-ext/mwlib-ext-0.13.2.ebuild
@@ -11,7 +11,7 @@ MY_PN="${PN/-/.}"
 MY_P="${MY_PN}-${PV}"
 
 DESCRIPTION="Extension module to mwlib to pull in reportlab"
-HOMEPAGE="http://code.pediapress.com/wiki/wiki https://pypi.python.org/pypi/mwlib.ext"
+HOMEPAGE="http://code.pediapress.com/wiki/wiki https://pypi.org/project/mwlib.ext"
 SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.zip"
 
 LICENSE="BSD"
diff --git a/dev-python/myghty/myghty-1.2-r1.ebuild b/dev-python/myghty/myghty-1.2-r1.ebuild
index 1d633cf776770..ee1fc90edb7ca 100644
--- a/dev-python/myghty/myghty-1.2-r1.ebuild
+++ b/dev-python/myghty/myghty-1.2-r1.ebuild
@@ -11,7 +11,7 @@ MY_PN="Myghty"
 MY_P="${MY_PN}-${PV}"
 
 DESCRIPTION="Template and view-controller framework derived from HTML::Mason"
-HOMEPAGE="http://www.myghty.org/ https://pypi.python.org/pypi/Myghty"
+HOMEPAGE="http://www.myghty.org/ https://pypi.org/project/Myghty"
 SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/myghtyutils/myghtyutils-0.52-r1.ebuild b/dev-python/myghtyutils/myghtyutils-0.52-r1.ebuild
index 0157c0a8a8b7c..1b813f6593e95 100644
--- a/dev-python/myghtyutils/myghtyutils-0.52-r1.ebuild
+++ b/dev-python/myghtyutils/myghtyutils-0.52-r1.ebuild
@@ -10,7 +10,7 @@ MY_PN="MyghtyUtils"
 MY_P=${MY_PN}-${PV}
 
 DESCRIPTION="Set of utility classes used by Myghty templating"
-HOMEPAGE="http://www.myghty.org https://pypi.python.org/pypi/MyghtyUtils"
+HOMEPAGE="http://www.myghty.org https://pypi.org/project/MyghtyUtils"
 SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.zip"
 
 LICENSE="MIT"
diff --git a/dev-python/mysql-python/mysql-python-1.2.3-r1.ebuild b/dev-python/mysql-python/mysql-python-1.2.3-r1.ebuild
index cf5c8f6465b00..0da0e240f1fe9 100644
--- a/dev-python/mysql-python/mysql-python-1.2.3-r1.ebuild
+++ b/dev-python/mysql-python/mysql-python-1.2.3-r1.ebuild
@@ -9,7 +9,7 @@ inherit distutils-r1 flag-o-matic
 MY_P="MySQL-python-${PV}"
 
 DESCRIPTION="Python interface to MySQL"
-HOMEPAGE="https://sourceforge.net/projects/mysql-python/ https://pypi.python.org/pypi/MySQL-python"
+HOMEPAGE="https://sourceforge.net/projects/mysql-python/ https://pypi.org/project/MySQL-python"
 SRC_URI="mirror://sourceforge/mysql-python/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
diff --git a/dev-python/mysql-python/mysql-python-1.2.5-r1.ebuild b/dev-python/mysql-python/mysql-python-1.2.5-r1.ebuild
index 1abfb12732c63..a9dc7da6a74af 100644
--- a/dev-python/mysql-python/mysql-python-1.2.5-r1.ebuild
+++ b/dev-python/mysql-python/mysql-python-1.2.5-r1.ebuild
@@ -11,7 +11,7 @@ MY_PN="MySQL-python"
 MY_P="${MY_PN}-${PV}"
 
 DESCRIPTION="Python interface to MySQL"
-HOMEPAGE="https://sourceforge.net/projects/mysql-python/ https://pypi.python.org/pypi/MySQL-python"
+HOMEPAGE="https://sourceforge.net/projects/mysql-python/ https://pypi.org/project/MySQL-python"
 SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.zip"
 
 LICENSE="GPL-2"
diff --git a/dev-python/mysqlclient/mysqlclient-1.3.12.ebuild b/dev-python/mysqlclient/mysqlclient-1.3.12.ebuild
index 5246b1ba5d406..90e4ee18eb5c8 100644
--- a/dev-python/mysqlclient/mysqlclient-1.3.12.ebuild
+++ b/dev-python/mysqlclient/mysqlclient-1.3.12.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
 inherit distutils-r1
 
 DESCRIPTION="Fork of MySQL-python"
-HOMEPAGE="https://pypi.python.org/pypi/mysqlclient/ https://github.com/PyMySQL/mysqlclient-python"
+HOMEPAGE="https://pypi.org/project/mysqlclient/ https://github.com/PyMySQL/mysqlclient-python"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
diff --git a/dev-python/nagiosplugin/nagiosplugin-1.2.3.ebuild b/dev-python/nagiosplugin/nagiosplugin-1.2.3.ebuild
index 26aaa8152d01a..4b912f0d2fd08 100644
--- a/dev-python/nagiosplugin/nagiosplugin-1.2.3.ebuild
+++ b/dev-python/nagiosplugin/nagiosplugin-1.2.3.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5} pypy )
 inherit distutils-r1
 
 DESCRIPTION="A class library for writing nagios-compatible plugins"
-HOMEPAGE="https://bitbucket.org/flyingcircus/nagiosplugin/ https://pypi.python.org/pypi/nagiosplugin/"
+HOMEPAGE="https://bitbucket.org/flyingcircus/nagiosplugin/ https://pypi.org/project/nagiosplugin/"
 if [[ ${PV} == "9999" ]] ; then
 	inherit mercurial
 	EHG_REPO_URI="https://bitbucket.org/flyingcircus/nagiosplugin/"
diff --git a/dev-python/nagiosplugin/nagiosplugin-1.2.4.ebuild b/dev-python/nagiosplugin/nagiosplugin-1.2.4.ebuild
index a6126533b5142..f909c5fa1ca36 100644
--- a/dev-python/nagiosplugin/nagiosplugin-1.2.4.ebuild
+++ b/dev-python/nagiosplugin/nagiosplugin-1.2.4.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5} pypy )
 inherit distutils-r1
 
 DESCRIPTION="A class library for writing nagios-compatible plugins"
-HOMEPAGE="https://bitbucket.org/flyingcircus/nagiosplugin/ https://pypi.python.org/pypi/nagiosplugin/"
+HOMEPAGE="https://bitbucket.org/flyingcircus/nagiosplugin/ https://pypi.org/project/nagiosplugin/"
 if [[ ${PV} == "9999" ]] ; then
 	inherit mercurial
 	EHG_REPO_URI="https://bitbucket.org/flyingcircus/nagiosplugin/"
diff --git a/dev-python/natsort/natsort-4.0.4.ebuild b/dev-python/natsort/natsort-4.0.4.ebuild
index 485781b48a501..94d5d1d39638c 100644
--- a/dev-python/natsort/natsort-4.0.4.ebuild
+++ b/dev-python/natsort/natsort-4.0.4.ebuild
@@ -10,7 +10,7 @@ RESTRICT="test"
 inherit distutils-r1
 
 DESCRIPTION="Natural sorting for Python"
-HOMEPAGE="https://pypi.python.org/pypi/natsort"
+HOMEPAGE="https://pypi.org/project/natsort"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/ndg-httpsclient/ndg-httpsclient-0.4.0.ebuild b/dev-python/ndg-httpsclient/ndg-httpsclient-0.4.0.ebuild
index 64649d378fad4..2a11a4e6294eb 100644
--- a/dev-python/ndg-httpsclient/ndg-httpsclient-0.4.0.ebuild
+++ b/dev-python/ndg-httpsclient/ndg-httpsclient-0.4.0.ebuild
@@ -10,7 +10,7 @@ inherit distutils-r1
 DESCRIPTION="Provides enhanced HTTPS support for httplib and urllib2 using PyOpenSSL"
 HOMEPAGE="
 	https://github.com/cedadev/ndg_httpsclient/
-	https://pypi.python.org/pypi/ndg-httpsclient"
+	https://pypi.org/project/ndg-httpsclient"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P/-/_}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/ndg-httpsclient/ndg-httpsclient-0.4.2-r1.ebuild b/dev-python/ndg-httpsclient/ndg-httpsclient-0.4.2-r1.ebuild
index d4f272ba1c676..a142c0a16b0e1 100644
--- a/dev-python/ndg-httpsclient/ndg-httpsclient-0.4.2-r1.ebuild
+++ b/dev-python/ndg-httpsclient/ndg-httpsclient-0.4.2-r1.ebuild
@@ -10,7 +10,7 @@ inherit distutils-r1
 DESCRIPTION="Provides enhanced HTTPS support for httplib and urllib2 using PyOpenSSL"
 HOMEPAGE="
 	https://github.com/cedadev/ndg_httpsclient/
-	https://pypi.python.org/pypi/ndg-httpsclient"
+	https://pypi.org/project/ndg-httpsclient"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P/-/_}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/netaddr/netaddr-0.7.12.ebuild b/dev-python/netaddr/netaddr-0.7.12.ebuild
index ff7f10be8cbf7..ae8c0c1bd6806 100644
--- a/dev-python/netaddr/netaddr-0.7.12.ebuild
+++ b/dev-python/netaddr/netaddr-0.7.12.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python{2_7,3_4} )
 inherit distutils-r1
 
 DESCRIPTION="Network address representation and manipulation library"
-HOMEPAGE="https://github.com/drkjam/netaddr https://pypi.python.org/pypi/netaddr"
+HOMEPAGE="https://github.com/drkjam/netaddr https://pypi.org/project/netaddr"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/netaddr/netaddr-0.7.13.ebuild b/dev-python/netaddr/netaddr-0.7.13.ebuild
index 743661b49cdc7..908ab660ef37f 100644
--- a/dev-python/netaddr/netaddr-0.7.13.ebuild
+++ b/dev-python/netaddr/netaddr-0.7.13.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_4 )
 inherit distutils-r1
 
 DESCRIPTION="Network address representation and manipulation library"
-HOMEPAGE="https://github.com/drkjam/netaddr https://pypi.python.org/pypi/netaddr"
+HOMEPAGE="https://github.com/drkjam/netaddr https://pypi.org/project/netaddr"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/netaddr/netaddr-0.7.14.ebuild b/dev-python/netaddr/netaddr-0.7.14.ebuild
index 743661b49cdc7..908ab660ef37f 100644
--- a/dev-python/netaddr/netaddr-0.7.14.ebuild
+++ b/dev-python/netaddr/netaddr-0.7.14.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_4 )
 inherit distutils-r1
 
 DESCRIPTION="Network address representation and manipulation library"
-HOMEPAGE="https://github.com/drkjam/netaddr https://pypi.python.org/pypi/netaddr"
+HOMEPAGE="https://github.com/drkjam/netaddr https://pypi.org/project/netaddr"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/netaddr/netaddr-0.7.15.ebuild b/dev-python/netaddr/netaddr-0.7.15.ebuild
index 41c876d8a2bd3..db4a9eacff540 100644
--- a/dev-python/netaddr/netaddr-0.7.15.ebuild
+++ b/dev-python/netaddr/netaddr-0.7.15.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_4 )
 inherit distutils-r1
 
 DESCRIPTION="Network address representation and manipulation library"
-HOMEPAGE="https://github.com/drkjam/netaddr https://pypi.python.org/pypi/netaddr"
+HOMEPAGE="https://github.com/drkjam/netaddr https://pypi.org/project/netaddr"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/netaddr/netaddr-0.7.17.ebuild b/dev-python/netaddr/netaddr-0.7.17.ebuild
index 3ecb9948967f5..7bd6a46628044 100644
--- a/dev-python/netaddr/netaddr-0.7.17.ebuild
+++ b/dev-python/netaddr/netaddr-0.7.17.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_4 )
 inherit distutils-r1
 
 DESCRIPTION="Network address representation and manipulation library"
-HOMEPAGE="https://github.com/drkjam/netaddr https://pypi.python.org/pypi/netaddr https://netaddr.readthedocs.org"
+HOMEPAGE="https://github.com/drkjam/netaddr https://pypi.org/project/netaddr https://netaddr.readthedocs.org"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/netaddr/netaddr-0.7.18.ebuild b/dev-python/netaddr/netaddr-0.7.18.ebuild
index 26d065c0e62e7..11383cd75de83 100644
--- a/dev-python/netaddr/netaddr-0.7.18.ebuild
+++ b/dev-python/netaddr/netaddr-0.7.18.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
 inherit distutils-r1
 
 DESCRIPTION="Network address representation and manipulation library"
-HOMEPAGE="https://github.com/drkjam/netaddr https://pypi.python.org/pypi/netaddr https://netaddr.readthedocs.org"
+HOMEPAGE="https://github.com/drkjam/netaddr https://pypi.org/project/netaddr https://netaddr.readthedocs.org"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/netaddr/netaddr-0.7.19.ebuild b/dev-python/netaddr/netaddr-0.7.19.ebuild
index ef37de34d901f..592112ae62d5f 100644
--- a/dev-python/netaddr/netaddr-0.7.19.ebuild
+++ b/dev-python/netaddr/netaddr-0.7.19.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
 inherit distutils-r1
 
 DESCRIPTION="Network address representation and manipulation library"
-HOMEPAGE="https://github.com/drkjam/netaddr https://pypi.python.org/pypi/netaddr https://netaddr.readthedocs.org"
+HOMEPAGE="https://github.com/drkjam/netaddr https://pypi.org/project/netaddr https://netaddr.readthedocs.org"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/netifaces/netifaces-0.10.6.ebuild b/dev-python/netifaces/netifaces-0.10.6.ebuild
index cd1efb72de083..55b258e548887 100644
--- a/dev-python/netifaces/netifaces-0.10.6.ebuild
+++ b/dev-python/netifaces/netifaces-0.10.6.ebuild
@@ -9,7 +9,7 @@ inherit distutils-r1
 
 DESCRIPTION="Portable network interface information"
 HOMEPAGE="
-	https://pypi.python.org/pypi/netifaces/
+	https://pypi.org/project/netifaces/
 	https://alastairs-place.net/projects/netifaces/
 	https://bitbucket.org/al45tair/netifaces"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
diff --git a/dev-python/nevow/nevow-0.11.1.ebuild b/dev-python/nevow/nevow-0.11.1.ebuild
index 6c8e6259e0e86..e901ef9d460ba 100644
--- a/dev-python/nevow/nevow-0.11.1.ebuild
+++ b/dev-python/nevow/nevow-0.11.1.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 )
 inherit twisted-r1
 
 DESCRIPTION="A web templating framework that provides LivePage, an automatic AJAX toolkit"
-HOMEPAGE="https://github.com/twisted/nevow https://pypi.python.org/pypi/Nevow"
+HOMEPAGE="https://github.com/twisted/nevow https://pypi.org/project/Nevow"
 SRC_URI="mirror://pypi/${TWISTED_PN:0:1}/${TWISTED_PN}/${TWISTED_P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/nevow/nevow-0.14.3.ebuild b/dev-python/nevow/nevow-0.14.3.ebuild
index a2cf9c4418b16..44c46db055d39 100644
--- a/dev-python/nevow/nevow-0.14.3.ebuild
+++ b/dev-python/nevow/nevow-0.14.3.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 )
 inherit twisted-r1
 
 DESCRIPTION="A web templating framework that provides LivePage, an automatic AJAX toolkit"
-HOMEPAGE="https://github.com/twisted/nevow https://pypi.python.org/pypi/Nevow"
+HOMEPAGE="https://github.com/twisted/nevow https://pypi.org/project/Nevow"
 SRC_URI="mirror://pypi/${TWISTED_PN:0:1}/${TWISTED_PN}/${TWISTED_P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/node-semver/node-semver-0.2.0.ebuild b/dev-python/node-semver/node-semver-0.2.0.ebuild
index f51fb5a27e368..ca4f56cfe2cd9 100644
--- a/dev-python/node-semver/node-semver-0.2.0.ebuild
+++ b/dev-python/node-semver/node-semver-0.2.0.ebuild
@@ -9,7 +9,7 @@ inherit distutils-r1
 
 DESCRIPTION="Python version of node-semver, the semantic versioner for npm"
 HOMEPAGE="
-	https://pypi.python.org/pypi/node-semver
+	https://pypi.org/project/node-semver
 	https://github.com/podhmo/python-semver
 	https://github.com/npm/node-semver"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
diff --git a/dev-python/nose-cover3/nose-cover3-0.1.0-r1.ebuild b/dev-python/nose-cover3/nose-cover3-0.1.0-r1.ebuild
index 203edd3095767..fb3c29db4ccf1 100644
--- a/dev-python/nose-cover3/nose-cover3-0.1.0-r1.ebuild
+++ b/dev-python/nose-cover3/nose-cover3-0.1.0-r1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="Coverage 3.x support for Nose"
-HOMEPAGE="https://github.com/ask/nosecover3 https://pypi.python.org/pypi/nose-cover3"
+HOMEPAGE="https://github.com/ask/nosecover3 https://pypi.org/project/nose-cover3"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2"
diff --git a/dev-python/nose-descriptionfixer/nose-descriptionfixer-0.0.4.ebuild b/dev-python/nose-descriptionfixer/nose-descriptionfixer-0.0.4.ebuild
index 6407e5fdba1fd..1048f9466f65f 100644
--- a/dev-python/nose-descriptionfixer/nose-descriptionfixer-0.0.4.ebuild
+++ b/dev-python/nose-descriptionfixer/nose-descriptionfixer-0.0.4.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3)
 inherit distutils-r1
 
 DESCRIPTION="Fix the way tests are described when the verbose flag is used"
-HOMEPAGE="https://pypi.python.org/pypi/nose-descriptionfixer"
+HOMEPAGE="https://pypi.org/project/nose-descriptionfixer"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/nose-show-skipped/nose-show-skipped-0.1.ebuild b/dev-python/nose-show-skipped/nose-show-skipped-0.1.ebuild
index 66c517ed9e01b..54a2e800059c4 100644
--- a/dev-python/nose-show-skipped/nose-show-skipped-0.1.ebuild
+++ b/dev-python/nose-show-skipped/nose-show-skipped-0.1.ebuild
@@ -9,7 +9,7 @@ inherit distutils-r1
 
 DESCRIPTION="A nose plugin to show skipped tests and their messages"
 HOMEPAGE="https://github.com/cpcloud/nose-show-skipped
-	https://pypi.python.org/pypi/nose-show-skipped"
+	https://pypi.org/project/nose-show-skipped"
 SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/nose/nose-1.3.7-r1.ebuild b/dev-python/nose/nose-1.3.7-r1.ebuild
index 04357fb0e9cec..934cdf20d5c27 100644
--- a/dev-python/nose/nose-1.3.7-r1.ebuild
+++ b/dev-python/nose/nose-1.3.7-r1.ebuild
@@ -10,7 +10,7 @@ inherit distutils-r1
 
 DESCRIPTION="Unittest extension with automatic test suite discovery and easy test authoring"
 HOMEPAGE="
-	https://pypi.python.org/pypi/nose
+	https://pypi.org/project/nose
 	https://nose.readthedocs.io/en/latest/
 	https://bitbucket.org/jpellerin/nose"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
diff --git a/dev-python/nose/nose-1.3.7-r3.ebuild b/dev-python/nose/nose-1.3.7-r3.ebuild
index 059365ede0009..10647b104eb12 100644
--- a/dev-python/nose/nose-1.3.7-r3.ebuild
+++ b/dev-python/nose/nose-1.3.7-r3.ebuild
@@ -10,7 +10,7 @@ inherit distutils-r1
 
 DESCRIPTION="Unittest extension with automatic test suite discovery and easy test authoring"
 HOMEPAGE="
-	https://pypi.python.org/pypi/nose
+	https://pypi.org/project/nose
 	https://nose.readthedocs.io/en/latest/
 	https://bitbucket.org/jpellerin/nose"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
diff --git a/dev-python/nose/nose-9999.ebuild b/dev-python/nose/nose-9999.ebuild
index 3c9d5bb2829d3..40d1e3da54928 100644
--- a/dev-python/nose/nose-9999.ebuild
+++ b/dev-python/nose/nose-9999.ebuild
@@ -10,7 +10,7 @@ inherit distutils-r1 git-r3
 
 DESCRIPTION="Unittest extension with automatic test suite discovery and easy test authoring"
 HOMEPAGE="
-	https://pypi.python.org/pypi/nose
+	https://pypi.org/project/nose
 	https://nose.readthedocs.io/en/latest/
 	https://github.com/nose-devs/nose"
 SRC_URI=""
diff --git a/dev-python/nose_fixes/nose_fixes-1.3.ebuild b/dev-python/nose_fixes/nose_fixes-1.3.ebuild
index b406653c87f24..912a845dcb3cc 100644
--- a/dev-python/nose_fixes/nose_fixes-1.3.ebuild
+++ b/dev-python/nose_fixes/nose_fixes-1.3.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_{4,5,6}} pypy pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="A plugin to make nose behave better"
-HOMEPAGE="https://pythonhosted.org/nose_fixes/ https://pypi.python.org/pypi/nose_fixes/"
+HOMEPAGE="https://pythonhosted.org/nose_fixes/ https://pypi.org/project/nose_fixes/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/ntplib/ntplib-0.3.3.ebuild b/dev-python/ntplib/ntplib-0.3.3.ebuild
index 0d862b5752b86..29fccef86b49c 100644
--- a/dev-python/ntplib/ntplib-0.3.3.ebuild
+++ b/dev-python/ntplib/ntplib-0.3.3.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python{2_7,3_{4,5,6}} )
 inherit distutils-r1
 
 DESCRIPTION="Python NTP library"
-HOMEPAGE="https://pypi.python.org/pypi/ntplib/"
+HOMEPAGE="https://pypi.org/project/ntplib/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/numpydoc/numpydoc-0.6.0.ebuild b/dev-python/numpydoc/numpydoc-0.6.0.ebuild
index 3e1732fb4d9dc..a88581ddac2bd 100644
--- a/dev-python/numpydoc/numpydoc-0.6.0.ebuild
+++ b/dev-python/numpydoc/numpydoc-0.6.0.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
 inherit distutils-r1
 
 DESCRIPTION="Sphinx extension to support docstrings in Numpy format"
-HOMEPAGE="https://pypi.python.org/pypi/numpydoc"
+HOMEPAGE="https://pypi.org/project/numpydoc"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/numpydoc/numpydoc-0.7.0.ebuild b/dev-python/numpydoc/numpydoc-0.7.0.ebuild
index 35bf1affb38c6..7b77412a09564 100644
--- a/dev-python/numpydoc/numpydoc-0.7.0.ebuild
+++ b/dev-python/numpydoc/numpydoc-0.7.0.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
 inherit distutils-r1
 
 DESCRIPTION="Sphinx extension to support docstrings in Numpy format"
-HOMEPAGE="https://pypi.python.org/pypi/numpydoc"
+HOMEPAGE="https://pypi.org/project/numpydoc"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/oauth/oauth-1.0.1-r1.ebuild b/dev-python/oauth/oauth-1.0.1-r1.ebuild
index 1a486d40820a5..6167bf95f8544 100644
--- a/dev-python/oauth/oauth-1.0.1-r1.ebuild
+++ b/dev-python/oauth/oauth-1.0.1-r1.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 pypy )
 inherit distutils-r1
 
 DESCRIPTION="Python OAuth module"
-HOMEPAGE="https://pypi.python.org/pypi/oauth"
+HOMEPAGE="https://pypi.org/project/oauth"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/oauth2/oauth2-1.9.0_p1-r1.ebuild b/dev-python/oauth2/oauth2-1.9.0_p1-r1.ebuild
index d41d8af9ac430..e9fe9bc012f55 100644
--- a/dev-python/oauth2/oauth2-1.9.0_p1-r1.ebuild
+++ b/dev-python/oauth2/oauth2-1.9.0_p1-r1.ebuild
@@ -10,7 +10,7 @@ inherit distutils-r1
 MY_P="${P/_p/.post}"
 
 DESCRIPTION="Library for OAuth version 1.0"
-HOMEPAGE="https://pypi.python.org/pypi/oauth2"
+HOMEPAGE="https://pypi.org/project/oauth2"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/oauthlib/oauthlib-1.0.3.ebuild b/dev-python/oauthlib/oauthlib-1.0.3.ebuild
index 0f619e0b8223b..5b96331b654b4 100644
--- a/dev-python/oauthlib/oauthlib-1.0.3.ebuild
+++ b/dev-python/oauthlib/oauthlib-1.0.3.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_{4,5}} )
 inherit distutils-r1
 
 DESCRIPTION="Spec-compliant and thorough implementation of the OAuth request-signing logic"
-HOMEPAGE="https://github.com/idan/oauthlib https://pypi.python.org/pypi/oauthlib"
+HOMEPAGE="https://github.com/idan/oauthlib https://pypi.org/project/oauthlib"
 SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/oauthlib/oauthlib-2.0.2.ebuild b/dev-python/oauthlib/oauthlib-2.0.2.ebuild
index 8e2670c4e15a2..f518acd47adb8 100644
--- a/dev-python/oauthlib/oauthlib-2.0.2.ebuild
+++ b/dev-python/oauthlib/oauthlib-2.0.2.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_{4,5,6}} )
 inherit distutils-r1
 
 DESCRIPTION="Spec-compliant and thorough implementation of the OAuth request-signing logic"
-HOMEPAGE="https://github.com/idan/oauthlib https://pypi.python.org/pypi/oauthlib"
+HOMEPAGE="https://github.com/idan/oauthlib https://pypi.org/project/oauthlib"
 SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/oauthlib/oauthlib-2.0.3.ebuild b/dev-python/oauthlib/oauthlib-2.0.3.ebuild
index 3f45f56fd9489..856cd966b676a 100644
--- a/dev-python/oauthlib/oauthlib-2.0.3.ebuild
+++ b/dev-python/oauthlib/oauthlib-2.0.3.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_{4,5,6}} )
 inherit distutils-r1
 
 DESCRIPTION="Spec-compliant and thorough implementation of the OAuth request-signing logic"
-HOMEPAGE="https://github.com/idan/oauthlib https://pypi.python.org/pypi/oauthlib"
+HOMEPAGE="https://github.com/idan/oauthlib https://pypi.org/project/oauthlib"
 SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/oauthlib/oauthlib-2.0.6.ebuild b/dev-python/oauthlib/oauthlib-2.0.6.ebuild
index a1951a9802a2e..67ecb85ce590f 100644
--- a/dev-python/oauthlib/oauthlib-2.0.6.ebuild
+++ b/dev-python/oauthlib/oauthlib-2.0.6.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_{4,5,6}} )
 inherit distutils-r1
 
 DESCRIPTION="Spec-compliant and thorough implementation of the OAuth request-signing logic"
-HOMEPAGE="https://github.com/idan/oauthlib https://pypi.python.org/pypi/oauthlib"
+HOMEPAGE="https://github.com/idan/oauthlib https://pypi.org/project/oauthlib"
 SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/oct2py/oct2py-3.6.0.ebuild b/dev-python/oct2py/oct2py-3.6.0.ebuild
index 3dc8c8704a01f..ee31ba5db8c16 100644
--- a/dev-python/oct2py/oct2py-3.6.0.ebuild
+++ b/dev-python/oct2py/oct2py-3.6.0.ebuild
@@ -9,7 +9,7 @@ inherit distutils-r1
 
 DESCRIPTION="Python to GNU Octave bridge"
 HOMEPAGE="
-	https://pypi.python.org/pypi/oct2py
+	https://pypi.org/project/oct2py
 	http://pythonhosted.org/oct2py/
 	https://github.com/blink1073/oct2py"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
diff --git a/dev-python/odfpy/odfpy-1.3.2.ebuild b/dev-python/odfpy/odfpy-1.3.2.ebuild
index f20d00b784d8e..aff677fdae505 100644
--- a/dev-python/odfpy/odfpy-1.3.2.ebuild
+++ b/dev-python/odfpy/odfpy-1.3.2.ebuild
@@ -11,7 +11,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5} )
 inherit distutils-r1
 
 DESCRIPTION="Python API and tools to manipulate OpenDocument files"
-HOMEPAGE="https://github.com/eea/odfpy https://pypi.python.org/pypi/odfpy"
+HOMEPAGE="https://github.com/eea/odfpy https://pypi.org/project/odfpy"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0 GPL-2 LGPL-2.1"
diff --git a/dev-python/onkyo-eiscp/onkyo-eiscp-1.2.4.ebuild b/dev-python/onkyo-eiscp/onkyo-eiscp-1.2.4.ebuild
index 355a69afdc990..b2b6039a2fc67 100644
--- a/dev-python/onkyo-eiscp/onkyo-eiscp-1.2.4.ebuild
+++ b/dev-python/onkyo-eiscp/onkyo-eiscp-1.2.4.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
 inherit distutils-r1
 
 DESCRIPTION="Control Onkyo A/V receivers over the network"
-HOMEPAGE="https://github.com/miracle2k/onkyo-eiscp https://pypi.python.org/pypi/onkyo-eiscp"
+HOMEPAGE="https://github.com/miracle2k/onkyo-eiscp https://pypi.org/project/onkyo-eiscp"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/optcomplete/optcomplete-1.2-r1.ebuild b/dev-python/optcomplete/optcomplete-1.2-r1.ebuild
index da4dc461f8e32..07c458fce3974 100644
--- a/dev-python/optcomplete/optcomplete-1.2-r1.ebuild
+++ b/dev-python/optcomplete/optcomplete-1.2-r1.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 pypy )
 inherit distutils-r1
 
 DESCRIPTION="Shell completion self-generator for Python"
-HOMEPAGE="http://furius.ca/optcomplete/ https://pypi.python.org/pypi/optcomplete"
+HOMEPAGE="http://furius.ca/optcomplete/ https://pypi.org/project/optcomplete"
 SRC_URI="http://furius.ca/downloads/${PN}/releases/${P}.tar.bz2"
 
 LICENSE="BSD"
diff --git a/dev-python/ordereddict/ordereddict-1.1.ebuild b/dev-python/ordereddict/ordereddict-1.1.ebuild
index 5c7e9ef9a762d..62d615f6e8eca 100644
--- a/dev-python/ordereddict/ordereddict-1.1.ebuild
+++ b/dev-python/ordereddict/ordereddict-1.1.ebuild
@@ -8,7 +8,7 @@ inherit distutils-r1
 
 DESCRIPTION="A drop-in substitute for Py2.7's new collections.OrderedDict that
 works in Python 2.4-2.6."
-HOMEPAGE="https://pypi.python.org/pypi/ordereddict"
+HOMEPAGE="https://pypi.org/project/ordereddict"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/os-testr/os-testr-0.8.0.ebuild b/dev-python/os-testr/os-testr-0.8.0.ebuild
index 16baee12e83d0..09967afaf4b9e 100644
--- a/dev-python/os-testr/os-testr-0.8.0.ebuild
+++ b/dev-python/os-testr/os-testr-0.8.0.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python{2_7,3_{4,5}} )
 inherit distutils-r1
 
 DESCRIPTION="A testr wrapper to provide functionality for OpenStack projects"
-HOMEPAGE="https://pypi.python.org/pypi/os-testr https://github.com/openstack/os-testr"
+HOMEPAGE="https://pypi.org/project/os-testr https://github.com/openstack/os-testr"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
diff --git a/dev-python/os-testr/os-testr-1.0.0.ebuild b/dev-python/os-testr/os-testr-1.0.0.ebuild
index 7e2944c6a359d..7694997f6449c 100644
--- a/dev-python/os-testr/os-testr-1.0.0.ebuild
+++ b/dev-python/os-testr/os-testr-1.0.0.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python{2_7,3_{4,5}} )
 inherit distutils-r1
 
 DESCRIPTION="A testr wrapper to provide functionality for OpenStack projects"
-HOMEPAGE="https://pypi.python.org/pypi/os-testr https://github.com/openstack/os-testr"
+HOMEPAGE="https://pypi.org/project/os-testr https://github.com/openstack/os-testr"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
diff --git a/dev-python/oslo-concurrency/oslo-concurrency-3.21.1.ebuild b/dev-python/oslo-concurrency/oslo-concurrency-3.21.1.ebuild
index ccb6375bf6b7a..d3382e4bb3fd7 100644
--- a/dev-python/oslo-concurrency/oslo-concurrency-3.21.1.ebuild
+++ b/dev-python/oslo-concurrency/oslo-concurrency-3.21.1.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 python3_4 python3_5 python3_6 )
 inherit distutils-r1
 
 DESCRIPTION="library for running  multi-thread, multi-process applications"
-HOMEPAGE="https://pypi.python.org/pypi/oslo.concurrency"
+HOMEPAGE="https://pypi.org/project/oslo.concurrency"
 SRC_URI="mirror://pypi/${PN:0:1}/oslo.concurrency/oslo.concurrency-${PV}.tar.gz"
 S="${WORKDIR}/oslo.concurrency-${PV}"
 
diff --git a/dev-python/oslo-concurrency/oslo-concurrency-3.25.0.ebuild b/dev-python/oslo-concurrency/oslo-concurrency-3.25.0.ebuild
index b95096e324e2e..6fde2da6a5fbf 100644
--- a/dev-python/oslo-concurrency/oslo-concurrency-3.25.0.ebuild
+++ b/dev-python/oslo-concurrency/oslo-concurrency-3.25.0.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 python3_4 python3_5 python3_6 )
 inherit distutils-r1
 
 DESCRIPTION="library for running  multi-thread, multi-process applications"
-HOMEPAGE="https://pypi.python.org/pypi/oslo.concurrency"
+HOMEPAGE="https://pypi.org/project/oslo.concurrency"
 SRC_URI="mirror://pypi/${PN:0:1}/oslo.concurrency/oslo.concurrency-${PV}.tar.gz"
 S="${WORKDIR}/oslo.concurrency-${PV}"
 
diff --git a/dev-python/oslo-context/oslo-context-2.17.1.ebuild b/dev-python/oslo-context/oslo-context-2.17.1.ebuild
index 1730977640407..193fbf54cac19 100644
--- a/dev-python/oslo-context/oslo-context-2.17.1.ebuild
+++ b/dev-python/oslo-context/oslo-context-2.17.1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_{4,5}} )
 inherit distutils-r1
 
 DESCRIPTION="Helpers to maintain useful information about a request context"
-HOMEPAGE="https://pypi.python.org/pypi/oslo.context"
+HOMEPAGE="https://pypi.org/project/oslo.context"
 SRC_URI="mirror://pypi/${PN:0:1}/oslo.context/oslo.context-${PV}.tar.gz"
 
 LICENSE="Apache-2.0"
diff --git a/dev-python/oslo-context/oslo-context-2.20.0.ebuild b/dev-python/oslo-context/oslo-context-2.20.0.ebuild
index 674a56cd203d2..a7c4af53c851e 100644
--- a/dev-python/oslo-context/oslo-context-2.20.0.ebuild
+++ b/dev-python/oslo-context/oslo-context-2.20.0.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_{4,5}} )
 inherit distutils-r1
 
 DESCRIPTION="Helpers to maintain useful information about a request context"
-HOMEPAGE="https://pypi.python.org/pypi/oslo.context"
+HOMEPAGE="https://pypi.org/project/oslo.context"
 SRC_URI="mirror://pypi/${PN:0:1}/oslo.context/oslo.context-${PV}.tar.gz"
 
 LICENSE="Apache-2.0"
diff --git a/dev-python/oslo-log/oslo-log-3.30.2.ebuild b/dev-python/oslo-log/oslo-log-3.30.2.ebuild
index 71421cccb169e..e8a2787842827 100644
--- a/dev-python/oslo-log/oslo-log-3.30.2.ebuild
+++ b/dev-python/oslo-log/oslo-log-3.30.2.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
 inherit distutils-r1
 
 DESCRIPTION="OpenStack logging config library, configuration for all openstack projects."
-HOMEPAGE="https://pypi.python.org/pypi/oslo.log https://github.com/openstack/oslo.log"
+HOMEPAGE="https://pypi.org/project/oslo.log https://github.com/openstack/oslo.log"
 SRC_URI="mirror://pypi/o/oslo.log/oslo.log-${PV}.tar.gz"
 S="${WORKDIR}/oslo.log-${PV}"
 
diff --git a/dev-python/oslo-log/oslo-log-3.36.0.ebuild b/dev-python/oslo-log/oslo-log-3.36.0.ebuild
index be21b76fe2182..5c8b426b2af8e 100644
--- a/dev-python/oslo-log/oslo-log-3.36.0.ebuild
+++ b/dev-python/oslo-log/oslo-log-3.36.0.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
 inherit distutils-r1
 
 DESCRIPTION="OpenStack logging config library, configuration for all openstack projects."
-HOMEPAGE="https://pypi.python.org/pypi/oslo.log https://github.com/openstack/oslo.log"
+HOMEPAGE="https://pypi.org/project/oslo.log https://github.com/openstack/oslo.log"
 SRC_URI="mirror://pypi/o/oslo.log/oslo.log-${PV}.tar.gz"
 S="${WORKDIR}/oslo.log-${PV}"
 
diff --git a/dev-python/oslo-messaging/oslo-messaging-5.30.2.ebuild b/dev-python/oslo-messaging/oslo-messaging-5.30.2.ebuild
index 4304312da8969..c1efa56a3f32c 100644
--- a/dev-python/oslo-messaging/oslo-messaging-5.30.2.ebuild
+++ b/dev-python/oslo-messaging/oslo-messaging-5.30.2.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
 inherit distutils-r1
 
 DESCRIPTION="Messaging API for RPC and notifications over different messaging transports"
-HOMEPAGE="https://pypi.python.org/pypi/oslo.messaging"
+HOMEPAGE="https://pypi.org/project/oslo.messaging"
 SRC_URI="mirror://pypi/${PN:0:1}/oslo.messaging/oslo.messaging-${PV}.tar.gz"
 S="${WORKDIR}/oslo.messaging-${PV}"
 
diff --git a/dev-python/oslo-messaging/oslo-messaging-5.35.0.ebuild b/dev-python/oslo-messaging/oslo-messaging-5.35.0.ebuild
index af544589a999c..9f7d4630dd3fb 100644
--- a/dev-python/oslo-messaging/oslo-messaging-5.35.0.ebuild
+++ b/dev-python/oslo-messaging/oslo-messaging-5.35.0.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
 inherit distutils-r1
 
 DESCRIPTION="Messaging API for RPC and notifications over different messaging transports"
-HOMEPAGE="https://pypi.python.org/pypi/oslo.messaging"
+HOMEPAGE="https://pypi.org/project/oslo.messaging"
 SRC_URI="mirror://pypi/${PN:0:1}/oslo.messaging/oslo.messaging-${PV}.tar.gz"
 S="${WORKDIR}/oslo.messaging-${PV}"
 
diff --git a/dev-python/oslo-middleware/oslo-middleware-3.30.1.ebuild b/dev-python/oslo-middleware/oslo-middleware-3.30.1.ebuild
index b3d9785d756eb..a1b6017540df6 100644
--- a/dev-python/oslo-middleware/oslo-middleware-3.30.1.ebuild
+++ b/dev-python/oslo-middleware/oslo-middleware-3.30.1.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
 inherit distutils-r1
 
 DESCRIPTION="Components injected into wsgi pipelines to intercept request/response flows."
-HOMEPAGE="https://pypi.python.org/pypi/oslo.middleware"
+HOMEPAGE="https://pypi.org/project/oslo.middleware"
 SRC_URI="mirror://pypi/${PN:0:1}/oslo.middleware/oslo.middleware-${PV}.tar.gz"
 S="${WORKDIR}/oslo.middleware-${PV}"
 
diff --git a/dev-python/oslo-middleware/oslo-middleware-3.34.0.ebuild b/dev-python/oslo-middleware/oslo-middleware-3.34.0.ebuild
index 00150703ccce1..f8e9e8d721735 100644
--- a/dev-python/oslo-middleware/oslo-middleware-3.34.0.ebuild
+++ b/dev-python/oslo-middleware/oslo-middleware-3.34.0.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
 inherit distutils-r1
 
 DESCRIPTION="Components injected into wsgi pipelines to intercept request/response flows."
-HOMEPAGE="https://pypi.python.org/pypi/oslo.middleware"
+HOMEPAGE="https://pypi.org/project/oslo.middleware"
 SRC_URI="mirror://pypi/${PN:0:1}/oslo.middleware/oslo.middleware-${PV}.tar.gz"
 S="${WORKDIR}/oslo.middleware-${PV}"
 
diff --git a/dev-python/oslo-policy/oslo-policy-1.25.2.ebuild b/dev-python/oslo-policy/oslo-policy-1.25.2.ebuild
index eeb8d81e1a5ed..18e95fc1efe1f 100644
--- a/dev-python/oslo-policy/oslo-policy-1.25.2.ebuild
+++ b/dev-python/oslo-policy/oslo-policy-1.25.2.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_{4,5,6}} )
 inherit distutils-r1
 
 DESCRIPTION="Support for RBAC policy enforcement across all OpenStack services"
-HOMEPAGE="https://pypi.python.org/pypi/oslo.policy"
+HOMEPAGE="https://pypi.org/project/oslo.policy"
 SRC_URI="mirror://pypi/${PN:0:1}/oslo.policy/oslo.policy-${PV}.tar.gz"
 
 LICENSE="Apache-2.0"
diff --git a/dev-python/oslo-policy/oslo-policy-1.33.1.ebuild b/dev-python/oslo-policy/oslo-policy-1.33.1.ebuild
index 1ce4176797c81..4b4b30ab00890 100644
--- a/dev-python/oslo-policy/oslo-policy-1.33.1.ebuild
+++ b/dev-python/oslo-policy/oslo-policy-1.33.1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_{4,5,6}} )
 inherit distutils-r1
 
 DESCRIPTION="Support for RBAC policy enforcement across all OpenStack services"
-HOMEPAGE="https://pypi.python.org/pypi/oslo.policy"
+HOMEPAGE="https://pypi.org/project/oslo.policy"
 SRC_URI="mirror://pypi/${PN:0:1}/oslo.policy/oslo.policy-${PV}.tar.gz"
 
 LICENSE="Apache-2.0"
diff --git a/dev-python/oslo-privsep/oslo-privsep-1.22.1-r1.ebuild b/dev-python/oslo-privsep/oslo-privsep-1.22.1-r1.ebuild
index d459390668fd5..ab6cf4a6404f7 100644
--- a/dev-python/oslo-privsep/oslo-privsep-1.22.1-r1.ebuild
+++ b/dev-python/oslo-privsep/oslo-privsep-1.22.1-r1.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
 inherit distutils-r1
 
 DESCRIPTION="OpenStack library for privilege separation."
-HOMEPAGE="https://pypi.python.org/pypi/oslo.privsep"
+HOMEPAGE="https://pypi.org/project/oslo.privsep"
 SRC_URI="mirror://pypi/${PN:0:1}/oslo.privsep/oslo.privsep-${PV}.tar.gz"
 S="${WORKDIR}/oslo.privsep-${PV}"
 
diff --git a/dev-python/oslo-privsep/oslo-privsep-1.27.0-r1.ebuild b/dev-python/oslo-privsep/oslo-privsep-1.27.0-r1.ebuild
index 9be292c6be7c2..e0a8d4a46bcef 100644
--- a/dev-python/oslo-privsep/oslo-privsep-1.27.0-r1.ebuild
+++ b/dev-python/oslo-privsep/oslo-privsep-1.27.0-r1.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
 inherit distutils-r1
 
 DESCRIPTION="OpenStack library for privilege separation."
-HOMEPAGE="https://pypi.python.org/pypi/oslo.privsep"
+HOMEPAGE="https://pypi.org/project/oslo.privsep"
 SRC_URI="mirror://pypi/${PN:0:1}/oslo.privsep/oslo.privsep-${PV}.tar.gz"
 S="${WORKDIR}/oslo.privsep-${PV}"
 
diff --git a/dev-python/oslo-rootwrap/oslo-rootwrap-5.13.0.ebuild b/dev-python/oslo-rootwrap/oslo-rootwrap-5.13.0.ebuild
index 4df559686182b..fe399ebe6dbe1 100644
--- a/dev-python/oslo-rootwrap/oslo-rootwrap-5.13.0.ebuild
+++ b/dev-python/oslo-rootwrap/oslo-rootwrap-5.13.0.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
 inherit distutils-r1
 
 DESCRIPTION="Allows fine filtering of shell commands to run as root from OpenStack services"
-HOMEPAGE="https://pypi.python.org/pypi/oslo.config"
+HOMEPAGE="https://pypi.org/project/oslo.config"
 SRC_URI="mirror://pypi/${PN:0:1}/oslo.rootwrap/oslo.rootwrap-${PV}.tar.gz"
 S="${WORKDIR}/oslo.rootwrap-${PV}"
 
diff --git a/dev-python/oslo-rootwrap/oslo-rootwrap-5.9.2.ebuild b/dev-python/oslo-rootwrap/oslo-rootwrap-5.9.2.ebuild
index 9e11cf0b9fafe..27c545975fab0 100644
--- a/dev-python/oslo-rootwrap/oslo-rootwrap-5.9.2.ebuild
+++ b/dev-python/oslo-rootwrap/oslo-rootwrap-5.9.2.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
 inherit distutils-r1
 
 DESCRIPTION="Allows fine filtering of shell commands to run as root from OpenStack services"
-HOMEPAGE="https://pypi.python.org/pypi/oslo.config"
+HOMEPAGE="https://pypi.org/project/oslo.config"
 SRC_URI="mirror://pypi/${PN:0:1}/oslo.rootwrap/oslo.rootwrap-${PV}.tar.gz"
 S="${WORKDIR}/oslo.rootwrap-${PV}"
 
diff --git a/dev-python/oslo-service/oslo-service-1.25.1.ebuild b/dev-python/oslo-service/oslo-service-1.25.1.ebuild
index af307573d4dbd..2d0fab3a202b7 100644
--- a/dev-python/oslo-service/oslo-service-1.25.1.ebuild
+++ b/dev-python/oslo-service/oslo-service-1.25.1.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
 inherit distutils-r1
 
 DESCRIPTION="Library for running OpenStack services"
-HOMEPAGE="https://pypi.python.org/pypi/oslo.service"
+HOMEPAGE="https://pypi.org/project/oslo.service"
 SRC_URI="mirror://pypi/${PN:0:1}/oslo.service/oslo.service-${PV}.tar.gz"
 S="${WORKDIR}/oslo.service-${PV}"
 
diff --git a/dev-python/oslo-service/oslo-service-1.29.0.ebuild b/dev-python/oslo-service/oslo-service-1.29.0.ebuild
index fd152c9371583..f63f13c05c430 100644
--- a/dev-python/oslo-service/oslo-service-1.29.0.ebuild
+++ b/dev-python/oslo-service/oslo-service-1.29.0.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
 inherit distutils-r1
 
 DESCRIPTION="Library for running OpenStack services"
-HOMEPAGE="https://pypi.python.org/pypi/oslo.service"
+HOMEPAGE="https://pypi.org/project/oslo.service"
 SRC_URI="mirror://pypi/${PN:0:1}/oslo.service/oslo.service-${PV}.tar.gz"
 S="${WORKDIR}/oslo.service-${PV}"
 
diff --git a/dev-python/oslo-vmware/oslo-vmware-2.23.1.ebuild b/dev-python/oslo-vmware/oslo-vmware-2.23.1.ebuild
index ac6a76f78572c..d39ac6819ab12 100644
--- a/dev-python/oslo-vmware/oslo-vmware-2.23.1.ebuild
+++ b/dev-python/oslo-vmware/oslo-vmware-2.23.1.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
 inherit distutils-r1
 
 DESCRIPTION="Oslo VMware library for OpenStack projects"
-HOMEPAGE="https://pypi.python.org/pypi/oslo.vmware"
+HOMEPAGE="https://pypi.org/project/oslo.vmware"
 SRC_URI="mirror://pypi/${PN:0:1}/oslo.vmware/oslo.vmware-${PV}.tar.gz"
 S="${WORKDIR}/oslo.vmware-${PV}"
 
diff --git a/dev-python/oslo-vmware/oslo-vmware-2.26.0.ebuild b/dev-python/oslo-vmware/oslo-vmware-2.26.0.ebuild
index 7d68bd4da89e2..1273309ff7c47 100644
--- a/dev-python/oslo-vmware/oslo-vmware-2.26.0.ebuild
+++ b/dev-python/oslo-vmware/oslo-vmware-2.26.0.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
 inherit distutils-r1
 
 DESCRIPTION="Oslo VMware library for OpenStack projects"
-HOMEPAGE="https://pypi.python.org/pypi/oslo.vmware"
+HOMEPAGE="https://pypi.org/project/oslo.vmware"
 SRC_URI="mirror://pypi/${PN:0:1}/oslo.vmware/oslo.vmware-${PV}.tar.gz"
 S="${WORKDIR}/oslo.vmware-${PV}"
 
diff --git a/dev-python/packaging/packaging-16.8.ebuild b/dev-python/packaging/packaging-16.8.ebuild
index a15cdbbbd337c..ecc0f3af7c742 100644
--- a/dev-python/packaging/packaging-16.8.ebuild
+++ b/dev-python/packaging/packaging-16.8.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3  )
 inherit distutils-r1
 
 DESCRIPTION="Core utilities for Python packages"
-HOMEPAGE="https://github.com/pypa/packaging https://pypi.python.org/pypi/packaging"
+HOMEPAGE="https://github.com/pypa/packaging https://pypi.org/project/packaging"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
diff --git a/dev-python/pafy/pafy-0.5.3.1.ebuild b/dev-python/pafy/pafy-0.5.3.1.ebuild
index 1d0bdc3194a00..4e220e20d4196 100644
--- a/dev-python/pafy/pafy-0.5.3.1.ebuild
+++ b/dev-python/pafy/pafy-0.5.3.1.ebuild
@@ -6,7 +6,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
 inherit distutils-r1
 
 DESCRIPTION="Python library to retrieve YouTube content and metadata"
-HOMEPAGE="http://np1.github.io/pafy/ https://pypi.python.org/pypi/pafy"
+HOMEPAGE="http://np1.github.io/pafy/ https://pypi.org/project/pafy"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-3"
diff --git a/dev-python/pafy/pafy-0.5.4.ebuild b/dev-python/pafy/pafy-0.5.4.ebuild
index 2d7b0d905811b..a869215b7bfa2 100644
--- a/dev-python/pafy/pafy-0.5.4.ebuild
+++ b/dev-python/pafy/pafy-0.5.4.ebuild
@@ -14,7 +14,7 @@ else
 fi
 
 DESCRIPTION="Python library to retrieve YouTube content and metadata"
-HOMEPAGE="http://np1.github.io/pafy/ https://pypi.python.org/pypi/pafy"
+HOMEPAGE="http://np1.github.io/pafy/ https://pypi.org/project/pafy"
 
 LICENSE="LGPL-3"
 SLOT="0"
diff --git a/dev-python/pafy/pafy-9999.ebuild b/dev-python/pafy/pafy-9999.ebuild
index b9d61d9088ce7..ef6f57f7f74e3 100644
--- a/dev-python/pafy/pafy-9999.ebuild
+++ b/dev-python/pafy/pafy-9999.ebuild
@@ -14,7 +14,7 @@ else
 fi
 
 DESCRIPTION="Python library to retrieve YouTube content and metadata"
-HOMEPAGE="http://np1.github.io/pafy/ https://pypi.python.org/pypi/pafy"
+HOMEPAGE="http://np1.github.io/pafy/ https://pypi.org/project/pafy"
 
 LICENSE="LGPL-3"
 SLOT="0"
diff --git a/dev-python/paisley/paisley-0.3.1-r1.ebuild b/dev-python/paisley/paisley-0.3.1-r1.ebuild
index b777ecbff0589..7c2f95d563ab7 100644
--- a/dev-python/paisley/paisley-0.3.1-r1.ebuild
+++ b/dev-python/paisley/paisley-0.3.1-r1.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 )
 inherit distutils-r1
 
 DESCRIPTION="Paisley is a CouchDB client written in Python to be used within a Twisted application"
-HOMEPAGE="https://launchpad.net/paisley https://pypi.python.org/pypi/paisley"
+HOMEPAGE="https://launchpad.net/paisley https://pypi.org/project/paisley"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/paramiko/paramiko-2.1.2.ebuild b/dev-python/paramiko/paramiko-2.1.2.ebuild
index a17535668170e..9e5b8f07f63ba 100644
--- a/dev-python/paramiko/paramiko-2.1.2.ebuild
+++ b/dev-python/paramiko/paramiko-2.1.2.ebuild
@@ -9,7 +9,7 @@ PYTHON_REQ_USE="threads(+)"
 inherit distutils-r1
 
 DESCRIPTION="SSH2 protocol library"
-HOMEPAGE="http://www.paramiko.org/ https://github.com/paramiko/paramiko/ https://pypi.python.org/pypi/paramiko/"
+HOMEPAGE="http://www.paramiko.org/ https://github.com/paramiko/paramiko/ https://pypi.org/project/paramiko/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
diff --git a/dev-python/paramiko/paramiko-2.2.1.ebuild b/dev-python/paramiko/paramiko-2.2.1.ebuild
index 2f1dfac87dd54..9ee804f583991 100644
--- a/dev-python/paramiko/paramiko-2.2.1.ebuild
+++ b/dev-python/paramiko/paramiko-2.2.1.ebuild
@@ -9,7 +9,7 @@ PYTHON_REQ_USE="threads(+)"
 inherit distutils-r1
 
 DESCRIPTION="SSH2 protocol library"
-HOMEPAGE="http://www.paramiko.org/ https://github.com/paramiko/paramiko/ https://pypi.python.org/pypi/paramiko/"
+HOMEPAGE="http://www.paramiko.org/ https://github.com/paramiko/paramiko/ https://pypi.org/project/paramiko/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
diff --git a/dev-python/paramiko/paramiko-2.3.1.ebuild b/dev-python/paramiko/paramiko-2.3.1.ebuild
index c5f04dee25d06..2252a944212e9 100644
--- a/dev-python/paramiko/paramiko-2.3.1.ebuild
+++ b/dev-python/paramiko/paramiko-2.3.1.ebuild
@@ -9,7 +9,7 @@ PYTHON_REQ_USE="threads(+)"
 inherit distutils-r1
 
 DESCRIPTION="SSH2 protocol library"
-HOMEPAGE="http://www.paramiko.org/ https://github.com/paramiko/paramiko/ https://pypi.python.org/pypi/paramiko/"
+HOMEPAGE="http://www.paramiko.org/ https://github.com/paramiko/paramiko/ https://pypi.org/project/paramiko/"
 # pypi tarballs are missing test data
 #SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
diff --git a/dev-python/paramiko/paramiko-2.4.0.ebuild b/dev-python/paramiko/paramiko-2.4.0.ebuild
index 277911f22ed51..c68b86b3b3120 100644
--- a/dev-python/paramiko/paramiko-2.4.0.ebuild
+++ b/dev-python/paramiko/paramiko-2.4.0.ebuild
@@ -9,7 +9,7 @@ PYTHON_REQ_USE="threads(+)"
 inherit distutils-r1
 
 DESCRIPTION="SSH2 protocol library"
-HOMEPAGE="http://www.paramiko.org/ https://github.com/paramiko/paramiko/ https://pypi.python.org/pypi/paramiko/"
+HOMEPAGE="http://www.paramiko.org/ https://github.com/paramiko/paramiko/ https://pypi.org/project/paramiko/"
 # pypi tarballs are missing test data
 #SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
diff --git a/dev-python/paramiko/paramiko-2.4.1.ebuild b/dev-python/paramiko/paramiko-2.4.1.ebuild
index cb6e5520642d0..842f76952d08b 100644
--- a/dev-python/paramiko/paramiko-2.4.1.ebuild
+++ b/dev-python/paramiko/paramiko-2.4.1.ebuild
@@ -9,7 +9,7 @@ PYTHON_REQ_USE="threads(+)"
 inherit distutils-r1
 
 DESCRIPTION="SSH2 protocol library"
-HOMEPAGE="http://www.paramiko.org/ https://github.com/paramiko/paramiko/ https://pypi.python.org/pypi/paramiko/"
+HOMEPAGE="http://www.paramiko.org/ https://github.com/paramiko/paramiko/ https://pypi.org/project/paramiko/"
 # pypi tarballs are missing test data
 #SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
diff --git a/dev-python/paramiko/paramiko-9999.ebuild b/dev-python/paramiko/paramiko-9999.ebuild
index e4db306f700bd..d1f4ddb6bd9cf 100644
--- a/dev-python/paramiko/paramiko-9999.ebuild
+++ b/dev-python/paramiko/paramiko-9999.ebuild
@@ -9,7 +9,7 @@ PYTHON_REQ_USE="threads(+)"
 inherit distutils-r1 git-r3
 
 DESCRIPTION="SSH2 protocol library"
-HOMEPAGE="http://www.paramiko.org/ https://github.com/paramiko/paramiko/ https://pypi.python.org/pypi/paramiko/"
+HOMEPAGE="http://www.paramiko.org/ https://github.com/paramiko/paramiko/ https://pypi.org/project/paramiko/"
 SRC_URI=""
 EGIT_REPO_URI="https://github.com/paramiko/paramiko.git"
 
diff --git a/dev-python/parso/parso-0.1.1.ebuild b/dev-python/parso/parso-0.1.1.ebuild
index b36d8abbb9c85..66ad036a0a69a 100644
--- a/dev-python/parso/parso-0.1.1.ebuild
+++ b/dev-python/parso/parso-0.1.1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
 inherit distutils-r1
 
 DESCRIPTION="a python parser that supports error recovery and round-trip parsing"
-HOMEPAGE="https://github.com/davidhalter/parso https://pypi.python.org/pypi/parso"
+HOMEPAGE="https://github.com/davidhalter/parso https://pypi.org/project/parso"
 SRC_URI="https://github.com/davidhalter/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/passwordmeter/passwordmeter-0.1.8.ebuild b/dev-python/passwordmeter/passwordmeter-0.1.8.ebuild
index ebb4a60f3ed50..2f21c749a1e86 100644
--- a/dev-python/passwordmeter/passwordmeter-0.1.8.ebuild
+++ b/dev-python/passwordmeter/passwordmeter-0.1.8.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
 inherit distutils-r1
 
 DESCRIPTION="A password strength measuring library"
-HOMEPAGE="https://pypi.python.org/pypi/passwordmeter/ https://github.com/cadithealth/passwordmeter"
+HOMEPAGE="https://pypi.org/project/passwordmeter/ https://github.com/cadithealth/passwordmeter"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
diff --git a/dev-python/paste/paste-2.0.3-r1.ebuild b/dev-python/paste/paste-2.0.3-r1.ebuild
index 6afaee26ffa2a..d825963780037 100644
--- a/dev-python/paste/paste-2.0.3-r1.ebuild
+++ b/dev-python/paste/paste-2.0.3-r1.ebuild
@@ -11,7 +11,7 @@ MY_PN="Paste"
 MY_P="${MY_PN}-${PV}"
 
 DESCRIPTION="Tools for using a Web Server Gateway Interface stack"
-HOMEPAGE="https://pypi.python.org/pypi/Paste"
+HOMEPAGE="https://pypi.org/project/Paste"
 SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/pastedeploy/pastedeploy-1.5.2-r1.ebuild b/dev-python/pastedeploy/pastedeploy-1.5.2-r1.ebuild
index 91a8cd2780336..a1e80dcc0c4f2 100644
--- a/dev-python/pastedeploy/pastedeploy-1.5.2-r1.ebuild
+++ b/dev-python/pastedeploy/pastedeploy-1.5.2-r1.ebuild
@@ -10,7 +10,7 @@ MY_PN="PasteDeploy"
 MY_P="${MY_PN}-${PV}"
 
 DESCRIPTION="Load, configure, and compose WSGI applications and servers"
-HOMEPAGE="https://pypi.python.org/pypi/PasteDeploy"
+HOMEPAGE="https://pypi.org/project/PasteDeploy"
 # pypi tarball does not include tests
 SRC_URI="https://bitbucket.org/ianb/pastedeploy/get/${PV}.tar.gz -> ${P}-r1.tar.gz"
 
diff --git a/dev-python/pastedeploy/pastedeploy-1.5.2.ebuild b/dev-python/pastedeploy/pastedeploy-1.5.2.ebuild
index 2307b8a9045d0..6d6b0695f1393 100644
--- a/dev-python/pastedeploy/pastedeploy-1.5.2.ebuild
+++ b/dev-python/pastedeploy/pastedeploy-1.5.2.ebuild
@@ -10,7 +10,7 @@ MY_PN="PasteDeploy"
 MY_P="${MY_PN}-${PV}"
 
 DESCRIPTION="Load, configure, and compose WSGI applications and servers"
-HOMEPAGE="https://pypi.python.org/pypi/PasteDeploy"
+HOMEPAGE="https://pypi.org/project/PasteDeploy"
 SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/pastescript/pastescript-2.0.2-r1.ebuild b/dev-python/pastescript/pastescript-2.0.2-r1.ebuild
index 79e5abae6812e..b13bed551fbb0 100644
--- a/dev-python/pastescript/pastescript-2.0.2-r1.ebuild
+++ b/dev-python/pastescript/pastescript-2.0.2-r1.ebuild
@@ -11,7 +11,7 @@ MY_PN="PasteScript"
 MY_P="${MY_PN}-${PV}"
 
 DESCRIPTION="A pluggable command-line frontend, including commands to setup package file layouts"
-HOMEPAGE="https://pypi.python.org/pypi/PasteScript"
+HOMEPAGE="https://pypi.org/project/PasteScript"
 SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/path-py/path-py-10.3.1.ebuild b/dev-python/path-py/path-py-10.3.1.ebuild
index f54f0542a8bb6..1ab2e8b560917 100644
--- a/dev-python/path-py/path-py-10.3.1.ebuild
+++ b/dev-python/path-py/path-py-10.3.1.ebuild
@@ -10,7 +10,7 @@ inherit distutils-r1
 MY_P="path.py-${PV}"
 
 DESCRIPTION="A module wrapper for os.path"
-HOMEPAGE="https://pypi.python.org/pypi/path.py https://github.com/jaraco/path.py"
+HOMEPAGE="https://pypi.org/project/path.py https://github.com/jaraco/path.py"
 SRC_URI="mirror://pypi/p/path.py/${MY_P}.tar.gz"
 
 SLOT="0"
diff --git a/dev-python/path-py/path-py-8.1.2.ebuild b/dev-python/path-py/path-py-8.1.2.ebuild
index c8329d5c6c885..6487f6b140d51 100644
--- a/dev-python/path-py/path-py-8.1.2.ebuild
+++ b/dev-python/path-py/path-py-8.1.2.ebuild
@@ -10,7 +10,7 @@ inherit distutils-r1
 MY_P="path.py-${PV}"
 
 DESCRIPTION="A module wrapper for os.path"
-HOMEPAGE="https://pypi.python.org/pypi/path.py https://github.com/jaraco/path.py"
+HOMEPAGE="https://pypi.org/project/path.py https://github.com/jaraco/path.py"
 SRC_URI="mirror://pypi/p/path.py/${MY_P}.tar.gz"
 
 SLOT="0"
diff --git a/dev-python/pathtools/pathtools-0.1.2-r1.ebuild b/dev-python/pathtools/pathtools-0.1.2-r1.ebuild
index 4c05f22e85e06..bac75f08000c0 100644
--- a/dev-python/pathtools/pathtools-0.1.2-r1.ebuild
+++ b/dev-python/pathtools/pathtools-0.1.2-r1.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5} pypy)
 inherit distutils-r1
 
 DESCRIPTION="Pattern matching and various utilities for file systems paths"
-HOMEPAGE="https://pypi.python.org/pypi/pathtools/"
+HOMEPAGE="https://pypi.org/project/pathtools/"
 SRC_URI="mirror://pypi/p/pathtools/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/pathtools/pathtools-0.1.2-r2.ebuild b/dev-python/pathtools/pathtools-0.1.2-r2.ebuild
index abfbe1472bb08..67b1c59bb1ac2 100644
--- a/dev-python/pathtools/pathtools-0.1.2-r2.ebuild
+++ b/dev-python/pathtools/pathtools-0.1.2-r2.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy)
 inherit distutils-r1
 
 DESCRIPTION="Pattern matching and various utilities for file systems paths"
-HOMEPAGE="https://pypi.python.org/pypi/pathtools/"
+HOMEPAGE="https://pypi.org/project/pathtools/"
 SRC_URI="mirror://pypi/p/pathtools/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/pdoc/pdoc-0.3.2.ebuild b/dev-python/pdoc/pdoc-0.3.2.ebuild
index f30520b037742..c10af369fda34 100644
--- a/dev-python/pdoc/pdoc-0.3.2.ebuild
+++ b/dev-python/pdoc/pdoc-0.3.2.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
 inherit distutils-r1
 
 DESCRIPTION="Simple program and library to auto generate API documentation for Python modules"
-HOMEPAGE="https://pypi.python.org/pypi/pdoc https://github.com/BurntSushi/pdoc"
+HOMEPAGE="https://pypi.org/project/pdoc https://github.com/BurntSushi/pdoc"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
diff --git a/dev-python/peak-rules/peak-rules-0.5.ebuild b/dev-python/peak-rules/peak-rules-0.5.ebuild
index edbc5c6550f06..56f30fbb6d431 100644
--- a/dev-python/peak-rules/peak-rules-0.5.ebuild
+++ b/dev-python/peak-rules/peak-rules-0.5.ebuild
@@ -10,7 +10,7 @@ MY_PN="PEAK-Rules"
 MY_P="${MY_PN}-${PV}a1.dev-r2713"
 
 DESCRIPTION="Generic functions and business rules support systems"
-HOMEPAGE="http://peak.telecommunity.com/ https://pypi.python.org/pypi/PEAK-Rules/"
+HOMEPAGE="http://peak.telecommunity.com/ https://pypi.org/project/PEAK-Rules/"
 SRC_URI="http://peak.telecommunity.com/snapshots/${MY_P}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="ZPL"
diff --git a/dev-python/pecan/pecan-1.0.4.ebuild b/dev-python/pecan/pecan-1.0.4.ebuild
index 85b5ec0467b99..2a65e6d84fc39 100644
--- a/dev-python/pecan/pecan-1.0.4.ebuild
+++ b/dev-python/pecan/pecan-1.0.4.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
 inherit distutils-r1
 
 DESCRIPTION="A WSGI object-dispatching web framework,  lean, fast, with few dependencies."
-HOMEPAGE="https://pypi.python.org/pypi/pecan"
+HOMEPAGE="https://pypi.org/project/pecan"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/pecan/pecan-1.1.2.ebuild b/dev-python/pecan/pecan-1.1.2.ebuild
index c383f6cb8497d..e38ee7b80d4ae 100644
--- a/dev-python/pecan/pecan-1.1.2.ebuild
+++ b/dev-python/pecan/pecan-1.1.2.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
 inherit distutils-r1
 
 DESCRIPTION="A WSGI object-dispatching web framework,  lean, fast, with few dependencies."
-HOMEPAGE="https://pypi.python.org/pypi/pecan"
+HOMEPAGE="https://pypi.org/project/pecan"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/pecan/pecan-1.2.1.ebuild b/dev-python/pecan/pecan-1.2.1.ebuild
index 82976b0fc88c5..02419b98bbaf0 100644
--- a/dev-python/pecan/pecan-1.2.1.ebuild
+++ b/dev-python/pecan/pecan-1.2.1.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 python3_4 python3_5 python3_6 )
 inherit distutils-r1
 
 DESCRIPTION="A WSGI object-dispatching web framework,  lean, fast, with few dependencies."
-HOMEPAGE="https://pypi.python.org/pypi/pecan"
+HOMEPAGE="https://pypi.org/project/pecan"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/pelican-minify/pelican-minify-0.9.ebuild b/dev-python/pelican-minify/pelican-minify-0.9.ebuild
index f1e901f4c0ef0..84be22dab7570 100644
--- a/dev-python/pelican-minify/pelican-minify-0.9.ebuild
+++ b/dev-python/pelican-minify/pelican-minify-0.9.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
 inherit distutils-r1
 
 DESCRIPTION="An HTML minification plugin for Pelican, the static site generator."
-HOMEPAGE="https://pypi.python.org/pypi/pelican-minify"
+HOMEPAGE="https://pypi.org/project/pelican-minify"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Unlicense"
diff --git a/dev-python/pep8/pep8-1.5.6.ebuild b/dev-python/pep8/pep8-1.5.6.ebuild
index ffa72efc8a2c5..e9fbbba130d6e 100644
--- a/dev-python/pep8/pep8-1.5.6.ebuild
+++ b/dev-python/pep8/pep8-1.5.6.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
 inherit distutils-r1
 
 DESCRIPTION="Python style guide checker"
-HOMEPAGE="https://github.com/jcrocholl/pep8 https://pypi.python.org/pypi/pep8"
+HOMEPAGE="https://github.com/jcrocholl/pep8 https://pypi.org/project/pep8"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/pep8/pep8-1.5.7.ebuild b/dev-python/pep8/pep8-1.5.7.ebuild
index 457924b1d0ab5..f1bebd1cae341 100644
--- a/dev-python/pep8/pep8-1.5.7.ebuild
+++ b/dev-python/pep8/pep8-1.5.7.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="Python style guide checker"
-HOMEPAGE="https://github.com/jcrocholl/pep8 https://pypi.python.org/pypi/pep8"
+HOMEPAGE="https://github.com/jcrocholl/pep8 https://pypi.org/project/pep8"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/pep8/pep8-1.7.0.ebuild b/dev-python/pep8/pep8-1.7.0.ebuild
index cc583ce0b856e..a7e60b7c9fb96 100644
--- a/dev-python/pep8/pep8-1.7.0.ebuild
+++ b/dev-python/pep8/pep8-1.7.0.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="Python style guide checker"
-HOMEPAGE="https://github.com/PyCQA/pep8 https://pypi.python.org/pypi/pep8"
+HOMEPAGE="https://github.com/PyCQA/pep8 https://pypi.org/project/pep8"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/peppercorn/peppercorn-0.5.ebuild b/dev-python/peppercorn/peppercorn-0.5.ebuild
index fa04999d3d245..352e208a8d733 100644
--- a/dev-python/peppercorn/peppercorn-0.5.ebuild
+++ b/dev-python/peppercorn/peppercorn-0.5.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy )
 inherit distutils-r1
 
 DESCRIPTION="A library for converting a token stream into a data structure for use in web form posts"
-HOMEPAGE="https://github.com/Pylons/peppercorn https://pypi.python.org/pypi/peppercorn"
+HOMEPAGE="https://github.com/Pylons/peppercorn https://pypi.org/project/peppercorn"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="repoze"
diff --git a/dev-python/pew/pew-1.1.1.ebuild b/dev-python/pew/pew-1.1.1.ebuild
index 72bd343b1730d..764c8cd917be0 100644
--- a/dev-python/pew/pew-1.1.1.ebuild
+++ b/dev-python/pew/pew-1.1.1.ebuild
@@ -10,7 +10,7 @@ inherit distutils-r1
 DESCRIPTION="tool to manage multiple virtualenvs written in pure python"
 HOMEPAGE="
 	https://github.com/berdario/pew
-	https://pypi.python.org/pypi/pew"
+	https://pypi.org/project/pew"
 SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/pexpect/pexpect-4.2.1.ebuild b/dev-python/pexpect/pexpect-4.2.1.ebuild
index dbeb8a0d0576e..4ec6aea194563 100644
--- a/dev-python/pexpect/pexpect-4.2.1.ebuild
+++ b/dev-python/pexpect/pexpect-4.2.1.ebuild
@@ -9,7 +9,7 @@ PYTHON_REQ_USE="threads(+)"
 inherit distutils-r1
 
 DESCRIPTION="Python module for spawning child applications and responding to expected patterns"
-HOMEPAGE="https://pexpect.readthedocs.io/ https://pypi.python.org/pypi/pexpect/ https://github.com/pexpect/pexpect/"
+HOMEPAGE="https://pexpect.readthedocs.io/ https://pypi.org/project/pexpect/ https://github.com/pexpect/pexpect/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/pgmagick/pgmagick-0.6.7.ebuild b/dev-python/pgmagick/pgmagick-0.6.7.ebuild
index 7e33e5a5ae017..5aa0828dee6b1 100644
--- a/dev-python/pgmagick/pgmagick-0.6.7.ebuild
+++ b/dev-python/pgmagick/pgmagick-0.6.7.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
 inherit distutils-r1
 
 DESCRIPTION="Yet another boost.python based wrapper for GraphicsMagick"
-HOMEPAGE="https://pypi.python.org/pypi/pgmagick/ https://bitbucket.org/hhatto/pgmagick/"
+HOMEPAGE="https://pypi.org/project/pgmagick/ https://bitbucket.org/hhatto/pgmagick/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/pgpdump/pgpdump-1.5.ebuild b/dev-python/pgpdump/pgpdump-1.5.ebuild
index cc2dbf0f8e516..cfd8127ebc2d9 100644
--- a/dev-python/pgpdump/pgpdump-1.5.ebuild
+++ b/dev-python/pgpdump/pgpdump-1.5.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
 inherit distutils-r1
 
 DESCRIPTION="PGP packet parser library"
-HOMEPAGE="https://pypi.python.org/pypi/pgpdump https://github.com/toofishes/python-pgpdump"
+HOMEPAGE="https://pypi.org/project/pgpdump https://github.com/toofishes/python-pgpdump"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
diff --git a/dev-python/pid/pid-2.1.1.ebuild b/dev-python/pid/pid-2.1.1.ebuild
index ed4759e413cc1..c25edf5a62ca5 100644
--- a/dev-python/pid/pid-2.1.1.ebuild
+++ b/dev-python/pid/pid-2.1.1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5} )
 inherit distutils-r1
 
 DESCRIPTION="Pidfile featuring stale detection and file-locking"
-HOMEPAGE="https://pypi.python.org/pypi/pid https://github.com/trbs/pid/"
+HOMEPAGE="https://pypi.org/project/pid https://github.com/trbs/pid/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
diff --git a/dev-python/pid/pid-2.2.0.ebuild b/dev-python/pid/pid-2.2.0.ebuild
index 9c1358e9687d0..1f45823e44660 100644
--- a/dev-python/pid/pid-2.2.0.ebuild
+++ b/dev-python/pid/pid-2.2.0.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy{,3} )
 inherit distutils-r1
 
 DESCRIPTION="Pidfile featuring stale detection and file-locking"
-HOMEPAGE="https://pypi.python.org/pypi/pid https://github.com/trbs/pid/"
+HOMEPAGE="https://pypi.org/project/pid https://github.com/trbs/pid/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
diff --git a/dev-python/piexif/piexif-1.0.12.ebuild b/dev-python/piexif/piexif-1.0.12.ebuild
index a78227b949583..810f323b5f634 100644
--- a/dev-python/piexif/piexif-1.0.12.ebuild
+++ b/dev-python/piexif/piexif-1.0.12.ebuild
@@ -9,7 +9,7 @@ inherit distutils-r1
 
 DESCRIPTION="Exif manipulation with pure Python"
 HOMEPAGE="https://github.com/hMatoba/Piexif
-	https://pypi.python.org/pypi/piexif"
+	https://pypi.org/project/piexif"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
 
 LICENSE="MIT"
diff --git a/dev-python/piexif/piexif-1.0.13.ebuild b/dev-python/piexif/piexif-1.0.13.ebuild
index 1f3c4871b8207..22bb6312313a9 100644
--- a/dev-python/piexif/piexif-1.0.13.ebuild
+++ b/dev-python/piexif/piexif-1.0.13.ebuild
@@ -9,7 +9,7 @@ inherit distutils-r1
 
 DESCRIPTION="Exif manipulation with pure Python"
 HOMEPAGE="https://github.com/hMatoba/Piexif
-	https://pypi.python.org/pypi/piexif"
+	https://pypi.org/project/piexif"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
 
 LICENSE="MIT"
diff --git a/dev-python/piexif/piexif-1.1.0_beta0.ebuild b/dev-python/piexif/piexif-1.1.0_beta0.ebuild
index d3d26468042f5..0f0edd7ea3eb0 100644
--- a/dev-python/piexif/piexif-1.1.0_beta0.ebuild
+++ b/dev-python/piexif/piexif-1.1.0_beta0.ebuild
@@ -10,7 +10,7 @@ inherit distutils-r1
 MY_P=${PN}-${PV/_beta/b}
 DESCRIPTION="Exif manipulation with pure Python"
 HOMEPAGE="https://github.com/hMatoba/Piexif
-	https://pypi.python.org/pypi/piexif"
+	https://pypi.org/project/piexif"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.zip"
 
 LICENSE="MIT"
diff --git a/dev-python/pillow/pillow-3.4.2-r1.ebuild b/dev-python/pillow/pillow-3.4.2-r1.ebuild
index febde57428564..7f169f5f119a6 100644
--- a/dev-python/pillow/pillow-3.4.2-r1.ebuild
+++ b/dev-python/pillow/pillow-3.4.2-r1.ebuild
@@ -12,7 +12,7 @@ MY_PN=Pillow
 MY_P=${MY_PN}-${PV}
 
 DESCRIPTION="Python Imaging Library (fork)"
-HOMEPAGE="https://github.com/python-imaging/Pillow https://pypi.python.org/pypi/Pillow"
+HOMEPAGE="https://github.com/python-imaging/Pillow https://pypi.org/project/Pillow"
 SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.zip"
 
 LICENSE="HPND"
diff --git a/dev-python/pillowfight/pillowfight-0.2.ebuild b/dev-python/pillowfight/pillowfight-0.2.ebuild
index 8ecb6623d6ba5..765adce168ab0 100644
--- a/dev-python/pillowfight/pillowfight-0.2.ebuild
+++ b/dev-python/pillowfight/pillowfight-0.2.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5} pypy pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="Eases the transition from PIL to Pillow"
-HOMEPAGE="https://pypi.python.org/pypi/pillowfight/ https://github.com/beanbaginc/pillowfight"
+HOMEPAGE="https://pypi.org/project/pillowfight/ https://github.com/beanbaginc/pillowfight"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
diff --git a/dev-python/pip/pip-7.1.2.ebuild b/dev-python/pip/pip-7.1.2.ebuild
index 99f9e2eb5b78b..d721dea510e2e 100644
--- a/dev-python/pip/pip-7.1.2.ebuild
+++ b/dev-python/pip/pip-7.1.2.ebuild
@@ -9,7 +9,7 @@ PYTHON_REQ_USE="threads(+)"
 inherit bash-completion-r1 distutils-r1
 
 DESCRIPTION="Installs python packages -- replacement for easy_install"
-HOMEPAGE="https://pip.pypa.io/ https://pypi.python.org/pypi/pip/ https://github.com/pypa/pip/"
+HOMEPAGE="https://pip.pypa.io/ https://pypi.org/project/pip/ https://github.com/pypa/pip/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/pip/pip-9.0.1-r1.ebuild b/dev-python/pip/pip-9.0.1-r1.ebuild
index 971b94875fd94..fa02fc68f6cf1 100644
--- a/dev-python/pip/pip-9.0.1-r1.ebuild
+++ b/dev-python/pip/pip-9.0.1-r1.ebuild
@@ -9,7 +9,7 @@ PYTHON_REQ_USE="threads(+)"
 inherit eutils bash-completion-r1 distutils-r1
 
 DESCRIPTION="Installs python packages -- replacement for easy_install"
-HOMEPAGE="https://pip.pypa.io/ https://pypi.python.org/pypi/pip/ https://github.com/pypa/pip/"
+HOMEPAGE="https://pip.pypa.io/ https://pypi.org/project/pip/ https://github.com/pypa/pip/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/pip/pip-9.0.1-r2.ebuild b/dev-python/pip/pip-9.0.1-r2.ebuild
index ec7541adfb8e9..0e8e869030011 100644
--- a/dev-python/pip/pip-9.0.1-r2.ebuild
+++ b/dev-python/pip/pip-9.0.1-r2.ebuild
@@ -9,7 +9,7 @@ PYTHON_REQ_USE="threads(+)"
 inherit eutils bash-completion-r1 distutils-r1
 
 DESCRIPTION="Installs python packages -- replacement for easy_install"
-HOMEPAGE="https://pip.pypa.io/ https://pypi.python.org/pypi/pip/ https://github.com/pypa/pip/"
+HOMEPAGE="https://pip.pypa.io/ https://pypi.org/project/pip/ https://github.com/pypa/pip/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/pipenv/pipenv-9.0.0-r1.ebuild b/dev-python/pipenv/pipenv-9.0.0-r1.ebuild
index fd27194151287..d1c68dab1f5f6 100644
--- a/dev-python/pipenv/pipenv-9.0.0-r1.ebuild
+++ b/dev-python/pipenv/pipenv-9.0.0-r1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_{4,5,6}} )
 inherit distutils-r1
 
 DESCRIPTION="Python Development Workflow for Humans"
-HOMEPAGE="https://github.com/pypa/pipenv https://pypi.python.org/pypi/pipenv"
+HOMEPAGE="https://github.com/pypa/pipenv https://pypi.org/project/pipenv"
 SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/pipenv/pipenv-9.0.0.ebuild b/dev-python/pipenv/pipenv-9.0.0.ebuild
index 8e681d97e156a..af88b67292e50 100644
--- a/dev-python/pipenv/pipenv-9.0.0.ebuild
+++ b/dev-python/pipenv/pipenv-9.0.0.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_{4,5,6}} )
 inherit distutils-r1
 
 DESCRIPTION="Python Development Workflow for Humans"
-HOMEPAGE="https://github.com/pypa/pipenv https://pypi.python.org/pypi/pipenv"
+HOMEPAGE="https://github.com/pypa/pipenv https://pypi.org/project/pipenv"
 SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/pkgconfig/pkgconfig-1.2.2.ebuild b/dev-python/pkgconfig/pkgconfig-1.2.2.ebuild
index 382f187d4443d..8261cbe1a901c 100644
--- a/dev-python/pkgconfig/pkgconfig-1.2.2.ebuild
+++ b/dev-python/pkgconfig/pkgconfig-1.2.2.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
 inherit distutils-r1
 
 DESCRIPTION="Interface Python with pkg-config"
-HOMEPAGE="https://pypi.python.org/pypi/pkgconfig/ https://github.com/matze/pkgconfig"
+HOMEPAGE="https://pypi.org/project/pkgconfig/ https://github.com/matze/pkgconfig"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/pkginfo/pkginfo-1.2.1.ebuild b/dev-python/pkginfo/pkginfo-1.2.1.ebuild
index dca8bf6c63ac4..f8eaa7b035885 100644
--- a/dev-python/pkginfo/pkginfo-1.2.1.ebuild
+++ b/dev-python/pkginfo/pkginfo-1.2.1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="Provides an API for querying the distutils metadata written in a PKG-INFO file"
-HOMEPAGE="https://pypi.python.org/pypi/pkginfo"
+HOMEPAGE="https://pypi.org/project/pkginfo"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 KEYWORDS="amd64 arm ~arm64 ppc ppc64 x86"
 IUSE="doc examples"
diff --git a/dev-python/pkginfo/pkginfo-1.4.2.ebuild b/dev-python/pkginfo/pkginfo-1.4.2.ebuild
index a006ae9cbcac5..e1ba9597b682b 100644
--- a/dev-python/pkginfo/pkginfo-1.4.2.ebuild
+++ b/dev-python/pkginfo/pkginfo-1.4.2.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="Provides an API for querying the distutils metadata written in a PKG-INFO file"
-HOMEPAGE="https://pypi.python.org/pypi/pkginfo"
+HOMEPAGE="https://pypi.org/project/pkginfo"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/pluggy/pluggy-0.5.2.ebuild b/dev-python/pluggy/pluggy-0.5.2.ebuild
index 03196120f2fed..1424c16e30d0f 100644
--- a/dev-python/pluggy/pluggy-0.5.2.ebuild
+++ b/dev-python/pluggy/pluggy-0.5.2.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_{4,5,6}} pypy pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="plugin and hook calling mechanisms for python"
-HOMEPAGE="https://pluggy.readthedocs.io/ https://github.com/pytest-dev/pluggy https://pypi.python.org/pypi/pluggy"
+HOMEPAGE="https://pluggy.readthedocs.io/ https://github.com/pytest-dev/pluggy https://pypi.org/project/pluggy"
 SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/pluggy/pluggy-0.6.0.ebuild b/dev-python/pluggy/pluggy-0.6.0.ebuild
index b1ccdf1c986f9..74ab2b537eefe 100644
--- a/dev-python/pluggy/pluggy-0.6.0.ebuild
+++ b/dev-python/pluggy/pluggy-0.6.0.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_{4,5,6}} pypy pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="plugin and hook calling mechanisms for python"
-HOMEPAGE="https://pluggy.readthedocs.io/ https://github.com/pytest-dev/pluggy https://pypi.python.org/pypi/pluggy"
+HOMEPAGE="https://pluggy.readthedocs.io/ https://github.com/pytest-dev/pluggy https://pypi.org/project/pluggy"
 SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/ply/ply-3.10.ebuild b/dev-python/ply/ply-3.10.ebuild
index 6325f2c97702d..46a3c2d89f920 100644
--- a/dev-python/ply/ply-3.10.ebuild
+++ b/dev-python/ply/ply-3.10.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="Python Lex-Yacc library"
-HOMEPAGE="http://www.dabeaz.com/ply/ https://pypi.python.org/pypi/ply"
+HOMEPAGE="http://www.dabeaz.com/ply/ https://pypi.org/project/ply"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/ply/ply-3.11.ebuild b/dev-python/ply/ply-3.11.ebuild
index 072c14822c068..de22eaf34f616 100644
--- a/dev-python/ply/ply-3.11.ebuild
+++ b/dev-python/ply/ply-3.11.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="Python Lex-Yacc library"
-HOMEPAGE="http://www.dabeaz.com/ply/ https://pypi.python.org/pypi/ply"
+HOMEPAGE="http://www.dabeaz.com/ply/ https://pypi.org/project/ply"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/ply/ply-3.6-r1.ebuild b/dev-python/ply/ply-3.6-r1.ebuild
index 78598ff6fcbd4..3d508e33a46a4 100644
--- a/dev-python/ply/ply-3.6-r1.ebuild
+++ b/dev-python/ply/ply-3.6-r1.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
 inherit distutils-r1
 
 DESCRIPTION="Python Lex-Yacc library"
-HOMEPAGE="http://www.dabeaz.com/ply/ https://pypi.python.org/pypi/ply"
+HOMEPAGE="http://www.dabeaz.com/ply/ https://pypi.org/project/ply"
 SRC_URI="http://www.dabeaz.com/ply/${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/ply/ply-3.9.ebuild b/dev-python/ply/ply-3.9.ebuild
index 3624433e01ab7..7b1ea5caa633e 100644
--- a/dev-python/ply/ply-3.9.ebuild
+++ b/dev-python/ply/ply-3.9.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="Python Lex-Yacc library"
-HOMEPAGE="http://www.dabeaz.com/ply/ https://pypi.python.org/pypi/ply"
+HOMEPAGE="http://www.dabeaz.com/ply/ https://pypi.org/project/ply"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/pockets/pockets-0.3.ebuild b/dev-python/pockets/pockets-0.3.ebuild
index 51e8ddb01a74c..c1ce16a273d5f 100644
--- a/dev-python/pockets/pockets-0.3.ebuild
+++ b/dev-python/pockets/pockets-0.3.ebuild
@@ -10,7 +10,7 @@ inherit distutils-r1
 IUSE="test"
 
 DESCRIPTION="A collection of helpful Python tools"
-HOMEPAGE="https://pypi.python.org/pypi/pockets"
+HOMEPAGE="https://pypi.org/project/pockets"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/pockets/pockets-0.5.1.ebuild b/dev-python/pockets/pockets-0.5.1.ebuild
index dbd67e0094293..027744cd2906d 100644
--- a/dev-python/pockets/pockets-0.5.1.ebuild
+++ b/dev-python/pockets/pockets-0.5.1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
 inherit distutils-r1
 
 DESCRIPTION="Collection of helpful Python tools"
-HOMEPAGE="https://pypi.python.org/pypi/pockets"
+HOMEPAGE="https://pypi.org/project/pockets"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/portend/portend-2.2.ebuild b/dev-python/portend/portend-2.2.ebuild
index 330589589cb48..7f2fbbd276600 100644
--- a/dev-python/portend/portend-2.2.ebuild
+++ b/dev-python/portend/portend-2.2.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="TCP port monitoring utilities"
-HOMEPAGE="https://pypi.python.org/pypi/portend https://github.com/jaraco/portend"
+HOMEPAGE="https://pypi.org/project/portend https://github.com/jaraco/portend"
 SRC_URI="mirror://pypi/p/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/pretend/pretend-1.0.8-r1.ebuild b/dev-python/pretend/pretend-1.0.8-r1.ebuild
index 89d768e64d71a..702f6be1c9863 100644
--- a/dev-python/pretend/pretend-1.0.8-r1.ebuild
+++ b/dev-python/pretend/pretend-1.0.8-r1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="A library for stubbing in Python"
-HOMEPAGE="https://github.com/alex/pretend/ https://pypi.python.org/pypi/pretend/"
+HOMEPAGE="https://github.com/alex/pretend/ https://pypi.org/project/pretend/"
 SRC_URI="https://github.com/alex/pretend/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/pretend/pretend-1.0.8.ebuild b/dev-python/pretend/pretend-1.0.8.ebuild
index fe04756ba4825..1c7b67cf6ef38 100644
--- a/dev-python/pretend/pretend-1.0.8.ebuild
+++ b/dev-python/pretend/pretend-1.0.8.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="A library for stubbing in Python"
-HOMEPAGE="https://github.com/alex/pretend/ https://pypi.python.org/pypi/pretend/"
+HOMEPAGE="https://github.com/alex/pretend/ https://pypi.org/project/pretend/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/priority/priority-1.3.0.ebuild b/dev-python/priority/priority-1.3.0.ebuild
index 99a72f2f1dcbc..fe1ab019e37a3 100644
--- a/dev-python/priority/priority-1.3.0.ebuild
+++ b/dev-python/priority/priority-1.3.0.ebuild
@@ -9,7 +9,7 @@ inherit distutils-r1
 DESCRIPTION="A pure-Python implementation of the HTTP/2 priority tree"
 HOMEPAGE="https://python-hyper.org/priority/en/latest/
 	https://github.com/python-hyper/priority
-	https://pypi.python.org/pypi/priority"
+	https://pypi.org/project/priority"
 SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/process-tests/process-tests-1.2.0.ebuild b/dev-python/process-tests/process-tests-1.2.0.ebuild
index d149bffdbbfa9..2040c41235751 100644
--- a/dev-python/process-tests/process-tests-1.2.0.ebuild
+++ b/dev-python/process-tests/process-tests-1.2.0.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="Tools for testing processes"
-HOMEPAGE="https://github.com/ionelmc/python-process-tests https://pypi.python.org/pypi/process-tests"
+HOMEPAGE="https://github.com/ionelmc/python-process-tests https://pypi.org/project/process-tests"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
diff --git a/dev-python/processing/processing-0.52-r1.ebuild b/dev-python/processing/processing-0.52-r1.ebuild
index b05c393de5558..3f5e362fcc392 100644
--- a/dev-python/processing/processing-0.52-r1.ebuild
+++ b/dev-python/processing/processing-0.52-r1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 )
 inherit distutils-r1 flag-o-matic
 
 DESCRIPTION="Package for using processes, which mimics the threading module API"
-HOMEPAGE="https://pypi.python.org/pypi/processing"
+HOMEPAGE="https://pypi.org/project/processing"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
 
 LICENSE="BSD"
diff --git a/dev-python/progress/progress-1.2.ebuild b/dev-python/progress/progress-1.2.ebuild
index 3ebc1c9b4ff5b..1fbbcd28a3198 100644
--- a/dev-python/progress/progress-1.2.ebuild
+++ b/dev-python/progress/progress-1.2.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
 inherit bash-completion-r1 distutils-r1
 
 DESCRIPTION="Easy to use progress bars"
-HOMEPAGE="https://pypi.python.org/pypi/progress https://github.com/verigak/progress/"
+HOMEPAGE="https://pypi.org/project/progress https://github.com/verigak/progress/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
diff --git a/dev-python/progress/progress-1.3.ebuild b/dev-python/progress/progress-1.3.ebuild
index c391e80d3d6c4..0f54c01628537 100644
--- a/dev-python/progress/progress-1.3.ebuild
+++ b/dev-python/progress/progress-1.3.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
 inherit bash-completion-r1 distutils-r1
 
 DESCRIPTION="Easy to use progress bars"
-HOMEPAGE="https://pypi.python.org/pypi/progress https://github.com/verigak/progress/"
+HOMEPAGE="https://pypi.org/project/progress https://github.com/verigak/progress/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
diff --git a/dev-python/progressbar/progressbar-2.3-r3.ebuild b/dev-python/progressbar/progressbar-2.3-r3.ebuild
index fda8d2843f91e..1882439d8ba08 100644
--- a/dev-python/progressbar/progressbar-2.3-r3.ebuild
+++ b/dev-python/progressbar/progressbar-2.3-r3.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3)
 inherit distutils-r1
 
 DESCRIPTION="Text progressbar library for python"
-HOMEPAGE="https://pypi.python.org/pypi/progressbar"
+HOMEPAGE="https://pypi.org/project/progressbar"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="|| ( LGPL-2.1 BSD )"
diff --git a/dev-python/prometheus_client/prometheus_client-0.1.1.ebuild b/dev-python/prometheus_client/prometheus_client-0.1.1.ebuild
index 375445ac92dd9..b1c1d0351c70e 100644
--- a/dev-python/prometheus_client/prometheus_client-0.1.1.ebuild
+++ b/dev-python/prometheus_client/prometheus_client-0.1.1.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
 inherit distutils-r1
 
 DESCRIPTION="Python client for the Prometheus monitoring system"
-HOMEPAGE="https://pypi.python.org/pypi/prometheus_client"
+HOMEPAGE="https://pypi.org/project/prometheus_client"
 SRC_URI="https://github.com/prometheus/client_python/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
diff --git a/dev-python/prometheus_client/prometheus_client-0.2.0.ebuild b/dev-python/prometheus_client/prometheus_client-0.2.0.ebuild
index 3f109c2efec7a..49e9f09b1ea6b 100644
--- a/dev-python/prometheus_client/prometheus_client-0.2.0.ebuild
+++ b/dev-python/prometheus_client/prometheus_client-0.2.0.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
 inherit distutils-r1
 
 DESCRIPTION="Python client for the Prometheus monitoring system"
-HOMEPAGE="https://pypi.python.org/pypi/prometheus_client"
+HOMEPAGE="https://pypi.org/project/prometheus_client"
 SRC_URI="https://github.com/prometheus/client_python/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
diff --git a/dev-python/promise/promise-0.4.2.ebuild b/dev-python/promise/promise-0.4.2.ebuild
index 21f09b63d8649..c525cf2211b83 100644
--- a/dev-python/promise/promise-0.4.2.ebuild
+++ b/dev-python/promise/promise-0.4.2.ebuild
@@ -9,7 +9,7 @@ DISTUTILS_SINGLE_IMPL=1
 inherit distutils-r1
 
 DESCRIPTION="Bytecode optimisation using staticness assertions"
-HOMEPAGE="https://github.com/rfk/promise/ https://pypi.python.org/pypi/promise"
+HOMEPAGE="https://github.com/rfk/promise/ https://pypi.org/project/promise"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/prompt_toolkit/prompt_toolkit-1.0.15.ebuild b/dev-python/prompt_toolkit/prompt_toolkit-1.0.15.ebuild
index 38f33fbc3f186..b2bea2fd90674 100644
--- a/dev-python/prompt_toolkit/prompt_toolkit-1.0.15.ebuild
+++ b/dev-python/prompt_toolkit/prompt_toolkit-1.0.15.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
 inherit distutils-r1
 
 DESCRIPTION="Building powerful interactive command lines in Python"
-HOMEPAGE="https://pypi.python.org/pypi/prompt_toolkit/ https://github.com/jonathanslenders/python-prompt-toolkit"
+HOMEPAGE="https://pypi.org/project/prompt_toolkit/ https://github.com/jonathanslenders/python-prompt-toolkit"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
diff --git a/dev-python/prov/prov-1.5.0.ebuild b/dev-python/prov/prov-1.5.0.ebuild
index 0459f01d6699d..39e88cd28c050 100644
--- a/dev-python/prov/prov-1.5.0.ebuild
+++ b/dev-python/prov/prov-1.5.0.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5} )
 inherit distutils-r1
 
 DESCRIPTION="W3C provenance data dodel library"
-HOMEPAGE="https://pypi.python.org/pypi/prov"
+HOMEPAGE="https://pypi.org/project/prov"
 SRC_URI="mirror://pypi/p/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/prov/prov-1.5.1.ebuild b/dev-python/prov/prov-1.5.1.ebuild
index 1e40c222e242f..5718bcd38c9dd 100644
--- a/dev-python/prov/prov-1.5.1.ebuild
+++ b/dev-python/prov/prov-1.5.1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5} )
 inherit distutils-r1
 
 DESCRIPTION="W3C provenance data dodel library"
-HOMEPAGE="https://pypi.python.org/pypi/prov"
+HOMEPAGE="https://pypi.org/project/prov"
 SRC_URI="mirror://pypi/p/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/psutil/psutil-5.4.1.ebuild b/dev-python/psutil/psutil-5.4.1.ebuild
index d7cdccf4f729f..272d780175ca9 100644
--- a/dev-python/psutil/psutil-5.4.1.ebuild
+++ b/dev-python/psutil/psutil-5.4.1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="Retrieve information on running processes and system utilization"
-HOMEPAGE="https://github.com/giampaolo/psutil https://pypi.python.org/pypi/psutil/"
+HOMEPAGE="https://github.com/giampaolo/psutil https://pypi.org/project/psutil/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/psutil/psutil-5.4.3.ebuild b/dev-python/psutil/psutil-5.4.3.ebuild
index d7cdccf4f729f..272d780175ca9 100644
--- a/dev-python/psutil/psutil-5.4.3.ebuild
+++ b/dev-python/psutil/psutil-5.4.3.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="Retrieve information on running processes and system utilization"
-HOMEPAGE="https://github.com/giampaolo/psutil https://pypi.python.org/pypi/psutil/"
+HOMEPAGE="https://github.com/giampaolo/psutil https://pypi.org/project/psutil/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/psycopg/psycopg-2.5.3.ebuild b/dev-python/psycopg/psycopg-2.5.3.ebuild
index 4fa5833cee8c3..d02892df5d905 100644
--- a/dev-python/psycopg/psycopg-2.5.3.ebuild
+++ b/dev-python/psycopg/psycopg-2.5.3.ebuild
@@ -10,7 +10,7 @@ MY_PN="${PN}2"
 MY_P="${MY_PN}-${PV}"
 
 DESCRIPTION="PostgreSQL database adapter for Python"
-HOMEPAGE="http://initd.org/psycopg/ https://pypi.python.org/pypi/psycopg2"
+HOMEPAGE="http://initd.org/psycopg/ https://pypi.org/project/psycopg2"
 SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="LGPL-3+"
diff --git a/dev-python/psycopg/psycopg-2.6.2.ebuild b/dev-python/psycopg/psycopg-2.6.2.ebuild
index 3ebb4749cd184..f5f8112de5e76 100644
--- a/dev-python/psycopg/psycopg-2.6.2.ebuild
+++ b/dev-python/psycopg/psycopg-2.6.2.ebuild
@@ -11,7 +11,7 @@ MY_PN="${PN}2"
 MY_P="${MY_PN}-${PV}"
 
 DESCRIPTION="PostgreSQL database adapter for Python"
-HOMEPAGE="http://initd.org/psycopg/ https://pypi.python.org/pypi/psycopg2"
+HOMEPAGE="http://initd.org/psycopg/ https://pypi.org/project/psycopg2"
 SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="LGPL-3+"
diff --git a/dev-python/psycopg/psycopg-2.7.3.1.ebuild b/dev-python/psycopg/psycopg-2.7.3.1.ebuild
index 8571410b80b69..e9907f29482c7 100644
--- a/dev-python/psycopg/psycopg-2.7.3.1.ebuild
+++ b/dev-python/psycopg/psycopg-2.7.3.1.ebuild
@@ -11,7 +11,7 @@ MY_PN="${PN}2"
 MY_P="${MY_PN}-${PV}"
 
 DESCRIPTION="PostgreSQL database adapter for Python"
-HOMEPAGE="http://initd.org/psycopg/ https://pypi.python.org/pypi/psycopg2"
+HOMEPAGE="http://initd.org/psycopg/ https://pypi.org/project/psycopg2"
 SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="LGPL-3+"
diff --git a/dev-python/psycopg/psycopg-2.7.3.2.ebuild b/dev-python/psycopg/psycopg-2.7.3.2.ebuild
index 93f6d5ad9cbb1..37400e78385ae 100644
--- a/dev-python/psycopg/psycopg-2.7.3.2.ebuild
+++ b/dev-python/psycopg/psycopg-2.7.3.2.ebuild
@@ -11,7 +11,7 @@ MY_PN="${PN}2"
 MY_P="${MY_PN}-${PV}"
 
 DESCRIPTION="PostgreSQL database adapter for Python"
-HOMEPAGE="http://initd.org/psycopg/ https://pypi.python.org/pypi/psycopg2"
+HOMEPAGE="http://initd.org/psycopg/ https://pypi.org/project/psycopg2"
 SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="LGPL-3+"
diff --git a/dev-python/psycopg/psycopg-2.7.3.ebuild b/dev-python/psycopg/psycopg-2.7.3.ebuild
index f70647ab04cac..66c4728a1bc90 100644
--- a/dev-python/psycopg/psycopg-2.7.3.ebuild
+++ b/dev-python/psycopg/psycopg-2.7.3.ebuild
@@ -11,7 +11,7 @@ MY_PN="${PN}2"
 MY_P="${MY_PN}-${PV}"
 
 DESCRIPTION="PostgreSQL database adapter for Python"
-HOMEPAGE="http://initd.org/psycopg/ https://pypi.python.org/pypi/psycopg2"
+HOMEPAGE="http://initd.org/psycopg/ https://pypi.org/project/psycopg2"
 SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="LGPL-3+"
diff --git a/dev-python/ptpython/ptpython-0.33-r1.ebuild b/dev-python/ptpython/ptpython-0.33-r1.ebuild
index 45f9f1f33141e..f27a8e8028d86 100644
--- a/dev-python/ptpython/ptpython-0.33-r1.ebuild
+++ b/dev-python/ptpython/ptpython-0.33-r1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
 inherit distutils-r1 eutils
 
 DESCRIPTION="Python REPL build on top of prompt_toolkit"
-HOMEPAGE="https://pypi.python.org/pypi/ptpython/ https://github.com/jonathanslenders/ptpython"
+HOMEPAGE="https://pypi.org/project/ptpython/ https://github.com/jonathanslenders/ptpython"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
diff --git a/dev-python/ptpython/ptpython-0.33.ebuild b/dev-python/ptpython/ptpython-0.33.ebuild
index b1c5fb77f83f1..3ae04d778f121 100644
--- a/dev-python/ptpython/ptpython-0.33.ebuild
+++ b/dev-python/ptpython/ptpython-0.33.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5} )
 inherit distutils-r1 eutils
 
 DESCRIPTION="Python REPL build on top of prompt_toolkit"
-HOMEPAGE="https://pypi.python.org/pypi/ptpython/ https://github.com/jonathanslenders/ptpython"
+HOMEPAGE="https://pypi.org/project/ptpython/ https://github.com/jonathanslenders/ptpython"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
diff --git a/dev-python/pudb/pudb-2017.1.4.ebuild b/dev-python/pudb/pudb-2017.1.4.ebuild
index c9c949ad5a4a6..7b72022eeab5a 100644
--- a/dev-python/pudb/pudb-2017.1.4.ebuild
+++ b/dev-python/pudb/pudb-2017.1.4.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python{2_7,3_{4,5,6}} )
 inherit distutils-r1
 
 DESCRIPTION="A full-screen, console-based Python debugger"
-HOMEPAGE="https://pypi.python.org/pypi/pudb"
+HOMEPAGE="https://pypi.org/project/pudb"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/pudge/pudge-0.1.3-r1.ebuild b/dev-python/pudge/pudge-0.1.3-r1.ebuild
index 580deb46e328c..d2353135f9e99 100644
--- a/dev-python/pudge/pudge-0.1.3-r1.ebuild
+++ b/dev-python/pudge/pudge-0.1.3-r1.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 )
 inherit distutils-r1
 
 DESCRIPTION="A documentation generator for Python projects, using Restructured Text"
-HOMEPAGE="http://pudge.lesscode.org https://pypi.python.org/pypi/pudge"
+HOMEPAGE="http://pudge.lesscode.org https://pypi.org/project/pudge"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/pupynere/pupynere-1.0.15-r1.ebuild b/dev-python/pupynere/pupynere-1.0.15-r1.ebuild
index 86a815f11e7e7..044e5cb458951 100644
--- a/dev-python/pupynere/pupynere-1.0.15-r1.ebuild
+++ b/dev-python/pupynere/pupynere-1.0.15-r1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 )
 inherit distutils-r1
 
 DESCRIPTION="Pupynere is a PUre PYthon NEtcdf REader"
-HOMEPAGE="https://pypi.python.org/pypi/pupynere/"
+HOMEPAGE="https://pypi.org/project/pupynere/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/pxml/pxml-0.2.12.ebuild b/dev-python/pxml/pxml-0.2.12.ebuild
index f9b96c5fc69b8..0b49cd8b60cb8 100644
--- a/dev-python/pxml/pxml-0.2.12.ebuild
+++ b/dev-python/pxml/pxml-0.2.12.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
 inherit distutils-r1
 
 DESCRIPTION="A python library and command-line tool to "prettify" and colorize XML"
-HOMEPAGE="https://pypi.python.org/pypi/pxml https://github.com/metagriffin/pxml"
+HOMEPAGE="https://pypi.org/project/pxml https://github.com/metagriffin/pxml"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
diff --git a/dev-python/py-amqp/py-amqp-1.4.9.ebuild b/dev-python/py-amqp/py-amqp-1.4.9.ebuild
index cff7689102b2e..4b82672bc71dc 100644
--- a/dev-python/py-amqp/py-amqp-1.4.9.ebuild
+++ b/dev-python/py-amqp/py-amqp-1.4.9.ebuild
@@ -11,7 +11,7 @@ MY_PN="amqp"
 MY_P="${MY_PN}-${PV}"
 
 DESCRIPTION="Low-level AMQP client for Python (fork of amqplib)"
-HOMEPAGE="https://github.com/celery/py-amqp https://pypi.python.org/pypi/amqp/"
+HOMEPAGE="https://github.com/celery/py-amqp https://pypi.org/project/amqp/"
 SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 S="${WORKDIR}/${MY_P}"
diff --git a/dev-python/py-amqp/py-amqp-2.2.1.ebuild b/dev-python/py-amqp/py-amqp-2.2.1.ebuild
index fa011e5422bad..b5e2a2aca3534 100644
--- a/dev-python/py-amqp/py-amqp-2.2.1.ebuild
+++ b/dev-python/py-amqp/py-amqp-2.2.1.ebuild
@@ -11,7 +11,7 @@ MY_PN="amqp"
 MY_P="${MY_PN}-${PV}"
 
 DESCRIPTION="Low-level AMQP client for Python (fork of amqplib)"
-HOMEPAGE="https://github.com/celery/py-amqp https://pypi.python.org/pypi/amqp/"
+HOMEPAGE="https://github.com/celery/py-amqp https://pypi.org/project/amqp/"
 SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 S="${WORKDIR}/${MY_P}"
diff --git a/dev-python/py-amqp/py-amqp-2.2.2.ebuild b/dev-python/py-amqp/py-amqp-2.2.2.ebuild
index fb1245f496b0b..efc12460921f4 100644
--- a/dev-python/py-amqp/py-amqp-2.2.2.ebuild
+++ b/dev-python/py-amqp/py-amqp-2.2.2.ebuild
@@ -11,7 +11,7 @@ MY_PN="amqp"
 MY_P="${MY_PN}-${PV}"
 
 DESCRIPTION="Low-level AMQP client for Python (fork of amqplib)"
-HOMEPAGE="https://github.com/celery/py-amqp https://pypi.python.org/pypi/amqp/"
+HOMEPAGE="https://github.com/celery/py-amqp https://pypi.org/project/amqp/"
 SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 S="${WORKDIR}/${MY_P}"
diff --git a/dev-python/py-cpuinfo/py-cpuinfo-3.2.0.ebuild b/dev-python/py-cpuinfo/py-cpuinfo-3.2.0.ebuild
index 308eee31c5066..5ebd847aac3b9 100644
--- a/dev-python/py-cpuinfo/py-cpuinfo-3.2.0.ebuild
+++ b/dev-python/py-cpuinfo/py-cpuinfo-3.2.0.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_{4,5,6}} pypy pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="Get CPU info with pure Python 2 & 3"
-HOMEPAGE="https://github.com/workhorsy/py-cpuinfo https://pypi.python.org/pypi/py-cpuinfo"
+HOMEPAGE="https://github.com/workhorsy/py-cpuinfo https://pypi.org/project/py-cpuinfo"
 SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/py-cpuinfo/py-cpuinfo-3.3.0.ebuild b/dev-python/py-cpuinfo/py-cpuinfo-3.3.0.ebuild
index 308eee31c5066..5ebd847aac3b9 100644
--- a/dev-python/py-cpuinfo/py-cpuinfo-3.3.0.ebuild
+++ b/dev-python/py-cpuinfo/py-cpuinfo-3.3.0.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_{4,5,6}} pypy pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="Get CPU info with pure Python 2 & 3"
-HOMEPAGE="https://github.com/workhorsy/py-cpuinfo https://pypi.python.org/pypi/py-cpuinfo"
+HOMEPAGE="https://github.com/workhorsy/py-cpuinfo https://pypi.org/project/py-cpuinfo"
 SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/py-lz4framed/py-lz4framed-0.9.6.ebuild b/dev-python/py-lz4framed/py-lz4framed-0.9.6.ebuild
index b39e398a5b18e..4341ca824f485 100644
--- a/dev-python/py-lz4framed/py-lz4framed-0.9.6.ebuild
+++ b/dev-python/py-lz4framed/py-lz4framed-0.9.6.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
 inherit distutils-r1
 
 DESCRIPTION="LZ4Frame library for Python (via C bindings)"
-HOMEPAGE="https://pypi.python.org/pypi/py-lz4framed/ https://github.com/Iotic-Labs/py-lz4framed"
+HOMEPAGE="https://pypi.org/project/py-lz4framed/ https://github.com/Iotic-Labs/py-lz4framed"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
diff --git a/dev-python/py-ubjson/py-ubjson-0.10.0.ebuild b/dev-python/py-ubjson/py-ubjson-0.10.0.ebuild
index 3505aa395ebeb..f654cd9a1c68e 100644
--- a/dev-python/py-ubjson/py-ubjson-0.10.0.ebuild
+++ b/dev-python/py-ubjson/py-ubjson-0.10.0.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6})
 inherit distutils-r1
 
 DESCRIPTION="Universal Binary JSON encoder/decoder"
-HOMEPAGE="https://github.com/Iotic-Labs/py-ubjson https://pypi.python.org/pypi/py-ubjson"
+HOMEPAGE="https://github.com/Iotic-Labs/py-ubjson https://pypi.org/project/py-ubjson"
 SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
diff --git a/dev-python/py-ubjson/py-ubjson-0.11.0.ebuild b/dev-python/py-ubjson/py-ubjson-0.11.0.ebuild
index 08ce652499c7e..aecb0d65ffe5a 100644
--- a/dev-python/py-ubjson/py-ubjson-0.11.0.ebuild
+++ b/dev-python/py-ubjson/py-ubjson-0.11.0.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6})
 inherit distutils-r1
 
 DESCRIPTION="Universal Binary JSON encoder/decoder"
-HOMEPAGE="https://github.com/Iotic-Labs/py-ubjson https://pypi.python.org/pypi/py-ubjson"
+HOMEPAGE="https://github.com/Iotic-Labs/py-ubjson https://pypi.org/project/py-ubjson"
 SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
diff --git a/dev-python/py-ubjson/py-ubjson-0.9.0.ebuild b/dev-python/py-ubjson/py-ubjson-0.9.0.ebuild
index 57e0fd09c78ea..693422a4e41cd 100644
--- a/dev-python/py-ubjson/py-ubjson-0.9.0.ebuild
+++ b/dev-python/py-ubjson/py-ubjson-0.9.0.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6})
 inherit distutils-r1
 
 DESCRIPTION="Universal Binary JSON encoder/decoder"
-HOMEPAGE="https://github.com/Iotic-Labs/py-ubjson https://pypi.python.org/pypi/py-ubjson"
+HOMEPAGE="https://github.com/Iotic-Labs/py-ubjson https://pypi.org/project/py-ubjson"
 SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
diff --git a/dev-python/py/py-1.4.30.ebuild b/dev-python/py/py-1.4.30.ebuild
index 8673019ada9bf..23b65563f29de 100644
--- a/dev-python/py/py-1.4.30.ebuild
+++ b/dev-python/py/py-1.4.30.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="library with cross-python path, ini-parsing, io, code, log facilities"
-HOMEPAGE="http://pylib.readthedocs.org/ https://pypi.python.org/pypi/py"
+HOMEPAGE="http://pylib.readthedocs.org/ https://pypi.org/project/py"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/py/py-1.4.34.ebuild b/dev-python/py/py-1.4.34.ebuild
index e6fadf662a344..789ceadfe2d13 100644
--- a/dev-python/py/py-1.4.34.ebuild
+++ b/dev-python/py/py-1.4.34.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="library with cross-python path, ini-parsing, io, code, log facilities"
-HOMEPAGE="http://pylib.readthedocs.org/ https://pypi.python.org/pypi/py"
+HOMEPAGE="http://pylib.readthedocs.org/ https://pypi.org/project/py"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/py/py-1.5.2.ebuild b/dev-python/py/py-1.5.2.ebuild
index 3c27d6bfde9d8..d03080ee2c341 100644
--- a/dev-python/py/py-1.5.2.ebuild
+++ b/dev-python/py/py-1.5.2.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="library with cross-python path, ini-parsing, io, code, log facilities"
-HOMEPAGE="http://pylib.readthedocs.org/ https://pypi.python.org/pypi/py"
+HOMEPAGE="http://pylib.readthedocs.org/ https://pypi.org/project/py"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/py/py-1.5.3.ebuild b/dev-python/py/py-1.5.3.ebuild
index fea521eca5309..b6000acfb7ced 100644
--- a/dev-python/py/py-1.5.3.ebuild
+++ b/dev-python/py/py-1.5.3.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="library with cross-python path, ini-parsing, io, code, log facilities"
-HOMEPAGE="http://pylib.readthedocs.org/ https://pypi.python.org/pypi/py"
+HOMEPAGE="http://pylib.readthedocs.org/ https://pypi.org/project/py"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/pyPdf/pyPdf-1.13-r1.ebuild b/dev-python/pyPdf/pyPdf-1.13-r1.ebuild
index 9b1663d88f039..a072b8a05c0e7 100644
--- a/dev-python/pyPdf/pyPdf-1.13-r1.ebuild
+++ b/dev-python/pyPdf/pyPdf-1.13-r1.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 )
 inherit distutils-r1
 
 DESCRIPTION="Python library to work with pdf files"
-HOMEPAGE="http://pybrary.net/pyPdf/ https://pypi.python.org/pypi/pyPdf/"
+HOMEPAGE="http://pybrary.net/pyPdf/ https://pypi.org/project/pyPdf/"
 SRC_URI="http://pybrary.net/${PN}/${P}.tar.gz"
 
 LICENSE="BSD-2"
diff --git a/dev-python/pyacoustid/pyacoustid-1.0.0-r1.ebuild b/dev-python/pyacoustid/pyacoustid-1.0.0-r1.ebuild
index 5f12b5a7acf9e..828519807499e 100644
--- a/dev-python/pyacoustid/pyacoustid-1.0.0-r1.ebuild
+++ b/dev-python/pyacoustid/pyacoustid-1.0.0-r1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 )
 inherit distutils-r1
 
 DESCRIPTION="Python module for Chromaprint acoustic fingerprinting and the Acoustid API"
-HOMEPAGE="https://pypi.python.org/pypi/pyacoustid"
+HOMEPAGE="https://pypi.org/project/pyacoustid"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/pyaes/pyaes-1.6.0.ebuild b/dev-python/pyaes/pyaes-1.6.0.ebuild
index 839a967746df2..de024d61c62aa 100644
--- a/dev-python/pyaes/pyaes-1.6.0.ebuild
+++ b/dev-python/pyaes/pyaes-1.6.0.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
 inherit distutils-r1
 
 DESCRIPTION="Pure-Python Implementation of the AES block-cipher and common modes of operation"
-HOMEPAGE="https://pypi.python.org/pypi/pyaes"
+HOMEPAGE="https://pypi.org/project/pyaes"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/pyaes/pyaes-1.6.1.ebuild b/dev-python/pyaes/pyaes-1.6.1.ebuild
index cfbc10bcf3599..2525b680205c9 100644
--- a/dev-python/pyaes/pyaes-1.6.1.ebuild
+++ b/dev-python/pyaes/pyaes-1.6.1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
 inherit distutils-r1
 
 DESCRIPTION="Pure-Python Implementation of the AES block-cipher and common modes of operation"
-HOMEPAGE="https://pypi.python.org/pypi/pyaes"
+HOMEPAGE="https://pypi.org/project/pyaes"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/pyalsaaudio/pyalsaaudio-0.7-r2.ebuild b/dev-python/pyalsaaudio/pyalsaaudio-0.7-r2.ebuild
index 980bb72e69939..e95c9035a7f23 100644
--- a/dev-python/pyalsaaudio/pyalsaaudio-0.7-r2.ebuild
+++ b/dev-python/pyalsaaudio/pyalsaaudio-0.7-r2.ebuild
@@ -9,7 +9,7 @@ inherit distutils-r1
 
 DESCRIPTION="A Python wrapper for the ALSA API"
 HOMEPAGE="https://www.sourceforge.net/projects/pyalsaaudio
-	https://pypi.python.org/pypi/pyalsaaudio"
+	https://pypi.org/project/pyalsaaudio"
 SRC_URI="mirror://sourceforge/pyalsaaudio/${P}.tar.gz
 	mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
diff --git a/dev-python/pyalsaaudio/pyalsaaudio-0.8.2.ebuild b/dev-python/pyalsaaudio/pyalsaaudio-0.8.2.ebuild
index 5a46d0feaffc5..0291e403e5f53 100644
--- a/dev-python/pyalsaaudio/pyalsaaudio-0.8.2.ebuild
+++ b/dev-python/pyalsaaudio/pyalsaaudio-0.8.2.ebuild
@@ -9,7 +9,7 @@ inherit distutils-r1 toolchain-funcs
 
 DESCRIPTION="A Python wrapper for the ALSA API"
 HOMEPAGE="https://www.sourceforge.net/projects/pyalsaaudio
-	https://pypi.python.org/pypi/pyalsaaudio"
+	https://pypi.org/project/pyalsaaudio"
 SRC_URI="mirror://sourceforge/pyalsaaudio/${P}.tar.gz
 	mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
diff --git a/dev-python/pyamf/pyamf-0.8.0.ebuild b/dev-python/pyamf/pyamf-0.8.0.ebuild
index d9e9bd1664e9b..da2aa6f632952 100644
--- a/dev-python/pyamf/pyamf-0.8.0.ebuild
+++ b/dev-python/pyamf/pyamf-0.8.0.ebuild
@@ -11,7 +11,7 @@ MY_PN=PyAMF
 MY_P=${MY_PN}-${PV}
 
 DESCRIPTION="Action Message Format (AMF) support for Python"
-HOMEPAGE="https://github.com/hydralabs/pyamf https://pypi.python.org/pypi/PyAMF"
+HOMEPAGE="https://github.com/hydralabs/pyamf https://pypi.org/project/PyAMF"
 SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/pyasn1-modules/pyasn1-modules-0.0.10.ebuild b/dev-python/pyasn1-modules/pyasn1-modules-0.0.10.ebuild
index e417c99978f83..4e7f2c7ed6cb4 100644
--- a/dev-python/pyasn1-modules/pyasn1-modules-0.0.10.ebuild
+++ b/dev-python/pyasn1-modules/pyasn1-modules-0.0.10.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="pyasn1 modules"
-HOMEPAGE="http://pyasn1.sourceforge.net/ https://pypi.python.org/pypi/pyasn1-modules"
+HOMEPAGE="http://pyasn1.sourceforge.net/ https://pypi.org/project/pyasn1-modules"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/pyasn1-modules/pyasn1-modules-0.0.5-r1.ebuild b/dev-python/pyasn1-modules/pyasn1-modules-0.0.5-r1.ebuild
index 2fc7e8c146bef..944c5d4f439d5 100644
--- a/dev-python/pyasn1-modules/pyasn1-modules-0.0.5-r1.ebuild
+++ b/dev-python/pyasn1-modules/pyasn1-modules-0.0.5-r1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="pyasn1 modules"
-HOMEPAGE="http://pyasn1.sourceforge.net/ https://pypi.python.org/pypi/pyasn1-modules"
+HOMEPAGE="http://pyasn1.sourceforge.net/ https://pypi.org/project/pyasn1-modules"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/pyasn1-modules/pyasn1-modules-0.0.8.ebuild b/dev-python/pyasn1-modules/pyasn1-modules-0.0.8.ebuild
index 8a5076c34ae06..0c528264db1ba 100644
--- a/dev-python/pyasn1-modules/pyasn1-modules-0.0.8.ebuild
+++ b/dev-python/pyasn1-modules/pyasn1-modules-0.0.8.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="pyasn1 modules"
-HOMEPAGE="http://pyasn1.sourceforge.net/ https://pypi.python.org/pypi/pyasn1-modules"
+HOMEPAGE="http://pyasn1.sourceforge.net/ https://pypi.org/project/pyasn1-modules"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/pyasn1-modules/pyasn1-modules-0.1.4.ebuild b/dev-python/pyasn1-modules/pyasn1-modules-0.1.4.ebuild
index e417c99978f83..4e7f2c7ed6cb4 100644
--- a/dev-python/pyasn1-modules/pyasn1-modules-0.1.4.ebuild
+++ b/dev-python/pyasn1-modules/pyasn1-modules-0.1.4.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="pyasn1 modules"
-HOMEPAGE="http://pyasn1.sourceforge.net/ https://pypi.python.org/pypi/pyasn1-modules"
+HOMEPAGE="http://pyasn1.sourceforge.net/ https://pypi.org/project/pyasn1-modules"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/pyasn1-modules/pyasn1-modules-0.1.5.ebuild b/dev-python/pyasn1-modules/pyasn1-modules-0.1.5.ebuild
index ad773ead1c362..9ec368dc9ab3f 100644
--- a/dev-python/pyasn1-modules/pyasn1-modules-0.1.5.ebuild
+++ b/dev-python/pyasn1-modules/pyasn1-modules-0.1.5.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="pyasn1 modules"
-HOMEPAGE="http://pyasn1.sourceforge.net/ https://pypi.python.org/pypi/pyasn1-modules"
+HOMEPAGE="http://pyasn1.sourceforge.net/ https://pypi.org/project/pyasn1-modules"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/pyasn1/pyasn1-0.2.3.ebuild b/dev-python/pyasn1/pyasn1-0.2.3.ebuild
index 13d9acacaff25..1d1badd8803eb 100644
--- a/dev-python/pyasn1/pyasn1-0.2.3.ebuild
+++ b/dev-python/pyasn1/pyasn1-0.2.3.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="ASN.1 library for Python"
-HOMEPAGE="http://pyasn1.sourceforge.net/ https://pypi.python.org/pypi/pyasn1"
+HOMEPAGE="http://pyasn1.sourceforge.net/ https://pypi.org/project/pyasn1"
 SRC_URI="https://github.com/etingof/pyasn1/archive/${PV}.tar.gz -> ${P}.tar.gz"
 # The required doc/source/conf.py file is missing from the pypi:
 # https://github.com/etingof/pyasn1/issues/35
diff --git a/dev-python/pyasn1/pyasn1-0.3.7.ebuild b/dev-python/pyasn1/pyasn1-0.3.7.ebuild
index 5a824793f7596..2c48421a921c3 100644
--- a/dev-python/pyasn1/pyasn1-0.3.7.ebuild
+++ b/dev-python/pyasn1/pyasn1-0.3.7.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="ASN.1 library for Python"
-HOMEPAGE="http://pyasn1.sourceforge.net/ https://pypi.python.org/pypi/pyasn1"
+HOMEPAGE="http://pyasn1.sourceforge.net/ https://pypi.org/project/pyasn1"
 SRC_URI="https://github.com/etingof/pyasn1/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 # The required doc/source/conf.py file is missing from the pypi:
 # https://github.com/etingof/pyasn1/issues/35
diff --git a/dev-python/pyblake2/pyblake2-1.1.0.ebuild b/dev-python/pyblake2/pyblake2-1.1.0.ebuild
index 5f31497ce5cac..22ceaaeb582f4 100644
--- a/dev-python/pyblake2/pyblake2-1.1.0.ebuild
+++ b/dev-python/pyblake2/pyblake2-1.1.0.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy )
 inherit distutils-r1
 
 DESCRIPTION="BLAKE2 hash function extension module"
-HOMEPAGE="https://github.com/dchest/pyblake2 https://pypi.python.org/pypi/pyblake2"
+HOMEPAGE="https://github.com/dchest/pyblake2 https://pypi.org/project/pyblake2"
 SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
 
 # pyblake2 itself allows more licenses but blake2 allows the following three
diff --git a/dev-python/pyblake2/pyblake2-1.1.1.ebuild b/dev-python/pyblake2/pyblake2-1.1.1.ebuild
index 1c7cc912307d5..4a10a7e77002f 100644
--- a/dev-python/pyblake2/pyblake2-1.1.1.ebuild
+++ b/dev-python/pyblake2/pyblake2-1.1.1.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy{,3} )
 inherit distutils-r1
 
 DESCRIPTION="BLAKE2 hash function extension module"
-HOMEPAGE="https://github.com/dchest/pyblake2 https://pypi.python.org/pypi/pyblake2"
+HOMEPAGE="https://github.com/dchest/pyblake2 https://pypi.org/project/pyblake2"
 SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
 
 # pyblake2 itself allows more licenses but blake2 allows the following three
diff --git a/dev-python/pyblake2/pyblake2-1.1.2.ebuild b/dev-python/pyblake2/pyblake2-1.1.2.ebuild
index 1c7cc912307d5..4a10a7e77002f 100644
--- a/dev-python/pyblake2/pyblake2-1.1.2.ebuild
+++ b/dev-python/pyblake2/pyblake2-1.1.2.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy{,3} )
 inherit distutils-r1
 
 DESCRIPTION="BLAKE2 hash function extension module"
-HOMEPAGE="https://github.com/dchest/pyblake2 https://pypi.python.org/pypi/pyblake2"
+HOMEPAGE="https://github.com/dchest/pyblake2 https://pypi.org/project/pyblake2"
 SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
 
 # pyblake2 itself allows more licenses but blake2 allows the following three
diff --git a/dev-python/pybloomfiltermmap/pybloomfiltermmap-0.3.11-r1.ebuild b/dev-python/pybloomfiltermmap/pybloomfiltermmap-0.3.11-r1.ebuild
index 30495941d3b7b..a4fe6bab938cd 100644
--- a/dev-python/pybloomfiltermmap/pybloomfiltermmap-0.3.11-r1.ebuild
+++ b/dev-python/pybloomfiltermmap/pybloomfiltermmap-0.3.11-r1.ebuild
@@ -9,7 +9,7 @@ inherit distutils-r1
 
 DESCRIPTION="A Bloom filter (bloomfilter) for Python built on mmap"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-HOMEPAGE="https://pypi.python.org/pypi/pybloomfiltermmap"
+HOMEPAGE="https://pypi.org/project/pybloomfiltermmap"
 
 LICENSE="MIT"
 SLOT="0"
diff --git a/dev-python/pybloomfiltermmap/pybloomfiltermmap-0.3.14.ebuild b/dev-python/pybloomfiltermmap/pybloomfiltermmap-0.3.14.ebuild
index 1e62b8ca69657..02f9d92ccac4c 100644
--- a/dev-python/pybloomfiltermmap/pybloomfiltermmap-0.3.14.ebuild
+++ b/dev-python/pybloomfiltermmap/pybloomfiltermmap-0.3.14.ebuild
@@ -9,7 +9,7 @@ inherit distutils-r1
 
 DESCRIPTION="A Bloom filter (bloomfilter) for Python built on mmap"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-HOMEPAGE="https://pypi.python.org/pypi/pybloomfiltermmap"
+HOMEPAGE="https://pypi.org/project/pybloomfiltermmap"
 
 LICENSE="MIT"
 SLOT="0"
diff --git a/dev-python/pybloomfiltermmap/pybloomfiltermmap-0.3.15.ebuild b/dev-python/pybloomfiltermmap/pybloomfiltermmap-0.3.15.ebuild
index 683066b5c6ab2..a97656b4d3b26 100644
--- a/dev-python/pybloomfiltermmap/pybloomfiltermmap-0.3.15.ebuild
+++ b/dev-python/pybloomfiltermmap/pybloomfiltermmap-0.3.15.ebuild
@@ -9,7 +9,7 @@ inherit distutils-r1
 
 DESCRIPTION="A Bloom filter (bloomfilter) for Python built on mmap"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-HOMEPAGE="https://pypi.python.org/pypi/pybloomfiltermmap"
+HOMEPAGE="https://pypi.org/project/pybloomfiltermmap"
 
 LICENSE="MIT"
 SLOT="0"
diff --git a/dev-python/pycadf/pycadf-2.6.0.ebuild b/dev-python/pycadf/pycadf-2.6.0.ebuild
index 30e2b250cc46e..64af85a8b0adc 100644
--- a/dev-python/pycadf/pycadf-2.6.0.ebuild
+++ b/dev-python/pycadf/pycadf-2.6.0.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
 inherit distutils-r1
 
 DESCRIPTION="python implementation of DMTF Cloud Audit (CADF) data model"
-HOMEPAGE="https://pypi.python.org/pypi/pycadf"
+HOMEPAGE="https://pypi.org/project/pycadf"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
diff --git a/dev-python/pycadf/pycadf-2.7.0.ebuild b/dev-python/pycadf/pycadf-2.7.0.ebuild
index 448691143d117..0131e0a94e096 100644
--- a/dev-python/pycadf/pycadf-2.7.0.ebuild
+++ b/dev-python/pycadf/pycadf-2.7.0.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
 inherit distutils-r1
 
 DESCRIPTION="python implementation of DMTF Cloud Audit (CADF) data model"
-HOMEPAGE="https://pypi.python.org/pypi/pycadf"
+HOMEPAGE="https://pypi.org/project/pycadf"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
diff --git a/dev-python/pycdio/pycdio-0.20-r1.ebuild b/dev-python/pycdio/pycdio-0.20-r1.ebuild
index 755b9a8abdf9f..cd240baf212e1 100644
--- a/dev-python/pycdio/pycdio-0.20-r1.ebuild
+++ b/dev-python/pycdio/pycdio-0.20-r1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 )
 inherit distutils-r1 flag-o-matic
 
 DESCRIPTION="Python OO interface to libcdio (CD Input and Control library)"
-HOMEPAGE="https://savannah.gnu.org/projects/libcdio/ https://pypi.python.org/pypi/pycdio"
+HOMEPAGE="https://savannah.gnu.org/projects/libcdio/ https://pypi.org/project/pycdio"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
diff --git a/dev-python/pychecker/pychecker-0.8.19-r1.ebuild b/dev-python/pychecker/pychecker-0.8.19-r1.ebuild
index ea99345e3d094..6f10896a5ffd0 100644
--- a/dev-python/pychecker/pychecker-0.8.19-r1.ebuild
+++ b/dev-python/pychecker/pychecker-0.8.19-r1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 )
 inherit distutils-r1
 
 DESCRIPTION="Python source code checking tool"
-HOMEPAGE="http://pychecker.sourceforge.net/ https://pypi.python.org/pypi/PyChecker"
+HOMEPAGE="http://pychecker.sourceforge.net/ https://pypi.org/project/PyChecker"
 SRC_URI="mirror://sourceforge/pychecker/${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/pyclamav/pyclamav-0.4.1-r2.ebuild b/dev-python/pyclamav/pyclamav-0.4.1-r2.ebuild
index 482de297cd089..d5461a3aa6cc5 100644
--- a/dev-python/pyclamav/pyclamav-0.4.1-r2.ebuild
+++ b/dev-python/pyclamav/pyclamav-0.4.1-r2.ebuild
@@ -9,7 +9,7 @@ inherit distutils-r1
 
 DESCRIPTION="Python binding for libclamav"
 HOMEPAGE="https://xael.org/norman/python/pyclamav/
-	https://pypi.python.org/pypi/pyclamav"
+	https://pypi.org/project/pyclamav"
 SRC_URI="https://xael.org/norman/python/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
diff --git a/dev-python/pycmd/pycmd-1.2.ebuild b/dev-python/pycmd/pycmd-1.2.ebuild
index 613ea33004bf3..94517d6fbd162 100644
--- a/dev-python/pycmd/pycmd-1.2.ebuild
+++ b/dev-python/pycmd/pycmd-1.2.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="pycmd: tools for managing/searching Python related files"
-HOMEPAGE="https://pypi.python.org/pypi/pycmd"
+HOMEPAGE="https://pypi.org/project/pycmd"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/pycodestyle/pycodestyle-2.0.0.ebuild b/dev-python/pycodestyle/pycodestyle-2.0.0.ebuild
index 43b8a0759c754..a44cd5d6ae025 100644
--- a/dev-python/pycodestyle/pycodestyle-2.0.0.ebuild
+++ b/dev-python/pycodestyle/pycodestyle-2.0.0.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="Python style guide checker (fka pep8)"
-HOMEPAGE="https://pypi.python.org/pypi/pycodestyle"
+HOMEPAGE="https://pypi.org/project/pycodestyle"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/pycodestyle/pycodestyle-2.1.0.ebuild b/dev-python/pycodestyle/pycodestyle-2.1.0.ebuild
index 43b8a0759c754..a44cd5d6ae025 100644
--- a/dev-python/pycodestyle/pycodestyle-2.1.0.ebuild
+++ b/dev-python/pycodestyle/pycodestyle-2.1.0.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="Python style guide checker (fka pep8)"
-HOMEPAGE="https://pypi.python.org/pypi/pycodestyle"
+HOMEPAGE="https://pypi.org/project/pycodestyle"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/pycodestyle/pycodestyle-2.2.0.ebuild b/dev-python/pycodestyle/pycodestyle-2.2.0.ebuild
index 948a84180d7ca..1b63d179dd128 100644
--- a/dev-python/pycodestyle/pycodestyle-2.2.0.ebuild
+++ b/dev-python/pycodestyle/pycodestyle-2.2.0.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="Python style guide checker (fka pep8)"
-HOMEPAGE="https://pypi.python.org/pypi/pycodestyle"
+HOMEPAGE="https://pypi.org/project/pycodestyle"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/pycodestyle/pycodestyle-2.3.1.ebuild b/dev-python/pycodestyle/pycodestyle-2.3.1.ebuild
index d1488000d1839..d55fb4d14bc91 100644
--- a/dev-python/pycodestyle/pycodestyle-2.3.1.ebuild
+++ b/dev-python/pycodestyle/pycodestyle-2.3.1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="Python style guide checker (fka pep8)"
-HOMEPAGE="https://pypi.python.org/pypi/pycodestyle"
+HOMEPAGE="https://pypi.org/project/pycodestyle"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/pycrypto/pycrypto-2.6.1-r2.ebuild b/dev-python/pycrypto/pycrypto-2.6.1-r2.ebuild
index c4245bf4a4a1a..b66290382c7dd 100644
--- a/dev-python/pycrypto/pycrypto-2.6.1-r2.ebuild
+++ b/dev-python/pycrypto/pycrypto-2.6.1-r2.ebuild
@@ -10,7 +10,7 @@ inherit distutils-r1 flag-o-matic
 
 DESCRIPTION="Python Cryptography Toolkit"
 HOMEPAGE="https://www.dlitz.net/software/pycrypto/
-	https://pypi.python.org/pypi/pycrypto"
+	https://pypi.org/project/pycrypto"
 SRC_URI="http://ftp.dlitz.net/pub/dlitz/crypto/pycrypto/${P}.tar.gz"
 
 LICENSE="PSF-2 public-domain"
diff --git a/dev-python/pycryptodome/pycryptodome-3.4.7.ebuild b/dev-python/pycryptodome/pycryptodome-3.4.7.ebuild
index c7fabe3d3c2e3..1abfce8d237c0 100644
--- a/dev-python/pycryptodome/pycryptodome-3.4.7.ebuild
+++ b/dev-python/pycryptodome/pycryptodome-3.4.7.ebuild
@@ -9,7 +9,7 @@ PYTHON_REQ_USE="threads(+)"
 inherit distutils-r1
 
 DESCRIPTION="A self-contained cryptographic library for Python"
-HOMEPAGE="https://www.pycryptodome.org https://github.com/Legrandin/pycryptodome https://pypi.python.org/pypi/pycryptodome"
+HOMEPAGE="https://www.pycryptodome.org https://github.com/Legrandin/pycryptodome https://pypi.org/project/pycryptodome"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD-2 Unlicense"
diff --git a/dev-python/pycryptopp/pycryptopp-0.6.0.ebuild b/dev-python/pycryptopp/pycryptopp-0.6.0.ebuild
index 01b582c7cb3ba..f70d7056d922f 100644
--- a/dev-python/pycryptopp/pycryptopp-0.6.0.ebuild
+++ b/dev-python/pycryptopp/pycryptopp-0.6.0.ebuild
@@ -11,7 +11,7 @@ MY_P="${P}.${NUM}"
 
 DESCRIPTION="Python wrappers for a few algorithms from the Crypto++ library"
 HOMEPAGE="https://tahoe-lafs.org/trac/pycryptopp
-	https://pypi.python.org/pypi/pycryptopp"
+	https://pypi.org/project/pycryptopp"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
diff --git a/dev-python/pycryptopp/pycryptopp-0.7.1.ebuild b/dev-python/pycryptopp/pycryptopp-0.7.1.ebuild
index 648eaf39acdd4..adc00405016ba 100644
--- a/dev-python/pycryptopp/pycryptopp-0.7.1.ebuild
+++ b/dev-python/pycryptopp/pycryptopp-0.7.1.ebuild
@@ -11,7 +11,7 @@ MY_P="${P}.${NUM}"
 
 DESCRIPTION="Python wrappers for a few algorithms from the Crypto++ library"
 HOMEPAGE="https://tahoe-lafs.org/trac/pycryptopp
-	https://pypi.python.org/pypi/pycryptopp"
+	https://pypi.org/project/pycryptopp"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
diff --git a/dev-python/pycuda/pycuda-2012.1.ebuild b/dev-python/pycuda/pycuda-2012.1.ebuild
index 8c8e48ffd0282..62b943dca773d 100644
--- a/dev-python/pycuda/pycuda-2012.1.ebuild
+++ b/dev-python/pycuda/pycuda-2012.1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 )
 inherit cuda distutils-r1 multilib
 
 DESCRIPTION="Python wrapper for NVIDIA CUDA"
-HOMEPAGE="http://mathema.tician.de/software/pycuda/ https://pypi.python.org/pypi/pycuda"
+HOMEPAGE="http://mathema.tician.de/software/pycuda/ https://pypi.org/project/pycuda"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
diff --git a/dev-python/pycuda/pycuda-2013.1.1.ebuild b/dev-python/pycuda/pycuda-2013.1.1.ebuild
index 38d353c8f62b5..095c58af06a28 100644
--- a/dev-python/pycuda/pycuda-2013.1.1.ebuild
+++ b/dev-python/pycuda/pycuda-2013.1.1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 )
 inherit cuda distutils-r1 multilib
 
 DESCRIPTION="Python wrapper for NVIDIA CUDA"
-HOMEPAGE="http://mathema.tician.de/software/pycuda/ https://pypi.python.org/pypi/pycuda"
+HOMEPAGE="http://mathema.tician.de/software/pycuda/ https://pypi.org/project/pycuda"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
diff --git a/dev-python/pycuda/pycuda-2014.1.ebuild b/dev-python/pycuda/pycuda-2014.1.ebuild
index 4da48c34850dd..a77e438bb9134 100644
--- a/dev-python/pycuda/pycuda-2014.1.ebuild
+++ b/dev-python/pycuda/pycuda-2014.1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_4 )
 inherit cuda distutils-r1 multilib
 
 DESCRIPTION="Python wrapper for NVIDIA CUDA"
-HOMEPAGE="http://mathema.tician.de/software/pycuda/ https://pypi.python.org/pypi/pycuda"
+HOMEPAGE="http://mathema.tician.de/software/pycuda/ https://pypi.org/project/pycuda"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
diff --git a/dev-python/pycuda/pycuda-2016.1.2.ebuild b/dev-python/pycuda/pycuda-2016.1.2.ebuild
index 8118670d6633b..1c92a093febb9 100644
--- a/dev-python/pycuda/pycuda-2016.1.2.ebuild
+++ b/dev-python/pycuda/pycuda-2016.1.2.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5} )
 inherit cuda distutils-r1
 
 DESCRIPTION="Python wrapper for NVIDIA CUDA"
-HOMEPAGE="http://mathema.tician.de/software/pycuda/ https://pypi.python.org/pypi/pycuda"
+HOMEPAGE="http://mathema.tician.de/software/pycuda/ https://pypi.org/project/pycuda"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
diff --git a/dev-python/pycuda/pycuda-9999.ebuild b/dev-python/pycuda/pycuda-9999.ebuild
index 4a27060149fde..2703949213697 100644
--- a/dev-python/pycuda/pycuda-9999.ebuild
+++ b/dev-python/pycuda/pycuda-9999.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5} )
 inherit cuda distutils-r1 git-r3 multilib
 
 DESCRIPTION="Python wrapper for NVIDIA CUDA"
-HOMEPAGE="http://mathema.tician.de/software/pycuda/ https://pypi.python.org/pypi/pycuda"
+HOMEPAGE="http://mathema.tician.de/software/pycuda/ https://pypi.org/project/pycuda"
 SRC_URI=""
 EGIT_REPO_URI="http://git.tiker.net/trees/pycuda.git"
 
diff --git a/dev-python/pycurl/pycurl-7.43.0.ebuild b/dev-python/pycurl/pycurl-7.43.0.ebuild
index 6a73795db8565..c7dbf0537b360 100644
--- a/dev-python/pycurl/pycurl-7.43.0.ebuild
+++ b/dev-python/pycurl/pycurl-7.43.0.ebuild
@@ -11,7 +11,7 @@ inherit distutils-r1
 DESCRIPTION="python binding for curl/libcurl"
 HOMEPAGE="
 	https://github.com/pycurl/pycurl
-	https://pypi.python.org/pypi/pycurl
+	https://pypi.org/project/pycurl
 	http://pycurl.io/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
diff --git a/dev-python/pydispatcher/pydispatcher-2.0.5.ebuild b/dev-python/pydispatcher/pydispatcher-2.0.5.ebuild
index d9ab7f9d82700..d851688a0d2a8 100644
--- a/dev-python/pydispatcher/pydispatcher-2.0.5.ebuild
+++ b/dev-python/pydispatcher/pydispatcher-2.0.5.ebuild
@@ -9,7 +9,7 @@ inherit distutils-r1 vcs-snapshot
 MY_PN="PyDispatcher"
 
 DESCRIPTION="Multi-producer-multi-consumer signal dispatching mechanism"
-HOMEPAGE="http://pydispatcher.sourceforge.net/ https://pypi.python.org/pypi/PyDispatcher"
+HOMEPAGE="http://pydispatcher.sourceforge.net/ https://pypi.org/project/PyDispatcher"
 SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/pydispatcher/pydispatcher-2.1.2.ebuild b/dev-python/pydispatcher/pydispatcher-2.1.2.ebuild
index f5b1510f8dae8..b2751b3e56e0f 100644
--- a/dev-python/pydispatcher/pydispatcher-2.1.2.ebuild
+++ b/dev-python/pydispatcher/pydispatcher-2.1.2.ebuild
@@ -8,7 +8,7 @@ inherit distutils-r1
 
 MY_P="PyPyDispatcher-${PV}"
 DESCRIPTION="Multi-producer-multi-consumer signal dispatching mechanism"
-HOMEPAGE="https://github.com/scrapy/pypydispatcher https://pypi.python.org/pypi/PyPyDispatcher"
+HOMEPAGE="https://github.com/scrapy/pypydispatcher https://pypi.org/project/PyPyDispatcher"
 SRC_URI="mirror://pypi/${MY_P::1}/${MY_P%-*}/${MY_P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/pydl/pydl-0.5.3.ebuild b/dev-python/pydl/pydl-0.5.3.ebuild
index 2af10b5aa4ed1..9951811167299 100644
--- a/dev-python/pydl/pydl-0.5.3.ebuild
+++ b/dev-python/pydl/pydl-0.5.3.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5} )
 inherit distutils-r1 virtualx xdg-utils
 
 DESCRIPTION="Library of IDL astronomy routines converted to Python"
-HOMEPAGE="https://pypi.python.org/pypi/pydl/"
+HOMEPAGE="https://pypi.org/project/pydl/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/pydl/pydl-0.5.4.ebuild b/dev-python/pydl/pydl-0.5.4.ebuild
index ad306d3b1cbfe..2d4fc1194004d 100644
--- a/dev-python/pydl/pydl-0.5.4.ebuild
+++ b/dev-python/pydl/pydl-0.5.4.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
 inherit distutils-r1 virtualx xdg-utils
 
 DESCRIPTION="Library of IDL astronomy routines converted to Python"
-HOMEPAGE="https://pypi.python.org/pypi/pydl/"
+HOMEPAGE="https://pypi.org/project/pydl/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/pydns/pydns-2.3.6-r1.ebuild b/dev-python/pydns/pydns-2.3.6-r1.ebuild
index 61a6144767c12..aa0c7069d5a9e 100644
--- a/dev-python/pydns/pydns-2.3.6-r1.ebuild
+++ b/dev-python/pydns/pydns-2.3.6-r1.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 pypy )
 inherit distutils-r1
 
 DESCRIPTION="Python module for DNS (Domain Name Service)"
-HOMEPAGE="http://pydns.sourceforge.net/ https://pypi.python.org/pypi/pydns"
+HOMEPAGE="http://pydns.sourceforge.net/ https://pypi.org/project/pydns"
 SRC_URI="http://downloads.sourceforge.net/project/pydns/pydns/${P}/${P}.tar.gz"
 
 LICENSE="CNRI"
diff --git a/dev-python/pydot/pydot-1.0.28-r2.ebuild b/dev-python/pydot/pydot-1.0.28-r2.ebuild
index 3958643fd37ba..ba9699da7a99b 100644
--- a/dev-python/pydot/pydot-1.0.28-r2.ebuild
+++ b/dev-python/pydot/pydot-1.0.28-r2.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 )
 inherit distutils-r1
 
 DESCRIPTION="Python interface to Graphviz's Dot language"
-HOMEPAGE="https://pypi.python.org/pypi/pydot"
+HOMEPAGE="https://pypi.org/project/pydot"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/pydot/pydot-1.2.3.ebuild b/dev-python/pydot/pydot-1.2.3.ebuild
index 0a313e45f1506..b392c2fb8ea11 100644
--- a/dev-python/pydot/pydot-1.2.3.ebuild
+++ b/dev-python/pydot/pydot-1.2.3.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
 inherit distutils-r1
 
 DESCRIPTION="Python interface to Graphviz's Dot language"
-HOMEPAGE="https://github.com/erocarrera/pydot https://pypi.python.org/pypi/pydot"
+HOMEPAGE="https://github.com/erocarrera/pydot https://pypi.org/project/pydot"
 # pypi releases don't include tests
 SRC_URI="https://github.com/erocarrera/pydot/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
diff --git a/dev-python/pyee/pyee-1.0.2.ebuild b/dev-python/pyee/pyee-1.0.2.ebuild
index 12c3825204ad4..efcf88a17a8ad 100644
--- a/dev-python/pyee/pyee-1.0.2.ebuild
+++ b/dev-python/pyee/pyee-1.0.2.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5} )
 inherit distutils-r1
 
 DESCRIPTION="A port of node.js's EventEmitter to python"
-HOMEPAGE="https://pypi.python.org/pypi/pyee https://github.com/jfhbrook/pyee"
+HOMEPAGE="https://pypi.org/project/pyee https://github.com/jfhbrook/pyee"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
diff --git a/dev-python/pyelftools/pyelftools-0.24.ebuild b/dev-python/pyelftools/pyelftools-0.24.ebuild
index bab6324ff1bca..635e8d2112a86 100644
--- a/dev-python/pyelftools/pyelftools-0.24.ebuild
+++ b/dev-python/pyelftools/pyelftools-0.24.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
 inherit distutils-r1
 
 DESCRIPTION="pure-Python library for analyzing ELF files and DWARF debugging information"
-HOMEPAGE="https://pypi.python.org/pypi/pyelftools https://github.com/eliben/pyelftools"
+HOMEPAGE="https://pypi.org/project/pyelftools https://github.com/eliben/pyelftools"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="public-domain"
diff --git a/dev-python/pyenchant/pyenchant-1.6.6.ebuild b/dev-python/pyenchant/pyenchant-1.6.6.ebuild
index 0c5bec8e0989a..707d7c4c51b8a 100644
--- a/dev-python/pyenchant/pyenchant-1.6.6.ebuild
+++ b/dev-python/pyenchant/pyenchant-1.6.6.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
 inherit distutils-r1
 
 DESCRIPTION="Python bindings for the Enchant spellchecking system"
-HOMEPAGE="http://pyenchant.sourceforge.net https://pypi.python.org/pypi/pyenchant"
+HOMEPAGE="http://pyenchant.sourceforge.net https://pypi.org/project/pyenchant"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
diff --git a/dev-python/pyenchant/pyenchant-1.6.8.ebuild b/dev-python/pyenchant/pyenchant-1.6.8.ebuild
index 4a9e1804c308a..e7477a21833c4 100644
--- a/dev-python/pyenchant/pyenchant-1.6.8.ebuild
+++ b/dev-python/pyenchant/pyenchant-1.6.8.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
 inherit distutils-r1
 
 DESCRIPTION="Python bindings for the Enchant spellchecking system"
-HOMEPAGE="http://pyenchant.sourceforge.net https://pypi.python.org/pypi/pyenchant"
+HOMEPAGE="http://pyenchant.sourceforge.net https://pypi.org/project/pyenchant"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
diff --git a/dev-python/pyev/pyev-0.9.0.ebuild b/dev-python/pyev/pyev-0.9.0.ebuild
index 7bd3c4243e52a..9cb7988fecb7a 100644
--- a/dev-python/pyev/pyev-0.9.0.ebuild
+++ b/dev-python/pyev/pyev-0.9.0.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
 inherit distutils-r1
 
 DESCRIPTION="Python libev interface, an event loop"
-HOMEPAGE="https://pypi.python.org/pypi/pyev/"
+HOMEPAGE="https://pypi.org/project/pyev/"
 SRC_URI="mirror://pypi/p/pyev/${P}.tar.gz"
 
 LICENSE="|| ( BSD GPL-2 )"
diff --git a/dev-python/pyfakefs/pyfakefs-3.3.ebuild b/dev-python/pyfakefs/pyfakefs-3.3.ebuild
index 35086811c6ffc..a8be46e716c03 100644
--- a/dev-python/pyfakefs/pyfakefs-3.3.ebuild
+++ b/dev-python/pyfakefs/pyfakefs-3.3.ebuild
@@ -8,7 +8,7 @@ DISTUTILS_IN_SOURCE_BUILD=1
 inherit distutils-r1
 
 DESCRIPTION="a fake file system that mocks the Python file system modules"
-HOMEPAGE="https://github.com/jmcgeheeiv/pyfakefs/ https://pypi.python.org/pypi/pyfakefs"
+HOMEPAGE="https://github.com/jmcgeheeiv/pyfakefs/ https://pypi.org/project/pyfakefs"
 SRC_URI="https://github.com/jmcgeheeiv/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
diff --git a/dev-python/pyfakefs/pyfakefs-3.4.1.ebuild b/dev-python/pyfakefs/pyfakefs-3.4.1.ebuild
index 36f46d577c56d..98a68ad0f1415 100644
--- a/dev-python/pyfakefs/pyfakefs-3.4.1.ebuild
+++ b/dev-python/pyfakefs/pyfakefs-3.4.1.ebuild
@@ -8,7 +8,7 @@ DISTUTILS_IN_SOURCE_BUILD=1
 inherit distutils-r1
 
 DESCRIPTION="a fake file system that mocks the Python file system modules"
-HOMEPAGE="https://github.com/jmcgeheeiv/pyfakefs/ https://pypi.python.org/pypi/pyfakefs"
+HOMEPAGE="https://github.com/jmcgeheeiv/pyfakefs/ https://pypi.org/project/pyfakefs"
 SRC_URI="https://github.com/jmcgeheeiv/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
diff --git a/dev-python/pyfeyn/pyfeyn-1.0.0-r1.ebuild b/dev-python/pyfeyn/pyfeyn-1.0.0-r1.ebuild
index 7651864a5e271..31874a127ec16 100644
--- a/dev-python/pyfeyn/pyfeyn-1.0.0-r1.ebuild
+++ b/dev-python/pyfeyn/pyfeyn-1.0.0-r1.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python3_{4,5,6} )
 inherit distutils-r1
 
 DESCRIPTION="Python package for drawing Feynman diagrams"
-HOMEPAGE="http://pyfeyn.hepforge.org/ https://pypi.python.org/pypi/pyfeyn/"
+HOMEPAGE="http://pyfeyn.hepforge.org/ https://pypi.org/project/pyfeyn/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2+"
diff --git a/dev-python/pyfeyn/pyfeyn-1.0.0.ebuild b/dev-python/pyfeyn/pyfeyn-1.0.0.ebuild
index 7b9d50fc051d9..e7d02801efbb0 100644
--- a/dev-python/pyfeyn/pyfeyn-1.0.0.ebuild
+++ b/dev-python/pyfeyn/pyfeyn-1.0.0.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python3_{4,5} )
 inherit distutils-r1
 
 DESCRIPTION="Python package for drawing Feynman diagrams"
-HOMEPAGE="http://pyfeyn.hepforge.org/ https://pypi.python.org/pypi/pyfeyn/"
+HOMEPAGE="http://pyfeyn.hepforge.org/ https://pypi.org/project/pyfeyn/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2+"
diff --git a/dev-python/pyflakes/pyflakes-0.8.1.ebuild b/dev-python/pyflakes/pyflakes-0.8.1.ebuild
index 9b0e88b8032ef..f73e43967fb9b 100644
--- a/dev-python/pyflakes/pyflakes-0.8.1.ebuild
+++ b/dev-python/pyflakes/pyflakes-0.8.1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
 inherit distutils-r1
 
 DESCRIPTION="Passive checker for Python programs"
-HOMEPAGE="https://launchpad.net/pyflakes https://pypi.python.org/pypi/pyflakes"
+HOMEPAGE="https://launchpad.net/pyflakes https://pypi.org/project/pyflakes"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/pyflakes/pyflakes-1.0.0.ebuild b/dev-python/pyflakes/pyflakes-1.0.0.ebuild
index 0b5513325c1c9..d3df3b74dfd08 100644
--- a/dev-python/pyflakes/pyflakes-1.0.0.ebuild
+++ b/dev-python/pyflakes/pyflakes-1.0.0.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
 inherit distutils-r1
 
 DESCRIPTION="Passive checker for Python programs"
-HOMEPAGE="https://launchpad.net/pyflakes https://pypi.python.org/pypi/pyflakes"
+HOMEPAGE="https://launchpad.net/pyflakes https://pypi.org/project/pyflakes"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/pyflakes/pyflakes-1.2.3.ebuild b/dev-python/pyflakes/pyflakes-1.2.3.ebuild
index 89265903f8445..6394e4df06417 100644
--- a/dev-python/pyflakes/pyflakes-1.2.3.ebuild
+++ b/dev-python/pyflakes/pyflakes-1.2.3.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="Passive checker for Python programs"
-HOMEPAGE="https://launchpad.net/pyflakes https://pypi.python.org/pypi/pyflakes"
+HOMEPAGE="https://launchpad.net/pyflakes https://pypi.org/project/pyflakes"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/pyflakes/pyflakes-1.6.0.ebuild b/dev-python/pyflakes/pyflakes-1.6.0.ebuild
index fd4262351e81c..6766f4b76f9e1 100644
--- a/dev-python/pyflakes/pyflakes-1.6.0.ebuild
+++ b/dev-python/pyflakes/pyflakes-1.6.0.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="Passive checker for Python programs"
-HOMEPAGE="https://github.com/PyCQA/pyflakes https://pypi.python.org/pypi/pyflakes"
+HOMEPAGE="https://github.com/PyCQA/pyflakes https://pypi.org/project/pyflakes"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/pyformance/pyformance-0.3.4.ebuild b/dev-python/pyformance/pyformance-0.3.4.ebuild
index b9c3c16faf965..2b15f74b0d12b 100644
--- a/dev-python/pyformance/pyformance-0.3.4.ebuild
+++ b/dev-python/pyformance/pyformance-0.3.4.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
 inherit distutils-r1
 
 DESCRIPTION="Performance metrics, based on Coda Hale's Yammer metrics"
-HOMEPAGE="https://pyformance.readthedocs.org/ https://github.com/omergertel/pyformance/ https://pypi.python.org/pypi/pyformance/"
+HOMEPAGE="https://pyformance.readthedocs.org/ https://github.com/omergertel/pyformance/ https://pypi.org/project/pyformance/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
diff --git a/dev-python/pyftpdlib/pyftpdlib-1.5.1.ebuild b/dev-python/pyftpdlib/pyftpdlib-1.5.1.ebuild
index 13721cd858ebe..a8ea9ea3ad358 100644
--- a/dev-python/pyftpdlib/pyftpdlib-1.5.1.ebuild
+++ b/dev-python/pyftpdlib/pyftpdlib-1.5.1.ebuild
@@ -8,7 +8,7 @@ PYTHON_REQ_USE="ssl(+)"
 inherit distutils-r1
 
 DESCRIPTION="Python FTP server library"
-HOMEPAGE="https://github.com/giampaolo/pyftpdlib https://pypi.python.org/pypi/pyftpdlib"
+HOMEPAGE="https://github.com/giampaolo/pyftpdlib https://pypi.org/project/pyftpdlib"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/pyftpdlib/pyftpdlib-1.5.3.ebuild b/dev-python/pyftpdlib/pyftpdlib-1.5.3.ebuild
index ea18387dfd79f..1cd92b21b1373 100644
--- a/dev-python/pyftpdlib/pyftpdlib-1.5.3.ebuild
+++ b/dev-python/pyftpdlib/pyftpdlib-1.5.3.ebuild
@@ -8,7 +8,7 @@ PYTHON_REQ_USE="ssl(+)"
 inherit distutils-r1
 
 DESCRIPTION="Python FTP server library"
-HOMEPAGE="https://github.com/giampaolo/pyftpdlib https://pypi.python.org/pypi/pyftpdlib"
+HOMEPAGE="https://github.com/giampaolo/pyftpdlib https://pypi.org/project/pyftpdlib"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/pygit2/pygit2-0.26.3.ebuild b/dev-python/pygit2/pygit2-0.26.3.ebuild
index da4c23af3db7f..46c3dc73ae13e 100644
--- a/dev-python/pygit2/pygit2-0.26.3.ebuild
+++ b/dev-python/pygit2/pygit2-0.26.3.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
 inherit distutils-r1 eapi7-ver
 
 DESCRIPTION="Python bindings for libgit2"
-HOMEPAGE="https://github.com/libgit2/pygit2 https://pypi.python.org/pypi/pygit2"
+HOMEPAGE="https://github.com/libgit2/pygit2 https://pypi.org/project/pygit2"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2-with-linking-exception"
diff --git a/dev-python/pygit2/pygit2-0.26.4.ebuild b/dev-python/pygit2/pygit2-0.26.4.ebuild
index 64a6fc92b3519..07238b38cf442 100644
--- a/dev-python/pygit2/pygit2-0.26.4.ebuild
+++ b/dev-python/pygit2/pygit2-0.26.4.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
 inherit distutils-r1 eapi7-ver
 
 DESCRIPTION="Python bindings for libgit2"
-HOMEPAGE="https://github.com/libgit2/pygit2 https://pypi.python.org/pypi/pygit2"
+HOMEPAGE="https://github.com/libgit2/pygit2 https://pypi.org/project/pygit2"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2-with-linking-exception"
diff --git a/dev-python/pygit2/pygit2-0.27.0.ebuild b/dev-python/pygit2/pygit2-0.27.0.ebuild
index 64a6fc92b3519..07238b38cf442 100644
--- a/dev-python/pygit2/pygit2-0.27.0.ebuild
+++ b/dev-python/pygit2/pygit2-0.27.0.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
 inherit distutils-r1 eapi7-ver
 
 DESCRIPTION="Python bindings for libgit2"
-HOMEPAGE="https://github.com/libgit2/pygit2 https://pypi.python.org/pypi/pygit2"
+HOMEPAGE="https://github.com/libgit2/pygit2 https://pypi.org/project/pygit2"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2-with-linking-exception"
diff --git a/dev-python/pygments/pygments-2.1.1.ebuild b/dev-python/pygments/pygments-2.1.1.ebuild
index 165fa998814f5..6f298a83d102a 100644
--- a/dev-python/pygments/pygments-2.1.1.ebuild
+++ b/dev-python/pygments/pygments-2.1.1.ebuild
@@ -11,7 +11,7 @@ MY_PN="Pygments"
 MY_P="${MY_PN}-${PV}"
 
 DESCRIPTION="Pygments is a syntax highlighting package written in Python"
-HOMEPAGE="http://pygments.org/ https://pypi.python.org/pypi/Pygments"
+HOMEPAGE="http://pygments.org/ https://pypi.org/project/Pygments"
 SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/pygments/pygments-2.2.0.ebuild b/dev-python/pygments/pygments-2.2.0.ebuild
index f593de1c1bfc4..0857df29d0e4a 100644
--- a/dev-python/pygments/pygments-2.2.0.ebuild
+++ b/dev-python/pygments/pygments-2.2.0.ebuild
@@ -11,7 +11,7 @@ MY_PN="Pygments"
 MY_P="${MY_PN}-${PV}"
 
 DESCRIPTION="Pygments is a syntax highlighting package written in Python"
-HOMEPAGE="http://pygments.org/ https://pypi.python.org/pypi/Pygments"
+HOMEPAGE="http://pygments.org/ https://pypi.org/project/Pygments"
 SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/pygraphviz/pygraphviz-1.2.ebuild b/dev-python/pygraphviz/pygraphviz-1.2.ebuild
index 25e0035803a5d..48a1981f72381 100644
--- a/dev-python/pygraphviz/pygraphviz-1.2.ebuild
+++ b/dev-python/pygraphviz/pygraphviz-1.2.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 )
 inherit distutils-r1
 
 DESCRIPTION="Python wrapper for the Graphviz Agraph data structure"
-HOMEPAGE="http://networkx.lanl.gov/pygraphviz/ https://pypi.python.org/pypi/pygraphviz"
+HOMEPAGE="http://networkx.lanl.gov/pygraphviz/ https://pypi.org/project/pygraphviz"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/pygtkhelpers/pygtkhelpers-0.4.3-r1.ebuild b/dev-python/pygtkhelpers/pygtkhelpers-0.4.3-r1.ebuild
index c80af44a4485a..a47c5e7975210 100644
--- a/dev-python/pygtkhelpers/pygtkhelpers-0.4.3-r1.ebuild
+++ b/dev-python/pygtkhelpers/pygtkhelpers-0.4.3-r1.ebuild
@@ -9,7 +9,7 @@ inherit distutils-r1
 
 DESCRIPTION="PyGTKHelpers is a library to assist the building of PyGTK applications"
 HOMEPAGE="https://pythonhosted.org/pygtkhelpers/
-	https://pypi.python.org/pypi/pygtkhelpers"
+	https://pypi.org/project/pygtkhelpers"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-3"
diff --git a/dev-python/pyinotify/pyinotify-0.9.6.ebuild b/dev-python/pyinotify/pyinotify-0.9.6.ebuild
index a7cf24f04df98..5ba4d7f549ecb 100644
--- a/dev-python/pyinotify/pyinotify-0.9.6.ebuild
+++ b/dev-python/pyinotify/pyinotify-0.9.6.ebuild
@@ -9,7 +9,7 @@ PYTHON_REQ_USE="threads(+)"
 inherit distutils-r1
 
 DESCRIPTION="Python module used for monitoring filesystems events"
-HOMEPAGE="http://trac.dbzteam.org/pyinotify https://pypi.python.org/pypi/pyinotify"
+HOMEPAGE="http://trac.dbzteam.org/pyinotify https://pypi.org/project/pyinotify"
 SRC_URI="http://seb.dbzteam.org/pub/pyinotify/releases/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/pyjwt/pyjwt-1.5.3.ebuild b/dev-python/pyjwt/pyjwt-1.5.3.ebuild
index 422c20d2efa03..ae1f2157deade 100644
--- a/dev-python/pyjwt/pyjwt-1.5.3.ebuild
+++ b/dev-python/pyjwt/pyjwt-1.5.3.ebuild
@@ -10,7 +10,7 @@ inherit distutils-r1 eutils
 MY_PN="PyJWT"
 
 DESCRIPTION="JSON Web Token implementation in Python"
-HOMEPAGE="https://github.com/progrium/pyjwt https://pypi.python.org/pypi/PyJWT/"
+HOMEPAGE="https://github.com/progrium/pyjwt https://pypi.org/project/PyJWT/"
 SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
 
 LICENSE=" MIT"
diff --git a/dev-python/pykwalify/pykwalify-1.5.2.ebuild b/dev-python/pykwalify/pykwalify-1.5.2.ebuild
index a0b78483c8306..aabec243e3241 100644
--- a/dev-python/pykwalify/pykwalify-1.5.2.ebuild
+++ b/dev-python/pykwalify/pykwalify-1.5.2.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5} )
 inherit distutils-r1
 
 DESCRIPTION="Python lib/cli for JSON/YAML schema validation"
-HOMEPAGE="https://pypi.python.org/pypi/pykwalify https://github.com/Grokzen/pykwalify"
+HOMEPAGE="https://pypi.org/project/pykwalify https://github.com/Grokzen/pykwalify"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
diff --git a/dev-python/pykwalify/pykwalify-9999.ebuild b/dev-python/pykwalify/pykwalify-9999.ebuild
index dd94957473535..05eb31b8e2535 100644
--- a/dev-python/pykwalify/pykwalify-9999.ebuild
+++ b/dev-python/pykwalify/pykwalify-9999.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5} )
 inherit distutils-r1 git-r3
 
 DESCRIPTION="Python lib/cli for JSON/YAML schema validation"
-HOMEPAGE="https://pypi.python.org/pypi/pykwalify https://github.com/Grokzen/pykwalify"
+HOMEPAGE="https://pypi.org/project/pykwalify https://github.com/Grokzen/pykwalify"
 SRC_URI=""
 EGIT_REPO_URI="https://github.com/Grokzen/pykwalify.git"
 
diff --git a/dev-python/pyldap/pyldap-2.4.37.ebuild b/dev-python/pyldap/pyldap-2.4.37.ebuild
index a8f7d202a33b4..afe55af2cc27c 100644
--- a/dev-python/pyldap/pyldap-2.4.37.ebuild
+++ b/dev-python/pyldap/pyldap-2.4.37.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
 inherit distutils-r1 multilib
 
 DESCRIPTION="Various LDAP-related Python modules"
-HOMEPAGE="https://pypi.python.org/pypi/pyldap https://github.com/pyldap/pyldap/"
+HOMEPAGE="https://pypi.org/project/pyldap https://github.com/pyldap/pyldap/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="PSF-2"
diff --git a/dev-python/pylibacl/pylibacl-0.5.0-r1.ebuild b/dev-python/pylibacl/pylibacl-0.5.0-r1.ebuild
index 7b3a397ff32a1..4ab4bcc183c1f 100644
--- a/dev-python/pylibacl/pylibacl-0.5.0-r1.ebuild
+++ b/dev-python/pylibacl/pylibacl-0.5.0-r1.ebuild
@@ -9,7 +9,7 @@ inherit distutils-r1
 
 DESCRIPTION="POSIX ACLs (Access Control Lists) for Python"
 HOMEPAGE="https://pylibacl.k1024.org/
-	https://pypi.python.org/pypi/pylibacl"
+	https://pypi.org/project/pylibacl"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
diff --git a/dev-python/pyliblzma/pyliblzma-0.5.3-r1.ebuild b/dev-python/pyliblzma/pyliblzma-0.5.3-r1.ebuild
index d818b884131e7..533b6e853817b 100644
--- a/dev-python/pyliblzma/pyliblzma-0.5.3-r1.ebuild
+++ b/dev-python/pyliblzma/pyliblzma-0.5.3-r1.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 )
 inherit distutils-r1
 
 DESCRIPTION="Python bindings for liblzma"
-HOMEPAGE="https://launchpad.net/pyliblzma https://pypi.python.org/pypi/pyliblzma"
+HOMEPAGE="https://launchpad.net/pyliblzma https://pypi.org/project/pyliblzma"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.bz2"
 
 LICENSE="LGPL-3"
diff --git a/dev-python/pylibmc/pylibmc-1.5.1-r1.ebuild b/dev-python/pylibmc/pylibmc-1.5.1-r1.ebuild
index 2455942948055..778269debe974 100644
--- a/dev-python/pylibmc/pylibmc-1.5.1-r1.ebuild
+++ b/dev-python/pylibmc/pylibmc-1.5.1-r1.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
 inherit distutils-r1
 
 DESCRIPTION="Libmemcached wrapper written as a Python extension"
-HOMEPAGE="http://sendapatch.se/projects/pylibmc/ https://pypi.python.org/pypi/pylibmc"
+HOMEPAGE="http://sendapatch.se/projects/pylibmc/ https://pypi.org/project/pylibmc"
 # One image is missing from the doc at PyPI
 # https://github.com/lericson/pylibmc/pull/221
 SRC_URI="https://github.com/lericson/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
diff --git a/dev-python/pylint/pylint-1.6.5-r1.ebuild b/dev-python/pylint/pylint-1.6.5-r1.ebuild
index ab337f86073ea..03f131c67f99a 100644
--- a/dev-python/pylint/pylint-1.6.5-r1.ebuild
+++ b/dev-python/pylint/pylint-1.6.5-r1.ebuild
@@ -10,7 +10,7 @@ inherit distutils-r1 eutils
 
 DESCRIPTION="Python code static checker"
 HOMEPAGE="https://www.logilab.org/project/pylint
-	https://pypi.python.org/pypi/pylint
+	https://pypi.org/project/pylint
 	https://github.com/pycqa/pylint"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
diff --git a/dev-python/pylint/pylint-1.7.2.ebuild b/dev-python/pylint/pylint-1.7.2.ebuild
index b0602530b4318..4515ead7fa428 100644
--- a/dev-python/pylint/pylint-1.7.2.ebuild
+++ b/dev-python/pylint/pylint-1.7.2.ebuild
@@ -10,7 +10,7 @@ inherit distutils-r1 eutils
 
 DESCRIPTION="Python code static checker"
 HOMEPAGE="https://www.logilab.org/project/pylint
-	https://pypi.python.org/pypi/pylint
+	https://pypi.org/project/pylint
 	https://github.com/pycqa/pylint"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
diff --git a/dev-python/pylint/pylint-1.7.5.ebuild b/dev-python/pylint/pylint-1.7.5.ebuild
index b2c53f122a4d8..a7fbc30a28350 100644
--- a/dev-python/pylint/pylint-1.7.5.ebuild
+++ b/dev-python/pylint/pylint-1.7.5.ebuild
@@ -10,7 +10,7 @@ inherit distutils-r1 eutils
 
 DESCRIPTION="Python code static checker"
 HOMEPAGE="https://www.logilab.org/project/pylint
-	https://pypi.python.org/pypi/pylint
+	https://pypi.org/project/pylint
 	https://github.com/pycqa/pylint"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
diff --git a/dev-python/pylint/pylint-1.8.2.ebuild b/dev-python/pylint/pylint-1.8.2.ebuild
index 430fd378d95af..26c652f6356c1 100644
--- a/dev-python/pylint/pylint-1.8.2.ebuild
+++ b/dev-python/pylint/pylint-1.8.2.ebuild
@@ -10,7 +10,7 @@ inherit distutils-r1 eutils
 
 DESCRIPTION="Python code static checker"
 HOMEPAGE="https://www.logilab.org/project/pylint
-	https://pypi.python.org/pypi/pylint
+	https://pypi.org/project/pylint
 	https://github.com/pycqa/pylint"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
diff --git a/dev-python/pylirc/pylirc-0.0.5-r1.ebuild b/dev-python/pylirc/pylirc-0.0.5-r1.ebuild
index 1064039605e3c..62571dc4fa274 100644
--- a/dev-python/pylirc/pylirc-0.0.5-r1.ebuild
+++ b/dev-python/pylirc/pylirc-0.0.5-r1.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 )
 inherit distutils-r1
 
 DESCRIPTION="lirc module for Python"
-HOMEPAGE="https://sourceforge.net/projects/pylirc/ https://pypi.python.org/pypi/pylirc"
+HOMEPAGE="https://sourceforge.net/projects/pylirc/ https://pypi.org/project/pylirc"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
diff --git a/dev-python/pylzma/pylzma-0.4.9.ebuild b/dev-python/pylzma/pylzma-0.4.9.ebuild
index 148c36ae1be42..9851b2c63ec8b 100644
--- a/dev-python/pylzma/pylzma-0.4.9.ebuild
+++ b/dev-python/pylzma/pylzma-0.4.9.ebuild
@@ -7,7 +7,7 @@ inherit distutils-r1
 
 DESCRIPTION="Python bindings for the LZMA compression library"
 HOMEPAGE="https://www.joachim-bauch.de/projects/pylzma/
-	https://pypi.python.org/pypi/pylzma"
+	https://pypi.org/project/pylzma"
 # pypi tarball does not include test data
 SRC_URI="https://github.com/fancycode/pylzma/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz"
 
diff --git a/dev-python/pymdstat/pymdstat-0.4.2.ebuild b/dev-python/pymdstat/pymdstat-0.4.2.ebuild
index 29b950b0ddccb..47c196e1d7b39 100644
--- a/dev-python/pymdstat/pymdstat-0.4.2.ebuild
+++ b/dev-python/pymdstat/pymdstat-0.4.2.ebuild
@@ -9,7 +9,7 @@ inherit distutils-r1
 
 DESCRIPTION="Python library to parse Linux /proc/mdstat"
 HOMEPAGE="https://github.com/nicolargo/pymdstat
-	https://pypi.python.org/pypi/pymdstat"
+	https://pypi.org/project/pymdstat"
 SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/pymongo/pymongo-2.7.2.ebuild b/dev-python/pymongo/pymongo-2.7.2.ebuild
index 9c988e9fbb5af..3045f7fedb1e2 100644
--- a/dev-python/pymongo/pymongo-2.7.2.ebuild
+++ b/dev-python/pymongo/pymongo-2.7.2.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
 inherit check-reqs distutils-r1
 
 DESCRIPTION="Python driver for MongoDB"
-HOMEPAGE="https://github.com/mongodb/mongo-python-driver https://pypi.python.org/pypi/pymongo"
+HOMEPAGE="https://github.com/mongodb/mongo-python-driver https://pypi.org/project/pymongo"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
diff --git a/dev-python/pymongo/pymongo-2.9.3.ebuild b/dev-python/pymongo/pymongo-2.9.3.ebuild
index 8f425e213ac02..f234bb1292603 100644
--- a/dev-python/pymongo/pymongo-2.9.3.ebuild
+++ b/dev-python/pymongo/pymongo-2.9.3.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
 inherit check-reqs distutils-r1
 
 DESCRIPTION="Python driver for MongoDB"
-HOMEPAGE="https://github.com/mongodb/mongo-python-driver https://pypi.python.org/pypi/pymongo"
+HOMEPAGE="https://github.com/mongodb/mongo-python-driver https://pypi.org/project/pymongo"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
diff --git a/dev-python/pymongo/pymongo-3.4.0.ebuild b/dev-python/pymongo/pymongo-3.4.0.ebuild
index 34dcb88ed5f9f..14b37ab899c7b 100644
--- a/dev-python/pymongo/pymongo-3.4.0.ebuild
+++ b/dev-python/pymongo/pymongo-3.4.0.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
 inherit check-reqs distutils-r1
 
 DESCRIPTION="Python driver for MongoDB"
-HOMEPAGE="https://github.com/mongodb/mongo-python-driver https://pypi.python.org/pypi/pymongo"
+HOMEPAGE="https://github.com/mongodb/mongo-python-driver https://pypi.org/project/pymongo"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
diff --git a/dev-python/pymongo/pymongo-3.5.1.ebuild b/dev-python/pymongo/pymongo-3.5.1.ebuild
index 1426c33c1fa2a..e28469004b55e 100644
--- a/dev-python/pymongo/pymongo-3.5.1.ebuild
+++ b/dev-python/pymongo/pymongo-3.5.1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
 inherit check-reqs distutils-r1
 
 DESCRIPTION="Python driver for MongoDB"
-HOMEPAGE="https://github.com/mongodb/mongo-python-driver https://pypi.python.org/pypi/pymongo"
+HOMEPAGE="https://github.com/mongodb/mongo-python-driver https://pypi.org/project/pymongo"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
diff --git a/dev-python/pympler/pympler-0.5.ebuild b/dev-python/pympler/pympler-0.5.ebuild
index 629446a0c6b68..c99ffbb0a2b10 100644
--- a/dev-python/pympler/pympler-0.5.ebuild
+++ b/dev-python/pympler/pympler-0.5.ebuild
@@ -11,7 +11,7 @@ MY_PN="Pympler"
 MY_P="${MY_PN}-${PV}"
 
 DESCRIPTION="Memory profiling for Python applications"
-HOMEPAGE="https://pypi.python.org/pypi/Pympler https://github.com/pympler/pympler"
+HOMEPAGE="https://pypi.org/project/Pympler https://github.com/pympler/pympler"
 SRC_URI="https://github.com/pympler/pympler/archive/${PV}.tar.gz -> ${P}.tar.gz"
 # The PyPi tarball is missing the documentation
 #SRC_URI="mirror://pypi/P/${MY_PN}/${MY_P}.tar.gz"
diff --git a/dev-python/pymssql/pymssql-1.0.2-r1.ebuild b/dev-python/pymssql/pymssql-1.0.2-r1.ebuild
index 24b3891b02283..f70c62279edbe 100644
--- a/dev-python/pymssql/pymssql-1.0.2-r1.ebuild
+++ b/dev-python/pymssql/pymssql-1.0.2-r1.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 pypy )
 inherit distutils-r1 flag-o-matic
 
 DESCRIPTION="Simple MSSQL python extension module"
-HOMEPAGE="http://www.pymssql.org/en/stable/ https://pypi.python.org/pypi/pymssql"
+HOMEPAGE="http://www.pymssql.org/en/stable/ https://pypi.org/project/pymssql"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
diff --git a/dev-python/pymtp/pymtp-0.0.6.ebuild b/dev-python/pymtp/pymtp-0.0.6.ebuild
index 9b014dd465e0b..dd99ec53c07b9 100644
--- a/dev-python/pymtp/pymtp-0.0.6.ebuild
+++ b/dev-python/pymtp/pymtp-0.0.6.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python3_{4,5,6} )
 inherit distutils-r1
 
 DESCRIPTION="LibMTP bindings for Python"
-HOMEPAGE="http://packages.debian.org/libmtp http://libmtp.sourceforge.net/ https://pypi.python.org/pypi/PyMTP"
+HOMEPAGE="http://packages.debian.org/libmtp http://libmtp.sourceforge.net/ https://pypi.org/project/PyMTP"
 DEB_URI="mirror://debian/pool/main/${PN:0:1}/${PN}"
 SRC_URI="${DEB_URI}/${PN}_${PV}.orig.tar.gz"
 
diff --git a/dev-python/pynacl/pynacl-1.1.2.ebuild b/dev-python/pynacl/pynacl-1.1.2.ebuild
index 10e5beed36e63..e0687f14d9cfb 100644
--- a/dev-python/pynacl/pynacl-1.1.2.ebuild
+++ b/dev-python/pynacl/pynacl-1.1.2.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6})
 inherit distutils-r1
 
 DESCRIPTION="Python binding to the Networking and Cryptography (NaCl) library"
-HOMEPAGE="https://github.com/pyca/pynacl/ https://pypi.python.org/pypi/PyNaCl/"
+HOMEPAGE="https://github.com/pyca/pynacl/ https://pypi.org/project/PyNaCl/"
 SRC_URI="https://github.com/pyca/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
diff --git a/dev-python/pynacl/pynacl-1.2.0.ebuild b/dev-python/pynacl/pynacl-1.2.0.ebuild
index 7869447c9f0ea..ca8c9c8b7af1a 100644
--- a/dev-python/pynacl/pynacl-1.2.0.ebuild
+++ b/dev-python/pynacl/pynacl-1.2.0.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6})
 inherit distutils-r1
 
 DESCRIPTION="Python binding to the Networking and Cryptography (NaCl) library"
-HOMEPAGE="https://github.com/pyca/pynacl/ https://pypi.python.org/pypi/PyNaCl/"
+HOMEPAGE="https://github.com/pyca/pynacl/ https://pypi.org/project/PyNaCl/"
 SRC_URI="https://github.com/pyca/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
diff --git a/dev-python/pynacl/pynacl-1.2.1.ebuild b/dev-python/pynacl/pynacl-1.2.1.ebuild
index c762eaeafe18b..730a7c34145cd 100644
--- a/dev-python/pynacl/pynacl-1.2.1.ebuild
+++ b/dev-python/pynacl/pynacl-1.2.1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6})
 inherit distutils-r1
 
 DESCRIPTION="Python binding to the Networking and Cryptography (NaCl) library"
-HOMEPAGE="https://github.com/pyca/pynacl/ https://pypi.python.org/pypi/PyNaCl/"
+HOMEPAGE="https://github.com/pyca/pynacl/ https://pypi.org/project/PyNaCl/"
 SRC_URI="https://github.com/pyca/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
diff --git a/dev-python/pynzb/pynzb-0.1.0-r1.ebuild b/dev-python/pynzb/pynzb-0.1.0-r1.ebuild
index b3ce62499337f..e6c4c9e470887 100644
--- a/dev-python/pynzb/pynzb-0.1.0-r1.ebuild
+++ b/dev-python/pynzb/pynzb-0.1.0-r1.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5} pypy )
 inherit distutils-r1
 
 DESCRIPTION="Unified API for parsing NZB files"
-HOMEPAGE="https://pypi.python.org/pypi/pynzb/"
+HOMEPAGE="https://pypi.org/project/pynzb/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/pyopencl/pyopencl-2016.1.ebuild b/dev-python/pyopencl/pyopencl-2016.1.ebuild
index c034e9a67809b..7ad7d28e65ddb 100644
--- a/dev-python/pyopencl/pyopencl-2016.1.ebuild
+++ b/dev-python/pyopencl/pyopencl-2016.1.ebuild
@@ -9,7 +9,7 @@ inherit distutils-r1
 
 DESCRIPTION="Python wrapper for OpenCL"
 HOMEPAGE="https://mathema.tician.de/software/pyopencl
-	https://pypi.python.org/pypi/pyopencl"
+	https://pypi.org/project/pyopencl"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
diff --git a/dev-python/pyopencl/pyopencl-2017.2.ebuild b/dev-python/pyopencl/pyopencl-2017.2.ebuild
index f70ddd62043bd..a0c701fdde531 100644
--- a/dev-python/pyopencl/pyopencl-2017.2.ebuild
+++ b/dev-python/pyopencl/pyopencl-2017.2.ebuild
@@ -9,7 +9,7 @@ inherit distutils-r1
 
 DESCRIPTION="Python wrapper for OpenCL"
 HOMEPAGE="https://mathema.tician.de/software/pyopencl
-	https://pypi.python.org/pypi/pyopencl"
+	https://pypi.org/project/pyopencl"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
diff --git a/dev-python/pyopencl/pyopencl-9999.ebuild b/dev-python/pyopencl/pyopencl-9999.ebuild
index ae75b8f048df3..f8e1236d30dbb 100644
--- a/dev-python/pyopencl/pyopencl-9999.ebuild
+++ b/dev-python/pyopencl/pyopencl-9999.ebuild
@@ -10,7 +10,7 @@ EGIT_REPO_URI="https://git.tiker.net/trees/pyopencl.git"
 
 DESCRIPTION="Python wrapper for OpenCL"
 HOMEPAGE="https://mathema.tician.de/software/pyopencl
-	https://pypi.python.org/pypi/pyopencl"
+	https://pypi.org/project/pyopencl"
 SRC_URI=""
 
 LICENSE="GPL-2"
diff --git a/dev-python/pyopengl/pyopengl-3.1.0.ebuild b/dev-python/pyopengl/pyopengl-3.1.0.ebuild
index 6a393610cdf64..52e0ade01f13e 100644
--- a/dev-python/pyopengl/pyopengl-3.1.0.ebuild
+++ b/dev-python/pyopengl/pyopengl-3.1.0.ebuild
@@ -11,7 +11,7 @@ MY_PN="PyOpenGL"
 MY_P="${MY_PN}-${PV}"
 
 DESCRIPTION="Python OpenGL bindings"
-HOMEPAGE="http://pyopengl.sourceforge.net/ https://pypi.python.org/pypi/PyOpenGL"
+HOMEPAGE="http://pyopengl.sourceforge.net/ https://pypi.org/project/PyOpenGL"
 SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 #	mirror://sourceforge/pyopengl/${MY_P}.tar.gz" # broken mirror for this release
 LICENSE="BSD"
diff --git a/dev-python/pyopengl_accelerate/pyopengl_accelerate-3.1.0.ebuild b/dev-python/pyopengl_accelerate/pyopengl_accelerate-3.1.0.ebuild
index 5d64d4a005e81..dcd1f69c04d3b 100644
--- a/dev-python/pyopengl_accelerate/pyopengl_accelerate-3.1.0.ebuild
+++ b/dev-python/pyopengl_accelerate/pyopengl_accelerate-3.1.0.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
 inherit distutils-r1
 
 DESCRIPTION="Accelerate module for PyOpenGL"
-HOMEPAGE="http://pyopengl.sourceforge.net/ https://pypi.python.org/pypi/PyOpenGL-accelerate"
+HOMEPAGE="http://pyopengl.sourceforge.net/ https://pypi.org/project/PyOpenGL-accelerate"
 MY_PN="PyOpenGL-accelerate"
 MY_P="${MY_PN}-${PV}"
 SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
diff --git a/dev-python/pyopenssl/pyopenssl-16.2.0.ebuild b/dev-python/pyopenssl/pyopenssl-16.2.0.ebuild
index 2b8579283288a..a6bbdfbd2fcee 100644
--- a/dev-python/pyopenssl/pyopenssl-16.2.0.ebuild
+++ b/dev-python/pyopenssl/pyopenssl-16.2.0.ebuild
@@ -15,7 +15,7 @@ DESCRIPTION="Python interface to the OpenSSL library"
 HOMEPAGE="
 	http://pyopenssl.sourceforge.net/
 	https://launchpad.net/pyopenssl
-	https://pypi.python.org/pypi/pyOpenSSL
+	https://pypi.org/project/pyOpenSSL
 "
 SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
diff --git a/dev-python/pyopenssl/pyopenssl-17.0.0.ebuild b/dev-python/pyopenssl/pyopenssl-17.0.0.ebuild
index ba3f71d2929af..9d6d0edc7da26 100644
--- a/dev-python/pyopenssl/pyopenssl-17.0.0.ebuild
+++ b/dev-python/pyopenssl/pyopenssl-17.0.0.ebuild
@@ -15,7 +15,7 @@ DESCRIPTION="Python interface to the OpenSSL library"
 HOMEPAGE="
 	http://pyopenssl.sourceforge.net/
 	https://launchpad.net/pyopenssl
-	https://pypi.python.org/pypi/pyOpenSSL
+	https://pypi.org/project/pyOpenSSL
 "
 SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
diff --git a/dev-python/pyopenssl/pyopenssl-17.2.0.ebuild b/dev-python/pyopenssl/pyopenssl-17.2.0.ebuild
index d8fe4c3aa6ac5..1d3a5bda0d404 100644
--- a/dev-python/pyopenssl/pyopenssl-17.2.0.ebuild
+++ b/dev-python/pyopenssl/pyopenssl-17.2.0.ebuild
@@ -15,7 +15,7 @@ DESCRIPTION="Python interface to the OpenSSL library"
 HOMEPAGE="
 	http://pyopenssl.sourceforge.net/
 	https://launchpad.net/pyopenssl
-	https://pypi.python.org/pypi/pyOpenSSL
+	https://pypi.org/project/pyOpenSSL
 "
 SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
diff --git a/dev-python/pyopenssl/pyopenssl-17.4.0.ebuild b/dev-python/pyopenssl/pyopenssl-17.4.0.ebuild
index bd636d9c7a75d..c4c92fb3aeffe 100644
--- a/dev-python/pyopenssl/pyopenssl-17.4.0.ebuild
+++ b/dev-python/pyopenssl/pyopenssl-17.4.0.ebuild
@@ -15,7 +15,7 @@ DESCRIPTION="Python interface to the OpenSSL library"
 HOMEPAGE="
 	http://pyopenssl.sourceforge.net/
 	https://launchpad.net/pyopenssl
-	https://pypi.python.org/pypi/pyOpenSSL
+	https://pypi.org/project/pyOpenSSL
 "
 SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
diff --git a/dev-python/pyopenssl/pyopenssl-17.5.0.ebuild b/dev-python/pyopenssl/pyopenssl-17.5.0.ebuild
index 076b670faa368..e16549997c4b2 100644
--- a/dev-python/pyopenssl/pyopenssl-17.5.0.ebuild
+++ b/dev-python/pyopenssl/pyopenssl-17.5.0.ebuild
@@ -15,7 +15,7 @@ DESCRIPTION="Python interface to the OpenSSL library"
 HOMEPAGE="
 	http://pyopenssl.sourceforge.net/
 	https://launchpad.net/pyopenssl
-	https://pypi.python.org/pypi/pyOpenSSL
+	https://pypi.org/project/pyOpenSSL
 "
 SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
diff --git a/dev-python/pyparsing/pyparsing-2.2.0.ebuild b/dev-python/pyparsing/pyparsing-2.2.0.ebuild
index a8757fd23b380..a0f5a2b4736d1 100644
--- a/dev-python/pyparsing/pyparsing-2.2.0.ebuild
+++ b/dev-python/pyparsing/pyparsing-2.2.0.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="Easy-to-use Python module for text parsing"
-HOMEPAGE="http://pyparsing.wikispaces.com/ https://pypi.python.org/pypi/pyparsing"
+HOMEPAGE="http://pyparsing.wikispaces.com/ https://pypi.org/project/pyparsing"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/pypcap/pypcap-1.2.0.ebuild b/dev-python/pypcap/pypcap-1.2.0.ebuild
index 3fa9a89970a85..574e9213f028e 100644
--- a/dev-python/pypcap/pypcap-1.2.0.ebuild
+++ b/dev-python/pypcap/pypcap-1.2.0.ebuild
@@ -6,7 +6,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy )
 inherit distutils-r1
 
 DESCRIPTION="Simplified object-oriented Python extension module for libpcap"
-HOMEPAGE="https://github.com/pynetwork/pypcap https://pypi.python.org/pypi/pypcap"
+HOMEPAGE="https://github.com/pynetwork/pypcap https://pypi.org/project/pypcap"
 SRC_URI="https://github.com/pynetwork/pypcap/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/pypeg2/pypeg2-2.15.2.ebuild b/dev-python/pypeg2/pypeg2-2.15.2.ebuild
index 54f25cc44f89c..981f67f8225c8 100644
--- a/dev-python/pypeg2/pypeg2-2.15.2.ebuild
+++ b/dev-python/pypeg2/pypeg2-2.15.2.ebuild
@@ -12,7 +12,7 @@ MY_P=${MY_PN}-${PV}
 DESCRIPTION="An intrinsic PEG Parser-Interpreter for Python"
 HOMEPAGE="https://fdik.org/pyPEG/
 	https://bitbucket.org/fdik/pypeg/
-	https://pypi.python.org/pypi/pyPEG2"
+	https://pypi.org/project/pyPEG2"
 SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
diff --git a/dev-python/pypgsql/pypgsql-2.5.1-r1.ebuild b/dev-python/pypgsql/pypgsql-2.5.1-r1.ebuild
index b33da36f0a3a9..2e35ec9e2ee03 100644
--- a/dev-python/pypgsql/pypgsql-2.5.1-r1.ebuild
+++ b/dev-python/pypgsql/pypgsql-2.5.1-r1.ebuild
@@ -10,7 +10,7 @@ inherit distutils-r1 flag-o-matic
 MY_P="pyPgSQL-${PV}"
 
 DESCRIPTION="Python Interface to PostgreSQL"
-HOMEPAGE="http://pypgsql.sourceforge.net/ https://pypi.python.org/pypi/pyPgSQL"
+HOMEPAGE="http://pypgsql.sourceforge.net/ https://pypi.org/project/pyPgSQL"
 SRC_URI="mirror://sourceforge/pypgsql/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
diff --git a/dev-python/pypng/pypng-0.0.18.ebuild b/dev-python/pypng/pypng-0.0.18.ebuild
index 318e5214c402f..36d6d075efdba 100644
--- a/dev-python/pypng/pypng-0.0.18.ebuild
+++ b/dev-python/pypng/pypng-0.0.18.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6})
 inherit distutils-r1
 
 DESCRIPTION="Pure Python PNG image encoder/decoder"
-HOMEPAGE="https://github.com/drj11/pypng https://pypi.python.org/pypi/pypng"
+HOMEPAGE="https://github.com/drj11/pypng https://pypi.org/project/pypng"
 SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/pypowervm/pypowervm-1.1.10.ebuild b/dev-python/pypowervm/pypowervm-1.1.10.ebuild
index 6e649c6a7a171..2a5809471eadb 100644
--- a/dev-python/pypowervm/pypowervm-1.1.10.ebuild
+++ b/dev-python/pypowervm/pypowervm-1.1.10.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
 inherit distutils-r1
 
 DESCRIPTION="Python binding for the PowerVM REST API"
-HOMEPAGE="https://pypi.python.org/pypi/pypowervm"
+HOMEPAGE="https://pypi.org/project/pypowervm"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
diff --git a/dev-python/pypowervm/pypowervm-1.1.6.ebuild b/dev-python/pypowervm/pypowervm-1.1.6.ebuild
index a0c213a9525ab..827404dedbcec 100644
--- a/dev-python/pypowervm/pypowervm-1.1.6.ebuild
+++ b/dev-python/pypowervm/pypowervm-1.1.6.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
 inherit distutils-r1
 
 DESCRIPTION="Python binding for the PowerVM REST API"
-HOMEPAGE="https://pypi.python.org/pypi/pypowervm"
+HOMEPAGE="https://pypi.org/project/pypowervm"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
diff --git a/dev-python/pyprof2calltree/pyprof2calltree-1.4.0.ebuild b/dev-python/pyprof2calltree/pyprof2calltree-1.4.0.ebuild
index f1bf41cedbac1..c7ce811bf4ad2 100644
--- a/dev-python/pyprof2calltree/pyprof2calltree-1.4.0.ebuild
+++ b/dev-python/pyprof2calltree/pyprof2calltree-1.4.0.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python{2_7,3_{4,5,6}} )
 inherit distutils-r1
 
 DESCRIPTION="convert python profile data to kcachegrind calltree form"
-HOMEPAGE="https://pypi.python.org/pypi/pyprof2calltree/"
+HOMEPAGE="https://pypi.org/project/pyprof2calltree/"
 # pypi tarball lacks tests
 SRC_URI="https://github.com/pwaller/pyprof2calltree/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
diff --git a/dev-python/pyprotocols/pyprotocols-1.0_pre2306-r1.ebuild b/dev-python/pyprotocols/pyprotocols-1.0_pre2306-r1.ebuild
index 8a8f9f0b4bdc8..51706c7edc0fc 100644
--- a/dev-python/pyprotocols/pyprotocols-1.0_pre2306-r1.ebuild
+++ b/dev-python/pyprotocols/pyprotocols-1.0_pre2306-r1.ebuild
@@ -11,7 +11,7 @@ MY_PN="PyProtocols"
 MY_P="${MY_PN}-${PV/_pre/a0dev_r}"
 
 DESCRIPTION="Extends the PEP 246 adapt function with a new 'declaration API'"
-HOMEPAGE="http://peak.telecommunity.com/PyProtocols.html https://pypi.python.org/pypi/PyProtocols \
+HOMEPAGE="http://peak.telecommunity.com/PyProtocols.html https://pypi.org/project/PyProtocols \
 	http://svn.eby-sarna.com/PyProtocols/"
 SRC_URI="mirror://gentoo/${MY_P}.tar.gz"
 
diff --git a/dev-python/pyqrcode/pyqrcode-1.2.1.ebuild b/dev-python/pyqrcode/pyqrcode-1.2.1.ebuild
index a81e0ffcd6ab2..3ecf5c0486996 100644
--- a/dev-python/pyqrcode/pyqrcode-1.2.1.ebuild
+++ b/dev-python/pyqrcode/pyqrcode-1.2.1.ebuild
@@ -10,7 +10,7 @@ MY_PN="PyQRCode"
 MY_P="${MY_PN}-${PV}"
 
 DESCRIPTION="A pure Python QR code generator with SVG, EPS, PNG and terminal output"
-HOMEPAGE="https://github.com/mnooner256/pyqrcode https://pypi.python.org/pypi/PyQRCode"
+HOMEPAGE="https://github.com/mnooner256/pyqrcode https://pypi.org/project/PyQRCode"
 SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/pyqtgraph/pyqtgraph-0.10.0-r1.ebuild b/dev-python/pyqtgraph/pyqtgraph-0.10.0-r1.ebuild
index 86bf6f65bbb39..6c2525df7676b 100644
--- a/dev-python/pyqtgraph/pyqtgraph-0.10.0-r1.ebuild
+++ b/dev-python/pyqtgraph/pyqtgraph-0.10.0-r1.ebuild
@@ -6,7 +6,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
 inherit distutils-r1
 
 DESCRIPTION="A pure-python graphics and GUI library built on PyQt and numpy"
-HOMEPAGE="http://www.pyqtgraph.org/ https://pypi.python.org/pypi/pyqtgraph/"
+HOMEPAGE="http://www.pyqtgraph.org/ https://pypi.org/project/pyqtgraph/"
 SRC_URI="http://www.pyqtgraph.org/downloads/${PV}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/pyringe/pyringe-1.0.2.ebuild b/dev-python/pyringe/pyringe-1.0.2.ebuild
index 43f8f7a8d5b1c..a1c03e6be1abe 100644
--- a/dev-python/pyringe/pyringe-1.0.2.ebuild
+++ b/dev-python/pyringe/pyringe-1.0.2.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 )
 inherit distutils-r1
 
 DESCRIPTION="Debugger capable of attaching and injecting code"
-HOMEPAGE="https://github.com/google/pyringe https://pypi.python.org/pypi/pyringe/"
+HOMEPAGE="https://github.com/google/pyringe https://pypi.org/project/pyringe/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
diff --git a/dev-python/pyro/pyro-3.16-r1.ebuild b/dev-python/pyro/pyro-3.16-r1.ebuild
index f3c8ae5230879..60a84097b5276 100644
--- a/dev-python/pyro/pyro-3.16-r1.ebuild
+++ b/dev-python/pyro/pyro-3.16-r1.ebuild
@@ -11,7 +11,7 @@ MY_PN="Pyro"
 MY_P="${MY_PN}-${PV}"
 
 DESCRIPTION="Distributed object middleware for Python (RPC)"
-HOMEPAGE="https://pypi.python.org/pypi/Pyro"
+HOMEPAGE="https://pypi.org/project/Pyro"
 SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/pyro/pyro-4.41.ebuild b/dev-python/pyro/pyro-4.41.ebuild
index 1e26b0eb90927..8f826f99582ed 100644
--- a/dev-python/pyro/pyro-4.41.ebuild
+++ b/dev-python/pyro/pyro-4.41.ebuild
@@ -11,7 +11,7 @@ MY_PN="Pyro4"
 MY_P="${MY_PN}-${PV}"
 
 DESCRIPTION="Distributed object middleware for Python (RPC)"
-HOMEPAGE="https://pypi.python.org/pypi/Pyro4
+HOMEPAGE="https://pypi.org/project/Pyro4
 	https://github.com/irmen/Pyro4"
 SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
diff --git a/dev-python/pyro/pyro-4.56.ebuild b/dev-python/pyro/pyro-4.56.ebuild
index ac5eee994bd6e..beba0f06ec294 100644
--- a/dev-python/pyro/pyro-4.56.ebuild
+++ b/dev-python/pyro/pyro-4.56.ebuild
@@ -11,7 +11,7 @@ MY_PN="Pyro4"
 MY_P="${MY_PN}-${PV}"
 
 DESCRIPTION="Distributed object middleware for Python (RPC)"
-HOMEPAGE="https://pypi.python.org/pypi/Pyro4
+HOMEPAGE="https://pypi.org/project/Pyro4
 	https://github.com/irmen/Pyro4"
 SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
diff --git a/dev-python/pyroma/pyroma-1.7.ebuild b/dev-python/pyroma/pyroma-1.7.ebuild
index f0d268b295658..bd358bfa29fde 100644
--- a/dev-python/pyroma/pyroma-1.7.ebuild
+++ b/dev-python/pyroma/pyroma-1.7.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
 inherit distutils-r1
 
 DESCRIPTION="Test project's packaging friendliness"
-HOMEPAGE="https://bitbucket.org/regebro/pyroma https://pypi.python.org/pypi/pyroma"
+HOMEPAGE="https://bitbucket.org/regebro/pyroma https://pypi.org/project/pyroma"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
 
 LICENSE="MIT"
diff --git a/dev-python/pyrsistent/pyrsistent-0.13.0.ebuild b/dev-python/pyrsistent/pyrsistent-0.13.0.ebuild
index 00607ac254d9f..e073ae5d87d3f 100644
--- a/dev-python/pyrsistent/pyrsistent-0.13.0.ebuild
+++ b/dev-python/pyrsistent/pyrsistent-0.13.0.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="Persistent/Functional/Immutable data structures"
-HOMEPAGE="https://github.com/tobgu/pyrsistent/ https://pypi.python.org/pypi/pyrsistent"
+HOMEPAGE="https://github.com/tobgu/pyrsistent/ https://pypi.org/project/pyrsistent"
 SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/pyrtf/pyrtf-0.45-r2.ebuild b/dev-python/pyrtf/pyrtf-0.45-r2.ebuild
index 09be2245c6221..f99d0374de473 100644
--- a/dev-python/pyrtf/pyrtf-0.45-r2.ebuild
+++ b/dev-python/pyrtf/pyrtf-0.45-r2.ebuild
@@ -11,7 +11,7 @@ MY_PN="PyRTF"
 MY_P="${MY_PN}-${PV}"
 
 DESCRIPTION="Python library to produce RTF documents"
-HOMEPAGE="http://pyrtf.sourceforge.net https://pypi.python.org/pypi/PyRTF"
+HOMEPAGE="http://pyrtf.sourceforge.net https://pypi.org/project/PyRTF"
 SRC_URI="mirror://sourceforge/$PN/${MY_P}.tar.gz"
 
 LICENSE="|| ( GPL-2 LGPL-2 )"
diff --git a/dev-python/pyscaffold/pyscaffold-2.4.4.ebuild b/dev-python/pyscaffold/pyscaffold-2.4.4.ebuild
index 8b179637dc42e..c90c557d9b663 100644
--- a/dev-python/pyscaffold/pyscaffold-2.4.4.ebuild
+++ b/dev-python/pyscaffold/pyscaffold-2.4.4.ebuild
@@ -11,7 +11,7 @@ MY_PN="PyScaffold"
 MY_P="${MY_PN}-${PV}"
 
 DESCRIPTION="Tool for easily putting up the scaffold of a Python project"
-HOMEPAGE="https://pypi.python.org/pypi/PyScaffold http://pyscaffold.readthedocs.org/"
+HOMEPAGE="https://pypi.org/project/PyScaffold http://pyscaffold.readthedocs.org/"
 SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${P}.tar.gz"
 
 SLOT="0"
diff --git a/dev-python/pyscard/pyscard-1.9.5.ebuild b/dev-python/pyscard/pyscard-1.9.5.ebuild
index 1a2dccec54d26..249e911fac15a 100644
--- a/dev-python/pyscard/pyscard-1.9.5.ebuild
+++ b/dev-python/pyscard/pyscard-1.9.5.ebuild
@@ -10,7 +10,7 @@ inherit distutils-r1 eutils
 DESCRIPTION="Smart cards support in python"
 HOMEPAGE="https://pyscard.sourceforge.io/
 	https://github.com/LudovicRousseau/pyscard
-	https://pypi.python.org/pypi/pyscard"
+	https://pypi.org/project/pyscard"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
diff --git a/dev-python/pyserial/pyserial-3.2.1.ebuild b/dev-python/pyserial/pyserial-3.2.1.ebuild
index cd5a0cd07d00d..fb917e23d4791 100644
--- a/dev-python/pyserial/pyserial-3.2.1.ebuild
+++ b/dev-python/pyserial/pyserial-3.2.1.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
 inherit distutils-r1
 
 DESCRIPTION="Python Serial Port extension"
-HOMEPAGE="https://github.com/pyserial/pyserial https://pypi.python.org/pypi/pyserial"
+HOMEPAGE="https://github.com/pyserial/pyserial https://pypi.org/project/pyserial"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="PSF-2"
diff --git a/dev-python/pyserial/pyserial-3.4.ebuild b/dev-python/pyserial/pyserial-3.4.ebuild
index 49af25222514c..9cdf3fdeadbc9 100644
--- a/dev-python/pyserial/pyserial-3.4.ebuild
+++ b/dev-python/pyserial/pyserial-3.4.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
 inherit distutils-r1
 
 DESCRIPTION="Python Serial Port extension"
-HOMEPAGE="https://github.com/pyserial/pyserial https://pypi.python.org/pypi/pyserial"
+HOMEPAGE="https://github.com/pyserial/pyserial https://pypi.org/project/pyserial"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="PSF-2"
diff --git a/dev-python/pysha3/pysha3-1.0.2-r1.ebuild b/dev-python/pysha3/pysha3-1.0.2-r1.ebuild
index 614ada89704e9..2b854d4665e12 100644
--- a/dev-python/pysha3/pysha3-1.0.2-r1.ebuild
+++ b/dev-python/pysha3/pysha3-1.0.2-r1.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy )
 inherit distutils-r1
 
 DESCRIPTION="SHA-3 (Keccak) for Python 2.7 - 3.5"
-HOMEPAGE="https://github.com/tiran/pysha3 https://pypi.python.org/pypi/pysha3"
+HOMEPAGE="https://github.com/tiran/pysha3 https://pypi.org/project/pysha3"
 SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
 
 LICENSE="CC0-1.0 PSF-2"
diff --git a/dev-python/pyshark/pyshark-0.3.7.2.ebuild b/dev-python/pyshark/pyshark-0.3.7.2.ebuild
index 4d11881ab65e7..12e12622a1fa5 100644
--- a/dev-python/pyshark/pyshark-0.3.7.2.ebuild
+++ b/dev-python/pyshark/pyshark-0.3.7.2.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5} )
 inherit distutils-r1 eutils
 
 DESCRIPTION="A Python wrapper for tshark output parsing"
-HOMEPAGE="https://pypi.python.org/pypi/pyshark https://github.com/KimiNewt/pyshark"
+HOMEPAGE="https://pypi.org/project/pyshark https://github.com/KimiNewt/pyshark"
 # pypi tarball is missing tests
 #SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 SRC_URI="https://github.com/KimiNewt/pyshark/archive/v${PV}.tar.gz -> ${P}.tar.gz"
diff --git a/dev-python/pysnmp-apps/pysnmp-apps-0.5.2.ebuild b/dev-python/pysnmp-apps/pysnmp-apps-0.5.2.ebuild
index b4ffb3b4c4775..b433bfa00b8ba 100644
--- a/dev-python/pysnmp-apps/pysnmp-apps-0.5.2.ebuild
+++ b/dev-python/pysnmp-apps/pysnmp-apps-0.5.2.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5} )
 inherit distutils-r1
 
 DESCRIPTION="PySNMP applications"
-HOMEPAGE="http://pysnmp.sf.net/ https://pypi.python.org/pypi/pysnmp-apps"
+HOMEPAGE="http://pysnmp.sf.net/ https://pypi.org/project/pysnmp-apps"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/pysnmp-apps/pysnmp-apps-0.5.3.ebuild b/dev-python/pysnmp-apps/pysnmp-apps-0.5.3.ebuild
index 76b50f5e9ea76..55d4ac689cdbe 100644
--- a/dev-python/pysnmp-apps/pysnmp-apps-0.5.3.ebuild
+++ b/dev-python/pysnmp-apps/pysnmp-apps-0.5.3.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
 inherit distutils-r1
 
 DESCRIPTION="PySNMP applications"
-HOMEPAGE="http://pysnmp.sf.net/ https://pypi.python.org/pypi/pysnmp-apps"
+HOMEPAGE="http://pysnmp.sf.net/ https://pypi.org/project/pysnmp-apps"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
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 ff0cead22857d..2acff3041233d 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=( python{2_7,3_4,3_5,3_6} )
 inherit distutils-r1
 
 DESCRIPTION="SNMP framework in Python - MIBs"
-HOMEPAGE="http://pysnmp.sf.net/ https://pypi.python.org/pypi/pysnmp-mibs"
+HOMEPAGE="http://pysnmp.sf.net/ https://pypi.org/project/pysnmp-mibs"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/pysnmp/pysnmp-4.3.3.ebuild b/dev-python/pysnmp/pysnmp-4.3.3.ebuild
index 38083e2b1ad9d..968dc80f94296 100644
--- a/dev-python/pysnmp/pysnmp-4.3.3.ebuild
+++ b/dev-python/pysnmp/pysnmp-4.3.3.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5} )
 inherit distutils-r1
 
 DESCRIPTION="Python SNMP library"
-HOMEPAGE="http://pysnmp.sf.net/ https://pypi.python.org/pypi/pysnmp"
+HOMEPAGE="http://pysnmp.sf.net/ https://pypi.org/project/pysnmp"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/pysnmp/pysnmp-4.4.4.ebuild b/dev-python/pysnmp/pysnmp-4.4.4.ebuild
index 00cffc9dba022..68a7e63f93c3a 100644
--- a/dev-python/pysnmp/pysnmp-4.4.4.ebuild
+++ b/dev-python/pysnmp/pysnmp-4.4.4.ebuild
@@ -6,7 +6,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
 inherit distutils-r1
 
 DESCRIPTION="Python SNMP library"
-HOMEPAGE="http://snmplabs.com/pysnmp/ https://pypi.python.org/pypi/pysnmp"
+HOMEPAGE="http://snmplabs.com/pysnmp/ https://pypi.org/project/pysnmp"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/pysolr/pysolr-3.3.2.ebuild b/dev-python/pysolr/pysolr-3.3.2.ebuild
index 0ce697520b2e4..68225dea78a02 100644
--- a/dev-python/pysolr/pysolr-3.3.2.ebuild
+++ b/dev-python/pysolr/pysolr-3.3.2.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
 inherit distutils-r1
 
 DESCRIPTION="Lightweight python wrapper for Apache Solr"
-HOMEPAGE="https://pypi.python.org/pypi/pysolr/ https://github.com/toastdriven/pysolr/"
+HOMEPAGE="https://pypi.org/project/pysolr/ https://github.com/toastdriven/pysolr/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
diff --git a/dev-python/pysolr/pysolr-3.6.0.ebuild b/dev-python/pysolr/pysolr-3.6.0.ebuild
index 02215372aaf72..83aeb842536ee 100644
--- a/dev-python/pysolr/pysolr-3.6.0.ebuild
+++ b/dev-python/pysolr/pysolr-3.6.0.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
 inherit distutils-r1
 
 DESCRIPTION="Lightweight python wrapper for Apache Solr"
-HOMEPAGE="https://pypi.python.org/pypi/pysolr/ https://github.com/toastdriven/pysolr/"
+HOMEPAGE="https://pypi.org/project/pysolr/ https://github.com/toastdriven/pysolr/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
diff --git a/dev-python/pyspf/pyspf-2.0.12.ebuild b/dev-python/pyspf/pyspf-2.0.12.ebuild
index cd41a136bafd3..bf1883969e604 100644
--- a/dev-python/pyspf/pyspf-2.0.12.ebuild
+++ b/dev-python/pyspf/pyspf-2.0.12.ebuild
@@ -8,7 +8,7 @@ PYTHON_REQ_USE="ipv6?"
 inherit distutils-r1
 
 DESCRIPTION="Python implementation of the Sender Policy Framework (SPF) protocol"
-HOMEPAGE="https://pypi.python.org/pypi/pyspf"
+HOMEPAGE="https://pypi.org/project/pyspf"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}t.tar.gz"
 
 LICENSE="PSF-2"
diff --git a/dev-python/pysrt/pysrt-1.0.1.ebuild b/dev-python/pysrt/pysrt-1.0.1.ebuild
index a7ed67b90277d..ffa3cee632cad 100644
--- a/dev-python/pysrt/pysrt-1.0.1.ebuild
+++ b/dev-python/pysrt/pysrt-1.0.1.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5} )
 inherit distutils-r1
 
 DESCRIPTION="Python library used to edit or create SubRip files"
-HOMEPAGE="https://github.com/byroot/pysrt https://pypi.python.org/pypi/pysrt"
+HOMEPAGE="https://github.com/byroot/pysrt https://pypi.org/project/pysrt"
 # pypi tarballs don't include tests https://github.com/byroot/pysrt/issues/42
 SRC_URI="https://github.com/byroot/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
diff --git a/dev-python/pysrt/pysrt-1.1.0.ebuild b/dev-python/pysrt/pysrt-1.1.0.ebuild
index ab91a666b6466..7a6b7a9fec617 100644
--- a/dev-python/pysrt/pysrt-1.1.0.ebuild
+++ b/dev-python/pysrt/pysrt-1.1.0.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5} )
 inherit distutils-r1
 
 DESCRIPTION="Python library used to edit or create SubRip files"
-HOMEPAGE="https://github.com/byroot/pysrt https://pypi.python.org/pypi/pysrt"
+HOMEPAGE="https://github.com/byroot/pysrt https://pypi.org/project/pysrt"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
diff --git a/dev-python/pysrt/pysrt-1.1.1.ebuild b/dev-python/pysrt/pysrt-1.1.1.ebuild
index c16e7200f4fbe..ddc1e6025751f 100644
--- a/dev-python/pysrt/pysrt-1.1.1.ebuild
+++ b/dev-python/pysrt/pysrt-1.1.1.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
 inherit distutils-r1
 
 DESCRIPTION="Python library used to edit or create SubRip files"
-HOMEPAGE="https://github.com/byroot/pysrt https://pypi.python.org/pypi/pysrt"
+HOMEPAGE="https://github.com/byroot/pysrt https://pypi.org/project/pysrt"
 SRC_URI="https://pypi.python.org/packages/f6/33/16ad65a8973cb8bcb494af09ee1b9ab5ffdd6ff300bce5d3ac7d3cb1f2cc/${P}.tar.gz"
 
 LICENSE="GPL-3"
diff --git a/dev-python/pysrt/pysrt-9999.ebuild b/dev-python/pysrt/pysrt-9999.ebuild
index a6d77706d853a..d0567969f497c 100644
--- a/dev-python/pysrt/pysrt-9999.ebuild
+++ b/dev-python/pysrt/pysrt-9999.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
 inherit distutils-r1 git-r3
 
 DESCRIPTION="Python library used to edit or create SubRip files"
-HOMEPAGE="https://github.com/byroot/pysrt https://pypi.python.org/pypi/pysrt"
+HOMEPAGE="https://github.com/byroot/pysrt https://pypi.org/project/pysrt"
 EGIT_REPO_URI="https://github.com/byroot/pysrt.git"
 
 LICENSE="GPL-3"
diff --git a/dev-python/pyte/pyte-0.5.2-r1.ebuild b/dev-python/pyte/pyte-0.5.2-r1.ebuild
index 38f19dd8f600c..4148f4ac2f8e6 100644
--- a/dev-python/pyte/pyte-0.5.2-r1.ebuild
+++ b/dev-python/pyte/pyte-0.5.2-r1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5} )
 inherit distutils-r1
 
 DESCRIPTION="Simple VTXXX-compatible terminal emulator"
-HOMEPAGE="https://pypi.python.org/pypi/pyte/ https://github.com/selectel/pyte"
+HOMEPAGE="https://pypi.org/project/pyte/ https://github.com/selectel/pyte"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
diff --git a/dev-python/pyte/pyte-0.5.2-r2.ebuild b/dev-python/pyte/pyte-0.5.2-r2.ebuild
index 999ffe7479b71..03bb80f7d5588 100644
--- a/dev-python/pyte/pyte-0.5.2-r2.ebuild
+++ b/dev-python/pyte/pyte-0.5.2-r2.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
 inherit distutils-r1
 
 DESCRIPTION="Simple VTXXX-compatible terminal emulator"
-HOMEPAGE="https://pypi.python.org/pypi/pyte/ https://github.com/selectel/pyte"
+HOMEPAGE="https://pypi.org/project/pyte/ https://github.com/selectel/pyte"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
diff --git a/dev-python/pytest-cache/pytest-cache-1.0-r1.ebuild b/dev-python/pytest-cache/pytest-cache-1.0-r1.ebuild
index 35c3a296da789..80375c03dbd56 100644
--- a/dev-python/pytest-cache/pytest-cache-1.0-r1.ebuild
+++ b/dev-python/pytest-cache/pytest-cache-1.0-r1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="mechanisms for caching across test runs"
-HOMEPAGE="https://pypi.python.org/pypi/pytest-cache
+HOMEPAGE="https://pypi.org/project/pytest-cache
 	https://bitbucket.org/hpk42/pytest-cache/
 	https://pythonhosted.org/pytest-cache/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
diff --git a/dev-python/pytest-catchlog/pytest-catchlog-1.2.2.ebuild b/dev-python/pytest-catchlog/pytest-catchlog-1.2.2.ebuild
index b948075d79ee3..a5d7a40ef447b 100644
--- a/dev-python/pytest-catchlog/pytest-catchlog-1.2.2.ebuild
+++ b/dev-python/pytest-catchlog/pytest-catchlog-1.2.2.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="py.test plugin to catch log messages, fork of pytest-capturelog"
-HOMEPAGE="https://pypi.python.org/pypi/pytest-catchlog https://github.com/eisensheng/pytest-catchlog"
+HOMEPAGE="https://pypi.org/project/pytest-catchlog https://github.com/eisensheng/pytest-catchlog"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
 
 SLOT="0"
diff --git a/dev-python/pytest-cov/pytest-cov-2.3.1.ebuild b/dev-python/pytest-cov/pytest-cov-2.3.1.ebuild
index c52df73750237..54e2586ba7c9f 100644
--- a/dev-python/pytest-cov/pytest-cov-2.3.1.ebuild
+++ b/dev-python/pytest-cov/pytest-cov-2.3.1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy{,3} )
 inherit distutils-r1
 
 DESCRIPTION="py.test plugin for coverage reporting"
-HOMEPAGE="https://github.com/pytest-dev/pytest-cov https://pypi.python.org/pypi/pytest-cov"
+HOMEPAGE="https://github.com/pytest-dev/pytest-cov https://pypi.org/project/pytest-cov"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/pytest-cov/pytest-cov-2.5.1-r1.ebuild b/dev-python/pytest-cov/pytest-cov-2.5.1-r1.ebuild
index 9f3ce0ed994f1..3dc7179e8a4bc 100644
--- a/dev-python/pytest-cov/pytest-cov-2.5.1-r1.ebuild
+++ b/dev-python/pytest-cov/pytest-cov-2.5.1-r1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy{,3} )
 inherit distutils-r1
 
 DESCRIPTION="py.test plugin for coverage reporting"
-HOMEPAGE="https://github.com/pytest-dev/pytest-cov https://pypi.python.org/pypi/pytest-cov"
+HOMEPAGE="https://github.com/pytest-dev/pytest-cov https://pypi.org/project/pytest-cov"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/pytest-cov/pytest-cov-2.5.1.ebuild b/dev-python/pytest-cov/pytest-cov-2.5.1.ebuild
index 6b39b3c8c69e7..9a605b2a064c5 100644
--- a/dev-python/pytest-cov/pytest-cov-2.5.1.ebuild
+++ b/dev-python/pytest-cov/pytest-cov-2.5.1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy{,3} )
 inherit distutils-r1
 
 DESCRIPTION="py.test plugin for coverage reporting"
-HOMEPAGE="https://github.com/pytest-dev/pytest-cov https://pypi.python.org/pypi/pytest-cov"
+HOMEPAGE="https://github.com/pytest-dev/pytest-cov https://pypi.org/project/pytest-cov"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/pytest-django/pytest-django-2.9.1.ebuild b/dev-python/pytest-django/pytest-django-2.9.1.ebuild
index 4e1da3ba941bd..39543a13cfa0e 100644
--- a/dev-python/pytest-django/pytest-django-2.9.1.ebuild
+++ b/dev-python/pytest-django/pytest-django-2.9.1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="A Django plugin for py.test"
-HOMEPAGE="https://pypi.python.org/pypi/pytest-django https://pytest-django.readthedocs.org https://github.com/pytest-dev/pytest-django"
+HOMEPAGE="https://pypi.org/project/pytest-django https://pytest-django.readthedocs.org https://github.com/pytest-dev/pytest-django"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/pytest-expect/pytest-expect-1.1.0.ebuild b/dev-python/pytest-expect/pytest-expect-1.1.0.ebuild
index 731b4b8a78fe1..eabe53e7d9b24 100644
--- a/dev-python/pytest-expect/pytest-expect-1.1.0.ebuild
+++ b/dev-python/pytest-expect/pytest-expect-1.1.0.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="py.test plugin that stores test expectations by saving the set of failing tests"
-HOMEPAGE="https://github.com/gsnedders/pytest-expect/ https://pypi.python.org/pypi/pytest-expect/"
+HOMEPAGE="https://github.com/gsnedders/pytest-expect/ https://pypi.org/project/pytest-expect/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/pytest-fixture-config/pytest-fixture-config-1.2.11.ebuild b/dev-python/pytest-fixture-config/pytest-fixture-config-1.2.11.ebuild
index 8b6d2ada092a7..2fc914c8b7692 100644
--- a/dev-python/pytest-fixture-config/pytest-fixture-config-1.2.11.ebuild
+++ b/dev-python/pytest-fixture-config/pytest-fixture-config-1.2.11.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy{,3} )
 inherit distutils-r1
 
 DESCRIPTION="Virtualenv fixture for py.test"
-HOMEPAGE="https://github.com/manahl/pytest-plugins https://pypi.python.org/pypi/pytest-fixture-config"
+HOMEPAGE="https://github.com/manahl/pytest-plugins https://pypi.org/project/pytest-fixture-config"
 SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/pytest-fixture-config/pytest-fixture-config-1.2.2.ebuild b/dev-python/pytest-fixture-config/pytest-fixture-config-1.2.2.ebuild
index 89bdb6e1b147f..7d14dbd4c2a89 100644
--- a/dev-python/pytest-fixture-config/pytest-fixture-config-1.2.2.ebuild
+++ b/dev-python/pytest-fixture-config/pytest-fixture-config-1.2.2.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5} )
 inherit distutils-r1
 
 DESCRIPTION="Virtualenv fixture for py.test"
-HOMEPAGE="https://github.com/manahl/pytest-plugins https://pypi.python.org/pypi/pytest-fixture-config"
+HOMEPAGE="https://github.com/manahl/pytest-plugins https://pypi.org/project/pytest-fixture-config"
 SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/pytest-flake8/pytest-flake8-0.8.1.ebuild b/dev-python/pytest-flake8/pytest-flake8-0.8.1.ebuild
index a42af5a698edc..913374116ce97 100644
--- a/dev-python/pytest-flake8/pytest-flake8-0.8.1.ebuild
+++ b/dev-python/pytest-flake8/pytest-flake8-0.8.1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
 inherit distutils-r1
 
 DESCRIPTION="py.test plugin for flake8"
-HOMEPAGE="https://github.com/tholo/${PN} https://pypi.python.org/pypi/${PN}"
+HOMEPAGE="https://github.com/tholo/${PN} https://pypi.org/project/${PN}"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/pytest-flake8/pytest-flake8-0.9.1.ebuild b/dev-python/pytest-flake8/pytest-flake8-0.9.1.ebuild
index 9b0fa3e9c971a..6ef8fc620514d 100644
--- a/dev-python/pytest-flake8/pytest-flake8-0.9.1.ebuild
+++ b/dev-python/pytest-flake8/pytest-flake8-0.9.1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
 inherit distutils-r1
 
 DESCRIPTION="py.test plugin for flake8"
-HOMEPAGE="https://github.com/tholo/${PN} https://pypi.python.org/pypi/${PN}"
+HOMEPAGE="https://github.com/tholo/${PN} https://pypi.org/project/${PN}"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/pytest-forked/pytest-forked-0.2.ebuild b/dev-python/pytest-forked/pytest-forked-0.2.ebuild
index 04779eea8fe00..79964ebe91845 100644
--- a/dev-python/pytest-forked/pytest-forked-0.2.ebuild
+++ b/dev-python/pytest-forked/pytest-forked-0.2.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy{,3} )
 inherit distutils-r1
 
 DESCRIPTION="run tests in isolated forked subprocesses"
-HOMEPAGE="https://pypi.python.org/pypi/pytest-forked https://github.com/pytest-dev/pytest-forked"
+HOMEPAGE="https://pypi.org/project/pytest-forked https://github.com/pytest-dev/pytest-forked"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
diff --git a/dev-python/pytest-httpbin/pytest-httpbin-0.2.3.ebuild b/dev-python/pytest-httpbin/pytest-httpbin-0.2.3.ebuild
index 626138b088cdf..871f9d8266f13 100644
--- a/dev-python/pytest-httpbin/pytest-httpbin-0.2.3.ebuild
+++ b/dev-python/pytest-httpbin/pytest-httpbin-0.2.3.ebuild
@@ -9,7 +9,7 @@ inherit distutils-r1
 
 DESCRIPTION="Easily test your HTTP library against a local copy of httpbin"
 HOMEPAGE="https://github.com/kevin1024/pytest-httpbin
-	https://pypi.python.org/pypi/pytest-httpbin"
+	https://pypi.org/project/pytest-httpbin"
 SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/pytest-isort/pytest-isort-0.1.0.ebuild b/dev-python/pytest-isort/pytest-isort-0.1.0.ebuild
index 8fe6efc963f1f..245430216ba1d 100644
--- a/dev-python/pytest-isort/pytest-isort-0.1.0.ebuild
+++ b/dev-python/pytest-isort/pytest-isort-0.1.0.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
 inherit distutils-r1
 
 DESCRIPTION="py.test plugin for isort"
-HOMEPAGE="https://github.com/moccu/${PN} https://pypi.python.org/pypi/${PN}"
+HOMEPAGE="https://github.com/moccu/${PN} https://pypi.org/project/${PN}"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/pytest-localserver/pytest-localserver-0.3.7.ebuild b/dev-python/pytest-localserver/pytest-localserver-0.3.7.ebuild
index 61c8ba3e25725..1c44fbbfbf8ae 100644
--- a/dev-python/pytest-localserver/pytest-localserver-0.3.7.ebuild
+++ b/dev-python/pytest-localserver/pytest-localserver-0.3.7.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=(python{2_7,3_4,3_5,3_6} pypy)
 inherit distutils-r1
 
 DESCRIPTION="Py.test plugin to test server connections locally"
-HOMEPAGE="https://pypi.python.org/pypi/pytest-localserver"
+HOMEPAGE="https://pypi.org/project/pytest-localserver"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/pytest-pep8/pytest-pep8-1.0.6.ebuild b/dev-python/pytest-pep8/pytest-pep8-1.0.6.ebuild
index 5d5ec11517bc4..d1f0235a597a8 100644
--- a/dev-python/pytest-pep8/pytest-pep8-1.0.6.ebuild
+++ b/dev-python/pytest-pep8/pytest-pep8-1.0.6.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="pytest plugin to check PEP8 requirements"
-HOMEPAGE="https://pypi.python.org/pypi/pytest-pep8"
+HOMEPAGE="https://pypi.org/project/pytest-pep8"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
diff --git a/dev-python/pytest-pythonpath/pytest-pythonpath-0.7.1.ebuild b/dev-python/pytest-pythonpath/pytest-pythonpath-0.7.1.ebuild
index 6db34836ac760..a3483ca073afc 100644
--- a/dev-python/pytest-pythonpath/pytest-pythonpath-0.7.1.ebuild
+++ b/dev-python/pytest-pythonpath/pytest-pythonpath-0.7.1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_{4,5,6}} pypy pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="pytest plugin for adding to the PYTHONPATH from command line or configs"
-HOMEPAGE="https://pypi.python.org/pypi/pytest-pythonpath https://github.com/bigsassy/pytest-pythonpath"
+HOMEPAGE="https://pypi.org/project/pytest-pythonpath https://github.com/bigsassy/pytest-pythonpath"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/pytest-qt/pytest-qt-2.3.0-r2.ebuild b/dev-python/pytest-qt/pytest-qt-2.3.0-r2.ebuild
index 317a66593a462..af670b1bcf48d 100644
--- a/dev-python/pytest-qt/pytest-qt-2.3.0-r2.ebuild
+++ b/dev-python/pytest-qt/pytest-qt-2.3.0-r2.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 python3_5 )
 inherit distutils-r1
 
 DESCRIPTION="pytest plugin for PyQt4 or PyQt5 applications"
-HOMEPAGE="https://pypi.python.org/pypi/pytest-qt"
+HOMEPAGE="https://pypi.org/project/pytest-qt"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/pytest-qt/pytest-qt-2.3.0.ebuild b/dev-python/pytest-qt/pytest-qt-2.3.0.ebuild
index 9032b7bee7559..3ae4ea036b6ee 100644
--- a/dev-python/pytest-qt/pytest-qt-2.3.0.ebuild
+++ b/dev-python/pytest-qt/pytest-qt-2.3.0.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 python3_5 )
 inherit distutils-r1
 
 DESCRIPTION="pytest plugin for PyQt4 or PyQt5 applications"
-HOMEPAGE="https://pypi.python.org/pypi/pytest-qt"
+HOMEPAGE="https://pypi.org/project/pytest-qt"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/pytest-relaxed/pytest-relaxed-1.1.0.ebuild b/dev-python/pytest-relaxed/pytest-relaxed-1.1.0.ebuild
index 948d62c8ac3d9..fa3c9f8cae6de 100644
--- a/dev-python/pytest-relaxed/pytest-relaxed-1.1.0.ebuild
+++ b/dev-python/pytest-relaxed/pytest-relaxed-1.1.0.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
 inherit distutils-r1
 
 DESCRIPTION="py.test plugin for relaxed test discovery and organization"
-HOMEPAGE="https://pypi.python.org/pypi/pytest-relaxed https://github.com/bitprophet/pytest-relaxed"
+HOMEPAGE="https://pypi.org/project/pytest-relaxed https://github.com/bitprophet/pytest-relaxed"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
diff --git a/dev-python/pytest-rerunfailures/pytest-rerunfailures-2.1.0.ebuild b/dev-python/pytest-rerunfailures/pytest-rerunfailures-2.1.0.ebuild
index 14de2183e0891..e74eacda46f22 100644
--- a/dev-python/pytest-rerunfailures/pytest-rerunfailures-2.1.0.ebuild
+++ b/dev-python/pytest-rerunfailures/pytest-rerunfailures-2.1.0.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="py.test plugin to re-run tests to eliminate flaky failures"
-HOMEPAGE="https://pypi.python.org/pypi/pytest-rerunfailures"
+HOMEPAGE="https://pypi.org/project/pytest-rerunfailures"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
diff --git a/dev-python/pytest-runner/pytest-runner-2.11.1.ebuild b/dev-python/pytest-runner/pytest-runner-2.11.1.ebuild
index 713a15cfd7091..6c3e95866e42c 100644
--- a/dev-python/pytest-runner/pytest-runner-2.11.1.ebuild
+++ b/dev-python/pytest-runner/pytest-runner-2.11.1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy{,3} )
 inherit distutils-r1
 
 DESCRIPTION="Adds support for tests during installation of setup.py files"
-HOMEPAGE="https://pypi.python.org/pypi/pytest-runner https://github.com/pytest-dev/pytest-runner"
+HOMEPAGE="https://pypi.org/project/pytest-runner https://github.com/pytest-dev/pytest-runner"
 SRC_URI="mirror://pypi/p/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/pytest-runner/pytest-runner-2.6.2.ebuild b/dev-python/pytest-runner/pytest-runner-2.6.2.ebuild
index 8d69d6c3b8562..87a5bf0761ae8 100644
--- a/dev-python/pytest-runner/pytest-runner-2.6.2.ebuild
+++ b/dev-python/pytest-runner/pytest-runner-2.6.2.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="Adds support for tests during installation of setup.py files"
-HOMEPAGE="https://pypi.python.org/pypi/pytest-runner https://github.com/pytest-dev/pytest-runner"
+HOMEPAGE="https://pypi.org/project/pytest-runner https://github.com/pytest-dev/pytest-runner"
 SRC_URI="mirror://pypi/p/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/pytest-runner/pytest-runner-4.0.ebuild b/dev-python/pytest-runner/pytest-runner-4.0.ebuild
index cff2bd301d4ab..ee3d50583ea09 100644
--- a/dev-python/pytest-runner/pytest-runner-4.0.ebuild
+++ b/dev-python/pytest-runner/pytest-runner-4.0.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy{,3} )
 inherit distutils-r1
 
 DESCRIPTION="Adds support for tests during installation of setup.py files"
-HOMEPAGE="https://pypi.python.org/pypi/pytest-runner https://github.com/pytest-dev/pytest-runner"
+HOMEPAGE="https://pypi.org/project/pytest-runner https://github.com/pytest-dev/pytest-runner"
 SRC_URI="mirror://pypi/p/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/pytest-shutil/pytest-shutil-1.2.11.ebuild b/dev-python/pytest-shutil/pytest-shutil-1.2.11.ebuild
index f6bf919098d03..7b7ea8ed385c5 100644
--- a/dev-python/pytest-shutil/pytest-shutil-1.2.11.ebuild
+++ b/dev-python/pytest-shutil/pytest-shutil-1.2.11.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy{,3} )
 inherit distutils-r1
 
 DESCRIPTION="A goodie-bag of unix shell and environment tools for py.test"
-HOMEPAGE="https://github.com/manahl/pytest-plugins https://pypi.python.org/pypi/pytest-shutil"
+HOMEPAGE="https://github.com/manahl/pytest-plugins https://pypi.org/project/pytest-shutil"
 SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/pytest-shutil/pytest-shutil-1.2.4.ebuild b/dev-python/pytest-shutil/pytest-shutil-1.2.4.ebuild
index 88ce32a9dec96..a83383c7ddc1d 100644
--- a/dev-python/pytest-shutil/pytest-shutil-1.2.4.ebuild
+++ b/dev-python/pytest-shutil/pytest-shutil-1.2.4.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5} )
 inherit distutils-r1
 
 DESCRIPTION="A goodie-bag of unix shell and environment tools for py.test"
-HOMEPAGE="https://github.com/manahl/pytest-plugins https://pypi.python.org/pypi/pytest-shutil"
+HOMEPAGE="https://github.com/manahl/pytest-plugins https://pypi.org/project/pytest-shutil"
 SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/pytest-shutil/pytest-shutil-1.2.8.ebuild b/dev-python/pytest-shutil/pytest-shutil-1.2.8.ebuild
index 88ce32a9dec96..a83383c7ddc1d 100644
--- a/dev-python/pytest-shutil/pytest-shutil-1.2.8.ebuild
+++ b/dev-python/pytest-shutil/pytest-shutil-1.2.8.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5} )
 inherit distutils-r1
 
 DESCRIPTION="A goodie-bag of unix shell and environment tools for py.test"
-HOMEPAGE="https://github.com/manahl/pytest-plugins https://pypi.python.org/pypi/pytest-shutil"
+HOMEPAGE="https://github.com/manahl/pytest-plugins https://pypi.org/project/pytest-shutil"
 SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/pytest-timeout/pytest-timeout-1.2.0.ebuild b/dev-python/pytest-timeout/pytest-timeout-1.2.0.ebuild
index 2f57c18920152..1ff4694843d16 100644
--- a/dev-python/pytest-timeout/pytest-timeout-1.2.0.ebuild
+++ b/dev-python/pytest-timeout/pytest-timeout-1.2.0.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="py.test plugin to abort hanging tests"
-HOMEPAGE="https://pypi.python.org/pypi/pytest-timeout"
+HOMEPAGE="https://pypi.org/project/pytest-timeout"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
diff --git a/dev-python/pytest-timeout/pytest-timeout-1.2.1.ebuild b/dev-python/pytest-timeout/pytest-timeout-1.2.1.ebuild
index d5be6744077df..0fdf2074e7f5f 100644
--- a/dev-python/pytest-timeout/pytest-timeout-1.2.1.ebuild
+++ b/dev-python/pytest-timeout/pytest-timeout-1.2.1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{5,6} pypy pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="py.test plugin to abort hanging tests"
-HOMEPAGE="https://pypi.python.org/pypi/pytest-timeout"
+HOMEPAGE="https://pypi.org/project/pytest-timeout"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
diff --git a/dev-python/pytest-virtualenv/pytest-virtualenv-1.2.11.ebuild b/dev-python/pytest-virtualenv/pytest-virtualenv-1.2.11.ebuild
index 587b8471652af..ffafec23cc87b 100644
--- a/dev-python/pytest-virtualenv/pytest-virtualenv-1.2.11.ebuild
+++ b/dev-python/pytest-virtualenv/pytest-virtualenv-1.2.11.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy{,3} )
 inherit distutils-r1
 
 DESCRIPTION="Virtualenv fixture for py.test"
-HOMEPAGE="https://github.com/manahl/pytest-plugins https://pypi.python.org/pypi/pytest-virtualenv"
+HOMEPAGE="https://github.com/manahl/pytest-plugins https://pypi.org/project/pytest-virtualenv"
 SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/pytest-xdist/pytest-xdist-1.15.0.ebuild b/dev-python/pytest-xdist/pytest-xdist-1.15.0.ebuild
index 0720113611f90..9ac23db3a9f6c 100644
--- a/dev-python/pytest-xdist/pytest-xdist-1.15.0.ebuild
+++ b/dev-python/pytest-xdist/pytest-xdist-1.15.0.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy{,3} )
 inherit distutils-r1
 
 DESCRIPTION="Distributed testing and loop-on-failing modes"
-HOMEPAGE="https://pypi.python.org/pypi/pytest-xdist https://github.com/pytest-dev/pytest-xdist"
+HOMEPAGE="https://pypi.org/project/pytest-xdist https://github.com/pytest-dev/pytest-xdist"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
diff --git a/dev-python/pytest-xdist/pytest-xdist-1.20.1.ebuild b/dev-python/pytest-xdist/pytest-xdist-1.20.1.ebuild
index a26976c9526a3..3bf471c7d78c2 100644
--- a/dev-python/pytest-xdist/pytest-xdist-1.20.1.ebuild
+++ b/dev-python/pytest-xdist/pytest-xdist-1.20.1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy{,3} )
 inherit distutils-r1
 
 DESCRIPTION="Distributed testing and loop-on-failing modes"
-HOMEPAGE="https://pypi.python.org/pypi/pytest-xdist https://github.com/pytest-dev/pytest-xdist"
+HOMEPAGE="https://pypi.org/project/pytest-xdist https://github.com/pytest-dev/pytest-xdist"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
diff --git a/dev-python/pytest-xprocess/pytest-xprocess-0.12.1.ebuild b/dev-python/pytest-xprocess/pytest-xprocess-0.12.1.ebuild
index ee3fbac5a9fda..d6903ec95d735 100644
--- a/dev-python/pytest-xprocess/pytest-xprocess-0.12.1.ebuild
+++ b/dev-python/pytest-xprocess/pytest-xprocess-0.12.1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="Manage external processes across test runs"
-HOMEPAGE="https://pypi.python.org/pypi/pytest-xprocess/ https://github.com/pytest-dev/pytest-xprocess"
+HOMEPAGE="https://pypi.org/project/pytest-xprocess/ https://github.com/pytest-dev/pytest-xprocess"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
diff --git a/dev-python/pytest/pytest-3.0.3.ebuild b/dev-python/pytest/pytest-3.0.3.ebuild
index 2b2ee7478c582..ca84419e4f1c9 100644
--- a/dev-python/pytest/pytest-3.0.3.ebuild
+++ b/dev-python/pytest/pytest-3.0.3.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy{,3} )
 inherit distutils-r1
 
 DESCRIPTION="Simple powerful testing with Python"
-HOMEPAGE="http://pytest.org/ https://pypi.python.org/pypi/pytest"
+HOMEPAGE="http://pytest.org/ https://pypi.org/project/pytest"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/python-catcher/python-catcher-0.1.7.ebuild b/dev-python/python-catcher/python-catcher-0.1.7.ebuild
index 96a17fbf1f998..24f1f8513dd77 100644
--- a/dev-python/python-catcher/python-catcher-0.1.7.ebuild
+++ b/dev-python/python-catcher/python-catcher-0.1.7.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 )
 inherit distutils-r1
 
 DESCRIPTION="Beautiful stack traces for Python"
-HOMEPAGE="https://pypi.python.org/pypi/python-catcher/ http://ajenti.org/"
+HOMEPAGE="https://pypi.org/project/python-catcher/ http://ajenti.org/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
diff --git a/dev-python/python-daemon/python-daemon-1.6-r1.ebuild b/dev-python/python-daemon/python-daemon-1.6-r1.ebuild
index 4ef2a6091c638..89189b37d30f7 100644
--- a/dev-python/python-daemon/python-daemon-1.6-r1.ebuild
+++ b/dev-python/python-daemon/python-daemon-1.6-r1.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 )
 inherit distutils-r1
 
 DESCRIPTION="Library to implement a well-behaved Unix daemon process"
-HOMEPAGE="https://pypi.python.org/pypi/python-daemon"
+HOMEPAGE="https://pypi.org/project/python-daemon"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="PSF-2"
diff --git a/dev-python/python-daemon/python-daemon-2.1.1.ebuild b/dev-python/python-daemon/python-daemon-2.1.1.ebuild
index 138f1abc2e544..f2d67501782a8 100644
--- a/dev-python/python-daemon/python-daemon-2.1.1.ebuild
+++ b/dev-python/python-daemon/python-daemon-2.1.1.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
 inherit distutils-r1
 
 DESCRIPTION="Library to implement a well-behaved Unix daemon process"
-HOMEPAGE="https://pypi.python.org/pypi/python-daemon"
+HOMEPAGE="https://pypi.org/project/python-daemon"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="PSF-2"
diff --git a/dev-python/python-dateutil/python-dateutil-2.6.1.ebuild b/dev-python/python-dateutil/python-dateutil-2.6.1.ebuild
index 9673ebb8cdd14..666cc8046378e 100644
--- a/dev-python/python-dateutil/python-dateutil-2.6.1.ebuild
+++ b/dev-python/python-dateutil/python-dateutil-2.6.1.ebuild
@@ -10,7 +10,7 @@ inherit distutils-r1
 DESCRIPTION="Extensions to the standard Python datetime module"
 HOMEPAGE="
 	https://dateutil.readthedocs.org/
-	https://pypi.python.org/pypi/python-dateutil
+	https://pypi.org/project/python-dateutil
 	https://github.com/dateutil/dateutil/
 "
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
diff --git a/dev-python/python-dateutil/python-dateutil-2.7.1.ebuild b/dev-python/python-dateutil/python-dateutil-2.7.1.ebuild
index 8ccb00532b227..859155cde63d9 100644
--- a/dev-python/python-dateutil/python-dateutil-2.7.1.ebuild
+++ b/dev-python/python-dateutil/python-dateutil-2.7.1.ebuild
@@ -10,7 +10,7 @@ inherit distutils-r1
 DESCRIPTION="Extensions to the standard Python datetime module"
 HOMEPAGE="
 	https://dateutil.readthedocs.org/
-	https://pypi.python.org/pypi/python-dateutil
+	https://pypi.org/project/python-dateutil
 	https://github.com/dateutil/dateutil/
 "
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
diff --git a/dev-python/python-dateutil/python-dateutil-2.7.2.ebuild b/dev-python/python-dateutil/python-dateutil-2.7.2.ebuild
index 8ccb00532b227..859155cde63d9 100644
--- a/dev-python/python-dateutil/python-dateutil-2.7.2.ebuild
+++ b/dev-python/python-dateutil/python-dateutil-2.7.2.ebuild
@@ -10,7 +10,7 @@ inherit distutils-r1
 DESCRIPTION="Extensions to the standard Python datetime module"
 HOMEPAGE="
 	https://dateutil.readthedocs.org/
-	https://pypi.python.org/pypi/python-dateutil
+	https://pypi.org/project/python-dateutil
 	https://github.com/dateutil/dateutil/
 "
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
diff --git a/dev-python/python-ddp/python-ddp-0.1.5.ebuild b/dev-python/python-ddp/python-ddp-0.1.5.ebuild
index fe3a30a75405e..2436496c6152e 100644
--- a/dev-python/python-ddp/python-ddp-0.1.5.ebuild
+++ b/dev-python/python-ddp/python-ddp-0.1.5.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5} )
 inherit distutils-r1
 
 DESCRIPTION="An event driven ddp client"
-HOMEPAGE="https://pypi.python.org/pypi/python-ddp https://github.com/hharnisc/python-ddp"
+HOMEPAGE="https://pypi.org/project/python-ddp https://github.com/hharnisc/python-ddp"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
diff --git a/dev-python/python-digest/python-digest-1.7-r1.ebuild b/dev-python/python-digest/python-digest-1.7-r1.ebuild
index 659d513eb335f..00d7359225a01 100644
--- a/dev-python/python-digest/python-digest-1.7-r1.ebuild
+++ b/dev-python/python-digest/python-digest-1.7-r1.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 pypy )
 inherit distutils-r1
 
 DESCRIPTION="A Python library to aid in implementing HTTP Digest Authentication"
-HOMEPAGE="https://pypi.python.org/pypi/python-digest/ https://bitbucket.org/akoha/python-digest/"
+HOMEPAGE="https://pypi.org/project/python-digest/ https://bitbucket.org/akoha/python-digest/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 KEYWORDS="amd64 x86"
 IUSE="test"
diff --git a/dev-python/python-engineio/python-engineio-1.7.0.ebuild b/dev-python/python-engineio/python-engineio-1.7.0.ebuild
index d3add65a2057e..6596f563e66ca 100644
--- a/dev-python/python-engineio/python-engineio-1.7.0.ebuild
+++ b/dev-python/python-engineio/python-engineio-1.7.0.ebuild
@@ -8,7 +8,7 @@ inherit distutils-r1
 
 MY_PN=""
 DESCRIPTION="Python implementation of the Engine.IO realtime server."
-HOMEPAGE="https://python-engineio.readthedocs.org/ https://github.com/miguelgrinberg/python-engineio/ https://pypi.python.org/pypi/python-engineio"
+HOMEPAGE="https://python-engineio.readthedocs.org/ https://github.com/miguelgrinberg/python-engineio/ https://pypi.org/project/python-engineio"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 LICENSE="MIT"
 SLOT="0"
diff --git a/dev-python/python-etcd/python-etcd-0.4.5.ebuild b/dev-python/python-etcd/python-etcd-0.4.5.ebuild
index 75ff1044e92b5..f6982b83604be 100644
--- a/dev-python/python-etcd/python-etcd-0.4.5.ebuild
+++ b/dev-python/python-etcd/python-etcd-0.4.5.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
 inherit distutils-r1
 
 DESCRIPTION="A python client for etcd"
-HOMEPAGE="https://github.com/jplana/python-etcd https://pypi.python.org/pypi/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/python-exconsole/python-exconsole-0.1.5.ebuild b/dev-python/python-exconsole/python-exconsole-0.1.5.ebuild
index 0450b1d30ced1..3f3f5df16d923 100644
--- a/dev-python/python-exconsole/python-exconsole-0.1.5.ebuild
+++ b/dev-python/python-exconsole/python-exconsole-0.1.5.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 )
 inherit distutils-r1
 
 DESCRIPTION="Emergency/postmortem Python console"
-HOMEPAGE="https://github.com/Eugeny/exconsole https://pypi.python.org/pypi/python-exconsole"
+HOMEPAGE="https://github.com/Eugeny/exconsole https://pypi.org/project/python-exconsole"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
diff --git a/dev-python/python-fastcgi/python-fastcgi-1.1-r1.ebuild b/dev-python/python-fastcgi/python-fastcgi-1.1-r1.ebuild
index 80a59e5cf117a..b1ba130dc2dca 100644
--- a/dev-python/python-fastcgi/python-fastcgi-1.1-r1.ebuild
+++ b/dev-python/python-fastcgi/python-fastcgi-1.1-r1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 )
 inherit distutils-r1 flag-o-matic
 
 DESCRIPTION="Interface to OpenMarket's FastCGI C Library/SDK"
-HOMEPAGE="https://pypi.python.org/pypi/python-fastcgi"
+HOMEPAGE="https://pypi.org/project/python-fastcgi"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/python-hpilo/python-hpilo-4.0.ebuild b/dev-python/python-hpilo/python-hpilo-4.0.ebuild
index a291d1ad427b8..5a7eae062c172 100644
--- a/dev-python/python-hpilo/python-hpilo-4.0.ebuild
+++ b/dev-python/python-hpilo/python-hpilo-4.0.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
 inherit distutils-r1
 
 DESCRIPTION="iLO automation from python or shell"
-HOMEPAGE="https://pypi.python.org/pypi/python-hpilo"
+HOMEPAGE="https://pypi.org/project/python-hpilo"
 SRC_URI="https://github.com/seveas/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
diff --git a/dev-python/python-hpilo/python-hpilo-4.1.ebuild b/dev-python/python-hpilo/python-hpilo-4.1.ebuild
index a291d1ad427b8..5a7eae062c172 100644
--- a/dev-python/python-hpilo/python-hpilo-4.1.ebuild
+++ b/dev-python/python-hpilo/python-hpilo-4.1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
 inherit distutils-r1
 
 DESCRIPTION="iLO automation from python or shell"
-HOMEPAGE="https://pypi.python.org/pypi/python-hpilo"
+HOMEPAGE="https://pypi.org/project/python-hpilo"
 SRC_URI="https://github.com/seveas/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
diff --git a/dev-python/python-ldap/python-ldap-2.4.19-r1.ebuild b/dev-python/python-ldap/python-ldap-2.4.19-r1.ebuild
index 5f2ddf353131e..786bc61b37790 100644
--- a/dev-python/python-ldap/python-ldap-2.4.19-r1.ebuild
+++ b/dev-python/python-ldap/python-ldap-2.4.19-r1.ebuild
@@ -10,7 +10,7 @@ inherit distutils-r1 multilib
 
 DESCRIPTION="Various LDAP-related Python modules"
 HOMEPAGE="https://www.python-ldap.org/en/latest/
-	https://pypi.python.org/pypi/python-ldap"
+	https://pypi.org/project/python-ldap"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="PSF-2"
diff --git a/dev-python/python-ldap/python-ldap-2.4.32.ebuild b/dev-python/python-ldap/python-ldap-2.4.32.ebuild
index 5372d99e5a1ac..68ea896be8be1 100644
--- a/dev-python/python-ldap/python-ldap-2.4.32.ebuild
+++ b/dev-python/python-ldap/python-ldap-2.4.32.ebuild
@@ -9,7 +9,7 @@ inherit distutils-r1 multilib
 
 DESCRIPTION="Various LDAP-related Python modules"
 HOMEPAGE="https://www.python-ldap.org/en/latest/
-	https://pypi.python.org/pypi/python-ldap"
+	https://pypi.org/project/python-ldap"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="PSF-2"
diff --git a/dev-python/python-ldap/python-ldap-9999.ebuild b/dev-python/python-ldap/python-ldap-9999.ebuild
index a32f42da69f29..d12a730271752 100644
--- a/dev-python/python-ldap/python-ldap-9999.ebuild
+++ b/dev-python/python-ldap/python-ldap-9999.ebuild
@@ -11,7 +11,7 @@ inherit distutils-r1 git-2 multilib
 
 DESCRIPTION="Various LDAP-related Python modules"
 HOMEPAGE="https://www.python-ldap.org/en/latest/
-	https://pypi.python.org/pypi/python-ldap"
+	https://pypi.org/project/python-ldap"
 EGIT_REPO_URI="https://github.com/xmw/python-ldap.git"
 
 LICENSE="PSF-2"
diff --git a/dev-python/python-levenshtein/python-levenshtein-0.11.2.ebuild b/dev-python/python-levenshtein/python-levenshtein-0.11.2.ebuild
index 1e12a16cff6cf..5278d9f1bab05 100644
--- a/dev-python/python-levenshtein/python-levenshtein-0.11.2.ebuild
+++ b/dev-python/python-levenshtein/python-levenshtein-0.11.2.ebuild
@@ -12,7 +12,7 @@ MY_P="${MY_PN}-${PV}"
 DESCRIPTION="Functions for fast computation of Levenshtein distance, and edit operations"
 HOMEPAGE="
 	https://github.com/ztane/python-Levenshtein/
-	https://pypi.python.org/pypi/python-Levenshtein/"
+	https://pypi.org/project/python-Levenshtein/"
 SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
diff --git a/dev-python/python-levenshtein/python-levenshtein-0.12.0.ebuild b/dev-python/python-levenshtein/python-levenshtein-0.12.0.ebuild
index cd4d52bf3e76e..8ac0164ade2a1 100644
--- a/dev-python/python-levenshtein/python-levenshtein-0.12.0.ebuild
+++ b/dev-python/python-levenshtein/python-levenshtein-0.12.0.ebuild
@@ -13,7 +13,7 @@ MY_P="${MY_PN}-${PV}"
 DESCRIPTION="Functions for fast computation of Levenshtein distance, and edit operations"
 HOMEPAGE="
 	https://github.com/ztane/python-Levenshtein/
-	https://pypi.python.org/pypi/python-Levenshtein/"
+	https://pypi.org/project/python-Levenshtein/"
 SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
diff --git a/dev-python/python-ly/python-ly-0.9.4.ebuild b/dev-python/python-ly/python-ly-0.9.4.ebuild
index ed92b771d6c74..91adc501e5fe1 100644
--- a/dev-python/python-ly/python-ly-0.9.4.ebuild
+++ b/dev-python/python-ly/python-ly-0.9.4.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5} )
 inherit distutils-r1
 
 DESCRIPTION="Tool and library for manipulating LilyPond files"
-HOMEPAGE="https://github.com/wbsoft/python-ly http://pypi.python.org/pypi/python-ly"
+HOMEPAGE="https://github.com/wbsoft/python-ly http://pypi.org/project/python-ly"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2+"
diff --git a/dev-python/python-ly/python-ly-0.9.5.ebuild b/dev-python/python-ly/python-ly-0.9.5.ebuild
index 7c579f08c3427..32e69b1081cd8 100644
--- a/dev-python/python-ly/python-ly-0.9.5.ebuild
+++ b/dev-python/python-ly/python-ly-0.9.5.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
 inherit distutils-r1
 
 DESCRIPTION="Tool and library for manipulating LilyPond files"
-HOMEPAGE="https://github.com/wbsoft/python-ly http://pypi.python.org/pypi/python-ly"
+HOMEPAGE="https://github.com/wbsoft/python-ly http://pypi.org/project/python-ly"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2+"
diff --git a/dev-python/python-memcached/python-memcached-1.53-r1.ebuild b/dev-python/python-memcached/python-memcached-1.53-r1.ebuild
index a14809eda6ad9..b5a371070cc4c 100644
--- a/dev-python/python-memcached/python-memcached-1.53-r1.ebuild
+++ b/dev-python/python-memcached/python-memcached-1.53-r1.ebuild
@@ -9,7 +9,7 @@ inherit distutils-r1
 
 DESCRIPTION="Pure python memcached client"
 HOMEPAGE="https://www.tummy.com/Community/software/python-memcached/
-	https://pypi.python.org/pypi/python-memcached"
+	https://pypi.org/project/python-memcached"
 SRC_URI="ftp://ftp.tummy.com/pub/python-memcached/old-releases/${P}.tar.gz"
 
 LICENSE="OSL-2.0"
diff --git a/dev-python/python-memcached/python-memcached-1.58.ebuild b/dev-python/python-memcached/python-memcached-1.58.ebuild
index 7b8cf80ce499d..88753f63880f4 100644
--- a/dev-python/python-memcached/python-memcached-1.58.ebuild
+++ b/dev-python/python-memcached/python-memcached-1.58.ebuild
@@ -10,7 +10,7 @@ inherit distutils-r1
 DESCRIPTION="Pure python memcached client"
 HOMEPAGE="
 	https://www.tummy.com/Community/software/python-memcached/
-	https://pypi.python.org/pypi/python-memcached"
+	https://pypi.org/project/python-memcached"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="OSL-2.0"
diff --git a/dev-python/python-meteor/python-meteor-0.1.6.ebuild b/dev-python/python-meteor/python-meteor-0.1.6.ebuild
index 609739016d7b2..de6ddcb6157ba 100644
--- a/dev-python/python-meteor/python-meteor-0.1.6.ebuild
+++ b/dev-python/python-meteor/python-meteor-0.1.6.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5} )
 inherit distutils-r1
 
 DESCRIPTION="An event driven meteor client"
-HOMEPAGE="https://pypi.python.org/pypi/python-meteor https://github.com/hharnisc/python-meteor"
+HOMEPAGE="https://pypi.org/project/python-meteor https://github.com/hharnisc/python-meteor"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
diff --git a/dev-python/python-oembed/python-oembed-0.2.4.ebuild b/dev-python/python-oembed/python-oembed-0.2.4.ebuild
index 28f9e2e50384e..db632ac17f759 100644
--- a/dev-python/python-oembed/python-oembed-0.2.4.ebuild
+++ b/dev-python/python-oembed/python-oembed-0.2.4.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 )
 inherit distutils-r1
 
 DESCRIPTION="A Python library that implements an OEmbed consumer"
-HOMEPAGE="https://pypi.python.org/pypi/python-oembed"
+HOMEPAGE="https://pypi.org/project/python-oembed"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/python-openid/python-openid-2.2.5-r1.ebuild b/dev-python/python-openid/python-openid-2.2.5-r1.ebuild
index b6a1cbf1d8e88..5aa4a84fce633 100644
--- a/dev-python/python-openid/python-openid-2.2.5-r1.ebuild
+++ b/dev-python/python-openid/python-openid-2.2.5-r1.ebuild
@@ -9,7 +9,7 @@ PYTHON_COMPAT=( python2_7 )
 inherit distutils-r1
 
 DESCRIPTION="OpenID support for servers and consumers"
-HOMEPAGE="http://www.openidenabled.com/openid/libraries/python/ https://pypi.python.org/pypi/python-openid"
+HOMEPAGE="http://www.openidenabled.com/openid/libraries/python/ https://pypi.org/project/python-openid"
 # Downloaded from https://github.com/openid/python-openid/downloads
 SRC_URI="mirror://gentoo/${P}.tar.gz"
 
diff --git a/dev-python/python-otrs/python-otrs-0.3.0.ebuild b/dev-python/python-otrs/python-otrs-0.3.0.ebuild
index aec0096d0513c..5fb7582a06470 100644
--- a/dev-python/python-otrs/python-otrs-0.3.0.ebuild
+++ b/dev-python/python-otrs/python-otrs-0.3.0.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5} )
 inherit distutils-r1
 
 DESCRIPTION="A programmatic interface to OTRS SOAP API"
-HOMEPAGE="https://pypi.python.org/pypi/python-otrs"
+HOMEPAGE="https://pypi.org/project/python-otrs"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
 
 LICENSE="GPL-3"
diff --git a/dev-python/python-ptrace/python-ptrace-0.8.1-r1.ebuild b/dev-python/python-ptrace/python-ptrace-0.8.1-r1.ebuild
index 80a8f01dad6eb..4e84d53870df5 100644
--- a/dev-python/python-ptrace/python-ptrace-0.8.1-r1.ebuild
+++ b/dev-python/python-ptrace/python-ptrace-0.8.1-r1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_{4,5,6}} pypy )
 inherit distutils-r1
 
 DESCRIPTION="A debugger using ptrace (Linux, BSD and Darwin system call to trace processes)"
-HOMEPAGE="https://github.com/haypo/python-ptrace/ https://pypi.python.org/pypi/python-ptrace"
+HOMEPAGE="https://github.com/haypo/python-ptrace/ https://pypi.org/project/python-ptrace"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
diff --git a/dev-python/python-socketio/python-socketio-1.7.4.ebuild b/dev-python/python-socketio/python-socketio-1.7.4.ebuild
index 9b05e5b1f5cf7..9ef5a2eae166c 100644
--- a/dev-python/python-socketio/python-socketio-1.7.4.ebuild
+++ b/dev-python/python-socketio/python-socketio-1.7.4.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="Python implementation of the Socket.IO realtime server."
-HOMEPAGE="https://python-socketio.readthedocs.org/ https://github.com/miguelgrinberg/python-socketio/ https://pypi.python.org/pypi/python-socketio"
+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"
diff --git a/dev-python/python-socketio/python-socketio-1.8.0.ebuild b/dev-python/python-socketio/python-socketio-1.8.0.ebuild
index 0dc7a26ee56f7..5ccde1d697c10 100644
--- a/dev-python/python-socketio/python-socketio-1.8.0.ebuild
+++ b/dev-python/python-socketio/python-socketio-1.8.0.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="Python implementation of the Socket.IO realtime server."
-HOMEPAGE="https://${PN}.readthedocs.org/ https://github.com/miguelgrinberg/${PN}/ https://pypi.python.org/pypi/${PN}"
+HOMEPAGE="https://${PN}.readthedocs.org/ https://github.com/miguelgrinberg/${PN}/ https://pypi.org/project/${PN}"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/python3-openid/python3-openid-3.1.0.ebuild b/dev-python/python3-openid/python3-openid-3.1.0.ebuild
index 1484171e99bd0..67a74b7a0aa6d 100644
--- a/dev-python/python3-openid/python3-openid-3.1.0.ebuild
+++ b/dev-python/python3-openid/python3-openid-3.1.0.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python3_{4,5,6} )
 inherit distutils-r1
 
 DESCRIPTION="Python 3 port of the python-openid library"
-HOMEPAGE="https://github.com/necaris/python3-openid https://pypi.python.org/pypi/python3-openid"
+HOMEPAGE="https://github.com/necaris/python3-openid https://pypi.org/project/python3-openid"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
diff --git a/dev-python/pythondialog/pythondialog-3.3.0-r200.ebuild b/dev-python/pythondialog/pythondialog-3.3.0-r200.ebuild
index 04baa8e3c99f3..2090ec26c4923 100644
--- a/dev-python/pythondialog/pythondialog-3.3.0-r200.ebuild
+++ b/dev-python/pythondialog/pythondialog-3.3.0-r200.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 pypy )
 inherit distutils-r1
 
 DESCRIPTION="A Python module for making simple text/console-mode user interfaces"
-HOMEPAGE="http://pythondialog.sourceforge.net/ https://pypi.python.org/pypi/python2-pythondialog"
+HOMEPAGE="http://pythondialog.sourceforge.net/ https://pypi.org/project/python2-pythondialog"
 SRC_URI="mirror://pypi/${PN:0:1}/python2-${PN}/python2-${P}.tar.gz"
 
 LICENSE="LGPL-2"
diff --git a/dev-python/pythondialog/pythondialog-3.4.0-r200.ebuild b/dev-python/pythondialog/pythondialog-3.4.0-r200.ebuild
index 78974d96017e3..8bf81f43dc5d2 100644
--- a/dev-python/pythondialog/pythondialog-3.4.0-r200.ebuild
+++ b/dev-python/pythondialog/pythondialog-3.4.0-r200.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 pypy )
 inherit distutils-r1
 
 DESCRIPTION="A Python module for making simple text/console-mode user interfaces"
-HOMEPAGE="http://pythondialog.sourceforge.net/ https://pypi.python.org/pypi/python2-pythondialog"
+HOMEPAGE="http://pythondialog.sourceforge.net/ https://pypi.org/project/python2-pythondialog"
 SRC_URI="mirror://pypi/${PN:0:1}/python2-${PN}/python2-${P}.tar.gz"
 
 LICENSE="LGPL-2"
diff --git a/dev-python/pythonz-bd/pythonz-bd-1.11.4.ebuild b/dev-python/pythonz-bd/pythonz-bd-1.11.4.ebuild
index c0305e3b77c53..003b6c3108424 100644
--- a/dev-python/pythonz-bd/pythonz-bd-1.11.4.ebuild
+++ b/dev-python/pythonz-bd/pythonz-bd-1.11.4.ebuild
@@ -10,7 +10,7 @@ inherit distutils-r1
 DESCRIPTION="Manage python installations in your system, berdario's shallow fork"
 HOMEPAGE="
 	https://github.com/berdario/pythonz/tree/bd
-	https://pypi.python.org/pypi/pythonz-bd"
+	https://pypi.org/project/pythonz-bd"
 SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/pytrie/pytrie-0.3.ebuild b/dev-python/pytrie/pytrie-0.3.ebuild
index 543c238f4beb0..6d6e86093c4f6 100644
--- a/dev-python/pytrie/pytrie-0.3.ebuild
+++ b/dev-python/pytrie/pytrie-0.3.ebuild
@@ -10,7 +10,7 @@ MY_PN="PyTrie"
 MY_P="${MY_PN}-${PV}"
 
 DESCRIPTION="A pure Python implementation of the trie data structure."
-HOMEPAGE="https://github.com/gsakkis/pytrie/ https://pypi.python.org/pypi/PyTrie"
+HOMEPAGE="https://github.com/gsakkis/pytrie/ https://pypi.org/project/PyTrie"
 SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/pytz/pytz-2016.3.ebuild b/dev-python/pytz/pytz-2016.3.ebuild
index 9cf8554870738..3ed671a5fa240 100644
--- a/dev-python/pytz/pytz-2016.3.ebuild
+++ b/dev-python/pytz/pytz-2016.3.ebuild
@@ -9,7 +9,7 @@ PYTHON_REQ_USE="threads(+)"
 inherit distutils-r1
 
 DESCRIPTION="World timezone definitions for Python"
-HOMEPAGE="http://pythonhosted.org/pytz/ https://pypi.python.org/pypi/pytz/"
+HOMEPAGE="http://pythonhosted.org/pytz/ https://pypi.org/project/pytz/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.bz2"
 
 LICENSE="MIT"
diff --git a/dev-python/pytz/pytz-2017.2.ebuild b/dev-python/pytz/pytz-2017.2.ebuild
index a2016daadf594..8c196a81f0594 100644
--- a/dev-python/pytz/pytz-2017.2.ebuild
+++ b/dev-python/pytz/pytz-2017.2.ebuild
@@ -9,7 +9,7 @@ PYTHON_REQ_USE="threads(+)"
 inherit distutils-r1
 
 DESCRIPTION="World timezone definitions for Python"
-HOMEPAGE="http://pythonhosted.org/pytz/ https://pypi.python.org/pypi/pytz/"
+HOMEPAGE="http://pythonhosted.org/pytz/ https://pypi.org/project/pytz/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
 
 LICENSE="MIT"
diff --git a/dev-python/pyusb/pyusb-1.0.2.ebuild b/dev-python/pyusb/pyusb-1.0.2.ebuild
index abedff611616e..0a660307d2e66 100644
--- a/dev-python/pyusb/pyusb-1.0.2.ebuild
+++ b/dev-python/pyusb/pyusb-1.0.2.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
 inherit distutils-r1
 
 DESCRIPTION="USB support for Python"
-HOMEPAGE="https://walac.github.io/pyusb/ https://pypi.python.org/pypi/pyusb"
+HOMEPAGE="https://walac.github.io/pyusb/ https://pypi.org/project/pyusb"
 SRC_URI="https://github.com/walac/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 # pypi releases don't include tests
 #SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
diff --git a/dev-python/pyutil/pyutil-2.0.0.ebuild b/dev-python/pyutil/pyutil-2.0.0.ebuild
index 3af73fcd45316..421007cfd5c0a 100644
--- a/dev-python/pyutil/pyutil-2.0.0.ebuild
+++ b/dev-python/pyutil/pyutil-2.0.0.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 )
 inherit distutils-r1
 
 DESCRIPTION="A collection of utilities for Python programmers"
-HOMEPAGE="https://tahoe-lafs.org/trac/pyutil https://pypi.python.org/pypi/pyutil"
+HOMEPAGE="https://tahoe-lafs.org/trac/pyutil https://pypi.org/project/pyutil"
 SRC_URI="mirror://pypi/p/pyutil/pyutil-${PV}.tar.gz"
 
 LICENSE="GPL-2+"
diff --git a/dev-python/pyutmp/pyutmp-0.2.1.ebuild b/dev-python/pyutmp/pyutmp-0.2.1.ebuild
index b441c76a87b2a..b0eb9dbdf5fc7 100644
--- a/dev-python/pyutmp/pyutmp-0.2.1.ebuild
+++ b/dev-python/pyutmp/pyutmp-0.2.1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 )
 inherit distutils-r1
 
 DESCRIPTION="Python UTMP wrapper for Un*x systems"
-HOMEPAGE="https://pypi.python.org/pypi/pyutmp https://bmc.github.com/pyutmp/"
+HOMEPAGE="https://pypi.org/project/pyutmp https://bmc.github.com/pyutmp/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
diff --git a/dev-python/pywebdav/pywebdav-0.9.8-r1.ebuild b/dev-python/pywebdav/pywebdav-0.9.8-r1.ebuild
index 84fb3d628c78e..3cbf82b1b76bf 100644
--- a/dev-python/pywebdav/pywebdav-0.9.8-r1.ebuild
+++ b/dev-python/pywebdav/pywebdav-0.9.8-r1.ebuild
@@ -10,7 +10,7 @@ inherit distutils-r1
 MY_P=${P/pywebdav/PyWebDAV}
 
 DESCRIPTION="WebDAV server written in Python"
-HOMEPAGE="https://pypi.python.org/pypi/PyWebDAV"
+HOMEPAGE="https://pypi.org/project/PyWebDAV"
 SRC_URI="https://pywebdav.googlecode.com/files/${MY_P}.tar.gz"
 
 LICENSE="LGPL-2"
diff --git a/dev-python/pyx/pyx-0.12.1-r1.ebuild b/dev-python/pyx/pyx-0.12.1-r1.ebuild
index a58f056e625bb..9b5f5e293aa34 100644
--- a/dev-python/pyx/pyx-0.12.1-r1.ebuild
+++ b/dev-python/pyx/pyx-0.12.1-r1.ebuild
@@ -10,7 +10,7 @@ MY_P="${P/pyx/PyX}"
 
 DESCRIPTION="Python package for the generation of encapsulated PostScript figures"
 HOMEPAGE="https://pyx.sourceforge.net/
-	https://pypi.python.org/pypi/PyX/"
+	https://pypi.org/project/PyX/"
 SRC_URI="mirror://sourceforge/pyx/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
diff --git a/dev-python/pyx/pyx-0.14.1-r1.ebuild b/dev-python/pyx/pyx-0.14.1-r1.ebuild
index eb92d512da119..66fa71529fb08 100644
--- a/dev-python/pyx/pyx-0.14.1-r1.ebuild
+++ b/dev-python/pyx/pyx-0.14.1-r1.ebuild
@@ -9,7 +9,7 @@ MY_PN=PyX
 MY_P="${P/pyx/PyX}"
 DESCRIPTION="Python package for the generation of encapsulated PostScript figures"
 HOMEPAGE="https://pyx.sourceforge.net/
-	https://pypi.python.org/pypi/PyX/"
+	https://pypi.org/project/PyX/"
 SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
diff --git a/dev-python/pyx/pyx-0.14.1.ebuild b/dev-python/pyx/pyx-0.14.1.ebuild
index 49a0ab25aa024..0d8ad3c588d79 100644
--- a/dev-python/pyx/pyx-0.14.1.ebuild
+++ b/dev-python/pyx/pyx-0.14.1.ebuild
@@ -9,7 +9,7 @@ MY_PN=PyX
 MY_P="${P/pyx/PyX}"
 DESCRIPTION="Python package for the generation of encapsulated PostScript figures"
 HOMEPAGE="https://pyx.sourceforge.net/
-	https://pypi.python.org/pypi/PyX/"
+	https://pypi.org/project/PyX/"
 SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
diff --git a/dev-python/pyyaml/pyyaml-3.12.ebuild b/dev-python/pyyaml/pyyaml-3.12.ebuild
index 5db7005c4a2f2..f9117d89a828a 100644
--- a/dev-python/pyyaml/pyyaml-3.12.ebuild
+++ b/dev-python/pyyaml/pyyaml-3.12.ebuild
@@ -10,7 +10,7 @@ inherit distutils-r1
 MY_P="PyYAML-${PV}"
 
 DESCRIPTION="YAML parser and emitter for Python"
-HOMEPAGE="http://pyyaml.org/wiki/PyYAML https://pypi.python.org/pypi/PyYAML"
+HOMEPAGE="http://pyyaml.org/wiki/PyYAML https://pypi.org/project/PyYAML"
 SRC_URI="http://pyyaml.org/download/${PN}/${MY_P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/pyzmq/pyzmq-16.0.2.ebuild b/dev-python/pyzmq/pyzmq-16.0.2.ebuild
index d75f8fdf7b5a8..03602c639ce20 100644
--- a/dev-python/pyzmq/pyzmq-16.0.2.ebuild
+++ b/dev-python/pyzmq/pyzmq-16.0.2.ebuild
@@ -9,7 +9,7 @@ PYTHON_REQ_USE="threads(+)"
 inherit flag-o-matic distutils-r1 toolchain-funcs
 
 DESCRIPTION="Lightweight and super-fast messaging library built on top of the ZeroMQ library"
-HOMEPAGE="http://www.zeromq.org/bindings:python https://pypi.python.org/pypi/pyzmq"
+HOMEPAGE="http://www.zeromq.org/bindings:python https://pypi.org/project/pyzmq"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-3"
diff --git a/dev-python/qrcode/qrcode-5.1-r1.ebuild b/dev-python/qrcode/qrcode-5.1-r1.ebuild
index 74e5fa4e258a6..cb22e1659edb9 100644
--- a/dev-python/qrcode/qrcode-5.1-r1.ebuild
+++ b/dev-python/qrcode/qrcode-5.1-r1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
 inherit distutils-r1
 
 DESCRIPTION="QR Code generator on top of PIL"
-HOMEPAGE="https://pypi.python.org/pypi/qrcode"
+HOMEPAGE="https://pypi.org/project/qrcode"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/qserve/qserve-0.2.8-r1.ebuild b/dev-python/qserve/qserve-0.2.8-r1.ebuild
index 42a420c1f88bb..7bab50ad78903 100644
--- a/dev-python/qserve/qserve-0.2.8-r1.ebuild
+++ b/dev-python/qserve/qserve-0.2.8-r1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 )
 inherit distutils-r1
 
 DESCRIPTION="A job queue server"
-HOMEPAGE="https://github.com/pediapress/qserve https://pypi.python.org/pypi/qserve/"
+HOMEPAGE="https://github.com/pediapress/qserve https://pypi.org/project/qserve/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
 
 LICENSE="BSD"
diff --git a/dev-python/qtawesome/qtawesome-0.4.4.ebuild b/dev-python/qtawesome/qtawesome-0.4.4.ebuild
index 0e71b8cd6a427..4313918724fab 100644
--- a/dev-python/qtawesome/qtawesome-0.4.4.ebuild
+++ b/dev-python/qtawesome/qtawesome-0.4.4.ebuild
@@ -6,7 +6,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
 inherit eutils distutils-r1
 
 DESCRIPTION="Enables iconic fonts such as Font Awesome in PyQt"
-HOMEPAGE="https://github.com/spyder-ide/qtawesome/ https://pypi.python.org/pypi/QtAwesome/"
+HOMEPAGE="https://github.com/spyder-ide/qtawesome/ https://pypi.org/project/QtAwesome/"
 MY_PN="QtAwesome"
 MY_P="${MY_PN}-${PV}"
 SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
diff --git a/dev-python/ramlfications/ramlfications-0.1.9_p20160718.ebuild b/dev-python/ramlfications/ramlfications-0.1.9_p20160718.ebuild
index 3ad37f9869b9a..81c18f6ba92d2 100644
--- a/dev-python/ramlfications/ramlfications-0.1.9_p20160718.ebuild
+++ b/dev-python/ramlfications/ramlfications-0.1.9_p20160718.ebuild
@@ -9,7 +9,7 @@ COMMIT="32a11cd7d75c4c5b3e3fc01c383314be298b0f9b"
 inherit eutils distutils-r1
 
 DESCRIPTION="RAML reference implementation in Python"
-HOMEPAGE="https://ramlfications.readthedocs.org/ https://pypi.python.org/pypi/ramlfications/"
+HOMEPAGE="https://ramlfications.readthedocs.org/ https://pypi.org/project/ramlfications/"
 SRC_URI="https://github.com/spotify/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
diff --git a/dev-python/rdflib/rdflib-4.2.1.ebuild b/dev-python/rdflib/rdflib-4.2.1.ebuild
index a7d090805bf84..023eb06cfad93 100644
--- a/dev-python/rdflib/rdflib-4.2.1.ebuild
+++ b/dev-python/rdflib/rdflib-4.2.1.ebuild
@@ -12,7 +12,7 @@ DISTUTILS_IN_SOURCE_BUILD=1
 inherit distutils-r1
 
 DESCRIPTION="RDF library containing a triple store and parser/serializer"
-HOMEPAGE="https://github.com/RDFLib/rdflib https://pypi.python.org/pypi/rdflib"
+HOMEPAGE="https://github.com/RDFLib/rdflib https://pypi.org/project/rdflib"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/rdflib/rdflib-4.2.2.ebuild b/dev-python/rdflib/rdflib-4.2.2.ebuild
index 58327a3b2ec11..d3d78846c85a7 100644
--- a/dev-python/rdflib/rdflib-4.2.2.ebuild
+++ b/dev-python/rdflib/rdflib-4.2.2.ebuild
@@ -12,7 +12,7 @@ DISTUTILS_IN_SOURCE_BUILD=1
 inherit distutils-r1
 
 DESCRIPTION="RDF library containing a triple store and parser/serializer"
-HOMEPAGE="https://github.com/RDFLib/rdflib https://pypi.python.org/pypi/rdflib"
+HOMEPAGE="https://github.com/RDFLib/rdflib https://pypi.org/project/rdflib"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/readlike/readlike-0.1.2.ebuild b/dev-python/readlike/readlike-0.1.2.ebuild
index ac88189fd790a..33f9f55308c68 100644
--- a/dev-python/readlike/readlike-0.1.2.ebuild
+++ b/dev-python/readlike/readlike-0.1.2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 KEYWORDS="~amd64"
 
 DESCRIPTION="a python library similar to readline"
-HOMEPAGE="https://pypi.python.org/pypi/readlike"
+HOMEPAGE="https://pypi.org/project/readlike"
 
 LICENSE="MIT"
 SLOT="0"
diff --git a/dev-python/readme/readme-0.6.0.ebuild b/dev-python/readme/readme-0.6.0.ebuild
index 43f0fc73122b8..8e3ce5ae38bcd 100644
--- a/dev-python/readme/readme-0.6.0.ebuild
+++ b/dev-python/readme/readme-0.6.0.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy{,3} )
 inherit distutils-r1
 
 DESCRIPTION="a library for rendering \"readme\" descriptions for Warehouse"
-HOMEPAGE="https://github.com/pypa/readme https://pypi.python.org/pypi/readme"
+HOMEPAGE="https://github.com/pypa/readme https://pypi.org/project/readme"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
diff --git a/dev-python/readme_renderer/readme_renderer-17.2.ebuild b/dev-python/readme_renderer/readme_renderer-17.2.ebuild
index 6b476590ba284..b52ee1c631f11 100644
--- a/dev-python/readme_renderer/readme_renderer-17.2.ebuild
+++ b/dev-python/readme_renderer/readme_renderer-17.2.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy{,3} )
 inherit distutils-r1
 
 DESCRIPTION="a library for rendering \"readme\" descriptions for Warehouse"
-HOMEPAGE="https://github.com/pypa/readme_renderer https://pypi.python.org/pypi/readme_renderer"
+HOMEPAGE="https://github.com/pypa/readme_renderer https://pypi.org/project/readme_renderer"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
diff --git a/dev-python/rebulk/rebulk-0.9.0.ebuild b/dev-python/rebulk/rebulk-0.9.0.ebuild
index 4fbf9cb372d90..818a38117f8b9 100644
--- a/dev-python/rebulk/rebulk-0.9.0.ebuild
+++ b/dev-python/rebulk/rebulk-0.9.0.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
 inherit distutils-r1
 
 DESCRIPTION="Python library that performs advanced searches in strings"
-HOMEPAGE="https://github.com/Toilal/rebulk https://pypi.python.org/pypi/rebulk"
+HOMEPAGE="https://github.com/Toilal/rebulk https://pypi.org/project/rebulk"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT Apache-2.0"
diff --git a/dev-python/rebulk/rebulk-9999.ebuild b/dev-python/rebulk/rebulk-9999.ebuild
index 50658d386ae74..f77f95ef84432 100644
--- a/dev-python/rebulk/rebulk-9999.ebuild
+++ b/dev-python/rebulk/rebulk-9999.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
 inherit distutils-r1 git-r3
 
 DESCRIPTION="Python library that performs advanced searches in strings"
-HOMEPAGE="https://github.com/Toilal/rebulk https://pypi.python.org/pypi/rebulk"
+HOMEPAGE="https://github.com/Toilal/rebulk https://pypi.org/project/rebulk"
 EGIT_REPO_URI="https://github.com/Toilal/${PN}.git"
 
 LICENSE="MIT Apache-2.0"
diff --git a/dev-python/recaptcha-client/recaptcha-client-1.0.6-r1.ebuild b/dev-python/recaptcha-client/recaptcha-client-1.0.6-r1.ebuild
index 05781a6a838f9..971c2f0226240 100644
--- a/dev-python/recaptcha-client/recaptcha-client-1.0.6-r1.ebuild
+++ b/dev-python/recaptcha-client/recaptcha-client-1.0.6-r1.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
 inherit distutils-r1
 
 DESCRIPTION="A plugin for reCAPTCHA and reCAPTCHA Mailhide"
-HOMEPAGE="https://pypi.python.org/pypi/recaptcha-client/"
+HOMEPAGE="https://pypi.org/project/recaptcha-client/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 KEYWORDS="amd64 x86"
 IUSE=""
diff --git a/dev-python/reconfigure/reconfigure-0.1.79.ebuild b/dev-python/reconfigure/reconfigure-0.1.79.ebuild
index d327f633f8693..d509091d54a81 100644
--- a/dev-python/reconfigure/reconfigure-0.1.79.ebuild
+++ b/dev-python/reconfigure/reconfigure-0.1.79.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 )
 inherit distutils-r1
 
 DESCRIPTION="An ORM for config files"
-HOMEPAGE="https://pypi.python.org/pypi/reconfigure/"
+HOMEPAGE="https://pypi.org/project/reconfigure/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
diff --git a/dev-python/redlock-py/redlock-py-1.0.8.ebuild b/dev-python/redlock-py/redlock-py-1.0.8.ebuild
index 98bd3e8f536d2..04560841c84b8 100644
--- a/dev-python/redlock-py/redlock-py-1.0.8.ebuild
+++ b/dev-python/redlock-py/redlock-py-1.0.8.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( pypy{,3} python2_7 python3_{4,5,6} )
 inherit distutils-r1
 
 DESCRIPTION="Redis distributed locks in Python"
-HOMEPAGE="https://github.com/SPSCommerce/redlock-py https://pypi.python.org/pypi/redlock-py"
+HOMEPAGE="https://github.com/SPSCommerce/redlock-py https://pypi.org/project/redlock-py"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/regendoc/regendoc-0.5.ebuild b/dev-python/regendoc/regendoc-0.5.ebuild
index a0cbbb30fc59d..e568e1f9f4e7b 100644
--- a/dev-python/regendoc/regendoc-0.5.ebuild
+++ b/dev-python/regendoc/regendoc-0.5.ebuild
@@ -11,7 +11,7 @@ MY_PN="RegenDoc"
 MY_P="${MY_PN}-${PV}"
 
 DESCRIPTION="Check/update simple file/shell examples in documentation"
-HOMEPAGE="https://pypi.python.org/pypi/RegenDoc
+HOMEPAGE="https://pypi.org/project/RegenDoc
 	https://bitbucket.org/pytest-dev/regendoc/"
 SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${P}.tar.gz"
 
diff --git a/dev-python/regendoc/regendoc-0.6.1.ebuild b/dev-python/regendoc/regendoc-0.6.1.ebuild
index 872a46354c1bc..f95a68332bdc4 100644
--- a/dev-python/regendoc/regendoc-0.6.1.ebuild
+++ b/dev-python/regendoc/regendoc-0.6.1.ebuild
@@ -11,7 +11,7 @@ MY_PN="RegenDoc"
 MY_P="${MY_PN}-${PV}"
 
 DESCRIPTION="Check/update simple file/shell examples in documentation"
-HOMEPAGE="https://pypi.python.org/pypi/RegenDoc
+HOMEPAGE="https://pypi.org/project/RegenDoc
 	https://bitbucket.org/pytest-dev/regendoc/"
 SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${P}.tar.gz"
 
diff --git a/dev-python/reno/reno-2.2.1.ebuild b/dev-python/reno/reno-2.2.1.ebuild
index 369edc605c613..977f33011649e 100644
--- a/dev-python/reno/reno-2.2.1.ebuild
+++ b/dev-python/reno/reno-2.2.1.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
 inherit distutils-r1
 
 DESCRIPTION="Release notes manager, storing release notes in a git repo and building docs"
-HOMEPAGE="https://pypi.python.org/pypi/reno"
+HOMEPAGE="https://pypi.org/project/reno"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
diff --git a/dev-python/reno/reno-2.5.0.ebuild b/dev-python/reno/reno-2.5.0.ebuild
index 14fdb51f401e6..dd5335f2ff765 100644
--- a/dev-python/reno/reno-2.5.0.ebuild
+++ b/dev-python/reno/reno-2.5.0.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
 inherit distutils-r1
 
 DESCRIPTION="Release notes manager, storing release notes in a git repo and building docs"
-HOMEPAGE="https://pypi.python.org/pypi/reno"
+HOMEPAGE="https://pypi.org/project/reno"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
diff --git a/dev-python/reno/reno-2.7.0.ebuild b/dev-python/reno/reno-2.7.0.ebuild
index 0bcd83890237e..303e0644e3c7d 100644
--- a/dev-python/reno/reno-2.7.0.ebuild
+++ b/dev-python/reno/reno-2.7.0.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
 inherit distutils-r1
 
 DESCRIPTION="Release notes manager, storing release notes in a git repo and building docs"
-HOMEPAGE="https://pypi.python.org/pypi/reno"
+HOMEPAGE="https://pypi.org/project/reno"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
diff --git a/dev-python/repoze-sphinx-autointerface/repoze-sphinx-autointerface-0.7.1-r1.ebuild b/dev-python/repoze-sphinx-autointerface/repoze-sphinx-autointerface-0.7.1-r1.ebuild
index c50bd018c0d2a..08beefe08e8db 100644
--- a/dev-python/repoze-sphinx-autointerface/repoze-sphinx-autointerface-0.7.1-r1.ebuild
+++ b/dev-python/repoze-sphinx-autointerface/repoze-sphinx-autointerface-0.7.1-r1.ebuild
@@ -10,7 +10,7 @@ MY_PN=${PN//-/.}
 MY_P=${MY_PN}-${PV}
 
 DESCRIPTION="Sphinx extension: auto-generates API docs from Zope interfaces"
-HOMEPAGE="https://pypi.python.org/pypi/repoze.sphinx.autointerface/"
+HOMEPAGE="https://pypi.org/project/repoze.sphinx.autointerface/"
 SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="repoze"
diff --git a/dev-python/requests-cache/requests-cache-0.4.12.ebuild b/dev-python/requests-cache/requests-cache-0.4.12.ebuild
index 3f7de0975d4db..c2058835cf571 100644
--- a/dev-python/requests-cache/requests-cache-0.4.12.ebuild
+++ b/dev-python/requests-cache/requests-cache-0.4.12.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5} pypy )
 
 inherit distutils-r1
 
-HOMEPAGE="https://pypi.python.org/pypi/requests-cache"
+HOMEPAGE="https://pypi.org/project/requests-cache"
 DESCRIPTION="Persistent cache for requests library"
 SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.zip"
 
diff --git a/dev-python/requests-kerberos/requests-kerberos-0.11.0.ebuild b/dev-python/requests-kerberos/requests-kerberos-0.11.0.ebuild
index d5978a9242a6d..6c824be1ff0c4 100644
--- a/dev-python/requests-kerberos/requests-kerberos-0.11.0.ebuild
+++ b/dev-python/requests-kerberos/requests-kerberos-0.11.0.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python3_{4,5,6} )
 
 inherit distutils-r1
 
-HOMEPAGE="https://pypi.python.org/pypi/requests-kerberos"
+HOMEPAGE="https://pypi.org/project/requests-kerberos"
 DESCRIPTION="A Kerberos authentication handler for python-requests"
 SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
diff --git a/dev-python/requests/requests-2.11.1.ebuild b/dev-python/requests/requests-2.11.1.ebuild
index 4fadd2dee904c..55056cd2cdac5 100644
--- a/dev-python/requests/requests-2.11.1.ebuild
+++ b/dev-python/requests/requests-2.11.1.ebuild
@@ -9,7 +9,7 @@ PYTHON_REQ_USE="threads(+)"
 inherit distutils-r1
 
 DESCRIPTION="HTTP library for human beings"
-HOMEPAGE="http://python-requests.org/ https://pypi.python.org/pypi/requests"
+HOMEPAGE="http://python-requests.org/ https://pypi.org/project/requests"
 SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
diff --git a/dev-python/requests/requests-2.12.5.ebuild b/dev-python/requests/requests-2.12.5.ebuild
index 4747b802f74b3..b5cd1b3024735 100644
--- a/dev-python/requests/requests-2.12.5.ebuild
+++ b/dev-python/requests/requests-2.12.5.ebuild
@@ -9,7 +9,7 @@ PYTHON_REQ_USE="threads(+)"
 inherit distutils-r1
 
 DESCRIPTION="HTTP library for human beings"
-HOMEPAGE="http://python-requests.org/ https://pypi.python.org/pypi/requests"
+HOMEPAGE="http://python-requests.org/ https://pypi.org/project/requests"
 SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
diff --git a/dev-python/requests/requests-2.14.2.ebuild b/dev-python/requests/requests-2.14.2.ebuild
index c99bc370f19b5..d218464dfe068 100644
--- a/dev-python/requests/requests-2.14.2.ebuild
+++ b/dev-python/requests/requests-2.14.2.ebuild
@@ -9,7 +9,7 @@ PYTHON_REQ_USE="threads(+)"
 inherit distutils-r1
 
 DESCRIPTION="HTTP library for human beings"
-HOMEPAGE="http://python-requests.org/ https://pypi.python.org/pypi/requests"
+HOMEPAGE="http://python-requests.org/ https://pypi.org/project/requests"
 SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
diff --git a/dev-python/restructuredtext-lint/restructuredtext-lint-0.12.2.ebuild b/dev-python/restructuredtext-lint/restructuredtext-lint-0.12.2.ebuild
index 4295010893740..f7809fc2f4f2b 100644
--- a/dev-python/restructuredtext-lint/restructuredtext-lint-0.12.2.ebuild
+++ b/dev-python/restructuredtext-lint/restructuredtext-lint-0.12.2.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python{2_7,3_{4,5,6}} )
 inherit distutils-r1
 
 DESCRIPTION="Created out of frustration, it sucks to find out your reST is invalid after uploading it."
-HOMEPAGE="https://pypi.python.org/pypi/restructuredtext_lint"
+HOMEPAGE="https://pypi.org/project/restructuredtext_lint"
 
 MY_P="restructuredtext_lint"
 SRC_URI="mirror://pypi/${PN:0:1}/${MY_P}/${MY_P}-${PV}.tar.gz"
diff --git a/dev-python/restructuredtext-lint/restructuredtext-lint-1.1.2.ebuild b/dev-python/restructuredtext-lint/restructuredtext-lint-1.1.2.ebuild
index dcc36614fba1a..a9aec5df9d266 100644
--- a/dev-python/restructuredtext-lint/restructuredtext-lint-1.1.2.ebuild
+++ b/dev-python/restructuredtext-lint/restructuredtext-lint-1.1.2.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python{2_7,3_{4,5,6}} )
 inherit distutils-r1
 
 DESCRIPTION="Created out of frustration, it sucks to find out your reST is invalid after uploading it."
-HOMEPAGE="https://pypi.python.org/pypi/restructuredtext_lint"
+HOMEPAGE="https://pypi.org/project/restructuredtext_lint"
 
 MY_P="restructuredtext_lint"
 SRC_URI="mirror://pypi/${PN:0:1}/${MY_P}/${MY_P}-${PV}.tar.gz"
diff --git a/dev-python/resumable-urlretrieve/resumable-urlretrieve-0.1.5.ebuild b/dev-python/resumable-urlretrieve/resumable-urlretrieve-0.1.5.ebuild
index b62bd2f2ab4c0..47adf6288b7a8 100644
--- a/dev-python/resumable-urlretrieve/resumable-urlretrieve-0.1.5.ebuild
+++ b/dev-python/resumable-urlretrieve/resumable-urlretrieve-0.1.5.ebuild
@@ -10,7 +10,7 @@ inherit distutils-r1
 DESCRIPTION="Small library to fetch files over HTTP and resuming their download"
 HOMEPAGE="
 	https://github.com/berdario/resumable-urlretrieve
-	https://pypi.python.org/pypi/resumable-urlretrieve"
+	https://pypi.org/project/resumable-urlretrieve"
 SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/reverend/reverend-0.4-r1.ebuild b/dev-python/reverend/reverend-0.4-r1.ebuild
index fc88c4e3e5c68..d0ae610280449 100644
--- a/dev-python/reverend/reverend-0.4-r1.ebuild
+++ b/dev-python/reverend/reverend-0.4-r1.ebuild
@@ -11,7 +11,7 @@ MY_PN="Reverend"
 MY_P="${MY_PN}-${PV}"
 
 DESCRIPTION="Reverend - Simple Bayesian classifier"
-HOMEPAGE="https://pypi.python.org/pypi/Reverend"
+HOMEPAGE="https://pypi.org/project/Reverend"
 SRC_URI="mirror://sourceforge/reverend/${MY_P}.tar.gz mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="LGPL-2.1"
diff --git a/dev-python/rfc3987/rfc3987-1.3.7.ebuild b/dev-python/rfc3987/rfc3987-1.3.7.ebuild
index d9f814f5de09c..c57d90dff95ae 100644
--- a/dev-python/rfc3987/rfc3987-1.3.7.ebuild
+++ b/dev-python/rfc3987/rfc3987-1.3.7.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="Parsing and validation of URIs (RFC 3986) and IRIs (RFC 3987)"
-HOMEPAGE="https://github.com/dgerber/rfc3987 https://pypi.python.org/pypi/rfc3987"
+HOMEPAGE="https://github.com/dgerber/rfc3987 https://pypi.org/project/rfc3987"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
diff --git a/dev-python/rlcompleter2/rlcompleter2-0.98-r1.ebuild b/dev-python/rlcompleter2/rlcompleter2-0.98-r1.ebuild
index cab29f48ab9ad..3b165c4a1f5c1 100644
--- a/dev-python/rlcompleter2/rlcompleter2-0.98-r1.ebuild
+++ b/dev-python/rlcompleter2/rlcompleter2-0.98-r1.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 )
 inherit distutils-r1
 
 DESCRIPTION="Python command line completion"
-HOMEPAGE="http://codespeak.net/rlcompleter2/ https://pypi.python.org/pypi/rlcompleter2"
+HOMEPAGE="http://codespeak.net/rlcompleter2/ https://pypi.org/project/rlcompleter2"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/robotframework-selenium2library/robotframework-selenium2library-1.8.0.ebuild b/dev-python/robotframework-selenium2library/robotframework-selenium2library-1.8.0.ebuild
index 3c4ab2d2e3f14..46600e7104cd5 100644
--- a/dev-python/robotframework-selenium2library/robotframework-selenium2library-1.8.0.ebuild
+++ b/dev-python/robotframework-selenium2library/robotframework-selenium2library-1.8.0.ebuild
@@ -8,7 +8,7 @@ inherit distutils-r1
 
 DESCRIPTION="Web testing library for Robot Framework"
 HOMEPAGE="https://github.com/rtomac/robotframework-selenium2library/
-	https://pypi.python.org/pypi/robotframework-selenium2library/"
+	https://pypi.org/project/robotframework-selenium2library/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
diff --git a/dev-python/robotframework-sshlibrary/robotframework-sshlibrary-2.1.3.ebuild b/dev-python/robotframework-sshlibrary/robotframework-sshlibrary-2.1.3.ebuild
index fa8b1594e1067..0bd225bc339c8 100644
--- a/dev-python/robotframework-sshlibrary/robotframework-sshlibrary-2.1.3.ebuild
+++ b/dev-python/robotframework-sshlibrary/robotframework-sshlibrary-2.1.3.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 )
 inherit distutils-r1
 
 DESCRIPTION="A test library for Robot Framework that enables SSH and SFTP"
-HOMEPAGE="https://github.com/robotframework/SSHLibrary https://pypi.python.org/pypi/robotframework-sshlibrary/"
+HOMEPAGE="https://github.com/robotframework/SSHLibrary https://pypi.org/project/robotframework-sshlibrary/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
diff --git a/dev-python/robotframework/robotframework-3.0.2.ebuild b/dev-python/robotframework/robotframework-3.0.2.ebuild
index 857138ab255a6..20a491ce597ba 100644
--- a/dev-python/robotframework/robotframework-3.0.2.ebuild
+++ b/dev-python/robotframework/robotframework-3.0.2.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_6 )
 inherit distutils-r1
 
 DESCRIPTION="Test automation framework for acceptance testing & test-driven development"
-HOMEPAGE="http://robotframework.org/ https://pypi.python.org/pypi/robotframework/"
+HOMEPAGE="http://robotframework.org/ https://pypi.org/project/robotframework/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 LICENSE="Apache-2.0"
 SLOT="0"
diff --git a/dev-python/roman/roman-2.0.0.ebuild b/dev-python/roman/roman-2.0.0.ebuild
index 355a44916938e..853f55239f80b 100644
--- a/dev-python/roman/roman-2.0.0.ebuild
+++ b/dev-python/roman/roman-2.0.0.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy )
 inherit distutils-r1
 
 DESCRIPTION="An Integer to Roman numerals converter"
-HOMEPAGE="https://pypi.python.org/pypi/roman/"
+HOMEPAGE="https://pypi.org/project/roman/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
 
 LICENSE="PSF-2"
diff --git a/dev-python/ropeide/ropeide-1.5.1-r2.ebuild b/dev-python/ropeide/ropeide-1.5.1-r2.ebuild
index d6b7c70830e27..5daae3e042460 100644
--- a/dev-python/ropeide/ropeide-1.5.1-r2.ebuild
+++ b/dev-python/ropeide/ropeide-1.5.1-r2.ebuild
@@ -8,7 +8,7 @@ inherit distutils-r1
 PYTHON_REQ_USE="tk"
 
 DESCRIPTION="Python refactoring IDE"
-HOMEPAGE="http://freecode.com/projects/ropeide https://pypi.python.org/pypi/ropeide"
+HOMEPAGE="http://freecode.com/projects/ropeide https://pypi.org/project/ropeide"
 SRC_URI="mirror://sourceforge/rope/${P}.tar.gz"
 
 LICENSE="GPL-2"
diff --git a/dev-python/ropemacs/ropemacs-0.8.ebuild b/dev-python/ropemacs/ropemacs-0.8.ebuild
index 4413ac115e156..d01170ff77eaf 100644
--- a/dev-python/ropemacs/ropemacs-0.8.ebuild
+++ b/dev-python/ropemacs/ropemacs-0.8.ebuild
@@ -9,7 +9,7 @@ inherit distutils-r1 eutils readme.gentoo
 
 DESCRIPTION="Rope in Emacs"
 HOMEPAGE="https://github.com/python-rope/ropemacs
-	https://pypi.python.org/pypi/ropemacs"
+	https://pypi.org/project/ropemacs"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-1+"		# GPL without version
diff --git a/dev-python/ropemode/ropemode-0.2-r1.ebuild b/dev-python/ropemode/ropemode-0.2-r1.ebuild
index 418e7e7201c41..5672c38e65788 100644
--- a/dev-python/ropemode/ropemode-0.2-r1.ebuild
+++ b/dev-python/ropemode/ropemode-0.2-r1.ebuild
@@ -10,7 +10,7 @@ inherit distutils-r1
 MY_P="${P/_rc/-rc}"
 
 DESCRIPTION="A helper for using rope refactoring library in IDEs"
-HOMEPAGE="https://pypi.python.org/pypi/ropemode"
+HOMEPAGE="https://pypi.org/project/ropemode"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
diff --git a/dev-python/ropemode/ropemode-0.4.ebuild b/dev-python/ropemode/ropemode-0.4.ebuild
index 33e4385c3ad3c..4ac6c4b88eb55 100644
--- a/dev-python/ropemode/ropemode-0.4.ebuild
+++ b/dev-python/ropemode/ropemode-0.4.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
 inherit distutils-r1
 
 DESCRIPTION="A helper for using rope refactoring library in IDEs"
-HOMEPAGE="https://github.com/python-rope/ropemode https://pypi.python.org/pypi/ropemode"
+HOMEPAGE="https://github.com/python-rope/ropemode https://pypi.org/project/ropemode"
 SRC_URI="https://github.com/python-rope/ropemode/archive/${PV}.tar.gz -> ${P}.tar.gz"
 # pypi releases don't include tests
 #SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
diff --git a/dev-python/routes/routes-2.4.1.ebuild b/dev-python/routes/routes-2.4.1.ebuild
index eb06f9e027daa..b04b2a8e70c83 100644
--- a/dev-python/routes/routes-2.4.1.ebuild
+++ b/dev-python/routes/routes-2.4.1.ebuild
@@ -10,7 +10,7 @@ MY_PN="Routes"
 MY_P="${MY_PN}-${PV}"
 
 DESCRIPTION="A re-implementation of Rails routes system, mapping URLs to Controllers/Actions"
-HOMEPAGE="http://routes.groovie.org https://pypi.python.org/pypi/Routes"
+HOMEPAGE="http://routes.groovie.org https://pypi.org/project/Routes"
 SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/rpy/rpy-2.6.2.ebuild b/dev-python/rpy/rpy-2.6.2.ebuild
index 5fdc415177a08..e02c8d713521d 100644
--- a/dev-python/rpy/rpy-2.6.2.ebuild
+++ b/dev-python/rpy/rpy-2.6.2.ebuild
@@ -14,7 +14,7 @@ MY_P=${MY_PN}-${PV}
 
 DESCRIPTION="Python interface to the R Programming Language"
 HOMEPAGE="https://rpy.sourceforge.net/
-	https://pypi.python.org/pypi/rpy2"
+	https://pypi.org/project/rpy2"
 SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="AGPL-3 GPL-2 LGPL-2.1 MPL-1.1"
diff --git a/dev-python/rpy/rpy-2.9.0.ebuild b/dev-python/rpy/rpy-2.9.0.ebuild
index f501bb506a3d8..f5674d5f4b793 100644
--- a/dev-python/rpy/rpy-2.9.0.ebuild
+++ b/dev-python/rpy/rpy-2.9.0.ebuild
@@ -14,7 +14,7 @@ MY_P=${MY_PN}-${PV}
 
 DESCRIPTION="Python interface to the R Programming Language"
 HOMEPAGE="https://rpy.sourceforge.net/
-	https://pypi.python.org/pypi/rpy2"
+	https://pypi.org/project/rpy2"
 SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="AGPL-3 GPL-2 LGPL-2.1 MPL-1.1"
diff --git a/dev-python/rsa/rsa-3.2.3-r1.ebuild b/dev-python/rsa/rsa-3.2.3-r1.ebuild
index b69f7b625a914..efb9ae14b6346 100644
--- a/dev-python/rsa/rsa-3.2.3-r1.ebuild
+++ b/dev-python/rsa/rsa-3.2.3-r1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
 inherit distutils-r1
 
 DESCRIPTION="Pure-Python RSA implementation"
-HOMEPAGE="https://stuvel.eu/rsa https://pypi.python.org/pypi/rsa"
+HOMEPAGE="https://stuvel.eu/rsa https://pypi.org/project/rsa"
 SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
diff --git a/dev-python/rsa/rsa-3.4.2.ebuild b/dev-python/rsa/rsa-3.4.2.ebuild
index bb73910d943c4..49f2c05e0fbbe 100644
--- a/dev-python/rsa/rsa-3.4.2.ebuild
+++ b/dev-python/rsa/rsa-3.4.2.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
 inherit distutils-r1
 
 DESCRIPTION="Pure-Python RSA implementation"
-HOMEPAGE="https://stuvel.eu/rsa https://pypi.python.org/pypi/rsa"
+HOMEPAGE="https://stuvel.eu/rsa https://pypi.org/project/rsa"
 SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
diff --git a/dev-python/rst2pdf/rst2pdf-0.93-r3.ebuild b/dev-python/rst2pdf/rst2pdf-0.93-r3.ebuild
index 004f5a1239ac6..620890e921396 100644
--- a/dev-python/rst2pdf/rst2pdf-0.93-r3.ebuild
+++ b/dev-python/rst2pdf/rst2pdf-0.93-r3.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 )
 inherit distutils-r1
 
 DESCRIPTION="Tool for transforming reStructuredText to PDF using ReportLab"
-HOMEPAGE="http://rst2pdf.ralsina.me/ https://pypi.python.org/pypi/rst2pdf"
+HOMEPAGE="http://rst2pdf.ralsina.me/ https://pypi.org/project/rst2pdf"
 SRC_URI="https://github.com/rst2pdf/rst2pdf/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/ruamel-std-pathlib/ruamel-std-pathlib-0.6.3.ebuild b/dev-python/ruamel-std-pathlib/ruamel-std-pathlib-0.6.3.ebuild
index b222c6ccf5d2f..726f535d9dd34 100644
--- a/dev-python/ruamel-std-pathlib/ruamel-std-pathlib-0.6.3.ebuild
+++ b/dev-python/ruamel-std-pathlib/ruamel-std-pathlib-0.6.3.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python3_{4,5,6} )
 inherit distutils-r1 vcs-snapshot
 
 DESCRIPTION="Ruamel enhancements to pathlib and pathlib2"
-HOMEPAGE="https://pypi.python.org/pypi/ruamel.std.pathlib https://bitbucket.org/ruamel/std.pathlib"
+HOMEPAGE="https://pypi.org/project/ruamel.std.pathlib https://bitbucket.org/ruamel/std.pathlib"
 MY_PN="${PN//-/.}"
 SRC_URI="https://bitbucket.org/${MY_PN/.//}/get/${PV}.tar.gz -> ${P}.tar.gz"
 
diff --git a/dev-python/ruamel-yaml/ruamel-yaml-0.15.35.ebuild b/dev-python/ruamel-yaml/ruamel-yaml-0.15.35.ebuild
index f7caae762f755..90d6c41f9f835 100644
--- a/dev-python/ruamel-yaml/ruamel-yaml-0.15.35.ebuild
+++ b/dev-python/ruamel-yaml/ruamel-yaml-0.15.35.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python3_{4,5,6} )
 inherit distutils-r1 vcs-snapshot
 
 DESCRIPTION="YAML parser/emitter that supports roundtrip comment preservation"
-HOMEPAGE="https://pypi.python.org/pypi/ruamel.yaml https://bitbucket.org/ruamel/yaml"
+HOMEPAGE="https://pypi.org/project/ruamel.yaml https://bitbucket.org/ruamel/yaml"
 MY_PN="${PN//-/.}"
 SRC_URI="https://bitbucket.org/${MY_PN/.//}/get/${PV}.tar.gz -> ${P}.tar.gz"
 
diff --git a/dev-python/scapy-python3/scapy-python3-0.18-r1.ebuild b/dev-python/scapy-python3/scapy-python3-0.18-r1.ebuild
index a8ea7528943ab..19f431d7aecfb 100644
--- a/dev-python/scapy-python3/scapy-python3-0.18-r1.ebuild
+++ b/dev-python/scapy-python3/scapy-python3-0.18-r1.ebuild
@@ -9,7 +9,7 @@ IUSE="test"
 inherit distutils-r1
 
 DESCRIPTION="Packet crafting/sending/... PCAP processing tool with python3 compatibility"
-HOMEPAGE="https://pypi.python.org/pypi/scapy-python3/"
+HOMEPAGE="https://pypi.org/project/scapy-python3/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/scapy-python3/scapy-python3-0.21.ebuild b/dev-python/scapy-python3/scapy-python3-0.21.ebuild
index 07ba265c3d9fd..7a0023d991fd3 100644
--- a/dev-python/scapy-python3/scapy-python3-0.21.ebuild
+++ b/dev-python/scapy-python3/scapy-python3-0.21.ebuild
@@ -9,7 +9,7 @@ IUSE="test"
 inherit distutils-r1
 
 DESCRIPTION="Packet crafting/sending/... PCAP processing tool with python3 compatibility"
-HOMEPAGE="https://pypi.python.org/pypi/scapy-python3/"
+HOMEPAGE="https://pypi.org/project/scapy-python3/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/scapy-python3/scapy-python3-0.23.ebuild b/dev-python/scapy-python3/scapy-python3-0.23.ebuild
index 9da508913c373..d93a0469a59b4 100644
--- a/dev-python/scapy-python3/scapy-python3-0.23.ebuild
+++ b/dev-python/scapy-python3/scapy-python3-0.23.ebuild
@@ -9,7 +9,7 @@ IUSE="test"
 inherit distutils-r1
 
 DESCRIPTION="Packet crafting/sending/... PCAP processing tool with python3 compatibility"
-HOMEPAGE="https://pypi.python.org/pypi/scapy-python3/"
+HOMEPAGE="https://pypi.org/project/scapy-python3/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/schema/schema-0.6.6.ebuild b/dev-python/schema/schema-0.6.6.ebuild
index a85bb01f7f3ee..e63c6a01d3e30 100644
--- a/dev-python/schema/schema-0.6.6.ebuild
+++ b/dev-python/schema/schema-0.6.6.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="Library for validating Python data structures"
-HOMEPAGE="https://pypi.python.org/pypi/schema https://github.com/keleshev/schema"
+HOMEPAGE="https://pypi.org/project/schema https://github.com/keleshev/schema"
 SRC_URI="
 	mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
 	https://github.com/keleshev/schema/archive/v${PV}.zip -> ${P}.tar.gz
diff --git a/dev-python/scimath/scimath-4.1.2-r1.ebuild b/dev-python/scimath/scimath-4.1.2-r1.ebuild
index b10a46fbe0fb2..d74b9fe5a69e4 100644
--- a/dev-python/scimath/scimath-4.1.2-r1.ebuild
+++ b/dev-python/scimath/scimath-4.1.2-r1.ebuild
@@ -10,7 +10,7 @@ inherit distutils-r1 virtualx
 DESCRIPTION="Enthought Tool Suite: Scientific and mathematical tools"
 HOMEPAGE="http://docs.enthought.com/scimath/
 	https://github.com/enthought/scimath
-	https://pypi.python.org/pypi/scimath"
+	https://pypi.org/project/scimath"
 SRC_URI="http://www.enthought.com/repo/ets/${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/scoop/scoop-0.7.0-r1.ebuild b/dev-python/scoop/scoop-0.7.0-r1.ebuild
index b9418cb1e15b9..3f0bc955ce89d 100644
--- a/dev-python/scoop/scoop-0.7.0-r1.ebuild
+++ b/dev-python/scoop/scoop-0.7.0-r1.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
 inherit distutils-r1
 
 DESCRIPTION="Distributed Evolutionary Algorithms in Python"
-HOMEPAGE="https://code.google.com/p/scoop/ https://pypi.python.org/pypi/scoop"
+HOMEPAGE="https://code.google.com/p/scoop/ https://pypi.org/project/scoop"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.release.tar.gz"
 
 LICENSE="LGPL-3"
diff --git a/dev-python/scrapy/scrapy-1.0.3.ebuild b/dev-python/scrapy/scrapy-1.0.3.ebuild
index 2018788ca1428..c919bbb9c1418 100644
--- a/dev-python/scrapy/scrapy-1.0.3.ebuild
+++ b/dev-python/scrapy/scrapy-1.0.3.ebuild
@@ -10,7 +10,7 @@ inherit vcs-snapshot distutils-r1
 
 DESCRIPTION="A high-level Python Screen Scraping framework"
 HOMEPAGE="https://github.com/scrapy/scrapy/
-	https://pypi.python.org/pypi/Scrapy/"
+	https://pypi.org/project/Scrapy/"
 SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD-2"
diff --git a/dev-python/scrapy/scrapy-1.4.0.ebuild b/dev-python/scrapy/scrapy-1.4.0.ebuild
index 344dc792517ea..ba726b0ccdebd 100644
--- a/dev-python/scrapy/scrapy-1.4.0.ebuild
+++ b/dev-python/scrapy/scrapy-1.4.0.ebuild
@@ -10,7 +10,7 @@ inherit distutils-r1
 
 DESCRIPTION="A high-level Python Screen Scraping framework"
 HOMEPAGE="https://github.com/scrapy/scrapy/
-	https://pypi.python.org/pypi/Scrapy/"
+	https://pypi.org/project/Scrapy/"
 SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD-2"
diff --git a/dev-python/scripttest/scripttest-1.2-r1.ebuild b/dev-python/scripttest/scripttest-1.2-r1.ebuild
index 4c51de9f77730..e0c7d04c9e01d 100644
--- a/dev-python/scripttest/scripttest-1.2-r1.ebuild
+++ b/dev-python/scripttest/scripttest-1.2-r1.ebuild
@@ -10,7 +10,7 @@ MY_PN="ScriptTest"
 MY_P="${MY_PN}-${PV}"
 
 DESCRIPTION="A very small text templating language"
-HOMEPAGE="https://pypi.python.org/pypi/ScriptTest
+HOMEPAGE="https://pypi.org/project/ScriptTest
 	https://github.com/pypa/scripttest"
 SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
diff --git a/dev-python/scripttest/scripttest-1.3.0.ebuild b/dev-python/scripttest/scripttest-1.3.0.ebuild
index a8e4544b55830..34f4f018bf5ed 100644
--- a/dev-python/scripttest/scripttest-1.3.0.ebuild
+++ b/dev-python/scripttest/scripttest-1.3.0.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy{,3} )
 inherit distutils-r1
 
 DESCRIPTION="A very small text templating language"
-HOMEPAGE="https://pypi.python.org/pypi/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/sdnotify/sdnotify-0.3.1.ebuild b/dev-python/sdnotify/sdnotify-0.3.1.ebuild
index c037e2b33e9c5..45d69f8416681 100644
--- a/dev-python/sdnotify/sdnotify-0.3.1.ebuild
+++ b/dev-python/sdnotify/sdnotify-0.3.1.ebuild
@@ -10,7 +10,7 @@ inherit distutils-r1
 DESCRIPTION="Python implementation of systemd's service notification protocol (sd_notify)"
 HOMEPAGE="
 	https://github.com/bb4242/sdnotify
-	https://pypi.python.org/pypi/sdnotify"
+	https://pypi.org/project/sdnotify"
 SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/sdnotify/sdnotify-0.3.2.ebuild b/dev-python/sdnotify/sdnotify-0.3.2.ebuild
index 41b30305da7dc..51e805f368ad9 100644
--- a/dev-python/sdnotify/sdnotify-0.3.2.ebuild
+++ b/dev-python/sdnotify/sdnotify-0.3.2.ebuild
@@ -9,7 +9,7 @@ inherit distutils-r1
 
 DESCRIPTION="Python implementation of systemd's service notification protocol (sd_notify)"
 HOMEPAGE="https://github.com/bb4242/sdnotify
-	https://pypi.python.org/pypi/sdnotify"
+	https://pypi.org/project/sdnotify"
 SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/secretstorage/secretstorage-2.3.1.ebuild b/dev-python/secretstorage/secretstorage-2.3.1.ebuild
index 959228344f5e2..af71862418894 100644
--- a/dev-python/secretstorage/secretstorage-2.3.1.ebuild
+++ b/dev-python/secretstorage/secretstorage-2.3.1.ebuild
@@ -9,7 +9,7 @@ inherit distutils-r1
 MY_PN="SecretStorage"
 
 DESCRIPTION="Python bindings to FreeDesktop.org Secret Service API."
-HOMEPAGE="https://github.com/mitya57/secretstorage https://pypi.python.org/pypi/SecretStorage"
+HOMEPAGE="https://github.com/mitya57/secretstorage https://pypi.org/project/SecretStorage"
 SRC_URI="mirror://pypi/S/${MY_PN}/${MY_PN}-${PV}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/semantic_version/semantic_version-2.6.0-r1.ebuild b/dev-python/semantic_version/semantic_version-2.6.0-r1.ebuild
index 3fbc3a46e1fdd..b6ad84b5df25a 100644
--- a/dev-python/semantic_version/semantic_version-2.6.0-r1.ebuild
+++ b/dev-python/semantic_version/semantic_version-2.6.0-r1.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5} pypy )
 inherit distutils-r1
 
 DESCRIPTION="Python library providing a few tools handling SemVer in Python"
-HOMEPAGE="https://pypi.python.org/pypi/semantic_version"
+HOMEPAGE="https://pypi.org/project/semantic_version"
 SRC_URI="https://github.com/rbarrois/python-semanticversion/archive/v${PV}.tar.gz -> ${P}-1.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/semantic_version/semantic_version-2.6.0.ebuild b/dev-python/semantic_version/semantic_version-2.6.0.ebuild
index cedf16e3ec0c6..74e89c964db4a 100644
--- a/dev-python/semantic_version/semantic_version-2.6.0.ebuild
+++ b/dev-python/semantic_version/semantic_version-2.6.0.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5} pypy )
 inherit distutils-r1
 
 DESCRIPTION="Python library providing a few tools handling SemVer in Python."
-HOMEPAGE="https://pypi.python.org/pypi/semantic_version"
+HOMEPAGE="https://pypi.org/project/semantic_version"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/send2trash/send2trash-1.3.0.ebuild b/dev-python/send2trash/send2trash-1.3.0.ebuild
index f61666e66ed05..27e43be5791d7 100644
--- a/dev-python/send2trash/send2trash-1.3.0.ebuild
+++ b/dev-python/send2trash/send2trash-1.3.0.ebuild
@@ -13,7 +13,7 @@ MY_P="${MY_PN}-${PV}"
 DESCRIPTION="Sends files to the Trash (or Recycle Bin)"
 HOMEPAGE="
 	http://hg.hardcoded.net/send2trash
-	https://pypi.python.org/pypi/Send2Trash
+	https://pypi.org/project/Send2Trash
 	https://github.com/hsoft/send2trash"
 SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
diff --git a/dev-python/serpent/serpent-1.19.ebuild b/dev-python/serpent/serpent-1.19.ebuild
index 225ecffa6d094..048cca75672ff 100644
--- a/dev-python/serpent/serpent-1.19.ebuild
+++ b/dev-python/serpent/serpent-1.19.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
 inherit distutils-r1
 
 DESCRIPTION="A simple serialization library based on ast.literal_eval"
-HOMEPAGE="https://pypi.python.org/pypi/serpent https://github.com/irmen/Serpent"
+HOMEPAGE="https://pypi.org/project/serpent https://github.com/irmen/Serpent"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/setuptools/setuptools-34.0.2-r1.ebuild b/dev-python/setuptools/setuptools-34.0.2-r1.ebuild
index ab4dfdb733008..81f6f11be1108 100644
--- a/dev-python/setuptools/setuptools-34.0.2-r1.ebuild
+++ b/dev-python/setuptools/setuptools-34.0.2-r1.ebuild
@@ -16,7 +16,7 @@ else
 fi
 
 DESCRIPTION="Collection of extensions to Distutils"
-HOMEPAGE="https://github.com/pypa/setuptools https://pypi.python.org/pypi/setuptools"
+HOMEPAGE="https://github.com/pypa/setuptools https://pypi.org/project/setuptools"
 
 LICENSE="MIT"
 SLOT="0"
diff --git a/dev-python/setuptools/setuptools-36.0.1.ebuild b/dev-python/setuptools/setuptools-36.0.1.ebuild
index cacfef117a0a7..5f04cd2f6e216 100644
--- a/dev-python/setuptools/setuptools-36.0.1.ebuild
+++ b/dev-python/setuptools/setuptools-36.0.1.ebuild
@@ -16,7 +16,7 @@ else
 fi
 
 DESCRIPTION="Collection of extensions to Distutils"
-HOMEPAGE="https://github.com/pypa/setuptools https://pypi.python.org/pypi/setuptools"
+HOMEPAGE="https://github.com/pypa/setuptools https://pypi.org/project/setuptools"
 
 LICENSE="MIT"
 SLOT="0"
diff --git a/dev-python/setuptools/setuptools-36.7.2.ebuild b/dev-python/setuptools/setuptools-36.7.2.ebuild
index ee23fc3cd2bbf..550ad20a004e6 100644
--- a/dev-python/setuptools/setuptools-36.7.2.ebuild
+++ b/dev-python/setuptools/setuptools-36.7.2.ebuild
@@ -16,7 +16,7 @@ else
 fi
 
 DESCRIPTION="Collection of extensions to Distutils"
-HOMEPAGE="https://github.com/pypa/setuptools https://pypi.python.org/pypi/setuptools"
+HOMEPAGE="https://github.com/pypa/setuptools https://pypi.org/project/setuptools"
 
 LICENSE="MIT"
 SLOT="0"
diff --git a/dev-python/setuptools/setuptools-38.5.1.ebuild b/dev-python/setuptools/setuptools-38.5.1.ebuild
index 179f967e99bcd..305f19ad61276 100644
--- a/dev-python/setuptools/setuptools-38.5.1.ebuild
+++ b/dev-python/setuptools/setuptools-38.5.1.ebuild
@@ -16,7 +16,7 @@ else
 fi
 
 DESCRIPTION="Collection of extensions to Distutils"
-HOMEPAGE="https://github.com/pypa/setuptools https://pypi.python.org/pypi/setuptools"
+HOMEPAGE="https://github.com/pypa/setuptools https://pypi.org/project/setuptools"
 
 LICENSE="MIT"
 SLOT="0"
diff --git a/dev-python/setuptools/setuptools-9999.ebuild b/dev-python/setuptools/setuptools-9999.ebuild
index b9335a39d9538..80812cd5756bd 100644
--- a/dev-python/setuptools/setuptools-9999.ebuild
+++ b/dev-python/setuptools/setuptools-9999.ebuild
@@ -16,7 +16,7 @@ else
 fi
 
 DESCRIPTION="Collection of extensions to Distutils"
-HOMEPAGE="https://github.com/pypa/setuptools https://pypi.python.org/pypi/setuptools"
+HOMEPAGE="https://github.com/pypa/setuptools https://pypi.org/project/setuptools"
 
 LICENSE="MIT"
 SLOT="0"
diff --git a/dev-python/setuptools_hg/setuptools_hg-0.4-r1.ebuild b/dev-python/setuptools_hg/setuptools_hg-0.4-r1.ebuild
index 2107ee18c03ff..8494a28990cd3 100644
--- a/dev-python/setuptools_hg/setuptools_hg-0.4-r1.ebuild
+++ b/dev-python/setuptools_hg/setuptools_hg-0.4-r1.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy )
 inherit distutils-r1
 
 DESCRIPTION="Setuptools/distribute plugin for finding files under Mercurial version control"
-HOMEPAGE="https://pypi.python.org/pypi/setuptools_hg https://bitbucket.org/jezdez/setuptools_hg/"
+HOMEPAGE="https://pypi.org/project/setuptools_hg https://bitbucket.org/jezdez/setuptools_hg/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
diff --git a/dev-python/setuptools_scm/setuptools_scm-1.15.6-r1.ebuild b/dev-python/setuptools_scm/setuptools_scm-1.15.6-r1.ebuild
index dd6a381e3d1ba..5f53436b59a1e 100644
--- a/dev-python/setuptools_scm/setuptools_scm-1.15.6-r1.ebuild
+++ b/dev-python/setuptools_scm/setuptools_scm-1.15.6-r1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="package to manage versions by scm tags via setuptools"
-HOMEPAGE="https://github.com/pypa/setuptools_scm https://pypi.python.org/pypi/setuptools_scm"
+HOMEPAGE="https://github.com/pypa/setuptools_scm https://pypi.org/project/setuptools_scm"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/setuptools_scm/setuptools_scm-1.15.7.ebuild b/dev-python/setuptools_scm/setuptools_scm-1.15.7.ebuild
index dc80764a3b504..9ac01501c7fca 100644
--- a/dev-python/setuptools_scm/setuptools_scm-1.15.7.ebuild
+++ b/dev-python/setuptools_scm/setuptools_scm-1.15.7.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="package to manage versions by scm tags via setuptools"
-HOMEPAGE="https://github.com/pypa/setuptools_scm https://pypi.python.org/pypi/setuptools_scm"
+HOMEPAGE="https://github.com/pypa/setuptools_scm https://pypi.org/project/setuptools_scm"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/setuptools_scm/setuptools_scm-1.16.1.ebuild b/dev-python/setuptools_scm/setuptools_scm-1.16.1.ebuild
index 8da7e59692a29..6730eb74c4781 100644
--- a/dev-python/setuptools_scm/setuptools_scm-1.16.1.ebuild
+++ b/dev-python/setuptools_scm/setuptools_scm-1.16.1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="package to manage versions by scm tags via setuptools"
-HOMEPAGE="https://github.com/pypa/setuptools_scm https://pypi.python.org/pypi/setuptools_scm"
+HOMEPAGE="https://github.com/pypa/setuptools_scm https://pypi.org/project/setuptools_scm"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/setuptools_trial/setuptools_trial-0.6.0.ebuild b/dev-python/setuptools_trial/setuptools_trial-0.6.0.ebuild
index b94353678127a..70b5c97432124 100644
--- a/dev-python/setuptools_trial/setuptools_trial-0.6.0.ebuild
+++ b/dev-python/setuptools_trial/setuptools_trial-0.6.0.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
 inherit distutils-r1
 
 DESCRIPTION="Setuptools plugin that makes unit tests execute with trial instead of pyunit"
-HOMEPAGE="https://github.com/rutsky/setuptools-trial https://pypi.python.org/pypi/setuptools_trial"
+HOMEPAGE="https://github.com/rutsky/setuptools-trial https://pypi.org/project/setuptools_trial"
 SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/shortuuid/shortuuid-0.4.3.ebuild b/dev-python/shortuuid/shortuuid-0.4.3.ebuild
index dede6fca80116..446a454a7139b 100644
--- a/dev-python/shortuuid/shortuuid-0.4.3.ebuild
+++ b/dev-python/shortuuid/shortuuid-0.4.3.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
 inherit distutils-r1
 
 DESCRIPTION="A generator library for concise, unambiguous and URL-safe UUIDs"
-HOMEPAGE="https://pypi.python.org/pypi/shortuuid"
+HOMEPAGE="https://pypi.org/project/shortuuid"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/shutilwhich/shutilwhich-1.1.0.ebuild b/dev-python/shutilwhich/shutilwhich-1.1.0.ebuild
index 714baa4474e69..3bcbdaeef955c 100644
--- a/dev-python/shutilwhich/shutilwhich-1.1.0.ebuild
+++ b/dev-python/shutilwhich/shutilwhich-1.1.0.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
 inherit distutils-r1
 
 DESCRIPTION="A copy & paste backport of Python 3.3's shutil.which function"
-HOMEPAGE="https://pypi.python.org/pypi/shutilwhich https://github.com/mbr/shutilwhich"
+HOMEPAGE="https://pypi.org/project/shutilwhich https://github.com/mbr/shutilwhich"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="PSF-2"
diff --git a/dev-python/simplebayes/metadata.xml b/dev-python/simplebayes/metadata.xml
index 9d1e5c16ae1b3..3b9be0dd1edc5 100644
--- a/dev-python/simplebayes/metadata.xml
+++ b/dev-python/simplebayes/metadata.xml
@@ -9,7 +9,7 @@
 A memory-based, optional-persistence naïve bayesian text classifier.
 
 This work is heavily inspired by the python "redisbayes" module found here:
-[https://github.com/jart/redisbayes] and [https://pypi.python.org/pypi/redisbayes]
+[https://github.com/jart/redisbayes] and [https://pypi.org/project/redisbayes]
 	</longdescription>
 	<upstream>
 		<remote-id type="github">hickeroar/simplebayes</remote-id>
diff --git a/dev-python/simplegeneric/simplegeneric-0.8.1-r1.ebuild b/dev-python/simplegeneric/simplegeneric-0.8.1-r1.ebuild
index 3f5962302f110..852adda5564df 100644
--- a/dev-python/simplegeneric/simplegeneric-0.8.1-r1.ebuild
+++ b/dev-python/simplegeneric/simplegeneric-0.8.1-r1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
 inherit distutils-r1
 
 DESCRIPTION="Simple generic functions for Python"
-HOMEPAGE="https://pypi.python.org/pypi/simplegeneric"
+HOMEPAGE="https://pypi.org/project/simplegeneric"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
 
 LICENSE="ZPL"
diff --git a/dev-python/simplejson/simplejson-3.10.0.ebuild b/dev-python/simplejson/simplejson-3.10.0.ebuild
index 84b7013548e3a..29ce65c4173cb 100644
--- a/dev-python/simplejson/simplejson-3.10.0.ebuild
+++ b/dev-python/simplejson/simplejson-3.10.0.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
 inherit distutils-r1 flag-o-matic
 
 DESCRIPTION="Simple, fast, extensible JSON encoder/decoder for Python"
-HOMEPAGE="http://undefined.org/python/#simplejson https://pypi.python.org/pypi/simplejson"
+HOMEPAGE="http://undefined.org/python/#simplejson https://pypi.org/project/simplejson"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="|| ( MIT AFL-2.1 )"
diff --git a/dev-python/simplejson/simplejson-3.13.2.ebuild b/dev-python/simplejson/simplejson-3.13.2.ebuild
index 0b3bfb940afe5..48c94c432d5fc 100644
--- a/dev-python/simplejson/simplejson-3.13.2.ebuild
+++ b/dev-python/simplejson/simplejson-3.13.2.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
 inherit distutils-r1 flag-o-matic
 
 DESCRIPTION="Simple, fast, extensible JSON encoder/decoder for Python"
-HOMEPAGE="https://github.com/simplejson/simplejson https://pypi.python.org/pypi/simplejson"
+HOMEPAGE="https://github.com/simplejson/simplejson https://pypi.org/project/simplejson"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="|| ( MIT AFL-2.1 )"
diff --git a/dev-python/simplekv/simplekv-0.11.5.ebuild b/dev-python/simplekv/simplekv-0.11.5.ebuild
index 8f596d13dff99..eaead6e46b581 100644
--- a/dev-python/simplekv/simplekv-0.11.5.ebuild
+++ b/dev-python/simplekv/simplekv-0.11.5.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
 inherit distutils-r1
 
 DESCRIPTION="A key-value storage for binary data, support many backends."
-HOMEPAGE="https://pypi.python.org/pypi/simplekv/ https://github.com/mbr/simplekv"
+HOMEPAGE="https://pypi.org/project/simplekv/ https://github.com/mbr/simplekv"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/simplekv/simplekv-0.11.7.ebuild b/dev-python/simplekv/simplekv-0.11.7.ebuild
index b19a293adbc21..59f6f809ed9f8 100644
--- a/dev-python/simplekv/simplekv-0.11.7.ebuild
+++ b/dev-python/simplekv/simplekv-0.11.7.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
 inherit distutils-r1
 
 DESCRIPTION="A key-value storage for binary data, support many backends."
-HOMEPAGE="https://pypi.python.org/pypi/simplekv/ https://github.com/mbr/simplekv"
+HOMEPAGE="https://pypi.org/project/simplekv/ https://github.com/mbr/simplekv"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/simplekv/simplekv-0.11.8.ebuild b/dev-python/simplekv/simplekv-0.11.8.ebuild
index a8f7df7edca76..70cf86192ba54 100644
--- a/dev-python/simplekv/simplekv-0.11.8.ebuild
+++ b/dev-python/simplekv/simplekv-0.11.8.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy{,3} )
 inherit distutils-r1
 
 DESCRIPTION="A key-value storage for binary data, support many backends."
-HOMEPAGE="https://pypi.python.org/pypi/simplekv/ https://github.com/mbr/simplekv"
+HOMEPAGE="https://pypi.org/project/simplekv/ https://github.com/mbr/simplekv"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/simplekv/simplekv-0.9.2.ebuild b/dev-python/simplekv/simplekv-0.9.2.ebuild
index 02d166f1451b4..244aeaffaf2df 100644
--- a/dev-python/simplekv/simplekv-0.9.2.ebuild
+++ b/dev-python/simplekv/simplekv-0.9.2.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 )
 inherit distutils-r1
 
 DESCRIPTION="A key-value storage for binary data, support many backends."
-HOMEPAGE="https://pypi.python.org/pypi/simplekv/ https://github.com/mbr/simplekv"
+HOMEPAGE="https://pypi.org/project/simplekv/ https://github.com/mbr/simplekv"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/simpleparse/simpleparse-2.1.1-r1.ebuild b/dev-python/simpleparse/simpleparse-2.1.1-r1.ebuild
index fb5234006edd1..6df2a1d72018a 100644
--- a/dev-python/simpleparse/simpleparse-2.1.1-r1.ebuild
+++ b/dev-python/simpleparse/simpleparse-2.1.1-r1.ebuild
@@ -9,7 +9,7 @@ MY_PN="SimpleParse"
 MY_P="${MY_PN}-${PV}"
 
 DESCRIPTION="A Parser Generator for mxTextTools"
-HOMEPAGE="http://simpleparse.sourceforge.net https://pypi.python.org/pypi/SimpleParse"
+HOMEPAGE="http://simpleparse.sourceforge.net https://pypi.org/project/SimpleParse"
 SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="eGenixPublic-1.1 HPND"
diff --git a/dev-python/simples3/simples3-1.0.ebuild b/dev-python/simples3/simples3-1.0.ebuild
index 5ca55e95ada0f..9f465e5aae4d5 100644
--- a/dev-python/simples3/simples3-1.0.ebuild
+++ b/dev-python/simples3/simples3-1.0.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 pypy )
 inherit distutils-r1
 
 DESCRIPTION="A fairly simple, decently quick python interface to Amazon's S3 storage service"
-HOMEPAGE="http://sendapatch.se/projects/simples3/ https://pypi.python.org/pypi/simples3/"
+HOMEPAGE="http://sendapatch.se/projects/simples3/ https://pypi.org/project/simples3/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/simplesettings/simplesettings-0.5-r1.ebuild b/dev-python/simplesettings/simplesettings-0.5-r1.ebuild
index 9e33251a2b64f..7328689638b62 100644
--- a/dev-python/simplesettings/simplesettings-0.5-r1.ebuild
+++ b/dev-python/simplesettings/simplesettings-0.5-r1.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 )
 inherit distutils-r1
 
 DESCRIPTION="Simple settings initialization"
-HOMEPAGE="https://pypi.python.org/pypi/simplesettings"
+HOMEPAGE="https://pypi.org/project/simplesettings"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
diff --git a/dev-python/six/six-1.10.0.ebuild b/dev-python/six/six-1.10.0.ebuild
index a7c52d164479e..075db224501e6 100644
--- a/dev-python/six/six-1.10.0.ebuild
+++ b/dev-python/six/six-1.10.0.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="Python 2 and 3 compatibility library"
-HOMEPAGE="https://github.com/benjaminp/six https://pypi.python.org/pypi/six"
+HOMEPAGE="https://github.com/benjaminp/six https://pypi.org/project/six"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/six/six-1.11.0.ebuild b/dev-python/six/six-1.11.0.ebuild
index 579065529a74b..8e49f3a6a7291 100644
--- a/dev-python/six/six-1.11.0.ebuild
+++ b/dev-python/six/six-1.11.0.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy{,3} )
 inherit distutils-r1
 
 DESCRIPTION="Python 2 and 3 compatibility library"
-HOMEPAGE="https://github.com/benjaminp/six https://pypi.python.org/pypi/six"
+HOMEPAGE="https://github.com/benjaminp/six https://pypi.org/project/six"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/smmap/smmap-0.9.0.ebuild b/dev-python/smmap/smmap-0.9.0.ebuild
index 4fe8891a07db9..fa6717598e2cf 100644
--- a/dev-python/smmap/smmap-0.9.0.ebuild
+++ b/dev-python/smmap/smmap-0.9.0.ebuild
@@ -9,7 +9,7 @@ inherit distutils-r1
 
 DESCRIPTION="A pure git implementation of a sliding window memory map manager"
 HOMEPAGE="
-	https://pypi.python.org/pypi/smmap
+	https://pypi.org/project/smmap
 	https://github.com/Byron/smmap"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
diff --git a/dev-python/smmap2/smmap2-2.0.3.ebuild b/dev-python/smmap2/smmap2-2.0.3.ebuild
index c525924ac6d9d..65ee1c7cf435d 100644
--- a/dev-python/smmap2/smmap2-2.0.3.ebuild
+++ b/dev-python/smmap2/smmap2-2.0.3.ebuild
@@ -9,7 +9,7 @@ inherit distutils-r1
 
 DESCRIPTION="A pure python implementation of a sliding window memory map manager"
 HOMEPAGE="
-	https://pypi.python.org/pypi/smmap2
+	https://pypi.org/project/smmap2
 	https://github.com/gitpython-developers/smmap"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
diff --git a/dev-python/snappy/snappy-0.5-r2.ebuild b/dev-python/snappy/snappy-0.5-r2.ebuild
index ca35ece82a650..a258b1e038ddc 100644
--- a/dev-python/snappy/snappy-0.5-r2.ebuild
+++ b/dev-python/snappy/snappy-0.5-r2.ebuild
@@ -11,7 +11,7 @@ MY_PN=python-${PN}
 MY_P=${MY_PN}-${PV}
 
 DESCRIPTION="Python library for the snappy compression library from Google"
-HOMEPAGE="https://pypi.python.org/pypi/python-snappy"
+HOMEPAGE="https://pypi.org/project/python-snappy"
 SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/snappy/snappy-0.5.1.ebuild b/dev-python/snappy/snappy-0.5.1.ebuild
index 3460b9855fa14..d207cdd918afd 100644
--- a/dev-python/snappy/snappy-0.5.1.ebuild
+++ b/dev-python/snappy/snappy-0.5.1.ebuild
@@ -11,7 +11,7 @@ MY_PN=python-${PN}
 MY_P=${MY_PN}-${PV}
 
 DESCRIPTION="Python library for the snappy compression library from Google"
-HOMEPAGE="https://pypi.python.org/pypi/python-snappy"
+HOMEPAGE="https://pypi.org/project/python-snappy"
 SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/snowballstemmer/snowballstemmer-1.2.0.ebuild b/dev-python/snowballstemmer/snowballstemmer-1.2.0.ebuild
index 66514e49f79a2..cb20dc1189df7 100644
--- a/dev-python/snowballstemmer/snowballstemmer-1.2.0.ebuild
+++ b/dev-python/snowballstemmer/snowballstemmer-1.2.0.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="Stemmer algorithms generated from Snowball algorithms"
-HOMEPAGE="https://github.com/shibukawa/snowball_py https://pypi.python.org/pypi/snowballstemmer/"
+HOMEPAGE="https://github.com/shibukawa/snowball_py https://pypi.org/project/snowballstemmer/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/snowballstemmer/snowballstemmer-1.2.1.ebuild b/dev-python/snowballstemmer/snowballstemmer-1.2.1.ebuild
index dcd462e0944eb..35a5e288166bb 100644
--- a/dev-python/snowballstemmer/snowballstemmer-1.2.1.ebuild
+++ b/dev-python/snowballstemmer/snowballstemmer-1.2.1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="Stemmer algorithms generated from Snowball algorithms"
-HOMEPAGE="https://github.com/shibukawa/snowball_py https://pypi.python.org/pypi/snowballstemmer/"
+HOMEPAGE="https://github.com/shibukawa/snowball_py https://pypi.org/project/snowballstemmer/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/soappy/soappy-0.12.22.ebuild b/dev-python/soappy/soappy-0.12.22.ebuild
index 3099c7599b904..eccad2cb531b8 100644
--- a/dev-python/soappy/soappy-0.12.22.ebuild
+++ b/dev-python/soappy/soappy-0.12.22.ebuild
@@ -12,7 +12,7 @@ MY_PN="SOAPpy"
 MY_P="${MY_PN}-${PV}"
 
 DESCRIPTION="SOAP Services for Python"
-HOMEPAGE="http://pywebsvcs.sourceforge.net/ https://pypi.python.org/pypi/SOAPpy"
+HOMEPAGE="http://pywebsvcs.sourceforge.net/ https://pypi.org/project/SOAPpy"
 SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.zip"
 
 LICENSE="BSD"
diff --git a/dev-python/socketio-client/socketio-client-0.6.6.ebuild b/dev-python/socketio-client/socketio-client-0.6.6.ebuild
index ea4969e34673e..84667bd74c10d 100644
--- a/dev-python/socketio-client/socketio-client-0.6.6.ebuild
+++ b/dev-python/socketio-client/socketio-client-0.6.6.ebuild
@@ -9,7 +9,7 @@ inherit distutils-r1
 MY_PN="socketIO-client"
 REPO_PN="socketIO_client"
 DESCRIPTION="A socket.io client library for Python"
-HOMEPAGE="https://github.com/invisibleroads/socketIO-client/ https://pypi.python.org/pypi/socketIO-client"
+HOMEPAGE="https://github.com/invisibleroads/socketIO-client/ https://pypi.org/project/socketIO-client"
 SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${REPO_PN}-${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/spark-parser/spark-parser-1.5.1-r1.ebuild b/dev-python/spark-parser/spark-parser-1.5.1-r1.ebuild
index f2dccf0862cd5..26f211b00834b 100644
--- a/dev-python/spark-parser/spark-parser-1.5.1-r1.ebuild
+++ b/dev-python/spark-parser/spark-parser-1.5.1-r1.ebuild
@@ -9,7 +9,7 @@ inherit distutils-r1
 MY_PN="spark_parser"
 
 DESCRIPTION="An Early-Algorithm Context-free grammar Parser"
-HOMEPAGE="https://github.com/rocky/python-spark/ https://pypi.python.org/pypi/spark_parser"
+HOMEPAGE="https://github.com/rocky/python-spark/ https://pypi.org/project/spark_parser"
 SRC_URI="mirror://pypi/${P:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/spark-parser/spark-parser-1.6.0.ebuild b/dev-python/spark-parser/spark-parser-1.6.0.ebuild
index 032761c8c32d9..684b69f92ccac 100644
--- a/dev-python/spark-parser/spark-parser-1.6.0.ebuild
+++ b/dev-python/spark-parser/spark-parser-1.6.0.ebuild
@@ -9,7 +9,7 @@ inherit distutils-r1
 MY_PN="spark_parser"
 
 DESCRIPTION="An Early-Algorithm Context-free grammar Parser"
-HOMEPAGE="https://github.com/rocky/python-spark/ https://pypi.python.org/pypi/spark_parser"
+HOMEPAGE="https://github.com/rocky/python-spark/ https://pypi.org/project/spark_parser"
 SRC_URI="mirror://pypi/${P:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/spark-parser/spark-parser-1.6.1.ebuild b/dev-python/spark-parser/spark-parser-1.6.1.ebuild
index 032761c8c32d9..684b69f92ccac 100644
--- a/dev-python/spark-parser/spark-parser-1.6.1.ebuild
+++ b/dev-python/spark-parser/spark-parser-1.6.1.ebuild
@@ -9,7 +9,7 @@ inherit distutils-r1
 MY_PN="spark_parser"
 
 DESCRIPTION="An Early-Algorithm Context-free grammar Parser"
-HOMEPAGE="https://github.com/rocky/python-spark/ https://pypi.python.org/pypi/spark_parser"
+HOMEPAGE="https://github.com/rocky/python-spark/ https://pypi.org/project/spark_parser"
 SRC_URI="mirror://pypi/${P:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/spark-parser/spark-parser-1.8.5.ebuild b/dev-python/spark-parser/spark-parser-1.8.5.ebuild
index fc4444683ff26..a42fe45c5c072 100644
--- a/dev-python/spark-parser/spark-parser-1.8.5.ebuild
+++ b/dev-python/spark-parser/spark-parser-1.8.5.ebuild
@@ -9,7 +9,7 @@ inherit distutils-r1
 MY_PN="spark_parser"
 
 DESCRIPTION="An Early-Algorithm Context-free grammar Parser"
-HOMEPAGE="https://github.com/rocky/python-spark/ https://pypi.python.org/pypi/spark_parser"
+HOMEPAGE="https://github.com/rocky/python-spark/ https://pypi.org/project/spark_parser"
 SRC_URI="mirror://pypi/${P:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/sparql-wrapper/sparql-wrapper-1.7.6.ebuild b/dev-python/sparql-wrapper/sparql-wrapper-1.7.6.ebuild
index 2304f727fd38e..b5d6afee70ae4 100644
--- a/dev-python/sparql-wrapper/sparql-wrapper-1.7.6.ebuild
+++ b/dev-python/sparql-wrapper/sparql-wrapper-1.7.6.ebuild
@@ -9,7 +9,7 @@ inherit distutils-r1
 
 MY_PN=SPARQLWrapper
 DESCRIPTION="Wrapper around a SPARQL service"
-HOMEPAGE="https://pypi.python.org/pypi/SPARQLWrapper"
+HOMEPAGE="https://pypi.org/project/SPARQLWrapper"
 SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
 
 LICENSE="W3C"
diff --git a/dev-python/sparql-wrapper/sparql-wrapper-1.8.0.ebuild b/dev-python/sparql-wrapper/sparql-wrapper-1.8.0.ebuild
index 9b7720387fd76..ad5ff7fa7491e 100644
--- a/dev-python/sparql-wrapper/sparql-wrapper-1.8.0.ebuild
+++ b/dev-python/sparql-wrapper/sparql-wrapper-1.8.0.ebuild
@@ -9,7 +9,7 @@ inherit distutils-r1
 
 MY_PN=SPARQLWrapper
 DESCRIPTION="Wrapper around a SPARQL service"
-HOMEPAGE="https://pypi.python.org/pypi/SPARQLWrapper"
+HOMEPAGE="https://pypi.org/project/SPARQLWrapper"
 SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
 
 LICENSE="W3C"
diff --git a/dev-python/sphinx-better-theme/sphinx-better-theme-0.1.5.ebuild b/dev-python/sphinx-better-theme/sphinx-better-theme-0.1.5.ebuild
index 37b77e5745271..0993c1cd3e987 100644
--- a/dev-python/sphinx-better-theme/sphinx-better-theme-0.1.5.ebuild
+++ b/dev-python/sphinx-better-theme/sphinx-better-theme-0.1.5.ebuild
@@ -10,7 +10,7 @@ inherit distutils-r1
 DESCRIPTION="A nice-looking, customizable theme for Sphinx"
 HOMEPAGE="
 	https://github.com/irskep/sphinx-better-theme
-	https://pypi.python.org/pypi/sphinx-better-theme"
+	https://pypi.org/project/sphinx-better-theme"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD-2"
diff --git a/dev-python/sphinx-jinja/sphinx-jinja-0.2.1.ebuild b/dev-python/sphinx-jinja/sphinx-jinja-0.2.1.ebuild
index 9c388a00c4c00..3ab3a4cc852fb 100644
--- a/dev-python/sphinx-jinja/sphinx-jinja-0.2.1.ebuild
+++ b/dev-python/sphinx-jinja/sphinx-jinja-0.2.1.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
 inherit distutils-r1
 
 DESCRIPTION="A sphinx extension to include jinja based templates into a sphinx doc"
-HOMEPAGE="https://github.com/tardyp/sphinx-jinja https://pypi.python.org/pypi/sphinx-jinja"
+HOMEPAGE="https://github.com/tardyp/sphinx-jinja https://pypi.org/project/sphinx-jinja"
 SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/sphinx-jinja/sphinx-jinja-0.3.0.ebuild b/dev-python/sphinx-jinja/sphinx-jinja-0.3.0.ebuild
index df6366a639de2..7c15805d4a401 100644
--- a/dev-python/sphinx-jinja/sphinx-jinja-0.3.0.ebuild
+++ b/dev-python/sphinx-jinja/sphinx-jinja-0.3.0.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
 inherit distutils-r1
 
 DESCRIPTION="A sphinx extension to include jinja based templates into a sphinx doc"
-HOMEPAGE="https://github.com/tardyp/sphinx-jinja https://pypi.python.org/pypi/sphinx-jinja"
+HOMEPAGE="https://github.com/tardyp/sphinx-jinja https://pypi.org/project/sphinx-jinja"
 SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/sphinx-py3doc-enhanced-theme/sphinx-py3doc-enhanced-theme-2.3.2.ebuild b/dev-python/sphinx-py3doc-enhanced-theme/sphinx-py3doc-enhanced-theme-2.3.2.ebuild
index 76b5106c8b464..a76eb63f0fd0a 100644
--- a/dev-python/sphinx-py3doc-enhanced-theme/sphinx-py3doc-enhanced-theme-2.3.2.ebuild
+++ b/dev-python/sphinx-py3doc-enhanced-theme/sphinx-py3doc-enhanced-theme-2.3.2.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python{2_7,3_{4,5,6}} pypy pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="Enhanced Sphinx theme (based on Python 3 docs)"
-HOMEPAGE="https://github.com/ionelmc/sphinx-py3doc-enhanced-theme https://pypi.python.org/pypi/sphinx-py3doc-enhanced-theme"
+HOMEPAGE="https://github.com/ionelmc/sphinx-py3doc-enhanced-theme https://pypi.org/project/sphinx-py3doc-enhanced-theme"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/sphinx/sphinx-1.2.2-r1.ebuild b/dev-python/sphinx/sphinx-1.2.2-r1.ebuild
index 4df1f6a06baff..436eb0b9ce820 100644
--- a/dev-python/sphinx/sphinx-1.2.2-r1.ebuild
+++ b/dev-python/sphinx/sphinx-1.2.2-r1.ebuild
@@ -12,7 +12,7 @@ MY_PN="Sphinx"
 MY_P="${MY_PN}-${PV}"
 
 DESCRIPTION="Python documentation generator"
-HOMEPAGE="http://sphinx.pocoo.org/ https://pypi.python.org/pypi/Sphinx"
+HOMEPAGE="http://sphinx.pocoo.org/ https://pypi.org/project/Sphinx"
 SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/sphinx/sphinx-1.2.3-r1.ebuild b/dev-python/sphinx/sphinx-1.2.3-r1.ebuild
index dff5692f906ab..5a976a04c6cbd 100644
--- a/dev-python/sphinx/sphinx-1.2.3-r1.ebuild
+++ b/dev-python/sphinx/sphinx-1.2.3-r1.ebuild
@@ -12,7 +12,7 @@ MY_PN="Sphinx"
 MY_P="${MY_PN}-${PV}"
 
 DESCRIPTION="Python documentation generator"
-HOMEPAGE="http://sphinx.pocoo.org/ https://pypi.python.org/pypi/Sphinx"
+HOMEPAGE="http://sphinx.pocoo.org/ https://pypi.org/project/Sphinx"
 SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/sphinx/sphinx-1.3.1-r2.ebuild b/dev-python/sphinx/sphinx-1.3.1-r2.ebuild
index d8392674210df..6c4f89271b3ec 100644
--- a/dev-python/sphinx/sphinx-1.3.1-r2.ebuild
+++ b/dev-python/sphinx/sphinx-1.3.1-r2.ebuild
@@ -12,7 +12,7 @@ MY_PN="Sphinx"
 MY_P="${MY_PN}-${PV}"
 
 DESCRIPTION="Python documentation generator"
-HOMEPAGE="http://sphinx.pocoo.org/ https://pypi.python.org/pypi/Sphinx"
+HOMEPAGE="http://sphinx.pocoo.org/ https://pypi.org/project/Sphinx"
 SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/sphinx/sphinx-1.3.5-r1.ebuild b/dev-python/sphinx/sphinx-1.3.5-r1.ebuild
index 46bcb37d35247..a18db40bd5975 100644
--- a/dev-python/sphinx/sphinx-1.3.5-r1.ebuild
+++ b/dev-python/sphinx/sphinx-1.3.5-r1.ebuild
@@ -12,7 +12,7 @@ MY_PN="Sphinx"
 MY_P="${MY_PN}-${PV}"
 
 DESCRIPTION="Python documentation generator"
-HOMEPAGE="http://sphinx.pocoo.org/ https://pypi.python.org/pypi/Sphinx"
+HOMEPAGE="http://sphinx.pocoo.org/ https://pypi.org/project/Sphinx"
 SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/sphinx_celery/sphinx_celery-1.3.1.ebuild b/dev-python/sphinx_celery/sphinx_celery-1.3.1.ebuild
index 13324c82ea735..294102d61bb25 100644
--- a/dev-python/sphinx_celery/sphinx_celery-1.3.1.ebuild
+++ b/dev-python/sphinx_celery/sphinx_celery-1.3.1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
 inherit distutils-r1
 
 DESCRIPTION="Celery Sphinx Theme and Utilities"
-HOMEPAGE="https://pypi.python.org/pypi/sphinx_celery https://github.com/celery/sphinx_celery"
+HOMEPAGE="https://pypi.org/project/sphinx_celery https://github.com/celery/sphinx_celery"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/sphinxcontrib-ditaa/sphinxcontrib-ditaa-0.2.ebuild b/dev-python/sphinxcontrib-ditaa/sphinxcontrib-ditaa-0.2.ebuild
index 0b34d44162cc8..e0cddcafc8387 100644
--- a/dev-python/sphinxcontrib-ditaa/sphinxcontrib-ditaa-0.2.ebuild
+++ b/dev-python/sphinxcontrib-ditaa/sphinxcontrib-ditaa-0.2.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 )
 inherit distutils-r1
 
 DESCRIPTION="Ditaa Sphinx extension"
-HOMEPAGE="https://pypi.python.org/pypi/sphinxcontrib-ditaa"
+HOMEPAGE="https://pypi.org/project/sphinxcontrib-ditaa"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD-2"
diff --git a/dev-python/sphinxcontrib-doxylink/sphinxcontrib-doxylink-1.3-r1.ebuild b/dev-python/sphinxcontrib-doxylink/sphinxcontrib-doxylink-1.3-r1.ebuild
index 961bd0d2d9770..b277785d4dc66 100644
--- a/dev-python/sphinxcontrib-doxylink/sphinxcontrib-doxylink-1.3-r1.ebuild
+++ b/dev-python/sphinxcontrib-doxylink/sphinxcontrib-doxylink-1.3-r1.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
 inherit distutils-r1
 
 DESCRIPTION="Extension to link to external Doxygen API documentation"
-HOMEPAGE="https://pypi.python.org/pypi/sphinxcontrib-doxylink https://pythonhosted.org/sphinxcontrib-doxylink/ https://bitbucket.org/birkenfeld/sphinx-contrib"
+HOMEPAGE="https://pypi.org/project/sphinxcontrib-doxylink https://pythonhosted.org/sphinxcontrib-doxylink/ https://bitbucket.org/birkenfeld/sphinx-contrib"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD-2"
diff --git a/dev-python/sphinxcontrib-doxylink/sphinxcontrib-doxylink-1.5.ebuild b/dev-python/sphinxcontrib-doxylink/sphinxcontrib-doxylink-1.5.ebuild
index 47d63f31fc08a..a363ce4d04a52 100644
--- a/dev-python/sphinxcontrib-doxylink/sphinxcontrib-doxylink-1.5.ebuild
+++ b/dev-python/sphinxcontrib-doxylink/sphinxcontrib-doxylink-1.5.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python{3_4,3_5,3_6} )
 inherit distutils-r1
 
 DESCRIPTION="Extension to link to external Doxygen API documentation"
-HOMEPAGE="https://pypi.python.org/pypi/sphinxcontrib-doxylink https://pythonhosted.org/sphinxcontrib-doxylink/ https://bitbucket.org/birkenfeld/sphinx-contrib"
+HOMEPAGE="https://pypi.org/project/sphinxcontrib-doxylink https://pythonhosted.org/sphinxcontrib-doxylink/ https://bitbucket.org/birkenfeld/sphinx-contrib"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD-2"
diff --git a/dev-python/sphinxcontrib-napoleon/sphinxcontrib-napoleon-0.5.2.ebuild b/dev-python/sphinxcontrib-napoleon/sphinxcontrib-napoleon-0.5.2.ebuild
index c1ae8fd6f2917..665a161853f69 100644
--- a/dev-python/sphinxcontrib-napoleon/sphinxcontrib-napoleon-0.5.2.ebuild
+++ b/dev-python/sphinxcontrib-napoleon/sphinxcontrib-napoleon-0.5.2.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5} )
 inherit distutils-r1
 
 DESCRIPTION="Allow a different format in dosctrings for better clarity"
-HOMEPAGE="https://pypi.python.org/pypi/sphinxcontrib-napoleon"
+HOMEPAGE="https://pypi.org/project/sphinxcontrib-napoleon"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/spyder/spyder-3.2.4.ebuild b/dev-python/spyder/spyder-3.2.4.ebuild
index 485bde91fcf7f..cdf19a4da1425 100644
--- a/dev-python/spyder/spyder-3.2.4.ebuild
+++ b/dev-python/spyder/spyder-3.2.4.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
 inherit eutils distutils-r1
 
 DESCRIPTION="Python IDE with matlab-like features"
-HOMEPAGE="https://github.com/spyder-ide/spyder/ https://pypi.python.org/pypi/spyder/ http://pythonhosted.org/spyder/"
+HOMEPAGE="https://github.com/spyder-ide/spyder/ https://pypi.org/project/spyder/ http://pythonhosted.org/spyder/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/sqlalchemy-migrate/sqlalchemy-migrate-0.11.0.ebuild b/dev-python/sqlalchemy-migrate/sqlalchemy-migrate-0.11.0.ebuild
index 1e40eb75fa36f..bf9969d18b7b5 100644
--- a/dev-python/sqlalchemy-migrate/sqlalchemy-migrate-0.11.0.ebuild
+++ b/dev-python/sqlalchemy-migrate/sqlalchemy-migrate-0.11.0.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
 inherit distutils-r1
 
 DESCRIPTION="SQLAlchemy Schema Migration Tools"
-HOMEPAGE="https://pypi.python.org/pypi/sqlalchemy-migrate"
+HOMEPAGE="https://pypi.org/project/sqlalchemy-migrate"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/sqlalchemy-migrate/sqlalchemy-migrate-0.7.2-r1.ebuild b/dev-python/sqlalchemy-migrate/sqlalchemy-migrate-0.7.2-r1.ebuild
index 4511a64637370..2b20ba92da5a7 100644
--- a/dev-python/sqlalchemy-migrate/sqlalchemy-migrate-0.7.2-r1.ebuild
+++ b/dev-python/sqlalchemy-migrate/sqlalchemy-migrate-0.7.2-r1.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 )
 inherit distutils-r1
 
 DESCRIPTION="SQLAlchemy Schema Migration Tools"
-HOMEPAGE="https://pypi.python.org/pypi/sqlalchemy-migrate"
+HOMEPAGE="https://pypi.org/project/sqlalchemy-migrate"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/sqlalchemy-migrate/sqlalchemy-migrate-0.9.2.ebuild b/dev-python/sqlalchemy-migrate/sqlalchemy-migrate-0.9.2.ebuild
index 678cb06f4b8cf..2ca76e3bd0bec 100644
--- a/dev-python/sqlalchemy-migrate/sqlalchemy-migrate-0.9.2.ebuild
+++ b/dev-python/sqlalchemy-migrate/sqlalchemy-migrate-0.9.2.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 )
 inherit distutils-r1
 
 DESCRIPTION="SQLAlchemy Schema Migration Tools"
-HOMEPAGE="https://pypi.python.org/pypi/sqlalchemy-migrate"
+HOMEPAGE="https://pypi.org/project/sqlalchemy-migrate"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/sqlalchemy/sqlalchemy-0.7.10.ebuild b/dev-python/sqlalchemy/sqlalchemy-0.7.10.ebuild
index 6681b0d832d0d..d24fbee01c3b2 100644
--- a/dev-python/sqlalchemy/sqlalchemy-0.7.10.ebuild
+++ b/dev-python/sqlalchemy/sqlalchemy-0.7.10.ebuild
@@ -11,7 +11,7 @@ MY_PN="SQLAlchemy"
 MY_P="${MY_PN}-${PV/_}"
 
 DESCRIPTION="Python SQL toolkit and Object Relational Mapper"
-HOMEPAGE="http://www.sqlalchemy.org/ https://pypi.python.org/pypi/SQLAlchemy"
+HOMEPAGE="http://www.sqlalchemy.org/ https://pypi.org/project/SQLAlchemy"
 SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/sqlalchemy/sqlalchemy-0.9.8.ebuild b/dev-python/sqlalchemy/sqlalchemy-0.9.8.ebuild
index c266d7dc3343b..3774fdd6158a9 100644
--- a/dev-python/sqlalchemy/sqlalchemy-0.9.8.ebuild
+++ b/dev-python/sqlalchemy/sqlalchemy-0.9.8.ebuild
@@ -11,7 +11,7 @@ MY_PN="SQLAlchemy"
 MY_P="${MY_PN}-${PV/_}"
 
 DESCRIPTION="Python SQL toolkit and Object Relational Mapper"
-HOMEPAGE="http://www.sqlalchemy.org/ https://pypi.python.org/pypi/SQLAlchemy"
+HOMEPAGE="http://www.sqlalchemy.org/ https://pypi.org/project/SQLAlchemy"
 SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/sqlalchemy/sqlalchemy-1.0.17.ebuild b/dev-python/sqlalchemy/sqlalchemy-1.0.17.ebuild
index 2c12159a34905..82a30a26e4629 100644
--- a/dev-python/sqlalchemy/sqlalchemy-1.0.17.ebuild
+++ b/dev-python/sqlalchemy/sqlalchemy-1.0.17.ebuild
@@ -12,7 +12,7 @@ MY_PN="SQLAlchemy"
 MY_P="${MY_PN}-${PV/_beta/b}"
 
 DESCRIPTION="Python SQL toolkit and Object Relational Mapper"
-HOMEPAGE="http://www.sqlalchemy.org/ https://pypi.python.org/pypi/SQLAlchemy"
+HOMEPAGE="http://www.sqlalchemy.org/ https://pypi.org/project/SQLAlchemy"
 SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/sqlalchemy/sqlalchemy-1.0.19.ebuild b/dev-python/sqlalchemy/sqlalchemy-1.0.19.ebuild
index 1e0a6318de86c..1ac0d1d90a350 100644
--- a/dev-python/sqlalchemy/sqlalchemy-1.0.19.ebuild
+++ b/dev-python/sqlalchemy/sqlalchemy-1.0.19.ebuild
@@ -12,7 +12,7 @@ MY_PN="SQLAlchemy"
 MY_P="${MY_PN}-${PV/_beta/b}"
 
 DESCRIPTION="Python SQL toolkit and Object Relational Mapper"
-HOMEPAGE="http://www.sqlalchemy.org/ https://pypi.python.org/pypi/SQLAlchemy"
+HOMEPAGE="http://www.sqlalchemy.org/ https://pypi.org/project/SQLAlchemy"
 SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/sqlalchemy/sqlalchemy-1.1.12.ebuild b/dev-python/sqlalchemy/sqlalchemy-1.1.12.ebuild
index b559e60ed4d34..5cd71d12ee287 100644
--- a/dev-python/sqlalchemy/sqlalchemy-1.1.12.ebuild
+++ b/dev-python/sqlalchemy/sqlalchemy-1.1.12.ebuild
@@ -12,7 +12,7 @@ MY_PN="SQLAlchemy"
 MY_P="${MY_PN}-${PV/_beta/b}"
 
 DESCRIPTION="Python SQL toolkit and Object Relational Mapper"
-HOMEPAGE="http://www.sqlalchemy.org/ https://pypi.python.org/pypi/SQLAlchemy"
+HOMEPAGE="http://www.sqlalchemy.org/ https://pypi.org/project/SQLAlchemy"
 SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/sqlalchemy/sqlalchemy-1.1.17.ebuild b/dev-python/sqlalchemy/sqlalchemy-1.1.17.ebuild
index 7804d7112936a..7c1e7effb7340 100644
--- a/dev-python/sqlalchemy/sqlalchemy-1.1.17.ebuild
+++ b/dev-python/sqlalchemy/sqlalchemy-1.1.17.ebuild
@@ -12,7 +12,7 @@ MY_PN="SQLAlchemy"
 MY_P="${MY_PN}-${PV/_beta/b}"
 
 DESCRIPTION="Python SQL toolkit and Object Relational Mapper"
-HOMEPAGE="http://www.sqlalchemy.org/ https://pypi.python.org/pypi/SQLAlchemy"
+HOMEPAGE="http://www.sqlalchemy.org/ https://pypi.org/project/SQLAlchemy"
 SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/sqlalchemy/sqlalchemy-1.2.0.ebuild b/dev-python/sqlalchemy/sqlalchemy-1.2.0.ebuild
index 14e4876c0d08d..4ecfc592fedcb 100644
--- a/dev-python/sqlalchemy/sqlalchemy-1.2.0.ebuild
+++ b/dev-python/sqlalchemy/sqlalchemy-1.2.0.ebuild
@@ -12,7 +12,7 @@ MY_PN="SQLAlchemy"
 MY_P="${MY_PN}-${PV/_beta/b}"
 
 DESCRIPTION="Python SQL toolkit and Object Relational Mapper"
-HOMEPAGE="http://www.sqlalchemy.org/ https://pypi.python.org/pypi/SQLAlchemy"
+HOMEPAGE="http://www.sqlalchemy.org/ https://pypi.org/project/SQLAlchemy"
 SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/sqlalchemy/sqlalchemy-1.2.2.ebuild b/dev-python/sqlalchemy/sqlalchemy-1.2.2.ebuild
index b5fd167ec9c0c..4a260405acab7 100644
--- a/dev-python/sqlalchemy/sqlalchemy-1.2.2.ebuild
+++ b/dev-python/sqlalchemy/sqlalchemy-1.2.2.ebuild
@@ -12,7 +12,7 @@ MY_PN="SQLAlchemy"
 MY_P="${MY_PN}-${PV/_beta/b}"
 
 DESCRIPTION="Python SQL toolkit and Object Relational Mapper"
-HOMEPAGE="http://www.sqlalchemy.org/ https://pypi.python.org/pypi/SQLAlchemy"
+HOMEPAGE="http://www.sqlalchemy.org/ https://pypi.org/project/SQLAlchemy"
 SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/sqlalchemy/sqlalchemy-1.2.4.ebuild b/dev-python/sqlalchemy/sqlalchemy-1.2.4.ebuild
index 238108b55c07d..0e5b3562d436c 100644
--- a/dev-python/sqlalchemy/sqlalchemy-1.2.4.ebuild
+++ b/dev-python/sqlalchemy/sqlalchemy-1.2.4.ebuild
@@ -12,7 +12,7 @@ MY_PN="SQLAlchemy"
 MY_P="${MY_PN}-${PV/_beta/b}"
 
 DESCRIPTION="Python SQL toolkit and Object Relational Mapper"
-HOMEPAGE="http://www.sqlalchemy.org/ https://pypi.python.org/pypi/SQLAlchemy"
+HOMEPAGE="http://www.sqlalchemy.org/ https://pypi.org/project/SQLAlchemy"
 SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/sqlite3dbm/sqlite3dbm-0.1.4-r1.ebuild b/dev-python/sqlite3dbm/sqlite3dbm-0.1.4-r1.ebuild
index 5743e08112b7a..d5abe83b6cb1c 100644
--- a/dev-python/sqlite3dbm/sqlite3dbm-0.1.4-r1.ebuild
+++ b/dev-python/sqlite3dbm/sqlite3dbm-0.1.4-r1.ebuild
@@ -11,7 +11,7 @@ inherit distutils-r1
 # TODO: strip the -git at some version bump, introduced to avoid clash with
 # earlier tarball
 DESCRIPTION="An sqlite-backed dictionary"
-HOMEPAGE="https://github.com/Yelp/sqlite3dbm https://pypi.python.org/pypi/sqlite3dbm/"
+HOMEPAGE="https://github.com/Yelp/sqlite3dbm https://pypi.org/project/sqlite3dbm/"
 SRC_URI="https://github.com/Yelp/${PN}/archive/v${PV}.tar.gz -> ${P}-git.tar.gz"
 
 LICENSE="Apache-2.0"
diff --git a/dev-python/sqlobject/sqlobject-3.4.0.ebuild b/dev-python/sqlobject/sqlobject-3.4.0.ebuild
index 576d9165bf84b..4b043cd9670aa 100644
--- a/dev-python/sqlobject/sqlobject-3.4.0.ebuild
+++ b/dev-python/sqlobject/sqlobject-3.4.0.ebuild
@@ -12,7 +12,7 @@ MY_PN="SQLObject"
 MY_P="${MY_PN}-${PV}"
 
 DESCRIPTION="Object-Relational Manager, aka database wrapper"
-HOMEPAGE="http://sqlobject.org/ https://pypi.python.org/pypi/SQLObject"
+HOMEPAGE="http://sqlobject.org/ https://pypi.org/project/SQLObject"
 SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="LGPL-2.1"
diff --git a/dev-python/squaremap/squaremap-1.0.4.ebuild b/dev-python/squaremap/squaremap-1.0.4.ebuild
index ab9646cdd0a36..ff5188278a44c 100644
--- a/dev-python/squaremap/squaremap-1.0.4.ebuild
+++ b/dev-python/squaremap/squaremap-1.0.4.ebuild
@@ -11,7 +11,7 @@ PYTHON_COMPAT=( python2_7 )
 inherit distutils-r1
 
 DESCRIPTION="Hierarchic data-visualisation control for wxPython"
-HOMEPAGE="https://pypi.python.org/pypi/SquareMap"
+HOMEPAGE="https://pypi.org/project/SquareMap"
 SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/statistics/statistics-1.0.3.5.ebuild b/dev-python/statistics/statistics-1.0.3.5.ebuild
index 33e131e73fd11..078b00044ba8a 100644
--- a/dev-python/statistics/statistics-1.0.3.5.ebuild
+++ b/dev-python/statistics/statistics-1.0.3.5.ebuild
@@ -9,7 +9,7 @@ inherit distutils-r1
 
 DESCRIPTION="A Python 2.* port of 3.4 Statistics Module"
 HOMEPAGE="https://github.com/digitalemagine/py-statistics
-	https://pypi.python.org/pypi/statistics"
+	https://pypi.org/project/statistics"
 SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
diff --git a/dev-python/statistics/statistics-3.4.0_beta3.ebuild b/dev-python/statistics/statistics-3.4.0_beta3.ebuild
index 6825787a875d1..7bf6d4ac5720e 100644
--- a/dev-python/statistics/statistics-3.4.0_beta3.ebuild
+++ b/dev-python/statistics/statistics-3.4.0_beta3.ebuild
@@ -11,7 +11,7 @@ MY_P=${PN}-${PV/_beta/b}
 
 DESCRIPTION="A Python 2.* port of 3.4 Statistics Module"
 HOMEPAGE="https://github.com/digitalemagine/py-statistics
-	https://pypi.python.org/pypi/statistics"
+	https://pypi.org/project/statistics"
 SRC_URI="mirror://pypi/${P:0:1}/${PN}/${MY_P}.tar.gz"
 
 LICENSE="PSF-2"
diff --git a/dev-python/statsd/statsd-3.2.1.ebuild b/dev-python/statsd/statsd-3.2.1.ebuild
index b5cab32637462..7530a98038ee3 100644
--- a/dev-python/statsd/statsd-3.2.1.ebuild
+++ b/dev-python/statsd/statsd-3.2.1.ebuild
@@ -9,7 +9,7 @@ inherit distutils-r1
 
 DESCRIPTION="A simple statsd client"
 HOMEPAGE="https://github.com/jsocol/pystatsd
-	https://pypi.python.org/pypi/statsd"
+	https://pypi.org/project/statsd"
 SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/stevedore/stevedore-1.25.1.ebuild b/dev-python/stevedore/stevedore-1.25.1.ebuild
index 8a34d764c3584..8789a7e01e171 100644
--- a/dev-python/stevedore/stevedore-1.25.1.ebuild
+++ b/dev-python/stevedore/stevedore-1.25.1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
 inherit distutils-r1
 
 DESCRIPTION="Manage dynamic plugins for Python applications"
-HOMEPAGE="https://github.com/openstack/stevedore https://pypi.python.org/pypi/stevedore"
+HOMEPAGE="https://github.com/openstack/stevedore https://pypi.org/project/stevedore"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
diff --git a/dev-python/stevedore/stevedore-1.28.0.ebuild b/dev-python/stevedore/stevedore-1.28.0.ebuild
index f2d29eb2ba57e..56293210cb32b 100644
--- a/dev-python/stevedore/stevedore-1.28.0.ebuild
+++ b/dev-python/stevedore/stevedore-1.28.0.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
 inherit distutils-r1
 
 DESCRIPTION="Manage dynamic plugins for Python applications"
-HOMEPAGE="https://github.com/openstack/stevedore https://pypi.python.org/pypi/stevedore"
+HOMEPAGE="https://github.com/openstack/stevedore https://pypi.org/project/stevedore"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
diff --git a/dev-python/stomper/stomper-0.3.0.ebuild b/dev-python/stomper/stomper-0.3.0.ebuild
index f05a394683d19..9f2f342831f47 100644
--- a/dev-python/stomper/stomper-0.3.0.ebuild
+++ b/dev-python/stomper/stomper-0.3.0.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 pypy )
 inherit distutils-r1
 
 DESCRIPTION="Transport neutral client implementation of the STOMP protocol"
-HOMEPAGE="https://pypi.python.org/pypi/stomper"
+HOMEPAGE="https://pypi.org/project/stomper"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
diff --git a/dev-python/storm/storm-0.20-r1.ebuild b/dev-python/storm/storm-0.20-r1.ebuild
index 4d02bf52610ad..65ced2b39afc7 100644
--- a/dev-python/storm/storm-0.20-r1.ebuild
+++ b/dev-python/storm/storm-0.20-r1.ebuild
@@ -10,7 +10,7 @@ PYTHON_REQ_USE="sqlite?"
 inherit distutils-r1 flag-o-matic
 
 DESCRIPTION="An object-relational mapper for Python developed at Canonical"
-HOMEPAGE="https://storm.canonical.com/ https://pypi.python.org/pypi/storm"
+HOMEPAGE="https://storm.canonical.com/ https://pypi.org/project/storm"
 SRC_URI="https://launchpad.net/storm/trunk/${PV}/+download/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1"
diff --git a/dev-python/strict-rfc3339/strict-rfc3339-0.6.ebuild b/dev-python/strict-rfc3339/strict-rfc3339-0.6.ebuild
index b0dbeac0aeac9..d62a841429396 100644
--- a/dev-python/strict-rfc3339/strict-rfc3339-0.6.ebuild
+++ b/dev-python/strict-rfc3339/strict-rfc3339-0.6.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="Strict, simple, lightweight RFC3339 functions"
-HOMEPAGE="https://pypi.python.org/pypi/strict-rfc3339 https://github.com/danielrichman/strict-rfc3339"
+HOMEPAGE="https://pypi.org/project/strict-rfc3339 https://github.com/danielrichman/strict-rfc3339"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
diff --git a/dev-python/strict-rfc3339/strict-rfc3339-0.7.ebuild b/dev-python/strict-rfc3339/strict-rfc3339-0.7.ebuild
index 2c78f9b7b5771..28f228fc5572e 100644
--- a/dev-python/strict-rfc3339/strict-rfc3339-0.7.ebuild
+++ b/dev-python/strict-rfc3339/strict-rfc3339-0.7.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="Strict, simple, lightweight RFC3339 functions"
-HOMEPAGE="https://pypi.python.org/pypi/strict-rfc3339 https://github.com/danielrichman/strict-rfc3339"
+HOMEPAGE="https://pypi.org/project/strict-rfc3339 https://github.com/danielrichman/strict-rfc3339"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
diff --git a/dev-python/stripogram/stripogram-1.5-r1.ebuild b/dev-python/stripogram/stripogram-1.5-r1.ebuild
index 091f028078955..cf796d132a08c 100644
--- a/dev-python/stripogram/stripogram-1.5-r1.ebuild
+++ b/dev-python/stripogram/stripogram-1.5-r1.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 )
 inherit distutils-r1
 
 DESCRIPTION="Strip-o-Gram HTML Conversion Library"
-HOMEPAGE="https://pypi.python.org/pypi/stripogram"
+HOMEPAGE="https://pypi.org/project/stripogram"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/subunit/subunit-1.2.0-r1.ebuild b/dev-python/subunit/subunit-1.2.0-r1.ebuild
index 247f6e31a66a8..6920f15aa9415 100644
--- a/dev-python/subunit/subunit-1.2.0-r1.ebuild
+++ b/dev-python/subunit/subunit-1.2.0-r1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
 inherit distutils-r1 eutils multilib-minimal versionator
 
 DESCRIPTION="A streaming protocol for test results"
-HOMEPAGE="https://launchpad.net/subunit https://pypi.python.org/pypi/python-subunit"
+HOMEPAGE="https://launchpad.net/subunit https://pypi.org/project/python-subunit"
 SRC_URI="https://launchpad.net/${PN}/trunk/$(get_version_component_range 1-2)/+download/${P}.tar.gz"
 
 LICENSE="Apache-2.0 BSD"
diff --git a/dev-python/subvertpy/subvertpy-0.9.1.ebuild b/dev-python/subvertpy/subvertpy-0.9.1.ebuild
index 0f9ecadd84817..98f88dd20caf3 100644
--- a/dev-python/subvertpy/subvertpy-0.9.1.ebuild
+++ b/dev-python/subvertpy/subvertpy-0.9.1.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 )
 inherit distutils-r1
 
 DESCRIPTION="Alternative Python bindings for Subversion"
-HOMEPAGE="https://www.samba.org/~jelmer/subvertpy/ https://pypi.python.org/pypi/subvertpy"
+HOMEPAGE="https://www.samba.org/~jelmer/subvertpy/ https://pypi.org/project/subvertpy"
 SRC_URI="https://www.samba.org/~jelmer/${PN}/${P}.tar.gz"
 
 LICENSE="|| ( LGPL-2.1 LGPL-3 )"
diff --git a/dev-python/supervisor-quick/supervisor-quick-0.1.4.ebuild b/dev-python/supervisor-quick/supervisor-quick-0.1.4.ebuild
index 3e047f8f16711..3e0963ff14800 100644
--- a/dev-python/supervisor-quick/supervisor-quick-0.1.4.ebuild
+++ b/dev-python/supervisor-quick/supervisor-quick-0.1.4.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 )
 inherit distutils-r1
 
 DESCRIPTION="Bypass supervisor's nasty callbacks stack and make it quick!"
-HOMEPAGE="https://pypi.python.org/pypi/supervisor-quick/"
+HOMEPAGE="https://pypi.org/project/supervisor-quick/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/symboltype/symboltype-1.0.ebuild b/dev-python/symboltype/symboltype-1.0.ebuild
index ea4b34c262dec..eb5819b246e3f 100644
--- a/dev-python/symboltype/symboltype-1.0.ebuild
+++ b/dev-python/symboltype/symboltype-1.0.ebuild
@@ -9,7 +9,7 @@ inherit distutils-r1
 MY_PN="SymbolType"
 
 DESCRIPTION="Gives access to the peak.util.symbols module"
-HOMEPAGE=" http://peak.telecommunity.com/DevCenter/SymbolType https://pypi.python.org/pypi/SymbolType"
+HOMEPAGE=" http://peak.telecommunity.com/DevCenter/SymbolType https://pypi.org/project/SymbolType"
 SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.zip -> ${P}.zip"
 
 KEYWORDS="amd64 x86"
diff --git a/dev-python/tabulate/tabulate-0.8.1.ebuild b/dev-python/tabulate/tabulate-0.8.1.ebuild
index a91800179602b..3711432854612 100644
--- a/dev-python/tabulate/tabulate-0.8.1.ebuild
+++ b/dev-python/tabulate/tabulate-0.8.1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
 inherit distutils-r1
 
 DESCRIPTION="Pretty-print tabular data"
-HOMEPAGE="https://pypi.python.org/pypi/tabulate"
+HOMEPAGE="https://pypi.org/project/tabulate"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
diff --git a/dev-python/tagpy/tagpy-2013.1.ebuild b/dev-python/tagpy/tagpy-2013.1.ebuild
index 291b489fd845a..3f920efdb1922 100644
--- a/dev-python/tagpy/tagpy-2013.1.ebuild
+++ b/dev-python/tagpy/tagpy-2013.1.ebuild
@@ -9,7 +9,7 @@ inherit distutils-r1
 
 DESCRIPTION="Python Bindings for TagLib"
 HOMEPAGE="https://mathema.tician.de//software/tagpy
-	https://pypi.python.org/pypi/tagpy"
+	https://pypi.org/project/tagpy"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/tempest-lib/tempest-lib-1.0.0.ebuild b/dev-python/tempest-lib/tempest-lib-1.0.0.ebuild
index 14583f1d8db7b..c31b2c0b0bb4e 100644
--- a/dev-python/tempest-lib/tempest-lib-1.0.0.ebuild
+++ b/dev-python/tempest-lib/tempest-lib-1.0.0.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python{2_7,3_{4,5}} )
 inherit distutils-r1
 
 DESCRIPTION="Functional or integrated test suites for OpenStack projects"
-HOMEPAGE="https://pypi.python.org/pypi/tempest-lib https://github.com/openstack/tempest-lib"
+HOMEPAGE="https://pypi.org/project/tempest-lib https://github.com/openstack/tempest-lib"
 SRC_URI="mirror://pypi/t/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
diff --git a/dev-python/tempita/tempita-0.5.3-r1.ebuild b/dev-python/tempita/tempita-0.5.3-r1.ebuild
index eb02f1953565b..6da2d93cf5d3d 100644
--- a/dev-python/tempita/tempita-0.5.3-r1.ebuild
+++ b/dev-python/tempita/tempita-0.5.3-r1.ebuild
@@ -11,7 +11,7 @@ MY_PN="Tempita"
 MY_P="${MY_PN}-${PV}dev"
 
 DESCRIPTION="A very small text templating language"
-HOMEPAGE="https://pypi.python.org/pypi/Tempita"
+HOMEPAGE="https://pypi.org/project/Tempita"
 SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/termcolor/termcolor-1.1.0-r1.ebuild b/dev-python/termcolor/termcolor-1.1.0-r1.ebuild
index f56d2416830ba..a3411ba60bc98 100644
--- a/dev-python/termcolor/termcolor-1.1.0-r1.ebuild
+++ b/dev-python/termcolor/termcolor-1.1.0-r1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
 inherit distutils-r1
 
 DESCRIPTION="ANSII Color formatting for output in terminal"
-HOMEPAGE="https://pypi.python.org/pypi/termcolor"
+HOMEPAGE="https://pypi.org/project/termcolor"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/terminado/terminado-0.5.ebuild b/dev-python/terminado/terminado-0.5.ebuild
index 2be6a8d648332..16f309e2e9721 100644
--- a/dev-python/terminado/terminado-0.5.ebuild
+++ b/dev-python/terminado/terminado-0.5.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
 inherit distutils-r1
 
 DESCRIPTION="Terminals served to term.js using Tornado websockets"
-HOMEPAGE="https://pypi.python.org/pypi/terminado https://github.com/jupyter/terminado"
+HOMEPAGE="https://pypi.org/project/terminado https://github.com/jupyter/terminado"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
diff --git a/dev-python/terminado/terminado-0.6.ebuild b/dev-python/terminado/terminado-0.6.ebuild
index c92961f85e531..6ed332680440a 100644
--- a/dev-python/terminado/terminado-0.6.ebuild
+++ b/dev-python/terminado/terminado-0.6.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
 inherit distutils-r1
 
 DESCRIPTION="Terminals served to term.js using Tornado websockets"
-HOMEPAGE="https://pypi.python.org/pypi/terminado https://github.com/jupyter/terminado"
+HOMEPAGE="https://pypi.org/project/terminado https://github.com/jupyter/terminado"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
diff --git a/dev-python/terminado/terminado-0.8.1.ebuild b/dev-python/terminado/terminado-0.8.1.ebuild
index 4ee0e36a539dd..7bf905f37a810 100644
--- a/dev-python/terminado/terminado-0.8.1.ebuild
+++ b/dev-python/terminado/terminado-0.8.1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
 inherit distutils-r1
 
 DESCRIPTION="Terminals served to term.js using Tornado websockets"
-HOMEPAGE="https://pypi.python.org/pypi/terminado https://github.com/jupyter/terminado"
+HOMEPAGE="https://pypi.org/project/terminado https://github.com/jupyter/terminado"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
diff --git a/dev-python/testfixtures/testfixtures-4.9.1.ebuild b/dev-python/testfixtures/testfixtures-4.9.1.ebuild
index 8003c5ff1b1dc..bcde042a6bd2c 100644
--- a/dev-python/testfixtures/testfixtures-4.9.1.ebuild
+++ b/dev-python/testfixtures/testfixtures-4.9.1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5} pypy )
 inherit distutils-r1
 
 DESCRIPTION="A collection of helpers and mock objects for unit tests and doc tests"
-HOMEPAGE="https://pypi.python.org/pypi/testfixtures/ https://github.com/Simplistix/testfixtures"
+HOMEPAGE="https://pypi.org/project/testfixtures/ https://github.com/Simplistix/testfixtures"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
diff --git a/dev-python/testify/testify-0.11.0.ebuild b/dev-python/testify/testify-0.11.0.ebuild
index 8887621f2c22a..7ff7f6292538e 100644
--- a/dev-python/testify/testify-0.11.0.ebuild
+++ b/dev-python/testify/testify-0.11.0.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
 inherit distutils-r1 vcs-snapshot
 
 DESCRIPTION="A more pythonic replacement for the unittest module and nose"
-HOMEPAGE="https://github.com/Yelp/testify https://pypi.python.org/pypi/testify/"
+HOMEPAGE="https://github.com/Yelp/testify https://pypi.org/project/testify/"
 SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
diff --git a/dev-python/testtools/testtools-0.9.36.ebuild b/dev-python/testtools/testtools-0.9.36.ebuild
index b3963b9dd4575..542c7d45555a3 100644
--- a/dev-python/testtools/testtools-0.9.36.ebuild
+++ b/dev-python/testtools/testtools-0.9.36.ebuild
@@ -12,7 +12,7 @@ inherit distutils-r1 versionator
 SERIES="trunk"
 
 DESCRIPTION="Extensions to the Python unittest library"
-HOMEPAGE="https://launchpad.net/testtools https://pypi.python.org/pypi/testtools"
+HOMEPAGE="https://launchpad.net/testtools https://pypi.org/project/testtools"
 SRC_URI="https://launchpad.net/${PN}/${SERIES}/${PV}/+download/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/textx/textx-1.4.ebuild b/dev-python/textx/textx-1.4.ebuild
index f176c431bf4d5..6116c0f436162 100644
--- a/dev-python/textx/textx-1.4.ebuild
+++ b/dev-python/textx/textx-1.4.ebuild
@@ -10,7 +10,7 @@ inherit distutils-r1
 MY_PN=textX
 MY_P=${MY_PN}-${PV}
 DESCRIPTION="Meta-language for DSL implementation inspired by Xtext"
-HOMEPAGE="https://pypi.python.org/pypi/textX https://github.com/igordejanovic/textX"
+HOMEPAGE="https://pypi.org/project/textX https://github.com/igordejanovic/textX"
 SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 # pypi tarball omits tests
 RESTRICT="test"
diff --git a/dev-python/tgmochikit/tgmochikit-1.4.2-r1.ebuild b/dev-python/tgmochikit/tgmochikit-1.4.2-r1.ebuild
index cad2a9158e85c..e6af0a674caf9 100644
--- a/dev-python/tgmochikit/tgmochikit-1.4.2-r1.ebuild
+++ b/dev-python/tgmochikit/tgmochikit-1.4.2-r1.ebuild
@@ -10,7 +10,7 @@ MY_PN="tgMochiKit"
 MY_P="${MY_PN}-${PV}"
 
 DESCRIPTION="MochiKit packaged as TurboGears widgets"
-HOMEPAGE="https://pypi.python.org/pypi/tgMochiKit"
+HOMEPAGE="https://pypi.org/project/tgMochiKit"
 SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="|| ( AFL-2.1 MIT )"
diff --git a/dev-python/timelib/timelib-0.2.4-r1.ebuild b/dev-python/timelib/timelib-0.2.4-r1.ebuild
index 00549a75f07bb..94c65983a926f 100644
--- a/dev-python/timelib/timelib-0.2.4-r1.ebuild
+++ b/dev-python/timelib/timelib-0.2.4-r1.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 )
 inherit distutils-r1
 
 DESCRIPTION="parse english textual date descriptions"
-HOMEPAGE="https://github.com/pediapress/timelib https://pypi.python.org/pypi/timelib"
+HOMEPAGE="https://github.com/pediapress/timelib https://pypi.org/project/timelib"
 # pypi zipball lacks tests; also it's .zip
 SRC_URI="https://github.com/pediapress/timelib/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
diff --git a/dev-python/tinycss2/tinycss2-0.5.ebuild b/dev-python/tinycss2/tinycss2-0.5.ebuild
index 1cd1f50f2d1f0..b375122990686 100644
--- a/dev-python/tinycss2/tinycss2-0.5.ebuild
+++ b/dev-python/tinycss2/tinycss2-0.5.ebuild
@@ -9,7 +9,7 @@ inherit distutils-r1
 
 DESCRIPTION="A complete yet simple CSS parser for Python"
 HOMEPAGE="https://github.com/SimonSapin/tinycss2/
-	https://pypi.python.org/pypi/tinycss2/"
+	https://pypi.org/project/tinycss2/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/tinycss2/tinycss2-0.6.1.ebuild b/dev-python/tinycss2/tinycss2-0.6.1.ebuild
index 1cd1f50f2d1f0..b375122990686 100644
--- a/dev-python/tinycss2/tinycss2-0.6.1.ebuild
+++ b/dev-python/tinycss2/tinycss2-0.6.1.ebuild
@@ -9,7 +9,7 @@ inherit distutils-r1
 
 DESCRIPTION="A complete yet simple CSS parser for Python"
 HOMEPAGE="https://github.com/SimonSapin/tinycss2/
-	https://pypi.python.org/pypi/tinycss2/"
+	https://pypi.org/project/tinycss2/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/tinydb/tinydb-3.1.3.ebuild b/dev-python/tinydb/tinydb-3.1.3.ebuild
index 57a3be966e566..196096821adf1 100644
--- a/dev-python/tinydb/tinydb-3.1.3.ebuild
+++ b/dev-python/tinydb/tinydb-3.1.3.ebuild
@@ -9,7 +9,7 @@ inherit distutils-r1
 
 DESCRIPTION="Tiny document-oriented database"
 HOMEPAGE="https://github.com/msiemens/tinydb
-	https://pypi.python.org/pypi/tinydb"
+	https://pypi.org/project/tinydb"
 SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.zip"
 
 LICENSE="MIT"
diff --git a/dev-python/tlslite/tlslite-0.4.9-r2.ebuild b/dev-python/tlslite/tlslite-0.4.9-r2.ebuild
index b068342b957c4..57c6627afe3ba 100644
--- a/dev-python/tlslite/tlslite-0.4.9-r2.ebuild
+++ b/dev-python/tlslite/tlslite-0.4.9-r2.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
 inherit distutils-r1 eutils
 
 DESCRIPTION="TLS Lite is a free python library that implements SSL 3.0 and TLS 1.0/1.1"
-HOMEPAGE="http://trevp.net/tlslite/ https://pypi.python.org/pypi/tlslite https://github.com/trevp/tlslite"
+HOMEPAGE="http://trevp.net/tlslite/ https://pypi.org/project/tlslite https://github.com/trevp/tlslite"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD public-domain"
diff --git a/dev-python/tmdb3/tmdb3-0.6.17.ebuild b/dev-python/tmdb3/tmdb3-0.6.17.ebuild
index 36401ed88d7ad..b1c3753757a9d 100644
--- a/dev-python/tmdb3/tmdb3-0.6.17.ebuild
+++ b/dev-python/tmdb3/tmdb3-0.6.17.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 )
 inherit distutils-r1
 
 DESCRIPTION="TheMovieDB.org APIv3 interface"
-HOMEPAGE="https://github.com/wagnerrp/pytmdb3 https://pypi.python.org/pypi/tmdb3"
+HOMEPAGE="https://github.com/wagnerrp/pytmdb3 https://pypi.org/project/tmdb3"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
 
 LICENSE="GPL-2"
diff --git a/dev-python/tmdb3/tmdb3-0.7.2.ebuild b/dev-python/tmdb3/tmdb3-0.7.2.ebuild
index 3895b5e70c4b7..f952a3f87b4e8 100644
--- a/dev-python/tmdb3/tmdb3-0.7.2.ebuild
+++ b/dev-python/tmdb3/tmdb3-0.7.2.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 )
 inherit distutils-r1
 
 DESCRIPTION="TheMovieDB.org APIv3 interface"
-HOMEPAGE="https://github.com/wagnerrp/pytmdb3 https://pypi.python.org/pypi/tmdb3"
+HOMEPAGE="https://github.com/wagnerrp/pytmdb3 https://pypi.org/project/tmdb3"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
diff --git a/dev-python/toolz/toolz-0.8.0.ebuild b/dev-python/toolz/toolz-0.8.0.ebuild
index 6479082d57e16..79d2875905a84 100644
--- a/dev-python/toolz/toolz-0.8.0.ebuild
+++ b/dev-python/toolz/toolz-0.8.0.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
 inherit distutils-r1
 
 DESCRIPTION="List processing tools and functional utilities"
-HOMEPAGE="https://pypi.python.org/pypi/toolz"
+HOMEPAGE="https://pypi.org/project/toolz"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/toolz/toolz-0.8.2.ebuild b/dev-python/toolz/toolz-0.8.2.ebuild
index dc0cf7b2c9860..8eeafa6be453d 100644
--- a/dev-python/toolz/toolz-0.8.2.ebuild
+++ b/dev-python/toolz/toolz-0.8.2.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
 inherit distutils-r1
 
 DESCRIPTION="List processing tools and functional utilities"
-HOMEPAGE="https://pypi.python.org/pypi/toolz"
+HOMEPAGE="https://pypi.org/project/toolz"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/tox/tox-2.9.1.ebuild b/dev-python/tox/tox-2.9.1.ebuild
index 1c71ff63d1ca4..d4b941bc7a774 100644
--- a/dev-python/tox/tox-2.9.1.ebuild
+++ b/dev-python/tox/tox-2.9.1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_{4,5,6}} pypy{,3} )
 inherit distutils-r1
 
 DESCRIPTION="virtualenv-based automation of test activities"
-HOMEPAGE="https://tox.readthedocs.io https://github.com/tox-dev/tox https://pypi.python.org/pypi/tox"
+HOMEPAGE="https://tox.readthedocs.io https://github.com/tox-dev/tox https://pypi.org/project/tox"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/traits/traits-4.5.0.ebuild b/dev-python/traits/traits-4.5.0.ebuild
index 64339121feeb8..051b3a510a1ef 100644
--- a/dev-python/traits/traits-4.5.0.ebuild
+++ b/dev-python/traits/traits-4.5.0.ebuild
@@ -10,7 +10,7 @@ inherit distutils-r1 virtualx
 DESCRIPTION="Enthought Tool Suite: Explicitly typed attributes for Python"
 HOMEPAGE="http://docs.enthought.com/traits/
 	https://github.com/enthought/traits
-	https://pypi.python.org/pypi/traits"
+	https://pypi.org/project/traits"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/traits/traits-4.6.0.ebuild b/dev-python/traits/traits-4.6.0.ebuild
index aa93fd5982163..7b550cd3e564d 100644
--- a/dev-python/traits/traits-4.6.0.ebuild
+++ b/dev-python/traits/traits-4.6.0.ebuild
@@ -10,7 +10,7 @@ inherit distutils-r1 virtualx
 DESCRIPTION="Enthought Tool Suite: Explicitly typed attributes for Python"
 HOMEPAGE="http://docs.enthought.com/traits/
 	https://github.com/enthought/traits
-	https://pypi.python.org/pypi/traits"
+	https://pypi.org/project/traits"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/translationstring/translationstring-1.3.ebuild b/dev-python/translationstring/translationstring-1.3.ebuild
index 79128d6e68d9b..cca434c5cdd69 100644
--- a/dev-python/translationstring/translationstring-1.3.ebuild
+++ b/dev-python/translationstring/translationstring-1.3.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="Utility library for i18n relied on by various Repoze packages"
-HOMEPAGE="https://github.com/Pylons/translationstring https://pypi.python.org/pypi/translationstring"
+HOMEPAGE="https://github.com/Pylons/translationstring https://pypi.org/project/translationstring"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="repoze"
diff --git a/dev-python/treq/treq-16.12.0.ebuild b/dev-python/treq/treq-16.12.0.ebuild
index bcac6de9fb0dc..b2d78b7fc28cb 100644
--- a/dev-python/treq/treq-16.12.0.ebuild
+++ b/dev-python/treq/treq-16.12.0.ebuild
@@ -6,7 +6,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5} )
 inherit distutils-r1
 
 DESCRIPTION="A requests-like API built on top of twisted.web's Agent"
-HOMEPAGE="https://github.com/twisted/treq https://pypi.python.org/pypi/treq"
+HOMEPAGE="https://github.com/twisted/treq https://pypi.org/project/treq"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/treq/treq-17.3.1.ebuild b/dev-python/treq/treq-17.3.1.ebuild
index f5efa5c167a2e..d85aa88952372 100644
--- a/dev-python/treq/treq-17.3.1.ebuild
+++ b/dev-python/treq/treq-17.3.1.ebuild
@@ -6,7 +6,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
 inherit distutils-r1
 
 DESCRIPTION="A requests-like API built on top of twisted.web's Agent"
-HOMEPAGE="https://github.com/twisted/treq https://pypi.python.org/pypi/treq"
+HOMEPAGE="https://github.com/twisted/treq https://pypi.org/project/treq"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/treq/treq-17.8.0.ebuild b/dev-python/treq/treq-17.8.0.ebuild
index 00ad59180b50c..af54d95cb3294 100644
--- a/dev-python/treq/treq-17.8.0.ebuild
+++ b/dev-python/treq/treq-17.8.0.ebuild
@@ -6,7 +6,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
 inherit distutils-r1
 
 DESCRIPTION="A requests-like API built on top of twisted.web's Agent"
-HOMEPAGE="https://github.com/twisted/treq https://pypi.python.org/pypi/treq"
+HOMEPAGE="https://github.com/twisted/treq https://pypi.org/project/treq"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/trollius/trollius-2.1.ebuild b/dev-python/trollius/trollius-2.1.ebuild
index 113ae35f56e7b..7ffb145893e72 100644
--- a/dev-python/trollius/trollius-2.1.ebuild
+++ b/dev-python/trollius/trollius-2.1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_{4,5}} pypy )
 inherit distutils-r1
 
 DESCRIPTION="A port of the Tulip project (asyncio module, PEP3156)"
-HOMEPAGE="https://github.com/haypo/trollius https://pypi.python.org/pypi/trollius/"
+HOMEPAGE="https://github.com/haypo/trollius https://pypi.org/project/trollius/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
diff --git a/dev-python/ttfquery/ttfquery-1.0.5-r1.ebuild b/dev-python/ttfquery/ttfquery-1.0.5-r1.ebuild
index 3ae2bd2db7a60..2c0914d7b913b 100644
--- a/dev-python/ttfquery/ttfquery-1.0.5-r1.ebuild
+++ b/dev-python/ttfquery/ttfquery-1.0.5-r1.ebuild
@@ -10,7 +10,7 @@ MY_PN="TTFQuery"
 MY_P="${MY_PN}-${PV}"
 
 DESCRIPTION="Font metadata and glyph outline extraction utility library"
-HOMEPAGE="http://ttfquery.sourceforge.net/ https://pypi.python.org/pypi/TTFQuery"
+HOMEPAGE="http://ttfquery.sourceforge.net/ https://pypi.org/project/TTFQuery"
 SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/turbocheetah/turbocheetah-1.0-r1.ebuild b/dev-python/turbocheetah/turbocheetah-1.0-r1.ebuild
index 86ff37d9bcccb..32698632fe77f 100644
--- a/dev-python/turbocheetah/turbocheetah-1.0-r1.ebuild
+++ b/dev-python/turbocheetah/turbocheetah-1.0-r1.ebuild
@@ -12,7 +12,7 @@ MY_PN="TurboCheetah"
 MY_P="${MY_PN}-${PV}"
 
 DESCRIPTION="TurboGears plugin to support use of Cheetah templates"
-HOMEPAGE="http://docs.turbogears.org/TurboCheetah https://pypi.python.org/pypi/TurboCheetah"
+HOMEPAGE="http://docs.turbogears.org/TurboCheetah https://pypi.org/project/TurboCheetah"
 SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/turbojson/turbojson-1.3.2-r1.ebuild b/dev-python/turbojson/turbojson-1.3.2-r1.ebuild
index c384aaa3395c8..bdc187dbb63c7 100644
--- a/dev-python/turbojson/turbojson-1.3.2-r1.ebuild
+++ b/dev-python/turbojson/turbojson-1.3.2-r1.ebuild
@@ -10,7 +10,7 @@ MY_PN="TurboJson"
 MY_P="${MY_PN}-${PV}"
 
 DESCRIPTION="TurboGears JSON file format support plugin"
-HOMEPAGE="https://pypi.python.org/pypi/TurboJson"
+HOMEPAGE="https://pypi.org/project/TurboJson"
 SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/turbokid/turbokid-1.0.5-r1.ebuild b/dev-python/turbokid/turbokid-1.0.5-r1.ebuild
index 61f245511b8dc..080f97713f37b 100644
--- a/dev-python/turbokid/turbokid-1.0.5-r1.ebuild
+++ b/dev-python/turbokid/turbokid-1.0.5-r1.ebuild
@@ -10,7 +10,7 @@ MY_PN="TurboKid"
 MY_P="${MY_PN}-${PV}"
 
 DESCRIPTION="Python template plugin that supports Kid templates"
-HOMEPAGE="https://pypi.python.org/pypi/TurboKid"
+HOMEPAGE="https://pypi.org/project/TurboKid"
 SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/twine/twine-1.11.0.ebuild b/dev-python/twine/twine-1.11.0.ebuild
index 053b8a7676362..e6bb6970b0a7e 100644
--- a/dev-python/twine/twine-1.11.0.ebuild
+++ b/dev-python/twine/twine-1.11.0.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
 inherit distutils-r1
 
 DESCRIPTION="Collection of utilities for publishing packages on PyPI"
-HOMEPAGE="https://twine.readthedocs.io/ https://github.com/pypa/twine https://pypi.python.org/pypi/twine"
+HOMEPAGE="https://twine.readthedocs.io/ https://github.com/pypa/twine https://pypi.org/project/twine"
 SRC_URI="https://github.com/pypa/twine/archive/${PV}.tar.gz -> ${P}.tar.gz"
 # pypi tarballs don't contain test data
 #SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
diff --git a/dev-python/txaio/txaio-2.7.1.ebuild b/dev-python/txaio/txaio-2.7.1.ebuild
index f4632ac61ce1d..8a0ac6ece8864 100644
--- a/dev-python/txaio/txaio-2.7.1.ebuild
+++ b/dev-python/txaio/txaio-2.7.1.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
 inherit distutils-r1
 
 DESCRIPTION="Compatibility API between asyncio/Twisted/Trollius"
-HOMEPAGE="https://github.com/crossbario/txaio https://pypi.python.org/pypi/txaio"
+HOMEPAGE="https://github.com/crossbario/txaio https://pypi.org/project/txaio"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/txaio/txaio-2.8.2.ebuild b/dev-python/txaio/txaio-2.8.2.ebuild
index 660e89d3ae149..84dc9aed8c7cd 100644
--- a/dev-python/txaio/txaio-2.8.2.ebuild
+++ b/dev-python/txaio/txaio-2.8.2.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
 inherit distutils-r1
 
 DESCRIPTION="Compatibility API between asyncio/Twisted/Trollius"
-HOMEPAGE="https://github.com/crossbario/txaio https://pypi.python.org/pypi/txaio"
+HOMEPAGE="https://github.com/crossbario/txaio https://pypi.org/project/txaio"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/txaio/txaio-2.9.0.ebuild b/dev-python/txaio/txaio-2.9.0.ebuild
index b82b9ad813060..9a30541e6013a 100644
--- a/dev-python/txaio/txaio-2.9.0.ebuild
+++ b/dev-python/txaio/txaio-2.9.0.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
 inherit distutils-r1
 
 DESCRIPTION="Compatibility API between asyncio/Twisted/Trollius"
-HOMEPAGE="https://github.com/crossbario/txaio https://pypi.python.org/pypi/txaio"
+HOMEPAGE="https://github.com/crossbario/txaio https://pypi.org/project/txaio"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/txgithub/txgithub-15.0.0-r1.ebuild b/dev-python/txgithub/txgithub-15.0.0-r1.ebuild
index f036c3f75326a..9e9fd96de6a01 100644
--- a/dev-python/txgithub/txgithub-15.0.0-r1.ebuild
+++ b/dev-python/txgithub/txgithub-15.0.0-r1.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6})
 inherit eutils distutils-r1
 
 DESCRIPTION="GitHub API client implemented using Twisted"
-HOMEPAGE="https://github.com/tomprince/txgithub https://pypi.python.org/pypi/txgithub"
+HOMEPAGE="https://github.com/tomprince/txgithub https://pypi.org/project/txgithub"
 SRC_URI="https://github.com/tomprince/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/txtorcon/txtorcon-0.19.3-r1.ebuild b/dev-python/txtorcon/txtorcon-0.19.3-r1.ebuild
index 7a947665ebdf1..e129ff226605f 100644
--- a/dev-python/txtorcon/txtorcon-0.19.3-r1.ebuild
+++ b/dev-python/txtorcon/txtorcon-0.19.3-r1.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
 inherit distutils-r1
 
 DESCRIPTION="Twisted-based Tor controller client, with state-tracking and config abstractions"
-HOMEPAGE="https://github.com/meejah/txtorcon https://pypi.python.org/pypi/txtorcon https://txtorcon.readthedocs.org"
+HOMEPAGE="https://github.com/meejah/txtorcon https://pypi.org/project/txtorcon https://txtorcon.readthedocs.org"
 SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/typing/typing-3.6.2.ebuild b/dev-python/typing/typing-3.6.2.ebuild
index 7f372a46e031d..56fdc74468fef 100644
--- a/dev-python/typing/typing-3.6.2.ebuild
+++ b/dev-python/typing/typing-3.6.2.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy{,3} )
 inherit distutils-r1
 
 DESCRIPTION="Type Hints for Python"
-HOMEPAGE="https://docs.python.org/3/library/typing.html https://pypi.python.org/pypi/typing"
+HOMEPAGE="https://docs.python.org/3/library/typing.html https://pypi.org/project/typing"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="PSF-2"
diff --git a/dev-python/typing/typing-3.6.4.ebuild b/dev-python/typing/typing-3.6.4.ebuild
index d6616e2931b06..1849d703abf16 100644
--- a/dev-python/typing/typing-3.6.4.ebuild
+++ b/dev-python/typing/typing-3.6.4.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy{,3} )
 inherit distutils-r1
 
 DESCRIPTION="Type Hints for Python"
-HOMEPAGE="https://docs.python.org/3/library/typing.html https://pypi.python.org/pypi/typing"
+HOMEPAGE="https://docs.python.org/3/library/typing.html https://pypi.org/project/typing"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="PSF-2"
diff --git a/dev-python/u-msgpack/u-msgpack-2.4.1.ebuild b/dev-python/u-msgpack/u-msgpack-2.4.1.ebuild
index fad2f09d722ea..d6284d42c6e62 100644
--- a/dev-python/u-msgpack/u-msgpack-2.4.1.ebuild
+++ b/dev-python/u-msgpack/u-msgpack-2.4.1.ebuild
@@ -10,7 +10,7 @@ MY_PN="${PN}-python"
 MY_P="${MY_PN}-${PV}"
 
 DESCRIPTION="A portable, lightweight MessagePack serializer and deserializer"
-HOMEPAGE="https://github.com/vsergeev/u-msgpack-python https://pypi.python.org/pypi/u-msgpack-python"
+HOMEPAGE="https://github.com/vsergeev/u-msgpack-python https://pypi.org/project/u-msgpack-python"
 SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/ujson/ujson-1.33.ebuild b/dev-python/ujson/ujson-1.33.ebuild
index 8c49a7e6fe880..638ba94c6edc9 100644
--- a/dev-python/ujson/ujson-1.33.ebuild
+++ b/dev-python/ujson/ujson-1.33.ebuild
@@ -10,7 +10,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5} )
 inherit distutils-r1
 
 DESCRIPTION="Ultra fast JSON encoder and decoder for Python"
-HOMEPAGE="https://pypi.python.org/pypi/ujson/"
+HOMEPAGE="https://pypi.org/project/ujson/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
 
 LICENSE="BSD"
diff --git a/dev-python/ujson/ujson-1.35.ebuild b/dev-python/ujson/ujson-1.35.ebuild
index 0e4637e65f728..f09734949f281 100644
--- a/dev-python/ujson/ujson-1.35.ebuild
+++ b/dev-python/ujson/ujson-1.35.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
 inherit distutils-r1
 
 DESCRIPTION="Ultra fast JSON encoder and decoder for Python"
-HOMEPAGE="https://pypi.python.org/pypi/ujson/"
+HOMEPAGE="https://pypi.org/project/ujson/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/uncompyle6/uncompyle6-2.10.1.ebuild b/dev-python/uncompyle6/uncompyle6-2.10.1.ebuild
index 2e3cc7ae1c823..dc76597b87371 100644
--- a/dev-python/uncompyle6/uncompyle6-2.10.1.ebuild
+++ b/dev-python/uncompyle6/uncompyle6-2.10.1.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5} pypy )
 inherit distutils-r1
 
 DESCRIPTION="Python cross-version byte-code deparser"
-HOMEPAGE="https://github.com/rocky/python-uncompyle6/ https://pypi.python.org/pypi/uncompyle6"
+HOMEPAGE="https://github.com/rocky/python-uncompyle6/ https://pypi.org/project/uncompyle6"
 SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/unicodecsv/unicodecsv-0.14.1.ebuild b/dev-python/unicodecsv/unicodecsv-0.14.1.ebuild
index 6656408e855f6..e0b1b60c7f0f5 100644
--- a/dev-python/unicodecsv/unicodecsv-0.14.1.ebuild
+++ b/dev-python/unicodecsv/unicodecsv-0.14.1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy )
 inherit distutils-r1
 
 DESCRIPTION="Drop-in replacement for python stdlib csv module supporting unicode"
-HOMEPAGE="https://pypi.python.org/pypi/unicodecsv https://github.com/jdunck/python-unicodecsv"
+HOMEPAGE="https://pypi.org/project/unicodecsv https://github.com/jdunck/python-unicodecsv"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/unidecode/unidecode-0.04.20.ebuild b/dev-python/unidecode/unidecode-0.04.20.ebuild
index 504d3a69a36fd..cabc6ca3c861a 100644
--- a/dev-python/unidecode/unidecode-0.04.20.ebuild
+++ b/dev-python/unidecode/unidecode-0.04.20.ebuild
@@ -11,7 +11,7 @@ MY_P=${MY_PN}-${PV}
 inherit distutils-r1
 
 DESCRIPTION="Module providing ASCII transliterations of Unicode text"
-HOMEPAGE="https://pypi.python.org/pypi/Unidecode"
+HOMEPAGE="https://pypi.org/project/Unidecode"
 SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
diff --git a/dev-python/unidecode/unidecode-0.04.21.ebuild b/dev-python/unidecode/unidecode-0.04.21.ebuild
index 7aee4702b2c53..98d638a06ebfe 100644
--- a/dev-python/unidecode/unidecode-0.04.21.ebuild
+++ b/dev-python/unidecode/unidecode-0.04.21.ebuild
@@ -11,7 +11,7 @@ MY_P=${MY_PN}-${PV}
 inherit distutils-r1
 
 DESCRIPTION="Module providing ASCII transliterations of Unicode text"
-HOMEPAGE="https://pypi.python.org/pypi/Unidecode"
+HOMEPAGE="https://pypi.org/project/Unidecode"
 SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
diff --git a/dev-python/unidecode/unidecode-1.0.22.ebuild b/dev-python/unidecode/unidecode-1.0.22.ebuild
index 5a5c76b4fc016..69c5af0800531 100644
--- a/dev-python/unidecode/unidecode-1.0.22.ebuild
+++ b/dev-python/unidecode/unidecode-1.0.22.ebuild
@@ -11,7 +11,7 @@ MY_P=${MY_PN}-${PV}
 inherit distutils-r1
 
 DESCRIPTION="Module providing ASCII transliterations of Unicode text"
-HOMEPAGE="https://pypi.python.org/pypi/Unidecode"
+HOMEPAGE="https://pypi.org/project/Unidecode"
 SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
diff --git a/dev-python/unittest-mixins/unittest-mixins-1.3.ebuild b/dev-python/unittest-mixins/unittest-mixins-1.3.ebuild
index 8635d1ee869bb..01a4b4704fe8b 100644
--- a/dev-python/unittest-mixins/unittest-mixins-1.3.ebuild
+++ b/dev-python/unittest-mixins/unittest-mixins-1.3.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy)
 inherit distutils-r1
 
 DESCRIPTION="A set of mixin classes and other helpers for unittest test case classes"
-HOMEPAGE="https://github.com/nedbat/unittest-mixins https://pypi.python.org/pypi/unittest-mixins"
+HOMEPAGE="https://github.com/nedbat/unittest-mixins https://pypi.org/project/unittest-mixins"
 SRC_URI="https://github.com/nedbat/unittest-mixins/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
diff --git a/dev-python/unittest2/unittest2-1.1.0.ebuild b/dev-python/unittest2/unittest2-1.1.0.ebuild
index 8444741135756..3aedc436ab9d3 100644
--- a/dev-python/unittest2/unittest2-1.1.0.ebuild
+++ b/dev-python/unittest2/unittest2-1.1.0.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="The new features in unittest backported to Python 2.4+"
-HOMEPAGE="https://pypi.python.org/pypi/unittest2 https://github.com/testing-cabal/unittest-ext"
+HOMEPAGE="https://pypi.org/project/unittest2 https://github.com/testing-cabal/unittest-ext"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/uritemplate/uritemplate-0.6.ebuild b/dev-python/uritemplate/uritemplate-0.6.ebuild
index 2f4cc9a8132f6..cda0e6878cb4c 100644
--- a/dev-python/uritemplate/uritemplate-0.6.ebuild
+++ b/dev-python/uritemplate/uritemplate-0.6.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="Python implementation of RFC6570, URI Template"
-HOMEPAGE="https://pypi.python.org/pypi/uritemplate"
+HOMEPAGE="https://pypi.org/project/uritemplate"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
diff --git a/dev-python/uritemplate/uritemplate-3.0.0.ebuild b/dev-python/uritemplate/uritemplate-3.0.0.ebuild
index 17aef2cea9d1d..18e2d4005a9a1 100644
--- a/dev-python/uritemplate/uritemplate-3.0.0.ebuild
+++ b/dev-python/uritemplate/uritemplate-3.0.0.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="Python implementation of RFC6570, URI Template"
-HOMEPAGE="https://pypi.python.org/pypi/uritemplate"
+HOMEPAGE="https://pypi.org/project/uritemplate"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
diff --git a/dev-python/urwid/urwid-1.3.1.ebuild b/dev-python/urwid/urwid-1.3.1.ebuild
index 5ef27046c964b..ee4c8d9c8908d 100644
--- a/dev-python/urwid/urwid-1.3.1.ebuild
+++ b/dev-python/urwid/urwid-1.3.1.ebuild
@@ -9,7 +9,7 @@ PYTHON_REQ_USE="ncurses"
 inherit distutils-r1
 
 DESCRIPTION="Curses-based user interface library for Python"
-HOMEPAGE="http://urwid.org/ https://pypi.python.org/pypi/urwid/"
+HOMEPAGE="http://urwid.org/ https://pypi.org/project/urwid/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
diff --git a/dev-python/urwid/urwid-2.0.1.ebuild b/dev-python/urwid/urwid-2.0.1.ebuild
index 1166fc2568b39..c8bfd90b8c4bb 100644
--- a/dev-python/urwid/urwid-2.0.1.ebuild
+++ b/dev-python/urwid/urwid-2.0.1.ebuild
@@ -9,7 +9,7 @@ PYTHON_REQ_USE="ncurses"
 inherit distutils-r1
 
 DESCRIPTION="Curses-based user interface library for Python"
-HOMEPAGE="http://urwid.org/ https://pypi.python.org/pypi/urwid/"
+HOMEPAGE="http://urwid.org/ https://pypi.org/project/urwid/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
diff --git a/dev-python/utmp/utmp-0.4.ebuild b/dev-python/utmp/utmp-0.4.ebuild
index 28a5559708728..c6de2802110aa 100644
--- a/dev-python/utmp/utmp-0.4.ebuild
+++ b/dev-python/utmp/utmp-0.4.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{3_4,3_5} )
 inherit distutils-r1
 
 DESCRIPTION="utmp/wtmp reader"
-HOMEPAGE="https://pypi.python.org/pypi/utmp https://srcco.de/"
+HOMEPAGE="https://pypi.org/project/utmp https://srcco.de/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
diff --git a/dev-python/vatnumber/vatnumber-1.1-r1.ebuild b/dev-python/vatnumber/vatnumber-1.1-r1.ebuild
index 88d6a393a51ea..c3c287524f3ca 100644
--- a/dev-python/vatnumber/vatnumber-1.1-r1.ebuild
+++ b/dev-python/vatnumber/vatnumber-1.1-r1.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 )
 inherit distutils-r1
 
 DESCRIPTION="Module to validate VAT numbers"
-HOMEPAGE="https://pypi.python.org/pypi/vatnumber/"
+HOMEPAGE="https://pypi.org/project/vatnumber/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
diff --git a/dev-python/vcversioner/vcversioner-2.16.0.0.ebuild b/dev-python/vcversioner/vcversioner-2.16.0.0.ebuild
index 777fd7e224fb4..4b4f649436199 100644
--- a/dev-python/vcversioner/vcversioner-2.16.0.0.ebuild
+++ b/dev-python/vcversioner/vcversioner-2.16.0.0.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="Use version control tags to discover version numbers"
-HOMEPAGE="https://github.com/habnabit/vcversioner https://pypi.python.org/pypi/vcversioner"
+HOMEPAGE="https://github.com/habnabit/vcversioner https://pypi.org/project/vcversioner"
 SRC_URI="mirror://pypi/v/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/verboselogs/verboselogs-1.6.ebuild b/dev-python/verboselogs/verboselogs-1.6.ebuild
index 19a63f142f970..f3b0f87a47bd4 100644
--- a/dev-python/verboselogs/verboselogs-1.6.ebuild
+++ b/dev-python/verboselogs/verboselogs-1.6.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
 inherit distutils-r1
 
 DESCRIPTION="Verbose logging for Python's logging module"
-HOMEPAGE="https://pypi.python.org/pypi/verboselogs"
+HOMEPAGE="https://pypi.org/project/verboselogs"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
diff --git a/dev-python/versioneer/versioneer-0.16.ebuild b/dev-python/versioneer/versioneer-0.16.ebuild
index 14462c4155ebb..193955102c3bf 100644
--- a/dev-python/versioneer/versioneer-0.16.ebuild
+++ b/dev-python/versioneer/versioneer-0.16.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
 inherit distutils-r1
 
 DESCRIPTION="Easy VCS-based management of project version strings"
-HOMEPAGE="https://pypi.python.org/pypi/versioneer https://github.com/warner/python-versioneer"
+HOMEPAGE="https://pypi.org/project/versioneer https://github.com/warner/python-versioneer"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
diff --git a/dev-python/versiontools/versiontools-1.9.1-r1.ebuild b/dev-python/versiontools/versiontools-1.9.1-r1.ebuild
index a346f2589929c..400a10c149531 100644
--- a/dev-python/versiontools/versiontools-1.9.1-r1.ebuild
+++ b/dev-python/versiontools/versiontools-1.9.1-r1.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5} pypy )
 inherit distutils-r1
 
 DESCRIPTION="Smart replacement for plain tuple used in __version__"
-HOMEPAGE="https://pypi.python.org/pypi/versiontools/ https://launchpad.net/versiontools"
+HOMEPAGE="https://pypi.org/project/versiontools/ https://launchpad.net/versiontools"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 KEYWORDS="amd64 x86"
 IUSE=""
diff --git a/dev-python/vertex/vertex-0.3.0-r1.ebuild b/dev-python/vertex/vertex-0.3.0-r1.ebuild
index d28c67053d4ec..1fbcd4af6057e 100644
--- a/dev-python/vertex/vertex-0.3.0-r1.ebuild
+++ b/dev-python/vertex/vertex-0.3.0-r1.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 )
 inherit twisted-r1
 
 DESCRIPTION="An implementation of the Q2Q protocol"
-HOMEPAGE="https://github.com/twisted/vertex https://pypi.python.org/pypi/Vertex"
+HOMEPAGE="https://github.com/twisted/vertex https://pypi.org/project/Vertex"
 SRC_URI="mirror://pypi/${TWISTED_PN:0:1}/${TWISTED_PN}/${TWISTED_P}.tar.gz"
 
 KEYWORDS="amd64 x86"
diff --git a/dev-python/vertex/vertex-0.3.1-r1.ebuild b/dev-python/vertex/vertex-0.3.1-r1.ebuild
index 2e568be706c79..a59fdf12cc986 100644
--- a/dev-python/vertex/vertex-0.3.1-r1.ebuild
+++ b/dev-python/vertex/vertex-0.3.1-r1.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 )
 inherit twisted-r1
 
 DESCRIPTION="An implementation of the Q2Q protocol"
-HOMEPAGE="https://github.com/twisted/vertex https://pypi.python.org/pypi/Vertex"
+HOMEPAGE="https://github.com/twisted/vertex https://pypi.org/project/Vertex"
 SRC_URI="mirror://pypi/${TWISTED_PN:0:1}/${TWISTED_PN}/${TWISTED_P}.tar.gz"
 
 KEYWORDS="~amd64 ~x86"
diff --git a/dev-python/vine/vine-1.1.3.ebuild b/dev-python/vine/vine-1.1.3.ebuild
index 1681f5c9d99ec..5e16a009d1b5b 100644
--- a/dev-python/vine/vine-1.1.3.ebuild
+++ b/dev-python/vine/vine-1.1.3.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="Python Promises"
-HOMEPAGE="https://pypi.python.org/pypi/vine https://github.com/celery/vine"
+HOMEPAGE="https://pypi.org/project/vine https://github.com/celery/vine"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/virtualenv/virtualenv-15.1.0.ebuild b/dev-python/virtualenv/virtualenv-15.1.0.ebuild
index 493ae2140524b..9aeb33a630260 100644
--- a/dev-python/virtualenv/virtualenv-15.1.0.ebuild
+++ b/dev-python/virtualenv/virtualenv-15.1.0.ebuild
@@ -10,7 +10,7 @@ inherit distutils-r1
 DESCRIPTION="Virtual Python Environment builder"
 HOMEPAGE="
 	https://virtualenv.pypa.io/en/stable/
-	https://pypi.python.org/pypi/virtualenv
+	https://pypi.org/project/virtualenv
 	https://github.com/pypa/virtualenv/
 "
 SRC_URI="https://github.com/pypa/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
diff --git a/dev-python/virtualenvwrapper/virtualenvwrapper-4.7.1.ebuild b/dev-python/virtualenvwrapper/virtualenvwrapper-4.7.1.ebuild
index bcc98199cd422..9aba1b3036522 100644
--- a/dev-python/virtualenvwrapper/virtualenvwrapper-4.7.1.ebuild
+++ b/dev-python/virtualenvwrapper/virtualenvwrapper-4.7.1.ebuild
@@ -9,7 +9,7 @@ inherit distutils-r1
 
 DESCRIPTION="Set of extensions to Ian Bicking's virtualenv tool"
 HOMEPAGE="http://www.doughellmann.com/projects/virtualenvwrapper
-	https://pypi.python.org/pypi/virtualenvwrapper"
+	https://pypi.org/project/virtualenvwrapper"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/virtualenvwrapper/virtualenvwrapper-4.8.2.ebuild b/dev-python/virtualenvwrapper/virtualenvwrapper-4.8.2.ebuild
index b2229273737bb..f91c0cde91609 100644
--- a/dev-python/virtualenvwrapper/virtualenvwrapper-4.8.2.ebuild
+++ b/dev-python/virtualenvwrapper/virtualenvwrapper-4.8.2.ebuild
@@ -9,7 +9,7 @@ inherit distutils-r1
 
 DESCRIPTION="Set of extensions to Ian Bicking's virtualenv tool"
 HOMEPAGE="https://bitbucket.org/dhellmann/virtualenvwrapper
-	https://pypi.python.org/pypi/virtualenvwrapper"
+	https://pypi.org/project/virtualenvwrapper"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/vobject/vobject-0.9.3.ebuild b/dev-python/vobject/vobject-0.9.3.ebuild
index 3ac69355122b0..fef87b7c6b14e 100644
--- a/dev-python/vobject/vobject-0.9.3.ebuild
+++ b/dev-python/vobject/vobject-0.9.3.ebuild
@@ -8,7 +8,7 @@ inherit distutils-r1
 
 DESCRIPTION="Python package for parsing and generating vCard and vCalendar files"
 HOMEPAGE="http://eventable.github.io/vobject/
-	https://pypi.python.org/pypi/vobject
+	https://pypi.org/project/vobject
 	https://github.com/eventable/vobject"
 SRC_URI="https://github.com/eventable/vobject/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
diff --git a/dev-python/vobject/vobject-0.9.5.ebuild b/dev-python/vobject/vobject-0.9.5.ebuild
index 18b00caafacc4..0ea2d2e849f80 100644
--- a/dev-python/vobject/vobject-0.9.5.ebuild
+++ b/dev-python/vobject/vobject-0.9.5.ebuild
@@ -8,7 +8,7 @@ inherit distutils-r1
 
 DESCRIPTION="Python package for parsing and generating vCard and vCalendar files"
 HOMEPAGE="http://eventable.github.io/vobject/
-	https://pypi.python.org/pypi/vobject
+	https://pypi.org/project/vobject
 	https://github.com/eventable/vobject"
 SRC_URI="https://github.com/eventable/vobject/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
diff --git a/dev-python/vpython/vpython-7.4.2.ebuild b/dev-python/vpython/vpython-7.4.2.ebuild
index f5ba2ba317a70..242bea8fdc7c0 100644
--- a/dev-python/vpython/vpython-7.4.2.ebuild
+++ b/dev-python/vpython/vpython-7.4.2.ebuild
@@ -6,7 +6,7 @@ PYTHON_COMPAT=( python{2_7,3_5,3_6} )
 inherit distutils-r1
 
 DESCRIPTION="VPython for Jupyter notebook"
-HOMEPAGE="http://www.vpython.org/ https://pypi.python.org/pypi/vpython/"
+HOMEPAGE="http://www.vpython.org/ https://pypi.org/project/vpython/"
 SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 DEPEND="dev-python/cython[${PYTHON_USEDEP}]
 	dev-python/versioneer[${PYTHON_USEDEP}]
diff --git a/dev-python/vulture/vulture-0.10.ebuild b/dev-python/vulture/vulture-0.10.ebuild
index ed993b7fea138..33d0bca790463 100644
--- a/dev-python/vulture/vulture-0.10.ebuild
+++ b/dev-python/vulture/vulture-0.10.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
 inherit distutils-r1
 
 DESCRIPTION="find unused classes, functions and variables in your code"
-HOMEPAGE="https://bitbucket.org/jendrikseipp/vulture https://pypi.python.org/pypi/vulture"
+HOMEPAGE="https://bitbucket.org/jendrikseipp/vulture https://pypi.org/project/vulture"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3+"
diff --git a/dev-python/waitress/waitress-1.0.1.ebuild b/dev-python/waitress/waitress-1.0.1.ebuild
index 57c1238d5331a..3a99c57754a60 100644
--- a/dev-python/waitress/waitress-1.0.1.ebuild
+++ b/dev-python/waitress/waitress-1.0.1.ebuild
@@ -9,7 +9,7 @@ inherit distutils-r1
 
 DESCRIPTION="A pure-Python WSGI server"
 HOMEPAGE="https://docs.pylonsproject.org/projects/waitress/en/latest/
-	https://pypi.python.org/pypi/waitress/
+	https://pypi.org/project/waitress/
 	https://github.com/Pylons/waitress"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
diff --git a/dev-python/waitress/waitress-1.0.2.ebuild b/dev-python/waitress/waitress-1.0.2.ebuild
index 784b10da1ce96..73232710f7f33 100644
--- a/dev-python/waitress/waitress-1.0.2.ebuild
+++ b/dev-python/waitress/waitress-1.0.2.ebuild
@@ -9,7 +9,7 @@ inherit distutils-r1
 
 DESCRIPTION="A pure-Python WSGI server"
 HOMEPAGE="https://docs.pylonsproject.org/projects/waitress/en/latest/
-	https://pypi.python.org/pypi/waitress/
+	https://pypi.org/project/waitress/
 	https://github.com/Pylons/waitress"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
diff --git a/dev-python/wcwidth/wcwidth-0.1.7-r1.ebuild b/dev-python/wcwidth/wcwidth-0.1.7-r1.ebuild
index 1cc85cf5dc9d3..ca6f6b62186f5 100644
--- a/dev-python/wcwidth/wcwidth-0.1.7-r1.ebuild
+++ b/dev-python/wcwidth/wcwidth-0.1.7-r1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
 inherit distutils-r1
 
 DESCRIPTION="Measures number of Terminal column cells of wide-character codes"
-HOMEPAGE="https://pypi.python.org/pypi/wcwidth/ https://github.com/jquast/wcwidth"
+HOMEPAGE="https://pypi.org/project/wcwidth/ https://github.com/jquast/wcwidth"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
diff --git a/dev-python/wcwidth/wcwidth-0.1.7.ebuild b/dev-python/wcwidth/wcwidth-0.1.7.ebuild
index a9351170f80f9..6bf84f0c1be7d 100644
--- a/dev-python/wcwidth/wcwidth-0.1.7.ebuild
+++ b/dev-python/wcwidth/wcwidth-0.1.7.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5} )
 inherit distutils-r1
 
 DESCRIPTION="Measures number of Terminal column cells of wide-character codes"
-HOMEPAGE="https://pypi.python.org/pypi/wcwidth/ https://github.com/jquast/wcwidth"
+HOMEPAGE="https://pypi.org/project/wcwidth/ https://github.com/jquast/wcwidth"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
diff --git a/dev-python/webcolors/webcolors-1.5.ebuild b/dev-python/webcolors/webcolors-1.5.ebuild
index 66426ea581c05..08e99284930ec 100644
--- a/dev-python/webcolors/webcolors-1.5.ebuild
+++ b/dev-python/webcolors/webcolors-1.5.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="Color names and value formats defined by the HTML and CSS specifications"
-HOMEPAGE="https://pypi.python.org/pypi/webcolors https://github.com/ubernostrum/webcolors"
+HOMEPAGE="https://pypi.org/project/webcolors https://github.com/ubernostrum/webcolors"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
diff --git a/dev-python/webencodings/webencodings-0.5.1.ebuild b/dev-python/webencodings/webencodings-0.5.1.ebuild
index 6bab989d36cce..2cd5dc35c6704 100644
--- a/dev-python/webencodings/webencodings-0.5.1.ebuild
+++ b/dev-python/webencodings/webencodings-0.5.1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="Character encoding aliases for legacy web content"
-HOMEPAGE="https://github.com/SimonSapin/python-webencodings https://pypi.python.org/pypi/webencodings"
+HOMEPAGE="https://github.com/SimonSapin/python-webencodings https://pypi.org/project/webencodings"
 SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/weberror/weberror-0.13.1.ebuild b/dev-python/weberror/weberror-0.13.1.ebuild
index 953c7a3a8127d..66d03a364389f 100644
--- a/dev-python/weberror/weberror-0.13.1.ebuild
+++ b/dev-python/weberror/weberror-0.13.1.ebuild
@@ -11,7 +11,7 @@ MY_PN="WebError"
 MY_P="${MY_PN}-${PV}"
 
 DESCRIPTION="Web Error handling and exception catching"
-HOMEPAGE="https://pypi.python.org/pypi/WebError"
+HOMEPAGE="https://pypi.org/project/WebError"
 SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/webhelpers/webhelpers-1.3-r1.ebuild b/dev-python/webhelpers/webhelpers-1.3-r1.ebuild
index 5e0c9ea81ae32..aa60ee750ae2d 100644
--- a/dev-python/webhelpers/webhelpers-1.3-r1.ebuild
+++ b/dev-python/webhelpers/webhelpers-1.3-r1.ebuild
@@ -11,7 +11,7 @@ MY_P="${MY_PN}-${PV}"
 
 DESCRIPTION="Web Helpers"
 HOMEPAGE="https://docs.pylonsproject.org/projects/webhelpers/en/latest/
-	https://pypi.python.org/pypi/WebHelpers"
+	https://pypi.org/project/WebHelpers"
 SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/webob/webob-1.7.3.ebuild b/dev-python/webob/webob-1.7.3.ebuild
index 560db4eeab6a5..a5ca5a16d8188 100644
--- a/dev-python/webob/webob-1.7.3.ebuild
+++ b/dev-python/webob/webob-1.7.3.ebuild
@@ -11,7 +11,7 @@ MY_PN=WebOb
 MY_P=${MY_PN}-${PV}
 
 DESCRIPTION="WSGI request and response object"
-HOMEPAGE="https://webob.org/ https://pypi.python.org/pypi/WebOb"
+HOMEPAGE="https://webob.org/ https://pypi.org/project/WebOb"
 SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/webob/webob-1.7.4.ebuild b/dev-python/webob/webob-1.7.4.ebuild
index 560db4eeab6a5..a5ca5a16d8188 100644
--- a/dev-python/webob/webob-1.7.4.ebuild
+++ b/dev-python/webob/webob-1.7.4.ebuild
@@ -11,7 +11,7 @@ MY_PN=WebOb
 MY_P=${MY_PN}-${PV}
 
 DESCRIPTION="WSGI request and response object"
-HOMEPAGE="https://webob.org/ https://pypi.python.org/pypi/WebOb"
+HOMEPAGE="https://webob.org/ https://pypi.org/project/WebOb"
 SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/webpy/webpy-0.37-r1.ebuild b/dev-python/webpy/webpy-0.37-r1.ebuild
index 8eed9a508f47f..3bf4f527e20a5 100644
--- a/dev-python/webpy/webpy-0.37-r1.ebuild
+++ b/dev-python/webpy/webpy-0.37-r1.ebuild
@@ -9,7 +9,7 @@ inherit distutils-r1
 MY_PN="web.py"
 
 DESCRIPTION="A small and simple web framework for Python"
-HOMEPAGE="http://www.webpy.org https://pypi.python.org/pypi/web.py"
+HOMEPAGE="http://www.webpy.org https://pypi.org/project/web.py"
 SRC_URI="http://www.webpy.org/static/${MY_PN}-${PV}.tar.gz"
 
 LICENSE="public-domain"
diff --git a/dev-python/webpy/webpy-0.38.ebuild b/dev-python/webpy/webpy-0.38.ebuild
index f289a598c0813..bc64092e163b2 100644
--- a/dev-python/webpy/webpy-0.38.ebuild
+++ b/dev-python/webpy/webpy-0.38.ebuild
@@ -10,7 +10,7 @@ inherit distutils-r1
 MY_PN="web.py"
 
 DESCRIPTION="A small and simple web framework for Python"
-HOMEPAGE="http://www.webpy.org https://pypi.python.org/pypi/web.py"
+HOMEPAGE="http://www.webpy.org https://pypi.org/project/web.py"
 SRC_URI="http://www.webpy.org/static/${MY_PN}-${PV}.tar.gz"
 
 LICENSE="public-domain"
diff --git a/dev-python/webtest/webtest-2.0.21.ebuild b/dev-python/webtest/webtest-2.0.21.ebuild
index 3e49691c6db6c..9cde0cc47c47e 100644
--- a/dev-python/webtest/webtest-2.0.21.ebuild
+++ b/dev-python/webtest/webtest-2.0.21.ebuild
@@ -11,7 +11,7 @@ MY_PN="WebTest"
 MY_P="${MY_PN}-${PV}"
 
 DESCRIPTION="Helper to test WSGI applications"
-HOMEPAGE="https://pypi.python.org/pypi/WebTest"
+HOMEPAGE="https://pypi.org/project/WebTest"
 SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/webtest/webtest-2.0.29.ebuild b/dev-python/webtest/webtest-2.0.29.ebuild
index a891f5791bf40..033f5ca884063 100644
--- a/dev-python/webtest/webtest-2.0.29.ebuild
+++ b/dev-python/webtest/webtest-2.0.29.ebuild
@@ -11,7 +11,7 @@ MY_PN="WebTest"
 MY_P="${MY_PN}-${PV}"
 
 DESCRIPTION="Helper to test WSGI applications"
-HOMEPAGE="https://pypi.python.org/pypi/WebTest"
+HOMEPAGE="https://pypi.org/project/WebTest"
 SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/werkzeug/werkzeug-0.12.2.ebuild b/dev-python/werkzeug/werkzeug-0.12.2.ebuild
index 257a868ec10f8..549e7115bfee5 100644
--- a/dev-python/werkzeug/werkzeug-0.12.2.ebuild
+++ b/dev-python/werkzeug/werkzeug-0.12.2.ebuild
@@ -11,7 +11,7 @@ MY_PN="Werkzeug"
 MY_P="${MY_PN}-${PV}"
 
 DESCRIPTION="Collection of various utilities for WSGI applications"
-HOMEPAGE="http://werkzeug.pocoo.org/ https://pypi.python.org/pypi/Werkzeug https://github.com/pallets/werkzeug"
+HOMEPAGE="http://werkzeug.pocoo.org/ https://pypi.org/project/Werkzeug https://github.com/pallets/werkzeug"
 SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/wheel/wheel-0.29.0.ebuild b/dev-python/wheel/wheel-0.29.0.ebuild
index 03eeda4845d1f..d910d2ba49556 100644
--- a/dev-python/wheel/wheel-0.29.0.ebuild
+++ b/dev-python/wheel/wheel-0.29.0.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
 inherit distutils-r1 eutils
 
 DESCRIPTION="A built-package format for Python"
-HOMEPAGE="https://pypi.python.org/pypi/wheel"
+HOMEPAGE="https://pypi.org/project/wheel"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/wheel/wheel-0.30.0.ebuild b/dev-python/wheel/wheel-0.30.0.ebuild
index aeb0a62efc730..079b89ceada2b 100644
--- a/dev-python/wheel/wheel-0.30.0.ebuild
+++ b/dev-python/wheel/wheel-0.30.0.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
 inherit distutils-r1 eutils
 
 DESCRIPTION="A built-package format for Python"
-HOMEPAGE="https://pypi.python.org/pypi/wheel"
+HOMEPAGE="https://pypi.org/project/wheel"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/whelk/whelk-2.7.1.ebuild b/dev-python/whelk/whelk-2.7.1.ebuild
index 62139f41888cf..bf4cadcfdeb43 100644
--- a/dev-python/whelk/whelk-2.7.1.ebuild
+++ b/dev-python/whelk/whelk-2.7.1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
 inherit distutils-r1
 
 DESCRIPTION="Pretending python is a shell"
-HOMEPAGE="https://pypi.python.org/pypi/whelk"
+HOMEPAGE="https://pypi.org/project/whelk"
 SRC_URI="https://github.com/seveas/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/whoosh/whoosh-2.6.0.ebuild b/dev-python/whoosh/whoosh-2.6.0.ebuild
index 8b6cf2e997a81..cc1a0db32fe6f 100644
--- a/dev-python/whoosh/whoosh-2.6.0.ebuild
+++ b/dev-python/whoosh/whoosh-2.6.0.ebuild
@@ -10,7 +10,7 @@ MY_PN="Whoosh"
 inherit distutils-r1
 
 DESCRIPTION="Fast, pure-Python full text indexing, search and spell checking library"
-HOMEPAGE="https://bitbucket.org/mchaput/whoosh/wiki/Home/ https://pypi.python.org/pypi/Whoosh/"
+HOMEPAGE="https://bitbucket.org/mchaput/whoosh/wiki/Home/ https://pypi.org/project/Whoosh/"
 SRC_URI="mirror://pypi/W/${MY_PN}/${MY_PN}-${PV}.zip"
 
 DEPEND="app-arch/unzip
diff --git a/dev-python/whoosh/whoosh-2.7.4.ebuild b/dev-python/whoosh/whoosh-2.7.4.ebuild
index d8b11488ca043..b1259e20cc304 100644
--- a/dev-python/whoosh/whoosh-2.7.4.ebuild
+++ b/dev-python/whoosh/whoosh-2.7.4.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy{,3} )
 inherit distutils-r1
 
 DESCRIPTION="Fast, pure-Python full text indexing, search and spell checking library"
-HOMEPAGE="https://bitbucket.org/mchaput/whoosh/wiki/Home/ https://pypi.python.org/pypi/Whoosh/"
+HOMEPAGE="https://bitbucket.org/mchaput/whoosh/wiki/Home/ https://pypi.org/project/Whoosh/"
 SRC_URI="mirror://pypi/W/${PN^}/${P^}.tar.gz"
 
 LICENSE="BSD-2"
diff --git a/dev-python/wsaccel/wsaccel-0.6.2_p20170108.ebuild b/dev-python/wsaccel/wsaccel-0.6.2_p20170108.ebuild
index 3c81271ea2aec..0a46f32f3e099 100644
--- a/dev-python/wsaccel/wsaccel-0.6.2_p20170108.ebuild
+++ b/dev-python/wsaccel/wsaccel-0.6.2_p20170108.ebuild
@@ -9,7 +9,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
 inherit distutils-r1
 
 DESCRIPTION="Accelerator for ws4py, autobahn and tornado"
-HOMEPAGE="https://pypi.python.org/pypi/wsaccel https://github.com/methane/wsaccel"
+HOMEPAGE="https://pypi.org/project/wsaccel https://github.com/methane/wsaccel"
 SRC_URI="https://github.com/methane/wsaccel/archive/${COMMIT}.zip -> ${P}.zip"
 
 SLOT="0"
diff --git a/dev-python/wsgilog/wsgilog-0.3-r1.ebuild b/dev-python/wsgilog/wsgilog-0.3-r1.ebuild
index c88488e6fc53e..96f6b2c4c7942 100644
--- a/dev-python/wsgilog/wsgilog-0.3-r1.ebuild
+++ b/dev-python/wsgilog/wsgilog-0.3-r1.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 pypy )
 inherit distutils-r1
 
 DESCRIPTION="Class for logging in WSGI-applications"
-HOMEPAGE="https://pypi.python.org/pypi/wsgilog/"
+HOMEPAGE="https://pypi.org/project/wsgilog/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/wsgiproxy2/wsgiproxy2-0.4.2.ebuild b/dev-python/wsgiproxy2/wsgiproxy2-0.4.2.ebuild
index 3f8ed4a718729..5014d130572fc 100644
--- a/dev-python/wsgiproxy2/wsgiproxy2-0.4.2.ebuild
+++ b/dev-python/wsgiproxy2/wsgiproxy2-0.4.2.ebuild
@@ -10,7 +10,7 @@ inherit distutils-r1
 MY_PN="WSGIProxy2"
 
 DESCRIPTION="HTTP proxying tools for WSGI apps"
-HOMEPAGE="https://pypi.python.org/pypi/WSGIProxy2"
+HOMEPAGE="https://pypi.org/project/WSGIProxy2"
 SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.zip"
 
 LICENSE="MIT"
diff --git a/dev-python/wsgiproxy2/wsgiproxy2-0.4.4.ebuild b/dev-python/wsgiproxy2/wsgiproxy2-0.4.4.ebuild
index 6f8278604c1b8..8559e8f5dd4f8 100644
--- a/dev-python/wsgiproxy2/wsgiproxy2-0.4.4.ebuild
+++ b/dev-python/wsgiproxy2/wsgiproxy2-0.4.4.ebuild
@@ -10,7 +10,7 @@ inherit distutils-r1
 MY_PN="WSGIProxy2"
 
 DESCRIPTION="HTTP proxying tools for WSGI apps"
-HOMEPAGE="https://pypi.python.org/pypi/WSGIProxy2"
+HOMEPAGE="https://pypi.org/project/WSGIProxy2"
 SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/wstools/wstools-0.4.3.ebuild b/dev-python/wstools/wstools-0.4.3.ebuild
index 6558e784e6fc9..a692f0bd919be 100644
--- a/dev-python/wstools/wstools-0.4.3.ebuild
+++ b/dev-python/wstools/wstools-0.4.3.ebuild
@@ -9,7 +9,7 @@ PYTHON_REQ_USE="xml(+)"
 inherit distutils-r1
 
 DESCRIPTION="WSDL parsing services package for Web Services for Python"
-HOMEPAGE="https://github.com/kiorky/wstools https://pypi.python.org/pypi/wstools"
+HOMEPAGE="https://github.com/kiorky/wstools https://pypi.org/project/wstools"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/wstools/wstools-0.4.5-r1.ebuild b/dev-python/wstools/wstools-0.4.5-r1.ebuild
index 1b12cdcb427bf..9f3b8161e26d1 100644
--- a/dev-python/wstools/wstools-0.4.5-r1.ebuild
+++ b/dev-python/wstools/wstools-0.4.5-r1.ebuild
@@ -9,7 +9,7 @@ PYTHON_REQ_USE="xml(+)"
 inherit distutils-r1
 
 DESCRIPTION="WSDL parsing services package for Web Services for Python"
-HOMEPAGE="https://github.com/kiorky/wstools https://pypi.python.org/pypi/wstools"
+HOMEPAGE="https://github.com/kiorky/wstools https://pypi.org/project/wstools"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/wtforms/wtforms-2.1.ebuild b/dev-python/wtforms/wtforms-2.1.ebuild
index f3f868242f83f..37cdcd1fe7594 100644
--- a/dev-python/wtforms/wtforms-2.1.ebuild
+++ b/dev-python/wtforms/wtforms-2.1.ebuild
@@ -11,7 +11,7 @@ MY_PN="WTForms"
 MY_P="${MY_PN}-${PV}"
 
 DESCRIPTION="Flexible forms validation and rendering library for python web development"
-HOMEPAGE="http://wtforms.simplecodes.com/ https://pypi.python.org/pypi/WTForms"
+HOMEPAGE="http://wtforms.simplecodes.com/ https://pypi.org/project/WTForms"
 SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.zip"
 
 LICENSE="BSD"
diff --git a/dev-python/xdis/xdis-3.3.1.ebuild b/dev-python/xdis/xdis-3.3.1.ebuild
index 85750f5bc90ab..32b82c03252f4 100644
--- a/dev-python/xdis/xdis-3.3.1.ebuild
+++ b/dev-python/xdis/xdis-3.3.1.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy)
 inherit distutils-r1
 
 DESCRIPTION="Python cross-version byte-code disassembler and marshal routines"
-HOMEPAGE="https://github.com/rocky/python-xdis/ https://pypi.python.org/pypi/xdis"
+HOMEPAGE="https://github.com/rocky/python-xdis/ https://pypi.org/project/xdis"
 SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
diff --git a/dev-python/xdis/xdis-3.6.0.ebuild b/dev-python/xdis/xdis-3.6.0.ebuild
index 587faf12da9b0..17a0964cc0c79 100644
--- a/dev-python/xdis/xdis-3.6.0.ebuild
+++ b/dev-python/xdis/xdis-3.6.0.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy)
 inherit distutils-r1
 
 DESCRIPTION="Python cross-version byte-code disassembler and marshal routines"
-HOMEPAGE="https://github.com/rocky/python-xdis/ https://pypi.python.org/pypi/xdis"
+HOMEPAGE="https://github.com/rocky/python-xdis/ https://pypi.org/project/xdis"
 # bad pypi source tarball - test failures
 #SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 SRC_URI="https://github.com/rocky/python-xdis/archive/release-${PV}.tar.gz -> ${P}.tar.gz"
diff --git a/dev-python/xlsxwriter/xlsxwriter-0.7.8.ebuild b/dev-python/xlsxwriter/xlsxwriter-0.7.8.ebuild
index 30ac84f26f1ed..9bc8c0b780b7e 100644
--- a/dev-python/xlsxwriter/xlsxwriter-0.7.8.ebuild
+++ b/dev-python/xlsxwriter/xlsxwriter-0.7.8.ebuild
@@ -11,7 +11,7 @@ MY_PN="XlsxWriter"
 MY_P="${MY_PN}-${PV}"
 
 DESCRIPTION="Python module for creating Excel XLSX files"
-HOMEPAGE="https://pypi.python.org/pypi/XlsxWriter https://github.com/jmcnamara/XlsxWriter"
+HOMEPAGE="https://pypi.org/project/XlsxWriter https://github.com/jmcnamara/XlsxWriter"
 SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 SLOT="0"
diff --git a/dev-python/xlutils/xlutils-1.7.1.ebuild b/dev-python/xlutils/xlutils-1.7.1.ebuild
index d72a7b0055204..af43090b60926 100644
--- a/dev-python/xlutils/xlutils-1.7.1.ebuild
+++ b/dev-python/xlutils/xlutils-1.7.1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 )
 inherit distutils-r1
 
 DESCRIPTION="provides a collection of utilities for working with Excel files"
-HOMEPAGE="https://pypi.python.org/pypi/xlutils"
+HOMEPAGE="https://pypi.org/project/xlutils"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
diff --git a/dev-python/xlwt/xlwt-1.0.0.ebuild b/dev-python/xlwt/xlwt-1.0.0.ebuild
index e1cf8b4b0a5d3..e38e8b65da2e5 100644
--- a/dev-python/xlwt/xlwt-1.0.0.ebuild
+++ b/dev-python/xlwt/xlwt-1.0.0.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5} pypy )
 inherit distutils-r1
 
 DESCRIPTION="Python library to create spreadsheet files compatible with Excel"
-HOMEPAGE="https://pypi.python.org/pypi/xlwt"
+HOMEPAGE="https://pypi.org/project/xlwt"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/xlwt/xlwt-1.2.0.ebuild b/dev-python/xlwt/xlwt-1.2.0.ebuild
index 5f532ce619083..fc93998d388b3 100644
--- a/dev-python/xlwt/xlwt-1.2.0.ebuild
+++ b/dev-python/xlwt/xlwt-1.2.0.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
 inherit distutils-r1
 
 DESCRIPTION="Python library to create spreadsheet files compatible with Excel"
-HOMEPAGE="https://pypi.python.org/pypi/xlwt"
+HOMEPAGE="https://pypi.org/project/xlwt"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/xmltodict/xmltodict-0.11.0.ebuild b/dev-python/xmltodict/xmltodict-0.11.0.ebuild
index 66d3a13de164f..988861cb9114b 100644
--- a/dev-python/xmltodict/xmltodict-0.11.0.ebuild
+++ b/dev-python/xmltodict/xmltodict-0.11.0.ebuild
@@ -6,7 +6,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="Makes working with XML feel like you are working with JSON"
-HOMEPAGE="https://github.com/martinblech/xmltodict/ https://pypi.python.org/pypi/xmltodict/"
+HOMEPAGE="https://github.com/martinblech/xmltodict/ https://pypi.org/project/xmltodict/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/xonsh/xonsh-0.2.6.ebuild b/dev-python/xonsh/xonsh-0.2.6.ebuild
index 4d9800c9afbb8..689ad36962f37 100644
--- a/dev-python/xonsh/xonsh-0.2.6.ebuild
+++ b/dev-python/xonsh/xonsh-0.2.6.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="An exotic, usable shell"
 HOMEPAGE="
 	http://xonsh.readthedocs.org/
 	https://github.com/scopatz/xonsh
-	http://pypi.python.org/pypi/xonsh"
+	http://pypi.org/project/xonsh"
 SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/xonsh/xonsh-0.4.4.ebuild b/dev-python/xonsh/xonsh-0.4.4.ebuild
index 28939bb06e71a..85b5a963236c8 100644
--- a/dev-python/xonsh/xonsh-0.4.4.ebuild
+++ b/dev-python/xonsh/xonsh-0.4.4.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="An exotic, usable shell"
 HOMEPAGE="
 	http://xonsh.readthedocs.org/
 	https://github.com/scopatz/xonsh
-	http://pypi.python.org/pypi/xonsh"
+	http://pypi.org/project/xonsh"
 SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/xonsh/xonsh-0.4.7.ebuild b/dev-python/xonsh/xonsh-0.4.7.ebuild
index 56fb478344b0a..0c93f172582a3 100644
--- a/dev-python/xonsh/xonsh-0.4.7.ebuild
+++ b/dev-python/xonsh/xonsh-0.4.7.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="An exotic, usable shell"
 HOMEPAGE="
 	http://xonsh.readthedocs.org/
 	https://github.com/scopatz/xonsh
-	http://pypi.python.org/pypi/xonsh"
+	http://pypi.org/project/xonsh"
 SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/xvfbwrapper/xvfbwrapper-0.2.8.ebuild b/dev-python/xvfbwrapper/xvfbwrapper-0.2.8.ebuild
index 616bea061751c..bc2d03e138968 100644
--- a/dev-python/xvfbwrapper/xvfbwrapper-0.2.8.ebuild
+++ b/dev-python/xvfbwrapper/xvfbwrapper-0.2.8.ebuild
@@ -8,7 +8,7 @@ inherit distutils-r1
 
 DESCRIPTION="Python wrapper for running a display inside X virtual framebuffer"
 HOMEPAGE="https://github.com/cgoldberg/xvfbwrapper
-	https://pypi.python.org/pypi/xvfbwrapper"
+	https://pypi.org/project/xvfbwrapper"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/yolk-portage/yolk-portage-0.1-r1.ebuild b/dev-python/yolk-portage/yolk-portage-0.1-r1.ebuild
index 4501d1b47b552..85e461d3f9038 100644
--- a/dev-python/yolk-portage/yolk-portage-0.1-r1.ebuild
+++ b/dev-python/yolk-portage/yolk-portage-0.1-r1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 pypy )
 inherit distutils-r1
 
 DESCRIPTION="Gentoo Portage plugin for yolk"
-HOMEPAGE="https://pypi.python.org/pypi/yolk-portage"
+HOMEPAGE="https://pypi.org/project/yolk-portage"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
diff --git a/dev-python/yolk/yolk-0.4.3-r1.ebuild b/dev-python/yolk/yolk-0.4.3-r1.ebuild
index cf3f68bfa0d6b..070cd8fad4070 100644
--- a/dev-python/yolk/yolk-0.4.3-r1.ebuild
+++ b/dev-python/yolk/yolk-0.4.3-r1.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 pypy )
 inherit distutils-r1
 
 DESCRIPTION="Tool and library for querying PyPI and locally installed Python packages"
-HOMEPAGE="https://pypi.python.org/pypi/yolk"
+HOMEPAGE="https://pypi.org/project/yolk"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
diff --git a/dev-python/zbase32/zbase32-1.1.5.ebuild b/dev-python/zbase32/zbase32-1.1.5.ebuild
index 63d63482870c4..bcf6a9668919a 100644
--- a/dev-python/zbase32/zbase32-1.1.5.ebuild
+++ b/dev-python/zbase32/zbase32-1.1.5.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 )
 inherit distutils-r1
 
 DESCRIPTION="base32 encoder/decoder (not RFC 3548 compliant)"
-HOMEPAGE="https://pypi.python.org/pypi/zbase32"
+HOMEPAGE="https://pypi.org/project/zbase32"
 SRC_URI="mirror://pypi/z/zbase32/zbase32-${PV}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/zc-buildout/zc-buildout-2.5.3-r1.ebuild b/dev-python/zc-buildout/zc-buildout-2.5.3-r1.ebuild
index fe4f6403f55cd..c5299f1c73d0c 100644
--- a/dev-python/zc-buildout/zc-buildout-2.5.3-r1.ebuild
+++ b/dev-python/zc-buildout/zc-buildout-2.5.3-r1.ebuild
@@ -10,7 +10,7 @@ MY_PN="${PN/-/.}"
 MY_P=${MY_PN}-${PV}
 
 DESCRIPTION="System for managing development buildouts"
-HOMEPAGE="https://pypi.python.org/pypi/zc.buildout"
+HOMEPAGE="https://pypi.org/project/zc.buildout"
 SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="ZPL"
diff --git a/dev-python/zeroconf/zeroconf-0.19.1.ebuild b/dev-python/zeroconf/zeroconf-0.19.1.ebuild
index b296885d58a59..ea21c5949fb48 100644
--- a/dev-python/zeroconf/zeroconf-0.19.1.ebuild
+++ b/dev-python/zeroconf/zeroconf-0.19.1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_{4,5,6}} pypy pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="Pure Python Multicast DNS Service Discovery Library (Bonjour/Avahi compatible)"
-HOMEPAGE="https://github.com/jstasiak/python-zeroconf https://pypi.python.org/pypi/zeroconf"
+HOMEPAGE="https://github.com/jstasiak/python-zeroconf https://pypi.org/project/zeroconf"
 SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
diff --git a/dev-python/zfec/zfec-1.4.24.ebuild b/dev-python/zfec/zfec-1.4.24.ebuild
index 5e5446f1cb133..e3ecb6cd8473f 100644
--- a/dev-python/zfec/zfec-1.4.24.ebuild
+++ b/dev-python/zfec/zfec-1.4.24.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 )
 inherit distutils-r1
 
 DESCRIPTION="Fast erasure codec for the command-line, C, Python, or Haskell"
-HOMEPAGE="https://pypi.python.org/pypi/zfec"
+HOMEPAGE="https://pypi.org/project/zfec"
 SRC_URI="mirror://pypi/z/zfec/zfec-${PV}.tar.gz"
 
 LICENSE="GPL-2"
diff --git a/dev-python/zope-exceptions/zope-exceptions-4.1.0.ebuild b/dev-python/zope-exceptions/zope-exceptions-4.1.0.ebuild
index 976197f62dec3..ca5dd7b40dda7 100644
--- a/dev-python/zope-exceptions/zope-exceptions-4.1.0.ebuild
+++ b/dev-python/zope-exceptions/zope-exceptions-4.1.0.ebuild
@@ -10,7 +10,7 @@ MY_PN=${PN/-/.}
 MY_P=${MY_PN}-${PV}
 
 DESCRIPTION="General purpose exceptions for Zope packages"
-HOMEPAGE="https://pypi.python.org/pypi/zope.exceptions https://github.com/zopefoundation/zope.exceptions"
+HOMEPAGE="https://pypi.org/project/zope.exceptions https://github.com/zopefoundation/zope.exceptions"
 SRC_URI="mirror://pypi/${MY_PN::1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="ZPL"
diff --git a/dev-python/zope-interface/zope-interface-4.1.1.ebuild b/dev-python/zope-interface/zope-interface-4.1.1.ebuild
index ec68ee6b63da6..667323ec2de1e 100644
--- a/dev-python/zope-interface/zope-interface-4.1.1.ebuild
+++ b/dev-python/zope-interface/zope-interface-4.1.1.ebuild
@@ -10,7 +10,7 @@ MY_PN=${PN/-/.}
 MY_P=${MY_PN}-${PV}
 
 DESCRIPTION="Interfaces for Python"
-HOMEPAGE="https://pypi.python.org/pypi/zope.interface"
+HOMEPAGE="https://pypi.org/project/zope.interface"
 SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="ZPL"
diff --git a/dev-python/zope-interface/zope-interface-4.3.2.ebuild b/dev-python/zope-interface/zope-interface-4.3.2.ebuild
index fd8aac319be4f..878c1917309fc 100644
--- a/dev-python/zope-interface/zope-interface-4.3.2.ebuild
+++ b/dev-python/zope-interface/zope-interface-4.3.2.ebuild
@@ -11,7 +11,7 @@ MY_PN=${PN/-/.}
 MY_P=${MY_PN}-${PV}
 
 DESCRIPTION="Interfaces for Python"
-HOMEPAGE="https://pypi.python.org/pypi/zope.interface https://github.com/zopefoundation/zope.interface"
+HOMEPAGE="https://pypi.org/project/zope.interface https://github.com/zopefoundation/zope.interface"
 SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="ZPL"
diff --git a/dev-python/zope-interface/zope-interface-4.4.3.ebuild b/dev-python/zope-interface/zope-interface-4.4.3.ebuild
index a941bfbf7940b..b2592e66af7da 100644
--- a/dev-python/zope-interface/zope-interface-4.4.3.ebuild
+++ b/dev-python/zope-interface/zope-interface-4.4.3.ebuild
@@ -11,7 +11,7 @@ MY_PN=${PN/-/.}
 MY_P=${MY_PN}-${PV}
 
 DESCRIPTION="Interfaces for Python"
-HOMEPAGE="https://pypi.python.org/pypi/zope.interface https://github.com/zopefoundation/zope.interface"
+HOMEPAGE="https://pypi.org/project/zope.interface https://github.com/zopefoundation/zope.interface"
 SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="ZPL"
diff --git a/dev-python/zope-testing/zope-testing-4.6.2.ebuild b/dev-python/zope-testing/zope-testing-4.6.2.ebuild
index a66cd8e49b12d..5e45a64a247bb 100644
--- a/dev-python/zope-testing/zope-testing-4.6.2.ebuild
+++ b/dev-python/zope-testing/zope-testing-4.6.2.ebuild
@@ -10,7 +10,7 @@ MY_PN=${PN/-/.}
 MY_P=${MY_PN}-${PV}
 
 DESCRIPTION="Zope testing helpers"
-HOMEPAGE="https://pypi.python.org/pypi/zope.testing https://github.com/zopefoundation/zope.testing"
+HOMEPAGE="https://pypi.org/project/zope.testing https://github.com/zopefoundation/zope.testing"
 SRC_URI="mirror://pypi/${MY_PN::1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="ZPL"
diff --git a/dev-python/zope-testrunner/zope-testrunner-4.7.0.ebuild b/dev-python/zope-testrunner/zope-testrunner-4.7.0.ebuild
index 99f2b933baa63..ddbb9862bbb38 100644
--- a/dev-python/zope-testrunner/zope-testrunner-4.7.0.ebuild
+++ b/dev-python/zope-testrunner/zope-testrunner-4.7.0.ebuild
@@ -10,7 +10,7 @@ MY_PN=${PN/-/.}
 MY_P=${MY_PN}-${PV}
 
 DESCRIPTION="Zope testrunner script"
-HOMEPAGE="https://pypi.python.org/pypi/zope.testrunner https://github.com/zopefoundation/zope.testrunner"
+HOMEPAGE="https://pypi.org/project/zope.testrunner https://github.com/zopefoundation/zope.testrunner"
 SRC_URI="mirror://pypi/${MY_PN::1}/${MY_PN}/${MY_P}.zip"
 
 LICENSE="ZPL"
diff --git a/dev-python/zstandard/zstandard-0.8.1.ebuild b/dev-python/zstandard/zstandard-0.8.1.ebuild
index 56a699e25248c..a40eb6cf66bf3 100644
--- a/dev-python/zstandard/zstandard-0.8.1.ebuild
+++ b/dev-python/zstandard/zstandard-0.8.1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
 inherit distutils-r1
 
 DESCRIPTION="Zstandard Bindings for Python"
-HOMEPAGE="https://pypi.python.org/pypi/zstandard https://github.com/indygreg/python-zstandard"
+HOMEPAGE="https://pypi.org/project/zstandard https://github.com/indygreg/python-zstandard"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
diff --git a/dev-util/buildbot-console-view/buildbot-console-view-0.9.12.ebuild b/dev-util/buildbot-console-view/buildbot-console-view-0.9.12.ebuild
index 0b002bd2400f1..2174fb58cd4e1 100644
--- a/dev-util/buildbot-console-view/buildbot-console-view-0.9.12.ebuild
+++ b/dev-util/buildbot-console-view/buildbot-console-view-0.9.12.ebuild
@@ -11,7 +11,7 @@ EGIT_REPO_URI="https://github.com/buildbot/buildbot.git"
 inherit distutils-r1
 
 DESCRIPTION="Buildbot console-view plugin"
-HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.python.org/pypi/buildbot-console-view"
+HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-console-view"
 
 MY_PV="${PV/_p/.post}"
 MY_P="${PN}-${MY_PV}"
diff --git a/dev-util/buildbot-console-view/buildbot-console-view-0.9.13.ebuild b/dev-util/buildbot-console-view/buildbot-console-view-0.9.13.ebuild
index 930624aac4dd2..5bb7e17a78f20 100644
--- a/dev-util/buildbot-console-view/buildbot-console-view-0.9.13.ebuild
+++ b/dev-util/buildbot-console-view/buildbot-console-view-0.9.13.ebuild
@@ -11,7 +11,7 @@ EGIT_REPO_URI="https://github.com/buildbot/buildbot.git"
 inherit distutils-r1
 
 DESCRIPTION="Buildbot console-view plugin"
-HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.python.org/pypi/buildbot-console-view"
+HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-console-view"
 
 MY_PV="${PV/_p/.post}"
 MY_P="${PN}-${MY_PV}"
diff --git a/dev-util/buildbot-console-view/buildbot-console-view-0.9.15_p1.ebuild b/dev-util/buildbot-console-view/buildbot-console-view-0.9.15_p1.ebuild
index 5f6501c2a7107..656a9b1f4ab92 100644
--- a/dev-util/buildbot-console-view/buildbot-console-view-0.9.15_p1.ebuild
+++ b/dev-util/buildbot-console-view/buildbot-console-view-0.9.15_p1.ebuild
@@ -11,7 +11,7 @@ EGIT_REPO_URI="https://github.com/buildbot/buildbot.git"
 inherit distutils-r1
 
 DESCRIPTION="Buildbot console-view plugin"
-HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.python.org/pypi/buildbot-console-view"
+HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-console-view"
 
 MY_PV="${PV/_p/.post}"
 MY_P="${PN}-${MY_PV}"
diff --git a/dev-util/buildbot-console-view/buildbot-console-view-1.1.0.ebuild b/dev-util/buildbot-console-view/buildbot-console-view-1.1.0.ebuild
index 5f6501c2a7107..656a9b1f4ab92 100644
--- a/dev-util/buildbot-console-view/buildbot-console-view-1.1.0.ebuild
+++ b/dev-util/buildbot-console-view/buildbot-console-view-1.1.0.ebuild
@@ -11,7 +11,7 @@ EGIT_REPO_URI="https://github.com/buildbot/buildbot.git"
 inherit distutils-r1
 
 DESCRIPTION="Buildbot console-view plugin"
-HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.python.org/pypi/buildbot-console-view"
+HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-console-view"
 
 MY_PV="${PV/_p/.post}"
 MY_P="${PN}-${MY_PV}"
diff --git a/dev-util/buildbot-grid-view/buildbot-grid-view-0.9.12_p1.ebuild b/dev-util/buildbot-grid-view/buildbot-grid-view-0.9.12_p1.ebuild
index f32dcb7f4ca64..08cbe25a44434 100644
--- a/dev-util/buildbot-grid-view/buildbot-grid-view-0.9.12_p1.ebuild
+++ b/dev-util/buildbot-grid-view/buildbot-grid-view-0.9.12_p1.ebuild
@@ -11,7 +11,7 @@ EGIT_REPO_URI="https://github.com/buildbot/buildbot.git"
 inherit distutils-r1
 
 DESCRIPTION="BuildBot grid view web interface"
-HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.python.org/pypi/buildbot-grid-view"
+HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-grid-view"
 
 MY_PV="${PV/_p/.post}"
 MY_P="${PN}-${MY_PV}"
diff --git a/dev-util/buildbot-grid-view/buildbot-grid-view-0.9.13.ebuild b/dev-util/buildbot-grid-view/buildbot-grid-view-0.9.13.ebuild
index 5fef4022a05a4..3844c8ba7fd25 100644
--- a/dev-util/buildbot-grid-view/buildbot-grid-view-0.9.13.ebuild
+++ b/dev-util/buildbot-grid-view/buildbot-grid-view-0.9.13.ebuild
@@ -11,7 +11,7 @@ EGIT_REPO_URI="https://github.com/buildbot/buildbot.git"
 inherit distutils-r1
 
 DESCRIPTION="BuildBot grid view web interface"
-HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.python.org/pypi/buildbot-grid-view"
+HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-grid-view"
 
 MY_PV="${PV/_p/.post}"
 MY_P="${PN}-${MY_PV}"
diff --git a/dev-util/buildbot-grid-view/buildbot-grid-view-0.9.15_p1.ebuild b/dev-util/buildbot-grid-view/buildbot-grid-view-0.9.15_p1.ebuild
index 384073a7a830b..478993869f406 100644
--- a/dev-util/buildbot-grid-view/buildbot-grid-view-0.9.15_p1.ebuild
+++ b/dev-util/buildbot-grid-view/buildbot-grid-view-0.9.15_p1.ebuild
@@ -11,7 +11,7 @@ EGIT_REPO_URI="https://github.com/buildbot/buildbot.git"
 inherit distutils-r1
 
 DESCRIPTION="BuildBot grid view web interface"
-HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.python.org/pypi/buildbot-grid-view"
+HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-grid-view"
 
 MY_PV="${PV/_p/.post}"
 MY_P="${PN}-${MY_PV}"
diff --git a/dev-util/buildbot-grid-view/buildbot-grid-view-1.1.0.ebuild b/dev-util/buildbot-grid-view/buildbot-grid-view-1.1.0.ebuild
index 384073a7a830b..478993869f406 100644
--- a/dev-util/buildbot-grid-view/buildbot-grid-view-1.1.0.ebuild
+++ b/dev-util/buildbot-grid-view/buildbot-grid-view-1.1.0.ebuild
@@ -11,7 +11,7 @@ EGIT_REPO_URI="https://github.com/buildbot/buildbot.git"
 inherit distutils-r1
 
 DESCRIPTION="BuildBot grid view web interface"
-HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.python.org/pypi/buildbot-grid-view"
+HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-grid-view"
 
 MY_PV="${PV/_p/.post}"
 MY_P="${PN}-${MY_PV}"
diff --git a/dev-util/buildbot-pkg/buildbot-pkg-0.9.12.ebuild b/dev-util/buildbot-pkg/buildbot-pkg-0.9.12.ebuild
index d1fcb6b9d18f0..1e8fdab99c2f9 100644
--- a/dev-util/buildbot-pkg/buildbot-pkg-0.9.12.ebuild
+++ b/dev-util/buildbot-pkg/buildbot-pkg-0.9.12.ebuild
@@ -14,7 +14,7 @@ MY_PV="${PV/_p/.post}"
 MY_P="${PN}-${MY_PV}"
 
 DESCRIPTION="BuildBot common www build tools for packaging releases"
-HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.python.org/pypi/buildbot-pkg"
+HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-pkg"
 [[ ${PV} == *9999 ]] || SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
diff --git a/dev-util/buildbot-pkg/buildbot-pkg-0.9.13.ebuild b/dev-util/buildbot-pkg/buildbot-pkg-0.9.13.ebuild
index 400819fb54388..ad35a561a8005 100644
--- a/dev-util/buildbot-pkg/buildbot-pkg-0.9.13.ebuild
+++ b/dev-util/buildbot-pkg/buildbot-pkg-0.9.13.ebuild
@@ -14,7 +14,7 @@ MY_PV="${PV/_p/.post}"
 MY_P="${PN}-${MY_PV}"
 
 DESCRIPTION="BuildBot common www build tools for packaging releases"
-HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.python.org/pypi/buildbot-pkg"
+HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-pkg"
 [[ ${PV} == *9999 ]] || SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
diff --git a/dev-util/buildbot-pkg/buildbot-pkg-0.9.15_p1.ebuild b/dev-util/buildbot-pkg/buildbot-pkg-0.9.15_p1.ebuild
index 42d65473d6848..d846576354afc 100644
--- a/dev-util/buildbot-pkg/buildbot-pkg-0.9.15_p1.ebuild
+++ b/dev-util/buildbot-pkg/buildbot-pkg-0.9.15_p1.ebuild
@@ -14,7 +14,7 @@ MY_PV="${PV/_p/.post}"
 MY_P="${PN}-${MY_PV}"
 
 DESCRIPTION="BuildBot common www build tools for packaging releases"
-HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.python.org/pypi/buildbot-pkg"
+HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-pkg"
 [[ ${PV} == *9999 ]] || SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
diff --git a/dev-util/buildbot-pkg/buildbot-pkg-1.1.0.ebuild b/dev-util/buildbot-pkg/buildbot-pkg-1.1.0.ebuild
index bfd79f3284508..d67047d350252 100644
--- a/dev-util/buildbot-pkg/buildbot-pkg-1.1.0.ebuild
+++ b/dev-util/buildbot-pkg/buildbot-pkg-1.1.0.ebuild
@@ -14,7 +14,7 @@ MY_PV="${PV/_p/.post}"
 MY_P="${PN}-${MY_PV}"
 
 DESCRIPTION="BuildBot common www build tools for packaging releases"
-HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.python.org/pypi/buildbot-pkg"
+HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-pkg"
 [[ ${PV} == *9999 ]] || SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
diff --git a/dev-util/buildbot-slave/buildbot-slave-0.8.12.ebuild b/dev-util/buildbot-slave/buildbot-slave-0.8.12.ebuild
index 8bb290378b53a..4303187015cf6 100644
--- a/dev-util/buildbot-slave/buildbot-slave-0.8.12.ebuild
+++ b/dev-util/buildbot-slave/buildbot-slave-0.8.12.ebuild
@@ -6,7 +6,7 @@ PYTHON_COMPAT=( python2_7 )
 inherit distutils-r1 readme.gentoo systemd user
 
 DESCRIPTION="BuildBot Slave Daemon"
-HOMEPAGE="http://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.python.org/pypi/buildbot-slave"
+HOMEPAGE="http://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-slave"
 
 MY_PV="${PV/_p/p}"
 MY_P="${PN}-${MY_PV}"
diff --git a/dev-util/buildbot-waterfall-view/buildbot-waterfall-view-0.9.12.ebuild b/dev-util/buildbot-waterfall-view/buildbot-waterfall-view-0.9.12.ebuild
index da5ed06744221..02f64d7db13c7 100644
--- a/dev-util/buildbot-waterfall-view/buildbot-waterfall-view-0.9.12.ebuild
+++ b/dev-util/buildbot-waterfall-view/buildbot-waterfall-view-0.9.12.ebuild
@@ -11,7 +11,7 @@ EGIT_REPO_URI="https://github.com/buildbot/buildbot.git"
 inherit distutils-r1
 
 DESCRIPTION="Buildbot waterfall-view plugin"
-HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.python.org/pypi/buildbot-waterfall-view"
+HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-waterfall-view"
 
 MY_PV="${PV/_p/.post}"
 MY_P="${PN}-${MY_PV}"
diff --git a/dev-util/buildbot-waterfall-view/buildbot-waterfall-view-0.9.13.ebuild b/dev-util/buildbot-waterfall-view/buildbot-waterfall-view-0.9.13.ebuild
index 5bfe06c4219ff..b580a1ed6287c 100644
--- a/dev-util/buildbot-waterfall-view/buildbot-waterfall-view-0.9.13.ebuild
+++ b/dev-util/buildbot-waterfall-view/buildbot-waterfall-view-0.9.13.ebuild
@@ -11,7 +11,7 @@ EGIT_REPO_URI="https://github.com/buildbot/buildbot.git"
 inherit distutils-r1
 
 DESCRIPTION="Buildbot waterfall-view plugin"
-HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.python.org/pypi/buildbot-waterfall-view"
+HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-waterfall-view"
 
 MY_PV="${PV/_p/.post}"
 MY_P="${PN}-${MY_PV}"
diff --git a/dev-util/buildbot-waterfall-view/buildbot-waterfall-view-0.9.15_p1.ebuild b/dev-util/buildbot-waterfall-view/buildbot-waterfall-view-0.9.15_p1.ebuild
index ac8298f1ae1f4..42f348b274298 100644
--- a/dev-util/buildbot-waterfall-view/buildbot-waterfall-view-0.9.15_p1.ebuild
+++ b/dev-util/buildbot-waterfall-view/buildbot-waterfall-view-0.9.15_p1.ebuild
@@ -11,7 +11,7 @@ EGIT_REPO_URI="https://github.com/buildbot/buildbot.git"
 inherit distutils-r1
 
 DESCRIPTION="Buildbot waterfall-view plugin"
-HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.python.org/pypi/buildbot-waterfall-view"
+HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-waterfall-view"
 
 MY_PV="${PV/_p/.post}"
 MY_P="${PN}-${MY_PV}"
diff --git a/dev-util/buildbot-waterfall-view/buildbot-waterfall-view-1.1.0.ebuild b/dev-util/buildbot-waterfall-view/buildbot-waterfall-view-1.1.0.ebuild
index ac8298f1ae1f4..42f348b274298 100644
--- a/dev-util/buildbot-waterfall-view/buildbot-waterfall-view-1.1.0.ebuild
+++ b/dev-util/buildbot-waterfall-view/buildbot-waterfall-view-1.1.0.ebuild
@@ -11,7 +11,7 @@ EGIT_REPO_URI="https://github.com/buildbot/buildbot.git"
 inherit distutils-r1
 
 DESCRIPTION="Buildbot waterfall-view plugin"
-HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.python.org/pypi/buildbot-waterfall-view"
+HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-waterfall-view"
 
 MY_PV="${PV/_p/.post}"
 MY_P="${PN}-${MY_PV}"
diff --git a/dev-util/buildbot-worker/buildbot-worker-0.9.12.ebuild b/dev-util/buildbot-worker/buildbot-worker-0.9.12.ebuild
index 4fd3f42b8d6f8..faea7b163e546 100644
--- a/dev-util/buildbot-worker/buildbot-worker-0.9.12.ebuild
+++ b/dev-util/buildbot-worker/buildbot-worker-0.9.12.ebuild
@@ -10,7 +10,7 @@ EGIT_REPO_URI="https://github.com/buildbot/buildbot.git"
 inherit readme.gentoo-r1 user distutils-r1
 
 DESCRIPTION="BuildBot Worker (slave) Daemon"
-HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.python.org/pypi/buildbot-worker"
+HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-worker"
 
 MY_V="${PV/_p/p}"
 MY_P="${PN}-${MY_V}"
diff --git a/dev-util/buildbot-worker/buildbot-worker-0.9.13.ebuild b/dev-util/buildbot-worker/buildbot-worker-0.9.13.ebuild
index a9abdbc71ee48..4454371676655 100644
--- a/dev-util/buildbot-worker/buildbot-worker-0.9.13.ebuild
+++ b/dev-util/buildbot-worker/buildbot-worker-0.9.13.ebuild
@@ -10,7 +10,7 @@ EGIT_REPO_URI="https://github.com/buildbot/buildbot.git"
 inherit readme.gentoo-r1 user distutils-r1
 
 DESCRIPTION="BuildBot Worker (slave) Daemon"
-HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.python.org/pypi/buildbot-worker"
+HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-worker"
 
 MY_V="${PV/_p/p}"
 MY_P="${PN}-${MY_V}"
diff --git a/dev-util/buildbot-worker/buildbot-worker-0.9.15_p1.ebuild b/dev-util/buildbot-worker/buildbot-worker-0.9.15_p1.ebuild
index bfcad9dc970b2..e92ba553318e8 100644
--- a/dev-util/buildbot-worker/buildbot-worker-0.9.15_p1.ebuild
+++ b/dev-util/buildbot-worker/buildbot-worker-0.9.15_p1.ebuild
@@ -10,7 +10,7 @@ EGIT_REPO_URI="https://github.com/buildbot/buildbot.git"
 inherit readme.gentoo-r1 user distutils-r1
 
 DESCRIPTION="BuildBot Worker (slave) Daemon"
-HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.python.org/pypi/buildbot-worker"
+HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-worker"
 
 MY_V="${PV/_p/.post}"
 MY_P="${PN}-${MY_V}"
diff --git a/dev-util/buildbot-worker/buildbot-worker-1.1.0.ebuild b/dev-util/buildbot-worker/buildbot-worker-1.1.0.ebuild
index bfcad9dc970b2..e92ba553318e8 100644
--- a/dev-util/buildbot-worker/buildbot-worker-1.1.0.ebuild
+++ b/dev-util/buildbot-worker/buildbot-worker-1.1.0.ebuild
@@ -10,7 +10,7 @@ EGIT_REPO_URI="https://github.com/buildbot/buildbot.git"
 inherit readme.gentoo-r1 user distutils-r1
 
 DESCRIPTION="BuildBot Worker (slave) Daemon"
-HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.python.org/pypi/buildbot-worker"
+HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-worker"
 
 MY_V="${PV/_p/.post}"
 MY_P="${PN}-${MY_V}"
diff --git a/dev-util/buildbot-worker/buildbot-worker-9999.ebuild b/dev-util/buildbot-worker/buildbot-worker-9999.ebuild
index bfcad9dc970b2..e92ba553318e8 100644
--- a/dev-util/buildbot-worker/buildbot-worker-9999.ebuild
+++ b/dev-util/buildbot-worker/buildbot-worker-9999.ebuild
@@ -10,7 +10,7 @@ EGIT_REPO_URI="https://github.com/buildbot/buildbot.git"
 inherit readme.gentoo-r1 user distutils-r1
 
 DESCRIPTION="BuildBot Worker (slave) Daemon"
-HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.python.org/pypi/buildbot-worker"
+HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-worker"
 
 MY_V="${PV/_p/.post}"
 MY_P="${PN}-${MY_V}"
diff --git a/dev-util/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-0.9.12.ebuild b/dev-util/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-0.9.12.ebuild
index cf9810a5d1c16..cbf202672e24d 100644
--- a/dev-util/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-0.9.12.ebuild
+++ b/dev-util/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-0.9.12.ebuild
@@ -11,7 +11,7 @@ EGIT_REPO_URI="https://github.com/buildbot/buildbot.git"
 inherit distutils-r1
 
 DESCRIPTION="Buildbot plugin to integrate flask or bottle dashboards to buildbot UI"
-HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.python.org/pypi/buildbot-wsgi-dashboards"
+HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-wsgi-dashboards"
 
 MY_PV="${PV/_p/.post}"
 MY_P="${PN}-${MY_PV}"
diff --git a/dev-util/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-0.9.13.ebuild b/dev-util/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-0.9.13.ebuild
index f96d4962c3220..ba9aa2ce56df1 100644
--- a/dev-util/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-0.9.13.ebuild
+++ b/dev-util/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-0.9.13.ebuild
@@ -11,7 +11,7 @@ EGIT_REPO_URI="https://github.com/buildbot/buildbot.git"
 inherit distutils-r1
 
 DESCRIPTION="Buildbot plugin to integrate flask or bottle dashboards to buildbot UI"
-HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.python.org/pypi/buildbot-wsgi-dashboards"
+HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-wsgi-dashboards"
 
 MY_PV="${PV/_p/.post}"
 MY_P="${PN}-${MY_PV}"
diff --git a/dev-util/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-0.9.15_p1.ebuild b/dev-util/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-0.9.15_p1.ebuild
index 6251d77f951dd..5224d8a610bef 100644
--- a/dev-util/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-0.9.15_p1.ebuild
+++ b/dev-util/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-0.9.15_p1.ebuild
@@ -11,7 +11,7 @@ EGIT_REPO_URI="https://github.com/buildbot/buildbot.git"
 inherit distutils-r1
 
 DESCRIPTION="Buildbot plugin to integrate flask or bottle dashboards to buildbot UI"
-HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.python.org/pypi/buildbot-wsgi-dashboards"
+HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-wsgi-dashboards"
 
 MY_PV="${PV/_p/.post}"
 MY_P="${PN}-${MY_PV}"
diff --git a/dev-util/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-1.1.0.ebuild b/dev-util/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-1.1.0.ebuild
index 6251d77f951dd..5224d8a610bef 100644
--- a/dev-util/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-1.1.0.ebuild
+++ b/dev-util/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-1.1.0.ebuild
@@ -11,7 +11,7 @@ EGIT_REPO_URI="https://github.com/buildbot/buildbot.git"
 inherit distutils-r1
 
 DESCRIPTION="Buildbot plugin to integrate flask or bottle dashboards to buildbot UI"
-HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.python.org/pypi/buildbot-wsgi-dashboards"
+HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-wsgi-dashboards"
 
 MY_PV="${PV/_p/.post}"
 MY_P="${PN}-${MY_PV}"
diff --git a/dev-util/buildbot-www/buildbot-www-0.9.12.ebuild b/dev-util/buildbot-www/buildbot-www-0.9.12.ebuild
index 8a824ff4cbcf7..f7163c0a71349 100644
--- a/dev-util/buildbot-www/buildbot-www-0.9.12.ebuild
+++ b/dev-util/buildbot-www/buildbot-www-0.9.12.ebuild
@@ -11,7 +11,7 @@ EGIT_REPO_URI="https://github.com/buildbot/buildbot.git"
 inherit distutils-r1
 
 DESCRIPTION="BuildBot base web interface, use with buildbot-{console-view,waterfall-view}..."
-HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.python.org/pypi/buildbot-www"
+HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-www"
 
 MY_PV="${PV/_p/.post}"
 MY_P="${PN}-${MY_PV}"
diff --git a/dev-util/buildbot-www/buildbot-www-0.9.13.ebuild b/dev-util/buildbot-www/buildbot-www-0.9.13.ebuild
index 255bdb148ef57..30a4693f13765 100644
--- a/dev-util/buildbot-www/buildbot-www-0.9.13.ebuild
+++ b/dev-util/buildbot-www/buildbot-www-0.9.13.ebuild
@@ -11,7 +11,7 @@ EGIT_REPO_URI="https://github.com/buildbot/buildbot.git"
 inherit distutils-r1
 
 DESCRIPTION="BuildBot base web interface, use with buildbot-{console-view,waterfall-view}..."
-HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.python.org/pypi/buildbot-www"
+HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-www"
 
 MY_PV="${PV/_p/.post}"
 MY_P="${PN}-${MY_PV}"
diff --git a/dev-util/buildbot-www/buildbot-www-0.9.15_p1.ebuild b/dev-util/buildbot-www/buildbot-www-0.9.15_p1.ebuild
index d14a3d992e00c..90a60bd5cd20f 100644
--- a/dev-util/buildbot-www/buildbot-www-0.9.15_p1.ebuild
+++ b/dev-util/buildbot-www/buildbot-www-0.9.15_p1.ebuild
@@ -11,7 +11,7 @@ EGIT_REPO_URI="https://github.com/buildbot/buildbot.git"
 inherit distutils-r1
 
 DESCRIPTION="BuildBot base web interface, use with buildbot-{console-view,waterfall-view}..."
-HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.python.org/pypi/buildbot-www"
+HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-www"
 
 MY_PV="${PV/_p/.post}"
 MY_P="${PN}-${MY_PV}"
diff --git a/dev-util/buildbot-www/buildbot-www-1.1.0.ebuild b/dev-util/buildbot-www/buildbot-www-1.1.0.ebuild
index d14a3d992e00c..90a60bd5cd20f 100644
--- a/dev-util/buildbot-www/buildbot-www-1.1.0.ebuild
+++ b/dev-util/buildbot-www/buildbot-www-1.1.0.ebuild
@@ -11,7 +11,7 @@ EGIT_REPO_URI="https://github.com/buildbot/buildbot.git"
 inherit distutils-r1
 
 DESCRIPTION="BuildBot base web interface, use with buildbot-{console-view,waterfall-view}..."
-HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.python.org/pypi/buildbot-www"
+HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-www"
 
 MY_PV="${PV/_p/.post}"
 MY_P="${PN}-${MY_PV}"
diff --git a/dev-util/buildbot/buildbot-0.8.12-r3.ebuild b/dev-util/buildbot/buildbot-0.8.12-r3.ebuild
index 67cc0e8a8dc22..f432a13be789f 100644
--- a/dev-util/buildbot/buildbot-0.8.12-r3.ebuild
+++ b/dev-util/buildbot/buildbot-0.8.12-r3.ebuild
@@ -11,7 +11,7 @@ MY_PV="${PV/_p/p}"
 MY_P="${PN}-${MY_PV}"
 
 DESCRIPTION="BuildBot build automation system"
-HOMEPAGE="http://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.python.org/pypi/buildbot"
+HOMEPAGE="http://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
diff --git a/dev-util/buildbot/buildbot-0.9.12.ebuild b/dev-util/buildbot/buildbot-0.9.12.ebuild
index 1db6439d370b9..9a106389b8ee6 100644
--- a/dev-util/buildbot/buildbot-0.9.12.ebuild
+++ b/dev-util/buildbot/buildbot-0.9.12.ebuild
@@ -14,7 +14,7 @@ MY_PV="${PV/_p/p}"
 MY_P="${PN}-${MY_PV}"
 
 DESCRIPTION="BuildBot build automation system"
-HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.python.org/pypi/buildbot"
+HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot"
 [[ ${PV} == *9999 ]] || SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
diff --git a/dev-util/buildbot/buildbot-0.9.13.ebuild b/dev-util/buildbot/buildbot-0.9.13.ebuild
index a9a9d7adf5f68..5c67c37ee7632 100644
--- a/dev-util/buildbot/buildbot-0.9.13.ebuild
+++ b/dev-util/buildbot/buildbot-0.9.13.ebuild
@@ -14,7 +14,7 @@ MY_PV="${PV/_p/p}"
 MY_P="${PN}-${MY_PV}"
 
 DESCRIPTION="BuildBot build automation system"
-HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.python.org/pypi/buildbot"
+HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot"
 [[ ${PV} == *9999 ]] || SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
diff --git a/dev-util/buildbot/buildbot-0.9.15_p1.ebuild b/dev-util/buildbot/buildbot-0.9.15_p1.ebuild
index 48d59be0032ca..3d1d553779bf2 100644
--- a/dev-util/buildbot/buildbot-0.9.15_p1.ebuild
+++ b/dev-util/buildbot/buildbot-0.9.15_p1.ebuild
@@ -14,7 +14,7 @@ MY_PV="${PV/_p/.post}"
 MY_P="${PN}-${MY_PV}"
 
 DESCRIPTION="BuildBot build automation system"
-HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.python.org/pypi/buildbot"
+HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot"
 [[ ${PV} == *9999 ]] || SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
diff --git a/dev-util/buildbot/buildbot-1.1.0.ebuild b/dev-util/buildbot/buildbot-1.1.0.ebuild
index 8c8f64302bd1d..1a698ff266210 100644
--- a/dev-util/buildbot/buildbot-1.1.0.ebuild
+++ b/dev-util/buildbot/buildbot-1.1.0.ebuild
@@ -14,7 +14,7 @@ MY_PV="${PV/_p/.post}"
 MY_P="${PN}-${MY_PV}"
 
 DESCRIPTION="BuildBot build automation system"
-HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.python.org/pypi/buildbot"
+HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot"
 SRC_URI="
 	mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz
 	https://dev.gentoo.org/~dolsen/distfiles/buildbot-1.1.0.docs.tar.xz
diff --git a/dev-util/buildbot/buildbot-9999.ebuild b/dev-util/buildbot/buildbot-9999.ebuild
index 41609b4536006..0ff3273063480 100644
--- a/dev-util/buildbot/buildbot-9999.ebuild
+++ b/dev-util/buildbot/buildbot-9999.ebuild
@@ -14,7 +14,7 @@ MY_PV="${PV/_p/.post}"
 MY_P="${PN}-${MY_PV}"
 
 DESCRIPTION="BuildBot build automation system"
-HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.python.org/pypi/buildbot"
+HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot"
 [[ ${PV} == *9999 ]] || SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
diff --git a/dev-util/bumpversion/bumpversion-0.5.3.ebuild b/dev-util/bumpversion/bumpversion-0.5.3.ebuild
index e070b4ae6e71a..66c64849538ea 100644
--- a/dev-util/bumpversion/bumpversion-0.5.3.ebuild
+++ b/dev-util/bumpversion/bumpversion-0.5.3.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy )
 inherit distutils-r1
 
 DESCRIPTION="Version-bump your software with a single command"
-HOMEPAGE="https://pypi.python.org/pypi/bumpversion https://github.com/peritus/bumpversion"
+HOMEPAGE="https://pypi.org/project/bumpversion https://github.com/peritus/bumpversion"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
diff --git a/dev-util/diffoscope/diffoscope-87.ebuild b/dev-util/diffoscope/diffoscope-87.ebuild
index 57f42c0822868..77784a1f35069 100644
--- a/dev-util/diffoscope/diffoscope-87.ebuild
+++ b/dev-util/diffoscope/diffoscope-87.ebuild
@@ -6,7 +6,7 @@ PYTHON_COMPAT=( python3_{5,6} )
 inherit distutils-r1
 
 DESCRIPTION="Will try to get to the bottom of what makes files or directories different"
-HOMEPAGE="https://diffoscope.org/ https://pypi.python.org/pypi/diffoscope/"
+HOMEPAGE="https://diffoscope.org/ https://pypi.org/project/diffoscope/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 LICENSE="GPL-3+"
 SLOT="0"
diff --git a/dev-util/diffoscope/diffoscope-88.ebuild b/dev-util/diffoscope/diffoscope-88.ebuild
index 2fa2a3eec9c35..4e57c2b2f0e94 100644
--- a/dev-util/diffoscope/diffoscope-88.ebuild
+++ b/dev-util/diffoscope/diffoscope-88.ebuild
@@ -6,7 +6,7 @@ PYTHON_COMPAT=( python3_{5,6} )
 inherit distutils-r1
 
 DESCRIPTION="Will try to get to the bottom of what makes files or directories different"
-HOMEPAGE="https://diffoscope.org/ https://pypi.python.org/pypi/diffoscope/"
+HOMEPAGE="https://diffoscope.org/ https://pypi.org/project/diffoscope/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 LICENSE="GPL-3+"
 SLOT="0"
diff --git a/dev-util/gertty/gertty-1.3.2.ebuild b/dev-util/gertty/gertty-1.3.2.ebuild
index e058673881955..7c18ac66c8e3e 100644
--- a/dev-util/gertty/gertty-1.3.2.ebuild
+++ b/dev-util/gertty/gertty-1.3.2.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 )
 inherit distutils-r1
 
 DESCRIPTION="Gertty is a console-based interface to the Gerrit Code Review system."
-HOMEPAGE="https://pypi.python.org/pypi/gertty"
+HOMEPAGE="https://pypi.org/project/gertty"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
diff --git a/dev-util/gertty/gertty-1.4.0.ebuild b/dev-util/gertty/gertty-1.4.0.ebuild
index e058673881955..7c18ac66c8e3e 100644
--- a/dev-util/gertty/gertty-1.4.0.ebuild
+++ b/dev-util/gertty/gertty-1.4.0.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 )
 inherit distutils-r1
 
 DESCRIPTION="Gertty is a console-based interface to the Gerrit Code Review system."
-HOMEPAGE="https://pypi.python.org/pypi/gertty"
+HOMEPAGE="https://pypi.org/project/gertty"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
diff --git a/dev-util/gertty/gertty-1.5.0.ebuild b/dev-util/gertty/gertty-1.5.0.ebuild
index 0ad02b9841db8..bd38b77879eeb 100644
--- a/dev-util/gertty/gertty-1.5.0.ebuild
+++ b/dev-util/gertty/gertty-1.5.0.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 )
 inherit distutils-r1
 
 DESCRIPTION="Gertty is a console-based interface to the Gerrit Code Review system."
-HOMEPAGE="https://pypi.python.org/pypi/gertty"
+HOMEPAGE="https://pypi.org/project/gertty"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
diff --git a/dev-util/howdoi/howdoi-1.1.12.ebuild b/dev-util/howdoi/howdoi-1.1.12.ebuild
index ce49409593dd2..2b8d41ba1bc66 100644
--- a/dev-util/howdoi/howdoi-1.1.12.ebuild
+++ b/dev-util/howdoi/howdoi-1.1.12.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5} )
 inherit distutils-r1
 
 DESCRIPTION="A code search tool"
-HOMEPAGE="https://pypi.python.org/pypi/howdoi"
+HOMEPAGE="https://pypi.org/project/howdoi"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-util/howdoi/howdoi-1.1.9.ebuild b/dev-util/howdoi/howdoi-1.1.9.ebuild
index 16b477d33ed50..aa14cb47aad41 100644
--- a/dev-util/howdoi/howdoi-1.1.9.ebuild
+++ b/dev-util/howdoi/howdoi-1.1.9.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5} )
 inherit distutils-r1
 
 DESCRIPTION="A code search tool"
-HOMEPAGE="https://pypi.python.org/pypi/howdoi"
+HOMEPAGE="https://pypi.org/project/howdoi"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-util/vint/vint-0.3.18.ebuild b/dev-util/vint/vint-0.3.18.ebuild
index 9020a6461e71a..8dbdf65404afc 100644
--- a/dev-util/vint/vint-0.3.18.ebuild
+++ b/dev-util/vint/vint-0.3.18.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
 inherit distutils-r1
 
 DESCRIPTION="Lint tool for Vim script language"
-HOMEPAGE="https://github.com/Kuniwak/vint https://pypi.python.org/pypi/vim-vint/"
+HOMEPAGE="https://github.com/Kuniwak/vint https://pypi.org/project/vim-vint/"
 SRC_URI="https://github.com/Kuniwak/vint/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-vcs/github-pages-publish/github-pages-publish-0.1.2.ebuild b/dev-vcs/github-pages-publish/github-pages-publish-0.1.2.ebuild
index 82c9728715861..208c4eb3fd693 100644
--- a/dev-vcs/github-pages-publish/github-pages-publish-0.1.2.ebuild
+++ b/dev-vcs/github-pages-publish/github-pages-publish-0.1.2.ebuild
@@ -14,7 +14,7 @@ fi
 inherit distutils-r1 ${GIT_ECLASS}
 
 DESCRIPTION="A script that commits files from a directory to Github Pages"
-HOMEPAGE="https://pypi.python.org/pypi/github-pages-publish
+HOMEPAGE="https://pypi.org/project/github-pages-publish
 	https://github.com/rafaelmartins/github-pages-publish"
 
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
diff --git a/dev-vcs/hg-git/hg-git-0.8.10-r1.ebuild b/dev-vcs/hg-git/hg-git-0.8.10-r1.ebuild
index 265c210991394..c0ee4243d734e 100644
--- a/dev-vcs/hg-git/hg-git-0.8.10-r1.ebuild
+++ b/dev-vcs/hg-git/hg-git-0.8.10-r1.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 )
 inherit distutils-r1
 
 DESCRIPTION="push to and pull from a Git repository using Mercurial"
-HOMEPAGE="http://hg-git.github.io https://pypi.python.org/pypi/hg-git"
+HOMEPAGE="http://hg-git.github.io https://pypi.org/project/hg-git"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
diff --git a/dev-vcs/hg-git/hg-git-0.8.10.ebuild b/dev-vcs/hg-git/hg-git-0.8.10.ebuild
index 9107366d406c0..545a0324ae31c 100644
--- a/dev-vcs/hg-git/hg-git-0.8.10.ebuild
+++ b/dev-vcs/hg-git/hg-git-0.8.10.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 )
 inherit distutils-r1
 
 DESCRIPTION="push to and pull from a Git repository using Mercurial"
-HOMEPAGE="http://hg-git.github.io https://pypi.python.org/pypi/hg-git"
+HOMEPAGE="http://hg-git.github.io https://pypi.org/project/hg-git"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
diff --git a/dev-vcs/hg-git/hg-git-0.8.8.ebuild b/dev-vcs/hg-git/hg-git-0.8.8.ebuild
index 949e6b8cb4f6e..f9ec4148be50f 100644
--- a/dev-vcs/hg-git/hg-git-0.8.8.ebuild
+++ b/dev-vcs/hg-git/hg-git-0.8.8.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 )
 inherit distutils-r1
 
 DESCRIPTION="push to and pull from a Git repository using Mercurial"
-HOMEPAGE="http://hg-git.github.io https://pypi.python.org/pypi/hg-git"
+HOMEPAGE="http://hg-git.github.io https://pypi.org/project/hg-git"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
diff --git a/dev-vcs/hgsubversion/hgsubversion-1.8.5.ebuild b/dev-vcs/hgsubversion/hgsubversion-1.8.5.ebuild
index 60e02ed16df11..01e8b97f9940e 100644
--- a/dev-vcs/hgsubversion/hgsubversion-1.8.5.ebuild
+++ b/dev-vcs/hgsubversion/hgsubversion-1.8.5.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 )
 inherit distutils-r1
 
 DESCRIPTION="hgsubversion is a Mercurial extension for working with Subversion repositories"
-HOMEPAGE="https://bitbucket.org/durin42/hgsubversion/wiki/Home https://pypi.python.org/pypi/hgsubversion"
+HOMEPAGE="https://bitbucket.org/durin42/hgsubversion/wiki/Home https://pypi.org/project/hgsubversion"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
diff --git a/dev-vcs/hgsubversion/hgsubversion-1.8.6.ebuild b/dev-vcs/hgsubversion/hgsubversion-1.8.6.ebuild
index 7d01be05dadf9..39a19e8b2d62a 100644
--- a/dev-vcs/hgsubversion/hgsubversion-1.8.6.ebuild
+++ b/dev-vcs/hgsubversion/hgsubversion-1.8.6.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 )
 inherit distutils-r1
 
 DESCRIPTION="hgsubversion is a Mercurial extension for working with Subversion repositories"
-HOMEPAGE="https://bitbucket.org/durin42/hgsubversion/wiki/Home https://pypi.python.org/pypi/hgsubversion"
+HOMEPAGE="https://bitbucket.org/durin42/hgsubversion/wiki/Home https://pypi.org/project/hgsubversion"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
diff --git a/dev-vcs/hgsubversion/hgsubversion-9999.ebuild b/dev-vcs/hgsubversion/hgsubversion-9999.ebuild
index 4983c810a849f..afbf338be78b4 100644
--- a/dev-vcs/hgsubversion/hgsubversion-9999.ebuild
+++ b/dev-vcs/hgsubversion/hgsubversion-9999.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 )
 inherit distutils-r1 mercurial
 
 DESCRIPTION="hgsubversion is a Mercurial extension for working with Subversion repositories"
-HOMEPAGE="https://bitbucket.org/durin42/hgsubversion/wiki/Home https://pypi.python.org/pypi/hgsubversion"
+HOMEPAGE="https://bitbucket.org/durin42/hgsubversion/wiki/Home https://pypi.org/project/hgsubversion"
 SRC_URI=""
 EHG_REPO_URI="https://bitbucket.org/durin42/hgsubversion"
 
diff --git a/dev-vcs/hgsvn/hgsvn-0.2.3-r1.ebuild b/dev-vcs/hgsvn/hgsvn-0.2.3-r1.ebuild
index f8f24efe19eaa..19aa39fd893ca 100644
--- a/dev-vcs/hgsvn/hgsvn-0.2.3-r1.ebuild
+++ b/dev-vcs/hgsvn/hgsvn-0.2.3-r1.ebuild
@@ -10,7 +10,7 @@ inherit distutils-r1
 PYTHON_REQ_USE="xml"
 
 DESCRIPTION="A set of scripts to work locally on Subversion checkouts using Mercurial"
-HOMEPAGE="https://pypi.python.org/pypi/hgsvn"
+HOMEPAGE="https://pypi.org/project/hgsvn"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
 
 LICENSE="GPL-3"
diff --git a/dev-vcs/hgview/hgview-1.9.0-r1.ebuild b/dev-vcs/hgview/hgview-1.9.0-r1.ebuild
index 9a51e54f07cca..8dddd30bab7f5 100644
--- a/dev-vcs/hgview/hgview-1.9.0-r1.ebuild
+++ b/dev-vcs/hgview/hgview-1.9.0-r1.ebuild
@@ -7,7 +7,7 @@ DISTUTILS_IN_SOURCE_BUILD=1
 inherit distutils-r1
 
 DESCRIPTION="A Mercurial interactive history viewer"
-HOMEPAGE="https://www.logilab.org/project/hgview/ https://pypi.python.org/pypi/hgview/"
+HOMEPAGE="https://www.logilab.org/project/hgview/ https://pypi.org/project/hgview/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
diff --git a/games-misc/doge/doge-3.5.0.ebuild b/games-misc/doge/doge-3.5.0.ebuild
index f37990a559f55..00b013bd7dbc4 100644
--- a/games-misc/doge/doge-3.5.0.ebuild
+++ b/games-misc/doge/doge-3.5.0.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
 inherit distutils-r1
 
 DESCRIPTION="wow very terminal doge"
-HOMEPAGE="https://github.com/thiderman/doge https://pypi.python.org/pypi/doge/"
+HOMEPAGE="https://github.com/thiderman/doge https://pypi.org/project/doge/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/media-gfx/qrencode-python/qrencode-python-1.02_pre140921.ebuild b/media-gfx/qrencode-python/qrencode-python-1.02_pre140921.ebuild
index 10d25c6326d6d..1f2c96240d9a0 100644
--- a/media-gfx/qrencode-python/qrencode-python-1.02_pre140921.ebuild
+++ b/media-gfx/qrencode-python/qrencode-python-1.02_pre140921.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
 inherit distutils-r1 vcs-snapshot
 
 DESCRIPTION="A simple wrapper for the C qrencode library"
-HOMEPAGE="https://pypi.python.org/pypi/qrencode/ https://github.com/Arachnid/pyqrencode/"
+HOMEPAGE="https://pypi.org/project/qrencode/ https://github.com/Arachnid/pyqrencode/"
 #SRC_URI="mirror://pypi/q/qrencode/qrencode-${PV}.tar.gz -> ${P}.tar.gz"
 SRC_URI="https://github.com/Arachnid/pyqrencode/tarball/486bb7b64e3ce5483f65e375a67da0fa6d02ca92 -> ${P}.tar.gz"
 
diff --git a/media-libs/mutagen/mutagen-1.35.1.ebuild b/media-libs/mutagen/mutagen-1.35.1.ebuild
index 51c48ea629dcf..c67b83d227b9e 100644
--- a/media-libs/mutagen/mutagen-1.35.1.ebuild
+++ b/media-libs/mutagen/mutagen-1.35.1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5} )
 inherit distutils-r1
 
 DESCRIPTION="Audio metadata tag reader and writer implemented in pure Python"
-HOMEPAGE="https://bitbucket.org/lazka/mutagen https://pypi.python.org/pypi/mutagen"
+HOMEPAGE="https://bitbucket.org/lazka/mutagen https://pypi.org/project/mutagen"
 SRC_URI="https://bitbucket.org/lazka/${PN}/downloads/${P}.tar.gz"
 
 LICENSE="GPL-2"
diff --git a/media-libs/mutagen/mutagen-1.38.ebuild b/media-libs/mutagen/mutagen-1.38.ebuild
index 3c860b85d743e..c582be7c718e6 100644
--- a/media-libs/mutagen/mutagen-1.38.ebuild
+++ b/media-libs/mutagen/mutagen-1.38.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
 inherit distutils-r1
 
 DESCRIPTION="Audio metadata tag reader and writer implemented in pure Python"
-HOMEPAGE="https://github.com/quodlibet/mutagen https://pypi.python.org/pypi/mutagen"
+HOMEPAGE="https://github.com/quodlibet/mutagen https://pypi.org/project/mutagen"
 SRC_URI="https://github.com/quodlibet/mutagen/releases/download/release-${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2"
diff --git a/media-libs/mutagen/mutagen-1.39.ebuild b/media-libs/mutagen/mutagen-1.39.ebuild
index 18bc2ef6e699e..02874c5e466c4 100644
--- a/media-libs/mutagen/mutagen-1.39.ebuild
+++ b/media-libs/mutagen/mutagen-1.39.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
 inherit distutils-r1
 
 DESCRIPTION="Audio metadata tag reader and writer implemented in pure Python"
-HOMEPAGE="https://github.com/quodlibet/mutagen https://pypi.python.org/pypi/mutagen"
+HOMEPAGE="https://github.com/quodlibet/mutagen https://pypi.org/project/mutagen"
 SRC_URI="https://github.com/quodlibet/mutagen/releases/download/release-${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2"
diff --git a/media-libs/mutagen/mutagen-1.40.0.ebuild b/media-libs/mutagen/mutagen-1.40.0.ebuild
index ab059849894f3..ef45a7517694b 100644
--- a/media-libs/mutagen/mutagen-1.40.0.ebuild
+++ b/media-libs/mutagen/mutagen-1.40.0.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
 inherit distutils-r1
 
 DESCRIPTION="Audio metadata tag reader and writer implemented in pure Python"
-HOMEPAGE="https://github.com/quodlibet/mutagen https://pypi.python.org/pypi/mutagen"
+HOMEPAGE="https://github.com/quodlibet/mutagen https://pypi.org/project/mutagen"
 SRC_URI="https://github.com/quodlibet/mutagen/releases/download/release-${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2"
diff --git a/media-sound/beets/beets-1.4.3-r1.ebuild b/media-sound/beets/beets-1.4.3-r1.ebuild
index 80af3567acb74..d5491b02393d7 100644
--- a/media-sound/beets/beets-1.4.3-r1.ebuild
+++ b/media-sound/beets/beets-1.4.3-r1.ebuild
@@ -11,7 +11,7 @@ MY_P=${PN}-${MY_PV}
 
 DESCRIPTION="A media library management system for obsessive-compulsive music geeks"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-HOMEPAGE="http://beets.io/ https://pypi.python.org/pypi/beets"
+HOMEPAGE="http://beets.io/ https://pypi.org/project/beets"
 
 KEYWORDS="~amd64 ~x86"
 SLOT="0"
diff --git a/media-sound/mps-youtube/mps-youtube-0.2.7.1.ebuild b/media-sound/mps-youtube/mps-youtube-0.2.7.1.ebuild
index e729cd979b07d..ad159c9c79529 100644
--- a/media-sound/mps-youtube/mps-youtube-0.2.7.1.ebuild
+++ b/media-sound/mps-youtube/mps-youtube-0.2.7.1.ebuild
@@ -6,7 +6,7 @@ PYTHON_COMPAT=( python{3_4,3_5,3_6} )
 inherit distutils-r1
 
 DESCRIPTION="Terminal-based YouTube player and downloader"
-HOMEPAGE="https://github.com/mps-youtube/mps-youtube https://pypi.python.org/pypi/mps-youtube"
+HOMEPAGE="https://github.com/mps-youtube/mps-youtube https://pypi.org/project/mps-youtube"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
diff --git a/media-sound/mps-youtube/mps-youtube-0.2.8.ebuild b/media-sound/mps-youtube/mps-youtube-0.2.8.ebuild
index 40c962d0e306e..c08548b41d712 100644
--- a/media-sound/mps-youtube/mps-youtube-0.2.8.ebuild
+++ b/media-sound/mps-youtube/mps-youtube-0.2.8.ebuild
@@ -14,7 +14,7 @@ else
 fi
 
 DESCRIPTION="Terminal-based YouTube player and downloader"
-HOMEPAGE="https://github.com/mps-youtube/mps-youtube https://pypi.python.org/pypi/mps-youtube"
+HOMEPAGE="https://github.com/mps-youtube/mps-youtube https://pypi.org/project/mps-youtube"
 
 LICENSE="GPL-3"
 SLOT="0"
diff --git a/media-sound/mps-youtube/mps-youtube-9999.ebuild b/media-sound/mps-youtube/mps-youtube-9999.ebuild
index b79a2339dbb1f..85dbd24601ff7 100644
--- a/media-sound/mps-youtube/mps-youtube-9999.ebuild
+++ b/media-sound/mps-youtube/mps-youtube-9999.ebuild
@@ -14,7 +14,7 @@ else
 fi
 
 DESCRIPTION="Terminal-based YouTube player and downloader"
-HOMEPAGE="https://github.com/mps-youtube/mps-youtube https://pypi.python.org/pypi/mps-youtube"
+HOMEPAGE="https://github.com/mps-youtube/mps-youtube https://pypi.org/project/mps-youtube"
 
 LICENSE="GPL-3"
 SLOT="0"
diff --git a/media-video/subliminal/subliminal-2.0.5-r1.ebuild b/media-video/subliminal/subliminal-2.0.5-r1.ebuild
index 0d8139e55f62c..4173429f438b9 100644
--- a/media-video/subliminal/subliminal-2.0.5-r1.ebuild
+++ b/media-video/subliminal/subliminal-2.0.5-r1.ebuild
@@ -10,7 +10,7 @@ COMMIT_ID='dd74383d1cba82829ce720f2e439a65d13ffe7ef'
 inherit distutils-r1 vcs-snapshot
 
 DESCRIPTION="Python library to search and download subtitles"
-HOMEPAGE="https://github.com/Diaoul/subliminal https://pypi.python.org/pypi/subliminal"
+HOMEPAGE="https://github.com/Diaoul/subliminal https://pypi.org/project/subliminal"
 SRC_URI="
 	https://github.com/Diaoul/${PN}/archive/${COMMIT_ID}.tar.gz -> ${PF}.tar.gz
 	test? ( mirror://sourceforge/matroska/test_files/matroska_test_w1_1.zip )
diff --git a/media-video/subliminal/subliminal-9999.ebuild b/media-video/subliminal/subliminal-9999.ebuild
index ca35900d17787..00acf627be882 100644
--- a/media-video/subliminal/subliminal-9999.ebuild
+++ b/media-video/subliminal/subliminal-9999.ebuild
@@ -9,7 +9,7 @@ PYTHON_REQ_USE='xml(+)'
 inherit distutils-r1 git-r3
 
 DESCRIPTION="Python library to search and download subtitles"
-HOMEPAGE="https://github.com/Diaoul/subliminal https://pypi.python.org/pypi/subliminal"
+HOMEPAGE="https://github.com/Diaoul/subliminal https://pypi.org/project/subliminal"
 EGIT_REPO_URI="https://github.com/Diaoul/${PN}.git"
 EGIT_BRANCH="develop"
 SRC_URI="test? ( mirror://sourceforge/matroska/test_files/matroska_test_w1_1.zip )"
diff --git a/net-dns/dnsimple-dyndns/dnsimple-dyndns-0.1.ebuild b/net-dns/dnsimple-dyndns/dnsimple-dyndns-0.1.ebuild
index c7a62597feacd..ce5bdf611c80f 100644
--- a/net-dns/dnsimple-dyndns/dnsimple-dyndns-0.1.ebuild
+++ b/net-dns/dnsimple-dyndns/dnsimple-dyndns-0.1.ebuild
@@ -14,7 +14,7 @@ fi
 inherit distutils-r1 ${GIT_ECLASS}
 
 DESCRIPTION="Dynamic DNS implementation, that relies on DNSimple.com"
-HOMEPAGE="https://pypi.python.org/pypi/dnsimple-dyndns
+HOMEPAGE="https://pypi.org/project/dnsimple-dyndns
 	https://github.com/rafaelmartins/dnsimple-dyndns"
 
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
diff --git a/net-im/hangups/hangups-9999.ebuild b/net-im/hangups/hangups-9999.ebuild
index 134b8dd2876e6..08b9e799a1c30 100644
--- a/net-im/hangups/hangups-9999.ebuild
+++ b/net-im/hangups/hangups-9999.ebuild
@@ -15,7 +15,7 @@ else
 fi
 
 DESCRIPTION="Third Party IM Client for Google Hangouts"
-HOMEPAGE="https://pypi.python.org/pypi/hangups"
+HOMEPAGE="https://pypi.org/project/hangups"
 
 LICENSE="MIT"
 SLOT="0"
diff --git a/net-misc/crossbar/crossbar-17.12.1.ebuild b/net-misc/crossbar/crossbar-17.12.1.ebuild
index 973e28aa48d33..77a37aa4d7a0e 100644
--- a/net-misc/crossbar/crossbar-17.12.1.ebuild
+++ b/net-misc/crossbar/crossbar-17.12.1.ebuild
@@ -10,7 +10,7 @@ MY_PV="${PV}"
 MY_P="${PN}-${MY_PV}"
 
 DESCRIPTION="Crossbar.io - The Unified Application Router for the twisted framework"
-HOMEPAGE="http://crossbar.io/ https://github.com/crossbario/crossbar https://pypi.python.org/pypi/crossbar"
+HOMEPAGE="http://crossbar.io/ https://github.com/crossbario/crossbar https://pypi.org/project/crossbar"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
 
 LICENSE="AGPL-3"
diff --git a/net-misc/crossbar/crossbar-17.6.1_p3-r1.ebuild b/net-misc/crossbar/crossbar-17.6.1_p3-r1.ebuild
index d320ae179088c..0f77cfad80258 100644
--- a/net-misc/crossbar/crossbar-17.6.1_p3-r1.ebuild
+++ b/net-misc/crossbar/crossbar-17.6.1_p3-r1.ebuild
@@ -12,7 +12,7 @@ MY_PV="17.6.1.post3"
 MY_P="${PN}-${MY_PV}"
 
 DESCRIPTION="Crossbar.io - The Unified Application Router for the twisted framework"
-HOMEPAGE="http://crossbar.io/ https://github.com/crossbario/crossbar https://pypi.python.org/pypi/crossbar"
+HOMEPAGE="http://crossbar.io/ https://github.com/crossbario/crossbar https://pypi.org/project/crossbar"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
 
 LICENSE="AGPL-3"
diff --git a/net-misc/crossbar/crossbar-17.8.1.ebuild b/net-misc/crossbar/crossbar-17.8.1.ebuild
index 27ba86e8835ca..60c1b6c803377 100644
--- a/net-misc/crossbar/crossbar-17.8.1.ebuild
+++ b/net-misc/crossbar/crossbar-17.8.1.ebuild
@@ -10,7 +10,7 @@ MY_PV="${PV}"
 MY_P="${PN}-${MY_PV}"
 
 DESCRIPTION="Crossbar.io - The Unified Application Router for the twisted framework"
-HOMEPAGE="http://crossbar.io/ https://github.com/crossbario/crossbar https://pypi.python.org/pypi/crossbar"
+HOMEPAGE="http://crossbar.io/ https://github.com/crossbario/crossbar https://pypi.org/project/crossbar"
 #SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
 SRC_URI="https://github.com/crossbario/crossbar/archive/v17.8.1.tar.gz -> ${P}.tar.gz"
 
diff --git a/net-misc/crossbar/crossbar-17.9.1.ebuild b/net-misc/crossbar/crossbar-17.9.1.ebuild
index 5597bd6ef26d5..0629c976bcd9c 100644
--- a/net-misc/crossbar/crossbar-17.9.1.ebuild
+++ b/net-misc/crossbar/crossbar-17.9.1.ebuild
@@ -10,7 +10,7 @@ MY_PV="${PV}"
 MY_P="${PN}-${MY_PV}"
 
 DESCRIPTION="Crossbar.io - The Unified Application Router for the twisted framework"
-HOMEPAGE="http://crossbar.io/ https://github.com/crossbario/crossbar https://pypi.python.org/pypi/crossbar"
+HOMEPAGE="http://crossbar.io/ https://github.com/crossbario/crossbar https://pypi.org/project/crossbar"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
 
 LICENSE="AGPL-3"
diff --git a/net-misc/crossbar/crossbar-18.3.1.ebuild b/net-misc/crossbar/crossbar-18.3.1.ebuild
index f651f274fa6d3..1cf259c852124 100644
--- a/net-misc/crossbar/crossbar-18.3.1.ebuild
+++ b/net-misc/crossbar/crossbar-18.3.1.ebuild
@@ -10,7 +10,7 @@ MY_PV="${PV}"
 MY_P="${PN}-${MY_PV}"
 
 DESCRIPTION="Crossbar.io - The Unified Application Router for the twisted framework"
-HOMEPAGE="http://crossbar.io/ https://github.com/crossbario/crossbar https://pypi.python.org/pypi/crossbar"
+HOMEPAGE="http://crossbar.io/ https://github.com/crossbario/crossbar https://pypi.org/project/crossbar"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
 
 LICENSE="AGPL-3"
diff --git a/net-misc/httpie/httpie-0.9.2.ebuild b/net-misc/httpie/httpie-0.9.2.ebuild
index 6eb1b8778479c..2bdd048612da1 100644
--- a/net-misc/httpie/httpie-0.9.2.ebuild
+++ b/net-misc/httpie/httpie-0.9.2.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_4} )
 inherit distutils-r1
 
 DESCRIPTION="A CLI, cURL-like tool for humans"
-HOMEPAGE="http://httpie.org/ https://pypi.python.org/pypi/httpie"
+HOMEPAGE="http://httpie.org/ https://pypi.org/project/httpie"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/net-misc/httpie/httpie-0.9.3.ebuild b/net-misc/httpie/httpie-0.9.3.ebuild
index 3dff6954a6692..c138d2718604f 100644
--- a/net-misc/httpie/httpie-0.9.3.ebuild
+++ b/net-misc/httpie/httpie-0.9.3.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_4} )
 inherit distutils-r1
 
 DESCRIPTION="A CLI, cURL-like tool for humans"
-HOMEPAGE="http://httpie.org/ https://pypi.python.org/pypi/httpie"
+HOMEPAGE="http://httpie.org/ https://pypi.org/project/httpie"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/net-misc/httpie/httpie-0.9.4.ebuild b/net-misc/httpie/httpie-0.9.4.ebuild
index 3dff6954a6692..c138d2718604f 100644
--- a/net-misc/httpie/httpie-0.9.4.ebuild
+++ b/net-misc/httpie/httpie-0.9.4.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_4} )
 inherit distutils-r1
 
 DESCRIPTION="A CLI, cURL-like tool for humans"
-HOMEPAGE="http://httpie.org/ https://pypi.python.org/pypi/httpie"
+HOMEPAGE="http://httpie.org/ https://pypi.org/project/httpie"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/net-misc/httpie/httpie-0.9.9.ebuild b/net-misc/httpie/httpie-0.9.9.ebuild
index 437c7beb31ea6..49deb2fe3c07e 100644
--- a/net-misc/httpie/httpie-0.9.9.ebuild
+++ b/net-misc/httpie/httpie-0.9.9.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5,3_6} )
 inherit distutils-r1
 
 DESCRIPTION="A CLI, cURL-like tool for humans"
-HOMEPAGE="http://httpie.org/ https://pypi.python.org/pypi/httpie"
+HOMEPAGE="http://httpie.org/ https://pypi.org/project/httpie"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/net-misc/whatportis/whatportis-0.6.ebuild b/net-misc/whatportis/whatportis-0.6.ebuild
index 97cd47b75bf4b..8c14354c95b9b 100644
--- a/net-misc/whatportis/whatportis-0.6.ebuild
+++ b/net-misc/whatportis/whatportis-0.6.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_{4,5}} )
 inherit distutils-r1 eutils
 
 DESCRIPTION="A command to search port names and numbers"
-HOMEPAGE="https://github.com/ncrocfer/whatportis http://pypi.python.org/pypi/whatportis"
+HOMEPAGE="https://github.com/ncrocfer/whatportis http://pypi.org/project/whatportis"
 SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/net-news/rawdog/rawdog-2.19.ebuild b/net-news/rawdog/rawdog-2.19.ebuild
index f3c042ce41225..13e695cd9f1fc 100644
--- a/net-news/rawdog/rawdog-2.19.ebuild
+++ b/net-news/rawdog/rawdog-2.19.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 pypy )
 inherit distutils-r1
 
 DESCRIPTION="Rawdog - RSS Aggregator Without Delusions Of Grandeur"
-HOMEPAGE="http://offog.org/code/rawdog.html https://pypi.python.org/pypi/rawdog"
+HOMEPAGE="http://offog.org/code/rawdog.html https://pypi.org/project/rawdog"
 SRC_URI="http://offog.org/files/${P}.tar.gz"
 
 LICENSE="GPL-2"
diff --git a/net-news/rawdog/rawdog-2.20.ebuild b/net-news/rawdog/rawdog-2.20.ebuild
index e365d3333838f..0638674487612 100644
--- a/net-news/rawdog/rawdog-2.20.ebuild
+++ b/net-news/rawdog/rawdog-2.20.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 pypy )
 inherit distutils-r1
 
 DESCRIPTION="Rawdog - RSS Aggregator Without Delusions Of Grandeur"
-HOMEPAGE="http://offog.org/code/rawdog.html https://pypi.python.org/pypi/rawdog"
+HOMEPAGE="http://offog.org/code/rawdog.html https://pypi.org/project/rawdog"
 SRC_URI="http://offog.org/files/${P}.tar.gz"
 
 LICENSE="GPL-2"
diff --git a/net-news/rawdog/rawdog-2.22-r1.ebuild b/net-news/rawdog/rawdog-2.22-r1.ebuild
index e6ef6154e2fde..11c968388770a 100644
--- a/net-news/rawdog/rawdog-2.22-r1.ebuild
+++ b/net-news/rawdog/rawdog-2.22-r1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 pypy )
 inherit distutils-r1
 
 DESCRIPTION="Rawdog, RSS Aggregator Without Delusions Of Grandeur"
-HOMEPAGE="http://offog.org/code/rawdog.html https://pypi.python.org/pypi/rawdog"
+HOMEPAGE="http://offog.org/code/rawdog.html https://pypi.org/project/rawdog"
 SRC_URI="http://offog.org/files/${P}.tar.gz"
 
 LICENSE="GPL-2"
diff --git a/net-print/hplip/hplip-3.17.10-r1.ebuild b/net-print/hplip/hplip-3.17.10-r1.ebuild
index b9500be12bd20..3eb07aaa37fd5 100644
--- a/net-print/hplip/hplip-3.17.10-r1.ebuild
+++ b/net-print/hplip/hplip-3.17.10-r1.ebuild
@@ -20,7 +20,7 @@ KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
 IUSE="doc fax +hpcups hpijs kde libressl -libusb0 minimal parport policykit qt5 scanner +snmp static-ppds X"
 
 # dependency on dev-python/notify-python dropped due to python 3 incompatibility
-# possible replacement notify2 (https://pypi.python.org/pypi/notify2/0.3) not in tree
+# possible replacement notify2 (https://pypi.org/project/notify2/0.3) not in tree
 
 COMMON_DEPEND="
 	net-print/cups
diff --git a/net-print/hplip/hplip-3.17.10.ebuild b/net-print/hplip/hplip-3.17.10.ebuild
index ad761f8e30123..f54e6aae145da 100644
--- a/net-print/hplip/hplip-3.17.10.ebuild
+++ b/net-print/hplip/hplip-3.17.10.ebuild
@@ -20,7 +20,7 @@ KEYWORDS="amd64 arm ppc ppc64 x86"
 IUSE="doc fax +hpcups hpijs kde libressl -libusb0 minimal parport policykit qt5 scanner +snmp static-ppds X"
 
 # dependency on dev-python/notify-python dropped due to python 3 incompatibility
-# possible replacement notify2 (https://pypi.python.org/pypi/notify2/0.3) not in tree
+# possible replacement notify2 (https://pypi.org/project/notify2/0.3) not in tree
 
 COMMON_DEPEND="
 	net-print/cups
diff --git a/net-print/hplip/hplip-3.18.3.ebuild b/net-print/hplip/hplip-3.18.3.ebuild
index fe86e7d5b572b..7a03206eac1d6 100644
--- a/net-print/hplip/hplip-3.18.3.ebuild
+++ b/net-print/hplip/hplip-3.18.3.ebuild
@@ -23,7 +23,7 @@ KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
 IUSE="doc fax +hpcups hpijs kde libressl -libusb0 minimal parport policykit qt5 scanner +snmp static-ppds X"
 
 # dependency on dev-python/notify-python dropped due to python 3 incompatibility
-# possible replacement notify2 (https://pypi.python.org/pypi/notify2/0.3) not in tree
+# possible replacement notify2 (https://pypi.org/project/notify2/0.3) not in tree
 
 COMMON_DEPEND="
 	net-print/cups
diff --git a/net-proxy/sshuttle/sshuttle-0.78.3-r2.ebuild b/net-proxy/sshuttle/sshuttle-0.78.3-r2.ebuild
index 6d1d9030054d0..3f550c42983aa 100644
--- a/net-proxy/sshuttle/sshuttle-0.78.3-r2.ebuild
+++ b/net-proxy/sshuttle/sshuttle-0.78.3-r2.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python{2_7,3_5,3_6} )
 inherit linux-info distutils-r1
 
 DESCRIPTION="Transparent proxy server that works as a poor man's VPN using ssh"
-HOMEPAGE="https://github.com/sshuttle/sshuttle https://pypi.python.org/pypi/sshuttle"
+HOMEPAGE="https://github.com/sshuttle/sshuttle https://pypi.org/project/sshuttle"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2+"
diff --git a/net-wireless/python-wifi/python-wifi-0.5.0-r3.ebuild b/net-wireless/python-wifi/python-wifi-0.5.0-r3.ebuild
index 2398d2b4f3bea..69c2dec771803 100644
--- a/net-wireless/python-wifi/python-wifi-0.5.0-r3.ebuild
+++ b/net-wireless/python-wifi/python-wifi-0.5.0-r3.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 )
 inherit distutils-r1
 
 DESCRIPTION="Provides r/w access to a wireless network card's capabilities"
-HOMEPAGE="https://pypi.python.org/pypi/python-wifi"
+HOMEPAGE="https://pypi.org/project/python-wifi"
 SRC_URI="mirror://sourceforge/${PN}.berlios/${P}.tar.bz2"
 
 SLOT="0"
diff --git a/sci-biology/biopandas/biopandas-0.1.4.ebuild b/sci-biology/biopandas/biopandas-0.1.4.ebuild
index 26e41891d0b22..9e1fdc736873f 100644
--- a/sci-biology/biopandas/biopandas-0.1.4.ebuild
+++ b/sci-biology/biopandas/biopandas-0.1.4.ebuild
@@ -14,7 +14,7 @@ DESCRIPTION="Molecular Structures in Pandas DataFrames"
 HOMEPAGE="
 	https://rasbt.github.io/biopandas/
 	https://github.com/rasbt/biopandas
-	https://pypi.python.org/pypi/BioPandas"
+	https://pypi.org/project/BioPandas"
 SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/sci-biology/biopandas/biopandas-0.2.1.ebuild b/sci-biology/biopandas/biopandas-0.2.1.ebuild
index 5243039d53b69..c8a752dce84f3 100644
--- a/sci-biology/biopandas/biopandas-0.2.1.ebuild
+++ b/sci-biology/biopandas/biopandas-0.2.1.ebuild
@@ -14,7 +14,7 @@ DESCRIPTION="Molecular Structures in Pandas DataFrames"
 HOMEPAGE="
 	https://rasbt.github.io/biopandas/
 	https://github.com/rasbt/biopandas
-	https://pypi.python.org/pypi/BioPandas"
+	https://pypi.org/project/BioPandas"
 SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/sci-biology/biopython/biopython-1.68.ebuild b/sci-biology/biopython/biopython-1.68.ebuild
index d0934b9879d90..9c8442e390908 100644
--- a/sci-biology/biopython/biopython-1.68.ebuild
+++ b/sci-biology/biopython/biopython-1.68.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5} pypy )
 inherit distutils-r1 eutils
 
 DESCRIPTION="Python modules for computational molecular biology"
-HOMEPAGE="http://www.biopython.org/ https://pypi.python.org/pypi/biopython/"
+HOMEPAGE="http://www.biopython.org/ https://pypi.org/project/biopython/"
 SRC_URI="http://www.biopython.org/DIST/${P}.tar.gz"
 
 LICENSE="HPND"
diff --git a/sci-biology/pysam/pysam-0.12.0.1.ebuild b/sci-biology/pysam/pysam-0.12.0.1.ebuild
index 1f4f58fdfe29c..d8328951bb17b 100644
--- a/sci-biology/pysam/pysam-0.12.0.1.ebuild
+++ b/sci-biology/pysam/pysam-0.12.0.1.ebuild
@@ -10,7 +10,7 @@ inherit distutils-r1
 DESCRIPTION="Python interface for the SAM/BAM sequence alignment and mapping format"
 HOMEPAGE="
 	https://github.com/pysam-developers/pysam
-	https://pypi.python.org/pypi/pysam"
+	https://pypi.org/project/pysam"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/sci-geosciences/seawater/seawater-2.0.1.ebuild b/sci-geosciences/seawater/seawater-2.0.1.ebuild
index 7e3abdb9163f6..324d8ac5d09c8 100644
--- a/sci-geosciences/seawater/seawater-2.0.1.ebuild
+++ b/sci-geosciences/seawater/seawater-2.0.1.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 )
 inherit distutils-r1
 
 DESCRIPTION="Calculate properties of sea water. Similar to SEAWATER 3.2 for MATLAB"
-HOMEPAGE="https://pypi.python.org/pypi/seawater/"
+HOMEPAGE="https://pypi.org/project/seawater/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/sci-geosciences/seawater/seawater-3.3.4.ebuild b/sci-geosciences/seawater/seawater-3.3.4.ebuild
index 661ef8f40cad7..ee873e03c3080 100644
--- a/sci-geosciences/seawater/seawater-3.3.4.ebuild
+++ b/sci-geosciences/seawater/seawater-3.3.4.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
 inherit distutils-r1
 
 DESCRIPTION="Calculate properties of sea water. Similar to SEAWATER 3.2 for MATLAB"
-HOMEPAGE="https://pypi.python.org/pypi/seawater/"
+HOMEPAGE="https://pypi.org/project/seawater/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/sci-libs/Fiona/Fiona-1.5.1.ebuild b/sci-libs/Fiona/Fiona-1.5.1.ebuild
index 85394dcc60ec4..d4a51401a9192 100644
--- a/sci-libs/Fiona/Fiona-1.5.1.ebuild
+++ b/sci-libs/Fiona/Fiona-1.5.1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_4 )
 inherit distutils-r1
 
 DESCRIPTION="OGR's neat, nimble, no-nonsense API"
-HOMEPAGE="https://pypi.python.org/pypi/Fiona"
+HOMEPAGE="https://pypi.org/project/Fiona"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/sci-libs/Fiona/Fiona-1.7.6.ebuild b/sci-libs/Fiona/Fiona-1.7.6.ebuild
index 2b00c823c1bb6..4154021ff892e 100644
--- a/sci-libs/Fiona/Fiona-1.7.6.ebuild
+++ b/sci-libs/Fiona/Fiona-1.7.6.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_{3,4,5,6}} )
 inherit distutils-r1
 
 DESCRIPTION="OGR's neat, nimble, no-nonsense API"
-HOMEPAGE="https://pypi.python.org/pypi/Fiona"
+HOMEPAGE="https://pypi.org/project/Fiona"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/sci-libs/Fiona/Fiona-9999.ebuild b/sci-libs/Fiona/Fiona-9999.ebuild
index a4322b36330ae..c54e9408c48e0 100644
--- a/sci-libs/Fiona/Fiona-9999.ebuild
+++ b/sci-libs/Fiona/Fiona-9999.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
 inherit distutils-r1 git-r3
 
 DESCRIPTION="OGR's neat, nimble, no-nonsense API"
-HOMEPAGE="https://pypi.python.org/pypi/Fiona"
+HOMEPAGE="https://pypi.org/project/Fiona"
 SRC_URI=""
 EGIT_REPO_URI="https://github.com/Toblerity/${PN}.git"
 
diff --git a/sci-libs/Rtree/Rtree-0.8.2.ebuild b/sci-libs/Rtree/Rtree-0.8.2.ebuild
index de9e5b077474d..80e739dbde9f3 100644
--- a/sci-libs/Rtree/Rtree-0.8.2.ebuild
+++ b/sci-libs/Rtree/Rtree-0.8.2.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 )
 inherit distutils-r1
 
 DESCRIPTION="R-Tree spatial index for Python GIS"
-HOMEPAGE="https://pypi.python.org/pypi/Rtree"
+HOMEPAGE="https://pypi.org/project/Rtree"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2"
diff --git a/sci-libs/Shapely/Shapely-1.3.0.ebuild b/sci-libs/Shapely/Shapely-1.3.0.ebuild
index 290fdf25740fb..cf854fc3004c5 100644
--- a/sci-libs/Shapely/Shapely-1.3.0.ebuild
+++ b/sci-libs/Shapely/Shapely-1.3.0.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_4 )
 inherit distutils-r1
 
 DESCRIPTION="Geometric objects, predicates, and operations"
-HOMEPAGE="https://pypi.python.org/pypi/Shapely"
+HOMEPAGE="https://pypi.org/project/Shapely"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/sci-libs/Shapely/Shapely-1.3.2.ebuild b/sci-libs/Shapely/Shapely-1.3.2.ebuild
index 290fdf25740fb..cf854fc3004c5 100644
--- a/sci-libs/Shapely/Shapely-1.3.2.ebuild
+++ b/sci-libs/Shapely/Shapely-1.3.2.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_4 )
 inherit distutils-r1
 
 DESCRIPTION="Geometric objects, predicates, and operations"
-HOMEPAGE="https://pypi.python.org/pypi/Shapely"
+HOMEPAGE="https://pypi.org/project/Shapely"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/sci-libs/Shapely/Shapely-1.5.17-r1.ebuild b/sci-libs/Shapely/Shapely-1.5.17-r1.ebuild
index 9dc9f27b2a211..76f1895833baf 100644
--- a/sci-libs/Shapely/Shapely-1.5.17-r1.ebuild
+++ b/sci-libs/Shapely/Shapely-1.5.17-r1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
 inherit distutils-r1
 
 DESCRIPTION="Geometric objects, predicates, and operations"
-HOMEPAGE="https://pypi.python.org/pypi/Shapely"
+HOMEPAGE="https://pypi.org/project/Shapely"
 
 if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3
diff --git a/sci-libs/Shapely/Shapely-1.5.17.ebuild b/sci-libs/Shapely/Shapely-1.5.17.ebuild
index a90108d26d171..c963c87cf7545 100644
--- a/sci-libs/Shapely/Shapely-1.5.17.ebuild
+++ b/sci-libs/Shapely/Shapely-1.5.17.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python{2_7,3_{4,5}} )
 inherit distutils-r1
 
 DESCRIPTION="Geometric objects, predicates, and operations"
-HOMEPAGE="https://pypi.python.org/pypi/Shapely"
+HOMEPAGE="https://pypi.org/project/Shapely"
 
 if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3
diff --git a/sci-libs/Shapely/Shapely-9999.ebuild b/sci-libs/Shapely/Shapely-9999.ebuild
index efa8587ea42e9..03f7c60c65069 100644
--- a/sci-libs/Shapely/Shapely-9999.ebuild
+++ b/sci-libs/Shapely/Shapely-9999.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
 inherit distutils-r1 git-r3
 
 DESCRIPTION="Geometric objects, predicates, and operations"
-HOMEPAGE="https://pypi.python.org/pypi/Shapely"
+HOMEPAGE="https://pypi.org/project/Shapely"
 SRC_URI=""
 EGIT_REPO_URI="https://github.com/Toblerity/${PN}.git"
 
diff --git a/sci-libs/deap/deap-1.0.0.ebuild b/sci-libs/deap/deap-1.0.0.ebuild
index cc81e092bcb02..a40d015405d9e 100644
--- a/sci-libs/deap/deap-1.0.0.ebuild
+++ b/sci-libs/deap/deap-1.0.0.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python{2_7,3_4} )
 inherit distutils-r1
 
 DESCRIPTION="Distributed Evolutionary Algorithms in Python"
-HOMEPAGE="https://code.google.com/p/deap/ https://pypi.python.org/pypi/deap/"
+HOMEPAGE="https://code.google.com/p/deap/ https://pypi.org/project/deap/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-3"
diff --git a/sci-libs/pycifrw/pycifrw-3.6.2.ebuild b/sci-libs/pycifrw/pycifrw-3.6.2.ebuild
index 4221d6ae43224..19fd43d8f8a5c 100644
--- a/sci-libs/pycifrw/pycifrw-3.6.2.ebuild
+++ b/sci-libs/pycifrw/pycifrw-3.6.2.ebuild
@@ -11,7 +11,7 @@ MY_PN="PyCifRW"
 MY_P="${MY_PN}-${PV}"
 
 DESCRIPTION="Provides support for reading and writing of CIF using python"
-HOMEPAGE="https://pypi.python.org/pypi/PyCifRW/ https://bitbucket.org/jamesrhester/pycifrw/wiki/Home"
+HOMEPAGE="https://pypi.org/project/PyCifRW/ https://bitbucket.org/jamesrhester/pycifrw/wiki/Home"
 SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="ASRP"
diff --git a/sci-libs/pycifrw/pycifrw-4.1.1.ebuild b/sci-libs/pycifrw/pycifrw-4.1.1.ebuild
index e2a8a84b2e991..17841ce359a7b 100644
--- a/sci-libs/pycifrw/pycifrw-4.1.1.ebuild
+++ b/sci-libs/pycifrw/pycifrw-4.1.1.ebuild
@@ -11,7 +11,7 @@ MY_PN="PyCifRW"
 MY_P="${MY_PN}-${PV}"
 
 DESCRIPTION="Reading and writing CIF (Crystallographic Information Format) files"
-HOMEPAGE="https://pypi.python.org/pypi/PyCifRW/ https://bitbucket.org/jamesrhester/pycifrw/wiki/Home"
+HOMEPAGE="https://pypi.org/project/PyCifRW/ https://bitbucket.org/jamesrhester/pycifrw/wiki/Home"
 SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="ASRP"
diff --git a/sci-libs/pyshp/pyshp-1.2.0.ebuild b/sci-libs/pyshp/pyshp-1.2.0.ebuild
index 40a25c90a67f9..4f727970c926a 100644
--- a/sci-libs/pyshp/pyshp-1.2.0.ebuild
+++ b/sci-libs/pyshp/pyshp-1.2.0.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
 inherit distutils-r1
 
 DESCRIPTION="Pure Python read/write support for ESRI Shapefile format"
-HOMEPAGE="https://pypi.python.org/pypi/pyshp/"
+HOMEPAGE="https://pypi.org/project/pyshp/"
 
 if [[ ${PV} == "9999" ]] ; then
 	SRC_URI=""
diff --git a/sci-libs/pyshp/pyshp-9999.ebuild b/sci-libs/pyshp/pyshp-9999.ebuild
index 40a25c90a67f9..4f727970c926a 100644
--- a/sci-libs/pyshp/pyshp-9999.ebuild
+++ b/sci-libs/pyshp/pyshp-9999.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
 inherit distutils-r1
 
 DESCRIPTION="Pure Python read/write support for ESRI Shapefile format"
-HOMEPAGE="https://pypi.python.org/pypi/pyshp/"
+HOMEPAGE="https://pypi.org/project/pyshp/"
 
 if [[ ${PV} == "9999" ]] ; then
 	SRC_URI=""
diff --git a/sci-mathematics/pymc/pymc-2.3.6.ebuild b/sci-mathematics/pymc/pymc-2.3.6.ebuild
index dc48d2559a460..a801f79150153 100644
--- a/sci-mathematics/pymc/pymc-2.3.6.ebuild
+++ b/sci-mathematics/pymc/pymc-2.3.6.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5} )
 inherit distutils-r1 flag-o-matic fortran-2 toolchain-funcs
 
 DESCRIPTION="Markov Chain Monte Carlo sampling toolkit"
-HOMEPAGE="https://github.com/${PN}-devs/${PN} https://pypi.python.org/pypi/${PN}"
+HOMEPAGE="https://github.com/${PN}-devs/${PN} https://pypi.org/project/${PN}"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
 
 SLOT=0
diff --git a/sci-visualization/mayavi/mayavi-4.3.0.ebuild b/sci-visualization/mayavi/mayavi-4.3.0.ebuild
index 4b61043d60e28..9492d357897ff 100644
--- a/sci-visualization/mayavi/mayavi-4.3.0.ebuild
+++ b/sci-visualization/mayavi/mayavi-4.3.0.ebuild
@@ -10,7 +10,7 @@ inherit distutils-r1 virtualx
 DESCRIPTION="Enthought Tool Suite: Scientific data 3-dimensional visualizer"
 HOMEPAGE="
 	http://code.enthought.com/projects/mayavi/
-	https://pypi.python.org/pypi/mayavi/"
+	https://pypi.org/project/mayavi/"
 SRC_URI="http://www.enthought.com/repo/ets/${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/sci-visualization/mayavi/mayavi-4.5.0.ebuild b/sci-visualization/mayavi/mayavi-4.5.0.ebuild
index 84348e718ed38..9368b708a3030 100644
--- a/sci-visualization/mayavi/mayavi-4.5.0.ebuild
+++ b/sci-visualization/mayavi/mayavi-4.5.0.ebuild
@@ -10,7 +10,7 @@ inherit distutils-r1 virtualx
 DESCRIPTION="Enthought Tool Suite: Scientific data 3-dimensional visualizer"
 HOMEPAGE="
 	http://code.enthought.com/projects/mayavi/
-	http://pypi.python.org/pypi/mayavi/"
+	http://pypi.org/project/mayavi/"
 SRC_URI="https://github.com/enthought/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/sys-fs/udiskie/udiskie-1.1.1.ebuild b/sys-fs/udiskie/udiskie-1.1.1.ebuild
index 22d3ae29b3cec..4546e227b8cac 100644
--- a/sys-fs/udiskie/udiskie-1.1.1.ebuild
+++ b/sys-fs/udiskie/udiskie-1.1.1.ebuild
@@ -6,7 +6,7 @@ PYTHON_COMPAT=( python2_7 )
 inherit distutils-r1 gnome2-utils
 
 DESCRIPTION="An automatic disk mounting service using udisks"
-HOMEPAGE="https://pypi.python.org/pypi/udiskie https://github.com/coldfix/udiskie"
+HOMEPAGE="https://pypi.org/project/udiskie https://github.com/coldfix/udiskie"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/www-apache/mod_scgi/mod_scgi-1.14-r1.ebuild b/www-apache/mod_scgi/mod_scgi-1.14-r1.ebuild
index 24560ce5468a9..2639e11eb69a8 100644
--- a/www-apache/mod_scgi/mod_scgi-1.14-r1.ebuild
+++ b/www-apache/mod_scgi/mod_scgi-1.14-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=5
 inherit apache-module eutils
 
 DESCRIPTION="Apache module for a replacement of the CGI protocol, similar to FastCGI"
-HOMEPAGE="http://python.ca/scgi/ https://pypi.python.org/pypi/scgi"
+HOMEPAGE="http://python.ca/scgi/ https://pypi.org/project/scgi"
 SRC_URI="http://python.ca/scgi/releases/scgi-${PV}.tar.gz"
 
 LICENSE="CNRI"
diff --git a/www-apps/ownpaste/ownpaste-0.2.2-r1.ebuild b/www-apps/ownpaste/ownpaste-0.2.2-r1.ebuild
index f141d29af9e8c..ca8e87f6a182a 100644
--- a/www-apps/ownpaste/ownpaste-0.2.2-r1.ebuild
+++ b/www-apps/ownpaste/ownpaste-0.2.2-r1.ebuild
@@ -14,7 +14,7 @@ fi
 inherit distutils-r1 ${HG_ECLASS}
 
 DESCRIPTION="Private pastebin (server-side implementation)"
-HOMEPAGE="http://ownpaste.rtfd.org/ https://pypi.python.org/pypi/ownpaste"
+HOMEPAGE="http://ownpaste.rtfd.org/ https://pypi.org/project/ownpaste"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/www-apps/ownpaste/ownpaste-9999.ebuild b/www-apps/ownpaste/ownpaste-9999.ebuild
index f141d29af9e8c..ca8e87f6a182a 100644
--- a/www-apps/ownpaste/ownpaste-9999.ebuild
+++ b/www-apps/ownpaste/ownpaste-9999.ebuild
@@ -14,7 +14,7 @@ fi
 inherit distutils-r1 ${HG_ECLASS}
 
 DESCRIPTION="Private pastebin (server-side implementation)"
-HOMEPAGE="http://ownpaste.rtfd.org/ https://pypi.python.org/pypi/ownpaste"
+HOMEPAGE="http://ownpaste.rtfd.org/ https://pypi.org/project/ownpaste"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/www-apps/roundup/roundup-1.5.1.ebuild b/www-apps/roundup/roundup-1.5.1.ebuild
index e3693ce0fb5af..152942fbf0f65 100644
--- a/www-apps/roundup/roundup-1.5.1.ebuild
+++ b/www-apps/roundup/roundup-1.5.1.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 )
 inherit distutils-r1
 
 DESCRIPTION="Issue-tracking system with command-line, web, and e-mail interfaces"
-HOMEPAGE="http://roundup.sourceforge.net https://pypi.python.org/pypi/roundup"
+HOMEPAGE="http://roundup.sourceforge.net https://pypi.org/project/roundup"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT ZPL"
diff --git a/www-apps/scgi/scgi-1.14-r1.ebuild b/www-apps/scgi/scgi-1.14-r1.ebuild
index 68172fcfa0839..2dddc7d25ddbc 100644
--- a/www-apps/scgi/scgi-1.14-r1.ebuild
+++ b/www-apps/scgi/scgi-1.14-r1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 )
 inherit distutils-r1
 
 DESCRIPTION="A Python package for implementing SCGI servers"
-HOMEPAGE="https://pypi.python.org/pypi/scgi http://python.ca/scgi/ http://www.mems-exchange.org/software/scgi/"
+HOMEPAGE="https://pypi.org/project/scgi http://python.ca/scgi/ http://www.mems-exchange.org/software/scgi/"
 SRC_URI="http://python.ca/scgi/releases/${P}.tar.gz"
 
 LICENSE="CNRI"
diff --git a/www-apps/trac/trac-1.0.13.ebuild b/www-apps/trac/trac-1.0.13.ebuild
index 3520f7bc0ea5b..9000e5dbbe030 100644
--- a/www-apps/trac/trac-1.0.13.ebuild
+++ b/www-apps/trac/trac-1.0.13.ebuild
@@ -14,7 +14,7 @@ MY_PV=${PV/_p/.post}
 MY_P=Trac-${MY_PV}
 
 DESCRIPTION="Enhanced wiki and issue tracking system for software development projects"
-HOMEPAGE="http://trac.edgewall.com/ https://pypi.python.org/pypi/Trac"
+HOMEPAGE="http://trac.edgewall.com/ https://pypi.org/project/Trac"
 SRC_URI="http://ftp.edgewall.com/pub/trac/${MY_P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/www-apps/trac/trac-1.0.9.ebuild b/www-apps/trac/trac-1.0.9.ebuild
index 05b93fd82c2a6..e199aa945efff 100644
--- a/www-apps/trac/trac-1.0.9.ebuild
+++ b/www-apps/trac/trac-1.0.9.ebuild
@@ -14,7 +14,7 @@ MY_PV=${PV/_p/.post}
 MY_P=Trac-${MY_PV}
 
 DESCRIPTION="Enhanced wiki and issue tracking system for software development projects"
-HOMEPAGE="http://trac.edgewall.com/ https://pypi.python.org/pypi/Trac"
+HOMEPAGE="http://trac.edgewall.com/ https://pypi.org/project/Trac"
 SRC_URI="http://ftp.edgewall.com/pub/trac/${MY_P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/www-apps/trac/trac-1.2-r1.ebuild b/www-apps/trac/trac-1.2-r1.ebuild
index ebdc5c23e93f1..38c684946c420 100644
--- a/www-apps/trac/trac-1.2-r1.ebuild
+++ b/www-apps/trac/trac-1.2-r1.ebuild
@@ -14,7 +14,7 @@ MY_PV=${PV/_p/.post}
 MY_P=Trac-${MY_PV}
 
 DESCRIPTION="Enhanced wiki and issue tracking system for software development projects"
-HOMEPAGE="http://trac.edgewall.com/ https://pypi.python.org/pypi/Trac"
+HOMEPAGE="http://trac.edgewall.com/ https://pypi.org/project/Trac"
 SRC_URI="http://ftp.edgewall.com/pub/trac/${MY_P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/www-apps/trac/trac-1.2.1.ebuild b/www-apps/trac/trac-1.2.1.ebuild
index f11b18c6bc422..4b2d400d4a4a0 100644
--- a/www-apps/trac/trac-1.2.1.ebuild
+++ b/www-apps/trac/trac-1.2.1.ebuild
@@ -14,7 +14,7 @@ MY_PV=${PV/_p/.post}
 MY_P=Trac-${MY_PV}
 
 DESCRIPTION="Enhanced wiki and issue tracking system for software development projects"
-HOMEPAGE="http://trac.edgewall.com/ https://pypi.python.org/pypi/Trac"
+HOMEPAGE="http://trac.edgewall.com/ https://pypi.org/project/Trac"
 SRC_URI="http://ftp.edgewall.com/pub/trac/${MY_P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/www-apps/trac/trac-1.2.ebuild b/www-apps/trac/trac-1.2.ebuild
index 3520f7bc0ea5b..9000e5dbbe030 100644
--- a/www-apps/trac/trac-1.2.ebuild
+++ b/www-apps/trac/trac-1.2.ebuild
@@ -14,7 +14,7 @@ MY_PV=${PV/_p/.post}
 MY_P=Trac-${MY_PV}
 
 DESCRIPTION="Enhanced wiki and issue tracking system for software development projects"
-HOMEPAGE="http://trac.edgewall.com/ https://pypi.python.org/pypi/Trac"
+HOMEPAGE="http://trac.edgewall.com/ https://pypi.org/project/Trac"
 SRC_URI="http://ftp.edgewall.com/pub/trac/${MY_P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/www-misc/urlwatch/urlwatch-2.5.ebuild b/www-misc/urlwatch/urlwatch-2.5.ebuild
index ce67eb6c5b839..9cc23df3f53ee 100644
--- a/www-misc/urlwatch/urlwatch-2.5.ebuild
+++ b/www-misc/urlwatch/urlwatch-2.5.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python{3_4,3_5} )
 inherit distutils-r1
 
 DESCRIPTION="A tool for monitoring webpages for updates"
-HOMEPAGE="https://pypi.python.org/pypi/urlwatch"
+HOMEPAGE="https://pypi.org/project/urlwatch"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/www-misc/urlwatch/urlwatch-2.6.ebuild b/www-misc/urlwatch/urlwatch-2.6.ebuild
index 3ea5b563add3d..47ba4623fb7f2 100644
--- a/www-misc/urlwatch/urlwatch-2.6.ebuild
+++ b/www-misc/urlwatch/urlwatch-2.6.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python{3_4,3_5} )
 inherit distutils-r1
 
 DESCRIPTION="A tool for monitoring webpages for updates"
-HOMEPAGE="https://pypi.python.org/pypi/urlwatch"
+HOMEPAGE="https://pypi.org/project/urlwatch"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/www-servers/gunicorn/gunicorn-19.1.1.ebuild b/www-servers/gunicorn/gunicorn-19.1.1.ebuild
index 2b534c00a950c..fde0b51962110 100644
--- a/www-servers/gunicorn/gunicorn-19.1.1.ebuild
+++ b/www-servers/gunicorn/gunicorn-19.1.1.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
 inherit distutils-r1
 
 DESCRIPTION="A WSGI HTTP Server for UNIX"
-HOMEPAGE="http://gunicorn.org https://pypi.python.org/pypi/gunicorn"
+HOMEPAGE="http://gunicorn.org https://pypi.org/project/gunicorn"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/www-servers/gunicorn/gunicorn-19.3.0.ebuild b/www-servers/gunicorn/gunicorn-19.3.0.ebuild
index 5990dadd704d4..030c35a54df12 100644
--- a/www-servers/gunicorn/gunicorn-19.3.0.ebuild
+++ b/www-servers/gunicorn/gunicorn-19.3.0.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
 inherit distutils-r1
 
 DESCRIPTION="A WSGI HTTP Server for UNIX"
-HOMEPAGE="http://gunicorn.org https://pypi.python.org/pypi/gunicorn https://github.com/benoitc/gunicorn"
+HOMEPAGE="http://gunicorn.org https://pypi.org/project/gunicorn https://github.com/benoitc/gunicorn"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/www-servers/gunicorn/gunicorn-19.4.5.ebuild b/www-servers/gunicorn/gunicorn-19.4.5.ebuild
index 05be8e62d5fa4..73095f06827db 100644
--- a/www-servers/gunicorn/gunicorn-19.4.5.ebuild
+++ b/www-servers/gunicorn/gunicorn-19.4.5.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
 inherit distutils-r1
 
 DESCRIPTION="A WSGI HTTP Server for UNIX"
-HOMEPAGE="http://gunicorn.org https://pypi.python.org/pypi/gunicorn https://github.com/benoitc/gunicorn"
+HOMEPAGE="http://gunicorn.org https://pypi.org/project/gunicorn https://github.com/benoitc/gunicorn"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/www-servers/gunicorn/gunicorn-19.6.0.ebuild b/www-servers/gunicorn/gunicorn-19.6.0.ebuild
index 6da709721f9fa..e00b4055cf718 100644
--- a/www-servers/gunicorn/gunicorn-19.6.0.ebuild
+++ b/www-servers/gunicorn/gunicorn-19.6.0.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
 inherit distutils-r1
 
 DESCRIPTION="A WSGI HTTP Server for UNIX"
-HOMEPAGE="http://gunicorn.org https://pypi.python.org/pypi/gunicorn https://github.com/benoitc/gunicorn"
+HOMEPAGE="http://gunicorn.org https://pypi.org/project/gunicorn https://github.com/benoitc/gunicorn"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT PSF-2 doc? ( BSD )"
diff --git a/www-servers/tornado/tornado-4.4.2-r1.ebuild b/www-servers/tornado/tornado-4.4.2-r1.ebuild
index 5321d46eb9358..340c2da3043f7 100644
--- a/www-servers/tornado/tornado-4.4.2-r1.ebuild
+++ b/www-servers/tornado/tornado-4.4.2-r1.ebuild
@@ -9,7 +9,7 @@ PYTHON_REQ_USE="threads(+)"
 inherit distutils-r1
 
 DESCRIPTION="Python web framework and asynchronous networking library"
-HOMEPAGE="http://www.tornadoweb.org/ https://pypi.python.org/pypi/tornado"
+HOMEPAGE="http://www.tornadoweb.org/ https://pypi.org/project/tornado"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"