diff --git a/app-crypt/hashid/hashid-9999.ebuild b/app-crypt/hashid/hashid-9999.ebuild
index 1edced946..b20084de2 100644
--- a/app-crypt/hashid/hashid-9999.ebuild
+++ b/app-crypt/hashid/hashid-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{5,6}} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 
 inherit distutils-r1
 
diff --git a/dev-python/editorconfig/Manifest b/dev-python/editorconfig/Manifest
index 25dc35a62..d7bb4b885 100644
--- a/dev-python/editorconfig/Manifest
+++ b/dev-python/editorconfig/Manifest
@@ -1,2 +1 @@
-DIST EditorConfig-0.12.1.tar.gz 19282 BLAKE2B baee598b125d92129925d5e4bc25ab73e96a97f0211331a10bafd5557e2024f573658b6384bebe01624fb0e33f413cdee14f32ce459ee421c32bc76047df3b1e SHA512 d31abc261c3f2e17582d3c5ef549fd2f2292588d8a4549eb98d80693cf94a50078047d95892164a71043375f6c5596152ac62e04e854d78458cfb1183030669f
 DIST EditorConfig-0.12.2.tar.gz 13485 BLAKE2B 11408c8aa2b1bd31588d1f58dc22a409802642ba09d20a138f441465155eaec01df058e17c08844e4f7c6a5bb549548235584e15ee19f7a7ef937065cd0da0eb SHA512 15648904683e04b68966651ebf2046b60473a47a408dff257d64d06b6c0cc6765882ebf5ec0e0ccaf5dc7e78e93b5f9bdf129ae0e2a23f7f489cb50c9ae3ff16
diff --git a/dev-python/editorconfig/editorconfig-0.12.1-r1.ebuild b/dev-python/editorconfig/editorconfig-0.12.1-r1.ebuild
deleted file mode 100644
index f8830f6aa..000000000
--- a/dev-python/editorconfig/editorconfig-0.12.1-r1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-
-inherit distutils-r1
-
-MY_PN=EditorConfig
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="EditorConfig File Locator and Interpreter for Python"
-HOMEPAGE="https://pypi.python.org/pypi/EditorConfig"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="PSF-2.4"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND=""
-
-S=${WORKDIR}/${MY_P}
diff --git a/dev-python/editorconfig/editorconfig-0.12.2.ebuild b/dev-python/editorconfig/editorconfig-0.12.2.ebuild
index f8830f6aa..8ba6c1d79 100644
--- a/dev-python/editorconfig/editorconfig-0.12.2.ebuild
+++ b/dev-python/editorconfig/editorconfig-0.12.2.ebuild
@@ -1,10 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
-EAPI=5
+EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 
 inherit distutils-r1
 
