diff --git a/app-admin/customrescuecd-x86/Manifest b/app-admin/customrescuecd-x86/Manifest
index 17dfa9e881..c9378b19ca 100644
--- a/app-admin/customrescuecd-x86/Manifest
+++ b/app-admin/customrescuecd-x86/Manifest
@@ -1,3 +1 @@
-DIST CUSTOMRESCUECD-x86-0.3.1.iso 1426063360 BLAKE2B 8116b657aed9f5fb9ac0d56f6284bc45a4e050ad7e84cd4cb7c5217b07c9151c82776589aefa3c030cf766106bca7948d48cde2055c408c4e32ea081297b6117 SHA512 3aa0d2ab54920a19046fc1038313e01a99287301b06f25b1346c54d680c4ca2395e9c9010b3299cdc94a0198ec0f63209d09a1d086243e3b82216e7f4d63e0e6
-DIST CUSTOMRESCUECD-x86-0.4.0.iso 1322811392 BLAKE2B f93550977a41d1d19a35f7ff2cc2cb7cdd94eb1ca1ade9fed6db7d7963297366b839c5590a17f85f2dec13e86588d651e94792dd12064f094eaffe3608117e03 SHA512 45bb47fc2b72e653c8f9d23a483aa5c59a92aabd306240d06f33d1c7249c905d7961670cbefc6d9d132a9a5fe1fdc7743ee3f1356a8e58724fea6a3073b08a86
 DIST CUSTOMRESCUECD-x86-0.4.1.iso 1322811392 BLAKE2B bd63d40baf6426ed525c13e91ce65469f8f2a263072003c4dc1adea1ca75f894d2517c94063488fa75e1fa6012202ddbbf5281378c17a26edad683ce49996391 SHA512 46f1a2f20697b666fc4506abb405a8ebf58b63a83c5faacfc70e352c9eb9cd4a75ca742ac0011119e8baadd6fb467cfb306d8009994dbf2879a45486ccfe57bc
