diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 829dfd6f1..86bf9c3bb 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -1,3 +1,6 @@
+2021-06-04
+ * cleanup PYTHON_COMPAT, remove unused Ebuilds (https://bugs.gentoo.org/793464)
+
 2021-05-15 homeassistant-2021.5.4
  * update pyialarm-1.5
  * bump pykmtronic-0.3.0
diff --git a/dev-embedded/esphome/Manifest b/dev-embedded/esphome/Manifest
index 1799dee24..8964c83d9 100644
--- a/dev-embedded/esphome/Manifest
+++ b/dev-embedded/esphome/Manifest
@@ -1,16 +1,10 @@
 AUX esphome.conf.d 349 BLAKE2B 54df063ef9805fd8de3eeb4f77331b22c256786817a305d9b3b8d1fcfb11a39b080a7630f70b5b36a2321446e18d54c67db94a64e3fe0d731b626734e2721148 SHA512 ea6e04b41ed7a885b239ff4547442f4589152ba612df040f950eafa85e31daf9a6791a2d93351401dc0ac633f62fd5f3c2c89f77c2d92ac94f7bf8d7ff92e5ff
 AUX esphome.init.d-r1 605 BLAKE2B c6443e2a9730638bda08bda51638d4cd8ee965526ae0fdb04d74a1b376ea7b461d5925b0fe8cb35cc991709a824c1c942902cfbdbe99823b39bd80abf46ca5f3 SHA512 98ef2a6d5524152e24b04b1e644e5672e6bebee8b68fbcc37b46f403fdbf1de24547e394ce52281b6ff5711a987c56c9f55c36b9ae871433ca7a4d3fc6e19297
 AUX esphome.init.d-r2 650 BLAKE2B 106e71245d76858dcd3deccfae0f4880053a39d7c280ca79a74adbf44ebff73c56fe7903a3dc1c1a3088d513be2e98c6edc2742ff137b384cbf088967395c09b SHA512 b983ca4b4645e5b79cab2804bc6fc0220a61e2b0234d6f7655c7eaef6cf507bc9791ec16843bee0767c9f3f0dbd88e28b93c39a9e945ca6a5e849dec5c58aa64
-DIST esphome-1.15.1.tar.gz 1221719 BLAKE2B f8c9cd4af384545fadd5dcb74e5ec584ad0bfec1205bc550a3ec56a21ef822d8600c321327930674500ae5e9d4a4c7e8263faebba58196132019f206d94b2bb1 SHA512 8ed3791f5ee527153a9163d6cf6571cd2c8e2c2913f3362650569856dc20566664785600b04ad3da7dbb3b0f1f7305381cd46a323c040544742a20dbf0ccf2bc
-DIST esphome-1.15.2.tar.gz 1221775 BLAKE2B b2d11ba7a99d0815333fcbca3fc3bf46d1b103d2112a161ed45028e8bcb393de9003c62bd7fc81041cf2908f47e8876e1598fe82de68a46444b2b07b2324193c SHA512 82914ff6c4ccf3a71daf79830adb47c1ad1ffa874ca44352742349fc0bd99c689203d34a50945200b00208d8285242e9a566885de3c2f0c9569aa1586da962f6
 DIST esphome-1.15.3.tar.gz 1222394 BLAKE2B 2bfc3c09666e20b002eccc36db4093688ba41c67a29cad5432140c04517f7d54cdaace7faac9247378d720326ed875658e122368d627e3bf4f51037b4a9be033 SHA512 932c5f6b5bab2c978812df83124076cc33cbc807b570016b46071b2cb278ce1895581341b6c0135b4b65e985ea9a0290a6e7a71a455633a917fc5adce8572cf9
 DIST esphome-1.16.1.tar.gz 1299334 BLAKE2B 322b7cd29c266bee81566045cd6857d2c3e6c3406a12cdc007709d6b31324fb8fb79ec66f8ba976dbf9c36836593c3364f597ff1b0461d14e0a0eec1fb3ab288 SHA512 97f9b96c2ab616ec548be70f85964f33029eadc932a490ca79f09a98920fdf2bd4fb5edf4de4edbeabb524aa4d46ce5b6afc4992acdfe1628cbb90f251105578
 DIST esphome-1.16.2.tar.gz 1299627 BLAKE2B ea294ac96c1e5b2528a48aed50e17abaf629b66bd0386cf1ad91d87cd32683ba11d9f288fb8505f10b7b4f3f41242916b918de97d891391b634a12140bed2960 SHA512 fbd042ce818f35612f4f3d2b10b629f249436b705a49c1ad1cbf6f69db1c699da1938a81b0e222ad786929f281e798981da470034dbc2be1a915fe24cc73413f
 DIST esphome-1.17.2.tar.gz 1338970 BLAKE2B 4ec0524d56325b3137d4240f90776e23fe3895a0e9a0fd846cd2cb24834cc525f82bd3bdd282df2bb0da0e82496acddedbe00fc86a250aa4aab5a0db9ade4da1 SHA512 37c3eaed3ab42e174060d35f63a08de76e47ec27c3319b4a89a0efd9ed4cda190d56fc845b746bfeb3bd30a1d78cb6dd26e99ca7e1d0eca78f138dd510a5edca
-EBUILD esphome-1.15.1.ebuild 2706 BLAKE2B 982b0feb259d89333abee1223ca17e000d618f5905007ea3696261e449f2cbdf4999aa3c6ad9b62652a5c40295ba823ec615c88482a5e2b39e6ddff8858ed202 SHA512 9b2b5540f3132d03db602cc277b6ea9902853bd4b7842623aaad2873055b0db6c3c827cc8bf22a3923a8864df991076ae2c21a9189903dbfef6d4930a9ae1a59
-EBUILD esphome-1.15.2.ebuild 2706 BLAKE2B 982b0feb259d89333abee1223ca17e000d618f5905007ea3696261e449f2cbdf4999aa3c6ad9b62652a5c40295ba823ec615c88482a5e2b39e6ddff8858ed202 SHA512 9b2b5540f3132d03db602cc277b6ea9902853bd4b7842623aaad2873055b0db6c3c827cc8bf22a3923a8864df991076ae2c21a9189903dbfef6d4930a9ae1a59
-EBUILD esphome-1.15.3-r1.ebuild 2867 BLAKE2B 03879069781160a67fc61736204bce1b58ce55e368f0733c0d986e057575e6cc222426238ffd0f6c123674d42fd18ba6147186023f6beb813d3f4c780da507a5 SHA512 02b5b5c0bb5339e7edebb0039694f1bc635110282e02df1cbe98d3e145cfe9a460226124983080fbe38f04a871a8b11ecf6e4c9fb91de426b3eb2b7671faa2fe
-EBUILD esphome-1.15.3-r2.ebuild 2943 BLAKE2B c868540e47a7d0964e7c8dbf501d5cb1e516e95fc4eae15be7c7b56af47e2e4c243347de117de9338b5360635ce3db41208da585d3f7e371d60abfb61674ab22 SHA512 ee7e1cf1f1117a715a7e34c500a96151bb8a656db82c4ebe0468ad6e335eed7911753f93efdebcd9a1a73603ed7dee61a11f2d631459f6a64380332a3017ceac
 EBUILD esphome-1.15.3-r3.ebuild 3006 BLAKE2B 7b4d604bea055f9f8153c2662ede6769e3aac02b5ba1dd2ff7e07682a5d26048390c6d76afc3f357dca9ef2f0dab942c7b8ed3245a11e84a3148e27bb04bcc39 SHA512 0e784fe81bc808f7ae818d57f8653a893787439e7e7cfb63488ce3a90c7f5b62a52a815241f479af56f41add60637a317a29fed375e49dbd5b8ba8910a60a4a4
 EBUILD esphome-1.16.1.ebuild 3038 BLAKE2B b9d98f42fae14eb76e4d84a15260db85040f824496acc0b18750e3270d6776a349b6bcbc5aee3656be96597d403456b9a115f4411bef5b5154bf48bad443d2e7 SHA512 5fc8244fe4dac1c4388d036aa2de9bd91f482ae39c8d004210220f55be9aa254346ca94380b9bcad24a3ee9403dff0cd98cd68d31ee929861ba836d8bcc6de33
 EBUILD esphome-1.16.2.ebuild 3038 BLAKE2B b9d98f42fae14eb76e4d84a15260db85040f824496acc0b18750e3270d6776a349b6bcbc5aee3656be96597d403456b9a115f4411bef5b5154bf48bad443d2e7 SHA512 5fc8244fe4dac1c4388d036aa2de9bd91f482ae39c8d004210220f55be9aa254346ca94380b9bcad24a3ee9403dff0cd98cd68d31ee929861ba836d8bcc6de33
diff --git a/dev-embedded/esphome/esphome-1.15.1.ebuild b/dev-embedded/esphome/esphome-1.15.1.ebuild
deleted file mode 100644
index 52dad8a4f..000000000
--- a/dev-embedded/esphome/esphome-1.15.1.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{6..8} )
-DISTUTILS_SINGLE_IMPL=1
-
-inherit readme.gentoo-r1 distutils-r1
-
-if [[ ${PV} == *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/esphome/esphome.git"
-	EGIT_BRANCH="dev"
-	S="${WORKDIR}/${P}/"
-else
-	MY_P=${P/_beta/b}
-	MY_PV=${PV/_beta/b}
-	SRC_URI="https://github.com/${PN}/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
-	#SRC_URI="mirror://pypi/${P:0:1}/${PN}/${MY_P}.tar.gz"
-	S="${WORKDIR}/${MY_P}/"
-fi
-
-DESCRIPTION="Make creating custom firmwares for ESP32/ESP8266 super easy."
-HOMEPAGE="https://github.com/esphome/esphome https://pypi.org/project/esphome/"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 x86 amd64-linux x86-linux"
-IUSE="+server test"
-
-RDEPEND="
-	server? ( acct-group/${PN} acct-user/${PN} )
-	$(python_gen_cond_dep '
-	  ~dev-python/voluptuous-0.11.7[${PYTHON_USEDEP}]
-	  ~dev-python/pyyaml-5.3.1[${PYTHON_USEDEP}]
-	  ~dev-python/paho-mqtt-1.5.0[${PYTHON_USEDEP}]
-	  ~dev-python/colorlog-4.2.1[${PYTHON_USEDEP}]
-	  server? ( ~www-servers/tornado-6.0.4[${PYTHON_USEDEP}] )
-	  ~dev-libs/protobuf-3.12.4
-	  ~dev-python/protobuf-python-3.12.4[${PYTHON_USEDEP}]
-	  ~dev-python/tzlocal-2.1[${PYTHON_USEDEP}]
-	  ~dev-python/pytz-2020.1[${PYTHON_USEDEP}]
-	  ~dev-python/pyserial-3.4[${PYTHON_USEDEP}]
-	  server? ( ~dev-python/ifaddr-0.1.7[${PYTHON_USEDEP}] )
-	  ~dev-embedded/platformio-4.3.4
-	  ~dev-embedded/esptool-2.8[${PYTHON_USEDEP}]
-	  ~dev-python/click-7.1.2[${PYTHON_USEDEP}]
-	')"
-
-	BDEPEND="
-	  $(python_gen_cond_dep '
-		  dev-python/setuptools[${PYTHON_MULTI_USEDEP}]
-		  test? (
-			dev-python/nose[${PYTHON_MULTI_USEDEP}]
-			dev-python/pytest[${PYTHON_MULTI_USEDEP}] )
-		')"
-
-DISABLE_AUTOFORMATTING=1
-DOC_CONTENTS="
-The ESPHome dashboard listens on port 6052
-ESPHome configuration is in: /etc/${PN}
-dashboard command line arguments are configured in: /etc/conf.d/${PN}
-logging is to: /var/log/${PN}/{dashboard,warnings}.log
-support at https://git.edevau.net/onkelbeh/HomeAssistantRepository
-"
-
-DOCS="README.md"
-
-src_prepare() {
-	sed -e 's;protobuf==3.12.2;protobuf==3.12.4;' \
-		-i requirements.txt || die
-	eapply_user
-}
-
-python_install_all() {
-	dodoc ${DOCS}
-	distutils-r1_python_install_all
-	if use server; then
-		keepdir "/etc/${PN}"
-		fowners -R "${PN}:${PN}" "/etc/${PN}"
-		keepdir "/var/log/${PN}"
-		fowners -R "${PN}:${PN}" "/var/log/${PN}"
-		newconfd "${FILESDIR}/${PN}.conf.d" "${PN}"
-		newinitd "${FILESDIR}/${PN}.init.d-r2" "${PN}"
-		readme.gentoo_create_doc
-	fi
-}
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
-
-pkg_postinst() {
-	if use server; then
-		readme.gentoo_print_elog
-	fi
-}
diff --git a/dev-embedded/esphome/esphome-1.15.2.ebuild b/dev-embedded/esphome/esphome-1.15.2.ebuild
deleted file mode 100644
index 52dad8a4f..000000000
--- a/dev-embedded/esphome/esphome-1.15.2.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{6..8} )
-DISTUTILS_SINGLE_IMPL=1
-
-inherit readme.gentoo-r1 distutils-r1
-
-if [[ ${PV} == *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/esphome/esphome.git"
-	EGIT_BRANCH="dev"
-	S="${WORKDIR}/${P}/"
-else
-	MY_P=${P/_beta/b}
-	MY_PV=${PV/_beta/b}
-	SRC_URI="https://github.com/${PN}/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
-	#SRC_URI="mirror://pypi/${P:0:1}/${PN}/${MY_P}.tar.gz"
-	S="${WORKDIR}/${MY_P}/"
-fi
-
-DESCRIPTION="Make creating custom firmwares for ESP32/ESP8266 super easy."
-HOMEPAGE="https://github.com/esphome/esphome https://pypi.org/project/esphome/"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 x86 amd64-linux x86-linux"
-IUSE="+server test"
-
-RDEPEND="
-	server? ( acct-group/${PN} acct-user/${PN} )
-	$(python_gen_cond_dep '
-	  ~dev-python/voluptuous-0.11.7[${PYTHON_USEDEP}]
-	  ~dev-python/pyyaml-5.3.1[${PYTHON_USEDEP}]
-	  ~dev-python/paho-mqtt-1.5.0[${PYTHON_USEDEP}]
-	  ~dev-python/colorlog-4.2.1[${PYTHON_USEDEP}]
-	  server? ( ~www-servers/tornado-6.0.4[${PYTHON_USEDEP}] )
-	  ~dev-libs/protobuf-3.12.4
-	  ~dev-python/protobuf-python-3.12.4[${PYTHON_USEDEP}]
-	  ~dev-python/tzlocal-2.1[${PYTHON_USEDEP}]
-	  ~dev-python/pytz-2020.1[${PYTHON_USEDEP}]
-	  ~dev-python/pyserial-3.4[${PYTHON_USEDEP}]
-	  server? ( ~dev-python/ifaddr-0.1.7[${PYTHON_USEDEP}] )
-	  ~dev-embedded/platformio-4.3.4
-	  ~dev-embedded/esptool-2.8[${PYTHON_USEDEP}]
-	  ~dev-python/click-7.1.2[${PYTHON_USEDEP}]
-	')"
-
-	BDEPEND="
-	  $(python_gen_cond_dep '
-		  dev-python/setuptools[${PYTHON_MULTI_USEDEP}]
-		  test? (
-			dev-python/nose[${PYTHON_MULTI_USEDEP}]
-			dev-python/pytest[${PYTHON_MULTI_USEDEP}] )
-		')"
-
-DISABLE_AUTOFORMATTING=1
-DOC_CONTENTS="
-The ESPHome dashboard listens on port 6052
-ESPHome configuration is in: /etc/${PN}
-dashboard command line arguments are configured in: /etc/conf.d/${PN}
-logging is to: /var/log/${PN}/{dashboard,warnings}.log
-support at https://git.edevau.net/onkelbeh/HomeAssistantRepository
-"
-
-DOCS="README.md"
-
-src_prepare() {
-	sed -e 's;protobuf==3.12.2;protobuf==3.12.4;' \
-		-i requirements.txt || die
-	eapply_user
-}
-
-python_install_all() {
-	dodoc ${DOCS}
-	distutils-r1_python_install_all
-	if use server; then
-		keepdir "/etc/${PN}"
-		fowners -R "${PN}:${PN}" "/etc/${PN}"
-		keepdir "/var/log/${PN}"
-		fowners -R "${PN}:${PN}" "/var/log/${PN}"
-		newconfd "${FILESDIR}/${PN}.conf.d" "${PN}"
-		newinitd "${FILESDIR}/${PN}.init.d-r2" "${PN}"
-		readme.gentoo_create_doc
-	fi
-}
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
-
-pkg_postinst() {
-	if use server; then
-		readme.gentoo_print_elog
-	fi
-}
diff --git a/dev-embedded/esphome/esphome-1.15.3-r1.ebuild b/dev-embedded/esphome/esphome-1.15.3-r1.ebuild
deleted file mode 100644
index 329276fe7..000000000
--- a/dev-embedded/esphome/esphome-1.15.3-r1.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{7..8} )
-DISTUTILS_SINGLE_IMPL=1
-
-inherit readme.gentoo-r1 distutils-r1
-
-if [[ ${PV} == *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/esphome/esphome.git"
-	EGIT_BRANCH="dev"
-	S="${WORKDIR}/${P}/"
-else
-	MY_P=${P/_beta/b}
-	MY_PV=${PV/_beta/b}
-	SRC_URI="https://github.com/${PN}/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
-	#SRC_URI="mirror://pypi/${P:0:1}/${PN}/${MY_P}.tar.gz"
-	S="${WORKDIR}/${MY_P}/"
-fi
-
-DESCRIPTION="Make creating custom firmwares for ESP32/ESP8266 super easy."
-HOMEPAGE="https://github.com/esphome/esphome https://pypi.org/project/esphome/"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 x86 amd64-linux x86-linux"
-IUSE="+server test"
-
-RDEPEND="
-	server? ( acct-group/${PN} acct-user/${PN} )
-	$(python_gen_cond_dep '
-	  >=dev-python/voluptuous-0.11.7[${PYTHON_USEDEP}]
-	  ~dev-python/pyyaml-5.3.1[${PYTHON_USEDEP}]
-	  ~dev-python/paho-mqtt-1.5.1[${PYTHON_USEDEP}]
-	  ~dev-python/colorlog-4.2.1[${PYTHON_USEDEP}]
-	  server? ( ~www-servers/tornado-6.0.4[${PYTHON_USEDEP}] )
-	  ~dev-libs/protobuf-3.12.2
-	  ~dev-python/protobuf-python-3.12.2[${PYTHON_USEDEP}]
-	  ~dev-python/tzlocal-2.1[${PYTHON_USEDEP}]
-	  ~dev-python/pytz-2020.1[${PYTHON_USEDEP}]
-	  ~dev-python/pyserial-3.4[${PYTHON_USEDEP}]
-	  server? ( ~dev-python/ifaddr-0.1.7[${PYTHON_USEDEP}] )
-	  ~dev-embedded/platformio-4.3.4
-	  ~dev-embedded/esptool-2.8[${PYTHON_USEDEP}]
-	  ~dev-python/click-7.1.2[${PYTHON_USEDEP}]
-	')"
-
-	BDEPEND="
-	  $(python_gen_cond_dep '
-		  dev-python/setuptools[${PYTHON_MULTI_USEDEP}]
-		  test? (
-			dev-python/nose[${PYTHON_MULTI_USEDEP}]
-			dev-python/pytest[${PYTHON_MULTI_USEDEP}] )
-		')"
-
-DISABLE_AUTOFORMATTING=1
-DOC_CONTENTS="
-The ESPHome dashboard listens on port 6052
-ESPHome configuration is in: /etc/${PN}
-dashboard command line arguments are configured in: /etc/conf.d/${PN}
-logging is to: /var/log/${PN}/{dashboard,warnings}.log
-support at https://git.edevau.net/onkelbeh/HomeAssistantRepository
-"
-
-DOCS="README.md"
-
-src_prepare() {
-	sed -e 's;protobuf==3.12.2;protobuf>=3.12.2;' \
-		-i requirements.txt || die
-	sed -e 's;voluptuous==0.11.7;voluptuous>=0.11.7;' \
-		-i requirements.txt || die
-	sed -e 's;paho-mqtt==1.5.0;paho-mqtt==1.5.1;' \
-		-i requirements.txt || die
-	eapply_user
-}
-
-python_install_all() {
-	dodoc ${DOCS}
-	distutils-r1_python_install_all
-	if use server; then
-		keepdir "/etc/${PN}"
-		fowners -R "${PN}:${PN}" "/etc/${PN}"
-		keepdir "/var/log/${PN}"
-		fowners -R "${PN}:${PN}" "/var/log/${PN}"
-		newconfd "${FILESDIR}/${PN}.conf.d" "${PN}"
-		newinitd "${FILESDIR}/${PN}.init.d-r2" "${PN}"
-		readme.gentoo_create_doc
-	fi
-}
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
-
-pkg_postinst() {
-	if use server; then
-		readme.gentoo_print_elog
-	fi
-}
diff --git a/dev-embedded/esphome/esphome-1.15.3-r2.ebuild b/dev-embedded/esphome/esphome-1.15.3-r2.ebuild
deleted file mode 100644
index 1d301dd2f..000000000
--- a/dev-embedded/esphome/esphome-1.15.3-r2.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{7..8} )
-DISTUTILS_SINGLE_IMPL=1
-
-inherit readme.gentoo-r1 distutils-r1
-
-if [[ ${PV} == *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/esphome/esphome.git"
-	EGIT_BRANCH="dev"
-	S="${WORKDIR}/${P}/"
-else
-	MY_P=${P/_beta/b}
-	MY_PV=${PV/_beta/b}
-	SRC_URI="https://github.com/${PN}/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
-	#SRC_URI="mirror://pypi/${P:0:1}/${PN}/${MY_P}.tar.gz"
-	S="${WORKDIR}/${MY_P}/"
-fi
-
-DESCRIPTION="Make creating custom firmwares for ESP32/ESP8266 super easy."
-HOMEPAGE="https://github.com/esphome/esphome https://pypi.org/project/esphome/"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 x86 amd64-linux x86-linux"
-IUSE="+server test"
-
-RDEPEND="
-	server? ( acct-group/${PN} acct-user/${PN} )
-	$(python_gen_cond_dep '
-	  >=dev-python/voluptuous-0.11.7[${PYTHON_USEDEP}]
-	  ~dev-python/pyyaml-5.3.1[${PYTHON_USEDEP}]
-	  ~dev-python/paho-mqtt-1.5.1[${PYTHON_USEDEP}]
-	  ~dev-python/colorlog-4.5.0[${PYTHON_USEDEP}]
-	  server? ( ~www-servers/tornado-6.0.4[${PYTHON_USEDEP}] )
-	  ~dev-libs/protobuf-3.12.2
-	  ~dev-python/protobuf-python-3.12.2[${PYTHON_USEDEP}]
-	  ~dev-python/tzlocal-2.1[${PYTHON_USEDEP}]
-	  ~dev-python/pytz-2020.1[${PYTHON_USEDEP}]
-	  ~dev-python/pyserial-3.4[${PYTHON_USEDEP}]
-	  server? ( ~dev-python/ifaddr-0.1.7[${PYTHON_USEDEP}] )
-	  ~dev-embedded/platformio-4.3.4
-	  ~dev-embedded/esptool-2.8[${PYTHON_USEDEP}]
-	  ~dev-python/click-7.1.2[${PYTHON_USEDEP}]
-	')"
-
-	BDEPEND="
-	  $(python_gen_cond_dep '
-		  dev-python/setuptools[${PYTHON_MULTI_USEDEP}]
-		  test? (
-			dev-python/nose[${PYTHON_MULTI_USEDEP}]
-			dev-python/pytest[${PYTHON_MULTI_USEDEP}] )
-		')"
-
-DISABLE_AUTOFORMATTING=1
-DOC_CONTENTS="
-The ESPHome dashboard listens on port 6052
-ESPHome configuration is in: /etc/${PN}
-dashboard command line arguments are configured in: /etc/conf.d/${PN}
-logging is to: /var/log/${PN}/{dashboard,warnings}.log
-support at https://git.edevau.net/onkelbeh/HomeAssistantRepository
-"
-
-DOCS="README.md"
-
-src_prepare() {
-	sed -e 's;protobuf==3.12.2;protobuf>=3.12.2;' \
-		-i requirements.txt || die
-	sed -e 's;voluptuous==0.11.7;voluptuous>=0.11.7;' \
-		-i requirements.txt || die
-	sed -e 's;paho-mqtt==1.5.0;paho-mqtt==1.5.1;' \
-		-i requirements.txt || die
-	sed -e 's;colorlog==4.2.1;colorlog==4.5.0;' \
-		-i requirements.txt || die
-	eapply_user
-}
-
-python_install_all() {
-	dodoc ${DOCS}
-	distutils-r1_python_install_all
-	if use server; then
-		keepdir "/etc/${PN}"
-		fowners -R "${PN}:${PN}" "/etc/${PN}"
-		keepdir "/var/log/${PN}"
-		fowners -R "${PN}:${PN}" "/var/log/${PN}"
-		newconfd "${FILESDIR}/${PN}.conf.d" "${PN}"
-		newinitd "${FILESDIR}/${PN}.init.d-r2" "${PN}"
-		readme.gentoo_create_doc
-	fi
-}
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
-
-pkg_postinst() {
-	if use server; then
-		readme.gentoo_print_elog
-	fi
-}
diff --git a/dev-embedded/esptool/Manifest b/dev-embedded/esptool/Manifest
index b2987deb2..8c34882cd 100644
--- a/dev-embedded/esptool/Manifest
+++ b/dev-embedded/esptool/Manifest
@@ -1,7 +1,5 @@
-DIST esptool-2.7.tar.gz 83472 BLAKE2B aa012d315068cb722246b451e177c60ff41a7f10f6ae7b5a98dcd2350b0e2e46efe84f83bddfb6caaf973b6e29ff30dcebfaadfdd043f36cc274a26cc11c3621 SHA512 50f3315de4c5334c586cef14f1be1b2fa7086b89db64f7379ef29d9afa70d98117c98b318c567465dade298f9df9be4947a39133ade749dca7463347fa578db6
 DIST esptool-2.8.tar.gz 84520 BLAKE2B 53e1a9f29becac41ddb81419e62029b4cd9ea1df4f4c5bbe925a70d16b260bd70b66411a27c99dde8f39c251b71c9e6da82a061b08aca1e78759447376774274 SHA512 e64dd7e60e273872dd9ac9880c8a150c3f58f1a6a5e115a899a9fde107788c9dc80b9c0425e0fa9631870a16013881e223d02e1338b13e17827686f9f9569ae0
 DIST esptool-3.0.tar.gz 149773 BLAKE2B ac19a625299e67dba21aa1d0605790a2e7730799cc4de96c159991d4ee78854c51cd87add134d5170321ec7de49e2788dab81d60c186ca3bdc0727e1d3b852ea SHA512 cf57fe16a15e4e62d42834d953eba09bf808bbb4b82ad3e988de064813e90854d9546d7e51bc95bb9e78e17822e37e9c6c1d9e013ffb90957a197ecfd1a47b15
-EBUILD esptool-2.7-r1.ebuild 768 BLAKE2B d05c02a7100eb2a41941587d61bd68187b207d54757a4cfe26f899ea4a59ee7b5e37fef48ce90e3cd942b0a7202dcf976580b3da571ff53bb9ba5afaed0d1ce6 SHA512 82a110da399bd1da793b826e0934f529f1777fa6f7f38081ee800a356c1deabe1d81a4ecaa5af769176e43b1d6839514b8247f580dd6bd11c1ca51e9b738f36e
 EBUILD esptool-2.8.ebuild 765 BLAKE2B 848c9e174d82bf80c7c0e257ec8c8c4dcb0ec2919590132bd4bf85e51d51e8d9342c107c06869faa6e897695672222322ccd989408631c7e2f3df2706e0cdddf SHA512 017b60662814356cf150633dfc721268a631cc5939244bf52db17defc370ece1219f78cad80547d61c5c07e923658fe356d3a86ada4b9f52c8d8d2b9b8f65bfe
 EBUILD esptool-3.0.ebuild 1026 BLAKE2B 045a672ebc387ac30356c3e28086954766c5336e5349aa949485535b0584d509327e20fc12a07a992803da23dc2b041851ee9f2cb80b3e3379cfbe5513bb81fb SHA512 3147f415a287d34cdf7f0dbb23bdcbb7b414931d79931e16c088b9c23bb17e303e615911c290c4c8e87e00ed1f34813eea13f4900f72cd7e24c014d8c8ae93ef
 MISC metadata.xml 504 BLAKE2B 2efaa3eb78c1ce0d4aef5891223a09228d83da25bc81169bc53aed23d4344e3107295947ae7d7313bedb44310e0cb2eadf54ab4407e8e493777f93c7662ed87c SHA512 0a8ee6b1576fd22397682c50b366c00a95292893fcbcad18e8f433cfe18bc88a4b58a606c8617d05691cc9109f21134f57258257a9d3b1c12ce1e7545ecf6838
diff --git a/dev-embedded/esptool/esptool-2.7-r1.ebuild b/dev-embedded/esptool/esptool-2.7-r1.ebuild
deleted file mode 100644
index 8b157e0ef..000000000
--- a/dev-embedded/esptool/esptool-2.7-r1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_{6,7}} )
-
-inherit distutils-r1
-
-DESCRIPTION="Utility to communicate with the ROM bootloader in Espressif ESP8266 and ESP32"
-HOMEPAGE="https://github.com/espressif/esptool"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}
-	dev-python/ecdsa[${PYTHON_USEDEP}]
-	dev-python/pyaes[${PYTHON_USEDEP}]
-	>=dev-python/pyserial-2.5[${PYTHON_USEDEP}]"
-
-RESTRICT="test" # Uses a device connected to the serial port
-
-python_test() {
-	${EPYTHON} test/test_esptool.py || die
-}
diff --git a/dev-python/Adafruit-Blinka/Adafruit-Blinka-1.2.1.ebuild b/dev-python/Adafruit-Blinka/Adafruit-Blinka-1.2.1.ebuild
deleted file mode 100644
index 1749fadd4..000000000
--- a/dev-python/Adafruit-Blinka/Adafruit-Blinka-1.2.1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{5,6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="CircuitPython APIs."
-HOMEPAGE="https://github.com/adafruit/Adafruit_Blinka https://pypi.org/project/Adafruit-Blinka/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/Adafruit-Blinka/Adafruit-Blinka-1.3.3.ebuild b/dev-python/Adafruit-Blinka/Adafruit-Blinka-1.3.3.ebuild
deleted file mode 100644
index 1749fadd4..000000000
--- a/dev-python/Adafruit-Blinka/Adafruit-Blinka-1.3.3.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{5,6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="CircuitPython APIs."
-HOMEPAGE="https://github.com/adafruit/Adafruit_Blinka https://pypi.org/project/Adafruit-Blinka/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/Adafruit-Blinka/Adafruit-Blinka-2.3.1.ebuild b/dev-python/Adafruit-Blinka/Adafruit-Blinka-2.3.1.ebuild
index 2be384c79..a015d5753 100644
--- a/dev-python/Adafruit-Blinka/Adafruit-Blinka-2.3.1.ebuild
+++ b/dev-python/Adafruit-Blinka/Adafruit-Blinka-2.3.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{7,8} )
 
 inherit distutils-r1
 
diff --git a/dev-python/Adafruit-Blinka/Adafruit-Blinka-3.9.0.ebuild b/dev-python/Adafruit-Blinka/Adafruit-Blinka-3.9.0.ebuild
index 781bef386..8c568a88f 100644
--- a/dev-python/Adafruit-Blinka/Adafruit-Blinka-3.9.0.ebuild
+++ b/dev-python/Adafruit-Blinka/Adafruit-Blinka-3.9.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{7,8} )
 
 inherit distutils-r1
 
diff --git a/dev-python/Adafruit-Blinka/Adafruit-Blinka-5.5.3.ebuild b/dev-python/Adafruit-Blinka/Adafruit-Blinka-5.5.3.ebuild
index 2dda0cb91..93b2c0838 100644
--- a/dev-python/Adafruit-Blinka/Adafruit-Blinka-5.5.3.ebuild
+++ b/dev-python/Adafruit-Blinka/Adafruit-Blinka-5.5.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{6..8} )
+PYTHON_COMPAT=( python3_{7..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/Adafruit-Blinka/Manifest b/dev-python/Adafruit-Blinka/Manifest
index c13714f15..7d0610b57 100644
--- a/dev-python/Adafruit-Blinka/Manifest
+++ b/dev-python/Adafruit-Blinka/Manifest
@@ -1,11 +1,7 @@
-DIST Adafruit-Blinka-1.2.1.tar.gz 69725 BLAKE2B 818dbe0c6e97e1e0f8b59cba22025fb75766b16c3d23410e93f0c15ebf3b08973da1186b6f78e0bba58228747d7d05479ead9a86007e4700283bb6d1b84df3d9 SHA512 84a768b49ebf1444a0513fe1521681e5a838ce61b15189828f7a41f25007beedb69eb716924f98be9ae06d5b05415965b86902849e124c53049e1d1d09eddfe8
-DIST Adafruit-Blinka-1.3.3.tar.gz 79416 BLAKE2B fd8ed245991ef6e97227980082936d661955f451a3957095447adcf7d7debc577fe750422a0db8492e1515bdf992e383dbb2b59cedbcf805a85b32ffa9f14a31 SHA512 7b69cf68decfc732364c3dfb0bb02a590169282b3a80a799704e31f37101b48d999c1b7a75d0832d1f6e4cebf064363b62c77442039e6a1e2f43f52790786cdc
 DIST Adafruit-Blinka-2.3.1.tar.gz 83111 BLAKE2B f8b5392c89f205f91a3846a731ce169c253fdc7a9bade9ecd645bf56fdd32f24af52c7ae46cf65429a140c8c13fb8c0d663a68fbb2ef8f4b8034bad65554ec68 SHA512 b471bf1c6daf115d385e5e8b2a979487b8aa93cd56eadb31765f957a726c39dcef96dd2903e6399323a67cb844b424d4db77f6d683149efafb260a2666a10476
 DIST Adafruit-Blinka-3.9.0.tar.gz 81367 BLAKE2B 2eaf2a535cc1f182ec04279129f6ac59ff3f87de80547d2fdaa8058772e2e0e153befecbaf429a02d5d9758263834a72094def9cdc2db2f81ff2db3a734760bd SHA512 bc5f2815df0977c44e54ec10c84aa09e43734704add8f38c5e3c9b105162dabf10caeb6f577ee38bd34d0f691cb93c24676f959b9a9e57615faf993525d17cc8
 DIST Adafruit-Blinka-5.5.3.tar.gz 110533 BLAKE2B c74c29c762dcb932bc390b6dfd322858bc4b72de756803f79d8202c1d63d2e9ef3edecb4d6d58ed31aebcd7e64ebbbd833e5bc2b2706d9431e3074d4dce81cfb SHA512 114094965207af9916c8ce165081569e4eed3cdf90f1febf479a87216fa48c7dc44df9a5c6b5c9ded3cf6815f23dd894c053475df15d5bb520a870c2c1eb1cf1
-EBUILD Adafruit-Blinka-1.2.1.ebuild 671 BLAKE2B b2c7d4a9eb448e198e32f23a393071c9836f9852905b3e610191d5915fa806a01d82988384dbb648128ff602831d0b4c9c8b849b6e108637daf9e9578838ef0b SHA512 3ac6049d72658f794ebdb252a7b088b06a0f529d825cd5cdc233287f85e44779f161719e28976edae967c839cb85b93f5faf9b29ed05ba03dff754189e14269c
-EBUILD Adafruit-Blinka-1.3.3.ebuild 671 BLAKE2B b2c7d4a9eb448e198e32f23a393071c9836f9852905b3e610191d5915fa806a01d82988384dbb648128ff602831d0b4c9c8b849b6e108637daf9e9578838ef0b SHA512 3ac6049d72658f794ebdb252a7b088b06a0f529d825cd5cdc233287f85e44779f161719e28976edae967c839cb85b93f5faf9b29ed05ba03dff754189e14269c
-EBUILD Adafruit-Blinka-2.3.1.ebuild 678 BLAKE2B 0f0c179da44d687ecf83d409740cc947475a6e07237b525bfd1c9ecd5a0572231ea2a8888e86f091cf740dfe85159c3ce26d415a57230f0baeefff56dc7696ef SHA512 13f1790e310b7ff015fb12e45473bc6f809a5b4cea6da8dd49b87e83f398379b5a79fd379c18455d72f0c5a8629efdc20e99e277bff364c428d96ea619b2dbf4
-EBUILD Adafruit-Blinka-3.9.0.ebuild 722 BLAKE2B 52db0187042a6d6eb265b650059fc28254a5710343c678a2c4100e7fee40ea09da42282f0ec7295c2e2c472873b86aef155a802696d91bc599afd3ec05ae4f0d SHA512 2e7912b963ada0dac66ea636447fad358ea5cba3cc2e358b44cf71ff94acd37ddf49d476ccffe9570811c792a234c1c1d524727b3ee9876164d4f35f2952d142
-EBUILD Adafruit-Blinka-5.5.3.ebuild 757 BLAKE2B e50735f018257432119a0e205be28ad24769ea8ecfc5eb776702829b1b3b8f42ac385ad91ef41fe8fdbc9cf61f9ab2abac5ee14fb174dcd2c7561d1e6560e583 SHA512 ac8aff6cb000b695cc9d243b2af0f5866a6f29223142ad1faa34aee6913d63277bbc4eecabb8a9e62098e78e0439f6f4223eb1897af9b2a9c204a429c6650cd5
+EBUILD Adafruit-Blinka-2.3.1.ebuild 676 BLAKE2B 4617806f2c6a5286f6db8b963881d8fa574133de0442b3b14e7cb98f8656e14c841d9c1de62fe4e57641e3b188bdabc720123a2040c54ebb41e8dbe091fcf182 SHA512 fa272714460c95c5dd1d3910c52e6ab9e0d65faf63e00d8f5df2d1f49a4a95c1c1f3ed8020cb52665120b2e8997d746b2d1b364b440dc95b024c3897a69ab89b
+EBUILD Adafruit-Blinka-3.9.0.ebuild 720 BLAKE2B 6741b286474cf27a2dfce5c666117d1080fecd9c5caa5dba2cd5aac6a5e012d5fa87f1925dd99e69638522dcfd62263fe8913b80352b8481c9dc4d988816c3c2 SHA512 0e4d3fc84aa3cb18b10a54f49f02683ba93cae4deee8acc98bca1db677ed4414e97f66ae9f5ef70654b9e343d6fbd49db1b0fa55dbb9ed68a8cd3be7dd632f29
+EBUILD Adafruit-Blinka-5.5.3.ebuild 757 BLAKE2B 7e063c314aa5e3ef81b4409bc0be8f419557b88de9cae0f87be02b0c4eb0a4ef885413f6f9921c427d8ca58793da771a49aa523cbff3d3fbc9542b94825d9f2a SHA512 ab5fb29fd7babc2a75e11a1666757b73f63c42fcfefabd02713c3cb8b1dcc3c2d5fe91c7b4228f671f8943d3a1c100b575cd2f192a1639adeea25ba244e6484d
 MISC metadata.xml 473 BLAKE2B cc4abfe9ab5a3162b7a190d48f41f35d338ef0615799e267be91e968fc6f0f03c2ecb829b0d6013c0c28b8dc17f7b63a102a53b3b1861c3ad11954a691f48da0 SHA512 0756f3a827567f145ded83ed636a09d0d9da2513cbafc36e8c4a831082f161d1a522ed7afe0e98fa654922c2eff00cf4516e337da8a78eb00f228f3441545717
diff --git a/dev-python/Adafruit-DHT/Adafruit-DHT-1.4.0.ebuild b/dev-python/Adafruit-DHT/Adafruit-DHT-1.4.0.ebuild
deleted file mode 100644
index a02825424..000000000
--- a/dev-python/Adafruit-DHT/Adafruit-DHT-1.4.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit distutils-r1
-
-MY_PN=${PN/-/_}
-DESCRIPTION="Read DHT11, DHT22, and AM2302 humidity and temperature on a Raspberry Pi."
-HOMEPAGE="https://github.com/adafruit/Adafruit_Python_DHT/ https://pypi.org/project/Adafruit-DHT/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/Adafruit-DHT/Adafruit-DHT-1.4.1.ebuild b/dev-python/Adafruit-DHT/Adafruit-DHT-1.4.1.ebuild
index f42e4eb95..7f8959427 100644
--- a/dev-python/Adafruit-DHT/Adafruit-DHT-1.4.1.ebuild
+++ b/dev-python/Adafruit-DHT/Adafruit-DHT-1.4.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{7,8} )
 
 inherit distutils-r1
 
diff --git a/dev-python/Adafruit-DHT/Manifest b/dev-python/Adafruit-DHT/Manifest
index 3f2589bb3..e4ddd404a 100644
--- a/dev-python/Adafruit-DHT/Manifest
+++ b/dev-python/Adafruit-DHT/Manifest
@@ -1,5 +1,3 @@
-DIST Adafruit-DHT-1.4.0.tar.gz 15734 BLAKE2B f6069a23a819badf3db602c9699b32ea88e38a3e5f3b99740f32b7ead96a9edfb07e612ec6e2c3a7b93c4d8a85d9adf5145bb3115d82a5268e39a711a4fbbc7e SHA512 7d09990ed9f2e560d7e9f1676a7c404bd79475b44a685b1912343098c5fd986bf493480ecb4a65d858094d84f4f2a7d9a32b227e57eb5acc9874886518e70a4f
 DIST Adafruit-DHT-1.4.1.tar.gz 18417 BLAKE2B 60cf669743672f2c19affdb420b312005a4226e5b08c4ebbfe99780fdd90a88335570e160d300af7d08e9afada64d0b2a125a9912bcf7e1d07e1342f7e2302be SHA512 c3a8680c22c3cb55c0f2a042a85b84500c5ad2956886c17fdf27122d267ca1a09cafdb9de191ca7e41080719e6aa4bc0512ec309065afbceed1bccdafa432e6d
-EBUILD Adafruit-DHT-1.4.0.ebuild 797 BLAKE2B 1c766df118af970071a9c4089eb2cc9ccd33ed8fb6e981e8b67388a897177cacbdd83cd8c5d6f2ab333a1be57d61cfb657ef46e8fd495835ce62f8c679614115 SHA512 2a33b72767e977bf9091046b332135312f83a90797845bcb09e565dc0591eea934032b0e2cd00e1bc23e9a5315d24672a482e83febc367b11ddaad60aa6d28aa
-EBUILD Adafruit-DHT-1.4.1.ebuild 824 BLAKE2B 6f585505ad5794cddb93af903a872eafcd1b79f1a2c66ca676fd184ab1d7e999b3679b5aad9fcc021118ce47913f1bd02fd4fd3f9123993d45c4d49cdd49f499 SHA512 ecbc731a957b9ddc705715e54931d66c7465f3779f48b9bcc35c5cb37bf1767996551ee4e3db1aa9228469709ef30843331d652d8f830be3df87b8aad68bd2bd
+EBUILD Adafruit-DHT-1.4.1.ebuild 822 BLAKE2B 16c5dbbad97ea09ea96e1d65447e5b2ae3fff9ee60722d5b8d1abfa0c5f001c3382430d25265ec87f994e600b963d83761fd2fd3b20bdc679d1d6ec6eeea4fe2 SHA512 751ef17d2e8afc04480176094e8564acfabaf2ad0909338d8ebd839eacfd1c6d0ba73235d7d2e31d1ee18d6b264f201a6d9ebb4a6dba5d7d0cd231e1625173e3
 MISC metadata.xml 456 BLAKE2B cbdbde3a5428ac6c84f110eaa5c890b8f5cd371d7ebdd81a8ef74c17e5f5b2975c96385a1e75aa943e7e2704873847ef9a5267160ec10370b345b3c630168911 SHA512 6f768ffe29543522175518d989a29c46cea523dee7e27d50afb7c6ca7a085839b9ecd47f3b0fa01042e7cea846cc25426f84b9261faa9e2fafc96f103570c251
diff --git a/dev-python/Adafruit_BBIO/Adafruit_BBIO-1.0.0.ebuild b/dev-python/Adafruit_BBIO/Adafruit_BBIO-1.0.0.ebuild
deleted file mode 100644
index 1d3491811..000000000
--- a/dev-python/Adafruit_BBIO/Adafruit_BBIO-1.0.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="A module to control BeagleBone IO channels"
-HOMEPAGE="https://github.com/adafruit/adafruit-beaglebone-io-python/ https://pypi.org/project/Adafruit_BBIO/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~arm ~arm64"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/Adafruit_BBIO/Adafruit_BBIO-1.1.1.ebuild b/dev-python/Adafruit_BBIO/Adafruit_BBIO-1.1.1.ebuild
index 5a48c6c32..8f586a116 100644
--- a/dev-python/Adafruit_BBIO/Adafruit_BBIO-1.1.1.ebuild
+++ b/dev-python/Adafruit_BBIO/Adafruit_BBIO-1.1.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{7..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/Adafruit_BBIO/Manifest b/dev-python/Adafruit_BBIO/Manifest
index da3f10457..22dcc259c 100644
--- a/dev-python/Adafruit_BBIO/Manifest
+++ b/dev-python/Adafruit_BBIO/Manifest
@@ -1,5 +1,3 @@
-DIST Adafruit_BBIO-1.0.0.tar.gz 43743 BLAKE2B 9defa95e865d167cf473c7f02f0ba23fd4947f2b9dca6a082e00bcd51f0339907b1be0ec90bd584734b75ae18010bcc93f8b64948ea68bf13c2c78fc3592f52f SHA512 fb8af67c25f6a852255b845d4884a31a194e885e93e6c12fd08c4737bab4ecc2fe6083d5fe7bcb37aef800150f2ef58ecd06841323fcca7d23a59e35a02bafb4
 DIST Adafruit_BBIO-1.1.1.tar.gz 76685 BLAKE2B c564514b1091a6d06eba8fdb4a837984a61a34e3cb9bc57b089d13387b3602bd98fc81238af2b1d1fe588ba841e9fe383c897205f5b5e997765c3cdd4650c1ea SHA512 c28c65737b9e49158ada89d3c9d303e35c03231ef282e266c6dc704efa500b0fef543251b8e17de201d24c903afe142027a9c88f8cd2b8f633e9f1a81c8cc846
-EBUILD Adafruit_BBIO-1.0.0.ebuild 676 BLAKE2B dd9c623315c90f7bb7ce3b63d110b919bd157f70ec0ec29388ba8797407230c690cd80f55c91ca00b9a465e629896b5f4b73718b36766a29ad7abcd59da1596c SHA512 92f0c68e435602e0d660d8bd24a63c08a864d622133a17486431a613f4a536182b95d8de27a61cf906ae9da9f8ddd06b99eeda0ba2f1383bd7d28217a16ce178
-EBUILD Adafruit_BBIO-1.1.1.ebuild 678 BLAKE2B e824f3d8328c6b42aba53c9b3afb0d0b1c228d3aed3811a2099478aedfb479ef919584d5a1b2fcda1a77c88e7c268ed1f3b8caa2842247ae5778a0bad4aa29f5 SHA512 4602a3f1a3e9a69233c676039f96387bf647078ac95afee15ff5b0c720c41659dced269586b4b12c6a8b9b47f2642c1d5fd9376fe9bc8d384c9acd2a08baab5c
+EBUILD Adafruit_BBIO-1.1.1.ebuild 677 BLAKE2B 9c3034f77c9a7284926af3838f79bb5d784137c4184aee44ea944f0547db706777f0d8b02f0a1ae2641e5ea7348f60e770b0f66ed5501279f323e214eef9f81b SHA512 954854fea7f7eb32f291f4a7a3f8a993374d72d86f6d12adfb27a9e8e962ed5c695221d30ae37fcc16402aea7dbd2e244f44ef544938dba15bc6729ca8a87a0b
 MISC metadata.xml 458 BLAKE2B 7e5c9df654fe5d11259fb34ca2e1103bf8601181351a3f3194c7b326fc0e33e021e0f247e54b5cf472893f11f928a5f9130c0410c1143fcbb2473af5131d2dbd SHA512 d4fdc4c1524c4bedca0701f1b50e35404445fb98f111ec7f0895b155ceae213387655c55f32245b74ecdc3e867c833ac7f49cf9fff23b7df9e5404c138620c07
diff --git a/dev-python/Ambiclimate/Ambiclimate-0.1.1.ebuild b/dev-python/Ambiclimate/Ambiclimate-0.1.1.ebuild
deleted file mode 100644
index 94accd617..000000000
--- a/dev-python/Ambiclimate/Ambiclimate-0.1.1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{5,6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="A python3 library to communicate with Ambiclimate"
-HOMEPAGE="https://github.com/Danielhiversen/pyAmbiclimate https://pypi.org/project/Ambiclimate/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/Ambiclimate/Ambiclimate-0.1.2.ebuild b/dev-python/Ambiclimate/Ambiclimate-0.1.2.ebuild
deleted file mode 100644
index 94accd617..000000000
--- a/dev-python/Ambiclimate/Ambiclimate-0.1.2.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{5,6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="A python3 library to communicate with Ambiclimate"
-HOMEPAGE="https://github.com/Danielhiversen/pyAmbiclimate https://pypi.org/project/Ambiclimate/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/Ambiclimate/Ambiclimate-0.1.3.ebuild b/dev-python/Ambiclimate/Ambiclimate-0.1.3.ebuild
deleted file mode 100644
index 94accd617..000000000
--- a/dev-python/Ambiclimate/Ambiclimate-0.1.3.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{5,6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="A python3 library to communicate with Ambiclimate"
-HOMEPAGE="https://github.com/Danielhiversen/pyAmbiclimate https://pypi.org/project/Ambiclimate/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/Ambiclimate/Ambiclimate-0.2.0.ebuild b/dev-python/Ambiclimate/Ambiclimate-0.2.0.ebuild
index 94accd617..e011fa488 100644
--- a/dev-python/Ambiclimate/Ambiclimate-0.2.0.ebuild
+++ b/dev-python/Ambiclimate/Ambiclimate-0.2.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{7..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/Ambiclimate/Ambiclimate-0.2.1.ebuild b/dev-python/Ambiclimate/Ambiclimate-0.2.1.ebuild
index 6536af39a..22ae3e6a6 100644
--- a/dev-python/Ambiclimate/Ambiclimate-0.2.1.ebuild
+++ b/dev-python/Ambiclimate/Ambiclimate-0.2.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{7..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/Ambiclimate/Manifest b/dev-python/Ambiclimate/Manifest
index e8c135a71..e4dc0f9f1 100644
--- a/dev-python/Ambiclimate/Manifest
+++ b/dev-python/Ambiclimate/Manifest
@@ -1,11 +1,5 @@
-DIST Ambiclimate-0.1.1.tar.gz 4232 BLAKE2B e89689a114c9bedc5cf7b1f80e383f3d79c0faa56d321efb794ba5f63f631d9be4af447a72f11420c45e7cd925354419c83fb9786d336f3d4641ad8cd04d54d1 SHA512 20132f338a641ce7726fb958be5cfc9d8c7dfe67b919f83abf762acd77eca1bca3a25085c1f26e723c13729d4685bc56f4a12c19417928c72158b44ce0d7e8ee
-DIST Ambiclimate-0.1.2.tar.gz 4289 BLAKE2B 96496d931a170d40bbf3bf386be7e260ed3aa2816a124b613c2f0e781aa9aceed57dc43e672dd8c9c1d998f592031d0a3a88db47b7d7c344ddf5505255deb3bb SHA512 baa758197fd854d4b950ef2250ca9a3bc405a8d16c075d2bbf10f788d3e38142f9693981d0775eb8485d69968b81c5c7a31aedbac02d390abcf408feb418f664
-DIST Ambiclimate-0.1.3.tar.gz 4328 BLAKE2B 6240d44a509e6a41b8181a15495897df1051d0a720e5a3155a681c8ef6663c402191757938c66cb09216b7ff91ba9c8c8f43b4f3588d9a7a5e2ba39bf85aaadd SHA512 2172d7e5ce31263b3ee453f4a8b6b96c143360f6678efdd3af4cddddaa47c24fe88724b30bfef6142b4936f63f69ce0922f4c17aedb520b556ba35f7b672be57
 DIST Ambiclimate-0.2.0.tar.gz 4338 BLAKE2B be33853efdfdd83a709dc777b78cae0234e7fadb336b2058420af0ed47370372b276e916029db58fb9bbf1e380c11a6b275353c2cdd9635a5c49cc6b47566919 SHA512 72c209bf31a01678d7ac6df263eab4fa0978abc0697959d0ba5d4ba12e3b3582a623533f9b04e7e1a43df79f38067d1575c9eb638ad79adbf63528310653fd57
 DIST Ambiclimate-0.2.1.tar.gz 4338 BLAKE2B 399c2df1f091df183fb24fc19f7db46c2b3a5b38f26eea7978f59057059e6bfce039d76db05c129f050e4b1ef147b4bde916a9679cb6753ddc4b0044289f0131 SHA512 01c3da64bc232a84a22a7f90364184d38f714c5d9b3d69768555c6e89694572ecefd606f03fcb1c28b8a0b46d898afa68af7ed57494ff1d101dbe4014b358139
-EBUILD Ambiclimate-0.1.1.ebuild 701 BLAKE2B 181a984f7ead4029a5794ef24f7525070cec628251b098e5297f6d456b81a18798f7e1606333fa9a9d9c449dba97465b336c281c53c61cdea5f6f511415b9e46 SHA512 0c5cf4d3e81587ca0c1cf3f5f204451bbe3f9cdcc1208096bb5245284951a727304dfb965eeb9201f720491197606dbce6c6de02a18da60759ccc1b6e7b322b3
-EBUILD Ambiclimate-0.1.2.ebuild 701 BLAKE2B 181a984f7ead4029a5794ef24f7525070cec628251b098e5297f6d456b81a18798f7e1606333fa9a9d9c449dba97465b336c281c53c61cdea5f6f511415b9e46 SHA512 0c5cf4d3e81587ca0c1cf3f5f204451bbe3f9cdcc1208096bb5245284951a727304dfb965eeb9201f720491197606dbce6c6de02a18da60759ccc1b6e7b322b3
-EBUILD Ambiclimate-0.1.3.ebuild 701 BLAKE2B 181a984f7ead4029a5794ef24f7525070cec628251b098e5297f6d456b81a18798f7e1606333fa9a9d9c449dba97465b336c281c53c61cdea5f6f511415b9e46 SHA512 0c5cf4d3e81587ca0c1cf3f5f204451bbe3f9cdcc1208096bb5245284951a727304dfb965eeb9201f720491197606dbce6c6de02a18da60759ccc1b6e7b322b3
-EBUILD Ambiclimate-0.2.0.ebuild 701 BLAKE2B 181a984f7ead4029a5794ef24f7525070cec628251b098e5297f6d456b81a18798f7e1606333fa9a9d9c449dba97465b336c281c53c61cdea5f6f511415b9e46 SHA512 0c5cf4d3e81587ca0c1cf3f5f204451bbe3f9cdcc1208096bb5245284951a727304dfb965eeb9201f720491197606dbce6c6de02a18da60759ccc1b6e7b322b3
-EBUILD Ambiclimate-0.2.1.ebuild 708 BLAKE2B 7de23512ca1d244c1688d161853424d72dd40411dfe63ddde20ba49123d0d95a64c660b52554072a81ce5df38ead57aeb33c1ef358b3576b635e57f34f579936 SHA512 7b4d372a5ce491708264f81621c7140bfa60ce66c36097f0a5d92b80cb313724be42e589110aaf8db33cba2aaf337cff33dc5242d03b411d500f6c6f4ba2c8a2
+EBUILD Ambiclimate-0.2.0.ebuild 700 BLAKE2B 3affba63b625b33571337b26179a3bd567b3c7a46db3535dfb674a427794d099472b125663d11a458ac14e229a69f4c69df3e767b8e5e2f7435d1baff07f3e49 SHA512 9ec2ee9019a59cfe49ce417235508226e8f7b75a44d20ba7dead8a0fc94d7b16cbf226fe5ab5fcec08e26b96835bdfd2164650f859ca6d92a1d837ac7829b039
+EBUILD Ambiclimate-0.2.1.ebuild 707 BLAKE2B bcad45056ac1b0c259059b85698b7f3d6e3d777796fb24b017ac46b72cfb2e350488da9feabcca566fd04a488f9adfa716eccd494466cff2a2be92d00f68ba66 SHA512 e063e5d2af25d1d7662834cdc72eb58fdb032cd6657db21e4550506174c1f18a8119a9da77454e9ed977151c348c517285aec0803b87d81c44eb8d8d2e4419ee
 MISC metadata.xml 459 BLAKE2B aa0ea776078a2b115be9df2a18ee0a6f663f2b4b99577506f98b4dfdb3575b6c6a721b1f263240f71d9372c2d2bba9035513e3a10e754b8d035ec56ccf5b02a1 SHA512 cf6582a852b481e605929fa524db6db790add8233d89f4e202185e49e8644772e2ebbf8353f4a706844735cf2f313fe01c7ce9e2f418cebc78f7cd47921a707e
diff --git a/dev-python/CO2Signal/CO2Signal-0.4.1.ebuild b/dev-python/CO2Signal/CO2Signal-0.4.1.ebuild
deleted file mode 100644
index fa5957580..000000000
--- a/dev-python/CO2Signal/CO2Signal-0.4.1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{5,6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="A package to access the co2signal API"
-HOMEPAGE="https://github.com/danielsjf/CO2Signal https://pypi.org/project/CO2Signal/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="CC-BY-NC-SA-4.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/CO2Signal/CO2Signal-0.4.2.ebuild b/dev-python/CO2Signal/CO2Signal-0.4.2.ebuild
index 0a9d34f34..af49ec981 100644
--- a/dev-python/CO2Signal/CO2Signal-0.4.2.ebuild
+++ b/dev-python/CO2Signal/CO2Signal-0.4.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{7..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/CO2Signal/Manifest b/dev-python/CO2Signal/Manifest
index 607c75306..8889ad30c 100644
--- a/dev-python/CO2Signal/Manifest
+++ b/dev-python/CO2Signal/Manifest
@@ -1,5 +1,3 @@
-DIST CO2Signal-0.4.1.tar.gz 1817 BLAKE2B 427948ed4ec1fad0494d53d0d93a2d3019f2155eba1f7e7e0aa068396e49f0d9ab48baae756eac62bb20b8cf420d0d4ed07701b7349c6ed5c910eff6c830da16 SHA512 15c01eb0856d07911a2c24e225d249bf9f35e235dab049f8012011edb89a3727a7276f27c5c14e5a51c4c81de8a0506bf6080b10762d0b77fb05137493f4b8b7
 DIST CO2Signal-0.4.2.tar.gz 1821 BLAKE2B e1823e5f3f99a4c81ab750387df6ec95b92a9773f3cade3f51a157a16a7f2f997ecbada3a1f1cf12a84955959ac603713023e45acc843e5fff1e93b90cd3d0d1 SHA512 e3018d513c674ae428881ce5a16d33f40595b599895184e47e1a6a9a6509fd5f4c248bff7d61f7baeed0b38e220b98d46930b2216d7aad2336a56a52ac36948d
-EBUILD CO2Signal-0.4.1.ebuild 688 BLAKE2B 72a546189b8ea4828d6e573e8ef7595716b2ce2f7d19a84fa72737959d845728e8f2801c4576053e2190be519289dbfd081a75ee28983771a529bdb5182b597c SHA512 42d16109a3bb626fa2662ee0005c8de2559355ea582a06abf91c7e2329edca394e576dc91f3481c46539588bfcdc7867098df6cb9f402a4b8f819c23283f544f
-EBUILD CO2Signal-0.4.2.ebuild 695 BLAKE2B 5c43eccaf24dfa73f63c24324137d1d5f4cf5b6e20bb68728d13239ff5aac3e22dc0df5e79312c3a95b19915c1d582aaee89fe7ad775cf196346bf33fa6de92c SHA512 6ad6d16b699f97ac42e2314268704830e2349aabc49693ecc32729d53c459fa5fed5f141a9e37738d4c449b9988e7fd43d5f6f189d02ba3b75374bcc87d9c07d
+EBUILD CO2Signal-0.4.2.ebuild 694 BLAKE2B 4ff80d01fc734b9b2c8dd32bc81480ef612ad73a03ab1b0cd2701291da8177cc3f5473540cdfa5bb09a26fee286a8a27f364952fed1488829983f8bb4ddfc2ec SHA512 cc747436b6c00241fc6819606273136f0b9631a0f0a2c0424e9fd9a250e2a513b102bb2c4c2826c9b2dffd8e5a3d5519519ecb411eb971cdaacb135f2c187aec
 MISC metadata.xml 252 BLAKE2B 507e0ddc9d50b879ff374b903b142f85d020dfd6c486aba2af84fe082c878e780edbb79188ae10104d57db0eb775c86814cc8c06891a3854c9da840a4d377050 SHA512 9470ac9c8a5a4f80e3f767e7aa198addc7b21866c63b2a310e9f41ce65817672fb77423117bdd619e99cb62322025aeadf50717e23eafabf99080fcc106820af
diff --git a/dev-python/Mastodon-py/Manifest b/dev-python/Mastodon-py/Manifest
index 085b1c8f8..eb0958a01 100644
--- a/dev-python/Mastodon-py/Manifest
+++ b/dev-python/Mastodon-py/Manifest
@@ -1,9 +1,3 @@
-DIST Mastodon-py-1.4.5.tar.gz 3564509 BLAKE2B 1f200d2e2c424579bdd596a56747ae5b3d90693453314db410b911ddca92ed9d7355103207af3a36242ef4a277dad9e8781a21a5f8a554250bc62fea226c6fb4 SHA512 d90a45479e8c3dbaeed0a40e32e89da99f58c59b008b41967d39ec8bcf2dcecaf12cca826f2b9fc9fbb63efa36a492e63248e00e42e82646d761c06f09d4d5b9
-DIST Mastodon-py-1.4.6.tar.gz 680887 BLAKE2B 4fab2e3a39b270e6208141e4d19da023a31cc2d27bf194407ad75753a6731d02a9ddae575c3ad48bee0747c097cf80ee528250c1cad38f0994d0d85d3ea23078 SHA512 f10e86433a9a02147a58e115ed942857f6dfb2c0332353dff0df57e606246ff5bbaaf7f004c3634bdf22277ae09af8fbcd828d6aa9d2189aa5ddd5fa649617df
-DIST Mastodon-py-1.5.0.tar.gz 706918 BLAKE2B 9b04c5dc85beb968b1f1a46539e77bfb0c4d9f48bcecac01f2aebb095d14bdf7ac154c62d22e3edac0407e458c8b9e2204b87deaba20af86674c6440689bee6a SHA512 5c22adc68eb5b122f6b6a43525daadfac19de6c26d0db67135a932f0422c9b9d3700b45070a23b683f92aa41237cdbde5a837c17ce9a7dd0afec3c5ae65eab1b
 DIST Mastodon-py-1.5.1.tar.gz 1225203 BLAKE2B 052ff268178645160d9a203156a11369bf8080a0abccc25d5e6c5fab68289a99ec45f660d3d94068b8bc31890295dcc42ecaa3a219264daff1df44e779a91413 SHA512 0c1a27b6cfcb4a197614100ffdb40ff8224162c0029598eadebdfa8984fe30519d3b163265d6f198e4a563c0e6a8bf68cafb69938f1a4768724a02f4f6971fa3
-EBUILD Mastodon-py-1.4.5.ebuild 1014 BLAKE2B 4b47173b6a49e5dd28d2b136e8436515db5787e73d0fce75825867ba184d4cdf4a01f36b3a4cc95e17cb88844ba87ccb05693f595f8b9c8397eeaa5eee0ff834 SHA512 dae8425488cfa88f0e6ab2edfc0ebdbfb1947aecdfac46199aab6056ac43ab904fb2eb2e99b6db2960db8cf9c856bdaa4bbcae103953584a9caa7ca8d713d8ae
-EBUILD Mastodon-py-1.4.6.ebuild 1014 BLAKE2B 4b47173b6a49e5dd28d2b136e8436515db5787e73d0fce75825867ba184d4cdf4a01f36b3a4cc95e17cb88844ba87ccb05693f595f8b9c8397eeaa5eee0ff834 SHA512 dae8425488cfa88f0e6ab2edfc0ebdbfb1947aecdfac46199aab6056ac43ab904fb2eb2e99b6db2960db8cf9c856bdaa4bbcae103953584a9caa7ca8d713d8ae
-EBUILD Mastodon-py-1.5.0.ebuild 1021 BLAKE2B 85775baec70ee44e098b52355177c46c28da8b1b4e053aef10316e95ca06710a1e8167b4c0e7b25de833340dce940c6f7e556165002554d52c3a8a4f4d609d35 SHA512 7ecd8e2d066e2a496bb5b618910ae2082345d99da0b787ea6290dfd9f3d29f64f3e794e09ffd92dcfd124d6db2ee3ed8876ac5b7ea601b43d6e7b5e9ea64081c
-EBUILD Mastodon-py-1.5.1.ebuild 1021 BLAKE2B 85775baec70ee44e098b52355177c46c28da8b1b4e053aef10316e95ca06710a1e8167b4c0e7b25de833340dce940c6f7e556165002554d52c3a8a4f4d609d35 SHA512 7ecd8e2d066e2a496bb5b618910ae2082345d99da0b787ea6290dfd9f3d29f64f3e794e09ffd92dcfd124d6db2ee3ed8876ac5b7ea601b43d6e7b5e9ea64081c
+EBUILD Mastodon-py-1.5.1.ebuild 1020 BLAKE2B 1071469f9f27a761dbbbd078e5424934d6b0a734ca6907666630dc0eb115b1db08287ba1e41db0fb913412c27ac818e4666323d98222e4f1e36bcb8c76b093e8 SHA512 b8f2be8926b8886e5b283c67c6b57d6e7b1fcb38e62edda06c7354a1a49aa101ff52ada9ece4f2db660bcb88f4cbe6e25afb5073c79042573dc7433b4f117ae8
 MISC metadata.xml 469 BLAKE2B b1aa176138df6f9244b9b3b30306ebdd735f24def348a0b1617d7120e6ec68ee3c9c28ad69096a85289895f1b9542995a6ca56515fd4889827003ea2e82170de SHA512 334aea9492a5470bfe1e15960d112ce63cc8eede45723404de35562a04087458760fd46dab49f9d236188fe3cb3c3d9af65dd1ac47b150e6c160c9e38bab6da2
diff --git a/dev-python/Mastodon-py/Mastodon-py-1.4.5.ebuild b/dev-python/Mastodon-py/Mastodon-py-1.4.5.ebuild
deleted file mode 100644
index ae5852171..000000000
--- a/dev-python/Mastodon-py/Mastodon-py-1.4.5.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{5,6,7} )
-
-inherit distutils-r1
-
-MY_PN=${PN/-/.}
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Python wrapper for the Mastodon API"
-HOMEPAGE="https://github.com/halcy/Mastodon.py https://pypi.org/project/Mastodon.py/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${MY_P}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-S=${WORKDIR}/${MY_P}
-
-RDEPEND=">=dev-python/requests-2.4.2[${PYTHON_USEDEP}]
-		 dev-python/python-dateutil[${PYTHON_USEDEP}]
-		 dev-python/six[${PYTHON_USEDEP}]
-		 dev-python/pytz[${PYTHON_USEDEP}]
-		 dev-python/python-magic[${PYTHON_USEDEP}]
-		 >=dev-python/decorator-4.0.0[${PYTHON_USEDEP}]"
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/Mastodon-py/Mastodon-py-1.4.6.ebuild b/dev-python/Mastodon-py/Mastodon-py-1.4.6.ebuild
deleted file mode 100644
index ae5852171..000000000
--- a/dev-python/Mastodon-py/Mastodon-py-1.4.6.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{5,6,7} )
-
-inherit distutils-r1
-
-MY_PN=${PN/-/.}
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Python wrapper for the Mastodon API"
-HOMEPAGE="https://github.com/halcy/Mastodon.py https://pypi.org/project/Mastodon.py/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${MY_P}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-S=${WORKDIR}/${MY_P}
-
-RDEPEND=">=dev-python/requests-2.4.2[${PYTHON_USEDEP}]
-		 dev-python/python-dateutil[${PYTHON_USEDEP}]
-		 dev-python/six[${PYTHON_USEDEP}]
-		 dev-python/pytz[${PYTHON_USEDEP}]
-		 dev-python/python-magic[${PYTHON_USEDEP}]
-		 >=dev-python/decorator-4.0.0[${PYTHON_USEDEP}]"
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/Mastodon-py/Mastodon-py-1.5.0.ebuild b/dev-python/Mastodon-py/Mastodon-py-1.5.0.ebuild
deleted file mode 100644
index b6fd144fe..000000000
--- a/dev-python/Mastodon-py/Mastodon-py-1.5.0.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit distutils-r1
-
-MY_PN=${PN/-/.}
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Python wrapper for the Mastodon API"
-HOMEPAGE="https://github.com/halcy/Mastodon.py https://pypi.org/project/Mastodon.py/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${MY_P}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-S=${WORKDIR}/${MY_P}
-
-RDEPEND=">=dev-python/requests-2.4.2[${PYTHON_USEDEP}]
-		 dev-python/python-dateutil[${PYTHON_USEDEP}]
-		 dev-python/six[${PYTHON_USEDEP}]
-		 dev-python/pytz[${PYTHON_USEDEP}]
-		 dev-python/python-magic[${PYTHON_USEDEP}]
-		 >=dev-python/decorator-4.0.0[${PYTHON_USEDEP}]"
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/Mastodon-py/Mastodon-py-1.5.1.ebuild b/dev-python/Mastodon-py/Mastodon-py-1.5.1.ebuild
index b6fd144fe..9ad955fc3 100644
--- a/dev-python/Mastodon-py/Mastodon-py-1.5.1.ebuild
+++ b/dev-python/Mastodon-py/Mastodon-py-1.5.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{7..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/OPi-GPIO/Manifest b/dev-python/OPi-GPIO/Manifest
index 72c480f67..035910877 100644
--- a/dev-python/OPi-GPIO/Manifest
+++ b/dev-python/OPi-GPIO/Manifest
@@ -1,5 +1,3 @@
-DIST OPi.GPIO-0.3.6.tar.gz 296298 BLAKE2B d96080e4c5d8a22d16eb9196bedb1714625dda894b5950626f5f29e74db649849e8aaab9de9c5b497ea95fdcfeaf5c28d152358d0dad9398f1eb79e1cc380b92 SHA512 7a380f6a3b2171a57ced3ef9e319e98e6390770b565d25595e9e9878c4ca0beb8824b9401d778425ad34df699eba7cbf9413f3d44c27945ed790594e7bf9bea1
 DIST OPi.GPIO-0.4.0.tar.gz 298389 BLAKE2B 2d1e2f32d074cb5a968769db2594b86fbaa9eb24a2bb52e4dc438d426af625b871ae819a6ca05d16d54798686ef510525568de9e2cefe43b2e4d2883f7a79625 SHA512 03f660a4535529fdeee5411814a80596f57f818b94b94d79c692512faec21c480da9a05a81d137d0e8de3486c021e5bb1a0458c7898cd481ea5df01d3f56d75e
-EBUILD OPi-GPIO-0.3.6.ebuild 737 BLAKE2B 72e52bd41090409362de0aae93d57cd7c4bc6ed027e52dfb30aeed6c1236da88e7de978147a26c0f6ab5f2ec9969e11ec8cd0fc8e496009ab09eea342c8cc52b SHA512 332e473ca613386218f67ea52cd37ff884539f45aeb9801e678c6ce39ba6b5814edb04b427975fcfe9ccaf94adbb1bea53014d8ee979ca9048c376e1f29133a3
-EBUILD OPi-GPIO-0.4.0.ebuild 737 BLAKE2B 90c08aba7f2d4f106ce5ace6cde6454da16c9aea264e7925fcedf5cb2170d21988a01cb4edf437a0fc060070c0726100be50958cb613145b99ff2f78f48e48ab SHA512 ca0f734acff117c97d05264d4c7d9ae800dec690156637da5a24068d7bf76fe9aa94ce8a03cd06c9672a9d4af35b0a04cf521edbe83415db01f35533391f01ca
+EBUILD OPi-GPIO-0.4.0.ebuild 736 BLAKE2B 41ce883a1122d6aeb8b171993b48e233075a9e7f6351ee5c1805ff9a363589d5746987ea995e67efb1146ed62c76d3ca66e4fd8e53703a5e85736627a37b1ed2 SHA512 29b85f6a349054ebc671adba1feec58e11ad360e23cb1a7a63fce15489a692c27e26ed1bef7142e51982456aaf6424bdf085a01495e7bcbe4c89748e9b6aca12
 MISC metadata.xml 468 BLAKE2B e8175685981c4f39268b83b8a206b43731344b441396f6df0bb6dec31ff4cfe5666f3369da3ff7fb62b31f4fd8e10412acafead5301ce49b4e8a144aaccac5cf SHA512 8d4c4c8269840c0e3c18a10901c14eda7ac81e707de2709d34f55294930f3af97c52bb80395a7b87008c68a2df18bc872656fca8fddfccb45c075233ff064101
diff --git a/dev-python/OPi-GPIO/OPi-GPIO-0.3.6.ebuild b/dev-python/OPi-GPIO/OPi-GPIO-0.3.6.ebuild
deleted file mode 100644
index 5f72c8f71..000000000
--- a/dev-python/OPi-GPIO/OPi-GPIO-0.3.6.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{5,6,7} )
-
-inherit distutils-r1
-
-MY_PN="${PN/-/.}"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="A drop-in replacement for RPi.GPIO for the Orange Pi Zero"
-HOMEPAGE="https://github.com/rm-hull/OPi.GPIO https://pypi.org/project/OPi.GPIO/"
-SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~arm ~arm64"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-S=${WORKDIR}/${MY_P}
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/OPi-GPIO/OPi-GPIO-0.4.0.ebuild b/dev-python/OPi-GPIO/OPi-GPIO-0.4.0.ebuild
index 64d573577..a0afe3a66 100644
--- a/dev-python/OPi-GPIO/OPi-GPIO-0.4.0.ebuild
+++ b/dev-python/OPi-GPIO/OPi-GPIO-0.4.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{7..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/PyFlume/.DS_Store b/dev-python/PyFlume/.DS_Store
new file mode 100644
index 000000000..b25fb83c4
Binary files /dev/null and b/dev-python/PyFlume/.DS_Store differ
diff --git a/dev-python/PyFlume/Manifest b/dev-python/PyFlume/Manifest
index cad0f8973..eaf62e4bf 100644
--- a/dev-python/PyFlume/Manifest
+++ b/dev-python/PyFlume/Manifest
@@ -1,11 +1,5 @@
-DIST PyFlume-0.2.1.tar.gz 3672 BLAKE2B 33f3f62d90365fa68a0cb3b388cb11d3481d049194137be474e91f844b8b3565c9123ea16a205b8310467d1631a76d83c6f15563d47292be38fdbfd46e5fb486 SHA512 0be5b5e39ad56c9f31724ca76e1056cfb0ee08aac9e925f47a3b0150471c1c8c09f694519835be0f0f3ac708a90532fcc2c18a6371f6f0d2f14db6836514091d
-DIST PyFlume-0.2.4.tar.gz 4022 BLAKE2B 43ff164edd5c22124097ffb2cb05cbe9cc189f6d144b7640b8f759aca07715aa87fcb2cb6f063a6e9f1a8ac7bc1b6a0c66abae72fd6c6fc28a8663736b1bc4a5 SHA512 f22f5ce99db08d9502dd3a846eff6b6a7ca6da7feb079ff0278047bf62ced031313da35ce6f4826256ec97d5f982b0bfe3fb8b86be541e4a794f6b24969ea6c3
-DIST PyFlume-0.3.0.tar.gz 4314 BLAKE2B 5792485571a87da63d38fd4070f6f3fbcff3549ca879abaafdbb33a67549465d6959690915c5fcc122cd69c6d91cf1106fe5c92b2f43741060597509241a0bb0 SHA512 055c911f3777ded9d29984213a8af5a82d20709bb0c352fb27f19b60635de24653b7079c94d65fbafea9136190c889299ed4c11e8eee6a98314876055ea9fb72
 DIST PyFlume-0.4.0.tar.gz 4291 BLAKE2B 04a231baf7aacedc2cfcc0d4b2894494dfa1969fde54402821944f123fb94239fcc0a20152e6371bc69f2e42e1485d3a3e087a2cc72d619077162fa9e5082807 SHA512 f5a5129349fb703647fbf056d31699f9e0fd647116678ebc521b8d0c6ed070a0d8a6e0db131829b70b40cc96c5aa2c48646f0f8964df38733502bdd0c6e94fbe
 DIST PyFlume-0.5.5.tar.gz 5234 BLAKE2B 20c9da58d844f5dc9e364d88161f87e86ed8002055efb83caa6c9c00cd2549462d1a161d7a523ab4f0ac9c1d4bb4e2946532df0e9020b55470e63f746a553542 SHA512 b799ac5e12f118d116d16e9330cabe42d6716a721ccc34c5b5e09846ead5a8b392ebf6fd2ee82d55aad9b13c55497eff8d9710ede954de420df19351bd3bf029
-EBUILD PyFlume-0.2.1.ebuild 785 BLAKE2B 7c74b763246f43e97661b4efdc7ae9c1a1be8e06092a84a2047c9e78dea203056c9d3edf344c5c69ba0b7152d96a7080d262226b7893c47a21255c02ab0e03a3 SHA512 9376a5acc1e03ee118d9ac83f16a450abe3adb2c0d475a03e6721869fe6e16eb56c2f241876a57c0f99459e66a38623b4ea85ba2fb2b852c14b4a1d246f378b7
-EBUILD PyFlume-0.2.4.ebuild 794 BLAKE2B cb85363a34ffc83ddfd901859967f1da2d6345ef405f376a8b1a1e8bfcc3a2ec095aee2a7c8a8642cf5e5ed437fcdad205eeb83272c0d7c181e2e8223c61fc8c SHA512 cc9c2808ac0cd61a084036ef28166b40a5f5a2821c1a6ab57c3e50a6b713aa3fd8ccb830cebd13b1bd4838740b7bbc3d63b5274cd87b5c1e28731c1927fe30d0
-EBUILD PyFlume-0.3.0.ebuild 794 BLAKE2B cb85363a34ffc83ddfd901859967f1da2d6345ef405f376a8b1a1e8bfcc3a2ec095aee2a7c8a8642cf5e5ed437fcdad205eeb83272c0d7c181e2e8223c61fc8c SHA512 cc9c2808ac0cd61a084036ef28166b40a5f5a2821c1a6ab57c3e50a6b713aa3fd8ccb830cebd13b1bd4838740b7bbc3d63b5274cd87b5c1e28731c1927fe30d0
-EBUILD PyFlume-0.4.0.ebuild 794 BLAKE2B cb85363a34ffc83ddfd901859967f1da2d6345ef405f376a8b1a1e8bfcc3a2ec095aee2a7c8a8642cf5e5ed437fcdad205eeb83272c0d7c181e2e8223c61fc8c SHA512 cc9c2808ac0cd61a084036ef28166b40a5f5a2821c1a6ab57c3e50a6b713aa3fd8ccb830cebd13b1bd4838740b7bbc3d63b5274cd87b5c1e28731c1927fe30d0
-EBUILD PyFlume-0.5.5.ebuild 833 BLAKE2B b23c202b12c5bacf167657a1b0c18da5591c2fc41b71081cb3d93dd0be57c8180ad14de99544c0a59d9d81cfaf9dad456b055e777f7335f9b5978d750e260a81 SHA512 440d10ac5ff19b3ffb8b8b375b72f6372f7b2d4fd701b1c7ca0fccefeb2e9823ccd3873dc09672769898bd53eebbde8a3f7c1c76ab52da622d4d6e7365bc29dc
+EBUILD PyFlume-0.4.0.ebuild 793 BLAKE2B 903a2c85d5f076e488e63ae436af102ab138dd4f35bebd165cf522b84ccc9f9f63e626879776e97b30ddcf967f68ffa4bd45b8c344567565db97798a865eba01 SHA512 5883e6a25a40325bb75114f24d6a0c22ac02f55282528762130a803f9557e24ed362a52f405acc08c1732686d6283ff6131b588b16274aa68a756f9ea075bdb3
+EBUILD PyFlume-0.5.5.ebuild 832 BLAKE2B 2a042ad502351a3393f7a322862be566df9e0c1cf31302a28b0109e33795ca8ece52640e954ae16763c78a591b231f4d69346dcc3ec2aba307125cb48e3d74ae SHA512 e3aed4b2bff32c9c139263a5b8a667248c60c3b3d4a02c4d85112b0178f1760409a413de9b224d20e756d4ac100faa60dd57f320a8c4c05dc15591f757c25019
 MISC metadata.xml 449 BLAKE2B e343870c0be130a953f0def8e4d9f8d8bbdb898a6695697de287079449df7f5932d854bce14009d8dc1606eb4eb49f7c31a2cc8926fc7ac2b9e3bafc0062c48c SHA512 6c970675042579f68b8771cfef6627cff8a113086144d7500737b48fefd3c72c58406790650d43880d17dd78f8229c97292b4939314ebfe2e4f07a675dd51c90
diff --git a/dev-python/PyFlume/PyFlume-0.2.1.ebuild b/dev-python/PyFlume/PyFlume-0.2.1.ebuild
deleted file mode 100644
index f1b81f9e3..000000000
--- a/dev-python/PyFlume/PyFlume-0.2.1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Package to integrate with Flume Sensor"
-HOMEPAGE="https://github.com/ChrisMandich/PyFlume https://pypi.org/project/PyFlume/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND="dev-python/pytz[${PYTHON_USEDEP}]
-	dev-python/pyjwt[${PYTHON_USEDEP}]
-	dev-python/ratelimit[${PYTHON_USEDEP}]"
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/PyFlume/PyFlume-0.2.4.ebuild b/dev-python/PyFlume/PyFlume-0.2.4.ebuild
deleted file mode 100644
index b39fb1b59..000000000
--- a/dev-python/PyFlume/PyFlume-0.2.4.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit distutils-r1
-
-DESCRIPTION="Package to integrate with Flume Sensor"
-HOMEPAGE="https://github.com/ChrisMandich/PyFlume https://pypi.org/project/PyFlume/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND="dev-python/pytz[${PYTHON_USEDEP}]
-	dev-python/pyjwt[${PYTHON_USEDEP}]
-	dev-python/ratelimit[${PYTHON_USEDEP}]"
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/PyFlume/PyFlume-0.3.0.ebuild b/dev-python/PyFlume/PyFlume-0.3.0.ebuild
deleted file mode 100644
index b39fb1b59..000000000
--- a/dev-python/PyFlume/PyFlume-0.3.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit distutils-r1
-
-DESCRIPTION="Package to integrate with Flume Sensor"
-HOMEPAGE="https://github.com/ChrisMandich/PyFlume https://pypi.org/project/PyFlume/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND="dev-python/pytz[${PYTHON_USEDEP}]
-	dev-python/pyjwt[${PYTHON_USEDEP}]
-	dev-python/ratelimit[${PYTHON_USEDEP}]"
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/PyFlume/PyFlume-0.4.0.ebuild b/dev-python/PyFlume/PyFlume-0.4.0.ebuild
index b39fb1b59..af4c6a67c 100644
--- a/dev-python/PyFlume/PyFlume-0.4.0.ebuild
+++ b/dev-python/PyFlume/PyFlume-0.4.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{7..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/PyFlume/PyFlume-0.5.5.ebuild b/dev-python/PyFlume/PyFlume-0.5.5.ebuild
index ee3f0fbd2..186c59e46 100644
--- a/dev-python/PyFlume/PyFlume-0.5.5.ebuild
+++ b/dev-python/PyFlume/PyFlume-0.5.5.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{7..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/PyISY/Manifest b/dev-python/PyISY/Manifest
index f7b33ae43..fa4c1b1b0 100644
--- a/dev-python/PyISY/Manifest
+++ b/dev-python/PyISY/Manifest
@@ -1,5 +1,3 @@
-DIST PyISY-1.1.1.tar.gz 25696 BLAKE2B f263d42adc81da1f0043886f77dddb0780155e1e8aa701d0e3802dc98a47e0ef656d51de19ff2b81ff2c27a59ab05514a4591edd9b6a589e05ebcc9a50e9867b SHA512 329089633a8052de47304f260973dc5221509161d63c0aa9d1484d160b958558c1e639b858c67322143def917f91f5ed988e8795a25f08e7674a62624e2516b8
 DIST PyISY-1.1.2.tar.gz 25831 BLAKE2B 84c80e4fef3b7c0f26a6885519949c5db6473258f17a91634f0900166da7e7f11933e623552ef5b9890fd09bc7397bcbe6e52a497f04f65903dc608a202e7dd0 SHA512 ca11a3e8ffaf8aa4a34d19ad3abbb85493d8326261b6baa597b1fe6752d0dd7c9a00ff2bfffc71461ed3d4d9e85dc961b3c6dcb962cbaa7e9fe482a12f7530a2
-EBUILD PyISY-1.1.1.ebuild 680 BLAKE2B ca735808e8c6d7012f71d259472f5d9ae38e36b91f039185cf946b77616534122f8213937450eeed7ba281f0f6871e60a5ff5cba8a79c87d2ad742772b07e96d SHA512 764df5e9b173cf148c1d19cddfa22cc3a13ef58e85b27428f8e334d620cf7a22f5ad2c0736a54f01578861448661f04700f9052b3cc68f5a2ddf9b16eb8d4068
-EBUILD PyISY-1.1.2.ebuild 687 BLAKE2B 56f2700e503e04a6d1f0459a6a25c99a12a433c1e062d50fad9675dd4f91c79fd36a08ff1ec372508131f2cf9675f74a6331cd9882c4fd4d72ec66158f7ec30a SHA512 de295e0dd3094d064e71da7b5044b64e844ba0e2d60f7c51d4b6d8120e2343f8962d5f0f04a61c4194b881aa8b88525b0a8ef9a61942cdd6a05f23746556a42a
+EBUILD PyISY-1.1.2.ebuild 686 BLAKE2B bb636b158067d0c738e0a3c3e5c96734b7f4f04171fc40d5745e590d8d71731792111afc4c2876259e8046d004c46b95a78079f53bed2f2db050433d5ca55f90 SHA512 4cbfe05c7e54f8490c791b0a514f41c896ddafd4aa594a909d59e25afffd0559ffb6c70ffb2da7d08c0cb63cd20c4697accfebd4d4b19167cd2ff6e702dfb375
 MISC metadata.xml 447 BLAKE2B 460f054d56f3e6df11c2134899311c5a821fdf49af19fe2ce51bfa6d24cb11fa3c765d76bd737b876fb96bcce0dbd5e0cf2ccb109f78f69210da4db7f53e5056 SHA512 9707a5bb8fb81710dc81653e65908715ac5532caf85b26b116b44dd13237d49d8349af5ba6bb7a864e59f1c381959ee7f10f4b9d39de2d83506bd4d84b362caf
diff --git a/dev-python/PyISY/PyISY-1.1.1.ebuild b/dev-python/PyISY/PyISY-1.1.1.ebuild
deleted file mode 100644
index e67e865ee..000000000
--- a/dev-python/PyISY/PyISY-1.1.1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{5,6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python module to talk to ISY994 from UDI."
-HOMEPAGE="https://automic.us/projects/pyisy https://pypi.org/project/PyISY/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/PyISY/PyISY-1.1.2.ebuild b/dev-python/PyISY/PyISY-1.1.2.ebuild
index 2d7545b68..456417c3b 100644
--- a/dev-python/PyISY/PyISY-1.1.2.ebuild
+++ b/dev-python/PyISY/PyISY-1.1.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{7..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/PyMata/Manifest b/dev-python/PyMata/Manifest
index 1a52cb97b..25419c3fd 100644
--- a/dev-python/PyMata/Manifest
+++ b/dev-python/PyMata/Manifest
@@ -1,5 +1,3 @@
-DIST PyMata-2.18.tar.gz 21222 BLAKE2B d5323542e7454028f24204ce16c69fe0665e278f5de56acde91c606be1c591c31d64b4055075e35f8bcabf7ce29d41aa131d8ce95495160818b6df0958cf5ca1 SHA512 6d2865e41cb93e111e9ecf6f0dc6a95dee5785bc0904394bb7ea058fa964bfce4d5dbd4fdf406d0ed057a7a38fe97430732d8bda1b96bddb8245bc35969bfd97
 DIST PyMata-2.20.tar.gz 23143 BLAKE2B 1e007b69cccce99736a7b4c408bb850985d74ab8c1f9807c0926596d2ca0305e6acf0449ef3a39bf4bbb8703a0b1d4e34dd9f1eb2d560b6752f756d30ea4a1dc SHA512 22ccfa550cebcfd61246af07c131cc70ea478e8cf1b98371bba79b2239af598b3d966e09edf2c511f3afe4aeb83b7ce72d427758f09e42b926a2273661fa043f
-EBUILD PyMata-2.18.ebuild 693 BLAKE2B 8de20e399b6bf1fd2f806733ddcce3414a08edc316376b41f2e5d73e0924509c9f7561a33dfe54db418d376e2ed5c2ff609d933958aa9c30c9c9adac75a47ca8 SHA512 8eb52ebb9b0f108320495a5c5428bb251bda42648c1dee87edb5f26b3cf120555c68e5925fb12f157234a0a951b7020cae7c9747d32eeefb935a96e1b4f00eab
-EBUILD PyMata-2.20.ebuild 700 BLAKE2B 4e9ef6483697e8247fb8af88c4fe9dbeb42f86c3572effa1dd7372aa0a44ef39ca6784a1f44181df729583e7e14bd3b2af378e46769f6d3833291af5f45c6662 SHA512 9e74c0c6faa6f4145dcf5cc946fc1531fcb7dba14027b4cdd20e19b1f7d9c28c2e6f798b54d4fd8d48b3fdd8f995c4160f77a0fcbc43c926bb055c9201f084b0
+EBUILD PyMata-2.20.ebuild 699 BLAKE2B 489530641aa15bbe999f9b81c432dcb17041e6f2db4add8538e715e6e247c0b670bdfc964fb0350bca7127c8fcd79ba558c5fba492767b9f2c342fe4a21491e4 SHA512 45408434f65136687751e85dde57dcdc2eda50b8d8ca25cd3c1cdf82ecea97546906bc57f28112d035223bc5dccc3a59cabf7817edc0df5b5de50908b12926fb
 MISC metadata.xml 452 BLAKE2B 8ff6e6fc23ed6bcb902463b4ba1fb0b9602a491d52e0ec1a14da65b2b18f8d3dd8560808bea004f442c0c81343562865c19524b1e7f70d6fc7577c0e4aecf73e SHA512 c4950c9bfc6076d40b24a6785ac5a12fb58c1e651ad55c2befc72674c5786a701187755ac6d19b6f3b6c7ba588f3c3397e64cdb6bc2be3ff6ac71788dae95ae3
diff --git a/dev-python/PyMata/PyMata-2.18.ebuild b/dev-python/PyMata/PyMata-2.18.ebuild
deleted file mode 100644
index 6e64ec660..000000000
--- a/dev-python/PyMata/PyMata-2.18.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{5,6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="A Python Protocol Abstraction Library For Arduino Firmata"
-HOMEPAGE="https://github.com/MrYsLab/PyMata https://pypi.org/project/PyMata/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="AGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/PyMata/PyMata-2.20.ebuild b/dev-python/PyMata/PyMata-2.20.ebuild
index 4da349227..d99a69b98 100644
--- a/dev-python/PyMata/PyMata-2.20.ebuild
+++ b/dev-python/PyMata/PyMata-2.20.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{7..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/PyOTA/Manifest b/dev-python/PyOTA/Manifest
index 399f7e8b6..aa7868ad6 100644
--- a/dev-python/PyOTA/Manifest
+++ b/dev-python/PyOTA/Manifest
@@ -1,5 +1,5 @@
 DIST PyOTA-2.0.5.tar.gz 5511961 BLAKE2B 612764f6f343718cfe3cec6e4c8880d99c4a57ca76c52bb5aedd297b8bc3c308a4e11e9368f68a6522efd29f61b2d6b5510c804cdad88121b66f6a9b58bcf32f SHA512 d4c36bc3099e9089dacfbc87637ba06122490025d5babf35ec9e4dcef6357fdc6aa34cdb112372c47e4a2341cf99a4e523bd3adc795a6bd440063788e5a490e3
 DIST PyOTA-2.1.0.tar.gz 5523818 BLAKE2B ca876bf2f9df5ce2be6807e26aeb58e9277085adc2e499bc8b4e19d0156fe83c0966a6f91333a8ebd80118ab61e788cbb40cde70125d2142fc0b65fe59701ccd SHA512 2574d41f842fbb22d302a932d5c17c32b33c7c6de55f2ca29e5e6fa7f5d7c5b6f9df0927807d949410a1a53382f09036d6a36da0461b8bf1b73415c6565f3034
-EBUILD PyOTA-2.0.5.ebuild 819 BLAKE2B 9a97e743710327bea9782ace5b52ac512fe430db77c12bd5e50c68511ac6bf5058358e6c5cb8b73a4bb7ffa6ae4a81610760e7279bee663eed7dd4a679dd37ba SHA512 da5b4b6ab5fb56b9155c6b9e81003d1449d275136284c27dc3ad0e8766546043ea0c7c8ae94821bf210cf2383112ae9c5f3f516264635f4a2882176d3cdaac3b
-EBUILD PyOTA-2.1.0-r1.ebuild 793 BLAKE2B d79c57611815885ffba9551369535227b04ab89214402d3df7a67ec8cf49861446eaa065dff41104795e2c734f2c493a32338ca4cecc17640e614d480606e66e SHA512 f4cabfb9f5761a1b14733dbe74c558addf12e88545bd42675a8c1ede85a9597e6e33255ab386b03f5e59d4c6d6bd6ec25b460f131366e200a885e6764365e15c
+EBUILD PyOTA-2.0.5.ebuild 820 BLAKE2B c8b12808bd90137d4c7b1532c45c2ecbc6f03d0952897518a1cb4dbaeab89312c8dd14da2beee218b67d0ed754c3e41276d0ceb864bdba6adedb76d109bc0928 SHA512 15420d306cfa84149610b983a7687800fb96ea71c31753830afea270e74f4e55ff3da1733f5abb194a5767ff08e75ab4146debb05a5023323ecc076b2e5e1e38
+EBUILD PyOTA-2.1.0-r1.ebuild 793 BLAKE2B 6e53b0ec385cb3e5301ffd08dc594ac0825adabba1b90e18ae682deb82fe0402cbcbec8b9f8e7421d09280e0428fb11ec3767032306b750b6970831c42426c4d SHA512 7453ff4470fed040afeb8d1adabe9bfa8e85767d65035b0ef7600afcf0727adf91213186d4f8a3f689e25f23c2de5190626cf7dac9fd52034f8b9a6f792b3113
 MISC metadata.xml 441 BLAKE2B fc913fff82e76f27073f5dd8243e6993b6e044a05723a38f38db6009825aa1913e4baafc779c414f3a233c9721e0b13e0607721b6876ff6676a39fa7b2eec224 SHA512 416343a7faaa553adba6283adb0923c1dafe358b441e2c4d81e7dbba594f7cd351862830a4cb68f4c50dd283d1938f83d6f3386e4cb047b51179ca18db1a2cbf
diff --git a/dev-python/PyOTA/PyOTA-2.0.5.ebuild b/dev-python/PyOTA/PyOTA-2.0.5.ebuild
index c87d92796..004ebe366 100644
--- a/dev-python/PyOTA/PyOTA-2.0.5.ebuild
+++ b/dev-python/PyOTA/PyOTA-2.0.5.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{7..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/PyOTA/PyOTA-2.1.0-r1.ebuild b/dev-python/PyOTA/PyOTA-2.1.0-r1.ebuild
index 3ec4977e0..bb28d40c9 100644
--- a/dev-python/PyOTA/PyOTA-2.1.0-r1.ebuild
+++ b/dev-python/PyOTA/PyOTA-2.1.0-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{6..8} )
+PYTHON_COMPAT=( python3_{7..8} )
 
 inherit distutils-r1
 
diff --git a/dev-python/PySwitchbot/.DS_Store b/dev-python/PySwitchbot/.DS_Store
new file mode 100644
index 000000000..d968af63b
Binary files /dev/null and b/dev-python/PySwitchbot/.DS_Store differ
diff --git a/dev-python/PySwitchbot/Manifest b/dev-python/PySwitchbot/Manifest
index a7032ea4d..155f590c4 100644
--- a/dev-python/PySwitchbot/Manifest
+++ b/dev-python/PySwitchbot/Manifest
@@ -1,9 +1,3 @@
-DIST PySwitchbot-0.6.1.tar.gz 1796 BLAKE2B a0a31cebafac146e7fa99e7f35327a77ebdabc5d44197f78dcd3d0b097ffc28395dc5ac6be2f5700f1481422fba00d58d0ecc0e8cd1bdbc0feabbf8d57181a24 SHA512 093b42f0ae4f4001383f73e6402ec683c5639de710aa1724a61782d1337dfafe7cffb768add9c9f774829ba51267d9987f64108cd2bf0798a6c450c7b4ecb9b7
-DIST PySwitchbot-0.6.2.tar.gz 1794 BLAKE2B a96a3b0d01a2048403e5d9d8516742c76e92089c0ffb3762d31c4b82a6c1100f25d2c9f2e6494330c6efa156c4b0b1647be2e988da3984228f82027b7fe8dfe9 SHA512 b66a831a9cd2a401d963007dbebd55e09243425815bdbc272347c6844143876366df79ccdb85f5b0f771787e86f7cbf14eed8a5297a0b4991cbccbad394d90e6
-DIST PySwitchbot-0.6.tar.gz 1792 BLAKE2B 528ec5b4f2e64796baf9a9b2ca870544cfdf54931f3a436b628bbe3ef5ba54de09810324b023b868542e9730f1608ce1ce9dddb66cb36b29200e416f9040315a SHA512 92de64dbea25c3f5e1146b16acaf5f45d2b7b62b609b6cd63ea390f70e0f446fa5c955fce2e01ee0ecd974735910398ffdbb621db80ccbed150897b1a77d0769
 DIST PySwitchbot-0.8.0.tar.gz 2339 BLAKE2B 18ff8acdeb0fa9b42c25d66f62400a2f33481322262ea1aa9f20d11df784feb2a7f6ee1bf3b6bb836e08087fc07e895d17920f015020b06f46908193b133f1e7 SHA512 54d87c800dc0c15187bef145ec8ced475c839f2e86533004c3faacd0c4e4877b8db3763e919d487dbb46f3cc575b6b9ead329d72c5e851ca0871b2399abf982f
-EBUILD PySwitchbot-0.6.1.ebuild 690 BLAKE2B 835c45efd07cb9fff8b42e4bdb504883a922b7ded83e71d8465d2eaacdce2af9aa2a31cc4b93688ce488d5c9114aedf3eddd4ada0338b899dd52656a45bfb16c SHA512 aa4b5b4abddcc9569c7195b904e7348bb6a989e76b867b38d289fc482c6b737f548fd859da153e4435b6ae272b0bff686222c56ce4c5e4f4406b6ae40a42e4f9
-EBUILD PySwitchbot-0.6.2.ebuild 697 BLAKE2B e78a328741c19f0950f19c6c37acad726d40b86510d8fd85d637f4e02e17baa0c7ddc62333046058b153bf282713676932c75805906b3f4d674d09a8cb3bd388 SHA512 e8b2ea524fde1e34da20b1748eb85c69ff7d7362fa97c6a97743d1f0bc9bd28cb4a906cd68a794b47232224a4c0e0d86cb8491fafb26b99708d766e26c2bc680
-EBUILD PySwitchbot-0.6.ebuild 690 BLAKE2B 835c45efd07cb9fff8b42e4bdb504883a922b7ded83e71d8465d2eaacdce2af9aa2a31cc4b93688ce488d5c9114aedf3eddd4ada0338b899dd52656a45bfb16c SHA512 aa4b5b4abddcc9569c7195b904e7348bb6a989e76b867b38d289fc482c6b737f548fd859da153e4435b6ae272b0bff686222c56ce4c5e4f4406b6ae40a42e4f9
-EBUILD PySwitchbot-0.8.0.ebuild 697 BLAKE2B e78a328741c19f0950f19c6c37acad726d40b86510d8fd85d637f4e02e17baa0c7ddc62333046058b153bf282713676932c75805906b3f4d674d09a8cb3bd388 SHA512 e8b2ea524fde1e34da20b1748eb85c69ff7d7362fa97c6a97743d1f0bc9bd28cb4a906cd68a794b47232224a4c0e0d86cb8491fafb26b99708d766e26c2bc680
+EBUILD PySwitchbot-0.8.0.ebuild 696 BLAKE2B 626e5d04bc6e653d956c8ba49652f15b5e8c2d35feb2e21d221786cd4a113d846e7d9dcacdd4c96398f07f316804429c077749e4381abd3708297ebf7265333a SHA512 20b8e177cda7793edcdb994fa559c86f8aa013ff6d94ac12f701373f3d18345657ba0be0c66999ed2d670c2c80b63b03bbd856631cd2fe1462634a4b1559d580
 MISC metadata.xml 330 BLAKE2B 513f48da73e61f211a2398788c1ae2fa6a5f11b75bbe22b6e01eecb74623ead9e67076a57515be99a3178af24f41a51866b8e81c03d719cdff8ff3566ac471ac SHA512 9a8ed7d0c9e9092fa6af0ee042fb27e45b552e2256f0a95f94f31b79ae597cae02efb38ff66e64c2e296494ba8baedee9f700190ebcdd0de5d27d197cad7311f
diff --git a/dev-python/PySwitchbot/PySwitchbot-0.6.1.ebuild b/dev-python/PySwitchbot/PySwitchbot-0.6.1.ebuild
deleted file mode 100644
index 9eba95dd7..000000000
--- a/dev-python/PySwitchbot/PySwitchbot-0.6.1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{5,6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="A library to communicate with Switchbot"
-HOMEPAGE="https://github.com/Danielhiversen/pySwitchbot/ https://pypi.org/project/PySwitchbot/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/PySwitchbot/PySwitchbot-0.6.2.ebuild b/dev-python/PySwitchbot/PySwitchbot-0.6.2.ebuild
deleted file mode 100644
index c121d837e..000000000
--- a/dev-python/PySwitchbot/PySwitchbot-0.6.2.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit distutils-r1
-
-DESCRIPTION="A library to communicate with Switchbot"
-HOMEPAGE="https://github.com/Danielhiversen/pySwitchbot/ https://pypi.org/project/PySwitchbot/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/PySwitchbot/PySwitchbot-0.6.ebuild b/dev-python/PySwitchbot/PySwitchbot-0.6.ebuild
deleted file mode 100644
index 9eba95dd7..000000000
--- a/dev-python/PySwitchbot/PySwitchbot-0.6.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{5,6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="A library to communicate with Switchbot"
-HOMEPAGE="https://github.com/Danielhiversen/pySwitchbot/ https://pypi.org/project/PySwitchbot/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/PySwitchbot/PySwitchbot-0.8.0.ebuild b/dev-python/PySwitchbot/PySwitchbot-0.8.0.ebuild
index c121d837e..d6dea2d83 100644
--- a/dev-python/PySwitchbot/PySwitchbot-0.8.0.ebuild
+++ b/dev-python/PySwitchbot/PySwitchbot-0.8.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{7..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/PySwitchmate/Manifest b/dev-python/PySwitchmate/Manifest
index 2667f99cb..b7853abf8 100644
--- a/dev-python/PySwitchmate/Manifest
+++ b/dev-python/PySwitchmate/Manifest
@@ -1,5 +1,5 @@
 DIST PySwitchmate-0.4.5.tar.gz 1835 BLAKE2B 0f10b26edc1f94bf9f34e75646a92bcdcb4dd18541dc6058933d12fac64da2d5aa49b3fba7829aa81253f4d3296498ae6fc746688a18eca744676c4fa1f134dc SHA512 1b05d84c6267b8508a9072a3c94765fa9e6efdf3a530211678fe7ae9dcc2ad2e89a4aff0d44c9dd25154e0c537943e8e5ef2dfe9cb950834b8ea85b4bf3edddf
 DIST PySwitchmate-0.4.6.tar.gz 1852 BLAKE2B df0cd5acf51f2837e70be7a5a3bb94f459037a05c9f8984701b571cba64260b7a2fa537784a18c06f8a64e7f853bce190fb271967ded67070a3be8eb21e4a53f SHA512 721d28da3be782de48456a2a91252428efc9e9b3286c1b1ce7e5560f1072448057cd839bf510bd40ffa495ecf80154d2ffef9d8b40c8d300a693c08f79bd5d09
-EBUILD PySwitchmate-0.4.5.ebuild 691 BLAKE2B 4bc4aa225fbf48c1277a25fe54fd09130f488c0103a3ea3a38bee57b2c84f367e3b2aff9a4529a069fd1395de24352fe81f7bd2e51f53917787d490e67199265 SHA512 14d13a11ebbddee8a3de578a8b0439713508996a66345967fde854b954d7a8bd3f6fb9391c08867ba625447b019e89b83c087d0dc605360d3be3ad9d7585734f
-EBUILD PySwitchmate-0.4.6.ebuild 700 BLAKE2B 1a956b316789a64119abf80a6dbf02d1bce39fead6c111af0f50f3b475421b9ae17c6bd2e9aa02d7770073fcd976a1c21c89780e8e11fa03724f0101d32c4d33 SHA512 91d5f05d3ce5a02c136b3ce9b0d6036e87c0f2f7424e4cf4c3b9c76f23b48dc126a5bb30baea10ca2247e54a87b45791d7f2dbf6e593c2060bcb4bd1d4425422
+EBUILD PySwitchmate-0.4.5.ebuild 692 BLAKE2B 488b2d183c0c87e274b1a52d34dee3374f9e48803508a88e7547ddca31d5affd9c079a49c9cfa7f466b7b5c9122ecc078dd4bd34571e723ca416b4757936fae9 SHA512 5341b0ac3ae97e788f239976417e9960d5985566fe3d2defbbbe8a1f1e08aa701dd1ffa5f98a90f7cad7b0d424b739fe6642e5e641883902947effa74e2dc2dd
+EBUILD PySwitchmate-0.4.6.ebuild 699 BLAKE2B c8ce7bbfecf1b58fec6acc0a79cbb39153a5dfad07b87802ca04082c61ae936ce00a1818327137ece554f96b4bd83fa20a32a67b94339b5bf6f17ba4b0772606 SHA512 e3ca69ad387ec0342278a58f98e3abd913bea30adfedb1e6e794e79b99b644d4ac7ef3fef23dd17347552dc07f3a0303a46d2ee3263673ef8ff8325db64c036a
 MISC metadata.xml 252 BLAKE2B 507e0ddc9d50b879ff374b903b142f85d020dfd6c486aba2af84fe082c878e780edbb79188ae10104d57db0eb775c86814cc8c06891a3854c9da840a4d377050 SHA512 9470ac9c8a5a4f80e3f767e7aa198addc7b21866c63b2a310e9f41ce65817672fb77423117bdd619e99cb62322025aeadf50717e23eafabf99080fcc106820af
diff --git a/dev-python/PySwitchmate/PySwitchmate-0.4.5.ebuild b/dev-python/PySwitchmate/PySwitchmate-0.4.5.ebuild
index 30e1b0a74..b0ddba304 100644
--- a/dev-python/PySwitchmate/PySwitchmate-0.4.5.ebuild
+++ b/dev-python/PySwitchmate/PySwitchmate-0.4.5.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI="7"
 
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{7..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/PySwitchmate/PySwitchmate-0.4.6.ebuild b/dev-python/PySwitchmate/PySwitchmate-0.4.6.ebuild
index c592f780b..a02e30cc0 100644
--- a/dev-python/PySwitchmate/PySwitchmate-0.4.6.ebuild
+++ b/dev-python/PySwitchmate/PySwitchmate-0.4.6.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{7..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/PySyncThru/.DS_Store b/dev-python/PySyncThru/.DS_Store
new file mode 100644
index 000000000..c1522cb9b
Binary files /dev/null and b/dev-python/PySyncThru/.DS_Store differ
diff --git a/dev-python/PySyncThru/Manifest b/dev-python/PySyncThru/Manifest
index 93b042c57..21bfb1548 100644
--- a/dev-python/PySyncThru/Manifest
+++ b/dev-python/PySyncThru/Manifest
@@ -1,11 +1,3 @@
-DIST PySyncThru-0.4.3.tar.gz 8440 BLAKE2B 1a2802cf9f9dd9fe42c359e2958d186aa7d35a6059169d03c8b14f1eda8ba7ebf95544c54bb812efe1c31483293f6be087ee18942d641c5968287aff9b90d1c3 SHA512 c57d963837f3f42f7f16a7c60f921998c862660dfc1a06d1f09df18ccf2b8c951d52fb36fa40085dd4974cf8c7bc1cd9bf707e2c94c9b850bc5704209f925347
-DIST PySyncThru-0.4.4.tar.gz 9141 BLAKE2B ee084b2927ce1e580301f2593c72c8a7fb02188cbccfb9fdfc892d37457fc50ec954229a8f3fc84c19f5587c6f264dd3698b239a7da283b110bfdf44907af9e4 SHA512 30b3f73db4f84d10886e27e5e486ba9588d590452888fb7da2a469ca8686d69fa76a719c57f37e42a9e5fa6d3641e0fbf0a5ad93794b955520f302e790d219d2
-DIST PySyncThru-0.5.0.tar.gz 10052 BLAKE2B 1df00c9897712d8fa659ea529b5144f3bfd1c39cca37799e3fec0a4b567074b461f49a2ab57b6ff16fa643a3e166579f186cddfdf0921e1326931beca8741b76 SHA512 ab973ba01bdfd49828a2be27691718467c82ce29d54c862a328e7ad9fd612101b7d90ff9dfe1bee388afeef53e588b6b22c8fb04a209cd0494e0d9f2c7f5feda
-DIST PySyncThru-0.5.2.tar.gz 10134 BLAKE2B 426b490561908534ab0033b6a35d16a3d771f7131db4b0444ef70e75d66e54a6dab387d1d3ef274268c1a58c8e175084c103521883497549bccffa931664eec7 SHA512 fdecbb5b75feed47dd57180cf156269e99efbbb7fa337343fc89d36959a07729ad5d7ec06def97814cebcc72a8f4e053bd3731f2adfc8d5ede6d30b29799a98f
 DIST PySyncThru-0.7.0.tar.gz 8954 BLAKE2B 53df72b71d8dbb64beb5fde9c615f8e6ed2dfc2776332586717d191f1d0efd457818f84f31460bfd109ab6c573e7491becb1740fd204d6ad8265a508cad858b2 SHA512 03e90a0ed83a2bb8cd661cea1d0ed4b4e0eafeca4a3c75e2a74baf86e45df7e43e5029cf4be8b6a058067d0e28d45f5390fa88bb7aed7238fd3aa94afbb1b421
-EBUILD PySyncThru-0.4.3.ebuild 716 BLAKE2B 1933b3b0d5b5537aa30fe85f8c49255da054bdddb8a476203009a56443a064b91f8f234892555987b13d335a79004b1e5a7c399ebe748c2c1188817b118bbd86 SHA512 4895fd8099854d2048cf25ec83b5fda1a6c6c2055c71349307454e968866a228b69860a88a00eaebd26fb8f766bb9d46a8e700c610cb0602faf98742d7ecfc8b
-EBUILD PySyncThru-0.4.4.ebuild 716 BLAKE2B 1933b3b0d5b5537aa30fe85f8c49255da054bdddb8a476203009a56443a064b91f8f234892555987b13d335a79004b1e5a7c399ebe748c2c1188817b118bbd86 SHA512 4895fd8099854d2048cf25ec83b5fda1a6c6c2055c71349307454e968866a228b69860a88a00eaebd26fb8f766bb9d46a8e700c610cb0602faf98742d7ecfc8b
-EBUILD PySyncThru-0.5.0.ebuild 797 BLAKE2B e862cf50d85e11a0a359f69c13ba943019c4736e4fda496ef520c67ba3515e3bf332e967605b03b17a2275885ab13ab7d21fd3e23715c8c777636eb5d084983a SHA512 06026a13b000a65fe373838c69d43854baecbf20714f5ba93438bad841bb542f340f6fd5f33081540f842c420a6bd59288af1d19c05549d58c336b72ffb66820
-EBUILD PySyncThru-0.5.2.ebuild 797 BLAKE2B e862cf50d85e11a0a359f69c13ba943019c4736e4fda496ef520c67ba3515e3bf332e967605b03b17a2275885ab13ab7d21fd3e23715c8c777636eb5d084983a SHA512 06026a13b000a65fe373838c69d43854baecbf20714f5ba93438bad841bb542f340f6fd5f33081540f842c420a6bd59288af1d19c05549d58c336b72ffb66820
-EBUILD PySyncThru-0.7.0.ebuild 797 BLAKE2B e862cf50d85e11a0a359f69c13ba943019c4736e4fda496ef520c67ba3515e3bf332e967605b03b17a2275885ab13ab7d21fd3e23715c8c777636eb5d084983a SHA512 06026a13b000a65fe373838c69d43854baecbf20714f5ba93438bad841bb542f340f6fd5f33081540f842c420a6bd59288af1d19c05549d58c336b72ffb66820
+EBUILD PySyncThru-0.7.0.ebuild 796 BLAKE2B 8f4faaca6c99d910493a9b3ed6a4fcb263ade06f11094f34b51438605b9622be223496c7f8765fe49e18f78529b385776130c80c45179eaecfab93dc56d5eea6 SHA512 0557ed4aa6dc6b50e6ac4ce75c0d4affe798bb261b7ccaa1a6a84714b8739f10cd58cb38b5937af7869d573ffae5f3cfd4e4527940708ff811c1b120ee4c093e
 MISC metadata.xml 449 BLAKE2B 4c86cf00f3e33bf20aea0b6ad07ec30e1bde57555d4a212a2da1cc32808ee86bba8493a9779dc9383ff08c056fd981ab7320714934c1873003cdd80c7ac7dffd SHA512 1e508694300e5e34fa01fcc03b5554ab392cf1f04424b62a5e143fc92ebc007f1ab629680b143a4530f1fccf632e79e66b7806d53f4affc2c3143b70713587fc
diff --git a/dev-python/PySyncThru/PySyncThru-0.4.3.ebuild b/dev-python/PySyncThru/PySyncThru-0.4.3.ebuild
deleted file mode 100644
index 863336830..000000000
--- a/dev-python/PySyncThru/PySyncThru-0.4.3.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{5,6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Automated JSON API based communication with Samsung SyncThru Web Service"
-HOMEPAGE="https://github.com/nielstron/pysyncthru/ https://pypi.org/project/PySyncThru/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/PySyncThru/PySyncThru-0.4.4.ebuild b/dev-python/PySyncThru/PySyncThru-0.4.4.ebuild
deleted file mode 100644
index 863336830..000000000
--- a/dev-python/PySyncThru/PySyncThru-0.4.4.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{5,6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Automated JSON API based communication with Samsung SyncThru Web Service"
-HOMEPAGE="https://github.com/nielstron/pysyncthru/ https://pypi.org/project/PySyncThru/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/PySyncThru/PySyncThru-0.5.0.ebuild b/dev-python/PySyncThru/PySyncThru-0.5.0.ebuild
deleted file mode 100644
index b0665dbf5..000000000
--- a/dev-python/PySyncThru/PySyncThru-0.5.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit distutils-r1
-
-DESCRIPTION="Automated JSON API based communication with Samsung SyncThru Web Service"
-HOMEPAGE="https://github.com/nielstron/pysyncthru/ https://pypi.org/project/PySyncThru/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND="dev-python/aiohttp[${PYTHON_USEDEP}]
-	dev-python/demjson[${PYTHON_USEDEP}]"
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/PySyncThru/PySyncThru-0.5.2.ebuild b/dev-python/PySyncThru/PySyncThru-0.5.2.ebuild
deleted file mode 100644
index b0665dbf5..000000000
--- a/dev-python/PySyncThru/PySyncThru-0.5.2.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit distutils-r1
-
-DESCRIPTION="Automated JSON API based communication with Samsung SyncThru Web Service"
-HOMEPAGE="https://github.com/nielstron/pysyncthru/ https://pypi.org/project/PySyncThru/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND="dev-python/aiohttp[${PYTHON_USEDEP}]
-	dev-python/demjson[${PYTHON_USEDEP}]"
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/PySyncThru/PySyncThru-0.7.0.ebuild b/dev-python/PySyncThru/PySyncThru-0.7.0.ebuild
index b0665dbf5..db21550ac 100644
--- a/dev-python/PySyncThru/PySyncThru-0.7.0.ebuild
+++ b/dev-python/PySyncThru/PySyncThru-0.7.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{7..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/Pysher/Manifest b/dev-python/Pysher/Manifest
index 593a8836c..f6e678c70 100644
--- a/dev-python/Pysher/Manifest
+++ b/dev-python/Pysher/Manifest
@@ -1,7 +1,7 @@
 DIST Pysher-1.0.1.tar.gz 9752 BLAKE2B 5284fd9da625069162a99fd65dd6707f7620308e7d66966ba7e09487a771ce13cb2a8640fcaeb28915af5ec994140ddbe735f1d7463c8bbc9eeff0812b78e25b SHA512 c81faa7813820ee6aaaf5a74015f3d04eb199f0de7c2e7ef94dd6f4225387edd5672678082af01a6ca8d8edebfe249297dadc2064ce631f1e9a23fc9e9d881f1
 DIST Pysher-1.0.4.tar.gz 9795 BLAKE2B 5908525c8a1ee7a02deca5a4f0afdf0cd88228c283b0dbb5db9264c839a2b365225d345f05068bd99d7986e73f055a423eb71d6fe123ac2b201b7c89b7ea9a46 SHA512 e85d3d5aa227197602fcdcc730908f4e4265cd78f9772d72d7072a47af39cefc2df08c18d400de124c3b6d16de12d354f4ec07aa9cb9580e4e5bd03c46e942e1
 DIST Pysher-1.0.6.tar.gz 8812 BLAKE2B ad092130eb75ba12d81e28e908708da7279855aebd3dd5d8ac1ce6a365fc50b796c76aacdfff802da7d273ff9873df51d8ff278e609bda939ebef1744e7f08a4 SHA512 fae00e4a23ffc2b4730703763fbff7c27faf109718a1158688b8d5dba46034e6bae91009d35c64245a9d605b3dba3b0ffe819f3834f5b5953f93d6b3f5608ff4
-EBUILD Pysher-1.0.1.ebuild 1025 BLAKE2B 0df40a4385828c735e6e373faee8f2e20932ae1a1e3dede36a2d522fc4c1d0fb7cb105ae3e14d331c128f731825f886e2adeddd9ff628a5deabcf8dc62ad2a93 SHA512 6fdf743b2e36f32a7e189e295c1fabbe8b967642c5b904c6c675d6df06e571074f8ad8d77bdec01d343002de0f146d1abdf48810a88a58042a40e877862d8086
-EBUILD Pysher-1.0.4.ebuild 927 BLAKE2B 4058c34bdfd2b0b2b4a10264300bf3a32d4ba249916b181032844c56e1c183944dc74cafd9513ee518f1a73099452568ca3af6e0d371ef2740e9612c239cbdc5 SHA512 91a6b3d4f76afe8b6a5e5dfad49647aa5a5041c73a9d2ec83e5aa6063e298c5eab29684205ceda1c4d69107f642b4e684e51b9e5ce6e4b8548e7cf4741fd4920
-EBUILD Pysher-1.0.6.ebuild 771 BLAKE2B 0bfe050fbd795d801cff63f671e7ca93a4ef2af208a01af57e6802eb5c649a9cffe01c3f4401132b23174d89fad0a79d42deeb0e41aadfc1a5d89f4eb5dc2559 SHA512 fec35e1630941ffcf6720d550d190a8be3ed7fb37bd5255e9fdb7beae94bb861bc8c11a085ae2b3053aaea08be5a94da46964b8592061a548b95aa9ba02a1861
+EBUILD Pysher-1.0.1.ebuild 1026 BLAKE2B 6c588da44c3fe3b58fa1d1af251da380abe8eb2955caa6e2fe7ec50335c020385d053177ba0f281347cf4213f1c62c8fb021a12f705daa19dbc134bc5e191007 SHA512 936c053876b91bccb5851b0172a0ce0f603edf671e4f2e7541199c34b687c4f83c9bead65d70846eb9d2e2889e2c06a3c3e0ccdc677f251e4482e895664ec048
+EBUILD Pysher-1.0.4.ebuild 926 BLAKE2B 8fd7b0687ec8c22e82f9e141ee45cf8f687a851ae239926093a55d665834b2ec81fb6d52245fc876e3c4f7f1460bef77ae79216ae5757560f6f7b2014196cc18 SHA512 861f53b59ed1c00bd3f41d92021e340a25ce6a1d16bafa6f2ad5e693047dcf9a8ec270a8a81098c8d60f9bc9d66922787049d59ffde6cc116e4f12d8943291a5
+EBUILD Pysher-1.0.6.ebuild 771 BLAKE2B 09c78eba28fd49e8398b49a591ee3353fb8906ef0120bd34f46155af20aca8600b677839eb0435c4fd5d945480e5debc0b893c59d19053108b4b2e091fad54bd SHA512 a69b598f8b728cd60ce33ed2ec413ecdd072b2c4b2daed84e53613a6056f6ddc22df1c0959749c40693f9866212b35dc292fb8eb2e8fcfaca18c4b15c3270802
 MISC metadata.xml 461 BLAKE2B c16baf898994a2cbaf2727008374ea37deff2ccb89949a84cd63491f0de10902415cd1b203e131129f2f6a5a38eb7ca275962079c3d9a50a0e659d036dcc4ea7 SHA512 d48998d1903af802aca022e09a3d20a13100fabc0b634f0c7bd3ccb0d34e13471f08d3e4e3d96e7331700a0d4b9cac760fbdbad9ce2470adb27d20b315b5287d
diff --git a/dev-python/Pysher/Pysher-1.0.1.ebuild b/dev-python/Pysher/Pysher-1.0.1.ebuild
index 1fa08ce70..e34b031dd 100644
--- a/dev-python/Pysher/Pysher-1.0.1.ebuild
+++ b/dev-python/Pysher/Pysher-1.0.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{7..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/Pysher/Pysher-1.0.4.ebuild b/dev-python/Pysher/Pysher-1.0.4.ebuild
index 7ebe954c3..43651c7ad 100644
--- a/dev-python/Pysher/Pysher-1.0.4.ebuild
+++ b/dev-python/Pysher/Pysher-1.0.4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{7..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/Pysher/Pysher-1.0.6.ebuild b/dev-python/Pysher/Pysher-1.0.6.ebuild
index 46f3d176b..7f62eecec 100644
--- a/dev-python/Pysher/Pysher-1.0.6.ebuild
+++ b/dev-python/Pysher/Pysher-1.0.6.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{6..8} )
+PYTHON_COMPAT=( python3_{7..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/RPi-GPIO/.DS_Store b/dev-python/RPi-GPIO/.DS_Store
new file mode 100644
index 000000000..2b82894d3
Binary files /dev/null and b/dev-python/RPi-GPIO/.DS_Store differ
diff --git a/dev-python/RPi-GPIO/Manifest b/dev-python/RPi-GPIO/Manifest
index 39ab9b39f..095334be2 100644
--- a/dev-python/RPi-GPIO/Manifest
+++ b/dev-python/RPi-GPIO/Manifest
@@ -1,7 +1,3 @@
-DIST RPi-GPIO-0.6.5.tar.gz 26986 BLAKE2B 1e8178a1cd5feda6b35875f188a3a847fd6276c98ae6ca93071c27184a7f4c7caccd5d4c175769fb1eac355711d304b27ddd05b852ed5762040f47fe63417f64 SHA512 1393f49715b9c2d693743f962f75c4129ed229c83f49f31b913af8eaddb94280884127b8815d5c1e8451c3764c86962763a611b19ebc4afe72ac5fea3b61817b
-DIST RPi-GPIO-0.7.0.tar.gz 30845 BLAKE2B e12c73a73f3ee049373433e63aeddbbc047122f2e2164e0c11661c0b693df334b0a2e122e11c15375ef7a7429bc3d2e10a859e8c67588ccd6131e540fc010b25 SHA512 db838914a26dbc2083af16d5e5780b2f9b5c5e8c43a083556157964b032654e0f4942173ee933afa7169d1eca26e123410518328ae5729b6aaf8ac8f41996b01
 DIST RPi-GPIO-0.7.1_alpha4.tar.gz 29871 BLAKE2B 468ee0fb1fa0a0939d70b9811cc139225d198c749b47a7d9bc86f80241be43be8876095899dbefae39f1f23749b05c0bd119c8d0c2f73e5f649e995248679d6b SHA512 31816a27252125611398eeb9a3ece61f220e9d32c5c83fb9b144f481eac9759ab8484c8e376387d125fb1bf71565452bec9786cac214d74a4be587a4dbeb28fa
-EBUILD RPi-GPIO-0.6.5.ebuild 778 BLAKE2B f40794416e0d05e365423c2b1010a57dfcbe6a9c0a0b9d241032a3c68e3b5f0d90938318e4405595b6a306c9529244aa2059d0904e63bc2be30d71b334c293ef SHA512 790761c67595d979c2ddd2ee9b3b0f1c143a8af1b11203f23750ec7a28a113a817bf4299093786b08d367381a81c568cfd6e3bd53fc896b45e44ed5242d2e72c
-EBUILD RPi-GPIO-0.7.0.ebuild 785 BLAKE2B 57adf7c830f6586fdd5b16cbee269e3f2924087f528dbcfc5748373deacb222dd1d07b58da519da17115683248f3e59887927aac1d13eed2f5701ea393135664 SHA512 501e179ab952f07a668241e6943fce4f20f41b162b5933e81000de684f6eb620fffef5c61be8ee2fe62a80b5cf83e8c57ea3f835dfc2aa0e344160f06c47bc80
 EBUILD RPi-GPIO-0.7.1_alpha4.ebuild 829 BLAKE2B ce0db240bb022ce116c3691a411ee0b44d508b36144083a7151c9b00aef17f24cd42af0c5abf6066b9b9f76fb4f98a71812e908a6ef6f46cc40d1564c15d5759 SHA512 2749911de9f9118fed053c1b67aa946c8ce858d0e2151665fd2d6f2e8a5b9526b159f4e8efade4cb440fb7566b07be71946a9daafa569134d1cd40fba9f1c82f
 MISC metadata.xml 447 BLAKE2B 8bec35139cb0b1560ab60de8eb7434c511ed84cb4dfc2e3bec2dabf8c08efdbe1a21cd9656534dc2a230cd23dff8193319fb8010c305564e6eb617332b9ec980 SHA512 f150e271c96c59825d0396d2f89212af70a0c07946b350e5b39bb30734b889cb6e54e632120dbcf6c46b5c6f2c3079cc644128a45d0ef222e768c81d20537dc1
diff --git a/dev-python/RPi-GPIO/RPi-GPIO-0.6.5.ebuild b/dev-python/RPi-GPIO/RPi-GPIO-0.6.5.ebuild
deleted file mode 100644
index 522270fad..000000000
--- a/dev-python/RPi-GPIO/RPi-GPIO-0.6.5.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{5,6,7} )
-
-inherit distutils-r1
-
-MY_PN=${PN//-/.}
-
-DESCRIPTION="A module to control Raspberry Pi GPIO channels"
-HOMEPAGE="https://sourceforge.net/projects/raspberry-gpio-python/ https://pypi.org/project/RPi.GPIO/"
-SRC_URI="mirror://pypi/${P:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-S=${WORKDIR}/${MY_PN}-${PV}
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/RPi-GPIO/RPi-GPIO-0.7.0.ebuild b/dev-python/RPi-GPIO/RPi-GPIO-0.7.0.ebuild
deleted file mode 100644
index 938c1672e..000000000
--- a/dev-python/RPi-GPIO/RPi-GPIO-0.7.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit distutils-r1
-
-MY_PN=${PN//-/.}
-
-DESCRIPTION="A module to control Raspberry Pi GPIO channels"
-HOMEPAGE="https://sourceforge.net/projects/raspberry-gpio-python/ https://pypi.org/project/RPi.GPIO/"
-SRC_URI="mirror://pypi/${P:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-S=${WORKDIR}/${MY_PN}-${PV}
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/RestrictedPython/.DS_Store b/dev-python/RestrictedPython/.DS_Store
new file mode 100644
index 000000000..90d3a3897
Binary files /dev/null and b/dev-python/RestrictedPython/.DS_Store differ
diff --git a/dev-python/RestrictedPython/Manifest b/dev-python/RestrictedPython/Manifest
index 8d9161421..60fbacaf9 100644
--- a/dev-python/RestrictedPython/Manifest
+++ b/dev-python/RestrictedPython/Manifest
@@ -1,9 +1,3 @@
-DIST RestrictedPython-4.0.tar.gz 437679 BLAKE2B fec17d36d1bb3b6c1a901fef26894aa1f67c78bb55109b37f031ec21e40a4210f75a08ba41c5a5238c40f0fe60e667719c1387683f3acd3da0acc492df2ab325 SHA512 8c753a4c54a1e6fb7be63e5645b4532f982af93e1866eb0b67a88d01761a7d17f4eb0cb1eb7113a428f1b5b533a49de866ec895cd9245d5d4b766f3ed858307b
-DIST RestrictedPython-4.0b8.tar.gz 77407 BLAKE2B 80bef6235a3bab073b27c1c863697fb4e2d24805b7c98b1a8fd29c5e0a1125c18ec883d0b1cc9224765a8671606bf3743ac307b9f574a6a8365ffa007a894a7e SHA512 d5fe2e62be3626e9ac4e8af009a4625bae29df57440c89dc2cc64036caad320363073e534d406ca719a00b611ddf3ac272e6cc0e0522ba9744fa1bd1e4efa037
-DIST RestrictedPython-5.0.tar.gz 437251 BLAKE2B 018266e7a9210b42d613835211ab3061ee70dc39776cffab884700a78393d072df35aa6cc727c11c6f030748870233bb9e7e0b1944d1d0a6040e2c1c4962fc4e SHA512 a3f9d6f31168683ec5dde66f93969d57b5dedd2ee5cb4430773ac635727903c8d6e3e6151170d8a058b1182dfeeabfbfd1a1f1c457b4b40f8d8b9078f01f3505
 DIST RestrictedPython-5.1.tar.gz 443982 BLAKE2B 9cd47ccb400cb9a6254f4da2d29c108fc985e2f1e037f120ac1eba993ff9bbdcb048f70a0904248f21fbe4107c79004844f18f6005108f20c55758c09ed056da SHA512 d75f3e9d9b3258e4d49f03981d05de832d490676feaffbaea4a08f08fa75b0e4b016aef69ee921efe7a3f26fd1bc6c2399a80793cc58a248c717771e0b3d27e0
-EBUILD RestrictedPython-4.0.ebuild 816 BLAKE2B 5438d37710ca06a84fba7604a1f06351dc5a16229185d2a4c7faa2e0d345ce47308b926868c302526a9ddb2b9eec9a6e9371be3a737fdd9e68dcdb28b165bfef SHA512 c22766499faf932797be9237fcb5de06c86587366de04676525029acebda867bcf3a1fab10dd75c37c9cf25f29a2488a91d89168b2ba7456d69e4a9129a81a5c
-EBUILD RestrictedPython-4.0_beta8.ebuild 816 BLAKE2B 5438d37710ca06a84fba7604a1f06351dc5a16229185d2a4c7faa2e0d345ce47308b926868c302526a9ddb2b9eec9a6e9371be3a737fdd9e68dcdb28b165bfef SHA512 c22766499faf932797be9237fcb5de06c86587366de04676525029acebda867bcf3a1fab10dd75c37c9cf25f29a2488a91d89168b2ba7456d69e4a9129a81a5c
-EBUILD RestrictedPython-5.0.ebuild 818 BLAKE2B 894501ef659dcdf70f959d6cdad8017abaa5728b7c9fc83ade55788ed3c58cb26481d18d7c6f09b45ddd4dfacc49930468f66bd2794d19eb54b3726337698048 SHA512 51fd7fc48552046c1bdc6141b61646fd6a1907be5829239e72fd884d459988f8d900fd4aca7d4c56c0b90a4f454718b6e4555a45a4914054ab4f6bedd0ba41a3
-EBUILD RestrictedPython-5.1.ebuild 857 BLAKE2B 280a33916cb87dc9d159701860e7869f83d5490053b8fa3456741892953e89659f963eb81ce9a24c1fa5d5f692aac28ab19235b427b66c561a72a78295e8055b SHA512 db1587e6aafda10519c53a0e778ca2a58a9ec482a99cf4f847eff9b85c6db013344db896e532e2e70e52c831d42617683a6f43b6e225a9f4fddaf80227952963
+EBUILD RestrictedPython-5.1.ebuild 857 BLAKE2B 3034c36885bc01870987fe92ce80b4bbf8483f814679c303dc315512b84c488d94807a90cbc3df1e0fdecc4417dc12a65657efeed3fd7559b6c0a12a02eeb887 SHA512 51f99ede6cc31e6528686fb3da0d581db00088ebe2accc1ac718f54a36e5b35909df627651f2a3565c2c2731960ce55dbd99ce61ec6b61cc3ca0700d4181fcb4
 MISC metadata.xml 478 BLAKE2B e694fe8c97965fc49c316892f7d210b53d864e0b5077607f06dfde2bc0dc01267f82202cce10ee816c26c642f60862330b2c6e7388254f98d35ba15cbf0d641b SHA512 24c4e0ea0acb3fd46b43c6f7d4f1174522fa0c05b5333322b186ca673ff12af6d269a4ffa0cda78eaf9670325214d1efb76faf0fbfb3955840a46e0a7af21e3c
diff --git a/dev-python/RestrictedPython/RestrictedPython-4.0.ebuild b/dev-python/RestrictedPython/RestrictedPython-4.0.ebuild
deleted file mode 100644
index f50b0b71a..000000000
--- a/dev-python/RestrictedPython/RestrictedPython-4.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{5,6,7} )
-
-inherit distutils-r1
-
-MY_P=${P/_beta/b}
-MY_PV=${PV/_beta/b}
-
-DESCRIPTION="subset of Python which allows program input into a trusted environment."
-HOMEPAGE="https://pypi.python.org/pypi/RestrictedPython https://pypi.org/project/RestrictedPython/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${MY_P}.tar.gz"
-
-LICENSE="ZPL"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-S="${WORKDIR}/${MY_P}"
-PYTHON_MODULES="${MY_PN}"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/RestrictedPython/RestrictedPython-4.0_beta8.ebuild b/dev-python/RestrictedPython/RestrictedPython-4.0_beta8.ebuild
deleted file mode 100644
index f50b0b71a..000000000
--- a/dev-python/RestrictedPython/RestrictedPython-4.0_beta8.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{5,6,7} )
-
-inherit distutils-r1
-
-MY_P=${P/_beta/b}
-MY_PV=${PV/_beta/b}
-
-DESCRIPTION="subset of Python which allows program input into a trusted environment."
-HOMEPAGE="https://pypi.python.org/pypi/RestrictedPython https://pypi.org/project/RestrictedPython/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${MY_P}.tar.gz"
-
-LICENSE="ZPL"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-S="${WORKDIR}/${MY_P}"
-PYTHON_MODULES="${MY_PN}"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/RestrictedPython/RestrictedPython-5.0.ebuild b/dev-python/RestrictedPython/RestrictedPython-5.0.ebuild
deleted file mode 100644
index dfe585d24..000000000
--- a/dev-python/RestrictedPython/RestrictedPython-5.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit distutils-r1
-
-MY_P=${P/_beta/b}
-MY_PV=${PV/_beta/b}
-
-DESCRIPTION="subset of Python which allows program input into a trusted environment."
-HOMEPAGE="https://pypi.python.org/pypi/RestrictedPython https://pypi.org/project/RestrictedPython/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${MY_P}.tar.gz"
-
-LICENSE="ZPL"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 x86 amd64-linux x86-linux"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-S="${WORKDIR}/${MY_P}"
-PYTHON_MODULES="${MY_PN}"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/RestrictedPython/RestrictedPython-5.1.ebuild b/dev-python/RestrictedPython/RestrictedPython-5.1.ebuild
index c9c1f4423..7d6c40df8 100644
--- a/dev-python/RestrictedPython/RestrictedPython-5.1.ebuild
+++ b/dev-python/RestrictedPython/RestrictedPython-5.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_{6..9} )
+PYTHON_COMPAT=( python3_{7..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/WazeRouteCalculator/.DS_Store b/dev-python/WazeRouteCalculator/.DS_Store
new file mode 100644
index 000000000..1ee08d322
Binary files /dev/null and b/dev-python/WazeRouteCalculator/.DS_Store differ
diff --git a/dev-python/WazeRouteCalculator/Manifest b/dev-python/WazeRouteCalculator/Manifest
index 40861d5cf..0ee39b8ad 100644
--- a/dev-python/WazeRouteCalculator/Manifest
+++ b/dev-python/WazeRouteCalculator/Manifest
@@ -1,9 +1,3 @@
-DIST WazeRouteCalculator-0.10.tar.gz 4961 BLAKE2B 4122faa37e65049fdf1e1a79c1e3d8640ea4d4c21608c950949143e104354b65fc3eca7061bd4b46f81d3a7939be661e4707700039352c658d98fdcc533d8190 SHA512 a5329157be5a4a9b2d01b8c5d8f4e1095f081bda60b06ae35a7303c70ce74b8ec045dbab8b51f876b33d83edcc557aa3e75d147f855005cb75f4768c3a54f456
 DIST WazeRouteCalculator-0.12.tar.gz 5400 BLAKE2B b2408fc89d95380e7ed4c09e1b2a7db699be3a27695688fe373d410eb7c312f0e1a9666daf97821657e7206006e1dcd9d60903fbd3bf2f80d29f07f140456f9a SHA512 25621c3fb5f77803322f1eb89210d33277651113823c1e6bcb6c7d5ab97e5d70ba4676fcc7eb96c904e07374ba2fa94f6d6aa1e8bad0c6b3e0a7891f2b7df076
-DIST WazeRouteCalculator-0.6.tar.gz 3010 BLAKE2B 3663774925fc0a7644e90ff49434ec06889dc5120051145f7f3c3da94e0642c978ad667139355658b9a7b86d3a0d279b30055c25bc6cd1d0c7cef1c83aaafee3 SHA512 d7301313add788cd29977013290879738062efb75a8535b4e9b3ecc60a70358d977db933f9ffa3d28160e82a7353adc99fe057a5ae5d81e442f3fd0733f91d8f
-DIST WazeRouteCalculator-0.9.tar.gz 4962 BLAKE2B 60dafda80e4709bcd2603d321e200c4619d620c6785e5cfdee04d951e62fc24c35968613d435b48cb3759a7d00f54e72255abe0cef86f896d8c300160b27d332 SHA512 037fca130aa0e8355695fc79ea67bb28024d355b0fcbf731a2bcd0c924e9c6c83fbbfbbdd9c6606c5cec561b6b8f34876f9abae69d4ada615e31b4c0bf2f73b2
-EBUILD WazeRouteCalculator-0.10.ebuild 719 BLAKE2B 2807e699de8962a7bf4c5e5857537a21b33783c2677556f2da202c77d22a2e6e2962072c4ae9f34b73dd8f40f172ae4ff3c5bbd3aed820c0a20d251919b0adaa SHA512 c827df6bafb0d4db58eecfd5742e8c18e17f68cf585ec66a0917671f403c797812f906adffed3a0cfbbcabdc6e95a32305e94a2255239b18b2d9c4c7625f230a
-EBUILD WazeRouteCalculator-0.12.ebuild 763 BLAKE2B d352113596640d08649b953311c00bc140b3ed4d02de05a028faabd311230f9adfd73697828b92a77864405336390a52d8d6e413a4625adee3aa9edd61b8933a SHA512 750bfbb1715a2494fc9964fefb0f20f5c9d23599fde80301465836cca056275d2f770fd3da6f957e6dd0769e41c7c118f7043a7062dc35bc408b7a09cf90adb1
-EBUILD WazeRouteCalculator-0.6.ebuild 717 BLAKE2B 057dab08284242ae6c2fea296eb5e412489e8298a0f665b9d0a9882b56b1153102c67f38774a6edf8c3e02ed425f47ee8b83d48a47fd12115339ab910e8c0e20 SHA512 ca91988e2bb213e482fb6f2c0617bfc64056a4c0abd519b98f91c2fc202e7fe4b77fafaf76e142b524f7314ec4858bacaee69d0fc6d5e94a9160619fd1bf02f9
-EBUILD WazeRouteCalculator-0.9.ebuild 717 BLAKE2B 057dab08284242ae6c2fea296eb5e412489e8298a0f665b9d0a9882b56b1153102c67f38774a6edf8c3e02ed425f47ee8b83d48a47fd12115339ab910e8c0e20 SHA512 ca91988e2bb213e482fb6f2c0617bfc64056a4c0abd519b98f91c2fc202e7fe4b77fafaf76e142b524f7314ec4858bacaee69d0fc6d5e94a9160619fd1bf02f9
+EBUILD WazeRouteCalculator-0.12.ebuild 762 BLAKE2B 682df8c5396671ee169bacc8af496c1afd042d95379b4d48086abecbd05a2f28ab82f829ac35f4abd38e849aa4d0e9ecf9d275d1fb8603b610ef0801c8d39e35 SHA512 c7c4db0134cb46b2261a45cbd19f755075048db4d311a3f229c88db35a7c904346ce544d02443758456b4740c03fa274de5bdb5d9d5f083238dd1846c689b994
 MISC metadata.xml 465 BLAKE2B afc3fe20dfff1f91957b5b0fbd6e9d17a906d2825d81efa938c36e37b392076f3c2266cf219ee99f4a72b10ea516cf57372f081ba6fbba0fd45173714e186ffb SHA512 94b0d141f29cc33b52693b803f4fb2bb7353aea264467a6914a5d0cc55364d9488afa9150456ef4c3a599a4721758462d252604fd8ec570a7c75d0667948bdf0
diff --git a/dev-python/WazeRouteCalculator/WazeRouteCalculator-0.10.ebuild b/dev-python/WazeRouteCalculator/WazeRouteCalculator-0.10.ebuild
deleted file mode 100644
index 3c796f604..000000000
--- a/dev-python/WazeRouteCalculator/WazeRouteCalculator-0.10.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{5,6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Calculate actual route time and distance with waze api."
-HOMEPAGE="https://github.com/kovacsbalu/WazeRouteCalculator https://pypi.org/project/WazeRouteCalculator/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/WazeRouteCalculator/WazeRouteCalculator-0.12.ebuild b/dev-python/WazeRouteCalculator/WazeRouteCalculator-0.12.ebuild
index 5abfc75b4..549bc40be 100644
--- a/dev-python/WazeRouteCalculator/WazeRouteCalculator-0.12.ebuild
+++ b/dev-python/WazeRouteCalculator/WazeRouteCalculator-0.12.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{7..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/WazeRouteCalculator/WazeRouteCalculator-0.6.ebuild b/dev-python/WazeRouteCalculator/WazeRouteCalculator-0.6.ebuild
deleted file mode 100644
index 3ca83732d..000000000
--- a/dev-python/WazeRouteCalculator/WazeRouteCalculator-0.6.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{5,6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Calculate actual route time and distance with waze api."
-HOMEPAGE="https://github.com/kovacsbalu/WazeRouteCalculator https://pypi.org/project/WazeRouteCalculator/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/WazeRouteCalculator/WazeRouteCalculator-0.9.ebuild b/dev-python/WazeRouteCalculator/WazeRouteCalculator-0.9.ebuild
deleted file mode 100644
index 3ca83732d..000000000
--- a/dev-python/WazeRouteCalculator/WazeRouteCalculator-0.9.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{5,6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Calculate actual route time and distance with waze api."
-HOMEPAGE="https://github.com/kovacsbalu/WazeRouteCalculator https://pypi.org/project/WazeRouteCalculator/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/YesssSMS/Manifest b/dev-python/YesssSMS/Manifest
index 0cee357da..d4061e17c 100644
--- a/dev-python/YesssSMS/Manifest
+++ b/dev-python/YesssSMS/Manifest
@@ -1,5 +1,5 @@
 DIST YesssSMS-0.4.1.tar.gz 8480 BLAKE2B 320e2ae952af41b4180fb2dc234f0b85789289db50b1d7740fc682e740659e29121f0e95066fb7c7cdb080ebb7a7ca500d8e2776049535acf8762de159986f25 SHA512 41338a4b7e036cfcf7b3e323b27c73eb905767ab0ab7778941b7bac07a7a35ae61dd7f1d5c6b3524a3b14845965485c811d5cb625b641fe82e445f003a68d7e1
 DIST YesssSMS-0.4.2.tar.gz 9637 BLAKE2B ee09b80978e45b8a1d877ad4ec067af2138f523dd934fbd1e326d147d27646fcd5dc89cbbd2e645ee975b967f39104a4dc741913138bc6f9eec004b19854ce52 SHA512 acf19008f1e958d1c49895dc009932c2c3a4be6fc9d2934ca994e88b480e5da517daf5ebec33b0278ac5ed3e5c4b21be9654ee2dea8aad8510eb3040a77ec6d4
-EBUILD YesssSMS-0.4.1.ebuild 723 BLAKE2B 348a638ad11782bdfd762e3eb1378a3e262275a8b1b811bdeed29a1817b78bab13e32ce63d77191fa232fafb21a5de561f2bb88d1ab170bae8868bfc722060b0 SHA512 64d72c28c6b01636d31bdb0d907a7b2244e0b203c0567ed8d13ad14d4eba366bd89e9be1226e42e5a6a61d51d0050afb97cbb0375d0340df0f63a133538feb71
-EBUILD YesssSMS-0.4.2.ebuild 732 BLAKE2B 7e688a01020595c50b569ffbc3e8d3039f9a630bee09815aaa014ac8ea1a1b00b0c7653e84506a7c7ed4194aeed6b2a8d544ce6c3d1906bbb7f3166ce47800d0 SHA512 159895ea6d38b1de23b744628a23f20872b07ace0f8f1af3a7bbdd3b15218ae9f5d5e2480965d513051a39b267f5c9a484660ef809edcebadbf7489c52c6682d
+EBUILD YesssSMS-0.4.1.ebuild 724 BLAKE2B f998be785f8e127ae3b0e9c1749f3ad12de2f369bd9e3902498f39cf4ecffa312f5642f2f80438105c5e9f3908ea717804a77206f0ba134698955d08ba46606a SHA512 931278147609d7bafebec263ae6808911af5f8c0e90921486eac7b77025c2e6ef67201167156524f346e7ed59093f1f8c92b82fc5fd00c0b16e105dc6df5b298
+EBUILD YesssSMS-0.4.2.ebuild 731 BLAKE2B e66fdc40374b9d5168d264fbadd5da3dfbd80f7611fc9b71c6b514b518ada3ab276ca6c437a33e333638551a063f971ede7bc6a28164b6fe1c99d57c3940b2a2 SHA512 664fee1afc6789466d91ed5b03932d52b6e4c5c73661da31fd480432b4242419804bcc67d44288a6c9e27e56a4314ff818c7b789bff1a04f6e75d6ba25feca45
 MISC metadata.xml 453 BLAKE2B 0ee9ae04a0d42b9aa5ac29855a7acdefa9588d5e8a194b57372baccd62b8c2f70f131e9afaeab1dd74ef7744461388a7291b2c1135460be7d0ffc593a2c43989 SHA512 3ddd8a0540a72191a3969ec3d4d43fcc3e9d4574f993e6a532f7aa002b4dad7ed92f11725aac299928487b2d095fe27813244259e6666baaa49e2fb1d47d6624
diff --git a/dev-python/YesssSMS/YesssSMS-0.4.1.ebuild b/dev-python/YesssSMS/YesssSMS-0.4.1.ebuild
index 0b862654a..4e26bcd57 100644
--- a/dev-python/YesssSMS/YesssSMS-0.4.1.ebuild
+++ b/dev-python/YesssSMS/YesssSMS-0.4.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{7..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/YesssSMS/YesssSMS-0.4.2.ebuild b/dev-python/YesssSMS/YesssSMS-0.4.2.ebuild
index e186b5c41..d9f7fc1fd 100644
--- a/dev-python/YesssSMS/YesssSMS-0.4.2.ebuild
+++ b/dev-python/YesssSMS/YesssSMS-0.4.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{7..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/adafruit-circuitpython-mcp230xx/Manifest b/dev-python/adafruit-circuitpython-mcp230xx/Manifest
index d675067b2..9c0044124 100644
--- a/dev-python/adafruit-circuitpython-mcp230xx/Manifest
+++ b/dev-python/adafruit-circuitpython-mcp230xx/Manifest
@@ -1,7 +1,3 @@
-DIST adafruit-circuitpython-mcp230xx-1.1.2.tar.gz 21133 BLAKE2B 34087b79f86646cb7da586a6f5437008be0e7692a78a8150d3529f9e469eea57242a3718742e8ad3ff1d9f12939f0fceff1810cc3e1197d79be0fdd92d443ac2 SHA512 dfaa4ed29a672b0060e3b00658c510d372761a2c4ff19c6b3eef23834597bfa79fd674c641209abe9427cdf45a6cf26c019d88f2e3b3fc486e6e523319f8502a
-DIST adafruit-circuitpython-mcp230xx-2.0.1.tar.gz 22813 BLAKE2B bd7aee9e82bf006bd27f5a06bf4ec881734b4db37197a63de4a4eeee9ae39a0c0e4f5d9171e318582999eb3bb24ed5b37a233e5ebba1ee4145c58ae241ca290a SHA512 c62fe540301e6b2ffce19bdbd5f0fe7f75db54169889eb7fc8a5f19ac881dde31e249539299795ac19e7debdb287e11097c93d78291e0505e20b9f2f50f0d8c3
 DIST adafruit-circuitpython-mcp230xx-2.2.2.tar.gz 24263 BLAKE2B d61b1c0f74cd65fe78d9f93bd24521434ac6b9df908d344182938f25a8387b83bc6c749b17f409d77aa4cf10347751c8cf3dd51e78ec68c50b0e63f816d30798 SHA512 067ca70d90d0c1bb44e259c8bfee6e6f3ea2315eb4c64e06a75937ba3303c662e8b0e9900fb609d5176de43d889f93f33473ba6d511101176e95020ca1108a7f
-EBUILD adafruit-circuitpython-mcp230xx-1.1.2.ebuild 763 BLAKE2B 09314b16d93f1fcd9249eba46cae450088f37a36372675c0467d8807c10195dca940c3cf07cd31d16396c09f6016f93f579fa2b0638ada8f72a3c0baa0eae33b SHA512 66b9bd2adebb9038157f9ca4fdb6c34a1d8fdc0b9c943acdb04f7f5c68f7eba29601a57a43e296ddea184db1a8ad2f3d84e03c4fd1fbcb41d502d2f6b320bdf5
-EBUILD adafruit-circuitpython-mcp230xx-2.0.1.ebuild 770 BLAKE2B 220248435958bed364905cba738db0afa365273ed55bc546e2a963c19f887f991f3cea4ee3dd85212e0e3ce186e711bd5cc865d81b021775b7c1f9117b3a21b1 SHA512 69e5bf8ca960b4f1a02ff9340041a4e5d0af79f205755416e4f89c44ae0db2fc1b9e3a5453d19aa94e9271331c41a84273f9c1eca974491d1ef8c1b7c9b2e70d
-EBUILD adafruit-circuitpython-mcp230xx-2.2.2.ebuild 814 BLAKE2B 7872493a1fc5e4d07b4b44fb0d6db6c9f83b3f2a9b398c562e1fef20ff2b1cb97122cf59278f01650eed012e435323631cb753c41eb2d2175af6d4a01a45f051 SHA512 2a3b36e93d71146b45755f8944f8503d4196ff1fcc404b8aadbdf9118f5b739c9502782135747b61d4c8efe02910b5a55965a5d88d9570cb01ca454eab6815d5
+EBUILD adafruit-circuitpython-mcp230xx-2.2.2.ebuild 813 BLAKE2B d9d7247c70277970a455ed602ce08a1b25bb00e91e49ad0f33210fc24ee4ab3c1b1b376537f856bff435c8d4d1beceb491dbf8f90aad818533116187793104e5 SHA512 17adbdcb185d5f21d3ebe7ca154d736ed6910b7579eb0d8d6eb0857506715073c3fbe3045e28b7eb72ffb892bc82f91409d4c705231be010907c1095532bde95
 MISC metadata.xml 489 BLAKE2B dc478e6d7e2aa671a0ec826945518833582de9d2e04fdd68882e80b218b50f406d56b0f2ef048a02714c04562f7f84956aa8f8925058a78cb2df01e78fd4c132 SHA512 a78e0ad6bbdf34eebbd6f9f0acaa1c87c494bada2271498d5d9f69b0be1d20f00141bdfcb3bdf996096c10cdd93b41354c315a1fa8083127b23c9d26574cac04
diff --git a/dev-python/adafruit-circuitpython-mcp230xx/adafruit-circuitpython-mcp230xx-1.1.2.ebuild b/dev-python/adafruit-circuitpython-mcp230xx/adafruit-circuitpython-mcp230xx-1.1.2.ebuild
deleted file mode 100644
index 6f58dd932..000000000
--- a/dev-python/adafruit-circuitpython-mcp230xx/adafruit-circuitpython-mcp230xx-1.1.2.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{5,6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="CircuitPython library for controlling a MCP23008 or MCP23017 I2C GPIO expander."
-HOMEPAGE="https://github.com/adafruit/Adafruit_CircuitPython_MCP230xx https://pypi.org/project/adafruit-circuitpython-mcp230xx/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/adafruit-circuitpython-mcp230xx/adafruit-circuitpython-mcp230xx-2.0.1.ebuild b/dev-python/adafruit-circuitpython-mcp230xx/adafruit-circuitpython-mcp230xx-2.0.1.ebuild
deleted file mode 100644
index ac0402d06..000000000
--- a/dev-python/adafruit-circuitpython-mcp230xx/adafruit-circuitpython-mcp230xx-2.0.1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit distutils-r1
-
-DESCRIPTION="CircuitPython library for controlling a MCP23008 or MCP23017 I2C GPIO expander."
-HOMEPAGE="https://github.com/adafruit/Adafruit_CircuitPython_MCP230xx https://pypi.org/project/adafruit-circuitpython-mcp230xx/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/adafruit-circuitpython-mcp230xx/adafruit-circuitpython-mcp230xx-2.2.2.ebuild b/dev-python/adafruit-circuitpython-mcp230xx/adafruit-circuitpython-mcp230xx-2.2.2.ebuild
index 1c6dbc055..adef45823 100644
--- a/dev-python/adafruit-circuitpython-mcp230xx/adafruit-circuitpython-mcp230xx-2.2.2.ebuild
+++ b/dev-python/adafruit-circuitpython-mcp230xx/adafruit-circuitpython-mcp230xx-2.2.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/adb-homeassistant/Manifest b/dev-python/adb-homeassistant/Manifest
index 47a0d2d62..29f19ac30 100644
--- a/dev-python/adb-homeassistant/Manifest
+++ b/dev-python/adb-homeassistant/Manifest
@@ -1,5 +1,3 @@
-DIST adb-homeassistant-1.3.1.tar.gz 27740 BLAKE2B 2a4ac59acca2d5995299678427133421f82b5c3193b03969bb529bb25c727adb5a1e8d0ee949b346d4c6ecfac562a08283d9f2cb3bde5dfb7a1b1b1d1d7e03e4 SHA512 b7e0d259086bd6b21da0ae66f96e49f629e9c7a7eb4219f2bb2280e698d0a14021c955fa6be0e49dd63d1c3104eb313be3f000381e8474031d066a5550c21f50
 DIST adb-homeassistant-1.3.2.tar.gz 26805 BLAKE2B 3896a895fd39800417b4c9c098230fae0d7134c8e6dd96fc47e542e8698c5e6ba2b444959d48d01ec292153dcde87da3a43fa41d392cb3a06825bcab283a7d27 SHA512 7147998212536fbfe3e638395ffa539f0cffd2999e5d8dd7568519bae1c7bbf4202faed0e47a4ab600aa66e088468eae18b5bfbc7c96e636e79b960f129d3b92
-EBUILD adb-homeassistant-1.3.1.ebuild 656 BLAKE2B d7af9ce1e81b815b0b9a6e66bdbea3a32ba2a864df676993f7a9c8f2d10b46de539d3e257ca00bcfb026a90bff0a2d93ff4c57d228f884d575d2d79f3a570b9e SHA512 bd3ee2d100f504b849e1a5139640c7b80365a7a2abb5369d428066e2918fcd0c5c46976dcd508bcd491ffe26d2872f65f0b31c73827b19a1bbe95dd4f3a08035
-EBUILD adb-homeassistant-1.3.2.ebuild 692 BLAKE2B db799eed65b4da40386bc6dfb8a2a4d6db109479587cade2f94b45e87436711c4c622e6e8260eeb4a46f2848010228b715c255e5b34a47b43a05cd272bd397a4 SHA512 3c7bed3c6490944ab85cdc65cd3c94792a5e5a27682c3f7e1a88f7268c8081b5f60d05eaff97e488e09da4eac1a24394eb0b101aedceec321367b36b77c8c1e7
+EBUILD adb-homeassistant-1.3.2.ebuild 693 BLAKE2B 38ffa992c04a6d13a5b73588e129558578509d8369127759c773aed17fc6fdbff068b71939d918101143060c07782fb743f1ccfab4517310fcc509d0c9278b76 SHA512 d03bb230d6cf734c837abce5090a4da903e67b79affb900aca16fedc2c8d37e7d5a9489a918b59809b6e35dbb726c9b87e9e301d7d4fa95e36ef649cc4431e69
 MISC metadata.xml 252 BLAKE2B 507e0ddc9d50b879ff374b903b142f85d020dfd6c486aba2af84fe082c878e780edbb79188ae10104d57db0eb775c86814cc8c06891a3854c9da840a4d377050 SHA512 9470ac9c8a5a4f80e3f767e7aa198addc7b21866c63b2a310e9f41ce65817672fb77423117bdd619e99cb62322025aeadf50717e23eafabf99080fcc106820af
diff --git a/dev-python/adb-homeassistant/adb-homeassistant-1.3.1.ebuild b/dev-python/adb-homeassistant/adb-homeassistant-1.3.1.ebuild
deleted file mode 100644
index 41cd414ce..000000000
--- a/dev-python/adb-homeassistant/adb-homeassistant-1.3.1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{5,6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="A pure python implementation of the Android ADB and Fastboot protocols"
-HOMEPAGE="https://github.com/google/python-adb"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-
-SLOT="0"
-KEYWORDS="~amd64 ~arm"
-IUSE="test"
-
-RDEPEND=">=dev-python/libusb1-1.0.16[${PYTHON_USEDEP}]
-		 dev-python/rsa[${PYTHON_USEDEP}]"
-DEPEND="${REDEPEND}
-	test? (
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)
-"
-
-python_test() {
-	py.test -v || die "Tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/adb-homeassistant/adb-homeassistant-1.3.2.ebuild b/dev-python/adb-homeassistant/adb-homeassistant-1.3.2.ebuild
index f4cc9864b..fc555d50e 100644
--- a/dev-python/adb-homeassistant/adb-homeassistant-1.3.2.ebuild
+++ b/dev-python/adb-homeassistant/adb-homeassistant-1.3.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI="7"
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/adb-shell/Manifest b/dev-python/adb-shell/Manifest
index 3abaab261..045edee67 100644
--- a/dev-python/adb-shell/Manifest
+++ b/dev-python/adb-shell/Manifest
@@ -1,13 +1,5 @@
-DIST adb-shell-0.1.0.tar.gz 18672 BLAKE2B c75a96cedafe553e8e7ac1bdf50c1ab2b51bd201941c6eee393720b03a4b39b90f7150142feb8a769e52220c7f92a17ec73356e40e2746e27d25897fb3fe0689 SHA512 0bec626606e0ea3ef59dfbd7d8746e6c1b6ffcefe6a72dae5a9ba31676be22f6179cd080c65bfe45b83eeb6d7db3a192de723bab1530267e0805f4d220615a65
-DIST adb-shell-0.1.1.tar.gz 19529 BLAKE2B cca11acf953f4ff3ad90d792fc961999733409924d4d1e003c8afb7d88574d9cadc308d2323b93fdc1540795cf5361855aa230d2b00680647f25934dc157eac9 SHA512 3e6fca8621c2a2b2b318017a76c525b008fb1faa201177f816c5f521bfd5b1ddac93d4d680f76159c557db0124ba3a10c8683b43746637ef42fc09509cb864c2
-DIST adb-shell-0.1.3.tar.gz 19818 BLAKE2B 0ce612536361f24048fd761ba489315f3b5fab78a90b9dc4b6af9ab40340829194c61829df31c9c6d34e15643ed56d9da346b29bff102bc0be4609fe67a0f415 SHA512 7519038043fb70e30fafdb58c5a5373314053f74d821340034c3d2f77a5a2915f72d428e22513ed116d588d7a7d8e91ee26780563fe59273848a5b3d033cf72c
-DIST adb-shell-0.2.0.tar.gz 37063 BLAKE2B 0ea4384832f03316aef77861e778f824e74d1ca1bf8d8b572cb066f745c6287a868096f44ed16b2c7931fcb91ec15ec36f60e2896dce9e07716ef9d8490d2986 SHA512 fac53f22cc595fa334d2e55765e891c41ab86a6494a8fec8914ec896912cd2ca53225f7c435140b3c82a2ff178300ce0b701cceca149db23165692ff99b52289
 DIST adb-shell-0.2.1.tar.gz 36947 BLAKE2B c9b122663a1b29fe44f319ca831bba3f4fea64a42bbc16b715c26621dadd37b825586a8e50190292d9899baf6a195334466bd8dde3fb4e70b170263bb3cce7f3 SHA512 cad47cdaca5bc35cb5bad3c9e3895aa81a6e3d7433145341b9166ab6cd59397d236ac048675310844c927fd9f74e61bc7b7ee50da1fbab81b21af5466b06b679
 DIST adb-shell-0.3.1.tar.gz 37932 BLAKE2B 299acffdceead5dea69875a2427e3e17fe42945959cbd756c407fba0f1bcfae3bb5c96fa754e6b0d6277e30946dea12996e2b1dff2deb6cdff1eebb3c311c3c8 SHA512 40f19cb31c5e7dc7cfd5789a8510fc12cddc1263dd5761638ab4168512988e13bf77c4d4a1a401303f62d6017fc5ee44e2d981591f4bb779d26b7db3bb5559f0
-EBUILD adb-shell-0.1.0.ebuild 845 BLAKE2B 1652e63b46ea64fd8d75dd9597ff192f445cb53eb05e138468a7f8550559711276cc9bff4e2ce333d67ad0c779a044990d2ae822c8089fc9e5fbca05622f87d0 SHA512 5e716a5b9d51439b3fdc45a92835e687b0b94b51d19c48f59df0771bfc426816ed2eca1454b1a8bafbf83ec2483a4dea5930d1de90893f3c4095315cd48fea09
-EBUILD adb-shell-0.1.1.ebuild 852 BLAKE2B 217edd0ec9204bd5657a250ff9b73d06fc231568fe0ea3e5207333d8da2ac324159971f74a9934c1565a40d7fdad7d4ef38da5dae2699ac0c9306e2d8b594522 SHA512 dee401a9dea18bcc68769c01ab23e5e120525cac55a1cdba92de0cecf9aabde43132ed284ede43783d08745f95fbbec21afe72d1c4f9804cc31d910c29fed97c
-EBUILD adb-shell-0.1.3.ebuild 852 BLAKE2B 217edd0ec9204bd5657a250ff9b73d06fc231568fe0ea3e5207333d8da2ac324159971f74a9934c1565a40d7fdad7d4ef38da5dae2699ac0c9306e2d8b594522 SHA512 dee401a9dea18bcc68769c01ab23e5e120525cac55a1cdba92de0cecf9aabde43132ed284ede43783d08745f95fbbec21afe72d1c4f9804cc31d910c29fed97c
-EBUILD adb-shell-0.2.0.ebuild 946 BLAKE2B a78773a097e55c26509199db204e5e579e1bb10363d325948555d51bae49398f9c7c1dd04984d602bce3a8e5b91b5a272aa41c5f68ad4ad692dcd6cf80a4d2d2 SHA512 15267c17f077be0083c6555fcb665fa3982a35c1c20eab324cb8aa352f0bea8e3fd38b53444772b307047be9777169b5449d2fdf99977fd28155cd14279381f8
-EBUILD adb-shell-0.2.1.ebuild 946 BLAKE2B a78773a097e55c26509199db204e5e579e1bb10363d325948555d51bae49398f9c7c1dd04984d602bce3a8e5b91b5a272aa41c5f68ad4ad692dcd6cf80a4d2d2 SHA512 15267c17f077be0083c6555fcb665fa3982a35c1c20eab324cb8aa352f0bea8e3fd38b53444772b307047be9777169b5449d2fdf99977fd28155cd14279381f8
-EBUILD adb-shell-0.3.1.ebuild 965 BLAKE2B ff0be0b1c00adca3a2086341fbc56878c6b0b796af543a69845da34ea0d5d5828de5354185cc934da320ff6fcd59723e70f7154229c2a0e5acb00b8d9877dfcc SHA512 e97947f784ef2c76b80e17860a89afbf8e5e5ce5b6b6be46681ef1c372fecd0d4541a4679e0a120eca57fecdefebc65b82c480de136b8209a0454dc5823e9f97
+EBUILD adb-shell-0.2.1.ebuild 945 BLAKE2B 5e191e7c883bf816e05c4c24a1af5bf667dbde9e95b2d620a86ffa281484c2feb8ca8d75792203c10bcb07ad9890d85fb391c980d5cbd25d3359580f6e772d49 SHA512 1bfca501d5fcd5053161facbb6fe4ad9c08cb52386eb2988a91e290e407c5ea01277126e2f15a1ea9a593ffa62f675934a473d3685fd6edb4e12e0f0d62700de
+EBUILD adb-shell-0.3.1.ebuild 965 BLAKE2B b953f20fb1c49c64b1e3887aecf3322f4c1708ede13a3c4c45e672706316e47770ba98ae7f4e441412e4bd1c89755490d7d3224653db88770769406076751550 SHA512 687371abc8c41ad411a985dfc8fdb0f290ec5da6ac431c31ac6a7c98ecc54742e41de8461e3dcfabffc9a981d7e4643cfcb106bf50da52966bb756e191311aa2
 MISC metadata.xml 467 BLAKE2B 574911fb0e27e21325e713b4b0b483536ad1492156771a1697cf620f4fd535ef8c0bce8c60f3f7ce99cce656067476c52fd1d815d4a1ac3e364cddd3770b8cbb SHA512 4115068f65ad55e12cf1827ed162b8f2a820a1ec7f7ce767604e2d0c71abf20a128fd1705a70b314da8b0b7b7aa368800a683169fcbb46b661bcb41343ce3d99
diff --git a/dev-python/adb-shell/adb-shell-0.1.0.ebuild b/dev-python/adb-shell/adb-shell-0.1.0.ebuild
deleted file mode 100644
index 73b781f5f..000000000
--- a/dev-python/adb-shell/adb-shell-0.1.0.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{5,6,7} )
-
-inherit distutils-r1
-MY_P=${PN/-/_}-${PV}
-
-DESCRIPTION="ADB shell functionality"
-HOMEPAGE="https://github.com/JeffLIrion/adb_shell https://pypi.org/project/adb-shell/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${MY_P}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND="dev-python/cryptography[${PYTHON_USEDEP}]
-	dev-python/pyasn1[${PYTHON_USEDEP}]
-	dev-python/rsa[${PYTHON_USEDEP}]"
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-S=${WORKDIR}/${MY_P}
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/adb-shell/adb-shell-0.1.1.ebuild b/dev-python/adb-shell/adb-shell-0.1.1.ebuild
deleted file mode 100644
index 00f687284..000000000
--- a/dev-python/adb-shell/adb-shell-0.1.1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit distutils-r1
-MY_P=${PN/-/_}-${PV}
-
-DESCRIPTION="ADB shell functionality"
-HOMEPAGE="https://github.com/JeffLIrion/adb_shell https://pypi.org/project/adb-shell/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${MY_P}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND="dev-python/cryptography[${PYTHON_USEDEP}]
-	dev-python/pyasn1[${PYTHON_USEDEP}]
-	dev-python/rsa[${PYTHON_USEDEP}]"
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-S=${WORKDIR}/${MY_P}
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/adb-shell/adb-shell-0.1.3.ebuild b/dev-python/adb-shell/adb-shell-0.1.3.ebuild
deleted file mode 100644
index 00f687284..000000000
--- a/dev-python/adb-shell/adb-shell-0.1.3.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit distutils-r1
-MY_P=${PN/-/_}-${PV}
-
-DESCRIPTION="ADB shell functionality"
-HOMEPAGE="https://github.com/JeffLIrion/adb_shell https://pypi.org/project/adb-shell/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${MY_P}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND="dev-python/cryptography[${PYTHON_USEDEP}]
-	dev-python/pyasn1[${PYTHON_USEDEP}]
-	dev-python/rsa[${PYTHON_USEDEP}]"
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-S=${WORKDIR}/${MY_P}
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/adb-shell/adb-shell-0.2.0.ebuild b/dev-python/adb-shell/adb-shell-0.2.0.ebuild
deleted file mode 100644
index 5b674bb49..000000000
--- a/dev-python/adb-shell/adb-shell-0.2.0.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit distutils-r1
-MY_P=${PN/-/_}-${PV}
-
-DESCRIPTION="ADB shell functionality"
-HOMEPAGE="https://github.com/JeffLIrion/adb_shell https://pypi.org/project/adb-shell/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${MY_P}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=">=dev-python/aiofiles-0.4.0[${PYTHON_USEDEP}]
-	dev-python/cryptography[${PYTHON_USEDEP}]
-	dev-python/pyasn1[${PYTHON_USEDEP}]
-	dev-python/rsa[${PYTHON_USEDEP}]
-	>=dev-python/libusb1-1.0.16[${PYTHON_USEDEP}]"
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-S=${WORKDIR}/${MY_P}
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/adb-shell/adb-shell-0.2.1.ebuild b/dev-python/adb-shell/adb-shell-0.2.1.ebuild
index 5b674bb49..0cc73ebb7 100644
--- a/dev-python/adb-shell/adb-shell-0.2.1.ebuild
+++ b/dev-python/adb-shell/adb-shell-0.2.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1
 MY_P=${PN/-/_}-${PV}
diff --git a/dev-python/adb-shell/adb-shell-0.3.1.ebuild b/dev-python/adb-shell/adb-shell-0.3.1.ebuild
index 7677dac27..0c82c736c 100644
--- a/dev-python/adb-shell/adb-shell-0.3.1.ebuild
+++ b/dev-python/adb-shell/adb-shell-0.3.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1
 MY_P=${PN/-/_}-${PV}
diff --git a/dev-python/adguardhome/Manifest b/dev-python/adguardhome/Manifest
index 99f679d02..1c6c825fa 100644
--- a/dev-python/adguardhome/Manifest
+++ b/dev-python/adguardhome/Manifest
@@ -1,11 +1,5 @@
-DIST adguardhome-0.3.0.tar.gz 11314 BLAKE2B 16a26223e31f8c849e5f9b702d625702e21d6e30655bb327af9c60dcb8251a1faefd79c43d67badc9442fe119c824b690b85054ee72cab470ccc61d79ae43955 SHA512 9b32e3426ae348ef0e7f9bc165ad601fde8514e9c0d70323f7f8238fec685c56d58f76d1671087a890982fbe78766ad7b156ce471befc6fe9b52570c3bc5ca04
-DIST adguardhome-0.4.0.tar.gz 11733 BLAKE2B ea95e599f1c82cc16d2134720cb1f97f046b6734bab57bbfd789526d44fba0579ec1ba5986b64c3e566e973f8a07a95c904b2d1e2f5c9823b31f9ebd72107f7c SHA512 cf2aac89d601d348f4af5af745626344cba756fe6d1e921f51b8edc949ee7b5df62cb6177d1c42c94719699130e46c7e0fc1f6c2f836880609f29df184d758bb
-DIST adguardhome-0.4.1.tar.gz 11731 BLAKE2B 16aa826284d6d9dc3965aa37f400c1fbc7d89ee467de4d8dbba8072060ca525ad89becc5df6d9ac8efd9989a7cbf48314c0eb3c4a00054ee2030d07a0083c089 SHA512 df5ab2d558830ede9415a97b894da856fabac935586c7c58b303187a65e0fabc46a60c32f301e76b38f3d0c550a36eb3c0eef896ec467ec60568a12654ca71b2
 DIST adguardhome-0.4.2.tar.gz 11746 BLAKE2B 3120fa4876cb87182e19602ff7019803166b220dad879b41c9237b52151e61064a7122f46cf55d223346bd34499d9644b5111203ad1fabe2004aaeed1e7d8de4 SHA512 fafcd84d7c9d23070b99f25cd8b73ad8e001b95fee4b7da0ad14f9eebf307a15eec7fcd9ab2888c61a110ece311876f0e00be17e03cae17594a68ca1ccbd7167
 DIST adguardhome-0.5.0.tar.gz 13181 BLAKE2B a0ae0b9f07b7e73c998c8aad3f2c7192eb64fc96dc7f30787348a4e05d0782beecf4050363e07067d8b8327d5e440eee242ddef4367a35a42c5a84a66258595a SHA512 c4adc8d8818c70b76413cb45d3e40e14af194173a2d846c122421e7f48fd2f7d8ffa0f27a9dafed646ac68d403ce45800b008f99abcdb03a06355c5c8f24620d
-EBUILD adguardhome-0.3.0.ebuild 701 BLAKE2B 45f7de9f09c66ab7e4a5bc3bdc46dda5c313c5aed634b6720e0e29cca07d68d0e26b535df88899f07d49c4944c940296798ffaccc9178607bf4d702d9d4eb79e SHA512 841ef83ff133df05a3933c27cf5efe64763833902d1e5b2daa39d6548b70cad60372870a74ad9a3d58c8932bc3eedadda75883e9607ef8c32914f9ab43fdfdb2
-EBUILD adguardhome-0.4.0.ebuild 708 BLAKE2B 5101e5d509d8a2cce698f9ac5f8dc76454a7a8637881a6cc27ae694cfe3a57b32b1d99f40c0498b08e96bdb5d14efb3841896c5200398d4adbcdbbd6d09cbf42 SHA512 d8d3ab843faad93bdff9663f8f327b0fdfb3a91207a7e8caa18d18e7fe0c6e68394620f7a2bf5640e42212e86e3be02259f1d2e6c6d2cf813de23555038163cc
-EBUILD adguardhome-0.4.1.ebuild 708 BLAKE2B 5101e5d509d8a2cce698f9ac5f8dc76454a7a8637881a6cc27ae694cfe3a57b32b1d99f40c0498b08e96bdb5d14efb3841896c5200398d4adbcdbbd6d09cbf42 SHA512 d8d3ab843faad93bdff9663f8f327b0fdfb3a91207a7e8caa18d18e7fe0c6e68394620f7a2bf5640e42212e86e3be02259f1d2e6c6d2cf813de23555038163cc
-EBUILD adguardhome-0.4.2.ebuild 708 BLAKE2B 5101e5d509d8a2cce698f9ac5f8dc76454a7a8637881a6cc27ae694cfe3a57b32b1d99f40c0498b08e96bdb5d14efb3841896c5200398d4adbcdbbd6d09cbf42 SHA512 d8d3ab843faad93bdff9663f8f327b0fdfb3a91207a7e8caa18d18e7fe0c6e68394620f7a2bf5640e42212e86e3be02259f1d2e6c6d2cf813de23555038163cc
-EBUILD adguardhome-0.5.0.ebuild 786 BLAKE2B 3454adc8a703fc8ecaca6f70b687009bbff11a41662862799da4baae5e2043972cba13f978d3111e7f1020bd2ed1a49bd5472711d7c5656a4408294ce6dbfdd2 SHA512 05f2bd1e70e0548be34c4d94e28e75336d12ecdd95006a0ca18cec4e13933abae71b2b13a7cb8ca22d4b6f6a1cb8d9bf847325ba7d53870d9f8ee7c5b03250e1
+EBUILD adguardhome-0.4.2.ebuild 707 BLAKE2B aabdbee8069ad8f87f71b35dee31b78e83e167cd8b71b38f94d982c77556ab342a40dfa47eed8cf8ea3fe9991f05c5e4ebb32ca6fa1a1a3a29923425788b529c SHA512 3a88111937879d2395220cd3d8eddf72f3432a3905631ab88f8887a16448346d2d5270f1329db1cbd3ce5774307003b69411669e49b97b10cf30fa43425f6a56
+EBUILD adguardhome-0.5.0.ebuild 786 BLAKE2B 4d9af8666f33d8b91263906ad46e931cba2a2a66faeb3d1f460df16fc20bd5a66467b8ffaeda438c2b644735dbc10b0f23b1ed79b60fc15c19c859f50134b52b SHA512 4e6ffaeedc64437b2649f0c019891510901f554bf941990456a0ff72ad239bab250ddcba404b32a7eaf3b04d2d3b667d11052cec0997361f7d27d95328ee459f
 MISC metadata.xml 458 BLAKE2B 44f7acdf02049809293fc7f24f9947c7b4f23df075bfa01b0848a270880f0f8b529036625bb742fc01362261753596981dd79291ae2fc1b23c8847ae67b444fd SHA512 08f31bc1d728a42b359c008a326272a25e113f3da5c4d233c84179d5cd283d734b21b4aa9f083fcdae972a945bbd902a3555a21e3d2d401edd71197f5ba7bd81
diff --git a/dev-python/adguardhome/adguardhome-0.3.0.ebuild b/dev-python/adguardhome/adguardhome-0.3.0.ebuild
deleted file mode 100644
index 090eac1a6..000000000
--- a/dev-python/adguardhome/adguardhome-0.3.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{5,6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Asynchronous Python client for the AdGuard Home API."
-HOMEPAGE="https://github.com/frenck/python-adguardhome https://pypi.org/project/adguardhome/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/adguardhome/adguardhome-0.4.0.ebuild b/dev-python/adguardhome/adguardhome-0.4.0.ebuild
deleted file mode 100644
index ebe923a39..000000000
--- a/dev-python/adguardhome/adguardhome-0.4.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit distutils-r1
-
-DESCRIPTION="Asynchronous Python client for the AdGuard Home API."
-HOMEPAGE="https://github.com/frenck/python-adguardhome https://pypi.org/project/adguardhome/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/adguardhome/adguardhome-0.4.1.ebuild b/dev-python/adguardhome/adguardhome-0.4.1.ebuild
deleted file mode 100644
index ebe923a39..000000000
--- a/dev-python/adguardhome/adguardhome-0.4.1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit distutils-r1
-
-DESCRIPTION="Asynchronous Python client for the AdGuard Home API."
-HOMEPAGE="https://github.com/frenck/python-adguardhome https://pypi.org/project/adguardhome/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/adguardhome/adguardhome-0.4.2.ebuild b/dev-python/adguardhome/adguardhome-0.4.2.ebuild
index ebe923a39..34e406e4c 100644
--- a/dev-python/adguardhome/adguardhome-0.4.2.ebuild
+++ b/dev-python/adguardhome/adguardhome-0.4.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/adguardhome/adguardhome-0.5.0.ebuild b/dev-python/adguardhome/adguardhome-0.5.0.ebuild
index 24f5aacf4..5afdae6c6 100644
--- a/dev-python/adguardhome/adguardhome-0.5.0.ebuild
+++ b/dev-python/adguardhome/adguardhome-0.5.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/aiobotocore/Manifest b/dev-python/aiobotocore/Manifest
index 133c8fdf3..008921fb2 100644
--- a/dev-python/aiobotocore/Manifest
+++ b/dev-python/aiobotocore/Manifest
@@ -1,11 +1,5 @@
-DIST aiobotocore-0.10.1.tar.gz 25692 BLAKE2B ab5cb575bb03e7abde954a5134254f3a255659e76c43aa01f470a9cd4d1194099255808410c922d2c91301929e891165ef3708c4df78a4ee023b62717e2488e6 SHA512 c24656f26599d23703c7181041defcd1f71e28b8be407162cc82cf66981afe4c5e2aeb3cb4299518902de4b91cb14c287ed0e592f7aeacfb39d805aea10da3d4
-DIST aiobotocore-0.10.2.tar.gz 25755 BLAKE2B 92d22571d2755bb571a99f9c7ca4a270778be2837173640a20f734c415160512e9652a27f2cf58048469409032eda12fb9eae3cc27d385dd64ff9f796b3e5ba0 SHA512 9c44cc6074f9598f93907efb7919830d8effd2a64b4ea40bf02899724b04db862ae5762a08530d7cee05d999ab1d74c4e691704270406f0d0afb0aa9f8c03144
-DIST aiobotocore-0.10.4.tar.gz 26572 BLAKE2B 02036e21580d9ea18974d3609e8f4207188db086d58400955e44a4efb9bed51ceea038e8b7948dd15f397317481c84b80f1a6fea2469c52d420dec653bea1691 SHA512 33e5a2bea4e15cb6876e66850baa8e7b347f9ffdd0badc3f4f2847515462380e28bb2f9f609edf9f15bde3ec6991fbc6ae5748aab6acd6aa5203368836af9730
 DIST aiobotocore-0.11.1.tar.gz 27860 BLAKE2B 22bc31e8d53177b286a4386698fbeec96893f67396ae8d80f8e7fd5b04dc24bb7be665dbde32c56292717b080e317e8c834386d9ab4381baba8a0e29e6647a50 SHA512 e9f48b57cd508b7cb049477b5f57b2822ea82b0c046e96818730ec0a9439e42798fa9e82ffe5d38f00375d5c3e92ce6f91571a9ebc3867af4c7d2bc635feea2b
 DIST aiobotocore-1.2.2.tar.gz 48113 BLAKE2B b623c68d409bc51d7f8b1752b959c1ed6e3f331a0d186628ccbd73eda30ba938c3091b440cc0c959675b81ab410d0af60f2b7d172002b3258696d9e94845306b SHA512 33dd6fa6002d459770b2fa5c0813cd2bad2f997cf2f7856076d67836ab39ff1ea162b4199a800f037f5308cdf1f91105bccd190b61f83a9158e33fc59912e361
-EBUILD aiobotocore-0.10.1.ebuild 892 BLAKE2B c9e1712b28b714f7632e6b6ee6f1748604d1c86ae9be222ab9c1880c50c398265144da03290c6262256709a808c735dfdd2bcde5faeda1a30448c7e61ffccc30 SHA512 af9b2bc520d891a149aaf8de007790c530287da0f1a0d0307e96f140c6e5227683e339dd5763d4b1ed74f3bfbc341b35e1878b56807dc41b8dcd6380fc16459e
-EBUILD aiobotocore-0.10.2.ebuild 892 BLAKE2B c9e1712b28b714f7632e6b6ee6f1748604d1c86ae9be222ab9c1880c50c398265144da03290c6262256709a808c735dfdd2bcde5faeda1a30448c7e61ffccc30 SHA512 af9b2bc520d891a149aaf8de007790c530287da0f1a0d0307e96f140c6e5227683e339dd5763d4b1ed74f3bfbc341b35e1878b56807dc41b8dcd6380fc16459e
-EBUILD aiobotocore-0.10.4.ebuild 846 BLAKE2B 07ba18decda1a275da0bfa5e93377275c5692b21c4d53a28419c43edc59e1a9f796e0f33d19cdf49b1135201f50a4682d14c90dc05643cf592454c1f29fe3b98 SHA512 d7862590cdd9172c0e1134407b79dd30f1910aad99885c977678a8874418379bb899329eacd5dc6f14c36f6aa55cd26e504465bb894dbc1e9590c5f642779a54
-EBUILD aiobotocore-0.11.1-r1.ebuild 931 BLAKE2B 13fb2c07fe9edf484f2c0fce314145619e4a6a0a2459e72ce38dcbeb49ebb0775b23e4e31b48b3c48c6414cc3aeeb180a66d26717c7ae393f02be213d77ad910 SHA512 6db11c2083a3175691c7238229f3e047d262ba32ca22eec34646bb24e799b7b1463f533f1c70f3f926c54eb94714d93ef4a7a77bb5a46da7f8954d758a653379
-EBUILD aiobotocore-1.2.2.ebuild 845 BLAKE2B f7170d1030d10f5bb456a1123aae1c69d2b4a9a945d74103417350700babf21ce4bb11361b89e3c7cd198a55530b983cf78c90b30c8265f565358c27883f82d2 SHA512 5fd7d0cffa4877bd9d58e0361e99b25a7c50d453f7feed370be0941a3b4b31b9b60a25cff5d4532f8caacf1bbec9e2de3f0ae5eacb9cb165f1c03383df540789
+EBUILD aiobotocore-0.11.1-r1.ebuild 930 BLAKE2B 7f2e54053bc30bcd16bd0018d7ee6ac63bd4fec24b51fbb2ac159b0498e1f9ec9e2c0ca142459f30ce8f8c268a890b5422583930cd04aa804257f87db1a9ec74 SHA512 42c73a29b04545b0b0936c85fd26e5f73ad4f791d7c7d7aa6c34d66ffc96e91099b4bbdbcdd74ea7db86ddc279c51aa3b6b7c2bedbdad3409e3d60496684394c
+EBUILD aiobotocore-1.2.2.ebuild 845 BLAKE2B 8ea39602329ab62f441c2314b779eeff43bba0633c8b2c0ea8f80313c97238332927456f620a77a5d911406009882c8ca52bf439b88481893b577d0f9ef8292e SHA512 39943cf59d565ab0acef870903c73c3c4f9ee4c9d479a71475838bc99421f722d6c577aef7035c6cbeb5230f2ffc939b6fde07a9c3c1d16ecf2154cdbdf100e4
 MISC metadata.xml 460 BLAKE2B 4a8ea3ee831803460c736be1a66ac272dea0ecfc33f806272b13e2d3178ef76ebd547857b79cf43a5e187820491d23a0c85025101ac97054c0d29ceef64a78af SHA512 242a704b62b365a2c4c0ceb16668afe8dbdec9a1bde0631880b51e618ae3af5730587bb98ba31435df642a16524a30f7c116399a9c0a9d76e11ab3174d716fe6
diff --git a/dev-python/aiobotocore/aiobotocore-0.10.1.ebuild b/dev-python/aiobotocore/aiobotocore-0.10.1.ebuild
deleted file mode 100644
index b09988d7c..000000000
--- a/dev-python/aiobotocore/aiobotocore-0.10.1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Async client for aws services using botocore and aiohttp"
-HOMEPAGE="https://github.com/aio-libs/aiobotocore https://pypi.org/project/aiobotocore/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=">=dev-python/aiohttp-3.3.1[${PYTHON_USEDEP}]
-	>=dev-python/wrapt-1.10.10[${PYTHON_USEDEP}]
-	>=dev-python/botocore-1.12.91[${PYTHON_USEDEP}]
-	<dev-python/botocore-1.12.92[${PYTHON_USEDEP}]"
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/aiobotocore/aiobotocore-0.10.2.ebuild b/dev-python/aiobotocore/aiobotocore-0.10.2.ebuild
deleted file mode 100644
index b09988d7c..000000000
--- a/dev-python/aiobotocore/aiobotocore-0.10.2.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Async client for aws services using botocore and aiohttp"
-HOMEPAGE="https://github.com/aio-libs/aiobotocore https://pypi.org/project/aiobotocore/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=">=dev-python/aiohttp-3.3.1[${PYTHON_USEDEP}]
-	>=dev-python/wrapt-1.10.10[${PYTHON_USEDEP}]
-	>=dev-python/botocore-1.12.91[${PYTHON_USEDEP}]
-	<dev-python/botocore-1.12.92[${PYTHON_USEDEP}]"
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/aiobotocore/aiobotocore-0.10.4.ebuild b/dev-python/aiobotocore/aiobotocore-0.10.4.ebuild
deleted file mode 100644
index cc794f4e5..000000000
--- a/dev-python/aiobotocore/aiobotocore-0.10.4.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit distutils-r1
-
-DESCRIPTION="Async client for aws services using botocore and aiohttp"
-HOMEPAGE="https://github.com/aio-libs/aiobotocore https://pypi.org/project/aiobotocore/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=">=dev-python/aiohttp-3.3.1[${PYTHON_USEDEP}]
-	>=dev-python/wrapt-1.10.10[${PYTHON_USEDEP}]
-	~dev-python/botocore-1.12.252[${PYTHON_USEDEP}]"
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/aiobotocore/aiobotocore-0.11.1-r1.ebuild b/dev-python/aiobotocore/aiobotocore-0.11.1-r1.ebuild
index be9f2085a..05fe806dc 100644
--- a/dev-python/aiobotocore/aiobotocore-0.11.1-r1.ebuild
+++ b/dev-python/aiobotocore/aiobotocore-0.11.1-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/aiobotocore/aiobotocore-1.2.2.ebuild b/dev-python/aiobotocore/aiobotocore-1.2.2.ebuild
index e725128f9..6cbf5ad27 100644
--- a/dev-python/aiobotocore/aiobotocore-1.2.2.ebuild
+++ b/dev-python/aiobotocore/aiobotocore-1.2.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/aiodns/Manifest b/dev-python/aiodns/Manifest
index b6c0cff11..79b0f2205 100644
--- a/dev-python/aiodns/Manifest
+++ b/dev-python/aiodns/Manifest
@@ -1,5 +1,3 @@
-DIST aiodns-1.1.1.tar.gz 6084 BLAKE2B 8e58cedcf288f87ca9cc8d5f067bdf182f220979aba3d2aa53eb998ae877dcaa7c2a7419a50719ba150fdf17271d025668b28a3212fc5a819bf13129b4fb25a2 SHA512 4bd8b80a10f84b82b13ba4ff6abbb1afd13ba6cfececc4db7c4bd303569473316f1c0e083f1017a450875fc8994a70c30c9a1b3fb2278fee5e27158973bc3810
 DIST aiodns-2.0.0.tar.gz 5948 BLAKE2B 70944ffbfa3fa1c591c5aab6ce2c4c59564a7665fd2eda1b544616a4481e58464f918081dfb21f74db08ebe4c7e43eebd17e0dc314cf79423835a182a257cd11 SHA512 d80b8f7641234c4d367e4554b10c5a66265e75ee82c58adf2a36f9e369bb1dbf4341dd6459f10540b771de3f102454511ca81eddf3082733e88c09bbdf125fe0
-EBUILD aiodns-1.1.1.ebuild 670 BLAKE2B 8a84957c7ef3930331a95b1c1da886037ed142824f6d987bf88d2398378d2a8adfc3e9542b698abf3814611ce26f5fff6b037805cf59280e56570c83baa845d4 SHA512 4d8cfa25b49803485fad0ed7263a3d195daeefea8ee6941c64511346a3002fdd9f2cf144f6882be887dfb421ef6db5fe58946077f5b4894497749a49eacc8d89
-EBUILD aiodns-2.0.0.ebuild 677 BLAKE2B 41510abdb5702bc12c6b514008ccddbf7cd26559159732704d7121fe5df42c6dc49cccc0f3b9237c21e3ebe41551ea0aff9df350a8f47e3e0afd7e4e5f2edfd2 SHA512 144cf5333f04375a8a0dce7a5cd050b2b9aa89250fc08ee2b05d24ca348ca8dd566ad4727e0dd5a7936442540dbedb5a5062dca9fee4df32fe45094435694855
+EBUILD aiodns-2.0.0.ebuild 676 BLAKE2B ff16b6f2c97bb8c5368fef6f9e666bcddf890d473d6ae082b4afe17a8b834dde4af69428c895fa1e4d13a0598bb13219dc40a06dd861b8fbf494a99970a86b3f SHA512 55485477914639f2b2fc1ec9b5faeab4508288243c2987b1d40f3373bff99a45b7963fe688c048fb259d854cba157e4c27659b662311c68fa60a053bc2ce30ef
 MISC metadata.xml 457 BLAKE2B 99f73b1c9ed1a2cd05641088a1211805039e4d6c85c561439c061268452139501a668c362396650a218763b2790b7a99f239a3604858f9c440b5df4ba1a614cf SHA512 506b63b15fba0dae9656781480089e6f4c2a2c3c05b42871512c4bd310d646adb406978049f67dc2dca26a700eb47d876ee446c7c22f18dcff4d82a81ac8cfc0
diff --git a/dev-python/aiodns/aiodns-1.1.1.ebuild b/dev-python/aiodns/aiodns-1.1.1.ebuild
deleted file mode 100644
index 1d06439c7..000000000
--- a/dev-python/aiodns/aiodns-1.1.1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{5,6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Simple DNS resolver for asyncio"
-HOMEPAGE="https://github.com/saghul/aiodns https://pypi.org/project/aiodns/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/aiodns/aiodns-2.0.0.ebuild b/dev-python/aiodns/aiodns-2.0.0.ebuild
index 4f0efa267..8054ca3aa 100644
--- a/dev-python/aiodns/aiodns-2.0.0.ebuild
+++ b/dev-python/aiodns/aiodns-2.0.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/aioharmony/Manifest b/dev-python/aioharmony/Manifest
index 381ff67a9..7a0c14761 100644
--- a/dev-python/aioharmony/Manifest
+++ b/dev-python/aioharmony/Manifest
@@ -1,13 +1,5 @@
-DIST aioharmony-0.1.13.tar.gz 26258 BLAKE2B 3d0b6af89719f4ce9e0009b8297102ff6382328745c0eb677748ca48abed779045a3c85e186d4647568243a681a77bc2b48305362df9617a88315f9066640e68 SHA512 6a579b402ada3bd936bf13ce63271cf3980e55d143c23a2e38f9167d39a461c3ec8868070d6fdf157cf9a410f4c3d9cda25b6024a8c48594a65f99e37ae4db1d
-DIST aioharmony-0.1.8.tar.gz 25293 BLAKE2B 5a7a25411c788b765e0097ad3e15d4986d886dc6d8b097cb24dc76bd1b17d763f42624eb941896588ce81335767d66bba18de21a5de8b63c73f8a903958e0885 SHA512 b110d9c036e5271c7bbdc94ffea14ff1587f6e35d17abbaa201e2ea08173a76fc5a103c2dbeca6fb1e77c0deddd8c7c9b8ee6ef033ee5e1d4149c262fb3ed6e9
-DIST aioharmony-0.2.4.tar.gz 30355 BLAKE2B 44d42e675e1fc1b05c18ee4f7715dacd8f764891d3ecceca28dae8986fd46e4f987235409ffb1ae0ad6f4db4cbe8b7a2e3cf2435063075d6cd6b319693a23807 SHA512 d4d61666161db7b8f063ed26677d9dbd70aceadbf2ece16b0ce2c840eac8bd6d14f560c412b3c40b59b2cb29bc9a368ff8207d28558dd5627c0cc737751601e4
-DIST aioharmony-0.2.5.tar.gz 33152 BLAKE2B c61ef43e6c18588e576b89435af97153e36bc38e545420d6f2142b34f44ce83a2f7ae3f72532af62b4afb9e307c3a91a9ce6e7500aa09f76a939a72bf509fb38 SHA512 f4a0c801046e6a4c52e0396b3c5491a7194aa6db1d90b161633fb86b787d15609a6d9412030999826bda9d8d10efd4ac08461cb0fd4829b890e861a4824e66fd
 DIST aioharmony-0.2.6.tar.gz 33766 BLAKE2B ba72e5dd3e649ce20c8bd0d179c47ef7e2e2f82aa69b27d6c1f4f2da494ebe34ae3f386b3c37367378ed3d72eff6a54217e21104f1f2006d98c2571082957e0b SHA512 7a0125984fe393c43f422462c23a49f88b55a524e929c06f1dd0b01c4f9863d28643da664d81c38425f1c88d487bff00f2227579beb72034a11a57fdf4fa5154
 DIST aioharmony-0.2.7.tar.gz 34615 BLAKE2B d6dc8a1979e80ea8aa3908069de56687e030085980d144aeb7397aa9fb1e972ecd9ef3abe4dd9590a7324fe25a8e9937ffdabebb195738d67ca979fd8407cd55 SHA512 e5c15ec18cf405f7e8ac1fe336d8152564986a5cbcff12b4ca1a35255353d87a1c02d498d6d7487a447f62a698090b0307b2ccca9ceffc0568a100aedfdd9bd1
-EBUILD aioharmony-0.1.13-r1.ebuild 821 BLAKE2B 9e71bbf2c762700f7c07006dcb9d313099420c142b53049ac9962c12bee04691151aa331cfded7ba087d5fd47bef8c8a87b69e9454241091e75a69b6a8712c95 SHA512 72578461ca35195d0e70958a0c62d8a86af16b19e5d7b1a4494185bdb64f24b2aa70c493401423bad3614625da32ee956b3be284af69b28606f1ce8cf4095140
-EBUILD aioharmony-0.1.8.ebuild 726 BLAKE2B 7f0a479e29d4472c6393bedbfd1f3778a62db8e550146394f18ab7405d9f8653cf444e99978586871f5e5ff784fbd95797a90bf69430a00295a2e83ed7392588 SHA512 dcc3cc89359310b866ec5d610ad7ffbec8450b9dde29bcd818cca9e692dff99ecf789d7b72b6816f8c0e95125e308179b7ee8c4b15c54d3ffb43b9bb8a8c1793
-EBUILD aioharmony-0.2.4.ebuild 799 BLAKE2B 7003ddded29c15e43ec7109d7f206cfd5561c7f79deb5df260d6c0aae959774c1a6d23fd44c7b6538b85f6b93e36ad8043941a5f93e8a5edeaa2209975acccdb SHA512 d907aa694bf701dbe8d3b0740357142ad988291ac9df2061f384473da54cdabb26f69a2a00ed173204ac9a1374c7117fdb95d9ba45d8d7907d0b05f2f70ffc05
-EBUILD aioharmony-0.2.5.ebuild 799 BLAKE2B 7003ddded29c15e43ec7109d7f206cfd5561c7f79deb5df260d6c0aae959774c1a6d23fd44c7b6538b85f6b93e36ad8043941a5f93e8a5edeaa2209975acccdb SHA512 d907aa694bf701dbe8d3b0740357142ad988291ac9df2061f384473da54cdabb26f69a2a00ed173204ac9a1374c7117fdb95d9ba45d8d7907d0b05f2f70ffc05
-EBUILD aioharmony-0.2.6.ebuild 799 BLAKE2B cfd02c0c35fccf32d896c42aeba62861a858d81f2b246633f5f8d973a23d76b773b27a4e894312c0ca10638984e32d5738ca256f786064a5a496f987d98d32e2 SHA512 e2af10b5a3892967e9bdd0b22595c94b6fe834b2161fec36b054f7fd9845c3479b08d0b2b5c16152f58efb879c31a1cc762d3cfd9b918486a1b6a387aa2d8507
-EBUILD aioharmony-0.2.7.ebuild 818 BLAKE2B 5f180102c1a4c0e83d7821cddf47fdb1fe7628fca6d6236a8871420829645891018e8a061f9046b1547ac2283e5a00526e24fd2f0879af930eda4e20122b8d7f SHA512 a3f9d0c15f43a7b2398901197f09b89602ebd03afc45306a61160800bb6815957a23e33b830bd5283f0ec6c2fdbc30ccbe32caa88ce827d6350e3ecdf64340ec
+EBUILD aioharmony-0.2.6.ebuild 798 BLAKE2B a8aa0b911feaf7c801104dc4b536c3a1b96ca7f33bad45d731f97fc0e53f0371c5902ab499591975a1ae3f8bde51343f3026d993ffeab91094e837ccf0a222b8 SHA512 fd4ccfb9e7219ba9786fda231e79b776d3a872173fdc77fb19ac29cfc50bf07f291572106e94a52c441901f31e496e086543e65241bbd2ac30d7df7df873b8ec
+EBUILD aioharmony-0.2.7.ebuild 817 BLAKE2B cc97a27ace33f9c045eb6ed9155c779862d5be3e7dc935dc59f7c1568428eac6386c1cd8861c50d29e12afaab62ac2f813ed25b024a8e93f69f737e496a7e10f SHA512 088a77d14f9293fc5f954d73045bc8b88c8e86a257a0c56f747d720e20cfa6b20a56f8a23807079e77e47781fa42918284130d92fffc27eb118e8a4aea1799d6
 MISC metadata.xml 329 BLAKE2B 9ab90ce35b9e1c421d768948132d2de1650788aa5e6a59f8e35f7faae33c19824cf0c5b39cee3fd8a9934b60bd7e712335f86ca0cad88e76eeb9b4029c58a770 SHA512 ab69d19fa6b9cca90317b77ba70dc6fa2fdd63dbb376cf6716876d964b4d9d0523440a879c74e3f7f7988629ba6e2fbf2dcab70cdd1f6542277c07b367f50d54
diff --git a/dev-python/aioharmony/aioharmony-0.1.13-r1.ebuild b/dev-python/aioharmony/aioharmony-0.1.13-r1.ebuild
deleted file mode 100644
index e72846db8..000000000
--- a/dev-python/aioharmony/aioharmony-0.1.13-r1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{7,8} )
-
-inherit distutils-r1
-
-DESCRIPTION="Asyncio Python library for connecting to and controlling the Logitech Harmony"
-HOMEPAGE="https://github.com/ehendrix23/aioharmony https://pypi.org/project/aioharmony/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=">=dev-python/aiohttp-3.4
-		 >=dev-python/async_timeout-3.0.1
-		 >=dev-python/slixmpp-1.4.2"
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/aioharmony/aioharmony-0.1.8.ebuild b/dev-python/aioharmony/aioharmony-0.1.8.ebuild
deleted file mode 100644
index c271cfb36..000000000
--- a/dev-python/aioharmony/aioharmony-0.1.8.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{5,6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Asyncio Python library for connecting to and controlling the Logitech Harmony"
-HOMEPAGE="https://github.com/ehendrix23/aioharmony https://pypi.org/project/aioharmony/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/aioharmony/aioharmony-0.2.4.ebuild b/dev-python/aioharmony/aioharmony-0.2.4.ebuild
deleted file mode 100644
index 63e942d0f..000000000
--- a/dev-python/aioharmony/aioharmony-0.2.4.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{7,8} )
-
-inherit distutils-r1
-
-DESCRIPTION="Asyncio Python library for connecting to and controlling the Logitech Harmony"
-HOMEPAGE="https://github.com/ehendrix23/aioharmony https://pypi.org/project/aioharmony/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND="dev-python/aiohttp
-		 dev-python/async_timeout
-		 dev-python/slixmpp"
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/aioharmony/aioharmony-0.2.5.ebuild b/dev-python/aioharmony/aioharmony-0.2.5.ebuild
deleted file mode 100644
index 63e942d0f..000000000
--- a/dev-python/aioharmony/aioharmony-0.2.5.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{7,8} )
-
-inherit distutils-r1
-
-DESCRIPTION="Asyncio Python library for connecting to and controlling the Logitech Harmony"
-HOMEPAGE="https://github.com/ehendrix23/aioharmony https://pypi.org/project/aioharmony/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND="dev-python/aiohttp
-		 dev-python/async_timeout
-		 dev-python/slixmpp"
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/aioharmony/aioharmony-0.2.6.ebuild b/dev-python/aioharmony/aioharmony-0.2.6.ebuild
index 18cee4ec8..2625ac2d8 100644
--- a/dev-python/aioharmony/aioharmony-0.2.6.ebuild
+++ b/dev-python/aioharmony/aioharmony-0.2.6.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/aioharmony/aioharmony-0.2.7.ebuild b/dev-python/aioharmony/aioharmony-0.2.7.ebuild
index 1333b03e8..14a6b2bac 100644
--- a/dev-python/aioharmony/aioharmony-0.2.7.ebuild
+++ b/dev-python/aioharmony/aioharmony-0.2.7.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/aioimaplib/Manifest b/dev-python/aioimaplib/Manifest
index 03d94eea3..fd5a74254 100644
--- a/dev-python/aioimaplib/Manifest
+++ b/dev-python/aioimaplib/Manifest
@@ -1,5 +1,3 @@
-DIST aioimaplib-0.7.13.tar.gz 55747 BLAKE2B cd5faa855ddde57b17729a7e5ec5e5568d52280eec93770dfee602e9ed1969ea46ff344cf417514a340865e6aca76eba695e80e3f9c3cc693b1f430836eb69b6 SHA512 558e63d152df50e9989ebbe0c9fbb6ceed4769a18a5cc17ce342a89f4f9467648b72fb164fadf73717af0b521a8947f080e834ef9104099c19100e84c50c88fa
 DIST aioimaplib-0.7.15.tar.gz 57337 BLAKE2B f81d589aea2a371e33b30f13f9db64712241a38f4cadbfb2f685293cb19d3a3c9ff1daf7744b0130f0747311b8812acb1152ab125bb4d2b6906d069232d6ecf5 SHA512 3430213ace2a48a559c9c13786be8f1eab13dcd06c1c980e942edf8acfaa680de7951b72f5dc560d4473e1153ca3d72ba31f1980b1fbf6ccb1f2cff6bc1a7dab
-EBUILD aioimaplib-0.7.13.ebuild 682 BLAKE2B 269900a0683d2ecf9bcf09311a3e1df5689cd98844c925dbc55732fffdf72c6683099b11cdcafeaee85a01802d5ea991e2dd708f80b9e88b1ee54d9fca046a33 SHA512 441260bd59ca037b86bebdd46b718764bdba21c5ad75be8bffd51d0fab77347a4bdd61d5f87b6c635d6d033cb6a13da20caa4413e654dd0c1c856d0df77bc80e
-EBUILD aioimaplib-0.7.15.ebuild 689 BLAKE2B 8863e3c4ec5607f97f0498f6a975fbd9b4f534915d34ea50ea2e48ed72e1850b7b81c298ae4f101dcd404ea7eeec39696d19754ccadcf75ea2d648678dbfb472 SHA512 0bfa008714902c5c4eff9e0e7940eb10fdef68f2a0533619be4f0db3a2a70106a659135b85e9092d1432f5fded20f3c457b43a0a3da1547c91a246c8d1f0c02a
+EBUILD aioimaplib-0.7.15.ebuild 688 BLAKE2B 9a8d1c9d8a9547c20a158ce91798bbd9d1735ad9368730ee43e282eb85c924b4217f63f35a53b42e5965cc24849cded91f44098ee325ea82905975b7c87b2903 SHA512 a73bdc5bc4e758819429212617a50d12ada948c8d601aa27b13e41419b1d566ef424e4752de7ec0a56d794f373ac2a5b7f661566dc9005aa2bd0cedda660c266
 MISC metadata.xml 341 BLAKE2B 9a9fc3207c075e442f29caaf7e7c6bbe78a9c733f44bc99c547ae90990a83e7eb4bf29415af4dac4a10982a29295c79511c2a9c2332f6d9251e95bf4907c7fcb SHA512 b291413c183ac84a251abd4777823260c080f28cd321063c2cd9353731f2261cc7010f2cdf98c2ac483c2920a345d8a5595c059c62f3cdc15601785a158060aa
diff --git a/dev-python/aioimaplib/aioimaplib-0.7.13.ebuild b/dev-python/aioimaplib/aioimaplib-0.7.13.ebuild
deleted file mode 100644
index ef2b7b9e6..000000000
--- a/dev-python/aioimaplib/aioimaplib-0.7.13.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{5,6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python asyncio IMAP4rev1 client library"
-HOMEPAGE="https://github.com/bamthomas/aioimaplib https://pypi.org/project/aioimaplib/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/aioimaplib/aioimaplib-0.7.15.ebuild b/dev-python/aioimaplib/aioimaplib-0.7.15.ebuild
index 96e4b288e..7f6e283f9 100644
--- a/dev-python/aioimaplib/aioimaplib-0.7.15.ebuild
+++ b/dev-python/aioimaplib/aioimaplib-0.7.15.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/aiokafka/Manifest b/dev-python/aiokafka/Manifest
index cbf0acee6..11babefd2 100644
--- a/dev-python/aiokafka/Manifest
+++ b/dev-python/aiokafka/Manifest
@@ -1,5 +1,3 @@
-DIST aiokafka-0.5.1.tar.gz 352661 BLAKE2B f7efa06f661ce6e7dde42141c053fa8a368dcecedde6729c81853b47e6146c3073e70212980d788f15916be042fcd8ba2db785bc129b42ad0e3e19bb15f9839f SHA512 5a346a0f10a6c6cb92fbaaff7865bc6deb43ad8bb7937de30f8deca3499c36e2c5e69482c23b993343c00a42f499799568de64878cfdff84d37f5e51675f51d9
 DIST aiokafka-0.6.0.tar.gz 359608 BLAKE2B acb7c7d7e1407573f1694980a4192376b91d16546133eeb3a7cb5dfe6b11930306310bad734139a318698cc24be55163cb2e319c980078f9c065b515f60554c9 SHA512 cb3ee368d2c153a80615df0f2ed2b04534135b73eabdb190c3b03c35df97be7c0d2a63f0e6b15b0c1a0d5442c23040448f084a495acf4421d2bd5802b871c98f
-EBUILD aiokafka-0.5.1.ebuild 672 BLAKE2B fffd98bf7a44962b956bb1d625a7df40ca1329b2f9be5ecb0bb91de9f0ce0e5727cd09706003f4a6bc0a9a481f0f1d6a4469b64149ac70d3cbcfca8c0cb06e1a SHA512 cc369c54b9c09839d3a8e3246cf6a083d0bb124b0d1d4bf4dd2dc670f18c704ff62872110faf2e7dd845d8141d2a572784562bf570fe2e1868288615a59bbf05
-EBUILD aiokafka-0.6.0.ebuild 679 BLAKE2B eb74da8916aabaeb287d9878b9f029b2b76a7a18049e6252848101f73b2b2af4f1daa40faacc5cff8cd1cf6af373193a65896289765a6785f443c152696159b6 SHA512 df921ec0b1f3e700388509538696595987a96bd7a17752b97c5bd961f7ec9832b6b00e29b05e8966aefd0ba37f9d92eaba6f72b8709a05a674cad2be60658b78
+EBUILD aiokafka-0.6.0.ebuild 678 BLAKE2B 6f051f20896af6d16359fd39adcb5dde8d03903852b66ae959e249a5a12bac83db57e12ee71ddfb1374eb86cae207f195246a0cad92a13bda2f34bb1f3c11688 SHA512 000ea86509c2bc11bd10c8b923dced542800f7e1db5a467f7eeaa283d1e0f12c65c68b7c08462d23ddcdea1e74dd80540197119a74b57905ba23bbb61dccc3e0
 MISC metadata.xml 459 BLAKE2B 3e1f27e002b902afb27b680c210c33c08de981dc27a95e0b29a41eed42e78c1f510a31785df7037012761faa56d11cde8592f2ca19bbe96f1b4edbfd02e872ec SHA512 65382efa7fc141450ded072a0eff2eb05ad1e128040aa63610e68414d7d403307c93d0250de24a172524e92b0fe09cfb08692718ed6abe7ca7bf86e98cbb025d
diff --git a/dev-python/aiokafka/aiokafka-0.5.1.ebuild b/dev-python/aiokafka/aiokafka-0.5.1.ebuild
deleted file mode 100644
index 1f3a21f05..000000000
--- a/dev-python/aiokafka/aiokafka-0.5.1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{5,6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Kafka integration with asyncio."
-HOMEPAGE="https://aiokafka.readthedocs.org https://pypi.org/project/aiokafka/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/aiokafka/aiokafka-0.6.0.ebuild b/dev-python/aiokafka/aiokafka-0.6.0.ebuild
index 4a62c5af0..0418aa2a5 100644
--- a/dev-python/aiokafka/aiokafka-0.6.0.ebuild
+++ b/dev-python/aiokafka/aiokafka-0.6.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/aiopylgtv/Manifest b/dev-python/aiopylgtv/Manifest
index 97da4f47c..7d945cad7 100644
--- a/dev-python/aiopylgtv/Manifest
+++ b/dev-python/aiopylgtv/Manifest
@@ -1,11 +1,5 @@
-DIST aiopylgtv-0.2.7.tar.gz 15226 BLAKE2B 04a85a283bcb80892ebb188d897e45e422782322a0df3781677328e5cbdcedb8944fbe4b8a7ef0a9c2d8315a0da9dda49d8209f5a72491b1937da36608d1c9e1 SHA512 80ea8fc0beaf937df75cf7c86199ed8a027fa9bf2fd809f88b3b45d6e84c9f2e9bc2119cdd5d1e8c88a1a83fb6dcf54db06080e2e0512fe0755f5dad8cf03fcf
-DIST aiopylgtv-0.3.0.tar.gz 19177 BLAKE2B 0ea9872591d70b215642683db95c7b702659e13775643d99414b787b8d54e66c1fbd9123dfe927b44811cafa33b84cf069357dc8c0235087c2e01dd64aabd948 SHA512 a0ec36fceb4896e5413a4f0da1b3bf8b285183065448c11cfa81fb455843792f543de7fca0cd6d9e4adef9d6c3fac126cde228ba867b1b6a01c638d50a424d0f
-DIST aiopylgtv-0.3.2.tar.gz 19386 BLAKE2B c331b1063fc13fd1141cb1af2330a086f187ee43ccf267bfa2d22b53240b14048fce88a6db467c39def1e4deef7c30f63155b1f15a38e5b65872ecbe08a4a8a9 SHA512 4b39f23f1b68eb0e0d483626254f8d3a0e8aa4d4f0ce8c11eda87632393678512066f79fdeafd9b20f7dbba847d541008a38f7c09b17824bc50afcf97f8cb77d
 DIST aiopylgtv-0.3.3.tar.gz 19393 BLAKE2B 638a5b8409c0630c379ea49c920851317859b93b9098beeb40da52331f67da2a652cb25025524c451a29538280060b604d724330cbc3fb5a283df8e07a777cc3 SHA512 1667ec3d68eac2bf960e443be7e75c7c8c8deacd460a6acedb0f1193e5772ae7bba2b3d1964a7683c0bf06764f77d285ada0ae3b78cc9a5dcfb6bfaf7a87fcaf
 DIST aiopylgtv-0.4.0.tar.gz 21199 BLAKE2B f6d2e7fb42cbc7357938f85cb87c1973d21e9aa17d4cda1f68e6e926c8dbb7b9ebc0c0f715758206a16e51e8b990211173240ed2d8ae6c42865feb594fa7cdbd SHA512 0ca1767f262f78e3a84659e3218e1ab4c7025045c806cf8370e82c36ecece0ce6239af37c96eadcc0afdc7bf3fa20f0324acd610904f154ad4a07dbf55735ff7
-EBUILD aiopylgtv-0.2.7.ebuild 757 BLAKE2B 60ff4c6e773fc5a116b39e6357b8661557d61b81facc0257787d2a50514d3711c39c2be5234a623cd2f43e69c7bceae8f253f0f0ff38abcf2f6c65e46333ab0f SHA512 21eaa718f5f02a52845d8454ff5fd509c0e2b6284c5b2a85e74255796e332fc41da09a816c33e0d5c3aa01af02a701ca8627e6bc53db236fb1654f245d50cd60
-EBUILD aiopylgtv-0.3.0.ebuild 740 BLAKE2B bc654a070b19e823ff4bc4e1b9a68bb10ef3b77e2e5758dff9d9f404260f4262ca0034d988473e8ac85e3682dec144d131f4bb8cad05b3af5ea754a5763a0b66 SHA512 a6ddf85d4a9301991e9dc9400f3686b79722f9ed7fa76851fe4d7c9196f5901fb9126ccb7e6b26dd0d699b878b2700175439d31c6dc0333f60a17e390abe2d14
-EBUILD aiopylgtv-0.3.2.ebuild 740 BLAKE2B bc654a070b19e823ff4bc4e1b9a68bb10ef3b77e2e5758dff9d9f404260f4262ca0034d988473e8ac85e3682dec144d131f4bb8cad05b3af5ea754a5763a0b66 SHA512 a6ddf85d4a9301991e9dc9400f3686b79722f9ed7fa76851fe4d7c9196f5901fb9126ccb7e6b26dd0d699b878b2700175439d31c6dc0333f60a17e390abe2d14
-EBUILD aiopylgtv-0.3.3.ebuild 820 BLAKE2B 9b2a999d4645333c8bcdae8fb383cc61e2e9789f1e7cf3e6744b7e1237b9d5423d96e72514e7b38b6f45baba33d03cd807c51f7e02f6135c7918d03ae9172ada SHA512 d9c7b0d9d0d6ad0cb5f9854b4b4b0faf969a51f1fd775b54a604dd0b808a93aaf9ebee65f106b8d48c7941f60ec6ab8571a4acb952634a7b8d46bef323ae9f7a
-EBUILD aiopylgtv-0.4.0.ebuild 830 BLAKE2B 8d18a77fec5ea22ee06447076dd81ea73f58a1867093f463b02dfc9dd562fb0a73dc80d41b7b8ba8182c26d9070f5e5688bf1918f8652cfe783db14b932321f5 SHA512 eb3aceec2fa97528ebaa1ad8c72099c5ec9f5b27c4711830fdd67babb14238cd4f8adf3ea3f58b1dc496222737a646fc75a1dd8aefbdf4455923950a23c6dcb4
+EBUILD aiopylgtv-0.3.3.ebuild 821 BLAKE2B 4ebcbab1c2641350d4d763d40f0f4d83f58b4d5dc7df12a9933b3c7115d8ef78c5b8c8a9d930078e830ed8890d317afc8746226a018773cfc0eff26229b00b70 SHA512 9b3515e5017ce04a1a414408ca321e914cbaa721ae78b3ba43a6ea4cc43713bfc916834a41477cfde651c60b3d9f38e25067cd9a5f20a5bdefe2f7252670061e
+EBUILD aiopylgtv-0.4.0.ebuild 830 BLAKE2B bdb768b8d2af9e5e75938e66ae92f214449d5c8904877cfe78e140c396f4daad962150971d7dd0587e0a5193e4c8b0c75f310629734d805c42d929723168ffe2 SHA512 ab868725ed048ac78ae4d911808a63e69eed4d10da6d0809b9dcc8b395eeeb578ea03edcb13d8d1c06f3d1a1fdc7b0a8eba32912d6a7513a816b37c3031c68e4
 MISC metadata.xml 457 BLAKE2B a10f71011c6909d601438010adb12dc947c36e84f55aac092f9afb374d9331022bf35ee731dfce55ff4b0f917cff53f200ba2649dd953a6a0d78a98365993157 SHA512 9f029d71cf53338b0fd5a755acbe343c17b6ab3f7e515510454ce8f49d84c130f03d76ceae146490b3b118dff360d9ce0f565869bd5f0ddd184b9f36ca263b46
diff --git a/dev-python/aiopylgtv/aiopylgtv-0.2.7.ebuild b/dev-python/aiopylgtv/aiopylgtv-0.2.7.ebuild
deleted file mode 100644
index 66ddcfa82..000000000
--- a/dev-python/aiopylgtv/aiopylgtv-0.2.7.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Library to control webOS based LG Tv devices"
-HOMEPAGE="https://github.com/bendavid/aiopylgtv https://pypi.org/project/aiopylgtv/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND="dev-python/websockets[${PYTHON_USEDEP}]
-	dev-python/numpy[${PYTHON_USEDEP}]"
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/aiopylgtv/aiopylgtv-0.3.0.ebuild b/dev-python/aiopylgtv/aiopylgtv-0.3.0.ebuild
deleted file mode 100644
index 2fd81f3c2..000000000
--- a/dev-python/aiopylgtv/aiopylgtv-0.3.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Library to control webOS based LG Tv devices"
-HOMEPAGE="https://github.com/bendavid/aiopylgtv https://pypi.org/project/aiopylgtv/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE="test"
-
-RDEPEND="dev-python/websockets[${PYTHON_USEDEP}]
-	dev-python/numpy[${PYTHON_USEDEP}]"
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/aiopylgtv/aiopylgtv-0.3.2.ebuild b/dev-python/aiopylgtv/aiopylgtv-0.3.2.ebuild
deleted file mode 100644
index 2fd81f3c2..000000000
--- a/dev-python/aiopylgtv/aiopylgtv-0.3.2.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Library to control webOS based LG Tv devices"
-HOMEPAGE="https://github.com/bendavid/aiopylgtv https://pypi.org/project/aiopylgtv/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE="test"
-
-RDEPEND="dev-python/websockets[${PYTHON_USEDEP}]
-	dev-python/numpy[${PYTHON_USEDEP}]"
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/aiopylgtv/aiopylgtv-0.3.3.ebuild b/dev-python/aiopylgtv/aiopylgtv-0.3.3.ebuild
index 063e69c8a..53eab4740 100644
--- a/dev-python/aiopylgtv/aiopylgtv-0.3.3.ebuild
+++ b/dev-python/aiopylgtv/aiopylgtv-0.3.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/aiopylgtv/aiopylgtv-0.4.0.ebuild b/dev-python/aiopylgtv/aiopylgtv-0.4.0.ebuild
index f71b9477f..8c6b800df 100644
--- a/dev-python/aiopylgtv/aiopylgtv-0.4.0.ebuild
+++ b/dev-python/aiopylgtv/aiopylgtv-0.4.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/aiowwlln/Manifest b/dev-python/aiowwlln/Manifest
index 2f6dbf096..249e8ec9e 100644
--- a/dev-python/aiowwlln/Manifest
+++ b/dev-python/aiowwlln/Manifest
@@ -1,7 +1,3 @@
-DIST aiowwlln-1.0.0.tar.gz 6089 BLAKE2B 7f69b6fde984cc4a6f47ead3f16b80a9780d736dd879150794d4f75cd05d8c389cf1793f3185d628c0b62b5b32f545128e7b5c6e40676d78717887a324f07ef5 SHA512 edb658d714aa7599d55c370c4a140b6b4858fb659a23a2a121652e546055bf5618fd27c4edf4c4b72635bb4c5dfa378a8fc545bf5b44ef2f3b08512f3a7d6f43
-DIST aiowwlln-2.0.1.tar.gz 6225 BLAKE2B 07755da9ed7cd4b06d3ef428a8c8a6afd136092640ec2fe9f165f69172e9ad706da59d01d2d49b250e8df271abe19eff8b25d15a1b50945e661aa32543023f56 SHA512 a10de6e604ad6134fc4c8ee25a46011f7441962ed00483d63f823ff37ef94b06045e7d3cf7a87c4850f61e584d9bbe774f45add7f804e30a36189c7e2be29d0f
 DIST aiowwlln-2.0.2.tar.gz 6201 BLAKE2B c240620a22f2f9d9119e70fef8635588c481ab07b6b34abbcbfdd6a1c22f10b4c5bc6c32bc4ceb6969c495d1a62169c4bd58b6de8c8d1525e2dea2d7c4041c35 SHA512 119ac51e0ad837633e74137754e62a3401ccbbb37dcf9d3145a08f365dbbcf6c3aad725b3a53c06a485c687a4852535503548323f236f74e51a97a24c24781ab
-EBUILD aiowwlln-1.0.0.ebuild 706 BLAKE2B 6dd8bdb9332bd1ec20e9ff403ad1370f3e1ba373f5d9d3fa173d5f372fab67e438f0f16f4965d9ce7f4326a5e648f58e1367f430315acd813463457aa03a9fe3 SHA512 9553ba637725aa9fbb254acae92ad8f20e447874cc23b1ec9e56c220a8bbddc7cbd89568de58f9dfa2fe62d4b3fd91cb73cc5b7e78837717983cf26a3d072bca
-EBUILD aiowwlln-2.0.1.ebuild 706 BLAKE2B 6dd8bdb9332bd1ec20e9ff403ad1370f3e1ba373f5d9d3fa173d5f372fab67e438f0f16f4965d9ce7f4326a5e648f58e1367f430315acd813463457aa03a9fe3 SHA512 9553ba637725aa9fbb254acae92ad8f20e447874cc23b1ec9e56c220a8bbddc7cbd89568de58f9dfa2fe62d4b3fd91cb73cc5b7e78837717983cf26a3d072bca
-EBUILD aiowwlln-2.0.2.ebuild 713 BLAKE2B ef58dde5806d110845c24d5421b8f85cfa7c051915790b98d101f5623bd6bc8f7d10299bb139785caaa9569d0dfbc3c0ee716a96df80a195e6acc66550f7037b SHA512 9a5658c82876c3cb1e7a4dfe20d33faed1cf105c8aa71608744fbb6346279d81773a27584dd117c1a3a084ffc0ae1cc9da7dc4fb6e69aa6c72e4856f70ca7bcf
+EBUILD aiowwlln-2.0.2.ebuild 712 BLAKE2B c83d0ad17b4aad2172a603181db82dee262da33d4b1e808f68936ed34300a0c7aa58f9ac41f81b5b18998881a8dd459caf82c60b22e4fe36cd58415ce84f07ae SHA512 6eb577fbd5b82425e60f9edf2cd353c98d6276911adf0b69786906218a5b009f7044a31fa8f35e612470bd3f9095201039297b193d26551d7be30ebfa7971b0e
 MISC metadata.xml 451 BLAKE2B 35d327ed28e33883efab4566681754b6e59e80e62d1f4b59608e954f63bae8416f192ac087596459b23a0ddf92123196da4861796630f9f0e5249111642d8b5c SHA512 101cb1a6d69d9299dbc2a06564de1433502cb8d180d63111d275c767ab21fd31acf1ba0dae6101c72caedd1d4df3790f4527df4ffb8559aaec11c665aca8b7b8
diff --git a/dev-python/aiowwlln/aiowwlln-1.0.0.ebuild b/dev-python/aiowwlln/aiowwlln-1.0.0.ebuild
deleted file mode 100644
index fcb7d12ec..000000000
--- a/dev-python/aiowwlln/aiowwlln-1.0.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{5,6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="A simple Python API for the WWLLN"
-HOMEPAGE="https://github.com/bachya/aiowwlln https://pypi.org/project/aiowwlln/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND="dev-python/aiocache[${PYTHON_USEDEP}]"
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/aiowwlln/aiowwlln-2.0.1.ebuild b/dev-python/aiowwlln/aiowwlln-2.0.1.ebuild
deleted file mode 100644
index fcb7d12ec..000000000
--- a/dev-python/aiowwlln/aiowwlln-2.0.1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{5,6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="A simple Python API for the WWLLN"
-HOMEPAGE="https://github.com/bachya/aiowwlln https://pypi.org/project/aiowwlln/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND="dev-python/aiocache[${PYTHON_USEDEP}]"
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/aiowwlln/aiowwlln-2.0.2.ebuild b/dev-python/aiowwlln/aiowwlln-2.0.2.ebuild
index 244062bd3..9b44ddad6 100644
--- a/dev-python/aiowwlln/aiowwlln-2.0.2.ebuild
+++ b/dev-python/aiowwlln/aiowwlln-2.0.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/alpha-vantage/Manifest b/dev-python/alpha-vantage/Manifest
index 5874761d2..ac11be6b0 100644
--- a/dev-python/alpha-vantage/Manifest
+++ b/dev-python/alpha-vantage/Manifest
@@ -1,11 +1,5 @@
-DIST alpha-vantage-2.1.1.tar.gz 14502 BLAKE2B f74ee7a6db53053e480bf6cb6136d2457f0b8927b03c02467741e03158c5b18dfea34bbac2cd4412de01ac4527042330867cf586cf15a0dbdef128918c754343 SHA512 0820c41f0f511fffc5e6fdbca9056a5eb0194887a7c820a77df0b063763f07db136a69cb3f53438f93cd24483349ac465a9fd7c0c3c39fb1e562ca93efeb4b8f
-DIST alpha-vantage-2.1.2.tar.gz 14621 BLAKE2B cb8a48197f8d85fb1d78930eaef5989370dc4c58d24e6ce22f958589032abae6bbbbf6d1d41f11691d9688e813d016618c0c029a5448a9e94b9487164a3a0325 SHA512 d28d29710acd99c6c246b347bb4521beb312712c8d4f1b64d80464157139fc43914b7d326dea7a9aa2eeec7c95f6aa75f23b4fc82dca308cd3e98077396e914d
-DIST alpha-vantage-2.1.3.tar.gz 14942 BLAKE2B 48b23734edfff014a59c62f1cdb53dce66fd59e0797b6a541f92969d3afac54861a896a9c321f3744252cb96c8332e7012485c9c45845c71f426d364dd9e71fb SHA512 5ec790561663feeb8893be273edbdaf8e428f374f39e0851dca576e44fba5689b191fa279be59219b2af78579d61bd1e30a35e47dd73f7c36947605d04b79a2c
 DIST alpha-vantage-2.2.0.tar.gz 20928 BLAKE2B 67f899be1b86d522ddbd2da9b37e78c632f0f7181f807953afa84502ce25e6342582c103c4586e2969f6ab5124eb2cf635c7cc4fd62d14ab88a5e24dcd92be0f SHA512 eb301155f3e18020e2b91dcb3e43022c8044caa206f763760868f9377b6d58a382ea62f6a7e193d4438e1aa2cac82729537a9c16c860ef6040e78847d9d72d7d
 DIST alpha-vantage-2.3.1.tar.gz 28024 BLAKE2B 2fe1f9068fc7255ddbbc6291be5193f8b818c00ee746e312f17763aac0f15002f39bdc79f28a93f9267a3d7cdcc7545dab10f7e9cf4ef77f44232b8729767f41 SHA512 50253369bee6077a31063bae21b33726828413131957db8638230c046b16629271200b6cc4fedba03477e06c04cd2b34a71ae2894dda57efec4453d43f80f83e
-EBUILD alpha-vantage-2.1.1.ebuild 817 BLAKE2B 6dd60381b7b0e778bd6eb1e007780aa1ddc7b4c7c33a087421338a89f90e124ce3cd342b218135433c940cef9197d7854f4fce84c001d33af160d5fd077a5c31 SHA512 7e447c07c49576537a3df21795b1f5c76f4e8e504228c63c886a8b1b39a13880fc04619a62e78324437499b1065279101db82cd4bd56768491d8d9b5df40a435
-EBUILD alpha-vantage-2.1.2.ebuild 817 BLAKE2B 6dd60381b7b0e778bd6eb1e007780aa1ddc7b4c7c33a087421338a89f90e124ce3cd342b218135433c940cef9197d7854f4fce84c001d33af160d5fd077a5c31 SHA512 7e447c07c49576537a3df21795b1f5c76f4e8e504228c63c886a8b1b39a13880fc04619a62e78324437499b1065279101db82cd4bd56768491d8d9b5df40a435
-EBUILD alpha-vantage-2.1.3.ebuild 826 BLAKE2B c3b0405f7968d644b7303dbd8e4062af0bf0dc08cdff8096acad282376d681759a9aedae37a1ac645b0ac53ab8aeb35079f36d5e58d81b13b62d964b1c5bf3c8 SHA512 9d8e28e5fa1687d509e547d9b5b6402c40af9c9c73dfdc9f9311903a7e47dfec5d04baee330ecf43fbddda4b9518dd55c14acd78a9d60bc035931164faf6c3cf
-EBUILD alpha-vantage-2.2.0.ebuild 826 BLAKE2B c3b0405f7968d644b7303dbd8e4062af0bf0dc08cdff8096acad282376d681759a9aedae37a1ac645b0ac53ab8aeb35079f36d5e58d81b13b62d964b1c5bf3c8 SHA512 9d8e28e5fa1687d509e547d9b5b6402c40af9c9c73dfdc9f9311903a7e47dfec5d04baee330ecf43fbddda4b9518dd55c14acd78a9d60bc035931164faf6c3cf
-EBUILD alpha-vantage-2.3.1.ebuild 958 BLAKE2B 51c1043bd6ea523ac177b9e193a02d81a5ca337a326ea26fe907fe19f97ebc61ee23f2fcc0d66a218c5fe59f05d02bb1a283ef675bbf5240b992b40465e15b8f SHA512 8fa9aceef64b0587e5b66892abd49535c0626fb571353fa3343a9e79f8b8685477dafe7e6809827f1010fd41ce4f24dff672d14fb7ac9c15221cfa4ad1d7cf3f
+EBUILD alpha-vantage-2.2.0.ebuild 825 BLAKE2B 3a9412f89e56fd9e0c4e39cf4972b9145220dddd89832f3903e2103f003954cf21e52997e6fbe444181dd0993d6d972746001e923ec9a4af20cbbdfdb515c10c SHA512 42638a57f5ca765a7b7ccc10b93b39b2d0448b32b163ed9db6e46274c6e883675f70fa31419ff52f3abc275f93b3459310670c868a28ca552f4340b6fbf58e0e
+EBUILD alpha-vantage-2.3.1.ebuild 958 BLAKE2B a9305e7bda416ec71ab561b6e0fac447f4a947af4c420de599323305886d58544d81cc16b8b194fe0a94855a6af995ad73e34ed3173321d7c6935a61ca593f0b SHA512 85595804fee49105e469bfbbd2b1f2e60777f81571db959076c1e1f7a1f47be504bac1aafb0494ea09ae8d39195a3807bb545af0e77c5246c692897e835d7750
 MISC metadata.xml 463 BLAKE2B ffe4f0b8d2d72134ebfd2d7639070bdda6c318833534b8947e7b5ad9d570ba67b29c54988325829feb76044e8ee4b3fab5f6ed73f50a2b4efca0c3b2dfac6b22 SHA512 7fdcab7fad7b8c15754fda3fa827ba489eae626ade09bc2e88dd64cf164be2344392c6ae031ae88472180562733c54bc8fae26517016bc41c86651d61dc8f575
diff --git a/dev-python/alpha-vantage/alpha-vantage-2.1.1.ebuild b/dev-python/alpha-vantage/alpha-vantage-2.1.1.ebuild
deleted file mode 100644
index 23bb7083c..000000000
--- a/dev-python/alpha-vantage/alpha-vantage-2.1.1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit distutils-r1
-
-MY_PN=${PN//-/_}
-DESCRIPTION="Python module to get stock data from the Alpha Vantage Api"
-HOMEPAGE="https://github.com/RomelTorres/alpha_vantage https://pypi.org/project/alpha-vantage/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND="dev-python/requests[${PYTHON_USEDEP}]"
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/alpha-vantage/alpha-vantage-2.1.2.ebuild b/dev-python/alpha-vantage/alpha-vantage-2.1.2.ebuild
deleted file mode 100644
index 23bb7083c..000000000
--- a/dev-python/alpha-vantage/alpha-vantage-2.1.2.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit distutils-r1
-
-MY_PN=${PN//-/_}
-DESCRIPTION="Python module to get stock data from the Alpha Vantage Api"
-HOMEPAGE="https://github.com/RomelTorres/alpha_vantage https://pypi.org/project/alpha-vantage/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND="dev-python/requests[${PYTHON_USEDEP}]"
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/alpha-vantage/alpha-vantage-2.1.3.ebuild b/dev-python/alpha-vantage/alpha-vantage-2.1.3.ebuild
deleted file mode 100644
index fa8fecdc1..000000000
--- a/dev-python/alpha-vantage/alpha-vantage-2.1.3.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit distutils-r1
-
-MY_PN=${PN//-/_}
-DESCRIPTION="Python module to get stock data from the Alpha Vantage Api"
-HOMEPAGE="https://github.com/RomelTorres/alpha_vantage https://pypi.org/project/alpha-vantage/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND="dev-python/requests[${PYTHON_USEDEP}]"
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/alpha-vantage/alpha-vantage-2.2.0.ebuild b/dev-python/alpha-vantage/alpha-vantage-2.2.0.ebuild
index fa8fecdc1..4ebb67eaa 100644
--- a/dev-python/alpha-vantage/alpha-vantage-2.2.0.ebuild
+++ b/dev-python/alpha-vantage/alpha-vantage-2.2.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/alpha-vantage/alpha-vantage-2.3.1.ebuild b/dev-python/alpha-vantage/alpha-vantage-2.3.1.ebuild
index baeabfa79..335d597bc 100644
--- a/dev-python/alpha-vantage/alpha-vantage-2.3.1.ebuild
+++ b/dev-python/alpha-vantage/alpha-vantage-2.3.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{6..9} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/amcrest/Manifest b/dev-python/amcrest/Manifest
index e6b1cac0d..f21ec26f7 100644
--- a/dev-python/amcrest/Manifest
+++ b/dev-python/amcrest/Manifest
@@ -1,13 +1,5 @@
-DIST amcrest-1.4.1.tar.gz 60902 BLAKE2B d9b893b7d41eed6d590330a1f4513ac3fb582fcc577de039af71854c8af7432a50a63659b46c47607835f790f4e4c021472d93bce2a6ce2f505d8ba03d19cc88 SHA512 2c197d1f2f2a45e32cd4a6d072a1e166b927f397506d4e72f10ed5e3c4fe298e2440840ee25439904e89d9b7f3f7bdd3c3a8c8ca2c1e4b2d6ffa0be980173057
-DIST amcrest-1.5.3.tar.gz 61715 BLAKE2B e51115a7423b9ffa6c9cdfcbbbf7541e2e2758bf2d3a1e8474c0e35e8266610b80fb05e5c836584b3bc7e76b8c7966dc030f5eacfc44564ab70e6251000246dc SHA512 d42cde8cffad03364ce40ec664b7f34c4f759ef975d4aa808a1c50b111ca96962beb61300a0b92fa9f3dd57b64dd81ab1aaf62d856041a60fdd9e52b051f2035
-DIST amcrest-1.5.6.tar.gz 81684 BLAKE2B 37da830fda55a2b917964b9fd247718627e1cd6e54a425bed4074afd51b0c8651dbb1d3ca2450bdf757a2648d3de60ad30a08a18610102817f1c6e189c1d886d SHA512 861557895b41dd93579aa16c2599d5a38646244c8711849adf63be2794795601b374273a069578b034a6b8894aefd1df9f567db3147a1ba4e8a8761172fbc908
-DIST amcrest-1.7.0.tar.gz 85397 BLAKE2B 1c16c7e29745bc88a22ab9ff86101abc3d49e4584fd12f77d6858c1f61fd75595a4f8baae5b5173d3ab2319c67c587dbb8e91cfa16db7f027c4e2f3c34452f7a SHA512 c39845bb09002ff03c680ce9690e67001ead4bbae6d3ce1d089ea939339dd77d55656e26029941a954f6d3d6579a35747e5108f5784c105075ca944e836ec8b0
 DIST amcrest-1.7.1.tar.gz 85472 BLAKE2B 8f4d287e6c2d2a7b07330d1f900bbc0cb85b13175ff6e016a202048abb844803d1faba4675209637ac4922b085cb1010c4c7293bafa2b9434ab4d3a63c77b141 SHA512 3bd31c478a129c21c974bd72bfa0858956538e97952fae70ff5d3b82e8a16be6e8b9d5a6cf96115de93104912d761bf554aedff5a881f0142d9f874bbcf807ae
 DIST amcrest-1.7.2.tar.gz 35732 BLAKE2B eadd4fc5e51f197f856b4480b9d02dbd06615b91f44c07001ccf6e721ce04867018438d3715e7a02f982bdc8c1c8fbdba7802638e956bf0a3fe8467d4bf638d5 SHA512 ae0055c223d11963713cdd0890ccb25636d538f58d145e309c0a084e75c54b6eb8483abd07797e14cd3a7f87df0e312eb8d13c0aec4d8855dcb93bbc1e64da1a
-EBUILD amcrest-1.4.1.ebuild 699 BLAKE2B bcf2403c3f76070f42d933268c67e3db661b4ecb1a9dd3228bd73d44402bf1f5151f04c244d489a8012e3df9582127be35e982cacaaebb6af89782805b0803b3 SHA512 eca5f64baed6f42e983b0fc6aeea9eed6fb9aa6d86576f6228346181078146d6c91ad58d1f905cebe9eb43b1bc0dcfbbcfcad6feb5633845e1c314aae409c97a
-EBUILD amcrest-1.5.3.ebuild 706 BLAKE2B 4f74b5488ccc71d64206cc1419ce24b5bef83bcef8c6c68c0083e9b23b3e005e1ee5bd1918ec2276e9c636445d30ec5e40f68ba9743983ecd45dadabcd8df3ff SHA512 1a6993026ce548da62c374330556f6e2191e449acd3c0f11e3817715b1e4e65d766e86b1bc9ec0a18b3eaa9bfeaa96a20fb5abd4929067af59b1e322511cc7b6
-EBUILD amcrest-1.5.6.ebuild 706 BLAKE2B 4f74b5488ccc71d64206cc1419ce24b5bef83bcef8c6c68c0083e9b23b3e005e1ee5bd1918ec2276e9c636445d30ec5e40f68ba9743983ecd45dadabcd8df3ff SHA512 1a6993026ce548da62c374330556f6e2191e449acd3c0f11e3817715b1e4e65d766e86b1bc9ec0a18b3eaa9bfeaa96a20fb5abd4929067af59b1e322511cc7b6
-EBUILD amcrest-1.7.0.ebuild 706 BLAKE2B 4f74b5488ccc71d64206cc1419ce24b5bef83bcef8c6c68c0083e9b23b3e005e1ee5bd1918ec2276e9c636445d30ec5e40f68ba9743983ecd45dadabcd8df3ff SHA512 1a6993026ce548da62c374330556f6e2191e449acd3c0f11e3817715b1e4e65d766e86b1bc9ec0a18b3eaa9bfeaa96a20fb5abd4929067af59b1e322511cc7b6
-EBUILD amcrest-1.7.1.ebuild 803 BLAKE2B 37e9c141e0187067b6c538e0dda77dbf6d19bea90e8236a9090c1c08654635744e9a020261a68bd1bc78b90300452cf4f76b5d9dffb5c11f9e7c1e62ef659678 SHA512 3bee74feff187de741ca6586bbce8a68261a69acd656d1bdb5e268a5642c013c9f13a3d69da3c3eb45294441394484001fce363bc11d35efcab3b8fdee794728
-EBUILD amcrest-1.7.2.ebuild 803 BLAKE2B 37e9c141e0187067b6c538e0dda77dbf6d19bea90e8236a9090c1c08654635744e9a020261a68bd1bc78b90300452cf4f76b5d9dffb5c11f9e7c1e62ef659678 SHA512 3bee74feff187de741ca6586bbce8a68261a69acd656d1bdb5e268a5642c013c9f13a3d69da3c3eb45294441394484001fce363bc11d35efcab3b8fdee794728
+EBUILD amcrest-1.7.1.ebuild 803 BLAKE2B f3499418fe978e13b548db15b3745632c4dd253a8dc867dbff07175c3691455b0df2e94201b2bde78dcc451fc160208770f19b47a976d3e186241fbf3eff92eb SHA512 b0a66e9ffae197ec22f2d83bc1de1e174fc681b7512f213ec70f1fe541f7b3d945cd744522ae55ba3c293d3371b8e91e9904e267e4c477635b1591b1bc512d33
+EBUILD amcrest-1.7.2.ebuild 803 BLAKE2B f3499418fe978e13b548db15b3745632c4dd253a8dc867dbff07175c3691455b0df2e94201b2bde78dcc451fc160208770f19b47a976d3e186241fbf3eff92eb SHA512 b0a66e9ffae197ec22f2d83bc1de1e174fc681b7512f213ec70f1fe541f7b3d945cd744522ae55ba3c293d3371b8e91e9904e267e4c477635b1591b1bc512d33
 MISC metadata.xml 516 BLAKE2B d29e7c967dec06d1f8adf89fba95eb205b9dda6021209962311dcadf0700ea24fc9ab3148694acf91ff2fba6d90b883d32ecce85881d1bd8803910d8b268651d SHA512 70ca7f5eaf662deca5b2d8ef45a441b0dd43b7b17812f9a9a2e1154198dfafa23efe5249eccfdb5d273f8ae52c86ac84ef9802dd232c7865ce1ad2ff0b64603b
diff --git a/dev-python/amcrest/amcrest-1.4.1.ebuild b/dev-python/amcrest/amcrest-1.4.1.ebuild
deleted file mode 100644
index 24c71c6ad..000000000
--- a/dev-python/amcrest/amcrest-1.4.1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{5,6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python wrapper implementation for Amcrest cameras."
-HOMEPAGE="https://github.com/tchellomello/python-amcrest https://pypi.org/project/amcrest/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/amcrest/amcrest-1.5.3.ebuild b/dev-python/amcrest/amcrest-1.5.3.ebuild
deleted file mode 100644
index 51047262b..000000000
--- a/dev-python/amcrest/amcrest-1.5.3.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python wrapper implementation for Amcrest cameras."
-HOMEPAGE="https://github.com/tchellomello/python-amcrest https://pypi.org/project/amcrest/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/amcrest/amcrest-1.5.6.ebuild b/dev-python/amcrest/amcrest-1.5.6.ebuild
deleted file mode 100644
index 51047262b..000000000
--- a/dev-python/amcrest/amcrest-1.5.6.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python wrapper implementation for Amcrest cameras."
-HOMEPAGE="https://github.com/tchellomello/python-amcrest https://pypi.org/project/amcrest/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/amcrest/amcrest-1.7.0.ebuild b/dev-python/amcrest/amcrest-1.7.0.ebuild
deleted file mode 100644
index 51047262b..000000000
--- a/dev-python/amcrest/amcrest-1.7.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python wrapper implementation for Amcrest cameras."
-HOMEPAGE="https://github.com/tchellomello/python-amcrest https://pypi.org/project/amcrest/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/amcrest/amcrest-1.7.1.ebuild b/dev-python/amcrest/amcrest-1.7.1.ebuild
index 607ea2057..5db66c6e8 100644
--- a/dev-python/amcrest/amcrest-1.7.1.ebuild
+++ b/dev-python/amcrest/amcrest-1.7.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/amcrest/amcrest-1.7.2.ebuild b/dev-python/amcrest/amcrest-1.7.2.ebuild
index 607ea2057..5db66c6e8 100644
--- a/dev-python/amcrest/amcrest-1.7.2.ebuild
+++ b/dev-python/amcrest/amcrest-1.7.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/anthemav/Manifest b/dev-python/anthemav/Manifest
index 74006d9f2..5f506152f 100644
--- a/dev-python/anthemav/Manifest
+++ b/dev-python/anthemav/Manifest
@@ -1,5 +1,3 @@
 DIST anthemav-1.1.10.tar.gz 15109 BLAKE2B 13bea5014ea82a059954d5577b5b272ef1e4efce2b4735ddb2687d54e645ad3af98ce8d90d8b80ee293c6985b16409f4a5e36585f0f2ed5fb3192b64d1b07bac SHA512 78ed89809fdb44fa7f9f93438245b582eef73bce98ce5d602d0bf25920e3fdfe513d9c42fcba84b32e030e113158757479dba7934d145c581cb48b9cb0a75fc1
-DIST anthemav-1.1.9.tar.gz 15091 BLAKE2B 745f280214ddcf600e086dae7015fba2daeb95c3552f99a72f510a7b16f2ddae055f863c18d52204248b8877d8705f5895328e34ef9c251a666188e4bdd471ec SHA512 71d5b29e647d340c706162761376f03a824f3893fba7c3d5d143286b76aacfd44a3245ab4f7ddb64f10c86c1a25ee045a49d86b9bc5cc9e383361d07205d894f
-EBUILD anthemav-1.1.10.ebuild 691 BLAKE2B ff7c4f4d8ede409a48e526da7f3d8b1cd4b9bfb2e2f51e81fe32a97676bc57e5c12a7f1cb162e0b9a9f50ad00949f587a4dc297b9fe9b5cff367f17ed5112199 SHA512 5c0e3fa9075637542d31093e2fa78b9b900a0425f192f6c2430d6011bc3b5d300551ddb2825b7dc031da5ef5256a301976a733de9e3911dae679c8d790bd0b14
-EBUILD anthemav-1.1.9.ebuild 684 BLAKE2B 221879451a0e90c6b58f6ceafd9f1eedc615d55a0fd19ee3a9c1f2d67ccd89ce40a172199ecab6cd37bf005fbeb3b9de721f68d0116ffa9994240ba9101e5aa6 SHA512 9aa913be0e4f11f78648c87fb049319a18ba5b19c59651a5d207662a17676a2286fc79d6402e7f75fe1681e41ceeab6dde059ca4656144e3f188cb5866162e11
+EBUILD anthemav-1.1.10.ebuild 692 BLAKE2B f741bbe591414ffa21df07cf0fe52e18f7b8c4dc5c2e28eed9d8f02e30759d605e9db2733b6740aeb595542b4a981f33e77409b657347fa9e58d2ff413351048 SHA512 abd64bcf3060b38fa468716b71f0df4ceafa7dca2d5f89ba6d9e789ce059b4e95a5cdad1d14fe74a29a96134c0855a3c3bb3597d0d0478adc6f889804f712e92
 MISC metadata.xml 340 BLAKE2B fd3646ce5d38af41f05ef76ecc40da5f69f3bd8e78a9a0ff957a59443aa96c2eef2433491f2c25d499b2aca6a1895568a6edd14b7072bb31c8b8fb4bc223fbc3 SHA512 018f4ec0e6c00bb43fcf18e53fd892170947cc8692615fcc51bc67e9741cb8b732853650c01f59aaf7e18dac9d9cbbdc11e9761eb947a0f7d03c5d89ec205e4d
diff --git a/dev-python/anthemav/anthemav-1.1.10.ebuild b/dev-python/anthemav/anthemav-1.1.10.ebuild
index c6af80c4e..e74f2a254 100644
--- a/dev-python/anthemav/anthemav-1.1.10.ebuild
+++ b/dev-python/anthemav/anthemav-1.1.10.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI="7"
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/anthemav/anthemav-1.1.9.ebuild b/dev-python/anthemav/anthemav-1.1.9.ebuild
deleted file mode 100644
index 49c58fac6..000000000
--- a/dev-python/anthemav/anthemav-1.1.9.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{5,6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python API for controlling Anthem Receivers"
-HOMEPAGE="https://github.com/nugget/python-anthemav https://pypi.org/project/anthemav/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/apns2/Manifest b/dev-python/apns2/Manifest
index f9114a72e..1fd87f580 100644
--- a/dev-python/apns2/Manifest
+++ b/dev-python/apns2/Manifest
@@ -1,5 +1,5 @@
 DIST apns2-0.3.0.tar.gz 8878 BLAKE2B 14bb9039d6526c57d31fb73888a63c2070e77a02ae39749dabc33ca760b51ba46af62f621362a8e002b8f6a6418c202675332d8af5232274c4de49fb3856ef1c SHA512 038db6e5de61ed9c8a5c8a97a74f49b9d4faaccf57ae89bcd90df2f1f279b170ac72ae29a65158d5328d2d63b3ad0990bf9f0776b11f6a6bba5d2d33ede9a15f
 DIST apns2-0.7.1.tar.gz 11052 BLAKE2B 784a144444a07abc9e05c7f507f5a944a6ce08d8ed031c6e1c6243e413e19644ca743d5d25f7b001789f3b33975e9e98d72512a55a4ffae4917442cb92618783 SHA512 4d03aef72651d83ce4cf64653a8e52da9a4c1c12a2feebe47d61920917949a84cb8c6041ddcde9baeb63deb61ac8dfdb9ca34cb382c58576f2351cbaf7df1fc7
-EBUILD apns2-0.3.0.ebuild 837 BLAKE2B 6098c78d92101474bae6ddadf49d261fc74104ce7aec81824d40182421081a6ab1227538e930a4ad28634eb564e33b1524878f7e60904bf27acd84141141ea22 SHA512 e0efa524069eaa8ff895181a019b25fd9d1ca0294542ffb3b7c106d67330bee6c785235edb71c035654f7c67d76575b323e16c492c48f257e6386b7864ea95ea
-EBUILD apns2-0.7.1.ebuild 846 BLAKE2B 614966f105bb6eb849794b925fd55abfbcf13a5324d4d339f48c8369d84cbb03a6e089388c7a7aea3eff5b2b275cc659f46c9969ac60c7024723bd8eafb99519 SHA512 f2bb74559ec43b2bf8c7ba39a2376bc72b32868d1b7e4ff23584288e41dce0617c5918c83e052c5a8a756121bfc355c378045d7e8869e801d31f0930e5c17489
+EBUILD apns2-0.3.0.ebuild 838 BLAKE2B ac84c410bc2e08b48ee93ee70005a75d356dd0578f7d363e01a2dc76084bc85d378a544d57cbf877dcd5db33036ff9c6439d860b04249ff692ee3627b22f5cd5 SHA512 8a8d20dd228784091f82301a8b2c66b475c941768e4beafaa4cae7a173a1d9e9be5fdd99faf8b33bdd78c97a0dcb4be8bfdebe75645a90cc00418736b3cb6318
+EBUILD apns2-0.7.1.ebuild 845 BLAKE2B cf39e9b49a2e28b099129c85404cf9122f6683e9b26c0767f9aed3732138c0403b5c2b545a51cb298510c5d60a7f3a7a46c01a9b0970df71aeba2d7f7d1ea717 SHA512 61c4fb6b55969ed7b5b709035a70e5d681a39a64715d034d1d635976970c6ed44098ba2ec43d6d76de8ae54af8015832676bd699efc91bbcbba006f5efeaa229
 MISC metadata.xml 444 BLAKE2B 88b0fdcbcd0b37a17eb983bcbed7c3efc999c1243b56c9eca29ef8e61353afa5ba85b7b432c13e40777601a1f79100ca3cc82a8c0c3cafa4c89f589da65f9411 SHA512 218d3564a8a172f1b98d4fed1a06013fa6a192ba8be7ec1575b1ad379627f2439bbfe5d68d6c1f59ea3355c84205cd14170853fafbd0becfc0eb5bd973855baa
diff --git a/dev-python/apns2/apns2-0.3.0.ebuild b/dev-python/apns2/apns2-0.3.0.ebuild
index 675ef0b21..0e17249fc 100644
--- a/dev-python/apns2/apns2-0.3.0.ebuild
+++ b/dev-python/apns2/apns2-0.3.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/apns2/apns2-0.7.1.ebuild b/dev-python/apns2/apns2-0.7.1.ebuild
index 60da463f1..61b623fbd 100644
--- a/dev-python/apns2/apns2-0.7.1.ebuild
+++ b/dev-python/apns2/apns2-0.7.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/astroid/.DS_Store b/dev-python/astroid/.DS_Store
new file mode 100644
index 000000000..8332bca24
Binary files /dev/null and b/dev-python/astroid/.DS_Store differ
diff --git a/dev-python/astroid/Manifest b/dev-python/astroid/Manifest
index a33249abe..c904d69ff 100644
--- a/dev-python/astroid/Manifest
+++ b/dev-python/astroid/Manifest
@@ -1,10 +1,6 @@
 AUX astroid-2.1.0-no-pytest-runner.patch 474 BLAKE2B fde7f34aa9e1feefb29bf0a993bdd451523ccfa30bcd8726d36c4b159d849536445599f8f794e6cac71e71ff6b68e8cd3af4d3d5ad1ecdf9936977ec92e29536 SHA512 9c8ff2d8b2ae67620fe38d9f454c77216c2291a7f2aa59d9c78abd5a76f72aabd8154b12055aacbbabdc10fc466f57e09ed5527f796df8e6a5a15bfefaa4f0f0
-DIST astroid-2.3.1.tar.gz 297020 BLAKE2B f94a72ee0037a8675a1a4f7bb5ffd038e9acd430292ebe4041d8f484f3c1ac1ec61ce2dcf131351fed1e3e0057986aa970ae1fdf3f3684af650a68d67821a1e0 SHA512 771c68013c791a2e55a40f4463148a6e317583d55397b8bb57d74cb27869f5a188b2a54258010ee441567a461aaa6d62f0ef0266543b64bb4104bbe15e0951f8
-DIST astroid-2.3.2.tar.gz 297318 BLAKE2B 2bb0f834a6f85db93bf315a72a44e1e732633698e204300d915e1393d47bb2bfb435c6a813974f9a2b4e24dc24b364d3edf3147669d9d4f7a70d9f138095fd9f SHA512 e97881971c3302ab12bf98f36d39764ee0412df277e63900d76e4d8f741c3fad70b67cb404121236591d03d7605c83ed65d0cde257c9970fa560c549eb4cd604
 DIST astroid-2.3.3.tar.gz 297350 BLAKE2B 7ac5cf028fa0263998271d23128b1bfd127fedafab2f6b3cc465867b9668942e1edc79bed62eb34bcce31b6892e4c5a31dbdd68d20fb92a1f134dc9e78a76920 SHA512 72011f3eb312ea7ce7dd55f7615972f6bfc152d8f16f9052b405f44fe17e594d5da22e0502b4c3034881b9783be9e808509d4ded3d679182ddf6d34eb90748f1
 DIST astroid-2.5.5.tar.gz 344997 BLAKE2B 9ab06834ac05557c095efaaf348772d5d523cb5f0fc79f369319d7b15a92a6737d8464ad8a331474737bab9453519cb779dbb1bb5bbe6ab2ee8bb9a0af269c47 SHA512 ffaa6b156c6bdb3399581388bdb4d058e0182b42051c83752d2f93fdf6aafe28e26bd085d272c9ae2907978ba22a94713e959df70b891f772ffe7f891a1f0dd3
-EBUILD astroid-2.3.1.ebuild 1281 BLAKE2B 860ebf2714ea410fb254a3c9b81ed51d7682ad5c78c4de6f5f2aa3ee43c2640f8236874db9c1ed83fa957fd49ff6b8421745603eed09ef922d067b2768c7f545 SHA512 fe8e0653e7c3eef428a08b3eb24f2789cd76c3a1978525a9e3aebcb50c8356798e8b05a62ebcbb182f707bb2eebfbe9ee1e339a069dec4c8146e820334c09f4c
-EBUILD astroid-2.3.2.ebuild 1281 BLAKE2B 860ebf2714ea410fb254a3c9b81ed51d7682ad5c78c4de6f5f2aa3ee43c2640f8236874db9c1ed83fa957fd49ff6b8421745603eed09ef922d067b2768c7f545 SHA512 fe8e0653e7c3eef428a08b3eb24f2789cd76c3a1978525a9e3aebcb50c8356798e8b05a62ebcbb182f707bb2eebfbe9ee1e339a069dec4c8146e820334c09f4c
-EBUILD astroid-2.3.3.ebuild 1218 BLAKE2B eb9ea9932b47371378d7823e5b3a47870d56cd2e7647b2c1af3bfe1e47ebba07e7fd21b621b636db9d6edbae95c18635705c6002dffac69f1b0a24ac942ac170 SHA512 dec613789073d79c47f950eac4a6c68127ea27e9e2c1c0436b3bd3a1eaaa0e6c5ca9e2d67834b2d391b6db8678faae167d2bdc2d587b9fbd7b7046447f5099af
-EBUILD astroid-2.5.5.ebuild 1198 BLAKE2B 8a6555fcbb19261889ec9ebb482d800b001b9d916ed1001a5371225026c063440897decb2cdb51de77a5ffdbc84617572166c6e7021b8d54b23ef10148e52f0e SHA512 2d412f46f147d714719c7501cb04d4bc72bf1feb0f49a22af4cce003e8ca13efe0eb3e4f2e624ad4ffbdd113e64710c8eb7d0aa70916e56f059c1d8c909b5c1b
+EBUILD astroid-2.3.3.ebuild 1217 BLAKE2B 591354c1a38979fc6d2ee708195c8066fb13aa400715a53754c0b84ab737d11050d60719237d1aef143430f56d43badf41a2e4bbd1cc52bd8b4d9d23385ccffe SHA512 fec9642ce53ac9f58d215dc212c12b620e890b0d7771952ec7b02df201b13ca4b81e4487790fc96ab8171899d6d599044841fe86370b651f1d2888617fc2ce07
+EBUILD astroid-2.5.5.ebuild 1198 BLAKE2B e0b4755548a6fc6a120b775a57ba68fd307abb28a3142d47b0e16116e6f72a4e83a7f2a48c35a5e851b9f2701c0676ebe03cb92acdc008b1db39802ef730cb0d SHA512 cd2fd4cbeaed2d359423dc7fde1bf17dbfe48e09d4b9dc8368260854caae40ba91449310b829ef749a9d31a7ba94209325777742b52f45301010184c36a92cb4
 MISC metadata.xml 1122 BLAKE2B 29f5f5eb980aa5e9035316854d7b69a803bf8507cd8f2b97880ef3a0be3e200936ddc3679e480741cf82203b704cd6c7b1610d31e9173dc3f8b97ebec6a6c844 SHA512 34a45382d84c03057ba59b40905138c2e048da4d602e5a26dab4b156c1a3697369e11ef66f451f3f823ec827f3771eb58c077c056f9609e5b55a27841fd5bf9d
diff --git a/dev-python/astroid/astroid-2.3.1.ebuild b/dev-python/astroid/astroid-2.3.1.ebuild
deleted file mode 100644
index 3f77b8cf5..000000000
--- a/dev-python/astroid/astroid-2.3.1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{5,6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Abstract Syntax Tree for logilab packages"
-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"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-# Version specified in __pkginfo__.py.
-RDEPEND="
-	dev-python/lazy-object-proxy[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/wrapt[${PYTHON_USEDEP}]
-	>=dev-python/typed-ast-1.3.0[${PYTHON_USEDEP}]"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		${RDEPEND}
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/python-dateutil[${PYTHON_USEDEP}]
-	)"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2.1.0-no-pytest-runner.patch"
-)
-
-python_prepare_all() {
-	# Disable failing tests
-
-	# no idea why this test fails
-	sed -i -e "s/test_knownValues_get_builtin_module_part/_&/" \
-		astroid/tests/unittest_modutils.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	${EPYTHON} -m pytest -v --pyarg astroid/tests || die "tests failed"
-}
diff --git a/dev-python/astroid/astroid-2.3.2.ebuild b/dev-python/astroid/astroid-2.3.2.ebuild
deleted file mode 100644
index 3f77b8cf5..000000000
--- a/dev-python/astroid/astroid-2.3.2.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{5,6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Abstract Syntax Tree for logilab packages"
-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"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-# Version specified in __pkginfo__.py.
-RDEPEND="
-	dev-python/lazy-object-proxy[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/wrapt[${PYTHON_USEDEP}]
-	>=dev-python/typed-ast-1.3.0[${PYTHON_USEDEP}]"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		${RDEPEND}
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/python-dateutil[${PYTHON_USEDEP}]
-	)"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2.1.0-no-pytest-runner.patch"
-)
-
-python_prepare_all() {
-	# Disable failing tests
-
-	# no idea why this test fails
-	sed -i -e "s/test_knownValues_get_builtin_module_part/_&/" \
-		astroid/tests/unittest_modutils.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	${EPYTHON} -m pytest -v --pyarg astroid/tests || die "tests failed"
-}
diff --git a/dev-python/astroid/astroid-2.3.3.ebuild b/dev-python/astroid/astroid-2.3.3.ebuild
index c1e57a71f..a7367bb17 100644
--- a/dev-python/astroid/astroid-2.3.3.ebuild
+++ b/dev-python/astroid/astroid-2.3.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/astroid/astroid-2.5.5.ebuild b/dev-python/astroid/astroid-2.5.5.ebuild
index a1a4c659c..09f26a6a8 100644
--- a/dev-python/astroid/astroid-2.5.5.ebuild
+++ b/dev-python/astroid/astroid-2.5.5.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/attrs/Manifest b/dev-python/attrs/Manifest
index 54b92c54c..88c7c5ef9 100644
--- a/dev-python/attrs/Manifest
+++ b/dev-python/attrs/Manifest
@@ -1,10 +1,3 @@
-DIST attrs-18.2.0.tar.gz 116817 BLAKE2B 79d50c9b49956bbc1e04084eed36a5f65f2dda8e954b23f15650cb881d6f77a8325e042c6d1a77dcad43661d4524a4d253d96bd0053464ef03091779636e6d0b SHA512 58c26579d6dfcacbe9e3f770a125861e0625d435f1293eebe0d62efc9b8aa9572be2b312d73037a647163bffb0a13b240fb157aff7ed35196f637ae945d61d22
-DIST attrs-19.1.0.tar.gz 124220 BLAKE2B a7a8321857c2723398db3b7943f221cc141f2d365b84d3f77ccd16c9180fb1d73402c7a1018d70b666bf76b6021bd90df14d792886c1345752b8fc810ac54a35 SHA512 22ee45e8b10a7abe10e720788c5cfab424d0bfe70e595dfb116928b8ebea497a747e8234d96549da00f0967de750fb943db0cd3669354253a27be2ca30fe413a
-DIST attrs-19.2.0.tar.gz 134333 BLAKE2B ce1e57daa5c1e778c8fb74005e78f362ed0723d89581cd22eb1be159f683aa21ff2f3dc7d7d2ffca48e10548075c1c5775dfcec392a8aba71edc3a7a633d0348 SHA512 c6239f5553d99f324a36193d9f6e684fdce26efcf4da866d1b995cd644909ec4b58ac6ef6c20a0fda4b8a16d00ec0aacfd3970a52b68997fd10804d5286b41c6
 DIST attrs-19.3.0.tar.gz 132477 BLAKE2B 6577f39fc15c9e70f0f76ba358099e83c57e226574cb11dbe83747f12e285a284e9d1a218fc1670e0d08be550d42c67cde132604b2cf385d1ee25bda7e57e79a SHA512 b5b641e6732156d1454ed6c49e3a6b29200a8d3f1515fb59aeb85fcb5e9ab6a1d760904de45083cae5250e7bf1a7aa2c1f3ede217240a63f989ae4bb484f2511
-EBUILD attrs-18.2.0.ebuild 806 BLAKE2B 75910b9654b87dab5e9ab35e223e90c02e9193e5efd859b874b93e4f745706d4807535f76c431b62e058930920ad4e90f259c0e25b7a790ddfe0ecb3577e9297 SHA512 1ed15b5cd27492b66e12a6957236bd6390bae1b8c05a032695d5cde4dd418822be8e9fa3ae123dfb2b8ef3166311db291e442f5620e7615c633763603bfa0b14
-EBUILD attrs-19.1.0.ebuild 806 BLAKE2B 75910b9654b87dab5e9ab35e223e90c02e9193e5efd859b874b93e4f745706d4807535f76c431b62e058930920ad4e90f259c0e25b7a790ddfe0ecb3577e9297 SHA512 1ed15b5cd27492b66e12a6957236bd6390bae1b8c05a032695d5cde4dd418822be8e9fa3ae123dfb2b8ef3166311db291e442f5620e7615c633763603bfa0b14
-EBUILD attrs-19.2.0-r1.ebuild 781 BLAKE2B 739f9aee87bfc0a4abaadd0774684ff620a825b335c3ad12d8bc174d66f33d516b1e3b4fbe063def7ea0623c1d1407065b295de35dd8f16dfaa2ff25835992e9 SHA512 2344fd14c29b205d42b5b31d14e9c8c759ef5e82998033bc94475ae00fc9c002cd2e1cc5363fbe45214725f2d67098da6b6711675012d39cf765ac92d7044b1d
-EBUILD attrs-19.2.0.ebuild 781 BLAKE2B 7623dde41995a5611147a4310d96e38f837354034fa168785879534b8715582ffebc6dd2c4819037f4fd1a3aa105e2a2cc9f1aaac6468a5aa19dafad719590ce SHA512 f0bd467506e3ec83e2560112e53a3c25e6d206f4a6edbfcc6531397db584c2a4a3ef2d446f2b50e728e4cc4b61c3d74955077c77815f56c12be8a1e41d7eacf3
-EBUILD attrs-19.3.0.ebuild 782 BLAKE2B 5a40c604efc3199508456b57d13826905c12d8a8ac8079302b67f4cb0ec8b18b6a685b69951fa26d6031e3b84d95234ec19cab56b2c93db5a332b86d897e7540 SHA512 2a6ecc35e376ce749dcfd46d9bfb52e02ec107007c96285ecfd909c6634c6a391605a45b6e3d4bc665c9f6edc4df9cc56b692a146d72e41184b8684221638fcb
+EBUILD attrs-19.3.0.ebuild 781 BLAKE2B 4bb9a8a835f74e0917625e5af254e361435e238495834760c9e27c610c35cf826fc7aafc827fd872b91123b09f212d46616d4e0f368932833eba8a96f26d616f SHA512 5645f512c4737deac504bd9b9808b76323ce2a51b389d693605e5571448532778b869950379c8199f1c9d460e24179421a055f5f7aeeb0e67e25fcd4c085d635
 MISC metadata.xml 252 BLAKE2B 507e0ddc9d50b879ff374b903b142f85d020dfd6c486aba2af84fe082c878e780edbb79188ae10104d57db0eb775c86814cc8c06891a3854c9da840a4d377050 SHA512 9470ac9c8a5a4f80e3f767e7aa198addc7b21866c63b2a310e9f41ce65817672fb77423117bdd619e99cb62322025aeadf50717e23eafabf99080fcc106820af
diff --git a/dev-python/attrs/attrs-18.2.0.ebuild b/dev-python/attrs/attrs-18.2.0.ebuild
deleted file mode 100644
index cb58ae649..000000000
--- a/dev-python/attrs/attrs-18.2.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} pypy{,3} )
-
-inherit distutils-r1
-
-DESCRIPTION="Attributes without boilerplate"
-HOMEPAGE="
-	https://github.com/hynek/attrs
-	https://attrs.readthedocs.org/
-	https://pypi.org/project/attrs/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND="
-	dev-python/zope-interface[${PYTHON_USEDEP}]"
-
-DEPEND="
-	${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		$(python_gen_impl_dep sqlite)
-		>=dev-python/hypothesis-3.6.0[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	py.test -v || die "tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/attrs/attrs-19.1.0.ebuild b/dev-python/attrs/attrs-19.1.0.ebuild
deleted file mode 100644
index cb58ae649..000000000
--- a/dev-python/attrs/attrs-19.1.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} pypy{,3} )
-
-inherit distutils-r1
-
-DESCRIPTION="Attributes without boilerplate"
-HOMEPAGE="
-	https://github.com/hynek/attrs
-	https://attrs.readthedocs.org/
-	https://pypi.org/project/attrs/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND="
-	dev-python/zope-interface[${PYTHON_USEDEP}]"
-
-DEPEND="
-	${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		$(python_gen_impl_dep sqlite)
-		>=dev-python/hypothesis-3.6.0[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	py.test -v || die "tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/attrs/attrs-19.2.0-r1.ebuild b/dev-python/attrs/attrs-19.2.0-r1.ebuild
deleted file mode 100644
index bcd89a23a..000000000
--- a/dev-python/attrs/attrs-19.2.0-r1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Attributes without boilerplate"
-HOMEPAGE="https://github.com/hynek/attrs https://attrs.readthedocs.org/ https://pypi.org/project/attrs/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND="
-	dev-python/zope-interface[${PYTHON_USEDEP}]"
-
-DEPEND="
-	${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		$(python_gen_impl_dep sqlite)
-		>=dev-python/hypothesis-3.6.0[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	py.test -v || die "tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/attrs/attrs-19.2.0.ebuild b/dev-python/attrs/attrs-19.2.0.ebuild
deleted file mode 100644
index 475ab3315..000000000
--- a/dev-python/attrs/attrs-19.2.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{5,6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Attributes without boilerplate"
-HOMEPAGE="https://github.com/hynek/attrs https://attrs.readthedocs.org/ https://pypi.org/project/attrs/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND="
-	dev-python/zope-interface[${PYTHON_USEDEP}]"
-
-DEPEND="
-	${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		$(python_gen_impl_dep sqlite)
-		>=dev-python/hypothesis-3.6.0[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	py.test -v || die "tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/attrs/attrs-19.3.0.ebuild b/dev-python/attrs/attrs-19.3.0.ebuild
index 689187fc9..52b3dda40 100644
--- a/dev-python/attrs/attrs-19.3.0.ebuild
+++ b/dev-python/attrs/attrs-19.3.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI="7"
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/avea/Manifest b/dev-python/avea/Manifest
index 63aeadcea..1a111507a 100644
--- a/dev-python/avea/Manifest
+++ b/dev-python/avea/Manifest
@@ -1,9 +1,3 @@
-DIST avea-1.2.8.tar.gz 8398 BLAKE2B b29759972a2c771728526a78dfb749af0a907361e608b53b12d4528257734eb9879c3ebebdf1817e7874fba61cf4393a8051d8bcf431c16f9266d43c3f53c9aa SHA512 fd7afbc114fa5fabaa1e7aa915429812121d4730a7e2f293e25a044feb332baebcf829bb1d5ba4a9d4227965b7a1e8b11b124b78db67545cb536080471d2022d
-DIST avea-1.4.tar.gz 9399 BLAKE2B 4125ca5adc7e45c4fc7780e85e8e9a0bf86deee78c3a9d30c3e5685ba76414910bfbf6fddfa2d2f72c0220ef5ee698cdffdbc3851b8df63552848c48d86f888f SHA512 4810f6a24516797924242172fd3d143df7494f21f5a4a6c6723040d0dc9469a8e5f2977b71681f77a608492129afec1eb43164797c2b526e7323280242a4f0ce
 DIST avea-1.5.1.tar.gz 11437 BLAKE2B 6355fe9eb6f0f144de802563719266a40369c7841d91e44695dbde40a6e439dddc695d8f40599eb805709f850bcddef0ac6ef2e0ce53449f0ef645e6b8aa4cf0 SHA512 595bf700e79516c7890bb38dd2d158697260c0aaac98a64ac5743509e981a487ed6df8682a4ef13ebe18d3b331909a62f9cb99b8fb9d89e7a1dced905ec136f3
-DIST avea-1.5.tar.gz 11375 BLAKE2B dadbbeda6dd8d51de900018e333dee5e92722276fa1e81ef4e768a274dd93f8c88a9844adb640fb6fc7419e8efea18c5cb01390d8666e8255381465a33bbfcd5 SHA512 c7ce7797f3b517d4052dd485925b197b3127cc9f7f9bd48694b0daaf10e13092876bbdbf9d62a6346e33585387b6579a5ec6df5af4e2d1277b08ac018177239c
-EBUILD avea-1.2.8.ebuild 671 BLAKE2B 318a8e283a746a50d1196c2e28a22e41b16fca0e8fba7dfc0c7c48d06b289078bee2debbe500b8ad6003c9b11aac16b9338e16bb1ef42578260d21a8d875fd3d SHA512 1c0d3106f9c5d7909f8c896c60984040493ff6b29776a77c0a57fdbd9db077570feb334a0918b3a521d624f531cf43595645c2a84e89758d24b372f46e63cf92
-EBUILD avea-1.4.ebuild 678 BLAKE2B bea198b8f6751c7bb74555d16cb2b29ed00a108960d544da537e079fe0a57ea7dc8aa0dc820e285e8318f190f68f3918128d427ac7252bec382c306f0e4b2823 SHA512 c2b854a743a8785b76d86b42ffb72cdd648dd240f33807cc7f566b1b8e84ea344c50fd57db467da038de4ca644a0a28fd4a320feb1b19eba2802d78d28d00aa7
-EBUILD avea-1.5.1.ebuild 721 BLAKE2B b039fd97218a38974770d13dd749ebb519a96f34ec9ee2d147168c20eb38c23589e18a9240d21867a43fbfacab7dc9a4fe47a1a8b111b4f9e2093ba5044386be SHA512 94eb3164de92d67c695bb5e6cbc9d9b652c7b66a63937d25336ad8b078c1a13c41569e9fc15f5b8b20166e01f2fbdf221669b87376f6d7318b8c6a16186357cb
-EBUILD avea-1.5.ebuild 679 BLAKE2B 2de4ffc0bb62e090f09fdb2b5360390ff0015a042d775cc74e4bb8b1681f9cf5fc2df821fba2b9b6ea51c373de7e0f40a47edfbb48f4cb4798db8ab74726c400 SHA512 dbb300a7a912b9ee90c0cd0ced04dbc8b8a681152f695502fd29c8768a3f87e6230de38d19822631905a8d489e51447b5d9b77ab5867b055da0775cf2673e2cd
+EBUILD avea-1.5.1.ebuild 721 BLAKE2B ece88aaad69853d020512c9d39ab49f9bca78837e638c7c59467c4e0dec2ec938e21c409135974bdf06e53736e4c4d699c7e1de1c382275d3480022b59490009 SHA512 9a0c6046760280b59d911fa262112dcbca089d2cf7824cd47b3fcf3611a954a5350086151bd5a4876e4821d1b617e9ce103b09c581e3d686019d1aa7cd0435b4
 MISC metadata.xml 323 BLAKE2B f693fff1be9cc0290876d0cda4a06f8c51ddeb3f6b96ccfa0f5ca5ab2fe4ba1d1f0ce6617f8177ef0cad49b75ec466d726aabb29a3265c5fbf0e596a42239e3c SHA512 7bd5255d222c05a518d89600c1613bd46b5812a79bfa41d6482732fc4f74d037f057363dac8d7904cf5f6529f02ec3ea3dc16c7cac27c3b29ea13b77cf0d9705
diff --git a/dev-python/avea/avea-1.2.8.ebuild b/dev-python/avea/avea-1.2.8.ebuild
deleted file mode 100644
index 09f902e44..000000000
--- a/dev-python/avea/avea-1.2.8.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{5,6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Control an Elgato Avea bulb using python"
-HOMEPAGE="https://github.com/k0rventen/avea https://pypi.org/project/avea/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/avea/avea-1.4.ebuild b/dev-python/avea/avea-1.4.ebuild
deleted file mode 100644
index 3d1462597..000000000
--- a/dev-python/avea/avea-1.4.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit distutils-r1
-
-DESCRIPTION="Control an Elgato Avea bulb using python"
-HOMEPAGE="https://github.com/k0rventen/avea https://pypi.org/project/avea/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/avea/avea-1.5.1.ebuild b/dev-python/avea/avea-1.5.1.ebuild
index 869f7808d..67edbac19 100644
--- a/dev-python/avea/avea-1.5.1.ebuild
+++ b/dev-python/avea/avea-1.5.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{6..9} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/avea/avea-1.5.ebuild b/dev-python/avea/avea-1.5.ebuild
deleted file mode 100644
index b90fecd7a..000000000
--- a/dev-python/avea/avea-1.5.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{6..8} )
-
-inherit distutils-r1
-
-DESCRIPTION="Control an Elgato Avea bulb using python3"
-HOMEPAGE="https://github.com/k0rventen/avea https://pypi.org/project/avea/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=""
-BDEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/bcrypt/Manifest b/dev-python/bcrypt/Manifest
index fd9af490d..de96a9388 100644
--- a/dev-python/bcrypt/Manifest
+++ b/dev-python/bcrypt/Manifest
@@ -1,8 +1,3 @@
-DIST bcrypt-3.1.5.tar.gz 42160 BLAKE2B b113369c0d7a7a115c7246193140b0b6c8419a9cb9c1274ae610a95db4cdfbb58e5b085951135eb4394d1e52cc09edd68a2b9cfa4a733d731fdcbf87a9e67ca4 SHA512 321aafe2e532a1cf068cfdd8ccf8785c96a7106b7aa7c44ad58290a0ff3b25f2f23bdd7abde5b3f102d99b9c7335da92f03b2999bcba5ad1ff7ed33e2f836144
-DIST bcrypt-3.1.6.tar.gz 42216 BLAKE2B 280e2d01d3d5195fe7d32426b9e9bb7b4544dd1c0027a9d1b4be287e21759efcb274cb3f943a913891fd63183f0525f7f301b6d76055a37240a7594240bbff33 SHA512 fcd4f3ec27ee27b4523c9f9b796e9c279895ad66d124fdabaee61b3fb27351b2e8721deb97e7bfc4f07ac4cfad6c2948d467cf21faba2af656ab0030c842244e
 DIST bcrypt-3.1.7.tar.gz 42512 BLAKE2B 5e762f153a5a69c1426748737956fd370e74fcd02e82b5a634e74dbb50fc9e894bdadb4e87eb9cdc580d0853f73ef348d9523ceaf4236df565e39b714bbd1c60 SHA512 bb9a431c8de97d5615d1a7fb67f868d08d839313fd5f3e17d8db40db1870f8b624594352c24c163c6a03485217de873cd92578040350678888728885c7b749de
-EBUILD bcrypt-3.1.5.ebuild 862 BLAKE2B 6bdae6786572ca5b653165c5056420739bb3b82c8e98d6c0fc358a516ef7738038c03f07a6e625af98e810cf9862128f34eea7622b9a7955865f80d80ed3d173 SHA512 4d4702bf8b49825e3e3896c525f5410b74ea54c247b7f7f0e50822a3e73e6ed11ef592d1f95d2216f2a4824cebccd39b2f2c8f31c9ea36aa4773ac5e51c93d0a
-EBUILD bcrypt-3.1.6.ebuild 862 BLAKE2B 6bdae6786572ca5b653165c5056420739bb3b82c8e98d6c0fc358a516ef7738038c03f07a6e625af98e810cf9862128f34eea7622b9a7955865f80d80ed3d173 SHA512 4d4702bf8b49825e3e3896c525f5410b74ea54c247b7f7f0e50822a3e73e6ed11ef592d1f95d2216f2a4824cebccd39b2f2c8f31c9ea36aa4773ac5e51c93d0a
-EBUILD bcrypt-3.1.7-r1.ebuild 860 BLAKE2B 89a4f71ca797cf5dba7a45b9169aabe13c5c82e24a4d08c2b2312faa2e5954bbd92d41f8c895169d2cb280f1b2f91b17c4593384df2ef4b36e935a48bd433ccf SHA512 8263db2b427d83498ef54d7ab225dd4fd34a42c7a5eb622db29cf366124ba6a92a0b12aacf677740960b8fa3b9aecc2b9d7f7e2413df08d1096e17b3c40f6026
-EBUILD bcrypt-3.1.7.ebuild 862 BLAKE2B 6bdae6786572ca5b653165c5056420739bb3b82c8e98d6c0fc358a516ef7738038c03f07a6e625af98e810cf9862128f34eea7622b9a7955865f80d80ed3d173 SHA512 4d4702bf8b49825e3e3896c525f5410b74ea54c247b7f7f0e50822a3e73e6ed11ef592d1f95d2216f2a4824cebccd39b2f2c8f31c9ea36aa4773ac5e51c93d0a
+EBUILD bcrypt-3.1.7-r1.ebuild 859 BLAKE2B 34db40f6a33a3be5124b988e44836e8b0b8838f1b252f81a49fa76b6f275a7447bb85bde7a8aedb81921eb33994149fe373bd1ecac71ae2f4af21f69841e894c SHA512 3d3339bf29934f711b98d78f402337b626fdf28fdda753a7bc860072b1eff3c367c63884ad5ad126b0839493ee4c98b3f6d62447c4263b407359cf51a6c6c6b5
 MISC metadata.xml 378 BLAKE2B 9717a17aea69af094e7c7ee3b835a1205bc4309ba6e9422c939f48343902d49417d15e6e8de3e3ef8de14b5d9a709e2a4b4b9acfb3465d64a0dc5795da8d94ab SHA512 d4c928de2b929f7bf274b8ac4cd3b69875a54ec58f11f20e2d2286b01b0f517788ccc6e67a75833aca4972e66ddc96176bf3be085fa49e13fc355aeb11d30110
diff --git a/dev-python/bcrypt/bcrypt-3.1.5.ebuild b/dev-python/bcrypt/bcrypt-3.1.5.ebuild
deleted file mode 100644
index 81d143b7c..000000000
--- a/dev-python/bcrypt/bcrypt-3.1.5.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
-
-inherit distutils-r1
-
-DESCRIPTION="Modern password hashing for software and servers"
-HOMEPAGE="https://github.com/pyca/bcrypt/ https://pypi.org/project/bcrypt/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="Apache-2.0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-COMMON_DEPEND="
-	$(python_gen_cond_dep '>=dev-python/cffi-1.1:=[${PYTHON_USEDEP}]' 'python*')
-	$(python_gen_cond_dep '>=virtual/pypy-2.6.0' pypy )
-	>=dev-python/six-1.4.1[${PYTHON_USEDEP}]
-"
-DEPEND="${COMMON_DEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( >=dev-python/pytest-3.2.1[${PYTHON_USEDEP}] )
-"
-RDEPEND="${COMMON_DEPEND}
-	!dev-python/py-bcrypt"
-
-python_test() {
-	esetup.py test
-}
diff --git a/dev-python/bcrypt/bcrypt-3.1.6.ebuild b/dev-python/bcrypt/bcrypt-3.1.6.ebuild
deleted file mode 100644
index 81d143b7c..000000000
--- a/dev-python/bcrypt/bcrypt-3.1.6.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
-
-inherit distutils-r1
-
-DESCRIPTION="Modern password hashing for software and servers"
-HOMEPAGE="https://github.com/pyca/bcrypt/ https://pypi.org/project/bcrypt/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="Apache-2.0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-COMMON_DEPEND="
-	$(python_gen_cond_dep '>=dev-python/cffi-1.1:=[${PYTHON_USEDEP}]' 'python*')
-	$(python_gen_cond_dep '>=virtual/pypy-2.6.0' pypy )
-	>=dev-python/six-1.4.1[${PYTHON_USEDEP}]
-"
-DEPEND="${COMMON_DEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( >=dev-python/pytest-3.2.1[${PYTHON_USEDEP}] )
-"
-RDEPEND="${COMMON_DEPEND}
-	!dev-python/py-bcrypt"
-
-python_test() {
-	esetup.py test
-}
diff --git a/dev-python/bcrypt/bcrypt-3.1.7-r1.ebuild b/dev-python/bcrypt/bcrypt-3.1.7-r1.ebuild
index 6f9370cb5..b8c2442b8 100644
--- a/dev-python/bcrypt/bcrypt-3.1.7-r1.ebuild
+++ b/dev-python/bcrypt/bcrypt-3.1.7-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI="7"
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/bcrypt/bcrypt-3.1.7.ebuild b/dev-python/bcrypt/bcrypt-3.1.7.ebuild
deleted file mode 100644
index 81d143b7c..000000000
--- a/dev-python/bcrypt/bcrypt-3.1.7.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
-
-inherit distutils-r1
-
-DESCRIPTION="Modern password hashing for software and servers"
-HOMEPAGE="https://github.com/pyca/bcrypt/ https://pypi.org/project/bcrypt/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="Apache-2.0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-COMMON_DEPEND="
-	$(python_gen_cond_dep '>=dev-python/cffi-1.1:=[${PYTHON_USEDEP}]' 'python*')
-	$(python_gen_cond_dep '>=virtual/pypy-2.6.0' pypy )
-	>=dev-python/six-1.4.1[${PYTHON_USEDEP}]
-"
-DEPEND="${COMMON_DEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( >=dev-python/pytest-3.2.1[${PYTHON_USEDEP}] )
-"
-RDEPEND="${COMMON_DEPEND}
-	!dev-python/py-bcrypt"
-
-python_test() {
-	esetup.py test
-}
diff --git a/dev-python/beacontools/Manifest b/dev-python/beacontools/Manifest
index cebb0ff4c..8a0287b6f 100644
--- a/dev-python/beacontools/Manifest
+++ b/dev-python/beacontools/Manifest
@@ -1,5 +1,3 @@
-DIST beacontools-1.2.3.tar.gz 13435 BLAKE2B 527c5fa4db215853b8cf60c0f0119d202e10879217b83571e864e1e2222aac33602bb8674c4b5e85fa2d251dd95137bdd637f2e889525059f0e4f2695cb909de SHA512 98db16dec8b0f8f06637d8f946b7d9bfcfabc40dee5bc2f29de68de0b5d6fae3f1f1e7dbf00751c38958318ce1bce075b125c340d11093f43b84aed72c8a1580
 DIST beacontools-1.3.1.tar.gz 18578 BLAKE2B 433b671e4daab3e8b3786cc1c884de61ecd0b6faf17d45fc56f48e7c845c9bffebf2bc0371b67c12f26a1eeb7746831f403ed6449c4266657af262c50c180d36 SHA512 b5482d72a6a5100c28bc7be8f3404c0a05ff0e0eca03cd5452d1b997a12f17fd736e1b8d1753a7a9739b1ff9761ff9318d26770981980a891599364a0cb8c344
-EBUILD beacontools-1.2.3.ebuild 805 BLAKE2B 84a72d49d3fa783cd27ae2e060d51962706aadc51ba3520d19b2aa6ef24f243ad8a2ffa37864095a015b1c3339cc6a5235aaf37f1dc2248b5e729da3131cd4fb SHA512 8cb910f9cf3ca310c2751248164564be241e2bf121431d574de64d35a0b03154eaf1c0f4ad90260d187de38fd464a57eb87dbe0581cad5e40706c8828355bff6
-EBUILD beacontools-1.3.1.ebuild 814 BLAKE2B dd1e1e9963f5afa036c74b133aabbc531fac36821120022b9aa7649b4e8bb47759b0e3925ab3a4e70e1b7298ba680f3a8e950f93ebdb69146a9bd14dc7f43053 SHA512 feb85854a6b66157a8212224fbf488475f9ec9f3f86bf44d1b5ff8e9a4aae29b9fdecfdc241a373e0296b7879c8721ac91f5bb034ceb7553b2dab340a17be409
+EBUILD beacontools-1.3.1.ebuild 813 BLAKE2B 873a69cdc9d99b623a68cc8682af9d2d756790f89378caf28a910627026ab2a2c14019a62228dd87d52872c8c5ee16ba30bfb8adf68d83a850106834ea891c6f SHA512 76530aafdd74e204afc25bd02fb83a4a1f5050cc55eb3b0904d2146371ffbdf3ab8275c4a9ec1231039374e70311705eb16699ca59bd9d92c64e8bfd13b23b75
 MISC metadata.xml 451 BLAKE2B 1418544d88ec5899fb5ded7046b249eda77b77fdd6a665a60fe7783081adf699190854ef9443ee778c2318b74892f6dc1210caf4c7f32214abada4efe9a87fad SHA512 27fbd86edb5e36fadc3f25b2fc5108b17997d2c1d0b7e0d3372497350a9aa9bc44de059b805da5397322c7c31e255f6d142e8ffb04cb4c9aa7ca079b5ebb66c9
diff --git a/dev-python/beacontools/beacontools-1.2.3.ebuild b/dev-python/beacontools/beacontools-1.2.3.ebuild
deleted file mode 100644
index 1b98c91b4..000000000
--- a/dev-python/beacontools/beacontools-1.2.3.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="A Python library for working with various types of Bluetooth LE Beacons."
-HOMEPAGE="https://github.com/citruz/beacontools https://pypi.org/project/beacontools/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=">=dev-python/construct-2.8.16[${PYTHON_USEDEP}]
-	<dev-python/construct-2.10[${PYTHON_USEDEP}]"
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/beacontools/beacontools-1.3.1.ebuild b/dev-python/beacontools/beacontools-1.3.1.ebuild
index 1fc7ed112..604820dc2 100644
--- a/dev-python/beacontools/beacontools-1.3.1.ebuild
+++ b/dev-python/beacontools/beacontools-1.3.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/beautifulsoup/Manifest b/dev-python/beautifulsoup/Manifest
index 0f83a569d..16598b40d 100644
--- a/dev-python/beautifulsoup/Manifest
+++ b/dev-python/beautifulsoup/Manifest
@@ -1,15 +1,7 @@
-DIST beautifulsoup4-4.6.3.tar.gz 167469 BLAKE2B 0bc8f729298a2fd1e8f3cc8a7635587217f9a2e6e2c71709e99c40eedf1ebb4d76cd0d17ec36b99f3ee047193e4d44e31b8d2aa9864c43ce5db380fbdc083f76 SHA512 0cacae77843326ebee87d108b6706a7ca6943684bcccc62554d2ae5d77dfd181c97435ceca9d3e2e51962b024bbe52bc08d7f0dc516311aa87b3a1f87fb4ae23
-DIST beautifulsoup4-4.7.1.tar.gz 167065 BLAKE2B ceb67b281a9dc4212fcab03f8d50dcc6e1e8d59936b329c8ee492c7c50e322efb480c0d640f13a9fcc4e53220b7526581d532f9d3ba1d797c3e845f974facb3b SHA512 7aa77bc6008bbcbbbe91b0a850007ab237d2832b63a787fbd94b7cbf47d4276b185e0c61c134df73221406458edff2b75b6b8c2b53b543aa3bb1b0e2202dac5a
-DIST beautifulsoup4-4.8.0.tar.gz 170919 BLAKE2B 9aa1e04b437193d65f02c1d96f63cd8049ec447f430afcd8e42641c39126a5e22c88306a54042ad94c31cce6f0854076e414a9c0b3726d10299a32b63e122772 SHA512 00e157f8031dbb0e30e49158ca30f9e9207647dd3355edf23c2906b9d0c8b93250669edf5b20372e62546501a0cd2d7e87b793faf30bc122b5544f9358c1a4db
-DIST beautifulsoup4-4.8.1.tar.gz 159164 BLAKE2B 00121e9b30f700ade0bb2ec8f637b4173ecb4c187b8f9a77bcc4e6b333fced85a699c8d9efa5b757ab02f54c2b05740702c13625ff427730ccc1f6a97f43fa48 SHA512 7abc5e84cb8da5428dafc6b473418d0cc72b518cb1a73d4ae58b8dad3ec985e5778629dc1d7c8374dfb223be981983c745a1dbb55a98078b4cfe7ba5ce25539b
 DIST beautifulsoup4-4.8.2.tar.gz 298650 BLAKE2B 6826abf793efa63be89d844bc25bdb105413196bfab21c18f3816fd59a7a771459bf2c7ee209b75b0c88dfa14da8f4625c948889acfb48502e2260ccca229675 SHA512 aab90eb22614e9a2fb47792389a951b3ad7faf9791e15984a6c27a38be6f3d0ccbf3a9753d9afb5c70105097ac1a9c5f9e07206e12c6d4cb7a7f6d4e90ec18c2
 DIST beautifulsoup4-4.9.0.tar.gz 368809 BLAKE2B 1128e09c0f22c7b9b7ecfa6d808beeecd2570f1c8414278c3a8cef671450704ed3ac174613fb61e7c3c6dd96dc772ca71373ecdbebfbe4f68a8482006ae7ae2d SHA512 8c8d3c23f9e76955e465c6d343addb5165480f59d785755f6550aa3e77e8efe0c3dd4a2f310d485162dc046b05f797a8a6aee96a515d59659c820993e0ee37d7
 DIST beautifulsoup4-4.9.1.tar.gz 374759 BLAKE2B 43f5dc296bd0c4967036fcb70889f988c0dfc9d8713f8bbab423c9089e87960323392458b3abb9b2332acff286efbbb308a5c77058462c15f8dfe9056f0304c3 SHA512 a1fe9cbfe8616d2ff25cc836769ff02d51ed86b06ca9a37366867b145440b7f64b866346600ed74820f0407c8e70eaac3d58700766a99b5ff7433cb736a57b3c
-EBUILD beautifulsoup-4.6.3.ebuild 1187 BLAKE2B a22d8f4ec923d9583ef61fd036c6c8452bf86a145cb5366ddbd788e1a7b013f26317bb5ed8cf263231326e112af3353d87eb5ebf571cf1d8695f1cdea5350d65 SHA512 8e49d849b72190dc47a4647526666e0a8732200dab4f753362b8aefc56b6ff9a05283249067ce105923987b7245a8227c4bd792eac1d5ebc0f7fd10980765e41
-EBUILD beautifulsoup-4.7.1.ebuild 1175 BLAKE2B 0c16d7f1841067a44414a2b4229c371ce28aaaf22f0744c0df4ae02edbada6126c008fb4221df0cb5b47d909205303acad171c6907ad8c84c7a13e17cee9ca8b SHA512 eba5ed14ce9400d4e6902f44614e61187ebe81ddac02f3f362b361ba9a0c0265d67bb94756c7c886047eb16070d9a180eca4ab4957f6fae8a2fed7ec5e3916a1
-EBUILD beautifulsoup-4.8.0.ebuild 1175 BLAKE2B 0c16d7f1841067a44414a2b4229c371ce28aaaf22f0744c0df4ae02edbada6126c008fb4221df0cb5b47d909205303acad171c6907ad8c84c7a13e17cee9ca8b SHA512 eba5ed14ce9400d4e6902f44614e61187ebe81ddac02f3f362b361ba9a0c0265d67bb94756c7c886047eb16070d9a180eca4ab4957f6fae8a2fed7ec5e3916a1
-EBUILD beautifulsoup-4.8.1.ebuild 1177 BLAKE2B 1668677e038d08a6b20e76692048c84cd06ed8b69a61c12b465e7e728efdcf4a7d63e6b525f77615ad5d0a58b9b2e886bb30b3ed77f3859fb74b2c9c95b61ebc SHA512 8dae8b72cd2723ddec984e74372aa0f4c3bd40d2a2d44d8e83e4ffa7c6bf1b85956c74f8b3df135d7a839149ce351c657ce06d9a3b83b1799d8cc12a15e5e4eb
-EBUILD beautifulsoup-4.8.2.ebuild 1172 BLAKE2B 2da6d31596f275d7d70b80b2a9b5677f306e4028660ec8d78dd316b77386786d6b9ed9379d15dfca803c3ebe6c457808bd1c6adb773e08c7fe58ab5d974bc50e SHA512 11ee6f34dbc75c922398e10c8bc8bf24a32117a6ad981b4a3900feb7eccc13aa5f94d5a1083f4a4c43bdc60a6908d8e5dd390ae71c644340d211a7633d4c8cf9
-EBUILD beautifulsoup-4.9.0.ebuild 1172 BLAKE2B 2da6d31596f275d7d70b80b2a9b5677f306e4028660ec8d78dd316b77386786d6b9ed9379d15dfca803c3ebe6c457808bd1c6adb773e08c7fe58ab5d974bc50e SHA512 11ee6f34dbc75c922398e10c8bc8bf24a32117a6ad981b4a3900feb7eccc13aa5f94d5a1083f4a4c43bdc60a6908d8e5dd390ae71c644340d211a7633d4c8cf9
-EBUILD beautifulsoup-4.9.1.ebuild 842 BLAKE2B e4a66c3e9e9bec9a97dc16b6c8d0bc7f77d497d47ddd7b99252ef863e6938e806b7c2db7ef43eb5753da24b37696788b50fd75ef5fd8b2de075933654d0fb678 SHA512 279b57b0ba658b014df4e53f40dca6a7066b4b38d4068ca90137ef21732c8d84725eff788bb72493e0ef2f1db188491ea33ff1b7f1fef9a35e7b0e4e1e16b2cf
+EBUILD beautifulsoup-4.8.2.ebuild 1171 BLAKE2B 288b4c4a92a00a7967aac49ae0deafac77b91329c4eebc0ca167ee9de6e93a2945344c59134269ffbcfa423bdb78ac82a163bcb7349328b2f8e3cb21237ac539 SHA512 d9dd1bda4445939e72317297d933e6412247bd8eb946d318745874c68bbb4c4f481ee875b8aaf5328d8f9d6329f6581687cc0d35e80e4d855b31cc0a43beba35
+EBUILD beautifulsoup-4.9.0.ebuild 1171 BLAKE2B 288b4c4a92a00a7967aac49ae0deafac77b91329c4eebc0ca167ee9de6e93a2945344c59134269ffbcfa423bdb78ac82a163bcb7349328b2f8e3cb21237ac539 SHA512 d9dd1bda4445939e72317297d933e6412247bd8eb946d318745874c68bbb4c4f481ee875b8aaf5328d8f9d6329f6581687cc0d35e80e4d855b31cc0a43beba35
+EBUILD beautifulsoup-4.9.1.ebuild 833 BLAKE2B 98992d895391a0db1e056c3ab31907a586001fae6b86b57e4b6b16f76b2f792c5bb609e62bcafd3f6bc423224fed169702dcfc5274bf513638b3cd866d151ea7 SHA512 f0be519f198faf1405ba3f5b583f433d355cf0818331fbafa1853d2e97e5ae0ed7c90e5ef708855a4c21affec696ec2141a89f3e5d1398d4286ea16f459c3941
 MISC metadata.xml 252 BLAKE2B 507e0ddc9d50b879ff374b903b142f85d020dfd6c486aba2af84fe082c878e780edbb79188ae10104d57db0eb775c86814cc8c06891a3854c9da840a4d377050 SHA512 9470ac9c8a5a4f80e3f767e7aa198addc7b21866c63b2a310e9f41ce65817672fb77423117bdd619e99cb62322025aeadf50717e23eafabf99080fcc106820af
diff --git a/dev-python/beautifulsoup/beautifulsoup-4.6.3.ebuild b/dev-python/beautifulsoup/beautifulsoup-4.6.3.ebuild
deleted file mode 100644
index fbe0c8089..000000000
--- a/dev-python/beautifulsoup/beautifulsoup-4.6.3.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 python3_{6,7,8} )
-
-inherit distutils-r1
-
-MY_PN=${PN}4
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Pythonic idioms for iterating, searching, and modifying an HTML/XML parse tree"
-HOMEPAGE="https://www.crummy.com/software/BeautifulSoup/bs4/"
-SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="4"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc test"
-
-# html5lib is optional however hard coding since its use is actively discouraged in the devmanual
-RDEPEND="
-	$(python_gen_cond_dep 'dev-python/html5lib[${PYTHON_USEDEP}]' python2_7 pypy)
-	$(python_gen_cond_dep 'dev-python/lxml[${PYTHON_USEDEP}]' python2_7 'python3*')"
-DEPEND="
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )
-	"
-
-S="${WORKDIR}/${MY_P}"
-
-python_compile_all() {
-	use doc && emake -C doc html
-}
-
-python_test() {
-	nosetests --verbose -w "${BUILD_DIR}"/lib || die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/beautifulsoup/beautifulsoup-4.7.1.ebuild b/dev-python/beautifulsoup/beautifulsoup-4.7.1.ebuild
deleted file mode 100644
index eb309992c..000000000
--- a/dev-python/beautifulsoup/beautifulsoup-4.7.1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit distutils-r1
-
-MY_PN=${PN}4
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Pythonic idioms for iterating, searching, and modifying an HTML/XML parse tree"
-HOMEPAGE="https://www.crummy.com/software/BeautifulSoup/bs4/"
-SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="4"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc test"
-
-# html5lib is optional however hard coding since its use is actively discouraged in the devmanual
-RDEPEND="
-	$(python_gen_cond_dep 'dev-python/html5lib[${PYTHON_USEDEP}]' python2_7 pypy)
-	$(python_gen_cond_dep 'dev-python/lxml[${PYTHON_USEDEP}]' python2_7 'python3*')"
-DEPEND="
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )
-	"
-
-S="${WORKDIR}/${MY_P}"
-
-python_compile_all() {
-	use doc && emake -C doc html
-}
-
-python_test() {
-	nosetests --verbose -w "${BUILD_DIR}"/lib || die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/beautifulsoup/beautifulsoup-4.8.0.ebuild b/dev-python/beautifulsoup/beautifulsoup-4.8.0.ebuild
deleted file mode 100644
index eb309992c..000000000
--- a/dev-python/beautifulsoup/beautifulsoup-4.8.0.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit distutils-r1
-
-MY_PN=${PN}4
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Pythonic idioms for iterating, searching, and modifying an HTML/XML parse tree"
-HOMEPAGE="https://www.crummy.com/software/BeautifulSoup/bs4/"
-SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="4"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc test"
-
-# html5lib is optional however hard coding since its use is actively discouraged in the devmanual
-RDEPEND="
-	$(python_gen_cond_dep 'dev-python/html5lib[${PYTHON_USEDEP}]' python2_7 pypy)
-	$(python_gen_cond_dep 'dev-python/lxml[${PYTHON_USEDEP}]' python2_7 'python3*')"
-DEPEND="
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )
-	"
-
-S="${WORKDIR}/${MY_P}"
-
-python_compile_all() {
-	use doc && emake -C doc html
-}
-
-python_test() {
-	nosetests --verbose -w "${BUILD_DIR}"/lib || die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/beautifulsoup/beautifulsoup-4.8.1.ebuild b/dev-python/beautifulsoup/beautifulsoup-4.8.1.ebuild
deleted file mode 100644
index 646983850..000000000
--- a/dev-python/beautifulsoup/beautifulsoup-4.8.1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit distutils-r1
-
-MY_PN=${PN}4
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Pythonic idioms for iterating, searching, and modifying an HTML/XML parse tree"
-HOMEPAGE="https://www.crummy.com/software/BeautifulSoup/bs4/"
-SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="4"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc test"
-
-# html5lib is optional however hard coding since its use is actively discouraged in the devmanual
-RDEPEND="
-	$(python_gen_cond_dep 'dev-python/html5lib[${PYTHON_USEDEP}]' python2_7 pypy)
-	$(python_gen_cond_dep 'dev-python/lxml[${PYTHON_USEDEP}]' python2_7 'python3*')"
-DEPEND="
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )
-	"
-
-S="${WORKDIR}/${MY_P}"
-
-python_compile_all() {
-	use doc && emake -C doc html
-}
-
-python_test() {
-	nosetests --verbose -w "${BUILD_DIR}"/lib || die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/beautifulsoup/beautifulsoup-4.8.2.ebuild b/dev-python/beautifulsoup/beautifulsoup-4.8.2.ebuild
index 0233d7731..b870b935a 100644
--- a/dev-python/beautifulsoup/beautifulsoup-4.8.2.ebuild
+++ b/dev-python/beautifulsoup/beautifulsoup-4.8.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/beautifulsoup/beautifulsoup-4.9.0.ebuild b/dev-python/beautifulsoup/beautifulsoup-4.9.0.ebuild
index 0233d7731..b870b935a 100644
--- a/dev-python/beautifulsoup/beautifulsoup-4.9.0.ebuild
+++ b/dev-python/beautifulsoup/beautifulsoup-4.9.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/beautifulsoup/beautifulsoup-4.9.1.ebuild b/dev-python/beautifulsoup/beautifulsoup-4.9.1.ebuild
index cef38209a..0494a1537 100644
--- a/dev-python/beautifulsoup/beautifulsoup-4.9.1.ebuild
+++ b/dev-python/beautifulsoup/beautifulsoup-4.9.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8,9} pypy3 )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/bellows-homeassistant/Manifest b/dev-python/bellows-homeassistant/Manifest
index e1720dbe0..5fdeda771 100644
--- a/dev-python/bellows-homeassistant/Manifest
+++ b/dev-python/bellows-homeassistant/Manifest
@@ -1,17 +1,3 @@
-DIST bellows-homeassistant-0.10.0.tar.gz 51029 BLAKE2B d19959334c04dca36bbebf432e8a35f591323ea75cdb0b1953d2f965801506d0c2527ef32e1c049efa800ead9f10dd34ff5816e644edcbfba9143afc860d6aa8 SHA512 3d711b7e2e30ec03797e343f2bcdcadd1efba2ee76f98e3b97d2245ee3362eb71b973ae03e39745e9404d26ac37d3cbe710a27b0c651d9e71496e264fa13b743
-DIST bellows-homeassistant-0.11.0.tar.gz 52317 BLAKE2B 6d87e9068b6615fd1567ab211d557f0d5fa30028f2114f373e6a5dfd116f627e0423f867b5bf23ecce428e8752781c4c5004b95158b6b683b6d921c0dc5ce2d7 SHA512 1bbe77cab67da94435903fe7a7b81494ec05246dde8bc7d95a328175b64cdff1b1bd25b6cefe8c29c579848486c0bec72d1252092fe6e97062cef9e434ff7593
-DIST bellows-homeassistant-0.12.0.tar.gz 53443 BLAKE2B b901192a60494ed31f23c7a1db8855ca90899ed5c1848c515a0ac6466e5ed2fe5908ecf50a8139b8ca725503b7252ec3ee0e77bd48a3ffaa30a87d3c97eba9f1 SHA512 9cd40b3bcf9a57b10edf50a6789f922d1116835af09ff32b4b2af583c97fcc29eb46cfeca1a75c44792fa0d55234d14524dad155aa719e142d6f57ee532f8db8
-DIST bellows-homeassistant-0.13.1.tar.gz 53464 BLAKE2B aa15cf335db9e764138c81f122298e29194f9bdeee8413d57494998582e2e2d4f9c9c1a982363ba7de688e495185d3227cb58072152ba373627380c88f1559ec SHA512 10b8681f62b91389f7c315108c973a837f9152eb50d87eef49e90206a2d1767a0f945a2cbb20b444f374c4652da151271010d16168af37f03ffc70b06ccf44fe
-DIST bellows-homeassistant-0.13.2.tar.gz 53458 BLAKE2B 1436f82cbd0ced3260d22e1e52fcb30c0cbfcbdb45ffee680b81a14c4c0c635793737538eb5fcdfe084e969e7c43bd7023a1e3c8ae767238b3f006dd17805bc6 SHA512 9c2723fcc11e2ff458d7f66554a77f2e0c70f0e05596e11549abbdc93692458303a0a9a67b3a8fdb48233835d058b6449fc55ea7ba38dfc873efd6621b7af8ad
-DIST bellows-homeassistant-0.14.0.tar.gz 53448 BLAKE2B cbafc9032984a19faa690332745ddbc8187755352985c4351ca52263ec03d51fbbcaac32227a67f62478a0154ae5b4dd6a0b6ed0396114d04b20e022f19d5bfc SHA512 6ad9e4eb858e2f72fbbcb6680886172c8d444567a39267cdc949b6d82a14fa7f2eacd7c056c341b27624afdc26af507ffa823b323560b92584d139088e904444
-DIST bellows-homeassistant-0.15.1.tar.gz 54588 BLAKE2B f5a26d983bc5e59d1648f75bb47fbff6af46b3661ea3013bc49d297a494b39468f593f7797505f085e287cbb03560c1415d430b001ae6ff0cc87bcdc358fee42 SHA512 2936eb3242841f0b2e0c152953521b75b2b7739e3ad9de4c451301b65d5eb3c697e0d2b4441f686d71a1c8124f5de652fb79f03f4246a682a7d93dc6db07e5b3
 DIST bellows-homeassistant-0.15.2.tar.gz 54610 BLAKE2B dff6bf85aef3b96505e2632c9125d0f90cd8d844d5f50c537ef9e774190f0b0a8669978c59442da015e1b8bc5a0909eb1ddfc6a4199f9d648ac057973f13fa03 SHA512 a9e8593d02b75cdded8d4ccd036464fc3f9b462d79727735312c69baaaaf9c5e3c6cc174b31d053012299877699a5d3f8201559bed5eab7b93480aad4d308cd5
-EBUILD bellows-homeassistant-0.10.0.ebuild 915 BLAKE2B 9b5d720080e8cf455d41615916ce53e13d8036bbfa886247c22ce6e0239168ff255de261a04f47b6d1a59c8c7e1e741c4082140e2d782993b6e2a41280fbe020 SHA512 29ea157b4efac2e18aa330301f68b914efd8f9387095d8eaefc43b1398e086c847f7b59e62987d52db8d378c5e96ec99eb77d53adddfdd730416aad7d0d475ed
-EBUILD bellows-homeassistant-0.11.0.ebuild 913 BLAKE2B 5923856f17c8af2ce75c0730ca9b0fcdf492dff0e237d948797d1de40ea8f23b881926a08ba632660beec92154348f372af35c69992baaf768d651d076a0d320 SHA512 eca63613ad25de211cbe646c5ee000dfdc35db6a8dd9c10633d91c8a4218f662ba7809413a0a7e7617fd067f0adfa9304a462ea26b222ae847c41c79bc9e5656
-EBUILD bellows-homeassistant-0.12.0.ebuild 913 BLAKE2B 5923856f17c8af2ce75c0730ca9b0fcdf492dff0e237d948797d1de40ea8f23b881926a08ba632660beec92154348f372af35c69992baaf768d651d076a0d320 SHA512 eca63613ad25de211cbe646c5ee000dfdc35db6a8dd9c10633d91c8a4218f662ba7809413a0a7e7617fd067f0adfa9304a462ea26b222ae847c41c79bc9e5656
-EBUILD bellows-homeassistant-0.13.1.ebuild 922 BLAKE2B e0335967c3116481a7791a0ea4de7c17540dba2103e483c35cfcae5f19777a88defe497d6d528b5257d513cd92cec657d7049206209f9ca9b94cef9e0aa0fa51 SHA512 1f0d1e4a074d70a20a085dcbb1090b93acfb14da3c753b1ad9aa09a9c715cea769f67ae09401025991b1eec3654afd418cfe06cd1259185f3bdfbe5d8533fb9d
-EBUILD bellows-homeassistant-0.13.2.ebuild 922 BLAKE2B e0335967c3116481a7791a0ea4de7c17540dba2103e483c35cfcae5f19777a88defe497d6d528b5257d513cd92cec657d7049206209f9ca9b94cef9e0aa0fa51 SHA512 1f0d1e4a074d70a20a085dcbb1090b93acfb14da3c753b1ad9aa09a9c715cea769f67ae09401025991b1eec3654afd418cfe06cd1259185f3bdfbe5d8533fb9d
-EBUILD bellows-homeassistant-0.14.0.ebuild 922 BLAKE2B e0335967c3116481a7791a0ea4de7c17540dba2103e483c35cfcae5f19777a88defe497d6d528b5257d513cd92cec657d7049206209f9ca9b94cef9e0aa0fa51 SHA512 1f0d1e4a074d70a20a085dcbb1090b93acfb14da3c753b1ad9aa09a9c715cea769f67ae09401025991b1eec3654afd418cfe06cd1259185f3bdfbe5d8533fb9d
-EBUILD bellows-homeassistant-0.15.1.ebuild 922 BLAKE2B e0335967c3116481a7791a0ea4de7c17540dba2103e483c35cfcae5f19777a88defe497d6d528b5257d513cd92cec657d7049206209f9ca9b94cef9e0aa0fa51 SHA512 1f0d1e4a074d70a20a085dcbb1090b93acfb14da3c753b1ad9aa09a9c715cea769f67ae09401025991b1eec3654afd418cfe06cd1259185f3bdfbe5d8533fb9d
-EBUILD bellows-homeassistant-0.15.2.ebuild 922 BLAKE2B e0335967c3116481a7791a0ea4de7c17540dba2103e483c35cfcae5f19777a88defe497d6d528b5257d513cd92cec657d7049206209f9ca9b94cef9e0aa0fa51 SHA512 1f0d1e4a074d70a20a085dcbb1090b93acfb14da3c753b1ad9aa09a9c715cea769f67ae09401025991b1eec3654afd418cfe06cd1259185f3bdfbe5d8533fb9d
+EBUILD bellows-homeassistant-0.15.2.ebuild 922 BLAKE2B cb3b4c17bda4d07066bb910185417ddc37973c4d6f474c0db362dca747992fee911a19b163f03eed44e45597221ae06da29c1fe18f73822c4320dc5d5b4a059f SHA512 8fdc792c0787ed8c733e9729fb4f85a26afd48fb27ef926881bb0e06d062a116edab8cf50859796b98ac6354bf63dcc297f59add30b967deff33c3650cbdfb0c
 MISC metadata.xml 352 BLAKE2B f06fe89477fec041195c1ad4ec72b6693ecd6b8916c308d7ef8d60997040b52083f598ab352206c860ae7ea0771ade2ff9fa8969f06df60a104fd339c7fc4eb1 SHA512 c08e586df7ca07df08e0375d06d90c05544d5f9b03b72ae5abee32ad53af1c64079d25c5969530aa77ba225355d484af489b26ca17b5f2517b944c55a7b81cdc
diff --git a/dev-python/bellows-homeassistant/bellows-homeassistant-0.10.0.ebuild b/dev-python/bellows-homeassistant/bellows-homeassistant-0.10.0.ebuild
deleted file mode 100644
index b1b2a1970..000000000
--- a/dev-python/bellows-homeassistant/bellows-homeassistant-0.10.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{5,6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Library implementing EZSP"
-HOMEPAGE="https://github.com/zigpy/bellows https://pypi.org/project/bellows-homeassistant/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND="dev-python/click[${PYTHON_USEDEP}]
-		 ~dev-python/click-log-0.2.0[${PYTHON_USEDEP}]
-		 ~dev-python/pure_pcapy3-1.0.1[${PYTHON_USEDEP}]
-		 dev-python/pyserial-asyncio[${PYTHON_USEDEP}]
-		 >=dev-python/zigpy-homeassistant-0.4.0[${PYTHON_USEDEP}]"
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/bellows-homeassistant/bellows-homeassistant-0.11.0.ebuild b/dev-python/bellows-homeassistant/bellows-homeassistant-0.11.0.ebuild
deleted file mode 100644
index 155c4e5aa..000000000
--- a/dev-python/bellows-homeassistant/bellows-homeassistant-0.11.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Library implementing EZSP"
-HOMEPAGE="https://github.com/zigpy/bellows https://pypi.org/project/bellows-homeassistant/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND="dev-python/click[${PYTHON_USEDEP}]
-		 ~dev-python/click-log-0.2.0[${PYTHON_USEDEP}]
-		 ~dev-python/pure_pcapy3-1.0.1[${PYTHON_USEDEP}]
-		 dev-python/pyserial-asyncio[${PYTHON_USEDEP}]
-		 >=dev-python/zigpy-homeassistant-0.9.0[${PYTHON_USEDEP}]"
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/bellows-homeassistant/bellows-homeassistant-0.12.0.ebuild b/dev-python/bellows-homeassistant/bellows-homeassistant-0.12.0.ebuild
deleted file mode 100644
index 155c4e5aa..000000000
--- a/dev-python/bellows-homeassistant/bellows-homeassistant-0.12.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Library implementing EZSP"
-HOMEPAGE="https://github.com/zigpy/bellows https://pypi.org/project/bellows-homeassistant/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND="dev-python/click[${PYTHON_USEDEP}]
-		 ~dev-python/click-log-0.2.0[${PYTHON_USEDEP}]
-		 ~dev-python/pure_pcapy3-1.0.1[${PYTHON_USEDEP}]
-		 dev-python/pyserial-asyncio[${PYTHON_USEDEP}]
-		 >=dev-python/zigpy-homeassistant-0.9.0[${PYTHON_USEDEP}]"
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/bellows-homeassistant/bellows-homeassistant-0.13.1.ebuild b/dev-python/bellows-homeassistant/bellows-homeassistant-0.13.1.ebuild
deleted file mode 100644
index ee3ece045..000000000
--- a/dev-python/bellows-homeassistant/bellows-homeassistant-0.13.1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit distutils-r1
-
-DESCRIPTION="Library implementing EZSP"
-HOMEPAGE="https://github.com/zigpy/bellows https://pypi.org/project/bellows-homeassistant/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND="dev-python/click[${PYTHON_USEDEP}]
-		 ~dev-python/click-log-0.2.0[${PYTHON_USEDEP}]
-		 ~dev-python/pure_pcapy3-1.0.1[${PYTHON_USEDEP}]
-		 dev-python/pyserial-asyncio[${PYTHON_USEDEP}]
-		 >=dev-python/zigpy-homeassistant-0.9.0[${PYTHON_USEDEP}]"
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/bellows-homeassistant/bellows-homeassistant-0.13.2.ebuild b/dev-python/bellows-homeassistant/bellows-homeassistant-0.13.2.ebuild
deleted file mode 100644
index ee3ece045..000000000
--- a/dev-python/bellows-homeassistant/bellows-homeassistant-0.13.2.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit distutils-r1
-
-DESCRIPTION="Library implementing EZSP"
-HOMEPAGE="https://github.com/zigpy/bellows https://pypi.org/project/bellows-homeassistant/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND="dev-python/click[${PYTHON_USEDEP}]
-		 ~dev-python/click-log-0.2.0[${PYTHON_USEDEP}]
-		 ~dev-python/pure_pcapy3-1.0.1[${PYTHON_USEDEP}]
-		 dev-python/pyserial-asyncio[${PYTHON_USEDEP}]
-		 >=dev-python/zigpy-homeassistant-0.9.0[${PYTHON_USEDEP}]"
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/bellows-homeassistant/bellows-homeassistant-0.14.0.ebuild b/dev-python/bellows-homeassistant/bellows-homeassistant-0.14.0.ebuild
deleted file mode 100644
index ee3ece045..000000000
--- a/dev-python/bellows-homeassistant/bellows-homeassistant-0.14.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit distutils-r1
-
-DESCRIPTION="Library implementing EZSP"
-HOMEPAGE="https://github.com/zigpy/bellows https://pypi.org/project/bellows-homeassistant/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND="dev-python/click[${PYTHON_USEDEP}]
-		 ~dev-python/click-log-0.2.0[${PYTHON_USEDEP}]
-		 ~dev-python/pure_pcapy3-1.0.1[${PYTHON_USEDEP}]
-		 dev-python/pyserial-asyncio[${PYTHON_USEDEP}]
-		 >=dev-python/zigpy-homeassistant-0.9.0[${PYTHON_USEDEP}]"
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/bellows-homeassistant/bellows-homeassistant-0.15.1.ebuild b/dev-python/bellows-homeassistant/bellows-homeassistant-0.15.1.ebuild
deleted file mode 100644
index ee3ece045..000000000
--- a/dev-python/bellows-homeassistant/bellows-homeassistant-0.15.1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit distutils-r1
-
-DESCRIPTION="Library implementing EZSP"
-HOMEPAGE="https://github.com/zigpy/bellows https://pypi.org/project/bellows-homeassistant/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND="dev-python/click[${PYTHON_USEDEP}]
-		 ~dev-python/click-log-0.2.0[${PYTHON_USEDEP}]
-		 ~dev-python/pure_pcapy3-1.0.1[${PYTHON_USEDEP}]
-		 dev-python/pyserial-asyncio[${PYTHON_USEDEP}]
-		 >=dev-python/zigpy-homeassistant-0.9.0[${PYTHON_USEDEP}]"
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/bellows-homeassistant/bellows-homeassistant-0.15.2.ebuild b/dev-python/bellows-homeassistant/bellows-homeassistant-0.15.2.ebuild
index ee3ece045..97145d45d 100644
--- a/dev-python/bellows-homeassistant/bellows-homeassistant-0.15.2.ebuild
+++ b/dev-python/bellows-homeassistant/bellows-homeassistant-0.15.2.ebuild
@@ -1,9 +1,8 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-
-PYTHON_COMPAT=( python3_{6,7,8} )
+EAPI="7"
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/bluepy/Manifest b/dev-python/bluepy/Manifest
index 0a13157a9..9fec6eca2 100644
--- a/dev-python/bluepy/Manifest
+++ b/dev-python/bluepy/Manifest
@@ -1,5 +1,3 @@
-DIST bluepy-1.1.4.tar.gz 218850 BLAKE2B fd33b617ee36bf371da08c880e9032f80e5a095480dc5e671901c2eb898ed072c0cda7fdcb257a7bed6ae9d067eb616ff48df75c6a270678b8f9447937e4bd3d SHA512 40b285a093ab9eb627d41bee03b8cef84c94aafcd65f5cf162fb30ce350126556f984d363389ac7b209847c32484486f5042891ffa8c9eb7a30d58bbab31626f
 DIST bluepy-1.3.0.tar.gz 217933 BLAKE2B 718855273ff08954369cb5f58b810f904da5e8c38a14042f214721c8f29bbb1b5ed22e3ff8fbd453ef044309f506c641c41e2a436c23df9a1b3cd34d2ef93e4f SHA512 1f06f8b1db869e9f74a965fab7d9cf6d42765012d2a88eb2b615a87a4e7721fbf0d9907619d1e80bb087188cd84b7e3f11f773480fe83c48fdfdfefb96cf5cd8
-EBUILD bluepy-1.1.4.ebuild 695 BLAKE2B bce63e347945a258fd51d07fc451495981216c2603af7e24fc19a00bcf1b08d7f6dbe866787775a2c86b9808a6946dad8c7b6b220e0bf7bfc298a9227aacafb0 SHA512 3a22e986360b0828f877927340a2e3e9d6fb256363b9344ecf9ca53f11938de2079c76862ce3e47be85dc1d16e36b34af241433ce1734fd163ff69c45a9d0ce8
-EBUILD bluepy-1.3.0.ebuild 704 BLAKE2B 45ca3696636172faea9db095c43c78c5a6473efcfafd72cf0e36c377c95574fa967e2cbd3843dde2907a968dc30a583b333fdb50bdca0579fc6982809503faac SHA512 ea846703224f140b805d472eef9d4b4874064795a00b6499b0b9a2da9d3a5b8fd3c15d870455506b4b94506e84ce78e6eaf0af0871f333366c83ebf5356a5911
+EBUILD bluepy-1.3.0.ebuild 703 BLAKE2B 45c198a8ce16697e3cc04755ec01c2b96754442d24fa6566bb5e96afdc6d20ad3de4bae2b5af2158c802c97ab1c0e668899516062f590dc768ea3a97d524f3d1 SHA512 c326f232c120ec6ab8b990fde377f037c6d4156a7e6b5568d1129dd5b8717112f1b7e6cc312810f4fde3ac58e10fdbceca61e354bc3a42510c230fdb5aa7a9d8
 MISC metadata.xml 458 BLAKE2B 0f4ac521e1eb1648204133ef509402e92b41b05686321eb3b44d07e3fe7b5abbe2fd2fcbf7789da9ada6711212941c02f06e4bd74fbaa2924c8356848d249166 SHA512 43e6ca41ccb3e3535ffd893661cbe4d30b6c9ebd880b5574b0bce935c0c0199cbb1b7e3deb83c9290abf1b189bf6beb3a5be73e25d3fa8e3b134844a2cb144ee
diff --git a/dev-python/bluepy/bluepy-1.1.4.ebuild b/dev-python/bluepy/bluepy-1.1.4.ebuild
deleted file mode 100644
index 0614878bf..000000000
--- a/dev-python/bluepy/bluepy-1.1.4.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python module for interfacing with BLE devices through Bluez"
-HOMEPAGE="https://github.com/IanHarvey/bluepy https://pypi.org/project/bluepy/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/bluepy/bluepy-1.3.0.ebuild b/dev-python/bluepy/bluepy-1.3.0.ebuild
index c78233f65..76efc5025 100644
--- a/dev-python/bluepy/bluepy-1.3.0.ebuild
+++ b/dev-python/bluepy/bluepy-1.3.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/bomradarloop/Manifest b/dev-python/bomradarloop/Manifest
index b3f7ef472..360d67ac9 100644
--- a/dev-python/bomradarloop/Manifest
+++ b/dev-python/bomradarloop/Manifest
@@ -1,9 +1,3 @@
-DIST bomradarloop-0.1.2.tar.gz 4124 BLAKE2B 1baa462c3d76c439d87cb75139ed60515425fade5be52d23923ff78b5d55260dec62c555418e608d986128fa64da1c00c801b1b7ddc6e7c7ea30a2a34312d663 SHA512 14682b2070756f8c44066691af32c1e176b7a02d9dcc66548264c441eb060ddb3d742f5d8b503803faa66c3f48aed01331116217533d8be3c9fc9fadd8a51657
-DIST bomradarloop-0.1.3.tar.gz 3927 BLAKE2B 1f78134f12a2d788c7b93d27c2bdd21314afd67114adbde46e647d4c3d08954e203327c6ef629a25a0f475d404d3159fd2ab00eb974e11cbf1d3bd2958121789 SHA512 50c21e1c91bd88fc6680970e1c7191d077a155ace15fe9d1ebbbf215f70395741696a5afa883934bef739f249c898ad0bc1c53d1d0402de9d70874caa01bb7df
-DIST bomradarloop-0.1.4.tar.gz 4237 BLAKE2B 9483c5c9b5c6696021d4116874aa4ce2d23262bd9e62653544f62c6af795670ff7071f7b4417bca905f18358295808523fc34f1d54dc4c04c937b88bdb473a43 SHA512 e38ffbc141005ade41ff5d5a7797bab4cca3678f646e3000cb078e25878377b91dd6f070cffb3e1a0f88eb44e00c0a45dd6a7ee1a5867af74a65d723a410a23a
 DIST bomradarloop-0.1.5.tar.gz 4533 BLAKE2B 695a03c901c1626896833b7c1cacab906b3a02a21ad8741b584a24ff20c7b582e3e2205667d5dbae02f8e4060af1caa2b67abb0ee6777acfd18c96a40ae1ee98 SHA512 33ba4a99fd865a078b3d416ffd7a94b14e29ac8135a611404435d645826950e78c516f4b9c32fdc3e0fc5ba7a1e714e078162e2f02bb836d2fdf337ae422e151
-EBUILD bomradarloop-0.1.2.ebuild 695 BLAKE2B b6867f1b8972d2bfaf06ebfdb3151a8a5363cfeb0d290f25a5551efdb6e247f50d9384951fc08b7bf5e526474f2a96f35d4bfd46283f3f0b65a8f1a7a6c17e6f SHA512 a8052e5b3710ce5156dd3686beabbcdf42c14ef6e71ba939954f8ccb088f9800750ead8eb84bb102478ef30d56cc91ca501e952fc49149ac28a7aafa17d64f73
-EBUILD bomradarloop-0.1.3.ebuild 702 BLAKE2B 896b11684da27b6b8e5097be521d0513720a1d5ace46cf92cc2a71821ec517680ab99a1be38b7355f100d287b96801ee1a8079c3643ff5f4d9bad2b06bb224ca SHA512 3a241e5c1bbff02f2acf34404d0c56ebb4935000b5e5ce075a4d33461b346dcb5ce03ce3951202e4fd7444ea386bab1c72450dc8db4a8d8634bef796cccb5b4b
-EBUILD bomradarloop-0.1.4.ebuild 702 BLAKE2B 896b11684da27b6b8e5097be521d0513720a1d5ace46cf92cc2a71821ec517680ab99a1be38b7355f100d287b96801ee1a8079c3643ff5f4d9bad2b06bb224ca SHA512 3a241e5c1bbff02f2acf34404d0c56ebb4935000b5e5ce075a4d33461b346dcb5ce03ce3951202e4fd7444ea386bab1c72450dc8db4a8d8634bef796cccb5b4b
-EBUILD bomradarloop-0.1.5.ebuild 776 BLAKE2B f940d0e1e21630049da01dbde553729c99cae5b9f0f6743d1eb1ec3601531db4e29567a2cc32325a57b13e264d906a0e829436171742de5fdb5beecbf6910acb SHA512 2708d6f6b6250cd8eb7b16e2fb575827ffb87b297aa3d64e89058a56d604bb2fddaaea57070a9559027106ad14936e4caea249274e5a8a413df3e7a469b946df
+EBUILD bomradarloop-0.1.5.ebuild 775 BLAKE2B 59a0b97ebc698f33a4e8dbd3b36c6c4ac2b0619e623a3ee7df8c3c055a3bd2b7e7645e3adc08fd3e5d006da5ef5439474c76989b0e40a7104da4325350969f40 SHA512 ffb8a8a3786a0e2e8abb81993101cf53507782a281675a0677b23c3e35455f4bab2464d0719dd641c9bd9f20bf9b8a97ee6d4d85f7ea1bfc5f1bec91df28706f
 MISC metadata.xml 456 BLAKE2B 1a077fefb7de2253136589a9830d1efb0fad89fb9a4a9f66138ce16049d3114fc21e32288223b4a466674ebb1f0ce584a13be0d5ddb999a61b63655341dabce1 SHA512 04027b35493e7bc8127dd037bfacf3cb7ac47682ccc89b5acc3f379a3579291e98e769dc84c49ec6026ebd2edde41c05b41424f12ba8c9e6661b3f4b1f36734c
diff --git a/dev-python/bomradarloop/bomradarloop-0.1.2.ebuild b/dev-python/bomradarloop/bomradarloop-0.1.2.ebuild
deleted file mode 100644
index 28f0689d5..000000000
--- a/dev-python/bomradarloop/bomradarloop-0.1.2.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{5,6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Create animated GIFs from BOM radar imagery"
-HOMEPAGE="https://github.com/maddenp/bomradarloop https://pypi.org/project/bomradarloop/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/bomradarloop/bomradarloop-0.1.3.ebuild b/dev-python/bomradarloop/bomradarloop-0.1.3.ebuild
deleted file mode 100644
index 9855d6491..000000000
--- a/dev-python/bomradarloop/bomradarloop-0.1.3.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit distutils-r1
-
-DESCRIPTION="Create animated GIFs from BOM radar imagery"
-HOMEPAGE="https://github.com/maddenp/bomradarloop https://pypi.org/project/bomradarloop/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/bomradarloop/bomradarloop-0.1.4.ebuild b/dev-python/bomradarloop/bomradarloop-0.1.4.ebuild
deleted file mode 100644
index 9855d6491..000000000
--- a/dev-python/bomradarloop/bomradarloop-0.1.4.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit distutils-r1
-
-DESCRIPTION="Create animated GIFs from BOM radar imagery"
-HOMEPAGE="https://github.com/maddenp/bomradarloop https://pypi.org/project/bomradarloop/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/bomradarloop/bomradarloop-0.1.5.ebuild b/dev-python/bomradarloop/bomradarloop-0.1.5.ebuild
index bf4b4767e..7bd37b8ec 100644
--- a/dev-python/bomradarloop/bomradarloop-0.1.5.ebuild
+++ b/dev-python/bomradarloop/bomradarloop-0.1.5.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/boto3/Manifest b/dev-python/boto3/Manifest
index 5b13b288a..ba2ce5b94 100644
--- a/dev-python/boto3/Manifest
+++ b/dev-python/boto3/Manifest
@@ -1,8 +1,5 @@
 DIST boto3-1.16.52.tar.gz 342838 BLAKE2B 62ab3b2bd72369e08d514fb712eb6653c247e774fbfb579f1293ec1a42752d7321011cf75a054cd625846e72b1b5b6490b1d8bd48f5a2ed818fcf6ac060c0857 SHA512 6a80ee0181f5def2595e7a2d07e7a29e32c23b2d91908338c43fc4794be3d69504cdf8cec7372cdca09004dddb45ae49772404f59a222af4e3eb0bb869cdaf98
-DIST boto3-1.9.233.tar.gz 270154 BLAKE2B dece7efa6d19593a9c4c7d5ea45cfad8b8f7b2b66362ebe24efe8948411341efa9e34a01d62110fd75a5033498767ae4fb24d3b9e38940a7cf41973f8e6cd82c SHA512 f9509665e065c405c7e804b93ac5c1d78a69bf3f8ba8cbaa76adbc1fb1dc44d98e7c3c5cb35f169d2f959329073884e403053b8031fb31e860fea1a888069107
 DIST boto3-1.9.252.tar.gz 271299 BLAKE2B a57af2c5e9e9247f614205fb1af1adf4f644566bcc7b8d9a5230f4978a728a51d01706a83f570871893bf371f403dd2cd76d5da59d259754a22e4a822f92f820 SHA512 db281b45650fd08416013d957b50def7acaf75f274ae4dd72b59d033ee9fa4c299817c783525a0a69dcdcedb80c93a589698ab2bb5de42e17115f8752bca70aa
-EBUILD boto3-1.16.52.ebuild 1355 BLAKE2B f0f3a5ce9733f47eb3be188aac00a378c8e49aa6f6b38056c13c8340d9371b5ac2df5569a94673e005cee363f69dd24ae8722db8dbe6fd3d822af9b4473e0c84 SHA512 4b286aa8fdddad64d1d03dc8921cd355bab18ba1d9b4744b94446eedc07bb19285bfde860994599022fa021b033ca5f64c78d8b674984227a85e4070ef574efd
-EBUILD boto3-1.9.233-r2.ebuild 1214 BLAKE2B 010071f013d25af09462f7bb4f2c92eab8d8ce1feffcf504c2c2f35514a240b51e3d157abd0f6cc3014fe0a74870d2a6a5819bfbb6012fdf06a8a3f50b7fb809 SHA512 236c8137d5fc5937efd0bb74410cdbeb0b82defbd5841d72f2d68328bcdd15236e975571a77e1c7527a9d583f699c0f98045de82877a10abfe4198e6ae68c148
-EBUILD boto3-1.9.233.ebuild 1214 BLAKE2B 010071f013d25af09462f7bb4f2c92eab8d8ce1feffcf504c2c2f35514a240b51e3d157abd0f6cc3014fe0a74870d2a6a5819bfbb6012fdf06a8a3f50b7fb809 SHA512 236c8137d5fc5937efd0bb74410cdbeb0b82defbd5841d72f2d68328bcdd15236e975571a77e1c7527a9d583f699c0f98045de82877a10abfe4198e6ae68c148
-EBUILD boto3-1.9.252.ebuild 1363 BLAKE2B 71751bd9c5a2e5941f8732c437cb153d084fcd234f8876bd7e1eb700dbfa4be345665a775f68e860ff86673a78243af32a2e968d12037a9594ce06ec9682d601 SHA512 2e0cece4ba6d2fc29f618859dc81ff13a22c1b983500b896ea83d15be68cb15bc61ca68e1b91174f71da699f0d0dd9e9cadbc11de32ecae71045beeb7d5063b2
+EBUILD boto3-1.16.52.ebuild 1355 BLAKE2B 21e3b5dc36f00fc9426fbe8c064a05327f9857d4fd941ca57042a60e2088ff50cb3a4ebb0896a1b5ac6ff990142978be348726fd89c3ccaa84cf95fc3462ab0e SHA512 1d5072424bb0b2b1508b30cb593bb8df4234980fd340ac12b0289e858f5e6cf4198ab67574d9dd73159fac436efada38a2bf4f0adda91370d59391f6c92245fe
+EBUILD boto3-1.9.252.ebuild 1362 BLAKE2B f217399b89eeb7a8add392e1296f90dd621a9672c87d0235b9f455c6ff9103d041f7c57e40edb756a02a0ff8402f1b751b5e453d508a58673b65752ed72c095a SHA512 3f26d4339a6d76a06c4bf685b81735ed2e294e81b3452b03a5458a3dce4e5f5db0dadc2c07bd1845a316f76e91ad06cc6d774cdecb75f6733903a944370d4481
 MISC metadata.xml 252 BLAKE2B 507e0ddc9d50b879ff374b903b142f85d020dfd6c486aba2af84fe082c878e780edbb79188ae10104d57db0eb775c86814cc8c06891a3854c9da840a4d377050 SHA512 9470ac9c8a5a4f80e3f767e7aa198addc7b21866c63b2a310e9f41ce65817672fb77423117bdd619e99cb62322025aeadf50717e23eafabf99080fcc106820af
diff --git a/dev-python/boto3/boto3-1.16.52.ebuild b/dev-python/boto3/boto3-1.16.52.ebuild
index 7be6516ff..16b137817 100644
--- a/dev-python/boto3/boto3-1.16.52.ebuild
+++ b/dev-python/boto3/boto3-1.16.52.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{6..9} )
+PYTHON_COMPAT=( python3_{8..9} )
 DISTUTILS_USE_SETUPTOOLS=bdepend
 inherit distutils-r1
 
diff --git a/dev-python/boto3/boto3-1.9.233-r2.ebuild b/dev-python/boto3/boto3-1.9.233-r2.ebuild
deleted file mode 100644
index 50ec59407..000000000
--- a/dev-python/boto3/boto3-1.9.233-r2.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit distutils-r1 vcs-snapshot
-
-DESCRIPTION="The AWS SDK for Python"
-HOMEPAGE="https://github.com/boto/boto3"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="doc test"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/boto/boto3"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/boto/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
-fi
-
-RDEPEND="
-	>=dev-python/botocore-1.12.4[${PYTHON_USEDEP}]
-	dev-python/jmespath[${PYTHON_USEDEP}]
-	~dev-python/s3transfer-0.2.0[${PYTHON_USEDEP}]
-"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? (
-		dev-python/guzzle_sphinx_theme[${PYTHON_USEDEP}]
-		dev-python/sphinx[${PYTHON_USEDEP}]
-	)
-	test? (
-		${RDEPEND}
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-	)
-"
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_test() {
-	nosetests -v tests/unit/ tests/functional/ || die "test failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/build/html/. )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/boto3/boto3-1.9.233.ebuild b/dev-python/boto3/boto3-1.9.233.ebuild
deleted file mode 100644
index 50ec59407..000000000
--- a/dev-python/boto3/boto3-1.9.233.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit distutils-r1 vcs-snapshot
-
-DESCRIPTION="The AWS SDK for Python"
-HOMEPAGE="https://github.com/boto/boto3"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="doc test"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/boto/boto3"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/boto/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
-fi
-
-RDEPEND="
-	>=dev-python/botocore-1.12.4[${PYTHON_USEDEP}]
-	dev-python/jmespath[${PYTHON_USEDEP}]
-	~dev-python/s3transfer-0.2.0[${PYTHON_USEDEP}]
-"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? (
-		dev-python/guzzle_sphinx_theme[${PYTHON_USEDEP}]
-		dev-python/sphinx[${PYTHON_USEDEP}]
-	)
-	test? (
-		${RDEPEND}
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-	)
-"
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_test() {
-	nosetests -v tests/unit/ tests/functional/ || die "test failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/build/html/. )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/boto3/boto3-1.9.252.ebuild b/dev-python/boto3/boto3-1.9.252.ebuild
index dafe525ac..e49fb9d01 100644
--- a/dev-python/boto3/boto3-1.9.252.ebuild
+++ b/dev-python/boto3/boto3-1.9.252.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1 vcs-snapshot
 
diff --git a/dev-python/botocore/Manifest b/dev-python/botocore/Manifest
index 5fbef7ad0..92b6659df 100644
--- a/dev-python/botocore/Manifest
+++ b/dev-python/botocore/Manifest
@@ -1,12 +1,7 @@
 AUX 1.8.6-tests-pass-all-env-vars-to-cmd-runner.patch 1056 BLAKE2B ecdf805cd61e337d4152d56952aeb8b78bfdd871b4da060d025ca4e3f974b3b7a907eee71ce6de1bc6cff8130fa81391aeaa2c5537b1baf159ce23500908a5f4 SHA512 c3be1a6457990168c759f03b24de8f78242b9c06f189553e416ce75fee6a77dce68967a551dfd83e1be096db9baeca019b75526c4886c672eca35282e307f229
-DIST botocore-1.12.115.tar.gz 5462616 BLAKE2B d72fa0977653cb67b2ada2ee769f556adf1428e6b918f676b186d333c8420ef68659f1c289f4398f58b1dcae1b197ba3852cf07b0e73e889cf75e085a02b407d SHA512 ac22fa911a6af4e9ae8971a0f1abe447d6c2222ad32fbf2697517dc6675b78ab4fe8452c00da98c5fd99c7019af86faf3728130e5c5ce4bbdce980c61cb13ea5
 DIST botocore-1.12.252.tar.gz 5939692 BLAKE2B 6e6c36e49df9a9ff288eba370408adb41f8ffd0e325401a69e9c7ab2ad96a2a10999b17e759cc062d1b280288f1fde5bbf4945037b8eff8a9d137ceb39aae2bd SHA512 7403456a467c1999ae509e9b5862c5a6059169b97127db89dba758b0582e00a78b6d79663d414733d88e069667675912545ddee5f701867d531924146ff022a5
-DIST botocore-1.12.57.tar.gz 5247450 BLAKE2B 537c14bc8541f597f835611a8bd8f13b4c5f112139788b67650ed5895882fc63327abb92ad4477785fbbae07fe66f28b095b3982b311421bf93b11377b7b4fdd SHA512 703d9d0967fa998112f9057475e11e2f064ffefa2dd90a2baafc5587bf34a7e255a10e69c9dc05e2e53c8c1414cfff18ffefd8a99d2de49ff749d55c24d5fa19
 DIST botocore-1.13.14.tar.gz 5598238 BLAKE2B dda5dc707adc0b7b6239431f6230482650845d3e9049c963a873926ab1ef0e5e12cee2172cee79de886b726fd6cc8aa77ebbfb34757c64f9e644d9197a52e84c SHA512 a82724041d9e7ae5f2197ddfb922a1c0df99e1e8cbb47be4c18ab2a97b811fb8071dd512eb41e552563a3d97a640fbc7ec421d75dc51bd718339b061546f933e
-EBUILD botocore-1.12.115-r1.ebuild 1473 BLAKE2B 50695394c7296b82682772c3665b09cfb931f7b42e916952ba05f5115a80f852a1212b005b83f7dcd4eada3aa37e7fd97d7585715970bf91598eef27e9f78ffe SHA512 528ca394d5f4045d55f87f893986291bb61fa70315b69e1b8beb0e7e1c38a3a06a96ccf464c8b897dd5e2295319079ccb9ed994da6952bb3f61ddec82a381e6b
-EBUILD botocore-1.12.115.ebuild 1478 BLAKE2B 71e8d985da40d4a281659ee0004979e7349e6a159bf95867b50f011ed9188ab3ba458d6f40e2684478ab342f317f0de49f053fac57cad718cda1cfa93487acae SHA512 09b17acc140a7b42ba81ab4d08f01fb1804fc60ab5763cf653e94392d947a8c06a92a80b41f619323857966eafa45f0c22defa0376b702ab3d7e7ab36b2fac2b
-EBUILD botocore-1.12.252-r1.ebuild 1638 BLAKE2B e9037fc06550c8ff2cc41171e74c40abaedec4fa5c754e8b7d6696284865b20e6312e63167c9f9d250c0519036c75201d96a8075dd9b942332a543cad6b04ea1 SHA512 d5745205995e2ad6a48fce4cc053cb72ebe33c06d9e667ac27d2d778675e5863643a1df96baded4cdd278277b9d728b4643d45bf8811781545902f24ed717724
-EBUILD botocore-1.12.252.ebuild 1587 BLAKE2B e1960a290e34b28aba019cd7b59ccada7b2aaab0b128bf8c923917e833d92921bc6f57395d0bcfc5a325d763a389d78ce4d159c39608d91237c0c89f17d1d654 SHA512 38490c1b52c682df2f3b061280ceacbb82c1960771a44e6c5afb6b36d163bc8fc033ee8c62d48567c840fc94f09997ef9062e7536634ff115107a3c563c012c2
-EBUILD botocore-1.12.57.ebuild 1470 BLAKE2B 436a5ef0e60050b64799f074e95891503d91ae792e6c19ecbb1657919b53d70f6fc468dc9ffb97f946e4dc6a1f6b3458d3c2bfc90b49fdf13b5964ec28d5ab68 SHA512 4def958f78fd5c088bcae93d9bf9feb8d1433ac287399bd61f985c04dfbd7b3b0d814b54cfaf1895305b4c993dd36440b797beee1d0a669a0c8c75adf0672247
-EBUILD botocore-1.13.14.ebuild 1513 BLAKE2B 9b70ceed74e50bd23605e2285a6b973492cfa07c3a9acc68f748768892ed29418f5db87653e504e3a6177af65ffcfef4178e9bce4c18679b21846a01a15a57a5 SHA512 a521c3add4b102b59772ef7d92e4aeefb7a702aeaeb6985ced0150d7369ca7e1e25051a88487696114ac90989518cb829785b2666e8155c14afd685404d19b3d
+EBUILD botocore-1.12.252-r1.ebuild 1638 BLAKE2B 6cfbde180f1a7f2cd7a32386836450fba16faf9204c17863bc99024b0bcbcdd3dd8dd574fbfd8efc3823535ba79d2550864a52ba8d5a7cacbe0362c51da2f819 SHA512 9d9a41330d352f9eb1a86b36d63bdf17eb2272fbf29553c2ce9d1fe7a9e61b597b33288c06d8b2eb72b982b8ae4a119fc930353fc35f7b227c85ca5ac58b398f
+EBUILD botocore-1.12.252.ebuild 1586 BLAKE2B 2e55d5df5e493377cdf9c3625c5b6fd48250df195a4579ce0f9308af3e9e8ac8500f766dfce5ce95b73ad19d5fdb68e537da0d773678982207c73971887ddee8 SHA512 9b6c9b969f157478211cb9bb99c4f637e709fb1bde992d7c76a60a249b8e185323835c05c40d853f6386a70e0a377d047cc33b2145a81f761f221c473c6f649a
+EBUILD botocore-1.13.14.ebuild 1500 BLAKE2B 335214b075995276405557bc09353aa478415c82f579c696b7e78abc8a9384657e9373b9bf63fa9f2f2bb06e4c960e6e71747b0a6db9daa891118304fbba741c SHA512 d22a5a73636150b457dc06a03041705dab9842907577d52932d729e9fc1dc04fa11f5ecb36813bc1a0897057dd7633b659e4b46b033455631fe56e29d36d4313
 MISC metadata.xml 252 BLAKE2B 507e0ddc9d50b879ff374b903b142f85d020dfd6c486aba2af84fe082c878e780edbb79188ae10104d57db0eb775c86814cc8c06891a3854c9da840a4d377050 SHA512 9470ac9c8a5a4f80e3f767e7aa198addc7b21866c63b2a310e9f41ce65817672fb77423117bdd619e99cb62322025aeadf50717e23eafabf99080fcc106820af
diff --git a/dev-python/botocore/botocore-1.12.115-r1.ebuild b/dev-python/botocore/botocore-1.12.115-r1.ebuild
deleted file mode 100644
index 30de043f2..000000000
--- a/dev-python/botocore/botocore-1.12.115-r1.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Low-level, data-driven core of boto 3."
-HOMEPAGE="https://github.com/boto/botocore"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="doc test"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/boto/botocore"
-	inherit git-r3
-else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
-fi
-
-RDEPEND="
-	dev-python/docutils[${PYTHON_USEDEP}]
-	dev-python/jmespath[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	dev-python/urllib3[${PYTHON_USEDEP}]
-"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? (
-		dev-python/guzzle_sphinx_theme[${PYTHON_USEDEP}]
-		dev-python/sphinx[${PYTHON_USEDEP}]
-	)
-	test? (
-		${RDEPEND}
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/jsonschema[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=( "${FILESDIR}/1.8.6-tests-pass-all-env-vars-to-cmd-runner.patch" )
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_test() {
-	PYTHONPATH="${BUILD_DIR}/lib" nosetests -v tests/unit || die "unit tests failed under ${EPYTHON}"
-	PYTHONPATH="${BUILD_DIR}/lib" nosetests -v tests/functional || die "functional tests failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/build/html/. )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/botocore/botocore-1.12.115.ebuild b/dev-python/botocore/botocore-1.12.115.ebuild
deleted file mode 100644
index 86b53de41..000000000
--- a/dev-python/botocore/botocore-1.12.115.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# 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}} )
-
-inherit distutils-r1
-
-DESCRIPTION="Low-level, data-driven core of boto 3."
-HOMEPAGE="https://github.com/boto/botocore"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="doc test"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/boto/botocore"
-	inherit git-r3
-else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
-fi
-
-RDEPEND="
-	dev-python/docutils[${PYTHON_USEDEP}]
-	dev-python/jmespath[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	dev-python/urllib3[${PYTHON_USEDEP}]
-"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? (
-		dev-python/guzzle_sphinx_theme[${PYTHON_USEDEP}]
-		dev-python/sphinx[${PYTHON_USEDEP}]
-	)
-	test? (
-		${RDEPEND}
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/jsonschema[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=( "${FILESDIR}/1.8.6-tests-pass-all-env-vars-to-cmd-runner.patch" )
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_test() {
-	PYTHONPATH="${BUILD_DIR}/lib" nosetests -v tests/unit || die "unit tests failed under ${EPYTHON}"
-	PYTHONPATH="${BUILD_DIR}/lib" nosetests -v tests/functional || die "functional tests failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/build/html/. )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/botocore/botocore-1.12.252-r1.ebuild b/dev-python/botocore/botocore-1.12.252-r1.ebuild
index 0cdd8bc6f..7387d1360 100644
--- a/dev-python/botocore/botocore-1.12.252-r1.ebuild
+++ b/dev-python/botocore/botocore-1.12.252-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
diff --git a/dev-python/botocore/botocore-1.12.252.ebuild b/dev-python/botocore/botocore-1.12.252.ebuild
index 7534fe411..0bbb66143 100644
--- a/dev-python/botocore/botocore-1.12.252.ebuild
+++ b/dev-python/botocore/botocore-1.12.252.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/botocore/botocore-1.12.57.ebuild b/dev-python/botocore/botocore-1.12.57.ebuild
deleted file mode 100644
index 55a40aa4a..000000000
--- a/dev-python/botocore/botocore-1.12.57.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Low-level, data-driven core of boto 3."
-HOMEPAGE="https://github.com/boto/botocore"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="doc test"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/boto/botocore"
-	inherit git-r3
-else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
-fi
-
-RDEPEND="
-	dev-python/docutils[${PYTHON_USEDEP}]
-	dev-python/jmespath[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	dev-python/urllib3[${PYTHON_USEDEP}]
-"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? (
-		dev-python/guzzle_sphinx_theme[${PYTHON_USEDEP}]
-		dev-python/sphinx[${PYTHON_USEDEP}]
-	)
-	test? (
-		${RDEPEND}
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/jsonschema[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=( "${FILESDIR}/1.8.6-tests-pass-all-env-vars-to-cmd-runner.patch" )
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_test() {
-	PYTHONPATH="${BUILD_DIR}/lib" nosetests -v tests/unit || die "unit tests failed under ${EPYTHON}"
-	PYTHONPATH="${BUILD_DIR}/lib" nosetests -v tests/functional || die "functional tests failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/build/html/. )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/botocore/botocore-1.13.14.ebuild b/dev-python/botocore/botocore-1.13.14.ebuild
index bd042dd7b..71e8796bf 100644
--- a/dev-python/botocore/botocore-1.13.14.ebuild
+++ b/dev-python/botocore/botocore-1.13.14.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
-PYTHON_COMPAT=( python2_7 python3_6 python3_7 )
+EAPI="7"
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/btsmarthub-devicelist/Manifest b/dev-python/btsmarthub-devicelist/Manifest
index f9d989d8c..96b2997c8 100644
--- a/dev-python/btsmarthub-devicelist/Manifest
+++ b/dev-python/btsmarthub-devicelist/Manifest
@@ -1,5 +1,3 @@
-DIST btsmarthub-devicelist-0.1.3.tar.gz 2862 BLAKE2B 0aa860ad7d1826ecca32c707c9e5002ce890c5676d476164a91d21ab7c3a76f0020168d9318ae3d761ceaf491c992b570c21a82a55a413aad984e5d9cf8c9e21 SHA512 112130aff520c4a289a98c5cf6ad864e969c5b6c817e85746dc78f6f1567adcfe4a5ebf1498cae1fb7b2877b602205291afe6e3623ef6d088a50a1e13dfac941
 DIST btsmarthub-devicelist-0.2.0.tar.gz 4599 BLAKE2B b03448af8497a317ed6a6d581c19a3414736019b93cde5e5619cebafe34446bc229ab6c5bd536c650f9aa9965897a3846cdbb1a6bebad4385c163d07aad685e6 SHA512 172327c42535ceb087ba5376c84106bab84684243b8cb0a669e881e6a4224cf36a80842a2b223a83e006d8b3a80ccc2f247ce4f9575fbe0aa8ae033ca1f80acf
-EBUILD btsmarthub-devicelist-0.1.3.ebuild 820 BLAKE2B 66331748f059a2ec2bb7986b0a465b70dd9b678345fb4d0398b8209508cd91accc99657249b3ab689e12b014b3a5060fee2cb85cb012a9f1bcf4539e27c9c490 SHA512 803ab9be61a86773d0850c3cdf0f4d1b55b14986f8949a0d9a094b1bd6daa58e8b48c6ff8056215c90a74055119322183c02fee906ab628ced114072ab322982
-EBUILD btsmarthub-devicelist-0.2.0.ebuild 829 BLAKE2B 0c8f3e41d9362a12a6c0c6abb3b95027dec4e541ca0c37f528aa3241b39052b05400007f6e48ad00659c5ef7fe047a8fa2bcd32b8a881a663d436017951d7d78 SHA512 6a42f88e308b51bde329456a98dc431dd82fc95edad777fce104de61397caae1d01b14b9dbabd48382bbd58369cc9d64de569b31639662e75e50df2da28542fa
+EBUILD btsmarthub-devicelist-0.2.0.ebuild 828 BLAKE2B 747abdcab8c60c54753d5df548b46ec9bfb8c83f088f3d4056ccb11904121abfc1a9685af28d6b0b65939e3c708c6554d1e6caaf017bc67021917b5b51aa9d79 SHA512 9c090d56382b3332da33a21a4b6bfe8c3ae3c14fcdffcba43b70f95ffd15d5987820c15eb20140d8b88561f92c68f325ad4cc10ecde9c0978562801afec9f900
 MISC metadata.xml 476 BLAKE2B 4d26ee2307f27a37b75c82bad58300d2589b4ee7777d31be275809114a1d37da7cafbb491281d502f8531dcbd389f80af61f86855c050ed5b92cc4a8b9b6f7e0 SHA512 70430824e839a7f604da561cd86d5914a7d4d285deba57ce7609e05bb7852cec46a26067226925f2eb812ee4d29dfdadc11eb4d5b1e4efcc9179339709537148
diff --git a/dev-python/btsmarthub-devicelist/btsmarthub-devicelist-0.1.3.ebuild b/dev-python/btsmarthub-devicelist/btsmarthub-devicelist-0.1.3.ebuild
deleted file mode 100644
index eb0d797e3..000000000
--- a/dev-python/btsmarthub-devicelist/btsmarthub-devicelist-0.1.3.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Retrieve list of devices from a bt smarthub or bt smarthub 2 on a local network"
-HOMEPAGE="https://github.com/jxwolstenholme/btsmarthub_devicelist https://pypi.org/project/btsmarthub-devicelist/"
-MY_PN=${PN//-/_}
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/btsmarthub-devicelist/btsmarthub-devicelist-0.2.0.ebuild b/dev-python/btsmarthub-devicelist/btsmarthub-devicelist-0.2.0.ebuild
index c42e8b9f2..c61627762 100644
--- a/dev-python/btsmarthub-devicelist/btsmarthub-devicelist-0.2.0.ebuild
+++ b/dev-python/btsmarthub-devicelist/btsmarthub-devicelist-0.2.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/caldav/Manifest b/dev-python/caldav/Manifest
index b46ea3638..c81ff0b0a 100644
--- a/dev-python/caldav/Manifest
+++ b/dev-python/caldav/Manifest
@@ -1,8 +1,6 @@
 AUX caldav-0.5.0-top_level.patch 450 BLAKE2B fee8442ccedb990c2cee37d3fd8b3af056caf78c513b7018ba98ffbaf64c66eb0f115dfa7bf000825d844b3ff58d66da75dd4072d9ac102e8d5d2f4051747455 SHA512 236747d53aeeff4669afc11496203b90b1b85847b00674445e7671a1e51f82d2ab5f64ef8cfbf91f4a6db7314231289aae97cb3cf514533d9d429146602c7bac
-DIST caldav-0.5.0.tar.gz 43932 BLAKE2B fa6820d86fd9ddf73da7ecfa09ec179249be8f530109793d6a9b0d04156880687631d20809b5440ad6eda689d8bf868e016dbf5f752567d93b2adc65cb13a036 SHA512 17b268513f7d77cdfd87a7388c3aefe65682a5e17b1100b07a29874a40c0f0df5a270759a0ca5b63f2232f0008a3f5720ad10f834962b6efe85712b9beb4ad28
 DIST caldav-0.6.1.tar.gz 70380 BLAKE2B a22df53223544ff23821d1ac432620f3f7a87f464e7a3dae8a71dcb052bb59ce82f31e3d195a3ffa9f3b313e959bfe45d1a991e37ded759aae18f629d2c990e4 SHA512 eb6cfedc58c59faef192c361cd43382a6fcd6417953357eb79779438c4cb55543268979fd01fcd5be5137cafb99ac753739250805a56cc3dc0729467d0a9034a
 DIST caldav-0.7.1.tar.gz 118233 BLAKE2B cfb6d6c25a73d53a430c5cc50a7a8fe9b403a4a35a50d454687dc691e3d8be946ef1287b09e425df2e38a74f74bd662439c71c48b77750bc59f4a12e99b2f794 SHA512 e70060aea51d0a0289e955755f8c1b67f46af4195c6584a0a10da390b9074d37b5821e6d829bf41eb0ddf7328b062bc5ef1a300656a9415ae56a1d5cf6ab55d7
-EBUILD caldav-0.5.0.ebuild 936 BLAKE2B 7df183190dd15e3e8b1c29d57709aa0828b82cdfc4d294e342476b1daf22905a1841e193c8df2a3db7cdba41b1e39644f61d8647fe947c3d23df3f2ee6da4417 SHA512 003486163a3bb59e06dac7a7322a699ca7802d9393333141c8f9ce026121d64f9d25f9eff2ce3a8c476af681455e8cec8fbc8565b92089fdb25c0bcd0de1a99c
-EBUILD caldav-0.6.1.ebuild 892 BLAKE2B 3b10adec8112dea8dce0069346189f2ef02542720dba0c85b899be20c03fbb909aca1f5e767e756b4fc42aa6cbe36e9d4a6dd726f643882c3b22bf2b24671f27 SHA512 b0fe5484c5994dd49b07685c85a8b05236e8020c343a0156914ea95bdf75da44758f94ec8445ab1ac5b4ebb2ef6da382c5064070f0325f1db1e3d3d39e1f26d4
-EBUILD caldav-0.7.1.ebuild 853 BLAKE2B 3f4d485b3291660219153998501b3f3ab3b1992146eb8444e31b9e86bcf3b47f7eb981dba3fcec0cd240f4e401b9b35e662c90415de0950fb92fbf6cdd90d1c7 SHA512 be2b589f64fd93ce4105c7495830cc2dfda1b0ea0b91ee3a644a62a86c9c406867289c73aee8422865efa9fc590c2ccbbf6194d4928d4b2a1d6273bc0c51022e
+EBUILD caldav-0.6.1.ebuild 891 BLAKE2B 6d80177a727f232fb291c54568d0c79c759a1ddf908c3e8b620598e97de77f1595d7fabc8dc2eaa964a07b1d2387af69842e6595ee40329b04b06f5ec7dcb338 SHA512 88e074b24baf6966dfa31b76adcda1165ee324194992a5c1426d1210577b31d0bcbe77899e061cde4fa80e6f96f236b5b6af4c5b456664804b97dd48c735ca07
+EBUILD caldav-0.7.1.ebuild 853 BLAKE2B aba6d5928d048c2c2b15f29651e85fbd4eca36af6810ccaa1747a0d513531714760949aeb9fee3483d6b038414eb84d887f94ef9524b590e4aa66356135f2afd SHA512 efe2132af67c773f09e4f2c1212f633304b3953347da1d9c55d6cbab6f0c33ed61b803b81ec1fd7ac7644e7f4bd04a302600f59384117eedb3fe49b02df36161
 MISC metadata.xml 494 BLAKE2B f3d3484dddfa108558dfeaabdd27474a866cc037b61256b49a80d01762dca481323ccd83f383f165c83ffdb91276d9dd0de52acaeb33d95ccf14b6bca4cf6bc4 SHA512 8574c06bfec9a96420c10c2bce3aee056024557517ab0d00880ec3fdcbb3d2721a5e550e8f40879d06cef215f9e6571fc8a4a7c65120f9279a043ae73a01761f
diff --git a/dev-python/caldav/caldav-0.5.0.ebuild b/dev-python/caldav/caldav-0.5.0.ebuild
deleted file mode 100644
index 542a5ba4c..000000000
--- a/dev-python/caldav/caldav-0.5.0.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="CalDAV (RFC4791) client library"
-HOMEPAGE="https://bitbucket.org/cyrilrbt/caldav https://pypi.org/project/caldav/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-1"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND="
-	dev-python/vobject[${PYTHON_USEDEP}]
-	dev-python/lxml[${PYTHON_USEDEP}]
-	dev-python/nose[${PYTHON_USEDEP}]
-	dev-python/coverage[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	"
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-PATCHES=( "${FILESDIR}"/${P}-top_level.patch )
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/caldav/caldav-0.6.1.ebuild b/dev-python/caldav/caldav-0.6.1.ebuild
index 8e484bc9d..79be4400d 100644
--- a/dev-python/caldav/caldav-0.6.1.ebuild
+++ b/dev-python/caldav/caldav-0.6.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{7..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/caldav/caldav-0.7.1.ebuild b/dev-python/caldav/caldav-0.7.1.ebuild
index 470dc8c09..bc8a69d82 100644
--- a/dev-python/caldav/caldav-0.7.1.ebuild
+++ b/dev-python/caldav/caldav-0.7.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{6..9} )
+PYTHON_COMPAT=( python3_{7..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/cffi/Manifest b/dev-python/cffi/Manifest
index c13e60ea1..e49081d83 100644
--- a/dev-python/cffi/Manifest
+++ b/dev-python/cffi/Manifest
@@ -1,4 +1,3 @@
 DIST cffi-1.12.2.tar.gz 453893 BLAKE2B 653b543acdb30c5200706de578ae9d9ba3e856385ba4a2350f9d9847457f9ba5354cba6821f0b5fc9e63fe3e68612559a67633b4f9242ed4907f18d47a786db1 SHA512 af4fe47cf5d6f1126222898365cfa21e9f11d0e71b87d869014dbb37af30dca9ddf50c989030d0f610f50e8099e8dfd08a688d8c3629abbcc4f0294f5f91b817
-EBUILD cffi-1.12.2-r1.ebuild 1384 BLAKE2B 80442e67675022799fb08c6c794e5ed53a60806856c3e2ab5309a1a70b20a2dd0274f6b0b79f9434c6cf6428b50b0c25b98f02e9989a5bdcc9c5f07c4f7cbdee SHA512 87fc7825ce79501b53087b3923c4c6ef82ff8bf3e0a3d44621c8544f1e045c99f01b170999e296ffc8e7d0e78ae2fae81a719f747abfdace555b29357ac98d72
-EBUILD cffi-1.12.2.ebuild 1387 BLAKE2B 403071901dcd67b534650b92d855d0ecd2ddd62c52b42f570d787c22f6c952456a64a543acb048055ff3eb7e061fa8de2ec462fd08e60127651c35822429c3b3 SHA512 a57b4784d2f254be3dddf558f4d064baeba6dfd870fcb2444f39303a1c921344a9127f98d7316d15cbb936c68112f06b94b390196e49589d0d36d224f2669990
+EBUILD cffi-1.12.2-r1.ebuild 1383 BLAKE2B 390313ea7182e4b1d08e20eb8261b91992d81a84656e3bad6967668c3a1b70a2f2546662216eb2e33fd74593bbd77e1c98130ee6742eaab9b8a714162cd1c26c SHA512 3da2a890f1ce14a944266a671d2bb6078b643ba092f4dd5576822a6229dd4148419ebf15b3e943efbb5f35eb8ffb3c7043aa68aafeb0ce8e7671386c30d05eca
 MISC metadata.xml 317 BLAKE2B b6416209bd2358c42c2be3bd228238b401bf126919b6e7371d83d7cec8cb55a40f89db562701cc8f3dfa904e225426881b22ff1d3b72085365b5caf9b8c6a403 SHA512 0744ca7b98b2ebe2985bf2a81a337d09be62cfaa51f8380bac52f8d30941e997f09be20e28caf6967226a71369003cf35977790aba56ed0d469cc490cfa089b6
diff --git a/dev-python/cffi/cffi-1.12.2-r1.ebuild b/dev-python/cffi/cffi-1.12.2-r1.ebuild
index 435caa092..f454f2efe 100644
--- a/dev-python/cffi/cffi-1.12.2-r1.ebuild
+++ b/dev-python/cffi/cffi-1.12.2-r1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI="7"
 
 # DO NOT ADD pypy to PYTHON_COMPAT
 # pypy bundles a modified version of cffi. Use python_gen_cond_dep instead.
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1 toolchain-funcs
 
diff --git a/dev-python/cffi/cffi-1.12.2.ebuild b/dev-python/cffi/cffi-1.12.2.ebuild
deleted file mode 100644
index e309d9198..000000000
--- a/dev-python/cffi/cffi-1.12.2.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# DO NOT ADD pypy to PYTHON_COMPAT
-# pypy bundles a modified version of cffi. Use python_gen_cond_dep instead.
-PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} )
-
-inherit distutils-r1 toolchain-funcs
-
-DESCRIPTION="Foreign Function Interface for Python calling C code"
-HOMEPAGE="https://cffi.readthedocs.io/ https://pypi.org/project/cffi/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc test"
-
-RDEPEND="
-	virtual/libffi:=
-	dev-python/pycparser[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
-
-# Avoid race on _configtest.c (distutils/command/config.py:_gen_temp_sourcefile)
-DISTUTILS_IN_SOURCE_BUILD=1
-
-src_configure() {
-	tc-export PKG_CONFIG
-}
-
-python_compile_all() {
-	use doc && emake -C doc html
-}
-
-python_test() {
-	einfo "$PYTHONPATH"
-	$PYTHON -c "import _cffi_backend as backend" || die
-	PYTHONPATH="${PYTHONPATH}" \
-	py.test -x -v \
-		--ignore testing/test_zintegration.py \
-		--ignore testing/embedding \
-		c/ testing/ \
-		|| die "Testing failed with ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/ciscomobilityexpress/Manifest b/dev-python/ciscomobilityexpress/Manifest
index 1025bc824..3eb6ca37d 100644
--- a/dev-python/ciscomobilityexpress/Manifest
+++ b/dev-python/ciscomobilityexpress/Manifest
@@ -1,11 +1,3 @@
-DIST ciscomobilityexpress-0.1.2.tar.gz 9434 BLAKE2B c6f3192be5229d4cd281475edf3ab5feffbb2c20612b0719e47ed81a37df141b4ab961ad3281c309d6022fd2cc15595c14536704f6aab24d3dde89b07e7b3883 SHA512 aae2d8267309e88489468da13b2e2dd418350c186f16e13f5932a06ed1b994251391a854c1a1280abc03fc286c70b62941b7d445b69e9306ff556277db60209c
-DIST ciscomobilityexpress-0.1.5.tar.gz 9547 BLAKE2B 6e51c22b2671609d7b7b76ce6e9df581cf6edc7769e19ec8f9f23000f6c026fe9c7166c58a10f7ae43e126c9bb0a8c8fb744025ef39162a36eeac7aa76f35563 SHA512 0796ef7a2978ac2fd41b2d396fd23d218550311920b8f5d7456f5381a1d85abe09c2d41dac87a81d103853ea7641d15423a1393870f8d4fab57ca723369c11ae
-DIST ciscomobilityexpress-0.3.1.tar.gz 9592 BLAKE2B 1cc6309383ed92772e728fcd59bc272e7c1e42a4febcef7cd7fcb31ceb35f9e1d6bac99577f28e85a2b710db92b93d4944c4359b4522d8410523ea28c6f9531b SHA512 4ed4e7039a441f8657ad5da5f8db22c1d99209978804877f01c849fab661a482e640acaf073536f4d1fcb84cc132d882608d95d64807fa7099ce281bb3e2cc9a
-DIST ciscomobilityexpress-0.3.3.tar.gz 9737 BLAKE2B 67429e37bad84f052486ed33d9d9156754426a47c949b857be9a05837877db99db3839a4bd18946527077950606589511b9afb4bad9936a7bf6b538644b55ded SHA512 ffb440fabbfb11570cd997b5170d06f0f7ee996f71d533d09b61fba5ed47cb89fabd0810096477ac3d656ec39918f3da0f9a41aeb232458d0b6f1c70d0631c25
 DIST ciscomobilityexpress-0.3.9.tar.gz 10055 BLAKE2B 658de8d56bb4c6a3d3fcababef6aef585306fc15298ec72be892918ea99dcfc7329deb4d0487884fde1afb765727fa3a6e145ef0b00a8efee01c79e768a13443 SHA512 58197b38df97118d93d8ae0627c62d94333a8f85bc8bf7be1395e3495d308786412fc33563b1f385d09d13cdd1d5f8f9ac9bd5d2c0c60b982e8f4ee1241d4ed4
-EBUILD ciscomobilityexpress-0.1.2.ebuild 742 BLAKE2B cb543105ab8cd34c0356663e420607bcd54c8dfcffbcd484168edaa3f82ec2f8aefbe0cd60df72e0be9db96cafb3c36249b6bab9fd26df545092f87d254cfa3a SHA512 679bd750b39bdebfe379ca05453922eddfae4708c696964d5dc58f516ef90a7274ee19a3a50aeef9c2bb9d297f228f18a5e3400b7205158f0c1e4d250559f3ca
-EBUILD ciscomobilityexpress-0.1.5.ebuild 742 BLAKE2B cb543105ab8cd34c0356663e420607bcd54c8dfcffbcd484168edaa3f82ec2f8aefbe0cd60df72e0be9db96cafb3c36249b6bab9fd26df545092f87d254cfa3a SHA512 679bd750b39bdebfe379ca05453922eddfae4708c696964d5dc58f516ef90a7274ee19a3a50aeef9c2bb9d297f228f18a5e3400b7205158f0c1e4d250559f3ca
-EBUILD ciscomobilityexpress-0.3.1.ebuild 788 BLAKE2B 018b6f85cd6a6ec6f7852dc5a81f4fa523e34dd2be3c74e3d3839d3707548e76b0d8c1dc9e23009fef74f7da3a92a113bbba5d1892dffb7e79dc5f9b8f7f8602 SHA512 bca4c5802d96ae095aada0ca42be2ce0f6842ddeb6e82a85319bab129ed1cd30dd18df1b9ac07157b0d4c2edb1a5f72300be25a502c38ef102ee41e400ae6a8b
-EBUILD ciscomobilityexpress-0.3.3.ebuild 795 BLAKE2B 9873bdc87430acbf6813ca5074bf4dfd65add2c9a18ae7ce4bb0f5c99c51290726e412dd08ec0f72490c68fa2e105bf62efabea8672fc89fa940505b4b9aa303 SHA512 812c539d8b314e7bca21b7072ff29f5802094f9539a75e31fdde62af2e08e1b3f2e84281fb0f0ff544345fe6134d80aefbdbcc4ae6734023a24c2d081d570566
-EBUILD ciscomobilityexpress-0.3.9.ebuild 803 BLAKE2B efb749aca8a535280f43246b2092bf14d11e7b8288557bbbdaffcd1e536c62b65a49f4702e5bd159caa79754044532992973c3e713ca06c965a9a0b089b04dfd SHA512 b5fc56ac371a95e58be6f43cd0af4d246c1b3344f1c8caf62098391bde31906bf90f49bc9e679ccdcddd176383eafb76269c83574fd84e037d6328b497efbbb4
+EBUILD ciscomobilityexpress-0.3.9.ebuild 803 BLAKE2B 47716079df131d973cae199735b46de73826ed73ab26dd028e956119c76d7ad93e91eb01c26a1210a9df3ee5704989f7751d3ab144a4175c38b5bf42c0c8d231 SHA512 a0098c2aab39d5884aa98f490bb43d6e9614d1da1c044b11d4670764e8aff47ec9ab2fba8b16ddfba184de801482372f6cd7bb02fb8f1391656b5eaebefe9b3a
 MISC metadata.xml 465 BLAKE2B 32e5719f9925019daedeedccedc79376658b288603f6335470cef3981b29a5dac341f99b52dd6d6f6d729ae8593acb67bd92e1250cc80b80338b717e1efcbeaf SHA512 dd244a29a87a377073ac8d8afb2157532b93b04bea6ec958bd8de1b7cc3f6f2ccf1a91e2273f747773edae917d27baf4144f332976f0ccce4d7f6e91800b1798
diff --git a/dev-python/ciscomobilityexpress/ciscomobilityexpress-0.1.2.ebuild b/dev-python/ciscomobilityexpress/ciscomobilityexpress-0.1.2.ebuild
deleted file mode 100644
index d934270e5..000000000
--- a/dev-python/ciscomobilityexpress/ciscomobilityexpress-0.1.2.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{5,6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Module to interact with Cisco Mobility Express APIs to fetch connected devices."
-HOMEPAGE="https://github.com/fbradyirl/ciscomobilityexpress https://pypi.org/project/ciscomobilityexpress/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/ciscomobilityexpress/ciscomobilityexpress-0.1.5.ebuild b/dev-python/ciscomobilityexpress/ciscomobilityexpress-0.1.5.ebuild
deleted file mode 100644
index d934270e5..000000000
--- a/dev-python/ciscomobilityexpress/ciscomobilityexpress-0.1.5.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{5,6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Module to interact with Cisco Mobility Express APIs to fetch connected devices."
-HOMEPAGE="https://github.com/fbradyirl/ciscomobilityexpress https://pypi.org/project/ciscomobilityexpress/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/ciscomobilityexpress/ciscomobilityexpress-0.3.1.ebuild b/dev-python/ciscomobilityexpress/ciscomobilityexpress-0.3.1.ebuild
deleted file mode 100644
index 511ac0514..000000000
--- a/dev-python/ciscomobilityexpress/ciscomobilityexpress-0.3.1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{5,6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Module to interact with Cisco Mobility Express APIs to fetch connected devices."
-HOMEPAGE="https://github.com/fbradyirl/ciscomobilityexpress https://pypi.org/project/ciscomobilityexpress/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=">=dev-python/requests-2.21.0[${PYTHON_USEDEP}]"
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/ciscomobilityexpress/ciscomobilityexpress-0.3.3.ebuild b/dev-python/ciscomobilityexpress/ciscomobilityexpress-0.3.3.ebuild
deleted file mode 100644
index 8d326a9f1..000000000
--- a/dev-python/ciscomobilityexpress/ciscomobilityexpress-0.3.3.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit distutils-r1
-
-DESCRIPTION="Module to interact with Cisco Mobility Express APIs to fetch connected devices."
-HOMEPAGE="https://github.com/fbradyirl/ciscomobilityexpress https://pypi.org/project/ciscomobilityexpress/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=">=dev-python/requests-2.21.0[${PYTHON_USEDEP}]"
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/ciscomobilityexpress/ciscomobilityexpress-0.3.9.ebuild b/dev-python/ciscomobilityexpress/ciscomobilityexpress-0.3.9.ebuild
index d7afab91c..99df212ae 100644
--- a/dev-python/ciscomobilityexpress/ciscomobilityexpress-0.3.9.ebuild
+++ b/dev-python/ciscomobilityexpress/ciscomobilityexpress-0.3.9.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{6..9} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/ciscosparkapi/Manifest b/dev-python/ciscosparkapi/Manifest
index 640cd9524..ca78e797c 100644
--- a/dev-python/ciscosparkapi/Manifest
+++ b/dev-python/ciscosparkapi/Manifest
@@ -1,5 +1,3 @@
 DIST ciscosparkapi-0.10.1.tar.gz 44703 BLAKE2B caa3deaef46d6daaf6b86fcc941e95eb61a3c4851470f46499b71da2acb00a58c572ea31a3051f4029b1a24dc3f7aa8536587c4f85993c56f1079472685709f5 SHA512 49045a5dd49bb8f8eb9ce76991bfa4a7c40d06b488499d62393ea0f2ab289b90eb749cd7989581b940572ff5f8ce9b7edf5cf39a3f5d42a3aa2e009e80dd4995
-DIST ciscosparkapi-0.4.2.tar.gz 33815 BLAKE2B f821c2e3da9340de6d739499749ad5658e10d1c7a073299e042933ebfef2f843098bb21e84d990ac82810d2afb1499d54e7be5f802dd52f8fae2caf0096b9e72 SHA512 0837000a054111e768ac700d246e2fe35b86256f6a97ac5117c40e98be925061ec9bfa1112df826f801579ad36235ff508cd6b324a1347ddd8137ff72fbabb56
-EBUILD ciscosparkapi-0.10.1.ebuild 731 BLAKE2B 3b92218d3717ee149a98d72ec77ec9de1b47fbce0c7038c7d1c9f0c6339f38b64b8fe6d8eb37a713966d4abef7b89b68df0dc988810b6937187033542df764c8 SHA512 584001ec585a65ff0549f4e5e44675d198b6b49c762043326dec897807b0ba2a4dab616a085ebc115eb6b6300b5fd31edaee1653d8f818c0360b7f42ae5adb2d
-EBUILD ciscosparkapi-0.4.2.ebuild 724 BLAKE2B 143e661d9d6e88dee849764eaff88ad14b36b4c3078f7e3f6a9d9983cd4ec46c480b66a6fd2b1adfc2f0d55891b259e112025b7a9c68c8ce1dd2b78c65c7bd8f SHA512 74e73d9c551f0933d05cd9b114c16c51f989893bc616e6dba35bc39207a64264f00016ec82b76c6dff1d49081b8a9bcb2b88b52f55b47fad84e8d3b094f9e38d
+EBUILD ciscosparkapi-0.10.1.ebuild 730 BLAKE2B 97f5e2a1e5438c8c4e13f2f441e254fd71ab34271a7a2da9d12f160f064257145244532651b9c9c80ccb1b1ac948b468d1a1fada16352d3190ef611ca6be614b SHA512 c6be39a78be5697efc6d2cb85cf368eca5a0d6b165eb3c869ad1174b06fb38b926b9c51a4cec5a9a89d75f75f8b2e7735d8fc908259f7031e9e15ee55921cff5
 MISC metadata.xml 458 BLAKE2B e6026863b56f7fbcdb56e709d1fd474c7e7c74619589c59e8708dc5fe1750f158ecbc698786e53e74ede55014d483cb86f57e7102bf28d32c24ad1f3c9f6cc24 SHA512 771974c38ff29143ae57521b9724eed3da0d245e046434f5fd46a6214139582b469c2f3984a63beb6f64209c6a163d7304d42ec78ac3eafdc1da1e90f212d73e
diff --git a/dev-python/ciscosparkapi/ciscosparkapi-0.10.1.ebuild b/dev-python/ciscosparkapi/ciscosparkapi-0.10.1.ebuild
index d3c7105fc..a53afeb52 100644
--- a/dev-python/ciscosparkapi/ciscosparkapi-0.10.1.ebuild
+++ b/dev-python/ciscosparkapi/ciscosparkapi-0.10.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/ciscosparkapi/ciscosparkapi-0.4.2.ebuild b/dev-python/ciscosparkapi/ciscosparkapi-0.4.2.ebuild
deleted file mode 100644
index 0cc4ef2ee..000000000
--- a/dev-python/ciscosparkapi/ciscosparkapi-0.4.2.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{5,6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Simple, lightweight, scalable Python API wrapper for the Cisco Spark APIs"
-HOMEPAGE="https://github.com/CiscoDevNet/ciscosparkapi https://pypi.org/project/ciscosparkapi/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/clearpasspy/Manifest b/dev-python/clearpasspy/Manifest
index ebf7147d3..eadccfb23 100644
--- a/dev-python/clearpasspy/Manifest
+++ b/dev-python/clearpasspy/Manifest
@@ -1,5 +1,5 @@
 DIST clearpasspy-1.0.2.tar.gz 2879 BLAKE2B 47c408fa5ae0259f4d21ce0a64a6a134ad9f83b5b79e93d9ca19365623060eac7adaf1b4c71848bab2c765333aed2f88de5289a2755dc91d6d87910d8061628c SHA512 716422c1d5546087004c3681f4f366cebd06b6f04c6b1b1e0897ece354c74e2e55c4a1633d8b31296421350bbef52b4afbad92540111ea08647e7c9683e9cb8d
 DIST clearpasspy-1.1.3.tar.gz 3027 BLAKE2B f84bce2e0ec69a01a7cb56cdeac0a042e44431ae5c6fa34162eae55d77d0f146d641b6a7bfa94c32600c008aba7f91ef2c31a2f1f43a8e24c93884131755c493 SHA512 7e12d1a9624c7a80c49adb6588d717eecf421ef953350f1dc8edbe82762ff822fbf4c0ae595ab7931e0199beda45c30dbe7601148d636e66e764b6790931bfc9
-EBUILD clearpasspy-1.0.2.ebuild 673 BLAKE2B 12c8d0301d9c23d7f2fd643903ff6d57d04554779496ca0c60c02fe8c5f284b8557798a27f05a7d1c9e71ec821053b0a53fe6080ed94b59b98754d7c64490b17 SHA512 a7476f5dd405a8c0902142b58990af41a28656f8e4236a3d52c0e13d84db8f0e9d2a1591f3b8acb53cc7c8327520d0e15979f1a7e01e1015f5be380075221bb6
-EBUILD clearpasspy-1.1.3.ebuild 680 BLAKE2B 76e4865b335c415c54256d66f366bf4b49d09f64a655373d2ef197c965283a889282c68de69a6d62dd36f72cf9b58a6c8efc01fc96f527ef3cc855d9d7f0be90 SHA512 97c85c2be85e3ef3e35b2aa35d07d4af857c29f7732e07e7a1961234080e9cc3b9b48651e41498ec9c07aaafe2f5f55ca9915adf078306d5444a6f420a87aa3e
+EBUILD clearpasspy-1.0.2.ebuild 672 BLAKE2B 3fd257cff03bc85e3cf7b34c5ef7c72eb461450eff5f7adb0795867cbf2cd5a964af3e1468271b8a8e407a7308daf537ea54493616a53bcfaed30a24fe92cf8e SHA512 382225e964116cac3aa43f307f77635301feb5c8de1555decaafd08c75d3ad44d0c56ffe88c11ed9e83ee3284a9150314efb4d86fdec2575b5aa96a7f75c4c00
+EBUILD clearpasspy-1.1.3.ebuild 679 BLAKE2B a30a37548545784168e698f81a0a141f7ece35f5736d8fae5a4b89395e4f58068179760807664648658d25e85fd68fa1fc86de546b933f6dcc23ab76962974b4 SHA512 45d91305d9694e33c0bb4732d92ae7e43091fdad0f9c42147b6056e9208ac110fd8bad2d91aceb8d80a584a4f3b57039cae1f228cdeed0617b891a160467c7a9
 MISC metadata.xml 455 BLAKE2B d057c9844a4962e9866e959f872b8ebc71215d445768d6799567048822c65e88671020a8f752962dd3eacf07a04fc182a52836d1dd8ec9bc54c343bea62d44ce SHA512 a8319c049cdfe7571fc75047a1b1efd6541fa442cf724244f8ee7e5420139a79d2107a14b5c9d408d84206e6bfa9bd458c0c537b3c1df18128aec1461e3cc304
diff --git a/dev-python/clearpasspy/clearpasspy-1.0.2.ebuild b/dev-python/clearpasspy/clearpasspy-1.0.2.ebuild
index bf0edffd5..3d4512ff5 100644
--- a/dev-python/clearpasspy/clearpasspy-1.0.2.ebuild
+++ b/dev-python/clearpasspy/clearpasspy-1.0.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/clearpasspy/clearpasspy-1.1.3.ebuild b/dev-python/clearpasspy/clearpasspy-1.1.3.ebuild
index 947ee02d7..52be77ddc 100644
--- a/dev-python/clearpasspy/clearpasspy-1.1.3.ebuild
+++ b/dev-python/clearpasspy/clearpasspy-1.1.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/click-log/Manifest b/dev-python/click-log/Manifest
index 53596b231..c08ce78fb 100644
--- a/dev-python/click-log/Manifest
+++ b/dev-python/click-log/Manifest
@@ -1,5 +1,3 @@
-DIST click-log-0.2.0.tar.gz 9665 BLAKE2B 5a46fa349efb36ee8932631ecd08af3eecd4e1e11b378be5a9152211c194671cc94078ef6071fe9794e9c05c8b0b5b07cac0f4955246e72f3076ac2245c61f3e SHA512 d34166f2174483f9ae9106d4b3540eea8bf6877e1d3832cf12977d50845638f4d431d505cac44f585e3b4c5d5a62c3b1c0c88e9b196aa8c928ee50af65920019
 DIST click-log-0.3.2.tar.gz 9523 BLAKE2B 212ac421b402fc0f32a9aec11a9e20c87a8148c461af87af78f8068ca95d60cab0c47bf24162aefd1c299ba783fb7a70e7e9dde01f0fc1f7c44a69fa8cb07121 SHA512 8ae5c43d739127367bbcdcf32bfd4b34b2ea1c377948df3b8588e4bfe2b0f5e7a61d1ccc6cb32c77045b15251222866daffa5a7bfb7a907487548784ba345351
-EBUILD click-log-0.2.0.ebuild 674 BLAKE2B c34915efef84d2674191c6dfcca41d9fac1c925413ad91fcac1aad4a0ab944577e9f8c814672686092a306713eb2e241f68d8eccef8ae2f1c87f28b2d540d694 SHA512 682506e65870b95b6d0e878a905d73735ccf0492ce56dc2b85432bd078f146a18ca7e934922ddc9b26f12f857deeb3f0d46cfccc22390575ff3739277e4d8fe2
-EBUILD click-log-0.3.2.ebuild 681 BLAKE2B 9089be73b5bff756084e60ddd6670a63023dbe29fb32d64a60d1225f2b4a2adc4d1ebffcfd71d631d96b97129fce604fff36b576ab0d2ee1490818eaf4a10c86 SHA512 e6e5f5562c539387c696e6c3f0b5c7a2aa4f02d4461bb3edbb5c46edd8d6e93980c216ee2ff1b958eca741b9d9de678a62226a999100a423a2eb2aeef002f027
+EBUILD click-log-0.3.2.ebuild 680 BLAKE2B 309f0f60892f3d0a4a723e0c18fb66f11a7b25e82bb523f39e2e62e5246010203cece9fd0899ccffbb4adaf66dc5f1dcc0882f8600824407ad20fee97f82ea05 SHA512 79e16cd7d361a1e03fa104cd6d40f51026b58cb05302f81f430267dae2ef8f0fdecb75257a5d875db51f2748825aed10dbca365aace66c1f9ffaeba2c966f21a
 MISC metadata.xml 466 BLAKE2B aaf15f6f20427fc37ef8f01a46bef96c330cc2e765ea6a157a6251539cad7cc9a55fd079812d612fede095bccbc10eadcd9dc7a67f6546ed9c021d4675514a93 SHA512 aaf7578a7f2c339035f623035fef53ad937afdefac6eb9480dd32759102b704e0ec722625cd6b61c285cec4eec13ea5968452ba7012b00ca58a64493af1bdd77
diff --git a/dev-python/click-log/click-log-0.2.0.ebuild b/dev-python/click-log/click-log-0.2.0.ebuild
deleted file mode 100644
index 929b57da4..000000000
--- a/dev-python/click-log/click-log-0.2.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{5,6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Logging integration for Click"
-HOMEPAGE="https://github.com/click-contrib/click-log https://pypi.org/project/click-log/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/click-log/click-log-0.3.2.ebuild b/dev-python/click-log/click-log-0.3.2.ebuild
index a8382b11d..eaac57fc8 100644
--- a/dev-python/click-log/click-log-0.3.2.ebuild
+++ b/dev-python/click-log/click-log-0.3.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/coveralls/Manifest b/dev-python/coveralls/Manifest
index 068819bbd..e3032faca 100644
--- a/dev-python/coveralls/Manifest
+++ b/dev-python/coveralls/Manifest
@@ -1,5 +1,3 @@
-DIST coveralls-1.2.0.tar.gz 14281 BLAKE2B c6e3cb5e3fd7b6db46200feff9c1af6190e5209ca327477abc46f737fddfd10f4e6853ce7fa6535f2c776fd0ab61f56313b1dc17696338b8f3ce8e47abda164c SHA512 96ca826bbd9a3f23dbd79aea43de0995c63024c8de192e4fcdb142f43c170536fdd8cec8b55fe9c2552854698c60d398e1b4bad243b3cce0f2cfd9ebbbc8cd67
 DIST coveralls-1.5.1.tar.gz 11404 BLAKE2B 2dcad06c1751301e5f41bf0bc78795486f5309ebc48e931e4e81cd6f1f6c0cfabcbf865efa5959c81a444141fd2193637ae5c2ffc67a78e6dca16776da55417d SHA512 7073ea7980e78d01dc0f2faa7bebf7c25a4563432b667277a7b6b632f0e45cc26caded9b865806206dd5d7ff26b2454edd095485fc1059d586d55db647f0f7c2
-EBUILD coveralls-1.2.0.ebuild 832 BLAKE2B 06c8d6d150f1c475ca8eccf40bbdac076e9f57b691f54071533a591544fa6d9f4fc06b69fdbe26249e7d90cd5a04e804153747c33e82d712b2377701f6086f08 SHA512 1314347cb05dd0fc4791ba75762e4a8e67b62196881b7e65bb252a6f80bb8dec97aee07a9d8b70de0905afccd3751e7201c4db5fd972d8f6651ded90225fa233
-EBUILD coveralls-1.5.1.ebuild 841 BLAKE2B b1ed5f4aa3a85603e43e924741ee6243b7d821c4f514f965a74b3cd3e425df7a8c85ca618a8cf661dd68d30a90a2b9dadad3f0982113c4c7cccc59aa07a523fc SHA512 8bd56ad48e82eecaf8d2999dcd292255de85d16ab13e735656db60c8446fdef91ca4c119efc95d66f32992e4c627a4a559c6722cf77b41ab0907d2e177895a03
+EBUILD coveralls-1.5.1.ebuild 842 BLAKE2B 9af9194c968092d6c0a120685b0318349ad2ff3ba86b4234d07e264d4d303e030d56793e35d2da3b69accce416b59e9708011bf324c530c4bd5c17d030b64ba8 SHA512 3f2d9a74333f2f724aa9567e3385e8978c85d595911d1e094d628b0596570afc68f6d96bf66e1d81977b6ccbf102dd439f01c306dcdc0799ac2a0326040b1052
 MISC metadata.xml 215 BLAKE2B 6bcbc29003d6c295f4b554203e900036f77b3c032285ef4e03ad3d2a87ab68309a9f76119ee45f3f054293a23693bb8616d0a22f4b022312e198fce33fbb24da SHA512 4eaf57e74d82f0d753d1edf476af815e5d0d8291eb096cf191c420e35b922090b674d9b39df6949028881bd1e31b1cdfcdde2f4c8a1e8049ecbca64b85ea9e81
diff --git a/dev-python/coveralls/coveralls-1.2.0.ebuild b/dev-python/coveralls/coveralls-1.2.0.ebuild
deleted file mode 100644
index 383e01de5..000000000
--- a/dev-python/coveralls/coveralls-1.2.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Show coverage stats online via coveralls.io"
-HOMEPAGE="https://github.com/coveralls-clients/coveralls-python https://pypi.org/project/coveralls/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=">=dev-python/coverage-3.6[${PYTHON_USEDEP}]
-		 >=dev-python/requests-1.0.0[${PYTHON_USEDEP}]"
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/docopt-0.6.1[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/coveralls/coveralls-1.5.1.ebuild b/dev-python/coveralls/coveralls-1.5.1.ebuild
index 7921d727c..14a78b82e 100644
--- a/dev-python/coveralls/coveralls-1.5.1.ebuild
+++ b/dev-python/coveralls/coveralls-1.5.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI="7"
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/curve25519-donna/Manifest b/dev-python/curve25519-donna/Manifest
index f5b376bac..b4bac72de 100644
--- a/dev-python/curve25519-donna/Manifest
+++ b/dev-python/curve25519-donna/Manifest
@@ -1,4 +1,3 @@
 DIST curve25519-donna-1.3.tar.gz 19549 BLAKE2B f9ba8f691cbe519e3121453703f1e9f4ab6d60ef67b356ac68b188ea9eb0d957b26413c20de40469f5af9044e4cb7c90640fb4d399a343c8a5399fa14d654f4d SHA512 a7cef5838ec58eb77e833cbdd646fc9a9cd48bf3fe12ee420f12f0e4d2deb53dd78d78767a9a994f9c7e0d6166d18acca0de648371a861b4e52fc43e42226f2c
-EBUILD curve25519-donna-1.3-r1.ebuild 595 BLAKE2B 486baef521f147da81c628f83fe0858413fad12b1b21b68681c2d875207ae3253423f3994355ae046e7f181764d9352bf1f4956e25fb9174c6b9420cefa785ce SHA512 b19d0922c020f22d42fa85d560bc58ae75e5e17cfe7941be3b3f33761b657870ec8b44693aab360eba8458f7e7bfc5a3a4cf9c5530aa5eee6ef33d602c75770e
-EBUILD curve25519-donna-1.3.ebuild 568 BLAKE2B 2750870376f991f570babebf865bdfa15ba38565d258a0b80340118d1819e9ffccadb4df86760709b0845416c6ee937f88381d8dfa64d533cecdb576062e2d3d SHA512 9d6b4e811d73638fa659c1f0699a5b6a4febda550e8e19a98aa20a0b64eebbc2473f82045d9086efc82da5505c9e1249fa3d9da8d70b403030cfab839cec75bf
+EBUILD curve25519-donna-1.3-r1.ebuild 594 BLAKE2B 8b945876d12795693b389dc04b1987f5304b8823918e4ded08c9928063ce8415d8da80b23fdaafa1afb27da5a3d979311215ec6e502a7b4218082aa340c7fd20 SHA512 ba9ee2df19814ebc26659e3547db29182a2dd79c2f704d16f428f0467a447322183edca4dd45feec25513758fc1fa54beab2898194e21776a1d877acef982fd3
 MISC metadata.xml 252 BLAKE2B 507e0ddc9d50b879ff374b903b142f85d020dfd6c486aba2af84fe082c878e780edbb79188ae10104d57db0eb775c86814cc8c06891a3854c9da840a4d377050 SHA512 9470ac9c8a5a4f80e3f767e7aa198addc7b21866c63b2a310e9f41ce65817672fb77423117bdd619e99cb62322025aeadf50717e23eafabf99080fcc106820af
diff --git a/dev-python/curve25519-donna/curve25519-donna-1.3-r1.ebuild b/dev-python/curve25519-donna/curve25519-donna-1.3-r1.ebuild
index 2d0765f21..e4e68b3d1 100644
--- a/dev-python/curve25519-donna/curve25519-donna-1.3-r1.ebuild
+++ b/dev-python/curve25519-donna/curve25519-donna-1.3-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI="7"
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/curve25519-donna/curve25519-donna-1.3.ebuild b/dev-python/curve25519-donna/curve25519-donna-1.3.ebuild
deleted file mode 100644
index eadd83896..000000000
--- a/dev-python/curve25519-donna/curve25519-donna-1.3.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
-
-inherit distutils-r1
-
-DESCRIPTION="Implementations of a fast Elliptic-curve Diffie-Hellman primitive"
-HOMEPAGE="https://github.com/agl/curve25519-donna"
-SRC_URI="https://github.com/agl/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-RESTRICT="mirror"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-
-RDEPEND="
-	${PYTHON_DEPS}
-"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	${RDEPEND}
-"
-
-DOCS="README"
diff --git a/dev-python/datadog/Manifest b/dev-python/datadog/Manifest
index 46c8c322c..b4738ca48 100644
--- a/dev-python/datadog/Manifest
+++ b/dev-python/datadog/Manifest
@@ -1,5 +1,3 @@
-DIST datadog-0.15.0.tar.gz 40246 BLAKE2B ae4813de5e1783287758fdced44c049af948aa5e946a9436e34344fc3a82702059bf87b65b2093a806f4e521a8773e8bce9311f7a0c93cc6b2668a1252f82f36 SHA512 abf1c85e11f1a209ac7035c7309c5e6d1c89ab2646ce72e1bdee97ef9548e42fffb90c970a2160e384daab3109ce0b04f6422c62597992172c9ad3df1489af9f
 DIST datadog-0.30.0.tar.gz 194640 BLAKE2B f0849cc771b8221bbfea291e32198925b7e989243d3e0e20db001f1fb08bded37fc765634f7772622bb5d721d24045f48c7fe4d56e57f0c3452d49444f62d2a0 SHA512 2bee419badf2a7b24fe99389d49580127f06158461f6a149073be43aa1609837cf6d432cf9982d5a4828046ae54f136f97e0cc847c776f6103df54a977481b1f
-EBUILD datadog-0.15.0.ebuild 652 BLAKE2B 5d22185141d9b8096b905a00eeb4dac15ea16e5d51cb65e4f1f614a741c453a75da70f15a9523d0c6c7bbe62aed5af9b6209b0c3ac0fb9f35b1df47015637729 SHA512 eea3743c0b8cdc7bb5f77d73a4bfb81f4ac99f68659e01225041056fbebc898f4ca0464fb8cea3e0224be423c369b523c3a8b35cb2ff97336ec4719e185a1513
-EBUILD datadog-0.30.0.ebuild 659 BLAKE2B 9971abf255ef9760f14c4eaeb8f8ae9af723d197c30aa0fed99b85cef3ba01b7cebeb735e8a47aec66006d1dfd237e62bf2a85697b3e9953c81ae3567e85fde6 SHA512 8c906904763f763cb8a85bb93cd0b5449bd8dbef4c35fd22f94865b435dd7b7216a534a19e012c5780b771d66215b13e79a9955d5fc16337b769e71f517ce361
+EBUILD datadog-0.30.0.ebuild 658 BLAKE2B a5eb0d4774937cc3dbeee2bf28599a15b0198f08d1c32dcba05934b0d654796c709b09726de6c72bd6ad556956178d2d82d273ffa0a2a0e4059b5aa736869de2 SHA512 968c2d0bd9449c08fd63fef793a5e40dcb446d15d4685a2e64e6ea0cdc0704a09f23e5d3a31d8b097a22945e157eb6af7c57145e08af4be5bca193b01510deb9
 MISC metadata.xml 450 BLAKE2B 2eae0d7710937cceadb3b26eab80498c14fd6c4b936b67b0051b155293107d62daf868acde14c25fce80fde9b227de11b5c27a61784cbff16a650a3c0168f871 SHA512 24c93b28d4f812425bbf51bb5d25fccfe63116aece21d912e1588fc3b8715506bd07c470d57b0c5c533545a2cb8a294d647650b603330593adc58e2b563be739
diff --git a/dev-python/datadog/datadog-0.15.0.ebuild b/dev-python/datadog/datadog-0.15.0.ebuild
deleted file mode 100644
index 73ada71da..000000000
--- a/dev-python/datadog/datadog-0.15.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{5,6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="The Datadog Python library"
-HOMEPAGE="https://www.datadoghq.com https://pypi.org/project/datadog/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/datadog/datadog-0.30.0.ebuild b/dev-python/datadog/datadog-0.30.0.ebuild
index 0b000face..dff472913 100644
--- a/dev-python/datadog/datadog-0.30.0.ebuild
+++ b/dev-python/datadog/datadog-0.30.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/datapoint/Manifest b/dev-python/datapoint/Manifest
index 8c9d7ba2b..cbbfb653a 100644
--- a/dev-python/datapoint/Manifest
+++ b/dev-python/datapoint/Manifest
@@ -1,5 +1,3 @@
-DIST datapoint-0.4.3.tar.gz 6138 BLAKE2B d06647f0167b0afa86361b6bcc3a448b4b1d0ef8eb959ff82c533675a237c2cf44d916d9a13a7ed15c6d170ab8232a4f0b6a284ad6323b8af48104349462e9b7 SHA512 1e55ad82eb72220a2719ec56569061aa61c40d4b75f1d06313fe5986750ff45dcc91f937467e3a5a502a769f72ef9f1744a78d0a7c4c74a7c9b86d6019a2a964
 DIST datapoint-0.9.5.tar.gz 29442 BLAKE2B d6222f24172536aaef3e1dd4631b0f66fecbc8a3aa717476ac8bde182e5239d6ce20fe14d4d9a21cf7d9e83325c6f2faa65e30d57697262ad5b6b77f03000826 SHA512 0f96ae1a77ee4bcf521c40e2f334fa402192316458676a62340772777a197de0f06a4670994c4b3e6b84a0e52a83c1c5c1e6d7ac8cc3e76747581cb48c5bf53a
-EBUILD datapoint-0.4.3.ebuild 812 BLAKE2B da1d65b1d0816e027940686668318d30d1b2e2e297849266f2ee8594e7871b5ad0331cd8ec6933f8a770f2f4124d758524ef2c4444fe867f67dda252d2e5282a SHA512 be45c17ad736b0634666f60db74e03f7f748ac8a2cede3c9d662cfebf8aae49f6b4d8733b6c8b6cb7dd5789049bea42619df919d02c4c49f9a613e1a4bce9c3e
-EBUILD datapoint-0.9.5.ebuild 821 BLAKE2B 65886f40c880aa37c7fe23cefbbc58f7b8cfb92c19db86f9b81c250360bcd22aaa9fb6c16609d00a6639eb574a3b07a739de7fc9a078904d664aba55e25a6b19 SHA512 7ead7b551b2decc16d9d82775d81ed30da735f7e5399743c6998481480ecadf459ffe25b332f2ec6dd32e0a1e0a0fe052a39052b4033fd75a5d36403452f280f
+EBUILD datapoint-0.9.5.ebuild 820 BLAKE2B b421c366b1e21abac8037d4a8dfe0d244d3a64a83b6d2ffdec5988ad70b9e7a356abfc1a4b999cfea07a9f39db7ffe94d1411deec4ae81f2d08b7907192c6f82 SHA512 0db455377b294cdc44c03e936ee00316e4915fd76bae38b4dc01a423b6e1e72595a42b6c49b25d40a0ccb48adb19c6fd3c4f296bd6fae0e2059f09c8a949c6e8
 MISC metadata.xml 457 BLAKE2B e43ebd4be36ed0ad48e96a85d5d929f6f2880fe9a8af8001efc33317df1bfa90cb49866b97661fdb1af93de963f296833f6e8a70f36ef0498ddd6bd496e7a4cf SHA512 0e5e5089ca10d2d5a3bdf16473b46cb595e46682f81554ca9104bc15842c746daa4e1184aba9d08c4567321a80c045b428deda24c025ff6d85c1560746485da4
diff --git a/dev-python/datapoint/datapoint-0.4.3.ebuild b/dev-python/datapoint/datapoint-0.4.3.ebuild
deleted file mode 100644
index 42a25f695..000000000
--- a/dev-python/datapoint/datapoint-0.4.3.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python interface to the Met Office's Datapoint API"
-HOMEPAGE="https://github.com/ejep/datapoint-python https://pypi.org/project/datapoint/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND="dev-python/pytz[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.20.0[${PYTHON_USEDEP}]
-	dev-python/appdirs[${PYTHON_USEDEP}]"
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/datapoint/datapoint-0.9.5.ebuild b/dev-python/datapoint/datapoint-0.9.5.ebuild
index b35db0640..70c118781 100644
--- a/dev-python/datapoint/datapoint-0.9.5.ebuild
+++ b/dev-python/datapoint/datapoint-0.9.5.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/deluge-client/Manifest b/dev-python/deluge-client/Manifest
index 11662b14d..1c5e69d3d 100644
--- a/dev-python/deluge-client/Manifest
+++ b/dev-python/deluge-client/Manifest
@@ -1,5 +1,3 @@
-DIST deluge-client-1.4.0.tar.gz 8634 BLAKE2B 1669a8d46e6d21b3b20981b2f05d97fd95a34ac5785119c96a742ed32e94953b179ae596f70a3e61b4b008c191caedf029d76045dc53c7faa59d7d1f0508083d SHA512 526501a7577e52824a5f176e0d9e4595e946826438852591261ecc0c6485a95ac558a2869e284d05d5360d1fec10333625be8cc9d1b596ef56a258aad8e84bc1
 DIST deluge-client-1.7.1.tar.gz 9966 BLAKE2B 0b54aed310417ad6e5e6cfdca17d8192976066a665d97a08effdde5a8b6660a9f85e605e00a3b8e9b702693751021dfee9f267d4fd9fb69622e0c86ef27c53a0 SHA512 80ad51704ff7d01775d10dfc77f71930a585ef4f2d1d13d0bb7eeb9925aca488b6a7a1efa9d1f9e87e5e9c237ded4a2d85996c80ea4d5264ca61c175f7e0b849
-EBUILD deluge-client-1.4.0.ebuild 668 BLAKE2B b54b4b5bcd0411a9a88a0a60591845011f0d7467ae83942d5a989567bf72ce9af238b9067bd9b748a953e80147059857b04db99651a90b02159fce7bede884d9 SHA512 fba1fe363474417b665752edb894bb944c3fb3b89f5815def2a5d34310d556253aa3a0c3afc228a2a60197e2403130516a9594aaf5ca136c2c1466bc8b2caa20
-EBUILD deluge-client-1.7.1.ebuild 675 BLAKE2B 9d3e734364e20c14f84f64b67d625ed76b4df7f927ccb77931be66e81a51ff4722012568e2a63aafdadaab92b5e1faae887ffcebf73323b62b40c3b8575df661 SHA512 e13d8d53d1c4a34c0b04c334e464c7f7fa7dcb72b6ca3160cc13adb2ab6506da3f4d9c6b42e871621f2a2e488d3deb5dc7487144e8557f7eb7cb56b8660622c0
+EBUILD deluge-client-1.7.1.ebuild 674 BLAKE2B b158a1527681436ede386ff4d1f7cbf9ea3a185e8a751f8a1a9b4aab26f9230a288efc54d6db5c0f69a84687508513f2fdd8cbe4d986d9f560d8cf71f636c274 SHA512 da346767004baa96199757e6de9818a44293a10de552dcd7ee5c1ba5bc8bc0f0e32f31d84c31e9a7bf678180b76dd7a21ad134297b8aa68d61ee22de24b1d546
 MISC metadata.xml 472 BLAKE2B 3ccfb8f507b8b23a48d94e6aca4b3d7ea75f0e94a15d9a527f7e39ec3bc4394043af2475afd6e42a535b8a75b6048f308ecb9a83d65a8bbf0ee6b905446e4758 SHA512 72c41dc79f5651174eee90b4a21f88198572c53cc8e4b6fba5e9b2e456ed9b7dea7347f20e115b19f3805e42fdb3c182c8289fb08306afecec97701183626681
diff --git a/dev-python/deluge-client/deluge-client-1.4.0.ebuild b/dev-python/deluge-client/deluge-client-1.4.0.ebuild
deleted file mode 100644
index 7bd7a8784..000000000
--- a/dev-python/deluge-client/deluge-client-1.4.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{5,6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Simple Deluge Client"
-HOMEPAGE="https://github.com/JohnDoee/deluge-client https://pypi.org/project/deluge-client/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/deluge-client/deluge-client-1.7.1.ebuild b/dev-python/deluge-client/deluge-client-1.7.1.ebuild
index 1a9ef5fa1..a7304bc48 100644
--- a/dev-python/deluge-client/deluge-client-1.7.1.ebuild
+++ b/dev-python/deluge-client/deluge-client-1.7.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/directpy/Manifest b/dev-python/directpy/Manifest
index 20f63a236..f4adee86f 100644
--- a/dev-python/directpy/Manifest
+++ b/dev-python/directpy/Manifest
@@ -1,7 +1,5 @@
-DIST directpy-0.5.tar.gz 2433 BLAKE2B b1189b3840c7270c85a8c891e006acddc4150d4f647a470f4f36be923779f4a1bbb2247fb43b7d88ca934c31fe3abe188792653eda0e96873591039beaabfac0 SHA512 5fa325a8459390fba984b2465888f48f8e2d65f1e6ea58354e83c305878b1786c2517fb957effddb9f025ed99549ea4e0a48b425455ab74fd15a0594b639212b
 DIST directpy-0.6.tar.gz 2481 BLAKE2B 5c927fb5804fcb6f1802558d2fe99bfa7602df299eb0d3a20c94d2239ddc0bfafeff070573953974e12ca592608bb09b3ac56ef28e5e56ad317b48a477ae7059 SHA512 3d202f6be13caaa3ac06a896c408f4a92db321e5f5c383ba80d0ea0c0cb5f9e71375a3ed8330d62309879bc1fc01bbed9d1c0723781b9dc6b73b2c730403aa94
 DIST directpy-0.7.tar.gz 2951 BLAKE2B afd7010e54a61ae7c4161c5aa8637e84459887a5fbf486f7d7fe62760dcc620a3a4eaf4a771e979607ff82d67ae06da7342eac78db8302889d463bd520896c73 SHA512 faf8a75004caff1302edbe98c4ff25e6d1fed21cbc1c5fe13381f1f29cbce655014f0191277ec4c818f88f93cecb180cf3a880fb40cb21ac16276007e7f7f47b
-EBUILD directpy-0.5.ebuild 693 BLAKE2B 7827d11ea1e6e7faefaefc9ed29892a9cd75bc3a75269566d6d9ecbe7abbd5fc25869a6200de7eccf25605643299f87373271336f0ad28e31a6087fb44b71efe SHA512 b1434fefdb7d0d4cfd2b96c1c263b1732f277c0b9f03215a033f788ac81c5187131d8eaaa3894bf6104d1f68d0d616e35772b3904e46f25ef2d68a1bf3c1d32d
-EBUILD directpy-0.6.ebuild 737 BLAKE2B 423c10e5180509566b82b64cff7d0512c0564f484ced4b7734c961a8d211c5cb5977cc94daed4e0f2c31534fd506684cc88979d25f595a7e5ada77274a8d035c SHA512 8a2cbb4d45a4195377ae767e3608087624e977097a3d76b63a40ea33a0b5ccec5d8bf0de3934742476ea51d6b0f2cd812380135f4bc3a8cf730b95d503219974
-EBUILD directpy-0.7.ebuild 737 BLAKE2B 423c10e5180509566b82b64cff7d0512c0564f484ced4b7734c961a8d211c5cb5977cc94daed4e0f2c31534fd506684cc88979d25f595a7e5ada77274a8d035c SHA512 8a2cbb4d45a4195377ae767e3608087624e977097a3d76b63a40ea33a0b5ccec5d8bf0de3934742476ea51d6b0f2cd812380135f4bc3a8cf730b95d503219974
+EBUILD directpy-0.6.ebuild 736 BLAKE2B 27edc1d8b0bd561c8c34b84a25d5eb4ddb0e859d7cb17fe8afd80eba654d3fc1826cbea67c7c72ae9c999a5a462005d1cd175ed7efe73ca523b8b700a9a6565b SHA512 def4a31ec858f04886f9416ec233888620a35de879c4ce83dab1de78b94de5acbd34fa94b514cda196e099ac369a7919aa66b12cb41bdcb164344ad0143880da
+EBUILD directpy-0.7.ebuild 736 BLAKE2B 27edc1d8b0bd561c8c34b84a25d5eb4ddb0e859d7cb17fe8afd80eba654d3fc1826cbea67c7c72ae9c999a5a462005d1cd175ed7efe73ca523b8b700a9a6565b SHA512 def4a31ec858f04886f9416ec233888620a35de879c4ce83dab1de78b94de5acbd34fa94b514cda196e099ac369a7919aa66b12cb41bdcb164344ad0143880da
 MISC metadata.xml 327 BLAKE2B e8c248a7a9ab371222468a5cf22ebf1e01a95e0278291265f000d85678cdc5504a5191b2de1926a14422b071608f06e870df6e000b0cb21606e396f013c695f9 SHA512 87d885ccbc62bb678f68e2db234a4e17f1e5a3a94623540b47e8af88db5bd19e02590468b4db0b71c03a28998f28625d622e9b06032ffc97a23a15db3842b594
diff --git a/dev-python/directpy/directpy-0.5.ebuild b/dev-python/directpy/directpy-0.5.ebuild
deleted file mode 100644
index 66773b0db..000000000
--- a/dev-python/directpy/directpy-0.5.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{5,6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="A python library for interacting with DirecTV receivers"
-HOMEPAGE="https://github.com/sentry07/DirectPy https://pypi.org/project/directpy/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/directpy/directpy-0.6.ebuild b/dev-python/directpy/directpy-0.6.ebuild
index ca19e05f3..61db0d5cb 100644
--- a/dev-python/directpy/directpy-0.6.ebuild
+++ b/dev-python/directpy/directpy-0.6.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/directpy/directpy-0.7.ebuild b/dev-python/directpy/directpy-0.7.ebuild
index ca19e05f3..61db0d5cb 100644
--- a/dev-python/directpy/directpy-0.7.ebuild
+++ b/dev-python/directpy/directpy-0.7.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/discogs-client/Manifest b/dev-python/discogs-client/Manifest
index 1c06155eb..e23e1689b 100644
--- a/dev-python/discogs-client/Manifest
+++ b/dev-python/discogs-client/Manifest
@@ -1,7 +1,3 @@
-DIST discogs-client-2.2.1.tar.gz 24645 BLAKE2B 310b2a23a58f58c0d258599ad88a8e44202a38850af72ead293bd5ac21a92521ee53cfd6d8340d4c122145b4f3797f905a7f5273c6b0e5e23e8aff43fdf09c85 SHA512 fa339b14d5655a36fdf252fd94c729ecb97e195c1f7eb2e5207355dc5f4fd89d0b738218ffbac71acab4f143870bdba5cf5ea02dff70166014f14c30481ae1e5
-DIST discogs-client-2.2.2.tar.gz 25005 BLAKE2B 1e87ce7a1cfd2d72a3dbbc0544a4e6a91d451c9d65c0712f261297e6bf4a46663bfe73d59781c9159902666cb10c0d1594a37ee6493623f794e0f4ec6ec6cfb0 SHA512 cf08526f739216efa9ef628f28650c8074cd6ddb21e0ab5431a8c8864c1f2707f612b065baf6b2f907b7fa7cdf2cfe5905cbefddb02c6f8f1c7796b0631a2ba7
 DIST discogs-client-2.3.0.tar.gz 24716 BLAKE2B 21902a0aaef5c5afa2c8b6c91092a7954e5c7805b6eb5b4d3265a0dca4e62ca9f123450996edf5af0d1455b0bec916d3b72a65048c0cd69931f7fe1b9ed785e4 SHA512 1912c0b9a3ff5ef33bcea92e322580458b78c5ad280cfde1f1e180a096bd2afe8f0d22059b985a8efd6fe5a84b54fecbeee521ccc698c694b3d6d3e66f976afc
-EBUILD discogs-client-2.2.1.ebuild 830 BLAKE2B 8918a6b2dc9997f0033a5ad0f5d2e881de622f9c7d020d1a14f3590b054fbdb00e807d84afefef8e8e771c7eb9f549352bc3f520f34310cbed40ea1e70225ccf SHA512 8fb91b4588c5007d6f100dda3335115e4fc41841d49fd56ed1618081c93fb46ff15ec86e46980e7cce5d4c3abe110b7ab9ce1a171f6af98a592a375d46a05a33
-EBUILD discogs-client-2.2.2.ebuild 839 BLAKE2B 382af7c338b2378a3e29874357b0f25b6b643d5bdbb2b1558c4c7e747a83dbdd76ffac504e11ed4dcacd44d05fab588143c1dfcc80987202bf6c8db308288cc6 SHA512 f0609850280dd1c84d46c41d761e6ac065826dcf334124d98dcb5065fc0eb6619bababad18daaba009b3d7661a6f6509abb8958fa02381138e8c3d2916784d69
-EBUILD discogs-client-2.3.0.ebuild 839 BLAKE2B 382af7c338b2378a3e29874357b0f25b6b643d5bdbb2b1558c4c7e747a83dbdd76ffac504e11ed4dcacd44d05fab588143c1dfcc80987202bf6c8db308288cc6 SHA512 f0609850280dd1c84d46c41d761e6ac065826dcf334124d98dcb5065fc0eb6619bababad18daaba009b3d7661a6f6509abb8958fa02381138e8c3d2916784d69
+EBUILD discogs-client-2.3.0.ebuild 838 BLAKE2B 321c755e75aeb092b7b41393901995e881d73d1c81cd7d77388e44cafbd799512830de3bc17a092f0a5707a0d93aaffcac86f4fcb79cd326c5f578a5a375aa6c SHA512 a5ee401338faff6fbe626788f178c3b8e454eb81dfc4936373f978bfd629df608f6b977a3866ef7feabd37bfb1e2d641e407a4f422c3d6e49a65af6c4481822c
 MISC metadata.xml 452 BLAKE2B 7eed8c397f54c8339821ff219ca3380e756f1c1c65df120826626a7e1fad60bc700460fea695d1bce933d50f509710cff3b6763bfed7b32033af0fe7aa9fd7b0 SHA512 32b12473e8a5ac0069da9d3237ee277dc3efb2b03c289a998030bc48ba90d4007b12c5f5bef1a522a2b49604098dfed6cbc4683ef8e68c8d22ad59152361bcd8
diff --git a/dev-python/discogs-client/discogs-client-2.2.1.ebuild b/dev-python/discogs-client/discogs-client-2.2.1.ebuild
deleted file mode 100644
index ada074f92..000000000
--- a/dev-python/discogs-client/discogs-client-2.2.1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Official Python API client for Discogs"
-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="all-rights-reserved"
-RESTRICT="mirror"
-
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND="dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/oauthlib[${PYTHON_USEDEP}]"
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/discogs-client/discogs-client-2.2.2.ebuild b/dev-python/discogs-client/discogs-client-2.2.2.ebuild
deleted file mode 100644
index b4c12920e..000000000
--- a/dev-python/discogs-client/discogs-client-2.2.2.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit distutils-r1
-
-DESCRIPTION="Official Python API client for Discogs"
-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="all-rights-reserved"
-RESTRICT="mirror"
-
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND="dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/oauthlib[${PYTHON_USEDEP}]"
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/discogs-client/discogs-client-2.3.0.ebuild b/dev-python/discogs-client/discogs-client-2.3.0.ebuild
index b4c12920e..3333486ae 100644
--- a/dev-python/discogs-client/discogs-client-2.3.0.ebuild
+++ b/dev-python/discogs-client/discogs-client-2.3.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/distro/Manifest b/dev-python/distro/Manifest
index 9e5105ab9..fb02f392c 100644
--- a/dev-python/distro/Manifest
+++ b/dev-python/distro/Manifest
@@ -1,8 +1,5 @@
-DIST distro-1.3.0.tar.gz 48067 BLAKE2B b8dc48dc82e96c674c5fedf2f55167fcbabacde59954ce978085f0a05e5184bf8c323c76208f2ebe0a2cfb6ac41ce0351774ba6ba02dd13b22a7506ce3e5cf58 SHA512 5a3e363b7dbfb5f70967937d04b566e5c8aea10b6f3b9be7485e6f49130766ec5480ce1c1c14ec759e38b2488ffa697478246e53be72ad277cf3bebac7dde741
 DIST distro-1.4.0.tar.gz 53719 BLAKE2B f393e4237ee946a0085eedee49b38ab140bb0e1696407a74a7259aacb4341f25eda6ea79da9bd3c060f00da4b1856ed678edbc403fe16b20d130ec5d076c4d77 SHA512 eac7d32ea77c2074e57c6828a8b2e4d4d01e9c46cb0f7adbd99998630b0af4924bf18d05d5f5b42fef5603b024ef835dbb4c05fc88310f5e64d193514b2fc10f
 DIST distro-1.5.0.tar.gz 54340 BLAKE2B 2a5bf45cdf41b9772a2e164aebe96a4e9952893b7462935938fa4939704c8dca67acc3e0a52e53d8722aa4405abdc7ad2c8d600dd397d1243bcceda4d5ceeb75 SHA512 14831fe1355e9ef4f58f273ce4a548a3fe438e95466b4b4f596b8110da51305d66ed77c2e40c3dbfbcbd1a66c74e23a4d4244c8bfdebc4b49b3e7ddcbff55b8f
-EBUILD distro-1.3.0.ebuild 583 BLAKE2B f977d08dc77559b9386faef5f0cd74a7a9674d9f2174119fb66c5dba12ecc8279096cd9e5fe83959af5f59c25429aa72ab73f0c2a8fabd6aa3ecd4027476a5df SHA512 351ca16982686b153d5f4579b732fb46a1b241a0cdddb9cce4cff46d6f69847862ba7b43b73783ef43f827d76f02fc8a46a93ed8fd8868d1f50efa2ef026e910
-EBUILD distro-1.4.0-r1.ebuild 581 BLAKE2B 05f1c26d9ba8bc22e967a79432dc5d4edc5436ca26bc7b05ecc93f9f84a0191ca81fafe2a3c107fc425b4df6d409cc8e2eef70ec6c756434e4614cb208e34b34 SHA512 6ec0649eec00c8679e9f711ad32b1ec72ed55f299286241a9937dd007531152aeae056cab50d9578c79d27d64f0603eb65bd1b56965f6d1a785e6c496c15d81b
-EBUILD distro-1.4.0.ebuild 583 BLAKE2B f977d08dc77559b9386faef5f0cd74a7a9674d9f2174119fb66c5dba12ecc8279096cd9e5fe83959af5f59c25429aa72ab73f0c2a8fabd6aa3ecd4027476a5df SHA512 351ca16982686b153d5f4579b732fb46a1b241a0cdddb9cce4cff46d6f69847862ba7b43b73783ef43f827d76f02fc8a46a93ed8fd8868d1f50efa2ef026e910
-EBUILD distro-1.5.0.ebuild 581 BLAKE2B 05f1c26d9ba8bc22e967a79432dc5d4edc5436ca26bc7b05ecc93f9f84a0191ca81fafe2a3c107fc425b4df6d409cc8e2eef70ec6c756434e4614cb208e34b34 SHA512 6ec0649eec00c8679e9f711ad32b1ec72ed55f299286241a9937dd007531152aeae056cab50d9578c79d27d64f0603eb65bd1b56965f6d1a785e6c496c15d81b
+EBUILD distro-1.4.0-r1.ebuild 580 BLAKE2B 115452c5d2daac584d2f1e0f3e57d19f225a5e72cedf7571788fa442799f05bd5f3cdca6af478e1579a1dce73a6a91bb021fec8d0355bf0503bef8731c114e2f SHA512 b1aaff01e3703c95c28c21027cd636860049b3cf5bdfa82cf8e9db2d1f9aa837ade84ab787249ec530c2165bdf4e8d742d21f660a6cbaa19e9f43b1afa43e6d7
+EBUILD distro-1.5.0.ebuild 580 BLAKE2B 115452c5d2daac584d2f1e0f3e57d19f225a5e72cedf7571788fa442799f05bd5f3cdca6af478e1579a1dce73a6a91bb021fec8d0355bf0503bef8731c114e2f SHA512 b1aaff01e3703c95c28c21027cd636860049b3cf5bdfa82cf8e9db2d1f9aa837ade84ab787249ec530c2165bdf4e8d742d21f660a6cbaa19e9f43b1afa43e6d7
 MISC metadata.xml 252 BLAKE2B 507e0ddc9d50b879ff374b903b142f85d020dfd6c486aba2af84fe082c878e780edbb79188ae10104d57db0eb775c86814cc8c06891a3854c9da840a4d377050 SHA512 9470ac9c8a5a4f80e3f767e7aa198addc7b21866c63b2a310e9f41ce65817672fb77423117bdd619e99cb62322025aeadf50717e23eafabf99080fcc106820af
diff --git a/dev-python/distro/distro-1.3.0.ebuild b/dev-python/distro/distro-1.3.0.ebuild
deleted file mode 100644
index fe6cd86ed..000000000
--- a/dev-python/distro/distro-1.3.0.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
-
-inherit distutils-r1
-
-DESCRIPTION="Reliable machine-readable Linux distribution information for Python"
-HOMEPAGE="https://distro.readthedocs.io/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="Apache-2.0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-DEPEND="test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
-
-RESTRICT="test" # incomplete test resources
-
-python_test() {
-	py.test || die
-}
diff --git a/dev-python/distro/distro-1.4.0-r1.ebuild b/dev-python/distro/distro-1.4.0-r1.ebuild
index a029d08c2..e76fcbf24 100644
--- a/dev-python/distro/distro-1.4.0-r1.ebuild
+++ b/dev-python/distro/distro-1.4.0-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/distro/distro-1.4.0.ebuild b/dev-python/distro/distro-1.4.0.ebuild
deleted file mode 100644
index fe6cd86ed..000000000
--- a/dev-python/distro/distro-1.4.0.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
-
-inherit distutils-r1
-
-DESCRIPTION="Reliable machine-readable Linux distribution information for Python"
-HOMEPAGE="https://distro.readthedocs.io/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="Apache-2.0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-DEPEND="test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
-
-RESTRICT="test" # incomplete test resources
-
-python_test() {
-	py.test || die
-}
diff --git a/dev-python/distro/distro-1.5.0.ebuild b/dev-python/distro/distro-1.5.0.ebuild
index a029d08c2..e76fcbf24 100644
--- a/dev-python/distro/distro-1.5.0.ebuild
+++ b/dev-python/distro/distro-1.5.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/dlipower/Manifest b/dev-python/dlipower/Manifest
index 1954fd188..d6529b26c 100644
--- a/dev-python/dlipower/Manifest
+++ b/dev-python/dlipower/Manifest
@@ -1,5 +1,3 @@
-DIST dlipower-0.7.165.tar.gz 15618 BLAKE2B 2f7ae3e4c140b8e48d12f2446f864cb9f8e04f9e70a10008509e9b2827d629fc305cb5600e9ba7b9a14135df32d3af7d9378e5c27c7134a16bdd4076ce03cc03 SHA512 a1618890958db674450d8cb4d8cb691d8b497bb572f9fbc69514da1e88bc653cdc002db65d583cec72fa8cad9a815bf5de43255f8f28bce11e14a43bad8e200d
 DIST dlipower-1.0.176.tar.gz 13362 BLAKE2B 541e16397ef369b1cf18b062aba8e7537cd08b4ae4c5a2346a485b447797518af671b414e9f2ea9101a550bace633c6fee77cb961ee62d8befa429f45b63a9fe SHA512 434d5726858147a135fcadf93590a0478c2f5d0423404394075bc08c33e4f3b874edad71a7e557cb6ad220b954a23f8c97d9250aaa56e0e5eeac61aad4c9d0fc
-EBUILD dlipower-0.7.165.ebuild 806 BLAKE2B d65c191ab0038c7f0e672aa3df099410c5eae70a48819b7b89c370b08e36baf998c3cd9685f84da65054cb9b8368d5d8a76a58be464e162ad0609952ad6a3437 SHA512 44c3b4476ed18c1e7229c325efef2139dbcea1c1f4b89639509a879379eb395a1836c2a149f70e20ec8e2f6df273f8aaf41e38e188ea1d14a7f3205804b2fbcc
-EBUILD dlipower-1.0.176.ebuild 815 BLAKE2B a92fe95955504b7f172677837df687c57cddffc28258182b72849fc6d8a5f9bc14115a957a7686ff059678aac69e567c2370850ed2642a00c93863c5ec24fe60 SHA512 eb1a51acf84b7ea0a82e8ce95c2885c2af8bfe1385adad778328cece180620371b20e68ddaff41a4e08892bda64044b6da972b8304cadcf6857bc2d65b07c882
+EBUILD dlipower-1.0.176.ebuild 814 BLAKE2B d7e329fad0ef18805f09b167968670838e50a65c1059cf9b00094aa9026e4aec794e0a92fc404f5096f93afbebf13a5f021b1969b5ed68e5bf9926db141d98b7 SHA512 c158dbf06732a4e780b66b240676bc740332172aa4131fe91649016090534837302275fc311493868415ffa75e9904872d4fd627b9056bb2e9834c86b021e1a4
 MISC metadata.xml 459 BLAKE2B ade266722709b926f63ff5642a4a6de97b040990b13e6da21dca93ca4d8c786efcc93af2308ae53aa3256b0e78f17806dc2dfdc4634ed85cbb432d9f3e61ee3e SHA512 05a20f9f2d839bb37e286040ea4d00488cf424fad0776431c5af954d4087a0bf6b9d4cad00ae714e2b343fed6a747277899bab251ab09c054dba7894f3fba054
diff --git a/dev-python/dlipower/dlipower-0.7.165.ebuild b/dev-python/dlipower/dlipower-0.7.165.ebuild
deleted file mode 100644
index 5a5b51f3f..000000000
--- a/dev-python/dlipower/dlipower-0.7.165.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Control digital loggers web power switch"
-HOMEPAGE="https://github.com/dwighthubbard/python-dlipower/ https://pypi.org/project/dlipower/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND="dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/beautifulsoup:4[${PYTHON_USEDEP}]"
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/dlipower/dlipower-1.0.176.ebuild b/dev-python/dlipower/dlipower-1.0.176.ebuild
index f7b9bdca3..a61daecf9 100644
--- a/dev-python/dlipower/dlipower-1.0.176.ebuild
+++ b/dev-python/dlipower/dlipower-1.0.176.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/eagle200-reader/Manifest b/dev-python/eagle200-reader/Manifest
index 3204bb6d5..0f907875b 100644
--- a/dev-python/eagle200-reader/Manifest
+++ b/dev-python/eagle200-reader/Manifest
@@ -1,7 +1,3 @@
-DIST eagle200-reader-0.2.1.tar.gz 3771 BLAKE2B 29dfcfd9b7affa28d569059d1f9b71dca34185ba96f7e94a4d921ab770c8ee5cf5a28e162a4ae046c63a92128a44562763578b33f6b7149056bebba5514a66ca SHA512 e4deb71cc0a30da7eaed09f79a3adce3ae72e2ea313752c06a9bdc8f3ff55dfd0595d100f30cf9e51a37b71c2cb7cdaf5366ca736ba4c36908eeeae1c1df4fc6
-DIST eagle200-reader-0.2.2.tar.gz 3437 BLAKE2B 8e373881795741631813fbefb88facc4b8824157560aecf8fc468761e271402cd1bc53e3cb9fef96695f61a9c83f297d2fb6ac752e933c9c4bbf39dc2f585070 SHA512 56647f6d9668f8cc0573eba482e577aabc971c256522aec39d7f1a18dcad5e75c3ca9547ff1d9bb3757afb57cc6b773d8e64cc981ca78621ab81d73178e1792c
 DIST eagle200-reader-0.2.4.tar.gz 3453 BLAKE2B f57cb22213e043044f82236a4366bb10ece2cd05411bb087f4d58cd63d61f2f441936ab0f108e6d347d0b2a7fc40b3e9f313633fef44197d0b923534125e2b92 SHA512 4066c1db950c37b99ece4e6326b290f043ff861bc815791c9209171282b01b9daae5d0182961155d509460de0d10f0b4e5e8cab639018dc68e6cc3fbc69c26f4
-EBUILD eagle200-reader-0.2.1.ebuild 791 BLAKE2B b37f2f58a018cd143db70435c1be21a2cc0fc8d378b05502ef46568c62917faa1da6a24f7b0ac78637213cce802b46f724488848a403e326951db6a9df559bdf SHA512 459c7b3013a2a410eaebdbb897a43757edfa3825b16ade0567801b7efc9a5b1155a6dd45c160a38b773da9210cca21e81b7d8c3144fcfc26041822ba992ef512
-EBUILD eagle200-reader-0.2.2.ebuild 800 BLAKE2B 45c1a755c8e0b50b5fa68e4ebf8172e576efa746f7df900538e8a8d5ebf06619c57b1f9bfb232f9edf24610ea1682d13bcea04231683b0821b8c96148d1ff122 SHA512 006c577545236057e5b4db19c1ea08988eff91dd782fc20068570ff7231623192f07fe6fe8bcf327a8c3ad90b5451bb8cd69e1890831b5271777d7e486a7f059
-EBUILD eagle200-reader-0.2.4.ebuild 800 BLAKE2B 45c1a755c8e0b50b5fa68e4ebf8172e576efa746f7df900538e8a8d5ebf06619c57b1f9bfb232f9edf24610ea1682d13bcea04231683b0821b8c96148d1ff122 SHA512 006c577545236057e5b4db19c1ea08988eff91dd782fc20068570ff7231623192f07fe6fe8bcf327a8c3ad90b5451bb8cd69e1890831b5271777d7e486a7f059
+EBUILD eagle200-reader-0.2.4.ebuild 799 BLAKE2B b348f9028ddb51bc6bdcecfce6e146c32833d4862d285dda9851e4a3425eaa82fd5ceb890df8a6f2684d57597672804374c0288d8f3036f1eb60649b7b2db60a SHA512 7c8865254ed5cfee31880b80cbb17e4e5655de4f97764b1008a0dddb5a1bc5ee1087850c544541767917833c61f4212a8b53d042a1981d4cfdc9b38d884dc7e6
 MISC metadata.xml 334 BLAKE2B 83011a0c62baa6d1648cefa6417cf9b269c5c21a78503a9559627813a2789d4721e736a79367580cff98b9a9e6cc64f6efe2b53aec27f56947ef692b32049b65 SHA512 6e38e838714e24165c3a91774d77eb2235aedd3e536ef30ea090d9ea8f4391343709cd1bdcb6188b0861b02872ec608b1c92a372cad6fa4334bfbf77b69a2369
diff --git a/dev-python/eagle200-reader/eagle200-reader-0.2.1.ebuild b/dev-python/eagle200-reader/eagle200-reader-0.2.1.ebuild
deleted file mode 100644
index 71a39204a..000000000
--- a/dev-python/eagle200-reader/eagle200-reader-0.2.1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit distutils-r1
-
-MY_PN=${PN/-/_}
-DESCRIPTION="A program to read from an Rainforest Eagle-200 on the local network"
-HOMEPAGE="https://github.com/gtdiehl/eagle200_reader https://pypi.org/project/eagle200-reader/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/eagle200-reader/eagle200-reader-0.2.2.ebuild b/dev-python/eagle200-reader/eagle200-reader-0.2.2.ebuild
deleted file mode 100644
index 84b846cdd..000000000
--- a/dev-python/eagle200-reader/eagle200-reader-0.2.2.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit distutils-r1
-
-MY_PN=${PN/-/_}
-DESCRIPTION="A program to read from an Rainforest Eagle-200 on the local network"
-HOMEPAGE="https://github.com/gtdiehl/eagle200_reader https://pypi.org/project/eagle200-reader/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/eagle200-reader/eagle200-reader-0.2.4.ebuild b/dev-python/eagle200-reader/eagle200-reader-0.2.4.ebuild
index 84b846cdd..e349a3378 100644
--- a/dev-python/eagle200-reader/eagle200-reader-0.2.4.ebuild
+++ b/dev-python/eagle200-reader/eagle200-reader-0.2.4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/elgato/Manifest b/dev-python/elgato/Manifest
index e0b28986d..a8a098405 100644
--- a/dev-python/elgato/Manifest
+++ b/dev-python/elgato/Manifest
@@ -1,9 +1,3 @@
-DIST elgato-0.1.0.tar.gz 6699 BLAKE2B 37c1bc81dd58f5cf5fecd89405ce06fdb71908cf8ec69dd3eaca91c8d9581fa9ab9e2f3d2013858db14a648a56840c04e2163a701a2035161badfba8480d2da7 SHA512 264614728d4914f7c0a27e18a9a26864829270a9ba86e70bc4b350c385d9c5caab8cd2607668ef4fb246a8dab4d8a652803e22358ce4787ec5e95c565db2030b
-DIST elgato-0.2.0.tar.gz 7778 BLAKE2B 1c2058acf7e957523afe1590a8b3773a541739b52c1e9e255bc0f8bbdb0522b6537e29e224ff37bd810c98248ef0201140a9e18c7af3745bfcbd2423dba43ee0 SHA512 cf48a7e442e63fca86c89cacfac00ab33b5b425985c035a23f6cef4b1229778e68ccb68461357a9ba179987d22ea4d6c1699d1d44935e4294da2d1e7733702c2
-DIST elgato-1.0.0.tar.gz 7791 BLAKE2B 0a894e8fa4233a36cc3be2704507e3c9b6842ce3c9fef22151bc0ace075557041844cb8d9ccde95bddb33b5ea120ca21d987c4d06a93d444ece34edcc67511a8 SHA512 c74cb406a6cb29a46bf76c087a177c661f189ce401cf1037ba2e48807d512368f1ed4669cd8c06f7b12c536e7fb59451307ae52e05e51723e206517f9178be1f
 DIST elgato-2.0.1.tar.gz 8360 BLAKE2B f79fe8136448c315e4899de722f8c6ea36d8c706466dd412348e219c080cdd926cb5527444e0c1c2ab7f14ee36d6081df394836ae09005022f16e2b28c06c7be SHA512 426ab8547390cd263cc76946556219bc6e12fac2e5483a88c74dc7f577c1bff608d7e5e26ab51c0aec7eada23df06100d1c3e9337aece8099adf656525cd1dd0
-EBUILD elgato-0.1.0.ebuild 810 BLAKE2B cbc0714caef6a1dedfb16921baca462c57b46c0ba6b4d7deb81f5f382468d35e04f1307a7ce99e37aab491424d218a48524c622bf852751ceab99c8570f93170 SHA512 43dd779bae090a647b161f3705c1bb9b728c77e85de30613c1d331eaff9cc4eb95041eebc8bd41f2c28a19e5f34079da8f00b6c9124c0831f1feaae6543c266d
-EBUILD elgato-0.2.0.ebuild 819 BLAKE2B 01f8a62c4561d3db1c932e293c7dba3d7d5642d0f881266851f7d5814a71b2aac27e6295be538136590a25db0d8b15c167a82c603166af70e64f089b4fbe8296 SHA512 e72ecace32bf8114b8dd730d14dd77c8b65e667a8c0fdf5f4dde8d3edebed3c5ebef1617c2c7319aa1d7fad143c0dd38fdae13c933c06b7e94a565ad79255e49
-EBUILD elgato-1.0.0.ebuild 782 BLAKE2B 13cd220c9d12907f6500365a1ff891571ea139ad8daedaaa2ec7d67861f768c1d9a4ac1f28ac9051359519628a761c74473950f8147bb2318b5b4654c9708b89 SHA512 6a62186bde14a47e07948432b0c97812fa55398662a154c2ce1bde41fa3b3c3746c8ab10e8336375acee5d423a3a3aca523d6c1cbf0d908ed69d8a2d1b005691
-EBUILD elgato-2.0.1.ebuild 781 BLAKE2B c437e0eaa0f932aa542ed38199373c1b2907bb6c09e5af62b9f1ce5c5cca879ca31d352fb19e6b2f508f93b05d2af7a77e52b781aad5b7f5b5bc889c8c510aa0 SHA512 b7f575024d44c80d5f0494ed8ad14c5341ed6cd1cde74ccb6dcd03dcc99ee702884d4748f12a6c6be518d21af54165f9c0b3eb41e47f08b004e7b90714d01ffd
+EBUILD elgato-2.0.1.ebuild 781 BLAKE2B 1d1939bea49d722b90ffe0d2049cd94d6e03b2e8927d9f1a581447aa997eecc0e4f34fdad2efe0f7f583994b72cd14dd11aa89088461d00373dc8aa2260e8669 SHA512 9c0ccf0af6f8a84090de1030f1473db6c75869a5511ef64bd55d2a803daacb52012d7057e62c464d91341a9ffd88ad7688452307f06008bd0eb419f334aad423
 MISC metadata.xml 453 BLAKE2B 8d5a7d84d885d2018d51ce75d2033978b1000d8692dfaf078b22d2f889aae13e0b94c109b5a6566924f5f84225963e70507f79d367884bd2f70c125afe80521e SHA512 1119ec8372f2ce810b92db562ef131d042343e6be67791f297b3b24a1232faa284f7e6c3095f6db27bd9ba47f367e92898864506f892d1fcfd4fcda025607ea7
diff --git a/dev-python/elgato/elgato-0.1.0.ebuild b/dev-python/elgato/elgato-0.1.0.ebuild
deleted file mode 100644
index ab11b7132..000000000
--- a/dev-python/elgato/elgato-0.1.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Asynchronous Python client for Elgato Key Lights."
-HOMEPAGE="https://github.com/frenck/python-elgato https://pypi.org/project/elgato/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND="dev-python/yarl[${PYTHON_USEDEP}]
-	>=dev-python/attrs-19.0.0[${PYTHON_USEDEP}]
-	>=dev-python/aiohttp-3.0.0[${PYTHON_USEDEP}]"
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/elgato/elgato-0.2.0.ebuild b/dev-python/elgato/elgato-0.2.0.ebuild
deleted file mode 100644
index f703cecf7..000000000
--- a/dev-python/elgato/elgato-0.2.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit distutils-r1
-
-DESCRIPTION="Asynchronous Python client for Elgato Key Lights."
-HOMEPAGE="https://github.com/frenck/python-elgato https://pypi.org/project/elgato/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND="dev-python/yarl[${PYTHON_USEDEP}]
-	>=dev-python/attrs-19.0.0[${PYTHON_USEDEP}]
-	>=dev-python/aiohttp-3.0.0[${PYTHON_USEDEP}]"
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/elgato/elgato-1.0.0.ebuild b/dev-python/elgato/elgato-1.0.0.ebuild
deleted file mode 100644
index 062dc5937..000000000
--- a/dev-python/elgato/elgato-1.0.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit distutils-r1
-
-DESCRIPTION="Asynchronous Python client for Elgato Key Lights."
-HOMEPAGE="https://github.com/frenck/python-elgato https://pypi.org/project/elgato/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-DOCS="README.md"
-
-RDEPEND="dev-python/yarl[${PYTHON_USEDEP}]
-	>=dev-python/aiohttp-3.0.0[${PYTHON_USEDEP}]"
-BDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/elgato/elgato-2.0.1.ebuild b/dev-python/elgato/elgato-2.0.1.ebuild
index 5415dc0ab..c4881eca6 100644
--- a/dev-python/elgato/elgato-2.0.1.ebuild
+++ b/dev-python/elgato/elgato-2.0.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/emulated-roku/Manifest b/dev-python/emulated-roku/Manifest
index 998ea0e27..70edb184b 100644
--- a/dev-python/emulated-roku/Manifest
+++ b/dev-python/emulated-roku/Manifest
@@ -1,9 +1,3 @@
-DIST emulated-roku-0.1.8.tar.gz 5557 BLAKE2B cfb67d7f4917a46e849344788d7f844c05aaae089014ace9e64ec5b9dfadc4cf44d82ad39f1f8b96e4578fc297b669fa05edab76351c233dae84709cf15b977a SHA512 99e26bf4767a3cedd401e31123f176d891eeedf79018adebe9516ca4c2010958e5dc325760a005319d599b70b3a55bf53c8d8be1c1f57c49061762262ab62e53
-DIST emulated-roku-0.1.9.tar.gz 5739 BLAKE2B d8f5bf3b8a98cf102703a50b53e5c672e09ef83a319da6ddec47651af4b404aedeed962c5c71b5e8ff3e65dddd483d382800ec13f90ffbcc4d7dc9cbd862d1f1 SHA512 2156320f5c5c1098de6bfb43be22269064611afa590299981118c5b5a0b31a63b5101f0f3fb8f8ca103d56e20e960308be3e2865cdf66789c1f4c8fdf0421cf6
-DIST emulated-roku-0.2.0.tar.gz 5740 BLAKE2B f141648d62959a6400c2a6b8a7cebb7461b8dd6eead15e2171d4f4949846cbd0bfad93a8207f692b8afa4789eb7bfb82c08780d8b5eb19f423640ba7f9729da6 SHA512 dad2c788d11892d9c434bfb8029ed3be11112d9c716c426a1eac430b6e428535333488f8ff9dfef3529c038fa1cad6545303dc96a93d25098aac21113468799f
 DIST emulated-roku-0.2.1.tar.gz 5744 BLAKE2B 0f0bdcae77aee77675157f4a2e11d30d0dc87b3856268ee13ffe35aa9c8fc46cdfbac23ffd3315e4844b6e1aa44dd38229f0a68163116ab6725f8ea47d58b74a SHA512 4b3e9614025c3d60d2ab240ae8310e5341144dd896296822a7ddb5acb3e5a4a74a815fc33a0dbe41b24747b3889ddfb1a77affa00f0ec78a44fad6a81710c744
-EBUILD emulated-roku-0.1.8.ebuild 838 BLAKE2B 380460d1bd4f6c496c5bab03b97c416fde08d4d9dad763cb1bf32cfb75d444d42b6472bc64e9f1b7a6f5d8e0667d1886008139e92aec68f6c685197af723022c SHA512 513d6117b3fa3974d1c992109eecffed90fbe0c928cf92b51a7aa0e87a5e3ad2ee527b78aca8e539f8fdca43f96c7645038e1d63c96dde910a7c629b0bbebc8c
-EBUILD emulated-roku-0.1.9.ebuild 838 BLAKE2B 380460d1bd4f6c496c5bab03b97c416fde08d4d9dad763cb1bf32cfb75d444d42b6472bc64e9f1b7a6f5d8e0667d1886008139e92aec68f6c685197af723022c SHA512 513d6117b3fa3974d1c992109eecffed90fbe0c928cf92b51a7aa0e87a5e3ad2ee527b78aca8e539f8fdca43f96c7645038e1d63c96dde910a7c629b0bbebc8c
-EBUILD emulated-roku-0.2.0.ebuild 847 BLAKE2B 2e3b475e832f080e4b7062b059640abfd514ac0cff724dd7b05fcbc48b47fc1b660196cdfe0a02e86bf0ef01c42459af75b239d0e17a934c1bdc526db6876bd1 SHA512 d6a50517ff135c07e4ee5b32ded9b5c7caa25a8ae039b49652596566812e70a93a730ce507c4bd8addfbabd4d808fca1855ec56216153c8c0d3982684d5a9298
-EBUILD emulated-roku-0.2.1.ebuild 845 BLAKE2B 12f696bb7daff9fab350b7024c09b1c62f74dfd73daf852586d3ee786f7fc760994b3c1b09aad6a1787d0d65469b2fa40c1fd2886dd96575a074110e306b4229 SHA512 6c0bda651c8acbacacca56cbb90a4933bfe1647e7223f1aec7a8b92f147c2ed79f74211c1c1afb173a944d4f36f40f29523dd3440527edd12563e3ad6b48df2a
+EBUILD emulated-roku-0.2.1.ebuild 844 BLAKE2B 5f6a19438a0402ecaa6f666c67fd2021fe7c491646bdf9c20831f861486255b458dded018b4e6d151e4b5e7bafd5d3bf487ff30054ad97b64407f64c700117c7 SHA512 7b876622097fd585dea4d2945348848fad16e290ac3f4ae81b390927b06e1c3eed67cdd3877a6926766c59d96c80ff48f5d1a2b16f8dd03ce96a779a18a18882
 MISC metadata.xml 332 BLAKE2B a6f971b7d3409a54705af094a3a08174f57f155c53b05a71abb625a696fe71e0aa878e2e1a73493d864272a988028040882d514c6b54fbe7fb5fe0290235b947 SHA512 d08b4d3c45f9f5cd910261e03e1caf736aebee9ca53c823990a000368523cce26261163011931402a0b07bcc9bf1703176b6fcb00447b02a5f95d8bb40f09883
diff --git a/dev-python/emulated-roku/emulated-roku-0.1.8.ebuild b/dev-python/emulated-roku/emulated-roku-0.1.8.ebuild
deleted file mode 100644
index ce63e8ad4..000000000
--- a/dev-python/emulated-roku/emulated-roku-0.1.8.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{5,6,7} )
-
-inherit distutils-r1
-
-MY_P=${PN/-/_}-${PV}
-
-DESCRIPTION="Library to emulate a roku server to serve as a proxyfor remotes such as Harmony"
-HOMEPAGE="https://gitlab.com/mindig.marton/emulated_roku https://pypi.org/project/emulated-roku/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${MY_P}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=">=dev-python/aiohttp-3.0.6[${PYTHON_USEDEP}]"
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-S=${WORKDIR}/${MY_P}
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/emulated-roku/emulated-roku-0.1.9.ebuild b/dev-python/emulated-roku/emulated-roku-0.1.9.ebuild
deleted file mode 100644
index ce63e8ad4..000000000
--- a/dev-python/emulated-roku/emulated-roku-0.1.9.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{5,6,7} )
-
-inherit distutils-r1
-
-MY_P=${PN/-/_}-${PV}
-
-DESCRIPTION="Library to emulate a roku server to serve as a proxyfor remotes such as Harmony"
-HOMEPAGE="https://gitlab.com/mindig.marton/emulated_roku https://pypi.org/project/emulated-roku/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${MY_P}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=">=dev-python/aiohttp-3.0.6[${PYTHON_USEDEP}]"
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-S=${WORKDIR}/${MY_P}
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/emulated-roku/emulated-roku-0.2.0.ebuild b/dev-python/emulated-roku/emulated-roku-0.2.0.ebuild
deleted file mode 100644
index d6a9ee16e..000000000
--- a/dev-python/emulated-roku/emulated-roku-0.2.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{5,6,7,8} )
-
-inherit distutils-r1
-
-MY_P=${PN/-/_}-${PV}
-
-DESCRIPTION="Library to emulate a roku server to serve as a proxyfor remotes such as Harmony"
-HOMEPAGE="https://gitlab.com/mindig.marton/emulated_roku https://pypi.org/project/emulated-roku/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${MY_P}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=">=dev-python/aiohttp-3.0.6[${PYTHON_USEDEP}]"
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-S=${WORKDIR}/${MY_P}
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/emulated-roku/emulated-roku-0.2.1.ebuild b/dev-python/emulated-roku/emulated-roku-0.2.1.ebuild
index a09943e9a..d930ef60a 100644
--- a/dev-python/emulated-roku/emulated-roku-0.2.1.ebuild
+++ b/dev-python/emulated-roku/emulated-roku-0.2.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/enocean/Manifest b/dev-python/enocean/Manifest
index 0733065d6..e81a77b47 100644
--- a/dev-python/enocean/Manifest
+++ b/dev-python/enocean/Manifest
@@ -1,7 +1,5 @@
-DIST enocean-0.40.tar.gz 17536 BLAKE2B c8ed4d9400900b3b364daa81ae8a9b878d2a324318b46eb23287986205b8ae7da4af909cfe33a80162072a421f29bfcc91a926ef8ad81e270791740735b89950 SHA512 60244b11383f7ea2111be999593a760a007143c05a35fa023db757072bf78475154fd44ebb7b105d6e8c4f4e8b6e4da69ccb08c31b957f5c4930dc3723192aff
 DIST enocean-0.50.0.tar.gz 19231 BLAKE2B 976ee054f73fd7d7786789241b4356bea7b92a338cf8daba932573305ddca95828a6a73d9ec729ce9a831c1d8dbd448d4675f6b92ff330aa825461b922d8c9a0 SHA512 2c73e78ff6734be390a5094aceffe0dd668b16627dad2acd3ad2fb2cc2fef89b4e84b0845e556b5235c86ed2e4ce9d9ec38fdf059c79e81e1a64826d900630ee
 DIST enocean-0.50.1.tar.gz 19355 BLAKE2B d58b6069f2603d0c3d211bb3b73a8780f3230f129ac3050bc35139f1702de5a76bc680f6660631efe6e6bcacb93fa029fb7f97708f0acae04e0936e00bb8bc63 SHA512 188292f1c909464117cfd5ebfe093b1a2f31d5251c35e6177080441dfae9a9b42ae8768c4c577888a72ddbe1ea05a4594f53af9572cb7bb5abbaf6b402698637
-EBUILD enocean-0.40.ebuild 670 BLAKE2B fbd09fe3f6c244433389c34c9912b84b4adfd403ee4d9bf5eade9421fdfe6248f7d7029f95a14485f6dd1ea9e4ba1b29924818b1a8f5e56f60b0b4438e2e690a SHA512 14b941f50c9e96bf18b663c1a77ca7051854be0d453e5fec6646ca2d534f3359f6678065d3d5273ffbbf664540042571658c6199ff95ea082166c6836d5f4660
-EBUILD enocean-0.50.0.ebuild 764 BLAKE2B 520ea4f93bfb4251bb0ed299007e15dd7a657fdc5c52dc879a9abbcd4a53f5fcb2822dde28a1702b2ed877fc7c3949d3a44bb50a7a8d8f153611b1ee533deb1c SHA512 9df87406a2e30506f41e25681169a72d5feb34c40f6898c3d96f80123796280ccdcd741b1f6ac88c9af75b5c390dff7396fdea690c42719160bc08ca83d4f202
-EBUILD enocean-0.50.1.ebuild 764 BLAKE2B 520ea4f93bfb4251bb0ed299007e15dd7a657fdc5c52dc879a9abbcd4a53f5fcb2822dde28a1702b2ed877fc7c3949d3a44bb50a7a8d8f153611b1ee533deb1c SHA512 9df87406a2e30506f41e25681169a72d5feb34c40f6898c3d96f80123796280ccdcd741b1f6ac88c9af75b5c390dff7396fdea690c42719160bc08ca83d4f202
+EBUILD enocean-0.50.0.ebuild 764 BLAKE2B eb904cf7acc63b9a92381fad2398c20fb8ee6fe915f62cbd9d5b6d85211159ee340b61b24bc215d8e1b1900e57ffaf963100dd4ad794fc12dd6639bb1cd1e845 SHA512 c5f0aa782d597236fe993b13672ec9b12c6bbd3b145557d4c63f7daf768acb3940570fcc246d53a9e666f8727a4b2d7013f68ace06c2a4d1a9ab54d561b65be2
+EBUILD enocean-0.50.1.ebuild 764 BLAKE2B eb904cf7acc63b9a92381fad2398c20fb8ee6fe915f62cbd9d5b6d85211159ee340b61b24bc215d8e1b1900e57ffaf963100dd4ad794fc12dd6639bb1cd1e845 SHA512 c5f0aa782d597236fe993b13672ec9b12c6bbd3b145557d4c63f7daf768acb3940570fcc246d53a9e666f8727a4b2d7013f68ace06c2a4d1a9ab54d561b65be2
 MISC metadata.xml 457 BLAKE2B a868e2c88354bfc6ff10e534a9269942d92396c5ddda7faebc011ace7e0473d6474303805f598899b7fd3a556fcee08b672729e71754b36d95496114a929da1b SHA512 6f2ce1f5db5e2db6020199dc18a99af08a4cac4a6a93bfaf30317a560dec21313927b6a9fa049ed6b4c02b286ce52654e6aa060d40ddfb2efa41df0fa444a9e3
diff --git a/dev-python/enocean/enocean-0.40.ebuild b/dev-python/enocean/enocean-0.40.ebuild
deleted file mode 100644
index a00159239..000000000
--- a/dev-python/enocean/enocean-0.40.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{5,6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="EnOcean serial protocol implementation"
-HOMEPAGE="https://github.com/kipe/enocean https://pypi.org/project/enocean/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/enocean/enocean-0.50.0.ebuild b/dev-python/enocean/enocean-0.50.0.ebuild
index 5d1656677..27587e561 100644
--- a/dev-python/enocean/enocean-0.50.0.ebuild
+++ b/dev-python/enocean/enocean-0.50.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{6..8} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/enocean/enocean-0.50.1.ebuild b/dev-python/enocean/enocean-0.50.1.ebuild
index 5d1656677..27587e561 100644
--- a/dev-python/enocean/enocean-0.50.1.ebuild
+++ b/dev-python/enocean/enocean-0.50.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{6..8} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/enturclient/Manifest b/dev-python/enturclient/Manifest
index b09e363e0..72e22bca9 100644
--- a/dev-python/enturclient/Manifest
+++ b/dev-python/enturclient/Manifest
@@ -1,5 +1,3 @@
-DIST enturclient-0.2.0.tar.gz 4818 BLAKE2B 70182f8c43bc0d8e5bb5f6b2cdce9618c3696d8252ce8cb623dcec1a7916e16761770fd56b3a600b9a59c83301943592dbd352a4e5c9e089e97d13f2e1ef2de2 SHA512 c43a19b0044433c58e75351cb63e0dc8687d9a846b3e9d3253a93f4567402b7ffc8f5930ce84e2e084a41c9ee7f3f5e68f5a4f8ea85b7fc990c0f2c0e989d04e
 DIST enturclient-0.2.1.tar.gz 4869 BLAKE2B 72abf9a706cfd6a0c278de2091e73cd440099ae018d0eef3b32c9819af2d87c92f545cd0c9379108b5e56a0f4ade1147c96d1e12a63768cadd9bb06ad70f7691 SHA512 c2ad35787aa3ecfc50158db28d4b4d15f028667aafe5aae697861e0c14da86ffaadb0690df72e46ffc1dd3a3d8bee523fd703dca39fac3ccecf23ecaf207999d
-EBUILD enturclient-0.2.0.ebuild 792 BLAKE2B d65ac65858ed8acaa7ebea1c97bc565d233907769891d2cc1de39c88d0368a5cdc08ca2f6c757d433af064b43a0ae363981e74476d107857c9e6117e5a4d33e6 SHA512 51347c46519cd4f5e0e0241fd12ba989d3a6f0437125a5c65604401a4307f66deeb13c7d557c4a2340486b6c21e40380f2aaf1ae9a9899758d792684cf07d073
-EBUILD enturclient-0.2.1.ebuild 801 BLAKE2B 54588a3262290963839ee06e9d321648194750c607f11fbe126ca64ee24ec2b920eafab846363effdf2de0abfeeb3ecfef1773c084d32cd2de86449427f99f05 SHA512 16bc6b335b527e67dd2c0cf13d8aa4d2a3969e7030443eccff83ce12ecea34752116ae9715e3a599645bbe0d43daedf6d40a7368ce7a903debfe0fa7e6639449
+EBUILD enturclient-0.2.1.ebuild 800 BLAKE2B df00aa6c9490da5cf2b7e76c857f753cda90cd11daf767e2b829f78a7a1340ad3384fb161dc937739a7e3b8ac21d3decf4235bef9be9a6ac9865609ff53882fd SHA512 18eadd382dbd0bd2205a15b9c3fb0eff18b5eeeabd566cbc3a9f6d2e3d296eed040292e7a5b0c49c983d7d27440f146d68b82a5b07c42b30bc0e05ad7c880297
 MISC metadata.xml 330 BLAKE2B 2bd23e12d0c105c94131f5c37a81e395ccc7f295b0dad95b37ab82b52a7b6552f6e5cb33aedacea2830d9ec5f216755e9416c514bfa3eabc6f96fa6670b329e8 SHA512 2f5a6f2ae1edf2627039db1cd434312bf15affc2db861525471fbe35ee4bb43149e1302ebab2f98eaad4f21cfa368c83142ad37e9b5274b83532cfdffdf81d18
diff --git a/dev-python/enturclient/enturclient-0.2.0.ebuild b/dev-python/enturclient/enturclient-0.2.0.ebuild
deleted file mode 100644
index 964d66f73..000000000
--- a/dev-python/enturclient/enturclient-0.2.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="An API client for public transport data from Entur."
-HOMEPAGE="https://github.com/hfurubotten/enturclient https://pypi.org/project/enturclient/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=">=dev-python/aiohttp-3.5.4[${PYTHON_USEDEP}]
-	>=dev-python/async_timeout-3.0.1[${PYTHON_USEDEP}]"
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/enturclient/enturclient-0.2.1.ebuild b/dev-python/enturclient/enturclient-0.2.1.ebuild
index ef1056dd2..44247e169 100644
--- a/dev-python/enturclient/enturclient-0.2.1.ebuild
+++ b/dev-python/enturclient/enturclient-0.2.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/envirophat/Manifest b/dev-python/envirophat/Manifest
index bf27ad793..70783da2e 100644
--- a/dev-python/envirophat/Manifest
+++ b/dev-python/envirophat/Manifest
@@ -1,5 +1,5 @@
 DIST envirophat-0.0.6.tar.gz 8433 BLAKE2B 7f9d3fa0fb1fab81eb09f54d108ee3f158e8b6325ea6a65ea0d60486933de2cc0aad74df7f1378e7945ef4ac5581d15e3b01b31c162a43f15ca70f66ccc68e77 SHA512 d86cb60d5dec944f7967d1bbfb0f284fa5f2b4c9df979b8195f227146d00b6fb56c2af4801de8519f5226473191d53c938363f0e15c4b841a603a30ee368e8c5
 DIST envirophat-1.0.1.tar.gz 11202 BLAKE2B e049e800802e14255b0bc39149e0ffddf8ccb51eaaa9bb981b8ca20b9448ee9943302b7fd3130b6231aa324120e18be026b979863b99a2f49e9282e07bc1a541 SHA512 75dd737dbdb75e7a0e758e35eea663bc4a918f31d7a146df9e46e0633b0157810ba106bd4d18f571ba42e5009f0b7c2acf1296c1af9f7cd24242ac158e027fe7
-EBUILD envirophat-0.0.6.ebuild 673 BLAKE2B 8d93668d6398ef67a36e57a1db868dddf809824a55024d0939946ce24f9dae6f44e231e67b3d7b99dda6247a49cfb72fa1ef435a73fc964051d218437d734c55 SHA512 6adfe1ba0008d33a3e99432c4d00ff4dce4ccd09a99e2d583da6595ec81de9ae404d425ace8b059d4e850a8e290152450bd9d4eee2d2ff6587cee9e717fc0c33
-EBUILD envirophat-1.0.1.ebuild 680 BLAKE2B e080d4ab04876c3df10ac355f85d692d2d24b7b31206f23e3213f38585766e63306aa15435607b99a8573a0cb8d2674f7e81f1c7491875ca7615809d2634d276 SHA512 e1ce0d2a78dbb46be37629be96e1fb298003e342f0e5f259fee73f4f0ddfa0b1aaa013a9e2f6d8b9382781083df7cfa62501205063a78209e6fb669485fe727c
+EBUILD envirophat-0.0.6.ebuild 672 BLAKE2B 39f2ea5fcff48e6b4885bd78d28d83895e815aa06f708173deeee1635f5401c2dff96cf3a1fe12422e0aeed27c3f7e861ec6957724dca860bd930e2856af9018 SHA512 3c67f0d99afdcc15adc4741c3b973d335427bbc46d5cac2e8d4deb79633d3ee1495247288a438bbeffea7b54212411073cae9621c96e9767c420cb72c67346f1
+EBUILD envirophat-1.0.1.ebuild 679 BLAKE2B 5953bcb8d7e5cc3428864cfad80995b4835d3b05928b6194d64553e767457dd88d9de886c8126c9806c37c711ea5d3a8011dc22d47b877d467f7dbc4721f6e71 SHA512 0695a8c9228c01bd7941a5199eacbce4e14774576d28f30349c7c12ecf5f3ef7d51215be42d914f42d4b65c8b651358711953c95fabd6be9003ba764d6404246
 MISC metadata.xml 453 BLAKE2B 8bf5cc12bb44c0dfe80bca8eade7ae2cb856af697a8fd4f3039fb4d22f333cc1fd2bbefbb07877f008c736135fe3e907c6d376bf5e2c2292bd19a9ffd349d27a SHA512 908d74ce8cadbba28fa94f94760a3237eadbc9baff91e412dc01515ce54546d8b7a3e8109d3e2634b8e6c08b0624a1479b87b57ea0518e57efda9fd99c317ac4
diff --git a/dev-python/envirophat/envirophat-0.0.6.ebuild b/dev-python/envirophat/envirophat-0.0.6.ebuild
index 54e1e971c..e231d0925 100644
--- a/dev-python/envirophat/envirophat-0.0.6.ebuild
+++ b/dev-python/envirophat/envirophat-0.0.6.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/envirophat/envirophat-1.0.1.ebuild b/dev-python/envirophat/envirophat-1.0.1.ebuild
index 189bfedb3..7047ff71a 100644
--- a/dev-python/envirophat/envirophat-1.0.1.ebuild
+++ b/dev-python/envirophat/envirophat-1.0.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/envs/Manifest b/dev-python/envs/Manifest
index f88bcd759..06a156d33 100644
--- a/dev-python/envs/Manifest
+++ b/dev-python/envs/Manifest
@@ -1,5 +1,5 @@
 DIST envs-1.2.6.tar.gz 21086 BLAKE2B f691aa80c0eb47c2ea9e384f4daf503f8d9d78170f7bd565a329aa6c05d19f395db4ff3ba27921a4acb7ada072feb58da47c12371ccffe1d3bb0ab00bf0cdabf SHA512 49d9db6a81e46bf6534abb036938f3a149435e93551599fd31c441a6af2e0ad6ed16da87851f67a8efc28086398027c28f8c7a460f6b8bf862b8b662c4c0593a
 DIST envs-1.3.tar.gz 21969 BLAKE2B b627e57e8815dbde4dcddbe8000765d4722622a184e8b43bbb24e75c7d2b5f0e365554b2c24064600929a9dd5bc8c742a3caaca02031994c76fc40e0ba022e1e SHA512 dd31ca3043efa0e47117b08fb24284667a91f678950354fa3c59faf3d549fe80e6a5c0b5dc015a7b7078f2428b1a1f20d91601a5f10937290de9a20a47725438
-EBUILD envs-1.2.6.ebuild 613 BLAKE2B 015ed3839a5468647aa92ce8085d62d38f7ed415195f6d4cae159103aebb7bbfb64b522a849f6932a75121f537ba4f972e5136c77f14b530b0b2c44e8117af6e SHA512 37c8ed043d383e681bfdc8813a281f0067b19a385b1a6518dbf29cdde6bdc80c2e358cb9278f148c5eaab909938e50bde0d18282e6bdc2df315b0b2ccf7d97ae
-EBUILD envs-1.3.ebuild 710 BLAKE2B e2def655d98c9cf01a2d54600c1e1de6bacf3267c2f4ac7131e9c6ecf7134b2a7eede0f1d2ea7a584ad7185e6e3e470e02ec2f501226d197b0bfb22b721b3e94 SHA512 852bf40c5613b455f55f3a381d029bb950f367ac07794d16c8b82e09b54462c466b98c6a220a058e9372e634a9f07f843da7196f96a2d37dc5549f47ff4092f6
+EBUILD envs-1.2.6.ebuild 608 BLAKE2B f063c4d82f9d9543b64dce99911972d939a7ccffd725c279489501ce2adf626e297faa07e31db7eb0c755200f9a1ee5e48493eb8e714c108bcde3cca57a79747 SHA512 7c122656fcf1f604ddf9b5f1d8301a56d722d5fc8f7574666178b73454e38c3f8e061282d81a9991ec905145c255d1fcfe4a35902b5a5dac32206c0160662942
+EBUILD envs-1.3.ebuild 709 BLAKE2B 141bd42914d95f923a71d42b8d30c99ca2896556466926d6240a8bac28de75f67bc0e129503c3d013eac3e0ed847355b087bfee6633fb30f88dfdf6593875a54 SHA512 752656baab31f42ae51a321acbd7943600b4bbadd44edac69492d6c94746aed16d9a682e41879082f58b642e840436b74a7e2345b919cb6bbe1271b2fb9fb5f0
 MISC metadata.xml 323 BLAKE2B 81a209e4fb1e4c836f490faa525735e256a6d0bdc4003e2e508da83cd733fc8d1ff43d5ed34e87c9ea9b081fa3fb801b8af32e731a3cf5151df339a4550fc06d SHA512 b3dc4a36595fa87c478cf95bde65a8c3852b38c54020469bb6accc5aeb9f1b684673b409b96819b6ea50e0ef7f90db1481668d4222866cb568922ac87e26982a
diff --git a/dev-python/envs/envs-1.2.6.ebuild b/dev-python/envs/envs-1.2.6.ebuild
index f99365238..e07af20b9 100644
--- a/dev-python/envs/envs-1.2.6.ebuild
+++ b/dev-python/envs/envs-1.2.6.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI="7"
 
-PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/envs/envs-1.3.ebuild b/dev-python/envs/envs-1.3.ebuild
index a41a6c1da..64f7c90aa 100644
--- a/dev-python/envs/envs-1.3.ebuild
+++ b/dev-python/envs/envs-1.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/ephem/Manifest b/dev-python/ephem/Manifest
index 65a59afac..5eb794bce 100644
--- a/dev-python/ephem/Manifest
+++ b/dev-python/ephem/Manifest
@@ -1,9 +1,5 @@
-DIST ephem-3.7.5.3.tar.gz 735066 BLAKE2B a9c5202185956cf2f66cfc0ec58e8b17dbdb5c96893c66f8cd4b3ebbf7d6716f54960477632d79309c60c7afafc0723dae33f4b502485c563579739bb219e434 SHA512 70002c35dcc14710725895516f9e6dccb0ecfb43c9132ec028f3599773c5b8d5ae64259620ba7227aee1d32a1f70dbed968c06212c8afb9f80a3f9b5c9687352
-DIST ephem-3.7.6.0.tar.gz 739442 BLAKE2B 891434388c1d7beab53b68b4048681596e7df037812b47789bb7640a8cc70bf8b677cd00684cbf65fd4162d4b8e70538cf295d60fe7e38cf785bf8414a38b46f SHA512 64f1ac2529782d5d50668d17aa2af4810e42db29e4dc55354dd6167c4ce052ffcd0b02f6bb06c1557c4ff6da1180131cfc0dfa53a97ff34aaa488fe58e4b41a3
 DIST ephem-3.7.7.0.tar.gz 745041 BLAKE2B 173d87b398cf5aab2b73f82bfba8c310982ded53b178f8953319a7212c5af0935d72b194eeb778c0c6236039f71658d10a1eb5e2cdb7a7229b43c0d20c8a15fb SHA512 daa6bc35d0095e8936593aab9d7cbc5602e81205fbf685cac8fc57d3ae40107789808e3784af433ef3e0e5eaaada7e1dfd8a8c0dcff24a859c289da0fb546c35
 DIST ephem-3.7.7.1.tar.gz 745839 BLAKE2B 19867bbf98e78e9e39a07183538042fb207d51134b2df5a234a871bf84b3b40fa25909a085904c4edb48b1f1468a32388b00fcc602e4d9fe19ead7b2d5ba0a6e SHA512 c3f489371febcb65da03da7ba0e08168320a6f5d81fd2355281f621074ecf2be694b2d0cc3ef7863cec617176751a34856bdd22beb66cd64129fbfb915b3dcae
-EBUILD ephem-3.7.5.3.ebuild 675 BLAKE2B 2e8c696fdba50489d63ba4d86d55f4dbb808ef20fde149244b9b540da6054af83259a060d8ea1fd222cc51ca2294a529e5289d65c991597b21f041d199d58d85 SHA512 b64456a3b50cb1905f0244134a3532ee3ea1129f95844c383da6eea2bdf1bdd4085486d000234fd314f911ee6393bca8722f90103de4264714a33aa9af9afcdf
-EBUILD ephem-3.7.6.0.ebuild 682 BLAKE2B 5e0987e75cfb21cea1226f88dd74fbe467210c482eb98f2e2651005a7fbc981ec402d711d138d92b8f2610ced23b4f22efad3095b8907cf9ddeea0d91996770f SHA512 971f4396b89934aa24bd17b8479414517d988d911bda915112f115d897cfe9527aadabf97548effd71468fba7a6dc9d917acbab2e2a7b9f20ac99058210b0f63
-EBUILD ephem-3.7.7.0.ebuild 682 BLAKE2B 5e0987e75cfb21cea1226f88dd74fbe467210c482eb98f2e2651005a7fbc981ec402d711d138d92b8f2610ced23b4f22efad3095b8907cf9ddeea0d91996770f SHA512 971f4396b89934aa24bd17b8479414517d988d911bda915112f115d897cfe9527aadabf97548effd71468fba7a6dc9d917acbab2e2a7b9f20ac99058210b0f63
-EBUILD ephem-3.7.7.1.ebuild 682 BLAKE2B 5e0987e75cfb21cea1226f88dd74fbe467210c482eb98f2e2651005a7fbc981ec402d711d138d92b8f2610ced23b4f22efad3095b8907cf9ddeea0d91996770f SHA512 971f4396b89934aa24bd17b8479414517d988d911bda915112f115d897cfe9527aadabf97548effd71468fba7a6dc9d917acbab2e2a7b9f20ac99058210b0f63
+EBUILD ephem-3.7.7.0.ebuild 681 BLAKE2B 516fb5b08652d3f8fe20615b7bda68b54b04dbb82a5e85db9c0f2c72ce088367862d7b262d77d1a8f416455e10971c70c608e25b72157eca01827b6d12577f59 SHA512 978ebf84fd3a6e6655519573c58312a6463c5edcf27af1fc4598755cc4613e88148836b2001a924661ceb32a7ea7ece7c8d9a03bab43e0ec0e98069865405dab
+EBUILD ephem-3.7.7.1.ebuild 681 BLAKE2B 516fb5b08652d3f8fe20615b7bda68b54b04dbb82a5e85db9c0f2c72ce088367862d7b262d77d1a8f416455e10971c70c608e25b72157eca01827b6d12577f59 SHA512 978ebf84fd3a6e6655519573c58312a6463c5edcf27af1fc4598755cc4613e88148836b2001a924661ceb32a7ea7ece7c8d9a03bab43e0ec0e98069865405dab
 MISC metadata.xml 454 BLAKE2B e0ae2c192ee0a52bba748d9529d5753bd7cb951be8fa541ff64b8972f10c8b4b8c1dd98c0a91b16ebaaa5efb5dfb474ae8e5ad394ac817bad9ca0cd8a8088ac9 SHA512 944e1fcdd61b1a1b17f40dfb743a13d0a1aa1ea1a9c384540c7acc77874867a09cbcb9f7c20be60c0de2f51de90326566151254de9bf6cdb84abc0a698ae84cb
diff --git a/dev-python/ephem/ephem-3.7.5.3.ebuild b/dev-python/ephem/ephem-3.7.5.3.ebuild
deleted file mode 100644
index 7fd63af49..000000000
--- a/dev-python/ephem/ephem-3.7.5.3.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{5,6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Compute positions of the planets and stars"
-HOMEPAGE="https://rhodesmill.org/pyephem/ https://pypi.org/project/ephem/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/ephem/ephem-3.7.6.0.ebuild b/dev-python/ephem/ephem-3.7.6.0.ebuild
deleted file mode 100644
index fb033f650..000000000
--- a/dev-python/ephem/ephem-3.7.6.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit distutils-r1
-
-DESCRIPTION="Compute positions of the planets and stars"
-HOMEPAGE="https://rhodesmill.org/pyephem/ https://pypi.org/project/ephem/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/ephem/ephem-3.7.7.0.ebuild b/dev-python/ephem/ephem-3.7.7.0.ebuild
index fb033f650..7011daeb6 100644
--- a/dev-python/ephem/ephem-3.7.7.0.ebuild
+++ b/dev-python/ephem/ephem-3.7.7.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/ephem/ephem-3.7.7.1.ebuild b/dev-python/ephem/ephem-3.7.7.1.ebuild
index fb033f650..7011daeb6 100644
--- a/dev-python/ephem/ephem-3.7.7.1.ebuild
+++ b/dev-python/ephem/ephem-3.7.7.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/eternalegypt/Manifest b/dev-python/eternalegypt/Manifest
index 58381dd38..6a8990051 100644
--- a/dev-python/eternalegypt/Manifest
+++ b/dev-python/eternalegypt/Manifest
@@ -1,11 +1,5 @@
-DIST eternalegypt-0.0.10.tar.gz 4748 BLAKE2B 28d8ed9897967e14612bbe10bbc93ec0a3662ee74f1c45679f35dda5b45436787db83eb74fad5873079d77f878c7bb4316f51228e7502dcf17d2c651bf40cf1d SHA512 a9f61c863d91c81a7c057a1f96bd1afb4b4b8b585f5062c7d86933a8d696356e42706a505a14ee8adc8206c90c391bdbed81bacc7b14f340e2ea97c81615b277
 DIST eternalegypt-0.0.11.tar.gz 4903 BLAKE2B ecaafde82d36209e92ff723ff232df95524f6377b26bba63f36a2faf87addefe9f8df98dd89d76c32731cd65f977fd44cc66ebc46d0de460493108ee4219bce3 SHA512 9b2effdf72c27be9ecdcbaa2cc60391a8cd4070c66157b3e217a91a1d57f40628d974a89fc58bc8b11325242fb383ee3361ab109f5e6f5d33f9c87ed0bd89c05
 DIST eternalegypt-0.0.12.tar.gz 5040 BLAKE2B 5115ed08c2a104de844e7d3694c337c4fcb9f3f765016b52107e1e93728b7c66600ad91f41510cb459c9276dd422f51431e90179170a1295acc25ca52fa487cf SHA512 e6cde52c7ceaa4c7f9397ad92e9458d0b0b50f793dc13dc76f9653bfe2e60150c3d6e2747148a931bda9a0a261d6f772ee7bd2550277dfee77be974797af53fc
-DIST eternalegypt-0.0.8.tar.gz 4540 BLAKE2B ec4a5c9a0cbe00a802387ec339215367d6f8b32510458a93d68e1bea117368eb4025ce62cc7c408cbb7c592e5404f78ab5511583eff6427729ffa65f6186b794 SHA512 7805e0e8b732d5b0e9365bd92533a70258d0351ff91263c5f4875ae960e827f214dca91d6bad770adb73a817fde07a045f6a6337c4ac8d8c5a2dee41494bf966
-DIST eternalegypt-0.0.9.tar.gz 4647 BLAKE2B 20dd6f0460af9048db6ac3df35a68278c4d63f5be631a41c3e564bb460cb9087c44b2ef94a14dc01b43a520cbd07f93920fdeef425362e7b606d20a98378764b SHA512 2409f27418a0e139960fdb0411c527d41abfafde7ea116b42dfb99d06a3fa707521fe35d3e01f3b1f92309a029004c9d50818c33ba4c754bc5cd54e5a22fabb1
-EBUILD eternalegypt-0.0.10.ebuild 794 BLAKE2B a4ebddc0dc93eebdd78e437fd7c01a6175f1b91bd7cf179ce2008a8d0b4c49cdd0d44616658da4c12ae73cebd57a1c8d7f39be1d203f6602fde45cf7b64bbfd0 SHA512 62f4ddd9871c9c2ba1f3285ef1cadaa12844a353d9719cf7d094858b032d5ce42819d9c7f454090c2db463b9120e478d22ad12f42b1ca325748a465e70485957
-EBUILD eternalegypt-0.0.11.ebuild 801 BLAKE2B 0639c48b3bed857b84311d26a59741fdffc9dd8422e8b1434ade7ce622fde4013150b81df7f3a12787131fa43c3401b62f3a1fdcd9bedcdf0bf5c762c07cb5cd SHA512 1b6c688d1cab7a3fef0243ef0b217e1c188ceecf2175e2876cab419e25a67a8b7d41d930006bb66d51699957f2ed5759ec7c8867de430dd7c2fdbaa64c02ae7d
-EBUILD eternalegypt-0.0.12.ebuild 753 BLAKE2B c04f40c727c04cbbd75a491ba4f7f73ee883f4f1424b6c01f13e739d11ce43faae048ac1eae1b7dfac2f467e3f9bc88bee1c5f699aaaa2964c532a09c7fb147d SHA512 0e9bf57033d70761048226266730cf5a9cb8678278ee9b667a94b6a7175784e5372289f0c084f3872be7eec629113f3084c3a65a306ee5364e63e9fb0fc51310
-EBUILD eternalegypt-0.0.8.ebuild 667 BLAKE2B a38ae029287978aa91a3a7045f066818178ffaa5c2e4440ef3bc77bcf6794cbf7855832526d4ef07187f5a42592bb1410c0260b7355226b610ab90d52a86346d SHA512 f81152274814f24baf230c364b8c4028625c0a01235f8c9ce10f8d45c9903ba69c4fe52fb82291fd36a5bd43050ec11a32c42d043ae24c585fdc616ff17bee5a
-EBUILD eternalegypt-0.0.9.ebuild 794 BLAKE2B a4ebddc0dc93eebdd78e437fd7c01a6175f1b91bd7cf179ce2008a8d0b4c49cdd0d44616658da4c12ae73cebd57a1c8d7f39be1d203f6602fde45cf7b64bbfd0 SHA512 62f4ddd9871c9c2ba1f3285ef1cadaa12844a353d9719cf7d094858b032d5ce42819d9c7f454090c2db463b9120e478d22ad12f42b1ca325748a465e70485957
+EBUILD eternalegypt-0.0.11.ebuild 800 BLAKE2B df4f241c3d287d4737f02e417d30499b8325ce20e356bfbebc5da4553c04cedd184e62597bb0ffeaeb575a5329edb01cb9b54a27b52ab34cc2fc2d4a13c6c6cf SHA512 ee180ff339b796e930503ceadc6ea03a36f916601d6017ad9a844aa07c323c18bed13191a75a93a351852a1f4b12c7b6a08264cb1d738e9a0092ac081a65796c
+EBUILD eternalegypt-0.0.12.ebuild 753 BLAKE2B 18a9fedc94c5b36ab850452877a017103a754b0c691d2bb6ce642fcb2e83e6a1812c9a10952f95345f0b535f966a3fc0562b981e7a4ba0271e462191447c651e SHA512 7256425d30c60a2c6242138388161a65f538660a0af3bae2b56d312f3f9abc742a2caf031ae87bd83de14e86143f4b1fffef25f8fb14580012e2013b4573ba02
 MISC metadata.xml 462 BLAKE2B c18b5895f84c6f6aa228dc842bda1c81ea13d58d7960f3dc0682e67874bf74b8878d815680f1178cb943faee47e88cd9a30a14cdf82ca9d1cb6373ef3efdf24b SHA512 85734b5074107369fee397bb1edaa7a7da3885577a92dd2327a813318f251fc35e5a46bf5742cc554437868c312881e4f35f81480dd17de6f93dfd716ff274b7
diff --git a/dev-python/eternalegypt/eternalegypt-0.0.10.ebuild b/dev-python/eternalegypt/eternalegypt-0.0.10.ebuild
deleted file mode 100644
index 17383f9bd..000000000
--- a/dev-python/eternalegypt/eternalegypt-0.0.10.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{5,6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Netgear LTE modem API"
-HOMEPAGE="https://github.com/amelchio/eternalegypt https://pypi.org/project/eternalegypt/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=">=dev-python/aiohttp-3.0.1[${PYTHON_USEDEP}]
-		 dev-python/attrs[${PYTHON_USEDEP}]
-		 dev-python/flatten-json[${PYTHON_USEDEP}]"
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/eternalegypt/eternalegypt-0.0.11.ebuild b/dev-python/eternalegypt/eternalegypt-0.0.11.ebuild
index 6eb94b05e..5f7908c79 100644
--- a/dev-python/eternalegypt/eternalegypt-0.0.11.ebuild
+++ b/dev-python/eternalegypt/eternalegypt-0.0.11.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/eternalegypt/eternalegypt-0.0.12.ebuild b/dev-python/eternalegypt/eternalegypt-0.0.12.ebuild
index 31ef85a4b..458f25849 100644
--- a/dev-python/eternalegypt/eternalegypt-0.0.12.ebuild
+++ b/dev-python/eternalegypt/eternalegypt-0.0.12.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{7..8} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/eternalegypt/eternalegypt-0.0.8.ebuild b/dev-python/eternalegypt/eternalegypt-0.0.8.ebuild
deleted file mode 100644
index cfbd229fb..000000000
--- a/dev-python/eternalegypt/eternalegypt-0.0.8.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{5,6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Netgear LTE modem API"
-HOMEPAGE="https://github.com/amelchio/eternalegypt https://pypi.org/project/eternalegypt/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/eternalegypt/eternalegypt-0.0.9.ebuild b/dev-python/eternalegypt/eternalegypt-0.0.9.ebuild
deleted file mode 100644
index 17383f9bd..000000000
--- a/dev-python/eternalegypt/eternalegypt-0.0.9.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{5,6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Netgear LTE modem API"
-HOMEPAGE="https://github.com/amelchio/eternalegypt https://pypi.org/project/eternalegypt/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=">=dev-python/aiohttp-3.0.1[${PYTHON_USEDEP}]
-		 dev-python/attrs[${PYTHON_USEDEP}]
-		 dev-python/flatten-json[${PYTHON_USEDEP}]"
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/evdev/Manifest b/dev-python/evdev/Manifest
index a985f2b76..555983345 100644
--- a/dev-python/evdev/Manifest
+++ b/dev-python/evdev/Manifest
@@ -1,9 +1,5 @@
-DIST evdev-0.6.1.tar.gz 22034 BLAKE2B 908260b13af01d345ea9edd1b3548bcc9df9fd4325b74718e866286930ddcbc816ef14a7e85af6d8e9f50198dc0f06eceb7794bd3f93fc6aacf17b14bcf857ac SHA512 b55951278e7e19109f8c98cc082024ee8b9c499a315eccfd705816e545f16a120895d4c44359c0f4c296aed64481ba5c39d5760e53789b8d158755f58b2b210e
-DIST evdev-0.6.2.tar.gz 21453 BLAKE2B 6c8c4105e92388aa6b23ee38413cd0af93731f4b4b54b50f56c8fd289600e5580eb3455f0d8a53e1b8df0a44a06003e3ccc7409526e8988090966c25803318ba SHA512 aef30f5a5b3878f3799a5fef942e3eb7a596cd5bd08022e54f87df10d5e07e0d3c47fc2169fe3163cfe166d46de191ef498c99d3592f8819fe57567c6344e28d
 DIST evdev-1.1.2.tar.gz 23308 BLAKE2B 3d1fb49f1801566ca32da512c5309d87b3ae0c8e9928874166d9c8ab8a2c1641a10729908b4a257a9a9c07d8e6808ec6776416084422cff119aa505afb0f25a9 SHA512 34d4b43d6b7eec230a9dddb9c5c5ef46b5964d65a1098c97e3d406c3d4418dcf8975131746dce9a819ff75f96c94d02ce2c141ecec4ed5e19f92e31900d8e8e5
 DIST evdev-1.2.0.tar.gz 24332 BLAKE2B 491b220ccfb21e4550a854fcd431af794b6fefc27bd9ee5197844e4a10c613751b1b387eae850ba9d3b9e012c474ea1c4fd2a9239ac7bd361f6aad27a4dfc32c SHA512 aa7e76783641b7ef729f7ff3f71040dddbe35e408ab7156b0751f3428fe38e1e6dadfd4604a1210689113e85a0e302b553d36c0ddf44059a2057e47988e0f6d3
-EBUILD evdev-0.6.1.ebuild 686 BLAKE2B 3a39eed97c3fbacfd1269a4f5bd62f11dfdb7f54066bffbd4c7e07409500f2ba8436263d934ac1d5eaf782d1454ce80a4465fb08641611e8faa998809bc1c7b6 SHA512 a0f8307e81861e8808a2949c3bbd95c6329fa332f724fadf4a5efe8b7791c5450630e4586afe8f47361b3987a470f73170c1f85a8e60685d1ee7b9a9a6cc8d33
-EBUILD evdev-0.6.2.ebuild 686 BLAKE2B 3a39eed97c3fbacfd1269a4f5bd62f11dfdb7f54066bffbd4c7e07409500f2ba8436263d934ac1d5eaf782d1454ce80a4465fb08641611e8faa998809bc1c7b6 SHA512 a0f8307e81861e8808a2949c3bbd95c6329fa332f724fadf4a5efe8b7791c5450630e4586afe8f47361b3987a470f73170c1f85a8e60685d1ee7b9a9a6cc8d33
-EBUILD evdev-1.1.2.ebuild 686 BLAKE2B 3a39eed97c3fbacfd1269a4f5bd62f11dfdb7f54066bffbd4c7e07409500f2ba8436263d934ac1d5eaf782d1454ce80a4465fb08641611e8faa998809bc1c7b6 SHA512 a0f8307e81861e8808a2949c3bbd95c6329fa332f724fadf4a5efe8b7791c5450630e4586afe8f47361b3987a470f73170c1f85a8e60685d1ee7b9a9a6cc8d33
-EBUILD evdev-1.2.0.ebuild 692 BLAKE2B ab7b4957f5e60a5ba907cdf028142c786dcac713c3025b4cc9812df8e3a094a2b895af7a28df04407676e0566c394251fdf7e1e15bdb132235ecd818262deb4a SHA512 5faf2a2ae296adc8a19f9b35fa2fdf7bc7e7f93d9daa948d4d5e5073f1582e323497116edeca30e4fcba01d5f43b696c9f9e9c2e3151693bda6d8c1fc4ace8fc
+EBUILD evdev-1.1.2.ebuild 685 BLAKE2B 388fd9c8ceb922fbeb67610d6ae4f1c62f3210bd9707eeb3c1c12bb40f0ec00a0160a29fbee7440033f7c86df91bd980d0aa172a597fe63ca5e96ef97489f78b SHA512 0f730a9b97c3ac706e1e6a35ff542f542cfb009996b5cad413b46abcf00c1abaaa21df441e53a6512777480ea3406f91752ef1cd5bfd6d07bf10c08f58731c72
+EBUILD evdev-1.2.0.ebuild 691 BLAKE2B 625482294cfa1c3ed3ab9ca1772f215cd5c99528c1f96fa4e604d10c3a5d5f7d79b017418ecafac073a5b198041ae15e0d7f2d1b1e8a308163b7eeddbd5644f4 SHA512 a39e1c890c967bd82767efe2aacf926c571d420bfe77d4e97dbf4ff637aa89219631ad21a56450a2e6d6c2c59d0f3fa56bbdef129d05cfbd8cac9929e7793867
 MISC metadata.xml 456 BLAKE2B 13a5b5439173591246a855ae9bb242ec9385d8a18935567754da74c505a278f0759240a5e914a72408c24298d222a17355b423762aea54974e42fd9f129d37a0 SHA512 32299589433dec712120efad43dfa6668ea80552ee05559ff461a87336d5091a522088e8f8f543991979e89a2ef80afea0ab1727fe531816592c4ac0f4c6a274
diff --git a/dev-python/evdev/evdev-0.6.1.ebuild b/dev-python/evdev/evdev-0.6.1.ebuild
deleted file mode 100644
index 08bd505e1..000000000
--- a/dev-python/evdev/evdev-0.6.1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{5,6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Bindings to the Linux input handling subsystem"
-HOMEPAGE="https://github.com/gvalkov/python-evdev https://pypi.org/project/evdev/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD-4"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/evdev/evdev-0.6.2.ebuild b/dev-python/evdev/evdev-0.6.2.ebuild
deleted file mode 100644
index 08bd505e1..000000000
--- a/dev-python/evdev/evdev-0.6.2.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{5,6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Bindings to the Linux input handling subsystem"
-HOMEPAGE="https://github.com/gvalkov/python-evdev https://pypi.org/project/evdev/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD-4"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/evdev/evdev-1.1.2.ebuild b/dev-python/evdev/evdev-1.1.2.ebuild
index 08bd505e1..2daeddf4b 100644
--- a/dev-python/evdev/evdev-1.1.2.ebuild
+++ b/dev-python/evdev/evdev-1.1.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/evdev/evdev-1.2.0.ebuild b/dev-python/evdev/evdev-1.2.0.ebuild
index 3caed2d87..117685694 100644
--- a/dev-python/evdev/evdev-1.2.0.ebuild
+++ b/dev-python/evdev/evdev-1.2.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{8..9} )
 inherit distutils-r1
 
 DESCRIPTION="Bindings to the Linux input handling subsystem"
diff --git a/dev-python/evohomeclient/Manifest b/dev-python/evohomeclient/Manifest
deleted file mode 100644
index cb3b6d02d..000000000
--- a/dev-python/evohomeclient/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST evohomeclient-0.3.3.tar.gz 12582 BLAKE2B 23192d94d2d468b9597cfa1b66b79a11a6424b0b667c3a7a6aac4592d122755d472fad24976817257aebfa62115409dc08131a497ada229f5c1f3ae81de7e675 SHA512 18a8e0ec34e02b2554d28fe0098c5f1c378cbb18a650b8f93114a0d83c85c838ce19693d8fc33db82006f1bd86b29d0494d695a90f2fdb592eaece79d568dc5a
-DIST evohomeclient-0.3.4.tar.gz 13025 BLAKE2B 5372851c63a409b07ae8c8216f7aa743fe70674ac6661a011abb5f183bfb29173472f689e3e9349b309e04a6c91fb2952d30ace3e3a40e72bd41cf0d15dd448d SHA512 189d32ff909502fe99e394e44b66217287ed78aff283a897c12782a52d3ddc561d606b7b060c8aac406ca0c75691888770d880dad9b998bf9270a38553d584af
-EBUILD evohomeclient-0.3.3.ebuild 716 BLAKE2B 5a4cc7696c52ec9935f6732df9d2c54076865a50c0c243b7cab9f34ab67f1cb131635b386ae1c67dc384bff2d09e24cb7d328c91539791cf3cb11e44626d6e9c SHA512 83d466424f71032c55673c077ea73380cfcd9afc57966f3180f23f3227f78edd52106bb159380a347d82c7938d19a57a2e107cd8231180e56096a7d820896b20
-EBUILD evohomeclient-0.3.4.ebuild 723 BLAKE2B 756dddd88a2b3a581d389fccfb2b7f8adb1e31383024b06736ec3eb309b06960b344cb5f4c53db5c2edb66d355da4fc242c088e6d85b2589325e633d26294b36 SHA512 cefe892fec5d939153118051d92cf678b49b7db7fc0dab835e214281c5c63b9b7a0c86c80be451f66dabb2168023e1aee80dd957288748ce3fc6b3ff13b77372
-MISC metadata.xml 462 BLAKE2B d278dc2afcb5b028446f76341307bb5cb658e2a596777edaed9353994e01604862657b482663a159da7841b5bed19dccbd6263bfc781e919f9b9cdc10ca0f18c SHA512 8dd650541c462eb4e62e6da04dbb0603311b7a6a6e2eb79536e2af1c3064145584ed886184efc3f60585032b5447365c6ace26026dc413b5d82fe25d0e22c90b
diff --git a/dev-python/evohomeclient/evohomeclient-0.3.3.ebuild b/dev-python/evohomeclient/evohomeclient-0.3.3.ebuild
deleted file mode 100644
index 0025ceced..000000000
--- a/dev-python/evohomeclient/evohomeclient-0.3.3.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{5,6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python client for connecting to the Evohome webservice"
-HOMEPAGE="https://github.com/watchforstock/evohome-client/ https://pypi.org/project/evohomeclient/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/evohomeclient/evohomeclient-0.3.4.ebuild b/dev-python/evohomeclient/evohomeclient-0.3.4.ebuild
deleted file mode 100644
index a707aaf30..000000000
--- a/dev-python/evohomeclient/evohomeclient-0.3.4.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python client for connecting to the Evohome webservice"
-HOMEPAGE="https://github.com/watchforstock/evohome-client/ https://pypi.org/project/evohomeclient/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/evohomeclient/metadata.xml b/dev-python/evohomeclient/metadata.xml
deleted file mode 100644
index 16572a589..000000000
--- a/dev-python/evohomeclient/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>b@edevau.net</email>
-    <name>Andreas Billmeier</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="pypi">evohomeclient</remote-id>
-    <maintainer status="unknown">
-      <email>evohome@andrew-stock.com</email>
-      <name>Andrew Stock</name>
-    </maintainer>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/fints/Manifest b/dev-python/fints/Manifest
index fa37e7877..159c8a0b3 100644
--- a/dev-python/fints/Manifest
+++ b/dev-python/fints/Manifest
@@ -1,5 +1,5 @@
 DIST fints-1.0.1.tar.gz 16195 BLAKE2B b4b5fc3bdaa759d8e7114f1460db75c3c11cf957d5e29afb84f04c728ed7eec4800c42fb992e87d65a7e499a1c4812372f5cffbfb66ebd0c97e9156ec7c9f5b6 SHA512 5504c6c8193ace9149763022a9ea61bcedae1105be5799819faf1e0969f8188348248af8fb531c707a16fdc87d9650ed9cc77a1830311530aaac2657889f9849
 DIST fints-2.2.0.tar.gz 64983 BLAKE2B 29f54826d1c918831331691d98a9aa450102b773d1ce5938de334ccee71e3eb27044db9a43e5254f130ea6bfc1813818a1e70501c00f837282c758f1ad38f480 SHA512 03dccc628fe3bd33ae0ca243ce16d0dfb43981055ccdedf00cf6a699ae0470f9f47407e95fe6ba3a7f854b6acf25eaab1284bf4adfb797f6f8659f800f1a62ac
-EBUILD fints-1.0.1.ebuild 856 BLAKE2B dc36153f3b967841da4a1c5c620597d06bef9b7853054f6f21a083a70941a241e323ab78d2e22e58849b37f31543c246d5864a495cad4898985063ace0b0a964 SHA512 b30a47a0d5b750ab7941a6ddcef723e5aada92ecd3cfaaf60eaec6ea4411a0e1bca83000e06268fbdac5e2213c5362b3efb3d492a7f535097409ada01624d919
-EBUILD fints-2.2.0.ebuild 864 BLAKE2B 7e6d458125c80c242527f9756cdeff216829e3422957cc25df34f0b94e047fc0a10d0446c3a53ee953214aaaa6b477c3875ffc511482b31b21d8befd0d68cb9c SHA512 4f4ade4149da4a8847750c3df872540fa3954846b2cf506149d78b1a8fa8f22043b43eecbc5aa221c74040f1052f61704e1e2d0fd48f56ef41683657fe916c0e
+EBUILD fints-1.0.1.ebuild 857 BLAKE2B 108c1d62c12863720d9bbfe30ea386ad22a864d7f6084c232932fd32081e0df00968794401753d6b7e988bb7e7944022da36f1a26644a66d8e74fafd59f22e0c SHA512 4e00db4b9c67aee0c54b5c0bb7fe69619da4cdfbae2df24066bb39f8b17f49475c17e8476e78a9b026582c9a3da5e454be79e531bdc9946e3e5668ee987f7b73
+EBUILD fints-2.2.0.ebuild 863 BLAKE2B 4b7a4df14d319720298f5fb6e79c8c7631d1c2b084c5e31cefeeb6470a3130d730ae8a6855407eeccc1b82e3a4aee48716462d51241052741b2661c2e2b79b6c SHA512 c54cd00aba92d0fe29d40e6c8a591a6e8499176bd0a09f1762ecd416271f1d2b0734b77a8ac61c955db0ec4add4a046bdf7b2045dc5bb1de5d8255e0e03ceead
 MISC metadata.xml 453 BLAKE2B 9a6ea04f91a4c3ce9c90711e45a544e6c0243fc0726711cfc2e4c37e2c5186ba2ae8d3423d74737e6e2c0129ed5e864cf8ce6cd53b910acf734a3e2374c2bddb SHA512 470c2c4bdf83bd99910841c29ba6702f859038a6a0be7e3c677332ad3a6937251a8941ebe50a2ce845a4738658664a425d5fa46a9c3205a223dd94e11888dbb3
diff --git a/dev-python/fints/fints-1.0.1.ebuild b/dev-python/fints/fints-1.0.1.ebuild
index c2322c039..fac852020 100644
--- a/dev-python/fints/fints-1.0.1.ebuild
+++ b/dev-python/fints/fints-1.0.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/fints/fints-2.2.0.ebuild b/dev-python/fints/fints-2.2.0.ebuild
index dc37b6a95..daa22d703 100644
--- a/dev-python/fints/fints-2.2.0.ebuild
+++ b/dev-python/fints/fints-2.2.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{8..9} )
 inherit distutils-r1
 
 DESCRIPTION="Pure-python FinTS 3.0 (formerly known as HBCI) implementation"
diff --git a/dev-python/firetv/Manifest b/dev-python/firetv/Manifest
index 213abad55..308f91eee 100644
--- a/dev-python/firetv/Manifest
+++ b/dev-python/firetv/Manifest
@@ -1,5 +1,3 @@
-DIST firetv-1.0.7.tar.gz 8336 BLAKE2B ca278981ca301b04bb199eacbd43d2f1ed316b1858fff0f925a626b647b308a234e8b5dd198a436c1d7239eee061fd3a4e3b4c1f0c05609ff669cfca04ee9634 SHA512 8d49185d315482fbdbd98725dd85ad3846d9fabe5dc43541e7956e12b6d9aa2753284174237393dbbd8d2b656f2cba1c8e9448dda74b701a7cdf42239a1cd0ab
 DIST firetv-1.0.9.tar.gz 10489 BLAKE2B e0fc47662f322fc757e7782be5fcf618d7b7848d40cd0146ffd2c0733e1d97b0616ae31fa7a78f7deba6603247d290fb3ba2737a05a4508125cb9ef924d52b55 SHA512 da0b2966302ea03043f82b0b38064e2764c3aad2183c3ee483ce945749edc5e25cb9ac441ea8f076f30b987ef55b8320e013de7bb8458a879d86e434b3b42f30
-EBUILD firetv-1.0.7.ebuild 729 BLAKE2B 3d78764608947e8a18d5f595b36bc89f15b012d3b7d57772ef6b86b6c63b8ddb3e5edd92c2f9550521950a1c1b8469eaeb0e6897f9a675ff78a8f4f239e0e98f SHA512 6825d3fa1136e54e96be8068cffa87e5defb225a9b2dd0849d7f8cecfb35be880ccb5c851e56f5335298d0439c51480575d40ae31f53f79c7a9e903212845515
-EBUILD firetv-1.0.9.ebuild 871 BLAKE2B 17feb4999299b84faae79ae7e54f15dd74b7f0b7b5c9feba6b8d6cc4314e5b54e62a249104a0582b889ca6b6445bfc4a6d2d8b301da21ac43edd9ba4386664b8 SHA512 e6d56cbc609c40a2aa47b786bc609739a2990bb4b044dc89ef0d634edb0b8faa3966b11cc7cc04072b2fa4f71e9970ede49a053653dc864b1951bb2f5d2fc41a
+EBUILD firetv-1.0.9.ebuild 870 BLAKE2B 4b55c39866da57f8a83814786990311b1f28c7e04daffc9518db7670e7393c3f0515204dcb7b0ef0a3bc5b8ebf149a562f40d9e752fe759046a7cc0a5a762294 SHA512 972b21975c15bfb53cd1a2f9c6b1c9ee5c1f78ce2250219c905d524a7d4e4d17138fa7c8f014f9d8fecf4728b742876fa10753f87214df6cc7858facea71d162
 MISC metadata.xml 455 BLAKE2B b585b6da03014852eb5b4698ff5922e0225920264b545f71a9d1afe7cee6159a4613d17bfbb75dcf9da931077e0e813360a1dbf4927b7deb9f8c83a03a75abfd SHA512 4bdfc5b3a010b7e21685cf812468b8ed027555ce2eb1beb6da57dac4f6471f44b2d5c07a56f13f6e7decdb015d5863dceb3e90b86e15676663d3a13d2ba93a88
diff --git a/dev-python/firetv/firetv-1.0.7.ebuild b/dev-python/firetv/firetv-1.0.7.ebuild
deleted file mode 100644
index 4c4c025c1..000000000
--- a/dev-python/firetv/firetv-1.0.7.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{5,6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Communicate with an Amazon Fire TV device via ADB over a network."
-HOMEPAGE="https://github.com/happyleavesaoc/python-firetv/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86 amd64-linux x86-linux"
-IUSE="test"
-
-DEPEND="
-	test? (
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)
-"
-RDEPEND="
-	>=dev-python/rsa-4.0[${PYTHON_USEDEP}]
-	>=dev-python/adb-homeassistant-1.3.1[${PYTHON_USEDEP}]
-	>=dev-python/libusb1-1.7[${PYTHON_USEDEP}]
-"
-
-python_test() {
-	py.test -v || die "Tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/firetv/firetv-1.0.9.ebuild b/dev-python/firetv/firetv-1.0.9.ebuild
index 54296d51a..a117d4ab4 100644
--- a/dev-python/firetv/firetv-1.0.9.ebuild
+++ b/dev-python/firetv/firetv-1.0.9.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/fitbit/Manifest b/dev-python/fitbit/Manifest
index c4bd08a1a..8e73982b7 100644
--- a/dev-python/fitbit/Manifest
+++ b/dev-python/fitbit/Manifest
@@ -1,5 +1,3 @@
-DIST fitbit-0.3.0.tar.gz 18269 BLAKE2B 33ad8f556622af9044b2df99573986206e7319fba534255250b811508f0dce611b2ed23ada944a726dd3271df8032c3f879778c47e3643192fedd0fd407e0ef5 SHA512 b13951c7cefd24b695f2a93c4af27f2ed48da3bd5b9910dd5b72ce28a79cd20a44701f5b10ea2fa3387d021f8b757c51551a38a1ec1addd85115a96211fc278a
 DIST fitbit-0.3.1.tar.gz 19760 BLAKE2B ed8dc0fab6bc86e651ec3c2dcb76ebf5d887063e8584f766f81e6c770ed640cf07af4140cf2284e656275b2bc2277de90d5b72c773289baf32c96370829a051d SHA512 34d52a81c1cf9a7cf2704b547b45b3253ffb6501fd91603a9edb3abdfc8f1b3c9cad2e92f55e789111edbf2dfce91a47ef495d274d164bcf76d42dc3df37d5ec
-EBUILD fitbit-0.3.0.ebuild 667 BLAKE2B 27266c8fea439fc19e875cf53638cf3215835d3429e5e5dc48b8ed8c0578403304c68a3a989de36fadf017820c31d68b63c12f0920461f13096577f01ced2cf4 SHA512 9cc0cce91c9aba218495ca8a89d28a840c97cc8f22ba1ca00ff0fae5bbe43549d4c718aab3bf7ed4e3a7c80b8c2a8faa85b279549998fafb652dc3df632614cb
-EBUILD fitbit-0.3.1.ebuild 674 BLAKE2B 5440b19c94d067c6d76f44fe4c9e570f0c49561d43b0b29fde71d4521e88f35652ca4ed06f0d64a78b61aa35cac17324238b6aa196f8058536ed30c7a78c52f2 SHA512 5a08642fbe92f55f92a157b0946e484c8edf75680653c0061dc9890bffdf44af369c3c60b9f8a7d7e907a97e519a90d8723457fec619a4e2f9c7f28712ffc5c9
+EBUILD fitbit-0.3.1.ebuild 673 BLAKE2B 5545edfd117682fe47988fd9e6bf21294e0448a77b7102e339e387afbc694a95bdcc5b9a0d06d4a22c4e47afe4384a72c580d86ab59d366c19f0387b54d064e1 SHA512 71ac99391f6638b93d8a676fc93e07b6f49de978db99f3628dbc8ef0c76e972edfdcbba03502ebb6c96a91966d532d90ea1361a989ff1f92146d7c443dadd9ed
 MISC metadata.xml 461 BLAKE2B a9f6d532ed88185d8ac3031d0fe50a71f061dfc243de501e89a72fcd5c8304f9b7d6bedf32b01a19b456c1df17a9c039270063e44924ceb306fbb0b9e40f1ffb SHA512 617f5ac46686cdcf18b64ccb4976b27a563ed50006f3f8649f34111e8e69be37668218ab27112735fb90d95b9660ae66efaa630970e57e00c1207b0c19fedd24
diff --git a/dev-python/fitbit/fitbit-0.3.0.ebuild b/dev-python/fitbit/fitbit-0.3.0.ebuild
deleted file mode 100644
index 23aae8d0c..000000000
--- a/dev-python/fitbit/fitbit-0.3.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{5,6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Fitbit API Wrapper."
-HOMEPAGE="https://github.com/orcasgit/python-fitbit https://pypi.org/project/fitbit/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/fitbit/fitbit-0.3.1.ebuild b/dev-python/fitbit/fitbit-0.3.1.ebuild
index 44f698c1b..a8f054a25 100644
--- a/dev-python/fitbit/fitbit-0.3.1.ebuild
+++ b/dev-python/fitbit/fitbit-0.3.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/fixerio/Manifest b/dev-python/fixerio/Manifest
index 42eb98867..8481dd0e8 100644
--- a/dev-python/fixerio/Manifest
+++ b/dev-python/fixerio/Manifest
@@ -1,5 +1,3 @@
-DIST fixerio-0.1.1.tar.gz 16063 BLAKE2B 904799297a8fdfbae18cd4151464602e0b23f2cef626733ee77e99ba6cd99471c1b482648912967af02bcc574d59321efe755bb0ada4456f7559bb33671431b7 SHA512 e3babf41020adf1375d3b8532820714ab5464c33a175c273e2fed5177f77de42bc3c9f278732254d3d250a3a992311df0987a969b6606ea9d53428dffeafdf59
 DIST fixerio-1.0.0_alpha0.tar.gz 15616 BLAKE2B ab2b97e5b49c1c3aae89bd03105345072daf74c980b6f7e1c245edc13faa5a04c70c2cc55ec46778f634afb5e92e8973d5f9afbfd5c1a2fbf81153771a641d44 SHA512 0cb7c5e8bd75ee1f959efead7b8abf82007fcade2d5bef3f1671f3b5fd77d28f8909b3f350054964a7f19c38e5febf9380f645b9e3f91ff1acc536b5a8679a44
-EBUILD fixerio-0.1.1.ebuild 708 BLAKE2B 7386f2a0c5473349be85f9f9428c0d8f330fb99d4f3f2885d0cb277f9842652a24e058799ce24398518bf125adc48bb7a9164ed158ab001a73665e40c62f37f9 SHA512 fc62564d998a5f97d09a27cff75153d8fc83eea82e49d3dbb73720283e9d0fba50bf65a9384a4099a39123f87dc3b2ff3636cca6442df44ad64b3960e05f42f5
-EBUILD fixerio-1.0.0_alpha0.ebuild 794 BLAKE2B 4710aefd5a655c8a3f514c7466e889210dbb92169c34606dcab46c07965a6c76ae29244533f7c4647642824f9c4606ea44593705d2a3fdd3fe9971efe0ec3ff9 SHA512 10984647b4c96bc7dfbeb428f3b0993ebdfd4bdcd9ba7c6de4f96d476151deb923c29f580d30d20eac374a408d284e57ac821818ff3f493c4c452271bf703b5a
+EBUILD fixerio-1.0.0_alpha0.ebuild 793 BLAKE2B adfb5de2b6730094a667ffdc69d3f619129eef032677b12e340cde8856a3cdb2f155eaed024124b7d3496439c60adcf9c7f270a4a4baf96f46cbd0c0ac6d2fa4 SHA512 2b613ce30ba0e2c9c73728a7a4251e8b1f7ee33f45f639a820d29b6de2db971ae32666729bf8b8eb6b86b62bc36f3af92248eed24083aad5d0ea8fe8f4199497
 MISC metadata.xml 463 BLAKE2B 791f53de0ec373813fc8ca963e5d2c5103e42f6ebb886eae951c81bd6adbf1a3f3d075b27644ec0a5757bee03c67613eda6b34087240885c6ba6c440655ad7c9 SHA512 d8d890b2f1df3e22a16c13f01ad18424d296d5aecde6f6b7e3a6875abd4b0909874ff61aef3e7cadce7f82fde843a730bc9d1792ccc0e04a2c933f17c650c602
diff --git a/dev-python/fixerio/fixerio-0.1.1.ebuild b/dev-python/fixerio/fixerio-0.1.1.ebuild
deleted file mode 100644
index fb0182599..000000000
--- a/dev-python/fixerio/fixerio-0.1.1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="A Python client for Fixer.io"
-HOMEPAGE="https://github.com/amatellanes/fixerio https://pypi.org/project/fixerio/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=">=dev-python/requests-2.0[${PYTHON_USEDEP}]"
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/fixerio/fixerio-1.0.0_alpha0.ebuild b/dev-python/fixerio/fixerio-1.0.0_alpha0.ebuild
index d65abe5b9..d5e63b95b 100644
--- a/dev-python/fixerio/fixerio-1.0.0_alpha0.ebuild
+++ b/dev-python/fixerio/fixerio-1.0.0_alpha0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/flake8/Manifest b/dev-python/flake8/Manifest
index eddab0a87..34538c97b 100644
--- a/dev-python/flake8/Manifest
+++ b/dev-python/flake8/Manifest
@@ -1,11 +1,5 @@
-DIST flake8-3.7.5.tar.gz 148039 BLAKE2B 4d1e793d92af549441542345709c1795bc1f16e883fc5cd3a6abcf7b0c42447652235ec3b8cc295a6c97d9813a814e04dfe18cb68c0bdb9f20005caa8f3d4212 SHA512 b7354012e5d66c8407bba062d0331fc1021bde4172f5d8014f37524218dfd489ce8d59a92edd86437a047251829ef0526663d823e14a09613f1d4dcf27f9365a
-DIST flake8-3.7.7.tar.gz 148457 BLAKE2B df445ecc1485efb21b1f76009019660d1dee2dae76125c6abc6399105a397eda29834f4c06841c36143fde263355d9cdadba23922cb691c0215d31248b69a9c9 SHA512 45a1d6d0ff84bc79738853930f14c2aa423cb7ac68b1655887ac9f68efdcce3d49d13f01cfa86ac82b759bbfe2b1182006c51b612b9230882aa03932100b5511
-DIST flake8-3.7.8.tar.gz 150113 BLAKE2B 627b266cebfcea2da48980d23c411dcc57c4566aa728d024d439e3a11945e3ad3f5a33dcc49626d7b925875cc4226afeebf7199351aa43e36d80beee4c2c8fc1 SHA512 a25076bb7f978ca23af0f2016b30bf5fe4680371b4c0939361a6f8c496f3c846cf98ecadee35fc2dedd588116c8cd982529972dd2411ab139621912b69132a1e
 DIST flake8-3.7.9.tar.gz 150123 BLAKE2B fd46710c0dcce7d3dcb3d5fc8ff7a83a35315679fa838e68abafd5bdc342c13218706fec0dac3fc9a6d919971f1f846c855f00cbd60c925e979378e431dace0b SHA512 c3c753ad050d8a8f87f7c28c8a1c953ed9bd04f08b09512d9323152b4eebb57d67fbfb0f5317d629174fa12fa234e1a86d6a633dd951fff6a45330b1c4f62850
 DIST flake8-3.8.4.tar.gz 163583 BLAKE2B 221234931365912adffec99c7c6761d2f35918222bee902ade4d8009d24f6918c66d23fc4b973fe653152cc6857b62ba859780b0d9de53fb91b7ea0379bee9d0 SHA512 51ed09beed50175573e6184b404431b3f89aa6594c40c70ed8288982fe12c2a68992e36d69c99013188f03555bf9fef1ba4f111f8e389cef1e1daa69b41ff5b0
-EBUILD flake8-3.7.5.ebuild 1486 BLAKE2B 96ee84607206fbd9ea3dc285314d7edd10ed1b8eac72d506963b64b0189f421a4481df76d0bf7be28c115897d46bf5048ad5d3c812cf8dfe49f14c3401cca649 SHA512 069b4cc2fff648269e28bd626146b4008554da4dbd337a1dc18d6a840b72c5be625a6fc90993faba46505c836ddfad7462b1dd0f8f95a89637d889b4d7839d01
-EBUILD flake8-3.7.7.ebuild 1486 BLAKE2B 96ee84607206fbd9ea3dc285314d7edd10ed1b8eac72d506963b64b0189f421a4481df76d0bf7be28c115897d46bf5048ad5d3c812cf8dfe49f14c3401cca649 SHA512 069b4cc2fff648269e28bd626146b4008554da4dbd337a1dc18d6a840b72c5be625a6fc90993faba46505c836ddfad7462b1dd0f8f95a89637d889b4d7839d01
-EBUILD flake8-3.7.8-r1.ebuild 1465 BLAKE2B 65f2d410380d7b3b1d53645a9a2159fe70b18a1ccb82fe2d4ae688798b989b65750ae607c9af4e237d03948853b768ac09b7f0cc34ad9d910c51077fdaab94b1 SHA512 84720247a56afe1a5f27dd606111bff5043298dc5787756af7cb71245abc61970eb3ff391f9e7e782f4d3c75f65043ace12645034c8711fc50b210fe4bee522e
-EBUILD flake8-3.7.9.ebuild 1474 BLAKE2B 15cc1268aa2860944bd054271d2084ca6ccb3e7f74474e8092bf2328c5c41dd191d33c2a9435ab6dcad76ff6f22b74f84938ebb8ebb0830b3490573a59763b13 SHA512 f9cce1138391fb5616de2b7a8099b2478840736910f0d2cd17072dc68d530f7a949e4f70fc3e1b057160ba0211796e089086c63d810c41152879b24678849ade
-EBUILD flake8-3.8.4-r1.ebuild 1341 BLAKE2B a9968c703062867c0c0dc6a5f7e78557735cc14b5027cb9e72bf9ef4ed5f37bce5ea04a951fa47a5bcac886ef2e2259921e0669c44f93e36d70b53b3877e0f16 SHA512 8603565f3c374912da52e76b4163a248a50c9fdd9e42697b34b20cf5a6ac0662a564d177279eebde161358d56ed2441d1368df5e46409d0163def8597f5acd06
+EBUILD flake8-3.7.9.ebuild 1473 BLAKE2B 6b338d96afa1c627d65e936f6c2aa17613dc5b02af2b1121d349fca32d02c44d46f5b626beb9935c73e0256b866a8b0357b0ec52237f9861c68b3dc032614044 SHA512 887b12a84c258bfb216051b02f648b7566349c6307634af9be7c36f4fd238feca08a34371dbc992c0f1d2e619072607e876d412a9e176a66eb332564917b04bc
+EBUILD flake8-3.8.4-r1.ebuild 1335 BLAKE2B e9124a45f1d22d7bf76cc7a84a5b1eee4dd0673801b458730360713e847672970a79096070f1e48a5a0c899436eae558205acd7d876e2eb7aba2c5fba26e1ff7 SHA512 2a71b05af4976133ba7df886c91e960e0527e7407e40fe2587006deba8c2da4c53e61f69b95cd1c7301629be49072906a100bb5f7526ee3bbc72f708f3665362
 MISC metadata.xml 373 BLAKE2B af4d7678c87281f631048d3c49b0a642ceee1d771be2b662458888659b7c8e262c98adcd7bcb7f6ab251783998950725729ed35c887c004f8d8da87da81eda7d SHA512 449aa40152590e7103a4bf10006a33e6a0d5010a7846b0c5fbee8a78d99a3539995eccf441845c205bf48fc1e9b35cd7b1d6af0d98b469bdd06989baf8b88646
diff --git a/dev-python/flake8/flake8-3.7.5.ebuild b/dev-python/flake8/flake8-3.7.5.ebuild
deleted file mode 100644
index b55414785..000000000
--- a/dev-python/flake8/flake8-3.7.5.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} pypy{,3} )
-
-inherit distutils-r1
-
-DESCRIPTION="A wrapper around PyFlakes, pep8 & mccabe"
-HOMEPAGE="https://gitlab.com/pycqa/flake8 https://pypi.org/project/flake8/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-# requires.txt inc. mccabe however that creates a circular dep
-RDEPEND="
-	>=dev-python/pyflakes-2.0.0[${PYTHON_USEDEP}]
-	<dev-python/pyflakes-2.1.0[${PYTHON_USEDEP}]
-	>=dev-python/pycodestyle-2.4.0[${PYTHON_USEDEP}]
-	<dev-python/pycodestyle-2.5.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep 'dev-python/enum34[${PYTHON_USEDEP}]' 'python2*' 'pypy*' )
-	$(python_gen_cond_dep 'dev-python/configparser[${PYTHON_USEDEP}]' 'python2*' pypy )
-"
-PDEPEND="
-	>=dev-python/mccabe-0.6.0[${PYTHON_USEDEP}]
-	<dev-python/mccabe-0.7.0[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		${PDEPEND}
-		dev-python/pytest[${PYTHON_USEDEP}]
-		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
-	)
-"
-
-python_prepare_all() {
-	# Flake8 falsely assumes it needs pytest-runner unconditionally and will
-	# try to install it, causing sandbox violations.
-	sed -i -e "/setup_requires=\['pytest-runner'\],/d" setup.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	py.test -v || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/flake8/flake8-3.7.7.ebuild b/dev-python/flake8/flake8-3.7.7.ebuild
deleted file mode 100644
index b55414785..000000000
--- a/dev-python/flake8/flake8-3.7.7.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} pypy{,3} )
-
-inherit distutils-r1
-
-DESCRIPTION="A wrapper around PyFlakes, pep8 & mccabe"
-HOMEPAGE="https://gitlab.com/pycqa/flake8 https://pypi.org/project/flake8/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-# requires.txt inc. mccabe however that creates a circular dep
-RDEPEND="
-	>=dev-python/pyflakes-2.0.0[${PYTHON_USEDEP}]
-	<dev-python/pyflakes-2.1.0[${PYTHON_USEDEP}]
-	>=dev-python/pycodestyle-2.4.0[${PYTHON_USEDEP}]
-	<dev-python/pycodestyle-2.5.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep 'dev-python/enum34[${PYTHON_USEDEP}]' 'python2*' 'pypy*' )
-	$(python_gen_cond_dep 'dev-python/configparser[${PYTHON_USEDEP}]' 'python2*' pypy )
-"
-PDEPEND="
-	>=dev-python/mccabe-0.6.0[${PYTHON_USEDEP}]
-	<dev-python/mccabe-0.7.0[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		${PDEPEND}
-		dev-python/pytest[${PYTHON_USEDEP}]
-		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
-	)
-"
-
-python_prepare_all() {
-	# Flake8 falsely assumes it needs pytest-runner unconditionally and will
-	# try to install it, causing sandbox violations.
-	sed -i -e "/setup_requires=\['pytest-runner'\],/d" setup.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	py.test -v || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/flake8/flake8-3.7.8-r1.ebuild b/dev-python/flake8/flake8-3.7.8-r1.ebuild
deleted file mode 100644
index 40459869b..000000000
--- a/dev-python/flake8/flake8-3.7.8-r1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="A wrapper around PyFlakes, pep8 & mccabe"
-HOMEPAGE="https://gitlab.com/pycqa/flake8 https://pypi.org/project/flake8/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-# requires.txt inc. mccabe however that creates a circular dep
-RDEPEND="
-	>=dev-python/pyflakes-2.0.0[${PYTHON_USEDEP}]
-	<dev-python/pyflakes-2.1.0[${PYTHON_USEDEP}]
-	>=dev-python/pycodestyle-2.4.0[${PYTHON_USEDEP}]
-	<dev-python/pycodestyle-2.5.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep 'dev-python/enum34[${PYTHON_USEDEP}]' 'python2*' 'pypy*' )
-	$(python_gen_cond_dep 'dev-python/configparser[${PYTHON_USEDEP}]' 'python2*' pypy )
-"
-PDEPEND="
-	>=dev-python/mccabe-0.6.0[${PYTHON_USEDEP}]
-	<dev-python/mccabe-0.7.0[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		${PDEPEND}
-		dev-python/pytest[${PYTHON_USEDEP}]
-		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
-	)
-"
-
-python_prepare_all() {
-	# Flake8 falsely assumes it needs pytest-runner unconditionally and will
-	# try to install it, causing sandbox violations.
-	sed -i -e "/setup_requires=\['pytest-runner'\],/d" setup.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	py.test -v || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/flake8/flake8-3.7.9.ebuild b/dev-python/flake8/flake8-3.7.9.ebuild
index defc612e7..bcd843a8f 100644
--- a/dev-python/flake8/flake8-3.7.9.ebuild
+++ b/dev-python/flake8/flake8-3.7.9.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/flake8/flake8-3.8.4-r1.ebuild b/dev-python/flake8/flake8-3.8.4-r1.ebuild
index ea0bb89d6..e5e68bf35 100644
--- a/dev-python/flake8/flake8-3.8.4-r1.ebuild
+++ b/dev-python/flake8/flake8-3.8.4-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( pypy3 python3_{6..9} )
+PYTHON_COMPAT=( python3_{8..9} )
 DISTUTILS_USE_SETUPTOOLS=rdepend
 
 inherit distutils-r1
diff --git a/dev-python/fritzhome/Manifest b/dev-python/fritzhome/Manifest
deleted file mode 100644
index 80b3952cc..000000000
--- a/dev-python/fritzhome/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST fritzhome-1.0.4.tar.gz 8403 BLAKE2B a01e334c2fee8f48779f74ea83bc1f899701df477c051c5d5a372ef56a0182cf99938b23db829a16653171cd412956d20338fcfa1897fc4a08064cc9bc2e8986 SHA512 7e5f661b407577374ac818d18b07f5d24d98bbf22ba0d1a4050b1733144d59d3607793e7c9447724285b82db0682788138fff8e5edeb71e5d16361a325354bf4
-DIST fritzhome-1.0.5.tar.gz 8403 BLAKE2B 3812c47c23bca40c23682fd8e275111c4612ea6020f0b7d0ab50a1022c868f140e9a4becdfb9e6eb9962daaea581e4ccefc1122a8bddf13f91372ecab9a577d9 SHA512 efba17b7b2fc76782d4d13668088c84edb156dd57e68267d5fd8f48b34a0f81d27b1d41e4dbd9cc32968f069fc1a7712941e80caa5c149d4edbee6bb2d49f421
-EBUILD fritzhome-1.0.4.ebuild 790 BLAKE2B bac9cb1188f577dd2107a185d641dd1444e1d6a6b5df65e941f7e7d17fd31715ca4f0b00070f4c220195703c2ddfb3b467ca650de0d3c1003dffc61f3682ef78 SHA512 7d3f79fbef74f1322921718c550361a7f2e5154d99a20986e6786ddba3ea630ed012f0a85305e43f632f1e692316254402e875d3b8a921aa74f5f8d40858e6ad
-EBUILD fritzhome-1.0.5.ebuild 799 BLAKE2B 5bf7bd91674d6ba8c943910e72f6f8115f9c6812b71fe906ccf3e968085eac30e1f119f6d3f62129478c3d57b0ca55a5e2a4fd644756ab018fbe8d7bed92b828 SHA512 570a3c3888e4e5543bafe4a80683bc37cbbb1d00952b92e8e784fb532ffc621cc2587cf3dbf5339270b8b108b94e49cb73dbc04b499a6ce42246f1934c6d263c
-MISC metadata.xml 453 BLAKE2B 593cc7e5fe92a0bada4ade6e45dbf447b3adea32b76d0bf7591ed9d7f1d7c539498f54053604cc71c9261230c9d5a24f562f1c45f8f832a0f89afc98880d5925 SHA512 5a1ef0a31950a682978315b687c7b8f0689aa59378100ca2a5bf2df12d77b562e15ac970590d35efcea85d636268b75f30012427c26519a5b699295efc54d520
diff --git a/dev-python/fritzhome/fritzhome-1.0.4.ebuild b/dev-python/fritzhome/fritzhome-1.0.4.ebuild
deleted file mode 100644
index 475ec238a..000000000
--- a/dev-python/fritzhome/fritzhome-1.0.4.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Query information from your FRITZ!Box (mostly energy)"
-HOMEPAGE="https://github.com/DerMitch/fritzbox-smarthome https://pypi.org/project/fritzhome/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=">=dev-python/requests-2.12.0[${PYTHON_USEDEP}]
-	>=dev-python/click-6.0.0[${PYTHON_USEDEP}]"
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/fritzhome/fritzhome-1.0.5.ebuild b/dev-python/fritzhome/fritzhome-1.0.5.ebuild
deleted file mode 100644
index ffb0b269c..000000000
--- a/dev-python/fritzhome/fritzhome-1.0.5.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit distutils-r1
-
-DESCRIPTION="Query information from your FRITZ!Box (mostly energy)"
-HOMEPAGE="https://github.com/DerMitch/fritzbox-smarthome https://pypi.org/project/fritzhome/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=">=dev-python/requests-2.12.0[${PYTHON_USEDEP}]
-	>=dev-python/click-6.0.0[${PYTHON_USEDEP}]"
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/fritzhome/metadata.xml b/dev-python/fritzhome/metadata.xml
deleted file mode 100644
index 6e80d74d2..000000000
--- a/dev-python/fritzhome/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>b@edevau.net</email>
-    <name>Andreas Billmeier</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="pypi">fritzhome</remote-id>
-    <maintainer status="unknown">
-      <email>michael@dermitch.de</email>
-      <name>Michael Mayr</name>
-    </maintainer>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/future/Manifest b/dev-python/future/Manifest
index 32d3ac32a..d9f4673dc 100644
--- a/dev-python/future/Manifest
+++ b/dev-python/future/Manifest
@@ -1,4 +1,3 @@
 DIST future-0.17.1.tar.gz 829119 BLAKE2B 95210b5128d25d6c189cd38bced873f096802690e8fab5f4591c08fa913c41dc255e24af1931cad91d872a286f690f47bf6e0aa365e2f6508b03b0d305779c26 SHA512 50094c44db81afbfd37ee25e1710ed11ecb2c2d64ad076fb62a2688dd36a9696ab26b0d7989bf1ecb10da251961a0ee6bb37c4dbd115f70384cd8c9a675d0b2d
-EBUILD future-0.17.1-r1.ebuild 544 BLAKE2B 80f5df12e836d424a0bf33051b666932ec41d74fd023229a723a1e5a767b2588b8d5bf34965925959cdb3fc7bdf1f3277d032966861956a55bf3aef3f7894c0e SHA512 c3bc8bfcc44f4ab62578ea23f72ac77c725d71b516e632d00543732e6557dd89647e2e91493929ed0e07c8bf3088e654aff7c619b4750df40a311b8bbe5aa048
-EBUILD future-0.17.1.ebuild 547 BLAKE2B c72dd65f50db1ca50b1adeb290f539bbce1a0e4f3a3f367e00b3ee7c53ecdd5468fb46d9f7987bce9cae16ec173fef5cb0a9dd31d9b1ae9af12f226cc9305202 SHA512 8fb5ed95537943a48bdd9c2d4ae3a09b6b6c6907e6018cbe4df44416a1d2e631ed7af8b0346ebc8625ed15fa756f8e11f9c0fb23d9b89348217a2c4ccf31939b
+EBUILD future-0.17.1-r1.ebuild 543 BLAKE2B 1edb7757529558bdaba4ff44d0b264312767248f16b9fcd34292874bef181c61cf821170f3a586632310dd679856a4bf0c005f4b5f1e46f1a997ce59821639eb SHA512 f6a8b5c76e1028c4004139c2bf21c4e5b542743aa0967f9ed7fb298848304cc6744c4cbf6c837a92a20f27f4f76a0ef48bd6a9f516d76e2bd7a07cc401158be8
 MISC metadata.xml 252 BLAKE2B 507e0ddc9d50b879ff374b903b142f85d020dfd6c486aba2af84fe082c878e780edbb79188ae10104d57db0eb775c86814cc8c06891a3854c9da840a4d377050 SHA512 9470ac9c8a5a4f80e3f767e7aa198addc7b21866c63b2a310e9f41ce65817672fb77423117bdd619e99cb62322025aeadf50717e23eafabf99080fcc106820af
diff --git a/dev-python/future/future-0.17.1-r1.ebuild b/dev-python/future/future-0.17.1-r1.ebuild
index 6895edc17..b70dbdd6e 100644
--- a/dev-python/future/future-0.17.1-r1.ebuild
+++ b/dev-python/future/future-0.17.1-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{8..9} )
 inherit distutils-r1
 
 DESCRIPTION="Easy, clean, reliable Python 2/3 compatibility"
diff --git a/dev-python/future/future-0.17.1.ebuild b/dev-python/future/future-0.17.1.ebuild
deleted file mode 100644
index aae436ee8..000000000
--- a/dev-python/future/future-0.17.1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
-
-inherit distutils-r1
-
-DESCRIPTION="Easy, clean, reliable Python 2/3 compatibility"
-HOMEPAGE="https://python-future.org/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-DEPEND="
-	test? (
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)
-"
-
-python_test() {
-	py.test -v || die "Tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/georss-generic-client/Manifest b/dev-python/georss-generic-client/Manifest
index 29194e712..91cccfac7 100644
--- a/dev-python/georss-generic-client/Manifest
+++ b/dev-python/georss-generic-client/Manifest
@@ -1,7 +1,3 @@
-DIST georss-generic-client-0.2.tar.gz 4926 BLAKE2B 2a0e59e0ec952932634b5395c34b5ace28b5fa482c6b6612f1144b4f4905766cde5ff74debbc0bf0003b8d386e34c26b84a419c61b5522ea4bf2d5d90a76eb8c SHA512 3a58ba5c3450506b1100b32eb96fda4e8a2b44971c82476066f8b4ae317f2a66728bb56025c2d79c9fff9733ae173adce5950a5cf6e05c9583f074c9a65c9027
-DIST georss-generic-client-0.3.tar.gz 4931 BLAKE2B 287b3ef93e6ac2b11e316471d6c4b83f5187fd802bee3284251cb06dd543130e138f496d1873fd1031483271601fba72072f6967d9aa46b9c02123b21c237ecc SHA512 36d5806ea19d1aa7742575a55ce30d8ef543694dfe4cceede2bdb822794568a5fb9f1ff2abd3808c11fc872a4276ddbedd2d7443100d6580d865d3d68284a44b
 DIST georss-generic-client-0.4.tar.gz 3283 BLAKE2B 5477b4c3bff1caa8041bfc4f3141b5793cfc6ae0a714a1a79f6fb1a6df2a2993031a208108e567c316c97def045323e85ed6eefe93561d47a4a699d055241836 SHA512 691f211c42f921b9bb0b1c03e933de12d1bdd81d15f2ac3f2766847bc713dfe53f64b45607bb7db3a9c74bf316210af66b5a44e2ff620eca4aa00d1018da9281
-EBUILD georss-generic-client-0.2.ebuild 972 BLAKE2B 0a35482c9ee62f863f779923ef3dae3d81d1394f590439f297a9280ccc705b353770cd3b4769fd026ed329d260536cefb54032ae0a0b399e2e432320f2ebcb97 SHA512 cbe5db812f3b1a12ec4259e2e7cc9eb0390ba873faf97acb93495c6eb2c659dfb037191fb428fa95e14f9bb3f29120881b7680fb06c054220f05bea390fe249c
-EBUILD georss-generic-client-0.3.ebuild 982 BLAKE2B eb91a9413a053531d7b0c79fc91bb8bba27eb6a89d03292493af02d7f02058a6cddff5f676a1f457522a3c139da95687d72f0d2f9e1496abb48eb3186bd5e5e9 SHA512 b35836e4686e92cd02e8717add9121c94875bedc34d37c0ed77089157a5a593c1cca0672f006ad437cb004770c77ca0fcee4da32e08f09104c1fee5bf81e7536
-EBUILD georss-generic-client-0.4.ebuild 847 BLAKE2B 66c628d6449c8a980056d06dc37e55790d039f7f8f55323ef748c4dc7a184ae69d6b438c6c6029399a2b4b8c486904e516e2bc75b9bcde42fe1828487c659c3d SHA512 11899b0d43b1af3cf7aa0bdb29817de8a8d7a95e14c945e8a3a6c9f1545bc8c276927e8ff20b2b7ec20be511634d06a5b06d9bba67f3adfa56a82c03d1a8568e
+EBUILD georss-generic-client-0.4.ebuild 847 BLAKE2B 8d0f57eea739e3b6811085acf50aa95b5aede1dc0d8c69e2d55402393b46fa17e4d3c93a5a8f7a40ade02a0103cf50c50869b6e16778d31a344d50d56d767cc1 SHA512 88042246afc62cb2f490ed5fc7cf452c21acc375d574ded2524fd71850f93f19455a852f8d573160b26dc8801e0ba51acef1f8213c0934beb982e8fa4d8d6217
 MISC metadata.xml 465 BLAKE2B 410ec05fd10b1bf9091b7e858d65750e2fa73cdb82419233805ca0706eedb8aeca3b3800860f1840ddff71fd087a69978891f9e575a1e094d2c2f7c3c42c3172 SHA512 81ee64b2141fc997d20bc1ba176aabbf44a5d1f5a3244dd2fb3bd14d8c5fe2f1c8ffce83ee5b7afd6be9a93753e48b6b7b10505a11573d5d2ffd4f4641fade74
diff --git a/dev-python/georss-generic-client/georss-generic-client-0.2.ebuild b/dev-python/georss-generic-client/georss-generic-client-0.2.ebuild
deleted file mode 100644
index b46cf1a98..000000000
--- a/dev-python/georss-generic-client/georss-generic-client-0.2.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit distutils-r1
-
-MY_PN=${PN//-/_}
-DESCRIPTION="A GeoRSS generic client library."
-HOMEPAGE="https://github.com/exxamalte/python-georss-generic-client https://pypi.org/project/georss-generic-client/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=">=dev-python/georss-client-0.9[${PYTHON_USEDEP}]"
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-src_prepare() {
-	sed -i "s/packages=find_packages()/packages=find_packages(exclude=['tests','tests.*'])/g" -i setup.py || die
-	eapply_user
-}
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/georss-generic-client/georss-generic-client-0.3.ebuild b/dev-python/georss-generic-client/georss-generic-client-0.3.ebuild
deleted file mode 100644
index 693e4810a..000000000
--- a/dev-python/georss-generic-client/georss-generic-client-0.3.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit distutils-r1
-
-MY_PN=${PN//-/_}
-DESCRIPTION="A GeoRSS generic client library."
-HOMEPAGE="https://github.com/exxamalte/python-georss-generic-client https://pypi.org/project/georss-generic-client/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=">=dev-python/georss-client-0.10[${PYTHON_USEDEP}]"
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-src_prepare() {
-	sed -i "s/packages=find_packages()/packages=find_packages(exclude=['tests','tests.*'])/g" -i setup.py || die
-	eapply_user
-}
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/georss-generic-client/georss-generic-client-0.4.ebuild b/dev-python/georss-generic-client/georss-generic-client-0.4.ebuild
index 1a74061a7..b6b714c5c 100644
--- a/dev-python/georss-generic-client/georss-generic-client-0.4.ebuild
+++ b/dev-python/georss-generic-client/georss-generic-client-0.4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{6..8} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/googlemaps/Manifest b/dev-python/googlemaps/Manifest
index 24b5d5850..866e3aee9 100644
--- a/dev-python/googlemaps/Manifest
+++ b/dev-python/googlemaps/Manifest
@@ -1,5 +1,5 @@
 DIST googlemaps-2.5.1.tar.gz 26434 BLAKE2B 1d46c1613e589254b08fb63f2e2e028aa0475ef74471d39c57fdcb3e2f998c31a8ea4d0efce27aafd9f95d9fb3271e7b8cf3da7c98d46982641268c11e9a561c SHA512 7580af07fcf6f08447a7a40f84cf2350ec0c07ea80e60154ea827b3d6848afd11e913d0f87cdc5c39ef586be5235986d4ead77ed77f3a45a3c4f0736902277f6
 DIST googlemaps-3.0.2.tar.gz 24705 BLAKE2B 3cd94e71e1f045755bdb6d5dbae29669d31ee83247192ddab9abe1ba085b4a94c9c34a50d8dd3d059fd48b9b1d1f115d7ceff3317d4828ebe0b7ed56e31dc1d4 SHA512 71ef70b1499243d7f1087b99919e687b831b3410235a8d9237c6defbb648632aba6353dbea059f0621cbc73a56374ac79aa4996c1ccdad99b0899d199d2731cb
-EBUILD googlemaps-2.5.1.ebuild 722 BLAKE2B b001be76ebd92869888f916d7ca551c1960613dfd58b1f0f03918d95c95662893d6944256df327c2b639f412e1148660e6ed9c906a30fc68ffbc44053e475ad7 SHA512 dfe9224a1fd5f0fd84586962ec02fed21622a19d45ce06578213e0f875091d6bdb4a39419b41cb8e47bb04587f7c08d2597d0e51aa5fb2ada6a5096c82bc6307
-EBUILD googlemaps-3.0.2.ebuild 729 BLAKE2B 20a39fd6356300fa5a6556c39c079a479126f63ce2cdce7083ae3b54e5aa64407ca91337d963cf41b199942d7977f2bf26612ec696c6eb758fc8e08b05b3807e SHA512 d31602816332354dd96f82363cb214734e3f91d0887c1654e3d199a0ea7d3c693409dc068c8c4bca5bfbc4f05bb7e72c697053e93f18df4ad4bb0a3ecd98d5c7
+EBUILD googlemaps-2.5.1.ebuild 721 BLAKE2B a09ee0956a6e183c708477007239cc79c8f2e5c8bbc7d7ff0b82fa389ffb8f301b1217dcbe473db6ed83e1304efb17bc09b6c07c6f42dd85413185f213b54d59 SHA512 f932aa7b05a5299aa3962464c10cde2cdf4dee92d8db7def71983f056293937e85e97a2a804165474d4a638723432b69c166c58fdea07aa5cee9868eee3e344f
+EBUILD googlemaps-3.0.2.ebuild 728 BLAKE2B 3ef7644d423079a38ef905e37e0270a7aac95b47b323342ed410bef8bf40d426e34baefc7818d02813a4e8182614f68fe5ea0c562d422af3db09878bffb020dc SHA512 bc0a6f1462d6b9a0a2a0859a124e0f7e2c1dc48beba3629dd444862cf699608436bb0fcaf7c1a80870954205cc150cf36dc4f15ff46b8e22e87963b03b2d2fdf
 MISC metadata.xml 329 BLAKE2B 8bac3569bdc02173a8c3ba6019fbab98bd1cf9aef3530d6442804346379dbeb8594954d9a59e4eb038236b9f918530471c6dbfd41ebf9ba953c80dab654eafc1 SHA512 6c047b76a228d9d1eb99c5d39b1e6c362e715e8b9c96edbb8814db6a6dcf5bd1b1f73e31a24c8e69c5fef8297a1c5fb849688704192ca0c4229165eb79b1ac86
diff --git a/dev-python/googlemaps/googlemaps-2.5.1.ebuild b/dev-python/googlemaps/googlemaps-2.5.1.ebuild
index 3cb264704..84ceea258 100644
--- a/dev-python/googlemaps/googlemaps-2.5.1.ebuild
+++ b/dev-python/googlemaps/googlemaps-2.5.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/googlemaps/googlemaps-3.0.2.ebuild b/dev-python/googlemaps/googlemaps-3.0.2.ebuild
index 667d0c721..0bf94e0f9 100644
--- a/dev-python/googlemaps/googlemaps-3.0.2.ebuild
+++ b/dev-python/googlemaps/googlemaps-3.0.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/gpiozero/Manifest b/dev-python/gpiozero/Manifest
index 0e656485c..e1d05623e 100644
--- a/dev-python/gpiozero/Manifest
+++ b/dev-python/gpiozero/Manifest
@@ -1,7 +1,5 @@
-DIST gpiozero-1.4.1.tar.gz 106880 BLAKE2B 2ceb9abd99b5ff1fcf404b401164976f1b2ab79861cf974aee6f103c6be65f582f79d66f1750005017a2688bac87acb2368b910f2dc11f081e67af787e1ed651 SHA512 7e9a7029489df57eb8c0145532e6305e7f01598219e6f42f34c58889736a70f62370837cc2a8d85e3f27c2eb0efb08917abe54810dfc52257fc06ec0c95cab21
 DIST gpiozero-1.5.0.tar.gz 138730 BLAKE2B 285d227853f1d507ee920a4336f2521a9ecc55ddae1c69f944708c0dbfc99f23c97a0e695828a8be1f43c82869bcab487e08c3eba0071825737a26f632a6ab56 SHA512 f636bf607ad689ba38277639edc2a69b631aaa1fdf413002918b644e649c042cc23dffd9880aff630be0dfa37cfaf63d79cb10867e84eef3b2603f5a513bd593
 DIST gpiozero-1.5.1.tar.gz 142637 BLAKE2B f5e254e3dbe84323f9432c62acbc89c90356fa2b481a20e542fa0d38d0f14b1a2a28b4848ce91f8d572301051685fe47edb111950ba14a5adf2ab093cf5f203c SHA512 d687693f134ab4248c7a3fffe56e36cd2d6968a76de873394708b535783e263cbd5527d03f9ccb28b5ffc2ceb0f1c297f061814734b5888f9fd1e0610aa5a043
-EBUILD gpiozero-1.4.1.ebuild 700 BLAKE2B 565aeefb408ab728c45409947a6009a2ab6956369051b086780912d7fbda69dbc55eb13d743a401bcdbec53b36d43ffe4473fc11504c9d7e920392458f78c64f SHA512 7246d121570df1dd6e9d655e18a46a8be3a377ebc3bc2c4099f6065f8c2be7cbaf834058e8abaefdffdda921e7ab813c100675ddf863bfe2470e4c9c04c7d78a
-EBUILD gpiozero-1.5.0-r1.ebuild 744 BLAKE2B ca664b8dd4835225f8663586382bdebe65de78df431f6bc2fe145fc8b5acecfb0a4d47c7a32a6c34adc63ca67e0513aabc87288bc60b407aca5c1ed710bf0057 SHA512 59953dec7fea4e9201f541b3534ee2c275683c5794de71e8b12b1debd7280e7c7e55d257e2756590dd131c4ae2ca31afb01d3a3874dd41b4f2d95182a0191d66
-EBUILD gpiozero-1.5.1-r1.ebuild 743 BLAKE2B a4c52b97535ef822e5dd59ad40111ea05de317d6a09097757da445a2135d530a7a5a7e46466c4c6cec1262df5f309af8b48f048fd956e33f2576214fe805c139 SHA512 02fd6922f55be6a731056116d7679b2db32a69601353e02adbb8b3d9d06e470857d18f7cf1ceccafefef71c283c5f29974400c74f7ca6ab0ca7213db06729a9e
+EBUILD gpiozero-1.5.0-r1.ebuild 744 BLAKE2B 5cbfc42b151d5ebc068dce50d5b15607948b084d723f6e70a613a8a1f0665f00995006be194bd0594df947ae193c69e433b31279f690322a2cc2d578693a435c SHA512 f98266f658f54fdb3d600ff8ed841bc4818057bbcb2afac42b4c60f4b93a91350e237c1c2815a60ac092abea90e3065a46a277ce96caba7fcb965aa173f46b51
+EBUILD gpiozero-1.5.1-r1.ebuild 743 BLAKE2B 6d55198bb3fff11ac69fe6dc06684bf35a77e28a4b2f2e2095c1698c6cef2486803a30b1ad97c2c340a07bac8c52ed936e87884c3b67767ed92c6666959c5c86 SHA512 fb0c6c097697e966e5148dd40f7fd050bfaeb33be1acf4d1a5dbe67cbd4982ca5f91fb8ef1cab29e9c439aebabcbebaae508ed5816316f694d9592ebeec872fc
 MISC metadata.xml 451 BLAKE2B 293e357b27a77d42d4f780f97792463dd74856f8098b9193957602a56cde12d6877d2d767a35b81406f24a6a9522865910978b03575c4d1dac7c4e4b77d5c199 SHA512 36d780867ac64dad6b48620adc0fb729ce0b4e91c956a52aa5c73911e66e57b77f79455878823324f47b977c1327a6f20589376f5e91f15f66f2ca7dad6c14a9
diff --git a/dev-python/gpiozero/gpiozero-1.4.1.ebuild b/dev-python/gpiozero/gpiozero-1.4.1.ebuild
deleted file mode 100644
index aaad5a828..000000000
--- a/dev-python/gpiozero/gpiozero-1.4.1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{5,6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="A simple interface to GPIO devices with Raspberry Pi."
-HOMEPAGE="https://github.com/RPi-Distro/python-gpiozero https://pypi.org/project/gpiozero/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/gpiozero/gpiozero-1.5.0-r1.ebuild b/dev-python/gpiozero/gpiozero-1.5.0-r1.ebuild
index b1ee31134..e5e745ad5 100644
--- a/dev-python/gpiozero/gpiozero-1.5.0-r1.ebuild
+++ b/dev-python/gpiozero/gpiozero-1.5.0-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{6..8} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/gpiozero/gpiozero-1.5.1-r1.ebuild b/dev-python/gpiozero/gpiozero-1.5.1-r1.ebuild
index c88a642b1..8446022f9 100644
--- a/dev-python/gpiozero/gpiozero-1.5.1-r1.ebuild
+++ b/dev-python/gpiozero/gpiozero-1.5.1-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{6..8} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/ha-ffmpeg/Manifest b/dev-python/ha-ffmpeg/Manifest
index e47ef6dc3..9445c0602 100644
--- a/dev-python/ha-ffmpeg/Manifest
+++ b/dev-python/ha-ffmpeg/Manifest
@@ -1,9 +1,5 @@
-DIST ha-ffmpeg-1.11.tar.gz 6323 BLAKE2B 95f40aacc9c554349db9df6fed9b09018d21671ff6531e3c65a59143f8a6583fd3e17bb6788970123af78951b2fdc301e74d99492099e266ab67b9b0ac0d863e SHA512 a5e8d62a10cdd90c60a00cb56e3eada85da1ee4f783a210de27d9f324b9feb1d08ee5eff18a237121e359c1ae20eab64d7b40b24f684505960e850a919d79070
-DIST ha-ffmpeg-1.9.tar.gz 6362 BLAKE2B 202073fbe02f5d6a31f9773c6abfe03c44752182e40a0b330c7191514b7c461f6ba7e19ed3f1da6b8092e2f4ce55e86219ee171b3e2e4367938a81354682917e SHA512 70e30a46a74180a82354e6ea9003cd866424bf8de07ed62fca9390014722d78b0a8bdab13e0e3f64cf4139643b8471d4c28b343796e4a08b5eee107dfeb3c5a3
 DIST ha-ffmpeg-2.0.tar.gz 6999 BLAKE2B d77bb13106289ef0a5e27be147843775d26b2b8863aee8fac8fcaaf4b9e649df6b9a1e4ff544117daed9e4127cd6c958a17a81e0b65c1f08888c2918f523d1d9 SHA512 55702e4256f376ceeeb4f4e0adc49b11e2f76cfdea441bc35787692671efb1d5106f7ec22c202c7ff22cdc48b05eab6251becc61c8ef64691df17af32bafbf29
 DIST ha-ffmpeg-3.0.2.tar.gz 7547 BLAKE2B ea413c1ccdddd69f35b60a31f7c14be500fd1d796c3c9d1fca1db0e2fc3bd35bcff03ffada41f2807a53404852343bd22af5a9fe960cb714a6e4d91667613517 SHA512 113cd0bfbe147c6ac3f8b31b4fd493aa645de0316215f879aceadd7fb7a8eb0af774e59cf4135badb44e4c4e11a9e207a7925445558016a2d90bfe7752f7d991
-EBUILD ha-ffmpeg-1.11.ebuild 691 BLAKE2B 17d3e97a3c92d073f66666c877a1ca34d6aa2110e81e8c7819c8d34a62d5d47e531f289749e12f97c9136332f1b844b4000cad26aada199cd98285cccb86ce74 SHA512 374e933680f89ce471bcd43412dc38ba28c8492c2919abee8eb6775846229e9007ff2fda2b77da90c15929a583a696a611d5073a287f36f42095ea16099e9d8d
-EBUILD ha-ffmpeg-1.9.ebuild 691 BLAKE2B 17d3e97a3c92d073f66666c877a1ca34d6aa2110e81e8c7819c8d34a62d5d47e531f289749e12f97c9136332f1b844b4000cad26aada199cd98285cccb86ce74 SHA512 374e933680f89ce471bcd43412dc38ba28c8492c2919abee8eb6775846229e9007ff2fda2b77da90c15929a583a696a611d5073a287f36f42095ea16099e9d8d
-EBUILD ha-ffmpeg-2.0.ebuild 698 BLAKE2B d0c191e66062849123644726a89fbfc17ee874385a16f36997ae08cd930214010e4304fc892e6217ff2505de91cf414797988afe6d1c3f0a193df8a83acfaf62 SHA512 c21215b9e86c2c41c343e62e93b3ba9a6e4b11cd4849c933bd5ee27847cdfc7ed8ccc8dd87df3c7d7bfcde28f91eaf0bdaae45e28646439aae9017cabd15c543
-EBUILD ha-ffmpeg-3.0.2.ebuild 760 BLAKE2B 82197451fc7f863fb5c994c943d25760d1de28017bbb9a23398a45e6b5610103fa19c7a2ece8267490510b35aadaf4ada4798ec8e4399151a1a44df58e268529 SHA512 5dd740b2a1183fa5d0d706a791e46fed7234b0dcc5a3baade6254a3776bc5999761c94225df0fbf07fa0cda33be0fc9655ecac594b685f7298266ebe48618ada
+EBUILD ha-ffmpeg-2.0.ebuild 697 BLAKE2B 7ff976547449623a9e80039b09b49dbf36d1d7df2b0b7fe25bf301f0e68bdd1f25b5cc58bd91707cd8a261da2627c99a4c8285139c8f2a2acb338988b6d401dc SHA512 94fb98ff27183d1a7781c739885ae637029309590b79d156ee1d316784cb018eb7a3496f87bf7f0a2a17177edc5e268428c757cbffa15ba5fa004abe36fb180b
+EBUILD ha-ffmpeg-3.0.2.ebuild 760 BLAKE2B 14b81a5cc129d89c6f36dd65d01d4715779d5affbb18889f02c19828af8b21cada880db82307af31e3f24f252f4d08c84adb0097c4ef78ce4f76e7b5316ecdfc SHA512 99580fdd51d93e47a7b54f084ee8ed560db17ce4154d71d8f7492120efaf887cfbaa60015dd1423b161c87f1048a9c615804f0d9d88335a0087caccdce37d183
 MISC metadata.xml 453 BLAKE2B 78a707c1de5e3ad457c200dbefcb93603442655c17f2f0b84612c41774bee79f12ab160e7254093ed08e5f5e6fa594573ec72284121dde31a60f4db7eb6d6285 SHA512 203019f15069deb0f82d7c778a620204b652c6678413417d1c4c60c24069f120787c00c8541c014d817436c0d2f7a9097b842aa4e9ae455441330f64416aeb8a
diff --git a/dev-python/ha-ffmpeg/ha-ffmpeg-1.11.ebuild b/dev-python/ha-ffmpeg/ha-ffmpeg-1.11.ebuild
deleted file mode 100644
index 3ea0ac451..000000000
--- a/dev-python/ha-ffmpeg/ha-ffmpeg-1.11.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{5,6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="A library that handling with ffmpeg for home-assistant"
-HOMEPAGE="https://github.com/pvizeli/ha-ffmpeg https://pypi.org/project/ha-ffmpeg/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/ha-ffmpeg/ha-ffmpeg-1.9.ebuild b/dev-python/ha-ffmpeg/ha-ffmpeg-1.9.ebuild
deleted file mode 100644
index 3ea0ac451..000000000
--- a/dev-python/ha-ffmpeg/ha-ffmpeg-1.9.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{5,6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="A library that handling with ffmpeg for home-assistant"
-HOMEPAGE="https://github.com/pvizeli/ha-ffmpeg https://pypi.org/project/ha-ffmpeg/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/ha-ffmpeg/ha-ffmpeg-2.0.ebuild b/dev-python/ha-ffmpeg/ha-ffmpeg-2.0.ebuild
index f72642d06..bb90bb841 100644
--- a/dev-python/ha-ffmpeg/ha-ffmpeg-2.0.ebuild
+++ b/dev-python/ha-ffmpeg/ha-ffmpeg-2.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/ha-ffmpeg/ha-ffmpeg-3.0.2.ebuild b/dev-python/ha-ffmpeg/ha-ffmpeg-3.0.2.ebuild
index e58d20c80..69ba36c14 100644
--- a/dev-python/ha-ffmpeg/ha-ffmpeg-3.0.2.ebuild
+++ b/dev-python/ha-ffmpeg/ha-ffmpeg-3.0.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{6..9} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/haanna/Manifest b/dev-python/haanna/Manifest
index af88b1706..c84a3e241 100644
--- a/dev-python/haanna/Manifest
+++ b/dev-python/haanna/Manifest
@@ -1,13 +1,5 @@
-DIST haanna-0.10.1.tar.gz 5274 BLAKE2B 9d3479c077cf8f1b15a1f1517e9cd83178ab0b2a3fa38f76bfb9c2316551e61f78f6f991bc14618d35002c36a68690e7ba1edb3383a6991fd05b63874db7b7eb SHA512 241225c4c2ac51261d2a082986c013989cc0c7a783328cb03b6674601afa1f4f550bfe11433dd8a590c29542b6527e54cc0dea8b5fbe86797767503093143deb
-DIST haanna-0.12.3.tar.gz 6179 BLAKE2B 0b8ecf0063cc5a05ede7e6c2a40123cca2b04203c7e268c13dc6de62342651aebda08d05e98096bee01f78a74015df254533d2de9a22463eafa4ee67232c88cb SHA512 7e1b6439ff7af1422b09bb5585992c1db0e98173c084007d1077f831aee3fa3746473f30c96b613c1449dd3c0c3087c3303c1b9dc26eabd1b6c2e81e42fe2368
-DIST haanna-0.13.5.tar.gz 6162 BLAKE2B 1ea0292b4fead7cfb702ca930dca0f575a533568d5771379d4b06a26b48a24c54d97ec88e9e203e5a5c1de5916e7ef8959ac247bbfaa704f4ac041c054e8df66 SHA512 21ba315da42d846464e36ac925dbb8229ab4430824a47cc3b4aa562dc34f84a2c86b8ffb6a3dfa693f2ee1d17d04860d25761164b4df3189557ddd68aeb90be9
-DIST haanna-0.14.1.tar.gz 6190 BLAKE2B b72056392fed7cf499afd1bb126a3a67f3126796635cfc2f668ccceea3fd8e86cff3177da5f88bb101b14e7db795c0b3ce2c29f2f3ef34ce9503a7998e8d7f35 SHA512 bdd20822a6900b631190f6da2a128cc9e4c757d1bf0dffb0b9a2435d237bb4d90be462a0a55c9a93a161120876a6de1eb71ab7d0b3d254e1b3145f514e520884
 DIST haanna-0.14.3.tar.gz 6162 BLAKE2B d675fc46a66ec7a7b764de48f0a4688a67ed9d7222933c56b2c1d96ed090428eb883b2f449d6367c1eab2cfe9aa16feb9f669a13499fc0b2a19d5366df2f6c46 SHA512 20fdad52d443d335e2ba019f36e950cd863a8079fc1b0b5d209b680a3f11b5394324cb1632316e600c89cd1d5995ba7b4575195fdbdee4312dd29de593cf5f32
 DIST haanna-0.15.0.tar.gz 6346 BLAKE2B c9c948c8dacbf6da6a85875468467237465fceccbb41de956257f790ae3b2136c9e7a39600559644c5900ecf1927585c874c6dc77cbf991cd544464a932b14d8 SHA512 c23ceefe5af1ddd97f404da6a8be9e85d0d6b8bb9343018c783d5bf14daf7eed65ffff6a63ce6b127121dc5d71b59668db3ec349cfcc37651f844855c187f247
-EBUILD haanna-0.10.1.ebuild 770 BLAKE2B 9b105c1b83e3c2a278a75b90ebc813f216d42778979027ae460fa04c3917984ec732a2715f0f752670460542551c0e78373d25663b9c232102c25194f7289810 SHA512 20a5e89d5426fe66a9f88175e36487d0367de4c4220db199001a5af68d054cbbe2d063ca657fd31d20ad4397bfd30a7e04a7a972244b6dc17f31b82a2128e931
-EBUILD haanna-0.12.3.ebuild 768 BLAKE2B 1dcfec6d40e463b80156b06c23598bf977751541b27399469a07101f2b101abe4b3c092b32318c40e7b7b3cdcce605bfdf386552852f972ed82b8916715cd268 SHA512 4518db35fa0f4c29a2d6327cd4328e892f3e450f3f3e2e98cbe5db4d73668698a8db1246ae19ef7dcce32477b42413bb5e2aec370d44bffe3acef01877993b4b
-EBUILD haanna-0.13.5.ebuild 768 BLAKE2B 1dcfec6d40e463b80156b06c23598bf977751541b27399469a07101f2b101abe4b3c092b32318c40e7b7b3cdcce605bfdf386552852f972ed82b8916715cd268 SHA512 4518db35fa0f4c29a2d6327cd4328e892f3e450f3f3e2e98cbe5db4d73668698a8db1246ae19ef7dcce32477b42413bb5e2aec370d44bffe3acef01877993b4b
-EBUILD haanna-0.14.1.ebuild 777 BLAKE2B 2b206fe46ce84f55202a596d04c40a0c5180f59d1ae225fa6c4fd36ecabb040fe8d58aa3603fe96ffe21df54f43c33f7a8be1cf55e7784ce8be72c33bb781d7d SHA512 c597145e44731b4f12def2a14e142907a8e57f0611eeef10ea26d247c39f10e748f3522e8bb328e556e3c2ec27e0ad03b3ee4bd6f09e5930e61ecbe0a2bd564a
-EBUILD haanna-0.14.3.ebuild 777 BLAKE2B 2b206fe46ce84f55202a596d04c40a0c5180f59d1ae225fa6c4fd36ecabb040fe8d58aa3603fe96ffe21df54f43c33f7a8be1cf55e7784ce8be72c33bb781d7d SHA512 c597145e44731b4f12def2a14e142907a8e57f0611eeef10ea26d247c39f10e748f3522e8bb328e556e3c2ec27e0ad03b3ee4bd6f09e5930e61ecbe0a2bd564a
-EBUILD haanna-0.15.0.ebuild 777 BLAKE2B 2b206fe46ce84f55202a596d04c40a0c5180f59d1ae225fa6c4fd36ecabb040fe8d58aa3603fe96ffe21df54f43c33f7a8be1cf55e7784ce8be72c33bb781d7d SHA512 c597145e44731b4f12def2a14e142907a8e57f0611eeef10ea26d247c39f10e748f3522e8bb328e556e3c2ec27e0ad03b3ee4bd6f09e5930e61ecbe0a2bd564a
+EBUILD haanna-0.14.3.ebuild 776 BLAKE2B 722e059a4f3ac0b7fd4ba6290fef0db7586a578dfff73fd3b165b55e3f64edd15bd336772171f833ea46a5363cf46d90eb1aecf1e8e8c85a7b158552d7af6695 SHA512 4da1a5fe1b30567a5aecb3eb412893b58a8fa128b3dc2f2c54dbb6bd814b8431651344205cbb895d92042d522bb9fc11be41277378b3a697cca2635c444d7fb5
+EBUILD haanna-0.15.0.ebuild 776 BLAKE2B 722e059a4f3ac0b7fd4ba6290fef0db7586a578dfff73fd3b165b55e3f64edd15bd336772171f833ea46a5363cf46d90eb1aecf1e8e8c85a7b158552d7af6695 SHA512 4da1a5fe1b30567a5aecb3eb412893b58a8fa128b3dc2f2c54dbb6bd814b8431651344205cbb895d92042d522bb9fc11be41277378b3a697cca2635c444d7fb5
 MISC metadata.xml 447 BLAKE2B a0b9d611f789f4f6698859b885182c3ebf1a3cf276e4d17a81c1617a8dfe00c258ff6a0fafcb002192c0ae67f83ca16abf861c1c3a50b8b762c3eac78b4083ca SHA512 ce91b197f2316ac5a85d46556f9a0be4efc02e6110ebbecad47b4ce1f664655aa6509a94a1d53db3c099453cadbaeaab1ff0449dafd9cd3090612483c19c4cb0
diff --git a/dev-python/haanna/haanna-0.10.1.ebuild b/dev-python/haanna/haanna-0.10.1.ebuild
deleted file mode 100644
index 72982b018..000000000
--- a/dev-python/haanna/haanna-0.10.1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{5,6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Plugwise Anna API to use in conjunction with Home Assistant."
-HOMEPAGE="https://github.com/laetificat/haanna https://pypi.org/project/haanna/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND="dev-python/requests[${PYTHON_USEDEP}]
-		 dev-python/pytz[${PYTHON_USEDEP}]"
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/haanna/haanna-0.12.3.ebuild b/dev-python/haanna/haanna-0.12.3.ebuild
deleted file mode 100644
index a3220a29c..000000000
--- a/dev-python/haanna/haanna-0.12.3.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Plugwise Anna API to use in conjunction with Home Assistant."
-HOMEPAGE="https://github.com/laetificat/haanna https://pypi.org/project/haanna/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND="dev-python/requests[${PYTHON_USEDEP}]
-		 dev-python/pytz[${PYTHON_USEDEP}]"
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/haanna/haanna-0.13.5.ebuild b/dev-python/haanna/haanna-0.13.5.ebuild
deleted file mode 100644
index a3220a29c..000000000
--- a/dev-python/haanna/haanna-0.13.5.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Plugwise Anna API to use in conjunction with Home Assistant."
-HOMEPAGE="https://github.com/laetificat/haanna https://pypi.org/project/haanna/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND="dev-python/requests[${PYTHON_USEDEP}]
-		 dev-python/pytz[${PYTHON_USEDEP}]"
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/haanna/haanna-0.14.1.ebuild b/dev-python/haanna/haanna-0.14.1.ebuild
deleted file mode 100644
index bda93fa8d..000000000
--- a/dev-python/haanna/haanna-0.14.1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit distutils-r1
-
-DESCRIPTION="Plugwise Anna API to use in conjunction with Home Assistant."
-HOMEPAGE="https://github.com/laetificat/haanna https://pypi.org/project/haanna/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND="dev-python/requests[${PYTHON_USEDEP}]
-		 dev-python/pytz[${PYTHON_USEDEP}]"
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/haanna/haanna-0.14.3.ebuild b/dev-python/haanna/haanna-0.14.3.ebuild
index bda93fa8d..bf21c0cac 100644
--- a/dev-python/haanna/haanna-0.14.3.ebuild
+++ b/dev-python/haanna/haanna-0.14.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/haanna/haanna-0.15.0.ebuild b/dev-python/haanna/haanna-0.15.0.ebuild
index bda93fa8d..bf21c0cac 100644
--- a/dev-python/haanna/haanna-0.15.0.ebuild
+++ b/dev-python/haanna/haanna-0.15.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/habitipy/Manifest b/dev-python/habitipy/Manifest
index 6927a5d63..e3fe7fed0 100644
--- a/dev-python/habitipy/Manifest
+++ b/dev-python/habitipy/Manifest
@@ -1,5 +1,5 @@
 DIST habitipy-0.2.0.tar.gz 39442 BLAKE2B aeea7b833db0318b2e77ee9b11ca5bef633742bbdec2e3562cf8f82e6967f5807e11572869bd74c164e979aa8f1a01b4eb4c807cfbfa8ebb4418cd2471686283 SHA512 654fb971e5b649816c5378a3f7ee9a63c631afecb92e847ddfd3985ff637953b05087440c4518164092eec6ec55bc7bef69b2e60d810f51fbfe516e8d5763ec6
 DIST habitipy-0.3.0.tar.gz 39910 BLAKE2B 75d4b721a1eee68de5d96b4238d4a83bf76749a24cc8b44bbb3ae61d4076fe7d1c0c7381e5a5b237b58ee46f7bea875b060c02afac7d7a85fe1ec3484eeb791d SHA512 b179fceb5216955b9fff686cbeb77051ba2355ebd7e567f8235308fbfdb68cf01150648d8a1d41a7aef68a9860b95f7bf9a57d5278908a62ad3de416f6893a9a
-EBUILD habitipy-0.2.0.ebuild 820 BLAKE2B fcf7d995d0b31fcb71eb2d07d55454b8836a20ad3987c591ac3487ec022af8c2f56936704c3f0d27f85a1b61afd1e36ac504305b706bfff318b6393af7663617 SHA512 f3b9aa54c20c58991e79b3ab2cd56abc31e11a8a6a7e1f8b36cc494c91f41db907bc51b17bb3e0ebeb2c1d055cb22727208fa38d0df17225649f9be63f8fa2f8
-EBUILD habitipy-0.3.0.ebuild 827 BLAKE2B 8e34797beb6783ccc74379954569b50af83813a54607c3aec6888c6dbabea62fb358fd89f79fc7ea02e704df71de71485509caef2db9c22176dad9734f3dcacb SHA512 66fcb2cdf59978b169e2e86b26743e6cc280c958c5ae5b112e730927bc697ede2455a6486e75ca69a9f23e5422b541b82dd300060bb45d48b4dbfb5422611c96
+EBUILD habitipy-0.2.0.ebuild 819 BLAKE2B 79c1c6b1d7441bd225251ab2239074699e91c2d4f6dc2ccfeebc27fa9d0212e9c45f82dccdabe2b12c7b04862c23ec24a0e7657b1be8474633b3658af6a912df SHA512 78e73e3be7928e8b0c4431a9b0ec3ba0dd43e47dcb70572a4f5cb3b1e578fcbcb432e033527b4e38ffc84096e3fcc0d568e98b0ceff3794ddac5cd49188142aa
+EBUILD habitipy-0.3.0.ebuild 826 BLAKE2B dc8ac35a30143a4f4f635bad6ed9e5be93de0df25c04656b1363599987df3f31043450dc40138e452e245ddbce3847a7f5360b31c89049dbca2d81c47c99ed62 SHA512 950041ebe5e58ac35ce47a90d5306a9c973037a15780c2b7b8f050e26e8f77267383a6edd86b26c2a0982c999bfca1376b8f0fb6868596fae9db821fdd03d7e1
 MISC metadata.xml 455 BLAKE2B 0e2de4633bf669d11e2f2f53b13f889fdb3d0253b7dde05f702850444fc605efe7ea9ef53a450792330dcc6b2fdb308188479e64d06c19ea2edad1fd6043896c SHA512 fad692e2404b3cd7ea773ad033b3976bef00d2392808acf3a757235f3c100bcd6e091c184449a9f2828d2f880d9e633e36424d944e597b1332da621b0f54bc42
diff --git a/dev-python/habitipy/habitipy-0.2.0.ebuild b/dev-python/habitipy/habitipy-0.2.0.ebuild
index 60a38c295..756053981 100644
--- a/dev-python/habitipy/habitipy-0.2.0.ebuild
+++ b/dev-python/habitipy/habitipy-0.2.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/habitipy/habitipy-0.3.0.ebuild b/dev-python/habitipy/habitipy-0.3.0.ebuild
index 739a9169d..dec2228eb 100644
--- a/dev-python/habitipy/habitipy-0.3.0.ebuild
+++ b/dev-python/habitipy/habitipy-0.3.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/hangups/Manifest b/dev-python/hangups/Manifest
index d868b7f84..bc043647f 100644
--- a/dev-python/hangups/Manifest
+++ b/dev-python/hangups/Manifest
@@ -1,9 +1,5 @@
 DIST hangups-0.4.10.tar.gz 95401 BLAKE2B 12bca5b029fee39084350694aa3ddac2e9775e1434a55f097087d945e32365f9c1df40de1e2ceb1d4e9f902adf6e447d7b5be9fd13ee16b02e7779f29f6e2c9d SHA512 0fc9470e16130d5247673a8d434f64da73320f1b69a6f5d93f93c3031f76c5f9b8bbc71d7171b1660273b3b153e435a9ab13962354facb404d40fd8f85741d2a
 DIST hangups-0.4.11.tar.gz 97364 BLAKE2B 430ab3e5981eea14a7b373a7578c675d19d57add126a63aef4e1089b8a3df48651efcd34e08b207df43170a32b7c22a400bc661691e24efccf27d3ddca1f2411 SHA512 d9e3791f2b5a00f06dadb7c0d73f4f7d39e88402029bd53b704ebe7f0cfecebbac8a2f89484f6db4f2c20cbd7c753d10df0710a63f21a54c895d0f52990b0045
-DIST hangups-0.4.6.tar.gz 85954 BLAKE2B 91fc90afdab73f394d5aeef5601c4fcc575b3b2e9346487af2cc72f6fe5aa1470577d079a85ab30acee510ad10e1f1d27ea13452c5db7dde047d37c40291d135 SHA512 643f9a5073a06a4dc85c582e9dac7503d4da74a6b87f09357623ad298c8b097071cb59f89ed32d54e1235c14605d36768b5abbd069d879b19b405c281d033bc8
-DIST hangups-0.4.9.tar.gz 94847 BLAKE2B 3ce112e905d6793fa364faecd2869ef2c1b72c15fb194cddc2086fba3a96bf01d609b280771e00b6252af769f422ddc7973eb56ddcf23edd4a07ab16da80301a SHA512 6a72b77e412cab79b6821f31b50cce6f5546d7e2a4bce66988207b148d09081b8b5d3fed8684d95722ddc2788fd5e24c0cf362a9ff7bf3f30dbc4066fe2f3624
-EBUILD hangups-0.4.10.ebuild 1191 BLAKE2B 6ed93b4e674db9b9db566beab4e0b89636b7a2343a94f94535d04590a57f85e0e0700a6599913e7a269a22bc33edad4fd2aeb2de4adf0f291312606cfdb97bb1 SHA512 4d96fc1acb771ecd5646bc2201dc904118f77152172d8f978f960f58e1c0552ff65fb0d3cfeb85f875f5c0422e8228ad1bdf25f31ccb62995d1e68639f0f8f13
-EBUILD hangups-0.4.11.ebuild 1191 BLAKE2B 6ed93b4e674db9b9db566beab4e0b89636b7a2343a94f94535d04590a57f85e0e0700a6599913e7a269a22bc33edad4fd2aeb2de4adf0f291312606cfdb97bb1 SHA512 4d96fc1acb771ecd5646bc2201dc904118f77152172d8f978f960f58e1c0552ff65fb0d3cfeb85f875f5c0422e8228ad1bdf25f31ccb62995d1e68639f0f8f13
-EBUILD hangups-0.4.6.ebuild 700 BLAKE2B 2bc9575dabf7bf39e1ff0c5636aa9c4e63ba399884bad210fd247b3688fad4e46e016e7bc315fa234a9157fd5c69ce0fb946b4a0fda95e670d7623d71723756a SHA512 5457e441875bcebc41d6c6b916e0164fe80b33216de450cd45b7fb581eca3ea97e4c9e28a433bf50c95732e221e9177e4141f33ac18f96d60005c37c93ff9894
-EBUILD hangups-0.4.9.ebuild 707 BLAKE2B 8be260fe635ff191f813390e8e96a4f15dee092dc8165b0b4826ef6a112be0ad384421ffa4c9ca2cfb4bc28197d020a7c96bb07b1a8d56c3ef14a4fd7f9fc2f0 SHA512 ed4589f8f817127a46712320cdda33a7735cb42787bc6eaab7ed01d1c0053a821df188b3092b61f6766fa87c3b04ce4e6fc9333a3d0daaebae70512971277114
+EBUILD hangups-0.4.10.ebuild 1191 BLAKE2B 125d3ba609fd48ea3af0059caa239ec2a2b0d65cb2127d97bb35078db682b97672db5722b4d004c591794cb30474bc92b052b3ea5583cee5d549f02897d0f255 SHA512 44cdba71b1ecb319cae9186de5a213c5222d807709037f56c344f4c974219e013561143b0184740dc6ff5669e62c2a0561d6f07802acc0f8a1191c13cf15988a
+EBUILD hangups-0.4.11.ebuild 1191 BLAKE2B 125d3ba609fd48ea3af0059caa239ec2a2b0d65cb2127d97bb35078db682b97672db5722b4d004c591794cb30474bc92b052b3ea5583cee5d549f02897d0f255 SHA512 44cdba71b1ecb319cae9186de5a213c5222d807709037f56c344f4c974219e013561143b0184740dc6ff5669e62c2a0561d6f07802acc0f8a1191c13cf15988a
 MISC metadata.xml 451 BLAKE2B 1f2f40e10acb79f4fa5757212b27ef94b26ed07a92f978f019e6adcd6d55a3c821ace6443fc1bdbccf4037df16ee1e7bc716690bbd1fb7fa74a27c3fcb5398b4 SHA512 c17dc52ee756daf9c7d33d3637ddb516ad0ae6f15a0ad95e4f5420a800060609f71a8320815e4b0b3b93d2f5eb9bb7a1d3b5cdcc7522e682d7c6d5123493e4e4
diff --git a/dev-python/hangups/hangups-0.4.10.ebuild b/dev-python/hangups/hangups-0.4.10.ebuild
index 5ab4b06b2..8f2a83dd6 100644
--- a/dev-python/hangups/hangups-0.4.10.ebuild
+++ b/dev-python/hangups/hangups-0.4.10.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{6..8} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/hangups/hangups-0.4.11.ebuild b/dev-python/hangups/hangups-0.4.11.ebuild
index 5ab4b06b2..8f2a83dd6 100644
--- a/dev-python/hangups/hangups-0.4.11.ebuild
+++ b/dev-python/hangups/hangups-0.4.11.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{6..8} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/hangups/hangups-0.4.6.ebuild b/dev-python/hangups/hangups-0.4.6.ebuild
deleted file mode 100644
index b9000aa1c..000000000
--- a/dev-python/hangups/hangups-0.4.6.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{5,6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="the first third-party instant messaging client for Google Hangouts"
-HOMEPAGE="https://github.com/tdryer/hangups https://pypi.org/project/hangups/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/hangups/hangups-0.4.9.ebuild b/dev-python/hangups/hangups-0.4.9.ebuild
deleted file mode 100644
index 21011cda1..000000000
--- a/dev-python/hangups/hangups-0.4.9.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit distutils-r1
-
-DESCRIPTION="the first third-party instant messaging client for Google Hangouts"
-HOMEPAGE="https://github.com/tdryer/hangups https://pypi.org/project/hangups/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/hbmqtt/Manifest b/dev-python/hbmqtt/Manifest
index f8d76ee12..130769a54 100644
--- a/dev-python/hbmqtt/Manifest
+++ b/dev-python/hbmqtt/Manifest
@@ -1,7 +1,5 @@
 AUX hbmqtt-0.9.4-remove-tests.patch 405 BLAKE2B 46eb60c2db15865bcdb2a60da0f2826e7d42e844356f3fb77e5e58c0e73c61002f7b061324cef8762d32ef6c86b9e65476f81ebe79cc654056b66d692b4d8001 SHA512 eaddb47006ab9d530dcbd1df94a7fab5614821617f93f677f3658e1230b0387aa7b00ba47916981ceb3d3e9743b37507ec2bba78bd49b18ae3f2cce718cca1b0
 AUX hbmqtt-0.9.5-remove-tests.patch 405 BLAKE2B 46eb60c2db15865bcdb2a60da0f2826e7d42e844356f3fb77e5e58c0e73c61002f7b061324cef8762d32ef6c86b9e65476f81ebe79cc654056b66d692b4d8001 SHA512 eaddb47006ab9d530dcbd1df94a7fab5614821617f93f677f3658e1230b0387aa7b00ba47916981ceb3d3e9743b37507ec2bba78bd49b18ae3f2cce718cca1b0
-DIST hbmqtt-0.9.4.tar.gz 70321 BLAKE2B 669b0378efafa67814423da3c96909144c2865b454926f3085a703988fbe51778f1a6084769e0220b24e97f8d2f0be45cae1ec15cd1f660044433c90665210b1 SHA512 bfd7e8c836fe736525381e8e7e8e4ffc558523148ef80705a9a4e298f329985b15f7cc62096604772e39ac16633b2b52a7f23c235596f05bdfab22cc1b5f1f79
 DIST hbmqtt-0.9.5.tar.gz 69338 BLAKE2B 7ff574b31adb3edf5a9b17bcf66d03848d2dbc5a5d2c3bb62258c0c7baa41566bb5fdfff12993219161b65c368c8f2bebc42e04d95aae20234bc20dc579a91a4 SHA512 f5b1a301268c7af300a407a1a9734ba74ced825883e6740cc9d4e2eed4db48c55f6d76e4911a69743e1db514b1f2b4a05abb2320f40c349f2ac7a1d6c38d1642
-EBUILD hbmqtt-0.9.4.ebuild 739 BLAKE2B d1b006e0807851c55a3f1ef46396fa4e6014556676304919509ad0c68a2ba1c3af57a33ca3b6be6ae8d21629439ef6b3e47b96e4f44f556d5aa9c41c2423e407 SHA512 6eb65d5fb527e1dd887bb645872561b98ea45bff626dfd850049a5cbadc284bac6d844f01504c982d6987fd031c92d87fdc1af89f773d55c4dcc12c88ed6f8e7
-EBUILD hbmqtt-0.9.5.ebuild 741 BLAKE2B 28e2739d6fbdd7c4078048add131c0d80f87764fea2b0de97c522521d9fd14ae8134939135910480c44eb36eb3c663a4c138f31f21b83d09da5c9a5203c41d7c SHA512 2b2236c0fc64d47e43705b7e0cf6f2f19122f9fca1493ac9120e0e1a0b95254ac2af2d90c9a7cc0d138a926369ab6f5823f997d8e4d4b3e701d739c2c17f4ab0
+EBUILD hbmqtt-0.9.5.ebuild 740 BLAKE2B fc3704b2af7ed7eb967892200d1d5f94b8468ec91e769c6d660615a21afb4ee7e01fc8c68f11d99bc72b509ab0bddf9575ee80f223d20a5f937e19f5a865413b SHA512 670979e7be91b7136b24147c80c295c04464e7454175c8a5c4187a2dc6f4898b6301c34abeb093b651c45c8101850b0772cb24fd4765c8bbabde8710eb38ee28
 MISC metadata.xml 454 BLAKE2B a5ae30ff8864371badc392aca4956e500e1a18385b4f748b705c7e85d866a44da585e29ade370643a52fc0c0f0658229b3a885c7ce5015af3e8205182ce22044 SHA512 4f9fd14c025653c79a6c9d5ae4a8f1df0b3d6e6a44a297a069591fa5864b37b5a278c439e887ed6a7164e858e82c40afd19b157011e256770356fab8b7c9fa03
diff --git a/dev-python/hbmqtt/hbmqtt-0.9.4.ebuild b/dev-python/hbmqtt/hbmqtt-0.9.4.ebuild
deleted file mode 100644
index ef94f0b66..000000000
--- a/dev-python/hbmqtt/hbmqtt-0.9.4.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{5,6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="MQTT client/broker using Python 3.4 asyncio library"
-HOMEPAGE="https://github.com/beerfactory/hbmqtt https://pypi.org/project/hbmqtt/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-PATCHES=( "${FILESDIR}"/${P}-remove-tests.patch )
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/hbmqtt/hbmqtt-0.9.5.ebuild b/dev-python/hbmqtt/hbmqtt-0.9.5.ebuild
index f39811cad..e984aceb7 100644
--- a/dev-python/hbmqtt/hbmqtt-0.9.5.ebuild
+++ b/dev-python/hbmqtt/hbmqtt-0.9.5.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/hdate/Manifest b/dev-python/hdate/Manifest
index 8d1647d8b..8025f4c73 100644
--- a/dev-python/hdate/Manifest
+++ b/dev-python/hdate/Manifest
@@ -1,15 +1,5 @@
 DIST hdate-0.10.2.tar.gz 32180 BLAKE2B c4018fc9d5e90344cb9be9a76ae6674491a34cd4ed76713c629fb2ee595bebfaa923c47a00e9e5f43dbcdb16925576acf3d3018efdb756828478c6c27a4f4591 SHA512 49f3cc0917864393a4882e1e733b8519e449fbab48d85a85664c606beaffad45208fc93ea35ad9e605b6e033ef278ddf330dd44904e195b8f2b104166eee1fa7
-DIST hdate-0.9.0.tar.gz 38247 BLAKE2B 855e7f8a639b16640b1613a68a01c91f7495497a066ee055ed0e4685f24bf169715ae3688a6b71525d644d9540e668db8fe9f9c1cc7ce05d993a8812aeb11fab SHA512 935774b063e3a35640f99a89de8cb1a1c450f9335034db1bb07498a832a44257d19ed1d8b1bf93054962d1a827fedab6da2ca48a161d6f7054d82b5b7a50fd00
-DIST hdate-0.9.1.tar.gz 39029 BLAKE2B 71772e2ad5141013d99fc109169ef468398b211f6b1b59d67c02ad3c487f71ae76c129868829ef66cb6aee75472f33d0c5e3e84cb92c4aa18e187b960a959fec SHA512 53ea1084dff6bc0f31849eddb673d2e30a8daec377d29fb34647e66a0dfe66d36f5ee05ab917a0dee472f8eb2178ee9c13671be014798f58e6028d38330bf313
 DIST hdate-0.9.12.tar.gz 49743 BLAKE2B c6cfb9c60d03581f0b9f2d70019b7a4e8fd93c44e4ba4341ec0dddf767ecbc9d32153fbc7ad3cfbd71b36d0b90bc71a21f574a8f46f362006c00369346fa622d SHA512 6bb52e80c9372cf297dc505df89bafaf36873e16c734487423788f6f81baeac033291439c8f34ada0084eff701b84a1e4f5a20db216687a6f003a70ce7deb2c7
-DIST hdate-0.9.2.tar.gz 39008 BLAKE2B 9ab56234f0692b515f57a01df036d0ea60d10a9c11a0951855a1f8d23bac9bc3258132ffad5a77bac2e8f01d875aeb07a8ccaa1d666754a553912420c426e6f2 SHA512 39a51aa55965b002b010d467ba55eaddb0eac6bef624636cb6455b7568a9564435e16021827ab10bfaa2114e9d057a1c8f815b1ed61c33189f6a8accef0580d3
-DIST hdate-0.9.3.tar.gz 40318 BLAKE2B e803d702b9b030377459e45f77bf46726e2f98af25036f1477fde5fde36603f7d150ad56ec78506a76cca97a99abf1d644364019e00fb0f90a4835d131f8c2b2 SHA512 26f6aff64139c33e2049894fa805dd2fa35e557509fb076c82c5ebf752dfd830fdfc89b8984a408d7e29649510849e075f7ce932390906d5d1994d4a1f820243
-DIST hdate-0.9.5.tar.gz 40964 BLAKE2B b180e4d32bb5906cd6f0f17199a4abb3675086d1407af0fba02307309b2cda2d11166a66a683357b2b3d167372b01e04aea690dad11c58c597e8a17d1d0e7a6b SHA512 b9456c263a212bcdeaa6767bc6b9117526133d4ace29b5cf05cf4859db3719141d7c41845565226050e8cb8c6a87149f80ba946460a7f56edf0bffc399b6a774
-EBUILD hdate-0.10.2.ebuild 714 BLAKE2B 3737117eada13ad66a989b1c90c4f50a324350967e8f96c1c85f764649c51d3049fac5da06b2753da62e6bd6657acbc3efe32cfa9e3690e261210645e73edfd7 SHA512 a4750c6945d325c9495b3b806b64b7383d49b4bbc919c50fbd735c46debd7c22391148ae86ed8d3783ba6470fc7b4baae97c256c91bf1ece913f3d00dbcb5d9f
-EBUILD hdate-0.9.0.ebuild 783 BLAKE2B 13ba75a6a26075efb6bc06b33050dac6615ab7c88c63462138dbccb432145757f23306f7d3648d18a45c7b26a5ba0ae9c3177fa8513b7484e7a39fa57a1411c4 SHA512 b62c2f192c404bcd32438d31e3c53b275024a68220df1d6c3a86f1d30a917e13eb8c8884e54fbfb3a3ade40ae67d04563941bcbea75ed205a84b94ab7191303c
-EBUILD hdate-0.9.1.ebuild 783 BLAKE2B 13ba75a6a26075efb6bc06b33050dac6615ab7c88c63462138dbccb432145757f23306f7d3648d18a45c7b26a5ba0ae9c3177fa8513b7484e7a39fa57a1411c4 SHA512 b62c2f192c404bcd32438d31e3c53b275024a68220df1d6c3a86f1d30a917e13eb8c8884e54fbfb3a3ade40ae67d04563941bcbea75ed205a84b94ab7191303c
-EBUILD hdate-0.9.12.ebuild 714 BLAKE2B 3737117eada13ad66a989b1c90c4f50a324350967e8f96c1c85f764649c51d3049fac5da06b2753da62e6bd6657acbc3efe32cfa9e3690e261210645e73edfd7 SHA512 a4750c6945d325c9495b3b806b64b7383d49b4bbc919c50fbd735c46debd7c22391148ae86ed8d3783ba6470fc7b4baae97c256c91bf1ece913f3d00dbcb5d9f
-EBUILD hdate-0.9.2.ebuild 783 BLAKE2B 13ba75a6a26075efb6bc06b33050dac6615ab7c88c63462138dbccb432145757f23306f7d3648d18a45c7b26a5ba0ae9c3177fa8513b7484e7a39fa57a1411c4 SHA512 b62c2f192c404bcd32438d31e3c53b275024a68220df1d6c3a86f1d30a917e13eb8c8884e54fbfb3a3ade40ae67d04563941bcbea75ed205a84b94ab7191303c
-EBUILD hdate-0.9.3.ebuild 670 BLAKE2B 3fc8037474a9f0410ea9f67f72d0ad2cb6ad41922d3e09490187e6dfa531a1af1f22f23dd87d3c2dc6cc026a38c9818f980646c5a6898745a1b531176d5f570e SHA512 e8deb52fa18f804cc3973fb89360db09a5c637c151b3570045e89b4e3f0450330e2f88f2b8872890398383f0477e9ce6b79216c216a39016375e3b33c7ba4c80
-EBUILD hdate-0.9.5.ebuild 670 BLAKE2B 3fc8037474a9f0410ea9f67f72d0ad2cb6ad41922d3e09490187e6dfa531a1af1f22f23dd87d3c2dc6cc026a38c9818f980646c5a6898745a1b531176d5f570e SHA512 e8deb52fa18f804cc3973fb89360db09a5c637c151b3570045e89b4e3f0450330e2f88f2b8872890398383f0477e9ce6b79216c216a39016375e3b33c7ba4c80
+EBUILD hdate-0.10.2.ebuild 714 BLAKE2B d58e3bf47e91ce90db5f721b24c9346717afba4b69d3b3e5f73c6029cf0ec7cd565186dcdde438e94c0160c3b4b21fec3f4c9b7cb1fa9f59d145e68dc0ec1b56 SHA512 7fefc670beb4fb563dc9ff682550875f8f23db849fdf7e5b4f0f24599dbed884703bf85da55ef9108c3ee0803e48f35a4410e2eaaff6343f27bb7d379511a540
+EBUILD hdate-0.9.12.ebuild 714 BLAKE2B d58e3bf47e91ce90db5f721b24c9346717afba4b69d3b3e5f73c6029cf0ec7cd565186dcdde438e94c0160c3b4b21fec3f4c9b7cb1fa9f59d145e68dc0ec1b56 SHA512 7fefc670beb4fb563dc9ff682550875f8f23db849fdf7e5b4f0f24599dbed884703bf85da55ef9108c3ee0803e48f35a4410e2eaaff6343f27bb7d379511a540
 MISC metadata.xml 448 BLAKE2B 9930f1f42530ab5e3479bdfa0cd77ecff3ad253641ea981c7825adeda098e176d8816bc300a77d99a6ca0be272d8021b028076c2d283562362f65064975f29a2 SHA512 dfd8c065ff5343d2eba5790b9adcdaa28f9eefafb7df0da76e8eb76b965347b5b8b368f62866d48698666227ebeff7e402192043c6c6325b04104615863e22f0
diff --git a/dev-python/hdate/hdate-0.10.2.ebuild b/dev-python/hdate/hdate-0.10.2.ebuild
index 3c73215ea..b002048bf 100644
--- a/dev-python/hdate/hdate-0.10.2.ebuild
+++ b/dev-python/hdate/hdate-0.10.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{6..8} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/hdate/hdate-0.9.0.ebuild b/dev-python/hdate/hdate-0.9.0.ebuild
deleted file mode 100644
index f361c5575..000000000
--- a/dev-python/hdate/hdate-0.9.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{5,6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Hebrew date and Zmanim"
-HOMEPAGE="https://github.com/royi1000/py-libhdate https://pypi.org/project/hdate/"
-
-# No Archive on PyPi for 0.9.0
-SRC_URI="https://github.com/royi1000/py-libhdate/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-#SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/hdate/hdate-0.9.1.ebuild b/dev-python/hdate/hdate-0.9.1.ebuild
deleted file mode 100644
index f361c5575..000000000
--- a/dev-python/hdate/hdate-0.9.1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{5,6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Hebrew date and Zmanim"
-HOMEPAGE="https://github.com/royi1000/py-libhdate https://pypi.org/project/hdate/"
-
-# No Archive on PyPi for 0.9.0
-SRC_URI="https://github.com/royi1000/py-libhdate/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-#SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/hdate/hdate-0.9.12.ebuild b/dev-python/hdate/hdate-0.9.12.ebuild
index 3c73215ea..b002048bf 100644
--- a/dev-python/hdate/hdate-0.9.12.ebuild
+++ b/dev-python/hdate/hdate-0.9.12.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{6..8} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/hdate/hdate-0.9.2.ebuild b/dev-python/hdate/hdate-0.9.2.ebuild
deleted file mode 100644
index f361c5575..000000000
--- a/dev-python/hdate/hdate-0.9.2.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{5,6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Hebrew date and Zmanim"
-HOMEPAGE="https://github.com/royi1000/py-libhdate https://pypi.org/project/hdate/"
-
-# No Archive on PyPi for 0.9.0
-SRC_URI="https://github.com/royi1000/py-libhdate/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-#SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/hdate/hdate-0.9.3.ebuild b/dev-python/hdate/hdate-0.9.3.ebuild
deleted file mode 100644
index 8d249442e..000000000
--- a/dev-python/hdate/hdate-0.9.3.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit distutils-r1
-
-DESCRIPTION="Hebrew date and Zmanim"
-HOMEPAGE="https://github.com/royi1000/py-libhdate https://pypi.org/project/hdate/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/hdate/hdate-0.9.5.ebuild b/dev-python/hdate/hdate-0.9.5.ebuild
deleted file mode 100644
index 8d249442e..000000000
--- a/dev-python/hdate/hdate-0.9.5.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit distutils-r1
-
-DESCRIPTION="Hebrew date and Zmanim"
-HOMEPAGE="https://github.com/royi1000/py-libhdate https://pypi.org/project/hdate/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/heatmiserV3/Manifest b/dev-python/heatmiserV3/Manifest
index 4aab4fb61..17bbf176a 100644
--- a/dev-python/heatmiserV3/Manifest
+++ b/dev-python/heatmiserV3/Manifest
@@ -1,7 +1,3 @@
-DIST heatmiserV3-0.9.1.tar.gz 6106 BLAKE2B 6765a454c1598f9a78c138113cc994bd42f0b46fe0b6079304e9a743e9a8344211ea79ec8d8844068433a890e93f8baf025aa14ed8ffa4376c4b50b4268a7502 SHA512 4dd49b5ac6fe4cecb38eb8365b6855e56ba549ba72eeda42a4e36e8f9434e001096c22a10038692a5a9314dc991e7fc3701177ea0b031b4fb13334cec1918ca8
 DIST heatmiserV3-1.1.18.tar.gz 6713 BLAKE2B 5b7b072b4093795ac977b88fb9d13dc661abdd0f3df0fd44c1d7a9fc6928d7cd11b6f1752973a72991febbf20a6afd7b0b5faada84b5959c5bbd7ab94a165e76 SHA512 cb097bc8f3fe7e05179842b3aedbb007f93d0d5e33ecab34c8917ede4f44647e1affcc073390dcbdeddc2b98c639e4f786eef9ac8f9e8371fcf24d786486c7f4
-DIST heatmiserV3-1.1.9.tar.gz 6701 BLAKE2B fc45ab21cf2f133028c9cb7e1ed7c9a12ea140eed4d396f10da5cdf14e342e965d90e7309813c316702756d8351f39e4e5cb5c91d0e07a7620158f6f9a433546 SHA512 4671e6bbf6a61e170c9027dbe117ac2d067fdffd4273c44b046f58fb827c57152d520eaade3f2d5f8bff0765f6cd14d299932426d8e02f5a1dd8b804f09cd932
-EBUILD heatmiserV3-0.9.1.ebuild 738 BLAKE2B 7286cd482996286a56ef529a413fa9692c0c186ec2f2f04439301587b33cfc130da13e82b295068ec87658ffd905c3027f7ca09cbb26759e9c2da2683f8810dc SHA512 e35fefdb2ff59766062187ba233c5d75dbfaca03f8677686069ab221d17f6ec5fd0d7f0259a4f59278a938777e78b9dcbf59a21567f4c60c65dc98fc03d2f6d0
-EBUILD heatmiserV3-1.1.18.ebuild 747 BLAKE2B 66813bb26d301ad09e0838245cd36d6df59300191315bdd4cab7483ab1c57ac3622225adbec99848664b6f1397730a8f2ec61271f64dc634f82b7c71be0debac SHA512 058611d1bbf48f20f87c2d0f741d361c06eeb06714c125c99db5ef6b03b3641c1a9ca9e330f620d59444b68537eaee96d57016ffd1d92e744813cd861ebd2418
-EBUILD heatmiserV3-1.1.9.ebuild 738 BLAKE2B 7286cd482996286a56ef529a413fa9692c0c186ec2f2f04439301587b33cfc130da13e82b295068ec87658ffd905c3027f7ca09cbb26759e9c2da2683f8810dc SHA512 e35fefdb2ff59766062187ba233c5d75dbfaca03f8677686069ab221d17f6ec5fd0d7f0259a4f59278a938777e78b9dcbf59a21567f4c60c65dc98fc03d2f6d0
+EBUILD heatmiserV3-1.1.18.ebuild 746 BLAKE2B 36a067c41b10f3505c0fe06a9f88a126633ef3c4c7d7992364fcceb9ae96f62647417af881895a4bb519532eeb66b1cb4b0ac0e3e0cb1117d3a34bb8325ff1de SHA512 278779a254ff6f18f36a6cf8b59a273d1f1a3ced5b9f56a985c130c3accb330fe4781b90aaebca240536b3a13986f4480047bced71e55530ef17206eff1578a2
 MISC metadata.xml 450 BLAKE2B a1bee0ee701c94718177dfe75e9fb750a9d4393da9613360a6a4b645c05eb51fffbdeb9206a841be094b174fa375e53f9d2f217cb4f7feecbfcd121f5d861820 SHA512 54e7a4998a2fb65b7a4eba3ef31ddca099c333d11cb3cafbb589d484e28fd8bee217f636b89fe33bcbf3469e0437f36485b0a0cee056d2ae2b0aeb7ebfb1c412
diff --git a/dev-python/heatmiserV3/heatmiserV3-0.9.1.ebuild b/dev-python/heatmiserV3/heatmiserV3-0.9.1.ebuild
deleted file mode 100644
index 2250c2eb0..000000000
--- a/dev-python/heatmiserV3/heatmiserV3-0.9.1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="A library to interact with Heatmiser Themostats using V3"
-HOMEPAGE="https://github.com/andylockran/heatmiserV3 https://pypi.org/project/heatmiserV3/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND="dev-python/pyserial[${PYTHON_USEDEP}]"
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/heatmiserV3/heatmiserV3-1.1.18.ebuild b/dev-python/heatmiserV3/heatmiserV3-1.1.18.ebuild
index 12519687a..4e1886741 100644
--- a/dev-python/heatmiserV3/heatmiserV3-1.1.18.ebuild
+++ b/dev-python/heatmiserV3/heatmiserV3-1.1.18.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/heatmiserV3/heatmiserV3-1.1.9.ebuild b/dev-python/heatmiserV3/heatmiserV3-1.1.9.ebuild
deleted file mode 100644
index 2250c2eb0..000000000
--- a/dev-python/heatmiserV3/heatmiserV3-1.1.9.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="A library to interact with Heatmiser Themostats using V3"
-HOMEPAGE="https://github.com/andylockran/heatmiserV3 https://pypi.org/project/heatmiserV3/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND="dev-python/pyserial[${PYTHON_USEDEP}]"
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/hikvision/Manifest b/dev-python/hikvision/Manifest
index b57eb1f3a..33429fc94 100644
--- a/dev-python/hikvision/Manifest
+++ b/dev-python/hikvision/Manifest
@@ -1,5 +1,5 @@
 DIST hikvision-0.4.tar.gz 3086 BLAKE2B c83392dd20d70dbe08b1dc16740455a3727b627df9ad968442f1841ef78c451e4dd1e5128ddd1610c9b2b9c049edf9fce232b1ba82cff4cb4ac9734d3d50dc67 SHA512 9c9aa80da836874f6cbc7c40dc4c2b4cf861da7fc3daba046a909da0bb85377f22fbbbc7b1e20a6b1e98ed2950a03034df3f2c5ccb9d0d224a4a674855d6a9ce
 DIST hikvision-1.2.tar.gz 3592 BLAKE2B 8408bc3f5dfeb00d018233fa12c0017bc1559b6f9ce0481a4cf0f50488b3663014a90d1a8da5c192d7b1c20afc182f04276d3f13217a47407acde26e603367f0 SHA512 c82bbb8398aba14a8284980af09c3ed40dcf66b517ad6fcf234db25ce2a9b96bc69e3799932554c3d7be198c2b0811ed468bcf463335dee80e526271e8018f01
-EBUILD hikvision-0.4.ebuild 702 BLAKE2B e511ee1dc6ba1902ffcbbdfbc470ac3d2bec4791f43912ef8d3257bf3beab7a8dfd7bbe786b177869f0ffa8c6e786e3f02ddb6b2cb976a29dbf822e6fefd7e8c SHA512 ef39ccf4371e994c7caf4394caaf40a96a5b22c93b8ae8566c8ca713deaa55dc5a2ac772da18378714d46d9ca92f71708e4aa1b06bd91a9f587bdaa64ec1e35d
-EBUILD hikvision-1.2.ebuild 711 BLAKE2B c931d6d1501f8bc6dba034bef85e369a4644ff1f76640e8082381fbb517991d04c48758a66d50964101271aee53fc38e6ebc7d5272a7006e68c00a7433b90733 SHA512 f170065b3612c738f4b564a402dc7bc1d3dc0a01d9df66eda22d38aba12410f9b19012e09c1b3f45c220656ca437a61993726901df92935e08c082b2a8c0a8c2
+EBUILD hikvision-0.4.ebuild 703 BLAKE2B adbfe8ca9d25517a925080ff739c876c269d0e3ad2056168ccccb8fd4aee56e328e2fffca0d9d2afd67b0dfeed4a0c6b08b9cf99827f1d0e3c6c60ae2bb3fbcc SHA512 568fb9bb0288c405e9fa7b64cebad4cf55131c9a4cad312c76fa490d419452ab5ab3bad8c0ff40f27c581f7fc51a0ebb0396e710a6ea8e00ca0ff57fc0bcb97c
+EBUILD hikvision-1.2.ebuild 710 BLAKE2B 6a6f3a4c4cf50f62fbb869d1c5cee3a047881c275ebc09e7a7c91d04c8edfd163ac514ebcfb0f171ef37b8e6802b727ad7c5de8acbbca223ad570ac0526a89ea SHA512 8ef4a2de6ff2a52519798a0a2348e67f318450bd30297076a2af3203ae1e439eb71a94d3237a9b2d9b7d8299b8c3f1b1993c502918495378716984102de1ae1f
 MISC metadata.xml 469 BLAKE2B 34cfbb646261ba20ff5af238d1d365aa625452cd8776b157558a4030b58e03cb66c741c3ea25b1b45b19b483e4613b9c539708ad1943256c51d84292626d52de SHA512 8187097fa5bbf9151d85ecf1597824230bb9c210bcc4767768365cb6fe89e948f6292fe443862ca662a548a4264b70439314a45e5f8eec67834a8d76a1c068e4
diff --git a/dev-python/hikvision/hikvision-0.4.ebuild b/dev-python/hikvision/hikvision-0.4.ebuild
index bdd58b32b..df1c037b4 100644
--- a/dev-python/hikvision/hikvision-0.4.ebuild
+++ b/dev-python/hikvision/hikvision-0.4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/hikvision/hikvision-1.2.ebuild b/dev-python/hikvision/hikvision-1.2.ebuild
index 83d872b67..a9428aaa6 100644
--- a/dev-python/hikvision/hikvision-1.2.ebuild
+++ b/dev-python/hikvision/hikvision-1.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/hlk-sw16/Manifest b/dev-python/hlk-sw16/Manifest
index 3c036b9d2..b2a3a2b2b 100644
--- a/dev-python/hlk-sw16/Manifest
+++ b/dev-python/hlk-sw16/Manifest
@@ -1,7 +1,3 @@
-DIST hlk-sw16-0.0.7.tar.gz 3434 BLAKE2B 90e7bdb684bc158627a00d2b2f5c269c810c636e78f95804b31da9471862f5450f7af8051183c827ea6123ad5dbdf6586f19d04e756a7ff21a1f6fb240da03ed SHA512 dae36aa22f22bfe780a4fde9531ca775d2f8c1d203b24cf6f79503bc7e13fef0bfa1690af6c960425c829e29f34a98c052c44b93c73cf4818fe3dcd9a9c50561
-DIST hlk-sw16-0.0.8.tar.gz 3578 BLAKE2B 700a8c4d46cbed71a32210441eab33b1a61faf5aceb07f2afa8e2a0c8d887c4b6d0787a8bbd6e35dce24a1bc173735d31f7d2e0ebc5ba8ab5a8b01421d2fcd57 SHA512 6f1f677070e4d2c5e82c38afa07dc6f8b9334a456dac5cd3eeae9e88b6978867fa08f821f68499a3fe3001d795e77bc76468356ab608723ee7a11b2a376b96ae
 DIST hlk-sw16-0.0.9.tar.gz 3790 BLAKE2B abcf4db40d17df5c7609e773ac6302ae2c6bc6c29a52848dcaa35c151e4e388ab1ee742f36bd1b5be484058d8cf980217a981245c8f207c816fa416cdf074220 SHA512 4c2461d89d78a57133b36f3ac1714874cf7821b27a951825fe2ccbca78edb6d9298238b275dda0bdf64fed383c18130525f389be6b15d0c841a8546686949395
-EBUILD hlk-sw16-0.0.7.ebuild 667 BLAKE2B bfa78c8acc2d4b9a0698e472f7a093fa23fb8d6b94514c1c15cc8e07b8290de5f0c9dd15325f7798ac5af51a4b29d3ce0e3222edcd85d4d7f1db320ce110cfb6 SHA512 e6a3bc52b8597e4cb043b38db93ec31534e669c420a73a3aa74229e3df910855ea24a8b4e449a5b2c871d36d33f75da3fb8b1ea958ce044fdab4e53b8b67228d
-EBUILD hlk-sw16-0.0.8.ebuild 676 BLAKE2B b23fed49ba301ea9376eb11a7761621021a4273c50888a6fa499bc204fb1b2730a2861d105aa739ee63484f745d2f21877249883b473e0003afdb74acdf07bf4 SHA512 bbcb7989e8ef39e01a7f6960c174915c770cce3a27b87f3d5cb1b3d7e6c2916a86bcd01622109214393b2d3e8ea73c4b3ab83b9b7d6acd7d22336146953fb219
-EBUILD hlk-sw16-0.0.9.ebuild 676 BLAKE2B b23fed49ba301ea9376eb11a7761621021a4273c50888a6fa499bc204fb1b2730a2861d105aa739ee63484f745d2f21877249883b473e0003afdb74acdf07bf4 SHA512 bbcb7989e8ef39e01a7f6960c174915c770cce3a27b87f3d5cb1b3d7e6c2916a86bcd01622109214393b2d3e8ea73c4b3ab83b9b7d6acd7d22336146953fb219
+EBUILD hlk-sw16-0.0.9.ebuild 675 BLAKE2B 6d790a4a9d3fff55b77d74f018f4c51f52e22e5b184507f377c556c24765fd1038304ad3a2de60ff120df2791d95794dfcd782634060712afcd595c41c8ff15c SHA512 3cf63f35447ef62f5f58757fb50af981bcb41dadb5cd9085eae88acb9059d6e975fccf535f81382772d3881e7db810827618114784d33743b0f60b1cf7e17640
 MISC metadata.xml 460 BLAKE2B 9bcaf23b3c1c800e810a73f88bcc3bec3d4b0d6e298390c3b61459841e39b5a9e99cae0cc0e8494c5becbb9d7e79aca586b7aa802e25aa9c8d14f05881d0e242 SHA512 03ec07c6f28a77c8f6659046c0142fccb19c203810fe74f74d50226d8bf3e015f1269cda2246313217b9363d559c59e8c1592b06c2d10c9ef2e6383c4c34f6d2
diff --git a/dev-python/hlk-sw16/hlk-sw16-0.0.7.ebuild b/dev-python/hlk-sw16/hlk-sw16-0.0.7.ebuild
deleted file mode 100644
index 7fb3039f6..000000000
--- a/dev-python/hlk-sw16/hlk-sw16-0.0.7.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python client for HLK-SW16"
-HOMEPAGE="https://github.com/jameshilliard/hlk-sw16 https://pypi.org/project/hlk-sw16/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/hlk-sw16/hlk-sw16-0.0.8.ebuild b/dev-python/hlk-sw16/hlk-sw16-0.0.8.ebuild
deleted file mode 100644
index f36bdcfb6..000000000
--- a/dev-python/hlk-sw16/hlk-sw16-0.0.8.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python client for HLK-SW16"
-HOMEPAGE="https://github.com/jameshilliard/hlk-sw16 https://pypi.org/project/hlk-sw16/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/hlk-sw16/hlk-sw16-0.0.9.ebuild b/dev-python/hlk-sw16/hlk-sw16-0.0.9.ebuild
index f36bdcfb6..5c5a92f6f 100644
--- a/dev-python/hlk-sw16/hlk-sw16-0.0.9.ebuild
+++ b/dev-python/hlk-sw16/hlk-sw16-0.0.9.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/hole/Manifest b/dev-python/hole/Manifest
index f10d75614..791059ba7 100644
--- a/dev-python/hole/Manifest
+++ b/dev-python/hole/Manifest
@@ -1,9 +1,5 @@
-DIST hole-0.3.0.tar.gz 4004 BLAKE2B 47e4421c6880d0a44e0afcae2625707e90be58e5824334a45f26d04c5dea44a305c3284ac25e5ce0a04fde7f9fdd8790ad0b6ad027da32f85236bf07f5b2f221 SHA512 3eaf0caf45d3b80d8f0d5c37844c6405fe2293d9e9d7a5e18760e8604464462bd1b55e5b997706ef4001664047ada0ffd62fed6052127915a0040406284e9640
-DIST hole-0.4.0.tar.gz 4189 BLAKE2B 0e7400062f4bb3975c837af4aeb76316e494fb3dc4a08831f62436eabf6e4cb4b51b3aeadc6834207ace70094915e81d16231510d32e10ebb7108a5cc1332c8b SHA512 2c1bd2adfa4b7d57b0fb4ff6d842fa25d9f0f585834be9df11e704556984d3c41d8d8216da413393d18c082d49123e09b18eb414e54a069db80e406331d044a1
 DIST hole-0.5.0.tar.gz 4266 BLAKE2B 0ca0b853cab115fff0104ecfda0ef024642ead4ec7bc453d5b3e4ea64a389b9ed3d540df38922fa21428676174bbdbbbefebebd7b756c0618a0261380a24a002 SHA512 676246de24035a00c8c8dafba02035b232413a2fac9bc230e82079248b0421fbcfb151c3dcb66aea7bfef13151b23914c707f00ac7e361f938515e6c0ae0775a
 DIST hole-0.5.1.tar.gz 4803 BLAKE2B 7fdd515991440533a6d098847fe47cb68ca52eb58ad4b566ac3d04f67c033b5082138f72e44598c18edbc9103b1d81a353f4b3347073d76818f8cc4fa181cd20 SHA512 0b92cfddf35bd34be9b7ce08999a3333d4c078d6ec0ba743979f45181805213ec83daadad19ac49ced80cd17acc861c181c691b9d56edce2c6bde26fbdc19840
-EBUILD hole-0.3.0.ebuild 673 BLAKE2B 2ccc7e26b5f94ec8d9d11e9cacf477d7123e43d2d03ebd1b85ff6a54832864790053742754b7494f976cb3d91a158872ef6478c9bcb47e843fef7f4bbecff0e8 SHA512 8857c21e41359d2f11b74c9fa33fc831e5f2ebaca0bc5c68b81a24435422d46b61575f3e8476774882f493f36f8c02ff4f6724eb7c8f2e73801c7ada752e93c8
-EBUILD hole-0.4.0.ebuild 673 BLAKE2B 2ccc7e26b5f94ec8d9d11e9cacf477d7123e43d2d03ebd1b85ff6a54832864790053742754b7494f976cb3d91a158872ef6478c9bcb47e843fef7f4bbecff0e8 SHA512 8857c21e41359d2f11b74c9fa33fc831e5f2ebaca0bc5c68b81a24435422d46b61575f3e8476774882f493f36f8c02ff4f6724eb7c8f2e73801c7ada752e93c8
-EBUILD hole-0.5.0.ebuild 762 BLAKE2B 60a8b8a4e83e2e348cbb09404c93e64036b923e9f82352741e593b23a9ba633794e32f6fec8e526fd480d7df1a80e472c74b532deab21462cbef9fd65c24d9cb SHA512 40d3ff0ce7fdf589f08ea4e9f58e8417cb67fe505edea2126e774808c06e690e6966d02b2c98a6c29fc50195a972674d35e5845304be902cd8e96625d0a73b13
-EBUILD hole-0.5.1.ebuild 762 BLAKE2B 60a8b8a4e83e2e348cbb09404c93e64036b923e9f82352741e593b23a9ba633794e32f6fec8e526fd480d7df1a80e472c74b532deab21462cbef9fd65c24d9cb SHA512 40d3ff0ce7fdf589f08ea4e9f58e8417cb67fe505edea2126e774808c06e690e6966d02b2c98a6c29fc50195a972674d35e5845304be902cd8e96625d0a73b13
+EBUILD hole-0.5.0.ebuild 761 BLAKE2B 0f15a17785b19e264dfe8d3cfc8ea9948595c53b13544c9ca63239ff8f91538acbf82dc2f501ad86f8f984b7e7e9552dd0e752349ce341cffcc9061b447138ec SHA512 e9b30d202eea8e28f0152b598e304fa1a7de66bf27b657bd3f1fc0fe743f659b158a7d9a9cbd9b591963d271f1f974a9422d1e8b8f9795af171c92a152bce736
+EBUILD hole-0.5.1.ebuild 761 BLAKE2B 0f15a17785b19e264dfe8d3cfc8ea9948595c53b13544c9ca63239ff8f91538acbf82dc2f501ad86f8f984b7e7e9552dd0e752349ce341cffcc9061b447138ec SHA512 e9b30d202eea8e28f0152b598e304fa1a7de66bf27b657bd3f1fc0fe743f659b158a7d9a9cbd9b591963d271f1f974a9422d1e8b8f9795af171c92a152bce736
 MISC metadata.xml 462 BLAKE2B 253b151a5a0afa3923f2cf0ba224c3829165c13bd7f7080670e96880cd6f482abc47e06af561e06dfaafa010cae3045882ac08b5058e1197daa5bbb2566105d6 SHA512 404ea668097f3ce0c86422bf639bb5027901c384e0a0d518f4dfc586a7c514a96af3b06e92f9de8a86e13b9f98a781668908701f8b3aa9b55239946c29913584
diff --git a/dev-python/hole/hole-0.3.0.ebuild b/dev-python/hole/hole-0.3.0.ebuild
deleted file mode 100644
index 1289a055d..000000000
--- a/dev-python/hole/hole-0.3.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{5,6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python API for interacting with *hole."
-HOMEPAGE="https://github.com/fabaff/python-hole https://pypi.org/project/hole/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/hole/hole-0.4.0.ebuild b/dev-python/hole/hole-0.4.0.ebuild
deleted file mode 100644
index 1289a055d..000000000
--- a/dev-python/hole/hole-0.4.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{5,6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python API for interacting with *hole."
-HOMEPAGE="https://github.com/fabaff/python-hole https://pypi.org/project/hole/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/hole/hole-0.5.0.ebuild b/dev-python/hole/hole-0.5.0.ebuild
index ceda3a156..c95c0afac 100644
--- a/dev-python/hole/hole-0.5.0.ebuild
+++ b/dev-python/hole/hole-0.5.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/hole/hole-0.5.1.ebuild b/dev-python/hole/hole-0.5.1.ebuild
index ceda3a156..c95c0afac 100644
--- a/dev-python/hole/hole-0.5.1.ebuild
+++ b/dev-python/hole/hole-0.5.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/homeassistant-pyozw/Manifest b/dev-python/homeassistant-pyozw/Manifest
index 9cf4a15fc..bdc8dc123 100644
--- a/dev-python/homeassistant-pyozw/Manifest
+++ b/dev-python/homeassistant-pyozw/Manifest
@@ -1,22 +1,4 @@
 DIST homeassistant-pyozw-0.1.10.zip 147523 BLAKE2B 9035bb612cd8fe47518ebb9ca53d4bdfa2ca4be2450fe6abf40bd09abbd8fbac61adc4e17f835821484c75c84aee213ac859a28c9acdca54ed3756b589891c5a SHA512 8b955cb33ec2f4c4af89ffafc604faf555b8bb7ecd5b99ba4e8a60597b1e78274abac70551feaa81d7580d34937dd69ed87495fbf2ffa5c29ade6fd6e7a5a940
-DIST homeassistant-pyozw-0.1.3.zip 147474 BLAKE2B 0bf33dee81391d1d6407e2d230698458f0b2d21d0a5af8e8b2932ade62b924e9764cb506f4e5337052f9a9eb886c4a2aff5604592fa23f33b72e5da0e09f5a48 SHA512 5cea798a36377a3eaf76b40294d786679392ebecd3dea2a813fb7cd32ee488f8e252b46fcade58299d6ccde8b0459b8e6ecab774d42eb27cd3d2fa9f6e239d14
-DIST homeassistant-pyozw-0.1.4.zip 147476 BLAKE2B d7b8cc52e2a5e6ffcb283a6b4ef692a8542366057fced11c4819400e6b4fb7aafb9c28ce8b93a398d906a752880482a2554bd4fc27a27b14770b742bb0f4de16 SHA512 28cd21ea1cc335e60a3c88464aa0f09f6e36be21dbd67177a2f1fcfe72978f0b693518114bdd23049dc9c3bfc2215766cbe748e85feb4c6ed75a0b353ffbbd58
-DIST homeassistant-pyozw-0.1.6.zip 147705 BLAKE2B 8c42a08ce42b8237788512fd43999d747cbff6ac7981bfac2c82a9e57c1c1bdedc739a2c7073412f2c90c317bb0722d56b4dd4e0031ac64e481ea970c82f8b70 SHA512 cecbadc26dc6c08e07dcda44b2085232ad40753478cf16ddfcdfdaaa4dfb5d83552eb345258302491bd04a95e2a3ec712d2af5aa1807f4c8f3c0a807e6994e58
-DIST homeassistant-pyozw-0.1.7.zip 147477 BLAKE2B 45fd91c195484478777aec293982f1ea0f4fa6fb05e853589e3c6847af2bb487541955d7c373fb41bc58c48704b56ce6874bdac0176d359204ec09e0b1e10729 SHA512 a966bb7a9aec0c7c2a5954451b3894cb157494ae91731319d2fa3ec63128518c2ebc47cd1e05782ca9b9e701c88faeff166cd12e4d342f01904b484c295f470f
-DIST homeassistant-pyozw-0.1.8.zip 147522 BLAKE2B f1285dcffdfb2038fbf4a475a51e8a49903b072591e9aaaa80f1d0fb95d25b01c0db6b807389fff73ea4784b1e7a82029b95c58abaa424605ccb4e6908535861 SHA512 5beae9a0124ccdce61acccac96d8020c7e2524dfd734fc9826b28ab137e2134ad3c2fb8f8be13425d21e9ef23579219372e78f08b6fe18929fa4be9216e1c381
-DIST homeassistant-pyozw-0.1.9.zip 147521 BLAKE2B 74272d419460fc28207b4ec79167dfa765331506f31a115923c2755330da4c9ac041a3f511127d5e9e88e054f7a6dd7c8d3d3bb130302f73449647a79afa0bb5 SHA512 661de212903a2e97eb081d40ac5b805162086da11d6a932e2ab88ba7305a9c106e2f94696754a41ff9ec90f6edb715ce3ac503873f58e768736b59f789555c20
 DIST open-zwave-hass-0.1.10.zip 1876537 BLAKE2B a510d9a52c69d8a8242697ac870b790bba08ecfd7004bc1b01e7aa08045514d2a9e56c659e447f98551f30b72ac07b242526c6c9f128b368b722bb2ad7b1ae1d SHA512 57d140e64b27354a548ba2d8b70f52cde3e06d60bab048f69cc38cd343f4dcb6cf695f1f226e299e45f528031668aef7470d2562077911df39dcf56102f4ddaf
-DIST open-zwave-hass-0.1.3.zip 1835986 BLAKE2B e5e3adc69d3e1b3700b29cd63bf4c9921c799e134622a9135ce5dc1d6ff1298e54ed9b2660f8d8a4c922596c47fc41db829fcdd792ba50318158bc19ad69836a SHA512 1bf6c0f30df4acce8892e004ca22a7e82d20fadf5c6a5336c01bacd84587980d41877af71535a1ef90bb67c995f39d3a2aeaa9a7bcc740e54c54c118c554c185
-DIST open-zwave-hass-0.1.4.zip 1836153 BLAKE2B d345490745df9a8dfd36ea21b10f2453094f95fc0dcaa1e5ab0481075c4603e981206f5ca99dc89e142abbe2f8803772640ff68ba128dd91e3682ae7297b0ada SHA512 7455d7c7b1b2321dba4e250c64e7d035bd297b1b6cebe9ca282a5ca8c357dbf1a76d78af543253943b5be014f8eb3339b03d4b0a4d286becfd9381f3c4a97353
-DIST open-zwave-hass-0.1.6.zip 1857120 BLAKE2B b9c1ff8d0bffed6c58b51120666389da7dc8e40265e29a7a101040ee293bf1f5920e588a5f3128fe9619a1671798748578a1321a2f969e28cb2e5714eb7d80a2 SHA512 3e8ec5b817a272fc08a3de981f1046efb488ffed59e52ea5d944d1de161dfb73fb133c5f4672a2f6be01d72c8e2d26a4a2d0101a6625b849bf655568d0017fa1
-DIST open-zwave-hass-0.1.7.zip 1858582 BLAKE2B fe1a2069cd5984b570c71943dd8b6900723d1363e2bbb986c2cdd435ca41debcf31a39274e23be792290d7bb350217d9b8554b22971efa6f8457d4bdf572fbdc SHA512 4acbd214cd7987930449688997139ec26378f6fcc690b9daeb7bc301dcdc16639d9fd846c230bb1855c672e63e950b3da83cceae5e37fb1ef2f364d9e74184d9
-DIST open-zwave-hass-0.1.8.zip 1869917 BLAKE2B 511d0398c58e0230c8cd38a1e37564c5a4ecd039ef909fda5494dccec0d98448c6985f8bbaf9c5ee3c4964237cf6472a484fcef862eeb437ee733ec8a589a51d SHA512 24bd5d721dbed8768cfc6ec52f45496976fe1c8d496b85df0f5603ffe4d94a0293ef1b9190ad9207246d027b353c695fc955b34933ba35c009dfcae8aebdaa7f
-DIST open-zwave-hass-0.1.9.zip 1875653 BLAKE2B e100e9fb28341178d13d0c2d86249ba13ad9b01059d80092feef5dfc655ae7c09c9a65206f81b4debb88fb7dd6f9947c2612db74ebda3ad29df4ee1d0be8c24c SHA512 eb71828f25bf30f90d491d2f0242781a609d937a6cde547d314f22ff1487b1ebe0de0726f1c3efae3d6da2e31856e77bb63503c7671fb603ff0e1fa082928be3
-EBUILD homeassistant-pyozw-0.1.10.ebuild 1031 BLAKE2B 3f5bb98609a1b8925644f606539d1019de1b495665d5fb7a7e405c27f0ed039d955de89b4e79a6fd9a5982ccf348c5d4abf9354d8db7ecda895c7d67efa24513 SHA512 f96e2bb9f549565e60f52c2750e03d5e0cd87d89bae60558d2ccf0fbd16b080595f5f5c0f41b0b3c6af5dd225ebc35b9833ede3a5d396f5446eca2ff01b3deaf
-EBUILD homeassistant-pyozw-0.1.3.ebuild 1022 BLAKE2B cdc71ca465882f566b925c417e01201062d15f6ad43fcdfa319b8bec7b4a02cae59428175d48d95c06adae5014086220f56e37da21117adcf5bd4ae99dfae797 SHA512 c4366274839618d24c7e2c5001da588273ad1b3ebb8ec4101333aa50000b0a485ef57979b82931a9162bc6c7c633a959446fa24ef5565d905f1867f843227fdd
-EBUILD homeassistant-pyozw-0.1.4.ebuild 1022 BLAKE2B cdc71ca465882f566b925c417e01201062d15f6ad43fcdfa319b8bec7b4a02cae59428175d48d95c06adae5014086220f56e37da21117adcf5bd4ae99dfae797 SHA512 c4366274839618d24c7e2c5001da588273ad1b3ebb8ec4101333aa50000b0a485ef57979b82931a9162bc6c7c633a959446fa24ef5565d905f1867f843227fdd
-EBUILD homeassistant-pyozw-0.1.6.ebuild 1022 BLAKE2B cdc71ca465882f566b925c417e01201062d15f6ad43fcdfa319b8bec7b4a02cae59428175d48d95c06adae5014086220f56e37da21117adcf5bd4ae99dfae797 SHA512 c4366274839618d24c7e2c5001da588273ad1b3ebb8ec4101333aa50000b0a485ef57979b82931a9162bc6c7c633a959446fa24ef5565d905f1867f843227fdd
-EBUILD homeassistant-pyozw-0.1.7.ebuild 1022 BLAKE2B cdc71ca465882f566b925c417e01201062d15f6ad43fcdfa319b8bec7b4a02cae59428175d48d95c06adae5014086220f56e37da21117adcf5bd4ae99dfae797 SHA512 c4366274839618d24c7e2c5001da588273ad1b3ebb8ec4101333aa50000b0a485ef57979b82931a9162bc6c7c633a959446fa24ef5565d905f1867f843227fdd
-EBUILD homeassistant-pyozw-0.1.8.ebuild 1031 BLAKE2B 3f5bb98609a1b8925644f606539d1019de1b495665d5fb7a7e405c27f0ed039d955de89b4e79a6fd9a5982ccf348c5d4abf9354d8db7ecda895c7d67efa24513 SHA512 f96e2bb9f549565e60f52c2750e03d5e0cd87d89bae60558d2ccf0fbd16b080595f5f5c0f41b0b3c6af5dd225ebc35b9833ede3a5d396f5446eca2ff01b3deaf
-EBUILD homeassistant-pyozw-0.1.9.ebuild 1031 BLAKE2B 3f5bb98609a1b8925644f606539d1019de1b495665d5fb7a7e405c27f0ed039d955de89b4e79a6fd9a5982ccf348c5d4abf9354d8db7ecda895c7d67efa24513 SHA512 f96e2bb9f549565e60f52c2750e03d5e0cd87d89bae60558d2ccf0fbd16b080595f5f5c0f41b0b3c6af5dd225ebc35b9833ede3a5d396f5446eca2ff01b3deaf
+EBUILD homeassistant-pyozw-0.1.10.ebuild 1030 BLAKE2B 72db4a092775693b955cc3807a271f2c68517d6a3c097a4f9934b2c71822cb334fa3c0cb7cb96a2eac49a7dba37f4a8ae64cbb924a573386777cf233db553a50 SHA512 1a93734ab604d4e6e119501701dbe127c5986489d2c4001ee42827050d54fc955abacd1fd5ab2fb0309945c58da7ca79ff1af2b318a3821c6c771d55d79dc0a6
 MISC metadata.xml 252 BLAKE2B 507e0ddc9d50b879ff374b903b142f85d020dfd6c486aba2af84fe082c878e780edbb79188ae10104d57db0eb775c86814cc8c06891a3854c9da840a4d377050 SHA512 9470ac9c8a5a4f80e3f767e7aa198addc7b21866c63b2a310e9f41ce65817672fb77423117bdd619e99cb62322025aeadf50717e23eafabf99080fcc106820af
diff --git a/dev-python/homeassistant-pyozw/homeassistant-pyozw-0.1.10.ebuild b/dev-python/homeassistant-pyozw/homeassistant-pyozw-0.1.10.ebuild
index 93cd02cb4..63aa49fe7 100644
--- a/dev-python/homeassistant-pyozw/homeassistant-pyozw-0.1.10.ebuild
+++ b/dev-python/homeassistant-pyozw/homeassistant-pyozw-0.1.10.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/homeassistant-pyozw/homeassistant-pyozw-0.1.3.ebuild b/dev-python/homeassistant-pyozw/homeassistant-pyozw-0.1.3.ebuild
deleted file mode 100644
index 09fc6024b..000000000
--- a/dev-python/homeassistant-pyozw/homeassistant-pyozw-0.1.3.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit distutils-r1
-
-MY_PN=${PN/-/_}
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="python_openzwave is a python wrapper for the openzwave c++ library."
-HOMEPAGE="https://home-assistant.io/ https://pypi.org/project/homeassistant-pyozw/ https://www.openzwave.net/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${MY_P}.zip -> ${P}.zip
-		 https://raw.githubusercontent.com/home-assistant/python-openzwave/hass/archives/open-zwave-hass-${PV}.zip"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-S=${WORKDIR}/${MY_PN}
-
-src_unpack() {
-	unpack ${A}
-	mkdir ${MY_PN}/openzwave-embed
-	mv open-zwave-hass ${MY_PN}/openzwave-embed/
-}
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/homeassistant-pyozw/homeassistant-pyozw-0.1.4.ebuild b/dev-python/homeassistant-pyozw/homeassistant-pyozw-0.1.4.ebuild
deleted file mode 100644
index 09fc6024b..000000000
--- a/dev-python/homeassistant-pyozw/homeassistant-pyozw-0.1.4.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit distutils-r1
-
-MY_PN=${PN/-/_}
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="python_openzwave is a python wrapper for the openzwave c++ library."
-HOMEPAGE="https://home-assistant.io/ https://pypi.org/project/homeassistant-pyozw/ https://www.openzwave.net/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${MY_P}.zip -> ${P}.zip
-		 https://raw.githubusercontent.com/home-assistant/python-openzwave/hass/archives/open-zwave-hass-${PV}.zip"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-S=${WORKDIR}/${MY_PN}
-
-src_unpack() {
-	unpack ${A}
-	mkdir ${MY_PN}/openzwave-embed
-	mv open-zwave-hass ${MY_PN}/openzwave-embed/
-}
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/homeassistant-pyozw/homeassistant-pyozw-0.1.6.ebuild b/dev-python/homeassistant-pyozw/homeassistant-pyozw-0.1.6.ebuild
deleted file mode 100644
index 09fc6024b..000000000
--- a/dev-python/homeassistant-pyozw/homeassistant-pyozw-0.1.6.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit distutils-r1
-
-MY_PN=${PN/-/_}
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="python_openzwave is a python wrapper for the openzwave c++ library."
-HOMEPAGE="https://home-assistant.io/ https://pypi.org/project/homeassistant-pyozw/ https://www.openzwave.net/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${MY_P}.zip -> ${P}.zip
-		 https://raw.githubusercontent.com/home-assistant/python-openzwave/hass/archives/open-zwave-hass-${PV}.zip"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-S=${WORKDIR}/${MY_PN}
-
-src_unpack() {
-	unpack ${A}
-	mkdir ${MY_PN}/openzwave-embed
-	mv open-zwave-hass ${MY_PN}/openzwave-embed/
-}
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/homeassistant-pyozw/homeassistant-pyozw-0.1.7.ebuild b/dev-python/homeassistant-pyozw/homeassistant-pyozw-0.1.7.ebuild
deleted file mode 100644
index 09fc6024b..000000000
--- a/dev-python/homeassistant-pyozw/homeassistant-pyozw-0.1.7.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit distutils-r1
-
-MY_PN=${PN/-/_}
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="python_openzwave is a python wrapper for the openzwave c++ library."
-HOMEPAGE="https://home-assistant.io/ https://pypi.org/project/homeassistant-pyozw/ https://www.openzwave.net/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${MY_P}.zip -> ${P}.zip
-		 https://raw.githubusercontent.com/home-assistant/python-openzwave/hass/archives/open-zwave-hass-${PV}.zip"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-S=${WORKDIR}/${MY_PN}
-
-src_unpack() {
-	unpack ${A}
-	mkdir ${MY_PN}/openzwave-embed
-	mv open-zwave-hass ${MY_PN}/openzwave-embed/
-}
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/homeassistant-pyozw/homeassistant-pyozw-0.1.8.ebuild b/dev-python/homeassistant-pyozw/homeassistant-pyozw-0.1.8.ebuild
deleted file mode 100644
index 93cd02cb4..000000000
--- a/dev-python/homeassistant-pyozw/homeassistant-pyozw-0.1.8.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit distutils-r1
-
-MY_PN=${PN/-/_}
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="python_openzwave is a python wrapper for the openzwave c++ library."
-HOMEPAGE="https://home-assistant.io/ https://pypi.org/project/homeassistant-pyozw/ https://www.openzwave.net/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${MY_P}.zip -> ${P}.zip
-		 https://raw.githubusercontent.com/home-assistant/python-openzwave/hass/archives/open-zwave-hass-${PV}.zip"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-S=${WORKDIR}/${MY_PN}
-
-src_unpack() {
-	unpack ${A}
-	mkdir ${MY_PN}/openzwave-embed
-	mv open-zwave-hass ${MY_PN}/openzwave-embed/
-}
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/homeassistant-pyozw/homeassistant-pyozw-0.1.9.ebuild b/dev-python/homeassistant-pyozw/homeassistant-pyozw-0.1.9.ebuild
deleted file mode 100644
index 93cd02cb4..000000000
--- a/dev-python/homeassistant-pyozw/homeassistant-pyozw-0.1.9.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit distutils-r1
-
-MY_PN=${PN/-/_}
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="python_openzwave is a python wrapper for the openzwave c++ library."
-HOMEPAGE="https://home-assistant.io/ https://pypi.org/project/homeassistant-pyozw/ https://www.openzwave.net/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${MY_P}.zip -> ${P}.zip
-		 https://raw.githubusercontent.com/home-assistant/python-openzwave/hass/archives/open-zwave-hass-${PV}.zip"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-S=${WORKDIR}/${MY_PN}
-
-src_unpack() {
-	unpack ${A}
-	mkdir ${MY_PN}/openzwave-embed
-	mv open-zwave-hass ${MY_PN}/openzwave-embed/
-}
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/iaqualink/Manifest b/dev-python/iaqualink/Manifest
index 0514ec8eb..9c13ea3db 100644
--- a/dev-python/iaqualink/Manifest
+++ b/dev-python/iaqualink/Manifest
@@ -1,11 +1,3 @@
-DIST iaqualink-0.2.9.tar.gz 7189 BLAKE2B 4617d5a56045c6006bec73c22aadcc7f93f36975a56c0719a5178bd9332a161576523b60f9c8597c2b1b94b652574e410c788abc065bc480f91450967d37674b SHA512 7be908e32d8cc8add71eb59e82692c11b86e6cae6d08ffd85eb062a4005152efb37f4ce12ca4e0c49fb9de15f94135e71a0c54669bfaceaf70ddbaeb6eb82a09
-DIST iaqualink-0.3.0.tar.gz 7290 BLAKE2B 96c3ce575f26e1a77a82983f44824f8dda6e46bb62059c018f36491d406b99c3583a45a9b7ed7c6a2cfef9ef6b4685b29b928e4f37a3da2cb03985b40dfae2fa SHA512 520e6a95107ce89091ed3fc72610733e0ac5e8da56ca38a825fece23c1aac7307ee8a7781d0c1bcc1ba84c315a941e8b42b7035e473bfb4a0493b5e243b82aec
-DIST iaqualink-0.3.1.tar.gz 7307 BLAKE2B 0841ca5080e7a60b4a1f28f3f4d94d013d1f0c30ab67e5ed8a55d444db59b103c77bec7cadd3286cb07efbf459b2e76610c48795fbf61058e4af9b3c5fd0a8bd SHA512 99aa3abf91c0891e5ef71b925a78765510a54825ea9bfe1b07df2b8baede5feec4ffefbd492fa26e9b7824bc863373e2e8b077f9ba8faacff6b2e1f88398cd43
-DIST iaqualink-0.3.3.tar.gz 7336 BLAKE2B 95fac2847fe39ea84c20ff45dfa15d89eeb10880a132edc6de69ea5da72d1bd9bf8ae79918acd01b26855fddcc1705fa51a954cf99b9bec1570435d481a69a88 SHA512 967e68c00de59fdb8c7559f9dce4da63baee30417a7322a93d6ab2441ba0f13898dd8dc5b2c0ccea5ddfcbdd59e4071f434ab17ca609a974b178ddbc2343df7d
 DIST iaqualink-0.3.4.tar.gz 7371 BLAKE2B 52a756e6b2c6835fb3c745a2c49a2ed48cbbc5aabf1d70de0ec34f31c132da9588ec2fd31b7b04146ad2acd3d2c05f0c368c004cbcd66644b2a5e0d3e824c1ae SHA512 1a09aed3020b75e49e701935913cad338869ee71c2c0d6c55ef25370056b2866d824b636cc66c02a130cff6a680e5f53b16b90c2c0010ada0c0ee60e97f7654a
-EBUILD iaqualink-0.2.9.ebuild 678 BLAKE2B d3d927fb56e24f0ad1038e4918b726ce87bd5969743293e5c4a5445222443453e96cfba4ceedcfb3eb415cbc26a310ddf55561e0b5dd573c1feedd916b1693c2 SHA512 8c55e805575972c53f3d3db2b0edbbcd2bb8b9d0041008a617a0709c1c27c4ecfc8c6b953b30b5d7c315c64ed8cc3244e97698b5eb8d88af89a6bf9222b28915
-EBUILD iaqualink-0.3.0.ebuild 678 BLAKE2B d3d927fb56e24f0ad1038e4918b726ce87bd5969743293e5c4a5445222443453e96cfba4ceedcfb3eb415cbc26a310ddf55561e0b5dd573c1feedd916b1693c2 SHA512 8c55e805575972c53f3d3db2b0edbbcd2bb8b9d0041008a617a0709c1c27c4ecfc8c6b953b30b5d7c315c64ed8cc3244e97698b5eb8d88af89a6bf9222b28915
-EBUILD iaqualink-0.3.1.ebuild 685 BLAKE2B 472127858b39ea25fcff54c024184d5ecf923fd9bedfa358be245999e34bfb6b0bb4e79f20588ed6cc85dc6e29fdc48985853a1b7faf5e9aecdd3289b9663168 SHA512 cf83348e76069a689483682f42394f417a23eb5aecaf3260615354a1049992dff75b4305ff74fe3abef761912e67c1af987ea1b323dbe45673318a76c707f9fe
-EBUILD iaqualink-0.3.3.ebuild 685 BLAKE2B 472127858b39ea25fcff54c024184d5ecf923fd9bedfa358be245999e34bfb6b0bb4e79f20588ed6cc85dc6e29fdc48985853a1b7faf5e9aecdd3289b9663168 SHA512 cf83348e76069a689483682f42394f417a23eb5aecaf3260615354a1049992dff75b4305ff74fe3abef761912e67c1af987ea1b323dbe45673318a76c707f9fe
-EBUILD iaqualink-0.3.4.ebuild 711 BLAKE2B cfd0d5b4e45d743b6b693e4d9f283e3086c71a441c6cf9a6461b1386004eaf9d13e0f5c744f206e1ed4d2ce2d5fb78419939ac117695c348394055ed38236a7e SHA512 26a9d965ebea0348813c4bfe32b5aaa68ffac72b913a9d12e5582fe2fd8ff363d82ef976ca09e86fa12a11e2173db07c87a2afc24ec2b9853ce012197365d97e
+EBUILD iaqualink-0.3.4.ebuild 710 BLAKE2B fc8cdb871af93c37caee60bf21573b242fc1d8e8ad830e233913235f37d1e2e4d07f83e41e2166439578fc1fdc3dadffa7a8f46382b72a112869e9a418edefb2 SHA512 a9220bd4869001397a5587c37bc535b12b4a155d79ac1b3c67a98f65df0aec67286e8e8aee0f411079796c75bcfe91325abc4c35c182b155ed0e3c0ff009a508
 MISC metadata.xml 456 BLAKE2B e5ba289525a502d1065fd3043acb882f72510ce2da5fcde095982dbd0710fd18d63c945233f0f735d7415ecf89b8e45f9f7ce1e6f801f2c5f8a23591701dc337 SHA512 2dcf81bcb9a50a781877eb8d2acdd8af5fc5ec355e635646175759d66d528b8c83d3833a8bf5ffd2b3a7fc64555cdf41da28c480f08305da1831fe91f18950e6
diff --git a/dev-python/iaqualink/iaqualink-0.2.9.ebuild b/dev-python/iaqualink/iaqualink-0.2.9.ebuild
deleted file mode 100644
index f8bd973f6..000000000
--- a/dev-python/iaqualink/iaqualink-0.2.9.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{5,6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Asynchronous library for Jandy iAqualink"
-HOMEPAGE="https://github.com/flz/iaqualink-py https://pypi.org/project/iaqualink/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/iaqualink/iaqualink-0.3.0.ebuild b/dev-python/iaqualink/iaqualink-0.3.0.ebuild
deleted file mode 100644
index f8bd973f6..000000000
--- a/dev-python/iaqualink/iaqualink-0.3.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{5,6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Asynchronous library for Jandy iAqualink"
-HOMEPAGE="https://github.com/flz/iaqualink-py https://pypi.org/project/iaqualink/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/iaqualink/iaqualink-0.3.1.ebuild b/dev-python/iaqualink/iaqualink-0.3.1.ebuild
deleted file mode 100644
index 29b0dbb6e..000000000
--- a/dev-python/iaqualink/iaqualink-0.3.1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit distutils-r1
-
-DESCRIPTION="Asynchronous library for Jandy iAqualink"
-HOMEPAGE="https://github.com/flz/iaqualink-py https://pypi.org/project/iaqualink/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/iaqualink/iaqualink-0.3.3.ebuild b/dev-python/iaqualink/iaqualink-0.3.3.ebuild
deleted file mode 100644
index 29b0dbb6e..000000000
--- a/dev-python/iaqualink/iaqualink-0.3.3.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit distutils-r1
-
-DESCRIPTION="Asynchronous library for Jandy iAqualink"
-HOMEPAGE="https://github.com/flz/iaqualink-py https://pypi.org/project/iaqualink/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/iaqualink/iaqualink-0.3.4.ebuild b/dev-python/iaqualink/iaqualink-0.3.4.ebuild
index d612640e5..3eb5828d1 100644
--- a/dev-python/iaqualink/iaqualink-0.3.4.ebuild
+++ b/dev-python/iaqualink/iaqualink-0.3.4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/ibm-cloud-sdk-core/Manifest b/dev-python/ibm-cloud-sdk-core/Manifest
deleted file mode 100644
index badde6421..000000000
--- a/dev-python/ibm-cloud-sdk-core/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST ibm-cloud-sdk-core-1.0.0.tar.gz 19949 BLAKE2B 2d745cc18278e33d11d398583417744dac6aff2b5a36bf683d103b0c3a5e75c5b79cca84ca32d571016f65a6d9c62a8f188d4c67460de35bacb500ba8c899b80 SHA512 6e51256cc23c606927486862c314d537f6c43c74780f4b9e6a1427a9d5acf91f033b106b387cb284b813b0d4c5df70e0cfeac1dda1d4b9fa942879e85cf545cd
-DIST ibm-cloud-sdk-core-1.5.1.tar.gz 25497 BLAKE2B bea44933423448d74df167b91139e0d3f64fcf06a8342fcaf9f38d12462f073d473b8851aa83edeb00226702149c1cc018ac5d9e3da7bb981740db3db48a3dae SHA512 e5baacf23eff8471e6dc758a19d5b29c4a903c27829ba6adb2a56cba5d1fa8a4612322c8b16647b6dd76cd86e026a839497faeebb542525fe3f753c9bb67f741
-EBUILD ibm-cloud-sdk-core-1.0.0.ebuild 837 BLAKE2B 8181a1da0dd0bf99f65e084e3afdd35c056208b418ef862c8dcbc709eabc76e5ed24b23154cd7c1a94b41c537c69f220c52efce9ef8d589baaccbd15909252e1 SHA512 02cb88ff25f4253d377578c6115e6583cd930ce201f4bf859c9d4d66fccd1d9187faaa9c6ddaaa8de4104b8e7cb515daa3b41a18fb289a1bd7deec48165de843
-EBUILD ibm-cloud-sdk-core-1.5.1.ebuild 846 BLAKE2B a315c87db5753d89f2ce142ff6cb3fd194cb2eb29a90ff00ba433ec9cbb8344a9af48211af2c6de07901f573e8502699547c998f3c1d9dec7009a6265f39d0ec SHA512 48e8dc4911a47ea97cae9b9236de07e24ec05b7c0b3bd8481f9d70e4563dec7af3cc7598591520bd79735c8c66cdc5978dd5cd4bee7d1b9115c0b833985c8734
-MISC metadata.xml 463 BLAKE2B 20ea8839b6093a57ee2ef026ac83f4415ecfca2b976658aa5451c95d1455dc04d22aa1144edfd024455974648826289614fcab8a1c96145656f97cf6749c11cd SHA512 ee9be150baf110ae76ffce6879be884e20bd88582b5d9ac97d49a34470ef8c45698ede0d702c22e89a3e26d520757755ff423796702c15746e4a82c7cbb63e66
diff --git a/dev-python/ibm-cloud-sdk-core/ibm-cloud-sdk-core-1.0.0.ebuild b/dev-python/ibm-cloud-sdk-core/ibm-cloud-sdk-core-1.0.0.ebuild
deleted file mode 100644
index 19536bea3..000000000
--- a/dev-python/ibm-cloud-sdk-core/ibm-cloud-sdk-core-1.0.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Client library for the IBM Cloud services"
-HOMEPAGE="https://github.com/IBM/python-sdk-core https://pypi.org/project/ibm-cloud-sdk-core/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=">=dev-python/requests-2.0[${PYTHON_USEDEP}]
-	>=dev-python/python-dateutil-2.5.3[${PYTHON_USEDEP}]
-	>=dev-python/pyjwt-1.7.1[${PYTHON_USEDEP}]"
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/ibm-cloud-sdk-core/ibm-cloud-sdk-core-1.5.1.ebuild b/dev-python/ibm-cloud-sdk-core/ibm-cloud-sdk-core-1.5.1.ebuild
deleted file mode 100644
index 5495d7e24..000000000
--- a/dev-python/ibm-cloud-sdk-core/ibm-cloud-sdk-core-1.5.1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit distutils-r1
-
-DESCRIPTION="Client library for the IBM Cloud services"
-HOMEPAGE="https://github.com/IBM/python-sdk-core https://pypi.org/project/ibm-cloud-sdk-core/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=">=dev-python/requests-2.0[${PYTHON_USEDEP}]
-	>=dev-python/python-dateutil-2.5.3[${PYTHON_USEDEP}]
-	>=dev-python/pyjwt-1.7.1[${PYTHON_USEDEP}]"
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/ibm-cloud-sdk-core/metadata.xml b/dev-python/ibm-cloud-sdk-core/metadata.xml
deleted file mode 100644
index 6021cbe09..000000000
--- a/dev-python/ibm-cloud-sdk-core/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>b@edevau.net</email>
-    <name>Andreas Billmeier</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="pypi">ibm-cloud-sdk-core</remote-id>
-    <maintainer status="unknown">
-      <email>erika.dsouza@ibm.com</email>
-      <name>Erika Dsouza</name>
-    </maintainer>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/ibm-watson/Manifest b/dev-python/ibm-watson/Manifest
deleted file mode 100644
index bbf01a69d..000000000
--- a/dev-python/ibm-watson/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST ibm-watson-4.0.1.tar.gz 297685 BLAKE2B d071d143e674bc9d960d490d31e5db7ad2e75ec9793ebd2f3d3dc80365d238a41eb472db6d6e4b6af112c7edb3d4a20beb2ed6ec44a6b6a21e8018853b9982f9 SHA512 d564812633eca9929a4ea890a743c401c8980893f94f8f69f44076c0aaa149fa46f7e9aa327b54a6eba6ab5bd9534df9e7a3859765701c83878d332e2a593975
-DIST ibm-watson-4.0.4.tar.gz 297846 BLAKE2B b026e613405ff585f78dc9e0e978b149a918042a72b2d723440d07703cbf374129063a9719bde5bc4b53c3f6613a503f150e070fdb616953dec423164e027b91 SHA512 ea604d1abd0c47560774c9a5e3adacd376b4ff8ac2b1e62cc2e7e6d7e6d107ff4ccb2f67c2dd452293434c5b775c2f0c88abb7365d5cd5dcc266a24427514960
-EBUILD ibm-watson-4.0.1.ebuild 914 BLAKE2B 5819e9183ec9661ab97e63135d4b9361122250ce6e523fdd745ff57822bf71748485bc097cbb19055d21706da8c2e2d98ecaeb4e15e84de819c66809f7e8456e SHA512 0dbd95e43a1ce27e3702eca91165643e53766bbb68ad30e2392b779a8bdc40ac1b8c63d655c73a62995f64c1c60b6ffb45f5cd2d4b981b768f1aa4b6f1dbdd75
-EBUILD ibm-watson-4.0.4.ebuild 923 BLAKE2B b28920f56c30fa4ad1cd2d17fe7eb88bcf43c7676d5a0c258c517730971b50138ce3871cf7b6ceff7987ed67a3c2d54ec5069224694674c755a852a38897a6d7 SHA512 cb8d6bb9da6cc2613265795d182cba1b8e97f41a648aee0a35703b37a0c7f27ddac796deca2925bdc97f813b7a545096a8ef9837eabccd9c97755a0915f3ed68
-MISC metadata.xml 452 BLAKE2B 2805da58ec0b410d6220c44b92a625a3771103aa9b16533898b953785dcf55d9122296cedf4eca6c4dde40672fb31e76811d4eae7b8165d246918fcc0bff0275 SHA512 e0b302b28f537ad75c246e95b9c8fbc3fc9861fb63f90279a23b54e97acff5b07e2a20f1ed2bfb92a42abb16db51e7d681328fe46928aed61696a8132d3209c6
diff --git a/dev-python/ibm-watson/ibm-watson-4.0.1.ebuild b/dev-python/ibm-watson/ibm-watson-4.0.1.ebuild
deleted file mode 100644
index a127d5fa8..000000000
--- a/dev-python/ibm-watson/ibm-watson-4.0.1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Client library to use the IBM Watson Services"
-HOMEPAGE="https://github.com/watson-developer-cloud/python-sdk https://pypi.org/project/ibm-watson/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=">=dev-python/python-dateutil-2.5.3[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.0[${PYTHON_USEDEP}]
-	~dev-python/websocket-client-0.48.0[${PYTHON_USEDEP}]
-	~dev-python/ibm-cloud-sdk-core-1.0.0[${PYTHON_USEDEP}]"
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/ibm-watson/ibm-watson-4.0.4.ebuild b/dev-python/ibm-watson/ibm-watson-4.0.4.ebuild
deleted file mode 100644
index 911cf8d26..000000000
--- a/dev-python/ibm-watson/ibm-watson-4.0.4.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit distutils-r1
-
-DESCRIPTION="Client library to use the IBM Watson Services"
-HOMEPAGE="https://github.com/watson-developer-cloud/python-sdk https://pypi.org/project/ibm-watson/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=">=dev-python/python-dateutil-2.5.3[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.0[${PYTHON_USEDEP}]
-	~dev-python/websocket-client-0.48.0[${PYTHON_USEDEP}]
-	~dev-python/ibm-cloud-sdk-core-1.0.0[${PYTHON_USEDEP}]"
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/ibm-watson/metadata.xml b/dev-python/ibm-watson/metadata.xml
deleted file mode 100644
index d3225e1a0..000000000
--- a/dev-python/ibm-watson/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>b@edevau.net</email>
-    <name>Andreas Billmeier</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="pypi">ibm-watson</remote-id>
-    <maintainer status="unknown">
-      <email>watdevex@us.ibm.com</email>
-      <name>IBM Watson</name>
-    </maintainer>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/ibmiotf/Manifest b/dev-python/ibmiotf/Manifest
index 9ff07bc13..249102c6a 100644
--- a/dev-python/ibmiotf/Manifest
+++ b/dev-python/ibmiotf/Manifest
@@ -1,5 +1,5 @@
 DIST ibmiotf-0.3.4.tar.gz 55039 BLAKE2B b64f64314ffdaa89d3756f74ff5750afe243a8300d40d20c8c2641725b7ae87389eb37608207898cecc047eddec49cccadfa86acc0b98f452b3999257d014c41 SHA512 4c358fd2cffe996f0ea2c72f1b21074cd7a58efd900beed8b00c77a63372d9ec09426eda0fa8350d885f86aceda6d1d112f43d5673626572ad538cf0e725b51a
 DIST ibmiotf-0.4.0.tar.gz 71787 BLAKE2B 3c3b32422217c2373051b51b2faa6d5fe6a4fc7fc7148f13ebc3a5092f06e755b2edb512ecdef0ef21a4a8b23be2a1d3a0c3c95eb2559dc0472453c22f2a89eb SHA512 4ae3bd62612a79cd84101c7f8a5beb476e06f7f9a996eefa660df5667dcc87855d114021df9c1e19562c7b6738cfaa33ea66e542720e3a1ed5545ea8997aa6f1
-EBUILD ibmiotf-0.3.4.ebuild 973 BLAKE2B 5d6f2a29b73e09cae53412b687251c2fbcd78e8bdf62f54a6d1fab7037d71ae674fdf7eb5e93b6f3ef2d3e2ddb9885bed1bcd7d0398668e72d55ae299f70572e SHA512 4c09850495f16534e7497da55535ea3d4eccf7cab8e38e2a43b138590c64458db4141f75988ca7f52e94e52d424420ccdb6091bda1fd08c548b9451a7578f849
-EBUILD ibmiotf-0.4.0.ebuild 982 BLAKE2B f5cd1186e30c2d913607c5121fd34b5771e860f59e55b4e29d6615de6648d2bb96a5f38f83c1154661a56e59f32174cfdd31236e82b4069ef45219df4ed475ff SHA512 ccf4957af9cb0a28db6e4368e84a95316730aeb08b0078b77523816c9236976555076d4783ee68bf30354368a43195a8eb5ff2fba48939f205b22d71bb5debc7
+EBUILD ibmiotf-0.3.4.ebuild 974 BLAKE2B db24a857f89dbd397ed3b13625aed3212baafcefcdffdcea47da20a045754f600672594e59af49900147ccd78e4e30b40b716e68fdf79d04b97ea584c37097a9 SHA512 de9d1f25809e84ae6ad01cbb11309ba3dbb1a6f2ac0bcc74216873d7751295eebdab8ce3fa02ee488f4b52d3b1c157747bff6e80a81977fccb14078cb4e006b0
+EBUILD ibmiotf-0.4.0.ebuild 981 BLAKE2B e7ae2cef19a137eef83278da0352844f3852c7652e83395f3490747ada25ce64218e56fb21473c047d5e5b3aaa3e1f450c9e5c33e76bfa310425fac11a4294a5 SHA512 3af40ca0d6d8dc9bf810406e14ff13ce05545b749ac44c704f3b9ba707bf5f39e080f116f601f107e9c59adde8e39ed6822d6a6c6109d7837fb5062fda7b42db
 MISC metadata.xml 451 BLAKE2B 30d8cfad1f9eaadcc571febf22f76b1afd78466dae81c46e14883319a3586b00e949bc224dcf6cc8885a3bfdc759647dc95138708510cb5717385915f97030d6 SHA512 3fe74ad3407dbf537c284a70d43584bdf5a47f4a4a328ec000553da1d21ef9c70ebb20364475956878320c35dc23c03c91977ceff4faada6256975ac70cacb5c
diff --git a/dev-python/ibmiotf/ibmiotf-0.3.4.ebuild b/dev-python/ibmiotf/ibmiotf-0.3.4.ebuild
index c7a54c6c7..d1ae86461 100644
--- a/dev-python/ibmiotf/ibmiotf-0.3.4.ebuild
+++ b/dev-python/ibmiotf/ibmiotf-0.3.4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/ibmiotf/ibmiotf-0.4.0.ebuild b/dev-python/ibmiotf/ibmiotf-0.4.0.ebuild
index 8d7493f7e..54a5431cf 100644
--- a/dev-python/ibmiotf/ibmiotf-0.4.0.ebuild
+++ b/dev-python/ibmiotf/ibmiotf-0.4.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/ifaddr/Manifest b/dev-python/ifaddr/Manifest
index 542089e65..fad8535fe 100644
--- a/dev-python/ifaddr/Manifest
+++ b/dev-python/ifaddr/Manifest
@@ -1,6 +1,5 @@
 DIST ifaddr-0.1.6.tar.gz 6526 BLAKE2B d30b955d42d0266a197214bbe16ff2a8b11e33b4305ae9ed128fca6719e2c86026c97b278b0abaf5f5f35f4c9b744e5b500b4a4c1783dede0ebd4aedff62803f SHA512 911f81c32e808b9e61f7e98b8c67dc9b40cb64de864843cd7239f08538c9ff7cd45c8f16428b2ce200ea5f213a539c7ed8479432e02feb5e82e917f838ee0cb6
 DIST ifaddr-0.1.7.tar.gz 9281 BLAKE2B 3f7d29b69462cbf592899f1b4035685d1e9bb4535b104e6e59b41fd51c4c2681d2502ad190dae633891aec90818bb330c1f8ea403be22d154d9e7de8a5a80dab SHA512 9a428dd6bb022c8f483b77df9e9301f96e9ba64207eda8b3956a7ca5993bfe97f222c451149851135d379db1a819c75d0834566f3b6501456b2f237b0645e300
-EBUILD ifaddr-0.1.6-r1.ebuild 570 BLAKE2B 28aff2988d4bcd60dd164ede74a78dc1d37f6275754a6e16946573a0f95c26d409cd1f8b31656255ce4f8ecfa9480d25c4f3ae086baa4adb25376da1b134a516 SHA512 dddb50ec0963c0f0e4c6395a800380580674aab0ffe87632932fbe8fe87519d500238ca33be074770f2f2f30b60448cbd998491b7ab3ef54f780ecf415507b3a
-EBUILD ifaddr-0.1.6.ebuild 572 BLAKE2B 24d451121fff0cbb787051b1794324bbdd8b1d5639aac673bfc8a87367bd50947e314a7b4c42b2d5352200e108cbd2f7651d133e9ceb0b6e3f7fdf9844b636e5 SHA512 3c957b57e633f8a2397d8a8f4004905017de48ab1e062d95ae19cbe7bd351878fe000bf67f4b9d3b6c0a68ce2e1b268590761ec8767220692f0dd0fc50705bfa
-EBUILD ifaddr-0.1.7.ebuild 770 BLAKE2B db78d7394f039ec3926e5356b81379388585dda81bb94a6bdc27ecf9a3513e7e2122d15b282a2bfef636c8cb8db0d72117c2d88356a101a5164dce54242c3204 SHA512 a3a1bcab7123e24613a4762737b3ca76df6f2431b97abeaf289adedbb9c82bafd1b000fd04b28f50d18d14c1306cdd1cb4a1f45ffe16ac07a0407604ba696f2c
+EBUILD ifaddr-0.1.6-r1.ebuild 569 BLAKE2B 94821d1387032f30b8146c4ad80d759390c507c49faa1913210a0f4e5c28c2a63ba6f07860f2342e6b3e7f8a4b7e85055ca3d3d32b4e05e7f196854998037bcb SHA512 9e4f6c928a8511f1126592ec7e2093c7327eb1dafde0339cb4a965c136261df933619d489a69149845a185a9106fe7efb9fc963b6957d0d9846e79a8d01de81d
+EBUILD ifaddr-0.1.7.ebuild 770 BLAKE2B adf01c1bcfaec19c361de7ef5f2b8e1bd38f5bd5c36520cbd939dbd6634d9280f627279579dbdfe77dcce97d91147f0e5cb5c6672ffbbcf0829aa9c1274bb1b6 SHA512 17c4597644be574fe39677b852df7acbc27b1c2c04183b0a39e3b2a8ee7497669f6a1b1fee3c04aa9d17f3bbe49b6738c471b529074838369f96448927f1eac7
 MISC metadata.xml 449 BLAKE2B 0aa7a3448c5403a0c93eb9c908c5ae5db1f0462fc6b408e7402bb5a15314a9f76f5cbb0081a57c60b9a3bf002110d68a6af82bcb05fc3172372f4a724ed14654 SHA512 5e7ddb5ffcfe6535eb2ecae1b7e6af6247d2fde27dbbdefb42d96b6b25b948b6a587858d789aa986e332ef55b135799d8b80f35634ff68f956578381338fbdaa
diff --git a/dev-python/ifaddr/ifaddr-0.1.6-r1.ebuild b/dev-python/ifaddr/ifaddr-0.1.6-r1.ebuild
index 6f4b530c1..216422f57 100644
--- a/dev-python/ifaddr/ifaddr-0.1.6-r1.ebuild
+++ b/dev-python/ifaddr/ifaddr-0.1.6-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/ifaddr/ifaddr-0.1.6.ebuild b/dev-python/ifaddr/ifaddr-0.1.6.ebuild
deleted file mode 100644
index 521fdc462..000000000
--- a/dev-python/ifaddr/ifaddr-0.1.6.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
-
-inherit distutils-r1
-
-DESCRIPTION="Enumerates all IP addresses on all network adapters of the system."
-HOMEPAGE="https://github.com/pydron/ifaddr"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-DEPEND="
-	test? (
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)
-"
-
-python_test() {
-	py.test -v || die "Tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/ifaddr/ifaddr-0.1.7.ebuild b/dev-python/ifaddr/ifaddr-0.1.7.ebuild
index a9123ff33..7f3420be4 100644
--- a/dev-python/ifaddr/ifaddr-0.1.7.ebuild
+++ b/dev-python/ifaddr/ifaddr-0.1.7.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{5..8} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/ihcsdk/Manifest b/dev-python/ihcsdk/Manifest
index 44c7e66ba..3b773eb22 100644
--- a/dev-python/ihcsdk/Manifest
+++ b/dev-python/ihcsdk/Manifest
@@ -1,11 +1,3 @@
-DIST ihcsdk-2.3.0.tar.gz 5899 BLAKE2B 7e9b81dea2fb8729e5d67bfa221dbdcb9eef9c0e1a7b5380f69fefe437436c5973d11fbe7f02a0a6a6c5b9370c14d95dc6c73233dc2b8c3d80f8092d809752c5 SHA512 e1ca3f692078638f58c957f7b30bcadd101f3bf0d9b17c1595798831de7366b6f50edd83970dc0d1d71799887a5ef4d9c4fa401e2dd981e113d8c623197bb2fa
-DIST ihcsdk-2.4.0.tar.gz 5936 BLAKE2B 6a3056f5d1a53bc6c02e942a2476e3dd208b955462636b7f1a89ad99d0c1a9d7c080e09b91893d3cab244bde9297ace108ce6640a1f76bb2ccce2bf5e9fd8554 SHA512 8b24f09ed5ae61e9cd2795cb8409706da03b6452b9baf36796965bf47d9e6856462084a85f06a03f743c6a0d3877aa997ee8f2b139513a45dcaa8957f16d7638
-DIST ihcsdk-2.5.0.tar.gz 6430 BLAKE2B fd2a1407b678f366a3c9d6d10413f5ccee9230e2c9bd206cb3eac332cd42384e332d3ab576c609064b989ee8956b6d291fe713938a810129adcb09131687ba41 SHA512 0337f3547fd22179262b38b1a76030777c737044f114b5d13041abef2724244d61f1bf4c2a67140ce2ff2f5f429587b373a9adffa9c295964bb6daff27104b5f
-DIST ihcsdk-2.6.0.tar.gz 6440 BLAKE2B 2650858b7f150c8d66fa9f027f5cf4cd3f18c1555d51392e9606129f7402cbd4ff3b9bdf421cf995c0b36b77fd5aeb82febabc6f6a7877c209b2da9c412c1962 SHA512 107e533652104638daced1568a454becbcd5634b3d6e6b50d7e4f831c1e0fdc9a62514e2cde192d099ae7b44cbbd31a94a5f6b528cd1d08d53e046076cb9b8c2
 DIST ihcsdk-2.7.0.tar.gz 21347 BLAKE2B cb6a5372030de68a44eb66a57b32261ce119a7a27bf2a0bd24d0717071688d5de6109588d36aea4b97f456235ec69f4ef96ebd5d20a18133decbc6018c42ca5e SHA512 bc3c565241992f0dad4cffa6de5b43da89ad1562db0795767479c40090fe90cca174e43fda09198d6c5bff986729e4e5dfbad5af25eb28b31e42259bf92188ed
-EBUILD ihcsdk-2.3.0.ebuild 656 BLAKE2B 83c4abfe29db391d6e0f5256fac3af4c526bffe9e80a2287d4e04ec250aaf710c377e66c0caf905409599a8b7a774231da7cee4d407dddca9983a860332e1efd SHA512 88e811a953ed420fdb995440c2fc2144bcccd3ce13d31d6b0729d4806014949f877c41c65c4eb3206a3786a429e93ad7fc09ef61063438e30bde656d685bf0a4
-EBUILD ihcsdk-2.4.0.ebuild 656 BLAKE2B 83c4abfe29db391d6e0f5256fac3af4c526bffe9e80a2287d4e04ec250aaf710c377e66c0caf905409599a8b7a774231da7cee4d407dddca9983a860332e1efd SHA512 88e811a953ed420fdb995440c2fc2144bcccd3ce13d31d6b0729d4806014949f877c41c65c4eb3206a3786a429e93ad7fc09ef61063438e30bde656d685bf0a4
-EBUILD ihcsdk-2.5.0.ebuild 663 BLAKE2B 4c90ca6a30716e87422c3f8752f2a41d037113554aac05dcc7e3d6575e72707625b77dc6e85bfd75a82170641bb32a3f6fd0f7437aedb386cc7c308b437be10f SHA512 81828ab11a8a5a23bf31c63e4cc42a203582dd9e1353c187485df77f8707e04d72aac9ce9b8afa48f065497c698ade74d6a23b2600074550e6a8925f697c65fc
-EBUILD ihcsdk-2.6.0.ebuild 663 BLAKE2B 4c90ca6a30716e87422c3f8752f2a41d037113554aac05dcc7e3d6575e72707625b77dc6e85bfd75a82170641bb32a3f6fd0f7437aedb386cc7c308b437be10f SHA512 81828ab11a8a5a23bf31c63e4cc42a203582dd9e1353c187485df77f8707e04d72aac9ce9b8afa48f065497c698ade74d6a23b2600074550e6a8925f697c65fc
-EBUILD ihcsdk-2.7.0.ebuild 663 BLAKE2B 4c90ca6a30716e87422c3f8752f2a41d037113554aac05dcc7e3d6575e72707625b77dc6e85bfd75a82170641bb32a3f6fd0f7437aedb386cc7c308b437be10f SHA512 81828ab11a8a5a23bf31c63e4cc42a203582dd9e1353c187485df77f8707e04d72aac9ce9b8afa48f065497c698ade74d6a23b2600074550e6a8925f697c65fc
+EBUILD ihcsdk-2.7.0.ebuild 662 BLAKE2B 6ec4c089d4cab38107494fd6218bf84f8d44e8aa434d98248703e065cb7fecf422c8cc232995e669952b2d3968649b1db76c9a714f5953b178ef866043aaf348 SHA512 7fdb1ff8b454cd4cb58f24c8a786c9436afa275789e7941e5639fbe686c13c250503927ce7628d5debc865a35fe00e27fb5a8e92af73bd5bcc8d9dd2afa0bf06
 MISC metadata.xml 325 BLAKE2B a35c830d26ce39cdba790ad62404c670a2a84bba53c196271685536a0c4f144362abec7b54d745a28cdc69509fc2ef39bec2fd816044170e7600796ef32590a9 SHA512 f176d29da090952f204be8164634a3763c9398bd8c9396a54045f106cc6bcb4e13423db72a7abe5281f3ab69878d6a291d8e87585f990849cc37a141de71d7dd
diff --git a/dev-python/ihcsdk/ihcsdk-2.3.0.ebuild b/dev-python/ihcsdk/ihcsdk-2.3.0.ebuild
deleted file mode 100644
index 0c45f930e..000000000
--- a/dev-python/ihcsdk/ihcsdk-2.3.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{5,6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="IHC Python SDK"
-HOMEPAGE="https://github.com/dingusdk/PythonIhcSdk https://pypi.org/project/ihcsdk/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/ihcsdk/ihcsdk-2.4.0.ebuild b/dev-python/ihcsdk/ihcsdk-2.4.0.ebuild
deleted file mode 100644
index 0c45f930e..000000000
--- a/dev-python/ihcsdk/ihcsdk-2.4.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{5,6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="IHC Python SDK"
-HOMEPAGE="https://github.com/dingusdk/PythonIhcSdk https://pypi.org/project/ihcsdk/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/ihcsdk/ihcsdk-2.5.0.ebuild b/dev-python/ihcsdk/ihcsdk-2.5.0.ebuild
deleted file mode 100644
index 89ce8654e..000000000
--- a/dev-python/ihcsdk/ihcsdk-2.5.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit distutils-r1
-
-DESCRIPTION="IHC Python SDK"
-HOMEPAGE="https://github.com/dingusdk/PythonIhcSdk https://pypi.org/project/ihcsdk/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/ihcsdk/ihcsdk-2.6.0.ebuild b/dev-python/ihcsdk/ihcsdk-2.6.0.ebuild
deleted file mode 100644
index 89ce8654e..000000000
--- a/dev-python/ihcsdk/ihcsdk-2.6.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit distutils-r1
-
-DESCRIPTION="IHC Python SDK"
-HOMEPAGE="https://github.com/dingusdk/PythonIhcSdk https://pypi.org/project/ihcsdk/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/ihcsdk/ihcsdk-2.7.0.ebuild b/dev-python/ihcsdk/ihcsdk-2.7.0.ebuild
index 89ce8654e..1d4f97d41 100644
--- a/dev-python/ihcsdk/ihcsdk-2.7.0.ebuild
+++ b/dev-python/ihcsdk/ihcsdk-2.7.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/imageio/Manifest b/dev-python/imageio/Manifest
index 97c6f9796..32acd7ce9 100644
--- a/dev-python/imageio/Manifest
+++ b/dev-python/imageio/Manifest
@@ -1,5 +1,3 @@
-DIST imageio-2.3.0.tar.gz 284032 BLAKE2B adb59803e0ef80b58f587efb7c0244c354c1bdd9ce5bb56c8421602c0cf48f48bab3a043e68eb7a8962b88b99e4b0d570a2c13d700cd453a1c42e14e95f5f35a SHA512 2cea1ead0dd541d013bbf0317f4e22fef99db8c3c8c6dc6deb5c5a1ace17fb750807e455c14eb2b3bacd6fc955c58912b2d7f2ba9bc016ab1fda7b70d0c58f41
 DIST imageio-2.6.1.tar.gz 302911 BLAKE2B b0ed781b9edcbb93af664ea4e815cf90e56ab2b31abdda88dcd142558efa1c43afb89886f6b3a372fddcd200df802e45c7278fe13067bfeebf119471f573e668 SHA512 e4a4510a9fd0823914a9f511011cb9c191bea1cd78b2c2bba5d559fcdc89c55cd1dbb03a81eaf82c460ebb86cde518f44ff02766a9935d4f463e81a52007fe25
-EBUILD imageio-2.3.0.ebuild 548 BLAKE2B a3fbad829aed24d06f7b4d12fa648b0b4e0bab83fa59c9673d5e199d7e9810146ca5ad0f06cdb67d272f0f808dc2cf9f076756b3a0fdf0f95e202f8ac86ec9a0 SHA512 9c64b38ce1576fbe35901d7f0827101c1059ca7b8950ec20fc618c12c338debe204bdbb2df09c24d4d4b7d8f522318ad8b66756da6093c0eaec0195d32c87c40
-EBUILD imageio-2.6.1.ebuild 581 BLAKE2B ba9d2bda78649535054783e71279b16dfeb9889431e7845d901f2ef17810506d514f0ded3e0338ed802e7fc41ae5fc793e328122680a9c4fb7d4136534b66768 SHA512 b616e6e4704c59b4e5f79553dfa7cf14ad313cfccc819fc921e0639c27bca4820adcfd5371000bf78213521079af1c154019f4b089afcdc4164f22bfc5c5baf6
+EBUILD imageio-2.6.1.ebuild 580 BLAKE2B 65bda1b045d4e7d1d79a159bb76b4cbebd1ddb5f7adc45abf731f6d11c4cc6c8e534146b204bda7d1e5ed5f730f2a3dfc35efde30b6e71a9f04582f0a493c7d9 SHA512 da66bb484121b853818a5588bcce365e2dfd9552d71aeb1c3accab82c22af80268a7a9d4ef40bf6dc644232edc7c85841d4b605d3e07464cb396eca29d6bee6d
 MISC metadata.xml 763 BLAKE2B 27b20ebe876a614cc94676106128147bdfb59ac16e1a513b1d868922ecbf7ea8c61b4a27c973a8321a29c8f2d2dbabd92974f403d1bd036937ddca6d43117dca SHA512 b6729dbd110c5d7c977618ba6fdc7585609e4bc69f93d904a8796781273b38c9dd0e9a29e782f47e36d49dc72032d6967803f88e418a6a1ea8715c719342136e
diff --git a/dev-python/imageio/imageio-2.3.0.ebuild b/dev-python/imageio/imageio-2.3.0.ebuild
deleted file mode 100644
index be19245b8..000000000
--- a/dev-python/imageio/imageio-2.3.0.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python library for reading and writing image data"
-HOMEPAGE="https://imageio.github.io/"
-SRC_URI="https://github.com/imageio/imageio/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-
-RDEPEND="
-	dev-python/numpy[${PYTHON_USEDEP}]
-	media-libs/freeimage
-	"
-DEPEND="
-	${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	"
diff --git a/dev-python/imageio/imageio-2.6.1.ebuild b/dev-python/imageio/imageio-2.6.1.ebuild
index 5c77ce92b..fe85f40fb 100644
--- a/dev-python/imageio/imageio-2.6.1.ebuild
+++ b/dev-python/imageio/imageio-2.6.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/incomfort-client/Manifest b/dev-python/incomfort-client/Manifest
index b132de942..6016df62c 100644
--- a/dev-python/incomfort-client/Manifest
+++ b/dev-python/incomfort-client/Manifest
@@ -1,7 +1,5 @@
-DIST incomfort-client-0.3.5.tar.gz 6634 BLAKE2B db6eaacd7a165618b9f4aeb9d2607149c90c0477a6f1b06894dfc07c0db5e9c8b4ed3c84d3565140fd4140170b3589848318a5a25f08ffd8ad7135b6c6d49cee SHA512 0da288bff1e9d6764aeaadb5ee7351d01d00bcfbd2fb5af11626ad95fbf330704693756be2fc4d0fb11a937bab83ac8555bf16de6a00fa57f7403b2a90e8506d
 DIST incomfort-client-0.4.0.tar.gz 11428 BLAKE2B 872280ad10e5da7f837124d44298fb9cb8780c44621a03bccb6dabbb8a213a734aa4375a12867e6eb6822a70c2a657e6f71bd1319eff397747265daa926461fc SHA512 d6fa9322bbd7217f4a1b7c19511b9d75eb7ba80cdcf88a307d5cd279f0d00a0ef32a8a7aa1aebea4bfce4e4133e421add9e0c8a9e98ad8d2fb854dbe3d085765
 DIST incomfort-client-0.4.4.tar.gz 6342 BLAKE2B 4b3c28d3dd4ee2b0c0ad467a200a2ac8d90c3ff86295afad8aeaaa24b1251da7aa48eeb2b440d12e13acaf13accdb2b90c2ba910de16974a694873b6302e1feb SHA512 b72cbdb2c57630aa81a3d297acd3456804b32a7a12e4c7b2c9b69856f282b07d002f3a725b9095545da81502a949697780077770c8a09cdda275d741d91c9c56
-EBUILD incomfort-client-0.3.5.ebuild 1149 BLAKE2B 3d7ec0cd928301f51c845717253bd14a00533c1d7c15eac8b3dd882b673ae3ffde521a8836352f3bbfad64165da9503ce784efa4b4dee8a0482f7df3683d629b SHA512 2d9b8029b46c13c35f1d947a5fbdedb3a104a6df1f615038212a5be6a3bea9caa1bf11fce36354c9d2c44fde78b3ef5d14f4aaae8ec3d6710271ab171735f0b2
-EBUILD incomfort-client-0.4.0-r1.ebuild 1636 BLAKE2B dbf00983ba92a48527eea0e5ad8d5213002c14776e5065bf5b5f988e1cb381a171200c51b6e6ddf798047fe9c4c1dfab57c0b1f2f3f24ce0e616ce2472863417 SHA512 2c13511e4f82060a4b6538a7e5d740fd12fba4b64821ccb4a34544644362748034032689055f04915bc284b44fb541a60852d2493e5908f6520698b239f89f91
-EBUILD incomfort-client-0.4.4.ebuild 778 BLAKE2B 4f9892e3dc501d48718778824f3dcd9595d1b974dc3f024daf3828626ed630264a6300bed2e6105155a6466d93fd8752329d3a89e7a851a03d1afb1019c1db32 SHA512 31a2858fa69d3aced9cfbcd8178f77bdc225a3d0f176115ed428715a5adb7180e801c3053b830ec40b8d98f8031978a7554fd779b14c35ae338a8ca947e88c54
+EBUILD incomfort-client-0.4.0-r1.ebuild 1636 BLAKE2B 231f34a8365166127d00d9c4006ece81cde36301df2804f13dd2bf7d02967dfc1300404333324a25e6a36d4dfb982c482453924c116ef2e524443a9f5eae5676 SHA512 4f2e809e758fad062a657f7d71127b0e4b0106f46d9b2029d7dea534e6a883a4683a17bf2be55121bef44500189ec02b1dcb7a1c7cbf99bad375c9229bd9a080
+EBUILD incomfort-client-0.4.4.ebuild 778 BLAKE2B 05f81101b333b59d6aac0ab3079a800d0f9c52ef1ab02e9a6c478819ea1bc5413de09b750549a0811df40220afbfc2f29f5018ab56fff9fdf44122d58109a658 SHA512 65181116204face728a7b768c16566a049d215369894642cc10622f0fa9a7e1d970d896dbdf1dddfcaa995c4451be08eb2c22c026fd094c910c570131b83e8c0
 MISC metadata.xml 457 BLAKE2B b87fab9691b031c2d43125a13a1cb07937b5eec86ebe6f7b10cfc267b357f4ebdf902698735aa39dbc740a81b34053cc3cf89f93bda39f34a05372677b79a1e2 SHA512 82e7cd2cd956287446374c5cb23c446c0002769144370345af44f76f55047b5788db3360bc84d612aa8b30fd4185af8fc55a56034c273ef9ebd930d2b5915385
diff --git a/dev-python/incomfort-client/incomfort-client-0.3.5.ebuild b/dev-python/incomfort-client/incomfort-client-0.3.5.ebuild
deleted file mode 100644
index 3107ba5ab..000000000
--- a/dev-python/incomfort-client/incomfort-client-0.3.5.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{5,6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="A aiohttp-based client for Intergas InComfort/InTouch Lan2RF systems"
-HOMEPAGE="https://github.com/zxdavb/incomfort-client https://pypi.org/project/incomfort-client/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND="~dev-python/aiohttp-3.5.4[${PYTHON_USEDEP}]
-		 ~dev-python/async_timeout-3.0.1[${PYTHON_USEDEP}]
-		 ~dev-python/attrs-19.1.0[${PYTHON_USEDEP}]
-		 ~dev-python/chardet-3.0.4[${PYTHON_USEDEP}]
-		 ~dev-python/idna-2.8[${PYTHON_USEDEP}]
-		 ~dev-python/idna-ssl-1.1.0[${PYTHON_USEDEP}]
-		 ~dev-python/multidict-4.5.2[${PYTHON_USEDEP}]
-		 ~dev-python/typing-extensions-3.7.2[${PYTHON_USEDEP}]
-		 ~dev-python/yarl-1.3.0[${PYTHON_USEDEP}]"
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/incomfort-client/incomfort-client-0.4.0-r1.ebuild b/dev-python/incomfort-client/incomfort-client-0.4.0-r1.ebuild
index 92666b408..b522b1c0a 100644
--- a/dev-python/incomfort-client/incomfort-client-0.4.0-r1.ebuild
+++ b/dev-python/incomfort-client/incomfort-client-0.4.0-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{6..8} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/incomfort-client/incomfort-client-0.4.4.ebuild b/dev-python/incomfort-client/incomfort-client-0.4.4.ebuild
index 196d5d303..c5c3fa2fa 100644
--- a/dev-python/incomfort-client/incomfort-client-0.4.4.ebuild
+++ b/dev-python/incomfort-client/incomfort-client-0.4.4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/influxdb/Manifest b/dev-python/influxdb/Manifest
index 3162cc2c5..c21ca7b78 100644
--- a/dev-python/influxdb/Manifest
+++ b/dev-python/influxdb/Manifest
@@ -1,5 +1,3 @@
-DIST influxdb-5.2.0.tar.gz 57629 BLAKE2B b567c2f5462daab35efcd429bcfafcfcb9bb44b0ee2096beda97ddf387fa39a112490fb8a001698f5e7d39c6fa1b797cd111b8ca490cbc758d8299b90de60360 SHA512 0751521e19ddcd5c0cb0118877a863d9ba21f4be2122ca505658b4e1c1d7030179f48454adb34870eeeaceecbb221a9127d31195bf78d27d20fbef3ff3b95c1c
 DIST influxdb-5.2.3.tar.gz 62569 BLAKE2B cb171293f53fffd5ee95349e2c62a9236d0f7094506f965b25b30a8371c372a576ed8b0c86dfc8407f44249f57ed198461e0826c146860750b04b4fb98d04b7e SHA512 de62c745fdbe2d77b4f4a596a5377b8ec5c0bd0a6030b08e1b45435139efc4ade4fcdfbf71fc6d37f65cb04b2d48028ded2f14e5ad337fee5630ce8082c4d617
-EBUILD influxdb-5.2.0.ebuild 660 BLAKE2B c67280cb41643d9c9163d6b2df656a54271f1af336463afde53971758302412d5bcbcda5526265485456f999760e6d12d2956626bd1b07556fa0c62ea212cb49 SHA512 778bb835c6e1a3d0626aa25e5cd08e3da4e310416c67acff64d0c23c28d7d43ea88b9ae77e3d968a409f2916ba1d6391f86aaea83b0b553ddd831abaec0d0cb2
-EBUILD influxdb-5.2.3.ebuild 667 BLAKE2B fe36a68f64dc67ce7d51e65ff48e127d1ff6a255b80afe5ca4986ef29c46b41d0e58298a883622877cdda3a50b3a406c4680116bcd5ae88f2080b7c11f245a6e SHA512 fd888fe6cdbaa8735a182712798304c6f62e6df67888830b8c7c895149f7eabbbe467c8cae0b63e60472db4a51cc03c80b24fd2f597334f077001ca4cc531162
+EBUILD influxdb-5.2.3.ebuild 666 BLAKE2B 20a4d7d70b6c43a7c5ede00346d8bb6bf169d60c8ee1fc9d7daeead79ba48c896337d401db34577573a9365f71955a3d88d005f10b1e3427de4fdf20264ab114 SHA512 f78c7d469795646d89aafcc574c7502b5c2878232e96e7fbf3de359b02af5bb29ccabb89114e9fde4bd5a840b4f7511698c7afa44d85b7f6e17158c01964bf08
 MISC metadata.xml 327 BLAKE2B 5f98b377419f639e8119f44fe9da3b6839a19a09c33688e8affe6f7123983b0d239b5a780a7038926e8b3f26a22f70628af5410aa33ed79d4de23a58c4b09f8d SHA512 e5c2c2487aca614212e8fabae9aeedea544b98462402391fb0398579a565af5ec1b2d5d059e3ca4f59e892ec68c539ff45b6766e4810be1d82a2440fc723e291
diff --git a/dev-python/influxdb/influxdb-5.2.0.ebuild b/dev-python/influxdb/influxdb-5.2.0.ebuild
deleted file mode 100644
index 867df5d19..000000000
--- a/dev-python/influxdb/influxdb-5.2.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{5,6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="InfluxDB client"
-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"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/influxdb/influxdb-5.2.3.ebuild b/dev-python/influxdb/influxdb-5.2.3.ebuild
index afe3b4bf6..86b94fde1 100644
--- a/dev-python/influxdb/influxdb-5.2.3.ebuild
+++ b/dev-python/influxdb/influxdb-5.2.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/insteonplm/Manifest b/dev-python/insteonplm/Manifest
deleted file mode 100644
index e244a5d6f..000000000
--- a/dev-python/insteonplm/Manifest
+++ /dev/null
@@ -1,14 +0,0 @@
-DIST insteonplm-0.15.4.tar.gz 97563 BLAKE2B 0ba14cf6e190ffd6402beccca5fa64879741db2615947e1a4a60d3ae7e360e17a9bda09e87d8caffd71b849498a1fed98c07155f8674ec6b8c3d059ac8ad9bc5 SHA512 445ff7c5739cf8d82aac2bfafba6bbe6eb99f1aa83dfa4d53b6b9bbde047f62bd1a289d3010f8fb902138833c2465067838b212c111d497041e82e5f3cb0ca4c
-DIST insteonplm-0.16.0.tar.gz 95649 BLAKE2B ad303d522dd8667725d8ab9c52736a260d360120501d6237f7f384d5297c725abf5f7d4509ee48370bd0dba995d411bb85d861e2daaca252fc486688ce75e2c4 SHA512 a69448efc4518a434bb33ba19e59695027cd6107912d5ade7b0aea148d00db20acec0149f789892d79651cf0e3222522330bfb140d36b19b65bbfb23e3e9147f
-DIST insteonplm-0.16.5.tar.gz 95824 BLAKE2B 94f1c68cf1d562082e85cd617eeda35e0ecde7cd9a8f0b0b51af7090a7fdabe958ecd10d114e01c730f2dd57c288ed139d3f1b254df628016d22e838669bb546 SHA512 53f6ca364a36b27cfbfedb1883b89d271b717b53596b01182b870664d102acb767d33c35382d3153c9159cb5d56dba821a3d9bbc7e2c248b3ee03bddaa19973f
-DIST insteonplm-0.16.6.tar.gz 96063 BLAKE2B 9829bbc7baa58f5ba817bcd2eb2abe676d605ba0544e02a227118d8b7d66b1460cd4e9223ff6b5cdd9e0a4bb28c01f1d15eb612555f645fc50793b0293a05b86 SHA512 62f35675203b328671f6fde43e3af4164afc498854c628c4fb0fc8e4396b25a9e34f3150d211b694041c035028dffb558e455317006f6d178e043c66909e08fa
-DIST insteonplm-0.16.7.tar.gz 96706 BLAKE2B 6823a0b5a7d1d6ec0587e83af93c8a806084d822696326ea2d67272754606e9d4ff2d1fbcc72f31c64d4b7df4e80a8de575117eee817825bab85e1968cfe32a2 SHA512 821c608756ef85c15270aaaaa2759d0627a04fd76c0cf848cd7a613c305746e7ce4a694c68a67c09bee60da07312822a0eb6666eca8c135608a93e2f154e28ac
-DIST insteonplm-0.16.8.tar.gz 102271 BLAKE2B a04f8f9d1dd629fadcf7c42ba37aff17e9ebb4cb2215db08e66ed2424a64ff1aad70df4c73cb7c783144aa32625e2c09e31275d26c6466d18837cd9fdc0019c7 SHA512 ead21eb15e56e6dae88664ba978f28969dca4b27a3a039287c087a091f1d5e2d2507ae3bf63e00f656b2cb4c901d3acbd1bd063d2a53ed2e7d23fe5e5f240a90
-EBUILD insteonplm-0.15.4.ebuild 895 BLAKE2B 03e6586bb3603af686b9e2095ca1df00fd46b0730b09c5d4645de86b210caf0a77bac968e394ba7fa58de8226a11dfca5629c5987eba962746054910dbf649c5 SHA512 be257e82b474c9ba1842aab9af02a23a2abd6a8cdec7736967f0aec2da6d66b2b1ce96da0d7a1e5b3735aa4a16ec22b3efb09ad87dda0be567902f1a22971e5b
-EBUILD insteonplm-0.16.0.ebuild 895 BLAKE2B 03e6586bb3603af686b9e2095ca1df00fd46b0730b09c5d4645de86b210caf0a77bac968e394ba7fa58de8226a11dfca5629c5987eba962746054910dbf649c5 SHA512 be257e82b474c9ba1842aab9af02a23a2abd6a8cdec7736967f0aec2da6d66b2b1ce96da0d7a1e5b3735aa4a16ec22b3efb09ad87dda0be567902f1a22971e5b
-EBUILD insteonplm-0.16.5.ebuild 1074 BLAKE2B e707b5b6680921a2b5092110053968297e3264bbf04d5eedef1f3b8779a9ac76d78cb296cef465ee40ed2aa8327ea497223b9b3adc5c8773326c736f74570865 SHA512 9408d90d3460ee6a4c63d341b55b8d48e77ac2cfd671f2fc1b3e04bef682d594905016417790230b75349a4b2db36f502258b53e78e2adf87dc75a13a44d210a
-EBUILD insteonplm-0.16.6.ebuild 1081 BLAKE2B 47a021f046c7bd87b0f4cc56639639c548e82de21c6050c6121d91d127190b9ef8fcae4c6620b54b12a1eba11172e2f4226084ad13f6a21ae426748b77916dab SHA512 2116f5fb9675d95ab9d9045d70be3e7725d5f316d7ade912db7a0476b9fdfeed802e8962df512bc6bfe647d57fb0e4ba416b8e40d19955038781fc3844c9ade8
-EBUILD insteonplm-0.16.7.ebuild 1087 BLAKE2B 1879e4026df2083b2708d44703c06c1725b033e2388a4623e1795fdfe0c8f5b8bf661e81427dd4ed7159935c3243d70e3b61be1815ad7a4d5447c0092b5d4bfc SHA512 e6dc68a2b944d6e27945060d917737b924449f30f32b4afb98802b9cd578c7955dc69bb18ceca0c85d7857d0d7c591514fd31dbea4991d913327e6bf5a81f7fa
-EBUILD insteonplm-0.16.8.ebuild 1087 BLAKE2B 1879e4026df2083b2708d44703c06c1725b033e2388a4623e1795fdfe0c8f5b8bf661e81427dd4ed7159935c3243d70e3b61be1815ad7a4d5447c0092b5d4bfc SHA512 e6dc68a2b944d6e27945060d917737b924449f30f32b4afb98802b9cd578c7955dc69bb18ceca0c85d7857d0d7c591514fd31dbea4991d913327e6bf5a81f7fa
-MISC metadata.xml 455 BLAKE2B 26d876adc5e2585c130d09bc396612514db5ff64239c3ca84b3f272401e65e2cb65ce785b116c16c0a1b04ce6608fcabd92d239f6e0f8c79172be45c9cc56c19 SHA512 630e6269033cc88de42763b8fa09c5cfe1e0d7ceb30f6fe681df2d3fdadd5318e6133749bb36f63a53917f4601a3a824cda923d7373864cf40e3a3ace70559c6
-MISC x 879 BLAKE2B c3b8a60cd90c7925e1d3168e56ce1fc07ba03274892bd5f48002ae3fa7a91cd2834e74db7c001ca457f5eb3b7af8689df8dde4ebd22e483038f5b39638f4886c SHA512 243e2f002918da75d1806c0acabb946267401dd9cba195fec3028c79ce4f2e5762ea11ee61eec46328b655c5df0429ce083788d29d6503da14a67d3b26160949
diff --git a/dev-python/insteonplm/insteonplm-0.15.4.ebuild b/dev-python/insteonplm/insteonplm-0.15.4.ebuild
deleted file mode 100644
index cbfcc7fa7..000000000
--- a/dev-python/insteonplm/insteonplm-0.15.4.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{5,6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python API for controlling Insteon PowerLinc Modems"
-HOMEPAGE="https://github.com/nugget/python-insteonplm https://pypi.org/project/insteonplm/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-src_prepare() {
-	sed -i "s/pyserial==3.2.0/pyserial/g" -i setup.py || die
-	sed "s/packages=find_packages()/packages=find_packages(exclude=['tests','tests.*'])/g" -i setup.py || die
-	eapply_user
-}
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/insteonplm/insteonplm-0.16.0.ebuild b/dev-python/insteonplm/insteonplm-0.16.0.ebuild
deleted file mode 100644
index cbfcc7fa7..000000000
--- a/dev-python/insteonplm/insteonplm-0.16.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{5,6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python API for controlling Insteon PowerLinc Modems"
-HOMEPAGE="https://github.com/nugget/python-insteonplm https://pypi.org/project/insteonplm/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-src_prepare() {
-	sed -i "s/pyserial==3.2.0/pyserial/g" -i setup.py || die
-	sed "s/packages=find_packages()/packages=find_packages(exclude=['tests','tests.*'])/g" -i setup.py || die
-	eapply_user
-}
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/insteonplm/insteonplm-0.16.5.ebuild b/dev-python/insteonplm/insteonplm-0.16.5.ebuild
deleted file mode 100644
index 9bcf5b3b9..000000000
--- a/dev-python/insteonplm/insteonplm-0.16.5.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{5,6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python API for controlling Insteon PowerLinc Modems"
-HOMEPAGE="https://github.com/nugget/python-insteonplm https://pypi.org/project/insteonplm/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND="~dev-python/pyserial-3.2.0[${PYTHON_USEDEP}]
-		 dev-python/pyserial-asyncio[${PYTHON_USEDEP}]
-		 dev-python/async_timeout[${PYTHON_USEDEP}]
-		 dev-python/aiohttp[${PYTHON_USEDEP}]"
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-src_prepare() {
-	sed -i "s/pyserial==3.2.0/pyserial/g" -i setup.py || die
-	sed "s/packages=find_packages()/packages=find_packages(exclude=['tests','tests.*'])/g" -i setup.py || die
-	eapply_user
-}
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/insteonplm/insteonplm-0.16.6.ebuild b/dev-python/insteonplm/insteonplm-0.16.6.ebuild
deleted file mode 100644
index 1f00f9fdf..000000000
--- a/dev-python/insteonplm/insteonplm-0.16.6.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python API for controlling Insteon PowerLinc Modems"
-HOMEPAGE="https://github.com/nugget/python-insteonplm https://pypi.org/project/insteonplm/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND="~dev-python/pyserial-3.2.0[${PYTHON_USEDEP}]
-		 dev-python/pyserial-asyncio[${PYTHON_USEDEP}]
-		 dev-python/async_timeout[${PYTHON_USEDEP}]
-		 dev-python/aiohttp[${PYTHON_USEDEP}]"
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-src_prepare() {
-	sed -i "s/pyserial==3.2.0/pyserial/g" -i setup.py || die
-	sed "s/packages=find_packages()/packages=find_packages(exclude=['tests','tests.*'])/g" -i setup.py || die
-	eapply_user
-}
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/insteonplm/insteonplm-0.16.7.ebuild b/dev-python/insteonplm/insteonplm-0.16.7.ebuild
deleted file mode 100644
index 81bb6adaa..000000000
--- a/dev-python/insteonplm/insteonplm-0.16.7.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{6..8} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python API for controlling Insteon PowerLinc Modems"
-HOMEPAGE="https://github.com/nugget/python-insteonplm https://pypi.org/project/insteonplm/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-DOCS="README.rst"
-
-RDEPEND="dev-python/pyserial[${PYTHON_USEDEP}]
-	dev-python/pyserial-asyncio[${PYTHON_USEDEP}]
-	dev-python/async_timeout[${PYTHON_USEDEP}]
-	dev-python/aiohttp[${PYTHON_USEDEP}]"
-BDEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-src_prepare() {
-	sed -i "s/pyserial==3.2.0/pyserial/g" -i setup.py || die
-	sed "s/packages=find_packages()/packages=find_packages(exclude=['tests','tests.*'])/g" -i setup.py || die
-	eapply_user
-}
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/insteonplm/insteonplm-0.16.8.ebuild b/dev-python/insteonplm/insteonplm-0.16.8.ebuild
deleted file mode 100644
index 81bb6adaa..000000000
--- a/dev-python/insteonplm/insteonplm-0.16.8.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{6..8} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python API for controlling Insteon PowerLinc Modems"
-HOMEPAGE="https://github.com/nugget/python-insteonplm https://pypi.org/project/insteonplm/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-DOCS="README.rst"
-
-RDEPEND="dev-python/pyserial[${PYTHON_USEDEP}]
-	dev-python/pyserial-asyncio[${PYTHON_USEDEP}]
-	dev-python/async_timeout[${PYTHON_USEDEP}]
-	dev-python/aiohttp[${PYTHON_USEDEP}]"
-BDEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-src_prepare() {
-	sed -i "s/pyserial==3.2.0/pyserial/g" -i setup.py || die
-	sed "s/packages=find_packages()/packages=find_packages(exclude=['tests','tests.*'])/g" -i setup.py || die
-	eapply_user
-}
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/insteonplm/metadata.xml b/dev-python/insteonplm/metadata.xml
deleted file mode 100644
index cfb177556..000000000
--- a/dev-python/insteonplm/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>b@edevau.net</email>
-    <name>Andreas Billmeier</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="pypi">insteonplm</remote-id>
-    <maintainer status="unknown">
-      <email>nugget@macnugget.org</email>
-      <name>David McNett</name>
-    </maintainer>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/insteonplm/x b/dev-python/insteonplm/x
deleted file mode 100644
index 38cb3467f..000000000
--- a/dev-python/insteonplm/x
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python API for controlling Insteon PowerLinc Modems"
-HOMEPAGE="https://github.com/nugget/python-insteonplm https://pypi.org/project/insteonplm/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND="~dev-python/pyserial-3.2.0[${PYTHON_USEDEP}]
-		 dev-python/pyserial-asyncio[${PYTHON_USEDEP}]
-		 dev-python/async_timeout[${PYTHON_USEDEP}]
-		 dev-python/aiohttp[${PYTHON_USEDEP}]"
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/iperf3/Manifest b/dev-python/iperf3/Manifest
index e9f614423..2aa9508a6 100644
--- a/dev-python/iperf3/Manifest
+++ b/dev-python/iperf3/Manifest
@@ -1,5 +1,3 @@
-DIST iperf3-0.1.10.tar.gz 14017 BLAKE2B 21539e3079610bf30bd72126c90a66e322f9ae119c7e80a6759a957e30aaec0ee56f8302408f08c944f3b08ef13381b1b4f1ccb42254b4d4f0343c99ac6678e0 SHA512 94292abd149422a4debf055d1c2e90f706e6df4ec679744cfc7a76ed0504bd686c37927ad2fecd09101d78f7100f700c568cc6da52c1877d5048d9d0002cbce5
 DIST iperf3-0.1.11.tar.gz 14286 BLAKE2B 3475ec79d60fdfc8521ca66bd67a3292b1e3d1eba8c35698b0ed759b27c8ec179bb9f699e9999fb014dc25508e1920d76a6878dd34c92ca05d1399c78dd431cc SHA512 e191aec1e5f1dfd223127f06527df4a925a2958e058f36eb243d381285046b812b1543f74530b577f8b5ea027826af45c6a716e627ad033e4ae9bd26b95be3d3
-EBUILD iperf3-0.1.10.ebuild 665 BLAKE2B b03fd5c09ce7f9745a755c05b9f26a705fd1d7cf86462e254610194f311e486ac2e2ad4643f59fe01f747588e868a457e46eb1696e4fab8e84c46530dd0cf51b SHA512 6c95e9c246fafd1b2064bcac01151041e67e1fd10932b19a48d37298bdd46cf07782c5c8494003ddb961af953f878cedff21e24f238ffb1019d3ade48f0b14f3
-EBUILD iperf3-0.1.11.ebuild 672 BLAKE2B 9e329185b0636ee158a56d04c54b5bdea488594972963b74230c761580661e38c01632933b9d0d3192869a20e838518b7927e99f0c7eb7408b7eb7641ae5f597 SHA512 87a87feb81e32b02d7ed6b0ef43034461829ce926a6a49a7f801950ee8881ec064ae4900b381a8df9dfd95b5e343ccc1d3f55bc9c9bf38fde95e14702c04f1ba
+EBUILD iperf3-0.1.11.ebuild 671 BLAKE2B a6bb76ae24ddc399c1e929d54c0fb019743696dbea8c505d46c6235c3b6896132781485b56baa9acb1f6b2ea126db29df25aba45d2f26b141abb21bae0ab03db SHA512 9efd6d1e7f36cb80c3e8512fe932ab9f31206ad509962e3c3df74164ffbdb637e557429029330d3851adc0f28542ace614bce3b5f2c9a3f788337167adcfe2aa
 MISC metadata.xml 341 BLAKE2B 5b3278d3ecdb9de16cbfca30c0f013f78e03d3e9d6271eb50ec62c57710e277239d7b6dc81fd89dd021ba16146f7d1574f1832953db6099459292f32542bb6a9 SHA512 848ef3ee836281c468a82be26b5b78fb6f341be40ab98d511029faba73c560ef6b70aa753e3a2a84720eaf4012ff22204da4f788cec20c21c238c0fcfee4eff7
diff --git a/dev-python/iperf3/iperf3-0.1.10.ebuild b/dev-python/iperf3/iperf3-0.1.10.ebuild
deleted file mode 100644
index 743131197..000000000
--- a/dev-python/iperf3/iperf3-0.1.10.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{5,6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python wrapper around iperf3"
-HOMEPAGE="https://github.com/thiezn/iperf3-python https://pypi.org/project/iperf3/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/iperf3/iperf3-0.1.11.ebuild b/dev-python/iperf3/iperf3-0.1.11.ebuild
index d0a4b10ee..4586aab56 100644
--- a/dev-python/iperf3/iperf3-0.1.11.ebuild
+++ b/dev-python/iperf3/iperf3-0.1.11.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/jdatetime/Manifest b/dev-python/jdatetime/Manifest
index 1958c63e9..ae7dc1549 100644
--- a/dev-python/jdatetime/Manifest
+++ b/dev-python/jdatetime/Manifest
@@ -1,5 +1,3 @@
-DIST jdatetime-3.1.0.tar.gz 10504 BLAKE2B 22e1a22301dd71961c7bc7acaec810d0b3bfe7ca1b012bbe542cbc2c3dd4768aad6e8c7a2e45cf8efd22f38fa31a3aa57d9a6bb941b82ea50fc1ca5eea29d451 SHA512 6b038a90599117cb529db0051c228dcc4dfb6f26d2537864334cb77da90dee6c2adb0231e33d568a58a2d68e3d2e252f0e4897f34b1bb46132f199250c7fa057
 DIST jdatetime-3.4.0.tar.gz 10910 BLAKE2B 604b7d8e37cdd483bf66f902d9473db70af10cea10d89d3999d056ab8dc07b7e9e1809306d2e532ae9885e2903dc908bc9c83878892e86191301096a78889dc8 SHA512 a4f2ddb0ce794fba46b49caaa7082768ce0ec29494725ee4b84882cb757f3c63fafe4626f4aba2088fabdded631d07a02096eeee3659f002bec17334288c1658
-EBUILD jdatetime-3.1.0.ebuild 683 BLAKE2B 2aa763cdee87d94a773efa0d2bb95dc806834ac03b098f5f03cd227ca53044455c5597969ba9b43d50d68e7e39c7bd14d66b362d6cabd7b8fcd19da6c041b2ea SHA512 ddc75d04f2127f15a19a13ca69d65d5e33d38b958f3cd31e52a115e4c5336ef495536c374a599ab90a7f47a2fbda71fad3a69984482a2b0cf6fde0319b9b8ddf
-EBUILD jdatetime-3.4.0.ebuild 690 BLAKE2B 122b70fe930d1abe7da466722742960f9f5d4ea4a883b3c3c6340a82d363906e580756ac62f1b0ab0a6fa8801e9d4c702eb79dee9d96ca717f0987f4dce44d15 SHA512 fe55942c65051adb27037f8fe99c29f39709d4b2998486e53d00ace333d87dce490a77b3a3af7c2ae01779cb3f3eee7a4639db02bdfe228baa54902c16ab5094
+EBUILD jdatetime-3.4.0.ebuild 689 BLAKE2B 327144fc839f9266b43f52d194fdda49392a47fc027087847c74f7a482fa6af81eae5a2f5fead00b0a8cb1d3a143e38bcaf9030c0b4eca65737b6a10ca5ba176 SHA512 6c225abd6dec81b50808616027f4459f071aea50bdaab93cc3eea6d427de28351d486b22bcd1f46c42d483c3402f757d09bff4d23a5a6f01589d879b4f2c3d1c
 MISC metadata.xml 455 BLAKE2B 3813afbc28f35982c1fbe48e36a9dacd87cd3fd4934b9a79ae4fefc6787f00b415b8267118ab735bd9ed89324832582538f7ea18fdc2149721afdcfea4fb52c7 SHA512 662aa1431401e5dfc93bd8755fd5fcfd909121a6e9bb8013c2644d2bf5e7d1611dd2f0bec5b521773ac9a0a844bd5f66eef48804cbca8a558e5265cecf25fbb4
diff --git a/dev-python/jdatetime/jdatetime-3.1.0.ebuild b/dev-python/jdatetime/jdatetime-3.1.0.ebuild
deleted file mode 100644
index 73226e4eb..000000000
--- a/dev-python/jdatetime/jdatetime-3.1.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{5,6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Jalali datetime binding for python"
-HOMEPAGE="https://github.com/slashmili/python-jalali https://pypi.org/project/jdatetime/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="PSF-2.4"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/jdatetime/jdatetime-3.4.0.ebuild b/dev-python/jdatetime/jdatetime-3.4.0.ebuild
index c96a7d656..738be9327 100644
--- a/dev-python/jdatetime/jdatetime-3.4.0.ebuild
+++ b/dev-python/jdatetime/jdatetime-3.4.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/jsonpath/Manifest b/dev-python/jsonpath/Manifest
index efde56d46..de39acbe8 100644
--- a/dev-python/jsonpath/Manifest
+++ b/dev-python/jsonpath/Manifest
@@ -1,5 +1,3 @@
-DIST jsonpath-0.75.tar.gz 8888 BLAKE2B d75a783cd760b6bc950aa8f59aa83f823f4294cf7b18ca962be8ac7aaf1dff81dded8c9b25d4ed2549c41d465f8caba836101054605ad0a033da5453f112acb5 SHA512 ecf62c08288ad7e2a4a4c3e2be655aa7b7046b89a9917eeb4bcd3316e709626d0b6e0bd73b141c3d86bf16326abe15481178c1babeeaa4f3b9de6e1a87dfc2c3
 DIST jsonpath-0.82.tar.gz 9598 BLAKE2B 801268f111f44cd8c82fbec48ccd20e38debcac78290cd1264ce9a29b01f1a7351ca1392b7eeb646920a6e99f080a58ed594306ee52dcb744636ed58f09f8816 SHA512 a8dafea196a7752e89fa02a94812a57a2decd3ab3c3e960329f11cfac0caec17c51fb360f39d37cc10cd9c84889946c057c241378ea1b8e8e20a48f0dc967d10
-EBUILD jsonpath-0.75.ebuild 663 BLAKE2B a9adad28bd715f16a66484aa8b08fe599e940b4b437f9ae7a6bc7c77316734b798f3ed908a3e3a289c6f6c43221c082fb4b8b60504a02c3dd3f597ef15ba55f8 SHA512 511f8acd5e29f12ca3eca77e347d2df18b65dba0dac79eb18196ad9fb2b27433aa3706a136b5f115430b092215ac6d28adc331069f40c1c26d5d52ba806b893d
-EBUILD jsonpath-0.82.ebuild 672 BLAKE2B 6826e6b11f7c8c1ba1d131c556713710d07cfa1f88540b81d07958dc30276615d2267540ce0ac1cbd495257af2a0f8e10b835d9ddca8f2974dce972bccea4aec SHA512 8ed039b0d887eeac71e2021955c3dd783ce9a68bf5e06afc88cdb3df036bb961aff84c19062d26fc87cd1fdd37dc587275e5b241787d62d292952fb80f22d40d
+EBUILD jsonpath-0.82.ebuild 671 BLAKE2B 3ca75ff8ddfd99cb3e36a0e95892da82af4bb7dcaffbb1a24b3bc45f1a1c3cd83e7186ba1349176aa459885666d9760c492a5e99f4c377711ca03464c8d6dd63 SHA512 5c770c364d839deabc669c15681c9713237b848b08f7886c2a93a3b7a6ed24310e42654d50d59a8162d3eabb5a34d0a685e1a89df6b5086fcbff296eb3f34f36
 MISC metadata.xml 448 BLAKE2B e052316bcc43b25db07c11e9be78d59cb5dc5e3de8e9b8fb4342ccf17936d7ea6b5fca7d7c243941ce3ca091369ae3b0a20823cd791b16c96d4e2129600bd78f SHA512 851a4f17bc10d4c7023cceed567e7168784c0213c1f760f331ff17c1f1a2d2b094666a27c2854e201da110b2fa4f7e509d9b40a16bf0b96b00971772fbb4f99a
diff --git a/dev-python/jsonpath/jsonpath-0.75.ebuild b/dev-python/jsonpath/jsonpath-0.75.ebuild
deleted file mode 100644
index bf14cb377..000000000
--- a/dev-python/jsonpath/jsonpath-0.75.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="An XPath for JSON"
-HOMEPAGE="https://www.ultimate.com/phil/python/#jsonpath https://pypi.org/project/jsonpath/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/jsonpath/jsonpath-0.82.ebuild b/dev-python/jsonpath/jsonpath-0.82.ebuild
index 515653467..2e2232ae2 100644
--- a/dev-python/jsonpath/jsonpath-0.82.ebuild
+++ b/dev-python/jsonpath/jsonpath-0.82.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/jsonrpc-async/Manifest b/dev-python/jsonrpc-async/Manifest
index ce20f5b48..d97fbd949 100644
--- a/dev-python/jsonrpc-async/Manifest
+++ b/dev-python/jsonrpc-async/Manifest
@@ -1,8 +1,5 @@
-DIST jsonrpc-async-0.6.tar.gz 4160 BLAKE2B e471c819adb89ab79fd6b0fd47faa823e6729f5812d3fbac99118109854ec5a6fada9805d8cca80f8efe6c084ed9c0914af390254d7edaa86b475b1924a600a1 SHA512 dedfcbb707b39c86cb420f97f645de03de61fc38770e60984f94d064aa4fdc0cee76193620f45944ce46c3d5d17efaa6e9a6640f1c46e29f7b904bfa7c5d6976
 DIST jsonrpc-async-1.1.1.tar.gz 4417 BLAKE2B f28e10142186f4fc94533b3eeec04d209bb7070fcf96aba808acab8cafec2a8e822c33271b4151c0707adbbecd9a0f6766aacc8ac6d864529d55ff97f9f970c6 SHA512 55d02b3c94205587c71054ffbdbc54cfacfd771c510333a142a61acd5c538b7a541a234fcf92d4e260d3e59aad3f92ad012b305135dae395034176269fe0fc7b
 DIST jsonrpc-async-2.0.0.tar.gz 5056 BLAKE2B c7a14cef418c435b6a0ab5785d3eb1586aea9b4ada539b549f6b6ea2c793dc3044c50cd5d4e87d9428d3448ab1fb2a09375fa810eac79aa67db7c28b69446003 SHA512 bd0febe6ec5ac7922c744be5c70d8d5fc0523741c7ea1cbee2a9de62274a1a53ec6f12e3cbae7c61e5333bc4d42ec8b87f3a1b932f87927489b381eeea68ddf4
-EBUILD jsonrpc-async-0.6-r1.ebuild 556 BLAKE2B 2cc8d48779673e28983feee9a86457f742962693e40715fc7515437176c9776e6d11852fdf8aae67c24607b6a9b6dbbd6802c4c457277fb7f6b34f4934d36175 SHA512 1801bf689cdddd90a7833fc4f8bd0cde540d33c4dcb9ee27e13577499bbe45298da4a3e5910fdd16481444e39842dd4795e16f5e79ad636ba2cfbbfde5db80cc
-EBUILD jsonrpc-async-0.6.ebuild 558 BLAKE2B 45a16fcae0e01ce33a9f57996f68fe84a482a86abc3cbafdb1c0c2c1d8497461f49daa80996f977415373b445d9e4f17a721d467cf1d410171be44bbe52fed7f SHA512 91ea280ab87b38583e48c19d41a87b722b81349e62276960751b0bd8b9bdeca3b7f12570639315c478a409e5d838134be08ff544bdf46b276f449d5fa61260db
-EBUILD jsonrpc-async-1.1.1.ebuild 786 BLAKE2B 5bb845b0d5c3c1655a2ecaa589538de92cff79590d0ca4cbfd31e1408530c73919015a7f28a25ba1c86b69b51da85ae278cb72eec96f352ba90d2558a7b0835e SHA512 4f4d99d73d473e4cd196e48f9466a7c4f776101a2399fe059da63ddfbd5c161aacf4eff63585ef0ddb70b5ca31b64875da80e7747b4e6abc9a5e66c11ad54f47
-EBUILD jsonrpc-async-2.0.0.ebuild 793 BLAKE2B 6d93ee2269d6189d25b34e72543d53037120a237a044bf2715927afae8724bece09f5f3419eecc0dcf7f7968917365b12dec3dce6a22b75ab876bf81dd6397e8 SHA512 c682d2c9e55032a845f912beedd6862b532c87ded2ea21a0e0b44bb22b6d5f555587231433190c117548815580ea421b64e0d99322cc1ec1ffa5b2009b4ff82c
+EBUILD jsonrpc-async-1.1.1.ebuild 786 BLAKE2B 33d25b2f33446190aa6a8a4faa577503dd60b13c08267a75b1a23867bba92b747b6ee6c1405c9cfa5a72679069b8b06b031a073ba1224e047224122ba3c24585 SHA512 e4819b24fe621aa6d845e704f53f1f3107ab25cda14fd25246c111027b249ac4eb917ee85f42474066e49392e4bbd7f49cd0de483cc85598ee0bccc36af4ef1c
+EBUILD jsonrpc-async-2.0.0.ebuild 793 BLAKE2B 91238dc567aef6d24739feb60e9b0aa4a8c696a3a9587dc174d5581b287f1435ae0a41e0200e300adea689d3aa900056149ba3bf748df8a87c3b6734f0ccaee1 SHA512 7477013a5c5b2e11dd205ff6f71ce82f9f986910ed64e5f5c426ffd64618949ba2731080efacaafa91ea77bcd47b26761693b5cb85c58d6972fb9e01a46c0337
 MISC metadata.xml 452 BLAKE2B 69f68db5dd551a678811716a38bea6682c89dd3b4d4a8009edf3112d766a6d2d01d2226a97aa51e5734723311222a75771c74b95b7f16d405c0a7fb4da6d6bcf SHA512 03768a072b2821093e8eac694d1c48ad231762c1ceac5a7d4eded2a92f8f3d4c8de5f286701f3bc87c1935f89286bc64fcaafc1800d036596abb3a4ed9bf5b03
diff --git a/dev-python/jsonrpc-async/jsonrpc-async-0.6-r1.ebuild b/dev-python/jsonrpc-async/jsonrpc-async-0.6-r1.ebuild
deleted file mode 100644
index 3ead3c732..000000000
--- a/dev-python/jsonrpc-async/jsonrpc-async-0.6-r1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit distutils-r1
-
-DESCRIPTION="a compact JSON-RPC client library for asyncio"
-HOMEPAGE="https://github.com/armills/jsonrpc-async"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 x86 amd64-linux x86-linux"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND=""
-
-python_test() {
-	unset PYTHONPATH
-	nosetests -v || die "Tests failed"
-}
diff --git a/dev-python/jsonrpc-async/jsonrpc-async-0.6.ebuild b/dev-python/jsonrpc-async/jsonrpc-async-0.6.ebuild
deleted file mode 100644
index 0f1dc774e..000000000
--- a/dev-python/jsonrpc-async/jsonrpc-async-0.6.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
-
-inherit distutils-r1
-
-DESCRIPTION="a compact JSON-RPC client library for asyncio"
-HOMEPAGE="https://github.com/armills/jsonrpc-async"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND=""
-
-python_test() {
-	unset PYTHONPATH
-	nosetests -v || die "Tests failed"
-}
diff --git a/dev-python/jsonrpc-async/jsonrpc-async-1.1.1.ebuild b/dev-python/jsonrpc-async/jsonrpc-async-1.1.1.ebuild
index 26ebcf3d7..0b698fc22 100644
--- a/dev-python/jsonrpc-async/jsonrpc-async-1.1.1.ebuild
+++ b/dev-python/jsonrpc-async/jsonrpc-async-1.1.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{6..8} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/jsonrpc-async/jsonrpc-async-2.0.0.ebuild b/dev-python/jsonrpc-async/jsonrpc-async-2.0.0.ebuild
index f02ff79b5..5a16565a0 100644
--- a/dev-python/jsonrpc-async/jsonrpc-async-2.0.0.ebuild
+++ b/dev-python/jsonrpc-async/jsonrpc-async-2.0.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/keyrings_alt/Manifest b/dev-python/keyrings_alt/Manifest
index 82bc3be88..0bd00942c 100644
--- a/dev-python/keyrings_alt/Manifest
+++ b/dev-python/keyrings_alt/Manifest
@@ -1,7 +1,3 @@
-DIST keyrings.alt-3.1.1.tar.gz 28193 BLAKE2B 3e209880009aa129646e5b21c622851ca49177782ad231085834f7b1d73abfa15d9207561395d0cddfc1abe9e0daa180f953e6b7b895eddcfedc1e01ca94ab00 SHA512 5d8a64788888261863c5001d0fdad4e817fad765ea8c2c4967db63e62fde3364476f333ece66cf2e44634149d23062d076b97b18a3c8703bddaff8ac7d7933cd
-DIST keyrings.alt-3.2.0.tar.gz 32000 BLAKE2B c53c79e173ff513124bb90ad828d76894d10e72538ab9f5b307085e4a08af42d1463ab31d3ed69438d3b1b1b4c25400e57e8cec1e3910c0e50012b99a35e896c SHA512 972f5622775de404dd71b318df36136b13e1bca6ccaac23e4250afb1a5f4e0d1772fd63b7abaeda152b4420765e2a393a2b93adeb6469821c4efc5ac9d526dcc
 DIST keyrings.alt-3.4.0.tar.gz 31630 BLAKE2B a35346df32697c2eed3e592c28664d8984a6d03d591c01828d79da68018d2b1b52fa563502db4e46b81d39f950e86c35ef7dfd69021478538509ebd9020a2bfe SHA512 4a8d9e9721163a696a0f7dbdff94d8f5cd61ea023824a9a5f60e4c422a3b1002ee7e3f610cfe618ef755354cc3275095f262ef2f510257f96c04a6fd9a0037e5
-EBUILD keyrings_alt-3.1.1-r1.ebuild 1032 BLAKE2B ea08a95c4696cf1012a68c152a6573daed288358acad9f507450a2363ce007e83a0ed1f7e627b3b931849069bef40192523c7d2d2b1488e54c76f45c392f84bb SHA512 882ac334cb6f4422cfb022d007ea1a1d4367bc6ca8397789e51c5844adfa0ac824a9c03e41b3f24a84c902b3dbbb3f9a6d7bb568afb66ff972397de8d71137e0
-EBUILD keyrings_alt-3.2.0.ebuild 1032 BLAKE2B ea08a95c4696cf1012a68c152a6573daed288358acad9f507450a2363ce007e83a0ed1f7e627b3b931849069bef40192523c7d2d2b1488e54c76f45c392f84bb SHA512 882ac334cb6f4422cfb022d007ea1a1d4367bc6ca8397789e51c5844adfa0ac824a9c03e41b3f24a84c902b3dbbb3f9a6d7bb568afb66ff972397de8d71137e0
-EBUILD keyrings_alt-3.4.0.ebuild 751 BLAKE2B 7a9295f4a3dac5bce44b334f806ed65964497e587f0eb9aaf2241938d66a1d7e3041ae8f425699cfcde4b9e2dfb97a0515c94221ce4b93129ae3c870c9f04fcf SHA512 60fe9496e363d901c9a785fa6dac24150cd72599d77b30829e0ebc6cbc9d66f21b076f7c1dfd0c4bc370e7798acc5d093f1e218ea2a06fe48594e4e2ce56aaf9
+EBUILD keyrings_alt-3.4.0.ebuild 751 BLAKE2B 18f55da85cf5e74e9884ad113bb36c5e88e2f9f8899c5033e26d11ef3def1d55592f5408e5de0bd40ff9eaeafb42835eea49e8ed4a8a9aa50d7203ad4b37d2df SHA512 ee3f22c4c62b6fd2b97625ec46cb7175ec8428492f5522bc0a50cfc8af5e7dac3188a5da8d9194b975bfc31e94c6751f8eb5387e9c20a2a331c67d6b7b1d6a46
 MISC metadata.xml 457 BLAKE2B 7c7f67b3b13220d278e8c85fe689697f22472769caf0e912a9c2f43e8c072fe3b24895f8bca577186d726fd2aa8dc0d7f3e5d0033799a8144c48a6c2c32a27f2 SHA512 9d74dfd683743244c7ef2c9192a49ca7c3aa0d58977049030f105cc8fe93e2ab4bcc7af21c77a40e1664e81c3597a49814d8c28c721275d44413dec52dfde312
diff --git a/dev-python/keyrings_alt/keyrings_alt-3.1.1-r1.ebuild b/dev-python/keyrings_alt/keyrings_alt-3.1.1-r1.ebuild
deleted file mode 100644
index 914eec754..000000000
--- a/dev-python/keyrings_alt/keyrings_alt-3.1.1-r1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit distutils-r1
-
-MY_PN="${PN/_/.}"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Alternate keyring implementations"
-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"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/setuptools_scm-1.15.0[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/fs-0.5[${PYTHON_USEDEP}]
-		<dev-python/fs-2[${PYTHON_USEDEP}]
-		>=dev-python/pytest-2.8[${PYTHON_USEDEP}]
-	)"
-
-S=${WORKDIR}/${MY_P}
-
-# Multiple failures
-RESTRICT=test
-
-python_prepare_all() {
-	sed \
-		-e "s:find_packages():find_packages(exclude=['tests']):g" \
-		-i setup.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	py.test -v -v || die
-}
diff --git a/dev-python/keyrings_alt/keyrings_alt-3.2.0.ebuild b/dev-python/keyrings_alt/keyrings_alt-3.2.0.ebuild
deleted file mode 100644
index 914eec754..000000000
--- a/dev-python/keyrings_alt/keyrings_alt-3.2.0.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit distutils-r1
-
-MY_PN="${PN/_/.}"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Alternate keyring implementations"
-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"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/setuptools_scm-1.15.0[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/fs-0.5[${PYTHON_USEDEP}]
-		<dev-python/fs-2[${PYTHON_USEDEP}]
-		>=dev-python/pytest-2.8[${PYTHON_USEDEP}]
-	)"
-
-S=${WORKDIR}/${MY_P}
-
-# Multiple failures
-RESTRICT=test
-
-python_prepare_all() {
-	sed \
-		-e "s:find_packages():find_packages(exclude=['tests']):g" \
-		-i setup.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	py.test -v -v || die
-}
diff --git a/dev-python/keyrings_alt/keyrings_alt-3.4.0.ebuild b/dev-python/keyrings_alt/keyrings_alt-3.4.0.ebuild
index 42474df14..edb122514 100644
--- a/dev-python/keyrings_alt/keyrings_alt-3.4.0.ebuild
+++ b/dev-python/keyrings_alt/keyrings_alt-3.4.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{6..8} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/konnected/Manifest b/dev-python/konnected/Manifest
index 1da65d14b..3167ade52 100644
--- a/dev-python/konnected/Manifest
+++ b/dev-python/konnected/Manifest
@@ -1,9 +1,3 @@
-DIST konnected-0.1.4.tar.gz 3363 BLAKE2B 65088de1c87f6ed23570467112e3843ab00dc2dd10fc7c0ff971e58c009970e8ad8c787db844fe576f659752fe801e98316a45f1286cb9c156fd03bd92e5d084 SHA512 5cfe038341df5ad6b881df833cc4a52e12c1db540cf23fc1b1d8cdadc98b8a8c2928c5837c8bff757c6e26d0e4ed0cc92581952688605ca0cd3de8d12eb8acd3
-DIST konnected-0.1.5.tar.gz 3349 BLAKE2B f1e82b19294d13f569ec9c3a1150c9695812617126d15aee40b5b43d4cd8ef14223c1799273cb1001756a8bc7ed80137743cefcfb007190facf9a5b5b397e8ed SHA512 169ec2cfa50c0e214c69fa2f5391353a369bf51e2c848c79d050dd4de826907ee561dd1896af401789b57792f119429c091cc4ca9630c5ae886530797572449d
-DIST konnected-1.1.0.tar.gz 3185 BLAKE2B 84a96ef68e71bda9194d5dab157d010bcdb15c90e2f4f09d07c62d379f61192a474a3116de2f3b9c6f1463012b77c2ed6a7b1b023af557505ea84ebfb5c8e238 SHA512 d16e1a2daf32f8c5e329a27af28b631d4e042a58f1a103db3ef8f3e3026ec5b5f0648c9a8cc77f698dc67e99b36be64437995a9569489fe1a7ddbe1dc024d9dd
 DIST konnected-1.2.0.tar.gz 3386 BLAKE2B e5bbc2b32fc25da270ee0d1476a7dbdbb6ff221e249894deb9f676d2f088ce628a606d85aa4c45a7c41202b8155780590f10396850181b1a743711c49ed27881 SHA512 3e844a68183cea92a042f9850f14775eb585de43530a8da5a76193a9e9cd37e0189877f481c2182c39ab4ca4c703abc092baca2ef73d1161238cb7f7215dd876
-EBUILD konnected-0.1.4.ebuild 749 BLAKE2B 47289f92e90fe75857c96ad27b86e58fcfce46c81c380681a33966bf0d50d51a21db547434f8b195acbf1c7c5103a2504815a9d1a359e4ca887aae91d398996e SHA512 fc864cb55d8216546a91160fe85636557af7a51bb22b480f43c2d054acba514d67a2b671989b5184b5501e1af652b9bca0ec8c944ec6d8160b4aaddabd20b754
-EBUILD konnected-0.1.5.ebuild 756 BLAKE2B a43ecf4b368eee6738759b45fa1ce57512cadaca4dc2617a68f9fc0be94a668b6e5a490db5efc0feef1214473b2f8db1a4d768a1f005cea0abf3950d6b9f1d60 SHA512 adcc13c04d2c7c9775a922ea43447301e16a2c6b35f71c3ecd070049d697bd9959bdc26345aaf3897f869ef33c8c73dd73e06f7d00d5d987588342e5bc614765
-EBUILD konnected-1.1.0.ebuild 763 BLAKE2B c968288725190225b7d001a726fa59c8f003f7f311b95e51b053132457ec55fd7a8a94e4fc0f5597a06d5bd0585cedadf6c200045bae1e134eb8fa45581a268a SHA512 ea4c0ba5c74557220e93e2cee2a907435bb168e4ab121872bba81612639733972c930ed0d95a4e5a3cb4b143ce751e5b2039c914c7e40daad970e90cc72677cc
-EBUILD konnected-1.2.0.ebuild 763 BLAKE2B c968288725190225b7d001a726fa59c8f003f7f311b95e51b053132457ec55fd7a8a94e4fc0f5597a06d5bd0585cedadf6c200045bae1e134eb8fa45581a268a SHA512 ea4c0ba5c74557220e93e2cee2a907435bb168e4ab121872bba81612639733972c930ed0d95a4e5a3cb4b143ce751e5b2039c914c7e40daad970e90cc72677cc
+EBUILD konnected-1.2.0.ebuild 762 BLAKE2B 2757135d33889da455e45cee558ff9373c82794177619034082c6b35133fde7cec91524963e88d6af50183cbba26e14032177e07eafc20e26b2e65be29a60e97 SHA512 6ce04b5164e7225e8b177ec96364e7f3ee1702b2a773a16cb9be863558d1baf1c7b7b31e3aae4dc35e4cc1ade3346ddda26c92a6f25340146d5124582f177eaf
 MISC metadata.xml 351 BLAKE2B b0beff437a632caa4bd7e1352f3637e0177976053c50b7230c9de199c1a820879897fd48f1283d49f3377997f8613dc77d8a01b7dd35092f94d26f686b15107b SHA512 4e6615499b655fe6892eef0082dd963e1844b5445d658d6d699fb41225203c4614a3d6d45ed8d6d69d603704e67510ddda68ff70840d19861ce8f04c020dd29a
diff --git a/dev-python/konnected/konnected-0.1.4.ebuild b/dev-python/konnected/konnected-0.1.4.ebuild
deleted file mode 100644
index 19192379b..000000000
--- a/dev-python/konnected/konnected-0.1.4.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{5,6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Library for interacting with Konnected home automation controllers."
-HOMEPAGE="https://github.com/konnected-io/konnected-py https://pypi.org/project/konnected/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND="dev-python/requests[${PYTHON_USEDEP}]"
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/konnected/konnected-0.1.5.ebuild b/dev-python/konnected/konnected-0.1.5.ebuild
deleted file mode 100644
index 35f32e97a..000000000
--- a/dev-python/konnected/konnected-0.1.5.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit distutils-r1
-
-DESCRIPTION="Library for interacting with Konnected home automation controllers."
-HOMEPAGE="https://github.com/konnected-io/konnected-py https://pypi.org/project/konnected/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND="dev-python/requests[${PYTHON_USEDEP}]"
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/konnected/konnected-1.1.0.ebuild b/dev-python/konnected/konnected-1.1.0.ebuild
deleted file mode 100644
index 8c7b561e6..000000000
--- a/dev-python/konnected/konnected-1.1.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit distutils-r1
-
-DESCRIPTION="Library for interacting with Konnected home automation controllers."
-HOMEPAGE="https://github.com/konnected-io/konnected-py https://pypi.org/project/konnected/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=">=dev-python/aiohttp-3.6.1[${PYTHON_USEDEP}]"
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/konnected/konnected-1.2.0.ebuild b/dev-python/konnected/konnected-1.2.0.ebuild
index 8c7b561e6..e4253b001 100644
--- a/dev-python/konnected/konnected-1.2.0.ebuild
+++ b/dev-python/konnected/konnected-1.2.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/libpurecool/Manifest b/dev-python/libpurecool/Manifest
index 6ba1117cd..12d2f310c 100644
--- a/dev-python/libpurecool/Manifest
+++ b/dev-python/libpurecool/Manifest
@@ -1,11 +1,3 @@
-DIST libpurecool-0.5.0.tar.gz 36369 BLAKE2B d48608084d539374bc42ed8dfe4590d63f030a476e98be3bd0c83d8fcc01f032a9da07d300aaca09b9dc1dcb2de15db763cfd323d87a636792d09651f91cf9ee SHA512 4de263b0b622dfec188a44402a76defa2ebcbb5ad73844617eab1080009d5eb8cfda7cfaa12e0b0d690e07eb0725f28eb29d208066ea87e1f66e66ec34d30b16
-DIST libpurecool-0.6.0.tar.gz 36569 BLAKE2B 18fa4881c028e81e5274afa55e8c5e6dd635a768c2904da4a27e3efa7977f86b3dabb5b1bdd010470177cce08af650fe2ff3f4f9b87d22d6359b5fba03570420 SHA512 e481397d926920c0e7291025173e87f29e2fe67612edda8bfc2b1ddce9b0ea347bb4f3c7d7c21122f88f0e9884d2b9f8715e19a6c7307222017545b6f330b212
-DIST libpurecool-0.6.1.tar.gz 36762 BLAKE2B f5b1bbaeba353e2ccc6146804596e09338aeed75f02de86a7534fd757f88de41dc5eb693ff4a97b9f8bbabc5ccf5f617b9fe1434428e60d8ccc4b9a8c29cbcf7 SHA512 5575af5a18c162686330b224a1d48e87158435c9fd25b2a3119113f203608c2f218cc0ff62e826bf38e9940093ed7f41444f10f39679ca0ef559762f4a4454c9
-DIST libpurecool-0.6.3.tar.gz 36881 BLAKE2B f9f56b308cb3ddc4f3584b364255a2844d2b64965077dc1edb5d70a76333f91dd895638b8883e24d13446060fa872cb64cae0da43b9700849f479650fc632c38 SHA512 b5baa1c5dcb3f5baa390d1429be32299954cab407ea55b5eb19dc40c235e34256243f90ef05167fb87bc48476e8872c5be63cb1946b8f21b536e1356b1c602f5
 DIST libpurecool-0.6.4.tar.gz 36963 BLAKE2B 9cefd670e6883bfc542a4a0a57bb334c0e7e7118918f28b81a07c6e875e8a65ea0b63fcbceae9c19dafae560583a9a8a73d027f0d7c7c975b9516b513fed9f68 SHA512 d1658f0d603848c8730de5571dd884edbc895245af463aae2078687f42563bd31ebf4ee82b97bfd792888b183b3e24b839f930d031ad3880c3210b31eac8911b
-EBUILD libpurecool-0.5.0.ebuild 723 BLAKE2B edf0a82dc7bfbc9bcb0a7a6fbcfc01445484354c75dc23e33da2138c62f8100a34a4d8adb9e75b2fe1401cb4c7d2c82dae955eb4da2400e1799d67ba63073af8 SHA512 de0792d8e460514d58f700d90305c66de19e31ba5454352538eef97dbf15b1b0aa817f5d9de1cbbc25eaf15e61b0ab63526e63d9a93f6a4d76e3a96f2642e4ae
-EBUILD libpurecool-0.6.0.ebuild 723 BLAKE2B edf0a82dc7bfbc9bcb0a7a6fbcfc01445484354c75dc23e33da2138c62f8100a34a4d8adb9e75b2fe1401cb4c7d2c82dae955eb4da2400e1799d67ba63073af8 SHA512 de0792d8e460514d58f700d90305c66de19e31ba5454352538eef97dbf15b1b0aa817f5d9de1cbbc25eaf15e61b0ab63526e63d9a93f6a4d76e3a96f2642e4ae
-EBUILD libpurecool-0.6.1.ebuild 730 BLAKE2B 26368a8d7269e8ee04c9e252b703aafcce01a4f79376473e061ba4c43f14fe765e1b21a101942ce22c86cf28de31dff5a2f09a2b61a2682b7baa507c0cc127d1 SHA512 566e74b8dce1e54c2af6ef45e3d59a0aa26f134d38348a60204e11ea605dd0b42f15443d8e54b5566050592a9a1afa9fa992f6cfe1e35a5d83d751ef2f1fb642
-EBUILD libpurecool-0.6.3.ebuild 730 BLAKE2B 26368a8d7269e8ee04c9e252b703aafcce01a4f79376473e061ba4c43f14fe765e1b21a101942ce22c86cf28de31dff5a2f09a2b61a2682b7baa507c0cc127d1 SHA512 566e74b8dce1e54c2af6ef45e3d59a0aa26f134d38348a60204e11ea605dd0b42f15443d8e54b5566050592a9a1afa9fa992f6cfe1e35a5d83d751ef2f1fb642
-EBUILD libpurecool-0.6.4.ebuild 913 BLAKE2B 76d64e5047a3e8d90d5278d6c376da775c3a9b050d32bc86906d75c8d2edabf2a48433825e4374debc6b461e28532910be4255df39c306aa7806662405a4ce66 SHA512 02a4a2afd1d5b883ccaf24fc6004978d582e6768f7852766d285eb6fda9f920b1d693c54747b0ed161a8fdfab1128a2fc179ac1d01d8c857adfaf3e4531cd98d
+EBUILD libpurecool-0.6.4.ebuild 913 BLAKE2B 7d6380e4f95fd671c3c3d07d8774075d01cb1fa25f70182743204260c19a602a04fba722f730f4d5fa95128fb5d12ec20e0dea5b7bf8840bfe6ddacd251734c8 SHA512 a7c473a80c6cb0a1fe62ea09c0146ae763b3e64de956050479b40d4ce0ac14b551f34b401ab828a08bf1bb43df4d2c9b1b7d2e3aa3884d3f6e0e0f43f676c708
 MISC metadata.xml 465 BLAKE2B ad78af533aa8ea24a0851499e07e4c0a107baba2f3ffaf85710044add0096ce89fe147f0be394f28d55c6859286561ccd270efc9d35326541c6f1d1893e3b696 SHA512 9429922cac138e584a47543c1642aa8a0a93f820b44ed348caa5ae754c7a8061bb69bd357b5de9fa7a8c7d768fd99b4fa6062d21f575654515c1080e5535904a
diff --git a/dev-python/libpurecool/libpurecool-0.5.0.ebuild b/dev-python/libpurecool/libpurecool-0.5.0.ebuild
deleted file mode 100644
index 05a038216..000000000
--- a/dev-python/libpurecool/libpurecool-0.5.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{5,6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Dyson Pure Cool/Hot+Cool Link and 360 eye robot vacuum devices Python library"
-HOMEPAGE="https://libpurecool.readthedocs.io https://pypi.org/project/libpurecool/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/libpurecool/libpurecool-0.6.0.ebuild b/dev-python/libpurecool/libpurecool-0.6.0.ebuild
deleted file mode 100644
index 05a038216..000000000
--- a/dev-python/libpurecool/libpurecool-0.6.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{5,6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Dyson Pure Cool/Hot+Cool Link and 360 eye robot vacuum devices Python library"
-HOMEPAGE="https://libpurecool.readthedocs.io https://pypi.org/project/libpurecool/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/libpurecool/libpurecool-0.6.1.ebuild b/dev-python/libpurecool/libpurecool-0.6.1.ebuild
deleted file mode 100644
index 9a7da122a..000000000
--- a/dev-python/libpurecool/libpurecool-0.6.1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit distutils-r1
-
-DESCRIPTION="Dyson Pure Cool/Hot+Cool Link and 360 eye robot vacuum devices Python library"
-HOMEPAGE="https://libpurecool.readthedocs.io https://pypi.org/project/libpurecool/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/libpurecool/libpurecool-0.6.3.ebuild b/dev-python/libpurecool/libpurecool-0.6.3.ebuild
deleted file mode 100644
index 9a7da122a..000000000
--- a/dev-python/libpurecool/libpurecool-0.6.3.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit distutils-r1
-
-DESCRIPTION="Dyson Pure Cool/Hot+Cool Link and 360 eye robot vacuum devices Python library"
-HOMEPAGE="https://libpurecool.readthedocs.io https://pypi.org/project/libpurecool/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/libpurecool/libpurecool-0.6.4.ebuild b/dev-python/libpurecool/libpurecool-0.6.4.ebuild
index 89bd4d990..d65a30aae 100644
--- a/dev-python/libpurecool/libpurecool-0.6.4.ebuild
+++ b/dev-python/libpurecool/libpurecool-0.6.4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{6..9} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/libpyfoscam/Manifest b/dev-python/libpyfoscam/Manifest
index e2e41446e..f9c48a056 100644
--- a/dev-python/libpyfoscam/Manifest
+++ b/dev-python/libpyfoscam/Manifest
@@ -1,5 +1,5 @@
 DIST libpyfoscam-1.0.tar.gz 21421 BLAKE2B aa0171e7e8e7efc9595367523dd4d4f801d858278543a7206ae6e27409afd8e62365ef2d15db7d38e3f61077032dc20c235c025b79377ebf74be3b523e98c2ac SHA512 2813c3f134bbf3cb0ffc18abcbf847b3652ad04cb59c07051b91131f11ef2ac025eebc8cbb398c0f5d542307f309599a5a5a85a6699c5ee31829adf4af874be9
 DIST libpyfoscam-1.1.tar.gz 7971 BLAKE2B b7add94c8a2bfae688e5eaa4107d878ea9c0e585c9cf0e442fb060bae140a4cbef6b90acf91de1273ccf7d213f5421b74abdab5627ca4a8e5f63cbfcf483a16c SHA512 8c8c8bccb235f921827d4accccb0e7d805a9f2bba5805019188e3a8416dc5d45b45473015d95f4b2acc10d07bb61b867bd90c4f3dcefcc371bcf6f68e29e3565
-EBUILD libpyfoscam-1.0.ebuild 779 BLAKE2B e62097f7d00e36636113c24abd004d00ad22db93202affe7716a84d1d5feb1db67532289269a7f46849913652756a0648ad3da5a51ef7e13cd9c5ea8f10d48fb SHA512 9d028a5dd91bd419b079d094aa8805cf2ff3aea282fce5ce694e8ddf18a44dee10b6271134d44bf6561192b802e903f33b4ea0484de1ae68792b58c4e7f442ef
-EBUILD libpyfoscam-1.1.ebuild 696 BLAKE2B 3f27ec4e3a556328d2c0c68c2e05ddf838c8a4ce859273e335c001f87aad0a621e9aa3c5c48641c52892a4d1e3cad690ffe4f6853240ca20898fc8d0247cb33b SHA512 1749ffe47d7e7a8051da38af40b59ba436afd5fbf885182a70b3ed12d0cfdeb091655010f674faedb88ef1979e742a49a4eee9e8cf52bfc8d2ef75ea08b3ec99
+EBUILD libpyfoscam-1.0.ebuild 780 BLAKE2B 1d3f14078b3044eec4e7c22a60b361b1e90298943fadd407db6745be1f1e17f863d330ce1923b0c5b10f3e790be4d0bef440244935823aa8920c8b1b62e0c74f SHA512 f819b352b1be62535af96323ce8d8f531f9493c66d88d7616b2f07cd408430bc747bde1b1181f0d115130b73cb25cdf4f06cba3cb955f5ef7bbe7d6e53d42037
+EBUILD libpyfoscam-1.1.ebuild 695 BLAKE2B 3104f4ba2052e72d1ff4a01300f2f38447f708244786202aafadc091f3f27aa05613490c61f9b41f109f377e8afb97308bc9f0ae784efcece1d5fc3a76aae0b2 SHA512 ff27b3f856f6be74294af97ab15a93b9318b99257be55e8cdf69d8a405fcb7e7bfab68b97e7b1bf730b5f3f4c2ec0e3eca09f21b84edcde1952d0427e567afc8
 MISC metadata.xml 458 BLAKE2B e425a12d814c1b1f84660a4b3ab3a3d38076c8d31751dddcb094cb450058275f3f46d960f53ed82d3c1dbe171e8721ea0706f985e1981bd9b081a2c929110eac SHA512 2b586113d829fec67c71e70c856ffa555108c34c78c42605bdf26a12724d86d0ff8fb5f65dacb4f20c688c6d872c092d107e72f47aa459c0c726f910526733ed
diff --git a/dev-python/libpyfoscam/libpyfoscam-1.0.ebuild b/dev-python/libpyfoscam/libpyfoscam-1.0.ebuild
index 6d715a8f5..e7deef19d 100644
--- a/dev-python/libpyfoscam/libpyfoscam-1.0.ebuild
+++ b/dev-python/libpyfoscam/libpyfoscam-1.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/libpyfoscam/libpyfoscam-1.1.ebuild b/dev-python/libpyfoscam/libpyfoscam-1.1.ebuild
index fc382457d..afee8ca5c 100644
--- a/dev-python/libpyfoscam/libpyfoscam-1.1.ebuild
+++ b/dev-python/libpyfoscam/libpyfoscam-1.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/libpyvivotek/Manifest b/dev-python/libpyvivotek/Manifest
index a0714a7a9..0271834bf 100644
--- a/dev-python/libpyvivotek/Manifest
+++ b/dev-python/libpyvivotek/Manifest
@@ -1,9 +1,3 @@
-DIST libpyvivotek-0.2.1.tar.gz 3040 BLAKE2B 2a7b170366bcfa125fbaa4834da2cfaf13d9b716b1ed097fed2cd0c5b98783a8921facc665e18d047cb8442d98a7383b7b9127d8ac8d97f46293d3fc97ed982b SHA512 f03ce43f8d39235e73470d77e54a18e3a3f0b36bdbf78db6891a21d1645346803001cd3e9ebb09076b41b0b969632d954e8a0913e6c307b186ac2f48a8f590ff
-DIST libpyvivotek-0.2.2.tar.gz 3144 BLAKE2B 910a02c57212f9e46b008218dbe1e6c30ab325fb9f619a35c553282f929c935a23ccaaff4e5d18cd374f217a87b2f7a7cf6a547ba7ddfa1661ee09b938a09e8f SHA512 448e7910f70d1313ddd330d8c23d9e4a3ca1be2a712b02b1ae279e44e82bb1cc89902ec33ae631ac32e13168c60053eb9ce1b71680eef1f9c1c3bc748d43313c
-DIST libpyvivotek-0.3.1.tar.gz 3954 BLAKE2B c0665d2c08bb8b0862f68ce5f6655c4a80c5a37cf196ab30a65c57f7e107293c171ebf9975b29c531e2d1d0d3c45e8caffbd9d45e38765c6148f26da1d63bedc SHA512 e2d5dc8d4a822b73875941c17f42b84312707993036302f4388ea7ecce051675b7a3aa7722efc379bcafcc06f8b43f8c3e69e19530931bef8bf7454255a8bfa9
 DIST libpyvivotek-0.4.0.tar.gz 3766 BLAKE2B 0ad242a3996bcad2578de1a43bd1e46298d93fca9c1d5bd4a7fd37364791934d15ed9eeb0a8d9c0287ff1a7c98663217c2e502ebf0dbe76adafd9b868ad7fd3f SHA512 f53b4af3cb6604c1766759e817875b9449c09d567b99b2e2722b4b22e9f3c1405cf7ca9b555f154b1fc7035b24004dc9b43e52792671caf48d75667152a56339
-EBUILD libpyvivotek-0.2.1.ebuild 695 BLAKE2B 9b0d14ca66689fcbf4505b0886d30d1d4324c65904964c6437a85038ab728ad56b0fc175f9dd4ae3df69ce6e4442c01032bc09c91219756b455695ee2fa57d46 SHA512 44dd3daed274b3bd364197f858770a486120f306c1362b80b46c859a6bf09747b60d5147b80627dd9fd7d278438ab097668625e40bf01889c0baa945981117a3
-EBUILD libpyvivotek-0.2.2.ebuild 695 BLAKE2B 9b0d14ca66689fcbf4505b0886d30d1d4324c65904964c6437a85038ab728ad56b0fc175f9dd4ae3df69ce6e4442c01032bc09c91219756b455695ee2fa57d46 SHA512 44dd3daed274b3bd364197f858770a486120f306c1362b80b46c859a6bf09747b60d5147b80627dd9fd7d278438ab097668625e40bf01889c0baa945981117a3
-EBUILD libpyvivotek-0.3.1.ebuild 695 BLAKE2B 9b0d14ca66689fcbf4505b0886d30d1d4324c65904964c6437a85038ab728ad56b0fc175f9dd4ae3df69ce6e4442c01032bc09c91219756b455695ee2fa57d46 SHA512 44dd3daed274b3bd364197f858770a486120f306c1362b80b46c859a6bf09747b60d5147b80627dd9fd7d278438ab097668625e40bf01889c0baa945981117a3
-EBUILD libpyvivotek-0.4.0.ebuild 702 BLAKE2B fc28bf9a035535ee9313e66499d7b878411d2a1e3e3d3e6b516815e58bfe27294b2e651281cfa5ec81fe63288f149e2671ea4ed72904c87fb02da0bdc88bb20f SHA512 e1ad996e08fb94a60610bc0c4d1f5aedc176276851ab83b031f68b6c0b5e40c9dfcd19f61f2675c64dfc00a0b9ec93722d182f15a23ece7f7f64d01171cab0a7
+EBUILD libpyvivotek-0.4.0.ebuild 701 BLAKE2B d353cec6e866577bce08169114a88c530f241642deb4991faeba2e1a91409958023ccd2b54fa602389ecb3fb61d4841e4e37e6764f04a66ee0eae3c09a9084c4 SHA512 5020ab0f1ece4e16174c8776d8257272a1039bb7b0cad0399d8c762b54e926fb8fe17ef5ce5d9aa793289d6d1ce291dcbeaeb78cad5c01ef6418e97c3403565f
 MISC metadata.xml 464 BLAKE2B 408c3af7636737582d9624f5a7d6defe8f9d81fc6c26b2fdcf7e25930e5e7704add1b377d6d95abee72032fcc7fe48bf4b3588660cc9c2960cf1b7d992a60b67 SHA512 3e96ca9ba540fdfe01907bafac44aa3a831003b08880e236ae32a3b172983e5a6259139100cbca03a93584c5fefb74c8680888911e805958e38cb4d494205c6e
diff --git a/dev-python/libpyvivotek/libpyvivotek-0.2.1.ebuild b/dev-python/libpyvivotek/libpyvivotek-0.2.1.ebuild
deleted file mode 100644
index 91e05643a..000000000
--- a/dev-python/libpyvivotek/libpyvivotek-0.2.1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{5,6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python Library for Vivotek IP Cameras"
-HOMEPAGE="https://github.com/HarlemSquirrel/python-vivotek https://pypi.org/project/libpyvivotek/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/libpyvivotek/libpyvivotek-0.2.2.ebuild b/dev-python/libpyvivotek/libpyvivotek-0.2.2.ebuild
deleted file mode 100644
index 91e05643a..000000000
--- a/dev-python/libpyvivotek/libpyvivotek-0.2.2.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{5,6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python Library for Vivotek IP Cameras"
-HOMEPAGE="https://github.com/HarlemSquirrel/python-vivotek https://pypi.org/project/libpyvivotek/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/libpyvivotek/libpyvivotek-0.3.1.ebuild b/dev-python/libpyvivotek/libpyvivotek-0.3.1.ebuild
deleted file mode 100644
index 91e05643a..000000000
--- a/dev-python/libpyvivotek/libpyvivotek-0.3.1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{5,6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python Library for Vivotek IP Cameras"
-HOMEPAGE="https://github.com/HarlemSquirrel/python-vivotek https://pypi.org/project/libpyvivotek/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/libpyvivotek/libpyvivotek-0.4.0.ebuild b/dev-python/libpyvivotek/libpyvivotek-0.4.0.ebuild
index 9456c8a0a..c11a9b1c4 100644
--- a/dev-python/libpyvivotek/libpyvivotek-0.4.0.ebuild
+++ b/dev-python/libpyvivotek/libpyvivotek-0.4.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/librouteros/Manifest b/dev-python/librouteros/Manifest
index 052d14143..5a8c676f9 100644
--- a/dev-python/librouteros/Manifest
+++ b/dev-python/librouteros/Manifest
@@ -1,7 +1,3 @@
-DIST librouteros-2.2.0.tar.gz 5861 BLAKE2B d5ca07b7f8379c18484ebf49cbbead6b9a726c5ddbc3e8b2f945f052da91f373d369e611370b16bb46c656d5e82a5b171c237eb019aa7dfa7ca7a6306f6dd503 SHA512 d49ddb0a9374cc5a033be46fc8b0f624ddaccc6ea91257bf160803c350628f9920c981b5fe628552e54f83f9bad3d0f175be26dec7d480b57d0ad0254895bdfc
-DIST librouteros-2.3.0.tar.gz 5744 BLAKE2B 95a921244c4e10104c4b02f8a672b17803c1a2d1a73ded8028dce089fc0afdc77f073fad85c31c19080ea3d896a92bfa5ec982458b36552fb4a115bde3869e50 SHA512 b70fcdb2e8a9c1e591b0380f6fd2487416386b35f04d9f085473dda6a54b8f20fe30e8f86078691701870b0b06b5f0a611e424e760322020259a038bf2445d6e
 DIST librouteros-3.0.0.tar.gz 6284 BLAKE2B b1d8935ea4ac6885c0e2d2eb83d314d1a422a9d5a14efa56a656c75e564f86b4afe3244744da5863b0c5ec23a0cd44632b1957f379df578d2c4615d94d0c3bd5 SHA512 421ddd50575a6e1befab1762321b0e8f39a878ebf81f149c0b158313882f15dbb02cc70c7d335ef59f08a03dc993e604a7394c883fd8a1c8e5aabef19305a95a
-EBUILD librouteros-2.2.0.ebuild 690 BLAKE2B 80e5c3935b568a26c401e6667ccb00968410dc3732ac8e2509b617d93b9694dfeeedeb8c700871ce07e00c9f018a7a20e233c1e68b1bde6dd40e007c50e5934b SHA512 6e397412f5a571c15d98d04f661426641dd3dc070965a9f01089917a4c0a56a5f7f79fc47da7d2a84beb605df791a40c4a227dc8b7029f24da20673efe27f486
-EBUILD librouteros-2.3.0.ebuild 690 BLAKE2B 80e5c3935b568a26c401e6667ccb00968410dc3732ac8e2509b617d93b9694dfeeedeb8c700871ce07e00c9f018a7a20e233c1e68b1bde6dd40e007c50e5934b SHA512 6e397412f5a571c15d98d04f661426641dd3dc070965a9f01089917a4c0a56a5f7f79fc47da7d2a84beb605df791a40c4a227dc8b7029f24da20673efe27f486
-EBUILD librouteros-3.0.0.ebuild 697 BLAKE2B 495de469935abf2da5280d84e1154de0903236872631a7471a0346f8cd43c89ed14037dead92347508009b2ef170ab8f508dd59fa2001905dab86d3714b02bee SHA512 c81c10e3791287e4fd75923d03ee58e312adc09a3985fe47165c75c03e015eec92059e29110373235fd013cd8cd2368a49189a470f712f2917958996f9be00e7
+EBUILD librouteros-3.0.0.ebuild 696 BLAKE2B 037bef80cbed6609b2fac82b79da09380212866f9b14a07822ea2b5e565ce8428bb4d71a58567dfe45268f19fabe931ccd501f79648c0a20b91e25cf6a4122fb SHA512 f003fa7b481c04cc11e9f6bc173062c31b000cf16abdeabfde9160e4e111cb171b2af8921df2836758a9bb40561c1ae56c2f7443ba5fb501e5895bb76298d247
 MISC metadata.xml 252 BLAKE2B 507e0ddc9d50b879ff374b903b142f85d020dfd6c486aba2af84fe082c878e780edbb79188ae10104d57db0eb775c86814cc8c06891a3854c9da840a4d377050 SHA512 9470ac9c8a5a4f80e3f767e7aa198addc7b21866c63b2a310e9f41ce65817672fb77423117bdd619e99cb62322025aeadf50717e23eafabf99080fcc106820af
diff --git a/dev-python/librouteros/librouteros-2.2.0.ebuild b/dev-python/librouteros/librouteros-2.2.0.ebuild
deleted file mode 100644
index fa4e05f6b..000000000
--- a/dev-python/librouteros/librouteros-2.2.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{5,6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python implementation of MikroTik RouterOS API"
-HOMEPAGE="https://github.com/luqasz/librouteros https://pypi.org/project/librouteros/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/librouteros/librouteros-2.3.0.ebuild b/dev-python/librouteros/librouteros-2.3.0.ebuild
deleted file mode 100644
index fa4e05f6b..000000000
--- a/dev-python/librouteros/librouteros-2.3.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{5,6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python implementation of MikroTik RouterOS API"
-HOMEPAGE="https://github.com/luqasz/librouteros https://pypi.org/project/librouteros/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/librouteros/librouteros-3.0.0.ebuild b/dev-python/librouteros/librouteros-3.0.0.ebuild
index 6e03f67e8..c4457c4d6 100644
--- a/dev-python/librouteros/librouteros-3.0.0.ebuild
+++ b/dev-python/librouteros/librouteros-3.0.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/libsoundtouch/Manifest b/dev-python/libsoundtouch/Manifest
index f5383078f..5c9d46b9d 100644
--- a/dev-python/libsoundtouch/Manifest
+++ b/dev-python/libsoundtouch/Manifest
@@ -1,5 +1,3 @@
-DIST libsoundtouch-0.7.2.tar.gz 15200 BLAKE2B cfcc6bd94a75014412d1710198994fd0f2b83be6c20d42c7e3a35f818fbd0ec1c2f2bc4e4788f280cf44f3f1aee6b81a70aa3b0a52de611606d6ece59fb89372 SHA512 54082f0793b0c54ac4359a23ff5174a519d38455936f056986ff7ba210039073f01ab54085e00df79c529f4139bdca4480c851f5b3cd3ab29c39aede46747e49
 DIST libsoundtouch-0.8.0.tar.gz 15956 BLAKE2B 5e80fed269c2ce9bf65e0cfaf468261ab9c5b645aacf1f8e4079716838641ae6667efd5a45e93b383943b14953a98e78e5fb89720087c667536a79ebc2a016aa SHA512 c5a3e9cb1c5850b6a06ef83ad7cf51e04c279224638d3501c3c99097f3df5d684059176e6a5ecc9f7a23e9dfabd727a0f293989b218af0abf3192d23aab37532
-EBUILD libsoundtouch-0.7.2.ebuild 680 BLAKE2B 0cd9d622ad47cb6a57a253f385c42ab789a1fa8e0676809548b87f93dcc4016e05f9dd1261de52095f6112f5aa709f3da6ab8d9e9382007c9d2ec378e2343f36 SHA512 a49a806c3deb8dd658523967e59ca7a82e65254cec1013b550726d1134a793d46b4834dfea38b1fe9328764c0c794501daea3952a3ad4e9d447736adf9180f57
-EBUILD libsoundtouch-0.8.0.ebuild 687 BLAKE2B 0cfece45ce3694cc4a418f653c2045c7756171177bee287bf97d382ae2645ec8be50dc7062fff7be05f70e4ba66506e58e6fcce760073a3e91a4805719f7422f SHA512 5e7b12e6983840aba085f0f76e4360747123b59e3837842f1370323fce6aa60c3f1483ef5b61690103b05fc072955f3c19714b76749d2fe5cfaed37ab2bbe817
+EBUILD libsoundtouch-0.8.0.ebuild 686 BLAKE2B c7b02a5712458ddc6a84efa4e1a0b945f42478c0468b99fd7f99f8327640bbed2e38028da3dfb4eabd0ca155ceb77dcbffaa8515cfc495edaf7c1d2e90c5964b SHA512 f640fddcdc43ebd17ba5bdd6fa39eb44aaa93800204bc59121c38b3e5cc4ccedeb4cc1243680ad6528132d03c80da6b1594c5d44e33b2ebc382a1a1aa5566451
 MISC metadata.xml 464 BLAKE2B d0114f8a926dd6d3269e0d12f4c0481cc4cedf72a60af27993092bf9c642b695ad520b7419137378bd003565c41aa8ebf0040dd4d5631f2bb7333e2ab4b9607e SHA512 d95a2a1b6a3f1d2775aabedea0e1f4c87a1ca0b177b9a13d34d5492e1b14a1d0e2f33f72ce15074c6b2dea9d6e2e93ed8ca4b31ab9e20d44d2c8c7531cd7fa66
diff --git a/dev-python/libsoundtouch/libsoundtouch-0.7.2.ebuild b/dev-python/libsoundtouch/libsoundtouch-0.7.2.ebuild
deleted file mode 100644
index de1260a2a..000000000
--- a/dev-python/libsoundtouch/libsoundtouch-0.7.2.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{5,6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Bose Soundtouch Python library"
-HOMEPAGE="https://libsoundtouch.readthedocs.io https://pypi.org/project/libsoundtouch/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/libsoundtouch/libsoundtouch-0.8.0.ebuild b/dev-python/libsoundtouch/libsoundtouch-0.8.0.ebuild
index 943ddb428..0cff5eab5 100644
--- a/dev-python/libsoundtouch/libsoundtouch-0.8.0.ebuild
+++ b/dev-python/libsoundtouch/libsoundtouch-0.8.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/libusb1/Manifest b/dev-python/libusb1/Manifest
index 60b9f456a..2ac9ac134 100644
--- a/dev-python/libusb1/Manifest
+++ b/dev-python/libusb1/Manifest
@@ -1,4 +1,3 @@
 DIST libusb1-1.7.tar.gz 56605 BLAKE2B f57b8468552ef687235baf64dacb42a3dddd92e354929e6bd31553fdf75d632bd69824e66bc019f813021127faa8336e991ae091de690b9b3273a51bab1d148d SHA512 ff7912ad3b7ee8fe49132f63263e87bd5a8210111de419740a286428e2af6a3d26c192f0ce571973dd89095dcdf716f2dd07a34206844a5650ebb00d62eccd95
-EBUILD libusb1-1.7-r1.ebuild 557 BLAKE2B 075159ab675c24db987f5c3e2fd48d550c25acc7bab566451807da0749653877aa64b911881c19c8cea924f6be0eb2414d361293ed3dd4b3677cd7d5c7d7dc23 SHA512 764d55880c70595094c8e59dcc4b60c38bbefcea3076abbd090f2550f6e4e468ab8ee49552fe4ab90c2b629d77e265f39db179fb4501ab7656fb050e645898fa
-EBUILD libusb1-1.7.ebuild 554 BLAKE2B 70e49ec64ccf109177d95db7522bbf13e4fdd91db5d1b4d669dc63612b997bd16aa0e3bad198bbe18fc69ed3880b47d7641b0b27032d75d12d72469312911c28 SHA512 921906f82467074f1e9ecbdf7944fbef1bf49a9175b6b60d446c1678b2e2fada883ce5a908ca204b5717b773ef2c48dfec58752da33432528fdae75207382ecc
+EBUILD libusb1-1.7-r1.ebuild 556 BLAKE2B a660ced5fc89628021bb6274137e5e7a1da9ee66a49852bc9a3beade21115d48a586259cdd8be597ec77f3edcfcda0faa677c626c640a5a2da65b65102c5a179 SHA512 eef2a0913e2e017a171bb5fc604a564cf7437153387abdcc8f59f469688e37484445c7bb25b05832d33524e7330ff40e4657f6f51b71487be1a5bcbca4e6c46b
 MISC metadata.xml 252 BLAKE2B 507e0ddc9d50b879ff374b903b142f85d020dfd6c486aba2af84fe082c878e780edbb79188ae10104d57db0eb775c86814cc8c06891a3854c9da840a4d377050 SHA512 9470ac9c8a5a4f80e3f767e7aa198addc7b21866c63b2a310e9f41ce65817672fb77423117bdd619e99cb62322025aeadf50717e23eafabf99080fcc106820af
diff --git a/dev-python/libusb1/libusb1-1.7-r1.ebuild b/dev-python/libusb1/libusb1-1.7-r1.ebuild
index 333f69dc9..72efda253 100644
--- a/dev-python/libusb1/libusb1-1.7-r1.ebuild
+++ b/dev-python/libusb1/libusb1-1.7-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/libusb1/libusb1-1.7.ebuild b/dev-python/libusb1/libusb1-1.7.ebuild
deleted file mode 100644
index f770719f6..000000000
--- a/dev-python/libusb1/libusb1-1.7.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
-
-inherit distutils-r1
-
-DESCRIPTION="Pure-python wrapper for libusb-1.0"
-HOMEPAGE="https://github.com/vpelletier/python-libusb1"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-DEPEND="
-	test? (
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)
-"
-
-python_test() {
-	py.test -v || die "Tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/life360/Manifest b/dev-python/life360/Manifest
index 3e7940964..891456713 100644
--- a/dev-python/life360/Manifest
+++ b/dev-python/life360/Manifest
@@ -1,7 +1,7 @@
 DIST life360-4.0.0.tar.gz 2961 BLAKE2B 2d7dc90032b91446b0d607464fd3f5d0e58a2c470e451af0c1676479e8fa84cbabe28e0573ca74bdaa5c4e2c30e6020edcf0f1c54ff06806f454691fb92ba489 SHA512 291df9e2065c2a6a0284721493810584a557b9ed37d327e57953b24d67bee53d0096fb1e858a1af8aaed8adf17264a5a7d34f6b76503ed06ce07fe7ad80ef903
 DIST life360-4.0.1.tar.gz 2978 BLAKE2B 06ec1588283c3f1726061c29a855c0fe6c5ef4c89669303559cc11d6b7a632f51f64eb185098be24b8334d825e8d7b15cd92b2d6fd27c944e99e3c91f308f993 SHA512 af229d30d21c776a6dc7939eee4257492748699a00fbb4fc3303399042b7e023e5f79344e306b9928c54c152d37c8335b5056fcd2c649c52cd06513524b7398c
 DIST life360-4.1.1.tar.gz 3165 BLAKE2B c7ce5efedd46689f140a82788598506c25c7e376a1ee5fd07e8681bb441238746b908e720ed7041c63cda45d914dd97134887b65c4ef07854c7840e24d0a3c64 SHA512 d5b5cee5e9a5540983fffa325e18224f481383d93aa0c8c4c838eef134200cf31a19c911704322788c56f9c1551b4de91d497e406c503b283bc1e70a3d1719a7
-EBUILD life360-4.0.0.ebuild 667 BLAKE2B d588835f68eac4437c8368be6bdb30b2680df0e268bfb4ae02b867c1b4b146f336dbe23cdcc16db7eea6f87fb611e846644624de3c55284f65ede1b9573de56c SHA512 ec3b000283f6d802727bbfc6fea2b501c389bbb7078349a68197632187eb379bafd4c24abe912e9ebc6c51697e1768b3a81736359ef166ec2769c1969e296add
-EBUILD life360-4.0.1.ebuild 667 BLAKE2B d588835f68eac4437c8368be6bdb30b2680df0e268bfb4ae02b867c1b4b146f336dbe23cdcc16db7eea6f87fb611e846644624de3c55284f65ede1b9573de56c SHA512 ec3b000283f6d802727bbfc6fea2b501c389bbb7078349a68197632187eb379bafd4c24abe912e9ebc6c51697e1768b3a81736359ef166ec2769c1969e296add
-EBUILD life360-4.1.1.ebuild 674 BLAKE2B fa79d5fc3736160598004fca9df9c83ddf90947c90400efc736e7d26218f5b15519f0ee999feb53fb998ad4fa0ac96b0f437c69ef213b3a95f879c5847d61a0b SHA512 1f3622b8508d0b100392aa396a2e89d9db1283f4747db8c340216608de02c961ce4f7da425f3c644a74d4d2f6da79b25456110b972c77fae65d86c120ed4db46
+EBUILD life360-4.0.0.ebuild 666 BLAKE2B 4cdecac3b249299d99f63e2357b3e8a3d1e474c0c222f892e3db88be6cf3f085f825069e6e7ce3019081e5c9ef50490d7e2fa4b90741dbb987f174129b6d11ff SHA512 495a761b03695f0c2dd5256f600b1d9c57b749da3bd090317405663310b6be87e8b21e4e2c40a8b44bc9176357b738edb5a867d89a0f19638353931f93ca7c0f
+EBUILD life360-4.0.1.ebuild 666 BLAKE2B 4cdecac3b249299d99f63e2357b3e8a3d1e474c0c222f892e3db88be6cf3f085f825069e6e7ce3019081e5c9ef50490d7e2fa4b90741dbb987f174129b6d11ff SHA512 495a761b03695f0c2dd5256f600b1d9c57b749da3bd090317405663310b6be87e8b21e4e2c40a8b44bc9176357b738edb5a867d89a0f19638353931f93ca7c0f
+EBUILD life360-4.1.1.ebuild 673 BLAKE2B 71569eccecafa1411de5da7d7061648b975753f5c1b6811df8ccccc182bdfa636b617748bfdba68edbe9b89d7feb61da4e62acc76b81de3e522c5f6643e89a97 SHA512 d1d4e928a34f5d5f81acf660cb58bb1cafc342cab01665cf2cb9bfa840c6d576b305229023f2f0275123fcc04c2b119844cdb084d8e16bd63d0e2932aeae9b56
 MISC metadata.xml 453 BLAKE2B cb2cbac4b0f8249bac6b424620a7c86307104d69f0fbc8534708be8d8502bae611eb1f6888c79b7d68d2f677f21f6707fa58fbae6bc4344fabefd6675008b68d SHA512 48e03dc839b2dc3f337e5f610e84ef39602d33ca5f42fd804b49e39d0821d70342cf6389e9090e2454a64667f6b6473ab08bbc21239117672fe10416962213cb
diff --git a/dev-python/life360/life360-4.0.0.ebuild b/dev-python/life360/life360-4.0.0.ebuild
index b02e8944c..3f7331c0b 100644
--- a/dev-python/life360/life360-4.0.0.ebuild
+++ b/dev-python/life360/life360-4.0.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/life360/life360-4.0.1.ebuild b/dev-python/life360/life360-4.0.1.ebuild
index b02e8944c..3f7331c0b 100644
--- a/dev-python/life360/life360-4.0.1.ebuild
+++ b/dev-python/life360/life360-4.0.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/life360/life360-4.1.1.ebuild b/dev-python/life360/life360-4.1.1.ebuild
index 3749a3d3d..37720a471 100644
--- a/dev-python/life360/life360-4.1.1.ebuild
+++ b/dev-python/life360/life360-4.1.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/lightwave/Manifest b/dev-python/lightwave/Manifest
index f8bc36775..383ab911d 100644
--- a/dev-python/lightwave/Manifest
+++ b/dev-python/lightwave/Manifest
@@ -1,9 +1,3 @@
-DIST lightwave-0.15.tar.gz 3332 BLAKE2B 2d569d136322ccdaa84b3a5722d574c5b3c507802337ce47960fba8720a4b617f194c92636b0ec591bc21edc4d1daafb0f7b9f0af9466cc884d77cb73a9968b4 SHA512 b533c19a0452912b6445302f99f8967249abdbf831c5beb84322557e525faebb1c7df90a8db061f6b0c98ee67f952865eb49b8f52fc8edaf5b7d65462d81735d
-DIST lightwave-0.17.tar.gz 3401 BLAKE2B 3fba2adb5de1fb98eea1b37687de3ab609f8147e7a1e98bab52f03ba3db3461abe6cbf155df842b380c75a094ecfb8db0a72d74c5f519176b9842bf11df1864b SHA512 6ae43a952061259628c5721fab02af19b7cd68c95f035e9779174c36e8c8f8c8e41f536b81016320c0485fb75a3d21919a835d5afb8e6463272a2ed6c7e0928e
-DIST lightwave-0.18.tar.gz 4357 BLAKE2B 0d39b608f8238670aefda7db7484e20eb36c9bcb8eb8cb7e73d67efa5437394f26c9fa5e6375834d8163971bdc6613819cb7e1c366345c38d47d87e65788c536 SHA512 a1ea7e8da96b967f04c9c2997a5e9e6276abdcca9eaba5c24d3f65afe7717ea361415fb4cfd769083bc0e04f75e8765fb8a82ce83e04ce3cc0c1945bac3ad1c8
 DIST lightwave-0.19.tar.gz 4368 BLAKE2B 62a03816bfaae069655d3301d9de8d1e9a3d4fbd693780b33256045ee5f73108270bcfa3bc6f60d3925c0da23b9352a88fb6a2f7c727d539dc300fb778e3aa19 SHA512 1092ecb016b6beff78808c83d1df82cd69c3ea6f914a18957af1d2c430971d66a137fe3513d969a2b8c323ab493c6c57736a164d1a490028f6b1632a601c0b61
-EBUILD lightwave-0.15.ebuild 719 BLAKE2B 283e5583202a794c8826270b5970766b60abbd1c1c8382eca2bbc0cd49726f075a865ae538565ada0e578b388d3a5fa24ccfeb61f09ad91306f5a6a2ff5f2475 SHA512 edc25156020c66d72b76ab28c3abd1324184c8f89a2fcf37ef30bde288e8c26af509dcfbedcacdf355f7674ddc3f311874e670a040142c17edf8b3f4d867078c
-EBUILD lightwave-0.17.ebuild 726 BLAKE2B 4940cc53beba477469efe8c1271c2054cafc55b353bbb0d26760f666f92e03f8eb492b1ff89342f4e8220b51902dae2527637009729fcd266c04e3cb465f5de7 SHA512 04d0be064dad34996f8ff778a8d46a3d92e5693dec4d8e77a55a7deff81a2a517bbbb5f6fd7414e7a4a9d7231133303a3be94ceff24e95a51bb249a4a643ab47
-EBUILD lightwave-0.18.ebuild 726 BLAKE2B 4940cc53beba477469efe8c1271c2054cafc55b353bbb0d26760f666f92e03f8eb492b1ff89342f4e8220b51902dae2527637009729fcd266c04e3cb465f5de7 SHA512 04d0be064dad34996f8ff778a8d46a3d92e5693dec4d8e77a55a7deff81a2a517bbbb5f6fd7414e7a4a9d7231133303a3be94ceff24e95a51bb249a4a643ab47
-EBUILD lightwave-0.19.ebuild 767 BLAKE2B 67339eb90328ad693416d72975b265a09ad26dc4038c3ac86ad060796ddab33dd39161cfbbade2f56d08153be1a7db250f0fe389cabaf16a95188f3d50bed3bd SHA512 c49824a2e04391c621ee3e7d4e3e4470bf05a2e9b560929a479fe91979ceb5302bbaced27225327006aa3f8f0657e5fb59c9148b951863473ec6cfb33e01141d
+EBUILD lightwave-0.19.ebuild 767 BLAKE2B 208bcc9b4a498d95ecf8c8006ee98b050d82f8dc9087400970792878c26418e572d807292bf09fb79799b758733e84d14c5553f0d2117fccdd086ab2338ea2dd SHA512 45337ea6ed4fcd7efa3aa7816192251e0bf6d1bf4b7ca3a6cc6c372af35ef3fb4eaacf22acd45d94d5545302610c8be1c3cd00f6da675836980a3138d1d3bd64
 MISC metadata.xml 451 BLAKE2B 95670c1ffb9850a39b3ebcfa4697abe87868baa42a79fcd6e259a83cc2843c0cd2cdc3e1f5c9740c880426a79d0275c1eb02db31b5fec4df1df7c499927084c5 SHA512 bf282c9b632401f4f224172152af70465b70266c8bf6e09060cd68cc9891e88ae2eebeb8f3a7650938fbf48783465580c7723b7c02713d270121c3bd2975bc16
diff --git a/dev-python/lightwave/lightwave-0.15.ebuild b/dev-python/lightwave/lightwave-0.15.ebuild
deleted file mode 100644
index c87a72e01..000000000
--- a/dev-python/lightwave/lightwave-0.15.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{5,6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Provide a realiable communication link with LightWaveRF lights and switches."
-HOMEPAGE="https://github.com/GeoffAtHome/lightwave https://pypi.org/project/lightwave/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/lightwave/lightwave-0.17.ebuild b/dev-python/lightwave/lightwave-0.17.ebuild
deleted file mode 100644
index e0ce20cb0..000000000
--- a/dev-python/lightwave/lightwave-0.17.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit distutils-r1
-
-DESCRIPTION="Provide a realiable communication link with LightWaveRF lights and switches."
-HOMEPAGE="https://github.com/GeoffAtHome/lightwave https://pypi.org/project/lightwave/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/lightwave/lightwave-0.18.ebuild b/dev-python/lightwave/lightwave-0.18.ebuild
deleted file mode 100644
index e0ce20cb0..000000000
--- a/dev-python/lightwave/lightwave-0.18.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit distutils-r1
-
-DESCRIPTION="Provide a realiable communication link with LightWaveRF lights and switches."
-HOMEPAGE="https://github.com/GeoffAtHome/lightwave https://pypi.org/project/lightwave/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/lightwave/lightwave-0.19.ebuild b/dev-python/lightwave/lightwave-0.19.ebuild
index 2568fe33a..edbdd86f0 100644
--- a/dev-python/lightwave/lightwave-0.19.ebuild
+++ b/dev-python/lightwave/lightwave-0.19.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{6..8} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/liveboxplaytv/Manifest b/dev-python/liveboxplaytv/Manifest
deleted file mode 100644
index fe8eda816..000000000
--- a/dev-python/liveboxplaytv/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST liveboxplaytv-2.0.2.tar.gz 7600 BLAKE2B 87472fce10db46fbe72b98ec8afa93045166169bcacb28d0b7407fc35123d4c10413b69195f3f7aa3576b90e486c864e8ba3dc0c0c804bac350d23a13f2ecac1 SHA512 d10eed26b30ba1a286d570f1f23d221522e9c63030512c3c965c9a8a383f245b10dc0ab48cb3ad9f2ceacbf2eba6981e4458aaf2c16886ad04840df712d193a6
-DIST liveboxplaytv-2.0.3.tar.gz 8697 BLAKE2B 69f341f4f2e4ffa583cb0b6176fb8a80a58eca1d97180904dcc2aaac41103cd2d86bc6046c040d157388923b329d475f1bf46836a4fb88744b72872ae0e772f5 SHA512 47759b44949896ff607b4a3b0bf17a3ae597672a3a800b8027f09e1582b4ddf8ea0cad0ce13671cd320a5437e8f8b82309cbf3c431f6fda67623b16ebbbb146f
-EBUILD liveboxplaytv-2.0.2.ebuild 928 BLAKE2B eb549d596f4879a10b369e39c66a705ea4c4cf57de3dd9098d14c5526e2d8e1db198e712b59e81a7c5c1ca538afade1ae694677b8538ac443ecf0ef13e29d3db SHA512 0d59a33317769509f8e8394d77137eec633bdfb793da71fc6870449bd0ade9b472c50b3233506b286d09bda3a4f74c90ed103f08f5d2de1bbb2c11911c71000d
-EBUILD liveboxplaytv-2.0.3.ebuild 937 BLAKE2B f5db14d3b7fd9d6e3ce89b5d3f8fd9ba2339c1c119096d696f37e1978bc04d317bcb52a6cf4cfd8dbddd442a4883946cce764ae5393fb7542bb2278103575ec6 SHA512 52d58288ff628550d01086bbd49f4426b0fc906614eebfd6256a86224cd38e551db76e2e8059f4c34e2f2177698b4656ceb4cbb049088bfd892e489ad96c7365
-MISC metadata.xml 459 BLAKE2B 4ff7e28b6fb1cf3bbe234c0a2a5da85e878b96c6a4c7cdab826471088e0a3d844741742120c56cbcfb85122283923ec722f63120da86273e631818bbc62e2220 SHA512 edc3bd760e81de4f97f8cde27016677adedf545f617e06949c8b9a9e1e9c2323f795ba9380e2023f32552b48370a5ebb6cd998c5f9b0e88ecc01bb94cbfc78a7
diff --git a/dev-python/liveboxplaytv/liveboxplaytv-2.0.2.ebuild b/dev-python/liveboxplaytv/liveboxplaytv-2.0.2.ebuild
deleted file mode 100644
index e9be74041..000000000
--- a/dev-python/liveboxplaytv/liveboxplaytv-2.0.2.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python bindings for the Orange Livebox Play TV appliance"
-HOMEPAGE="https://github.com/pschmitt/python-liveboxplaytv https://pypi.org/project/liveboxplaytv/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND="dev-python/fuzzywuzzy[${PYTHON_USEDEP}]
-	dev-python/python-levenshtein[${PYTHON_USEDEP}]
-	>=dev-python/pyteleloisirs-3.3[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/wikipedia[${PYTHON_USEDEP}]"
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/liveboxplaytv/liveboxplaytv-2.0.3.ebuild b/dev-python/liveboxplaytv/liveboxplaytv-2.0.3.ebuild
deleted file mode 100644
index 0351a5cdb..000000000
--- a/dev-python/liveboxplaytv/liveboxplaytv-2.0.3.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python bindings for the Orange Livebox Play TV appliance"
-HOMEPAGE="https://github.com/pschmitt/python-liveboxplaytv https://pypi.org/project/liveboxplaytv/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND="dev-python/fuzzywuzzy[${PYTHON_USEDEP}]
-	dev-python/python-levenshtein[${PYTHON_USEDEP}]
-	>=dev-python/pyteleloisirs-3.3[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/wikipedia[${PYTHON_USEDEP}]"
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/liveboxplaytv/metadata.xml b/dev-python/liveboxplaytv/metadata.xml
deleted file mode 100644
index b2c4d9e98..000000000
--- a/dev-python/liveboxplaytv/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>b@edevau.net</email>
-    <name>Andreas Billmeier</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="pypi">liveboxplaytv</remote-id>
-    <maintainer status="unknown">
-      <email>philipp@schmitt.co</email>
-      <name>Philipp Schmitt</name>
-    </maintainer>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/lmnotify/Manifest b/dev-python/lmnotify/Manifest
index f95060fe3..90d5e75ee 100644
--- a/dev-python/lmnotify/Manifest
+++ b/dev-python/lmnotify/Manifest
@@ -1,5 +1,5 @@
 DIST lmnotify-0.0.4.tar.gz 9075 BLAKE2B f4812a1b99395d936d74429551dcfc203b8464756d092f306f98f2220751df023516dab15ff55b92a06397eb966421545b804dafce3d3183e994ab259475184b SHA512 37ed029640f78233b0b081a555cb6c4acf33cfefdb3f3766b380e3a6ff0709b24aa64fdfe01f4489c33974731a90151867baacfad6dba12191d8a947b46f125e
 DIST lmnotify-0.0.6.tar.gz 17072 BLAKE2B 443a0e0cbaf7a18fee9a65867246ed4cd4e7e478fd9c2dd517b1a548edf7b866ae4613260dfe941fcdf8882f5b4b00768346473c87f83340fbfc8792488ae733 SHA512 1666e378a9bde4069fc7ba95bbb00250651f1a2f503623f517fa5669632a0b3bec3d07072116c4199387fa1fdb74ef2968c508ed5fceec4804e9ef277b9abe5c
-EBUILD lmnotify-0.0.4.ebuild 810 BLAKE2B cb56068ce121091d338d58cd8c02b0b7d1f885e532bce4b432cbfd402aa7c2647215a3cf033feb0660aa114391c143201129fe13e26466ef10d9d59e3fd432ab SHA512 3a47b9cdf58230dbdcebeb3a050658b25120e4bed7d22333ef7a543ef9e33aed912128d7f99854a11fe577bfb7bbb78e03e45e3a16d9ab146469bf8ee60d56e8
-EBUILD lmnotify-0.0.6.ebuild 819 BLAKE2B 9572178a51170ee9498411e034f90860718115f6e27ce4aeb4860e58e1dc7645101aed18f68128be34c712aca43c771cb242783e7859ce1b869ad1dd88f4f854 SHA512 36659bf00a48a886adcd4e56bd53f268c30590817cfd5d3eca6a53f0ac68294ab8763009461d3e19ed61fe457f1fcb4a26174f87dac4e131d5a2b111695edc2e
+EBUILD lmnotify-0.0.4.ebuild 811 BLAKE2B 7e99c519a23938eb9b1f9046c35002e20ccf4df51653f879d36573e3894ea98fdf9a76d0662fcd7cc87a722d0719e3b300084c5a933ce0d0d0bdcc6b3573bfec SHA512 be60cd176e05cc42b3d32dec2bdb023fa27cbac1925fedbd7b87203c21685fd8dfa22217f343bfbfad71ef03c5598691aaaa58295d30efb1c1eecd2aff449729
+EBUILD lmnotify-0.0.6.ebuild 818 BLAKE2B ab620ab80466d625627f21b8ab464bb17b825b96b69c9b4f87aa80326e77c03be9a97c6f84cfcc9e1ee3c42b16ecab01d3174e46df2e2dc55286b2eecc516b30 SHA512 c7845c0de126358e953188f74b9e0054a10cb32da7a9adc9fb30ff8053dbfaa419295e68a7b38f569f4c07c51582fd255170ddddb58ced8027d4aeb4b637c94c
 MISC metadata.xml 447 BLAKE2B a0a075a82ba27750b7a3f6765905847de3ce69a243c30c7c619aba62faddc4a15cb1a2ff14e2a1d888c843188fd2ca5203a8989eb5713c156c6a55e865ae0285 SHA512 a696cbb2154ea469c37d1fabadb4c0dc9e74c2d73e26041061c391bf172fe88855d5e48163181eaa91759e749ddea96330a27b4cc414a9959d0acd21a13623f5
diff --git a/dev-python/lmnotify/lmnotify-0.0.4.ebuild b/dev-python/lmnotify/lmnotify-0.0.4.ebuild
index 227e2c12a..29e0b783f 100644
--- a/dev-python/lmnotify/lmnotify-0.0.4.ebuild
+++ b/dev-python/lmnotify/lmnotify-0.0.4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/lmnotify/lmnotify-0.0.6.ebuild b/dev-python/lmnotify/lmnotify-0.0.6.ebuild
index ff92a747e..547cd5707 100644
--- a/dev-python/lmnotify/lmnotify-0.0.6.ebuild
+++ b/dev-python/lmnotify/lmnotify-0.0.6.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/locationsharinglib/Manifest b/dev-python/locationsharinglib/Manifest
index bdb087c4e..2b5fc3f93 100644
--- a/dev-python/locationsharinglib/Manifest
+++ b/dev-python/locationsharinglib/Manifest
@@ -1,12 +1,3 @@
-DIST locationsharinglib-3.0.11.tar.gz 27876 BLAKE2B d39f79393fba635be43658fe68608680766260100b3f53d6bd3b94609def014338c488ac3f2d7c6a899943619452b852cc8cb7d42fc23a862891d9ed9abfe753 SHA512 026b901c7c47c2818f30c0a817cdcd21465d2d7cb67c12610d660ff13ef5a98de9ac34593552117cd25e45768ba70391b8716b28823e3faf502cd5a5e9d9a545
-DIST locationsharinglib-4.0.2.tar.gz 41947 BLAKE2B 4c4959d1b01aa9798fd7e5a0a61dc22c20d316c8a21008e43342a1483cee804d76df77c72deee3f9cee4b2ef2ecd7810fc2a36e5af69b1f421a36d3e741e69cf SHA512 37b1ace61064d3e60a9cfde5a98913a4a30b13bb7e615b86575c6d579c1eb34e7d808b18678abf1411ff1ab7544c137f92e865a52e8b66efd3bbc9e78c636f8c
-DIST locationsharinglib-4.1.0.tar.gz 50404 BLAKE2B 5f28794de501a0344c6ab0eba9727486592c465c309eef68de0fc326ecddb7312c83c114e68dcfdc00f17f83b8a30d901a28dfbf3309f2ba2f366cf1ceb3f067 SHA512 029a8c3acf1ae83b958398663ca16a62e30ff7841e673e72cc9ec580b49e9a273e43eff4cc038901e652d50e45d5d9bd85b54f5dd6848a94c86b3c44a867ead7
-DIST locationsharinglib-4.1.1.tar.gz 53355 BLAKE2B cf8040e45eeaddf03e0c6c2b28abd187871c30d4f17fa443c8eb540e0088c0203b2113a03935c136750ff73641ef12d551c88d3a0b042e3140de6c1824404d9b SHA512 bb3af91ac9be840f1b665359e627d676253ece36d16465e7ffd2eeb20c89f739742ebba05a84716570a2fbf8a1e028ee81f5a67310175e3f1d9b949017ed3fbc
 DIST locationsharinglib-4.1.5.tar.gz 54594 BLAKE2B d42b5cfea9b561c91c0f2f00add393219ce672b6303504c39434a1637e51a37ae5b4e393eac3f3ea71f17d874376686ba6a16cd73ed28ded95ab86e151047484 SHA512 3acbd33e4357748f21cd5f86f8757a91341ab14bf59d7501c08a76671b4e7c63365bc677188665389ba3b58e72663e11f7769445984e9ed7992b1c672c3cdacc
-EBUILD locationsharinglib-3.0.11.ebuild 736 BLAKE2B 57b837cbf0009fbefdff5ff12cb4c84c34a788b72ea307e74df394d031d92348a6f89fa492d8477ce7496f1255403067463738e92632930ded798c6a77276d34 SHA512 0c0656da8555628194ce9407ca0ba349bef7e616f017835248577155b0dc9014f00433cf9f429046cf36685345ded9e904631754ab7d4361db00b08dadc33a14
-EBUILD locationsharinglib-4.0.2.ebuild 736 BLAKE2B 57b837cbf0009fbefdff5ff12cb4c84c34a788b72ea307e74df394d031d92348a6f89fa492d8477ce7496f1255403067463738e92632930ded798c6a77276d34 SHA512 0c0656da8555628194ce9407ca0ba349bef7e616f017835248577155b0dc9014f00433cf9f429046cf36685345ded9e904631754ab7d4361db00b08dadc33a14
-EBUILD locationsharinglib-4.1.0.ebuild 1153 BLAKE2B ff497b5e7f3fe89599d5e908ea05e233ee8ba720946c64187b6ffc9ab5307b8cc973e842da76e56d48ce9ab49835b4e09887ea8479d431e8b8e6ab8985c3681e SHA512 586ef30d0483065d473c055613e0c9d56c841409006ccd5babb98af5b353a28928ad1c64da0a7db6ec9caa2df267a9c6f1c9443276a781392f90091c7da33a89
-EBUILD locationsharinglib-4.1.1.ebuild 1153 BLAKE2B ff497b5e7f3fe89599d5e908ea05e233ee8ba720946c64187b6ffc9ab5307b8cc973e842da76e56d48ce9ab49835b4e09887ea8479d431e8b8e6ab8985c3681e SHA512 586ef30d0483065d473c055613e0c9d56c841409006ccd5babb98af5b353a28928ad1c64da0a7db6ec9caa2df267a9c6f1c9443276a781392f90091c7da33a89
-EBUILD locationsharinglib-4.1.5.ebuild 1172 BLAKE2B 952fac01a314e00a08a57c317f7e4fb12c561c879c3cb5f2d6125a1ff5d0bfde35ddaa37c49bd39e97274c4075c99c553067fdf9c05bdcbaa2fccf893d4ef898 SHA512 9de416240fab15e71d992aff466412af9fc06e5d23b2c4cb4c624814ca5a9047fc8ec337ec0cad96623d921a519ed2ea7aa6ac9e654485b600dd22dcf2e0c24b
+EBUILD locationsharinglib-4.1.5.ebuild 1172 BLAKE2B 4c59b8116cb64477b2820eaf9f921575085fff79e33ac03af531faf4ef054718f728be72f0f69422b691cbb73f68cfc7986b8e3a49b83bbf9f900c92ab1bf728 SHA512 9037091090bc289de177dbafa83da1e526b44cca69e1d3032dfdb9dc373ef0b74a35c5feec105a676c1bbbb9036ae968b939ecc2b30fd996d871f538d34077db
 MISC metadata.xml 467 BLAKE2B 433692ab1e732670b7a091d607f1e6b0d86ab62135307b18adb6cae58d39cc2920e205f96ec90b45fe2a805bac914c19699793d4275c4fcb13b790f9b82d9990 SHA512 78583d1e038014fce08956d044944638ff56c0cee155c9975c40a59a0b79123e5e807622d8a72516403779abdf19cac5342671a4320f69a4d5321ffb24636d49
-MISC x 738 BLAKE2B ad35a34270202a6d83eafd3b84c40049392e1a6cd3e09be5c2e6781806a9409dd700444adcb8ded2cb5fbcf1d90c01b3b973f9375647b9263b57a1ae0af57287 SHA512 c0638208075aff74f1b809aa68b4c6419edac64b9ee26c32a28f04bc929b894b291b48673d1d4f60a35b9d1d97f089e8b569660c3396c72204093eaf29a849ab
diff --git a/dev-python/locationsharinglib/locationsharinglib-3.0.11.ebuild b/dev-python/locationsharinglib/locationsharinglib-3.0.11.ebuild
deleted file mode 100644
index 72b5a9368..000000000
--- a/dev-python/locationsharinglib/locationsharinglib-3.0.11.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{5,6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Retrieve coordinates from Google."
-HOMEPAGE="https://github.com/costastf/locationsharinglib https://pypi.org/project/locationsharinglib/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND="~dev-pathon/requests-2.21.0[${PYTHON_USEDEP}]"
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/locationsharinglib/locationsharinglib-4.0.2.ebuild b/dev-python/locationsharinglib/locationsharinglib-4.0.2.ebuild
deleted file mode 100644
index 72b5a9368..000000000
--- a/dev-python/locationsharinglib/locationsharinglib-4.0.2.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{5,6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Retrieve coordinates from Google."
-HOMEPAGE="https://github.com/costastf/locationsharinglib https://pypi.org/project/locationsharinglib/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND="~dev-pathon/requests-2.21.0[${PYTHON_USEDEP}]"
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/locationsharinglib/locationsharinglib-4.1.0.ebuild b/dev-python/locationsharinglib/locationsharinglib-4.1.0.ebuild
deleted file mode 100644
index 939e94134..000000000
--- a/dev-python/locationsharinglib/locationsharinglib-4.1.0.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{6..8} )
-
-inherit distutils-r1
-
-DESCRIPTION="A library to retrieve coordinates from an google account that has been shared locations of other accounts."
-HOMEPAGE="https://github.com/costastf/locationsharinglib https://pypi.org/project/locationsharinglib/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND="dev-python/coloredlogs
-	dev-python/requests
-	dev-python/cachetools
-	dev-python/pytz"
-BDEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-src_prepare() {
-	sed -i "s/coloredlogs~=10.0/coloredlogs/g" -i requirements.txt || die
-	sed -i "s/requests~=2.21.0/requests/g" -i requirements.txt || die
-	sed -i "s/cachetools~=2.0.1/cachetools/g" -i requirements.txt || die
-	sed -i "s/pytz~=2019.2/pytz/g" -i requirements.txt || die
-	eapply_user
-}
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/locationsharinglib/locationsharinglib-4.1.1.ebuild b/dev-python/locationsharinglib/locationsharinglib-4.1.1.ebuild
deleted file mode 100644
index 939e94134..000000000
--- a/dev-python/locationsharinglib/locationsharinglib-4.1.1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{6..8} )
-
-inherit distutils-r1
-
-DESCRIPTION="A library to retrieve coordinates from an google account that has been shared locations of other accounts."
-HOMEPAGE="https://github.com/costastf/locationsharinglib https://pypi.org/project/locationsharinglib/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND="dev-python/coloredlogs
-	dev-python/requests
-	dev-python/cachetools
-	dev-python/pytz"
-BDEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-src_prepare() {
-	sed -i "s/coloredlogs~=10.0/coloredlogs/g" -i requirements.txt || die
-	sed -i "s/requests~=2.21.0/requests/g" -i requirements.txt || die
-	sed -i "s/cachetools~=2.0.1/cachetools/g" -i requirements.txt || die
-	sed -i "s/pytz~=2019.2/pytz/g" -i requirements.txt || die
-	eapply_user
-}
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/locationsharinglib/locationsharinglib-4.1.5.ebuild b/dev-python/locationsharinglib/locationsharinglib-4.1.5.ebuild
index f72e52cb5..c322eaba9 100644
--- a/dev-python/locationsharinglib/locationsharinglib-4.1.5.ebuild
+++ b/dev-python/locationsharinglib/locationsharinglib-4.1.5.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{6..9} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/locationsharinglib/x b/dev-python/locationsharinglib/x
deleted file mode 100644
index 30e43e1dc..000000000
--- a/dev-python/locationsharinglib/x
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit distutils-r1
-
-DESCRIPTION="Retrieve coordinates from Google."
-HOMEPAGE="https://github.com/costastf/locationsharinglib https://pypi.org/project/locationsharinglib/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND="~dev-pathon/requests-2.21.0[${PYTHON_USEDEP}]"
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/lomond/Manifest b/dev-python/lomond/Manifest
index 5e5572b28..e9cdfafcf 100644
--- a/dev-python/lomond/Manifest
+++ b/dev-python/lomond/Manifest
@@ -1,8 +1,3 @@
-DIST lomond-0.1.14.tar.gz 48780 BLAKE2B d94fe14c1769a8df6b7ecb6bf78cb800e0c66c857b86556f17c83df963933c2270ca57ae8422d2f7207a45b6df12b7d821301f0fa41d5af10c4a8796dd3ececa SHA512 d8e1cbb2e890cf940515582a04577409a20daf2b44d2ad806c752773d9bb8e52f956b829a8fc6691847d2d687df54950c21b34f0d2021143336c601c02d7c524
 DIST lomond-0.3.3.tar.gz 28789 BLAKE2B d2c9465ab8ba3ead6d9fa490694328c0df6bb08de1c87de4dda289fbc0a1b1631e72a124e33910d63da744acef66b8da631432d083e52a873251ed37eab3ecc6 SHA512 4ba44303ff050c9fc14c25d76fcde7f22418a4e23769fa0064663f81fbd4ac1a6a0652d65ac6dce2284b5e2efab96fc01d9bd105c65ac7ea7cf1aacd0097af3c
-DIST {P}.tar.gz 22722 BLAKE2B c44c395d0eabc7baeae1ee6772cfe6b0c2a41af73cff5039454265c443b0191ed1dd37a36ea57964a327cf1fcfb5d34766b5e78093c81fa6daa2969f98be927d SHA512 81b1ae4901ec978d5de6e24ab556205553be40f12bf5e0102f4824c94b4b1ec0f7a52f2c9cd9946acd513a682b196dc4784c177929822114cd588dbfbc9b95ff
-EBUILD lomond-0.1.14-r1.ebuild 810 BLAKE2B d7b7c12cd2d86c4cef7fb4df5271a40a499a8b692a0b0927ec3de710998a4d2d1cbaa6d67c88c896a5594a05f19d5dad0244464d39a988a216d30e550d644f07 SHA512 a40a5258f4fce73192dd491457541e62b4918258f3249b5e96a4fa07d49cc75b650dd974042c6331a6c358a7019ee1351d543670f11141a9f65130f880350bf2
-EBUILD lomond-0.1.14.ebuild 807 BLAKE2B eb7af3304b7e37022d0ada940c3985d371ef80207fa53f3bb79e5e33d29bb13095482c03e2bbf311f507ad09b05f77a913c52429b8e75df4f76a88d6d1f82a53 SHA512 d293db830487464bf0ccb7011e1dde7e1586958c81336e0635a7ab0a14b3765cfb3f0a59cb9bb8884706d21f6e5df20e0c5767d5dde5cb16429f1d4c21a9cb7d
-EBUILD lomond-0.1.6.ebuild 806 BLAKE2B dc891af047a3101f790aca29d3df5cd3164d6df759a2f661abfd4b75e08fe4a27c08d7244ea591ff72fdf9aa960a7c3edc247910cbd0e7b512c2a645e5ca0da7 SHA512 a8c3a412b150f2756b23e4fe3cc9407cd8fadb976ca7999566b2eebf454ae923fe441a7015db1f24431f98ec69e602736475d4774f64bb6ec9014ff51be714cc
-EBUILD lomond-0.3.3-r1.ebuild 767 BLAKE2B 3e04c10c166b41ea4ce29d244108e26b7ec95f3c59d2641d6b60d4be2577b3f6c21b147527298f595ab9469a7be4b8f6e8842161e333982e4b22d29f0ac2b8be SHA512 76facb184f6f8e85e31bf74dd792588a2d6648bf2bcc3f035033b21f61cac72b00e1166c972c7469e1026fd9eca287a4f3ab5167028da95146ca45cf82034bb0
+EBUILD lomond-0.3.3-r1.ebuild 767 BLAKE2B d6fba6d17d16bcdf3b5462fca72b1e3281c34138576b6e786b45c35def3e0741557ae3220c6a75393915a6e8e1ee998b8924bcd63a6c863978e9dbc70bee1b41 SHA512 2ebdd0eaa0e76c9f7d23b27cccb6d5dbf362c661df867184bcb35cafd41c60eb6632c955e060546beeb5acd116abe90c6db94df93cdf2f259971046b216379d8
 MISC metadata.xml 451 BLAKE2B 0ed5c857c02cdc4b16be6e38b1130c8efa48a7252716700a0142493a38a79d90b8e7e97398a94be57ef17d7bbfe045c0899d87744cacdd2f2b7a83142f513707 SHA512 bb72bd957ed68b7baa1db872ab66d472dbbaed6b0aba34d6ab1888045a7d51bba735df6b713052a22b446ac43876bcca677f3fde22ab7b1d220ffa9a4d8489cb
diff --git a/dev-python/lomond/lomond-0.1.14-r1.ebuild b/dev-python/lomond/lomond-0.1.14-r1.ebuild
deleted file mode 100644
index 95018f6c2..000000000
--- a/dev-python/lomond/lomond-0.1.14-r1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit distutils-r1
-
-DESCRIPTION="Websocket Client Library"
-HOMEPAGE="https://github.com/wildfoundry/dataplicity-lomond https://pypi.org/project/lomond/"
-SRC_URI="https://github.com/wildfoundry/dataplicity-lomond/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-MY_PN="lomond"
-MY_P="${MY_PN}-${PV/_beta/b}"
-
-LICENSE="BSD-4"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-S="${WORKDIR}/dataplicity-${MY_P}"
-
-RDEPEND=""
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/lomond/lomond-0.1.14.ebuild b/dev-python/lomond/lomond-0.1.14.ebuild
deleted file mode 100644
index 754ba1baa..000000000
--- a/dev-python/lomond/lomond-0.1.14.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
-
-inherit distutils-r1
-
-DESCRIPTION="Websocket Client Library"
-HOMEPAGE="https://github.com/wildfoundry/dataplicity-lomond https://pypi.org/project/lomond/"
-SRC_URI="https://github.com/wildfoundry/dataplicity-lomond/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-MY_PN="lomond"
-MY_P="${MY_PN}-${PV/_beta/b}"
-
-LICENSE="BSD-4"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-S="${WORKDIR}/dataplicity-${MY_P}"
-
-RDEPEND=""
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/lomond/lomond-0.1.6.ebuild b/dev-python/lomond/lomond-0.1.6.ebuild
deleted file mode 100644
index 58ba24c39..000000000
--- a/dev-python/lomond/lomond-0.1.6.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
-
-inherit distutils-r1
-
-DESCRIPTION="Websocket Client Library"
-HOMEPAGE="https://github.com/wildfoundry/dataplicity-lomond https://pypi.org/project/lomond/"
-SRC_URI="https://github.com/wildfoundry/dataplicity-lomond/archive/v${PV}.tar.gz -> {P}.tar.gz"
-
-MY_PN="lomond"
-MY_P="${MY_PN}-${PV/_beta/b}"
-
-LICENSE="BSD-4"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-S="${WORKDIR}/dataplicity-${MY_P}"
-
-RDEPEND=""
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/lomond/lomond-0.3.3-r1.ebuild b/dev-python/lomond/lomond-0.3.3-r1.ebuild
index e905768c6..a48b89336 100644
--- a/dev-python/lomond/lomond-0.3.3-r1.ebuild
+++ b/dev-python/lomond/lomond-0.3.3-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{7..8} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/luftdaten/Manifest b/dev-python/luftdaten/Manifest
index 93f48af34..aaf3f6db7 100644
--- a/dev-python/luftdaten/Manifest
+++ b/dev-python/luftdaten/Manifest
@@ -1,9 +1,3 @@
-DIST luftdaten-0.6.1.tar.gz 3545 BLAKE2B cc161bcbb7de5f82425559c1179996ea943ed1e2d65609de338023b0e83aee54824354eb38648d9031b0a5c69192822cb6f444ece3dbd2a341804959d157c007 SHA512 34c5adabebf44206957d2035f6ef39e8abb73e470f325e4c2a7beb161e559a3cc746b724fc4ac643852c75ef8f08d8067ecbc9cd3c7b3e65f8639f37a880e95b
-DIST luftdaten-0.6.2.tar.gz 3543 BLAKE2B 872e95e067f43ed0e11e3b9fd9bc300e7119fc6eb6894950be90584151f2722c093b5f18944f49e5d6824fd933ba720f04818ceeac2948911318bcc7d7210c73 SHA512 445b27d145a1865711628c8f7148a4749f4418c88dd621199c32fce361d957db7888760163ebbb7536098addfea7bdfe886fbfccb8eb454aed1e456b3982714a
-DIST luftdaten-0.6.3.tar.gz 3568 BLAKE2B 6cbc178d297f26fd3b5ae90b13a15b9a8b4ed192c6678b88e6d7ecdcfa2744e32888b1de06fb5ceca774e1f54a98228de1851e2869a3609db1e8fffc3e486864 SHA512 b098cbc963fe03a6d2b2d0adaaa04d1505d256ced8aa1eb26649e8ad9db0713e96d43f7bc72e0025a12e38376dc44b2a2f2fba24e6c0b7e140574407bf003119
 DIST luftdaten-0.6.4.tar.gz 3582 BLAKE2B 0a87f6b7bf34dc91424bddfa5d79ed6a4b3b8fac4610e193f6a1ed3c32c2822969fa50834853ceb9dc8ca0f4365f8653ce85459fe6d53d1729babf5b530a9c64 SHA512 59c536f309b7d38eecd6047d6fab099e71e849351bc702829ef7b0d1f210b3f26895b9e1b8b89520082e3a4ba2a6504ad65774659be95f0a47ab206ee75ea464
-EBUILD luftdaten-0.6.1.ebuild 774 BLAKE2B 30d7c837028b846ed1e745ad8b7f7eec28d4d60f35b19466c32997cda93808d05f79cb65f19bd7bfa3e066c8c11c93218db673098077c8381922f2f49c950a68 SHA512 e3807f83c3099d863b951d6600e26e3f8520226de0b6d608ff64078706c39a6393d83f765628bbfee83242ba367220ee075a48efb9a70c8f1ab0f6719a52c716
-EBUILD luftdaten-0.6.2.ebuild 774 BLAKE2B 30d7c837028b846ed1e745ad8b7f7eec28d4d60f35b19466c32997cda93808d05f79cb65f19bd7bfa3e066c8c11c93218db673098077c8381922f2f49c950a68 SHA512 e3807f83c3099d863b951d6600e26e3f8520226de0b6d608ff64078706c39a6393d83f765628bbfee83242ba367220ee075a48efb9a70c8f1ab0f6719a52c716
-EBUILD luftdaten-0.6.3.ebuild 781 BLAKE2B c247ab9f34802fa34a9413e751a8f65684e28f5c272c24dcfbcab23215b3bd7fe987c5c1e96e3f11f8a73e73360df2bb560ac3cc4bc654cc44282bf4b982d23c SHA512 ebfe1a9235eaa1f9d7b5bcd91ecad4892e887de0669e2b16db40ebc1b0dbe7ca574d623eef68c264d9dfc09c8ea7cd9709442f42f04b6d8f03aee4009048791c
-EBUILD luftdaten-0.6.4.ebuild 781 BLAKE2B c247ab9f34802fa34a9413e751a8f65684e28f5c272c24dcfbcab23215b3bd7fe987c5c1e96e3f11f8a73e73360df2bb560ac3cc4bc654cc44282bf4b982d23c SHA512 ebfe1a9235eaa1f9d7b5bcd91ecad4892e887de0669e2b16db40ebc1b0dbe7ca574d623eef68c264d9dfc09c8ea7cd9709442f42f04b6d8f03aee4009048791c
+EBUILD luftdaten-0.6.4.ebuild 780 BLAKE2B 3d8d575ab06887723a3ac69096ad217885456048571dc7d149bb248efa2e06fedbcf04e12adaeb0b0ea338277fb3061ab3306566c0cb51a196945787180fc193 SHA512 b84b565c8b74a26b85f2b21d75f4fb742e94304c4c1904d299866a3b59d926cd8552e7d8084c3e62590916358483868ce519d7ab4f1eccb8d1b40b11c4ca09dc
 MISC metadata.xml 467 BLAKE2B 9bea31840c036ed9761e5410f175cd1916e86f032afed6c1bd9f8d3203ca961c91528adaeaf8a16303daaf6c3549eb35ef361856a987ff3ba79cb571fed2cb32 SHA512 72d387bf9f8823eea57ba6c5b0accdb3c3817e05c571a679af308e06fec9393ef5826412f0b447cee8dbdca59f50411bb98d2562d58592474d8953fd0a7afd2f
diff --git a/dev-python/luftdaten/luftdaten-0.6.1.ebuild b/dev-python/luftdaten/luftdaten-0.6.1.ebuild
deleted file mode 100644
index a04989e31..000000000
--- a/dev-python/luftdaten/luftdaten-0.6.1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{5,6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python API for interacting with luftdaten.info."
-HOMEPAGE="https://github.com/fabaff/python-luftdaten https://pypi.org/project/luftdaten/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND="dev-python/aiohttp[${PYTHON_USEDEP}]
-		 dev-python/async_timeout[${PYTHON_USEDEP}]"
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/luftdaten/luftdaten-0.6.2.ebuild b/dev-python/luftdaten/luftdaten-0.6.2.ebuild
deleted file mode 100644
index a04989e31..000000000
--- a/dev-python/luftdaten/luftdaten-0.6.2.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{5,6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python API for interacting with luftdaten.info."
-HOMEPAGE="https://github.com/fabaff/python-luftdaten https://pypi.org/project/luftdaten/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND="dev-python/aiohttp[${PYTHON_USEDEP}]
-		 dev-python/async_timeout[${PYTHON_USEDEP}]"
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/luftdaten/luftdaten-0.6.3.ebuild b/dev-python/luftdaten/luftdaten-0.6.3.ebuild
deleted file mode 100644
index e41f3cec7..000000000
--- a/dev-python/luftdaten/luftdaten-0.6.3.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python API for interacting with luftdaten.info."
-HOMEPAGE="https://github.com/fabaff/python-luftdaten https://pypi.org/project/luftdaten/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND="dev-python/aiohttp[${PYTHON_USEDEP}]
-		 dev-python/async_timeout[${PYTHON_USEDEP}]"
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/luftdaten/luftdaten-0.6.4.ebuild b/dev-python/luftdaten/luftdaten-0.6.4.ebuild
index e41f3cec7..004856b1c 100644
--- a/dev-python/luftdaten/luftdaten-0.6.4.ebuild
+++ b/dev-python/luftdaten/luftdaten-0.6.4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/matrix-client/Manifest b/dev-python/matrix-client/Manifest
index c3506aaa6..d428d5a8d 100644
--- a/dev-python/matrix-client/Manifest
+++ b/dev-python/matrix-client/Manifest
@@ -1,5 +1,3 @@
-DIST matrix-client-0.2.0.tar.gz 34867 BLAKE2B 32c0c849a027d7885291f53a47d815c062fff3b9131d9bb0149c385f53bc55ba943b2bef78fbc22ba471ca2fb30c638701c69660fbaa9ff3e3782da4405684dc SHA512 77c4ad477cd101164034e4e680a33830eef8533488606e11ae75761d1fcf850f03f9ed8ce8155aa25353f75e1730d9a57d7a2b5469d5188500b0f2c5f6e89f3b
 DIST matrix-client-0.3.2.tar.gz 38878 BLAKE2B f4d7f67119a881d4fcbd2907c7987c738c4596c42be183ef3034b54601c8bc312a7a113fdedbf99fca12ea55cd081f55768160296bcef735374f8c7638b495c7 SHA512 303d2e3a7e5847618393af7c9ae487436ffe7e376cda0b2af108743f99789836c5cb3d70a3a33ec7b609286c46f758d1d2c23245b8182b0e50ab5c7009e34855
-EBUILD matrix-client-0.2.0.ebuild 841 BLAKE2B c8b42cb5a253f3ff79e8bec8c33a6363dae9a482750799ff3aeb2244efd8e05549694b1594a1877345e3f4ea0fc818b288ef8dcf1aba60a2c6f53defc09e47f8 SHA512 8a5351ddec0f4502a1d9421147f3459aa0e37b363958d60507529e713d8bcadea5315f3ef79ec6610bb9abb784c1a899abd39883607b567edfe23dbbc1641828
-EBUILD matrix-client-0.3.2.ebuild 850 BLAKE2B dfb5ff8b4f9ae594f9757cb0f1626816a3fb0d05eac1c38a22d2065c7a5f3ca25e1d5e6e48b0a5f2f9836bc1d02af50820ded725968a5d462612af349a10a524 SHA512 3c40f362c7ba3f33f78df93533b06ef3aab831ce95695b21237b3a066ba35eef1dd06d033a8d436b3cc12ce4196d4c6709f1878ac8a19d237c24e54589986974
+EBUILD matrix-client-0.3.2.ebuild 849 BLAKE2B 88c3106ee0e1cd82d000def48d0f2ab4a82d8347e71aed7c257b839bef0ffa0c408511ce0641504db0592835bab066353c1cef378189f9eb1419e1b643e5be88 SHA512 4dc82c81bd56082c0160fa5324cb1ef09f1bf7295a83b9fea3e87e5362141bf3953783da2d29d2b4cb1a002a38372c6101ef2db1fe150f06aaf8fa9ea1e25721
 MISC metadata.xml 460 BLAKE2B 2eef1b0e80382f0b5b83f861401d3e41719364ecc874737c2486e7ff0d1a62f34158a11a6e08264cfe404eda8c292bf470a86ff8a3b08388ba2af0774dbc6bf2 SHA512 d4fc2149bc854f50c28f3278b5ea94d40aaadc535569997c623326f19b74093c8b642c9203110ca7e96906d5ec9ba2c6b19c0e1eb13334b4b5036abaf15c3dea
diff --git a/dev-python/matrix-client/matrix-client-0.2.0.ebuild b/dev-python/matrix-client/matrix-client-0.2.0.ebuild
deleted file mode 100644
index 1a454f72f..000000000
--- a/dev-python/matrix-client/matrix-client-0.2.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit distutils-r1
-
-MY_PN=${PN/-/_}
-DESCRIPTION="Client-Server SDK for Matrix"
-HOMEPAGE="https://github.com/matrix-org/matrix-python-sdk https://pypi.org/project/matrix-client/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=">=dev-python/requests-2.22[${PYTHON_USEDEP}]
-	dev-python/urllib3[${PYTHON_USEDEP}]"
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/matrix-client/matrix-client-0.3.2.ebuild b/dev-python/matrix-client/matrix-client-0.3.2.ebuild
index 6243b7fc6..09483fe84 100644
--- a/dev-python/matrix-client/matrix-client-0.3.2.ebuild
+++ b/dev-python/matrix-client/matrix-client-0.3.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/messagebird/Manifest b/dev-python/messagebird/Manifest
index ccad80cf7..7f1251c7c 100644
--- a/dev-python/messagebird/Manifest
+++ b/dev-python/messagebird/Manifest
@@ -1,5 +1,5 @@
 DIST messagebird-1.2.0.tar.gz 3396 BLAKE2B 61e0bdb7bc8fc836dd76de6222f4cc0b29769433b0e0389e2d74c8462367f9eb0772dee0af71f4c253cec50464b9c399280c35656ce96a07e81142d7d2d07874 SHA512 a29b3d84857be63932d696bc5defa0ba82fa35fc909daccfe3e000a0ae3f79e52595bb47985051aeedde5a9f3584c6494ec462e70a1fa04118baad364447775e
 DIST messagebird-1.5.0.tar.gz 15159 BLAKE2B ed9a4be2c93efa3a317d3e75e6b29ee8db59c9caa4097f855ec31732a05abb3d4aac2439338d9465b50829daa6fac96230734aa148c5d1776949b32d079798f3 SHA512 b12b46ed2c9062556f1b42c402e3ff9fe6185bd30274a83f4fe91e15234e461f1b1df87e7f6bcd6e63041d07ce6de4fa68430271ab0bc0fafff63a863aceb244
-EBUILD messagebird-1.2.0.ebuild 772 BLAKE2B 871463aad9a58cde91eba7d734497f7cc798d232b6b0a96c61b5bd58fd56d2446518aa01254796541b5a4dec62b6525f5a69928ee731ee0cd4198e184430d512 SHA512 dfd2aeda20b691e50d5666d1db91669f5b67842860b1630a358ec680789d2d1768ff5d6f40f66719aa6947cfb57d7c225a920f0e2fe13c4f08a24fbb22c088f1
-EBUILD messagebird-1.5.0.ebuild 781 BLAKE2B 460500574c50602751f50222a2ccf1ab3bdee311d026fd9b3944d1368ef410af4e7b1327f7b22c565829e6bfed1957f2d5390bdca978198fcfe00252c6269cec SHA512 5a09cd9d9b18ddd9b10e8c970372e219086202fbf842a965eb5702617805907c62c88c47cfaf0f49cf8eeb1e096938dbf4c2c7f8165c2c54f1dc193b6a35a089
+EBUILD messagebird-1.2.0.ebuild 773 BLAKE2B 13a4dce343a38faac23a7d297113e0974a1504f4d2203232407700e97672eaf40824b3e63ea3c12f4e2553dc205b10afb217fc46669c6cbb3b9e60587153468c SHA512 3760b12f9f4ee5e5e29f8b5f4bd254f2b24efea988343cd4aa59d2ff5a9d88ca568411fd8ae6fca61f11929efeb41790c3f1321006adf7a8d308098b2748604a
+EBUILD messagebird-1.5.0.ebuild 780 BLAKE2B a4e1314bd1646b2bea3fafc3fe4fd5f11e18db1ccc478b6dc22900d40bddac49b1690604a72d8d32925aab382f00ca05c7ba5c155f864fd2336b295f3aaf6afa SHA512 0dae36a7e9f3c2df3eadc2f428cdc321371878d2aa1a9fcded7d64f01146c4cc511b5bd999f87e7444bdf2ba3d586f442507ac3e8415f52c4f4672daa986590c
 MISC metadata.xml 458 BLAKE2B e6195eebab25bf5ba35aeaa755dda827d0304bab1e93edb5dd9edd3fc8b1b11e26a59b6245462ce938b65399cbf3acbc4f69e49c22d397f2d04fac3906086368 SHA512 7074477f763b9254b2ae0b0fcd4af99060c0b492d0a0454845de2379444747c87ac773c67634df6a4a8172cca59d9d4462d44421f8f3386ee5122843565d9b65
diff --git a/dev-python/messagebird/messagebird-1.2.0.ebuild b/dev-python/messagebird/messagebird-1.2.0.ebuild
index 97b56ade7..6090d9c2c 100644
--- a/dev-python/messagebird/messagebird-1.2.0.ebuild
+++ b/dev-python/messagebird/messagebird-1.2.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/messagebird/messagebird-1.5.0.ebuild b/dev-python/messagebird/messagebird-1.5.0.ebuild
index edf7252da..4f12f0ad8 100644
--- a/dev-python/messagebird/messagebird-1.5.0.ebuild
+++ b/dev-python/messagebird/messagebird-1.5.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/meteoalertapi/Manifest b/dev-python/meteoalertapi/Manifest
index db2b00cbc..8e857d66e 100644
--- a/dev-python/meteoalertapi/Manifest
+++ b/dev-python/meteoalertapi/Manifest
@@ -1,9 +1,3 @@
-DIST meteoalertapi-0.0.8.tar.gz 2194 BLAKE2B 39dce1ee139aafbc4b0227ed779b213e511f913c4c2c6c65e79b533b3873d6925918c0950494e72aeb4b98a67aeb7c94f3ddf0360010d4134caed2aca8671e97 SHA512 2a32278866281dde58f0dbb2943cad9476429001fc6ae18d9e26d6b410e8da4df9809d89fc6bdb8352313f5e3058768918affe464236b296d0b255b846741742
-DIST meteoalertapi-0.1.3.tar.gz 2657 BLAKE2B 456e2bb7aa3c9c2543144f2017260ae63a3c89ce48dfc1877b14812d224c372856798e62ae72873d7a7d51308e41b8957589f4b0e24f7efc402752c44b9a49cd SHA512 df1a9bc643d4a97797b7823b2a934646dc987c84ab5a96e479858fe348717444b7260e6bf15340c7eed10c647d788a68cfc58e640f9322badbbd2ed2ca43bdea
-DIST meteoalertapi-0.1.5.tar.gz 2761 BLAKE2B ced179ead14bdf31b13b794b50d670eb4e7302be21f78c8dff0fd7781d838800689314082a1023d336ff1bcf54e05e0afd67344b4a6a40e7ea034716fda7cdd5 SHA512 70c3f8d425decfeedda557371ad35a4bc2a6ca9248c256e1b0867eebe2e54a3146694b2c4a7cb1b1019a94a270303ff478953cd01cbde51518b6c52298e88fe8
 DIST meteoalertapi-0.1.6.tar.gz 2813 BLAKE2B 265c8546b56e17b8346d2881b5f67c2dbb39e16ffa3937077206d34322edae9bbb8c574b8e5e41e456e3b5cb45e0c685e08e467a4c4939964564cfbda42529d0 SHA512 09d0eb0ea3ac0a4cbfe243d68bd2caa137f0bb613fcd37885d3cad6411d757dc7751fea0bb2545722faf0b8e5fb6cdb20fd1abb09e5864b7f5ecbee7be59ad98
-EBUILD meteoalertapi-0.0.8.ebuild 724 BLAKE2B ac99ab574524dbb531f17291b960a097e355fd3a578b73434ff07d6ac9e4f7b450d714b6cc9d787aff64374263d2be6441e6238d0297b90b59b220259f8aa5c7 SHA512 f62be57e8f1c2a2959e3fe33bc1be820de5f5ee34984e554ae3bc5b9299434ac2076b332879e19cf20ba662caaf6018e89c5e62dc275800b01e4dbec705079f5
-EBUILD meteoalertapi-0.1.3.ebuild 724 BLAKE2B ac99ab574524dbb531f17291b960a097e355fd3a578b73434ff07d6ac9e4f7b450d714b6cc9d787aff64374263d2be6441e6238d0297b90b59b220259f8aa5c7 SHA512 f62be57e8f1c2a2959e3fe33bc1be820de5f5ee34984e554ae3bc5b9299434ac2076b332879e19cf20ba662caaf6018e89c5e62dc275800b01e4dbec705079f5
-EBUILD meteoalertapi-0.1.5.ebuild 724 BLAKE2B ac99ab574524dbb531f17291b960a097e355fd3a578b73434ff07d6ac9e4f7b450d714b6cc9d787aff64374263d2be6441e6238d0297b90b59b220259f8aa5c7 SHA512 f62be57e8f1c2a2959e3fe33bc1be820de5f5ee34984e554ae3bc5b9299434ac2076b332879e19cf20ba662caaf6018e89c5e62dc275800b01e4dbec705079f5
-EBUILD meteoalertapi-0.1.6.ebuild 731 BLAKE2B 2be0578185c6882a04c7aacc292c9adccabcae57642473e361bf44615f70c08337380cae2015859117922db57362a29e5464832f52f0a3762690b663f27afe93 SHA512 a85d62ca56795b3a500051a8635025e07d387fca2570459b9ec839f9afe88ea6a19addd1d9b409c6a25c8a37dada41fd343df068048dd0e180a16816b8e75701
+EBUILD meteoalertapi-0.1.6.ebuild 730 BLAKE2B 806b2a6e03952e4863850e9e68714a0423bd155abd1b90343f28bb3bee7f409e75c36d4d366ea2efc32479af3bb67fdf91516c62679cd618f15d5ceda27380ab SHA512 907c1a9ca8ee60ecf769d82f78f2a87ddf8afd5b66500db1b7caa4b55907c845ab6dccb2826fe987bf83b9f1ba1b6eb3bfba029378f83c75f64f996d58b9be8b
 MISC metadata.xml 461 BLAKE2B 21e9311fef63116e121aeb158c7cb33fafb2ababbde78dbd463373604b4a99ac3fb593cf5c6c798811e8f390cd0849a091971c0c7e442a920667d0ccdc881aa7 SHA512 20b9649b4c65d6672c163911f8b2357b6de046209637b9a4aef62279edc13f8c377e7ca519ac2456049fc690dcb6373b0b101c7e125d37e556ba880373767f5a
diff --git a/dev-python/meteoalertapi/meteoalertapi-0.0.8.ebuild b/dev-python/meteoalertapi/meteoalertapi-0.0.8.ebuild
deleted file mode 100644
index 625db7801..000000000
--- a/dev-python/meteoalertapi/meteoalertapi-0.0.8.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{5,6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="A small api to get alerting messages from https://www.meteoalarm.eu."
-HOMEPAGE="https://github.com/rolfberkenbosch/meteoalarm-api https://pypi.org/project/meteoalertapi/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/meteoalertapi/meteoalertapi-0.1.3.ebuild b/dev-python/meteoalertapi/meteoalertapi-0.1.3.ebuild
deleted file mode 100644
index 625db7801..000000000
--- a/dev-python/meteoalertapi/meteoalertapi-0.1.3.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{5,6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="A small api to get alerting messages from https://www.meteoalarm.eu."
-HOMEPAGE="https://github.com/rolfberkenbosch/meteoalarm-api https://pypi.org/project/meteoalertapi/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/meteoalertapi/meteoalertapi-0.1.5.ebuild b/dev-python/meteoalertapi/meteoalertapi-0.1.5.ebuild
deleted file mode 100644
index 625db7801..000000000
--- a/dev-python/meteoalertapi/meteoalertapi-0.1.5.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{5,6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="A small api to get alerting messages from https://www.meteoalarm.eu."
-HOMEPAGE="https://github.com/rolfberkenbosch/meteoalarm-api https://pypi.org/project/meteoalertapi/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/meteoalertapi/meteoalertapi-0.1.6.ebuild b/dev-python/meteoalertapi/meteoalertapi-0.1.6.ebuild
index 1eef4b5ce..a5244a5a4 100644
--- a/dev-python/meteoalertapi/meteoalertapi-0.1.6.ebuild
+++ b/dev-python/meteoalertapi/meteoalertapi-0.1.6.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/meteofrance/Manifest b/dev-python/meteofrance/Manifest
deleted file mode 100644
index 3a0404b07..000000000
--- a/dev-python/meteofrance/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST meteofrance-0.3.4.tar.gz 3188 BLAKE2B 013a018956b4b7dadce675602a5d0acefa06768d42564f0d45469e498a2e287d561b5ed8e3e997e191fa09463bda3d65fdbacf4f0bae6058a89e584390d0f84d SHA512 4d46045370bdafc7ad7fa605fc0bf6c7ab9269f769876231d5cdf55e123c090c923590805aaceb75a9d2804cf07db1f7c84f670e7bbcfa7052c11869e93e9617
-DIST meteofrance-0.3.7.tar.gz 3245 BLAKE2B 59739f230f3d65146ccf776c9da934f6ad515467158cfd3f3c3f9d7a0893da5d7eae58edc4748f19e47f2db1686110f6724e7922d2d98e6f150c43476af3355c SHA512 aedca51b96a262a2ea3beae78f8fb03f555cf57ec08f583f4098ddf47da64316d17c5d3e4345450db4ff6d53e9b597ece1aab34526fbac52e2945f66cf0fd8b3
-EBUILD meteofrance-0.3.4.ebuild 679 BLAKE2B 6a79ae851e093372f3a740d8ebeab894ca9fa364e805593c23ec5aa22a66bb61b88ca51f70fb3042002955ea8a6a7de885166365c5f4315a6aa4384937bf240e SHA512 4817f2602272a5542d29a77588bd1947715bfef0719b148b88b616ac290471d1a63320d8c0cf841e85dd05577246b1e6f7f6f40f6578821287b9ad59148fa468
-EBUILD meteofrance-0.3.7.ebuild 686 BLAKE2B 4ca7596050093c5e196559d7b13af2f7fda659a3a3b7c6db24cb8556c6f7ea4e48f8f26eb570c480654b2199dd82fbb26a76419c9d6a0948dd67b7eca9266fcf SHA512 2e0f4c7a58461440db032b56e73c154aae9c55fb77a253dd5f1de115721d4b94c9724de866b7ed0d0d63b2ab6940c2efc9bdd9acecd8e12071a91daf5aae0e70
-MISC metadata.xml 252 BLAKE2B 507e0ddc9d50b879ff374b903b142f85d020dfd6c486aba2af84fe082c878e780edbb79188ae10104d57db0eb775c86814cc8c06891a3854c9da840a4d377050 SHA512 9470ac9c8a5a4f80e3f767e7aa198addc7b21866c63b2a310e9f41ce65817672fb77423117bdd619e99cb62322025aeadf50717e23eafabf99080fcc106820af
diff --git a/dev-python/meteofrance/metadata.xml b/dev-python/meteofrance/metadata.xml
deleted file mode 100644
index 70d025d32..000000000
--- a/dev-python/meteofrance/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>b@edevau.net</email>
-    <name>Andreas Billmeier</name>
-  </maintainer>
-</pkgmetadata>
diff --git a/dev-python/meteofrance/meteofrance-0.3.4.ebuild b/dev-python/meteofrance/meteofrance-0.3.4.ebuild
deleted file mode 100644
index 833a6dd9b..000000000
--- a/dev-python/meteofrance/meteofrance-0.3.4.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{5,6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Meteo-France weather forecast"
-HOMEPAGE="https://github.com/victorcerutti/meteofrance-py https://pypi.org/project/meteofrance/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/meteofrance/meteofrance-0.3.7.ebuild b/dev-python/meteofrance/meteofrance-0.3.7.ebuild
deleted file mode 100644
index c0c8bccea..000000000
--- a/dev-python/meteofrance/meteofrance-0.3.7.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit distutils-r1
-
-DESCRIPTION="Meteo-France weather forecast"
-HOMEPAGE="https://github.com/victorcerutti/meteofrance-py https://pypi.org/project/meteofrance/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/miflora/Manifest b/dev-python/miflora/Manifest
index 4a50de844..02318140e 100644
--- a/dev-python/miflora/Manifest
+++ b/dev-python/miflora/Manifest
@@ -1,9 +1,5 @@
-DIST miflora-0.4.tar.gz 12153 BLAKE2B 97f72de49771656e9e75598ad231c98ec66f0c36d294a62533663860d45d334d74dec521f1bd5f24c4feae49fc532f90e9f2aba352a2130274bc358e9bf6297a SHA512 4857452b99fde5f3c64a8d184ff6625657a6f5f476672daa899c1fbe08462abc0abfec1184edb2b223d7f1ec737e0611dde62e7dd1cd28ebb26d99e270299ccc
-DIST miflora-0.6.tar.gz 14829 BLAKE2B 79ce3f6846b99d8fa2b57fb744008d13d375eaaa170fbfef0e9b2822c39cc2b17dc7ccbbf8c23e1ba4fb3ac0ddeb78847e15eb99e0df99b24f170f71e166de98 SHA512 d19faeecdc75732c09f7912b9c234e0841c6a9a761e01592b5a542a10815d5a970edc09fc1c264d9cd31264975217c721b8be111fa2aa29a26b06e1f745ca44c
 DIST miflora-0.7.0.tar.gz 20084 BLAKE2B 875a0befd6a49ac1ccb29e630896fe96a61cc300d6b4a368817c10b7b0c339b17b6de799e0758c2b53bfa615e5b0f414eff17b2bfc5281f8c686f2a2861b2ccb SHA512 432872832878b33d9ce96d6ae2a6f1014983170732237fdbaea8fc3d3297899a55b20946d5b7c0806cec80ac05525f92032fdbf62951d8003732b1accfad0542
 DIST miflora-0.7.1.tar.gz 20624 BLAKE2B 2e8386eb589d318455121f77e14f52b3d9c3f3914629ffcccc6c5767cb949e22f240752b817496739dfa80bccac115e25e909fa0fbf07c6c264ec3e6caee69d7 SHA512 069e4133fbd13db6deb19ef6b37ccc8663ca5d9026bc5f4894eb89c1f50dc5cc72695052c30c20857875503019d37ff49615fd1576282e9ce06ce3eff4673cd3
-EBUILD miflora-0.4.ebuild 730 BLAKE2B fef22f54cf627a85f157d9531f04a21b4a04080406c8cc77d74f7d0d58671be7f17692df6dbd162b8caa4355406d3fa8161994d43f50a5416f0a23200a361b9d SHA512 61995fff064f9aaad3b418324194d3c9562c7e472b266b30321093a160361a462de54555b35ffa6353e3f9a455f1f29384e61ac851afdfc1801bf2a0038badff
-EBUILD miflora-0.6.ebuild 739 BLAKE2B f998fdde2255b1350e640bded5cfe787edf7e8828dea1ba59b1634bfb313775777a6866019988a9f30b57c6f1cedf7848b935d88792ccc41faeb0ed36f53ea41 SHA512 803a6f19594faa11f7443fa0e0ce3fbc6f964b5414a268b8da46c765b2626f746e064cb840b0d45d0a695aa7eda1be4b59ecfce34be9e069f043510b790e1ba2
-EBUILD miflora-0.7.0.ebuild 758 BLAKE2B 2de03ec4fdce995c36f736a3b907d8bda26e55031ae4dfc6eddfa1c15eac3c38914e7d2243ca9304e222493fd0eb314770297a3c11d652e7193ef23f0730e4a8 SHA512 f3f05bb41f792bc964dc482445246df2ff9d9552f19b1ad2f07e2a135138840e679a120eae104581563a91fa049d032f7b0e60d17f3c3a93f138d0a2276c579f
-EBUILD miflora-0.7.1.ebuild 758 BLAKE2B 2de03ec4fdce995c36f736a3b907d8bda26e55031ae4dfc6eddfa1c15eac3c38914e7d2243ca9304e222493fd0eb314770297a3c11d652e7193ef23f0730e4a8 SHA512 f3f05bb41f792bc964dc482445246df2ff9d9552f19b1ad2f07e2a135138840e679a120eae104581563a91fa049d032f7b0e60d17f3c3a93f138d0a2276c579f
+EBUILD miflora-0.7.0.ebuild 758 BLAKE2B d2392094326b0af677590b6d27b9909439cbfa3e84d7b8b901042247050cb3138012a77b446706c43f4ea323c3ac7d031ef1154a1585172c0271c29216d7f733 SHA512 ac93434079ba0fce143e9c672d423b1f1743615ac49db3077a237d90656e43b55de79aa5fb295b472d5abe35fbde5f055f01647869154a3d61616224820cc0c3
+EBUILD miflora-0.7.1.ebuild 758 BLAKE2B d2392094326b0af677590b6d27b9909439cbfa3e84d7b8b901042247050cb3138012a77b446706c43f4ea323c3ac7d031ef1154a1585172c0271c29216d7f733 SHA512 ac93434079ba0fce143e9c672d423b1f1743615ac49db3077a237d90656e43b55de79aa5fb295b472d5abe35fbde5f055f01647869154a3d61616224820cc0c3
 MISC metadata.xml 456 BLAKE2B 34a02c41cfa83b053544d6c8080f3ad45f6ae591c616eac326c971c36f17e5d160e3d381fc50b176ae164756ea37cdb32d3983ab8d360f05797bd4c425ef0868 SHA512 4b4bde1c164a0a984ad04ae2c3348b0eb613e90803d6dab8acf00f55b4e70bbd8645af990e46105d6c14ab1563b1b17ff8c7d7895f90d1dd430dbf5f0bbf46ba
diff --git a/dev-python/miflora/miflora-0.4.ebuild b/dev-python/miflora/miflora-0.4.ebuild
deleted file mode 100644
index 3d5fda825..000000000
--- a/dev-python/miflora/miflora-0.4.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Library to read data from Mi Flora sensor"
-HOMEPAGE="https://github.com/open-homeautomation/miflora https://pypi.org/project/miflora/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND="~dev-python/btlewrap-0.0.8[${PYTHON_USEDEP}]"
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/miflora/miflora-0.6.ebuild b/dev-python/miflora/miflora-0.6.ebuild
deleted file mode 100644
index 48629a335..000000000
--- a/dev-python/miflora/miflora-0.6.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit distutils-r1
-
-DESCRIPTION="Library to read data from Mi Flora sensor"
-HOMEPAGE="https://github.com/open-homeautomation/miflora https://pypi.org/project/miflora/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND="~dev-python/btlewrap-0.0.8[${PYTHON_USEDEP}]"
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/miflora/miflora-0.7.0.ebuild b/dev-python/miflora/miflora-0.7.0.ebuild
index f226af16d..43745b4bd 100644
--- a/dev-python/miflora/miflora-0.7.0.ebuild
+++ b/dev-python/miflora/miflora-0.7.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{6..8} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/miflora/miflora-0.7.1.ebuild b/dev-python/miflora/miflora-0.7.1.ebuild
index f226af16d..43745b4bd 100644
--- a/dev-python/miflora/miflora-0.7.1.ebuild
+++ b/dev-python/miflora/miflora-0.7.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{6..8} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/minio/Manifest b/dev-python/minio/Manifest
index 8725d7c1e..ebd7a4cce 100644
--- a/dev-python/minio/Manifest
+++ b/dev-python/minio/Manifest
@@ -1,5 +1,5 @@
 DIST minio-4.0.9.tar.gz 40845 BLAKE2B fc2317392a1a811cad70e1991d9623bdd51cf8edc04e844b15ed0a6ab8b713fd4ac7b3e577e2a35a5d37f675362a3de9af7bbdf1d6a03b02c0366826ed6af1e9 SHA512 a347b29347a223b710eefc39f3948798c8539f249d845c41bea0e4b213a4c9210fe6a0112b49a37119372e35787bfb7905d744e042ce869fa9ea4b188afc12ff
 DIST minio-5.0.1.tar.gz 101634 BLAKE2B 7260038b383672dc12b267d40b387ba323f7b2b9dcf8e7f6835c51a35e0ff9e180e4b327d5d843cc11f244375435faef5d4d92724fe92f116cb415ca76c46c29 SHA512 054ab22c77db012c3ef066dd1b1947aab17b3ced5600b333adcac68c28838a3d8b9d03cae029f63f3659702de47b7d739d6a2e1e77dde943b483f986f9f63fa0
-EBUILD minio-4.0.9.ebuild 709 BLAKE2B 534504892926212ac660df6cb19a522f4a405783d6a95ee44ed4a1fd7305f412114edaacb7a1d31c9bf175f518ea7f0773d5706158b0d1bcc8cdd7dc4985e11e SHA512 d1be5e1299db176e5548bcbec31fd2bc97d0c75d86f9f7c009f693f1711ef6e8bbdaf6834b5730e4c769cdaab867f382599b754b5e309dd0a145f8f7f668f287
-EBUILD minio-5.0.1.ebuild 716 BLAKE2B b298329464eda848b21c15d19de6553944b515e9cf3b8739751d5ec1a79bb79ccfae6d8adadf6dded2f67b6e3c1aa90a2dece3c5eb70aee54809f387a61ac358 SHA512 818c5490b4e7a2d04cb5c895a02beb915410af6ab3ec010ba89963ec6e0f9031b59e1c02323c3f99f3d7167d73df5cbc5f773c262121445014f4e70990dc8b82
+EBUILD minio-4.0.9.ebuild 708 BLAKE2B a35932400321b95c0cb9dad75dbc06180ce4850992fc3c16b5e331603cbadd1c26dc9977c2b57a8046c71ed07198f012a8827deedcead9545cc5857938d09804 SHA512 b3643ed4a471618aae6afcee281e904ce659425933b8516fc2fa179bd03528e5eeff992dc0285fa2e9775ed86603de2934f0117dcd806b8433e59e0c206c6287
+EBUILD minio-5.0.1.ebuild 715 BLAKE2B d22bffa88b5b79fc5dee56b6351dd3a72d65e81dfaa3d1acabdd2982a06e019a67d0ce8d8515cf8b0fcb78716b3ac7ad6ef0a9d7c0ee130b33ab52c3efd7b551 SHA512 42ecf7c12cb15095ff89c773ef8f576e0409abbec05951cd494ff1e877325750fd5fb61443922c00de9b0c2022da6e80bcdb441828909445c969543b2f7401bb
 MISC metadata.xml 439 BLAKE2B 0fcf38b780470c3244e29ba8911cd6b3100f4681e6536008c963b42b746a98ea672dfe6c7a487203310941a05444fe5295705afd45b8db200379b6d4e3a7ca78 SHA512 e78f8680fecf60b24747ece962c95fbb2359fc315cc5d80c2c84a4c799ea1abd9169873142cc65f4e91519118ba26e4b8d3e3cb2657d68af086a77dd377898f5
diff --git a/dev-python/minio/minio-4.0.9.ebuild b/dev-python/minio/minio-4.0.9.ebuild
index cede89705..e6da951f9 100644
--- a/dev-python/minio/minio-4.0.9.ebuild
+++ b/dev-python/minio/minio-4.0.9.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/minio/minio-5.0.1.ebuild b/dev-python/minio/minio-5.0.1.ebuild
index 380eb4597..44c946960 100644
--- a/dev-python/minio/minio-5.0.1.ebuild
+++ b/dev-python/minio/minio-5.0.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/mitemp-bt/Manifest b/dev-python/mitemp-bt/Manifest
index 0aab9b7c0..aad65dcb6 100644
--- a/dev-python/mitemp-bt/Manifest
+++ b/dev-python/mitemp-bt/Manifest
@@ -1,5 +1,3 @@
-DIST mitemp-bt-0.0.1.tar.gz 8024 BLAKE2B cd73fb0c3186fca9c8187c2f2029fd322abb7f9047925b88873f5e56762d5f314f0713126691059fdbc294470d7f08050966b2bf87b0352843bf1e2287bfeefd SHA512 cbe3129d9166869c8f03884dff70e1db98426a488b95902721565dc3b5e322381ad674dac035f29217a29598b1991293263116d021b058402ea4f3ca0c37393b
 DIST mitemp-bt-0.0.3.tar.gz 9169 BLAKE2B 2793766a1d3873f9474d2d304104001d280e2b09585b186736f1d3b19a8ae2bf8bc12727b01ca1731bf3790fe7aaf75d7edb6c7fb721c125a24e8647c141481d SHA512 eb72756f3d59797fe195572f000cad4c36b5347998117ebb26460875acef9f1d2f3d313884b87d80b097ba6c97174b6d7cfff2f2c90ec1c99373275c3afe0c97
-EBUILD mitemp-bt-0.0.1.ebuild 818 BLAKE2B 882a8061630304130baff5cdd60811b73197bc4bbdf806b417c5a0551adc5f04077b15a8f024d13bea53b8e38f5aa69aab3a0b05cb25e5aaeb52a045b9664fc0 SHA512 7d33a85a9939710406252fda89670ff40ff9f9877c85cfd54c19e3b6103082b877ead77a01a50361011357e3d4806a01ee48813757deb3796392c7b12fd01ba5
-EBUILD mitemp-bt-0.0.3.ebuild 827 BLAKE2B 22ea2bdc218ec1dc1f65b034df378a532970a7fc4b84afe11347ab030c20c7606f7d5c36b140f8953e2b4a767ab711075b3164b824e3ec97b8951de38717da1b SHA512 1fbb8d4ded16ed55b680d7d4d3e623139ad83d2c9af9df04b3fbef462f70c12dd9d3235a2b669adfc3fbde22fd8139c285b70c1c462cd6b7288d4aada11c7e5c
+EBUILD mitemp-bt-0.0.3.ebuild 826 BLAKE2B a91e934945bf3fc04e742d6d10f36db70b4a6c537047a831a02db5db3c3084b371178393d7208f5c96cc48ae74ffb2fde207410a660ac160c2c19478d47fd422 SHA512 07b194c0509fc3126185985d688546956ffe4a7e5b43074444967257e1d9a56e567692b478a7461a1fb293f659ffffc899faf42f1f141526ddde70fcf3d735eb
 MISC metadata.xml 453 BLAKE2B 4ff5a49bf2aad2f2a59570476e1148e768d02d33eff0fd979df42fc7aa8ab9e4d98ae15fb13e15fa1bd76235a48a45bcd5b83596e7461705565c06aff73d4ed6 SHA512 30c306f05a466c7f15f3b0f706a7e204140125f322944f9706f68fffa576fa9458ca3b822ee87c809cf9f2998004e448c926aa78cba1e4f769f4d22205a4fb91
diff --git a/dev-python/mitemp-bt/mitemp-bt-0.0.1.ebuild b/dev-python/mitemp-bt/mitemp-bt-0.0.1.ebuild
deleted file mode 100644
index 0e4a59dc0..000000000
--- a/dev-python/mitemp-bt/mitemp-bt-0.0.1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit distutils-r1
-
-MY_PN=${PN/-/_}
-DESCRIPTION="Library to read data from Mi Temperature and Humidity Sensor (V2)"
-HOMEPAGE="https://github.com/ratcashdev/mitemp https://pypi.org/project/mitemp-bt/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND="~dev-python/btlewrap-0.0.8[${PYTHON_USEDEP}]"
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/mitemp-bt/mitemp-bt-0.0.3.ebuild b/dev-python/mitemp-bt/mitemp-bt-0.0.3.ebuild
index 8ee296acc..7d91b82a4 100644
--- a/dev-python/mitemp-bt/mitemp-bt-0.0.3.ebuild
+++ b/dev-python/mitemp-bt/mitemp-bt-0.0.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/mypy/Manifest b/dev-python/mypy/Manifest
index b10a0f0af..c7c7db6dc 100644
--- a/dev-python/mypy/Manifest
+++ b/dev-python/mypy/Manifest
@@ -1,14 +1,7 @@
-DIST mypy-0.660.tar.gz 1705668 BLAKE2B dfc3e2bee3a8a8c533a440e4cb1d6cc7b20910432852d610cf225a32a2b749ede3c5b77a1f0de11c9b4dcc35eab755abe5a64126921f748e70916d374b7b5378 SHA512 9eb1154de96d6596eaa0adaabf88eeba02fa86e995cf8d5df1c6d0cf1fc1228d8295dd0ee3fafda108975bbc913e9c41a8a6c6bcefd5df58d487d17f6b01507d
-DIST mypy-0.710.tar.gz 1890252 BLAKE2B a26ba2165de89d151b61217d41b01bc6268f1b0d47fe1526dd902650af631d0ba5a4ded0b423f34f8c30a92d68ecee610c4f1564767545646a807661eb836d19 SHA512 89efb9f024d31cbe17e2ca8c812ba25883972755de9195839363094f72d3f5c9ad2ca7af796f90bb27cba3a64262269a6b9ce0a6749f337a4df5cf8506c093ab
-DIST mypy-0.780.tar.gz 2056698 BLAKE2B 470890149396759e4d7833e04294c7704e4d181b5cfb6d679c4c1c239ba65fb60203e805933b94b3a7690e535f1666b9ac0a36dc739c063413debcaaa6b77ae3 SHA512 af90809844e97e289d427dafc1883692320deb44b85b3f80e00de87884477e4c243b291a544455b93fd3a6552cf8ccfef646e2030331b053fd9ac87f24424692
 DIST mypy-0.782.tar.gz 2056932 BLAKE2B 76f91a3b708c0e0ca3fdbc8364ea720ef5c722aeea90e4e1dd28c73ac0023674db2d9c76cc084f19e7f98e067cc5fb599469e0dc16095bae70fb36926186db7b SHA512 08444abc3cb8f57dcb1ebd90a2248019e0c69c255b0b82c879291b00899018795810d70467a9c350c0564c0961b6f146d63d33238659354336658ac559f97f95
 DIST mypy-0.790.zip 2431919 BLAKE2B 51d6e93c4023025bd7720f5ab41195e3aa3d3ebce797c43485ed2df197d38d25275a97a041629407a306b7b636af7217fe3629911965a6cad098b4ebe5870416 SHA512 865fae439443c7796082a86e897a5c860e148e8747c6ebc34f0eb354484b992c388bc32b12c703d941766450f41afa29cee4909ef3d6c931e717c541460ebd2e
-DIST mypy-typeshed-0.780-e199c2e.tar.gz 541588 BLAKE2B f663d0feccffb315efd1b6e3ebc54bbe3cf4c7873c240ed54c7be1042807e2213326db8756b5a540fd9bf5ae95a2c0850e8cb35ae2e849ec3e9a628367fabe72 SHA512 57f3159d909799838779c04ccc6541322c27c01efb026c26a145676fa75076f64b8cd3e99f7488501582c743e1102cad59320512d52d4a058d8731c54c0705cd
 DIST mypy-typeshed-0.782-e199c2e.tar.gz 541588 BLAKE2B f663d0feccffb315efd1b6e3ebc54bbe3cf4c7873c240ed54c7be1042807e2213326db8756b5a540fd9bf5ae95a2c0850e8cb35ae2e849ec3e9a628367fabe72 SHA512 57f3159d909799838779c04ccc6541322c27c01efb026c26a145676fa75076f64b8cd3e99f7488501582c743e1102cad59320512d52d4a058d8731c54c0705cd
 DIST mypy-typeshed-0.790-58ee9c0.tar.gz 588345 BLAKE2B 1b6911f38b89549843a5d95d6d69bbfb505e8979aa123bbfcdfb046b3ad3da1ddfa79605e2c0d5404a726dc9cb190b2c221f2a9ea8a23c3f91bbdd44bc775b9d SHA512 711324a5d7cfcd54a07698a52416f70aa67b52cb3282cbbf64a2760874cc00110428be311db5fd4cfabcc9fc3ca4452c1382f2307c11fe396c27f72a15797e3b
-EBUILD mypy-0.660.ebuild 655 BLAKE2B d0c7341263e5236224c711ca781f9742db7cadb8cc1b226b72d1909f9b17352332918a4c6bf59f4876068549a1550c4144272d67840e05224c8d02a0fd05ad66 SHA512 dc427d2b0b1ad6931dbfadcab207fa1aa249c600134b146bf3ac6aa3868fe6bf087222d93f05980a87f2deecf0719f75d1133965f8d462ed522cb15e20afc81f
-EBUILD mypy-0.710.ebuild 657 BLAKE2B 9841d092a3bdbaf79a7f0b8bacbc4f934bfd425820a4b421f6b7c0d30f2deda890d5d70b0f93ab160d26ac77110f36860de7765798d17bd3ba83d8d3e61f37dc SHA512 b70ee8590cda423ef86ea1125eee835780299dd49cbac7d7a65d23307fb14c795d31f3534b6a8c8c651ca0319c0327bf9e6ab8e90ef66eef098c8588b175b88d
-EBUILD mypy-0.780.ebuild 2085 BLAKE2B 13e99fa154f213e10107f1041ea11af956636467574a82345366480fe8013818d0a6aef3b08d222206f217399fb92a91e9383e873ddb4dc2f8708fcef3aa6997 SHA512 f01597aa10df479d9ef7cb97d266c31ad07be6b1a040a72ce7d7b1942ab86106af572df3ad1d6ba36b06e16c4b28d1f4d8c86ec0650a620de0e93bc8f03957ca
-EBUILD mypy-0.782.ebuild 2081 BLAKE2B 55c6456006d184986c16d2cf61a22b54bb718d46566302ed4c854ac40e2cfa744a56542b2a892429813d7654c5a7f2d8f9aa2fa7f627174bf1a83f714a1cb5cf SHA512 f3c4ce42d549204bd810eba443d981ff25871019cda62d97c2b050b545fbfa8b9abd60ac5afa6395f7d37494ebe6b16f5598efe99de6ed4c188dc2faa9740b7b
-EBUILD mypy-0.790.ebuild 2077 BLAKE2B cbdfd4088fcb6a191030e3f23e2075009f1ea49bf025fbf23f005436f6f825a858ee2cd5d0e2116fd340f193a4504902326c68030e77efb25495b6eaf4135a84 SHA512 a1d1b0c2c75381bf907d00fa03ce0c93681ffa68098fc2657412c14f27b66dfe4011117671d7f54b5ad37f5c32bbd0b30b080ff83a510c5629faed7c2148e718
+EBUILD mypy-0.782.ebuild 2080 BLAKE2B d7200afd9bd0178f180ea08a68715eefb8406ccd0dfe9c27ee454f55ee9c7df01fa6cfc7e673e95430deb67d4376fe563a4428bcf0499591523fe3de7af67265 SHA512 4ed85b643f8e99f4258a2d9aefbd35e71073b9e5fee24e3d85a2af0576f47b308507ffdb8369bdedc1a9a88ae7de5b5851bc94b0a37eb8cfa36311d21c6d3cbd
+EBUILD mypy-0.790.ebuild 2076 BLAKE2B bd7415145d690032942c5bdd77abdb3f35d905c37b6a2b0d89529494d9c93c0ea043e6d81413182a37253b6f94171ac2d696bbf0e0e3a551e97dfd3596d366e8 SHA512 a330852f482d6e0a0298bd76f62be9ba26965a67bbc682bf0ca54a4b2c703c9cf1377f873fdcce7b9ad1fc58b4b5729b56b91cb842beac452693c511664c4c6c
 MISC metadata.xml 454 BLAKE2B 932219fbce42dca57af572b0c3a6d541adbc8ea5b52d4823d3744bb698660544c19aacc8f5fbbabbad85625b26e2670bf03f9e828c46fe6aba3b50b2616beea0 SHA512 fcdc27b48eba35950d4b97454637b896eb14f8e0f8e8b01ec1f9126e2adbe6d08034942ffa77ade3c9bd50d1939afee6369c4d12d4a7c1867f4c92beabe10993
diff --git a/dev-python/mypy/mypy-0.660.ebuild b/dev-python/mypy/mypy-0.660.ebuild
deleted file mode 100644
index 8c40b8a8f..000000000
--- a/dev-python/mypy/mypy-0.660.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{5,6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Optional static typing for Python"
-HOMEPAGE="https://www.mypy-lang.org/ https://pypi.org/project/mypy/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/mypy/mypy-0.710.ebuild b/dev-python/mypy/mypy-0.710.ebuild
deleted file mode 100644
index 607557bb1..000000000
--- a/dev-python/mypy/mypy-0.710.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{5,6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Optional static typing for Python"
-HOMEPAGE="https://www.mypy-lang.org/ https://pypi.org/project/mypy/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/mypy/mypy-0.780.ebuild b/dev-python/mypy/mypy-0.780.ebuild
deleted file mode 100644
index bb8c0b76c..000000000
--- a/dev-python/mypy/mypy-0.780.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit distutils-r1
-
-if [ "${PV}" == "9999" ]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/python/${PN}"
-	SRC_URI=""
-else
-	TYPESHED_COMMIT="e199c2e"
-	SRC_URI="https://github.com/python/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-			https://api.github.com/repos/python/typeshed/tarball/${TYPESHED_COMMIT} -> mypy-typeshed-${PV}-${TYPESHED_COMMIT}.tar.gz"
-fi
-
-DESCRIPTION="Optional static typing for Python"
-HOMEPAGE="https://www.mypy-lang.org/"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux"
-IUSE="doc test"
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/flake8[${PYTHON_USEDEP}]
-			>=dev-python/pytest-3.0[${PYTHON_USEDEP}]
-			>=dev-python/pytest-xdist-1.18[${PYTHON_USEDEP}]
-			>=dev-python/pytest-cov-2.4.0[${PYTHON_USEDEP}]
-			>=dev-python/psutil-5.4.0[${PYTHON_USEDEP}]
-			>=dev-python/lxml-4.1.1[${PYTHON_USEDEP}]
-			>=dev-python/py-1.5.2[${PYTHON_USEDEP}]
-			>=dev-python/virtualenv-16.0.0[${PYTHON_USEDEP}] )
-	doc? (
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
-	)
-"
-CDEPEND="
-	!dev-util/stubgen
-	>=dev-python/psutil-5.4.0[${PYTHON_USEDEP}]
-	>=dev-python/typed-ast-1.4.0[${PYTHON_USEDEP}]
-	<dev-python/typed-ast-1.5.0[${PYTHON_USEDEP}]
-	>=dev-python/typing-extensions-3.7.4[${PYTHON_USEDEP}]
-	>=dev-python/mypy_extensions-0.4.3[${PYTHON_USEDEP}]
-	<dev-python/mypy_extensions-0.5.0[${PYTHON_USEDEP}]
-	"
-
-RDEPEND="${CDEPEND}"
-
-RESTRICT="!test? ( test )"
-
-src_unpack() {
-	if [ "${PV}" == "9999" ]; then
-		git-r3_src_unpack
-	else
-		unpack ${A}
-		rmdir "${S}/mypy/typeshed"
-		mv "${WORKDIR}/python-typeshed-${TYPESHED_COMMIT}" "${S}/mypy/typeshed"
-	fi
-}
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_test() {
-	local PYTHONPATH="$(pwd)"
-
-	"${PYTHON}" runtests.py || die "tests failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/build/html/. )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/mypy/mypy-0.782.ebuild b/dev-python/mypy/mypy-0.782.ebuild
index ff20815e7..823e50f32 100644
--- a/dev-python/mypy/mypy-0.782.ebuild
+++ b/dev-python/mypy/mypy-0.782.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/mypy/mypy-0.790.ebuild b/dev-python/mypy/mypy-0.790.ebuild
index 84ebc053d..c5686c338 100644
--- a/dev-python/mypy/mypy-0.790.ebuild
+++ b/dev-python/mypy/mypy-0.790.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/ndms2-client/Manifest b/dev-python/ndms2-client/Manifest
index b3d85fce3..b4969afe4 100644
--- a/dev-python/ndms2-client/Manifest
+++ b/dev-python/ndms2-client/Manifest
@@ -1,7 +1,3 @@
-DIST ndms2-client-0.0.10.tar.gz 4645 BLAKE2B 177b4279f0f8830337319f33298588f561ef832ebd407c7e58a5eb69e841229b06fe0523a23f2bb9e873c8c553f9168c493f12ba5c14049e4933a8e322f45503 SHA512 91019ba693602340f9a7160ab84e69c8ce9a6f749476e512aade4c08bd794bf6f4f80c16aca5b482f356fb057ae62c81244088222f7d1f73a53019b03383590c
-DIST ndms2-client-0.0.11.tar.gz 4762 BLAKE2B 4f7d5f6e643cb2dc5f29d09ccb69643462132db97b6ea58f3981af8b3ab0a9babcac371c255d6d599d8b3791baf7b62d855dd79cbedb60cfb0bec1fa48077608 SHA512 118e3212f063006e5cdbd45a9d0d691763b79caa3727bcbe8c295594e9197b40f1efce7e8339e0ee93d6408864373760f352247b62580dce8c0787c07bc56ee4
 DIST ndms2-client-0.1.1.tar.gz 5927 BLAKE2B b70f4826599911b77a2e2743d5b202bc682026de8beb863577446e44bf6fcf8faf713bb65b4c335e647acdaf5df57abcff189cd510898b085b706ed61b989128 SHA512 af38e7fc8ce20609a4beaf766af155842514dd6baa5fac7cde1071f548dfdc1982f8b3eec7fb222391fbab110c11af037ccf67be8aaca72fadaae11040e88ba7
-EBUILD ndms2-client-0.0.10.ebuild 752 BLAKE2B 942bf515ddb1027251f117dded27c9578e85e4121e26fac1e00538717c679b718114af065153e066e3363e59d3a513229e375c84258cf672e9a21dcfb90eea74 SHA512 264e5289622b6a35bad66ec3a6cb46c6e2f849375b2c88aeb4571192cb326b0302bab547656dda681ce7f8654ce8e0e00e497a511f7bd4676c306fd83ab4be0b
-EBUILD ndms2-client-0.0.11.ebuild 761 BLAKE2B 94f4d07e964e41509d293fb05aa0dd7d417f6664ac6644742de52f8fdd7a810ab345abcceb82171edbf6ccf1c529e20185339270d358a4584da3a3dbbde07d95 SHA512 d821422f6b9c232cb53763db5e0f62430417ab268b5ea3d816732e25a414d8c8fe20426666d687b316a10f2cde63e071ded80ee6a39d23082e69f3b3cfa17b22
-EBUILD ndms2-client-0.1.1.ebuild 767 BLAKE2B 5a8861a7e1a0f3771ffb10a5407c11795e8e033778f72ba91b6ce888f0ab20cd25df6cb6d42de7d657fbb89d2a272ffdc6a509a413d4cf74ccdc9980df65d67b SHA512 4beedeafb5c425d6277355533ebd4b781e7bd2f5d2a1a76f7d08e3a1fb6252e4312ad656b4c7c2572f985effd44f9acc98a2fa38faa5825a7eeea80698bd6de3
+EBUILD ndms2-client-0.1.1.ebuild 767 BLAKE2B 505ac1760847b99fe851c4557a8747a06052452690a1c2a6fabd528aa1def52530736c976ab82b65c74939387628b5db85636106c7bf2715185e9819aa099ec0 SHA512 4cdfdbcc053a51fbbc1a5a48a0d512e021409168bf82b955d75b5084d401db616f549681a3d3a82e7df32541fab581a41e5d03f3fa983e3a58f8c5ec365e489e
 MISC metadata.xml 462 BLAKE2B c0e3809a4fd28ece62dafb68a758b7faf8419aab4327c25d50d58b8d6632c4eba8d80f10a4a7ba0d56e3d57b56cb675bcf345058031afc640a2d02bd835c0323 SHA512 ac7964fa41c2ce378ae5e34ddb5b17955427b0e142957984143d65ef6ca054947e10872bca64bf44602fd6108c98352fbbf932a35973aef54f407908d7c42456
diff --git a/dev-python/ndms2-client/ndms2-client-0.0.10.ebuild b/dev-python/ndms2-client/ndms2-client-0.0.10.ebuild
deleted file mode 100644
index 16b4bef7e..000000000
--- a/dev-python/ndms2-client/ndms2-client-0.0.10.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit distutils-r1
-
-MY_PN=${PN/-/_}
-DESCRIPTION="Keenetic NDMS 2.x and 3.x client"
-HOMEPAGE="https://github.com/foxel/python_ndms2_client https://pypi.org/project/ndms2-client/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/ndms2-client/ndms2-client-0.0.11.ebuild b/dev-python/ndms2-client/ndms2-client-0.0.11.ebuild
deleted file mode 100644
index 53b46e5dd..000000000
--- a/dev-python/ndms2-client/ndms2-client-0.0.11.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit distutils-r1
-
-MY_PN=${PN/-/_}
-DESCRIPTION="Keenetic NDMS 2.x and 3.x client"
-HOMEPAGE="https://github.com/foxel/python_ndms2_client https://pypi.org/project/ndms2-client/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/ndms2-client/ndms2-client-0.1.1.ebuild b/dev-python/ndms2-client/ndms2-client-0.1.1.ebuild
index 64fba162b..d695ee3ea 100644
--- a/dev-python/ndms2-client/ndms2-client-0.1.1.ebuild
+++ b/dev-python/ndms2-client/ndms2-client-0.1.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/nessclient/Manifest b/dev-python/nessclient/Manifest
index ce9a0e2e2..a086b79a3 100644
--- a/dev-python/nessclient/Manifest
+++ b/dev-python/nessclient/Manifest
@@ -1,9 +1,3 @@
-DIST nessclient-0.9.10.tar.gz 14117 BLAKE2B 178b2686f115028039aa56f27d234064e5d5fc24d253621f6bb498a856bf3cf4f4c4485e4c165b4a52b2baeee4ec372d4ac5337934b171905d97340ebd7ef6cb SHA512 68c7df9f011258c13c098a9211cc56269cfc2f14ddd3867011ace563e327b8dd220c0f8b7e50186b7cbb18dee6d5feb9bac74e59943780d794be44273bad28f9
-DIST nessclient-0.9.13.tar.gz 14387 BLAKE2B 66e0ddf362ddb133fd1564e2d6cb0be9ad31b6b02f8a3e8fd31d3365eb2ff0024d35fc546e9891e923083e8ff069fe9fa6f76551cb650349b68430ce91a20ace SHA512 f320108c5f600540adffe2ccd2e0480ed5f17c9d0f7deb253ed8fa80f535528d8bb4c8d8b09640e02fb1cd61de07913d6ec8b217661d0a8499b04ed7ba468026
-DIST nessclient-0.9.14.tar.gz 14396 BLAKE2B 615f6c52811cbf9bb054d774cfd99f400c31945e2faad6a915b454afda1ff3cfc5ea6a35a1dec34027878653d7dc7fd19fe26e9b35ee0a3fb6130219b7861866 SHA512 aebf80fa4cd08b7dbe2b2cd34c9edfc64623deabf15806e5c8718fd6920fcba90667f549d315a36c26a211590ef3485cc72db52fcb84a2c4dcd5a9fe180b74ba
 DIST nessclient-0.9.15.tar.gz 15669 BLAKE2B 2b326d52309cb0921952229f06fe8685f398e146192f22ea74499ac0548e96e469b966003cf53d45b57fbf787052aaec4c312552e2a27f8d2dcb851f519470cd SHA512 d49c4e4fe7aa98261ee2129cfa796ed13c5dd2ae8bb2927560fa1f7447870c6d0cb3bd63effc92552253296af4174f91909defa81e7763a949b9a7d0c9c8c282
-EBUILD nessclient-0.9.10.ebuild 709 BLAKE2B de34c50d00cb2afe6583faa8f5981738bfc615c678e28188047036cd33f30f8b48d1d0d8c2bf267cc149001f98c3418bf5872834999b3c978d6534d8a031d165 SHA512 07c01df0471c442438006f8cf07c5285001d7af05bbb78b886360ac544f707c5e1d26d3aac69eed867c287809eac18438a6d1fc49482dda88c5c3fb0be072740
-EBUILD nessclient-0.9.13.ebuild 709 BLAKE2B de34c50d00cb2afe6583faa8f5981738bfc615c678e28188047036cd33f30f8b48d1d0d8c2bf267cc149001f98c3418bf5872834999b3c978d6534d8a031d165 SHA512 07c01df0471c442438006f8cf07c5285001d7af05bbb78b886360ac544f707c5e1d26d3aac69eed867c287809eac18438a6d1fc49482dda88c5c3fb0be072740
-EBUILD nessclient-0.9.14.ebuild 711 BLAKE2B 012b952a8c9aa5c6a02d496ad60421f56ade96156f1a334cace25467676e92c2236e095c923187f060f661670f225e2b3d0ed6082e0dfb03e7a444521181e7cb SHA512 1b2d59203a8ff11a6712eee404137a8e53855ce517867ae965e9ed29d2b3a267754278a88b47df1bd52b458e039e566638fff769635515eccb8fe3b5033c4844
-EBUILD nessclient-0.9.15.ebuild 718 BLAKE2B 3fec840cb1c28aa8b5c5ae72d70050be8e6e5820d6e3766ff68396ba76e0f7733ef69ae37bb341d6406e7e8919885498fe863860441d63a72af87e7c540d550b SHA512 84f81a215b621fa911877fc0e97099532cf14858925044d105d4680650775a0040597feace1a35ace85df7f76618378782a8df3e123e29ecc33d9ac01cc5d211
+EBUILD nessclient-0.9.15.ebuild 717 BLAKE2B f1e176b534730dbff214aa0a48082cbc2c5ff9cfc4a83acb1275826ee3582412980fc6017359c13e8cd78380ccc0cc8c031794bd2e763649bbb0e35aba375ae9 SHA512 803fb4558f3a139304cf6543b7fedb43e0820a3954a45a9effd315b9e7a42de6a2a255217eb71ae1f16877862ffc99609cb4d9a4e4e40d3c3cbab4b86101395e
 MISC metadata.xml 451 BLAKE2B 5974e95dd4bf192c52203802650bc204113c0c3b860cfac6017bb3bed2fd1288e215cbb7a3fdfe0ce1a944d743b599765ba52d71b26941a26754ef2a360a97df SHA512 b605357962bba737fd6cdb1cb4215bc304b2a41ca192ae33ca275b3367e1952af8ddc6f2d7ad153bc3932145dea015a3758e8f84303dfc22ef15b19f6af32284
diff --git a/dev-python/nessclient/nessclient-0.9.10.ebuild b/dev-python/nessclient/nessclient-0.9.10.ebuild
deleted file mode 100644
index a12e489cc..000000000
--- a/dev-python/nessclient/nessclient-0.9.10.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{5,6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Implementation of the Ness D8x / D16x Serial Interface ASCII protocol"
-HOMEPAGE="https://github.com/nickw444/nessclient https://pypi.org/project/nessclient/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/nessclient/nessclient-0.9.13.ebuild b/dev-python/nessclient/nessclient-0.9.13.ebuild
deleted file mode 100644
index a12e489cc..000000000
--- a/dev-python/nessclient/nessclient-0.9.13.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{5,6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Implementation of the Ness D8x / D16x Serial Interface ASCII protocol"
-HOMEPAGE="https://github.com/nickw444/nessclient https://pypi.org/project/nessclient/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/nessclient/nessclient-0.9.14.ebuild b/dev-python/nessclient/nessclient-0.9.14.ebuild
deleted file mode 100644
index ad06f3606..000000000
--- a/dev-python/nessclient/nessclient-0.9.14.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{5,6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Implementation of the Ness D8x / D16x Serial Interface ASCII protocol"
-HOMEPAGE="https://github.com/nickw444/nessclient https://pypi.org/project/nessclient/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/nessclient/nessclient-0.9.15.ebuild b/dev-python/nessclient/nessclient-0.9.15.ebuild
index 34ca5efd3..7ba97bd88 100644
--- a/dev-python/nessclient/nessclient-0.9.15.ebuild
+++ b/dev-python/nessclient/nessclient-0.9.15.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/nsapi/Manifest b/dev-python/nsapi/Manifest
index 7fbb7c15e..5eca31481 100644
--- a/dev-python/nsapi/Manifest
+++ b/dev-python/nsapi/Manifest
@@ -1,11 +1,3 @@
-DIST nsapi-2.7.4.zip 12602 BLAKE2B 6556fe1782f4ec9bed803bff78b9247a7c62278acf1b4681a0b365d0655ffeb8781a0da2ec9d2f4423b9576ddce34ab2cef770fcb983cfcefa074b5cc69a0a32 SHA512 2288cdbb2c510999d69d2229dd6410a7af7832d6de1df7f4c9355208587f898402ebee603a1b364071145c5410bac790805fceb84075abd0947cbd9be8848e83
-DIST nsapi-3.0.0.zip 14489 BLAKE2B 1eb65efb16ccbcb003389a2baf54570261519b51f2b8a386588df949f937b92bf635472741bf04f18917f61350877813a96fddc837e2685a1be5275ec30b033d SHA512 ef9270902b8942289b70f23cc9d716af61aa1e4f5b4d68a204918e85639a8b5cc6e7b5095e7a2e34219cea69e440a83476dea1bba80a75a7e92d2f7d1f1bb330
-DIST nsapi-3.0.2.zip 15026 BLAKE2B d5327e627f8527424633b9165ade0ad4b24dacb8e5f85214f4663779a60b9af48ecc96e9d535d58ea6a6fa8218cace8818e6a59c62075fc3d86fa5bba72f2e62 SHA512 cb3bb791da9f64bcb5fd91a83ce386c625a2f4076e1f5c322dfce50194b7b71b310282d81e81437c15e40515b863112f1b5edae08051404bb48d25085ed07c50
-DIST nsapi-3.0.3.zip 15511 BLAKE2B 019e49262459c17fe825d8aee3d28a28d65dd3390ca9822dc06b1117b52fea464998201e81c65ae35a63b6b0f1c756efef2cbb6c66f5eb9dc932ab3e24675d37 SHA512 e762d838e9307a18013dce4360a6e14763971ba143b47c1f46e5712d42d2d80849a4543d5d21c8cdf98adfa4bc218203e0b7011c3ef8272fc8880dd6a19d717b
 DIST nsapi-3.0.4.zip 15903 BLAKE2B 174686a8ab41596112e0ca8b3b5d1a69869973c9e8044e4d9250235c72c3bc9f6da6d6b47135e62e60f7210201f954b9f73b5e6232ab63b6bd49af91caf56624 SHA512 e61ad52ca8e26882b3ea3e034172ab11521bc1c0b6f8c0bc0badc8fbb64f251aa98b11793322c292da8deabae1593fe33aad58e844bd2409e797da8d7fcc2a59
-EBUILD nsapi-2.7.4.ebuild 830 BLAKE2B 499cdc23a732374f7f3458952b3f4b2a2f11d42c7fdf2516169637df494c2fff448b2d4477ccf66b2a7b25dab854824b51ad95e12abfe28406e684c840950282 SHA512 26b797ea99698714f59969286047ec080987e9dd42222f5ec193efbf6639a471efc47fbaddc427c849f27d6b9ff4a6edb48ae9ed7074cfa8153e1868bc2f8665
-EBUILD nsapi-3.0.0.ebuild 830 BLAKE2B 499cdc23a732374f7f3458952b3f4b2a2f11d42c7fdf2516169637df494c2fff448b2d4477ccf66b2a7b25dab854824b51ad95e12abfe28406e684c840950282 SHA512 26b797ea99698714f59969286047ec080987e9dd42222f5ec193efbf6639a471efc47fbaddc427c849f27d6b9ff4a6edb48ae9ed7074cfa8153e1868bc2f8665
-EBUILD nsapi-3.0.2.ebuild 839 BLAKE2B d13d041fa8f853f91cb7bf7b420dc56dc5eb1db4ba83c5ba2d4875a0e5b2151b65feefa49f4b1170f678408fff054d66aaab4b43b7e55a645ead57c416659165 SHA512 a097a52aab9c19df8d63bb6bec24eaac88043f6a74d1a6f6d02ff64e1ccb4e10490e5405b77f03d2ada1bdb7ef993eb5b5c52bd7ba8bcf3dd9f9ca59d3c89fc8
-EBUILD nsapi-3.0.3.ebuild 839 BLAKE2B d13d041fa8f853f91cb7bf7b420dc56dc5eb1db4ba83c5ba2d4875a0e5b2151b65feefa49f4b1170f678408fff054d66aaab4b43b7e55a645ead57c416659165 SHA512 a097a52aab9c19df8d63bb6bec24eaac88043f6a74d1a6f6d02ff64e1ccb4e10490e5405b77f03d2ada1bdb7ef993eb5b5c52bd7ba8bcf3dd9f9ca59d3c89fc8
-EBUILD nsapi-3.0.4.ebuild 839 BLAKE2B d13d041fa8f853f91cb7bf7b420dc56dc5eb1db4ba83c5ba2d4875a0e5b2151b65feefa49f4b1170f678408fff054d66aaab4b43b7e55a645ead57c416659165 SHA512 a097a52aab9c19df8d63bb6bec24eaac88043f6a74d1a6f6d02ff64e1ccb4e10490e5405b77f03d2ada1bdb7ef993eb5b5c52bd7ba8bcf3dd9f9ca59d3c89fc8
+EBUILD nsapi-3.0.4.ebuild 838 BLAKE2B c3f505e4b66822bd2cffe19480f7afd4fd60c2906fb23edca0990e1d2996696a08b54e2d31e43587bfe9ac20e310675876fe61f1d6a0afb78c843760d1127492 SHA512 7d774f0805832960670f6b54415c59cf903c8fa3290da3fad8d0cb2bea2bb12123c34ff83d56571adc6849e4d583805500d667fb6c4294d2c92d73318b86f612
 MISC metadata.xml 454 BLAKE2B 286dc39ae17a0a133b1ec7d8c3f10e7f2d3bfa063d807d9e81fa7b823c234ebc02556afd0b2746fe835ad50f8cc4f67a58b65272a37024b328416b6ca9fe9425 SHA512 3c5827460d462b614ed5a232ca64a0adad90919803ab2a8b55092a110c335151a28f98151775a0ca079767d952f52a4acc164f5051f5cb7e6bfa429414b378d1
diff --git a/dev-python/nsapi/nsapi-2.7.4.ebuild b/dev-python/nsapi/nsapi-2.7.4.ebuild
deleted file mode 100644
index eeeee4d26..000000000
--- a/dev-python/nsapi/nsapi-2.7.4.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="api wrapper for Dutch Railways (NS)"
-HOMEPAGE="https://github.com/aquatix/ns-api/ https://pypi.org/project/nsapi/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.zip"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=">=dev-python/requests-2.19.1[${PYTHON_USEDEP}]
-	>=dev-python/pytz-2018.5[${PYTHON_USEDEP}]
-	dev-python/xmltodict[${PYTHON_USEDEP}]
-	dev-python/future[${PYTHON_USEDEP}]"
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/nsapi/nsapi-3.0.0.ebuild b/dev-python/nsapi/nsapi-3.0.0.ebuild
deleted file mode 100644
index eeeee4d26..000000000
--- a/dev-python/nsapi/nsapi-3.0.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="api wrapper for Dutch Railways (NS)"
-HOMEPAGE="https://github.com/aquatix/ns-api/ https://pypi.org/project/nsapi/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.zip"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=">=dev-python/requests-2.19.1[${PYTHON_USEDEP}]
-	>=dev-python/pytz-2018.5[${PYTHON_USEDEP}]
-	dev-python/xmltodict[${PYTHON_USEDEP}]
-	dev-python/future[${PYTHON_USEDEP}]"
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/nsapi/nsapi-3.0.2.ebuild b/dev-python/nsapi/nsapi-3.0.2.ebuild
deleted file mode 100644
index 1795bc4f3..000000000
--- a/dev-python/nsapi/nsapi-3.0.2.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit distutils-r1
-
-DESCRIPTION="api wrapper for Dutch Railways (NS)"
-HOMEPAGE="https://github.com/aquatix/ns-api/ https://pypi.org/project/nsapi/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.zip"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=">=dev-python/requests-2.19.1[${PYTHON_USEDEP}]
-	>=dev-python/pytz-2018.5[${PYTHON_USEDEP}]
-	dev-python/xmltodict[${PYTHON_USEDEP}]
-	dev-python/future[${PYTHON_USEDEP}]"
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/nsapi/nsapi-3.0.3.ebuild b/dev-python/nsapi/nsapi-3.0.3.ebuild
deleted file mode 100644
index 1795bc4f3..000000000
--- a/dev-python/nsapi/nsapi-3.0.3.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit distutils-r1
-
-DESCRIPTION="api wrapper for Dutch Railways (NS)"
-HOMEPAGE="https://github.com/aquatix/ns-api/ https://pypi.org/project/nsapi/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.zip"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=">=dev-python/requests-2.19.1[${PYTHON_USEDEP}]
-	>=dev-python/pytz-2018.5[${PYTHON_USEDEP}]
-	dev-python/xmltodict[${PYTHON_USEDEP}]
-	dev-python/future[${PYTHON_USEDEP}]"
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/nsapi/nsapi-3.0.4.ebuild b/dev-python/nsapi/nsapi-3.0.4.ebuild
index 1795bc4f3..c3382b803 100644
--- a/dev-python/nsapi/nsapi-3.0.4.ebuild
+++ b/dev-python/nsapi/nsapi-3.0.4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/nuimo/Manifest b/dev-python/nuimo/Manifest
index 1d5779718..ea83ddf71 100644
--- a/dev-python/nuimo/Manifest
+++ b/dev-python/nuimo/Manifest
@@ -1,5 +1,5 @@
 DIST nuimo-0.1.0.tar.gz 9167 BLAKE2B e5f09e14cdbdff56589f0b909579b3210359d634f1c0d8c51e1d437cc6dbebd336696c26c98ee3e7d51c2a652ec8b18237058395d56c39cac0a2232b8959e815 SHA512 7e01a818daf1c2b92ff83e1172fd00428f0f2735a80c54515947fe8230873467e9a5e293b48559d9df257f0eeb5c6a86e8365edcd0b659ddedeaca5dcca020fd
 DIST nuimo-0.3.6.tar.gz 5857 BLAKE2B eb66d27d15f80095cc81a6c5142df1b2c23cf529bdae74bf323d1661f983494cdde7718f4249958deca49646641446990a5eb24cf23dc4939316eafa90d2f560 SHA512 59076623aa8a26370de4933ee77dd4c0ab3e46eaeacd5a70f2d9ff22e52c42262a3e87e250d88c8e05e68dd88a4beaffc5fb24fbaf11a7c38a1fcb3aed065e33
-EBUILD nuimo-0.1.0.ebuild 713 BLAKE2B ab000bb8da466465169015526513de3a690d6ec0fd7ea0b4bf021f812d831d11aad72af8ec604881e360a0921db8b5722edf120ff1684fb7ceab2f9cc5c3a1f0 SHA512 a37b69936c735940a34ab9f855f85f1797655a451c413366bbb0b1890415135d24e9418f08143e216abc2917b762485843bdeeb49628b57ca3383c186496955d
-EBUILD nuimo-0.3.6.ebuild 722 BLAKE2B 6901d585fe0b9152b0ed6284f903c6874d5d83f4174ecb257af0f1e671af6f9ecc158edeb3c03db4b564176d4b1c9f6db3434728e97732afaa34ab0957ec4627 SHA512 21d03ad6fa40885e173454377ef1f77a3d64213df7cf62fbf7e674c90e0d6a9408b8c7ccce110cb94def8be2bb4a5e6746d30841eb626511f9f84254d87708d6
+EBUILD nuimo-0.1.0.ebuild 714 BLAKE2B a58999ecb120e227ef4632e8f725a6f562151f5d0eb73ad43343b9c66d447138b07c92a32d77a73daeecbba581a56295b2dd93210ccdf7ed508acdfcbc2e028c SHA512 92c19fa354022355c7141a748abff272e5c928c4eb17de3d94472a4dce65077fe85b5d34530ad1ac4c4258c93524c3cb243ea5d799c0dc75f33155d4c63c4abc
+EBUILD nuimo-0.3.6.ebuild 721 BLAKE2B a847e81616c904a7ab2aac7fac7f6ac967b8fa29f3f8093462c92011873638f040962016f5f627e672135053ecda7c16b3374f08253476f42ffec3a4e6f2eda1 SHA512 a59d6fd50308daf4069f13efc56a461c02025eba4c25b2641112d953001193f258ae5978a575b267b378d8a2886c8dd4d40506378fc77daf26bc318a44817524
 MISC metadata.xml 448 BLAKE2B e991605b8d41193e73796f78387de9b17b3f26ba45dd4b94df1860e769c9a70947404f080c5b93e85579d3f4d0a1d31a06841d31d07b085bdefc37d4368a21a5 SHA512 a2fda301db08cb581d24b5381bd30a143bde9c086f4a6873ed096fcdae5b63a4337d69613466113924223867ca18d8480d8dfcc8e28cb78215bb2686c50d4417
diff --git a/dev-python/nuimo/nuimo-0.1.0.ebuild b/dev-python/nuimo/nuimo-0.1.0.ebuild
index c318efc94..160dba09f 100644
--- a/dev-python/nuimo/nuimo-0.1.0.ebuild
+++ b/dev-python/nuimo/nuimo-0.1.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/nuimo/nuimo-0.3.6.ebuild b/dev-python/nuimo/nuimo-0.3.6.ebuild
index 566818916..94babd12e 100644
--- a/dev-python/nuimo/nuimo-0.3.6.ebuild
+++ b/dev-python/nuimo/nuimo-0.3.6.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/openhomedevice/Manifest b/dev-python/openhomedevice/Manifest
index 83be351b8..255068f50 100644
--- a/dev-python/openhomedevice/Manifest
+++ b/dev-python/openhomedevice/Manifest
@@ -1,7 +1,3 @@
-DIST openhomedevice-0.4.2.tar.gz 6139 BLAKE2B 420324b1d059a16d3037046935a6f6c35cf3e5dee2996039a3073aaaa5b57971389985611702177ef5eadf7a256c078140f8a15b7dc90f0de377250d69d64adc SHA512 5fe2e8bb960186b98eb5d0b5e4266e1fe67f275dbe84ace7dd0508ff17bb8ae416823f612d73b8bac45922723ccf0c44ef8d4d4fc6af10c2c0dc2c3a5402b82c
-DIST openhomedevice-0.6.3.tar.gz 11945 BLAKE2B 84b8db5104d78b965d4ebc6956130a2724ee791239c4d614c27f44fa6f99c94c5e4f7dfe5211e7bab5912e5c519a28a401b46cc65f2a96fbf423317913c007a2 SHA512 8d65d30834d678615dea332e35ea1936e218af17c405646c7a67d0320ccc7659b87d55c834ab6b64a34e88a8d804c0be74d63b03259b76c18ec1c52e772ae240
 DIST openhomedevice-0.7.2.tar.gz 12710 BLAKE2B 624be0602abf1dc60290454d12df6f29bae3e1338d33f5ee071526dfe3c29762db311c132276d4f6eb1ccf1ede1a27e3fc3889fd4714bc4ebb460325aec01af7 SHA512 5a91c97cd73a535d32d2584c06f3113b5bd703d14a293c0e90d1ec2ee474b03e578471a781f2653e6051c89d0f1abbdd0d6b4ac8100f82f456cb3f2c18946f45
-EBUILD openhomedevice-0.4.2.ebuild 789 BLAKE2B 1ac9432d83ededad28fe99054a04c8327f5dd305e3faf17106148514766380196651bccfd4c7dc108e60444aa0e95edd60df094df5bc55a45dce799db2e5891e SHA512 169f6882f656bb901a0b5711b91c82b77fab42f5f8d6a6653413e9c9021a472d9ffa1941459697f5586394cf58145a3aba6fe41fb9b262c1aa512f5fd2893e4d
-EBUILD openhomedevice-0.6.3.ebuild 798 BLAKE2B c78d7e7560acc310b122de6b246394f0c4f74fdfa41bf775d59b440f859a46e55ac8a3a05af78fe056d75bf4c08b331956f3858841d983b22a2f8fa42f6f307a SHA512 4b467157da37cb365b60fc46ade2c0ee1c97a2487e0c84f13191751fbc0871ade1193f1f10f5b8155423f3cb46f463d5ddceeb8c382908b50ac573b5b9791ece
-EBUILD openhomedevice-0.7.2.ebuild 798 BLAKE2B c78d7e7560acc310b122de6b246394f0c4f74fdfa41bf775d59b440f859a46e55ac8a3a05af78fe056d75bf4c08b331956f3858841d983b22a2f8fa42f6f307a SHA512 4b467157da37cb365b60fc46ade2c0ee1c97a2487e0c84f13191751fbc0871ade1193f1f10f5b8155423f3cb46f463d5ddceeb8c382908b50ac573b5b9791ece
+EBUILD openhomedevice-0.7.2.ebuild 797 BLAKE2B 6ec3ec5675557fe2ac4f7ef0d5c7afd8db78da2741fefe360ff8a91784b44251513d6ff2529f0f43e9bc4c2f45339beaad83768c3cfb8060b700fed22d6a109a SHA512 98972a27bb22b7afd05d065650f27e4ca3a3c5a7690bae053649abac5f9f69a0f91fe3b7456ab68a45e3b31ac3412c3b9c3dfdf0527f219e7c33e2df2067c9e7
 MISC metadata.xml 461 BLAKE2B 17d45aba96e3af90085e83a8ece8b7443976f5bcbd040827097166e403ada68491367f9d73e25be3641b49aec62cc7fac1d6edb0641cfc09f37d05e40fdc12a2 SHA512 1906e1831bed7468672d5e4e94dd0e933606fb58acf96f53b3c81e5fa9f2014f80fceceec24b4fe616c21a49489b267dc2f6e19917cb047c96215bdc52751633
diff --git a/dev-python/openhomedevice/openhomedevice-0.4.2.ebuild b/dev-python/openhomedevice/openhomedevice-0.4.2.ebuild
deleted file mode 100644
index 9b0af3498..000000000
--- a/dev-python/openhomedevice/openhomedevice-0.4.2.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Provides an API for requesting information from an Openhome device"
-HOMEPAGE="https://github.com/bazwilliams/openhomedevice https://pypi.org/project/openhomedevice/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND="dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/lxml[${PYTHON_USEDEP}]"
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/openhomedevice/openhomedevice-0.6.3.ebuild b/dev-python/openhomedevice/openhomedevice-0.6.3.ebuild
deleted file mode 100644
index 7f3131824..000000000
--- a/dev-python/openhomedevice/openhomedevice-0.6.3.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit distutils-r1
-
-DESCRIPTION="Provides an API for requesting information from an Openhome device"
-HOMEPAGE="https://github.com/bazwilliams/openhomedevice https://pypi.org/project/openhomedevice/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND="dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/lxml[${PYTHON_USEDEP}]"
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/openhomedevice/openhomedevice-0.7.2.ebuild b/dev-python/openhomedevice/openhomedevice-0.7.2.ebuild
index 7f3131824..8dcd6b286 100644
--- a/dev-python/openhomedevice/openhomedevice-0.7.2.ebuild
+++ b/dev-python/openhomedevice/openhomedevice-0.7.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/opensensemap-api/Manifest b/dev-python/opensensemap-api/Manifest
index 8460419fb..817bca321 100644
--- a/dev-python/opensensemap-api/Manifest
+++ b/dev-python/opensensemap-api/Manifest
@@ -1,5 +1,3 @@
-DIST opensensemap-api-0.1.4.tar.gz 3509 BLAKE2B 644437180b193345e0c96e743d0e246fd4a82eb6c1fc96447e582fb5ea507aa2ef2ed775ee512e5609156e146c9d3076bd558d2868c3c8d47561356cd0857de1 SHA512 cea6a2cfd5950d937b870c4ad9735e589e5fbca5a8585dd370e2a0bbb465d427f1095d9db5442e37ff3aa9cc485915104f6e606e1a450890d6d8bdbf7aea9191
 DIST opensensemap-api-0.1.5.tar.gz 3812 BLAKE2B 22d3ef7f2f8c7eb15aff8967b84806b4d066dac896e6f735ec4af45ab34cd404d79b69653829a0e7d6f7b4d6c020aaab56a539c2934e70b52087200df9a7f076 SHA512 04f1a5806eae9b8791ebd89f3dc9e41e263f4e978bf66beedd49a4eb9c12788a2eabfd77114d5a4ff6bc4474f6efd01caf7825b2af34e2d08d06ff54e8e65271
-EBUILD opensensemap-api-0.1.4.ebuild 713 BLAKE2B 8b49aaca7218f7efeada9d5225c9359efc11985434109a3a71295be67be056254aa45adaa40ec0704b91ee3b437adc316429597e6476ee68497f8f84d5a0aea3 SHA512 38ea878a92da6eda04b1e439fa197e347196213feb171004d100f8c676b821c322d9f37061bf31484eeaffe3337a865cf3746add6382fdf5bffff428539cc2e9
-EBUILD opensensemap-api-0.1.5.ebuild 722 BLAKE2B cdf32e88e1456330c7ca97a4c300fbb3064c39376462c4fee0df61095fb00155ee6d4c69bb0e0455760367624281cb45bba6863b24c4b2e24b69b60a5989f182 SHA512 cbacaef6e152929b6eb0b87390e1abcacc37ca8525441fc7d71140f10745801e5bd958b0b2414c042095afc87a7a6d467bed21bdc7ea240277c198bac585b4b1
+EBUILD opensensemap-api-0.1.5.ebuild 721 BLAKE2B 69a9d341291a4e8862b106e8b8f01b7eda668ba2ab12873c2f3f015d3516e3c3b182ab44090a9c6a06dd8a700ed2e3430df69cb4e8139ae0af9feb616a0aee4b SHA512 d1b18339ffd6bcb6980ca0a2321f59556899ea0d0db713076f3aa086acc29ec36501cf816281ba698be37446f6b97e8f36f5bc427773f791567ab5931a5f057b
 MISC metadata.xml 474 BLAKE2B 99632de4da0cf2007be4cb99aefd144b10f66b04c5f06d959074da4121dab16d841a542d4eb58cf6a787eaa4dc39598c405d05730e4537f78eb8c3dffdf30783 SHA512 aa9af6a5637f17e33475319e8d85fe17736171c764ec7e5acc3fc003246f78a9ac3d3a4efeeb70d87101665c01bd927c649b81329549da4921294425a6ed3661
diff --git a/dev-python/opensensemap-api/opensensemap-api-0.1.4.ebuild b/dev-python/opensensemap-api/opensensemap-api-0.1.4.ebuild
deleted file mode 100644
index 1147e25a4..000000000
--- a/dev-python/opensensemap-api/opensensemap-api-0.1.4.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{5,6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python client for interacting with the openSenseMap API."
-HOMEPAGE="https://github.com/fabaff/python-opensensemap-api https://pypi.org/project/opensensemap-api/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/opensensemap-api/opensensemap-api-0.1.5.ebuild b/dev-python/opensensemap-api/opensensemap-api-0.1.5.ebuild
index 9127bdbf9..0b1d3aaa3 100644
--- a/dev-python/opensensemap-api/opensensemap-api-0.1.5.ebuild
+++ b/dev-python/opensensemap-api/opensensemap-api-0.1.5.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/openwebifpy/Manifest b/dev-python/openwebifpy/Manifest
index e5aaef67f..83f783b94 100644
--- a/dev-python/openwebifpy/Manifest
+++ b/dev-python/openwebifpy/Manifest
@@ -1,11 +1,3 @@
-DIST openwebifpy-1.2.7.tar.gz 14395 BLAKE2B 9b3f4bc095510d16713de7e88feb5c91e87ab4f1a0bdcc6304aead63827fbe7dffd31ca31db9f54702476cf637db8075d43cf0411fe44a4c7d9aab5175834d91 SHA512 aa0c993c07e27434d0123a405411b6454e67b7fd3c77ad8f0f6164a04ffad634dbb0bc30e9399f74d5c79d382d1088e3c04320ed5b515d6dc1243c905e0f43c4
-DIST openwebifpy-3.1.0.tar.gz 17712 BLAKE2B afd7c25b7721bd3969f4c40e0bbd2a1f2229222503e34efe2069bb34d0890711b94b316ba1ff63001e4e907b3589a6f7f74eca155dfac6ec56e4c508f8c58cc5 SHA512 58c42bcfb0b2137946a4e6f249e6c7e39f666bacb19842a6ac0e23424803d75b80aac6cf822444f55ac9ba36699c75f73fd2d2c4fd3c3370b6a91fa55865037d
-DIST openwebifpy-3.1.1.tar.gz 17791 BLAKE2B 02e3aa691a6c4ea60b2f2b0e56813c8154b1e275409b9a9d65026d8b179bce7b5951d0f035716b52e09e3510c2494055dd3cea39fd4213a7f13ece656a694433 SHA512 eb417b1de3a031b4f870c6c7ba6c2ad2adbf14b88de1448badf97e3240de49b4c284bf9fc974a4ac2506b64ce51c8327774b12eda0d85a0513982c38120bef6a
-DIST openwebifpy-3.2.0.tar.gz 17777 BLAKE2B 5ae461238c9484099264f39bb64e305d4c83fa13a0283d1b23c9bfa9391bec24d2a4389e5777e835ebcc1213cacfa386538b42723af21449467d5735c1bf6756 SHA512 5dd5267dc386ccbe8875d348223363ca11f9f10554c573488dbf26642d2643e37527dd0fe50364279787ff4289f05078f5ed4d832e5e116d8cd5c9985c94fbab
 DIST openwebifpy-3.2.7.tar.gz 17680 BLAKE2B 97ece4cc7f8045da234a8d1778a569d2c45754a7ceb0a70f627f6bff43e4b7f4bf1d398539e273d27cc04261cab8d4f4abc6ab7548ba252c7fbd95733d0feda7 SHA512 cd2b035f2f0b30690b542a43fda91102d48d618d97224f9ba0236715be91a37804f185c953b8d582da50a54813a0c3623eb6455d5647b840fd1fb3da495d06d7
-EBUILD openwebifpy-1.2.7.ebuild 746 BLAKE2B 6051c7b97c7565a17aff8df5c59857dfc8214fbb4bdb1f96567c21d19d9ea9db12b583609053c6c2e0b88cdf7b33afee93777b8d4028c184428d167354de2990 SHA512 c71bca3260bc1ce28062af4a624ff58fe5ae48f4cd582ed7121f86821bd1b8ee0fc9cbf52b50a67ed61899345f0fe86d7a84df93ef3ebd1e57c00f4c3cdd563e
-EBUILD openwebifpy-3.1.0.ebuild 746 BLAKE2B 6051c7b97c7565a17aff8df5c59857dfc8214fbb4bdb1f96567c21d19d9ea9db12b583609053c6c2e0b88cdf7b33afee93777b8d4028c184428d167354de2990 SHA512 c71bca3260bc1ce28062af4a624ff58fe5ae48f4cd582ed7121f86821bd1b8ee0fc9cbf52b50a67ed61899345f0fe86d7a84df93ef3ebd1e57c00f4c3cdd563e
-EBUILD openwebifpy-3.1.1.ebuild 818 BLAKE2B 70894d8f0b6667055222495b493526d16f43d13dbba26cbce7745224b0e2b3ad9b330db33c7da3a446ba4313218f5902f7c771e709a1b5f1f68662674dfca031 SHA512 1566a762700cebc47a4325556cf9b7fafe672eeccc16eb517d0034a2fca596e6efd5c867c1f97a7d5b9e08543a484c76c16970f8a8069ee553b8b469a4177b84
-EBUILD openwebifpy-3.2.0.ebuild 826 BLAKE2B 6a2d847f5f1c6a043d65964db418a792fceb6f4ceb18f168a90cd109d96ca98dfa018d64ef704f0bbc029d10042cbf997610077beb3e02ed8207c579838e74fd SHA512 8561faefc7e46e12697d0799fc6544c76bbf1b88feed9d3b01b1cc3d783548e9dbe14ef91b69b6294edae9d31691beffa582e6df36512621c09f3aa3bb5a9e53
-EBUILD openwebifpy-3.2.7.ebuild 826 BLAKE2B 6a2d847f5f1c6a043d65964db418a792fceb6f4ceb18f168a90cd109d96ca98dfa018d64ef704f0bbc029d10042cbf997610077beb3e02ed8207c579838e74fd SHA512 8561faefc7e46e12697d0799fc6544c76bbf1b88feed9d3b01b1cc3d783548e9dbe14ef91b69b6294edae9d31691beffa582e6df36512621c09f3aa3bb5a9e53
+EBUILD openwebifpy-3.2.7.ebuild 826 BLAKE2B 3f6de27b914db947058420e160bae272fe59ac328a98ea590845876f756a2d078d75f03b72f4005543ac4f45235e06dca31731cf47adbc4107002c6f24f768bd SHA512 439f9fd9ecf04765e710b280acfc9fdf92185f2b5a3110646523dc2bd453870e213b49fb8086e5f28f37f5b3a3098726da6b18568b426684940b3cb5ded55056
 MISC metadata.xml 456 BLAKE2B 9d5f1d316a5416c35c637af9e8110a196eac7b23077593784ca05cc985de63b4bec456cbf64ae5fdf92e3938cf4832d5c53ae502bb029eb40979a50c7ae1f627 SHA512 5f3faa65ca4f7a0aed499f4def56136bb63fc3048caedcf7ff4d4b43ad20b5a4f1a75960322bdf4e24b741778db68a2bbe3015a5e8d43cbdc62f6b4c0a0f571d
diff --git a/dev-python/openwebifpy/openwebifpy-1.2.7.ebuild b/dev-python/openwebifpy/openwebifpy-1.2.7.ebuild
deleted file mode 100644
index 38e5d8f15..000000000
--- a/dev-python/openwebifpy/openwebifpy-1.2.7.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{5,6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Provides a python interface to interact with a device running OpenWebIf"
-HOMEPAGE="https://github.com/fbradyirl/openwebifpy https://pypi.org/project/openwebifpy/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND="=dev-python/requests-2.21.0-r1"
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/openwebifpy/openwebifpy-3.1.0.ebuild b/dev-python/openwebifpy/openwebifpy-3.1.0.ebuild
deleted file mode 100644
index 38e5d8f15..000000000
--- a/dev-python/openwebifpy/openwebifpy-3.1.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{5,6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Provides a python interface to interact with a device running OpenWebIf"
-HOMEPAGE="https://github.com/fbradyirl/openwebifpy https://pypi.org/project/openwebifpy/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND="=dev-python/requests-2.21.0-r1"
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/openwebifpy/openwebifpy-3.1.1.ebuild b/dev-python/openwebifpy/openwebifpy-3.1.1.ebuild
deleted file mode 100644
index 74cb4fc22..000000000
--- a/dev-python/openwebifpy/openwebifpy-3.1.1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit distutils-r1
-
-DESCRIPTION="Provides a python interface to interact with a device running OpenWebIf"
-HOMEPAGE="https://github.com/fbradyirl/openwebifpy https://pypi.org/project/openwebifpy/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=">=dev-python/requests-2.21.0-r1
-		 >=dev-python/zeroconf-0.21.3
-		 >=dev-python/wakeonlan-1.1.6"
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/openwebifpy/openwebifpy-3.2.0.ebuild b/dev-python/openwebifpy/openwebifpy-3.2.0.ebuild
deleted file mode 100644
index 3ab3b6eb2..000000000
--- a/dev-python/openwebifpy/openwebifpy-3.2.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{6..9} )
-
-inherit distutils-r1
-
-DESCRIPTION="Provides a python interface to interact with a device running OpenWebIf"
-HOMEPAGE="https://github.com/fbradyirl/openwebifpy https://pypi.org/project/openwebifpy/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-DOCS="README.rst"
-
-RDEPEND=">=dev-python/requests-2.21.0-r1
-		 >=dev-python/zeroconf-0.21.3
-		 >=dev-python/wakeonlan-1.1.6"
-BDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/openwebifpy/openwebifpy-3.2.7.ebuild b/dev-python/openwebifpy/openwebifpy-3.2.7.ebuild
index 3ab3b6eb2..ab77ba937 100644
--- a/dev-python/openwebifpy/openwebifpy-3.2.7.ebuild
+++ b/dev-python/openwebifpy/openwebifpy-3.2.7.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{6..9} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/oru/Manifest b/dev-python/oru/Manifest
index be3d09459..feb2a0ccd 100644
--- a/dev-python/oru/Manifest
+++ b/dev-python/oru/Manifest
@@ -1,7 +1,3 @@
-DIST oru-0.1.10.tar.gz 2834 BLAKE2B 7db5538486fafa5a2622ef3eb38523f5ecc05db1d8079f42549a188831abacd0e79a561ae2e33ce6813f6bdaa4767fc03203c1c9a719b29854f45000b7955352 SHA512 cbf7654e2116cda14ee7eef1aa3dce30d0edd15ba17c5b438d4a9d1cd7aa7a499ff823147011c696fba90f1da17957147943f96712f8016588b196e60a6ebd39
 DIST oru-0.1.11.tar.gz 2845 BLAKE2B b48a221b9732c98c80ab1d680221527d7f9694ce2185976f70cebd1ccc278eddff9d8295e610a6c76ec41eed234cab5d3b22189c027ca5d45a339aeeed2995ae SHA512 28c08f4648c0642f2ed9fe021572e7eaa99c00ec26c77ed929d2de8ed92b75c6b5d593d60ea22e55dcb1bb60bc8384d2eed842f2bcae380f87c7bf99280b4e27
-DIST oru-0.1.9.tar.gz 2797 BLAKE2B cfcf0a2d1a2db13f16aa8609efe731a5215902f9524e0f6ccf1a7b38a6f3419400790dcb0236590396ce94a19be2bb2a211f570dfbc0ddbc16207b51a26f297c SHA512 4b63b6d4809ffc5b213b0fc73a9837cf07e0e880bec4ff5d0b8f33f78fb38d858b436541c9410808225e70996d2dbb887e795856d3cd71c2997016fdd9a13bb5
-EBUILD oru-0.1.10.ebuild 735 BLAKE2B aaf54bfd506cbd4633e3bd0833ad1ee313328e44a675ac313b39f39fb64246077026e8df7fabec5f2a70a07452a5a7882a5abe29850487d357c1c849f963b3c6 SHA512 96321b0b8e1c115510ac6b87cc3771a95c0e306988df00a2bed08fd461dbdb6f8a1068c0e55630629b75f4ebf52ac5d5c3b1c2b0895c4a058a38d210c41baa5a
-EBUILD oru-0.1.11.ebuild 744 BLAKE2B 4d5d770481683371b2456551b4b58c192476cce5b4904a5dca04852c909ef9bc3b4ff496e9e9120f19cad32ae2aad005a3943a99065cec01573a5eb80c2a01d5 SHA512 ff65fbaf8d1c3bb0ac038d3b2b39390d3779c382aabe74226945f892c50e38d5e5db01b8c1ca5d2571b31b58bdf848887c5260a7713a7528212e82cbeef2b860
-EBUILD oru-0.1.9.ebuild 735 BLAKE2B aaf54bfd506cbd4633e3bd0833ad1ee313328e44a675ac313b39f39fb64246077026e8df7fabec5f2a70a07452a5a7882a5abe29850487d357c1c849f963b3c6 SHA512 96321b0b8e1c115510ac6b87cc3771a95c0e306988df00a2bed08fd461dbdb6f8a1068c0e55630629b75f4ebf52ac5d5c3b1c2b0895c4a058a38d210c41baa5a
+EBUILD oru-0.1.11.ebuild 743 BLAKE2B 31c08f28ac466787529badb476ddb1b41f2d50b1d0152c4e293876637f8bb1914398d8843229b7cdc2c3b88c50b939de9ea617dc413dbe56ddd1baede3d741b5 SHA512 02b7b0673657d36bf40eacf7d5f008820fc59cb90a16ab0e51e2f720dc088038caa1ada01709df299cf95168e9a2e35c1c296909ffc816d794da10eea47146b9
 MISC metadata.xml 451 BLAKE2B f75d00210fe0e5c7ff1e70703b1c05f6497dc0b95c0a44c22e613e7447eecb7da2e6a389fb4986f7024868585266c701e747126f4115af255de3030f1974bf83 SHA512 8072b8002f95becc44ea6143a1c01d4fb6fbc5da8678ea69e6b28fa1fe92a6e36f7158a522838b06e4716a6dd71dfc3f9f2787b899aaf6abdb233cafc4e4a6cd
diff --git a/dev-python/oru/oru-0.1.10.ebuild b/dev-python/oru/oru-0.1.10.ebuild
deleted file mode 100644
index 4eddc86db..000000000
--- a/dev-python/oru/oru-0.1.10.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python client for Orange and Rockland Utility smart energy meters"
-HOMEPAGE="https://github.com/bvlaicu/oru/ https://pypi.org/project/oru/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND="dev-python/requests[${PYTHON_USEDEP}]"
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/oru/oru-0.1.11.ebuild b/dev-python/oru/oru-0.1.11.ebuild
index 8f543fdb6..b06f926a4 100644
--- a/dev-python/oru/oru-0.1.11.ebuild
+++ b/dev-python/oru/oru-0.1.11.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/oru/oru-0.1.9.ebuild b/dev-python/oru/oru-0.1.9.ebuild
deleted file mode 100644
index 4eddc86db..000000000
--- a/dev-python/oru/oru-0.1.9.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python client for Orange and Rockland Utility smart energy meters"
-HOMEPAGE="https://github.com/bvlaicu/oru/ https://pypi.org/project/oru/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND="dev-python/requests[${PYTHON_USEDEP}]"
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/paho-mqtt/Manifest b/dev-python/paho-mqtt/Manifest
index 55cfb6fdc..98eca1a46 100644
--- a/dev-python/paho-mqtt/Manifest
+++ b/dev-python/paho-mqtt/Manifest
@@ -1,9 +1,4 @@
 AUX paho-mqtt-1.4.0-strip-test-dependency.patch 681 BLAKE2B 0ed9a448e5e72813aa05ad1d37ae957150ad09b6d48a54f668a969e5e98ad25f8d55b223064e01f6773d0e42da3ba26f2e0a7f43a628ff68fee4b619b8de96c9 SHA512 dbadb8c1bd7691a973d8c1cd146ac9bd72407625ddfc5042b25bc81ff74af6d554c06fa3b2972637acc4a466e75a65c9371990e43bbf649fe5a5a22da2bb36fb
-DIST paho-mqtt-1.4.0.tar.gz 108278 BLAKE2B 0569f3cb5d262b3b7f6ae68261fe138d839afcc6fe91f880e29de24d5cf8e2491af81a30eb82c27fe63eee90114326eb75b06a32e05ec2fffed27b92d9601902 SHA512 2e49f0f146207ab4fbc8c346b10d3e2b50869b2d9db7c999b6645f7213fb635b64cff01c5405e7833a8b25334d24685ce6ed734a6e4b6b0660b48f65cf4a941c
-DIST paho-mqtt-1.5.0.tar.gz 126869 BLAKE2B 2dce27c1fcfe7ae422dc6da76fb58e7901de00c0c349b9715c56a3603da26e1f46af9bb8c0bd982043ba54a2070655b483d251a0a847e1c3afb36bcd4cfcdba8 SHA512 7e52180bf1783ee1f39aa5248730e82fae47fe3db7c4579b0b7207a29f5337c7c0af58d58aac1c265b1ed91fa9c240187d5e3005f55c6e28623e6cbc36750294
 DIST paho-mqtt-1.5.1.tar.gz 101757 BLAKE2B d4131faf24b0a845ea6449f5b763cf40e9f43bcde52cbead61a2dcdfd5b1938524f593ddda67cded3bda49cbbac242622145dbbf2977ebaf4cf6adca8d75e2f9 SHA512 b8afaeab4a7d331e2377cfad049bde7deed8922eda007ef1004223a5927319e8f84dc99221ce98284cd22b691e756a446cd4f040c2cac2889cf9dc3591b3b0c2
-EBUILD paho-mqtt-1.4.0-r1.ebuild 830 BLAKE2B f7efd88a3d4c84df4764c6c02894701ee86a0b7a8978384451e9b1c3e36cb368943a9aedf0c4e5527bb787b3307cec8fadde05b11b24c72110e4e211e240d9e8 SHA512 805a05dddf24fe7a56ed969f17eb67f5e5d156cd1af9fcc4c62a8643fa3643d9d59f3fafa1cafcf1dea3715121a38d2af13559be61ad9c68f90abb39056caf57
-EBUILD paho-mqtt-1.4.0.ebuild 835 BLAKE2B 1f9396ff2f5de3cd85bff17a017c3dc2492e840c858615b14fb7ee07d693e0c0cbbcc9bc25c13e4583ffcc7874d6fdbd5323bfc3c613b4301c8b44298db7722f SHA512 b78765750743a3f71c0aeb05cdb4375be6bc89d05d5ba2c61dd61a47c4bcc5302d7f16a4c860b1b901d73a50fffd24c00e65662ed4721cf86582dffe7cf7a818
-EBUILD paho-mqtt-1.5.0-r1.ebuild 864 BLAKE2B c31e91e5996af476b747e108c21fc30b78c626409c232a30c5a43681476911a6719a4007d4ef002b4b1e5dedf5fa94f58668e427828d1526c64e8c588726a09a SHA512 ab0df8e970a079d21ec0ad5ba87ab4a6307093a9859ad78a987b00d9857f89daf9cf0cb1f933c6514fc27f842152e6438032509f51d96bae7e80e32219554939
-EBUILD paho-mqtt-1.5.1.ebuild 770 BLAKE2B 9f38569c6dad931a7139fdd0e7be58c6c6f5f08eed380d5f599f8b3b3768e5ff80dc38f0f173d83e617aabf15b0278094e7512f5f31251d0f4b36bdffc738c11 SHA512 156f9600e85913b65afc17041af4550793682a2646ef2e88005066324aef93817c392facc4523007648ca0a47e7485cb15ccf3117951478014a0ad5fcd0c8c9a
+EBUILD paho-mqtt-1.5.1.ebuild 770 BLAKE2B 93983c55c79b3478943f030970adcfc33ddc73e42bd60898a4e2a71f07ff72866f6019939f360defef187afff7d6cd8a5ad9cb04e99c5d2ecd61dd1d5f23f6ba SHA512 1ceab0c814e5c6bc5a32437f87d13b5392c6bec60080ea280811b5a5d201ed41edb2efde74f6e2b6c350d7e156db52f0a71e3b93fee96db676330e680e306acb
 MISC metadata.xml 449 BLAKE2B 7750e5de03491785020b3e39b033a289af0bffa5c87327d415d06461ec3588bdc544bb04cfe5635b71a58f52cefcab533abc01ce00ead7edad016887c44543b7 SHA512 41719d750610dc7b50497c7953874473ac25e5f13458ad736e2b59acdf61e3bb3f1084c2a0871a8a2e46d743221ed2bcc2d4e8280f50286e4830eacede0d33eb
diff --git a/dev-python/paho-mqtt/paho-mqtt-1.4.0-r1.ebuild b/dev-python/paho-mqtt/paho-mqtt-1.4.0-r1.ebuild
deleted file mode 100644
index e981e3470..000000000
--- a/dev-python/paho-mqtt/paho-mqtt-1.4.0-r1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="A client class with support for both MQTT v3.1 and v3.1.1"
-HOMEPAGE="https://www.eclipse.org/paho/clients/python/"
-SRC_URI="https://github.com/eclipse/paho.mqtt.python/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="EPL-1.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/pytest-runner[${PYTHON_USEDEP}]
-	) "
-
-S="${WORKDIR}/paho.mqtt.python-${PV}"
-
-RESTRICT="test" #659106
-
-src_prepare() {
-	eapply "${FILESDIR}/${P}-strip-test-dependency.patch"
-	default
-}
-
-python_test() {
-	esetup.py test
-}
diff --git a/dev-python/paho-mqtt/paho-mqtt-1.4.0.ebuild b/dev-python/paho-mqtt/paho-mqtt-1.4.0.ebuild
deleted file mode 100644
index ab4ff4bd5..000000000
--- a/dev-python/paho-mqtt/paho-mqtt-1.4.0.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
-
-inherit distutils-r1
-
-DESCRIPTION="A client class with support for both MQTT v3.1 and v3.1.1"
-HOMEPAGE="https://www.eclipse.org/paho/clients/python/"
-SRC_URI="https://github.com/eclipse/paho.mqtt.python/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="EPL-1.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/pytest-runner[${PYTHON_USEDEP}]
-	) "
-
-S="${WORKDIR}/paho.mqtt.python-${PV}"
-
-RESTRICT="test" #659106
-
-src_prepare() {
-	eapply "${FILESDIR}/${P}-strip-test-dependency.patch"
-	default
-}
-
-python_test() {
-	esetup.py test
-}
diff --git a/dev-python/paho-mqtt/paho-mqtt-1.5.0-r1.ebuild b/dev-python/paho-mqtt/paho-mqtt-1.5.0-r1.ebuild
deleted file mode 100644
index c797b9765..000000000
--- a/dev-python/paho-mqtt/paho-mqtt-1.5.0-r1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit distutils-r1
-
-DESCRIPTION="A client class with support for both MQTT v3.1 and v3.1.1"
-HOMEPAGE="https://www.eclipse.org/paho/clients/python/"
-SRC_URI="https://github.com/eclipse/paho.mqtt.python/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="EPL-1.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 x86 amd64-linux x86-linux"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/pytest-runner[${PYTHON_USEDEP}]
-	) "
-
-S="${WORKDIR}/paho.mqtt.python-${PV}"
-
-RESTRICT="test" #659106
-
-#src_prepare() {
-#	eapply "${FILESDIR}/${P}-strip-test-dependency.patch"
-#	default
-#}
-
-python_test() {
-	esetup.py test
-}
diff --git a/dev-python/paho-mqtt/paho-mqtt-1.5.1.ebuild b/dev-python/paho-mqtt/paho-mqtt-1.5.1.ebuild
index 962c7c935..93d81aa55 100644
--- a/dev-python/paho-mqtt/paho-mqtt-1.5.1.ebuild
+++ b/dev-python/paho-mqtt/paho-mqtt-1.5.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{6..8} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/panasonic-viera/Manifest b/dev-python/panasonic-viera/Manifest
index daae7946b..62c43eeaa 100644
--- a/dev-python/panasonic-viera/Manifest
+++ b/dev-python/panasonic-viera/Manifest
@@ -1,9 +1,3 @@
-DIST panasonic-viera-0.3.2.tar.gz 5163 BLAKE2B 718710ae5a2cdcf9c6f2834178fa7490c7d1cacb00bb8818b33a3484cb2d40d56e0c8676bbb4e54172e7d2b55726d9edbf80c36737b7d3203eb3b36a140e7ee7 SHA512 2bc336fe6a9a2727b13f8fd5da376e0bcd4d04796463c4620fc37687983f82c5c07ef68a08aad933c7692c77749356bd6149e45e26e00242278fea8bf8e54573
-DIST panasonic-viera-0.3.4.tar.gz 8633 BLAKE2B dfcf64f1f79f140fb0c0d88fcc3af76b635a6f3d24204c798e1a1fc05f56abc717bd1f202fe93c3bad213a25ebc3ddbb0fe8d00d4a03f2fd74cd70987493b30e SHA512 ff33a6a7697db75c7af49cf9791d257d8e80806984a1c27c95155ec50d64423f4894f94ed0c5ca52b93676f796b8cd578598f69f8eed7dae7dae48dac198e420
-DIST panasonic-viera-0.3.5.tar.gz 8639 BLAKE2B 7c3a22ea1d96b6ac1f501ba3d0333d68e249d947983e0cc826870e1ce3d9c49996676774f503a8665eb07deef258b8a96a9a846d224680c5b5dc22f781100d65 SHA512 406061ad0df0698c41151fd7a4d03eb48c25765c2c5c74f34be6f352271968252d471ead3b8e5928c1a42ef82c2ca14b55699927a2f1716c21dce2dd7b81c141
 DIST panasonic-viera-0.3.6.tar.gz 8772 BLAKE2B 7cc95e00d90b54516e7c3cb948b43985c07a5f93eade8f7c66ccbaf993e1ad3940523a28df7475d2acee057aba8f092f6be802cbfd1fda9ca90dd7039bc1cf9a SHA512 eccbf9473c6bc98fd21769d2af166af11b30d35ee4733aab7433721cbbf91f1f1e9ce3d2385dab3804c5e87ade4ecf4464bebadd0faec06ced129322d325e5e4
-EBUILD panasonic-viera-0.3.2.ebuild 810 BLAKE2B 00021ed051c0628cdfd3955aa005f22e17d63c78a1b22741de16832013fb2b6c938dfd660360915ce3339763f033cdb0bc041c8203b777c5aaf85ac4420fc118 SHA512 bc3f5b3ca372d0faa5b6bc4c49e4a9509a228a63017969b717ce67817678394653b90fd5b08333a577797ba46b6d2544c1f5a6ce1838c849d2b9328d814c4295
-EBUILD panasonic-viera-0.3.4.ebuild 819 BLAKE2B 377ea2e035593687876c0f360d5e131c78d96dff131273df06298bfe5a2d9508f620db276b93cca2d22ed1b1f54524bf25bff2efff326e2b8cdcdc11458f620d SHA512 3d26285bc12fefafe504a57784e0f4fe2cd941dc277dccb9fe6291ff3d56ad8bb3951d15de9faf1bea37f4add785ca9837084abd7e9baaedb557c74c86fb5b0e
-EBUILD panasonic-viera-0.3.5.ebuild 819 BLAKE2B 377ea2e035593687876c0f360d5e131c78d96dff131273df06298bfe5a2d9508f620db276b93cca2d22ed1b1f54524bf25bff2efff326e2b8cdcdc11458f620d SHA512 3d26285bc12fefafe504a57784e0f4fe2cd941dc277dccb9fe6291ff3d56ad8bb3951d15de9faf1bea37f4add785ca9837084abd7e9baaedb557c74c86fb5b0e
-EBUILD panasonic-viera-0.3.6.ebuild 859 BLAKE2B cda8a8407d98ba6014559d9d9d982f04b5429d8719a49552c5decff63de2c95e3e6c716d6a7e793dd1135fec01621293deb85479c7d8d4f4921a9fe5559f496c SHA512 04dbcdada822368afc274b4a322c18dca1330c037b3ebb3e357874a42a4fa79371055c935246e92b70f9a196c56769af238efa5320f538cdde06e61519b2926f
+EBUILD panasonic-viera-0.3.6.ebuild 858 BLAKE2B 11d74d33d6bf5427eac43c37cb92bbf9fefe7139878cec6b487336f1193cd1930c6e626155f1060a29fc5ec828c9a22821cad3cd5cdd87d4ef1e3918904ed4ae SHA512 8ef6673b9735042bae73c5e8ad3a80f8a5206ef6b0334d2f30b110ca184608f8f64f6670d0132ddee9de62b7a01d05346ff8371de9c1fcb4fc6cfd348d8d14aa
 MISC metadata.xml 468 BLAKE2B dc3e8d35f1cc872167bd74af7d9d680e58d225ca38f8bd37af48e3528219f7e15f1a206e494e82703c9dd1843fc4e3e8434041d73cb3b63f94b94f4aac03707b SHA512 e6164984f3b88973885651d4dcc507b91beb7478bc51b7b8723a70842bb82e2e3d0720e1d724fd7d41333a97597e6ef5372c4bdc14b4667c7ae542e23e9f9ffc
diff --git a/dev-python/panasonic-viera/panasonic-viera-0.3.2.ebuild b/dev-python/panasonic-viera/panasonic-viera-0.3.2.ebuild
deleted file mode 100644
index a03df2633..000000000
--- a/dev-python/panasonic-viera/panasonic-viera-0.3.2.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit distutils-r1
-
-MY_PN=${PN/-/_}
-DESCRIPTION="Library to control Panasonic Viera TVs"
-HOMEPAGE="https://github.com/florianholzapfel/panasonic-viera https://pypi.org/project/panasonic-viera/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND="dev-python/pycryptodome[${PYTHON_USEDEP}]"
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/panasonic-viera/panasonic-viera-0.3.4.ebuild b/dev-python/panasonic-viera/panasonic-viera-0.3.4.ebuild
deleted file mode 100644
index d1cbde2b6..000000000
--- a/dev-python/panasonic-viera/panasonic-viera-0.3.4.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit distutils-r1
-
-MY_PN=${PN/-/_}
-DESCRIPTION="Library to control Panasonic Viera TVs"
-HOMEPAGE="https://github.com/florianholzapfel/panasonic-viera https://pypi.org/project/panasonic-viera/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND="dev-python/pycryptodome[${PYTHON_USEDEP}]"
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/panasonic-viera/panasonic-viera-0.3.5.ebuild b/dev-python/panasonic-viera/panasonic-viera-0.3.5.ebuild
deleted file mode 100644
index d1cbde2b6..000000000
--- a/dev-python/panasonic-viera/panasonic-viera-0.3.5.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit distutils-r1
-
-MY_PN=${PN/-/_}
-DESCRIPTION="Library to control Panasonic Viera TVs"
-HOMEPAGE="https://github.com/florianholzapfel/panasonic-viera https://pypi.org/project/panasonic-viera/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND="dev-python/pycryptodome[${PYTHON_USEDEP}]"
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/panasonic-viera/panasonic-viera-0.3.6.ebuild b/dev-python/panasonic-viera/panasonic-viera-0.3.6.ebuild
index c0d8817f5..faeb35e03 100644
--- a/dev-python/panasonic-viera/panasonic-viera-0.3.6.ebuild
+++ b/dev-python/panasonic-viera/panasonic-viera-0.3.6.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/pencompy/Manifest b/dev-python/pencompy/Manifest
index d9577451b..d9458db01 100644
--- a/dev-python/pencompy/Manifest
+++ b/dev-python/pencompy/Manifest
@@ -1,5 +1,5 @@
 DIST pencompy-0.0.3.tar.gz 2817 BLAKE2B a8814b5536addd5e58c54064656ccbe0658b62f3527f46435b66e7fb8dfbf7bf0d49b1093e6772f774c510565333e4d6ba1e4868828db7f7928f02b6bdaa5af5 SHA512 27e4e35549dea5e7b6738eca52f37c28277e43d1a83a0d234714aea0839a55f93f299895214c6bbdb50e2b3aa3598991ad35c6ec624b8dee5c4cf962d3ca49bb
 DIST pencompy-0.0.4.tar.gz 2923 BLAKE2B e95641d524132afcacfa8fe413d4248cf3f396af97fbfaa8b91ac542c0ce905d21c3711d8a62b66e521855d03bac4233519290176eb7f54bebc5fb69cd0c9810 SHA512 5b3443b02b059f2d271ce9eceec6c3bb0c7dbcc50040c93a7b5b88c200cefa1558c54267f2631d6830ae6824691f74e141c642e6f074bb81b1454b9682ae88e7
-EBUILD pencompy-0.0.3.ebuild 671 BLAKE2B 7180d3cff7e1daa613b6d6d88b2f7afad353d4722f42978f812a03afb6810e5b3daaf98583074262df2788f8394ea3f9bc8f6f8d235279450242c471f9be6b42 SHA512 24b2891b1e756d977971e77a205574d86eafb68461ac208f23717f2b449b79f48665f6fb59cddd4cd0339da8711810b0ccb77d42336f821964d1531de5625e36
-EBUILD pencompy-0.0.4.ebuild 680 BLAKE2B 8d5d225a218000f62ebd49bf871d2647762831d801f443314618b5fbc825026f86ac23cc821c1ef6b74e2db4bedf99165bf9a8cff907895f9128ccb11a7f01ea SHA512 c650f02105ca243e369ff9d884f51e2ff2988ca8646517306f0c76f2c4f64fe3678528d63d6b532d97d220f046e0d7e6d9d0b3ce6a9e3be5071ffa0929b3e3e8
+EBUILD pencompy-0.0.3.ebuild 672 BLAKE2B f1af69922858c5bbd78c04cec218441c6a10f2e35180c997b3fd257e025628b3e78b3853983808045d1867f69088e83e58bc0cc50257c64f0e03e578ce23853f SHA512 212a6ce18b43741c58ce3e09dad081dcb5c585cc2567fbe69e9cd460b21f99aa7cc567b6e2533dc1142947a57f7c53c327bb7c9d41ea05f0df9e688253907270
+EBUILD pencompy-0.0.4.ebuild 679 BLAKE2B f7dc62debc438111bbcaf1c73de000520e1d90ff91983f60468850fe2d59ea3d0c9b1dc282c2e6c896b9727fbe7eb44b63513d0280447038042f0bf91fd58fc4 SHA512 73b082c82e8a06a56052b836873c35787a85089c102779f0658a7c2e54d2ce6f212dc7f4d9c2661da560ff553bf3819517648c647e82ac121e13d1210a67f92a
 MISC metadata.xml 451 BLAKE2B 0c4036e06977b1e4f41d750bc181a01d579b6d317cde5c977fea7bfb214d794d2dfc3eebb5f4327683506391fbb337b255c4e6ad868d19b83c147b757e534950 SHA512 cf189dd51dc4cff3f85d69ffeed610e3a35014698484221e34008a234d3e285a884fa517a4752e3266a3b04051ae7742c6f307bd163320d48e160e16c64829ff
diff --git a/dev-python/pencompy/pencompy-0.0.3.ebuild b/dev-python/pencompy/pencompy-0.0.3.ebuild
index a3b1bd8d0..410571cb8 100644
--- a/dev-python/pencompy/pencompy-0.0.3.ebuild
+++ b/dev-python/pencompy/pencompy-0.0.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/pencompy/pencompy-0.0.4.ebuild b/dev-python/pencompy/pencompy-0.0.4.ebuild
index 1d4cd8bef..ad750e1bc 100644
--- a/dev-python/pencompy/pencompy-0.0.4.ebuild
+++ b/dev-python/pencompy/pencompy-0.0.4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/piglow/Manifest b/dev-python/piglow/Manifest
index e72e2fd47..e51d8d2be 100644
--- a/dev-python/piglow/Manifest
+++ b/dev-python/piglow/Manifest
@@ -1,5 +1,5 @@
 DIST piglow-1.2.4.tar.gz 5620 BLAKE2B bf8170498c4d906914f9525d5ec1349f646c98f750b57b3a3bad4c8bbf059f5e8a52e9ff5d69324a2773ae82c51cdb3ee1c0d2bdec53b5b3279571fca3d7fbe6 SHA512 e330686d66174e639e59cac49a47c0589fecdb0b5c408bec0230f293c5b078e495c46495c4e0132fbaffe5026bbfb99fefb4e4336bb5a50629c151face932d41
 DIST piglow-1.2.5.tar.gz 8164 BLAKE2B 404445386a5c8972856205779a91d4176c8e80b2287d32d0051b230050d21a21eb5177a2bd6cff66c22ff277d306377d40f0267bf3429b02be2795acdac58b3c SHA512 cb495370794b621700cb7e0d4906b87129d46e28a121a22bf286ac9f92e2af967de70a2755d48aef29529cea0abe720f42a6ef60e8ca2a401936be268b67f0c9
-EBUILD piglow-1.2.4.ebuild 693 BLAKE2B df03bf08155ff3af8b82b03ac5aab704220ba6039fbbad0823d15c4c4e6059511aa1a1239801ce99d67dea198b9b779741ff302286671d6aa3a9ae4153691028 SHA512 5df542315ce3d54f09782e0de666a82ef3c1afb32c17d59e3a04be4e9feae7aca7dcfeb52b6b04d6607b4dc484e240bc655f5b6c8afac34e600c0ccad57a512e
-EBUILD piglow-1.2.5.ebuild 702 BLAKE2B 031731ba9483a3be72c214818ae3de36360fc510bdf9c7f575165457dd5373b5853e76d7d5ea34bfd31871ee2327b39a27cf42f47312d7408dcc36a234c3a652 SHA512 cb4232d1a9b1920fb54216dbf5589ead29c101e0f60a75e428a7c19fbe850158694be7da6ef70938dd694e75af61c11718feea3eb842bb34929948d3fef40528
+EBUILD piglow-1.2.4.ebuild 694 BLAKE2B f2c3583529f8535f2427b5f77aa0613a69e47e27283deec3361693a47e6f0aed545489214a0fcbec098dfe63230b865fbbcfbca0d45054e78f811bd1c53f6c69 SHA512 d2e234c4ec44855835c3315c72576d4dbd36d5adca600462a8d0ae741e12cffa8be602816dd5f3a463df51d7601b93b39b09373642ffa1f5778f1c12f47c27fc
+EBUILD piglow-1.2.5.ebuild 701 BLAKE2B e4c8f9a496e10239fd53e0c63a25c4f5a6c6feb3d52cebbacdfb08f6da36cd2d0ffdd15970e6cbb677a897aa302caa06548acec124a3aa24026629c5375f1468 SHA512 d782614d57e50b3a9f2342593c3d78435489da89c8f822d15f976d0d42ac7bf7d85a46943c120411c88e041b8baeb457e62d3e2ac5b637e3060f5b8c402ed98a
 MISC metadata.xml 449 BLAKE2B d3bda06f205cb7c1345e211a7592a7f9e3f494e5858a48c86dc48a6875938b1c96545507ac0ec266a881bc35dc3a17b5864e1affa838bef3cb86c1159dbd2997 SHA512 f23025971a6bac699e044ed2fe005e532e92c9ca2d0417244786288fd0ec79bbe790678d4a798916808fcbe8f0d0168c31a8198b427a44b94afb331abe502e9a
diff --git a/dev-python/piglow/piglow-1.2.4.ebuild b/dev-python/piglow/piglow-1.2.4.ebuild
index 931041bda..e9781be86 100644
--- a/dev-python/piglow/piglow-1.2.4.ebuild
+++ b/dev-python/piglow/piglow-1.2.4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/piglow/piglow-1.2.5.ebuild b/dev-python/piglow/piglow-1.2.5.ebuild
index ac94ebe7a..f645c0ae6 100644
--- a/dev-python/piglow/piglow-1.2.5.ebuild
+++ b/dev-python/piglow/piglow-1.2.5.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/pizzapi/Manifest b/dev-python/pizzapi/Manifest
index 8243eb04b..9d4407ea1 100644
--- a/dev-python/pizzapi/Manifest
+++ b/dev-python/pizzapi/Manifest
@@ -1,5 +1,5 @@
 DIST pizzapi-0.0.3.tar.gz 5950 BLAKE2B 711262fbd1fcc5843f33fda2b8dafd52503d98533c4563b170e02e3bfc1c320e39b14983eb6764609b1e23bbd1e02e064f0299471b658efa2373c865a1e15911 SHA512 b9f6241b4222a9080767d6ff5394a97589a9adbb7ae60b1019af552cfb4e6d0bc531345d31e8e348621b7f30b3b97c253ad75ab44ea85bd4773c968fa47906a7
 DIST pizzapi-0.0.6.tar.gz 11435 BLAKE2B 9eafc2ca9908dbb2b7ce781e8caf66d8657972acdb2a9060314a3fb47ca16c986e8752e764fc6c56437463c0e1156a184454a914b8536047cc0ca006fcbd2089 SHA512 bef356aa7c6ceff9f10a93ec46e64eeab2dbd37261d37cc0bccf27ffe1ea227c64dd17d4e05ebc5c1984baa94999192a653a1fa57e7ab25ce4bb1e85441c566c
-EBUILD pizzapi-0.0.3.ebuild 968 BLAKE2B 5aaaaac9643979b8c9067f15dd8ed381a11980616371749919b5c2e908b6b23802f8587d01b4c99faaa98b0449d7c0696ba135241799d5de09a982ea212a139f SHA512 0225d4a1fe8580bfdd23cb7af21773f0b8466e2aaca0478b4a633e6bfe8dbb44748264b9de63e4853959fdd6a12273175289b5e49e5053ab7a5efba504f7d6cf
-EBUILD pizzapi-0.0.6.ebuild 977 BLAKE2B e158f19c5ebed4a7b199b14205ee51a73bcf9c59b0645502fe67e66a96d07a3afdcf2a5b53eabf4d9eb64267c63ab001d488cc3fabc7022938a277ec107bad59 SHA512 3ae9d9b5bafc88fc125e79dfdedc0028ca3ceca2a830024a19da1d8cac8f86b2969b72e51e61c7ae4e6eb57362ab5106c026dec6ba88290d110d2d912c7e90df
+EBUILD pizzapi-0.0.3.ebuild 969 BLAKE2B 86bf0a07133ebcc543106603f7100e7774f1835a3640b4e75c7ada7e8bc471035f786ba312ea5871a5aa2327126ce81f8d01ddd4aa23a54aa54735eee2228fcd SHA512 eaf6a7aac47440c2547fc0ec574edb3326b64ce377baad7bc2e12c5dd9967a0926a1d4ef624a3ff6aabd76f7099eea90f669c909be558ba05f2f6374e48f9ccd
+EBUILD pizzapi-0.0.6.ebuild 976 BLAKE2B f97749fdae58fee275fa4a005c9058569c6d26714aab8fdcf157309e824e25f625e92d43ad236cabe195d3520ff546578a05b13d1b0423b6cab534c29514598a SHA512 628fc1e538bdc9a891609b3f490c852474a3a171ceb1d8e24e65c419e35e1741e99d3c254ec78cc4a9d220d29f0a51b34b00a8bf8a52cecdbd45a2192ef82758
 MISC metadata.xml 444 BLAKE2B 52bbcd9a30407e5fab5e6d671b3efb52f1cfe54f4f7d893317573280ee6eda27b7a5df8fc8a4256cb2946a500532c5eccad564a8f2089698a0a651605c3053b6 SHA512 880865673bed601c0ad691a6cacdd7b817a472537c01e86cb0846e586f68f9c768be3792c3b57ff2ec7ef610605fd96b53bc0eb6680839e0c8e844f4e975e029
diff --git a/dev-python/pizzapi/pizzapi-0.0.3.ebuild b/dev-python/pizzapi/pizzapi-0.0.3.ebuild
index 0b98c3eaa..7b6bc09dd 100644
--- a/dev-python/pizzapi/pizzapi-0.0.3.ebuild
+++ b/dev-python/pizzapi/pizzapi-0.0.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/pizzapi/pizzapi-0.0.6.ebuild b/dev-python/pizzapi/pizzapi-0.0.6.ebuild
index 8b01e555d..7f2ae119d 100644
--- a/dev-python/pizzapi/pizzapi-0.0.6.ebuild
+++ b/dev-python/pizzapi/pizzapi-0.0.6.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/plexauth/Manifest b/dev-python/plexauth/Manifest
index 1cda64253..b86c72bd4 100644
--- a/dev-python/plexauth/Manifest
+++ b/dev-python/plexauth/Manifest
@@ -1,7 +1,3 @@
-DIST plexauth-0.0.4.tar.gz 2446 BLAKE2B bff56a8b6822e502c56a67a64fefbfaf8a1f1faa5818eb6de0f4d71fdd7db8ef64f0c1f8b95697786d8fd0e2ef23f54eaae8b300b6cc8a1101f157ea7d3049f4 SHA512 9a00f4a44e6e11d4a558702a49493b276009b110b2468c6e8056e768d8b2773894e232570c77031ee8d957e454558fc645e96b3fc8158c71953511a18bcae5af
-DIST plexauth-0.0.5.tar.gz 2455 BLAKE2B d5662c857b245a359162fd5122af13502df9c95dbd838c28614346bae60309242cab616ee9a4b40c5f092e82fb31e3fcbcb08d72adba12dc525f6d8da4574ee7 SHA512 a5fe4a4cd8781759ac65dfd709d5cee1aacc20483df8240a6e86de61f55870ae0aab8c76b5370ecafc49b848d1ca94abd38b2fbe9f723322aea4cd3ed25d8583
 DIST plexauth-0.0.6.tar.gz 2438 BLAKE2B 1c7bad4cfac10f95c47ad1b3f5d556e761b6d0bddbfed4d39c34108433279f7b9605eadc2c988602535dbd37d969361c9b2f854db53b49ff51fa27d88668fedb SHA512 aa6b5a71dab3eabdb435ebe121e2cab156188714e6fc71166e501bbf56c9d20533270b69c74f747a51dd493d86de286d0435cded66645fb30508754938fe88ea
-EBUILD plexauth-0.0.4.ebuild 720 BLAKE2B 26240d8a6ab35b237d55cf5115a288266dcc157a34782ea83f1ebbc23fca4d0cf3d883e78cef242f5b5eb7f28703f03ece4c44877434a8d8b9ad8be0bed62eae SHA512 87b64189dfcfb00b5f4c178a7997025e6388238bdb8a8530b53950c1829fe72aa5d2105f262f94194b0301d8eed397853b1f692044070650b55dddaf40dd3611
-EBUILD plexauth-0.0.5-r1.ebuild 763 BLAKE2B 51be7a7cac95978e65fc339d4a25c74bd493f155319e7eaceb38ed10e43281e5b661931db6fea656c328b5c2c7482f8c73e35b695acaaf2d880c8ef2f4dcd89c SHA512 ea47f61f3db1e0a95b2d141841cfd0bb6680038232371396c5fe18b487356e99ed19da4c20bdbfac97cea84c3f5c3b23c0a77d3ebf85466c9443c3fd0562495b
-EBUILD plexauth-0.0.6.ebuild 764 BLAKE2B 566ede91c20e219b5acdf1367610464df585a3cab7d605918be5bdb5b174a9b77e2a563355e5b07d73dee3fe37d73a0d8b21a8978e73abe4ea99f58d95ec87df SHA512 b5f208dcdfc25797e9689ddd58824b65063a1bd899ffefacd8dc888594d5dcb4baf08631f884f40bc5968d2feac95a415637ff879cfb282c6461f71cc290ed25
+EBUILD plexauth-0.0.6.ebuild 764 BLAKE2B 5f11d0b957610b407a7d56dc541f3b67eda94341ae462975d6b0af81acafa58841978dff7093537dc1e7807e16ff67adfdfeb62d3ad84c60ca13495964e62688 SHA512 f7b6208f0663a91b8b6f8075a5ed970a1c44ecd00c6f90c4f452375879e65ddacb7f959fade4b853f4d5cfdfc97fb1f7f243c7052538df2716dda0c262f704b8
 MISC metadata.xml 468 BLAKE2B e855739211b61e72f88d20cb60106c6024bd5893295274d947b10522324242f6f32f13b395cc359645b32195642a69bf1a96ce6cda6217053efda1ef18596191 SHA512 bfda84d408c4d91ba035fd7cb2c8c237a73e4da6076249b1c2f0cb5131040bcaa5e0c5ea21cfcc16f890b131338963d2c6fb4421cb8d6da7996edb4ed8a0084d
diff --git a/dev-python/plexauth/plexauth-0.0.4.ebuild b/dev-python/plexauth/plexauth-0.0.4.ebuild
deleted file mode 100644
index b49c29dfa..000000000
--- a/dev-python/plexauth/plexauth-0.0.4.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{5,6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Authorization flow to obtain tokens from Plex.tv via external redirection."
-HOMEPAGE="https://github.com/jjlawren/python-plexauth/ https://pypi.org/project/plexauth/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/plexauth/plexauth-0.0.5-r1.ebuild b/dev-python/plexauth/plexauth-0.0.5-r1.ebuild
deleted file mode 100644
index bfcac2a21..000000000
--- a/dev-python/plexauth/plexauth-0.0.5-r1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit distutils-r1
-
-DESCRIPTION="Authorization flow to obtain tokens from Plex.tv via external redirection."
-HOMEPAGE="https://github.com/jjlawren/python-plexauth/ https://pypi.org/project/plexauth/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND="dev-python/aiohttp[${PYTHON_USEDEP}]"
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/plexauth/plexauth-0.0.6.ebuild b/dev-python/plexauth/plexauth-0.0.6.ebuild
index 28e5b986e..2d9aeb210 100644
--- a/dev-python/plexauth/plexauth-0.0.6.ebuild
+++ b/dev-python/plexauth/plexauth-0.0.6.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{6..8} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/postnl-api/Manifest b/dev-python/postnl-api/Manifest
deleted file mode 100644
index 46ef4b410..000000000
--- a/dev-python/postnl-api/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST postnl-api-1.0.2.tar.gz 3495 BLAKE2B c65aa2bd62b1de50861070f0e80678d2003305d49b68d3d5d83edf8afa4a7b3192ff384f2b26a2f8cf015c40548967130c94b80c91d3893c32ed4bc6bf0e92a2 SHA512 231fb37fb897c601eae4a9972308c49c9885e87f9c74b26bc752b537f07de45cd634203cf961d8caf572b9618518afb2ac4133e3b423fba1056720a7ed5766d0
-DIST postnl-api-1.2.2.tar.gz 4652 BLAKE2B 296212a310dabc9277bb82b28d4cf65f50c6d677396fef2dae581640ad6ba6a1ca8904966d066db2f07231a055b22dbc50e6156ec6fbc5ed0735d6ce2318970f SHA512 8c1ff3cef4d24cd105aad3334de7d33b3bd0a7591da026c66c975cb2d999d09a319e918f8ffc3fd32594f14fd7e6d63c284c8b0106f14c938c9cd190967494d7
-EBUILD postnl-api-1.0.2.ebuild 833 BLAKE2B 76300ceba9137a718379a69ca06c59f1da404d94518781dd378958ab19ddf7742fc171f76d54035e0381683599a149df6f16594951ada3053adfae4f288d7817 SHA512 09b2a6d3c32581d372aa473105f5bea073d0ae2b76d06372df09c93066663284462f708c4e424646edeb587368fdbc4fce1fd776b0caf8295a1fdb4521dbf841
-EBUILD postnl-api-1.2.2.ebuild 842 BLAKE2B 13bca318697550903e0741483504798dad46b9f4ba1461c8e6d2d76b87f537e0edc5d12443350611c706a6c2aeb00f868d1efb2424b61f4c3c59102ba5e5ec4b SHA512 9cacdf3688b2edb860f10ef6664a8908d6a5f3f3013f96c02a98f056a364f165c524eb53c99b667b4b9488e39de2c6c22593ebb431cb56c59b577bade8e1f1d8
-MISC metadata.xml 452 BLAKE2B 568d50d76333cc5e46e9a5875aa029ad87615b0d02e7d96cee17384b52b164932860e721b2d720b3c65bcf063dca4afe72c948b808100de626a9160d523cd32b SHA512 2ce2abf35397accb9878013084575c14fb17fc0387714cb3fcf197f5f9c883d18d3c4da630b0e3587137531e889762c394b52d3c73fdc9e5278f2ffded3b5bbe
diff --git a/dev-python/postnl-api/metadata.xml b/dev-python/postnl-api/metadata.xml
deleted file mode 100644
index f3be30f21..000000000
--- a/dev-python/postnl-api/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>b@edevau.net</email>
-    <name>Andreas Billmeier</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="pypi">postnl-api</remote-id>
-    <maintainer status="unknown">
-      <email>mick@imick.nl</email>
-      <name>Mick Vleeshouwer</name>
-    </maintainer>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/postnl-api/postnl-api-1.0.2.ebuild b/dev-python/postnl-api/postnl-api-1.0.2.ebuild
deleted file mode 100644
index 1dca45ec8..000000000
--- a/dev-python/postnl-api/postnl-api-1.0.2.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit distutils-r1
-
-MY_PN=${PN//-/_}
-DESCRIPTION="Python wrapper for the PostNL API, a way to track packages and letters."
-HOMEPAGE="https://github.com/imicknl/python-postnl-api https://pypi.org/project/postnl-api/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=">=dev-python/requests-2.0[${PYTHON_USEDEP}]"
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/postnl-api/postnl-api-1.2.2.ebuild b/dev-python/postnl-api/postnl-api-1.2.2.ebuild
deleted file mode 100644
index 38d398d50..000000000
--- a/dev-python/postnl-api/postnl-api-1.2.2.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit distutils-r1
-
-MY_PN=${PN//-/_}
-DESCRIPTION="Python wrapper for the PostNL API, a way to track packages and letters."
-HOMEPAGE="https://github.com/imicknl/python-postnl-api https://pypi.org/project/postnl-api/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=">=dev-python/requests-2.0[${PYTHON_USEDEP}]"
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/praw/Manifest b/dev-python/praw/Manifest
index 60291a4fd..135d3e6a9 100644
--- a/dev-python/praw/Manifest
+++ b/dev-python/praw/Manifest
@@ -1,13 +1,3 @@
-DIST praw-6.4.0.tar.gz 20361596 BLAKE2B 1eda9053993fbc4ab4e8a5cf6eac189a4732fa156e018bd773390d232ef8c3a76471e928bdaf53ca0bc7b8df80624a402d5e2a49905e4be99bb1a7384f510284 SHA512 9f7c0892aff25d44946e78446c8916e2812a9da37a9b2f77e56c78b20a7e9d7fa11240c6ee7910506bb1d858a6b937b44957d46cfe326f4553393898261db64f
-DIST praw-6.5.0.tar.gz 20463588 BLAKE2B 04522bd8a8d78723c198ea520688f014eed2eab2900705a57668376c8f6f3d03aa2423dfbb43fece4a228ab74a31fd41b547b26672bf18c3d5e321bad85b9171 SHA512 8b7c7509083f023e2623dd2026715d14a8d4292f1d24a6806c25af550361b2c758d48ad482b8e82a0f6dc8c67e8242bae547e9253a2a566d7995d32b34ecafae
-DIST praw-6.5.1.tar.gz 20310154 BLAKE2B 36ac44d4eb3de32074c3648dfcd582727ed1bf733199afbf7911563d1f140501a2ca56556feb2e7e10f654a31cb1b14b5ff02176a3ff608d754ec245401a878f SHA512 8e4eca808a261b41f6952fb691e65bfafc34b32acc986e9e2bd501f300c8512a9915f5c4381fb859db93ca79460ef44cae4ee9f98309e613043d84eae203ebc8
-DIST praw-7.1.0.tar.gz 21293290 BLAKE2B e2eeaf8465e0fb24e72b565d94e13705e682178c66b93d398c6bcd1f8f6d7ab49942fbf1f635ff5b9198bf376ee08ce163fd4625f19c416b064d71b6a7b501f8 SHA512 ba19434f875139d535c00a5019c8ecbdeefbaa48c24e44f4eee77058eacc661be613949cfb5b74dcd267fe41f813339ff971c1cdcedea369ec244279fb5c99bb
-DIST praw-7.1.3.tar.gz 22744745 BLAKE2B b963d89fef58174c00c5d41f9f978f2310ea9ac1111821fce99454b2664cff2d2872da3246f2801903c0c14292281420ac1c8c4458d640f0114c458406c33e97 SHA512 f56f39edbeb429432ea52f1823c22bf39f408ca5cf7db3956605c28c5d3726825d31906241b701c3cb5172980f5e7d38637620df7846cb64a0845acec21ed652
 DIST praw-7.1.4.tar.gz 22702929 BLAKE2B 96a65296dcfd8c208a5341596e73edcc11d3e3ce7319e1c23139fbcc6446861986eb93a52a41677a0c52f9c1120f7ed1c2d5100d0747a6c33bb42a0f8d36f353 SHA512 0527da9bcfc758094c3b2cc2b6984e9004a55251f0973f035b51dbef20d50b87609fd9f21047197f68336c8fd722187c2159f9e290a24d0fb004e0048fb95d6d
-EBUILD praw-6.4.0.ebuild 688 BLAKE2B 3ddf877a52de2054b26f45e66a64ddac4a3bc2457347c990914dd874397a7c3f8618384af9f325a7ca0cce90c40a3a644e44e2446a213b410301574b774af64f SHA512 e416dddeb8514c0a317511313af85d20a2cf672b9c8c89e8ec6329cafdec85d0edb78c2d08cb0eb4bcb4f7e3e2136a679f0e6aaf5076042ff8aa452eb30096b1
-EBUILD praw-6.5.0.ebuild 688 BLAKE2B 3ddf877a52de2054b26f45e66a64ddac4a3bc2457347c990914dd874397a7c3f8618384af9f325a7ca0cce90c40a3a644e44e2446a213b410301574b774af64f SHA512 e416dddeb8514c0a317511313af85d20a2cf672b9c8c89e8ec6329cafdec85d0edb78c2d08cb0eb4bcb4f7e3e2136a679f0e6aaf5076042ff8aa452eb30096b1
-EBUILD praw-6.5.1.ebuild 695 BLAKE2B 533142399ae93303200811ace23fcdc6a623e05f1eba7f2ae10b212c81bafb22ad8b0794edc6ddf88f687b88ea15e125a0170201b0cd7d9e3bc0e3ba303d64e3 SHA512 b0c3d7c4d582116a10194aa1f2209f1904d2b9dac4a4ee28247fa954a4590e98b180f7c944c69fd4a75b137239d482d15a561490476bc264a3c34f6f9bcc551c
-EBUILD praw-7.1.0.ebuild 695 BLAKE2B 533142399ae93303200811ace23fcdc6a623e05f1eba7f2ae10b212c81bafb22ad8b0794edc6ddf88f687b88ea15e125a0170201b0cd7d9e3bc0e3ba303d64e3 SHA512 b0c3d7c4d582116a10194aa1f2209f1904d2b9dac4a4ee28247fa954a4590e98b180f7c944c69fd4a75b137239d482d15a561490476bc264a3c34f6f9bcc551c
-EBUILD praw-7.1.3.ebuild 812 BLAKE2B 9cc385e021c17c41169ce17b3eba7cb346efb342e68e110cabbe6922f977ec02e8f0e2c9d0e2d88e0f0fcf9c85a2f374ccf7945742e535ee623275d0f1d0b076 SHA512 8215a612454f9b74b90fd6903db4ea34404d3a0b049878fccae52974fa01d3ebfe23954c2f8f70e7b9ae08809aa8b0ed0fb14434d079fa12e6724f25fc60e406
-EBUILD praw-7.1.4.ebuild 812 BLAKE2B 9cc385e021c17c41169ce17b3eba7cb346efb342e68e110cabbe6922f977ec02e8f0e2c9d0e2d88e0f0fcf9c85a2f374ccf7945742e535ee623275d0f1d0b076 SHA512 8215a612454f9b74b90fd6903db4ea34404d3a0b049878fccae52974fa01d3ebfe23954c2f8f70e7b9ae08809aa8b0ed0fb14434d079fa12e6724f25fc60e406
+EBUILD praw-7.1.4.ebuild 812 BLAKE2B 32cec63b26c2d81f613f451f77977d1a512ea00b796444f1836edb563cc00c24ad11fdcfee7564a9a69afef6917b248abbf00d80f0d81d732b77c15dd00c2563 SHA512 708fb3d7f143f181df7c133611165981a42ed935da709e1d1b7f39d997b58b27e30d742c5c1ff753dfc46345a79e839fabc3b153be22fa24cb453878eea30eb1
 MISC metadata.xml 444 BLAKE2B 179c78a2c54c11728a8329027f81cd8a8837a29cd8716942bba9fac5907675080c305872d2a29a5d184a8cd3859e28d7adedc65a1ae3724750c69a162836cf98 SHA512 b267fbfb759f8e79729149b76859c599a475f1bd3fd5d4fca15304655d8f51403464d0e036725c50a39e9fbd6c4b0a8d2ea46bdf1bac9b191252bf951f1a4817
diff --git a/dev-python/praw/praw-6.4.0.ebuild b/dev-python/praw/praw-6.4.0.ebuild
deleted file mode 100644
index 344aeae66..000000000
--- a/dev-python/praw/praw-6.4.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{5,6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python Reddit API Wrapper allows simple access to reddit's API."
-HOMEPAGE="https://praw.readthedocs.org/ https://pypi.org/project/praw/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/praw/praw-6.5.0.ebuild b/dev-python/praw/praw-6.5.0.ebuild
deleted file mode 100644
index 344aeae66..000000000
--- a/dev-python/praw/praw-6.5.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{5,6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python Reddit API Wrapper allows simple access to reddit's API."
-HOMEPAGE="https://praw.readthedocs.org/ https://pypi.org/project/praw/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/praw/praw-6.5.1.ebuild b/dev-python/praw/praw-6.5.1.ebuild
deleted file mode 100644
index c6cbbbee4..000000000
--- a/dev-python/praw/praw-6.5.1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python Reddit API Wrapper allows simple access to reddit's API."
-HOMEPAGE="https://praw.readthedocs.org/ https://pypi.org/project/praw/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/praw/praw-7.1.0.ebuild b/dev-python/praw/praw-7.1.0.ebuild
deleted file mode 100644
index c6cbbbee4..000000000
--- a/dev-python/praw/praw-7.1.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python Reddit API Wrapper allows simple access to reddit's API."
-HOMEPAGE="https://praw.readthedocs.org/ https://pypi.org/project/praw/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/praw/praw-7.1.3.ebuild b/dev-python/praw/praw-7.1.3.ebuild
deleted file mode 100644
index 9d92c3cb7..000000000
--- a/dev-python/praw/praw-7.1.3.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit distutils-r1
-
-DESCRIPTION="PRAW, an acronym for Python Reddit API Wrapper, is a python package that allows for simple access to reddit's API."
-HOMEPAGE="https://praw.readthedocs.org/ https://pypi.org/project/praw/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-DOCS="README.rst"
-
-RDEPEND=">=dev-python/websocket-client-0.54.0[${PYTHON_USEDEP}]"
-BDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/praw/praw-7.1.4.ebuild b/dev-python/praw/praw-7.1.4.ebuild
index 9d92c3cb7..77dddb9ba 100644
--- a/dev-python/praw/praw-7.1.4.ebuild
+++ b/dev-python/praw/praw-7.1.4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/proliphix/Manifest b/dev-python/proliphix/Manifest
index a76807a1b..5205de3ba 100644
--- a/dev-python/proliphix/Manifest
+++ b/dev-python/proliphix/Manifest
@@ -1,5 +1,5 @@
 DIST proliphix-0.4.1.tar.gz 16971 BLAKE2B d6280fe2bfe11ce6fa01710d91e3dcd5b376cb0462292015c5766d4c6aaaf29ef8a2ad2918ec0af0b03f23889fd11488db544fe220efbfc3709ad716894ca137 SHA512 59f8a2c588d9a740aa73c1c4f6da3d02fff2e918c6aef2b4c4c2e4061b396e326cea849723ed90170286bdf7d73e6ec3f8c683e903ece2e662319a197058d25a
 DIST proliphix-0.5.0.tar.gz 17274 BLAKE2B 316cc05cb5d63ae02a6e10db9bfd29e328d07ab8aa81b57d8ea4136369c92229cefe9faf0b1e0f8eca9cac63d95cffb88485d4eb03c181ec60b42d06f78eaae7 SHA512 a552cebd6b1f94484d3e480780c1c7d5d3fbcfae36d7f00a6f954c47f54f116e7e116bd9a0ac30faa9f9443e35a7362592d3974652f08396a8aac3308d5a0f41
-EBUILD proliphix-0.4.1.ebuild 759 BLAKE2B e1092d11d77bcd73019c79d512f28353982ef7eabbe2417220ebf4be7f7daae5e8208c4ae54cbdc478d99dde2bc73e43a0a2f1db114e5971ffe7d65d85c48526 SHA512 4896afbbee86931542002f744b14606d2311449f8d79761894a3a7e77349c5c33668be681f1ab80da7a5e73cb1c49f3ea7201c58e4bf19b3099b00a228a25a04
-EBUILD proliphix-0.5.0.ebuild 768 BLAKE2B a515dc53eff35530f6f6a5ae2528801a7a0eb4aea13c4b4f3be880b35d98d045a9454608c8d604729f9be4e611fd64ce703babc91275412f09a9aa109f3005ae SHA512 7cb761d40a82158dc1bd3361643a4ee1c8156b1d3a70bbc466b19b0f8238e6ee2c89ac4eef51a8b9c50287eda600d3ef3c306430e53dfff1453081a9c8364e4e
+EBUILD proliphix-0.4.1.ebuild 760 BLAKE2B d74d658414e3d8d3ad9bfc204877dae7a1ba52e3626e75dbad0ddd6c0c59c6a58e21a4c33e74dc140392aa052d615512c0c2ee90a6a3a8a904eac54152e65274 SHA512 f5f815cb9e304bafedd25c4ef2fe4b6cd88e8bc1c20e30fa7d490094bbdd8c2633c59648f08ce7653112a0cbccc3d37a0c32657633ffb68a455adcc32efb1b9f
+EBUILD proliphix-0.5.0.ebuild 767 BLAKE2B 1f4aee469e71ea3e91eccf99d6fd66746d3942819f083ab2b37d0e721c06dedf11dc8dea5df76414d2ffc962413ed479ede54185378c6e69b3fa95d9629bf98a SHA512 61dae8a85b9c9c50a4c144f85a9db71dc45a3f664cbe4be11267d5f3bfa6aa7f3c7dfb6976180407951d6e6ae0d23927449d2591092a65db833b89e37b96e384
 MISC metadata.xml 446 BLAKE2B e044fe52e30a10df246694fc00000d35807a36ffb956f9cf67f76d14784ea94462d93d733bb983c8498df287efc53cce2db971d83a38f3309a0c20f701b4c353 SHA512 f9a37ae8f7527f5c7d6aef17487eb5193d28c1da52adc5fe62ad128cc297b9017aac033ceaccebc4bfd58b2643087e73dea203439259d495a3d5515f55ed93d3
diff --git a/dev-python/proliphix/proliphix-0.4.1.ebuild b/dev-python/proliphix/proliphix-0.4.1.ebuild
index ae0eac11a..fd90b063f 100644
--- a/dev-python/proliphix/proliphix-0.4.1.ebuild
+++ b/dev-python/proliphix/proliphix-0.4.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/proliphix/proliphix-0.5.0.ebuild b/dev-python/proliphix/proliphix-0.5.0.ebuild
index d35239b4f..d89e1c80f 100644
--- a/dev-python/proliphix/proliphix-0.5.0.ebuild
+++ b/dev-python/proliphix/proliphix-0.5.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/protobuf-python/Manifest b/dev-python/protobuf-python/Manifest
index f24ff7364..b64ea435d 100644
--- a/dev-python/protobuf-python/Manifest
+++ b/dev-python/protobuf-python/Manifest
@@ -1,10 +1,7 @@
-DIST protobuf-3.10.0.tar.gz 4908907 BLAKE2B 53a702a2cbfe7e642989eec010541fda434b7b8bbd267e3b65fc569a0ab33b08438c1a81d478426ebfbec6e330b90428e3da4fd345b8b64f890a6b3f4e360883 SHA512 0dcba6d21486fdc162f57119754b47b4a2fb605af878d5b96a32df55895321535cffb5b804566fd90ee7c36e20106d0cd4f5d9f3c652dc9c4dfca96be41a1977
-DIST protobuf-3.12.2.tar.gz 5309688 BLAKE2B 6f04ab75a165d8135b4c1de210f8698f56f309f73d664192209de10580e0ef850bf56f6f394b860f21912e341141f7bbb1f63198eaee55fd7ad74d86b00c3b1f SHA512 84a349a1dcb5bce6a6a892cf11264390b557ed1e7b05883b71fa9cfb7460d9f73119da1f2861066869e33c752246ea438d5ce2c2b3ff7a4b07696d9450b7916b
 DIST protobuf-3.12.4.tar.gz 5310348 BLAKE2B 2630941672963165467221843c10079a0ed966f2fdfcbc970b0b41e1ed3c7f78734496c1fbd3ec509c68999a14f637fff267b309cf82a8acf2bb5a948484f79b SHA512 c5d24502b9a6be0a606a19213186fe462e0de6830547003636f0897781f36d0bd7e4e7d9689d96390a0399ce04b6438cda3a0fe6f97f0feb700a110e90beef0c
-DIST protobuf-3.7.0.tar.gz 4784675 BLAKE2B cb65f3384c7b0f015ab48081764ee9e01ad4bcffdb4903025774d95626f804fb9f72532371cc090de2b2e86c4bb0eb8f618d1cf8ff4d9c54d281c45a43b1cd8b SHA512 c570ece1d42706982dd87f601af6b3dd1d788d1b150b543190d10d2f070c67f0d006726ec4eafd3b9234a679e7ef77ac9d97749414f53f619287a1f23a0b739c
-EBUILD protobuf-python-3.10.0-r1.ebuild 1243 BLAKE2B 613bc877da981dfe93263be900a5faafcf1b022e655db50d44b6f1b168bd21fccc4184d5f1077cf6ef50c6873cae7772df73bdc097877f40afb668057b6b9b27 SHA512 80cdb6b0af2fc843647a3ff3b201611a47fdc21c48e677b272a80a00e91ea1f42144927c3a57c968f70a558c2bf700dc9eed2217135976e121621bf9421804cb
-EBUILD protobuf-python-3.10.0.ebuild 1252 BLAKE2B eb9acc3a05be557956a4e50f2c7e5ae6abbdb33b356fdf0bf6852e3d913b33c3167ade8924c4e18980283d796a2446f0fe4f732937e825f983fc86a6549902f7 SHA512 6b33acb85a992a654bf875e96a623860c0e99042e2db75ab0d426a16d866602bfe19309567d77cfabec61c969d322a7f3044224d74d2f2fab2692a8079c3cbd3
-EBUILD protobuf-python-3.12.2.ebuild 1559 BLAKE2B cbf8fe7187083fcd94ae6cd1b91dfeecc2462e1a863bf7b227569fb6433de9ac2288017de69747b703f6b7ba339910a59105409f5bb1623d6a34bdbec4e15a70 SHA512 af881934dca2db4fbcd4834621f7e218ab94d33e500f5e3874b014114b43d8fe46c3b40ce5bdce20f1844e8d30853788b56814d32c2dc7e1c539fa7330b917c1
-EBUILD protobuf-python-3.12.4.ebuild 1559 BLAKE2B cbf8fe7187083fcd94ae6cd1b91dfeecc2462e1a863bf7b227569fb6433de9ac2288017de69747b703f6b7ba339910a59105409f5bb1623d6a34bdbec4e15a70 SHA512 af881934dca2db4fbcd4834621f7e218ab94d33e500f5e3874b014114b43d8fe46c3b40ce5bdce20f1844e8d30853788b56814d32c2dc7e1c539fa7330b917c1
-EBUILD protobuf-python-3.7.0.ebuild 1252 BLAKE2B eb9acc3a05be557956a4e50f2c7e5ae6abbdb33b356fdf0bf6852e3d913b33c3167ade8924c4e18980283d796a2446f0fe4f732937e825f983fc86a6549902f7 SHA512 6b33acb85a992a654bf875e96a623860c0e99042e2db75ab0d426a16d866602bfe19309567d77cfabec61c969d322a7f3044224d74d2f2fab2692a8079c3cbd3
+DIST protobuf-3.13.0.tar.gz 5277913 BLAKE2B 168aaa5beef83be675cd2543ca8efeaf5174f5e7fd861a056b04b01c8c781dc7b1fcbd05068ae89f051dfacfdc47c34b19cc33c8d09dd3212d3827746e3408f2 SHA512 514efa65fc8a36bc0791e6d39bdfb07b2689e9c2a4b82536c657859b800e7bc1e1a0ae86a7ee33f30c43a473a49b5c346ce830ac0057b6da104ed37f90b8b0fd
+DIST protobuf-3.14.0.tar.gz 5319779 BLAKE2B cea083eea4d7fec441536effdfe2bf1811913154b0cc0da2f14f4edeb0efb200236da102c36700e24fab73fd9883aa90576ad64603a7f175ebf5cef0dc29aae5 SHA512 9dabba81119cb6196ef5de382a1032c57f6e69038f4dce0156f8671b98e51bb5095915fb6d05bb5a8ad8b17b559e652e1e9a392dd30c7ed8dcf1d986c137be11
+EBUILD protobuf-python-3.12.4.ebuild 1555 BLAKE2B 3815c238ed382f0bbefa7fd6f6e2c654eaa9edc72659d56ddf719887aadd84ee52b09c0547efe662316954e2bcd6b11da2ba2f5f590f0d3787e185640770d284 SHA512 252ab35375e4f4bb5dc591c85bb42f1a347c0d6e7b30647c5ca58b1bda0c6a68ca1a6972d6a9d2be2b6432c304e5787affe74f8bd2da3566faff3d3f23a9163a
+EBUILD protobuf-python-3.13.0-r1.ebuild 1818 BLAKE2B 678ea8db328562401dda2798ba1a1c6666d17f587a2aa71ce4fe452a701ea790a0131c64958ee56cdfb9d43cea8681df61316afeb34daf04a5ae22c9d7f6bad1 SHA512 6f5ff1462d9f8c5013fc6a4856f9ce9ae13a9d4353f7e9438dbdfc0bde538e76262cc668016b8cff9590c8b2d4c2b9a9db527e4ed9334f355f17418ab7c95cc6
+EBUILD protobuf-python-3.14.0.ebuild 1615 BLAKE2B 949c47fe07c2071a4525210b54b3309ebcbf47b53625287adfb593491d13a51829d89ed4ce68e5648fc532397ed178b003f24620c240229ba3f941a01383368c SHA512 f4bce30a5a0b6e4ac25c5387d6fa4b717397a66565a95e31260d6833a2645cb1c63ea44bb80fa669b17594aa94db024d9482f9b82752f2d8defe6a03eae28bf8
 MISC metadata.xml 656 BLAKE2B e63db63e247b105b51b506a404d8edc821cc0ccc276a3f813df3b06951184218e736e57b577ad2f64880250c55ef09c50a9fe04428f7cec02fb04293c337175a SHA512 5d747585e025672d423690fa2d8df09380a1714c2e0adad5838a41f099e3984b70c7f80c5873ea296101898cd92dea70edee964bf01b9d86acb9a1d0140169fd
diff --git a/dev-python/protobuf-python/protobuf-python-3.10.0-r1.ebuild b/dev-python/protobuf-python/protobuf-python-3.10.0-r1.ebuild
deleted file mode 100644
index 84e601af7..000000000
--- a/dev-python/protobuf-python/protobuf-python-3.10.0-r1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit distutils-r1
-
-DESCRIPTION="Google's Protocol Buffers - Python bindings"
-HOMEPAGE="https://developers.google.com/protocol-buffers/ https://github.com/protocolbuffers/protobuf"
-SRC_URI="https://github.com/protocolbuffers/protobuf/archive/v${PV}.tar.gz -> protobuf-${PV}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/17"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
-IUSE=""
-
-DEPEND="${PYTHON_DEPS}
-	~dev-libs/protobuf-${PV}
-	dev-python/namespace-google[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}
-	!<dev-libs/protobuf-3[python(-)]"
-
-S="${WORKDIR}/protobuf-${PV}/python"
-
-python_prepare_all() {
-	distutils-r1_python_prepare_all
-}
-
-python_configure_all() {
-	mydistutilsargs=(--cpp_implementation)
-}
-
-python_compile() {
-	python_is_python3 || local -x CXXFLAGS="${CXXFLAGS} -fno-strict-aliasing"
-	distutils-r1_python_compile
-}
-
-python_test() {
-	esetup.py test
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	find "${D}" -name "*.pth" -delete || die
-}
diff --git a/dev-python/protobuf-python/protobuf-python-3.10.0.ebuild b/dev-python/protobuf-python/protobuf-python-3.10.0.ebuild
deleted file mode 100644
index c1c211028..000000000
--- a/dev-python/protobuf-python/protobuf-python-3.10.0.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# 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,3_7})
-
-inherit distutils-r1
-
-DESCRIPTION="Google's Protocol Buffers - Python bindings"
-HOMEPAGE="https://developers.google.com/protocol-buffers/ https://github.com/protocolbuffers/protobuf"
-SRC_URI="https://github.com/protocolbuffers/protobuf/archive/v${PV}.tar.gz -> protobuf-${PV}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/17"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
-IUSE=""
-
-DEPEND="${PYTHON_DEPS}
-	~dev-libs/protobuf-${PV}
-	dev-python/namespace-google[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}
-	!<dev-libs/protobuf-3[python(-)]"
-
-S="${WORKDIR}/protobuf-${PV}/python"
-
-python_prepare_all() {
-	distutils-r1_python_prepare_all
-}
-
-python_configure_all() {
-	mydistutilsargs=(--cpp_implementation)
-}
-
-python_compile() {
-	python_is_python3 || local -x CXXFLAGS="${CXXFLAGS} -fno-strict-aliasing"
-	distutils-r1_python_compile
-}
-
-python_test() {
-	esetup.py test
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	find "${D}" -name "*.pth" -delete || die
-}
diff --git a/dev-python/protobuf-python/protobuf-python-3.12.4.ebuild b/dev-python/protobuf-python/protobuf-python-3.12.4.ebuild
index 833089004..7ef70de5f 100644
--- a/dev-python/protobuf-python/protobuf-python-3.12.4.ebuild
+++ b/dev-python/protobuf-python/protobuf-python-3.12.4.ebuild
@@ -1,8 +1,8 @@
-# Copyright 2008-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
-PYTHON_COMPAT=(python{2_7,3_{6..9}})
+PYTHON_COMPAT=( python3_{8..9} )
 DISTUTILS_USE_SETUPTOOLS="manual"
 
 inherit distutils-r1
diff --git a/dev-python/protobuf-python/protobuf-python-3.13.0-r1.ebuild b/dev-python/protobuf-python/protobuf-python-3.13.0-r1.ebuild
new file mode 100644
index 000000000..89893e562
--- /dev/null
+++ b/dev-python/protobuf-python/protobuf-python-3.13.0-r1.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+PYTHON_COMPAT=( python3_{8..9} )
+DISTUTILS_USE_SETUPTOOLS="rdepend"
+
+inherit distutils-r1
+
+if [[ "${PV}" == "9999" ]]; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/protocolbuffers/protobuf"
+	EGIT_SUBMODULES=()
+fi
+
+DESCRIPTION="Google's Protocol Buffers - Python bindings"
+HOMEPAGE="https://developers.google.com/protocol-buffers/ https://github.com/protocolbuffers/protobuf"
+if [[ "${PV}" == "9999" ]]; then
+	SRC_URI=""
+else
+	SRC_URI="https://github.com/protocolbuffers/protobuf/archive/v${PV}.tar.gz -> protobuf-${PV}.tar.gz"
+fi
+
+LICENSE="BSD"
+SLOT="0/24"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+IUSE=""
+
+BDEPEND="${PYTHON_DEPS}
+	~dev-libs/protobuf-${PV}
+	dev-python/namespace-google[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]"
+DEPEND="${PYTHON_DEPS}
+	~dev-libs/protobuf-${PV}"
+RDEPEND="${BDEPEND}
+	!<dev-libs/protobuf-3[python(-)]"
+
+S="${WORKDIR}/protobuf-${PV}/python"
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_CHECKOUT_DIR="${WORKDIR}/protobuf-${PV}"
+fi
+
+python_prepare_all() {
+	pushd "${WORKDIR}/protobuf-${PV}" > /dev/null || die
+	eapply "${FILESDIR}/${PN}-3.13.0-google.protobuf.pyext._message.PyUnknownFieldRef.patch"
+	eapply_user
+	popd > /dev/null || die
+
+	distutils-r1_python_prepare_all
+
+	sed -e "/^[[:space:]]*setup_requires = \['wheel'\],$/d" -i setup.py || die
+}
+
+python_configure_all() {
+	mydistutilsargs=(--cpp_implementation)
+}
+
+python_compile() {
+	python_is_python3 || local -x CXXFLAGS="${CXXFLAGS} -fno-strict-aliasing"
+	distutils-r1_python_compile
+}
+
+python_test() {
+	esetup.py test
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	find "${D}" -name "*.pth" -type f -delete || die
+}
diff --git a/dev-python/protobuf-python/protobuf-python-3.12.2.ebuild b/dev-python/protobuf-python/protobuf-python-3.14.0.ebuild
similarity index 71%
rename from dev-python/protobuf-python/protobuf-python-3.12.2.ebuild
rename to dev-python/protobuf-python/protobuf-python-3.14.0.ebuild
index 833089004..cd3744756 100644
--- a/dev-python/protobuf-python/protobuf-python-3.12.2.ebuild
+++ b/dev-python/protobuf-python/protobuf-python-3.14.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 2008-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
-PYTHON_COMPAT=(python{2_7,3_{6..9}})
-DISTUTILS_USE_SETUPTOOLS="manual"
+PYTHON_COMPAT=( python3_{8..9} )
+DISTUTILS_USE_SETUPTOOLS="bdepend"
 
 inherit distutils-r1
 
@@ -23,14 +23,13 @@ else
 fi
 
 LICENSE="BSD"
-SLOT="0/23"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+SLOT="0/25"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE=""
 
 BDEPEND="${PYTHON_DEPS}
 	~dev-libs/protobuf-${PV}
 	dev-python/namespace-google[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
 	dev-python/six[${PYTHON_USEDEP}]"
 DEPEND="${PYTHON_DEPS}
 	~dev-libs/protobuf-${PV}"
@@ -43,13 +42,17 @@ if [[ "${PV}" == "9999" ]]; then
 	EGIT_CHECKOUT_DIR="${WORKDIR}/protobuf-${PV}"
 fi
 
-python_configure_all() {
-	mydistutilsargs=(--cpp_implementation)
+python_prepare_all() {
+	pushd "${WORKDIR}/protobuf-${PV}" > /dev/null || die
+	eapply "${FILESDIR}/${PN}-3.13.0-google.protobuf.pyext._message.PyUnknownFieldRef.patch"
+	eapply_user
+	popd > /dev/null || die
+
+	distutils-r1_python_prepare_all
 }
 
-python_compile() {
-	python_is_python3 || local -x CXXFLAGS="${CXXFLAGS} -fno-strict-aliasing"
-	distutils-r1_python_compile
+python_configure_all() {
+	mydistutilsargs=(--cpp_implementation)
 }
 
 python_test() {
diff --git a/dev-python/protobuf-python/protobuf-python-3.7.0.ebuild b/dev-python/protobuf-python/protobuf-python-3.7.0.ebuild
deleted file mode 100644
index c1c211028..000000000
--- a/dev-python/protobuf-python/protobuf-python-3.7.0.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# 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,3_7})
-
-inherit distutils-r1
-
-DESCRIPTION="Google's Protocol Buffers - Python bindings"
-HOMEPAGE="https://developers.google.com/protocol-buffers/ https://github.com/protocolbuffers/protobuf"
-SRC_URI="https://github.com/protocolbuffers/protobuf/archive/v${PV}.tar.gz -> protobuf-${PV}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/17"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
-IUSE=""
-
-DEPEND="${PYTHON_DEPS}
-	~dev-libs/protobuf-${PV}
-	dev-python/namespace-google[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}
-	!<dev-libs/protobuf-3[python(-)]"
-
-S="${WORKDIR}/protobuf-${PV}/python"
-
-python_prepare_all() {
-	distutils-r1_python_prepare_all
-}
-
-python_configure_all() {
-	mydistutilsargs=(--cpp_implementation)
-}
-
-python_compile() {
-	python_is_python3 || local -x CXXFLAGS="${CXXFLAGS} -fno-strict-aliasing"
-	distutils-r1_python_compile
-}
-
-python_test() {
-	esetup.py test
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	find "${D}" -name "*.pth" -delete || die
-}
diff --git a/dev-python/proxmoxer/Manifest b/dev-python/proxmoxer/Manifest
index 05ae05936..225ccf0f7 100644
--- a/dev-python/proxmoxer/Manifest
+++ b/dev-python/proxmoxer/Manifest
@@ -1,9 +1,3 @@
-DIST proxmoxer-1.0.3.tar.gz 15725 BLAKE2B c7c8d3ff41642f541fc2aa2c2b067562204057817d570fa57268d8916ea8e6160f846170640d0ccacc8b783d5bb85f04678e18f178696ea2c01852b4c6f53d32 SHA512 370625a36c790d4e1f15907b5f50215e509c115cedc06c99f1359885ae0f454513b1531d8ac8d849e91e77e691c9a6f5854eff7424e71eacfb3dbf1b9767a595
-DIST proxmoxer-1.0.4.tar.gz 16754 BLAKE2B 065e129c12d82ab22564fcddac6d4a6230ef95ff500a041d7c4ec5cace8c5e3aafea219c2005d3738322e46e9a5ca7cc02d50c424b65e325d28ff3a4e14fc36a SHA512 03a01203b38c986391ba993910d857da87d0157c2ddf020034b4ce583d28fb49fb05a220a450b9f0766b17e8eeecd1527426cef9d9beae270200e55fdeb394ae
-DIST proxmoxer-1.1.0.tar.gz 18432 BLAKE2B 8aaaa64ac6be994c2c4f421b11cd82c5666e2316ffc17f3148d1fb58050327a988d7d76a60c554fe336c70f7d0396bb6c30de9eba84f047c5eec1fa19f807ed7 SHA512 e61514b6f31b77c9120b03baa47b6687715362c0c6753007118d0f7a732721103340852d7eda6221a07ddd966affa4abe91f65b8d5e93b06ac8ea2d9e82c1e7b
 DIST proxmoxer-1.1.1.tar.gz 18588 BLAKE2B 1f9a9dc656e958fe2d6fe1f38d618bec70df16892a344beb313d484825ac42737e78efc98a5f3bb5864bae5791c7b36fb82a80d7e5993676cac1d9f2f7c45c8b SHA512 cad9cb21103105d1e35927cdeb72d222a4fcbd30fce25b61b0e8e7b182b1e62bb29c318b5e7a5ba2abfa2635c39320d7f7ecbac2d4b49ef6086c644b86f9fc21
-EBUILD proxmoxer-1.0.3.ebuild 865 BLAKE2B dc9d939abad462265923e96fad15437c976331da61fd44637bb41bd75f58d5ec9ce46b6c0f2c961a9b628d282242c7e90826c370922fa411f0944d7ae6983b74 SHA512 60e92e7afa010f3a871ad3c6e37b7757309e72127832955ccfc5a1366b54c95a3d045161e9b347f6a99b82098f3cf8c63112b420172e19130a301fef1a9ac575
-EBUILD proxmoxer-1.0.4.ebuild 874 BLAKE2B da4ab8776eb06de0a75c59076f656d23dac61ce45a48cd5e2b31de93c9cddcbefdfa2c75dad5f5a52aca18032cc15ec37a3e3cd47b95a351f2e55ad71f3f6ee6 SHA512 67856b40cc349c4b0da36b0f8c772e0cbe188b56eebfae2bb9508a100011a59fb2b1876f6a1420e30f2d39446213b180769cdffc21fbf66105280d5d9f8dbe3f
-EBUILD proxmoxer-1.1.0.ebuild 874 BLAKE2B da4ab8776eb06de0a75c59076f656d23dac61ce45a48cd5e2b31de93c9cddcbefdfa2c75dad5f5a52aca18032cc15ec37a3e3cd47b95a351f2e55ad71f3f6ee6 SHA512 67856b40cc349c4b0da36b0f8c772e0cbe188b56eebfae2bb9508a100011a59fb2b1876f6a1420e30f2d39446213b180769cdffc21fbf66105280d5d9f8dbe3f
-EBUILD proxmoxer-1.1.1.ebuild 874 BLAKE2B da4ab8776eb06de0a75c59076f656d23dac61ce45a48cd5e2b31de93c9cddcbefdfa2c75dad5f5a52aca18032cc15ec37a3e3cd47b95a351f2e55ad71f3f6ee6 SHA512 67856b40cc349c4b0da36b0f8c772e0cbe188b56eebfae2bb9508a100011a59fb2b1876f6a1420e30f2d39446213b180769cdffc21fbf66105280d5d9f8dbe3f
+EBUILD proxmoxer-1.1.1.ebuild 873 BLAKE2B 75df924b7e13d64d7c9f6610b58c0ef6cf51cee59b25142651af4bc7c74c15441324ab5245da5f95c86b6268f8c8fafacf0831cf403a4b2db98777b5fa287cde SHA512 2e8c7bdfcb8b9f74c50952d55c51df0636b3ccf729b110dcb16efb999bec0b7244b56f407f5c7f835747c1552f36a8761a3c37f9ccb79f53e90efd1e42009cc2
 MISC metadata.xml 454 BLAKE2B 8f9cd23b208074f1425a445e4f89e9681f27a285fd428c99c4a8d26e066f239cd5b3ba828282d8eb13432664d0bb6fa9f3f2efc7faf4e5d3a67c3c8cf1885201 SHA512 17a4b4a74f8745a5a0e080157122ce5543a5bd0adac49065ad311aafb0addbc4519f70cf222dd18f23222ed222f8ffd6d923555bd7f3d0e335ac344e28ffe3e8
diff --git a/dev-python/proxmoxer/proxmoxer-1.0.3.ebuild b/dev-python/proxmoxer/proxmoxer-1.0.3.ebuild
deleted file mode 100644
index c5582ff45..000000000
--- a/dev-python/proxmoxer/proxmoxer-1.0.3.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python Wrapper for the Proxmox 2.x API (HTTP and SSH)"
-HOMEPAGE="https://github.com/swayf/proxmoxer https://pypi.org/project/proxmoxer/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-src_prepare() {
-	sed "s/packages=\['proxmoxer', 'proxmoxer.backends', 'tests', 'tests.base'\]/packages=['proxmoxer', 'proxmoxer.backends']/g" -i setup.py || die
-	eapply_user
-}
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/proxmoxer/proxmoxer-1.0.4.ebuild b/dev-python/proxmoxer/proxmoxer-1.0.4.ebuild
deleted file mode 100644
index 01fd3dd19..000000000
--- a/dev-python/proxmoxer/proxmoxer-1.0.4.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python Wrapper for the Proxmox 2.x API (HTTP and SSH)"
-HOMEPAGE="https://github.com/swayf/proxmoxer https://pypi.org/project/proxmoxer/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-src_prepare() {
-	sed "s/packages=\['proxmoxer', 'proxmoxer.backends', 'tests', 'tests.base'\]/packages=['proxmoxer', 'proxmoxer.backends']/g" -i setup.py || die
-	eapply_user
-}
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/proxmoxer/proxmoxer-1.1.0.ebuild b/dev-python/proxmoxer/proxmoxer-1.1.0.ebuild
deleted file mode 100644
index 01fd3dd19..000000000
--- a/dev-python/proxmoxer/proxmoxer-1.1.0.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python Wrapper for the Proxmox 2.x API (HTTP and SSH)"
-HOMEPAGE="https://github.com/swayf/proxmoxer https://pypi.org/project/proxmoxer/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-src_prepare() {
-	sed "s/packages=\['proxmoxer', 'proxmoxer.backends', 'tests', 'tests.base'\]/packages=['proxmoxer', 'proxmoxer.backends']/g" -i setup.py || die
-	eapply_user
-}
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/proxmoxer/proxmoxer-1.1.1.ebuild b/dev-python/proxmoxer/proxmoxer-1.1.1.ebuild
index 01fd3dd19..91134d428 100644
--- a/dev-python/proxmoxer/proxmoxer-1.1.1.ebuild
+++ b/dev-python/proxmoxer/proxmoxer-1.1.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/pubnubsub-handler/Manifest b/dev-python/pubnubsub-handler/Manifest
index acd82c2fb..adaaaa78d 100644
--- a/dev-python/pubnubsub-handler/Manifest
+++ b/dev-python/pubnubsub-handler/Manifest
@@ -1,11 +1,3 @@
-DIST pubnubsub-handler-1.0.5.tar.gz 3448 BLAKE2B 7e734005d73388e82115d5cae4b92ccbfd463c9971a8767ccd3744a1b57cd1ed22cb4d73426d2402940760fdf5d7198f040791b3e75162c4d696d8c32c7b7602 SHA512 8c7661ee8df2f01f7f2c1618d707b92efed4fd080bc96e370114d6ec3cf2b6cfb5c403ee48c104c86aec2c960db1216b9342baba852c49883eb13d5a803f6244
-DIST pubnubsub-handler-1.0.6.tar.gz 3445 BLAKE2B bdee07fc245901e31ce326cf49c07f86347f5fad1e27e239649d643a508c6822f4a9ef44cb01580620ab4dd0d53581bf27c1a1ab779086f973b7f29c6b54e78b SHA512 038507d97d4e4760cca54e0e9b5485e5df272aa949d5ecd85e753d659a4cfa7fc42fc873cb1794fe10edc17e7fb4b3754fe8a8bb1917f23a9861644fd3a01e0c
-DIST pubnubsub-handler-1.0.7.tar.gz 3457 BLAKE2B e4ae1f395c4194daa1de2374376dbf9df31e15c060ac3cb7e4ec4e4cfa462af27d381bb6d8d054d28b1346dd2f42689f4f842ffb0b69eee09b89f3ecb43259ca SHA512 cb47a9a0fa85e75ba0775ced2d33a5d46e201f5cc18773bd4de2689342ee37c64c12604b50640032ceaba5b7498e8d66fd42871239887c4f93748d680c61e4d3
-DIST pubnubsub-handler-1.0.8.tar.gz 3458 BLAKE2B ade5e019789af021de40fbdbfc36b354b6d64246766b625ba9cdab70851fb8761dc67adc7f11822ab5ebbb9954801820adad2632b37015f6a86772e4768e8c73 SHA512 ab3327bd98e034a2dfda70c5bed3e59020134673e6341998d1ea5436191480ff04c064bc6d12e71d1422b1c69f7a4775ba0c304c820d033c9845be3f3db91a1b
 DIST pubnubsub-handler-1.0.9.tar.gz 3408 BLAKE2B 63fa937fb0cd492c2df8a49946abb570887c0bc018227db6674a11c34168f0a9dc1c128a668444366251bd19dc42b228e39aa102b04c52c1e938ca9161db5626 SHA512 7d04709091bdb247a38b2d375cfdffb73ceca6ae82449254baef70a1fa8dcf13f7ebeee2e72a175adaac9587f85d45d8b7e239b0c12c8c798ec36e94f3840265
-EBUILD pubnubsub-handler-1.0.5.ebuild 732 BLAKE2B 595106421270150be1065c04dfa77bb543a9f3a47d0b4bfdfa038ad8eeeb83f7ab1ebfbf07b4a51adaba9119ba81ad2493e5c597c203ff5b4000af275f3c5642 SHA512 7c698c97a3f5ebddeadbfeee0660a46be5f051b18e59ab8020bdfd81d606a0b025f7b918cfe844c42f07db76c769b23098de5ad0277da39addfae1c7d861c65f
-EBUILD pubnubsub-handler-1.0.6.ebuild 732 BLAKE2B 595106421270150be1065c04dfa77bb543a9f3a47d0b4bfdfa038ad8eeeb83f7ab1ebfbf07b4a51adaba9119ba81ad2493e5c597c203ff5b4000af275f3c5642 SHA512 7c698c97a3f5ebddeadbfeee0660a46be5f051b18e59ab8020bdfd81d606a0b025f7b918cfe844c42f07db76c769b23098de5ad0277da39addfae1c7d861c65f
-EBUILD pubnubsub-handler-1.0.7.ebuild 732 BLAKE2B 595106421270150be1065c04dfa77bb543a9f3a47d0b4bfdfa038ad8eeeb83f7ab1ebfbf07b4a51adaba9119ba81ad2493e5c597c203ff5b4000af275f3c5642 SHA512 7c698c97a3f5ebddeadbfeee0660a46be5f051b18e59ab8020bdfd81d606a0b025f7b918cfe844c42f07db76c769b23098de5ad0277da39addfae1c7d861c65f
-EBUILD pubnubsub-handler-1.0.8.ebuild 739 BLAKE2B 0195fb0fe92743e301ae4508478fbaeb7069733f4eabc0c27c6d75ca1932405a07312d1e84f331603b0e057736f23bcc18b9a31009e42c9e53c5bcaefcccdc6d SHA512 e6bad698af15110cc25f340538425371746c613e45929b8f5c4ed6cd6385685a536ae1c7560695aa42393d2d7e82be112f4233436ab7ee8b4c6150b4155ec0ce
-EBUILD pubnubsub-handler-1.0.9.ebuild 866 BLAKE2B 953dd8f80de8ba08ed8de395a17b3521de7e830e8a1028ecadbfe53b0e737431627f50296565c2768e5aa16a907493a63daad7a7fa86dc70e7c24bb1ec7ecdd9 SHA512 1eebf9fd045a2dedcd40f70736accff7dd0822ddb3598db4729525a2c44115f972cad9cb1a9546c9af7fe8823f051cf779681112f4d857adadcc46b5db543d50
+EBUILD pubnubsub-handler-1.0.9.ebuild 866 BLAKE2B 5b7b78609681c6a7c5021d07183a195b1d768b8351d9839e7bb62385722cbbf61ea4d89d38d55319e70d1d8b96bef872e7384ad9ba2f32a9388e7898c3c8c3ef SHA512 7696ecacb95850504b27e7fb2fd2beec88347b777a96dfb2f29e2fe9cd62b2ae43fd423c8c94cc763888d80b58531525e5f302fbd43b2e2b2c03cf3ccdff434e
 MISC metadata.xml 336 BLAKE2B d7c7982a51e04231ba52c831bf3444e059df8e9bd6ebaf19ab5c76ad9d4fa5e9218c8dcdf2c365cac260e640fa6ae5fc1686d8d1711a4a2ad7247e39b2625919 SHA512 0122a1d29f5b24fe5f5c8dae86f29fdf013e4bd8099d1ce177fc85dabd21bc41124e6ec43a509827ab0acfbc543bb638b458804f9b9bbd93e1188f777de716d2
diff --git a/dev-python/pubnubsub-handler/pubnubsub-handler-1.0.5.ebuild b/dev-python/pubnubsub-handler/pubnubsub-handler-1.0.5.ebuild
deleted file mode 100644
index e8bb3a0f8..000000000
--- a/dev-python/pubnubsub-handler/pubnubsub-handler-1.0.5.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{5,6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Handles the PubNub subscriptions between PubNub and Home-Assistant for Wink"
-HOMEPAGE="https://github.com/w1ll1am23/pubnubsub-handler https://pypi.org/project/pubnubsub-handler/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/pubnubsub-handler/pubnubsub-handler-1.0.6.ebuild b/dev-python/pubnubsub-handler/pubnubsub-handler-1.0.6.ebuild
deleted file mode 100644
index e8bb3a0f8..000000000
--- a/dev-python/pubnubsub-handler/pubnubsub-handler-1.0.6.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{5,6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Handles the PubNub subscriptions between PubNub and Home-Assistant for Wink"
-HOMEPAGE="https://github.com/w1ll1am23/pubnubsub-handler https://pypi.org/project/pubnubsub-handler/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/pubnubsub-handler/pubnubsub-handler-1.0.7.ebuild b/dev-python/pubnubsub-handler/pubnubsub-handler-1.0.7.ebuild
deleted file mode 100644
index e8bb3a0f8..000000000
--- a/dev-python/pubnubsub-handler/pubnubsub-handler-1.0.7.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{5,6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Handles the PubNub subscriptions between PubNub and Home-Assistant for Wink"
-HOMEPAGE="https://github.com/w1ll1am23/pubnubsub-handler https://pypi.org/project/pubnubsub-handler/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/pubnubsub-handler/pubnubsub-handler-1.0.8.ebuild b/dev-python/pubnubsub-handler/pubnubsub-handler-1.0.8.ebuild
deleted file mode 100644
index 1bb1d445d..000000000
--- a/dev-python/pubnubsub-handler/pubnubsub-handler-1.0.8.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit distutils-r1
-
-DESCRIPTION="Handles the PubNub subscriptions between PubNub and Home-Assistant for Wink"
-HOMEPAGE="https://github.com/w1ll1am23/pubnubsub-handler https://pypi.org/project/pubnubsub-handler/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/pubnubsub-handler/pubnubsub-handler-1.0.9.ebuild b/dev-python/pubnubsub-handler/pubnubsub-handler-1.0.9.ebuild
index ab14b34d4..1959bbbff 100644
--- a/dev-python/pubnubsub-handler/pubnubsub-handler-1.0.9.ebuild
+++ b/dev-python/pubnubsub-handler/pubnubsub-handler-1.0.9.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{6..9} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/pure-python-adb-homeassistant/Manifest b/dev-python/pure-python-adb-homeassistant/Manifest
deleted file mode 100644
index 4d6b3ce69..000000000
--- a/dev-python/pure-python-adb-homeassistant/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST pure-python-adb-homeassistant-0.1.6.dev0.tar.gz 17581 BLAKE2B f66fa305a1020216f8c3152b2dc38cf8bd0e226dbd3bb4ccec02544f288b53b5ae37fdec1c1a535e7c9babe469520a4de1dfd313f5935893c2c08312789d27b4 SHA512 310d42683cc83daeef26ccbc1d0e88dfc0fb4384c4487e7db75c890cda861239bd155dc4b469e43a96a0afee8d18a6f4565644b398a033e1e5708c1ddd819858
-DIST pure-python-adb-homeassistant-0.1.7.dev0.tar.gz 18149 BLAKE2B 9688066b95deb4c19f6028a44eee56c79aa10390eeb2e2e40a0838baecaf2dc1f1dae4e94c534c67ba30dbb9feda94ae9d2ce284efc87df51c03da3227a7f09b SHA512 f98964d2de1b565d3b54ec46a2d258eaef3fffd95ee23232392a4ab5f97607e242c176df87182e2b6d0833d8d2dbeec79adb7e9b62d19f6dbd55dffcfcc29e3f
-EBUILD pure-python-adb-homeassistant-0.1.6.ebuild 738 BLAKE2B a6c898989a63fa8f015979b733ca3e271cd8e3f2b523c615aa2331de865dd5f3010d3fa642aaa0ed5a2473f34e1ea20822247aca0bf73f0b28ef4c2857f13dbd SHA512 b907b72f437f5498a37f51bfedcbde2c296ccf3cf80f184ae6b1f821336d0d862fcb214e6580ef03ef502fb872ed84a8e242a6f75cff4740ce4a994053d6af64
-EBUILD pure-python-adb-homeassistant-0.1.7.ebuild 745 BLAKE2B 32b09cd1d1dcaf7ba508c143e3b930e84b03e2bbdde347d6163c6c6da936338e7fd185bebc4e5d6967d9b364e9c74b3e88404dda82d551276bf37e86c1de6575 SHA512 5f57c32fa3dccf43f90c4ce82987db4b1aae9d96f6db4cb43d225aa75fc463055e80f27389a85ff8c84b7ae1529bec518246700ac0db1b1c383925d3df6b8265
-MISC metadata.xml 469 BLAKE2B 5315ffcecb43363ef4779bcd304cc3447fdd1f24d127a8f38c1c6b93ff54e1e13eb3f6625c5e3e07ff918b4a032f40cf0d399cffa1f039470ee385e81d853b70 SHA512 f3c153474448104eec54c18a802e5c62418de24f1ed18ab70b4fac1874b15b757d77118381160e66cda817cf0e2b42940def4e693e5b5a245a0be7c074ff9b89
diff --git a/dev-python/pure-python-adb-homeassistant/metadata.xml b/dev-python/pure-python-adb-homeassistant/metadata.xml
deleted file mode 100644
index 50bb5746b..000000000
--- a/dev-python/pure-python-adb-homeassistant/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>b@edevau.net</email>
-    <name>Andreas Billmeier</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="pypi">pure-python-adb-homeassistant</remote-id>
-    <maintainer status="unknown">
-      <email>swind@cloudmosa.com</email>
-      <name>Swind Ou</name>
-    </maintainer>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/pure-python-adb-homeassistant/pure-python-adb-homeassistant-0.1.6.ebuild b/dev-python/pure-python-adb-homeassistant/pure-python-adb-homeassistant-0.1.6.ebuild
deleted file mode 100644
index 4482722e3..000000000
--- a/dev-python/pure-python-adb-homeassistant/pure-python-adb-homeassistant-0.1.6.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{5,6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Pure python implementation of the adb client"
-HOMEPAGE="https://github.com/Swind/pure-python-adb https://pypi.org/project/pure-python-adb-homeassistant/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.dev0.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-S="${WORKDIR}/${P}.dev0"
-
-RDEPEND=""
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/pure-python-adb-homeassistant/pure-python-adb-homeassistant-0.1.7.ebuild b/dev-python/pure-python-adb-homeassistant/pure-python-adb-homeassistant-0.1.7.ebuild
deleted file mode 100644
index c6f69d6d7..000000000
--- a/dev-python/pure-python-adb-homeassistant/pure-python-adb-homeassistant-0.1.7.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit distutils-r1
-
-DESCRIPTION="Pure python implementation of the adb client"
-HOMEPAGE="https://github.com/Swind/pure-python-adb https://pypi.org/project/pure-python-adb-homeassistant/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.dev0.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-S="${WORKDIR}/${P}.dev0"
-
-RDEPEND=""
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/pure-python-adb/Manifest b/dev-python/pure-python-adb/Manifest
index e381ce0a4..9f12258dc 100644
--- a/dev-python/pure-python-adb/Manifest
+++ b/dev-python/pure-python-adb/Manifest
@@ -1,9 +1,3 @@
-DIST pure-python-adb-0.1.6.tar.gz 2651642 BLAKE2B d75bf0452a88c183c9ada1e1b3cb24e772b2990d913fb944d6ffab3f8920731e066b0b5d154f9e02210ea6ab9c962e56bfbe94894413c2cbe45a68f4d521ff36 SHA512 aac9d30ea4c97ffe110f17b5263b6aa44341d26e9842c89ae92af2490460be6af72e0d1ee18ce896a0c7b80355927d79e759a4f106926a67476f51895b41ce92
-DIST pure-python-adb-0.1.7.tar.gz 18034 BLAKE2B 2c6f969df50213f1d6817e5a4ccba11fb63f5c204df89abc3c2706950dbf0b93989cd939583ecefd4e36b4bf7cdf485ce059da46d0316646c6716ee0d2b14b56 SHA512 b4d93d91518224633e2035d2cead2aab982492688b06f90e2567905b4fe6d6b4e7327e29815d692065a4dfb5a9722698693e66bf36f5825fe9372339b45210ee
-DIST pure-python-adb-0.2.2.tar.gz 23104 BLAKE2B 0b9fd18727773dea2c94de78b7338e7f6d260cb9feaeb77e79365da086bd615309bc4462bee971fbb6564acb876ebb533c7f46f4f20833ad2e3681f833c0ee3a SHA512 298f45c49316b0f3dff5ae0b89e51ad222cfe6bb10c79bf54114a980a80e41eb7a6a204cb03f43b6360b69751ae75de455f6487155f4e06fdf012756fadbc0da
 DIST pure-python-adb-0.3.0.tar.gz 25680 BLAKE2B a7dbd9835abbd5e0bfc00cbb7cd422d78de539a75f7d77da2df54783b0f4fbada04901cad34a6dd6a81017cfa530df6bf14e9a9a928699e28ee963b25dc40f30 SHA512 d25e77a00d5508fb0f83fab773bb1c0f853645d79de3009cb06beecb395ce701eb787175f33909fc84a18b7e84a92c15b844c562f3eb3a390ce40e20274fa2f4
-EBUILD pure-python-adb-0.1.6.ebuild 760 BLAKE2B bd2511462b927e7b3ed8589f002f681af7c9af7b845b78045cbb3dd119720199bcd7caedd00dd1656fd8b8953e9a9982bf05509703c423dbf13481824dfef235 SHA512 b7ef172acdfcfd2e7abf704e3cd17050cea2aa462aac5e89c6acbcf8b2126e73e68bad704be29722571650a00d384f63600ab25ad4b32669981c84ccd54bee67
-EBUILD pure-python-adb-0.1.7.ebuild 834 BLAKE2B 719e37a2f039c1bcc4597f6946561508ac95bbcc8786f31f06fa0cc8de8c7c9d74de17146ed33fbf77cda2043eea6d3449143e8a371ddcda18b24a13bfee00a1 SHA512 282950ecd9a5497110b27c375ec630de62953404e94dddfae356fd79e8cd5a78a10bf138e50ab1a5022a01c0c2ae7c4b9392b00cfba6f610ef5ae6119a2bb1c9
-EBUILD pure-python-adb-0.2.2.ebuild 747 BLAKE2B 3605c81fab44d59853d6befeb34e38992a6e6b957e95f11ff78dffe7a2e454ef0b41dde2f8d7ef01cd2cf7632b7dfb9f10ff98c12b236baca2a567377e1408c8 SHA512 c83196fddbf039d8b02bb659115d63e52e1e7da8bbc11f995f274430de00feebfce0c175d7cb71541dcf9553d69bdbc8303237cb83ab4b748932949a6df021f8
-EBUILD pure-python-adb-0.3.0.ebuild 747 BLAKE2B 3605c81fab44d59853d6befeb34e38992a6e6b957e95f11ff78dffe7a2e454ef0b41dde2f8d7ef01cd2cf7632b7dfb9f10ff98c12b236baca2a567377e1408c8 SHA512 c83196fddbf039d8b02bb659115d63e52e1e7da8bbc11f995f274430de00feebfce0c175d7cb71541dcf9553d69bdbc8303237cb83ab4b748932949a6df021f8
+EBUILD pure-python-adb-0.3.0.ebuild 746 BLAKE2B dfe062bb082fdfbc09255dc0f2c02e43387d7e362d1b0585565d1968742b49c3b2a6408be27ed6e14ab72ecee6f5b7805bdfc6f5db54cf189e2f7fd5267a33db SHA512 9e1a8c2598a93fc1f5afcadd923655b08902d242d62c59dd0aa4a682f588378b8684efaf1dbd57297d40cc44af8b699916fda464bd812c2ef473232aacf7da75
 MISC metadata.xml 455 BLAKE2B fa26a209c98b6dda94b59c862e2ff34723f331ce1825a514fba20bacb841d0148fd8d0b2d34898ff9d19464c5dd42476781778aed58e742f527198783897eaff SHA512 3ce559d06d8f73d52e21c15e7705ada8525713fdde37d8837c6c047e046219d9f91ef1d43e7dcd051e86b9be0f8887886b85ba356d9be155e76f446ba4413acc
diff --git a/dev-python/pure-python-adb/pure-python-adb-0.1.6.ebuild b/dev-python/pure-python-adb/pure-python-adb-0.1.6.ebuild
deleted file mode 100644
index 35c7e206c..000000000
--- a/dev-python/pure-python-adb/pure-python-adb-0.1.6.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{5,6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Pure python implementation of the adb client"
-HOMEPAGE="https://github.com/Swind/pure-python-adb https://pypi.org/project/pure-python-adb/"
-SRC_URI="https://github.com/Swind/pure-python-adb/archive/v${PVR}-dev.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-S="${WORKDIR}/${P}-dev"
-
-RDEPEND=""
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/pure-python-adb/pure-python-adb-0.1.7.ebuild b/dev-python/pure-python-adb/pure-python-adb-0.1.7.ebuild
deleted file mode 100644
index 740954132..000000000
--- a/dev-python/pure-python-adb/pure-python-adb-0.1.7.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{5,6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Pure python implementation of the adb client"
-HOMEPAGE="https://github.com/Swind/pure-python-adb https://pypi.org/project/pure-python-adb/"
-#SRC_URI="https://github.com/Swind/pure-python-adb/archive/v${PVR}-dev.tar.gz -> ${P}.tar.gz"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.dev0.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-S="${WORKDIR}/${P}.dev0"
-
-RDEPEND=""
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/pure-python-adb/pure-python-adb-0.2.2.ebuild b/dev-python/pure-python-adb/pure-python-adb-0.2.2.ebuild
deleted file mode 100644
index 60ccba930..000000000
--- a/dev-python/pure-python-adb/pure-python-adb-0.2.2.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit distutils-r1
-
-DESCRIPTION="Pure python implementation of the adb client"
-HOMEPAGE="https://github.com/Swind/pure-python-adb https://pypi.org/project/pure-python-adb/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.dev0.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-S="${WORKDIR}/${P}.dev0"
-
-RDEPEND=""
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/pure-python-adb/pure-python-adb-0.3.0.ebuild b/dev-python/pure-python-adb/pure-python-adb-0.3.0.ebuild
index 60ccba930..e4e5ff6c6 100644
--- a/dev-python/pure-python-adb/pure-python-adb-0.3.0.ebuild
+++ b/dev-python/pure-python-adb/pure-python-adb-0.3.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/py-melissa-climate/Manifest b/dev-python/py-melissa-climate/Manifest
index 77a301603..d92d2e89d 100644
--- a/dev-python/py-melissa-climate/Manifest
+++ b/dev-python/py-melissa-climate/Manifest
@@ -1,5 +1,3 @@
-DIST py-melissa-climate-2.0.0.tar.gz 5271 BLAKE2B 447bb23e26b8becdaddd5a5a1cb4ea699f6cdedea7a0bb23c572ba1feae724a76641cb24bf84cd23b0e210cd774cae0a73920b10831ca442a10efdd7662f4b6e SHA512 eae263058572c08189d50036b79fcef53e9016dd7681313c1ca6c94ab2dd6207b01e0037c31901f540af132af3463b7e1185db5eb15e8e6bb66e802a65882889
 DIST py-melissa-climate-2.1.4.tar.gz 5610 BLAKE2B 16df0fa014dc035646477c9f988ce02885ab259086157eb2cad93fb03ae4af647d088d2bc36168ec49ec47d551f38e61f4e8e281edd273f9cd5c9393f700fb06 SHA512 9cd4c1fe4cd0798d8155d1410f894b4842d69d2814898c9ec3e2027bc3696c68d967c5a4f0a3a601216b1aec2faacb15eba456d77f04f12cd025b30fd2d49830
-EBUILD py-melissa-climate-2.0.0.ebuild 836 BLAKE2B b01dd65741572c37cc6427af7ce1c6b05ac192fe6ae27a76329d235c8804758cfc2bb6cbcbff493e1f2dc09d0cf1423039bb343fa0bdbbe9ed17e9bb1068432c SHA512 74489b56b405d541397f904b3961fcede26124411da3b52f3d4971a2d571bcb9d983b17216555f8da5a8dbdcd6e7dc824dbd980cd3082daf58ce77db6c34a715
-EBUILD py-melissa-climate-2.1.4.ebuild 934 BLAKE2B 6fdeb7dba4a759ee0fedfa97c2e082719ccf3e801ca04cf1a3e2641902210af4b3989ff468dc883ca7d0ca92ec4900b0779b424fdb20571240c4a118ee22f7f2 SHA512 f152853a36db41201c2a5da18e0c8a81cfec87c0cbb3cdc9036f01522a37ef0c218421b22ced9dcb9d8b876a01fb22d3258a19bc05e1b855b2b5f37c6f83c103
+EBUILD py-melissa-climate-2.1.4.ebuild 934 BLAKE2B 5ce86e83e2162aba89b554cc807b58d9a1a4bc2e8643e9cf87e02a6ec1f69a703fb15822886980b7d2722ca79404f3b0c60f9922fa209317006aac1fca4492a5 SHA512 b22aa73eb7385d66d1034a9d3a57a97cd694272b86763b0210f2a3a3cf67cc92ef5d5f6946b5a0cc1ca5bfc258d4cee393868bed1c8c5e545ca2ceec45ff60c2
 MISC metadata.xml 466 BLAKE2B 14b754384357b6a8dd8df786e022a46c372f3db64d3a2fd4c203d8d57849457f653c636846c32dc3b8c49a513fe4e7a4ebb92be98ca09f7180d8a5f2fce86991 SHA512 1b619cfd599b9a00b7200d03070a902f0080dc3a8252eba42c7578370c976a3fcb335da20c9561b1105f0dba2e5d7f71e04ca4f20c39272985f8228187bf1c81
diff --git a/dev-python/py-melissa-climate/py-melissa-climate-2.0.0.ebuild b/dev-python/py-melissa-climate/py-melissa-climate-2.0.0.ebuild
deleted file mode 100644
index e444ea00c..000000000
--- a/dev-python/py-melissa-climate/py-melissa-climate-2.0.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Api wrapper for Melissa Climate https://seemelissa.com"
-HOMEPAGE="https://github.com/kennedyshead/py-melissa-climate https://pypi.org/project/py-melissa-climate/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND="dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/requests-futures[${PYTHON_USEDEP}]
-	dev-python/aiohttp[${PYTHON_USEDEP}]"
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/py-melissa-climate/py-melissa-climate-2.1.4.ebuild b/dev-python/py-melissa-climate/py-melissa-climate-2.1.4.ebuild
index 628ae69ed..726ece4df 100644
--- a/dev-python/py-melissa-climate/py-melissa-climate-2.1.4.ebuild
+++ b/dev-python/py-melissa-climate/py-melissa-climate-2.1.4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{6..8} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/py-noaa/Manifest b/dev-python/py-noaa/Manifest
deleted file mode 100644
index 49dfbadad..000000000
--- a/dev-python/py-noaa/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST py-noaa-0.3.0.tar.gz 7225 BLAKE2B f5f411434c208fc593a39b887862821d1786ba1f731de96bb988f4959f4860c47ef2c009dfdb24df1fff96635cdb7b4957ea6ed721fe20e2de96e16440ed2881 SHA512 596169c3b197fcb58ba4194212cac05f1c1cdc353a55305cc035ea21f901156c24fe866bfc8ea691075bea9c421761bfe1c7f5b36721cc2c1953b842d8d51101
-DIST py-noaa-1.0.tar.gz 7646 BLAKE2B 800dcb64d0c4befd2b1ac1ce5081d72237fb9bacb24901ce8afd0ee9f28086d027182c80cd16adec33f6d550e07e3b5a3b69b08a9b53e0914c1a416f5c052bdf SHA512 f8688d2905e7727f0d955b65aa825841b15ccaa3c4c00b53113f7ced4ed085a4f782860ed8e91e1ed3fc4a6e29d0bb2676d7b7cf1aba9fb4b2a59250b072ec9b
-EBUILD py-noaa-0.3.0.ebuild 860 BLAKE2B 7c340571552394088387cf5c1073921a3d353a231957e5a974dbc04a66cf512a5f927ffe6e9a5b519187e9960a9627e014d464ed2bd8d03345c57f193fce5ca5 SHA512 68186df08fdaf885c1a4b3f8bf04f3e043e1a29365c283f4dd522e89d97de1f178b5c2d8f6bedec82b8649c2780717293cbd001e26f52242e02865625d7734eb
-EBUILD py-noaa-1.0.ebuild 869 BLAKE2B b0abbc47230a6a593daade5a8097462f98b785de801256af7be9d0217b8a87cab2eb7dd2fa74ec33496c58881e61a91ecbceb1aa4a1e643ad5d8c9f06f39c2fc SHA512 6259e3b1ded73498fac199ba208a4858876c84651f30b33cad7d4232743baa1ff1661160ce3904f93475f352454b523f7fa3e2dfbebccb14fd836e22204dfa89
-MISC metadata.xml 454 BLAKE2B 2d17966398185208c19ede3d0b5fcf6f82c6d3d5e3a37c476cc789d5616f2338a34270e1762ad62aec252e04a321200797e7f6b60952c29292d60920241e5deb SHA512 d8414f9e5d68e04e52cae42306d40a22bf1935f952375d10726cfac4d0041f302564c59ede528f2ccd1ae69fcd82418dd3a66407dae62e3408863c7b72539e79
diff --git a/dev-python/py-noaa/metadata.xml b/dev-python/py-noaa/metadata.xml
deleted file mode 100644
index 0577c6476..000000000
--- a/dev-python/py-noaa/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>b@edevau.net</email>
-    <name>Andreas Billmeier</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="pypi">py-noaa</remote-id>
-    <maintainer status="unknown">
-      <email>greg.clunies@gmail.com</email>
-      <name>Greg Clunies</name>
-    </maintainer>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/py-noaa/py-noaa-0.3.0.ebuild b/dev-python/py-noaa/py-noaa-0.3.0.ebuild
deleted file mode 100644
index 7abba188c..000000000
--- a/dev-python/py-noaa/py-noaa-0.3.0.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit distutils-r1
-
-MY_PN=${PN/-/_}
-DESCRIPTION="Python wrapper to fetch data from NOAA APIs"
-HOMEPAGE="https://github.com/GClunies/py_noaa https://pypi.org/project/py-noaa/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND="dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/numpy[${PYTHON_USEDEP}]
-	dev-python/pandas[${PYTHON_USEDEP}]"
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/py-noaa/py-noaa-1.0.ebuild b/dev-python/py-noaa/py-noaa-1.0.ebuild
deleted file mode 100644
index ea9174802..000000000
--- a/dev-python/py-noaa/py-noaa-1.0.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit distutils-r1
-
-MY_PN=${PN/-/_}
-DESCRIPTION="Python wrapper to fetch data from NOAA APIs"
-HOMEPAGE="https://github.com/GClunies/py_noaa https://pypi.org/project/py-noaa/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND="dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/numpy[${PYTHON_USEDEP}]
-	dev-python/pandas[${PYTHON_USEDEP}]"
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/py-synology/Manifest b/dev-python/py-synology/Manifest
index 628c8f8ef..e1561c0b2 100644
--- a/dev-python/py-synology/Manifest
+++ b/dev-python/py-synology/Manifest
@@ -1,5 +1,5 @@
 DIST py-synology-0.2.0.tar.gz 2750 BLAKE2B fa42973b68a04c020c51352ed0093595ae446fdfe4f4a85f94c5f7af088fc7be135110d2b87922c7fccd1636ba4fcf8f3cff331ed2834f3083b9c17d1925b0cc SHA512 d0f766685ff80b4a13280e0d1c099350ab598ad9c0f7de6c0b3deff2d374d723c41d7a8d3780ec25912b9478e4915a91d1cc2f9c327411d1d341efcc4e520fae
 DIST py-synology-0.3.0.tar.gz 3150 BLAKE2B e98653ed107d101c47aee011fe8615be5416e1fe10f59d697d4dab56f30b8548457c32510cb407b6295e86c0a31abea7b4ad5b4ffe55319b001f286093512a39 SHA512 d639b5b448c33038f6c31e1abb80c40a68a577f8f80ed6736c82d4780e6dec96c9ee2455e231249df55dec0dad3e52e06f7fec2e629e30fedc03c0d9d1b260cf
-EBUILD py-synology-0.2.0.ebuild 722 BLAKE2B e24700fe4a1340f9ded8d4ca0577ca43c9c2733357e72d268bb72315bd10d9bb0de8fed80258953272aaa555b6df83f80802fba9f0f8ef18675434e0b77ae1a3 SHA512 9d062e4acf1a8226f5e63c3ed6c918a8a8d92bc4f6bf98ed73070ec648aabf92909a113901a2b4a6bc889e3d354f84cc8c4a9ed5536a67476acf9c85cd546969
-EBUILD py-synology-0.3.0.ebuild 731 BLAKE2B 0b90d71e24893f05ebee56cc60db3cf19d282cb535d9545801884c85af918acdbcf0e74fe7d437dc84da965525a9162a959667e4d4bfa46bfcdef34d2c08f4cc SHA512 135b7f73c0b180fefc5c7274ed74ab61be55f58fe35bf6cae44f1a27c39220daa05542d6f2d0401de88679a83bcf44bd8d6b341f1a8aa817186366a6d9d27bea
+EBUILD py-synology-0.2.0.ebuild 723 BLAKE2B 02ca257a64ee39278616e6cba4c960d8c61f4f40a641a52b01f32808eff08d18bf82c3790ef16dc8b10bc68cafac8919c04a02084e2cb4a791c39c5fa05f1e30 SHA512 2debea23a35004b7edc51775e049d80711e47d932c27195dad508afc8dc17cf27ed409dbe0e7fe1496a3ee72a8ac5b960d71b29932065c42c12743fcd6f9f131
+EBUILD py-synology-0.3.0.ebuild 730 BLAKE2B 32c3e1e173c9d20c0ff2f6b35c979b5d1cd0d5ccc37fbe7fc6385d1b16224060773c63dc773c1acc0eb21107a5beedc8fa5165c9af15a5eeefb66e8e053de33e SHA512 0f31a07b735f16d2296c3b665399326ac8315b20392a0d2b592296169221d843af5812b133e3125b5a03eece9c8ef8d8e8728b038629a44f60172257a409db72
 MISC metadata.xml 448 BLAKE2B 09773528266a8b4a0a2274454e84dfe26637c69fc194aeea8ea44b6a4c4ac254242428f16f0cfefc68d39c5accd334d6ba77310b4448a2c763f1db98a9b2f06c SHA512 24a15f1e07d408713cc75ee48c0f8d0cc55740148a2ebc727309a522b7f93978fc9d454c4ab49fdb0c524a70935e9760b636f7e6db9d4eeb5bc8029a8d5cd060
diff --git a/dev-python/py-synology/py-synology-0.2.0.ebuild b/dev-python/py-synology/py-synology-0.2.0.ebuild
index a071018e5..8ee33c750 100644
--- a/dev-python/py-synology/py-synology-0.2.0.ebuild
+++ b/dev-python/py-synology/py-synology-0.2.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/py-synology/py-synology-0.3.0.ebuild b/dev-python/py-synology/py-synology-0.3.0.ebuild
index ee8faaa3d..d5ab0be97 100644
--- a/dev-python/py-synology/py-synology-0.3.0.ebuild
+++ b/dev-python/py-synology/py-synology-0.3.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/pyEight/Manifest b/dev-python/pyEight/Manifest
index 6f2266aec..67514e442 100644
--- a/dev-python/pyEight/Manifest
+++ b/dev-python/pyEight/Manifest
@@ -1,11 +1,3 @@
-DIST pyEight-0.1.1.tar.gz 6963 BLAKE2B 6a6f13f56855ce4b2af82df2a103045ea8a05004b2e9fec0f7797f646d48379831dfaafa288dd6df0aea250455078a6105e469e4f343a922407e12cfd2a54a87 SHA512 64fddd1bc251d8d4eded0aa2d6b57e753df3757c3b9f6e9f184ae7f8070701c0d743e26c37bb6215540aff6da4ff5d3119670e5d956982db5127f0497dacc298
-DIST pyEight-0.1.2.tar.gz 6972 BLAKE2B 91c84ce121a8df7070b337d171b494c7ed49040770f9f978307d47ba6eb45105583e3034e5a314cc25106e77c3598283e9a26ff56f5c100a8ba73b7d8c187dd5 SHA512 7ac11fe4bab48010d1f800702d61ffeb4e81a83362b995e62e215a9a0a03eb4a28405918ed24d0204edd00e030bafaf10fd3742fc9024beda9d2112c91d7322e
-DIST pyEight-0.1.3.tar.gz 7513 BLAKE2B e2d146e08ecf08350d09e70c5463eb714378e1adc6fa139f80ecc0922f2aa458b929e14d89319341e552d18c7bf46c261c334ec67801ab0371013cbc4dea1699 SHA512 ea384660ee0d75c3d48b5d79c736f5d58e37ccb168483d013e83ab7df57aa8a0ac1da9e5502425b88b7dbf6fb16e428864ad0a9c7768b33bb1dcbab85e4b07e9
-DIST pyEight-0.1.4.tar.gz 7517 BLAKE2B 6c115fc7ee0cd25cce0cf4ab2266b57bc32be5ea3cb388a379d8f791c9068b4a76d323adb0dbcd3eaf9fdf29acff100c6b61747e4f2624e6b9b7e702c97d2ca2 SHA512 2a8ab01f710fc75672e03128aa6761c7beda9f695903fdead1734b6646192fea9bcb0b351fac2d0ced84677e5fb6918cd07381c1464d2afdd42acff1fc11a239
 DIST pyEight-0.1.5.tar.gz 7891 BLAKE2B 18f2836b99f8274746633089ac78ed8f0288a6bae284a0c559bd7a6c7fe0f4834765c41aa00f3fcf81da3110d8649b687768f5e7b8338dcd31df690615a1eba2 SHA512 c9c6078fddfaea61579ee6a90fc1c3f02dff06ebd55231bf39820b8e98c021e117ba7bb1c3dd5fb864f1d879eac961bb9cb04d9f1cf1074a80fe103709a28f1a
-EBUILD pyEight-0.1.1.ebuild 701 BLAKE2B 02444abb58def770e65a5cd596b412ab6be228bba3eb92d4fd0880063be4f026789d02057f6838aa521886d9cf47783d7b058bfdf2399141d3ce10b4bfbbd3f5 SHA512 b3a3503a5474bcb10af5c69cbeff3619f3c7b39436d882288a3120edeacb8c5115b66f422664b66783b31528f5918f3ea6e45bee8915c2c68a79b744c607f305
-EBUILD pyEight-0.1.2.ebuild 708 BLAKE2B e0141e31416f36d249f8e7a777f12d07dea5d83ce3e8629d0de3d5479ab51e2baac07967dd5e97d9150f7861c1560433d1f122dbb8341c80f347f22ca0fff6b6 SHA512 f823a96f1c3b23e11ebe53699585a5b95454636af97964aab6eb4e1dbe3aa38327e77ffe4f92f6dc7c2603a8338218d98523e8ea37ce61038acd1b2d49fd2c5d
-EBUILD pyEight-0.1.3.ebuild 708 BLAKE2B e0141e31416f36d249f8e7a777f12d07dea5d83ce3e8629d0de3d5479ab51e2baac07967dd5e97d9150f7861c1560433d1f122dbb8341c80f347f22ca0fff6b6 SHA512 f823a96f1c3b23e11ebe53699585a5b95454636af97964aab6eb4e1dbe3aa38327e77ffe4f92f6dc7c2603a8338218d98523e8ea37ce61038acd1b2d49fd2c5d
-EBUILD pyEight-0.1.4.ebuild 708 BLAKE2B e0141e31416f36d249f8e7a777f12d07dea5d83ce3e8629d0de3d5479ab51e2baac07967dd5e97d9150f7861c1560433d1f122dbb8341c80f347f22ca0fff6b6 SHA512 f823a96f1c3b23e11ebe53699585a5b95454636af97964aab6eb4e1dbe3aa38327e77ffe4f92f6dc7c2603a8338218d98523e8ea37ce61038acd1b2d49fd2c5d
-EBUILD pyEight-0.1.5.ebuild 710 BLAKE2B acf9feee61cd453ee71ea852f13744675bfbb25612d550b36c7d0128c87229461fab31436d09155e1aefec0af982f4602f60b5bb3479150547390fc227b90cca SHA512 6fa6da94cd5662aed150ac9f0a5ae25c38fb47edc9a5082f28aa958d5faee0f86f6b6e07654048ca17d5ffcc4b21cfb31b98bf1402243eecb54737954275a6bc
+EBUILD pyEight-0.1.5.ebuild 710 BLAKE2B fe5a945453e583d2d4641ce1b99234b5ada96826995221f06bb699c7648eceebc6bde50f625bfb494ee40294d649c1640694315a1c636e272c04155d7c0fbb18 SHA512 32568fc3e6e65a2fed476a90cb33ffb8d0c0dcebedc3d029d6f328937be5ad7124e5dd68e8f2fd18c9ade70e1f36909ac6dfb52759bb9960c306b4dea5eecab1
 MISC metadata.xml 463 BLAKE2B 32be602513d45ba18b07a5028cf9e5cad0426e410c7394c79312e9cc9d9ea1c9789cf4a4c6807f4064b81ab1bd4609c2e566f1d997bd10eebe354782cce40122 SHA512 bab80e438582dd524d1d88631d1f8f74785f33f05f25309bd9c4fbbaa83b8ad9991126812a78b8991b796d5bc9d11593664727ae3417cf94bfc6be7919777b3b
diff --git a/dev-python/pyEight/pyEight-0.1.1.ebuild b/dev-python/pyEight/pyEight-0.1.1.ebuild
deleted file mode 100644
index 175dc163e..000000000
--- a/dev-python/pyEight/pyEight-0.1.1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{5,6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Provides a python api to interact with an Eight Sleep mattress cover."
-HOMEPAGE="https://github.com/mezz64/pyEight https://pypi.org/project/pyEight/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/pyEight/pyEight-0.1.2.ebuild b/dev-python/pyEight/pyEight-0.1.2.ebuild
deleted file mode 100644
index 9bf9cf651..000000000
--- a/dev-python/pyEight/pyEight-0.1.2.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit distutils-r1
-
-DESCRIPTION="Provides a python api to interact with an Eight Sleep mattress cover."
-HOMEPAGE="https://github.com/mezz64/pyEight https://pypi.org/project/pyEight/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/pyEight/pyEight-0.1.3.ebuild b/dev-python/pyEight/pyEight-0.1.3.ebuild
deleted file mode 100644
index 9bf9cf651..000000000
--- a/dev-python/pyEight/pyEight-0.1.3.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit distutils-r1
-
-DESCRIPTION="Provides a python api to interact with an Eight Sleep mattress cover."
-HOMEPAGE="https://github.com/mezz64/pyEight https://pypi.org/project/pyEight/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/pyEight/pyEight-0.1.4.ebuild b/dev-python/pyEight/pyEight-0.1.4.ebuild
deleted file mode 100644
index 9bf9cf651..000000000
--- a/dev-python/pyEight/pyEight-0.1.4.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit distutils-r1
-
-DESCRIPTION="Provides a python api to interact with an Eight Sleep mattress cover."
-HOMEPAGE="https://github.com/mezz64/pyEight https://pypi.org/project/pyEight/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/pyEight/pyEight-0.1.5.ebuild b/dev-python/pyEight/pyEight-0.1.5.ebuild
index 04adaf29e..a62fbe037 100644
--- a/dev-python/pyEight/pyEight-0.1.5.ebuild
+++ b/dev-python/pyEight/pyEight-0.1.5.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{6..8} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/pyHS100/Manifest b/dev-python/pyHS100/Manifest
index 1cf7a6a62..682a4e23c 100644
--- a/dev-python/pyHS100/Manifest
+++ b/dev-python/pyHS100/Manifest
@@ -1,11 +1,3 @@
-DIST pyHS100-0.3.3.tar.gz 15250 BLAKE2B 118689acac2d292a01a83b84af3263995a7ad85fcf754106eb1be24ed4188c64cef3bc07b73df17937e4b3deba28726d27a462e05a8f54cc768d1629ff97282c SHA512 f1abdf6376c0ee955a7609540683230d221a67cac7fceb841badfbd0e7335e71f7bb06ce64ac8f6f9ced7b6ae57dc1ab2e7e1f4f9d6132e14f95fbf0abcb8733
-DIST pyHS100-0.3.4.tar.gz 17000 BLAKE2B fb99c848854fc5970a645ace720ff6112da17668bb4cc781e4165d0627511bc058495f28a759a25b900b7de8b8eadd43e2fdb0c7ec8634e39315565acf94e23f SHA512 bce2fbd234a12a984d569d763229c35387421b8b3515489679977c5c3061f7174c4270e5070f0b4337f1c2d607cf11fad232da83f94a9aaff0d55c456cb09972
-DIST pyHS100-0.3.5.1.tar.gz 17787 BLAKE2B 8fd0dc1419a19e821ccb250aee6a6cf7c8f0d0258cec261ce1e8bc691c25bf6431eb5216d2694153ada44b5312d4514f7b4ef2ef2f6993aaf60e8f8d13889bb9 SHA512 40e32f29d95888552af1369408ffe32f5d9f536955638fb58c82b8245a7faf17a869fb4ee2322f9ba0f170a513289cdb5ea827fe19b9c8726c9a84bfdd7c9446
 DIST pyHS100-0.3.5.2.tar.gz 17840 BLAKE2B 6af4634c2593d84085445074efd64794cbfc9882f35dff47f592119ef002e69b2a5d30c168f1709f3612435eb9c8e46cce3e1533d6f6b42611c1b1b3dbfd8bff SHA512 0d21f24ba99503ec125ae43629cbc07fb48052d3f962067828c2a18882eb514b7b7351918f2c81c15149994961dca3be5c54127c3a08adef23cf07f7d6b60f7a
-DIST pyHS100-0.3.5.tar.gz 17377 BLAKE2B 7becffa17e778772432f9519b120f3130e8eab18f70473d64ae11ed5ec4b2ca644b9741fef5ff21e44fb818baba6e03d99cf46ac715ab5e4356465b8db2fd1e9 SHA512 350e029f4f2e836abc74ca73837113af40c9c19b390274bac7a4b500e379857000acc89ae23dbe259d3d0da1417c6b2df4fea468eb6dbc35d36175c16547621d
-EBUILD pyHS100-0.3.3.ebuild 708 BLAKE2B 70b4f867d96319ee83b50e325f6c2234474b257434e846c63084c1e1fa78be8199869c3cfbe418150b1d11bed92af1ac4338e19b0e45724072ebf41fb962c481 SHA512 8ff2fc0a17ec47b6941704e9a3af033c594e1ec9f9d960c8e5ccf9e5113119f250c8079003d339bb18383ed60f5f997e641747c4f7e93b75faa89ee214788b33
-EBUILD pyHS100-0.3.4.ebuild 708 BLAKE2B 70b4f867d96319ee83b50e325f6c2234474b257434e846c63084c1e1fa78be8199869c3cfbe418150b1d11bed92af1ac4338e19b0e45724072ebf41fb962c481 SHA512 8ff2fc0a17ec47b6941704e9a3af033c594e1ec9f9d960c8e5ccf9e5113119f250c8079003d339bb18383ed60f5f997e641747c4f7e93b75faa89ee214788b33
-EBUILD pyHS100-0.3.5.1.ebuild 715 BLAKE2B c68abae1c8d7118bc927067e0cd1c2f8968dc8026bba7853781f36c972826d3fd2dbdec844aa8bd8eff4b4fa76c1b6418029e665fe375784d6ebb5bb89c645ec SHA512 12e96b4f84ce85e1c646f7dbda0a8615311b83940105a4a99b55aede87a7d834ba385046e32db53d33c6f2f46a93fac267d96e938d56895ac6ef7f4cab17126e
-EBUILD pyHS100-0.3.5.2.ebuild 790 BLAKE2B c4b9941d88bae97f963cbf2103f892c92fe7e54fed2e3dfa4f280e4364ad10a9b2dca177e4668a78329deb8f5abc90262054638d082d5a4789755881108b69f8 SHA512 55a5063099e2ac3fabbeebd8e25dba866bb619a3ac589a89d226d40ee225ee4581182cac81ab86013149ee38b81951c8c4a6ae985157f4198952b81e51687dbe
-EBUILD pyHS100-0.3.5.ebuild 715 BLAKE2B c68abae1c8d7118bc927067e0cd1c2f8968dc8026bba7853781f36c972826d3fd2dbdec844aa8bd8eff4b4fa76c1b6418029e665fe375784d6ebb5bb89c645ec SHA512 12e96b4f84ce85e1c646f7dbda0a8615311b83940105a4a99b55aede87a7d834ba385046e32db53d33c6f2f46a93fac267d96e938d56895ac6ef7f4cab17126e
+EBUILD pyHS100-0.3.5.2.ebuild 790 BLAKE2B a45e150310b0d31c1430eb16df029d494ecb9dea9ec060672efcc003f9699037d1807a9c357be6684cb664ef9bbac2310d983423ae6b140552878cf55a65cc7f SHA512 6607bd695c0e704c36c105cf1ae1a2922dc3a83e5cd3e241492e9768ae20da9ef3e837cf64a384a2ac9073da26b29827387bfc35b99c4d253bea18db0e03eff3
 MISC metadata.xml 467 BLAKE2B 185cd493cd43a283c7a690b9ab226e3755b27f63a0d44337744cf3e2b398ac093da04272e525ed34d444b54b2f78dcacb5d5844ca7342988885e29bc1c3e91fb SHA512 f33a3c76118b62cbd17405530322c43b56effe14021a8b1f371a744fdebb119866e779a4ac398b3bd4bb0adf8cc9e7e44ead84676e55e4554645af1bbaea73dc
diff --git a/dev-python/pyHS100/pyHS100-0.3.3.ebuild b/dev-python/pyHS100/pyHS100-0.3.3.ebuild
deleted file mode 100644
index f10e6845e..000000000
--- a/dev-python/pyHS100/pyHS100-0.3.3.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{5,6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Interface for TPLink HS1xx plugs, HS2xx wall switches & LB1xx bulbs"
-HOMEPAGE="https://github.com/GadgetReactor/pyHS100 https://pypi.org/project/pyHS100/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/pyHS100/pyHS100-0.3.4.ebuild b/dev-python/pyHS100/pyHS100-0.3.4.ebuild
deleted file mode 100644
index f10e6845e..000000000
--- a/dev-python/pyHS100/pyHS100-0.3.4.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{5,6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Interface for TPLink HS1xx plugs, HS2xx wall switches & LB1xx bulbs"
-HOMEPAGE="https://github.com/GadgetReactor/pyHS100 https://pypi.org/project/pyHS100/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/pyHS100/pyHS100-0.3.5.1.ebuild b/dev-python/pyHS100/pyHS100-0.3.5.1.ebuild
deleted file mode 100644
index c30ee3df1..000000000
--- a/dev-python/pyHS100/pyHS100-0.3.5.1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit distutils-r1
-
-DESCRIPTION="Interface for TPLink HS1xx plugs, HS2xx wall switches & LB1xx bulbs"
-HOMEPAGE="https://github.com/GadgetReactor/pyHS100 https://pypi.org/project/pyHS100/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/pyHS100/pyHS100-0.3.5.2.ebuild b/dev-python/pyHS100/pyHS100-0.3.5.2.ebuild
index 26bbcbac1..1f675290e 100644
--- a/dev-python/pyHS100/pyHS100-0.3.5.2.ebuild
+++ b/dev-python/pyHS100/pyHS100-0.3.5.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_{6..9} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/pyHS100/pyHS100-0.3.5.ebuild b/dev-python/pyHS100/pyHS100-0.3.5.ebuild
deleted file mode 100644
index c30ee3df1..000000000
--- a/dev-python/pyHS100/pyHS100-0.3.5.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit distutils-r1
-
-DESCRIPTION="Interface for TPLink HS1xx plugs, HS2xx wall switches & LB1xx bulbs"
-HOMEPAGE="https://github.com/GadgetReactor/pyHS100 https://pypi.org/project/pyHS100/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/pyHik/Manifest b/dev-python/pyHik/Manifest
index 284f45b7a..e415ef707 100644
--- a/dev-python/pyHik/Manifest
+++ b/dev-python/pyHik/Manifest
@@ -1,11 +1,3 @@
-DIST pyHik-0.2.3.tar.gz 8056 BLAKE2B da7edae6997b74f72021ebbee7835ddf4d5b226978adb3537aace1f5b6c1d497838455858b857b4608ea6ed620369cb14b8abd73ce382ad0eb446a51a0a17e65 SHA512 3f72d9dbdffdfbe2b80baaf2988e729fec5b0e54125af95bc3a19c010906f0eef75a7b94ab5a0a9b1895d0a4fdd314af3f678873e3fd05064aca8d36511e0b5e
-DIST pyHik-0.2.4.tar.gz 8078 BLAKE2B 222be4e07bb9873c6667ed873ba6c7b6cebd44bde28b660686fdbdd2789d7bd359e9933c469670c4d3a616ddc87d8f836b92c5070582b6cb7a08220c412f9069 SHA512 a3d84aec6925811f0f6601d3c7a6d8f18bc50b6aa88c8d5d707993489c6109a1001454bea9d742d5fa58a44e5eb19ac9c1f80a5b75d18d385593484ec118ebdd
-DIST pyHik-0.2.5.tar.gz 8087 BLAKE2B 40dc960d1507fbb1161a972dbe5f2f312feba0bbf42da62e100ad27804994b1d8496ffa1b3b04a461587169d7d8103825ec4fd2fb89750da172c838a34d57c11 SHA512 14f3c50cd5d61cb472f535edceea1e2e001bbc33719ac78da39826938de6090f32ea7866f881bee45a249d04fae18c33558f746742785ba55bc0584044571a84
-DIST pyHik-0.2.7.tar.gz 8230 BLAKE2B 23fdf6a578204f2be2923d4dfc336e01470a326509db6422f2b03868fc096c82c2d1c77f5853b35459cadd904021114884fc39cfd08d0f324000c06b7cbbcf0c SHA512 432b1f86e90b9818c5c4360aad2ec525d714a1498aa6eec65ccb0d0f6d42bc7f81e18734fc4399df616f88c75bbe4807b54baf808db40fdec332f3fbed16a999
 DIST pyHik-0.2.8.tar.gz 8602 BLAKE2B 4d74bc80dbaa10b2903e0483eeab745388c3d372a51de2c86a60e65a050c33cc6041861f903d82666d931a3679819a0d827a4fa5fa189797eafc1573f005cbcc SHA512 41cbd41e4c8c6fd3da7937e41c4f55a891e5e9564dd66b1874749b8d2e2aa96938918fc50469d5c5c72bd83117ae71182db5103760b4812cc2ccb0c9d038c3d5
-EBUILD pyHik-0.2.3.ebuild 704 BLAKE2B e6a11734e20545d63649ee6266240c63a1ad626e38b8b7e3bffc61898c8d5e9aef2807f011906a824eeffec14819bc4629c27067d1568a392ddf5a0cd30f587c SHA512 6721f47443124fe368b76fb9d1f5217f9aaf63c044744415b57ea01824b84fb833a0fa2aaacf33e74ae1875ec3be45f9e343cb0c3e5a63f536ff61083517ee26
-EBUILD pyHik-0.2.4.ebuild 704 BLAKE2B e6a11734e20545d63649ee6266240c63a1ad626e38b8b7e3bffc61898c8d5e9aef2807f011906a824eeffec14819bc4629c27067d1568a392ddf5a0cd30f587c SHA512 6721f47443124fe368b76fb9d1f5217f9aaf63c044744415b57ea01824b84fb833a0fa2aaacf33e74ae1875ec3be45f9e343cb0c3e5a63f536ff61083517ee26
-EBUILD pyHik-0.2.5.ebuild 711 BLAKE2B 6db32bbed8f22dcbf4b2521e79f6ae7d850701fa94611a0dc642b4e4950c97599fbbdc046b7ae784453b7fd9997ca03a22c914344451ea8d31c150aa4d691dd3 SHA512 7a2d5646185593f41a28ae0f003e0fd320d7b4a02ffdbec871638a8fc94d66909bc1199647cf9df5e407f00be03f0b53c8f0cb94de6a1c08f028e08980478885
-EBUILD pyHik-0.2.7.ebuild 711 BLAKE2B 6db32bbed8f22dcbf4b2521e79f6ae7d850701fa94611a0dc642b4e4950c97599fbbdc046b7ae784453b7fd9997ca03a22c914344451ea8d31c150aa4d691dd3 SHA512 7a2d5646185593f41a28ae0f003e0fd320d7b4a02ffdbec871638a8fc94d66909bc1199647cf9df5e407f00be03f0b53c8f0cb94de6a1c08f028e08980478885
-EBUILD pyHik-0.2.8.ebuild 736 BLAKE2B 7b1e8be5821e55e6e64a283789ce10b0508a0dfb88fad72fe54cf797053c2e6307c949d050df30cb7f306a00da979f9a8ba4a76d99b2d950c124069b097262ea SHA512 08fbae7c7e7cb83542e93c19c001b103a144766804699ff5f663d59f0576db58a591b53a526fd1b214e7f6e3e3e72a878ce7fa69151db899a9052091bbd1de49
+EBUILD pyHik-0.2.8.ebuild 736 BLAKE2B 3f807e9b997695f015aee2c447b0996e2e850ab7720f2ecd6f3db1bf11aa37639fc98b001684b23e50d92e1f0106bad70cea4aedc3304f8c238af6a86ae0c40e SHA512 22e2c46e5cdbd2691f4edd56bcbc459c2efa97e95ecd76311c1d64516a4d950df2f20eeab45e0b2ec538606cda90bb3494e2846136271b073b36482ef11a6411
 MISC metadata.xml 461 BLAKE2B 0de060004376a8c94b7f17989fcd060f10ca17918c8f1dcff32c8b2af40a74aed2f4075f07ad91450915e4e45c0dcd38607f42a4af4032e476055fa5e5ee3a60 SHA512 bfea1d44cb0745d53e508b980261d5dcd63b9bb2cadb3d6a49c65216c730932d4568e8edb0a6cecd78e5c3f5c64751f8933b99cf387fe698856aa35df6b7fae3
diff --git a/dev-python/pyHik/pyHik-0.2.3.ebuild b/dev-python/pyHik/pyHik-0.2.3.ebuild
deleted file mode 100644
index 6c4be3b75..000000000
--- a/dev-python/pyHik/pyHik-0.2.3.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{5,6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Interact with a Hikvision camera event stream and toggle motion detection."
-HOMEPAGE="https://github.com/mezz64/pyhik https://pypi.org/project/pyHik/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/pyHik/pyHik-0.2.4.ebuild b/dev-python/pyHik/pyHik-0.2.4.ebuild
deleted file mode 100644
index 6c4be3b75..000000000
--- a/dev-python/pyHik/pyHik-0.2.4.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{5,6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Interact with a Hikvision camera event stream and toggle motion detection."
-HOMEPAGE="https://github.com/mezz64/pyhik https://pypi.org/project/pyHik/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/pyHik/pyHik-0.2.5.ebuild b/dev-python/pyHik/pyHik-0.2.5.ebuild
deleted file mode 100644
index 5b247f0ea..000000000
--- a/dev-python/pyHik/pyHik-0.2.5.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit distutils-r1
-
-DESCRIPTION="Interact with a Hikvision camera event stream and toggle motion detection."
-HOMEPAGE="https://github.com/mezz64/pyhik https://pypi.org/project/pyHik/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/pyHik/pyHik-0.2.7.ebuild b/dev-python/pyHik/pyHik-0.2.7.ebuild
deleted file mode 100644
index 5b247f0ea..000000000
--- a/dev-python/pyHik/pyHik-0.2.7.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit distutils-r1
-
-DESCRIPTION="Interact with a Hikvision camera event stream and toggle motion detection."
-HOMEPAGE="https://github.com/mezz64/pyhik https://pypi.org/project/pyHik/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/pyHik/pyHik-0.2.8.ebuild b/dev-python/pyHik/pyHik-0.2.8.ebuild
index 9d2015bc8..a3371bd0f 100644
--- a/dev-python/pyHik/pyHik-0.2.8.ebuild
+++ b/dev-python/pyHik/pyHik-0.2.8.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{6..8} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/pyRFXtrx/Manifest b/dev-python/pyRFXtrx/Manifest
index ba46c1db1..33b9957a3 100644
--- a/dev-python/pyRFXtrx/Manifest
+++ b/dev-python/pyRFXtrx/Manifest
@@ -1,11 +1,3 @@
-DIST pyRFXtrx-0.23.0.tar.gz 22455 BLAKE2B 2545d95b763b8368bfd847f49ce7bfd8fc1b24addf9884f2184111222bf1056fd8803d3314c9a966f8da35cca62eeb8d67a9b27e25e1805dd35af6abd3b20e5e SHA512 090a7f02d3866d2d00edaf6e1e91608c9c94c0665e66df28ff7e6386fd9f844a3b5978e2a541e0acbde7ac7aaa81ca6d1f7c72846036af3055a38be6584001af
-DIST pyRFXtrx-0.24.0.tar.gz 22991 BLAKE2B b319d9510b3240b4146acba93ee96813ffed24d078882324af35142bd39711fdee00c6e3db48976f43048558576aad5e5d5f56bca6e1ef5e9d75de7ed0aad5b4 SHA512 00ed3d563c40022bdf5377f1a66d3610d2c6c02f4125413bda1d237229cd5d4be0e7a3177a03c5899a7dbd1ef9092157a308a043dfa125f39b843089d7bd74d3
-DIST pyRFXtrx-0.25.0.tar.gz 22995 BLAKE2B 4863c6aedb72e3979d33561f6f9eeab847a75f90e1e7650687ad8270fa0268e61007a43f5d7c388a9fcc738fb04514d62c62b05dadaf79b94f05c885e2e56b51 SHA512 840effaf48e21179242ca2c563df8ed2dc5dc4104543ec8a0ad6897d022f96f4c64dfcd6cc1626e5aeda9f4ba16f0bd76430ade8cad3b1680f7d8d8cc5b15770
-DIST pyRFXtrx-0.26.0.tar.gz 24213 BLAKE2B 6011373bbde49b7e30cc4ae9a90ae151317c1ed798d8114f5a8526075d315d230d28e92e6ecdf88430b769ae79d9afc24a1d7ea0612e9477fb7da34168c1ea77 SHA512 2bbcc1efb280c10c093b04ad79ec62d49b5a4f96cf3bd5c2d9af9b5b0afb15e02ade6e0057eba0fba182b4135152d30669740aa9a26db253956907eaa46a25f3
 DIST pyRFXtrx-0.26.1.tar.gz 25515 BLAKE2B 8dcfbe611d5859f979ce25d5e56f7c0224c0a1f93c336e13a2fc2d38051ef3e80283b086e0789fd1a9f5cb04ed87f46d003b610ed85d6fed7381c3e82b5962af SHA512 6cd655cbec451dde3869119a894bcb47916ecf6768fde5ff03e2f0c71172610fb379b9ac5a40fe5ba6b288f0ef2d9990cc5fa3e0e6f9377230a8e6af7733cbf4
-EBUILD pyRFXtrx-0.23.0.ebuild 746 BLAKE2B 9bb313c9abe1c2bec094c459d6185a2167b278c094379a38c5d66ddb6abc47a2e55dcc98a64b77531e6056ce276f035bc08ed054ea5211f2c76b464f492c938e SHA512 b2ad4a052a0018f4e22d08590eb51e1110325e2d39e023c444bca458a3720dc9c67599eca9919d817b530f7a6f7b35ef11f2a3c09691c98d3740b89cb433ad5f
-EBUILD pyRFXtrx-0.24.0.ebuild 746 BLAKE2B 9bb313c9abe1c2bec094c459d6185a2167b278c094379a38c5d66ddb6abc47a2e55dcc98a64b77531e6056ce276f035bc08ed054ea5211f2c76b464f492c938e SHA512 b2ad4a052a0018f4e22d08590eb51e1110325e2d39e023c444bca458a3720dc9c67599eca9919d817b530f7a6f7b35ef11f2a3c09691c98d3740b89cb433ad5f
-EBUILD pyRFXtrx-0.25.0.ebuild 755 BLAKE2B f01d7fc315ea3108e4b83e0f7cdd832f19c999f1140015dd858fcb38683a1a68ad2c9a608f94bdc3eb110e5bdb903980a1035cd476f3a9d279622828de58f46f SHA512 833f43c40f406276935c1dde412c11963d2c878724d2ed73c0af6de00bba7ab79a46c519ddeb2f4b0dc77aec1261a894e3092ce5eb921225ddecfc96c758a7a0
-EBUILD pyRFXtrx-0.26.0.ebuild 755 BLAKE2B 487ac78271109398998ae11a5c0e2cf8a65e85105f75dee117fafeaf7ecb3591932d9b3ff526c1a44e30ab56420c4b204c41b6e2932696504c47a8d5e1fca26e SHA512 985248304e8c89766b1e5d96f14e5e259173f5430d7ac946b8897e81f3aba2a7b891f843005d1ddbf20e284c17438efa7a1ad67abbee96e17de3a26ab57777cd
-EBUILD pyRFXtrx-0.26.1.ebuild 753 BLAKE2B a3f3196fc04ba1659070aa8e6a333ca39868b1575b85fc09a4bb5e9074953308fc0868683798b731863680f0ffdabfd3bcaa5c57490c3fdfe602eff9d49bca9c SHA512 3fac267567bc01be3025c3ceb64c09c4ea83700c5c30dc3f7075a806001afebb5747cdc8a0d5b4a703d59113c2998dacccc24ecc82296c1e89d50012feabddc7
+EBUILD pyRFXtrx-0.26.1.ebuild 753 BLAKE2B b8bfff84ea42b08a82186cd917f0e0344a7541342ea11dc972857d285929d2ea641e7febdba8399ed9288d9304cca4fca4b529beeec7147622dc58de06e498ed SHA512 da21ce900cdecc1296e43275a05d358931235051a6d37d7750fed0cccd09b759f6f1dd47a03e8f8b1c32b2e8b62c25812a648795d969415400f2e02f53d7a37c
 MISC metadata.xml 446 BLAKE2B 826745aaeaa75cbc4e55bc3875607dba7bc5a56c35ea122df2b2b73fc07bb201fa88b8cc72736c8e64815bc6481fcddf9430e92713d96f022608921dace47872 SHA512 a0b6b7e7d9613affb2999f9c9790baf3179519c4ecb0258a6a288919fae259db91b8272d0ca024814f80cbf80c84e20882d7ce66fa0b2b2cebd84d2bb61712cc
diff --git a/dev-python/pyRFXtrx/pyRFXtrx-0.23.0.ebuild b/dev-python/pyRFXtrx/pyRFXtrx-0.23.0.ebuild
deleted file mode 100644
index ee112e9f6..000000000
--- a/dev-python/pyRFXtrx/pyRFXtrx-0.23.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="a library to communicate with the RFXtrx family of devices"
-HOMEPAGE="https://github.com/Danielhiversen/pyRFXtrx https://pypi.org/project/pyRFXtrx/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=">=dev-python/pyserial-2.7[${PYTHON_USEDEP}]"
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/pyRFXtrx/pyRFXtrx-0.24.0.ebuild b/dev-python/pyRFXtrx/pyRFXtrx-0.24.0.ebuild
deleted file mode 100644
index ee112e9f6..000000000
--- a/dev-python/pyRFXtrx/pyRFXtrx-0.24.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="a library to communicate with the RFXtrx family of devices"
-HOMEPAGE="https://github.com/Danielhiversen/pyRFXtrx https://pypi.org/project/pyRFXtrx/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=">=dev-python/pyserial-2.7[${PYTHON_USEDEP}]"
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/pyRFXtrx/pyRFXtrx-0.25.0.ebuild b/dev-python/pyRFXtrx/pyRFXtrx-0.25.0.ebuild
deleted file mode 100644
index c66242abd..000000000
--- a/dev-python/pyRFXtrx/pyRFXtrx-0.25.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit distutils-r1
-
-DESCRIPTION="a library to communicate with the RFXtrx family of devices"
-HOMEPAGE="https://github.com/Danielhiversen/pyRFXtrx https://pypi.org/project/pyRFXtrx/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=">=dev-python/pyserial-2.7[${PYTHON_USEDEP}]"
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/pyRFXtrx/pyRFXtrx-0.26.0.ebuild b/dev-python/pyRFXtrx/pyRFXtrx-0.26.0.ebuild
deleted file mode 100644
index dc1f0b760..000000000
--- a/dev-python/pyRFXtrx/pyRFXtrx-0.26.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{6..8} )
-
-inherit distutils-r1
-
-DESCRIPTION="a library to communicate with the RFXtrx family of devices"
-HOMEPAGE="https://github.com/Danielhiversen/pyRFXtrx https://pypi.org/project/pyRFXtrx/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=">=dev-python/pyserial-2.7[${PYTHON_USEDEP}]"
-BDEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/pyRFXtrx/pyRFXtrx-0.26.1.ebuild b/dev-python/pyRFXtrx/pyRFXtrx-0.26.1.ebuild
index 8c34dbde2..581ff4d47 100644
--- a/dev-python/pyRFXtrx/pyRFXtrx-0.26.1.ebuild
+++ b/dev-python/pyRFXtrx/pyRFXtrx-0.26.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{6..9} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/pyW800rf32/Manifest b/dev-python/pyW800rf32/Manifest
index dbdaac5c5..ff463d4cd 100644
--- a/dev-python/pyW800rf32/Manifest
+++ b/dev-python/pyW800rf32/Manifest
@@ -1,5 +1,5 @@
 DIST pyW800rf32-0.1.tar.gz 17190 BLAKE2B 62576137befbda5ce6cf78449cdb5c67a24675efb58892a2837eed984df27b5bf675c845cc685eecc8f45a8d7a57923b46816a6130c8d98fd6327b67c9df1756 SHA512 67346d6071e901f73092ecdd74a7e8bf1e1fcf858b2e1292b78f53bdd72398a991c46a6b8f42a70d56616a812a01182f78b1908b1e58528abb3d278361eef1b4
 DIST pyW800rf32-0.3.tar.gz 17193 BLAKE2B 05b618376a8923f34a1603404fcca2aa03c7bfe76d2e7d684f2e6b3c9be90e8d4591de2ee0eb033f0c0c75d88d4c52bb84a4e4824bca9917cdd57ffd08c35d4d SHA512 13c57a3488208321e48c6d2cde4bb1bb03edd8dcc99550e71b3258bc85bc7ee36c073e80e4987f096b455933e0f76b0bd61b7525ef8512648edfd557cb2e79b0
-EBUILD pyW800rf32-0.1.ebuild 701 BLAKE2B d7824744e18756239fb7bae25df8952bad6bf05d59d934c82f4a2b3bb7c80ad0d98cb577e699e5b050cd844b7d2c6468587dccca51259a8b24b48ca469d4ceea SHA512 d058dca889ca219d9de90768a8d08d020260083d2f6e08c5fd5feb6b3b56ce74e16546a8ed1b6d5fff958383dc517993fa0de3c1ac649bc126b162e6af95940f
-EBUILD pyW800rf32-0.3.ebuild 710 BLAKE2B 6774244cd6b6a5c38bf585fbe9c3b8d045a982edcd04bcb82fd5c3173204ce114a6b8a067f324ca49c92f46f5eb48de676ac29e91f82cdc998c67c22491f2229 SHA512 ecae1d369a6bbb8f512491bf7cf3d1b124e7b3838402af8f21c3b8481586f5f9171fd57cb744da70e1eef032a31d5cd3f3db76e42c456e962fe45aabbf827cab
+EBUILD pyW800rf32-0.1.ebuild 702 BLAKE2B 86a6a7d890f815a34651d7a8cc0953d3cace8e3b94ea52a2821bb9095ef43a1a29ba5f1ebcce9d8bdbb8fcc2cf6e641bd262d0f76767bcde50257e8f2f90c8f2 SHA512 a4a0e257ba804211d6b451c1a31fd11202e2c008c2484fdf4220a2224b80713dcbb47a2807828ff4050b7956fb14f0d221ebd709900fb3a9b0505cc9cf494355
+EBUILD pyW800rf32-0.3.ebuild 709 BLAKE2B de8666e3fd44451b48db6fad86386deeac4d71af3bef9602e56e2fa822b1e2ae60c3608e45e0193a6a5f9f0e5dffbb7b0e8716840f89eb14f7588a090820d1dc SHA512 411cbdbdc06ed703427157bb4d1ac9214d1c1578482cd9855f1493fcc14c9d63db06f8f715b7fd218859efbecd36ade04b7d750493d41c0b83132e5ba67a499e
 MISC metadata.xml 453 BLAKE2B cf6f0195b2207400c868d7d5ae882ff8f4c9005c2f209c27db871ad062a2d5e309227eb95f301966eecd7df5a0c601a544e267579c2e4e146301b99409b7dd2a SHA512 4980618d46f010b0b9ae50dbf7348429ad42ac32e3fa75bfa008d4abc9c67209dd48ef70fcf1c6743c76088bb7eead44a449de13cb08bbd088319aa2ddfd9b8e
diff --git a/dev-python/pyW800rf32/pyW800rf32-0.1.ebuild b/dev-python/pyW800rf32/pyW800rf32-0.1.ebuild
index 056b273fc..0157a557d 100644
--- a/dev-python/pyW800rf32/pyW800rf32-0.1.ebuild
+++ b/dev-python/pyW800rf32/pyW800rf32-0.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/pyW800rf32/pyW800rf32-0.3.ebuild b/dev-python/pyW800rf32/pyW800rf32-0.3.ebuild
index b36089d7d..1aade116f 100644
--- a/dev-python/pyW800rf32/pyW800rf32-0.3.ebuild
+++ b/dev-python/pyW800rf32/pyW800rf32-0.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/pyads/Manifest b/dev-python/pyads/Manifest
index 55b798563..e353b3f36 100644
--- a/dev-python/pyads/Manifest
+++ b/dev-python/pyads/Manifest
@@ -1,11 +1,5 @@
-DIST pyads-3.0.7.tar.gz 389071 BLAKE2B 066943e27889b28c37337fa30fa3f8d4e3e58a3f31a0d7816e07fe9be1637361e1e5701e763582cceb7b8ef62fc154daac724658067534b121f3b22fe60b25f1 SHA512 92d9659ceb02bdfdd73479f08f06776a64dbae9c984181f48014e540edeea57b974b0968b9c53425b1c73774a422413f770775327e3de1951f59dca7c5c76cfb
-DIST pyads-3.1.2.tar.gz 364829 BLAKE2B b1b5b1d895c6aaee74a7cb86d6dd3f23270507c0631f9576024a7739b0d0eebe63a33272fba43bc65d9d980fb17d7dd9dfc99041f4e6a6838d2abacaeeac5a7c SHA512 e4a5551c75cc4d3b97547d2f150964878ac054e2d1924d010c47826e447672f0779f950592f3a083e2d329df316678417f08917c5012cf62e67780f7414b5455
-DIST pyads-3.1.3.tar.gz 366778 BLAKE2B bb86fa04630c2b4e52e45b9d37f8365f05a8ef71da15776cbb9169f86e1ef983de3ee775f098172484ca9fd15cab6632c41ae39781a71ead3e8c9b962f666e0e SHA512 a351676c61721b8add4431facd6ef4afa6ce677fd1620e2012a6f8366da0a5ed4ff2746e2230accdf05fdaf5ad54fb76bd4295e92eb8fd56d60aada4ee7630e3
 DIST pyads-3.2.1.tar.gz 411839 BLAKE2B 99dadfb5c35ee8289536dfc8a6801999a97e9ea7ea07e4c9a7bad4e08f96e40de2e0eb001131727ec55754104d819a5572ea3712b5805047946f241acaefc220 SHA512 543e90fe2b65407f412b433a3bb28852b4b6c6954e2fc2f40adc5a3feb1992399064469a2af2e98e3a48889e95b978e0446d408065b14aba906f963002feb4c3
 DIST pyads-3.2.2.tar.gz 464540 BLAKE2B 5f514042e41125eb12c85f52c8cf3af16497b9c862d2327ece7805bbbda51d97a992c7eabf18efff49a93101212b8dd6a9735cadc986c945e7032df2ab276ead SHA512 4606358c0c5a4c7e383b4971e22d31a1c06ee572be3285579832389594ed59c87c614e654d865b37684be960630f9655cc6e7523f2fad723a325dd8d5e5dd6e3
-EBUILD pyads-3.0.7.ebuild 666 BLAKE2B 0c2df9a699d0668bb2117b4d63c9ba7acd5693db23171d19a5542daef509a5d36620346a7f4798f0dbbe5b59c90311323af8b9349f0e284418545d829fbdc9c6 SHA512 4bf59717d245285842910505eebd7f03fc63ed871853640bc1b55069be6e472687f6337736a558374d6ef6968707415a776d6c22f3cf03313d57885c89cd6834
-EBUILD pyads-3.1.2.ebuild 675 BLAKE2B 9459bcb29bdb2193e8233644e113741c49ea942a2d3da10c70924a055597ebe8c51748978009832dafb25f289c41f32a5a1f091fa77d11ebe14648c0c5e60fd5 SHA512 19b30c291d16d578d2c71c7c5192f6ac1e75535e6535245fec2fd5f1863ea192fde4fab920adbea27c5652b56c7a7c86c26329717833d7dc88e54bd88322603d
-EBUILD pyads-3.1.3.ebuild 675 BLAKE2B 9459bcb29bdb2193e8233644e113741c49ea942a2d3da10c70924a055597ebe8c51748978009832dafb25f289c41f32a5a1f091fa77d11ebe14648c0c5e60fd5 SHA512 19b30c291d16d578d2c71c7c5192f6ac1e75535e6535245fec2fd5f1863ea192fde4fab920adbea27c5652b56c7a7c86c26329717833d7dc88e54bd88322603d
-EBUILD pyads-3.2.1.ebuild 675 BLAKE2B 9459bcb29bdb2193e8233644e113741c49ea942a2d3da10c70924a055597ebe8c51748978009832dafb25f289c41f32a5a1f091fa77d11ebe14648c0c5e60fd5 SHA512 19b30c291d16d578d2c71c7c5192f6ac1e75535e6535245fec2fd5f1863ea192fde4fab920adbea27c5652b56c7a7c86c26329717833d7dc88e54bd88322603d
-EBUILD pyads-3.2.2.ebuild 717 BLAKE2B 6d6376a21adf3ecd12fe94debffde3a5ddda806cd21fa833195ceba96e852a6f6fdeb502f47fe00cc50296a3d8729646668fdc7a278d8cfd643e0bd5f87356c1 SHA512 06a31cf840e95a6aa266facaf7dd8ac9a80e01d882e7dd525e36db1324ffec3ddf5d5b0257aab57036e9fc5b1ba8c68e8b8a886a27a8d13f8985b97342c82e3f
+EBUILD pyads-3.2.1.ebuild 674 BLAKE2B b1c1d3a9c08862dbf1f76522300f96accd4abaadf92861d3bb20bab76255c05eda560ee4118c367065444c9ae2bfe48d957e9973003b67e03ad45e666a37d446 SHA512 a31e422db5a1197009ca7fa685e36c98d9234ea41cd147bfcbe4fc5e8e01e9ce7dafaf783b6cc74b08244dba96db121372235e879db4e169cd699a73e1ccfea2
+EBUILD pyads-3.2.2.ebuild 716 BLAKE2B ff4a706821a3ddb0219a1755112f9d26dfcd0cbc64a9aec53f345e500b5edaba5c99989c24aaad50583f57f472ab7a5f83d87e749d815352b1e3227b14d8ea21 SHA512 d5250a35ba9cbe83aa3333e343c34a79107510428c3368a043986a4540aad781454305fd26069f9c3c85c66fda28532791b03f553f4715977fc91895a28708d7
 MISC metadata.xml 459 BLAKE2B ee3976b1b011211d9fb06d091fc789609cb11df4260a3e3f8be78a447fb715b5029ed37d17cf1928954cf46fd9384c03c8091c0152c4bcecb6e74899c05c64f0 SHA512 d97a39c8a1a3a774fea6e3b73298c8967e025bb341e488351d1904271eb7ff2c1cc59c517c9f2565e88cee5493cc48dbaa40b73d9dd8f49ddca62cb4adec36b1
diff --git a/dev-python/pyads/pyads-3.0.7.ebuild b/dev-python/pyads/pyads-3.0.7.ebuild
deleted file mode 100644
index 70258566f..000000000
--- a/dev-python/pyads/pyads-3.0.7.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python wrapper for TwinCAT ADS library"
-HOMEPAGE="https://github.com/MrLeeh/pyads https://pypi.org/project/pyads/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/pyads/pyads-3.1.2.ebuild b/dev-python/pyads/pyads-3.1.2.ebuild
deleted file mode 100644
index 537492543..000000000
--- a/dev-python/pyads/pyads-3.1.2.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python wrapper for TwinCAT ADS library"
-HOMEPAGE="https://github.com/MrLeeh/pyads https://pypi.org/project/pyads/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/pyads/pyads-3.1.3.ebuild b/dev-python/pyads/pyads-3.1.3.ebuild
deleted file mode 100644
index 537492543..000000000
--- a/dev-python/pyads/pyads-3.1.3.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python wrapper for TwinCAT ADS library"
-HOMEPAGE="https://github.com/MrLeeh/pyads https://pypi.org/project/pyads/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/pyads/pyads-3.2.1.ebuild b/dev-python/pyads/pyads-3.2.1.ebuild
index 537492543..2d1c2e579 100644
--- a/dev-python/pyads/pyads-3.2.1.ebuild
+++ b/dev-python/pyads/pyads-3.2.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/pyads/pyads-3.2.2.ebuild b/dev-python/pyads/pyads-3.2.2.ebuild
index 9b43a96ab..bb5ad05cc 100644
--- a/dev-python/pyads/pyads-3.2.2.ebuild
+++ b/dev-python/pyads/pyads-3.2.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/pyaehw4a1/Manifest b/dev-python/pyaehw4a1/Manifest
index f3a869a8f..85258b170 100644
--- a/dev-python/pyaehw4a1/Manifest
+++ b/dev-python/pyaehw4a1/Manifest
@@ -1,9 +1,3 @@
-DIST pyaehw4a1-0.3.1.tar.gz 8691 BLAKE2B d49bb49b385fbc76649f71f464bbf0b2f0c8b2e1b5d11fd072b1878b7d95beec4782cb6b4f588b3cea3b7add63e2b6f2e7d4daff26669dba1a900306ec827a8e SHA512 e47a3eeabc82540e002ca0121e6ee07f9bcd8433420865898863a643c3feb07e2fa5510500712be9b81005560108386e8450fd6314fa3bedcecf08c52139aafa
-DIST pyaehw4a1-0.3.4.tar.gz 8834 BLAKE2B 83dd8f1bd3e2480e97803fcce11a8f39c4d17ecbc4a0ec8fc91bdc2b3f86a3feeb272f975778e914e5146f2fec581356aefc88abb0386ad532fe27e0e2a34aa7 SHA512 ad9e6cc75a964ad81c7e52704c1d9f54f20d023c355c810317fbcfa9366f98e2291a70c89232c72b0d39855e2d00cf9b0a13955536d638658e8b821d6edda803
-DIST pyaehw4a1-0.3.5.tar.gz 8848 BLAKE2B cbd94e7beb3610759709c105427ae37fdcf8874fd02d425bfd760275475f4b5d712de14903f549069708b8bb91f82b4834777f4917d92a0cd18b45c360cebbda SHA512 1c685d655483c997597cc497542486336390ecdb288cd47f3df4af3038e0c22ff53177c38987d360d0f61065882d47eabe7b211ba148ffa861ae43309207b2a7
 DIST pyaehw4a1-0.3.9.tar.gz 8862 BLAKE2B b8dc3c19214c63ba6bc73fdb9118f882c2e04adbebc7592a0977da197742c506c8d077fcdfb401c833c7c3095d73f94b80c679dd2774ee8b341998dc3c7fadac SHA512 bea7f70c8fbf84669f9e25d26626db5733cbcb935f7be3364ee6b71ce9ef1723f9852ebce3260684610027c8f055e26c61a27db51cb04a0c546e15224f1b4d08
-EBUILD pyaehw4a1-0.3.1.ebuild 689 BLAKE2B d6299054c132c3b8429e28c8672f244ebf7d7e7fd6ebed9cd932b120243294d1516e5dee813840bfb3497fca8330b054784efad97c24d8bfa28cdf6b1f766ac0 SHA512 4485619bd76ead7b220fa5a52159564494130d182b33e5c2eb58c808fa4a07ac7e931b1e3c8c3eec16781f3c17f548986e24a7dd64d068bce9f0e70cc560de3d
-EBUILD pyaehw4a1-0.3.4.ebuild 698 BLAKE2B a1db7b53d2749e373a1cd4b8d580e9e33654ef1f7c6d5ee4a7e824e6fc3a57f9ceb89279c3f36187498bc2e68edff212449639b3f9ac7eaba5bb72d3e91e7ad2 SHA512 011ab34fa8293b30d4917ce1341d71ad152a6a9aadce85c839e3b5a780371c1ca5ff295602841e4ae71ac3cae2927b7ac94835d932e67c29b0139bd127b62f71
-EBUILD pyaehw4a1-0.3.5.ebuild 698 BLAKE2B a1db7b53d2749e373a1cd4b8d580e9e33654ef1f7c6d5ee4a7e824e6fc3a57f9ceb89279c3f36187498bc2e68edff212449639b3f9ac7eaba5bb72d3e91e7ad2 SHA512 011ab34fa8293b30d4917ce1341d71ad152a6a9aadce85c839e3b5a780371c1ca5ff295602841e4ae71ac3cae2927b7ac94835d932e67c29b0139bd127b62f71
-EBUILD pyaehw4a1-0.3.9.ebuild 698 BLAKE2B a1db7b53d2749e373a1cd4b8d580e9e33654ef1f7c6d5ee4a7e824e6fc3a57f9ceb89279c3f36187498bc2e68edff212449639b3f9ac7eaba5bb72d3e91e7ad2 SHA512 011ab34fa8293b30d4917ce1341d71ad152a6a9aadce85c839e3b5a780371c1ca5ff295602841e4ae71ac3cae2927b7ac94835d932e67c29b0139bd127b62f71
+EBUILD pyaehw4a1-0.3.9.ebuild 697 BLAKE2B 5eeb4371df5456489e2b5620508cb12280f203684af5ed2d4fe08e4a6aa3c6b08cbcddc2f0c2936be2fc4394984679c7d2d874aa5986e595576dffc9b34f4adf SHA512 78ca9080629d6c9c47c2f2c65e6ed52c48c29eb8251f216f9bb4f99165ba5cc0897edf04be6765215e53245c2138d898a33b7f9566de24e619551e00692cfb74
 MISC metadata.xml 466 BLAKE2B eff8a48b952f5da2f5ceb83c6651568d2a39f611a0fec561076f25fb4f64f79be727d3961b386e010fe4d3079b33dca50083761aaaa08292f0c0dfb597d2013d SHA512 e25de1a553ff5a57c83ecf7bffbe8831c90eed83b625095dcabf44c11c5ed2ddf1377d0cc4ee1acbb452731f792c5015c7e2bc8544098cf3290a926b0ee50042
diff --git a/dev-python/pyaehw4a1/pyaehw4a1-0.3.1.ebuild b/dev-python/pyaehw4a1/pyaehw4a1-0.3.1.ebuild
deleted file mode 100644
index 3c9907b58..000000000
--- a/dev-python/pyaehw4a1/pyaehw4a1-0.3.1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python interface for Hisense AEH-W4A1 module"
-HOMEPAGE="https://github.com/bannhead/pyaehw4a1 https://pypi.org/project/pyaehw4a1/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/pyaehw4a1/pyaehw4a1-0.3.4.ebuild b/dev-python/pyaehw4a1/pyaehw4a1-0.3.4.ebuild
deleted file mode 100644
index c43a058c2..000000000
--- a/dev-python/pyaehw4a1/pyaehw4a1-0.3.4.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python interface for Hisense AEH-W4A1 module"
-HOMEPAGE="https://github.com/bannhead/pyaehw4a1 https://pypi.org/project/pyaehw4a1/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/pyaehw4a1/pyaehw4a1-0.3.5.ebuild b/dev-python/pyaehw4a1/pyaehw4a1-0.3.5.ebuild
deleted file mode 100644
index c43a058c2..000000000
--- a/dev-python/pyaehw4a1/pyaehw4a1-0.3.5.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python interface for Hisense AEH-W4A1 module"
-HOMEPAGE="https://github.com/bannhead/pyaehw4a1 https://pypi.org/project/pyaehw4a1/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/pyaehw4a1/pyaehw4a1-0.3.9.ebuild b/dev-python/pyaehw4a1/pyaehw4a1-0.3.9.ebuild
index c43a058c2..b74faaaf1 100644
--- a/dev-python/pyaehw4a1/pyaehw4a1-0.3.9.ebuild
+++ b/dev-python/pyaehw4a1/pyaehw4a1-0.3.9.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/pybotvac/Manifest b/dev-python/pybotvac/Manifest
index d4f4fc82d..cc33a1724 100644
--- a/dev-python/pybotvac/Manifest
+++ b/dev-python/pybotvac/Manifest
@@ -1,11 +1,3 @@
-DIST pybotvac-0.0.15.tar.gz 8997 BLAKE2B 0efe6ef4cb65e53268a498d06438281740a34b2804b8410cc914e4a338a3b49c0a1a760ecd540b99b2295fcce012112990b896f2713574d02212b21246850974 SHA512 3e26d29f39dd6f601b7d15a7a5917bf3cb5e0a64991dc5c984e1175694cb0fc5a18d55df9e3a60813b8ed7f83326642f58c4c0cf619237736181c99a676001d9
-DIST pybotvac-0.0.16.tar.gz 9660 BLAKE2B 1c7b3a9b10bf55723dc77225dbc25aabdd0fa3c17c6db0387679237bc8ae987220d9b825efed73ad3019049bcd30e9dbdab81b16a1ded9c554f618ccc5f6c6fa SHA512 83982b134f55647abfe83d4e759a1cc6c14f01110648837f3af5982a60b6e8cc45e43234b5c5cc3b4d84429f4c4b2ee3f6222d540737ec66334cbd27529fa375
-DIST pybotvac-0.0.17.tar.gz 8888 BLAKE2B 37c3cce2fb843bd94e549b776358d7c1afe4849724bceb8a91b1352934c2ae8ba2f144b1ff0577790fd8b9e3fec563e3cf7d7b4d6443b2b388d1401f42fe4e56 SHA512 2efc734583fe1f29c85502fe58d29fd4ea17022167c71631a1eeba9b81f2ec685a37ebe28cbd14750e263edc4e4637bfb2037d9c5efccf1e839123275c4edd5e
-DIST pybotvac-0.0.19.tar.gz 12771 BLAKE2B 17562fb0a82ecab1adb01c42cfecca35b9645b983cd0bb90f407c207a77b85a9fd631e60355de1a0e01e65537d8389b4a601d04b4be76548f53f2a10ce3781ac SHA512 7e711fa0a7cbba580bebb3b8ca6add174a620a8a5bb638e725b9988180142cd5e996957dfa87b7d875efa113ce4d219197cab5c84a886ea7ca5295a6d957ba99
 DIST pybotvac-0.0.20.tar.gz 14227 BLAKE2B 64b7c36c7b42710092ed0747434c388f55d0e1341d6c96894757bf275079c89f197f0e83ce6c755b7aae6af2c102686e5d0a704c5501911cffd70c7881fdac03 SHA512 ab666374ddfc9997418d43139b274e01b5c24130619d90310098504cc56373ad554612da4811e6f1cadd68972624d4117518ba553bd5ca7f91049aa86eda17d7
-EBUILD pybotvac-0.0.15.ebuild 744 BLAKE2B df526fd3f2a4c76d8e31bae6920504df6e027749500cc0660ae72fccb6934488ceda3bae58f687a04b4c478f5eb8e1a5ea28b9f56a546b6ab3abb6401226609e SHA512 9dbb01cd14c5cc6360b67dfc0e4ff6239da25d448a1606b83ac818518e31b67b6b139bc4d4483bb9377acb5187223145187db796b585cd828da03e3228cea14f
-EBUILD pybotvac-0.0.16.ebuild 744 BLAKE2B df526fd3f2a4c76d8e31bae6920504df6e027749500cc0660ae72fccb6934488ceda3bae58f687a04b4c478f5eb8e1a5ea28b9f56a546b6ab3abb6401226609e SHA512 9dbb01cd14c5cc6360b67dfc0e4ff6239da25d448a1606b83ac818518e31b67b6b139bc4d4483bb9377acb5187223145187db796b585cd828da03e3228cea14f
-EBUILD pybotvac-0.0.17.ebuild 751 BLAKE2B df1a6767719a13cf6b59386fd7c833bb4ddfa47125f177d509940ca05a7bdee7fed0d3f52cee506d4020188c4f6fa64ed2e8a6d6c713fc364b92abd5d773966c SHA512 78e064c4b0161d02a99339e3ae64811d30328b05643d53b72a4d184fff5082073ea2e6305abf6055759520c9132166f2ba121195845557f7cc44acf046725838
-EBUILD pybotvac-0.0.19.ebuild 806 BLAKE2B f3c16444b4d976877c4e448f352374e6a7d063b456d01f2215653abf4c14e6a7d8265152495f667c04e0841a772e9890a5555ab7133f080f898167961ec342f9 SHA512 3fe304f74ddc0e5a8a8ce36796148ccfbb7ff16ade3f8ed197e8ddb7ca4e76ce6560672db86b0ab1585cc8d7e35570c03cb18a93418820a0b2b872d3d0d4d4cc
-EBUILD pybotvac-0.0.20.ebuild 847 BLAKE2B 2e2406e2d9c94705ae40018cd9ca1bb542e37b7959ad650c174880fcc0c2a2f169b11e1447495ea18aad0bbbd39f13e273a8afce1f875ffaa659ef265d320135 SHA512 b0381cc34400e2d6a159451190db7ab900e102d76e8a4eb5ae2e4ff00a251fe2926aa96d8961e7303f09dad4abede4aafbfcaa250cf62deee529901168fc076d
+EBUILD pybotvac-0.0.20.ebuild 847 BLAKE2B 9509b09ff59a5d17b17407505f07d3bfd2678e8251ed11fb52b14199ee032dc2536fa03203969373c798b330b1759e4ae6bf88d6766d90b6bd11265d876f04c3 SHA512 254192ef5841f39f35f28d5c019c62e873e4f39fddf622b5838b0b665ebd56e75e30ee44893303dc8e4008a74ecbb2d4f7b12aa2213108bbd12b7247dd0d25aa
 MISC metadata.xml 454 BLAKE2B e720fdab283dda588ef10e9f5ea43f593c2fe5dfe9cfcc32fbc36b96423dfb0422852595bbc3969d6bde26fdfefd851e9289ed36d47d8955fe9e5b3ffc2f041c SHA512 04bb7e9254c1ec22d2c42add4fca9ef0d810d48c3c8a2381db0ca504cd3688d3ce74efeb3fdbb022315380e1241125354a71b43ed899ef31d37c56c9a6764e89
diff --git a/dev-python/pybotvac/pybotvac-0.0.15.ebuild b/dev-python/pybotvac/pybotvac-0.0.15.ebuild
deleted file mode 100644
index 1aaa147da..000000000
--- a/dev-python/pybotvac/pybotvac-0.0.15.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{5,6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python package for controlling Neato pybotvac Connected vacuum robot"
-HOMEPAGE="https://github.com/stianaske/pybotvac https://pypi.org/project/pybotvac/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND="dev-python/requests[${PYTHON_USEDEP}]"
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/pybotvac/pybotvac-0.0.16.ebuild b/dev-python/pybotvac/pybotvac-0.0.16.ebuild
deleted file mode 100644
index 1aaa147da..000000000
--- a/dev-python/pybotvac/pybotvac-0.0.16.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{5,6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python package for controlling Neato pybotvac Connected vacuum robot"
-HOMEPAGE="https://github.com/stianaske/pybotvac https://pypi.org/project/pybotvac/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND="dev-python/requests[${PYTHON_USEDEP}]"
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/pybotvac/pybotvac-0.0.17.ebuild b/dev-python/pybotvac/pybotvac-0.0.17.ebuild
deleted file mode 100644
index 9e7302484..000000000
--- a/dev-python/pybotvac/pybotvac-0.0.17.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python package for controlling Neato pybotvac Connected vacuum robot"
-HOMEPAGE="https://github.com/stianaske/pybotvac https://pypi.org/project/pybotvac/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND="dev-python/requests[${PYTHON_USEDEP}]"
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/pybotvac/pybotvac-0.0.19.ebuild b/dev-python/pybotvac/pybotvac-0.0.19.ebuild
deleted file mode 100644
index 751912001..000000000
--- a/dev-python/pybotvac/pybotvac-0.0.19.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{6..9} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python package for controlling Neato pybotvac Connected vacuum robot"
-HOMEPAGE="https://github.com/stianaske/pybotvac https://pypi.org/project/pybotvac/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-DOCS="README.md"
-
-RDEPEND="dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/requests-oauthlib[${PYTHON_USEDEP}]"
-BDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/pybotvac/pybotvac-0.0.20.ebuild b/dev-python/pybotvac/pybotvac-0.0.20.ebuild
index 3d34c2e3c..89974f9fe 100644
--- a/dev-python/pybotvac/pybotvac-0.0.20.ebuild
+++ b/dev-python/pybotvac/pybotvac-0.0.20.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{6..9} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/pycarwings2/Manifest b/dev-python/pycarwings2/Manifest
index 2265c1cde..bd10cb8fc 100644
--- a/dev-python/pycarwings2/Manifest
+++ b/dev-python/pycarwings2/Manifest
@@ -1,7 +1,3 @@
 DIST pycarwings2-2.10.tar.gz 13024 BLAKE2B 53761fefe59013fc4c0fcd430c33efe4489b2837f863ea3e66e25178d5c0a52341d2f9afc66c4c6a5b0b90896fdef66338c249adda0b5e9e8d313256f1e406f1 SHA512 d792e675a38495986272317a679c83a4534897bddec3a6e569fc78e9725ecab6a9c4df2b6fc9aa950ac0c65728374741fcf906e57ac6d077fdad242f0683ba17
-DIST pycarwings2-2.8.tar.gz 11802 BLAKE2B 0b526985300ef3dc5e6da72a5d266f69218a889dcc4bff385bd8104e707d614a2dad12f93a548ff34a452a2aefedee0d248dce86b0c25c42641b3012c8152b25 SHA512 a779a8dcdd12679602a57ef2f5004868fc529a10107aa5c4201ca695aacb68ecb4185d61eb7959dd8916afbd2b4e2a1dff9eb1e47806f9c832350e997f74fcba
-DIST pycarwings2-2.9.tar.gz 12968 BLAKE2B 9f78943eb00fd78c679d1dd4eb7f48956c4cda0b042d325e0b6acb79ecd1ad062e0e1ef82dcb6e71285f901195cf7ab635f06b08a695f3cbb1dc029ca310546e SHA512 ea8da91887c8cf69d26a26fc19ede294f304cc753c891008b602fd35b29119427cdb969f27cf41bced6dc9c21ca19f487e7d46a3f6ac17eaad4bc9b51d22da27
-EBUILD pycarwings2-2.10.ebuild 898 BLAKE2B 576beea999b566e9fde26250e740115eb2c32db9ceeb2b0da85af0aeeb90f6429cd31624c29a1227ce5bf553ff79dd13808ded9aed8ee967d15774e0b899cb4c SHA512 dcb49bcc14aa1ac1bd9000e183c9c78b30371982d57fe1ffd28284c01682e8a14e83550b8e4675507a2d883aac8623316ef9fd27e0213137f56cc9b018f4a354
-EBUILD pycarwings2-2.8.ebuild 727 BLAKE2B 56022a7a87e5a0d17749d95bee1be24aad9a428ddae2bdde372ed0441d7ddf7d5d590aefa487364146f2652185dec360dbadc608e6667d074ea2ceb88a6058fd SHA512 0da18d9f225d313d3d41cf73ec930844ebce16c1fc169ef1f7180565475e92df1596abb45d6d7b27630a653338e78641db2a78cbe9f213bf66caae572ae6a514
-EBUILD pycarwings2-2.9.ebuild 889 BLAKE2B fe4368ae7b20dc66f485746055e35aa3ba9c47eadd8583a06754162a1af7e0fdd2be81ba0b03c0b90f1933c02759710d96a021bf993fb82e94fadbf54695ea8d SHA512 8dbb5d083726de3a90384799f075491ee8a858302d90f0782e17973913a66bd92803ede0e95f2bd4bfdea9b4b47df93ba229f2523eed052001a6278da9ed114c
+EBUILD pycarwings2-2.10.ebuild 898 BLAKE2B ef235fece441e1d4c9d8d4bec7aae15a1b04730542a33406cb624defa7ad4c5c5bffd4cb8b0c2e367f02d24f0f884edfe98a327441cad2e7f4bc4e0d42bd77d7 SHA512 9ad5d5ddaf6241ab7d9e7bcf9596e3cf786c72285e872e73d0bc5da1b717654f63696140a8a4098799963e0163e35abb5b2b17a8533da2c7e81472ac6e55dbf7
 MISC metadata.xml 450 BLAKE2B 4689c334c516c8dc81cd3ad601d12a065d7c156a84f03a8db1d2f63bb59f69c32496eee5b36ec7c2487ea1d542efebb3f6e140ac73c23096622651dfe8c51432 SHA512 e84ae03382ef74ea75a0ca6ec90edbd0e469d3fd9c058168175767e86bb17e00b38b7fa0ac869e7b1793e641c408ecb09761741023386e66671ac454bf8fe271
diff --git a/dev-python/pycarwings2/pycarwings2-2.10.ebuild b/dev-python/pycarwings2/pycarwings2-2.10.ebuild
index 9b51b9e3f..508aa6bb2 100644
--- a/dev-python/pycarwings2/pycarwings2-2.10.ebuild
+++ b/dev-python/pycarwings2/pycarwings2-2.10.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{6..9} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/pycarwings2/pycarwings2-2.8.ebuild b/dev-python/pycarwings2/pycarwings2-2.8.ebuild
deleted file mode 100644
index 93f68f2b7..000000000
--- a/dev-python/pycarwings2/pycarwings2-2.8.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{5,6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python library for interacting with the Nissan Leaf Carwings telematics service"
-HOMEPAGE="https://github.com/filcole/pycarwings2 https://pypi.org/project/pycarwings2/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/pycarwings2/pycarwings2-2.9.ebuild b/dev-python/pycarwings2/pycarwings2-2.9.ebuild
deleted file mode 100644
index aa1870e1b..000000000
--- a/dev-python/pycarwings2/pycarwings2-2.9.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python library for interacting with the Nissan Leaf Carwings telematics service"
-HOMEPAGE="https://github.com/filcole/pycarwings2 https://pypi.org/project/pycarwings2/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND="dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/pycryptodome[${PYTHON_USEDEP}]
-	dev-python/iso8601[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]"
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/pychannels/Manifest b/dev-python/pychannels/Manifest
index 0e9d7a55f..276ff3bf7 100644
--- a/dev-python/pychannels/Manifest
+++ b/dev-python/pychannels/Manifest
@@ -1,5 +1,5 @@
 DIST pychannels-1.0.0.tar.gz 1683 BLAKE2B 2a8536dc8c7d4c51001ebcd2425855798d73e83969bfadf90f7c066a3df443060d30baf635e75c3ac8d2ff53ce86f6595c8ce60a97cfcc3ec09520ddcb8678d1 SHA512 e966aaefd293d3c08a53ec1e69f08ea59e36abe4a2b59737ff15cd86a9d2f792183509a410fbac559ce6690569fbb1db1d1ac634214cc6f81fc4e95bae2856e7
 DIST pychannels-1.1.0.tar.gz 1718 BLAKE2B 288b0a3f7f7fb00dad00a775cb18fb4fcb2212d8d45624833562df0e13e6a4a6113619f89473f500611ed36741572069f372fd9a00b245a03f85a37811cb4cf1 SHA512 e8715141d4c763a4fae72f654c7bb6c7b974a9165d4186538d49d6539256abcba567912faac039f37a0b26e2efe7a618b9f3d9aa56af54be84890d1519cc8a26
-EBUILD pychannels-1.0.0.ebuild 700 BLAKE2B 55eb359d8f629d002561fe0255d147fb761887b85ac6770332239d8ceab56732a4a4530935d4b2d5d9775953aa9bd43af2074bec62f82c787816c4c2837ef99e SHA512 d2a5b65151a1d7e731a6a1ddf86e5a2843516ebbccea57d6b7d755152260b3fe509a04018811bdf4f8ba79d3573b727c9abba17855f2d80e2556e660c68b5733
-EBUILD pychannels-1.1.0.ebuild 707 BLAKE2B 878fa29a2d0f5816de2d273ba78e7dc1edd39c5692323ef6da41efaddd54ecf7c1ec695d988895990b364aed5bd23aa8a0ddceeaf22c8cab6c989d59d9faa0fc SHA512 a982d4dfdf334133c1b86bdd1a2fa69a821cc682661c22b8a3a4115af815648c126538050525684cd922d777846969d5d8fcaf04ed224f40334a781f731c09fb
+EBUILD pychannels-1.0.0.ebuild 699 BLAKE2B 49ed743ccc6db5b568fa79f403ba4a602a9ced4ff6a3c29711310d6af63d3a0f3a1ce46d3cf17571070cdd19250a778ae752abb568b80d88980ef6f26b19faec SHA512 7bc2020db7ab3892c79c4fe157210639039997614409a107e824e5bcd60c21fe5c9283ab0dad5ad6f915022836f0ee51a59a7a20c380ab774ddc43978bbf4013
+EBUILD pychannels-1.1.0.ebuild 706 BLAKE2B 16558dcd98a46718862f595e9d7f34b56aeaf362a2f02cc5b51a864552c3ebbc48e170ac91d7d22fec720dc0bc57c14b5b93dbaa9e7d690080d401e6367eb301 SHA512 ffeb1399f4e5138d4bca1fb1c2b5f443465760be5f11746a799a0b9263d0bbe4a0976b536e8cbfdbf7d766d5e961bc969800f05d4a041d7b4268b89013a30e3d
 MISC metadata.xml 457 BLAKE2B fa7ec86c88d44c850aeb56d783b465dd3c472ecb075c26859fdd5dbf05d5b7f742d71a41da8987960e74f499234c8adc7b8906e9d7935e373de184dce3776ca8 SHA512 bdb443013138ac36ae27e35554b6f809c43f7054814667aac48b591b40012bf2eeba24041b827005961be1c9e56b7b2746e486429a8b7a25a01cdc096a7638d7
diff --git a/dev-python/pychannels/pychannels-1.0.0.ebuild b/dev-python/pychannels/pychannels-1.0.0.ebuild
index ed1567ba0..9d4a9671d 100644
--- a/dev-python/pychannels/pychannels-1.0.0.ebuild
+++ b/dev-python/pychannels/pychannels-1.0.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/pychannels/pychannels-1.1.0.ebuild b/dev-python/pychannels/pychannels-1.1.0.ebuild
index 80c9962aa..f779b9b62 100644
--- a/dev-python/pychannels/pychannels-1.1.0.ebuild
+++ b/dev-python/pychannels/pychannels-1.1.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/pycoolmasternet-async/Manifest b/dev-python/pycoolmasternet-async/Manifest
index ae74747c4..cf9580d9c 100644
--- a/dev-python/pycoolmasternet-async/Manifest
+++ b/dev-python/pycoolmasternet-async/Manifest
@@ -1,7 +1,3 @@
-DIST pycoolmasternet-async-0.1.0.tar.gz 5075 BLAKE2B e74063cca0a3b5e35104f6599949c92eee20ddaac5189ff4dd31f20fe064830b218e3e0c5a28ccf14cc47fc5ace28c0ec996465c39ad28a63b8e2007a19ed9ff SHA512 876ff44227953702a6c6f2b5da411e07dd0e8ed58e311787b8bafc401f33988eb9998cab79e0f76c031fb7c6049335150168bfc2b3fc2cb4ad98eba3207a967b
-DIST pycoolmasternet-async-0.1.1.tar.gz 5041 BLAKE2B 2d1e7babdf8f2ba530fd4797be528c05bae425c138383ab2306e69fef775b91653b30ce7b89485d64f6aed21807f2c7bb295a64302f96d05d37890b98912fdcf SHA512 404c8db2432fb54c7e708bdc8e27a765081dcf4d446cb610d395ba7f5ce4f787ec117d7c98fc77de238b4b3468915c0f08410601493e6fbb9c7a629f7870056d
 DIST pycoolmasternet-async-0.1.2.tar.gz 5043 BLAKE2B 45429dc50158d51530f3c388ef69611937ab4b8cbc0f65107cd050c9441df49db450b49b0cfb16168c70e60ec731e8bc9109740c33b30cca7f7fbd0afb1c9d81 SHA512 3b5203b1e6df634349d19c570a4ce462196298f5e730356ca6b4d6c9473cc4b2ea97369c9c1cd0c0a4f796b295abb9596924d737c60ed38ef472771c9a669580
-EBUILD pycoolmasternet-async-0.1.0.ebuild 739 BLAKE2B a5be7073b54de7d4372c08e197f26062b303078cb48f4b597c2bce331686a053952f3d4f9fababd71e709614120145d14e617384ec7ab00910102a8f84dfa3bb SHA512 2091815360eb5582e281cc11919fa83d38c3f2aed0e2f23cab4cca8938e00920fb5f191d39a2820b2d3ca77e8067bfc62e8afa741006e55edb8548e74e968911
-EBUILD pycoolmasternet-async-0.1.1.ebuild 738 BLAKE2B d570f373d30361895bee4c27144ae33974c881c80da59c82aa119d63f936fc69136f54addd5278c0ed7efeb577ce9205494c48da0fa072aad3c44ebd63a120ed SHA512 38aafb54f98dbcaadb36ac4fb195147538318cc9f5db4e3490313b958343da310f4a06be54c169db9030e38602a36d0013ebc51bc8b71dbdea8a4c1b317d97d6
-EBUILD pycoolmasternet-async-0.1.2.ebuild 739 BLAKE2B aaaa72a6d89d7bced2cf8ed1ddd4e1174f2b87269db09d31bbe628384062ff49d5e0da2b39ce6ad50753cc367601381cdf2ebbb98c849f7acdb93c865b1a3fb9 SHA512 0c249d13878e4301ab2e8c6fdba44d7c3e24336e8d7bd15f1b31e04ccc445e7d1b66cfc3e40901bdd0d065b2995bdfd0d33e28a75b884ec8caefd7adde8a5a00
+EBUILD pycoolmasternet-async-0.1.2.ebuild 739 BLAKE2B 8920bc546f05d87764521daddcefebfe44bec6a34c9e05add0ad33084f985438416ba367f717d119a916ab453c5f09b56f85fdf9dbf7491beb6510c957bf503d SHA512 5b1b4bc7fdd28d6f87fdddf13476e3bb4f7b9452bead2d3a3a29aa161df8311b395d7fe59e0565b10305049315b007da7a05b261dde45703ee55819060c1e205
 MISC metadata.xml 461 BLAKE2B a50dbfcfbc0b667a5ef1c3be08f2ccc35f34f935c9e8c4ba76a8b4de0b2d0b9783593a71a27c06b2e8fa670a1e042adc6372ef5821cc29fd95a609cfb6a57029 SHA512 156e2a09247f8a8ad458ef33af9eb570876262ccf9f138d976c92364a1398184b11c301e87c1d100b2970b6ad35c79ee1140a23d8e08dccfc59baa969ab7079c
diff --git a/dev-python/pycoolmasternet-async/pycoolmasternet-async-0.1.0.ebuild b/dev-python/pycoolmasternet-async/pycoolmasternet-async-0.1.0.ebuild
deleted file mode 100644
index c9fce9f4a..000000000
--- a/dev-python/pycoolmasternet-async/pycoolmasternet-async-0.1.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit distutils-r1
-
-DESCRIPTION="A python library to control CoolMasterNet HVAC bridges over asyncio."
-HOMEPAGE="https://github.com/OnFreund/pycoolmasternet-async https://pypi.org/project/pycoolmasternet-async/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/pycoolmasternet-async/pycoolmasternet-async-0.1.1.ebuild b/dev-python/pycoolmasternet-async/pycoolmasternet-async-0.1.1.ebuild
deleted file mode 100644
index b954dace1..000000000
--- a/dev-python/pycoolmasternet-async/pycoolmasternet-async-0.1.1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{6..8} )
-
-inherit distutils-r1
-
-DESCRIPTION="A python library to control CoolMasterNet HVAC bridges over asyncio."
-HOMEPAGE="https://github.com/OnFreund/pycoolmasternet-async https://pypi.org/project/pycoolmasternet-async/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/pycoolmasternet-async/pycoolmasternet-async-0.1.2.ebuild b/dev-python/pycoolmasternet-async/pycoolmasternet-async-0.1.2.ebuild
index e5018893e..bb61af35e 100644
--- a/dev-python/pycoolmasternet-async/pycoolmasternet-async-0.1.2.ebuild
+++ b/dev-python/pycoolmasternet-async/pycoolmasternet-async-0.1.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{6..8} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/pycoolmasternet/Manifest b/dev-python/pycoolmasternet/Manifest
deleted file mode 100644
index 48828e088..000000000
--- a/dev-python/pycoolmasternet/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST pycoolmasternet-0.0.4.tar.gz 3499 BLAKE2B 26ceac578031a54d481d577c92bd4ae976b28b0fe029d21fe11a9a4f6ccb659663af9d09c67c849a1f0025841d6c3c3119bc6122ef6f49c0c1bef0ce88322a80 SHA512 0a0b386e978e6d2bff129dc0c86eaac4cea0bf8313010fd087c90cca983025aac1e5cb1f74d9e01aa5f786835359028864c58567e7b8b168a1c4e40e51bc6a58
-DIST pycoolmasternet-0.2.0.tar.gz 4274 BLAKE2B 5da5a720ba4033ecb8be4a655a1393220b0660b3dfe12775b604f99999ed770bd454efb0e38508060d13c4c29b1f37db10b4940d4cd508b615637330b440a2b1 SHA512 ffa8866c33466b7024da07b6beb091f937ac89d12715e7c160557c3975e51f7c1d637f458162500f9ef8b5baf1c3d62d33791643a00ab6bac9b3df88d27db438
-EBUILD pycoolmasternet-0.0.4.ebuild 701 BLAKE2B 199194d110aaa993ac2bc674d90f1723a6cebb049ec36cbbfccd1997bdcab1c358febb7b665a3f68f95d992548fd41c9dac88dee6c3ad2224a53c2692b1b6432 SHA512 be8ee37dea0d4174f2fca6457ffb5b39f7e41b66d71cf347819dcd248b1d2b9b17947a8fe01f05049bced04ec86bde0dae32a2f1c3af2965043b683f3454d8af
-EBUILD pycoolmasternet-0.2.0.ebuild 710 BLAKE2B e9f50e6441f150a603687cef894f6cc744c9029a54f83db1e4516dee722b4cb72ab963fcfc9033a0c55bfffdc9df8ed80b965a61303f7a0004d1db683beed8fa SHA512 3eb61760a1e5d4cd6dc809261c3c514bd08e84e52007d45780c109011c21735c31c0e0f54d1501a6a82fb2d51a6c997f46e1a670a262ca946439a23d3eda4bb0
-MISC metadata.xml 456 BLAKE2B 3d399e9bcf9f971c966e2c6530f31d4f80414deaca27afbe5377b5f65f02f1704c2d3e03df3974cec85e268a619100742b5295f2d7d85aadc66226b43e34b2b3 SHA512 bf47baf50fc9ff9d6786d64f3007d3b368a2b5966a641b16ce4d506153dd8ea9c30ab6e472e1601e9313863978d7dc263cfdc218c09a377b37d18836ebe5dd57
diff --git a/dev-python/pycoolmasternet/metadata.xml b/dev-python/pycoolmasternet/metadata.xml
deleted file mode 100644
index 64fcb071a..000000000
--- a/dev-python/pycoolmasternet/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>b@edevau.net</email>
-    <name>Andreas Billmeier</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="pypi">pycoolmasternet</remote-id>
-    <maintainer status="unknown">
-      <email>koreth@gmail.com</email>
-      <name>Steven Grimm</name>
-    </maintainer>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/pycoolmasternet/pycoolmasternet-0.0.4.ebuild b/dev-python/pycoolmasternet/pycoolmasternet-0.0.4.ebuild
deleted file mode 100644
index 028e259bf..000000000
--- a/dev-python/pycoolmasternet/pycoolmasternet-0.0.4.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Lightweight Python API for CoolMasterNet HVAC bridges"
-HOMEPAGE="https://github.com/koreth/pycoolmasternet https://pypi.org/project/pycoolmasternet/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/pycoolmasternet/pycoolmasternet-0.2.0.ebuild b/dev-python/pycoolmasternet/pycoolmasternet-0.2.0.ebuild
deleted file mode 100644
index 3f8ed8514..000000000
--- a/dev-python/pycoolmasternet/pycoolmasternet-0.2.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit distutils-r1
-
-DESCRIPTION="Lightweight Python API for CoolMasterNet HVAC bridges"
-HOMEPAGE="https://github.com/koreth/pycoolmasternet https://pypi.org/project/pycoolmasternet/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/pycryptodome/Manifest b/dev-python/pycryptodome/Manifest
index 94c366679..75caa94ff 100644
--- a/dev-python/pycryptodome/Manifest
+++ b/dev-python/pycryptodome/Manifest
@@ -1,14 +1,7 @@
 AUX pycryptodome-3.9.4-parallel-make.patch 756 BLAKE2B 06a79eff056ecb983131838287563d4d60896f27e28d5c2534f4ab008e50017694ac9355b43f8f387cc29abfd21ffd648233c3dbae33a06fcedb12a6c7e11e80 SHA512 06b42ea780bd374cf5cb5d6cef3fade5d695c1ee0d765e2659408da7645ad311eef2028f17d8ec0289d49c3a5851b4c63503d7c922de15873dbbf16d0db58b08
 AUX pycryptodome-3.9.4-tests.patch 2201 BLAKE2B 93bad5e716c968c1d1b765c0506f5e46680d3f1b71a89e6b6cc17c73475ca44433f75f03661bb5bb32905a9898c10ab13167e883a5240d08e540c6bf5adcc06a SHA512 8154064bcda7a4d7d9e87be09f1ecfdc1a7553b9fc82d7f9c7c9c12cef216d856d6135925c0cca64708e5f3f8009be27a97405ca7d31945af89248f77a0b8f5f
-DIST pycryptodome-3.7.0.tar.gz 7180132 BLAKE2B 1befc6704e50bf74b277cc76ac73518e4a25ab8fe811ee8347eaaf74d5534b5c2bdc9821b36e9658d83d88d096b73a31cb5b93d245ae541402a20140220741b6 SHA512 8a25ad339901cf0823f8035380f514de1b86a2468ba303b6c5c3f27cc0bea7cb0ea6d7e911e57b1e5a35d3089b0290f4dda7670525ce33b7e8dfb6b3277e1ecc
-DIST pycryptodome-3.7.2.tar.gz 7192874 BLAKE2B 25f9e1f318e5256679f49eb0c59d4d94765b7e0c21a8590073c6e2fc06d5b6cffc18a1623736bb0e016eaba688be380b117f9c8d2c954c60fceb2305777afca7 SHA512 f505d2fccb272bf5cb3f3fc1c3c77cafe809303f0c108e8d1b128c7a9567dff20384bcccb91fc5f80a0e847eec34f2629f9ddd1cb90580e00426044feeea467f
-DIST pycryptodome-3.7.3.tar.gz 9285823 BLAKE2B 6f215a3bb0337f5b7469d92bd2d5b5a19ab4e2c6a8f119411c3a5bcdcf93307752d99113866268b5066cceda6470bd0fbe81b1b2f9e30b5e5e569c77ede087f3 SHA512 b5e09c08cd252cad4d76249be84ce29e16a9bba4f2c5e81594c24d9a39df0f3fc67822698497eb9daa4cb6a43311c5d5a2543f187a5d5f801288596c2941f08f
 DIST pycryptodome-3.9.6.tar.gz 15451600 BLAKE2B 4eea059413ca09944fd234693c83a9c559ddbc3ca2d2d26b27f5df96925b20202621608737bf2d930ba63e3d0518da6e25a172a7097139cf859e224186615884 SHA512 c1fc4dc9e993d77c6928d0accdddafb4de4157a6db8a4c0f81fa7eb75a529a1cff04db77ff0d926a29030c98549329143b4bb2bbf198ef8811d7fee9803a8f2a
 DIST pycryptodome-3.9.8.tar.gz 15633268 BLAKE2B 8c4f8d4839be0fb09556677514ee6c7f832684f20eb4e355cee87eb5b52a5c09e12712c1865ff89fb5dd6c628ca027374c7cab8a2287aafa4eecedf1095f1a12 SHA512 894e763720df284804fd686d5805980853b86773bb3097bf03d929818b9944e5a257e47414275f302966864751e50ae34dea19ad749910f1ceac31833a53ef7c
-EBUILD pycryptodome-3.7.0.ebuild 735 BLAKE2B e8b94a9940c5b03d708b4511047a94d92b318e1dc553359bc6956b86f1f68bf046bb8afb8bc6ec0d0feb2818d2013fbcac96ccf3197aa5163e0874e1ffe5acac SHA512 54adb5fd7433591d2d938315d1c6cd58376a0bf3f1917ba505b515f164c9b0659086232b1bcab5c383b3ccff372eed6820b633c03a3ef8d065d80d08a0990b3b
-EBUILD pycryptodome-3.7.2.ebuild 735 BLAKE2B e8b94a9940c5b03d708b4511047a94d92b318e1dc553359bc6956b86f1f68bf046bb8afb8bc6ec0d0feb2818d2013fbcac96ccf3197aa5163e0874e1ffe5acac SHA512 54adb5fd7433591d2d938315d1c6cd58376a0bf3f1917ba505b515f164c9b0659086232b1bcab5c383b3ccff372eed6820b633c03a3ef8d065d80d08a0990b3b
-EBUILD pycryptodome-3.7.3-r1.ebuild 714 BLAKE2B a4aa3f6a9cc09288b3f9a65f375bb2fbfe83ca91d97132a898fdb25675b80cb256d8c0992d0a8877d9325f019f84f55f0d904d27d0b9eadc35edc9cc1f6bd3d4 SHA512 4fd3d69893c4930a5e649680697f34400d31253fb00c033abb838b7e749e8a34d524af258789343999abf23e25661265a4ba3a2f60a9bfce91178425c1fbe804
-EBUILD pycryptodome-3.7.3.ebuild 735 BLAKE2B e8b94a9940c5b03d708b4511047a94d92b318e1dc553359bc6956b86f1f68bf046bb8afb8bc6ec0d0feb2818d2013fbcac96ccf3197aa5163e0874e1ffe5acac SHA512 54adb5fd7433591d2d938315d1c6cd58376a0bf3f1917ba505b515f164c9b0659086232b1bcab5c383b3ccff372eed6820b633c03a3ef8d065d80d08a0990b3b
-EBUILD pycryptodome-3.9.6.ebuild 1485 BLAKE2B 2e48f2518cff057f55cfcdd0d4c2b9d7e551e4d7888bd25d9b5e3e124e3044411ec15bb58ffffb3e8b35de43d82ba19fb555096c4138d9045dbf7becfab594cb SHA512 2378842ac4337a3f6892e1270193bfacfffceb7355935968b071f2d92de4199827acaa34e620d61826e7d90d528a130d9e70b2dc0d85e7297a90afbe8ec3f0ad
-EBUILD pycryptodome-3.9.8.ebuild 1485 BLAKE2B 2e48f2518cff057f55cfcdd0d4c2b9d7e551e4d7888bd25d9b5e3e124e3044411ec15bb58ffffb3e8b35de43d82ba19fb555096c4138d9045dbf7becfab594cb SHA512 2378842ac4337a3f6892e1270193bfacfffceb7355935968b071f2d92de4199827acaa34e620d61826e7d90d528a130d9e70b2dc0d85e7297a90afbe8ec3f0ad
+EBUILD pycryptodome-3.9.6.ebuild 1468 BLAKE2B 403b839b415da5adf2cfc6d1399636d0447d2d1e96663643f39b277f144b6d20bbc7454a55f7c8ed5fb0d9af0a3022942dfce6bb181a1d0b2a4d9d69c5c064cf SHA512 955c416cb8249128855904f9b913884f1d82eaef50805a03413461c58d07bda8753da2e10151c895892bfcd1bfb7bb59a33cb5339942e31c73ff689993885a01
+EBUILD pycryptodome-3.9.8.ebuild 1468 BLAKE2B 403b839b415da5adf2cfc6d1399636d0447d2d1e96663643f39b277f144b6d20bbc7454a55f7c8ed5fb0d9af0a3022942dfce6bb181a1d0b2a4d9d69c5c064cf SHA512 955c416cb8249128855904f9b913884f1d82eaef50805a03413461c58d07bda8753da2e10151c895892bfcd1bfb7bb59a33cb5339942e31c73ff689993885a01
 MISC metadata.xml 455 BLAKE2B 85d76bc452c28d7776686cb0c904b8d12f383110b29219e97a88e3f913c3b1605d917d84df20f94787b6b6ebbad99f5a3f5970e8983f90fcc83512fa98a2c03a SHA512 bf7e03d29b8a17f2c8b6b5524183f965ca21c9218cf6ec5fa64ce850f11a7ac7a628c5b43b8919867fdaf94892444acc28ed292bb68339b3e5c433434e608b36
diff --git a/dev-python/pycryptodome/pycryptodome-3.7.0.ebuild b/dev-python/pycryptodome/pycryptodome-3.7.0.ebuild
deleted file mode 100644
index e04aa0f6c..000000000
--- a/dev-python/pycryptodome/pycryptodome-3.7.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} pypy{,3} )
-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.org/project/pycryptodome/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD-2 Unlicense"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND="dev-libs/gmp:0
-	virtual/python-cffi[${PYTHON_USEDEP}]
-	!dev-python/pycrypto"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-python_test() {
-	esetup.py test
-}
diff --git a/dev-python/pycryptodome/pycryptodome-3.7.2.ebuild b/dev-python/pycryptodome/pycryptodome-3.7.2.ebuild
deleted file mode 100644
index e04aa0f6c..000000000
--- a/dev-python/pycryptodome/pycryptodome-3.7.2.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} pypy{,3} )
-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.org/project/pycryptodome/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD-2 Unlicense"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND="dev-libs/gmp:0
-	virtual/python-cffi[${PYTHON_USEDEP}]
-	!dev-python/pycrypto"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-python_test() {
-	esetup.py test
-}
diff --git a/dev-python/pycryptodome/pycryptodome-3.7.3-r1.ebuild b/dev-python/pycryptodome/pycryptodome-3.7.3-r1.ebuild
deleted file mode 100644
index e02ff9f70..000000000
--- a/dev-python/pycryptodome/pycryptodome-3.7.3-r1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{6,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.org/project/pycryptodome/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD-2 Unlicense"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 x86 amd64-linux x86-linux"
-IUSE=""
-
-RDEPEND="dev-libs/gmp:0
-	virtual/python-cffi[${PYTHON_USEDEP}]
-	!dev-python/pycrypto"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-python_test() {
-	esetup.py test
-}
diff --git a/dev-python/pycryptodome/pycryptodome-3.7.3.ebuild b/dev-python/pycryptodome/pycryptodome-3.7.3.ebuild
deleted file mode 100644
index e04aa0f6c..000000000
--- a/dev-python/pycryptodome/pycryptodome-3.7.3.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} pypy{,3} )
-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.org/project/pycryptodome/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD-2 Unlicense"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND="dev-libs/gmp:0
-	virtual/python-cffi[${PYTHON_USEDEP}]
-	!dev-python/pycrypto"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-python_test() {
-	esetup.py test
-}
diff --git a/dev-python/pycryptodome/pycryptodome-3.9.6.ebuild b/dev-python/pycryptodome/pycryptodome-3.9.6.ebuild
index dc1707ddb..b6cf5d034 100644
--- a/dev-python/pycryptodome/pycryptodome-3.9.6.ebuild
+++ b/dev-python/pycryptodome/pycryptodome-3.9.6.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
+PYTHON_COMPAT=( python3_{8..9} )
 PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1
diff --git a/dev-python/pycryptodome/pycryptodome-3.9.8.ebuild b/dev-python/pycryptodome/pycryptodome-3.9.8.ebuild
index dc1707ddb..b6cf5d034 100644
--- a/dev-python/pycryptodome/pycryptodome-3.9.8.ebuild
+++ b/dev-python/pycryptodome/pycryptodome-3.9.8.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
+PYTHON_COMPAT=( python3_{8..9} )
 PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1
diff --git a/dev-python/pydanfossair/Manifest b/dev-python/pydanfossair/Manifest
index 66a9f7e4c..c1ae7a5aa 100644
--- a/dev-python/pydanfossair/Manifest
+++ b/dev-python/pydanfossair/Manifest
@@ -1,5 +1,3 @@
-DIST pydanfossair-0.0.7.tar.gz 2356 BLAKE2B 4826918ce0967034c6988effd5c738bbff19292d2065381b126941f1735acf4b33e9d90f59b1fe74665e23f1ebdfddee7db2eecfb3479854319e0317c4889a36 SHA512 ece2d20793cc006d5864e089fe881ebc20e72c4aeadcf64964583f9147f613ec78abd1caf1bf5423c5ed7e6838471e5fbff333d85003af9c97fcabea4db8f7cb
 DIST pydanfossair-0.1.0.tar.gz 2664 BLAKE2B 4bc8aec9800338c7471daa0808806e27c26c1a0f45a0a60080a83f527a6dcf06240185230ba9bb7b9bd80da67bbac88f26a1bfa26534fe7a66bf0ad597932f1d SHA512 d95d3629890fdb7c58459815f815542986fb10f71919fa12bdb288eefb28b1424df66d3fbfdc5755924401a481b0ce9c5a4ed8a810e3971c2118ffdf6e9ae1ef
-EBUILD pydanfossair-0.0.7.ebuild 696 BLAKE2B fa0b0d17517c519fcbd3d533876f2fe030e6ba13571e03a0d60ae238c15098f7203ab9e4990eb7812705058472cead9e0854cca7619ae6ba4bf5138139542087 SHA512 15f2821111e4047dfbaae6434bc70b122d3dcd932b56065f4f91c9f936046d9dc7b0312f39c70059415ce2b5456bd3747b119d78680fbd6ae93fbf47361463ca
-EBUILD pydanfossair-0.1.0.ebuild 705 BLAKE2B c21177483deef70e964f9ca6b3be0a1e8cf72385f4ed88b11b75f3052a18ef0949ff6dae23f4708c3d0b13ce42bef5e56b53edb50afc6f981b3eab9319f03792 SHA512 8e68ccbc5ec04cb48b910881ec0a408bb76a65c9e84e9d5b76c94667983a1a7fa22330bf290fd8c700927af03f66f9537872870b69923f4ecfc5cb89073789cc
+EBUILD pydanfossair-0.1.0.ebuild 704 BLAKE2B 156b496f52bff0658916128e1014be81a396a04e055f94e4f9a08f0b96cfba58caee796328b91f71ce165b4a01b299bc11fa6994645fd0d241d5a6cda83521e4 SHA512 748845d8139eff9bbf395b6cad487a0e52f50216798ef5dda964e3b1f9a3c241e25f290f691c7d4f36e902bb12c4676091944c4a0ec0a23e17931098ba68fb44
 MISC metadata.xml 459 BLAKE2B 80582afbfd56eeb59216ce7864c9fa33b9f28fbad06cf57e6640e874bf4d53159bbaa8db1809e447b87f6c3c46b24191541b81bf7f74daf95ce1d7583a0ac334 SHA512 b116f06bcdd1ecc01c591fe004d64e637565c69d81e6b82d7a5c40b7a23d25903c59fb76929d49d3a1f50e7ce94f613e50b0e707ea90056bc26784885b2f1bb3
diff --git a/dev-python/pydanfossair/pydanfossair-0.0.7.ebuild b/dev-python/pydanfossair/pydanfossair-0.0.7.ebuild
deleted file mode 100644
index 93fc2731c..000000000
--- a/dev-python/pydanfossair/pydanfossair-0.0.7.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{5,6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python interface for Danfoss Air HRV systems"
-HOMEPAGE="https://github.com/JonasPed/pydanfoss-air https://pypi.org/project/pydanfossair/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/pydanfossair/pydanfossair-0.1.0.ebuild b/dev-python/pydanfossair/pydanfossair-0.1.0.ebuild
index b2cdb1ecc..9723089f1 100644
--- a/dev-python/pydanfossair/pydanfossair-0.1.0.ebuild
+++ b/dev-python/pydanfossair/pydanfossair-0.1.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/pydocstyle/Manifest b/dev-python/pydocstyle/Manifest
index 80039112b..a903707ec 100644
--- a/dev-python/pydocstyle/Manifest
+++ b/dev-python/pydocstyle/Manifest
@@ -1,9 +1,5 @@
-DIST pydocstyle-4.0.1.tar.gz 31432 BLAKE2B e724bbe36ca14b353ec350f6e774d83ee4a611bffc9ff027a25ab9a6dfacdb954226c0d84491ff1463fd98598cbe93f67219dcccc65d8a3012ec55f1a5903a51 SHA512 c15907591693547dffc44fbca9c57786247ca2c97c19f84b88cc522ed94a1d8327ea037a143e4ca3edcae5bd112c7164889e9bfdc89c7ddbc13a1fbd080fd3b8
-DIST pydocstyle-5.0.1.tar.gz 32515 BLAKE2B 750a0c216ee246935ebf17b59e22e6386ce1dd537040f262d6eaf44405e0c33e0af7c69f8b6ecadbcea9fdd37086596aca9353caa2ed2a7a60e078ea08baefaa SHA512 0e4c47aa0953cee9e0a016d3ebe175d9b8a6ae71730135648ffd0edc6ca7c7265f28bc4998c689f9c950399dcc3a49f59d7bb9c33709246ee4b0226dbdb5d04f
 DIST pydocstyle-5.1.0.tar.gz 33048 BLAKE2B 36299fbc15503c3bfae676b77ba0540dcd65a9c0e452b98be0b92a208a0889289b405305128e97442ea66339902ae125808368244a1fa072a3fd778519e11893 SHA512 519522a674433159512ee4bb26b31d50f6cc249e5d3d1fcaa4077c8c1e342e6beb623406330123f0541b817d8fc02de1d2b1b799bffb482fa26f1ba38dc5ac7c
 DIST pydocstyle-5.1.1.tar.gz 33038 BLAKE2B 36831e6c995431f699119fe8f8884b3e9743769c221474686d75f96632295a8689e617d940d1e26e0116dd6b72538cc34e71267fbce67ed000eba22f8bc384e0 SHA512 55416d6ad646ad2e1978809021c5fa2a9cb70993c07b7b7f7ff4fb7fab9a2694221f3c859edf04fc2b56a022d72e784569a16a8562d18abba4c052f81b78e761
-EBUILD pydocstyle-4.0.1.ebuild 719 BLAKE2B ecd52665ae81b00e7df3ca32f7230408187caa8ef65d52475217873a28588c70bd90f64a5ac352e491923c865ed281d3ea6ee0a34f566a4bcbe136a0e874654f SHA512 ce4bb278b23e4edd572ed9ed6f7d783304a7bc50e8db6ab79f2c179c57dbfbc357c629dea7847cbfbf803285f2d39d762a33a7d663989ba6014b6b84e903f656
-EBUILD pydocstyle-5.0.1.ebuild 719 BLAKE2B ecd52665ae81b00e7df3ca32f7230408187caa8ef65d52475217873a28588c70bd90f64a5ac352e491923c865ed281d3ea6ee0a34f566a4bcbe136a0e874654f SHA512 ce4bb278b23e4edd572ed9ed6f7d783304a7bc50e8db6ab79f2c179c57dbfbc357c629dea7847cbfbf803285f2d39d762a33a7d663989ba6014b6b84e903f656
-EBUILD pydocstyle-5.1.0.ebuild 902 BLAKE2B ffcc784c67d72c8abe8c2371aafb94ee215789aca6a9b3b720699fa4aa0bfad05bd7c936f086f0e61a062e7c33f1a7e7b427a7cebc7f07fb45aa7d17683fd70b SHA512 ac1101738e2f13f994bcfd3a36b05b1f1b934cd435045024ed222cc9a1a55bff4f6c550f7537a5a1175ae46c6154b1ee8b926bab359466aa93a074b76614d248
-EBUILD pydocstyle-5.1.1.ebuild 902 BLAKE2B ffcc784c67d72c8abe8c2371aafb94ee215789aca6a9b3b720699fa4aa0bfad05bd7c936f086f0e61a062e7c33f1a7e7b427a7cebc7f07fb45aa7d17683fd70b SHA512 ac1101738e2f13f994bcfd3a36b05b1f1b934cd435045024ed222cc9a1a55bff4f6c550f7537a5a1175ae46c6154b1ee8b926bab359466aa93a074b76614d248
+EBUILD pydocstyle-5.1.0.ebuild 902 BLAKE2B 40ba323e3a9b0ea2dbbb94fb6f3edec8f8440c0335485a219c84bf3b6d9f50130807358b75ddd50ee5eb4a7327e5253c0e96b9db87957b9fcbf6d56be2cd6af5 SHA512 14505557a9109ed32bddfb7360958dfd7c03337a6a5c22d83de1361388dea906c07b59d0c4f7b0dfa12a82172b5505e386fe6457eb3952fd518cf8479bddbde6
+EBUILD pydocstyle-5.1.1.ebuild 902 BLAKE2B 40ba323e3a9b0ea2dbbb94fb6f3edec8f8440c0335485a219c84bf3b6d9f50130807358b75ddd50ee5eb4a7327e5253c0e96b9db87957b9fcbf6d56be2cd6af5 SHA512 14505557a9109ed32bddfb7360958dfd7c03337a6a5c22d83de1361388dea906c07b59d0c4f7b0dfa12a82172b5505e386fe6457eb3952fd518cf8479bddbde6
 MISC metadata.xml 252 BLAKE2B 507e0ddc9d50b879ff374b903b142f85d020dfd6c486aba2af84fe082c878e780edbb79188ae10104d57db0eb775c86814cc8c06891a3854c9da840a4d377050 SHA512 9470ac9c8a5a4f80e3f767e7aa198addc7b21866c63b2a310e9f41ce65817672fb77423117bdd619e99cb62322025aeadf50717e23eafabf99080fcc106820af
diff --git a/dev-python/pydocstyle/pydocstyle-4.0.1.ebuild b/dev-python/pydocstyle/pydocstyle-4.0.1.ebuild
deleted file mode 100644
index ace7c0fa7..000000000
--- a/dev-python/pydocstyle/pydocstyle-4.0.1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{5,6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python docstring style checker"
-HOMEPAGE="https://github.com/PyCQA/pydocstyle/ https://pypi.org/project/pydocstyle/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND="~dev-python/snowballstemmer-1.2.1[${PYTHON_USEDEP}]"
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/pydocstyle/pydocstyle-5.0.1.ebuild b/dev-python/pydocstyle/pydocstyle-5.0.1.ebuild
deleted file mode 100644
index ace7c0fa7..000000000
--- a/dev-python/pydocstyle/pydocstyle-5.0.1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{5,6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python docstring style checker"
-HOMEPAGE="https://github.com/PyCQA/pydocstyle/ https://pypi.org/project/pydocstyle/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND="~dev-python/snowballstemmer-1.2.1[${PYTHON_USEDEP}]"
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/pydocstyle/pydocstyle-5.1.0.ebuild b/dev-python/pydocstyle/pydocstyle-5.1.0.ebuild
index afdcb5952..f5e8141c1 100644
--- a/dev-python/pydocstyle/pydocstyle-5.1.0.ebuild
+++ b/dev-python/pydocstyle/pydocstyle-5.1.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6..8} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/pydocstyle/pydocstyle-5.1.1.ebuild b/dev-python/pydocstyle/pydocstyle-5.1.1.ebuild
index afdcb5952..f5e8141c1 100644
--- a/dev-python/pydocstyle/pydocstyle-5.1.1.ebuild
+++ b/dev-python/pydocstyle/pydocstyle-5.1.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6..8} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/pyeconet/Manifest b/dev-python/pyeconet/Manifest
index b2c0b7f41..91a2dc77c 100644
--- a/dev-python/pyeconet/Manifest
+++ b/dev-python/pyeconet/Manifest
@@ -1,11 +1,7 @@
-DIST pyeconet-0.0.11.tar.gz 4075 BLAKE2B b95d4c58ac87c73ce831f21d19d750be1af153a56391909c3250fb16c9bf9de393c2b0195432a8d2409293c0c4dbb1ee7f3a51bb9a508c21c55267e749e79e98 SHA512 1e5e79b0af25db58cfd0e4dd7f6cdec435af5163a79d7f92098f4cf02edc863aee9bc7226497f8da4ed08eb9eed50a3bf812b0132baa099c2a937bc5521a0804
-DIST pyeconet-0.0.8.tar.gz 3938 BLAKE2B 984ddce9a04adc14fb7d229289edd9437b63cedbfdd85b3d07be12b734f8e960733148e47ad782545ab3eeefb59da6ef74ceb04637b7a0a00cb54acacc3336e4 SHA512 afaf842f17e31066ef2f05ed2d51cc5f1d570baa2bf5817fb84a5b57cdd38d120846d636add83547cffcd05a99d9bbb3f5e2d70379229cf48e0f10462f77fe80
 DIST pyeconet-0.1.12.tar.gz 8865 BLAKE2B bbbba23989287cafdb225a55f551f4a7a91ee01eff1549840be1a23d936ed9692d04601dd9df2169139fd647cb4cce779782255b9b9825f0c9fcab275d4507c9 SHA512 58a407777a6057849586b44d8083d030e24a7ad8675282d93192484e80d2d0dcfb89eb20d87cf9430bf055b4a2498a7ee3cb9c504410e2d6ceec513ac85d1639
 DIST pyeconet-0.1.13.tar.gz 8921 BLAKE2B 63be6a0ca6fec45761cb091d466fb6848455dffd93ad1c330f5da0cc77b6b6b53dc816d3f9a7b28bb13838368e6c18e73cf1a35305d56ca262162afdd68ced37 SHA512 df7a8dbb993afbf535756012fc4a707a0a5b40dff6717288b25b24d5bc2037e8c85bd79a4caa0abc0a78f7ae38126a031bdaf741c456728e8f84d84785656f8a
 DIST pyeconet-0.1.14.tar.gz 9047 BLAKE2B 71b35864b401eb9bcf9b718343920610408bec9ea7f9a8e27a847e4b714c3e3e9231da5f3c1e5e2d44c363ae3a9f794e56da994403308008b20f57ec0d2cd7a9 SHA512 02b0d1cd32f0736dbfd5c58561c59d201c0339f6e59a3ec5ef2c3580bfeb4d76677d80de80d1c3900d8fb5e23969d47323318858fa273781e4fa77c4945f610b
-EBUILD pyeconet-0.0.11.ebuild 684 BLAKE2B ca3821bcab2776e0d5cafcfaad3c20060fcd90921fd5f51559e7256638c3d0790c9fe8cfee0c93fddc9f0f520d391eb812324c240c7549bd2db77a32402a278d SHA512 475df7b69936cae93667e382ed45cef8ff5ec03251eb06df81fa13dbd96eb52193c37bf5337242eb0192f3fb06e1aedf2ae4ece8ac833f335dabbfecd1ac9a74
-EBUILD pyeconet-0.0.8.ebuild 675 BLAKE2B 8eee2508327851cb56b80d25d360316677de75a1468f1e529777974f77a518b8f60cf304d2a6073ccce4e6bd078346e22a5ed6b22d21646610a9f44db024e30d SHA512 3a12018e77b191b45e6373c5c66d6637da768dd7720e0487b46bb089ff0cbcd0ebc7331cebfe321c796e9df6920e5eca75781a539e78f464f54359d2c8f64fec
-EBUILD pyeconet-0.1.12.ebuild 773 BLAKE2B 9e6d6842ab560631e837dc9b528aec2f1a22d10a4fd89e05dd61f9b8eb351889595793c46fffe20dd7b1b0a86f42e7ceec2ca84947724e148d85e16fbdcfbe2d SHA512 473cd5335a960f2ff2c065cdc6191f177b22284197901a4c25bc6dcc71d24ebef613f7689ba63e08b81bcaf98318db65ca0cfba0895cb12f3c975ab7ef3572e5
-EBUILD pyeconet-0.1.13.ebuild 783 BLAKE2B 0d2a2bdedbfc28592df90db30a7f9b909eef69b095ce703009036df02293c53a1f6de0579aef6a3c543a668d5b763aff0b4fd35931bd75ac665df965128da62e SHA512 314dcc9d01abddfda797b3afcab93e096a5228fc3f79bdeb1c1ff0ac8f756a6b34f2ee390ac58082eb75e93a2be86ba8821ddb483368269e30dfe0b3ec7d347d
-EBUILD pyeconet-0.1.14.ebuild 783 BLAKE2B 0d2a2bdedbfc28592df90db30a7f9b909eef69b095ce703009036df02293c53a1f6de0579aef6a3c543a668d5b763aff0b4fd35931bd75ac665df965128da62e SHA512 314dcc9d01abddfda797b3afcab93e096a5228fc3f79bdeb1c1ff0ac8f756a6b34f2ee390ac58082eb75e93a2be86ba8821ddb483368269e30dfe0b3ec7d347d
+EBUILD pyeconet-0.1.12.ebuild 773 BLAKE2B 060327e9e8e211df90fb60ae92130e12360989cdaf8e64b1ffbab4ea952f564bc157a3c6ef0502c8b1fb0f0ae2a7501bf98d6a022478ef71b7f0254eea8675ce SHA512 7b176bf7a029ff49abb16e93290013bdfc53cf37a9cbf07d6c90454abe5e8643a23b6182742cf76643af61940054ce55cb1227dcc46deeff994a5142b655149b
+EBUILD pyeconet-0.1.13.ebuild 783 BLAKE2B 1ea756b28296c26d81494b97c3512e632cbb38d8bcab814d1396cad530a3d550077f3d2f4fedf4e0ce96951209851a1b312edd210ab9bc6c7d6c61a3248740d8 SHA512 962f396aa4f1114087053cbc78f0e2441850f26e13445c45e2390f6b59c0590b5f337c44298557db4287e535f7b687aa2f8f878a8bc9a699d3934871be23deff
+EBUILD pyeconet-0.1.14.ebuild 783 BLAKE2B 1ea756b28296c26d81494b97c3512e632cbb38d8bcab814d1396cad530a3d550077f3d2f4fedf4e0ce96951209851a1b312edd210ab9bc6c7d6c61a3248740d8 SHA512 962f396aa4f1114087053cbc78f0e2441850f26e13445c45e2390f6b59c0590b5f337c44298557db4287e535f7b687aa2f8f878a8bc9a699d3934871be23deff
 MISC metadata.xml 327 BLAKE2B c3b1d8e90163961e8710886d36b7cbea4f94c696cc73b8914f1333af3247a4dafed8ae232410e141102b58657488848c47405fd242d57f08f7ff8af3504d6963 SHA512 3e31b5e9c90f015660234e6a45f8e73c83375949407efc18d41e967777309931b935d7df1be51a2a9a197faee315d3584e203aa305fb3409b0b3f4a15f83dfbb
diff --git a/dev-python/pyeconet/pyeconet-0.0.11.ebuild b/dev-python/pyeconet/pyeconet-0.0.11.ebuild
deleted file mode 100644
index 41cfb3f90..000000000
--- a/dev-python/pyeconet/pyeconet-0.0.11.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit distutils-r1
-
-DESCRIPTION="Interface to the unofficial EcoNet API"
-HOMEPAGE="https://github.com/w1ll1am23/pyeconet https://pypi.org/project/pyeconet/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/pyeconet/pyeconet-0.0.8.ebuild b/dev-python/pyeconet/pyeconet-0.0.8.ebuild
deleted file mode 100644
index 98a4bab2f..000000000
--- a/dev-python/pyeconet/pyeconet-0.0.8.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{5,6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Interface to the unofficial EcoNet API"
-HOMEPAGE="https://github.com/w1ll1am23/pyeconet https://pypi.org/project/pyeconet/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/pyeconet/pyeconet-0.1.12.ebuild b/dev-python/pyeconet/pyeconet-0.1.12.ebuild
index 02159f389..a70958146 100644
--- a/dev-python/pyeconet/pyeconet-0.1.12.ebuild
+++ b/dev-python/pyeconet/pyeconet-0.1.12.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/pyeconet/pyeconet-0.1.13.ebuild b/dev-python/pyeconet/pyeconet-0.1.13.ebuild
index 8cf02251a..50f35d64d 100644
--- a/dev-python/pyeconet/pyeconet-0.1.13.ebuild
+++ b/dev-python/pyeconet/pyeconet-0.1.13.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/pyeconet/pyeconet-0.1.14.ebuild b/dev-python/pyeconet/pyeconet-0.1.14.ebuild
index 8cf02251a..50f35d64d 100644
--- a/dev-python/pyeconet/pyeconet-0.1.14.ebuild
+++ b/dev-python/pyeconet/pyeconet-0.1.14.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/pyedimax/Manifest b/dev-python/pyedimax/Manifest
index 32e3cc38e..2537488ba 100644
--- a/dev-python/pyedimax/Manifest
+++ b/dev-python/pyedimax/Manifest
@@ -1,5 +1,3 @@
-DIST pyedimax-0.1.tar.gz 2503 BLAKE2B b4dfe1fb3f9ad8f4d6b7eb63536be1ffcdb0308cd9f9b05dcca51468546852f7ef9350a93009cd47e7c30417105df4aaa04ff467f6ee8f442a0aeedfd09ddcf4 SHA512 6cd7663197f086c412af0369dfc289ba8943652651e2e5b332d808797e4502811ffa48670786cba3e92eae308d44add2af403db50d944d10d976e03e1e307298
 DIST pyedimax-0.2.1.tar.gz 3146 BLAKE2B 80bffe86d0f3289b4d1d9715f26a853ea86cacc68f09861aa731c4e7f4894fc5e0ac6a2170c258d665866e9501b0d865f522115fddcef2931789edec6bd8159e SHA512 76e9fb8940cb6f16e3daaecfcc9daa7373afcf09a73c1b84897f65afd007ed904d0423f0eb85214f087eb3bc9adef4744d777a40a6a0cd518a469a36c0f5f764
-EBUILD pyedimax-0.1.ebuild 717 BLAKE2B 021289fc4c799707615f7869fe29f637ac1f27eba3d9cbee1a8d6845e48488ee613be0115212ac2af0d6318fec22911836effc66d0b27356f0b3ad0c7d05267a SHA512 665a15b65f34cbf3fa089215d8873f5b6c4ae93237c934662e896ed3a6a2b87e2e974eef8356a9f73d5e4f6f392fd0672b222b458041464dd2b868cd47564dce
-EBUILD pyedimax-0.2.1.ebuild 726 BLAKE2B fdd66c22a83f8f4c92da0c5b60c0a9678a885e23a17fac078f46f875b55a7c9ab70ec110c05b0ed1b5b1b461532aef763f578ed89ea6641c57093c283066f966 SHA512 a706dabad0ae63369a0dd1f2ea83048047cd784fc5549314f482b89a9b93c18f98975852e284586dbc7e82143db5edfe8c0fe36c67a5ed500459c8562cf0f0c7
+EBUILD pyedimax-0.2.1.ebuild 725 BLAKE2B 63e0c82e5b64501c382b0ba18cf10266112f44e3a6552c7a9ce2d0c3d37adbc7f3b6ba070b34b2964f19b56df900f9e4963586b1500c33c8b20443e475df4472 SHA512 83ebafa6a2633497100f74199036b985bf6528abe64fc13685aae37f9ec163fb439783b3e47adb000a257ae4d9bc8d8bfb1a4a762615a5692196068444b18b7b
 MISC metadata.xml 454 BLAKE2B 39640049d4e5445109abfa71ed208d273f6aad2dfe2a863cdb846133f40a9fe764f3be7d21181de5db07ed8a9f1ecaba74ac224f5100cb4c9d118a03b1c553db SHA512 52036b44a8ff36509dabf6cd9f8d1c7110b4efbea3b1f1f9d9276b563da844e56d30b29e13f7ef32b6e90d8562a57c0f9b2628f896b00051404af8274a9b5e16
diff --git a/dev-python/pyedimax/pyedimax-0.1.ebuild b/dev-python/pyedimax/pyedimax-0.1.ebuild
deleted file mode 100644
index 316efdbbf..000000000
--- a/dev-python/pyedimax/pyedimax-0.1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Interface with Edimax Smart Plugs"
-HOMEPAGE="https://github.com/andreipop2005/pyedimax https://pypi.org/project/pyedimax/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=">=dev-python/requests-2.0[${PYTHON_USEDEP}]"
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/pyedimax/pyedimax-0.2.1.ebuild b/dev-python/pyedimax/pyedimax-0.2.1.ebuild
index 5202ae5d1..82aeeaf9f 100644
--- a/dev-python/pyedimax/pyedimax-0.2.1.ebuild
+++ b/dev-python/pyedimax/pyedimax-0.2.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/pyelftools/Manifest b/dev-python/pyelftools/Manifest
index e2c07525b..c461a7bc2 100644
--- a/dev-python/pyelftools/Manifest
+++ b/dev-python/pyelftools/Manifest
@@ -1,4 +1,3 @@
 DIST pyelftools-0.25.tar.gz 499493 BLAKE2B 941b21526d1225a4effa25d8f0245b326d5ec652cea6741240613c19af61e03a537fe363dd4c10a90760a7ddc6201e20dd83b6825ad185ae21696be6f4d1e52f SHA512 06ead53ada32676161193d7e5cdb3b9e4c1910dcb34f77a544f53445651f8118b582716bf8c5cc54efb21b1ddbbcdb4b41c533350af3c41553d103c7fc74702f
-EBUILD pyelftools-0.25-r1.ebuild 819 BLAKE2B eda1a35c9ceaae8ffcaa8017e23990de82b52267264879433c6cd3cc15f88ff513a3d41c0d985d221d36d0c3b7cf8789183fe5a0145bc030ca80447c7d195788 SHA512 83a85dc0060cfa222b937611aed495af7c6d6de94ed38bc1e2cec13bd4a9f6ef43d4eb30ff714f052aef3665158ce5c1e2d225a1cd0eaf91100ae7e05b27c627
-EBUILD pyelftools-0.25.ebuild 818 BLAKE2B 287226f4d20b1110b4d1a0b0335798898411fd7f4640477f65cb16e84a8b3284e23f14809c3a3cc33bdcbd99d24aa89944983bfd7d816b4c7a8445c21e4da65e SHA512 b482c246bd2782f37a34ad7c9d9e9fcef9468b2ac9dbf0a8e7c68794316ee63f1984d7e25565104a4fa228761290b09593b9d737c0ae0eff821c1d6e0abee46b
+EBUILD pyelftools-0.25-r1.ebuild 818 BLAKE2B ac2d5ccd9eccae02f2be6c517a068b5d8e87e96b53489ea0f64861ad769773528d3ab835cdf4f345b4595ad2efe44f79b784e30c99fed0ef93737c5c251a6131 SHA512 50c5a688306ade71895b492d13fd7d55acb52d3d8d96ee50639fd455d3660b66e7c35289f4e617f1ca0358bf8812a991bd6eaeb7f1d40168241ce3da9261c3a9
 MISC metadata.xml 370 BLAKE2B 8dcbbb8d9add514bc0daf421c6739f8ee8426af39a0cf36758c594ee859a1aead4bddcfab3466cb50761ae289f7d58426dacb5a51b745a290530abeb511204eb SHA512 0f00113fb42e48e7b232b8a500ac77958f3ead50ff51d547e015a2c1aa7b87ff7a25495094ba10480176f3653742f18473378fe336f544ec93d645db9057ec20
diff --git a/dev-python/pyelftools/pyelftools-0.25-r1.ebuild b/dev-python/pyelftools/pyelftools-0.25-r1.ebuild
index 49bdfd946..df8c1848d 100644
--- a/dev-python/pyelftools/pyelftools-0.25-r1.ebuild
+++ b/dev-python/pyelftools/pyelftools-0.25-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{8..9} )
 inherit distutils-r1
 
 DESCRIPTION="pure-Python library for analyzing ELF files and DWARF debugging information"
diff --git a/dev-python/pyelftools/pyelftools-0.25.ebuild b/dev-python/pyelftools/pyelftools-0.25.ebuild
deleted file mode 100644
index 4654ac215..000000000
--- a/dev-python/pyelftools/pyelftools-0.25.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
-inherit distutils-r1
-
-DESCRIPTION="pure-Python library for analyzing ELF files and DWARF debugging information"
-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"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86 amd64-linux x86-linux"
-IUSE="examples"
-
-python_test() {
-	# readelf_tests often fails due to host `readelf` changing output format
-	local t
-	for t in all_unittests examples_test ; do
-		"${PYTHON}" ./test/run_${t}.py || die "Tests fail with ${EPYTHON}"
-	done
-}
-
-python_install_all() {
-	use examples && dodoc -r examples
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pyephember/Manifest b/dev-python/pyephember/Manifest
index 629e151f0..90ed3aecd 100644
--- a/dev-python/pyephember/Manifest
+++ b/dev-python/pyephember/Manifest
@@ -1,5 +1,3 @@
-DIST pyephember-0.2.0.tar.gz 3790 BLAKE2B 9321bd89a4b4faaabdac526a75c9c8eeb9b7250a6e6dfa0bdbacc1845aab7b910c11e7e15413ee0c2418928d221b8bf6f5f460ee444490919a9568dc61d47893 SHA512 9daf537a682b887ff946ec1a017b46ef30d5647ffcc8e4769dce9153cb08cf3e2c8a8028f1b9507056089fe973e3445ef584fa6e9d8b59e12dcb228935123011
 DIST pyephember-0.3.1.tar.gz 4213 BLAKE2B 8ee617008d2adfe31ef65c6e8f792b37f3a73f3315bf39f2daccb45e341b407fd8daec60ea523aaf4eda947917f55ab88ad8600916eae9fb71bdf06b33e69f7b SHA512 23c679b2925891a44f03c2ec3f390a050cb0b54932965d155454c1aaa6b10054ed6c7348d1ab6d42c337af8ae66d46a2f30025b95b60ecc2b6c3fdd04d48f4cf
-EBUILD pyephember-0.2.0.ebuild 690 BLAKE2B c2d7fb8c740889fad1c9d467f715fd7bd8926f87efaf05037918f739b5c29bb44a0be65bc141cff4938c847224702de983eb6d66d60f9a5f6f2dec38cd72bb5f SHA512 0777f3530e3c24be35e8f6da30fbf251642422bb65b672c8f4f23f7ba77d74e7feed7bd894e77446b5cbc56725603147d5c75a95eebe93ebb9cfe997334f0769
-EBUILD pyephember-0.3.1.ebuild 699 BLAKE2B 410e58f4120009d6303b66d12dc6c6732cceb121f692807fdd4ca06343f5038d8bf8db6f3152d2283060fee10a1c3f9e5eacbf4b4f234a2391919757b602ee0f SHA512 4d5d5b45eca512a419a4b29054976d41242ae5147bdd728029b6afc29b3fdc89ef72fc1d5749956f72a9fe305636a8d1a94775472c153a65a49e45e6c4f837d0
+EBUILD pyephember-0.3.1.ebuild 698 BLAKE2B a9c5ff650d89a386675e129cefff281333e0f00b4b46b7ac658b427e1bfdb56e3020bd0c18096a8cb447b8c049fb8177cf59f4da26f072ee406debe7e7a03a3f SHA512 0ed06d53224a6a89ac01624a22e8b9a176077f35868394119b398122ead4bb3039bac88668df94b6bd9dab67740ec2482e5616667ec0bdae25bc1989d3ff6aab
 MISC metadata.xml 449 BLAKE2B f17f5bb71834398429915489bc677fedda135648709eacae64bc949ef5151854d9dec2b41d0f013e91d38d8bf2d093d1a8444fe89701d894694befbd419d5939 SHA512 1ca8e26a5e7f091aacf62dbb414d9bc4830ed28ace65c663bcf22a10703de5fd026867b4779ca0131195b80abf422ea73684676a42cc69eba5c0a5cae9e137d6
diff --git a/dev-python/pyephember/pyephember-0.2.0.ebuild b/dev-python/pyephember/pyephember-0.2.0.ebuild
deleted file mode 100644
index 3731febf3..000000000
--- a/dev-python/pyephember/pyephember-0.2.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python library to work with ember from EPH Controls"
-HOMEPAGE="https://github.com/ttroy50/pyephember https://pypi.org/project/pyephember/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/pyephember/pyephember-0.3.1.ebuild b/dev-python/pyephember/pyephember-0.3.1.ebuild
index 073c6a471..4616da745 100644
--- a/dev-python/pyephember/pyephember-0.3.1.ebuild
+++ b/dev-python/pyephember/pyephember-0.3.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/pyflunearyou/Manifest b/dev-python/pyflunearyou/Manifest
index 5bea70210..2c199b9cc 100644
--- a/dev-python/pyflunearyou/Manifest
+++ b/dev-python/pyflunearyou/Manifest
@@ -1,7 +1,3 @@
-DIST pyflunearyou-1.0.2.tar.gz 8047 BLAKE2B 4bebdc59c16c6d6b09bece06e2df14884ef66af949e238d79a3cfbf9672d5c7354bbcc5856bc69cd316cd28c49252f8e6086eef5959b10f01d65fc9dbc259661 SHA512 43a88307b6cea8bb107527646b98afb6c87e6e3d39b4170d9ffe8c88da235ce7edef8bdc1066b66fd5214041733bb439a75172ec76a29e7f00584ab4130511e7
-DIST pyflunearyou-1.0.3.tar.gz 8313 BLAKE2B 62204039704f6e376ef24b0142d5341d7c295d91595b251cb53a7f8dc2b41979d016013425ebee3af436684c719c56d008969d90650d4958f9f3192feb276d01 SHA512 2924d1e6b352526e5991da08ffe745b18effa1b81380cc10f04a02805ad07d4b8a7c138e6f86c889ab211d04903b96104170a6e2e35eac16ba990ac20aa80691
 DIST pyflunearyou-1.0.7.tar.gz 6885 BLAKE2B 6ebb571876327fbb4cb057413be85fbbe198185fe6d37ebc6afd35a26bb3a50448df6f9c39ec000c3e003f6f2848be1771b17802083acf0b772c7a726c1f2e36 SHA512 cfa50fba281d2edb70cce8ed2c16854f409476d8606955f1abbd47277a1d9db3d63a04f04201a741e042780b432a03eedaa004d9e4049908595e1e874f9e268d
-EBUILD pyflunearyou-1.0.2.ebuild 693 BLAKE2B 37efe5fe901e4bced2ad6ae88911bc3a933155ce459a3b76158144d0cc9adef793b5c66b30e79e7b7e9dcccd06999416d47710df350cb19915ef9e12a1af7ad2 SHA512 41e4012d78b006e4935870bf1b3f02d0e0545e97a9d5cabe08bec926fbf98e20c32ecc27a61d371fd98f23f11df22d85e9a694a52bced23d43bdc8021ce9961f
-EBUILD pyflunearyou-1.0.3.ebuild 736 BLAKE2B f3354929962fa6e69b9b6ecf2a25b72ec6c88e0d8b97a786b2dd9b3218d17433ee122d4f7ed7654f7a7f5c99008e47373d322315bea2f0d70347c4d0111df1ef SHA512 b977a3141b0e3bc5793b9b4b31b693324ad39bb0f60a50313d00fc0d3819da2711fd7e8cb0b04872bceae8caaa63f8f74742f6f927681f4331f836f2733c457b
-EBUILD pyflunearyou-1.0.7.ebuild 736 BLAKE2B f3354929962fa6e69b9b6ecf2a25b72ec6c88e0d8b97a786b2dd9b3218d17433ee122d4f7ed7654f7a7f5c99008e47373d322315bea2f0d70347c4d0111df1ef SHA512 b977a3141b0e3bc5793b9b4b31b693324ad39bb0f60a50313d00fc0d3819da2711fd7e8cb0b04872bceae8caaa63f8f74742f6f927681f4331f836f2733c457b
+EBUILD pyflunearyou-1.0.7.ebuild 735 BLAKE2B df0dc80f55b7c8b701b9b2adb7bc83d7bc937725c27682c47f56c0e0f44cea8a740482a393b7a941bb94e2f6abd6ac939360ecdffa87017f517679b8c0b90f0f SHA512 bd801f063cf7a08b463eb7502d92b0260acf559f08f0148e088d317e0355dc93c45e4335015a645d8002c709a5926c30398932bb063b59715b8af074338ae44b
 MISC metadata.xml 455 BLAKE2B 2e8e27f55bb46834a9096d07c52b295d08961e2d666f8bea16085ae15218d63ec76783700f1fc86e165dfb670af959b308ff3a42e01eb88883956a685e46fe6b SHA512 3461326f25c3366277f07b026f8cc1e2e46918a2a7c1dcaeb4446ddc6d6572a2feea99e8c613446c867e0dc9fcf85be6ce29f186510abb8f6dfb31ce9bd1fd33
diff --git a/dev-python/pyflunearyou/pyflunearyou-1.0.2.ebuild b/dev-python/pyflunearyou/pyflunearyou-1.0.2.ebuild
deleted file mode 100644
index 1f68039dd..000000000
--- a/dev-python/pyflunearyou/pyflunearyou-1.0.2.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{5,6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="A clean, well-tested Python3 API for Flu Near You"
-HOMEPAGE="https://github.com/bachya/pyflunearyou https://pypi.org/project/pyflunearyou/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/pyflunearyou/pyflunearyou-1.0.3.ebuild b/dev-python/pyflunearyou/pyflunearyou-1.0.3.ebuild
deleted file mode 100644
index 055e7ac9e..000000000
--- a/dev-python/pyflunearyou/pyflunearyou-1.0.3.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit distutils-r1
-
-DESCRIPTION="A clean, well-tested Python3 API for Flu Near You"
-HOMEPAGE="https://github.com/bachya/pyflunearyou https://pypi.org/project/pyflunearyou/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND="dev-python/aiohttp[${PYTHON_USEDEP}]"
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/pyflunearyou/pyflunearyou-1.0.7.ebuild b/dev-python/pyflunearyou/pyflunearyou-1.0.7.ebuild
index 055e7ac9e..606bbb13d 100644
--- a/dev-python/pyflunearyou/pyflunearyou-1.0.7.ebuild
+++ b/dev-python/pyflunearyou/pyflunearyou-1.0.7.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/pyfritzhome/Manifest b/dev-python/pyfritzhome/Manifest
index 5f17c123f..2ada8091a 100644
--- a/dev-python/pyfritzhome/Manifest
+++ b/dev-python/pyfritzhome/Manifest
@@ -1,5 +1,3 @@
-DIST pyfritzhome-0.4.0.tar.gz 12709 BLAKE2B 7f36c7229841842b9a985ffe7d686b4582521cb26870ed5bfe41f5cb36a5f2b23985064a1959a9650ab916921f0cda6b069d3cc530f680c9695f8b7df216c280 SHA512 f4df9b239e0c78f0a52ae27fbbdffdfca9cc423c340c070ce6d03b7ab33df54c24f6a7db05b81afbc696ec907468979604c57a52e073c3ed1c984c9e800931df
 DIST pyfritzhome-0.4.2.tar.gz 12791 BLAKE2B e9c31643496b1733a9db067f42df45e4fecf9d4e8d13aa195b0a8f768653570991bc6621fabcfb6d89b274454451d13eb4a1f62cdf03c2dc49f2ea009533641a SHA512 23ca8ae736a0067dc9887dabc93add6612c68193b5dbfb82935cac2af373d38983e2c997a460eda62b53eaa5487e1db9c84472c2e6e8e751087a422e786f2755
-EBUILD pyfritzhome-0.4.0.ebuild 686 BLAKE2B 72e125b3fa2acc6d1cb2d763025d6103c9959d47e78adbbc8676f200b9220336ff146473fd268b54d7ab1d834184020f6f896e51cc13ad3b9991e68904e47289 SHA512 5e24fa99ec4a0696f8267b4c74d684c2c9e342e19265e89a4256ce7799d14ad1d452e28fc3210c4ab5c878ca6cc11962a5c6e47ca1ac8b2e9ec45554812dc1a2
-EBUILD pyfritzhome-0.4.2.ebuild 693 BLAKE2B f866efce050f19885377467c9bdf8764e935bedf6bd208f7f944d45ba6dff989b7c68d2ab344889d7d278e5be26f5f5439df9fd9d6015216c57070b37f096063 SHA512 390df73b8c82357c837a95d7a03351c18f75e530a6ca9e91faee49c5be592d7c2f900235deafdda0a3605edf8d228a3eda8b91861ee0ab0e9bf54acac64ed6a0
+EBUILD pyfritzhome-0.4.2.ebuild 692 BLAKE2B 8d89935e3291f3163931a57285dfc6889ef17f4bb5ada58835f46fd4d0e64c41fc932e5dd9d7cdd94e434f5d4b0e4af4e44e146c29fd7384a44d36a96af79752 SHA512 2943fa14a5d9479274433ec1908779b0995c5d8a277a4fb0d8aacfaf2b0416b30011a496f340e4d9627073ab5820f9f8dd1d391b808268065ba0a31a2cdc4ce9
 MISC metadata.xml 458 BLAKE2B f3062ecc7c68f3989d4ba7b61d962c7e8f4580ab4546b6f7abc2c2e9daef0dff5ed5e62770fb4597d4da86efa2615db6c8d57334483893ec5e4f6b9200d3bf65 SHA512 ffebce99c0b74c397f81692d165e822f35ca6cffa3406afce26a9684da70c7e957e3e7fd710742ad0e808aabd7490776ab4edcdbe2f68f5388f5a6e4247f1d9b
diff --git a/dev-python/pyfritzhome/pyfritzhome-0.4.0.ebuild b/dev-python/pyfritzhome/pyfritzhome-0.4.0.ebuild
deleted file mode 100644
index b72776051..000000000
--- a/dev-python/pyfritzhome/pyfritzhome-0.4.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{5,6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Fritz!Box Smarthome Python Library"
-HOMEPAGE="https://github.com/hthiery/python-fritzhome https://pypi.org/project/pyfritzhome/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/pyfritzhome/pyfritzhome-0.4.2.ebuild b/dev-python/pyfritzhome/pyfritzhome-0.4.2.ebuild
index 0bc742e35..c91edd72c 100644
--- a/dev-python/pyfritzhome/pyfritzhome-0.4.2.ebuild
+++ b/dev-python/pyfritzhome/pyfritzhome-0.4.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/pygogogate2/Manifest b/dev-python/pygogogate2/Manifest
deleted file mode 100644
index 7d179e844..000000000
--- a/dev-python/pygogogate2/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST pygogogate2-0.1.1.tar.gz 3827 BLAKE2B 31451159c1d43ef8957a4924221f2cd251e13fb41932b53cb9ce34ea26f2cb851cdccc8d8dc193dd469e3b9a8b0e5276506151d707c9b61d6e182352b2e7f209 SHA512 326d1201394c3b80c2ad8e0d3943ad8055626ebb6796396077ff55b9093f2938068b3dd3394a9a076bd7748da3977b9cf0650f8f4b421920cfb9f11fbfac15ed
-DIST pygogogate2-0.2.1.tar.gz 3947 BLAKE2B 420b1a3292c363e849943a7b1e7bd855e94cecb624ce6bb449e1250855c82a684ebc32ab58e00dbd7a3203893e65f910eba59ead860d57a33a004126f5eeeb75 SHA512 9871913ec9fde139aa0bf0372b7b66c24649ac08b1e4e1d6e1495728beff1086207d40808049c8e97ffbd72adff6a31d0d99c5f7a92dced93d49f404a9c8bceb
-EBUILD pygogogate2-0.1.1.ebuild 747 BLAKE2B 41b52dbc9684abe586e2e9f2677bc462c152bd4b216e9dc19c3f9f9cebb58831587f7a1a6ff24c5fff50cd43c076e38c5518665439fe0cb25c4bab9178c64c7e SHA512 4bfd91497f9ea17b39472ebd731bfecd5fd320b1142612a1b73109cd9f41ac4baa29fd5597a493892060852b142d0feacd936dd55d33803db1606e06eae0af98
-EBUILD pygogogate2-0.2.1.ebuild 756 BLAKE2B a6f44711ac08e5ae58f664edbe37b6aa35a94388ca4bbd6ffdfacef491b1b0d39d2cc5e7574b5a3d0e93ad7b290ba2bb78d3deb8844eb9f4af0229f1c0750559 SHA512 0cb962f897cb97ba860d86ebb09100613a6d384ba44f7169dd6ab0f4e10e6f89bf92e206b16b3045d43ee181a7a17155997426dc4279c310488da6d26490a50e
-MISC metadata.xml 459 BLAKE2B 611cc1eb2b67fad2289d9f145e4c8d1ae9c49ab6becb97ba87c3a6ed382f456bfd0506d5ba9d81050959b7a6284ff4f8353e229ef8fc07984a69a4058a8cf290 SHA512 2e2ef361c7287c5e04cf99f04efbe408ad75c81e82cbd00c3b36596afd6c1b8c12f2166c74430485a897b698157c58cd6d44a9c5a26dd6f14935cd5d99896d87
diff --git a/dev-python/pygogogate2/metadata.xml b/dev-python/pygogogate2/metadata.xml
deleted file mode 100644
index 685d236b6..000000000
--- a/dev-python/pygogogate2/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>b@edevau.net</email>
-    <name>Andreas Billmeier</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="pypi">pygogogate2</remote-id>
-    <maintainer status="unknown">
-      <email>dbroadfoot@gmail.com</email>
-      <name>David Broadfoot</name>
-    </maintainer>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/pygogogate2/pygogogate2-0.1.1.ebuild b/dev-python/pygogogate2/pygogogate2-0.1.1.ebuild
deleted file mode 100644
index abe550f88..000000000
--- a/dev-python/pygogogate2/pygogogate2-0.1.1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python package for controlling Gogogate2-Enabled Garage Door"
-HOMEPAGE="https://github.com/dlbroadfoot/pygogogate2 https://pypi.org/project/pygogogate2/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND="dev-python/pycryptodomex[${PYTHON_USEDEP}]"
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/pygogogate2/pygogogate2-0.2.1.ebuild b/dev-python/pygogogate2/pygogogate2-0.2.1.ebuild
deleted file mode 100644
index 1f0d5107a..000000000
--- a/dev-python/pygogogate2/pygogogate2-0.2.1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python package for controlling Gogogate2-Enabled Garage Door"
-HOMEPAGE="https://github.com/dlbroadfoot/pygogogate2 https://pypi.org/project/pygogogate2/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND="dev-python/pycryptodomex[${PYTHON_USEDEP}]"
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/pyheos/Manifest b/dev-python/pyheos/Manifest
index 95d2e799e..9ec1ee299 100644
--- a/dev-python/pyheos/Manifest
+++ b/dev-python/pyheos/Manifest
@@ -1,11 +1,3 @@
-DIST pyheos-0.4.1.tar.gz 25052 BLAKE2B fc2dd7f7b24517bcce8790dd4a35b92d64820cb12a31c7b695486e01fb5a264a5418816225b4608392d58a73bd6a75339efc4286cf5b0e7672a881896181be73 SHA512 7cab191e1587369beb53f633833dfdae0aa8ff99bcbf421e0e7ec237cbe60055cb03a69fd4eb143f121bcc85809b347b5e6996607f12409105e455c09186c15c
-DIST pyheos-0.5.1.tar.gz 27378 BLAKE2B 9b4e8d50cfc9c56f2003688942d15470d857ed4565a2a8b00b65c88c8f03ac0817669a469e7e838aa068c78251b63c2be25fe191b724ad75469cd28029a0c0eb SHA512 08817623d6a19edbbf0caf43e373b2ca0a79cf6dc941202613c32689a8e13002ca9cc9942bc7708cdfd0eacea4975ae7fbb164381eea0abb855b9691121ed754
-DIST pyheos-0.5.2.tar.gz 27497 BLAKE2B 41da4624846f34e669d0435a8e6b086f8cc5afd7bcc2c07e9a6862da3c6d64e101eb3bfbd00008755cb2dd9dede042f2fad2b9ae3f6092f9494546f28c62ee71 SHA512 f3fcf04e39e981a0277322a83e9ec643ee21581987c0dda845c7d732d744caf6f90cf9000bd87d6e7553e2a9bacd216c8ac03875788ca59018705c9fe159cb5f
-DIST pyheos-0.6.0.tar.gz 28118 BLAKE2B 98060be771012575f5d7b34568db3dd0b13feee00e16b772b89f851bf5012691060c66f9bf0f3d8eb6a661961e4e2b40971c5b11b4de409ae709197a6ed84b5c SHA512 a3e2da3e73151b79830239e5e261cc1a6441b435dd13e0c228877fd9b03b494f7f29fdda884e233ee67553fe37badbf1e0625c0422772cc2b9244deb513e50cf
 DIST pyheos-0.7.2.tar.gz 19442 BLAKE2B 7e5c29002fb698a37e4e637003971fdaa97b0c2cec179142d8a1f710167f35742d0cb03b2614cf0173e86ff90094e3d4a11245ca5c6ce9150ee0f687abd140ee SHA512 8f297859de974c895197555f30d8b8182353ee2aa59821c610031d1f31c7867e4584807f477519cdba50038548d3dde74ef2b847723b51048f0edae76ddc51aa
-EBUILD pyheos-0.4.1.ebuild 937 BLAKE2B d7e6ebc4add3aff7a6cad3f9931cc4281b1c130371b17a81bcf3b606ece48950c05714e5d08239b345506f81bf0a3dd113b1f4b45b0d596d169e16db5ecac280 SHA512 1847b44579fcc2cf40b87346c3680db20358ce59d121d48cf5eea94d4a88a7836347c83db253e5a5e3b7cfafc18a77982a33e1d9372c6686ea7d5f7cf6d2415e
-EBUILD pyheos-0.5.1.ebuild 944 BLAKE2B 3a1af5bb39ed3c23f523eb9f39d53e20eb9fe731f2892e1a9f9e908347ffbbcde9f260e766826210e8493f59efb30961cbaa1b3e86fb45a3d54cc6f2f89c4f8e SHA512 908a4cba80be70938e6c8d76ba82366c4f727981bc79addd870ee98561c59b0c5e7a13a718b07db4c8cf73e89c53b41dc3e5ceb73c6c8c624d44116ad1d7e04c
-EBUILD pyheos-0.5.2.ebuild 944 BLAKE2B 24a822a3cc5b00b3fae654053bbc9f1abd15e26e1f2041f0b39af9794c5cb88cbf5e1934ebd143814aea1bc6921405762b586364ce4e25716b8962f4e0f9478a SHA512 9d4fb7e5e00284b18b6f03df1d014b3925de986fb0c9ce508c0d248c9b1ac4e495c9c3ff65ac6612294a88cb6467b6b46724054d3c5da220f175b12b002e9097
-EBUILD pyheos-0.6.0.ebuild 986 BLAKE2B 1baf50cd17aa79d31a5a9020a8601be1388fa4d60cdde8d5b2ac87ec01e5d6e035323a5fbb2ed25562952a2cc73d1c400e24db079c6c835e7bd578e8296bf2c9 SHA512 99147a401743c6f3e2f45f5b843a3a87758ac6f20f6f62b4266f4f6d4aaa06b70b0b33e17923d266ff9b3ce52babe20021cc0354474535ace77ad46e17170215
-EBUILD pyheos-0.7.2.ebuild 794 BLAKE2B 1da13a7f56cfe8bbaee3178cde89ea33c85fc2a783aee3a73e5fb6029619557566489097ef3fd224aa891f336ef2a3eb12b835575931ee4abfce3cbaf953edc2 SHA512 a3cf8ca906e00c662212352cc49011b93f381c12c07e063ad7e17b43dda6a25f77375dd3f22c115205ce28137386debff27952c1710582b17dbf22a22298ad27
+EBUILD pyheos-0.7.2.ebuild 794 BLAKE2B ed5fcec8fde49049cc65b344b800ef0ac2cfe031aef554fdfd2c4c63bfa089db40c9532990783b45fe69ef8b1b53f53e4f42b622fa8c21a1c592dca09bffc8b5 SHA512 2fa9d3b4af15cc1758f800f06f23f82a0ef922b13572c03533f356ceecfe30f3207c04ad99052e30f816e28e122384a9eed1f11c45a28018d05e764670e9db81
 MISC metadata.xml 447 BLAKE2B 8218e75ce8d185913354ad72d68d69e5b9b5476ebde98d6a22e01bf91330f6e2c1e02f85717ebdafb96fbd3688ff2bed598e9d023505b0130f3e34b4bd5e1486 SHA512 f50636496aebccee98b1de988e626a13f63e5cd578cfda25ebd438abcc775cc7a8907cf433a597e5f9e39c1db454b909efd595a62de09076bbe93f6998fc0e64
diff --git a/dev-python/pyheos/pyheos-0.4.1.ebuild b/dev-python/pyheos/pyheos-0.4.1.ebuild
deleted file mode 100644
index 7b2759276..000000000
--- a/dev-python/pyheos/pyheos-0.4.1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{5..7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Async python library: HEOS devices through the HEOS CLI Protocol"
-HOMEPAGE="https://github.com/andrewsayre/pyheos https://pypi.org/project/pyheos/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-# packages=find_packages()
-# https://git.edevau.net/onkelbeh/HomeAssistantRepository/issues/53
-src_prepare() {
-	sed -i "s/packages=find_packages()/packages=find_packages(exclude=['tests','tests.*'])/g" -i setup.py || die
-	eapply_user
-}
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/pyheos/pyheos-0.5.1.ebuild b/dev-python/pyheos/pyheos-0.5.1.ebuild
deleted file mode 100644
index 74c98efdd..000000000
--- a/dev-python/pyheos/pyheos-0.5.1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{5..7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Async python library: HEOS devices through the HEOS CLI Protocol"
-HOMEPAGE="https://github.com/andrewsayre/pyheos https://pypi.org/project/pyheos/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-# packages=find_packages()
-# https://git.edevau.net/onkelbeh/HomeAssistantRepository/issues/53
-src_prepare() {
-	sed -i "s/packages=find_packages()/packages=find_packages(exclude=['tests','tests.*'])/g" -i setup.py || die
-	eapply_user
-}
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/pyheos/pyheos-0.5.2.ebuild b/dev-python/pyheos/pyheos-0.5.2.ebuild
deleted file mode 100644
index ced55b19a..000000000
--- a/dev-python/pyheos/pyheos-0.5.2.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{5..8} )
-
-inherit distutils-r1
-
-DESCRIPTION="Async python library: HEOS devices through the HEOS CLI Protocol"
-HOMEPAGE="https://github.com/andrewsayre/pyheos https://pypi.org/project/pyheos/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-# packages=find_packages()
-# https://git.edevau.net/onkelbeh/HomeAssistantRepository/issues/53
-src_prepare() {
-	sed -i "s/packages=find_packages()/packages=find_packages(exclude=['tests','tests.*'])/g" -i setup.py || die
-	eapply_user
-}
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/pyheos/pyheos-0.6.0.ebuild b/dev-python/pyheos/pyheos-0.6.0.ebuild
deleted file mode 100644
index 4af7bb781..000000000
--- a/dev-python/pyheos/pyheos-0.6.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{6..8} )
-
-inherit distutils-r1
-
-DESCRIPTION="Async python library: HEOS devices through the HEOS CLI Protocol"
-HOMEPAGE="https://github.com/andrewsayre/pyheos https://pypi.org/project/pyheos/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/tox[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-# packages=find_packages()
-# https://git.edevau.net/onkelbeh/HomeAssistantRepository/issues/53
-src_prepare() {
-	sed -i "s/packages=find_packages()/packages=find_packages(exclude=['tests','tests.*'])/g" -i setup.py || die
-	eapply_user
-}
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/pyheos/pyheos-0.7.2.ebuild b/dev-python/pyheos/pyheos-0.7.2.ebuild
index 2ecaa50f5..c44be319e 100644
--- a/dev-python/pyheos/pyheos-0.7.2.ebuild
+++ b/dev-python/pyheos/pyheos-0.7.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{6..8} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/pyipma/Manifest b/dev-python/pyipma/Manifest
index f01dee53f..3542aed8c 100644
--- a/dev-python/pyipma/Manifest
+++ b/dev-python/pyipma/Manifest
@@ -1,11 +1,3 @@
-DIST pyipma-1.2.1.tar.gz 4311 BLAKE2B 3405b76c6c30e089192bba3a80e5ce2b6a728cac55c8b652008df35c7170f16698803d10eee25b0d09b12b6ccdbe639e5868d51058714bdc8be554b888e0afc2 SHA512 30519bbf1fff668c9bc2710674b13436037d9759d1d967ed94bdef3fb0d8414d55b7856522cfd58be90cfaef7bda21c0d7528b0463728fb0f5f020f1f32d5cd5
-DIST pyipma-2.0.2.tar.gz 5366 BLAKE2B 7a70a6b66ea434d61d5ab559be40fb36b8390f95acc87bb8659f854f01d5160cf8ecc676a8bf6ff3beff1472e4f2668132eea48ee34082c55fb29272c3f551b1 SHA512 6a7c2f729d566d672a7acf51b96ba38dcd89f485818a3e1c34dec6b0140e43a9233b6ef1880bdb7ff2e6ee9333541fef5de37d61688ef9cedc565cff5f857e58
-DIST pyipma-2.0.3.tar.gz 5524 BLAKE2B ff2ec06261736ec55388d04fbe359e0c410e03f56cc2798affa09f23cf41dc9163c5847b0324363220dc3f9b4b2cf8a32fda8928fbfe394f445953125e816d86 SHA512 4bb42fefff96d11155735432a92ede6804595060b75c4c21e7c6e2577f0e42374471ded62df39eabd06e526b1fb045a014d59836ff5d6dbbccefe6777b50390b
-DIST pyipma-2.0.4.tar.gz 5550 BLAKE2B 9361415e4267b770effd41c8be5e70a2e301c1c3cde76cb17e1947f4c81cd8b7accf4b207d4463c2fc9d978a0a313dec15a80e892bef452e8703a39a91303606 SHA512 515450bd8b3a8d592fc61137becb781e7a3c6b2f24edf667cfeb7c5ab727e9b598584c369c8f991827949a6ebfa85de17d3560430ae53a35bae4facb8852a439
 DIST pyipma-2.0.5.tar.gz 5718 BLAKE2B 0918441bcff5ae0c2be7fc8c7018f33ddb38ddd7944f0482f5b9d3cefb48c967b4d927f846f59bc7df39cebb3fcd767c594d0393e7cf5c1184f167ec4e6ab484 SHA512 a2e59c8562125b07b02285130ef0ca876a8e265d4d8bccff398008e008492204e3556273fca6943281658ec7645de1888721078f79326e7389a3de28ab51d3db
-EBUILD pyipma-1.2.1.ebuild 779 BLAKE2B d89afedf2269e16ec7ce34f1c29a7ffac41bb4e966a4da59537e22f8aa11f9224810f9114e7207b91125406b3d90449f641344ed515beeac7192db3df711f9ed SHA512 77e65133ceb1ef10110d5d3f67811c12f132249a1432ad67002fd87e38f23e0449f04379884dcd19f815570b20a39326121de7ed64df44a00b451214f7efad97
-EBUILD pyipma-2.0.2.ebuild 788 BLAKE2B 3309c414733180626c64d2f7b57af9a97ac81b163c12c9a7b6193796a7798ae1990de21f2cfc16605ac73e916c61597dde1ec01c261e652f80d4faea45bda393 SHA512 a75a03c9b982e1debfacb51b2643d3ea479af85190c1c10a816895decb100d3aff088228c28fa495cd3d43f2b9e2dd85468520e44673e5b208350cff07e152ee
-EBUILD pyipma-2.0.3.ebuild 788 BLAKE2B 3309c414733180626c64d2f7b57af9a97ac81b163c12c9a7b6193796a7798ae1990de21f2cfc16605ac73e916c61597dde1ec01c261e652f80d4faea45bda393 SHA512 a75a03c9b982e1debfacb51b2643d3ea479af85190c1c10a816895decb100d3aff088228c28fa495cd3d43f2b9e2dd85468520e44673e5b208350cff07e152ee
-EBUILD pyipma-2.0.4.ebuild 788 BLAKE2B 3309c414733180626c64d2f7b57af9a97ac81b163c12c9a7b6193796a7798ae1990de21f2cfc16605ac73e916c61597dde1ec01c261e652f80d4faea45bda393 SHA512 a75a03c9b982e1debfacb51b2643d3ea479af85190c1c10a816895decb100d3aff088228c28fa495cd3d43f2b9e2dd85468520e44673e5b208350cff07e152ee
-EBUILD pyipma-2.0.5.ebuild 788 BLAKE2B 3309c414733180626c64d2f7b57af9a97ac81b163c12c9a7b6193796a7798ae1990de21f2cfc16605ac73e916c61597dde1ec01c261e652f80d4faea45bda393 SHA512 a75a03c9b982e1debfacb51b2643d3ea479af85190c1c10a816895decb100d3aff088228c28fa495cd3d43f2b9e2dd85468520e44673e5b208350cff07e152ee
+EBUILD pyipma-2.0.5.ebuild 787 BLAKE2B 0f9390c51a60483fbd0a18e383436638ff8dd29c2286e517dbe5697b9e57ddd4172d77ceb1f28c9644779f1c4b51c6cc0676cda1788d33715e5656295b55feec SHA512 9812e53465c94ca5d3f3306ed817a4b5ea31dd5f7964be308287843b03818cce3c608605a46ef0980ca4747d9ba8f18b3af4517cc1109429cc148c4a1fe5f31e
 MISC metadata.xml 450 BLAKE2B df2dc3a7c513d92b085f725112251b13442ccc1da6bfdb53413adeb923ce4dd3224901b1bbfc36946900f1658d8dcce00e6fde3f73bb1fee873bbff869b30ed8 SHA512 3d1b615084cf02b699db3fd46762ef1386e20eaf52c98223aa926b954c162bdabef76bc0e7a607103fbb4bc5da72165615274602a0908fde2bb2261267d9883a
diff --git a/dev-python/pyipma/pyipma-1.2.1.ebuild b/dev-python/pyipma/pyipma-1.2.1.ebuild
deleted file mode 100644
index cdbe9a88d..000000000
--- a/dev-python/pyipma/pyipma-1.2.1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Library to retrieve information from Instituto Portuguges do Mar e Atmosfera."
-HOMEPAGE="https://github.com/dgomes/pyipma https://pypi.org/project/pyipma/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND="dev-python/aiohttp[${PYTHON_USEDEP}]
-	dev-python/geopy[${PYTHON_USEDEP}]"
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/pyipma/pyipma-2.0.2.ebuild b/dev-python/pyipma/pyipma-2.0.2.ebuild
deleted file mode 100644
index 84648fc20..000000000
--- a/dev-python/pyipma/pyipma-2.0.2.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit distutils-r1
-
-DESCRIPTION="Library to retrieve information from Instituto Portuguges do Mar e Atmosfera."
-HOMEPAGE="https://github.com/dgomes/pyipma https://pypi.org/project/pyipma/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND="dev-python/aiohttp[${PYTHON_USEDEP}]
-	dev-python/geopy[${PYTHON_USEDEP}]"
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/pyipma/pyipma-2.0.3.ebuild b/dev-python/pyipma/pyipma-2.0.3.ebuild
deleted file mode 100644
index 84648fc20..000000000
--- a/dev-python/pyipma/pyipma-2.0.3.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit distutils-r1
-
-DESCRIPTION="Library to retrieve information from Instituto Portuguges do Mar e Atmosfera."
-HOMEPAGE="https://github.com/dgomes/pyipma https://pypi.org/project/pyipma/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND="dev-python/aiohttp[${PYTHON_USEDEP}]
-	dev-python/geopy[${PYTHON_USEDEP}]"
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/pyipma/pyipma-2.0.4.ebuild b/dev-python/pyipma/pyipma-2.0.4.ebuild
deleted file mode 100644
index 84648fc20..000000000
--- a/dev-python/pyipma/pyipma-2.0.4.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit distutils-r1
-
-DESCRIPTION="Library to retrieve information from Instituto Portuguges do Mar e Atmosfera."
-HOMEPAGE="https://github.com/dgomes/pyipma https://pypi.org/project/pyipma/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND="dev-python/aiohttp[${PYTHON_USEDEP}]
-	dev-python/geopy[${PYTHON_USEDEP}]"
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/pyipma/pyipma-2.0.5.ebuild b/dev-python/pyipma/pyipma-2.0.5.ebuild
index 84648fc20..25ed49a24 100644
--- a/dev-python/pyipma/pyipma-2.0.5.ebuild
+++ b/dev-python/pyipma/pyipma-2.0.5.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/pyjwt/Manifest b/dev-python/pyjwt/Manifest
index a8e065985..a38789343 100644
--- a/dev-python/pyjwt/Manifest
+++ b/dev-python/pyjwt/Manifest
@@ -1,6 +1,3 @@
-DIST PyJWT-1.6.4.tar.gz 41694 BLAKE2B 59677d2f76a6f49be794d7cb796a5388b34fb8016dde9a069fa0494dfa91862b5cd9437e9231377fc7da10438a0a73ffbfe3afd2023cc21c5e166c93eb04fdaa SHA512 28c448d473f0409d11c2a97bef9f878800a78691250f55a46d79009b09faab0ac179133c4d4795ed9910dd7176adc9d6912189a5b4938f27ae441308e98d5e11
 DIST PyJWT-1.7.1.tar.gz 41979 BLAKE2B 5604b309838b2dfb2f95e18e291c43703954664aa8acb7439072f002c1c8a1e49ff2c21d907be77a4d2f86e695ec71970d550aad2541252ac85bd7133e300b28 SHA512 70cd38127b6848933992c8b88303725ef71bfb430ad42eb63247e549b0bdab2a194137349d43ab02a1c97212dbc89f447ee3f0c5403dd14632b8b4b6b9235fc4
-EBUILD pyjwt-1.6.4.ebuild 1271 BLAKE2B d29a506d6fff60cba22f37dca3232092a095c9863b0d3ba9af51c740db9270aeaa2df7c184e82f0dfa2f45e8465d1020b7d8a5dd9f8ab7726eb8dbc9d6ee552e SHA512 4bd303963e69b67d4cc7ac586a8d0b26e9d3828d02bbf917af27370a98761cad6f222632ae7d32e22d8290e7574a697c4fe3302098b3510c04910d68063ff115
-EBUILD pyjwt-1.7.1-r1.ebuild 1278 BLAKE2B 1975d6f41c02636eac7b3f51253aa4c2e261ef32432813f2423ca2e0157fc5a0fd1bfd338f041d0361006ed505119dd6378b3dcf80cbf526e4e87ebe436f59f0 SHA512 93c83f630f1115c92a0ca793eb8d42e0ef574da7969d611285f95904867067b251c5398c7c20e05905558c108306b886b1c574b115257fa6896b873e188babd6
-EBUILD pyjwt-1.7.1.ebuild 1271 BLAKE2B d29a506d6fff60cba22f37dca3232092a095c9863b0d3ba9af51c740db9270aeaa2df7c184e82f0dfa2f45e8465d1020b7d8a5dd9f8ab7726eb8dbc9d6ee552e SHA512 4bd303963e69b67d4cc7ac586a8d0b26e9d3828d02bbf917af27370a98761cad6f222632ae7d32e22d8290e7574a697c4fe3302098b3510c04910d68063ff115
+EBUILD pyjwt-1.7.1-r1.ebuild 1277 BLAKE2B 37244e0653072aef88bdb770674ed240d4304f237af1ef80a04c8faf588f7b7584d8658f9ad3b47ac37ca9671c243f9578cda36ab373f7409dc60a80ffc68eff SHA512 b5c3a73f5046362475f6a183a443b4da367cf2a665687fc927072570e12ce7d665a686befbb52fb7a22bbc5590f5e56f050c1555ac3b1a07b6e1215163af0857
 MISC metadata.xml 252 BLAKE2B 507e0ddc9d50b879ff374b903b142f85d020dfd6c486aba2af84fe082c878e780edbb79188ae10104d57db0eb775c86814cc8c06891a3854c9da840a4d377050 SHA512 9470ac9c8a5a4f80e3f767e7aa198addc7b21866c63b2a310e9f41ce65817672fb77423117bdd619e99cb62322025aeadf50717e23eafabf99080fcc106820af
diff --git a/dev-python/pyjwt/pyjwt-1.6.4.ebuild b/dev-python/pyjwt/pyjwt-1.6.4.ebuild
deleted file mode 100644
index 775d96707..000000000
--- a/dev-python/pyjwt/pyjwt-1.6.4.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# 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,5,6,7}} pypy )
-
-inherit distutils-r1 eutils
-
-MY_PN="PyJWT"
-
-DESCRIPTION="JSON Web Token implementation in Python"
-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"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 x86"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/cryptography-1.4.0[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-S="${WORKDIR}"/${MY_PN}-${PV}
-
-python_prepare_all() {
-	find . -name '__pycache__' -prune -exec rm -rf {} \; || die "Cleaning __pycache__ failed"
-	find . -name '*.pyc' -exec rm -f {} \; || die "Cleaing *.pyc failed"
-
-	# enables coverage, we don't need that
-	rm setup.cfg || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	pytest -vv || die "Tests fail with ${EPYTHON}"
-}
-
-pkg_postinst() {
-	elog "Available optional features:"
-	optfeature "cryptography" dev-python/cryptography
-	optfeature "flake8" dev-python/flake8
-
-	ewarn "flake8 feature requires 'flake8-import-order' and 'pep8-naming', which are not in portage yet"
-}
diff --git a/dev-python/pyjwt/pyjwt-1.7.1-r1.ebuild b/dev-python/pyjwt/pyjwt-1.7.1-r1.ebuild
index 8e84b65fe..bc3db9af7 100644
--- a/dev-python/pyjwt/pyjwt-1.7.1-r1.ebuild
+++ b/dev-python/pyjwt/pyjwt-1.7.1-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1 eutils
 
diff --git a/dev-python/pyjwt/pyjwt-1.7.1.ebuild b/dev-python/pyjwt/pyjwt-1.7.1.ebuild
deleted file mode 100644
index 775d96707..000000000
--- a/dev-python/pyjwt/pyjwt-1.7.1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# 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,5,6,7}} pypy )
-
-inherit distutils-r1 eutils
-
-MY_PN="PyJWT"
-
-DESCRIPTION="JSON Web Token implementation in Python"
-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"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 x86"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/cryptography-1.4.0[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-S="${WORKDIR}"/${MY_PN}-${PV}
-
-python_prepare_all() {
-	find . -name '__pycache__' -prune -exec rm -rf {} \; || die "Cleaning __pycache__ failed"
-	find . -name '*.pyc' -exec rm -f {} \; || die "Cleaing *.pyc failed"
-
-	# enables coverage, we don't need that
-	rm setup.cfg || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	pytest -vv || die "Tests fail with ${EPYTHON}"
-}
-
-pkg_postinst() {
-	elog "Available optional features:"
-	optfeature "cryptography" dev-python/cryptography
-	optfeature "flake8" dev-python/flake8
-
-	ewarn "flake8 feature requires 'flake8-import-order' and 'pep8-naming', which are not in portage yet"
-}
diff --git a/dev-python/pykodi/Manifest b/dev-python/pykodi/Manifest
index dab06911f..eb2be42b9 100644
--- a/dev-python/pykodi/Manifest
+++ b/dev-python/pykodi/Manifest
@@ -1,13 +1,7 @@
-DIST pykodi-0.1.0.tar.gz 5958 BLAKE2B 5ef21e16cea4cb7a33247eaaf8abaf9a023a74943952ed669c80008a9284dea24930bc8fada601cd22d5eafc7acb46fb99d15812702b9abd2c2c3afae36c0160 SHA512 2a99d180730b58c432827923e34759a2a09ef0149f0f6e2c91e14d9b54e7544962e284c39976de9ad8a1f159063b1276d82312f896640381bfc97b2d441aba37
-DIST pykodi-0.1.1.tar.gz 5947 BLAKE2B e048c536d3d85bf2274acbde851672a6fcfd787d8b41d7514945547606f64d02e1e5e8cc335e25ba7ffe4cfefea37d77b762bf684308c41f01cb000b49ba1e32 SHA512 1cae965c7bcf750978899a43792119049b8a2252e39e206ba4acc2d8275bf77dc6e2e5cf648a64d4bc9596dd3f8b94c99ae4f593cbe7b835c65bf3469b065fd4
-DIST pykodi-0.1.2.tar.gz 5943 BLAKE2B 75ffb30e74cf60423c8e4ccff5e8475054ea6acc675883d2ef99f03f9300ae600ee310182c36a8641bd20bd064bab20307f4a8685e60c29b9c9e4aee17670509 SHA512 8668b5393f6596e96a271e76827cb383a666f32e90dc917f1fd998163cc36a797def91426bd37931827ced663975808483b5c4a43bfba69ad4f554bee9ded534
 DIST pykodi-0.2.0.tar.gz 5936 BLAKE2B 88c3267c36d979813d1e305dfe8bbf1a24636bb9aa96514015c27c5e7fa4d009533e09dc7aa5c353ff8c1158eb042dd7df03afe5cbf0ec3c00539668cb63b296 SHA512 1a6585ffbfcd3451cc58cd1b39b06400b823b5b46dd55a0ed8618e3f9f7d8a2e0bdc56be0f7118e29ac146cda5ffb39273043bd704be5f2dbd352521be8b5024
 DIST pykodi-0.2.1.tar.gz 6258 BLAKE2B 89d4b10b4fd48edcca8fbd74fa39cbf2c584394a7b40e70581dfb5fdd33ca9a6266df09f0fd4748989260d4ab73c05b1206b47a8057b3a8360b14c1466c0c014 SHA512 feed053e8d0a2a039edb30a68786f70d575b87d27573f863d674bfe2ec83524dc226c1f34c8d8c1fb84776cc9d7b1dff188c76bd73dddf85710167131a832304
 DIST pykodi-0.2.3.tar.gz 6657 BLAKE2B 179cfc330aa904da07ed217219d5e8ef6622b0e68f6e9da20eca5ecec308141082c0d0f9a4c2b57d93d57533224196f8b6aebd36bf7d98d0deca917b456d8bf6 SHA512 3e29e28e95ce57d5b23cb21c4994580c4dbe0889f39cca2277457a0436e34196e5786e046e922884bb43d4e8ab42fd21fadd1b09ebffd540dd6d11c6ca2660bb
 DIST pykodi-0.2.5.tar.gz 6641 BLAKE2B 95be57b1d68b5955a5bd2a98ce1647e2793f14661abbd5385404b0fa1fe56347cd1b4593fedcb3c5306b4d0c8817d8b9789264b03ef189d02f5468be4b8efc3b SHA512 fb11b434b44bd8139a7935891321834c245c19caa6392aee4aac953268be3df9a3835f5af8921f78bfc98c91317e480557fa7d3faf1816a55069447fe1e46744
-EBUILD pykodi-0.1.0.ebuild 861 BLAKE2B 5587ac9b377ce3a74fc6be132b4ae7414ce82f98db8e700784205d293ec21bb7011d12739fe3fa6187f18a04d774d11b8d97fdb79b975a78932ef9a8dac38c56 SHA512 353e46a49bb337d741ebe90717fa319d0a7dc78b233aeb1036d09cc50a6880f6413dd1afdecc78e9ae669274059a0f82a597801d94446a31f57aa895c1ed35dd
-EBUILD pykodi-0.1.1.ebuild 861 BLAKE2B 5587ac9b377ce3a74fc6be132b4ae7414ce82f98db8e700784205d293ec21bb7011d12739fe3fa6187f18a04d774d11b8d97fdb79b975a78932ef9a8dac38c56 SHA512 353e46a49bb337d741ebe90717fa319d0a7dc78b233aeb1036d09cc50a6880f6413dd1afdecc78e9ae669274059a0f82a597801d94446a31f57aa895c1ed35dd
-EBUILD pykodi-0.1.2.ebuild 861 BLAKE2B 6aa27d8aa30570195ee8cdeb0412575d4596357a16b23afed3ee78b0413085af0bccaceaf50defbaab465dfde438a1d84686558f7a452bb308003ed75bda12aa SHA512 5c4cdfcc9e5707859f0e71b08c3afb142a8d4da80e14a177a48379e41123ab61358cae84d2865664c16855b33171588e8bd0de9857c9e8e8abe8bb5da1a89146
 EBUILD pykodi-0.2.0.ebuild 877 BLAKE2B 0bf5607bb87cdd965bec6189cbd96f71941d4ce11e4c858cd20769fda61d6f8685938a5314a9b9fbe0c2596100a588d74afd16aa296d9ec9fcb9e73f8c29a55b SHA512 7e7c8fe3400afb95ce2c2e87bd19bd133d822eb3982eabb57a79f9b7f34b3a48e9685fe4d300be3e0c8a048127a526e6a675632e557f85357f1e4d96f1678bc9
 EBUILD pykodi-0.2.1.ebuild 877 BLAKE2B 0bf5607bb87cdd965bec6189cbd96f71941d4ce11e4c858cd20769fda61d6f8685938a5314a9b9fbe0c2596100a588d74afd16aa296d9ec9fcb9e73f8c29a55b SHA512 7e7c8fe3400afb95ce2c2e87bd19bd133d822eb3982eabb57a79f9b7f34b3a48e9685fe4d300be3e0c8a048127a526e6a675632e557f85357f1e4d96f1678bc9
 EBUILD pykodi-0.2.3.ebuild 884 BLAKE2B c7e15190c43926e3e77347f45e0a8ade9053d7347efbb6da25f7843cb1eceef42f58c508b5885fbd2c73b0b74a26b94135beac8e69f742c0ce07d252f602c529 SHA512 93c2eaebf5af561256ac341a6642d672a2fe74a0d09f89f319c1026e36ddd2ce1aea47bfe84387f834277884531ef20b75f4c8a8711a752b15db2598ec145d1f
diff --git a/dev-python/pykodi/pykodi-0.1.0.ebuild b/dev-python/pykodi/pykodi-0.1.0.ebuild
deleted file mode 100644
index 59baa3f1c..000000000
--- a/dev-python/pykodi/pykodi-0.1.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit distutils-r1
-
-DESCRIPTION="An async python interface for Kodi over JSON-RPC."
-HOMEPAGE="https://github.com/OnFreund/PyKodi https://pypi.org/project/pykodi/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND="dev-python/jsonrpc-base[${PYTHON_USEDEP}]
-	dev-python/jsonrpc-async[${PYTHON_USEDEP}]
-	dev-python/jsonrpc-websocket[${PYTHON_USEDEP}]
-	dev-python/aiohttp[${PYTHON_USEDEP}]"
-BDEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/pykodi/pykodi-0.1.1.ebuild b/dev-python/pykodi/pykodi-0.1.1.ebuild
deleted file mode 100644
index 59baa3f1c..000000000
--- a/dev-python/pykodi/pykodi-0.1.1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit distutils-r1
-
-DESCRIPTION="An async python interface for Kodi over JSON-RPC."
-HOMEPAGE="https://github.com/OnFreund/PyKodi https://pypi.org/project/pykodi/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND="dev-python/jsonrpc-base[${PYTHON_USEDEP}]
-	dev-python/jsonrpc-async[${PYTHON_USEDEP}]
-	dev-python/jsonrpc-websocket[${PYTHON_USEDEP}]
-	dev-python/aiohttp[${PYTHON_USEDEP}]"
-BDEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/pykodi/pykodi-0.1.2.ebuild b/dev-python/pykodi/pykodi-0.1.2.ebuild
deleted file mode 100644
index 19861abf2..000000000
--- a/dev-python/pykodi/pykodi-0.1.2.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{6..8} )
-
-inherit distutils-r1
-
-DESCRIPTION="An async python interface for Kodi over JSON-RPC."
-HOMEPAGE="https://github.com/OnFreund/PyKodi https://pypi.org/project/pykodi/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND="dev-python/jsonrpc-base[${PYTHON_USEDEP}]
-	dev-python/jsonrpc-async[${PYTHON_USEDEP}]
-	dev-python/jsonrpc-websocket[${PYTHON_USEDEP}]
-	dev-python/aiohttp[${PYTHON_USEDEP}]"
-BDEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/pykwb/Manifest b/dev-python/pykwb/Manifest
index 3b7eb6ccf..2162b45b6 100644
--- a/dev-python/pykwb/Manifest
+++ b/dev-python/pykwb/Manifest
@@ -1,5 +1,5 @@
 DIST pykwb-0.0.10.tar.gz 5000 BLAKE2B 344581404b35b0f9fa9bb39e039b60f9570a00d4274742c14d60eec17e56d4b1a2cc54f31bc60572285b7efde1bd32466886a6540aa866e334132df302d0b771 SHA512 b449245d27a0d257a0eb42f86838259ef941b06d479e3d12ed5f7ac5c07f7b49e8e046b007c77bc26e4872909f336c6e354d95e964665e3d6de15161f0b449fb
 DIST pykwb-0.0.8.tar.gz 4613 BLAKE2B 4544f30995cd74a0461c48c11e3be9c4e5defa91849763c1fdc0e5a5d9f8b777c993bcc28be15ca915b587388e1249d0eddb3146bfbbd495e57e11e11c80683e SHA512 84f0c08c74487d0e2c1f9ce4fe02c26f76c9137e1af28e653bdace614dde937ddfd5202a03fc2b01a243967f96f77faeb722e24a493e1f930a0e833f1b3627e0
-EBUILD pykwb-0.0.10.ebuild 747 BLAKE2B 70db17c68e62081e9175d70e3e1b9b0b1901466975c7ab66106520363d964de43fe117a319bac286dc70b115c1d4c8562ab5e3408aeee46f4d3589abf782cdc2 SHA512 8fd98618fd5af365dd267599348bb85fa40c932f6ac4af6bdbbfa164a39a568f87c0d58df679ca788a791cbf9d0e4237b30528f9a1b762fda8d7e9afef9949ce
-EBUILD pykwb-0.0.8.ebuild 738 BLAKE2B cf0eaa045618c237c75244f5b96763ad07cfcdb8017f03083e4715b8a5d9e3c694265726ec57f939c6a9744ec9bcf032bc34fe890126adea189a852d2c547e0c SHA512 60c440ff79b8b6989f519894f97594d21b0318113293616960fd524309d43025571165f71b03a2ac1c1fc39d3e693630868b18bc866d52f8a6c33b371de65cfe
+EBUILD pykwb-0.0.10.ebuild 746 BLAKE2B 4961b2dd87ead44f6ba6b0140fb6c3d5d258dd6fd273fb1c5f16904669c826dc3f07d81133d358d5b30c72367b68c55fbdecae6fbcf806a7e6aa7042c2cd2ab6 SHA512 5fd618980d90c797aafc60c4b1652bfee7ff5b2d549d2b294da0e94989b7d95d9fe6627506870b0cef1979ec692def156674a8a5dd715aefa1f2a5b335c0f80b
+EBUILD pykwb-0.0.8.ebuild 739 BLAKE2B 5f53c9dcdb39a3fa1b40d713fc00237731480eaaf20cf8865b49789994414ef772325603f7791f8a9d00f2ad60ee2ce7ac61640900a8ccfd2032b56f6ffcef63 SHA512 4a8c88772a408662db9734c5a9fb35725814aed1c37a91300d8a682ff81a32c985d2fe6c5a2c340ce872811571f7e1dcb4acb26a7dd47ae87d00c2a58dfef323
 MISC metadata.xml 445 BLAKE2B b4397325fd602959a1b49389130ce1eaaddaebee8ef31aea9b86a1f5262726d837e41b86fd15b5f101371ba5577db961de7a0d6859486e7798aaa33e019ef8da SHA512 dc860e91fbee25cab39ad3f63140d60d6d8d225643e7fee70a89035e4fc497c16d7725b2993f6a4a2d949a1ccace6a47b1c5f1ff60275487c06731b2727760cb
diff --git a/dev-python/pykwb/pykwb-0.0.10.ebuild b/dev-python/pykwb/pykwb-0.0.10.ebuild
index fa6576c00..df16e1171 100644
--- a/dev-python/pykwb/pykwb-0.0.10.ebuild
+++ b/dev-python/pykwb/pykwb-0.0.10.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/pykwb/pykwb-0.0.8.ebuild b/dev-python/pykwb/pykwb-0.0.8.ebuild
index bf207b676..4775b413d 100644
--- a/dev-python/pykwb/pykwb-0.0.8.ebuild
+++ b/dev-python/pykwb/pykwb-0.0.8.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/pylacrosse/Manifest b/dev-python/pylacrosse/Manifest
index 2c364566a..d4891fdaa 100644
--- a/dev-python/pylacrosse/Manifest
+++ b/dev-python/pylacrosse/Manifest
@@ -1,5 +1,3 @@
-DIST pylacrosse-0.3.1.tar.gz 6931 BLAKE2B e76bf3bb5afe444bde9a694bc7078cc673209dc06367da5dd166a48848ef3a7963cc08dd819119a8691cec6c522abc2d236b1a2fb58383bca0241d40f827630b SHA512 01e255d27e0db658b6010ef0980a5aed592c6dea2d5f25b689acd9708c8786f5a8378bd85b916718dddbbd4f013931f50432099d14bb855b9d2c331a44531c25
 DIST pylacrosse-0.4.tar.gz 8287 BLAKE2B fa8fae8bb0cae0ebf7669ae5977b2a107328272e8c8ddc5b839cf84dcd62bcd7d544f44723444b66c72b8ad8b526a9cd4d1eb03e19dc0776ed10c2edf2147952 SHA512 3b638aa8569fae6056d4d6d872d864e5b6215fbe2e6f11ef50e2cdc630aa173ec9beff3705a144857242490b13147b8604fb4b54813ae35f29443bd62d117d8a
-EBUILD pylacrosse-0.3.1.ebuild 673 BLAKE2B 379b6051ffe6289d9a614060727921c6f35953bf48606b2e2dc9462766bb28a0b544426c58240290a342413cf2e9e8b8eb3c62767b08413943a770d7479b1298 SHA512 2d7b814d7938f5330722e8056ce4c1b26bf07e5fe1793d4ac94de92eb92a2ee62f505ab82f5a40b57519c702743e2adf4e522bd1f4f5eb6af095671fb44d3797
-EBUILD pylacrosse-0.4.ebuild 717 BLAKE2B c4a385a061ee35ead339ce572d603881c94eb27fb438a18906f8e82ef2d98ab52ee9ef93d7994e0c2cf99a710af5aa621606f10d31612bfc8a326dcc3afb7a29 SHA512 ee27cdd04c0648eec2e57e4e01ce6c18448d8293f30843112c29d9a08329321d5df8a0289388f5cc754456acd3fc302b8ab936f3e0add102441a284a6c49e7f3
+EBUILD pylacrosse-0.4.ebuild 716 BLAKE2B 32c59c98de1cabb7e2aa1710a3345fbece6e5279fb1643ece98d9a99b6fe08e5d4cf6c0d45a835c2a56fee94fd3122084d0603dbddfedce2f67783824ce47eb0 SHA512 da28e128171bacdaf5d0511d79cbcb0d3cd20452b8f9f7f9f04c30cd3a8538332e00963d146b2c9ee0e5f50c204836cafcd427f0e5572ce4b4089469aa121dc6
 MISC metadata.xml 457 BLAKE2B 3759937fa32b1067bfaef7d349a5dea3a9d9f5c3063173355fb1c0c3e62c22bc4ca33f7c4ac1b99560bd7dfad90f0bffd3e90462e37fceb3854cc991d60bb7a0 SHA512 78ed55bf0c1455e4cb6fac959674230ce6536bd3d80dcfb7a7bc4da701b6d7af1ba36666f66c05ddc25d9dd6b39fdab88285261d351e9d636592d2658a24cd1a
diff --git a/dev-python/pylacrosse/pylacrosse-0.3.1.ebuild b/dev-python/pylacrosse/pylacrosse-0.3.1.ebuild
deleted file mode 100644
index dca25be0b..000000000
--- a/dev-python/pylacrosse/pylacrosse-0.3.1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{5,6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="LaCrosse sensor library"
-HOMEPAGE="https://github.com/hthiery/python-lacrosse https://pypi.org/project/pylacrosse/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/pylacrosse/pylacrosse-0.4.ebuild b/dev-python/pylacrosse/pylacrosse-0.4.ebuild
index 87a4903b2..43f839c73 100644
--- a/dev-python/pylacrosse/pylacrosse-0.4.ebuild
+++ b/dev-python/pylacrosse/pylacrosse-0.4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/pylinky/Manifest b/dev-python/pylinky/Manifest
deleted file mode 100644
index 06ef5f504..000000000
--- a/dev-python/pylinky/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-DIST pylinky-0.3.0.tar.gz 4364 BLAKE2B fd4c5a64a603ee13090c73413710847e6e05f44ac2042837ab9149b70c8bb776949c45582253effcc5915047035c79c86c9d166e8ab61c109a2c39dab8ed8773 SHA512 8b0b6fe2acf18458febdf6265b017198924c383c8cbb64e60b1eaf84d1c278789ed749d4c0cdc2ca8bab26d49c7bd43c458f0abe225e7724e89887d9c4b3224d
-DIST pylinky-0.3.3.tar.gz 4836 BLAKE2B 891c2828dba4c99dbb515b0f1f274fd242bc5da5a33d4b9ba57aec8881b85a180da2e91e7c6a7af4e60c25cfc8aebe7a2ba75843b3293d9bc3000e1b95561d73 SHA512 00e4f0028d6d8be95445c07913c8e8650cf2de007e3ce0e1c60385ecc9359db1ccc78e36435e98eba2e6615b07fc0fa9b169cf1e5fd4df8c8d82f7c10d491123
-DIST pylinky-0.4.0.tar.gz 4970 BLAKE2B 480aaed1667e30ed61589af35e86f8495c8b9d5c2f17b64611689ba4adebdf8d742bc75b187a761d8f0a43967f1e5249876cb102f6cbb71f6515548c0cd0a811 SHA512 a2342e7345b9dbbf2c18d5d8da3075fbb0dbdd6b272beac2b192bba33202b4ff54d521776816c6ea021cc59f574689861773c1d390dba0f96aa5985e1c85a876
-EBUILD pylinky-0.3.0.ebuild 846 BLAKE2B d2448a382dc4c79c02ca154add4f432737c3952d193299b24fe4807886b399602c1c08ac524bee83b0bb622ebecdd1555b7f982dc10131d40fc422210043f02e SHA512 a00114aa333defc92da41032202ccb59b0f24faebf056000cbf8d1b6581b076fae27f2fdb45ae7a72bb133e3b3c1c99f4889abf13e5d8b5ba12a85a21801543d
-EBUILD pylinky-0.3.3.ebuild 846 BLAKE2B d2448a382dc4c79c02ca154add4f432737c3952d193299b24fe4807886b399602c1c08ac524bee83b0bb622ebecdd1555b7f982dc10131d40fc422210043f02e SHA512 a00114aa333defc92da41032202ccb59b0f24faebf056000cbf8d1b6581b076fae27f2fdb45ae7a72bb133e3b3c1c99f4889abf13e5d8b5ba12a85a21801543d
-EBUILD pylinky-0.4.0.ebuild 853 BLAKE2B 99f9a0e01e5d9593df3823121f7328bc8032af52c341c1d19fb9c5d98aa13bdc66b690c6443c1c6a3caf969534a3837aeb9814d53ee63d11a6a8111d9fd0b764 SHA512 8017049527ad5cc475dc8ada1397dab62010c02952ca9c35a189a66d8af249328623e5d60c3a5cdaf4f7323b12461e928de5cbadcd2f5290b926c4809084f556
-MISC metadata.xml 342 BLAKE2B 203283f14dd5164b1550e356e5990539def0ca3b4415303d15e0ba0f0e4aa88a6d8fa7914685948599b6cfdae6f2c553c66e869c5c85139c34bb99e989c0e99a SHA512 42659a00414fc3bf1b52a981aa26c2ea9f405a49b58ea50558bdeac275406f7cb293e8d3dabfb73db8fb986f6ec6bef52f26e3edf7ccb566c4ac293b1ed20516
diff --git a/dev-python/pylinky/metadata.xml b/dev-python/pylinky/metadata.xml
deleted file mode 100644
index b59d622f0..000000000
--- a/dev-python/pylinky/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <upstream>
-    <remote-id type="pypi">pylinky</remote-id>
-    <maintainer status="unknown">
-      <email>grytes29@gmail.com</email>
-      <name>Dimitri Capitaine</name>
-    </maintainer>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/pylinky/pylinky-0.3.0.ebuild b/dev-python/pylinky/pylinky-0.3.0.ebuild
deleted file mode 100644
index 0f825634a..000000000
--- a/dev-python/pylinky/pylinky-0.3.0.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{5,6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Get your consumption data from your Enedis account (www.enedis.fr)"
-HOMEPAGE="https://github.com/Pirionfr/pyLinky https://pypi.org/project/pylinky/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-src_prepare() {
-	sed "s/packages=find_packages()/packages=find_packages(exclude=['tests','tests.*'])/g" -i setup.py || die
-	eapply_user
-}
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/pylinky/pylinky-0.3.3.ebuild b/dev-python/pylinky/pylinky-0.3.3.ebuild
deleted file mode 100644
index 0f825634a..000000000
--- a/dev-python/pylinky/pylinky-0.3.3.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{5,6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Get your consumption data from your Enedis account (www.enedis.fr)"
-HOMEPAGE="https://github.com/Pirionfr/pyLinky https://pypi.org/project/pylinky/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-src_prepare() {
-	sed "s/packages=find_packages()/packages=find_packages(exclude=['tests','tests.*'])/g" -i setup.py || die
-	eapply_user
-}
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/pylinky/pylinky-0.4.0.ebuild b/dev-python/pylinky/pylinky-0.4.0.ebuild
deleted file mode 100644
index 8e25c4ec8..000000000
--- a/dev-python/pylinky/pylinky-0.4.0.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit distutils-r1
-
-DESCRIPTION="Get your consumption data from your Enedis account (www.enedis.fr)"
-HOMEPAGE="https://github.com/Pirionfr/pyLinky https://pypi.org/project/pylinky/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-src_prepare() {
-	sed "s/packages=find_packages()/packages=find_packages(exclude=['tests','tests.*'])/g" -i setup.py || die
-	eapply_user
-}
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/pyloopenergy/Manifest b/dev-python/pyloopenergy/Manifest
index 71d56e8ab..31c637b2f 100644
--- a/dev-python/pyloopenergy/Manifest
+++ b/dev-python/pyloopenergy/Manifest
@@ -1,7 +1,3 @@
-DIST pyloopenergy-0.1.2.tar.gz 4527 BLAKE2B e38113d34ab3424523de5c234277b06435720fa36345d43e126ace8140ec4dd5cee27e7bbaf55d3d9b2aeffd0fb4569aea7338f62b1a64927cc17e9fd760abdc SHA512 d4d8df7d7c294d819f8c24d958584bef21b09d895f479b1be8b401f072785ec32ed8c861b10d3b515eeea0bf5a69e28cb9575fef19533847a3e15d8d98f16f84
-DIST pyloopenergy-0.1.3.tar.gz 4534 BLAKE2B df9b10f87775929dc73d678159394cfe1b6d5c2af3c4b849f4104a6df2c46bb7534af702c407c95e0dbbec0914247682dd5ea26531689a07f60a02e3a657fd8a SHA512 1205434eaf4908c502b53a25de289579011a218b165e7eab288e8a0aa9775a38685510f170bfd1c78b6cbc561728e8e7ceff5a94c2b408f94f7e926e3e283734
 DIST pyloopenergy-0.2.1.tar.gz 5112 BLAKE2B 2ba2338bc761f4492ab097baf7cb099451b12fba953ad9fba6a4c5a5e114318ee33ad7b85cc71f8fc8fb9aacb509e6e10987aa1378573976114cb2afdc394437 SHA512 fcd59c4ec992aec4df5060fb68b253bd65f491f5d62adcba1e4ace40143dd7e6f3caf3a600e003dda92b7801dcba6fc0fbf4724100e05f5176fc73ad6b4b4d36
-EBUILD pyloopenergy-0.1.2.ebuild 696 BLAKE2B 17ef7f07fbf03fa83319fd83110328082f8bb6e0564f2bc901f8036372e3f5402e8478720097088f3f626f39ffcfeabd39ba7d42090d76ce37554f1aa3642639 SHA512 9efd5d8ee6f8dfa4d9f50c70ccf0acf49ac5a6eb8276a91c19e31f1df52d5b97ff061fe52d499f7461e4c113648af6252a17b43b06f90fd0a7530e80c056853d
-EBUILD pyloopenergy-0.1.3.ebuild 703 BLAKE2B 463289a50c260ff7902070a59616a780d4adca8a22b8468662c5a4dcbf6c7c3fefebd7d6bd3f207e750148d92b2a0eb2e8852fe02ef122a1577e97fe5edd0f86 SHA512 6010c559d6ca2e632d96baaf633117b1cafea2264f640b64a53351338b82539ca8bc85d4bd6fc7be47ad21e2bf77f8be3c2016fc23bd1a57fb9c8cfa6ecd02cf
-EBUILD pyloopenergy-0.2.1.ebuild 703 BLAKE2B 5ba8204df753a8094f9e5613943563df97feb9c2bafc35b4ce2ab4b932fddc90928981a7318a58f72aef9b5bf94b526d4b3af62973b7f12ddf4278f430b54acf SHA512 74c6af051a92ed3e2243928e607a2293969e9f07dfd84d0d55d243a33189bbb3742047ccbee55dbc555ed4056ff4be2478fbb9acb757625059aa8538fc001b2c
+EBUILD pyloopenergy-0.2.1.ebuild 703 BLAKE2B 63cd5224380ba966aeaca6f3158b65ab71f847eb5ff3cc309a7236295acb91d16edc63473135660fc8d8633b790a1577f4e7f0c5bf204d3e75a8e20745b6b2df SHA512 b65aa988b1416eaeefd49b39baf0a08ac41e7c7c77a34b52b86a2aecd616cd567a1bd2fe66c58853831e43637436cef41c5909c10657ff2e47f7f436c19d9c55
 MISC metadata.xml 457 BLAKE2B 7699af322102090ad2997190bc98d4c985a709e19992003fbbf050614a6304e2792876ba936b31abc185cc923e4a8e683b8d5b8c3b093ea32d12cac387aa6317 SHA512 cf5125b9e0bb6e9f419f6a0349d4abdf6909ee8f9a9c10fbdfeca8e0281e86801debd9f823c0658487f324bff404dad3300d592cedcef094bf4a51c14433dc20
diff --git a/dev-python/pyloopenergy/pyloopenergy-0.1.2.ebuild b/dev-python/pyloopenergy/pyloopenergy-0.1.2.ebuild
deleted file mode 100644
index 6b2a913dc..000000000
--- a/dev-python/pyloopenergy/pyloopenergy-0.1.2.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{5,6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Access Loop Energy energy monitors via Socket.IO API"
-HOMEPAGE="https://github.com/pavoni/pyloopenergy https://pypi.org/project/pyloopenergy/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/pyloopenergy/pyloopenergy-0.1.3.ebuild b/dev-python/pyloopenergy/pyloopenergy-0.1.3.ebuild
deleted file mode 100644
index f8ce7ee9d..000000000
--- a/dev-python/pyloopenergy/pyloopenergy-0.1.3.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit distutils-r1
-
-DESCRIPTION="Access Loop Energy energy monitors via Socket.IO API"
-HOMEPAGE="https://github.com/pavoni/pyloopenergy https://pypi.org/project/pyloopenergy/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/pyloopenergy/pyloopenergy-0.2.1.ebuild b/dev-python/pyloopenergy/pyloopenergy-0.2.1.ebuild
index 3911f0205..876101112 100644
--- a/dev-python/pyloopenergy/pyloopenergy-0.2.1.ebuild
+++ b/dev-python/pyloopenergy/pyloopenergy-0.2.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{6..8} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/pylutron/Manifest b/dev-python/pylutron/Manifest
index 4b96334c6..c5750b670 100644
--- a/dev-python/pylutron/Manifest
+++ b/dev-python/pylutron/Manifest
@@ -1,7 +1,3 @@
-DIST pylutron-0.2.2.tar.gz 11845 BLAKE2B e4c8cb28077253e1b5cef3257156dc7292f3b043667f30f49820afede37396e6b54f4431ba287f8a6b523e0850f20f8a83397d79ab880816e02d2f70a68d60b5 SHA512 80aeae3e4e9ff0e5e89a9ee866dfc69c2845d3c4f05aa0a3ba2978fd3ad721901879d4c271354b748ca4524023e6a7a42fcf089f197569fadd18bd25b1aa288f
-DIST pylutron-0.2.5.tar.gz 12277 BLAKE2B bc4152d6645c84b481e075040c54e9f6b9a6ad2410b0a6ff3f7bc479f3e5c90262fc90c3d43ca71e55bd0d0b6440d4622f58c31b1842eff5bd057632fbc8b534 SHA512 10ef330e2668010f7d60efb9e84e9e8aad2300a6a43e5e38fab9c78a6663011d68a2550ded0d0e419b776c290390d7d09fcd4469eb471fc34febc8f97849d539
 DIST pylutron-0.2.7.tar.gz 12988 BLAKE2B 8c1fedcb38de86787e89b3c35e7150d1f4151d6cc2a3715ec92f7db969b2f26edbfd8d4854abdf2655f9ac71451f76ae63746ab8c979fabc646708c2f3e8b635 SHA512 ae2e65f537f639fee867df72ba04da75e7f151f8482aca7e770e9f9be26e47727107dd360ea17ac9c153efb99057f0daabf898139d5e31fb8c6dfe2ebcc27a03
-EBUILD pylutron-0.2.2.ebuild 673 BLAKE2B e676be7d3728cf207266f4187592b42da962a1bc58822a0da2e453c33c092b15d8363deb84f5e7fe723bacd8fc0f91431b364471487aeab3363acb7f8841ee11 SHA512 1e76a7df18c39aef19c70a1d8849f0f685b909fdb3d5062b0b028861a4b5fc1e07a8ac15926b8ef6d1deb1b8772d22db7b331a8838d0ad1b838ecd5c11928cfc
-EBUILD pylutron-0.2.5.ebuild 680 BLAKE2B df23bf523689e450e636da7d017f3f9f4b5bcb34ece637fbf5266b32c5f210549f99133fecb2a417a71a29be430a81de3c449d510d167ef8d7cf90ed93a757b2 SHA512 e43af02a54667011aa58ad7868e118998c508f1105a5f42c22a4d9933b6131818ec241fbb4d69146fc5e1552836b69ed9fd90e03c4274fb0b44096eadb9eeb0b
-EBUILD pylutron-0.2.7.ebuild 678 BLAKE2B 154f4e3317b8d84bd0cce3a5f6c5d9c62a912308569a4bf82ddc2451bc8e5746f47b9b14dd41f9535ecb2c3eceee01c986c0b86b05268132114b92ffc2e2c079 SHA512 6f5d68b33269aca50fc150f97bbead4fd8a48255448dd28ebefc58bb72442dc484d0a06a526fd8e69b2aae763277f088381420d1ef02b4fd2433f65bfaa03b54
+EBUILD pylutron-0.2.7.ebuild 678 BLAKE2B 9027b24a60cf1cb75b7bf4a33afd7836883a64502713c526ccd4788f3db02871fb5820d0773485c1d01da09d21fe7c330e633455d8e34e0c6eff87e05e228b04 SHA512 322ce6faea06d3c077c81915aa7978854a977318824280f4c7bdeaf1d9793e56f130da09e7306d67abdf4892caedf763b82b4542f155dd99ac6984ff7ed3de17
 MISC metadata.xml 449 BLAKE2B 1800005f0c715cafcd594bd9c77a426cd670771c4b986119ba50451cd905d6a48d5902c255ca14bc165c5f642bc5f7c1ed5e698fc58be38c1f3c03cb90c9d734 SHA512 0541fa6dd583f87fdbef4ee83bfb574733330f96514906938330283507e52c9505d8cbe531985a2281720ef51e80abdd99a16933ecb01b8557aecd7d6fa74665
diff --git a/dev-python/pylutron/pylutron-0.2.2.ebuild b/dev-python/pylutron/pylutron-0.2.2.ebuild
deleted file mode 100644
index 21380e97b..000000000
--- a/dev-python/pylutron/pylutron-0.2.2.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{5,6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python library for Lutron RadioRA 2"
-HOMEPAGE="https://github.com/thecynic/pylutron https://pypi.org/project/pylutron/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/pylutron/pylutron-0.2.5.ebuild b/dev-python/pylutron/pylutron-0.2.5.ebuild
deleted file mode 100644
index ea6c9f8a0..000000000
--- a/dev-python/pylutron/pylutron-0.2.5.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python library for Lutron RadioRA 2"
-HOMEPAGE="https://github.com/thecynic/pylutron https://pypi.org/project/pylutron/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/pylutron/pylutron-0.2.7.ebuild b/dev-python/pylutron/pylutron-0.2.7.ebuild
index 2f5f121ce..d75f2cf55 100644
--- a/dev-python/pylutron/pylutron-0.2.7.ebuild
+++ b/dev-python/pylutron/pylutron-0.2.7.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/pymata-express/Manifest b/dev-python/pymata-express/Manifest
index 5078e1a7c..c1a29e154 100644
--- a/dev-python/pymata-express/Manifest
+++ b/dev-python/pymata-express/Manifest
@@ -1,7 +1,5 @@
-DIST pymata-express-1.13.tar.gz 193015 BLAKE2B 4d5b16ad79673b3051e6167f06fc0184198e03180f070bf89778ac2108707114ada8d545e677e8e297db54080d12d0b1bd0ff99104a61d286e29afb44ead3a04 SHA512 7ef98c938ddd6c42df77660a6dd3cfaa8bb1b8906e08dcd4676e06a97bd9808023069c0118808b100b5433bc0c6d621a4536a85ccd0b5d56f5b1703a897c7fea
 DIST pymata-express-1.17.tar.gz 153619 BLAKE2B a41d74c8d0b1dc206a0bd4393fca0df0762ddbe195913950e23433bbb1758a5446dd679d46cdbd37b743d2a8f3f04fe538c12e50dbd12478a48b43759bc61ea2 SHA512 bd610f6c82db4e5030be917e24d88b7827612e0baf574f769279ce8eba32f087ec25bd9f2b11fd1f42fee2ecea4744cd1facd58e8c9f17e8bbce28346c930408
 DIST pymata-express-1.19.tar.gz 24816 BLAKE2B c93496d90c1b782d36f03514b37061f63d3c4b000585c8cfdede63737ae528f739bb8214ab77e2ed34ee9fe83704a72805fc36a5157089f12dcc72041d10831b SHA512 1c6a3c0c45998b39b711ddf6bdf10466cc8cd1e48df13f51967a1a9cf7cc4c396958d8a48ca5877a970b5ba5aca84455488bdd39d2f96076094853f31fb54b95
-EBUILD pymata-express-1.13.ebuild 896 BLAKE2B bbb8e0e97ef6b8db3c62d8c1b601fd8fc95fbab2f89afc2e2846cd842c30e8a82e86f184b1544ffa841eb45a64273f71bb9c92ee0e756552dbfac0424f52ba1c SHA512 558f20042a88903ed9b17aa8818871cf0bce648e9e0fbb4250fe0ca7380c412e3a9b7e6897abf3e59da7a7642b7140889e0cd3b6b2c437b56de50f44c510c0e2
-EBUILD pymata-express-1.17.ebuild 896 BLAKE2B bbb8e0e97ef6b8db3c62d8c1b601fd8fc95fbab2f89afc2e2846cd842c30e8a82e86f184b1544ffa841eb45a64273f71bb9c92ee0e756552dbfac0424f52ba1c SHA512 558f20042a88903ed9b17aa8818871cf0bce648e9e0fbb4250fe0ca7380c412e3a9b7e6897abf3e59da7a7642b7140889e0cd3b6b2c437b56de50f44c510c0e2
-EBUILD pymata-express-1.19.ebuild 775 BLAKE2B 70c4e284a65a717e47d805db8506fee6b1cdef57d432f000973e858ff4565f150e44c4ebb1d3e466127f0fc240e10762c549fdbfd463f81926688674d388590b SHA512 93fa54d6ec2d45cbd24328fddb24b709120f3d6221d7cd8c4fa9ae697e1cc745f0be3c0b2c34ea65da3ad84b4b756518ba7d86761512fbc9f6e94b30e7d03d9c
+EBUILD pymata-express-1.17.ebuild 896 BLAKE2B 328fb8fe093dcc5fbe21c0ff70890d43debe75e8d244ceec2a71315a25ccac70244c0399855475dcfeec233297b90866af0ce21afdb8fed57488a9a2356d7d27 SHA512 61a95234364516546e241553d2dd989426f2475ef4fc1953785bfeb325893ef51576319b018ba9474c8821d10454d6b3247a1ff8ecb05714dd25253285576ae7
+EBUILD pymata-express-1.19.ebuild 775 BLAKE2B 3160bf5cbc1b86d6c40be605138dfb22bbc4bf642441d81b683297887c707ad4a0ba31b30e26f83d682a1e0c9fba259aa02a77582864149dee1aeacaf93574dd SHA512 098d10db4f4edb2b1b3fab7d7c49f0626026e3f628e9f2df209c03e708abcc4bc3a66798d52dfd09ea9b03faf2a3db9d2bdf19e2b67172b7c3b50da672d6de67
 MISC metadata.xml 460 BLAKE2B 2a23546abfcfb119f6db14032bd4a260b6d3c61077bfc71a069ceb2063e84704aaa97042fbeaf96fb76549e8c14778d2722a94345137a3c4a8e9a5b774dd2815 SHA512 ca1ab1b6f3ffc3ef7973b2d7f623b3a47c5a4bff2352f7585f75b4568d9cfd187bdd157ced1586b2f7d4034b384fff35368165d088615d4828684e60b893b2df
diff --git a/dev-python/pymata-express/pymata-express-1.13.ebuild b/dev-python/pymata-express/pymata-express-1.13.ebuild
deleted file mode 100644
index 6810fe21e..000000000
--- a/dev-python/pymata-express/pymata-express-1.13.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{6..8} )
-
-inherit distutils-r1
-
-DESCRIPTION="A Python Protocol Abstraction Library For Arduino Firmata using Python asyncio"
-HOMEPAGE="https://mryslab.github.io/pymata-express/ https://pypi.org/project/pymata-express/"
-
-# SDIST at Pypi is missing some files
-# SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-SRC_URI="https://github.com/MrYsLab/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="AGPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND="dev-python/pyserial[${PYTHON_USEDEP}]"
-BDEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/pymata-express/pymata-express-1.17.ebuild b/dev-python/pymata-express/pymata-express-1.17.ebuild
index 6810fe21e..ba32cbe8d 100644
--- a/dev-python/pymata-express/pymata-express-1.17.ebuild
+++ b/dev-python/pymata-express/pymata-express-1.17.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{6..8} )
+PYTHON_COMPAT=( python3_{7..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/pymata-express/pymata-express-1.19.ebuild b/dev-python/pymata-express/pymata-express-1.19.ebuild
index a240de7c8..a191e1ea8 100644
--- a/dev-python/pymata-express/pymata-express-1.19.ebuild
+++ b/dev-python/pymata-express/pymata-express-1.19.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{6..8} )
+PYTHON_COMPAT=( python3_{7..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/pymfy/Manifest b/dev-python/pymfy/Manifest
index 4feb37107..327c113d0 100644
--- a/dev-python/pymfy/Manifest
+++ b/dev-python/pymfy/Manifest
@@ -1,11 +1,3 @@
-DIST pymfy-0.6.1.tar.gz 20802 BLAKE2B 3624bd431a768347667c2a47bfcf40b646a9b4c97535115adbfbf7914a8a3bc65a861859ef8c8ddb517a1b60f2fa7a2f83ab3b27f18e7887bc894858cbb13e4e SHA512 4bf6bce86f64ae58d44c1a4ccddb4d1cbd6c6f04e5c57d9b846f94918d93ac1fdd6999d3bf15b29d139a48b69d57b35da41247815bace7c4661ad1b5f8ed6a30
-DIST pymfy-0.7.1.tar.gz 19457 BLAKE2B a02d892d1376cb505664d0f246c9d726dc17b8b497eb891fec73e7c6353459d65a49bef02f04391cc723afc2da5b559e53f8dd4292668176291dedca5286034a SHA512 f96bdcfcd5a16956bd2092d0d5b489b4ef4fc3a403d67553eba97d3cd1175f3c49920be5bc8d5c7fa45e28707c10c72a145197921b53bc6a3e2ba80f40f9b852
-DIST pymfy-0.9.0.tar.gz 20760 BLAKE2B 81d9352235461952edbb888f25f2c4fdf3a3d906152bc9837bd6569fac13c2a84a2c363534fd325e9044670c242f7beb0dfb34a99eaa200aeb0074270a176316 SHA512 bd9a5825d6860ef939a3354f91930bf2f846936986030a9eb18e83b63a5ce664d4dfeb4a1635ee3de181278294a2b2ac6e9e592a32c8e76c6d3fbfad626e6e6c
-DIST pymfy-0.9.1.tar.gz 20749 BLAKE2B d223bedb76ef845ea0f8072aeb46f7565fa8eade6e1060ee44f7bffa2e5f134108e3a9b3a7d56909b136be81bfcd938bc50369baecbd10f435cabe60ee0b5cc6 SHA512 b4cf621750437d02b6d38e9dede09516b65f799c75107e802c457d92e4ac36bbd67184eb9da0eef3f06d56cfaf7e9bf4f3043812902650f8090d11c516962229
 DIST pymfy-0.9.3.tar.gz 20829 BLAKE2B 400614f6ef1a782425c5e335ff58502e9c95b6ab6db8ff204f6db45e7da4ec51a76f4882533b2eca201e9989314ea4c34871ac42a719b1039b41c7fbc6f317b3 SHA512 d5f34c0172763414a696c58ddc018edfbb4a59ea8847728984761cede1d641d9b16bb071c471255a46a3faaaea1ff6050b75afb354400d4f9dc12d0f3d9b6383
-EBUILD pymfy-0.6.1.ebuild 667 BLAKE2B 4c08a4b0eb26b7277d77ad593d100c3a2319f203eded907cb9a241d5f3535e9d40e961ec50a16ed4f9373c08511b9e94c93e2636cfcd22de90709aa1aa4d2db2 SHA512 29911fc0fa3113fb28787f452db3b05bfd25cfdcd7726ed2dda1792650192831d45c313acd047392fe970979b061075fadcc752dc475561d4d92ca091bdb6435
-EBUILD pymfy-0.7.1.ebuild 720 BLAKE2B 5f499a2d739d09e597dbe16a9f9ace2598504616c262d3223885ab70396de049e801ed6df48f69b688eb51575acbd6d0423ed8aea755c766dfb72ef09891bb5b SHA512 59c2e48ab4d13e4db9b958b586331954ce3a9d191a7e71e6466aabdb27c971f68a6da907eead0c5aac09001a228c593ab5e2115444c5c36bfed7fe7c72b962fb
-EBUILD pymfy-0.9.0.ebuild 720 BLAKE2B 5f499a2d739d09e597dbe16a9f9ace2598504616c262d3223885ab70396de049e801ed6df48f69b688eb51575acbd6d0423ed8aea755c766dfb72ef09891bb5b SHA512 59c2e48ab4d13e4db9b958b586331954ce3a9d191a7e71e6466aabdb27c971f68a6da907eead0c5aac09001a228c593ab5e2115444c5c36bfed7fe7c72b962fb
-EBUILD pymfy-0.9.1.ebuild 717 BLAKE2B 67b398131bd319ad44046c06c5a44fdcdb1fc913b47987d9acf09ec1d48edc56ba61380a3a37d38f6e3ccf8fec245cea5720cb29a5e78c63872b1971d35b687d SHA512 bf0e9b4010dbf487b91e5aa5cbbbd2e6250885b53d26f8ed0eb8c43bd8f9a79f4e1e7153077f7ec51ae934e58453fc1be66f676d27eba960b7e8dd7dd86ff824
-EBUILD pymfy-0.9.3.ebuild 735 BLAKE2B edc1cba18352842afd93834e4af133a6f6f8d0d33720d28bd0871a7988ca8da4aa4f3ed86dd5e47efc17d40b87ee3a520ac7e78bf15aa1cc2a18319b343785c9 SHA512 2a427fe71bea44569b26f7ea62aa7a64abd3c18be3f626045ba88052466b9d2bdcd21ef3b31dd8657782696b6df31242895046c9652633a2d34f97551bba489c
+EBUILD pymfy-0.9.3.ebuild 735 BLAKE2B 8b489af9b05254a3cb29683800deb634560ebb25ddb15029bae7b0a9fa167b51b9d05a44ebb4c5a421b0a0ff248e27caf1707aca444df8c2d0b7f04bd2675615 SHA512 08d63e37f8a4637f0c500426f8830986f9b1707a8f7a274c3ee32436a1cdc9338646fa71128b1ee39eea745e6158f42f7cdac5b055e12548155e4488a9a58b47
 MISC metadata.xml 324 BLAKE2B aec0dc97a53eaf9f04b2a3b929b2639638d1346cc58bc57ba44325eb75922562954a84eee0f014a8596d44d45e4efbe9efbe854f870e3b0baf7f1be95f426d5e SHA512 4ec5a71586e2777f553d4a7e6b617241637588c38ebdd3fa4c1a3106b423910f0d98097961d1a1f8e898b1920de48f6520d5f51e23f6b869198bdac442aa27f7
diff --git a/dev-python/pymfy/pymfy-0.6.1.ebuild b/dev-python/pymfy/pymfy-0.6.1.ebuild
deleted file mode 100644
index 6a05e51fb..000000000
--- a/dev-python/pymfy/pymfy-0.6.1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{5,6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="A Somfy Open API library"
-HOMEPAGE="https://github.com/tetienne/somfy-open-api https://pypi.org/project/pymfy/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/pymfy/pymfy-0.7.1.ebuild b/dev-python/pymfy/pymfy-0.7.1.ebuild
deleted file mode 100644
index 650a65e2e..000000000
--- a/dev-python/pymfy/pymfy-0.7.1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit distutils-r1
-
-DESCRIPTION="A Somfy Open API library"
-HOMEPAGE="https://github.com/tetienne/somfy-open-api https://pypi.org/project/pymfy/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND="dev-python/requests-oauthlib[${PYTHON_USEDEP}]"
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/pymfy/pymfy-0.9.0.ebuild b/dev-python/pymfy/pymfy-0.9.0.ebuild
deleted file mode 100644
index 650a65e2e..000000000
--- a/dev-python/pymfy/pymfy-0.9.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit distutils-r1
-
-DESCRIPTION="A Somfy Open API library"
-HOMEPAGE="https://github.com/tetienne/somfy-open-api https://pypi.org/project/pymfy/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND="dev-python/requests-oauthlib[${PYTHON_USEDEP}]"
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/pymfy/pymfy-0.9.1.ebuild b/dev-python/pymfy/pymfy-0.9.1.ebuild
deleted file mode 100644
index 56e1b5332..000000000
--- a/dev-python/pymfy/pymfy-0.9.1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit distutils-r1
-
-DESCRIPTION="A Somfy Open API library"
-HOMEPAGE="https://github.com/tetienne/somfy-open-api https://pypi.org/project/pymfy/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=">=dev-python/requests-oauthlib-1.3.0[${PYTHON_USEDEP}]"
-BDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/pymfy/pymfy-0.9.3.ebuild b/dev-python/pymfy/pymfy-0.9.3.ebuild
index 601c79b48..5d87ab8a3 100644
--- a/dev-python/pymfy/pymfy-0.9.3.ebuild
+++ b/dev-python/pymfy/pymfy-0.9.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/pymusiccast/Manifest b/dev-python/pymusiccast/Manifest
index 1874ce5e7..09c13d6cc 100644
--- a/dev-python/pymusiccast/Manifest
+++ b/dev-python/pymusiccast/Manifest
@@ -1,4 +1,3 @@
 DIST pymusiccast-0.1.6.tar.gz 7832 BLAKE2B b4bc9ea06f4cb0f1a4c90ffef2fbe75f93349e2b0f0cfc4412e3dae361409c08f9123ab9fc4e31a721beccbe9d75e5bd3464ae08c4e546abb3349cb7755854cc SHA512 0e0160628de78148d8db9fe5078f8bafb167945e845db619a1518be1bdf29feec5e11863d532ad1800202e2d7c27f23a67feb6ccaa304fc4e226108dad0ef09e
-EBUILD pymusiccast-0.1.6-r1.ebuild 582 BLAKE2B d26a9384f94a346a3605cba6d21aab3870d0c5b892dcb4c77fc944219d48348506ef4ed248d3d08ec9e53169a30fd6c720bbcfb6ef0a6b5d8e247815675e93b2 SHA512 5cb2e4c29e34ed30309f869a167273658f8fc53e5531c891711942b3ad51e4fa48bf6e941aa954e30167980ee04adbc2c823fa69d979651cedf0da6a48abb4d0
-EBUILD pymusiccast-0.1.6.ebuild 582 BLAKE2B e470c97aea7f36e5ac20b7a686aa9411c4c6b70c675581b406b648225ac957fb9d86bb0bbdfd4dd9846d8288de4783b738de8886d1a39b2629c4604cd2a8e380 SHA512 d3f32c474463d699935c9fb694e0af410fe6b8faf519a814911616a57769b267b0f2d0808b27a13a49192ce00f45a35a714fd9b64479f51fc58efc101ab10a95
+EBUILD pymusiccast-0.1.6-r1.ebuild 581 BLAKE2B d9be449da603de549af778060f6bd1a8567e9016f036a4bf34663101fa323041d1162a9d6c51845b59bb58733cc8628d0aefcece97df6c887779ef1f4b224acf SHA512 db249ca0902576319be2be554e7768efde24478cb028d25045655b0bed009ca6d65541c63423a79be77a89be4035690ea26c9a1b307ea660920880e66e7acbe8
 MISC metadata.xml 252 BLAKE2B 507e0ddc9d50b879ff374b903b142f85d020dfd6c486aba2af84fe082c878e780edbb79188ae10104d57db0eb775c86814cc8c06891a3854c9da840a4d377050 SHA512 9470ac9c8a5a4f80e3f767e7aa198addc7b21866c63b2a310e9f41ce65817672fb77423117bdd619e99cb62322025aeadf50717e23eafabf99080fcc106820af
diff --git a/dev-python/pymusiccast/pymusiccast-0.1.6-r1.ebuild b/dev-python/pymusiccast/pymusiccast-0.1.6-r1.ebuild
index 4101e395b..0959ba557 100644
--- a/dev-python/pymusiccast/pymusiccast-0.1.6-r1.ebuild
+++ b/dev-python/pymusiccast/pymusiccast-0.1.6-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/pymusiccast/pymusiccast-0.1.6.ebuild b/dev-python/pymusiccast/pymusiccast-0.1.6.ebuild
deleted file mode 100644
index 9b7aebce7..000000000
--- a/dev-python/pymusiccast/pymusiccast-0.1.6.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
-
-inherit distutils-r1
-
-DESCRIPTION="This library brings support for Yamaha MusicCast devices to Home Assistant"
-HOMEPAGE="https://github.com/jalmeroth/pymusiccast"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86 amd64-linux x86-linux"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND=""
-
-python_test() {
-	unset PYTHONPATH
-	nosetests -v || die "Tests failed"
-}
diff --git a/dev-python/pynello/Manifest b/dev-python/pynello/Manifest
index 6a4d43e29..77f0bf49b 100644
--- a/dev-python/pynello/Manifest
+++ b/dev-python/pynello/Manifest
@@ -1,5 +1,3 @@
-DIST pynello-2.0.2.tar.gz 7036 BLAKE2B 7dc739ce14b3a98be8616072b1cf1dea1c596b19c2e6e66ed51cb6ec30b8069ec6b206d90d4a43ae6fa669e8e11159948a4210b216d7a7350c212d5ca52bcfe5 SHA512 dd63a79c0f0d513378755025ecd04945fca58277b2ea097dec217ed25eb85ea86d4fb58eb4aa31e043b9023b9a63b5dbaf1504f02710b660834240039d392125
 DIST pynello-2.0.3.tar.gz 7683 BLAKE2B 13dfc2422e594277c5c471ef3eab12197808c1cac630842cae52c2b03cd7cfcb8bc8c83cb7ef392d5d5fcdc182d9591c8c2f47f61ffa998dd731a2ddfab7b11c SHA512 6330f95ca21f75ab45e3929e011e70206210725e12739e401489e01797fe07bdfe855f11e49d635496c4dd1a343c263ef37a88f3f1537b17a6836b8a2ed9d017
-EBUILD pynello-2.0.2.ebuild 804 BLAKE2B 518f84a96658af04017c8199c3d67a62009927d04db9a2335955ad7a2f845df0b11932fae2e625fd7e699780e03e95137273d4a9b9557a1a0e50e0fe752ed6ca SHA512 ac76ad58dfc6865d601d74bb98b7227eb05099d04cb1939c8ed993c48f7922055124d477f46dcbdcfcdaec8c38915a9e28bc710ca84994a39adc1a7f3d70eecb
-EBUILD pynello-2.0.3.ebuild 813 BLAKE2B 629e4e5037f331c767119582e4c725601ee5208120051a63720cae98cafde89c272b02259761252b8ca61034d1ec1ea724dbc9026aafd649d0d4d0b0a56040e4 SHA512 eb5629c6d5521d3a325c104b535323e515d81872c3de2e9278a6aea7a455fd6e2193aa35248f7984a5b4b66dbb720333dc7c9f1de7ca70429295d7ef068ddcb1
+EBUILD pynello-2.0.3.ebuild 812 BLAKE2B 4c6568452516ab19b24c112dd765575b66852cd209778b698135950251327d98a4e82d6a504d8664d26cf5fc496a2e843defdcf76a7707b4ad817f4462879eae SHA512 e62fa426231cc02c261d339c019e2f75bbd39f88a402d4f92d6898c424467311658f5582e8e709f1c837ac3348c0a62703eb2ce565ce6b9c8e910e0ec290603e
 MISC metadata.xml 453 BLAKE2B 5e6bd277d56014e22ede9cb5220c79bbba6fa23048bd834a7fbb64be68161ef517ff007ef4fb303b85ae582476a126e748f7502a10cbad6a55906c718bb95f5e SHA512 0b7483c038c99efd16ebb5464503623de5f0b3c5299797cf68926c1127ec2d8b88ef92459b2dbfeab2c6575b4173946f5e2356c78cc093a8f6ecf12cfa5c4d85
diff --git a/dev-python/pynello/pynello-2.0.2.ebuild b/dev-python/pynello/pynello-2.0.2.ebuild
deleted file mode 100644
index 2d40202bc..000000000
--- a/dev-python/pynello/pynello-2.0.2.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python library for nello.io intercoms"
-HOMEPAGE="https://github.com/pschmitt/pynello https://pypi.org/project/pynello/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND="dev-python/python-dateutil[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/requests-oauthlib[${PYTHON_USEDEP}]"
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/pynello/pynello-2.0.3.ebuild b/dev-python/pynello/pynello-2.0.3.ebuild
index 0b98a691e..6a2d210c7 100644
--- a/dev-python/pynello/pynello-2.0.3.ebuild
+++ b/dev-python/pynello/pynello-2.0.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/pynuki/Manifest b/dev-python/pynuki/Manifest
index e04c714eb..6de464d88 100644
--- a/dev-python/pynuki/Manifest
+++ b/dev-python/pynuki/Manifest
@@ -1,11 +1,5 @@
-DIST pynuki-1.3.2.tar.gz 2661 BLAKE2B 231500b64d33619baa194ea540d92e4b30585b60812167fece2b3e2918c4a600295ea5f12f8606216b5cd6bd2b5e6e685762420a0eedcf63ee1c6fb4113fa098 SHA512 bd11c40a061dc706c33e355a81362382c6efb747a4656d2d7be5f9bc1158edddc03b9df84cfd0c2702ed24dda072f46e43fe83e6636714682668f7face85331f
-DIST pynuki-1.3.3.tar.gz 2685 BLAKE2B 6c64736d0b46d55a4794111d6c62a493c34c4c29f5f9451362cefbf213b585254777d22aef42bc8a50bd1086c2696c7d9c64d47fa3005182550f9be43f2c89ec SHA512 2173e9d7e3f4c41d083a837e8892059017c994e56ed789073baeb7ccc2672d74b5f27bf8fa79f7aea43bb702060103ef393b4980f171a5e769588b87c7240417
-DIST pynuki-1.3.7.tar.gz 5808 BLAKE2B 13384ff227cc3d3debfe29d010facdd4029d8476ca7b5ae5e081f9954a76f50ec22234bc97ef58a615c1c46905fce9081b40c28b5b9e1dc2fed0dbf3b6712ace SHA512 a141101b747e8814c02cd7c8097c345593ffbe60296dabadd37bc555d4644cfb756c95a2cbfea2e0e980f45c12c020b4ea092e8112d3dd27454f5216b91db8c7
 DIST pynuki-1.3.8.tar.gz 5885 BLAKE2B 95b9ed46d51067c4a957ec5437c67a9d801d621cab023b0dab96743906d7cce7dd51ff15c78ba6f3016602a56c7581a44a9220b0ace8b457741f69448b510e61 SHA512 beecaaef416c886e5f6d63455ea7f5eccfb2492c5b289d18a7b8fec6ca1a9210cea5e6ef72990db5881481a95874ca31143370652b1b98e2eacc7fc3c896fff0
 DIST pynuki-1.4.1.tar.gz 6227 BLAKE2B c92eff2a24c78b24c2ae31bc48ba98e4688ad78d199347ce5bff19a6c18bafa1bf4f478df66e63100799d1ed0ca5c50b81262148923ff211effe617874cebb06 SHA512 5087fbad5e9f9b4e9cee2269c73ba34e6c108c5e54750f7fbe36191795d1978c622d14ee24d2bdc42783b57f80dd0355e7fefd1cd18e7bf32a372abae31f72e1
-EBUILD pynuki-1.3.2.ebuild 902 BLAKE2B c99c85afce8c9a79b37cb8e76b72ea02ada2d7d22ffa23d2f07fadd640829c7a3ec38b1516872b7f11e101062fe7610055a638b35852f39acc55aee1fa725738 SHA512 15a464e43c72a6be1c73334994e676253874d7c82db76167c31272c30b864278f26e47197c71022e48b1a7e2509dad2bc25a822edb947e3203d6514b76f44c9c
-EBUILD pynuki-1.3.3.ebuild 910 BLAKE2B 034d5ca64014463215b5fdc3e65f444f5d184ae1eee1d05618d1cb622de54ead26dc37be4bc8c8ec9ed2d207cc281d1d10fd0e570e46fb301f1e23026e929521 SHA512 d18e33d23a1ef8a644a065a8a21c993e66dde41a3da20bf23183e3d1fc345cedb0e2b1fcd2b8c28a05b4d6c69e713aa5a8f0de17b1afbe2d3a3e54d07b06de24
-EBUILD pynuki-1.3.7.ebuild 910 BLAKE2B 088fea3956e0e982356616a7341c2b120acf030894c73e50c6c553429154943502ab0d6693d65a4d222407fce191ed75652517b166d8d84620896424ca531bfe SHA512 b17e2c17f956ebcdef85ada854767075ed526c7cc67f140f2bcd5e9941b1aed3a96ca97059d31259e3abf81d792e9df7c954f2721816ba6eaaeb87b786798c63
-EBUILD pynuki-1.3.8-r1.ebuild 1007 BLAKE2B ec8063d00d3f26e7d6044bc4d5665fbbcd7e2cde9c6620eeffe63b5491746a27f10f2fd82f8a120f89901baffd03739deb0223ce15356c63889cc96ec87830d9 SHA512 6f210324f4ad99da7337f9bf73935dbe20cc2922e94f71e8467e75a6a92c9c5c8cd6d7d76f1272400ce4f022be1276feb717190e4b307a099d0f318fe3175370
-EBUILD pynuki-1.4.1.ebuild 788 BLAKE2B c71b876229f42bf9826a4bd9e1e5fa56d9a562fd43c889babaf25c4e9dc97727b1400a71b3788fa4c20e42ecfec4d71e738cb024df8fc240e292267c7936e845 SHA512 e09572c17f4ce9c13080a29e95ea22d8c3a5396fd65cbe5c6eae8b8daad3506d3337377ef6c41c28ecad6493838a83ae01fbfeef2da078edb3a72410c87b38e7
+EBUILD pynuki-1.3.8-r1.ebuild 1006 BLAKE2B 857ae083bf0bfc7c9e2a5c5e7cda35f45cac19c56f341d619ae0a17c9a17f8cb4b0a88053b2679249db76a97f646ea4b8ad473d845a90c1e48551b64f29c239c SHA512 325c3f1c637bf75e8cf76b1ec148c145aa8ef7e4500791af8e29618d1ed1cb0ab367971cf0817a387b17ea6d0b8dfcfc2b261cab587ae81c0cd5e6ae5d0967ea
+EBUILD pynuki-1.4.1.ebuild 787 BLAKE2B 08aed7d55a44a096e59ad53552bf75b65e4fb23972f99fd4d7051f724134f21c226332210b278943e729fd774189694b2a000ac4ad7aff45238ab4178a2685e6 SHA512 f8692622a2cae65cb9423d25d8803146121b319b18b8786bf608dd7ca7437b73daa589038db7df48836ed6a4709c8540e97dab74801beaf4d0e9bec926010bf2
 MISC metadata.xml 252 BLAKE2B 507e0ddc9d50b879ff374b903b142f85d020dfd6c486aba2af84fe082c878e780edbb79188ae10104d57db0eb775c86814cc8c06891a3854c9da840a4d377050 SHA512 9470ac9c8a5a4f80e3f767e7aa198addc7b21866c63b2a310e9f41ce65817672fb77423117bdd619e99cb62322025aeadf50717e23eafabf99080fcc106820af
diff --git a/dev-python/pynuki/pynuki-1.3.2.ebuild b/dev-python/pynuki/pynuki-1.3.2.ebuild
deleted file mode 100644
index c659f7142..000000000
--- a/dev-python/pynuki/pynuki-1.3.2.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{5,6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python bindings for nuki.io bridges"
-HOMEPAGE="https://github.com/pschmitt/pynuki https://pypi.org/project/pynuki/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND="~dev-python/appdirs-1.4.3[${PYTHON_USEDEP}]
-		 ~dev-python/packaging-19.0[${PYTHON_USEDEP}]
-		 ~dev-python/pyparsing-2.4.0[${PYTHON_USEDEP}]
-		 ~dev-python/requests-2.22.0[${PYTHON_USEDEP}]
-		 ~dev-python/six-1.11.0[${PYTHON_USEDEP}]"
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/pynuki/pynuki-1.3.3.ebuild b/dev-python/pynuki/pynuki-1.3.3.ebuild
deleted file mode 100644
index 22fc6d1d4..000000000
--- a/dev-python/pynuki/pynuki-1.3.3.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python bindings for nuki.io bridges"
-HOMEPAGE="https://github.com/pschmitt/pynuki https://pypi.org/project/pynuki/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND="~dev-python/appdirs-1.4.3[${PYTHON_USEDEP}]
-		 ~dev-python/packaging-19.0[${PYTHON_USEDEP}]
-		 ~dev-python/pyparsing-2.4.0[${PYTHON_USEDEP}]
-		 ~dev-python/requests-2.22.0[${PYTHON_USEDEP}]
-		 >=dev-python/six-1.11.0[${PYTHON_USEDEP}]"
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/pynuki/pynuki-1.3.7.ebuild b/dev-python/pynuki/pynuki-1.3.7.ebuild
deleted file mode 100644
index ed153521e..000000000
--- a/dev-python/pynuki/pynuki-1.3.7.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python bindings for nuki.io bridges"
-HOMEPAGE="https://github.com/pschmitt/pynuki https://pypi.org/project/pynuki/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND="~dev-python/appdirs-1.4.4[${PYTHON_USEDEP}]
-		 ~dev-python/packaging-20.4[${PYTHON_USEDEP}]
-		 ~dev-python/pyparsing-2.4.7[${PYTHON_USEDEP}]
-		 ~dev-python/requests-2.23.0[${PYTHON_USEDEP}]
-		 >=dev-python/six-1.14.0[${PYTHON_USEDEP}]"
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/pynuki/pynuki-1.3.8-r1.ebuild b/dev-python/pynuki/pynuki-1.3.8-r1.ebuild
index f73f061a1..d4720c57e 100644
--- a/dev-python/pynuki/pynuki-1.3.8-r1.ebuild
+++ b/dev-python/pynuki/pynuki-1.3.8-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/pynuki/pynuki-1.4.1.ebuild b/dev-python/pynuki/pynuki-1.4.1.ebuild
index 7fa8a9073..c7a799145 100644
--- a/dev-python/pynuki/pynuki-1.4.1.ebuild
+++ b/dev-python/pynuki/pynuki-1.4.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/pynws/Manifest b/dev-python/pynws/Manifest
index 44436ad5f..83782f3b9 100644
--- a/dev-python/pynws/Manifest
+++ b/dev-python/pynws/Manifest
@@ -1,11 +1,3 @@
-DIST pynws-0.10.1.tar.gz 6599 BLAKE2B 5d598fe371416c0bd6b2d8e062ebf1fe122745eb62a84981ad189202cae69b9ff188addbb3102d5093893685e356aa7c5283cd0abfdc4aa04c07e583f4cacde6 SHA512 bf5c12ec8b41fb1102e6da3b698dcf66514a58dab4a51981828e503c678156d10e16a3aba3851387f94b141383e0acd3029af30b9fdad27c57d81753c3083e59
-DIST pynws-0.10.4.tar.gz 6651 BLAKE2B 72626963d166cbd5c3563f15b490b91a077c5415e833cd343bdbc0657540d67c7bef107d015e1f41718980f4dcb11d4f3435ab135350d7fd17d86d5f12dbe2d4 SHA512 a05b7856a0f8d6dce26b1dad2a3b7c920fccd1e257bda284d9afd37d1774c2a90412e12ae0b54ed4193f4010b1e4b54de93a29ad800f2067a26617fa662386b2
-DIST pynws-0.8.1.tar.gz 5992 BLAKE2B 0abc4309dca2b09898764451a9286e9c5b484d9767fb79d98e896ef168542b51fe82279075b0ca74d14147c39c883094ba49bb6c96b2b94eecf0ed91cbf50610 SHA512 a5cb8581ec3163db4e5fd14cdaca3bff69ae6af72c8e474d8128ccd26f0e6864a8274808b7409f59b233bfe9981fd84a99826f7c3aae53d6b0e9ad7d39b2ce4e
-DIST pynws-1.2.1.tar.gz 8829 BLAKE2B 5545b2bbf3851787cb8c51af3587049770415d528481513c4e46f3e6c4dd1a5344ac7632c338a2bdf3b6d8dd6abb314ad957bd8538508bede8de4571b551ae2f SHA512 64f488ca73c6f7eaaabf8f924484591163810acee4f553ad5f3654740c4530eafe6844c2ee75571afb51215eef136ac45180ef4b82632042c75185f913bcea0b
 DIST pynws-1.3.0.tar.gz 9307 BLAKE2B acf85eab47156f7369b9a1eec05cfa3072d918a995e608b21f57c1bc3a76d747111e333e0f21c8b813d73c628122f70e1bc037d5cadb24700897f5f11dafb9b6 SHA512 b72c1db0c3542960296cc0dc651fc5ad7c9197ff8f33c168be78e1fed5924a59f38859c5c9c081d73d63e6e7770cc112b76a542eadc5cad33117c6d8fe222496
-EBUILD pynws-0.10.1.ebuild 703 BLAKE2B 0a9483430c6b74d9f85de54e06b1331012df5ae182506f6aa41da7763842c7c276132484eb86353b498f04e12277cc3b903a59f6201d9bb584c42379636009b6 SHA512 18fdb33feff3c6faabb19df0c6f7282c386808fdf73016c0746d999d89efb6fe5a9a4848a4c4e5a29ed3746034bf8eb3f4fa829aa7133d75e744ad3194e1517b
-EBUILD pynws-0.10.4.ebuild 710 BLAKE2B fa239f6509a3508729f0e54edd007fdd9beca2738ac3c14bf5247414aad63d746564e693d079e3003f89e136b50ac74f495a1c94c4699d6d13f1631cbae7e7ef SHA512 25ce6b1a3fa86db48c63689472437112c4abfa766a3717250da2f8e46d75b2d0b6c0468c7259955ffb80e4e8755576bb29fca9d51b4a6f46e906ffbf3c7efb9f
-EBUILD pynws-0.8.1.ebuild 703 BLAKE2B 0a9483430c6b74d9f85de54e06b1331012df5ae182506f6aa41da7763842c7c276132484eb86353b498f04e12277cc3b903a59f6201d9bb584c42379636009b6 SHA512 18fdb33feff3c6faabb19df0c6f7282c386808fdf73016c0746d999d89efb6fe5a9a4848a4c4e5a29ed3746034bf8eb3f4fa829aa7133d75e744ad3194e1517b
-EBUILD pynws-1.2.1-r1.ebuild 788 BLAKE2B 10f143d3100f580f08740c41aa1cc314cbd653b7b44132b2a9a3c140db7a8d35e6472e00396e50ff51349f678abc7c83d2534ba2a9cef4215116c6e0d649d599 SHA512 b6468c950cd053593818585a1248720eec7dcaf8fc530c93af08db5bdb9e8d73d2033282a5b370fbf81b6e515a181530443fe89607df54579c1ec365ad0c2d24
-EBUILD pynws-1.3.0-r1.ebuild 807 BLAKE2B fc612f37a1dd6fc3ac924762ca9fb35a1df95ef024578104a7c0dbb476df27dc3d89e31730bfb2fde04631f56ccca44041a6b61c97e013dd9e49a8976d0f7dd7 SHA512 a682380b1c3366313c3ab1d591666f8adc55001ca909aafde139efda1b2b67a60f029c16f0a4e3f7154b772752513b4b2d1d8bda81e4935d86576db57f8b37df
+EBUILD pynws-1.3.0-r1.ebuild 807 BLAKE2B 6a5ff23966b9fb687b042fd0d3cf95c67b69e9a430512bf6d504cbcdf28d2b8007f292c7197bcca5f2ed03cc44dcd9840d3af7449d01c12172733de11c9a6611 SHA512 4fa86e4c8e343ec68c56a4d856f2b13ded8705bc97c8b92df5baf2a2254bfad947067fa399c2b6228465112a86be98c41eae923a966fedeb3f09e022196f74ce
 MISC metadata.xml 454 BLAKE2B 27091f845abce336c7701e56a7892c1493751d39c3c728c135bf8f55ae2ed1b310214242acaae39685d753514e3f8d780fdfa6ec4649f3ae134da529f48deec9 SHA512 b83d847ade88e8fe9ac0485d5fcfce27e6e3e36c0f546e60da509a9b96a2a043d0431c399b9374e0bd1cf0c364055c961ccc97ff572c0565ba608ead6c60dbae
diff --git a/dev-python/pynws/pynws-0.10.1.ebuild b/dev-python/pynws/pynws-0.10.1.ebuild
deleted file mode 100644
index 1801970e3..000000000
--- a/dev-python/pynws/pynws-0.10.1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{5,6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python library to retrieve observations and forecasts from NWS/NOAA"
-HOMEPAGE="https://github.com/MatthewFlamm/pynws https://pypi.org/project/pynws/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/pynws/pynws-0.10.4.ebuild b/dev-python/pynws/pynws-0.10.4.ebuild
deleted file mode 100644
index 4e2d44f63..000000000
--- a/dev-python/pynws/pynws-0.10.4.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python library to retrieve observations and forecasts from NWS/NOAA"
-HOMEPAGE="https://github.com/MatthewFlamm/pynws https://pypi.org/project/pynws/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/pynws/pynws-0.8.1.ebuild b/dev-python/pynws/pynws-0.8.1.ebuild
deleted file mode 100644
index 1801970e3..000000000
--- a/dev-python/pynws/pynws-0.8.1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{5,6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python library to retrieve observations and forecasts from NWS/NOAA"
-HOMEPAGE="https://github.com/MatthewFlamm/pynws https://pypi.org/project/pynws/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/pynws/pynws-1.2.1-r1.ebuild b/dev-python/pynws/pynws-1.2.1-r1.ebuild
deleted file mode 100644
index 1b3b55b98..000000000
--- a/dev-python/pynws/pynws-1.2.1-r1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python library to retrieve observations and forecasts from NWS/NOAA"
-HOMEPAGE="https://github.com/MatthewFlamm/pynws https://pypi.org/project/pynws/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND="dev-python/aiohttp[${PYTHON_USEDEP}]
-	dev-python/python-metar[${PYTHON_USEDEP}]"
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/pynws/pynws-1.3.0-r1.ebuild b/dev-python/pynws/pynws-1.3.0-r1.ebuild
index beeebab12..bd14ac713 100644
--- a/dev-python/pynws/pynws-1.3.0-r1.ebuild
+++ b/dev-python/pynws/pynws-1.3.0-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/pynx584/Manifest b/dev-python/pynx584/Manifest
index 7b36af0cc..2d9e804c0 100644
--- a/dev-python/pynx584/Manifest
+++ b/dev-python/pynx584/Manifest
@@ -1,5 +1,3 @@
-DIST pynx584-0.4.tar.gz 14221 BLAKE2B a81a25ebbf8a625342eb5199ac7d5ce47e606f13d7fa01a1e38857e975c0da832ab3d6fd3ed39ab7d6c9eb345ef34711ae30d8b265c45070254bc4261f81ec5a SHA512 9b8a197a934a564f7e96ecd6bfe1ff6da362f973368c10b1ef566f1752e857f8763ce01f45966343e1fad917ceac7f56092814d4835a2b5a69cd8027c2a88232
 DIST pynx584-0.5.tar.gz 14755 BLAKE2B d6e3aceda6bd1197598815307d941c2e19a2b3c4a9ad2fd828d533c50af6df04a4a33a532c629eb7f1425784dad7b0feead56b838631fdbadf7b259265562a04 SHA512 a10b0f5641df1b5fd58be86744ae083c25a260766137aa19ad37229979ef8965f0c91ab16db1967f5228bab55f2ea1660475aeedc9470b6592ecf7f1389d89b5
-EBUILD pynx584-0.4.ebuild 899 BLAKE2B 902f7f06692ac25cb881b404207397e78ea6a44dbd53f648e33ad6044c453347fb92349b1729b7c3ef8ca386ad40cc78a29b48f76aecd960ac005123f9908642 SHA512 1b5391e6f6cbf72f36eba5031c0a28754ea50b8ed91fefaab70a815fb4a84d748be9f584f92e9cbdc149b3d3c3ead078476957782f52dcbfbfbd22d3b6f5a388
-EBUILD pynx584-0.5.ebuild 908 BLAKE2B b8adc3ad1d93fc07356bd3ec0da3835b535e70189ca930d45884fcbf432c3edae62686937fca9e195b94afa880e851ca82d50add609cd72f120ae24c643e4d70 SHA512 302d6697de8b2b8c9047a704d08d06aebce86500bc6c30c8c0ed386278e62267b925cfb25721023c61045dfaca9f33fc1175fc0efc012f9a10bcbd0da14ad8be
+EBUILD pynx584-0.5.ebuild 907 BLAKE2B 530f739dfdc32f9bb67a5fcc4b4d2a96a933993affce4b9a8b4f6c350f334775d753fcdbada82d1d338cd0a38278c4219d1aa8cdf9658d25c4a56d272be9e373 SHA512 cf821714cf280be4ff9b270c0beab11127adf7ec3fcd36ed8e2efde32b82c3d2d61a0c13f57f7e39414ca2312ad6b4f79579532ec57d623bcbb55e598e507dcc
 MISC metadata.xml 455 BLAKE2B 452f278396105e6ae6fdde8d4b298f51a451140db72042a6da6a9cb216ad98cf7f04fc5bfd441560e7401c2766a672d8898e6211626c603bbcfd6afde083951e SHA512 d0afb796982ab19306b1b39d84625b3012eba6d16b2352b3926990692bf0dce26d1c15fb5a398d773bc5feb528f2a18535abd5bba201f007e09bec5f36fe3c43
diff --git a/dev-python/pynx584/pynx584-0.4.ebuild b/dev-python/pynx584/pynx584-0.4.ebuild
deleted file mode 100644
index 0f900d1f3..000000000
--- a/dev-python/pynx584/pynx584-0.4.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="NX584/NX8E Interface Library and Server"
-HOMEPAGE="https://github.com/kk7ds/pynx584 https://pypi.org/project/pynx584/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="all-rights-reserved"
-RESTRICT="mirror"
-
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND="dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/stevedore[${PYTHON_USEDEP}]
-	dev-python/prettytable[${PYTHON_USEDEP}]
-	dev-python/pyserial[${PYTHON_USEDEP}]
-	dev-python/flask[${PYTHON_USEDEP}]"
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/pynx584/pynx584-0.5.ebuild b/dev-python/pynx584/pynx584-0.5.ebuild
index 8031641f3..84cc7e92e 100644
--- a/dev-python/pynx584/pynx584-0.5.ebuild
+++ b/dev-python/pynx584/pynx584-0.5.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/pyobihai/Manifest b/dev-python/pyobihai/Manifest
index 6a5097c01..6f4fe1cc5 100644
--- a/dev-python/pyobihai/Manifest
+++ b/dev-python/pyobihai/Manifest
@@ -1,11 +1,3 @@
-DIST pyobihai-1.1.0.tar.gz 2349 BLAKE2B 019e52f0eba859cd7555f82891baef9333333554e8dd0f9d43d29f5ebaeab2a0830d8c045dbb57ae1f7a188069c805628dc4875c27259d817af0b2b5e2f378a4 SHA512 625486170ac5c7e924a43e5bb972184ac52c243be5925eee448bed74e29257194ebae53b05f75e6d81c107a9ad6208f36791350aa9682984c5a0e4a1b54db33f
-DIST pyobihai-1.2.0.tar.gz 2472 BLAKE2B d1a8ff86b431c2bca0ad978ad67e17539d6679c65aa6a93af62d85c74b986d95b566741e3df012ae321157da1241d6cbda3addb3c0745112fcce3b1487a66835 SHA512 08b96debff393460485eaa7b53cdfb8d18fcda33cf9633c686189a0ee9038b0fb8282e56b4f7d741a1df0000356a8028c70d91371fbbb4e99360ae434bd7761f
-DIST pyobihai-1.2.1.tar.gz 2495 BLAKE2B e5305003069dd1d5ce2493aaf8f11dc709122667b10b814f494fce3db33b79b8aefdfb3a2701c40ffe59d49b7f01a481196b59617e2ed67c41de20c9bbc2fa0a SHA512 7892e138b6fec3cef87f52d8d3e8571ec24f284ae6408e226db6189faae013bfb2f8478916d5f1fcd304b9aabeb14bd33face72714316e5c4608865b95696f70
-DIST pyobihai-1.2.3.tar.gz 2556 BLAKE2B 36232daa7722572ec41365dee79e3814acaa2da67ba6fe593acb1d674245495b7b0d4db4ff745552d59de232f32cbcc4e5f41d74af00f7a81058b69022c0b8a8 SHA512 3caa7ad511db3874fdeb0f0d04eb02394e55a48286027c458425fc5e7d154a19740b2df4f779a65ccde9232e4a0a29f73b23bec12426ee222a39172489459022
 DIST pyobihai-1.3.1.tar.gz 2883 BLAKE2B 8c76c8fa5227d032c359c2215b8c69386c267f501ada76122966fa658f58de316a71a6c8fe537bb4f8cbad78cdd54de1054fe00a9f1d5890348865a07e56c3ae SHA512 8d817a4c79cfd240c7e6b4f0378104459c58171ea5069e906289fe688b782969a5856f80fd92b09b9c1eba6bb364296fde883b6e87aa7908873866f75898fa07
-EBUILD pyobihai-1.1.0.ebuild 666 BLAKE2B 0ea9405b1ce497610f0be6c074ef049f4002e832c7bb9ce28f1e7edbeadb4818243e79f473a52d3e0b66acf40e5bacbc02704fc69170b7969752b762d9c2a9b9 SHA512 e36c0a5dbafb7dc51590baa2ccfd17d048ee467c1f46bf1f38630470bc4c98b0bb933fcee04a33c1f899774a58531861d1df5f13e77dcf523fedeca7a28708f8
-EBUILD pyobihai-1.2.0.ebuild 673 BLAKE2B cb559b37b8863395f7523769a6e11ca4984e4a56e1172c878146b66a1afe016fd5af504ce97c079b1ba0bcfbcc15bc9c67e065ca20f7ed0d0e911ff8c42a9ebd SHA512 b9c3f9eb54baab2562a142fd10d0a29f2248ae533528a61a8d7894523a6d62ef40237e214b139fb24bf184e19f807744eda23c68557c7c7ac56342ddf52d5764
-EBUILD pyobihai-1.2.1.ebuild 673 BLAKE2B cb559b37b8863395f7523769a6e11ca4984e4a56e1172c878146b66a1afe016fd5af504ce97c079b1ba0bcfbcc15bc9c67e065ca20f7ed0d0e911ff8c42a9ebd SHA512 b9c3f9eb54baab2562a142fd10d0a29f2248ae533528a61a8d7894523a6d62ef40237e214b139fb24bf184e19f807744eda23c68557c7c7ac56342ddf52d5764
-EBUILD pyobihai-1.2.3.ebuild 673 BLAKE2B cb559b37b8863395f7523769a6e11ca4984e4a56e1172c878146b66a1afe016fd5af504ce97c079b1ba0bcfbcc15bc9c67e065ca20f7ed0d0e911ff8c42a9ebd SHA512 b9c3f9eb54baab2562a142fd10d0a29f2248ae533528a61a8d7894523a6d62ef40237e214b139fb24bf184e19f807744eda23c68557c7c7ac56342ddf52d5764
-EBUILD pyobihai-1.3.1.ebuild 680 BLAKE2B bfd8f592d4f95491894fa159adf168c28dddb056f7cc81b257ebbfd4bfc7365593aaf91b6871db91e4edeed5dcc6fd2a5d5cc48b1a7af17433f2f8db558e4548 SHA512 cbcf09946a1ae997b708eab2d7a5a2a8acd5596ac5f0893fd4682beb4a0f6aca2492617b8f98586eaaaaf536d7702ae629017132e65c7a0747fd1e41cf9af51e
+EBUILD pyobihai-1.3.1.ebuild 680 BLAKE2B a9a8fd7e707bd6e38d3a7c378fe078a3b7520dafbe735270b36083eab98627cde3c5aa74dbbf51d37fd5043db427377bf83a445b9a0911df2ba9baeec56a846d SHA512 a631afbdffd4b70ddde9aff2f1e266056e57625257510daaa477261ff05e147ee8fad234d99f513dddbb881e8f35fc37cdba0a19f121001e559dd6dee53d6b27
 MISC metadata.xml 455 BLAKE2B f9cc6614d84a6c9f96cc2a473a07a7b4bc1759b9ce7885cd5c1e20419242372d0d02856ab98ee967f18aa1151698c7359c0aff0a0f1a2b8336c88f93eb22bec5 SHA512 f0624bb0ed73103451afb47f7ea7d9a07997d81ca5652d9640c8791cf889f6d395e28e9aae12795b58a15ac0e54d1c58c2d257515f47c6d2c928568cb90cce3a
diff --git a/dev-python/pyobihai/pyobihai-1.1.0.ebuild b/dev-python/pyobihai/pyobihai-1.1.0.ebuild
deleted file mode 100644
index 6656eb9aa..000000000
--- a/dev-python/pyobihai/pyobihai-1.1.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{5,6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="A Python wrapper for Obihai"
-HOMEPAGE="https://github.com/dshokouhi/pyobihai https://pypi.org/project/pyobihai/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/pyobihai/pyobihai-1.2.0.ebuild b/dev-python/pyobihai/pyobihai-1.2.0.ebuild
deleted file mode 100644
index f99811e03..000000000
--- a/dev-python/pyobihai/pyobihai-1.2.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit distutils-r1
-
-DESCRIPTION="A Python wrapper for Obihai"
-HOMEPAGE="https://github.com/dshokouhi/pyobihai https://pypi.org/project/pyobihai/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/pyobihai/pyobihai-1.2.1.ebuild b/dev-python/pyobihai/pyobihai-1.2.1.ebuild
deleted file mode 100644
index f99811e03..000000000
--- a/dev-python/pyobihai/pyobihai-1.2.1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit distutils-r1
-
-DESCRIPTION="A Python wrapper for Obihai"
-HOMEPAGE="https://github.com/dshokouhi/pyobihai https://pypi.org/project/pyobihai/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/pyobihai/pyobihai-1.2.3.ebuild b/dev-python/pyobihai/pyobihai-1.2.3.ebuild
deleted file mode 100644
index f99811e03..000000000
--- a/dev-python/pyobihai/pyobihai-1.2.3.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit distutils-r1
-
-DESCRIPTION="A Python wrapper for Obihai"
-HOMEPAGE="https://github.com/dshokouhi/pyobihai https://pypi.org/project/pyobihai/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/pyobihai/pyobihai-1.3.1.ebuild b/dev-python/pyobihai/pyobihai-1.3.1.ebuild
index b6a4548de..e94dd898b 100644
--- a/dev-python/pyobihai/pyobihai-1.3.1.ebuild
+++ b/dev-python/pyobihai/pyobihai-1.3.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{6..9} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/pyombi/Manifest b/dev-python/pyombi/Manifest
index c45f5da52..7340a14fb 100644
--- a/dev-python/pyombi/Manifest
+++ b/dev-python/pyombi/Manifest
@@ -1,5 +1,3 @@
 DIST pyombi-0.1.10.tar.gz 3386 BLAKE2B ee728cecb21dd5a2f2b9e5376d3f166b0e26672e7f8384bd3bef354d7dbb01c6689a0b9103d202ff3e92c6b119f634134395428d23ccd706bfb6879fdc7e97f7 SHA512 53345d2fa7a13c2b602224bb1887d4a937a3f9b2e0cdcb74c3ed6973bca7e065aaef9d5d00a59ac92ff96e0e8471308abf182af8a089996a8f6c473c4022de83
-DIST pyombi-0.1.5.tar.gz 2779 BLAKE2B de7734cda36cedb83ffba11f288324ca00f7dcde337e8e3a5e9033760b03c1b36dc61aa65ec715439507afc65586ed5f5409203512940b46e20371a6aa02702b SHA512 d1a6dc6f4ca03187e476e6bb760178fc7a802bf01bc37378efebe9d73726139f669688ef533879376de762b169b6915a341a53d26f594b5e7e10196aaecda651
-EBUILD pyombi-0.1.10.ebuild 728 BLAKE2B 16ebb6c6e6f6f019a7daba31e7105afb7ed4bf97edf6a9b9729c8e604eee07cd5d35c45a3e8b4ea2ffa50202d45757e520158dcf1cb538306e06a546fd468caf SHA512 4d982c361c676a3df268552b34e9cefc274cc68a3b71eee463f1b0e3a6223d7184c8707fa42940e309c1f2240d7f09771a59e47de63a58fd7ee577ce0a4b6435
-EBUILD pyombi-0.1.5.ebuild 719 BLAKE2B 20e426de240aac4bad28f28579e25594fec6cc1c62a066d756af36630c4279cdf091d53721c685b7a4bcb693c888ddafc8e3439fa236fb96b7196a2f2b73fe0e SHA512 f3847f940f8a29419340beb8ac3a432c9045ed2f7f7776fd4f32ba62d367d0fe492ee4810baef8f1683ee4d7814b438b2e0b20d3eec8c9bdae12c2d799f91bb8
+EBUILD pyombi-0.1.10.ebuild 727 BLAKE2B 3d7f07db94272ba6268bd70c3565e133f4c22a765b6a34c6320298a38f6997d2a285ab924f43c5b9a048ce15dda717ab50f39497e30b9b25562e9c5d482ee9a0 SHA512 d7b2f7bb05056f5cd8743dc23d7638424ee107fd6d6cfce7c8db66503dc171113930ca623b191e932bbe83b7c7e4943c76410228b185350ce9278f91855e6308
 MISC metadata.xml 448 BLAKE2B 9359e8724f03d9ff8991890238996a162926935a524a39f09ae83029337cd9945337b18c2c78f44fe56360a4d1f1291cce3b17881b1930e1dcca773740ddd494 SHA512 2906cfeaac563f4f4455d996cede353bd4b101d17e08cf83313d08b58b9489cb3ada69e2894301f1bd2d1e620ebcda44f0f0d8ad1bd36c92993796a211ec4cde
diff --git a/dev-python/pyombi/pyombi-0.1.10.ebuild b/dev-python/pyombi/pyombi-0.1.10.ebuild
index 2411a6ffb..6590b5220 100644
--- a/dev-python/pyombi/pyombi-0.1.10.ebuild
+++ b/dev-python/pyombi/pyombi-0.1.10.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/pyombi/pyombi-0.1.5.ebuild b/dev-python/pyombi/pyombi-0.1.5.ebuild
deleted file mode 100644
index 4af0fce88..000000000
--- a/dev-python/pyombi/pyombi-0.1.5.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="A python module to retrieve information from Ombi."
-HOMEPAGE="https://github.com/larssont/pyombi https://pypi.org/project/pyombi/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND="dev-python/requests[${PYTHON_USEDEP}]"
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/pyotgw/Manifest b/dev-python/pyotgw/Manifest
index 5d7521ffb..a9dfd5707 100644
--- a/dev-python/pyotgw/Manifest
+++ b/dev-python/pyotgw/Manifest
@@ -1,11 +1,5 @@
-DIST pyotgw-0.5_beta0.tar.gz 28492 BLAKE2B 73e775aee0ab4b0f1ae4bff85fd26d08fd3175c308e0fc2071babdcf0ea9c6d4a1f48916ca2398084bb801563b2c705283a3b133ec3ad60f33eba09d6c6158a6 SHA512 7dc3ab0e82abe95bb319bafab1dfb24ea85c2fe436cfb065f18397e6fc123dc7bc6121af187f25d9ba41c3325798ba1b5e21f6e6abbff5324d36544f2d5fbed9
-DIST pyotgw-0.5_beta1.tar.gz 28586 BLAKE2B b5cbea4a8bc19472714e463097713b8328b9a13624dceb9373e1e8132828734744fc55d3a81e6ce136ffd4ff3ce68b638944dce027cb60b236f4d69657a2b62b SHA512 0c9feab7a8a320399a8b01148a6565b58c3165e962bdffcff5f7eb696b434be990ca12f26fd7cab77fb330111e5ebd081445124430fb27ecdd8871d6b67c5ad7
-DIST pyotgw-0.6_beta1.tar.gz 29839 BLAKE2B 03b7432b1771979fbf56f07e875689cf6dcf2b870774584cfb07521f5a7f515c6a87e439ccfe477e713743ef4cf90a2070bc96d871a69363a903917170a3aaeb SHA512 fd7a3d0776e54ccec7f13dbf4ad23e501454e0ef351e54ff3fd67e909a54545c84e0cc23103c15b879d910c2ca7e503d74b074774f0b5a23ec53a087eeba553f
 DIST pyotgw-1.0_beta1.tar.gz 36929 BLAKE2B bf01be7c7fb4564426b6e0c85715fadb7535475d8c05f847d21d60a8b75efc05786ad85350a8cc995d3579884b88e0145312d21623b2e3867f532488ca90aea0 SHA512 0a2b3ec3c218cee08aba636dd7fdd8b12a0345bece3144b16b80c40c5075c266e41a6f8b7d52db7e99d4c4be7a1a90fec64e2d8a807c451772c1e68111a172c0
 DIST pyotgw-1.1_beta1.tar.gz 51505 BLAKE2B 2989e19204c280b273d41a0b2643281e029cb0d69fd7db4a1f8a5108d686fbce6929431c2c238984faf2f72e32b2c75f015272b3fdaeebce5d39918539922f89 SHA512 bc25567b200f0b8e7fd5c500e99e0b94331a0eba66a1500e9d3906382b4533fee49f4a0baea993204e94df6596b3547fc665ff219f0bfe36c4d35b8d04c51d3f
-EBUILD pyotgw-0.5_beta0.ebuild 759 BLAKE2B 64b55a93d6ff7d55979af5cc0f0db7de24dd24a8f5911925fe9feae9b9172240b8584f17c5b712ff4b93a24d9655a01baf21ad3d7ab38c6ade3cd0a3070082f6 SHA512 0ae1ae5674fa6dde28b57393923c899521ed534ecbb5c2147b128a8e952913e331d46e5accce31b2f35f6291067d7fa625603717723eb66c492e39b40e7a6c14
-EBUILD pyotgw-0.5_beta1.ebuild 766 BLAKE2B 57833e67c5ad60a90e215714d7559d6ccf96fceefb9777d9c9512bfad6d4fdac44d2f8d457c6a6bf049d793f643e35e4b94dab06d50b9c9dfbdbbb0f01eceffc SHA512 c3b82780eb0265a69bab4072b1ad2121cbc027aff86092cdfada50a1f096421cb6d8e760d28729f7fa61c4ef0d513aa2ce48f34046a2302276506040682fe039
-EBUILD pyotgw-0.6_beta1.ebuild 766 BLAKE2B 57833e67c5ad60a90e215714d7559d6ccf96fceefb9777d9c9512bfad6d4fdac44d2f8d457c6a6bf049d793f643e35e4b94dab06d50b9c9dfbdbbb0f01eceffc SHA512 c3b82780eb0265a69bab4072b1ad2121cbc027aff86092cdfada50a1f096421cb6d8e760d28729f7fa61c4ef0d513aa2ce48f34046a2302276506040682fe039
-EBUILD pyotgw-1.0_beta1.ebuild 848 BLAKE2B 19ae9b09e9902c3e159bf3dc2515d0a4f70d30d491c43d9984fb429610f8faec46c5cd44f6240513b7cce056325ec3bdf680373c372190c43c77ebf3eb14f332 SHA512 394debef5ba34aee780c132c8aa65a35fdb2d5947014f2d58db70f7c74e727953c5bd3bfcb06cc7115a70eae461fbc02763fdd1001fc5af2a2e3c1d29031003f
-EBUILD pyotgw-1.1_beta1.ebuild 848 BLAKE2B 19ae9b09e9902c3e159bf3dc2515d0a4f70d30d491c43d9984fb429610f8faec46c5cd44f6240513b7cce056325ec3bdf680373c372190c43c77ebf3eb14f332 SHA512 394debef5ba34aee780c132c8aa65a35fdb2d5947014f2d58db70f7c74e727953c5bd3bfcb06cc7115a70eae461fbc02763fdd1001fc5af2a2e3c1d29031003f
+EBUILD pyotgw-1.0_beta1.ebuild 848 BLAKE2B d31f15521708331eb4b47cb1523211d25ca405456c893cf7e5a4a5eb5f68ec2ca01c3cacb5f512da328424aec5f91482df5d9a607b34aef01c1d7a3996440e74 SHA512 27e0b0126ec6c7e28a6a9b993078300b4386c4012de58ad6a5da2f88cdbdb1df73e05003b00f3f2ef8424983dcc37cce6b19d2fdc0395f79d5e5282569533296
+EBUILD pyotgw-1.1_beta1.ebuild 848 BLAKE2B d31f15521708331eb4b47cb1523211d25ca405456c893cf7e5a4a5eb5f68ec2ca01c3cacb5f512da328424aec5f91482df5d9a607b34aef01c1d7a3996440e74 SHA512 27e0b0126ec6c7e28a6a9b993078300b4386c4012de58ad6a5da2f88cdbdb1df73e05003b00f3f2ef8424983dcc37cce6b19d2fdc0395f79d5e5282569533296
 MISC metadata.xml 455 BLAKE2B 18c060e7d00164739a1a98debce079e52756c40cda1e4e99e754596b5740f3154a245251416312d1106d7b40ae01eb028838b7e96df47e6215e82720e3b3c066 SHA512 a598c74011f95f31b1eab06f269246452387af3c33e74067841209490070bfa8632cf9e5c610fb396a817d7e9fecbc2c17fda92ccb1f2454c38b3b4eb13969ca
diff --git a/dev-python/pyotgw/pyotgw-0.5_beta0.ebuild b/dev-python/pyotgw/pyotgw-0.5_beta0.ebuild
deleted file mode 100644
index f9f60897a..000000000
--- a/dev-python/pyotgw/pyotgw-0.5_beta0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{5,6,7} )
-
-inherit distutils-r1
-
-MY_P="${PN}-${PV/_beta/b}"
-
-DESCRIPTION="Opentherm gateway through serial or network connection."
-HOMEPAGE="https://github.com/mvn23/pyotgw https://pypi.org/project/pyotgw/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${MY_P}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-S="${WORKDIR}/${MY_P}"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/pyotgw/pyotgw-0.5_beta1.ebuild b/dev-python/pyotgw/pyotgw-0.5_beta1.ebuild
deleted file mode 100644
index 6efb0bd42..000000000
--- a/dev-python/pyotgw/pyotgw-0.5_beta1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit distutils-r1
-
-MY_P="${PN}-${PV/_beta/b}"
-
-DESCRIPTION="Opentherm gateway through serial or network connection."
-HOMEPAGE="https://github.com/mvn23/pyotgw https://pypi.org/project/pyotgw/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${MY_P}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-S="${WORKDIR}/${MY_P}"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/pyotgw/pyotgw-0.6_beta1.ebuild b/dev-python/pyotgw/pyotgw-0.6_beta1.ebuild
deleted file mode 100644
index 6efb0bd42..000000000
--- a/dev-python/pyotgw/pyotgw-0.6_beta1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit distutils-r1
-
-MY_P="${PN}-${PV/_beta/b}"
-
-DESCRIPTION="Opentherm gateway through serial or network connection."
-HOMEPAGE="https://github.com/mvn23/pyotgw https://pypi.org/project/pyotgw/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${MY_P}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-S="${WORKDIR}/${MY_P}"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/pyotgw/pyotgw-1.0_beta1.ebuild b/dev-python/pyotgw/pyotgw-1.0_beta1.ebuild
index beda5316b..d4cf99011 100644
--- a/dev-python/pyotgw/pyotgw-1.0_beta1.ebuild
+++ b/dev-python/pyotgw/pyotgw-1.0_beta1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/pyotgw/pyotgw-1.1_beta1.ebuild b/dev-python/pyotgw/pyotgw-1.1_beta1.ebuild
index beda5316b..d4cf99011 100644
--- a/dev-python/pyotgw/pyotgw-1.1_beta1.ebuild
+++ b/dev-python/pyotgw/pyotgw-1.1_beta1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/pyotp/Manifest b/dev-python/pyotp/Manifest
index e56183613..79f2debe9 100644
--- a/dev-python/pyotp/Manifest
+++ b/dev-python/pyotp/Manifest
@@ -1,7 +1,3 @@
-DIST pyotp-2.2.6.tar.gz 10602 BLAKE2B 801f48646ff15a039b9295948ed292c3c432f8b0b629d249554259802335b7430a2c82f8c3bee1f54df71b0972ec293d69a2005c35cac120a51cec1a3548b2c1 SHA512 4f962704411ceebff967cf13af5ec5b815da0f82af665a086c4e5d53acc735453d638c65aa2afa40fe546e92d04a9250f6964cb22270a67c9609f8486eb5ba90
-DIST pyotp-2.2.7.tar.gz 11416 BLAKE2B f26dcdf6018dc0d40b6ce27616479cea1adb0b66ec3e0eab945a6725289efc817becaba54b3049523224ead6475daeb3cc386cabd3f994cbc833d9fe41ea8501 SHA512 d8fe8a737c75b1731042ffc7213eb20851fd31ee3583511a8db6c2adb171c63d6f2620d50921997836cbf34c37829d4f0bd44d8955ee66a1bec7e94e2368e19d
 DIST pyotp-2.3.0.tar.gz 11672 BLAKE2B a3d8ca5296b5a8a7aa053b0a0556285c19f335cb1dfb4f892d40fe2d79cc52313af7b31c6ee4afc4eb8c1cd8cb8248442bd1a4868e2bb921a552332a0a283a44 SHA512 4a7a4206134e9a370f7f3c3a9b7e755b75a84e30a320084faf91af5607c4262a6aa76d7b8cefaf284e4cf01faea1df4ca92d871644a14ab56f04693b227485cf
-EBUILD pyotp-2.2.6.ebuild 659 BLAKE2B 0e6a23fab20b370c2d33b750f04f4393dbf2649da4a260c74b691feaed683c5d2165d730840b1a6fdf729eaaf62ecd047a1342faf6b5c269cd328add5e640800 SHA512 affc63a7a536b4036587b62e996222b82433467e55ec2f45597e923bf764aff38b886e89ea089902b0b7ad1f248af7c93fd8429e454e0140752d4af91cdf0258
-EBUILD pyotp-2.2.7.ebuild 659 BLAKE2B 0e6a23fab20b370c2d33b750f04f4393dbf2649da4a260c74b691feaed683c5d2165d730840b1a6fdf729eaaf62ecd047a1342faf6b5c269cd328add5e640800 SHA512 affc63a7a536b4036587b62e996222b82433467e55ec2f45597e923bf764aff38b886e89ea089902b0b7ad1f248af7c93fd8429e454e0140752d4af91cdf0258
-EBUILD pyotp-2.3.0.ebuild 661 BLAKE2B c496d42c1d5f91b44f609f82e2238e6710595ba6918f0dc83ff5c6245fd54483d37b92aa00a88903bc3cd47c7b382531a1e454b3bf950f3a57d4705f6bc41146 SHA512 3b43db8e0869b71a28e303ea49e04f14b9b3daae436817796946b2194f8e76ca06d2524d471a4bdb9c98d03ddba37e643de7efcc9d53c2efa6daa66acb2312c5
+EBUILD pyotp-2.3.0.ebuild 660 BLAKE2B 8b435aeadd3fefcd945a15e7fa3707d9fad844c5c6809ecd18c9a1268363824676fae39915437e2bca3e2a74f935791fe1c9aaf7d52f57abfe9f9db9cfa713bf SHA512 cedc206b4a077fcef3d62bf6f900c884e37a81513e78a10422c9d6604a53d13fd3ff68dbba21277c4694b3b09346b3f4130c3f8f66bd76e2e6fecedbc5e3a4d5
 MISC metadata.xml 340 BLAKE2B 2ee2eba1adf1120989f9dbb139fd0facbe3d20edb5922be2d5bc5270aba10666f0d348675b9bfc0cea4fd2c4a5fb936efba657aad49864406ed3dddd486852f9 SHA512 ebe2a13ae19d2d5201bee56fbf8b55fb1b7fbcbdb4609ce69a639044554df7c8958ec7af1ad3483c1ec8a382855b096ebf6e9440349fbd32ba6e3229419eb723
diff --git a/dev-python/pyotp/pyotp-2.2.6.ebuild b/dev-python/pyotp/pyotp-2.2.6.ebuild
deleted file mode 100644
index 5b99d125c..000000000
--- a/dev-python/pyotp/pyotp-2.2.6.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{5,6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python One Time Password Library"
-HOMEPAGE="https://github.com/pyotp/pyotp https://pypi.org/project/pyotp/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/pyotp/pyotp-2.2.7.ebuild b/dev-python/pyotp/pyotp-2.2.7.ebuild
deleted file mode 100644
index 5b99d125c..000000000
--- a/dev-python/pyotp/pyotp-2.2.7.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{5,6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python One Time Password Library"
-HOMEPAGE="https://github.com/pyotp/pyotp https://pypi.org/project/pyotp/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/pyotp/pyotp-2.3.0.ebuild b/dev-python/pyotp/pyotp-2.3.0.ebuild
index b64ec6f3b..5fae3b538 100644
--- a/dev-python/pyotp/pyotp-2.3.0.ebuild
+++ b/dev-python/pyotp/pyotp-2.3.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/pypca/Manifest b/dev-python/pypca/Manifest
index 0ea0f234f..1b3aaa509 100644
--- a/dev-python/pypca/Manifest
+++ b/dev-python/pypca/Manifest
@@ -1,7 +1,3 @@
-DIST pypca-0.0.5.tar.gz 4891 BLAKE2B 4b587022c023773dca40d66d81de2c436851587178525d42b6d3388fdf65fcf08559d3f60100863adc50c3301b4c02cde151458a524dbd4f34b811e1d88c9d23 SHA512 058f451ed79ba6faee7b956292d3b6ec508ddd1cf14f2cc2b3678ce9f540135caf9406eb87ab3b400e6e87741f9207965ec03e8f3f0e460a68e80e580ad4f3fd
-DIST pypca-0.0.6.tar.gz 4942 BLAKE2B 7623e2db5d14b7570c71768de03c6afa30e1604e3a459ad5cd66dfee0b74cecb55c234b48d21b73f8062c1a68422765b4df8ac629c828381d683c144b30d0307 SHA512 13dbb488f8a473e5d26650ad89d05c04d549d86c0ea92786dbcc2e94aec91592b21c23a9319e715543293ef0d5269d9a28abf4725209c52aa731a1f85302b19d
 DIST pypca-0.0.7.tar.gz 4375 BLAKE2B 36d7865a83a189c8f1fac58fece586d3b2dd5b7b4c7df32e6ba36a4fdebb53773f2781ce5ddf861f1a5289c59dd69e07fa0d8cbdead7488991e5d8f5b35768ce SHA512 7e818e948ad0d60372d8b492f02876a8376ddbfc9ee79e79dbf668d0931bdeab7dcc1ab560c4eecf055b17cd44295cc8afd0798ad6033de7a8a12a894538128d
-EBUILD pypca-0.0.5.ebuild 905 BLAKE2B b8ce9acf96ff96313538052d3665ee704caf1435841d05bb72d8e68997e17a0ff1b105b74449e908c41fef446bd6f1203e1784f02a28b78e6d84e3ace671732c SHA512 040d02ed65fe39e28f3cc0dc88552d4507c658c8ad40060cdfb8b55a9bb4a01fb198a15219b7a75fe4c2193429254073009fd3e6767cd6cf3487badb094f34f7
-EBUILD pypca-0.0.6.ebuild 824 BLAKE2B 176e2d71898d63d7511582ea5f3d2055f4ecee815319ba3e6e78f315ed1568208836a07b61c1a4383a5eceb347782f99c21bc9527bc5d1647cc15116e21b41c8 SHA512 29dfff3f8f6aa702683f7c575211a5e7c1a094984402810848ce7301c98eb9b97bf3a17d55e2c61cc792a63975139192904e3a9fe7f30a46a1ca3e2b4da58dcd
-EBUILD pypca-0.0.7.ebuild 754 BLAKE2B 2b9b54531592b895004ed7b1ce731a136ef3def12b04c2c9c27e0ab9c746cda4e9c59301e4755c775d7b63e39b9b8353d8071a9c56ecd4918ab895bbd478980d SHA512 7bd2066c2dddfbbc4b7fdc76c9558b13c4b21703930759698c1e7750c2d239f2a61f7bcd65da231e236f0a151ca07938eee0ec0871e4980030368ee4be845377
+EBUILD pypca-0.0.7.ebuild 753 BLAKE2B 0188a88155ed6b208ffa9b944748a40fe3f8afc7cd285e78c915a7e0078e1b7374b75ae73be98531ac6d17cc3ccae659ced6b3d14144f7e7661a709b554b40b5 SHA512 257bda1400905dcebb44037953052afcd94093bc6e5e36bfbf03a87d1c458d6a9b0da270c501171480fd490ac72f69cbf8d8a66e7f5b3be62b8814eb0f7ad95b
 MISC metadata.xml 324 BLAKE2B 0b62161f2bd0b7a3fe27b8ea1f217e136d24e97544e02b66fc5d3f1e1b3f63db8c45a4c6a148528ce0cffa6209940dadc534055e254d1e81652a6ca456575ba7 SHA512 40e42b360369b1c81f528388ae6d62f998af6df5e5c7eb0b19284e62464eab3dc20c350036809014c7dd4c82ab2025e7c3ed44dc9237a16261e06001fcdc116c
diff --git a/dev-python/pypca/pypca-0.0.5.ebuild b/dev-python/pypca/pypca-0.0.5.ebuild
deleted file mode 100644
index 352e31f5d..000000000
--- a/dev-python/pypca/pypca-0.0.5.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="A python cli for PCA 301 smart plugs."
-HOMEPAGE="https://www.github.com/majuss/pypca https://pypi.org/project/pypca/"
-#SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-#SRC_URI="https://github.com/majuss/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-SRC_URI="https://github.com/onkelbeh/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND="dev-python/pyserial[${PYTHON_USEDEP}]
-	dev-python/colorlog[${PYTHON_USEDEP}]"
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/pypca/pypca-0.0.6.ebuild b/dev-python/pypca/pypca-0.0.6.ebuild
deleted file mode 100644
index e37fac6de..000000000
--- a/dev-python/pypca/pypca-0.0.6.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="A python cli for PCA 301 smart plugs."
-HOMEPAGE="https://www.github.com/majuss/pypca https://pypi.org/project/pypca/"
-#SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-SRC_URI="https://github.com/majuss/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND="dev-python/pyserial[${PYTHON_USEDEP}]
-	dev-python/colorlog[${PYTHON_USEDEP}]"
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/pypca/pypca-0.0.7.ebuild b/dev-python/pypca/pypca-0.0.7.ebuild
index bf7593733..8cacafcbb 100644
--- a/dev-python/pypca/pypca-0.0.7.ebuild
+++ b/dev-python/pypca/pypca-0.0.7.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/pypoint/Manifest b/dev-python/pypoint/Manifest
index 2bee9cde0..fa891a889 100644
--- a/dev-python/pypoint/Manifest
+++ b/dev-python/pypoint/Manifest
@@ -1,11 +1,5 @@
-DIST pypoint-1.0.8.tar.gz 3604 BLAKE2B 949a534d461c78ce7036ab7237f8119c6cbc06805de313d77666bff62a76d1cf5377fcaa367f1a5b128138b4692185f4c88aacc78f563eff0d27952851c13e6a SHA512 b472f8307a6585905ef98146a39060e9ca7295ab0bdf7d1fe8fb509ffd95d42cdb6a7be5b772a21c1854780b3fb936ecf40c09b25d694b5d914c05bf5fb55255
-DIST pypoint-1.1.1.tar.gz 3811 BLAKE2B 1bb2db839415cee13843897ebe7920654e4a2f2d626a8c8bf9c23db00f9e117cfa64c39c4d8c0d91d4674364c6fe75b07cda29be7a11fa5e70d586fca5d3d528 SHA512 ebf68f9d0fe0f55522d330ae11db4e83543655551c0cfcdc3a01d0ac333d0070767c7e6a0562222ded2fd2215a2be662db7952a9a0c0721e515194c5877e1039
-DIST pypoint-1.1.2.tar.gz 4052 BLAKE2B 87d026cdb1f14d12bb2dd73ea0a042237ab05e2cbc2138eea5d1d7388f8151970d3dac8361a8f516e1216eb40cf762ef36089227b54015664c83efef65d1d043 SHA512 985d7d6ebde6fbcf94ad5fccb4ce9fa9905e183741918d7bd98b91721b56fbde11ced4823596e713ac1d3ea14f47e7d9ad9d05aca51fa29ece5906f53d6f1640
 DIST pypoint-2.0.0.tar.gz 4733 BLAKE2B 98b12d7153b88ad19fc42eea23f7c6d3563f2c961a34e2fe485e8be727d1f7c96e1635b7e17b59212811145ae7d87192122a73f891d73aca29231491cad3b04b SHA512 71ae73e9213c6df774d2a509983e2417b07e09b57c48ecf5002bed7b4ba79cb118bdfacb2adb47c76e2440dd5c4bd3f7c4914cb0ed1c7570538e78916d45f168
 DIST pypoint-2.1.0.tar.gz 5026 BLAKE2B 719307748d11dc360069a527f17a8650382b2e65f209257fb09c1c1c31b86225bde5cb4112614cb8d03a637954f690d80a71c8f66ca9e49dc5354ef5f14c8378 SHA512 8954e745d871f726b01e2de8861516c89e07b544b7be53ca2307349654fe889f535d27f78538d59b1baf793ed53b63f9e2a461830eb30cf0cc94799f7b73043f
-EBUILD pypoint-1.0.8.ebuild 653 BLAKE2B aae48da7822c2b6691c3150fcd850b0f428460b36870a6bde157c84cb10cbc990fb11f6d5bcb50cd7c66e418544dacd59b082ec7101a708207b2ab035c015322 SHA512 09143ff39695cc4d76117f8ce9e3ce1bbfdbd4b2311e1b871cab6277ed2acb950b9a583c88ecbf134085d9e20b47f97ed6b798940bd2ed6d51dba2ae8c07e9af
-EBUILD pypoint-1.1.1.ebuild 653 BLAKE2B aae48da7822c2b6691c3150fcd850b0f428460b36870a6bde157c84cb10cbc990fb11f6d5bcb50cd7c66e418544dacd59b082ec7101a708207b2ab035c015322 SHA512 09143ff39695cc4d76117f8ce9e3ce1bbfdbd4b2311e1b871cab6277ed2acb950b9a583c88ecbf134085d9e20b47f97ed6b798940bd2ed6d51dba2ae8c07e9af
-EBUILD pypoint-1.1.2.ebuild 784 BLAKE2B 0cd02f8da494660eea0a9c52a23d3271d6d8131ad7409b17c40ed1383b026bded2c6c6b79a70293de785564a4301cece43948f538184eee3ce708eb469cc62cd SHA512 64113b8743d3e4b76e4b2951368aad6177a5021e8dc349cf1f1b6ba0cdb82d3a6bdee85711bf075725a7d5c66a9712f3ff32d07f2ec2b6cc34549f940adc8093
-EBUILD pypoint-2.0.0.ebuild 715 BLAKE2B 6ddf7c178551fd9fd308cbdbdc79ec8e236c021fb004304c536ad60f419fc03ebeb7572b6662145ed85c6d7afc2b0da7e855efd27e866354fd9a7896c07e4091 SHA512 31e85eb422b7a0bee8184c9d10067b573c1f627a82f5ab864925ff800f811cbf5e1e9fb64fb5169a1fa7cae02d9385f855479108e0535baa969139d03e1f6bd5
-EBUILD pypoint-2.1.0.ebuild 705 BLAKE2B 1cfd78816b77a702a24d40a6e97974ffd9eff67474926cff1dac1b865cd5a7cca16dc0104fe4a1306589a88679879369c98bad78204c8906dba49fbbb14858a8 SHA512 10b07fb870ea641f83308444e409ec6db73e7c64b2e2e62527c45ce002dce712580bf9b0fee6aeca47cb9a7b4dd35dea5c070f71203ea0e51a21925ce94c0eef
+EBUILD pypoint-2.0.0.ebuild 715 BLAKE2B 88b705c2b990fca80a4dd662f5724c73f869de6ddd85eb7be93e0ddf88c381e987e712e23d55c9673ce9d87ce7cf00268c6d804ea200170ed73092606693c6c4 SHA512 d4a5094b172f7fdfd24da23bdd308432aa97b70cd70aa9224ef457a28b4de57d465d6e3edd970981f9358175ae6c0d8ac88d953214ef25a5bfa6ae51392a5364
+EBUILD pypoint-2.1.0.ebuild 705 BLAKE2B 06d4aa387acf628d821fcbc1cc4f14fb7345ee1d268a7af043a6041f2d38eb87b4361cf6dda5c4f65106d82c39f6f6a80672e0eb9d3c42af6d8c16f5267ab57e SHA512 ec80c97353c7cf02edaaa8d72fa99dfe055f74e7f418df854fd4589a4255759273acfd689727c21e57e8c5efbcb3ca5bf3d5259bf7140049db4786984f54dc3f
 MISC metadata.xml 457 BLAKE2B 5e1578b87055ba9b6be7cc69e8065344af0154e7e594c882b08d71ab84fd3babed5f13298674c5f0bf48fd8e707e2833e2a9acc2388798d7010ebf768c13e0d8 SHA512 caed34b477ad74f527b31bc59bc166748e186a1ae63cbe38415738c31942a62ad5376b7c425a7dca97bd91ffb3a9cda648a0c4a270c7428a84011a7ec757295d
diff --git a/dev-python/pypoint/pypoint-1.0.8.ebuild b/dev-python/pypoint/pypoint-1.0.8.ebuild
deleted file mode 100644
index a3ecb2b50..000000000
--- a/dev-python/pypoint/pypoint-1.0.8.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{5,6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="API for Minut Point"
-HOMEPAGE="https://github.com/fredrike/pypoint https://pypi.org/project/pypoint/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/pypoint/pypoint-1.1.1.ebuild b/dev-python/pypoint/pypoint-1.1.1.ebuild
deleted file mode 100644
index a3ecb2b50..000000000
--- a/dev-python/pypoint/pypoint-1.1.1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{5,6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="API for Minut Point"
-HOMEPAGE="https://github.com/fredrike/pypoint https://pypi.org/project/pypoint/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/pypoint/pypoint-1.1.2.ebuild b/dev-python/pypoint/pypoint-1.1.2.ebuild
deleted file mode 100644
index dfb66a52e..000000000
--- a/dev-python/pypoint/pypoint-1.1.2.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit distutils-r1
-
-DESCRIPTION="API for Minut Point"
-HOMEPAGE="https://github.com/fredrike/pypoint https://pypi.org/project/pypoint/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND="dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/oauthlib[${PYTHON_USEDEP}]
-	dev-python/requests-oauthlib[${PYTHON_USEDEP}]"
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/pypoint/pypoint-2.0.0.ebuild b/dev-python/pypoint/pypoint-2.0.0.ebuild
index e048a0323..f811de0b9 100644
--- a/dev-python/pypoint/pypoint-2.0.0.ebuild
+++ b/dev-python/pypoint/pypoint-2.0.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{6..8} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/pypoint/pypoint-2.1.0.ebuild b/dev-python/pypoint/pypoint-2.1.0.ebuild
index fce544b19..fa8ab7d94 100644
--- a/dev-python/pypoint/pypoint-2.1.0.ebuild
+++ b/dev-python/pypoint/pypoint-2.1.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/pyqwikswitch/Manifest b/dev-python/pyqwikswitch/Manifest
index 37dc43cad..fc261a667 100644
--- a/dev-python/pyqwikswitch/Manifest
+++ b/dev-python/pyqwikswitch/Manifest
@@ -1,5 +1,5 @@
 DIST pyqwikswitch-0.93.tar.gz 7448 BLAKE2B d0cfcf8f2a57f9e258d9441fc6855d405902d3e0010cc3119df30bf8152fac6d429d7e9f7303d25da9bb4e59711e2f0430aa30d7d74bf7d6dfbfb8f8d833408a SHA512 352eb535b2aee21e1233ea62998755bceb4790a15a39fc8f1d6f22d8db57b4e4cb10900ecf0c9526bbf1584461dd58fd9da5b90395f6cb08c6b1bc988483cdc0
 DIST pyqwikswitch-0.94.tar.gz 7655 BLAKE2B f1c56d029c296584d5e9769ecf29d1469c23e9a096a5daac1e4dce937b1b0a43816bbaf742c5d7f11afd27776579997dba88e498be3f3c75bc9d878229f05d44 SHA512 24d6004c8962b6a24cda90c642f5f41efa2f51437956b6276c4d169de9990fed757b9e11416a0725b376e83f7f40e323bb0c7a511928dcaa6c0d3cbb24c2ae3f
-EBUILD pyqwikswitch-0.93.ebuild 756 BLAKE2B 77b0f6996d8fedb302651d4092f6688d1de02bb7a8b118ade16fe45b2149b17ad3d291bb76f969437ae8361d5ca49a4e25b49bc1bc4633565febc9154bb1adb6 SHA512 7ace9ff30bb13d0478e943c26a5288de5de2d20efa74e6f39a28e7af65c6492a78168643c427396b9ed465a8c0e85604d8bfaa1858e604994924e069cde1f310
-EBUILD pyqwikswitch-0.94.ebuild 765 BLAKE2B be2f4abd71d50e4d2f73e46123b9f093771d4747d482af6d50512f4bdcd91f0380ac09e2372d6e1ab8adba64adf882fa86a6264fe3d06afec67ac86d555b8783 SHA512 5825626c3fd1239146b6b6a59aaca25838d4e141f6ad5d28fd10094983993994c8ede63c88b341567fc1ce3b80bcb1c407a294664daccf733933eef88590b11d
+EBUILD pyqwikswitch-0.93.ebuild 757 BLAKE2B 876d1b56055d512eda4d0336d24c725d0449f3ab71ae718cd80cb98f7057b7126f246f1ceb6bd2647f81c87fae598f74d9944af7c37303fc9621c83f93f24b49 SHA512 c43d4aed42b6631ff01a3b5ec09b09fad7a508d185cb6e91178e1ff397af4ec78f10e56e20e1dd41f948b57f55c4584cbd721e175affe47ad557d20994f55c77
+EBUILD pyqwikswitch-0.94.ebuild 764 BLAKE2B e92c42d21e912598a4e2b7fc8b574813008170f2f8b9bd1298e700b0aeadbe793e3daf0542a34559c4c8ee8ca8f85dd623f755c64b295fb957c72bd2e2ef0d6f SHA512 e383273cd820c0f83d80b9140dec77da536dd66228214a9f42754dd1fa4e313258f4fc95726346ce8481348e67cab8b13403603ff178cb47a7887401057312e1
 MISC metadata.xml 459 BLAKE2B 9b719c10dcb069c78e639a5e387e37da12809e502e3d9b988552b783a0d01c059018c27cdcaa769e69275071d2ad1423ef2f93820cfb5ef7b5f6326e297b855a SHA512 c9290eaa0460d42547b02e5f7d4a6b02378ab8d1bbb949ed2822bec1403d48ea685d129c430b24b159bffcc244ce94af69799b2baab73e44a4e2e5ca569429be
diff --git a/dev-python/pyqwikswitch/pyqwikswitch-0.93.ebuild b/dev-python/pyqwikswitch/pyqwikswitch-0.93.ebuild
index 3d67649d2..3659f5ce9 100644
--- a/dev-python/pyqwikswitch/pyqwikswitch-0.93.ebuild
+++ b/dev-python/pyqwikswitch/pyqwikswitch-0.93.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/pyqwikswitch/pyqwikswitch-0.94.ebuild b/dev-python/pyqwikswitch/pyqwikswitch-0.94.ebuild
index 7406b0cd5..fab6b2bfd 100644
--- a/dev-python/pyqwikswitch/pyqwikswitch-0.94.ebuild
+++ b/dev-python/pyqwikswitch/pyqwikswitch-0.94.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/pysaj/Manifest b/dev-python/pysaj/Manifest
index 0173bfdc4..fb10cf67b 100644
--- a/dev-python/pysaj/Manifest
+++ b/dev-python/pysaj/Manifest
@@ -1,9 +1,3 @@
-DIST pysaj-0.0.13.tar.gz 3391 BLAKE2B 049f6d1052fbff447e1b81fe966a82396d7bf61dfa8a6081a26ac21a47c5ffc5f584e6b489c77c2324ea8a2f215b9a6478b505a261a0c357824281cc8172aabb SHA512 1d688ff5b04a17db296a30f28fb4c36e0d942f79b5864a2715f825aaff55e2af4878bcdd55e40fb56a72c3ad060981daa127d6222eb15bdcb8193b5c7e8252bf
-DIST pysaj-0.0.14.tar.gz 3539 BLAKE2B 4a1fff69e5ce6cdd9fe88455b59334044618bb863118ac68be6778b551fa34335d9bbd9a1d2899ceb97ed634e541e6bb93b55bae588ad5ad2d8e12cbbf1421b2 SHA512 4b6d85764444cdbdc6e96bba375b9da9db80543683a8025938b60f2f329e2e23d302445c95f4c82bc6c62f31dd8d1111ad005522fa5fcdd7b53c9823ff7b504b
 DIST pysaj-0.0.16.tar.gz 3500 BLAKE2B c8c9aab03b2c93525df73860654a883144940022dfae337f2545c08908c051a8d6c2c6320aa7fb808414345d1cb5d9cb7cf42bcdc978c7ff8bb68966136956b2 SHA512 3853caec9cb920c541a644f8077394fee291178963fc0be745659a65abce8e88058fa3b103072edfcbf9d95a448498ac97600487b7a14b35586d85ae7b82171a
-DIST pysaj-0.0.9.tar.gz 2540 BLAKE2B 984bc1a3062c69a231b27fafaccfbe29dcaa297a4b1c10a5e77f984603fbf0d061ec2698bd91f93de2e73bd0687b4a1a7fdf052940b5317c43e3237dec73f863 SHA512 03f0edac9cf65c100df8f37f33908fe62d5cb90c377908b9e2e8ea21aaddef328dc1a1aab8ec9639e09f7bf90b3777a27306193071c6889ac90729892542f66f
-EBUILD pysaj-0.0.13.ebuild 675 BLAKE2B bf1ef9f5649ecc9c4ca4071eb9c708e74abff0ef9a31ce4f826d834c0fd00dfaa578876b024a9b02e65c8483ced096d66e9a5dc5235ec9db576346efb506d898 SHA512 4dcac696f2ad66f47eca7d9a7c0f6e584165622401d8986d4286dfc158233e5a35bc623d9311535c43718411cb09a9f74090547559d8f5ac7d4a5fee5a0e5c42
-EBUILD pysaj-0.0.14.ebuild 718 BLAKE2B 9e7556e987017d7d90f9defeedf984e23e4c883262cabd0fe89403d5bb5840b036b5cd499bae41f596c5aa1f3f98b9f32419359ec2fd208f13289dd36995a391 SHA512 7b304f7ac5c1fdc212987635494ba6b01e33e41f18cf735e24d0e9b336e97b079c737579cae44f1b8cb65e06953178833a1e7e6e9668055f03914551fc8dbc66
-EBUILD pysaj-0.0.16.ebuild 718 BLAKE2B 9e7556e987017d7d90f9defeedf984e23e4c883262cabd0fe89403d5bb5840b036b5cd499bae41f596c5aa1f3f98b9f32419359ec2fd208f13289dd36995a391 SHA512 7b304f7ac5c1fdc212987635494ba6b01e33e41f18cf735e24d0e9b336e97b079c737579cae44f1b8cb65e06953178833a1e7e6e9668055f03914551fc8dbc66
-EBUILD pysaj-0.0.9.ebuild 675 BLAKE2B bf1ef9f5649ecc9c4ca4071eb9c708e74abff0ef9a31ce4f826d834c0fd00dfaa578876b024a9b02e65c8483ced096d66e9a5dc5235ec9db576346efb506d898 SHA512 4dcac696f2ad66f47eca7d9a7c0f6e584165622401d8986d4286dfc158233e5a35bc623d9311535c43718411cb09a9f74090547559d8f5ac7d4a5fee5a0e5c42
+EBUILD pysaj-0.0.16.ebuild 717 BLAKE2B 3ccfe4f91aaa7f7f6fc6b2b482ec5ece32d6248134c5bf99b0f0e416430b20490e3d2c40b59b949fc66673c373c792f3f8286471accabd26708c560a740ce7f8 SHA512 7a1cf515b2eef3429a27848eb6b2b07eeae0bf89ca126f6db2676b1a6e4d4354cc84227d8aec3e5ebbedef73d93a3da321bdf80a990e35c1d692029d327ecad1
 MISC metadata.xml 460 BLAKE2B 840e1699a40cab42d6bebb27933833b2d6d5f67eda2b89f4a612995a8126edba08c69269e7b6ec949e8a0547635c4977c0b65432af828cffb80f7e8ca7ec80ab SHA512 4fc397eb480c4ac821822e02be3fe8ae25f18b93ce9a4cc080cdb06f15dfb171e1ea9df06a5854f67c668727fdb30d64f10aba8990a4771a0b3761637b83eac6
diff --git a/dev-python/pysaj/pysaj-0.0.13.ebuild b/dev-python/pysaj/pysaj-0.0.13.ebuild
deleted file mode 100644
index 3d935109f..000000000
--- a/dev-python/pysaj/pysaj-0.0.13.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{5,6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Library to communicate with SAJ inverters"
-HOMEPAGE="https://github.com/fredericvl/pysaj https://pypi.org/project/pysaj/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/pysaj/pysaj-0.0.14.ebuild b/dev-python/pysaj/pysaj-0.0.14.ebuild
deleted file mode 100644
index f958dbba3..000000000
--- a/dev-python/pysaj/pysaj-0.0.14.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit distutils-r1
-
-DESCRIPTION="Library to communicate with SAJ inverters"
-HOMEPAGE="https://github.com/fredericvl/pysaj https://pypi.org/project/pysaj/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND="dev-python/aiohttp[${PYTHON_USEDEP}]"
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/pysaj/pysaj-0.0.16.ebuild b/dev-python/pysaj/pysaj-0.0.16.ebuild
index f958dbba3..999feaa4a 100644
--- a/dev-python/pysaj/pysaj-0.0.16.ebuild
+++ b/dev-python/pysaj/pysaj-0.0.16.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/pysaj/pysaj-0.0.9.ebuild b/dev-python/pysaj/pysaj-0.0.9.ebuild
deleted file mode 100644
index 3d935109f..000000000
--- a/dev-python/pysaj/pysaj-0.0.9.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{5,6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Library to communicate with SAJ inverters"
-HOMEPAGE="https://github.com/fredericvl/pysaj https://pypi.org/project/pysaj/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/pysesame2/Manifest b/dev-python/pysesame2/Manifest
index 2b3230ee2..9cac63ba1 100644
--- a/dev-python/pysesame2/Manifest
+++ b/dev-python/pysesame2/Manifest
@@ -1,5 +1,5 @@
 DIST pysesame2-1.0.1.tar.gz 3903 BLAKE2B 679b83d2b723b05306c908dab21510e58c90d235f826e0d02d416f3e48af013ca7aa7db756ab0ce186d6f797d0c38a15cdd63d9be3dbb58d723876593a31d71b SHA512 d928cdec5c5f5d14ba604b685fcfb3fc671f08999e3884dcac5253ea59bbc7ccf6406b36dc61383333a287683333fa45b7840a9fbb78022c3530157c795787b5
 DIST pysesame2-1.0.2.tar.gz 3908 BLAKE2B 29533581cb6ee1a56d6e24336c1143a7635e03c0f6a1da2f76db82303298187514505508e19d3c3179bcfece653c1f57ce17774b1d7067caa6eaf2266309fb5d SHA512 26154d32eb098f60a0c67cc41f413ab29d2bec423d2f8663b62f923f98bd84217e862540b42e9f987716e75c192c1ad93a6612dee0e7f01426fed6616a7f60a3
-EBUILD pysesame2-1.0.1.ebuild 739 BLAKE2B e6961489a26e6c45772765b6f1f5e0339e3f17e4bcc1a0699dbd96c22c81dbe9eac0cd6060eb1005a8a026beb21697289d23dac0cbb1025c2056ab624ae10757 SHA512 dd8bc514e9aea7cc1d94415f398451911be073b0a1d65edf06e02fcb20d44b003a6902f5583da391759c0012f0233e56e09ae909351d886d57594b83287702e2
-EBUILD pysesame2-1.0.2.ebuild 748 BLAKE2B 77614eca6efd727630ca6dd4fd97e3283c7a8d15bbde9bfa3828b9c00f4f3facd4b6651d1066003f95d62fc6f2c393d6c34149e75ddcf148a18c287171a695d1 SHA512 96e084feb91145e17a4a3f3825d4bdd9945eb4966af0351079e02719e78850a819834d004d872f5dcebb6cb7eca73a2608929872c9efe4bbc19d09e0d2881805
+EBUILD pysesame2-1.0.1.ebuild 740 BLAKE2B 6293ea30c0539781dcd2b3e954f9f343a3d9ac0cf333b101624c0ea234dd75b34abf4bf70f82dbb660aed903a364fb9243589084068a57312588f2d27a1c306f SHA512 9bbd4ca0f6d7c131a69bd913c61a714a59086908fa1d95f82bf2333ea115277d4e8659867060fb3aa133031bc185d6fe3aaed38aee757b899bacb337e7452d57
+EBUILD pysesame2-1.0.2.ebuild 747 BLAKE2B 338091e46e30e64abee3163c916e5e1aceaf6964a93b0c308d688b8d908e6ee84911a4573c99f77c2b0a06399fd5c27a439bd033591492c399ae2d94f5ebcef8 SHA512 9b97798b2e33f5061a5b181fa3d4745825723323e387d3876089dabbbebb14f1d387c09d39d9b98d79ba834166fba75087896e50a2750021b12fa9b99d31e2a9
 MISC metadata.xml 458 BLAKE2B 032dabee0dfdaa1f71b135111425e62d55587dbc6893f68cbfe8aca25b4b77f6de3c19b6a3fdd181f8da9a25bbb1204b197b2343d089a1dcee177dde60683a06 SHA512 c5cd8659fa583413b0665ca4a3ebdbf0b0fda5a9fdd8bed9dc73a15a21debd335827d6c9af2bb3ff2593755416a989d07fc43b8a725069044988f1ca45eb5710
diff --git a/dev-python/pysesame2/pysesame2-1.0.1.ebuild b/dev-python/pysesame2/pysesame2-1.0.1.ebuild
index f3dceb53f..d3c975b39 100644
--- a/dev-python/pysesame2/pysesame2-1.0.1.ebuild
+++ b/dev-python/pysesame2/pysesame2-1.0.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/pysesame2/pysesame2-1.0.2.ebuild b/dev-python/pysesame2/pysesame2-1.0.2.ebuild
index c6cdf7619..aa6847ee5 100644
--- a/dev-python/pysesame2/pysesame2-1.0.2.ebuild
+++ b/dev-python/pysesame2/pysesame2-1.0.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/pysma/Manifest b/dev-python/pysma/Manifest
index 77c6cdc2f..9f21eb8a3 100644
--- a/dev-python/pysma/Manifest
+++ b/dev-python/pysma/Manifest
@@ -1,11 +1,5 @@
-DIST pysma-0.3.1.tar.gz 4629 BLAKE2B 4d5c080ccc68cbf725cccf7b6ac6dca789e28f58affe18ca33b6eec48f0dccb3a0d8759ca139f460218800adf2fb01dc446d9f97606b8f293ab90e79c75849ab SHA512 cf6bbb57777ab7ec5b300cdb91c7a0677476d15543eca418d325ca5134c71f08790bb1fd1ae629a4c71ff3d60fe26951bfd6e444cbc7d2e448cea04e7771bf4f
-DIST pysma-0.3.2.tar.gz 4727 BLAKE2B 15cd45aaf3faa4db3c84313e95eba47605437567056ae631ab9dc6826837e444be1a4a7a51f2d7fda7d933b6731ba7330947b986567ffff647ff80527cb2e0e6 SHA512 d099bd73101c6e202c1b13ac3e53ecd8eb0d1a9edff31112f0f6e608af1de09fc4382b7c25dc75dad259622a7fa649ee88b864e713a27e2a3d8782c460d6fa4d
-DIST pysma-0.3.4.tar.gz 5372 BLAKE2B 5cb0f7db17a34baadcaca628c79e6d9b2fddd3940ca9c20224ea29d05355b8cb407e32ce57937a093458792ca490862b91081205d245e126f2ef60be1f3186ae SHA512 90004204b45b74cece3d2a8482f38e699e37de96f72e8fc37728467e80450836fe4b6eae4606f7fb29c510e3d5327803f13b07342628761c510e7194ff10fe47
 DIST pysma-0.3.5.tar.gz 5798 BLAKE2B 8bb99dd402f7c6d21b43c73e6f20c32665293f926ab66fd48f87a203e45f15cdd5c3ad06f96e43a96d8442fef44f9a9f2f37f7028d6c6ffac41c3fede2a4e66d SHA512 df10e51d02dabaf474040837d84afd1fc543f6addba71dfc7a1d9f25318e00bff2c3f24c3b2e348bd53d30c2bf66a85f768c76e2c9611c7a2782b3d389d020b4
 DIST pysma-0.4.3.tar.gz 8539 BLAKE2B f588966835b4281cbbe69c1cec547c41fc160aaf96fae42962ab327b2c033bba22b89fbf8625bd741a89b435918d8e35c9119c6094885c56172301c02fdad757 SHA512 ce0a220f4a5c7a2c5edc97e673e3353611b851ef730c4e1fbef23de146a9bbbac36f46fd89543f17ad86cf1fd04afaa22d7b52d57ca6471906cc61b4439f8765
-EBUILD pysma-0.3.1.ebuild 683 BLAKE2B f5f7da40f5db98a584730dd74ef516e1efc640f8f7437cb09f7e16fca127f785e14906487dcf557c21b37dbe3dd0c8244849020f97d63ae449fcc6e08ba404ad SHA512 d3000cb4a0874eb8651867f9aa40cfda276af6193a623c3ee8c2e873e569e3271c86722d03036cebd03bbd891c147d087b1570ea7b50d7a457d72388d86f2440
-EBUILD pysma-0.3.2.ebuild 683 BLAKE2B f5f7da40f5db98a584730dd74ef516e1efc640f8f7437cb09f7e16fca127f785e14906487dcf557c21b37dbe3dd0c8244849020f97d63ae449fcc6e08ba404ad SHA512 d3000cb4a0874eb8651867f9aa40cfda276af6193a623c3ee8c2e873e569e3271c86722d03036cebd03bbd891c147d087b1570ea7b50d7a457d72388d86f2440
-EBUILD pysma-0.3.4.ebuild 683 BLAKE2B f5f7da40f5db98a584730dd74ef516e1efc640f8f7437cb09f7e16fca127f785e14906487dcf557c21b37dbe3dd0c8244849020f97d63ae449fcc6e08ba404ad SHA512 d3000cb4a0874eb8651867f9aa40cfda276af6193a623c3ee8c2e873e569e3271c86722d03036cebd03bbd891c147d087b1570ea7b50d7a457d72388d86f2440
-EBUILD pysma-0.3.5.ebuild 690 BLAKE2B d15e5979bc7d667c5048b8d82863f87daaf90fb1a49410c28a3b343fbea7c450c230ca0f3f531e6f0496dfebefd59eab4707adc01ddc616f9f529fdb89e9cadd SHA512 2805178f4f410acd53c4709ded910b06b4843863c531c768315b85279538b64a0b48880513d7147de001f44ece355bb55300b958083f73f181f5d4bc17b772b3
-EBUILD pysma-0.4.3.ebuild 862 BLAKE2B c3e4117337ab11c3f33e7f13d92632bd93db5b02f354df9439224bb00709fef6f21ab23d94173ce88b5446dfa7ea7cd3c887d0e437fa8f1f7fbbe09da7a0e0ca SHA512 a885255cf014c20f26f45068158264dc535a91e3d872778603a433e6344612da23ac8ba4c479817b8120a3cf17f0200a5411ef9839f420aa339ed6d6a4c72a8c
+EBUILD pysma-0.3.5.ebuild 689 BLAKE2B c8dc104e1526dd8746a1ca562d6355fd249a56dadf4adc869d4d70bb1151e5ecb951305c8c41fa7a10f043b49baba4477fe6afb7a1501241e74e1a0745acdab9 SHA512 eb8786a41ce48e36c03c8b433950a4dc84cbefe7decef804cd7dbf732d2763f5c0bde5d8612d96595993c8c89cc94154aa729f895997694132e112afd621fd28
+EBUILD pysma-0.4.3.ebuild 862 BLAKE2B 37097f0c1ff0e986001440b902e2629873ec2fdbf1078156e409f61d9a5b9e9e347866b8bbd1783eee91c34e6d99d3d2c8c00e09fc7e0f4ed6c393901c7fbceb SHA512 de6f1a2e4d92f62f1a99502f7a16c289bd80f6bac734c5061479a63bb9ceb9c68c3bf15db3d62d88f752337f6b089c09719a0af376d829804773891ec65f2ed9
 MISC metadata.xml 452 BLAKE2B dd32407f2d5fd0489d37aa566654006d78c5052b6fcb0a779392b7f06a4c35191ae73e53a495ef50beb93dbcf96698adf8b25278e1bb2e8a5df754a145afcc9d SHA512 28235a00cc0a2a0c34549a7d2d3cbae84371d28f028708fbadb4b00c4ab0f4241be973513c1417aba2c951b169e15441b3579d57e8e7f9917fbacb0d95e88141
diff --git a/dev-python/pysma/pysma-0.3.1.ebuild b/dev-python/pysma/pysma-0.3.1.ebuild
deleted file mode 100644
index a6d098431..000000000
--- a/dev-python/pysma/pysma-0.3.1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{5,6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Library to interface an SMA Solar WebConnect module"
-HOMEPAGE="https://github.com/kellerza/pysma https://pypi.org/project/pysma/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/pysma/pysma-0.3.2.ebuild b/dev-python/pysma/pysma-0.3.2.ebuild
deleted file mode 100644
index a6d098431..000000000
--- a/dev-python/pysma/pysma-0.3.2.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{5,6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Library to interface an SMA Solar WebConnect module"
-HOMEPAGE="https://github.com/kellerza/pysma https://pypi.org/project/pysma/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/pysma/pysma-0.3.4.ebuild b/dev-python/pysma/pysma-0.3.4.ebuild
deleted file mode 100644
index a6d098431..000000000
--- a/dev-python/pysma/pysma-0.3.4.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{5,6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Library to interface an SMA Solar WebConnect module"
-HOMEPAGE="https://github.com/kellerza/pysma https://pypi.org/project/pysma/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/pysma/pysma-0.3.5.ebuild b/dev-python/pysma/pysma-0.3.5.ebuild
index a3e8e8c61..3f6cfc8f3 100644
--- a/dev-python/pysma/pysma-0.3.5.ebuild
+++ b/dev-python/pysma/pysma-0.3.5.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/pysma/pysma-0.4.3.ebuild b/dev-python/pysma/pysma-0.4.3.ebuild
index 071922cdb..6eab7b3e3 100644
--- a/dev-python/pysma/pysma-0.4.3.ebuild
+++ b/dev-python/pysma/pysma-0.4.3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/pysnmp/Manifest b/dev-python/pysnmp/Manifest
index 25af63568..15f68d345 100644
--- a/dev-python/pysnmp/Manifest
+++ b/dev-python/pysnmp/Manifest
@@ -1,5 +1,3 @@
-DIST pysnmp-4.4.11.tar.gz 441657 BLAKE2B 2a1f14f9205ce34bdbd5cc22e1875e00aa8f34f0a3327aad37d920e3b0c2e4b5c2f0e877b23cf59ec65f803020bcfae0c7162666baa7621be19042506fdbfd26 SHA512 0f61ad0c095398b4b511c854ea7156aae78495f299457b14f4d3b50833670ec77c905e9cf4bdc30c21dd3c3e62d1c3473d7895f0352140af6345b18c1db3e7d8
 DIST pysnmp-4.4.12.tar.gz 442270 BLAKE2B 0e4e1c44d7fe1def24d8bd12bf88012eb54d432888745becacdc9c072ab5a653eb947ee418f6b7b3f84bed39d6656dac25ea00a2accfa546d7310be17b04c8ee SHA512 f22a346443cb07beea594b67b09ce587f5602a439c68148b8a655a0d2c769893848bfcfdd47b5f0002f48c650bf3a39186edddf977fb3ad2cc0d124e66f2ce94
-EBUILD pysnmp-4.4.11.ebuild 654 BLAKE2B 3955c8a368c7c323fca11cea2a9b6c5581679b5f821e884bfd7b591ddacd1eab76e5dae8f9148e0f0b9b5728d222068c851bf64f77b412f6b5f026a988e75567 SHA512 20949181a252440309dbe587770727c23d1d53e60266411f177403db1f9e084156db84b9c7ff16345fa6096ece0791979602a6b9b4104479b9ebb468f7c3ee49
-EBUILD pysnmp-4.4.12.ebuild 658 BLAKE2B 8d8263a2d42bbb3ee85455e2a395977d47658aab36779aac35417c8fb12f27e347327e75ec05d7f8da23252db17f2f4398732ee607c2aa1fd9da61e184db6139 SHA512 6636e09d305ec16e9bcc4e9ef891b5b46e5a3515a244efe73616e4b6d2e0b1ee9b5d0d7ed25c00bffbb0fdeb8bf55aa2ce8953564caa1d2c2c992701270d10df
+EBUILD pysnmp-4.4.12.ebuild 657 BLAKE2B fbceefdc7bce1522e8ef791f389f7f70fd2985333c97daa208955dac51383df3ccba67357b10b6908c981b2c6c08e4c606c1d5e3f0f06611723d0c6915b1cb72 SHA512 d90fa7a56e5784c02aeab5243712877f644b17866ffda015da394048496b73061e34909ac5d8eabf66b8290aa638188f7881045118c9f6ddafcd41daa6ca08e3
 MISC metadata.xml 474 BLAKE2B 8bf9b234c67f13bb91ddf9c6fcb9e9c50eb9fe5971d79e2ce7bc649850a9951c6c575b923d43ac3975b14eb710254f5a45f3a566ea1a64148c31ce4fb5baa4dd SHA512 9cf285d7c537e8755174038bc406459261338dab24b7a66c279613bfe3e02d75277ba36788eb829abc3786ff39b526fd254526e2597de2cd1f2b7507a28151ce
diff --git a/dev-python/pysnmp/pysnmp-4.4.11.ebuild b/dev-python/pysnmp/pysnmp-4.4.11.ebuild
deleted file mode 100644
index 41514feaa..000000000
--- a/dev-python/pysnmp/pysnmp-4.4.11.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="SNMP library for Python"
-HOMEPAGE="https://github.com/etingof/pysnmp https://pypi.org/project/pysnmp/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/pysnmp/pysnmp-4.4.12.ebuild b/dev-python/pysnmp/pysnmp-4.4.12.ebuild
index 551fa1a53..f2e1e0f07 100644
--- a/dev-python/pysnmp/pysnmp-4.4.12.ebuild
+++ b/dev-python/pysnmp/pysnmp-4.4.12.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/pystride/Manifest b/dev-python/pystride/Manifest
deleted file mode 100644
index d54c81890..000000000
--- a/dev-python/pystride/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST pystride-0.1.7.tar.gz 1749 BLAKE2B 616fb8dd7657160e98de462c80da6f2d06be2e7a5e61de206c06c007d21a8bd3ca371155a4422fca4e33e747682204540ec7b92cb7a501fdd0664bffe00f5acd SHA512 8fe953eb5ff28076fd82e980f4238d7477fe318bfe3535a589dc36a51e1e0e4b44f868824b03b361106777c663044452b9f4c1facdc8925f25f7680a7946b85b
-DIST pystride-0.1.9.tar.gz 1914 BLAKE2B aa3c724fe54d43aa12fc30887cdd2f7732ecce07a80e8f440e759aab32bb6741f65e166fe09f2e8fc11c04811c5de45bc66bf82dbfec56e83057be700a07e643 SHA512 84470a014d620c1f4c5df200e943b0b9cdd94dfaae25d9d91de5790fda9202bbc2d2cc54b065b87447b685290838146ab348bcdda7f4c75ff5f393dd56d2e5f0
-EBUILD pystride-0.1.7.ebuild 675 BLAKE2B 834d4f496634ab9b6046acf4f07f7f81c14066516ed56fa06b349e56efbc02f2c2936bc6aa3c74857dba8c87d868037a499b7f579dfef93a9a66cce2c12978ef SHA512 d3da6bb4279b4e1a870c878692abedfa0cbf17aca64b2372b0da4536c4a5f5bde3b728493111ec43f2a1b5df1e5619681c13c173ad088652732ddd5a8e90a3f1
-EBUILD pystride-0.1.9.ebuild 682 BLAKE2B 5179626ef3d1b28117f92436e3e1cb8578c78d1787244aa43c4f0a7b2c27025f2b1c653807fe56bdffc0b61e7d44974db2580b7de5231a95f8b4c7779512d7ff SHA512 34967297d87d004e6375e3224f24ca8b03732baa97c6d18b5c9918425734a5fa5e0943e92bd5071ef0ce86d898569425ba2051d1546de3517440448d3bc73109
-MISC metadata.xml 455 BLAKE2B 849e5451040c561c4e70cdb7bc5352b43d4c28d4e5091213d74860bd9adb0f75f9d57d3f690be5d53736f82803ccb5a2b8efd80a6c07ec13f6f085ff12c8a564 SHA512 5f2dfe53b6223193332b42843a80a3d1d51369b589e66c3760f49c58bdcd67f1090e42df7321e6163f9e19df8e33dced745af43f0816c5bad8743fc3df48dd29
diff --git a/dev-python/pystride/metadata.xml b/dev-python/pystride/metadata.xml
deleted file mode 100644
index a2f707d36..000000000
--- a/dev-python/pystride/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>b@edevau.net</email>
-    <name>Andreas Billmeier</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="pypi">pystride</remote-id>
-    <maintainer status="unknown">
-      <email>dchevell@atlassian.com</email>
-      <name>Dave Chevell</name>
-    </maintainer>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/pystride/pystride-0.1.7.ebuild b/dev-python/pystride/pystride-0.1.7.ebuild
deleted file mode 100644
index 402f60829..000000000
--- a/dev-python/pystride/pystride-0.1.7.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{5,6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python client for Atlassian Stride"
-HOMEPAGE="https://bitbucket.org/dchevell/pystride https://pypi.org/project/pystride/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/pystride/pystride-0.1.9.ebuild b/dev-python/pystride/pystride-0.1.9.ebuild
deleted file mode 100644
index e0bf66168..000000000
--- a/dev-python/pystride/pystride-0.1.9.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python client for Atlassian Stride"
-HOMEPAGE="https://bitbucket.org/dchevell/pystride https://pypi.org/project/pystride/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/pytautulli/Manifest b/dev-python/pytautulli/Manifest
index e3e9793e8..57ca4fdba 100644
--- a/dev-python/pytautulli/Manifest
+++ b/dev-python/pytautulli/Manifest
@@ -1,5 +1,5 @@
 DIST pytautulli-0.5.0.tar.gz 2821 BLAKE2B 8f8b32407e280d6f86e098ddf135bf75483f26ecc53b8fde3108adf733813133b8410f32979e7e5c4f3b4fe11f7fa155359dd984569cbc0994f1c77590ebcdf7 SHA512 8b6175603311131ab52bbf0541b180f2cbd32a4d174ccdaa77de42747f4403f746c3a6f2933aa981641a7e8f32a98bf003617db56903a7c9b8b0728d2fac903e
 DIST pytautulli-0.5.1.tar.gz 2822 BLAKE2B 89b20fa3e552eab9097d8f62c23fb14f9d62e736f082d32897281b201cd9410cd90437e21e54054a1962eb3b681e98de796095d82f848d1dbfacf290a145fdbe SHA512 d33c431a8305cd690de7d5497658e4529937a580a894b7eb40c2324939b421fb3ab684dbe063323067fc380ea3148b227b024ae10c087b262e911fdb4b77129e
-EBUILD pytautulli-0.5.0.ebuild 768 BLAKE2B ee938afb8670701fe24af237e6bb6309b918b5f8e7585fb04814012ca45a5c882515be0cbf0970e27167a89f8369ce424232904b2da04de25dd2fd8157b00dad SHA512 4ee108d75127e358c296387f7a95ddf32fb591249060fb60a74e15a2741a0f54581ebf414fa9c2b201b62672936c9585f4b6c8960a172a79b8a2b8ec7ca16407
-EBUILD pytautulli-0.5.1.ebuild 777 BLAKE2B 92712c8d43c6d926839ee5fc3b958136571535db601391de80a0346b46d946cd33e0a7cd912652682c8d1457262218ab7ef8faf6c4d2b59307deb12f4642778c SHA512 12bc1db2ec40a10db1496de54f36ad66d467c25221612cb7574723845d3183cb6cfcfc327b5e207370d6049e38d98ad8d955b613442687e2ca0beaf2c3b874c7
+EBUILD pytautulli-0.5.0.ebuild 769 BLAKE2B e21ce075d1a6b4e52018d8e79393dc05d3f7c1ecac1607024e0ff7ee55daee855f5e37fdffe86202d7807391359866d33190d01e2d1b5513fa41bbf44e580625 SHA512 7765ff731d98dd6d56d0efaa81d18f9a131e037aa21c94b72bd3531c009d9d17e09817011024a3d1135de2c4e4e673f49ee00934d2d6c8d8f3866fc363bf2aa7
+EBUILD pytautulli-0.5.1.ebuild 776 BLAKE2B 9ea4625b354ce55e17aa10d1523206a21cbc1d2607d0ccda97b1d7041a9f7176f84e774d341b0a44a7e528c0b45023161ed3ebf62d5b7bd0167e437394d85b53 SHA512 33285ef79b430fbe3712cde8c46a12671bb5dbd361462b79644f647ee53ceb9d7bdc4db9ffda7b18ba6291010c6c3a19af96da530f9946d3ec06e9412ca836ca
 MISC metadata.xml 455 BLAKE2B 0909d68d78b365920cd9bb775f1d26890d5d4671154d673ab198e7e4ac044e9bf70ce2274b2f9d10c6ccb6c6e3490d4c04070dce2ed85575a60e3845ab375769 SHA512 e5c09f1e7b99debafb8960b58c6ab24b7a53337be6b1ea2cecec047991286260e70af424ae869f9400e5cf9d1acaa09f2fb2764bc52edcaf6e421b012f9109a2
diff --git a/dev-python/pytautulli/pytautulli-0.5.0.ebuild b/dev-python/pytautulli/pytautulli-0.5.0.ebuild
index 76fa3420f..9df4a4c11 100644
--- a/dev-python/pytautulli/pytautulli-0.5.0.ebuild
+++ b/dev-python/pytautulli/pytautulli-0.5.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/pytautulli/pytautulli-0.5.1.ebuild b/dev-python/pytautulli/pytautulli-0.5.1.ebuild
index dae697239..0047e38da 100644
--- a/dev-python/pytautulli/pytautulli-0.5.1.ebuild
+++ b/dev-python/pytautulli/pytautulli-0.5.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/pyteleloisirs/Manifest b/dev-python/pyteleloisirs/Manifest
deleted file mode 100644
index b6a17d598..000000000
--- a/dev-python/pyteleloisirs/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST pyteleloisirs-3.5.tar.gz 4538 BLAKE2B 92ec1e3fb32ac7670788dbe8f7e0a9202aea5d7c0e3a5754aaaf72ede8dae33faa1a8dfa32b31998ce8c76c9792018058a8dabb726c1d77c57da3b3751969e97 SHA512 7e5353f0004ff914466085795c0f79475c57ce2c7345af0a33cfd4a9676e22dc727dfeec7a8e6cf8152888e7c7e4c7b58722b811297bd49f242ca380a54d2d2a
-DIST pyteleloisirs-3.6.tar.gz 4167 BLAKE2B 6e8a4a0973ed31ee402bd1d695fe14d66256585ef5731554fe84b7c0e93b875f29ad325080107b21d98bca6c735ab8570470039bcaaae2cb4fb504d9ef6a8fa3 SHA512 293dfab6d22cb1982085110117cd34f36e5fa3597a25ff5cfa69ddb57ed9fbae1e267baad6ce0b928335a0355896f14fd19ed52ad1b1763df7bb9283a6a3f331
-EBUILD pyteleloisirs-3.5.ebuild 856 BLAKE2B ae54cc0fc39a3b7c1c28730cd632326ecd42b0e381fe67eac5d2add51c0e5bad9cc392fbadf0ff45d4da998d6aad447f7f5d8387242804f0f0670609a385b6ae SHA512 c2404e2dfdebe91979cc16c4e8438ae805c39016a17bad46def37c340ca16f16e1aaae195f3df6bd5ceb2a1434e523f5f3402652c64387b840b515213bd886a4
-EBUILD pyteleloisirs-3.6.ebuild 865 BLAKE2B 406b8d2a1cda777c2a6dc840970433109130c893eeb3240ed17a3501893bfce38036fb53bfcd054ad86b7a9a72ec97a53773d44f8d1a5a03de4c15f4dabfa0eb SHA512 dbb2832853a869331b7347321a32eb8cb94c153070634b3f51da8d8b3e93abc80e6e5aadb511e459ba87bcd08122f377a2df3210e1e32e42b56e6c60c4322b03
-MISC metadata.xml 459 BLAKE2B 310aa5a1b850ef9a827d57b9913a1e6bb794409c6947c09e126aaaa873939aaa4281bab5b9a0b4c32e0074ee0b7a98a8826f95e1c978b23079a6598634072049 SHA512 bc1aaf0171ea1745ed15d9084b41a2fbbdc6e2f8062bc2e7758911d13ce967c89e062ed9be482db0e69154adefca42d8fbfa2edf587e4d209b4294d0041d0805
diff --git a/dev-python/pyteleloisirs/metadata.xml b/dev-python/pyteleloisirs/metadata.xml
deleted file mode 100644
index 5e57ca892..000000000
--- a/dev-python/pyteleloisirs/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>b@edevau.net</email>
-    <name>Andreas Billmeier</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="pypi">pyteleloisirs</remote-id>
-    <maintainer status="unknown">
-      <email>philipp@schmitt.co</email>
-      <name>Philipp Schmitt</name>
-    </maintainer>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/pyteleloisirs/pyteleloisirs-3.5.ebuild b/dev-python/pyteleloisirs/pyteleloisirs-3.5.ebuild
deleted file mode 100644
index 263ac9a0d..000000000
--- a/dev-python/pyteleloisirs/pyteleloisirs-3.5.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Get TV program data from teleloisirs"
-HOMEPAGE="https://github.com/pschmitt/pyteleloisirs https://pypi.org/project/pyteleloisirs/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND="dev-python/aiohttp[${PYTHON_USEDEP}]
-	dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
-	dev-python/fuzzywuzzy[${PYTHON_USEDEP}]
-	dev-python/python-levenshtein[${PYTHON_USEDEP}]"
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/pyteleloisirs/pyteleloisirs-3.6.ebuild b/dev-python/pyteleloisirs/pyteleloisirs-3.6.ebuild
deleted file mode 100644
index 9b32d0af4..000000000
--- a/dev-python/pyteleloisirs/pyteleloisirs-3.6.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit distutils-r1
-
-DESCRIPTION="Get TV program data from teleloisirs"
-HOMEPAGE="https://github.com/pschmitt/pyteleloisirs https://pypi.org/project/pyteleloisirs/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND="dev-python/aiohttp[${PYTHON_USEDEP}]
-	dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
-	dev-python/fuzzywuzzy[${PYTHON_USEDEP}]
-	dev-python/python-levenshtein[${PYTHON_USEDEP}]"
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/pytest-cov/Manifest b/dev-python/pytest-cov/Manifest
index 4a9e06cba..4ba4cf85f 100644
--- a/dev-python/pytest-cov/Manifest
+++ b/dev-python/pytest-cov/Manifest
@@ -1,12 +1,6 @@
 AUX pytest-cov-2.8.1-disable-broken-tests.patch 763 BLAKE2B d36ec8acb8329cff8619f22cf485d2161d3ddda7740eea7f1516b5fee6e70bc597b1ca5ac79514be06eeccbd22a458381282622404152e7a41def6af3c3b15a4 SHA512 fc301e116072b7d77864f51a973b20274034569015c198fa8c05efa09d5863bbe9534d1ee1d2170a41485f914f4006cc6818332df76292aecb7e229cd61c7a63
 AUX pytest-cov-2.8.1-latest-setuptools.patch 1247 BLAKE2B 24ac573f41ea6beff690330b26900e99f7454bbc74bb868246055bbd5ed9385f7fff9e72c4222c855dcfcd06e1cab6ac322ec9c085c3b3fdbb12137f8f64455b SHA512 699c4e0e5e3f0b8b145946fa319d19be4ddd42ab7f565af875ca37df0aac222d2b0af50f13ee52f19cf01c9e799a8b7e60ccf114b59530731f820c91311b1b5a
 AUX pytest-cov-2.8.1-python38.patch 2522 BLAKE2B c09196ac945cd4b00acd75e45987be12ad1c8c251b679135fce1c2356d58396bc11b986f6d65ba0b946f5008eae70dcf18ceed68ba1ea50cb39bce303e710912 SHA512 3bd1fc80cfc76bdf643ed00bb59ecee1ceaf3c838f851cd65f844a5297ea33ab514ed441a5807ce6424ac461b10b629a8b6885851cb80336c5836c5f72ca6271
-DIST pytest-cov-2.10.0.tar.gz 54570 BLAKE2B f9969a593d0ef4d3be636e66516388e879d32eb0b82ef63fd82ddc84f9cdf2e7186e695f8b1b6d7a825e7be2307837263c08b4654123895c2ee1b79a8cb2f416 SHA512 64347a140d5653afa8aa64dd703b1611e3462f185af9ff81b02c4309673e11603499be978fff3ccf33a5128db1f6d4efb0e822585080d35bcd22b4a1e964072e
 DIST pytest-cov-2.10.1.tar.gz 56822 BLAKE2B 45eba205a2c6687882445d3554cedc04ad556854f5eac8eb0fab7fda84cdf2736b034dfdceb664293d1add153a5271403eb94585a863676ccfef9ab09727d165 SHA512 2dd575141754a417f34b414ba7e07291c273abdc63a6b7dc72d317c6ec10076b83c2ad78eeefdda7cee1fd6f56932d838602da4dd760a1c0d12095be94c22568
-DIST pytest-cov-2.6.1.tar.gz 35307 BLAKE2B 11974ff70ed5609d7db3c4c35f5b528b0ec36b48cfaf06974a090127706e0964841347592ac3f1e086f46800857ee10c05404045b6a4b467ffa278c2ee1e1957 SHA512 2dfd16e013d8bfbe5d14990f419291b651dd11560328a7e59b5449016d51b17f84d4ee3866fda866c3530389d206b1c4c67c84b23f097281c3963ffd19ea8caa
-DIST pytest-cov-2.7.1.tar.gz 42121 BLAKE2B 4136a1ad33bad35b0d8f161be15b33ddaab69e68cf34f1db6d3a92ad31b84da18ea2051d2ad67e006acbe5dd2a49032fa78b8a564d97b23ca283eb0563e9e77c SHA512 dbdaa8b1ed7b97885671b1bd46234df51552754913603e93c4e0caa2f1e09c7efba84908d49bdad459348a989ec4efaa97567a51a7ccb38c5d4e37a0d9f97ca7
-EBUILD pytest-cov-2.10.0.ebuild 1394 BLAKE2B 628fd0f4b0ee7762be21d2b1015786cca63ea6e5c91c3c32c229f6c4b04315860421ffecdfdd4a5a1ef6c30643209af350895bda5c66598b97deb75a84481b53 SHA512 b7bd42f6aca9b78b847e945b4fa0cb793d796ea7bee779f51c4a641a0170c9cf6c8c0bf26be7810eae0d870a0010ea8e64b24e88c63f6051cdeb0674264b5af1
-EBUILD pytest-cov-2.10.1.ebuild 1394 BLAKE2B 628fd0f4b0ee7762be21d2b1015786cca63ea6e5c91c3c32c229f6c4b04315860421ffecdfdd4a5a1ef6c30643209af350895bda5c66598b97deb75a84481b53 SHA512 b7bd42f6aca9b78b847e945b4fa0cb793d796ea7bee779f51c4a641a0170c9cf6c8c0bf26be7810eae0d870a0010ea8e64b24e88c63f6051cdeb0674264b5af1
-EBUILD pytest-cov-2.6.1.ebuild 679 BLAKE2B a8f467b18cd03c7d96e9dd6ea58d428148289e512cd8da9f3e1a3db629b5a12fc097d7bbcbda8cd84b2c522007dfced698c9321e3b4480415ac488130d4c9365 SHA512 a351a409f16dccdbc6a2054e39546f1827622801295b5dc3aa51bdc5822d04415c33a2a77695818d1c13ebd0518a88d0644542091de7a944ef77e07acde909ee
-EBUILD pytest-cov-2.7.1.ebuild 688 BLAKE2B 58a46df504dafc52b615707483b3280cb2bbef0beb6e002d010f1e76c01fb12e464c7e552514b4453e71a4f124927539f1650647aae9ccf892152b29666b20ae SHA512 82b263af3ef6f0c281c7de566a5f358745484c620f493e90407f6c8db400b78d1414924bd65c52ab66fd41f1dd546db31ff7ac6f76510b4ad3d76d81bd64e350
+EBUILD pytest-cov-2.10.1.ebuild 1388 BLAKE2B d1c977eba83f146c90105ed414fbcef59225e9a75b0c8aed8e5553d3d5400e21b3fd859e83f016834792acd0e18cb3ba2bbdec4066c5de20016c672fdbf091f7 SHA512 6f907d536310b1e6aafdb3389020dba5ee1e9f51893e869c6cd1006acea4c7b7ac19c18c72a2fc0ffe52d6a4a8252a414b576c510bfdec5e7ec7866d9723a223
 MISC metadata.xml 459 BLAKE2B 8a721ec24cc58fcaa3ada2a0a574dcc87f9337b3de4f90d833f71049e4c2e9f1761ee824d64e1f69c4302e42ea21459a69a98ee790db6cb2732324fd34b30558 SHA512 06ca6539cbd732bae4995c552cb8df225f26a13fdb0e9128d7726373be2eff9b72e915a1ed7a77a8b5773a3edf8d17e0104f745b96d61553c5361503709f4498
diff --git a/dev-python/pytest-cov/pytest-cov-2.10.0.ebuild b/dev-python/pytest-cov/pytest-cov-2.10.0.ebuild
deleted file mode 100644
index 2747df1b0..000000000
--- a/dev-python/pytest-cov/pytest-cov-2.10.0.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{6..9} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="py.test plugin for coverage reporting"
-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"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/py-1.4.22[${PYTHON_USEDEP}]
-	>=dev-python/pytest-3.6[${PYTHON_USEDEP}]
-	>=dev-python/coverage-4.4[${PYTHON_USEDEP}]
-"
-DEPEND="
-	test? (
-		dev-python/virtualenv[${PYTHON_USEDEP}]
-		dev-python/fields[${PYTHON_USEDEP}]
-		>=dev-python/process-tests-2.0.2[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=(
-	# Bug 597708
-	# "${FILESDIR}/${PN}-2.8.1-disable-broken-tests.patch"
-	"${FILESDIR}/${PN}-2.8.1-latest-setuptools.patch"
-	# https://github.com/pytest-dev/pytest-cov/issues/365
-	"${FILESDIR}/pytest-cov-2.8.1-python38.patch"
-)
-
-distutils_enable_sphinx docs \
-	dev-python/sphinx-py3doc-enhanced-theme
-
-python_test() {
-	distutils_install_for_testing
-	PYTHONPATH="${S}/tests:${BUILD_DIR}/lib:${PYTHONPATH}" \
-		PYTEST_PLUGINS=${PN/-/_} \
-		pytest -vv || die "Tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/pytest-cov/pytest-cov-2.10.1.ebuild b/dev-python/pytest-cov/pytest-cov-2.10.1.ebuild
index 2747df1b0..4cfd3e65d 100644
--- a/dev-python/pytest-cov/pytest-cov-2.10.1.ebuild
+++ b/dev-python/pytest-cov/pytest-cov-2.10.1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{6..9} pypy3 )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/pytest-cov/pytest-cov-2.6.1.ebuild b/dev-python/pytest-cov/pytest-cov-2.6.1.ebuild
deleted file mode 100644
index bd94dcbd3..000000000
--- a/dev-python/pytest-cov/pytest-cov-2.6.1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{5,6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Pytest plugin for measuring coverage."
-HOMEPAGE="https://github.com/pytest-dev/pytest-cov https://pypi.org/project/pytest-cov/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/pytest-cov/pytest-cov-2.7.1.ebuild b/dev-python/pytest-cov/pytest-cov-2.7.1.ebuild
deleted file mode 100644
index 53c7163e0..000000000
--- a/dev-python/pytest-cov/pytest-cov-2.7.1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit distutils-r1
-
-DESCRIPTION="Pytest plugin for measuring coverage."
-HOMEPAGE="https://github.com/pytest-dev/pytest-cov https://pypi.org/project/pytest-cov/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/python-blockchain-api/Manifest b/dev-python/python-blockchain-api/Manifest
index d650826d2..7f41c4771 100644
--- a/dev-python/python-blockchain-api/Manifest
+++ b/dev-python/python-blockchain-api/Manifest
@@ -1,5 +1,3 @@
-DIST python-blockchain-api-0.0.1.tar.gz 1894 BLAKE2B 6e6a5260bbfe11f58f152772bafaf2fb6cf17518a4a339c467a3945e2b8da9684f07d16f7723d2cdbce41891a10596b0c6783342877bf8151604f1ea17089411 SHA512 a73062a930403abb47e07b9b2c720eb8b7787199f520cfedb7fb1b85555d79a97aebd934c7c7287b3c4623d27200a5ace34dc87f03f10ef95f0ddb8207877310
 DIST python-blockchain-api-0.0.2.tar.gz 2153 BLAKE2B d3f0f82942bc0b27ddeb19a45704c2c52b902ea73a83abea0eae3bfae9b11efe6ae1d02a06bfc9a3afea0dac995f75ce305875efcbbcdb0e2a196e080b76db81 SHA512 3c9500a0d123c07448c6983af4b0f5a08420c17a887545dd629876fe93a015456f9f916491cc3b154ecd6e037f229de9b3409e780e89ff293201353b1fec251c
-EBUILD python-blockchain-api-0.0.1.ebuild 753 BLAKE2B bc355d8cdf9d94e1ab11a47ef368a46b4fe470faf804577c784f738287e8c2f034b34ca3c063bf9261fc0e1167de0d5be701b88030c291b05bc4145700964a6f SHA512 5fef38a7015dbff06930fc78c138bf8daf2680913a8bf94158b2a48fc60eb3ad932486fafc6465eae6d31f1322168544b39d8157ffd846160c1ec3f085aacbf5
-EBUILD python-blockchain-api-0.0.2.ebuild 762 BLAKE2B 0988c949973234c0ffb38c34079d2a28296c111ac65c72b9682cf945e7d0c2e00ea4f6cd3e5f2654adf16dc25749b9a3636b58e6248cf6e4a33222edff316572 SHA512 2377cc07059eb674d7f5b7d99fe177621405c1c350ac153bd6c84e9021417daba38228c75cadeb33a9aa75e222a35157d2b7fcf930ca893a54522fe500a518e0
+EBUILD python-blockchain-api-0.0.2.ebuild 761 BLAKE2B e04a6c9d4559ab3ab8e0e8c74eb7fcb52540baf05f01e7288b63a52929d097faf562042692b63fd2a252e614054311816d60b6975e625e89a8f6dba42ab36d2f SHA512 dd9f41b31a179e02745f700e8d774077b6a737ad1c414ce0e93877364fabcd52641250f1d88ceb31411e9aae6bb1b8b21b4f5370e521baa47a5973ef9320c767
 MISC metadata.xml 464 BLAKE2B ad6927bfbe4cd26cb91375a528a7253ce030581936cad34bb69dbbfe1b99b365848541c33de5e2b454a588c53715edb0e99bf466109f14f107065ba194c281e6 SHA512 5f6c8f36db72b1d6ed062a6365bf9036813dfbd8564ae3b61e38dc814f58ca20b39632c56f8dfc97bcfff345f1dd3932f63b6bb9411d30f847f02a8eeec6dc2c
diff --git a/dev-python/python-blockchain-api/python-blockchain-api-0.0.1.ebuild b/dev-python/python-blockchain-api/python-blockchain-api-0.0.1.ebuild
deleted file mode 100644
index 0241d019d..000000000
--- a/dev-python/python-blockchain-api/python-blockchain-api-0.0.1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python API for interacting with blockchain.info."
-HOMEPAGE="https://github.com/nkgilley/python-blockchain-api https://pypi.org/project/python-blockchain-api/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=">=dev-python/requests-2.0[${PYTHON_USEDEP}]"
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/python-blockchain-api/python-blockchain-api-0.0.2.ebuild b/dev-python/python-blockchain-api/python-blockchain-api-0.0.2.ebuild
index 2731a825a..d4b64ac60 100644
--- a/dev-python/python-blockchain-api/python-blockchain-api-0.0.2.ebuild
+++ b/dev-python/python-blockchain-api/python-blockchain-api-0.0.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/python-eq3bt/Manifest b/dev-python/python-eq3bt/Manifest
index 952e9cbbb..983eee3af 100644
--- a/dev-python/python-eq3bt/Manifest
+++ b/dev-python/python-eq3bt/Manifest
@@ -1,5 +1,3 @@
 DIST python-eq3bt-0.1.11.tar.gz 9498 BLAKE2B ac2f5fc52a4a2232905db4e00f6f078c253fb41870af0d4912a2b543d5da9286f77f1a41cd2b276e34045f97d29aeedacd7d2ddf2d5605b69cc091aaaa66f66d SHA512 0b10e12141c938026297c9b7bd039933ff06921b0ecd897d1de1aa6090ee7e985dc8aab9eeaddce24311d0fc07da5eed4ab615eb3c6eed7c32611fa59d9f2714
-DIST python-eq3bt-0.1.9.tar.gz 8315 BLAKE2B 2c332ac9921224bc5753b05c94fe5fe91bf028689e78b008e2dcd5d230b48d6465018b3f29ea28c093707a2184b77efa1d486921dfdc2e9cbc31f900d17e037b SHA512 a013bc461e0d261220961e8634f8a598a33d3fd8cc4a99d388404a76520a88cbf0655f61ed856ac1906aef646f2396e7c228f11963e91f87f647d7a2f73ac7fe
-EBUILD python-eq3bt-0.1.11.ebuild 698 BLAKE2B b2404cc90160ad027b610476237ebd34d0d2a2055b7c72fd7f6101f4b165734efa1bee3a87c97652d9c33f8a38421594f54acaadc9b5789b58ef365bdde92121 SHA512 bac6b0422902172d50caaa71f4ce0917a84fe1e723b88241992d138d198078f6141bbd0ff541678ab45bb65234661bd8e2836772e62cb4cf3d168f838a6b9e7b
-EBUILD python-eq3bt-0.1.9.ebuild 691 BLAKE2B 2513288ac0d72ff36927dddec24e763355b54bb32087f3b1ac547bfb8af0cb8742ede8db11fc195b94d2b15b10a54466e14340bd160032e00e911f110438f201 SHA512 e0e1bda85a9b8ccd9f9dad6dcc96a8bb79694ab71acfa35544e2ab19df228d561af64330e578e628dbfcf7ee7e44ad8b30a91c8c1563ddecffe2a13b5aefedf9
+EBUILD python-eq3bt-0.1.11.ebuild 697 BLAKE2B 4cb4a41b3b07913ea2d0165e3350253856ebf041048fc356e7d0feae389ff7cf83e198320b7daf5ddf14e637953bbcf2ea78b49271d92f20b72a428789f4e497 SHA512 f5c54bce842f7287438fb525a29d30de69bd5dfca8fb28b7e52c3877d28224f042c43dfc9cb98887e217391f4eeb0bfe1a91182edb427721cf9de1ddd8c1b8e6
 MISC metadata.xml 450 BLAKE2B 704a0898f95f27a3b5975f413abdd9681c768d1b12e90721e3a3116708a29521d27d50b6bb6acaae553011b4325875b0b5c05d83f2dc2ef2df05b17beb105005 SHA512 e7a0f0bbb3bf89dd8026602a067ef675077c03f4cc19c11b464e45391f209a89b2cfa5c74342496edc01449e4e985c96513d60b68397335ff6414790c9a2befa
diff --git a/dev-python/python-eq3bt/python-eq3bt-0.1.11.ebuild b/dev-python/python-eq3bt/python-eq3bt-0.1.11.ebuild
index 235514728..d5d8a31cd 100644
--- a/dev-python/python-eq3bt/python-eq3bt-0.1.11.ebuild
+++ b/dev-python/python-eq3bt/python-eq3bt-0.1.11.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/python-eq3bt/python-eq3bt-0.1.9.ebuild b/dev-python/python-eq3bt/python-eq3bt-0.1.9.ebuild
deleted file mode 100644
index de2826f56..000000000
--- a/dev-python/python-eq3bt/python-eq3bt-0.1.9.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{5,6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="EQ3 bluetooth thermostat support library"
-HOMEPAGE="https://github.com/rytilahti/python-eq3bt.git https://pypi.org/project/python-eq3bt/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/python-gitlab/Manifest b/dev-python/python-gitlab/Manifest
index 95ccd1ee7..aaddf99b7 100644
--- a/dev-python/python-gitlab/Manifest
+++ b/dev-python/python-gitlab/Manifest
@@ -1,5 +1,5 @@
 DIST python-gitlab-1.13.0.tar.gz 121434 BLAKE2B f8a9af4f389b4759891e26de305c48a70b4255667d4bda869e4e9738f37a1d9a99777a3aa3d1617df343e6b10fe58ad42d2f1d309da931c92690233347a21f2d SHA512 483133d6bc3244c28a2cfa7382262692ed5eef5be5217c5f9786883667d777bac7f952946c50cb8ca6bbe07f63691ec19be4fbfeb7d9cd733fb049a0c3378721
 DIST python-gitlab-1.6.0.tar.gz 110201 BLAKE2B 7df304e82e463404ae59f49b9056ae4f29f0cb05cd8ce411c675c735c05aaac8c3ccb6fb8648f32c7f8097c9834906b409cbb533968a458953632ee74d2679fb SHA512 b567845ccb3f7e759ec1718398b9f224da089c2033e346cda47ac4dc0b63e6302c48ee38e2b06b0df1976be483746f63d7d2375381f03f219cf4479a40baa9d1
-EBUILD python-gitlab-1.13.0.ebuild 766 BLAKE2B cce5011ddeb85069f9e578a3777eec713ae8c51c0d773d77c019cc6eebe44a5c89f6d607ecdb69826aff2009ef34112f7fa011e44c1ea5d52f13c62aac8fd6b8 SHA512 b41de5577dd467c2399c775ed48f611a2854487ebc1abb3286bc8b6bd3f0f8e87b621d55347289184f8d2bc07d13dc98953ea7f6d24af7fec3acf18f04c7f2f5
-EBUILD python-gitlab-1.6.0.ebuild 757 BLAKE2B 5f0d8ff1f1c22a71aee3121f640771b5fc60389a2f5c275da1df3bc32592797357430687613c5b1bff3ab8fc2b1eb5df7e745f9f07c58c73e64090dfd1dc90a4 SHA512 6009542e4c096925596d3ad4b2f6f2e8df564c05610158a55cc2215ecb58610013e0fba23ac18e078199660a0d0eb597340ca7d98bf36f88e43dd9f4c9e18bc2
+EBUILD python-gitlab-1.13.0.ebuild 765 BLAKE2B 1a3583adacd4dc2b339e34c137784300fe70430ea6031f1de6acc1fb47f2e3bca550feb6595552b13ffa87920eea60c16e04a1ddaab70bd7454fbeb8674d14ae SHA512 62b10789683dbd537ebd3a760b5b6d2c67ec420b544a17ca47b3db85f644d8075f00acdda20f68a0126f1e1111496dca0bcdbf374e6c02ff3f470c010eecc707
+EBUILD python-gitlab-1.6.0.ebuild 758 BLAKE2B 98d37a4ab216d7f7077ee384d97ba711e504e571e02a496c4b6d3ca0d9def496210a31659ca8360fea6028740980e18ca8f94e636f518483dd31331dc62137b9 SHA512 ebbe320a328a93fddb64e12ea0001659f35ae109ba55e1e5e11ca3842284a42cdf3d5f9471c844dd480d0b4f72d0da45658c051ccffe62735dc88b415482bd41
 MISC metadata.xml 462 BLAKE2B a93cceccc7ba5384abc0aaf83a1777cd5fca6dc08b006e57140fcd2909f455251f4a31978c635d6a828e07bdd1b4ca15f955b590bbc7ccc0fa2064dd409c2850 SHA512 834afb6702ebf441de6e3b34e9a8dbcabd6bee7f8b6ac5e0633f41062600a87970697ab9dce8f08421323c4202587cf5c1660a6c5c28a5a2743825f54733f17b
diff --git a/dev-python/python-gitlab/python-gitlab-1.13.0.ebuild b/dev-python/python-gitlab/python-gitlab-1.13.0.ebuild
index 8ea9feee4..f9140111b 100644
--- a/dev-python/python-gitlab/python-gitlab-1.13.0.ebuild
+++ b/dev-python/python-gitlab/python-gitlab-1.13.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/python-gitlab/python-gitlab-1.6.0.ebuild b/dev-python/python-gitlab/python-gitlab-1.6.0.ebuild
index 4a48508e7..173099247 100644
--- a/dev-python/python-gitlab/python-gitlab-1.6.0.ebuild
+++ b/dev-python/python-gitlab/python-gitlab-1.6.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/python-hpilo/Manifest b/dev-python/python-hpilo/Manifest
index 70b02ca22..c3083d6b2 100644
--- a/dev-python/python-hpilo/Manifest
+++ b/dev-python/python-hpilo/Manifest
@@ -1,5 +1,3 @@
-DIST python-hpilo-3.9.tar.gz 132127 BLAKE2B 97c06d7c7bbdb894fcac35c6289db6a2c338ffd33e7fc7d265788cc6ede99506066cc8b69abec3c03d99fbbde64ff55039fca3766e975e5b7ee5518fbfc71f0b SHA512 0d84aadb0a14e454040b75dfc3f5e84fdd112f7fab86e748acd0035db1f1fe1f4f6ffe8030154857964cf6968f23f9935c9d1ae2f9f03da1a130569199f4d6af
 DIST python-hpilo-4.3.tar.gz 139977 BLAKE2B c4594955de314b47267b60b3f37a1d8c5f5344a47ace137099fe2e6f366d81119086b8d63dc77fef028fe3468d49eb14ad6f701d337548692503988645abb0e3 SHA512 1dd89c032eb19c96075b8ea96c8a7efbed968e555547316131e933eccd73109f93ef95f51b4e5fb9a9eba18e0db2f2e7393ea25338906574512dca85c1293a53
-EBUILD python-hpilo-3.9.ebuild 697 BLAKE2B be21e8545889459aa4ee903d7cbbf46350326238f9e7f0b3067c63daf13509c444463c576f2b45c4a2be448a72c9609b780648e8543adfc16682d8a34d0a8168 SHA512 d10329e0dcb68807d64cec81097a3b3aaaf675a1d4fe31aa20e8737d6fd53d81ab3eef3b7199026961471156675d3f8a030ae8571b671675e0e7f8ad33972ed6
-EBUILD python-hpilo-4.3.ebuild 704 BLAKE2B 9ed54d7005175e869c84d2dec96181b62431b86aa89e02bd363b7b74f24a30c894d42de23f225d24da27e30d7ae09ff5f92c871191279f8b0dabdb1977fc8c90 SHA512 731c20147f27e342eb05ba28076bf70fab13ed94aaaa876ac05fb210e5bb3dd3ff9389561de25ba0a2a4f4853ad9aac1f8bcd05f32eda9e9cca83ed4fb32a2f5
+EBUILD python-hpilo-4.3.ebuild 703 BLAKE2B e8388904e52994893ef7adab348d831b7fbedafacb24e5ae6b8f6801e22374e5f7a471b37d297224f702e40a9f1a474d15aa95f28b811a8acefbc246fef5e575 SHA512 f4d703dbb2342a7b614240bb2c0fd965008a9e4a28b2fe290ae7eefe4f47302d43928234cbd457d5b2908043d97cea299b17f7b8b3dbe08e165e55fa2c2e6d44
 MISC metadata.xml 465 BLAKE2B c1ead7922c8f02b6351cde20a4fbf394a7fe1e1ca0f295e81d45044aa0136599357e10ce0030c7a25e6b3826a4102296ff6d514c16bdaa2e0f13639ed83872be SHA512 5ba87dbd1e481f0b0ccf51a5b74ed44cae48d555ff77f53ff2f3669777f1e5afa89bb835fcc03746d845f00f610b04825dacd7e8be259b170a50d705b1dac7a0
diff --git a/dev-python/python-hpilo/python-hpilo-3.9.ebuild b/dev-python/python-hpilo/python-hpilo-3.9.ebuild
deleted file mode 100644
index 47bfdbb55..000000000
--- a/dev-python/python-hpilo/python-hpilo-3.9.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{5,6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Accessing the HP iLO XML interface from python"
-HOMEPAGE="https://github.com/seveas/python-hpilo https://pypi.org/project/python-hpilo/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/python-hpilo/python-hpilo-4.3.ebuild b/dev-python/python-hpilo/python-hpilo-4.3.ebuild
index 63c2fd1f5..ce3625ff9 100644
--- a/dev-python/python-hpilo/python-hpilo-4.3.ebuild
+++ b/dev-python/python-hpilo/python-hpilo-4.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/python-juicenet/Manifest b/dev-python/python-juicenet/Manifest
index b9d987d2e..ee837d8f5 100644
--- a/dev-python/python-juicenet/Manifest
+++ b/dev-python/python-juicenet/Manifest
@@ -1,7 +1,3 @@
-DIST python-juicenet-0.1.5.tar.gz 2205 BLAKE2B f65630715d01b2ea5dbd5c1f2f7dc9b23362b3e8e7c185f89aa02c3bd3a8a532e027007ec33959aebea6854ed9dd454c7a2481648fd2aa67506dd5f001c28392 SHA512 476b46e9c3b8bbfda5398bb8ef273cc55b4483edf7b04f16b49e519f63cf9522907cbfc295d25cfd4a7f4ca64534e3e5e52fde0236e9919de133ec7c3dd60ccb
-DIST python-juicenet-0.1.6.tar.gz 2239 BLAKE2B 6e6032d5763db346dab504cfe1e48303b13b57b57256a1912bf1709745d5bee20733cf00a4fe7a62c9fe7f961a9127bb3e0393b97bed1290637e721abf79f744 SHA512 4d51b39b8980dae978ec86ab32ecb66fe7c41c404477216b7347beb3d3220819777ce90c4c830d30a05acabf8416bc433b22f2494c6a10708e1633e57d81dbe7
 DIST python-juicenet-1.0.1.tar.gz 2668 BLAKE2B 37a8cf61ad6e74ecac371085fee659eff1043f5488b3a4905d66bc6212a20971a63cc8c656b56b6dadf36280de27be506bd9fc92b11e7d7b17121aa0cd2d57cc SHA512 ea875d09f6c31d2fa99b0c67ee52bec43ff61f58dd083d988d05670e8d8e2935e7339eb72a64581d3beeee62f3c23774961e82a3ac9c8971969eeab6b3dc0932
-EBUILD python-juicenet-0.1.5.ebuild 759 BLAKE2B 241687b802bb291bc6ba8ef3347bb87934bfdfa5d9677e4b94bcb73408b5bd29936de02ccd759d18c68dbeb0f935646a7883fcbe462eee7d2377cf6114c2a49d SHA512 e11c8573740368807ff1d4101008d206cd0ddc84a6a2dfd0442e92dbfc280b69221bf37301ee20628f1e1da7f74d7881e62fb06c031413510ae2ea0a57775da5
-EBUILD python-juicenet-0.1.6.ebuild 768 BLAKE2B 60841d71c74260897e23d4132e836cc5be4aa383a5dc4e34d3a89dca6427aa766d597702380506c812246b232bb7f12e7be37ec39f486d8658114a0750a08867 SHA512 9242395ffd30e8af4d34b88ed9e9d353138f06786ba49a171c2b42b075364ad23ec35502f182416eb1ffa32e59bc52b90f201a2d19e8f9aa0b7720cd26834547
-EBUILD python-juicenet-1.0.1.ebuild 768 BLAKE2B 60841d71c74260897e23d4132e836cc5be4aa383a5dc4e34d3a89dca6427aa766d597702380506c812246b232bb7f12e7be37ec39f486d8658114a0750a08867 SHA512 9242395ffd30e8af4d34b88ed9e9d353138f06786ba49a171c2b42b075364ad23ec35502f182416eb1ffa32e59bc52b90f201a2d19e8f9aa0b7720cd26834547
+EBUILD python-juicenet-1.0.1.ebuild 767 BLAKE2B 92fa89de0120ba1b65d2c1d9acac49270d93c3c1869c352fed5dddd3e064d4b705fe4ec7246a5046e2a8bc9ca606e439b35872ccbb3f471f02620397eb46ff44 SHA512 09ee087cd82ed2420d83ceae69a80ad469553ab637325dc808d4814a659ad2d331e7751bb81d6b0784f56432b6349c8e4562212a315dc55c7d5b1a362c04fddc
 MISC metadata.xml 334 BLAKE2B 9dea2d83a523cdb4e6374018494b63b09b0dfa612f588f558c51320a9379ee2464af4ddaf6a933db87c2735f9aef0dda81efcc0be0382204f2cd121317473c01 SHA512 9f034a2e668a8c7ca7a3d525bc8c27903bf917d18fa4a2939e8e3c26e8c0d1d0acf4c6593b915254550a92c6b3fd7239b8f4df5d1f77ac2e54d6437d9f91ef61
diff --git a/dev-python/python-juicenet/python-juicenet-0.1.5.ebuild b/dev-python/python-juicenet/python-juicenet-0.1.5.ebuild
deleted file mode 100644
index c1aee9024..000000000
--- a/dev-python/python-juicenet/python-juicenet-0.1.5.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Read and control Juicenet/Juicepoint/Juicebox based EVSE devices"
-HOMEPAGE="https://github.com/jesserockz/python-juicenet https://pypi.org/project/python-juicenet/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=">=dev-python/requests-2.0[${PYTHON_USEDEP}]"
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/python-juicenet/python-juicenet-0.1.6.ebuild b/dev-python/python-juicenet/python-juicenet-0.1.6.ebuild
deleted file mode 100644
index b6215f61f..000000000
--- a/dev-python/python-juicenet/python-juicenet-0.1.6.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit distutils-r1
-
-DESCRIPTION="Read and control Juicenet/Juicepoint/Juicebox based EVSE devices"
-HOMEPAGE="https://github.com/jesserockz/python-juicenet https://pypi.org/project/python-juicenet/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=">=dev-python/requests-2.0[${PYTHON_USEDEP}]"
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/python-juicenet/python-juicenet-1.0.1.ebuild b/dev-python/python-juicenet/python-juicenet-1.0.1.ebuild
index b6215f61f..41f6b4056 100644
--- a/dev-python/python-juicenet/python-juicenet-1.0.1.ebuild
+++ b/dev-python/python-juicenet/python-juicenet-1.0.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/python-qbittorrent/Manifest b/dev-python/python-qbittorrent/Manifest
index 7a3a12558..4f3dca1ec 100644
--- a/dev-python/python-qbittorrent/Manifest
+++ b/dev-python/python-qbittorrent/Manifest
@@ -1,7 +1,3 @@
-DIST python-qbittorrent-0.3.1.tar.gz 8166 BLAKE2B ed3e012c3e4fbe68a75b2ccd30e3ba2861ebef5b852ccee0a2b6893776012d31047313f29cce4e8b96f4301407b58478dc267431f4373c5367014f11da1e067c SHA512 3a4e790150be4ba54385c002ab7b1c4d4c70d0196b18986a9ab0e7a4918a5ff061454b2dcb72265ca56cc3b83f432f886179e7e6afe39fba1dab0dc843e6362e
-DIST python-qbittorrent-0.4.1.tar.gz 9377 BLAKE2B 71e5576c2a2288e6f324c6b76cce0bab81c0c54d2972b8882f45df905c9418188ce004dce18d0a719b704275ca2b0bfeb104ec8a723a22fecd7c5a57a21207d0 SHA512 fbcc564477846a8111846f664d612e44aa6744aa8946a5b8ce1a8dffa02e685d914314489bcde6e0fffd29654090b42c7c214cae59127c10b504e4a49b882535
 DIST python-qbittorrent-0.4.2.tar.gz 9535 BLAKE2B 3f570745cf01d82ffb68a5a11c32ffdad1feb971411e8f096f910261aad47262e49bb4bb712a0db747ba27e2312cddd563de3df0c7ae312098bc007c934057e7 SHA512 aa841f9ab376e1bed28836e7dd4eea291f856389b2f90f348dac8909d96b1e6257f7c55736fec3e94e5ee2fb487fa21d843e447c3b62b83ea6e8f40e80396d85
-EBUILD python-qbittorrent-0.3.1.ebuild 727 BLAKE2B ad896883eac93dda1fbba0cbd413a42ab591ab3524b42d8f67194cbde68df3593980d218d7b164cb651f74582db300edcc088315125f37ea82fa12ebed8d94cb SHA512 013c913d1821576f6b8e0cf845f183afb83f36a7852c105274ad5f130a2a16fb64cae9ebfabacf9c898343e1c33dc0ac638811c64daf6ea90780c3a5ea341e2a
-EBUILD python-qbittorrent-0.4.1.ebuild 736 BLAKE2B 17e5d67adbb0aa7932947bc6afbc641d8c92186624f5b04561a355d8f9a82003b69f87827de6b321395c162cd27c46c17cb2eb6769fa9af4a1daecbd586334bc SHA512 d6aaec7ae6e4dccef7b92c909a172f961889c16cd9ec693552da938e1b3b45d5e061273628fd5ceee086d4ea4a752e1a8e474c5c261d85a279bc22d86235526c
-EBUILD python-qbittorrent-0.4.2.ebuild 744 BLAKE2B 00b50f60eb78c2195c3a77d20e2dfb126792d94fe8e2d6454d0eea85d80f9227fdf0e3aedd246332e88b6a71a5028e474acc5c0998423432bfd2085eade01310 SHA512 3f03e21512fbc839d17da92682d8b373f83b01e44dbd687c5fe84792b43c88cd4942704ac75c3fdb3b962dc3ed8ef8fdc54b6d3dcece2934776b5dc3a9c792d5
+EBUILD python-qbittorrent-0.4.2.ebuild 744 BLAKE2B 2eb4237a5af9492d65916bb551165c90d4c5f4abf4f7cc316c0e1bfdb5e1eaf5fe1edfcbeef3aea4c243c99b7f31cbced5fc64af68c97fb6b9c5fd9066dc4c1f SHA512 8fe0c159664d8590a0a5cce4d5f8b3668b25806911ab7bb3bf03b247379d4e9e59e7455d202741ea87ef9c60aebd918e0e4ebd9241df579bb99efbc34645371a
 MISC metadata.xml 458 BLAKE2B 87df55e9bef07bd988584dcf2d753b6534d4900fb432d8d9e414cc0e10cc9351c17214a10968f9ac8d508c0a0f654fba71d8986d82769b6befd7f7d53b1331e6 SHA512 9464c14dc95f13311dce9804ac73dcb3d8f1c8c0bbb4a74d76d8edaef0c3fb0823448fd226444e50e218b09a28968a35c71d98c2c68db752a94e27d203a303bf
diff --git a/dev-python/python-qbittorrent/python-qbittorrent-0.3.1.ebuild b/dev-python/python-qbittorrent/python-qbittorrent-0.3.1.ebuild
deleted file mode 100644
index a0ef632a5..000000000
--- a/dev-python/python-qbittorrent/python-qbittorrent-0.3.1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python wrapper for qBittorrent >3.1.x"
-HOMEPAGE="https://github.com/v1k45/python-qbittorrent https://pypi.org/project/python-qbittorrent/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND="dev-python/requests[${PYTHON_USEDEP}]"
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/python-qbittorrent/python-qbittorrent-0.4.1.ebuild b/dev-python/python-qbittorrent/python-qbittorrent-0.4.1.ebuild
deleted file mode 100644
index c751fa217..000000000
--- a/dev-python/python-qbittorrent/python-qbittorrent-0.4.1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python wrapper for qBittorrent >3.1.x"
-HOMEPAGE="https://github.com/v1k45/python-qbittorrent https://pypi.org/project/python-qbittorrent/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND="dev-python/requests[${PYTHON_USEDEP}]"
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/python-qbittorrent/python-qbittorrent-0.4.2.ebuild b/dev-python/python-qbittorrent/python-qbittorrent-0.4.2.ebuild
index 5bb4521f7..ad478c1d5 100644
--- a/dev-python/python-qbittorrent/python-qbittorrent-0.4.2.ebuild
+++ b/dev-python/python-qbittorrent/python-qbittorrent-0.4.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{6..9} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/python-slugify/Manifest b/dev-python/python-slugify/Manifest
index e2ead201e..30f681c1c 100644
--- a/dev-python/python-slugify/Manifest
+++ b/dev-python/python-slugify/Manifest
@@ -1,11 +1,5 @@
-DIST python-slugify-3.0.3.tar.gz 8126 BLAKE2B 92de66ca4cab07eae82e95aaee9e03e07947082f96a420e9ff124a9994ba7c6bfe5abfd3ed047963214c62426b0bcce7f062ca279a75f3d67e7c0f918dc94e63 SHA512 65e2373c33b6b23b25d4d3b66cae3c68e9cc133dd6e26155151647bc2e1df5bbba7dfb187eafe5fa9ffb488b2b6f3415e7a5f95d2460dc3f551383d509d740fb
-DIST python-slugify-3.0.4.tar.gz 8110 BLAKE2B 77e56f51fa9268ab145033c9ea3dfda2076668311fa548cb572182907772795b75c880bfb5b0fcb21dbfdb120c1a748a2bafd06a88cf1f0d1524636053b649e5 SHA512 59cadfe24a9794577c4c9b7fd30ab56e129af47a8b56867bfea5c9b186f368eb3bd0b47b941c61f403af5e274654c8ee3722916b71ba5d34ed30e203ad335d12
-DIST python-slugify-3.0.6.tar.gz 8733 BLAKE2B 04dcf1da9e4a532aa260286345649f82cd580c305d86c976df9a764984833aedd90fcccffc738bd13c9f23144ab87fb04b91dd1274ea9b09cc3c2e8e269e0c4d SHA512 f62e67f18753848155f2ddfa05e1bb869a8c28fb27fd5963fc7a67393237fe8f84ffdc447611a3e99a61c722952410ad46c10b2a70b7fe9d52c8f814cc12723e
 DIST python-slugify-4.0.0.tar.gz 9391 BLAKE2B 386e0186f9300bd00098ee534c5c5521b04b087e17a2530501291c17884c5ceb4895aa357dc0d4b573ba39aeaf4a69f60e2c110b3efede0e066f70ed9992f5f7 SHA512 a4b0da48ee887a24a022076c9b21fa5795ab104b1d382bae96fc7ba5ce6c09c0cc42e1f4c3b6874b44097d2246ea5b18302dc42386d8844fa41f495744e5ed90
 DIST python-slugify-4.0.1.tar.gz 11509 BLAKE2B b505c62c959dae3823db4441b8811ed98ec8afa0278325cb2715abb63a84b5de1506362699bc39216bbac4100ae265671f940dbbbdaf9164fd251bdaa7af462a SHA512 c1d99a9dc891c4cfa927e4d2bc5701f47b23b7882cce22350283a53c6ded18e1290196c3bb9838883c29c9cb3582e5e684edffd50dfbb4e9da9c2b821ea54bb5
-EBUILD python-slugify-3.0.3.ebuild 792 BLAKE2B ecd952f8488db588665968296f1b83796752ec88bf4264e7660401758030c92a879eecb9b08dd82919d7117ca6b88cde2574cc3bce0604798eb4c3539aa907f7 SHA512 5891bcf07839805f37a854917c71ffc519ce9eed77b3f8a8e645bd0bb1cb01e796b0a0184413dabd225a45ff4763964262a1724c6b2653e03863ca96840260d4
-EBUILD python-slugify-3.0.4.ebuild 792 BLAKE2B 7f73d95b8198d3b1e171f913b2a29eeb8d55369a218792e6bb01be7f9e149b300808f8010d49e0531759590b7d831e203856ab1aa8d400fdd0cf64e06cbe8f19 SHA512 1f8cc48c229a2aebac48b830206837000074e33a905f0907e2cd5730eedce577ad09deab95d5aaad12b9efaa24877e3b4ac4ad34cd872281fcea26140d04b15f
-EBUILD python-slugify-3.0.6.ebuild 792 BLAKE2B 7f73d95b8198d3b1e171f913b2a29eeb8d55369a218792e6bb01be7f9e149b300808f8010d49e0531759590b7d831e203856ab1aa8d400fdd0cf64e06cbe8f19 SHA512 1f8cc48c229a2aebac48b830206837000074e33a905f0907e2cd5730eedce577ad09deab95d5aaad12b9efaa24877e3b4ac4ad34cd872281fcea26140d04b15f
-EBUILD python-slugify-4.0.0.ebuild 796 BLAKE2B f45392fb90161920d83fe5c7b58b8776c9ccdd7d84a49f1876b0c83ab276c4e37baaa01101c0bf650cd749e314846cc326d3bbed2840049f9f9b8d64531f4fae SHA512 52f714ff91d50d7099a459815414cf544eda13d605c613cb9b52474beb677519ad9dd77a59abb266a2b9bbe20da8b623be9f72aef7620fb93759f27728202c53
-EBUILD python-slugify-4.0.1.ebuild 795 BLAKE2B b3e0ee28ba48bf448cf54830250c561d7be8aeeb3e5a342077a0deaec33acca2195e87928f5b53607ddc3a77a66f58b277d2993da41856168d9f0f19dfd14aa6 SHA512 429b92ec6d471852165184eed244e1132019622c1045e3b2ce0e72b6ff55ae2e4fedafdf454be2297694808406fefb8b42d066a92c987de98ff5334566cc0c23
+EBUILD python-slugify-4.0.0.ebuild 795 BLAKE2B 1d3b76c9284383f910301e441b09dc277a3b3980106d722d0ee59bc35297ba69543f33b08ad19efd7e5c568115b4103d5ef3c47d30189bf13ed63f74fcde1fc8 SHA512 37351d89101355f15ad8e220b1d6221de14372cd0159d3cc5883718b96074ffa7171266a95273f0ccb42816219a977178fca0e510a4d8d672e411d971d6c5e83
+EBUILD python-slugify-4.0.1.ebuild 794 BLAKE2B dbdea0633099e8188fa36000c5e2bf5afa5eaea74604a02140e88eeb57d0e20216d7e3464b84a9c3f786388aef4701a1d668d2078ad67938a82504913275427f SHA512 262cbf9aed49354851598e255a8324c2f6daf3ee0113966855dabdeb3279f3cbc9b57df6809480e3a2b662614a39e89d8bda21d3148a1283970ff0cb7b989dcf
 MISC metadata.xml 252 BLAKE2B 507e0ddc9d50b879ff374b903b142f85d020dfd6c486aba2af84fe082c878e780edbb79188ae10104d57db0eb775c86814cc8c06891a3854c9da840a4d377050 SHA512 9470ac9c8a5a4f80e3f767e7aa198addc7b21866c63b2a310e9f41ce65817672fb77423117bdd619e99cb62322025aeadf50717e23eafabf99080fcc106820af
diff --git a/dev-python/python-slugify/python-slugify-3.0.3.ebuild b/dev-python/python-slugify/python-slugify-3.0.3.ebuild
deleted file mode 100644
index 7ca25bb0e..000000000
--- a/dev-python/python-slugify/python-slugify-3.0.3.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="A Python Slugify application that handles Unicode"
-HOMEPAGE="https://github.com/un33k/python-slugify https://pypi.org/project/python-slugify/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=">=dev-python/unidecode-0.04.16[${PYTHON_USEDEP}]
-		 ~dev-python/text-unidecode-1.2[${PYTHON_USEDEP}]"
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/python-slugify/python-slugify-3.0.4.ebuild b/dev-python/python-slugify/python-slugify-3.0.4.ebuild
deleted file mode 100644
index bde01ec47..000000000
--- a/dev-python/python-slugify/python-slugify-3.0.4.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="A Python Slugify application that handles Unicode"
-HOMEPAGE="https://github.com/un33k/python-slugify https://pypi.org/project/python-slugify/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=">=dev-python/unidecode-0.04.16[${PYTHON_USEDEP}]
-		 ~dev-python/text-unidecode-1.3[${PYTHON_USEDEP}]"
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/python-slugify/python-slugify-3.0.6.ebuild b/dev-python/python-slugify/python-slugify-3.0.6.ebuild
deleted file mode 100644
index bde01ec47..000000000
--- a/dev-python/python-slugify/python-slugify-3.0.6.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="A Python Slugify application that handles Unicode"
-HOMEPAGE="https://github.com/un33k/python-slugify https://pypi.org/project/python-slugify/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=">=dev-python/unidecode-0.04.16[${PYTHON_USEDEP}]
-		 ~dev-python/text-unidecode-1.3[${PYTHON_USEDEP}]"
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/python-slugify/python-slugify-4.0.0.ebuild b/dev-python/python-slugify/python-slugify-4.0.0.ebuild
index 4028908d6..add64500c 100644
--- a/dev-python/python-slugify/python-slugify-4.0.0.ebuild
+++ b/dev-python/python-slugify/python-slugify-4.0.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/python-slugify/python-slugify-4.0.1.ebuild b/dev-python/python-slugify/python-slugify-4.0.1.ebuild
index 4e413a1aa..267b68edf 100644
--- a/dev-python/python-slugify/python-slugify-4.0.1.ebuild
+++ b/dev-python/python-slugify/python-slugify-4.0.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/python-songpal/Manifest b/dev-python/python-songpal/Manifest
index 074bdf47a..1a4d04e88 100644
--- a/dev-python/python-songpal/Manifest
+++ b/dev-python/python-songpal/Manifest
@@ -1,7 +1,3 @@
-DIST python-songpal-0.11.1.tar.gz 25698 BLAKE2B f2d57e26ede952608bab9c366827f25eb369ff5b6f878f022577f63864859d1b9366c99ffa90fea09968603414c168f2286fbf094711afec32b4f07d534d2987 SHA512 eb966a5e218fb38dc5817e1bc5c53e0954c5079e7c10a7c3cb6c67657621cad2528a7df454ecffaac3beed6e402568f9d2ba2a0ea180de9ea6d7f5c75fa17515
-DIST python-songpal-0.11.2.tar.gz 25745 BLAKE2B 5913c717a74af0d5aa0952337eae1d63535a2d803d2c2e5ac09da1fcde8989a9d4b5a945ce7c5c67cdd096ad61394c131da38667d8e6cfba3f2e01227d770825 SHA512 f98759b72a6f52974934994297d755423680aec803688cb6957d2dd9722e3f593a77a355285b2d00948b71b9433eb9002f7b6938620c905108559574af92ab95
 DIST python-songpal-0.12.tar.gz 41237 BLAKE2B 2940b0bbf8b136827048b5b0f1bf79e150144de36447f020f1f416de60fc6a17070fe3ec8ec8016bce0adff1eb5e018128cb8e1b23d595f744b74f95ebf7be52 SHA512 0bef348d76ab509f429071aacce6fdf5b1d905ccefce448a3ab0205b02d79ef57a4f367757b79ffb19ff91a8d9f65ffd35c8caca8407392650c1125648ea12e8
-EBUILD python-songpal-0.11.1.ebuild 711 BLAKE2B 64a4cb825620f647b8b2ac8a8ae8db3004f0e22137496f116c0ccb307cc95c13cfbcef929626701caae4739a63db3b62ec785e78cda2ae0a7e2607e08139d7b5 SHA512 430d38feb10750293be56c4129055a06e22e84b574d7c47870d44cbac86c47d461ca92490c65fb03aacd44820fdc272edfa592a51c2a3162a95b4d53d7f71a60
-EBUILD python-songpal-0.11.2.ebuild 880 BLAKE2B cc2bcd4f8efc48f7def4ee34a1c6abe2fd18d3507f7f7f8ec2d1c3b80bf82db72bd699bd4d4bcfce6f12aacff196f716b5e069624bc7e5bc1f5a77c254c18d71 SHA512 4729245a5cf5991e526419587baf4ef179e61702f3340a1b9cc39c139eac7dd560eb6800b20fd0bc3844c75cdbf8cf240df65123e773abeaa11af605df5d29b4
-EBUILD python-songpal-0.12.ebuild 880 BLAKE2B cc2bcd4f8efc48f7def4ee34a1c6abe2fd18d3507f7f7f8ec2d1c3b80bf82db72bd699bd4d4bcfce6f12aacff196f716b5e069624bc7e5bc1f5a77c254c18d71 SHA512 4729245a5cf5991e526419587baf4ef179e61702f3340a1b9cc39c139eac7dd560eb6800b20fd0bc3844c75cdbf8cf240df65123e773abeaa11af605df5d29b4
+EBUILD python-songpal-0.12.ebuild 879 BLAKE2B d584328f53044ccc5bafffe62daea32613fc058851c4c64adf4eb07461c6086840a5523875ec6770980fad639450a9e2c473f0a59416108c8a3b18a599f24a97 SHA512 b55ed9167220a14da6ade15c75919f7c2385fa075f7cba816afdb8da4c2c975554e4e7cdfc4ba36958d1480aa0f60ea96f790820f36a17bcc115479354362142
 MISC metadata.xml 452 BLAKE2B 88f2474981aca5c6a401fb5ede01e784020654f1298cdc3b856926515dbc4fc21643bd0a955d4ef94732e3cd581e3d278b0016ca84fdbf5a17cbb2c7751e61e5 SHA512 c174c2cd66b072d81f8e5f7594fadd49c2b0c969de89d0920647b57e5aa1f8d27b0dc130eb84551af35971dd6bcdd95147319fd0972d48a2500e9f6b1e0ed5ec
diff --git a/dev-python/python-songpal/python-songpal-0.11.1.ebuild b/dev-python/python-songpal/python-songpal-0.11.1.ebuild
deleted file mode 100644
index 2aa1572ad..000000000
--- a/dev-python/python-songpal/python-songpal-0.11.1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{5,6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python library for interfacing with Sony's Songpal devices"
-HOMEPAGE="https://github.com/rytilahti/python-songpal https://pypi.org/project/python-songpal/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/python-songpal/python-songpal-0.11.2.ebuild b/dev-python/python-songpal/python-songpal-0.11.2.ebuild
deleted file mode 100644
index e9fa764d5..000000000
--- a/dev-python/python-songpal/python-songpal-0.11.2.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python library for interfacing with Sony's Songpal devices"
-HOMEPAGE="https://github.com/rytilahti/python-songpal https://pypi.org/project/python-songpal/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND="dev-python/aiohttp[${PYTHON_USEDEP}]
-	>=dev-python/click-7.0[${PYTHON_USEDEP}]
-	dev-python/attrs[${PYTHON_USEDEP}]
-	dev-python/async-upnp-client[${PYTHON_USEDEP}]"
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/python-songpal/python-songpal-0.12.ebuild b/dev-python/python-songpal/python-songpal-0.12.ebuild
index e9fa764d5..8a33491bd 100644
--- a/dev-python/python-songpal/python-songpal-0.12.ebuild
+++ b/dev-python/python-songpal/python-songpal-0.12.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/python-vlc/Manifest b/dev-python/python-vlc/Manifest
index dbc5d925a..2d229107a 100644
--- a/dev-python/python-vlc/Manifest
+++ b/dev-python/python-vlc/Manifest
@@ -1,5 +1,5 @@
 DIST python-vlc-1.1.2.tar.gz 201191 BLAKE2B 9676503479fb68564a627ffb7a019e07eb8ed512467d68d19942b44fd61e3d77104942e857004b0e3265fa3e66695ac8955af2679265f3a94bcd099971d18b6e SHA512 bcddaa39e7ec3eaa649209ca34c14c06f5613c2205fdf9df4752553458913b373e5f74db01a53500ba30ec95520dc6df54752d1ef2d64b4aa42844eca56bb8d6
 DIST python-vlc-3.0.7110.tar.gz 224455 BLAKE2B b550cae3d3975e71610ca91b92d16278032da9a90efb8b753da80823028b67cd674613f682b565b830b098940fbd8cd91420cb56494dd46aaf9fe3037374d11b SHA512 c02fa5e66ce17520228a1f2058c468399aa56ff791be2b456bd836eb8db58909890830fe56942d2ffc0c4a565d5fa97cad2dea705152e6c8be406c801a872a4e
-EBUILD python-vlc-1.1.2.ebuild 671 BLAKE2B 672e1babc5a28b3d5a55365a81d79080f3cca165687ce3134a21f96b3581be65f54cb9e17d99f63e0b396348f971450445707052740a99c7a214a4e4cc523a2e SHA512 cc4120368d530285d78b6bad049c32128e4967d5f9660edcc2575b926d7ce767c14bdfe8287f5a245344a6efb6d5f0ccf09b7c8a69b492cfc552f03bfc5d4a3b
-EBUILD python-vlc-3.0.7110.ebuild 680 BLAKE2B a79dd661c1a66669a2334068d1330c294d058308b301ae8c5effffbc5306fff2ca2451cbdd6e1fd6ec71ed0cb684aa3cb650574b3dd426d117c6aa0b102c5852 SHA512 bc55a6bad593b99dd3bc85f12e96251f5f5d6e04b31183bf53a4810f3335d0cbea64ad5604ed8e6b871c2351e9ec3f50865a3c1da23a9944d1e7c08c7ccb40fd
+EBUILD python-vlc-1.1.2.ebuild 672 BLAKE2B 2532be63005ec7c50b199c50e02eb7fb900d727afd7c77e30b8318ba19f84252db965289e8f1a610dc8523e9d1d2291a2425835108fd147f9025d0d098aa640f SHA512 95edae280ee6527f52253e7efaba583ad397054b54c86ecb2513f4a9274c8395967d24d23b622b76624f56d65a3dca8c09a7a02d94bea103cf7a99c2e199808b
+EBUILD python-vlc-3.0.7110.ebuild 679 BLAKE2B e46d93259e11d0da23aeb8adc091240cc44fcaa7c54a0604ea8354a46c7d6ec8213c09103fc79e28cc20e776fc989a457eaaf33be6f00c4c79e807a731d37f9c SHA512 731076b3eb073ac95fff557aba675707c944a48f8bf6c16cff998938b84e7148da0c6d45de62281da0b30bc0682743037202c306744c0d7588a31515ee443ce7
 MISC metadata.xml 462 BLAKE2B b3812e01703dbbe49fe2f6f101401dbb20c4943cee663d3202ab146dab85857c49fe4d66008b4182a1996fda5d0b1a1b7e5923da91463485a67bda89089db8b3 SHA512 f82d6002c8b41ebcc9895c0a45967ea1eba37197a3c00c67a392076f41b6a795143da5cfd3c4ea41fa313f1cd6c81e2e55dd6090513d9db9eea459fa451b241b
diff --git a/dev-python/python-vlc/python-vlc-1.1.2.ebuild b/dev-python/python-vlc/python-vlc-1.1.2.ebuild
index 53e2d0b69..f9d5df0b6 100644
--- a/dev-python/python-vlc/python-vlc-1.1.2.ebuild
+++ b/dev-python/python-vlc/python-vlc-1.1.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/python-vlc/python-vlc-3.0.7110.ebuild b/dev-python/python-vlc/python-vlc-3.0.7110.ebuild
index 45edb74f9..c57bcc828 100644
--- a/dev-python/python-vlc/python-vlc-3.0.7110.ebuild
+++ b/dev-python/python-vlc/python-vlc-3.0.7110.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/python-whois/Manifest b/dev-python/python-whois/Manifest
index 58b16ae8a..3312bb604 100644
--- a/dev-python/python-whois/Manifest
+++ b/dev-python/python-whois/Manifest
@@ -1,7 +1,3 @@
-DIST python-whois-0.7.1.tar.gz 83403 BLAKE2B 16d1faac41e1679001210dbf6e347068d14989f9b83a4446dd680e414547dd5cf34714151115452d800b4bfb7a26b4449e210499f9e1b7cb87fb515d75563483 SHA512 b5954b92c72fa03a8dab01cddae85a7f964cca3f72820788140e75c8702ead7884ebefdaf95c50efd2992efc7966c287a5ea66220b44348827d35d62bd9b4494
-DIST python-whois-0.7.2.tar.gz 90030 BLAKE2B e851e45ca0f342c89fdf8e48bfa3972d64db2b8a9e74985d07006ad2ec1deefc430068b25334c3cbde5f5f38e0f1acc69116b94fdf041d97a0cf4795b34de756 SHA512 9f0b0ceedac13b8c4f51389063096819b6aef2b3454c297ca7497dbe78800447e39f61e42fefec84994070ef0d10d75a4342d99a9dc5d76b711b21da0e76f1b6
 DIST python-whois-0.7.3.tar.gz 91507 BLAKE2B 5ea312de8c9beeff0d8626deb5fd1c8100940531fdaf3dd9c357c24d2a8043a6a5c508f3b722d42296aaeb3b529d248de1f7ed726b3fcac992f12e9c38415a9c SHA512 59ef578d7611f8925449dd837c8f77982eeffb2e5454ed2f893596dfc73dd984d52d1e5e557d3424bca136b40ff14e720e55feb424692c448e94fee6cd65cdc2
-EBUILD python-whois-0.7.1.ebuild 708 BLAKE2B eb01d2e524925c304c6a30a563e37908e2ba33e14caae7d3f2a17e9f62a9ce659c5f484ea633e35807182d96974e78828a9a672a9c39e009469c9b3d1e47aea8 SHA512 dd1a57a32015d81af82fb806bcc9422ea5a59e68afbe0dfedd01ac7c303cf26b0020f5eb6ff349c21c0d4e4da73bba2680d436f42e033598dc7645a276701c9c
-EBUILD python-whois-0.7.2.ebuild 715 BLAKE2B eb003ebdcdeee9961378c74f2506a5de025fce675c43d1bd020841608a53439744befc9fa9e354f33052e63a98465fcbfb632439d384c3e708620838822e9164 SHA512 fb7775931ca036e8908e67f6fef6f370dedecaf4b2c924afbe5b88f7227852ec390e53a533c1e06f629b983f8a82b2fbf6bf63507e4e168f04001df7f54f62de
-EBUILD python-whois-0.7.3.ebuild 796 BLAKE2B 49f09e49fb003c5a7d5416817ef57a290f9a5298e1617e6f3c3b21090ad324831ab6025662174ca7f2d7c4f93cf7a373131f07e69c788f6f1066446f38217770 SHA512 12dc6da16f8bc28eda1ae5ff370f115b992c9bd82ff8e2d4cdbfd05c601393d9384ebf212e2faf3695c4978bc9b7ceef7131ef0e445f54ce8aa8600e1de0ec0a
+EBUILD python-whois-0.7.3.ebuild 795 BLAKE2B d673bd8e211ffb4c375251e4d5f97272f750542379d151fd7519bb761a6088e9e784c63461f9bc6f5b6855b390dacf08c9129af14dbb98df35c7664b91e0dc1d SHA512 9c5325174e45fdc7d9124c7c3bdf76bb1388166d6aec8991793bb3ff8fa4b1cc7528d81525844d54fe91d62373ca5e5d89867072386dc01049c5b8dd18c717cf
 MISC metadata.xml 463 BLAKE2B e8da73cab49f6f2911b6c3887da7101459daaeba8ef14b2fb461ed4eb88ca3b0dcaec2a56176941c8d2a70ec7d45472c3c42ce69384bf336fc2983acfa48d17c SHA512 0167048e15b78d9105056ccd1f0dc33eb287160a4b4b5a9277a8f5abb9b238a570a97fd7e451d502ec766553774d3bcd67d61ed7dc9336f7273503bd612bf095
diff --git a/dev-python/python-whois/python-whois-0.7.1.ebuild b/dev-python/python-whois/python-whois-0.7.1.ebuild
deleted file mode 100644
index 4ffec4d5b..000000000
--- a/dev-python/python-whois/python-whois-0.7.1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{5,6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Whois querying and parsing of domain registration information."
-HOMEPAGE="https://github.com/richardpenman/pywhois https://pypi.org/project/python-whois/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/python-whois/python-whois-0.7.2.ebuild b/dev-python/python-whois/python-whois-0.7.2.ebuild
deleted file mode 100644
index 30e795810..000000000
--- a/dev-python/python-whois/python-whois-0.7.2.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit distutils-r1
-
-DESCRIPTION="Whois querying and parsing of domain registration information."
-HOMEPAGE="https://github.com/richardpenman/pywhois https://pypi.org/project/python-whois/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/python-whois/python-whois-0.7.3.ebuild b/dev-python/python-whois/python-whois-0.7.3.ebuild
index b87d54880..603091b61 100644
--- a/dev-python/python-whois/python-whois-0.7.3.ebuild
+++ b/dev-python/python-whois/python-whois-0.7.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/python-wink/Manifest b/dev-python/python-wink/Manifest
index da209b924..07cb79133 100644
--- a/dev-python/python-wink/Manifest
+++ b/dev-python/python-wink/Manifest
@@ -1,5 +1,3 @@
-DIST python-wink-1.10.3.tar.gz 20105 BLAKE2B 20d49d80ea4f62ed1cff0af0fd96da9dfaee4e127327b08a2c99c7bdbbc2b2e3f5a71306b25f61876e5bcccb2ae881375da6fd04c4bce155bd9e2023d628ac26 SHA512 21c6311c9c5a62768cd9d01d7d1293e9d6ac313eb681a73cb7e7ce10ca8df51826999563e72dbc499dbad6e8d4d9ca8ab81ab7dc0bdae756f7ef1dcf17c054a5
 DIST python-wink-1.10.5.tar.gz 20524 BLAKE2B 5c7ddead92e3b038d26bcdfaab2ebcce57fd0e3aa79451dca7bbc027f31f8c273124f407e9fe1f605cee516d7d32b8cd59d50cad6fb38577601e4bdaeaca225a SHA512 4c088b8c2282684a6a8a2230e1404d7743e04a6bbe39f4b1fa2e729cdcee7b81d23a41f36ee7c552d6894612c53534de4e73e5c644764dffaaeaa024d5165537
-EBUILD python-wink-1.10.3.ebuild 683 BLAKE2B ea67898c0f5f71f2dd35c7aac55bccbb8ba005ca1952b42a0c750de5b9e76fa8252a14ea1d8e78fa71cf760913dc9ce52918e596c1ef739b027ac333a6def894 SHA512 b4b52284b07b22f5a7cbf6f2a2c58f0bbcad97de224caa9ae19e1c9eedd4e7dac91bbee9e3e5f7f6a5c449f91c2e87a81f5ebd889f01e43ee2a8ab99bbe832b7
-EBUILD python-wink-1.10.5.ebuild 690 BLAKE2B a2134903e684e386d49c54ee4054165eedfecf195801cdc00013bcb0e1ac2b8c465e6d62dfbd1490270f28cbb9aa00d14c8ce72e82b7b29907a105177a8914fd SHA512 20af74ed03228ba51d3c6517b6c3a7bbc5837280bbf35e777c3602cf21061a4aa8159c22bf1eb23f4bf9c4c89c6bc490a795846d74f1b5cce2797885a8760c50
+EBUILD python-wink-1.10.5.ebuild 689 BLAKE2B 1e012a76284949940b7b40a24c4057b5efca29f011e4c969ed2a8301d15e7337f7a87fed64b69237d93a05394b3a43dba75bf23c5a09addafa185fb38c5f12e2 SHA512 72876818c2aa3ca8f191d742440cd7fbed6275bd14b3d2ef22329687bedf9ffc7f31e0e25d0a76d9f279811e2c478e419c673e034651a8322b686f8468eeac1d
 MISC metadata.xml 330 BLAKE2B eb4db51d8c6153f5df850b6e42cf654facf9501690f4b5d2dbd1daa6cb9874f3ef4afba1ecb89defaea4cc240f9cd8c9673c305d64bc60ec2a0204a4d6dd66f3 SHA512 30af6d5d66fc1639804c0f6a57aa5a5571c53e135e4405997fe769844dabead204d683b184abc8106964c936572c4a36f720dfe48f624ae11d7ad7b6cffa25e2
diff --git a/dev-python/python-wink/python-wink-1.10.3.ebuild b/dev-python/python-wink/python-wink-1.10.3.ebuild
deleted file mode 100644
index 314b48cc1..000000000
--- a/dev-python/python-wink/python-wink-1.10.3.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{5,6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Access Wink devices via the Wink API"
-HOMEPAGE="https://github.com/python-wink/python-wink https://pypi.org/project/python-wink/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/python-wink/python-wink-1.10.5.ebuild b/dev-python/python-wink/python-wink-1.10.5.ebuild
index c0e29b734..bc849c069 100644
--- a/dev-python/python-wink/python-wink-1.10.5.ebuild
+++ b/dev-python/python-wink/python-wink-1.10.5.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/python_opendata_transport/Manifest b/dev-python/python_opendata_transport/Manifest
index 0a00430e9..7d368d611 100644
--- a/dev-python/python_opendata_transport/Manifest
+++ b/dev-python/python_opendata_transport/Manifest
@@ -1,5 +1,3 @@
-DIST python_opendata_transport-0.1.4.tar.gz 3547 BLAKE2B bd1d5a4f93f2b8b8f6a63b52a4d538335b477aa3af6d827d9376ebeaed8be5c3cdfd90b082e1076981393323606f4d4fb6af9d8d0282ea354277e499ab0a7391 SHA512 fc45a1c9f3734f7525942ddbcfe661db9c25f60f32491542f8d8475a47c21e48198c0602b2a523838010b6e9c858e326ef1935a169f66e345974cea12f748c74
 DIST python_opendata_transport-0.2.1.tar.gz 4248 BLAKE2B 87fd981274ce703c97560d89df0e6476663b95cafb45d0ff1156e5f293360b7630f331cb5fc06a37038e03d6a83117b8fe44cf9718c41a185b67706c01180beb SHA512 f811aa34a9448b40346ea53b1d665622e8c173001b1e0c96aa9732497f7766038a45ce88bbeef349c4f1933ed62f94cd2a045f3dc4e577613848a720dccf175a
-EBUILD python_opendata_transport-0.1.4.ebuild 802 BLAKE2B 1dea6762e1f7f5078724c6bf80aa7c856d662a57164b2be465c9755892c4adf16d18bd674be9bb77e163543cf5ebd1a034a6b1a937385d09b96e8d2f552a05e2 SHA512 e37f799bf91d16f071640d708c430b92a50dfd97ed75d15d212aa7d7d66745814c7c4f229d0908ef00f6866495186d01621ef4eb5ed95ca77ba19d3e82c47d27
-EBUILD python_opendata_transport-0.2.1.ebuild 811 BLAKE2B fc2208befca819bea2695f0195051429ef22e8d74408dcf79a272248d2f61e6728d6cfdd46d391eef74a67ca449a3efa95b2ee5030fd8ee54f6b43ac19db675e SHA512 734da4b885249f838708c69344a6d19b88372c275467d68782afd523fdf10dcd1705ca52fc6cd3cbddaf63f50588f8d26ffa881f7dbd0b697052dd7d4710a489
+EBUILD python_opendata_transport-0.2.1.ebuild 810 BLAKE2B 3e50ac2f5a903dc26e5a2f56090735c95241900b041545a89eaf80958f3a62525b0c0552ce0fa2c463cc967fe0f652adfa0b7189c12d07eecbedcd63b28402cc SHA512 675305147e98f7dc4f284558acc8b84c8f52eecb54b02e6ec0c0dd74a35d1adfc8ed09cf6b6a741c870bacb360df5c3368cd90f038277e3d0dbf01b67f911c10
 MISC metadata.xml 483 BLAKE2B 41ade82ef0bd1cf0c4610973686e02ba3f047df53c3a44c0285d72040c17776eeebae21fa1ebfaf2410bb7f3f3dd4a07c33ebbf58bbbb2355729af3458908cf9 SHA512 692a765609ae68addbd94a2532135947a0154c2fe9c9226010a407ad63ba69516b6d8ed722d5cd282d1a5945ead30ff869884ddcdb662686b851d61637cd4ff8
diff --git a/dev-python/python_opendata_transport/python_opendata_transport-0.1.4.ebuild b/dev-python/python_opendata_transport/python_opendata_transport-0.1.4.ebuild
deleted file mode 100644
index 4a37638be..000000000
--- a/dev-python/python_opendata_transport/python_opendata_transport-0.1.4.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python API for interacting with transport.opendata.ch."
-HOMEPAGE="https://github.com/fabaff/python-opendata-transport https://pypi.org/project/python_opendata_transport/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND="dev-python/aiohttp[${PYTHON_USEDEP}]
-	dev-python/async_timeout[${PYTHON_USEDEP}]"
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/python_opendata_transport/python_opendata_transport-0.2.1.ebuild b/dev-python/python_opendata_transport/python_opendata_transport-0.2.1.ebuild
index 226bb311e..67f8ab9b4 100644
--- a/dev-python/python_opendata_transport/python_opendata_transport-0.2.1.ebuild
+++ b/dev-python/python_opendata_transport/python_opendata_transport-0.2.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/pytrafikverket/Manifest b/dev-python/pytrafikverket/Manifest
index b4ff1bb36..d59c312dc 100644
--- a/dev-python/pytrafikverket/Manifest
+++ b/dev-python/pytrafikverket/Manifest
@@ -1,7 +1,3 @@
-DIST pytrafikverket-0.1.5.9.tar.gz 5914 BLAKE2B a843f6debd0dfa07f664d30f8b063fd5242ab2b6cd82f68c2fce006027995263e9fda47295b678f9c93c7e99af8dc66b3093db51de143d41bfcc9e254ed5e877 SHA512 605a6b07b2cc75fda6936aa5d6233254ca37b988961dfbdd4f6b3f37178c5eb7a00941d6e862889dd2d497f57cb3387055c476f2d5c60b298af4deb7e39f912f
-DIST pytrafikverket-0.1.6.1.tar.gz 8145 BLAKE2B 8e006d94e3607cbefadf809ec116a950430a45254136d4d0c8e45a05de93533674a7523cf656b18804e27aa979a2557006b35eeb585de2be244e35fc53ce0878 SHA512 4d6f942b455ee35360fee10f9eb5a747c5149f6bcf648f4131fd39e0f69cdb6847121002cc20c9e21d98b7a210f77da7db8cc15d5355657de1a5d406ba2397e2
 DIST pytrafikverket-0.1.6.2.tar.gz 8660 BLAKE2B 1730fc41780e6ab346bb8b0d9a7991a313c6f19f1dae11a3fad8fa52590ac42f6312ce90be0391a0c49ea10e798df845f8d47ec28b14af06e9990ad57e274f53 SHA512 1216cfbc315706779c5e35d23d4dbe9bbfbaa26758c10fe84a1b798f06a4cb8e4cbb5b4bbbe516f58ee9a171d8ab84cafaa6be0c6a6224f30bc9626409c2a965
-EBUILD pytrafikverket-0.1.5.9.ebuild 799 BLAKE2B a741e604d6aaf2f311487c9597c232df536d4abfef7d68ade5b7086a80a8b4db06ac44a07b8596080546dd5f858fe8e060383d2a96d0c66f0d3647b5641a15dc SHA512 62990f40ab083e7da96a1190d0adacd746e120b20d18b2a155ce606cca8f316b1e475ebd0c464a73e9986e9a66203717779118bde7adfa9e0e5de52b9c802b38
-EBUILD pytrafikverket-0.1.6.1.ebuild 808 BLAKE2B 6c4c30ff712eb767cb74955ba31d838c86b816c6e4f7f2ad5a7d4dd458c39e263f7ef3a012672641f5249f8b1cfdba22ae55531055356fdf7cf74d3998a57a1d SHA512 d5fcce3cb336f44d17d0375098d44dea67bd215213571ce67e9d65e3bb99753498904d17f7efdcf0761fce81b5173fe869e375d670920eb8281f642a8d783895
-EBUILD pytrafikverket-0.1.6.2.ebuild 808 BLAKE2B 6c4c30ff712eb767cb74955ba31d838c86b816c6e4f7f2ad5a7d4dd458c39e263f7ef3a012672641f5249f8b1cfdba22ae55531055356fdf7cf74d3998a57a1d SHA512 d5fcce3cb336f44d17d0375098d44dea67bd215213571ce67e9d65e3bb99753498904d17f7efdcf0761fce81b5173fe869e375d670920eb8281f642a8d783895
+EBUILD pytrafikverket-0.1.6.2.ebuild 807 BLAKE2B bf039eb93a46c76a89d4c4c059fc698b8d7d30b0e302f105877cc98c1af934508006cd836dd6e75278ea8b7d58a6a9900b93e73a8c2f461b01c86ad95b168cc1 SHA512 9b0ee6b0f6216f728f07ea44e050f8b3c298a6a961ea369bb4c4b41be2d70102e1c523a5eade715a1919e3a95d294fe190a52b1f275765c9daf854286eb0b654
 MISC metadata.xml 333 BLAKE2B 7558471b17d66a6c55945de25b4b6e8c658a4ce4e623918d3e3476f50b0748a631996afcdabea77bdb36f9042ba1ab02ab57bd97e7ebf8f279e68449a3731110 SHA512 cf5ab3341d8a9db68b53b2103e297bff99d0bad83793024ee214d94a1d8f3b71a83ad5b64544ce1d6bbd944a3d450e42180ceffde2de1185ec9592bf893c1fd5
diff --git a/dev-python/pytrafikverket/pytrafikverket-0.1.5.9.ebuild b/dev-python/pytrafikverket/pytrafikverket-0.1.5.9.ebuild
deleted file mode 100644
index c1d6db10b..000000000
--- a/dev-python/pytrafikverket/pytrafikverket-0.1.5.9.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="api for trafikverket in sweden"
-HOMEPAGE="https://github.com/AnderssonPeter/pytrafikverket https://pypi.org/project/pytrafikverket/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND="dev-python/aiohttp[${PYTHON_USEDEP}]
-	dev-python/async_timeout[${PYTHON_USEDEP}]
-	dev-python/lxml[${PYTHON_USEDEP}]"
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/pytrafikverket/pytrafikverket-0.1.6.1.ebuild b/dev-python/pytrafikverket/pytrafikverket-0.1.6.1.ebuild
deleted file mode 100644
index 3ad2c5741..000000000
--- a/dev-python/pytrafikverket/pytrafikverket-0.1.6.1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit distutils-r1
-
-DESCRIPTION="api for trafikverket in sweden"
-HOMEPAGE="https://github.com/AnderssonPeter/pytrafikverket https://pypi.org/project/pytrafikverket/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND="dev-python/aiohttp[${PYTHON_USEDEP}]
-	dev-python/async_timeout[${PYTHON_USEDEP}]
-	dev-python/lxml[${PYTHON_USEDEP}]"
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/pytrafikverket/pytrafikverket-0.1.6.2.ebuild b/dev-python/pytrafikverket/pytrafikverket-0.1.6.2.ebuild
index 3ad2c5741..ef3b66920 100644
--- a/dev-python/pytrafikverket/pytrafikverket-0.1.6.2.ebuild
+++ b/dev-python/pytrafikverket/pytrafikverket-0.1.6.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/pytz/Manifest b/dev-python/pytz/Manifest
index 3da1789ec..50b96cc10 100644
--- a/dev-python/pytz/Manifest
+++ b/dev-python/pytz/Manifest
@@ -3,14 +3,8 @@ AUX 2018.4-zoneinfo.patch 549 BLAKE2B 5654ac8133627afaf9dc17dd9ae8e6a22ef9206efc
 AUX pytz-2009h-zoneinfo-noinstall.patch 957 BLAKE2B aec135326ab00e0287fc1c57ca745bc113ab8f0564d7328e82ed00cb024ad8a5008dcac4a7f580967672e996e861bc994fd307de7aee7e55f5e8623fe64844c5 SHA512 142d3ac58be3fffc35e2dc1f70ee988a7c9ebec51518d15bee9d36f4d4a08178840fa4d73f9734e92192c3633e517f525a9d583f7b5dc754af83f7c9536bd446
 AUX pytz-2009j-zoneinfo.patch 651 BLAKE2B 9e0f5d4f037691ee02809ae46887d6f4f5a390e95f670d604a6525b9b68ba4b1743ed34a8c0c05b70f436e2023bc0c9326a6a9fa46ac3ce87eb9438adcdb60b2 SHA512 228d3c59e3e0b5b0b3b80f5b0b6e947815d11191fd5523d17420dde6cea488bc544c05b552619934c4ca72c30ebefd042114abfea6c72f03710e96a776f39038
 AUX pytz-2018.4-zoneinfo-noinstall.patch 579 BLAKE2B 1d21d01160dbdf6c6848c2c0088cbc6ca326270b106098ce7157b363acf6f4da750a58498be95a8b5bf1ee342b679fdbbf16cf9d542d5f46088062db83f866f7 SHA512 309c2427f5a8ebb77bdf899ad3fb34029c46901cbaf2baf3ab697b83608dd1d3c6e7cf776b1b9b592918b91cbafd148ee3e4c0b4255f38ea3e41c0bca94f4c51
-DIST pytz-2018.9.tar.gz 310705 BLAKE2B 38e4f403e299ca3c24e5cde66bc02ebb861abfb7be06bcb0556fa75f426a2d3e1ac42466ea2296ddf52d3ed0e0f6f2478733d9877d2b891b5f4787cd1e792d91 SHA512 c3dabe61d04539245761a5c4e3bfb614df1c3b8ccc2ffa1cf320c5ad642242c29b3321fe7855d32a2ae55c739acbbe8c0e1813df5b3c757b8f56fff910fee159
-DIST pytz-2019.1.tar.gz 308148 BLAKE2B 79ebec345adb57de2420bfe00c7b5d4acc160100fb1292be8734643a0b2d31622d93c7ad7e60eeceed2bd455d0c6e6f3ec5d392ae44f94a0726a0008f33d0aed SHA512 981a5aa2430bb7740bc1fd53e6c7416552c4f19d33a82701854b087ca5624ec3211b55add802e1e004f3728c32447f93d934c0d2bff993cd1be5e96e41fd44d6
-DIST pytz-2019.2.tar.gz 307474 BLAKE2B 23c6e80cc800fcd9a7adcececf6edd136957ea2f4900d2f94fc69bcb5f06faf7b179c68c6bb0b7717410effadb5141cd8f221fce4faf53cfc0a05c18a2b68c92 SHA512 86d8b600373274f66200e5e9426303d5855221c85488415ad9270059fc7853c6f5f9399b11aad41f6522fbccc0878b9caf896c9bba16fde9857e412620151beb
-DIST pytz-2019.3.tar.gz 312286 BLAKE2B 8a81caf3ead284a66404fadeca4f17a603a4f0ab2404f9b73b2b06a209d0094a25549065aa14d254239d6d842804c6924bc7658a876517b170f535be71868ead SHA512 b925b59d197e7007dae8098d35518a470e4b7588d9114f51e4d8816813243a9f816f662055f690bedf56b86cc9ece06428ed8c55e5b3ed676ba0f504f7cb43af
 DIST pytz-2020.1.tar.gz 311771 BLAKE2B 2d7dd9987fd912dd2a62b5c4ab1667a13f3704ff407796c00fd76b6f3ac4dfcffba9f58740f9456ddfade6c2ef6deacc754f57f5e434b97da36b36fca3024d0f SHA512 4f652ab400bac0bd83ed305be7540094e674029a0cbde7da280adfd911b8c0a44023799b7c61971a5a61a1d6e3992c5b621e5e95bbfe962f310d5f26d4fda3ce
-EBUILD pytz-2018.9.ebuild 883 BLAKE2B 7897d8857383d7e7f0d46180838e3781a9596efa5b0c9f56d376a8a3ab5136fcb7f2e85ecdaeea9c772940591450b207a22edbe7a8a2923a314cedb65ae666b0 SHA512 af2c3182778a61252e506cb28496ebe83097ad418edb6571b6a68378ffbcdaf274e15c279f8fab202178cde0b77ab0141a29052f32cb9688ec7615e630a6326b
-EBUILD pytz-2019.1.ebuild 883 BLAKE2B 7897d8857383d7e7f0d46180838e3781a9596efa5b0c9f56d376a8a3ab5136fcb7f2e85ecdaeea9c772940591450b207a22edbe7a8a2923a314cedb65ae666b0 SHA512 af2c3182778a61252e506cb28496ebe83097ad418edb6571b6a68378ffbcdaf274e15c279f8fab202178cde0b77ab0141a29052f32cb9688ec7615e630a6326b
-EBUILD pytz-2019.2.ebuild 883 BLAKE2B 7897d8857383d7e7f0d46180838e3781a9596efa5b0c9f56d376a8a3ab5136fcb7f2e85ecdaeea9c772940591450b207a22edbe7a8a2923a314cedb65ae666b0 SHA512 af2c3182778a61252e506cb28496ebe83097ad418edb6571b6a68378ffbcdaf274e15c279f8fab202178cde0b77ab0141a29052f32cb9688ec7615e630a6326b
-EBUILD pytz-2019.3.ebuild 883 BLAKE2B 97c96f1241d60b208d14b4378e248917b9f05cfe3a23c6d2d5ddc8f1c9bd18709b9c5df676c65586debd4fbd1e66b91b251a583ecbd4fc89aeec51ef23163deb SHA512 02a125e69fc7c564477d2856a24f722f1d04886f2abc808a5abf266cf0d890b6a13ed8c2fd44e28b6e59adbc3069cb5181d973c2c9b6bbb5797d400a26d30d85
-EBUILD pytz-2020.1.ebuild 883 BLAKE2B 97c96f1241d60b208d14b4378e248917b9f05cfe3a23c6d2d5ddc8f1c9bd18709b9c5df676c65586debd4fbd1e66b91b251a583ecbd4fc89aeec51ef23163deb SHA512 02a125e69fc7c564477d2856a24f722f1d04886f2abc808a5abf266cf0d890b6a13ed8c2fd44e28b6e59adbc3069cb5181d973c2c9b6bbb5797d400a26d30d85
+DIST pytz-2021.1.tar.gz 317945 BLAKE2B 5d8b5ac80a9d5be56977df8a422e9f008ccb1afb9468155c53aa97f0bf43ba15c27fd30ee7be035be6fa590dcb272991a069cd1383f1c6c8d378958d7b0c4970 SHA512 507e24e3c5c2c619d9f3c7f4c33d44d262e33656b07701d0db78f5d67b263ad845dccc4ff50e48c580b0f295cf97ed146af7b9259890a50bb6da4c82b70c439b
+EBUILD pytz-2020.1.ebuild 882 BLAKE2B 7b8294b81f056f62ce915957719f50da8cfe818fabc93cf235dd4fffdc31ce5b38ee6cab272a8b62bc4a64857597a82b013dc12e49123357e8312ddd84a01f84 SHA512 3fdac7bd733b0a2e08c682b9fdf539f1eb14802368d418661881a0fa05782addab1a207ee2bba6f27af95fec6aa70b2aeb34468db1d1af77381aabd4a2f956b5
+EBUILD pytz-2021.1.ebuild 865 BLAKE2B ce2d0fe070ef487e945c7f2df022fa94a3ad879c566f75092168310b4febafefec8ca6534aeceb613b4332ea1da0d22d7a87f246dfaaaab88d4adc6b4c63f9a6 SHA512 7bcbbfcc0d3299c9878c199ee2d8c83e3ac940794d4bf0768a3b587ccbcfae6fef7e184829f60202f0e1f1355f41e8c40bd1d57ceaa7467119d371d3d22470a7
 MISC metadata.xml 739 BLAKE2B d96611c8cdfc1d45fa86eabcbcc60ed1d3f7e7d2a358a2fc5cf54a64ac3427140299651263e0be1cc4d2f87750df81c4adac9512be75ab334d38f44a375238ea SHA512 b7c9e6ea1b5bd128f1c5ce0a77171d0b7cdbb6f8ffb186d92aa4167d2d84c60c28c647cae66ffc7532350bca13ab65aaab5eb441f68321fc786a14b90f8813e8
diff --git a/dev-python/pytz/pytz-2019.1.ebuild b/dev-python/pytz/pytz-2019.1.ebuild
deleted file mode 100644
index 85950a7ef..000000000
--- a/dev-python/pytz/pytz-2019.1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="World timezone definitions for Python"
-HOMEPAGE="https://pythonhosted.org/pytz/ https://pypi.org/project/pytz/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86 amd64-linux x86-linux"
-IUSE=""
-
-RDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	|| ( >=sys-libs/timezone-data-2017a sys-libs/glibc[vanilla] )"
-DEPEND="${RDEPEND}
-	app-arch/unzip"
-
-PATCHES=(
-	# Use timezone-data zoneinfo.
-	"${FILESDIR}"/2018.4-zoneinfo.patch
-	# ...and do not install a copy of it.
-	"${FILESDIR}"/${PN}-2018.4-zoneinfo-noinstall.patch
-)
-
-python_test() {
-	"${PYTHON}" pytz/tests/test_tzinfo.py -v || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/pytz/pytz-2019.2.ebuild b/dev-python/pytz/pytz-2019.2.ebuild
deleted file mode 100644
index 85950a7ef..000000000
--- a/dev-python/pytz/pytz-2019.2.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="World timezone definitions for Python"
-HOMEPAGE="https://pythonhosted.org/pytz/ https://pypi.org/project/pytz/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86 amd64-linux x86-linux"
-IUSE=""
-
-RDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	|| ( >=sys-libs/timezone-data-2017a sys-libs/glibc[vanilla] )"
-DEPEND="${RDEPEND}
-	app-arch/unzip"
-
-PATCHES=(
-	# Use timezone-data zoneinfo.
-	"${FILESDIR}"/2018.4-zoneinfo.patch
-	# ...and do not install a copy of it.
-	"${FILESDIR}"/${PN}-2018.4-zoneinfo-noinstall.patch
-)
-
-python_test() {
-	"${PYTHON}" pytz/tests/test_tzinfo.py -v || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/pytz/pytz-2019.3.ebuild b/dev-python/pytz/pytz-2019.3.ebuild
deleted file mode 100644
index bb6e133ea..000000000
--- a/dev-python/pytz/pytz-2019.3.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="World timezone definitions for Python"
-HOMEPAGE="https://pythonhosted.org/pytz/ https://pypi.org/project/pytz/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 x86 amd64-linux x86-linux"
-IUSE=""
-
-RDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	|| ( >=sys-libs/timezone-data-2017a sys-libs/glibc[vanilla] )"
-DEPEND="${RDEPEND}
-	app-arch/unzip"
-
-PATCHES=(
-	# Use timezone-data zoneinfo.
-	"${FILESDIR}"/2018.4-zoneinfo.patch
-	# ...and do not install a copy of it.
-	"${FILESDIR}"/${PN}-2018.4-zoneinfo-noinstall.patch
-)
-
-python_test() {
-	"${PYTHON}" pytz/tests/test_tzinfo.py -v || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/pytz/pytz-2020.1.ebuild b/dev-python/pytz/pytz-2020.1.ebuild
index bb6e133ea..1b0f1f2ba 100644
--- a/dev-python/pytz/pytz-2020.1.ebuild
+++ b/dev-python/pytz/pytz-2020.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{8..9} )
 PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1
diff --git a/dev-python/pytz/pytz-2018.9.ebuild b/dev-python/pytz/pytz-2021.1.ebuild
similarity index 51%
rename from dev-python/pytz/pytz-2018.9.ebuild
rename to dev-python/pytz/pytz-2021.1.ebuild
index 85950a7ef..cdcdc2f4a 100644
--- a/dev-python/pytz/pytz-2018.9.ebuild
+++ b/dev-python/pytz/pytz-2021.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
+PYTHON_COMPAT=( python3_{8..9} )
 PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1
@@ -14,22 +14,19 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm x86 amd64-linux x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE=""
 
-RDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
+DEPEND="
 	|| ( >=sys-libs/timezone-data-2017a sys-libs/glibc[vanilla] )"
-DEPEND="${RDEPEND}
-	app-arch/unzip"
+RDEPEND="${DEPEND}"
+BDEPEND="app-arch/unzip"
 
 PATCHES=(
 	# Use timezone-data zoneinfo.
-	"${FILESDIR}"/2018.4-zoneinfo.patch
-	# ...and do not install a copy of it.
-	"${FILESDIR}"/${PN}-2018.4-zoneinfo-noinstall.patch
+	"${FILESDIR}"/pytz-2020.5-system-zoneinfo.patch
 )
 
 python_test() {
-	"${PYTHON}" pytz/tests/test_tzinfo.py -v || die "Tests fail with ${EPYTHON}"
+	"${EPYTHON}" pytz/tests/test_tzinfo.py -v || die "Tests fail with ${EPYTHON}"
 }
diff --git a/dev-python/pyubee/Manifest b/dev-python/pyubee/Manifest
index c377795be..d7ca91ce0 100644
--- a/dev-python/pyubee/Manifest
+++ b/dev-python/pyubee/Manifest
@@ -1,13 +1,3 @@
 DIST pyubee-0.10.tar.gz 22181 BLAKE2B 9ae716990d24e4825cc677385d82afb6f5e3195fd52a7ec90dcf6168bfe994362c366cde84edfb7dcefb0df8b680bedaf068196dc28423d4aef279062b81f789 SHA512 7af27cea5d112366f1a23a040f7fec62c3108569524d1bead17669ebe11cf08d62838264a27b99d1e52a63db14cbe90e856947981147ef3d3422b1b0c3ddae84
-DIST pyubee-0.5.tar.gz 18480 BLAKE2B 2a26a79fddee36bafef4cc6e344b8bb8eec73360d5bfb5ace65f4d239b952ec8e20e12725e38b57d119526ba5e80e5406a6380067c17946bc00d58517ee32260 SHA512 7a5fa787113c857cf1299a2e544fc6b1e5d9f310ee336998df00fbc0d2a060bbdc519ad448537f542e6f363028522b422c831fce9e2ef9a36ed45ccead0bb2ab
-DIST pyubee-0.6.tar.gz 19776 BLAKE2B 66dc3208ccab48a4de418cdcc28bc696446b2d262641c73ae60cc117d255050dc8a0f094cbabbead467c4fc1bc527c033475ee00808743e7a8e778e11f9e0b51 SHA512 2e6027acfe6842007bdf3b7a1ae4bc33f8641354a93285a349814166bbb3fcf25460ac45eeaa4952d06e87aecc3797ef91b2f30ec6515ebd3932d1e89dbaa028
-DIST pyubee-0.7.tar.gz 19834 BLAKE2B 3c0b7a0e54917cbd976fe6966b79fbc668ea37281c0e7e70524e466716cdfa26946fb31374b43cb7f44005ffdd80674b61acd201e5833f3914d5471c7f6eb725 SHA512 3635753d9af99845df2bb36f1ce4cf1e0000b18e788579e8445f96c9f448b9a0d751d9e90a72298a44f0afe432b6a9b0cb1f30ced6f83cc5f48d43b3295a633c
-DIST pyubee-0.8.tar.gz 21367 BLAKE2B 0eecadc2510e0243c6a03234e90d2a46a080562f063c8c0f2653563b056070cfb853cbc4119ae5b4364e96e15f3650b92705157329b28d491c98a35aedca51a2 SHA512 d06ad2736796f0c19996a57d937acdac90306c232450eeed8cfd086265834b5c5c2c20d56700422bf3c22dd29fddfefc7e36724cefc88cd70d8f1d1d9ab420ff
-DIST pyubee-0.9.tar.gz 21443 BLAKE2B c5bbd9db7c643fe9a62c2f31ecc9f90b400560887721d478c975ae32503b2338a0c3e9d88f1b61d4362b5f02d35ec97e50a3b15aaa2676c29e471695dbddf177 SHA512 3f49389af47dbb0408da6a42696558930fe477acf8fffd29291d1c6cc160bc00bd93a88e0926e7a97e8092e81639d64712718106c1667e7e73cffc8dfb619e1a
 EBUILD pyubee-0.10.ebuild 693 BLAKE2B f89c87e2399ef2b66d7e6fcbae3f0597ebfc6c48018c099e8ad1a28de5ede6966219e5812c3612a0d2e23f11cae8af05d29c359fc00313eb6e3fc8841e3f2e7c SHA512 71a65bd90e595d764278a9b417227a0d3eb0fc747cbb2fa253a12239679ca7ec4d9cd53a7252f26bea394fd04b4694900fd8a7e3692cf3b13a686853d79c689c
-EBUILD pyubee-0.5.ebuild 686 BLAKE2B a65ce72dfe4c4f24dc38d2f6fca3d28af1d7c9dd21cfa764e2a536257aa0b6d8f68a5777dd642d2d001cf0d0f378978196bbd5981785770d207c3eb5b4750ebd SHA512 aed5582cdceda8978edc3697d505a30d9f57374cbd5445b64a8434e38a427e66ef9c76bbc6dac259d7fdcddb78a0ac38b42a41b47acaa0e13fe40dd55aabcfc7
-EBUILD pyubee-0.6.ebuild 686 BLAKE2B a65ce72dfe4c4f24dc38d2f6fca3d28af1d7c9dd21cfa764e2a536257aa0b6d8f68a5777dd642d2d001cf0d0f378978196bbd5981785770d207c3eb5b4750ebd SHA512 aed5582cdceda8978edc3697d505a30d9f57374cbd5445b64a8434e38a427e66ef9c76bbc6dac259d7fdcddb78a0ac38b42a41b47acaa0e13fe40dd55aabcfc7
-EBUILD pyubee-0.7.ebuild 686 BLAKE2B a65ce72dfe4c4f24dc38d2f6fca3d28af1d7c9dd21cfa764e2a536257aa0b6d8f68a5777dd642d2d001cf0d0f378978196bbd5981785770d207c3eb5b4750ebd SHA512 aed5582cdceda8978edc3697d505a30d9f57374cbd5445b64a8434e38a427e66ef9c76bbc6dac259d7fdcddb78a0ac38b42a41b47acaa0e13fe40dd55aabcfc7
-EBUILD pyubee-0.8.ebuild 693 BLAKE2B f89c87e2399ef2b66d7e6fcbae3f0597ebfc6c48018c099e8ad1a28de5ede6966219e5812c3612a0d2e23f11cae8af05d29c359fc00313eb6e3fc8841e3f2e7c SHA512 71a65bd90e595d764278a9b417227a0d3eb0fc747cbb2fa253a12239679ca7ec4d9cd53a7252f26bea394fd04b4694900fd8a7e3692cf3b13a686853d79c689c
-EBUILD pyubee-0.9.ebuild 693 BLAKE2B f89c87e2399ef2b66d7e6fcbae3f0597ebfc6c48018c099e8ad1a28de5ede6966219e5812c3612a0d2e23f11cae8af05d29c359fc00313eb6e3fc8841e3f2e7c SHA512 71a65bd90e595d764278a9b417227a0d3eb0fc747cbb2fa253a12239679ca7ec4d9cd53a7252f26bea394fd04b4694900fd8a7e3692cf3b13a686853d79c689c
 MISC metadata.xml 451 BLAKE2B ddc2b5bd3004cef064bed4ef063ff6063e29fe04bd49c15b99ad431b80c4d4cf0fa17cc10b7d2f0fed662a9b607413d03234dc5993cf2804be6dc89b38a2058a SHA512 5d393d1c0f7933ecf731ba408be6e7cd9c800eecf2d95a93e5ab1c25be0a0c65f1835426df254312cf1d7a6cc89ab6dfa15452dd4e2d61257f9d49ab0a894a81
diff --git a/dev-python/pyubee/pyubee-0.5.ebuild b/dev-python/pyubee/pyubee-0.5.ebuild
deleted file mode 100644
index 85f3a566d..000000000
--- a/dev-python/pyubee/pyubee-0.5.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{5,6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Simple library for getting stats from Ubee routers."
-HOMEPAGE="https://github.com/mzdrale/pyubee https://pypi.org/project/pyubee/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/pyubee/pyubee-0.6.ebuild b/dev-python/pyubee/pyubee-0.6.ebuild
deleted file mode 100644
index 85f3a566d..000000000
--- a/dev-python/pyubee/pyubee-0.6.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{5,6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Simple library for getting stats from Ubee routers."
-HOMEPAGE="https://github.com/mzdrale/pyubee https://pypi.org/project/pyubee/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/pyubee/pyubee-0.7.ebuild b/dev-python/pyubee/pyubee-0.7.ebuild
deleted file mode 100644
index 85f3a566d..000000000
--- a/dev-python/pyubee/pyubee-0.7.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{5,6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Simple library for getting stats from Ubee routers."
-HOMEPAGE="https://github.com/mzdrale/pyubee https://pypi.org/project/pyubee/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/pyubee/pyubee-0.8.ebuild b/dev-python/pyubee/pyubee-0.8.ebuild
deleted file mode 100644
index 3bf78f3f6..000000000
--- a/dev-python/pyubee/pyubee-0.8.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit distutils-r1
-
-DESCRIPTION="Simple library for getting stats from Ubee routers."
-HOMEPAGE="https://github.com/mzdrale/pyubee https://pypi.org/project/pyubee/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/pyubee/pyubee-0.9.ebuild b/dev-python/pyubee/pyubee-0.9.ebuild
deleted file mode 100644
index 3bf78f3f6..000000000
--- a/dev-python/pyubee/pyubee-0.9.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit distutils-r1
-
-DESCRIPTION="Simple library for getting stats from Ubee routers."
-HOMEPAGE="https://github.com/mzdrale/pyubee https://pypi.org/project/pyubee/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/pyvesync-v2/Manifest b/dev-python/pyvesync-v2/Manifest
deleted file mode 100644
index df159eb45..000000000
--- a/dev-python/pyvesync-v2/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST pyvesync_v2-0.9.6.tar.gz 6495 BLAKE2B f33a236eaae0f445d6c3a344657677201e205a5c6f912766b91b46a675d9ad6dc3d23db0324acb0f32d69b1cbfd8cf6f8ba35fe430a6e92fee243ea574f4eba7 SHA512 593bbae2ffd58f90eea679d2d7f3d8a8e6c0f1e72e1f3330b11939bf781c3c279e465cd39e72ae201b23ec278207808451b72d646229c94af514426ea7d1aac2
-DIST pyvesync_v2-0.9.7.tar.gz 7417 BLAKE2B 4e638d451758a08f00cf5ecaf90bca59efb8534403ef5bdfd72b3a4f40a05552587f6dcd2694e6491353036bf79ed4d814d7238d5e97eb23ec43d77fa9dd8789 SHA512 1766751487eeb03824ee9eec5e9ce73762c0cee213acd0ca6fc03cd23dfaa28e76fff331aef9919a457822025a172db2b18c74ed203a3f9ed4ebfbb289fd04d5
-EBUILD pyvesync-v2-0.9.6.ebuild 827 BLAKE2B f8582bad956616f3dfce2192043f8d82e259ca33a72a4666646bfe669af9feb1bcecbd15dd9b0a82d8c4381a1d158c00646adcc2313353174262a15a1f1622d8 SHA512 04bff2114743947c9a75ffb4df88ac7a1ffe1d57485bb94a2644ad943987508fac4ecd26d6f7b5bf24ee7ba48f64d0f941bf652333d675c7319851f53add343c
-EBUILD pyvesync-v2-0.9.7.ebuild 834 BLAKE2B 9ac1802b6cff58fc61923ac3a1a271c75dd5796167a965d5b29afcff66eff352e4c1a41a0ac01205f578c7c218b543eb3c1e92b6d94758da5c05b7e538bca4bc SHA512 e83984885ef2ddba5fdebebd4f0b0c714d9e78202a29c6152b5dc9040d4fca097e06bdc2f858034fca036097bf1a0452b11667334bfee5d313bf4e58874bd2d9
-MISC metadata.xml 456 BLAKE2B e31cb2d152da0b11bac8870337c8c0fe2830249f6f6d90e5a78c20b7c89ab7aa014d9804e82546a604f61dfdaf82df8288b1a4897e0ab7a4596ffe555d1ea1cc SHA512 3c4d13f379bc0352535f75fa79d24e9b135ed262aee0f97505af21b61724026c3d7dc8a6415ba4808a571f1d50da314c41a079311c5cf77b0c949554c60dd2e3
diff --git a/dev-python/pyvesync-v2/metadata.xml b/dev-python/pyvesync-v2/metadata.xml
deleted file mode 100644
index f53602696..000000000
--- a/dev-python/pyvesync-v2/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>b@edevau.net</email>
-    <name>Andreas Billmeier</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="pypi">pyvesync-v2</remote-id>
-    <maintainer status="unknown">
-      <email>webdjoe@gmail.com</email>
-      <name>Joseph Trabulsy</name>
-    </maintainer>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/pyvesync-v2/pyvesync-v2-0.9.6.ebuild b/dev-python/pyvesync-v2/pyvesync-v2-0.9.6.ebuild
deleted file mode 100644
index c72f6658b..000000000
--- a/dev-python/pyvesync-v2/pyvesync-v2-0.9.6.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{5,6,7} )
-
-inherit distutils-r1
-
-MY_P=${PN/-/_}-${PV}
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="test"
-S=${WORKDIR}/${MY_P}
-
-DESCRIPTION="Python library for vesync API for Etekcity Smart Outlets & switches"
-HOMEPAGE="https://github.com/webdjoe/pyvesync_v2 https://pypi.org/project/pyvesync-v2/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/pyvesync-v2/pyvesync-v2-0.9.7.ebuild b/dev-python/pyvesync-v2/pyvesync-v2-0.9.7.ebuild
deleted file mode 100644
index 1740c14db..000000000
--- a/dev-python/pyvesync-v2/pyvesync-v2-0.9.7.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit distutils-r1
-
-MY_P=${PN/-/_}-${PV}
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="test"
-S=${WORKDIR}/${MY_P}
-
-DESCRIPTION="Python library for vesync API for Etekcity Smart Outlets & switches"
-HOMEPAGE="https://github.com/webdjoe/pyvesync_v2 https://pypi.org/project/pyvesync-v2/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/pywebpush/Manifest b/dev-python/pywebpush/Manifest
index 33bdbd936..d491cc470 100644
--- a/dev-python/pywebpush/Manifest
+++ b/dev-python/pywebpush/Manifest
@@ -1,5 +1,3 @@
-DIST pywebpush-1.6.0.tar.gz 20890 BLAKE2B 38f2b360fec5d89f7b90a2e8e8269f4369d40b071dc2efbc7a9406acf11d9d1c6c9fd6d05a82acf173e173e62c31efc341e1d4b2e24394bb9bbe0c3b9ca7703d SHA512 d3d783a83c5dbbba91ec0ddbcb02b34d67a0d1383f8c519fe6dc115994b48a1211f5acb861af9f99240eed473bf70fdbe44bbb14383d9c8b8aae5c845356c704
 DIST pywebpush-1.9.2.tar.gz 22223 BLAKE2B 74be94c0db3c34d9bf9a67d2cb6c3d164624dfe36bc93ab5170a24776dfa553fbf86d41d78fbe60f401b6d33178e3ef9363a41f8d0bd3d2c305dd59db9344d43 SHA512 ab67db67afcdef85b3574a65c1c60cd77cd237a03c21a9ff676e39ea0658355648444b8a7bc861834d2e1d16f68f387c5fc0c84492679befef82694ae62e4b30
-EBUILD pywebpush-1.6.0.ebuild 676 BLAKE2B 3a0996b3f61b5b3d285d5ce14f9889816093f0770d864471868099538ea113a56a9c7f03669a45578c6529d8d317a6fdf2c377f017f35b5a0f45247a497d9d50 SHA512 90d7fcd861210ac0161664a1654921e9199b576bf37613cf8d80601ab4b215f344714e8e994f9b98c0fd8981bf512fc4a2532bdb625c6820839c7bea86044827
-EBUILD pywebpush-1.9.2.ebuild 683 BLAKE2B 831e3feb59c99c3c50fc885f9a14aab62aac0b6f31c90050035e0c25103b25ddc26a659ebc1bbc08c476871ffbf8b3eaa6e6dc12dedec11bffeea1dd952741f1 SHA512 2b67bf33e266b1de2d71625a8e64684b4e40bbcaa4331dc113d3a61e7d67ff046312d7adef8ad88edcd87a05c5cd049fa4ddee03bbe0f8671082d145441eaa7a
+EBUILD pywebpush-1.9.2.ebuild 682 BLAKE2B b5b2e5b649ca7b58b0a9288593cf9a456a19fdc36e4947ccd901ba4ec36391459b93f0f14d51c0cc71d485f4f862de4f235e6428b2dc017550bc20332b429e65 SHA512 802a9fbf845b408c8438c4585a9fda7697922f1df15e1a570c4e33fc107e3b47426b6d9ee3feab4a9f0918d04a18df58cef2a101867e997512e832af7e080200
 MISC metadata.xml 457 BLAKE2B 44ea576aa073a0b07370a643931db64a83ac4fdbd72a2404736fbdad8cffd4b76f6bbffcbf66028bb784260196f2cda689a140870cf1bcbeeb894a1e1d732b9a SHA512 d987bce16388491662f88ff8f1447a61860b0bef817032d1093ceb2481a9561aae582f0786d50a982c71c0e4650e3821d4030b0f17f3f6cd4a814c8925ee5320
diff --git a/dev-python/pywebpush/pywebpush-1.6.0.ebuild b/dev-python/pywebpush/pywebpush-1.6.0.ebuild
deleted file mode 100644
index 54ba97f31..000000000
--- a/dev-python/pywebpush/pywebpush-1.6.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{5,6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="WebPush publication library"
-HOMEPAGE="https://github.com/web-push-libs/pywebpush https://pypi.org/project/pywebpush/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MPL-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/pywebpush/pywebpush-1.9.2.ebuild b/dev-python/pywebpush/pywebpush-1.9.2.ebuild
index e2dd3d6e8..0ed91ebcf 100644
--- a/dev-python/pywebpush/pywebpush-1.9.2.ebuild
+++ b/dev-python/pywebpush/pywebpush-1.9.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/pyxeoma/Manifest b/dev-python/pyxeoma/Manifest
index dd84ef964..f44b351a6 100644
--- a/dev-python/pyxeoma/Manifest
+++ b/dev-python/pyxeoma/Manifest
@@ -1,5 +1,3 @@
-DIST pyxeoma-1.4.0.tar.gz 2298 BLAKE2B c74fe6c02469cd36cfa89db73a983bec696d3240a4bbf77de64f869ffc8fab532ef70db136504303ab5be74618150f77a3464fb1f184886ceaa85ca4ff33042e SHA512 8abe0f926762dd7a0a2d22064b7e1910249fdac0136d181c3c26f34bc2880414ae819c1df59ecb66e5b31988077c10d61f056f6a9bb9d6bc50b856a3b218fa32
 DIST pyxeoma-1.4.1.tar.gz 2314 BLAKE2B dd957e4c451c038060dbba7701f387b73046f43fe352b8b6b5630f9782b013a99c828556fb76ffff6f4da00d4f6c4427c33322766115e6cc9b9615c686b85ad6 SHA512 08be69f0944525adab5a823271bf342beeaa8d81bc4150df054a31187ad1b4cbff1cc206c0d6ab2d9dca510f597abbf3c7a825e7246247ae472aacf5fc326d96
-EBUILD pyxeoma-1.4.0.ebuild 673 BLAKE2B 296021ee70ec7747faa3388f286d10aaadec308a51f5767385c1e4616d91ecb6aea2cdf12766c8b80e2e30268c25c34b51e40eba0065f45ecd7b023e548d6754 SHA512 efc6843b5504be302ee4b06aa1f0d3012c47c1a19483434557a743feb912574c5ec6239c25ef4bd5ca8d7d4112b04978e85ea00b0ce977813ca399498693bb4c
-EBUILD pyxeoma-1.4.1.ebuild 680 BLAKE2B 69354a8d27ead825c123d9389f51496c8227d3d9222c0e112f6ac5299159c71734ec347631671e2c673225b2d619c673197992ee031cdbd5beb7c9b49c53325e SHA512 d2a6e191f146440f2809de81b68b791a7190cdb61235e71d8043100137a7e5b67c67564269010ce5421468d7e4ed86732463bfe427c8a01295fac934490125dd
+EBUILD pyxeoma-1.4.1.ebuild 679 BLAKE2B aa7bb57fbaea3b279b1a4601e3aad31d1dd6422e164d4ee8339816c36c6c813eb976faab53724b88c28691b10ade3684343ed1834e624df809ec5cf7883b87fc SHA512 6d8c0be7c85d23376e8e47096c3cafcad90a763c2582cd04404f0c4ceb2ee3f0fc70e787b32574c38fe9e7d3f2c3b6118f8b3167c5048716b94efbaf272889ff
 MISC metadata.xml 456 BLAKE2B 2282a07e9025b3bfce5c919ff3cfac3e7e8544f191fff1dcfa70704308aefb30c6c870e5fb4ba62aecc03065e74c19baea6a4194e08936b2355e76bbaea6319d SHA512 72d95410bd1258cf6010d58f68b42fd3a52d6ae7f7e029d4d864ab4fb6908b3146c3f07556e34e0263025b8cf5b32368f8304eaf98935e0795b039a8f049f3c2
diff --git a/dev-python/pyxeoma/pyxeoma-1.4.0.ebuild b/dev-python/pyxeoma/pyxeoma-1.4.0.ebuild
deleted file mode 100644
index 1a632e73c..000000000
--- a/dev-python/pyxeoma/pyxeoma-1.4.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{5,6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python wrapper for Xeoma web server API"
-HOMEPAGE="https://github.com/jeradM/pyxeoma https://pypi.org/project/pyxeoma/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/pyxeoma/pyxeoma-1.4.1.ebuild b/dev-python/pyxeoma/pyxeoma-1.4.1.ebuild
index 0a93f91ed..caa8679ac 100644
--- a/dev-python/pyxeoma/pyxeoma-1.4.1.ebuild
+++ b/dev-python/pyxeoma/pyxeoma-1.4.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/qnapstats/Manifest b/dev-python/qnapstats/Manifest
index b82cc9f1d..39063ab67 100644
--- a/dev-python/qnapstats/Manifest
+++ b/dev-python/qnapstats/Manifest
@@ -1,7 +1,5 @@
-DIST qnapstats-0.2.7.tar.gz 5924 BLAKE2B 53a29b560b4fbc273703f5a4ada286d64c6ed85a1c6eb38a525d87c8fcf308603e775307e60c9bb39ad872170a2d93b7738eafe67a457a2aa28610ecaceada4b SHA512 5b06e11033f9226660117d4b1c49b7ff0da817cf88b2718dbbaf45267b3ecda5285e2d752e022eb0b1ce9845e5794c5ab2ac58b322cb80b9f07ea40c2411bdd0
 DIST qnapstats-0.3.0.tar.gz 6003 BLAKE2B c1690665880f19e618804172ee8d60e96ea0f3abfcb46d031cff389b5944182759292287af999602c1955bb3a78215243a8bd76ca4348168d0c20dfcdc249d40 SHA512 6e7cef0eb6ed030a000a259c97a04ccbc29470bf089ee02399664e51fcf32fa76d06aa33110b9a09b8907d71a2e67f00c4df398edfb0f8f21fc8bfe9a7a04069
 DIST qnapstats-0.3.1.tar.gz 6313 BLAKE2B 7d0014d2d6fdbcd954131f0ba9e34d816e4f4218c99ab5f1166dd9a7d909eb3dfcc0380236775739e532447c3c90121eae1ba2c47fc94e66e91616a12793636e SHA512 d0d9bf04396d30975ee1ba935b4547a5bc8403f8813fa1279eb7f1e9689c0523b87b6161d23be9aff085f99b40c702935257c71951252c27bd1b3a4ea434f9e6
-EBUILD qnapstats-0.2.7.ebuild 695 BLAKE2B cfbc8b7a9023c21ddf0b4ca53f07c2065289a1d431119c86ee887d300ca7ca0178779afd66c9e22527ed63d1fc60d085c6aae47af31048c48716ee43a985bbb3 SHA512 21d6cb27fc78c7b0684e08b59773ac562758777b730b396f6ac61e51ad9f9bbe971ae0b22053e80ae794dcf991a974db048c89880a370092865942031ff72ebc
-EBUILD qnapstats-0.3.0.ebuild 702 BLAKE2B e73bd9d3381778ce60643554d8765266236b8a239c41900a5e811afffb602a869b80748614a7d3121aa06bdc7273c9a910e4c1fdfcb8498a2e02bdc1f9c77bd6 SHA512 55b108ee15afc942e26f417b7faa1868e40eaf4fdadbf878ccd6fb5dce98447849a41baf0a80305ee30812f5f3efa8a694e7000ac493d1060181288a284014a3
-EBUILD qnapstats-0.3.1.ebuild 804 BLAKE2B 1f8e6640b8c8c63378abeb1b583601db455c3fdf9fc534fef91769a4269deeff4d77b480190c8efaecfa29e65ca9b09685a64011c218f8c57ca140fea614008d SHA512 44d29b6be07bb90bc09eb1c799d7e30f9004ee30100642e9a2128e963a9528d7ca9b4946f3a7119210b830ad84dd83662d2ad01cd62446220f32964695c9afbd
+EBUILD qnapstats-0.3.0.ebuild 701 BLAKE2B 6e88f0dd9e64abfcf3d63573ce20c0d85396e564c7cab349c146861ab0a3234b86b78bd83a6d1cf747f048bfa4bc460f2dce6c05fb457296abfe28bb6cd663df SHA512 ef154ae461fb0074f36ca072c1f8e448555953d0178dab60ac2708726ec523542f3f8c05827df07c6836366d99382e587023993df30ce4cc50e20bed37b5bca0
+EBUILD qnapstats-0.3.1.ebuild 804 BLAKE2B b46c59b6c6e390f66c3da5486e2f0f49eaf2b5304dab9bf9567bf7ee983b7123d8d21987dcbea2483783ce2d5c0ef806942fdd5b6bb1f184a9097b5b90cf9eee SHA512 f8d8967b5a3ebeadcdddf13c6d8ef44f077f2f878734ffe5cded20263e007ec13e5732ddf446740abbe57891d90e448e4f68a9e9e0fd6287e341228753533049
 MISC metadata.xml 454 BLAKE2B 3868da783d02344f0497910b31ecf86a2f618450c8db6d201da21a3b32d76ca3ed99c84249a994c7b282f184e95e7f33eea96630b94264877111a1da42025e50 SHA512 1b239c2206123e8d6ea4dff800ba65b746f93d2fd7407a48dd7388c0c18b183b3c5a6909ede16dedad5cfdd6924c0d83cb6cb09064cdcf1dd8fffb81f21e58d1
diff --git a/dev-python/qnapstats/qnapstats-0.2.7.ebuild b/dev-python/qnapstats/qnapstats-0.2.7.ebuild
deleted file mode 100644
index 39c7ec37f..000000000
--- a/dev-python/qnapstats/qnapstats-0.2.7.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{5,6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python API for obtaining QNAP NAS system stats"
-HOMEPAGE="https://github.com/colinodell/python-qnapstats https://pypi.org/project/qnapstats/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/qnapstats/qnapstats-0.3.0.ebuild b/dev-python/qnapstats/qnapstats-0.3.0.ebuild
index 033851b76..e13f7ab2e 100644
--- a/dev-python/qnapstats/qnapstats-0.3.0.ebuild
+++ b/dev-python/qnapstats/qnapstats-0.3.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/qnapstats/qnapstats-0.3.1.ebuild b/dev-python/qnapstats/qnapstats-0.3.1.ebuild
index 2d6150206..1def2863f 100644
--- a/dev-python/qnapstats/qnapstats-0.3.1.ebuild
+++ b/dev-python/qnapstats/qnapstats-0.3.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/quantum-gateway/Manifest b/dev-python/quantum-gateway/Manifest
index 0e32deb9c..e1f69cc98 100644
--- a/dev-python/quantum-gateway/Manifest
+++ b/dev-python/quantum-gateway/Manifest
@@ -1,5 +1,3 @@
-DIST quantum-gateway-0.0.3.tar.gz 5230 BLAKE2B 24196b699d680d5eca5ac76d89b32b822cc16e8150148620ac78b7112765dbcdce725542bbab840576e7410143fe8c8ab8270e1dfebd37c9c4b59dfacc1077e6 SHA512 4a235a31c21ebd8f67388255db17386ff42d6c2ee2efe4b98963931b116b0a482cb2eb56a4bb29b6e560799c4443eca4f26a408c8e16129e49e99e2065709d90
 DIST quantum-gateway-0.0.5.tar.gz 5411 BLAKE2B 8ea15bbbb301fc15947b5c3fcb92afcbdfd5b6e19dc8af552815b1b84e2a808114b62783cdd1ce89f8dda2931171de05d6e16bb1ff62a7250eb512dbc585f18f SHA512 fc64e0c9dcd9c3be4d1c898d1b737414ba8b3bc76a3cbc379fddc52e58d8d7d2d8d88b1d9198ad71d571cdd219e853e0bf7e1f63a14c2774f53fb1e3c3af2243
-EBUILD quantum-gateway-0.0.3.ebuild 743 BLAKE2B 95872faa35bfd25d5002dc2465f6c3ddfe80458ca8d74e6b0c6c0df7379b93310dadeef26f9b47e182bb281b8a1db87301518017193b6da5dd0bbcb5c8da30f6 SHA512 46b79e24c5c5a6f00e7aa720658b8f0f0d44e6333f85394a1e43ac634ed8c28110f4a6c5c3640b5f6b7ca3b763be76b6332c79b13c1af7bd661bac791eeed51b
-EBUILD quantum-gateway-0.0.5.ebuild 750 BLAKE2B 366799a584d4b70682898c2bad1de315598a43dddee172014fc6eecf0573493ca877758e19cd584cf0befe7af2a406598aa366f620d20280aba597bb9d7cea26 SHA512 fc55313833b5bdde75364f4f12cd05b97552aee6fc4d11dd2e148c1f7aab2c68443e07ec788aa0ceed96aa0a5ef45f8574e9e1949d70649a8003bf5d2b93eea8
+EBUILD quantum-gateway-0.0.5.ebuild 749 BLAKE2B f0b3fe5973b382a61d4aca6cd1f955152b4ec94849292a2559b8b287df23a504d31547f1a51aea46f35194fc2617c8bcc21f2ccfbc023e579eb3eb3fd680d995 SHA512 b868ba53aca6ec3dca008c26bb66f2ad78116994877b136d67b54c47ff9fc128b4eefe79ad7e64905e11ffb3afe32980c22e5c6153916ebf6e1ed35ac6566529
 MISC metadata.xml 457 BLAKE2B d2aaef9499eae8992949e08c5debffb4b00108d054d1767c0dc552ad37ef76d43747aed4b8d1e5d0720922c543debf88701fe2d87417987a5a816c0d27e78404 SHA512 17d83bd2531d5f4eb2b6bc1396639e3badb0bad4734b037dd6b8c9f675020b9efb36777352a454d350f8d429849d0b320991e1aafe3ba0d3b1b8bb91887bfe1d
diff --git a/dev-python/quantum-gateway/quantum-gateway-0.0.3.ebuild b/dev-python/quantum-gateway/quantum-gateway-0.0.3.ebuild
deleted file mode 100644
index 36e8c6fc7..000000000
--- a/dev-python/quantum-gateway/quantum-gateway-0.0.3.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{5,6,7} )
-
-inherit distutils-r1
-
-MY_P=${PN/-/_}-${PV}
-
-DESCRIPTION="Query a Quantum Gateway"
-HOMEPAGE="https://github.com/cisasteelersfan/quantum_gateway https://pypi.org/project/quantum-gateway/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${MY_P}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-S=${WORKDIR}/${MY_P}
-
-RDEPEND=""
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/quantum-gateway/quantum-gateway-0.0.5.ebuild b/dev-python/quantum-gateway/quantum-gateway-0.0.5.ebuild
index 612ac7035..babfd602b 100644
--- a/dev-python/quantum-gateway/quantum-gateway-0.0.5.ebuild
+++ b/dev-python/quantum-gateway/quantum-gateway-0.0.5.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/raspihats/Manifest b/dev-python/raspihats/Manifest
index f3045a0a8..2ab9a98fc 100644
--- a/dev-python/raspihats/Manifest
+++ b/dev-python/raspihats/Manifest
@@ -1,5 +1,5 @@
 DIST raspihats-2.2.3.tar.gz 14765 BLAKE2B cd1bcffc6506f4a1968c5d1ebbc829425ebed3c900950954a952310a68405140edee63024d716523079a6535c1c7459d2a52edd97204a3d97867264b2332c4d1 SHA512 d4f898dab44ea4c37cdd6cd5f7a39d90a20702e3f060d12efb7428c4e22b2fc5cf32ad24d9e7360b11cb0ecf8883ec6252d7701bbdbf552eeec27d1ac083f22a
 DIST raspihats-2.3.0.tar.gz 17836 BLAKE2B 8d9ce78bd39f57418af6506abe6e78ab0fc43c641bffb79e3b0d7281369404db7c493cb7b4c0fd4921bb0ff0fb9e31a2bf9d7aa4b8d789ccc4f38febfdbf5edd SHA512 6a91a8e79fec91dc71101b337b4e34150820ef603b3645cac2b0b1b2446dc4c31c6b8f2b39e8e601162578d8b53c5bf0792809caeaa962522137581a49c50906
-EBUILD raspihats-2.2.3.ebuild 683 BLAKE2B 94aa3b181887cdbc2bb0e362bc1ad548149a4fd5aae050db95ffb3f33827e68005871d4d11b7bb1077374c4646a5a2c7f66d5952df471dea60ed3751871bc587 SHA512 5eec2f528ba4f84da7834be1439d7bf228cc4800673fa2965485112b7a40ca52e6fbc91dde8b178855db04620be37d1f79e41d9949785daffb8a7646da8086c1
-EBUILD raspihats-2.3.0.ebuild 692 BLAKE2B 79732cc68c56e46c576ad99d18a2370e894da5160a5292fc1ad0086c164af5515c4cd6859b225b21b7b996fe1e3941b8bf411c553f9f9392822afc9a76bd497c SHA512 d773abbc146000bbdc663842941d2a5b8df3910193313eec589c8bd235f07188bbfd0cee82dda29dbd4a48399865e82d01913a0915c7e37d7ad79f8c73807b9f
+EBUILD raspihats-2.2.3.ebuild 684 BLAKE2B d85b3c2b4dcce857f50969a72141830532fe0828757ffde27e134e27b01ac0b4fd90b665a3fd715cfd5a9dd76850096734f269887e4ccdef101213347b2441a4 SHA512 ac5f8c79d3309945c96c2cc751f68862242c590b467a9e24dc95f19908cc7e773d8d58b3e65b37df52a292e9a1ceca0df4411606805747e5595680c7d61b6e4c
+EBUILD raspihats-2.3.0.ebuild 691 BLAKE2B eec2e1fe10d1ea717a599e5bc66d6b8b7870fcf8f681d6ff337f5b388304eb32037d09491200d9cffc1df13ae46c72aff2b5d13f7a2481722b018477552afe24 SHA512 09c7f015ef925fec36d7277a1bec790cd1a5ca8caa7fe0ab051c2425fbf4da77b599c06593bee7894be2e40f9064d51370c1dfdeacfb2311573298fe6bfcdfde
 MISC metadata.xml 455 BLAKE2B 2004fc986257b5a3f680a9e4a1b34f4d9f70c6fbbf9a1bc864b2061e7cb2c6a9b795829eaa3c82dc7a40ba1f1d5b5c90128f09ea1bd1604f83b17b87f6ac1d86 SHA512 51f3e59d599d1b6bf040f679e0a40a0c6c324b37945ed66e991ea70ad5bf0c856d264cb133b69d81ca68ba63769278d8771217c20988da45657a78df0d6de7ee
diff --git a/dev-python/raspihats/raspihats-2.2.3.ebuild b/dev-python/raspihats/raspihats-2.2.3.ebuild
index 2468f2d03..8b9da5b04 100644
--- a/dev-python/raspihats/raspihats-2.2.3.ebuild
+++ b/dev-python/raspihats/raspihats-2.2.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/raspihats/raspihats-2.3.0.ebuild b/dev-python/raspihats/raspihats-2.3.0.ebuild
index d50a053b7..e4b52e367 100644
--- a/dev-python/raspihats/raspihats-2.3.0.ebuild
+++ b/dev-python/raspihats/raspihats-2.3.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/regenmaschine/Manifest b/dev-python/regenmaschine/Manifest
index 959c096d0..176a78497 100644
--- a/dev-python/regenmaschine/Manifest
+++ b/dev-python/regenmaschine/Manifest
@@ -1,11 +1,3 @@
-DIST regenmaschine-1.2.0.tar.gz 14325 BLAKE2B 112c635c292d30e7e83cbd85499412e9e5f281d254618385b9a6c35688a7782bcf784de3ccf363cf91557dc116b84588b9fa18554812fe816d612c38d58609b3 SHA512 729f628215699096a8270d62b812a8689dcda6ab6b1415e1b38626f0369f382f31912a25f66dbdbe3ca62051350fa2ab65c7037f8dafb87ed9dc726f32cc6817
-DIST regenmaschine-1.4.0.tar.gz 15836 BLAKE2B 631dacca32ad89ddb77ec4a7625428a2f60d0bbb5d97fc1c43829fa3ab9a93defa69d81ff802a56efc8cfb8a55f5bc74e9866c124a74469d5edeaa6bc10014f9 SHA512 860c8aa3a4aca227d63e71f0f9fa4331f018c19d955d60729d2d57dc1e63e9ad08c548485379c84c8dc9eb8d994036e040e1d7efe0e7c5a79dc7835f00f11ff1
-DIST regenmaschine-1.5.1.tar.gz 19240 BLAKE2B 5bbbd52d07779b03d0b97a07dd44dd8c2c334b7e66cfbea5c6b8c9c0b178a514a453dbd6587275726a09e159caa20eb7fb30f55c89a583366842f19a5ea6ca56 SHA512 6cb44418ce53cc586098d6ddf87ed9a767becbccac848237ddb92d0082fa24a14b96009af3c14ace4ec092f5681a6073d9ecd831068855620506d31474f44fa4
-DIST regenmaschine-2.1.0.tar.gz 13640 BLAKE2B 66fc128d329b62983fe2f6abd351f1341b745c329fc3d45bd4fcc083a8e986453c154cc6df2999f7a20f097b5dd219b094288cfb5051be7e4468af5722a7c842 SHA512 8b0e6b7d3bc841bf06a501440d8a6b35151da65db00d5cdd20a65c8152f45b9d32adf24b9dba8c1f3fa6f5e4b83f9b83f1f173e5b266d4e8f7c1472f7a6c744b
 DIST regenmaschine-3.0.0.tar.gz 13780 BLAKE2B 8f0eebef384e5cf324e00617057e6738c63f55e266d23017772e2c1bd94bf115e116ac95cf94d9ded72688b2d2d8ab8fb2b2e73d24ddfb28f66b7878a68a1c84 SHA512 b756ed68099a8e9e6b36ccac22646a237a09a3368e17b59ab9f4cd1f98a68c7b444f7230b247e6cfba51148a5890b214aaea344ace2e64de586352da60269ad7
-EBUILD regenmaschine-1.2.0.ebuild 696 BLAKE2B f95ae59d8ce7cd33df09b2b1c4b394beeec291f99db7f815ac61649372047fba520352c0bb0c868e2110dbc10276400a361786138623d1eb5e1e20a9bcd4af5c SHA512 2e11000bc3fe1c0ec6bcd402e57cb56a82b0bd7725c08ea395a59bc4833e137d53e938574b19750088e7d7dcfa934d418b1af7ffe00838609e688c1d1a35418d
-EBUILD regenmaschine-1.4.0.ebuild 696 BLAKE2B f95ae59d8ce7cd33df09b2b1c4b394beeec291f99db7f815ac61649372047fba520352c0bb0c868e2110dbc10276400a361786138623d1eb5e1e20a9bcd4af5c SHA512 2e11000bc3fe1c0ec6bcd402e57cb56a82b0bd7725c08ea395a59bc4833e137d53e938574b19750088e7d7dcfa934d418b1af7ffe00838609e688c1d1a35418d
-EBUILD regenmaschine-1.5.1.ebuild 703 BLAKE2B 7f198789a6fd8f1cb46e2b80e24c4aa31fb6d820df496f206565cf943039362671e81f8082f7653ce85aefeb86cfb66e3db4274713ce113c55bf17b6f6a2b17e SHA512 8e9bbcf768cc0f3a2dd01f69f9c8010e2671a08e58119acd1b5f2b3b4d4b4c114d503e1e74328fab72502ce2641c0b4ab504fbdb60c0cfc05774b3f449de0f90
-EBUILD regenmaschine-2.1.0.ebuild 746 BLAKE2B 8035f3e7c3b4484c93caf09f239604c97e2715938a41f82956d119b7384dd431d41b42a2da539349fef916543be7a34a65a065afa60cbe1a4fa0bab8424b7044 SHA512 573a02121c67cb7cac54102c579d96350f180c278e4dad18ffd1cbfdabbb6f0025b1d60aa4011d8eef78bd41ecb7fa1b83ccd3b8602f984f14fd243fd827b220
-EBUILD regenmaschine-3.0.0.ebuild 746 BLAKE2B 8035f3e7c3b4484c93caf09f239604c97e2715938a41f82956d119b7384dd431d41b42a2da539349fef916543be7a34a65a065afa60cbe1a4fa0bab8424b7044 SHA512 573a02121c67cb7cac54102c579d96350f180c278e4dad18ffd1cbfdabbb6f0025b1d60aa4011d8eef78bd41ecb7fa1b83ccd3b8602f984f14fd243fd827b220
+EBUILD regenmaschine-3.0.0.ebuild 746 BLAKE2B ff684e0ec444166666cc18ba6d6a5e0bd28e9e0fa6ccb208bc8cb703e83b8ff569510688199cef2661a6597626be37b45cdcdd6afeae91deb7203e0af144b574 SHA512 dcc2b624ca13b67992f68afa7170a91a120fd6119a633cb824266b14edf794d73eeb19da105c59d0c51f90d243025f3810eb555411e8bb6d0b91ac830099c12e
 MISC metadata.xml 456 BLAKE2B 4c51bd0fd739c1e6472bffb626697fbc630009ec15cad05b43195e53876e13bc21f9b21fd80ace806879848c07124b034082a35ea50d58f8000bc0faf95cfcfd SHA512 694961bbe134b4815868530ddf2d0d6fac422d777c4d0e483ba6fcae8fbc5f8ca54a3929bd17c5a1762ac13d5152579b4cdf40e59216ad97e682488d7d69b136
diff --git a/dev-python/regenmaschine/regenmaschine-1.2.0.ebuild b/dev-python/regenmaschine/regenmaschine-1.2.0.ebuild
deleted file mode 100644
index 371a83fc3..000000000
--- a/dev-python/regenmaschine/regenmaschine-1.2.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{5,6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="A simple API for RainMachine sprinkler controllers"
-HOMEPAGE="https://github.com/bachya/regenmaschine https://pypi.org/project/regenmaschine/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/regenmaschine/regenmaschine-1.4.0.ebuild b/dev-python/regenmaschine/regenmaschine-1.4.0.ebuild
deleted file mode 100644
index 371a83fc3..000000000
--- a/dev-python/regenmaschine/regenmaschine-1.4.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{5,6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="A simple API for RainMachine sprinkler controllers"
-HOMEPAGE="https://github.com/bachya/regenmaschine https://pypi.org/project/regenmaschine/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/regenmaschine/regenmaschine-1.5.1.ebuild b/dev-python/regenmaschine/regenmaschine-1.5.1.ebuild
deleted file mode 100644
index 2cc01a5f5..000000000
--- a/dev-python/regenmaschine/regenmaschine-1.5.1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit distutils-r1
-
-DESCRIPTION="A simple API for RainMachine sprinkler controllers"
-HOMEPAGE="https://github.com/bachya/regenmaschine https://pypi.org/project/regenmaschine/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/regenmaschine/regenmaschine-2.1.0.ebuild b/dev-python/regenmaschine/regenmaschine-2.1.0.ebuild
deleted file mode 100644
index c96f015fa..000000000
--- a/dev-python/regenmaschine/regenmaschine-2.1.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{6..8} )
-
-inherit distutils-r1
-
-DESCRIPTION="A simple API for RainMachine sprinkler controllers"
-HOMEPAGE="https://github.com/bachya/regenmaschine https://pypi.org/project/regenmaschine/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=">=dev-python/aiohttp-3.6.2[${PYTHON_USEDEP}]"
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/regenmaschine/regenmaschine-3.0.0.ebuild b/dev-python/regenmaschine/regenmaschine-3.0.0.ebuild
index c96f015fa..7724e8de1 100644
--- a/dev-python/regenmaschine/regenmaschine-3.0.0.ebuild
+++ b/dev-python/regenmaschine/regenmaschine-3.0.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{6..8} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/requests-futures/Manifest b/dev-python/requests-futures/Manifest
deleted file mode 100644
index 12ebaec26..000000000
--- a/dev-python/requests-futures/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST requests-futures-0.9.7.tar.gz 5571 BLAKE2B 63bdf088b7339fc4f5bc5af7ee3b0033edb29b2718c8ef135f2042cee118e461aa1a193408250dfc8207a55d165742c0535975b9b97b48cb8013a4dd16d38985 SHA512 02ca972bc2215d9e3f880125013746ea2b6f238d25f7aa519665be20e3fb3e2cd69b7d6605663c3bdaf9a1abe88f76553545f5895d9defef4616115b5963bdd2
-DIST requests-futures-1.0.0.tar.gz 10897 BLAKE2B deccf99ffecf3dd04eaaa7692b93b046b027109346555ca9b4172f29600615fb78bd46528c2ae925587d06f24e5b52dc2f02f5d5da04eda18cd97037e1b28440 SHA512 64b39ed99712df8f1be74b2de97500d89711c0d5d3ba0f2b64e3bab755d0bf82029d7ced13b755ce12a2b86f3b673305b651ba6ff4cfb60aed40c8d5876f202c
-EBUILD requests-futures-0.9.7.ebuild 736 BLAKE2B 34a8cff020be49dae694e2561ce3b2501e29cecfb9859ac8284432a51f8ff704caf4c86946cacdf881eb0806c640263b1d21dab62252bf764c2b8fd10153a7c4 SHA512 ed94d0b3d6677509635b1277ed2c8575a19a681706deadf4addc203247b0e572078b9017cc2ca8179772bb08cfb81ee012f7c8159e80a84c759b585c15c1f903
-EBUILD requests-futures-1.0.0.ebuild 745 BLAKE2B 58f8acc5a253c10db21dbccf7327c13119c4b0ee3998cdb1dccd7dcb941158ad93a65c64d9d1de71fb8492160fe85ec765a5d1cf5edcb0002abcb2aececb9bbd SHA512 6182768aebc58c1fe188477590e248e5193b6c24b1d57f100bf85872609a5271d5fcb29ed8a8a193d3302ea1a69cbb96dc619c4e6cf1c7fe92acf0708f792533
-MISC metadata.xml 460 BLAKE2B 8283854864b06f783e63da12eff260f1aeaf91f2405a00fd0cb13c5c4827947a97a1bd2e90da7eb402eb3a9702298afb29b196fae52c52448fe2c93d22078c44 SHA512 adf805d251147ae211bc9892d191f7ec93b6bbfb972c93b4ee6c74e3bf9993eb6aca36f59c9c60589623da3286dea759710ee2f66cf5ca34304f7cf22c3d8b4e
diff --git a/dev-python/requests-futures/metadata.xml b/dev-python/requests-futures/metadata.xml
deleted file mode 100644
index 4c5e7c3d1..000000000
--- a/dev-python/requests-futures/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>b@edevau.net</email>
-    <name>Andreas Billmeier</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="pypi">requests-futures</remote-id>
-    <maintainer status="unknown">
-      <email>rwmcfa1@neces.com</email>
-      <name>Ross McFarland</name>
-    </maintainer>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/requests-futures/requests-futures-0.9.7.ebuild b/dev-python/requests-futures/requests-futures-0.9.7.ebuild
deleted file mode 100644
index 678bc7388..000000000
--- a/dev-python/requests-futures/requests-futures-0.9.7.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Asynchronous Python HTTP for Humans."
-HOMEPAGE="https://github.com/ross/requests-futures https://pypi.org/project/requests-futures/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=">=dev-python/requests-1.2.0[${PYTHON_USEDEP}]"
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/requests-futures/requests-futures-1.0.0.ebuild b/dev-python/requests-futures/requests-futures-1.0.0.ebuild
deleted file mode 100644
index 18379c734..000000000
--- a/dev-python/requests-futures/requests-futures-1.0.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit distutils-r1
-
-DESCRIPTION="Asynchronous Python HTTP for Humans."
-HOMEPAGE="https://github.com/ross/requests-futures https://pypi.org/project/requests-futures/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=">=dev-python/requests-1.2.0[${PYTHON_USEDEP}]"
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/requests-mock/Manifest b/dev-python/requests-mock/Manifest
index bd0fd4250..744a9477a 100644
--- a/dev-python/requests-mock/Manifest
+++ b/dev-python/requests-mock/Manifest
@@ -1,5 +1,3 @@
-DIST requests-mock-1.6.0.tar.gz 50766 BLAKE2B c8a89e44926e5241e051038513f601352f2289fbe086fd623dd3b720d970eb47b0806b1738ff83bab00269f71ac9014ead68e0c2aeb9cd0e5b810221112cb2ae SHA512 0271fb55270541a9c0ee549fe1599f1bcc1dcd8fe10d51fb40858a331d13b4ffba2440745b2344f751ac8dd808ee0581b075fff2bfde46f1b57cf65b53e13a55
 DIST requests-mock-1.8.0.tar.gz 59794 BLAKE2B 2bdcd180ea793a02cf34eda356d90c0e338cec6f3fb718564026d28ea06ac975073f291be9cb685f012c803fdeca1fe29139537529e292b91a3356f0b781f97a SHA512 252bce965e0fca03cd5ce09912c726045f9c632e90bfee13b06c9f3e2c6b70eab7f39cf8e7efb3b7d2cf2b5d79cc5c5ba6e2379b3d48ce33bf78861ada911918
-EBUILD requests-mock-1.6.0.ebuild 695 BLAKE2B 5f8f63bb05bd575848a118dab6c49c8999183556220d3f206f631f550a784e0e968c96ecc18cce99bf921a5283fc519d7726a1f9d31163ba9e8028b2ccd5bbd3 SHA512 669637e16138bdb97edc3f8330a25fcb32499bd431e5b790f4bc9acb38b322d4d730c3055e62c0f88255e4c4ec14033250dad024febdb63ee44f272045b95b5c
-EBUILD requests-mock-1.8.0.ebuild 1085 BLAKE2B 1ce3259cc20c16f8c6a64d3819936d68af03533f68e38a721cbb235b2abe49ce9a3e3dda10c887f96a142f9afa2a7c358e5765f097d0d6a7b5b772621de9b38f SHA512 d4d95c16fb08301393fc5a2284a16b9417eaf28500a616ba20ec7d3edf462037ee80925738b7c9e6badf5195aa997331ddd01497d8cc00016b43cf12f5a318ec
-MISC metadata.xml 459 BLAKE2B 5c56141d4320f337b95ac9074aff604840afe635ead4defe5be58a97cb13e1dbbf6f4ccce440d9213e2250a3c3d6eafcbdfbe7c43ac99a45d576b3381785a7ea SHA512 4de152a050e0455a10e37f2e0d10426255c5223bc6d2506ea504f9a71a1fa1c62a93d01ea253522773d2f2e15d43a98841af4c03fa8ddd47135f37367a1512b2
+EBUILD requests-mock-1.8.0.ebuild 1307 BLAKE2B 4851278fd0b41ba8ea481aaef7591f26669a813b90389c77afde2b173b8d3700f63ca95490e2022d5c11a2cdec6b03369f74456030b9844b529812f04b2e97bb SHA512 87c27dcbf77b9ee465ca02f7401ccc481881079ffb2ebaeda8b208d894a62207a55b8356e6ebfa3317e6ea18aff9f74e3ec74905cc35076d72d9719ca5cc05c4
+MISC metadata.xml 478 BLAKE2B 73ae7388ccece263501b7b1b4b1953e2528cfa2287460aae4f9d4758dbb9a41ec38d6a00c45f74e87e4625243660ba530f85e37328ade1b88dbda55a20ea739d SHA512 5efc54aa7f3fda2909ddb82975cb6bd554ad90924075a22ecba41e50e4af8a70722ec9f69c7a588ba2cd01cf937d887a11f747bb0787f20976567423feaa5867
diff --git a/dev-python/requests-mock/metadata.xml b/dev-python/requests-mock/metadata.xml
index 4a12d76d4..ef5f17b47 100644
--- a/dev-python/requests-mock/metadata.xml
+++ b/dev-python/requests-mock/metadata.xml
@@ -1,15 +1,14 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>b@edevau.net</email>
-    <name>Andreas Billmeier</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="pypi">requests-mock</remote-id>
-    <maintainer status="unknown">
-      <email>jamielennox@gmail.com</email>
-      <name>Jamie Lennox</name>
-    </maintainer>
-  </upstream>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<stabilize-allarches/>
+	<upstream>
+		<remote-id type="pypi">requests-mock</remote-id>
+		<remote-id type="github">jamielennox/requests-mock</remote-id>
+		<bugs-to>https://github.com/jamielennox/requests-mock/issues</bugs-to>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/requests-mock/requests-mock-1.6.0.ebuild b/dev-python/requests-mock/requests-mock-1.6.0.ebuild
deleted file mode 100644
index b040a601a..000000000
--- a/dev-python/requests-mock/requests-mock-1.6.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{5,6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Mock out responses from the requests package"
-HOMEPAGE="https://requests-mock.readthedocs.io/ https://pypi.org/project/requests-mock/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/requests-mock/requests-mock-1.8.0.ebuild b/dev-python/requests-mock/requests-mock-1.8.0.ebuild
index 2df0bab64..fd467e031 100644
--- a/dev-python/requests-mock/requests-mock-1.8.0.ebuild
+++ b/dev-python/requests-mock/requests-mock-1.8.0.ebuild
@@ -1,9 +1,10 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="7"
+EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{8..9} )
+DISTUTILS_USE_SETUPTOOLS=bdepend
 
 inherit distutils-r1
 
@@ -13,14 +14,18 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 
-RDEPEND=">=dev-python/requests-1.1[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]"
-BDEPEND="	>=dev-python/pbr-0.8[${PYTHON_USEDEP}]
+RDEPEND="
+	>=dev-python/requests-2.3[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	>=dev-python/pbr-0.8[${PYTHON_USEDEP}]
 	test? (
 		dev-python/fixtures[${PYTHON_USEDEP}]
 		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
 		dev-python/testtools[${PYTHON_USEDEP}]
 	)
 "
@@ -29,9 +34,12 @@ distutils_enable_sphinx doc/source
 distutils_enable_tests unittest
 
 python_prepare_all() {
+	# Disable reno which only works inside a git repository
 	sed -i "s/'reno.sphinxext',//" doc/source/conf.py || die
+	# Remove the release notes section which requires reno
 	rm doc/source/release-notes.rst || die
 	sed -i '/^=============$/,/release-notes/d' doc/source/index.rst || die
+	# Disable a test which requires purl (not in the tree)
 	sed -i -e "/^import purl$/d" -e "s/test_with_purl/_&/" \
 		tests/test_adapter.py || die
 	distutils-r1_python_prepare_all
diff --git a/dev-python/ring-doorbell/Manifest b/dev-python/ring-doorbell/Manifest
index 0d07987d9..f1bcc019f 100644
--- a/dev-python/ring-doorbell/Manifest
+++ b/dev-python/ring-doorbell/Manifest
@@ -1,11 +1,3 @@
-DIST ring-doorbell-0.2.8.tar.gz 29386 BLAKE2B f6cfba04e0ceaf446e8da0a3ed42f4fe79f157fce0ec3e484f0c2199be67996db06f4516c3126b9ba899f2e2e4ece527dac54efc25f989b57a99ea1974b4fb86 SHA512 b2d1165ece27786bb14d0fd99ae120a05c48a0054058399d77c483eaf53cb28bacb4032b0b73a91dea06899d5b5dac7c0c303c73b2212cb171698d0d4aee926d
-DIST ring-doorbell-0.2.9.tar.gz 28428 BLAKE2B bbe25928b0c4a5bdab8c73de17f4efafc8863ae860fa498e9cf1521cc23f2c14c286424d2ab0f1aa52ed7f48d81ea1560010ebed4e08230bee287548a0649fd3 SHA512 3836be0bfc5dcaf1ccbb0a0e81eb531e2460c26bc365b1d282b7bf6dfaa41771fb4a5405f1b5b8d8924b6c6d363e85d00b9767230770e3336a6422df0f33e104
-DIST ring-doorbell-0.5.0.tar.gz 26845 BLAKE2B 47196591cd8d399b4726c7c80df245b6ab20096615459a6908c3a411f6485d05e87358e3f8198422c608f3d93d0d557345da346f096edb6292d4c4aaaf5cb45a SHA512 f082d240e848e16badd267731d4f99585789d76e25dd1eea314f453c1956e58eb7edca46273b70fc40caf52a80ecf8376a54b10a1087f0998fe00d05be39ae0e
-DIST ring-doorbell-0.6.0.tar.gz 26124 BLAKE2B cba42f262e1ff20ffeaa32ca76f3bc8520ad0e8080b3d63f774264030f7c1df22ecb3e95464f77ae188cf42d035d3863ff310d8e2cbb4ef11fc0f09513de94e7 SHA512 aafcb25c2360ea47e1863cfadb869276790a7d150722be2377cf722786fa6bdd04b368e0bb1ccba42082b536b01b766488497841417e0fd6b7323e2a0e8b86b8
 DIST ring-doorbell-0.6.2.tar.gz 27778 BLAKE2B ce784dab66275b71d83cb6dd063694ae6d24958642c884b3a54bdbaa953decb017ca3b183b76ee24b0c8d80c7082449141172476b17f64f22f14b8998456f61b SHA512 432fadf43459d746cea86d2eff98b254db6ea606167a0ff732c9362edea4f252e8a1a25e78ea0edf80c4ad29921d975f38841c1b878a02ff60381c760ea594ed
-EBUILD ring-doorbell-0.2.8.ebuild 877 BLAKE2B 60f523731dd76b47f9ea23d3a159edb739394e1d50fa58f2de21efe63f55d8f3d736e04135a083ac1254329f6cf49218eb7743bb5865098d47305e66ab8c65da SHA512 a98424c910e1ad01438819cdabdbe88ca22087cf1394daa82d2c1c475f8c22f71cba0eaf7e826e87e296f00f48cda0c16a76bc11d25374ca3e0b8cd3bdea6599
-EBUILD ring-doorbell-0.2.9.ebuild 890 BLAKE2B 266e31cfdf2e9a1f5e09d9da9bd49535ec69d6d75b0829394dff39cc4a80c5ce0c1ff002a61d32f5d1f5386a405491280749e067dac208bea6ed60c70a99bd05 SHA512 6aa12b439f2524ed8dc64cf9cdc50818f6eb14415df8e108d904634982de25ccd9a23e2a6e08cf7d84ad85bc19fdff6f8218df463281faff509b29451438b9f3
-EBUILD ring-doorbell-0.5.0.ebuild 877 BLAKE2B 60f523731dd76b47f9ea23d3a159edb739394e1d50fa58f2de21efe63f55d8f3d736e04135a083ac1254329f6cf49218eb7743bb5865098d47305e66ab8c65da SHA512 a98424c910e1ad01438819cdabdbe88ca22087cf1394daa82d2c1c475f8c22f71cba0eaf7e826e87e296f00f48cda0c16a76bc11d25374ca3e0b8cd3bdea6599
-EBUILD ring-doorbell-0.6.0.ebuild 886 BLAKE2B dfd28cb0aed433f4033666b899b8089f5970283d3cdc81fe9e692c1116aca427940551c353d592f55e36673e374db17431bbadc76701ffa6a31139249ae1fae0 SHA512 56072b6e0da8363e5aea22bd19542314896fcd3f863008adcf24e8da206eb987dbdd8b789d94b38790fd7e6ec9054f173ed47fe8a8a9c8b478fd5fc75615b636
-EBUILD ring-doorbell-0.6.2.ebuild 1006 BLAKE2B 225c7cd799e6c5a7c8efbbf5dd9eb8a3a49ccdf920ab5093f74efabaacca1f5668e71a5877f96c12a4a0703e877ae12e1293a61b6eb0b6025a4dd82554718f60 SHA512 921e5b93b55d5b280880d997c9d4bac677191c6838178a0ef007200ccd2a825331b39e797e299c0fa520532a64c49aeb8c2367087f0307194a3424f5a106116b
+EBUILD ring-doorbell-0.6.2.ebuild 1006 BLAKE2B 8f2ec40e146f4544aafe60f4474a16f92caad040d937df9a69fcb977f10fccaff59326c7850f4ff2d5bc8d8ad88d012b039a4a1ff6138acca07a061d1ede1b58 SHA512 dca9d5eb57619eea5559b76adb7ab70d1dc9c80d8fbd6df6bc541dc53a0b123b1463f6727a478026cdf5bcf142eda65653e9efc3a85a446ec4c18516b87884ac
 MISC metadata.xml 473 BLAKE2B f7e6bc1ce278b7792e6ac78c589af1c8acf1deb440143defa8ad0040d460c20325efc5da42df2aab2ae30ea8634444e72a3922cf7373d60a0bb7ccce5ab4296b SHA512 0b5daf3ee7f7e0a147d355f6459fe203330caf44902f94d1875485b5e4feccb619d0fb869226f1caa6839b0b1824fe495959c6b353a9ebe52c07f62870ca7d1b
diff --git a/dev-python/ring-doorbell/ring-doorbell-0.2.8.ebuild b/dev-python/ring-doorbell/ring-doorbell-0.2.8.ebuild
deleted file mode 100644
index 05c6b328c..000000000
--- a/dev-python/ring-doorbell/ring-doorbell-0.2.8.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit distutils-r1
-
-MY_PN=${PN/-/_}
-DESCRIPTION="A Python library to communicate with Ring Door Bell (https://ring.com/)"
-HOMEPAGE="https://github.com/tchellomello/python-ring-doorbell https://pypi.org/project/ring-doorbell/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND="dev-python/pytz[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]"
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/ring-doorbell/ring-doorbell-0.2.9.ebuild b/dev-python/ring-doorbell/ring-doorbell-0.2.9.ebuild
deleted file mode 100644
index 14d2ff05d..000000000
--- a/dev-python/ring-doorbell/ring-doorbell-0.2.9.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit distutils-r1
-
-MY_PN=${PN/-/_}
-DESCRIPTION="A Python library to communicate with Ring Door Bell (https://ring.com/)"
-HOMEPAGE="https://github.com/tchellomello/python-ring-doorbell https://pypi.org/project/ring-doorbell/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_PN}-${PV}.linux-x86_64.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND="dev-python/pytz[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]"
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/ring-doorbell/ring-doorbell-0.5.0.ebuild b/dev-python/ring-doorbell/ring-doorbell-0.5.0.ebuild
deleted file mode 100644
index 05c6b328c..000000000
--- a/dev-python/ring-doorbell/ring-doorbell-0.5.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit distutils-r1
-
-MY_PN=${PN/-/_}
-DESCRIPTION="A Python library to communicate with Ring Door Bell (https://ring.com/)"
-HOMEPAGE="https://github.com/tchellomello/python-ring-doorbell https://pypi.org/project/ring-doorbell/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND="dev-python/pytz[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]"
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/ring-doorbell/ring-doorbell-0.6.0.ebuild b/dev-python/ring-doorbell/ring-doorbell-0.6.0.ebuild
deleted file mode 100644
index 798958a31..000000000
--- a/dev-python/ring-doorbell/ring-doorbell-0.6.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit distutils-r1
-
-MY_PN=${PN/-/_}
-DESCRIPTION="A Python library to communicate with Ring Door Bell (https://ring.com/)"
-HOMEPAGE="https://github.com/tchellomello/python-ring-doorbell https://pypi.org/project/ring-doorbell/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND="dev-python/pytz[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]"
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/ring-doorbell/ring-doorbell-0.6.2.ebuild b/dev-python/ring-doorbell/ring-doorbell-0.6.2.ebuild
index 7b86b2f62..0fcc6cf88 100644
--- a/dev-python/ring-doorbell/ring-doorbell-0.6.2.ebuild
+++ b/dev-python/ring-doorbell/ring-doorbell-0.6.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{6..9} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/ritassist/Manifest b/dev-python/ritassist/Manifest
index e97dc0010..7d2ac4ccc 100644
--- a/dev-python/ritassist/Manifest
+++ b/dev-python/ritassist/Manifest
@@ -1,5 +1,5 @@
 DIST ritassist-0.9.2.tar.gz 5095 BLAKE2B 46a2604439af2bf8d5ad082680483f63c6006720a2cb5080b144ca79f10e889e7f8d948c23bbe0ea81ed2d78d62fa228f3aeb0ce4ae541f01596b14b51385831 SHA512 e0d3b0ea55ec31d8e15cdb52361817c98009bf51e4c2d39cae8fed7799d6e16c71988aa3a7c7bf899ae36e3fded7eb51b030de43540544d391f61abbf45b849e
 DIST ritassist-0.9.3.tar.gz 5379 BLAKE2B e7ae6e0942e9864468f72f3a5bee2ba771d11cf80041231cc4e3073218e7a4146df57a1eac81709c14feb2fea81b1941216bb1fb99068a616e4e05fea46a1f1c SHA512 38dcbb202930a498b42dc7090f9b41164d0c1ee6b4068a7f33c93c14359c122337e0863c9cbcb3fc32f1b1fd2a25e40ce86b7298b4bf09a998e12bf4440dfb73
-EBUILD ritassist-0.9.2.ebuild 771 BLAKE2B 74bf41b86201047daf2870e972fe70e31f34a1202afcebb6698db299e739692f9bc400d16ca644658e91594e488ecccd9ac69be60d70894ccf2e48052f79e597 SHA512 6ccc28e5f19fe72fe054a07193e671551a1919e52dedbfacbb27d19a1bf9dcbcdc3cd1d55ada9064e3bab3f1d92f63c490b14c4ec69a2f56759813eea57a53cf
-EBUILD ritassist-0.9.3.ebuild 780 BLAKE2B 6b4bfbe0d82ee184144c2691719f0d76d10253fe3104c06a55dfa3da6e7025cd14b9fe051470366a9c6b96afceed4c122287409fa21f6bad19ce21dcf3b33a07 SHA512 6c0a1869f086dce432136df6831d83a9a13f7e73d956b439c544e9404f3527254778002b36d6e023a1f2c2d0eec81f251e3ad073ba07d098b5c9ca0e6151af15
+EBUILD ritassist-0.9.2.ebuild 772 BLAKE2B 5a89a314e9cd23acdd89ee5958c606e8d9f8070ec89098a5e283fbdf0c602ca6e21efdb1413635db0861d778de8b76bb561694406236010e407e53ed4c97ada9 SHA512 4090fb00f9a79974769adb4aa12ba9453922da6c0844d4b58ffcf1a9016777c9f6712f8852887cf8c976f9638c2ec7917faa7c8261e76131f8ec7fbe6f31c3eb
+EBUILD ritassist-0.9.3.ebuild 779 BLAKE2B 5fba57a0413ac26c118135462c8d6017870947645f6c3a653ba33d66518a2da32c7b595a8051d3d8cf9b4364683a2c2cef17fd2bfd0b9a2f9feba86214c954ed SHA512 57e4b39948393f4c42b05755fba709117caf3c5a19d789707deb050e2ab28ea6140f7092a368ab20c67a58598e1c73a22c5f4a972161fb16f2145012fb4a18e0
 MISC metadata.xml 444 BLAKE2B 14372ea25def8f34315e5b9fbf3f008a09851cf45ce69ca08013774929e53b321727b1f9d957d96d0916cc25ab1b421f56559313082dd878cb4d452fcc476f3f SHA512 7e0c99c861e78dbcdb7370c22784a65cf44d0a5f4ef8cef6bdede3ec486605183c18bb3474f5f7f4814905d877633a7c4daf66dda4eda768f44c3d7428934830
diff --git a/dev-python/ritassist/ritassist-0.9.2.ebuild b/dev-python/ritassist/ritassist-0.9.2.ebuild
index 733cd7e5b..aa8e8edfa 100644
--- a/dev-python/ritassist/ritassist-0.9.2.ebuild
+++ b/dev-python/ritassist/ritassist-0.9.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/ritassist/ritassist-0.9.3.ebuild b/dev-python/ritassist/ritassist-0.9.3.ebuild
index a4aba6bcc..283270dd1 100644
--- a/dev-python/ritassist/ritassist-0.9.3.ebuild
+++ b/dev-python/ritassist/ritassist-0.9.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/rocketchat-API/Manifest b/dev-python/rocketchat-API/Manifest
index d6299d76b..28c24a78b 100644
--- a/dev-python/rocketchat-API/Manifest
+++ b/dev-python/rocketchat-API/Manifest
@@ -1,5 +1,5 @@
 DIST rocketchat-API-0.6.1.tar.gz 4980 BLAKE2B 190186b2ea9ce31727f7bee897b835211ec0bb03ae3ee911f88e13c707120efdfe26756cd083a6c829ee2ddf4544af698b16ddb2be73da47b95880423df7d244 SHA512 e2fffb7d33af705ce45ea9d192025311a8837d6fe7b0a6a11d1a05b3b4b5963d9cd3c584f3b129151ed74c94144c492d23dd38de83ca56216b21bcf198b6b957
 DIST rocketchat-API-0.6.35.tar.gz 55282 BLAKE2B 5264900c6ca300e1c6d820dbd7552d31e4bcc3c9c07af7e12a09848d3f61926fcd199f8bff3881b707c18f91190684902ef5d8c7a57f4a3f0863c0078bca5424 SHA512 f38d02dfb6d39903b8333d695ccd35534d45c8a15951b315affcd9342996b96835e4be284a8f8b62ea78910efa501fe9b31f16e0fb17baaf04fa6bdc6d0bbd96
-EBUILD rocketchat-API-0.6.1.ebuild 790 BLAKE2B fea2241eb8cb6c3670b92db5c58b151b1bfbaf147676ecad5f27b8077e3e9fb537670d64392e6b8a2a27a28869dc8ab5d6b68cb665089df3e8f2729f749cfd29 SHA512 1df4f9d0ede6b474c36c20b8d32415cfdf600b24006266c7f6532dc9a18ef40647cb727f5b169cc8013eb766d71a1119522493a440089b7a91e9c3110404fcd7
-EBUILD rocketchat-API-0.6.35.ebuild 793 BLAKE2B d15f619e8dc198f0a56b5fda8c0a3d32045e44f5d13ca9e3a7fd51dbb7cb9e7ef067b16cf19be83751a85c9429d75f66658b22da13e576dce2a427a8124e4c42 SHA512 4d672124017c5bf34d01514917f37e8cb60c17f3f4a5759b14ec904781fc798b137872f2b2577b5760a4d081a71bf29c3f85799cf7e13547959f7615545ad0cb
+EBUILD rocketchat-API-0.6.1.ebuild 791 BLAKE2B aa707f73ba3a6e4d26794a65bcd47fb1c027e9cba221fb50c592f5704dd8839a3e46801ae8f18304e0926d5597269844dff70d07e4941eefb3b44798acf03144 SHA512 ffb7cfc54120f4ec58a1d4476dc88fdfd290701165b2ff3a27e04c2176d36a218b70de235adb12268667c65ac70b72e133189651d48bb36a5a95f4b1446cb4f9
+EBUILD rocketchat-API-0.6.35.ebuild 792 BLAKE2B 76f80ccf71fd2b8e454f1603185912a4c5b622cbfc9605653a7431fd1f4006e57a7e73e53360b7a4e4403cba2f9c0857bd53a4e809a3b9ae64e5166686feefca SHA512 aa789834d754ad65abe4a1f48c944ae2c9a7ab873066e69b11c6f4dd256e672171a67f0bbb78de41598dab46192aa2c95a891e5679465017d0438d5155ba9760
 MISC metadata.xml 474 BLAKE2B f1275f73f8a3cae362ffe1739e0b1e5d93b8a3916c4e02808e6af3da46fa1454448a9ae760bfb94a93d7ca5b469440d6db7929c5616c6f2fc1a6e15e3d3bc7d1 SHA512 e84fdd83ceeaa4a89a37fedb231c99a42cfdd1349c8df191bb778e9f199e5a40749a9d0c54d4cd0129874b9679f79ab5efdfcf069d6d84193c3f2a7b9c10c520
diff --git a/dev-python/rocketchat-API/rocketchat-API-0.6.1.ebuild b/dev-python/rocketchat-API/rocketchat-API-0.6.1.ebuild
index dc59ddd09..c3470f061 100644
--- a/dev-python/rocketchat-API/rocketchat-API-0.6.1.ebuild
+++ b/dev-python/rocketchat-API/rocketchat-API-0.6.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/rocketchat-API/rocketchat-API-0.6.35.ebuild b/dev-python/rocketchat-API/rocketchat-API-0.6.35.ebuild
index 54ca4e3e1..71b3758f6 100644
--- a/dev-python/rocketchat-API/rocketchat-API-0.6.35.ebuild
+++ b/dev-python/rocketchat-API/rocketchat-API-0.6.35.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/roku/Manifest b/dev-python/roku/Manifest
deleted file mode 100644
index dea83a813..000000000
--- a/dev-python/roku/Manifest
+++ /dev/null
@@ -1,9 +0,0 @@
-DIST roku-3.0.tar.gz 12932 BLAKE2B 8113c65cc723f7ace068d6e3623e7509719931c94541fbdca12a946f63763898d2bca2ede85283a062721edbc09d0edbcab56b8928dea30a105309ba7c3ae140 SHA512 d9f88d0611f2d63d1d378b9c3cfa52077821ba9b91d08aac1ca47c6f9bd3d0a6d743d8a6f712e3d65730bfc8159b0fee96f15816959c49a929834c193ebf5c5c
-DIST roku-3.1.tar.gz 10382 BLAKE2B 6c9276eb34075841270bccc6c8f63691db95273cffd7d9c9a84cac0a9906007d174aaec94abf1e89df544015fdf3ef52fc283b5faab80b8f560c0762175faac2 SHA512 1c039864a00516bb176b12e30c13a6f63c496e99c012235b9380033a6c02f46e632ebc13ccaa56109efdee8fb7913d2d301c9dc137736552d231df719c4aa847
-DIST roku-4.0.0.tar.gz 12617 BLAKE2B 0e8dcbd41c54d70ef840c69fac39cf8ebb6a1bbf02a739531d2fe7551f194e3142df79af731e6f98a37589b8a2178af779eb222aaea732cc4917e1a3c9364147 SHA512 75c2fadf42bb452309b4bec7999737201a5d9b6c903d2aee0e63337c1669cb848ea8529949c440d6b0cf0dad094706c6a852ac3c87e803dbb852b8f3965fc27f
-DIST roku-4.1.0.tar.gz 13296 BLAKE2B d25931620c1bc2014cf6b9c816cde0a599d05b3f0fa4d8eec5237feb59ac3e83caece9b0d72f043aec09298d232b51c238caf4c544da8208c971fd29938d7e0d SHA512 8727c48bf0eb4190dd3dd2a173a135757ea41c563399f0c320633e4b99893d8e139637ca01359abdbe1306c929775a3096b759942174d2d63b428895e047ca2e
-EBUILD roku-3.0.ebuild 880 BLAKE2B 6c076bd464cc2f3e57d06e262e58234ff74f277ce285471136a4b7122f347bc7a9f89857719a002228d8a0646106430f2c47d2ecc12e775fcbb36b554fa9abfa SHA512 1fefcceb05c9a1609f8867cba0e1eef6456751d89d2df5be04b17ce5147e87e63f9e0805ec9e5426980ec7d6c3328419f05000b9816bec0abd5be6e8650e9b05
-EBUILD roku-3.1.ebuild 810 BLAKE2B 313d729ba4f91dced3242da3f06f68d490a2db2af22b323e0c59c0885141ea37e875ef0da6925e22b0af96e7a0c2d06f0aceb34d6652e1d444f777fd60f3836e SHA512 52f8917065eeab7f914595543b98ddd2b38483a5866518bf63bce1f56e390852fc91810f4adfc13a889520cbe9e1a2db53980f28147b9d3637304f1fd604823e
-EBUILD roku-4.0.0.ebuild 733 BLAKE2B e9e84b7add869d04844b90ed48ae508215cba2c9948bb22a34c79e64c4d5691c05edd4d84bf65bafa9fa4fc549184614fe53ab4b923d480d294708dd29e9060f SHA512 a735ad40b6f5321f92b75ff26d08ee9e0a4eeeac6e8ab8820c06019887ebe27bb8fc74f0116be965e4fd3e2e53d70469e5a1909daff9b911a4d7701a5c60d205
-EBUILD roku-4.1.0.ebuild 733 BLAKE2B e9e84b7add869d04844b90ed48ae508215cba2c9948bb22a34c79e64c4d5691c05edd4d84bf65bafa9fa4fc549184614fe53ab4b923d480d294708dd29e9060f SHA512 a735ad40b6f5321f92b75ff26d08ee9e0a4eeeac6e8ab8820c06019887ebe27bb8fc74f0116be965e4fd3e2e53d70469e5a1909daff9b911a4d7701a5c60d205
-MISC metadata.xml 451 BLAKE2B efba2c7fd4ca08723e81d4c730811e1e9515203f001479f9514ee7d4ed003debe6d7c9b1fae1f749c801c23c23a4aea4784b0937cc027faf956f31cc07a9ff2b SHA512 7eb5483da90fba67d60da98d915967de4f695697de76948fef28e995240b3e07843f59807fd94ccaf06282e0c19037044d66c8c22243defa5d97fa792f2e7bd0
diff --git a/dev-python/roku/metadata.xml b/dev-python/roku/metadata.xml
deleted file mode 100644
index 0d29d4330..000000000
--- a/dev-python/roku/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>b@edevau.net</email>
-    <name>Andreas Billmeier</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="pypi">roku</remote-id>
-    <maintainer status="unknown">
-      <email>jcarbaugh@gmail.com</email>
-      <name>Jeremy Carbaugh</name>
-    </maintainer>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/roku/roku-3.0.ebuild b/dev-python/roku/roku-3.0.ebuild
deleted file mode 100644
index 06473c88c..000000000
--- a/dev-python/roku/roku-3.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{5,6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Client for the Roku media player"
-HOMEPAGE="https://github.com/jcarbaugh/python-roku https://pypi.org/project/roku/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=">=dev-python/requests-2.10[${PYTHON_USEDEP}]
-		 <dev-python/requests-2.11[${PYTHON_USEDEP}]
-		 dev-python/six[${PYTHON_USEDEP}]
-		 >=dev-python/tox-2.3[${PYTHON_USEDEP}]
-		 <dev-python/tox-2.4[${PYTHON_USEDEP}]"
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/roku/roku-3.1.ebuild b/dev-python/roku/roku-3.1.ebuild
deleted file mode 100644
index 01e9cf27f..000000000
--- a/dev-python/roku/roku-3.1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{6..8} )
-
-inherit distutils-r1
-
-DESCRIPTION="Client for the Roku media player"
-HOMEPAGE="https://github.com/jcarbaugh/python-roku https://pypi.org/project/roku/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-DOCS="README.rst"
-
-RDEPEND="dev-python/requests[${PYTHON_USEDEP}]
-	>=dev-python/lxml-4.4.0[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]"
-BDEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/roku/roku-4.0.0.ebuild b/dev-python/roku/roku-4.0.0.ebuild
deleted file mode 100644
index ce4e16114..000000000
--- a/dev-python/roku/roku-4.0.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{6..8} )
-
-inherit distutils-r1
-
-DESCRIPTION="Client for the Roku media player"
-HOMEPAGE="https://github.com/jcarbaugh/python-roku https://pypi.org/project/roku/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-DOCS="README.rst"
-
-RDEPEND="dev-python/requests[${PYTHON_USEDEP}]"
-BDEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/roku/roku-4.1.0.ebuild b/dev-python/roku/roku-4.1.0.ebuild
deleted file mode 100644
index ce4e16114..000000000
--- a/dev-python/roku/roku-4.1.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{6..8} )
-
-inherit distutils-r1
-
-DESCRIPTION="Client for the Roku media player"
-HOMEPAGE="https://github.com/jcarbaugh/python-roku https://pypi.org/project/roku/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-DOCS="README.rst"
-
-RDEPEND="dev-python/requests[${PYTHON_USEDEP}]"
-BDEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/rsa/Manifest b/dev-python/rsa/Manifest
index 25f3a080f..39b9d0db2 100644
--- a/dev-python/rsa/Manifest
+++ b/dev-python/rsa/Manifest
@@ -1,6 +1,4 @@
 AUX rsa-3.2.3-CVE-2016-1494.patch 3843 BLAKE2B 94721282f4079aa0a77813dd8ad1c0aefd0924272d4e2b3e8a6ad745375bafb6b6fe5e50af621232df632a1f2261be097fde92b5ad3f57b74ff7976c22daa9bc SHA512 9150b25bc1a9dacc8eee0fb93d46b9d024c868d540097b9166be9a7879fe116d8fd47cacaaf5614b86cd44e7cd10602a0ad290eb2ef116539683101d4057a231
 DIST rsa-4.0.tar.gz 37385 BLAKE2B 2621ee732f15ea12283b723efb5e88847d3e030e8115bb4a3e986099fc94adc3409202d54b4350b0888deefd8dc801d8d3e57fef9e85f386ead53e4412da6d05 SHA512 e11106741cc4275246c986d39b3f028b5a4df6fbffdd08a78072ac3d3a9a7ade7a39789c504a2705f54d858a9bdbf03981251f32f9c45baba71e4a986e14b24e
-EBUILD rsa-4.0-r1.ebuild 741 BLAKE2B 502b6fcb7e779dcf58c9f578003d43bf1e678038590f1eb5eec05762e09e5f4779736168630bb3740fdfbc1157e5f608ee0cfbc188dcd56518648da2a50b70f1 SHA512 5ff506109d3baf660addc793a6a7e00811646ba19bdb39d025f76e5abfe01583b76ea851661221da6daeb882bc63e01141785074d2fecab425e05af68aa606c6
-EBUILD rsa-4.0-r2.ebuild 742 BLAKE2B 80b06ca574dda16dc1f30a585f50109f798f09a03956d3b1ff328b06b976bb0c07b6e50dad932e24638609afa97354a71bb387b9d20f003156d7df9189e484b1 SHA512 43e549101f1016926ffa5e8d85ad3ce42a8327e5c8d2be49309d85db741c3031420016a14b5f5233266d8ece16b682e2b470fb9accfd15517e4ab8e68e412ab5
-EBUILD rsa-4.0.ebuild 721 BLAKE2B 8ba52c5273a270a61f5680c4cb01d521c1de541bc7998ad220f97402ebdbd19b57d65a5c04ce6341ed1e8b4d328aae938c4d48101377ef59c22d5e1c406767d3 SHA512 36a5088306d930ef9aca24473e8441fc4c3c07af033dde2d9e994f4c8d5b718a57999be0d132de66f5c1512805438f80741cd9a736e0506daa3a7f07b94f2c5f
+EBUILD rsa-4.0-r2.ebuild 741 BLAKE2B cdcaf95f2b8f99da940287de24471f1cb1d76a0031183d2e05cecc9b8b677822b463df50e30d91bf744cdb63ea7c32a212864fdaa7053b6ee89e714e1a63a92b SHA512 42fe7d7113d594e3d1df2c93cb877d17840c677e2d1d76748d5d7fae9d8018338926d57233ac50505ee53872f5d2700bf94f2ea89cff5e8c8ce1d0e5f046f251
 MISC metadata.xml 316 BLAKE2B fd1e4f7bdee45f5ab99e67cc3918634b9ac5ecfad75167aad5f2ee33cea308f99d8d03aab5b5e0c01e8c1bf41ca8a45f67146c5126f84af4b6d914f58af0ea38 SHA512 4d8c48ae8e4360727f5c4b83e426f42a597a175dfa2a965c9f966e5824a83291c78d3e8e636d21b4f28d73f7e912abc7db1b09078baaa0e3a1b25713abd3d0a1
diff --git a/dev-python/rsa/rsa-4.0-r1.ebuild b/dev-python/rsa/rsa-4.0-r1.ebuild
deleted file mode 100644
index c8445eab8..000000000
--- a/dev-python/rsa/rsa-4.0-r1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit distutils-r1
-
-DESCRIPTION="Pure-Python RSA implementation"
-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"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND="
-	~dev-python/pyasn1-0.4.5[${PYTHON_USEDEP}]
-	dev-python/traceback2[${PYTHON_USEDEP}]
-	"
-DEPEND="${RDEPEND}
-	>=dev-python/setuptools-0.6.10[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/unittest2[${PYTHON_USEDEP}]
-		)
-	"
-
-python_test() {
-	nosetests --verbose || die
-}
diff --git a/dev-python/rsa/rsa-4.0-r2.ebuild b/dev-python/rsa/rsa-4.0-r2.ebuild
index 3cf319cc2..04deb3c05 100644
--- a/dev-python/rsa/rsa-4.0-r2.ebuild
+++ b/dev-python/rsa/rsa-4.0-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/rsa/rsa-4.0.ebuild b/dev-python/rsa/rsa-4.0.ebuild
deleted file mode 100644
index f1373dce4..000000000
--- a/dev-python/rsa/rsa-4.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
-
-inherit distutils-r1
-
-DESCRIPTION="Pure-Python RSA implementation"
-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"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE="test"
-
-RDEPEND="
-	~dev-python/pyasn1-0.4.5[${PYTHON_USEDEP}]
-	dev-python/traceback2[${PYTHON_USEDEP}]
-	"
-DEPEND="${RDEPEND}
-	>=dev-python/setuptools-0.6.10[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/unittest2[${PYTHON_USEDEP}]
-		)
-	"
-
-python_test() {
-	nosetests --verbose || die
-}
diff --git a/dev-python/s3transfer/Manifest b/dev-python/s3transfer/Manifest
index d46fc1a11..01c010293 100644
--- a/dev-python/s3transfer/Manifest
+++ b/dev-python/s3transfer/Manifest
@@ -1,7 +1,4 @@
 AUX s3transfer-0.1.13-tests.patch 753 BLAKE2B 7b168d35c9287eade9b9e1ca0393c625f742d1a698df9996f9ddbe6cb892128badb3a77dc9804e3bc9905d0982f240c3dd5021459e3d050a7647e279efd93491 SHA512 3fd66ae7574ee5263582006292a19a782aa3c2d4ebef00e005b02d1cb5192a99c36325114e49aa13ddc2fa1cb8604f65f87dcac8994b2845eaa45b409a5b8ff6
-DIST s3transfer-0.2.0.tar.gz 118361 BLAKE2B 0cb0a29e6dfa82762084396db1950a9e1baf4de1d9c8b9f0db3dbf1e274636f60a89ceb959d55cc22fe41c4ce175ab53f414c5c44f08624cc43f0d289f768863 SHA512 2e37a13da67cdabb49deeb177fd9f8d6393128e757e6c9bd93c99eb95a3edbd14736025e284f3173e8247d23239abae3700d894ba0d138f970ceaff748aa6e9e
 DIST s3transfer-0.2.1.tar.gz 119635 BLAKE2B f8978afb2ca367238392974dc98c0a2547cf95c42f0dcce627694dda5d34ff07c92db1b838ea4cbb111db921ac9f0ab2bee81eeca99827d0731cf77ea111d70e SHA512 1494436fa74ba6eee26e96fb0d448062acddf4c4179e56baaa47d62785218d9e91c5fb50b6641e488d0c84cbaab53bd552b4277bb873cd170904074e6509b0e9
-EBUILD s3transfer-0.2.0-r1.ebuild 926 BLAKE2B 94a5e862a3075697ca2d0a5735d985db22cbfc11a9523f73ec421f969fe43f53e962e5f6a2c77117cd202298a39f3bf77251da663a11db5f8efc6be253ad021d SHA512 23949948e312b4953ea97f754fb197623a24b16e5c929057c23c8468c16d6c1e2d2dfde8151c9f368ae430f7e888c87571d976cbea899d4b17192aaf79af19da
-EBUILD s3transfer-0.2.0.ebuild 960 BLAKE2B 176efd257934e7fc7c8d8ef464ead4cb442376bee5cf76f6b8b9ec15ad14ccac3b64085e654d231b1eb84d6cc342896772c716c0d4952cf8bc23bf9c149aa1b4 SHA512 177280ac22da025903bc938f564662b8366c7c833cc1d74454228f7e2ea41922a6e1f0c7f46f149843fd77a3ef6572f3f2d64f4a006be16d071cbf8bd762c9c4
-EBUILD s3transfer-0.2.1.ebuild 1008 BLAKE2B d3bbacb30af00ae38c3974b5587fe8da413d2ca44a5be0a7652e43402badb94137fa65c9f4bf28934b1742d66bb9da67b64580ecabaabbd44b343e641f1e9428 SHA512 402b110230e37c900f0a19aa8d452ebb439ddcf8163f0318c4bf197b950d217d200b224e7b29d5493a602e70916c9c48c24017819ad6349e0eb0492a1b983d6f
+EBUILD s3transfer-0.2.1.ebuild 1007 BLAKE2B 7d4c05a620ca1def110e23072a16ebba9624a40762c1d1ddeab85e85a1b23fb32c8ccc038e77b185743f30ceb9db29fc9202b3d2e13e45ebe85b1caab738be46 SHA512 525921163c27a13158a754c4f8f89c091765d3e97e6e245ee6e04a32bbf29bec6eb3e28b8119f74b661fe76572dd36a6d5912625b1fe7c41d95cd2a8c2da2c5c
 MISC metadata.xml 379 BLAKE2B 71ab13315921746f0b71ac09c3f7a5e4e182e4efc0dda7f0e9cd6fe2948f52eddde9b9fe7c117ced64f4e3f6646a2d15a1fd3630ab814b067a10dadd11448def SHA512 452e566006f5a6ec91765cdeb4fe75edbf890f3a8e495bca7d1db859a882109eecb252dca18f1d1e4dc970c62c7810b5e51cf1b5ab61553c76d4dc04e38bc5ee
diff --git a/dev-python/s3transfer/s3transfer-0.2.0-r1.ebuild b/dev-python/s3transfer/s3transfer-0.2.0-r1.ebuild
deleted file mode 100644
index 4c05c0233..000000000
--- a/dev-python/s3transfer/s3transfer-0.2.0-r1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{6,7} )
-inherit distutils-r1
-
-DESCRIPTION="An Amazon S3 Transfer Manager"
-HOMEPAGE="https://github.com/boto/s3transfer"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-CDEPEND="
-	dev-python/botocore[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep 'dev-python/futures[${PYTHON_USEDEP}]' 'python2_7')
-"
-# Pin mock to 1.3.0 if testing failures due to mock occur.
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		${CDEPEND}
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-	)
-"
-RDEPEND="${CDEPEND}"
-
-#PATCHES=( "${FILESDIR}/s3transfer-0.1.13-tests.patch" )
-python_test() {
-	nosetests -v tests/unit/ tests/functional/ || die "tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/s3transfer/s3transfer-0.2.0.ebuild b/dev-python/s3transfer/s3transfer-0.2.0.ebuild
deleted file mode 100644
index 86caae33e..000000000
--- a/dev-python/s3transfer/s3transfer-0.2.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 python3_4 python3_5 python3_6 python3_7 )
-inherit distutils-r1
-
-DESCRIPTION="An Amazon S3 Transfer Manager"
-HOMEPAGE="https://github.com/boto/s3transfer"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-CDEPEND="
-	dev-python/botocore[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep 'dev-python/futures[${PYTHON_USEDEP}]' 'python2_7')
-"
-# Pin mock to 1.3.0 if testing failures due to mock occur.
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		${CDEPEND}
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-	)
-"
-RDEPEND="${CDEPEND}"
-
-#PATCHES=( "${FILESDIR}/s3transfer-0.1.13-tests.patch" )
-python_test() {
-	nosetests -v tests/unit/ tests/functional/ || die "tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/s3transfer/s3transfer-0.2.1.ebuild b/dev-python/s3transfer/s3transfer-0.2.1.ebuild
index b71e3a49e..66d883560 100644
--- a/dev-python/s3transfer/s3transfer-0.2.1.ebuild
+++ b/dev-python/s3transfer/s3transfer-0.2.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{8..9} )
 inherit distutils-r1
 
 DESCRIPTION="An Amazon S3 Transfer Manager"
diff --git a/dev-python/sharp_aquos_rc/Manifest b/dev-python/sharp_aquos_rc/Manifest
index 33d8a0c06..541e0887e 100644
--- a/dev-python/sharp_aquos_rc/Manifest
+++ b/dev-python/sharp_aquos_rc/Manifest
@@ -1,5 +1,5 @@
 DIST sharp_aquos_rc-0.3.2.tar.gz 3417 BLAKE2B 2659af3e2b6999d69fc9ca05ba04a67aaad2a7db98d1d901f704f4f503e7b63dbcf3281cdd8ffde54ba0a2e52eacef070a95390669ae50820951fc6d4e7420a1 SHA512 91b62349a76a0b6dcbc81d6bc6ca958d549ace6c11d51d0964686d4654e8def3e7a5a1165ecc186ed95734f2a40aaaaae3e3090493669b3e5922742cd5fb82d6
 DIST sharp_aquos_rc-0.4.tar.gz 5204 BLAKE2B 72b74a1c9e7e0224136c9b1cc5d8db1bf77227c4ced6f17f02aafe195a0622fa44112c2fed095dd82caab69c07db6e1e1b9e405537245fc47021cd503b07f450 SHA512 3b765236c6422647c5e112c74f5eebfac3abe8c9bc7965168ed825618c8cfd445ea4a6d6b13c45a3c99525b88a647023931036ced9d4005753357739a2577fca
-EBUILD sharp_aquos_rc-0.3.2.ebuild 703 BLAKE2B 7b1de57380068efcaf5d2fec0846dfde929a3d7623395263a39f940cf144a1d201f7c7430318c2bfa67adf8d2af261bd0ca73541342984a3fb4e530ba7e0dc2b SHA512 dc25d2914e8d855545503e2da8785917d33f971a6d979e7f2470c165da5bcc43b458439d134f33554b0bfb98351f98148d426ccd2fa0dd3111e30e6027693487
-EBUILD sharp_aquos_rc-0.4.ebuild 712 BLAKE2B 62807ab634bd1cb44ade53ad01c433231152316e63efd380c1c8f3d684cf689916b26cb6e8db9d2b0aa7c2a379d3d9f43053563486a52a135fb50700a28e881c SHA512 cdf3ad84fd5a9f5bcaf827846f989c78e82df26d5fc095135e6fe49055ec25f575ddc15a335553ad51e4019450ac065d34832a2164b5754961581ddee4d10725
+EBUILD sharp_aquos_rc-0.3.2.ebuild 704 BLAKE2B 4a8e04d0b9d6624e16d0c4386fa8eb4b6f8fc6570081a7b7dbe346a2341ab52fc54cef4d0692dc9289bfa45b57be082aacb13c3082da8d6d77a6b689c5c41df6 SHA512 1f264f2ec04da335682936da9a87367aecbb650e76419f5852b8951c54bb5b9f936affda716c946b309742a11ee03355bf72e816f1d12792dafc03b0a0eb46eb
+EBUILD sharp_aquos_rc-0.4.ebuild 711 BLAKE2B f07807ffa99b1509763de14676727ceb0f961b63d3d8600644642720b1b9546a32f327b126f3874828843089357071bdc41ecc2c8984af4d9cb49629898af53a SHA512 a19383afe6b9631cc1f32024c7c33946fa4a346bb7445a88343fa0c604be792689f1c31ad0d766c57bd5945b5f96ab0c3837085fdbd31e5308dc19ce4ff7d505
 MISC metadata.xml 459 BLAKE2B 30f19421b496b91db6d40f7fdab83c8514aa3a5d8177ee72d6e29414541f0bce9c3ec58843522988b2412aa76408a9b82a8c475bdf99ec2d66bee2a7f5404af0 SHA512 12657ad6f2b8e21488bd1006e604eb8fc849a97c40adbbdeaaf9170b010a5f3685967fc8dfa680a43c9bfa03b650a2f3867530d34e7be841ffd28ba62bca3a36
diff --git a/dev-python/sharp_aquos_rc/sharp_aquos_rc-0.3.2.ebuild b/dev-python/sharp_aquos_rc/sharp_aquos_rc-0.3.2.ebuild
index 96f9d0c79..b4bc556f4 100644
--- a/dev-python/sharp_aquos_rc/sharp_aquos_rc-0.3.2.ebuild
+++ b/dev-python/sharp_aquos_rc/sharp_aquos_rc-0.3.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/sharp_aquos_rc/sharp_aquos_rc-0.4.ebuild b/dev-python/sharp_aquos_rc/sharp_aquos_rc-0.4.ebuild
index c07d111fa..71ddb2606 100644
--- a/dev-python/sharp_aquos_rc/sharp_aquos_rc-0.4.ebuild
+++ b/dev-python/sharp_aquos_rc/sharp_aquos_rc-0.4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/shodan/Manifest b/dev-python/shodan/Manifest
index 7340a7762..cf34edd7e 100644
--- a/dev-python/shodan/Manifest
+++ b/dev-python/shodan/Manifest
@@ -1,13 +1,3 @@
-DIST shodan-1.21.2.tar.gz 48809 BLAKE2B 837b9eb6c1d4b5930f5ea6b89739ee23e402d9079f5f3d8f37f485f051a83f08e0de86fb2d6a168f32722145704da3a9947a2f94d9dbc21c9ccb843c3321d379 SHA512 fcb2525b8b83546f7fe05d4ff07477fae7b57ba5a22e309185b9e0fc0d42f0d9f801b4c81e1c3c39b70e1faa754f9cc2bd1a94302e70794b90f544f651f95b89
-DIST shodan-1.21.3.tar.gz 50296 BLAKE2B d47a60c3e06082e24462836c456f82634d8809b06ae9cd067d78ec478e9ccf69b829fad508e3d77fd1ba1f57f25d197202a48b7e055edcb703bb6b7cfb1009e2 SHA512 64b30d977f1a210b43974b3bc9609a2ac352b21e9b50aa62c4871846e96c622c2e27a2e3f0df63fad5c678c9e0b29b38094a03debafed58bdfeb5cae1e0a911b
-DIST shodan-1.22.0.tar.gz 49000 BLAKE2B 073dc1117a706f54e2e5943afeef95d8c2468556fb1fa5243b75823d78213821d38841a08117598f701685a45799b344b21001256214950810c1027156ea6949 SHA512 600148fe3d468695e061cd79b739ffe7b5f280c4d638ea8f7ca7f8c1d3f08aade2d99014813e655286ddc1b671c156adfb0e8d28aaf115a377253161688df1ae
-DIST shodan-1.23.0.tar.gz 49457 BLAKE2B a4ffab4b71aa2f37d43137ee2c851b8bd717093d12a6e9f0aaea737848409934e21ea1202bc91fd39c1ff4667e0ec942f3fb78cd751935b5ae092daefe54d55c SHA512 79af2164e9fd61cd60ce01ac8874255322e89c0966a73ff2239036e76c1181b28e9f504fbf2db862cf881ee9a76cfe9a1501fe848939482fd9aea5ca9034cb64
-DIST shodan-1.24.0.tar.gz 50951 BLAKE2B 5b1e5cf609df768c21d98ee66efbc2724f96467932fb99f4a25f5a65c72cb7f090adba5246469f20649c7c80470760e8f98b4f2232e89f93646989a0e9709038 SHA512 f7e13626d5ddbd21687be4c638b755c5986d0fa36494d7684d83d64e592a196c4f1ffb80930b3fe0cfa5adfcedeb6b8d5e4cd338250ca67a45d2f0c5a6b759a2
 DIST shodan-1.25.0.tar.gz 51374 BLAKE2B 8068a02f7bb8ae91fd56c7b9a42b6b6c3195e689bf1f12e39fcd64b071fb1d6d6336f56b68a690e89a638ceecefdc4a9ec8b65561f529c62e334d80f10a2c479 SHA512 5a86e537ff5d74f1fa91a5b7591b939cfd73570961392bd4ea457a4e089a65bf601b890888c739bac292ed5b55478400cfdefc1fbcb748e3dfd2bb79f2d9bbce
-EBUILD shodan-1.21.2.ebuild 857 BLAKE2B 771794a262d14ef120a5dc22d926e5ecb3f981d68d5bdaaae9e7f4c3118a7d3691123113a8759f7e1c87ae4838c79da8fce2c66000f4b275bb104d9ed36a6845 SHA512 4d35c03f6202621c93b8fa589f327aeb0e24958870bbebd9aa3f3a78963e2b2e054fd111f173a6b352a9e8e5c91f2a3557c6c57232ef8d86964c5436816790fc
-EBUILD shodan-1.21.3.ebuild 866 BLAKE2B fafeceb73c54a686d5e7d6103e5b56c81d4d546054bd6019ecb944c28788bfd3c01c957c1e932f7b90faa3b6b9c5dc857b758c8511e10acfd78904d81c1f9210 SHA512 40a92fdf4971d89466bc79ee131e39089b33fa7242a3eb66957beab9ded779340cf570ae698febb5aeede770714a5a9178cee30185619b67c23e4e4b9b44d5d7
-EBUILD shodan-1.22.0.ebuild 866 BLAKE2B fafeceb73c54a686d5e7d6103e5b56c81d4d546054bd6019ecb944c28788bfd3c01c957c1e932f7b90faa3b6b9c5dc857b758c8511e10acfd78904d81c1f9210 SHA512 40a92fdf4971d89466bc79ee131e39089b33fa7242a3eb66957beab9ded779340cf570ae698febb5aeede770714a5a9178cee30185619b67c23e4e4b9b44d5d7
-EBUILD shodan-1.23.0.ebuild 866 BLAKE2B fafeceb73c54a686d5e7d6103e5b56c81d4d546054bd6019ecb944c28788bfd3c01c957c1e932f7b90faa3b6b9c5dc857b758c8511e10acfd78904d81c1f9210 SHA512 40a92fdf4971d89466bc79ee131e39089b33fa7242a3eb66957beab9ded779340cf570ae698febb5aeede770714a5a9178cee30185619b67c23e4e4b9b44d5d7
-EBUILD shodan-1.24.0.ebuild 902 BLAKE2B 4d384448caf1d134b7a51bf108b1dc3b40f5d77e856c2b5e511fda74107d4a1f42e0bbb25ddd98b0dcf942a54792a6758b202483113fd99dbb485895780e2c7b SHA512 068bae5e422bb33943c0832fc6e6f144905253744cf07f44a9286fd9ab875346930cbe9ec04f326e4b634bfe9dd332d2dfdf6e6d466ca3c1238dcdab1240c7f4
-EBUILD shodan-1.25.0.ebuild 902 BLAKE2B 7bffd1f44eaac7b9f33d08670cf6de42f6e628cf6507cd6b349daf245f7f5786d4e23ab1e4a3a8fff3824c8cc8ab881551e22a57b026bb5f9b59bdc8638ce135 SHA512 6718e1fe4da91f3356bf0ab7a7bdd870483c945af3be500006fabd3072534b6fb83e727ababab0845cec2609ee8863349b56ea0f9a4455989188236fd6d379af
+EBUILD shodan-1.25.0.ebuild 902 BLAKE2B 8d6d622d3f2936586bdd024a297300172a7a92328122b82cc769de82cbcad93ea2309e557fb8a90a9f50b0b0a3c1de0969474c0a835c151ab8c50dee83e317ce SHA512 afb5ed8b246ef7f1fd90f76fa524efad3a48e7d436cd71d34d74b94cdbd3cc6d0be61fc2f2d0263856a0a0b7d7dbeab8b623dfc1408aad889bd4a429e976162a
 MISC metadata.xml 447 BLAKE2B 2581c7f6bd7a31b7387145dfca7a0defb2880089ecee4ae4da33d3fbad255dd57d8464bcc98ddd693761c1123fb33bbd253b6625df3f92209a4833ea0312e8d5 SHA512 d726f28c5bbf92acb7741d79b97ca548dea743d0dd453a9cd1b1b90edc46d3b53e532664400eac94fb169e0ea316b2f2daa442399304d6089a5da1e324639252
diff --git a/dev-python/shodan/shodan-1.21.2.ebuild b/dev-python/shodan/shodan-1.21.2.ebuild
deleted file mode 100644
index 50c0dc6d4..000000000
--- a/dev-python/shodan/shodan-1.21.2.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python library and command-line utility for Shodan (https://developer.shodan.io)"
-HOMEPAGE="https://github.com/achillean/shodan-python/tree/master https://pypi.org/project/shodan/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=">=dev-python/requests-2.2.1[${PYTHON_USEDEP}]
-	dev-python/click[${PYTHON_USEDEP}]
-	dev-python/click-plugins[${PYTHON_USEDEP}]"
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/shodan/shodan-1.21.3.ebuild b/dev-python/shodan/shodan-1.21.3.ebuild
deleted file mode 100644
index a4b79c049..000000000
--- a/dev-python/shodan/shodan-1.21.3.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python library and command-line utility for Shodan (https://developer.shodan.io)"
-HOMEPAGE="https://github.com/achillean/shodan-python/tree/master https://pypi.org/project/shodan/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=">=dev-python/requests-2.2.1[${PYTHON_USEDEP}]
-	dev-python/click[${PYTHON_USEDEP}]
-	dev-python/click-plugins[${PYTHON_USEDEP}]"
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/shodan/shodan-1.22.0.ebuild b/dev-python/shodan/shodan-1.22.0.ebuild
deleted file mode 100644
index a4b79c049..000000000
--- a/dev-python/shodan/shodan-1.22.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python library and command-line utility for Shodan (https://developer.shodan.io)"
-HOMEPAGE="https://github.com/achillean/shodan-python/tree/master https://pypi.org/project/shodan/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=">=dev-python/requests-2.2.1[${PYTHON_USEDEP}]
-	dev-python/click[${PYTHON_USEDEP}]
-	dev-python/click-plugins[${PYTHON_USEDEP}]"
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/shodan/shodan-1.23.0.ebuild b/dev-python/shodan/shodan-1.23.0.ebuild
deleted file mode 100644
index a4b79c049..000000000
--- a/dev-python/shodan/shodan-1.23.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python library and command-line utility for Shodan (https://developer.shodan.io)"
-HOMEPAGE="https://github.com/achillean/shodan-python/tree/master https://pypi.org/project/shodan/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=">=dev-python/requests-2.2.1[${PYTHON_USEDEP}]
-	dev-python/click[${PYTHON_USEDEP}]
-	dev-python/click-plugins[${PYTHON_USEDEP}]"
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/shodan/shodan-1.24.0.ebuild b/dev-python/shodan/shodan-1.24.0.ebuild
deleted file mode 100644
index 8de15767f..000000000
--- a/dev-python/shodan/shodan-1.24.0.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{6..8} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python library and command-line utility for Shodan (https://developer.shodan.io)"
-HOMEPAGE="https://github.com/achillean/shodan-python/ https://pypi.org/project/shodan/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-DOCS="README.rst"
-
-RDEPEND=">=dev-python/requests-2.2.1[${PYTHON_USEDEP}]
-	dev-python/click[${PYTHON_USEDEP}]
-	dev-python/colorama[${PYTHON_USEDEP}]
-	dev-python/click-plugins[${PYTHON_USEDEP}]"
-BDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/shodan/shodan-1.25.0.ebuild b/dev-python/shodan/shodan-1.25.0.ebuild
index 9048e87bb..b7a0bca35 100644
--- a/dev-python/shodan/shodan-1.25.0.ebuild
+++ b/dev-python/shodan/shodan-1.25.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/skybellpy/Manifest b/dev-python/skybellpy/Manifest
index c25cdf88b..fd99976b9 100644
--- a/dev-python/skybellpy/Manifest
+++ b/dev-python/skybellpy/Manifest
@@ -1,9 +1,3 @@
-DIST skybellpy-0.4.0.tar.gz 12089 BLAKE2B b252d3fd8e08ec34e41f27afa5f4c21dcf9cb94988a89258e2a58f55244e0b86710ffe40a49a0e5aaa40d7fad4558e7c8a0dfed935f1a50055123488da2e9e56 SHA512 8bec84bcda53763191ed3e2f368a0d194eb194327279968bf64735a7514ce0bbbd2ecbe2f4d3dd5e660d373f391b0b5ad7143dadb7d9854f18ecfc1c212c0428
-DIST skybellpy-0.5.0.tar.gz 12094 BLAKE2B 965812b4a4782d3b0eb4034037c1a4aa875f9e470177710d2152b6ec451eadb44a4fdcb26ada7bc8268be6215560e7fc0f308f1f5453173eb7a646460bbf9978 SHA512 11385651caee78ca018c52eb5d3bf10bca26653c1256f9292e065a57b7a73b8c8a3402cae93a540dbd10277705a3ed512879f55a2ed793d88e273a746005d417
-DIST skybellpy-0.6.1.tar.gz 21002 BLAKE2B 3e32c504cd95e31c6a9a5530ebe019ec5f9e328be887895e2fea41b966f345c0f5b26765f75a1d1e30c81db29a44b78c3ac19b5922b561358f987db1190837f7 SHA512 87325a8578dcf0919f43e78d3e491cb2738771b572e3cc300646f8f1040534471660e623190fa119c3770df0220a6253c6ee66aeacbdb33dcbf9b8934968301a
 DIST skybellpy-0.6.3.tar.gz 21003 BLAKE2B 7eac10bd00c64ac5791a771fcd82d9a2a87884ea2dcd661701b5d4d1ddb5fd5d067a53888eaf6a9100d95c2acdfb51cdf78c15f1a9de315b0afccf7f4f799ca7 SHA512 8b3ef6cc625e03a41d2946338b067e09f527343db659d66ade940e042c11724493ad5d4cbf4d7772ae5706f24ab1eda3929c1806c683f60c888eaaf665451224
-EBUILD skybellpy-0.4.0.ebuild 810 BLAKE2B cfeeb8d1673a4ae8edebb4679a299dcf318d14970d7d5b341a3ad95d9502cf671f058837cfbc9403c433caed800e083c06a4c8a2ed2863f47f62f6e41e6f12ca SHA512 9513f4dcb1e11fb159c7cbf6ee5f72fd07c675aeaac5c1ede1c1a790c2cf67693ab4e53528331c8f41624588d3dd83fad05eeb08dec981bc88423fbb168a23bd
-EBUILD skybellpy-0.5.0.ebuild 819 BLAKE2B 67cd8e94ccd814d7a0541436d870e460d6b4ad996eef6e939ba4dc1de8e2b205c3772c1a4bc725c6dea0f10444cc98d41ecb05ae6337da678eb529ec3fc2e72f SHA512 6303fd179e9ea52b2d8dfb94e2ec4b83df35b54a8bdd0692ba1c3c3e82d53f16c58d79ae97645057ea340ec45db7435bac20ef55d68874263e34194ef40e091f
-EBUILD skybellpy-0.6.1.ebuild 902 BLAKE2B fde7ecde26d2c5d2794271743e363bf1d988dc887556144096f11387f0cfa626ea49757c9945801048ff1f55914bf7a099acaf743173044eee0082c17d2167cb SHA512 d87fb7acfcc4657772b03dbf13e8c27308a5ea86d9bbd57b51b26af9074da28519ae0116571241e99378adcdbc95e88ffa925066f339abc81d76bf97ee5af031
-EBUILD skybellpy-0.6.3.ebuild 850 BLAKE2B cbf173c435a90813817881ba7e18d6568b8f3b95fb60613e8056a71b2938e4f22e1182898d220d267ea48f4211235ead8d1f7fbda71e79fcf57ae9354b1cb8de SHA512 3c2208a90855d5924b5ceec456112e38604027913e81b1f4072ef81b39589312c34711c7046021ea18c4a26de43975209b5902d410e81d6412e6b31cb27c30b5
+EBUILD skybellpy-0.6.3.ebuild 849 BLAKE2B e908577f28dfda1d35e9c459b71bab1d69085baa0486a7f895d6f2be98d2f8e4dc878258d212e3124eb3e6e8b4fa2e8a0981a069391e97911ad35c4b3c4a3a43 SHA512 005f56043bf1fa11930affefaa3518565e9daa3392739854cfd0778cb68134c723b2846e47bb8b856895f7cfb1007a29d1a2f7c0239841c43240aea594092fb5
 MISC metadata.xml 452 BLAKE2B 472b257636c80e6719e86aad33782f198a2d879dde3467312bf05f568fda483dcb2befb3e2de1d0ae62cd481d1cbb8573d75db0da567c79784fc0eb223666f7c SHA512 bd55098562bb7299f602be319a6441cdaaf87fd3c4f9f8a082e3ebb54f6eae811e0b8a6fc73440b5cfcca96184d102cb542013f609f258f290098cc51e172c99
diff --git a/dev-python/skybellpy/skybellpy-0.4.0.ebuild b/dev-python/skybellpy/skybellpy-0.4.0.ebuild
deleted file mode 100644
index db68790ac..000000000
--- a/dev-python/skybellpy/skybellpy-0.4.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="An Skybell HD Python library running on Python 3."
-HOMEPAGE="https://github.com/MisterWil/skybellpy https://pypi.org/project/skybellpy/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=">=dev-python/requests-2[${PYTHON_USEDEP}]
-	<dev-python/requests-3[${PYTHON_USEDEP}]
-	dev-python/colorlog[${PYTHON_USEDEP}]"
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/skybellpy/skybellpy-0.5.0.ebuild b/dev-python/skybellpy/skybellpy-0.5.0.ebuild
deleted file mode 100644
index 5ba3ff9bf..000000000
--- a/dev-python/skybellpy/skybellpy-0.5.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit distutils-r1
-
-DESCRIPTION="An Skybell HD Python library running on Python 3."
-HOMEPAGE="https://github.com/MisterWil/skybellpy https://pypi.org/project/skybellpy/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=">=dev-python/requests-2[${PYTHON_USEDEP}]
-	<dev-python/requests-3[${PYTHON_USEDEP}]
-	dev-python/colorlog[${PYTHON_USEDEP}]"
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/skybellpy/skybellpy-0.6.1.ebuild b/dev-python/skybellpy/skybellpy-0.6.1.ebuild
deleted file mode 100644
index f36e9d98e..000000000
--- a/dev-python/skybellpy/skybellpy-0.6.1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit distutils-r1
-
-DESCRIPTION="An Skybell HD Python library running on Python 3."
-HOMEPAGE="https://github.com/MisterWil/skybellpy https://pypi.org/project/skybellpy/"
-#SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-SRC_URI="https://github.com/MisterWil/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=">=dev-python/requests-2[${PYTHON_USEDEP}]
-	<dev-python/requests-3[${PYTHON_USEDEP}]
-	dev-python/colorlog[${PYTHON_USEDEP}]"
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/skybellpy/skybellpy-0.6.3.ebuild b/dev-python/skybellpy/skybellpy-0.6.3.ebuild
index cd8521066..1fe4838d5 100644
--- a/dev-python/skybellpy/skybellpy-0.6.3.ebuild
+++ b/dev-python/skybellpy/skybellpy-0.6.3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/slacker/Manifest b/dev-python/slacker/Manifest
deleted file mode 100644
index 17d215fb7..000000000
--- a/dev-python/slacker/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-DIST slacker-0.12.0.tar.gz 9471 BLAKE2B 39aa20380fc012b05e089116efdb706962dee6e5369d35ea6c1671365ef64cc9acec20ff42bbbe833ccfcdb3e087043e01af9ac1e90fd33a348796a4e44009cd SHA512 ade79ee36bd4adeaa4c84cfa73ba4a5b9a5bc00ed4ce7356a96c656eb1720787c83102c5509f71652f8ec76ae167c7ee723d471f37762e0d9e46030805828e77
-DIST slacker-0.13.0.tar.gz 10073 BLAKE2B 95fcfc22de001758767d78d96bfdcee4e0e2f55b03441b57ef43bc0e6e0a85fb73e47237e8768db699ab26fb11a8dd2c94ca5167ef1b9b3f0878638f228d6258 SHA512 c951ffa3a7452d91f8f2ca0ba33a56a9a37beea7eb397353de26809bca5745cd349f3b277a30325c324798dd679a17f361fb97fdf8b380427092a9cd097e4a84
-DIST slacker-0.14.0.tar.gz 10116 BLAKE2B 7d0726b2af9b1f20d6e37b7ad429f94613cbb37e3c7ecf5665e545264cc9d0f9d4331be912f59bd2f361b0884e01edbc1efd9c9f7b17cd54682c467e7f176053 SHA512 cec0d04d43c6a9375d80be1b443491fe11587131cb061a5a2ae2d58377e932f9548faa84f9f9754bbaa42db5b5921b9d862416394d538caf951d35c1bbc0cf51
-EBUILD slacker-0.12.0.ebuild 654 BLAKE2B 2a0431c96ccf1ddd0ecb9c52bc56ae1ac506ec8dd7ee532a5b1cdf4086edb886b3169371a650cd2fff370b994a675db49072f300802bdf22d9e6b86c10451a17 SHA512 72a83be958ce45aabfc6661c8cf240b5c74ef1eda2c46c49e721329d176ca6a12d1fb4293f2d22cd41ee7a879dd69f3d35036f29cea664d61c5384d21bcea88d
-EBUILD slacker-0.13.0.ebuild 661 BLAKE2B 08626a07644fcd99ebd8f6a508a2e58dd682a72e4ea574f4c79e8c508c081e872124a9a8cf765019e957f4d8081e005b42fd45532cba156fc0fdbbd11b267e4b SHA512 9ea9d538732245fce26743b189d0c546d1f53ad5920bbdefed0d6511558b5aa83e5063123b7684d5ad95f5828cac71b4d126a281fd68c4827e411de15c93ee5c
-EBUILD slacker-0.14.0.ebuild 661 BLAKE2B 08626a07644fcd99ebd8f6a508a2e58dd682a72e4ea574f4c79e8c508c081e872124a9a8cf765019e957f4d8081e005b42fd45532cba156fc0fdbbd11b267e4b SHA512 9ea9d538732245fce26743b189d0c546d1f53ad5920bbdefed0d6511558b5aa83e5063123b7684d5ad95f5828cac71b4d126a281fd68c4827e411de15c93ee5c
-MISC metadata.xml 453 BLAKE2B ef41f2e491912b0aaf4a90c769d60131c406127607b57dceb96b3866c52adab98acec4b45310aa067501d63fca36e46bdd5fd9533bae877c0bec8ed17ef875aa SHA512 e966cba340501a5d31f6c2d26ac230c69ca1a163fb5e0ef3c1ead37a4ea421880a5cb4c1ed9e2b94785fea87cccdec472d0ef492a355c0e265ae0e797f1a2faa
diff --git a/dev-python/slacker/metadata.xml b/dev-python/slacker/metadata.xml
deleted file mode 100644
index 2fab0318e..000000000
--- a/dev-python/slacker/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>b@edevau.net</email>
-    <name>Andreas Billmeier</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="pypi">slacker</remote-id>
-    <maintainer status="unknown">
-      <email>oktaysancak@gmail.com</email>
-      <name>Oktay Sancak</name>
-    </maintainer>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/slacker/slacker-0.12.0.ebuild b/dev-python/slacker/slacker-0.12.0.ebuild
deleted file mode 100644
index 0f4d403de..000000000
--- a/dev-python/slacker/slacker-0.12.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{5,6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Slack API client"
-HOMEPAGE="https://github.com/os/slacker/ https://pypi.org/project/slacker/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/slacker/slacker-0.13.0.ebuild b/dev-python/slacker/slacker-0.13.0.ebuild
deleted file mode 100644
index 1bfae5b54..000000000
--- a/dev-python/slacker/slacker-0.13.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit distutils-r1
-
-DESCRIPTION="Slack API client"
-HOMEPAGE="https://github.com/os/slacker/ https://pypi.org/project/slacker/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/slacker/slacker-0.14.0.ebuild b/dev-python/slacker/slacker-0.14.0.ebuild
deleted file mode 100644
index 1bfae5b54..000000000
--- a/dev-python/slacker/slacker-0.14.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit distutils-r1
-
-DESCRIPTION="Slack API client"
-HOMEPAGE="https://github.com/os/slacker/ https://pypi.org/project/slacker/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/sleepyq/Manifest b/dev-python/sleepyq/Manifest
index 4fc04790e..e9b23007b 100644
--- a/dev-python/sleepyq/Manifest
+++ b/dev-python/sleepyq/Manifest
@@ -1,7 +1,3 @@
-DIST sleepyq-0.6.tar.gz 2881 BLAKE2B d801fd9c68124a48d0d801f46198828d4f945c932e71e3de08f6f4e56b6b4f4b0da0126b4b811e1391d174afbe33fe6ad405a512e171d9a0134009144f829ccf SHA512 b40c70a7d817db02f46d59ed265a982d6728eb9530a29638ff45238bc47129a491b1844db05c3a10c3fd5a9cbc7d699cfd8b2212f3bf663073ad12e5dff27c25
-DIST sleepyq-0.7.tar.gz 4430 BLAKE2B 3f6d0bd2e6696dd4e612f946d5e79e12ec3f8aa828c130b116a6cb73da5f461500693a6569d80bda1cfdb4fddeaa777c6da685b5ce15ec5224a56cc25c1661e7 SHA512 d0eb703dbe2f94bc201f3387595e5431a77a08342a7ba3f20bb632284a377257d79bcccc419c1fd048185822d574087fc55d694e07748360791da0f672bcf86b
 DIST sleepyq-0.8.1.tar.gz 5165 BLAKE2B c801d7de62176fdd798eebbd622d1b2e28989b4c90216602a084ac51c16dbb668b6d305571aee2d1ed839f5fb701c6abbcaec5ed8fcd6f370468c1962846b58c SHA512 3d63bd237e61587c6ecb4d7a597c445ab79d46551fc5d6073f9aadbccfb5aa857383bc2f8fbe6a9f368ed9cc1ebaa63f929239577d5613efa84335be8a332d35
-EBUILD sleepyq-0.6.ebuild 666 BLAKE2B 5e98e3452c6d23105d044268363a5fe9cb4ebbb53f7cc6ee2484b065df7fd53b54b3888f7dd949859f95b3280ed8928a41cc12cce78cedfb60ee2cf80beb9750 SHA512 b8973db8a91327a5b8490e430e0cdc9069f46626c03f5090f56d6ade3398abe4169d42d2fbf65486a826ac24ab8d818a278798c2e68de1ee1dd357cb36418ff8
-EBUILD sleepyq-0.7.ebuild 673 BLAKE2B 28355ccdb70212a1382255889976c2187fe417fabbc8900aeca1e6dff8b44050881b3606030b7c688818ffaa88ee0bd65d303c29a0ec4be8477234299148acce SHA512 084ed19520c885c5d1d97d50dac35f22756d7783600660340a1983c52247599cddb36cd6e7befedc1293bcd02572225dca74f5120ccf8a45c66c8d9359492605
-EBUILD sleepyq-0.8.1.ebuild 759 BLAKE2B da3fca530fd52138d28c7c0f6e0390bc80d7d213d3807f67719e7f5a97c22a3db6aa972a52da45bdfb0b65c5d30448d627d95a49b2159e83e25c22569e729edc SHA512 42e5af8308f9a0218a54a4e0a28c04edbc4fa36c943ebeadc8584faa7ffaaccb20566c9d66d876f5306b1d2e10c101714aafd4897dcd124fea451c481fe659fc
+EBUILD sleepyq-0.8.1.ebuild 759 BLAKE2B e81c6774559b94696a124cd415f42f923668d4a8fe97f4f023d001acac952c24690a6c5af353924e947d5514d828a6a8891e417620f911b9b656122ea3423675 SHA512 62bdbbb24be05d9bfa7bad403ec4026887f626713490cc79b9465014f43303293d496db1fa23822da2e502d18dfbf2e9bb1ace379f7c4f9edf5722a23cef8f57
 MISC metadata.xml 457 BLAKE2B 54d81f21388967e3e5d2db4bc77cf1e8175df8b56008ea635b09222a62a2ff4114c66d401c9cb8d5171750e603285f8c86ae2b4dcb9c9c8c9a4e8c0aa9393261 SHA512 ed5218bf4fa8cb0b07b2bff92088923a49ebc27d34e86032a441c411204cccf82ade222f297d1564f95428b244d767cf28b63bcdd81ae3e4e774bb585ed4dec9
diff --git a/dev-python/sleepyq/sleepyq-0.6.ebuild b/dev-python/sleepyq/sleepyq-0.6.ebuild
deleted file mode 100644
index 27f88ae23..000000000
--- a/dev-python/sleepyq/sleepyq-0.6.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{5,6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="SleepIQ API for Python"
-HOMEPAGE="https://github.com/technicalpickles/sleepyq https://pypi.org/project/sleepyq/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/sleepyq/sleepyq-0.7.ebuild b/dev-python/sleepyq/sleepyq-0.7.ebuild
deleted file mode 100644
index 46270ae3a..000000000
--- a/dev-python/sleepyq/sleepyq-0.7.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit distutils-r1
-
-DESCRIPTION="SleepIQ API for Python"
-HOMEPAGE="https://github.com/technicalpickles/sleepyq https://pypi.org/project/sleepyq/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/sleepyq/sleepyq-0.8.1.ebuild b/dev-python/sleepyq/sleepyq-0.8.1.ebuild
index 2f39a93d7..9c02c8cd6 100644
--- a/dev-python/sleepyq/sleepyq-0.8.1.ebuild
+++ b/dev-python/sleepyq/sleepyq-0.8.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{6..8} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/snapcast/Manifest b/dev-python/snapcast/Manifest
index 1e090358a..9acb09080 100644
--- a/dev-python/snapcast/Manifest
+++ b/dev-python/snapcast/Manifest
@@ -1,11 +1,7 @@
-DIST snapcast-2.0.10.tar.gz 8512 BLAKE2B e464730292e40720e8a5e01791048fb95198aedd73e992d5458ae06b4e1ee2e91160b8d777a9178620c0257ba546e97dfa2247fe02b9141fba061417e07a7578 SHA512 41a5be823d4baa46b6c1f1f57ad7d1bd7b3ba6054ef2724c3256d31dff3fb10d0a1cbb72f0d9ff92f2ee8ecf9ebaa97af6c619e8946253132aedd5d4cc5b7ccb
-DIST snapcast-2.0.9.tar.gz 8461 BLAKE2B cf3a0b6d50369abe31c29aab9cc5352a5619361a57e5ab8a94324d0e59cd8785ea1fc9a5d7c9cd6975cea5ff7cc1ad7438bac02b9146b18c1546ad06dadf07f6 SHA512 00b9b05f07831424d46efdd26e842ae486f65849f07ca89004a89ab59db7f18df1b04fe1c9c250646252ce434533a1aa6c3d34f2c81c80e968c5f75925b73eb7
 DIST snapcast-2.1.1.tar.gz 8726 BLAKE2B 688e51c714df9489c618339cf5b7c8fa1d2e0839f75a0a1d34b58845fc16883f722b89bd0f35f944b0b86cc19ff3e429998ad6adde4e42f43469df2db314c763 SHA512 6f912a41452b727c2d5b3d19a0732730088bbca055825a1097d119f4c2b25b14a3216087e0d485658950bb8f74cc41f489e372e2eb5f3bb064425da2f3d4d65a
 DIST snapcast-2.1.2.tar.gz 9225 BLAKE2B 04c5b67710e3da7b908cc30af5c212b9856a2d9393f6299f5fb03ef706013629615a2ab8d8839628b31a720849b6054a4fb4f812833849173c4cb54cf245270f SHA512 c282c1fe8bac2cdcd6a1ccb69e31b3fe430f0eb93e9da30a5ebb3838699101ffbfff5dde2264405e58397ba7cb69e0a2c230c83cbeacf42180de212bd0200b82
 DIST snapcast-2.1.3.tar.gz 9259 BLAKE2B 12e22f616f2d2c03e32da234bf28dd0d7605cdc96e7cb124f8aa1a0de7b210c36f6879d19dfe442f4ae95569859567c4f41d4d6e491895e91e4e82ee4b72726b SHA512 f55a4620e891f60ccc8293b2f397dd6ff148fb49cd6db3971b4bb0ceae0194244131b7d3f1555a2075d64af93b8e5beb0aeb1f3650bee886b2ad46587e2541d0
-EBUILD snapcast-2.0.10.ebuild 725 BLAKE2B 96637223b4ca8541c0c3bcd4fee6d644e861b2330d55f9800101beebc5dcbaf43b2022d92d3109624126f95e65df0ddb8fc895697ce1365dfc2b89501ed7f5e6 SHA512 4c27d50ad2a566d2ebe28c0e7098c10913c4252eb120bd0fee905970fe2f71d70f48609f1046374d579872a6923208adea832f1d4eb8403cad97650523e19a6a
-EBUILD snapcast-2.0.9.ebuild 718 BLAKE2B fb6b747e9cfc44f42646900a5b31452be6af67a15c0027167ba79d9c7225cffef96a5a4588342a6a13ca79d9221048283fb53f2f8bfb48f441652ac519fbaf43 SHA512 9a5fd4f42398aeab303d53d3da71973abdc054f093f5e59b228ea69996da9f41c3c63aef645a6acf92f07818f2a9b773263c3ca65a2207ba59ac926328a7d432
-EBUILD snapcast-2.1.1.ebuild 725 BLAKE2B 0daa522865b14b173bf4bb21a588907feb3540135f50a50d046beec78b612171b8bebb866b0b091b4c4cb2030294987a633a0bcf36a49136e674fdc9b74a1eeb SHA512 db68fcbcf1be32f0378d42a78fbcaa483c48c60babc493b3d12106f5b35f0dc4507a4567337218fecd1c00888b4099dee2c04639b320531052d4510b76f21da4
-EBUILD snapcast-2.1.2.ebuild 722 BLAKE2B 5e2f3185d97143d46e700f0ad5127f34d76dcf243370967a69a3c4a27eadba5f32e2fe2954e55f7fb46c982cefab5c1607a893c0e36ec1327c5c5b7f4ac94bf0 SHA512 7a6b13fa5ca5ff95bc8145343040927bd2595891fa3fa86bd754ba52edb89451fde02bf5cae19c1e918a16b3b8a958906255a60c3c6ceab6d0ecdb4db2d65201
-EBUILD snapcast-2.1.3.ebuild 732 BLAKE2B 172d486eca45db7a0ff7e466da635f13b5320ea6cc15e6bb0c7c97c771b424f36e60fc5d144bed8f0cfff5b7769b6340f7d7e0fe766560953155ea38f6954302 SHA512 d76a36e46ec097a7b4d296fa6585dce1b8627763e203e2393e249dbef89dfd66e9a4c35dfbeec71ffc19b2ae5c353d9a588bc0797fe6e8553b531f65d41e9126
+EBUILD snapcast-2.1.1.ebuild 725 BLAKE2B 37c2ccbbf5d2f84536802ecb45089982bf7905dc09464ea6dd97002813e7b17f53091c4a26ced79897c60f11e33ef4989fe5c7558d5a525d9555c8c4072920a2 SHA512 b0147440a777cbb331af1d9144685a61a809d80eafd82eadf9a5e156d1a8ef0953d4c93f78b3a609bd6de025c04407b85f60b375aa646425591773d78f2ca976
+EBUILD snapcast-2.1.2.ebuild 722 BLAKE2B 76dd037369b6ad83a8ee8bba245e7a8397f70110367ac1371f1592b6374a086e25329988af6e99da14f1816209e776d3529628952121ac0b9e12c115cd56267f SHA512 fa61c0b22d4905bb2736b5d2e161cc17da3d97e60b34bd4c7cbe8647142df8e42c9f85b9f9ddb919a760f5b18ed0655b36215458e96c6ae2cef21d605f566c49
+EBUILD snapcast-2.1.3.ebuild 732 BLAKE2B fcb130db7017999ba32bf05e059110049deb34e6bd0313a36334e7737401b34111638e34516c85b63f320e3c4b4f07dc47b9ca11257b2c024a2b7797e9e8b456 SHA512 aad49af367c4b7f69fa73be4480f959a973fb3071b0f6bd3c07dd34930450909e20052d1e5e2afbb6d450c79293146be76d09f565008aa4cec77898f226c2530
 MISC metadata.xml 457 BLAKE2B 9c0139e1df1f268d47a7c9c68f140dba7bf375c5ab7f32f43265f8c054a8213d30dcd1c2b161358f9eeda9663c9fe2398a75f0f4e1d4799f5d431314f69438ad SHA512 e9f42b8e06251b5fdfc3ebfdce72c2ab09ed43cc8ff998f4d5af0cb3a0043e15ad7a305b98c81f5a0e769ef7b2d2843f45312d0c32175496829d31635e9a7e78
diff --git a/dev-python/snapcast/snapcast-2.0.10.ebuild b/dev-python/snapcast/snapcast-2.0.10.ebuild
deleted file mode 100644
index 265809e8a..000000000
--- a/dev-python/snapcast/snapcast-2.0.10.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit distutils-r1
-
-DESCRIPTION="Control Snapcast."
-HOMEPAGE="https://github.com/happyleavesaoc/python-snapcast/ https://pypi.org/project/snapcast/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-		>=dev-python/construct-2.5.2[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/snapcast/snapcast-2.0.9.ebuild b/dev-python/snapcast/snapcast-2.0.9.ebuild
deleted file mode 100644
index a5482ce8c..000000000
--- a/dev-python/snapcast/snapcast-2.0.9.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{5,6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Control Snapcast."
-HOMEPAGE="https://github.com/happyleavesaoc/python-snapcast/ https://pypi.org/project/snapcast/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-		>=dev-python/construct-2.5.2[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/snapcast/snapcast-2.1.1.ebuild b/dev-python/snapcast/snapcast-2.1.1.ebuild
index 720927844..d662a6a21 100644
--- a/dev-python/snapcast/snapcast-2.1.1.ebuild
+++ b/dev-python/snapcast/snapcast-2.1.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{6..8} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/snapcast/snapcast-2.1.2.ebuild b/dev-python/snapcast/snapcast-2.1.2.ebuild
index ce7d05616..d4319e144 100644
--- a/dev-python/snapcast/snapcast-2.1.2.ebuild
+++ b/dev-python/snapcast/snapcast-2.1.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/snapcast/snapcast-2.1.3.ebuild b/dev-python/snapcast/snapcast-2.1.3.ebuild
index 1905e431c..1ddbc2336 100644
--- a/dev-python/snapcast/snapcast-2.1.3.ebuild
+++ b/dev-python/snapcast/snapcast-2.1.3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/snitun/Manifest b/dev-python/snitun/Manifest
index 2259589e6..d6a071e6b 100644
--- a/dev-python/snitun/Manifest
+++ b/dev-python/snitun/Manifest
@@ -1,9 +1,3 @@
-DIST snitun-0.13.tar.gz 12373 BLAKE2B facc3cb8abc39dc7b4df27fae74a96ac6fc7e36b2e96913e92b2ceee3ccfeddfed28301630192fd3ddbc01fc159097ce857a6763c50eb0d00175c7e779984f8c SHA512 293edd75ff44a841ea47c0a378b9bb8e4bc1e4a1c2fd2f6d53ed51931c97dffa6ddcd6df4731011067ef3dddf4af17e522a3735757ef1949a99b9cfe56ba4d22
-DIST snitun-0.15.tar.gz 12800 BLAKE2B 5c707031e3b14b93c6d687b47797de4e4961f9da8e7a12f252b3b9bfe2c1a2b5eba82cb4e2695c657dd388f0725e7b84da86999f73460f5da48a8aaa0e1c7858 SHA512 3d38ed863c538feaa525adb1b235002b9d3dcbe5f191b7d52e9105926fbae5b7360f61f16e6b3ee8045b9a76caf21b5ee3fcfb2bd6132cf992bc01845f0e008b
-DIST snitun-0.18.tar.gz 13217 BLAKE2B 54ad934319cedd311b553c2cc892a343968f1afb9bbc61d6d1c89177fa1b619fac97a5a5c93cf2cb0f408f969f918dd61240d54be10d8739b46d98487fa5757f SHA512 3e1bdb1a84be5b7a7c70e565af53103ee3ea1a6f26cf95eacac43ce0d9258b30fab54f86e7195c2f93d95c509bc74a0f7d150184682ef296b3c0a0cb95ebe95a
 DIST snitun-0.20.tar.gz 13347 BLAKE2B 53d7a6d426f06c143cc2492fd1346219355777464fa5d3f160b49c0936f05ef61b1feb81afb2889590286273b15e4b366fef3b592b0ed04ac4e4c6f3e92fd086 SHA512 f3294aca246c8fcba1414750eaa3111288f2c26702e1c1162a9c3a9ad1de4a71d1a2bb36b44b04382ded7d8151fd35ec1200b16f91b9074c81b3aa0ace1636ad
-EBUILD snitun-0.13.ebuild 657 BLAKE2B a7e98b5f9a33d64ec08d26985643b492aeb6bf2e5907c0a7b421af3bd17afd23617951a54ff7cfa74bfdbf2326712aa890327918edf59af12fb6ad9e4cbfcb3a SHA512 f6556697d9995740750273fae31200971c6eb5214e5778e4b0fa47d239ee6790f86c9bf520a40b72a6fd6d0b0c1be08e453fcde6b9b59f88736e16397060674f
-EBUILD snitun-0.15.ebuild 657 BLAKE2B a7e98b5f9a33d64ec08d26985643b492aeb6bf2e5907c0a7b421af3bd17afd23617951a54ff7cfa74bfdbf2326712aa890327918edf59af12fb6ad9e4cbfcb3a SHA512 f6556697d9995740750273fae31200971c6eb5214e5778e4b0fa47d239ee6790f86c9bf520a40b72a6fd6d0b0c1be08e453fcde6b9b59f88736e16397060674f
-EBUILD snitun-0.18.ebuild 657 BLAKE2B a7e98b5f9a33d64ec08d26985643b492aeb6bf2e5907c0a7b421af3bd17afd23617951a54ff7cfa74bfdbf2326712aa890327918edf59af12fb6ad9e4cbfcb3a SHA512 f6556697d9995740750273fae31200971c6eb5214e5778e4b0fa47d239ee6790f86c9bf520a40b72a6fd6d0b0c1be08e453fcde6b9b59f88736e16397060674f
-EBUILD snitun-0.20.ebuild 664 BLAKE2B fa43855bfe72864030bbca065552278028f5ebd89d220720c4a18405bed7675cb20ba3c9a26b843567531b9da4336c8aec99df79ed0502b010c3908e0d57c6fd SHA512 dab12838a27cee4f5f07858c39856e5d2cbaa9592e35b897472f7fe962c13175f9c29f696692aea797a78a125629e74c65598ab5f7fc9f0bc495eb966639bd9a
+EBUILD snitun-0.20.ebuild 663 BLAKE2B 5c57ffe0731db77190f7a2a5f9259a2c7b3af5efed68d67261f6154ade5ee00da27371d7e843f01346edc5fa3a4a2aeb93315df55451c2af185742b10b3bf857 SHA512 5d158fff20afca3e1c19a6d19a0bfef4a145ad4d1d2dd52e1b0bbb470b3c2d278f49a67f00af976284ca1a32ca7ddb88beaf6f725f382e33c359d1f9eee15601
 MISC metadata.xml 457 BLAKE2B 6a4853fba958fd316c98c1bb24cd2475f4b08a43dd0fc1128558fd8330a4e4fd4d8191964f1fbcc552a02486478eb79feabaa03523418010d8fb84b8d717a1cd SHA512 d73b59c1ff1ab864273e9024a4c0b1c7c015018037df2b3cef2af67741d58e2098417005cbc19f7bcd3b0c7f9478fed2879b8450234405618d4d4d3fcb26d0e2
diff --git a/dev-python/snitun/snitun-0.13.ebuild b/dev-python/snitun/snitun-0.13.ebuild
deleted file mode 100644
index eb7ab5cb0..000000000
--- a/dev-python/snitun/snitun-0.13.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{5,6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="SNI proxy with TCP multiplexer"
-HOMEPAGE="https://www.nabucasa.com/ https://pypi.org/project/snitun/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/snitun/snitun-0.15.ebuild b/dev-python/snitun/snitun-0.15.ebuild
deleted file mode 100644
index eb7ab5cb0..000000000
--- a/dev-python/snitun/snitun-0.15.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{5,6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="SNI proxy with TCP multiplexer"
-HOMEPAGE="https://www.nabucasa.com/ https://pypi.org/project/snitun/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/snitun/snitun-0.18.ebuild b/dev-python/snitun/snitun-0.18.ebuild
deleted file mode 100644
index eb7ab5cb0..000000000
--- a/dev-python/snitun/snitun-0.18.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{5,6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="SNI proxy with TCP multiplexer"
-HOMEPAGE="https://www.nabucasa.com/ https://pypi.org/project/snitun/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/snitun/snitun-0.20.ebuild b/dev-python/snitun/snitun-0.20.ebuild
index 6cf24ba31..e6fa927f6 100644
--- a/dev-python/snitun/snitun-0.20.ebuild
+++ b/dev-python/snitun/snitun-0.20.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/solaredge-local/Manifest b/dev-python/solaredge-local/Manifest
index a2b1bf2d9..99f1f5083 100644
--- a/dev-python/solaredge-local/Manifest
+++ b/dev-python/solaredge-local/Manifest
@@ -1,5 +1,3 @@
-DIST solaredge-local-0.1.4.tar.gz 12457 BLAKE2B 44a79af39bf04a5008ac960940795db15acfe04941cd00c1af802c27edeffba062c9797b36cfc8d740790537e85efdc34b2015e9512193a757273f0f2877a7b1 SHA512 4cca49fc00c45f84cdaa08523b95a27d225dd0f824629822a8661be328e5e112e8e017484b543fa4cbd91efba77459ba0d8deccb8615ba26b697322de9123a65
 DIST solaredge-local-0.2.0.tar.gz 21602 BLAKE2B b52cb4772035ab4a45dff3259af1fd2625203030e024a098c8e037cdece8a525b2aa621054682860bc0e52d871bc1b3e1e457f6beec420cdf42b36578677eb8d SHA512 85bd5bcf439d9a8f84ec75b0ee33d32cb8915d3248d59c0a3b48200f6711c3d1a7759f0fa844aff4d873b9e34f3400ba619671890c769bb58a9d75c7b18b125e
-EBUILD solaredge-local-0.1.4.ebuild 858 BLAKE2B 8f5d8e14e0e9666748170bfca6706681433a6d038b25783e410807dde62e130b68993fca176a08aa1de0da7e2df89c400d98e9ec0561c3fa17565f30ae769506 SHA512 6ae35c60874a2c82968b4c142ab5d95d9f65a50417fc8c411c71ec176113e0bb30929a74bd4c56c6cb5cf49863a83a3c06a2c647528df5b7948e7c7a83144182
-EBUILD solaredge-local-0.2.0.ebuild 865 BLAKE2B 5ef60d336f8edbefb540d46d82de91e6d85011001c1b93cdcbcdf65692d413bd2c28c2488c2c4abae40dce9322b07fda8619b9f47b14c9d1db572118a80e1991 SHA512 24b34de3b43b84a178bef897bfb96aa860203b4e9778a648692d4099a2378b91be90abba0446f29fa96796ddeb44f860e3a4f0fc0a849becaa2f15eb59004d7e
+EBUILD solaredge-local-0.2.0.ebuild 864 BLAKE2B 24cfa704a9e4f46b40a56c78906a8fd17d69e44f288b4fd61b0de7ecdf706c212fbacfe317eed154bdafa281d992b8400c52ba58578c2e12fb7fbe96f73a5197 SHA512 8fabe3663fb4b540cd267e01cd31e55cf929209d238e5e757ed1a961a51dc80878eb2924a46e66c85bc7b7d32642077c9134ddacf4aa1d901364045bf20dc5f0
 MISC metadata.xml 334 BLAKE2B 4d9f5d8e812a634c5dbf4497763b415a98672acf03ed238b2cb280a7fd356af3aa26ba59935823317c728489d0dbe57bd34df6c78172a0bdea7b0d517d73578d SHA512 49566b4e311b01872bd885064f80564fe8fe3686be2e1887a5076c9765842925c22871eadea873f91e371d493fa843a04c77a5439ba949e93d5492ac207fbd5a
diff --git a/dev-python/solaredge-local/solaredge-local-0.1.4.ebuild b/dev-python/solaredge-local/solaredge-local-0.1.4.ebuild
deleted file mode 100644
index c34d375fb..000000000
--- a/dev-python/solaredge-local/solaredge-local-0.1.4.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{5,6,7} )
-
-inherit distutils-r1
-
-MY_P=${PN/-/_}-${PV}
-DESCRIPTION="API wrapper to communicate locally with SolarEdge Inverters"
-HOMEPAGE="https://github.com/drobtravels/solaredge-local https://pypi.org/project/solaredge-local/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${MY_P}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-S=${WORKDIR}/${MY_P}
-
-RDEPEND=""
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/uplink[${PYTHON_USEDEP}]
-	dev-python/uplink-protobuf[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/solaredge-local/solaredge-local-0.2.0.ebuild b/dev-python/solaredge-local/solaredge-local-0.2.0.ebuild
index 1fc806c2a..a65525917 100644
--- a/dev-python/solaredge-local/solaredge-local-0.2.0.ebuild
+++ b/dev-python/solaredge-local/solaredge-local-0.2.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/sphinx-autodoc-typehints/Manifest b/dev-python/sphinx-autodoc-typehints/Manifest
deleted file mode 100644
index 2c0d8d61d..000000000
--- a/dev-python/sphinx-autodoc-typehints/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST sphinx-autodoc-typehints-1.10.3.tar.gz 16396 BLAKE2B 5621e6225fa8f97f61a3e7ad387631bc524bd4cd236a184e88431dd044dbf208b042882a150a88372f7bdd613d06de980a5b6685ed1814c6b0c7c1a27079f715 SHA512 170fd6cea10d730eefeef4e2e4de985119dbcde06d43181bb522ec31923ddc49dd7757ca623c820e2e5008198ef9b522d70e08c0c6ff5349921f1777b797bddb
-DIST sphinx-autodoc-typehints-1.6.0.tar.gz 11752 BLAKE2B 4aadda769d19cea73430b49ffcb0f2abd7f046300a0642d4d025ff77e9bbc66d33e2c4c98dc5c1a1320492c89e810ce8f008b7eec8803d508e438bbef5141209 SHA512 01d832592721528f45f5c5867e1c5fb859ae0cecff51cd033a172fc3aae972662e83913aef95dcd2f41c8140475ae668dd3ae5aab6fb8d5f1e295a1efceb3c1c
-EBUILD sphinx-autodoc-typehints-1.10.3.ebuild 684 BLAKE2B 160990476eadbb71c62e1726c400a5402120ae1e9cbd01cd7721a776394ea69f5e5113e86a1ec31abe1de3f5dc1ba76c8e9937b130ee89b652972a8268ae95cc SHA512 2c38947ce514209a6b39147eeeff9fec67adc72013ea64d05bf4a2564691b905f9d4080c61c106314beb0950c03bda175c3b38f3cbdace0a6642ae1988df1856
-EBUILD sphinx-autodoc-typehints-1.6.0.ebuild 677 BLAKE2B 4807b234e73e862f64cf2627cc01e3ccd0a762f18bf15453ba174fb0a28b55d1d6343d31683ec734b73dcd613818003b65e68a0711b9702b0d1a7fd2087d2a4a SHA512 295cb8313c2fdda225e53d555f3e35423f12a2f7edd4d51f99998cfc092f3a85784dd9fe72952758be95b0c3c58b4c19876658b60c7af719ceeabc59a3192939
-MISC metadata.xml 486 BLAKE2B afe67407699e46fc072dafc7acfbf56a59595ac784b35896704d6c6a3c85b94140a97bff47a4d0e1b5e43e36d2e5c64d50ef1ede44a2beff0f0e2ea995d71271 SHA512 27463bdd7c2e6d9ac3ed850a1b7ce58f2dfba91d5e496c3932327a0cc85db35957000971a4b7e368824dd8ca516eeacd9280ff3259c604ce653c468ed26ca765
diff --git a/dev-python/sphinx-autodoc-typehints/metadata.xml b/dev-python/sphinx-autodoc-typehints/metadata.xml
deleted file mode 100644
index 63a5d3649..000000000
--- a/dev-python/sphinx-autodoc-typehints/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>python@gentoo.org</email>
-		<name>Python</name>
-	</maintainer>
-	<longdescription lang="en">Sphinx is a tool to create documentation for Python projects (or other documents consisting of multiple reStructuredText sources).</longdescription>
-	<upstream>
-		<remote-id type="pypi">Sphinx</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/sphinx-autodoc-typehints/sphinx-autodoc-typehints-1.10.3.ebuild b/dev-python/sphinx-autodoc-typehints/sphinx-autodoc-typehints-1.10.3.ebuild
deleted file mode 100644
index 5899e0cdf..000000000
--- a/dev-python/sphinx-autodoc-typehints/sphinx-autodoc-typehints-1.10.3.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit distutils-r1
-
-DESCRIPTION="Type hints (PEP 484) support for the Sphinx autodoc extension"
-HOMEPAGE=" https://pypi.org/project/sphinx-autodoc-typehints/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/sphinx-autodoc-typehints/sphinx-autodoc-typehints-1.6.0.ebuild b/dev-python/sphinx-autodoc-typehints/sphinx-autodoc-typehints-1.6.0.ebuild
deleted file mode 100644
index f5fa7abd5..000000000
--- a/dev-python/sphinx-autodoc-typehints/sphinx-autodoc-typehints-1.6.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{5,6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Type hints (PEP 484) support for the Sphinx autodoc extension"
-HOMEPAGE=" https://pypi.org/project/sphinx-autodoc-typehints/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/sphinx/Manifest b/dev-python/sphinx/Manifest
deleted file mode 100644
index bb99a2866..000000000
--- a/dev-python/sphinx/Manifest
+++ /dev/null
@@ -1,10 +0,0 @@
-DIST Sphinx-1.8.3.tar.gz 5760197 BLAKE2B c95f3708d00a69f1d3daad97ea2aa7c750412ae6dfa0267425d3fb81115ac33d43522fbef48d1a100f81d410ba0fa493cabebe7f8da24b69f9aab2be3d05d10a SHA512 f0a0aa9f6c57001c0c5326d941aa81cd49ec79abd15b217b121750c405a8f5bd6ab965e5eaf15c8be3d681aa711bac0405ff13f2b0a1d58b03c44be4335ed8e3
-DIST Sphinx-2.1.2.tar.gz 6253121 BLAKE2B 10454e4669645002be8cc45a959d2c04ebc1d9bf8b9a441dd156f9bacc75a9b47c2326792fc0f7903dc5a2c558e564ecf52098a49e57288b30163387fa739bed SHA512 22696cd143b75c497c36e08b81b10981e80ad10a4f9f42a29165bfed18bacbc33dc2f477926fe795faf9918dce9d283cd1acf03f7289bd50fa93a86e7979d9f1
-DIST Sphinx-2.2.2.tar.gz 5828933 BLAKE2B 24aacb9b20456fc1e0830ff9f99d4798f03b4fbe5267c10c2655dc94c52b85ef12fd76b1063a90a7c034b8c10bfa362bd91be236c610968a628f1d8fb799103e SHA512 2aaed5980c6fb3bf1a8b2911bbf5d7b8a2d9356e2e9faad58e9ac93e76f76e0c5f40243774553a719dfe982e5e683821545db56142cd8e3db914e97e363124f1
-DIST Sphinx-2.3.1.tar.gz 5838626 BLAKE2B 178640f52d1b7180a37a6ab1753dd174160648fd288e474f469f7c9d750f4066f8945817ff12c901d603c347e84cca958f2b086663e4a26c0226d53b6383f619 SHA512 10916d4d173456c485eca97c65b731d9986f3cf6a7773a33e25e38702a2bba069935cf333cc5747fc8b211d2816a0b8c706513db5e9f5b8034ba73a8975ef045
-EBUILD sphinx-1.8.3-r1.ebuild 3152 BLAKE2B 6c5fa6303ae7e3520592b8911f924f3f63377918746fb16340cdf0b4662d4fdf568c32816547572b3e90dae2bb2084248f2e9db9a9f7b46d1ee3dd4a4a4eb288 SHA512 3908efcdc5696c15ebe55713ba36d93ec91ed4ca075ff51c8b6ab5cce67f676181a06b07b8d135b3b019f1429b5fc93dad95a315817a54bf4b3fc60cbeb12776
-EBUILD sphinx-1.8.3.ebuild 3173 BLAKE2B b6cdb0989f41e1cbc907fa4b18f36e42c597695a85a3852d05b99e356c62515a0bba5072069a3a0a255c98ad7ad34fa0dc5bc0cecf0dce98c3e47acdf01b68ac SHA512 62c203b2447a3fa923fe50b93c6b143ce5fb4715cc1d5f0d903646002dbe8d61072e199a19e990baac312b81d0b2d297440fe36685edcc837ab56feb849704c5
-EBUILD sphinx-2.1.2.ebuild 3152 BLAKE2B 6c5fa6303ae7e3520592b8911f924f3f63377918746fb16340cdf0b4662d4fdf568c32816547572b3e90dae2bb2084248f2e9db9a9f7b46d1ee3dd4a4a4eb288 SHA512 3908efcdc5696c15ebe55713ba36d93ec91ed4ca075ff51c8b6ab5cce67f676181a06b07b8d135b3b019f1429b5fc93dad95a315817a54bf4b3fc60cbeb12776
-EBUILD sphinx-2.2.2.ebuild 3152 BLAKE2B 6c5fa6303ae7e3520592b8911f924f3f63377918746fb16340cdf0b4662d4fdf568c32816547572b3e90dae2bb2084248f2e9db9a9f7b46d1ee3dd4a4a4eb288 SHA512 3908efcdc5696c15ebe55713ba36d93ec91ed4ca075ff51c8b6ab5cce67f676181a06b07b8d135b3b019f1429b5fc93dad95a315817a54bf4b3fc60cbeb12776
-EBUILD sphinx-2.3.1.ebuild 3165 BLAKE2B b234ffa45e191bf40443784bffc82f615ff66765d5215fb71c3c4b1f9a96277e0c74be495c388930f38d697c07791844a80fe958202f54d538a5062757af2848 SHA512 e6348ef1782bbf6824786e2eed347d2bb30089e76fe3d0d83a65ca5c54f8f2899a102bdffb6bcd027d58d904a13495b16d64d45c58cd6dae82b55b31d0142aab
-MISC metadata.xml 556 BLAKE2B a2689efbe3d569fa878296875f4145fdb4d83b4c4821aa636d4006b1823e5646b9cebd5341b4bc02de30985191b83461363cc892aca638e678f86a6e314dcef3 SHA512 bff6813bf9c5110c2e4f5764f911309325923cb58300c19c079d1e6de3d6c4c0bcaf4e206fa4bc11ebf54b961c7e09217310b5647029350d4f9602da6325db0c
diff --git a/dev-python/sphinx/metadata.xml b/dev-python/sphinx/metadata.xml
deleted file mode 100644
index fe4bfd29c..000000000
--- a/dev-python/sphinx/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>python@gentoo.org</email>
-		<name>Python</name>
-	</maintainer>
-	<longdescription lang="en">Sphinx is a tool to create documentation for Python projects (or other documents consisting of multiple reStructuredText sources).</longdescription>
-	<upstream>
-		<remote-id type="pypi">Sphinx</remote-id>
-	</upstream>
-	<use>
-		<flag name="net">enable internet capabilities</flag>
-	</use>
-</pkgmetadata>
diff --git a/dev-python/sphinx/sphinx-1.8.3-r1.ebuild b/dev-python/sphinx/sphinx-1.8.3-r1.ebuild
deleted file mode 100644
index 60ad1ae9c..000000000
--- a/dev-python/sphinx/sphinx-1.8.3-r1.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-PYTHON_COMPAT=( python3_{6,7} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Python documentation generator"
-HOMEPAGE="https://www.sphinx-doc.org/"
-SRC_URI="mirror://pypi/S/${PN^}/${P^}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86 amd64-linux x86-linux"
-IUSE="doc latex net test"
-
-# Tests automagically use latex, bug 667414
-#REQUIRED_USE="test? ( latex )"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/alabaster-0.7.9[${PYTHON_USEDEP}]
-	<dev-python/alabaster-0.8[${PYTHON_USEDEP}]
-	>=dev-python/Babel-2.1.1[${PYTHON_USEDEP}]
-	>=dev-python/docutils-0.11[${PYTHON_USEDEP}]
-	dev-python/imagesize[${PYTHON_USEDEP}]
-	>=dev-python/jinja-2.3[${PYTHON_USEDEP}]
-	>=dev-python/pygments-2.0.1-r1[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.0.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.5[${PYTHON_USEDEP}]
-	>=dev-python/snowballstemmer-1.1[${PYTHON_USEDEP}]
-	>=dev-python/sphinx_rtd_theme-0.1[${PYTHON_USEDEP}]
-	<dev-python/sphinx_rtd_theme-2.0[${PYTHON_USEDEP}]
-	dev-python/packaging[${PYTHON_USEDEP}]
-	dev-python/sphinxcontrib-websupport[${PYTHON_USEDEP}]
-	virtual/python-typing[${PYTHON_USEDEP}]
-	latex? (
-		dev-texlive/texlive-latexextra
-		dev-texlive/texlive-luatex
-		app-text/dvipng
-	)
-	net? (
-		>=dev-python/sqlalchemy-0.9[${PYTHON_USEDEP}]
-		>=dev-python/whoosh-2.0[${PYTHON_USEDEP}]
-	)"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/sphinxcontrib-websupport[${PYTHON_USEDEP}]
-		dev-python/html5lib[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/simplejson[${PYTHON_USEDEP}]
-		>=dev-python/sqlalchemy-0.9[${PYTHON_USEDEP}]
-		>=dev-python/whoosh-2.0[${PYTHON_USEDEP}]
-		virtual/imagemagick-tools[jpeg,png,svg]
-		virtual/python-enum34[${PYTHON_USEDEP}]
-		dev-texlive/texlive-latexextra
-		dev-texlive/texlive-luatex
-		app-text/dvipng
-	)"
-
-S="${WORKDIR}/${P^}"
-
-python_prepare_all() {
-	# remove tests that fail due to network-sandbox
-	rm tests/test_websupport.py || die "Failed to remove web tests"
-	rm tests/test_build_linkcheck.py || die "Failed to remove web tests"
-	sed -i -e 's:test_latex_remote_images:_&:' tests/test_build_latex.py || die
-
-	# fails when additional sphinx themes are installed
-	sed -i -e 's:test_theme_api:_&:' tests/test_theming.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile() {
-	distutils-r1_python_compile
-
-	# Generate the grammar. It will be caught by install somehow.
-	# Note that the tests usually do it for us. However, I don't want
-	# to trust USE=test really running all the tests, especially
-	# with FEATURES=test-fail-continue.
-	pushd "${BUILD_DIR}"/lib >/dev/null || die
-	"${EPYTHON}" -m sphinx.pycode.__init__ || die "Grammar generation failed."
-	popd >/dev/null || die
-}
-
-python_compile_all() {
-	if use doc; then
-		esetup.py build_sphinx
-		HTML_DOCS=( "${BUILD_DIR}"/sphinx/html/. )
-	fi
-}
-
-python_test() {
-	mkdir -p "${BUILD_DIR}/sphinx_tempdir" || die
-	local -x SPHINX_TEST_TEMPDIR="${BUILD_DIR}/sphinx_tempdir"
-	py.test -vv || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/sphinx/sphinx-1.8.3.ebuild b/dev-python/sphinx/sphinx-1.8.3.ebuild
deleted file mode 100644
index f6253a509..000000000
--- a/dev-python/sphinx/sphinx-1.8.3.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} pypy{,3} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Python documentation generator"
-HOMEPAGE="https://www.sphinx-doc.org/"
-SRC_URI="mirror://pypi/S/${PN^}/${P^}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86 amd64-linux x86-linux"
-IUSE="doc latex net test"
-
-# Tests automagically use latex, bug 667414
-#REQUIRED_USE="test? ( latex )"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/alabaster-0.7.9[${PYTHON_USEDEP}]
-	<dev-python/alabaster-0.8[${PYTHON_USEDEP}]
-	>=dev-python/Babel-2.1.1[${PYTHON_USEDEP}]
-	>=dev-python/docutils-0.11[${PYTHON_USEDEP}]
-	dev-python/imagesize[${PYTHON_USEDEP}]
-	>=dev-python/jinja-2.3[${PYTHON_USEDEP}]
-	>=dev-python/pygments-2.0.1-r1[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.0.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.5[${PYTHON_USEDEP}]
-	>=dev-python/snowballstemmer-1.1[${PYTHON_USEDEP}]
-	>=dev-python/sphinx_rtd_theme-0.1[${PYTHON_USEDEP}]
-	<dev-python/sphinx_rtd_theme-2.0[${PYTHON_USEDEP}]
-	dev-python/packaging[${PYTHON_USEDEP}]
-	dev-python/sphinxcontrib-websupport[${PYTHON_USEDEP}]
-	virtual/python-typing[${PYTHON_USEDEP}]
-	latex? (
-		dev-texlive/texlive-latexextra
-		dev-texlive/texlive-luatex
-		app-text/dvipng
-	)
-	net? (
-		>=dev-python/sqlalchemy-0.9[${PYTHON_USEDEP}]
-		>=dev-python/whoosh-2.0[${PYTHON_USEDEP}]
-	)"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/sphinxcontrib-websupport[${PYTHON_USEDEP}]
-		dev-python/html5lib[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/simplejson[${PYTHON_USEDEP}]
-		>=dev-python/sqlalchemy-0.9[${PYTHON_USEDEP}]
-		>=dev-python/whoosh-2.0[${PYTHON_USEDEP}]
-		virtual/imagemagick-tools[jpeg,png,svg]
-		virtual/python-enum34[${PYTHON_USEDEP}]
-		dev-texlive/texlive-latexextra
-		dev-texlive/texlive-luatex
-		app-text/dvipng
-	)"
-
-S="${WORKDIR}/${P^}"
-
-python_prepare_all() {
-	# remove tests that fail due to network-sandbox
-	rm tests/test_websupport.py || die "Failed to remove web tests"
-	rm tests/test_build_linkcheck.py || die "Failed to remove web tests"
-	sed -i -e 's:test_latex_remote_images:_&:' tests/test_build_latex.py || die
-
-	# fails when additional sphinx themes are installed
-	sed -i -e 's:test_theme_api:_&:' tests/test_theming.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile() {
-	distutils-r1_python_compile
-
-	# Generate the grammar. It will be caught by install somehow.
-	# Note that the tests usually do it for us. However, I don't want
-	# to trust USE=test really running all the tests, especially
-	# with FEATURES=test-fail-continue.
-	pushd "${BUILD_DIR}"/lib >/dev/null || die
-	"${EPYTHON}" -m sphinx.pycode.__init__ || die "Grammar generation failed."
-	popd >/dev/null || die
-}
-
-python_compile_all() {
-	if use doc; then
-		esetup.py build_sphinx
-		HTML_DOCS=( "${BUILD_DIR}"/sphinx/html/. )
-	fi
-}
-
-python_test() {
-	mkdir -p "${BUILD_DIR}/sphinx_tempdir" || die
-	local -x SPHINX_TEST_TEMPDIR="${BUILD_DIR}/sphinx_tempdir"
-	py.test -vv || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/sphinx/sphinx-2.1.2.ebuild b/dev-python/sphinx/sphinx-2.1.2.ebuild
deleted file mode 100644
index 60ad1ae9c..000000000
--- a/dev-python/sphinx/sphinx-2.1.2.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-PYTHON_COMPAT=( python3_{6,7} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Python documentation generator"
-HOMEPAGE="https://www.sphinx-doc.org/"
-SRC_URI="mirror://pypi/S/${PN^}/${P^}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86 amd64-linux x86-linux"
-IUSE="doc latex net test"
-
-# Tests automagically use latex, bug 667414
-#REQUIRED_USE="test? ( latex )"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/alabaster-0.7.9[${PYTHON_USEDEP}]
-	<dev-python/alabaster-0.8[${PYTHON_USEDEP}]
-	>=dev-python/Babel-2.1.1[${PYTHON_USEDEP}]
-	>=dev-python/docutils-0.11[${PYTHON_USEDEP}]
-	dev-python/imagesize[${PYTHON_USEDEP}]
-	>=dev-python/jinja-2.3[${PYTHON_USEDEP}]
-	>=dev-python/pygments-2.0.1-r1[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.0.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.5[${PYTHON_USEDEP}]
-	>=dev-python/snowballstemmer-1.1[${PYTHON_USEDEP}]
-	>=dev-python/sphinx_rtd_theme-0.1[${PYTHON_USEDEP}]
-	<dev-python/sphinx_rtd_theme-2.0[${PYTHON_USEDEP}]
-	dev-python/packaging[${PYTHON_USEDEP}]
-	dev-python/sphinxcontrib-websupport[${PYTHON_USEDEP}]
-	virtual/python-typing[${PYTHON_USEDEP}]
-	latex? (
-		dev-texlive/texlive-latexextra
-		dev-texlive/texlive-luatex
-		app-text/dvipng
-	)
-	net? (
-		>=dev-python/sqlalchemy-0.9[${PYTHON_USEDEP}]
-		>=dev-python/whoosh-2.0[${PYTHON_USEDEP}]
-	)"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/sphinxcontrib-websupport[${PYTHON_USEDEP}]
-		dev-python/html5lib[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/simplejson[${PYTHON_USEDEP}]
-		>=dev-python/sqlalchemy-0.9[${PYTHON_USEDEP}]
-		>=dev-python/whoosh-2.0[${PYTHON_USEDEP}]
-		virtual/imagemagick-tools[jpeg,png,svg]
-		virtual/python-enum34[${PYTHON_USEDEP}]
-		dev-texlive/texlive-latexextra
-		dev-texlive/texlive-luatex
-		app-text/dvipng
-	)"
-
-S="${WORKDIR}/${P^}"
-
-python_prepare_all() {
-	# remove tests that fail due to network-sandbox
-	rm tests/test_websupport.py || die "Failed to remove web tests"
-	rm tests/test_build_linkcheck.py || die "Failed to remove web tests"
-	sed -i -e 's:test_latex_remote_images:_&:' tests/test_build_latex.py || die
-
-	# fails when additional sphinx themes are installed
-	sed -i -e 's:test_theme_api:_&:' tests/test_theming.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile() {
-	distutils-r1_python_compile
-
-	# Generate the grammar. It will be caught by install somehow.
-	# Note that the tests usually do it for us. However, I don't want
-	# to trust USE=test really running all the tests, especially
-	# with FEATURES=test-fail-continue.
-	pushd "${BUILD_DIR}"/lib >/dev/null || die
-	"${EPYTHON}" -m sphinx.pycode.__init__ || die "Grammar generation failed."
-	popd >/dev/null || die
-}
-
-python_compile_all() {
-	if use doc; then
-		esetup.py build_sphinx
-		HTML_DOCS=( "${BUILD_DIR}"/sphinx/html/. )
-	fi
-}
-
-python_test() {
-	mkdir -p "${BUILD_DIR}/sphinx_tempdir" || die
-	local -x SPHINX_TEST_TEMPDIR="${BUILD_DIR}/sphinx_tempdir"
-	py.test -vv || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/sphinx/sphinx-2.2.2.ebuild b/dev-python/sphinx/sphinx-2.2.2.ebuild
deleted file mode 100644
index 60ad1ae9c..000000000
--- a/dev-python/sphinx/sphinx-2.2.2.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-PYTHON_COMPAT=( python3_{6,7} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Python documentation generator"
-HOMEPAGE="https://www.sphinx-doc.org/"
-SRC_URI="mirror://pypi/S/${PN^}/${P^}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86 amd64-linux x86-linux"
-IUSE="doc latex net test"
-
-# Tests automagically use latex, bug 667414
-#REQUIRED_USE="test? ( latex )"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/alabaster-0.7.9[${PYTHON_USEDEP}]
-	<dev-python/alabaster-0.8[${PYTHON_USEDEP}]
-	>=dev-python/Babel-2.1.1[${PYTHON_USEDEP}]
-	>=dev-python/docutils-0.11[${PYTHON_USEDEP}]
-	dev-python/imagesize[${PYTHON_USEDEP}]
-	>=dev-python/jinja-2.3[${PYTHON_USEDEP}]
-	>=dev-python/pygments-2.0.1-r1[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.0.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.5[${PYTHON_USEDEP}]
-	>=dev-python/snowballstemmer-1.1[${PYTHON_USEDEP}]
-	>=dev-python/sphinx_rtd_theme-0.1[${PYTHON_USEDEP}]
-	<dev-python/sphinx_rtd_theme-2.0[${PYTHON_USEDEP}]
-	dev-python/packaging[${PYTHON_USEDEP}]
-	dev-python/sphinxcontrib-websupport[${PYTHON_USEDEP}]
-	virtual/python-typing[${PYTHON_USEDEP}]
-	latex? (
-		dev-texlive/texlive-latexextra
-		dev-texlive/texlive-luatex
-		app-text/dvipng
-	)
-	net? (
-		>=dev-python/sqlalchemy-0.9[${PYTHON_USEDEP}]
-		>=dev-python/whoosh-2.0[${PYTHON_USEDEP}]
-	)"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/sphinxcontrib-websupport[${PYTHON_USEDEP}]
-		dev-python/html5lib[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/simplejson[${PYTHON_USEDEP}]
-		>=dev-python/sqlalchemy-0.9[${PYTHON_USEDEP}]
-		>=dev-python/whoosh-2.0[${PYTHON_USEDEP}]
-		virtual/imagemagick-tools[jpeg,png,svg]
-		virtual/python-enum34[${PYTHON_USEDEP}]
-		dev-texlive/texlive-latexextra
-		dev-texlive/texlive-luatex
-		app-text/dvipng
-	)"
-
-S="${WORKDIR}/${P^}"
-
-python_prepare_all() {
-	# remove tests that fail due to network-sandbox
-	rm tests/test_websupport.py || die "Failed to remove web tests"
-	rm tests/test_build_linkcheck.py || die "Failed to remove web tests"
-	sed -i -e 's:test_latex_remote_images:_&:' tests/test_build_latex.py || die
-
-	# fails when additional sphinx themes are installed
-	sed -i -e 's:test_theme_api:_&:' tests/test_theming.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile() {
-	distutils-r1_python_compile
-
-	# Generate the grammar. It will be caught by install somehow.
-	# Note that the tests usually do it for us. However, I don't want
-	# to trust USE=test really running all the tests, especially
-	# with FEATURES=test-fail-continue.
-	pushd "${BUILD_DIR}"/lib >/dev/null || die
-	"${EPYTHON}" -m sphinx.pycode.__init__ || die "Grammar generation failed."
-	popd >/dev/null || die
-}
-
-python_compile_all() {
-	if use doc; then
-		esetup.py build_sphinx
-		HTML_DOCS=( "${BUILD_DIR}"/sphinx/html/. )
-	fi
-}
-
-python_test() {
-	mkdir -p "${BUILD_DIR}/sphinx_tempdir" || die
-	local -x SPHINX_TEST_TEMPDIR="${BUILD_DIR}/sphinx_tempdir"
-	py.test -vv || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/sphinx/sphinx-2.3.1.ebuild b/dev-python/sphinx/sphinx-2.3.1.ebuild
deleted file mode 100644
index 9ec588171..000000000
--- a/dev-python/sphinx/sphinx-2.3.1.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Python documentation generator"
-HOMEPAGE="https://www.sphinx-doc.org/"
-SRC_URI="mirror://pypi/S/${PN^}/${P^}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc latex net test"
-
-# Tests automagically use latex, bug 667414
-#REQUIRED_USE="test? ( latex )"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/alabaster-0.7.9[${PYTHON_USEDEP}]
-	<dev-python/alabaster-0.8[${PYTHON_USEDEP}]
-	>=dev-python/Babel-2.1.1[${PYTHON_USEDEP}]
-	>=dev-python/docutils-0.11[${PYTHON_USEDEP}]
-	dev-python/imagesize[${PYTHON_USEDEP}]
-	>=dev-python/jinja-2.3[${PYTHON_USEDEP}]
-	>=dev-python/pygments-2.0.1-r1[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.0.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.5[${PYTHON_USEDEP}]
-	>=dev-python/snowballstemmer-1.1[${PYTHON_USEDEP}]
-	>=dev-python/sphinx_rtd_theme-0.1[${PYTHON_USEDEP}]
-	<dev-python/sphinx_rtd_theme-2.0[${PYTHON_USEDEP}]
-	dev-python/packaging[${PYTHON_USEDEP}]
-	dev-python/sphinxcontrib-websupport[${PYTHON_USEDEP}]
-	virtual/python-typing[${PYTHON_USEDEP}]
-	latex? (
-		dev-texlive/texlive-latexextra
-		dev-texlive/texlive-luatex
-		app-text/dvipng
-	)
-	net? (
-		>=dev-python/sqlalchemy-0.9[${PYTHON_USEDEP}]
-		>=dev-python/whoosh-2.0[${PYTHON_USEDEP}]
-	)"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/sphinxcontrib-websupport[${PYTHON_USEDEP}]
-		dev-python/html5lib[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/simplejson[${PYTHON_USEDEP}]
-		>=dev-python/sqlalchemy-0.9[${PYTHON_USEDEP}]
-		>=dev-python/whoosh-2.0[${PYTHON_USEDEP}]
-		virtual/imagemagick-tools[jpeg,png,svg]
-		virtual/python-enum34[${PYTHON_USEDEP}]
-		dev-texlive/texlive-latexextra
-		dev-texlive/texlive-luatex
-		app-text/dvipng
-	)"
-
-S="${WORKDIR}/${P^}"
-
-python_prepare_all() {
-	# remove tests that fail due to network-sandbox
-	rm tests/test_websupport.py || die "Failed to remove web tests"
-	rm tests/test_build_linkcheck.py || die "Failed to remove web tests"
-	sed -i -e 's:test_latex_remote_images:_&:' tests/test_build_latex.py || die
-
-	# fails when additional sphinx themes are installed
-	sed -i -e 's:test_theme_api:_&:' tests/test_theming.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile() {
-	distutils-r1_python_compile
-
-	# Generate the grammar. It will be caught by install somehow.
-	# Note that the tests usually do it for us. However, I don't want
-	# to trust USE=test really running all the tests, especially
-	# with FEATURES=test-fail-continue.
-	pushd "${BUILD_DIR}"/lib >/dev/null || die
-	"${EPYTHON}" -m sphinx.pycode.__init__ || die "Grammar generation failed."
-	popd >/dev/null || die
-}
-
-python_compile_all() {
-	if use doc; then
-		esetup.py build_sphinx
-		HTML_DOCS=( "${BUILD_DIR}"/sphinx/html/. )
-	fi
-}
-
-python_test() {
-	mkdir -p "${BUILD_DIR}/sphinx_tempdir" || die
-	local -x SPHINX_TEST_TEMPDIR="${BUILD_DIR}/sphinx_tempdir"
-	py.test -vv || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/spotcrime/Manifest b/dev-python/spotcrime/Manifest
index f0dc55b61..820f41831 100644
--- a/dev-python/spotcrime/Manifest
+++ b/dev-python/spotcrime/Manifest
@@ -1,5 +1,3 @@
-DIST spotcrime-1.0.3.tar.gz 2622 BLAKE2B 25307a3441870af6b2917de8f3c122847798cf8a559eb4b2d35adb679c0f94eed0528d7d921903d9277d7ec18e2d867006d46f9f46a1c61be2b5d85aff794362 SHA512 10b86b8e4dddceaa28466af614b549336f4975b8cfa4b01409283105ce8c09c153aa1ed6d5bf29be2d91324f99eb3f2eb0d191af13e3e3cebe8b9461b682aa61
 DIST spotcrime-1.0.4.tar.gz 2614 BLAKE2B afe34a3c44234dd85e51a116425012f4429dd9e9eedaab68dc160aeaa43a8300ab86b6129dbc1bddb020d28a922d17d498dc82c2201f2e1cee4f94ba1963f070 SHA512 b4009a3f2fc1319a9ce5339c15722c0ee081270dac8dcc17e69cb876ff4eb11a4b3dc91e8172ae9a65ea798fd1cbbd72266cd9a7c454613b56e3df7023a474ea
-EBUILD spotcrime-1.0.3.ebuild 684 BLAKE2B cf30e6193de99b4639b5a062465539133b22ef960569ebf95e1d1217db7e1bec93b7ff68822a42c040e3646ab50759d9cd7444e024882c4cbe6e44b821d68646 SHA512 a1bdbb1bdd91a487a9a9c29e9fb75097e6c05666a72f4ce187f85fe084d70fbc64391b1e4dbdc81dcad51308b7e622a6a58e2440aade289530846ff4eb3f4da4
-EBUILD spotcrime-1.0.4.ebuild 691 BLAKE2B 3db689bf9d74dc40e6bd2bfe4a7e3bfdcce35c4b91911f404270dc47e7c949722c2da600ea6c4bd9ee50ab153e048342b1a02d11f5a1a0291a127b1ceae43a29 SHA512 bf0ea0ffca1c4176c88cc2a9371b4fd2e9fd451d3cbe1843e01a4027e19153a31778f1e4fc33ff6e89640a1279b8be893783cd9bbf0bb73bb5d5ee1bfad11b4a
+EBUILD spotcrime-1.0.4.ebuild 690 BLAKE2B 815c3157bb5b18472de3e06fb48c4465028318fd53e8fec9e181df79e803c46ecc56a2574511ac8281b3e4b83b05604a1742ee8570873dd6b30e0d90c5cc3ff8 SHA512 20bc573977e107ae49b333d077b1bf2ec02a1f40e9c09521f21eb2d40271223ed9fc158715dc86ec3e11b3e38df9cdc65ad6088a168703410ebfedffc0e19b56
 MISC metadata.xml 460 BLAKE2B e221eae515fa44f2738ef4803d843a8e7e5f6110489efe7f25421a23c7405ac0222d5476204cccc73045528ede2544c14986cc88a0440b1df05c054f1b835185 SHA512 6090397a9ce848a65c17778d76e638dea03cc6b282d34dacdee2bb5a129db790b35bbaaa13f26aa12df819347e0c92f9944ceb2a7856adbb77e18e55861490ca
diff --git a/dev-python/spotcrime/spotcrime-1.0.3.ebuild b/dev-python/spotcrime/spotcrime-1.0.3.ebuild
deleted file mode 100644
index d34136e6d..000000000
--- a/dev-python/spotcrime/spotcrime-1.0.3.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{5,6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Provides basic API to spotcrime.com."
-HOMEPAGE="https://github.com/jcconnell/python-spotcrime https://pypi.org/project/spotcrime/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/spotcrime/spotcrime-1.0.4.ebuild b/dev-python/spotcrime/spotcrime-1.0.4.ebuild
index 6d3f3dbba..4e1c3e9b2 100644
--- a/dev-python/spotcrime/spotcrime-1.0.4.ebuild
+++ b/dev-python/spotcrime/spotcrime-1.0.4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/starlingbank/Manifest b/dev-python/starlingbank/Manifest
index 6d6b90e67..bea886b14 100644
--- a/dev-python/starlingbank/Manifest
+++ b/dev-python/starlingbank/Manifest
@@ -1,5 +1,3 @@
-DIST starlingbank-3.1.tar.gz 4171 BLAKE2B 8c235d0b32c6b6d8f49990fbd979ebf09ad67a205c709de7371cf9f260eb365ad1f6d92dd3f468ad3b57b282b94ba22c9df50daa0a788401463f30ba5dfc8ee9 SHA512 e7077ab2a7564186a4d59bae618758df39a09427520a22729692ea8edd96dd2ad746ee5a3bd5c7042ca9ae9055cebe618d0eda70979cafe08249a37ee687967e
 DIST starlingbank-3.2.tar.gz 4179 BLAKE2B d2c8879e692126fa56b05205c16179ca2180134fef27a3f707ce9e70bc707fe9d1667b002ae8237ee8d21302d94979b0f533f822b4940dc1d4ca34db6e0bf4d8 SHA512 a59bf49ae72d19af86d05cee51bd998c88969eafb50a861378af356337af74f3afac9557e2e468efe7b545dc00087f15abe7e7a209790a318b0eac72479844f8
-EBUILD starlingbank-3.1.ebuild 750 BLAKE2B ac602c991ec60d037a34c3a4c07710c643752c6e798c9f31261879b704bfb78b6e7bd7e5e0e14c95507682f237e96f131afaa6b2ce64d7dc91ef006547687937 SHA512 33788a151a602b1f0b67d8823be9d1388e594291e3ae76e4edcca635f23ebe545a6a7928456d5ec0cf77b42e8bbb673c6add6b31ac92fec8425d53a97f68b764
-EBUILD starlingbank-3.2.ebuild 759 BLAKE2B 96221dcff25fa6ded07882383ba6ba4ca1ca08992f2605c1b701697d74b92d8c78b25dd4ffb11121d636cdb3d4a58a48a468552124a7eb53f836392a491de582 SHA512 a6da569c75bfa8db6a90874acef480045e86fa87e9362c2c8ae26dc4ceed0c8be8ef30e4b6c3b1c8a59212b8bac588ef9f85fba062af216e559b3b3f0865e1bb
+EBUILD starlingbank-3.2.ebuild 758 BLAKE2B 94de0b8ab22b9c5f415183b4ff7a74862d105e2e5f11dfc3f0862c5df6ffc576b1595c44be4d86ad4b1eaac0d18960634e3aeb2784e2c4ec40f767ad9031db9a SHA512 ee6d82db1fc3e791199228d1cf081a509add5aa9a5b8cc6673f31e7dab0e830cb6413251af58b5ace1d6febd03717b09b67de71705c225f83e3c025905df3f56
 MISC metadata.xml 453 BLAKE2B d829453b8c2d362ca0b903e1857ed531dd6540b16cb616708a973b541095daee6b3e72f6609687c881a58e094ea5b6a8aae880a0dc8c20ebe4403898fabbf446 SHA512 f1702ea6b8ccd9942694046d79a01e3c17d24c97571fb4cf7902e0a459180f73794445f4a2e9809db9799cdc232aa070dffe5cff4e9cf44ad195ab9c03f183ba
diff --git a/dev-python/starlingbank/starlingbank-3.1.ebuild b/dev-python/starlingbank/starlingbank-3.1.ebuild
deleted file mode 100644
index 9f310358c..000000000
--- a/dev-python/starlingbank/starlingbank-3.1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python package that provides access to parts of the Starling bank API."
-HOMEPAGE="https://github.com/Dullage/starlingbank https://pypi.org/project/starlingbank/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND="dev-python/requests[${PYTHON_USEDEP}]"
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/starlingbank/starlingbank-3.2.ebuild b/dev-python/starlingbank/starlingbank-3.2.ebuild
index 7c3dea811..4f6053725 100644
--- a/dev-python/starlingbank/starlingbank-3.2.ebuild
+++ b/dev-python/starlingbank/starlingbank-3.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/steamodd/Manifest b/dev-python/steamodd/Manifest
index ecaa14c29..d8fde9075 100644
--- a/dev-python/steamodd/Manifest
+++ b/dev-python/steamodd/Manifest
@@ -1,5 +1,5 @@
 DIST steamodd-4.21.tar.gz 20389 BLAKE2B aa93242c80b6e02e15f6a02f7e34eb809ff54f38f6b50a959e84691ccb38e1792eb4cc36cd2610e61758b34b3b5be8107ec927d56a10d63e6ec78424e17dd793 SHA512 ed7400b6061b96b8c8a79a9f2a031d387bef8432e2852b7dbd94c9abe8aa6cd40c77e43fc4049ad4d84654c759f19479f33333c099180032c57b526816625b50
 DIST steamodd-4.22.tar.gz 20583 BLAKE2B 90cff891e3e8b97e1580ab730af6b21f8ca437587d1b2c81c07be871a3e4b90ec7669238b88f2ddb53f7a0c19c144e57e98be5c166b1aeeed1f79f810cfe2dc5 SHA512 21a345f4b3c888062ac254a04dd45bc76d7e7995246e02428f7a52bc746dfdc450693c5897c7f1cd87a93872fee1ef9a182ee22686a1f0d5e7a3069132cd8104
-EBUILD steamodd-4.21.ebuild 696 BLAKE2B 7bd48f642dff437336bc0d1994fa49f85299b6897b23197a66a36acb09578b2c5e018529eb6959bf2da34367c229891979c3c15c7fc6c143b6a5de3acbdee9b3 SHA512 e8417e1c4c3078bc3bffb0bb37b079c754fcb3538aba8692e34748ad4a2ba42880e40e11aa8e071040986609cde1a67ccded744b151a82399a3f8085e2602f86
-EBUILD steamodd-4.22.ebuild 705 BLAKE2B f99656d49ddeda7a6a31ab349e59f73c2c9c8f0b8c29a8eecd5414d3370d0e125ddaac0f7f6c0a57e57734dd71b0b02da4fe80167bf11fac45e69bd4ca40b389 SHA512 700e03a47fac091b00e6fa1de2aaea2092e8f0a0f06295867609d4d6c186b14399f4968d9c9bd9ffdfb4bf1d8d087f78cb0173f75b9898484f30d5ad43a821e3
+EBUILD steamodd-4.21.ebuild 697 BLAKE2B e094668f01e5baaf24174ceb2ca17b3bbf0d69418d0a36c3441ba89b06ede405c7603bb0d265d57217e2d0f29d57ab7491d89c35b2bfbef85605bcd513c4b8a8 SHA512 91c6104d39f618d01b92ab74c9afa428cfdfe1d92280a551850de6487dce033c22ee3461dac8589d7b05bf92b8e37ccc6a8587c879b87c7fa1a178415aafb522
+EBUILD steamodd-4.22.ebuild 704 BLAKE2B 99c8f70235b0b16292960ba49fae4ca4ce96efa7c5ce95ca56ece6b9d9fc483d8a6a88e0773332ab1ee8a3f699ca18f43d214817e833b25e5a5d419a8a04f07e SHA512 89d7df3a9171fb3757adf43fa6e30abded542942c886e144d44dbd322317eb5627b1a1281fef3974058383a7f11904efd7a80cabf14f050a1dfd02110776dfa4
 MISC metadata.xml 450 BLAKE2B 2bceb4db5bdd6579f2a5b69860500e104aed1215b3a185bcc74f3b04718313e61570cf6bd354c0ba856278b1747e73791828a8fe1135c025d098ca071458fdb1 SHA512 fa137dd221d71b65f9f3f7cdecda9c1928ff40f4e9cddcd56b43cfb0de74611456a3634d1d34cf55fcf0eee115e6ed4fae59c79e6ce8d7a89cc5942060985177
diff --git a/dev-python/steamodd/steamodd-4.21.ebuild b/dev-python/steamodd/steamodd-4.21.ebuild
index 58059f96c..5b6fcdd2c 100644
--- a/dev-python/steamodd/steamodd-4.21.ebuild
+++ b/dev-python/steamodd/steamodd-4.21.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/steamodd/steamodd-4.22.ebuild b/dev-python/steamodd/steamodd-4.22.ebuild
index 391a7e3aa..a3e8cd120 100644
--- a/dev-python/steamodd/steamodd-4.22.ebuild
+++ b/dev-python/steamodd/steamodd-4.22.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/synology-srm/Manifest b/dev-python/synology-srm/Manifest
index f18154aa3..32c19b74b 100644
--- a/dev-python/synology-srm/Manifest
+++ b/dev-python/synology-srm/Manifest
@@ -1,7 +1,3 @@
-DIST synology-srm-0.0.7.tar.gz 6277 BLAKE2B 711e91a0c234298aff815ea1f44190fb375a95b1f476e5984264087fb011a9e2286f518dd420253fb8e633763c22854fc376b7bf66bc49679fca300239043b30 SHA512 6f6ccbf3108ede1291564d8245cb917af97eb1ed3113bd263fd17200f8e462ba0e159ac3c5e6be46081c54e21ac2b96a5b9a0a33ca123024e0ec42601f07d254
-DIST synology-srm-0.1.2.tar.gz 5760 BLAKE2B 2d8be7eca984677342216223ed31aa631fe2c470413f9081559b13c9f4f2076dce0b0a5f911e7681eee8687b0321069ada8e322373897e2b743d3779aa4dc79c SHA512 6ad2c559e889b6be84c082714f80aa5b32cbba6fef183319b487f538b04240bcae8c21194a23027e87fce4eb0f8111301b43610b53614a6dfc038927db866e9a
 DIST synology-srm-0.2.0.tar.gz 6386 BLAKE2B 3dd88760bb32523618c99bba1d3806c93853f8094733eca03e3c2f63d03a42ae82101eb556abcbc2fb41300ca5420719888b45675ace3280631bc1e2d6a22fdb SHA512 334ae64e2be8ada72c088f10af87c3b8d95f149e6b73a4852f41f0ec41d2d9f7f9fd340873777b56c92ffb48b2e01892e76e94abb5ff7fe05829ed4546141f32
-EBUILD synology-srm-0.0.7.ebuild 697 BLAKE2B b3bc30bb6d7bb73463dbecb480286877269417ab0b4a1bae13396e8bc99b21ab91d733e4ad26253c65501b665db01218778dc16a548de29631a354af55bb6106 SHA512 9ae98f5dbb51919dbe1e2e85c14ab2032d86c1dd313ef18d88d76a73e6532579da7422ad90132a01cfc2637df05ed94d6701a79270c0ab42952322d656611c19
-EBUILD synology-srm-0.1.2.ebuild 706 BLAKE2B b57f01807615a7491365c383097b34b54a5ae1af75a7ef70da4a2de3838ba790fef4c7ad80ecba8a72c66ee2ef563f7589f69b08bcd82d1129e9822b37bd0289 SHA512 bd351928142d4a120f3f224f95e454337feabf156327d0143b52e48ecbf141d883245ab0d0694eacd87f34a31ed70e2c3dd1e541af7878e227c5092c939c9c9f
-EBUILD synology-srm-0.2.0.ebuild 706 BLAKE2B 0ae6a8ebfe5449f386f6fc50704d339b9ad6810668e81a850a4a22fa13be0bac87d9fb986ffbabb4dc8c7105a9d42c5f33079b5125009f998eee2d2c3eb8e19e SHA512 4a5c4d00dd799db17b1ce60ac26caebff80ef9d2d19990c127c2cf8d87896c27b518dc75ebf1c2e3c59f7ed9059da451f35b241dc0f49b7a7adbbe0ecc56a889
+EBUILD synology-srm-0.2.0.ebuild 706 BLAKE2B 8e38c37cdb56990e8740959b80dff654a1f67ac5531afef486d0d1dc024140ed77796425361bde85b2f800cb5429b1b7f00eb0bb52a5d5a9272913f8c63fdc42 SHA512 997ce3c9b5d03ae0a13eca48d2b53526b6910c528b865d7c9625ee6b29f86f8515dab823a3ad493ac91c22601c7bb293a0d4e7e8dd441b7996d1e94c8ca80e56
 MISC metadata.xml 457 BLAKE2B 4f063ca64291ba032aa65974bd14056fc66d899c6a8f681a42734ca4630df53ba7279821f69930c05ccad5684cf31987338861c1d537dcf05b177a08e7b7890d SHA512 99c1b5a5a45cdb23807f9ecfd3f50441af37775637615e6dbac8890c6d67cfaa0bf9a10f6016bff7ccbeaf6c79613b01c1838ac94ee6036c8cf71b25ede247bd
diff --git a/dev-python/synology-srm/synology-srm-0.0.7.ebuild b/dev-python/synology-srm/synology-srm-0.0.7.ebuild
deleted file mode 100644
index dd76cd1e5..000000000
--- a/dev-python/synology-srm/synology-srm-0.0.7.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Synology SRM API"
-HOMEPAGE="https://github.com/aerialls/synology-srm https://pypi.org/project/synology-srm/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND="dev-python/requests[${PYTHON_USEDEP}]"
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/synology-srm/synology-srm-0.1.2.ebuild b/dev-python/synology-srm/synology-srm-0.1.2.ebuild
deleted file mode 100644
index 1dc433094..000000000
--- a/dev-python/synology-srm/synology-srm-0.1.2.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit distutils-r1
-
-DESCRIPTION="Synology SRM API"
-HOMEPAGE="https://github.com/aerialls/synology-srm https://pypi.org/project/synology-srm/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND="dev-python/requests[${PYTHON_USEDEP}]"
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/synology-srm/synology-srm-0.2.0.ebuild b/dev-python/synology-srm/synology-srm-0.2.0.ebuild
index 884bdcba6..1d2261402 100644
--- a/dev-python/synology-srm/synology-srm-0.2.0.ebuild
+++ b/dev-python/synology-srm/synology-srm-0.2.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{6..8} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/tabulate/Manifest b/dev-python/tabulate/Manifest
deleted file mode 100644
index d2dfc4344..000000000
--- a/dev-python/tabulate/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST tabulate-0.8.5.tar.gz 45867 BLAKE2B 4951a22066673d9d8a4ce46dc3123046b8296f36a6fd80c3d43489e4de310386b602c35eec7c560695816cf252670c6954157752e1c7060d20c0195ba2e5a8a6 SHA512 137f576ac5adc29ad82f77da499804b110ddc7f12c5f85cdc79bdd5dfd37404d49f1c5667e6f8721e48f949b684c71b330b8e4fae4ef8a933af24d68fd0665c5
-EBUILD tabulate-0.8.5-r1.ebuild 824 BLAKE2B 56c9426d1ff88207e861d669bcc7ef16d4df148a6b00886bdbd58dd3ea9c1258522bd15a14e59bed131a89afb9e28be43d7964a8d186763c9e9bfa8df01b1a0c SHA512 7af6a7a06dfcc12bf752ff7f01b267087d214af96b75b2ed1e4a10350ff8e015762358c0f6969b7f8410c1760f042704aa649d50158c1dd98c39e92e2db776f2
-EBUILD tabulate-0.8.5.ebuild 825 BLAKE2B f3079f0fb1bcf155683b39236518ee333447cf2e5d0a4fb7a8e6605a8af5581d989a218becaf7776fe7a6a9da3b39d5836a575b043eab948bdaf00ca1ca8c0ab SHA512 75cacd5f4c04fc60224f8f489e68c0d0ae14adfa0698d0f68e3cb82f40101009934133fd550d56311e0d522bdf75027a23123e0a864ce85cb1c2afaad3357314
-MISC metadata.xml 321 BLAKE2B 8b68baf97f22e2360ba30d2a86e181492217d12162d7717d3f69dff5a51926867d5ac8a227fa93c345e3ddb80036ba97839e7ab22aab5df27ec974048b666a41 SHA512 4967ca411c6ee428e897be2be259da008f9dec1991754235f0e8f79d64b5175e69d460c3cfee72f49faa41704ebda3c46bb2f30fc157e95cec4d8d60ae7ba89d
diff --git a/dev-python/tabulate/metadata.xml b/dev-python/tabulate/metadata.xml
deleted file mode 100644
index 4d3a5455d..000000000
--- a/dev-python/tabulate/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>python@gentoo.org</email>
-    <name>Python</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="pypi">tabulate</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/tabulate/tabulate-0.8.5-r1.ebuild b/dev-python/tabulate/tabulate-0.8.5-r1.ebuild
deleted file mode 100644
index 069685b22..000000000
--- a/dev-python/tabulate/tabulate-0.8.5-r1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit distutils-r1
-
-DESCRIPTION="Pretty-print tabular data"
-HOMEPAGE="https://pypi.org/project/tabulate/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/wcwidth[${PYTHON_USEDEP}]"
-# TODO: optional test-dep on colorclass
-DEPEND="
-	test? (
-		${RDEPEND}
-		$(python_gen_impl_dep 'sqlite')
-		dev-python/colorclass[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/pandas[${PYTHON_USEDEP}]
-		virtual/python-funcsigs[${PYTHON_USEDEP}]
-	)
-"
-
-python_test() {
-	esetup.py test
-}
diff --git a/dev-python/tabulate/tabulate-0.8.5.ebuild b/dev-python/tabulate/tabulate-0.8.5.ebuild
deleted file mode 100644
index 2039cf0db..000000000
--- a/dev-python/tabulate/tabulate-0.8.5.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Pretty-print tabular data"
-HOMEPAGE="https://pypi.org/project/tabulate/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/wcwidth[${PYTHON_USEDEP}]"
-# TODO: optional test-dep on colorclass
-DEPEND="
-	test? (
-		${RDEPEND}
-		$(python_gen_impl_dep 'sqlite')
-		dev-python/colorclass[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/pandas[${PYTHON_USEDEP}]
-		virtual/python-funcsigs[${PYTHON_USEDEP}]
-	)
-"
-
-python_test() {
-	esetup.py test
-}
diff --git a/dev-python/tahoma-api/Manifest b/dev-python/tahoma-api/Manifest
index 9a85a6563..e0b914288 100644
--- a/dev-python/tahoma-api/Manifest
+++ b/dev-python/tahoma-api/Manifest
@@ -1,5 +1,3 @@
-DIST tahoma-api-0.0.14.tar.gz 7832 BLAKE2B 8c36c3fa59853d120f8c8736f485f870feb529bf693f3ddc7cdb866652bad3123f09bd10323e2f2bdc5c361c0758c6ae45c1e26b18174646688d0c8b630eb320 SHA512 766be48bc6063831a3b10a587cecc1e63aed4544ce36e5d393e2017c1e7230c6e61d8affd5815c15483dfd0384f3ad5e19160d16943bb73bcf0ef54b4b05151c
 DIST tahoma-api-0.0.16.tar.gz 7796 BLAKE2B cb15d64381474eef5b4e2efdedb83a69f4a0b529c68549762f8bd86921bfcbe6f6427f51d80d65c2f319e5538836a18b9080bc759fe2db95126c91282aac43af SHA512 905fc12b6e2eb39cf66c17c1e06adb31c1476a39fd66b4de5e2f8fccd52963f0504bcd24fe6d2c33a2bb6cc9adcb3b8798e07894ba9e50264ec64d56844702cf
-EBUILD tahoma-api-0.0.14.ebuild 809 BLAKE2B 0a9365dfa3aff9c848aa1cead48f8087819af20cbdb6fdd91590b2827f4c7775f42046ca917083ca70b7df7cf112ae1e4f3265aabc3ba2c54671d718a8bcc1ea SHA512 5537e361334e2318524a0cff0c728ffff087b956e7b3ff91eb09e0e81e720d95ba61064166d8d92ce19e2298c496e4ee7939b42606925cd7e2786777c6761a7a
-EBUILD tahoma-api-0.0.16.ebuild 818 BLAKE2B edb68dcc15eae001d7deb790923f45fcacddbf4d7d2de4349232867d4fdd8c6fc49f1dfe050050d12bc57f4f99ddf138991a9bb2f504fffb8227fb37bc22d0c6 SHA512 bd8ccb42e335673265f2eb8aa3d2bb3256a2d6e0e9899a011bfca4bfdaeab57b1d75a96da2d37a07930cac82ff641ed323803efa22220f5aca50cff649952051
+EBUILD tahoma-api-0.0.16.ebuild 817 BLAKE2B b03dadebbc2310d80cb89cabebb34e802eae520cb4e5b1401bef39af0ca950eb15431e7a25cf8aa669f78e70069e8e61b02e413ce8efe69e4ed596b3db66f81f SHA512 7e40350d788ba624fb350d3196c75e4924a1c005401b6fa06bc8aae2eb051046cf387ed8bf864fa1abe024a8d19b2badaba4ff7a859be100d410b7ca5becdcba
 MISC metadata.xml 465 BLAKE2B 7c747b70f50688752aa2c0678c3560ff819ef2e32c347accb1444af656c588c22f9908cc5a8474feeafaa7afd10a5f748956d4ecd79b1fd0a38275baf456aa81 SHA512 3b264f1b8b22fe540dc47ce080f580d9672bab0da23a52916a5e1f8c9337f9c37ebf3aa4e427b95de5d444f07b94299862bf66226ac4524273a366397c43fddb
diff --git a/dev-python/tahoma-api/tahoma-api-0.0.14.ebuild b/dev-python/tahoma-api/tahoma-api-0.0.14.ebuild
deleted file mode 100644
index 07ef1e6a5..000000000
--- a/dev-python/tahoma-api/tahoma-api-0.0.14.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Tahoma Api - Python connect to Tahoma REST API"
-HOMEPAGE="https://github.com/philklei/tahoma-api/ https://pypi.org/project/tahoma-api/"
-MY_PN=${PN/-/_}
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=">=dev-python/requests-2.0[${PYTHON_USEDEP}]"
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/tahoma-api/tahoma-api-0.0.16.ebuild b/dev-python/tahoma-api/tahoma-api-0.0.16.ebuild
index 38f68370b..d3d4c7a57 100644
--- a/dev-python/tahoma-api/tahoma-api-0.0.16.ebuild
+++ b/dev-python/tahoma-api/tahoma-api-0.0.16.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/tapsaff/Manifest b/dev-python/tapsaff/Manifest
index 4e3810590..c0c1b56fc 100644
--- a/dev-python/tapsaff/Manifest
+++ b/dev-python/tapsaff/Manifest
@@ -1,5 +1,3 @@
-DIST tapsaff-0.2.0.tar.gz 1648 BLAKE2B 04fc9b17f349a4e6d537254fb2877a303a9aef951769b460183664489717a40cb27dafbda4543fb5b1503b11904e7b00b9abfa02322401d12b948a614614af47 SHA512 fa5805b41efc3e3d6e655af82d0626271a82b68caed33087bdbd8278e923650ac17503c76aa4262d92c333a42e3b0fc4b9d6b85b342933f834b7a84b1ed4692d
 DIST tapsaff-0.2.1.tar.gz 1640 BLAKE2B ba217d964cb069cd6620d5dfdc77c9b1d2e43c8def0cc52f13f4c16078ede7d02da6f2def5f5581bc57a46bb0bf0bbf6cee460b1efb78eaaef11203af6f9195c SHA512 9e6a9d6ce2f61e84e93c3a55146526f6f8895274cdabeb6c587e9a732737edbca0ea744a167b4a0060ac69770e1fe7b01924a494bf1fcbae14dca9b0a0533ab4
-EBUILD tapsaff-0.2.0.ebuild 709 BLAKE2B a283251915e15b9c14bb8c24fa476c77f35c290678bdf3d41ac0f06a67e3606ac0e2a012f69e27c51f9e00a46fbb2332bd2625d06ea4e935b07c96a72e941651 SHA512 bf0ca6dc3fbca9ceedd2d30e3ade9da3a3b42d169d9d472b523802a40de8d64c434e6c22c4df562f16a77b17788f4b609b40af1d282fa5e230e3ccfe418e7bd3
-EBUILD tapsaff-0.2.1.ebuild 716 BLAKE2B a0bebe40a252e232afa4a26904b188d31c827e8e7823ae7ee5ac478f87065671c48b561245808540f44094e0ffd2ea4ad8a6a9f3ac66564921d81e72c7ab48c6 SHA512 abd4350a8560ee8cdcebc9892e6d8ef14dc8abe9a5ab01983febd072a926f50042266c4ae5f011cedeaf33751a5d3184556ea6511c5cce4525a34df5a26af05e
+EBUILD tapsaff-0.2.1.ebuild 715 BLAKE2B 6a2259ea34c381ce483dddbc8fbc9683945e116990948a93083ef30280eae3486b8433b37a2cc2a5c11854bb30577fb69707fe36447f93b9721f130479a409d6 SHA512 003e163780314407085531fe68d741ded021b46ccb7f5e235355efc658d2d17e312a60d2988294afd30f684deac069c20cf24b98881d0ba83774f5797d8131f0
 MISC metadata.xml 454 BLAKE2B 8be984f0ca2c65604b89927658ff96f2cbbc6adba60e235ff76e601f388bbd9c6b4ff1dfbd9e5e7200ab11bf1fb231016b47048afcbac2776ba90db03c5f1ebc SHA512 ab69729c3f2e1399b41fad8b40a748c713d184c249f0e836c5e73f3781da286b3899ae9bceaa6da954093c4fdfd524526dc3f2d1bd7f132fe274482f9cfeb3b6
diff --git a/dev-python/tapsaff/tapsaff-0.2.0.ebuild b/dev-python/tapsaff/tapsaff-0.2.0.ebuild
deleted file mode 100644
index cdfef59ba..000000000
--- a/dev-python/tapsaff/tapsaff-0.2.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{5,6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Provides an API for requesting information from taps-aff.co.uk"
-HOMEPAGE="https://github.com/bazwilliams/python-taps-aff https://pypi.org/project/tapsaff/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/tapsaff/tapsaff-0.2.1.ebuild b/dev-python/tapsaff/tapsaff-0.2.1.ebuild
index 475810f17..b356966d9 100644
--- a/dev-python/tapsaff/tapsaff-0.2.1.ebuild
+++ b/dev-python/tapsaff/tapsaff-0.2.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/tellcore-py/Manifest b/dev-python/tellcore-py/Manifest
index 9d61681cb..3e6d098de 100644
--- a/dev-python/tellcore-py/Manifest
+++ b/dev-python/tellcore-py/Manifest
@@ -1,5 +1,5 @@
 DIST tellcore-py-1.1.2.tar.gz 41517 BLAKE2B d3774b93f7eb874bbcc5f9e15c8b3cbcc2a09cbf2017a080bd377559f1ed94d83cc440f1595fc2a5bcbe119d2d1340b539f6624e6c2ceac0fc2fa5c6a7c78232 SHA512 371a2962092bc8f56c26a7a28f137d77960d3a119bb6a18233bab8d7b161bf51ae84eddb0752770dd3f5ca3a0fe9f651d708c61d154b667307c2e1c4abc78f29
 DIST tellcore-py-1.1.3.tar.gz 41788 BLAKE2B 54e3d4ddd5bd05e3897e7833e60769420d4374f6934e9ad010dcbeba756d3b41704481720d9fbad51b9d5fc728a35588ad144a9a42b51662b2e22823f2a0c48f SHA512 a95b6f92ead40d36f232b18821fdd4f0ecbdf3132ce7d4fcd8bf399fb4eb81113f57a89776c2b607f7527e13390416f43f7e25e1ca1db41fc211f5cde374e031
-EBUILD tellcore-py-1.1.2.ebuild 693 BLAKE2B 40975730f23b81caa6e230762fac0d404c033300da27af51b573a16ef3bfff28ce50b853de87d95458b0e101a32fb1dc3ce2af016754b9f5f6269ac82124b961 SHA512 ecd0ccc45a06a5a2cd18481acf4c5611343610d07f4c0c67e26d4bda4135c21183f34f8cafe0ff8e7d9cc49fea17e561694650e6f16e72f8778c55236a30dd3c
-EBUILD tellcore-py-1.1.3.ebuild 702 BLAKE2B 39a73d25b8f3405515f6fc0de9fe64c7bc01be1cc8477793c6667a46892a50ec1720945c3ac20d0fcf31754ca3a1731e05cf30762c91dbc57cadc0f27a54b897 SHA512 4868b3e66201146deebd31b75f20e6d2931483720ee6523a0d576c40ce384f4610cebbd5f7efc612fb35b6dbba5760b63a34ecb6dac73c9217bb98e288e0a1db
+EBUILD tellcore-py-1.1.2.ebuild 694 BLAKE2B f54afd91398ac0f41770eb32c601529eea0185aa28c762a86aec6991f810a5eea1633969ec6dde6d8041e6a7bebad08880facc4c0677dd65d2b563d790ab54e8 SHA512 a04a468c4782c91cfbc5ff1e8687a1e8596667ab3910058957f1f4383e7db0e2b000900f57a4aefebf988ba7b63e2e3b838ceb3169ce9246c5b06bc827adcd3c
+EBUILD tellcore-py-1.1.3.ebuild 701 BLAKE2B de737874e718b4002b2f1015ec8ac87c12b4a4cb195960c0097a2c8bb2875c97ffd88ccb246b94e5de8576b24994b8f862954a87af103571e359b89351ecb7ef SHA512 bf4b60efb6eef59573bd974d73f1b90f5a55734fca928e1f4a4728e778fa0298f283f8ef10a34fe854cb46f384bed83a0a22c78cae0b98203a3057c230119459
 MISC metadata.xml 456 BLAKE2B 4f118243eb6d38da4508a2fe42077917b4fa59a223f5ae904f47b42fa334a48eda38136c24fe5a334975bbc866e53e600041cae1d59cc90a56721ac6464de868 SHA512 1127865bd265793ac012405cf59335c9befe3107f899d1df1110f3efb8bb9400a930b0383d1cea85cd580fdff43cdb4d70e71bf453b0ad61645c88a01cfba1b9
diff --git a/dev-python/tellcore-py/tellcore-py-1.1.2.ebuild b/dev-python/tellcore-py/tellcore-py-1.1.2.ebuild
index bb1e13b87..e6443fc7c 100644
--- a/dev-python/tellcore-py/tellcore-py-1.1.2.ebuild
+++ b/dev-python/tellcore-py/tellcore-py-1.1.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/tellcore-py/tellcore-py-1.1.3.ebuild b/dev-python/tellcore-py/tellcore-py-1.1.3.ebuild
index ff4a3cb1d..4edfa24b7 100644
--- a/dev-python/tellcore-py/tellcore-py-1.1.3.ebuild
+++ b/dev-python/tellcore-py/tellcore-py-1.1.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/text-unidecode/Manifest b/dev-python/text-unidecode/Manifest
deleted file mode 100644
index a786b26b0..000000000
--- a/dev-python/text-unidecode/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST text-unidecode-1.2.tar.gz 76872 BLAKE2B 5d49540784d03004aea7a44162fb34cce4a53cb82fe6fbb6b0afa3ca03dc82f1d94832b6651166bcb8d151743eb2f0ae320a905d82c4e302fad406e052887d8c SHA512 1ba3309dfdf94a9293c2aae4f7fd53d74b3742e2432928124196a3db9b523edce5f71e55485135dec10362bf69580d9f83707c6b6ab0a8075523fdc1b640723e
-DIST text-unidecode-1.3.tar.gz 76885 BLAKE2B b783963b4fce6588d45d48a498de566c08df83ae62c72caf599648df195eb94b7c02090503590ab8c747af0d210847ddfbf0772289e170361914db20c049828e SHA512 aeaf0e79bd0545ca7a4fe700d5a7dac1d5900841fcfe8a5a568c84ba7d3bee5f75eaac0531f4a01d689a550ac5bc7e1acaeb8132293f220db8387fae2eb6a150
-EBUILD text-unidecode-1.2.ebuild 690 BLAKE2B 4a75fa5207ce60f675170c4b61c9c24b56b769bd7954817ccf87edc8b77c0ec4434b5da82ab0e43cb34e9824f163875f3efa54ff4c54c9535c14170f5d48a838 SHA512 2c0a48092bdb142920d87d1a5f03c05dae5e72cb61c3614c5b2e2497533619b1fba93d2062ee2a56885ef1463867a6ccaddc3d9c74bbd0d0352a5dd21b04d107
-EBUILD text-unidecode-1.3.ebuild 697 BLAKE2B 6e43d338ac6e4371f3e10cae1efbeca9de9828e32f502c1c649bd07b827e89f7c30dd68c94902d558121371d2eb6f4bc0010f66eb88e331d824aa75ebe515afa SHA512 a76fd61136ad81f7260ffaecbd175284e2b026389ffac7dc977051bc6704e39bcd654574105f44a6fa5b8e0831fa7b11a7351cc0ff71eb23abf93f9ba20b6730
-MISC metadata.xml 459 BLAKE2B 13efe5082206b1a208c818075df9b28deb81df6f5cf1e3a08eace945de7d80b6f454eb8e65314e52b473f3be2338e1ca610a989a1a76aaa481de05e93f66deb1 SHA512 61685c171fe4f0b7f3742b390cd638a44a0934fef60514a3e9062ad0718bd3a177b7e4dcc30af3ba7b48f414d865263196afa74a30a54b31ab32ea5eef2711c4
diff --git a/dev-python/text-unidecode/metadata.xml b/dev-python/text-unidecode/metadata.xml
deleted file mode 100644
index 9cd686ee4..000000000
--- a/dev-python/text-unidecode/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>b@edevau.net</email>
-    <name>Andreas Billmeier</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="pypi">text-unidecode</remote-id>
-    <maintainer status="unknown">
-      <email>kmike84@gmail.com</email>
-      <name>Mikhail Korobov</name>
-    </maintainer>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/text-unidecode/text-unidecode-1.2.ebuild b/dev-python/text-unidecode/text-unidecode-1.2.ebuild
deleted file mode 100644
index 7c5d561fe..000000000
--- a/dev-python/text-unidecode/text-unidecode-1.2.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{5,6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="The most basic Text::Unidecode port"
-HOMEPAGE="https://github.com/kmike/text-unidecode/ https://pypi.org/project/text-unidecode/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Artistic-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/text-unidecode/text-unidecode-1.3.ebuild b/dev-python/text-unidecode/text-unidecode-1.3.ebuild
deleted file mode 100644
index 70503b038..000000000
--- a/dev-python/text-unidecode/text-unidecode-1.3.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit distutils-r1
-
-DESCRIPTION="The most basic Text::Unidecode port"
-HOMEPAGE="https://github.com/kmike/text-unidecode/ https://pypi.org/project/text-unidecode/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Artistic-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/todoist-python/Manifest b/dev-python/todoist-python/Manifest
index d0d4cc6cd..7ce29d118 100644
--- a/dev-python/todoist-python/Manifest
+++ b/dev-python/todoist-python/Manifest
@@ -1,5 +1,5 @@
 DIST 8.0.0.tar.gz 23176 BLAKE2B fb1a1ee41437da5067c675994188f0e5484072f5dda6763df3e069f9941b63e638eee51354c3b02aec448a026d5d747fe0d0d37a46b55bc5525d38888805737c SHA512 77103896682276f4deaaef7d9269932a8ca124d543b21376d3447f7f76c4277137757497f3f34de2759496931974659ab57a10a96863a9d3afcd3e373ad3ee65
 DIST 8.0.2.tar.gz 23187 BLAKE2B 7d5897b8ff3d07754473c8bf95482fb83bf412b76a55d45598e99634d9a6f491ab1c1b0d335a2ecffe91e749cb691a8b807390314091cb0cb9646327d9ff58fd SHA512 d1944e931e5e2e50061ac1b1e345c75afabbd3788ddfe2467c3302cb83532785d6c626c2c446c105a15b1d62e249759dfe79e8af85bc1b54c183c0b1b67d44a7
-EBUILD todoist-python-8.0.0.ebuild 697 BLAKE2B 4e845d110c40040fc7ff26a35f1518c77f821944dd4566df8e2a26c9f045d868fce117cbe655c7424e3b415aa0099ff5c60f5e7b151cc2da23a771cf9161f95e SHA512 9f67605da1bab222812ec615cc1ee485be4dec773d5220d98f3d8f12f58dea4747862486a8fd1f87aaba71989c1208251de8e692cfccf03cb19cfd040ff65799
-EBUILD todoist-python-8.0.2.ebuild 704 BLAKE2B 9b5b5ac3e5d76924ad35b32d7259df5614fa11582c9df6584e00704f343d9a900d54278fc9499ae2c687e67d5913e9c0cde1d49d7f66681db15325f7a167bfbf SHA512 b9a9ff5c64364fa332e4f9ab62c9c835d31e61f863d67305d0891f2f755615ae17302d8ba9796ab0a605078e11e66b2e8e1b0837003e1fc6c9dc05883e5f97a2
+EBUILD todoist-python-8.0.0.ebuild 696 BLAKE2B 452e8707389de10b974fe8d06a80100ce3b457f251c5199313912544ebc6305314670107f3e0d22886523f274eb949038fecb3f998774fafd6e2ecc728f9952a SHA512 5b50708f5cf62f8f62dc1158cbf5e3d49ef85201d2b37ed1e49f41b11070aa396151a5a5f8a762563f4ba706a3af4f1aeda058983711111173bd9ddca7913423
+EBUILD todoist-python-8.0.2.ebuild 703 BLAKE2B f41b36104480cb165f9c02d96657239b8fd3e50e028aa1a06fbf6a5912d8a9f973884099d21b7dae8b1458dea60514730e1e44ed8aeca11f5158399cd231b3c5 SHA512 516be639800d1a84491a39b28f370ac336a209ff4c66ea5c022d542ec43a8f6d7baa37b1e7af7248adde028f11203ea205582a9c2fa366258cdbf028089e87ee
 MISC metadata.xml 453 BLAKE2B 445ae7e4b70b1c24ec0f8b7c59d81bfdd3935224e511a4845a216a1b36a207fcbed731389fc31f7da729d0dfc52efd7c8ba204c5d9c36d3e3f46af08bb921369 SHA512 81b8782d302c31fbce65c22e105b2f2d77160faadc3814b48f9b0c395fda592e59fb83972237f89cfd41ed81bf4789fea8b8df632c7c41b23d7983df1aba3260
diff --git a/dev-python/todoist-python/todoist-python-8.0.0.ebuild b/dev-python/todoist-python/todoist-python-8.0.0.ebuild
index 2ff31853d..956f959e8 100644
--- a/dev-python/todoist-python/todoist-python-8.0.0.ebuild
+++ b/dev-python/todoist-python/todoist-python-8.0.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/todoist-python/todoist-python-8.0.2.ebuild b/dev-python/todoist-python/todoist-python-8.0.2.ebuild
index cc1764656..6d2815156 100644
--- a/dev-python/todoist-python/todoist-python-8.0.2.ebuild
+++ b/dev-python/todoist-python/todoist-python-8.0.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/toonapilib/Manifest b/dev-python/toonapilib/Manifest
deleted file mode 100644
index c1abd654a..000000000
--- a/dev-python/toonapilib/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-DIST toonapilib-3.0.10.tar.gz 63287 BLAKE2B fa0183562e014231efdff3af59bca2a0d11260e7032a2f106493cb4a61c07cb721173640cb4c6d39cbaa259cc891c9f9207d5edc223aaa736dc7a3c7e11fa540 SHA512 48bcdf288bfbf04c6048cac9d80f475c3b7ec85d9aceab6c8becdca25cc2eb6e90c93852ff74a1b97e821a7308ff585c9aca3a2122864b16bfd585a8331e7c70
-DIST toonapilib-3.2.2.tar.gz 54060 BLAKE2B 917acf354939132f2d3012ae0f91773b47e20c91e37dbb4bbec433f0e6c6ec83939981f47e40a47af4b040817ade9bc3a36addc6d8dce3e672467728beafdd1d SHA512 2df6425a1ea5112cfdbc10676c25c25badee6b55a046016d3d10e7a45d460f067f56a3fe5495b371a82eb5e95b735773df973aa719eb0eea2928ce5eaf367436
-DIST toonapilib-3.2.4.tar.gz 68780 BLAKE2B 1b6c3a1fb1f24e712d7d6696b5e43c5d1504e3c1dd581d8a3f46bd1dda91cdf778e1a2e3d83d112a5ebf928633bb31d48c7b6ad5878586eeeb11bd130a6e5d44 SHA512 406042773743586df521d60f48cd4b810e4d01ba48030ecc7b37a3431577935d4ea9a52e60aae817c07ce0d6b76b420e6280b6f3c0b1ec98c1f04db81e0285d4
-EBUILD toonapilib-3.0.10.ebuild 717 BLAKE2B c2375a6b86b7f4d15f872c1534ad3a3d0be5f920c2843a97f58940bbc1939d061c63847331b72ae8e6796bb47204aaf97a6be1cc7eddb9b2174fa3557cf9ee5c SHA512 1e3838be936c09cc2e36379b869909b7c7f6fa5981d26c099c9c0146d6a590bd022be87bd8ad18efd1520b739d74f2ccc0a0777df47eee43949403272d0d0bd0
-EBUILD toonapilib-3.2.2.ebuild 717 BLAKE2B c2375a6b86b7f4d15f872c1534ad3a3d0be5f920c2843a97f58940bbc1939d061c63847331b72ae8e6796bb47204aaf97a6be1cc7eddb9b2174fa3557cf9ee5c SHA512 1e3838be936c09cc2e36379b869909b7c7f6fa5981d26c099c9c0146d6a590bd022be87bd8ad18efd1520b739d74f2ccc0a0777df47eee43949403272d0d0bd0
-EBUILD toonapilib-3.2.4.ebuild 724 BLAKE2B c5f8003e46215dd653b2a102985ba7ca040a0da80826b7c5631e98da930e7b694ba7a9d171246b4fa6472873f615175f82e1d44b9f76fd8cb47c5e95d25530f5 SHA512 24b46909eec50a95dc51c4f604a8fae58d17531afa75010064bee4c7a74033fef703c416955fd743377cd92b18bb9fb8b4cd8811463724435f9b965485da6dbc
-MISC metadata.xml 346 BLAKE2B 90addc7a275a9527a8619b5118ccabddaa033bedb29251e47fd3cd9d11c9ac41b8e35e07d34e0fda996797f0004f327be9dfc1ab15b90fd2340733269b539583 SHA512 200b09e1939f4319bd61787bfe2f53fe004496d878b1a80bed50793c72570501a39d9d8c70e97c42f9a53212484f737462bf10d0ff57facf776690c3f32b7a80
diff --git a/dev-python/toonapilib/metadata.xml b/dev-python/toonapilib/metadata.xml
deleted file mode 100644
index c2e8869c9..000000000
--- a/dev-python/toonapilib/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <upstream>
-    <remote-id type="pypi">toonapilib</remote-id>
-    <maintainer status="unknown">
-      <email>costas.tyf@gmail.com</email>
-      <name>Costas Tyfoxylos</name>
-    </maintainer>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/toonapilib/toonapilib-3.0.10.ebuild b/dev-python/toonapilib/toonapilib-3.0.10.ebuild
deleted file mode 100644
index 126b34f1c..000000000
--- a/dev-python/toonapilib/toonapilib-3.0.10.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{5,6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="A library to interact with eneco's "Toon" smart meter via their official api."
-HOMEPAGE="https://github.com/costastf/toonapilib https://pypi.org/project/toonapilib/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/toonapilib/toonapilib-3.2.2.ebuild b/dev-python/toonapilib/toonapilib-3.2.2.ebuild
deleted file mode 100644
index 126b34f1c..000000000
--- a/dev-python/toonapilib/toonapilib-3.2.2.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{5,6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="A library to interact with eneco's "Toon" smart meter via their official api."
-HOMEPAGE="https://github.com/costastf/toonapilib https://pypi.org/project/toonapilib/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/toonapilib/toonapilib-3.2.4.ebuild b/dev-python/toonapilib/toonapilib-3.2.4.ebuild
deleted file mode 100644
index 4f5a377f5..000000000
--- a/dev-python/toonapilib/toonapilib-3.2.4.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit distutils-r1
-
-DESCRIPTION="A library to interact with eneco's "Toon" smart meter via their official api."
-HOMEPAGE="https://github.com/costastf/toonapilib https://pypi.org/project/toonapilib/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/tplink/Manifest b/dev-python/tplink/Manifest
deleted file mode 100644
index 27a5ca931..000000000
--- a/dev-python/tplink/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST tplink-0.2.1.tar.gz 8867 BLAKE2B b11a4cc5cdf00a00f9762188da1b45d754d2e4c0614d5f98d9151de5e8ffc078d0267662dd864cbf271181689a537898566ceb1a3be7f48b049c6e4d5ea040a5 SHA512 9110bef139c7f66e596a962cb6791d52cd176b39c851031fc7f835121e20544880dcba0cda08ead1d1a317142949965f0f604013fdc8ae6ddfaa52ec4e6d1808
-DIST tplink-0.2.3.tar.gz 8974 BLAKE2B 973b04ca8a385426c19a746dc1d5d4b2db3a81b1996ef7d28e0c85f3d769a70429a24f398ff282a6bfa04dd0e02e37e84157f474569edbf31292a625e59fe0b0 SHA512 22eb764bb6021603cd7875d3e3cd045c4033d7fdd190d4d22336f8f34f0f9211fa5fd2e45814b5f6fc5249e310cc9f14bf0825b6b3b98a28f3ef3236c718b08a
-EBUILD tplink-0.2.1.ebuild 679 BLAKE2B a218075ac4040fc178d92e8df189496a0f98ec2d3c6731d35fcde405f8f65a823cc16656c930cedfc49b685fadfc78aac3211640efb4e187cb24385f62624cc8 SHA512 678e358acf0b99378c7a8c1bd6e08054c69b5c7528952b7e8d37ebbff2355cdf3b63aa563799cfc11ec261c0693025369f8b01f5138eb286e19bab7ebe0dd3d7
-EBUILD tplink-0.2.3.ebuild 686 BLAKE2B b3a8106b4df0b78d2bb5cb2ecd81e204a03a45fb1b7bcd9778630d78f91f5fd777fec87d39bd5381f59f53faa6b56554c1168835b94c4773b648cf22b41b9314 SHA512 01506506ec312986797af88dc5fb6d61ddc6b0eea6ab59a82a8fe71ac4d5564c4137fa03aaa35450f7028357573145c30979ebb82a2df098f8d8b61531b83384
-MISC metadata.xml 451 BLAKE2B 7f61699e5432583250d4c704abc200c79e7edb12b071950cc884bbecad140b5afbf29f4f5cec869696a3cb4daa8d7d7040113b89bf07bb12b14eac8cb0828f89 SHA512 ebfccd991712eba76aeb5a7bc5de0001f036cae223e1a4918510674d8dcd9206f03b2636f2ab72f0df8367d2d963e1b9c4da9ceb817fb0ab9a044d2b0c029540
diff --git a/dev-python/tplink/metadata.xml b/dev-python/tplink/metadata.xml
deleted file mode 100644
index 6f29f4bf1..000000000
--- a/dev-python/tplink/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>b@edevau.net</email>
-    <name>Andreas Billmeier</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="pypi">tplink</remote-id>
-    <maintainer status="unknown">
-      <email>dario@jntstudio.net</email>
-      <name>Dario Iacampo</name>
-    </maintainer>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/tplink/tplink-0.2.1.ebuild b/dev-python/tplink/tplink-0.2.1.ebuild
deleted file mode 100644
index ec3a21590..000000000
--- a/dev-python/tplink/tplink-0.2.1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{5,6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Get the list of hosts connected to the router"
-HOMEPAGE="https://github.com/JackNova/tplink https://pypi.org/project/tplink/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/tplink/tplink-0.2.3.ebuild b/dev-python/tplink/tplink-0.2.3.ebuild
deleted file mode 100644
index c53098e83..000000000
--- a/dev-python/tplink/tplink-0.2.3.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit distutils-r1
-
-DESCRIPTION="Get the list of hosts connected to the router"
-HOMEPAGE="https://github.com/JackNova/tplink https://pypi.org/project/tplink/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/twilio/Manifest b/dev-python/twilio/Manifest
index a8fa7f413..06c3b30f9 100644
--- a/dev-python/twilio/Manifest
+++ b/dev-python/twilio/Manifest
@@ -1,5 +1,3 @@
-DIST twilio-6.19.1.tar.gz 482956 BLAKE2B 361b8a03253ad6e4ff0399264ecef16b8f7d975ea40c4e4867a3a13d15fbf6a4f3c9f445b6795b72c8825e122ef4cbd7c068a4bd3157b42a3d71b0051995cf6f SHA512 2460ddba0af11da10f9efbb985aa9a0d05fe12053145b29d4b7ba2b330f7b95629acb10b73b1e4e736853955dcd21f82c44ffb08e75cfad35818518c777c3c38
 DIST twilio-6.32.0.tar.gz 541911 BLAKE2B 0863ae0c9c200d45ffc88bc95f0d98a872a08ee783720ee76a0d94e4dfa7c5748ca6d51db0c960c1616a28fd911696f7dfbed15571d68e8ecd1c853168fe257c SHA512 7e0f63a2397a81bc19a839aadb28645446e15f97575dfce4145dc44920ce51f542d346b475c941564c024ba529c2362cff0192a936a4215745916f27a4455ebc
-EBUILD twilio-6.19.1.ebuild 764 BLAKE2B 0fd48609e3309e148b5389865ac86969898446b2890442c5c27c1c4499430b0a3d357704284cab183941856867da612aa7da01af3307e111e963c2b98c0999d9 SHA512 3c5f170d482bb55f3184dde943250858f1b6a0708d90553aa49101ec9ea13dfd80393074cc67edaed34416524b2e9a0e1d48fb4769d17b3eba6e6d0d51604f87
-EBUILD twilio-6.32.0.ebuild 795 BLAKE2B 17c125cae90770071fa15df3972c4a2ba4d73705f46d3d8519f68a23c1918f0ed9005c8c5f0ee5796462839deedcb1b626ec5dff8243dcc90d65873c84ce0080 SHA512 0c988e88f57b290da382a2e9e02a909c8769ea9f4b543e3b6a7c13d8014d1058ce510f3e3be1e770d434d70a604c71dfcf11b8c29fc9607c1cd95012f7820ea8
+EBUILD twilio-6.32.0.ebuild 794 BLAKE2B 1373738c0e0bb3ae6b23cc637bcf910062ea0aad4b8f3392e99a41c6c4d4e7155aa7319a297fb27d98ff30a8c657976d9c6c134cd72776229a197da9dcac9caa SHA512 c1d298049de72e1e5ca129a66069d494102a4b37d42ef2f71c08d7efd10d462c090709662250cf83cf0acb5164089d16adab77dabc1244e8bbc3850b9488e895
 MISC metadata.xml 252 BLAKE2B 507e0ddc9d50b879ff374b903b142f85d020dfd6c486aba2af84fe082c878e780edbb79188ae10104d57db0eb775c86814cc8c06891a3854c9da840a4d377050 SHA512 9470ac9c8a5a4f80e3f767e7aa198addc7b21866c63b2a310e9f41ce65817672fb77423117bdd619e99cb62322025aeadf50717e23eafabf99080fcc106820af
diff --git a/dev-python/twilio/twilio-6.19.1.ebuild b/dev-python/twilio/twilio-6.19.1.ebuild
deleted file mode 100644
index 06afbc82d..000000000
--- a/dev-python/twilio/twilio-6.19.1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{5,6,7} )
-
-inherit distutils-r1 vcs-snapshot
-
-DESCRIPTION="Helper library for the Twilio API"
-HOMEPAGE="https://github.com/twilio/twilio-python https://www.twilio.com/docs/python/install"
-SRC_URI="https://github.com/twilio/${PN}-python/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-
-IUSE="test"
-
-CDEPEND="dev-python/six[${PYTHON_USEDEP}]
-		dev-python/httplib2[${PYTHON_USEDEP}]
-		dev-python/PySocks[${PYTHON_USEDEP}]"
-
-RDEPEND="${CDEPEND}"
-DEPEND="test? (
-			${CDEPEND}
-			dev-python/nose[${PYTHON_USEDEP}]
-		)"
-
-python_test() {
-	nosetests tests || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/twilio/twilio-6.32.0.ebuild b/dev-python/twilio/twilio-6.32.0.ebuild
index fee988395..a27dad22b 100644
--- a/dev-python/twilio/twilio-6.32.0.ebuild
+++ b/dev-python/twilio/twilio-6.32.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1 vcs-snapshot
 
diff --git a/dev-python/txaio/Manifest b/dev-python/txaio/Manifest
index df299efd3..c239aa6ae 100644
--- a/dev-python/txaio/Manifest
+++ b/dev-python/txaio/Manifest
@@ -1,5 +1,5 @@
 DIST txaio-18.7.1.tar.gz 45587 BLAKE2B c8185eb99752b8cde256cb0177513927e52e599777cf84e05f92dd539d1bf29fcc1b638efb3931f6542fc8cec5cc9af1b7da92799ce009e398b9c43c0eb8899c SHA512 d88cc8862340d269470e91a3e2d60c5c3ca6e169e838069f690e35bbf07d3db516b59e0e76cb83cfd1217ca73c0705fdae451df3d9c69adc421579eb2f1b68d9
 DIST txaio-18.8.1.tar.gz 51092 BLAKE2B e22ae7c031e01437856ea9ed7d18c85600b769b1d76d52fb6ba2bf651944556cf8f473984e4befa7c1eeb192e6a6b221c6d3ae43b3914776ef7cdbd1a0d8ab02 SHA512 5aa0024b32211534b0c673da13b092ba08e15195b3b016bc21104618605d5c0b49096fa2795e13d9d5c4247defa1d72f903cbcc8d00a21359825224faab64b64
-EBUILD txaio-18.7.1.ebuild 929 BLAKE2B df963f1718990e45d17783ff0b03732f307bcf437e89eab440149471bfea7ef4607367d6f94ada530546884851f5406e3a9c6826bdec54dce6b47faae53a59d0 SHA512 051301262622b28f7f6285f43a1b990f61dee975713eb82dde9caf5bf12011b2077c03ba61d7e967f71dcd2fc66bce3867e0abfdfa09d8a114b72fbbeb6b4d4b
-EBUILD txaio-18.8.1.ebuild 938 BLAKE2B 37670f15efec1466719ac3b1190d450fad6f284aa6a1d4b7bd04cdbae424c01b4e49dc2e05074b942dfc07ea82324d32683cd9b898947e15332dae63baecf45f SHA512 d7a7d30e94bd34d767250e8ebc604548085aefe0482dac17eeaa3bcd47dae001e95417f75ad66e6a29fe2ccd32b2f69ead0aa0c8ebcb8205b2ad6578e6c9ea02
+EBUILD txaio-18.7.1.ebuild 930 BLAKE2B af352a5c1fc8ca2639e5411ade4c4084e393a1691513e35ce79a614cd5e101c96792ffbb7bb1885028bfa5dbb32ad1a10c1aff4bd12ea6b2066face2b1d3b1e7 SHA512 bee3e4eccbaa44a0e2caef1730c5c55d0bd78fc7080662f5102d248873327ef3d9b0171e9523f75ec131ad575a754deeff263c4b7e4b6dd0a74efec0b23ddabb
+EBUILD txaio-18.8.1.ebuild 937 BLAKE2B c07f415bf0396dfb467e2ac00adac43c7c705766dec4883ef5b2800fe907216f175f0690c68c83736c50ec5e8085ee16463b9ffaff504822d04d3b68f2415a8e SHA512 5872e5fcd25dc4a3d34730bd48e643c310caa62e1a8993630ca8457d69ef4c1ee85d7bedf2ebebadda7bc39e11b4f6254891d00056397c3a6ef620148c3a10ef
 MISC metadata.xml 474 BLAKE2B d65de6e8457088e95b3cf40b688fb57040fa6b3e5d91e5bbff74c2130129ec941693f6de40205eaddba5f10de7ce22b871f78ecc15344f2a8874b63457b5278f SHA512 c04cdbeabe7d1a53fa428d45af9248df01cc6d0477bad057aa53f8f1dba7588829f8e15b6c5614500a5cb4882d496371983a9f7344a7b06f46b9223405aea643
diff --git a/dev-python/txaio/txaio-18.7.1.ebuild b/dev-python/txaio/txaio-18.7.1.ebuild
index 620220de3..51162002e 100644
--- a/dev-python/txaio/txaio-18.7.1.ebuild
+++ b/dev-python/txaio/txaio-18.7.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/txaio/txaio-18.8.1.ebuild b/dev-python/txaio/txaio-18.8.1.ebuild
index d8ce77bc1..b7146cdf8 100644
--- a/dev-python/txaio/txaio-18.8.1.ebuild
+++ b/dev-python/txaio/txaio-18.8.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/tzlocal/Manifest b/dev-python/tzlocal/Manifest
deleted file mode 100644
index 190e8c369..000000000
--- a/dev-python/tzlocal/Manifest
+++ /dev/null
@@ -1,8 +0,0 @@
-DIST tzlocal-1.4.tar.gz 15279 BLAKE2B 2d1814c2a4fd2ed5b4b345c94e1cad05c850ab02764fc76e33940aa5f2c4c593c376e9252ca9524a0fc5732b201c222e7d4c1374c2842de6686e277dd537468f SHA512 e846f00cb0571da0c891ca8576d614ebfed622431201c713ef38a80fc990fa19298873bad74e5020648ec4b8307ce8362412e0e05d260121e9d70691814a321b
-DIST tzlocal-1.5.1.tar.gz 16809 BLAKE2B e2d73cc7a47623deb179af92b590dd558beed214ea9f203012c0947e848ac7a3abc27a5f00dec666eedfbe5909f1c3ab3521267bf9d417d7e734744693df7742 SHA512 9141e3941435fa16afe040f49b8225cdc3434e10003275fe5df9166cb9562764a51c83bc16b6d5be197feb45c913859a37393e13285f0e612510ce076a6451d9
-DIST tzlocal-2.0.0.tar.gz 22040 BLAKE2B 4527c9f23640165547ee77d36defc54000241b0141a54043659dd6c93876c9f97e9f6b5189f889a969e8a6100c176e14df56b2a1b8eceb4036d9f7ed3aa7912c SHA512 b72487f791df1dda7370ef5de58e524a451bf87a2ad5ce9d365591fb45af1e080499956d9b19410aeacdf3013ce09c84cd3ec243e15d3bbbee4cec32685298d9
-EBUILD tzlocal-1.4.ebuild 575 BLAKE2B c57d63221d03e7d9e617946fed4f2b19914b36499458e210d9c42c1ec93148c172f4210de95436b568205e20acf57612ce24b498a67517ea5325275a71e2c5f4 SHA512 f116be1a262b62f5ee6549f60e3708ee4a020b15777bc953d094e565cd2993f11845c7d2dc9fda915df7f866ffdf326b9b1561d527a8635d1e6db96d6b90ac76
-EBUILD tzlocal-1.5.1.ebuild 582 BLAKE2B a51f0960f94f350118299aa6fb29555fc60d79a9f348ffc733138ccb102a25abdc0783cb0fb2921fa51b994a3d8319d4fd9978dea7adb12279334c16f7279314 SHA512 3d83f56bedb000eea6871ae68120080ae10ff862e98ce299c6ebe4512ed58a12c00173a6fad1ad8a258b9e45772f422e6aa19b1a687e745e2b8037dcbd5e523c
-EBUILD tzlocal-2.0.0-r1.ebuild 599 BLAKE2B 704bc354d8dbd893d96c8e93b4555f6754f467d9bcf81f00727d8771a8d91d5fadde652715f0d1dcd7b9bf4dd6ac22079b4659806192a1fed0991e0a9fdae3ba SHA512 0602fd20120f8cdf145571406b2227d2b2d0bdfd82d5c21e62f5df827bd6684bb0c2824fa3324a35169d8ab4acd0a8c3b6594e46df18ac2952308f3ade4567c5
-EBUILD tzlocal-2.0.0.ebuild 575 BLAKE2B c57d63221d03e7d9e617946fed4f2b19914b36499458e210d9c42c1ec93148c172f4210de95436b568205e20acf57612ce24b498a67517ea5325275a71e2c5f4 SHA512 f116be1a262b62f5ee6549f60e3708ee4a020b15777bc953d094e565cd2993f11845c7d2dc9fda915df7f866ffdf326b9b1561d527a8635d1e6db96d6b90ac76
-MISC metadata.xml 377 BLAKE2B c85be3067a235a5d7546bcf7c3eb05857986a371bca6743e222e9016ab6d6d5a212f3f65d7e9db523ef9ddb8091b62c1cfbd2d5c5d6d8560fcf881aaa3ffad80 SHA512 3ada56c5037a2a59fb53408483f03bc3ae72c9d7f676dd046125b035b34d4195e653662b67529453d63556dedda4471a9c77daaa1137af1245e49174fef1fd87
diff --git a/dev-python/tzlocal/metadata.xml b/dev-python/tzlocal/metadata.xml
deleted file mode 100644
index ba2007a1f..000000000
--- a/dev-python/tzlocal/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>python@gentoo.org</email>
-    <name>Python</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="pypi">tzlocal</remote-id>
-    <remote-id type="github">regebro/tzlocal</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/tzlocal/tzlocal-1.4.ebuild b/dev-python/tzlocal/tzlocal-1.4.ebuild
deleted file mode 100644
index 58d161fcb..000000000
--- a/dev-python/tzlocal/tzlocal-1.4.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
-
-inherit distutils-r1
-
-DESCRIPTION="tzinfo object for the local timezone"
-HOMEPAGE="https://github.com/regebro/tzlocal"
-SRC_URI="mirror://pypi/t/${PN}/${P}.tar.gz"
-
-LICENSE="CC0-1.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDPEND="dev-python/pytz[${PYTHON_USEDEP}]"
-
-python_test() {
-	unset TZ
-	"${PYTHON}" -m unittest discover || die "Testing failed with ${EPYTHON}"
-}
diff --git a/dev-python/tzlocal/tzlocal-1.5.1.ebuild b/dev-python/tzlocal/tzlocal-1.5.1.ebuild
deleted file mode 100644
index fdbf93298..000000000
--- a/dev-python/tzlocal/tzlocal-1.5.1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_{6,7,8}} )
-
-inherit distutils-r1
-
-DESCRIPTION="tzinfo object for the local timezone"
-HOMEPAGE="https://github.com/regebro/tzlocal"
-SRC_URI="mirror://pypi/t/${PN}/${P}.tar.gz"
-
-LICENSE="CC0-1.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDPEND="dev-python/pytz[${PYTHON_USEDEP}]"
-
-python_test() {
-	unset TZ
-	"${PYTHON}" -m unittest discover || die "Testing failed with ${EPYTHON}"
-}
diff --git a/dev-python/tzlocal/tzlocal-2.0.0-r1.ebuild b/dev-python/tzlocal/tzlocal-2.0.0-r1.ebuild
deleted file mode 100644
index d7e5ff9fe..000000000
--- a/dev-python/tzlocal/tzlocal-2.0.0-r1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit distutils-r1
-
-DESCRIPTION="tzinfo object for the local timezone"
-HOMEPAGE="https://github.com/regebro/tzlocal"
-SRC_URI="mirror://pypi/t/${PN}/${P}.tar.gz"
-
-LICENSE="CC0-1.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 x86 amd64-linux x86-linux"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDPEND="dev-python/pytz[${PYTHON_USEDEP}]"
-
-python_test() {
-	unset TZ
-	"${PYTHON}" -m unittest discover || die "Testing failed with ${EPYTHON}"
-}
diff --git a/dev-python/tzlocal/tzlocal-2.0.0.ebuild b/dev-python/tzlocal/tzlocal-2.0.0.ebuild
deleted file mode 100644
index 58d161fcb..000000000
--- a/dev-python/tzlocal/tzlocal-2.0.0.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
-
-inherit distutils-r1
-
-DESCRIPTION="tzinfo object for the local timezone"
-HOMEPAGE="https://github.com/regebro/tzlocal"
-SRC_URI="mirror://pypi/t/${PN}/${P}.tar.gz"
-
-LICENSE="CC0-1.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDPEND="dev-python/pytz[${PYTHON_USEDEP}]"
-
-python_test() {
-	unset TZ
-	"${PYTHON}" -m unittest discover || die "Testing failed with ${EPYTHON}"
-}
diff --git a/dev-python/ua-parser/Manifest b/dev-python/ua-parser/Manifest
deleted file mode 100644
index 59e52f755..000000000
--- a/dev-python/ua-parser/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST ua-parser-0.8.0.tar.gz 35024 BLAKE2B 61248efca1642e7f52ce8753456c44a7c1d84f6bc556308bc824da5f7422a97328e107ed3ca637bd23998cee5a2f407ab1f07a351857338baf8d5f8e4f884454 SHA512 3c9fb70a6cbae13aedc9e3bb0ed2442d9d4f1f6bb211c1a71a45c8f2afe38c90d824dbd827a6d9cf4badb298d3e7d5992d2139fdd4b0349abd1fe400bb9b183f
-EBUILD ua-parser-0.8.0-r1.ebuild 719 BLAKE2B f128775c944e144086585d6e821ccb0fc924c8abe9fc2042c1d1b45b05ca8657a3dbb8e5f5fcb85a50bcee117cac83f277925a270a9005db4adf3df485626d6f SHA512 ccb7ed937ec6ee367107dcac041db4121dfe2488a314e2369c932d84100caea93ff2b4ddd5a1f28ee4ef1d42cdb0de8a6c2984903da51528f9d5114053c06706
-EBUILD ua-parser-0.8.0.ebuild 692 BLAKE2B 334bf08398988e2e86f9001f9860ca044c0a56f7fc43082eef1dd92fff25e3a90befcac40cd0cb952b8d69de51f5ca0a6947168495389482b814dd249a64fb59 SHA512 cc709c60e61ef1d32d2cfc86540937c27f08ed41494205c2637ac5bc8535fdf7ef7fffcc5bcbf09c568bc9ffbeecaca0e22f5f4c584cf7505adf805cadc82c61
-MISC metadata.xml 252 BLAKE2B 507e0ddc9d50b879ff374b903b142f85d020dfd6c486aba2af84fe082c878e780edbb79188ae10104d57db0eb775c86814cc8c06891a3854c9da840a4d377050 SHA512 9470ac9c8a5a4f80e3f767e7aa198addc7b21866c63b2a310e9f41ce65817672fb77423117bdd619e99cb62322025aeadf50717e23eafabf99080fcc106820af
diff --git a/dev-python/ua-parser/metadata.xml b/dev-python/ua-parser/metadata.xml
deleted file mode 100644
index 70d025d32..000000000
--- a/dev-python/ua-parser/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>b@edevau.net</email>
-    <name>Andreas Billmeier</name>
-  </maintainer>
-</pkgmetadata>
diff --git a/dev-python/ua-parser/ua-parser-0.8.0-r1.ebuild b/dev-python/ua-parser/ua-parser-0.8.0-r1.ebuild
deleted file mode 100644
index cb9727a5e..000000000
--- a/dev-python/ua-parser/ua-parser-0.8.0-r1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python port of Browserscope's user agent parser"
-HOMEPAGE="https://github.com/ua-parser/uap-python https://pypi.org/project/ua-parser/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 x86 amd64-linux x86-linux"
-IUSE="test"
-
-RDEPEND=">=dev-python/pyyaml-5.1"
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/ua-parser/ua-parser-0.8.0.ebuild b/dev-python/ua-parser/ua-parser-0.8.0.ebuild
deleted file mode 100644
index 249f62527..000000000
--- a/dev-python/ua-parser/ua-parser-0.8.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python port of Browserscope's user agent parser"
-HOMEPAGE="https://github.com/ua-parser/uap-python https://pypi.org/project/ua-parser/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/unifiled/Manifest b/dev-python/unifiled/Manifest
index 1a7c0560d..7f820476a 100644
--- a/dev-python/unifiled/Manifest
+++ b/dev-python/unifiled/Manifest
@@ -1,7 +1,5 @@
-DIST unifiled-0.10.tar.gz 2316 BLAKE2B 3e02ff41741bd8d58af9c51c5b378339a5e1c6ee315a02c25533a5a18bb372ee8be3ab837dc8c428d4eaa1174dfb173a8368bf044f6482bbfaaf67b65b94c7df SHA512 64bca0f13e1e54a7954ea396518ef3a7a8320ac702797fe4e0fbdd97102563e9db81823e1a2ca4a7b23129c5409df2d8116dd337cf578107b063e2660ba4d5af
 DIST unifiled-0.11.tar.gz 2217 BLAKE2B bacece436e2fca39b26ff680986e75af4b532903bbf0732047817156752a29e360d0f5d4689e0f53d91bafc23352a37d6fb6b5006f77a8f7002ee576b221906f SHA512 edc3989060a0d5b0d7f7f1be343b5295e35eb48b0f5a83700bd0832edcd9098ed29ff2d9d36b305c61d4ba4e52ed63e9b0da8f720b0ded039edacdc06125083e
 DIST unifiled-0.12.tar.gz 2282 BLAKE2B 5d6b961a0f716c14bb8db36158450f33d3b8b1d55e34a5d4547910423a5ec51ef8895ba7cbc1a80bcb4131877cde1547c2541c5da5d5e91ad04ae36c7b1f12fa SHA512 4a2c2d2bef022d7174682353e03fdf22f66ab9d16b5d455d94237f0c1e09c0a6979d0bf57a94f210c3aa7252f5552448abe06e76d214b42d103c0ebff2ea6fb9
-EBUILD unifiled-0.10.ebuild 683 BLAKE2B b888dba608cec858036ab1e1c384d88faaa69f5c1a40c1509dc054227465468a69a7ae15eab7b93e013534277960b7719b09315ba193c7c1f1f47b94c631899c SHA512 1214376fb4faeba904b28ef5952ae6659331d635941b030d6564771924c2238b2cbcaafbe0ccf434c6089ade547116cc942a7ecca57908b86ea2c143b3c5486d
-EBUILD unifiled-0.11.ebuild 683 BLAKE2B b888dba608cec858036ab1e1c384d88faaa69f5c1a40c1509dc054227465468a69a7ae15eab7b93e013534277960b7719b09315ba193c7c1f1f47b94c631899c SHA512 1214376fb4faeba904b28ef5952ae6659331d635941b030d6564771924c2238b2cbcaafbe0ccf434c6089ade547116cc942a7ecca57908b86ea2c143b3c5486d
-EBUILD unifiled-0.12.ebuild 690 BLAKE2B f0d68a04b37f84e8abe02ebe86d0a384fad4f8071c4f0b129f2ff79c7010e340689e745193953b4953faff6d2128fe1900fa74ffe5e6050cda5ce91def4ea667 SHA512 e0df07745223dec75e11605800960c8f859a6b86bc791030b3343036b4f481da65e8073783915e9ae015a097b6a42f5d4e37a447587bfb9b5bdd8a721f89036f
+EBUILD unifiled-0.11.ebuild 682 BLAKE2B 94dedf8299e3987cd6dcc6bc8b025886ce3bb37108065f58a906a1cde6820c1c7109670f4862487d1903650a3287b8724a2c7f41ec0fc046043159ad574c731c SHA512 8982d3a02506b758e08a59b8444fb7ad2441f3493efa54a9fd4bd6b6ef653e192a07cd7833dc77f10096995d4d9fb244d172c984745ea331ae4e7b5a94ef7c0c
+EBUILD unifiled-0.12.ebuild 689 BLAKE2B af7e62c3bcfe91c09905dc1cccad25a238eba0354b25cedfebce2405602d534f586d909958ab8c923e202d6c46034d72c9f80e729bd26194f7f6e44253897590 SHA512 3e0c7fd2f6c9594a75a097374b02d3d241f7ad914e9df7c2053c519eac03e153f347f77dde6d29d809087c8cbf90257941a986802e3ac73bd62b6e5d42c6fb0a
 MISC metadata.xml 460 BLAKE2B bf4f45139e35fd2557adc55439ff65c72e9951204fea4846df95c8a6e3a61f409f07aa22009d9f47c32bd4753abc4e60ac2c385de380c6600ceaac4e3a031e9f SHA512 2687d2cdc90540e7b98c4e7bcb83212deb7667f049872833deb124e81947cf8724ed7e58a4fc987038440e0dbb0b0c9dc5e7a1f28342e0eb0c658ed0e3ed2400
diff --git a/dev-python/unifiled/unifiled-0.10.ebuild b/dev-python/unifiled/unifiled-0.10.ebuild
deleted file mode 100644
index c29a7920a..000000000
--- a/dev-python/unifiled/unifiled-0.10.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{5,6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Easily connect to Ubiquiti Unifi led devices"
-HOMEPAGE="https://github.com/florisvdk/unifiled https://pypi.org/project/unifiled/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/unifiled/unifiled-0.11.ebuild b/dev-python/unifiled/unifiled-0.11.ebuild
index c29a7920a..34b292813 100644
--- a/dev-python/unifiled/unifiled-0.11.ebuild
+++ b/dev-python/unifiled/unifiled-0.11.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/unifiled/unifiled-0.12.ebuild b/dev-python/unifiled/unifiled-0.12.ebuild
index 47c7b4c7a..a3eb8713f 100644
--- a/dev-python/unifiled/unifiled-0.12.ebuild
+++ b/dev-python/unifiled/unifiled-0.12.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/upcloud-api/Manifest b/dev-python/upcloud-api/Manifest
index c1a86d87f..a7c4de91e 100644
--- a/dev-python/upcloud-api/Manifest
+++ b/dev-python/upcloud-api/Manifest
@@ -1,7 +1,5 @@
-DIST upcloud-api-0.4.3.tar.gz 38778 BLAKE2B da98ff0e4d888a1f6984c25a3000b0bd8e2a808063d2317ea85e83768f5b9ed65b9cb44513ba9a56969d21481503cfc0aacf7de9037b0e57fca01b0e6fec8063 SHA512 99b007178c1aa15d9292ead2926f9f5f7b2cf701aa02e743e67eb8e04fce76fa909a0fafae3ba4ca90e184d10d129774ecf3c275f11b693e9cdc1acb195fd2ea
 DIST upcloud-api-0.4.5.tar.gz 35875 BLAKE2B b314944694c731f0c02c32177a5db659bc4bc85cfade3f913ef55ebcdf031302b687da18ef781bb969c0568119c315dc84520a2929ecfee77fd04955e202432f SHA512 7c39f8ffb447d75a2f4c26e19701aff76968d83134a4069ce1b13ede15eee7e6ad64aed4d56d174dc6577a7142156dfeeed812d0f995c0896a9f7a13de7e560a
 DIST upcloud-api-1.0.1.tar.gz 56000 BLAKE2B 863ef4bbfe468f8f0abf5be749a6dcf34bea735b155e7328a95be4e747e313d2d2ca4aa766fed67b99606f3dadeee8c5f9a317178539eec5dc5a01c078ba21e8 SHA512 4f7dd49bbeefca1a9aef052fa4fc334f0b6ad13251421c902b9dd2d42376a354aa9a5aaabefa2b7f1af8961a1b261292548a64f22daca6ca9d2476951cd00dc2
-EBUILD upcloud-api-0.4.3.ebuild 801 BLAKE2B 8aff4de8e4b0810c64f2a1fb7a96ef193e288366ca20d474d3509573af20705b115fd7e0621890ef6c99b91d3d7d476dc0a5eaf22a0564ef111943f02b1ee3ab SHA512 e303e0d2ab315744bc655924051ef5c21644ffc49f782e1c8ca088f400572d3f36f5c54151cf69896cf68af9ab1faa24e2554d547918a70da0976996fb859e99
-EBUILD upcloud-api-0.4.5.ebuild 765 BLAKE2B a2d9af83af105e301aee66b238a12ba8c0976d5a11f70c5abd4ae6085043a6f8fb697e57a7d7c2dc7838bb97d4be2889d549a76a3af7f1fa726dd244753b7b1b SHA512 0119cc19fcf10b9f4db5f768ec4992fce27676fc620f8b1ddb35c1bca56472709b729a24620d90f7c238c650452f45d9a04008b70cd84195826ae138b9311fb4
-EBUILD upcloud-api-1.0.1.ebuild 873 BLAKE2B 3878c7fa309ff6367770a03adac3f130823dffa26dfed9aef1244c0a1ea3e901af10c1a347410de0ec07537e3fa117e2580ab558ce504770f1ab6c96c95d7b5a SHA512 576d8fccdf092add5fec7c3ec4640fdc5841b696d1f4868dc7b7c673fbb856c9afcc08fa5e86058e91343428c5a228ed6dba0d370ab874416b846ac94b6e6f73
+EBUILD upcloud-api-0.4.5.ebuild 764 BLAKE2B da2bd3882ea771c2aeec0d09eefe9169c1572998c3424642adcea614efca8a0df38124a14ef9ac6dadf8de9bffb14f8535738688cd8533a47810e5fe63942300 SHA512 e08ba2da3a49d6bdc21cca2e50eff3b85a493af0bdb85bb6fc0c6ec73e6f5259bf6a65ec39700c092bf87fc10742491c18b525d0b85974ac3d4624051246adc8
+EBUILD upcloud-api-1.0.1.ebuild 873 BLAKE2B 886cb2575cf75fb0fc8203dab8c02c6266e2f750afb088010e73539339c521be8f78d849bb0d7aa378175683c11e76d94a716bffcc84531987340b1c3c6c5830 SHA512 add653db955e3e151dc1b33f333c6425b942f0dbce7f73c80bc7e499168b0b80d179a8009cd20b998cf13cd31454d2e634782aef8e309400978fb33ebe46dbfc
 MISC metadata.xml 448 BLAKE2B 53730eabb7afbe87d2d52e27b9320b0047c0bdf2078c1e9fcbf49d3d1d5068f46add5183addc65bdcd1ded7d8f3440031f1573c893f20b9a04dad9a07735d268 SHA512 f881a4689ad3f673000d32454f7f0c4cc112c64b55de494054f1413a33dfdd329d2899854552b0418db96fc48199493457a4101e0776f5bb55c10d9be903c53d
diff --git a/dev-python/upcloud-api/upcloud-api-0.4.3.ebuild b/dev-python/upcloud-api/upcloud-api-0.4.3.ebuild
deleted file mode 100644
index 6588569eb..000000000
--- a/dev-python/upcloud-api/upcloud-api-0.4.3.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="UpCloud API Client"
-HOMEPAGE="https://github.com/UpCloudLtd/upcloud-python-api https://pypi.org/project/upcloud-api/"
-SRC_URI="https://github.com/UpCloudLtd/upcloud-python-api/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=">=dev-python/requests-2.6.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]"
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/upcloud-api/upcloud-api-0.4.5.ebuild b/dev-python/upcloud-api/upcloud-api-0.4.5.ebuild
index ba29d0afc..f5ce86731 100644
--- a/dev-python/upcloud-api/upcloud-api-0.4.5.ebuild
+++ b/dev-python/upcloud-api/upcloud-api-0.4.5.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/upcloud-api/upcloud-api-1.0.1.ebuild b/dev-python/upcloud-api/upcloud-api-1.0.1.ebuild
index 8b5a49381..16fb60aff 100644
--- a/dev-python/upcloud-api/upcloud-api-1.0.1.ebuild
+++ b/dev-python/upcloud-api/upcloud-api-1.0.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/user-agents/Manifest b/dev-python/user-agents/Manifest
index 7e149b55d..97fb8d42c 100644
--- a/dev-python/user-agents/Manifest
+++ b/dev-python/user-agents/Manifest
@@ -1,6 +1,3 @@
-DIST user-agents-1.1.0.tar.gz 11217 BLAKE2B 1f57302568a75c3dbf7504e097a48095ce1b4e5b43f71f2933908de5b44ee821e3ccb8d34132952ac8b1abe17a83cbfd95c9f0d3c9830dc939601689ae51e39b SHA512 4968c80d21e3f10225b74b00617d012381767657d654c2a085c72dab35756b2e3ac25e42376dd57e5dd4888ea05ecf9787164366fae736d762cc5c02d8fb5aed
 DIST user-agents-2.0.tar.gz 9356 BLAKE2B 996130f46e813cca0f7343593ef80c81cf5db335818e03f3ccc770babb775cd522ba508dc323da246e3fbf72bbe010569b5302183ea76f286df63432773acd29 SHA512 0bfd1da8c4b25b521524dfcf9ebb1ea9eaec6f7b72f05f370eb2f180484ecfb54abc0b7c7b4d86c2c5cd6e21bae11581ce8f4587d5b844b135ee48e61a106f58
-EBUILD user-agents-1.1.0.ebuild 593 BLAKE2B 6202cb185bc44ee22d58ccfcab6652d781fb8295a3f90ebe01dd91da7a2dfc8dff5f7119ed1450a2ac65d40b2d12de241c450a3ae01a10c2d890df0041c66c0f SHA512 9f315b7cab9b91af489c158cac40f372a8a500df112d985e81704f0f35287f35f2500b4cbf7de974abeaa81547ac52eca3d60eb8f7ff58a3d0ec90fce94bdc7e
-EBUILD user-agents-2.0-r1.ebuild 595 BLAKE2B e3ea9a294d312822f5cb75e8f265f17bdeb6be4b6d8ca38ecb876e10bdc316f3ffabe4aaf7dfaeefeceb3c265eeee9f7e972062cb1d2d6f13da96fb1c0c8e1ec SHA512 87e2f560893d942fcbbd4a0769177816f8857dacd7eb3210978588e17352daf630932d6b1ea34097201c2cc8e1685e9812f0b5819b8a1faf12066e5d72c16703
-EBUILD user-agents-2.0.ebuild 593 BLAKE2B 6202cb185bc44ee22d58ccfcab6652d781fb8295a3f90ebe01dd91da7a2dfc8dff5f7119ed1450a2ac65d40b2d12de241c450a3ae01a10c2d890df0041c66c0f SHA512 9f315b7cab9b91af489c158cac40f372a8a500df112d985e81704f0f35287f35f2500b4cbf7de974abeaa81547ac52eca3d60eb8f7ff58a3d0ec90fce94bdc7e
+EBUILD user-agents-2.0-r1.ebuild 594 BLAKE2B a7e3fdb4279eec3da2c0f84829920106493e5b5e73c0e60210cdbe39eb7c5025cf7bceea474fc781c0cb9e7af79803ca8e2326d8d9803228c6ef98dfb5f91895 SHA512 e77d801826d5876e273c6d2a322fec1f6261a063e2128a90259048c80191ce421752cef83dd1f5359956c3d25225d7fd9416b666081a00c7b87836fc4e10cbf3
 MISC metadata.xml 252 BLAKE2B 507e0ddc9d50b879ff374b903b142f85d020dfd6c486aba2af84fe082c878e780edbb79188ae10104d57db0eb775c86814cc8c06891a3854c9da840a4d377050 SHA512 9470ac9c8a5a4f80e3f767e7aa198addc7b21866c63b2a310e9f41ce65817672fb77423117bdd619e99cb62322025aeadf50717e23eafabf99080fcc106820af
diff --git a/dev-python/user-agents/user-agents-1.1.0.ebuild b/dev-python/user-agents/user-agents-1.1.0.ebuild
deleted file mode 100644
index c9956992a..000000000
--- a/dev-python/user-agents/user-agents-1.1.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
-
-inherit distutils-r1
-
-DESCRIPTION="A library to identify devices and their capabilities parsing user agent strings"
-HOMEPAGE="https://github.com/selwin/python-user-agents"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86 amd64-linux x86-linux"
-IUSE="test"
-
-DEPEND="
-	test? (
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)
-"
-
-python_test() {
-	py.test -v || die "Tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/user-agents/user-agents-2.0-r1.ebuild b/dev-python/user-agents/user-agents-2.0-r1.ebuild
index f9d19db31..3bbcbbea1 100644
--- a/dev-python/user-agents/user-agents-2.0-r1.ebuild
+++ b/dev-python/user-agents/user-agents-2.0-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/user-agents/user-agents-2.0.ebuild b/dev-python/user-agents/user-agents-2.0.ebuild
deleted file mode 100644
index c9956992a..000000000
--- a/dev-python/user-agents/user-agents-2.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
-
-inherit distutils-r1
-
-DESCRIPTION="A library to identify devices and their capabilities parsing user agent strings"
-HOMEPAGE="https://github.com/selwin/python-user-agents"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86 amd64-linux x86-linux"
-IUSE="test"
-
-DEPEND="
-	test? (
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)
-"
-
-python_test() {
-	py.test -v || die "Tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/vallox-websocket-api/Manifest b/dev-python/vallox-websocket-api/Manifest
index 5fcb260b6..d0250b052 100644
--- a/dev-python/vallox-websocket-api/Manifest
+++ b/dev-python/vallox-websocket-api/Manifest
@@ -1,7 +1,3 @@
-DIST vallox-websocket-api-2.0.0.tar.gz 37937 BLAKE2B 441d3bde52114430f3cc39b2b3eead981c953d75f43dba791c7b93620f01522d4d4aff484400f59881ef22b0d97e25b4f20ebb309afed7d011132948e452221e SHA512 7bb311e3ba2b09c4842be52a4a1af7ce4997f25876ca794cf5a8d03013b1397c643e14c4b1a0ad982db57acab41de2e8ee9438b7fb7702046270fddb373484e4
-DIST vallox-websocket-api-2.2.0.tar.gz 38302 BLAKE2B 3bf1f92aab647a3adbe9bc12aea306896cb64ca0b5355505375f8a534156160233ec14b50ebb55d279d055b73605bde371529a405bdeb3cf024ae2b05c596ce6 SHA512 6541d93762981b6b969ef245961ac76a794b1b83bc8dd127d6f914d6c2c5c99f4d66431f848efb8256f52604722f1a865ccea0206690c8dcf3a590e3369763b9
 DIST vallox-websocket-api-2.4.0.tar.gz 38194 BLAKE2B 7d30749d6fc989f24bad038b5555a1907666efbd695560e8af144faba03dd38203a980e709719576c49d8064638cdf14abbeb7ed99ac5bcc25611e73669e0368 SHA512 bbd17c3402bf1e9ab3201af00fb8a991dc5574d660235429b32e4d7d9d141199c1834f3fc53c479567a96e1d0615de20581341bc2a1eb2d8098177d790b54532
-EBUILD vallox-websocket-api-2.0.0.ebuild 963 BLAKE2B 0dbab8f31dd621ee1b044abe9bc98ea53566147a125980e0af4510b49569db3200e90f30c1542cedf9cc6218a739a4eb17518873111197e864eb89c38da577a5 SHA512 3c6da079374e243c2910b60599f70daff7fffb46bf12c0576ddff45c33a6e16dc8bbfcee82dc830d013766dd710edd523d4b80ec900226cd0d9bfc9f37a9b1df
-EBUILD vallox-websocket-api-2.2.0.ebuild 970 BLAKE2B b7a134252689ebda6345774ac56737c21da046bc9195bef1350b08a20acdf9aed28251394c2036b571fcf46ae9a8b594f47f0ca0cbd8f4b531cad02e0d764bd0 SHA512 7c5298954475d0af9b2b89b59e3e37d7dc62f810c3d18468c1d05e1123ce2c45158c083ad6713584a6fe9d8aae224e59ea1ce733fac31de01d687bcb322f8ab9
-EBUILD vallox-websocket-api-2.4.0.ebuild 970 BLAKE2B 0458df574e84fa458463c906bda5314688201b3bacd3f4693a81bde69ece655ef711009ad74fe92c0aa369c040fe69c314adcf6237ad574bc2255ed8cd6016bc SHA512 8ed98a27122359e72dfd45b4a12bf3aff65b6e148fef75e42d5d1a32a54b9ca7ba4f22d29dd2129cd6c5285a3e43c310ee3009c688387fc4cf738816d4e9d09c
+EBUILD vallox-websocket-api-2.4.0.ebuild 969 BLAKE2B d6444d473d5899a3cb4d624d0a0b2bac7b70d46251d8f1a19697b9375e9e726d64af4e466bd6ae649e8eebbd9b6e13f62ebb596ef7ac16ce95189f55ae31cd02 SHA512 c4d7637e07dbda1af9fcac3ba1cc85d5ab134fd6e416fae191ae807996c8ccd97bfbe1ff54f2c54c7cb14f248fef6ed4049f4cfe259a54fa38285c05fc02c75f
 MISC metadata.xml 463 BLAKE2B 8a6dafb0412b6040c04bb497413458a39528a0d41b19154738106912a38fe3614b0294883ab6c92df9b8ecfdd062d62f58df82865094dac6062cced3365dd007 SHA512 95bf5a5c252b24cf39123a94568c83eabb744ba964eabc516d526d31c23dadaaa6d20059aae9f16fec9f8b1cf85a026e0cddc8e95be73eb8cbe27e24c34f2ead
diff --git a/dev-python/vallox-websocket-api/vallox-websocket-api-2.0.0.ebuild b/dev-python/vallox-websocket-api/vallox-websocket-api-2.0.0.ebuild
deleted file mode 100644
index 9c433c220..000000000
--- a/dev-python/vallox-websocket-api/vallox-websocket-api-2.0.0.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{5,6,7} )
-
-inherit distutils-r1
-
-MY_PN=${PN//-/_}
-MY_P=${MY_PN}-${PV}
-DESCRIPTION="Vallox WebSocket API"
-HOMEPAGE="https://github.com/yozik04/vallox_websocket_api https://pypi.org/project/vallox-websocket-api/"
-SRC_URI="mirror://pypi/${P:0:1}/${MY_PN}/${MY_P}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=">=dev-python/websockets-7.0[${PYTHON_USEDEP}]
-		 <dev-python/websockets-8.0[${PYTHON_USEDEP}]
-		 >=dev-python/construct-2.9.0[${PYTHON_USEDEP}]
-		 <dev-python/construct-3.0.0[${PYTHON_USEDEP}]"
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-S=${WORKDIR}/${MY_PN}-${PV}
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/vallox-websocket-api/vallox-websocket-api-2.2.0.ebuild b/dev-python/vallox-websocket-api/vallox-websocket-api-2.2.0.ebuild
deleted file mode 100644
index 131d404bc..000000000
--- a/dev-python/vallox-websocket-api/vallox-websocket-api-2.2.0.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit distutils-r1
-
-MY_PN=${PN//-/_}
-MY_P=${MY_PN}-${PV}
-DESCRIPTION="Vallox WebSocket API"
-HOMEPAGE="https://github.com/yozik04/vallox_websocket_api https://pypi.org/project/vallox-websocket-api/"
-SRC_URI="mirror://pypi/${P:0:1}/${MY_PN}/${MY_P}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=">=dev-python/websockets-7.0[${PYTHON_USEDEP}]
-		 <dev-python/websockets-8.0[${PYTHON_USEDEP}]
-		 >=dev-python/construct-2.9.0[${PYTHON_USEDEP}]
-		 <dev-python/construct-3.0.0[${PYTHON_USEDEP}]"
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-S=${WORKDIR}/${MY_PN}-${PV}
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/vallox-websocket-api/vallox-websocket-api-2.4.0.ebuild b/dev-python/vallox-websocket-api/vallox-websocket-api-2.4.0.ebuild
index a92441e4c..4d3f68c41 100644
--- a/dev-python/vallox-websocket-api/vallox-websocket-api-2.4.0.ebuild
+++ b/dev-python/vallox-websocket-api/vallox-websocket-api-2.4.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/venstarcolortouch/Manifest b/dev-python/venstarcolortouch/Manifest
index 311aac2ee..896a788db 100644
--- a/dev-python/venstarcolortouch/Manifest
+++ b/dev-python/venstarcolortouch/Manifest
@@ -1,9 +1,3 @@
-DIST venstarcolortouch-0.12.tar.gz 9251 BLAKE2B 9532a7c6ca8d4fd3da02cd26d44b4663ba649514ef0297ab01c01f181985dc7e46164f046c44a0743e1b266f6a93ccec0431126cbef99af48f734b2be9831974 SHA512 b95425f84047b127cb9e6a3eeb795739a942a3830d50afdce09da09e8e51e1ecc6d4a48de7be817e7b079ac6c01ad6553acd4fad7cef8ebf6d0602a8288ac041
 DIST venstarcolortouch-0.13.tar.gz 10116 BLAKE2B 2b1309dfd5d1fd765f2eb72b3aa8fe98514b049aba6ca1327c73925a1967806979ab968d6f7ace0e395322a11fd4560bc52a651b891322b06a25854763dbb227 SHA512 5efa94805c06cec465e1b83291f020cd0b8fa9959cb78ed32f93e690eff422c4ddb370c5a30b8cd9666cd9acc4328f66fbcdf2e0f58db30e378f7a15a38a678e
-DIST venstarcolortouch-0.7.tar.gz 8611 BLAKE2B f291ef47a9dd340cf12c4120f44b048d0a165e03b904eca8d52c4d79faea2c199fd40010f010d67724b3b93b368c913dcb2a76d55ba02aaf0df78771a178161d SHA512 8e829846e4bad96d11daabbbcad2876567c5d84ad56f62c2d5cb29c6809ec732133c4d7d14a1d78b851e464ac5208170c21229671ed1e2565ce4c4205abd60e0
-DIST venstarcolortouch-0.9.tar.gz 8203 BLAKE2B 23f413ccccfe4500e6e78c9aa8ef0812771708d5c3d9935577cd9e82ce0bc73eb2d8ca43078be070e0734278ef8347c0ccdd7a6b7bb644f6c95bcdf0268798e4 SHA512 058a2322350ca08b1b42890c43b339b0774506c380a4471ef7ea7bbba78114bce685fd34902c87a5e0e0fb537c0a4b3f0e68052cdf95d13d70ac0d7c0f65cbd3
-EBUILD venstarcolortouch-0.12.ebuild 672 BLAKE2B 73b35c0724890bb4ec879440f83a34ae8bfe16aad9dd2c92d061ab9aa26b2a989ccb44795ae2026e755bea6a99d6b0a3e986784a150cfd2b871ef9f4293d9db7 SHA512 a7ef484e48d9d2a799ef2b4cf0d18ba2395a68f9628db5db733c1d12badfa59f2b6e22afa6dea350f78aec93621c240eecc8426d1455711964bb169e2ff90d71
-EBUILD venstarcolortouch-0.13.ebuild 774 BLAKE2B 8c05d152be6b3a90315897bdb56a0e7224117546908f6a0048c78b5f804dad485014758c399298a61baccb97f1c4b8e3a8e7aa6eac3e0aa82d4e7dec06f66260 SHA512 00f4ec291c0f104358ccee1d5fff0dc6703fb56afdcc5e23288a98187518582d3b28f7ac4c5cef27dce169e35e959693568c75f9458cd49cbf4c616e26f7c527
-EBUILD venstarcolortouch-0.7.ebuild 710 BLAKE2B 89c1721d6defc30789feb95368ab24bb6b62948c2ccd777e17ab0aecdc7eeeeb242c4ebff695cd66c828568be2f9b957b5f6493c93f0de1a335e81a400d319c6 SHA512 657085849352043eaa6f82b319488c76587aec3658fa7c1932b184e5cc352c0114a7e6cf58c4cbbdce35c40f4e79c8664e1226690bb4715295016b3d56c059d5
-EBUILD venstarcolortouch-0.9.ebuild 710 BLAKE2B 89c1721d6defc30789feb95368ab24bb6b62948c2ccd777e17ab0aecdc7eeeeb242c4ebff695cd66c828568be2f9b957b5f6493c93f0de1a335e81a400d319c6 SHA512 657085849352043eaa6f82b319488c76587aec3658fa7c1932b184e5cc352c0114a7e6cf58c4cbbdce35c40f4e79c8664e1226690bb4715295016b3d56c059d5
+EBUILD venstarcolortouch-0.13.ebuild 774 BLAKE2B 7f8b7c5bf558240dce2c40eb99ced53bdf76006df9d445049e475a6ad477bba03e6771c065e6db9601cb0dbb829b351b340e4f98f1198c1be06a5ae911926da7 SHA512 ff878d87beae4a25ddf57ecfe9cf2f22fa081eb6e12227bd4d6f54663883450eca8753e38a37d026d0f1e3be96253269097b73b8e5467b5e76163b9de8fadcc2
 MISC metadata.xml 465 BLAKE2B 61cecaa43e17f149b82e9b9b23785a01cde9a512b827a16353aa042bed66f8cdfead89a4fc8b9cba5f62a156b6ed9d40aa299ecd82fcbccc1b42aee1b3dc0d98 SHA512 e06dcac88718aea639506d907a8e278bc2dab14dbce87111cb481ce6ccdb02f8d7a3ef56b02840f216b5fcc53cbfae56e50cb3903a39d2790ef1cb5ae16fb159
diff --git a/dev-python/venstarcolortouch/venstarcolortouch-0.12.ebuild b/dev-python/venstarcolortouch/venstarcolortouch-0.12.ebuild
deleted file mode 100644
index a531257fd..000000000
--- a/dev-python/venstarcolortouch/venstarcolortouch-0.12.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit distutils-r1
-
-DESCRIPTION="Interface Library for Venstar ColorTouch Thermostat API"
-HOMEPAGE="https://pypi.org/project/venstarcolortouch/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/venstarcolortouch/venstarcolortouch-0.13.ebuild b/dev-python/venstarcolortouch/venstarcolortouch-0.13.ebuild
index 69bd9b60e..04c84b1ce 100644
--- a/dev-python/venstarcolortouch/venstarcolortouch-0.13.ebuild
+++ b/dev-python/venstarcolortouch/venstarcolortouch-0.13.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{6..9} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/venstarcolortouch/venstarcolortouch-0.7.ebuild b/dev-python/venstarcolortouch/venstarcolortouch-0.7.ebuild
deleted file mode 100644
index 69c692ef9..000000000
--- a/dev-python/venstarcolortouch/venstarcolortouch-0.7.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{5,6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Interface Library for Venstar ColorTouch Thermostat API"
-HOMEPAGE="https://github.com/hpeyerl/venstarcolortouch https://pypi.org/project/venstarcolortouch/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/venstarcolortouch/venstarcolortouch-0.9.ebuild b/dev-python/venstarcolortouch/venstarcolortouch-0.9.ebuild
deleted file mode 100644
index 69c692ef9..000000000
--- a/dev-python/venstarcolortouch/venstarcolortouch-0.9.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{5,6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Interface Library for Venstar ColorTouch Thermostat API"
-HOMEPAGE="https://github.com/hpeyerl/venstarcolortouch https://pypi.org/project/venstarcolortouch/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/voluptuous-serialize/Manifest b/dev-python/voluptuous-serialize/Manifest
index a54c994c5..11d318be8 100644
--- a/dev-python/voluptuous-serialize/Manifest
+++ b/dev-python/voluptuous-serialize/Manifest
@@ -1,11 +1,3 @@
-DIST voluptuous-serialize-2.1.0.tar.gz 2785 BLAKE2B eda572499fcd94f04af1fdcb69dd3fb7ade21518c6a830792bc7d2fc44c26c8311825c49df0d4ff0b998f0009aa2718249d400e0b0e8454abc65d348ab7560e8 SHA512 02e00b4f7d7334894d0db59a728c49131999b3b6383ef0718918e2222c5591d41fc72c3ef60b00f0c869434ed7d4fbfa61fe4f726b472f79b13df5e045f019ae
-DIST voluptuous-serialize-2.2.0.tar.gz 2848 BLAKE2B 035a9920778b392b1f1d36744a4444532787e047442e4e5ec70a59acfd70444499a9d028eb383e597c4bfaa6345372b5f16e0f65d0db876ff8b564590612a1be SHA512 af12dd129aa06a14cac1235f3faa7146971003ecaf5706701eecfc729512dd9009c6452627b568af868b36a3e4ac2662b5fdad2b390ac302c140884de4f40618
-DIST voluptuous-serialize-2.3.0.tar.gz 3047 BLAKE2B 4d11e4003c0b0f4ca759154b9d176cb4ef9542d9fd1add7bda68c262a15088fa867ea6283f36feed293ea0a911fc71094d08c4bc7452ee2eca1fbbd009efbd90 SHA512 a9610062436a1600c41607cd716c7ce91c96d7593d7c99601adc1bb3b8774ba724fd6a968c6e5018c5b47e203cb1de0448df0a05ffa9081cefb58537952e8afd
 DIST voluptuous-serialize-2.4.0.tar.gz 3401 BLAKE2B a4c4e0496236a2e8f550c7fe6ca26bbfd24751d7f7ae391d88c355c7e96eb756447cdf275012ab09104d31a81d77f7bb2666f7463778001f5937905f67757e39 SHA512 5a96fe893f0f3450701366fd6bfa3f986847ab1e9952cb0eebc76d4ccf0f9a6aa84abf24b71c08e4c0850707d48d99551941184673c9592f58e8747e892c8ce0
-EBUILD voluptuous-serialize-2.1.0.ebuild 564 BLAKE2B 82808e7568110fa65d859020698e23caa0897fc43beca7ddfb95b89f30ec23ce0493f677e11b7d454f5579b7b4619d0c6e3e9462d052cb3d159c1b6ae2d08d61 SHA512 9b76d24fb1da300c795da492e5bdf15ffff961ecfe9efc3df5ebfa455f6e89d8bb5b271ea7e80364d66d40d4fdebc2a84760a4cfde1480b9f0ed3f2eb4cbf8b3
-EBUILD voluptuous-serialize-2.2.0-r1.ebuild 612 BLAKE2B e57caeadba0659b16219701445ce85e80be80eca99983300d65d93a71fc0475fc53eedc7fc0f89856f710a3e48f2e77ad38e3f9faada22c0f5dfda3751330c3a SHA512 378ffb972c828c5746e8729ca765841f3d3727e21de6805edca5e029ddb87aa72e126f4d037c5ed1989cf1f2e31105f4808496fbf27b3b8b619d9c2175021f8f
-EBUILD voluptuous-serialize-2.2.0.ebuild 611 BLAKE2B b23425dd93fc3b8263988a3f325f593a8311bedc17083a173599483783f993232c7c7273440f5c08a98e519ef8e2c68843d18dbf25f14002d630a5f4d8ad8022 SHA512 84bd397fed762256e8442a6db96ba7198923dce49d542e2ac59bc0c7712bbd3bf401783c5c2c4ad931da83f6d0501634e9e4358372d0da28afdd5936083e28da
-EBUILD voluptuous-serialize-2.3.0-r1.ebuild 614 BLAKE2B 42db33e4b905f4531d30b0acf3f4c69f0c2ac5dd2ab077e895266965ec026caacef6ddc7ee60586f07d5e60c79ff062fb12806dc2892c2486ccc6eed6dd90d89 SHA512 7b7faf071e5c702117754a74210311499263c9cfdfca95ef73216c28a979c239cab52cdb507f57db58c7bf2b39d592aa5ddb208ba46fc0db8a677ac566b7670d
-EBUILD voluptuous-serialize-2.3.0.ebuild 612 BLAKE2B e57caeadba0659b16219701445ce85e80be80eca99983300d65d93a71fc0475fc53eedc7fc0f89856f710a3e48f2e77ad38e3f9faada22c0f5dfda3751330c3a SHA512 378ffb972c828c5746e8729ca765841f3d3727e21de6805edca5e029ddb87aa72e126f4d037c5ed1989cf1f2e31105f4808496fbf27b3b8b619d9c2175021f8f
-EBUILD voluptuous-serialize-2.4.0.ebuild 614 BLAKE2B 42db33e4b905f4531d30b0acf3f4c69f0c2ac5dd2ab077e895266965ec026caacef6ddc7ee60586f07d5e60c79ff062fb12806dc2892c2486ccc6eed6dd90d89 SHA512 7b7faf071e5c702117754a74210311499263c9cfdfca95ef73216c28a979c239cab52cdb507f57db58c7bf2b39d592aa5ddb208ba46fc0db8a677ac566b7670d
+EBUILD voluptuous-serialize-2.4.0.ebuild 613 BLAKE2B fb069000cb4b2d58afcf4ebaa6dd8bab9bcf85e55f6ed7846a14c2c177047fc5c91a0e3a9267400e2dd4fc46861547557e8e4ccee9e77d979ee5ea66b31d6a50 SHA512 5a9d3c08843b3f56633ff45882c438636921ca0f52ce9bc3df1fed580051884bc93266c1c653d054c067d9fb193551e824a656731de5cb492dd2b4809091548a
 MISC metadata.xml 252 BLAKE2B 507e0ddc9d50b879ff374b903b142f85d020dfd6c486aba2af84fe082c878e780edbb79188ae10104d57db0eb775c86814cc8c06891a3854c9da840a4d377050 SHA512 9470ac9c8a5a4f80e3f767e7aa198addc7b21866c63b2a310e9f41ce65817672fb77423117bdd619e99cb62322025aeadf50717e23eafabf99080fcc106820af
diff --git a/dev-python/voluptuous-serialize/voluptuous-serialize-2.1.0.ebuild b/dev-python/voluptuous-serialize/voluptuous-serialize-2.1.0.ebuild
deleted file mode 100644
index 6aebcdeb5..000000000
--- a/dev-python/voluptuous-serialize/voluptuous-serialize-2.1.0.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
-
-inherit distutils-r1
-
-DESCRIPTION="Experiment to convert voluptuous schemas to JSON"
-HOMEPAGE="https://github.com/balloob/voluptuous-serialize"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86 amd64-linux x86-linux"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND=""
-
-python_test() {
-	unset PYTHONPATH
-	nosetests -v || die "Tests failed"
-}
diff --git a/dev-python/voluptuous-serialize/voluptuous-serialize-2.2.0-r1.ebuild b/dev-python/voluptuous-serialize/voluptuous-serialize-2.2.0-r1.ebuild
deleted file mode 100644
index 15acd2bbf..000000000
--- a/dev-python/voluptuous-serialize/voluptuous-serialize-2.2.0-r1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
-
-inherit distutils-r1
-
-DESCRIPTION="Experiment to convert voluptuous schemas to JSON"
-HOMEPAGE="https://github.com/balloob/voluptuous-serialize"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86 amd64-linux x86-linux"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND=">=dev-python/voluptuous-0.11.1[${PYTHON_USEDEP}]"
-
-python_test() {
-	unset PYTHONPATH
-	nosetests -v || die "Tests failed"
-}
diff --git a/dev-python/voluptuous-serialize/voluptuous-serialize-2.2.0.ebuild b/dev-python/voluptuous-serialize/voluptuous-serialize-2.2.0.ebuild
deleted file mode 100644
index ea607f54e..000000000
--- a/dev-python/voluptuous-serialize/voluptuous-serialize-2.2.0.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
-
-inherit distutils-r1
-
-DESCRIPTION="Experiment to convert voluptuous schemas to JSON"
-HOMEPAGE="https://github.com/balloob/voluptuous-serialize"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86 amd64-linux x86-linux"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="~dev-python/voluptuous-0.11.1[${PYTHON_USEDEP}]"
-
-python_test() {
-	unset PYTHONPATH
-	nosetests -v || die "Tests failed"
-}
diff --git a/dev-python/voluptuous-serialize/voluptuous-serialize-2.3.0-r1.ebuild b/dev-python/voluptuous-serialize/voluptuous-serialize-2.3.0-r1.ebuild
deleted file mode 100644
index bd2255788..000000000
--- a/dev-python/voluptuous-serialize/voluptuous-serialize-2.3.0-r1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit distutils-r1
-
-DESCRIPTION="Experiment to convert voluptuous schemas to JSON"
-HOMEPAGE="https://github.com/balloob/voluptuous-serialize"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 x86 amd64-linux x86-linux"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND=">=dev-python/voluptuous-0.11.1[${PYTHON_USEDEP}]"
-
-python_test() {
-	unset PYTHONPATH
-	nosetests -v || die "Tests failed"
-}
diff --git a/dev-python/voluptuous-serialize/voluptuous-serialize-2.3.0.ebuild b/dev-python/voluptuous-serialize/voluptuous-serialize-2.3.0.ebuild
deleted file mode 100644
index 15acd2bbf..000000000
--- a/dev-python/voluptuous-serialize/voluptuous-serialize-2.3.0.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
-
-inherit distutils-r1
-
-DESCRIPTION="Experiment to convert voluptuous schemas to JSON"
-HOMEPAGE="https://github.com/balloob/voluptuous-serialize"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86 amd64-linux x86-linux"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND=">=dev-python/voluptuous-0.11.1[${PYTHON_USEDEP}]"
-
-python_test() {
-	unset PYTHONPATH
-	nosetests -v || die "Tests failed"
-}
diff --git a/dev-python/voluptuous-serialize/voluptuous-serialize-2.4.0.ebuild b/dev-python/voluptuous-serialize/voluptuous-serialize-2.4.0.ebuild
index bd2255788..3083224e2 100644
--- a/dev-python/voluptuous-serialize/voluptuous-serialize-2.4.0.ebuild
+++ b/dev-python/voluptuous-serialize/voluptuous-serialize-2.4.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/voluptuous/Manifest b/dev-python/voluptuous/Manifest
deleted file mode 100644
index 484029253..000000000
--- a/dev-python/voluptuous/Manifest
+++ /dev/null
@@ -1,11 +0,0 @@
-AUX voluptuous-0.11.5-fix-doctest.patch 193 BLAKE2B 7880210f220cc65a4ac3692da728fe607e2accea6722232dd0bbef2fcc29187e661afb326741caa0d47f9dc96b6b5bb1cfcd064019dae66636054e1b2704f01f SHA512 d261e24685e551de96cdd68e1e0090aa639198f2647ad5d68f7d0d45b834ede99c52e5439ed0b41f3271aaf934519105c8e0820ead288b1748b18b0ee734e977
-DIST voluptuous-0.11.5.tar.gz 44216 BLAKE2B 921e0f35bd5348f412f0bf20939b3364b0014d3b1d1a7248cd73f2514eef0fb4e5b4b742876dc4606b5619529f1aa96e3577508ed0bf8d1e98b4d8bb88e2b8a2 SHA512 8893434e8e73ebf3682da1970d1d720444de452937ac9123fab53413c88a21d04ad3eb490902d829aa60be6804ff68b8bcf57a1c45807751c3d50be63e9b2551
-DIST voluptuous-0.11.7.tar.gz 45262 BLAKE2B 2c4c171ed281bdf799491b0e14f64ff2f4ff73143b1b5498eed0d2d4a148ff0e40392393923f25bbb066a872a81ac753d861640abc8b3d340c4c01ff5e139140 SHA512 bf0ad4684a4da59b3eccb54f6edfa643eb894076fc50d1bfd4c953de15cfd711a70e8aee685497197eaef24897ae55fb5fb2aec5e2fc9dcf344a6f7c6f569b88
-DIST voluptuous-0.12.0.tar.gz 46958 BLAKE2B ec41ea9d5775bdc443153b913bcef7e73f14e29d47c6997e5597958b59c2b1143c83b65ca08d2a06aba3725f76f9168be4f46f68d91d87ceb4e4e3b6643e6800 SHA512 7c72d965f2a2eeb2ad099a19b41e2249b9921e51985ff975ed62fe5a6d5b3f2d5c2a7d6fc2cbe3c80abbea17cfc46c39f1953db5daecc0faafb348c838f80417
-DIST voluptuous-0.12.1.tar.gz 47476 BLAKE2B aa991ab2131e478eb06909c8b7ca86158980b47431d7fae82f41ab2c09b2d23c21d6da937394732cb479436fc247268947c3b31701c6260132cd6f9c7f7e288f SHA512 14ead6bd99c9238318e7ed39fa543cb3363cbb0716a251061e6f533b8fae3fd5e754bd6b2756b6d76745da0e02236e04bfe0ae4e25dd87d291bb2a716660eebc
-EBUILD voluptuous-0.11.5.ebuild 542 BLAKE2B 537ffcbf026f014b1cb76c7bd5a50ccd50e660abb4913243874ad82a2ba8d9045455cfeca88c9c93c45380d377408b2a07ad426fa45c51414e275e0bd9c33e89 SHA512 58663851cae430b8787d66b0e2e1f878e34bc8dfd91444eee46ac3c01204714a94069f6997647e13e1dc647b12af384c4abdb347b6a7aff01255fa05c611e262
-EBUILD voluptuous-0.11.7-r1.ebuild 544 BLAKE2B 61ee0bebca484c5e5d21c01e102476d857ec7a0befd8e787c6ecb0a7a4de8edd225910d861e62152f4c320ed99c3aec245a4cd337847977e9a425093a7c2cc2f SHA512 baa8bddb970bb0e7f1ff2ca238b87e6a050f1c5277c1aae6e294c73183bd5302b36a0e7d184f33a72127bdedb4fcc43afdfbdf79ad8336e9e47223319e978868
-EBUILD voluptuous-0.11.7.ebuild 542 BLAKE2B 537ffcbf026f014b1cb76c7bd5a50ccd50e660abb4913243874ad82a2ba8d9045455cfeca88c9c93c45380d377408b2a07ad426fa45c51414e275e0bd9c33e89 SHA512 58663851cae430b8787d66b0e2e1f878e34bc8dfd91444eee46ac3c01204714a94069f6997647e13e1dc647b12af384c4abdb347b6a7aff01255fa05c611e262
-EBUILD voluptuous-0.12.0.ebuild 715 BLAKE2B fdb4e1e53b51f19e733d2b64f2793db26c8437fbb9a3d30d0b5f066d3d8b96019053649b5581fc2ceb49a997b464ed53378f67b2159b6ca171391df0e15f1b3c SHA512 d550a50c760218984b814da665c50e70db952b6b1b0bdd0836af3f8794eba0f217644ceefd25d0ee2af2680f5fd7355a9d864ca22fb7eced16c37a61a36f413a
-EBUILD voluptuous-0.12.1.ebuild 541 BLAKE2B 3991e82383c6aaa9df0e8f49a1a5aa8cf1022a1201d99e8bd33039955d3f292a37e971d13391efd85c023f5ad6ed20529078707494b3816fcb519442a34bcb9f SHA512 a926c4c872edc46771b37f74b0bd793299f8f7bbb311b7262fc11419bf33c9224408673e77825c4428dde61a40524b6446e0d8a673da1c18feeb3252ffc3179c
-MISC metadata.xml 450 BLAKE2B 0b85a40fb665550a1686ca20147e090bca5885bfc27549e43b53823bd99a062947a80e8f919e3d7d9091f6433b96053ef3ebd065738af5e54d635fb6980463d7 SHA512 13eef9b404b122c6ffe92eb6d97b6119213df71f9400d918140f2d5607e455cd79b8b8394fcf2632e7394e3f2127255da337c306ba695a64f2d2ae2545b0ec4b
diff --git a/dev-python/voluptuous/files/voluptuous-0.11.5-fix-doctest.patch b/dev-python/voluptuous/files/voluptuous-0.11.5-fix-doctest.patch
deleted file mode 100644
index bdc8228ff..000000000
--- a/dev-python/voluptuous/files/voluptuous-0.11.5-fix-doctest.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/voluptuous/util.py
-+++ b/voluptuous/util.py
-@@ -87,7 +87,7 @@
-     >>> s = Schema(validators.Any(int, SetTo(42)))
-     >>> s(2)
-     2
--    >>> s("foo")
-+    >>> s(42)
-     42
-     """
- 
diff --git a/dev-python/voluptuous/metadata.xml b/dev-python/voluptuous/metadata.xml
deleted file mode 100644
index 333486f07..000000000
--- a/dev-python/voluptuous/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>b@edevau.net</email>
-    <name>Andreas Billmeier</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="pypi">voluptuous</remote-id>
-    <maintainer status="unknown">
-      <email>alec@swapoff.org</email>
-      <name>Alec Thomas</name>
-    </maintainer>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/voluptuous/voluptuous-0.11.5.ebuild b/dev-python/voluptuous/voluptuous-0.11.5.ebuild
deleted file mode 100644
index 56ffa4ccb..000000000
--- a/dev-python/voluptuous/voluptuous-0.11.5.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
-
-inherit distutils-r1
-
-DESCRIPTION="A Python data validation library."
-HOMEPAGE="https://github.com/alecthomas/voluptuous"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86 amd64-linux x86-linux"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND=""
-
-python_test() {
-	unset PYTHONPATH
-	nosetests -v || die "Tests failed"
-}
diff --git a/dev-python/voluptuous/voluptuous-0.11.7-r1.ebuild b/dev-python/voluptuous/voluptuous-0.11.7-r1.ebuild
deleted file mode 100644
index 76b182495..000000000
--- a/dev-python/voluptuous/voluptuous-0.11.7-r1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit distutils-r1
-
-DESCRIPTION="A Python data validation library."
-HOMEPAGE="https://github.com/alecthomas/voluptuous"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 x86 amd64-linux x86-linux"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND=""
-
-python_test() {
-	unset PYTHONPATH
-	nosetests -v || die "Tests failed"
-}
diff --git a/dev-python/voluptuous/voluptuous-0.11.7.ebuild b/dev-python/voluptuous/voluptuous-0.11.7.ebuild
deleted file mode 100644
index 56ffa4ccb..000000000
--- a/dev-python/voluptuous/voluptuous-0.11.7.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
-
-inherit distutils-r1
-
-DESCRIPTION="A Python data validation library."
-HOMEPAGE="https://github.com/alecthomas/voluptuous"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86 amd64-linux x86-linux"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND=""
-
-python_test() {
-	unset PYTHONPATH
-	nosetests -v || die "Tests failed"
-}
diff --git a/dev-python/voluptuous/voluptuous-0.12.0.ebuild b/dev-python/voluptuous/voluptuous-0.12.0.ebuild
deleted file mode 100644
index c341e0d2f..000000000
--- a/dev-python/voluptuous/voluptuous-0.12.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{6..8} )
-
-inherit distutils-r1
-
-DESCRIPTION="Voluptuous is a Python data validation library"
-HOMEPAGE="https://github.com/alecthomas/voluptuous https://pypi.org/project/voluptuous/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-DOCS="README.md"
-
-RDEPEND=""
-BDEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/voluptuous/voluptuous-0.12.1.ebuild b/dev-python/voluptuous/voluptuous-0.12.1.ebuild
deleted file mode 100644
index d0c398fb0..000000000
--- a/dev-python/voluptuous/voluptuous-0.12.1.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6..9} )
-
-inherit distutils-r1
-
-DESCRIPTION="A Python data validation library."
-HOMEPAGE="https://github.com/alecthomas/voluptuous"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-PATCHES=( "${FILESDIR}"/${PN}-0.11.5-fix-doctest.patch )
-
-distutils_enable_tests nose
diff --git a/dev-python/vsure/Manifest b/dev-python/vsure/Manifest
index 165ba89cf..93a2bb1c4 100644
--- a/dev-python/vsure/Manifest
+++ b/dev-python/vsure/Manifest
@@ -1,11 +1,5 @@
-DIST vsure-1.5.3.tar.gz 8547 BLAKE2B 8a42eb240a4f36e6d9f20bed1752ef355de0700e9f2722b7b0a7df5d70182de842d3863688949df448b549565d29ca79fba0bb9d2c321f83d3430022e104a22a SHA512 51ff941f57824c69bcf9caf10c7cee440233de9e18661be18231bb158818698b1092a498455400a17ca209858ccd94ecdcf472dc1d512e82b4fa26d9ab2ad9cf
-DIST vsure-1.5.4.tar.gz 8591 BLAKE2B b1e372b3f01bef083f33f67b32e71eff1ea437860f41e44bf8db6aa738cf063b5f179258706797fbbc378b8ddf660366196dd22055ce568fad1cb8a96cc7a69e SHA512 11e2e691e1e6f939bb095001a9fe584499acb2302aff7347fd8c53fb9ed8834d0e77e7e76e9f41a9158a44ec7de299be213343c1a19c87ee3f520270736c18d2
-DIST vsure-1.6.1.tar.gz 9831 BLAKE2B 7c2980bee2d5e45d2e7809dee40c790d6e046cf0ebc663fcdc221b54ff6bda519e9e5bbd57401c05bc5caf995904cbbb9115bf32f6aa846dfc6b086ae8ee52ae SHA512 82de72d6d683cc735e062a19d74ae5f72bbd609b955c1cbc860cc92b54f69f879e7dda995a630a0f0c1bbd2aca1452c0be519df45b6f4e6f8ec340b6389df25f
 DIST vsure-1.7.2.tar.gz 9785 BLAKE2B 0c5bce2932b51f56edfd45843cb9b783233d66b57ab841ff9e39be34e02cbb8cdad0c2b01c17fd9d7826c3fba7846849f9c7f8c5581364d3d667f906696fbf8d SHA512 ce7fb2c076d977b752e0814c64c32e870cb80830869e6deb3232f7535ba771d85fa06b9b69892acb964da1331f7e5dd326043cc99b0eb0204c9d1e810f2c56cb
 DIST vsure-1.7.3.tar.gz 9843 BLAKE2B 01afdad1ea6acfb7b3b176ee2debbb776f60752ada6ecb39781b5e0721f1dadd547c50c4f955ca4c5cae744db18edecab62f98f93bb1fd0bfb306e4ace826d86 SHA512 1f4d27fa28ef886abdca6a0dd22f3fcfdd7afee45d39f2ac9d8016f9797a19ceb9c1c04374321ed95968546c65e4f6d0ab07bd3f940dcce894d3969ce42813ed
-EBUILD vsure-1.5.3.ebuild 733 BLAKE2B 4024913a5c637bf355f581706f31af74cc1e69273f79abab937f1fdb014294caf7b8a5bb24aea4febd5ecb628cfb73b8989adafeaa36553fd617c948328d7331 SHA512 8c157c4269ecf8ab3124ca3c80354a4977afcefe865dbb3ae9d256c207d862787ec6140075e193b1c354fbe504520c5ddbe317f4df2f3c7618486a83f4701a16
-EBUILD vsure-1.5.4.ebuild 740 BLAKE2B e9cf0c4513427d3a3d672b5bbdae29395a191bed29e213b69bd99795aabe7a923122ba14f8de78e14cc3dda16a9c760d19adbb1c721a0454cf657ef0dd99fb49 SHA512 b3de37a5b7469a6301fa119122fc839a74f8c40910cdc948f92951b8aa474b7752e5aa5eaef04ed105e293801100232bde7f0a497f30a4e3df2212dad94b6913
-EBUILD vsure-1.6.1.ebuild 747 BLAKE2B 2f5a265bbc05bc9d222351f500d623b1a75362a9f4c70c8907153ac591c617e77c4277be34aa485f31f4d0266e975f2d3f1be287852c7bafcfc001b19f3d2170 SHA512 9792a9d6410c4aae4adbece1eb1e6bf2e0ad92d4329224611a527dc41df9154d2e2ed2ec83121f5c21a8c284adf187d65ee1b5afed6015285eb937c972d97d86
-EBUILD vsure-1.7.2.ebuild 747 BLAKE2B a34bf8d2dbae018c811ec1b92a94a138706f190896d1b8114a68136b58092400e26aa5b2eb0bdf9c0656a26d808ee416098283c2a4f02d7c9e6d6ec1998d8e14 SHA512 cb16d26b93db2cf1532e7bbfdc1a251924a72b5ae16e59e641de27e4bf7836ba3a5f0893cbd0b08fe9750567912895bbff59c5a0c858898d0fdcfb74bf1972f0
-EBUILD vsure-1.7.3.ebuild 747 BLAKE2B a34bf8d2dbae018c811ec1b92a94a138706f190896d1b8114a68136b58092400e26aa5b2eb0bdf9c0656a26d808ee416098283c2a4f02d7c9e6d6ec1998d8e14 SHA512 cb16d26b93db2cf1532e7bbfdc1a251924a72b5ae16e59e641de27e4bf7836ba3a5f0893cbd0b08fe9750567912895bbff59c5a0c858898d0fdcfb74bf1972f0
+EBUILD vsure-1.7.2.ebuild 747 BLAKE2B 23f0dc42313c96ec8c6589462559013f9452adb9b59940f5df210c56383a8dc959719eec3337ca24cb06e565ec5a59722c2eaac7431195f427670ce54da628b6 SHA512 6eea9618e9e2c7d94baf9b10e6b0eb6141461977908a1dad443d395037cf5ffa2d9b0ded2cae04832247f79238405c82892883140f550997a72b1c35aa3f9f3b
+EBUILD vsure-1.7.3.ebuild 747 BLAKE2B 23f0dc42313c96ec8c6589462559013f9452adb9b59940f5df210c56383a8dc959719eec3337ca24cb06e565ec5a59722c2eaac7431195f427670ce54da628b6 SHA512 6eea9618e9e2c7d94baf9b10e6b0eb6141461977908a1dad443d395037cf5ffa2d9b0ded2cae04832247f79238405c82892883140f550997a72b1c35aa3f9f3b
 MISC metadata.xml 456 BLAKE2B e4e1a162b02394eb091a9be44953d67d05b57dacdc620d78f5b91de7ead1344300816fe46f50884ecaf904daa3f848439cae8944e8e78f49efa2b6ff63e49395 SHA512 a90ec2fb4239b07f9b253a979a60eb58b8e388554d330b8ca0da3b53ba220d1ec9ed2ee7cdaa6f852763f477b08b5f50213089fcd16e32168184d9206139ea35
diff --git a/dev-python/vsure/vsure-1.5.3.ebuild b/dev-python/vsure/vsure-1.5.3.ebuild
deleted file mode 100644
index 1628c298f..000000000
--- a/dev-python/vsure/vsure-1.5.3.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{5,6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Read and change status of verisure devices through mypages."
-HOMEPAGE="https://github.com/persandstrom/python-verisure https://pypi.org/project/vsure/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=">=dev-python/requests-2.20.0"
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/vsure/vsure-1.5.4.ebuild b/dev-python/vsure/vsure-1.5.4.ebuild
deleted file mode 100644
index a1df5e151..000000000
--- a/dev-python/vsure/vsure-1.5.4.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit distutils-r1
-
-DESCRIPTION="Read and change status of verisure devices through mypages."
-HOMEPAGE="https://github.com/persandstrom/python-verisure https://pypi.org/project/vsure/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=">=dev-python/requests-2.20.0"
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/vsure/vsure-1.6.1.ebuild b/dev-python/vsure/vsure-1.6.1.ebuild
deleted file mode 100644
index 48ac092fe..000000000
--- a/dev-python/vsure/vsure-1.6.1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{6..9} )
-
-inherit distutils-r1
-
-DESCRIPTION="Read and change status of verisure devices through mypages."
-HOMEPAGE="https://github.com/persandstrom/python-verisure https://pypi.org/project/vsure/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-DOCS="README.md"
-
-RDEPEND=">=dev-python/requests-2.20.0"
-BDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/vsure/vsure-1.7.2.ebuild b/dev-python/vsure/vsure-1.7.2.ebuild
index b17640111..e31dde198 100644
--- a/dev-python/vsure/vsure-1.7.2.ebuild
+++ b/dev-python/vsure/vsure-1.7.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/vsure/vsure-1.7.3.ebuild b/dev-python/vsure/vsure-1.7.3.ebuild
index b17640111..e31dde198 100644
--- a/dev-python/vsure/vsure-1.7.3.ebuild
+++ b/dev-python/vsure/vsure-1.7.3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/vultr/Manifest b/dev-python/vultr/Manifest
index e6a278295..7887a6211 100644
--- a/dev-python/vultr/Manifest
+++ b/dev-python/vultr/Manifest
@@ -1,7 +1,5 @@
 DIST vultr-0.1.2.zip 15794 BLAKE2B 7dd9ffbf37dee82caac695b9babe58895345e002b7986b20f0b7ed691ada77493a21ac5ccb723d117d7cd2d87f0b4c7936cc6a175d52f3a62599bd61a26b6a69 SHA512 29f0d30e7db60bf072c03a8d3ad9d73da08bc1ead24e16837c991a0acebdf0652a5c36d0758accf9ac60b23d0008242dad8132c35252cf7c3b3475bfe34f0c21
-DIST vultr-1.0.1.tar.gz 11284 BLAKE2B 4541787438a6b9004754100c2754dfc4b2578bc4ff5b8dec3af02ef87f0f3a56bdb09939b5b7a5b61c973607db9b83f291a6d12914532e3685ca349a2093404d SHA512 fd269e18649340dab3a042736a7371791fa0d7dfe424df67b24589adc1876d04139dce8c267ff8118d72a8a0ad4b479b2ad87f33bdf0e2c02163ea78309390ce
 DIST vultr-1.0.2.tar.gz 11817 BLAKE2B 979004689aa1a600558d093a36ea7ee5aaad06c437cea55b79543fcf3c8db5bc838811d75b4695aecc7cd5fad7d50fc20a6c3ee443c0625fd0d2e879a3fd5ce4 SHA512 567df98db502bd2c078738a63df1c3e8160e3f6d0116a15e853846cd256082fbc884921cf1ca9b886082b43e7d8e2b4189b985c87364b8563e841066a2cbb219
-EBUILD vultr-0.1.2.ebuild 775 BLAKE2B e32b1051b771c3706bdc48a5b54d42a0d27d9a360c2298c01303641de8380e750f3b4ccd2e758b7e07ca9ad84d56936c5a82d82910c6f70bd8c9c5278483c36f SHA512 54ce94a5e44f7786ae6a11ce38e21025e46a723ea49f49c717938f6cf867b852ce8a39344748e586d707ecf2b2ac7a33d1f74efe21f3f74f16eda2f45ba113b5
-EBUILD vultr-1.0.1.ebuild 696 BLAKE2B cb49941faf1093763271bb11e9eb1f0f0938738bc1cc4120fb8f78ad0b0ba5e88f25edf83059d479f115d586546b4a485f13948e0f8150652b7d6382dcb83bfb SHA512 cd90e90a1564f32d91f3503e7a3fe5c0de096d76bebe3870ffb8c64a6df89536413224e797bcdbcb7e82bbd0cedc9f979424d22eeb7e2197d4441b803dc5e958
-EBUILD vultr-1.0.2.ebuild 786 BLAKE2B 2b28764f687c316b5782998a122fc82067fcd5829339fc3a3559b4643b2ab6955a8fb444ec39455085c8d525b1f91e05012654a853ea1d67dc7385b1c9baf88e SHA512 fbbd1b6a463665a11d8a8a61731ea2a6105acc3c07df28be81962f08ff489af40bfa2a129975ab527f79e390ec915a1a04550cc9ee5e13c55a0b633bfd3b6aa7
+EBUILD vultr-0.1.2.ebuild 776 BLAKE2B 84aee1e23deacc6d9e25ee9c92ace7ae82743813cbdc4238fa2ab0e325db1a4b28949266dcc5dc132cbc991454ef7170ba55a503a94248944415d98a08e148ce SHA512 0eba9dbbe863bd5a0d4d8d336965b0d623c12da2e82e134cc146777f829021077491c6d32eb990e816c8aa34f691d25e1895e241e55656948f69c5464e3aa0db
+EBUILD vultr-1.0.2.ebuild 785 BLAKE2B ee61479e720cd224bd5db4f9e5a6636058671bae5d14b61714789c6ea1b58e95d7e73ad19e1e9ce77ab6ee23dff35a4e4bbab6068da43ea2bd2ec29e6597508c SHA512 11f085fbc8d610334e5e61f9844bd3e95356dda21dfb422b93e3b298139b5d80a15e82b6ac68563b24cbf48a6c509e01a77702ff63bf50b3e8c9d3dabda0ae5a
 MISC metadata.xml 456 BLAKE2B b3091275b76a067cdef0633f52915af86277d0303cc79456338a5b069ec4486782880df7362d5fc076a92d52674f509b0d628fb82f191502c7395e5b371b91e5 SHA512 d5ac11f8690d688428bce0892a2f483d5f8574db98cb7c9a6f97aa90a5858444801b80e6d909c57113204887d0bc0bd5b14f7cc7bd4e94ffffe252ad568cfae5
diff --git a/dev-python/vultr/vultr-0.1.2.ebuild b/dev-python/vultr/vultr-0.1.2.ebuild
index 3dc6045fd..e6a598217 100644
--- a/dev-python/vultr/vultr-0.1.2.ebuild
+++ b/dev-python/vultr/vultr-0.1.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/vultr/vultr-1.0.1.ebuild b/dev-python/vultr/vultr-1.0.1.ebuild
deleted file mode 100644
index d979f1847..000000000
--- a/dev-python/vultr/vultr-1.0.1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Vultr.com API Client"
-HOMEPAGE="https://github.com/spry-group/python-vultr https://pypi.org/project/vultr/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND="dev-python/requests[${PYTHON_USEDEP}]"
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/vultr/vultr-1.0.2.ebuild b/dev-python/vultr/vultr-1.0.2.ebuild
index c1a6fa447..d8b4b58f2 100644
--- a/dev-python/vultr/vultr-1.0.2.ebuild
+++ b/dev-python/vultr/vultr-1.0.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/warrant/Manifest b/dev-python/warrant/Manifest
deleted file mode 100644
index d7a016fa6..000000000
--- a/dev-python/warrant/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX warrant-0.6.1-pip10-req.patch 512 BLAKE2B bee47c609261268b2353d511f07f6e2af8e6019e4d91ba00e5db32975abd5de87aed6639ac68d2e626ccdb3d8e0bdb797830efb8381b2fecfe5734a8a6eeea3c SHA512 4144c3e48843bd7dbe5dbd1a9d8abdaf1dbf863b4d4f2234ea4e507c2dc22d3d14d4b8a360f94a1bb674eff1c6fe3782c9e242cb9a6b89abacef1de8b4bf0a40
-AUX warrant-0.6.1-requirements.patch 347 BLAKE2B 135173e015a4739e95a52687aa3c35cad47786363205b1739580e8536e9b3dfede8038ad438f3b265acae45f2fb375547ce4f1fe6be8f5276e476b461a677c9c SHA512 a1a0db314980fada63cce072b91410af0cf4a1a679c67b105d1eeab0da8447b5468116a69aaf786b99604f23eeb47061b5dd88e75aa1b9bbb8f56d699025f588
-DIST warrant-0.6.1.tar.gz 11526 BLAKE2B b9432852cb94df3c3ba34e2b1981a86c4d0acb6ffd8599ab4e27ad0185ed999a75d59085cf1f2cd627e4ddc98fe487f835849b820c7925f4d0c2fe8877b3c132 SHA512 9eeb5b6c0ee08f69c51d59069161c486b6bcd3a211b780497421b841c079aa2ebef4658975183d58f9da3481229f2cb0ce202a180b7cf26bfaf9f41995fcc6bb
-EBUILD warrant-0.6.1-r1.ebuild 1092 BLAKE2B a0176ac6b9f0abaa6497026e5ec8d2d1b8339b29cbc07437bc4d5d20e75c679b24c721743a62e02495500b02a5a42290786f4848051ccad7f89384d831fa92bb SHA512 2ae69c4c0c527247cca2bba390a57c475f6b8a4e2c60838a92637b22e8e56104dc2c354f86d80c5b158365237412a6cf9d4b897af7b4adba1e9fa2ac2b298b22
-EBUILD warrant-0.6.1.ebuild 1052 BLAKE2B 51738bc6445ee884a068bc7e824f657d8f6f6dd82567606c53537c1ff9f8201437b98c93d5a3f75e825255c91a105fcc98dbeba9ddd0053bec87e5401e83afc4 SHA512 686f85897316739463f15c37e43e8a599d8f86bdb026d1453aae6173de59307959b06a7e39bc5ce8fc4b3ad7829cd33501a4ef1f5563a78fe4cb866b1b006390
-MISC metadata.xml 252 BLAKE2B 507e0ddc9d50b879ff374b903b142f85d020dfd6c486aba2af84fe082c878e780edbb79188ae10104d57db0eb775c86814cc8c06891a3854c9da840a4d377050 SHA512 9470ac9c8a5a4f80e3f767e7aa198addc7b21866c63b2a310e9f41ce65817672fb77423117bdd619e99cb62322025aeadf50717e23eafabf99080fcc106820af
diff --git a/dev-python/warrant/files/warrant-0.6.1-pip10-req.patch b/dev-python/warrant/files/warrant-0.6.1-pip10-req.patch
deleted file mode 100644
index 78933a54a..000000000
--- a/dev-python/warrant/files/warrant-0.6.1-pip10-req.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff --git a/setup.py b/setup.py
-index f51d154..5d14281 100644
---- a/setup.py
-+++ b/setup.py
-@@ -1,7 +1,10 @@
- import os
- 
- from setuptools import setup, find_packages
--from pip.req import parse_requirements
-+try: # for pip >= 10
-+    from pip._internal.req import parse_requirements
-+except ImportError: # for pip <= 9.0.3
-+    from pip.req import parse_requirements
- 
- install_reqs = parse_requirements('requirements.txt', session=False)
- test_reqs = parse_requirements('requirements_test.txt', session=False)
diff --git a/dev-python/warrant/files/warrant-0.6.1-requirements.patch b/dev-python/warrant/files/warrant-0.6.1-requirements.patch
deleted file mode 100644
index 9020641be..000000000
--- a/dev-python/warrant/files/warrant-0.6.1-requirements.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/requirements_test.txt b/requirements_test.txt
---- a/requirements_test.txt
-+++ b/requirements_test.txt
-@@ -0,0 +1,3 @@
-+mock>=2.0.0
-+nose
-+coverage
-diff --git a/requirements.txt b/requirements.txt
---- a/requirements.txt
-+++ b/requirements.txt
-@@ -0,0 +1,4 @@
-+boto3>=1.4.3
-+envs>=0.3.0
-+python-jose-cryptodome>=1.3.2
-+requests>=2.13.0
diff --git a/dev-python/warrant/metadata.xml b/dev-python/warrant/metadata.xml
deleted file mode 100644
index 70d025d32..000000000
--- a/dev-python/warrant/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>b@edevau.net</email>
-    <name>Andreas Billmeier</name>
-  </maintainer>
-</pkgmetadata>
diff --git a/dev-python/warrant/warrant-0.6.1-r1.ebuild b/dev-python/warrant/warrant-0.6.1-r1.ebuild
deleted file mode 100644
index 54dd3e364..000000000
--- a/dev-python/warrant/warrant-0.6.1-r1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit distutils-r1
-
-DESCRIPTION="Integrate Boto3's Cognito client so it is easy to login users. With SRP support."
-HOMEPAGE="https://github.com/capless/warrant https://pypi.org/project/warrant/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 x86 amd64-linux x86-linux"
-IUSE="test"
-
-RDEPEND="
-	>=dev-python/boto3-1.4.3[${PYTHON_USEDEP}]
-	>=dev-python/envs-0.3.0[${PYTHON_USEDEP}]
-	>=dev-python/python-jose-cryptodome-1.3.2[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.13.0[${PYTHON_USEDEP}]
-"
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/coverage[${PYTHON_USEDEP}]
-		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-PATCHES=( "${FILESDIR}"/${P}-requirements.patch
-		  "${FILESDIR}"/${P}-pip10-req.patch)
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/warrant/warrant-0.6.1.ebuild b/dev-python/warrant/warrant-0.6.1.ebuild
deleted file mode 100644
index 60fd1a57f..000000000
--- a/dev-python/warrant/warrant-0.6.1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{5,6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Integrate Boto3's Cognito client so it is easy to login users. With SRP support."
-HOMEPAGE="https://github.com/capless/warrant https://pypi.org/project/warrant/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND="
-	>=dev-python/boto3-1.4.3[${PYTHON_USEDEP}]
-	>=dev-python/envs-0.3.0[${PYTHON_USEDEP}]
-	>=dev-python/python-jose-cryptodome-1.3.2[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.13.0[${PYTHON_USEDEP}]
-"
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/coverage[${PYTHON_USEDEP}]
-		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-PATCHES=( "${FILESDIR}"/${P}-requirements.patch )
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/webexteamssdk/Manifest b/dev-python/webexteamssdk/Manifest
index f984ae206..280059c7e 100644
--- a/dev-python/webexteamssdk/Manifest
+++ b/dev-python/webexteamssdk/Manifest
@@ -1,5 +1,5 @@
 DIST webexteamssdk-1.1.1.tar.gz 48247 BLAKE2B 6d60d654286b96ebe1073df2ec8c132bff61942d43c71499a8066aeebb06b6689e130ded3fbd808a2a00948b0da5e7802284afa238c03f8b5b94f57756824279 SHA512 887192973b01f536040ba0723d45e58a1bbb82d035f9d3b3d95e0bc6e36a8f12afd25d6c8426a530d6bc852809cf3b1286471627da112dcc5ec397f965aae06b
 DIST webexteamssdk-1.2.tar.gz 50476 BLAKE2B d0ae3dcd1de2f1be1dd490f8e44922923b245a6a510cce25b7e21397d9ca7c2b1fafa246a1972fb2250b135f29dfbe1b69d4af01ae912cf91649a5ec4abf89c9 SHA512 3d37e058547ac6cf633ce757973a1a00823b448d01592ddb574d08f70c81748e9b7bd4a80063179493e23943f46e4c3c072a8cda511a830fcf6f20acf07e8159
-EBUILD webexteamssdk-1.1.1.ebuild 870 BLAKE2B 8036f200d106077faecb75c209f142281573bbbcbd6f0cc5a038bd709c20bcd8e95e3d8647c6d26f40416485442093b525590af2f491140bb00298f934836a8a SHA512 9fbdeb89c22ef78b6b1e7bcb98ead25607d2e0c32e23b7edee8b730be8ce965a57be0dd1e8c745d9a6f79db8104820585a420482d6f22cea65df94b9af18c857
-EBUILD webexteamssdk-1.2.ebuild 879 BLAKE2B e38aaffb07db70083b449857c169f0d5f0204b0d6a5da95a3dd357be9f72aad97cfa85e8d44686410198b9566f3c3e88ef039139f85bc88b7f11bb369e9e9936 SHA512 0db6e7fc2644d996fbe6e437dddf281e761b11e07fbae069503f47b6125c1ce88df0d6ad96ea37fde3c410d5bbe5f7233d1b4c2dcfc3b5cba1767a86481d23ed
+EBUILD webexteamssdk-1.1.1.ebuild 871 BLAKE2B b34ed9a29441a8fccfd63bd4bb77627aa44b3c0da5494c302a29620ef21515f9ee98984bd7d945866ee063e8e8d1caa517fba802a5abffcfed9eb5818bf6e920 SHA512 c8f590136be7aacabb422afcd006f1e122e1900d7fa7b6c0c99ec9919751835f94f34695d4b9bbcad5b6c7d1a5c8374bddb3ab96aea7a530cfc22095196cb78e
+EBUILD webexteamssdk-1.2.ebuild 878 BLAKE2B 5c288dbed02052abd9267a45ff533bce13b83b2314c6ef5091c3ffc7ed7f94e690cacb03189a9db81c0c685480b0ac26bcf78a5642b3850d1c8b8c680dc9c183 SHA512 0e4e0956fe695b92069a3b323b6d028fcd85546eb36c2a8fdd6742a65e86c0cd50f556308696c0fd63045f5ba032408c4160bc60ca58f3f39eaed2ae3b61bda9
 MISC metadata.xml 458 BLAKE2B bdf09775602b499d50d28d8310c103a55e983c6ffd214931430fef75f28b3a6bdf272a52b077863df38d09f3576418da8a74ac99cf20415e0b453ac6274a81c9 SHA512 ae08e081089ccc0129f3b58ef68aecf50e0ba11d1c5f62f389ddaa1031ddf9f4fc88b26c782340e41563a04ada93eeba1bda0a32b639082efcac5227432a3a93
diff --git a/dev-python/webexteamssdk/webexteamssdk-1.1.1.ebuild b/dev-python/webexteamssdk/webexteamssdk-1.1.1.ebuild
index 217945139..6c4965e06 100644
--- a/dev-python/webexteamssdk/webexteamssdk-1.1.1.ebuild
+++ b/dev-python/webexteamssdk/webexteamssdk-1.1.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/webexteamssdk/webexteamssdk-1.2.ebuild b/dev-python/webexteamssdk/webexteamssdk-1.2.ebuild
index c5da184a5..5cf3ff90c 100644
--- a/dev-python/webexteamssdk/webexteamssdk-1.2.ebuild
+++ b/dev-python/webexteamssdk/webexteamssdk-1.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/websocket-client/Manifest b/dev-python/websocket-client/Manifest
index c3f8b03fe..1b07e9fbc 100644
--- a/dev-python/websocket-client/Manifest
+++ b/dev-python/websocket-client/Manifest
@@ -1,6 +1,7 @@
 DIST websocket-client-0.54.0.tar.gz 36413 BLAKE2B 13344b8c43d4c4664005347a4a37c0e32a28dfbe7602c0ad13a46c44a99e6d49675c3c5d038824c557c819d528449d19932b594c470ddef4aaa05c4d082fea6e SHA512 ba4dfb6b879ec88ca446f44a77b91bbace55faa1a276f493174f3dc5b96b4d400d43c886798666da98e331610f71b4629f894d97f4614acf8d64affe8370bfec
 DIST websocket-client-0.56.0.tar.gz 36951 BLAKE2B 2dc82dbf2d2f9c6109645231f100d659347d6bfc854f1221a1e37b708d9a21fad7e9beaa6a272f36bd47fe0b2404f41b09c90d8fd350fc7147fb25ed680fb2d1 SHA512 f61497b5fa6deea11d0e81c1c0d3092d1efba9bcdb3427a45f51b81059444a486a9aa6a4d046fc2aa805e855d2c8e68a4ba46669c05a45eb928251c50e2e3a50
-EBUILD websocket-client-0.54.0-r1.ebuild 940 BLAKE2B da68d45f0c48aedd4b4a818b88ce51bada035c3fa4211c3fcaad89bf625e4fa751ae877125f8a49c65e3b7e76a2e3c22eb5b5b5d5972e3fd79f22a84deb8a597 SHA512 c5787a349d5462426910983508641407347653443d6fe27c6130664de66e82025d5c267a11e4fb59ba14ece2e68ae589574d88869b3745db5976a7f0616585fa
-EBUILD websocket-client-0.54.0.ebuild 958 BLAKE2B b76769269752288d67271256ab63c41da2acda5a8cc7190a77deb9d634b4fa2b1d156caccdf266a2e61a98146d5221f3bcf9eb395fe8341e9a10edd617844022 SHA512 cb63c4f38f413c2a9bf110f68a6e2d8a9f50bbedc77983d502ec181c9e4a0c6d47069b483037ad293c91255ab406e4c11e3dff8816442a641c6dccb7617fd166
-EBUILD websocket-client-0.56.0.ebuild 781 BLAKE2B ea09ba44492b08e1c0bae31c249fbf3387dd76a111f1abcc40b4c86c001687710005f69070b8d0d35e69bcd380539c936c262974ed62a01ec170d25a69e5808a SHA512 d33eab9c5fadb02143ddfd526b44551767a2dfea45e5c5cd550f86cc2aed67766e6e0f63ca5ab1141985cce419efd281085ed50b99574c3728c8d5140debe3b5
+DIST websocket-client-0.57.0.tar.gz 39333 BLAKE2B 3e24c41176e0566edf0d31bcbb0ecd69d368a7ff879ac7ab8e4b170ca356b0ea50aa0b6be845e76ecdd73dff9a2aa38c8cdefaa202627f9f9d272989114fe94b SHA512 8677b00abbdd995ef1c2254f73a01713eb0707ee2549031f410205af7bbbf57b4730b38a78d683a90605c1412863f57a3829d8be1c058f3e9bfb177bd49c4525
+EBUILD websocket-client-0.54.0-r1.ebuild 939 BLAKE2B f8a1374e91ec7fe742c706119b2bf24227de8f7db654820129edc7bb680376c5ed668d33be3d62e4c06d194f1712299433d4584b3cbb145d7f53716219d201d1 SHA512 0be5520de4ac713d65cafa19c8ae7b8ac3b7af8450c290292a18eefddcbfa65cc9d834dd81462db4a707eb44ff07d9e17403c60ea242657aadfa3af81ecba77b
+EBUILD websocket-client-0.56.0.ebuild 775 BLAKE2B 45fe04573e594d628634d51303f5afbeb99330cddf427be2eafb21e238205da72d6cf93e6d0f9f4e4d68b7c7d7341d3a33a6da5b2a65cf860e37f413c170e11d SHA512 2861b341c26f7d006bf714327d2382e6ec28612fca0023e39cf841b7b214558736cffa0ee1e8fe3b8ca8b4949f4fb2582a9c894bf6eeb8f812dcefc53293b680
+EBUILD websocket-client-0.57.0.ebuild 777 BLAKE2B 7b9621791b9e798c197cf6f03125e2426a440c1fa04f59a9e3326c6bf4d832104ae4d0e37c40b1e98e5fd5f8c485a4b6fdd4ded20eea49b7c43339a8bbb6f770 SHA512 ee82ca0d0d9262944316f2b96965e5617564f7e08f6a2c6b07f54ceddb67289096bde5ef4bc43a08405fb3c6de4aa10f9f3b36cd061964f025258ac3bac659e3
 MISC metadata.xml 473 BLAKE2B 22faac31bc833792ca0ed170d4a785a85275c81403da85cf04003672ce00c1b28fcbcb0834f03cc872dabef36af53a30e53949c154586f3346c3b731a1fbe56b SHA512 1ed56113c593335003b4ccaadac76f39bf05ca4f403c25bf7f2de655b0047bec86088d56aab803a20540193748b2063846f0c6ea552514907b4ec9da6b6aa106
diff --git a/dev-python/websocket-client/websocket-client-0.54.0-r1.ebuild b/dev-python/websocket-client/websocket-client-0.54.0-r1.ebuild
index 225e8240a..a355c245e 100644
--- a/dev-python/websocket-client/websocket-client-0.54.0-r1.ebuild
+++ b/dev-python/websocket-client/websocket-client-0.54.0-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/websocket-client/websocket-client-0.56.0.ebuild b/dev-python/websocket-client/websocket-client-0.56.0.ebuild
index 96e9689e1..c23dc5d2c 100644
--- a/dev-python/websocket-client/websocket-client-0.56.0.ebuild
+++ b/dev-python/websocket-client/websocket-client-0.56.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( pypy3 python3_{6..9} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/websocket-client/websocket-client-0.54.0.ebuild b/dev-python/websocket-client/websocket-client-0.57.0.ebuild
similarity index 60%
rename from dev-python/websocket-client/websocket-client-0.54.0.ebuild
rename to dev-python/websocket-client/websocket-client-0.57.0.ebuild
index 70aef20fd..c7ac58131 100644
--- a/dev-python/websocket-client/websocket-client-0.54.0.ebuild
+++ b/dev-python/websocket-client/websocket-client-0.57.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI="7"
 
-PYTHON_COMPAT=( python{2_7,3_{4,5,6,7}} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1
 
@@ -15,23 +15,16 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux ~x64-macos"
-IUSE="examples test"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos"
+IUSE="examples"
 
 RDEPEND="
 	dev-python/six[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep 'dev-python/backports-ssl-match-hostname[${PYTHON_USEDEP}]' pypy python2_7 )
-"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( ${RDEPEND} )
 "
 
 S="${WORKDIR}/${MY_PN}-${PV}"
 
-python_test() {
-	esetup.py test
-}
+distutils_enable_tests setup.py
 
 python_install_all() {
 	if use examples; then
diff --git a/dev-python/websockets/Manifest b/dev-python/websockets/Manifest
index 8932a15c8..087259e82 100644
--- a/dev-python/websockets/Manifest
+++ b/dev-python/websockets/Manifest
@@ -1,7 +1,3 @@
-DIST websockets-6.0.tar.gz 70483 BLAKE2B 83c883737b6ff0925b6bb68dfe8852fa2f8fd7ee70f39351ef75a8c0a0655b655d768521e4b13e39dfe6247c281f30212fbf5ec79b64b47e25d1c391287e0e86 SHA512 ef89ceb4844488b3322c98c762353067cef5df4ee71ec27ae59fe550302b6d4b789af4c5099b0945afb1eeadff5cc0ddb8df8e3309256dc59584640074340579
-DIST websockets-7.0.tar.gz 49257 BLAKE2B dc27ea2c80f530e11a1e811da02b548eb0bf404cf5a2f916d3d2112f0e8174d6f9f44f511d898ba20487eb99142eb235a6990d4ec815ae0d6e0f89387994eddf SHA512 3f3493c920ca3e07c143fdc443a2b1da142dda52ca6291566a3042daee6f5f702a9b091411a915da3896fe0f48cf174d9ef6fd40cf09483bc90928ee67ebd438
 DIST websockets-8.1.tar.gz 58874 BLAKE2B 4f0541fdf5ebaa6199d9911e67279cbbe3937f8ac8f31f2579a35a9a5a7c468f925d20686bc47c6544b6c296f3d51e13e63edfdd199040ad00eb813905fbf70d SHA512 408e35d7a908830d51b3b9b73a1c34b1b2dbabbbbd2431515bc0fba7f6ec7db402a55fd00dc737d344549fd5d5f2d90e27cef7cd5f7847e4a1545d3c74db007c
-EBUILD websockets-6.0.ebuild 704 BLAKE2B 94bc3ff38dcd01564feb90389b7de12c84cc6672f919d311ef8b2ef8247fb2766bef3d38a92c2fe92aedba8d81cee7405c9c012d0aed1d5337db6905c51c53fb SHA512 0005c4436607dd403e761f44c065d5b78e056922dc0ad69f1e4b437f33c9b5bcef1263d68e1c39723bb8502900ffbdae1dcc615cd4a55191bb93284e43dbac56
-EBUILD websockets-7.0.ebuild 711 BLAKE2B 9fc3bbc1c8ed1ba2be446132f12e3a4d672ac668b4dfa66623915e2de8dabd6e367d17b735d145b8628e412b3c4ec3e573be2b4df91cac64a09fe01f0f61f671 SHA512 df69a23eec803ee6f4c57bcf522d8303daf90fb6a65b22c0d26714ba128af5cc9382556606c2ba256b135bfeeb5a1a3126118186d001463de81eaac85b97f5a1
-EBUILD websockets-8.1.ebuild 711 BLAKE2B 9fc3bbc1c8ed1ba2be446132f12e3a4d672ac668b4dfa66623915e2de8dabd6e367d17b735d145b8628e412b3c4ec3e573be2b4df91cac64a09fe01f0f61f671 SHA512 df69a23eec803ee6f4c57bcf522d8303daf90fb6a65b22c0d26714ba128af5cc9382556606c2ba256b135bfeeb5a1a3126118186d001463de81eaac85b97f5a1
+EBUILD websockets-8.1.ebuild 710 BLAKE2B 6e943bee42c0697197c6c06ade53cc78c76512343966e304aca85fea1bdb777037d0181720a972f409eb686056c431de3f463c925b6472e32cfbe70223de0d97 SHA512 e035e594c56b3d2672670fedc881eacbda60665c537a6c6490a91f69a52693cf83d837901e69f7973cd29ede3db0a17a689434eaea0e01f684dec4951d0ebed7
 MISC metadata.xml 463 BLAKE2B 397b59f6fe15dee589e9f710156269e3b422b156497dbbd2d00e75fc6d70ba10cce557a3cf5bc5630a29262f733873c8a77f56485fed5e3d330fb5ed270ade56 SHA512 14169a7246fa72b686eb76605f4f88cb88412a76d3c279bb2505ce7dfb4242c2c06864bdb793d224f53883e393e110d2a4f9a285082a39aa76eafdc32d4f5d02
diff --git a/dev-python/websockets/websockets-6.0.ebuild b/dev-python/websockets/websockets-6.0.ebuild
deleted file mode 100644
index af54df6d0..000000000
--- a/dev-python/websockets/websockets-6.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{5,6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="An implementation of the WebSocket Protocol (RFC 6455 & 7692)"
-HOMEPAGE="https://github.com/aaugustin/websockets https://pypi.org/project/websockets/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/websockets/websockets-7.0.ebuild b/dev-python/websockets/websockets-7.0.ebuild
deleted file mode 100644
index 378f090a0..000000000
--- a/dev-python/websockets/websockets-7.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit distutils-r1
-
-DESCRIPTION="An implementation of the WebSocket Protocol (RFC 6455 & 7692)"
-HOMEPAGE="https://github.com/aaugustin/websockets https://pypi.org/project/websockets/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/websockets/websockets-8.1.ebuild b/dev-python/websockets/websockets-8.1.ebuild
index 378f090a0..c7e4fdd15 100644
--- a/dev-python/websockets/websockets-8.1.ebuild
+++ b/dev-python/websockets/websockets-8.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/wled/Manifest b/dev-python/wled/Manifest
index 2fca73708..d5a25257a 100644
--- a/dev-python/wled/Manifest
+++ b/dev-python/wled/Manifest
@@ -1,15 +1,3 @@
-DIST wled-0.1.0.tar.gz 514419 BLAKE2B 3e484d64ebd7d755df94586cd2fe4aa82190b2cc03c687a7fd5c956f17ed29e3120ac570e2843c851baa2d9c5d1bca6f6278e57cccab99ab69ccf30ee2dd7f33 SHA512 57e70bc97b5fc2c876d1ecd5973cde3439905151ad2f819948977ea917f969f36ee2df927d2d046db900502ae579b9d91a93aae7e38a051164d030f525eb1800
-DIST wled-0.2.1.tar.gz 12136 BLAKE2B 63ae461257175333dfb719490513d79e3657dde24b30fc5365fd78921bdce2511ef67d9e9b77fb717e77a4077d53f6c27bebf33a700ad916396f63371d637929 SHA512 a0565e6dbde96e1593dd5ef1a7bef963e5831ec295f831056c0a0f7ca6a2954d199b7d886a090ba4e75dc6c14995d9e93f3d84e37ec63528b8919f3fff3423c0
-DIST wled-0.3.0.tar.gz 12758 BLAKE2B d853a1acdadfb9415086d036fe866cfb1279683708606d52b1345c024be275308cbc5b090bedb3802a2de1f5461ca2ebc76ff3c8aa881b88dd3f0955fa6d4820 SHA512 9f4a84e56316407ada1167c3529fa0af78193041890cf84064fbced9f1025088533579d36dab36c0f859e009259872338a8d0ac86fffc5dabe0ed0699079d219
-DIST wled-0.4.1.tar.gz 12876 BLAKE2B 935b257d074b0648910052fd531d636a0d8868355c7d6c095c76951882032cb22fb11a752183587d4b891e2a063ec344006b7ff24064b97a5088f757a8f34903 SHA512 be464981df5c5a40454938d40c528f19b014786e547c64cf54e34bb08747f72ad3e68744184e1366ca5d179d0fff7ea1e87c35f35fd37cc840b4a73802abf302
-DIST wled-0.4.2.tar.gz 13083 BLAKE2B 23f6666a7dd7a9edd21a01374528873b129899f63079f3061c2d5c344ac74ba1635b90f9565bc7f88b2b19a9131c253bd1422370590a27f7b48047d297b7fe53 SHA512 31b93843d9a3104d0e36a882214256d9ee20769bd369208c2fef8d5e7afbfe7e1af04f2444f546f257f5f5c56bc10698098dc4fc033be07989e2b3829b7a31fb
-DIST wled-0.4.3.tar.gz 13124 BLAKE2B 08e5439c977e5272ec0782e7e31f4d41c8f37cc5f479694029529a6fa23cac265fa8642f92b2a122d1027e025fe27c755e9fc225d953a9097a6dfe53294626d7 SHA512 6ce7ac3dae6900f7865bb2127f4d59ac9b84bb04cdbc08ec90b750ae62082ea6f74482261e29b398eb645a73f410fa3d9c6c8bec3f04de52816abddaabf26767
 DIST wled-0.4.4.tar.gz 13154 BLAKE2B e71577df8df9ca2c5d3ac07867517f73f2c57a859fd4346ec72e5e20bbf10c495dca1adde56f6ca607eccae0c35d9a4900edaf9108f38ba44bf5c0d11985347a SHA512 d777e430002f2e747eff2a6fcdad3b6f51257eeabfa8b3cdcd5def988ba4c4c252f96235623cd66fdc6c8b322e9847f82bcd823261e045f8ddd640d2f8e3a5fe
-EBUILD wled-0.1.0.ebuild 776 BLAKE2B b54e5619a8065a8a5856938b734a039256b5333bc8a14af7a9a18474b04f44ebd696f0b223aabbd90259712261146241337c7c548d1f23f349551a2b685178e5 SHA512 7523903b34659f301cbfb73fc3ebe173f45f91a7858675f346e5e98e77d01ac974aa26e7ab5862900fdf6917c42c9b250839e6c9cc1f946e5f591245d23c1acb
-EBUILD wled-0.2.1.ebuild 802 BLAKE2B ec6b8969e4dcb60ecf3f436b80d5e8f395c474074ace545eaa5286c9ca32c5b9c0cffb737cc890254d2a66333c83c20245458570588633acddd3cec45c6c8fce SHA512 959c5d18384d4b4e1d42a0198cad7cf90deff52fa9d025ccb050cc71e0fcd863924063a5ed60e21aa54e0077d7470978bf9e62c41627d0c397bfe161d6dbe887
-EBUILD wled-0.3.0.ebuild 757 BLAKE2B 4687cc3faa5993fe54d9241573788e54e117dc211a9e7a572804ac255ca5c92a454c51cfb7ed6aaf374b8ea24af77bfb3f5217b2b7aa83935c6d0a3d4d1702f3 SHA512 93e294b0547dcf29cc39f3d1503b9c7eb56649457b88fd5e154496a488b66b2cdfabf41fd68ab13e1736dd87176f68eb28fb780cd099bd8746905d3c2004b157
-EBUILD wled-0.4.1.ebuild 803 BLAKE2B 6260e9256f9d946fafa84df7276afc4cf55dd2f2a5bae00bad9900d498b54d557489eaa0945ca44705d843e1c6724dbe7b0bbd90d42c0b9b9bdf8eccb06c1f81 SHA512 7f8fc415933b668c14985e4192aef76e8e3c6308657b093084cb98324fe45aaef01d1074851f4022c0a31ab08233460e695f39c6b9680b6d28ca690b1ed1cf4f
-EBUILD wled-0.4.2.ebuild 803 BLAKE2B 6260e9256f9d946fafa84df7276afc4cf55dd2f2a5bae00bad9900d498b54d557489eaa0945ca44705d843e1c6724dbe7b0bbd90d42c0b9b9bdf8eccb06c1f81 SHA512 7f8fc415933b668c14985e4192aef76e8e3c6308657b093084cb98324fe45aaef01d1074851f4022c0a31ab08233460e695f39c6b9680b6d28ca690b1ed1cf4f
-EBUILD wled-0.4.3.ebuild 803 BLAKE2B 6260e9256f9d946fafa84df7276afc4cf55dd2f2a5bae00bad9900d498b54d557489eaa0945ca44705d843e1c6724dbe7b0bbd90d42c0b9b9bdf8eccb06c1f81 SHA512 7f8fc415933b668c14985e4192aef76e8e3c6308657b093084cb98324fe45aaef01d1074851f4022c0a31ab08233460e695f39c6b9680b6d28ca690b1ed1cf4f
-EBUILD wled-0.4.4.ebuild 842 BLAKE2B 8a4a918e63a6cb26de81bb45bdf80ae92e0981a4444cc3dfa56825b61558ed60a41749cf81063f5c53c499cff9efc19450940b4dec6d426d1a85937da617f564 SHA512 a4ae846a03df4b3cff0edfa93ecb0ad2f97f53e6aef309594fc4a4b42e821074c0ab362ead690ae3c7c5aa6aeae0bc2f7b5098128bf99c08769847ecea0e2d39
+EBUILD wled-0.4.4.ebuild 842 BLAKE2B e8fb2d8af135766748cd5af3aa140df6cc3d45be788caaaac9cfd83fd43db04547f4a83ed4b02cfdf3f92ef82362d4b2cbc58f64346b7ace8a665330c45b6829 SHA512 e0d3a47e7747298d370e45719de903938aabaa293cccca2318ef2ee6ee102121efaeef85953d7b76f77928c183aaf6f7dfc18c8fcbba2f2bb45edf7b7353129d
 MISC metadata.xml 451 BLAKE2B 61ecd292c75c14eac77440da1b89cd676d4991f633b3c06fde3e7f30c39707ff928a2e3feed5db399f5fcdeed39d69c6c3a8983121640af8d7a550681d571189 SHA512 1e2b868359575177d2acc15decd7801cffc277169a89bde116e81115eb28c47ff0f19cbed9f4a1393c62574b1c74b943cac6753ae4e86bf60e90fef101e5eb92
diff --git a/dev-python/wled/wled-0.1.0.ebuild b/dev-python/wled/wled-0.1.0.ebuild
deleted file mode 100644
index 5fcb359e9..000000000
--- a/dev-python/wled/wled-0.1.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Asynchronous Python client for WLED."
-HOMEPAGE="https://github.com/frenck/python-wled https://pypi.org/project/wled/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND="~dev-python/aiohttp-3.6.2
-		 ~dev-python/attrs-19.3.0
-		 ~dev-python/cattrs-0.9.0
-		 ~dev-python/yarl-1.3.0"
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/wled/wled-0.2.1.ebuild b/dev-python/wled/wled-0.2.1.ebuild
deleted file mode 100644
index 965d32da6..000000000
--- a/dev-python/wled/wled-0.2.1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit distutils-r1
-
-DESCRIPTION="Asynchronous Python client for WLED."
-HOMEPAGE="https://github.com/frenck/python-wled https://pypi.org/project/wled/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=">=dev-python/aiohttp-3.0.0[${PYTHON_USEDEP}]
-	>=dev-python/attrs-19.0.0[${PYTHON_USEDEP}]
-	dev-python/yarl[${PYTHON_USEDEP}]"
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/wled/wled-0.3.0.ebuild b/dev-python/wled/wled-0.3.0.ebuild
deleted file mode 100644
index 3d36af626..000000000
--- a/dev-python/wled/wled-0.3.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit distutils-r1
-
-DESCRIPTION="Asynchronous Python client for WLED."
-HOMEPAGE="https://github.com/frenck/python-wled https://pypi.org/project/wled/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=">=dev-python/aiohttp-3.0.0[${PYTHON_USEDEP}]
-	dev-python/yarl[${PYTHON_USEDEP}]"
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/wled/wled-0.4.1.ebuild b/dev-python/wled/wled-0.4.1.ebuild
deleted file mode 100644
index b009c5ce2..000000000
--- a/dev-python/wled/wled-0.4.1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit distutils-r1
-
-DESCRIPTION="Asynchronous Python client for WLED."
-HOMEPAGE="https://github.com/frenck/python-wled https://pypi.org/project/wled/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=">=dev-python/aiohttp-3.0.0[${PYTHON_USEDEP}]
-	>=dev-python/backoff-1.9.0[${PYTHON_USEDEP}]
-	dev-python/yarl[${PYTHON_USEDEP}]"
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/wled/wled-0.4.2.ebuild b/dev-python/wled/wled-0.4.2.ebuild
deleted file mode 100644
index b009c5ce2..000000000
--- a/dev-python/wled/wled-0.4.2.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit distutils-r1
-
-DESCRIPTION="Asynchronous Python client for WLED."
-HOMEPAGE="https://github.com/frenck/python-wled https://pypi.org/project/wled/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=">=dev-python/aiohttp-3.0.0[${PYTHON_USEDEP}]
-	>=dev-python/backoff-1.9.0[${PYTHON_USEDEP}]
-	dev-python/yarl[${PYTHON_USEDEP}]"
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/wled/wled-0.4.3.ebuild b/dev-python/wled/wled-0.4.3.ebuild
deleted file mode 100644
index b009c5ce2..000000000
--- a/dev-python/wled/wled-0.4.3.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit distutils-r1
-
-DESCRIPTION="Asynchronous Python client for WLED."
-HOMEPAGE="https://github.com/frenck/python-wled https://pypi.org/project/wled/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=">=dev-python/aiohttp-3.0.0[${PYTHON_USEDEP}]
-	>=dev-python/backoff-1.9.0[${PYTHON_USEDEP}]
-	dev-python/yarl[${PYTHON_USEDEP}]"
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/wled/wled-0.4.4.ebuild b/dev-python/wled/wled-0.4.4.ebuild
index 43b9812a5..0822e34eb 100644
--- a/dev-python/wled/wled-0.4.4.ebuild
+++ b/dev-python/wled/wled-0.4.4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{6..8} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/zigpy-xbee-homeassistant/Manifest b/dev-python/zigpy-xbee-homeassistant/Manifest
deleted file mode 100644
index 2a6eba944..000000000
--- a/dev-python/zigpy-xbee-homeassistant/Manifest
+++ /dev/null
@@ -1,17 +0,0 @@
-DIST zigpy-xbee-homeassistant-0.10.0.tar.gz 13275 BLAKE2B 5916c726015bb28f04ed7db21e73e03e8f7fb9047ece1b4000b10694473d0ee4fd1d2776b77cc4461319e89c81af69164bb4ae3a961532317bcb848ff29acf55 SHA512 74d4721dbb064a5c35608a684349a8268b3ea27ba0a3960fd933a44ea45b952e2629fc00cd09cfd1bde560ef968c1e6c02ff560389944ecb65102b95288c4e64
-DIST zigpy-xbee-homeassistant-0.11.0.tar.gz 14435 BLAKE2B badd21df12b5396b7b007729819c8d710d83989ba4f2acf0acff49279de68f953e2fdc21f12daf61f7df6f1109897580edc6be7d2df7d97c4057e2b3eb33ca48 SHA512 02af4fd890262d13ff91221dd06f952890c17eb131985013e3ab78ec0dd9db81972ca1fc567371c5b58c7b403d8942f94f670e16010a791372e24d828cf9674e
-DIST zigpy-xbee-homeassistant-0.4.0.tar.gz 11370 BLAKE2B 91e87be8aa7e86b0970e0a30915c746581a0267469ede02b1d999514b909e05bdb2afde78c583a1f554470cb5f79e36027651f5006dc33c582b05e36fe269f7a SHA512 9e71ca1c093af92e76fa4d05fec36ea05e6548d2e9a46bded369b14f4e7f2e7b49da396d510e6ad0f8ccf71980c632dfe1d0b5e6aa41fc339506d653d46bc979
-DIST zigpy-xbee-homeassistant-0.5.0.tar.gz 11583 BLAKE2B 40a973ec5ab17d14141332a577bc4d17c03d4b3469cc4fb200d02d5c337775cf3c11576b55f7f2f94fa6f1dc202e21a7a0e937951c2651500468642e140b0823 SHA512 229cd70517dcb29ff5624f9412ecf16bfb5a041cea162ea0f244a1a20b97e475248feb2c9bb7aae54043267c0f2f5eed5c177d0e01ee127aa654a72cf0fbe3b1
-DIST zigpy-xbee-homeassistant-0.6.0.tar.gz 11601 BLAKE2B 06646f1295ca3431578a73ca66dcea91166cc7048a5f51d41adb89b35211d6d18c499f3d96ddebc3a62de88a396e8a00388d6e41cc822e67dcd5ec260c9cc734 SHA512 cb1ecc3a7a137a573df5ad63f8c905a8b16169447c475a55e0e9b1a0b53daba6aee7b41417f137437db7259f5289526028b9f98202b6a2ccd7473cc23f46499c
-DIST zigpy-xbee-homeassistant-0.7.0.tar.gz 12914 BLAKE2B 8d1c6016eafe17b1fcf68c00242f0e59a4f14c81454d92ba88a03628463f265fb82ac012538c3ab587cf5fca7d5d80d4b08cc4ae613198bf10f7f15377d0165e SHA512 f36530ee542aed129b1464f404d022b1a526469576098f99edce01b6b723994cc36fb8e67c13d3093f0fcd925fd79643f44f24ac55325406cc5d58abb1ba8f0b
-DIST zigpy-xbee-homeassistant-0.8.0.tar.gz 13182 BLAKE2B 2008ab790ab2e6e03d4c46df8f1e02cc314ffe3045f314cecfcf314c8e0528d47e417a9dabeac1fd7d9963d4070d79df40c67a6c7d3601cadda1ea0519f70c9b SHA512 709e27259af17f3c4545eae314a7ffd82d7404f5f507ebc72adbb6b4e99ac77206eb012f09338cd67672e561534dfd10c9659547034ac3eea029d31ae302ebab
-DIST zigpy-xbee-homeassistant-0.9.0.tar.gz 13191 BLAKE2B e8642ce9136e84587c416fa7056c4eaa1a280d0aa297265bf56a88a8651be03bec64c8c1895afef68cb8535001a4c87de3043609a40083b85e1afad18730c66e SHA512 55ea5103b0a88b2143d4f99c2e38d75ac2cbf928e35ccf73e1bad5b3c2297135990cec62cb5f93a8f63ab73aa8810368214074c022b9e1df482acfde01ccf0e8
-EBUILD zigpy-xbee-homeassistant-0.10.0.ebuild 822 BLAKE2B f008489169ef1838bfc4f2f15a12645cb117c64f44c7f609c24a72fb5488bf98addf9d3296d1c196e9e44e26329f7c14ae0732b662189047fe5cc815b0d857e8 SHA512 0309716cf1843dd49af9ac864b94fe112ba903c200606ddd444dc6a625ab659fb533239029de303e2a0b92d9040001ebda17e7a1ba7573066add9387a8a99b6d
-EBUILD zigpy-xbee-homeassistant-0.11.0.ebuild 822 BLAKE2B f008489169ef1838bfc4f2f15a12645cb117c64f44c7f609c24a72fb5488bf98addf9d3296d1c196e9e44e26329f7c14ae0732b662189047fe5cc815b0d857e8 SHA512 0309716cf1843dd49af9ac864b94fe112ba903c200606ddd444dc6a625ab659fb533239029de303e2a0b92d9040001ebda17e7a1ba7573066add9387a8a99b6d
-EBUILD zigpy-xbee-homeassistant-0.4.0.ebuild 708 BLAKE2B 959de3335581e4b6127f8b70704da6c034cf9ad95710fdcc74242d31564ff96d7d628df1806d443ec4d044ee43052691e129436bdd8958c881686959075cf930 SHA512 13a05f0ea9428c9287d081e30b6d430f4863eb3699fe9d7c9aa73fd2391842a61fec3a8da65a9975194586fc79a979f1f427a2a5cc33f30a8e6cc2cb3a2df51c
-EBUILD zigpy-xbee-homeassistant-0.5.0.ebuild 708 BLAKE2B 959de3335581e4b6127f8b70704da6c034cf9ad95710fdcc74242d31564ff96d7d628df1806d443ec4d044ee43052691e129436bdd8958c881686959075cf930 SHA512 13a05f0ea9428c9287d081e30b6d430f4863eb3699fe9d7c9aa73fd2391842a61fec3a8da65a9975194586fc79a979f1f427a2a5cc33f30a8e6cc2cb3a2df51c
-EBUILD zigpy-xbee-homeassistant-0.6.0.ebuild 708 BLAKE2B 959de3335581e4b6127f8b70704da6c034cf9ad95710fdcc74242d31564ff96d7d628df1806d443ec4d044ee43052691e129436bdd8958c881686959075cf930 SHA512 13a05f0ea9428c9287d081e30b6d430f4863eb3699fe9d7c9aa73fd2391842a61fec3a8da65a9975194586fc79a979f1f427a2a5cc33f30a8e6cc2cb3a2df51c
-EBUILD zigpy-xbee-homeassistant-0.7.0.ebuild 813 BLAKE2B 7e29de801ec360c1e0e14ef0d090b15f2c411e0b4c634514f5be42faf723410929c56a22abffb5a3f1ab44b5f1b1982b2ac7a7b9463422e0c0559b184b6c430d SHA512 375fde0e359344d21062c5ba56bf3f1271fd690238d3a0946f58a6f5eebcee216107478f4bba35f65b664807341c40e8b3fb3c99c8481b0929e88a64e0e58cf6
-EBUILD zigpy-xbee-homeassistant-0.8.0.ebuild 822 BLAKE2B f008489169ef1838bfc4f2f15a12645cb117c64f44c7f609c24a72fb5488bf98addf9d3296d1c196e9e44e26329f7c14ae0732b662189047fe5cc815b0d857e8 SHA512 0309716cf1843dd49af9ac864b94fe112ba903c200606ddd444dc6a625ab659fb533239029de303e2a0b92d9040001ebda17e7a1ba7573066add9387a8a99b6d
-EBUILD zigpy-xbee-homeassistant-0.9.0.ebuild 822 BLAKE2B f008489169ef1838bfc4f2f15a12645cb117c64f44c7f609c24a72fb5488bf98addf9d3296d1c196e9e44e26329f7c14ae0732b662189047fe5cc815b0d857e8 SHA512 0309716cf1843dd49af9ac864b94fe112ba903c200606ddd444dc6a625ab659fb533239029de303e2a0b92d9040001ebda17e7a1ba7573066add9387a8a99b6d
-MISC metadata.xml 355 BLAKE2B 42f871b2890b6569da44ea569d0205f872df7acd51b9ce837c3c25547180a3152e96c6383179e7561dd4b01ab59967fcb77823bce31c7b5d34cc9ac02bc7e38f SHA512 628bf49cb691e8b37b83a23a96bb60ce2d7d8b6f23fb7a2eb90a95bdce82b4e4229bc2b128a588b89fbdeada26cec3d70104e0b67bf9a61e146f50795c07c6c1
diff --git a/dev-python/zigpy-xbee-homeassistant/metadata.xml b/dev-python/zigpy-xbee-homeassistant/metadata.xml
deleted file mode 100644
index 46d1134fe..000000000
--- a/dev-python/zigpy-xbee-homeassistant/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <upstream>
-    <remote-id type="pypi">zigpy-xbee-homeassistant</remote-id>
-    <maintainer status="unknown">
-      <email>rcloran@gmail.com</email>
-      <name>Russell Cloran</name>
-    </maintainer>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/zigpy-xbee-homeassistant/zigpy-xbee-homeassistant-0.10.0.ebuild b/dev-python/zigpy-xbee-homeassistant/zigpy-xbee-homeassistant-0.10.0.ebuild
deleted file mode 100644
index 35787b495..000000000
--- a/dev-python/zigpy-xbee-homeassistant/zigpy-xbee-homeassistant-0.10.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit distutils-r1
-
-DESCRIPTION="A library which communicates with XBee radios for zigpy"
-HOMEPAGE="https://github.com/zigpy/zigpy-xbee https://pypi.org/project/zigpy-xbee-homeassistant/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND="dev-python/pyserial-asyncio[${PYTHON_USEDEP}]
-	   >=dev-python/zigpy-homeassistant-0.10.0[${PYTHON_USEDEP}]"
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/zigpy-xbee-homeassistant/zigpy-xbee-homeassistant-0.11.0.ebuild b/dev-python/zigpy-xbee-homeassistant/zigpy-xbee-homeassistant-0.11.0.ebuild
deleted file mode 100644
index 35787b495..000000000
--- a/dev-python/zigpy-xbee-homeassistant/zigpy-xbee-homeassistant-0.11.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit distutils-r1
-
-DESCRIPTION="A library which communicates with XBee radios for zigpy"
-HOMEPAGE="https://github.com/zigpy/zigpy-xbee https://pypi.org/project/zigpy-xbee-homeassistant/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND="dev-python/pyserial-asyncio[${PYTHON_USEDEP}]
-	   >=dev-python/zigpy-homeassistant-0.10.0[${PYTHON_USEDEP}]"
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/zigpy-xbee-homeassistant/zigpy-xbee-homeassistant-0.4.0.ebuild b/dev-python/zigpy-xbee-homeassistant/zigpy-xbee-homeassistant-0.4.0.ebuild
deleted file mode 100644
index c7709be4d..000000000
--- a/dev-python/zigpy-xbee-homeassistant/zigpy-xbee-homeassistant-0.4.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{5,6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="A library which communicates with XBee radios for zigpy"
-HOMEPAGE="https://github.com/zigpy/zigpy-xbee https://pypi.org/project/zigpy-xbee-homeassistant/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/zigpy-xbee-homeassistant/zigpy-xbee-homeassistant-0.5.0.ebuild b/dev-python/zigpy-xbee-homeassistant/zigpy-xbee-homeassistant-0.5.0.ebuild
deleted file mode 100644
index c7709be4d..000000000
--- a/dev-python/zigpy-xbee-homeassistant/zigpy-xbee-homeassistant-0.5.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{5,6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="A library which communicates with XBee radios for zigpy"
-HOMEPAGE="https://github.com/zigpy/zigpy-xbee https://pypi.org/project/zigpy-xbee-homeassistant/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/zigpy-xbee-homeassistant/zigpy-xbee-homeassistant-0.6.0.ebuild b/dev-python/zigpy-xbee-homeassistant/zigpy-xbee-homeassistant-0.6.0.ebuild
deleted file mode 100644
index c7709be4d..000000000
--- a/dev-python/zigpy-xbee-homeassistant/zigpy-xbee-homeassistant-0.6.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{5,6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="A library which communicates with XBee radios for zigpy"
-HOMEPAGE="https://github.com/zigpy/zigpy-xbee https://pypi.org/project/zigpy-xbee-homeassistant/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/zigpy-xbee-homeassistant/zigpy-xbee-homeassistant-0.7.0.ebuild b/dev-python/zigpy-xbee-homeassistant/zigpy-xbee-homeassistant-0.7.0.ebuild
deleted file mode 100644
index ea4f7400c..000000000
--- a/dev-python/zigpy-xbee-homeassistant/zigpy-xbee-homeassistant-0.7.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="A library which communicates with XBee radios for zigpy"
-HOMEPAGE="https://github.com/zigpy/zigpy-xbee https://pypi.org/project/zigpy-xbee-homeassistant/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND="dev-python/pyserial-asyncio[${PYTHON_USEDEP}]
-	   >=dev-python/zigpy-homeassistant-0.10.0[${PYTHON_USEDEP}]"
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/zigpy-xbee-homeassistant/zigpy-xbee-homeassistant-0.8.0.ebuild b/dev-python/zigpy-xbee-homeassistant/zigpy-xbee-homeassistant-0.8.0.ebuild
deleted file mode 100644
index 35787b495..000000000
--- a/dev-python/zigpy-xbee-homeassistant/zigpy-xbee-homeassistant-0.8.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit distutils-r1
-
-DESCRIPTION="A library which communicates with XBee radios for zigpy"
-HOMEPAGE="https://github.com/zigpy/zigpy-xbee https://pypi.org/project/zigpy-xbee-homeassistant/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND="dev-python/pyserial-asyncio[${PYTHON_USEDEP}]
-	   >=dev-python/zigpy-homeassistant-0.10.0[${PYTHON_USEDEP}]"
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/zigpy-xbee-homeassistant/zigpy-xbee-homeassistant-0.9.0.ebuild b/dev-python/zigpy-xbee-homeassistant/zigpy-xbee-homeassistant-0.9.0.ebuild
deleted file mode 100644
index 35787b495..000000000
--- a/dev-python/zigpy-xbee-homeassistant/zigpy-xbee-homeassistant-0.9.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit distutils-r1
-
-DESCRIPTION="A library which communicates with XBee radios for zigpy"
-HOMEPAGE="https://github.com/zigpy/zigpy-xbee https://pypi.org/project/zigpy-xbee-homeassistant/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND="dev-python/pyserial-asyncio[${PYTHON_USEDEP}]
-	   >=dev-python/zigpy-homeassistant-0.10.0[${PYTHON_USEDEP}]"
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/zipp/Manifest b/dev-python/zipp/Manifest
deleted file mode 100644
index e6fff4872..000000000
--- a/dev-python/zipp/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-DIST zipp-0.5.0.tar.gz 10926 BLAKE2B 7020d56cd2d093e1adbe8e6d4999e09dd108da01799a7bcc16b7d7f909a158c65d494dbc286422ee79e18aa8c20f74c99d1eea6c8fb77d66bdee28fc33e20f41 SHA512 c593c537c31c2cf4fe007574900de31e549d7066babacd0fa8f8897011b05e379a60a29e78a6ae632fe16915e6fc9ac6b52d08a249363977d842b3aef0663870
-DIST zipp-0.5.1.tar.gz 10763 BLAKE2B 4f70d6ed94203d4b9fb9127930a07797c3cbfa023e0cd472e9d3a18e1877619dbefee654cd0364592a594b6e9e0aabc813e0560695bb18f8e3a64cb4ce76f0e2 SHA512 d4486ae98159677cd481cddb3bd00d5d2237dc94f0f3129b03994800b0e136c12b05e02d2ca7d628043dabce323f34dd919b9ba731549656802527abdcfea120
-EBUILD zipp-0.5.0.ebuild 687 BLAKE2B 1bfea12ea3c2aa02a9022d41718a35d484fbf52b458746ebc6aa0b1278912e57fb93a07d0820c64062bf168c24023a82bf82766a93278c7c15232b4963779847 SHA512 98ff6ea89440aeffe5d3aa625a23a1ca2075ef0d5ea3455acb879680f335e8471692fbeb2fc8d112cdf478b8b1c38fccc0e042c19368faed55641c531d8c7f67
-EBUILD zipp-0.5.1-r1.ebuild 739 BLAKE2B 46a4ec5074f0ef7af548cc3080a6c2242e0b6da94ca1f9d5e0970c057edd56d4a2a07ba6c15387299ccc845f24d09977384716688c90f3e3a6c648fc98ebad40 SHA512 ccd4f4830f44e25cf575b3c1a6a9d28009976fd17fcc14e181b48b9bc0f1248df1648015ae583dd43d7bff2ae03a5570a6ed5a831fbff67a2c8d0145c75c6b05
-EBUILD zipp-0.5.1.ebuild 687 BLAKE2B 1bfea12ea3c2aa02a9022d41718a35d484fbf52b458746ebc6aa0b1278912e57fb93a07d0820c64062bf168c24023a82bf82766a93278c7c15232b4963779847 SHA512 98ff6ea89440aeffe5d3aa625a23a1ca2075ef0d5ea3455acb879680f335e8471692fbeb2fc8d112cdf478b8b1c38fccc0e042c19368faed55641c531d8c7f67
-MISC metadata.xml 449 BLAKE2B eab7ca4cc6d95885312a0e2334554e90b224201664104a2f19449ea8b5aa2b4fb2c31970bdf62f0654a7bc72bb92134414a759e5867f6de151eb6763d523e813 SHA512 08b45d0b3203eaba9ec4d5f2b1c40e28f12b37d536d768fbd2370ad330816a275b30d773e3a050aa54246da1fc0090ad15b588e3cae92b48caba077e18c65503
diff --git a/dev-python/zipp/metadata.xml b/dev-python/zipp/metadata.xml
deleted file mode 100644
index c44f37920..000000000
--- a/dev-python/zipp/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>b@edevau.net</email>
-    <name>Andreas Billmeier</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="pypi">zipp</remote-id>
-    <maintainer status="unknown">
-      <email>jaraco@jaraco.com</email>
-      <name>Jason R. Coombs</name>
-    </maintainer>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/zipp/zipp-0.5.0.ebuild b/dev-python/zipp/zipp-0.5.0.ebuild
deleted file mode 100644
index fd0d9473e..000000000
--- a/dev-python/zipp/zipp-0.5.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{5,6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Backport of pathlib-compatible object wrapper for zip files"
-HOMEPAGE="https://github.com/jaraco/zipp https://pypi.org/project/zipp/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/zipp/zipp-0.5.1-r1.ebuild b/dev-python/zipp/zipp-0.5.1-r1.ebuild
deleted file mode 100644
index 7736d7a78..000000000
--- a/dev-python/zipp/zipp-0.5.1-r1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit distutils-r1
-
-DESCRIPTION="Backport of pathlib-compatible object wrapper for zip files"
-HOMEPAGE="https://github.com/jaraco/zipp https://pypi.org/project/zipp/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/zipp/zipp-0.5.1.ebuild b/dev-python/zipp/zipp-0.5.1.ebuild
deleted file mode 100644
index fd0d9473e..000000000
--- a/dev-python/zipp/zipp-0.5.1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{5,6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Backport of pathlib-compatible object wrapper for zip files"
-HOMEPAGE="https://github.com/jaraco/zipp https://pypi.org/project/zipp/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/zm-py/Manifest b/dev-python/zm-py/Manifest
index 31363024a..e0119c3db 100644
--- a/dev-python/zm-py/Manifest
+++ b/dev-python/zm-py/Manifest
@@ -1,7 +1,3 @@
-DIST zm-py-0.3.3.tar.gz 10119 BLAKE2B 66d7da0800f81382802c91325cd9c1d39f526bf6825883c50ad21bd924ebd42492b31376094a0db5c4e253606370139e030c9a93ee4fc499b1de6b98ebfe0680 SHA512 4a75e277307b9b27545a126168b9a6643bf52b68b49b2077bd8cde4b2f2f9857c66e74d6eb5e75e04e9efcefcefeb11b15b8ec010f6986ad727f1ceed6924a20
-DIST zm-py-0.4.0.tar.gz 12337 BLAKE2B 3f48941fabdfb5af704742bad07eeb083841ad17a53d38eea2b527bcfea841133fc23f40c8129d62d7649cf99e77a3799c6f6312d8c73361f9744cc42076104e SHA512 cf8a7035bf4a04100ae439bfdf8c97d278989c7e7ccfbb3a1519f1d565f1feb028ebd64322a3a7753d885c2705a69cddd8ab5cb12277e08c0cd09bd6d0aa1088
 DIST zm-py-0.5.2.tar.gz 12746 BLAKE2B 10905456f5e06addac22c3cf72eb2ec7c3425a2597305c369363c40055c17391d778d270ef508e2a886f0ec3af8d15e92a396844e8997bb5420ca8b0eed7dbd8 SHA512 4946c02d2e3a230d3113f68bddec7bd03da5f6b3e8334b84c5fcc943e5856089488dc1692e9e13f3e149d299e52887c02cc8a9b95615e336ed1588291193ef90
-EBUILD zm-py-0.3.3.ebuild 984 BLAKE2B 1ae0e3d51566d817513dbd331a1284eff5dbeb290ebfecc5bf52d4b7761a71f1543c225af0723732ccd4377daca586216fe8f1257486e26e0f34998664b4b044 SHA512 1ccf0731e239943df055e84a1484be254a585b01858356fd0cb85e78ff319e78d00a35fc70f80034e475c08f7c62d8a9415e5887c0f84c656973826a674376d3
-EBUILD zm-py-0.4.0.ebuild 1151 BLAKE2B 19853c60b083c95c9fcfad2ef66777d8ff943cfdec2aa0811e7b5c6105af8b11e703cb79a3b807c278eccfc00fc2a917213f1ac9a684e77fe1629f36aaf0c6c4 SHA512 b702fdb9d158ff8b9710600aa4c3502733b7f8774f4889903715eb19237f92cd52d8083430153a627388ed8fa76b8a0ae8f18c970782aff1b414968b6d2ed61b
-EBUILD zm-py-0.5.2.ebuild 989 BLAKE2B d0d39edf36cc693a1b37dc075ba0d1bcb06a97952c8da2c191afef478fba67262787d795cee86429ea8b7fed48b5ebf10e4b9b7712e786beb6b45becee16f19d SHA512 ba4c174c5123027b1be22dbe82c81c61c5a2adb0902cc807a4b6e998a6e7e5d68be91ddb7c9f51d6e75c12d639c9c71d5f6eabbaeefcac6f4dc56c460bc0cb6d
+EBUILD zm-py-0.5.2.ebuild 989 BLAKE2B 0f8bb5ff38a2ec792eb91ebfdf26931b6dbcdd7a86e3d50f3c21ac1466ed814a5b93dea76ccd804ffedd3f09e601ed4fdb3f36c34b9aae0e9f7f7a9a1bcb953d SHA512 61b431d2977d7c4a0cba64addc72d0ef1de4fc7c6bcb0d74c02f9bee9d73250b352f2730b83979418a9a055d7a2f1b58a8e5a5abbf0e3b3f1a70b8b0a638b5bb
 MISC metadata.xml 451 BLAKE2B 12eacbde2f0eb5af760ea38b3f6cbc5adcf5d5c24f796f8a48e8ae6a2b487660f6cd4f9f294339488b1b897b51cb93254325ea3601b63b848b574d397d36c919 SHA512 1c2c0dd51b5b97865420c18fb920410ab4360560c1f5a004846a367d051a4cad8b3f1ebccdc265320bf302c29a675e1d0d658389a93a407f64eb2b86c1bf6dc5
diff --git a/dev-python/zm-py/zm-py-0.3.3.ebuild b/dev-python/zm-py/zm-py-0.3.3.ebuild
deleted file mode 100644
index fa81ab7fb..000000000
--- a/dev-python/zm-py/zm-py-0.3.3.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{5,6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="A loose python wrapper around the ZoneMinder REST API."
-HOMEPAGE="https://github.com/rohankapoorcom/zm-py https://pypi.org/project/zm-py/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=">=dev-python/requests-2.0[${PYTHON_USEDEP}]"
-
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/colorlog[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/flake8[${PYTHON_USEDEP}]
-		dev-python/flake8-docstrings[${PYTHON_USEDEP}]
-		dev-python/mypy[${PYTHON_USEDEP}]
-		dev-python/pydocstyle[${PYTHON_USEDEP}]
-		dev-python/pylint[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/zm-py/zm-py-0.4.0.ebuild b/dev-python/zm-py/zm-py-0.4.0.ebuild
deleted file mode 100644
index df9a9c0df..000000000
--- a/dev-python/zm-py/zm-py-0.4.0.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit distutils-r1
-
-DESCRIPTION="A loose python wrapper around the ZoneMinder REST API."
-HOMEPAGE="https://github.com/rohankapoorcom/zm-py https://pypi.org/project/zm-py/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=">=dev-python/requests-2.0[${PYTHON_USEDEP}]"
-
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/colorlog[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/flake8[${PYTHON_USEDEP}]
-		dev-python/flake8-docstrings[${PYTHON_USEDEP}]
-		dev-python/mypy[${PYTHON_USEDEP}]
-		dev-python/pydocstyle[${PYTHON_USEDEP}]
-		dev-python/pylint[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-# packages=find_packages()
-src_prepare() {
-	sed -i "s/packages=find_packages()/packages=find_packages(exclude=['tests*'])/g" -i setup.py || die
-	eapply_user
-}
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/zm-py/zm-py-0.5.2.ebuild b/dev-python/zm-py/zm-py-0.5.2.ebuild
index c7706efa3..1536256e0 100644
--- a/dev-python/zm-py/zm-py-0.5.2.ebuild
+++ b/dev-python/zm-py/zm-py-0.5.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{6..9} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1