diff --git a/dev-python/flask-jwt-extended/Manifest b/dev-python/flask-jwt-extended/Manifest
index aa027cd3f..af099f430 100644
--- a/dev-python/flask-jwt-extended/Manifest
+++ b/dev-python/flask-jwt-extended/Manifest
@@ -1,3 +1 @@
-DIST flask-jwt-extended-3.18.2.tar.gz 56548 BLAKE2B 9e768a8ae4e729f8318274b40f7fd7e1c73fa807e5c08e34e061d1271998243c07bc0ff7e8f552bedcd6f385f09044429c085867af4f63b9e2195a2231ec14e3 SHA512 0fafc874a64c525e820a1cced67102500b6d174e08a04474350c90e0e366b6fc40a770cc9887b7068ab6ad7596d1ddcf1f6c7473571ec0cc504291cb70fd03fe
-DIST flask-jwt-extended-3.22.0.tar.gz 58121 BLAKE2B 8cd68bd69f2d6eb511540d9e6f9bae9667e17ee226b445c789e743d0fe13ba16c47ce4aeebd476bb07b61364ae9e364c78bd9e82e6803e48e6e23acc2ff150b1 SHA512 925afa197a099171b64c23b464906cb3113260d071074d538af3c66910758f04b779d1cebaf9eeb2ddda26ae2af9481356f8d220602d4c12039f66d0c2b9e7e4
-DIST flask-jwt-extended-3.23.0.tar.gz 58417 BLAKE2B 8ab936cc913492aeece12905541b47bd3dc9e13cbf806c3ea277be9bd882588173e0d8ece394c0e051594d383902dd221909fc77379b7f6a4b2e3cbe329c484b SHA512 872f38008ff3f782ca2d0571b20a1a6cca296b2374dc006122c68e661a0c397be8f87c11c37651159fb571dc9a25a3aa86dbb5a98286ce54a45afe97ce6f9be4
+DIST flask-jwt-extended-3.24.1.tar.gz 59311 BLAKE2B bfb041b76f00c012c79ead0c7387bdbf2ce9a6d2a30af7b56237fc7f78f5b2057aac8b2930b83de41ea81867ff20c1572f8e9a25f933ea985a33d25a12755cb8 SHA512 f00299f3163f9706217844f36d54ceb7c099b7bfd5421c0bbe489beb835a94e898df1743bb894e16f59273f6a4e92b1881f8757f43b4458f54a8988def4235b6
diff --git a/dev-python/flask-jwt-extended/flask-jwt-extended-3.18.2.ebuild b/dev-python/flask-jwt-extended/flask-jwt-extended-3.18.2.ebuild
deleted file mode 100644
index dc1c2fe26..000000000
--- a/dev-python/flask-jwt-extended/flask-jwt-extended-3.18.2.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
-
-inherit distutils-r1
-
-DESCRIPTION="An open source Flask extension that provides JWT support"
-HOMEPAGE="https://github.com/vimalloc/flask-jwt-extended"
-SRC_URI="https://github.com/vimalloc/flask-jwt-extended/archive/${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	>=dev-python/asn1crypto-0.24.0[${PYTHON_USEDEP}]
-	>=dev-python/cryptography-2.4.2[${PYTHON_USEDEP}]
-	dev-python/flask[${PYTHON_USEDEP}]
-	dev-python/flask-sphinx-themes[${PYTHON_USEDEP}]
-	>=dev-python/pyjwt-1.7.1[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/werkzeug[${PYTHON_USEDEP}]"
diff --git a/dev-python/flask-jwt-extended/flask-jwt-extended-3.23.0.ebuild b/dev-python/flask-jwt-extended/flask-jwt-extended-3.23.0.ebuild
deleted file mode 100644
index 7c8035642..000000000
--- a/dev-python/flask-jwt-extended/flask-jwt-extended-3.23.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
-
-inherit distutils-r1
-
-DESCRIPTION="An open source Flask extension that provides JWT support"
-HOMEPAGE="https://github.com/vimalloc/flask-jwt-extended"
-SRC_URI="https://github.com/vimalloc/flask-jwt-extended/archive/${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	>=dev-python/asn1crypto-0.24.0[${PYTHON_USEDEP}]
-	>=dev-python/cryptography-2.4.2[${PYTHON_USEDEP}]
-	>=dev-python/flask-1.0.2[${PYTHON_USEDEP}]
-	dev-python/flask-sphinx-themes[${PYTHON_USEDEP}]
-	>=dev-python/pyjwt-1.7.1[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/werkzeug[${PYTHON_USEDEP}]"
diff --git a/dev-python/flask-jwt-extended/flask-jwt-extended-3.22.0.ebuild b/dev-python/flask-jwt-extended/flask-jwt-extended-3.24.1.ebuild
similarity index 73%
rename from dev-python/flask-jwt-extended/flask-jwt-extended-3.22.0.ebuild
rename to dev-python/flask-jwt-extended/flask-jwt-extended-3.24.1.ebuild
index 7c8035642..360203a5d 100644
--- a/dev-python/flask-jwt-extended/flask-jwt-extended-3.22.0.ebuild
+++ b/dev-python/flask-jwt-extended/flask-jwt-extended-3.24.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 
 inherit distutils-r1
 
@@ -17,10 +17,9 @@ IUSE=""
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="${PYTHON_DEPS}
-	>=dev-python/asn1crypto-0.24.0[${PYTHON_USEDEP}]
-	>=dev-python/cryptography-2.4.2[${PYTHON_USEDEP}]
+	>=dev-python/werkzeug-0.14[${PYTHON_USEDEP}]
 	>=dev-python/flask-1.0.2[${PYTHON_USEDEP}]
-	dev-python/flask-sphinx-themes[${PYTHON_USEDEP}]
 	>=dev-python/pyjwt-1.7.1[${PYTHON_USEDEP}]
 	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/werkzeug[${PYTHON_USEDEP}]"
+	>=dev-python/cryptography-2.4.2[${PYTHON_USEDEP}]
+	"
diff --git a/dev-python/flask-jwt/flask-jwt-0.3.2.ebuild b/dev-python/flask-jwt/flask-jwt-0.3.2.ebuild
index 29880821d..ce2f6dd9b 100644
--- a/dev-python/flask-jwt/flask-jwt-0.3.2.ebuild
+++ b/dev-python/flask-jwt/flask-jwt-0.3.2.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy )
+
+PYTHON_COMPAT=( python3_{6,7,8} )
 
 inherit distutils-r1
 
diff --git a/dev-python/geoip2-python/Manifest b/dev-python/geoip2-python/Manifest
index e497bd616..d73c36e8a 100644
--- a/dev-python/geoip2-python/Manifest
+++ b/dev-python/geoip2-python/Manifest
@@ -1 +1 @@
-DIST GeoIP2-python-2.8.0.tar.gz 32783 BLAKE2B 48b711b2517769ab9483a4f33c53e5ad9d84c2b6b013219ba7e945db22fbbfa3b0348e9cd1f4f63ae62024d39a74c5fedbae6502cfac8492576ba25b2e545f17 SHA512 08a23b55bc2cb55552aad4d821e129170d2c2e2d9a22aff7e365692a325166470460b77e500cfa04c00e08f89531f762dc9e4c1b1543752c40459b1cd99f55c5
+DIST GeoIP2-python-3.0.0.tar.gz 35698 BLAKE2B c3235d7d3e5cd3fc3372434de9077175a36c6650050f8317d88ffe63ba12bc7ae92e665f0dcb5d55247c5c445adb9cfb3434f60e77ca2927dabec85618afbd00 SHA512 685cfaca15abac73ceafa5795d8740a9d1e95f255c516623c80981bb78a5c6ad357829b154c382a4928295f311c6922b621aee1c794cac962da857507bfcfbdb
diff --git a/dev-python/geoip2-python/geoip2-python-2.8.0.ebuild b/dev-python/geoip2-python/geoip2-python-3.0.0.ebuild
similarity index 73%
rename from dev-python/geoip2-python/geoip2-python-2.8.0.ebuild
rename to dev-python/geoip2-python/geoip2-python-3.0.0.ebuild
index 745278e19..949f2d2d5 100644
--- a/dev-python/geoip2-python/geoip2-python-2.8.0.ebuild
+++ b/dev-python/geoip2-python/geoip2-python-3.0.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy pypy3 )
+PYTHON_COMPAT=( python3_{6,7,8} pypy3 )
 
 inherit distutils-r1
 