diff --git a/app-admin/customrescuecd-x86/customrescuecd-x86-0.3.1.ebuild b/app-admin/customrescuecd-x86/customrescuecd-x86-0.3.1.ebuild
deleted file mode 100644
index 4c3a5f629c..0000000000
--- a/app-admin/customrescuecd-x86/customrescuecd-x86-0.3.1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_P="CUSTOMRESCUECD-x86"
-DESCRIPTION="A system rescue cd or usbstick for desktop and server based on gentoo"
-HOMEPAGE="https://sourceforge.net/projects/customrescuecd"
-SRC_URI="mirror://sourceforge/customrescuecd/"${MY_P}"-"${PV}".iso"
-
-LICENSE="GPL-3"
-SLOT="${PV}"
-KEYWORDS="~x86"
-RESTRICT="bindist mirror"
-
-S=${WORKDIR}
-
-src_unpack() { :; }
-
-src_install() {
-	insinto "/usr/share/${PN%-*}"
-	doins "${DISTDIR}/${MY_P}-${PV}.iso"
-}
-
-pkg_postinst() {
-	local f=${EROOT%/}/usr/share/${PN%-*}/${PN}-newest.iso
-
-	# no version newer than ours? we're the newest!
-	if ! has_version ">${CATEGORY}/${PF}"; then
-		ln -f -s -v "${MY_P}-${PV}.iso" "${f}" || die
-	fi
-}
-
-pkg_postrm() {
-	local f=${EROOT%/}/usr/share/${PN%-*}/${PN}-newest.iso
-
-	# if there is no version newer than ours installed
-	if ! has_version ">${CATEGORY}/${PF}"; then
-		# and we are truly and completely uninstalled...
-		if [[ ! ${REPLACED_BY_VERSION} ]]; then
-			# then find an older version to set the symlink to
-			local newest_version=$(best_version "<${CATEGORY}/${PF}")
-
-			if [[ ${newest_version} ]]; then
-				# update the symlink
-				ln -f -s -v "${newest_version%-r*}.iso" "${f}" || die
-			else
-				# last version removed? clean up the symlink
-				rm -v "${f}" || die
-				# and the parent directory
-				rmdir "${f%/*}" || die
-			fi
-		fi
-	fi
-}
diff --git a/app-admin/customrescuecd-x86/customrescuecd-x86-0.4.0.ebuild b/app-admin/customrescuecd-x86/customrescuecd-x86-0.4.0.ebuild
deleted file mode 100644
index 4c3a5f629c..0000000000
--- a/app-admin/customrescuecd-x86/customrescuecd-x86-0.4.0.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_P="CUSTOMRESCUECD-x86"
-DESCRIPTION="A system rescue cd or usbstick for desktop and server based on gentoo"
-HOMEPAGE="https://sourceforge.net/projects/customrescuecd"
-SRC_URI="mirror://sourceforge/customrescuecd/"${MY_P}"-"${PV}".iso"
-
-LICENSE="GPL-3"
-SLOT="${PV}"
-KEYWORDS="~x86"
-RESTRICT="bindist mirror"
-
-S=${WORKDIR}
-
-src_unpack() { :; }
-
-src_install() {
-	insinto "/usr/share/${PN%-*}"
-	doins "${DISTDIR}/${MY_P}-${PV}.iso"
-}
-
-pkg_postinst() {
-	local f=${EROOT%/}/usr/share/${PN%-*}/${PN}-newest.iso
-
-	# no version newer than ours? we're the newest!
-	if ! has_version ">${CATEGORY}/${PF}"; then
-		ln -f -s -v "${MY_P}-${PV}.iso" "${f}" || die
-	fi
-}
-
-pkg_postrm() {
-	local f=${EROOT%/}/usr/share/${PN%-*}/${PN}-newest.iso
-
-	# if there is no version newer than ours installed
-	if ! has_version ">${CATEGORY}/${PF}"; then
-		# and we are truly and completely uninstalled...
-		if [[ ! ${REPLACED_BY_VERSION} ]]; then
-			# then find an older version to set the symlink to
-			local newest_version=$(best_version "<${CATEGORY}/${PF}")
-
-			if [[ ${newest_version} ]]; then
-				# update the symlink
-				ln -f -s -v "${newest_version%-r*}.iso" "${f}" || die
-			else
-				# last version removed? clean up the symlink
-				rm -v "${f}" || die
-				# and the parent directory
-				rmdir "${f%/*}" || die
-			fi
-		fi
-	fi
-}
diff --git a/app-admin/customrescuecd-x86_64/Manifest b/app-admin/customrescuecd-x86_64/Manifest
index 39fa287c28..aefacd2595 100644
--- a/app-admin/customrescuecd-x86_64/Manifest
+++ b/app-admin/customrescuecd-x86_64/Manifest
@@ -1,3 +1 @@
-DIST CUSTOMRESCUECD-x86_64-0.10.3.iso 1537474560 BLAKE2B d4812074013323d8372bd71bea1c81cbe8cb88e0cf87dd1ec7c4373a1c4f4023cfec383ea3327cb75aa903021d929ac7a29290a2a9a7a75857c591827af7a148 SHA512 1092dc85a82c1f17c362b19e91d36602debaab7d52a98945ebb494f9d8bec03fb07b16649c7401233a060ce95905c3f9259107c2eb9f80bd63d759740754105e
-DIST CUSTOMRESCUECD-x86_64-0.11.0.iso 1265106944 BLAKE2B f6732d1f903c02a49ed13525e19f957ccc5a78466cdc62d609579d2aaf2bfa5bcdf5cf2597089d3634fa8124cff3293030703e95187771c7517d890226997245 SHA512 6099c5a344c701936743bbbfad02206dca7937b6c6b796fa7cb42ad42a544c731fa2e0895a94d138cd3d91d34791a5ed88d723973e2e383e900ad1a385a27482
 DIST CUSTOMRESCUECD-x86_64-0.11.1.iso 1261371392 BLAKE2B b12dc61fb2c91fd04832ba22af3421f7223c40ae8e1fe2bd4fc0beeb0aafbc1b11a82aacb16282ce7dd14621e3be717af90363d157c5f36ee33f3eb03a36e26a SHA512 07475353e883756b2782ad6727440132d6f97b9bca7f3cd9180b5a47290a8a0361fb672ef01ac5a5ea5862b1b4ec7bec85990710a53b7a190cce321b24660d01
