diff --git a/app-crypt/certbot-dns-rfc2136/certbot-dns-rfc2136-1.10.1.ebuild b/app-crypt/certbot-dns-rfc2136/certbot-dns-rfc2136-1.10.1.ebuild
index 890f0a3..cf1f042 100644
--- a/app-crypt/certbot-dns-rfc2136/certbot-dns-rfc2136-1.10.1.ebuild
+++ b/app-crypt/certbot-dns-rfc2136/certbot-dns-rfc2136-1.10.1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=(python{3_6,3_7,3_8,3_9})
+PYTHON_COMPAT=(python{3_8,3_9})
 DISTUTILS_USE_SETUPTOOLS=rdepend
 
 if [[ ${PV} == 9999* ]]; then
diff --git a/app-crypt/certbot-dns-rfc2136/certbot-dns-rfc2136-9999.ebuild b/app-crypt/certbot-dns-rfc2136/certbot-dns-rfc2136-9999.ebuild
index 890f0a3..737f11e 100644
--- a/app-crypt/certbot-dns-rfc2136/certbot-dns-rfc2136-9999.ebuild
+++ b/app-crypt/certbot-dns-rfc2136/certbot-dns-rfc2136-9999.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=(python{3_6,3_7,3_8,3_9})
+PYTHON_COMPAT=(python{3_8,3_9})
 DISTUTILS_USE_SETUPTOOLS=rdepend
 
 if [[ ${PV} == 9999* ]]; then
diff --git a/dev-libs/Ice/Ice-3.6.5-r2.ebuild b/dev-libs/Ice/Ice-3.6.5-r2.ebuild
index 861267d..1fc1219 100644
--- a/dev-libs/Ice/Ice-3.6.5-r2.ebuild
+++ b/dev-libs/Ice/Ice-3.6.5-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 RUBY_OPTIONAL="yes"
 USE_RUBY="ruby27"
diff --git a/dev-libs/Ice/Ice-3.6.9999.ebuild b/dev-libs/Ice/Ice-3.6.9999.ebuild
index ccfe454..9e7a8c1 100644
--- a/dev-libs/Ice/Ice-3.6.9999.ebuild
+++ b/dev-libs/Ice/Ice-3.6.9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 RUBY_OPTIONAL="yes"
 USE_RUBY="ruby27"
diff --git a/dev-libs/Ice/Ice-3.7.9999.ebuild b/dev-libs/Ice/Ice-3.7.9999.ebuild
index 213056a..59d31ff 100644
--- a/dev-libs/Ice/Ice-3.7.9999.ebuild
+++ b/dev-libs/Ice/Ice-3.7.9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 RUBY_OPTIONAL="yes"
 USE_RUBY="ruby27"
diff --git a/dev-python/aiohttp-json-rpc/aiohttp-json-rpc-0.13.1.ebuild b/dev-python/aiohttp-json-rpc/aiohttp-json-rpc-0.13.1.ebuild
index 3e34c11..0a9c590 100644
--- a/dev-python/aiohttp-json-rpc/aiohttp-json-rpc-0.13.1.ebuild
+++ b/dev-python/aiohttp-json-rpc/aiohttp-json-rpc-0.13.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -10,7 +10,7 @@ inherit distutils-r1
 
 DESCRIPTION="JSON-RPC 2.0 using aiohttp"
 HOMEPAGE="https://github.com/pengutronix/aiohttp-json-rpc"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz -> ${P}.tar.gz"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
diff --git a/dev-python/aiosqlite/aiosqlite-0.15.0.ebuild b/dev-python/aiosqlite/aiosqlite-0.15.0.ebuild
index 8147d99..5f471a1 100644
--- a/dev-python/aiosqlite/aiosqlite-0.15.0.ebuild
+++ b/dev-python/aiosqlite/aiosqlite-0.15.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -10,7 +10,7 @@ inherit distutils-r1
 
 DESCRIPTION="asyncio bridge to the standard sqlite3 module"
 HOMEPAGE="https://github.com/jreese/aiosqlite"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz -> ${P}.tar.gz"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
diff --git a/net-im/swift/swift-9999.ebuild b/net-im/swift/swift-9999.ebuild
index 735aa58..71a7a02 100644
--- a/net-im/swift/swift-9999.ebuild
+++ b/net-im/swift/swift-9999.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
 
 LUA_COMPAT=( lua5-{1..2} luajit )
-PYTHON_COMPAT=( python3_{6..9} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit lua-single python-any-r1 scons-utils toolchain-funcs
 
@@ -145,6 +145,9 @@ src_configure() {
 		hunspell_enable="no"
 		icu="$(usex icu)"
 		install_git_hooks="no"
+		# Use 'DISABLE' as an invalid lib name, so no editline lib is used,
+		# as current version is not compatible and compilation will fail.
+		editline_libname="DISABLE"
 		libidn_bundled_enable="false"
 		libminiupnpc_force_bundled="false"
 		libnatpmp_force_bundled="false"
diff --git a/net-irc/znc/znc-9999.ebuild b/net-irc/znc/znc-9999.ebuild
index 4aa4d24..b79a8f2 100644
--- a/net-irc/znc/znc-9999.ebuild
+++ b/net-irc/znc/znc-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8,9} )
 
 inherit cmake python-single-r1
 
diff --git a/sys-auth/sssd/sssd-2.5.0.ebuild b/sys-auth/sssd/sssd-2.5.0.ebuild
index 1b4fe7c..dc2d73f 100644
--- a/sys-auth/sssd/sssd-2.5.0.ebuild
+++ b/sys-auth/sssd/sssd-2.5.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9,10} )
+PYTHON_COMPAT=( python3_{8,9,10} )
 
 inherit autotools flag-o-matic linux-info multilib-minimal python-single-r1 pam systemd toolchain-funcs
 
diff --git a/sys-libs/pam_wrapper/pam_wrapper-1.1.3.ebuild b/sys-libs/pam_wrapper/pam_wrapper-1.1.3.ebuild
index db8ccd7..013a674 100644
--- a/sys-libs/pam_wrapper/pam_wrapper-1.1.3.ebuild
+++ b/sys-libs/pam_wrapper/pam_wrapper-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_{7..9} )
+PYTHON_COMPAT=( python3_{8..9} )
 CMAKE_ECLASS=cmake
 inherit cmake-multilib python-single-r1