@@ -18,8 +18,9 @@ SLOT="0"
 KEYWORDS="~amd64"
 IUSE=""
 
-RDEPEND=">=dev-python/maxminddb-1.2.1[${PYTHON_USEDEP}]
-		>=dev-python/requests-2.9[${PYTHON_USEDEP}]"
+RDEPEND=">=dev-python/maxminddb-1.5.1[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.22[${PYTHON_USEDEP}]
+	>=dev-python/urllib3-1.25.2[${PYTHON_USEDEP}]"
 DEPEND="${RDEPEND}"
 
 S="${WORKDIR}/${MY_P}"
diff --git a/dev-python/htmlentities/htmlentities-0.3.0.ebuild b/dev-python/htmlentities/htmlentities-0.3.0.ebuild
index fd73bb645..d81ab0bc2 100644
--- a/dev-python/htmlentities/htmlentities-0.3.0.ebuild
+++ b/dev-python/htmlentities/htmlentities-0.3.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} )
 inherit distutils-r1
 
 DESCRIPTION="Easy-to-use data handling for SQL data stores"
@@ -17,8 +17,7 @@ KEYWORDS="~amd64 ~x86"
 
 RDEPEND=""
 DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"
+	dev-python/setuptools[${PYTHON_USEDEP}]"
 
 S="${WORKDIR}/python-${P}"
 