diff --git a/app-admin/customrescuecd-x86_64/customrescuecd-x86_64-0.10.3.ebuild b/app-admin/customrescuecd-x86_64/customrescuecd-x86_64-0.10.3.ebuild
deleted file mode 100644
index 96d32df69b..0000000000
--- a/app-admin/customrescuecd-x86_64/customrescuecd-x86_64-0.10.3.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_P="CUSTOMRESCUECD-x86_64"
-DESCRIPTION="A system rescue cd or usbstick for desktop and server based on gentoo"
-HOMEPAGE="https://sourceforge.net/projects/customrescuecd"
-SRC_URI="mirror://sourceforge/customrescuecd/"${MY_P}"-"${PV}".iso"
-
-LICENSE="GPL-3"
-SLOT="${PV}"
-KEYWORDS="~amd64"
-RESTRICT="bindist mirror"
-
-S=${WORKDIR}
-
-src_unpack() { :; }
-
-src_install() {
-	insinto "/usr/share/${PN%-*}"
-	doins "${DISTDIR}/${MY_P}-${PV}.iso"
-}
-
-pkg_postinst() {
-	local f=${EROOT%/}/usr/share/${PN%-*}/${PN}-newest.iso
-
-	# no version newer than ours? we're the newest!
-	if ! has_version ">${CATEGORY}/${PF}"; then
-		ln -f -s -v "${MY_P}-${PV}.iso" "${f}" || die
-	fi
-}
-
-pkg_postrm() {
-	local f=${EROOT%/}/usr/share/${PN%-*}/${PN}-newest.iso
-
-	# if there is no version newer than ours installed
-	if ! has_version ">${CATEGORY}/${PF}"; then
-		# and we are truly and completely uninstalled...
-		if [[ ! ${REPLACED_BY_VERSION} ]]; then
-			# then find an older version to set the symlink to
-			local newest_version=$(best_version "<${CATEGORY}/${PF}")
-
-			if [[ ${newest_version} ]]; then
-				# update the symlink
-				ln -f -s -v "${newest_version%-r*}.iso" "${f}" || die
-			else
-				# last version removed? clean up the symlink
-				rm -v "${f}" || die
-				# and the parent directory
-				rmdir "${f%/*}" || die
-			fi
-		fi
-	fi
-}
diff --git a/app-admin/customrescuecd-x86_64/customrescuecd-x86_64-0.11.0.ebuild b/app-admin/customrescuecd-x86_64/customrescuecd-x86_64-0.11.0.ebuild
deleted file mode 100644
index 96d32df69b..0000000000
--- a/app-admin/customrescuecd-x86_64/customrescuecd-x86_64-0.11.0.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_P="CUSTOMRESCUECD-x86_64"
-DESCRIPTION="A system rescue cd or usbstick for desktop and server based on gentoo"
-HOMEPAGE="https://sourceforge.net/projects/customrescuecd"
-SRC_URI="mirror://sourceforge/customrescuecd/"${MY_P}"-"${PV}".iso"
-
-LICENSE="GPL-3"
-SLOT="${PV}"
-KEYWORDS="~amd64"
-RESTRICT="bindist mirror"
-
-S=${WORKDIR}
-
-src_unpack() { :; }
-
-src_install() {
-	insinto "/usr/share/${PN%-*}"
-	doins "${DISTDIR}/${MY_P}-${PV}.iso"
-}
-
-pkg_postinst() {
-	local f=${EROOT%/}/usr/share/${PN%-*}/${PN}-newest.iso
-
-	# no version newer than ours? we're the newest!
-	if ! has_version ">${CATEGORY}/${PF}"; then
-		ln -f -s -v "${MY_P}-${PV}.iso" "${f}" || die
-	fi
-}
-
-pkg_postrm() {
-	local f=${EROOT%/}/usr/share/${PN%-*}/${PN}-newest.iso
-
-	# if there is no version newer than ours installed
-	if ! has_version ">${CATEGORY}/${PF}"; then
-		# and we are truly and completely uninstalled...
-		if [[ ! ${REPLACED_BY_VERSION} ]]; then
-			# then find an older version to set the symlink to
-			local newest_version=$(best_version "<${CATEGORY}/${PF}")
-
-			if [[ ${newest_version} ]]; then
-				# update the symlink
-				ln -f -s -v "${newest_version%-r*}.iso" "${f}" || die
-			else
-				# last version removed? clean up the symlink
-				rm -v "${f}" || die
-				# and the parent directory
-				rmdir "${f%/*}" || die
-			fi
-		fi
-	fi
-}
diff --git a/dev-python/asyncpg/Manifest b/dev-python/asyncpg/Manifest
index f2a7c6116b..4d5625d938 100644
--- a/dev-python/asyncpg/Manifest
+++ b/dev-python/asyncpg/Manifest
@@ -1 +1 @@
-DIST asyncpg-0.20.1.tar.gz 734341 BLAKE2B 10935cd36f874abe7748bfc7a5fa6fa3f64c1b17291b5f4ec390078d7ccdf2031cc52ce97d18a355b7e956ceab1f1b4b708982a2f2af93f82f1d5b97646cb931 SHA512 e7f3a10bdfe28ac37260afefcaeb0580728a7f7363378778abe9a934144ffa062275e8cf73d8d5db9f6d7a94418b1324a8f4ba009da55f374a2764613fff1df0
+DIST asyncpg-0.21.0.tar.gz 746782 BLAKE2B b3f149b02833b1206d82df0f3f28f6b24a8333b861f53410e053a36e4a68359e2c0641bbd9953040b74f1198c301b1a709052110275686a038c0febcb931e688 SHA512 8bfd6689008ea964ac66d1c141bddd749f50d928b6cbc5e059f0e1d0a3597213ccae0b2fa7d694bf4e40c0b2650c445d2c54040a076ba69509e508bf51de2970
diff --git a/dev-python/asyncpg/asyncpg-0.20.1.ebuild b/dev-python/asyncpg/asyncpg-0.21.0.ebuild
similarity index 78%
rename from dev-python/asyncpg/asyncpg-0.20.1.ebuild
rename to dev-python/asyncpg/asyncpg-0.21.0.ebuild
index 712eeb2c5f..5dd92659af 100644
--- a/dev-python/asyncpg/asyncpg-0.20.1.ebuild
+++ b/dev-python/asyncpg/asyncpg-0.21.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_7 )
+PYTHON_COMPAT=( python3_{7,8} )
 
 inherit distutils-r1
 
@@ -16,8 +16,8 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
 # ModuleNotFoundError: No module named 'asyncpg.protocol.protocol'
-# tests seem to require that the package is already installed,
-# PYTHONPATH workaround does not seem to work here
+# for some reason, still doesn't work if package is already installed
+# or with distutils_install_for_testing function
 RESTRICT="test"
 
 BDEPEND="dev-python/cython[${PYTHON_USEDEP}]"
@@ -25,7 +25,8 @@ BDEPEND="dev-python/cython[${PYTHON_USEDEP}]"
 DEPEND="test? (
 	dev-python/pycodestyle[${PYTHON_USEDEP}]
 	dev-python/flake8[${PYTHON_USEDEP}]
-	dev-python/uvloop[${PYTHON_USEDEP}] )"
+	dev-python/uvloop[${PYTHON_USEDEP}]
+)"
 
 distutils_enable_tests pytest
 distutils_enable_sphinx docs dev-python/sphinxcontrib-asyncio dev-python/sphinx_rtd_theme