diff --git a/dev-python/jsbeautifier/Manifest b/dev-python/jsbeautifier/Manifest
index e4b48119b..1be8834fb 100644
--- a/dev-python/jsbeautifier/Manifest
+++ b/dev-python/jsbeautifier/Manifest
@@ -1,3 +1 @@
-DIST jsbeautifier-1.10.0.tar.gz 69079 BLAKE2B 83b1fdc5cc2083847279a6a23b3a9521940e7be50997b2c4d4350948a446111d7b117136fdd022c70063cf13cdbd8dea62d03c0a66a5824b552cdc969ea14abc SHA512 7d020dc111a078fe2b8cc560b1f8ecfab0322a8955422522ba5975de2fcd4cf05ee261532f27c9cc97441f489492f7aa4a3241e4a23af916724a91e1e9d1d23b
-DIST jsbeautifier-1.8.9.tar.gz 64780 BLAKE2B 79ac38602862ca6975df89a020f0ed95d7529801ef8b0ba40ee253bfcde4b1314f4dd8c90d8f2400d3e70c2d8654dd1c8e47dfa56e2fa29563efedcac594d84b SHA512 cbc0942ae6465bde74f50b3649e5f46adbb4dae5b454e77eaa239b02d0b1c5f4c56303d6beb5417559080ed9c6d8247398635c2d96b1f2b764a0f7abd2e2cbdc
-DIST jsbeautifier-1.9.1.tar.gz 68266 BLAKE2B 525a8687b990ee647a54b8522a2a3ffefb33abbccd5abe75c8e50f835364f3ee31d977e286353ffee7b04442d3e8255d31407c094278a692a6ee6be028a64a03 SHA512 74237f6c07dd7693ff68b56f1c0cac21d574e8efdabb6bd91db9e9a36d1b055ad0536504fbae7196ab49d55301e8c2cff431ea2bcfec04d37e910e410013293b
+DIST jsbeautifier-1.11.0.tar.gz 69799 BLAKE2B a24fe2d43a836c71ec19342013cd6e33977a671813410488fd4af2112e697f2d7b505481827dd585dd6101265c0699d278cd7d5d8867460d4ceadcdeca0d6dae SHA512 1321493314f091b3b6d8d128de0f5931dbc35b447ea59665044262e99098b9766d7e1a7fa2725423fdfe13be88cc25858b40e8a88a4e3d9bb5426a8ba617156c
diff --git a/dev-python/jsbeautifier/jsbeautifier-1.10.0.ebuild b/dev-python/jsbeautifier/jsbeautifier-1.10.0.ebuild
deleted file mode 100644
index 80de9c181..000000000
--- a/dev-python/jsbeautifier/jsbeautifier-1.10.0.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2019 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-
-inherit distutils-r1
-
-DESCRIPTION="Beautify, unpack or deobfuscate JavaScript"
-HOMEPAGE="https://pypi.python.org/pypi/jsbeautifier"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-python/six-1.6.1[${PYTHON_USEDEP}]
-	>=dev-python/editorconfig-0.12.0[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/jsbeautifier/jsbeautifier-1.9.1.ebuild b/dev-python/jsbeautifier/jsbeautifier-1.11.0.ebuild
similarity index 66%
rename from dev-python/jsbeautifier/jsbeautifier-1.9.1.ebuild
rename to dev-python/jsbeautifier/jsbeautifier-1.11.0.ebuild
index 80de9c181..7995122b8 100644
--- a/dev-python/jsbeautifier/jsbeautifier-1.9.1.ebuild
+++ b/dev-python/jsbeautifier/jsbeautifier-1.11.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 
 inherit distutils-r1
 
@@ -16,7 +16,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-RDEPEND=">=dev-python/six-1.6.1[${PYTHON_USEDEP}]
-	>=dev-python/editorconfig-0.12.0[${PYTHON_USEDEP}]"
+RDEPEND=">=dev-python/six-1.13.0[${PYTHON_USEDEP}]
+	>=dev-python/editorconfig-0.12.2[${PYTHON_USEDEP}]"
 DEPEND="${RDEPEND}
 	dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/jsbeautifier/jsbeautifier-1.8.9.ebuild b/dev-python/jsbeautifier/jsbeautifier-1.8.9.ebuild
deleted file mode 100644
index 82f6a5ef6..000000000
--- a/dev-python/jsbeautifier/jsbeautifier-1.8.9.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-
-inherit distutils-r1
-
-DESCRIPTION="Beautify, unpack or deobfuscate JavaScript"
-HOMEPAGE="https://pypi.python.org/pypi/jsbeautifier"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-python/six-1.6.1[${PYTHON_USEDEP}]
-	>=dev-python/editorconfig-0.12.0[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/maxminddb/Manifest b/dev-python/maxminddb/Manifest
index 80d2ad45f..0d5470b75 100644
--- a/dev-python/maxminddb/Manifest
+++ b/dev-python/maxminddb/Manifest
@@ -1 +1 @@
-DIST MaxMind-DB-Reader-python-1.4.1.tar.gz 32001 BLAKE2B 793d42c5c9e99742f282bad1cfd99c2427d9fade649b6a0a650c245b8378bbc6cf1e4c9fa67a324a3618abcaae5cad173815d36f3e438ce10c43bfa6067654a1 SHA512 94bee89a0ef9d24f937f12f79dc8b9686be46ba3aeedc5538cc0c2ff4379ad2eb0bb84914849d3baa9120d4bbdb3abc215e30efd237a2c6d5fc0161e7e40c0d6
+DIST MaxMind-DB-Reader-python-1.5.2.tar.gz 33471 BLAKE2B 974b60153987b763e77437849c62a5f31236205c2bc305d7debb58777f056d50f36e301f024ef3acc0477eafe4a14a49071c3c8dcf6bdce3e2503436cd871934 SHA512 1f4ceb3514bba357ec5439a008e7e314c83f2073d5752317bcf6d91f2bb3218ebce33638c44360132e4b12a5694fdbaf75d4ec8c8796fb96844f82d702a29c50
diff --git a/dev-python/maxminddb/maxminddb-1.4.1-r1.ebuild b/dev-python/maxminddb/maxminddb-1.5.2.ebuild
similarity index 70%
rename from dev-python/maxminddb/maxminddb-1.4.1-r1.ebuild
rename to dev-python/maxminddb/maxminddb-1.5.2.ebuild
index d8d617663..af7c90a44 100644
--- a/dev-python/maxminddb/maxminddb-1.4.1-r1.ebuild
+++ b/dev-python/maxminddb/maxminddb-1.5.2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy pypy3 )
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8} pypy3 )
 
 inherit distutils-r1
 
@@ -18,11 +18,9 @@ SLOT="0"
 KEYWORDS="amd64 ~ia64 ~ppc ~sparc x86 ~x86-fbsd"
 IUSE=""
 
-RDEPEND="virtual/python-ipaddress[${PYTHON_USEDEP}]"
-DEPEND="
-	${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"
+RDEPEND=""
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
 
 S="${WORKDIR}/${MY_P}"
 
diff --git a/dev-python/qt-py/Manifest b/dev-python/qt-py/Manifest
index 0539021a0..ded52ed17 100644
--- a/dev-python/qt-py/Manifest
+++ b/dev-python/qt-py/Manifest
@@ -1,2 +1 @@
-DIST qt-py-1.1.0.tar.gz 52383 BLAKE2B d38376635b52bed364e9e826046e02543733e5416f9a85069ec82419d75fb210459e37314953dd76397408bdb10e6440e01331165d4c7ca02e8a1c1dfe899a73 SHA512 603090c3a20b8b9db1771b7b1a4328228d6e9aa529208b18704174b1fde241bedd1ce2090410c0dea4f6ec68653c3ec807486cfa113a8a649daa7430e9a291f3
-DIST qt-py-1.2.3.tar.gz 56197 BLAKE2B 8bbda68b787797d67173fb7e9de01d58a470c3f65803040eba434d69153cc891d9505e30c1124a4df221d20bf05aab4bae28231a195c62518db8b4fa9eb22181 SHA512 525247099c6c700e3d00be9b93d0b405fa8d0cb625b31caa993e842467e56649fb01f55e581974515a24648afa3ccf25a1d3f096282f129b23d8e36ef1f41d87
+DIST qt-py-1.2.5.tar.gz 57333 BLAKE2B 844ed2e789b31cde0f4842cd3ae61942a3aa57054e793349827dbff82a66fb162d0142ad46e2d819e10d4c35e946fb5620f00ce1fd469b77e3fb06aa1829abe3 SHA512 c38a61007df2138ac38b33d61df456a70cc0aa94ac1d4b37384420fab28f9f75218258680e23ff181a0092f8b04b8d20441b3b64c051da07b13f8e49a5d36b1e
diff --git a/dev-python/qt-py/qt-py-1.1.0.ebuild b/dev-python/qt-py/qt-py-1.1.0.ebuild
deleted file mode 100644
index 83434a95e..000000000
--- a/dev-python/qt-py/qt-py-1.1.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-
-inherit distutils-r1
-
-DESCRIPTION="Minimal Python 2 & 3 shim around all Qt bindings"
-HOMEPAGE="https://github.com/mottosso/Qt.py"
-
-LICENSE="MIT"
-SLOT="0"
-
-if [ "${PV}" = "9999" ]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/mottosso/Qt.py.git"
-	KEYWORDS=""
-else
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/mottosso/Qt.py/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}"/Qt.py-"${PV}"
-fi
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="${PYTHON_DEPS}"
-RDEPEND="${DEPEND}
-	dev-python/PyQt5[${PYTHON_USEDEP}]"
-
-python_prepare_all() {
-	#do not install LICENSE into /usr
-	sed -e '/data_files/d' -i setup.py || die
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/qt-py/qt-py-1.2.3.ebuild b/dev-python/qt-py/qt-py-1.2.5.ebuild
similarity index 89%
rename from dev-python/qt-py/qt-py-1.2.3.ebuild
rename to dev-python/qt-py/qt-py-1.2.5.ebuild
index 4e9f98c6a..d08670fed 100644
--- a/dev-python/qt-py/qt-py-1.2.3.ebuild
+++ b/dev-python/qt-py/qt-py-1.2.5.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} )
 
 inherit distutils-r1
 
diff --git a/dev-python/shortuuid/Manifest b/dev-python/shortuuid/Manifest
index b34757dfd..9c2315441 100644
--- a/dev-python/shortuuid/Manifest
+++ b/dev-python/shortuuid/Manifest
@@ -1 +1 @@
-DIST shortuuid-0.5.0.tar.gz 6123 BLAKE2B f4891cd4261fe2a79e21c60874cc41c26596561a16bd70a85b04efa61d937d99be39f1b99a86a0fc99fd1b22ca40155161e612f2d49b6caabc23620f388b7cee SHA512 bf0b804281af1a515979a104c22e0c0e5cf99fe55efe6e29bb4b4b0d1d5a78b1e83a2d0262d6c2e2c2745f5ea198153fba80718aabac2955c691e6cb9bd5f4b5
+DIST shortuuid-1.0.1.tar.gz 6974 BLAKE2B f7fde10a79e05627a49c5155fcbc4f5574f05ae5b60ae23c670d7d2ddc82b06fd93a753b98bd9ea0f123994eb0f530dd374a335936a53553135bd0f8d3ada4fa SHA512 fd8eca4b8b944c591f51aba4fceedddf4adac7fb052a40304fff8590a535b451ffe15b48dde9164d4386be9f5ca9af824c936812bfb192991c443b20a1e38070
diff --git a/dev-python/shortuuid/shortuuid-0.5.0.ebuild b/dev-python/shortuuid/shortuuid-1.0.1.ebuild
similarity index 88%
rename from dev-python/shortuuid/shortuuid-0.5.0.ebuild
rename to dev-python/shortuuid/shortuuid-1.0.1.ebuild
index b1e09e2e8..1272b18c9 100644
--- a/dev-python/shortuuid/shortuuid-0.5.0.ebuild
+++ b/dev-python/shortuuid/shortuuid-1.0.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 inherit distutils-r1
 
 DESCRIPTION="A generator library for concise, unambiguous and URL-safe UUIDs."
diff --git a/dev-python/tls_parser/Manifest b/dev-python/tls_parser/Manifest
index a37194818..77e29bb67 100644
--- a/dev-python/tls_parser/Manifest
+++ b/dev-python/tls_parser/Manifest
@@ -1,3 +1 @@
-DIST tls_parser-1.1.0.tar.gz 17477 BLAKE2B 5dcf77f91b9450b545142f266d83b77c9f8a9ae93f21d615c26f018a1378cbd54a7161fb6edb62e62cb1df8f6468a03e17d6b014c2d64bbdf513f7e47972ac57 SHA512 1186836e9dec5c5a9828ca2e9a6307e2513060f8fe5816796dc55624fc99958489fad5ea8a25473cf092516ba872a6b6c5e3a3fd19dc2d820587244b842d1b99
-DIST tls_parser-1.1.1.tar.gz 18221 BLAKE2B 18d13235082c044a075550394eb2dd7a97f6e3dec3a02c1c8159b4d48e2bd4cc84879ffe29e462bf1205ff9d50065f77aab191d722d8032762050bea86f989e0 SHA512 b40efaffef31452bf8c16a59e8bfe45e9bc36471ec373cacae50cc89bad53eab98c0cc6bfd8471052d317d8ee3ac75986dc12171ddba9c0a270246f28973a2b3
 DIST tls_parser-1.2.1.tar.gz 21038 BLAKE2B 08ab3808a11b8d866e07733e0c36926f455efed47d3a5c74c2db51fda2fcee5f9058b091f1a80826dad77540f104117b72ff7f74287992d580a1b7a2dde4f16f SHA512 090510c147f57820c7121919ca4ec9188fef215f2d5630fcd2aead7f4cc800e20f7746a7ab6e88658edeaf2f838bd351bd393659dce934dd54d988f9532b4627
diff --git a/dev-python/tls_parser/tls_parser-1.1.0.ebuild b/dev-python/tls_parser/tls_parser-1.1.0.ebuild
deleted file mode 100644
index a96cb5c49..000000000
--- a/dev-python/tls_parser/tls_parser-1.1.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-
-inherit distutils-r1
-
-DESCRIPTION="Small library to parse TLS records."
-HOMEPAGE="https://github.com/nabla-c0d3/tls_parser"
-SRC_URI="https://github.com/nabla-c0d3/tls_parser/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}
-	dev-python/typing
-	dev-python/enum34
-"
-
-#typing; python_version < '3.5'
-#enum34; python_version < '3.4'
diff --git a/dev-python/tls_parser/tls_parser-1.1.1.ebuild b/dev-python/tls_parser/tls_parser-1.1.1.ebuild
deleted file mode 100644
index a96cb5c49..000000000
--- a/dev-python/tls_parser/tls_parser-1.1.1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-
-inherit distutils-r1
-
-DESCRIPTION="Small library to parse TLS records."
-HOMEPAGE="https://github.com/nabla-c0d3/tls_parser"
-SRC_URI="https://github.com/nabla-c0d3/tls_parser/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}
-	dev-python/typing
-	dev-python/enum34
-"
-
-#typing; python_version < '3.5'
-#enum34; python_version < '3.4'
diff --git a/net-analyzer/osmedeus/osmedeus-9999.ebuild b/net-analyzer/osmedeus/osmedeus-9999.ebuild
index 0df6ae931..ab36b7ee9 100644
--- a/net-analyzer/osmedeus/osmedeus-9999.ebuild
+++ b/net-analyzer/osmedeus/osmedeus-9999.ebuild
@@ -2,7 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{5,6} )
+
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit eutils git-r3 python-r1
 
diff --git a/net-misc/linkfinder/Manifest b/net-misc/linkfinder/Manifest
index 5d360214a..46af99838 100644
--- a/net-misc/linkfinder/Manifest
+++ b/net-misc/linkfinder/Manifest
@@ -1,2 +1 @@
-DIST linkfinder-20190717.tar.gz 8641 BLAKE2B 98a70be6c0f09216a56fbd52a2241d226fa0c683f677c7639a6e0146e2a221396941473f8ef404ae5a10e816d0c01aa71ac4d103e51dfe8ed9520e8314b63298 SHA512 9ec3ec7d07b8a08b3ffe34ab48b4fb644c8590fcea4998a66d05e888e4504880b4dd9cd6ddad8d7e00b1db049a681f42e1fef1927b6defbc064508c314e9ac33
 DIST linkfinder-20191124.tar.gz 9193 BLAKE2B c5e8eb04d437a9886cb46451d2a8677eb34383ab5cb1bb4ebe0988ff0b58bfaa87d80fd9a99ab7be67eeded74fe92716ff2d430025786a1377a0bee61bd6268a SHA512 d3a61e9c9265bf9b14289ccc8b44ec098ddf8f46842e314f0ab206649129501c20cf67ad265a9b06c3a22d14a01970613c675f1aabeb870f800262065d201ee0
diff --git a/net-misc/linkfinder/linkfinder-20190717.ebuild b/net-misc/linkfinder/linkfinder-20190717.ebuild
deleted file mode 100644
index 6fe5d623a..000000000
--- a/net-misc/linkfinder/linkfinder-20190717.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python{2_7,3_{5,6}} )
-
-inherit distutils-r1
-
-DESCRIPTION="A python script that finds endpoints in JavaScript files"
-HOMEPAGE="https://github.com/GerbenJavado/LinkFinder"
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/GerbenJavado/LinkFinder"
-else
-	# snapshot: 20190717
-	HASH_COMMIT="ceb93552377903ff84708d27587d1ce6b08e2a43"
-
-	SRC_URI="https://github.com/GerbenJavado/LinkFinder/archive/${HASH_COMMIT}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-	S="${WORKDIR}/LinkFinder-${HASH_COMMIT}"
-fi
-
-LICENSE="MIT"
-SLOT=0
-IUSE=""
-
-RDEPEND="${PYTHON_DEPS}
-	dev-python/jsbeautifier[${PYTHON_USEDEP}]"
-
-pkg_setup() {
-	python_setup
-}
-
-src_install() {
-	distutils-r1_python_install
-	python_foreach_impl python_doscript linkfinder.py
-}
-
-pkg_postinst() {
-	elog "\nSee documentation: https://github.com/GerbenJavado/LinkFinder#examples\n"
-}
diff --git a/net-misc/linkfinder/linkfinder-20191124.ebuild b/net-misc/linkfinder/linkfinder-20191124.ebuild
index 833385afd..8b896da8e 100644
--- a/net-misc/linkfinder/linkfinder-20191124.ebuild
+++ b/net-misc/linkfinder/linkfinder-20191124.ebuild
@@ -3,8 +3,7 @@
 
 EAPI=7
 
-# TODO: add py3.* support
-PYTHON_COMPAT=( python3_6 )
+PYTHON_COMPAT=( python3_{6,7,8} )
 
 inherit distutils-r1