gentoo resync : 16.09.2020

author: V3n3RiX <venerix@redcorelinux.org> 2020-09-16 09:32:48 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2020-09-16 09:32:48 +0100
commit: 9ee6d97c2883d42f204a533a8bc1f4562df778fb (patch)
tree: b690ddc0ca30f1472887edbb0b8313629bfcbbb2 /dev-python
parent: b17a3ef12038de50228bade1f05502c74e135321 (diff)
1107 files changed, 10247 insertions, 2584 deletions
diff --git a/dev-python/Babel/Babel-2.8.0-r1.ebuild b/dev-python/Babel/Babel-2.8.0-r1.ebuild
index c7d4b499463c..518ced6631e2 100644
--- a/dev-python/Babel/Babel-2.8.0-r1.ebuild
+++ b/dev-python/Babel/Babel-2.8.0-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
 
 RDEPEND="dev-python/pytz[${PYTHON_USEDEP}]
 	dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/Babel/Manifest b/dev-python/Babel/Manifest
index 193c3def2410..f0f8bd4457b0 100644
--- a/dev-python/Babel/Manifest
+++ b/dev-python/Babel/Manifest
@@ -1,4 +1,4 @@
 AUX Babel-2.8.0-py39.patch 7421 BLAKE2B 94a9b55504214b4c422cab61651dcc4c9192f438635e0ec6aa77ea1b53fefb782dd4a1d13ba89500fc2c2e13bebfc616529aaf74c18a55304fd23c2c53fb77cc SHA512 8d738bb0140c80bb2db8a2180c563f61500df42de1b69f0b2a36dea23aad889fe59451fca993161f6ca6a2f6006d98ce94ab139eb5be4a1a25f43e922e3fc9de
 DIST Babel-2.8.0.tar.gz 8444381 BLAKE2B ea3757182464770f47d3253e77bece7b64c84558e7a19fc55759198bfa55c6d8156d27e9de7b796b62eefd93e458c7e00b2014dd23e4ed7383f5bc9785d1a332 SHA512 f9687b36176c146a8ace073197111463d24fca343bb1dbee8b0e37a7f37b68b4cd77ffbe3bf14a20f8f64c701aa860e0b5e6076658a95dbee2556f0688d68d91
-EBUILD Babel-2.8.0-r1.ebuild 930 BLAKE2B 18d7eb5333ce5487b22d6c43504c53130a62262918fcdef70fc509e0167d2f53df279a499071ae2d1d686a07a2242898b05b651017e1d8ec82ac8954c8986a8a SHA512 6ef9304ba4b345756c3f80b6f0ec141d5310912177335b8ece236357965ea93132d30da4f2934d3cc315400fe0978eedc8cc0d71d7d6a6c934c3ee2366b3cffd
+EBUILD Babel-2.8.0-r1.ebuild 937 BLAKE2B e0c8acae0dbdbdc4ef4ecb85b09aa9f8f0840f8b2644facffbeab3efea6c7dce7649de8c0291604c07c2aa39f03971a20c5d24c09602465544d50a5e1b7a6f2a SHA512 a67e359ff80426214e8db4042054c236340b586b626d3fe1bb93f74b51b98abb689ba64a09a6123d54b33f536bcc26ecebb53228c28aa1417a701a9e492b9f62
 MISC metadata.xml 839 BLAKE2B d9916ce88ce8436bb28d15300e78013e1c9e0f88f385a369c0ad6840f0fe81ad136052a3c257cef50a2fd86500bcde2b652ad0ed664f95d6affa4ccc8770445b SHA512 3688c1488c552b84c685d0aeb6251aea4f9d41be3db3aeb226291655107e1332df13445545b3742587e133de7468a40f22ca53fa67fd8d2e0db570069498654f
diff --git a/dev-python/GitPython/GitPython-3.1.8.ebuild b/dev-python/GitPython/GitPython-3.1.8.ebuild
new file mode 100644
index 000000000000..2dedec128a2b
--- /dev/null
+++ b/dev-python/GitPython/GitPython-3.1.8.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+TEST_P=GitPython-${PV}
+GITDB_P=gitdb-4.0.5
+SMMAP_P=smmap-3.0.4
+
+DESCRIPTION="Library used to interact with Git repositories"
+HOMEPAGE="https://github.com/gitpython-developers/GitPython https://pypi.org/project/GitPython/"
+SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz
+	test? (
+		https://dev.gentoo.org/~mgorny/dist/${TEST_P}.gitbundle
+		https://dev.gentoo.org/~mgorny/dist/${GITDB_P}.gitbundle
+		https://dev.gentoo.org/~mgorny/dist/${SMMAP_P}.gitbundle
+	)"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	dev-vcs/git
+	>=dev-python/gitdb-4.0.1[${PYTHON_USEDEP}]"
+BDEPEND="
+	test? (
+		>=dev-python/ddt-1.1.1[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests unittest
+
+src_test() {
+	git config --global user.email "you@example.com" || die
+	git config --global user.name "Your Name" || die
+
+	git clone "${DISTDIR}/${TEST_P}.gitbundle" "${T}"/test || die
+	git clone "${DISTDIR}/${GITDB_P}.gitbundle" \
+		"${T}"/test/git/ext/gitdb || die
+	git clone "${DISTDIR}/${SMMAP_P}.gitbundle" \
+		"${T}"/test/git/ext/gitdb/gitdb/ext/smmap || die
+
+	cd "${T}"/test || die
+	rm -r test/performance || die
+	# tests requiring network access
+	sed -i -e 's:test_fetch_error:_&:' test/test_remote.py || die
+	rm test/test_installation.py || die
+	# broken apparently (also fails in git clone)
+	sed -e 's:test_rev_parse:_&:' \
+		-i test/test_repo.py || die
+
+	distutils-r1_src_test
+}
diff --git a/dev-python/GitPython/Manifest b/dev-python/GitPython/Manifest
index d6672e33aa05..10ba75ed8526 100644
--- a/dev-python/GitPython/Manifest
+++ b/dev-python/GitPython/Manifest
@@ -1,6 +1,9 @@
 DIST GitPython-3.1.7.gitbundle 8821099 BLAKE2B 96b6cb8cce9778099001d9c3066b9d3b7f4c3c4b4283e521f7b41e93cf5f3990a8758853c261e3458cd6a8c8c48661526e1dd2ce2208e02d3ee895358a135b4a SHA512 c311a464e79c769be92b08a216d52487a47af6c8807e880b6c2225d04eb7cd772808a6675660a2e727ce3ddf47746203646fb96f9a947d4ae2ad4b916f8dc984
 DIST GitPython-3.1.7.tar.gz 169134 BLAKE2B aba0464b18bfbcfd5e219c6483a1af70cb89da45d26e41e18a26b661985d2ab414e72b60a5366a9dd1ff0603876907a7fd642bc49bae01973ef6c8ba7906ec31 SHA512 7c434312be303288b58fabea4d6a84bf417dfff60d61695384af594e5f1231efc8d79d250aa63e04263b4c9aa4f19efceb98c5eea1a466fb0b433113ddb4af46
+DIST GitPython-3.1.8.gitbundle 4418113 BLAKE2B b6c2154b8f1eadc005055c8c04a9c2ee5e9b365bcbb258cf24d676aa5e1d7f598c26c5404606f8c48d2e2165615e6cf4b3006f071cc3a3bb2047990d232f16d2 SHA512 d506bc72ae10227fde57c8497ad41a2da9e9b4613b3b98ca6a0d48cf8286bdc3e9d71284a5fededd2df075042a12dd8074e07c32defda707865c129dc83b7247
+DIST GitPython-3.1.8.tar.gz 170582 BLAKE2B 0ca3111ce09259b9b071d43b06715b187a6f428dd81002c57215c60e720447007220536f51d681c5468ebe91a4144769b57f6a8c80d29683c26f0f07d984d765 SHA512 8848b58738d7dd33b8c3186d9db0eb41a6e428050f4fe170351e42c941c9586ba4999bf5083fbbe2b7ce73a668a0f62cfb19be013f470c7b8f0733d07d9bee32
 DIST gitdb-4.0.5.gitbundle 1497722 BLAKE2B 8ee85368db7f408f96f0b48250f1ed96c8df28b0439d355ce2eecbdcc5dc94382883510c57142e7e4b6ba7cd8e82b1140eca538b45692dbe8c55bce32e1b5b4f SHA512 2c55a8e402a61ebcc362a8aee4a6154705d8ff2f5e582d13c855562dd074427681f4147641fe76681b76c99ec46040c7577dfca8bbfd575fc52772a9a6f17326
 DIST smmap-3.0.4.gitbundle 276552 BLAKE2B 2d17b927b2c644d2f1984168ee99fe5a9a58392401ac0b2894a1d5e5f9c292f32311a7a5d7669bd93c642ff791f4801d61ef3236c1dafa1434e99a17fd8751f6 SHA512 6deb282c6ece3b556c59c458b5242ff362b903441db63c005a0ab1ac055b3f974f9b34f30e0a4a41ef9246696e08b191254f72db61a8f24d4eb2f0e48a08937b
 EBUILD GitPython-3.1.7.ebuild 1591 BLAKE2B b28668afcd02953756d822212888cd7d05f3e27ab6407b9d963aa9a877852db082fd82d72b66be85bd25b1fd8ddac02fe65dae43f892ab0ed8164930f947668a SHA512 2ddca8c8fe89ff8c7a2402c9a81883d61af089ea92c554149fe08bb89467da87ba869d31cd64fb6942fd202d61e4c2307d8de7b4640e18369b50244365185401
+EBUILD GitPython-3.1.8.ebuild 1594 BLAKE2B 6de51ce01515d1c7b7dfea87b3a05beb95fc13cea3dfdf4513ff2ffd33123a77ff11f6f37c5f64113a6ac59c8ccee6aca73bad8da426c471208ffde9f13f9dc1 SHA512 153e59402445821d499384b6d3df4686748eb8eb3952943f8b574bf1c255f009149e31988ae12cda7fb5f0959f967cf00f9307796adc1ba6b91d7201ee9c46e7
 MISC metadata.xml 406 BLAKE2B ae639878f2162f9c2e313d10ba8122ede602251b28c0e82f36f73c92822d2626601bc6ce575cbd4bd5087acaea1a048079901ef67d787849c2061c68b2ad77a9 SHA512 2942febc2c1edbd075b64bdb5b6cffc2ecfa07231e8d210de4dbbaef3dd64a4df876dfddd8f1227ff2b1b9264d8746d951dc9e08db64bebddf0b0e1dea2a641a
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index fc9a76d5788a..f48776200f53 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/PyQt5/Manifest b/dev-python/PyQt5/Manifest
index be78bf3e22bb..a36b452946fa 100644
--- a/dev-python/PyQt5/Manifest
+++ b/dev-python/PyQt5/Manifest
@@ -1,5 +1,7 @@
 DIST PyQt5-5.14.2.tar.gz 3246557 BLAKE2B 0dd57da76dede97349c1af1d97cebad430dd5ae03c99b71de2e1ef1c41c1503820b0c0b1af8ddb507ffa5d6f466f7d3012db2cf625dad949dc4c962fb9e8a6a3 SHA512 56d9b2970ff50f2af0bfd889ad1226bf64087a6210cc545c5a0188352d1651343fcda9d53f04b041273f61bf31baf43af4a1854c1b580d50c28cff82f59c24ec
 DIST PyQt5-5.15.0.tar.gz 3262004 BLAKE2B 6f9751bb00a8099555da89cc0df26d36906fabaf12eba60d11479152ad78805ba84d6de9c32b6212a19edb38b10c2253976a964bdcfaf18b8b8aa3656126b73f SHA512 35bcfef4d7ccfee04c1c4409d2af3d862f1e8e46d6ce743bfcfbaf43d2046bc58317824b0840f3db460ad280d1b7e896812268b36225198e916a1d9ea86823a9
+DIST PyQt5-5.15.1.tar.gz 3264559 BLAKE2B 20060297c52aa5d07ba28b50440bd3623b8648eef8502693f8175af9ba4edf9238b9be71c696ea2589556ad70e70e868dc9c286466af22867ab51d5c66e613db SHA512 a7378dd53337c58f5ba7e9f7510b57fe4affe578b68975ce1dd7ba5c2a1c77d08d51d11078ce782aab09509df934eb3e4d0588de87391f74ad99f9624644cc4e
 EBUILD PyQt5-5.14.2-r1.ebuild 5728 BLAKE2B be7eb17461a7de96db7093a308760f5bc8e7291cf33c85a3ec23cd587c06448d27b83d91c2359ef6bd5f2fd0fa07ac8839e79bb378e9314ad14e20c08ae79ce4 SHA512 6a29fbc177ee262d0f5551b3246d2512f6f2ec0b47db991a0885372c5c0afa5ce8a4d3e712791746894b90a334ce5bc33649b6a290ebb2d9c7a96adfc77c6c85
 EBUILD PyQt5-5.15.0-r1.ebuild 5740 BLAKE2B ef0da446f5bcc809cd0bb1c1d194a6183cc0dba0ddeee12658995d127542377d19bb75c46a4fbfa9353f8462b4f74cca16b81e5bed03bd1aac2dbaa5f8ddf461 SHA512 2d077f9eb58f623f835cdf0d13a8b5686037a553e4bad4ad7a14771fa58e0234f9ed9fecc580b43d98430f09afe101431e3b1098467960e6cf73df19740bb107
+EBUILD PyQt5-5.15.1.ebuild 5649 BLAKE2B 1977f063ea24c1da9c86d4c88c10f2b8fe5b1a4236f8015b7a7c834970b0a2d91d4969ff7136a8071da02403df4c49aff2f5ea315d331f81b98376e3d685c9ec SHA512 bb37089c5d64b70e7f733c07ca0fc5f52d5a171c929fc36074b7692571fc08394bb1b0b9a4a90659b642a15351e17b3ab4ba95ce268080eefe0fcf1c20d099eb
 MISC metadata.xml 2354 BLAKE2B 765b65d4070c72689637e5f9cc2f5499ee4b8fa622ce75fc87a873e9b69079dc83474ce03a79b4c77ed6cf9c46881e0d1d629d518b6d14849b9ce5f72eafff04 SHA512 21444cee42058a0b134c27c67ab8219dcc96c5898de4112e8cd125a46e61ec7f421a2f58677991bc3bb2c330e55fe2382b561ead1a6623d549210e7ddf06b6ec
diff --git a/dev-python/PyQt5/PyQt5-5.15.1.ebuild b/dev-python/PyQt5/PyQt5-5.15.1.ebuild
new file mode 100644
index 000000000000..f8783da20c36
--- /dev/null
+++ b/dev-python/PyQt5/PyQt5-5.15.1.ebuild
@@ -0,0 +1,190 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+inherit multibuild python-r1 qmake-utils
+
+DESCRIPTION="Python bindings for the Qt framework"
+HOMEPAGE="https://www.riverbankcomputing.com/software/pyqt/intro"
+
+MY_P=${PN}-${PV/_pre/.dev}
+if [[ ${PV} == *_pre* ]]; then
+	SRC_URI="https://dev.gentoo.org/~pesa/distfiles/${MY_P}.tar.gz"
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+
+# TODO: QtNfc, QtQuick3D, QtRemoteObjects, QtTextToSpeech
+IUSE="bluetooth dbus debug declarative designer examples gles2-only gui help location
+	multimedia network networkauth opengl positioning printsupport sensors serialport
+	sql +ssl svg testlib webchannel webkit websockets widgets x11extras xmlpatterns"
+
+# The requirements below were extracted from configure.py
+# and from the output of 'grep -r "%Import " "${S}"/sip'
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+	bluetooth? ( gui )
+	declarative? ( gui network )
+	designer? ( widgets )
+	help? ( gui widgets )
+	location? ( positioning )
+	multimedia? ( gui network )
+	networkauth? ( network )
+	opengl? ( gui widgets )
+	positioning? ( gui )
+	printsupport? ( gui widgets )
+	sensors? ( gui )
+	serialport? ( gui )
+	sql? ( widgets )
+	svg? ( gui widgets )
+	testlib? ( widgets )
+	webchannel? ( network )
+	webkit? ( gui network printsupport widgets )
+	websockets? ( network )
+	widgets? ( gui )
+	xmlpatterns? ( network )
+"
+
+# Minimal supported version of Qt.
+QT_PV="5.14:5"
+
+RDEPEND="${PYTHON_DEPS}
+	>=dev-python/PyQt5-sip-4.19.23:=[${PYTHON_USEDEP}]
+	>=dev-qt/qtcore-${QT_PV}
+	>=dev-qt/qtxml-${QT_PV}
+	bluetooth? ( >=dev-qt/qtbluetooth-${QT_PV} )
+	dbus? (
+		dev-python/dbus-python[${PYTHON_USEDEP}]
+		>=dev-qt/qtdbus-${QT_PV}
+	)
+	declarative? ( >=dev-qt/qtdeclarative-${QT_PV}[widgets?] )
+	designer? ( >=dev-qt/designer-${QT_PV} )
+	gui? ( >=dev-qt/qtgui-${QT_PV}[gles2-only=] )
+	help? ( >=dev-qt/qthelp-${QT_PV} )
+	location? ( >=dev-qt/qtlocation-${QT_PV} )
+	multimedia? ( >=dev-qt/qtmultimedia-${QT_PV}[widgets?] )
+	network? ( >=dev-qt/qtnetwork-${QT_PV}[ssl=] )
+	networkauth? ( >=dev-qt/qtnetworkauth-${QT_PV} )
+	opengl? ( >=dev-qt/qtopengl-${QT_PV} )
+	positioning? ( >=dev-qt/qtpositioning-${QT_PV} )
+	printsupport? ( >=dev-qt/qtprintsupport-${QT_PV} )
+	sensors? ( >=dev-qt/qtsensors-${QT_PV} )
+	serialport? ( >=dev-qt/qtserialport-${QT_PV} )
+	sql? ( >=dev-qt/qtsql-${QT_PV} )
+	svg? ( >=dev-qt/qtsvg-${QT_PV} )
+	testlib? ( >=dev-qt/qttest-${QT_PV} )
+	webchannel? ( >=dev-qt/qtwebchannel-${QT_PV} )
+	webkit? ( dev-qt/qtwebkit:5[printsupport] )
+	websockets? ( >=dev-qt/qtwebsockets-${QT_PV} )
+	widgets? ( >=dev-qt/qtwidgets-${QT_PV} )
+	x11extras? ( >=dev-qt/qtx11extras-${QT_PV} )
+	xmlpatterns? ( >=dev-qt/qtxmlpatterns-${QT_PV} )
+"
+DEPEND="${RDEPEND}
+	>=dev-python/sip-4.19.23[${PYTHON_USEDEP}]
+	dbus? ( virtual/pkgconfig )
+"
+
+S=${WORKDIR}/${MY_P}
+
+pyqt_use_enable() {
+	use "$1" || return
+
+	if [[ $# -eq 1 ]]; then
+		echo --enable=Qt$(tr 'a-z' 'A-Z' <<< ${1:0:1})${1:1}
+	else
+		shift
+		echo ${@/#/--enable=}
+	fi
+}
+
+src_configure() {
+	configuration() {
+		local myconf=(
+			"${PYTHON}"
+			"${S}"/configure.py
+			$(usex debug '--debug --qml-debug --trace' '')
+			--verbose
+			--confirm-license
+			--qmake="$(qt5_get_bindir)"/qmake
+			--bindir="${EPREFIX}/usr/bin"
+			--qsci-api
+			--enable=QtCore
+			--enable=QtXml
+			$(pyqt_use_enable bluetooth)
+			$(pyqt_use_enable dbus QtDBus)
+			$(usex dbus '' --no-python-dbus)
+			$(pyqt_use_enable declarative QtQml QtQuick $(usex widgets QtQuickWidgets ''))
+			$(usex declarative '' --no-qml-plugin)
+			$(pyqt_use_enable designer)
+			$(usex designer '' --no-designer-plugin)
+			$(usex gles2-only '--disable-feature=PyQt_Desktop_OpenGL' '')
+			$(pyqt_use_enable gui)
+			$(pyqt_use_enable gui $(use gles2-only && echo _QOpenGLFunctions_ES2 || echo _QOpenGLFunctions_{2_0,2_1,4_1_Core}))
+			$(pyqt_use_enable help)
+			$(pyqt_use_enable location)
+			$(pyqt_use_enable multimedia QtMultimedia $(usex widgets QtMultimediaWidgets ''))
+			$(pyqt_use_enable network)
+			$(pyqt_use_enable networkauth QtNetworkAuth)
+			$(pyqt_use_enable opengl QtOpenGL)
+			$(pyqt_use_enable positioning)
+			$(pyqt_use_enable printsupport QtPrintSupport)
+			$(pyqt_use_enable sensors)
+			$(pyqt_use_enable serialport QtSerialPort)
+			$(pyqt_use_enable sql)
+			$(usex ssl '' '--disable-feature=PyQt_SSL')
+			$(pyqt_use_enable svg)
+			$(pyqt_use_enable testlib QtTest)
+			$(pyqt_use_enable webchannel QtWebChannel)
+			$(pyqt_use_enable webkit QtWebKit QtWebKitWidgets)
+			$(pyqt_use_enable websockets QtWebSockets)
+			$(pyqt_use_enable widgets)
+			$(pyqt_use_enable x11extras QtX11Extras)
+			$(pyqt_use_enable xmlpatterns QtXmlPatterns)
+		)
+		echo "${myconf[@]}"
+		"${myconf[@]}" || die
+
+		# Run eqmake to respect toolchain and build flags
+		eqmake5 -recursive ${PN}.pro
+	}
+	python_foreach_impl run_in_build_dir configuration
+}
+
+src_compile() {
+	python_foreach_impl run_in_build_dir default
+}
+
+src_install() {
+	installation() {
+		local tmp_root=${D}/${PN}_tmp_root
+		# parallel install fails because mk_distinfo.py runs too early
+		emake -j1 INSTALL_ROOT="${tmp_root}" install
+
+		local bin_dir=${tmp_root}${EPREFIX}/usr/bin
+		local exe
+		for exe in pylupdate5 pyrcc5 pyuic5; do
+			python_doexe "${bin_dir}/${exe}"
+			rm "${bin_dir}/${exe}" || die
+		done
+
+		local uic_dir=${tmp_root}$(python_get_sitedir)/${PN}/uic
+		rm -r "${uic_dir}"/port_v2 || die
+
+		multibuild_merge_root "${tmp_root}" "${D}"
+		python_optimize
+	}
+	python_foreach_impl run_in_build_dir installation
+
+	einstalldocs
+
+	if use examples; then
+		dodoc -r examples
+	fi
+}
diff --git a/dev-python/PyQtWebEngine/Manifest b/dev-python/PyQtWebEngine/Manifest
index e58535cd1204..d582be346081 100644
--- a/dev-python/PyQtWebEngine/Manifest
+++ b/dev-python/PyQtWebEngine/Manifest
@@ -1,5 +1,7 @@
 DIST PyQtWebEngine-5.14.0.tar.gz 47794 BLAKE2B 28f4a577ab5d8c1bea439b11e836008d27b4a49f31f230885013b515147a95c97e398328d1fc3a99619c3fd6eca3da7e94bf5873de9ac6511e0f59e467d4490c SHA512 c5274ce5ba1c80c6851971c3e18acf33121cd5863f613bd1789fdb40323b52429b55b54f3dcbb3127c85343e11f14c004ad54711b2b59cab95fd440f90fe5f2e
 DIST PyQtWebEngine-5.15.1.dev2006110847.tar.gz 48514 BLAKE2B a4c4490720dcc1bf95c62e3bb9e72f2e25000a2641b64f2a0466649899f56eac0594461471ba787c332a32cda8b48cff0bddd2d4beceadfca02b1c06668e4117 SHA512 1f39052f22598f4fdb30ce9b9180fc145414e2e6708f2bda5a6f9166824926f91ca61070e64c4d9f880f0711a0c4c3a6a345d9904092bb13d51bd28e71fd52ab
+DIST PyQtWebEngine-5.15.1.tar.gz 48520 BLAKE2B d4e4fcfb1066fcc274f4b3c8ccd7380435b9391586e3396fb5aa95ad7443c168ea9be3b85ec93e2dc28285aca18718afeb1487cb2c4ad5ed1a4f4d03010107ec SHA512 1efbea43bfd4a6de1c7aa2ab2ca124c4278b6b7ea0d6073c64a7ad83df676759d0747421cae5214017e3c61d8edddf9766f93660e13eee5d407a24fd11d8c21f
 EBUILD PyQtWebEngine-5.14.0.ebuild 1666 BLAKE2B 50ceeff152ddfc9bd8809eadf514ed5be1363829d7533d4431f7ee5d23a6d3d172dd96303912dd05770391b633774c2931e11ecf9a1eb9cb5b10294f25a557a7 SHA512 ac328a51e306f15d4fea2101968dab5df731935642938915bc62399ce9eacc1a79bb5666af51594db0d37efc1ec9efdcc6d4168e44eb7c6d9a6e54515ec4c0a8
+EBUILD PyQtWebEngine-5.15.1.ebuild 1668 BLAKE2B 18ba0ce56d43189b91d8d38109d8c55e43ebfad7bd037d48dbce6bbfa255b51b209fb9c519b9002e55ce25d6b0a88dc7a04f6ee9dea6a013d177ca777b2bd7ea SHA512 f1679dc7da76d09e86151674c35744388dd3bd0cfd38c279a0f04c932b03288a6be9fc8d937b22a051a8569ac7f351e1914e9683ef0481bd2d82f86d76ee784d
 EBUILD PyQtWebEngine-5.15.1_pre2006110847.ebuild 1668 BLAKE2B 18ba0ce56d43189b91d8d38109d8c55e43ebfad7bd037d48dbce6bbfa255b51b209fb9c519b9002e55ce25d6b0a88dc7a04f6ee9dea6a013d177ca777b2bd7ea SHA512 f1679dc7da76d09e86151674c35744388dd3bd0cfd38c279a0f04c932b03288a6be9fc8d937b22a051a8569ac7f351e1914e9683ef0481bd2d82f86d76ee784d
 MISC metadata.xml 958 BLAKE2B 3d360762116d92a71aee391ba8bb5eaeb4f8347f22c0bad7c05211d82cf9bf9ce04e74baa1691c3a48c7be7c3906c180234a7b3c33b76e56c6b94982ad0045f5 SHA512 06ed8222b239484fdb7d1e7ab35b922b9eea81ec144bace571355302d1b01dbd6bd80d2d5c03d1ec7f7edad851050305d2e87232f5580e92276018c7c4e9753f
diff --git a/dev-python/PyQtWebEngine/PyQtWebEngine-5.15.1.ebuild b/dev-python/PyQtWebEngine/PyQtWebEngine-5.15.1.ebuild
new file mode 100644
index 000000000000..94183f43f9bb
--- /dev/null
+++ b/dev-python/PyQtWebEngine/PyQtWebEngine-5.15.1.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+inherit python-r1 qmake-utils
+
+DESCRIPTION="Python bindings for QtWebEngine"
+HOMEPAGE="https://www.riverbankcomputing.com/software/pyqtwebengine/intro"
+
+MY_P=${PN}-${PV/_pre/.dev}
+if [[ ${PV} == *_pre* ]]; then
+	SRC_URI="https://dev.gentoo.org/~pesa/distfiles/${MY_P}.tar.gz"
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="debug"
+
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	>=dev-python/PyQt5-5.14[gui,network,printsupport,ssl,webchannel,widgets,${PYTHON_USEDEP}]
+	>=dev-python/PyQt5-sip-4.19.22:=[${PYTHON_USEDEP}]
+	dev-qt/qtcore:5
+	dev-qt/qtwebengine:5[widgets]
+"
+DEPEND="${RDEPEND}
+	>=dev-python/sip-4.19.22[${PYTHON_USEDEP}]
+"
+
+S=${WORKDIR}/${MY_P}
+
+src_configure() {
+	configuration() {
+		local myconf=(
+			"${PYTHON}"
+			"${S}"/configure.py
+			--qmake="$(qt5_get_bindir)"/qmake
+			$(usex debug '--debug --trace' '')
+			--verbose
+		)
+		echo "${myconf[@]}"
+		"${myconf[@]}" || die
+
+		# Fix parallel install failure
+		sed -i -e '/INSTALLS += distinfo/i distinfo.depends = install_subtargets install_pep484_stubs install_api' \
+			${PN}.pro || die
+
+		# Run eqmake to respect toolchain and build flags
+		eqmake5 -recursive ${PN}.pro
+	}
+	python_foreach_impl run_in_build_dir configuration
+}
+
+src_compile() {
+	python_foreach_impl run_in_build_dir default
+}
+
+src_install() {
+	installation() {
+		emake INSTALL_ROOT="${D}" install
+		python_optimize
+	}
+	python_foreach_impl run_in_build_dir installation
+
+	einstalldocs
+}
diff --git a/dev-python/PySocks/Manifest b/dev-python/PySocks/Manifest
index b49f427ca903..af09769a7e74 100644
--- a/dev-python/PySocks/Manifest
+++ b/dev-python/PySocks/Manifest
@@ -1,4 +1,4 @@
 AUX PySocks-1.7.1-test_server.patch 1382 BLAKE2B 82bbc57a47b4cc0c6ee3177d997a25ba905b0c43eb5cc9b444d31080d20a365a85f1ab1c954d3edf0b9ef54a70985eb3956dd1533c09b46766d407edce085c07 SHA512 810bcbffd4d61db66459a04f422e6789a89f46d1026afd55c2bb06b13302e087613fc643b2f53df5f17992432df82707e776c60d8d0d69a6eebab862351d9ece
 DIST PySocks-1.7.1.tar.gz 284429 BLAKE2B 8015e8a0a7ebfbb09ec542393aeb633a769701445c07f24bb9e62b07803d7bb605f22e79ad9ec83e47aa7fe843a1a057073d97e25482e742f42e18b2c7a2f1b3 SHA512 cef4a5ce8c67fb485644696a23bf68a721db47f3211212de2d4431eaf9ebd26077dd5a06f6dfa7fde2dcb9d7c1ed551facd014e999929cb4d7b504972c464016
-EBUILD PySocks-1.7.1.ebuild 1256 BLAKE2B 682a79b26dad815782a9a42e93d4a23e4dc0693aa9c75725cba30c19d389358fd110034a486f1221cb652131caaea4399c3f1563b7fa44cabea8a4dc9a6ab8e8 SHA512 8832d26541d7899af3ed0593d492c576d24fadf8180d05c1152d35dc4e74ed9f05467612f7e6563a3bb15e9eeb0de1cabb0c1fa13fea1afadab238b58852ee7e
+EBUILD PySocks-1.7.1.ebuild 1263 BLAKE2B 2a1cebdf150a2f62d9106ec5ab72b745d72a91b1b019ba08cbb86ef46cc1e1a2115c243fc75bb1a0e48e5f9e27337560e31c1e06e897b1a992f5d99c27575b4a SHA512 ede5b99352a1e17b67d949367f45a3128b9c0538f69ce40c09f93bd36bf84f7c5ebe18cf26909529266e2b173b468703da085d9fbc4a04b62d4cf2120f5ad080
 MISC metadata.xml 499 BLAKE2B 6eeb0c4905d8f0d6c2d276b36a74ac9e1aaf3f5066ba79ea3b821fa31440a46c4ba49f88be096850032cf8598f6abee09182d84a35345fa53e1001a05137dbe0 SHA512 ec9cc3e4f9a050f78cb0c073efd3698b47aee2ce14d438163b5037509a5d8076509b4954bec0afc7f1e05bc790f26a6a520bb671b1c8590db966456dcf53b9aa
diff --git a/dev-python/PySocks/PySocks-1.7.1.ebuild b/dev-python/PySocks/PySocks-1.7.1.ebuild
index b49d8900163f..569c7a291e95 100644
--- a/dev-python/PySocks/PySocks-1.7.1.ebuild
+++ b/dev-python/PySocks/PySocks-1.7.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 #BDEPEND="
 #	test? (
diff --git a/dev-python/WSME/Manifest b/dev-python/WSME/Manifest
index 479585dab6c1..33fd7cf74598 100644
--- a/dev-python/WSME/Manifest
+++ b/dev-python/WSME/Manifest
@@ -1,3 +1,3 @@
 DIST WSME-0.9.3.tar.gz 124775 BLAKE2B 393168629333c4e304689758c9462164d638cdc529c6128975ed5cb6624db4caef5a700a41ae8e51565cd796d1c4e5539bc553bc358991c3c62c1a18aa443cd4 SHA512 dcff4a1742c778af37b1182f45d4025a3a9b60b1aa7b7c1e62957eb1a2c0d38ffe0a0d16a921e44fda1f2310aa60cdae9bdacc1941cb01d8eb8f36cb31514c9c
 EBUILD WSME-0.9.3.ebuild 768 BLAKE2B 9890917e01dd84ebae649cc40776b99d24da5655775b0a228f94ab9a7d0e2da75674202b5d9225725ab23436be582597d6dcafdb70af533b3fde8685013f1fa5 SHA512 2aedf9567670bafadb8146609169042d1c63c5a7a3624ded65a85ad0731d0951ba60b642935bbd3c4238181e499ed54cfb93f03c5dd0d8a9bac4575af2136532
-MISC metadata.xml 575 BLAKE2B 124788df9210c22a2bd71eae838d413f3faf231eb31dafef6f6c4cc15a65cc23098e052d18353470f23c8874bd752503cb7d44f629dc1faef562309479315162 SHA512 d57f5520e1f102f496ac66c0f9b2842ee4511ce96e9fca3d4e166ee81307d8033d36ed1d0d90fd91a8285d9516a268691dd3502beefb398e7b1303b0af0111af
+MISC metadata.xml 444 BLAKE2B e8ce8fb88d87751866b1340aab2fefd4493c3e04fc9ec49ca8616dd29481c231e5dc5401c9fb7b57b8c640d0f652e589c1960b0f8036486e39e532c30e4f447e SHA512 3e79dde8df3688202f9ca0bbf7a979cab8faf2655dfabb569c67bcef5a7c84d570498ad023967a4c9540e0cb4c4a1703c9c9bf68213ea036872dfc7af17bb405
diff --git a/dev-python/WSME/metadata.xml b/dev-python/WSME/metadata.xml
index 370ecc10214e..24f482c68fda 100644
--- a/dev-python/WSME/metadata.xml
+++ b/dev-python/WSME/metadata.xml
@@ -9,9 +9,6 @@
     <email>openstack@gentoo.org</email>
     <name>Openstack</name>
   </maintainer>
-  <longdescription lang="en">
-  Simplify the writing of REST APIs, and extend them with additional protocols.
-  </longdescription>
   <upstream>
     <remote-id type="pypi">WSME</remote-id>
   </upstream>
diff --git a/dev-python/aiocontextvars/Manifest b/dev-python/aiocontextvars/Manifest
index 967aa17daca1..abc0f5c5ecb8 100644
--- a/dev-python/aiocontextvars/Manifest
+++ b/dev-python/aiocontextvars/Manifest
@@ -1,3 +1,3 @@
 DIST aiocontextvars-0.2.2.tar.gz 17329 BLAKE2B 96c77d6222456b84a99454d60aa5f30d8256297f716d729398a07a3d9bcfa4a64fa44d183163c47deccda75d5e761140aecb6d5f5df2865e1c52f9cd6682cce8 SHA512 87de2be27217b664615ebfec2b4bd4da8542913649ce2b4f23357e7d8b07c9776d633f7f781caedc6eb4e261bdd762228486ab69d6b776e40013942e593f19bf
-EBUILD aiocontextvars-0.2.2.ebuild 748 BLAKE2B 269ee9620dcdc0232ee99afefa69cd790d99a0ab29fd3dd45eeec527cef4a7c6d221ec9ae6a016491cb2b5a244b973b378e58cc443a28e0a72f62cbe8191701a SHA512 19fd082a0b4fd611a3a6e6e36dd347966a0c68dfbef23904c8cd5d5d0b3b6d9e7a0533406705e46e53917ec88d84bc9a5e3cd1916727214c7b1acb366aa95525
+EBUILD aiocontextvars-0.2.2.ebuild 753 BLAKE2B f3799af7cd2e6633e7a842e94359b340fb8d864018663df41cfe5f0bea06bcc6319bed3cefcd2920b3a7097193ef2bf9fd8a851683266eb286f0b104d9872813 SHA512 87d091b9dc61ceaebfe7eb4e2f1be291ea26f33951ada43136c158f2ec3a91d91a0fff02aa4a59108886a5c559738ec240c7fca4faa3f57d6e3cd7bdfa66bcc3
 MISC metadata.xml 356 BLAKE2B b803eba6f4ba59df603e711eea6fe7b169a304ec1e1df8e9133575f8540d2ef002b3fb8ecf186d9ab522b00a7fc6ffaf188bb8930d07d66f10b01ed86614534e SHA512 7aedb0c4fe2e58f969a1cc457d4eb43354a7cac4c82add69b8d2aa384fae6888a8f4b82601a8db1ead5466f8924a3350a4794c3a408a6b4ecf4dff1eca819015
diff --git a/dev-python/aiocontextvars/aiocontextvars-0.2.2.ebuild b/dev-python/aiocontextvars/aiocontextvars-0.2.2.ebuild
index 05e3c3c4dca3..eb4b3c5ef0fd 100644
--- a/dev-python/aiocontextvars/aiocontextvars-0.2.2.ebuild
+++ b/dev-python/aiocontextvars/aiocontextvars-0.2.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/fantix/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 
 DEPEND="test? ( dev-python/pytest-asyncio[${PYTHON_USEDEP}] )"
 RDEPEND="dev-python/contextvars[${PYTHON_USEDEP}]"
diff --git a/dev-python/aiohttp-cors/Manifest b/dev-python/aiohttp-cors/Manifest
index 7c3780aaa8eb..80b02831bb36 100644
--- a/dev-python/aiohttp-cors/Manifest
+++ b/dev-python/aiohttp-cors/Manifest
@@ -1,5 +1,5 @@
 AUX aiohttp-cors-0.7.0-py3_7.patch 991 BLAKE2B e2a08dab701bd31e4a9008c8f89ae97508fb6b99b89db69a05b731849e09c6f04e8b148d82d38f2093e00bb9bee03e45f230cfc8eff4b71ca7797a95524732e2 SHA512 efe7c488d9f30da7eebbe355d86c603657bddc75c88f5cd1bb4b0e76b17f26f5827cc2f42ab8766767a4ad16c08fa636a4f61e50a8c478e7f32eb2567e26427c
 AUX aiohttp-cors-0.7.0-tests.patch 2422 BLAKE2B 4660be793987dd0cd5c945703aa4d6d4b499ba0ab1c305b80e26bac9cc87d811131f6ab179e402821740f193bbfc86a384b58e35aaa453fdfd5d4db3bcc44b23 SHA512 b3fa463b87a112529443f516fe1c37ffda092e8a0133a6d37f407519e32842f65773c87e939082591edb969ee243170be3a4828896ec5ffc1150c3f43aedd9d5
 DIST aiohttp-cors-0.7.0.tar.gz 39728 BLAKE2B 747499856272f551cf8e2e0911ff7cbb2c7cb8a1f3159327dd8f0d40cabbbd9713a1a9e30ef9c99f3f9642567c99025e049db837c89f907d6698a27005ac2632 SHA512 72e0b365b952c08a02c1123d7672cfea01063e2ff01743a71e10f804d22178edc0f1c6b7f87b7ed484ca7c24e89a32de90d0d279f2f5c060427319182f9bdd3b
-EBUILD aiohttp-cors-0.7.0-r1.ebuild 938 BLAKE2B 9da6cd7d4bc50b7af7e6a9a4b65b806ecd472b8c1d2bcff235f9e1b98d9a91aa3395ba4fd8d3fdb132a50f2a8e2f9a6eb0caf4c8c3dece41d1bf64de68668c8d SHA512 e890513320ab4188b9a336ebf53ad2e934aadc8420e1b41bf84c406654ff9e0c09f027f21cd1bc2f6f16a65bbadd38a50c03d31eef3384ec09c1ffaede01de1c
+EBUILD aiohttp-cors-0.7.0-r1.ebuild 957 BLAKE2B e607bc8cb189c8dfd8c731918ed2bb81c1c8df568b3478d67edaf26893d0fc47f6cd0e260ccdb8da459f704800dcd96fd550270e8701f880be8cbf361d138e38 SHA512 e78f462237ac84f2423f100fd172a1339a8d11890b64c55fb0f23f8649c4b12274775bfb6ffad1e4ec998a1cbef4facf2646e9d94e30c64d582185f9aab9fbbd
 MISC metadata.xml 453 BLAKE2B 425da23ceef20765f00fd1f15b34bf99166f66dc7d6cdc0ee74a7d6439ed912ebf79c365daf9cb50a918802706aa8782d88cee3520b1e37bf3e6505579521263 SHA512 690dfd58364f19eb58ae3348b9b2a8d64fdf4324dd26fb63cf563762f4f8368437fbae1afeeffeb0ccaeac100d793008e28b66309139e27418ef5cd70daf0d8c
diff --git a/dev-python/aiohttp-cors/aiohttp-cors-0.7.0-r1.ebuild b/dev-python/aiohttp-cors/aiohttp-cors-0.7.0-r1.ebuild
index 41ae8c343741..355a196ad404 100644
--- a/dev-python/aiohttp-cors/aiohttp-cors-0.7.0-r1.ebuild
+++ b/dev-python/aiohttp-cors/aiohttp-cors-0.7.0-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/aio-libs/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
 
 RDEPEND=">=dev-python/aiohttp-1.1.1[${PYTHON_USEDEP}]"
 BDEPEND="
diff --git a/dev-python/aiohttp/Manifest b/dev-python/aiohttp/Manifest
index c7babb1ac1b4..0e19f986f816 100644
--- a/dev-python/aiohttp/Manifest
+++ b/dev-python/aiohttp/Manifest
@@ -1,3 +1,3 @@
 DIST aiohttp-3.6.2.tar.gz 1076923 BLAKE2B 14327a0bc5b5fffdf436a4c3525e4c25d80100aa464ed652316f7724c2bea6de4ace6c27e8a2a8cf9d895673ed63ed52e8c958ad611636e1e524a4e40efa4735 SHA512 49bd3089158c05ff6312420190ccd7fed95efb4a18b8aff7497d5507c71c692080d6949801edabdcd95379ca8e6614398408118d72ff1e782399e059e2cfc1a8
-EBUILD aiohttp-3.6.2.ebuild 6742 BLAKE2B e8467540f7d1b56620e389ac86386ba65a39bbc1a45472e0e555c75f2711d63740e0098a543976d912d568cc879db6442cdd221b4180571f5db12bcf0ab0f4b0 SHA512 71300a7d91580047c8f29f101f168b857d32011ca972fdf018558dda0dd0beb4a48868f4783a4747053046ec53c9501d482808ab45bf56683656f9ffa53b3ec3
+EBUILD aiohttp-3.6.2.ebuild 6761 BLAKE2B 3ecfc4251403d3f5df85a4752c1aa19d31b585f342940f39fc292f47d46b87631cafbd93bd86342559df614e63bf190c3cccd1fb3060a9fb4d09edf7f74278be SHA512 0d4825b013f7205c34e92fd0064b45824c4e5be30c159d768491335000d8a58ed015c5b5890c7e1c7f53f842682a2e7e86eab8f01b26a69138acbdb8461d9abc
 MISC metadata.xml 489 BLAKE2B beb80da34848dfe7b81ed65d75923480644ecf42e2c5ce04a7f66f3e729651fdc6035054482aff966ec9f03cfbb812d3be0afd783af69e37f1002182e4885473 SHA512 d8c9e2edb8a57a3b6b02bb5314aef77dc266af6e80fd0300eb0652c59790232017d0062f5b7361b059c382d1c904f0f46cd0e672d1963e9595f3d4dc7514f182
diff --git a/dev-python/aiohttp/aiohttp-3.6.2.ebuild b/dev-python/aiohttp/aiohttp-3.6.2.ebuild
index 237e921f85ff..b2089b92c174 100644
--- a/dev-python/aiohttp/aiohttp-3.6.2.ebuild
+++ b/dev-python/aiohttp/aiohttp-3.6.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/alabaster/Manifest b/dev-python/alabaster/Manifest
index 91a78c7f2098..cbc171c41953 100644
--- a/dev-python/alabaster/Manifest
+++ b/dev-python/alabaster/Manifest
@@ -1,3 +1,3 @@
 DIST alabaster-0.7.12.tar.gz 11242 BLAKE2B 5690d9c0b8aabfc2c95c4279183d174d6a5768f89732028f7ec6eb790531499a2017b9f3b9896442e298f3189f79070178b3e281b6d0bcfad3741625caa99c48 SHA512 e3bfd0c92ce01f08d5e6d9dc1ef0967ca1f54827e08756f4a0ba7be8d3b8bec7f2e53a169b831ff5ce2d2548f7f52c6e518bcc513e49bb3e4c38274293aebbac
-EBUILD alabaster-0.7.12.ebuild 488 BLAKE2B f95fc935d4f3c01d9c109f2cc679db941d62b8be857e16c484566db9e67b3f1af38c78066aeb07dbfe624bdcb40e71703353cd84459e3bf9fbf5fc99f5b166de SHA512 084df9a711ba85503712c8a1ba3ee8360a6b0dea6177116abbdd2a0ce4d8c0dbe33890b15866274a20ebe6579ac935e986a9b4ce5dd639d0ff1bf3ac34e91d9c
+EBUILD alabaster-0.7.12.ebuild 495 BLAKE2B e775635a7122ffc22df6c134717f069ed8792056f7c22c4660dda5555fc39bf5eed80cc32c1f1b7222900ae76f437464d43d7f120dd3d3577d2d0d418032d564 SHA512 3ea0ce5111231e73fbebe180755990338234a8b18ff29206a0fc084e43026c5b474b7c24d5da4067e8fa4ffe53a132e99ac7792f515eda9c889f18534c47ec34
 MISC metadata.xml 409 BLAKE2B ba8f679d608b3fea7dc109f7699830f487ec02644cec6af7dedd8fbd5246062f85b92a94646d30470e7b502eae997a0abf0f92c6427b1b9ffd264e83035b1217 SHA512 0dfaf8004d8f6f8b61e8bf94e12bb083ce4b7e3f850ecbacc6d82a411e840389317337eb7442c6f5848d2b928aef59c6e56b916b44dcb8e3ef6945cd7695f3b5
diff --git a/dev-python/alabaster/alabaster-0.7.12.ebuild b/dev-python/alabaster/alabaster-0.7.12.ebuild
index fca86004f512..21c8f6f696bb 100644
--- a/dev-python/alabaster/alabaster-0.7.12.ebuild
+++ b/dev-python/alabaster/alabaster-0.7.12.ebuild
@@ -13,5 +13,5 @@ HOMEPAGE="https://github.com/bitprophet/alabaster"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-solaris"
 SLOT="0"
diff --git a/dev-python/alagitpull/Manifest b/dev-python/alagitpull/Manifest
index c19723925545..61a41c1bedf8 100644
--- a/dev-python/alagitpull/Manifest
+++ b/dev-python/alagitpull/Manifest
@@ -1,3 +1,4 @@
 DIST alagitpull-0.0.23.tar.gz 6692 BLAKE2B 63af3da6e98521487fad233dd648d9217d8e89c0d17e49dd771e934c0808a52c0659661ca8104c53c2d0fddf458650458e676e14b2e9c3820f353ab42044a490 SHA512 1620c0e25299f694f29f6e54105a2f336dee90535370a691a6e23a879a68626ef4aa19ae40ecc835553fe3b0272d48e4f5213c1ada054ad20d47034fc20dea3c
+EBUILD alagitpull-0.0.23-r1.ebuild 554 BLAKE2B cbde248576ae12b02744b840105a8714b6613613124ca0ed9f724d72eaae3eeaa48f129b8ad06bb2b26a29e27d31841b2979daeace1701ecafe3210521ff1bb1 SHA512 4e714aacdd1d8c6f8ec17b9ce5735e4585cc13ee28a5cfbb141b0df2b68d888352805c74be98aef0291d1fad793e9ff1c6c355e5f9a3d4d156292363a447690e
 EBUILD alagitpull-0.0.23.ebuild 556 BLAKE2B 8ad0faeea63ea9c15d023fe5b27a8a91cefc183fac632e5d536ede8ea5f5a56941c43f1c1bd3db504e4479d9ad23048fac05bc2f71738423824ea2c5c85948be SHA512 b7e0b5451431fb882bc19abb27e2b4e65991e8588a7157a22dc6e641ac3d8136f962b97501ba83dee38f4f0c2a1af77a9b1956be58107a51193d00033a3aad27
 MISC metadata.xml 255 BLAKE2B 2bb3830b8cec850703f7912f4c22f5b0abeabeed0715222bc56141779d02160773cfd0f85417c553c1cd8f2738bfeb78c56dffb8e648e572019319657646d1ba SHA512 522158915afe67937f81ba572a918a2de8ca1f8591e097da56799c97870d7c44756c1acd8224d63bd3375c2b9ebc0e1ce50816899117948a48065a27804883bf
diff --git a/dev-python/alagitpull/alagitpull-0.0.23-r1.ebuild b/dev-python/alagitpull/alagitpull-0.0.23-r1.ebuild
new file mode 100644
index 000000000000..cae488ea6060
--- /dev/null
+++ b/dev-python/alagitpull/alagitpull-0.0.23-r1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6..9} pypy3 )
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+inherit distutils-r1
+
+DESCRIPTION="alabaster sub-theme used on git-pull docs"
+HOMEPAGE="https://github.com/git-pull/alagitpull"
+SRC_URI="https://github.com/git-pull/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+SLOT="0"
+
+RDEPEND="
+	<dev-python/alabaster-0.8[${PYTHON_USEDEP}]
+"
+BDEPEND="${RDEPEND}"
+
+# no tests...
diff --git a/dev-python/aodhclient/Manifest b/dev-python/aodhclient/Manifest
index db3b24bacc6b..bd29d06a6587 100644
--- a/dev-python/aodhclient/Manifest
+++ b/dev-python/aodhclient/Manifest
@@ -1,3 +1,3 @@
 DIST aodhclient-1.2.0.tar.gz 41043 BLAKE2B 2ced3205427291470e2bacdadfb4328e5bc933aa57ea3bc8b92cd4781102acec53992212caf323b134522c72ede98a2c036a07230ff6a78ce8ef03e5d9129b55 SHA512 2422847c83c2a331ff4b6778f8819b6cb67e840626854961e865c3fd8fa00ce34ca6cbfd8eed17a0779daff784cae2c9084b163aaeeee8df1563a797bd2832ca
 EBUILD aodhclient-1.2.0.ebuild 971 BLAKE2B 1e03854fb8f67f202454404d8e2beebcf7299ae77d24587d7aad204da9c6dbe7c5932b70e22567e3e6f876d95ad40d413eb687f22dc4ad30a12cfe8e2c6190cb SHA512 c72b40d06e6efa2f0058e46e633d4d4366a2a74a5c1ca98faa3387c3abb3ca00a4cfd0cb8ed3f60d372183bade926fcd337e71005b03660592be9747124737ab
-MISC metadata.xml 604 BLAKE2B 2389e07026b35c4cf96b7caecf3c29f7f8c7f5f8a7cc6b9c576043163826d97092999ff76dbf6f52b49475c001a89409095a7af25c182bc2069bb9e7c6ae0536 SHA512 95b484267b9f6eceeed9f404fe3ca3140d364aa9551cb306e0a40769b17afcd927b1570fa367eff9c250b1fd8bdf8adddfb4f61f506d297eb011f83ab4676aa7
+MISC metadata.xml 508 BLAKE2B 660be31fd4d21af51f9a60e32567bbf24fe4a4e910b814bc3c68ab76e95b794a102f7b1a1c3177f8f6ae97175539078270372fc0f9fece1b77cd63f215ce8426 SHA512 3af0d53dd364ea1baae12c85a3fb3188717872e348fab374c83ef01f04a53007298cf03ca5384abe4264ac66218e4fb557f1e3c2fb66fedc592d345ac10b643f
diff --git a/dev-python/aodhclient/metadata.xml b/dev-python/aodhclient/metadata.xml
index 7d43d37ad583..45a7e697a598 100644
--- a/dev-python/aodhclient/metadata.xml
+++ b/dev-python/aodhclient/metadata.xml
@@ -9,9 +9,6 @@
 		<email>openstack@gentoo.org</email>
 		<name>Openstack</name>
 	</maintainer>
-	<longdescription lang="en">
-		This is a client for the OpenStack Aodh API.
-	</longdescription>
 	<upstream>
 		<remote-id type="pypi">python-aodhclient</remote-id>
 		<remote-id type="github">openstack/python-aodhclient</remote-id>
diff --git a/dev-python/apipkg/Manifest b/dev-python/apipkg/Manifest
index 05a7bda5b375..d80d7bf95dab 100644
--- a/dev-python/apipkg/Manifest
+++ b/dev-python/apipkg/Manifest
@@ -1,4 +1,4 @@
 AUX apipkg-1.5-pytest-4.patch 801 BLAKE2B 4fe40fb766f4e8654ef37f0796a88f74b81e2a1d237382f87745f33ac80e505c9e764f8b83d467c7f5051ce7eb3a80add369595556b5b6abf3e1a569d33cc071 SHA512 d50ecac0382e70124634a403c5010bc929f92f7a6768979497a5d2646626c6244f3c213f18989f71dda137bd4376f81d5d97a5f4979ff0e937046bffeef75b04
 DIST apipkg-1.5.tar.gz 11186 BLAKE2B f703a37b38b412228348520a9daa0276a69c3be47a9586e1c2797cf525a024bb0fda81dbfad7d4b1404e1ebcd3eec0e9ce2231beef5072bf9915240e2e5fb445 SHA512 828937ca5e203915248fac54db8e7c13f941e006403f2a415c27fa4d1aa114790be3d7b5dd892f528611e5e6dfe75114ee80f4f4589a03c3f789ae6ddfcae0bf
-EBUILD apipkg-1.5.ebuild 622 BLAKE2B b93a0a5ba16e9115642b163b58674ed371ca6d0ce02e12fa3612e3f4900840d689db40381e6a3be7d7f2ddba672a82cf6bd72f3795057d213df45c2dd0de2a8a SHA512 0c07c0c4ebe660cfc465b4eabed62dd2e005c4584faad59d95f0e10ae2dc84b2cff473f26c7e3f5b4b58898ae31e53b38c238bb6f2fff0ce81a57448755164b5
+EBUILD apipkg-1.5.ebuild 629 BLAKE2B a53bf73e086b16301459b47cc51bbd3d9051702aec7a351babb321dadd498874d1791e17ecf0f0217f346c8682cb1c12edb2515f449d3e3ef10089fd4d6a0824 SHA512 f61b8777ce1d5c42846708f2c339c8af85ffb8f82fa495ff1f6afe0a14e6403464d8ab83fb0c9986ba6fef9b58c2c00aa872e77e4c050798dc5cd000fa0e63c5
 MISC metadata.xml 333 BLAKE2B 3afc02af856372debf32ee34e8da1f618d23656ee440be75af68bae0f9fda7d6595860dfbff0fb14f00d84d01fd9ade7adb873568e55d80830f157c39f205103 SHA512 5479e8777267cb9b66366ed387d20dc954f02cee672d58c5e6c742a7a31cf529a069f8f5b57b99a6d5fcff91dbcc59790ef179e282d7ecdd1d798798d9e7b7ba
diff --git a/dev-python/apipkg/apipkg-1.5.ebuild b/dev-python/apipkg/apipkg-1.5.ebuild
index 14584db1a944..0c5fa2681419 100644
--- a/dev-python/apipkg/apipkg-1.5.ebuild
+++ b/dev-python/apipkg/apipkg-1.5.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
 
 BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
 	dev-python/setuptools_scm[${PYTHON_USEDEP}]"
diff --git a/dev-python/appdirs/Manifest b/dev-python/appdirs/Manifest
index 3fa825a8cae1..44db20ea91ea 100644
--- a/dev-python/appdirs/Manifest
+++ b/dev-python/appdirs/Manifest
@@ -1,4 +1,4 @@
 AUX appdirs-1.4.4-distutils.patch 700 BLAKE2B 8986f3b3da992b836b4cb1f0e212b91c2f82a714abf94080de0a48a3e5ea8ee5f23b88fca357d56a409b3a57f0cb08b4612d81931c665354a9225db57bdde07d SHA512 add351286f307ce49c340b92ddab731b5c675b32062107c4076002e7e1ec098f5bb541b1985fe6f1881620714446475419d5c7229ab371ffb683c37e00e91494
 DIST appdirs-1.4.4.tar.gz 9840 BLAKE2B cb9466f4a7f7c1d6f5b6d7ca031820ec4d3450afcaa8ba571e35387c3109ede4e2afbf2c1141a9d01d13798f55524d5efd3fa12546a9378abbda405353938d79 SHA512 4c0e1e8dcd3f91b8b2d215b3f1e2ffaa85137fe054d07d3a2d442b1419e3b44e96fdea1620bd000bd3f4744f71b71f07280094f073df0ff008fac902af614656
-EBUILD appdirs-1.4.4.ebuild 820 BLAKE2B 2a4d4a6f25af1e60db65424e8b34098a52b12e6e5754b163e96da178b759d1fc877791d5a70e0c9f5db0700232f0b04fc802639680bf361f6d3a11a115252d42 SHA512 7abc1a1e007ea54d80b89abda2ab7bbd2de24569f1200da2176b65fb6d72bbcce886a94886f3e99e73d29f792fc8a365660aa4fc7764c5c9bb394a0708f9755d
+EBUILD appdirs-1.4.4.ebuild 827 BLAKE2B 1e9fbc2e786e474f119a07dd89a9372e855dab8c150b0ebe7bd996329e919a55e8eb8de21d30efb0e7cc1640470318e47a96d6eaa753e86693592b2e8f050f79 SHA512 af2e46c874923095957cb3d58f1e3b6d804fe6b9176e7e3bf44bc54c0b3f861861e6d73d262de0eefb506e152d0c2a2a1048d9dcd53ad7002ab38c7c05c74853
 MISC metadata.xml 615 BLAKE2B 25ecff1fc659fefee97a373a6c228a4d4609df375113f812f17935bb3d2fa32b79db79930e0458c5c9a3c738ed2c1bf1e999d1dc9d26243749b6401c5245849b SHA512 536fb34e9f8d5657941d883975c17ce95e177376b9434dd72a12b7e59ef126865cd696a0bef5d0d5f016514a216c3cca07b39377e66f87c9e3e706d9afb4cc33
diff --git a/dev-python/appdirs/appdirs-1.4.4.ebuild b/dev-python/appdirs/appdirs-1.4.4.ebuild
index fff25cbf188f..ce38c50bfcce 100644
--- a/dev-python/appdirs/appdirs-1.4.4.ebuild
+++ b/dev-python/appdirs/appdirs-1.4.4.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/ActiveState/${PN}/archive/${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 PATCHES=( "${FILESDIR}"/${PN}-1.4.4-distutils.patch )
 
diff --git a/dev-python/argcomplete/Manifest b/dev-python/argcomplete/Manifest
index 32bc8f179259..3a64c7d6bf24 100644
--- a/dev-python/argcomplete/Manifest
+++ b/dev-python/argcomplete/Manifest
@@ -1,4 +1,3 @@
-AUX argcomplete-1.11.1-fish-xpass.patch 1195 BLAKE2B 9ae2e5803359f2abca0b168e009afe8e98f8bc4529db2e4a5aafecce674f0cd4dd8e6e1354b19f00ed9f2afefc8038e938713872115613545c51933ffa6e4cf1 SHA512 0d187868ecf3428d0840fc97311c542c782a938cf039caa777e521a9073b525d3dd0a8e376ca9fe0dd4260313642854b21a0bd3d9c2f9a3fbbed8b4edd6ed3be
 DIST argcomplete-1.12.0.tar.gz 53625 BLAKE2B 29b4f620537a087629c63dc71c6a0101d40967145680518b566b9c81e3e744c5d73e1ed016795f0ea4338be4e8f20b7df1968e388e1ff09308e012ed1ba6d0c0 SHA512 5e21e3caf1dcee661c0dadf28d7b127147325475fe3ae569fae8797a762c34b55125df9f52de8d76f0aa6dd4efdac260a358b325a7659beae02b1dedab501c18
-EBUILD argcomplete-1.12.0.ebuild 836 BLAKE2B c2740735d631fed9216d85c1792d5e5ece2211273a1dc8264b902992290a2676736c7502b42e6f784c3edd0368b03776e94935508148366990383a9e97b31dfb SHA512 910dfb6c9bc36cfef979db9206f98a0a85609324e56e3b87c40a11b3514a6a1f461e200b5fca3f37f13bf13d93337273a977bf704d80f6acd08144ac2a34687b
+EBUILD argcomplete-1.12.0.ebuild 843 BLAKE2B 11908baaa38094e90ced6d31daf292ef3d4e042ac4cde1852f3de6574473833fac3fdf6aa23ee89bcd7bc32760d9bef48cd97192dd03a36e9fcc01092e5040ff SHA512 fc577a0013be71c0775dfbe278b6f356049aca96a3255b2168ceacdc31cdb18b44ed7801fadfc049c719bd43342d664b946a51a56218a0ab48a96a963f729be6
 MISC metadata.xml 410 BLAKE2B 5cc57d8d5fce195e6c050674f8626a6b2a884a956306c668a40fb81c3bed51d9dd8a23c4b69cca5ece9facdd6d459341abc2e5fd4454b1f3614b5866b3501682 SHA512 9a04c26c63f40f33ed3f5d004e5a0478dcaa5f90c363f1364ee14f309433d65e3db5809b3fa8b504c4d4f961b79a8ae39efbd6b3af1fe1cf681ad1f4f9a89fc3
diff --git a/dev-python/argcomplete/argcomplete-1.12.0.ebuild b/dev-python/argcomplete/argcomplete-1.12.0.ebuild
index 72f021a112db..b4aebed2de7a 100644
--- a/dev-python/argcomplete/argcomplete-1.12.0.ebuild
+++ b/dev-python/argcomplete/argcomplete-1.12.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/argcomplete/files/argcomplete-1.11.1-fish-xpass.patch b/dev-python/argcomplete/files/argcomplete-1.11.1-fish-xpass.patch
deleted file mode 100644
index 575c8abbb744..000000000000
--- a/dev-python/argcomplete/files/argcomplete-1.11.1-fish-xpass.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 08bfc8a788e8081515d733e67be026d051c726f7 Mon Sep 17 00:00:00 2001
-From: Evan <evanunderscore@gmail.com>
-Date: Thu, 19 Mar 2020 14:55:07 +1100
-Subject: [PATCH] Remove expected test failure for new versions of fish (#292)
-
----
- test/test.py | 7 ++++++-
- 1 file changed, 6 insertions(+), 1 deletion(-)
-
-diff --git a/test/test.py b/test/test.py
-index e91352b..2c34806 100755
---- a/test/test.py
-+++ b/test/test.py
-@@ -28,6 +28,8 @@
- 
- BASH_VERSION = subprocess.check_output(['bash', '-c', 'echo $BASH_VERSION']).decode()
- BASH_MAJOR_VERSION = int(BASH_VERSION.split('.')[0])
-+FISH_VERSION_STR = subprocess.check_output(['fish', '-c', 'echo -n $FISH_VERSION']).decode()
-+FISH_VERSION_TUPLE = tuple(int(x) for x in FISH_VERSION_STR.split('.'))
- 
- 
- class TempDir(object):
-@@ -1258,8 +1260,11 @@ class TestFish(_TestSh, unittest.TestCase):
-     expected_failures = [
-         'test_parse_special_characters',
-         'test_comp_point',
--        'test_special_characters_double_quoted'
-     ]
-+    if FISH_VERSION_TUPLE < (3, 1):
-+        expected_failures.extend([
-+            'test_special_characters_double_quoted'
-+        ])
- 
-     skipped = [
-         'test_single_quotes_in_single_quotes',
diff --git a/dev-python/argon2-cffi/Manifest b/dev-python/argon2-cffi/Manifest
index 309621d4b74a..90802233ef7b 100644
--- a/dev-python/argon2-cffi/Manifest
+++ b/dev-python/argon2-cffi/Manifest
@@ -1,3 +1,3 @@
 DIST argon2-cffi-20.1.0.tar.gz 1814415 BLAKE2B c216349beffa263fd96df23f40a8102b56a88b8320e64ac062ecfea4582efa34b298ba223437bfbfc422b68a3d9b9ea769c384db078c633103f2aae3cd38bd5b SHA512 d1d798e3e51ed67c4f523a66081fea99479ee986b5cfc36b250954e757b9846625681445447f9347519d9988f8a2ace2e3c8ce5817c5c6b4767819cf56ee0af2
-EBUILD argon2-cffi-20.1.0.ebuild 764 BLAKE2B 9cfbba88171c4dca594c26cb91255ad363758cd814ff3c7b229fefe259b3453d73f2153773bc6dbb90224999e0a0f941e7e6bbfb5c5a768bc54207708dd3d326 SHA512 0ce6cddcec4a8f94bbafe6652f1b37ad81dd3eee6ca67946e1259e6e72b62d317ca626924130cd1685bbe9aea75c7c541c64717a7d11ecb17485c6fd95c32059
+EBUILD argon2-cffi-20.1.0.ebuild 763 BLAKE2B f1231072a07245b189470997d0189b5d81d85f8bf6f254e1466b93eb2bfc8763c0c36e741b48710815cbf1e41e3a61071b6da26fc214e48fd353328339cb9d9e SHA512 efafa1066b82104f399b61073cdacf8ff23a7cb165422220a4eeef5fe5a1d496b371cc388437c642811fe1b40a018798f500fdfa9586ee424ace7ffbd782cf18
 MISC metadata.xml 635 BLAKE2B f81f4a8996795ecf69d31587e460532fca7861c8bc5546c7511ee19389406601e0cfe84d67e9387163247833f4032c8c00f3c4de7fcdf8b9f4a0ff405a5299b5 SHA512 d50d5dbcf728218f7fa3accb7b105b6c879a0fef1382868a1d30159e91dcbb3aa818e986303c0c694ac3d8b00b53e17a66d6b9c9d69bfa8a8d20157cacd5f706
diff --git a/dev-python/argon2-cffi/argon2-cffi-20.1.0.ebuild b/dev-python/argon2-cffi/argon2-cffi-20.1.0.ebuild
index 0affd4f5af9d..5107871dfb9f 100644
--- a/dev-python/argon2-cffi/argon2-cffi-20.1.0.ebuild
+++ b/dev-python/argon2-cffi/argon2-cffi-20.1.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 
 DEPEND="
 	app-crypt/argon2:=
diff --git a/dev-python/args/Manifest b/dev-python/args/Manifest
index 1b5b7c35ee84..d6c426e1d09b 100644
--- a/dev-python/args/Manifest
+++ b/dev-python/args/Manifest
@@ -1,3 +1,3 @@
 DIST args-0.1.0.tar.gz 3048 BLAKE2B 4f31ec64f740640c9c927585ae35877654eb99beb5f0673ce8561ee093efd8b69eb5cb0c08a304c2319a38496935b62286f8bb9b2f1dca7c9447671ab0e3732f SHA512 664d33386af2ac0b9d30344db5fb5cea4210f600df28708ada19266afec237d6e6d9d57f03c8b64cfdbb6a17eff05f633a2cc4ddbfedc320dd133be246aee033
-EBUILD args-0.1.0-r1.ebuild 436 BLAKE2B 8b93dc2ca9c7eb91d67ff772f7fc080cb6b5aa65c15f1b58812aa6d0bcfe0cd2224f5fc8eaa88aa18c754f04034b2e4f26fef7f2fad0abfd89154d3d3f07c8bf SHA512 73f28f553337675a092b2d72a3d6cbfb7be18f83fd6d412f861573b58f668c1935a89032b120830e35623a2f5af6eecef81e22628f9d64b953e40507cf51f64a
+EBUILD args-0.1.0-r1.ebuild 443 BLAKE2B 89538094652a11facd4517d01375440e3da112be1a04f3b9b569e5b63c92f7456c377eb0374cb327e723d2a63debe22ba6fe72babdb0266bc45a96c475b6aa84 SHA512 3e9ddc20a66d064a3d3138a740ed6c3d27c51cedd0f89a1a051d131a8ccc4ce781aadcec1c4f56623221ef2488845b074edf2c0a2e94902d2314f3be64d489f6
 MISC metadata.xml 297 BLAKE2B c5947002d631d50d8764a3d5c25dd577523f555bfd45bf6341c4393fc1d2667656c3a21212957af13cf9ebb4e4938cccf0dbdeaa5115eeffd87c97095294e227 SHA512 df9140d329afba0ebc1880724f1fc75728ef5ccdd4013c2395199bfd0871e7e3342dcb8e9bdde0b8f986484d1263db8add5fc380c9bab945fb38319d5886d0d6
diff --git a/dev-python/args/args-0.1.0-r1.ebuild b/dev-python/args/args-0.1.0-r1.ebuild
index fbe868546446..764790c48a5c 100644
--- a/dev-python/args/args-0.1.0-r1.ebuild
+++ b/dev-python/args/args-0.1.0-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 ~arm64 ~x86"
 IUSE=""
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/astroid/Manifest b/dev-python/astroid/Manifest
index 827f25768703..40a5c15cac45 100644
--- a/dev-python/astroid/Manifest
+++ b/dev-python/astroid/Manifest
@@ -1,4 +1,6 @@
 AUX astroid-2.4.2-no-pytest-runner.patch 643 BLAKE2B 830b0d604e988701faf6c75f148ff65775bbd349ab11669ff9e50809541d45af5a575f5d8874e4260f2e300ffac2446a1f9469da21ab288f325693eebc67f5b7 SHA512 3b2819eda0bdf0847aa7153439dd2cd766aa588921f8c7acf6da85a966ba7047e19a508a208141f7be11fc3348a7757d23a1c0835e977a9fe545cbafec09eb3d
+AUX astroid-2.4.2-py39.patch 1723 BLAKE2B e05c71961478c4a9ea76d5edcff3d1f775fb225a98a4b6849068fd387a4061e25078c14d374f5c60260d1678f34cc9ed6db96b20567bb04a4dc089e0a611a328 SHA512 3afefb42e9bda1666820de490c6d4a8ad7c873fce2965f5a8a159bb00617fe71deda231c3f810d238af1b1f386cd4b5c9eba78f6012ff05a7b6f10e50573b5d8
 DIST astroid-2.4.2.tar.gz 310972 BLAKE2B 23ebe5ef418ce19b64eb1c0f8d711c3f0d86ae32cff112d9a99db48d20a34c73cfa97c96229fd0f0f1169720d24e2cfd0b5a327c29ea0fc0f54a57ede45fcebe SHA512 f5d759c07a13e06d3d071faacff2dc775924566aaef8bdb6e526c4ebf723b6b561f5824b711b33e33a2a69df0a2ff4cbf0f4302c9a0d55610e031e81c4a4be91
+EBUILD astroid-2.4.2-r1.ebuild 1877 BLAKE2B de0cd03e4086363e8d0a7b698a86cd221cc1e49553b55d120f80833edf1529a79c80b9c2a74cbc5a32a5a9357372147899a460fe4de07da871b05ff6449c17e8 SHA512 4e488d880797dd9a38ce5c7854dbf6826d1fc90727f523947476fe1060db1a99a2f1575bc39da251ae2a1d29338a9f03500033e34b9864e4dfd42a47b297f95b
 EBUILD astroid-2.4.2.ebuild 1352 BLAKE2B d3a1804b4d05fd0813bbbb4afa5009f1ac908fc52469f92e50ab8fa9beca334a5268abe11e16377fb73fc9f462a102c1edb2a9abeb38357acd0c9a3c8cb826b8 SHA512 335f6ae90e9d40295f9d0e6b5e6e2b1bc42453a857e22029ab5a4afa3e1f8ff79db38f72e185a68df034198732bf21f84ba76a00e02021c2ef7f722b07bc6e43
 MISC metadata.xml 1147 BLAKE2B 6fd688ecaf19f5de658caecd0e4a5b5b451ece67b0e55afc8fc65cae8f99f0a2cb09c5e70b2cf3b68a4748ee10a417dfcd93569cc35e866aec7404d6ec9ecac4 SHA512 5eab195b147e8e1551871f537d61d0a4460ff8be0420c7e1661f6774f7fe8ace43f665f64d61677bdf890788d8a53206ac54350a8c6b73f87ba9a6edd44d56da
diff --git a/dev-python/astroid/astroid-2.4.2-r1.ebuild b/dev-python/astroid/astroid-2.4.2-r1.ebuild
new file mode 100644
index 000000000000..60e1cbbb76db
--- /dev/null
+++ b/dev-python/astroid/astroid-2.4.2-r1.ebuild
@@ -0,0 +1,68 @@
+# 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="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="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+# Version specified in __pkginfo__.py.
+RDEPEND="
+	dev-python/lazy-object-proxy[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	>=dev-python/wrapt-1.11.2[${PYTHON_USEDEP}]
+	>=dev-python/typed-ast-1.4.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}"/astroid-2.4.2-no-pytest-runner.patch
+	"${FILESDIR}"/astroid-2.4.2-py39.patch
+)
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	sed -r -e 's:"(wrapt|six|lazy_object_proxy)(~|=)=.+":"\1":' \
+		-i astroid/__pkginfo__.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	local deselect=(
+		# no clue why it's broken
+		--deselect
+		tests/unittest_modutils.py::GetModulePartTest::test_knownValues_get_builtin_module_part
+	)
+	[[ ${EPYTHON} == python3.9 ]] && deselect+=(
+		--deselect
+		tests/unittest_brain.py::TypingBrain::test_namedtuple_few_args
+		--deselect
+		tests/unittest_brain.py::TypingBrain::test_namedtuple_few_fields
+		--deselect
+		tests/unittest_brain.py::TypingBrain::test_namedtuple_inference_nonliteral
+		--deselect
+		tests/unittest_inference.py::test_dataclasses_subscript_inference_recursion_error
+	)
+
+	pytest -vv "${deselect[@]}" || die "Tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/astroid/files/astroid-2.4.2-py39.patch b/dev-python/astroid/files/astroid-2.4.2-py39.patch
new file mode 100644
index 000000000000..0f838b7214a4
--- /dev/null
+++ b/dev-python/astroid/files/astroid-2.4.2-py39.patch
@@ -0,0 +1,42 @@
+From 3ffe25f8e3cdb30f0dcfb68f4373370828894727 Mon Sep 17 00:00:00 2001
+From: Karthikeyan Singaravelan <tir.karthi@gmail.com>
+Date: Tue, 4 Aug 2020 10:11:44 +0000
+Subject: [PATCH] Skip test for | in dictionaries due to PEP-584 in Python 3.9+
+
+---
+ tests/unittest_inference.py | 8 ++++++--
+ 1 file changed, 6 insertions(+), 2 deletions(-)
+
+diff --git a/tests/unittest_inference.py b/tests/unittest_inference.py
+index 76c7e879..b7bc732d 100644
+--- a/tests/unittest_inference.py
++++ b/tests/unittest_inference.py
+@@ -2455,7 +2455,6 @@ def test_binary_op_type_errors(self):
+         1 ** (lambda x: x) #@
+         {} * {} #@
+         {} - {} #@
+-        {} | {} #@
+         {} >> {} #@
+         [] + () #@
+         () + [] #@
+@@ -2500,7 +2499,6 @@ def __radd__(self, other):
+             msg.format(op="**", lhs="int", rhs="function"),
+             msg.format(op="*", lhs="dict", rhs="dict"),
+             msg.format(op="-", lhs="dict", rhs="dict"),
+-            msg.format(op="|", lhs="dict", rhs="dict"),
+             msg.format(op=">>", lhs="dict", rhs="dict"),
+             msg.format(op="+", lhs="list", rhs="tuple"),
+             msg.format(op="+", lhs="tuple", rhs="list"),
+@@ -2515,6 +2513,12 @@ def __radd__(self, other):
+             msg.format(op="+=", lhs="int", rhs="A"),
+             msg.format(op="+=", lhs="int", rhs="list"),
+         ]
++
++        # PEP-584 supports | for dictionary union
++        if sys.version_info < (3, 9):
++            ast_nodes.append(extract_node("{} | {} #@"))
++            expected.append(msg.format(op="|", lhs="dict", rhs="dict"))
++
+         for node, expected_value in zip(ast_nodes, expected):
+             errors = node.type_errors()
+             self.assertEqual(len(errors), 1)
diff --git a/dev-python/asttokens/Manifest b/dev-python/asttokens/Manifest
new file mode 100644
index 000000000000..1cda2195de3f
--- /dev/null
+++ b/dev-python/asttokens/Manifest
@@ -0,0 +1,3 @@
+DIST asttokens-2.0.4.gh.tar.gz 46823 BLAKE2B 111ed58c1b657900f830b7b9f521c1f87fd37945ab6ed6e165108fc2371923030b37cae33885e166a524eb8dd5cfad5fe9391a19b7729b7cd504474d1477748d SHA512 49287259d64c43c7460357d19ed95495ab499b0ad7ae0d5a59378ea0332142b574643349d1d3ca56442712ebec14c53167da475915017feb1b524ac190f9dac3
+EBUILD asttokens-2.0.4.ebuild 1455 BLAKE2B 8d03d2a448c542f054a5eac816addca597d68027085e8d407bfba00f70860943a40bb1971fa6c547b22e2af64b781bafc615e50841e09f6147e7c9697a74ca2f SHA512 2c02dc3aafe0d3dcd9c8323f21fd09124b32a6e7a3dffa537db5d4e562919cde9b80c6cc082055c3a31712a13d81b32455953277a909b081b42ecdc347593547
+MISC metadata.xml 218 BLAKE2B 086fdcf7b63ca7bd6c58e861d717bb375e1cd372eff26d5d2eeeb176d8c5e6f10e653562abafb50eae7d7508f8e3d421b87e6a749acd0490308672828d0da697 SHA512 4558fee4c51117e21b1f42ca3edbdf1195ed297db798d6bfa0e5fbb7019654a187422b0abde7af5d800caffed66d1e55e4280e8be602bad591424d9776c46781
diff --git a/dev-python/asttokens/asttokens-2.0.4.ebuild b/dev-python/asttokens/asttokens-2.0.4.ebuild
new file mode 100644
index 000000000000..cc5ac4e4ecfc
--- /dev/null
+++ b/dev-python/asttokens/asttokens-2.0.4.ebuild
@@ -0,0 +1,58 @@
+# Copyright 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="Annotate Python AST trees with source text and token information"
+HOMEPAGE="
+	https://github.com/gristlabs/asttokens/
+	https://pypi.org/project/asttokens/"
+SRC_URI="
+	https://github.com/gristlabs/asttokens/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+
+RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	dev-python/toml[${PYTHON_USEDEP}]
+	test? (
+		dev-python/astroid[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
+
+export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
+
+src_prepare() {
+	# Kill off useless wheel dep
+	sed -i -e 's/wheel; //' setup.cfg || die
+
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	local deselect=()
+	[[ ${EPYTHON} == python3.9 ]] && deselect+=(
+		# invalid syntax
+		--deselect
+		tests/test_astroid.py::TestAstroid::test_fixture9
+		--deselect
+		tests/test_astroid.py::TestAstroid::test_splat
+		--deselect
+		tests/test_astroid.py::TestAstroid::test_sys_modules
+		--deselect
+		tests/test_mark_tokens.py::TestMarkTokens::test_fixture9
+		--deselect
+		tests/test_mark_tokens.py::TestMarkTokens::test_splat
+		--deselect
+		tests/test_mark_tokens.py::TestMarkTokens::test_sys_modules
+	)
+	pytest -vv "${deselect[@]}" || die "Tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/asttokens/metadata.xml b/dev-python/asttokens/metadata.xml
new file mode 100644
index 000000000000..266e3f19ca59
--- /dev/null
+++ b/dev-python/asttokens/metadata.xml
@@ -0,0 +1,7 @@
+<?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>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-python/async_generator/Manifest b/dev-python/async_generator/Manifest
index 2596b7b09710..653c15280074 100644
--- a/dev-python/async_generator/Manifest
+++ b/dev-python/async_generator/Manifest
@@ -1,3 +1,3 @@
 DIST async_generator-1.10.tar.gz 29870 BLAKE2B 7f1bea82b1ed9ed87774f1fb42af2c58d8f9e34a02f067fad018680d46c94b811075107396b29e948fa5f72131c79f3b45544fae5aeca9f990e809db85bb28dd SHA512 3874b4e474cc7febec981f704672e233512a999e00e1672e46fe3a18e45168373fabc83142926763b7c6fcaf16948e031702d5854694aab4b5cae96b9b1ef819
-EBUILD async_generator-1.10.ebuild 678 BLAKE2B 702057e80949e47082696d43df31bf5353ae1da2e8e1aa176cd9882577819e7cc2c879b4d8bfe995e40712e778c1292527904825c49d34578975efd815515a3d SHA512 84202a327d42c6d8dedfdf783c8aaae3442f5fd1ad2a92ebc2acf26e64a5f2316aa906ecc6eb5bff0648150706c442a761e52fbe03841fc80b0c8f563057682f
+EBUILD async_generator-1.10.ebuild 685 BLAKE2B 49f5cd601fc27bfb8f4fd912e6d6279df0a8942a655815ac065e8fcf4ae7847861c8c914ce8e8280b81471d2cca8e92b49e35b58018df73e8a4a34bd3c37cb0f SHA512 166c43f389694520d622e0c416f616b415e1c4ce157f1f379df77f863e05d3072f4ab49145bb66150d2b01707a3036ae610ba1bab5b13fc91f0ee19720b9d275
 MISC metadata.xml 442 BLAKE2B 93ff73ecbd80ae38cb18b2ffe11bb60c411b7f3ce36b196566e230fecda350a13d19892e672a65fd278038feb53273b39ed7eb42809bd397bb71b8eeb4baf5ca SHA512 fdd4036bac7d48e387e8ad059be940d3eb3cebcf1d6a6079cf4effe25265c3a52d360269fccd8e45f67374d2ce4c2b67245e75fd59656df92a36744265494f07
diff --git a/dev-python/async_generator/async_generator-1.10.ebuild b/dev-python/async_generator/async_generator-1.10.ebuild
index c440c8ba8343..6fc53dac5a04 100644
--- a/dev-python/async_generator/async_generator-1.10.ebuild
+++ b/dev-python/async_generator/async_generator-1.10.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="|| ( MIT Apache-2.0 )"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="amd64 arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86"
 
 DOCS=( README.rst )
 
diff --git a/dev-python/async_timeout/Manifest b/dev-python/async_timeout/Manifest
index 6b26a908798f..3db4f1d9e8c6 100644
--- a/dev-python/async_timeout/Manifest
+++ b/dev-python/async_timeout/Manifest
@@ -1,3 +1,3 @@
 DIST async-timeout-3.0.1.tar.gz 9724 BLAKE2B f18ae75969b7048469fe22949f25ea25da3fdbf08b98a16b5d5ffe823060a75e6de9ed764727e08d4344c79426e9c89013d49522f20ed62e6fbe912b5c7a8787 SHA512 fd30842671a79edfd52c7350e7fb2120533a6d97b44975f7b071ce2cbde43443bd5bbe1f2ad0ad3ab2156e1987b9e58e0c149b0ecfea8674eb0cb78eee79c986
-EBUILD async_timeout-3.0.1.ebuild 985 BLAKE2B 267484db01e79adaac3a944ec3c40a532aa081f9de39d28519b612da3dd756f19d2cfe62f63e5cc2d83ca57a05b7ec606024acd4a2362d854bbf6464835861f9 SHA512 15a9b00e5bc3bc069aeefdf89f9f01a531995e0668089e5450447783c3a9470cecb5150589c3a6f2cabff3269004454f477d4112c704aee468755d535770e829
+EBUILD async_timeout-3.0.1.ebuild 1004 BLAKE2B 8e274597cbf11e7aa53a71360afebd093dcd083c67c88f0e5f1973d910688af4dad04b77be07408efcbc90b06cc5a5e525c017eeeac71bbba5e5abb89e3fd8a1 SHA512 5be4beed84c46256495ebb8da04911b6de7b405f5fd43e9cbb1a2b717f83df94f537fcae6184ff4baf554352cf8d217204ffb3f9ba2b7924e1bceb06fa9b1f0a
 MISC metadata.xml 435 BLAKE2B a3bf9896730a3f697c6a41257e9f3c168154760ffba1cc5d5660a1442a3b5f5f8032d48ae0b069a412e3ef2e792376e29d3a0867a46576bf8b412acca0798388 SHA512 a7a43ad3fabf98be2d846d8a4bea1ff2a867f934e27d9f88b1c76daaf4d4195f8ffc6039f283313dd009566c732bcb0ab8a847e0b6424afdce902539530637dd
diff --git a/dev-python/async_timeout/async_timeout-3.0.1.ebuild b/dev-python/async_timeout/async_timeout-3.0.1.ebuild
index 6bd8c5425b6e..a9291b7803c5 100644
--- a/dev-python/async_timeout/async_timeout-3.0.1.ebuild
+++ b/dev-python/async_timeout/async_timeout-3.0.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 S=${WORKDIR}/${MY_P}
diff --git a/dev-python/atpublic/Manifest b/dev-python/atpublic/Manifest
index 3f31879e4b46..8ded0967493c 100644
--- a/dev-python/atpublic/Manifest
+++ b/dev-python/atpublic/Manifest
@@ -1,3 +1,3 @@
 DIST atpublic-1.0.tar.gz 13611 BLAKE2B b5ce4cbbe950943c001e25c3f0c1fe6c25a99a96e4c630844a409cb0ae9a2e7d8fae8d010864364bb2bc948ce78ed17bef5c1f1ca1435faca439f62521bcc719 SHA512 f9e6f7bbbe12d86df5bc849c432e789fb55c6d19b9d6b3fb2462ea38aa8ad6602504a30a95ec14e001f62709ae5e11ae29258b9cb7a71eaa48879f9cb0cb19d8
 EBUILD atpublic-1.0.ebuild 495 BLAKE2B 1d71d3b681a9e7b5bb443f1772ed23849de2e6ef97e2f4f66a0d6db15f7c77abad32dc4848aefdf0e6f3eae01e3945619254d199e9414c841cb71e7f9691d2d5 SHA512 0212885e9bdf42d832a534bb6ebff24f31bb4d88708bfc8b1c19784d191afcdfc1610b21b69f5b9928dd4579b095f66a13bcc9fe5d80201bc7ae98d3086e7558
-MISC metadata.xml 499 BLAKE2B 545ff1748d57a895d71011220a139f70d3d6477248c79a2345ddba23995c5ac32ec2748567728485db49dbe2f2b61d3b0a5ba76839217ca5e58881193b49b0a1 SHA512 9001d8c190fae7cd4ec6e9ec9224493b4bd66af4a3cae4caa38c2ad02a361208cf953dc7357861dec1582923df187bf0ac85f478b06a3dbdf2f6921a40a2f1c6
+MISC metadata.xml 333 BLAKE2B 1a681ac99aee289a919b530bb87037df6fe53b044ce14ce3a9da3cec54a73d7fde58cf01f12678f18397d16b56c9e5bf88d289ddec4469e343d7193502124124 SHA512 a73512d246562e6591eb9c8d13759352cede7f0ae978d02c87bd72b1fe2c9b155cc3908e8489b136387bada61f1257d8e0771e01e26d998b51f9ce13c087ec41
diff --git a/dev-python/atpublic/metadata.xml b/dev-python/atpublic/metadata.xml
index 3aea3831625d..3ee70120def4 100644
--- a/dev-python/atpublic/metadata.xml
+++ b/dev-python/atpublic/metadata.xml
@@ -8,7 +8,4 @@
 		<email>prometheanfire@gentoo.org</email>
 		<name>Matthew Thode</name>
 	</maintainer>
-	<longdescription lang="en">
-		This is a very simple decorator and function which populates a module's __all__ and optionally the module globals.
-	</longdescription>
 </pkgmetadata>
diff --git a/dev-python/attrs/Manifest b/dev-python/attrs/Manifest
index 47a1bc7fa661..3e93cc015676 100644
--- a/dev-python/attrs/Manifest
+++ b/dev-python/attrs/Manifest
@@ -1,5 +1,7 @@
 DIST attrs-19.3.0.tar.gz 132477 BLAKE2B 6577f39fc15c9e70f0f76ba358099e83c57e226574cb11dbe83747f12e285a284e9d1a218fc1670e0d08be550d42c67cde132604b2cf385d1ee25bda7e57e79a SHA512 b5b641e6732156d1454ed6c49e3a6b29200a8d3f1515fb59aeb85fcb5e9ab6a1d760904de45083cae5250e7bf1a7aa2c1f3ede217240a63f989ae4bb484f2511
 DIST attrs-20.1.0.tar.gz 160766 BLAKE2B 65170484648318b9e6466789a9d212475dd8233c2d89fdd7bdf3b24dab4fd5018f981f30a0fa0df83271a8bcc915f13b03a55e7e42da2e1d8a3a0684430107be SHA512 0be286c9263ea26fbb29a89a1c9a37577577b1147cbf440de257a3652147bcb559c8fc4118a900cef558b9f49b59074a276c8a4843f3e8829278eaae5b70e913
+DIST attrs-20.2.0.tar.gz 160604 BLAKE2B 1536366a943aa2d0517e3c0aa71230c378b20e731cbac78d1c5cc96f2500fb30203ee0939e25c80f8216bcc6dc7ed1fdfc2b23ab7f5d7c712fb05f5ba65739b1 SHA512 829030d8c1fe7bffbbb8d70fc56228f4c378d85a24c89d802e51f63a78abbfa24f46f5aa8b56cb7ba26ef0bf1fb272163873c45c994145de0be45b14c6fb29cd
 EBUILD attrs-19.3.0.ebuild 868 BLAKE2B eabe886f699ddfdc462847003e10d102ad3ed75bf901af6e12158197490bed29983b89a65d1fd584bd10edcc620591b0cb207f4eea877e0d247e4533182c7a19 SHA512 ab4542831afe2178c61e6056cd444ba77ea5a4e26c5ec388ecf2aca644b4771b3a46080d8c1c5bd7a20b25bd136a9f2be1a7bbd3bceaea857df7e77cedb07942
-EBUILD attrs-20.1.0.ebuild 836 BLAKE2B 9a919f6c9ff877b2aa5a0e6dfc0f2c6167cc41761b0717ead724813824239b7e11798dd256bda57ba6ff359b4402c8379bd82af2ae1a9fbbb473a48c678a5524 SHA512 f3ab234e60abf4dab6da95d24abe300f5f19c35f6d15780d9051942c12e3449f6da2c99a137f47c5229bb76774dd142dc4e54602454b902d0938568cea628ad8
+EBUILD attrs-20.1.0.ebuild 843 BLAKE2B a1eb656d1d4ae548433040099a2aaa6e36991f9a69d1b916bcfc02ab40227882fd91e9c42bc6087d7f7e815466f381c6c13c120e3789767f31921a228e1f4272 SHA512 b2cb31d71461b3fa12b7b20e391b4fd4b27b786744c501e16434a57131e89ae6f67445a9b3778f83ed5e68a2a97b06b3fb8ec629fb752117057c8e5247fde99e
+EBUILD attrs-20.2.0.ebuild 843 BLAKE2B a1eb656d1d4ae548433040099a2aaa6e36991f9a69d1b916bcfc02ab40227882fd91e9c42bc6087d7f7e815466f381c6c13c120e3789767f31921a228e1f4272 SHA512 b2cb31d71461b3fa12b7b20e391b4fd4b27b786744c501e16434a57131e89ae6f67445a9b3778f83ed5e68a2a97b06b3fb8ec629fb752117057c8e5247fde99e
 MISC metadata.xml 495 BLAKE2B e9a4bb16661c2b059e33b2f4182da181bca463091c53e4f1ff61c54137030bc9982b746ad9544dc0c293be4d05cc14949b1e2fcda773846de04ed879eef59d97 SHA512 439bf5cd48fd1647fb72a6bb320b493adbfef6be38298d1f6aa77c3d4594dbc03082701390a69f9324dd76fd3367472d865a39c7b5ba48e2a5a0ec56e04c5d39
diff --git a/dev-python/attrs/attrs-20.1.0.ebuild b/dev-python/attrs/attrs-20.1.0.ebuild
index 8f8f2085fd45..834a2b07aa45 100644
--- a/dev-python/attrs/attrs-20.1.0.ebuild
+++ b/dev-python/attrs/attrs-20.1.0.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	dev-python/zope-interface[${PYTHON_USEDEP}]"
diff --git a/dev-python/attrs/attrs-20.2.0.ebuild b/dev-python/attrs/attrs-20.2.0.ebuild
new file mode 100644
index 000000000000..834a2b07aa45
--- /dev/null
+++ b/dev-python/attrs/attrs-20.2.0.ebuild
@@ -0,0 +1,30 @@
+# 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,9} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Attributes without boilerplate"
+HOMEPAGE="
+	https://github.com/python-attrs/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="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+RDEPEND="
+	dev-python/zope-interface[${PYTHON_USEDEP}]"
+BDEPEND="
+	test? (
+		$(python_gen_impl_dep sqlite)
+		>=dev-python/hypothesis-3.6.0[${PYTHON_USEDEP}]
+		>=dev-python/pytest-4.3.0[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
diff --git a/dev-python/automat/Manifest b/dev-python/automat/Manifest
index 0d531bb9005b..5f43467b5836 100644
--- a/dev-python/automat/Manifest
+++ b/dev-python/automat/Manifest
@@ -1,5 +1,5 @@
 AUX automat-0.8.0-no-setup-py-m2r-import.patch 826 BLAKE2B 835956b8e3ab657d09d683a173c43626f0af59056ccd25e3a7bc9167da4d5d081e095e91e96ee943e7329d28c3a70b9e001e8977d64bb85581ef19f73a9ecf93 SHA512 b89fd865e8b95283efdc96614b1230d3e8e6d70cdb0ba07842cdf07e1a546a5a89b7c88a0cd774ec47148579981d41cd7261cdd7069e2736807b64422b3ca56f
 AUX test_visualize-twisted-import-errors.patch 1999 BLAKE2B e551520aeb24b3df293eeda358fa3b9b3e33934af54ff6a7a205a0e1b5b7e916e34f8c81c103fa0fee93a22e7d0bc6ca3f7b8a17dedadeaccb02131ac23f94e4 SHA512 67f14d0b64333b872c0057eba32f77132a4bbf61c8867ec475c87552b3b553162c3e2a668ffeda0c75d85906273d50e4d80231213a3f46d1855316bb229fb6cb
 DIST Automat-20.2.0.tar.gz 61679 BLAKE2B 9dfb93a0bf0a348d8f7de0796b3e5715947eb84cc0aa507a453f438d2027ae877280ed6d7896192cee46f31c7d1c0eb6cb3dee36e1f13a315071513920c5b6d0 SHA512 715cb5dc087288492e6465a29e7d8502a84fadf451bc3d29da86335ea1c20f8efd9549f0c1eaac8800559dd8001dd73736c3bfacdc6321c83a35d2288d69632c
-EBUILD automat-20.2.0.ebuild 1609 BLAKE2B c704e366cf4c4e817068be3e3ad8544bcc8780e6463f07cbd71f17a3b968c3cade794b72d06aeda06f5505bee28bdaab5f8251577610d482626a2ff67f01bfa4 SHA512 68bdb45cff53f01930a9de788bf5437bb0bbb58702a0969097b7222c8ccfad31034ca4ee15da30c0c1879c45903f49ca716def96f213228ba8b5c625d289c564
+EBUILD automat-20.2.0.ebuild 1616 BLAKE2B 12cf87c83a0c55b4da6f673574e07e4788b204fbe5f10b21e0fadc876e7505b090baeaafaab2465a9aa8f828e67ae1af90df9de6241bad6c5efabb8ba576aef9 SHA512 92de5b231f12ffe22c6eb0fec653be3553e851c49c626c6028aaf490d8a2b7fd10d2e7b4bac1aa2c0650f15e3b54c13ab21e58bf0f81aea43bce037a2d8e90a0
 MISC metadata.xml 669 BLAKE2B 22b4ba427dc89c8f651aa4f5d31dbde255937d32f3c3f15e1b5a44f13e574822523d6051b087066f18f22f15001629d6a012961be2603b16f561a567826c453c SHA512 a3683067d91582e4b0262a8d66fbb86d15fdff9093916d4298c9ca8f94a81db4357338be8a4f18513b0670e1f209f138bc28b8bf5df5e0b5ed4b0978dcaf6083
diff --git a/dev-python/automat/automat-20.2.0.ebuild b/dev-python/automat/automat-20.2.0.ebuild
index 3ca1eac96eef..2b8afa2515f3 100644
--- a/dev-python/automat/automat-20.2.0.ebuild
+++ b/dev-python/automat/automat-20.2.0.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="examples"
 
 RDEPEND="
diff --git a/dev-python/autopep8/Manifest b/dev-python/autopep8/Manifest
index 8f00cfeb7513..0c4ea5cfc2b7 100644
--- a/dev-python/autopep8/Manifest
+++ b/dev-python/autopep8/Manifest
@@ -1,4 +1,6 @@
 DIST autopep8-1.4.4.tar.gz 114796 BLAKE2B 0eef2550e2e13a79e4c3199dae119ed49b13056d9bbd98be5d9e4c7d0288d12bf6ad30162c0e4c485f6de9b47b4b6ecfe92dcb278f2cb265b75e395bdda77aa8 SHA512 06822df7cd02c68980965c1fd987dec03785e155554ff0f735dc707c4de99b4d152b0d092e21017ec5d9176b33bcf22f3ef2b0986f38faebab0928443eca4d32
+DIST autopep8-1.5.4.tar.gz 121471 BLAKE2B 4d9d4d0de94757573ad56636d92983d0bedfb2c7a3f25a47d8dba9c78c4e0752aa2ea0cd43f93d9cf37e434178cf89ad6c98b2af3a07f2490147c87a95ff610a SHA512 e613295d080149028361715f748fc9db1b7fc6212ca4e117594a10c3924a67eaad6ff8d94cfcf2c3dea087e0aa1ce6bcadc1b4eb3f07915daa5b002a09913f59
 EBUILD autopep8-1.4.4.ebuild 822 BLAKE2B 166a16771249241a262188451b1d0ffdd629bc8c6755b804a7f4bd1bf103bb99dfdcdcf96e1ff651b6442bcfb847524809e58724d493ee01d483c53c1c9196cd SHA512 ee8f3ef92a8454b7d51a56e42c5373f5ff3861d5a92518926dc96ee83c2315e41fc5605fb737053bb3db2661a6aa378dc4d507c4167c3675a872653aa05d7ac6
-EBUILD autopep8-9999.ebuild 799 BLAKE2B a0a3cb93be6e0d566e42a7f92906de125f88e7519c3c19852977567e08e44c39059af4ca53c6c6741689d9633df6317d0e3bf48fc29ba137ebf66d0778977348 SHA512 79ad3a98848af6ca1cf60a4dda33b6adf41e5e0fd9e6ef13b3c04bf61ce060c6111962d35d0e894e909fabb9a336cb73b06674c6a573baada40a22de5b803dcf
+EBUILD autopep8-1.5.4.ebuild 819 BLAKE2B 751eefd61bf46d0fadccaad7e1383dbc17580d9e50821370044ea721328517c01e9e39d05da3435130dba66e7969b56522d65ab94a3d3f4a13345ebcc57882ae SHA512 bec6a094ae8c90e8e03095e9496d896a98c26e50cfe22ec7df5ba392273894aff2aeca1426e33703e63d73db833e4955ead024ac0858db5dc840fee7d195c1da
+EBUILD autopep8-9999.ebuild 819 BLAKE2B 751eefd61bf46d0fadccaad7e1383dbc17580d9e50821370044ea721328517c01e9e39d05da3435130dba66e7969b56522d65ab94a3d3f4a13345ebcc57882ae SHA512 bec6a094ae8c90e8e03095e9496d896a98c26e50cfe22ec7df5ba392273894aff2aeca1426e33703e63d73db833e4955ead024ac0858db5dc840fee7d195c1da
 MISC metadata.xml 378 BLAKE2B c45e6a1e950f4288d6bf63969fb59c426a483c9e27294b6aa18c85d827f0cbce3cad2111852f6c7bb9347a17650b92b98fc3234989742459c57652fb6600adcb SHA512 e7ac8c3772bcdef589f909947f23d6c97d09ca98eb3aafbd88cf4af53ed56c12f85741e0d8f872ffceefd59012e11f4c98939b0daa79590255685cbbf04acf80
diff --git a/dev-python/autopep8/autopep8-1.5.4.ebuild b/dev-python/autopep8/autopep8-1.5.4.ebuild
new file mode 100644
index 000000000000..4ebce4805b38
--- /dev/null
+++ b/dev-python/autopep8/autopep8-1.5.4.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} pypy3 )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="Automatically formats Python code to conform to the PEP 8 style guide"
+HOMEPAGE="https://github.com/hhatto/autopep8 https://pypi.org/project/autopep8/"
+if [[ ${PV} == *9999* ]]; then
+	EGIT_REPO_URI="https://github.com/hhatto/${PN}.git"
+	inherit git-r3
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm64 ~ia64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+
+RDEPEND="
+	>=dev-python/pycodestyle-2.6.0[${PYTHON_USEDEP}]
+	dev-python/toml[${PYTHON_USEDEP}]"
+BDEPEND="test? ( dev-python/pydiff[${PYTHON_USEDEP}] )"
+
+distutils_enable_tests setup.py
diff --git a/dev-python/autopep8/autopep8-9999.ebuild b/dev-python/autopep8/autopep8-9999.ebuild
index 90456b8815b5..4ebce4805b38 100644
--- a/dev-python/autopep8/autopep8-9999.ebuild
+++ b/dev-python/autopep8/autopep8-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} pypy3 )
+PYTHON_COMPAT=( python3_{6..9} pypy3 )
 PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1
@@ -15,14 +15,15 @@ if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha ~amd64 ~arm64 ~ia64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux"
 fi
 
 LICENSE="MIT"
 SLOT="0"
 
-RDEPEND=">=dev-python/pycodestyle-2.5.0[${PYTHON_USEDEP}]"
-BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/pydiff[${PYTHON_USEDEP}] )"
+RDEPEND="
+	>=dev-python/pycodestyle-2.6.0[${PYTHON_USEDEP}]
+	dev-python/toml[${PYTHON_USEDEP}]"
+BDEPEND="test? ( dev-python/pydiff[${PYTHON_USEDEP}] )"
 
 distutils_enable_tests setup.py
diff --git a/dev-python/bashate/Manifest b/dev-python/bashate/Manifest
index 5605ce22fe79..a9037e14307a 100644
--- a/dev-python/bashate/Manifest
+++ b/dev-python/bashate/Manifest
@@ -1,3 +1,3 @@
 DIST bashate-0.6.0.tar.gz 30980 BLAKE2B 5b210edaa44a0652a03f30a641a072dba1482e1ca3b42c6b7140a52349ddb271f0137373a4d2f364032c22c176d6caf14be2635038df8a4e86585773d17a1f97 SHA512 bb64d8de0143bf2662497b1571ce654f4ceeb7d1dea3f625705b609ab70ed3b4bca6266c4eba7c2e7d99a1520fb9566a4a4daefa34c9c16538537b446c1da255
 EBUILD bashate-0.6.0.ebuild 692 BLAKE2B 052cd7f391e1463878fab38ea3ba2586bb0166f78fde128c0cc56556815f889f2be37f4b9f60a559515ab64c7a15a5b342eb5e20ddf1f7b0a3ffd77c353d759a SHA512 ce5efb4e64ea2f9db06d972a517f0dafbdf68716ff0e949547eb84a50ec670af49731ba40cc44b3b7ef6f345263be654a8e93018c8ffab1573d0c0dcc851b29c
-MISC metadata.xml 517 BLAKE2B 74c61fabea9ee345173582be1486426377f97187d976b992380d6670fb024c00ccfa818e6bac19e1e637c371280ca8d5535c8e84bff52ae874eeae939728a400 SHA512 eca862a58ed6a1571e626ddc24e73fb8d295f0a6e5fa36246d261688d9de81ff7780018df8defd159094ed8badf8449982dcf07c2415067080f38ba516da481f
+MISC metadata.xml 431 BLAKE2B 5584ee417afcf244975299d7ee769137b41956f60aa7b273d593aad8b9e1a05d0624d820870648a56da0ee816366a03b59e31ab27113cda02ddc084237c850c1 SHA512 1b7b1ac3b3de9dc163ea84df81645beb10790b3b192baa16b49fd977d9cc1c37794cbdc846d995c54fa1eaa9d04ec02149acfad07011bd273dc6693652c77860
diff --git a/dev-python/bashate/metadata.xml b/dev-python/bashate/metadata.xml
index c25cf671b7a9..c720d6562fe6 100644
--- a/dev-python/bashate/metadata.xml
+++ b/dev-python/bashate/metadata.xml
@@ -9,9 +9,6 @@
 		<email>openstack@gentoo.org</email>
 		<name>Openstack</name>
 	</maintainer>
-	<longdescription lang="en">
-		A pep8 equivalent for bash scripts
-	</longdescription>
 	<upstream>
 		<remote-id type="pypi">bashate</remote-id>
 	</upstream>
diff --git a/dev-python/bcrypt/Manifest b/dev-python/bcrypt/Manifest
index d4a014c86952..f24b1598a994 100644
--- a/dev-python/bcrypt/Manifest
+++ b/dev-python/bcrypt/Manifest
@@ -1,5 +1,5 @@
 DIST bcrypt-3.1.7.tar.gz 42512 BLAKE2B 5e762f153a5a69c1426748737956fd370e74fcd02e82b5a634e74dbb50fc9e894bdadb4e87eb9cdc580d0853f73ef348d9523ceaf4236df565e39b714bbd1c60 SHA512 bb9a431c8de97d5615d1a7fb67f868d08d839313fd5f3e17d8db40db1870f8b624594352c24c163c6a03485217de873cd92578040350678888728885c7b749de
 DIST bcrypt-3.2.0.tar.gz 42416 BLAKE2B ff9cca995e38fe27c6f02e9770e9349dfe528a1c9c18f41c72f29dfc01e981373fc0964f3a74161f2a7dddea63c5f48708539221adcd5a8ae99b7c30d7b1afd8 SHA512 aa782aa6a725434e0b0737973e33e6c2bf4e82d39e8dfba0913da5d7dd051d55217adab8004c3eaf896fc3c3e145ba543da1b5162a667a3d82a4eb6b07430b80
 EBUILD bcrypt-3.1.7-r2.ebuild 749 BLAKE2B 616ac74130346028188c70b150c5c9095de9bfb47d5d1aab97435db1f0db8f4cd73ed6386dfafb9698fb081584d9f844e0f417633e6ee906e112c65b544bd941 SHA512 43a77dd7ef01017083875e72f41432e69ed850c260a1929444eba09aeb5ef8f0ed92c96ca30d99c6c165f45b980dd1910505a4e3897eedf37fcd8752719929aa
-EBUILD bcrypt-3.2.0.ebuild 758 BLAKE2B 8c77697b8d3ac4972b61fcf1012e03fef6240f4ae4fadbc3760f78629f9ef8c86993abef9add8758a7f7a54d8a06ed1c8f37f2fa298958b9150f971a4090d8bd SHA512 9b98d8f570ae4962093be77a52fa67578edae225cc323b45885407a4d5663aa94ece719f01f4273ba23bff63912060ccc8ba476289c16e5224e7f9c30360ecc9
+EBUILD bcrypt-3.2.0.ebuild 765 BLAKE2B f99f08be1e8bdb9796558cea7dc749039693157c842d4b05ff7357a4e36f98d563680664091601e4e6e78a84fc41dee12bc75680aa13ca13180c3d38fee2d69c SHA512 a0183a80900b8ac0a470bf7f5aa37abdfc70bc73ac8b086540c08e82a66071ad9667083619621636491ca5a6d3a5ee604b86308cea0e00ead894244de7727eaa
 MISC metadata.xml 485 BLAKE2B 789fde3cb8c29c27778293f22f9e3a4453b743d52f5fab1dd2db6d940e4e1bff843d6ccdb4f7374b456b2cd4f80877f453205bb9a5eeee9f6e32382297ab967b SHA512 3b4fb489f9d1ecdee3dedc58dda61aa86c6bc30f29aba50de6dc4faa499276d83fe15518088e4d0e76c98ca30188b2f1b921807821fc73b5dfc592490e6fdb46
diff --git a/dev-python/bcrypt/bcrypt-3.2.0.ebuild b/dev-python/bcrypt/bcrypt-3.2.0.ebuild
index cc0bd6f01842..e26c0aa08df8 100644
--- a/dev-python/bcrypt/bcrypt-3.2.0.ebuild
+++ b/dev-python/bcrypt/bcrypt-3.2.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="Apache-2.0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris"
 
 RDEPEND="
 	$(python_gen_cond_dep '>=dev-python/cffi-1.1:=[${PYTHON_USEDEP}]' 'python*')
diff --git a/dev-python/beautifulsoup/Manifest b/dev-python/beautifulsoup/Manifest
index fcd6aaf48438..d6cb9d60386a 100644
--- a/dev-python/beautifulsoup/Manifest
+++ b/dev-python/beautifulsoup/Manifest
@@ -1,5 +1,5 @@
 DIST beautifulsoup4-4.8.2.tar.gz 298650 BLAKE2B 6826abf793efa63be89d844bc25bdb105413196bfab21c18f3816fd59a7a771459bf2c7ee209b75b0c88dfa14da8f4625c948889acfb48502e2260ccca229675 SHA512 aab90eb22614e9a2fb47792389a951b3ad7faf9791e15984a6c27a38be6f3d0ccbf3a9753d9afb5c70105097ac1a9c5f9e07206e12c6d4cb7a7f6d4e90ec18c2
 DIST beautifulsoup4-4.9.1.tar.gz 374759 BLAKE2B 43f5dc296bd0c4967036fcb70889f988c0dfc9d8713f8bbab423c9089e87960323392458b3abb9b2332acff286efbbb308a5c77058462c15f8dfe9056f0304c3 SHA512 a1fe9cbfe8616d2ff25cc836769ff02d51ed86b06ca9a37366867b145440b7f64b866346600ed74820f0407c8e70eaac3d58700766a99b5ff7433cb736a57b3c
 EBUILD beautifulsoup-4.8.2.ebuild 868 BLAKE2B d835b9cbd772d58f124ead4a7195f9b54820ab111c936e38d6c112d3037ab799cf8489d691f9be03785e516998ee7fe3f180989d99208a81022f678f5ef21428 SHA512 8a9f1b0a898560a83597b1ff09a9b84f779483b28da91ce2204104c653f8588f7d4292cb681352dfa8b15b33fa6e6cf5ac0a519f0957157e17019610b4bc668e
-EBUILD beautifulsoup-4.9.1.ebuild 873 BLAKE2B 7653e2add6dc81cd5d78e02721a65bf1ffca1d06f3d237c9d1cba08c51229e0c93b9cec2fe422006f192e32198ef5ae2da5b00fdbd850291e35de615e343b30a SHA512 28c8d0f7cc910d02fcdb3813d969d6e90e99a7d4e04dece0223654121d503238e2732afa965fd73e3e1c3eee71018bf25bb2cd69b410beaa5a3efcc8d353f1cd
-MISC metadata.xml 720 BLAKE2B eb5a827491cd19df36bee9593e3e110a986fceee9f6d62a4de47edfc3daf4e1090062a2a9a4c8bc9cbb4f9b378de0c21126b3229740b7e75fba22643fb28fbcd SHA512 94493d30b0e0e55b94d08f9a56841c54088469a86b706b73e8efe9c0f9a0da598feececd01f5f14d7e28bfe6fea5d7b017fb84a2df680335f519803450c6f578
+EBUILD beautifulsoup-4.9.1.ebuild 865 BLAKE2B 56ad3bad060f06f8c8c5a423756737103788c45f0989e8ec3b6b73d3a5e3d2f9cdc8d45e488a518ea018fa24b04cff0ac670a1c25cd81a8cfed7845b6cbfea5e SHA512 4d7262aefafc557a8f5a82312043aa2128cff129032fba20a17b25363e2047cebd6c73423c16375a0690ad829aaa60fee13a0fba83022e00f2244e469e850028
+MISC metadata.xml 744 BLAKE2B 93987e4adb8dc5dea9b897940cae80d431b29d693bd1fea9d242de75174b1fd86afaecc6a5fb5e4ad06576caa559a918d09da28d253147f2683703d911435f76 SHA512 f56ab7ff03d21187e38f292b24396eccfd53622c84f5f489bd1e515393dbf85b75bbdfe26a6875352b16dcbf16f89cd9a051dfe44dbca8786efecd7db914f789
diff --git a/dev-python/beautifulsoup/beautifulsoup-4.9.1.ebuild b/dev-python/beautifulsoup/beautifulsoup-4.9.1.ebuild
index bea89dc44f97..6be95da941cc 100644
--- a/dev-python/beautifulsoup/beautifulsoup-4.9.1.ebuild
+++ b/dev-python/beautifulsoup/beautifulsoup-4.9.1.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="MIT"
 SLOT="4"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
 
 RDEPEND="
 	dev-python/soupsieve[${PYTHON_USEDEP}]
diff --git a/dev-python/beautifulsoup/metadata.xml b/dev-python/beautifulsoup/metadata.xml
index 1a865dd3b27d..227205f32598 100644
--- a/dev-python/beautifulsoup/metadata.xml
+++ b/dev-python/beautifulsoup/metadata.xml
@@ -13,6 +13,7 @@
 		a parse tree: a toolkit for dissecting a document and extracting
 		what you need.
 	</longdescription>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">beautifulsoup4</remote-id>
 	</upstream>
diff --git a/dev-python/binaryornot/Manifest b/dev-python/binaryornot/Manifest
index 68c4df2f9552..58adf47bf628 100644
--- a/dev-python/binaryornot/Manifest
+++ b/dev-python/binaryornot/Manifest
@@ -1,4 +1,6 @@
+AUX binaryornot-0.4.4-fix-version-number.patch 391 BLAKE2B cde44c468996c18513115daee310eabbd267c2192a947ac3a3b572f009e4c0ed9e53ee967e2129dbf88cb2052cb8862cdb541f676ff2fb6a719c825928ff4760 SHA512 b40c2248c900c70f1b6603fd5d607005e07ce1278d4dacf72dd6664f7558a3b382ec815cd9215dd17f5b69a09002d48fa9e960771b274fb1fb08dfa4daf9df2a
 AUX binaryornot-0.4.4-tests.patch 674 BLAKE2B f07730709f11bf0732b60b81603c40bea1fa6da2d8df545b088072e0f710a7e123e438b03d2390122b6000c14343e932b38d4b6f8956ea87b72e29deae1a4715 SHA512 8a0f1066a580f08778434ed7d30c2ebf2764dbfd746b561ffce2fb8dd8d77cafaf4a58b03504cf5b1e4d37e0a6ffe3038dcaa5611cdfd7d42ada86edd1e47f3f
 DIST binaryornot-0.4.4.tar.gz 372361 BLAKE2B cb2099313f602915bacd5b463642f16430fcb0ab62dcaae546cb854780996526fb777c0b730b4b89e664ec7f995ddd2d2f632cfbac2dadca45958cfd1dd7a410 SHA512 31dfb79bb5847e12487d94519a357dece4572f7ed064686d53a49c2de5a51d6441be64523c98cca6221ed89be5bf26e54866dd3b79ac8d89fd5019a5b4d75a45
+EBUILD binaryornot-0.4.4-r1.ebuild 869 BLAKE2B 337bb810d41ba5267574545058a83862b863e5371fda50a5949e3fcee40722a2ab59296d391244c45ac5988fecf3781b4f6b31b1a69ea09df7aefb9ca01d90ef SHA512 4974d5a1413451bbf5815f7260dae710e2c1462a25d873233509e9169b660ef238592ca05d06247abf25829a7dca8bb868577ecb3eb1214decbd23426e00952a
 EBUILD binaryornot-0.4.4.ebuild 768 BLAKE2B e33987a9b4ff8eaf6f53487290b9c9209a242ba7c184f1242c50b2951e0fdc92a7fd5028d166cc6361c9e45c0c9fa95d5600b22cd44525746fc62350bd6830c3 SHA512 aa2fb3ca6efb3864daa55e7040dd634b53ff071d084657e93cf591aadcb87325c433f9f2b91b0d4072875e0754e78ed34146908e639ac020afe1cda79da38aaf
 MISC metadata.xml 324 BLAKE2B 85a0925b2255a6577beed4974beba21884b88df30bc1519f6ce16e856659589c6e6e38166540f59fb0043885ce786382d90b6830c6ed1bc0051a5d728a1f780b SHA512 f20343e29c9a1d2bb354ecb3c308d5b21985deed5368d27dc144c3a6f2e236f30f7516e27a56e55be48fda32bd59ae9af96ff3b90ecf641bf57dc5b61a4267c6
diff --git a/dev-python/binaryornot/binaryornot-0.4.4-r1.ebuild b/dev-python/binaryornot/binaryornot-0.4.4-r1.ebuild
new file mode 100644
index 000000000000..b9ce949a9e5d
--- /dev/null
+++ b/dev-python/binaryornot/binaryornot-0.4.4-r1.ebuild
@@ -0,0 +1,31 @@
+# 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="Ultra-lightweight pure Python package to guess whether a file is binary or text"
+HOMEPAGE="https://github.com/audreyr/binaryornot"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND=">=dev-python/chardet-3.0.2[${PYTHON_USEDEP}]"
+BDEPEND="test? ( dev-python/hypothesis[${PYTHON_USEDEP}] )"
+
+DOCS=( README.rst HISTORY.rst CONTRIBUTING.rst )
+
+PATCHES=(
+	# https://github.com/audreyr/binaryornot/commit/38dee57986c6679d9936a1da6f6c8182da3734f8
+	"${FILESDIR}"/${P}-tests.patch
+	# Version number has not been updated to 0.4.4
+	"${FILESDIR}"/${P}-fix-version-number.patch
+)
+
+distutils_enable_tests unittest
+distutils_enable_sphinx docs
diff --git a/dev-python/binaryornot/files/binaryornot-0.4.4-fix-version-number.patch b/dev-python/binaryornot/files/binaryornot-0.4.4-fix-version-number.patch
new file mode 100644
index 000000000000..05d6ed0b7449
--- /dev/null
+++ b/dev-python/binaryornot/files/binaryornot-0.4.4-fix-version-number.patch
@@ -0,0 +1,13 @@
+diff --git a/setup.py b/setup.py
+index 68a4f5b..a0c9e14 100755
+--- a/setup.py
++++ b/setup.py
+@@ -13,7 +13,7 @@ with open('README.rst') as readme_file:
+ with open('HISTORY.rst') as history_file:
+     history = history_file.read().replace('.. :changelog:', '')
+ 
+-version = '0.4.3'
++version = '0.4.4'
+ 
+ if sys.argv[-1] == 'publish':
+     os.system('python setup.py sdist bdist_wheel upload')
diff --git a/dev-python/bitstring/Manifest b/dev-python/bitstring/Manifest
index 8d50feb2823c..59c6b0563f36 100644
--- a/dev-python/bitstring/Manifest
+++ b/dev-python/bitstring/Manifest
@@ -2,4 +2,4 @@ DIST bitstring-3.1.6.tar.gz 751557 BLAKE2B e35735fac2f99832585e909b48faecec2c03f
 DIST bitstring-3.1.7.tar.gz 407574 BLAKE2B aef290b174ca4cfb756778683e956ba083a8a51cc77d6232477318f91d6d1aee495967722e97a090353032ab99db97f72f3e4d5835e6a841c5076f788ffff456 SHA512 57a48cf279f1e0e2ea8e1ce436cd8c256325f6f9e9ad340b8c28c2954712faf8473e5779aeff4d66b4c596dbeb4cb39ea3328d5c22dcb4d8b0ee0a7098023561
 EBUILD bitstring-3.1.6.ebuild 731 BLAKE2B fe8d3030e0ac1b5e737b3d33c10e117fd1bdd8444abc25f7b5f3a8680c2258220033ce625cdd915a85db511812bb9577cf906d070c8837bcb81048e4944f5c63 SHA512 a39308c269f0f84f3b37ec23450fb0b0c2abdac058554baaedb3ae14952fee6028b8e24446c2c1d88b491f366014908b42df77432e87dc5506f1873ba144082c
 EBUILD bitstring-3.1.7.ebuild 605 BLAKE2B bcd7b98ea6fb14a96082ee435631bc8b577267333e969a59884e9c76a5ed5d200c8afb08e766ef937cc5fa2720794fc256d312f5356f0c4a97af995f823d35f6 SHA512 a1fc85e0448860ee334772f00ec2098d8095a25a9f3503b2468320ef54dfd61983c65db6e8945aee67bcd57616ffb9e57bc88e138545459868da71a605eb7393
-MISC metadata.xml 661 BLAKE2B c6adcf300502376851157d3fb869c9327f49f4ae61f820ff59379816fddae11ec5c2952eb708d817facc9899ab347517a41c1307ac0bab4dcf34a4ff877bd704 SHA512 666cfe84898096825c292dd1e37af3b8d962f199199b8a73813b366fa4c14cc3a5373c4ed4fb8153b8e1c05321f4dae87204e1bf5a53e6fe07ab0117704b7f2d
+MISC metadata.xml 685 BLAKE2B 45a55a5375b05612b1303a5d214343d4cd298ab0c71de1a716d816d001c999f439dbd341d60286bf1744ff57fd94a2dcd4bb3c88fc1899ee5246f332bdd6d96c SHA512 95f7164420cc0364bb45e1968e49833544ab7caf85cbf5e5b551c137e68d1a90f321e68abfbd52aca1ca425d8afc673292fa5d6bd4434e9b71723be87a42b975
diff --git a/dev-python/bitstring/metadata.xml b/dev-python/bitstring/metadata.xml
index ee1a871839b8..1248de8cc91f 100644
--- a/dev-python/bitstring/metadata.xml
+++ b/dev-python/bitstring/metadata.xml
@@ -14,6 +14,7 @@
 		the creation and analysis of binary data
 		as simple and natural as possible
 	</longdescription>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="google-code">python-bitstring</remote-id>
 		<remote-id type="github">scott-griffiths/bitstring</remote-id>
diff --git a/dev-python/black/Manifest b/dev-python/black/Manifest
index 621944202621..1188fee6ded5 100644
--- a/dev-python/black/Manifest
+++ b/dev-python/black/Manifest
@@ -2,6 +2,6 @@ AUX black-19.10_beta0-setuptools_scm.patch 706 BLAKE2B da031160089a1bf505656b301
 AUX black-20.8_beta1-setuptools_scm.patch 467 BLAKE2B 4dd16dde09bdb9c9b8480eff2542f11cbe712919dec6678193fae1dd2d58c646c76ecc4831a6bcbb54ed5a7f3692f61953bbb8856e8dcf6b64918ccbf32fe69c SHA512 47df09f60aae9ebbddfdf513d9b6caa30aaf60d65cd21027e965b0544085d63312dcbdc54906a0d1ef0edfaaf00f3cc753a7af3c113f4001ef4b48ca53e04c6d
 DIST black-19.10b0.tar.gz 1008099 BLAKE2B e8a6e286e7a60f880f8b5d37a2b07278faeb4efffd15feb511764e449c36b4e54d5ac5b910f583a15948a2f92eb5e61ae210073be7a57251b2b01e69d2e5b373 SHA512 778909c26afa65548a77524451b50a2692a7b4e297fa52fc80567f7fea94dd5aae9e61cf0f1de718c28a733f1813c8e2c6974ab58e6b0e891de331bb4f245968
 DIST black-20.8b1.tar.gz 1092546 BLAKE2B 5a0a755222617d8d551b627c91670ecc32a9330cc1197900a9d21b071d0d99ddd32e09786becfc577407ab402f6da3d8683a59a9deaea1f6b4f07b9e1e4ecbed SHA512 53d6f6a6f47027e5bdfd3909471c993480034c8aa8ae395792565b8d79fb4e3a44299ea529652c0ccabf4309d645db9179bf54efc06fee20517f479e91cec838
-EBUILD black-19.10_beta0.ebuild 1718 BLAKE2B 3899e9bffa845f2b1353038ff476ac84c4527256f1ed6f2c1924a9c09014744b36b12d5fec28cb9c87a6e84140dc11e6329ada16e6ca3ca1efe4aa9618187b01 SHA512 9485c06c19a2d33dfa628b3e7a705f0c542697c192938d6f025f89e277fcc2669927ca6ecffbd37890cfad4ea490d17371ff9a3b9ba5b828afa5ef0e0a51b6b2
-EBUILD black-20.8_beta1.ebuild 2166 BLAKE2B fe7cd69eb48311e08f0dcb02076e37fcc50c20c1e2a3d5434e7bf33316780d482aa167cee8c13c3b36e7be849c38a52f8e4d80a1ed62446f81ca134dc4c6fe2f SHA512 3cf13c896c167e5bb55dba000a5278080f2cf337c5df7779802b226f5601f5303dca226d7e271678e86801e45bc20d0d0b12b4f4be769af522516e6bcd69367c
+EBUILD black-19.10_beta0.ebuild 1722 BLAKE2B 0897c09b72f341734b20e3a092328d7d6346306d74c911d7e6c681ecb7d9c58b22fca2f04bd78f53a53c47dc41b757cbcfb3a7e39c42a1a2bb61f5f44135ad03 SHA512 7e397c5babc3096c4917c18765d141f234d3d553aa227efa8aa97c64a65e6d90ebebf995f3b930ec489f42bb97621aed34298a1c7c01aed7fbb4bc29984b4a84
+EBUILD black-20.8_beta1.ebuild 2196 BLAKE2B a25330d815527c3bb5df0bcbebe481618c2028099253998067a5359624279c0bc2d799bbc0eadba5c6e5bc90c8bb3660eb0942ee59228cca36d026aeb7182d6e SHA512 7db27cefdb3f98c801955ea3d680ab4c0b7cea237f4564b3369ef002faadb4b8e5c67a6fd3ca3e589d0296486b5a11633fd1ae1f9a66051074b3ba1b1277713c
 MISC metadata.xml 255 BLAKE2B 2bb3830b8cec850703f7912f4c22f5b0abeabeed0715222bc56141779d02160773cfd0f85417c553c1cd8f2738bfeb78c56dffb8e648e572019319657646d1ba SHA512 522158915afe67937f81ba572a918a2de8ca1f8591e097da56799c97870d7c44756c1acd8224d63bd3375c2b9ebc0e1ce50816899117948a48065a27804883bf
diff --git a/dev-python/black/black-19.10_beta0.ebuild b/dev-python/black/black-19.10_beta0.ebuild
index 8098148cd15e..e28d8526c1bd 100644
--- a/dev-python/black/black-19.10_beta0.ebuild
+++ b/dev-python/black/black-19.10_beta0.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 PYTHON_COMPAT=( python3_{6,7,8} )
 DISTUTILS_USE_SETUPTOOLS=rdepend
-inherit eutils distutils-r1
+inherit distutils-r1 optfeature
 
 MY_PV="${PV//_beta/b}"
 MY_P="${PN}-${MY_PV}"
diff --git a/dev-python/black/black-20.8_beta1.ebuild b/dev-python/black/black-20.8_beta1.ebuild
index bb2b6a73f63b..229cdc66ac76 100644
--- a/dev-python/black/black-20.8_beta1.ebuild
+++ b/dev-python/black/black-20.8_beta1.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 PYTHON_COMPAT=( python3_{6..9} )
 DISTUTILS_USE_SETUPTOOLS=rdepend
-inherit eutils distutils-r1
+inherit distutils-r1 optfeature
 
 MY_PV="${PV//_beta/b}"
 MY_P="${PN}-${MY_PV}"
@@ -17,7 +17,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-python/blinker/Manifest b/dev-python/blinker/Manifest
index 0b413b570231..174186bbe580 100644
--- a/dev-python/blinker/Manifest
+++ b/dev-python/blinker/Manifest
@@ -1,3 +1,3 @@
 DIST blinker-1.4.tar.gz 111476 BLAKE2B a9ebe32bc01f7f08a5f180caa3d3830eaa10b7c0499c11ff4ceb71ed604f94dfbe4c783cc7409a57da28d6d69cc49d7861d05401802f86d054bdd2501f36cf60 SHA512 2f5f71b05c7cc27f5761ba698b05c78c8a491f5285c120e532d24be0c8256daa14e075f3f30e15fb18e7c3f16579af9378a155d058f170e3af9ffdb89e49f56e
-EBUILD blinker-1.4-r1.ebuild 643 BLAKE2B 22de03993a3a6eaedcfb8ef960326ffdee15ba629e049959380aebeed9e18978a5b46e758e270ae969092e0ef33c7f3308bccec5e75e0e9fbe47ac45c28c43c5 SHA512 b92823549ff468598424b30e77802b49f7f1606113608840762f048906f437524a2f79f3657b6aec5cf1b3b3e45fa88d1f5f9dbbed6d29d31b0ef0f40f1d58b9
+EBUILD blinker-1.4-r1.ebuild 650 BLAKE2B 71c252cef9bc852314e3faab8a60839a11fe872cccbe0387fd7da3cb69f63b72ff20cc61cdfa699ed0480318036657ffc3bd1f051b2f5d73098c04fc740fcfda SHA512 2436e69b4fc785a0366c880e3551652e42b10ed6a78bbfd46ff177eafce0f856dc5b413070a0ba046b12f9135023c7890f0e7520827b20843718319e104fc32e
 MISC metadata.xml 310 BLAKE2B 4300b6665f80282364e473ec1113f6cc1a2f33f81ebdd4c9a070a7565cd10d83026807ac49472fbbd0c09df5b58eeb18c407b3487a7de8780149b14bdcc09c0a SHA512 4712a1a048dd03c070785ebbefb637eade345c4959994d74643f9f521ebbc3c5477e38ad7628de967c13ceab3c906fd54db6322f8a32a43a47f3223cf8783250
diff --git a/dev-python/blinker/blinker-1.4-r1.ebuild b/dev-python/blinker/blinker-1.4-r1.ebuild
index 824547158018..22fa82c0a2b7 100644
--- a/dev-python/blinker/blinker-1.4-r1.ebuild
+++ b/dev-python/blinker/blinker-1.4-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="doc"
 
 distutils_enable_tests nose
diff --git a/dev-python/blockdiag/Manifest b/dev-python/blockdiag/Manifest
index 1bcf885a13df..1b929e94f813 100644
--- a/dev-python/blockdiag/Manifest
+++ b/dev-python/blockdiag/Manifest
@@ -2,5 +2,5 @@ AUX blockdiag-1.5.3-py2_7-test-fix.patch 551 BLAKE2B d7e44b823390b6338bdb2d33cbd
 DIST blockdiag-1.5.4.tar.gz 2693073 BLAKE2B 8a825742b4144667153af00d5e334325f8a3b49823355787dbd577729da8b0fc221ead14ab899ef8aef1800bbc2cdc47f060330bf0a2f2f1bcd055d172d8adbb SHA512 0eef8b3837282ed611e044ee618abca1f799b4a151bc2d7cece140c97ac728b2f3b9a3bb6877d3fed42a74e0173d0cbfd2966521c4dfb21c266975b4062405d2
 DIST blockdiag-2.0.1.tar.gz 2694776 BLAKE2B 289bbeab89dff4e8274efb9e2061b1e412e29bfbd663f64b55346ee09d09279e0813347c51b6cdc9e547b417eba637a85f7cb37f48006467bfa1c9875a113971 SHA512 07690882b05d4cf7be04245e183a7c54d9cd4acab3bb4b5e170b7b0f9229d6ea42eba4dc9fab47604c1572d3c4b09de96cffb610c0c31882b9c0b150f0e76d89
 EBUILD blockdiag-1.5.4.ebuild 1750 BLAKE2B ece073452af02fe443aeac91de5684691fd0f7cb61a59d3ffb115e68c9a4c450c652ba9ab6d0decef9bc37d44ccb4e723ecfe9702eff91a975d7e2758debd854 SHA512 14d788ec56261ac0ee8d7c9c64bdc3e57ca04e5ae1c17c114ee239846cd0e1e0fb8b1f071587207968abb4f4d34f67a7ca481c2f2d6cb5bcf8faeae211744fcc
-EBUILD blockdiag-2.0.1.ebuild 1686 BLAKE2B 22f52a02d176b94729e44931300f55cdf9f0ed305e373445e916eb62abdd40a5a7cd09dc5bc6f308be459496a516cfc4133d2b50d65ffc809517f04c55ac4e04 SHA512 184c036ad8a93e5fb9ea71031165e69ff1b6b084483064c22d59df325956274bbb11655127d05a9c329d761fbe2df43c9b848c5420eb807fab976ca06e7950a3
+EBUILD blockdiag-2.0.1.ebuild 1698 BLAKE2B ebf09c851a0ecd89c2b595bb38f9ce4c85c215aa6f2ab4cfc10919bde2bb0d6498332df82f21c14cfe87d9b3e0eae87e1f7d92a604957fc9a3721f78dae4f9d6 SHA512 a67c58b4372f2fe0b0c87586952dd9bf2a99a3831204faaba1b59f4f7c9a8d595c01721d0098e7794633fbeb4dc3bfb40e3a3c40633a7248c0e83b6ef3331fba
 MISC metadata.xml 749 BLAKE2B e61c5eeedb3b8fbdaf84f013ae7b59c9502385583fb24728810acb9bf1996ad6fa45a4719b1f34d59081ddebd331b161e43c1a6fc74c357ee138e646f20adc22 SHA512 f3733f81850b4e1c332207c31ffe1a371e021fc9628246dea2a74f45cb0aa2812afcbf7311279fe618071fd3da876da6d4343a057d7c939fe20bc15d052cca72
diff --git a/dev-python/blockdiag/blockdiag-2.0.1.ebuild b/dev-python/blockdiag/blockdiag-2.0.1.ebuild
index ccd2cec158a2..e01eb61ac595 100644
--- a/dev-python/blockdiag/blockdiag-2.0.1.ebuild
+++ b/dev-python/blockdiag/blockdiag-2.0.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/blosc/Manifest b/dev-python/blosc/Manifest
index 653e33608f22..872fb1660a4f 100644
--- a/dev-python/blosc/Manifest
+++ b/dev-python/blosc/Manifest
@@ -1,4 +1,6 @@
 AUX blosc-1.9.1-unbundle.patch 1066 BLAKE2B 28138077ebd4f2efe9abd0d87e8e894299fba8df755a322fc77c6d00546cb12e106520bfeec4f0e750b9943fe448db2c6d44e75972cc6db01c10777bc943999e SHA512 dde7c2184da44bf3ed0ea3c9241550b30ae918f785727c812478fc1c085bb7dde99180d3b02a965e7d1c7126ede3c53c5cef409299fd253e2893452174c277fa
 DIST blosc-1.9.1.tar.gz 809621 BLAKE2B fdeb76e5714d94a9992b59b99926a54457850c69d9d2c217b5a57cd8ce0d8886853ec139683a68c96d3a697b11f68163a7f267cd6060eacba78f595d4ff67d5d SHA512 61ed4e184c1a3e19a2556e5eb4f30030c00294af7b2d5b6c0641160db53c65756170c138229edd684f41606b2a3ae0b1c4f5e01495e74875e5123d7e1d8ed9c2
+DIST blosc-1.9.2.tar.gz 816897 BLAKE2B 7d1a2d925500c8ddb93975dd785c03b91dec2716a438915d5dfdb739c650de8a47ed80eb25fc55357e69b586c446c5af61212e0a4fba8158839a66849309f478 SHA512 a8f53afb7fb1bb742e2daa03015b636d4dbb1fd073be079022364ec67035c9e6ee372ab07f7ce06579b85d9fcaedd2a11f30b9cf5b2bd1d1ea62cf32a8aa3c1f
 EBUILD blosc-1.9.1-r1.ebuild 1029 BLAKE2B 47a75dcb1cd08369fec2fc4ed75e7e5567c64f96ca09c494c0549ac0b1ac3d682e5b66e319f2559b9a2e039b2329ff6f9c06278ea0db5059218c57baf234c0b6 SHA512 21a1c3b5c8d1fa4ed320375744a4dacc34957df0d688ddaf09af5ffcadd42648301ddc85f4cfe77daae4aa21a7f1365bc011f9dd283ae89bffbb86d0b352bd21
+EBUILD blosc-1.9.2.ebuild 1038 BLAKE2B e85b0a464acd94cc177215178f0e11144b0c407eaab501ef6ad9a1c8410621ff476225b5ca0139cc2a288c69ce4cbdfbe440f2422960617195b0d4c6f0636d3d SHA512 dd09497bce9535275b19f2604c7bf6ea425387167c05ab8b6f2b3ef38f241ac5fa8e4dd83b89d0cf448a635ffc28986a7e7ed00c4479237307af511ef2f90a48
 MISC metadata.xml 998 BLAKE2B 3630fcaea0c8e2e9062aa9f42c60b17b407fd5febb70d5d41b0a0c46f202f06afc79fc25072c1403c917caedfd6205e7133431fcfd40e74f8480852aee7e2299 SHA512 22ffa2acb28f4f6f9af18398681db0ddb5b19c7b125386c0eb24265f11ccba24f90977710f74af57a2de6e497c668fb17398da89a2b2ecc5ef552b201960450e
diff --git a/dev-python/blosc/blosc-1.9.2.ebuild b/dev-python/blosc/blosc-1.9.2.ebuild
new file mode 100644
index 000000000000..4ceec05a63cf
--- /dev/null
+++ b/dev-python/blosc/blosc-1.9.2.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=no
+PYTHON_COMPAT=( python3_{6..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="High performance compressor optimized for binary data"
+HOMEPAGE="http://python-blosc.blosc.org"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND=">=dev-libs/c-blosc-1.19.0:="
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-python/scikit-build[${PYTHON_USEDEP}]
+	test? (
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/numpy[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}"/blosc-1.9.1-unbundle.patch
+)
+
+python_prepare_all() {
+	export BLOSC_DIR="${EPREFIX}/usr"
+	distutils-r1_python_prepare_all
+	DOCS=( ANNOUNCE.rst  README.rst  RELEASE_NOTES.rst )
+}
+
+python_test() {
+	cd "${BUILD_DIR}"/lib || die
+	PYTHONPATH=. nosetests -v || die
+}
+
+python_install() {
+	distutils-r1_python_install
+	python_optimize
+}
diff --git a/dev-python/boto3/Manifest b/dev-python/boto3/Manifest
index fa8f4b37f0b7..4c552854bb7b 100644
--- a/dev-python/boto3/Manifest
+++ b/dev-python/boto3/Manifest
@@ -3,10 +3,18 @@ DIST boto3-1.14.31.tar.gz 300720 BLAKE2B 9dbd002e299c629f28037572c615a00612c8077
 DIST boto3-1.14.46.tar.gz 301815 BLAKE2B e389e7e0cd9ed0907fd13a948bf37e00040e32029d7720f5a720c8c9cb3cf1fb157bb665032b4ba594b3b5f50129088f26f004535fc4f8fe72f32ab0be6ce9b9 SHA512 aa1aa0155fcaaaddcfc24697211e8f5a69eab1282a185f0cb76b02d63d1426c02ca3be71be980214484a351159f6bcc34c3422cd11b9a556d67802c01a06aed0
 DIST boto3-1.14.49.tar.gz 301978 BLAKE2B ab27aab54b7e1b531ae063e3a84691820208d5d229664d07aaba4c184d5344eb2a620bd2cf4cd4dc4555cf014926c56c89ee29a9832d7ede4fa46b025914a135 SHA512 bc66702f869cb41c6c6dc7d6f82eb09c962122e108d02daf2c4ee408b7a805193f2f4f9af0c5c96775c8a79975142d1154a32c2fe86b0c6aacd18617ff2934c8
 DIST boto3-1.14.52.tar.gz 302219 BLAKE2B 97b93e7e203aba7e0dad8bdace83ac41fb85b5880473721543160dc19da52559db3e095edfea8e0946a8915e1a3c396de598b76a35221a64226d602199b8301e SHA512 f65473d91d45bfbd036413b63ee62688bdf9318a09fb81d7e83d5655b785a7b6b626ec7b61ddc1fef8f3fc46c7acb7becefb632d4ae931335a4568451596673d
+DIST boto3-1.14.55.tar.gz 302397 BLAKE2B 61785df9bfbe0668ff7b0537bb86b119ab3a98dc41cbe5118f550c81bb08cbec3c68249d9bffa1420088cd5b6a2aff2267dbeb16e52275e632ba88c8e709c8f3 SHA512 d51b0716f5148b5765e90d0a60146b5b06013e4a789eacfb798e5a4c114d4a8b9b07f5d74c0fa0b50b79e1704b7893d709bf87c9a2dd1d184bd477dbecd21a38
+DIST boto3-1.14.57.tar.gz 334506 BLAKE2B ba422426f36c55eb78e057d886abdb9a435839b4a842bf917e3e02d2f3f80c8c94bbf524ed4f3cab53ae627a9f1aeac41a790bebb72c94f52c73486dbcd3f13b SHA512 b772ec8d1c167e37515643796a569ba4258de24b9e4aa1a5022e140fc9121fdc02472231f36b8336e75115aabafa8dbc8c5422ce2ac137f3ead1202043b1c6c0
+DIST boto3-1.14.59.tar.gz 334641 BLAKE2B 96cd0750521715f030c2668cf21b7d6e5f53ffb9bcb84bc9fc540b1bea911591880385a3bd31447f924aa24cbdce873d17241d921b87e57d109173062dd27678 SHA512 9dddad6c71bac90803402b35a316f7177c26629e7e1b3cdadc6222e890d89dce4c2941174501705da85209220fe741f788654f5db164b2d9eac26cbba7cfb0d5
+DIST boto3-1.14.61.tar.gz 334755 BLAKE2B f0c5b5e9f74abaab03789deae1bbf9c5957d5d54af5cdc0c3a21deaed4945e104abeb59305ec1c692f2bcd2e99f7806ea4bd7fb9ae6194f194d74c9eeac4bf0a SHA512 6bec490d4d976585c5a8522998a4b3538dfdfc53416844779dbede2faa7d0d45bb10a6a566a777eaccd5d630202f6217178a386fbf3de5ef3c6395cda583f413
 EBUILD boto3-1.14.23.ebuild 1229 BLAKE2B 96cd59f3b6d4e9be48608381293cfef71ffc5fdbc4785e0fc61e7550a150219ea392724d60258c71a48798adf7c865301501ded5b6157731a6a8b278b2a07e9a SHA512 76ceac13c7b47f2653146eb37767355e4585931c5272c78645802a4f61744c765eda7d961b29dd114eff4b41f2309150ddafccdfb5dc94538636099b809cfa0c
-EBUILD boto3-1.14.31.ebuild 1350 BLAKE2B 32d6cf48455240fb127d359f94ab09e45ec78655fbd63a5a1f29cd5a2b3de2941599c7d7068abc186b6e25baf13456b5e52958879871a5a8fc338b87e087fceb SHA512 58d3f3b2a1c04252e9c7527ccb094ec7ca41c9191de1aab85b4f6b2c6babe0c95d43f189031d2c8d1da2b35689d3ece1c27cdced6ecdec596a286893e05a5f55
+EBUILD boto3-1.14.31.ebuild 1348 BLAKE2B 1d3c93a795e6201900f308d693c9357df15463155b255a7580fff7a4a1435fd252573af53c58bdd8411252105a54ecbd9a1bcff113b31a44dfca90cce6edf49b SHA512 1e5147e7c1c11ebbf07fbe8742455763ddafb1b3b0564e5e4459087d1fb5961a8aea607c6a71cf820c310438d3cecc12b083d23cbdeab22b181a431e1cfadefe
 EBUILD boto3-1.14.46.ebuild 1355 BLAKE2B b77544d9428e4a8306032b23d79f453bfd59e44a61fcc664506d8e3b8977478bebda0d6b7df403c5e2b00473f0b14bb8eff7ef2bd454597c7d5550a6c37e972e SHA512 e863b24a58b8a33b678c3bd7b9f26ae9fa924f9f9cbd6ae7e923f1f764c4c83852c6e15084e0614f6141ad4ba00596208c41e543b40cffa1eec9029b7ae09ed2
 EBUILD boto3-1.14.49.ebuild 1355 BLAKE2B b77544d9428e4a8306032b23d79f453bfd59e44a61fcc664506d8e3b8977478bebda0d6b7df403c5e2b00473f0b14bb8eff7ef2bd454597c7d5550a6c37e972e SHA512 e863b24a58b8a33b678c3bd7b9f26ae9fa924f9f9cbd6ae7e923f1f764c4c83852c6e15084e0614f6141ad4ba00596208c41e543b40cffa1eec9029b7ae09ed2
 EBUILD boto3-1.14.52.ebuild 1355 BLAKE2B b77544d9428e4a8306032b23d79f453bfd59e44a61fcc664506d8e3b8977478bebda0d6b7df403c5e2b00473f0b14bb8eff7ef2bd454597c7d5550a6c37e972e SHA512 e863b24a58b8a33b678c3bd7b9f26ae9fa924f9f9cbd6ae7e923f1f764c4c83852c6e15084e0614f6141ad4ba00596208c41e543b40cffa1eec9029b7ae09ed2
+EBUILD boto3-1.14.55.ebuild 1355 BLAKE2B b77544d9428e4a8306032b23d79f453bfd59e44a61fcc664506d8e3b8977478bebda0d6b7df403c5e2b00473f0b14bb8eff7ef2bd454597c7d5550a6c37e972e SHA512 e863b24a58b8a33b678c3bd7b9f26ae9fa924f9f9cbd6ae7e923f1f764c4c83852c6e15084e0614f6141ad4ba00596208c41e543b40cffa1eec9029b7ae09ed2
+EBUILD boto3-1.14.57.ebuild 1355 BLAKE2B b77544d9428e4a8306032b23d79f453bfd59e44a61fcc664506d8e3b8977478bebda0d6b7df403c5e2b00473f0b14bb8eff7ef2bd454597c7d5550a6c37e972e SHA512 e863b24a58b8a33b678c3bd7b9f26ae9fa924f9f9cbd6ae7e923f1f764c4c83852c6e15084e0614f6141ad4ba00596208c41e543b40cffa1eec9029b7ae09ed2
+EBUILD boto3-1.14.59.ebuild 1355 BLAKE2B b77544d9428e4a8306032b23d79f453bfd59e44a61fcc664506d8e3b8977478bebda0d6b7df403c5e2b00473f0b14bb8eff7ef2bd454597c7d5550a6c37e972e SHA512 e863b24a58b8a33b678c3bd7b9f26ae9fa924f9f9cbd6ae7e923f1f764c4c83852c6e15084e0614f6141ad4ba00596208c41e543b40cffa1eec9029b7ae09ed2
+EBUILD boto3-1.14.61.ebuild 1355 BLAKE2B b77544d9428e4a8306032b23d79f453bfd59e44a61fcc664506d8e3b8977478bebda0d6b7df403c5e2b00473f0b14bb8eff7ef2bd454597c7d5550a6c37e972e SHA512 e863b24a58b8a33b678c3bd7b9f26ae9fa924f9f9cbd6ae7e923f1f764c4c83852c6e15084e0614f6141ad4ba00596208c41e543b40cffa1eec9029b7ae09ed2
 EBUILD boto3-9999.ebuild 1350 BLAKE2B 32d6cf48455240fb127d359f94ab09e45ec78655fbd63a5a1f29cd5a2b3de2941599c7d7068abc186b6e25baf13456b5e52958879871a5a8fc338b87e087fceb SHA512 58d3f3b2a1c04252e9c7527ccb094ec7ca41c9191de1aab85b4f6b2c6babe0c95d43f189031d2c8d1da2b35689d3ece1c27cdced6ecdec596a286893e05a5f55
 MISC metadata.xml 668 BLAKE2B 0fd93bc75c34b2348e49e39aa58d6404fc0bdeac1129a1c5644262973b08fc3f9afe371fdf9ee87ff00fd0aaa18b86bfbdbf86394434661b5253ae9b5b9dacd4 SHA512 ab5ea5b31b95ce548c12ec80f2261b98fb0e51b34218c23bafbe7cc0ac792b0680b5886062c2a016bd58ceaf1cdebc7fabade37edae756851895257b1ef1fc59
diff --git a/dev-python/boto3/boto3-1.14.31.ebuild b/dev-python/boto3/boto3-1.14.31.ebuild
index 74bb826bd085..5ab88849a211 100644
--- a/dev-python/boto3/boto3-1.14.31.ebuild
+++ b/dev-python/boto3/boto3-1.14.31.ebuild
@@ -17,7 +17,7 @@ if [[ "${PV}" == "9999" ]]; then
 	BOTOCORE_PV=${PV}
 else
 	SRC_URI="https://github.com/boto/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
 
 	# botocore is x.(y+3).z
 	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
diff --git a/dev-python/boto3/boto3-1.14.55.ebuild b/dev-python/boto3/boto3-1.14.55.ebuild
new file mode 100644
index 000000000000..ccc99e1c2415
--- /dev/null
+++ b/dev-python/boto3/boto3-1.14.55.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6..9} )
+DISTUTILS_USE_SETUPTOOLS=bdepend
+inherit distutils-r1
+
+DESCRIPTION="The AWS SDK for Python"
+HOMEPAGE="https://github.com/boto/boto3"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/boto/boto3"
+	inherit git-r3
+	BOTOCORE_PV=${PV}
+else
+	SRC_URI="https://github.com/boto/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+
+	# botocore is x.(y+3).z
+	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
+fi
+
+RDEPEND="
+	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
+	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
+	>=dev-python/s3transfer-0.3.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx docs/source \
+	'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests nose
+
+python_prepare_all() {
+	# don't lock versions to narrow ranges
+	sed -e '/botocore/ d' \
+		-e '/jmespath/ d' \
+		-e '/s3transfer/ d' \
+		-i setup.py || die
+
+	# prevent an infinite loop
+	rm tests/functional/docs/test_smoke.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	nosetests -v tests/unit/ tests/functional/ || die "test failed under ${EPYTHON}"
+}
diff --git a/dev-python/boto3/boto3-1.14.57.ebuild b/dev-python/boto3/boto3-1.14.57.ebuild
new file mode 100644
index 000000000000..ccc99e1c2415
--- /dev/null
+++ b/dev-python/boto3/boto3-1.14.57.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6..9} )
+DISTUTILS_USE_SETUPTOOLS=bdepend
+inherit distutils-r1
+
+DESCRIPTION="The AWS SDK for Python"
+HOMEPAGE="https://github.com/boto/boto3"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/boto/boto3"
+	inherit git-r3
+	BOTOCORE_PV=${PV}
+else
+	SRC_URI="https://github.com/boto/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+
+	# botocore is x.(y+3).z
+	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
+fi
+
+RDEPEND="
+	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
+	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
+	>=dev-python/s3transfer-0.3.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx docs/source \
+	'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests nose
+
+python_prepare_all() {
+	# don't lock versions to narrow ranges
+	sed -e '/botocore/ d' \
+		-e '/jmespath/ d' \
+		-e '/s3transfer/ d' \
+		-i setup.py || die
+
+	# prevent an infinite loop
+	rm tests/functional/docs/test_smoke.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	nosetests -v tests/unit/ tests/functional/ || die "test failed under ${EPYTHON}"
+}
diff --git a/dev-python/boto3/boto3-1.14.59.ebuild b/dev-python/boto3/boto3-1.14.59.ebuild
new file mode 100644
index 000000000000..ccc99e1c2415
--- /dev/null
+++ b/dev-python/boto3/boto3-1.14.59.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6..9} )
+DISTUTILS_USE_SETUPTOOLS=bdepend
+inherit distutils-r1
+
+DESCRIPTION="The AWS SDK for Python"
+HOMEPAGE="https://github.com/boto/boto3"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/boto/boto3"
+	inherit git-r3
+	BOTOCORE_PV=${PV}
+else
+	SRC_URI="https://github.com/boto/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+
+	# botocore is x.(y+3).z
+	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
+fi
+
+RDEPEND="
+	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
+	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
+	>=dev-python/s3transfer-0.3.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx docs/source \
+	'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests nose
+
+python_prepare_all() {
+	# don't lock versions to narrow ranges
+	sed -e '/botocore/ d' \
+		-e '/jmespath/ d' \
+		-e '/s3transfer/ d' \
+		-i setup.py || die
+
+	# prevent an infinite loop
+	rm tests/functional/docs/test_smoke.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	nosetests -v tests/unit/ tests/functional/ || die "test failed under ${EPYTHON}"
+}
diff --git a/dev-python/boto3/boto3-1.14.61.ebuild b/dev-python/boto3/boto3-1.14.61.ebuild
new file mode 100644
index 000000000000..ccc99e1c2415
--- /dev/null
+++ b/dev-python/boto3/boto3-1.14.61.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6..9} )
+DISTUTILS_USE_SETUPTOOLS=bdepend
+inherit distutils-r1
+
+DESCRIPTION="The AWS SDK for Python"
+HOMEPAGE="https://github.com/boto/boto3"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/boto/boto3"
+	inherit git-r3
+	BOTOCORE_PV=${PV}
+else
+	SRC_URI="https://github.com/boto/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+
+	# botocore is x.(y+3).z
+	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
+fi
+
+RDEPEND="
+	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
+	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
+	>=dev-python/s3transfer-0.3.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx docs/source \
+	'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests nose
+
+python_prepare_all() {
+	# don't lock versions to narrow ranges
+	sed -e '/botocore/ d' \
+		-e '/jmespath/ d' \
+		-e '/s3transfer/ d' \
+		-i setup.py || die
+
+	# prevent an infinite loop
+	rm tests/functional/docs/test_smoke.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	nosetests -v tests/unit/ tests/functional/ || die "test failed under ${EPYTHON}"
+}
diff --git a/dev-python/botocore/Manifest b/dev-python/botocore/Manifest
index 0a83b3e05e1e..2a9c8d1c5dee 100644
--- a/dev-python/botocore/Manifest
+++ b/dev-python/botocore/Manifest
@@ -5,10 +5,18 @@ DIST botocore-1.17.31.tar.gz 6665851 BLAKE2B dbc89d1216f9fda89c6185baccfdf2878c2
 DIST botocore-1.17.46.tar.gz 6738493 BLAKE2B 2e5ee1241af91c19cef0ac575c5ad68d46277e8b2f0f1f719428f7b4026303a47e48b8a8240c1121cfe35c6310be5fde3f0cfa2aa3f3321249811eb510b47f94 SHA512 a11de252454477d478f2b5d0b5978b24961baa3942936ef5990c421709d0b8081e8dbf020b76cce5c3c43d3fe0467cedf5441918767163712e0ad178c9cba80d
 DIST botocore-1.17.49.tar.gz 6765351 BLAKE2B c5c40c37d1f1f0f1d7e059a1b88025039be6021723d244725de28d453789a51b19c4feed35d7c862a8238e5d2b4d77fb83f0b0052ce7a7b31c26e024b7be4321 SHA512 912a25c98fa08a89aa8511f00a83712525eaa11a1c8137da3e569a993c54d2c2a3c9566ff88f91cede34dc1d1b155f21ac037f2396b3b3339ddc2c2be7c400d1
 DIST botocore-1.17.52.tar.gz 6778122 BLAKE2B 4afb88a7990ca4cd04f113a75f00dcc26569102a3a3b8ad991073577178a86b56b607888ed8d70569affb03fc77d3f89060a1a34059dd33a457eff4f3c31eb5e SHA512 97de510725dcc2db9c57d7e9415f5c22fc30a2737c3785ffc32e53a56cb542dec06468b3a06bf03ae0ae2eb913628b68ca104b1e8f211e5c580606422e5f3267
+DIST botocore-1.17.55.tar.gz 6781012 BLAKE2B d9dac6d32ae6226bf80c79651f0d56c1b916a9e4b696c99c2921aae9759ff2c86df1f4682902ff4313d018c6514e24718228cd13219cdbd784b828faf3a8fc10 SHA512 941e773932db1a9fddf8476485c9b979803596a02017fa44c88667e833acd0b84fe8a2f9211c7791a20f08e947d93354bb995f03d915543ab5d24ebad683cbaf
+DIST botocore-1.17.57.tar.gz 6815839 BLAKE2B e135e4d0b889add8417d8a6ce97c475865859e8805077bc404010cf1c0d7da0eae27f49fc14eaffa86b0a45e5a49799a59fa6b3a7117d103976b0c1628a531db SHA512 244021f4ab9a2778917f91bcf0f26d868025e77bee0c592f81e8266721952b5ffcc3ec4fc7f1dc2b7e2b20faac8f0d4e8b8b47d72a89ff66386fc008b0781da1
+DIST botocore-1.17.59.tar.gz 6829639 BLAKE2B efacd4c875e17f187abd5c4602a82229ed2a9fd78e1987f1b540eb882d1a3ce7c23768f7f4b9dc26a678ff4ce48264f3893c0aa2a68511823f79686c21ecf82f SHA512 609eb24774384b95dd9b5bcf5931d263341fbbba90b84159c6833296c22d95c6cf8d304d6908713d9ba826858d8d226e0b5c700bb1410c3a9f7b2d679f535c40
+DIST botocore-1.17.61.tar.gz 6832886 BLAKE2B 1c63507dea98f4f4275effe190e7af1e3325ee03376676bdbab6eeca364540bd86c7253b1ab64a70d28cf2f5ae8182927c2f18ac86e0bac813d4ef11c37193c6 SHA512 606076103594fb6efee1fa79181449c0ffa37eb71b5f5c187f8046375ddf982f72741ba00a1d2311be893094b86dd9196ee33410a693727ea9502cf87332dcc0
 EBUILD botocore-1.17.23.ebuild 1597 BLAKE2B 7b0b186045fbb385188e87b9f81699e4392f667b870870fdff142b83e9baaddbbe6d6003466326f6652ebc9b274453b06a2d9c1a33277c852193a46170df493b SHA512 4d2900d96ab5a9eacb101f75543b47ff4069fe5d52ec5acf239ba432cd12abe53b655f7d291551a7b4485fe5022cccee93caeb5470214b5c1e20d4421a40dfc3
-EBUILD botocore-1.17.31.ebuild 1606 BLAKE2B 15b1624c806724dd4cf8f86099a4f9049214ab9c0afa47f0211c0a5f66fe37b6ecc03db5448bfb3b4764f8eda23e19ab9f37bbe1461837bf0dccfae7da17faa7 SHA512 b5e16cf97b370e96e814c413d80793684a1579d293bbaf16b435de83af274efb299dbe42fb824c955b28099c50841c46124c8212bd539861ff01b278e6a7ee3d
+EBUILD botocore-1.17.31.ebuild 1604 BLAKE2B 0bb052c0188f579688abebe441fa1d753ed0c3cf511037d3e1966071e0e5f7870b69f8c59911880777e18889f02687bac2b4c3c8ff0f91e6e496b90698173594 SHA512 cabd9436df70d53248ccb5afabb6533a859877a6f84236709f281ddda3967ec7df4247210bafb7b9d0ec979f087738e71ebea2de60c9806f5e5bc9722244e1d8
 EBUILD botocore-1.17.46.ebuild 1611 BLAKE2B 3b63a581ad997b3d17ec4c2124b391537420fd0ef91f18f0071be34cfe13d70241006384d64fa577b1088d8e5664a8260c008959a6ba102bd13c68117618d010 SHA512 8c7cacf4ed5b422db3a065281bc26b7e582c852807df75949e8324127c93a230106a71c3dd96f09de00ee4d30f31ee8a77a97513bf7b76c1c39bc4d891748303
 EBUILD botocore-1.17.49.ebuild 1611 BLAKE2B 3b63a581ad997b3d17ec4c2124b391537420fd0ef91f18f0071be34cfe13d70241006384d64fa577b1088d8e5664a8260c008959a6ba102bd13c68117618d010 SHA512 8c7cacf4ed5b422db3a065281bc26b7e582c852807df75949e8324127c93a230106a71c3dd96f09de00ee4d30f31ee8a77a97513bf7b76c1c39bc4d891748303
 EBUILD botocore-1.17.52.ebuild 1611 BLAKE2B 3b63a581ad997b3d17ec4c2124b391537420fd0ef91f18f0071be34cfe13d70241006384d64fa577b1088d8e5664a8260c008959a6ba102bd13c68117618d010 SHA512 8c7cacf4ed5b422db3a065281bc26b7e582c852807df75949e8324127c93a230106a71c3dd96f09de00ee4d30f31ee8a77a97513bf7b76c1c39bc4d891748303
+EBUILD botocore-1.17.55.ebuild 1611 BLAKE2B 3b63a581ad997b3d17ec4c2124b391537420fd0ef91f18f0071be34cfe13d70241006384d64fa577b1088d8e5664a8260c008959a6ba102bd13c68117618d010 SHA512 8c7cacf4ed5b422db3a065281bc26b7e582c852807df75949e8324127c93a230106a71c3dd96f09de00ee4d30f31ee8a77a97513bf7b76c1c39bc4d891748303
+EBUILD botocore-1.17.57.ebuild 1611 BLAKE2B 3b63a581ad997b3d17ec4c2124b391537420fd0ef91f18f0071be34cfe13d70241006384d64fa577b1088d8e5664a8260c008959a6ba102bd13c68117618d010 SHA512 8c7cacf4ed5b422db3a065281bc26b7e582c852807df75949e8324127c93a230106a71c3dd96f09de00ee4d30f31ee8a77a97513bf7b76c1c39bc4d891748303
+EBUILD botocore-1.17.59.ebuild 1611 BLAKE2B 3b63a581ad997b3d17ec4c2124b391537420fd0ef91f18f0071be34cfe13d70241006384d64fa577b1088d8e5664a8260c008959a6ba102bd13c68117618d010 SHA512 8c7cacf4ed5b422db3a065281bc26b7e582c852807df75949e8324127c93a230106a71c3dd96f09de00ee4d30f31ee8a77a97513bf7b76c1c39bc4d891748303
+EBUILD botocore-1.17.61.ebuild 1611 BLAKE2B 3b63a581ad997b3d17ec4c2124b391537420fd0ef91f18f0071be34cfe13d70241006384d64fa577b1088d8e5664a8260c008959a6ba102bd13c68117618d010 SHA512 8c7cacf4ed5b422db3a065281bc26b7e582c852807df75949e8324127c93a230106a71c3dd96f09de00ee4d30f31ee8a77a97513bf7b76c1c39bc4d891748303
 EBUILD botocore-9999.ebuild 1606 BLAKE2B 15b1624c806724dd4cf8f86099a4f9049214ab9c0afa47f0211c0a5f66fe37b6ecc03db5448bfb3b4764f8eda23e19ab9f37bbe1461837bf0dccfae7da17faa7 SHA512 b5e16cf97b370e96e814c413d80793684a1579d293bbaf16b435de83af274efb299dbe42fb824c955b28099c50841c46124c8212bd539861ff01b278e6a7ee3d
 MISC metadata.xml 717 BLAKE2B 6b5923518aebfebb4ac5de56ccc51b6d665b81870d4cdd915265ddef063db42dc9b0a4814c8cec71b44cb1aec7050797f6e2ec8f2a499b6c2e16d9cf312f7fb2 SHA512 fef7663fe63c373d775e419b5b5cfc63a896adf32a177e856c42ebf1c7574b3956fa989c30428d9ce69b19ecf68e553f19885fef46cbcaf7b434e27b15022b54
diff --git a/dev-python/botocore/botocore-1.17.31.ebuild b/dev-python/botocore/botocore-1.17.31.ebuild
index 6b14dce9712f..4b8203526dbf 100644
--- a/dev-python/botocore/botocore-1.17.31.ebuild
+++ b/dev-python/botocore/botocore-1.17.31.ebuild
@@ -16,7 +16,7 @@ if [[ "${PV}" == "9999" ]]; then
 	inherit git-r3
 else
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
 fi
 
 RDEPEND="
diff --git a/dev-python/botocore/botocore-1.17.55.ebuild b/dev-python/botocore/botocore-1.17.55.ebuild
new file mode 100644
index 000000000000..8737f742498b
--- /dev/null
+++ b/dev-python/botocore/botocore-1.17.55.ebuild
@@ -0,0 +1,62 @@
+# 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="Low-level, data-driven core of boto 3"
+HOMEPAGE="https://github.com/boto/botocore"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+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/six[${PYTHON_USEDEP}]
+	dev-python/docutils[${PYTHON_USEDEP}]
+	dev-python/jmespath[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	dev-python/urllib3[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/jsonschema[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/1.8.6-tests-pass-all-env-vars-to-cmd-runner.patch"
+	"${FILESDIR}/botocore-1.16.7-unlock-deps.patch"
+)
+
+distutils_enable_sphinx docs/source \
+	'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests nose
+
+src_prepare() {
+	# py3.9
+	find -name '*.py' -exec \
+		sed -i -e 's:cElementTree:ElementTree:' {} + || die
+	# very unstable
+	sed -i -e 's:test_stress_test_token_bucket:_&:' \
+		tests/functional/retries/test_bucket.py || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	# note: suites need to be run separately as one of the unit tests
+	# seems to be leaking mocks and breaking a few functional tests
+	nosetests -v tests/unit ||
+		die "unit tests failed under ${EPYTHON}"
+	nosetests -v tests/functional ||
+		die "functional tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/botocore/botocore-1.17.57.ebuild b/dev-python/botocore/botocore-1.17.57.ebuild
new file mode 100644
index 000000000000..8737f742498b
--- /dev/null
+++ b/dev-python/botocore/botocore-1.17.57.ebuild
@@ -0,0 +1,62 @@
+# 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="Low-level, data-driven core of boto 3"
+HOMEPAGE="https://github.com/boto/botocore"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+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/six[${PYTHON_USEDEP}]
+	dev-python/docutils[${PYTHON_USEDEP}]
+	dev-python/jmespath[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	dev-python/urllib3[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/jsonschema[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/1.8.6-tests-pass-all-env-vars-to-cmd-runner.patch"
+	"${FILESDIR}/botocore-1.16.7-unlock-deps.patch"
+)
+
+distutils_enable_sphinx docs/source \
+	'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests nose
+
+src_prepare() {
+	# py3.9
+	find -name '*.py' -exec \
+		sed -i -e 's:cElementTree:ElementTree:' {} + || die
+	# very unstable
+	sed -i -e 's:test_stress_test_token_bucket:_&:' \
+		tests/functional/retries/test_bucket.py || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	# note: suites need to be run separately as one of the unit tests
+	# seems to be leaking mocks and breaking a few functional tests
+	nosetests -v tests/unit ||
+		die "unit tests failed under ${EPYTHON}"
+	nosetests -v tests/functional ||
+		die "functional tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/botocore/botocore-1.17.59.ebuild b/dev-python/botocore/botocore-1.17.59.ebuild
new file mode 100644
index 000000000000..8737f742498b
--- /dev/null
+++ b/dev-python/botocore/botocore-1.17.59.ebuild
@@ -0,0 +1,62 @@
+# 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="Low-level, data-driven core of boto 3"
+HOMEPAGE="https://github.com/boto/botocore"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+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/six[${PYTHON_USEDEP}]
+	dev-python/docutils[${PYTHON_USEDEP}]
+	dev-python/jmespath[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	dev-python/urllib3[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/jsonschema[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/1.8.6-tests-pass-all-env-vars-to-cmd-runner.patch"
+	"${FILESDIR}/botocore-1.16.7-unlock-deps.patch"
+)
+
+distutils_enable_sphinx docs/source \
+	'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests nose
+
+src_prepare() {
+	# py3.9
+	find -name '*.py' -exec \
+		sed -i -e 's:cElementTree:ElementTree:' {} + || die
+	# very unstable
+	sed -i -e 's:test_stress_test_token_bucket:_&:' \
+		tests/functional/retries/test_bucket.py || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	# note: suites need to be run separately as one of the unit tests
+	# seems to be leaking mocks and breaking a few functional tests
+	nosetests -v tests/unit ||
+		die "unit tests failed under ${EPYTHON}"
+	nosetests -v tests/functional ||
+		die "functional tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/botocore/botocore-1.17.61.ebuild b/dev-python/botocore/botocore-1.17.61.ebuild
new file mode 100644
index 000000000000..8737f742498b
--- /dev/null
+++ b/dev-python/botocore/botocore-1.17.61.ebuild
@@ -0,0 +1,62 @@
+# 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="Low-level, data-driven core of boto 3"
+HOMEPAGE="https://github.com/boto/botocore"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+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/six[${PYTHON_USEDEP}]
+	dev-python/docutils[${PYTHON_USEDEP}]
+	dev-python/jmespath[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	dev-python/urllib3[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/jsonschema[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/1.8.6-tests-pass-all-env-vars-to-cmd-runner.patch"
+	"${FILESDIR}/botocore-1.16.7-unlock-deps.patch"
+)
+
+distutils_enable_sphinx docs/source \
+	'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests nose
+
+src_prepare() {
+	# py3.9
+	find -name '*.py' -exec \
+		sed -i -e 's:cElementTree:ElementTree:' {} + || die
+	# very unstable
+	sed -i -e 's:test_stress_test_token_bucket:_&:' \
+		tests/functional/retries/test_bucket.py || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	# note: suites need to be run separately as one of the unit tests
+	# seems to be leaking mocks and breaking a few functional tests
+	nosetests -v tests/unit ||
+		die "unit tests failed under ${EPYTHON}"
+	nosetests -v tests/functional ||
+		die "functional tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/bottle/Manifest b/dev-python/bottle/Manifest
index 008e9bce4a6d..4801dbc01e59 100644
--- a/dev-python/bottle/Manifest
+++ b/dev-python/bottle/Manifest
@@ -1,4 +1,4 @@
 AUX bottle-0.12.8-py3.5-backport.patch 1720 BLAKE2B 63081eee3765d060d7381a0eeca97fde17367273b0308449678301f0d2ed9357c90881aeeff31c6a26920ff256b76b0567a74628499fb4d9f2325bc75de6a2e8 SHA512 10f8b95d77d35db582be9bb937ca0c52050c22faa191f373b34039c6ddec24a8e71ce26f6bc9c3f3af7973670343b2f3131c02ed626e3d161a636f8c9e4cdd2b
 DIST bottle-0.12.18.tar.gz 71557 BLAKE2B a34cc1ab9a2a8505b7fda8bbddbae30b4e6c4829cae53f0f886237a21fdfa7f2b2463b216d7a16464539f41bdce4c1dabb5cc66027b8fdd19b10e9a78a3cdbb5 SHA512 db8a341cd80d755205518bb9eac5b79dca9e541ab3ad9d9d57f891d895f7df75a8facd16b068cbdf7c4f884f35e384449f4cbd565a43e9c5d000d3a9f5b7dcb0
-EBUILD bottle-0.12.18.ebuild 1392 BLAKE2B b2ab908a5488f43f1b8aaf907659694649cdf6de00fc5b394adacbd5a3d5b0c83a974e99442e722ea2e7b6b4fd987ec8ad108936367238c06149a60877c18e3c SHA512 4d205c9cfb32896f1118a0ceb28983b2c8761dd56b47b1f01d1151d22d2f6b0e750f2a48c67f326af38caa1c39923d9c46a73360649612a5462ae90887d87725
+EBUILD bottle-0.12.18.ebuild 1396 BLAKE2B 6aa00636d51539b58ff18a2ab1d3a8edaaa1d548a19820b3d1d2f5d4ad86e6299db1d8c2a0750e7c532d892d3e68120a7896b0378327fb40873fc99017716171 SHA512 1f32b5de27304dc877bd40b3e43c0d8fa8dbf5b9cec2c78b72f63f93edb4afbbaba286489fe29d3da4b17ca568d5548d0141b3c64a40f54a4a4de30aff228fab
 MISC metadata.xml 319 BLAKE2B 29a2c856ee0a0af9214a5cec842b697fcb095d2bcf4702225b2e81d4f715967c29a383da78c43ac60d4464e27e651e81f1b085684b0b6f39925a6df7c36a54c4 SHA512 2ff50f032ea6042a32a7d391906ff95d00115367770423874aa6ee638b1db03fc0b7fabc484e1ecc002eff1e5abf5d45075463b76b7d512535d4820c46b56251
diff --git a/dev-python/bottle/bottle-0.12.18.ebuild b/dev-python/bottle/bottle-0.12.18.ebuild
index 1e518dc8bb12..b03629e58814 100644
--- a/dev-python/bottle/bottle-0.12.18.ebuild
+++ b/dev-python/bottle/bottle-0.12.18.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 PYTHON_COMPAT=( python2_7 python3_{6,7,8,9} pypy3 )
 
-inherit distutils-r1 eutils
+inherit distutils-r1 optfeature
 
 DESCRIPTION="A fast and simple micro-framework for small web-applications"
 HOMEPAGE="https://pypi.org/project/bottle/ https://bottlepy.org/"
diff --git a/dev-python/breathe/Manifest b/dev-python/breathe/Manifest
index 526f41a2bcb8..84871d6f7e29 100644
--- a/dev-python/breathe/Manifest
+++ b/dev-python/breathe/Manifest
@@ -1,3 +1,3 @@
 DIST breathe-4.14.1.tar.gz 69369 BLAKE2B 93c394d7174aff8e8e8b1c95435d88c5f344ea1a26f46e9ef6ea8e7457bb9650d0cce96d03bc5c23e58704e3dcda3228ef1a61b16cd9ab45b07c2f1989eea88f SHA512 7247aae71c8e3e2491b76e6a5889fd9b97100e921e8c724c26e6c75b904c4e5dca825ae824b015f156960d5afbbf622b29535a46261c7fa0c24dd52deb46d096
-EBUILD breathe-4.14.1.ebuild 759 BLAKE2B fe884f108ee5abb70e29d32df9f397aab95c6fd2d4bb5910b4255d93d83002597ded5e0d30a3f722e8b61dcdad7d44f4ab04c4805e562ca3fa44eef75f969689 SHA512 482b059395d3bed3751af362633997abef9bf0d11a183ffa430f924d0ce445029002d5f69c506ea3fd237cf8681bb2e8ad5010fa220f9667885a612c96796d0c
+EBUILD breathe-4.14.1.ebuild 758 BLAKE2B fced61c688f9496422adb3267165824904c93b4959107d87a84d7368168e8ac124c4c927a6df2590cc059368c16fd9db2b6b6dcd862c859a3cd00d0c3c5dce2b SHA512 b693afa217365628e5606be195d1e96a44ed6522e9aeacc06674df15034524bb8f62a3164efeff9550b24ab2c21dad83c5d9be7cf4a638416f476665703fbf33
 MISC metadata.xml 796 BLAKE2B 5f7541beb0113e83fb387eadfbbefea4bfe9d6a172c61fd60a2de473ec9e61f1a941d768350526de1464ff0ebbc58dabf13e7be3e38cac1d3a3cbcd791260d40 SHA512 734fa318039a2831c3cd35fa9f710739406b627f1e0f1d34c772d1d9dae53ea6921c21a236cabf00e3a1d3d2e95f053ea39436b1f539d9fa0c2bf1abbaf9018f
diff --git a/dev-python/breathe/breathe-4.14.1.ebuild b/dev-python/breathe/breathe-4.14.1.ebuild
index 00ffeb74ad38..a9bf669f7e1b 100644
--- a/dev-python/breathe/breathe-4.14.1.ebuild
+++ b/dev-python/breathe/breathe-4.14.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	app-doc/doxygen
diff --git a/dev-python/brotlipy/Manifest b/dev-python/brotlipy/Manifest
index edad4878f17e..d5e447227c9f 100644
--- a/dev-python/brotlipy/Manifest
+++ b/dev-python/brotlipy/Manifest
@@ -1,5 +1,5 @@
 AUX brotlipy-0.7.0-test-deadline.patch 913 BLAKE2B f7a57989defc3cbc6aa0f29d9db73d7aaf5abae22609b4d501699b4e5195f50fa8025feee64e7935584868d5100f3e088abcc2086056058464f3f4ad14a939e6 SHA512 c125622a149582b0e45397877f4f609ced2d9b388ed101a7a5c0bdbdbb849093538be5ba12e6d549c7a9fea1df3c74dc8dcc3d4bc894bb2ebae0117440b1d5af
 DIST brotli-46c1a881b41bb638c76247558aa04b1591af3aa7.tar.gz 19840371 BLAKE2B b9a1c3c2e5b62bd63b392debe54bd1732ac1cb31f88500f0142108b453649d96901d9a03b6db98642cb9abaf9188c06d440f2b8bd3cf57fbbb52196a931f5079 SHA512 dc573c90491032a205f32f0ce9c93e95b06c70a3107caa9501e038a212226c37117d63709a29843367344bf7d18cf32d0c0578b11166387198e12b38b1522406
 DIST brotlipy-0.7.0.tar.gz 19375 BLAKE2B 035dc8757e491bc4fc0d8e2b6b82703eecc8f6f4150da42fda0f6c6f42a617519f5191371eb1dd976b8bbfeab88845bb018b874a395cdbf0ff409a6911f969f5 SHA512 bec8183cf3cc8ba9e594d1a86a8a33d88a6ac8e9c6a6287c837bda3726183ff1b486f2c49da4e489b5b3cb51b57dd5816413b59419920c2ced48435221f1beaf
-EBUILD brotlipy-0.7.0-r2.ebuild 1529 BLAKE2B 6ee9a711fdc17449851ffba3f62c2dbfe0cf735e3d902a4be0dde058ce02caf70883a65adeac9ecb015c14535a9d6b1009bd80fa161c1c4bfa13f6893898b5e8 SHA512 3ae732bea20c9b65aaab02a93ef0d714e8ac0a1a95e4b40a5a5debb371217dc3cc8ac98e5712bc0cf0954e14f93287a2959480d1cbbd0b0a6a70524025552a7e
+EBUILD brotlipy-0.7.0-r2.ebuild 1536 BLAKE2B 19c85f7a8cd2880e5160d0ef1f94bda5b52362582ff15712b9985bd0f4dcc5e2a3f367d56b7a882441b5108e4473861f8c732f8016a4ddd54859d2e6b6a54607 SHA512 0c01c9f7ac5aa63285e5b0f00c44081b8af979957843738d3fba95025bcf7be0ed9c4323542c724fd4a1ee7de0852767e0a4d962596e241b7534af6e4153d94a
 MISC metadata.xml 240 BLAKE2B 41e6a4d9da33dab2decc5ff419924f382a8f64d27a81fdb97576db8c6cf125be95911747946ec8be1b453f56617fef1084f5947f84b50a8db419d46df2ae8a0f SHA512 9c23321eaa853f851bf00195ea64ac2ba093e516f9b57855ee5aa58fbb1988130c9f0c17c2a9ce9fae4ee033e0a28a70c868e0f5acdfa1dd316ab533c5279d59
diff --git a/dev-python/brotlipy/brotlipy-0.7.0-r2.ebuild b/dev-python/brotlipy/brotlipy-0.7.0-r2.ebuild
index c5cb8d92c103..58775effc736 100644
--- a/dev-python/brotlipy/brotlipy-0.7.0-r2.ebuild
+++ b/dev-python/brotlipy/brotlipy-0.7.0-r2.ebuild
@@ -19,7 +19,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
 
 # module name collision with app-arch/brotli
 RDEPEND="
diff --git a/dev-python/cached-property/Manifest b/dev-python/cached-property/Manifest
index b9253d97814e..5e7503aab2f2 100644
--- a/dev-python/cached-property/Manifest
+++ b/dev-python/cached-property/Manifest
@@ -1,4 +1,4 @@
 AUX cached-property-1.5.1-test-failure.patch 366 BLAKE2B 1df343e43fb74df2913c222d2a1f37e703de34480e325df68feee7575682005be6d0f41f34e553c3ec2cde11c6907b1d79a73e67ac88c5691e366b7bc64d6970 SHA512 bf005bbb986140dab7949e015ee9453081b72a9c377b6f330f8ffac10f73d7ec0e2a2e20c9d65879c3c18b3c4b2735b3329b30f48e1e4bd01ece475833f2a58c
 DIST cached-property-1.5.1.tar.gz 12791 BLAKE2B dcc75564d3b1dbb2f34ea433f4a477b2fe0454047f1fb4825cc6350458bf09509cf970b308744d79eb3b17f96c04c606ad36327c7e24f0b13f412880d9ad2ab7 SHA512 61bbedb48336af7c0b465421eb4d3b6b48155cfe4fd6270ff49caefe0d80e40b50c4801a68a5564931d316e374b69112ad14f72687a015ce81aaeade6fcf9ce3
-EBUILD cached-property-1.5.1.ebuild 727 BLAKE2B fa754a05805aee91ea5b02d1a478b03e79bcbe9a2787fc10bfd237bc6e07e0b712d20e740d3ad5aba108bde97547a275aa15d2fc3c6c8f310ddded64a8d19974 SHA512 1359667eae48f4cd9abbd8c6b09139ee6e41179c5806d0971387607f58f1ad5c66f7a2ac630050e6a75e43ff566302e949b98fb8b3a65560345bea0bf98cf112
+EBUILD cached-property-1.5.1.ebuild 734 BLAKE2B 91ddd373e81a52e94d4b47734ef73eb6db428480c87f2370f16a108906fda14cc75245a17873cccb55600141542b4c3a459f252dd116afa23cc2d14a9a3f1da4 SHA512 e7f4a1da8a0427f7c83c0357f0af3b45b5380b79fced679c5308095f71cac0951e47e6c8ed7d663b59027203a8bea0452b9eea981bddd08fb937b5988e002556
 MISC metadata.xml 486 BLAKE2B e012a6b1d4e8ab99e6f89b18a31d548b5e26887dcf7985cf5a6c500fe4a751c7e2f4b0a055e8afa9ba09ab20af3cdd206c902521f878872e920858a3b9f649cc SHA512 8c3e98d3d89a58505c4cf4a1cb15559c43be2a184bdd4cd696b023f58001cb65064ddb938ea792c51fd29808512bbfb30580ff2ac9509aab92e0c53c4de08afc
diff --git a/dev-python/cached-property/cached-property-1.5.1.ebuild b/dev-python/cached-property/cached-property-1.5.1.ebuild
index 04b4c9817683..93d8fa7b6b6d 100644
--- a/dev-python/cached-property/cached-property-1.5.1.ebuild
+++ b/dev-python/cached-property/cached-property-1.5.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ppc64 x86"
+KEYWORDS="amd64 ~arm64 ppc64 x86"
 
 DEPEND="test? ( dev-python/freezegun[${PYTHON_USEDEP}] )"
 
diff --git a/dev-python/cairocffi/Manifest b/dev-python/cairocffi/Manifest
index 3a0cb78634a8..7fef65a4e7ea 100644
--- a/dev-python/cairocffi/Manifest
+++ b/dev-python/cairocffi/Manifest
@@ -4,6 +4,6 @@ DIST cairocffi-0.8.0.tar.gz 79217 BLAKE2B fefcee32e486c150d089b7d13b046c864b83fc
 DIST cairocffi-0.9.0.tar.gz 84652 BLAKE2B 9f09c038619b0f44c568d6636861b0e12ffd7e9ab546f3a65bbd8e77eee7ff5f0c6f4d92a841696492b786d0067af86e25949b723ef6ef73ede370fbf2576d6d SHA512 0d3d54e0d54b3696c8336d8b3a6d745628da51d9d9f8c50f36006c007e1432a95dd9bafd8d865923059d040cc4e9f7989b3670a5318383b357ffc979eeb920d5
 DIST cairocffi-1.1.0.tar.gz 68744 BLAKE2B 604812572bb1a39ab52e41e03714acc93ddc7532e07ac36b693f53ad71cf0bcfd5d2f3bceb56b8e352fe7f179b174a244238b9cfcee690cbc0cb96e5b2934c75 SHA512 a9bc9ec5be767388aad9d06cc3b386b474dbacf097d3558b4033834cfb2f5418eede2f4b4080bec7e4725c6821f6e54d6c3366e8c4ee73bd3fa1cf444b395197
 EBUILD cairocffi-0.8.0-r1.ebuild 961 BLAKE2B 1d0a9cb41737b18a356c3edf2b3659007fbf4ad3ebd161fa10cba51c87f1d9135368e6dad1e6d2018c7602313bb263d7becaa34675da26da2f44c108cacb2026 SHA512 75161a3bc22139d5196831ea4bf70a61fcdf7b04c54361da157e6d903ab463e7a582c475a0220065c5f8250a383d9c8dff881bce8e7cab939156f0f6ca6276a3
-EBUILD cairocffi-0.9.0-r1.ebuild 1143 BLAKE2B 9358b64213b6a41020163076b88f9e553462e4fcceca326c10eec0203d9e4d058218164b94aa348ccf19b5fd082d4a9345f596809d2032dd3f4f07d10b6d80ba SHA512 83defdcf8d2ef9db15b6cc388a5bac489f0423929d0a271601cea2078bcbf407424726a31dca2c0f579739d181fe2b615754ad10e2055e7d6770ee7222f7775f
+EBUILD cairocffi-0.9.0-r1.ebuild 1142 BLAKE2B 3eca594349b578e607fb6fb4d908d29116c60134f8ef19eb78a52bbb1851559daeb61a311eb85fd168381d357559b36f107ef497c080f1c28c090d2966e93b7d SHA512 e55dfc5bc38205a174c03bae7e90a984449358b232ef846108936e31aa43fe3c218e0f528e0dcc4657299611421b21614e0c5fdb829d32fd226b46a32e8634d4
 EBUILD cairocffi-1.1.0.ebuild 781 BLAKE2B fd97362eea8415a40d9cc60e7bfca532b3f095c2ce3cac892269c6bfd6865ba8b79fddbcb1640ecf8ecb798d5295dc311a7fa47d3d50d87f601dab22257e2d8a SHA512 2a0e41a651bc2918ffe90624ede77ae31d6a7e6cba871ac0c416efcc22cff4f6032817438a67a8e9eb9af2d0230c9bac580cc5f79c29e64cff9d18f9003ee8a9
 MISC metadata.xml 379 BLAKE2B 75baee69a9fff6d3c571bded0b1e6cfd8abbdfae7262faa2215fb3251ace498c33119ebe3bf74e4e4e0b2d1ba620b9bc60d4daf244917098e17c62af24d4b401 SHA512 b0bdbb3b144675f9e90a0421c694e0f0a782dbf315dd8203574bea69b9389d49d377797a28d9d86588d062e15071c1fe226dd4166a4fbf8e95a852d46cc20215
diff --git a/dev-python/cairocffi/cairocffi-0.9.0-r1.ebuild b/dev-python/cairocffi/cairocffi-0.9.0-r1.ebuild
index 876b548c4b6f..53ff6e8a9f86 100644
--- a/dev-python/cairocffi/cairocffi-0.9.0-r1.ebuild
+++ b/dev-python/cairocffi/cairocffi-0.9.0-r1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc ppc64 x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/casttube/Manifest b/dev-python/casttube/Manifest
index 840cb7a3d59f..552a6ccdb91c 100644
--- a/dev-python/casttube/Manifest
+++ b/dev-python/casttube/Manifest
@@ -1,3 +1,3 @@
 DIST casttube-0.2.0.tar.gz 3760 BLAKE2B d4e37fb0e98f2e9197e7e1a78b45109d0319f9b4337ef86d0dcd5797e703960162432990b9c4d26796ce5cc957179023044b86a9b07c8e581d13373889c6c824 SHA512 0ab69a92d49a9095c0adb70fec95011447d1f2a57e7642504d2ab4f19fc5f93b09db0e5d277bf7876311e5f26067a687bde58e3aa12469dcc6778486fc19c836
 EBUILD casttube-0.2.0.ebuild 524 BLAKE2B 489b7f9b235d1a09621092ab2f3b546edc968944bfa531b26022aa3afdfdc791eeb5721ced4ba3cd8f501c6c1722bd17b218bbe6da604f6ba42e0943043f3ce0 SHA512 28adadfa6a157353446927d56a1572cfdadcc8e86f3bf78f1ccc0b5f048cfab5eefa2717cb98c4bc7e51b4292952a04f8bca2814032a5b1879cf5cab3bced325
-MISC metadata.xml 454 BLAKE2B 4e344ff1bd14e77af4be34248975293d7a1539e2c3d639319da62d410617469de124e17e7e9b93e08b9a304db1bd6c85474fa4532e91e5e47059ef0f8b15237d SHA512 f3e86a08b9b0507e69dd28fa09461909957f2867d043fadfd369e9894f12cffd89254cbc67f97bf4d7cf3e8831b085a9532a6aac81090ee204a17ad9a3728e3b
+MISC metadata.xml 333 BLAKE2B 1a681ac99aee289a919b530bb87037df6fe53b044ce14ce3a9da3cec54a73d7fde58cf01f12678f18397d16b56c9e5bf88d289ddec4469e343d7193502124124 SHA512 a73512d246562e6591eb9c8d13759352cede7f0ae978d02c87bd72b1fe2c9b155cc3908e8489b136387bada61f1257d8e0771e01e26d998b51f9ce13c087ec41
diff --git a/dev-python/casttube/metadata.xml b/dev-python/casttube/metadata.xml
index 09f75100735c..3ee70120def4 100644
--- a/dev-python/casttube/metadata.xml
+++ b/dev-python/casttube/metadata.xml
@@ -8,7 +8,4 @@
 		<email>prometheanfire@gentoo.org</email>
 		<name>Matthew Thode</name>
 	</maintainer>
-	<longdescription lang="en">
-			casttube provides a way to interact with the Youtube Chromecast api.
-	</longdescription>
 </pkgmetadata>
diff --git a/dev-python/celery/Manifest b/dev-python/celery/Manifest
index d167b644d031..7833d048ca9a 100644
--- a/dev-python/celery/Manifest
+++ b/dev-python/celery/Manifest
@@ -1,5 +1,5 @@
 AUX celery.confd-r2 1442 BLAKE2B df6ab3585c12fef2272979ad3412f08827f59e9306b7b997642ee8bd0d4c84b168f32fd9b6427be3c889af411806d37673853588999d366b549908891491bd6e SHA512 ba3172e56a18df963b5886497c51b8aaf5298b5f3055214217561c8c691678b44c762d4f68f96e597807630af4d9185b7a9d557d13f7ffe25fc0092abcd09354
 AUX celery.initd-r2 4303 BLAKE2B 259821a93fc84c45580e06bcb4aa36b72a26290c917afea86b6e095489a1abde7b00f3ed91fa699452b4b7635d71bd72fd12ef9f46a3452f1f0d69c841c83b29 SHA512 722b5d526cad15589a4c26c4871c11255f8f1550b6d6a9d503962c07a6c60167d411f47135d55408acb6320636f885fff28e7691d74831ec1c2bb9d5dc48f3e2
 DIST celery-4.3.0.tar.gz 1434073 BLAKE2B 47d9d461a9bf3d3418a7cb37684f53cce58ef1d1bee928e74cc8b6ff8e9bfde19d99a59d7a8ef7b638efa24263d5b35f50c774fb5f81e9c693c9d3c6242015ac SHA512 6a4f99857c2b329eddb5200934b2c83bc2377b5b89ccbcfed548d8f52cff40800db7b94ea321f74e932ea4be42a546fb9b515569266435cecdbe204a0a891b2f
-EBUILD celery-4.3.0.ebuild 3973 BLAKE2B 5d2e994c0c33fcab4f887bc2d7ee4b7fc99cce028e0b90447c33a958c34ee351e4759ce8fe0a3e528e4223b34e69e89476e3377da90d2ec90d5ed47561c2f675 SHA512 667685e2ec4c77066b499a1a1f3689cb3bf97ac005388cbf7d9e84b6094cb93b73eab75df8c5e3f40b9a7168cdf46085d2b8992264bff768a9aaf0c53a6e87cf
+EBUILD celery-4.3.0.ebuild 3977 BLAKE2B f4306521f66f38a19146cf03fa68980d605b38c3e4d56693910936ebc32b3b06b2de049b4587e4e2d4d6d3ae03d9db604749aa9bb7f95cdc6e599f65d7a944b9 SHA512 457902fd176c41da784a8f3745cdfcfc76b4f2204f5407809375a3a87ecfdce0a7967fc6b7c3a2472e8d052302c30fae219f281a1911a23ea4e07aca07f61783
 MISC metadata.xml 309 BLAKE2B 2d5a0a0dacd3113a16ea680c65d1048c78af98c2dd2f9638f63590d6874b2a342d225a5af03bdc449aba89c00930a1984e12df01fed301b2cd5e428b6809d65a SHA512 931a91ce75aa5b4226054a6122edc341f0b34dcf2301312293a82dc74c1e315d66496fc86d02b287e5af575474a4cff01150cef4f396f2989195f1dbeefd8bf3
diff --git a/dev-python/celery/celery-4.3.0.ebuild b/dev-python/celery/celery-4.3.0.ebuild
index d5e16c50847f..f37d6c697b84 100644
--- a/dev-python/celery/celery-4.3.0.ebuild
+++ b/dev-python/celery/celery-4.3.0.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 PYTHON_COMPAT=( python3_{6,7} )
 
-inherit bash-completion-r1 distutils-r1 eutils
+inherit bash-completion-r1 distutils-r1 optfeature
 
 DESCRIPTION="Asynchronous task queue/job queue based on distributed message passing"
 HOMEPAGE="http://celeryproject.org/ https://pypi.org/project/celery/"
diff --git a/dev-python/cffi/Manifest b/dev-python/cffi/Manifest
index 240343299a75..b588a3876b24 100644
--- a/dev-python/cffi/Manifest
+++ b/dev-python/cffi/Manifest
@@ -1,4 +1,4 @@
 AUX cffi-0.14.0-g-line.patch 9258 BLAKE2B a57cb8836dfcfb1124b1b72c38fb4c02d231fc7116c2de4b970e6423d037d1aa382173a4bebb9dafab0d690df485a64d824aafcdb16e31d01b391c25f4c239eb SHA512 335758de740050256af711e688072bbe4ac835551437bc2fbfd4dfaf5492efd5c722bca3bd8e5747bb0a88d3e7e6f82b78f85f5f42a4f11efb7b2f6c3ae4a492
 DIST cffi-1.14.0.tar.gz 463065 BLAKE2B 4d1e8a92241db801848ef8bd05ea15a31c7f61ea426ce4da184aff00df786348d2c76de9dc48898c814478aed9750b665868df24ad39435062cd7e1c84163e52 SHA512 4c5451eeede1d48a8f4b40e25b845ad1863b8bf3bd39624e6c693c2800d89a13efedc4c43b37e317a035613bffc2e3fd5f7e583c46cb283cb5cb930356f86253
-EBUILD cffi-1.14.0-r2.ebuild 1342 BLAKE2B 4811dfa305a292b1c009585a6887de68250e469feb2d7621a5c85a561472287df1bfe9e08bdd53e022d76f6407f3734183497c526b354776ca61a539f7ddb8f5 SHA512 1698c7c0b8685a6375a5a2df1d28b2b9e29186ee4be5267b6af22be8c2d6f6ed833d67240b4e72039071fe327b9b200fd9b283d5ee3caf08b6ceb435d3fbc66a
+EBUILD cffi-1.14.0-r2.ebuild 1349 BLAKE2B 51d75557181e50a0cf4b23d7358e23f8b56bd05d76efe18a9d5685328c5197060eb45e9ffe894fbc5f05baa2e35275eef205d148b080ff6e774ce09da8cb6743 SHA512 510887308c5068c4d7b9f44c9e297cd854202b1651ba2661b2339dcf91fc438b476e1f1f6c30cbc95267e675dd00a98979a24482d5cc9aed99db6c89d9c555c9
 MISC metadata.xml 317 BLAKE2B b6416209bd2358c42c2be3bd228238b401bf126919b6e7371d83d7cec8cb55a40f89db562701cc8f3dfa904e225426881b22ff1d3b72085365b5caf9b8c6a403 SHA512 0744ca7b98b2ebe2985bf2a81a337d09be62cfaa51f8380bac52f8d30941e997f09be20e28caf6967226a71369003cf35977790aba56ed0d469cc490cfa089b6
diff --git a/dev-python/cffi/cffi-1.14.0-r2.ebuild b/dev-python/cffi/cffi-1.14.0-r2.ebuild
index 81a2fac6a16d..a590138b360b 100644
--- a/dev-python/cffi/cffi-1.14.0-r2.ebuild
+++ b/dev-python/cffi/cffi-1.14.0-r2.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/cfn-python-lint/Manifest b/dev-python/cfn-python-lint/Manifest
index c94770c212bc..656a09f5ae5a 100644
--- a/dev-python/cfn-python-lint/Manifest
+++ b/dev-python/cfn-python-lint/Manifest
@@ -1,4 +1,6 @@
 AUX cfn-python-lint-0.30.1-tests.patch 621 BLAKE2B 7b4d457c56f32799c0da0e1e1f6551b57b89b08d7916a5a4b5c8c59605bb7dbb2393d566afc0da606103c09226b61d8a85734e124027ed81d46d405d18079778 SHA512 bffe6e2668dfb16f09ce20b784fb33a4a19cfbee832e6107601bd0bbd60c3f4e3b7debb3c3c320b87223dc584f054b6bfd1c19251ce17bf0b978d0b3e0b28088
 DIST cfn-python-lint-0.30.1.tar.gz 4137425 BLAKE2B dd4f7d449236e567e7ea0fa662cbe983b6125a6cb557ee314de0e6647c5756b0be450deec7778ac69f1cec95b594c8c74a0a2f56ea229b7dc28ffb918983e6b3 SHA512 67b72973dc174e0de4980606b7886459233fca516a0587b91319127c4df0ce2647bbdc3302d68b63916654a76f4c9405c2f27cfd5e0ad737b00724e403815477
+DIST cfn-python-lint-0.35.1.tar.gz 4501826 BLAKE2B 84da0965fc198ce7b8f955a7d43f9a1c87c9688c301594abe6843509a832b4c9c5fadad1f75ac1c5b20ce2179244fd2b9681f5a92a1dbe38738a61c94f95982a SHA512 6d277048bbd7d8950ef7681c4a31cb82ccc231fb29f5083169caef69bfa4464cd87e473f40c775d798ff511a5db1dff9a17b0c08dcc800db0188e1e84990c9e4
 EBUILD cfn-python-lint-0.30.1.ebuild 1147 BLAKE2B 2f23485ac84f0911d2e403928924f0a96198aa863c712103c68295aa02f662d51e5c59d51883f9753159177f5b05dd47966489ce537e9cc8aca9de0cd5a75f56 SHA512 ae3c1238893d5d4d7ba86a6fb749aa407f0597f8ec2a59c8b455392105b45de8400ae133df8025d5b04a8b3a1b8edfa3ee30e2999c718107555a185e1e595077
+EBUILD cfn-python-lint-0.35.1.ebuild 1234 BLAKE2B 1a88241ea6c30d155790ebe1a599c184b8746b55c70021885549c8d10228f77052b564d2a8f0768746326db784c163bcffe52b108a5db442d4ddac366cbfb40e SHA512 8759e70f66de52b3ca3890e585ee8ffae47e966e5b28a72f078317edd8b87f0559ae862b3f10ef75950a1932907946ec14aaad0765df7d41e423e3a26fee7341
 MISC metadata.xml 572 BLAKE2B e7e0e4631f4ec0e9b668f664607b89790edcaeea43c2da8b9cde1e9671eb5c18221d61d8981b1f23773b6d0582883d879b70d1850bfb4ab8a7bbfad60456b286 SHA512 6677b1994867314be92d0a95e2115102d8ef87f4137ac26d488957ca7d34e77cc618a308c8fb648405f28eecd872c8965dda5f042d410d5084c3dc38d54994ac
diff --git a/dev-python/cfn-python-lint/cfn-python-lint-0.35.1.ebuild b/dev-python/cfn-python-lint/cfn-python-lint-0.35.1.ebuild
new file mode 100644
index 000000000000..09f91de4ad66
--- /dev/null
+++ b/dev-python/cfn-python-lint/cfn-python-lint-0.35.1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6..9} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+inherit distutils-r1
+
+DESCRIPTION="CloudFormation Linter"
+HOMEPAGE="https://pypi.org/project/cfn-lint/ https://github.com/aws-cloudformation/cfn-python-lint"
+SRC_URI="https://github.com/aws-cloudformation/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+RDEPEND="
+	>=dev-python/aws-sam-translator-1.25.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/importlib_resources[${PYTHON_USEDEP}]
+	' python3_6)
+	dev-python/jsonpatch[${PYTHON_USEDEP}]
+	>=dev-python/jsonschema-3.0[${PYTHON_USEDEP}]
+	dev-python/junit-xml[${PYTHON_USEDEP}]
+	dev-python/networkx[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.15.0[${PYTHON_USEDEP}]
+	>=dev-python/six-1.11[${PYTHON_USEDEP}]
+"
+
+PATCHES=(
+	"${FILESDIR}/cfn-python-lint-0.30.1-tests.patch"
+)
+
+src_prepare() {
+	# unpin the deps
+	sed -e 's:~=[0-9.]*::' -i setup.py || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	distutils_install_for_testing
+	"${EPYTHON}" -m unittest discover -v ||
+		die "tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/characteristic/Manifest b/dev-python/characteristic/Manifest
index d289cf645aca..76ebed988863 100644
--- a/dev-python/characteristic/Manifest
+++ b/dev-python/characteristic/Manifest
@@ -1,3 +1,3 @@
 DIST characteristic-14.3.0.tar.gz 26993 BLAKE2B a24548953451da77e08678b8a204c0fc649ebff52026aafc6f80037a65f527c9a2244273420b1ce76e3ac75778f48c11bc2344296cbf34ff1e9a1e82356d52f1 SHA512 e13a86f453cd3688a74188005b82a661a9c73d9f0408d9afe9e0575e69ffe87a5327f51e2c16a9c0a653b738e7c014d5aa08e353835f0aca7897714b7ae56e83
-EBUILD characteristic-14.3.0-r3.ebuild 659 BLAKE2B 654dd133c42b3aa445d672e7cadbb12166021ef2f884a940379f80e3ab27facb0dbc6e6ca00bcdc1b0a9c726b3a05a52718d8312ebee3e9ebeb53a8900d7dd8c SHA512 ece46af5d584a05a205d09898bfcf7a5a4b1162a401fca9950ec703393bad9548a302d1bfd7fbd9323cf372c280189c93f2339e9657a395a32eec085731790b5
+EBUILD characteristic-14.3.0-r3.ebuild 666 BLAKE2B 849fed8fabf4e97e635eabec59ebb16aa90eef7283f20f907152c9a3c592a322f5814c1ac62058ed21726a6c28a05b8f18f633a0ef36ebb5bc274c4df37196e6 SHA512 9497c0ca39548634ffdf370cf746e079ecf2290185ada30701450e496bbedb5b8c77d2c8b4f27c5f570dcc7ef1bbe37c53971708ce05797a62b20c94c405ba58
 MISC metadata.xml 389 BLAKE2B 0e2226a252bf0308d7bf33b34eee3f035bfd242736b91072eabd77e07216104961c45f8469dcfc3a8871cacb4ed619bebfd3443612bce85d1f2ec4d95a13dd21 SHA512 291bc593113bd6fa148fcb5f978ec1630808a0a6b4ec7fb40b00596c9cd2bd56357fa792af91243d96ac21fdab420d370c0d1f59570e739be22d81b8add56676
diff --git a/dev-python/characteristic/characteristic-14.3.0-r3.ebuild b/dev-python/characteristic/characteristic-14.3.0-r3.ebuild
index ae5ce89e809e..af4f4b639410 100644
--- a/dev-python/characteristic/characteristic-14.3.0-r3.ebuild
+++ b/dev-python/characteristic/characteristic-14.3.0-r3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
 
 distutils_enable_tests pytest
 distutils_enable_sphinx docs
diff --git a/dev-python/chardet/Manifest b/dev-python/chardet/Manifest
index 443e28f51b7e..cd0876d3b45c 100644
--- a/dev-python/chardet/Manifest
+++ b/dev-python/chardet/Manifest
@@ -1,4 +1,4 @@
 AUX chardet-3.0.4-pytest-4.patch 802 BLAKE2B 64992866c2f101b41f525a0f8cf642774850211f434b471dcfa5aaadcabd5ceb573d5b902f6cdecc2f651a71dc8955204f13beb8a5261d4d0ff3aa6703a4266d SHA512 ca99abb30e8e221b43b7467cfa385c0abb16addd4befd149e35208278a25faf07dd99edd20595be4d0d0d0afdf81602b47e0110f4e9335ef90f5b4c41b54b0ab
 DIST chardet-3.0.4.tar.gz 1872214 BLAKE2B b93e2d3e0b5a5c35affa5e3ee661323029f79837a1222d8f69db72911301d9490c9788d2effc577eeeb2a50334cc855afc4bdf4b8dbafb143fcc411d93b824a9 SHA512 b433ea0e15e200df968e6d61c671c42fbd77e519eb033035c4a5c241e1f98e1dfaea6747af632788507583b3ef85b00d510b3f6ef5cf58589ceca1b3a088b357
-EBUILD chardet-3.0.4.ebuild 941 BLAKE2B eec7d3a9e5e56372c406c63f37f3bccb5b856d9264748edd07e7974cb88f1f4b1b0615c8f4d70c9fe017ae771f3027e612bf96ef457f4de6fcd34ac587662202 SHA512 c0c323eac39a255a5fc7345d319082dfc0d295f45272fdb2303f6002a1267eb9881f25264398e802e666836d3f4f7e335e28155e81de043fe9b344031cfd0303
+EBUILD chardet-3.0.4.ebuild 948 BLAKE2B 8f4556c511148228eb4b66a3869ca2565715d48b607306e729be34465595b22fba83787c0aafe0c120959aaea52504bcb65ef6e1dc71937d751c3304fdfc8d34 SHA512 636011a3e96cf2ada48c3242d7a5619a89112ab931ec42b7d175127581cb39c6112d153fd339aaae25f58a2372fa2ff6978f5e7a33361c8220762bf78ca67e80
 MISC metadata.xml 377 BLAKE2B 8aa19a889e96303024d469c969a9e47613cabd1456b0e21888a02a091049e09a53c6faa3d0e128b5ea21b68f521cede9cf09b570f2fba7a4299187a44e40b018 SHA512 c48c3874a248049fc2845d0a64ee5b94c705ef58158f882f30bbdc561f311a7203cd8979e067a5b0f3f034c95cc4b6da373cea6efc9616f3dabc574772874650
diff --git a/dev-python/chardet/chardet-3.0.4.ebuild b/dev-python/chardet/chardet-3.0.4.ebuild
index 52b5155a2c20..051d976f3a06 100644
--- a/dev-python/chardet/chardet-3.0.4.ebuild
+++ b/dev-python/chardet/chardet-3.0.4.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/chardet/chardet/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris"
 
 RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 DEPEND="${RDEPEND}
diff --git a/dev-python/cheroot/Manifest b/dev-python/cheroot/Manifest
index cc1aa8854ffd..467fd31289ae 100644
--- a/dev-python/cheroot/Manifest
+++ b/dev-python/cheroot/Manifest
@@ -3,6 +3,6 @@ DIST cheroot-8.3.0.tar.gz 100557 BLAKE2B f5f2fd8a11a1a8660fc37030d501e93787be46d
 DIST cheroot-8.4.2.tar.gz 107264 BLAKE2B d28d602ebd442ad5d85dfb2f4618b279e733cfca9d3c516ad1fbefcd318449155819549f6b929713d51d44fbaa9a7db383af81ea65271c6646a9245e521b3178 SHA512 d0b807969d491e0b3423453d27acfbe51147f6786c0b2c8a1b4774589e3e82b027277bf0ddd5ff406f31e0ac7d9dfbd6c2f02efe6911889986e72e9f16b8e62f
 DIST cheroot-8.4.4.tar.gz 107753 BLAKE2B 4e5d9c3a101876d76696a2e6e3c191f199810e734e25cdc07aac69c102eb28b90033c6fa749569e140c01dbd08a4b06f067b4f47d34ef483d48731c6372ee5eb SHA512 18e2c198a537abd740a868fc4055c1e1e0501392c5518ec345669d02511dac2d59aa2abe2670ffb1800c5aae7032b11445488ecf7fd63d02d5923ed08b82f216
 EBUILD cheroot-8.3.0-r1.ebuild 1409 BLAKE2B bb5c42a3682198b4fd398d4a4bded944caa79b0e17721d49266e368297bba90a216ae10dc7653fd2cb1fb58fc61ff53623a407e55dc8600c4a8f04daa130be48 SHA512 ff73d49cb031988681ec77508c52cab9138b6a38d5eddc98c3f1e0d752a75870793391677f575ece594be53aa7b4d72f482139cd0f291ed52023e2cc743f20ef
-EBUILD cheroot-8.4.2.ebuild 1529 BLAKE2B 9d0e3bda85a726d08e7e5f145e4a5e814239c6d7574bc93d9f15b4c04609b542693b728f35becb45657601f17e656e26e3167807418ad13f31539be01cf211ac SHA512 17db137994110789ff496c40a0b2d10efb7913de0c9902cd4bb5498483c704eaad09d808948767c805f9c9efd1a956fbf3fb3d0641cddef4f95b62edb9874cc7
+EBUILD cheroot-8.4.2.ebuild 1526 BLAKE2B 7488df772797ad6e224ecfed10fba4b5fc1a1d7a851b8c9c18b93b3e8347d24f3168e9304ab5541a078be27c1afc5cd9a2494e0b8124f89555502e8e8debd876 SHA512 17ba3882fb2814fe369cbb7d464ebe706462dc6200bfa1cff31965d4634b0e34297c485132f0bc38010c5bd4cb2e2f2667b7d6caefbd714762bd8ab5a61e9131
 EBUILD cheroot-8.4.4.ebuild 1529 BLAKE2B 9d0e3bda85a726d08e7e5f145e4a5e814239c6d7574bc93d9f15b4c04609b542693b728f35becb45657601f17e656e26e3167807418ad13f31539be01cf211ac SHA512 17db137994110789ff496c40a0b2d10efb7913de0c9902cd4bb5498483c704eaad09d808948767c805f9c9efd1a956fbf3fb3d0641cddef4f95b62edb9874cc7
 MISC metadata.xml 471 BLAKE2B e623692550af72f63a0df84767bfadcf9ee16beafc4f467cc6bd83d7a0deca6a66d73f9041e3e37a967a4d7451eebe0d9f7974e43ce90b2dac24134ed7aa6496 SHA512 19c39b453a668408550b250a96af25ea12c8a46285070aa4a1b1d7c3e6b4ee36ac287ead410e6b798d4fa607543d58c5cc8bec0f00992206d2a231de983b5976
diff --git a/dev-python/cheroot/cheroot-8.4.2.ebuild b/dev-python/cheroot/cheroot-8.4.2.ebuild
index 467ee0e31e3f..f2b6dddf9229 100644
--- a/dev-python/cheroot/cheroot-8.4.2.ebuild
+++ b/dev-python/cheroot/cheroot-8.4.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/C/${PN/c/C}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 arm arm64 ~ia64 ppc ~ppc64 ~x86"
 
 RDEPEND="
 	>=dev-python/six-1.11.0[${PYTHON_USEDEP}]
diff --git a/dev-python/chump/Manifest b/dev-python/chump/Manifest
index 3dd0ed738f7b..77c6528fd555 100644
--- a/dev-python/chump/Manifest
+++ b/dev-python/chump/Manifest
@@ -1,3 +1,3 @@
 DIST chump-1.6.0.tar.gz 15646 BLAKE2B 8cab76e633fd4084d349115fae925c152439d06acbe629d5c23c474f2dc0a3cb1b5b727b856a9d54a82e39698b3cfd7470086a976cfc6b4870f1af02bac71f87 SHA512 d219f1b9e28dd17f834dc807cd42a288adc4f5579bf97cf6b1833e63f339bd811953c3a74cafad9021beb05cd5fddb46cf49b62a4803c62ece62d037fe38a4ee
-EBUILD chump-1.6.0.ebuild 774 BLAKE2B c7ca79c6e195959db9ad129ee22ef1b746ba7a9abd2282ce79eec9f7a87a393717c66a2201cc436b92304821e422ae7487983cf11d5831bacf073b18b6c3b206 SHA512 853e5937711f9397d10e69d711cd2356da5204a3aa5f73909fc11d612318e0f1cd609117e9fded6e8523d943b0c46600770a411352751750a32f415b401dd38e
+EBUILD chump-1.6.0-r1.ebuild 516 BLAKE2B 0aeaec7e5210ff8258ea7d4f1a603b64bd872ca09b7e1afdc428433d2bcc10608faad42d24145a05db2169faeeb72e111d1375d49ccb407feb346f5d66878210 SHA512 4f6faeb67a5e58130dd219f16f72e5ac64075054d747bd52b73c8725650502aed7a0212f0fbe4bf3b13f3cbd0c27022219899d0f35ded325a860683a17f6b0fb
 MISC metadata.xml 518 BLAKE2B 126300d60995a32912c84d734b465bdc4ad7f4569aeeae7674325dbd44c177431dffb22e05341cc50e8ac0f294617c64c18c11e3b5f7bfb17eb083f48f06ffdc SHA512 bf56b4200d946208832b539649d18f450da83e2bcc31bff902ad8793fb27f823e2e4207175cc13db3ae49f1862b5889a36fa06d27ec412da647cbdb2c4286604
diff --git a/dev-python/chump/chump-1.6.0-r1.ebuild b/dev-python/chump/chump-1.6.0-r1.ebuild
new file mode 100644
index 000000000000..b46f8078b775
--- /dev/null
+++ b/dev-python/chump/chump-1.6.0-r1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( pypy3 python3_{6,7,8,9} )
+
+inherit distutils-r1
+
+DESCRIPTION="API wrapper for Pushover"
+HOMEPAGE="https://github.com/karanlyons/chump"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+# 'html_theme' is unset, meaning alabaster will be used
+# and sphinx depends on it
+distutils_enable_sphinx docs
+
+# The package has no test suite
diff --git a/dev-python/chump/chump-1.6.0.ebuild b/dev-python/chump/chump-1.6.0.ebuild
deleted file mode 100644
index 6ee3f01c296e..000000000000
--- a/dev-python/chump/chump-1.6.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=( pypy3 python3_{6,7,8} )
-
-inherit distutils-r1
-
-DESCRIPTION="API wrapper for Pushover"
-HOMEPAGE="https://github.com/karanlyons/chump"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc"
-
-DEPEND="
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-"
-
-# The package has no test suite
-
-python_prepare_all() {
-	sed -i "/'sphinx.ext.intersphinx'/d" docs/conf.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	if use doc; then
-		# Force sphinx to use the standard theme
-		READTHEDOCS=True sphinx-build docs docs/_build/html || die
-		HTML_DOCS=( docs/_build/html/. )
-	fi
-}
diff --git a/dev-python/cjkwrap/Manifest b/dev-python/cjkwrap/Manifest
index 4a000c3abb68..a6ae7b1b2716 100644
--- a/dev-python/cjkwrap/Manifest
+++ b/dev-python/cjkwrap/Manifest
@@ -1,3 +1,3 @@
 DIST cjkwrap-2.2.tar.gz 20995 BLAKE2B 35604e2d1aa24a75e1de0f0b17ba592e7588aade42d43e98864f5d83fe598eaa0ca566682cb7c7af566e66f79c9696ba2ae86b1579681688d6cd31469c07a3ff SHA512 c72ce67b10af46018f7aa5d65af030373e8889a28f533a59d55668e5c90a759ad7cb31708dd6ff35561f9e62115edef5bc0facc74b6a6e122d7399d9dc950624
-EBUILD cjkwrap-2.2-r1.ebuild 439 BLAKE2B 076828695bdf6a7ae3fc332836a7842b99232b5c1fa5dd86ef1de15f7dba016d16dd3012b1c42212150d465a60bdf68793e1934b93bcf6eef796233d3f36f0d7 SHA512 a7fe787edff3f128163f0b91f2248ade2d2974386e248c4dea009bdeb7495e87e831b30159fdbcc80cad0e3032c1a1dc61bf95a373f218176857f32287d673b3
+EBUILD cjkwrap-2.2-r1.ebuild 446 BLAKE2B f08f05fac24e11a0cc22524ed86b9a41f3d97a4f16ecfe312b8be6d4638c53706c0d95ece918912215b27e2f7e8194b9e02b5c413d71f07394cb2ab1fe752126 SHA512 67a17726c0a78d032914092a5d638bcf0c89d20a82fc6dee09729dc75ff11847279bf13ecbc712eeb37734a3ef9557b61f24ecf6df720c689c9af1dc993572c3
 MISC metadata.xml 254 BLAKE2B 938f68b7b21ad386a35540a09e4bb956e241dfc963d4823c3c0cd46d3449ff4fb5a1cead67ad7c35a460503d30bdbde35822535f1c2d46f2939ee190f328b846 SHA512 26047ebb40fc49bfb4393121c5c5af69caee617a1d75676be84b0f5af75564828aeeef4503c7681eaaf7e48f6c662574874336296c18e002dca8e925162a1d4c
diff --git a/dev-python/cjkwrap/cjkwrap-2.2-r1.ebuild b/dev-python/cjkwrap/cjkwrap-2.2-r1.ebuild
index fc292b5d68ed..7525aac7e189 100644
--- a/dev-python/cjkwrap/cjkwrap-2.2-r1.ebuild
+++ b/dev-python/cjkwrap/cjkwrap-2.2-r1.ebuild
@@ -12,4 +12,4 @@ SRC_URI="https://github.com/fgallaire/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="LGPL-3+"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~arm64 x86"
diff --git a/dev-python/click-default-group/Manifest b/dev-python/click-default-group/Manifest
index 32010b374dfc..1bba01f83e14 100644
--- a/dev-python/click-default-group/Manifest
+++ b/dev-python/click-default-group/Manifest
@@ -1,3 +1,3 @@
 DIST click-default-group-1.2.2.tar.gz 4753 BLAKE2B 919e3921ef3c6723b92cab8433032237af4e5583084badb6cc53d82971d81aa910ae6553deefea2ac46067d2618bb8f6d2003f0b2c4ced04acc5b46588012614 SHA512 6f296d154813e0c3dbf8e435c4c1b4394f51a000320c5585aeb78b81f30fe15bd27a8aad0fdbb71fccb88dc3083682519f1dd06572c8d5c35639fb9c3acf73fa
-EBUILD click-default-group-1.2.2.ebuild 629 BLAKE2B 6d8c225f51106b9f4f17b2955be19448ee5b2f58b421872a620d73ee182972110162afbfb38a48117919acff03f25d378ffc4b7944638b5b5bfb87fd7ecdcd45 SHA512 d6fc2d32f23ab765a11aecb34d94ef54bb6370708b7ff18d46bac289f2e0558f0c3c80a0b849c3d2591c50eaf90a7969a701850ecdade80cb08287d6326f9550
+EBUILD click-default-group-1.2.2.ebuild 636 BLAKE2B bd6746ecf03373153f8a1514202520eb5e92b1d7a093e14c5ea3bea581313380534f8d3f853710ba33e1b6522de8185cb8e478e7d18d54acf7ce09c5b56452f9 SHA512 e393412c8cfa0e79978839371a24426d9859fc8b072e830294b97343623794fc6a9bbb467da0a4c08cd2f0170b004ecd6c6c96728ff419af6cea86922b6cc81e
 MISC metadata.xml 322 BLAKE2B 8a78490ccdc4b51ba871eac8ca74b0e342ed41d8d91f8a4b7c0c824b6447be791604c71f1f59d5151686931a34160b5f5d1979b2760e4aa533b45033ce3d09c9 SHA512 c90048e0f2c412a4d44e289cada3350df7a74a8d87f09b1568085183a37fa6895163fa913f4a3917c34e314a81fedac06d8c24304b1cf619c3489275a2ef1417
diff --git a/dev-python/click-default-group/click-default-group-1.2.2.ebuild b/dev-python/click-default-group/click-default-group-1.2.2.ebuild
index 57a412fec38f..a973e932d905 100644
--- a/dev-python/click-default-group/click-default-group-1.2.2.ebuild
+++ b/dev-python/click-default-group/click-default-group-1.2.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/click-contrib/${PN}/archive/v${PV}.tar.gz -> ${P}.ta
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86"
 
 RDEPEND="dev-python/click[${PYTHON_USEDEP}]"
 BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/click/Manifest b/dev-python/click/Manifest
index c78df20ae894..5ba685349f49 100644
--- a/dev-python/click/Manifest
+++ b/dev-python/click/Manifest
@@ -3,5 +3,5 @@ AUX click-6.7-support-sphinx-1.7.patch 1243 BLAKE2B d4939d49d43b50a3cddb77899ed2
 DIST click-6.7.tar.gz 279019 BLAKE2B cc1e59d0a34ccb4ce50c8a2982b308d23cd525ceb44d84a493c0fe9b5a6f7f616e8a4c440ae211fca811a2bf904ddb75d93618f3c6ac7bbe6b1ed022710dab1f SHA512 d454369fe1acb01c2210a61e15f45ac9cc77102c93345257f4ef3090bd8f31f1ccc49d9fd6ea670cddca9f715ad5db29368b4eecd95abff50d1033c4f7a967d6
 DIST click-7.1.2.tar.gz 295757 BLAKE2B aea76d5378cfa49fe58a83132737d609d48b3d3a71ec65c0a8a144c7a0e244b5bdf0196ffe2150889b82edda20c3f1faa3c84a227fc9ef459a5a9646cff86129 SHA512 d0caf2fb0a258774a18a7b8f83bdfa73abeb70196a70b45a6cc35befaeb862d068d2f2cce4e27201ab2e3adcd02e7e2f099d6c37c497a507010eefa10ad16eba
 EBUILD click-6.7-r1.ebuild 1429 BLAKE2B 2c45c292df5a62a6db72be4210300eb6e599aa86f6df7add0f2f855490538c077940e45ef0b5f384b75340891aa5393732804c0e2d11fc05e89cc85780663956 SHA512 4a0a8b36db424d172d8f209c24047be29a8b48d94add0127b3adfaee7f91a7c56e9546cb2711f7871bd262b7d1add94624ed4e03c98c5bbab68ad10d0cc0e012
-EBUILD click-7.1.2.ebuild 754 BLAKE2B 676d984143a33f3817f9e58a5aee811572cd4655b85654949ca9bd10ab77e9f2ea5cd903c989c66a34a4eb3ac0062e0fe3e44f0ba29ab616f7928f9e91dbfebe SHA512 296e06a3c9ab4886629b3ed196915ed576afdb9ce441012662338f9a842e98e21c71b20bbf60e56785e72d67b64ef436c3ca220096d5226cb6f6e3802d3fbcab
+EBUILD click-7.1.2.ebuild 761 BLAKE2B ae572ffdc0407e381636d3527e500bbdbfd33f6d098b43078a6e2ae77305b92c7e8e88aef5d42b95e8716609b22a3c0ad34202db56c4d4bf7472f966c924143e SHA512 c16db2e2c6b410470698a8ebace1afbab4b32d457b1df327e1ec13795b1672b94d2bc5aea824151f76207772be224d54e55b7c09343785e0fc6ec1e9b456adb9
 MISC metadata.xml 332 BLAKE2B a41bc7699360c666ce286a0d9a44779fab5afa6e6ce99efec2ee65a5d8d534bf3ccd65d4b23a2f5d40fc3b1c04c3c7e078a8889a3030909e7cc3992eabecfcb3 SHA512 de78734678a4bafe5175228f6df58210c65eaf016efec93e65441109b280725c4994406d0f21f2ee22ca0f9e1e27e27f76b3a1db724dbbd5b958fc8d8410126f
diff --git a/dev-python/click/click-7.1.2.ebuild b/dev-python/click/click-7.1.2.ebuild
index 6f2551df5b41..803bc15a989c 100644
--- a/dev-python/click/click-7.1.2.ebuild
+++ b/dev-python/click/click-7.1.2.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://palletsprojects.com/p/click/ https://pypi.org/project/click/"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="examples"
 
 distutils_enable_sphinx docs \
diff --git a/dev-python/cliff/Manifest b/dev-python/cliff/Manifest
index a302707aa11f..1595a254c17f 100644
--- a/dev-python/cliff/Manifest
+++ b/dev-python/cliff/Manifest
@@ -1,5 +1,5 @@
 DIST cliff-3.3.0.tar.gz 79680 BLAKE2B 844910bc588fb80ee6645735c3be2518fb00fb255eba67d7cf8a572ee9153cc5c1af399296782254d1d94aab89dd14a7107174b5c580cd842eddd62f4aeae155 SHA512 644dc14817e18dbabe8a33bd48545b27f5053f3b2c5be386c7752fe0a89d3de02aa70f6a5d7b0dcc32fb26f73773c744ba17e916c1186d93b8609caee5f08d6c
 DIST cliff-3.4.0.tar.gz 78990 BLAKE2B d7d8209e2fe24614cde6d3e113eb0dbbba981addef045fe318143e71f9a240188c0fb74e831d868b31b6dafb4289f7beabfbb5fe1dade1df196f670c53a55549 SHA512 d625588f4eed0aeee549b4a21e604f1cb886b8c10a12df7c546a5292223ec5bf9067352b4d326d5710673dab56eec47e2fb46c9c5d5df6e9fbf026d030bcde1c
 EBUILD cliff-3.3.0.ebuild 1031 BLAKE2B 98bfd5e1b5ee9e4e9d4eb5573b0782ca5848e196f7287cb1b12a002ee1c91d4c2aaf1f289fec36996bea3100f332a4c081aa568b87385aa23d55f85a54bc1473 SHA512 1768688ae062bbd0248a11f0728ba97808f7fac02db5703d7a6b205b77d6be2e481cebc62f2cf9be0497288aab858cb950aeb6777dc1712e32537e99363569ab
-EBUILD cliff-3.4.0.ebuild 1036 BLAKE2B 9467964b55090ae43d9c9cc040eb95cf0808af4f4b89cc8e0f56e25854da0d9355b3b451851cbf79b3a1754da1f3d032353f5ffd4e9c2500595704b3ca9861be SHA512 7b0afda286110c34bcb9017d35ee071c9fc03bbe873466fd9cb70d25161957436accd4798d12fed564ab207e9f53e58ca5df089113664cb5c9dd2df6448a3652
+EBUILD cliff-3.4.0.ebuild 1030 BLAKE2B a3d63fa28dd726341baf4548e86833fc8e76c47cb0505216b0cdde38c1a67832269baede6b7f011e60bc1bd5277e35686361658f3b06c4bd317ced86031c86f1 SHA512 6f216271a4840acc7806adeb9bfbba75a9663712c88f1f9d888ca86918432b05d7826009eaa47417e281abe2a1551005615504ed4773006f89b4203ac5e94673
 MISC metadata.xml 734 BLAKE2B cdfc9f839d8dd599e27c78314ca5688d94dc52b3128d0aca7c6ff11d8b7f5f9de9d2d43f6690543d8e44b8483899d0cc21ef7273dbbdbeca0b498b2a593279a9 SHA512 6103b640d65a93bbd2cd9cf6ca6ae42a12a0fbfcdc26dd164494b777bc976d14d7e0bd94372b84ed30f7eab3e1acb54787671d90f165cbf6b0b160770cdbcfff
diff --git a/dev-python/cliff/cliff-3.4.0.ebuild b/dev-python/cliff/cliff-3.4.0.ebuild
index c64de385c651..97560bbb48ee 100644
--- a/dev-python/cliff/cliff-3.4.0.ebuild
+++ b/dev-python/cliff/cliff-3.4.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ia64 ~mips ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm64 hppa ~ia64 ~mips ~ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	>=dev-python/cmd2-0.8.0[${PYTHON_USEDEP}]
diff --git a/dev-python/clint/Manifest b/dev-python/clint/Manifest
index ba8f750fe0a0..cd4350ff53be 100644
--- a/dev-python/clint/Manifest
+++ b/dev-python/clint/Manifest
@@ -1,3 +1,5 @@
+AUX clint-0.5.1-disable-args-dependency.patch 417 BLAKE2B 182c61c55e2d0d573ab62bcefaa6c31a43e9c6ca11c1fd4a2a36ff7917198b90e09016d877d368bddb6234996bb85d3517825d4bbd8b0a48e594d3e987e71ce7 SHA512 294e21ce515bbaf2949cf0da5c1c89e2dc9a1c4556a52c2a2d3ed360cbcd22891cfa103ed97abc59f5498e08f38995c3986b42dcbc7e548b87076d7e3dc574cb
 DIST clint-0.5.1.tar.gz 81140 BLAKE2B 5b42e7d46321f0416d3ffb51edf66c53476d3e4a211e971f36cab54a412f6b0f0ec26486c2b95871956ab09e7e4adf68e8329dd7e9e3c7ed1adb3f8a0dd2a728 SHA512 3ad8bfc587acb1322c7d7c3e73756a07c98f3b4215a3d4dc409b5a2067bc70dce2dd98d19250b8122b319b7bcf5e2859251de2829780345de06f93b35447c4e8
-EBUILD clint-0.5.1-r1.ebuild 957 BLAKE2B 1c151ffaeaaabdcc24ba431c9716aeb60f73b5e898d5f886d8ae7c3f73eb9094ec19ee94585740bd050a4bf6145cd623082f81277449bc953b79593e6cc5b775 SHA512 439df905656502d7b57ba925d15e98c307b30c445b832ad27196638e23d2f264d4182368bada1f3a1ed00f720fd42c74c009db269cb1befafa1c980c8b95fae9
+EBUILD clint-0.5.1-r2.ebuild 1039 BLAKE2B 470df4bf3d48c774325e05baf64dea432a096aa241a1baf48c99be853ba3cda39be223a95bc306385122369d78f267de30e0bb90a54148643c0b38c2c856e1a5 SHA512 01d13dd5cc3e92efe7df096e78c26b08ec17db089f19a71f40715e1d66502db822665ddad5a6a954c91b2a28a79517e5636bb3e2c73beec6ea9e53dd0cf55493
+EBUILD clint-0.5.1-r3.ebuild 802 BLAKE2B 69c57c008e2f42c0756630236a51de68eaf6d0dbc5785e8dd726ac217ca5c47129d3bed2d87348548edd33873866d995971d83f2f4520ed9e35e78d7b549da03 SHA512 09dbe7742e09c7467da64ddcc134c36f4a65c3172a6b27e60fb3904212c6eb674fa16bdd0fc748db0526cf0668e6cb4527d7fb78fec64f76e16f28b63ab96318
 MISC metadata.xml 248 BLAKE2B 886e9928c5735483e1b88968c7c68b328965d8b77022184e2428115042bfa146439a44a5b3b6ae1c813fc9626617bc5158d0be4d0c173594dc93efa84f1c2268 SHA512 28daaa3233c61835448e78dfcf4381cbb1d6789f0fc16b309aa9317d36f81754d1757ba5d6be5b6b6209fad9921708619b4e92011d91c879eddc440a819fbbdb
diff --git a/dev-python/clint/clint-0.5.1-r1.ebuild b/dev-python/clint/clint-0.5.1-r2.ebuild
index bd9659a536e2..f62be93bf388 100644
--- a/dev-python/clint/clint-0.5.1-r1.ebuild
+++ b/dev-python/clint/clint-0.5.1-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/kennethreitz/${PN}/archive/v${PV}.tar.gz -> ${P}.tar
 
 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 ~arm64 ~x86"
 IUSE="doc examples test"
 RESTRICT="!test? ( test )"
 
@@ -22,7 +22,9 @@ DEPEND="
 	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
 	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
 "
-RDEPEND="dev-python/args[${PYTHON_USEDEP}]"
+
+# https://github.com/kennethreitz-archive/clint/pull/180
+PATCHES=( "${FILESDIR}/${P}-disable-args-dependency.patch" )
 
 python_compile_all() {
 	use doc && emake -C docs html
diff --git a/dev-python/clint/clint-0.5.1-r3.ebuild b/dev-python/clint/clint-0.5.1-r3.ebuild
new file mode 100644
index 000000000000..1612ad767b7c
--- /dev/null
+++ b/dev-python/clint/clint-0.5.1-r3.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( pypy3 python3_{6,7,8,9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python Command-line Application Tools"
+HOMEPAGE="https://github.com/kennethreitz/clint"
+SRC_URI="https://github.com/kennethreitz/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="examples"
+
+# https://github.com/kennethreitz-archive/clint/pull/180
+PATCHES=( "${FILESDIR}/${P}-disable-args-dependency.patch" )
+
+distutils_enable_sphinx docs --no-autodoc
+distutils_enable_tests pytest
+
+python_install_all() {
+	if use examples; then
+		docompress -x "/usr/share/doc/${PF}/examples"
+		docinto examples
+		dodoc -r examples/.
+	fi
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/clint/files/clint-0.5.1-disable-args-dependency.patch b/dev-python/clint/files/clint-0.5.1-disable-args-dependency.patch
new file mode 100644
index 000000000000..8b648dbc735d
--- /dev/null
+++ b/dev-python/clint/files/clint-0.5.1-disable-args-dependency.patch
@@ -0,0 +1,19 @@
+commit e12338aa8f317c6f7e99fc2f4c2dc9424299b4ab
+Author: Louis Sautier <sautier.louis@gmail.com>
+Date:   Sun Sep 13 16:54:20 2020 +0200
+
+    Do not require bundled args module
+
+diff --git a/setup.py b/setup.py
+index 0221184..e9e3fa5 100755
+--- a/setup.py
++++ b/setup.py
+@@ -19,7 +19,7 @@ if sys.argv[-1] == "publish":
+     publish()
+     sys.exit()
+ 
+-required = ['args']
++required = ['']
+ 
+ setup(
+     name='clint',
diff --git a/dev-python/cmd2/Manifest b/dev-python/cmd2/Manifest
index 4c8b2587aea6..eafe24bc8703 100644
--- a/dev-python/cmd2/Manifest
+++ b/dev-python/cmd2/Manifest
@@ -2,8 +2,10 @@ DIST cmd2-1.2.1.tar.gz 623518 BLAKE2B 69aebdb6350c453001b6101988d9b0d3d96ca7970c
 DIST cmd2-1.3.4.tar.gz 641801 BLAKE2B 0d85cad11613aec5d58d9130f4edb46b038abe3ba02aa84570cb5c34100d02f7b5d0fa92cbc49a71d3be19b15f5b380e42d4eac28a609fac4f1e9d0c8b85fc34 SHA512 a8fcb7448e5afde392921ad15c0848c3396b91922f10fcee925721860ee74f678fbf43d334091e201b9e6612e4d70825762a03a870f2e4aa1f82a43b37c5800c
 DIST cmd2-1.3.5.tar.gz 642337 BLAKE2B 85003cbe6161b280421ef05280171d4c76092240b6b060651be58dd7ca25562ef5666760d5261bd6e94d76598b24861eb1986ec8046813f698d2d789682b2b1d SHA512 39d0142eaf238005787786e2033187d512073872a032d5bd973f81ef07cbc43a660c2c0c44175115ba25892aba9407789c21864ad19ea2ff287a44f37da6929b
 DIST cmd2-1.3.8.tar.gz 643320 BLAKE2B ca9eb089c4d1a5922d3f762e9fe118168349c807b770265d2e565a183447b938f08da578e0dc7de4a59a52fc39df2b53a63c84c1d86efd75c0ba58950bbe9a9a SHA512 af2b56234e0b257c4de564d46f4be83b56c37fd903ee737e825779558e44a9b60164bac1c0bc35a79c8aa1ba80155331c496c310e5ecad94f984673a30ef6976
+DIST cmd2-1.3.9.tar.gz 652521 BLAKE2B 709ccbf6e9f7aefb0c746e3e2e1880de649f8aa7cfd6165f0f18117af8f8001b0caca86eed4e8ec8748367bea7bc06032462606affbb7defeeb0e96e8c6d99c0 SHA512 82c5153c2edf688ac964f407170e646c7066c309bb05cd42cacfb5b873bc4b0301341352699f10862e4c6744a37b87df5ac96478096ad80c03e89203d3dfe13a
 EBUILD cmd2-1.2.1.ebuild 1231 BLAKE2B 94e7f09cb9e2fc73c5e831ab193be8a723cc66fba42dcbdbba7f51e2733f6b736ba6117366a81eb35fffcf80329201ad4a1280ea1dd189ee3b96c926c268c2b1 SHA512 4a746cb023b3ce7afcc383bfa1a4abae0e5be4b0bb3ea90649e474fecb2a16b7c7767b636a3c8ab7150ec75c3d2dba80a07e055720d7f900020a5ccfb6f10879
 EBUILD cmd2-1.3.4.ebuild 1237 BLAKE2B 6ba444387e36ebcc11511c30b0f8cf9577ed63744081deb292a411a2ca195b1c58200f496841390305945d6f0bb31cd993ee98f7ea992e2a51c3adf0cd157f57 SHA512 6ad20be1300967b792426b458dfbb8d7578edf96e8dcc4e592188a62a3e997e2b869bdf04009dc367ebdd53a40ff73d020e3d0683f378263efb5b3be51dd8254
 EBUILD cmd2-1.3.5.ebuild 1237 BLAKE2B 6ba444387e36ebcc11511c30b0f8cf9577ed63744081deb292a411a2ca195b1c58200f496841390305945d6f0bb31cd993ee98f7ea992e2a51c3adf0cd157f57 SHA512 6ad20be1300967b792426b458dfbb8d7578edf96e8dcc4e592188a62a3e997e2b869bdf04009dc367ebdd53a40ff73d020e3d0683f378263efb5b3be51dd8254
 EBUILD cmd2-1.3.8.ebuild 1237 BLAKE2B 6ba444387e36ebcc11511c30b0f8cf9577ed63744081deb292a411a2ca195b1c58200f496841390305945d6f0bb31cd993ee98f7ea992e2a51c3adf0cd157f57 SHA512 6ad20be1300967b792426b458dfbb8d7578edf96e8dcc4e592188a62a3e997e2b869bdf04009dc367ebdd53a40ff73d020e3d0683f378263efb5b3be51dd8254
+EBUILD cmd2-1.3.9.ebuild 1237 BLAKE2B 6ba444387e36ebcc11511c30b0f8cf9577ed63744081deb292a411a2ca195b1c58200f496841390305945d6f0bb31cd993ee98f7ea992e2a51c3adf0cd157f57 SHA512 6ad20be1300967b792426b458dfbb8d7578edf96e8dcc4e592188a62a3e997e2b869bdf04009dc367ebdd53a40ff73d020e3d0683f378263efb5b3be51dd8254
 MISC metadata.xml 521 BLAKE2B 0246c37d4e3d54c54b632fc75eb51b0b6e1ff3fcf6be8218a958c9483fb0248bfa3238ed31ab9631f41b12bdef71704649423bd2b44a322ec0b4cfb20a6026f2 SHA512 6a94c23d403d07e6d8e980e4c11ed1a1a0de4707417d60b539a4acc50312d1a9604d9d7ee55dd232c51c8fa6fc24f10bd28e9cc80e2a6f143086da448f78f924
diff --git a/dev-python/cmd2/cmd2-1.3.9.ebuild b/dev-python/cmd2/cmd2-1.3.9.ebuild
new file mode 100644
index 000000000000..cdd3428887c2
--- /dev/null
+++ b/dev-python/cmd2/cmd2-1.3.9.ebuild
@@ -0,0 +1,48 @@
+# 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 virtualx
+
+DESCRIPTION="Extra features for standard library's cmd module"
+HOMEPAGE="https://github.com/python-cmd2/cmd2"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	dev-python/attrs[${PYTHON_USEDEP}]
+	>=dev-python/colorama-0.3.7[${PYTHON_USEDEP}]
+	>=dev-python/pyperclip-1.6[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/wcwidth[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/importlib_metadata-1.6.0[${PYTHON_USEDEP}]
+	' python3_{6,7})
+"
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? ( dev-python/pytest-mock[${PYTHON_USEDEP}] )
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	sed -i -e 's:test_which_editor_good:_&:' tests/test_cmd2.py || die
+	distutils-r1_src_prepare
+}
+
+src_test() {
+	# tests rely on very specific text wrapping...
+	local -x COLUMNS=80
+	virtx distutils-r1_src_test
+}
+
+python_test() {
+	distutils_install_for_testing
+	pytest -vv || die "Tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/colorama/Manifest b/dev-python/colorama/Manifest
index 851672c03778..8365d78cff02 100644
--- a/dev-python/colorama/Manifest
+++ b/dev-python/colorama/Manifest
@@ -1,3 +1,3 @@
 DIST colorama-0.4.3.github.tar.gz 107251 BLAKE2B e09e92171b6ea4b3db4801feaf794e9aeb4f2b3e57079907911cbb909167b192eb857f0b404fa45673bee3bc02c122326bd05091846755d7dbfd990a74c60a24 SHA512 ab41a2f95fe75de0b280c174c6166b86645e5cc675dcedf784fe15170aae630e831370527c9490342b77c7d088a023a48428a519b52ad1c70be58904742a94c8
-EBUILD colorama-0.4.3.ebuild 1133 BLAKE2B c2bac349a26903e8602ce7ecd085923f68598eaa9a4311d31c624a6845fb6ff80ad704d0cae65118653dc4cc52fa97500c78d895c155cd7e3ecefc0d0c443975 SHA512 127a1da44f83d5d6e449507abf0027d83b175b82cacb6334ff4dd1a36d9c3bbace5274c0bdb46dbc4c88b4f2c44118e89f8503aec841b50189dbc280099d8d34
+EBUILD colorama-0.4.3.ebuild 1140 BLAKE2B 0eece1ecb10d4a683cd4d426bace9cf529c3a00a9876272b0ba8e2f67f151d297999fb9446801b87ec9df9f52ac558366b48396e3192d9a7d7953e28d0c0bd34 SHA512 54ea8c99dc0c7ebf935fc841a687ec547c62a8bd347fc3fdb0ec02ea8aae29773e7b37a8393ca0a224e1700be7a3d0dd40f774a7c6e53c7919f23d98033b2bdc
 MISC metadata.xml 525 BLAKE2B ae9c4e561fa86ce37c1bc26140f3dd4267c37591df64060b0c355a78f566b0453d6f923dc6de0e92595bc4f932bbaa58a823c2c9b62f9b8ec3f38cd1730a067a SHA512 19e73cbbef7d9ee826eb4df24a23f1d1896e294209fec9a1a854e174b83aa7a948b3128a3a70db3f406aeb577b9b500f80f41d544baf053ff4460bf2e5cc2646
diff --git a/dev-python/colorama/colorama-0.4.3.ebuild b/dev-python/colorama/colorama-0.4.3.ebuild
index 3756d4cce508..4d3eeb8d2854 100644
--- a/dev-python/colorama/colorama-0.4.3.ebuild
+++ b/dev-python/colorama/colorama-0.4.3.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/tartley/${PN}/archive/${PV}.tar.gz -> ${P}.github.ta
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="examples test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/constantly/Manifest b/dev-python/constantly/Manifest
index b0c3c615ca1d..25d8861e5627 100644
--- a/dev-python/constantly/Manifest
+++ b/dev-python/constantly/Manifest
@@ -1,3 +1,3 @@
 DIST constantly-15.1.0.gh.tar.gz 40635 BLAKE2B d400336901f7df7b1535a0e46fe092a2542546964ea144014210e8be3807aabfe8e8370e94f426061a0c3a6257ee66a6ceb963b159717def7e047405368d910e SHA512 eeaa74552fe8e01c40566ac3c8b3d41085f800863ac516e30fe1242f40d3401e4e872279149776f29d3ba78a7a16337a794ad26230efab4dd1847d42bffa81ce
-EBUILD constantly-15.1.0-r1.ebuild 696 BLAKE2B 4671b0b6a9b9a56eee91db1157da901bbf7b5a5a5825875444fdc9e118f640132150c0317a5e2acb0d39c3bcfa5b84968817df6c5d63ce2b0aa9f39a37ad1cc3 SHA512 f11c519153d4ffa92f637e3ffd4097b66745b03354f9901b9b528fdaeaa3496f24bcb6ada1e1da888d05e755fe918f276da49c3cf6bc0cf9faab7c7004d255cf
+EBUILD constantly-15.1.0-r1.ebuild 703 BLAKE2B 7de985255dd471129eff7fb8b6a178a430d95c2c05c22935d520eb537e40ed1b938c05d8d08ae8166d56181c1ed7a6afa22078853fc0d0f19a5e60d0841c1b06 SHA512 434dbe51178523147c7ab7a55f77d7df6330ebf0c10a0a1ca96386c77aba98fc0cb024d79d8bc6a3b8200d76cc0c90bf0315845e22d407f5d8086718eacd0090
 MISC metadata.xml 737 BLAKE2B f434d4398ccc7e8feb419980f2a71e69a74eb8e66ce506c180349bc4a3f69947e6002b3d930a3f3695f63f8acdba692c531cb9e700776e0889422e235e0ee5af SHA512 eafe24ee36b106a31703feb548b75d4eae9ba6d5a903570351bc647cff3f42ea2481602500f53abece88ac054b46629d46a5643148b514fda43f53b5d201875d
diff --git a/dev-python/constantly/constantly-15.1.0-r1.ebuild b/dev-python/constantly/constantly-15.1.0-r1.ebuild
index 5d0b3f160999..7f1753cbfab5 100644
--- a/dev-python/constantly/constantly-15.1.0-r1.ebuild
+++ b/dev-python/constantly/constantly-15.1.0-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/twisted/constantly/archive/${PV}.tar.gz -> ${P}.gh.t
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/contextvars/Manifest b/dev-python/contextvars/Manifest
index 54efa22d834f..3529f15fae21 100644
--- a/dev-python/contextvars/Manifest
+++ b/dev-python/contextvars/Manifest
@@ -1,3 +1,3 @@
 DIST contextvars-2.4.tar.gz 9253 BLAKE2B b46466e44f836561024b69bd648613654336a41f964ced77ab29e2fa20b43b19f0c6b5b72d31ccf208c8b74ad54fa1898ac1c09b24b124ec53a5970019910553 SHA512 391c12f163854a21d6422afd9464e8896c02b5cb5e2c567550907a16b7970d4e2d02cd360851bba103efd64062669596eacadc7421432198c61054837b57b223
-EBUILD contextvars-2.4.ebuild 561 BLAKE2B a2472185707896afd8c8619060133af2f2af680c406e89fb1ff439a52b6d042fe1d92a0a6fbb12fe0fa1234ad4952ba3da30615cf86e977ce3ada78da562c495 SHA512 46e92123b0e3221216c554258eb2c0e7b3d0b822fe71ee23cdb31deddb69eb9b39fee1a988da0be575adefe129486b3a85cbdb0c8d1c49fd878948d6419e5e10
+EBUILD contextvars-2.4.ebuild 566 BLAKE2B eb9a8165c7cc1fdf22f2abf32f1c18cc00164f7bb3e9efd31bfa84f39ce81fdbaecbad2ca151225c8e80713ebc969dd01c70eae7bb304d6321f5e52a48d58f43 SHA512 e5bbec630890289b3e3f8a305a6f6abeb3b273f3bc719499c9f93188c8f1694dba4c1ae120a53aa4174827b616a248b6af171d545eba900dac929fc30ee4ea8a
 MISC metadata.xml 354 BLAKE2B f7fae56b019c0b03a1e699cd23711fa067c36549b7164f7d4f4aa1001f49d290d1dde42a5fa8c57cd77f20454181f259723ee6847ac38e97c7fd46235901b201 SHA512 79f19d5d674af1a45bfc90fe9bb2e4fe9e21d1fc195e6475b9a7c28014dba29a45fc49787b5fc9c2d7b33dc8ff6ddbc7a4710e296064d4fd097bbbc0df6a0ab1
diff --git a/dev-python/contextvars/contextvars-2.4.ebuild b/dev-python/contextvars/contextvars-2.4.ebuild
index d4247a17fcc9..f49943beeadc 100644
--- a/dev-python/contextvars/contextvars-2.4.ebuild
+++ b/dev-python/contextvars/contextvars-2.4.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/MagicStack/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm64 ~ppc ~ppc64 x86"
 
 RDEPEND="dev-python/immutables[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/cookies/Manifest b/dev-python/cookies/Manifest
index d91d6ce1e6ba..8b2289064042 100644
--- a/dev-python/cookies/Manifest
+++ b/dev-python/cookies/Manifest
@@ -1,5 +1,5 @@
 AUX cookies-2.2.1-fix-warnings.patch 9038 BLAKE2B 78692c413a2a5495dc43c544cbc27410a341088c8ffc8cfb8543ef0a6f7e7393ae37379912dada2cf0e4ce8b238160244305869a12629ede435dfcb6df334910 SHA512 cc18c782d07bda0518a1d0824281ac068bc97684abc505ba24bc895e6f43f70bc16835c9781ffada42175ac2cb9dde7a200b0746910e7106c3b41e8a9a0cb382
 AUX cookies-2.2.1-tests.patch 1131 BLAKE2B c98b40cab2a20b5779e670bfb481f34abaa080d0780a76127f12783f0fd108b67c590d01304f2f173ab5808fd8f9ad7ef65d0227a1f31eac4296302b7610ea81 SHA512 ff571d810ca576a9dbcea1960056ed05ceaf738148324d434409b03cf399d43ecb5b13fe228da54465d020c6cabe109a447f1a04a37d1276feaf5be6cf38eea9
 DIST cookies-2.2.1.tar.gz 40704 BLAKE2B 422d70f15e93193ac9c4865f988b22a895a81c59ae98a86cb90289940c283f3998a7e1d3b7ecc0a4f4b004d6b4b64de6743cae7a10f45d9bd1e6136ff35518c0 SHA512 76f362a9a1d74b87c90c5b91ad806d872612d31f487e4067a627409316f6099602c9e5a429f85ce20adcb0a7b63dd131b9e1ecc5c0c6444d1569367432a719de
-EBUILD cookies-2.2.1-r1.ebuild 638 BLAKE2B 3f8a22f4d89f1aa95bf0bf36b2a26f1c54b472a382720b7377c0826137e37635c44f597580dc898bc660a7644d699ef5cb500206c17c65c6f3bd8eca089ed7b2 SHA512 ae8625938440b4014c75e0818f8bf116dbeaf5e7ba99df95034f56f5ba1b4400c32da7af4fc57baa269ad5f6ebcb502ee6398174958cd4462e98972ad156b0d5
+EBUILD cookies-2.2.1-r1.ebuild 643 BLAKE2B 7c3b4d6b3111a294ff037f2626351d4718645b04d04bff34b9ad813cdedab594074e65a6b933321beeeeb1e9c98b26030f8d11794e2c615d2f0300055c321796 SHA512 dcc839c7426f769e982f2aa7c11c45033684f07b14fe45bc22040e601a31b47d1db0f5ffca6c99371cc4635d5cb92ecafc25cdd1ec15ce07bc017963d0e8483c
 MISC metadata.xml 310 BLAKE2B 3f44f9692738692ca4eff801de2fa67bf33220d8b5a94985dcf33c21d1b18b78f6dc8f13bdc42b4edb4afa96a869583c6caa0643190ec68a24c57852c4212d8b SHA512 b98da30bc8b8f3deb352a59ca73a88a9640cadbc20b3049523930f6e671cd057d19b4dbd559702efdac09ba1ed238b7df95502e9203f1d34147fdea5a308c82b
diff --git a/dev-python/cookies/cookies-2.2.1-r1.ebuild b/dev-python/cookies/cookies-2.2.1-r1.ebuild
index 3619a599b5ad..19ebc6d5af40 100644
--- a/dev-python/cookies/cookies-2.2.1-r1.ebuild
+++ b/dev-python/cookies/cookies-2.2.1-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 
 PATCHES=(
 	# https://gitlab.com/sashahart/cookies/merge_requests/2
diff --git a/dev-python/cov-core/Manifest b/dev-python/cov-core/Manifest
index a7390f1aa1b3..4482121b459f 100644
--- a/dev-python/cov-core/Manifest
+++ b/dev-python/cov-core/Manifest
@@ -1,3 +1,3 @@
 DIST cov-core-1.15.0.tar.gz 5890 BLAKE2B bddab94ae47ba19ecdee5aae0198d9086a423673362ac64f0885f773bd8b8ab3f4d6abf1203ee901e272161dfb4b64168f2aa5f2d0f4426ea279d6d7251e921e SHA512 1b962a6a7253c1f6530248f3a71058e7709ee5cca274166807f040163c9cc240e9e85e42820063476c1c0f6dfca81d45277738663ed818fe715b30db151ace16
-EBUILD cov-core-1.15.0-r1.ebuild 598 BLAKE2B 6298128072a2516fd9d542c33a911776e536fbfe55462d86e34120311d595780f924d088fcb6877c66ba4f4bbf7e7d65812261462824ae64fe3b9c50674f6ff9 SHA512 6b4fab931db73086e28e57eef7d0e5d9dcd0a5e732c565ba1ed692d49b1179f0ec74672b10ba81f0dfd37c27d39ec7693554d58864378de85ba203b012502ddb
+EBUILD cov-core-1.15.0-r1.ebuild 599 BLAKE2B 6b76cc2d2e3c268505832b55c2839c367968d927ea9b9a61f82cd22e88494bcbcc0f3593a3b9467bc5f3c44ece50f86f373a3be246171bd0d728301a2bca5d8e SHA512 1b4f76dc376c69de52b6a3ee3177a41ae7b7d4d9f3ec2b296057638b610a5b398060399f522b28ec71db11fc4223b4423e4163c12fcb29410b83139a5fa3eea0
 MISC metadata.xml 389 BLAKE2B 79a7ccf0572ed3cb85715d40a9096058253405df1eced44164f6d60462c00d403c69fafda3ebd5e28e158a4e0bcf7a648f956dee39faef80f0153a260ad84a0b SHA512 62a559392798a95fd3b0e540eacd9cd3ea997a9cfcbc5492ffce378353ea737128045d46c8bf2d89d3641c575ab943ad66a97ba4e7c1efe858abf1e7d7a2aa74
diff --git a/dev-python/cov-core/cov-core-1.15.0-r1.ebuild b/dev-python/cov-core/cov-core-1.15.0-r1.ebuild
index 210e44f673db..3becb7572b51 100644
--- a/dev-python/cov-core/cov-core-1.15.0-r1.ebuild
+++ b/dev-python/cov-core/cov-core-1.15.0-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{6..9} pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="plugin core for use by pytest-cov, nose-cov and nose2-cov"
diff --git a/dev-python/coverage/Manifest b/dev-python/coverage/Manifest
index c6540ce6d2df..e83c3f3efd25 100644
--- a/dev-python/coverage/Manifest
+++ b/dev-python/coverage/Manifest
@@ -3,8 +3,10 @@ DIST coverage-4.5.2.tar.gz 384845 BLAKE2B a7b4f249a68e025449d26ef8ee2194b9ce355c
 DIST coverage-4.5.4.tar.gz 385185 BLAKE2B 9d040bff13cebd1cb7147f15c3ec03bb08648cf801b5b2bb046a6b5bcadb3d3886be8bf0a624d225f25d10a5ca82fe5fb88f55e44e92a0a3285836b837972970 SHA512 ba534e04fe35cbadc4b16735f25c08f579a49a6677ec106680f222f2dfb3d0f1e011d0962f1c2108c375173ac4588bea1619ecda05ff9ba6fd888daddfd27b0e
 DIST coverage-5.1.tar.gz 687427 BLAKE2B f4eee548cd6fb58c4a527b9e0ac5ee4133c984358f42ca0c87301f95eb60253a2748ccf9d4e88358941d7897998e68e3c5e70e6dc7387bf5e60eda950f4a679c SHA512 7bd3ca158fe2eab1946c52161fb877623d4ed0382de193aa6eb267443fdda86089ec7aaae518115d6a3b5487fd1400320eb503b9afe83182fb3c3621ccbfb6d7
 DIST coverage-5.2.1.tar.gz 694076 BLAKE2B 0aaf9b5668c2fac1220c377d5b841341b534bd14579b70fa3d4c5e64239df71b95c2278e041f46ae3f9d2ae55145894d51457caabdd9540b7d8ce3f32f8d409c SHA512 bda6129a4f4e2db3d26878036ceec137e4f359b8d37ce087e4007751bf0bbda7d706967a50b120378fa533f980e70142328099332374a1f303fa0083ffc078b0
+DIST coverage-5.3.tar.gz 693632 BLAKE2B 9daa3a0fd7f8c3ff7c9d68603e11a0a419d3ab50e3c3fb6be5b694aa1f7566040e1212b7175dfa4f71a0a309db325c00f94a85e0e9e755ae8c4f09c499d0daf4 SHA512 f40a21c394b1a72118965f702ae2b8e09c4e0b2fe92709aedf1de4c8074cd9c2cae0ed4860fbb863e4e5479f1067ff806d7051f7683d6b324de9945c0cacfc39
 EBUILD coverage-4.5.2.ebuild 1237 BLAKE2B e34bf2b12ce2f78f0882e690ed2d8fb9dccc805a3ba05ffbb25e5a69e9590fbf5706800b0b5fdcb055e0044afa92feb6b7903b23f85343d8b5d56ad724a4145a SHA512 24f1e3624cbf90d7debff9fe521cda8c4ee9cc368377cfa7d1143768ea7f674f534a3c94201e5f3154b0fc5499e953b53b79958bd5aa0e40d0e424ce6f28f02c
 EBUILD coverage-4.5.4.ebuild 1787 BLAKE2B b644cd4091377f15566c9bc3979410910429cede262de4d941e48c1bd68db7cdb5d7840cb71fa9454d6289db66b69772b2519b5ae2a82ce129ab2a54136d1528 SHA512 a52843da254fdf9632bb3461bcae4f58c5e7537577510aa8f4e0ca8bf7cd236376cbb707b01b3933670dc686d4a4c433115116e42e6c63f66336c2d6234a5486
 EBUILD coverage-5.1.ebuild 1882 BLAKE2B 654f744159702478c1570a0f3bad15db7dc5f377442c30e256c650da68e80bd071b06a3a96453965916254fd88747a5d023d5f4f8f83ff35d2a9644e66687e55 SHA512 cb43a7226368f4266ebe0ef1a001508c054aa3d4655a1d6f51e669e5dc49c67df1ec583664ded59e7a13191b132c510002dc5099ced9d347ecd91364703a7a5e
-EBUILD coverage-5.2.1.ebuild 1889 BLAKE2B b177a6c5b6d6e97fc959be935f1b3cdf02cccb7cfb16d20543a72c89341b6def4fac71fe66117ef42e560ab935afd5f35cee9e2594d2c14efbcb1ad4034e4675 SHA512 f11127308fce1be9833c91750bf73b231feaab3a456fc99cb0b8408e2aa4f3e1d1b2ab64495333092eb2ba2425e6ad87f49e5c187421bc73b8524f79f5e8fbf2
+EBUILD coverage-5.2.1.ebuild 1891 BLAKE2B f96cda5458c5fd5f2be1ad962970a99cb530da08ce4c33ea78411b3c5bf59b5f099c2019b28d52f1809e1ffd72b472ee5e54fe0c5054b00e010e2b5736462832 SHA512 9620a77e36ffb9d9839e324acc7e396cb52834fb137e5933e6053bed3c0eb04288f359b0f121f3ce285bf099b52f83e21b5c01a3e36618163219630b4c1ffa02
+EBUILD coverage-5.3.ebuild 1896 BLAKE2B 9da4cbe5ff7901f65dcb1b94e91397418726ee7a3af6d5e139acb28771532ffb7cfd2764810640562e22c8f3f06fa5ed004d651805711c9fcec6fb284400fe2e SHA512 fbb2ceff06b7f8c4103d376aa5d8d1190bb0be5f9189e1fe922545b10ade5e1a99e7f6b1b853850191854efc0f851cede8a6228a517f49eef7d5f7cc2289134f
 MISC metadata.xml 713 BLAKE2B af0e3d7e3b503581edb2552d0eaddcc9cf3ea5cb92db247cbae4dc66edfb1da6608f472cd2e76e1c17537b6907b991fbf2b4c250792ba6654fd0d4924da599db SHA512 d836604218fc48fd477b27744c6f97a40c3102b859b25e327cd0775ecc54390db62c9f4096c8c54af26557c38dd48ae138a8bed742aaa759572189974522ede5
diff --git a/dev-python/coverage/coverage-5.2.1.ebuild b/dev-python/coverage/coverage-5.2.1.ebuild
index 53b473ccf11d..7c1796f4f87b 100644
--- a/dev-python/coverage/coverage-5.2.1.ebuild
+++ b/dev-python/coverage/coverage-5.2.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc ~x86"
 #IUSE="test"
 # The tests are impossible to appease.  Please run them externally
 # via tox.  Or fix the ebuild if you have hours of time to spend
diff --git a/dev-python/coverage/coverage-5.3.ebuild b/dev-python/coverage/coverage-5.3.ebuild
new file mode 100644
index 000000000000..cce4c0981a5d
--- /dev/null
+++ b/dev-python/coverage/coverage-5.3.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8,9} pypy3 )
+PYTHON_REQ_USE="threads(+),sqlite(+)"
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+DESCRIPTION="Code coverage measurement for Python"
+HOMEPAGE="https://coverage.readthedocs.io/en/latest/ https://pypi.org/project/coverage/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+#IUSE="test"
+# The tests are impossible to appease.  Please run them externally
+# via tox.  Or fix the ebuild if you have hours of time to spend
+# on something utterly useless.
+RESTRICT="test"
+
+#BDEPEND="
+#	test? (
+#		dev-python/PyContracts[${PYTHON_USEDEP}]
+#		dev-python/flaky[${PYTHON_USEDEP}]
+#		dev-python/hypothesis[${PYTHON_USEDEP}]
+#		dev-python/mock[${PYTHON_USEDEP}]
+#		dev-python/pytest[${PYTHON_USEDEP}]
+#		>=dev-python/unittest-mixins-1.4[${PYTHON_USEDEP}]
+#	)
+#"
+
+src_prepare() {
+	# avoid the dep on xdist, run tests verbosely
+	sed -i -e '/^addopts/s:-n3:-v:' setup.cfg || die
+	distutils-r1_src_prepare
+}
+
+python_compile() {
+	if [[ ${EPYTHON} == python2.7 ]]; then
+		local CFLAGS="${CFLAGS} -fno-strict-aliasing"
+		export CFLAGS
+	fi
+
+	distutils-r1_python_compile
+}
+
+python_test() {
+	distutils_install_for_testing
+	local bindir=${TEST_DIR}/scripts
+
+	pushd tests/eggsrc >/dev/null || die
+	distutils_install_for_testing
+	popd >/dev/null || die
+
+	"${EPYTHON}" igor.py zip_mods || die
+	PATH="${bindir}:${PATH}" "${EPYTHON}" igor.py test_with_tracer py || die
+
+	# No C extensions under pypy
+	if [[ ${EPYTHON} != pypy* ]]; then
+		cp -l -- "${TEST_DIR}"/lib/*/coverage/*.so coverage/ || die
+		PATH="${bindir}:${PATH}" "${EPYTHON}" igor.py test_with_tracer c || die
+	fi
+
+	# clean up leftover "egg1" directory
+	rm -rf build/lib/egg1 || die
+}
diff --git a/dev-python/cryptography/Manifest b/dev-python/cryptography/Manifest
index 6f646563a28b..315179f43091 100644
--- a/dev-python/cryptography/Manifest
+++ b/dev-python/cryptography/Manifest
@@ -5,6 +5,6 @@ DIST cryptography_vectors-2.9.tar.gz 35140661 BLAKE2B 870245659f6a64566f823116d8
 DIST cryptography_vectors-3.0.tar.gz 35156155 BLAKE2B 987fa88873bb3ec9745a150906e868c1aea14bb9e618c5c65348deb4e8618f89b15a8d70ea6ed0760649505f5649dd2fbf1e40fadad193faf3a92922ed234025 SHA512 a24c6f25c0acf79cea534fc86d61d9697c004a18204043457cf1a955751e8313893c63258f82ada523a9608b7ec0e5a7a7047ddcbd20e0c55d7c6392bc61c24f
 DIST cryptography_vectors-3.1.tar.gz 35163687 BLAKE2B c381781950bf5399c15fe329fc28cf35933936a2130bbf18909f31f1bbd764a69a8816327e968d3810790b8404e3ae5af25b3d390da3015533f5c52f8a0cd0cf SHA512 094076a26ba4cae1bf0408844abbb9b3a5634f97657e4627e10b8a7c7424b69574fd9d719d5c258aa02244bee8b395f09c51af79350971072b2f9719446743c1
 EBUILD cryptography-2.9.ebuild 2048 BLAKE2B 13d5aa1de69c55a08312a302f96069f1a76e78cdd998b0255539656e425f7956788ab2c2b5e776434fff3deeabeb2d9e7c3152acfc42b78910a91bf50aae7947 SHA512 8fd34e0c4009ed7f276a5f562d9b6df1bb782c5ddd8ea73e1240e414ebc7f6fc352217b5cf4a721b87b1b390ba7695f1459c19c58cee797ab1886fd9d523d693
-EBUILD cryptography-3.0.ebuild 1968 BLAKE2B da1ea5be9d78dc8ba42f9824f4f231e038a73c47c3bbfba2b0f8cfdd7dbfc5c1503fb8b8bbac4eef02b945d3a722fc77a8293471c378d008569181954d11c754 SHA512 0453f407e632f30d26f5e13390015613c984ed6afb8856bf9057fe1cde1e856641862d396dfb225a579e04d36d49a28f78e69e279ac51519c3d98a197389952b
-EBUILD cryptography-3.1.ebuild 1968 BLAKE2B da1ea5be9d78dc8ba42f9824f4f231e038a73c47c3bbfba2b0f8cfdd7dbfc5c1503fb8b8bbac4eef02b945d3a722fc77a8293471c378d008569181954d11c754 SHA512 0453f407e632f30d26f5e13390015613c984ed6afb8856bf9057fe1cde1e856641862d396dfb225a579e04d36d49a28f78e69e279ac51519c3d98a197389952b
+EBUILD cryptography-3.0.ebuild 1962 BLAKE2B 6c99e7c2dc750ce75c0a14447d533661475d2f5c74e3b60d87a6fcf4e6a9742142781b03c5f836e0c9c3d69974a7f38004d45622a15d8201f0e59b8676216210 SHA512 72d18bfe155dea37104c4103155afbd87b20102da0e1c2e5331dcc09f5b4476f4fce1ced486a5c5c593d53a2c8dd62005a16ee26c5a57840131d29e33c9b5b1a
+EBUILD cryptography-3.1.ebuild 1975 BLAKE2B 7ca209841370310dd20201e7d4e63a52e1eef2ec0ec8419dfe900610ffd24fb5a8bc519d73f1477dece54b9bd8ce60e883ec5ca1534846fa0449a5f6d7ada61f SHA512 e3abd81f6a6279f02393a965c8df6880332be7654f6a7d5a38ec5f25974f820d10ebcc950c235428f28c220e03ed684e8348d5288b5f35f8c8f628909e503b9b
 MISC metadata.xml 499 BLAKE2B 2e4c37917ebb1604f399b0db4abe27b02b133a2cc8fb69fbbf52b6fdc0aee079dde61be188bfa5bca043a1804a670ffb53f6ab1e79147230166f696741fadad8 SHA512 26eda8b0a2ac91dce2946e18e941e2e75df15e4583e4ddb1f1329403eaae30db9976017f92981c462bfb8c8a559de2a2ea9531f4ac5ccb2d57cadb00e68e05ec
diff --git a/dev-python/cryptography/cryptography-3.0.ebuild b/dev-python/cryptography/cryptography-3.0.ebuild
index c2571ae27052..7425755d68c9 100644
--- a/dev-python/cryptography/cryptography-3.0.ebuild
+++ b/dev-python/cryptography/cryptography-3.0.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
 
 LICENSE="|| ( Apache-2.0 BSD )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="libressl idna test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/cryptography/cryptography-3.1.ebuild b/dev-python/cryptography/cryptography-3.1.ebuild
index c2571ae27052..0469975fc43e 100644
--- a/dev-python/cryptography/cryptography-3.1.ebuild
+++ b/dev-python/cryptography/cryptography-3.1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
 
 LICENSE="|| ( Apache-2.0 BSD )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="libressl idna test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/csv23/Manifest b/dev-python/csv23/Manifest
index e8155ab9989a..10ea4fedf3ce 100644
--- a/dev-python/csv23/Manifest
+++ b/dev-python/csv23/Manifest
@@ -1,3 +1,3 @@
 DIST csv23-0.3.2.tar.gz 24132 BLAKE2B 2c5eb231814e087dce9689c7075bdbc3875b3e200dc1273022d55661ec60f18a5bcb03e062b205fde13e845e5e50d530b07596b51ad7b2a89e41b45629bf3ce8 SHA512 289386cce5de4ae5bc42fc56d1639bbd1483034e5422f63142c1d188de735b1f5f18f9f69e3cb96f4ac3e1d7d0b371b1c45e720982c4f4b539fcf0d2da893f6a
-EBUILD csv23-0.3.2.ebuild 827 BLAKE2B ccf04535381d2157f83855d0e219b6a7712688b8fae2d155e423e51d6902abfa45b75c37a1c8ea45da73e99a98bd994139886cd9276cb3b04ff0eccea75fa11c SHA512 c7c2215faacd175b782bcda975d1dd5e7b17d4e1506eb06e59f5ee1112096e2298ef0ff6640a068d5fc872c66fa06ced112b1c727bfb3a38e57de06f4cc18046
+EBUILD csv23-0.3.2.ebuild 832 BLAKE2B 4e9fdfab073611e994490082dc292f3ba13d74dec004dc7bec4e12701393d7baab2c45e27b53439eec68cd651a9abdac0b80a23868b44c8fca046238152f0ba9 SHA512 f53f14e589a20a261a5cb38d47ad8a6986eec0201db21dd3b9574426e7c802d35175c266a6436de6593eadb06aca238d701a38f06f222d469c07e9bde34112f6
 MISC metadata.xml 218 BLAKE2B 086fdcf7b63ca7bd6c58e861d717bb375e1cd372eff26d5d2eeeb176d8c5e6f10e653562abafb50eae7d7508f8e3d421b87e6a749acd0490308672828d0da697 SHA512 4558fee4c51117e21b1f42ca3edbdf1195ed297db798d6bfa0e5fbb7019654a187422b0abde7af5d800caffed66d1e55e4280e8be602bad591424d9776c46781
diff --git a/dev-python/csv23/csv23-0.3.2.ebuild b/dev-python/csv23/csv23-0.3.2.ebuild
index 4cd89a07f42e..0fba6113fbaa 100644
--- a/dev-python/csv23/csv23-0.3.2.ebuild
+++ b/dev-python/csv23/csv23-0.3.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/xflr6/csv23/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~ppc ~ppc64 sparc x86"
+KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86"
 
 # note: upstream really uses mock at runtime
 RDEPEND="
diff --git a/dev-python/ctypesgen/Manifest b/dev-python/ctypesgen/Manifest
index cc3c9addd7ab..a6c698727d2b 100644
--- a/dev-python/ctypesgen/Manifest
+++ b/dev-python/ctypesgen/Manifest
@@ -1,5 +1,5 @@
 DIST ctypesgen-0_p72.tar.bz2 85694 BLAKE2B eab6f01c7fc541f069d131abe255a51dd876e0629639cb46a8fac215da55af80746771cd15a5de4b300c58f56e4b975985953d4efe5327c8d2b29c37c166c393 SHA512 eab85c71a2f98fd03ae582899de680bd861e7e6e20841ac087520f8b844dc686ea519b0510382cedec09ff3fa1d87fcc1c79878a2eb9219d7cc092423813e2e5
 DIST ctypesgen-1.0.2.tar.gz 119413 BLAKE2B 27bc387ccbcd62cd164aef544129ead58248272251d2e2737f7fd65f22b92def3b62845a92dab4e1ba3faf030a002b4f2a67bfb0492ffb6298ddba9d7a2ba0f3 SHA512 d5168f72a04878d64b43c096f84f2a32663d481d7ac37f78d706f11aa09b68fe267af476885232a8c64be0f33dec20937e11bbfdef6231ecef1b19eae592d638
 EBUILD ctypesgen-0_p72-r1.ebuild 798 BLAKE2B 46552f34043b363b6969306405caee564b7e5cc7e19554a35cc186665341a5635727bd408a65f6794477288f1f1625dec65ab7f3f0872570825b73da98cc42e6 SHA512 d0e8d35eeea35b4cff80bbe9836611064b4cd5f43a850c21ea6c92b9e6c571ecc29d1df272dd8d9754db46c57a160a5fac887dafd48ab8b58c61581d2fd1d9a6
-EBUILD ctypesgen-1.0.2.ebuild 749 BLAKE2B 48c30bed24c64e51b96e5e898b2520f1770e5cde90df4c9d28486dfa5c3487fa1b15d0a122eb02ec4d229c1f77c542537000d5785ca6f008bfd489f25dd4200e SHA512 0f66533a2eb5fd7bbda8a4f50281b5aa13937bf88eafa631028dd22679cfe55aa0fc7d7c4abac45a58802ae80529f65dc9e2fc0bfb6b762c79898e3723622390
+EBUILD ctypesgen-1.0.2.ebuild 745 BLAKE2B fc25b584f6d296831a6a2465f45ca608757d00be9ffb0cb0912fd4dd6cc1bfbc6d6743080362338317bacc1d436e26f311052f86c2638fcd789cfcf11626c87c SHA512 c029eefc55c37026c6b54a76858cd49d61d4c0d7a973869b13daa968f52fa4fea38af8fcf11cf73ecf98851c7d260ae632e4ce6c4cf1a5a33c46f9094a361e97
 MISC metadata.xml 327 BLAKE2B 0c2d0845df5c1de25a375b7cd59ba658b8f60fa45224dd02a9bfe864685f3414dd741aef1b3256e2780470e87ae71d46fd872ecc8ad5f801bf0f281a83c04f04 SHA512 3cc32b4405bb86fec917d9fb3ff5aef6ebc1d4f73474a1cddb34dd6861e7916315a09f5171ddff9e35d61d1aab29cf0be47fa20c347fc8b93e2db6ca8323cb6c
diff --git a/dev-python/ctypesgen/ctypesgen-1.0.2.ebuild b/dev-python/ctypesgen/ctypesgen-1.0.2.ebuild
index a71817580b75..f7754a90a6bb 100644
--- a/dev-python/ctypesgen/ctypesgen-1.0.2.ebuild
+++ b/dev-python/ctypesgen/ctypesgen-1.0.2.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/davidjamesca/ctypesgen/archive/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86"
 IUSE=""
 
 DEPEND=""
diff --git a/dev-python/cursive/Manifest b/dev-python/cursive/Manifest
index 9d18a84acd89..6d490d31d079 100644
--- a/dev-python/cursive/Manifest
+++ b/dev-python/cursive/Manifest
@@ -1,3 +1,3 @@
 DIST cursive-0.2.2.tar.gz 43065 BLAKE2B 2c007b357c3cd1d560f74958b78d157c97301b8c2e15ed50ff340950eb4abb8baac078865bd82a3222a22505862a78a651905c843b6b0ba4662d653dfdd5f369 SHA512 6c97f8f71b016ee57349b8156543c8ca41c29c3f234ea60967b96c09fce2cea4b36b9f92996c622bd9504d4a71893903e8d5a8ab50e089fd37bddb8095f4b9d2
 EBUILD cursive-0.2.2.ebuild 934 BLAKE2B 5a9a3797ac27efde9ed5294b625f948c20776c7c46260ba45e778d01ee1c73c3d6ac77f1ebd599ff7ea859b583b254f0d7355b3027b41d44ff7b38d84ac9d753 SHA512 ea751234fa50dad065f7bca45c6b5fccb33442bde0f6f3095cc0c09ae3264bbaa7545bffc6c03e30304bc68a0cc5e87a42e66d17aa13da85a44083bd3f831708
-MISC metadata.xml 633 BLAKE2B 7b363a0b8ced131965cfbe2616dd30d3608d3d61b1c402b1885eea0e10c379e5d82e87e15abe1d805349ad2d99b94a2c2ebc2df7e8df7a5a095a4fffdd174c52 SHA512 0ab2f1ce6ef8d6e2a53a9dad20c26a26beddb6738857e3cd360362e0c1ad1c562eca6551cc88bb8ad4a8e08f621224934a4476b1ff22aee805dfe6f1ce352c6c
+MISC metadata.xml 506 BLAKE2B 5f2e3c604b20bd4f8c17efa4ca257497623af95891e9da873dc5b06de8e6f10be1f6b4bdfb341ea6b0bbe722b935ca68551f217b1751541e311ae65eb889a565 SHA512 6abaf6ce58fd7291e5930324a69581abef02af29f7ff2f8a21138efce7c310fde46da2286a994d74083d248fffb3194d38867733eeeaaa78e70d7db1726fa4d2
diff --git a/dev-python/cursive/metadata.xml b/dev-python/cursive/metadata.xml
index c1128eadb030..90971ef21590 100644
--- a/dev-python/cursive/metadata.xml
+++ b/dev-python/cursive/metadata.xml
@@ -9,9 +9,6 @@
     <email>openstack@gentoo.org</email>
     <name>Openstack</name>
   </maintainer>
-  <longdescription lang="en">
-    Cursive implements OpenStack-specific validation of digital signatures.
-  </longdescription>
   <upstream>
     <remote-id type="pypi">cursive</remote-id>
     <remote-id type="github">openstack/cursive</remote-id>
diff --git a/dev-python/dask/Manifest b/dev-python/dask/Manifest
index 7b6f7a8544a0..4cd8719e5852 100644
--- a/dev-python/dask/Manifest
+++ b/dev-python/dask/Manifest
@@ -4,9 +4,11 @@ DIST dask-2.22.0.tar.gz 2831467 BLAKE2B 641f71c868fe49a027adab11b0a84c091537bfe5
 DIST dask-2.23.0.tar.gz 2840133 BLAKE2B 2fe8e4007acf2bbd8bfab889e4d912a15518318dc019573ce6deb7f3a64504608e1e27c3bd9c6766dd98a071ed075065da9beda3f2e5fef27c7bfc9918516d0a SHA512 6ce0f1471357cfa4f5c7f2e2ab31009e68d3e5de363569867d67038ae2e1a9c69552797fb232fb92deafc3b57aa040df9e60669c1856cbb53505a905c4f4b052
 DIST dask-2.24.0.tar.gz 2826106 BLAKE2B fc63bf33f8441a70412e7872c696c071c5e156137fe767007a57f6d2c6a976bd29fff4db20f42c76014bbaf8b763f0a9d974ed1fc62530a3a91633ab97a1a466 SHA512 cf9a781c64eca4be84b82d026cfa1883d54ce18c93625e28c085a7bd63ac129befeded808c817e4adab790c28aa2eeca4f79c7086be683f1a7d30c6d1961c0ae
 DIST dask-2.25.0.tar.gz 2842089 BLAKE2B 048a116a60dd98c7c1f3800426af13c2d8d116772a6b3133823b9a78ae6fcd34ab32dbfb9ae8db9eb6c948bce381e5d6e91caaab78203ae56159493ed7689038 SHA512 0d6e8e8c1efbaa4dc77e1a505e5c2df45eefc43868ce923ec674c5f768f12beb30e06c8712f621e44a826fc11f86fd50e60f0f6a78e261d74273f73b49503301
+DIST dask-2.26.0.tar.gz 2852574 BLAKE2B 66abba9ef32bee11249557e38eee7e60d2988f098904bd867e5e9ad110d735c1a3b3f10829c58fdca5400f078fc569822e7e73f0e9c6894dbbfa41b46d521f61 SHA512 07daf541570e9e30fcb97f607b9629761d14de58fcb4b89fd01f9688690af1b55b80e3e62eefc54942d47da5fcb9d3c4aa6bca0b76f4bf60e664054515e18fcb
 EBUILD dask-1.2.0.ebuild 1204 BLAKE2B 9acad86af714eaf0f95d3bb857bf2bc6ae960316a0304a6f3b1a5b47b0b0e063347732b2cfe116de9ae69b3a6413729b1c610bea08e8c8813ca14e8e352e2b2c SHA512 364829d15951d615f25fa31cfd95134d338f292fb75deaff6c50cc558d934c3c99b4ab046c3cf5d155159c1f3f54beff37361edff0172dafc811d1f62e794f0c
-EBUILD dask-2.22.0.ebuild 1354 BLAKE2B d3025d5df58ed2653ab36973b0c0f1833e8988ec6f085016db1125e010ed7e30cb24f5d89d7e587591cadb7b12abe0f7aaca8ef7bba4114df8e1e2da3d063b07 SHA512 c197be6f6c26a1b82aede6a1d5516e5cd82398cc6624b3cec4910790cb41c9a190a6977bf7a22bd3b8251420442524eaf94d85b1bbeed4697654ac7b2e173771
+EBUILD dask-2.22.0.ebuild 1353 BLAKE2B e18f3787f24b1a3a7f2427d0c271196271b195ddc1ea91ef3beea8d5c589bb4c5850838ffee9da5d541971e65a5d8863188905e168199f2ae5aa4d80927117a5 SHA512 025949572579f3cf9eaec9fb5ec8a109ff61a6b48cb5d1c89780e7b0f42b6856474a5c6f6f249e8ae3e8ca56e7a9e6e71c00510e92ce8ed88b145f3d1fb8349b
 EBUILD dask-2.23.0.ebuild 1417 BLAKE2B fe14aa208dc839483cfea6cd4aee744cf79f02d731856c0ecfd691f7ba0c50162f258ed8a1e36cb86691e75ae2cbfa69ba223ea14ef507114e715d8ffff00d91 SHA512 411a347eceef785bf805c39841031c37b3a58c0852fc9f13cee0339b658374759e90e3fb0ab27751d9018499bffd57b1193f8c2894f04e232eb274334ab69c5f
 EBUILD dask-2.24.0.ebuild 1270 BLAKE2B 064240ed65711f6446b5fd312d3828e1f5f52d911f6fe57ae0556463c29596a5d4b7b5513b1438662117b8897383811e5230cee75150028e3f643ecc8cf06968 SHA512 b1d2f50d76b9f4d826e9cc9e3eb33f366a42540f4b44463ed4b98dbe4d5f863b3cb7b2f62fc750a937f80cc064bc01516fab73fa57f19d5768d7266655cba94a
 EBUILD dask-2.25.0.ebuild 1183 BLAKE2B 59af442edb4594bee4bff5f81bd36dc2ee8732e5ff643806b347417be8c58416cc219cf4a4b667886a287288fe8350adae32afe5aa74df8b8a7d8e3eae4a489c SHA512 e82eb8e98fcfd572af2e1418625d5ee27cd2ac8d14db7fcbfde80353bce4394bbd4f0075f35a5893399fea31fb0ed93bbc960f74822489b9e40734676191a70f
+EBUILD dask-2.26.0.ebuild 1219 BLAKE2B e70d1d7dddbb5dfb9cc43f466d172f9e9db530db70c01e046d335ccb8ad6393aaba4cf6cda1e61ffdaacc12d2a3585b48331ad1a6bf9dd2ec7cbafbdc22c8c54 SHA512 7510a137b8ddf08978c37a49aa3d3648dbed90d2d67557a0be4e95aa8f8ab38304dbd958d0b83e1e845caa66721887d4dd3f8dd811d886d1eeed8279275027e0
 MISC metadata.xml 738 BLAKE2B 7fc68719e62b0af7e8b81c1264c5cd59294f56c04958516d8c5a80d3ff56495957eee60a258328c840016e674b97c1898ce5cde4b3564377093b9a6533d4b479 SHA512 fc576c213621f285d74e94f156390c7831d28cf66303c6b06fe4d8f99c244c94fdc6a38511c1135d44d4e1ddb4c6febf469cefeeb122be6edf238d9a07ca3c6f
diff --git a/dev-python/dask/dask-2.22.0.ebuild b/dev-python/dask/dask-2.22.0.ebuild
index b4855c7b7821..715909e909ec 100644
--- a/dev-python/dask/dask-2.22.0.ebuild
+++ b/dev-python/dask/dask-2.22.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
 IUSE="distributed"
 
 RDEPEND="
diff --git a/dev-python/dask/dask-2.26.0.ebuild b/dev-python/dask/dask-2.26.0.ebuild
new file mode 100644
index 000000000000..9741a26c5870
--- /dev/null
+++ b/dev-python/dask/dask-2.26.0.ebuild
@@ -0,0 +1,44 @@
+# 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 multiprocessing
+
+DESCRIPTION="Task scheduling and blocked algorithms for parallel processing"
+HOMEPAGE="https://dask.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	>=dev-python/cloudpickle-0.2.2[${PYTHON_USEDEP}]
+	>=dev-python/fsspec-0.6.0[${PYTHON_USEDEP}]
+	>=dev-python/numpy-1.13.0[${PYTHON_USEDEP}]
+	>=dev-python/pandas-0.23.4[${PYTHON_USEDEP}]
+	>=dev-python/partd-0.3.10[${PYTHON_USEDEP}]
+	dev-python/psutil[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	>=dev-python/toolz-0.8.2[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/toolz[${PYTHON_USEDEP}]
+	test? (
+		dev-python/moto[${PYTHON_USEDEP}]
+		dev-python/numexpr[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+		>=dev-python/s3fs-0.0.8[${PYTHON_USEDEP}]
+		sci-libs/scipy[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	pytest -vv -m "not network" \
+		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")" ||
+		die "Tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/dataclasses/Manifest b/dev-python/dataclasses/Manifest
index 843db4092d25..27a33ebc2246 100644
--- a/dev-python/dataclasses/Manifest
+++ b/dev-python/dataclasses/Manifest
@@ -1,3 +1,3 @@
 DIST dataclasses-0.7.tar.gz 35690 BLAKE2B 8d3c60d1e2ad4c9ceb3c502fa74f8fdae75717e52c698984b6def96e867cae633864de711856a69992df6a207617d17d7116f5e0daa7d757076dc8b97d7e0e9b SHA512 ff921237a99bac21e091ff253824eb07eb09be7e7ec02b869da9c68c35141fc1bee526b3d2942963bac7762827438ea8fdc89fa72404991b78d1d063a3c18661
-EBUILD dataclasses-0.7.ebuild 531 BLAKE2B 402bbdfb9bdd5ae539ec23444c86b2fd2d3497a26d820ce43931b9bd64e9e6d2dc1cb115a6b0c3b0ff6a903892ae2c20a30099cb72ec33670d2460ee209a5b0a SHA512 f80392e2c36737ba85f3a01f0185bc981b6b7357fc6716d51cfb099d1fc5b84d479ed1f4dd85b2f64591d6ff5ec9396d3fac41ca55558ffd7f176ba0ad102a97
+EBUILD dataclasses-0.7.ebuild 550 BLAKE2B 547bd291e9a0c39783cb005caab2cc9ae7470a059b61092d740ad937c53925b50f34d208b0a9b0c8d1645439f70c1ed4f9cb673a2fcd946ce8c613b726d0331f SHA512 22bc8eaab14eb62e397554010eb668f350b0dd3e21673abe7545610623e4d677f943734b417e8dac29cd555642034e7144343fb7533f2acddc7bff62144865e3
 MISC metadata.xml 218 BLAKE2B 086fdcf7b63ca7bd6c58e861d717bb375e1cd372eff26d5d2eeeb176d8c5e6f10e653562abafb50eae7d7508f8e3d421b87e6a749acd0490308672828d0da697 SHA512 4558fee4c51117e21b1f42ca3edbdf1195ed297db798d6bfa0e5fbb7019654a187422b0abde7af5d800caffed66d1e55e4280e8be602bad591424d9776c46781
diff --git a/dev-python/dataclasses/dataclasses-0.7.ebuild b/dev-python/dataclasses/dataclasses-0.7.ebuild
index 5d420c62dddc..3abafb733cdc 100644
--- a/dev-python/dataclasses/dataclasses-0.7.ebuild
+++ b/dev-python/dataclasses/dataclasses-0.7.ebuild
@@ -15,7 +15,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 
 src_test() {
 	cd test || die
diff --git a/dev-python/dbusmock/Manifest b/dev-python/dbusmock/Manifest
index a005f8ba06d1..ac0c7d948d81 100644
--- a/dev-python/dbusmock/Manifest
+++ b/dev-python/dbusmock/Manifest
@@ -2,5 +2,5 @@ AUX 0.18.2-disable-polkitd-tests.patch 372 BLAKE2B bb9b33df485c635a080c41d4bea53
 DIST dbusmock-0.18.3.tar.gz 72049 BLAKE2B b5ed8ebcae51fedec75fc810e07dc9a38223bcde541cbfddd5d3fbf1ad45d1458e6ad39c1fc69ee77165d751f978cb4483929e823eacbc99a7ae414aebf4d0f0 SHA512 6f7b42eae578ce03024b3b5cc85e82f04a467803f4c8b4cb5193454dcd849038f11e6ce5028ca9dd57ea5a9380c1b754d8fc644b4a24b51deee9e87b409115c3
 DIST dbusmock-0.19.tar.gz 72567 BLAKE2B 973cfa02d1aec29f2151ce077471c49f7def3cee079eb975bbc1abca39cc6d391f5dc4aed40fcd9c9db3fcc25429e689f130dc495b94428b73c64f3c650a9c3a SHA512 9f49cb1818c0de8b774d4ccd0eed35de3b0a95de669e70539699237b5cdfee993da7747dc28375c8f1c26fac83d948b7ce25107d866e28b833b556c6f654706c
 EBUILD dbusmock-0.18.3.ebuild 1071 BLAKE2B ceac7e1a85ab974743225c48b6d76168b69cc55b703b59dc29caa6433a7c7b5ce13edb312355045d14eaf8a58d9d47ae86c9738eb93e07f64ce6c3878d728c54 SHA512 74a0aa6c85d547eca93f99c9e27fe9cc13136a74b963ef315ee560a332f7a809e4d7f154d2809a3be720cb1f7ec76b7e97becc32fc130b0c45bf4422e8b6663e
-EBUILD dbusmock-0.19.ebuild 1072 BLAKE2B 46eb5cdbf0f93de37e4cf995a1668a5c8d8f261db5b8ad3122b519b1af76add03c64564f7339d238cac1f1b232061ba420f160c0c245b131a57436eb51b3f82e SHA512 e472e723f795ad1ea4943fa7f9b29766a62f15a0edc11fbc7fee1c7aa7bc808950ad82138bef8c930d2683c4ad41ff8c7bd49699be6b23a5cd5fe62ee06a7110
+EBUILD dbusmock-0.19.ebuild 1071 BLAKE2B ceac7e1a85ab974743225c48b6d76168b69cc55b703b59dc29caa6433a7c7b5ce13edb312355045d14eaf8a58d9d47ae86c9738eb93e07f64ce6c3878d728c54 SHA512 74a0aa6c85d547eca93f99c9e27fe9cc13136a74b963ef315ee560a332f7a809e4d7f154d2809a3be720cb1f7ec76b7e97becc32fc130b0c45bf4422e8b6663e
 MISC metadata.xml 253 BLAKE2B a1efbd3751efaa83ee173f557ec1c8a4497a90b60896cf5a7a07da40b4f94a7a299ca0385477e82b2f5e5dbdf9afa482ccbe21f35ef44214e9c451d764b65529 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442
diff --git a/dev-python/dbusmock/dbusmock-0.19.ebuild b/dev-python/dbusmock/dbusmock-0.19.ebuild
index dfaf74e260d9..899a8a785982 100644
--- a/dev-python/dbusmock/dbusmock-0.19.ebuild
+++ b/dev-python/dbusmock/dbusmock-0.19.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/martinpitt/${MY_PN}/releases/download/${PV}/${MY_P}.
 
 LICENSE="LGPL-3+"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/decorator/Manifest b/dev-python/decorator/Manifest
index ff902149c3b3..660d5fc6e82f 100644
--- a/dev-python/decorator/Manifest
+++ b/dev-python/decorator/Manifest
@@ -1,3 +1,3 @@
 DIST decorator-4.4.2.tar.gz 33629 BLAKE2B 5b2c6a1b6aba293d4b93444d4613e3c9af16bd9d6d80ae9eb21112a4a16397ff67e1f648e8118beeb7d17755a2f1bd37b867f73129c42ef7f8654d1c1f609e5f SHA512 c068efd4e70764ac447b772c9c29625c2180dad256b2b4e46a50a8479fc1d7de09b114c2ba11bb37dd58774ed9460d2e0ea9fa76061833a2d3c2676ac91a0db1
-EBUILD decorator-4.4.2.ebuild 585 BLAKE2B dade4db86201a472dbeccd15a7ab2e5e8f3dfac63f0d5d2cf66d7c628bfdbb197a106a782897a6697c9bb916fc21c5c04cecc702bd9a0e17a01bae995d307806 SHA512 4c7075e13093de469c9691512133e21afb7fbf975c318aba2dd3234653a695183969416c26809e9a2322e87083d937142d47005feb1eacd79bec15425415240d
+EBUILD decorator-4.4.2.ebuild 592 BLAKE2B aa617a125e9283592eb379b2e6ef0c4deea5d1855f796e543241e0ee76740d6c6dc91bf5cccff69d086f6ce8ad1dc909af246be4f48cc7ddba09ff9361e028d8 SHA512 28c539346151d45f255186a5569fbbd7231c3682a2aea56b3d8e4970c94c99a6cbd64a8894d293f9a92e4fba18e622b42aa1200a4a50ac2e7751ce4ca324efe4
 MISC metadata.xml 755 BLAKE2B adb49470c4efa969898e39f60002800c948f985933ae6f3ee773f03b1a5cfc4f4addca2f4cbd486ddb3f37222c69090a88c2befed4769d33df96fab014bf5715 SHA512 e8a2802a144fab6e73d358c30fe2fe9ce394a4497c82670ccbe23f2ee156111b848444814114d17ffda2bbab26e3a126f8fe58ff6c2a9d63738d7733f4463582
diff --git a/dev-python/decorator/decorator-4.4.2.ebuild b/dev-python/decorator/decorator-4.4.2.ebuild
index a845fc13f375..56f688a3937f 100644
--- a/dev-python/decorator/decorator-4.4.2.ebuild
+++ b/dev-python/decorator/decorator-4.4.2.ebuild
@@ -12,7 +12,7 @@ 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 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 
 DOCS=( CHANGES.md )
 
diff --git a/dev-python/denonavr/Manifest b/dev-python/denonavr/Manifest
index a6c558c87aa0..7a8122d11d50 100644
--- a/dev-python/denonavr/Manifest
+++ b/dev-python/denonavr/Manifest
@@ -1,3 +1,3 @@
 DIST denonavr-0.9.4.tar.gz 92936 BLAKE2B e7a38f1e967fa375bbc024fb2803ed7f4587b9bbf3540b47b2011bc30df7e907addcadf3ca26158e7a855fdb362c97c43a37d296b674c8774ff095e466a8a3d5 SHA512 32dd78f381a1c98b629e49dd90b127c023fad37b2e6f2fbd1aa4c5a308fe26a8fbca2e3f72e0ae5e26d498a421f029f5673af63353ed057213c2c3c4c77ef77f
-EBUILD denonavr-0.9.4.ebuild 642 BLAKE2B e66bcc19190ca45f4397255f88237939727d205468047a46b2aff5c2d345933e00dcb034e2b1b15f146819bb6e06803b83e8208ff3b8ad55960b434c50012cca SHA512 dae173a5d85608a9d4a3acd0a372c50a01f6274589aba76c7c996447a45c7cf75c7fec2cdec0ade499d251a8834ea9988d8c4d202dd3c839d1478df4b3273d01
+EBUILD denonavr-0.9.4.ebuild 644 BLAKE2B 73d19e57387ee6fd872ec1d75dc6fc9b4f35fdc479ba405ade982c3eacc9ee349c74415754e482289d586fedcd1fb5aeb8a5badefeb765a8245c3ea49962023e SHA512 4e5f423beb12be295bca772d860adb8da02f5c4680f8806049c6fc68db6f1f18c9ffb8c89d12943641ca6dd0ecba4eaa5647dcf3a99312965ccad716b4d69865
 MISC metadata.xml 448 BLAKE2B abf1f391011c497830fd97efbefd1bf3ee9a92967b962859f9b557427b3dde2fb9da76a5c14c8f33b28ebb0e57a0d4511c4403c6a13270f500389d2dc0aff487 SHA512 017d0cc05c8dd263292a080f39a86b415955081f2c2d06a58ef59f21703748b8e15b54a88a4592f9e378e256d6f5ce60d5317aecd373777fb1e686a8cfcd8031
diff --git a/dev-python/denonavr/denonavr-0.9.4.ebuild b/dev-python/denonavr/denonavr-0.9.4.ebuild
index d2099e429b0e..9273badd2211 100644
--- a/dev-python/denonavr/denonavr-0.9.4.ebuild
+++ b/dev-python/denonavr/denonavr-0.9.4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( pypy3 python3_{6,7,8} )
+PYTHON_COMPAT=( pypy3 python3_{6,7,8,9} )
 PYTHON_REQ_USE="xml(+)"
 
 inherit distutils-r1
diff --git a/dev-python/deprecation/Manifest b/dev-python/deprecation/Manifest
index 72b1bd717ffb..4c91d195317f 100644
--- a/dev-python/deprecation/Manifest
+++ b/dev-python/deprecation/Manifest
@@ -1,5 +1,5 @@
 DIST deprecation-2.0.7.tar.gz 17077 BLAKE2B da3fb5db53f281c29e2af40335ef4038e37d133563b85d0ea795a314fd9f2d725a98c100aca338dc9ebe60bb1000476e0debcfdc9c4583108004df207cb36747 SHA512 4412e2e95f4aa4b3d5598346a6649c8d945d7401ac2d0fba3b6f6eef567403c8454ebe537e8de646903cd0c2308f48ecb949dae3015ba7617edd2fa3a26ed429
 DIST deprecation-2.1.0.tar.gz 173788 BLAKE2B 444c7ff688d6eab7dfcf58ad24580b5a6df39a5749341b28d6d5b9b516fd6aa7a462d7f644e6cba596bbf289be0224968f579837c6c71dbe7b36b65588da6eea SHA512 c184665d210c6eeb3f055b23e75c3714f3b18050e03bfe1384baf6c2504f1370116ae0e8c53ff818ccc54c0d633bbb3ba5791fe20b8029f3be0207b019a00275
 EBUILD deprecation-2.0.7.ebuild 573 BLAKE2B 35adb3a4ad5fc675d03536e189a2f9b10d87f7fb4d93e47f9f3e45aac89012cde5279d45e716affc7666a81ba2272f6d669e0b0a20dda589d9217df12ae19311 SHA512 9b16106b78a448ad6e7135310e50a0aadb33ae4622325af5b69721381711339b16f23f5ed11349217c8793f85ed4cef76d3a5959acb414181f423c383d6e3317
-EBUILD deprecation-2.1.0.ebuild 594 BLAKE2B c162d24896474e2ef1b5479b44b61130c50eec2c861cbae113503b2fd39c5e5c5dfd1c3f921f8155cc87bc2c480286ebd0464d1ff0ebc3114824df56b72a493c SHA512 e9e5045f85219ca5d1a32f63d1e16bc3db3f8604968e299d9a365183c601aa41f2bb75abab86a0609898f05b585f353d4e7a61bcfbd2b2058d63344af9ae3901
-MISC metadata.xml 541 BLAKE2B 709794874c752bf9bfd7c4869969c7f5ae80779d2bdaaf2c49cab8abbe3c4b8b4a3f62683961edbb00ea260d933adce5d3da5f7b8be9532ab5e016fb35dc94a5 SHA512 78d8d2f01e9b6d3bc0e6c2edcc05593ce877d15fbef65a55b9302565e0a8b6f933fb12a3fe280111ddd415ba959ef816cada9c5e6c84f369bab4f0e1c8e3c74e
+EBUILD deprecation-2.1.0.ebuild 599 BLAKE2B bb1be39544f879cadc174adc7a7136ee21f95193de3a717452899a0c252ec231de484f538e460badd5d916ed32afcf27bed46b702f685114c9e9860905c66d53 SHA512 2b5baa18931d4ee7d53a6d07be93f6083077ed3be5c1a7a985303944f1d9c2723ec7e68ae00feff813650cb7f41c68825993badd49f9e9c97398293495781d57
+MISC metadata.xml 565 BLAKE2B 007c1977dff6e93c49877fbd0a41e12f7b59e73b12dd8cbd0ee309860195ab560b9bbb3f52b861be6742d5e8f1b78564eb69f74cf53e121e7c9df2a2e58f0f8d SHA512 89374b3c32bbf7f35e585295cfd13c50019304f2620a4b8745b20f0e37b87abc04c7fa464b9277630a723a1a0d4a6a9460f85b87c902285ad4033519e6ad5120
diff --git a/dev-python/deprecation/deprecation-2.1.0.ebuild b/dev-python/deprecation/deprecation-2.1.0.ebuild
index d70f3219ddb5..445d9e0f66bf 100644
--- a/dev-python/deprecation/deprecation-2.1.0.ebuild
+++ b/dev-python/deprecation/deprecation-2.1.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc64 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 
 RDEPEND="dev-python/packaging[${PYTHON_USEDEP}]"
 BDEPEND="
diff --git a/dev-python/deprecation/metadata.xml b/dev-python/deprecation/metadata.xml
index 44c6802a4baa..42d0c0af24a5 100644
--- a/dev-python/deprecation/metadata.xml
+++ b/dev-python/deprecation/metadata.xml
@@ -8,6 +8,7 @@
 		<email>prometheanfire@gentoo.org</email>
 		<name>Matthew Thode</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">deprecation</remote-id>
 		<remote-id type="github">briancurtin/deprecation</remote-id>
diff --git a/dev-python/diskcache/Manifest b/dev-python/diskcache/Manifest
index 75cc55e7cac1..a8eb99559716 100644
--- a/dev-python/diskcache/Manifest
+++ b/dev-python/diskcache/Manifest
@@ -1,7 +1,9 @@
 DIST diskcache-4.1.0.gh.tar.gz 658268 BLAKE2B 7712892a15e0f7b34b05c48071b4ed22f94ff4c8b6e66dff5591296d7186c686958ef3ec19994b6965319ba3e601850a1782f7ac8ed09090afda4b75ae16a12b SHA512 3871e56fa9a50942e29e200df74d7f4312d21a0f51d6be2041ce71efd3c1d0c204cc1df5ac1f92825314c742bb48bf8b0a3929cee225055903953e095701c8e3
 DIST diskcache-5.0.1.gh.tar.gz 656475 BLAKE2B 1926dd40564130a24f211a1962c9a9e4ecc640ecd55d2bae5057ead787df0cc64634be8a798202702a7810612bece0d45202bb12d495da1863c8b10e645cb7fa SHA512 9e06427e8ff158fa186ed161b7e90980f1a1d866164d6018a522f80a323be981f99e4297b0d90106dfb08b5d2d0babcb5a2dafebcc194e2c282c30bcf3e0f1a1
 DIST diskcache-5.0.2.gh.tar.gz 656471 BLAKE2B d4aa7859bbefdd5aedf8bfd81ee9763890371a7667216a0d4a1728d5eacb643749adfb9f7324745f67c145ed6d61f50c449d1cc20ac9b77386aacad639fe1856 SHA512 79fc94be90517a55cd94f67b5c33279925beaf6cc38027c26603b67527b49976c3aaa80368db2671cce7deb4e933aacb8f89ed85dafe3cdc2f99862b2b49471c
+DIST diskcache-5.0.3.gh.tar.gz 656486 BLAKE2B be3a7c919287698e4bd7fc6ff4b861729eabeddff47d01f08711f75f72a48d652e798ed511c5aa1cd9952ecbbbd5ebb003663cfd9c0877b812ef421665e080c0 SHA512 41b393ce255747939c68059251c31b5af43ad9c7fbcfe9288193c501a3a7d070b8db0863e1abd10f16db574565719b2357a7b10371428ed3f37f7de754b16ab6
 EBUILD diskcache-4.1.0.ebuild 1165 BLAKE2B cdffc7e266f9c1b19b1dde1d6ebad0760c296c03d5a200f8d48c8eedb9d61ab781a7a5a6fe2029a43b484f420d6067b8fa24611a782d2859c229b5ea021e4227 SHA512 417b23597e292910883249505c249ff9b15324119e896eb9b5398d7b7feef385a7fde8d08b70f3759e47a265a472762d11b9b43bc915a344230416a3cd1f3e18
 EBUILD diskcache-5.0.1.ebuild 802 BLAKE2B bb75be194dff99e889efba4875121ba23b386a967f932a2f628b56a5035366d614b5dbef8e5edba4793a23e4b813c49a23323398eb96784aed100ff7f2f28c92 SHA512 f5b6ef9363372e042977aa1056f89fa9c5572914f881837734a1dd743a72cc5389a3b567c4e7a9adf7652b2aa123ef140a97dd0d206914725e6df9e2d03e5e02
 EBUILD diskcache-5.0.2.ebuild 807 BLAKE2B f25648d1fda9da9d2d9c78f15450004a81d02ba50c500bcf97dc60e3c94c74e4c3bfb9fc92a5cac28ef06d7417d95957aa666352f8f0a8dc5da8b9be536ec6e8 SHA512 9c31f7e9f957ef600815eeec30a917d0a56cde7a68fbd03750cdb270c0bf08cd546741bee80a7b8a7c039d5315fae26a70185c16471f8d4eb17c673150660c8e
+EBUILD diskcache-5.0.3.ebuild 807 BLAKE2B f25648d1fda9da9d2d9c78f15450004a81d02ba50c500bcf97dc60e3c94c74e4c3bfb9fc92a5cac28ef06d7417d95957aa666352f8f0a8dc5da8b9be536ec6e8 SHA512 9c31f7e9f957ef600815eeec30a917d0a56cde7a68fbd03750cdb270c0bf08cd546741bee80a7b8a7c039d5315fae26a70185c16471f8d4eb17c673150660c8e
 MISC metadata.xml 391 BLAKE2B 74eba8c76944b17dd3b7a446129b9786a56e1afa0a787af75c8e832317b5051afa7e527ac8e7c04a2f9f4c36b0eb3bc72a61655f7de4a5caf9048c50f438d745 SHA512 0d088c14dbbf7c11541b5f47d193280c0f92f8f1b3ec62c8aad49648b3fbcc393ce639b5b9ae18533a4d4b9cb5ad536a5a847b705e2b4bd385d3b90d48f812ec
diff --git a/dev-python/diskcache/diskcache-5.0.3.ebuild b/dev-python/diskcache/diskcache-5.0.3.ebuild
new file mode 100644
index 000000000000..c57b662ad91a
--- /dev/null
+++ b/dev-python/diskcache/diskcache-5.0.3.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+PYTHON_REQ_USE="sqlite"
+
+inherit distutils-r1
+
+HOMEPAGE="http://www.grantjenks.com/docs/diskcache/
+	https://github.com/grantjenks/python-diskcache/"
+DESCRIPTION="Disk and file backed cache"
+SRC_URI="
+	https://github.com/grantjenks/python-diskcache/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz"
+S=${WORKDIR}/python-diskcache-${PV}
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+
+BDEPEND="
+	test? (
+		>=dev-python/django-2.2[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx docs
+distutils_enable_tests pytest
+
+src_prepare() {
+	# remove dep on pytest-xdist
+	sed -i -e '/-n auto/d' tox.ini || die
+
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/distlib/Manifest b/dev-python/distlib/Manifest
index e1787ba40578..6d0a3d4c9a11 100644
--- a/dev-python/distlib/Manifest
+++ b/dev-python/distlib/Manifest
@@ -1,4 +1,4 @@
 AUX distlib-0.3.1-system-pypiserver.py 1532 BLAKE2B 7bb2bbb2282bcaa943735804428b00f6c51fdb51c7acaec7efe653495acd9194a0544d5d49531a96ab269ab8a61ba87e3c35d4f30ce5275a0a284fadd88cc19f SHA512 b96579d450c5c33502edc57480d5bb00aa3b9b61333c43ab446a3cf7117934a6a14026b2061cbf28e69e88a515554f8a1aad732f685cb73f18686b1aba6379ab
 DIST distlib-0.3.1.tar.bz2 1068500 BLAKE2B 52135869242f71cc6d6887da6d9e20ffc6b46c84d8146393961062d92d8c0bd68e1309277f64fdec0319ff3c503b1caaba3d5378f5c081dca79573c8d9c2e6f2 SHA512 f259299176c45be7024b80759015a2fad120ffdde55b6abea0f7fb0335cee90809b5daedcb88abdfb68fd496284b2e478df622004b3750327bfc86807581116c
-EBUILD distlib-0.3.1.ebuild 1325 BLAKE2B c4f5f25465a310357b30d655890caec24b4fc9490a30f30d2bf3c829deb8c0d3df4d7afc86ba89fad782c64d174cf56483c397542cbc4b259c996a6f109a9af5 SHA512 8339b311f87979382995d1669e7f5220106b6a282c20f5bc75b6a847e709d8ef9b098088b92b84ef108e6ad6cf3606362df68704717fc13f607f9ff3a18a66d2
+EBUILD distlib-0.3.1.ebuild 1332 BLAKE2B 26ce8849023fc5d6fd9c134da9d27266546ee26525c42442995eac7c337d682a9daff138d9d492ddc99af633c50dc17b4251607ce782c7d1fd0e8906d35f7762 SHA512 66f667a7673ed1e5a1089904892399246dd86f1ebddf77c2b7ae59ae9338ac9e430303768d4f556eb850881b7c9c77ee855c92b4110cc8b84e433ec498aec998
 MISC metadata.xml 218 BLAKE2B 086fdcf7b63ca7bd6c58e861d717bb375e1cd372eff26d5d2eeeb176d8c5e6f10e653562abafb50eae7d7508f8e3d421b87e6a749acd0490308672828d0da697 SHA512 4558fee4c51117e21b1f42ca3edbdf1195ed297db798d6bfa0e5fbb7019654a187422b0abde7af5d800caffed66d1e55e4280e8be602bad591424d9776c46781
diff --git a/dev-python/distlib/distlib-0.3.1.ebuild b/dev-python/distlib/distlib-0.3.1.ebuild
index f82db5aa0028..b26346445884 100644
--- a/dev-python/distlib/distlib-0.3.1.ebuild
+++ b/dev-python/distlib/distlib-0.3.1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="
 
 LICENSE="PSF-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/distro/Manifest b/dev-python/distro/Manifest
index 7eb924e3293a..e570a0a92e52 100644
--- a/dev-python/distro/Manifest
+++ b/dev-python/distro/Manifest
@@ -1,3 +1,3 @@
 DIST distro-1.5.0.tar.gz 54340 BLAKE2B 2a5bf45cdf41b9772a2e164aebe96a4e9952893b7462935938fa4939704c8dca67acc3e0a52e53d8722aa4405abdc7ad2c8d600dd397d1243bcceda4d5ceeb75 SHA512 14831fe1355e9ef4f58f273ce4a548a3fe438e95466b4b4f596b8110da51305d66ed77c2e40c3dbfbcbd1a66c74e23a4d4244c8bfdebc4b49b3e7ddcbff55b8f
-EBUILD distro-1.5.0.ebuild 533 BLAKE2B 33914cd224b4af61fb2906d5af941e5f5ccad603e04ca641e295c6ecc1978011345c8fd5cecd2333f2f36142d787e10c88266c2f52d71d40740aef0906f5d53b SHA512 ecd0960607a5afe8c30c064ee50cbe7cc7c76ec77e4e69d56a6c0316b1e8672d994c2f0595229190c916ae523a74c93b0d9f9f0ae5e5bbe725f044d2e95d2938
+EBUILD distro-1.5.0.ebuild 532 BLAKE2B b1ed84b3e046a778f0ff8f4cabf0ccec18d6b4b0c4bc6645b0b576167f6a22f23503e0e6724e565e922ad4a58781d072adce9da36ed63c2d3023af26332f2f78 SHA512 8a14c4f05a97f67a25228a046df95e46c78ab8fa81c58ede893011f91ca65357b3e8214d91d9ffb399a2c05bc053b43468209adf6353d9f80e965ed0e4d4efc6
 MISC metadata.xml 838 BLAKE2B 899bf57efe9358f0f33df59ef8802cdb0e9d26c05ac99289b7d3765ddf2a5cb65452874aaca7db3774c76564c4761c4f71ee139bad080cc1e62472794de29b8e SHA512 55cab917a2b67bab65c1fda28693020efde74e905c09d077dd2562c2e78171ab33a2a4190b458deb5bfbeb3b9ed3fd66c61e69cbe569f1640d135c46a66477e5
diff --git a/dev-python/distro/distro-1.5.0.ebuild b/dev-python/distro/distro-1.5.0.ebuild
index d8dd48a3bb5a..e0de7ed13dac 100644
--- a/dev-python/distro/distro-1.5.0.ebuild
+++ b/dev-python/distro/distro-1.5.0.ebuild
@@ -14,6 +14,6 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="Apache-2.0"
-KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 
 distutils_enable_tests pytest
diff --git a/dev-python/django-allauth/Manifest b/dev-python/django-allauth/Manifest
new file mode 100644
index 000000000000..30280b69028d
--- /dev/null
+++ b/dev-python/django-allauth/Manifest
@@ -0,0 +1,3 @@
+DIST django-allauth-0.42.0.tar.gz 549566 BLAKE2B aa346bcc47b9419776a68c023ab560e5cba0fd97eeaf4cb2f43da4b2c53619c65a3ec9e1313ff3ffa0ed051718d41ccea2d362f56d6bd8dcf4c5a0569ccbb7c9 SHA512 2c31a70dfd3becf0f921b0566204b8b3221b0c85e82cb8a8ad37ab557fc6f302b9c24bfdd6885978157f4ccb9044d1eed9973d066ee59877aee727c60d2a5b46
+EBUILD django-allauth-0.42.0.ebuild 665 BLAKE2B f91e48007ad4aaa68bfcc1b798f2b8220498dca8b0b3ef129e31c9aff43c1c78ffc5c3f7d9f3ff0fd905ce59d51c16f37aaee34510f4e8a22f92124c6b6af40f SHA512 5b42fe06af47ca32377e23a4dcab873955a1a47db1a641963352d84964b6d8821c1859a3314a7aefac33ab8a6267ee7820b51d311a0ce8ba6aabb140a679af9a
+MISC metadata.xml 293 BLAKE2B 1f94d47b3f88a08c249d0d9dd6667e195b68ea8f47401ab02c6d5bc41619e5e4eb6877ffe881353c5d2b69fe9d71703a48002e5b5557aeb188ad592f8e2f4d54 SHA512 6d71d8644c96cab3551e98e13ba808a6d97685cf093a8e1c7968ce5e5a4ba3a358428e4b597c438d72be7b98a24714dc6ddd41ea970b6c97e902f9b5de0cdd8c
diff --git a/dev-python/django-allauth/django-allauth-0.42.0.ebuild b/dev-python/django-allauth/django-allauth-0.42.0.ebuild
new file mode 100644
index 000000000000..3326fa20cdb1
--- /dev/null
+++ b/dev-python/django-allauth/django-allauth-0.42.0.ebuild
@@ -0,0 +1,25 @@
+# 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="Django 3rd party (social) account authentication"
+HOMEPAGE="https://www.intenct.nl/projects/django-allauth/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="dev-python/django[${PYTHON_USEDEP}]
+	dev-python/python3-openid[${PYTHON_USEDEP}]
+	dev-python/requests-oauthlib[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]"
+
+DOCS=( README.rst AUTHORS ChangeLog.rst )
diff --git a/dev-python/django-allauth/metadata.xml b/dev-python/django-allauth/metadata.xml
new file mode 100644
index 000000000000..c2ab2a38263d
--- /dev/null
+++ b/dev-python/django-allauth/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>hanno@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">django-allauth</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/django-gravatar2/Manifest b/dev-python/django-gravatar2/Manifest
new file mode 100644
index 000000000000..c46499eb3468
--- /dev/null
+++ b/dev-python/django-gravatar2/Manifest
@@ -0,0 +1,3 @@
+DIST django-gravatar2-1.4.4.tar.gz 8396 BLAKE2B 181aee58f6be4f8833a26674f020412e050387855a84d4c3b8b8f1c028eeb56caee7c95d4a09f301d7e974051b1519b90e1cff1e9789c860f74497da1ab88fe1 SHA512 999fe2a036b23f73ee8111cccde459aa72a5f90995d322e772776f85ba206281e791cdf7d4888b45c7f2ecf8baf6509ed44652396f5db158c484a2fb53439c99
+EBUILD django-gravatar2-1.4.4.ebuild 499 BLAKE2B 4590bf9d8006227a256efa9c24b71962e27d424dbd542139d9790c60c76c7cd5d9c80ef4f3abe710b051e65b82bdf3da04d7a143b94096b3510a3cd6d57252f0 SHA512 877476fbd7fa3c2bf542c0409840f5027d4593f8c1486667b3982d9956da2021548cad150b87bb7108e6b6a4051541393b3c133fb2344e1d202dfe536393d3c7
+MISC metadata.xml 295 BLAKE2B 3c119ba286af37428c6b1224f01e9252f69561a961995802e85c62709916f5f9e431266baf14de59d75ba8d7eab99f53365961275255a20cc3c4babfe1f4c4b6 SHA512 51b052a8f6dff1692c3d914b3eb19f9d6af086dae59e500cf728eaa9fd28ec3ce0fdf62adeabaa28abc036a0d0c3d63dbd6a07b774fe0bbdb7546f2c71a280e2
diff --git a/dev-python/django-gravatar2/django-gravatar2-1.4.4.ebuild b/dev-python/django-gravatar2/django-gravatar2-1.4.4.ebuild
new file mode 100644
index 000000000000..b9d8a9cff7cd
--- /dev/null
+++ b/dev-python/django-gravatar2/django-gravatar2-1.4.4.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Essential Gravatar support for Django"
+HOMEPAGE="https://github.com/twaddington/django-gravatar"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="dev-python/django[${PYTHON_USEDEP}]"
+
+DOCS="README.rst"
diff --git a/dev-python/django-gravatar2/metadata.xml b/dev-python/django-gravatar2/metadata.xml
new file mode 100644
index 000000000000..ce6b295c28a4
--- /dev/null
+++ b/dev-python/django-gravatar2/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>hanno@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">django-gravatar2</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/django-rq/Manifest b/dev-python/django-rq/Manifest
index 61092bf2cec8..9718d47ba3b8 100644
--- a/dev-python/django-rq/Manifest
+++ b/dev-python/django-rq/Manifest
@@ -1,5 +1,3 @@
-DIST django-rq-2.3.0.tar.gz 40916 BLAKE2B cdaae3b3d1289a539306f0d8d41d034384366877bd226a5d2226fa017e7807ca2c3304fe6100d45f6cc929e591970bf707acebb1f0571d2827e22acff0468fee SHA512 2b0e0531d40ea866680aa52ac941bf0ea09d4295608c3c8b99c9b3a1c9f1efbb05527327e22ad6da3b013667a16251f190a064806c7c0e1edaf1625b5bc3a2e5
 DIST django-rq-2.3.2.tar.gz 41038 BLAKE2B 837a8f819e9a91763b2d4ec961257d429e6d686fbaaa181d7fbe41efd9e08d958c5c340e4e1a4c8f0ef4063e985d3df82d8ea2c6a7cdea872b330dd545660e31 SHA512 8cf59aae163034240bfecda5f332dcc590813445cb2fc14bee15459ec8d4c50a36ab56865b3ce9360968451695e7a6d5eca5da26ef63c29dbc9dd58af8f16b98
-EBUILD django-rq-2.3.0.ebuild 543 BLAKE2B 56db8e38544f91bffa18f28a6a4382215dd80cf85f6b09758ee5a5f2098ed04ad9810a2e0cc2b75ab165ad8bda10a0932c38a037e2a7128016db280b1c75db0b SHA512 b6cc4061d8ab9ae5e1554338117ada8a0204a01153e3e619d0768bdf12b6df248f3cfbcfe7e5502d50da501a1d4e79e6766cbaacef93354f88a76a2fc82dc84c
-EBUILD django-rq-2.3.2.ebuild 525 BLAKE2B 5c1320106a8bfe8978e224c420b3609b2fe836e8c80f28d1bab1287efcc9b46e5ffde5e7cef7f94ea905d2613e0646bb4ea24c7654e39e3e57ab3e2d4e45dc17 SHA512 08c197bfbf308ba690946bb4951175b72c7fbbe2c66b42428cbc258645a1e5159de31401aac8b2278c477bf29170269b9a7186afd02272713c17cf6e7defa063
+EBUILD django-rq-2.3.2.ebuild 527 BLAKE2B 02270816b2d9018497bc5b1618aeea38aa1c821dacf7c6b64b443fb055725d088f3880ff6ed54e6cf753a1c2a3423a2824cd1031f24f993c88c700f23935ff28 SHA512 f517548e513cd2e62f819c391a4b27d5118ea16f3a09ff8fa541b83cc6ca5a1233e497c9ae3db0bb94799946828beef64748462014515a15da65e31d838a5d0c
 MISC metadata.xml 248 BLAKE2B 5d9c3678c604aac0f24c5d5015e28f02b9ce83bb6a179755a44adeb3d69e4dd50be4acc30a6317649f5be23bcf13ac210bbe4712aa403e9c4cf2de351b39c941 SHA512 dc5b06a888be6367909895d5891a08189f4657bcee602e5ff0021be2ad3677e58ec7387ff244625be66a142138666e7eac790d2a7b1e298f0ad644725b5e57e0
diff --git a/dev-python/django-rq/django-rq-2.3.0.ebuild b/dev-python/django-rq/django-rq-2.3.0.ebuild
deleted file mode 100644
index 95ddd036ff9b..000000000000
--- a/dev-python/django-rq/django-rq-2.3.0.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 python3_7 )
-inherit distutils-r1
-
-DESCRIPTION="An app that provides django integration for RQ (Redis Queue)"
-HOMEPAGE="https://github.com/rq/django-rq"
-SRC_URI="mirror://pypi/${PN:0:1}"/${PN}/${P}.tar.gz
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-
-DEPEND=">=dev-python/django-2.0[${PYTHON_USEDEP}]
-	>=dev-python/rq-1.2[${PYTHON_USEDEP}]
-	>=dev-python/redis-py-3.0.0[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}"
diff --git a/dev-python/django-rq/django-rq-2.3.2.ebuild b/dev-python/django-rq/django-rq-2.3.2.ebuild
index 96a7c90ccc7c..cae14afdcdc5 100644
--- a/dev-python/django-rq/django-rq-2.3.2.ebuild
+++ b/dev-python/django-rq/django-rq-2.3.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
 inherit distutils-r1
 
 DESCRIPTION="An app that provides django integration for RQ (Redis Queue)"
diff --git a/dev-python/django/Manifest b/dev-python/django/Manifest
index 435a803fdc1e..721218908950 100644
--- a/dev-python/django/Manifest
+++ b/dev-python/django/Manifest
@@ -1,20 +1,10 @@
 AUX django-2.0.7-bashcomp.patch 1507 BLAKE2B 8aeb494087dbccffc69ad43f370e791d9fbfb1908d45f55d5f8be01ec0f3af6b2aff591da84a06c0858fecd44180579a4647d622ef57d8235ccb4b3b80fd3a2a SHA512 5a3867b8e4f2fafe4c53a741d41e8c6e8e28a55463f7d8007afd669a04daa8b93f911e4ef8d5ad38ba300558f21ac8090b00337d0c0bfb93b2aea73a179334a4
 AUX django-3.0.6-bashcomp.patch 2060 BLAKE2B 6bff228193b4cfe4f0f4c3d727146dffdb43c1decf1231edf6ab15d9de4a0b504ad4ec9f00f8f6030562a50584e0445ed8d671c6af84926d7b1d23380258a35d SHA512 f9a962ff61ba8fba490b2b8c233cbf2770751c7a184c64915039a4b476b2f2d235896aa3af514ace72d0fe0a4fbb8858534196d163a44edfa0a043e3b9fe178a
 AUX django-3.1-bashcomp.patch 2085 BLAKE2B 36a0aa4d3413f13089ac104f5d3f98ecbb152a9a5a35f8c1ff2e5ffc9824153b0ac89f1cbca76c31a1afefde471e4d6ed801e405551b25cb31da89c20f3019cc SHA512 82dceede4292bad6e3e4966a6dba01bd2bbc7db494fce592e25dc4a64236485d88d8ad67b247239a80f8fe96dff054d20afea6f48a5518b67cf88404d399e61c
-DIST Django-2.2.13.tar.gz 8879757 BLAKE2B 4a7986805c6a3674d47aa82b97f31ae63968dd7c0f12db672207cd1d97076acb681fe44e730147122911684b36d7f1e9d5ea18c054d4c40c68b460300fd9294b SHA512 6daf3486d2f19eb159193df77a7525e5173ba5889ad5c587a6ec6bbf02c4ea94fa90b9a30a5310932fc9353a22c413208ab724c05740f844eccfe610da3ca68a
-DIST Django-2.2.15.tar.gz 9023679 BLAKE2B 9619d0ac45a8256a1e605f447b89df6266d67d98969baffd41a9184165e14d57d4edfb898f64a6633cc0f4c23b24a35b16cb446c920d8baf58f771c69d8697ee SHA512 bb91e5b621be54570f8c7676f820ff93fbf0546dea79e035eebd60b70c5c872b0de65395a4606f07af7b9c77de2cf218aaef8ff489fcfabaf5c9b75d28e42dc2
 DIST Django-2.2.16.tar.gz 8884774 BLAKE2B e65074c44e35921f6c40ca9e2a5fee53ce9a956a7503b96a33c8dbb4588bb0928d2e2b605f1117c3c75cdc84d6c7d1bfe52f4e7888fbe300adb5411a55b0ac27 SHA512 eabcdfc17e27c579001e4739268abd13bebbb018db1a7dbe4fb8482d32320b85bd16b3b18428084c0df947094f23f7cb4b12a3a55bc370748d7d8746af22bc3b
 DIST Django-3.0.10.tar.gz 8958332 BLAKE2B 0ff17da9d9175b080d81e334e46ec6daaec5e4cd48f5d9a614c84b448a6d4b93d304b3fd25bcee665d65f589a8f94cf83f002bbd7a27975d23e3516286784e01 SHA512 fcce2815f966a5eb0f7986c16d065b352c73ea2ea4fc1422d440487d84162c5a93aa45b9173ba5d62d6caee2e976a9ac818f228b47ed7f4f50deda27bac995e9
-DIST Django-3.0.8.tar.gz 9080731 BLAKE2B b3276527c9c5eba18b380204c498ebd5724e5211640ead9e05284eb013f907ce6799125b29e2030bc37ecd5a1022e6eb3f193eca5e2c6520adef630d6d2114a9 SHA512 92d169fb37883355f1898fc13b54b6732ec14d71f77e4b91db30dd9bfb5df8b34c1c9566af6ddc37e00a9e3eadd38b6a51ff604a4da4285167f66b55215be301
-DIST Django-3.0.9.tar.gz 9081099 BLAKE2B 502f9cf1fafff50d92c771e845319f5406722cdb8ca0570688bb96e7fbc765cee319325b0340b722afeb0a304316d30408ca92154623ad4934877cbdc8ee9259 SHA512 1244b9cff26b9e8d9a3d611e0a39981bd1a46d68fa734a58ba12fd51eeb023fb053605372d7b41b51027e4e609f1870d25f7e0584d0449ceeb8d877f674e49b4
 DIST Django-3.1.1.tar.gz 9250616 BLAKE2B 220c53873a70bb30f0ea9b48a70ba71b2de517c11f238e6dc2be20b0e85c99dfdb2ea3b9cfe7b164c7141e0857f19d9d8f93390d7ef36bf34e915ccdb449e8f6 SHA512 5da4282c2ae712ecb2da654a99d46cd60c99aced90f75e681d5a0765b8c08669f27b6c38287bfe7bac028f12ae0643e2be06742752bdc83c62daf82fee60281f
-DIST Django-3.1.tar.gz 9382872 BLAKE2B 31f2a45cf31f87401ac1834be81cf207ca48f720bf6d6885b774fb51f42616be1346b8ab71d6c0b605d99bc7422f27b21665729b78e00c9cc0ba9cf3e4d788f3 SHA512 31f0821966f4ebc6b2a719b69f1137a32a7228414221e8938a66c9b940465c008761bd380ba9ea603e3693d38c233d6f23afe0cbe5647eb2478844ce2d0e7fd4
-EBUILD django-2.2.13.ebuild 2329 BLAKE2B 318f88cb8e0817dcefd31d0a43ce2b1067c187ecb27deb948df7c12633e76fad8f1298b3769bda49082a2887f42ca6088387bf0c9816fbed899b0207c9e452e3 SHA512 3f5f6c0e3576f74a1f0d0483e3f9640ea38d228e54f9a302ce33c2cf4805a56405c33777295cbfd6eba3ce86128a0acaca10445839b2de2918225420aa4b2b0e
-EBUILD django-2.2.15.ebuild 2338 BLAKE2B 021702600dc058b29f671f64f165985528d5fe93357d9577b9dc0c6bbf8ae69483bae62d820483ba976873ccbbac8fda0e5bf66e480369f18cc30051a6c07328 SHA512 04cddd1785450b0e02b0d838e653a616f7f76a396a769901d6100c518e94dff438dd79cc4972bf59f65c57943d1601fc5de07609e54598adc7297a17d85c62fd
-EBUILD django-2.2.16.ebuild 2419 BLAKE2B 755b1d0dcdbc60d5edff14f81bbf85e4017c8ab87717fb313116742a0907e770aec5fc66ce02d44f2586540877e9829722fa02f44ea50e0482838c3a0258a975 SHA512 99e5bad3f8ad9637b4f1adff22bc1b36306c55bbec5f5d36c668989a48cac5edc0c82e2232fb0a2d15960a64c65de4d551b7adb6a2a48a3e64d48823f4ae3df0
-EBUILD django-3.0.10.ebuild 2400 BLAKE2B 0493dd61bc7f97f040863ee8771461c40450d0e1273bb19f7f967aa296ae459ace1de71f1311abe4507dc4ba0e92ac8053b284c8c36fad98fac550621629224c SHA512 108e5fbbcfc0b20047194846c3553c49aa911dee9dded54f9c8453630549236755b995cc62cc8278dc950e3919675d0adb10b9d671852d25fc55fd9b609fe4cd
-EBUILD django-3.0.8.ebuild 2317 BLAKE2B 8855c8a746876f491588b1dae108ca528f8e90be8a75acddc50559f3e9ad7e11e9b7580adddbdb391a7c2dd9f98f04f6a9696cb73da28d1c5331fac6759c114b SHA512 ed16f2d2ac738b0e404ee2c0cbc5c3877e751fd8ed160366f6b3717f48ef46a9ac4a072e56d691f73cf7d4386f25278edb49e55d825f32a462f1ffe2f763b265
-EBUILD django-3.0.9.ebuild 2319 BLAKE2B 0c243aff451ef7259ef835dc60a3d57c6d8f4a1727d29891fadc491cf45b5ef5f561e3d6b5cc9762fc16a8a107076df330492f3044c4896d69c0136144ade43b SHA512 1ce2b6f417296abf924eb75943fd5bb7eef7b0fd4bb66fc0a6e5891433958666394c44b982d9bf56218ae60fc2b70763b0cebdc4050a20f8b075ea8c778bd18c
-EBUILD django-3.1.1.ebuild 2403 BLAKE2B 3bcd54c65fcc0bd2d3cdd977a323fbe32b5a941262e76d75143cdbf6e4e8726f3d4bfcd792946246592dec6efa4290c6d490be99ee965c62d2f70877ecd8a098 SHA512 8614a935388f9aff62589d8b223b78069190218f4221d04e5716a588d8a3423330d26b0b586e8a1e3b84d817775cc5ecb6a2f51f8a6f181ca11bd4fc52345cd8
-EBUILD django-3.1.ebuild 2322 BLAKE2B d18f22edeef15aa49418d3e6e2bc3370cbc2b5fac6d7dbe724a0686aadecc2a6753d09c12b812f1ae5233ff20e2933ad4998ba77dc4996456e8b1a71311a7a56 SHA512 b3d92430d7befd22369d958410c2769bcdce949eff10518708f80c1b9472b6b14382ea2737bc9d9a4c8289371ca69835fc2adbb4b0fe9dc0e70f335fc7bc6aca
+EBUILD django-2.2.16.ebuild 2418 BLAKE2B 7e68722c3f2ba98ed45f231a845e6b0f0d236d6848301e154b1a15a24018931a0be015a5d229d4435ada444ce79c121b4fb6b90f2895fe1a4ca4c0ffb5551465 SHA512 ef392582dab3f7d47d874946afd93bdee2b9b3c60100c70886e096761cbb0a7730ad441e062829aaf23da82295dd7e8d492bde2ad19094561edc21d47cb4b7a9
+EBUILD django-3.0.10.ebuild 2399 BLAKE2B 2c5359a434b0d99e856e4bd2a52d7a06a85e0327180d7587024531c9624e9cfd52066fa5e1340f028562b55e2e60071cd6a6e880be833ffd174d7257ad725816 SHA512 d6bd98b753eeb2d8624d976d124a19a4774ef9a7f81c8bf504ad1e4515780aa42ed996d147b62835e0c580592aafe2e813bd0d13b16cf64ad3f8912e52fdeccd
+EBUILD django-3.1.1.ebuild 2404 BLAKE2B 73d81ca180cae72f001d6da7c1b2fad67f348170b9b906db8aea79731c6ca6764620845d9b4d6878df169548bca3e6ee23044b9545f32c70c263862b06fb2a1d SHA512 16f576b4e1c18c367c6b758ec4010656b39bcfabab96d1d881d86e715838235f38206bd0e2906040e40a7da5d48ef5d13d5d1a7688167d98677cc8410120c570
 MISC metadata.xml 399 BLAKE2B f49845f5a6476a0b43cbe47ab11b298f53703d850d145a31967f512d9402048fc1b1891606ddba7342ea9613c27ace3986f6b508ed83f0c5eccb26a13fd49f85 SHA512 92470f2930b1c940ccf3478b11157adcc4b84924b0cab4e1fd8aae98c7bba14e995491ce44810223eeb3802967be68c867d0ee4ac0df9f49b4234efd1a7ecfa7
diff --git a/dev-python/django/django-2.2.13.ebuild b/dev-python/django/django-2.2.13.ebuild
deleted file mode 100644
index 734a55d6bdf3..000000000000
--- a/dev-python/django/django-2.2.13.ebuild
+++ /dev/null
@@ -1,78 +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,7,8} )
-PYTHON_REQ_USE='sqlite?,threads(+)'
-
-inherit bash-completion-r1 distutils-r1 eutils
-
-MY_PN="Django"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="High-level Python web framework"
-HOMEPAGE="https://www.djangoproject.com/ https://pypi.org/project/Django/"
-SRC_URI="https://www.djangoproject.com/m/releases/$(ver_cut 1-2)/${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="BSD"
-# admin fonts: Roboto (media-fonts/roboto)
-LICENSE+=" Apache-2.0"
-# admin icons, jquery, xregexp.js
-LICENSE+=" MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="doc sqlite test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/pytz[${PYTHON_USEDEP}]
-	dev-python/sqlparse[${PYTHON_USEDEP}]"
-BDEPEND="
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? (
-		$(python_gen_impl_dep sqlite)
-		${RDEPEND}
-		dev-python/docutils[${PYTHON_USEDEP}]
-		dev-python/jinja[${PYTHON_USEDEP}]
-		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/pillow[webp,${PYTHON_USEDEP}]
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-		dev-python/selenium[${PYTHON_USEDEP}]
-		dev-python/tblib[${PYTHON_USEDEP}]
-	)"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.0.7-bashcomp.patch
-)
-
-distutils_enable_sphinx docs --no-autodoc
-
-python_test() {
-	# Tests have non-standard assumptions about PYTHONPATH,
-	# and don't work with ${BUILD_DIR}/lib.
-	PYTHONPATH=. "${EPYTHON}" tests/runtests.py --settings=test_sqlite -v2 ||
-		die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	newbashcomp extras/django_bash_completion ${PN}-admin
-	bashcomp_alias ${PN}-admin django-admin.py
-
-	distutils-r1_python_install_all
-}
-
-pkg_postinst() {
-	elog "Additional Backend support can be enabled via"
-	optfeature "MySQL backend support" dev-python/mysqlclient
-	optfeature "PostgreSQL backend support" dev-python/psycopg:2
-	echo ""
-	elog "Other features can be enhanced by"
-	optfeature "GEO Django" "sci-libs/gdal[geos]"
-	optfeature "Memcached support" dev-python/pylibmc dev-python/python-memcached
-	optfeature "ImageField Support" dev-python/pillow
-	optfeature "Password encryption" dev-python/bcrypt
-	optfeature "High-level abstractions for Django forms" dev-python/django-formtools
-}
diff --git a/dev-python/django/django-2.2.15.ebuild b/dev-python/django/django-2.2.15.ebuild
deleted file mode 100644
index 2d48305066b2..000000000000
--- a/dev-python/django/django-2.2.15.ebuild
+++ /dev/null
@@ -1,78 +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..8} )
-PYTHON_REQ_USE='sqlite?,threads(+)'
-
-inherit bash-completion-r1 distutils-r1 eutils
-
-MY_PN="Django"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="High-level Python web framework"
-HOMEPAGE="https://www.djangoproject.com/ https://pypi.org/project/Django/"
-SRC_URI="https://www.djangoproject.com/m/releases/$(ver_cut 1-2)/${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="BSD"
-# admin fonts: Roboto (media-fonts/roboto)
-LICENSE+=" Apache-2.0"
-# admin icons, jquery, xregexp.js
-LICENSE+=" MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="doc sqlite test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/pytz[${PYTHON_USEDEP}]
-	>=dev-python/sqlparse-0.2.2[${PYTHON_USEDEP}]"
-BDEPEND="
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? (
-		$(python_gen_impl_dep sqlite)
-		${RDEPEND}
-		dev-python/docutils[${PYTHON_USEDEP}]
-		dev-python/jinja[${PYTHON_USEDEP}]
-		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/pillow[webp,${PYTHON_USEDEP}]
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-		dev-python/selenium[${PYTHON_USEDEP}]
-		dev-python/tblib[${PYTHON_USEDEP}]
-	)"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.0.7-bashcomp.patch
-)
-
-distutils_enable_sphinx docs --no-autodoc
-
-python_test() {
-	# Tests have non-standard assumptions about PYTHONPATH,
-	# and don't work with ${BUILD_DIR}/lib.
-	PYTHONPATH=. "${EPYTHON}" tests/runtests.py --settings=test_sqlite -v2 ||
-		die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	newbashcomp extras/django_bash_completion ${PN}-admin
-	bashcomp_alias ${PN}-admin django-admin.py
-
-	distutils-r1_python_install_all
-}
-
-pkg_postinst() {
-	elog "Additional Backend support can be enabled via"
-	optfeature "MySQL backend support" dev-python/mysqlclient
-	optfeature "PostgreSQL backend support" dev-python/psycopg:2
-	echo ""
-	elog "Other features can be enhanced by"
-	optfeature "GEO Django" "sci-libs/gdal[geos]"
-	optfeature "Memcached support" dev-python/pylibmc dev-python/python-memcached
-	optfeature "ImageField Support" dev-python/pillow
-	optfeature "Password encryption" dev-python/bcrypt
-	optfeature "High-level abstractions for Django forms" dev-python/django-formtools
-}
diff --git a/dev-python/django/django-2.2.16.ebuild b/dev-python/django/django-2.2.16.ebuild
index 332ed12688eb..a104153638a1 100644
--- a/dev-python/django/django-2.2.16.ebuild
+++ b/dev-python/django/django-2.2.16.ebuild
@@ -7,7 +7,7 @@ DISTUTILS_USE_SETUPTOOLS=rdepend
 PYTHON_COMPAT=( python3_{6..8} )
 PYTHON_REQ_USE='sqlite?,threads(+)'
 
-inherit bash-completion-r1 distutils-r1 eutils
+inherit bash-completion-r1 distutils-r1 optfeature
 
 MY_PN="Django"
 MY_P="${MY_PN}-${PV}"
@@ -23,7 +23,7 @@ LICENSE+=" Apache-2.0"
 # admin icons, jquery, xregexp.js
 LICENSE+=" MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="amd64 ~arm64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="doc sqlite test"
 RESTRICT="!test? ( test )"
 
@@ -70,7 +70,7 @@ pkg_postinst() {
 	elog "Additional Backend support can be enabled via"
 	optfeature "MySQL backend support" dev-python/mysqlclient
 	optfeature "PostgreSQL backend support" dev-python/psycopg:2
-	echo ""
+	elog
 	elog "Other features can be enhanced by"
 	optfeature "GEO Django" "sci-libs/gdal[geos]"
 	optfeature "Memcached support" dev-python/pylibmc dev-python/python-memcached
diff --git a/dev-python/django/django-3.0.10.ebuild b/dev-python/django/django-3.0.10.ebuild
index c88f68b480e4..44093b1ebee8 100644
--- a/dev-python/django/django-3.0.10.ebuild
+++ b/dev-python/django/django-3.0.10.ebuild
@@ -7,7 +7,7 @@ DISTUTILS_USE_SETUPTOOLS=rdepend
 PYTHON_COMPAT=( python3_{6..9} )
 PYTHON_REQ_USE='sqlite?,threads(+)'
 
-inherit bash-completion-r1 distutils-r1 eutils
+inherit bash-completion-r1 distutils-r1 optfeature
 
 MY_PN="Django"
 MY_P="${MY_PN}-${PV}"
@@ -23,7 +23,7 @@ LICENSE+=" Apache-2.0"
 # admin icons, jquery, xregexp.js
 LICENSE+=" MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc ~ppc64 x86"
 IUSE="doc sqlite test"
 RESTRICT="!test? ( test )"
 
@@ -71,7 +71,7 @@ pkg_postinst() {
 	elog "Additional Backend support can be enabled via"
 	optfeature "MySQL backend support" dev-python/mysqlclient
 	optfeature "PostgreSQL backend support" dev-python/psycopg:2
-	echo ""
+	elog
 	elog "Other features can be enhanced by"
 	optfeature "GEO Django" "sci-libs/gdal[geos]"
 	optfeature "Memcached support" dev-python/pylibmc dev-python/python-memcached
diff --git a/dev-python/django/django-3.0.8.ebuild b/dev-python/django/django-3.0.8.ebuild
deleted file mode 100644
index 5bc565ca8f8a..000000000000
--- a/dev-python/django/django-3.0.8.ebuild
+++ /dev/null
@@ -1,79 +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} )
-PYTHON_REQ_USE='sqlite?,threads(+)'
-
-inherit bash-completion-r1 distutils-r1 eutils
-
-MY_PN="Django"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="High-level Python web framework"
-HOMEPAGE="https://www.djangoproject.com/ https://pypi.org/project/Django/"
-SRC_URI="https://www.djangoproject.com/m/releases/$(ver_cut 1-2)/${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="BSD"
-# admin fonts: Roboto (media-fonts/roboto)
-LICENSE+=" Apache-2.0"
-# admin icons, jquery, xregexp.js
-LICENSE+=" MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ppc ~ppc64 x86"
-IUSE="doc sqlite test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/asgiref[${PYTHON_USEDEP}]
-	dev-python/pytz[${PYTHON_USEDEP}]
-	>=dev-python/sqlparse-0.2.2[${PYTHON_USEDEP}]"
-BDEPEND="
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? (
-		$(python_gen_impl_dep sqlite)
-		${RDEPEND}
-		dev-python/docutils[${PYTHON_USEDEP}]
-		dev-python/jinja[${PYTHON_USEDEP}]
-		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/pillow[webp,${PYTHON_USEDEP}]
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-		dev-python/selenium[${PYTHON_USEDEP}]
-		dev-python/tblib[${PYTHON_USEDEP}]
-	)"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.0.6-bashcomp.patch
-)
-
-distutils_enable_sphinx docs --no-autodoc
-
-python_test() {
-	# Tests have non-standard assumptions about PYTHONPATH,
-	# and don't work with ${BUILD_DIR}/lib.
-	PYTHONPATH=. "${EPYTHON}" tests/runtests.py --settings=test_sqlite -v2 ||
-		die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	newbashcomp extras/django_bash_completion ${PN}-admin
-	bashcomp_alias ${PN}-admin django-admin.py
-
-	distutils-r1_python_install_all
-}
-
-pkg_postinst() {
-	elog "Additional Backend support can be enabled via"
-	optfeature "MySQL backend support" dev-python/mysqlclient
-	optfeature "PostgreSQL backend support" dev-python/psycopg:2
-	echo ""
-	elog "Other features can be enhanced by"
-	optfeature "GEO Django" "sci-libs/gdal[geos]"
-	optfeature "Memcached support" dev-python/pylibmc dev-python/python-memcached
-	optfeature "ImageField Support" dev-python/pillow
-	optfeature "Password encryption" dev-python/bcrypt
-	optfeature "High-level abstractions for Django forms" dev-python/django-formtools
-}
diff --git a/dev-python/django/django-3.0.9.ebuild b/dev-python/django/django-3.0.9.ebuild
deleted file mode 100644
index b48404f115e9..000000000000
--- a/dev-python/django/django-3.0.9.ebuild
+++ /dev/null
@@ -1,79 +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} )
-PYTHON_REQ_USE='sqlite?,threads(+)'
-
-inherit bash-completion-r1 distutils-r1 eutils
-
-MY_PN="Django"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="High-level Python web framework"
-HOMEPAGE="https://www.djangoproject.com/ https://pypi.org/project/Django/"
-SRC_URI="https://www.djangoproject.com/m/releases/$(ver_cut 1-2)/${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="BSD"
-# admin fonts: Roboto (media-fonts/roboto)
-LICENSE+=" Apache-2.0"
-# admin icons, jquery, xregexp.js
-LICENSE+=" MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86"
-IUSE="doc sqlite test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/asgiref[${PYTHON_USEDEP}]
-	dev-python/pytz[${PYTHON_USEDEP}]
-	>=dev-python/sqlparse-0.2.2[${PYTHON_USEDEP}]"
-BDEPEND="
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? (
-		$(python_gen_impl_dep sqlite)
-		${RDEPEND}
-		dev-python/docutils[${PYTHON_USEDEP}]
-		dev-python/jinja[${PYTHON_USEDEP}]
-		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/pillow[webp,${PYTHON_USEDEP}]
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-		dev-python/selenium[${PYTHON_USEDEP}]
-		dev-python/tblib[${PYTHON_USEDEP}]
-	)"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.0.6-bashcomp.patch
-)
-
-distutils_enable_sphinx docs --no-autodoc
-
-python_test() {
-	# Tests have non-standard assumptions about PYTHONPATH,
-	# and don't work with ${BUILD_DIR}/lib.
-	PYTHONPATH=. "${EPYTHON}" tests/runtests.py --settings=test_sqlite -v2 ||
-		die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	newbashcomp extras/django_bash_completion ${PN}-admin
-	bashcomp_alias ${PN}-admin django-admin.py
-
-	distutils-r1_python_install_all
-}
-
-pkg_postinst() {
-	elog "Additional Backend support can be enabled via"
-	optfeature "MySQL backend support" dev-python/mysqlclient
-	optfeature "PostgreSQL backend support" dev-python/psycopg:2
-	echo ""
-	elog "Other features can be enhanced by"
-	optfeature "GEO Django" "sci-libs/gdal[geos]"
-	optfeature "Memcached support" dev-python/pylibmc dev-python/python-memcached
-	optfeature "ImageField Support" dev-python/pillow
-	optfeature "Password encryption" dev-python/bcrypt
-	optfeature "High-level abstractions for Django forms" dev-python/django-formtools
-}
diff --git a/dev-python/django/django-3.1.1.ebuild b/dev-python/django/django-3.1.1.ebuild
index 722cccf60e2d..e13533790e62 100644
--- a/dev-python/django/django-3.1.1.ebuild
+++ b/dev-python/django/django-3.1.1.ebuild
@@ -7,7 +7,7 @@ DISTUTILS_USE_SETUPTOOLS=rdepend
 PYTHON_COMPAT=( python3_{6..9} )
 PYTHON_REQ_USE='sqlite?,threads(+)'
 
-inherit bash-completion-r1 distutils-r1 eutils
+inherit bash-completion-r1 distutils-r1 optfeature
 
 MY_PN="Django"
 MY_P="${MY_PN}-${PV}"
@@ -71,7 +71,7 @@ pkg_postinst() {
 	elog "Additional Backend support can be enabled via"
 	optfeature "MySQL backend support" dev-python/mysqlclient
 	optfeature "PostgreSQL backend support" dev-python/psycopg:2
-	echo ""
+	elog
 	elog "Other features can be enhanced by"
 	optfeature "GEO Django" "sci-libs/gdal[geos]"
 	optfeature "Memcached support" dev-python/pylibmc dev-python/python-memcached
diff --git a/dev-python/django/django-3.1.ebuild b/dev-python/django/django-3.1.ebuild
deleted file mode 100644
index 24e2cdebd36a..000000000000
--- a/dev-python/django/django-3.1.ebuild
+++ /dev/null
@@ -1,79 +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} )
-PYTHON_REQ_USE='sqlite?,threads(+)'
-
-inherit bash-completion-r1 distutils-r1 eutils
-
-MY_PN="Django"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="High-level Python web framework"
-HOMEPAGE="https://www.djangoproject.com/ https://pypi.org/project/Django/"
-SRC_URI="https://www.djangoproject.com/m/releases/$(ver_cut 1-2)/${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="BSD"
-# admin fonts: Roboto (media-fonts/roboto)
-LICENSE+=" Apache-2.0"
-# admin icons, jquery, xregexp.js
-LICENSE+=" MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-IUSE="doc sqlite test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/asgiref[${PYTHON_USEDEP}]
-	dev-python/pytz[${PYTHON_USEDEP}]
-	>=dev-python/sqlparse-0.2.2[${PYTHON_USEDEP}]"
-BDEPEND="
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? (
-		$(python_gen_impl_dep sqlite)
-		${RDEPEND}
-		dev-python/docutils[${PYTHON_USEDEP}]
-		dev-python/jinja[${PYTHON_USEDEP}]
-		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/pillow[webp,${PYTHON_USEDEP}]
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-		dev-python/selenium[${PYTHON_USEDEP}]
-		dev-python/tblib[${PYTHON_USEDEP}]
-	)"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.1-bashcomp.patch
-)
-
-distutils_enable_sphinx docs --no-autodoc
-
-python_test() {
-	# Tests have non-standard assumptions about PYTHONPATH,
-	# and don't work with ${BUILD_DIR}/lib.
-	PYTHONPATH=. "${EPYTHON}" tests/runtests.py --settings=test_sqlite -v2 ||
-		die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	newbashcomp extras/django_bash_completion ${PN}-admin
-	bashcomp_alias ${PN}-admin django-admin.py
-
-	distutils-r1_python_install_all
-}
-
-pkg_postinst() {
-	elog "Additional Backend support can be enabled via"
-	optfeature "MySQL backend support" dev-python/mysqlclient
-	optfeature "PostgreSQL backend support" dev-python/psycopg:2
-	echo ""
-	elog "Other features can be enhanced by"
-	optfeature "GEO Django" "sci-libs/gdal[geos]"
-	optfeature "Memcached support" dev-python/pylibmc dev-python/python-memcached
-	optfeature "ImageField Support" dev-python/pillow
-	optfeature "Password encryption" dev-python/bcrypt
-	optfeature "High-level abstractions for Django forms" dev-python/django-formtools
-}
diff --git a/dev-python/dkimpy/Manifest b/dev-python/dkimpy/Manifest
index 6e9f3b125f46..f7af6732c6c8 100644
--- a/dev-python/dkimpy/Manifest
+++ b/dev-python/dkimpy/Manifest
@@ -1,5 +1,5 @@
 DIST dkimpy-1.0.4.tar.gz 59689 BLAKE2B ddbe24f3d98833260763eac65199dc282d4833f22adaf5495247c2198626da826d8e1b40767a7a85dd2fe62efe527d99e3c2bcbb838f1038e6ae65af1a60b686 SHA512 0c6b35f6658b11bee340cfe51eca03c301ee052ce602a326b4519bbe134cc7f7d816b8b58faf38bec53b71201bd57dcd1869dd4f3df942cbf2f49caca04cde34
 DIST dkimpy-1.0.5.tar.gz 59799 BLAKE2B 317e7a9e7ad1efdbbc7f4f1ce7efca70f3be4272ead3761d8bbde14d19e9f3a90af96d7bff5fba5b612cecaa166b58da4617e39a13276d0982ea38809f808b4d SHA512 af72a56a777b23318af8f8014bad03cadb93cc39f0b8c2062e15f3e5ca77a13be6f49664c9745f1fe97c592be5a63c4b0a3942da2c2c6eaa486137fdbb96528f
-EBUILD dkimpy-1.0.4.ebuild 808 BLAKE2B c93bad7f707d6d186a93be2d2895b0ed2453275f862cbbfb9636f8dc02b1d490d0bd545f00bec63893184bac049c53577e51adfb324897fddae562c55fc1a315 SHA512 4632e623f3700a3b30def29cda59a12ff69e3f90cd7100f994d0f21ccf50ec7ac8f910eec98ea3c16ce1782795f480426c4f5e85ea0b35c8b60e3f4fed6d80f7
-EBUILD dkimpy-1.0.5.ebuild 803 BLAKE2B 71dc694116f64618bd4c32f333126cbf2a4ae5a1d0e6ed5206241a58cd94e9c67d2cdb425f31f8baa220b00525be2489e7183777697def50fbf8288407926e99 SHA512 a5cee2d397c16648d928861e5f47a4500566021ce440aec4d1583f90c16c73c3380e36ca46185520f9f238a2d657ba34c2f71e48b28dc5ec9b500e8ff35e768e
+EBUILD dkimpy-1.0.4.ebuild 812 BLAKE2B 18823a78bb33e36c6d4ce72cec260631d5d3edb13909aaa4cba37827c8b32d66971f9f8d18e5e578fb664c2c7cb85f9ffaaf223a9a9bbd48a50d2cf88e2eb06d SHA512 0e9f4b1710e3502bf96cc3f49b2f92d14c56857f304dd7078ce762979592ada30b83a3aa78551af47697cb27c5f59bf7f4d95f763babc1519c386e246a1dc6d4
+EBUILD dkimpy-1.0.5.ebuild 807 BLAKE2B ecbf40a0af5490ab1eb1b2e32a85730d63626ca0881ef064d622a716d3679fe8e411a385e4a0c5fd45102b9b20ebdf34feff393e7b47fbdf4e1e9a0490046a7c SHA512 29cc44144646d8182a622b94af81e6c7d624b8a0cf26b01b6b491e4a4b8fdd6b65979d4a12a64a32708ebaa8540baf6038cefb32da46fb6ed763c17876f1a432
 MISC metadata.xml 484 BLAKE2B 14c8de62e359754a4d1dda796cd4f41a216cc3a740bbea0e127bd08f9db82acfa616159beffbd7763f345e61b32152dc66417b1dd125a500d32ddaf71655ea5b SHA512 5290aa58fb15040115413a5eaa144a5c39071a9362f86b34c969b057821267ef978b90900d4d5e52b336c00927cda6878b679cb2d4c2a7f9b4f9dfa9ad425ed6
diff --git a/dev-python/dkimpy/dkimpy-1.0.4.ebuild b/dev-python/dkimpy/dkimpy-1.0.4.ebuild
index 0cdf6add25e3..af3c9201395c 100644
--- a/dev-python/dkimpy/dkimpy-1.0.4.ebuild
+++ b/dev-python/dkimpy/dkimpy-1.0.4.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 PYTHON_COMPAT=( python3_{6,7,8,9} )
 DISTUTILS_USE_SETUPTOOLS=rdepend
 
-inherit distutils-r1 eutils
+inherit distutils-r1 optfeature
 
 DESCRIPTION="DKIM and ARC email signing and verification library"
 HOMEPAGE="https://launchpad.net/dkimpy"
diff --git a/dev-python/dkimpy/dkimpy-1.0.5.ebuild b/dev-python/dkimpy/dkimpy-1.0.5.ebuild
index 92115472e0ca..c8f8c7e80310 100644
--- a/dev-python/dkimpy/dkimpy-1.0.5.ebuild
+++ b/dev-python/dkimpy/dkimpy-1.0.5.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 PYTHON_COMPAT=( python3_{6,7,8,9} )
 DISTUTILS_USE_SETUPTOOLS=rdepend
 
-inherit distutils-r1 eutils
+inherit distutils-r1 optfeature
 
 DESCRIPTION="DKIM and ARC email signing and verification library"
 HOMEPAGE="https://launchpad.net/dkimpy"
diff --git a/dev-python/dockerpty/Manifest b/dev-python/dockerpty/Manifest
index 1ba03187d300..3d37fc6b9d42 100644
--- a/dev-python/dockerpty/Manifest
+++ b/dev-python/dockerpty/Manifest
@@ -1,3 +1,3 @@
 DIST dockerpty-0.4.1.tar.gz 19608 BLAKE2B 1c7229bdd18100bb75a8ec80f0b8a636137efce40affb2bbadf27eef5ee13322ab92f9a3f77db0ef79c35366daf700550eb9a358534f7a1f1c2b92ec2cd4d5d0 SHA512 1f27a1d1cf9bfa21a77f2c0695334ec09a81ed5b70190b16fb23ec0e2ab4cb84af334b5e9275265eff2d8014aac5f96890276bed5775bb805c3f30260c99da70
-EBUILD dockerpty-0.4.1-r1.ebuild 748 BLAKE2B a89b919b15fad1cb328a0bb312e95ab0a69164f783420b69a0239faffc0daaa07bae07e310fe3d6816227df753304ac2569008107e40decfb7403054e39b618e SHA512 07cb1ef6036da37271bc738bcd2de73b46dd955226280344503d4bddb5c593fb67c43b48d7575f897a12181d7503e731760016572c29cab7c08575c97383520c
+EBUILD dockerpty-0.4.1-r1.ebuild 715 BLAKE2B 1d221f77156d7cd0675d0866d4e9262f7ff2adc2406553be0ef42d5daf491cc3f33332e44ef3c8faa7515e993411f127f49166a552e63000cd1f63320b4812a5 SHA512 603ea5deeb67a50bbd75bd13edf0ee2b35f8b20ce3ea17ee917fb2c31330eb5d2e6d8afa640ae36451b66f8a102242394370be6970027209a8c61ffb61aeac99
 MISC metadata.xml 246 BLAKE2B a3790516e837d7d62a7efa31295004ba64b36026f45d696d87b5fb83e0b08815b887209bd5ba4f0be5a8b1371797d4abdbd125f4f018b32dd95613b36c53ffbb SHA512 c9e4e7717be1b4f5571d287b57d59c6de4bee0f4bb0a21a55cbbc886f711d57e52e74761bcf7f1102e1efa4b0e56f508e5f15eeb69cb38866692bc232032f936
diff --git a/dev-python/dockerpty/dockerpty-0.4.1-r1.ebuild b/dev-python/dockerpty/dockerpty-0.4.1-r1.ebuild
index 142a6b162903..02b1c30f3769 100644
--- a/dev-python/dockerpty/dockerpty-0.4.1-r1.ebuild
+++ b/dev-python/dockerpty/dockerpty-0.4.1-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
 
 inherit distutils-r1
 
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/d11wtq/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64"
+KEYWORDS="amd64 ~arm64"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
@@ -26,6 +26,4 @@ DEPEND="
 "
 RDEPEND=">=dev-python/six-1.3.0[${PYTHON_USEDEP}]"
 
-python_test() {
-	py.test tests || die "Tests failed under ${EPYTHON}"
-}
+distutils_enable_tests pytest
diff --git a/dev-python/dogpile-cache/Manifest b/dev-python/dogpile-cache/Manifest
index a91ecb9fd6b1..20076255c5a8 100644
--- a/dev-python/dogpile-cache/Manifest
+++ b/dev-python/dogpile-cache/Manifest
@@ -1,6 +1,5 @@
-AUX dogpile-cache-1.0.1-install-tests.patch 583 BLAKE2B fccbec419311e32f94bf3fd72dc55c621e53b4cd7e0401ac480da85c9ec332413d615388a480cca53dfe213f6f97e1f2b5f16827753f21272e3caf4ee3105d01 SHA512 a7e32c981f87b43750cc263a783ca22a8b1dd487adaf19e007ce104564a660968758d256cff17f39c151474cb1b3ce9283a69038e4097e08788326b9a82a7610
 DIST dogpile.cache-0.9.1.tar.gz 329015 BLAKE2B 23a33ccf024153e39bdccebefc33c866990733432abd2bdd715a0f180f0059a2ff8315024d59d3ad9c79a01561fda3a802a867d359961d7655bdf790556c7a2f SHA512 7d84325dd7ec2d85027472f07cddd51f495b75dc9dbbcbf26bad7aaabfee8c2da99e0c247851282b228528a87e54d98e04d8451a3ca3a571e84a4a2bb33e72f2
 DIST dogpile.cache-1.0.2.tar.gz 351221 BLAKE2B 7cca7e0c260ca68fb26c0db5b736de1e3586f22a14558b8b294dfd12452cd55d70eb75b7a01041001d1d8f5300d4b7d5b5c9ff9e52dc066514d908ae188a6f97 SHA512 b49e9005916636aff0a25b9158923ea9362b3edf1f42704d06e65b14892d0cdb6b1da7d620f10d752efb1ae1987a9187b0f642cc30d07de3fc961921e1794a87
 EBUILD dogpile-cache-0.9.1.ebuild 684 BLAKE2B 94543a180628b1504ff9e1735ec5cede15d0f298f25b938d6de57d4c2c9453fba267c9006d45814c37e4101c282622fb04fa7626a9cdacd354f2f0c486622c33 SHA512 a302435982fc6d763d1fc33797a74240f8a50ce7cdd0350d0eaeef40af5173884c5edb5e411206fa4c19b20f6a3b2eff3a878f0069fdcb5dddd164a6b3b6d6ec
-EBUILD dogpile-cache-1.0.2.ebuild 762 BLAKE2B 7080560b50903f1343babd40e04491234620f182625f89adaa30f47e783a06a255fc8a72baffbbb1150e89d41ef883f09d4e49288e79454cd4eafd6a45428b07 SHA512 2f3ee60f8e89d39e3cd79325b29046f7eaf0ec14d9216701f8e429b2d472674d0ee9cbf8fadfd5530907bd9cd3c70d73cebbfefc08e50f6cc5e20b09aeb3a14e
+EBUILD dogpile-cache-1.0.2.ebuild 759 BLAKE2B 9457c3a94f8c312b22406269cabbc0da9fec8fa6284db401ea379e6ddd7f8edef51c74878d9cb98ce928aad773ddddfa3479ce06792a29d1ea9f036bf03bbd0a SHA512 3a8ca69e37b452cf3af1bb89d23388117c0097df1e8eb2456385d8ad059c0086241c442a6e0d3482d582a50bda0765d8b1f3e2b2bced876718b4badde710b202
 MISC metadata.xml 842 BLAKE2B 563cbf5028020e4afaf810c0b47b98c9e4c44cece6ca57575e91d76014f25892306bedf1812df08634001fc099d26e83288874e2f9274d09dc523d53775a9d46 SHA512 9640c0603ffeefe661427c6dda9fbb2c1633693beda0da39afcd2f8a2cbdb6206cae75228d692a1ae11352306aea3a9fdf602d0cde4324d21642825620e20176
diff --git a/dev-python/dogpile-cache/dogpile-cache-1.0.2.ebuild b/dev-python/dogpile-cache/dogpile-cache-1.0.2.ebuild
index 40848b853c59..f85ba84273e6 100644
--- a/dev-python/dogpile-cache/dogpile-cache-1.0.2.ebuild
+++ b/dev-python/dogpile-cache/dogpile-cache-1.0.2.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/dogpile.cache-${PV}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm arm64 x86"
 
 RDEPEND="
 	>=dev-python/decorator-4.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/dogpile-cache/files/dogpile-cache-1.0.1-install-tests.patch b/dev-python/dogpile-cache/files/dogpile-cache-1.0.1-install-tests.patch
deleted file mode 100644
index f00d5a15538b..000000000000
--- a/dev-python/dogpile-cache/files/dogpile-cache-1.0.1-install-tests.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 559a5c57c922741461d419b73f1aa547e3231110 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Mon, 3 Aug 2020 08:50:33 +0200
-Subject: [PATCH] Exclude installing "tests" package from setup.py
-
----
- setup.cfg | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/setup.cfg b/setup.cfg
-index ab4008f..2f43889 100644
---- a/setup.cfg
-+++ b/setup.cfg
-@@ -30,6 +30,11 @@ python_requires = >=3.6
- package_dir =
-     =.
- 
-+[options.packages.find]
-+exclude =
-+    tests
-+    tests.*
-+
- [options.exclude_package_data]
- '' = tests*
- 
--- 
-2.28.0
-
diff --git a/dev-python/doublex-expects/Manifest b/dev-python/doublex-expects/Manifest
index da070694bb85..2f60194f2a26 100644
--- a/dev-python/doublex-expects/Manifest
+++ b/dev-python/doublex-expects/Manifest
@@ -1,3 +1,5 @@
 DIST doublex-expects-0.7.0_rc2.tar.gz 6151 BLAKE2B 34d385467fec24a5210dcad53ef768d23eb5117b14679b89bcef721bf90ea380da50c62233afe92abaaf3bd015dc1bb021adedaf98c463400af3ec4e462b7aaf SHA512 94e499f01fbdc73f3f97bbfb64f299d43e3b767f8eb00eecb7c05e062cedd8fa84569cc97ef48aeca24df5ff94b1bfbb330a786500641c857039c2e7d287e952
-EBUILD doublex-expects-0.7.0_rc2-r1.ebuild 733 BLAKE2B 75314aea231e853bbbab6352d043f4f995ba6d174c5db5d69f6d741c922e4cc89dc2d0dfcf6933d77b844ef6bf1f1ea53c0a5960a627e81926bdcac5267b89ef SHA512 2096048cfc4da5c851b478e492d447cf898cb32feb57789863a47e20aa32a1468adcc49bbbe13213cc4070943633a14f1c2e852cbc415044368346cb45d72e73
+DIST doublex-expects-0.7.1.tar.gz 6315 BLAKE2B 4af2832244578237821ba29baec54ffe1f226dfb1c92a5a03122c1a30c0e78d472ab8f75e6412a9014b97265120b5c60a8b5674cb42be58b46397a537bd534bf SHA512 2aaff2e58556ed9eb91ebb418e65058367411e011e843afb5adb08ab69705b6bdfb478d3052aae093ad1c1a1b49ba1e084e4c5510acde4874182a658330e3448
+EBUILD doublex-expects-0.7.0_rc2-r1.ebuild 740 BLAKE2B 88ca4dac659eaad885208e121d9211549a75e3f9f9410ee46ab87c086acc9de805ee411fc93ec2b354ad2b5b035023489e5aa151a931502bb784a28fc5a917b9 SHA512 08d694ccc7af038367b04ef6effb56682906cee9ba54a9b6e3010ed95196f6127a1f7d28eefddb0f5b23cc26554143f093e1e051ff3977f5297edbff63b0d0f0
+EBUILD doublex-expects-0.7.1.ebuild 747 BLAKE2B a8454881cc313679f24f69ece72e257dc0c3bb0db45e2cccecff88ea27267f91d3226abe2764884f38a3f9f02279ab77f8aa82e7a263fc7d21f0a4bb43071a60 SHA512 b133e9c15bb9188e5c6c17fe4565e4d7f6a73e6d9cd239210a0a64047ae9052ca53572ee86c7c8e1ddce4372402e6d437ffc8d5cc562fe64d6f2bc6d731f47b4
 MISC metadata.xml 263 BLAKE2B b2f81a90ecd9e66c5495a4c8cf4bb7d0e2dbce41a5e5fbc172f1d2ab65569bf15223789dbc356ae93774af872c3267b756eddaec82014c64f242c92455e8f3aa SHA512 0281999c203e87325a1f2688efd19a57088305289308fdf2401b775a3ffe375ceefb200dd4896417a7e1a5f436e5681143326c74635acc504af8e25d3b876c1c
diff --git a/dev-python/doublex-expects/doublex-expects-0.7.0_rc2-r1.ebuild b/dev-python/doublex-expects/doublex-expects-0.7.0_rc2-r1.ebuild
index 0dac2ba60987..8bb684e38bfe 100644
--- a/dev-python/doublex-expects/doublex-expects-0.7.0_rc2-r1.ebuild
+++ b/dev-python/doublex-expects/doublex-expects-0.7.0_rc2-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/jaimegildesagredo/${PN}/archive/v${MY_PV}.tar.gz ->
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64"
+KEYWORDS="amd64 ~arm64"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/doublex-expects/doublex-expects-0.7.1.ebuild b/dev-python/doublex-expects/doublex-expects-0.7.1.ebuild
new file mode 100644
index 000000000000..6672dc2eac3d
--- /dev/null
+++ b/dev-python/doublex-expects/doublex-expects-0.7.1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9} )
+
+inherit distutils-r1
+
+MY_PV=${PV/_/}
+
+DESCRIPTION="Expects matchers for Doublex test doubles assertions"
+HOMEPAGE="https://github.com/jaimegildesagredo/doublex-expects"
+SRC_URI="https://github.com/jaimegildesagredo/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-python/doublex[${PYTHON_USEDEP}]
+	>=dev-python/expects-0.8.0_rc1[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		${RDEPEND}
+		dev-python/mamba[${PYTHON_USEDEP}]
+	)
+"
+
+python_test() {
+	mamba || die "Tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/doublex/Manifest b/dev-python/doublex/Manifest
index 630cad42ed14..010b23cb5a04 100644
--- a/dev-python/doublex/Manifest
+++ b/dev-python/doublex/Manifest
@@ -1,3 +1,3 @@
 DIST doublex-1.9.2.tar.gz 80246 BLAKE2B 7fc1c4e6d117bee13e7125b634293aa7c9d1016c9cd5201f047143bcb1fae1e9607bf0a030cbaa2d6eb930474babe29aaf244433aba57ae4325a3a43af2fdf56 SHA512 0278f756930b0d5c3da676e3908ccc17b919c14f740aace3002f5117fa341ac52fe16fdaa2c3b36029757dd1dc2f36d8d35cdc8664fcfdbcafd4809d2fc969b0
-EBUILD doublex-1.9.2.ebuild 906 BLAKE2B f9cdf0b4f9958cf08a1cbb6ae74c79c3c1403fe6bdcc6446c16f476cff172e96fee986ece06797031df8c60eefe58343ba3530a76988bebce14314949476bbb8 SHA512 d28df8038136b28abea6a3b19e53856af743b94cb9a4c551f066ec6f5cc60dc57c2fb5ef372f2e667330162931e5362e765fa7454f70615487a1b3da6819be88
+EBUILD doublex-1.9.2.ebuild 1405 BLAKE2B 0f5d4c517607f1825ef8c83e088eda1b9011c039cd7ec8024d1c2090381168891c934849f74d4079859954992ebf7230c417936b122ad568b21ac879652d6560 SHA512 a2b4cc5393c61ecb4c19bb16f2b5ab53efd03657c18faf0bb09705415c0e973582ad937ff0b38b747848b26ae1d13d288db4079d483fd01cba81d3f92bd8f98d
 MISC metadata.xml 303 BLAKE2B 45ebb26950f3f4fc9bc3d6d99418f544523b778c3952e91e6bfb5f37bdfc13b73d25e24bcaf199d61a69cad733fe370cd19ad0c934b3d478097c52ede1316784 SHA512 efe73a700fe748323eeb26f9203b3aab0e189c8ceb56efba5ba97a91793a5deb0ad973dad345e240fc9c15803b929fd84f26524055de1f2290f40042f318d2c9
diff --git a/dev-python/doublex/doublex-1.9.2.ebuild b/dev-python/doublex/doublex-1.9.2.ebuild
index 43ec6b36311a..167fc6a19c20 100644
--- a/dev-python/doublex/doublex-1.9.2.ebuild
+++ b/dev-python/doublex/doublex-1.9.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
 
 inherit distutils-r1 vcs-snapshot
 
@@ -13,7 +13,7 @@ SRC_URI="https://bitbucket.org/DavidVilla/python-${PN}/get/v${PV}.tar.gz -> ${P}
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64"
+KEYWORDS="amd64 ~arm64"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 
@@ -27,6 +27,16 @@ RDEPEND="${CDEPEND}"
 
 distutils_enable_tests setup.py
 
+python_prepare_all() {
+	# Disable broken tests
+	# https://bitbucket.org/DavidVilla/python-doublex/issues/5/support-for-python-36-37-38-tests-failing
+	sed -i "s/test_*hamcrest_/_&/" doublex/test/report_tests.py || die
+	# https://bitbucket.org/DavidVilla/python-doublex/issues/6/more-failing-tests-with-python-39
+	sed -i -r "s/test_(proxyspy_get_stubbed_property|stub_property|custom_equality_comparable_objects)/_&/" \
+		doublex/test/unit_tests.py || die
+	distutils-r1_python_prepare_all
+}
+
 python_compile_all() {
 	use doc && emake -C docs
 }
diff --git a/dev-python/dulwich/Manifest b/dev-python/dulwich/Manifest
index 780858debcc1..93c2fe87d2d0 100644
--- a/dev-python/dulwich/Manifest
+++ b/dev-python/dulwich/Manifest
@@ -2,5 +2,5 @@ AUX dulwich-0.18.3-skip-failing-test.patch 695 BLAKE2B 27ad8e5037931859e8dc138cc
 DIST dulwich-0.19.15.tar.gz 369491 BLAKE2B ffaabbd68ee228e771b8a56c9a5b70498e49a4547f3f0ff87225ca4ee0a222fca5cd75a36293fb0d111615f4fe9550acd2825732a178f67d9f6b538abf9fc37f SHA512 ae56cf4748ea5f9d275f2d1456bf9fce77859ad2eeba6b7d8f34283e212404ba385f377f4fb86b88dc40982649ec8cfb12ea407dd25ada7cb2b0e862568ac7da
 DIST dulwich-0.20.5.tar.gz 384166 BLAKE2B f11ef1467a7f850666a850c42871b2bb798cdad54b4ad5a7d6fef8171cb5378982537574f9d2c783e2c9e7357624eec4c617c0b014d789d9f40f5bdfd56d8b39 SHA512 88c546fdc6cb4fbde1ebab5160e1f226259d85c934bee456c8a93b14f4c292550e685696fd25c27635f3342f82b0c67572059fb90e3e9b339aa0d11b9e010c25
 EBUILD dulwich-0.19.15.ebuild 1701 BLAKE2B 181fac6e54d4dfa2d34bb8ced0e1eb5d037c85fdc0ffc0c51fe395e90b626dc3a98fe47e6a59ec904b6c5d8d1827a5c5000cac0de94dddf0d6f51bb50694fbaf SHA512 8cf6577504fdbcfb4045ea633c8a990a7be0af26a4b80b400435f72e668b284494ef89d74a60fb0478bad255cb3bc730b7f3958a7b9a18cd5f23d11150d00c18
-EBUILD dulwich-0.20.5.ebuild 1604 BLAKE2B 0f5eab76c7fd88680bb3782ec6ee16743caffbdaa53e266fe45045e51f0f5f2294dd6cd9dd282123f281687a9e6eb61e6b26e51f93e23dccc96229dc826345e5 SHA512 eda5203d4bba40c13c8474b64962448f3e35ee26c31aa3277105bb6e177374e2df6bf350a852af340ca42ae52e5c8aed2acfdc73523394bb5addd22740de0d28
+EBUILD dulwich-0.20.5.ebuild 1553 BLAKE2B 87306720ca73d3bb62cb912507eb4b357b606bb14ec8e5fb944d78afdc5203eb55191ec2efa2af9cb67999f4a7f4b75af7266f7e79f28c895e9a552f49f58aed SHA512 f2a97d98cab952b3e5e99ea4f715b50cb66253e7d6a6c3c3e76f1568d99ee9e0bf83e0d267317430a7f13dff29c15ba1fd6d3b4ebf45186ba1d9e55257fc7f89
 MISC metadata.xml 448 BLAKE2B 15b62d6a9a252067a63c02db94a906b0da6b72cf8287997252e8fab9cc6f52059ea966d915449a9bd4c64a5bf045e0725d62ff14baf6864cd5212c1765cb5738 SHA512 3a490b46094e92d66e7e0f8e2d0282b75cb33ee2a7a21e4f89029b0a454909466ff5ab4732193480203da9d2481c6134494ccef95953906f6a9da66cc9834830
diff --git a/dev-python/dulwich/dulwich-0.20.5.ebuild b/dev-python/dulwich/dulwich-0.20.5.ebuild
index bea5ab1da2bd..fe78bc73abb1 100644
--- a/dev-python/dulwich/dulwich-0.20.5.ebuild
+++ b/dev-python/dulwich/dulwich-0.20.5.ebuild
@@ -3,8 +3,7 @@
 
 EAPI=7
 
-# ready for 3_9, but fastimport isn't yet, #733838
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
 
 inherit distutils-r1
 
@@ -14,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~ia64 ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc examples test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/easyprocess/Manifest b/dev-python/easyprocess/Manifest
new file mode 100644
index 000000000000..1993c4d6a5c1
--- /dev/null
+++ b/dev-python/easyprocess/Manifest
@@ -0,0 +1,3 @@
+DIST easyprocess-0.3.tar.gz 11310 BLAKE2B d26405863f213a94687d646f57aed98d0285bd57c0dfe9c40d2f49e5cfe46710e0435ff20eb1d697648e6fd1b63a38adf46a03f0fe970e35d44bfe3ad058d63f SHA512 3a10a02b28139c2d3d53134ac7842dcc7027c855e55b17747be1545cbf77cf86303531b595a54d92d7dc8133aee210388d25f3362b705ee554323c01d742d336
+EBUILD easyprocess-0.3.ebuild 642 BLAKE2B f79c7b8cfd498610a93cfeffbc5c296b7ad6b6cea3f15a14e9e5335267dbfde5cf979ed3c96fa3ee29584d3e1f2e3d4790b720325a4639bfd0f9476ce12102eb SHA512 647664b6620bda76cfbd5bf8ef59e441da345fdbabf5825e33852329fd2f9c6d05b8d6fddc5d2b3d2b40ffb51eb0ba79d7ba3380b67d24888bc1f40be3a30f6e
+MISC metadata.xml 375 BLAKE2B 393138e315b4eae4dacb9339fbb5766e9dbaa84b7482babaddc08d524fb8b9939f6622ee9c6d09b66c61ac270fcc483fac39996a12ba87ccccf7cafd4c6d36db SHA512 9a44b6b9de4d1a61d6af9256519473541d5513cef349c15178c025dee3aaaa3f6772b1be56576411a985fcd9c70029c00743d8f577be8eaec4c5a44646c9cbf6
diff --git a/dev-python/easyprocess/easyprocess-0.3.ebuild b/dev-python/easyprocess/easyprocess-0.3.ebuild
new file mode 100644
index 000000000000..1bc9dae21a85
--- /dev/null
+++ b/dev-python/easyprocess/easyprocess-0.3.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8} )
+
+inherit distutils-r1
+
+DESCRIPTION="Easy to use Python subprocess interface"
+HOMEPAGE="https://github.com/ponty/EasyProcess"
+SRC_URI="https://github.com/ponty/EasyProcess/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+BDEPEND="test? (
+	dev-python/pytest-timeout[${PYTHON_USEDEP}]
+	dev-python/pyvirtualdisplay[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	x11-base/xorg-server[xvfb]
+)"
+
+S="${WORKDIR}/EasyProcess-${PV}"
+
+distutils_enable_tests pytest
diff --git a/dev-python/easyprocess/metadata.xml b/dev-python/easyprocess/metadata.xml
new file mode 100644
index 000000000000..d22e99d73577
--- /dev/null
+++ b/dev-python/easyprocess/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>andrewammerlaan@riseup.net</email>
+		<name>Andrew Ammerlaan</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-python/elementpath/Manifest b/dev-python/elementpath/Manifest
index 97839f05bd52..926b33afee0d 100644
--- a/dev-python/elementpath/Manifest
+++ b/dev-python/elementpath/Manifest
@@ -1,7 +1,11 @@
 DIST elementpath-1.4.6.tar.gz 121815 BLAKE2B 09014fc503c8a3a6a6865572fa48c515af19fc009512369d8e761ca5b4e516de1add7eb14c0681114331c4a8ef08cccb5fac8f4ce2b436523780cb4e41e2dc00 SHA512 ac1d7fc0ab07f22fa02550ac77f4067b5564f78619bf98d6fda257751d6404684622580002d69beb769fc471500ee0c08f6095b05ddc6b7d81276dc8e158c40b
 DIST elementpath-2.0.0.tar.gz 149239 BLAKE2B 6963429ee127ef2a293da6706e6d1bc13be4d864d7da3d7169dd81d0a430156684f0977076182ec7aff7622940dbc341b84fab3eb488bbe6470476c4d30b6d4a SHA512 bb29c9cf30e9a414f9ddc7e29d3ae09af74302ed9c0bb98332b4fe01bab2e043cd5adb59b20a0730218d79b9f2ae42e9f2ad3ed7e4d0ae8ffde1800c96ee00a9
 DIST elementpath-2.0.1.tar.gz 186127 BLAKE2B db2e566e3032881d9db57d3951371dd4321baf3c3246a1a882c8a1ee9dafee2c2e4c2e8bb35cea7452ed51779a91c85976847cb46f18c1c6683c7c501961b2ed SHA512 77bf895c9d509dec57dd9770ebddf8ad58eca4aaee46c3372fead2d0a5109ff27e183d29a5bd5ef1a2ad203c6c64387b11b8bc0b2e96786843d24faadc3274ad
+DIST elementpath-2.0.2.tar.gz 189956 BLAKE2B 7d7b612a1271b322eef504952bc6fb5089bdafa3276745668c156229b66c80b8fb8070de56c84988af22ee3586a5b420481bd9141b598d436525ac2a78d25f5e SHA512 eeb4876525ab06857e30cd04e234a66c7396e6aea48a6bfdd158354591fd8b7e8fcb65cbcafd73c274a5590d8fe1844a62e1d86baae4d55dbf7545e8377d49d1
+DIST elementpath-2.0.3.tar.gz 191499 BLAKE2B dd8ee226b5e04168de90e0375db971bb51aad233cbc56a63e1a79aa847fffbeddc5438ca769317ccd0ad6f30aad61ec65fe9dc7c32dfff687e8cd208ccf9ee46 SHA512 fccb291405aafa5751f0dbb636171145a41941e929dd93b097d61f11366e71757f47a65c32b83fd8ad0fafcfb530315417ea879b3e05421bc479b2e309960006
 EBUILD elementpath-1.4.6.ebuild 664 BLAKE2B d8d91a1dacd4a0b0000700d6fb35101b969b65529903588462b26570135811e40d76692eda1f7db1b367a0acf5fdae5ab94676bc74e3b632ac3d7ea342b1b9b8 SHA512 d96ec68d52c9910d1c9320538d9347c78ded4c6a47a99d5c12cb53fcc5302dad4dcc8de53bf66fb549d0fb0a71aaace2c6e1121cd3a36c409e03b2e5e3c677f7
 EBUILD elementpath-2.0.0.ebuild 672 BLAKE2B 9c0b90acb8f616c3d019513e589f4942a5038877df436575379909eadaf3fcdc226264e97003be0d99fbb8fbc3efb3bd01d8866c25f8dced376dd67aa848e506 SHA512 852736112ce064bea6ba97c8b703175c956adfe4b3de67ecd9fd31780127ec9c44c3672bcb501cfe70d4ca66c2f3db76f0fe2bece37ad4733ccfd27f938a6a62
 EBUILD elementpath-2.0.1.ebuild 672 BLAKE2B 9c0b90acb8f616c3d019513e589f4942a5038877df436575379909eadaf3fcdc226264e97003be0d99fbb8fbc3efb3bd01d8866c25f8dced376dd67aa848e506 SHA512 852736112ce064bea6ba97c8b703175c956adfe4b3de67ecd9fd31780127ec9c44c3672bcb501cfe70d4ca66c2f3db76f0fe2bece37ad4733ccfd27f938a6a62
+EBUILD elementpath-2.0.2.ebuild 679 BLAKE2B 0bcb031d256537cb2029e11890fd365277090465c16efaf359b7cc3bc4966e88be6dbbf26fa8574f470b0ba9e380913662ff1a42dca185032e378b700bfdc220 SHA512 0329166440ce98ab0489e3746e766a2692e7426b8d00061985ad4e5e1774eafea9cf22a930efb304f61ff74adf90f76aa513ef418469d66ed076b1aafe6ae998
+EBUILD elementpath-2.0.3.ebuild 679 BLAKE2B 0bcb031d256537cb2029e11890fd365277090465c16efaf359b7cc3bc4966e88be6dbbf26fa8574f470b0ba9e380913662ff1a42dca185032e378b700bfdc220 SHA512 0329166440ce98ab0489e3746e766a2692e7426b8d00061985ad4e5e1774eafea9cf22a930efb304f61ff74adf90f76aa513ef418469d66ed076b1aafe6ae998
 MISC metadata.xml 242 BLAKE2B 17fd7db1343fb7dba1842d5b62d83e56e2816962b0122ec6eee7f9e163f333d69ede2cbdf2a2ba8c77613367fca3d2cee779697fb25b5d8cf0439e1e845dbf1f SHA512 2ce768d5aae91f32da90c62900f556c647eb9806c810a817b6c45c5356e71f504b5a646bf75f553c3a9bfd3f94c4317df4948bae863ef7525b4a013b63618cd8
diff --git a/dev-python/elementpath/elementpath-2.0.2.ebuild b/dev-python/elementpath/elementpath-2.0.2.ebuild
new file mode 100644
index 000000000000..c7a8e1d2336a
--- /dev/null
+++ b/dev-python/elementpath/elementpath-2.0.2.ebuild
@@ -0,0 +1,26 @@
+# Copyright 2019-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9} pypy3 )
+inherit distutils-r1
+
+DESCRIPTION="XPath 1.0/2.0 parsers and selectors for ElementTree and lxml"
+HOMEPAGE="https://github.com/sissaschool/elementpath
+	https://pypi.org/project/elementpath/"
+SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	test? (
+		dev-python/lxml[${PYTHON_USEDEP}]
+		dev-python/xmlschema[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests unittest
diff --git a/dev-python/elementpath/elementpath-2.0.3.ebuild b/dev-python/elementpath/elementpath-2.0.3.ebuild
new file mode 100644
index 000000000000..c7a8e1d2336a
--- /dev/null
+++ b/dev-python/elementpath/elementpath-2.0.3.ebuild
@@ -0,0 +1,26 @@
+# Copyright 2019-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9} pypy3 )
+inherit distutils-r1
+
+DESCRIPTION="XPath 1.0/2.0 parsers and selectors for ElementTree and lxml"
+HOMEPAGE="https://github.com/sissaschool/elementpath
+	https://pypi.org/project/elementpath/"
+SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	test? (
+		dev-python/lxml[${PYTHON_USEDEP}]
+		dev-python/xmlschema[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests unittest
diff --git a/dev-python/entrypoint2/Manifest b/dev-python/entrypoint2/Manifest
new file mode 100644
index 000000000000..f95d7b254723
--- /dev/null
+++ b/dev-python/entrypoint2/Manifest
@@ -0,0 +1,3 @@
+DIST entrypoint2-0.2.1.tar.gz 11396 BLAKE2B ee462006f1fe4c80f707d00c2ef89fcf359b59853730786920ad931a099afafc808620ca16f0232e07a75c824b4b25ff50971c643f70087b89ab2ba6b7e13c1f SHA512 2273eda6cd8bf5a5e9fc5e8a657f837a88c8b617e384cdb6f6b62b3380e0b37d82af54dadd59a0ff82cd85cfdd61bb79d6c747621370f50e97c3796111baaaf6
+EBUILD entrypoint2-0.2.1.ebuild 548 BLAKE2B 48b6eaabc07e0a4dd7a3450af0ccc0de1d297ebaf2c7941be29e34a5769707e73e42d7936638482865567fda136cda415164eae70fc9cce496f1b588df6c0a6c SHA512 c550a431fcd1bd79f563cdb94a0a23273538e1509e2eedc036bfa12e738495814e4c15ab37f5a57b084d8fcbc6252c9947059770ff926fac09a5bf8077378484
+MISC metadata.xml 375 BLAKE2B 393138e315b4eae4dacb9339fbb5766e9dbaa84b7482babaddc08d524fb8b9939f6622ee9c6d09b66c61ac270fcc483fac39996a12ba87ccccf7cafd4c6d36db SHA512 9a44b6b9de4d1a61d6af9256519473541d5513cef349c15178c025dee3aaaa3f6772b1be56576411a985fcd9c70029c00743d8f577be8eaec4c5a44646c9cbf6
diff --git a/dev-python/entrypoint2/entrypoint2-0.2.1.ebuild b/dev-python/entrypoint2/entrypoint2-0.2.1.ebuild
new file mode 100644
index 000000000000..fc2e650b9d50
--- /dev/null
+++ b/dev-python/entrypoint2/entrypoint2-0.2.1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8} )
+
+inherit distutils-r1
+
+DESCRIPTION="Easy to use command-line interface for python modules"
+HOMEPAGE="https://github.com/ponty/entrypoint2"
+SRC_URI="https://github.com/ponty/entrypoint2/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+BDEPEND="test? (
+	dev-python/easyprocess[${PYTHON_USEDEP}]
+	dev-python/path-py[${PYTHON_USEDEP}]
+)"
+
+distutils_enable_tests pytest
diff --git a/dev-python/entrypoint2/metadata.xml b/dev-python/entrypoint2/metadata.xml
new file mode 100644
index 000000000000..d22e99d73577
--- /dev/null
+++ b/dev-python/entrypoint2/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>andrewammerlaan@riseup.net</email>
+		<name>Andrew Ammerlaan</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-python/execnet/Manifest b/dev-python/execnet/Manifest
index ce4a7fe621e0..da4079d574fa 100644
--- a/dev-python/execnet/Manifest
+++ b/dev-python/execnet/Manifest
@@ -1,4 +1,4 @@
 AUX execnet-1.7.1-tests.patch 7299 BLAKE2B a2bf00a2b283dcebb777ff4743f6dbd522ddb8ede743f77bbaa20b1b2e5956ea08e04359459a2c6837a5b2bb64585b8bf3bb826236acbbd874ffa5950d8d1196 SHA512 938bdc6185a5251a7f1e5185a694774a1b6e1c1ad39dbc444ee248f338f2e8a15dc3761980224f9eb378fa4c384a2c83f96f8a3ce55da2a24ea04b85997bdcf9
 DIST execnet-1.7.1.tar.gz 174157 BLAKE2B 0c2f7b8918bdd5a3cd1fdc49607e571874e20bd26a4806a6ec1a11359b912ed09244afb781670ff24fbee752516d59ab2bba7f662bbcddb802e7e6efd2c544ef SHA512 375748c03f8d955bd8fca90d5c6308073c31a978fd7a604257512e0a710f899dec5db8a91d5bb5f16de9b0656e1742da9ab513827a1a065a5125bafcf1e63a70
-EBUILD execnet-1.7.1.ebuild 1174 BLAKE2B 06737b6102700da77b14df8c443be0b9a1f96d3284e90ce385c6ddc25c836e0bd0d5c72b40d296b25a6b66c82cf406869f3a78b8dfd4363b755d97dbb2db464d SHA512 db34af248e8c963b3f7bb04f8cbf9ce37a8551ebd99aa2f66ee974319cd90a5155b8c145ecd99cf9a7ef360ef58ab2f5ce59698141dd24fd4d7729bae6673665
+EBUILD execnet-1.7.1.ebuild 1181 BLAKE2B 1ed1ec8a7e048e8a6e9eb46be64ab8ad706ed1a80a8f76ef3b3f529236ad3441f8ccb6a0a8cae1e1c09e0c2c41e1dc7614fa954e15f85efbf6a6be6624435da7 SHA512 278de1f59ced1ad44e2cabf1c587770d3b1a24d2404d6489a1be1cdcba9f98f7ed5cdc9c3d73fe5b9cddd75be6c5d7e446612fa3a8509c9d0cc87504a7be43b2
 MISC metadata.xml 417 BLAKE2B b2dbd5a0b0bee658ad27c90d607e2a6ac13d7c11c9ce21571f041831136c6fbf52f888fea8658603b9768ca4201dbbda01cbc03ef61fd3a90b88677b2f2ebe90 SHA512 d264334e083c2e9171c1fed5cbdc02f36a39de150949afba267db382dcbbbe758a283ee81f59172db66450cc424a4398ad80f5e5298cfe496636a93853d6e94e
diff --git a/dev-python/execnet/execnet-1.7.1.ebuild b/dev-python/execnet/execnet-1.7.1.ebuild
index 0a5b7e9a95c5..cfa1d95adf6b 100644
--- a/dev-python/execnet/execnet-1.7.1.ebuild
+++ b/dev-python/execnet/execnet-1.7.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
 
 RDEPEND=">=dev-python/apipkg-1.4[${PYTHON_USEDEP}]"
 DEPEND="${RDEPEND}
diff --git a/dev-python/executing/Manifest b/dev-python/executing/Manifest
new file mode 100644
index 000000000000..1fef41d4c14e
--- /dev/null
+++ b/dev-python/executing/Manifest
@@ -0,0 +1,3 @@
+DIST executing-0.5.2.gh.tar.gz 303118 BLAKE2B e3b0ee22791a7fc4b378cf9f0c4640b4971ebd772d95a5d8d0abd25959c53eede5c61e4807abd4be38b9e14d0e3ab9083941ace7f59f0b6358c68b2e85291193 SHA512 2487dbb95240553f9bb7e1249af42e83be7db8cfa8a8c0569c22bfad48add9eddf903a4f365e3a6409e5208bef0d32893abb0c4dc5a93782c3b33125b091ef54
+EBUILD executing-0.5.2.ebuild 1065 BLAKE2B 4fe881c9292c456dacb9da69787ddcdea8c745734044b4cdf8dfcbe06082cec42ca525c95c1dcb858705bd5073309eae90abb4658ef72456173e5f30efaade4b SHA512 fe41089859ab3c5dada9d862b72282a7f52825af45d3cd24241149bd63e27beff5909288656d95da2cdd290e16fc956b6545b4527a70c004959edbd4d5002a7a
+MISC metadata.xml 218 BLAKE2B 086fdcf7b63ca7bd6c58e861d717bb375e1cd372eff26d5d2eeeb176d8c5e6f10e653562abafb50eae7d7508f8e3d421b87e6a749acd0490308672828d0da697 SHA512 4558fee4c51117e21b1f42ca3edbdf1195ed297db798d6bfa0e5fbb7019654a187422b0abde7af5d800caffed66d1e55e4280e8be602bad591424d9776c46781
diff --git a/dev-python/executing/executing-0.5.2.ebuild b/dev-python/executing/executing-0.5.2.ebuild
new file mode 100644
index 000000000000..63786f62a790
--- /dev/null
+++ b/dev-python/executing/executing-0.5.2.ebuild
@@ -0,0 +1,44 @@
+# Copyright 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="Get information about what a Python frame is currently doing"
+HOMEPAGE="
+	https://github.com/alexmojaki/executing/
+	https://pypi.org/project/executing/"
+SRC_URI="
+	https://github.com/alexmojaki/executing/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+
+# asttokens is optional runtime dep
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	dev-python/toml[${PYTHON_USEDEP}]
+	test? (
+		dev-python/asttokens[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
+
+export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
+
+src_prepare() {
+	# Kill off useless wheel dep
+	sed -i -e 's/wheel; //' setup.cfg || die
+
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	# this test explodes when collected by pytest
+	"${EPYTHON}" tests/test_main.py || die "Tests failed with ${EPYTHON}"
+	pytest -vv tests/test_pytest.py || die "Tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/executing/metadata.xml b/dev-python/executing/metadata.xml
new file mode 100644
index 000000000000..266e3f19ca59
--- /dev/null
+++ b/dev-python/executing/metadata.xml
@@ -0,0 +1,7 @@
+<?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>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-python/expects/Manifest b/dev-python/expects/Manifest
index 31d4cd2117fe..3727bd5d0a8e 100644
--- a/dev-python/expects/Manifest
+++ b/dev-python/expects/Manifest
@@ -1,3 +1,5 @@
 DIST expects-0.8.0.tar.gz 27801 BLAKE2B 3371ad3b494a6cfaf463660d013dbd5c26d88e0cd7816be11a39466a831d2a3c19e9459967947651e004dc1bbc6f6e9a61eb0b9f69685482440056061fb9bd95 SHA512 c2379bb6b3b6181a0365a84b0602f2552de40760b7cbadd775705bacfe113ffbe55bcde818c5766f7079867ae38c8c02e318f3c9ffdccdddb58e6cf0559f1e25
-EBUILD expects-0.8.0-r1.ebuild 794 BLAKE2B 944da81cf66165cfe6138686cc1d015fe4487cf170af73600f8b0fc8ec6c0d7c5c1dfe12f75b7a316fddbbb8d74f977fa4998cc7edee06b932d66abaceb550ca SHA512 d8172b0808b23566264fe63cf045006edfb93d2575e68686023990ae436bfd6d7b6058b7be621d6cecd6a25cb8ce61170eedc67a349dc7ae09e075a3de63bd26
+DIST expects-0.9.0.tar.gz 27901 BLAKE2B b504f0d7dc91f76a2e036693873efaecdbe1e96a376d930924e00268d6374fad2bdc953e7f684f2ad44bf4d9ca962c377d753ef627304a036c1197b23230a2b0 SHA512 82465cfa48d2c28e6584bc05b9895bf5a0ebb90f43ac828c8e2888a10695c24da7833560880fcd8e7deef9996187ec7be7d993fc9973e2887a66b0b463125fff
+EBUILD expects-0.8.0-r1.ebuild 801 BLAKE2B d0f6ccc6ad4ae6b0affc6efe81513b39169083d020e923b0595b4bb25d11833fe1ca3dd5e20b724077b7757f17f14e58a9f01652419c099f067477f3c2d8599c SHA512 17673f2ae150c40a266f368bed7ca07e7db0da9c378b9d7ba17e2be98d13cae8f6e3f86a7c5626cc1bb7094f3b5f50d1c9b2aa7bc579e949504934845e4fdf80
+EBUILD expects-0.9.0.ebuild 603 BLAKE2B 33bb485d66468f83d5a67e088a792c7d95fedf969fe7699782282fa71102cc39580164042b8cc87704dd12ab937b5019261bda6fbf33357118d187f4812195e0 SHA512 88b1a6438516dfdcf0fdc70dfa4f34fb2662d56f748ea81745c946145beb94c83439b0e4622add7baa9c784faa05c5756a2d022e35cce6e43200730f31da26ea
 MISC metadata.xml 300 BLAKE2B 31a0397f19e9d532bcf03051b430f97e50cda0ad360e9ae6ffbdcd17ddc5d6067495ed3ddcb73fad288fd7a7c0808e6e08a1a629ae1eb8fdb92749ef423a147c SHA512 8540e7e195b657fce1c062e1a41b3e0bc988a393f4f251069f14379a072708707e4ffbbd5dbb80fa217eccbf887bccc4c6a550dadfcb9aba54a1bdd4db8ecca2
diff --git a/dev-python/expects/expects-0.8.0-r1.ebuild b/dev-python/expects/expects-0.8.0-r1.ebuild
index b046ef40afa0..cbb08d3b026f 100644
--- a/dev-python/expects/expects-0.8.0-r1.ebuild
+++ b/dev-python/expects/expects-0.8.0-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64"
+KEYWORDS="amd64 ~arm64"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/expects/expects-0.9.0.ebuild b/dev-python/expects/expects-0.9.0.ebuild
new file mode 100644
index 000000000000..164210bad0d2
--- /dev/null
+++ b/dev-python/expects/expects-0.9.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Expressive and extensible TDD/BDD assertion library for Python"
+HOMEPAGE="https://github.com/jaimegildesagredo/expects"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="test? ( dev-python/mamba[${PYTHON_USEDEP}] )"
+
+distutils_enable_sphinx docs
+
+python_test() {
+	mamba || die "tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/eyeD3/Manifest b/dev-python/eyeD3/Manifest
index 3bbebf3b6386..dea70888d411 100644
--- a/dev-python/eyeD3/Manifest
+++ b/dev-python/eyeD3/Manifest
@@ -2,5 +2,5 @@ DIST eyeD3-0.8.11.tar.gz 215807 BLAKE2B e289a274198a4adceb0ec3b77a5c79f50faaa320
 DIST eyeD3-0.9.5.tar.gz 222657 BLAKE2B 3932c1b07e0961773a1cccaebec116c3b51a8c4560850661e8725efb3f4c5716b43ba610e35a2682f94b0e3b72513fbf108ffbc8c436a52977c308ad82e59400 SHA512 be89a2070b8cd5d70b25ff24e508c35e4e0ad20bfbe7bc91e4119614c1359cbc7a4ba812066b608f310abfd027d34b7bfa13f9dae8f3ab54f3ecfc9ce47c07e4
 DIST eyeD3-test-data.tgz 97281754 BLAKE2B 9b667a5f8be157ace06d773d575c08f4a8e8b7a7b81ba9cb39b1e2c924b2e3f98597607ed3076b13150e02ef7768e89d1ff8a9913021e5f4b9ac6b59344ed397 SHA512 937971dcefc53812c59adb97df27d200e92de04e12391c735ab85cd547e2a168aa1212d88c206ec71ac2fa85a504a9faa91dcc444b45149aca7c8f3a794e9a95
 EBUILD eyeD3-0.8.11-r1.ebuild 558 BLAKE2B 38f36e5f8c769a1e228f834495b4d56d9b9ab3dffc0211551d4f65a8a7288c969119d0b690f3426c2a2221945233235a87d6d6447f966105ff518dca683b82fa SHA512 70c13459cd085dc0cfcc844733baf13c54174b514d9ac500c76f0f0ff4430943e6a433429bf27acefca420064b0df680ee8f432248d3f9992808d102e341ac61
-EBUILD eyeD3-0.9.5.ebuild 1222 BLAKE2B 77457248d113664846e08ac3023c0e2acb9e44c1facec25a44ef3a0c5ba802208a59352f0b93ffe39d5bc0581889921432e4359454cdaf4847ed1e056915bc94 SHA512 b617ab3a7d0435b3727a03a90fd36305ba8c69728386ae74bc925f4b102bbef5b488c7a1883880cdd24d71d5163094796bfc59f3603c718999b41852d2196bc0
+EBUILD eyeD3-0.9.5.ebuild 1227 BLAKE2B 5ad5634f00c9e883afae0fe6e86ff4ae60fdf6685ef4d4af7badedb7c39b7b1b8fa4306a9bedf2fa9815becd851ece353767cdc0c40d0e647712f6e9a092eb63 SHA512 eb084bbeff60fd65a916530022f98a9fc164924bdb4b82dfd11649f9da742ff6dfc20ba0c264bdf5077dde36d90f17c10a7cf42c409f7b713bca8e16ef79552a
 MISC metadata.xml 353 BLAKE2B 936234dca3e9cd646ab403b630c1dd05eb56bc3648bfdbda6fa31b6609334dbf04622760ea00d78f3c9b2bb37ab3c3d8e992db3210bcaffdaecbd5bc3e538fa0 SHA512 5d9b0061aaffcdcaa374f9ebe83ac47d7d6acdd28a51452f68d3f43a5e7b866639b9edebd82c20a440fe4e7f54a93567219a91cbf524218276c6c17df8b605c1
diff --git a/dev-python/eyeD3/eyeD3-0.9.5.ebuild b/dev-python/eyeD3/eyeD3-0.9.5.ebuild
index c3e639317a52..87155128a941 100644
--- a/dev-python/eyeD3/eyeD3-0.9.5.ebuild
+++ b/dev-python/eyeD3/eyeD3-0.9.5.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/nicfit/eyeD3/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0.7"
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc64 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 
 RDEPEND="
 	dev-python/deprecation[${PYTHON_USEDEP}]
diff --git a/dev-python/fakeredis/Manifest b/dev-python/fakeredis/Manifest
new file mode 100644
index 000000000000..66faea401c82
--- /dev/null
+++ b/dev-python/fakeredis/Manifest
@@ -0,0 +1,3 @@
+DIST fakeredis-1.4.3.gh.tar.gz 64936 BLAKE2B 61f85ec5c5b05b45f421a422f0cab072c24864a970097d2e15340ba7655ba9182c312091b9b6570aaf366fc241bb430fa528068db2728d42b615aecbec635d1a SHA512 56a0cc6d51025ceb24bb46dcdb2a8f638699f9928552d9b0f1592ff93903397304a9166e167de4d7c1d9f718a486f71e249c36e7c0667bde59f46710896da987
+EBUILD fakeredis-1.4.3.ebuild 1043 BLAKE2B 6e5491338a915e041f159855b025ed2e973711638118fb38b6894959a76336d4619b01ffa21a87fa3745fb9626ddd099dbbf00c6cb957f1d409dca0bfb71d68e SHA512 be939a2bc6ba8317fae6f13eefea8e69523507b593d4d5c2c42457847d7e4e8f3eba6db91e30bdce3a4c2d7ac3870a421dfd39f88c5f80fd6ea54cb55d8acbb4
+MISC metadata.xml 218 BLAKE2B 086fdcf7b63ca7bd6c58e861d717bb375e1cd372eff26d5d2eeeb176d8c5e6f10e653562abafb50eae7d7508f8e3d421b87e6a749acd0490308672828d0da697 SHA512 4558fee4c51117e21b1f42ca3edbdf1195ed297db798d6bfa0e5fbb7019654a187422b0abde7af5d800caffed66d1e55e4280e8be602bad591424d9776c46781
diff --git a/dev-python/fakeredis/fakeredis-1.4.3.ebuild b/dev-python/fakeredis/fakeredis-1.4.3.ebuild
new file mode 100644
index 000000000000..436bde5d7ac1
--- /dev/null
+++ b/dev-python/fakeredis/fakeredis-1.4.3.ebuild
@@ -0,0 +1,44 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( pypy3 python3_{6..9} )
+inherit distutils-r1
+
+DESCRIPTION="Fake implementation of redis API for testing purposes"
+HOMEPAGE="
+	https://github.com/jamesls/fakeredis/
+	https://pypi.org/project/fakeredis/"
+SRC_URI="
+	https://github.com/jamesls/fakeredis/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+
+RDEPEND="
+	dev-python/redis-py[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/sortedcontainers[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/hypothesis[${PYTHON_USEDEP}]
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local excludes=(
+		# tests for use with aioredis, not packaged in ::gentoo
+		--ignore test/test_aioredis.py
+		# tests requiring lupa (lua support)
+		-k 'not test_eval and not test_lua and not test_script'
+	)
+
+	pytest -vv "${excludes[@]}" || die "Tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/fakeredis/metadata.xml b/dev-python/fakeredis/metadata.xml
new file mode 100644
index 000000000000..266e3f19ca59
--- /dev/null
+++ b/dev-python/fakeredis/metadata.xml
@@ -0,0 +1,7 @@
+<?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>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-python/feedparser/Manifest b/dev-python/feedparser/Manifest
index e93d9e62863b..fe50c668c355 100644
--- a/dev-python/feedparser/Manifest
+++ b/dev-python/feedparser/Manifest
@@ -1,7 +1,11 @@
 AUX feedparser-5.2.1-sgmllib.patch 2748 BLAKE2B c7b4ce987f0067020e996134379ff0d30b151fc64a85ddf8a66748d118d748cc3552c2a889e3621c90221c37d1adcf8668e2e417566a6059a4a272ce1c3323cd SHA512 3ef63206b043179f5a09cf1f3d5256aed1ae0c559b99fc0ec4c1de756dd678af8a7672673f864f72c8162705056fb0011ff19b39debfcbd0faf402804869f681
 AUX feedparser-6.0.0_beta1-py39.patch 2768 BLAKE2B 26966964d788891224adf67f0afe6ee20a233d2eb46c5215d643085edd8d8f15b7cff7d6a353029d1dc1e435dbc5cf7c690f157ae5d2069bf8684cd10b470365 SHA512 25f371a75e1b5b1688dccd1fc55be8a011018a4555727f87725238c28ca2ae2b0da491f45b9b48ef49ab4af19f373eed54ac2acf2e5a382dcebc91c1c60ae921
 DIST feedparser-5.2.1.tar.gz 252956 BLAKE2B 182ebefa8a44276e758f277c203c28b274c580b667b039e4fc6ed9bd059b15e35e775e9efb784a97d712dc57e7b176ff91d6e094ddd225735f4315ffa770ae83 SHA512 1fd0c4324e2eff8ef4b15e3793c767290bca562af4a5056fdbdfa12411095530c87a113bb1b9757e532ff63aecb399b18f1e6b753884798eb6b8d3fdf575af81
+DIST feedparser-6.0.0.tar.gz 252195 BLAKE2B 144c1d914518efe651bbd2c28ecf526be9cdc3422453d8e4208104b9a7832d787c8de093f0acf43f786460841852dc5a45076b96c12e1aedfb6124ce18c9034d SHA512 13f19264a52d97094dac9a0692ca4edc5ae2b5ce1a89b12207da8e994904d5c24382e304e62bfc7160ce67812b861352650f61c0273ca17fd091bde7133b2ffa
 DIST feedparser-6.0.0b1.tar.gz 250065 BLAKE2B 54e955f011af0755e0f627caa1491be15a073984d5c7c2b4edd6e9dcd6054e19b5c77cea9741d0bf7af151f9c79b22739c12db94619373f195e024df65b1cff1 SHA512 580e02bd77dcba547eb8295f958c6d30e55c62bd7fdbe25eda7687d0654b9342edf82ab637902175fc90b86a8ae9cbae8ba2c7c9a83009d25ab5c007c37cf02d
+DIST feedparser-6.0.1.tar.gz 251457 BLAKE2B e159ecae5cfdb6828a17bd26494218db78bcb2542b75161878ce9eb8f126ba0285772a4c99584654de53e297fcb308ed50baaf9f208459237a0447721e32f1f3 SHA512 562748e079b44bd249406cf15d88bd4bb338a1e5a9a9b2c606514b054edf6cdd78d66f1cf6f00320c24a9d8519069e44b730a86f92e47775614bee680b9d8b7b
 EBUILD feedparser-5.2.1.ebuild 1194 BLAKE2B 8fa165bdf23171244f6d0fb6fdf2cb296c06515296150cee3a871ad09c9825a476802d176935f7eb459d130f7c0c43a4a4774ac8d913004bc63c960db25dbb6b SHA512 90b24aa7ffd61794fa22a9d530f7ade3aec69cc8f330a9f1979f6ff302aa2a6c94b5897e0e05ae7671b86dbceea9b63f540e221bc3d739d366192ae45dee77a4
-EBUILD feedparser-6.0.0_beta1.ebuild 944 BLAKE2B 9bab175ae3c514e51827cb2196181ea149d3a61c3e49995217faab9fc5fe64f6d24c3d9b83dc3f72f1833c2b9b21cac372220c959dcef2f4bbf90f11a77f1ae5 SHA512 620a56526e001d096e3d5a4ae22fbcf42ad54b3e5047ad803ec0c5ba5f6fc1d91df0130283fa5661f069dde333178031335c4605ef7fae980b441e86f6a9cfa5
+EBUILD feedparser-6.0.0.ebuild 901 BLAKE2B 95134ee9e0b2236e7b4c9201a19c54ef615564edf6b54c3ad6cd477238faef0048354e53e04caa1f6e0269208f12cf3da82b332fde82e7082584f1062dbf09f4 SHA512 c318d48ac3681642c1b421fb811dd1e4a777fa3fa962562c3974c589d431a44a0fc7f191bf27c8aab685f97a76b54602e0ae36433869f5aaf5c62a722fd9e93d
+EBUILD feedparser-6.0.0_beta1.ebuild 939 BLAKE2B d4670427e411e6fe1346562c317f97ab8b6a43d9fd2b0264b046ffbb43a0e1c857e4b90da3922fe61048594d6af678d9efc73167eb7d7e326bc74550cc71e62b SHA512 04ab36f69ea551bcaa2a3d6c837e88d03ab861dc922dc606c1ca83595a1201cb16e1a81a8a2f9911476f751024117fca2d84f29e7d8c2b16c05350cfd4616d0f
+EBUILD feedparser-6.0.1.ebuild 901 BLAKE2B 95134ee9e0b2236e7b4c9201a19c54ef615564edf6b54c3ad6cd477238faef0048354e53e04caa1f6e0269208f12cf3da82b332fde82e7082584f1062dbf09f4 SHA512 c318d48ac3681642c1b421fb811dd1e4a777fa3fa962562c3974c589d431a44a0fc7f191bf27c8aab685f97a76b54602e0ae36433869f5aaf5c62a722fd9e93d
 MISC metadata.xml 442 BLAKE2B a561722b8e5ad877d3a1b0503f159b7933a2bb45673420b20f840dd876881a0fd8fc3eedb3b0c3aecb76b044c770ef42cdbcf3f210e71e400dfb002eb4742251 SHA512 20cef7a9f4d1bb89e11748a8b5ab31136b85f68d15ecec018f1f0872b721a2d53f3aa3ab06a1b97e3f79588656e327feb87f90a0e75f4adc5e879c9f0fd36017
diff --git a/dev-python/feedparser/feedparser-6.0.0.ebuild b/dev-python/feedparser/feedparser-6.0.0.ebuild
new file mode 100644
index 000000000000..dc1e470b0678
--- /dev/null
+++ b/dev-python/feedparser/feedparser-6.0.0.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} pypy3 )
+
+inherit distutils-r1
+
+MY_PV=${PV/_beta/b}
+MY_P=${PN}-${MY_PV}
+DESCRIPTION="Parse RSS and Atom feeds in Python"
+HOMEPAGE="https://github.com/kurtmckee/feedparser
+	https://pypi.org/project/feedparser/"
+SRC_URI="
+	https://github.com/kurtmckee/feedparser/archive/${MY_PV}.tar.gz
+		-> ${MY_P}.tar.gz"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+
+RDEPEND="dev-python/sgmllib3k[${PYTHON_USEDEP}]"
+
+distutils_enable_tests unittest
+
+src_prepare() {
+	# broken
+	rm \
+		tests/illformed/chardet/big5.xml \
+		tests/illformed/undeclared_namespace.xml || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	"${EPYTHON}" tests/runtests.py || die
+}
diff --git a/dev-python/feedparser/feedparser-6.0.0_beta1.ebuild b/dev-python/feedparser/feedparser-6.0.0_beta1.ebuild
index 1b027df23193..48535d9068a5 100644
--- a/dev-python/feedparser/feedparser-6.0.0_beta1.ebuild
+++ b/dev-python/feedparser/feedparser-6.0.0_beta1.ebuild
@@ -18,7 +18,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha ~amd64 arm ~arm64 hppa ~ia64 ppc ppc64 ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
 
 RDEPEND="dev-python/sgmllib3k[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/feedparser/feedparser-6.0.1.ebuild b/dev-python/feedparser/feedparser-6.0.1.ebuild
new file mode 100644
index 000000000000..dc1e470b0678
--- /dev/null
+++ b/dev-python/feedparser/feedparser-6.0.1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} pypy3 )
+
+inherit distutils-r1
+
+MY_PV=${PV/_beta/b}
+MY_P=${PN}-${MY_PV}
+DESCRIPTION="Parse RSS and Atom feeds in Python"
+HOMEPAGE="https://github.com/kurtmckee/feedparser
+	https://pypi.org/project/feedparser/"
+SRC_URI="
+	https://github.com/kurtmckee/feedparser/archive/${MY_PV}.tar.gz
+		-> ${MY_P}.tar.gz"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+
+RDEPEND="dev-python/sgmllib3k[${PYTHON_USEDEP}]"
+
+distutils_enable_tests unittest
+
+src_prepare() {
+	# broken
+	rm \
+		tests/illformed/chardet/big5.xml \
+		tests/illformed/undeclared_namespace.xml || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	"${EPYTHON}" tests/runtests.py || die
+}
diff --git a/dev-python/fields/Manifest b/dev-python/fields/Manifest
index 52c4e7247ee0..d12aba4476a4 100644
--- a/dev-python/fields/Manifest
+++ b/dev-python/fields/Manifest
@@ -1,3 +1,3 @@
 DIST fields-5.0.0.tar.gz 36232 BLAKE2B 7e5ebc5b7c76b456acbe02e0b325685776c573dd0715e27402e5245e04f3c54e6e0ac04b8780a50d9b560cb5fbb664bca6a3addc76666f012aa2427140dbf870 SHA512 3d80b9c6a1d0a43568045fc25422b0db783c84e2e3f2be8b1d41b0150f48fef58736d863d06b4562b29190cd6dc2616829faab8e901b7268ac2e9e63e996180e
-EBUILD fields-5.0.0-r2.ebuild 857 BLAKE2B 05bafb4a5b8a9e48308ebb97d3783bfe4361f7b38947e5105fd0d664ce57e55c0002559e6bbca94e12b2f22a174d4af736272bd4a3500531b946d4310e972f19 SHA512 76963d4735f7ad660f2068ee5b2c81f028b6a5db8abf99b5869a59c6292a4722945de0421956489eac3f7ca43a310b8b039993b787a7b08cbadc3c6ea260a78e
+EBUILD fields-5.0.0-r2.ebuild 864 BLAKE2B 3c714713b269fcfe1e03081ecdcbaefb32e7722676bfa5f38a3452102af3abaea92b40d9776c756482d3b3cb0cb3e082d0e2fd1c83e0c884a16ea2f82d17c92b SHA512 ca4e54bf09c31170272a7bf5aef12d588584ec5d73fe79ad9ea521e42f9516c3ae7fa3e28170e42ad34eac11757d926969dc31c46844e23551d40be216178f67
 MISC metadata.xml 336 BLAKE2B 4bec1a37213268f4116b30d5b6db4b43718d3803467423c01ea7c44702c0ccad255d2c0ae6d55469f0e6c6a82a6c4f344000f86989fd820b13513ac4e9d354c6 SHA512 3c055d4cf5070c7535ac37c335f224c0cafbeb68a7bf7677acd06a786b4aff93b5ddeeed3e2514cb999407c21303adf2945561688d5e20148d7e712000f62d0d
diff --git a/dev-python/fields/fields-5.0.0-r2.ebuild b/dev-python/fields/fields-5.0.0-r2.ebuild
index af2b8086ea55..06fbc514ec8c 100644
--- a/dev-python/fields/fields-5.0.0-r2.ebuild
+++ b/dev-python/fields/fields-5.0.0-r2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/filelock/Manifest b/dev-python/filelock/Manifest
index 84465c06cf3d..2123fdd6655d 100644
--- a/dev-python/filelock/Manifest
+++ b/dev-python/filelock/Manifest
@@ -1,3 +1,3 @@
 DIST py-filelock-3.0.12.tar.gz 587613 BLAKE2B 3eb765e4cb251ace50fcaf3b7cf52939e697d5a710b87eb2f0ea0cf66f554b90bda2e95754b82e1544e45d0abd8dea861f52cdf9c7de0f1e91a8f5c8e0f9759c SHA512 0f30b54b9de2540f023855effcc582b18fedcee6681f21e1733f1b60dbd39eb148e3830bc798a44c5e8c22e7ea8ca26b6d4547fae79dacc78c62b819a3d84683
-EBUILD filelock-3.0.12.ebuild 622 BLAKE2B c699560b5df085043c04ca549591e173e61b48101693ee18c0669f1d510b04f62bd0157f07000c70ef34aeeff8a25c2c2f989f493f71eb5f824667abab46888b SHA512 7223853c3b1dca7721daac1f58cba840f4aef7a651218d812f331db697b1e2d9e3efe7799046cdf85edfbbd26b01ac562d47b266d3aecb5895f451f072b5466d
+EBUILD filelock-3.0.12.ebuild 629 BLAKE2B 61202a52f93bcd3fc7f86149fbcb1155f9f312b154d7736373a292ba6a9d20940fb28f669dc4f3926111beccfb3573f78cf97edf1c78a033aa9afa9a71accbdd SHA512 b9288328679ee3c2f7c53940fa3faae8a780b28c9c5775393c8e0a3725eadb51b777f6a88bd39f7a219e769ed05b6110da0ec05e182fe16b8f8d3927cd6340df
 MISC metadata.xml 356 BLAKE2B 795142cf645edcb80e9a087e62fadbab50c5db359946ec290dc0c0b1c4ae12a666a0dbba4b2212a27310339c783f0c13e0a28a42df45a4cc9e781674d9514fc2 SHA512 3617ad60e67b84ce0d36bb1caef8a6b1dfac31d487ead4887b70f575726974b27d73208cc8ca0039a2334c6deb6609cf8ed85c8404c6b3a4efe0ad7bbc69507a
diff --git a/dev-python/filelock/filelock-3.0.12.ebuild b/dev-python/filelock/filelock-3.0.12.ebuild
index 0d4e9fcf309e..36bb5f1a4eb3 100644
--- a/dev-python/filelock/filelock-3.0.12.ebuild
+++ b/dev-python/filelock/filelock-3.0.12.ebuild
@@ -15,7 +15,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="Unlicense"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE=""
 
 distutils_enable_tests unittest
diff --git a/dev-python/filetype/Manifest b/dev-python/filetype/Manifest
index 960b7a59f08b..fa0dc2127e05 100644
--- a/dev-python/filetype/Manifest
+++ b/dev-python/filetype/Manifest
@@ -1,5 +1,4 @@
-AUX filetype-1.0.5-examples.patch 452 BLAKE2B b99fbb4ec4fb1ac75aa9f33bbcb509f9979ea23d47eb4d86b08a4c61dadae3aa27ab116d389d6f9c9c8787247d8e9febb15e06281de5ec82c5aa1c8d5948de75 SHA512 a2d9263958dc8a2927f9221758bba634106abdf041ae0f1c2092181e9ea0f9f3bc87d133eb107a92ff3fdef537ce3e2269fd8bc22ea4c5d3c669ccaf4003c5f5
 AUX filetype-1.0.7-examples.patch 824 BLAKE2B 1e3fe9e72a422eafa45f35b43d04bb0cb1d4ccc379b7a318b6de33924b3e4139ca3e6c6efe529da5d99e4cc4038b818f4edae38778c9b9f7e0e0fca740b5ffec SHA512 9d5171016461f65330d4f1e6c985d1764f1ee8a173529e35d4abebbe98a7a3ccf920752f4baab8b3c6fcca484b59043f0338cc7c0b3c319948399781eae31e7c
 DIST filetype-1.0.7.tar.gz 666636 BLAKE2B 3abc1cc3a94b3ca8c91b9b43909522efa18736c826f8f45990b3d7dab18047476f05b259108290bf7383e4df82a63def4249c0d52ae313b0dc23d377bb5369d8 SHA512 8d81261082a5765c2f96b587cc8372ec2e7347536f3e76c1f4c17f10011fd1808309ceaf55923f0e063f379cdd253020ce651a263b9535a9d16375f07dc8ec92
-EBUILD filetype-1.0.7.ebuild 522 BLAKE2B 3236ed3f5a7f0e804dac64d1ed25ddaddc181b1eec3297c28346692293b4f562c14a4a50b9e56dda7f2e44cd1fd3a02836d3156afbd6fced9912bd7bece2e0cb SHA512 0901e6a1a813bc2b698bc8bff040ca3f0d4bd20705727f20158eb4b1aa8ef217a6468496f1eb4ee53b09da1d5f6f24cae3df63d532d72f0f688670ce2a46d75f
+EBUILD filetype-1.0.7.ebuild 527 BLAKE2B eb206f02c64f5f67191c6c7e39a6886084a47a72ee189c692ad0b712a056f05ad1fb82115905462833619d7e81ff97f455b93cec6738df9a9c86720cd5cbf1b1 SHA512 6603070cd275f2bb5d6412b9625380c0ce17fe28695d31263cd36412dce7857e66393d796eddf15c83a08188da569d36379af942ddb995c7064bdf05d64cce4e
 MISC metadata.xml 477 BLAKE2B 6dbd312736921b69409b7fb9958069761814babf275ee8f27119fae412a59b13085eda8bc2075d4b1b0971b9662a8d7e1443f6ade74d644b109eb51df1d507e4 SHA512 e44e28a04f1a024d76a6a880eb0efcece6e9b5bce30fd1715dbcede55734412287ca810c42559470bf835705855e76c2c24286351ec53ed068e9b33932cca92c
diff --git a/dev-python/filetype/files/filetype-1.0.5-examples.patch b/dev-python/filetype/files/filetype-1.0.5-examples.patch
deleted file mode 100644
index 3032c38a6995..000000000000
--- a/dev-python/filetype/files/filetype-1.0.5-examples.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/setup.py  2020-02-07 15:57:33.445851327 -0000
-+++ b/setup.py  2020-02-07 15:57:50.921877837 -0000
-@@ -37,6 +37,6 @@
-         'Topic :: System :: Filesystems',
-         'Topic :: Utilities'],
-     platforms=['any'],
--    packages=find_packages(exclude=['dist', 'build', 'docs', 'tests']),
-+    packages=find_packages(exclude=['dist', 'build', 'docs', 'tests', 'examples']),
-     package_data={'filetype': ['LICENSE', '*.md']},
-     zip_safe=True)
diff --git a/dev-python/filetype/filetype-1.0.7.ebuild b/dev-python/filetype/filetype-1.0.7.ebuild
index efe38c69fbf4..5fe6826b3bb2 100644
--- a/dev-python/filetype/filetype-1.0.7.ebuild
+++ b/dev-python/filetype/filetype-1.0.7.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc64 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 
 PATCHES=( "${FILESDIR}/${P}-examples.patch" )
 
diff --git a/dev-python/flaky/Manifest b/dev-python/flaky/Manifest
index fb8c1282f250..7498faf19642 100644
--- a/dev-python/flaky/Manifest
+++ b/dev-python/flaky/Manifest
@@ -1,5 +1,5 @@
 DIST flaky-3.6.1.tar.gz 29501 BLAKE2B 57d8c1ed9f271688f8a6f2acf25456058b3a67c86ea7aac8c32fd52221d294b5226461b9260677e3ed94af84ff9993a02e79f0d6b01f05daee2992efd8ad03b8 SHA512 f14fbd9259759f3b6f18a7dc16e00717ce54392a10cd9b3225636e33c904e69c6b01398bfce96d7273a40b6c2cca897a05ad386a4d8a83bffee12fab322f9b32
 DIST flaky-3.7.0.tar.gz 29591 BLAKE2B 747fbda71055bba937abf3e7b97691c1f4b222f085069d1815d5a9eba669464d2ed5d6dcf1842ae82f1970de5cd5e3aea5b12476bfa2d9282549ad0cc62901e9 SHA512 b399f6e1323d6ca341803ac6f1eb318bf24dc37182d0b49b89bb81b9466dd36271ad6dbb9f48ea6fa4760ee631f1482bb6f49c64f4d4520c40634089c1b64f9a
 EBUILD flaky-3.6.1.ebuild 1277 BLAKE2B bd89281a3810254e08e56744046a9ef6380d8c339ca0c7e15292f157251653ceb5722354b0851e1b5c9cbe05c4c9d168fc5a396183861e969e0cc171dfe8ac0d SHA512 39005d51822b0ed1d0c9568197e4d6eee774b47e6c8ea8aec34ab7f899c7130a14d3cbb422ee2f3180b21be4280df749cc7f7c90a3be8feda7edd465a744460f
-EBUILD flaky-3.7.0.ebuild 1286 BLAKE2B cbbcd94899a975bf694ea731f73be9b74dae620f26b60c869fbe1d98ff10c42e361b1582983b92ad4b3faef4a37ca75a4e68add7c60dc7fed0beacfa21f2f4ef SHA512 b11146c9ad64f132c2ba9fa4f8d48475da2e7f885f699a2c329dba0a1356d525876e109d4a3da3c30a6cc61e052a4125e25ffdbe2e7f3aaa3d88288fc891690d
-MISC metadata.xml 369 BLAKE2B ffa607acfbc98fc2e539492f87b55cedb039b39b3cdb7ce07cf9dcebe1a1559296284b27d06fc6262f362c0ea8577e23f4bef07ffd01a94c4d981fa060384d5a SHA512 da1597d14b2e3f9bc56e48064718a2a52bc1615d982d679d8c971f1fb1b9c25169d5412f99542f808fa42f958e1bb589e7615a13077a7d1b0574acbec1d4b1dd
+EBUILD flaky-3.7.0.ebuild 1284 BLAKE2B b973a11f6050b6a40d09b72c26a1b6a1aa7587085ffbfbf64f5d78ec64e014074b680273b98c97e09a169440578f2ed0a22f6ec6c2f4c25edae5ba93a6893cc7 SHA512 ab70702cd3c0fa6519b6f434124e14cd3049ff33f4688973c262b33b8b1d3781958e38507138953d3dbd2b51173764b50929766640d611a515d9ba67945bace5
+MISC metadata.xml 394 BLAKE2B 53dd53a5d469ac917564b6e476bd9dc3ad0db1d5deae6070233427dc2429e233bc9ee800fce0ec5c1a00eeb399d942287e2bb7acb2267abc8fc0541a08596b4c SHA512 cf363a14b16277e1bd3af50ae9827103ea16f901489b7b2d8729729e98dc09e0a05f91298e82054e5a58d042b0beeb844a80ee5a4ca2e28e9852fa7f5b7fc652
diff --git a/dev-python/flaky/flaky-3.7.0.ebuild b/dev-python/flaky/flaky-3.7.0.ebuild
index 98443c6754cf..965a7cfbb3a3 100644
--- a/dev-python/flaky/flaky-3.7.0.ebuild
+++ b/dev-python/flaky/flaky-3.7.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="Apache-2.0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/flaky/metadata.xml b/dev-python/flaky/metadata.xml
index 8487b6711c9e..69788b0035b0 100644
--- a/dev-python/flaky/metadata.xml
+++ b/dev-python/flaky/metadata.xml
@@ -5,6 +5,7 @@
     <email>python@gentoo.org</email>
     <name>Python</name>
   </maintainer>
+  <stabilize-allarches/>
   <upstream>
     <remote-id type="github">box/flaky</remote-id>
     <remote-id type="pypi">flaky</remote-id>
diff --git a/dev-python/flask-compress/Manifest b/dev-python/flask-compress/Manifest
new file mode 100644
index 000000000000..357d20f0d021
--- /dev/null
+++ b/dev-python/flask-compress/Manifest
@@ -0,0 +1,3 @@
+DIST Flask-Compress-1.5.0.tar.gz 6473 BLAKE2B eba68544018d587a7651c07739ac14218ff9918031fee740893245816daa7494d4998cf60b533971ba8dc0c7c9e3d1e1c14ee746d9e29deab70b30478a3c4eae SHA512 fe2d1dfef8be8d04b78a2938dd52a1f6068e6c35741f593fbb0d3d050b789b8d70188d683f7028b92a180653afda0566bda29b82475b20444f6563c8620ff1ec
+EBUILD flask-compress-1.5.0.ebuild 701 BLAKE2B 4a1a692533d8c086cdcbb68146b8d2256a56541f55c8e2647964a64c0f6a5faa7274b25411edd26967727a339ba068ef9f1c3374beac0872775e685de08660ef SHA512 fc7a5fc06b85ced250f60bcf213c9c2f1d92d437fc6ddd8112bfbf2580c3de44891bef71ae165a8d474c5919138aa375356e9d702aa9fec36c86e2231695b119
+MISC metadata.xml 431 BLAKE2B f3d71b4c8b86528458a7dbbefd527c9b32252338950f799ec315351454219dafed0b84e74e1e2443b48114a50c8bade0953648cd5ec441b2722fee4e63e5beb6 SHA512 d6cc23df1b882978c77421c21b2a00ea7bdc6781ebd283b00cefdff1efd79e6822025e63f2fc64d2268237f114a6e0f6b451487060d66bfa30295312518f6bbb
diff --git a/dev-python/flask-compress/flask-compress-1.5.0.ebuild b/dev-python/flask-compress/flask-compress-1.5.0.ebuild
new file mode 100644
index 000000000000..115c157c65c1
--- /dev/null
+++ b/dev-python/flask-compress/flask-compress-1.5.0.ebuild
@@ -0,0 +1,36 @@
+# 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="Flask-Compress"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Compress responses in your Flask app with gzip"
+HOMEPAGE="https://pypi.org/project/Flask-Compress"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="
+	app-arch/brotli[python,${PYTHON_USEDEP}]
+	dev-python/flask[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
+
+DEPEND="
+	${RDEPEND}
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
+
+S="${WORKDIR}/${MY_P}"
+
+python_test() {
+	pytest
+}
diff --git a/dev-python/flask-compress/metadata.xml b/dev-python/flask-compress/metadata.xml
new file mode 100644
index 000000000000..09014f03117e
--- /dev/null
+++ b/dev-python/flask-compress/metadata.xml
@@ -0,0 +1,15 @@
+<?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>
+	<maintainer type="person">
+		<email>titanofold@gentoo.org</email>
+		<name>Aaron W. Swenson</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">Flask-Gravatar</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/flask-debug/Manifest b/dev-python/flask-debug/Manifest
index 948da2de85b5..636421336f61 100644
--- a/dev-python/flask-debug/Manifest
+++ b/dev-python/flask-debug/Manifest
@@ -1,3 +1,4 @@
 DIST flask-debug-0.4.3.tar.gz 9148 BLAKE2B 9263a4df08f1a9518a42a025a14a89b902c62ab08b25d79b3dfffb25675a47785d0bf9075290190ee4622a30a89e190a465a87986b47ceed7d724ce0b59ad218 SHA512 7bc1cf9f88f28e2ca5a24c1454dcdb4e2a450eff3c00329f299c3840032e0803079f565652974f4c3a0e5aac443365ce47a3d2c2fee8e21e2e0c7150367e8816
+EBUILD flask-debug-0.4.3-r1.ebuild 777 BLAKE2B 4fb8a7b5752e0761d42703cbd127070ad45650f14d9e5a97c37791a4c8f5cc4df38f872f9137109c5aba2a698ee1f5d44b129678630aed1d489d69d3431603c1 SHA512 afc7842346ec8075d63135b80246edf63c697bf977efae2cbb0ba213cafc97bbad6c04a2dcac7382a2976e728ee6c212af3b007f41a3250e05ea45cb7906df27
 EBUILD flask-debug-0.4.3.ebuild 1211 BLAKE2B c0f14871076f34df30f71c5f814f82b7f1bd438a603ff180f3fa5d225ab08d6fd2f3fae0b3b282f138d0c0e401753742e0577c559f8df975e833d11491419bc2 SHA512 dbc78e5177a49c679b071128d9f0d38322187584a86d2f0938c01c7451a7a2aafa252746e7f31f7f2f725d0c1744a654bfa0a68856b40ac807ce43adc48bf2f8
 MISC metadata.xml 437 BLAKE2B a47818cc11d0365a7a03da5ea3c9fa7bb60d3ec783d63bd8780e11db56dd2093e39ecf4633f462f17cf95e97c93dfbc64301c1c321450a985dcfe28bd6a1bbb5 SHA512 93d72b4859ed2838632f65de971957dc279ccb5897b703b61baf5287a5748f33a7b94f484f8f457b6e4a4e7c5c25e7a5f35506c86e3f539ad7240bbc66748398
diff --git a/dev-python/flask-debug/flask-debug-0.4.3-r1.ebuild b/dev-python/flask-debug/flask-debug-0.4.3-r1.ebuild
new file mode 100644
index 000000000000..9fad701cf388
--- /dev/null
+++ b/dev-python/flask-debug/flask-debug-0.4.3-r1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( pypy3 python3_{6,7,8,9} )
+
+inherit distutils-r1
+
+MY_PN="Flask-Debug"
+DESCRIPTION="Flask extension that displays various debugging insights during development"
+HOMEPAGE="https://github.com/mbr/Flask-Debug"
+# PyPI tarballs don't include tests
+# https://github.com/mbr/Flask-Debug/pull/2
+SRC_URI="https://github.com/mbr/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-python/flask[${PYTHON_USEDEP}]
+	dev-python/inflection[${PYTHON_USEDEP}]
+	dev-python/jinja[${PYTHON_USEDEP}]
+"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+distutils_enable_tests pytest
+distutils_enable_sphinx docs dev-python/alabaster
diff --git a/dev-python/flask-login/Manifest b/dev-python/flask-login/Manifest
index 297b10bfa9f4..2bc1d55c3191 100644
--- a/dev-python/flask-login/Manifest
+++ b/dev-python/flask-login/Manifest
@@ -1,3 +1,3 @@
 DIST flask-login-0.5.0.tar.gz 44961 BLAKE2B a780a3ca1ced7f01cbc1f99e3d92f57819c73982a4098330be7b9b4dce88e5fac577d15b2989b99971c4b2f7e6c9f02a54aeab9f7fa1c101f409cbdcfa3c6942 SHA512 8ffecd2a512738f81ec3901ad30d356b1d63355268f7cf1b427e463d0a271a4623723255e139bbd0f88845d73fa4aab051418b5f68aef0b4576c30294f6207b3
-EBUILD flask-login-0.5.0.ebuild 927 BLAKE2B 64e0eb41ccfa89fa9e86c5b8ad601b2db03798aa151f809dfbb4469f5a4ced583aa0e22f828d608a8bfa334af1368c22ab5f81f24144b675fcc7e840ffa84cbf SHA512 2516247e39f070b034f51cfa7419a595a41618bff4ef6bd690726ade0d2e1d0602308a8189cd3088b2184b767a9a3047b3d6f0d0a14473db0b4e90c92bc2ad96
+EBUILD flask-login-0.5.0.ebuild 939 BLAKE2B a86c13507e3eba98b2eee4ec0e5e51dd1ceae354eddf64fd7622b1d380acbfc14e17a87beaadc781156d82fcf476a941311dc18c37883c276c192b6d91489892 SHA512 b16dc5c6152a1a977bf4ae1234670cc294e86bbf25080541dd3f31590258c77669ef1ea545a259e5fdbe839b85c2fe22805714624798dec953ccc0e2489e7803
 MISC metadata.xml 403 BLAKE2B 975f428a5370ac440d4b4c6d257a91ed91fa463bf62491130010a73f87978b68468fade0b44fce56854b52fe0b64c3b77bfa676025b5ccdfd75214c3e43b5ce6 SHA512 5b702e0e8a7d848d1f09f0282c790132a8fbd3bd44596a3e9ddcf13228f93dd67e38c332fa444fc21eb4999be8fae38c64d576b5b59aaa73d650c3efc9c420f4
diff --git a/dev-python/flask-login/flask-login-0.5.0.ebuild b/dev-python/flask-login/flask-login-0.5.0.ebuild
index 8f2d36b5fd56..babcb53b6ee5 100644
--- a/dev-python/flask-login/flask-login-0.5.0.ebuild
+++ b/dev-python/flask-login/flask-login-0.5.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/maxcountryman/${PN}/archive/${PV}.tar.gz -> ${P}.tar
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
 
 RDEPEND="
 	>=dev-python/flask-0.10[${PYTHON_USEDEP}]
diff --git a/dev-python/flask-nav/Manifest b/dev-python/flask-nav/Manifest
index 47b1d76c2ea5..5694aa45b6c8 100644
--- a/dev-python/flask-nav/Manifest
+++ b/dev-python/flask-nav/Manifest
@@ -1,3 +1,4 @@
 DIST flask-nav-0.6.tar.gz 12270 BLAKE2B eff90b6fc08629139012e2d920b4d464ed06954040a5e97636a7aa4d59d11654839460ef52477cfcec967bd774d942028a53675d682e850f08f6359c5cfbb54e SHA512 a7930687425a53fac9ad9a7cb65c2e2a759a0c9660189965bf37ea6e9925dd869074d37a283801631b3e6c3391f9f4167e0a36294104f72970e876b5a7a0930c
 EBUILD flask-nav-0.6-r1.ebuild 1214 BLAKE2B 1e413d5f92f7e91157f35db0a864fc1833aef26cfb0d2195578e1cc7ddb1c29c000fd6bc86005a3c1431edca363989840378c49be72e1a87c749047409016f95 SHA512 d49e661ddc270446eef69cf388257699a656e74a3f04ba5a30411ae0463844af9e642388d5c5e71fc16d843ba9b24805bc5e007a988165dd2548b17c65e97335
+EBUILD flask-nav-0.6-r2.ebuild 739 BLAKE2B ef1c572c0632893a9153e63258bb2396ea430e42add16c7c5744862f88a3bf7ce1271ab696c032d7a87fc8da21e223b9ee6b6876c574c2bc7c967f708b89b9f7 SHA512 b1dc927e630faba728fe3542374ad56b20fbd24b60b70d3862d7c266d7dafa26c487c34f14b0b072a55794310ed11b868892bdd526eb19af90051d25fd864505
 MISC metadata.xml 431 BLAKE2B 949791299994b108e48e5bfc9076726ffac5a530783464f54b44deb95646492078e3cb608e99382c04b2ae825336e644433fa5ce7775e7f44d39f6e2840565b5 SHA512 aeae5220fab0583fb7b5f4a0e694791edbaf6b9f5f61fdb04d48b4a91f12726b3101e41097e26980404a19e8b6c5e43723dfc0b61f8d4cfea0f6a5924f8b67f4
diff --git a/dev-python/flask-nav/flask-nav-0.6-r2.ebuild b/dev-python/flask-nav/flask-nav-0.6-r2.ebuild
new file mode 100644
index 000000000000..75935b1a5538
--- /dev/null
+++ b/dev-python/flask-nav/flask-nav-0.6-r2.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( pypy3 python3_{6,7,8,9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Easily create navigation for Flask applications."
+HOMEPAGE="https://pythonhosted.org/flask-nav/"
+# docs are missing from PyPI tarballs
+# https://github.com/mbr/flask-nav/pull/12
+SRC_URI="https://github.com/mbr/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-python/dominate[${PYTHON_USEDEP}]
+	dev-python/flask[${PYTHON_USEDEP}]
+	dev-python/markupsafe[${PYTHON_USEDEP}]
+	dev-python/visitor[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+distutils_enable_sphinx docs dev-python/alabaster
diff --git a/dev-python/flask-security/Manifest b/dev-python/flask-security/Manifest
index a0fb2a1c81ea..2045f023bcbb 100644
--- a/dev-python/flask-security/Manifest
+++ b/dev-python/flask-security/Manifest
@@ -3,6 +3,6 @@ DIST Flask-Security-3.0.0.tar.gz 160367 BLAKE2B c2e1449dc2807c2c40519fa3afb89415
 DIST flask-security-3.4.3.gh.tar.gz 346540 BLAKE2B ab3b037282bc5b7777ceeaaaf869996f471bc3b954f0b2cf6d17ba44d4014c8c3ac8e34618bc7347bbd1cd6b1c649b49407cb05aad9bd748191c08b7326f679a SHA512 23ad8bc91df418361a556827ff8369777f3716dfd1c97fef6237ba9cb07813eac4033eb3fed80e9ebadeab4f2d2a956b5a652bec80825f939a9fc7d817aa3d90
 DIST flask-security-3.4.4.gh.tar.gz 348525 BLAKE2B 77a851c2549be9ce8612e3b186ad2d83d272b277f286885da491f3f0fe99e8836d145749ae137f1e75625c34b2214270ba4d24f1bfaa514012064dd38f083230 SHA512 1c1a4f079199704d7a2a4e11351cd199e3a790f5d0c7f68b240c299e83b129227fac4ca00caf45401efbf14520c1d65d3b710b85e8f53b495283b94a164f97a2
 EBUILD flask-security-3.0.0.ebuild 1341 BLAKE2B fda0b3ef0eb3905478e61b3dd9b0728f974e090009af723aef9d5707196a875e992c0603f459cbc6c413ddae9bf4044ab6dbdf2dffe0f3deb5a02260eb28430c SHA512 9baf9297cc339569409cf9403bf9bf986433b236499e758406ecfb56751849fa3d1a2197da8e88f1aa64751224969c32330a6284def06806154f3a378774c90e
-EBUILD flask-security-3.4.3.ebuild 2136 BLAKE2B 6027b4ab95385e35ab71af98197d336c3ebce93f984d67d862bd0ef10786a5caf3ec2406cda8f8ea67c82f2423ce4ac8a7c49d0f17c002dbf758550e96307914 SHA512 596b1c877dd94f2fe2ca30cecd9790cf2f2725e0c2cdb33f0ff3922903c67bc3b852c12c71ecf8fcb85ba4197b4682af1818fdf0c0df3c73a6f479a8b2d35a3e
+EBUILD flask-security-3.4.3.ebuild 2135 BLAKE2B 170093c37ba951d2979b2fc2d686e35a859c761e2f41a27370614214f5847d2eda47c8a2c6820cae3054bad541df4017bfa900e657ac4513c6bdce480cbd9ddb SHA512 aab5fdc72c5a573db8adb11e5dc24aa8b335f3179ad1970cf8261adcb6e49692cbe57ddf0c3bab5c57b5711cfb2f6ccee1ef9ffb6bf1d32ec6c62fafa38398c5
 EBUILD flask-security-3.4.4.ebuild 2144 BLAKE2B 2aaf0c0290e6121c14325c1f4d158c646028ce871051f96d6027dffa095b035b20547e46cfdd11b9ba37bd8275e782c6eb64df75724f5243753c8dabeb3c47b9 SHA512 c1767593e7d093e61f94a8e36ab995debe7ba352d420412d8eff61a942bf2aff86b9753dfcde8d9487bfb212daa578e67a4c3b31a1b5c2eb3c610e28d980db13
 MISC metadata.xml 341 BLAKE2B e33881ccf51b30de5fa6831f144035f0e895f2e1720ef7ca9360a1196b7d6c587f736d4d868afbdbd6678ea020f41164a41c0ab99069bdddd253b7e5b9d80d04 SHA512 ec87dffdadc946be52ca0a12d9265250f5a0e08e833c0cbd6deda1e8eb70354c2fea0bdfcdbe86fc16072138972881112cc5a5b08f4179b85f89695b5b22f30d
diff --git a/dev-python/flask-security/flask-security-3.4.3.ebuild b/dev-python/flask-security/flask-security-3.4.3.ebuild
index 04b6f4e7b4c7..835a9fab9ba0 100644
--- a/dev-python/flask-security/flask-security-3.4.3.ebuild
+++ b/dev-python/flask-security/flask-security-3.4.3.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="
 	dev-python/cachetools[${PYTHON_USEDEP}]
diff --git a/dev-python/flask/Manifest b/dev-python/flask/Manifest
index 50ce347af5cf..59041d63a0ed 100644
--- a/dev-python/flask/Manifest
+++ b/dev-python/flask/Manifest
@@ -1,4 +1,4 @@
 DIST Flask-1.1.2.tar.gz 637516 BLAKE2B 90dffbb8faa48489d1c71ff2a064d41e97d2103c07532fd5b252dbe0b32e4babb815e31f0ceae201a66cead645b68149d13d4bb39a0df1b27b4002e613920493 SHA512 9feb6a9a8f34fadbea508d465f73c24b1d81b3f66243804dc3904d198c2fd78e2e1bef94df6a4940a7eec6b9b54abea06557a87de8b27b0a9497d18b3e071384
-EBUILD flask-1.1.2.ebuild 1330 BLAKE2B 1bc76164ee22c6a3bbdaa06b36c6c927647760f947e117b4205e87b056f705386f11188552620d68f5d0373fa9e9f0323ca0bd721096f2892fd31369d08a6d3d SHA512 278eb7bdb8311efb258abade66683d121bfd78b4a9e411eb1549b627bda665501257f3aec3339fea740b79bf54d4b179e5d3d1d4cf3b8dd5ea4923eac072cb26
+EBUILD flask-1.1.2.ebuild 1337 BLAKE2B 89b4a21d676faf73edc173e24084c2547835e612f2a6e1bd345cfb8320fa448ec57b71115d87d082cd3f40d9c3e2d41afe377da630862511a671de39903dc4bc SHA512 a1bf5217cfc3bd606031c23ac10ec974a6ea78c19cf23408461553051aa17239ea5eda91778f05200521235735df5aa4a75dc6c7b432727d0ebf586d072eb945
 EBUILD flask-9999.ebuild 1306 BLAKE2B 624eabc5bd3dc1dc8470f04b49c65a3dfd9ea1ea72e75fbbdb4130cb5e5790e299f4309f4088ba3e9cd13a8c2400c6bac405515b7c3b01b3963b21d33fb6067d SHA512 af1a02401a2b305f0579dddbfa5f5430df4a04b9309e704ba9bab37449f06894a6c4f7b6f2e1c1e7e7d1a0330cc8d36b1dee8ac5a7baa8cb3aa22b910b742498
 MISC metadata.xml 387 BLAKE2B 32096cb4f4a2e7b3e484224a6253f7f0ee52d73b9419c8ea3f76aca7d782408fdf2917ef1797057b32d1dffb17522d23cc26011fdde938d9a47046d0e9794769 SHA512 f70179503fe0651fe6ff288731f10821cce3b19d020c3817db2f6d846f66d5f013f52c168d75e3fec8070b19bdbd9c3b08670d56d8aa6158ba3547a70ae39b84
diff --git a/dev-python/flask/flask-1.1.2.ebuild b/dev-python/flask/flask-1.1.2.ebuild
index c76b57aee912..7644fa4e9eaf 100644
--- a/dev-python/flask/flask-1.1.2.ebuild
+++ b/dev-python/flask/flask-1.1.2.ebuild
@@ -17,7 +17,7 @@ if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 	S="${WORKDIR}/${MY_P}"
 fi
 
diff --git a/dev-python/flufl-lock/Manifest b/dev-python/flufl-lock/Manifest
index 5697a85ee3d9..e800088eac0c 100644
--- a/dev-python/flufl-lock/Manifest
+++ b/dev-python/flufl-lock/Manifest
@@ -1,3 +1,3 @@
 DIST flufl-lock-3.2.tar.gz 19250 BLAKE2B 230d7122fb6db1b4002e5732a878d597837f1c8cb10b85f4c131f793f820dc0b76a494504aef89845be4f7bdfab94b17573f83002712c245206c9ce25fac893a SHA512 496195e1c52f628bc6c0e8fc3dcd5373ed01cfee35b6165cae37ab4b90d70265c6a0aea565f1e0663277c2b9e9bafde8af1420133a15e6254275fad2f28a56d0
 EBUILD flufl-lock-3.2.ebuild 574 BLAKE2B 2ff8d9470afef5e042e561a721c6e77c3750fc25aa7f918e88e3c0917b773aab69de40c422d4c8fce37f8b121d976ebb1fbebdd6522b6fc98a8b487a445d732f SHA512 087e144a6c232a0467c50f0bd848ca6632c955abf9741c51e59f88004d8b2066d3a8edf76346d87ff320ea8918ba1c88deaaea95fcd4acb429183070c42d5bcd
-MISC metadata.xml 439 BLAKE2B ac364f01f2831f0bf328429ccf9254134ed961d04e6a2a7cd09d399c6d59be0085dd23dcc379d390de5e81ef99d6e0d19138dec486cd3764e34e9c2299fc09db SHA512 0021f035c2b525bc71ed0054caf093bb840a8e360b7aebfc0e7b0feaa111453b26c590d16a383fc0bfd97c0d2bd435308895d98fb43ec58360d8091bff88d0ab
+MISC metadata.xml 333 BLAKE2B 1a681ac99aee289a919b530bb87037df6fe53b044ce14ce3a9da3cec54a73d7fde58cf01f12678f18397d16b56c9e5bf88d289ddec4469e343d7193502124124 SHA512 a73512d246562e6591eb9c8d13759352cede7f0ae978d02c87bd72b1fe2c9b155cc3908e8489b136387bada61f1257d8e0771e01e26d998b51f9ce13c087ec41
diff --git a/dev-python/flufl-lock/metadata.xml b/dev-python/flufl-lock/metadata.xml
index 974a1aef8c98..3ee70120def4 100644
--- a/dev-python/flufl-lock/metadata.xml
+++ b/dev-python/flufl-lock/metadata.xml
@@ -8,7 +8,4 @@
 		<email>prometheanfire@gentoo.org</email>
 		<name>Matthew Thode</name>
 	</maintainer>
-	<longdescription lang="en">
-		NFS-safe file locking with timeouts for POSIX systems.
-	</longdescription>
 </pkgmetadata>
diff --git a/dev-python/fqdn/Manifest b/dev-python/fqdn/Manifest
index f77b6554dc7c..ff92b50d8b63 100644
--- a/dev-python/fqdn/Manifest
+++ b/dev-python/fqdn/Manifest
@@ -1,3 +1,3 @@
 DIST fqdn-1.2.0.tar.gz 12275 BLAKE2B 0bc862863ee3b196ea08a1f4f50f98dca88e8b81f37d2cb97bd3fd74ef9844157ea7a9f38707047fad17b95fb95c2f0e7ace8ad2c2310171cba6ff43471ae63d SHA512 ddfcfd82860d597075fd2d989d4bb1cd8c1dc79b711da432732bf786032e78b9356e04851a491c5299b336dcde173a66ddae0e23aea59b67c758d997554b494e
-EBUILD fqdn-1.2.0.ebuild 623 BLAKE2B 1873b41d1717caec4b15bbe05617c7c9cb2eed2ed735516cc3919310ddc8efbc4e8ea947e4809f784e0afc07ee457c45160de8a3e87b0e3b5660a9148a20ac10 SHA512 f69b029bdd4a25dd72bce9a95e540d133a1635e2e3081e6450d035724584c19c88416a636dda509d105f3e7826ed562c05eb8bb183d0992346ba1f2cbb972ef0
+EBUILD fqdn-1.2.0.ebuild 625 BLAKE2B 3f3ff8c5a36dd5fdb0ed8cceb030432d2da6215fb132c4a887d84b9bd89175bdca6ccb68e06ee42408757d1730ddf78d29198e6d59087ba38a7dcbf6032b3334 SHA512 fa46d2d375ef21a13f25f6c66d25676f2ee2b689710e1d5270c966e1d853336dd9c7ebbcf1ff27f876697cf1aedf49e8b9731c60a3d645d5b209316e7ef98e69
 MISC metadata.xml 526 BLAKE2B 1fb86ccea80fe5eadf839fb67a10f428907b402f8559935ba97ea054012497253b3b139818d7cab92f3375fae374772b8e90d470be10773998ec554b3407c401 SHA512 d9107d31f2e828667938b86209ecfe70f0eabd8c10517e3dfdaceb63ac860c314e4889a1b06ef680b2a9acd84212aa0f703147c6180a9b7e031bc4579e93e6a7
diff --git a/dev-python/fqdn/fqdn-1.2.0.ebuild b/dev-python/fqdn/fqdn-1.2.0.ebuild
index 44be7d78fc50..920e0b4567c6 100644
--- a/dev-python/fqdn/fqdn-1.2.0.ebuild
+++ b/dev-python/fqdn/fqdn-1.2.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 
 inherit distutils-r1
 
diff --git a/dev-python/freezegun/Manifest b/dev-python/freezegun/Manifest
index bf8009f8c687..00723fbedaf6 100644
--- a/dev-python/freezegun/Manifest
+++ b/dev-python/freezegun/Manifest
@@ -1,3 +1,5 @@
 DIST freezegun-0.3.15.tar.gz 25530 BLAKE2B 866736cfe556da50f8edba55b0b84c7365e6a1bf32d88e84dfcee6046474b30a9ea15522c3356c5ca30f9a8b79096ba17fdaab240f20e4ef1f91b25ec8262716 SHA512 9f3836f8c9f207d9bccbcaec3f1af977b26aa3699ad5f792d052e105a0de530c6dda1641480c9cd551627186bf0c65d92bf39a6f4a61f458f762d8aa999180ba
-EBUILD freezegun-0.3.15.ebuild 1115 BLAKE2B 867991de772aebb6c3cee2500add21222988eed4949bef6530b119d88ae7f0ea75018e706737e865ead5f90054c559ce64514ddc7b2fb3b6bf094c0ce28e642d SHA512 4835a63cfebbde3739f3949c90a6909511123e9f8e7ea1d92e0e0931aff82f9ece2e67009d0cf2f4aa9d9956b7490832cad267725a900e2ff075352feb7ce9eb
+DIST freezegun-1.0.0.tar.gz 27426 BLAKE2B ebbe77d50f71cd10ad77dd9010fbc3dd9411a781300a5d196f4f86a76a374a8416980f8779705a943c4638ffdf99250640afe577695203b87e77e2daa1be8b38 SHA512 b6e19cf7799c0689eb756f6ce922797f2f0622f03d13aaf81c62d777d00b660b6619cff996f7a89c54b2e9f33641401e04e72a455a03ba0c7dfca09b64cfecb0
+EBUILD freezegun-0.3.15.ebuild 1122 BLAKE2B 73b0fc8fe338ec2ea05260b5e242a1ceb9243f46b0f7cac471ad219c8345b9be877977a1e44ec618df2d76eeeb2c55ba55ecc7315f6f3a3d67eb2c272253d76c SHA512 0c1f36f9f44325c7c19a9f9cbedbe5699b7d39fae13052e3ab080585c8b8cd8536b1906bccbf494d66dc69e11143001bbacf8758cf42b5ff7cf6dddb69194d09
+EBUILD freezegun-1.0.0.ebuild 705 BLAKE2B 99e163b5495ce3c6ed1b670d503f220a23acbea76c89320f98663e600faf6ea171b84ae6c8f23dc86640a1c4b5200a30cc8dccda595cdb289e00d01c1a90f1fa SHA512 0f2dd6a431c5aa8272d2c57fc0d92fb7d323ae4a212e7a08983f260c97edc37c07a4f29df2976c32982b889c981f8f5ea312b7c58d8afcd036d0aa192ea732ed
 MISC metadata.xml 392 BLAKE2B 574f859b6be3de78801f9214b561b366ddb87357be71a6891084da1f3de2e6481692d5da7ca6d5008d3ae963cc1e36ead4aae6115f0008d63d65a089cf70115f SHA512 b39f8a45d62f0c220fb915ad64c6a17e9f9619aa8c358694c3a3a83464eb5fcf50ed658430d9aabfb76e8310d4ab3baf059a8de78ebe46a59d6af187735489ed
diff --git a/dev-python/freezegun/freezegun-0.3.15.ebuild b/dev-python/freezegun/freezegun-0.3.15.ebuild
index b0d4cbd6d939..afa76b6f2455 100644
--- a/dev-python/freezegun/freezegun-0.3.15.ebuild
+++ b/dev-python/freezegun/freezegun-0.3.15.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 
 RDEPEND="
 	>dev-python/python-dateutil-2.0[${PYTHON_USEDEP}]
diff --git a/dev-python/freezegun/freezegun-1.0.0.ebuild b/dev-python/freezegun/freezegun-1.0.0.ebuild
new file mode 100644
index 000000000000..4b7260beae0d
--- /dev/null
+++ b/dev-python/freezegun/freezegun-1.0.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8,9} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Let your Python tests travel through time"
+HOMEPAGE="https://github.com/spulec/freezegun"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+
+RDEPEND="
+	>dev-python/python-dateutil-2.7[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		$(python_gen_impl_dep sqlite)
+		dev-python/nose[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/fs/Manifest b/dev-python/fs/Manifest
index 97f50d943ba0..9780018baed5 100644
--- a/dev-python/fs/Manifest
+++ b/dev-python/fs/Manifest
@@ -1,3 +1,5 @@
+DIST fs-2.4.11.tar.gz 163986 BLAKE2B 953e50da7002512029c0a1a8e7fe8be3a7c31fc48e2c66f0fe7d71dc908aab734f724e09c16074c3e4cdd86c9c2e1a847aa21176af07311012090375a3a6808e SHA512 fe4596bf213f9b1721cd3c665e6af180d6617eea07afbaa9d83847dc3f7dfe64bca16c8ccb337d48bbb49bf0d2fef90903e3c4aecc63f61faac6a2b6f6c59cf6
 DIST fs-2.4.9.tar.gz 126022 BLAKE2B bd7406ee0c22171af349bed6096f58bc749af30f3fae6b8532d7a2b07dd7f0a55165f4b4ab413d6ff7c8861fbe7784ae383a984d26c1cdb1bdc9100c4ae0b0df SHA512 594536eccc043547df4ec4fd1fc507d3fad2838ebb46768a11f142c68d42a776f9fa3cda8651421c6255314835a0283407ea49ebdce04af84a1646efaf5391e5
-EBUILD fs-2.4.9-r1.ebuild 1214 BLAKE2B ce3ef26fddbcec68143383bce719186cf298f5a283cd560d660666df6b83b523258b2c1468ebf6aab0b2952082a5c3bc46393eec57db8045e8845fbab5ec40e6 SHA512 7bb1743c9d17768b6aba41b7d1410300674fd9d7583bc6a13f4e6ae0d429ef5a48a0199a456dcad2df34b9d9fc9924b6728da70e1439d43771918849edc7863d
-MISC metadata.xml 486 BLAKE2B 69d62d79b3d0e05fb12bbf8a4d4f703f82488cace87e8f42aaace9319c18f564c3c841b5b69a189530ffb760bceb1acb9fce38472af659a6c4ce24b1bddc16c0 SHA512 48e48fb5f3c868fb8e1b9dce7c483c13291659c99e0f19e096204451e1ada83fb0d2334d89a3beb45de11b7e710a3deb9e5777e5c8f905312efe899cbee02d07
+EBUILD fs-2.4.11.ebuild 1433 BLAKE2B 9d6734f7a46407294edd3a5372bf78a606d021e3cdd389919daa67154429ac2ec27a116cfb229ad6a6acc983c75a516fe8d1f7cd481098a6f30c6c75d826cc58 SHA512 7f552a2bed99356d037d0fe52dd60b95cb6043ce037ddee77ca1cab00d713de3623e3cf9ad166b99d5fe9b977afa751d1d8d9a9ff9afd2af5d5b728520197dcc
+EBUILD fs-2.4.9-r2.ebuild 1176 BLAKE2B 1e8bbbfe9341398067f67cab4d3b6dbd9560fc09896e7a44d432b83c30c9a4737980e9643c5ad407154fa54492065ac1b8f7d14c2783c08bc4d7fe1ff56a5a4d SHA512 93f9767a91bcae478c86bc200e0e4ab2158e748b8c3322155685312eefac6862f0575c3fabe32161809def6a40b5f37c5cfe83d56fccb9f5b5ca0e63db59d386
+MISC metadata.xml 554 BLAKE2B bb83374a2bf2dfb3aacea898fbf8bbb4804888688e9d0a91ea9a0176978b1a3d17f999710e18fbf655f7598e368d615fe6c081e1865c88c97fe9b790618ccf08 SHA512 c4c1f6db70a41984387e97e5ea47e841ab683da5f7501b3e83f283028680c423f6a05fb0e6971f8083c1f8c272e17fca47b53d8b94e8caba2573a3a08fc60175
diff --git a/dev-python/fs/fs-2.4.11.ebuild b/dev-python/fs/fs-2.4.11.ebuild
new file mode 100644
index 000000000000..a71c92e9647c
--- /dev/null
+++ b/dev-python/fs/fs-2.4.11.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# Not yet ready for 3.9
+# https://github.com/PyFilesystem/pyfilesystem2/issues/421
+PYTHON_COMPAT=( python3_{6,7,8} )
+# pkg_resources is used
+DISTUTILS_USE_SETUPTOOLS=manual
+
+inherit distutils-r1 optfeature
+
+MY_PN="pyfilesystem2"
+
+DESCRIPTION="Filesystem abstraction layer"
+HOMEPAGE="
+	https://pypi.org/project/fs/
+	https://docs.pyfilesystem.org
+	https://www.willmcgugan.com/tag/fs/
+"
+# Tests from the PyPI tarball are broken
+# https://github.com/PyFilesystem/pyfilesystem2/issues/364
+SRC_URI="https://github.com/PyFilesystem/pyfilesystem2/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	>=dev-python/appdirs-1.4.3[${PYTHON_USEDEP}]
+	dev-python/pytz[${PYTHON_USEDEP}]
+	>=dev-python/six-1.10[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		${RDEPEND}
+		dev-python/pyftpdlib[${PYTHON_USEDEP}]
+		dev-python/psutil[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx docs/source dev-python/sphinx_rtd_theme
+distutils_enable_tests pytest
+
+pkg_postinst() {
+	optfeature "S3 support" dev-python/boto
+	optfeature "SFTP support" dev-python/paramiko
+	optfeature "Browser support" dev-python/wxpython
+}
diff --git a/dev-python/fs/fs-2.4.9-r1.ebuild b/dev-python/fs/fs-2.4.9-r2.ebuild
index 2dc5fca3dcff..0d76f77f0a13 100644
--- a/dev-python/fs/fs-2.4.9-r1.ebuild
+++ b/dev-python/fs/fs-2.4.9-r2.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 PYTHON_COMPAT=( python3_{6,7,8} )
 
-inherit distutils-r1 eutils
+inherit distutils-r1 optfeature
 
 DESCRIPTION="Filesystem abstraction layer"
 HOMEPAGE="
@@ -32,7 +32,6 @@ BDEPEND="test? (
 		dev-python/nose[${PYTHON_USEDEP}]
 		dev-python/mock[${PYTHON_USEDEP}]
 		dev-python/pyftpdlib[${PYTHON_USEDEP}]
-		dev-python/pysendfile[${PYTHON_USEDEP}]
 		dev-python/psutil[${PYTHON_USEDEP}]
 		dev-python/unittest2[${PYTHON_USEDEP}]
 		' -3)
diff --git a/dev-python/fs/metadata.xml b/dev-python/fs/metadata.xml
index a3293478ffe7..1643d116dc14 100644
--- a/dev-python/fs/metadata.xml
+++ b/dev-python/fs/metadata.xml
@@ -7,6 +7,7 @@
   </maintainer>
   <upstream>
     <remote-id type="pypi">fs</remote-id>
+    <remote-id type="github">PyFilesystem/pyfilesystem2</remote-id>
     <doc>http://docs.pyfilesystem.org/</doc>
     <maintainer status="unknown">
       <email>will@willmcgugan.com</email>
diff --git a/dev-python/fsspec/Manifest b/dev-python/fsspec/Manifest
index 28f50bdd0a9f..a9eba90cd966 100644
--- a/dev-python/fsspec/Manifest
+++ b/dev-python/fsspec/Manifest
@@ -1,5 +1,9 @@
 DIST filesystem_spec-0.7.4.tar.gz 222128 BLAKE2B b111b8194e2c31065a26dcd952aaadf0bc39bf75e94b10f79a387dc1b66838de820bcdcd90af60533dbbd33cfcc275470ccd82b98d0c82154f0633efab355187 SHA512 086e7e7905ff4a55b7027d2b005fd875200bf40469ea4b36effb9805a3416145ba4c709c4a6c8a3ac24a033cbd2104e7ebe401e2610db6c2d8548a63587b343a
 DIST filesystem_spec-0.8.0.tar.gz 235922 BLAKE2B 5ca1ce8fe3932ace39f3623217b0918cc7f24c07e86357fd4d3d56630010c37c33e94f0419f5fd6bb86292751ccc93efae305ad3c86c4f94a54b0ae360c9a07d SHA512 55513650f1795657ce274478d4360f2cfc3d2bbd8114df7a458fb3a20277b1594e48b5be38e26154a3af525a169f1e4b3d3c0e387bf3889b78350bacf12cc02b
+DIST filesystem_spec-0.8.1.tar.gz 238298 BLAKE2B a4a5fd16b10de1420a33cdc3ee5a37b3f9c93a9a5ccf179f0b022897bb41c8f22cd517bad7ca8ac3c43190e9fcc92b51142a58349a6b1f51274d27e5da1152f3 SHA512 1447f2fb2fc27b5d3ed18cdf43df3c1da9f0bbc03d2dbd0cd69631cfa629c74d2e35358f8bb560b7d2a7d9bb9b7512e2fcf0f7ad6a2f364334748c0026e4b6a6
+DIST filesystem_spec-0.8.2.tar.gz 238399 BLAKE2B f64f153dd303bd3ec44e5010507704b5cbb50a89ad4a7a2e50b38b139219896be543bcff0fe0a99e06f015450f4b0334a641fabeeeb23583b14665ef8f089159 SHA512 e30badc56871ef20cf4b2ce0f6353b4125632d9e253f68d4b08535c9e1ac5fe428745315cee89a9536bfd1b308a28cc65fff555a7b9d9511225357bf790b9aac
 EBUILD fsspec-0.7.4.ebuild 804 BLAKE2B dc0ce270b209f58b0d59cf6f67c8c8a5715083f50788fc8297e0b27b3557ff3223be3b9e0ddf7e05e108ed55b54a48bf3121b3cdfa3a7142a611dacdf09d5e51 SHA512 ae45ef85aecbc576a849eb125c621a4f4abecc68cdf212fc62f29486340b674ea441db198d4b9552c5896ae2122dd3972ff0b2322929aa0e3ee61f6ed52f7b48
 EBUILD fsspec-0.8.0.ebuild 818 BLAKE2B bb540631aeb10dc1b3988bb0aceb3d8f9f8f9a8b7dab374e18a914ab765d1331bbc574663437fb09ef18df14849349de8c6bf5ca41122c0fdb500a4e21a08ff6 SHA512 63bcf13edfa4c637fabbb7bf013228b37a9f04468ab28e0850c2fb6d380b55d722ef33eb85538ce9bd1a4a7ea4637a625cb6cc493c145b0938357b8644d153de
-MISC metadata.xml 218 BLAKE2B 086fdcf7b63ca7bd6c58e861d717bb375e1cd372eff26d5d2eeeb176d8c5e6f10e653562abafb50eae7d7508f8e3d421b87e6a749acd0490308672828d0da697 SHA512 4558fee4c51117e21b1f42ca3edbdf1195ed297db798d6bfa0e5fbb7019654a187422b0abde7af5d800caffed66d1e55e4280e8be602bad591424d9776c46781
+EBUILD fsspec-0.8.1.ebuild 1048 BLAKE2B 8a07453212ddab7306cb16809036de5d19f958256a6cbd0e2e7456866d8d6c2ba6a121f4b616ff91ba48d2fb6eb3396bc12ffa588e3016e37e9121d4f85ccb33 SHA512 975e3e7f56d637f980649c361a6c2c315532f51dac9f96bbd407d09721255be65c8dad2312c911630d4d2641a02eb2cb9ffc924489ecc761a99b2c46300bca70
+EBUILD fsspec-0.8.2.ebuild 1048 BLAKE2B 8a07453212ddab7306cb16809036de5d19f958256a6cbd0e2e7456866d8d6c2ba6a121f4b616ff91ba48d2fb6eb3396bc12ffa588e3016e37e9121d4f85ccb33 SHA512 975e3e7f56d637f980649c361a6c2c315532f51dac9f96bbd407d09721255be65c8dad2312c911630d4d2641a02eb2cb9ffc924489ecc761a99b2c46300bca70
+MISC metadata.xml 242 BLAKE2B 17fd7db1343fb7dba1842d5b62d83e56e2816962b0122ec6eee7f9e163f333d69ede2cbdf2a2ba8c77613367fca3d2cee779697fb25b5d8cf0439e1e845dbf1f SHA512 2ce768d5aae91f32da90c62900f556c647eb9806c810a817b6c45c5356e71f504b5a646bf75f553c3a9bfd3f94c4317df4948bae863ef7525b4a013b63618cd8
diff --git a/dev-python/fsspec/fsspec-0.8.1.ebuild b/dev-python/fsspec/fsspec-0.8.1.ebuild
new file mode 100644
index 000000000000..041adfc0de56
--- /dev/null
+++ b/dev-python/fsspec/fsspec-0.8.1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+inherit distutils-r1
+
+MY_P=filesystem_spec-${PV}
+
+DESCRIPTION="A specification that python filesystems should adhere to"
+HOMEPAGE="https://github.com/intake/filesystem_spec/
+	https://pypi.org/project/fsspec/"
+SRC_URI="
+	https://github.com/intake/filesystem_spec/archive/${PV}.tar.gz
+		-> ${MY_P}.tar.gz"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+BDEPEND="
+	dev-python/versioneer[${PYTHON_USEDEP}]
+	test? (
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-vcs/git
+	)"
+
+distutils_enable_tests pytest
+
+src_test() {
+	git config --global user.email "you@example.com" || die
+	git config --global user.name "Your Name" || die
+	distutils-r1_src_test
+}
+
+python_test() {
+	# sftp and smb require server started via docker
+	pytest -vv \
+		--ignore fsspec/implementations/tests/test_sftp.py \
+		--ignore fsspec/implementations/tests/test_smb.py ||
+		die "Tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/fsspec/fsspec-0.8.2.ebuild b/dev-python/fsspec/fsspec-0.8.2.ebuild
new file mode 100644
index 000000000000..041adfc0de56
--- /dev/null
+++ b/dev-python/fsspec/fsspec-0.8.2.ebuild
@@ -0,0 +1,44 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+inherit distutils-r1
+
+MY_P=filesystem_spec-${PV}
+
+DESCRIPTION="A specification that python filesystems should adhere to"
+HOMEPAGE="https://github.com/intake/filesystem_spec/
+	https://pypi.org/project/fsspec/"
+SRC_URI="
+	https://github.com/intake/filesystem_spec/archive/${PV}.tar.gz
+		-> ${MY_P}.tar.gz"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+BDEPEND="
+	dev-python/versioneer[${PYTHON_USEDEP}]
+	test? (
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-vcs/git
+	)"
+
+distutils_enable_tests pytest
+
+src_test() {
+	git config --global user.email "you@example.com" || die
+	git config --global user.name "Your Name" || die
+	distutils-r1_src_test
+}
+
+python_test() {
+	# sftp and smb require server started via docker
+	pytest -vv \
+		--ignore fsspec/implementations/tests/test_sftp.py \
+		--ignore fsspec/implementations/tests/test_smb.py ||
+		die "Tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/fsspec/metadata.xml b/dev-python/fsspec/metadata.xml
index 266e3f19ca59..e59516686a44 100644
--- a/dev-python/fsspec/metadata.xml
+++ b/dev-python/fsspec/metadata.xml
@@ -4,4 +4,5 @@
 	<maintainer type="project">
 		<email>python@gentoo.org</email>
 	</maintainer>
+	<stabilize-allarches/>
 </pkgmetadata>
diff --git a/dev-python/funcparserlib/Manifest b/dev-python/funcparserlib/Manifest
index 1c7d13fa6333..72dc7b6b1ba8 100644
--- a/dev-python/funcparserlib/Manifest
+++ b/dev-python/funcparserlib/Manifest
@@ -1,3 +1,3 @@
 DIST funcparserlib-0.3.6.tar.gz 30401 BLAKE2B cfce97cf08914f67ba3bd743bd3d6e7e7a03599ddc00d58a884aa84118d197d92bcc67a93ff1f7a2ab2074d66704078f5392c1d846004a5cd6eed2a423ba6b61 SHA512 efa52f788aa902b099660cb8bc60a025085a8c383e52bd0824a0c3ae28a6c13804a0659de0c80b4dcd839ee70491805d4eecda6cea221e35c3750ec569098c24
-EBUILD funcparserlib-0.3.6-r1.ebuild 709 BLAKE2B 0edffc36086e5971d03b9f99f52cce39656b0516aaa23100db7adcaca84c1b9bf84b0d7dfaf45698c2703a7ca3999bb6d18003bc111780dbdcb727c1caa0badb SHA512 d05d121826b7e9680d782cae1ebc6505af419d86576b7d8b56b1caa8d8505e9654aaff07aa6cd29c33338262645e43e8770b09ae1e7c8ff2ed63e59eb7dd4810
+EBUILD funcparserlib-0.3.6-r1.ebuild 714 BLAKE2B 7251b48b35b1993d36a2018d758ca9b79b2ac89b819f006b72b8e3d35308dca2e67321a5d2318c4895b20259f5f9085697ca13dda7a5d66320c9e5332787a228 SHA512 4feb41de697c9bffb6739d6ac0dd6724e46ab4d6e0e421c08db8f28ae27ada3eb7d7c7f8701922e93fbabe74200cd95eaf727d841e6b947e6dc8a4beede6d18c
 MISC metadata.xml 316 BLAKE2B 1899ee4255eb25643967fafb8aa09ea4b8e6319074de967e512d98ed182c2c7f7992c11c6689000f7bd2076b7296fc544fb8aff86fb03c86d661ce183a41c9b1 SHA512 9fe54328f405d097056ad5e3e0795ded4e3eacd72381dca3298a9af0e7c78f11eab97548b251c6bfaa9144dd0b00c00ac4292ad2ed5e84c31ab6c593a26b8caa
diff --git a/dev-python/funcparserlib/funcparserlib-0.3.6-r1.ebuild b/dev-python/funcparserlib/funcparserlib-0.3.6-r1.ebuild
index b51cad0ac5dc..83574dcad3f6 100644
--- a/dev-python/funcparserlib/funcparserlib-0.3.6-r1.ebuild
+++ b/dev-python/funcparserlib/funcparserlib-0.3.6-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ia64 ~ppc64 ~sparc x86"
+KEYWORDS="amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
 IUSE=""
 
 RDEPEND=""
diff --git a/dev-python/genson/Manifest b/dev-python/genson/Manifest
index cb9f8e9931a0..fba747860c24 100644
--- a/dev-python/genson/Manifest
+++ b/dev-python/genson/Manifest
@@ -1,3 +1,3 @@
 DIST genson-1.1.0.tar.gz 26662 BLAKE2B 726b0467edca9ca503d73c914d35392f0784ae8be01a8287b84da3cd5ae4b4cd6e12a46b1a7baf73db40377b915ddb3c4b53f4a135e3923fa775af5b51a5261c SHA512 54264dcc51cd5ece9bd428079fcd5cf833f32ef36afbb7987de9982d33253834c5c8c35d18b21ad4003fc2ffac4da02965a00844457b7d8ca6c6bf3d3facb8d6
 EBUILD genson-1.1.0.ebuild 700 BLAKE2B bb3ded0a5603b1dadc195486542233a02be119876657ad1bbf930a67a7f9adeda7a06a3bb9d365f56236e27cd816b983d610cc7881645d7119a4ad3494290251 SHA512 2e0a8a8a5270f27b3e727060720d9578c30b3402aab2fca1f952566356d096cc7b4788ae6fdea4c4ae9543aa73ed46bdee5d7c157f78d58007f3e01ba8f0d25f
-MISC metadata.xml 499 BLAKE2B 3b4c33ee482291e8c22cd4dbc83f8ce0640db00739db1be07d27778f1eb55e923ac7413f30ccd94b0b7fea6936a75e66ddbe4e42d4b035ecd7a641ba335e6460 SHA512 47f8f9a3a1467dcd877c10a9d3f0214edfe897a9874d20d655ae5296e12d197d5d6c0b39c5bca11b6a00df73a0135a8779804ea9763be51b136570e2e435774c
+MISC metadata.xml 374 BLAKE2B 5b656de91f608ed3000284960ac44e8983150d3886c34ce891ddfa5036581a246bd2eef841002b0b8c9e25fb81b96a08e8e7f001446d0a1b8c8a7f8196b96286 SHA512 94125f62b402ca3ef2ce14df0727dc0c777a30276380d61cb3ecde3bce3930d130a65c730f2106b2aae324819e593e1fb4e62ceb20051f74fc56295c7bf9983b
diff --git a/dev-python/genson/metadata.xml b/dev-python/genson/metadata.xml
index 0a41def911c8..52b7e7906ee9 100644
--- a/dev-python/genson/metadata.xml
+++ b/dev-python/genson/metadata.xml
@@ -5,9 +5,6 @@
 		<email>alexxy@gentoo.org</email>
 		<name>Alexey Shvetsov</name>
 	</maintainer>
-	<longdescription lang="en">
-		GenSON is a powerful, user-friendly JSON Schema generator built in Python
-	</longdescription>
 	<upstream>
 		<remote-id type="pypi">genson</remote-id>
 		<remote-id type="github">wolverdude/GenSON</remote-id>
diff --git a/dev-python/genty/Manifest b/dev-python/genty/Manifest
index 79e5d66d2d85..f4115ecc8594 100644
--- a/dev-python/genty/Manifest
+++ b/dev-python/genty/Manifest
@@ -1,3 +1,3 @@
 DIST genty-1.3.2.tar.gz 20818 BLAKE2B a3344869e63f4f6e564836fdcf5e36b3184f5df2a20994ded3a20ee0ff1360ea5e9db574bf6097f5b47673fc7db70bb9bfd3238075fb0a3b7b722a6461f09632 SHA512 cfe984dfe5af48ba9f4f959a1d0ab1d331d3c2fdb64c680572e5652b845e5c290097ec3ed2b4e472a563cd6ab79489124f6eb212902a05a2f1ce5ff254a82e13
-EBUILD genty-1.3.2.ebuild 648 BLAKE2B e2061c693cded01e0d9f4ae95de8aad0a130f7aa669586ff6b34c93d09828f408a97ae4fcefc234ee18cfe64c9ba8d83b6e7edaa62e185bb4c817d4484e6bf89 SHA512 0dc7289486eb7f9f5dc75e7eaca255742e19b803afce51ae06855ecd0afcbef277fc66d38871fd771644ce292ce024a3f4141e174577b71a2a8c61510a46d1d1
+EBUILD genty-1.3.2.ebuild 655 BLAKE2B d42ed669fbeb8eb5603ae25dd03540edcb15d856fafaac025078fab7206229173f9db9d333179958410e42f1192a350b8019ed810af49ec7688c551b6a5f9b4d SHA512 b079b93e7883cc04978f50a8235e682c96b28ae8649585ce4c5902aa43558944e7162864e66ece40a408e63293fb4bf2ab9146320945794b317f8db55e1332cf
 MISC metadata.xml 357 BLAKE2B c4b7d3382dabce66ab01fecd442eb82e979d27434b0888c06d75d138ced20b984c67367f632a9fe00602d8d385f2222af1e195b8cb5e8b8b7e50494b9b018627 SHA512 ba3b3f11913ffc8848a7d2b1637b028812badef52306565f5d0462314d97ddb5795219cc6f674f3dfdc47c3d9b0bce602425b25df99c7227dcc166f1b1f536a0
diff --git a/dev-python/genty/genty-1.3.2.ebuild b/dev-python/genty/genty-1.3.2.ebuild
index 15cbbcc63c39..19dea8cfd41f 100644
--- a/dev-python/genty/genty-1.3.2.ebuild
+++ b/dev-python/genty/genty-1.3.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="Apache-2.0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	dev-python/six[${PYTHON_USEDEP}]
diff --git a/dev-python/gevent/Manifest b/dev-python/gevent/Manifest
index 46b9136565aa..f3302c69a960 100644
--- a/dev-python/gevent/Manifest
+++ b/dev-python/gevent/Manifest
@@ -1,5 +1,5 @@
 DIST gevent-20.6.0.tar.gz 5803237 BLAKE2B 97b988964ef80fcc1c3238718b6802016fb46742c94e7e56b5196139181ff82ce60816e0a8ccc5c3e1c3b73ec11cc705884b5ac5524dbd5116dc0d8722ccc7a4 SHA512 28ee030934d3c379577c9f86b76838e5d76c7ea7c0880cdeac9dc5ead497ae0600fb02b2984c7312fd42319142200c674b75da2e93b58fd4a99882d601a95108
 DIST gevent-20.6.2.tar.gz 5806612 BLAKE2B 8b1fbd991cb169292d33001bb0df06702d36eb3849c9251e4fac9e2fb5826eda3435971e39e209f1f537536081ce2730e561e91c398ee66a9b1d55c9d0e5a81a SHA512 65caa9caf8a2913b4c3bcc9a303169ce5837a0d7ccf4fb6b7583bf4ec3a0b288d65fc7e28399f0715e61aed128ffc6e67fc9b455474e47263236136a492021f4
 EBUILD gevent-20.6.0.ebuild 2297 BLAKE2B f0d2a4367a77c22341cbdce9345f0208c9ba01bfe0062532dc4696d49de5f5c01d23b220991d88deb92cd706fa8fcc6e5812579b4468ee532de5973fba3cff13 SHA512 51aa1c880970f350206d762c9ba1fd33d63424342f961e1ae7d2ed26ea7bda278df3a72c41b6f8e955c9af658d83fd482a343a280bb2322360193160780c1501
-EBUILD gevent-20.6.2.ebuild 2297 BLAKE2B 86973db907f34ea0a3a58b2fa395ab995254f2a596c18deaa3f0cd13edd5ec448b2c2928ef47f613dcedb0e2682b0f0d10d0743818763d7e79ec85d7f3e9dcc9 SHA512 edc043e20c7e7bb4ae6721a2a1b8099ca0fba1887e6df4445f54c2f0c97fd3e1cfabd5c5b6c87146b0d18e21951ac3128abea24d1fa8a2f805cc39edcb097225
+EBUILD gevent-20.6.2.ebuild 2295 BLAKE2B d6bc69b3403558df0e9c151683b52a7ce18570d6dd1d7a327a92093e6a24f43e0bd1cb3df4dd2e93a0f3147ca45e22481a0ce41d628f216d83396acabebf7fbe SHA512 7ee4afe92b053afa10717d5697bbed41c4e995a026901cbb8bbd6c811390e457b30814e11cf92d93f4d3b1fdaa02982d7ebe38d2997d7e89f9d636630aefff89
 MISC metadata.xml 374 BLAKE2B 87fe7f375b08bf4991954e018241ce4b150365409df516a12b79d221a037d718342dae60461663fac1d5af34458d352e287901e15fe68b1074927680055c204a SHA512 443f847333d35cd55f9c33624664569ecc8c2d0b7c74a358a716e0e133072edb0f29abfc36d6fb446db6890ae1319ad9d719a6e65e2bb35f9c9e9259379241fc
diff --git a/dev-python/gevent/gevent-20.6.2.ebuild b/dev-python/gevent/gevent-20.6.2.ebuild
index 9fee201e0534..a07973a73b41 100644
--- a/dev-python/gevent/gevent-20.6.2.ebuild
+++ b/dev-python/gevent/gevent-20.6.2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~mips ~ppc ~ppc64 s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~mips ppc ppc64 s390 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="doc examples test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/geventhttpclient/Manifest b/dev-python/geventhttpclient/Manifest
index c7528e2071a9..b652d3cb50fa 100644
--- a/dev-python/geventhttpclient/Manifest
+++ b/dev-python/geventhttpclient/Manifest
@@ -1,5 +1,5 @@
 DIST geventhttpclient-1.4.2.tar.gz 57535 BLAKE2B f3c17140698b1609d9953110790fb536d982782c60165c717b6cee290c0b8fa5ae99cd6935401b6b617f0bd021783dd3f836c7cff775f513b9084714da1575a7 SHA512 3252d27f07a4642ba34d449664f50451b2ca4e44dc508345133d21acf659251a66be72784bacd312c074de4025dd5e080bdf35c84d9f7d40057132184a4d285d
 DIST geventhttpclient-1.4.4.tar.gz 57620 BLAKE2B 20b60cfa7e8221b050bfd95a6e23c2f3eee87c0df1e93171719c7ba1804e88c918471cdd01cf4c6020fb6d44d0a1b911ee09dd44cc1e150b5d18d6052f2904cf SHA512 c6a8580707f3178a3a55eb638b9e3f36f82aecbd8a5ce044f0b8c167d88ad2bec584275bed6b720a5f7a546b0ffd113bec28dd2e1ff4290c60f0b5e13542b737
 EBUILD geventhttpclient-1.4.2.ebuild 1527 BLAKE2B 6e6a17d12cebcc4e355bd35e7030df325ce028da315f76274d8ca95015488bb650a33f8ee64a0e0b7298a250e018a9778020bc511ed500bc1f1a12cfc0018afd SHA512 33a0eb1d558e10a841a09511f0c3ab48453c2ed66c38304f981f0f4027a9eaa77550b44384245377dde4fd61c4a260510577b0b7b68e5dbf41b4506b47483869
-EBUILD geventhttpclient-1.4.4.ebuild 1535 BLAKE2B f0b454451021ac030a18c97900d557135f1ae65066a970fc224b45ed0107c6b886cec11906999cc90241c6b452b06a7d062f602cbb67c8e6f762d06a9e4d4455 SHA512 edf6091fd6a6bcdf21fe1e5344998312269a46e54ae7d59d3a0714e2d5afdcf0f31468447831cd577245fe525d26763ea8d6eede701ec911d1d3fec8e5426577
+EBUILD geventhttpclient-1.4.4.ebuild 1534 BLAKE2B 197e4765239974791a17839b96ae0e3ca778cbbe0cfc7e653cbc6191ccae8f0961bd4e5884d8dfbe95d28def428ba5a7dac05d309c861c027f6866de7f6cb493 SHA512 06e2e9ca60a5d959fe400eefb7db325f43f8dac024c8b7d30617519810239054578da3e4cb3a9798c7b779720586ffbf9dd37ef4f542d0425d5d1a3e4c7ccccf
 MISC metadata.xml 555 BLAKE2B a747ad2f270f2267b197d8489d253c18bc6093063f9cbc037afa0598931a244aa9da1d0d9d5c8e69a98c4f1fdfb8275917b9493dec895db5225a8918c51d0f43 SHA512 61c8affec2fd6d68f40d721842d7a121f6e24fdad560d131acf9e8b0f1a229afd2580fe9f78095da9a77b8dd9accf72b180eef797c4e143776e8beb7b7c36fcc
diff --git a/dev-python/geventhttpclient/geventhttpclient-1.4.4.ebuild b/dev-python/geventhttpclient/geventhttpclient-1.4.4.ebuild
index 60b9abfec4e8..3cb77db1829c 100644
--- a/dev-python/geventhttpclient/geventhttpclient-1.4.4.ebuild
+++ b/dev-python/geventhttpclient/geventhttpclient-1.4.4.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/gntp/Manifest b/dev-python/gntp/Manifest
deleted file mode 100644
index e348b419283a..000000000000
--- a/dev-python/gntp/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST gntp-1.0.3.tar.gz 10839 BLAKE2B f427096ff1e0b81da7f3a6c4f4a477bdedd7c69f632d8ff7bb7780a0b31726341d78852f3819e5ae8764b96513b27c5e3a261e0885645b60b5146d3d36628a14 SHA512 77f4f3801e183eeacceedd2c0588e571e3ffb1d81fc13f222fc593035ed767af487c2242b8cece697b430e04a6dce589c3e91fd5784f29f477964307197053c1
-EBUILD gntp-1.0.3.ebuild 447 BLAKE2B a8f2f99b8ebecf59d47ddef8658a5f6a69994cc0bfa05dbd31456a57b9a6955d7a41c7f714778017173212cf556b4d016913f034ef1240c7fc9cd7597f2a7545 SHA512 d19096b62970536baed59b931e464eadefa125aa76351f86a600fbb56744510333d0dbec97ed9df9ca1022029cf3bdfb33bc4e5bd09aba34611c91d7406d441a
-MISC metadata.xml 372 BLAKE2B 355ee3bad65b04dc623309bd6b14ce8e25b0b16356b4ef6d08cfebb5f2e3b7a9959967e69fb66faee38eca60a6004e03e205400814cc136911bd46b9cc0b9a71 SHA512 c247337a79257cb729b1439a90f977f650169abe6d685edd8f74bf2841f3274579df2b2a3c32ff4a8c2c9771220e6f115295671407829ce145daecf652f43621
diff --git a/dev-python/gntp/gntp-1.0.3.ebuild b/dev-python/gntp/gntp-1.0.3.ebuild
deleted file mode 100644
index 0334779bffeb..000000000000
--- a/dev-python/gntp/gntp-1.0.3.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="Python library for working with the Growl Notification Transport Protocol"
-HOMEPAGE="https://github.com/kfdm/gntp https://pypi.org/project/gntp/"
-SRC_URI="mirror://pypi/g/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND}"
diff --git a/dev-python/gntp/metadata.xml b/dev-python/gntp/metadata.xml
deleted file mode 100644
index ec14835c24ee..000000000000
--- a/dev-python/gntp/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="person">
-    <email>naota@gentoo.org</email>
-    <name>Naohiro Aota</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="pypi">gntp</remote-id>
-    <remote-id type="github">kfdm/gntp</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/graphviz/Manifest b/dev-python/graphviz/Manifest
index d34344b108b3..968134a684b5 100644
--- a/dev-python/graphviz/Manifest
+++ b/dev-python/graphviz/Manifest
@@ -2,4 +2,4 @@ DIST graphviz-0.13.zip 181039 BLAKE2B 6484706c706941891500350c933cad537e63b8f6bd
 DIST graphviz-0.14.1.zip 183737 BLAKE2B f4dd100d6fcdfcfc266a7dc77f89b8647ac16d4d56629555ec94b54347b0d91b531ec25ac7ed9c13b0470f6bc49c68a9101791e5fe8b815ab0cd18a9c6f93e7d SHA512 ce2731acecee823afaf086955b316aba956a666b5d528c1ecdee388bf26ee02f502d48d650ed3a8aebcb75ecbff750049c1ca50e27644f74f57fb34b65e42c9a
 EBUILD graphviz-0.13.ebuild 712 BLAKE2B c109d4ff4e571328c7b88cf59727a82b22c14a0ffe499fa04be225a1f3f5b5714956831d297e775f049c324ca02464c4cb9d04171c5440a160f10620432cfc7a SHA512 baead7390ecb362bb8c6c488d4e1d895104fb893134b99b3a1df3fb5a58d3367e70476c26385ef09149bbaaf8a9f3fee380ec1742c12a7fe3488edefcc9741c5
 EBUILD graphviz-0.14.1.ebuild 714 BLAKE2B b729944979869343730ea20ce1fcc9536a714c0f7deca2b75bc5a156ac865972e2dc656e220f6eb339e4aec4942c4e4f9df5b7fcadf555e0c031d47dac83b288 SHA512 d8a4b832aea3751e214b82aed64c9fd6a185123f4e2a519d57b3baf6a7f57abbba11898a0c86e3a7c728afab0b0a58b1b3728d05a907d8115b02256c8183978e
-MISC metadata.xml 527 BLAKE2B b9c6fc9921bfbde8dcde78435394cb97b88d65cd6691bffe94d03f5b22127753333a93496b206d7efa7aef31ffce26d7dd212e3f244f9d111bfc006baf4fff42 SHA512 ee156200f5de25536c3de4de57d0cdc0e01fcbf5b3ef8cd0baf15f7aeea29ce178e393c2ff3f409a93ad3dacd099664b9e72c43c259231b59668f08504c21c82
+MISC metadata.xml 552 BLAKE2B e5a314fb4006a3081b0f54b84bb35243dc1e56e6cf19b8500dc683a02e48b687c8a086785fc1aadefb6301aa7112467820c1697b141010b96ee9504213d21a61 SHA512 d8513afc41a59f83476e98b296e6150d159096939645afc964d48a95dd36e6add4b2cda9a2ef2a5034050616c5c08d6c6222f71a0a0e0f83250f2be570c1c990
diff --git a/dev-python/graphviz/metadata.xml b/dev-python/graphviz/metadata.xml
index f36ba828ecec..411953de1313 100644
--- a/dev-python/graphviz/metadata.xml
+++ b/dev-python/graphviz/metadata.xml
@@ -10,6 +10,7 @@
     descriptions in the DOT language of the Graphviz graph drawing
     software (repo) from Python.
   </longdescription>
+  <stabilize-allarches/>
   <upstream>
     <remote-id type="pypi">graphviz</remote-id>
   </upstream>
diff --git a/dev-python/greenlet/Manifest b/dev-python/greenlet/Manifest
index abb3dd2257b6..a4e247c8f415 100644
--- a/dev-python/greenlet/Manifest
+++ b/dev-python/greenlet/Manifest
@@ -1,3 +1,3 @@
 DIST greenlet-0.4.16.tar.gz 60576 BLAKE2B e0c53af4b6886fe00f0299a1779e478b7cbce5ff733669e8a62757cef49f034e19b7b932e7900b09e288ff4ab7e883fc2dd5f97f78c0e1b5702e5ba9c9f62fa1 SHA512 0dc473c05c1d54a830c009fe8197fd2017b8f3117532af0fc7970eb5abd93a82bbaa1a8403375a0ac7148fcff63cdc3faa663d0c5e442f3dd10ea3b2f98b306e
-EBUILD greenlet-0.4.16.ebuild 836 BLAKE2B 77054541432a5bf5be6ab7533e8c8aa5bd156d0e475fd4d28156ce36aab2d803ddc8c51f0b9f282d4badbd1a0a8fe1a824b63cfc28678945dd0ad34a52559dd9 SHA512 a425cb0f954ae0e35fcdc1fd3f5a013616217d060638bb22933196c380734ab62b5d1af4b2e96bdf95283d50054f17debffd520cc3657ce29d7cf564894c74f0
+EBUILD greenlet-0.4.16.ebuild 849 BLAKE2B 6c549798785b620cba7a06cabe422f3ba01a88ef5bff1b2dc786a8f859bdc5389e2e2ff63006411c69879ff9f783c5baf90d7b0ee2182996205a7fad8312eaea SHA512 dd19d494fbd42b16037b81649c43ccf1f53be9c495d04529f9f3321b06e42d6495ef1c1e7db5428fe9fbb962c262b0c01966bdf919a1185000aadec2de66925a
 MISC metadata.xml 321 BLAKE2B e625b0c7ecad0e1755cc398a1111c93434bc16c848ba4c15c11551ec1f9367c71a8f1f081409a7f09f5a3c5c6a693d5702fe2d30d371f4c431a6147b817621e6 SHA512 39b920fabdf3e6ca67ead606a859b66dfa19ab532a798755fc9406b850372d238b774ebe82e107e89b4e8e0447e5e48abb259047df62b4cd5009396ecad74548
diff --git a/dev-python/greenlet/greenlet-0.4.16.ebuild b/dev-python/greenlet/greenlet-0.4.16.ebuild
index 4766b676c6e4..fc13d115df20 100644
--- a/dev-python/greenlet/greenlet-0.4.16.ebuild
+++ b/dev-python/greenlet/greenlet-0.4.16.ebuild
@@ -19,7 +19,7 @@ IUSE="doc"
 
 DISTUTILS_IN_SOURCE_BUILD=1
 
-distutils_enable_sphinx doc
+distutils_enable_sphinx doc --no-autodoc
 
 python_compile() {
 	if ! python_is_python3; then
diff --git a/dev-python/gst-python/Manifest b/dev-python/gst-python/Manifest
index 326db15f6e18..3d91e47be740 100644
--- a/dev-python/gst-python/Manifest
+++ b/dev-python/gst-python/Manifest
@@ -2,5 +2,5 @@ AUX 1.16.2-python3.8.patch 1400 BLAKE2B 67e870a837f8fe2a2b7a5cc38ed0528a1afc5603
 DIST gst-python-1.14.1.tar.xz 405312 BLAKE2B 29be6f79b20a27e0d21f27cbf29b1881216e412c3c4ea016f3ee6bd921ec7b73139f74a20528f7f704526786347b065d246940f152d61a64e4eb926dbb44bb87 SHA512 32537e6556b69d00cb0b467239c148c0b9c282b76786be395e053a30554b84aea7c22e7fe6fc6faf77b35fca82fb799df4f52c114b282d0a6ea660f67dc40c53
 DIST gst-python-1.16.2.tar.xz 414912 BLAKE2B 016e59fc7d29047dcf49901d4ccb1ff2e96950dc723cd7e9dd31e0fe92257e881ced1c93e7e4e531320be8fb9d6cb8382d2c31e460448d5d630ec7c8a0378024 SHA512 c274591cb820a2576ca236de0d1a2c2c53a9db11afc689e0385afe3d38fadc59c9230d65198e79e4059abb90c0e5b6d71f1ee4cf1439d92feaaffd2ab5cd3a23
 EBUILD gst-python-1.14.1-r1.ebuild 1743 BLAKE2B 0b44d77f6b04dc63ca3775a096b4080d4e9936f8d1cfd14704cfbe5986af45b03156c8f1fc5015a79ef40f28ba67413bddb9edb2cace5ed94a600e14de2443bd SHA512 d5edfadd026636f2f549fdb9ddabb75853b7b98d26b553b166f65f5bb256ad42f7e83ce1c5e871490a6fb75f5a655bf7e646e10c7aa16db7dd5f4fa5b455aed5
-EBUILD gst-python-1.16.2.ebuild 1613 BLAKE2B 5a5c391957ffcd5e04047692ff87245e68be81b5626d1a2b7238ba354f1feed339bca830ba036f022a1fcf24428ecc0cbd6bafab2e47f57d423097acf6bf4cce SHA512 84046969bcbcc4182962b3babff68393f4e31b083e13cb9d74ec29883ab6971b7e150d86b80806dc28d5ad65d06be72b59770b54abf5d3320058ffe1246a1cb5
+EBUILD gst-python-1.16.2.ebuild 1611 BLAKE2B 6db4e6b87c4f14b2cbbe9823d9cb60018824073bd4aa7fc7333dc5081f2c3c18549c679de21ce0069519fbd0605f8409c2fee9f86a4cf805d593748057ce4f5a SHA512 481113d7034dbe4d402011d68ec3c8c7d9c7f39c68348a1f5120a1deb6ef03666d8bfddcc7c217a5c359be130ed4de3bb80505e45bb63eef9332626ba1369cc9
 MISC metadata.xml 272 BLAKE2B b1575d88177572e472e66c7cce4fb4c0d98aeb02edb03e800c2b2f2702b5c81c6c012c264655fce8c3170e44bfa117c81b85cdbb9f409714ab216c7a6f2b4482 SHA512 7dffa3bd729f24f9081f6b1c3db474cb26c54e95752a37140c5a9836299f26b3d0aa73e7c448e6b773478cb0112eaaf70f783d2b2f3d2868b1a2def8e6a9b8ea
diff --git a/dev-python/gst-python/gst-python-1.16.2.ebuild b/dev-python/gst-python/gst-python-1.16.2.ebuild
index 7b496ec8e5ca..ab3cb841ce5c 100644
--- a/dev-python/gst-python/gst-python-1.16.2.ebuild
+++ b/dev-python/gst-python/gst-python-1.16.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://gstreamer.freedesktop.org/src/${PN}/${P}.tar.xz"
 
 LICENSE="LGPL-2+"
 SLOT="1.0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="${PYTHON_DEPS}
diff --git a/dev-python/hpack/Manifest b/dev-python/hpack/Manifest
index baff4de5db78..8f02d58c7c5b 100644
--- a/dev-python/hpack/Manifest
+++ b/dev-python/hpack/Manifest
@@ -1,6 +1,6 @@
 AUX hpack-3.0.0-hypothesis-healthcheck.patch 549 BLAKE2B 6177deb0b6a4de5fe5f2c65a82f8cd7eb7ef6140224070c0680b6c4646c111a063ec6a8c7d51ed2e56455eede1696abf6fb82f9d6d14d5aa81d58619b0c802bd SHA512 a1510a688d000b8f45ac48c39ba46336859f952356cf776d5204b512496c523e5dc622d16b17b50d0d6318bd94b817d52683e5f56287f0053ced2508cbf23259
 DIST hpack-3.0.0.tar.gz 5305971 BLAKE2B d1df8a1b2a1ce8b91e63cab475d3957f937fb74c0bec343d342971be1bb7cfbc929c53cf041845df2965cef0cfb098345bf0612acabc7ef3e5e23f6f0aa44f2f SHA512 7b9cf5e643dff2a6454bfe419b797c8ed1a0fe6ec3b725d2696da5a820ab96fe87a64e600b1831c7024bd82616b155a0aa058301acb32172155b6538ba0a73c6
 DIST hpack-4.0.0.tar.gz 5301419 BLAKE2B 0164f6aafc0d1f17f6c397efe710503a22501faae3c7dbba4e57ca2dc76e4d373bc5e65bf55acda8bc61975d12f8a2084de0e0c4587539e5a3102e3cf66d562b SHA512 f482d086d7a82649393e3cfea55c98966ce57055cb1826bc4dec1ea334661c02708e7903f2e8e588ee1c30df41373e1de9fb960c2e7bbc18d0ace0b8f97b195b
-EBUILD hpack-3.0.0.ebuild 1134 BLAKE2B bc24b1c99733ec94dcfa3c9377dcec18d66524991ae54fc3f6cd72807cc5459edf85ff5331bc15db7ebac20a6e30803ea1e817f48ca69b7474883756bfacfd34 SHA512 ecbb4218d5fb8bcf481ce982d732622efdd72f70967625e2fe1de26595fdd424735287531b6ff10000ecc2854adb39e1574d92ab14d38afb54714ad166d8c848
+EBUILD hpack-3.0.0.ebuild 1141 BLAKE2B fa5b217246a531245d1b1c93176eed6918058252cb1d0bbf0aaed7e4575d53b87803d372c9865dfd6aae0874923d243506b2f1173c43d94a34e99b7696ee20bb SHA512 c6628c614799fda7f861d72ddb0d9768c0f877f392b8652ded30d354506711472076aa12af116de4076eb10682c29df2e5d361571ab6bf26ccf5a52b108bddd2
 EBUILD hpack-4.0.0.ebuild 704 BLAKE2B 7058a9975122825eff85502616b66f5c8c60880a90ad6c5ecf5b9c669ef89c3d4b6a3ba57882e19f3fe1bf091b407e03b9a13972fbe3a1b79903df052bfe22a9 SHA512 80ec08712faabf91b23f606e348ea4b2f9c35f22f29ab97f50d7d82445409254403d26cf1b57ae2cfe8b8387ecc06a775ef8c9c36e87ad35bc1f377bd0deab4a
 MISC metadata.xml 677 BLAKE2B 1440fcf100740188ffc8ae85da9bc014004feb2aa04d5f5db73546e62a01ffbe0975b9b588e6d579c45a2b1c803958999dbdd1cad8c1cbee597a3202556b7d4b SHA512 b7d64d3fa13e9e2f7a794aab733b511ec37809294b0c353d9cff55950dca47e57da8b5b5b80ffb0763f509a498816f94586c11dfdb569ecc6fa604f75c7a6132
diff --git a/dev-python/hpack/hpack-3.0.0.ebuild b/dev-python/hpack/hpack-3.0.0.ebuild
index e19f0adffbc8..a9c589009be3 100644
--- a/dev-python/hpack/hpack-3.0.0.ebuild
+++ b/dev-python/hpack/hpack-3.0.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/python-hyper/${PN}/archive/v${PV}.tar.gz -> ${P}.tar
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/html5lib/Manifest b/dev-python/html5lib/Manifest
index 0ddfc4ab0c39..a7ad0cc1ae9c 100644
--- a/dev-python/html5lib/Manifest
+++ b/dev-python/html5lib/Manifest
@@ -3,5 +3,5 @@ AUX html5lib-python-1.0.1-support-pytest4.patch 13579 BLAKE2B 723c8a77f200897837
 DIST html5lib-1.0.1.tar.gz 252959 BLAKE2B d2a9fa19d6a18b9e0c39f737a22ff4d5a6533734843f787c083f9497fd94788dad0e1e96478fe48b262c208370cf58e91ab94cc06a3e2757a40e936363cd3148 SHA512 35939b4450893864da04e735ee5e0addacf1dd34bae6a6909c76572abf6bfded446a78a713dfde91c1485ba45867d7abeb6a45cf0545c16ea968707be7de5dd2
 DIST html5lib-1.1.tar.gz 272215 BLAKE2B 11a4fc3fb84bf8bab4af5da1de30b0892a9eb454505716b3db391187053c9aac159b1c82ae787896592b8fc850363bba9313b9d7fc617150771c3bfa1aeadefb SHA512 af7c29591007fded99be6c38e3d0ae5a4ac32d71d26046a615918ae732cb1c1ecbf754f47ceca1a53726c3843f3ecea7af87a7362281b45ff3af495815818626
 EBUILD html5lib-1.0.1-r2.ebuild 1000 BLAKE2B f9d18a3bc62939db608535664b81d2d81e10cac020b08ac940798a036145f9e1f0156a98d3d17dbc56ad25785b9078df99be8a213b0beff3a2d03b0af8878f36 SHA512 0812c6c817aff122c8edd70d85ba51dcc8d1a751ce1ad08cdd28ef5954cfb79135a477e2a046a08dcab99ff0ecf06860d79a381ee3706af6170cdb19c9313d36
-EBUILD html5lib-1.1.ebuild 799 BLAKE2B 4e60813b397d9b5c7ade6972549ece8251f1efcca0474e346ffea9c5d56ca6463a960771a21e815a6906e996aeb32c856cdcaab95e1efd0959e4097c0fc68911 SHA512 ea62cb737dd21d2fb128035d74162af8a8a86545398aa4659c408744e756ca9f8f5fc9c8435fae56474646285225b7e9082cfc07fefa4e6de7700abbf0a8b0f7
+EBUILD html5lib-1.1.ebuild 806 BLAKE2B 75704b97487457ca6a5fe83c9e7e0b79932f3c1823f83c0a17bf86b6de8be3a28c14192b22438af69727877bccf260b079425675ebd957901c08d07ea9ab82e2 SHA512 4cb48d3f6be07d149b7e5565529878a8e3e881aa2cf1e65af1db7079ed615b4a55b5ca9a15694e111699ae9a8c271e8eb0bb0dcb013a1dea7ce891c45e3684a0
 MISC metadata.xml 614 BLAKE2B 09fb1e4c136770b5e53aecf3af9681c9155bad58e2720e6e1af9aa8d5b44c184a48bbe0d204f8af0d3e61ddf9d3b60f19ae0034d6e66b4f8683fdf7e8ecd919f SHA512 1cd9bdc5fbbedc67023c31d24901c873a9d644b8dc4f26bb5b19eda8f0fe25c413b9bf0e2b52f7e73517d744d5757881cd26bd939c39eea748dd2f84c25d983b
diff --git a/dev-python/html5lib/html5lib-1.1.ebuild b/dev-python/html5lib/html5lib-1.1.ebuild
index 32fe89fdf77e..cee55175f437 100644
--- a/dev-python/html5lib/html5lib-1.1.ebuild
+++ b/dev-python/html5lib/html5lib-1.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 IUSE="test"
 RESTRICT+=" !test? ( test )"
 
diff --git a/dev-python/httpauth/Manifest b/dev-python/httpauth/Manifest
index fe72a6813437..091dfe4ed914 100644
--- a/dev-python/httpauth/Manifest
+++ b/dev-python/httpauth/Manifest
@@ -1,3 +1,3 @@
 DIST httpauth-0.3.tar.gz 4440 BLAKE2B 41c9ba9ee50b7fcc4ed409f4b34897b5243df4065fd081cd5c0951ebe2719a34a424e59c21adbcd9be133c8fe4fa4ad9dc7bec561285b873987f982f684b3682 SHA512 aa35148322a1c5ffc22a132d3062d300118aa23181a0008018d0aacfd473758d86d50ff1236d88126858a53e2f45aeea938988b2d1a8f62f80a97d8c2cc69822
-EBUILD httpauth-0.3.ebuild 467 BLAKE2B 2e20ce5c6632d0efb81ab140c3a35163ba540db3014975ddc196e7440133833be559f1ea7fefb1d169b8616554aed8123d970b0daa6cb8b93cb34ae9221a5d45 SHA512 264a2f76aad2c562bd058b99dd967d04f7c9768d854d78d32fb135673dde2528d625d29491948b4367c6b213c5b0f3df7aa51a5e6aaf8a5cb9019e392b30ef87
+EBUILD httpauth-0.3.ebuild 469 BLAKE2B 742050d010a2c048ed5679388133bd9e028afbffd1dca4ea150d52cc29ba66d0332721632e802df8a0c8f14f41f334577886f69199c3f64bfd4305d1b33662ba SHA512 a85e77ee162c6098c35029c0fecd2e2c7cacd8503ef0b033f15f84b082fbdb30c169176042ae67fd52c2162eec7610b6ac04c212c940d63393554f4335a23229
 MISC metadata.xml 440 BLAKE2B 440d03c6243a6b43d9b8d033ad41383a2f3a1c375ad085e7c9241fc85a301ca4bdf2d1831e76dc55e6f17975e560fb90d6cd88bc1df57f31a8880068afbea80c SHA512 572f2e592e08ea0316f9df8fad23e77dc78644adb664e975631944d06d8ddb3a560724d3d241f33fd323fc83877b75506527960c4f3790fc650c88b461770a82
diff --git a/dev-python/httpauth/httpauth-0.3.ebuild b/dev-python/httpauth/httpauth-0.3.ebuild
index 5bff2d382521..79917f96a9cc 100644
--- a/dev-python/httpauth/httpauth-0.3.ebuild
+++ b/dev-python/httpauth/httpauth-0.3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( pypy3 python3_{6,7,8} )
+PYTHON_COMPAT=( pypy3 python3_{6,7,8,9} )
 DISTUTILS_USE_SETUPTOOLS=no
 
 inherit distutils-r1
diff --git a/dev-python/httpbin/Manifest b/dev-python/httpbin/Manifest
index 6167372705bb..03a940015067 100644
--- a/dev-python/httpbin/Manifest
+++ b/dev-python/httpbin/Manifest
@@ -1,5 +1,5 @@
 AUX httpbin-0.7.0-optional-raven.patch 841 BLAKE2B bdf8cd94706b08d6706349ad471212fbda7f78e7125378073e4db43af352b26778706b2c61ca51f6c1c44aae4fd250432793e0ffef463102324ed39069da20bd SHA512 757bbe80463b332571e9d6e2e3266d2db3df519a180a7d3840b6f4813c2373382519e322547feb522c59ec3893d4721e42463d8231b4f5904725b9547af407bd
 AUX httpbin-0.7.0-test-werkzeug.patch 1108 BLAKE2B a7118afed382eeedcfb3e8ff9a31b31fb80c01cf97f19948f9d208d77289f829d3ef24f4cbdde74cc87d2d640b61a51994292fcdf5058f94b8768fd4c37a3cc1 SHA512 3556b921a6daed3dc561d78912b41ca9a3cea1274384f849bba1d7cd7e7014798ce5c9e93491351ca5225e26762be03c73cd0d09c60c90b8a55ff6e6ce0bf81f
 DIST httpbin-0.7.0.tar.gz 92613 BLAKE2B 59252df1d4d0ef853ec65263b472d3ba6c597336d844f9b457f2d0a009048d4222f715a7f6fb120aca00fa641d1687e302036dc151bd2fd67ba98cf5fc47a63a SHA512 82e80058b58943637e9f8191764cea79bf7a6e40f36069f9b5d3f908585dbef20a03ef070d1f865d350920b6e874a93a48a544b05c14ff4911038ec2c20f6f63
-EBUILD httpbin-0.7.0.ebuild 1074 BLAKE2B 0f6e17a8cc92088f0e5702c89146d50494de98bfb03b7899641da929a799d9aa55cd68415a1cc841118a55bb64699df28703f39d04e5834e54d6200abd9f29c9 SHA512 b5ba2bcf91797cac502f3aef49b0485c39cc8d6d0f2114b4bde72c45f6e0e4dcbb9bcada85e665e78f8c8b41d7bda6644fad5833eb3acb284bc50eeff1b432aa
+EBUILD httpbin-0.7.0.ebuild 1081 BLAKE2B f2a4f128135a485571ab6c8da26647b6e472634fe321c3264ff4e13590921dae9ea297f26d68d4a3e34f78217326a875c14b664573ff7962eb0a217dad758a79 SHA512 ca836302816024455e919928e1354b36931c8875a05c98c8bd3b9a6685e44e7fe563d83b5c161da018f077a1ef8b9705e26bf44dab4899153c260a5779bf798c
 MISC metadata.xml 500 BLAKE2B 1270abbd84e19a72d75a2955858c49c6b33a8c92da7f86fb7853fde55968a840d941fe9f7cd1ec2718e8cbcfede6166c412aac7fc40e483043330935720dd898 SHA512 014a5e115d2cd225618e78ddf226dfe4f8772815efc3e9ecf49883701127335d9cba5e216daaba3f15de2944074c0041e5fd6eaf26772f0892da891570f841e1
diff --git a/dev-python/httpbin/httpbin-0.7.0.ebuild b/dev-python/httpbin/httpbin-0.7.0.ebuild
index 4d57e0c59304..14b625e35c9a 100644
--- a/dev-python/httpbin/httpbin-0.7.0.ebuild
+++ b/dev-python/httpbin/httpbin-0.7.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	dev-python/brotlipy[${PYTHON_USEDEP}]
diff --git a/dev-python/httplib2/Manifest b/dev-python/httplib2/Manifest
index d4a629de4096..7aa4c5db53b7 100644
--- a/dev-python/httplib2/Manifest
+++ b/dev-python/httplib2/Manifest
@@ -1,4 +1,4 @@
 AUX httplib2-0.12.1-use-system-cacerts.patch 582 BLAKE2B ee2a407452ab557eec0934a175958ac7f1d1af3ad588b7f288b9e9f0a3d2b08146fdee05943e2681a1462986098256fa818d9561a4541ba0ed3b95984172271f SHA512 ff1b982e9f95f6efa53064b2a8d2748bf5a91a26fdaeb584f044d8e036b91034dbcf4719cb08855de412d6abcc33fe82e18fbd250c14d0ae2fea47b412fcafc3
 DIST httplib2-0.18.1.tar.gz 262930 BLAKE2B d8130dfbbee71dae1319a8a65fb2ae96d667bba08cfc586c0a9239d6bf6cb475fbd4548d6b5276b8001a02417eebff4a7565024d43c630b8ed51e467cdd3de71 SHA512 a1bb527279bdc92fb75bffebc317ff549bb6efb678580cbe40d187921b7ace66b1a5bc1d98bdf065ec5667fe69632da086b0eb201ff911497324fd817bfe1b7a
-EBUILD httplib2-0.18.1.ebuild 1388 BLAKE2B 89ba39a3a5fa3a3fda83b1a5ee187b24489e5a8662cc1e82924008c32f2445736264189edd66a429cf56c5ecbd069fac72f6ef811681d401cdeae7250ab3694f SHA512 33f1ba8f543137ddc29a5fbc4e689ee329d80fe0a7cc65c2d46730c9e71e142af71b0b0ef51d4fcc3d4d8683dc569a26393821b923269a7f5e2d44a6a25eac1a
+EBUILD httplib2-0.18.1.ebuild 1387 BLAKE2B b470e527891325ad6159bdb4d5b03453096a12a47980b1007b9344b3f03ac092ed4c3177f582c87f75733b0b1fc0af9b9d6d16f0326193b20bdf8b23068e5e7e SHA512 7a3a6667c05016c7e45402f22e111364412340fca7fe434c239471dc8c7eaaaa79db31112ecad86726638db20a2fde6a019f91b1b5f717e655e2d602a8a242bb
 MISC metadata.xml 462 BLAKE2B 9e3eb8c4bcf82d868f8c77f40cb62f4b0fd8b3d32d3a61b7d46dc4161ca9ef5e39de4540ca5f22694ea3c185f9f1b0c8e32d476f6b4883f2ebd2ed7a32bb8cbd SHA512 586ff0cb09ead1571157ece3bbeec4121490f2a53d6c6925c71d31f7182e3da62efb1a16c235299669110730725802b5c1b09f39c58ae53ec97b1a7be19cf935
diff --git a/dev-python/httplib2/httplib2-0.18.1.ebuild b/dev-python/httplib2/httplib2-0.18.1.ebuild
index 7b48fb23c40a..d878ed1a9a7e 100644
--- a/dev-python/httplib2/httplib2-0.18.1.ebuild
+++ b/dev-python/httplib2/httplib2-0.18.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 
 RDEPEND="app-misc/ca-certificates"
 BDEPEND="
diff --git a/dev-python/hyper-h2/Manifest b/dev-python/hyper-h2/Manifest
index 2db23cac6a35..3011a3268ecb 100644
--- a/dev-python/hyper-h2/Manifest
+++ b/dev-python/hyper-h2/Manifest
@@ -1,3 +1,3 @@
 DIST hyper-h2-3.2.0.tar.gz 2203333 BLAKE2B 245bab162852070e850613c41162c75efe5e43535945dacf448afdc948cade83402f77259aa46f375d0772a5287e42d8842b1259cb36392cc8fc222dec7cef75 SHA512 103a4ea2cd29037ce03ae676864125b4111c7d31a82bbbe7028557da886d88fb5363d885f08d5d3f68dfa29013b7b03350cc0cb4d9dddf32735e98dae5d7fc7c
-EBUILD hyper-h2-3.2.0.ebuild 951 BLAKE2B 6824009d985a868be4acd09c0f51c8a0774d3e0c390d68220c6555a946bffe60320a67d24f7dc19aeeeee4611b0f726d065364f99fcbba1d859a0478d65e32c9 SHA512 87d7d194bad7305bc3a405759ddf297d67515644b0bc40a3926ad4ae457ca8a23543fd0070b3233fe4507878bd51c4a55f8c23f9624479563ea180d203189108
+EBUILD hyper-h2-3.2.0.ebuild 958 BLAKE2B 9cc6c4a52f3ec041d9e6072f42e5ca7d17fb51533461a184d94aa74acc30647a10c74a7fcf4c31edb652091e96d35ce04a424c1d08f75013d8482a7041d77917 SHA512 7a54002d65b303d0d359123143184c9698153d6d6e3c5dfb6cd277353065898d8ed5adc22fb2351362923e844fc3e2d7c54282a03f1f972cb945dad2404f5651
 MISC metadata.xml 693 BLAKE2B 40bdc58c6b6541754e1fb5d2b3a6fa4ffd234f84768061f7ac1c1183f2f944a72948ca54824488ed2f177d96f9a0a74dc990ff6e97e6b9dabc4602522c0d27a0 SHA512 3f083b3de6499dfc1dbe59c4aa201f7b159847cf72076e0a7a9f80b029f668dd668395c2219e01dc5035677b21e6cd60f3ccf646fbef6bf458e208a0d79cb94d
diff --git a/dev-python/hyper-h2/hyper-h2-3.2.0.ebuild b/dev-python/hyper-h2/hyper-h2-3.2.0.ebuild
index 114276642909..fcdf76ea4ecb 100644
--- a/dev-python/hyper-h2/hyper-h2-3.2.0.ebuild
+++ b/dev-python/hyper-h2/hyper-h2-3.2.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/python-hyper/${PN}/archive/v${PV}.tar.gz -> ${P}.tar
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/hyperframe/Manifest b/dev-python/hyperframe/Manifest
index 7c45dca79b9f..462e6367c1d1 100644
--- a/dev-python/hyperframe/Manifest
+++ b/dev-python/hyperframe/Manifest
@@ -1,3 +1,5 @@
 DIST hyperframe-5.2.0.tar.gz 19115 BLAKE2B 6dfd7c6e7f07eb52a499794709fb498a30bc4b534fb49d57295cf280afa200342139fa6c794613e518bbd0e2301672b05826d2adcdd7eebf528469af5e9441f7 SHA512 2e04b48c6d31adb0893a3246046b447c32f3d4485ffe9b08370b6c534ed4273c19e2e2c1a23d48268e333d91d8e911578829776076d8f73743cd9ef597926e3c
-EBUILD hyperframe-5.2.0.ebuild 528 BLAKE2B 5f23553a52f35a5f9e2a9bd98a93660b5aa1fc8be93f7cefc165b8e4fae622befd16ec7f0301cecf9d657ae7435738482d04fc90529882de4962f9ba27528144 SHA512 3428a4b717278ed9b4d30845c295371bb00529e89172b3667e32a0ca8876baa06a802ec8d744bd76f3fb9304a78c00f020a57c29eb1630b33ec3a185c9b80c22
+DIST hyperframe-6.0.0.tar.gz 24640 BLAKE2B 7b420c8bcf54510b9dabfca7c7e8718c0c547109874671d11528709572d55e463c91bae14b8cbf6db1eac99a9cceb1799050afc54b709805c9850b3083b72679 SHA512 54812dcd5bc92ebe8333e6976c2edba7309cff9921fbcbae0eda7666bf7de7758b3646f4738404bcbd069c4904e57710cb312c42ef9b6ae1d88a057b0bd0ca44
+EBUILD hyperframe-5.2.0.ebuild 535 BLAKE2B d1a96fd3469b9fbb2c64a32c38a031a4218f393a55347824c8fb2d4ef953a14f663adac1b338cf7eecd4f8a65a1b21b2de476cc6fdc801a151310ab05710e1a5 SHA512 52538c3306ca471807bcc890ead257ff37cb0f1678ff4abfa31e28424edd08b27500f7a78417120cead0fe26989a986fde17abf2677df69c019e02d0b74e002f
+EBUILD hyperframe-6.0.0.ebuild 544 BLAKE2B 9eb807c6d4875aab7010b80224741da81ff12270d7e655e63c029f6be44a482aa25f2373adc3adb38259a4eb87ddddf25a4eba028c8ad94920b4002e8ce41e63 SHA512 f4f269d7e439c148ad528ac3fb1d5b2225bcd8f70774893e128d156f105e8d67e454fe73fb782254504274f16ef750eb2c90354c3fa0698242e6771e616a1354
 MISC metadata.xml 624 BLAKE2B 8c5eb7949a6b19a3341658ac90103bfa5829ebfac29aea3c5b1bb7861a0abe6d562ef304b3182d31402a45ad142f772c2887e5969f93ab4c8301abbe0d65cd44 SHA512 11667c2401c1c98563d96e63e08f9a013330c29688219dcf502afd751cb2259c688c55cae250f5ccb676c00dcd8bdc59988ec9bc9f8f92a25a985a784031e562
diff --git a/dev-python/hyperframe/hyperframe-5.2.0.ebuild b/dev-python/hyperframe/hyperframe-5.2.0.ebuild
index 5d9af85aecb9..4684a3e1fb69 100644
--- a/dev-python/hyperframe/hyperframe-5.2.0.ebuild
+++ b/dev-python/hyperframe/hyperframe-5.2.0.ebuild
@@ -14,6 +14,6 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86"
 
 distutils_enable_tests pytest
diff --git a/dev-python/hyperframe/hyperframe-6.0.0.ebuild b/dev-python/hyperframe/hyperframe-6.0.0.ebuild
new file mode 100644
index 000000000000..7337c2d4dc4f
--- /dev/null
+++ b/dev-python/hyperframe/hyperframe-6.0.0.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8,9} )
+
+inherit distutils-r1
+
+DESCRIPTION="HTTP/2 framing layer for Python"
+HOMEPAGE="https://python-hyper.org/en/latest/
+	https://pypi.org/project/hyperframe/
+	https://github.com/python-hyper/hyperframe"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+distutils_enable_tests pytest
diff --git a/dev-python/hyperlink/Manifest b/dev-python/hyperlink/Manifest
index 9af8ec22524f..35387918817c 100644
--- a/dev-python/hyperlink/Manifest
+++ b/dev-python/hyperlink/Manifest
@@ -1,5 +1,5 @@
 DIST hyperlink-19.0.0.tar.gz 99099 BLAKE2B 1213bbc404ebf04f178e3f8b986c343f64cd6a75202942d1cfaeab640d1523388beaafcd2662f414c9fb1eb87f746f3edeb5b5e395b9fc0acb7e82697f45f7a2 SHA512 5d5723bc0bd0c381edd3a9ef7bab3ba9ad4252027d5a4afa61e6cfff3e5b8457994b6dd36ecc356e638d41f797fe3367a3010249e0e77bee6e9e94336c1e7c2e
 DIST hyperlink-20.0.1.tar.gz 140291 BLAKE2B ee8c741d4cb87e4a577e1c9a45614f5f47e086f27b60a75897b66684ab5927da73ccaba47b16b770f0277a52351cc732cf74762e29c83644c220ed59c67a18d0 SHA512 f935c09d35baf8a8a3c8d4dc6aaf64135d13dda4636187f5d47f3fe4de675498efa29cd93d802c0912db2fa371d0e58213767b1c3c42e5a14bb837ea96a72193
 EBUILD hyperlink-19.0.0.ebuild 568 BLAKE2B 50b5ab528343078e69ae3dbf0135f34b74a660618090fe7cb215535f32a4f348bd98c57baf63f972a0469318cceddce108361314e6a767cf7645a7afda564f44 SHA512 122381a0f3253cfc5e0e6511d71114e8552767d39b6b5d09ccdcedb1f56337948ea0af20f7b74b7681f415e5e68670b17c712e10e936746207c0ef165866d710
-EBUILD hyperlink-20.0.1.ebuild 670 BLAKE2B 83e8672955c293c7e6bdb3bb7378e36ca3d3d7c06015785d96cfa82d4d050372d029c5d5d258e61cea5d48a47278f6f901578c44c059c01c6b0ed4150e53ac29 SHA512 cdb48e07b8a670f2068b9210d6d831d93f3549bf77ac5795982462852635b411a8a6ff651ae3d2adc4f616ddc9619b26bc812682a161d53cfa092a1b517fb702
-MISC metadata.xml 673 BLAKE2B 054899b405550c1b1e891ad235cf2dd553275aa2d791c874073c83510123d4c995656d9777b022211369b705b3c068fa48abf2b6f3f63e5a78bd0a77fa367248 SHA512 4ddbf3e9d95f7699b5099d8c296aa3a777d9685e93e7f84734773c49d2a9174055cbed229cc0a1ddd2e10e3f414a6c93dd08eb3bfbc0717a4bf828ccf350060d
+EBUILD hyperlink-20.0.1.ebuild 668 BLAKE2B 9f518497d436bb1532b5ad5e83bf07832cf4b4b71c7b9f54788face3df46483ffcfad558c863b256997b3a59548d4b908021c6872ce07720f677080435bb3378 SHA512 cb0edd11afd2afe5676596645d995ed82580e7ec32e6efc35757301cf699e710f4e4ce18449aa37991b9c09b83d67a6cd3f4587e471bb2dadd90fd3fe4c3e598
+MISC metadata.xml 697 BLAKE2B c5362a0a1a73b8f1d2675539ceb6c13199ac14dc6365b46f268799dbac155b03a0dab0e9302e61e6ca5ce5f2e7ae58be9806f8664c117c430bb52732bf8db927 SHA512 3811b8d737d1531e1355622dd939430085e5e672bdfe36450893f46b84441fd009ba60eb46a9cef4472688070a007e1c78b2b67794eb7d5b2ef8acff2bd801f8
diff --git a/dev-python/hyperlink/hyperlink-20.0.1.ebuild b/dev-python/hyperlink/hyperlink-20.0.1.ebuild
index d1adb23821d0..d228def6b469 100644
--- a/dev-python/hyperlink/hyperlink-20.0.1.ebuild
+++ b/dev-python/hyperlink/hyperlink-20.0.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	dev-python/idna[${PYTHON_USEDEP}]"
diff --git a/dev-python/hyperlink/metadata.xml b/dev-python/hyperlink/metadata.xml
index 6db633f711cf..1650d8471c01 100644
--- a/dev-python/hyperlink/metadata.xml
+++ b/dev-python/hyperlink/metadata.xml
@@ -5,6 +5,7 @@
 		<email>python@gentoo.org</email>
 		<name>Python</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<maintainer>
 			<email>mahmoud@hatnote.com</email>
diff --git a/dev-python/hypothesis/Manifest b/dev-python/hypothesis/Manifest
index a65e3a0a4ed3..8074a62a5206 100644
--- a/dev-python/hypothesis/Manifest
+++ b/dev-python/hypothesis/Manifest
@@ -1,21 +1,13 @@
 DIST hypothesis-python-4.57.1.tar.gz 9005030 BLAKE2B 3d318896cbe2d24fa6847e764a109791d3acf3821852f8e170991b0be5b069f166e16bdacf7a82fbe49bd9db5188315cdec7cdb4592647571233949ec5732991 SHA512 28622ce8a1d89d09df65f3fbf7e92a1ad98dac140ab646fe11fcb15e6aa9a9672eb51d459f984384d92b819f902de911b06cec2542582d529dd556d2f99ed952
-DIST hypothesis-python-5.21.0.tar.gz 9025422 BLAKE2B acd6f3b0f945ae65656af2a718add06fe440e221fda7793e3557ab194ccee4c6327e7946a58ce51e9efe3c08274888a648d9021c49fdcf663a04c28b99a0f636 SHA512 1921e5ea8d0f2a6e55d80611004d35671f7a7a02cb8a8f101b45e64e4ef23f9c2c8a9c467fb6c9f33ae440622020e1ad504f51a7d725a6449ca715ad1f373e40
-DIST hypothesis-python-5.24.3.tar.gz 9050345 BLAKE2B bfb47794edb3c1c6aee22e808a6d27af52f8176d307f9a585efa0f1e0d68adf9a902ed6f67405e77c6804f18e17a76486ab42f610807f6ee97535f950318a055 SHA512 7647d14ba805ad3ff6465e1d2c6d9104560c7ea31517777ab45e07da39efefa7109215d2f4074082620554ae4aa5ce5060bca5c923d11c14718f1efdae829986
 DIST hypothesis-python-5.24.4.tar.gz 9054743 BLAKE2B 5c64c86ed58d8f0e4a07390b1b1b5e405878b9632bf14233e0515ad9d98ec6ddcc57bf39be6b61f53739d34e393b3af64c0d362880019d29a649a9523a0204e3 SHA512 147f4fa47b54bf3ec4dfcebf2a6c98cee26ea6780244ef99e181bada65978375ca7731ed05cb98f1b92f7a44a357faae374d97d489ec6e2318ff94e526cd9a40
-DIST hypothesis-python-5.27.0.tar.gz 9067945 BLAKE2B 29cd1fd1b7cd4a2258a84d4dc122284c1cc8f21da2604e3b6c800a3bb43687eed7a3eb5b33373000c7c1359a3ff08326107d878910a0d92817c0c29c743dd1fa SHA512 973ab33c69d2db58ca3550335be3cc4196ccf532ccc2c0aeb0b54459201904c06f289a9f6faa3bfa77f6704a6f43e253e34453110cda750a2a1a19a851038dda
-DIST hypothesis-python-5.28.0.tar.gz 9069739 BLAKE2B c7b404b815053441a7446c947a03a50eaf3030cb2b0387dda697e677af94b1b90e7570603ef3b4f8b26b9afbcdfc1b3708f713202c4a3617c73494f9e13781aa SHA512 7d3f7a88d70d48465a5bb6b995a73dafc4273f4a0cc3d3f2ee0ae125e1b2f52b9a840268acebf80f4dd1e86b5b5998996f2506a665f24044643a299aded0ced1
-DIST hypothesis-python-5.29.0.tar.gz 9070261 BLAKE2B 38781893d6fdf68deae890a150ca07ba5d1fb3c9ba717ea356af8b0b10b21c7e6a4b94b1ec9bca7ba5cb02b0baa18c5a773892fac342767b6dd79cbf2f89bdad SHA512 e3fc350181f86bb9669d4b0d0a43291056550bb73545070e2c7931006393895e7010050f90a063935bedb60bd18a3bad904ca92b147d81254ab50d4868adc8d0
-DIST hypothesis-python-5.29.3.tar.gz 9070885 BLAKE2B 6e106fbc6ed6719c787083c85e3047c49af94478148f4038b59d4ae130b272cffa86a2c117fd2a4f6a798255aa33b0f4714ec08baaf8fb1d5f1d0fb8d4de336a SHA512 fb820057ec257d4dd749f0c6caf10bdcc1e3a090c788900f159456620bec6bd2130e9ffad0ced0155a9f97e2186ed397fa72dbd5548b132ac2c129735c1e716d
 DIST hypothesis-python-5.29.4.tar.gz 9071060 BLAKE2B 0668f3c7859fae7024c15f693b1f56ce8d02d6f3b8187d24b2d84e38e7bdb73c0824d2b02cfecc6b40bdfbbb1c91c0aa83d40848c499a97ab7e9223aaa6c78d4 SHA512 9da4b487fd3c56540a20e2fbff635704f0720f422d8a398d0accd24a1fb9517476b0d29135b9113a96e8dc98fcfc31cc53215ad82cb727be54e4e77b44d4c8e4
-DIST hypothesis-python-5.30.0.tar.gz 9071239 BLAKE2B 7d46bc588d35bee187d9c19fafb41b290edb0e4b40022bfcdf502f96631aca7afe3beb6c4f27df27784ab1ef9903df7747284253906140835429e62b19eb1904 SHA512 03423b48aee71eceb84d838433351b48abf041ed1a9b617ea3e0059e8046f1cafd327e4ed4ec65c7893340602ea7d21572b3a8bbd059b27e1d0c9b867a6938b0
-EBUILD hypothesis-4.57.1.ebuild 1836 BLAKE2B bdb5dce13df4313f88387dcbde4209f31a7f23ddf9a6a5a3f886bf050b35f3b45e27ec349cd8baa1d3ba88e5e9200283df5b6f11c0d10fe4383d33575a682317 SHA512 b642bec77a742a13acfc480f02eec505fe0908071c55b58264e066e6ed3187ed0ed4b6d5a330db304ea45a1726f8c67a000e5ac179b63f72a79aaeda616ca2bb
-EBUILD hypothesis-5.21.0.ebuild 1604 BLAKE2B eca08db7b4e0937dbd5de78cdb420e2a5557105590415994db1b7f43b33dd006d64327c750414d076c42d609338309de94b831adeacb05c9d5c0402887bc4789 SHA512 d95ef55b76a3317fded4c9af28a4e75987263eec99063c25e926602a62a0016c09a8d7a877e43f715eb7fc4d4874388e02f01e139ca4e582ba0f658def9696aa
-EBUILD hypothesis-5.24.3.ebuild 1613 BLAKE2B 39dedc7960ce9bd835ae40279daad87a1a212f8800dcfb701cf4d118a67a7dd3807b4224ce775062d65ee5dd03447e8f02706b3c7a5c3583888be16f6ed1ed79 SHA512 4777e2e6516f0c1bbf91604e61fcd6892129cbd2af6cf27af1f4cec5391a805032f8d01f324c32348fae3856111285879f8cf89a80ecaa226b83eac222942884
-EBUILD hypothesis-5.24.4.ebuild 1613 BLAKE2B 39dedc7960ce9bd835ae40279daad87a1a212f8800dcfb701cf4d118a67a7dd3807b4224ce775062d65ee5dd03447e8f02706b3c7a5c3583888be16f6ed1ed79 SHA512 4777e2e6516f0c1bbf91604e61fcd6892129cbd2af6cf27af1f4cec5391a805032f8d01f324c32348fae3856111285879f8cf89a80ecaa226b83eac222942884
-EBUILD hypothesis-5.27.0.ebuild 1844 BLAKE2B 7a25a5c1b07603bad7984ae2baf757d2ec0ff8c9f5142db0ebc94efdc0fc2000a17a3ec99680ea5a18b4f373749df79bec73b4825359dd39b8349132cbbf1349 SHA512 45da50147532aa3d2b427146e4379ccade85900069f210d515b48fb5774d3e8505966417238edfce8d026889c522ce2a93e6f2146fd49fc421da34f86e0db5a3
-EBUILD hypothesis-5.28.0.ebuild 1851 BLAKE2B 51e077f925b25feadd790dc8865f76b33a3736c931e11fc49735fd809003025d0f4a72f1d49b1e4f8a393c17f2ba370a5c1acbc5b569eaa517b088acc9bb61b9 SHA512 bcb00e66dbdebfec49b463399b3f954314fd21dd5b08993cfacf966257bc0a39cbdda87cc402bd4048561d76325e4bbef885264bed2ce28f31e53473e8088f92
-EBUILD hypothesis-5.29.0.ebuild 1772 BLAKE2B 7c76cce2c877719567508154dd49205fdbc60ee451b16fb0d2ebb962d4578a908d95840ae922b5c35b030cdb81ff62e23e3c8d971d504707a91d04792ad292a3 SHA512 5b25512e3729fc58dc210a415543d9db565d72f927b534c8d86492c8c8ef4606d9c50abea19a61f97bb942a4e415c173863de1806c25a7e7b4862be972b609b6
-EBUILD hypothesis-5.29.3.ebuild 1747 BLAKE2B 02e1a719501fd340ee9ebe06000628e09974f8c74364bec4024b493e3249d4e4f097a11f70d7c4bffc79fb51bf2b69ea5f8a53a3aa477345c538ffd69fbf5de5 SHA512 af9963a79b9b14328db2a4459d4b84dacea6b8b89cbd9a84986889c4350b04ed994ed649cf7e30f0fcf327f1241d41836cacd82c74adca63dbd78b9a8cbe6035
-EBUILD hypothesis-5.29.4.ebuild 1759 BLAKE2B 7bac23cbf538ada8d1feccd7616f5d97803a73e8ec9ceea078d765674142650905e006a35eb68cd8cb1e725570352e7927e8afa5cf63a3167dd1e00d1cec2f9e SHA512 a914296368baa47e29afea7a95cd1113220a630fcb3281d52e9c407b885725d7007b9c4161bc04d927516636bdc6c0087b01b548e046730caf894590d16207ac
-EBUILD hypothesis-5.30.0.ebuild 1759 BLAKE2B 7bac23cbf538ada8d1feccd7616f5d97803a73e8ec9ceea078d765674142650905e006a35eb68cd8cb1e725570352e7927e8afa5cf63a3167dd1e00d1cec2f9e SHA512 a914296368baa47e29afea7a95cd1113220a630fcb3281d52e9c407b885725d7007b9c4161bc04d927516636bdc6c0087b01b548e046730caf894590d16207ac
+DIST hypothesis-python-5.35.0.tar.gz 9081292 BLAKE2B 8f1d50d76f589103f7b734cea6008b3533d3c0d62f45ab95a71f079833cb20b766d398a1b9492d592a93156d097d58c14041caf609f035b547f2234cbef2d602 SHA512 e99ce4c2801341fc43c4290afb551bcae69e0747a6b98a633b284bce009cc18d978b75a23bf22dafb39c5020595159806d5627128577770be3aad72a022549a3
+DIST hypothesis-python-5.35.2.tar.gz 9082095 BLAKE2B 6d2d2f74519975455a6d73f5d006837f7f71d162c5fe84c33afe81c7a110ecd93d2643db5b1ed8b00aec212c5c311254dcfbd66ae5bd08b077335a3754c9e9b4 SHA512 f17b7783d689986703bc6755a7dc30e8bfd4977a128954481067780d14b1b3f4bbfb21751a607a215357b5d300ad4e06ce951b81059ac8638c84005d682e2398
+DIST hypothesis-python-5.35.3.tar.gz 9084707 BLAKE2B ff0638194067a1c52a0297254be572ba66d67afa49c1f2fbcc42bff694ab4fe545d408d9144118314a6decfdffdbe950e2b72e89b689ae99b82ad3d3321e72fd SHA512 d862cba17444b36fa05877419495b5e49e8686980e0203da388e2dc4e528ace928f0bcb244afc8512f97bf466f2e5a2a421a2c873053849af61de71421d5c61a
+EBUILD hypothesis-4.57.1.ebuild 1840 BLAKE2B 4da9f9d805e6238e32c252c1aea50329b3a9bac7376f2f7c3bc89a93b354fdccdecf788ad3e404ad08b3acf6d49d89065ed52bbe70a864e62dcfbf1e2ac84a75 SHA512 99845577d9118b7d54419e0dbafcf2db1b01678f035b2b9650cdbd33ae1029707d6016f2f614ce12df11728deb9c975fa6101c7d0208dc36a0334f7b577bfc16
+EBUILD hypothesis-5.24.4.ebuild 1608 BLAKE2B c52cd842682347491245d4560fba737a85f8dd46e93416047c2bff5ff4dcde85bd337d7e7c65556e61d97bb1c2a1270652bf3dec8126049daa01215ed1424b3f SHA512 7d3450fa374c88dd6206663341a1437d177a7cfe5b0eb99161a85f4e62b97020843e052d28ae0975628d8c299655a35b86ba51cf67bacd296e839d949c06f785
+EBUILD hypothesis-5.29.4.ebuild 1782 BLAKE2B 7088d5f99f70a5195711fe19904daeb3286292e85f2c4b00b3c8f0b87ecea5f17e595f1204fad1f326847688da324d0a747d0b99c0fe0313c0c1330fe1569b2d SHA512 9bec8bf52fff95e4e4c5244c41f8987cc41f6a90d0a5ffaf4af1ce929601536752cf7a03180a626d343bea25c7016e3f40e4dae651b7e5ffb4c5aac60f6c4b15
+EBUILD hypothesis-5.35.0.ebuild 1796 BLAKE2B 3962807fed780a205f7ad0aa29d18c19cfe3b15ee2a96a6581e420cd67deb9b81984cec05d3445d27e689a613161a7bc03526c801ef6888a086b882ade089e54 SHA512 5555a953cdae1e0c70b5231c9ea9d14385b083135c585a2cd9cdf6dcd68d8ab051c541ef7c5d3c91bc5186e31c45abf485783ab00a7e3ee17338e8554ea57e33
+EBUILD hypothesis-5.35.2.ebuild 1796 BLAKE2B 3962807fed780a205f7ad0aa29d18c19cfe3b15ee2a96a6581e420cd67deb9b81984cec05d3445d27e689a613161a7bc03526c801ef6888a086b882ade089e54 SHA512 5555a953cdae1e0c70b5231c9ea9d14385b083135c585a2cd9cdf6dcd68d8ab051c541ef7c5d3c91bc5186e31c45abf485783ab00a7e3ee17338e8554ea57e33
+EBUILD hypothesis-5.35.3.ebuild 1796 BLAKE2B 3962807fed780a205f7ad0aa29d18c19cfe3b15ee2a96a6581e420cd67deb9b81984cec05d3445d27e689a613161a7bc03526c801ef6888a086b882ade089e54 SHA512 5555a953cdae1e0c70b5231c9ea9d14385b083135c585a2cd9cdf6dcd68d8ab051c541ef7c5d3c91bc5186e31c45abf485783ab00a7e3ee17338e8554ea57e33
 MISC metadata.xml 755 BLAKE2B da1fcfe4509905d2058d448b0178dacbb87026a3542368d8aa3ffca38edf1cd3d76d9542f8badc0220f5b5c916fdbb054f65b054a361977e0258e475768e3cf3 SHA512 3f046788581ef05937ec8376538cc60628f9d8e25486fc6e4421dd8461a9a085f51540e1d5203ccf85007adf1a978a23da9ac39cc486d698967412eeb3f2a793
diff --git a/dev-python/hypothesis/hypothesis-4.57.1.ebuild b/dev-python/hypothesis/hypothesis-4.57.1.ebuild
index dbb3ff9d7f15..0a1109d059e1 100644
--- a/dev-python/hypothesis/hypothesis-4.57.1.ebuild
+++ b/dev-python/hypothesis/hypothesis-4.57.1.ebuild
@@ -7,7 +7,7 @@ DISTUTILS_USE_SETUPTOOLS=rdepend
 PYTHON_COMPAT=( python2_7 python3_{6,7,8,9} pypy3 )
 PYTHON_REQ_USE="threads(+),sqlite"
 
-inherit distutils-r1 eutils
+inherit distutils-r1 optfeature
 
 DESCRIPTION="A library for property based testing"
 HOMEPAGE="https://github.com/HypothesisWorks/hypothesis https://pypi.org/project/hypothesis/"
diff --git a/dev-python/hypothesis/hypothesis-5.21.0.ebuild b/dev-python/hypothesis/hypothesis-5.21.0.ebuild
deleted file mode 100644
index b36d0b119e67..000000000000
--- a/dev-python/hypothesis/hypothesis-5.21.0.ebuild
+++ /dev/null
@@ -1,56 +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,7,8,9} pypy3 )
-PYTHON_REQ_USE="threads(+),sqlite"
-
-inherit distutils-r1 eutils
-
-DESCRIPTION="A library for property based testing"
-HOMEPAGE="https://github.com/HypothesisWorks/hypothesis https://pypi.org/project/hypothesis/"
-SRC_URI="https://github.com/HypothesisWorks/${PN}/archive/${PN}-python-${PV}.tar.gz"
-S="${WORKDIR}/${PN}-${PN}-python-${PV}/${PN}-python"
-
-LICENSE="MPL-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 s390 sparc x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
-	>=dev-python/sortedcontainers-2.1.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		${RDEPEND}
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pexpect[${PYTHON_USEDEP}]
-		>=dev-python/pytest-5.3.5[${PYTHON_USEDEP}]
-		!!<dev-python/typing-3.7.4.1
-	)
-"
-
-src_prepare() {
-	# avoid pytest-xdist dep for one test
-	sed -i -e 's:test_prints_statistics_given_option_under_xdist:_&:' \
-		tests/pytest/test_statistics.py || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	pytest -vv tests/cover tests/pytest tests/quality ||
-		die "Tests fail with ${EPYTHON}"
-}
-
-pkg_postinst() {
-	optfeature "datetime support" dev-python/pytz
-	optfeature "dateutil support" dev-python/python-dateutil
-	optfeature "numpy support" dev-python/numpy
-	optfeature "django support" dev-python/django dev-python/pytz
-	optfeature "pandas support" dev-python/pandas
-	optfeature "pytest support" dev-python/pytest
-}
diff --git a/dev-python/hypothesis/hypothesis-5.24.3.ebuild b/dev-python/hypothesis/hypothesis-5.24.3.ebuild
deleted file mode 100644
index 54efc2972e96..000000000000
--- a/dev-python/hypothesis/hypothesis-5.24.3.ebuild
+++ /dev/null
@@ -1,56 +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,7,8,9} pypy3 )
-PYTHON_REQ_USE="threads(+),sqlite"
-
-inherit distutils-r1 eutils
-
-DESCRIPTION="A library for property based testing"
-HOMEPAGE="https://github.com/HypothesisWorks/hypothesis https://pypi.org/project/hypothesis/"
-SRC_URI="https://github.com/HypothesisWorks/${PN}/archive/${PN}-python-${PV}.tar.gz"
-S="${WORKDIR}/${PN}-${PN}-python-${PV}/${PN}-python"
-
-LICENSE="MPL-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
-	>=dev-python/sortedcontainers-2.1.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		${RDEPEND}
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pexpect[${PYTHON_USEDEP}]
-		>=dev-python/pytest-5.3.5[${PYTHON_USEDEP}]
-		!!<dev-python/typing-3.7.4.1
-	)
-"
-
-src_prepare() {
-	# avoid pytest-xdist dep for one test
-	sed -i -e 's:test_prints_statistics_given_option_under_xdist:_&:' \
-		tests/pytest/test_statistics.py || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	pytest -vv tests/cover tests/pytest tests/quality ||
-		die "Tests fail with ${EPYTHON}"
-}
-
-pkg_postinst() {
-	optfeature "datetime support" dev-python/pytz
-	optfeature "dateutil support" dev-python/python-dateutil
-	optfeature "numpy support" dev-python/numpy
-	optfeature "django support" dev-python/django dev-python/pytz
-	optfeature "pandas support" dev-python/pandas
-	optfeature "pytest support" dev-python/pytest
-}
diff --git a/dev-python/hypothesis/hypothesis-5.24.4.ebuild b/dev-python/hypothesis/hypothesis-5.24.4.ebuild
index 54efc2972e96..aa35615cd316 100644
--- a/dev-python/hypothesis/hypothesis-5.24.4.ebuild
+++ b/dev-python/hypothesis/hypothesis-5.24.4.ebuild
@@ -7,7 +7,7 @@ DISTUTILS_USE_SETUPTOOLS=rdepend
 PYTHON_COMPAT=( python3_{6,7,8,9} pypy3 )
 PYTHON_REQ_USE="threads(+),sqlite"
 
-inherit distutils-r1 eutils
+inherit distutils-r1 optfeature
 
 DESCRIPTION="A library for property based testing"
 HOMEPAGE="https://github.com/HypothesisWorks/hypothesis https://pypi.org/project/hypothesis/"
@@ -16,7 +16,7 @@ S="${WORKDIR}/${PN}-${PN}-python-${PV}/${PN}-python"
 
 LICENSE="MPL-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 s390 sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/hypothesis/hypothesis-5.27.0.ebuild b/dev-python/hypothesis/hypothesis-5.27.0.ebuild
deleted file mode 100644
index fcf6b2610385..000000000000
--- a/dev-python/hypothesis/hypothesis-5.27.0.ebuild
+++ /dev/null
@@ -1,68 +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,7,8,9} pypy3 )
-PYTHON_REQ_USE="threads(+),sqlite"
-
-inherit distutils-r1 eutils
-
-DESCRIPTION="A library for property based testing"
-HOMEPAGE="https://github.com/HypothesisWorks/hypothesis https://pypi.org/project/hypothesis/"
-SRC_URI="https://github.com/HypothesisWorks/${PN}/archive/${PN}-python-${PV}.tar.gz"
-S="${WORKDIR}/${PN}-${PN}-python-${PV}/${PN}-python"
-
-LICENSE="MPL-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~x86"
-IUSE="cli test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
-	>=dev-python/sortedcontainers-2.1.0[${PYTHON_USEDEP}]
-	cli? (
-		$(python_gen_cond_dep '
-			dev-python/black[${PYTHON_USEDEP}]
-			dev-python/click[${PYTHON_USEDEP}]
-		' python3_{6..8})
-	)
-"
-BDEPEND="
-	test? (
-		${RDEPEND}
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pexpect[${PYTHON_USEDEP}]
-		>=dev-python/pytest-5.3.5[${PYTHON_USEDEP}]
-		!!<dev-python/typing-3.7.4.1
-	)
-"
-
-src_prepare() {
-	# avoid pytest-xdist dep for one test
-	sed -i -e 's:test_prints_statistics_given_option_under_xdist:_&:' \
-		tests/pytest/test_statistics.py || die
-	distutils-r1_src_prepare
-}
-
-python_prepare() {
-	if ! use cli || [[ ${EPYTHON} != python3.[678] ]]; then
-		sed -i -e '/console_scripts/d' setup.py || die
-	fi
-}
-
-python_test() {
-	pytest -vv tests/cover tests/pytest tests/quality ||
-		die "Tests fail with ${EPYTHON}"
-}
-
-pkg_postinst() {
-	optfeature "datetime support" dev-python/pytz
-	optfeature "dateutil support" dev-python/python-dateutil
-	optfeature "numpy support" dev-python/numpy
-	optfeature "django support" dev-python/django dev-python/pytz
-	optfeature "pandas support" dev-python/pandas
-	optfeature "pytest support" dev-python/pytest
-}
diff --git a/dev-python/hypothesis/hypothesis-5.28.0.ebuild b/dev-python/hypothesis/hypothesis-5.28.0.ebuild
deleted file mode 100644
index c80c7aa009cf..000000000000
--- a/dev-python/hypothesis/hypothesis-5.28.0.ebuild
+++ /dev/null
@@ -1,68 +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,7,8,9} pypy3 )
-PYTHON_REQ_USE="threads(+),sqlite"
-
-inherit distutils-r1 eutils
-
-DESCRIPTION="A library for property based testing"
-HOMEPAGE="https://github.com/HypothesisWorks/hypothesis https://pypi.org/project/hypothesis/"
-SRC_URI="https://github.com/HypothesisWorks/${PN}/archive/${PN}-python-${PV}.tar.gz"
-S="${WORKDIR}/${PN}-${PN}-python-${PV}/${PN}-python"
-
-LICENSE="MPL-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc64 ~x86"
-IUSE="cli test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
-	>=dev-python/sortedcontainers-2.1.0[${PYTHON_USEDEP}]
-	cli? (
-		$(python_gen_cond_dep '
-			dev-python/black[${PYTHON_USEDEP}]
-			dev-python/click[${PYTHON_USEDEP}]
-		' python3_{6..8})
-	)
-"
-BDEPEND="
-	test? (
-		${RDEPEND}
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pexpect[${PYTHON_USEDEP}]
-		>=dev-python/pytest-5.3.5[${PYTHON_USEDEP}]
-		!!<dev-python/typing-3.7.4.1
-	)
-"
-
-src_prepare() {
-	# avoid pytest-xdist dep for one test
-	sed -i -e 's:test_prints_statistics_given_option_under_xdist:_&:' \
-		tests/pytest/test_statistics.py || die
-	distutils-r1_src_prepare
-}
-
-python_prepare() {
-	if ! use cli || [[ ${EPYTHON} != python3.[678] ]]; then
-		sed -i -e '/console_scripts/d' setup.py || die
-	fi
-}
-
-python_test() {
-	pytest -vv tests/cover tests/pytest tests/quality ||
-		die "Tests fail with ${EPYTHON}"
-}
-
-pkg_postinst() {
-	optfeature "datetime support" dev-python/pytz
-	optfeature "dateutil support" dev-python/python-dateutil
-	optfeature "numpy support" dev-python/numpy
-	optfeature "django support" dev-python/django dev-python/pytz
-	optfeature "pandas support" dev-python/pandas
-	optfeature "pytest support" dev-python/pytest
-}
diff --git a/dev-python/hypothesis/hypothesis-5.29.4.ebuild b/dev-python/hypothesis/hypothesis-5.29.4.ebuild
index 9fb996f97f0a..5065388770fa 100644
--- a/dev-python/hypothesis/hypothesis-5.29.4.ebuild
+++ b/dev-python/hypothesis/hypothesis-5.29.4.ebuild
@@ -7,7 +7,7 @@ DISTUTILS_USE_SETUPTOOLS=rdepend
 PYTHON_COMPAT=( python3_{6,7,8,9} pypy3 )
 PYTHON_REQ_USE="threads(+),sqlite"
 
-inherit distutils-r1 eutils multiprocessing
+inherit distutils-r1 multiprocessing optfeature
 
 DESCRIPTION="A library for property based testing"
 HOMEPAGE="https://github.com/HypothesisWorks/hypothesis https://pypi.org/project/hypothesis/"
@@ -16,7 +16,7 @@ S="${WORKDIR}/${PN}-${PN}-python-${PV}/${PN}-python"
 
 LICENSE="MPL-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="cli test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/hypothesis/hypothesis-5.30.0.ebuild b/dev-python/hypothesis/hypothesis-5.35.0.ebuild
index 9fb996f97f0a..c8d53477c0bc 100644
--- a/dev-python/hypothesis/hypothesis-5.30.0.ebuild
+++ b/dev-python/hypothesis/hypothesis-5.35.0.ebuild
@@ -7,7 +7,7 @@ DISTUTILS_USE_SETUPTOOLS=rdepend
 PYTHON_COMPAT=( python3_{6,7,8,9} pypy3 )
 PYTHON_REQ_USE="threads(+),sqlite"
 
-inherit distutils-r1 eutils multiprocessing
+inherit distutils-r1 eutils multiprocessing optfeature
 
 DESCRIPTION="A library for property based testing"
 HOMEPAGE="https://github.com/HypothesisWorks/hypothesis https://pypi.org/project/hypothesis/"
@@ -16,7 +16,7 @@ S="${WORKDIR}/${PN}-${PN}-python-${PV}/${PN}-python"
 
 LICENSE="MPL-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
 IUSE="cli test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/hypothesis/hypothesis-5.29.3.ebuild b/dev-python/hypothesis/hypothesis-5.35.2.ebuild
index 19018a948f1d..c8d53477c0bc 100644
--- a/dev-python/hypothesis/hypothesis-5.29.3.ebuild
+++ b/dev-python/hypothesis/hypothesis-5.35.2.ebuild
@@ -7,7 +7,7 @@ DISTUTILS_USE_SETUPTOOLS=rdepend
 PYTHON_COMPAT=( python3_{6,7,8,9} pypy3 )
 PYTHON_REQ_USE="threads(+),sqlite"
 
-inherit distutils-r1 eutils multiprocessing
+inherit distutils-r1 eutils multiprocessing optfeature
 
 DESCRIPTION="A library for property based testing"
 HOMEPAGE="https://github.com/HypothesisWorks/hypothesis https://pypi.org/project/hypothesis/"
@@ -16,7 +16,7 @@ S="${WORKDIR}/${PN}-${PN}-python-${PV}/${PN}-python"
 
 LICENSE="MPL-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
 IUSE="cli test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/hypothesis/hypothesis-5.29.0.ebuild b/dev-python/hypothesis/hypothesis-5.35.3.ebuild
index 89b2b4ea6b8b..c8d53477c0bc 100644
--- a/dev-python/hypothesis/hypothesis-5.29.0.ebuild
+++ b/dev-python/hypothesis/hypothesis-5.35.3.ebuild
@@ -7,7 +7,7 @@ DISTUTILS_USE_SETUPTOOLS=rdepend
 PYTHON_COMPAT=( python3_{6,7,8,9} pypy3 )
 PYTHON_REQ_USE="threads(+),sqlite"
 
-inherit distutils-r1 eutils multiprocessing
+inherit distutils-r1 eutils multiprocessing optfeature
 
 DESCRIPTION="A library for property based testing"
 HOMEPAGE="https://github.com/HypothesisWorks/hypothesis https://pypi.org/project/hypothesis/"
@@ -16,7 +16,7 @@ S="${WORKDIR}/${PN}-${PN}-python-${PV}/${PN}-python"
 
 LICENSE="MPL-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
 IUSE="cli test"
 RESTRICT="!test? ( test )"
 
@@ -27,7 +27,7 @@ RDEPEND="
 		$(python_gen_cond_dep '
 			dev-python/black[${PYTHON_USEDEP}]
 			dev-python/click[${PYTHON_USEDEP}]
-		' python3_{6..8})
+		' python3_{6..9})
 	)
 "
 BDEPEND="
@@ -42,7 +42,7 @@ BDEPEND="
 "
 
 python_prepare() {
-	if ! use cli || [[ ${EPYTHON} != python3.[678] ]]; then
+	if ! use cli || [[ ${EPYTHON} != python* ]]; then
 		sed -i -e '/console_scripts/d' setup.py || die
 	fi
 }
diff --git a/dev-python/icalendar/Manifest b/dev-python/icalendar/Manifest
index 884990e730cc..87c3beee20e7 100644
--- a/dev-python/icalendar/Manifest
+++ b/dev-python/icalendar/Manifest
@@ -1,3 +1,5 @@
 DIST icalendar-4.0.6.tar.gz 78418 BLAKE2B 4941262cca63cae4df249b6ec01b73b640caa002d011ed19aead89fdfc6fe9a7e37258d95668142137faf635403986a2ea4d3e39dd565d1205dfb238fd13e98f SHA512 e8f7ee878cc14b75636268d7b8c79569ce1875142fb907b1eb74bc6b9cf96f218e4be63828190aa2a27978c431437c1d454febe9a2da58c5f2785e283ae725b2
+DIST icalendar-4.0.7.tar.gz 78569 BLAKE2B b5d980335b1a9d8135ad9ec037e140f3ae49c3e8db6736b9e469748e3bd51c43f39fc5f9dc443de46d4d4c5856ec74bb548a8d1b47b7e52278fdc2e269be0cbe SHA512 97f7184ddc42ade2a447af5112f5bd18ea9a89ef25ea3983cc2213fefe2c59255102b7babcd49b3e04cbe435d75d2712dd57eebc1bf1c20c54aae7081ba24379
 EBUILD icalendar-4.0.6.ebuild 816 BLAKE2B 89c131e1e5d9d00b84211762e9972502d531342bc33af5a606171d53d92675764a8a5b17d8c1eb6f1829bde4082e93f89385cdf31db7b6021b6e41a12535b0dc SHA512 c2f8f909dd23f0b47be19bf3281c8026d0fcd930ea0da2fef069a5596cffc40e1ac4bdfd753a42773120a399ab678ab75cf046831065a79aac59db72a5c0471f
+EBUILD icalendar-4.0.7.ebuild 818 BLAKE2B a309fa950247ca9095e91d24a28fd5778b8b6c2e4790a2b5fcc732ed1b64c372a7a5d3a0287e37c2c9a561628d0baaddb9ea8348c40c053e2d8d1b4f2e5d158a SHA512 c5abca0b72f30895f044b56930c91a15504c8e1ff9558d1916432658dc39ea8436a246e668e902b5f0ddb33553bde2488accadce6d6ec4e2ba29f6d43d026a4d
 MISC metadata.xml 502 BLAKE2B f370ac279a7af56233a313f68da17d2c2f03fa6028fa05b1bef93cfd52fc3fc2808409b86df3c3597939c7e0778513067ce643c456ae74f8a6cfff5d4fb83efd SHA512 e345c6c50e5c496bf50e2d0a5c4134ad57a85a7b43867359fb152962d75a0ff2ab69beed9bd9522bab68f8e98125b37c812ac00394d55a0bc4297c21c9af90a2
diff --git a/dev-python/icalendar/icalendar-4.0.7.ebuild b/dev-python/icalendar/icalendar-4.0.7.ebuild
new file mode 100644
index 000000000000..4b472fff1bc1
--- /dev/null
+++ b/dev-python/icalendar/icalendar-4.0.7.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+PYTHON_COMPAT=( python3_{6,7,8,9} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+DESCRIPTION="Package used for parsing and generating iCalendar files (RFC 2445)"
+HOMEPAGE="https://github.com/collective/icalendar"
+SRC_URI="mirror://pypi/i/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+RDEPEND="
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	dev-python/pytz[${PYTHON_USEDEP}]"
+
+distutils_enable_sphinx docs
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# reset conf.py to not read version from an installed instance
+	sed -e "s:pkg_resources.get_distribution('icalendar').version:'${PV}':" \
+		-i docs/conf.py || die
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/idna-ssl/Manifest b/dev-python/idna-ssl/Manifest
index 77f3190f179b..84966b9f08d8 100644
--- a/dev-python/idna-ssl/Manifest
+++ b/dev-python/idna-ssl/Manifest
@@ -1,3 +1,3 @@
 DIST idna-ssl-1.1.0.gh.tar.gz 5267 BLAKE2B 07912379da74e4711f291a54bd0878e08d8820005b055f9b978a684b8263a801a7fb9ccbbf395aa226e009b3ebfe4a7cca11861502a9b859446279b111911209 SHA512 01e58e9f32f7e02ef203edbd76e199916ea0b16d01a929ca2fb272d83988483c17e9c36e131f47bfba7f7b657bef9e2be222f81800716a5b87d5847c27cce34d
-EBUILD idna-ssl-1.1.0.ebuild 838 BLAKE2B 876e8985acc596d17adb7d7f5ab89211d197f6ad3597fa2aa3be50b2987c1b937e6557e5aecf344379ac8c044b2f5881d5201fc80f28813cf329ef326cbc174d SHA512 07f34216db9bb0d61961fbdd852a16e37348ce5e90356b3ee452fb83e7f203d084f3b1fa55e4915cfabeff4e9383947ddd286ed67d41dabd4f2e22bd6700a252
+EBUILD idna-ssl-1.1.0.ebuild 857 BLAKE2B e43687a4cf70d0759f56bcfe5f01997dd8e45a6e06ae7b8161736cc15fff28b34603de2aa93addaae55c4d5e4316607636ccad7f10741e4e422e6cf32411d14e SHA512 fbf482d78ff4a208add93753b03a694f49d9370e46d6c1f79b64adb4234bb6396711fec7903513b4b992ef27ee6be0c0f1fd104be293d4ff1746673703f5fd2c
 MISC metadata.xml 368 BLAKE2B b2f78fb9dea9edf6f2b2a7fb72412302b014e8b1b536653ae12fcd2bc8fa94bb253ff780aedcfd32fcddfcc2030b363e12440dfa4efef1a886e99b8b0acd8dba SHA512 531bbcdb7ec492aa4c38f4352cb0a93c618c60d9f8920ff476f6f8b7991744ccba2188a9e441e696a02d1c4ef4ea9af3afeb2c81a0d046e700796ee45b7f3888
diff --git a/dev-python/idna-ssl/idna-ssl-1.1.0.ebuild b/dev-python/idna-ssl/idna-ssl-1.1.0.ebuild
index 2bdc61050ddb..802b3e0ff9ac 100644
--- a/dev-python/idna-ssl/idna-ssl-1.1.0.ebuild
+++ b/dev-python/idna-ssl/idna-ssl-1.1.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="
 
 SLOT="0"
 LICENSE="MIT"
-KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86"
 IUSE=""
 
 RDEPEND="dev-python/idna[${PYTHON_USEDEP}]"
diff --git a/dev-python/idna/Manifest b/dev-python/idna/Manifest
index af0665ba6221..57f7fe0438e9 100644
--- a/dev-python/idna/Manifest
+++ b/dev-python/idna/Manifest
@@ -1,5 +1,5 @@
 DIST idna-2.10.tar.gz 175616 BLAKE2B 2b109491a5751811e6e85244133a1c66b04b577441c250e600a9cb58511f4a0350f9dc386c64ce40464bf644c7434187c61e747c8e9a422443a740ebb766fe22 SHA512 83b412de2f79a4bc86fb4bdac7252521b9d84f0be54f4fb1bde1ee13a210bbfa4b1a98247affbc7921046fb117a591316c12694c1be72865767646554c5207ac
 DIST idna-2.8.tar.gz 174481 BLAKE2B 68e5dddaae30097522e4e661438d7f89a391c5a0e2f72a99e1da88e0af9380f15958d5315fccb4221e7d44a6390a7b0daa537a4752c26cd915bf2d433a4f7cc4 SHA512 8ca5cfe6350c51250bafdac7c6e4ddd54c4a5d6bf7acbcef896760a759868c8e9df1fdf550121d8512fa3eb316dcf031ec6058e03b4f66eadee21b63e2187d33
-EBUILD idna-2.10.ebuild 641 BLAKE2B 47e15fc27ce9257455364799ef3f7ab2947559257866e404a2e9e4e28c16032cbb54ae47d0c9cf15f5338d98b402444695205fc4410ee9b3320ad1013741cf30 SHA512 0f09ff321413c13a831e04ff54bca648c008a0f08c79b1a82a451f7d4e6f1f9f23126082ba1ebff299c0a4b911a3ab728e550ed398c649f5db0137ffb9e30382
+EBUILD idna-2.10.ebuild 648 BLAKE2B e13bfef64041be0416a6a611264980fb84b8208b011742744a7e49487d36a82c79f4edb9e0b93cad48428bc8fc5912f935c0e4a1dccc505266db56879509f6f3 SHA512 27407c4a9745a0c3558e07d83561238f69f5742a36b7d62a411cb9682f029a6b713431d5f16b82c8bd77b0073b7c3b9deaf0312ac38d5bf6180456f579b8f17e
 EBUILD idna-2.8.ebuild 691 BLAKE2B af17b44ed061c888ebcd1af6693d658403ba1c6eea0bea1e7e76036f9f4c013c8f2fb32f7fddba1f5ed049d5c9e04aab58fbf93aed74a34278fc905770aaf381 SHA512 7d32611ae1725f8eb2443aadaa9c23f5ed8e72fce06db75baf20098ec4f485104cba4e726748321d6f2b909cbd5b4bc6e10b8c08ad8bdb4931eafaaaf1d540b2
 MISC metadata.xml 392 BLAKE2B 3dc0422f56bcbb74b91e6366e35e0393e420321140b9589777e261b3169e837caffa3c6703306cdfc3f3d7d4e77a84b132650b17df485e02bce906992c49fbd0 SHA512 ac8113778dc4e03045ab53beeefacb748df94329289d09a2e49a0df6328c24b864be241e24377ce23173f9f7662f7fc18ce7e4a99e4b6a935db68ffb9fa958b7
diff --git a/dev-python/idna/idna-2.10.ebuild b/dev-python/idna/idna-2.10.ebuild
index 12c884cff34c..5693a53ff468 100644
--- a/dev-python/idna/idna-2.10.ebuild
+++ b/dev-python/idna/idna-2.10.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="BSD"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 distutils_enable_tests setup.py
diff --git a/dev-python/ifaddr/Manifest b/dev-python/ifaddr/Manifest
index b9176c42edc5..8232afce9f30 100644
--- a/dev-python/ifaddr/Manifest
+++ b/dev-python/ifaddr/Manifest
@@ -1,3 +1,3 @@
 DIST ifaddr-0.1.6.tar.gz 6526 BLAKE2B d30b955d42d0266a197214bbe16ff2a8b11e33b4305ae9ed128fca6719e2c86026c97b278b0abaf5f5f35f4c9b744e5b500b4a4c1783dede0ebd4aedff62803f SHA512 911f81c32e808b9e61f7e98b8c67dc9b40cb64de864843cd7239f08538c9ff7cd45c8f16428b2ce200ea5f213a539c7ed8479432e02feb5e82e917f838ee0cb6
 EBUILD ifaddr-0.1.6.ebuild 495 BLAKE2B a0d4a7424cf24383fb55b029def2a132888e59ad856e7c1ed5d01fc8154a8d29e59cae2fbad0b65cff60fb88497ff4af09789745568d7590a1ce6ad777ad2580 SHA512 89dc28f0d849280c51cdf1ad30b020ef2b4d753814be14d780bea99072fe11addfd1c09f3f35abd106e83ac78b7c80811a6a16c3655c501fe9724bc4bd0e3497
-MISC metadata.xml 452 BLAKE2B f30dc1cb3a45142daaab071a2397a6210c3aa48b363228a25b6bb5d11f331506a78e1d52f79780f6be6c160e6e8f9a6cf1f81e11dbab2f879a916b3745495d4e SHA512 528af68f1d6a498593329c687dffa4bf624d4de2144d1af1563d7424207fc0eaa1a6ccdfa4580c3e5cd2d0225394afd152543ebfd2af000a4796c6d36329eed7
+MISC metadata.xml 333 BLAKE2B 1a681ac99aee289a919b530bb87037df6fe53b044ce14ce3a9da3cec54a73d7fde58cf01f12678f18397d16b56c9e5bf88d289ddec4469e343d7193502124124 SHA512 a73512d246562e6591eb9c8d13759352cede7f0ae978d02c87bd72b1fe2c9b155cc3908e8489b136387bada61f1257d8e0771e01e26d998b51f9ce13c087ec41
diff --git a/dev-python/ifaddr/metadata.xml b/dev-python/ifaddr/metadata.xml
index 93a15d138a16..3ee70120def4 100644
--- a/dev-python/ifaddr/metadata.xml
+++ b/dev-python/ifaddr/metadata.xml
@@ -8,7 +8,4 @@
 		<email>prometheanfire@gentoo.org</email>
 		<name>Matthew Thode</name>
 	</maintainer>
-	<longdescription lang="en">
-			Enumerates all IP addresses on all network adapters of the system.
-	</longdescription>
 </pkgmetadata>
diff --git a/dev-python/ijson/Manifest b/dev-python/ijson/Manifest
index 3243b0aa3b8d..a6fdaec58132 100644
--- a/dev-python/ijson/Manifest
+++ b/dev-python/ijson/Manifest
@@ -1,3 +1,5 @@
+DIST ijson-3.1.1.tar.gz 124875 BLAKE2B 6f20efa076cf9e9a9f22eec65c7658440cc2ddffc2bf88054025f76f2df48e395d1c11a52501a45e7b5301448ce5874fb3e62d9111963f49f976ee68836c39d1 SHA512 c693444ac757c3b6e1f762d4a877a82b11ccaaecc922d34b868d236a78d9cf8f8648cb6d1188f0444caf61a0758f3080d3bfbd79c1ee51114bbd7c0a34bc633e
 DIST ijson-3.1_p0.tar.gz 123536 BLAKE2B d8ed0da77e219aee8ca287a2ede4eccd8e965a5778ff95485376bcfdcca07b48ae5c0e22b271fad0a489342403b11716971663158f340c97b80031bb2cc8c060 SHA512 af2db5b3c9f2cc93aa2d15462b6476a970e5c394a8f5bd9740ebbe134e8a2fa973c95057447bd02d3c4262ddf22fc7d231840d3a91b919a1411bae07d38cfd93
+EBUILD ijson-3.1.1.ebuild 575 BLAKE2B 633eb85b0e1936d5a87473e7d9f24023aefe242fdcb1de5fb1415539b9bc3a1e7416c1019c580405d6cc64a3f9abf8ddeb859212791665647c001164d290bd5b SHA512 1b3998e74c3d4f7ae0fe006f5039740e1f1a13b6a6ed082867154f0feb41c77cf9cc6d355453b09781d1bfe97a1f817d356489a88e2cf6272442f8e3c7fb3845
 EBUILD ijson-3.1_p0.ebuild 567 BLAKE2B aa5e2d500abc067150057f03d9a7f86075b3e73fc98ac8dafdd240cea6b0e8a9520e02076af4c5d82e4f1f0e7be6efa2711f821ab283bf14f591864cfae470ec SHA512 391cf793bed0be5cfc7904abbb32da7aaf0bd9ee2a177e76cf6b0f5bca0671a8e93254216110d18da9e6cb627c561c58033b26258dfe5f93e4792807a5da42f4
 MISC metadata.xml 371 BLAKE2B b69568a1fd9e7578de49b729826c1bae5b6aef3c6e34d3c32adb9745e4bbb0541fe1e43730fff84aa0dc85b3b116c1e4fb9d9301b3c0f1f8c615c24141b1657b SHA512 874354dc3c06b919b563b13b0b0dd64b9e5af1fd759d199691d2e45a3ddf3fac61412452a0c746c22cb43c3eef379f3c391c2cb04d109ad6859ca279566e1108
diff --git a/dev-python/ijson/ijson-3.1.1.ebuild b/dev-python/ijson/ijson-3.1.1.ebuild
new file mode 100644
index 000000000000..8ea1c3bc00e1
--- /dev/null
+++ b/dev-python/ijson/ijson-3.1.1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6..9} pypy3 )
+
+inherit distutils-r1
+
+MY_PV="${PV//_p/.post}"
+DESCRIPTION="Iterative JSON parser with a Pythonic interface"
+HOMEPAGE="
+	https://github.com/ICRAR/ijson
+	https://pypi.org/project/ijson/
+"
+SRC_URI="https://github.com/ICRAR/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-libs/yajl
+"
+DEPEND="${RDEPEND}"
+
+distutils_enable_tests pytest
diff --git a/dev-python/imagesize/Manifest b/dev-python/imagesize/Manifest
index 567c879ca225..bca778080f8d 100644
--- a/dev-python/imagesize/Manifest
+++ b/dev-python/imagesize/Manifest
@@ -1,3 +1,3 @@
 DIST imagesize-1.1.0.tar.gz 1275201 BLAKE2B 32169ccbfee5080d98b7304a2eb7c437d223a9e538281bd0a9ae1e35f5defb71d1abb7e6307057f7e41d199eda402ee91a2a91eb3d9f74cb8fb1df5c4c966072 SHA512 11af71a5120decb88450d1bc7609e25e560e448fcaef72c273690ffe3ad06856e6a172e20738a8dd5650efe1ba8d599e797692eb5cae2b7d74a71f1f55438a03
-EBUILD imagesize-1.1.0.ebuild 513 BLAKE2B 70d88342c73168874d3463339a0590ee393312a0c79b9c559c0bf6a89ac5533e62940838e6b6d7f6a90a3df8b0cc451fd278e95be0a8dc20f15bb75246502449 SHA512 bea68b0285ccdfd710cf3e0bedcadac49492a8be342aaa8822c634dc46c0f637fcfadeb23975e88fd649386838a39cee73dfd83ae1da56b96e26d11d23c13005
+EBUILD imagesize-1.1.0.ebuild 520 BLAKE2B 1e50acd5071497d6c6c3ca758833778f341402b5960f518eb95425422462cb1ea8bcddf94515d5fb41375d2dbef1832b1e53fbb7b4a0b10ec43e28e059f4c8bb SHA512 e63fcb9d95299fbe5a0f0531defdf3e60d0b72cb26851ae27e4d8fe3713bfd2ccef33c9db8fe0a44a80363b2a059bc1b7f327e7c70fc2c0e22894907df52a868
 MISC metadata.xml 434 BLAKE2B 946bd353c48c258821176debdb575437e538092c2b0d618355ed90883cb5b6e91a6de1f9f842c0c6df002e69ed6bf37bf9a087ab4fab4c57ca36bb918f67d723 SHA512 3c4d3637bad987db6e9c46a46d51cf59cef4e067b5bc6b6e47ab5da5f257db8dc67c35c0f52f7f4ec0522acb527beaacd22bddc6c47282be6e1552bdac5003eb
diff --git a/dev-python/imagesize/imagesize-1.1.0.ebuild b/dev-python/imagesize/imagesize-1.1.0.ebuild
index 74dfd6ea9b98..5ed08c4afb86 100644
--- a/dev-python/imagesize/imagesize-1.1.0.ebuild
+++ b/dev-python/imagesize/imagesize-1.1.0.ebuild
@@ -13,6 +13,6 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-solaris"
 
 distutils_enable_tests pytest
diff --git a/dev-python/immutables/Manifest b/dev-python/immutables/Manifest
index 23bf14e21a6c..717b3cb25be3 100644
--- a/dev-python/immutables/Manifest
+++ b/dev-python/immutables/Manifest
@@ -1,5 +1,5 @@
 DIST immutables-0.11.tar.gz 76589 BLAKE2B 64d7ac89dfe680d1fe78704c165a1fbb15559203980f1a8edd65fbd74589bf2038c799037189849a917555a67483e0cb352664b1d44f3ce161db6c88b878ae5a SHA512 fceb1feb5fd8de4444681cb89c6692206042d0f8f404d78848c379ca3afbb07425e2ba875f7b7cdb42bf126ea0b9f682c0b873c4867c5266cc77da28d29f6ab5
 DIST immutables-0.14.tar.gz 79451 BLAKE2B b18b554536a92b6f23e4c8366161cd43c2bd75d81fc619bfc9760b265835c7fc729c797758f195bd50f81573c4c52d48449deabf19167321eabbbfdfd8961217 SHA512 244a1faab70d46333749abcc2a98f65802c656eb58b23353893a8d894aff4089ccf9ed43170aa0094d8ec2d59a0dc7014d8bf12ad1a044fc066b43ae968968ea
 EBUILD immutables-0.11.ebuild 467 BLAKE2B cf218d188b5c9d1e76dad9daa9bf759c6c9921d760887f55ec93a2856c10d48373b658b92e8689d36c10bd8541f87429bdceaa682b08dd3b61a3a03374b6127a SHA512 ca127c9316d6a453a0c1af6d8105e3ab5b809430d45b54d8e2f609f4940484d9d97e520583bb1799b7ba5431d8cf97d5bc31f60d417c5b4c2715eb440b5c7627
-EBUILD immutables-0.14.ebuild 468 BLAKE2B ba453e05cdf0455393b75188ab4e879035a4db27d47e8ec2a9d25df7d27d27346a7e7867c49621c22f3c47ddfd8fc7d486daf8750d2c15df3249d4985dbefe7b SHA512 66e6c85cc7e67f94f883deb186390233e9c8242d1a7c7f2a019b13288a55ca0103c9f8db6dbe3a0dfa6195aa4355e66f7de84fae16185f862f92b5d39ede06ce
+EBUILD immutables-0.14.ebuild 473 BLAKE2B 49d2d2f30a7fbe4f91cfccbc5a3b3a7ec33d0069df3352fc9616678218915561ebbd839c436be334c239088ea42c3eae890ae63b805c4cffe0ddf0aee0158911 SHA512 ac51ff95d2078c1cbcee88537c5a2e26eaed28266cbdcf6cf10a82baa577f4b8c8901104c9c00bfdb224d07e2882aa89b679b2262ff941a99e684b016eb402bb
 MISC metadata.xml 352 BLAKE2B 65ae089f4fcda6735dce5a7772e25b57c69f38e728073213b7c3d1c96382f22cb570fea4890ba1c9086a327b7e24cf1e58514fa6363a1ca595ea9c66cc4a8289 SHA512 96bd2296b24b710cf4a4eecabf3918cc49fb70e859989074d1c07f16b48dca7e2439a4f5f00e5e2283598216fa574621cdb69c78d7a3e7ee9bca144b3955d4d6
diff --git a/dev-python/immutables/immutables-0.14.ebuild b/dev-python/immutables/immutables-0.14.ebuild
index 456316f1258e..470634f78497 100644
--- a/dev-python/immutables/immutables-0.14.ebuild
+++ b/dev-python/immutables/immutables-0.14.ebuild
@@ -12,6 +12,6 @@ SRC_URI="https://github.com/MagicStack/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc ~ppc64 ~x86"
 
 distutils_enable_tests pytest
diff --git a/dev-python/importlib_metadata/Manifest b/dev-python/importlib_metadata/Manifest
index 7680f54c617d..ddc30f911dba 100644
--- a/dev-python/importlib_metadata/Manifest
+++ b/dev-python/importlib_metadata/Manifest
@@ -1,3 +1,3 @@
 DIST importlib_metadata-1.7.0.tar.gz 29233 BLAKE2B a8cd97a384ab06201025fcbdc401fb25788c2eb1dd4f1697ca00e79634cbce32b984cb8a7c2aeacfb0871f92857d08f3ce9c3ae43d698df7401db91add07b6ca SHA512 31f7cda6a1149ca2040032945b19b55d2e97ef8be67db1423c2c2cbb79da3dead46338f3c9eb03b46f9202fca08ed7bf388adc25d34903ddff4b2873c8a89aba
-EBUILD importlib_metadata-1.7.0-r1.ebuild 1269 BLAKE2B c22d7cb2d57f9a40d8fe287f83b57e0f998afe5cd0b2a1fdce71e17b08e8237328b901817d178956e16967bd57ca4dbf4287f98eff958056651c691fe5671eca SHA512 e0e648b0842c76d0379d6db752fe322b361eb19698c32908ff3ef263c2533f7d4660c2e2411f3fc0b601d7ca5c4326ab6d0b2cab75086b200eb0d78a2cd5544e
+EBUILD importlib_metadata-1.7.0-r1.ebuild 1276 BLAKE2B 6b296493015dc312c0ed5b4aa3ce0f88d0ca1c3a2be054c0f5ae57b767b2d7fb574aa203bfe3e9a880a4256cf8a84f45e93abb527cb09113e39504eee560b9e2 SHA512 843c7f6cd3cc21d9257b8be426cc99b424190d42b46ca4552b259450a7da876f81eb0f5fae5c7ca920b4253f2f22a22c208519296afdc7a0a99ee237bf37a443
 MISC metadata.xml 599 BLAKE2B ce02ca578d2030d74c64bc05e83c8453dc4bc9efe83ae89860ef66e8f13da35961dfb73ba5aec3da5f12f91be9d15a4168bf93f45c7b942071b9418cb12aeb5b SHA512 f1c15874958ff4744838e06e2dd6f20349febc7d6f1939eaed3d698ea7ab552de18956f8dc3f57777ff0c82e26be1cb6bac325a9fde1b51b796fdabb2e7ae0e5
diff --git a/dev-python/importlib_metadata/importlib_metadata-1.7.0-r1.ebuild b/dev-python/importlib_metadata/importlib_metadata-1.7.0-r1.ebuild
index 04f1b0fda7d3..207c75be649e 100644
--- a/dev-python/importlib_metadata/importlib_metadata-1.7.0-r1.ebuild
+++ b/dev-python/importlib_metadata/importlib_metadata-1.7.0-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	dev-python/zipp[${PYTHON_USEDEP}]
diff --git a/dev-python/importlib_resources/Manifest b/dev-python/importlib_resources/Manifest
index 72b1ec927dd6..427f659b3e4f 100644
--- a/dev-python/importlib_resources/Manifest
+++ b/dev-python/importlib_resources/Manifest
@@ -1,5 +1,5 @@
 DIST importlib_resources-1.5.0.tar.gz 23660 BLAKE2B aed7a2d730f945505083812355a63d3a88e07b057cf46394f3475135143e535e33dc3ebded24d233797020c805dc35decf5c5ce53758798b093f03f2951daa87 SHA512 34d14c1ff3121cc6f9ef1d3d4417831e3476e9facfcc9b35152c28a59a2c75d7723f171f4b48852f79ec46cbf54b066580745744bc54d349e2bfe12a353a9aed
 DIST importlib_resources-3.0.0.tar.gz 26725 BLAKE2B e2517b0d1e576ce949ac05230892acbad59c09fa4b84401b3c957e83f40b50d12bc02360b135fe949d12c43f8f557006824e4e4a3e9ff2ce879c03362569a00c SHA512 cd29e268cacef3729024af6cae8394ce5aa8c1d8a28397fd8f009c7eaa908ed3775508bde86c26b0d233c25261b8509abb1e16c378c7c8a9bb0906224f3fdd54
 EBUILD importlib_resources-1.5.0-r1.ebuild 1280 BLAKE2B 16db4dff815fc1e5dd034965e42a9d22f0f7413281856c80aa7652003799c2cdb928a8a6143a5d1d3d31b7f1dddb7ae933afe3bcf30a6d838ddaa290593b5cac SHA512 3c4c2aead9af6c6f44acde1b976bd8a853993ef1813cadff7986d41f4b627f697817e65d0ec2bdee8d6fcf3b618c3b320a3b179d8df9c4445dcc1c31d21aa837
-EBUILD importlib_resources-3.0.0-r1.ebuild 1242 BLAKE2B 5482c5f4f81653d5bf63e12cacd329412beb80b7de02a6b6cfb095e5d0e5a4273b28e055b9803ba52ec00d8d09700844f616ec36aa3eb610bae414213a7521ab SHA512 da82eff49d66eb8fc0a76648a232f03dcd4ac30b5c693926a6cf86a5b103b571fa571649f9bc147c1ad44d6b05410e590b20fffe15be44a6a6593a4d2d71f668
+EBUILD importlib_resources-3.0.0-r1.ebuild 1249 BLAKE2B ecc0946b7ea68513404e258ddd36a6c95c2902cc977ca1d407260e70931061594328baa4910484e560d211286ad37dff208ac8263681f6683807bd4d6554db02 SHA512 52b86ffb1549f47c4357df0587e29cc1ebbc2bf2a96874068a64479861159f3310bc3483c67c0d2065bb62684f6c2fcde2e8bcaeb64f923ce93414af9a384aed
 MISC metadata.xml 895 BLAKE2B fadc4adcee6471eb31d5a1b406c9a6a29e366a50abcee105a08456b432e9a42352afdf7d08f37c3ee6100f1f57080bce2a32770b3fda96bedebfa7958957975f SHA512 6802c03cfc8049146dbbef1ff6462cb2eb01f18048a857ff0050af8e15367bff8e40521c989fcdc68c95b2025d2b7af09015f99c279ee504d556165687d7fa36
diff --git a/dev-python/importlib_resources/importlib_resources-3.0.0-r1.ebuild b/dev-python/importlib_resources/importlib_resources-3.0.0-r1.ebuild
index 8de5a9670ffd..d8eb56fdde37 100644
--- a/dev-python/importlib_resources/importlib_resources-3.0.0-r1.ebuild
+++ b/dev-python/importlib_resources/importlib_resources-3.0.0-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 
 RDEPEND="
 	$(python_gen_cond_dep '
diff --git a/dev-python/incremental/Manifest b/dev-python/incremental/Manifest
index f859515f5152..49455157d3a6 100644
--- a/dev-python/incremental/Manifest
+++ b/dev-python/incremental/Manifest
@@ -1,3 +1,3 @@
 DIST incremental-17.5.0.tar.gz 15527 BLAKE2B a967ba891b69e91768db213a9692da10eb9987bf962bdbc3b6fe70e337322686d58901878b72934a5abc8d9b0c9884d6e03de5b8912067f07b7562427bcba38a SHA512 91443205f7c92ec8f6502f38379c5ac2fe441435ff9490af01e5420d6bb05bb1c666dd612fc45204199a34afd533fd3de1390ca482bb554dfec7d3a22958a4bc
-EBUILD incremental-17.5.0.ebuild 573 BLAKE2B e8e5f7444072d765b3e0016bd28d91ecce67fca9dc61e26a44a093b5eb8d434ab7353adb87fd5c0467a7ac3a023d8e502941a73fa3a224fec2d249d66d05246c SHA512 e444206dfda069ee7e14c87b25a48bd5f48b83ec1d3576e38de79d952792189468dc8aa75ff01801d5c30fbdb163e03696387afed5763132c7bc08abb6b749ed
+EBUILD incremental-17.5.0.ebuild 580 BLAKE2B 4207be344127bfe2141adc90e95cc1253582fa5b2ab4d55f604679e3afd2e4c51b695566f7e7c2b87dce1d3c52960ca4cee70aa6596938c1dea147d66902c604 SHA512 a1251cae48f64fe6c4d3e7f79061e634a87eadcb5b9e967a2f1bde99f10cfda5f1741dcd286a1a1385c267179b4841513ecd347656b21169efcb34c5c20f47ec
 MISC metadata.xml 476 BLAKE2B 854207bdc5352a730881f6f6a820bed4648e839e64601274f0c249e805bd8c1aad5066ee970f2f45e8c8cf532fd4f07ab0956ac8656da5e8947246fcdb618337 SHA512 603906b5876ed9cc69aadcaee6d9443d20a2d134939ac79a41ca23f8ef010563ba3f56c012219cabb812eab0eb7e6bdc19cbe7763cb406e948713e49f1bb13c2
diff --git a/dev-python/incremental/incremental-17.5.0.ebuild b/dev-python/incremental/incremental-17.5.0.ebuild
index 2cd598812816..ca490e4d58e0 100644
--- a/dev-python/incremental/incremental-17.5.0.ebuild
+++ b/dev-python/incremental/incremental-17.5.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 #S=${WORKDIR}/${P}
diff --git a/dev-python/inflect/Manifest b/dev-python/inflect/Manifest
index 96e782872770..319b975ff7fd 100644
--- a/dev-python/inflect/Manifest
+++ b/dev-python/inflect/Manifest
@@ -1,5 +1,5 @@
 DIST inflect-3.0.2.tar.gz 71546 BLAKE2B 951eb818ba1645a9e426468811ad449378aa5a7341575ac2aff5e9d1e06237fe8e96fa64cd678665cd6c05e1dc5e477a65b261b9d8bd170be4fb923d5fb90e9c SHA512 5858548e947f742b91630fc584f568a2221057ada7cd4a55f39de1b52a82c97884d6a78c2f32e5995e354fd1c4eae4d5b3d30491ef57dd5187fd6baca93d2779
 DIST inflect-4.1.0.tar.gz 72200 BLAKE2B c15f6b0d5d93050283dfc4d691e9fdbc26bb2f71573d6b397834e87af62f3afb8f5cdb0448c531de37e84729c0c6ae0cf4ea7a7b081a9dd784f7c06b962d7def SHA512 9a2ba4777f01475390976f3ac28f046d39d1f86cfdafd161cc7c8d33526aca35d44e6598ccf2a0b68d3511a64b67ed0991b51c78bda8f279cd706fd29a3fa514
 EBUILD inflect-3.0.2.ebuild 1221 BLAKE2B a509765bbaef5fce7e7c44c34e57cb38eaf972ddb57730521fb4db2a9fc3d33083407f32b2de06aad2a04197d7340b3e49dc8bfeaa3fea1230b9e87955646541 SHA512 852be80446b9b71a422c732a41baa0c07eb2af65d209512dd39971b4d24caf3dbf221e66a80391e00c8d04dedd2f02e7812535e30060c06c27d523d60a680a00
-EBUILD inflect-4.1.0.ebuild 1129 BLAKE2B 8672665eff98771476836422651324a652d1aa5d180f3ad0cb8749a7a568795e2c4ff48c235f2d46893a0dbc38b6cd79e7b6942f1f2b99970bc993737fd7fb0d SHA512 a69669466e18f47c78aa6e5111167cd305f1267ae0106359caa1f5cf6becd05327de5a6b6e643a4772723c31f55365f1fb2cb818a7b0a39928c8ebf1f07452e6
+EBUILD inflect-4.1.0.ebuild 1138 BLAKE2B 23c36449d9b214270b19cb07e88d478e7661ca10b4e66ebc43ddbd3d58f0783e4205f103c4651ce82722aa026f768884101dd4420422c3b7003c9cef30e3b27d SHA512 49b4a5679fec1b85eb89389ab30efd04da3f414d258f1c329581cea46707848ec2f785a9f22f9af86963ebe0dd6603176f04c31f9f8a5cf00b8f3a26c31dd1c6
 MISC metadata.xml 496 BLAKE2B f1e420733f50138d3e750b0eea09ee773aee906b7e18351c18adf161f6cdbb257d24784f503b455f1529a45899d968fe15d274d296c04b42f609f89eae0354d7 SHA512 e2a538fe19ae2849100603f5e695e4d100819ccb7e0bfe26d99268eaffd5b650f275b33efa6a4cda4caa17d941be917cecf17ca0939794820defbd01dd728fa5
diff --git a/dev-python/inflect/inflect-4.1.0.ebuild b/dev-python/inflect/inflect-4.1.0.ebuild
index 11e5def6d12f..360011e84cb0 100644
--- a/dev-python/inflect/inflect-4.1.0.ebuild
+++ b/dev-python/inflect/inflect-4.1.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( pypy3 python3_{6,7,8} )
+PYTHON_COMPAT=( pypy3 python3_{6,7,8,9} )
 # [options.entry_points] is present in setup.cfg but it is empty
 DISTUTILS_USE_SETUPTOOLS=manual
 
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/influxdb/Manifest b/dev-python/influxdb/Manifest
index 19e603acc746..c6148a715fc3 100644
--- a/dev-python/influxdb/Manifest
+++ b/dev-python/influxdb/Manifest
@@ -1,4 +1,5 @@
+AUX influxdb-5.3.0-pandas-future-warning.patch 638 BLAKE2B a8cba22ef423b5162666fe9157516dae077355139f323ee98149cfdbde15fc12de163cfb54009ab8bfebf2697c4b539f512de19d6d066aa28623e7e9f272b411 SHA512 0d2a6213efbcd56b9908924a839fe63d369dc7ec674e3d1603a81649969f47fe085b6ab163028384752a033a98d358de2d7c651618370c018d05df7152b74e52
 AUX influxdb.conf.template 476 BLAKE2B 50416cccd720729d28b50d6cd4bcd6582c959b932c75f8dc64525e96be35242cd8dd36b3f689383e22b0eed3925b0c97dc42dbaabdd76dcc3cca4d5f49d8cc0d SHA512 3b8f9dfa149ed0e8aa25c8db8b39968e01ba7f81b9db037a0e05740c27d617dea8101efc9b9ddb00bf354cea7eefe5ad318b2ba309276e5ba4500bc3dc9db62e
 DIST influxdb-5.3.0.tar.gz 66683 BLAKE2B 28dd955fb26eb9a984bb910f26655720c566c08a8178f8aa08b5eb66a6f02933a6f3cb2d26981ffcfc3fd9a017fae2ad27b61f32e2a7916c55d723ffea5b248a SHA512 49ae48dc56ea8f6c6d4103f33207a35af4877c292ff4bfd32ebf8ff35fae816f570e64657406fdf9ef13092c69e7e2d1f0c641124445d35731a4a37812f67242
-EBUILD influxdb-5.3.0.ebuild 1117 BLAKE2B b6ce42212120f644f74402a102c74635b8f6c6ca4ade589d37ef6ed398006144bd1b60adf8a10baf2a25fc3422f7997a0a823a88b926038549c7f6118f892817 SHA512 d6247ba8169e4d372c59a70dfbab69a77241cae8fac5d6e4067675067bb60e46f0acaa412425cfa1e4be38b96ecf330363dba7fa10b1fb0eb21fbb28e6fc1f3d
+EBUILD influxdb-5.3.0-r1.ebuild 1133 BLAKE2B 828f4da543d1068dc0dbe1b77c2d41cc35719117e441db67cf236b28338fb4b84c03042e70ae60931fa95efc4bdc994d6365dd2fe69eedce48453938dd1ff303 SHA512 cd97f9b958e90154f49664994daf71358226e7539501bb84ecc98db214ca8209427d10151219a04732ff1e8df7f284d04792ce19a97852fc1ad727647f1a4f88
 MISC metadata.xml 497 BLAKE2B d0626d2e8a84dae9647d13d9cc6971ac9249d0b77352cbcf0b081460412225f6854770d4eca768725aa57b329bd9213f0c4db3cb5b5bd859a604b9826abe3fbc SHA512 49f6810c70b348acab0cc59581a7e0cda7d798edc68f34127c7eb65c6f70643f281de099b61efbb7af1787db2d9ae7f49d1bd45b1cfa7e2ac67737e743a45cf2
diff --git a/dev-python/influxdb/files/influxdb-5.3.0-pandas-future-warning.patch b/dev-python/influxdb/files/influxdb-5.3.0-pandas-future-warning.patch
new file mode 100644
index 000000000000..efd510fc8420
--- /dev/null
+++ b/dev-python/influxdb/files/influxdb-5.3.0-pandas-future-warning.patch
@@ -0,0 +1,15 @@
+https://github.com/influxdata/influxdb-python/pull/845
+
+diff --git a/influxdb/_dataframe_client.py b/influxdb/_dataframe_client.py
+index 600bc1ec1f47..7f2b4ee2989f 100644
+--- a/influxdb/_dataframe_client.py
++++ b/influxdb/_dataframe_client.py
+@@ -294,7 +294,7 @@ class DataFrameClient(InfluxDBClient):
+              'time': np.int64(ts.value / precision_factor)}
+             for ts, tag, (_, rec) in zip(
+                 dataframe.index,
+-                dataframe[tag_columns].to_dict('record'),
++                dataframe[tag_columns].to_dict('records'),
+                 dataframe[field_columns].iterrows()
+             )
+         ]
diff --git a/dev-python/influxdb/influxdb-5.3.0.ebuild b/dev-python/influxdb/influxdb-5.3.0-r1.ebuild
index 84c5acb0015e..178929abf867 100644
--- a/dev-python/influxdb/influxdb-5.3.0.ebuild
+++ b/dev-python/influxdb/influxdb-5.3.0-r1.ebuild
@@ -2,7 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{6,7} )
+
+PYTHON_COMPAT=( python3_{6,7,8,9} )
 
 inherit distutils-r1
 
@@ -22,14 +23,14 @@ RDEPEND="
 	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
 "
 BDEPEND="test? (
-		${RDEPEND}
 		dev-db/influxdb
 		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
 		dev-python/pandas[${PYTHON_USEDEP}]
 		dev-python/requests-mock[${PYTHON_USEDEP}]
 	)"
 
+PATCHES=( "${FILESDIR}/${P}-pandas-future-warning.patch" )
+
 distutils_enable_tests nose
 
 src_prepare() {
diff --git a/dev-python/iniconfig/Manifest b/dev-python/iniconfig/Manifest
index 928379acee5b..2e09ce4d60e0 100644
--- a/dev-python/iniconfig/Manifest
+++ b/dev-python/iniconfig/Manifest
@@ -1,4 +1,4 @@
 AUX iniconfig-1.0.0-pytest-5.patch 1809 BLAKE2B ccb4383f447f84a88cb020daf0b17ae626c627ce46424ba89591e1feba8ba38b48877e0cac83cef8792cafe283e632cdcec358f6d3929146cc67d2da57848233 SHA512 347295b050cc31108ee013a20dd1135f42a85636d83fba19d509a09856e50ad9343074b965e3b80306a9b73bfcda4c5197800ed3c2e5cba8432d26c5397a135f
 DIST iniconfig-1.0.0.tar.gz 7807 BLAKE2B a77c4d8c6f549db911110505ac5a367be5175adbb580211d4aded14d1108e189fd6d6a229ac4e0e742baafa9b037d58c2bbc810897c8b274c07493c518ef752e SHA512 639a4e765637110f69627fb18a5e719b6d648e5549fd857168183d97da7880434d447c9af1e254dd2aa5d0e36cbd3f5c4ffabf8a949ed3d6294002e7e1b2f6e1
-EBUILD iniconfig-1.0.0.ebuild 545 BLAKE2B d41cce2f93f7a574e2c236aaa7d2a9061f773c73b9a11f1639050d8709b3eec7ae571970c89340aa5b6b75ad6f4f24bf20365c088dd78714d175d6e6dc1dc06d SHA512 7ce455d87894842b7aaa49d499f5913d2fac121657a250a1cae7df1b5b06e353ca083e5c69670686dce2921645a10c537c7702f45a2a7eece31a54cc3df79780
+EBUILD iniconfig-1.0.0.ebuild 564 BLAKE2B 1bc1935fdb3333abb4b9f2ce6b01467d732708eea1c7ffca71fd16f53d4d0aebdd6ed760aa769932e81376609a88f7f0f369e900b51e4a1d47fd466ec014f25d SHA512 c54f6dde5a7028b1e5b5cad60824ddae6055998f368336fac47cf10fe258a82f7b5fc75a07aa704340bbf0ad97780d6fd55fca123e3a81278bfd80dca27e324a
 MISC metadata.xml 218 BLAKE2B 086fdcf7b63ca7bd6c58e861d717bb375e1cd372eff26d5d2eeeb176d8c5e6f10e653562abafb50eae7d7508f8e3d421b87e6a749acd0490308672828d0da697 SHA512 4558fee4c51117e21b1f42ca3edbdf1195ed297db798d6bfa0e5fbb7019654a187422b0abde7af5d800caffed66d1e55e4280e8be602bad591424d9776c46781
diff --git a/dev-python/iniconfig/iniconfig-1.0.0.ebuild b/dev-python/iniconfig/iniconfig-1.0.0.ebuild
index a6579ae0b7e7..635312b96011 100644
--- a/dev-python/iniconfig/iniconfig-1.0.0.ebuild
+++ b/dev-python/iniconfig/iniconfig-1.0.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
 
 BDEPEND="dev-python/setuptools_scm[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/ipykernel/Manifest b/dev-python/ipykernel/Manifest
index 5511348e919d..ccafb7dcdcff 100644
--- a/dev-python/ipykernel/Manifest
+++ b/dev-python/ipykernel/Manifest
@@ -1,6 +1,6 @@
 DIST ipykernel-5.3.3.tar.gz 111718 BLAKE2B 4295eab97c971dfaef797ad3314b9077f740ae102282553ae7265352b83c3d44a51e1cb696cdf161c612ccc1ccdbed39bde1ffe17d83aeb3f61c1cdf73154d3e SHA512 4c33e6db572e002c2ecda479a427a46707f0e162bac5701a5a079d6d5c1df2680b20bed2cd5b2aa7927e8efee0b0993dc78ba4090e7e053389e278f6116be1d3
 DIST ipykernel-5.3.4.tar.gz 108656 BLAKE2B ee2ff12e0a3fae853dfb16235bd14bbfe16b670ac93c572ff4e3867d5d2c451ed4f4800f3e501caf857405d0efb73a671c2966ea0fe53aa41f1e59ff68424cb9 SHA512 6865cb4cb1979e79ed532fabd59e55bd860df996f557e4c05b69fe7baf60301d70dc0657248bf75102285c68be6212787180b548d5125029991605f05d0d812f
 EBUILD ipykernel-5.3.3.ebuild 831 BLAKE2B 4d305566dc109c47e4ea3133b6cf2f357436fb5a85a629b1f1abf4ea8dd2f75d41dda911b793b81b2b68fd5478bd722383352b6113c86b019e9749adcdd894c1 SHA512 9a8875796301e1fec9be0e048e0b695fd7ae4da5e32032f25268c85fe568ca8b80673d510ec5d9199dd40a1c3afc5373b138e4d350edd37015d803b48a13cc9e
-EBUILD ipykernel-5.3.4-r1.ebuild 834 BLAKE2B ca7883f6f525dcb85646cb3df70e49dd011fff3eec26d9c3449bf1e6857c4290fbbda8c9b6ad343af63961f56201512c3c6faad93a1c59d4bf85f6ed4a1ffbb8 SHA512 2ec88fc3fbc371dee936751788f3c098e0fb0fe48640a4f5277fa60d1ccc0c81f137bd35c2881c2461a4ba329d58a9027ed2892a306d8fa231fe3ad33ecf6e32
+EBUILD ipykernel-5.3.4-r1.ebuild 831 BLAKE2B bd0bb564d4e9ba30c8e342f3919061f74a3ba4f91011333e8d332f8f3c6ca0306fe3c590d65103ee466bd7c282c70493a359272e72259f680717a7f8c4502bd1 SHA512 33a518ab2f84a728482a6b015b0a0ab512ae50cc133fe5e73b43d6b9ef25e64a812f1c90f964a9d55ad1cb5230bcc4167e9b67bc56e00036e071e8be5b8cea2c
 EBUILD ipykernel-5.3.4.ebuild 831 BLAKE2B 4d305566dc109c47e4ea3133b6cf2f357436fb5a85a629b1f1abf4ea8dd2f75d41dda911b793b81b2b68fd5478bd722383352b6113c86b019e9749adcdd894c1 SHA512 9a8875796301e1fec9be0e048e0b695fd7ae4da5e32032f25268c85fe568ca8b80673d510ec5d9199dd40a1c3afc5373b138e4d350edd37015d803b48a13cc9e
 MISC metadata.xml 526 BLAKE2B 736792bdddadea61e82623e7b510347bc00a8b0ac35fa6e10cb420fca4b3890bd00f26cfbc91eb15964a5718b14037cfc8066503345ceffb5c69214f93babc50 SHA512 33e7a9809469d373b1279395f3b09cb735defa451982b69059f10d334b449e8fb75851271db71315939b44fe4f1ac6bcdf988308faa05d705ccf0fad9887daf0
diff --git a/dev-python/ipykernel/ipykernel-5.3.4-r1.ebuild b/dev-python/ipykernel/ipykernel-5.3.4-r1.ebuild
index d8754af6f7c2..5d175e638675 100644
--- a/dev-python/ipykernel/ipykernel-5.3.4-r1.ebuild
+++ b/dev-python/ipykernel/ipykernel-5.3.4-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-python/ipyparallel/Manifest b/dev-python/ipyparallel/Manifest
index 36dc01351b12..c1c09f436859 100644
--- a/dev-python/ipyparallel/Manifest
+++ b/dev-python/ipyparallel/Manifest
@@ -1,4 +1,4 @@
 DIST ipyparallel-6.3.0.tar.gz 2380153 BLAKE2B b8312102e1d2b5fc963491ebe8530e2fd73e9f941f7912fbc72a8db51e7255f5cac95a853d15a57e384926ab1aff27f2a3ad13cc45130a8b612be5dc623538ab SHA512 fe621854b9cc3e5f88aeca2b06b63bb689dd2feee0da451a0a90800d8832f4b44b23bb9a15033029cc33179276f31e982a10fc7540e6d13b04f15d96c348a295
-EBUILD ipyparallel-6.3.0-r1.ebuild 1721 BLAKE2B 377255a22842e61abef1707ba54024bbabcc24af9d943af69c5697dbd7ed870ab743cf89503d051a3febd505334ac47cca54cd1ca713f193203415df1daa836a SHA512 7690b53d225b82108c0115d1ac32147aebaa58dad62d2e7d957dbdd3a48432c2dee032a745959375dc7cbbbf543e82ac1d3f2d14e4b4cc8a53753db44568f2d8
-EBUILD ipyparallel-6.3.0.ebuild 1718 BLAKE2B e67a1bf4043f42fe6e60611ee1c6bd1bbfbd56074f5328992ee01e7649b9d415dd173b15779af2fd331cb9368c4fb5c1130efbda2060edbcea303818b1d90d95 SHA512 bc731e2069ea2533eacc3967eaf705148ccd809d8c0d8746296c11097184361ee72c2d351a7b08b13077c2155037a169cde49cc70e7316a868881077556292a8
-MISC metadata.xml 505 BLAKE2B 3dc8a7d01f8d67619f064ced47674ad386c81e625d46b820a7949dcba68755ecc69d29166880d80ba8951bd5226d6a380fdb0545287c527a133c3645b6f2bee5 SHA512 d86601139ae4a5d2aaf7d69fdfd609450f12d03775276bb0b459728712a15803d7c3a6ec3eb73ca7a0802e4333809f2eff8f9ebc2dd2a2c22947262b78c3dea6
+EBUILD ipyparallel-6.3.0-r1.ebuild 1722 BLAKE2B cffe9c3a63146edbf8903a46ac7a69c58c3770b5962789776cbc942d47fb05006c113a88b7034f64cf1cf31b022cc61d80497dcc64b0505a4caaeda15d44bb2e SHA512 ba7697ae2dfff5a51d6d31ab367d009d9f7a87313c78d35b99f67045f622df1cca4c3f219e9eb2cc8f5dbe388e7c5fc1d831eb559a1769a3dfe82957ad6d0f3d
+EBUILD ipyparallel-6.3.0.ebuild 1722 BLAKE2B efe1f2c6e47419a21154ccc07fcec02034aed5436afef6dbe1d6f4935b6f4df8a331941d663cdf867768078b7b5fc3b7789ebeb4bf46b9b484fd7e45869a1bd7 SHA512 4a90135f003b558fa11f265ad831c9f07d84415685f203a585488e78c8b7b6b1a0893ac62a6b5ae6aca734ec585f012bd7dd66741378a99659ffc08a200417cd
+MISC metadata.xml 530 BLAKE2B 3b19d29a2e5531c54fc9fb6fed6757d6eeb2a8e2f5f24318cdf8f5977f766496e575f9928d9a54a94532affc246dcc75762191fe00279427ac1110ece156d85d SHA512 cbbd4517deb574adfccd11c7677f212f1b1a086f86fe76f6aae18f0cbc5e833758d9ef574e452fe217ef92fe70dc2cd83a97f46e69b341cf9463c371bb46a781
diff --git a/dev-python/ipyparallel/ipyparallel-6.3.0-r1.ebuild b/dev-python/ipyparallel/ipyparallel-6.3.0-r1.ebuild
index f478bc55e983..ab64a2e382ca 100644
--- a/dev-python/ipyparallel/ipyparallel-6.3.0-r1.ebuild
+++ b/dev-python/ipyparallel/ipyparallel-6.3.0-r1.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python3_{7..9} )
 PYTHON_REQ_USE="threads(+)"
 DISTUTILS_USE_SETUPTOOLS=rdepend
 
-inherit distutils-r1 eutils
+inherit distutils-r1 optfeature
 
 DESCRIPTION="Interactive Parallel Computing with IPython"
 HOMEPAGE="https://ipyparallel.readthedocs.io/"
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm64 x86 ~amd64-linux ~x86-linux"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/ipyparallel/ipyparallel-6.3.0.ebuild b/dev-python/ipyparallel/ipyparallel-6.3.0.ebuild
index d89e468faf15..181f4ec46a71 100644
--- a/dev-python/ipyparallel/ipyparallel-6.3.0.ebuild
+++ b/dev-python/ipyparallel/ipyparallel-6.3.0.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python3_{6..9} )
 PYTHON_REQ_USE="threads(+)"
 DISTUTILS_USE_SETUPTOOLS=rdepend
 
-inherit distutils-r1 eutils
+inherit distutils-r1 optfeature
 
 DESCRIPTION="Interactive Parallel Computing with IPython"
 HOMEPAGE="https://ipyparallel.readthedocs.io/"
diff --git a/dev-python/ipyparallel/metadata.xml b/dev-python/ipyparallel/metadata.xml
index 8edacf7e68ed..a2e02f843c06 100644
--- a/dev-python/ipyparallel/metadata.xml
+++ b/dev-python/ipyparallel/metadata.xml
@@ -9,6 +9,7 @@
     <email>python@gentoo.org</email>
     <name>Python</name>
   </maintainer>
+  <stabilize-allarches/>
   <upstream>
     <remote-id type="pypi">ipyparallel</remote-id>
     <remote-id type="github">ipython/ipyparallel</remote-id>
diff --git a/dev-python/ipython/Manifest b/dev-python/ipython/Manifest
index ae1944a3775f..8531c73eda15 100644
--- a/dev-python/ipython/Manifest
+++ b/dev-python/ipython/Manifest
@@ -3,8 +3,8 @@ DIST ipython-7.16.1.tar.gz 5136303 BLAKE2B 9baf42c9befa50d78eec29d012aeae7f01886
 DIST ipython-7.17.0.tar.gz 5139470 BLAKE2B df7dfb00ed81d5c3db7ba1408df6a4e26ac8439d6d58c7f9214ae89e446951eadf3f0d4c2be0654acebc0429a77773972b6dd081ef8c009a9d177924968e7b28 SHA512 0dabc6f4079719d2dd75c5ee92e4523b016b4a790776ccc7130a60bdd4ca1b88bcdcfb9ddd192f9c1a4397c27a27e7f7297540275d06832f870af347e2f14dd9
 DIST ipython-7.18.0.tar.gz 5138647 BLAKE2B cb6e81468ff7b0d452bd4666a8dc47dda7a7ee7b4685391f222a84db6fddcffa3d41514c1d8a346f07e0c3a89a942893cc7e16ac5888e1c35cc2603698527846 SHA512 2c1cb414d0125aba54dcf98221011d3024d7db0779b2ba79d7c283e2fe918822b59a7771f67e45bf3a60d1a2582862ff3a97475163278961564644373b416029
 DIST ipython-7.18.1.tar.gz 5139337 BLAKE2B 936759db4377767537766a2baf0bff2adf1a95d17438899e1e1611d725e796d8ab78fcb8f1ca14d8d41171af64fa67abe9fadf84c6ca3cf17bb1d83fa2ba4268 SHA512 71f495021df56bbea97fb26b9274e54f7662875b7690a9493bdf682635e048d9ec53a947ee9b0d487634a3a8c639f0d93c6639b3a0dd20bdfefbb4c53fb53799
-EBUILD ipython-7.16.1.ebuild 3648 BLAKE2B d6a6667ec56db5adb9176038bf8e9abb3f9a2ddb69f181b73188b6e9afacffadcaba88a4f06631e5f2828a7dfe9a507068d16dcc5ebacf10e28a43137d6779d9 SHA512 99bd76b6778bd5b3a2a86be2217e9d1720d2bf565ef201a1acfdf39c9b450697c385b53844904f3c04788ddfa26df8e707221e03a22d284a02dc93fe9696854d
-EBUILD ipython-7.17.0.ebuild 3652 BLAKE2B 65972fa0122548fa440337d4584af6967a7fa51ccf09aea9027898e4c42c4b78add1bc88e1e59cb978be4a5d50b1e2228dd62005ddb2a5f18f7122c1a06ad284 SHA512 a1a5c4134cccdb45113f7267af59ac116f4e1de2d7d2a0964e80ea84701f0abb4cc123ae69b64b7297ee78aaabc82ebe8950f75e9cd3c31c595d8a0f09e7cc4c
-EBUILD ipython-7.18.0.ebuild 3628 BLAKE2B 5f462669da46286d71d5aa924441f8300f88172f7f4ad8fc01352141184bde9a9b7b14304725c4cea61bce230611ffaeb213569d118d6d154456e3888c3ea958 SHA512 4ce0be72dc3acf6f60b7e6d7a5b8971d4bfc013a8daf3049c9570bffcc34256222ceaa1bdbf7d39a59f3b7ca410a624cc0ddf6bf3e3dab38dae6ef9d7ef7d173
-EBUILD ipython-7.18.1.ebuild 3628 BLAKE2B c1e23ab454eccd6dd626c9676b2f450c88c96da1d6702e5cc33cb94457e302215cbb102753b23882dcef7ee0b7f3199cf137957049d646d6a03b2c137d3a9f9d SHA512 3fb8391ec4194cc56e2a7de51a0ce9af7c025b428718e24a6400f2c18a52894add99888d7276bfcffd81f87704ea5ec973257a8dd69adb57a940f4812144c191
-MISC metadata.xml 2857 BLAKE2B 89f6ea04a550e2e590f9e041c435fe578691118e24265d0f3c2465480cb32cbf4f5ca4d6c8fb2a08a665061347e19e361160f73aea080b1f67a4c9c743f6c23c SHA512 6b28c7f0be77e23656df143940074658a71ea872ba12238d3dc206f25662ddd589e3ebee11d5ca06498cfbbc651ae0effc95235feed91e853616706c87ca5bc4
+EBUILD ipython-7.16.1.ebuild 3652 BLAKE2B 70be8a367fb2c221e9d9b176445d7a3c2d8e9f21e7f5c5c3e395d6238bd92ff00aae8d061ff384d3da3c5635dd09c79965d1c755074add0d101f26c9c3570c8e SHA512 7281469503c7e301048343ad8ea65784026b6822382bdf08a02490c0ef1f67c2f5d5aef5bf9bb731aaffedca60472dd9af99ae4de4489a0f262b1de195e75843
+EBUILD ipython-7.17.0.ebuild 3652 BLAKE2B e71ebec6aaa62a267a206476efedaaf254dd1f6343212b6b877e18bfc1db2e19887814dc534685e8c59ef16503dc8de2ed89004dc6eb5b5ff52669380187a3eb SHA512 b85b4d7cd9e022001dcd8be117273766596c19052ce313e02ec41133eb4ade08bf62fc3d60448963f63689406e03a367126e402ed047e65bb35a65601d3ff224
+EBUILD ipython-7.18.0.ebuild 3632 BLAKE2B 35bdbf8f346234842e190488cc1758d437a30a2b3277c8dfaace904ff827839bb64e45f81e89923ad5773cae461f07498ea300e206b0b8aabcd4571a9a4696c2 SHA512 60aeee5ba4077b6de0a3835c65e4a72504f37ee24841ac882da38f331fed768dd147d408ebf10215341dca387c906d0642ec380e78b00abce8290c9079906598
+EBUILD ipython-7.18.1.ebuild 3632 BLAKE2B bde74b79f32a8459345d458a7b50aac5b5c740d2f1ce162808dac9ce3dd6493695fe448427cf1083c5e9c657ff3753b7dbf6763e57b2db80d34c2e581f85694a SHA512 f5ffa961c13fe5bbed5eb5eab8b711865bbb2776880cb1da9d04235041b2afe663eb17d585cab5741426b5debb35359ae4d1746ab0577e8708150d12b1f4fa9e
+MISC metadata.xml 2882 BLAKE2B 189477b4ccde9051b61d2a4ff5134907886795f97c5201fc2bf9c012526333151931a1445b6315f286474b71af84253033cbe9bf89bffa7813bfa49a4a07ef6c SHA512 f54fef4552d09a03a8d186c45f917c091928f1de84dfbdd80f1db80912d616d509f10c588de533916d9c494f5b3ca5e6e50a6d8b8c59ea47781311ad4319442a
diff --git a/dev-python/ipython/ipython-7.16.1.ebuild b/dev-python/ipython/ipython-7.16.1.ebuild
index 8a96fc541cbe..900ba194d9e0 100644
--- a/dev-python/ipython/ipython-7.16.1.ebuild
+++ b/dev-python/ipython/ipython-7.16.1.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 PYTHON_COMPAT=( python3_{6..9} )
 PYTHON_REQ_USE='readline,sqlite,threads(+)'
 
-inherit distutils-r1 eutils virtualx
+inherit distutils-r1 optfeature virtualx
 
 DESCRIPTION="Advanced interactive shell for Python"
 HOMEPAGE="https://ipython.org/ https://github.com/ipython/ipython/"
diff --git a/dev-python/ipython/ipython-7.17.0.ebuild b/dev-python/ipython/ipython-7.17.0.ebuild
index 3ba94560a010..bdb4b91bc9d8 100644
--- a/dev-python/ipython/ipython-7.17.0.ebuild
+++ b/dev-python/ipython/ipython-7.17.0.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 PYTHON_COMPAT=( python3_{7..9} )
 PYTHON_REQ_USE='readline,sqlite,threads(+)'
 
-inherit distutils-r1 eutils virtualx
+inherit distutils-r1 optfeature virtualx
 
 DESCRIPTION="Advanced interactive shell for Python"
 HOMEPAGE="https://ipython.org/ https://github.com/ipython/ipython/"
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm arm64 ~ppc ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="doc examples matplotlib notebook nbconvert qt5 +smp test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/ipython/ipython-7.18.0.ebuild b/dev-python/ipython/ipython-7.18.0.ebuild
index cf8e9ceba1a8..634ebd345b96 100644
--- a/dev-python/ipython/ipython-7.18.0.ebuild
+++ b/dev-python/ipython/ipython-7.18.0.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 PYTHON_COMPAT=( python3_{7..9} )
 PYTHON_REQ_USE='readline,sqlite,threads(+)'
 
-inherit distutils-r1 eutils virtualx
+inherit distutils-r1 optfeature virtualx
 
 DESCRIPTION="Advanced interactive shell for Python"
 HOMEPAGE="https://ipython.org/ https://github.com/ipython/ipython/"
diff --git a/dev-python/ipython/ipython-7.18.1.ebuild b/dev-python/ipython/ipython-7.18.1.ebuild
index 474f4f5f8fb4..306f35fa3ed8 100644
--- a/dev-python/ipython/ipython-7.18.1.ebuild
+++ b/dev-python/ipython/ipython-7.18.1.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 PYTHON_COMPAT=( python3_{7..9} )
 PYTHON_REQ_USE='readline,sqlite,threads(+)'
 
-inherit distutils-r1 eutils virtualx
+inherit distutils-r1 optfeature virtualx
 
 DESCRIPTION="Advanced interactive shell for Python"
 HOMEPAGE="https://ipython.org/ https://github.com/ipython/ipython/"
diff --git a/dev-python/ipython/metadata.xml b/dev-python/ipython/metadata.xml
index 2d738f93e425..98db1495da7b 100644
--- a/dev-python/ipython/metadata.xml
+++ b/dev-python/ipython/metadata.xml
@@ -41,6 +41,7 @@
 * 他のPython言語プログラムを組み込むのが簡単。
 * pdbデバッガとprofilerへの統合アクセス。
 </longdescription>
+  <stabilize-allarches/>
   <use>
     <flag name="matplotlib">Add support for <pkg>dev-python/matplotlib</pkg></flag>
     <flag name="notebook">Install requirements for the web notebook based on <pkg>www-servers/tornado</pkg></flag>
diff --git a/dev-python/ipywidgets/Manifest b/dev-python/ipywidgets/Manifest
index 27d00c9ea824..3ef69b4039a2 100644
--- a/dev-python/ipywidgets/Manifest
+++ b/dev-python/ipywidgets/Manifest
@@ -1,4 +1,4 @@
 DIST ipywidgets-7.5.1.tar.gz 5656334 BLAKE2B 8bd98f523b619bea02e01ae5faffb08040dc5011905dd69510728b02736e66444b3c3cdf1e7272884c1df97f610aff790063f783e1d0939786669ef39cd1fc94 SHA512 856b3e4dad331766eff6e5f1fd31984a4b6ede5c678ffd51a4896f6448dac53ba181ccec2821f10e07e0f1095318427affe19f1420d0337bc3d37ef1e0a9ea0d
-EBUILD ipywidgets-7.5.1-r1.ebuild 664 BLAKE2B f9002ab5e29c788dc83c10130d1e42e92c6094216593308ffaefedf5e9a4d6ae5d607a49665a548916eb2c8a406eb04ea3a2832abf4374afc674f0c4f5f299f6 SHA512 ea57701c1282fb716ba8746fb287e0fc46cdef092b969c92833b0aa473d443ec2356f1d8bfc4e07681b3d397050c8314d2102a7a86fd15e6312b30d04ba1952b
+EBUILD ipywidgets-7.5.1-r1.ebuild 662 BLAKE2B 59d22bbe2c5149799509cdb5bf95592b6e4eaadb687fb8a6337ba39b111aece352e86fc44cc811ec45c174ca8e83bdc7c0c17a933312e355f5a355b19413516e SHA512 3f7c57a8e75fdd19b6a718cc09f6bb5b296070f22e2fff8a4a231633c0dd201bb2c96e8083389950086145584f592c670197fc7808fac4d96f4c7c1292e00c61
 EBUILD ipywidgets-7.5.1.ebuild 662 BLAKE2B bca9b4a4d217793b05b1eef3ff58b8a5c0958ae98ecb1acaa7f8cc6417755c9a00d04d98775860ab752ff79545b62814cd9ba994dc20be7816cef2f351a0afdc SHA512 b956f20f561e0d3a835d658adfe8454305a2b6193d0e0bfa5ed2b91b8bd43a8fbece646ccae88e2e9593a5d3b989262b952c7b648723017bce335fe33341e939
 MISC metadata.xml 536 BLAKE2B 885f71096220f3b226d03e8b44bfb31ccccf060a55c1de6634369d2570463912e19146577c10c0152ad0aac8c5d0a107317db1e2a2f705bc8a21efb6ac59a636 SHA512 2e7e02e4dbb0b2ef05216f597a14bca27af0526da6ec962da402e206ec5eb8a9b08174d52cf5d6d231c20c899a7e87a8f942c7cefb93dfa50eeab7bc65d61a05
diff --git a/dev-python/ipywidgets/ipywidgets-7.5.1-r1.ebuild b/dev-python/ipywidgets/ipywidgets-7.5.1-r1.ebuild
index feaa1edb8dc0..4557f0f48e95 100644
--- a/dev-python/ipywidgets/ipywidgets-7.5.1-r1.ebuild
+++ b/dev-python/ipywidgets/ipywidgets-7.5.1-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	>=dev-python/ipykernel-4.5.1[${PYTHON_USEDEP}]
diff --git a/dev-python/irc/Manifest b/dev-python/irc/Manifest
index 131df01cace7..3e7ae2d5f6c7 100644
--- a/dev-python/irc/Manifest
+++ b/dev-python/irc/Manifest
@@ -1,3 +1,5 @@
 DIST irc-18.0.0.tar.gz 91529 BLAKE2B 91e7f9fe38b46f836eb902c8ce4ca04706e673a8a9372c743e9b6be3b400e4d84a0d841b72e2b8444e055a69d37b22d48fcf33c7bd51375dbf0dd4a06b3ed5dd SHA512 a424f1261a09246dd2cfd0b717d4fd9bbeab9754d1f480c870c2e131354db85268bd010ec6b7cf2c59a0c32057bb290ef3ffdcb30cca8c0d833e1497bc89f58e
-EBUILD irc-18.0.0-r1.ebuild 1684 BLAKE2B 9d23782042a6211b0a920a4643e97cf571ebd8bb8c543310e28691b2b6c421965eb535d38650949cea82421a37d2bd06b3f1ee93eb6002413b0bf0a6f5287822 SHA512 050b5c92d0e265fb630d44f2c5e9675997ab79a51dcda216eaa0a35e9f84e43896ec02bad0a4b4f238c02ba4de3e4430b20fe98dbbaade0418afc82420b5c4a9
+DIST irc-19.0.1.tar.gz 118227 BLAKE2B 7cafeaee39545ea2fb2257ca2ea89ccb90ed6d6607be27dac6d72cd9fc2e308a7980cc89ff4e1a491e52b071f3b91f6a56f56c9956d35f10a3bac95f214fee10 SHA512 f472c47c3fb54fd012fe16774cf19d43e07cfbc314347b02a280b6bf1d08eda9cbc13d4e3adf3af5f22b31d41e7160c44dbde9479abed01e0b5224f23ec9a0d7
+EBUILD irc-18.0.0-r1.ebuild 1629 BLAKE2B 13905c88052e024e8469d5a665822eeb57a7cef175dcd05a955b1e9b79e28abe2614a8a7d6ba3c23d79b0bf025ea9ea2bc320e5450c6a50aaf872c0a9871e7d5 SHA512 d3c99499cdcf4c6a1c0e851081d978005c3b5bcdfc8c9d2484447f0665d9c8d3048dadec8db01e9c1e77d685ee85c0f6dacabc7256aeb0e6f255219a4b1e131d
+EBUILD irc-19.0.1.ebuild 1641 BLAKE2B 359bf2a7aa9f73acc0285cb3d6b121253f88f5638b95725768108de698c896fd09c0cd212273d274b13472926797ad447b9eeb96615333beda18e69469256d2f SHA512 e4845b502df64ff7b073aff089ec3038d13b8cc424f6a1a71746cecf5a74fc95a93a7fab44436c72d68469a64cace55e5fd4d28385f6e7b45b2792ecdfd73c08
 MISC metadata.xml 815 BLAKE2B 0431114b3a5e9f0ba4d316502ce7612a7b987d9189789c0e156f6cf970c06fea9353c8b8fbbca828f3b89b2b43e42453ee6073b90097fedf92ce0e6a6061ea8c SHA512 a6b414ff2bac0bb47c4330707b9e09236a7ef2ca13d4e5ed19aa1bc514998ba0139643fd3014ca451c19b446452a829c074b5d2015e761a914373d1b5561c482
diff --git a/dev-python/irc/irc-18.0.0-r1.ebuild b/dev-python/irc/irc-18.0.0-r1.ebuild
index a0838bdf12cd..a96210c789e6 100644
--- a/dev-python/irc/irc-18.0.0-r1.ebuild
+++ b/dev-python/irc/irc-18.0.0-r1.ebuild
@@ -32,7 +32,6 @@ BDEPEND="
 	>=dev-python/setuptools_scm-1.15.0[${PYTHON_USEDEP}]
 	test? (
 		${RDEPEND}
-		dev-python/backports-unittest-mock[${PYTHON_USEDEP}]
 		>=dev-python/pytest-2.8[${PYTHON_USEDEP}]
 	)
 "
diff --git a/dev-python/irc/irc-19.0.1.ebuild b/dev-python/irc/irc-19.0.1.ebuild
new file mode 100644
index 000000000000..2d780f0ed7ab
--- /dev/null
+++ b/dev-python/irc/irc-19.0.1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9} )
+# [options.entry_points] is present in setup.cfg but it is empty
+DISTUTILS_USE_SETUPTOOLS=manual
+
+inherit distutils-r1
+
+DESCRIPTION="IRC client framework written in Python"
+HOMEPAGE="https://github.com/jaraco/irc"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="examples test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	$(python_gen_cond_dep 'dev-python/importlib_metadata[${PYTHON_USEDEP}]' python3_{6,7})
+	dev-python/jaraco-collections[${PYTHON_USEDEP}]
+	>=dev-python/jaraco-functools-1.20[${PYTHON_USEDEP}]
+	>=dev-python/jaraco-itertools-1.8[${PYTHON_USEDEP}]
+	dev-python/jaraco-logging[${PYTHON_USEDEP}]
+	dev-python/jaraco-stream[${PYTHON_USEDEP}]
+	dev-python/jaraco-text[${PYTHON_USEDEP}]
+	dev-python/more-itertools[${PYTHON_USEDEP}]
+	dev-python/pytz[${PYTHON_USEDEP}]
+	>=dev-python/tempora-1.6[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/setuptools_scm-3.4.1[${PYTHON_USEDEP}]
+	dev-python/toml[${PYTHON_USEDEP}]
+	test? (
+		${RDEPEND}
+		>=dev-python/pytest-2.8[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx docs '>=dev-python/jaraco-packaging-3.2' \
+	'>=dev-python/rst-linker-1.9'
+
+python_test() {
+	# Override pytest options to skip flake8
+	pytest -vv --override-ini="addopts=--doctest-modules" \
+		|| die "Tests failed with ${EPYTHON}"
+}
+
+python_install_all() {
+	if use examples; then
+		docompress -x "/usr/share/doc/${PF}/scripts"
+		dodoc -r scripts
+	fi
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/iso8601/Manifest b/dev-python/iso8601/Manifest
index f3c28b910bfc..03f063020114 100644
--- a/dev-python/iso8601/Manifest
+++ b/dev-python/iso8601/Manifest
@@ -1,3 +1,3 @@
 DIST iso8601-0.1.12.tar.gz 8868 BLAKE2B 5463af17cfaf2c1f256790ec11dc50f808857abdf0a341f2c88033e9e94f09069ed570223c3743007e0fff8fdd9a714bce0ef3e88a961c2bb131b79e88a1424f SHA512 d64f3a83fd3a678446e17fb35265c0487491a53a2ec306fe2332c59e9e471bfe8580b3280da7ae13664f07f7f29edb0347196351ab698849ccaefb52d6ce6613
-EBUILD iso8601-0.1.12.ebuild 559 BLAKE2B a2b7b6ac8888fbfbe35163de186f6085ecc5631d91c47c0e3fd9edd4b07715211354e8b43c3ba692f6208e6ad3d6a169c709329561426e6e8fb2381978aa0172 SHA512 c1cb4cca48b6cf85c9d8090e6c5b61e660176a84c34b9aea33a9d53860712be0f5dd1e34847f086a1b90ea752051232c42c03ebe19bcc86906e91ca12cb43fe2
+EBUILD iso8601-0.1.12.ebuild 566 BLAKE2B 5d721700a57452aea3b58b90570def041efd983e45b18e3aadd12a068b8f57426d079ac1470f39755cac09b411b616e0ec974a8e9aa7494c65cf9bb272fee2e2 SHA512 8748204961045421202b71fa6511893ee77c6545c29570476cb3e5ad62425462cabb7a9e66c0f08514e0d573c8f71bec252d323d899728a190243b10cae8cea0
 MISC metadata.xml 334 BLAKE2B 5e73aa36a751a0547b8c8d39ef2a9cd3c9b4b5a41cda2e4ab47850fb4ef86fc4a9fa0f819329409b6fa34dcb031b38cf2532bdd33b59db85e61953e08b5f03de SHA512 70d83069bca1f66a6229800c51a0f8a5081a23072eb9d432e07c9945500899f769217ca989de90886896371d5f7d9a95cc976048035d1d6d615fe602ee471589
diff --git a/dev-python/iso8601/iso8601-0.1.12.ebuild b/dev-python/iso8601/iso8601-0.1.12.ebuild
index 794ce2637c07..0771ad4c104e 100644
--- a/dev-python/iso8601/iso8601-0.1.12.ebuild
+++ b/dev-python/iso8601/iso8601-0.1.12.ebuild
@@ -13,6 +13,6 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
 
 distutils_enable_tests pytest
diff --git a/dev-python/itsdangerous/Manifest b/dev-python/itsdangerous/Manifest
index 6087dae51ef4..ae115f83ef50 100644
--- a/dev-python/itsdangerous/Manifest
+++ b/dev-python/itsdangerous/Manifest
@@ -1,3 +1,3 @@
 DIST itsdangerous-1.1.0.tar.gz 53219 BLAKE2B 6ad74dacb9728e77d57ac5e364e79e3cc749be206fa03e82a407cdd77b5b72ddb4861bf181772915e684539e6404c6a45f6081c7c8e17a33a2d532b4fc3fed80 SHA512 61bab3fce5f87a3b5fc8fad61e735a63df6aa039416ee3494e1c99a2a1162b4fb72793bc5dc949de0985724c40121810b159513606c4c3976a7666dba3a1b93d
-EBUILD itsdangerous-1.1.0.ebuild 677 BLAKE2B ff9355ca4ffeb4382a63cb49f3245318fe3dd106ba76ff4312478495ab9dfa0bf55faf96320a6e711d514482d4cb503c63f46176653a9be25d31723c110192ac SHA512 2687a0de211ae6506f11c1826efcf2b6f934090c3e2fa1eab6d2f8a251ccdff2b36345320b94284262eb2e6f69337cfc6d4825bce856cc060aeb503b9beda6e9
+EBUILD itsdangerous-1.1.0.ebuild 684 BLAKE2B 5d7bebb3b39f622b881c60b1ab22f078270dd0d56c72e5603ac075f1b46d9b64468d1f9bd6fe57d041559514c14d77a1f3ddd0d0b2fe02786879570735f33127 SHA512 7b8f12f6c193530c44d032746a32f427343349a3d7113cfb19ff467f737b17f7125d9e145efd540cf6e144277c1e95cad39d1b646345aca5ac30d35db97404b2
 MISC metadata.xml 325 BLAKE2B 77ff2333a1e15eb410f0c320bf5b62c19568bea653b4cda79294debf6dad02b774f914ecfb3cecbe0adb1630e36bc82727ae77ab09f2b8314fe2ccc101df6737 SHA512 ea6c9ac90af243fc0367615835740108e37ddb9547dd9f288572af097c978e11c3fb2a17398950fbf842e6d1a4fb0410a74e769ad7b0c103b2d9301497578e22
diff --git a/dev-python/itsdangerous/itsdangerous-1.1.0.ebuild b/dev-python/itsdangerous/itsdangerous-1.1.0.ebuild
index f605c2dc5797..c6dd5840a4f3 100644
--- a/dev-python/itsdangerous/itsdangerous-1.1.0.ebuild
+++ b/dev-python/itsdangerous/itsdangerous-1.1.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 
 BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
 	test? ( dev-python/freezegun[${PYTHON_USEDEP}] )"
diff --git a/dev-python/jaraco-classes/Manifest b/dev-python/jaraco-classes/Manifest
index 5eaf8b0b3d3c..f19cd3383819 100644
--- a/dev-python/jaraco-classes/Manifest
+++ b/dev-python/jaraco-classes/Manifest
@@ -1,5 +1,5 @@
 DIST jaraco.classes-2.0.tar.gz 9911 BLAKE2B aa5e5c90f16c9536239ed61e6dccbc426244c98a33a944de32239bd42a0a4944e5df3529cfd525e05cf276a4a4b028edcec734006b549053ac8817032f52b2ea SHA512 83c9a570f951ef6c3708243dce6397cfbfe963db5920550ac807878a69860b34831af5f277f956fd0b327d85462676fd6386a22d6d97c7616e01ca81d7ace694
 DIST jaraco.classes-3.1.0.tar.gz 11616 BLAKE2B 5b438f7582a9a93ca4fc97a71725c1fe3275e4bfb48f5e06b549f7ac8fb6900262165b1ad0638114d3a8d11c10f449b7930d4c2d66fa928665aaff820af88937 SHA512 697d892a01c4e8ad83f57e69dcd744f976cea67fa3efcd55b10eda02f6bf1916162c0fa952d0d711e62f62fdff62740ee55a93be9fc46ebd4ab22416092f0ff6
 EBUILD jaraco-classes-2.0-r1.ebuild 1653 BLAKE2B 0debe2ad86864beccbb67d70d725a8ab4b228006cc7f63fce7981c69cc0a8ce0661c3b5bc79996f0bcb79d1e1539a393fe2847e2b97d5de0ca49dfa149c40090 SHA512 54fbd8c51e0471920e04dc42f6634bf84719a879417cb577d4634b1cb851dc5479b2a8f93f54b0ee7ff6e4b7a2a54cb0340cac4ba16f29e6aedcdf5839b35306
-EBUILD jaraco-classes-3.1.0.ebuild 1646 BLAKE2B dabf68fb1b8f8901945196e75dc60fe8ac2f99eca622a9b225d3d4509760a35538b582e412e72f26164572496bd0a8653c0934d477b56bb1c957f6069badefed SHA512 9c7d83eb8977e07684d956cab98c77f861fda3a54483b021b7b4ef5d781bf6f7442a8d9c4c3ceb786e9aa6063fa621dbe3e20d3d3d0a791e518177aa69ec7302
+EBUILD jaraco-classes-3.1.0.ebuild 1645 BLAKE2B 1f63545c418cf16dc30aaedf9d0fc1162c25915799b41c463263c9d413cb98cd2f287e5651a9ac44223ca58b0d596d9c6d983ed0862bab74d17f901731f6a386 SHA512 3d28413e382151b831cd2f1fefcaa1f8a5a44ddec6d3932be89cf022123168a3ff520dd3e7083236cabf9cb632537af88fb6e7975737b581d02c1271463badff
 MISC metadata.xml 553 BLAKE2B f5e492cbcab83e5783cb3be7f42c48654f7dd4ae620d92029d7e51c653a1c78b7488bfb6ffaa03a08fa3aa0e99b1b2384cd15de6846ea16ff4f89d948cef5900 SHA512 03759959ae7a56bcfb92581e9586cdc5afe0a5347009a74aa4394d4f65c9b929b15572f7faa02914d376443204b693544fde85e61558688c547a58652e4d2800
diff --git a/dev-python/jaraco-classes/jaraco-classes-3.1.0.ebuild b/dev-python/jaraco-classes/jaraco-classes-3.1.0.ebuild
index 1e6374b3d94b..c633df5dae46 100644
--- a/dev-python/jaraco-classes/jaraco-classes-3.1.0.ebuild
+++ b/dev-python/jaraco-classes/jaraco-classes-3.1.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ~ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/jaraco-context/Manifest b/dev-python/jaraco-context/Manifest
index 3065c52ce449..97d7648349f3 100644
--- a/dev-python/jaraco-context/Manifest
+++ b/dev-python/jaraco-context/Manifest
@@ -1,4 +1,4 @@
 AUX jaraco-context-3.0.0-useless-deps.patch 2133 BLAKE2B 8db1fea20763661a3d6786536de6ed956a1e3f2952a96f7242b5735f2ed782496dcc662259921e4eb2967655da4f94ad7262f282caf3bf15428c704f4a38890c SHA512 16608605a401fbd002714043da0a7a28fc770f8972a808d71da19733fe1992f7f1f27f1d87462900c980bd14ba4c493349e5802f735e795a2e2c3d7012d2773f
 DIST jaraco.context-3.0.0.tar.gz 12901 BLAKE2B b0a18d8799de211c9827a708302798372dff06767fbac08f4bff8ed48e1dde4cca8d3896a3c4dccd186efdc4d80ffe2b972a05e8f351ec53dcd0c7dec45cfcea SHA512 fd48a9af65edea3212c194758ba1a8fc2d7efc35f7eaec959a7f327ad46d1bf15f295af29d62726f813d35baaeaff35bc3fcd6e27a0e0f272232772e1cb87c17
-EBUILD jaraco-context-3.0.0.ebuild 1122 BLAKE2B 7c52d1532ccff0b303988f86c61e22cc194851eb4d96cdf0e81a30a5a3faf166ceeccd7555368c43bd443781918b98cb41a92df91907ce84ad776e010ae20cc6 SHA512 e9dabf3036916d9ec75b5e51e149be77e4da09bfa82f270d420611137cee1e0a2d971ab79006b5c7efe676f01fb30b8998ab613e1d3e1bc8e1a5b61d0f5b20e2
+EBUILD jaraco-context-3.0.0.ebuild 1119 BLAKE2B d1f214d04fe1cd50dfbca6964e6881c3de9b9cd4f2abfe49cfef746074587ca4981f14309dd588cd99d1f253214ef45e1731d5a0230d9b7a9baed882184f21ae SHA512 59daf4643686f2fd67ea2cc7b154e5c5a959fe920ac944295ca6be1bd38e963e0b6149d620890abdcd04bb9cf0b9fd6ed5ea67fd28d8c9584620e868f38e8335
 MISC metadata.xml 240 BLAKE2B 41e6a4d9da33dab2decc5ff419924f382a8f64d27a81fdb97576db8c6cf125be95911747946ec8be1b453f56617fef1084f5947f84b50a8db419d46df2ae8a0f SHA512 9c23321eaa853f851bf00195ea64ac2ba093e516f9b57855ee5aa58fbb1988130c9f0c17c2a9ce9fae4ee033e0a28a70c868e0f5acdfa1dd316ab533c5279d59
diff --git a/dev-python/jaraco-context/jaraco-context-3.0.0.ebuild b/dev-python/jaraco-context/jaraco-context-3.0.0.ebuild
index e452794c4180..8aab19ff3ad0 100644
--- a/dev-python/jaraco-context/jaraco-context-3.0.0.ebuild
+++ b/dev-python/jaraco-context/jaraco-context-3.0.0.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/${MY_PN}-${PV}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 arm arm64 ~ia64 ppc ~ppc64 ~x86"
 
 RDEPEND="
 	>=dev-python/namespace-jaraco-2[${PYTHON_USEDEP}]
diff --git a/dev-python/jaraco-envs/Manifest b/dev-python/jaraco-envs/Manifest
index 71a167e416c5..d64cc9613043 100644
--- a/dev-python/jaraco-envs/Manifest
+++ b/dev-python/jaraco-envs/Manifest
@@ -1,3 +1,3 @@
 DIST jaraco.envs-2.0.0.tar.gz 10018 BLAKE2B 8ad47fb7cb8f68081bba0e83368fe3a2f069130153b78be375a7a4543cf85e00ca1e365f9fb5a76d54f771879e87ff4737fe2991a9c520a9f86f21cf5d9aa8ce SHA512 f121c25ecce75beece7ed7218e69616f7cec6e493f9734b8ce040368d0fedc1ca4d7d343ba41c1367451a744f28ed98d9d2f3abc4610bfa8709fc29480c5ccbd
-EBUILD jaraco-envs-2.0.0.ebuild 1031 BLAKE2B 52e2efe76c6328d90b7ebb50db9f3c0ff95b2e8d0fca861340524dce717a9d2dbd6ef0c7c89aab5fab7d4d1f25b82a63b40c65d4c177246c5f40e9ada01a3ae9 SHA512 5b6216b8b4db90a528b9269015220e1e44d22fb9617dae78d646d0cf74b6ebf0094f5af45898c330cb5d63d5208b1dc86b80dcf8f38143e310ac10ffdc189261
+EBUILD jaraco-envs-2.0.0.ebuild 1030 BLAKE2B c7f36e96ee3ef5ca84de9e4068cdbeec3745fb6f864288f44325afabb24a76c85b55f321a7f231db18b59478d53659f5c4e141f4c69dd493b19a5d669b43af5f SHA512 64bb1c3a7b36b5e731990a1cf4ae245857189232abf73365fec3d448cbf3966a568f6caecd46e58f40b79c7c599896f3938818a88c887f681ed95c6e082e3951
 MISC metadata.xml 396 BLAKE2B e6dc26e54f94142429135696cc42201a0ccc3331a3e87cb3294bdae386b84a0f804bb91410294dd076badeae53d93b5da2158e8114aefdefbb91bd93ebb14ba6 SHA512 1456e135ae43a738ce79411b5040513a24acfadc4ea040cb93adcde5f61e6eed7c0798f42b32ce473d4bdc6563c755f5f4387f5e3cce350d557cc00a6efa899a
diff --git a/dev-python/jaraco-envs/jaraco-envs-2.0.0.ebuild b/dev-python/jaraco-envs/jaraco-envs-2.0.0.ebuild
index 9f373e18842e..a70ba1c43607 100644
--- a/dev-python/jaraco-envs/jaraco-envs-2.0.0.ebuild
+++ b/dev-python/jaraco-envs/jaraco-envs-2.0.0.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ~ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86"
 
 RDEPEND="dev-python/namespace-jaraco[${PYTHON_USEDEP}]
 	dev-python/path-py[${PYTHON_USEDEP}]
diff --git a/dev-python/jaraco-functools/Manifest b/dev-python/jaraco-functools/Manifest
index 8ccb766dae4c..8ae17a59c6cf 100644
--- a/dev-python/jaraco-functools/Manifest
+++ b/dev-python/jaraco-functools/Manifest
@@ -1,3 +1,3 @@
 DIST jaraco.functools-3.0.1.tar.gz 16996 BLAKE2B 8cad1532753ae5c941038d4b8cda17b49f2d131405bb010d3747ecafc1ea4f72ad2c91b1ce2c499cd2885b18a9fe2cd1ac1bf06d58ed6f13a7a379cf9deb0e66 SHA512 96696839d3405e571bd0120443c5494f13d737b7e0fd9324a7a003c88ff45bdaa89a717c81b9c5ecb4eded9781ba2c05f4735e5cf24c1d1c162fc3d55d38eedb
-EBUILD jaraco-functools-3.0.1.ebuild 1562 BLAKE2B 4696832f693603770559aa3c57822cfaec47682d2f9f298c2a4db277bb2acf8c1025c2deaf817a61520e1198ee977039feec5e89bf150a945526d4ca4fdf6fc5 SHA512 145584d185a0ff801e2a1eac747c36537486de5971b747c3ec25f093e4036fa65e33a4972af8de1acad84a4f6e2f33c05e1fd7fdb22b94515bd996ad3f3811a2
+EBUILD jaraco-functools-3.0.1.ebuild 1561 BLAKE2B 642e578dbdbd9a79e4819f8680402a3136f817b5d4431899233b95bb3c88595652f28aee701f73bb5c79a75c7b26c009cc8e986808a14419d50aace0d2dcf6fd SHA512 d88dd5c09fdcfead5e8fcee3aed79e8ed1ce15e92e9094d6abce0a381b2b2aeec23deef1df5a84dc513c9a097734999d6a589b9718b2153b2a75d51bc77c34bc
 MISC metadata.xml 651 BLAKE2B 3b8c3e620ec97e632d9d67c336e08989f662e36cd55ed0c283f7f9f4020717e099f00a438e550d38ddde73ca2736e728e74e8110ac957c797b109aa4252503b2 SHA512 04cef990bef9e5c53188b1c5997549644588a0053c06109992ae4d1757c3cc76553b3a3bcb535f4e3a0b33d679083d4c2247a73bbe69a6b1b606f99a6c96abc0
diff --git a/dev-python/jaraco-functools/jaraco-functools-3.0.1.ebuild b/dev-python/jaraco-functools/jaraco-functools-3.0.1.ebuild
index 2a5017a2f033..9710b82bb05d 100644
--- a/dev-python/jaraco-functools/jaraco-functools-3.0.1.ebuild
+++ b/dev-python/jaraco-functools/jaraco-functools-3.0.1.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/${MY_PN}-${PV}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ~ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/jaraco-itertools/Manifest b/dev-python/jaraco-itertools/Manifest
index 3f7e92aa2c9d..239613742a31 100644
--- a/dev-python/jaraco-itertools/Manifest
+++ b/dev-python/jaraco-itertools/Manifest
@@ -1,5 +1,5 @@
 DIST jaraco.itertools-4.4.2.tar.gz 19431 BLAKE2B d3493380f9522d436d4d8dbcdf484e7fd4fa223e96fabde0d7f3803c395e56d0bd28f49b9a6bfec0b680fdff7f5d145c85530036157f7976ffa82fc4851e3105 SHA512 74db7a3c7595c7deaf2a0c9ba68e9b02d02ccbc6c65142de34a5339aac679c2d71f05b27e27632d265de4f78997e11d7dc43178bd0d64f3010e1568a5085812c
 DIST jaraco.itertools-5.0.0.tar.gz 19517 BLAKE2B b38bbb75daa53ce9390a51099b3ebad16696924c26c6674a7c5b9ae5e219db6560d1bae24b4c491d6e424b7fecea66dac2eab673d0cfa91fbdb3a4246b852944 SHA512 38ae2cbdd436b277e3d3c252fadeb5239e2d32b2291686b2a3dbaca69328392eb1db4318b2144954b17302e5b15b94ad89f1ea8a1b2e354deec7d4516bd7ec85
 EBUILD jaraco-itertools-4.4.2.ebuild 1655 BLAKE2B 70cb2db3fc1c9f808ab510019df7456534be797b784bacc44cab4a4e3c258df7c031165ddb30e2fe155a3048a1626e5e5ab6f8332bbc1b361702218d9ddc64e6 SHA512 8673b99b27f52724a005f3e99ed702aebab1d5d2cbc6ee2ed0f7d72103710d76c09160d6a852af8d6ba002d3dc7a27b6c21416c6d7c822ab5f9fb828be4f2f76
-EBUILD jaraco-itertools-5.0.0.ebuild 1858 BLAKE2B 46c40ec0e5acafcacd2f3b650e86aa91e9576d913677300d68a10c49634af20d9ccfd45edbae40a447371dd2c286fba69661e3d683f4a63999cdfbd2c99ea451 SHA512 b945b192f6befb60a6a81da6cbc91dee22ce032a75197737e4a943df78e09a30b391206c0fd1fda1e355da40d5187999217b21d821e132c3fb1a89a91fc1b389
+EBUILD jaraco-itertools-5.0.0.ebuild 1867 BLAKE2B 20202c986a12b87cce9e2eda2d2dca854b9d1be990577a821782546561e2addfc28685f8723e282162733b9724de81bb8277e06f4ea34eb7f11326f21f20a964 SHA512 3ef9f9c91ce8cfbf066ae7ece4d9bffd23241524919b6776f44addc22e4db534993004b1bd58d3f229ffa674b4bfc97203d4fbf6d09ae88ea35505ff44d25d17
 MISC metadata.xml 550 BLAKE2B 9a0db00bf8d20a8942cc362092d64aad0a91d47e54fc5a7c3a6d444defb32a1045f0993d3ad2c61f6edbf059c633388ff4109e71af3454824631e79388bcc5ed SHA512 f60f044460ba89008629bbde7c052af0159ad7044124606a7cddbba403c9a20bae9b91839ab76e48e1b0481f2a6cabdbc4ca0e00e636955e2149f5ebddfd964c
diff --git a/dev-python/jaraco-itertools/jaraco-itertools-5.0.0.ebuild b/dev-python/jaraco-itertools/jaraco-itertools-5.0.0.ebuild
index 4ffbcec2bccd..5e85df429dec 100644
--- a/dev-python/jaraco-itertools/jaraco-itertools-5.0.0.ebuild
+++ b/dev-python/jaraco-itertools/jaraco-itertools-5.0.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( pypy3 python3_{6,7,8} )
+PYTHON_COMPAT=( pypy3 python3_{6,7,8,9} )
 # [options.entry_points] is present in setup.cfg but it is empty
 DISTUTILS_USE_SETUPTOOLS=manual
 
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/jaraco-logging/Manifest b/dev-python/jaraco-logging/Manifest
index 3bd30abb9593..00ec8ecfe0be 100644
--- a/dev-python/jaraco-logging/Manifest
+++ b/dev-python/jaraco-logging/Manifest
@@ -1,3 +1,3 @@
 DIST jaraco.logging-3.0.0.tar.gz 10739 BLAKE2B c5cad0b6d7702a1216869dd0cd388d51a0a8e7bd24000108ef818623b54d23ce1adf0de2e017b869d764342484bf25d676ee18af9647b82964933ebb184cec0e SHA512 bc0edeef6223d0eb78110d51159a70afd16542e830e3cd37dec7628e582bce44218cd7669c03c41125db9824b6fc774f608dd7f6540224659f4dc2f1927d681c
-EBUILD jaraco-logging-3.0.0-r1.ebuild 1400 BLAKE2B 29a93b2ab8cfa6ec2d34252f6ead5319fc5d555649c88b373d15ec11189f4d369a3c82704356612e6508b753d58a13f1f0dbd7b3ca5e12001687b8bac64e5e44 SHA512 1727c121fcda6460ee26679616d7cf3541028283fe83763342102e13f30f985d3de7e9f390634fd272f0e6f663ef328ca2297dd9c5acc81817e5d692cd660479
+EBUILD jaraco-logging-3.0.0-r1.ebuild 1540 BLAKE2B b0142d1bc9ef3226f7865a76ee385b0306aca2dab4c6cf05856cba220d4f0efaf5b3f3c0e64003648d5be9a4ede46611f73824a2f1fceb81493ece54cf3ab325 SHA512 03989576dec3cf883e82da47ec5889cd7ba0b2041c87b17bd19fac0d8a9555850a1c7183eaaac6c2d76c241ceb60af4ff4f3f5b4d7d1fbf803ffb372e9465846
 MISC metadata.xml 452 BLAKE2B 6beacf543b6c6ba9482609f0374283438dab3bff1ba25c53f1ec6c6441ddd0e185336766eaaae3ef89277874c6f12652a68b79a934919c8fe70f8bee88872b43 SHA512 447053b09d211ddbe1b2e98f7c1379395291f1331c75837ba1dc036a3b5d1e05e1f78717c419c4dfdc7d687001992f4c926cfc61bf267aa925024180646a3296
diff --git a/dev-python/jaraco-logging/jaraco-logging-3.0.0-r1.ebuild b/dev-python/jaraco-logging/jaraco-logging-3.0.0-r1.ebuild
index 2470aa63d5e8..46c712a12fd2 100644
--- a/dev-python/jaraco-logging/jaraco-logging-3.0.0-r1.ebuild
+++ b/dev-python/jaraco-logging/jaraco-logging-3.0.0-r1.ebuild
@@ -3,7 +3,9 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( pypy3 python3_{6,7,8} )
+PYTHON_COMPAT=( pypy3 python3_{6,7,8,9} )
+# [options.entry_points] is present in setup.cfg but it is empty
+DISTUTILS_USE_SETUPTOOLS=manual
 
 inherit distutils-r1
 
@@ -26,6 +28,7 @@ RDEPEND="
 	dev-python/tempora[${PYTHON_USEDEP}]
 "
 BDEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
 	>=dev-python/setuptools_scm-1.15.0[${PYTHON_USEDEP}]
 	test? (
 		${RDEPEND}
diff --git a/dev-python/jaraco-packaging/Manifest b/dev-python/jaraco-packaging/Manifest
index cdd4fb839c9a..9677e944a552 100644
--- a/dev-python/jaraco-packaging/Manifest
+++ b/dev-python/jaraco-packaging/Manifest
@@ -1,5 +1,6 @@
 DIST jaraco.packaging-6.2.tar.gz 15408 BLAKE2B 21c63b4e400bdf8b4b79873e6a96c7576b91500624c942246a8f64fc06da22e90203832c3c3084803c6ee23af8f102bb23cb12276cd3bba13446815f4a71f0dc SHA512 f8496a9dccb29dbac24927b40bc29d472b8c6bdb939bfcacf70196130ba9c961747a8b75c63574352a8bfeb2a512eb849dfba3344e942f1338ea1538e0767f33
 DIST jaraco.packaging-8.1.0.tar.gz 15322 BLAKE2B c354bec458a319bd9df0667c155203efa5c3de2d95218d0dd3a5878011d2d8fef694a490a2bac0035bff8daa18d1a3447c2c8dab7c0bd7bb09b62969f91d4709 SHA512 99996765cb047f2f0416d6afc4ff6ee0d84d03da0e07c7a7121518fbaf668f587c044f567c1d66a455372897ec1634ba5ee490552ac92064ca072e20b8f60a3b
 EBUILD jaraco-packaging-6.2-r1.ebuild 1720 BLAKE2B fd913fd7648b24dd2c7fa1f7052cc4f4482c8536c2d18a2061d2ca05e8cc3bca86cd363fdc272bbecb421a0cc1d564fa257634a165f08c5358c8844781c2804c SHA512 49e64e395070a768954473a163b419037a8689673b85a8fa1464caa10a1ee75cc8b78abb3f7ac74001807853465d619cfc58d39db6870baddd2dcfa5c3fd7245
-EBUILD jaraco-packaging-8.1.0.ebuild 1497 BLAKE2B 8bbbe2fb48701a54863bec94b42596690b500eb56ecaeb3ef67d2b63042fcdf8dacab82df3e9bec2fb49ac23691c82b916208025dfbe39a3f6b9977b1c3484e9 SHA512 8ad1d01ed66de7c75963b480dd399e687131b6f1d77cc4260b6a96ae34fe4c6259294255d55add2ab6d1af9f2f456c68fa9a207d8d30e96d0e4bf91a0f14a460
+EBUILD jaraco-packaging-8.1.0-r1.ebuild 1560 BLAKE2B 9708457a39412c13e9d6958421988dab3c6c03b8e3ba940c815511c839bd43fbe4b1a685b5d616ebeb0cc190b7a2cf27f1b6335e241c7bf5770a6d7612a65a1d SHA512 997b0cbd1930f5e62e15ec49dd7a05f6cf9b0b73cd65555bb7519ffb1557706228e199d052a3cecc7f076bc7c2ce502507be2c22d76374c93f91b3c0e6789ae3
+EBUILD jaraco-packaging-8.1.0.ebuild 1504 BLAKE2B 0fb8c8862a24fec2ae8d5072d3aa79f19568ba4591fad16ff58d627714efcf35bfc7d33b431bd18095144c0c1c4f87a72c8ccca8de72b6eb7dbd5584b63f09c1 SHA512 8d8fd454efc874c8a1267ee7494bee7e7ebc5e3af1653cd13f98d06f028b3a42bb22dc17f5c8f72d13b0e776856208d1098cd6504f0fef66eb42af02e983f693
 MISC metadata.xml 651 BLAKE2B 145a05709cfd4b85e623982b7defaf588eb0d68ed3fcbb52655a5a8cd10fcb2cfb269b9179e81e5409be0485f4c71565ecbdc4019d9f07f322d2cfbc3731c2d0 SHA512 d8f857056e0a73cb34903a7001cda6f543eeec0182a87ee2bd660631ab9e855d1214166546c179b9711ec8ed9a5063b14d9362001e67203a7132694112ebf086
diff --git a/dev-python/jaraco-packaging/jaraco-packaging-8.1.0-r1.ebuild b/dev-python/jaraco-packaging/jaraco-packaging-8.1.0-r1.ebuild
new file mode 100644
index 000000000000..a80e08b70b10
--- /dev/null
+++ b/dev-python/jaraco-packaging/jaraco-packaging-8.1.0-r1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( pypy3 python3_{6,7,8,9} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+MY_PN="${PN/-/.}"
+DESCRIPTION="Tools to supplement packaging Python releases"
+HOMEPAGE="https://github.com/jaraco/jaraco.packaging"
+SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	$(python_gen_cond_dep 'dev-python/importlib_metadata[${PYTHON_USEDEP}]' pypy3 python3_{6,7})
+	>=dev-python/namespace-jaraco-2[${PYTHON_USEDEP}]
+	>=dev-python/six-1.4[${PYTHON_USEDEP}]
+"
+DEPEND="
+	dev-python/toml[${PYTHON_USEDEP}]
+	>=dev-python/setuptools_scm-1.15.0[${PYTHON_USEDEP}]
+	test? (
+		${RDEPEND}
+		>=dev-python/pytest-2.8[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx docs '>=dev-python/rst-linker-1.9'
+
+python_test() {
+	# Skip one test which requires network access
+	# Override pytest options to skip flake8
+	PYTHONPATH=. pytest -vv -k "not test_revived_distribution" \
+		--override-ini="addopts=--doctest-modules" \
+		|| die "tests failed with ${EPYTHON}"
+}
+
+# https://wiki.gentoo.org/wiki/Project:Python/Namespace_packages#File_collisions_between_pkgutil-style_packages
+python_install() {
+	rm "${BUILD_DIR}"/lib/jaraco/__init__.py || die
+	# note: eclass may default to --skip-build in the future
+	distutils-r1_python_install --skip-build
+}
diff --git a/dev-python/jaraco-packaging/jaraco-packaging-8.1.0.ebuild b/dev-python/jaraco-packaging/jaraco-packaging-8.1.0.ebuild
index 7e637144c698..a14d9974caad 100644
--- a/dev-python/jaraco-packaging/jaraco-packaging-8.1.0.ebuild
+++ b/dev-python/jaraco-packaging/jaraco-packaging-8.1.0.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_PN}-${PV}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/jaraco-stream/Manifest b/dev-python/jaraco-stream/Manifest
index 507fc18822ef..0a905d863356 100644
--- a/dev-python/jaraco-stream/Manifest
+++ b/dev-python/jaraco-stream/Manifest
@@ -1,3 +1,3 @@
 DIST jaraco.stream-3.0.0.tar.gz 11838 BLAKE2B 9d26ff8f78a3f090d79ccc8cbc41819a8290ebdb7770f56a57938ad9311ca1fd168d633fec78ee102c2c08156c9e0ae6f521dd5cafcb9df22928ba9f3f832734 SHA512 f2ce7e65d9a3bcd81985f45d03f7cd56b2f2939f13a423b8b65714f19eb249493d89cad774460dd08c1345124d3d10f85ce6875b5f7049705f993c0a3146e5d9
-EBUILD jaraco-stream-3.0.0.ebuild 1402 BLAKE2B 5134ec16b580ba72299daf485aa56c744b2d4714faa0dc49d30e774485b343bb44872c86e7b6245842a6b461f1218b7fbe9811222331386282f6371f2c554826 SHA512 f220b21aa50eb5aedd28e27b2f7261903a855a84e0379e99bf1228d377c38c9a3912f3fbe1b96e442c6e6fdff484337b2ddf1e908efaddd32cb05d2784cca926
+EBUILD jaraco-stream-3.0.0.ebuild 1490 BLAKE2B 5b3d01893d9c1a324009dd8b138a23c28b121364763c5d286b4b6fddc23bda8c2635e222b83cef447bf13b4a1a88aa3e55f366a3df034401115534fb01556b9f SHA512 20bc599cea83d369f875e97b415e34f8171e3ce29f49884c47c1c3710395b9c1a8366b2af0d72ba9cdf420acd7c553ff598c833ad85c2fc7cf72730241c6f8f5
 MISC metadata.xml 602 BLAKE2B 3875bfb93914028b263ef5b6f7af81ee9f3fc08f1217537363a02b12e69f273ad9344c5078ea284ed5edfee1389bace975f2745379c3b4b17db4fbeee4045494 SHA512 3a6635e6f38260c76979248878ff326451273bab021f3e85c23a0ae7e29d71daa53ccfa319c8d8457faa00c6fdf5ad3dc68e0693e951ecdd419182f1861a36c0
diff --git a/dev-python/jaraco-stream/jaraco-stream-3.0.0.ebuild b/dev-python/jaraco-stream/jaraco-stream-3.0.0.ebuild
index a8ead7c507d7..ecdbe10dea62 100644
--- a/dev-python/jaraco-stream/jaraco-stream-3.0.0.ebuild
+++ b/dev-python/jaraco-stream/jaraco-stream-3.0.0.ebuild
@@ -3,7 +3,9 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( pypy3 python3_{6,7,8} )
+PYTHON_COMPAT=( pypy3 python3_{6,7,8,9} )
+# entry_points is present in setup.py but it is empty
+DISTUTILS_USE_SETUPTOOLS=manual
 
 inherit distutils-r1
 
diff --git a/dev-python/jeepney/Manifest b/dev-python/jeepney/Manifest
index df8653c7ecbe..9e8ced4a701f 100644
--- a/dev-python/jeepney/Manifest
+++ b/dev-python/jeepney/Manifest
@@ -1,3 +1,3 @@
 DIST jeepney-0.4.3.tar.gz 28121 BLAKE2B 2c9b5b5ec26a9af25d28af602827c73c8ec9377a88a4aa79b9a986675c1ef3f195763a338f3efa4ee371f7751dcf05a9f9cfed06c8d6677d81da3699773d5561 SHA512 bfb12c9259a57324759f8be44d1faf2c0535762e72db5f1370e64cb144c0fc537c9bc9cfb9b075932fb3a20e3ef4e0c990c10905cc5a69e3fb088e8de4193689
-EBUILD jeepney-0.4.3.ebuild 803 BLAKE2B 887f8aab1dec5a23a616f9ca984cfd046d8ac3330e27f0f572c66112d7bf841c6455febbe26fee2094f40c906fc59e24579825ad505dfb79a7223e92565a8c6c SHA512 1d443e321346c6e8eec366dbf079dd718774bfb5deb95c5f286730de6acbcaae030b9e538dfaa9676ed6f9187f4e0690d709aef676f377dfa7fb10591c7ff2fc
+EBUILD jeepney-0.4.3.ebuild 802 BLAKE2B aefbece367f00496eaf9b986ee25c8b470dbac4d4ec4c9715b8b1d29b8c31f4307d6b0ce67154b9fd78bd518f984c8fd109185610a7b9dc89efef7b57568fd49 SHA512 13e500ebc659528d61478f15329c0b084c5556779e742144c5d3e5d3bff1c3c9eeaec607974c58e74c730c8893ff662223adca2fc2971f8a4672af687e339fb1
 MISC metadata.xml 432 BLAKE2B 57cc148c4580f5dd579dfbec20c85c80e7d5f2b75397c96f4daa2382e86dbe0547b15ac628fc46bb62c3845becb46cfcfb65027f37839d2d1f843c6872d45e80 SHA512 124413d7ca2a366a651128cd8346aeeb3bd5ceed9b43136fad32861844a078694fa8603e4a11df4d7b37343434bf29bf21d0a0ac6999bf9e9b13f474b93914e4
diff --git a/dev-python/jeepney/jeepney-0.4.3.ebuild b/dev-python/jeepney/jeepney-0.4.3.ebuild
index 9717da697eaa..ec23c5737657 100644
--- a/dev-python/jeepney/jeepney-0.4.3.ebuild
+++ b/dev-python/jeepney/jeepney-0.4.3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="examples"
 
 BDEPEND="
diff --git a/dev-python/jsonext/Manifest b/dev-python/jsonext/Manifest
index f093ed13eff7..0554cb862bef 100644
--- a/dev-python/jsonext/Manifest
+++ b/dev-python/jsonext/Manifest
@@ -1,3 +1,3 @@
 DIST jsonext-0.4.2.tar.gz 9574 BLAKE2B cba417bc116e572f383a6d396d33fab0f6b63534ae89c402b6cfc0297a0c2fce336bf63464252fe9c87a9617f7f00ed82fe9de9d4e95356b60ae555963d4951b SHA512 2b47b48b529ad8f3b9662ce19f6ea9250648e17cb94e4a59a52ab6a9aabf64abb74f3c76a1edf274fe1e52863352456c0f95c5cd7406c44ca917b6addd09a2a7
 EBUILD jsonext-0.4.2.ebuild 573 BLAKE2B be761a9cc8eb3bdd76d593ee091efb68a4b280a7d3225f7cd578a10fac8238440d3239ba04479c6432ce22220541379f713f1f1dc2701de97e9baf2b6ca768f4 SHA512 a655d678df15545691b8facfb7df52f71ffe29cf0a7c4da81c494c02bcf298e2652700353a5ec11168ffff43b163f2d9ff3edb07898e48951eb363d876f987f4
-MISC metadata.xml 478 BLAKE2B 917cd38f6d39c8fb63724e545d5a0d76a173b83dd43543dcc0400799c2cfec8966496e8656696947fff61f7fb25cdc4fe64ee73ca787d9072acbbaf376817a9f SHA512 819a01efba7324a2b5dc6829a882b1d8ec22588a0b615abf44a83b1e1ea517b463f1d01fae40c6fa3309ebe15f2797065575e9b34dc53944d7b44f860b36a6ed
+MISC metadata.xml 333 BLAKE2B 1a681ac99aee289a919b530bb87037df6fe53b044ce14ce3a9da3cec54a73d7fde58cf01f12678f18397d16b56c9e5bf88d289ddec4469e343d7193502124124 SHA512 a73512d246562e6591eb9c8d13759352cede7f0ae978d02c87bd72b1fe2c9b155cc3908e8489b136387bada61f1257d8e0771e01e26d998b51f9ce13c087ec41
diff --git a/dev-python/jsonext/metadata.xml b/dev-python/jsonext/metadata.xml
index 959c6dbb5909..3ee70120def4 100644
--- a/dev-python/jsonext/metadata.xml
+++ b/dev-python/jsonext/metadata.xml
@@ -8,7 +8,4 @@
 		<email>prometheanfire@gentoo.org</email>
 		<name>Matthew Thode</name>
 	</maintainer>
-	<longdescription lang="en">
-		jsonext makes it easy to serialize objects outside of the standard Python primitives to JSON.
-	</longdescription>
 </pkgmetadata>
diff --git a/dev-python/jsonpickle/Manifest b/dev-python/jsonpickle/Manifest
index 116e7ea7419d..6794cfcd5e26 100644
--- a/dev-python/jsonpickle/Manifest
+++ b/dev-python/jsonpickle/Manifest
@@ -1,3 +1,4 @@
+AUX jsonpickle-1.4.1-importlib-metadata.patch 1198 BLAKE2B c37f21cb8102eb1f6ec2bb178a0d38552bf013a4557fff990731a15eec24ced69210c38ac0abe28e7f8dd7707016bee51844faa2acc35b582a9871ca44d87104 SHA512 574ed4cb7492483c516b96b74502ba3b94d66e149000395781f2eee49b5e649bcd4d8f433e2dc257ae74b036ce314c1fd23369c1ac2ea2cdf7c89185d3abc076
 DIST jsonpickle-1.4.1.tar.gz 104564 BLAKE2B a3ad6f9c712f39153186b6ccdef515581012ad4ba1251dcb094074f2093eb4b158b9357bdf2e8668073cb21dc3bf6dd2fc3a0058c8597252c558a797432068b9 SHA512 ed6bf3472c59ba907a973c5c6f05de13dbfc75eef103796b8f8a63d388f769527f22667ca8761092d1649ff2caf5a73de0593e370df3e7fcabe06e73b265da35
-EBUILD jsonpickle-1.4.1-r1.ebuild 1297 BLAKE2B 4c1395725496b24e16429333a0aaa7d726a52b8155a8abb29748fad2362bb797b33ea9bf847df689ff7eb638de138740a4551f28f82fe7b7d211e74a92f60474 SHA512 10537693574be37f87edbe02657c3c97984e7df5d33e76270c774cfc6e2862173efea9aaae6f1bf500c790b395cbe1e995fc6fefd6c7c066b786fd534e335655
+EBUILD jsonpickle-1.4.1-r2.ebuild 1460 BLAKE2B 7b5ef9682327cb6580d4b5964e0a026fbb1c8214177a40b2c3dd5864f1af0bfe7f67baf07d5a9f4a4ec7c92942cf86d5ad84fc1043bb80c30ebf9d6c8effc324 SHA512 d7ce02c29062b3950efc00672edf0b24c76bf28e0f9e09a567512548d5ffc7950c6707e2e82ff3c3e1c99a14d43fed8e188778cbe820ceb5b332e9fbcd7cbbf2
 MISC metadata.xml 386 BLAKE2B 486aa3823ac1ae6b816068ae775da293fedab7120df504f2bb64cbbd026e1ad4ac2041acfb48035b5816616dedd46a5f4bedf8c63daad2315727cdbaedcd15ad SHA512 12590542127c674ae6c8123b20ce5c7ed6815f9129eefb95ef3a8c064fdc25477765d397cb7d7e62772475306c0ac7389a7155655576845b936866470302b759
diff --git a/dev-python/jsonpickle/files/jsonpickle-1.4.1-importlib-metadata.patch b/dev-python/jsonpickle/files/jsonpickle-1.4.1-importlib-metadata.patch
new file mode 100644
index 000000000000..eefb41d73d7c
--- /dev/null
+++ b/dev-python/jsonpickle/files/jsonpickle-1.4.1-importlib-metadata.patch
@@ -0,0 +1,44 @@
+From 7e5752de7d49f222cec5107aa5044fa8f8ffbb39 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= <miro@hroncok.cz>
+Date: Wed, 22 Apr 2020 20:38:28 +0200
+Subject: [PATCH] Use importlib.metadata from the standard library on Python
+ 3.8+
+
+Fixes https://github.com/jsonpickle/jsonpickle/issues/303
+---
+ jsonpickle/version.py | 7 ++++++-
+ setup.cfg             | 2 +-
+ 2 files changed, 7 insertions(+), 2 deletions(-)
+
+diff --git a/jsonpickle/version.py b/jsonpickle/version.py
+index 01c83c4..92b44b2 100644
+--- a/jsonpickle/version.py
++++ b/jsonpickle/version.py
+@@ -1,5 +1,10 @@
++import sys
++
+ try:
+-    import importlib_metadata as metadata
++    if sys.version_info < (3, 8):
++        import importlib_metadata as metadata
++    else:
++        from importlib import metadata
+ except (ImportError, OSError):
+     metadata = None
+ 
+diff --git a/setup.cfg b/setup.cfg
+index 9f0eab2..46707ec 100644
+--- a/setup.cfg
++++ b/setup.cfg
+@@ -36,7 +36,7 @@ packages = find:
+ include_package_data = true
+ python_requires = >=2.7
+ install_requires = 
+-	importlib_metadata
++	importlib_metadata; python_version<"3.8"
+ setup_requires = setuptools_scm[toml] >= 3.4.1
+ 
+ [options.extras_require]
+-- 
+2.28.0
+
diff --git a/dev-python/jsonpickle/jsonpickle-1.4.1-r1.ebuild b/dev-python/jsonpickle/jsonpickle-1.4.1-r2.ebuild
index c990ed01191f..752307b9830b 100644
--- a/dev-python/jsonpickle/jsonpickle-1.4.1-r1.ebuild
+++ b/dev-python/jsonpickle/jsonpickle-1.4.1-r2.ebuild
@@ -23,6 +23,9 @@ RDEPEND="
 	dev-python/simplejson[${PYTHON_USEDEP}]
 	dev-python/feedparser[${PYTHON_USEDEP}]
 	dev-python/ujson[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/importlib_metadata[${PYTHON_USEDEP}]
+	' python3_{6,7})
 "
 # toml via setuptools_scm[toml]
 BDEPEND="
@@ -32,6 +35,10 @@ BDEPEND="
 distutils_enable_sphinx "docs/source"
 distutils_enable_tests pytest
 
+PATCHES=(
+	"${FILESDIR}"/jsonpickle-1.4.1-importlib-metadata.patch
+)
+
 python_prepare_all() {
 	# too many dependencies
 	rm tests/pandas_test.py || die
diff --git a/dev-python/junit-xml/Manifest b/dev-python/junit-xml/Manifest
new file mode 100644
index 000000000000..f08dd8f15bc7
--- /dev/null
+++ b/dev-python/junit-xml/Manifest
@@ -0,0 +1,3 @@
+DIST junit-xml-1.9.tar.gz 11111 BLAKE2B e40914263421e7021d6bd697a03ae74b596d915479f24e8227d8b0b0bda51529df58f7aa54b27e981bb1df0aa36d7876f4f30fff8924188143bc4dd6b1d80b17 SHA512 73d5245f4a324485370e91d0d4d9a754133e0f90e5ad9ae7070bbb7aad29bee5fda4103548483358d536834c5fee9c8bd5fef79c4b66f905a2aeb0823ef02d22
+EBUILD junit-xml-1.9.ebuild 810 BLAKE2B 5c53fb8764f98e5ef7c408a9cff437eabea4dfb73671ecd31e5fdd452d9a7d674a44b307b407a0837253aaadcc033c62c9bca0580e5bb7b1f471d3652ca12a06 SHA512 04bb3940ce78871a8bac6dcb1c8e976a5fb422597245e3ac9fec71c1a501c60071f94322ca72b04fb789b5f342f114556168b7703404d7cdc6559ece11cd8ef2
+MISC metadata.xml 218 BLAKE2B 086fdcf7b63ca7bd6c58e861d717bb375e1cd372eff26d5d2eeeb176d8c5e6f10e653562abafb50eae7d7508f8e3d421b87e6a749acd0490308672828d0da697 SHA512 4558fee4c51117e21b1f42ca3edbdf1195ed297db798d6bfa0e5fbb7019654a187422b0abde7af5d800caffed66d1e55e4280e8be602bad591424d9776c46781
diff --git a/dev-python/junit-xml/junit-xml-1.9.ebuild b/dev-python/junit-xml/junit-xml-1.9.ebuild
new file mode 100644
index 000000000000..b6fa6e5bf110
--- /dev/null
+++ b/dev-python/junit-xml/junit-xml-1.9.ebuild
@@ -0,0 +1,28 @@
+# Copyright 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="Create JUnit XML test result documents"
+HOMEPAGE="
+	https://pypi.org/project/junit-xml/
+	https://github.com/kyrus/python-junit-xml"
+# upstream fails both at uploading to pypi and making tags
+# https://github.com/kyrus/python-junit-xml/issues/69
+# https://github.com/kyrus/python-junit-xml/issues/31
+EGIT_COMMIT="19d3cc333d35dfd2d17d75c506336c15e5c6685a"
+SRC_URI="
+	https://github.com/kyrus/python-junit-xml/archive/${EGIT_COMMIT}.tar.gz
+		-> ${P}.tar.gz"
+S=${WORKDIR}/python-junit-xml-${EGIT_COMMIT}
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
diff --git a/dev-python/junit-xml/metadata.xml b/dev-python/junit-xml/metadata.xml
new file mode 100644
index 000000000000..266e3f19ca59
--- /dev/null
+++ b/dev-python/junit-xml/metadata.xml
@@ -0,0 +1,7 @@
+<?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>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-python/jupyter/Manifest b/dev-python/jupyter/Manifest
index c73053961ec3..87d5d8e1f2fe 100644
--- a/dev-python/jupyter/Manifest
+++ b/dev-python/jupyter/Manifest
@@ -1,4 +1,4 @@
 DIST jupyter-1.0.0-file-colision.patch 1727 BLAKE2B 59bf5e567e6da9e9f3d84178942993072e1697c1c4c06e06d606dce7bdc76d296d10c30cdef2865bce7b4c26136a1b0a2860f009f1530c1815b48b3300401501 SHA512 a6b4cc6b91bb9941f029963cc3e3b7f415192f64788a34dde7828d450497987f92c25655c5ca183a7408fb1fb439917ba0f0a1ef1db3fe3bec1fc46d9ad2cf4d
 DIST jupyter-1.0.0.tar.gz 12916 BLAKE2B 36476eaf0119613ba6d9f153aab1658f43951dc3879cb6a9e90d8fba14cc1247305e18fda2251127faac4e68867efd3ef57129675bbe89a17a6469255efcade2 SHA512 1f0bc83f7a127c98ccf4b3868814116aa272ea5d0baac52d7a022305af7e2da28ca2b90fa3554ff085d8df3eb6d8b8cde80bf02b8e66064c59900b926d73c520
-EBUILD jupyter-1.0.0-r2.ebuild 1120 BLAKE2B 0d11b75661414fca66549a99c01529bd39fbf984cd5544f083fc52d8ea7d0aeb3c56cd833aa27a2ba013256870065cd9f8c2710bbdaf49d642a0806686e1b3cd SHA512 0e845fba31c5b09bd9aff42a9cfcab6ae01266ff6627a0dedc8eda6e6fb438f61c7020f7859abcc3994c92bdf612ebe1fc0582ebec1e0c0814736b985810e589
+EBUILD jupyter-1.0.0-r3.ebuild 1120 BLAKE2B 0d11b75661414fca66549a99c01529bd39fbf984cd5544f083fc52d8ea7d0aeb3c56cd833aa27a2ba013256870065cd9f8c2710bbdaf49d642a0806686e1b3cd SHA512 0e845fba31c5b09bd9aff42a9cfcab6ae01266ff6627a0dedc8eda6e6fb438f61c7020f7859abcc3994c92bdf612ebe1fc0582ebec1e0c0814736b985810e589
 MISC metadata.xml 390 BLAKE2B 1f4d29ef2bf8add19fc945beb9f7b92bc49ca189fafbb16bcdc2c25cf71bc5d248491d63bb88f67100504aa796723072342b4c225064339fefbce73905d78211 SHA512 e2b9ac43d44b647a247148e87403e8cb1aeb8e89f482740f489424caa3b5b0301dffcf2693297a0755b8ee3d6f82e519382b4b8bdbd760763a096cfebd66cbc5
diff --git a/dev-python/jupyter/jupyter-1.0.0-r2.ebuild b/dev-python/jupyter/jupyter-1.0.0-r3.ebuild
index c88927ac5ff2..c88927ac5ff2 100644
--- a/dev-python/jupyter/jupyter-1.0.0-r2.ebuild
+++ b/dev-python/jupyter/jupyter-1.0.0-r3.ebuild
diff --git a/dev-python/jupyter_client/Manifest b/dev-python/jupyter_client/Manifest
index 5ef7be174798..627f3267b3f2 100644
--- a/dev-python/jupyter_client/Manifest
+++ b/dev-python/jupyter_client/Manifest
@@ -2,5 +2,5 @@ DIST jupyter_client-6.1.5.tar.gz 290829 BLAKE2B 7029703ebf7dccafd9c90835d9ed3305
 DIST jupyter_client-6.1.6.tar.gz 292265 BLAKE2B 46f5b814577c8b1351ce42eb3de4a3032bb2917512f0c9cfc07fddc991698e192b628c03a9ce0d98817dfebcf4af0386fa4ee656b524f54c36de64781af3b8dd SHA512 9a443a2b4a86d823d1403a05d359b50ca95efb8e1dd992d331699e3fe2b46e5d4190cc55aa5d110a384fc0bb94abceaa4e36f67c0f7ce5a33f9ef3b11e682522
 EBUILD jupyter_client-6.1.5.ebuild 849 BLAKE2B 49328d173ac8e7f13e98e0479785d607bbcdf92de3b3642f94e3fb6737f4162debc0defd27043705212585aa8aaa4c48fc674bce6b36eb3cfc929b61626e544c SHA512 f527f2ab63ef66b74f6540db12896bc0a0ff0d3af5c4f82bece768c87471b810e592cf29e075e30372840b0408ac00593670b1602a88a7c5270d5420800af134
 EBUILD jupyter_client-6.1.6-r1.ebuild 884 BLAKE2B 17c74179956421da4617e2a4058dc05fced9860412c2142c0df8fd07cd7d7559cbf1224937fea1c7404ecee468bf9286440ec33809338e3386e46c603baa289d SHA512 1f1afa7805b4fba979bce7dc9ca34aafbe8c8d35bf6a0e54450e9b1cfcde2bfb7c72e01fbfcc02fab62f91d657e2b738048095f8ab55cfa829e82585d351189d
-EBUILD jupyter_client-6.1.6-r2.ebuild 884 BLAKE2B cb9f675ea4cb1e5d1fb26ceea1b665e8aa172cabe1d63d02121628e2c1f5f32cd48b03125b081212ccd412e0fe79922b7ce6506dcd0445cd26d1195cb7020436 SHA512 ef176b816fde521e550a5d27bd36e666983d6dc57de697d97f71c3849c855086d60b424f15d85be6fa99a12db4d51c859e289a6770f1a9f100d95494e55e159f
+EBUILD jupyter_client-6.1.6-r2.ebuild 881 BLAKE2B 1d69983285577a6d753b95771a1d4a28b80880b352cedb1b7e4e8ce983eda8be61b0159b81c35556c05c292cf5b4332383454d40fb63c512d1ca475a61590646 SHA512 f91902f5bf0716e663d68414615059bc95b7c6bcf21264456c2530595a1dc7f66c1b21eee7d3c356b41a1d4ed842e705fce2223b9e8f18bb65dcde912531b9ad
 MISC metadata.xml 779 BLAKE2B 43107b0b7e5e1316a386e41e99c482dd13eb753bcaeebf6b496d7b432b69aaee01f6777877033154b178b17bbef87cb019d4fc55302e089c69972ec7dd412c59 SHA512 4333a7a7ae831d4f12b09d3f78fea784c508ed1de502b71d5279c6574cec7808e0e13e0e9b59d3b6048788d406f617a883f753204eaa22c24218587e3e4fd610
diff --git a/dev-python/jupyter_client/jupyter_client-6.1.6-r2.ebuild b/dev-python/jupyter_client/jupyter_client-6.1.6-r2.ebuild
index 85d8a9afd7bc..7f009cdea52e 100644
--- a/dev-python/jupyter_client/jupyter_client-6.1.6-r2.ebuild
+++ b/dev-python/jupyter_client/jupyter_client-6.1.6-r2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 
 RDEPEND="
 	dev-python/async_generator[${PYTHON_USEDEP}]
diff --git a/dev-python/jupyter_console/Manifest b/dev-python/jupyter_console/Manifest
index 302e2e1cb193..a356b6a69c8d 100644
--- a/dev-python/jupyter_console/Manifest
+++ b/dev-python/jupyter_console/Manifest
@@ -1,5 +1,5 @@
 AUX jupyter_console-6.1.0-increase-test-timeout.patch 393 BLAKE2B b4338c47a14170247b3ceb4d4e8ea861311e651840c1bb2df595f0384ea0e855711633c73e79a6624f82570a86dfcea80b94ec97eeb988881fb9ca5d88e33060 SHA512 7ed1cbb54050eb40456648c92b1471dd164217cb3abd3298327b9d5f20a809bd4dce792e98764f9f5d1b57de9ab118644005f2773e1603002547aef356eb24f9
 AUX jupyter_console-6.1.0-py39.patch 2284 BLAKE2B a54d7d6a8cee2e17bd50a73bf1e242995d3f0e1c375190ce9038560a532cff5d62d56d34afcd574b7dfb91fc2c224f2bc8ff0c8584f7592d933c016f8d9de4d6 SHA512 3b77e727ae62c56d713d9c9c7d8163ecbefaf916238c3964b47407edb166ec4448377c55623e4b0b25c4a491f310cf2895ec3e8e444e0ced09aa57196085ada0
 DIST jupyter_console-6.1.0.tar.gz 28468 BLAKE2B 08ef158de6a0eb8fe741dac00b74e11f7e577b5097f54aa16c47ae9e39607231e19a1fcd0a96cbae41d41fad891fefdb532d0f66bc03aa66ff99a8d3ff3cb28c SHA512 abb5457a90d109457e91071cd8b592a14bec7ead75fd667d656f9180a457e39bf470877b2e17c81ff512d1cc69b62a8f700996492f6164eb05a1581db82abbf7
-EBUILD jupyter_console-6.1.0-r1.ebuild 1131 BLAKE2B 26ac084c60f23c58dad3de4ddc87392b0927eef4201b6416bdab90bb194265109e0c70321c10ae75033c0c5f0cb5f98675c6a94b3f5b9e569174de498752680e SHA512 8f87e8be83392605c3467b754d4e1c27380526d471fd890d2b22829644b242361935e20c34cb579383780b67155d0d5ec99d67d437dc70ac950a062fbf2488af
+EBUILD jupyter_console-6.1.0-r2.ebuild 1131 BLAKE2B 26ac084c60f23c58dad3de4ddc87392b0927eef4201b6416bdab90bb194265109e0c70321c10ae75033c0c5f0cb5f98675c6a94b3f5b9e569174de498752680e SHA512 8f87e8be83392605c3467b754d4e1c27380526d471fd890d2b22829644b242361935e20c34cb579383780b67155d0d5ec99d67d437dc70ac950a062fbf2488af
 MISC metadata.xml 701 BLAKE2B 04e5ee12062960ad591ca853b731b0f5ef797a3ed40ab269b1f82235dca406346db5997f91b58edf1961af2252109c71e510992050e6978fdd787d2c8886cdd4 SHA512 cf5598a16ccd18cbedee0c7403fdf957339cdb4b6c21499cef96273bd25c84755a2e841dde82192a9cf93c12c515334374bdec9ec54a13a8bd027c6540055fd5
diff --git a/dev-python/jupyter_console/jupyter_console-6.1.0-r1.ebuild b/dev-python/jupyter_console/jupyter_console-6.1.0-r2.ebuild
index bf2123863415..bf2123863415 100644
--- a/dev-python/jupyter_console/jupyter_console-6.1.0-r1.ebuild
+++ b/dev-python/jupyter_console/jupyter_console-6.1.0-r2.ebuild
diff --git a/dev-python/jupyter_core/Manifest b/dev-python/jupyter_core/Manifest
index 1aa2048732dd..976edc59248c 100644
--- a/dev-python/jupyter_core/Manifest
+++ b/dev-python/jupyter_core/Manifest
@@ -1,3 +1,4 @@
 DIST jupyter_core-4.6.3.tar.gz 67305 BLAKE2B 7c6a32bd8ce773b7bc4156eabf75597112716632179736b19be4b0e73eba7c5c67a0c9d2d141b952d72b68aff826227b0004a3bc9f3b286b68eb1375f2316bdb SHA512 3c7370c24a4cf53c9747e9e411852d207c0c7035809dab7cb018ccb53e19208df25ad4f728531e47f3a42c4d9694c3e1ed7b03133de23bcbdeb346c319f5f51f
+EBUILD jupyter_core-4.6.3-r1.ebuild 873 BLAKE2B c12862c168695134a8c52a77060095a2b9561cc63ac212267cc91116144466b22d89accb0e0e48309c359017c9de14f15c42404d2ce210258ad0a44798fe19e9 SHA512 bbbc98f07bd98aad3d0a719ebc1c0a0b398138fdac6c259c886dd502950db26508a8da010802367dddaec04d7744e037e3e8dae272d478a20c3b07897bb9825f
 EBUILD jupyter_core-4.6.3.ebuild 873 BLAKE2B a9b154e32d11ed92a339b19ab9c0421693bf4fe8789f3b9dc4b8503b6024980ee3deb913f7d77ebecb1a9efce30fad6544baa1ba05dc5b39bf5ca69eb03e439c SHA512 015f86ab4e92bd94398378e102d0ad99b4a412b458b5b8dedd7de9948040e944819f996f615af7a334a48681bad1b36e9be7d642cf97e492acea3e236a97a6d5
 MISC metadata.xml 733 BLAKE2B 1ac253b8e7dedbbb5291296d40d16280514f3a12fd3c905d32690cdefebb1844e60cd0ab516d04feb8a947f32a86ec4f2813c3edb2dc48638c734fb207adf825 SHA512 e180aa5a798b8e7fac09d83f7125058ece7e2ed9be722de31616f09408e46d87153c88345615af2d4691f155ea3999b4d83c4c6e21360068af469181ce13bef8
diff --git a/dev-python/jupyter_core/jupyter_core-4.6.3-r1.ebuild b/dev-python/jupyter_core/jupyter_core-4.6.3-r1.ebuild
new file mode 100644
index 000000000000..b5e369ae4bba
--- /dev/null
+++ b/dev-python/jupyter_core/jupyter_core-4.6.3-r1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+DESCRIPTION="Core common functionality of Jupyter projects"
+HOMEPAGE="https://jupyter.org"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 arm64 x86"
+
+RDEPEND="dev-python/traitlets[${PYTHON_USEDEP}]"
+BDEPEND="
+	test? (
+		>=dev-python/ipython-4.0.1[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_sphinx docs \
+	dev-python/sphinxcontrib-github-alt
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# rely on imports working without PYTHONPATH
+	sed -e 's:test_not_on_path:_&:' \
+		-e 's:test_path_priority:_&:' \
+		-i jupyter_core/tests/test_command.py || die
+
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/jupyterlab_pygments/Manifest b/dev-python/jupyterlab_pygments/Manifest
new file mode 100644
index 000000000000..8d0c7b7aac03
--- /dev/null
+++ b/dev-python/jupyterlab_pygments/Manifest
@@ -0,0 +1,3 @@
+DIST jupyterlab_pygments-0.1.1.tar.gz 561976 BLAKE2B ca317ed6709fd2c9a8afd137051140396bccdc3140c8c1ca97f64f8d4f74d2272c687661e1e28822a5008b2285306024408b18ba6ac92cb9d73acc29b8741fe4 SHA512 743e380f253f817ec9c9aedbe5d3c1cb5bc2c3de2136deba40b0fd3880bb04a4774099eb90437519638811ea9bea0324db3c3d8b1a9ab63857e7513deeaba669
+EBUILD jupyterlab_pygments-0.1.1.ebuild 485 BLAKE2B d3689104d3cc6d75b51f102535e60d27dd07320754c4247feb1b57d618cc87a38417ec24d64f633a249c0621fd5bdcf10968c0e7092583498875b069cfe71bd7 SHA512 8b8f874bb55566733591b851969d70200e62a9882622bad18fe4b8211de1acc0e86508107118cc8db8d0cc04773fa0332a1375fa7f51960b7161a268b795895d
+MISC metadata.xml 384 BLAKE2B c047f8bd2673bf34d6a1f17af9d3e6ca58fb54a8b237e433cf55f6c6bdda863cd8c39b41d44b7119d2b8c2ff0b3c3ac67a5e0a0cc606a545a46ada4e64704345 SHA512 fe21650260f3a89af0dbaaa7d4953e7e5396b94cd1ff630601e8c8bd82d0c91870380bc3da3a7d03aaa212ac278c834a19c2c83ca23b7a2a86d09460878e2813
diff --git a/dev-python/jupyterlab_pygments/jupyterlab_pygments-0.1.1.ebuild b/dev-python/jupyterlab_pygments/jupyterlab_pygments-0.1.1.ebuild
new file mode 100644
index 000000000000..04d1e50b8b28
--- /dev/null
+++ b/dev-python/jupyterlab_pygments/jupyterlab_pygments-0.1.1.ebuild
@@ -0,0 +1,18 @@
+# Copyright 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="Pygments theme making use of JupyterLab CSS variables"
+HOMEPAGE="https://github.com/jupyterlab/jupyterlab_pygments"
+SRC_URI="https://github.com/jupyterlab/jupyterlab_pygments/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="dev-python/pygments[${PYTHON_USEDEP}]"
diff --git a/dev-python/jupyterlab_pygments/metadata.xml b/dev-python/jupyterlab_pygments/metadata.xml
new file mode 100644
index 000000000000..f97ba7497b13
--- /dev/null
+++ b/dev-python/jupyterlab_pygments/metadata.xml
@@ -0,0 +1,12 @@
+<?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>
+    <description>Python</description>
+  </maintainer>
+  <stabilize-allarches/>
+  <upstream>
+    <remote-id type="github">jupyterlab/jupyterlab_pygments</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/kaitaistruct/Manifest b/dev-python/kaitaistruct/Manifest
index fe6a84ae847f..4b8990746739 100644
--- a/dev-python/kaitaistruct/Manifest
+++ b/dev-python/kaitaistruct/Manifest
@@ -1,3 +1,3 @@
 DIST kaitaistruct-0.8.tar.gz 5158 BLAKE2B 802435e81c8ec2544f26109762d43d7761c8672714107861e5f981583bf38ab85b3c2f1f3be5d25429287b380b756599fb51cedd130870f2cd9cfe221fd2f509 SHA512 8361e30c5bec9a7c57c280d277232ff4123686f29f3813e61cde9bf7512ead2e2f447ea1e18b8925aefe432edbbd9682a690293dcb928a9049c4c81832b5666f
-EBUILD kaitaistruct-0.8.ebuild 394 BLAKE2B 5d47f200a12dacd51fb073766d85630b595bfed39b95d0204998e52947ce50a9839b2152c2dd1882f25ee12e126345c344ecbd7830d43b498e6eb553c942cf15 SHA512 213c04cbdedb5df7d7ab2af06dbafb5e818e58a406f724739292bfd45f20dab85542b29dc5581135f790c0fb33ed629804d28a1f3a9816eb235452724948101c
-MISC metadata.xml 169 BLAKE2B 21efaa2ec5fcac1a8cf109ad11001875d2c1327d6765bf71d06666699dc6eab3eed845895cc55a6a1d57358bfe6a6fefcbef1f616d6c259ee725a526e10b5a05 SHA512 5192868b5508b672a7e4e119ffd5a730dca1630781ec37fd20b74e2370521c83dd9020d7bb1379cf911f643a57e4a1e6578f89b64b6e3486571b58fd06e7b88d
+EBUILD kaitaistruct-0.8.ebuild 396 BLAKE2B 00d2e2cf62f6bd31d1e7a23be1e8e834dcffad3bef9da069ea7556c22be14104034ea8bf599dbd5afc0aa7409e9808cad1957eb4b9241421c8b4ec0dc131b13d SHA512 c9a2ae29538ebd85711f6dc4f0a71393f907512bb3a8108a6c6f5aca1ec786b4d6378f5895a794ee5987fa860d358886bf2d6b326d1ba11417b959212d5fc380
+MISC metadata.xml 752 BLAKE2B 743726aa6868d3973bf1218efe848d90599192b3ced2e47b4c2c9defd90e8fe784e7e556bfe3cc2f3db2f65b07caff767ffdacc36fbc009ee6940fef044eee0b SHA512 865d70e44c72b031ee005935fd0d82fe66e559e2190077c0f10c5feb8fde320a6fc042fe6473561a7afa7b220b5014896f21e007d292286acfcc9d4c7282fb33
diff --git a/dev-python/kaitaistruct/kaitaistruct-0.8.ebuild b/dev-python/kaitaistruct/kaitaistruct-0.8.ebuild
index 626735a49c23..dc89a9167f76 100644
--- a/dev-python/kaitaistruct/kaitaistruct-0.8.ebuild
+++ b/dev-python/kaitaistruct/kaitaistruct-0.8.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 
 inherit distutils-r1
 
diff --git a/dev-python/kaitaistruct/metadata.xml b/dev-python/kaitaistruct/metadata.xml
index 97c6505eb5cf..65d46603f159 100644
--- a/dev-python/kaitaistruct/metadata.xml
+++ b/dev-python/kaitaistruct/metadata.xml
@@ -1,6 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
-	</pkgmetadata>
+	<maintainer type="person">
+		<email>matt@offtopica.uk</email>
+		<name>Matt Smith</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<longdescription lang="en">
+		Kaitai Struct is a declarative language used for
+		describe various binary data structures, laid out in
+		files or in memory: i.e. binary file formats, network
+		stream packet formats, etc.
+	</longdescription>
+	<upstream>
+		<remote-id type="github">kaitai-io/kaitai_struct_python_runtime</remote-id>
+		<remote-id type="pypi">mitmproxy</remote-id>
+	</upstream>
+</pkgmetadata>
 
diff --git a/dev-python/keep/Manifest b/dev-python/keep/Manifest
new file mode 100644
index 000000000000..859da014bbc3
--- /dev/null
+++ b/dev-python/keep/Manifest
@@ -0,0 +1,3 @@
+DIST keep-2.9.tar.gz 11277 BLAKE2B ea9813b725e9cbc93a0fdcab9d7a6b8927b69de8e960bf5b91696a8fcd9806f4ec0646bae147355206c05b91f2a828e2a20728ed16c9ca97b2592887b1f9f185 SHA512 36d6c4d268fe72f05bf3ccf6006f3ec1d93e6320f5dc810814d15274f3e63b29e97678089178fee99e9bb5b119079895550e8f48627d1dc1612140f13e7f02df
+EBUILD keep-2.9.ebuild 619 BLAKE2B 369557338bc23e8c8e3bd82fe8b1f7da03477b3101b6c00dbc7b82451a68da4f3abbd0aa59c9c5b921411a1255d33723bef87f72d222baf69e6ee333284c5743 SHA512 bf6138783db8ca187fbc1fab18854d282e46f905a756073e02c7df285489f17bc38cc9500659257b99cc3712fa4829608a4202913d821fa41cec98cc6c09951d
+MISC metadata.xml 343 BLAKE2B e768980bdf2f3b10c05892c41970b1a763cd7e4c4c405267496653beac320170bfa52c90798e6b4961245e22fe96802d3ea06acb3401400c920b162496b4de21 SHA512 55420d5e10ee9b5da9f15ab6faea642041d7a040410d3c1cd399d2ed8b0346948f3c45639cd38e5956c452cae00e530a85e4d71713785572e93506b61d3af67d
diff --git a/dev-python/keep/keep-2.9.ebuild b/dev-python/keep/keep-2.9.ebuild
new file mode 100644
index 000000000000..a466bbc6e430
--- /dev/null
+++ b/dev-python/keep/keep-2.9.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_7 )
+DISTUTILS_USE_SETUPTOOLS="rdepend"
+inherit distutils-r1
+
+DESCRIPTION="Personal shell command keeper and snippets manager"
+HOMEPAGE="https://pypi.org/project/keep/ https://github.com/orkohunter/keep"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	dev-python/click[${PYTHON_USEDEP}]
+	dev-python/PyGithub[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/terminaltables[${PYTHON_USEDEP}]
+"
diff --git a/dev-python/keep/metadata.xml b/dev-python/keep/metadata.xml
new file mode 100644
index 000000000000..b54a40074238
--- /dev/null
+++ b/dev-python/keep/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>kensington@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">keep</remote-id>
+		<remote-id type="github">orkohunter/keep</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/keyring/Manifest b/dev-python/keyring/Manifest
index 41205189ab48..ff1aad5a4d37 100644
--- a/dev-python/keyring/Manifest
+++ b/dev-python/keyring/Manifest
@@ -2,8 +2,8 @@ DIST keyring-21.2.1.tar.gz 45535 BLAKE2B b276f5b973c418794561e0d0872761847d4cb81
 DIST keyring-21.3.0.tar.gz 73120 BLAKE2B 6124e29e4dfa0b4c1f4ad3c1262c282935f860c0aea796a9e66987e64e4737d7f746c9c832b427e49cdadb87e61a33f7bfbd956299400311ff08e59f643cf6ff SHA512 85119a13aeb62456f8b9409990c3f5f6e0c83e9850466ee3b7a3d10e879e3b7fd6d723b2b683a8904b5d20c76fc85471d16aaedbd7ce04d8b88f1d1dd265f0ff
 DIST keyring-21.3.1.tar.gz 73553 BLAKE2B 75824dc1ce757501ed286a2dc5c49c644df0fd3278f7344bf42c8e687f51b2c488e038377e776b13f0d97b3f60d940467248689d8f1572811a15400a14d85529 SHA512 6a95d602eed052378c78fe3d8134eeaccd5fd13051ecda32710061c2b9348ebbfc350dc004ef41df94df28006ead4bbefe3bc968bdabd136acf27c469a87ee7a
 DIST keyring-21.4.0.tar.gz 73591 BLAKE2B ad8fe71a6a8bd3180b01ce3ca0372f9d1dc493d3eb58ced707d1869284d21ceaffaab314c1304b58461d771fa1a4a5981ec8fbcfaf333d602bdef7985d8799eb SHA512 149f1706296c830605d0ff2eddacf3d531c3d80f694465785d83e2af1d55a49204a2112db840522d4de10cd012073cafe571638e2c39a2f61c308821fe5ec901
-EBUILD keyring-21.2.1.ebuild 1267 BLAKE2B f1a95e142caf22676560dedffacecfd0d06d1097916190e8219bcf472b536239f1effd6169b60a1c6564a5e5c0180b8bf935d5ae303ac10d76425fce02d6a064 SHA512 3c174310a9fe8665993891684da99d7a3c304c73a191059d4fc8095117a56ed2623a42b333e8224b9217fe0c698a695804ade899f5c5c17190bdbe248c957d29
-EBUILD keyring-21.3.0.ebuild 1281 BLAKE2B 1e2e062a47177c8928df23e48fdb99917e51e7da008a1483fc83b09fa9a98b95f489a879db37b6de17a7365a6ef121a20ba3507fecbe32a5d346f3aa84fd4537 SHA512 c7916d84182970017e8a5a955ee260661f09ad75202a53b0e73cc3b306496eea5646157596c5b2e1a0cf4c37fe3eab9a3f90ca179b77472e619271bb546945fb
+EBUILD keyring-21.2.1.ebuild 1266 BLAKE2B df8ce389ede1d4715c06f4cfe36cc131f74698d9f1a90bee267ae3f329b1710582578f78d3035b5199326e3589e3dea4f2e26c63e3e58fe36c977e65b6ec05b2 SHA512 7c692f813a322a04f957766dbb2703cb0202e2fd0cf34b15bcb6b82202ffd8e7d12bd58ba06be64934ff4dca596216644788c1cce03b07c7fbdc501df7bf0be5
+EBUILD keyring-21.3.0.ebuild 1273 BLAKE2B 6edd2f19198f9dac1950043b0149e5b69cb8aa1fd718c843d5ec0199d4ac82f50f12a97744f5506d2b6d58eb26e8b33502e3d1d149885169cf862ea34e53b4b2 SHA512 5a3a91255b0dc31176a1833bdd2f150ebcf7f762f580d0b7e7887252266290d920142232100839cd8296486fc7fd2a2d8a210c343128bafa5df6947b1a9d26bc
 EBUILD keyring-21.3.1.ebuild 1164 BLAKE2B 8b30b9f248e9517db0d4831b6d0d05744ca6d4b2862bc8066bd0ec9811b05d3f3bda31056064416057b9cc17a442d6140c0e348bad302f021d255fe27a50a964 SHA512 3828e321691678d215dc54ce441f7b9a36c4760cca8b7989abfed7d91f6914a49373bd163e7d05ff7bfcb7e73594ec050a4c9dff05f7a7222043cf91a8a86b0b
 EBUILD keyring-21.4.0.ebuild 1164 BLAKE2B 8b30b9f248e9517db0d4831b6d0d05744ca6d4b2862bc8066bd0ec9811b05d3f3bda31056064416057b9cc17a442d6140c0e348bad302f021d255fe27a50a964 SHA512 3828e321691678d215dc54ce441f7b9a36c4760cca8b7989abfed7d91f6914a49373bd163e7d05ff7bfcb7e73594ec050a4c9dff05f7a7222043cf91a8a86b0b
 MISC metadata.xml 610 BLAKE2B abd4cf8986ea009081e0e21d31b8bbdbe7b2e99fb332bda41d666c97feda8974cabcabdf6d88e4d8d9a2b9aefd250ad06bfcdd8888513cc0a10cdbda9c93c981 SHA512 931f5d607bc5d9caf329f0b7a010ee055f3c962e67e61c8f4e7458f5325a89bd91678c215fbdd63160eb2d7f34ce58b0a30b144e4159fb426c243efa1dc12d05
diff --git a/dev-python/keyring/keyring-21.2.1.ebuild b/dev-python/keyring/keyring-21.2.1.ebuild
index 63d0699c6485..e0b3973e6993 100644
--- a/dev-python/keyring/keyring-21.2.1.ebuild
+++ b/dev-python/keyring/keyring-21.2.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/jaraco/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 SLOT="0"
 LICENSE="PSF-2"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ~ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86"
 IUSE="doc"
 
 RDEPEND="
diff --git a/dev-python/keyring/keyring-21.3.0.ebuild b/dev-python/keyring/keyring-21.3.0.ebuild
index 651413158c99..8c9cdcffe088 100644
--- a/dev-python/keyring/keyring-21.3.0.ebuild
+++ b/dev-python/keyring/keyring-21.3.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/jaraco/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 SLOT="0"
 LICENSE="PSF-2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86"
 IUSE="doc"
 
 RDEPEND="
diff --git a/dev-python/keystonemiddleware/Manifest b/dev-python/keystonemiddleware/Manifest
index 04f1927a6625..e03a98be9f26 100644
--- a/dev-python/keystonemiddleware/Manifest
+++ b/dev-python/keystonemiddleware/Manifest
@@ -1,3 +1,3 @@
 DIST keystonemiddleware-7.0.1.tar.gz 177439 BLAKE2B 645cade35a1b310b9a897b17fc96a7f1f33ca26efd3dbe482c8d76cca9a9639364cda6d2798c0b2956f5b905c166a67fe3f334cd0ae276e7b0124956f9a9cfd6 SHA512 2c3890a395fe03c19e121a1d315180bf2bf5004351a5dcabb1f455bf22514c682347a3c387da361075a81c3e931f6ac802aed1a95fa3763b90a2ac77adbec306
 EBUILD keystonemiddleware-7.0.1.ebuild 1466 BLAKE2B 3be59200a860cb8097c5bbff3774b3e80b08fe85d9e4b3e04838dc3d1f7d27031d6f8dd11fb63fd5c2df04c1272df28dcc81ec1dc80836b82f32298fee393d39 SHA512 7771e244dac935eafc985eff418dee5b4bf6babecb6d19f1880e29132d1bc5679c3b56b517d5a3be53392a47f1590af2cf361e70310a60d2abf5bf16504a15c1
-MISC metadata.xml 624 BLAKE2B 9431121807a163b4dac75bfe53e40ee4b86412db23d46c8fa6318ec6e0d2af338eb6423076879bbb863e7a2aa173d484d2f1a3c98211021e5357e07f9cae481b SHA512 5ca1f6ea10053be2f9f74c797cd1143f6b3ab267d0decb66f3609973c20637b55769bcb305ab70693d99d3ab09da6aa6ac7d2acc66431a4a52f6dc9aef79aa6c
+MISC metadata.xml 528 BLAKE2B 9b8453371bd9fe7d9a6a9ed5bca9868ddeedb6207b8733c4330ca4a70ef733f9ad0f896fc353d0bb3df84a65cc0e34685d959c2180c3fc717a0e2e5a7944f517 SHA512 a3446e027f44d3aa2c191bdded6454f398da99f5087961a4f083d46b701237167cd332a30b6821be188ecef933cc68bdde196e565b8b93aa480ff1e0ceb646b6
diff --git a/dev-python/keystonemiddleware/metadata.xml b/dev-python/keystonemiddleware/metadata.xml
index baeeac9fc4ba..727128b5e592 100644
--- a/dev-python/keystonemiddleware/metadata.xml
+++ b/dev-python/keystonemiddleware/metadata.xml
@@ -9,9 +9,6 @@
     <email>openstack@gentoo.org</email>
     <name>Openstack</name>
   </maintainer>
-  <longdescription lang="en">
-    OpenStack Identity (Keystone) Middleware
-  </longdescription>
   <upstream>
     <remote-id type="pypi">keystonemiddleware</remote-id>
     <remote-id type="github">openstack/keystonemiddleware</remote-id>
diff --git a/dev-python/lazr-config/Manifest b/dev-python/lazr-config/Manifest
index 04487feeb6d5..eadc010ba69d 100644
--- a/dev-python/lazr-config/Manifest
+++ b/dev-python/lazr-config/Manifest
@@ -1,3 +1,3 @@
 DIST lazr-config-2.2.2.tar.gz 31957 BLAKE2B 5bfee9ae556e6b4109fa43ca36cc2676fb805dc6b9d9f788224ccd29e7836313affa55dd031496c2a252c5e64b150fd8f21c2934da3699ba95e0968ee8022879 SHA512 3427d2be4b4763238bd8378ec5936d38d0b944074d56f6ada55d0e3f232fe0846630a0ef3900c169b58092d029297d7c937ea4ad349aaa2745ed25b71df9c7a0
 EBUILD lazr-config-2.2.2.ebuild 656 BLAKE2B c836de2b5365b1225f73ed0555fd96c34b72ea36fb47e6eede44e29b0b656fd7388a6cb1911ed54226b5d5f4de4616fafde43b3108cf18508059fec055a21cfd SHA512 b852a4ce88ba1b8eb34ef9fca7bbee6d35e22c1528d0c15e7b0d5490f47156e02ec1a4ea5a4470dcd3dad78ee4f7ba99fc39ec0af42fc9a13034ff259b973f2d
-MISC metadata.xml 455 BLAKE2B f897ae39a752d337a92e2ce15baa3cc30217d8741d9da23345b8a4a62122ac87c0d38fe1780a89ff6ade706b59634d56c8cf4a6bd77a362f4319f83d8776ef43 SHA512 85f0af921cd7c83999cd0b302842276fb463c2881f3af7700676711a162804c2db3ecb06d89c0ccd3e33527ab7147723d5e9d7292cc0f26ba8f12438484a7301
+MISC metadata.xml 333 BLAKE2B 1a681ac99aee289a919b530bb87037df6fe53b044ce14ce3a9da3cec54a73d7fde58cf01f12678f18397d16b56c9e5bf88d289ddec4469e343d7193502124124 SHA512 a73512d246562e6591eb9c8d13759352cede7f0ae978d02c87bd72b1fe2c9b155cc3908e8489b136387bada61f1257d8e0771e01e26d998b51f9ce13c087ec41
diff --git a/dev-python/lazr-config/metadata.xml b/dev-python/lazr-config/metadata.xml
index d8d3ff337ff4..3ee70120def4 100644
--- a/dev-python/lazr-config/metadata.xml
+++ b/dev-python/lazr-config/metadata.xml
@@ -8,7 +8,4 @@
 		<email>prometheanfire@gentoo.org</email>
 		<name>Matthew Thode</name>
 	</maintainer>
-	<longdescription lang="en">
-		Create configuration schemas, and process and validate configurations.
-	</longdescription>
 </pkgmetadata>
diff --git a/dev-python/lazr-delegates/Manifest b/dev-python/lazr-delegates/Manifest
index e1c689b6cae5..731f458f2543 100644
--- a/dev-python/lazr-delegates/Manifest
+++ b/dev-python/lazr-delegates/Manifest
@@ -1,3 +1,3 @@
 DIST lazr-delegates-2.0.4.tar.gz 14168 BLAKE2B b9388a869e7f83e0bc30dc5a0cfb184a935db2b6272c2a9a93bb12d3db375114453a224703ef05b3f34232860a16fc087b7d398e94d164fbf77af61ba8abf102 SHA512 0c0b32a4fa4c132646d601870be0f0c1f1856aceb91bf979faa9a675fcbf94f76c7c6f548978a402842633cf4e53275c052cff7dfd776a4246691c067eabe501
 EBUILD lazr-delegates-2.0.4.ebuild 622 BLAKE2B 4757f6e2b151b266be640ef59ac7ad627d459e34ca0d696bdce2ce9a07c23651e03c978d88fa0f10ec8367cac60b14c3dfdc051b51de24bb77ce5677a849be44 SHA512 3cdd8d85a7766db79f7376ca87efa002a6319dd049de9ab4c8abb3dd25d4ac9bf9799cc3b08f670d0f4814e28e285dbede0485df99c6cf93986934333d254d10
-MISC metadata.xml 428 BLAKE2B 9156e02f1e687a320435ae677b8b357a0d101e670ff1e57647aa54012dacbab33ef9145f38b01b3c72d33377ab79cef1f388d00a758d4424f8c5ac38f3f4226f SHA512 e37d21627228729b1f9434288e81d0950505606f0394cf7793d49e217503244ccfcf8aca0ec3354d8dd0c9d7a511680800f6da5a0de423c187c1884e40b0bbce
+MISC metadata.xml 333 BLAKE2B 1a681ac99aee289a919b530bb87037df6fe53b044ce14ce3a9da3cec54a73d7fde58cf01f12678f18397d16b56c9e5bf88d289ddec4469e343d7193502124124 SHA512 a73512d246562e6591eb9c8d13759352cede7f0ae978d02c87bd72b1fe2c9b155cc3908e8489b136387bada61f1257d8e0771e01e26d998b51f9ce13c087ec41
diff --git a/dev-python/lazr-delegates/metadata.xml b/dev-python/lazr-delegates/metadata.xml
index 368888ee2914..3ee70120def4 100644
--- a/dev-python/lazr-delegates/metadata.xml
+++ b/dev-python/lazr-delegates/metadata.xml
@@ -8,7 +8,4 @@
 		<email>prometheanfire@gentoo.org</email>
 		<name>Matthew Thode</name>
 	</maintainer>
-	<longdescription lang="en">
-		Easily write objects that delegate behavior
-	</longdescription>
 </pkgmetadata>
diff --git a/dev-python/libcloud/Manifest b/dev-python/libcloud/Manifest
index 624b5dfbf5ce..b51fb209e72c 100644
--- a/dev-python/libcloud/Manifest
+++ b/dev-python/libcloud/Manifest
@@ -2,4 +2,4 @@ DIST apache-libcloud-3.0.0.tar.bz2 1609684 BLAKE2B cac9f42a2e73c8903d9b29c8e39d0
 DIST apache-libcloud-3.1.0.tar.bz2 1613381 BLAKE2B afc607a76ff3cd24961cfaf916b5813cd59e84d523f9a642bb8222d889abb44d6357d230b001ae03a0b021160384d6c6d8420e85825aa8d84f7619e900c4c9b0 SHA512 ef2fc4754281adc336d656d3a707710feae0f6c22f33156830dd0b299d06fbf9b890817f68192106320944f851265c39f175b5fae5f85053706ec2f0ccd04bf1
 EBUILD libcloud-3.0.0.ebuild 1073 BLAKE2B 51e7a9ce37b08669d3ca78abaca3f7f910e9bc2db73520fdc097cddeb8d296b3ff8656fdcbfbc5470d2c7a085bb2c442589fb633a17d984e6691b4aaef26c3ab SHA512 0b5c838bd97e5dd2ad2c949e1b1c4f6bd1c1935b3f2f3132e7dd8fd58727733c91ffd260d6f0f1e5be4d4570fa7159b80149827f217632fc78120c77359f350c
 EBUILD libcloud-3.1.0.ebuild 1065 BLAKE2B 913749dff780009479ac94edda7c0c973506407be82f2c6f5941f71ac7cc7c8c101f7ccbc51aa75491182d784370acf5e43106fc49119546be4a9ea907dfe0ed SHA512 12905cd077a7d2ad01b2c7051fa747f537e391dda7bd3f9ad2a1810dfa0cec21904f2aabf4a8c6f5283354b2027d9d3500dd882bdac29d76ae8e381058063535
-MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
+MISC metadata.xml 191 BLAKE2B 8bff04ca02f4930d6f77dd32df009c145cacaad2d1cf271d91ae928f85acdccb0d73b0202a41aa3e60470ba6c7853e41ef76587601b2163f9ec249b7fa1c5274 SHA512 da06af54ba93db06f717082e3f09bbca9e17adad4b070a28131f2ffec15d0dfc82c79a3b2fb045fa33d6756c6df85254733622b0b7b1952b33d5590a71865c62
diff --git a/dev-python/libcloud/metadata.xml b/dev-python/libcloud/metadata.xml
index 7a38bb900964..3c58a0219fbe 100644
--- a/dev-python/libcloud/metadata.xml
+++ b/dev-python/libcloud/metadata.xml
@@ -2,4 +2,5 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<!-- maintainer-needed -->
+	<stabilize-allarches/>
 </pkgmetadata>
diff --git a/dev-python/line_profiler/Manifest b/dev-python/line_profiler/Manifest
index 0fc5c252dc94..d91daf9ea415 100644
--- a/dev-python/line_profiler/Manifest
+++ b/dev-python/line_profiler/Manifest
@@ -1,3 +1,3 @@
 DIST line_profiler-3.0.2.tar.gz 45185 BLAKE2B 04e617cc7b6c9686192281ab1cdfdef2cfc6ce3c7aa6b9962ed2369620618af8835b93bafe89f8d1288b45d4120d71f728ec577d5c5d035699c2d7a49d6be7c1 SHA512 9a5d1821c02fc063081854ba98a17eca21af65d5aecf4ce32c67806d31bf0c936291a30409845ce6f94211cdaaaf0859ab5e2b437e1a086fd4f60fc2a0fd2742
-EBUILD line_profiler-3.0.2.ebuild 1150 BLAKE2B 20dff4f66758befd8e7f20fd6dc2473725f62a01b1bc8f5eebb1c56c0da041c2d3b9fc05c0966cb61f04c980b917274fe9f78af66f573d47dc4f2f4fb1bff71e SHA512 58a78a291b4503695d3b14c30c5ff1211bb6a84d9c864cbc516d709d617c9988c70d2b535b5f8a262dacec959982e7ab7a6a2e43dc060bfb4f59512107cf5223
+EBUILD line_profiler-3.0.2.ebuild 1152 BLAKE2B dbfd004c68d715d9cf2b6f6f863e10a0a8eb01b34ed350301804a07fb17a792196977dc7ab39fce0766b7dfcd27e5b08f9998671ce0548e71e45521bcae35acf SHA512 f22c83187b2f49488706eddd1a02cb6516100bbf9b2d2a8d6514f756540a5425bc72829ea6ac8a0c25afbfe11ad80f02e2c60c5bde3aa1b37ad0b3ae8dee90c2
 MISC metadata.xml 691 BLAKE2B 7cf7f3e2a82470d3d3423e203fe1db3ab849502af636e6e36664937738cfb179960c8dbaa2628550e0490f71dd3baec74b083e4341122144cd1b8a6a6c503bdf SHA512 9430cfef2807664446522f0401645522714eac92f990d9c9b4568d3362a26250a3059a386c35e875e2e186206a6401d87b09ad6d66b3d5accc11bc40f73901b7
diff --git a/dev-python/line_profiler/line_profiler-3.0.2.ebuild b/dev-python/line_profiler/line_profiler-3.0.2.ebuild
index 4c08a5c1f82d..a48003e8777a 100644
--- a/dev-python/line_profiler/line_profiler-3.0.2.ebuild
+++ b/dev-python/line_profiler/line_profiler-3.0.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 
 DISTUTILS_USE_SETUPTOOLS=rdepend
 
diff --git a/dev-python/loguru/Manifest b/dev-python/loguru/Manifest
index ec5f6c511e23..bcb271b931e4 100644
--- a/dev-python/loguru/Manifest
+++ b/dev-python/loguru/Manifest
@@ -1,3 +1,5 @@
 DIST loguru-0.5.1.tar.gz 412284 BLAKE2B c28fafd0c9871b56ea05648847d837e0a45c9c0452840c27cb966cc61d7010d41695066dd6723d0987af600cb90fbca499b99354aec2bbe6f1542fd5f7bbe2e9 SHA512 62e53d9a6ec9d6f9b305f1522f0149d22931782d485d21df3e6dbceea9dada269c77de8f69629fb07f28c2afd0b743b4e8d4afb54381b03933a07667a14fb356
+DIST loguru-0.5.2.tar.gz 413504 BLAKE2B 5ded9ade8998bec5a3074cd39b1501a764f141eeb9f389aef50f337f69934ed7902636c4f3d82b5396953750960bb97bf9919ee0361fb77a77c4dbb5607bc8ec SHA512 8a2032a5fbff3c3e2f076eb879462eaca5c8bf12356658583a9877b14a9ce28bce88c7eb8d99fb3224745d59d90dc82e967bda699b95a3c95d748f08613a8fbc
 EBUILD loguru-0.5.1.ebuild 658 BLAKE2B a11d2fe151b026c5f169d1740ba69d6b6db3ff1de2004c17c7f065c2991bb13f056a11736d2e37c4a58e3ef0fd047d6450f092fb21bcc44d9729676b99cf5aae SHA512 857ee28f1d196215d7e616035f89688425c39017ee96ca2a102860ab128cdef0b8189d78ddbd6432166e9881804f5c1ea97dd743d4d8b3d6380fd94e7521d6ea
+EBUILD loguru-0.5.2.ebuild 674 BLAKE2B 06904dd2866cd48ff7f927bd6f25a17c24f08568579e6a0fdeccbd511cd2f5a3a0f6b4d93269607e1edaa169283b72d5b2ffb84a74c4f127295dd7e0941640f1 SHA512 489bd9826510067621aa325fd2b863cde74610c8d4e2f732eee36f6e104578c6ebfb1337d77ddfdc891c7f7fd821c95c1ce1f3c948e746523ec8df6da42ca412
 MISC metadata.xml 683 BLAKE2B bd44db6c47f17a714eb8080d63d5002bbedf247787d568735f87f8aa01a13fc32d383f4eab2b92536a2f98f5b76b0ae01c407bf3c746b08c668ef562cf488ed0 SHA512 8a671ba69aa489f384c7074623f62c03905442b14b6b12bc9f306416a66390a334dcdadf84a5485936b47ff9992ac87e35ffbc8ae17d035b381f53f721b2369b
diff --git a/dev-python/loguru/loguru-0.5.2.ebuild b/dev-python/loguru/loguru-0.5.2.ebuild
new file mode 100644
index 000000000000..0f7fde343c28
--- /dev/null
+++ b/dev-python/loguru/loguru-0.5.2.ebuild
@@ -0,0 +1,22 @@
+# Copyright 2019-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 logging made (stupidly) simple"
+HOMEPAGE="https://github.com/Delgan/loguru"
+SRC_URI="https://github.com/Delgan/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+
+RDEPEND="$(python_gen_cond_dep 'dev-python/aiocontextvars[${PYTHON_USEDEP}]' 'python3_6')"
+BDEPEND="test? ( >=dev-python/colorama-0.3.4[${PYTHON_USEDEP}] )"
+# filesystem buffering tests may fail
+# on tmpfs with 64k PAGESZ, but pass fine on ext4
+distutils_enable_tests pytest
diff --git a/dev-python/lxml/Manifest b/dev-python/lxml/Manifest
index 97644fa6ba6a..35549687122e 100644
--- a/dev-python/lxml/Manifest
+++ b/dev-python/lxml/Manifest
@@ -1,8 +1,7 @@
-AUX lxml-3.5.0-cross-compile.patch 1518 BLAKE2B 70907747332021789933759d3e2620d7b70a223664608680663472b648e2da103362bcbba6ee025375579cc2699432a44fc9b44169ba9c830ad546ebd3abd451 SHA512 b53925979e554552e72e58e06df579d2eb0190cadc304d13766852eaaeec78641deb1ef10700a0b52aebbdc998979830413a76a56cf221bce2e9a24926e1680b
 AUX lxml-4.5.0-tests-pypy.patch 17429 BLAKE2B d27a093c8419e0a9a8a192c91f0f764868aa0164851d3f8650eacda14ecca836b306321de81768b64788ebd013d1916ce2e608d9f000c0699b969cb13fc67ffb SHA512 dfe9bcfd035edbb7e931f9827405f6df449aa9b572970fe4c11e666977df874584bfba12145f79b3d59723da004815f9ec2f708398ef4d8205ad7c3954884361
 AUX lxml-4.5.1-py39.patch 17992 BLAKE2B 17855768819d42b0b67f9a66c5cb1661b71385fb5f28ee275a018497fb55c5da9ae8f8284f38635ac8322ec5ac071ea7dfe496f30dcabde2293e7a6703b3147d SHA512 9c2ea59c526f0ab0a0feaed86d9fca7253582ca8bd09b7ccc6e9638100ab53b5ba716a1c61c311019d13b25cfe72fa28be5cf38eecda1d33e77315f0a7fb166d
 DIST lxml-4.5.1.tar.gz 942377 BLAKE2B 3b7434b50d7f81628f17adf0c65e38c826304674495160a216c3051d86ddd9924f2854cf35453ba8270ca461c4c5429698a002853642f9e52206de1443c6b6f0 SHA512 0f16cdcb8aa7f8c98d3fb625d6713b422c14f0d4e7348cda38eb0776f0cfa637faaabc14dc63f8052f2741c908de6f71cfcb6471d5286c09780816b46cbfb439
 DIST lxml-4.5.2.tar.gz 943480 BLAKE2B 11130d2507ff0d61637d7fef2f4b28c5fbbbfe8864504c8f3a231899be4db14e6be65edc6e780719686605663b0c5f76f161beb509dc58d16ee3a9158a7db59c SHA512 146dcb4414b7f0815c5930048d9dc89711bf0a3ee091c89f4475265cdd6f1690a20f82ec24a282a43cff8854f9b960f0cd4430cff79a7506d39ac1baf7770695
-EBUILD lxml-4.5.1.ebuild 2280 BLAKE2B 45e69675c800525b39a9f26960569910900f15d27e30425f4dcb6a59724f6962df1bd56c7e887739d82001a9ff5ba0b10219f0df23bcd3de32654380ef43206f SHA512 17d0324fe06c46be955af96a82718ae04e5fff68cbfe0c8f127ee805d8ebcd0502b6b8a63b29a8d21fc557b7d56da4264e75efbfdbc02376429c6afc1b0564b3
-EBUILD lxml-4.5.2.ebuild 2246 BLAKE2B d0e4b6b6b93e90ac0683596c0a36658f85331ecfb8d325ebe639c494d10658da99aa755d86b959c5ed9bfacb7ea898d242f9943f75019467f87a881397c042ee SHA512 60e2fca65bfb547af1adfac7bfc4890cc0ed0e49e483033de81488e8a9a1db4f9792907cb27830cd6bb345c58fea1b7ed4971ef82e44e14fc4ff3dfdc128dea1
+EBUILD lxml-4.5.1.ebuild 2284 BLAKE2B dae3e0f7151b1a660276c23eccb1a52faa631a879aadf877016765aa038b0a4d6c1fca10ee1e5fb0981c4db9f8f63badc4d9e208ca1e40adb4985421a92b9418 SHA512 855356ab8be6fdcc024eb5117d1b6f49be4390237ff8b7e7098f661ed82321f23220d80da606e925e664e11760a9a90e222393e603ffba84374b5e34878c0f5a
+EBUILD lxml-4.5.2.ebuild 2247 BLAKE2B 98bcd13a52412ffae6f8be77266db161a37ca23c27ec8092f47c853567afaa35faf30700105e3c74f0ec22162e73502b3a0c8956d65d86c0d2dd366f20025341 SHA512 4656c26d3541440c6f5cbbdbe2ffbeb52ea0d4e2c637f399c73bc13947a377bc09bcf60df99509f4ae3ffe7013b3a644131a1eeba42e615b96d08e18580a92f4
 MISC metadata.xml 317 BLAKE2B ba93bbba5105423b6640b86b29f2a54ff50c9daf42424915cfe25049e983ca03c6f2fc066d4e27fe42292e8290b7091bc00d5a40f49d368a3dd6acce42c4504e SHA512 900609bfd7cd032821afb5d1f6e5c25287178f06a49e59431a710d4e76187a2b41a4a0da383d257777a2120b60f15620da37c70d145eca4a84aa30a08b824fae
diff --git a/dev-python/lxml/files/lxml-3.5.0-cross-compile.patch b/dev-python/lxml/files/lxml-3.5.0-cross-compile.patch
deleted file mode 100644
index 82a371c72978..000000000000
--- a/dev-python/lxml/files/lxml-3.5.0-cross-compile.patch
+++ /dev/null
@@ -1,39 +0,0 @@
- setupinfo.py | 18 +++---------------
- 1 file changed, 3 insertions(+), 15 deletions(-)
-
-diff --git a/setupinfo.py b/setupinfo.py
-index e04c38f..0549eaa 100644
---- a/setupinfo.py
-+++ b/setupinfo.py
-@@ -93,19 +93,6 @@ def ext_modules(static_include_dirs, static_library_dirs,
-         source_extension = ".c"
-         print("Building without Cython.")
- 
--    lib_versions = get_library_versions()
--    versions_ok = True
--    if lib_versions[0]:
--        print("Using build configuration of libxml2 %s and libxslt %s" %
--              lib_versions)
--        versions_ok = check_min_version(lib_versions[0], (2, 7, 0), 'libxml2')
--    else:
--        print("Using build configuration of libxslt %s" %
--              lib_versions[1])
--    versions_ok |= check_min_version(lib_versions[1], (1, 1, 23), 'libxslt')
--    if not versions_ok:
--        raise RuntimeError("Dependency missing")
--
-     base_dir = get_base_dir()
-     _include_dirs = _prefer_reldirs(
-         base_dir, include_dirs(static_include_dirs) + [INCLUDE_PACKAGE_PATH])
-@@ -358,8 +345,9 @@ def get_library_versions():
- 
- 
- def flags(option):
--    xml2_flags = run_command(find_xml2_config(), "--%s" % option)
--    xslt_flags = run_command(find_xslt_config(), "--%s" % option)
-+    pkg_config = os.environ.get('PKG_CONFIG', 'pkg-config')
-+    xml2_flags = run_command(pkg_config, 'libxml-2.0', '--%s' % option)
-+    xslt_flags = run_command(pkg_config, 'libxslt', '--%s' % option)
- 
-     flag_list = xml2_flags.split()
-     for flag in xslt_flags.split():
diff --git a/dev-python/lxml/lxml-4.5.1.ebuild b/dev-python/lxml/lxml-4.5.1.ebuild
index 3759600dec7c..49c1e25edcd5 100644
--- a/dev-python/lxml/lxml-4.5.1.ebuild
+++ b/dev-python/lxml/lxml-4.5.1.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 PYTHON_COMPAT=( python2_7 python3_{6,7,8,9} pypy3 )
 
-inherit distutils-r1 eutils toolchain-funcs
+inherit distutils-r1 optfeature toolchain-funcs
 
 DESCRIPTION="A Pythonic binding for the libxml2 and libxslt libraries"
 HOMEPAGE="https://lxml.de/ https://pypi.org/project/lxml/ https://github.com/lxml/lxml"
diff --git a/dev-python/lxml/lxml-4.5.2.ebuild b/dev-python/lxml/lxml-4.5.2.ebuild
index 29cf22e36c1a..5fda592375ee 100644
--- a/dev-python/lxml/lxml-4.5.2.ebuild
+++ b/dev-python/lxml/lxml-4.5.2.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 PYTHON_COMPAT=( python2_7 python3_{6,7,8,9} pypy3 )
 
-inherit distutils-r1 eutils toolchain-funcs
+inherit distutils-r1 optfeature toolchain-funcs
 
 DESCRIPTION="A Pythonic binding for the libxml2 and libxslt libraries"
 HOMEPAGE="https://lxml.de/ https://pypi.org/project/lxml/ https://github.com/lxml/lxml"
@@ -14,7 +14,7 @@ S=${WORKDIR}/lxml-${P}
 
 LICENSE="BSD ElementTree GPL-2 PSF-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc examples +threads test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/m2crypto/Manifest b/dev-python/m2crypto/Manifest
index 4506a7666333..5fa07f2625ce 100644
--- a/dev-python/m2crypto/Manifest
+++ b/dev-python/m2crypto/Manifest
@@ -1,7 +1,6 @@
-AUX m2crypto-crossdev-0.31.0.patch 505 BLAKE2B 09adce189073dab0cf7e49ed2291ab2f140cd3b26ad771e9c6819315388dc5ef6be26fb730018c1869bcc8d68c54a1e0c54b3ffa422c981597c7a3518a174c9a SHA512 bc13bda02e42937e1793c46dbcbdd0ba887d49360899cbecfc53f5580bbdb070cf76d6f986e146aac0cf6733edadec855cb64b1e25ec74212f82f90a425bfb7b
 AUX m2crypto-libressl-0.31.0.patch 8211 BLAKE2B dc36c1e77f6fa9f260d465c0e61168a9ddd82f382c46f31c06a3ef5972cbbe225f665eac17999f7c8a0b74e1702f82451fed5a39691577b050f477bbf7a2ee2e SHA512 ea100feabae82cf1c1237f55354847935a9c49e05c780e01d8fef959d2a10abc4b9f14c56ea50cba68ff59eb67c3cf5136ff92e9dc456960327e0c582b55720d
 DIST M2Crypto-0.35.2.tar.gz 1117706 BLAKE2B efa15e023be7755b94c642bb23eade912edcbbb76bcdfed3414d27937cd705ec4c83069ca620fe20e58e126549ba7f98e84f6f8330b78133a8a8b953d18f467b SHA512 3608b29a8e7d0732a2359e35fcaae191447aa7c0211ca3d057eed6cee7f0819f5c1121e7d41caca8cdea3c7911f8c447ee475b1b3d125e8dc3adde2718a59f36
 DIST M2Crypto-0.36.0.tar.gz 1127584 BLAKE2B 5cdbbb11ff67d4ddffb2853a72383f3c7f1e1aa53ab84166aeda4fbea1b0d7f506761bb07bf8cb5b36f94bdbeb2ea2b46e0693da8355f81b4bf5c4c1c1cc18b1 SHA512 5b7d6d10c943ff0e09e0e9748d5578e7e0f7659a73de4ba49481152bca05871aef2bfbb869e1636a7cebcf2dd8b9f67fb0d299a833d1d4ebd538031c35d7bca1
 EBUILD m2crypto-0.35.2.ebuild 1433 BLAKE2B 36599cd736a015dcd9a4b574fa127bc77e103c030830f19005135eb433f49bd57e0f7fbcbee5ea9a872415528415e1d3b81116de7dda18cf126036d0549a8491 SHA512 1138c7bad9f33994cea5f22d298f12c5f9f551f63851228e43137a85df125616421348cac4f375cbe7715e0e177c28fb34149f02df649d55f4c003a3174d6aa8
-EBUILD m2crypto-0.36.0.ebuild 1564 BLAKE2B 77ef7c876640b74c5e6654cef8eba34736aa44cc5ada2ba0baa627fd966bd4af0548b482d331551dbe02187e12dd1089f231a987c8d51ef8cff3d760709e5320 SHA512 220486490a241c20779afdad3eb11a7398d05c01293943b4bdbb5c59d10ff38dcbb38f2f5e3926e46e56c3f01be3efc3c683be47a32d5b764317948661146f04
+EBUILD m2crypto-0.36.0.ebuild 1563 BLAKE2B f8540a7336559de4f498a852816c9e8c4a6b3e4b24018cfffb8c46670d563d98a23042e7e9d28308d0b2dfb35208081fbfae4a7df0277e02c687da2a5fd4587b SHA512 774c5ddea2898fa8a822c487cc666d56deb792d0c1e9dc64ff858803f03a8e60e341a6156341e1f96900b50cdf5984b0129538588193ce670d4a450275f26341
 MISC metadata.xml 380 BLAKE2B 99a1c8e8202bed7c6d0ff8cdff3f17b664791405b082be2b7d72b3fe2b77bf89c886666d9bdce6a96c540b9518042b9d49b9af926ca10ab4c5b3b416182de01c SHA512 f2e3b4228c45471f0132b3bb412f017f4006eb82bd63e187db3efdfd3f412c1db19bdb79d37630bb059f75ef69f110687b8924d22c2aef0101cb40eb3486f1e6
diff --git a/dev-python/m2crypto/files/m2crypto-crossdev-0.31.0.patch b/dev-python/m2crypto/files/m2crypto-crossdev-0.31.0.patch
deleted file mode 100644
index ff8388988ad1..000000000000
--- a/dev-python/m2crypto/files/m2crypto-crossdev-0.31.0.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/setup.py
-+++ b/setup.py
-@@ -50,7 +50,8 @@
-                                 '*Visual*', 'VC', 'include')
-         err = glob.glob(globmask)
-     else:
--        pid = subprocess.Popen(['cpp', '-Wp,-v', '-'],
-+        pid = subprocess.Popen(os.environ.get('CPP', 'cpp').split() +
-+                               ['-Wp,-v', '-'],
-                                stdin=open(os.devnull, 'r'),
-                                stdout=subprocess.PIPE,
-                                stderr=subprocess.PIPE)
diff --git a/dev-python/m2crypto/m2crypto-0.36.0.ebuild b/dev-python/m2crypto/m2crypto-0.36.0.ebuild
index 3331769e288b..544cbbac4e15 100644
--- a/dev-python/m2crypto/m2crypto-0.36.0.ebuild
+++ b/dev-python/m2crypto/m2crypto-0.36.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ~ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE="libressl"
 
 RDEPEND="
diff --git a/dev-python/m2r/Manifest b/dev-python/m2r/Manifest
index a47894a2f0fb..5445f6c1ff77 100644
--- a/dev-python/m2r/Manifest
+++ b/dev-python/m2r/Manifest
@@ -5,5 +5,5 @@ AUX m2r.1 9244 BLAKE2B d7ac673d0750695f8b21b6e9d0c5328ab8934dd20eb88835c655affab
 AUX test.md 34 BLAKE2B 88eac9a501f3fd54ac3c9555612c7d3860d5c692170fcfeca3d75b665611b75e627443e8a54d8dbba4c820b2f793c5b933a76493381d295aefdd5ef55b7fc1d5 SHA512 c4b98b3256e14d46187d4c5cf5d3b26e4e4e0b1c6f2f61618987c234f49ea5a9bf31a94b9d2c4907bbd0685fb30138a5916b5dd3c8f92cd80bf0c7c2e657ae26
 AUX test.rst 45 BLAKE2B 1bdb710270f83f8a5177fe457f3ea40bd0bd8ddd36e5acabb4d6fcbdd1cded336a736978a79efff42c7cebcd1a420d8bc4485593d675b3a66e3f427434147c9a SHA512 a2d44de89e17b5a023928fa695c8dd61163a2b59968a514b9a976f92923881ce53625930f0e05f7f257250e46f25747928f71e8f25fcb9c05445b221688077d7
 DIST m2r-0.2.1.tar.gz 24455 BLAKE2B 42ec5a919301b6dee2b345a5eca9e62a1bd44186fb61dbd8cc9de6cacc34821e912f242355cc7368b755f923a433353cfa567afc480e9b8c63bf209ff9d3c624 SHA512 847f04538ee52f0b0a88cee9474ed889e8114a3a7b1fb221cdaa867ab70ca52f517250f2c8bbf795ae598c7b6614e6d03d9f6f05b7e3d56fb8087d63eb52f1bc
-EBUILD m2r-0.2.1.ebuild 1404 BLAKE2B 24127287875b1a0756b9c67847ea0d40528e9d2c56536c8c0fd5fa6788ac6dd9c7b007cb3682cbeb7134dbda52ba279a37e79513126716dd2075710041102b20 SHA512 bd1f9b40c0fe70d22fe33e7990c9c6cfdd8fed669283429b88555ddf5b397f7823b5172dba400f98a0ea6bd1bb5b3be7056a5205620e184cfefd5dc2d17105ec
+EBUILD m2r-0.2.1.ebuild 1411 BLAKE2B 74518e7617eaf6a4655830a6226136f91f5f21889fc34141b3f4c9792bd849ef9527763e34d8ff8e165877896845697229fff851311e2ec15e7ab062fec9a2e5 SHA512 2df9a0e22a63db142eed6bf0d76bf0337c91db08d31759dd8c943f91906d7929e6cdf0bdfd56ef4f5e23d8013a9c48a7bf9f70dadc2092086cffbaac12cc3674
 MISC metadata.xml 460 BLAKE2B fc2b57003045116830f1a25dd6cd1f6230a05e1fe14dc2bb7cfcd65c49b1b7d05e405007335a32bbfef95ab660ec5f0c476392f2ab516eb513add9da725abc87 SHA512 b32f1840054745c2985203c25baa12aeaafb2db1fff06f413ef95ad6e72ec7f5f78528db32f06d5b1f600c76f38d13b6ee541c77a2c6e36ba726174375782b26
diff --git a/dev-python/m2r/m2r-0.2.1.ebuild b/dev-python/m2r/m2r-0.2.1.ebuild
index a0723dd76814..df0a58f8f860 100644
--- a/dev-python/m2r/m2r-0.2.1.ebuild
+++ b/dev-python/m2r/m2r-0.2.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/miyakogi/m2r/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv s390 sparc x86"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-python/mako/Manifest b/dev-python/mako/Manifest
index 9d5bb6155f52..c4de319b3997 100644
--- a/dev-python/mako/Manifest
+++ b/dev-python/mako/Manifest
@@ -1,4 +1,4 @@
 AUX mako-1.1.1-pypy3-test.patch 822 BLAKE2B a6c66e8ff7f430c005843dbdcdb874b520de0ef0b727415745a53bc153e87632be39257124b5640c6e22cee8cca40c2e6dd059302adad9089a40bdac6224be61 SHA512 60eae74863f44c50f45b51519dc887eb60f45708fb2cb272e64b82938b00c3ce3f53933066a56e3385930654ea2295c78aee5cbe82a51c7e2001c8d5e6a54da9
 DIST Mako-1.1.3.tar.gz 477440 BLAKE2B ffa148815d64f1fbfac0291e6afdbcf967d7445e13f364e1e2a492330ad1cd71a788255776e07bbec95877f65440073ec873b035d6f6fc1293a299b0478524a3 SHA512 a9b94fa34a61e7794b6e4549fa0bada6ff84dfb0d9edb8d5c7f9b95d12184fa4499f42303cfee720b576a9f7e986a57d91ad3aeb26c9f93154dbc08fb2975952
-EBUILD mako-1.1.3.ebuild 1192 BLAKE2B 72d4456b5161cd6c67b770d5f5d94141b9243a8d138fab8deaae51c161ea60cb24ea1e687efa9d9d76f8dd585ee1956de253c3b844d22d82a1380b36e6eaf0f2 SHA512 e167baa394a710fc492ee267b1b3ef4350cfd882da1bea316cd657f122766fc2690fce2b13ab39946e2e5e071dcc7856694b0c0e835ac69ac08097d9a1030669
+EBUILD mako-1.1.3.ebuild 1196 BLAKE2B 2dcf48c70c9766b91a2e67b24a03d182741c6aa24afbe891219a278214c97652726197ecd6c66107ec5c0930bc660df624ec7ea6d804c5412045514906271542 SHA512 0003bb2af6f82bdd61d30e80f9dd624dd702d15e31c12fe19dabaeccb8dcd6babaceda188e6de472aae9e3d7484b2338b63702a5d8c58e6ed2cb02fce7dead2e
 MISC metadata.xml 464 BLAKE2B aa08f15bb15d98ba21a42c4cddab014f83b701ada29a2e8f9e445e4055885da957d2029189c895630d914ae0de040a47fc6e088a04c2a33fd47b92d1e564776a SHA512 dbd099adfc1137934764551e38ae97b9a5a32473f86402375e70fb638131e748392f7e0a3397ee7850de3142fb840160269f24be53ab4f532490869397952279
diff --git a/dev-python/mako/mako-1.1.3.ebuild b/dev-python/mako/mako-1.1.3.ebuild
index 5f82325b04d1..94b0810928ba 100644
--- a/dev-python/mako/mako-1.1.3.ebuild
+++ b/dev-python/mako/mako-1.1.3.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 DISTUTILS_USE_SETUPTOOLS=rdepend
 PYTHON_COMPAT=( pypy3 python{2_7,3_{6,7,8,9}} )
 
-inherit distutils-r1 eutils
+inherit distutils-r1 optfeature
 
 MY_P=${P^}
 DESCRIPTION="A Python templating language"
diff --git a/dev-python/mamba/Manifest b/dev-python/mamba/Manifest
index 66a35ef7e357..21ee0fd006f7 100644
--- a/dev-python/mamba/Manifest
+++ b/dev-python/mamba/Manifest
@@ -1,3 +1,5 @@
 DIST mamba-0.11.0.tar.gz 33598 BLAKE2B c52ccbf1fca5dd6f27b4515fa6db65a8a28537e705d734bb126bdc9a4bd4afb5119aabc212f871508f91c21679e7e2215d0c7f13adfaabdf6ea49c942b7b3d64 SHA512 2faf941700800ba0432bfd170d6ff2278e5fc3ba4e85f486d33ed5f07e148284d400e2b02ac0f957a27d47b705fc52b042dc4311bdd175907e307e4dbfa95246
-EBUILD mamba-0.11.0.ebuild 985 BLAKE2B 7511d4c66ee08b4c98d41d643d357555fef8f976affa9adc6edc027514fe3bf232379381a713346246cec305ade97929c4826aaaaf2d8cae8f05fc7aa6a6e088 SHA512 3726358cc420f008cb682d4d89207d1af605f8fb7998240b228dda5a34215f8fb4cc464cd8dfdfe3206a03bb563322856925a34fbd06b41c0849fbdb2b8d8590
+DIST mamba-0.11.1.tar.gz 36974 BLAKE2B 0bffac92c32413be736c20f926094cd2003c8bd8abb47abda7c63a071af5b99729f32b5cdb74f21f30f0b50be81674f08f79dc37416e8c67e2ae03c9a837eda4 SHA512 2b28415e5352fcec8028a8ddef6ff83a0cf2ebbb385506eb97f6a46be619277136a61180e8cf30047efd7807f867a03a0d1032dbfed27e2fc050a8639f67814c
+EBUILD mamba-0.11.0.ebuild 992 BLAKE2B d5410f3bc6f68c3ea6abac56361bc30c8e600a2bb7e882907215aeb5c47f3b50b9695823304db516dac828589cf5117f68cacd28297eecb5b8a395ceeb920378 SHA512 52eed82d8178fd077870fbf9c2e718a4d3a26ee0d45aba5996fc66ecdecf6c5574229d916c227df509417a61679ce7bc6987cdba5eabec130d1dbe38e4903708
+EBUILD mamba-0.11.1.ebuild 893 BLAKE2B 220204cbeeee247b913654d566bf79f31877f9c3eed607b6c1e9b896481106d861e46a5f95491a4ca2d80ef3a4dbe0fc97b3d25d55f8a5ee5961527440bb18f4 SHA512 4e8681befa7a8d56ba63733340f1a76566c77198b4165f8127ef6beda31fb6a2fc26d053945cc042480161ebf4d78fc5a299875d77de0c9d171917bfaa292336
 MISC metadata.xml 299 BLAKE2B 921f7b7d5add4e7decb67da81d15bc1382bb3c51125d99342a9d8229fbf4cb0336ac13623290d0977ee9db821565bde14a1a5d9769dd5e2b89e333efc2a44d54 SHA512 ea6d9b306c3a8691697cea16a1582c8b5a36b54977534e4937feedc34bb62f4006d57227df48e878174aaaee03229d272bd940f23cc5e831cfbe79b05d827f93
diff --git a/dev-python/mamba/mamba-0.11.0.ebuild b/dev-python/mamba/mamba-0.11.0.ebuild
index 3f6be0377656..c6f00f18e6db 100644
--- a/dev-python/mamba/mamba-0.11.0.ebuild
+++ b/dev-python/mamba/mamba-0.11.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/nestorsalceda/${PN}/archive/v${PV}.tar.gz -> ${P}.ta
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64"
+KEYWORDS="amd64 ~arm64"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/mamba/mamba-0.11.1.ebuild b/dev-python/mamba/mamba-0.11.1.ebuild
new file mode 100644
index 000000000000..b29bf908938c
--- /dev/null
+++ b/dev-python/mamba/mamba-0.11.1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+DESCRIPTION="Python test runner born under the banner of Behavior Driven Development"
+HOMEPAGE="https://nestorsalceda.github.io/mamba"
+SRC_URI="https://github.com/nestorsalceda/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-python/clint-0.3.1[${PYTHON_USEDEP}]
+	>=dev-python/coverage-3.7.1[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		${RDEPEND}
+		>=dev-python/doublex-expects-0.7.0_rc1[${PYTHON_USEDEP}]
+		>=dev-python/expects-0.8.0_rc2[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx docs --no-autodoc
+
+python_test() {
+	"${EPYTHON}" -m mamba.cli || die "Tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/matplotlib/Manifest b/dev-python/matplotlib/Manifest
index 47d80a8f7c18..26f55b31638e 100644
--- a/dev-python/matplotlib/Manifest
+++ b/dev-python/matplotlib/Manifest
@@ -1,11 +1,14 @@
 AUX matplotlib-3.1.2-qhull.patch 768 BLAKE2B 480f213014c4f50f7926679a826e282937f25043f530f01d38ac3c4b1672b37a0cd52466bd5f6c66957de5a871b30dfea58e42a6f389a005347220e4d73cb97d SHA512 d25b5888a03b82ddf8e8d415905663e4e77041ce17fb37ac3562ba126048373abc1203acfd0643c1544f1d0ac9f3232447c3f60295daa5528346e80142848420
 AUX matplotlib-3.2.2-test.patch 16508 BLAKE2B 42ed1e5b59f3248dd0c8786769a9694e2e29dbde11d2bc8cff4dc6773663d7f777ee7e125ef9261ec10dd142b686396408d2e5a87939b74ed2c1f8c1ff0c7841 SHA512 e8689c978b7055f01ed7b996b6a25f716039c2bc146bc74cfeb8adb3e29739ddb5e0c5749b220ffb346ef95ad09dbed2339315e357c35d3a9b46d03c21a3382c
 AUX matplotlib-3.3.0-test.patch 9618 BLAKE2B f239d5c16be50b601c91e47e9c43c928beeaddb22be236a17244f289c9032564d3bb1e2e5bd63f6017e51d71008efbd8c86ccc96eed0d30abc50537563720271 SHA512 445076feec916e508a3673babacbf8a8372a6f05c3d067eb77584c4352387d1bc3b1dc6c76beb18549df4601b50943d271c8db510f30748dbcdfc56727030b41
+AUX matplotlib-3.3.2-test-extra.patch 851 BLAKE2B 8fca758413834cf78707a42edbf878919e5d5183eac017928f12da0f9636d62ca42b1a7206e8f2131613bfa5249a835083c461c14c5be95091c37ce94902ea17 SHA512 45aaca6349269b5ab7476cbb82ba1dda6f8fa89100f7a8c7c1c5c037db1213b252daccfc5e905cb09d259f4e28d726c583d5a71f2da2421a787bb3b31fca6e5a
 DIST freetype-2.6.1.tar.gz 2302080 BLAKE2B 6a5fb98e5fa6cf4b7d7533ad44e364227d8c2f7dded4c552d6e22e204c32b7858f20d41d1e809ecdad6e5353d6cec81bea0e0b06a4533363a41ecab83ce3f7ca SHA512 ff2daed64d712737085924c50e75862fafbcbb24eef6d72dac9eaae63bb656d7245397fd828f5d3e47ac847f7ff83d73dedfdd61fde1f7d6e0f0cdeb49bcf83b
 DIST matplotlib-3.2.2.tar.gz 40295831 BLAKE2B 32fb34b95d1df928f949fd7b04909da2494b56efbe543f75bffedf1d9d85a0089a50cd27b82a28ac75361b56fe3f2a6c95b7d9e777778ce46f1d2805e5dae9df SHA512 4b8080fddc717f311a87b6ef1a279304da2931ef2d6de85688c153f14da5009351f42d9533c44695ca43ce1496bb642927aca822a7946a2d50d40a7d25224b31
 DIST matplotlib-3.3.0.tar.gz 38782487 BLAKE2B 97330d93b8d8a64a1296ccb173e44ebcc54c61e22aacdd73cc38a46fb2d22fbfe7334fb3c6993be001c475724c47f530243affddd71ec647232ac093db6e3135 SHA512 2ffd9e79e300a37092ab4b5a7156c2f57e408975818abd413c74477ad622030c7636695467aab821c9996564cddec57e26ba6a8004f6639070964fcb7a510a75
 DIST matplotlib-3.3.1.tar.gz 38780756 BLAKE2B b67388408da5ca6c36333705f0c19db6a1dc815819f01a5b0a7fe4ebd990f3e0df8def90971494e308ba8731f305db80dbe367f64c4fbf1294fd0f884cbb2d64 SHA512 cb3c61b7c96dde226f978980ebc960edc1329655efdeb974c8b6d8fd0cd3b660a8dfa3c98c1b140128b2ba13b134c81b000f6e87fa049d77512c81b1138b2b35
-EBUILD matplotlib-3.2.2-r1.ebuild 6529 BLAKE2B bd5d59fa18590dfa91a7ee9ec6c675489a4bd62ef9f4fbbca126854b148a5cfa453cf77bb68ba32058b69966fc36bc69c05929186a5510c2af48cb45b60617e3 SHA512 ce34651998a057438c85ed198dc0ac3bd461b789ce8a931020405c4a8456fd03f4b316fecb2ed53538ce70da3b3dbdca8ca67505b18b6341ba18fdb60a64ec42
-EBUILD matplotlib-3.3.0.ebuild 6652 BLAKE2B 617db8e27e957d351479da54926834320179f1d490cb55c91eaf5834607c6a69cd1b75f6db99cc5dbe77d45a1174d3a4157090ea4ae12268bc494dff401687e6 SHA512 d2f62cb2ce8a05963f4117623dcec047219210f8de9d81778cf990f3dcfa12046645f3b275bd53295a78641ca3f51ba84f6e81dfe9a799a69acea4db4a89377b
-EBUILD matplotlib-3.3.1-r1.ebuild 6719 BLAKE2B 31acd9a95a4f146040dddc8ad70821108c4ba6c0dcd356c786f741cbd7916e52023d2118fee68977ba5b4db1f66059755d40f2d7d3d6b3d29e938bed1eb8105d SHA512 5e70f4386a5371dc4e5543e5e43d2c0ad86dc35db6ea408dbf5d891fc6f51776b5ba8c9b40694b9650424a15d736b2de98dbf4e425f56e14ff6d1266e5a97b34
+DIST matplotlib-3.3.2.tar.gz 37939974 BLAKE2B f28e184a0fccd4192ba8135b70569bf463d08cae0f4eb8e7f997f417cb947500a9fe46eb5f979473b4d7d22c0ad03ab55aba4067082c86f63eacbf837b8606ad SHA512 cae68e63d879bcfb41b25df4de48472461f7987403d42d34c7205a65ed3ef567660309c04d2a55e155fbe1ef708fd9de0b0d66e71578f34c3ee93379c4ea1e1a
+EBUILD matplotlib-3.2.2-r2.ebuild 6534 BLAKE2B fc84bb6c99dfb3e0c3eb97289d75eae653b7e395bc4aa934dfdaa507bd067fc597cb2f0f1b2e5d254d7f04e3686cf8cbe82ed6d23d37f87cc4e454eb0a05b08a SHA512 a93fcf89d97738e378e343dade32e0335c42314d8d782a62a57fbd1ad73a457f15728139e8086274c5df3685e097e692af2dbb29ed2fa681378f42bcf61e6e55
+EBUILD matplotlib-3.3.0-r1.ebuild 6656 BLAKE2B a78fd213fa3827540e062120bfc7f2bf40108db6951d370871b72c36c5667c4921c4947fd776bfd5aef11c1b63a32e37e479fbd5f6295e394e24f7fc81f8bb65 SHA512 11e4cb4b82791a9bfd53ad47b8d33467baba684eddb0ee62ef630c2e93209465fc5c2d8f02a80bd41fa89bd95eb78863d21c661482f2aa2167ad7b3227eb3bbb
+EBUILD matplotlib-3.3.1-r2.ebuild 6724 BLAKE2B 77ca45a10f77128eabc2f40ce35b57af57feb47748e414218578b6c0de5f8db82b9d4aebd971c53cc9bd55eb60108c30a514acef8efe6c50fadc8aaf6c8dacdc SHA512 2dcfd4ee0eb0f8d0cf1fe409806162b51ec0a8c23f07765cafd8ac197de44a4b909d8648af3c03699cbc49073d5aca3058c60306458ea00a0737b37b76dc01d0
+EBUILD matplotlib-3.3.2.ebuild 6774 BLAKE2B e1bbd7d90106a97cd489ac5aa73d078a1ac5009abb467421b23c0dc2e2f6c23be99df80fd0b9f907a394bbe1f01ba5f35bb7f28b32389c5d7078fee9bc9f4f2f SHA512 387c20f94aea1e53781413b0dd271562f8b95b925df77164b67241e90edb7b712799ce5882ad2b2f32d3f1e3f2d7285e331f4a7869f3e519626960ac708476d0
 MISC metadata.xml 921 BLAKE2B 1ec6f51395f5b41747123b4b0104155defb7f881573259f57572e02ddcf986feecb9fc34bc93cbafa5498afb9549661e3491f72029487cf0eef55f2d756e7ea7 SHA512 cac60a2bdda5c3e9d3eef1a8250b09c8759294361994b8d5f4ec18389106b9aee610dc4c32634ab8e7c0c77ebe39513ce5b816002aaeb2f9037e665b46333f0b
diff --git a/dev-python/matplotlib/files/matplotlib-3.3.2-test-extra.patch b/dev-python/matplotlib/files/matplotlib-3.3.2-test-extra.patch
new file mode 100644
index 000000000000..1fff166295b2
--- /dev/null
+++ b/dev-python/matplotlib/files/matplotlib-3.3.2-test-extra.patch
@@ -0,0 +1,25 @@
+From 5d2f40b312966c08436b4495980313f2dacd9750 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Tue, 15 Sep 2020 23:48:05 +0200
+Subject: [PATCH] Increase tolerance for test_transparent_markers
+
+---
+ lib/matplotlib/tests/test_axes.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/lib/matplotlib/tests/test_axes.py b/lib/matplotlib/tests/test_axes.py
+index 412dd2471..52a32f9f1 100644
+--- a/lib/matplotlib/tests/test_axes.py
++++ b/lib/matplotlib/tests/test_axes.py
+@@ -3500,7 +3500,7 @@ def test_hist_labels():
+     assert l[2][0].get_label() == '00'
+ 
+ 
+-@image_comparison(['transparent_markers'], remove_text=True)
++@image_comparison(['transparent_markers'], remove_text=True, tol=5)
+ def test_transparent_markers():
+     np.random.seed(0)
+     data = np.random.random(50)
+-- 
+2.28.0
+
diff --git a/dev-python/matplotlib/matplotlib-3.2.2-r1.ebuild b/dev-python/matplotlib/matplotlib-3.2.2-r2.ebuild
index a653f14fcd90..3296b24075d0 100644
--- a/dev-python/matplotlib/matplotlib-3.2.2-r1.ebuild
+++ b/dev-python/matplotlib/matplotlib-3.2.2-r2.ebuild
@@ -32,7 +32,7 @@ RDEPEND="
 	>=dev-python/cycler-0.10.0-r1[${PYTHON_USEDEP}]
 	>=dev-python/kiwisolver-1.2.0[${PYTHON_USEDEP}]
 	>=dev-python/numpy-1.18.2[${PYTHON_USEDEP}]
-	>=dev-python/pillow-7.1.1[${PYTHON_USEDEP}]
+	>=dev-python/pillow-7.1.1[jpeg,${PYTHON_USEDEP}]
 	>=dev-python/pyparsing-1.5.6[${PYTHON_USEDEP}]
 	dev-python/python-dateutil:0[${PYTHON_USEDEP}]
 	>=dev-python/pytz-2019.3[${PYTHON_USEDEP}]
diff --git a/dev-python/matplotlib/matplotlib-3.3.0.ebuild b/dev-python/matplotlib/matplotlib-3.3.0-r1.ebuild
index 0ff607bcd6dc..92a63fef1567 100644
--- a/dev-python/matplotlib/matplotlib-3.3.0.ebuild
+++ b/dev-python/matplotlib/matplotlib-3.3.0-r1.ebuild
@@ -23,7 +23,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
 # Fonts: BitstreamVera, OFL-1.1
 LICENSE="BitstreamVera BSD matplotlib MIT OFL-1.1"
 SLOT="0"
-KEYWORDS="~amd64 ~arm arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm arm64 ~ppc ppc64 ~x86"
 IUSE="cairo doc excel examples gtk3 latex qt5 tk wxwidgets"
 
 # internal copy of pycxx highly patched
@@ -32,7 +32,7 @@ RDEPEND="
 	>=dev-python/cycler-0.10.0-r1[${PYTHON_USEDEP}]
 	>=dev-python/kiwisolver-1.2.0[${PYTHON_USEDEP}]
 	>=dev-python/numpy-1.18.2[${PYTHON_USEDEP}]
-	>=dev-python/pillow-7.1.1[${PYTHON_USEDEP}]
+	>=dev-python/pillow-7.1.1[jpeg,${PYTHON_USEDEP}]
 	>=dev-python/pyparsing-1.5.6[${PYTHON_USEDEP}]
 	dev-python/python-dateutil:0[${PYTHON_USEDEP}]
 	>=dev-python/pytz-2019.3[${PYTHON_USEDEP}]
diff --git a/dev-python/matplotlib/matplotlib-3.3.1-r1.ebuild b/dev-python/matplotlib/matplotlib-3.3.1-r2.ebuild
index 981026cbe93b..d8b120fa06ff 100644
--- a/dev-python/matplotlib/matplotlib-3.3.1-r1.ebuild
+++ b/dev-python/matplotlib/matplotlib-3.3.1-r2.ebuild
@@ -33,7 +33,7 @@ RDEPEND="
 	>=dev-python/cycler-0.10.0-r1[${PYTHON_USEDEP}]
 	>=dev-python/kiwisolver-1.2.0[${PYTHON_USEDEP}]
 	>=dev-python/numpy-1.18.2[${PYTHON_USEDEP}]
-	>=dev-python/pillow-7.1.1[${PYTHON_USEDEP}]
+	>=dev-python/pillow-7.1.1[jpeg,${PYTHON_USEDEP}]
 	>=dev-python/pyparsing-1.5.6[${PYTHON_USEDEP}]
 	dev-python/python-dateutil:0[${PYTHON_USEDEP}]
 	>=dev-python/pytz-2019.3[${PYTHON_USEDEP}]
diff --git a/dev-python/matplotlib/matplotlib-3.3.2.ebuild b/dev-python/matplotlib/matplotlib-3.3.2.ebuild
new file mode 100644
index 000000000000..9ded3690e457
--- /dev/null
+++ b/dev-python/matplotlib/matplotlib-3.3.2.ebuild
@@ -0,0 +1,277 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+PYTHON_REQ_USE='tk?,threads(+)'
+
+DISTUTILS_USE_SETUPTOOLS=bdepend
+inherit distutils-r1 flag-o-matic virtualx toolchain-funcs prefix
+
+FT_PV=2.6.1
+DESCRIPTION="Pure python plotting library with matlab like syntax"
+HOMEPAGE="https://matplotlib.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
+	test? (
+		https://downloads.sourceforge.net/project/freetype/freetype2/${FT_PV}/freetype-${FT_PV}.tar.gz
+	)"
+
+# Main license: matplotlib
+# Some modules: BSD
+# matplotlib/backends/qt4_editor: MIT
+# Fonts: BitstreamVera, OFL-1.1
+LICENSE="BitstreamVera BSD matplotlib MIT OFL-1.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="cairo doc excel examples gtk3 latex qt5 tk wxwidgets"
+
+# internal copy of pycxx highly patched
+#	dev-python/pycxx
+RDEPEND="
+	dev-python/certifi[${PYTHON_USEDEP}]
+	>=dev-python/cycler-0.10.0-r1[${PYTHON_USEDEP}]
+	>=dev-python/kiwisolver-1.2.0[${PYTHON_USEDEP}]
+	>=dev-python/numpy-1.18.2[${PYTHON_USEDEP}]
+	>=dev-python/pillow-7.1.1[jpeg,${PYTHON_USEDEP}]
+	>=dev-python/pyparsing-1.5.6[${PYTHON_USEDEP}]
+	dev-python/python-dateutil:0[${PYTHON_USEDEP}]
+	>=dev-python/pytz-2019.3[${PYTHON_USEDEP}]
+	>=dev-python/six-1.14.0[${PYTHON_USEDEP}]
+	dev-python/versioneer[${PYTHON_USEDEP}]
+	media-fonts/dejavu
+	media-fonts/stix-fonts
+	media-libs/freetype:2
+	media-libs/libpng:0
+	>=media-libs/qhull-2013
+	>=www-servers/tornado-6.0.4[${PYTHON_USEDEP}]
+	cairo? (
+		dev-python/cairocffi[${PYTHON_USEDEP}]
+	)
+	excel? (
+		dev-python/xlwt[${PYTHON_USEDEP}]
+	)
+	gtk3? (
+		dev-python/pygobject:3[cairo?,${PYTHON_USEDEP}]
+		x11-libs/gtk+:3[introspection]
+	)
+	latex? (
+		virtual/latex-base
+		app-text/dvipng
+		app-text/ghostscript-gpl
+		app-text/poppler[utils]
+		dev-texlive/texlive-fontsrecommended
+		dev-texlive/texlive-latexextra
+		dev-texlive/texlive-xetex
+	)
+	qt5? (
+		dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}]
+	)
+	wxwidgets? (
+		$(python_gen_cond_dep '
+			dev-python/wxpython:*[${PYTHON_USEDEP}]
+		' python3_{6,7,8})
+	)
+"
+
+BDEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+	doc? (
+		>=app-text/dvipng-1.15-r1
+		>=dev-python/colorspacious-1.1.2[${PYTHON_USEDEP}]
+		>=dev-python/ipython-1.18.2[${PYTHON_USEDEP}]
+		>=dev-python/numpydoc-0.9.2[${PYTHON_USEDEP}]
+		>=sci-libs/scipy-1.4.1[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-1.3.1[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-gallery-0.3.1-r1[${PYTHON_USEDEP}]
+		>=dev-python/xlwt-1.3.0-r1[${PYTHON_USEDEP}]
+		dev-texlive/texlive-latexextra
+		dev-texlive/texlive-fontsrecommended
+		dev-texlive/texlive-latexrecommended
+		>=media-gfx/graphviz-2.42.3[cairo]
+	)
+	test? (
+		dev-python/flaky[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pygobject:3[cairo?,${PYTHON_USEDEP}]
+		x11-libs/gtk+:3[introspection]
+	)
+"
+
+# A few C++ source files are written to srcdir.
+# Other than that, the ebuild shall be fit for out-of-source build.
+DISTUTILS_IN_SOURCE_BUILD=1
+
+distutils_enable_tests pytest
+
+pkg_setup() {
+	unset DISPLAY # bug #278524
+}
+
+use_supported() {
+	case ${1} in
+		wxwidgets)
+			[[ ${EPYTHON} == python3.[678] ]]
+			;;
+	esac
+
+	return 0
+}
+
+use_setup() {
+	local uword="${2:-${1}}"
+	if use_supported "${1}" && use "${1}"; then
+		echo "${uword} = True"
+		echo "${uword}agg = True"
+	else
+		echo "${uword} = False"
+		echo "${uword}agg = False"
+	fi
+}
+
+python_prepare_all() {
+# Generates test failures, but fedora does it
+#	local PATCHES=(
+#		"${FILESDIR}"/${P}-unbundle-pycxx.patch
+#		"${FILESDIR}"/${P}-unbundle-agg.patch
+#	)
+#	rm -r agg24 CXX || die
+#	rm -r agg24 || die
+
+#	cat > lib/${PN}/externals/six.py <<-EOF
+#	from __future__ import absolute_import
+#	from six import *
+#	EOF
+
+	local PATCHES=(
+		"${FILESDIR}"/matplotlib-3.3.0-test.patch
+		"${FILESDIR}"/matplotlib-3.3.2-test-extra.patch
+	)
+
+	# requires jupyter-nbconvert
+	rm lib/matplotlib/tests/test_backend_nbagg.py || die
+
+	sed \
+		-e 's/matplotlib.pyparsing_py[23]/pyparsing/g' \
+		-i lib/matplotlib/{mathtext,fontconfig_pattern}.py \
+		|| die "sed pyparsing failed"
+
+	sed -e 's:\(@pytest.mark.flaky\)(reruns=3):\1:' \
+		-i lib/matplotlib/tests/test_*.py || die
+
+	hprefixify setupext.py
+
+	rm -rf libqhull || die
+
+	export XDG_RUNTIME_DIR="${T}/runtime-dir"
+	mkdir "${XDG_RUNTIME_DIR}" || die
+	chmod 0700 "${XDG_RUNTIME_DIR}" || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_configure_all() {
+	append-flags -fno-strict-aliasing
+	append-cppflags -DNDEBUG  # or get old trying to do triangulation
+	tc-export PKG_CONFIG
+}
+
+python_configure() {
+	mkdir -p "${BUILD_DIR}" || die
+
+	# create setup.cfg (see setup.cfg.template for any changes).
+
+	# common switches.
+	cat > "${BUILD_DIR}"/setup.cfg <<- EOF || die
+		[directories]
+		basedirlist = ${EPREFIX}/usr
+		[provide_packages]
+		pytz = False
+		dateutil = False
+		[libs]
+		system_freetype = True
+		system_qhull = True
+		[packages]
+		tests = $(usex test True False)
+		[gui_support]
+		agg = True
+		gtk = False
+		gtkagg = False
+		pyside = False
+		pysideagg = False
+		qt4 = False
+		qt4agg = False
+		$(use_setup cairo)
+		$(use_setup gtk3)
+		$(use_setup qt5)
+		$(use_setup tk)
+		$(use_setup wxwidgets wx)
+	EOF
+
+	if use gtk3 && use cairo; then
+		echo "gtk3cairo = True" >> "${BUILD_DIR}"/setup.cfg || die
+	else
+		echo "gtk3cairo = False" >> "${BUILD_DIR}"/setup.cfg || die
+	fi
+}
+
+wrap_setup() {
+	local MAKEOPTS=-j1
+	local -x MPLSETUPCFG="${BUILD_DIR}"/setup.cfg
+	"$@"
+}
+
+python_compile() {
+	wrap_setup distutils-r1_python_compile --build-lib="${BUILD_DIR}"/lib
+}
+
+python_compile_all() {
+	if use doc; then
+		cd doc || die
+
+		# necessary for in-source build
+		local -x PYTHONPATH="${BUILD_DIR}"/build/lib:${PYTHONPATH}
+
+		VARTEXFONTS="${T}"/fonts \
+		emake SPHINXOPTS= O=-Dplot_formats=png:100 html
+	fi
+}
+
+src_test() {
+	virtx distutils-r1_src_test
+}
+
+python_test() {
+	# we need to rebuild mpl against bundled freetype, otherwise
+	# over 1000 tests will fail because of mismatched font rendering
+	grep -v system_freetype "${BUILD_DIR}"/setup.cfg \
+		> "${BUILD_DIR}"/test-setup.cfg || die
+	local -x MPLSETUPCFG="${BUILD_DIR}"/test-setup.cfg
+	ln -s "${WORKDIR}/freetype-${FT_PV}" "${BUILD_DIR}" || die
+	distutils-r1_python_compile -j1 --build-lib="${BUILD_DIR}"/test-lib
+	local -x PYTHONPATH=${BUILD_DIR}/test-lib:${PYTHONPATH}
+
+	"${EPYTHON}" -c "import sys, matplotlib as m; sys.exit(m.test(argv=['-m', 'not network'], verbosity=2))" || die
+}
+
+python_install() {
+	wrap_setup distutils-r1_python_install
+
+	# mpl_toolkits namespace
+	python_moduleinto mpl_toolkits
+	python_domodule lib/mpl_toolkits/__init__.py
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/build/html/. )
+
+	distutils-r1_python_install_all
+
+	if use examples; then
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+
+	find "${D}" -name '*.pth' -delete || die
+}
diff --git a/dev-python/metakernel/Manifest b/dev-python/metakernel/Manifest
index 4441f89f4bc7..37f3c105ec31 100644
--- a/dev-python/metakernel/Manifest
+++ b/dev-python/metakernel/Manifest
@@ -1,4 +1,4 @@
 AUX metakernel-0.25.0-disable-brittle-tests.patch 762 BLAKE2B 440f29b4566beac51b5428e691c0fc6dfb13c2b3912486956589f414c44ad07ecb7ad23b5ef4b5e160bee15205c7b68b327c3bf612b81cda2a73fd51968ba83a SHA512 475829494bd4cc20b994f69428228a2d12a3a1b004e72be50ac5e2d746e37f9ae6203fe776e63a96e4d673bfdba814ca1ae1dc609392a4e346648a5b1471d314
 DIST metakernel-0.25.0.tar.gz 182808 BLAKE2B 40fbd44109e3b9e88fa8065138e7ffe3b42320651c1731249a10c443a456a5eaa5c91110fcc223f1d557aaa1acfee670a3a36dacf78e6bc9b2ecba0e39f7cc21 SHA512 89a46d3b746a0f4c435dcbeefdb485257c2813790849f95bc0508fee7c2a892e688fdbe2dc9db5f2a0c69ed4917e8de81753492e686337d5e1ab692e9e51ea5a
-EBUILD metakernel-0.25.0.ebuild 567 BLAKE2B a4746723d861dcb63c7fe8bccb31103e62e419783df07b2e7fd4f48edc15dd041135eab083fb12e5932af43a90f9b3a9de46b236c73530fa8474b407fa356d4b SHA512 f3971eea99d5b07bade4fa6af3629644225eecb0f2e428cf84b736c016901ab7f44f1d0cfa04de7df95243a810bf45ddcf3dbc659a85992f6604f14a486cbe43
+EBUILD metakernel-0.25.0-r1.ebuild 567 BLAKE2B a4746723d861dcb63c7fe8bccb31103e62e419783df07b2e7fd4f48edc15dd041135eab083fb12e5932af43a90f9b3a9de46b236c73530fa8474b407fa356d4b SHA512 f3971eea99d5b07bade4fa6af3629644225eecb0f2e428cf84b736c016901ab7f44f1d0cfa04de7df95243a810bf45ddcf3dbc659a85992f6604f14a486cbe43
 MISC metadata.xml 634 BLAKE2B 18f77a465ef02244b5ded5cea7751fabeb5d1fbad17c2e47239228e7512512eabaa79fab71f480fd11d33af8b43ca6859f4749b81c14c2e93384b051f1ea3590 SHA512 b4a566da04b0f87e979b4556d3fbe76d3716ef96b6b9e5222fb942b0d622d9acb98274b935cb2fdbbf01baa111df351e2dc3988ce494c1bb4b17a18f2115c7ad
diff --git a/dev-python/metakernel/metakernel-0.25.0.ebuild b/dev-python/metakernel/metakernel-0.25.0-r1.ebuild
index a0d19a5493da..a0d19a5493da 100644
--- a/dev-python/metakernel/metakernel-0.25.0.ebuild
+++ b/dev-python/metakernel/metakernel-0.25.0-r1.ebuild
diff --git a/dev-python/mistune/Manifest b/dev-python/mistune/Manifest
index f0c11a0aed63..ac0f66d2dfc7 100644
--- a/dev-python/mistune/Manifest
+++ b/dev-python/mistune/Manifest
@@ -1,3 +1,3 @@
 DIST mistune-0.8.4.tar.gz 58322 BLAKE2B e65d45c5c95706a49a7fd407afe5f10e82a475766ca272ec3bebba8c89e670fe6efced7b09537efb69d3fd36e75091e370170a15ad7488b5cbe9186e2ccaf4db SHA512 36c3ef5d5537f5cceaa43e4da20a84b27c378cb744a93f0380024faefde490bcb42c453f79002ca049083fc437278f4afb3e10de5462f9eeb9077ca2a2fcaea7
-EBUILD mistune-0.8.4.ebuild 526 BLAKE2B 2725b9ab5fa413d4e28b8e00059dfbf8292a6714b91a8703f2722ce9a6d2ad99c74b2d5757ec001bdb3acc8ca79e0ccac7f44ba8e82fb967c3d68a52737d64a2 SHA512 f8c227de2b1bd8de2dcdde2a00fa0d6e6608639789023c77da9b81850cd8aea49806f1d1a42ab5de662aee8907e3855c6938b1f3fa32a8c5f475eaad82781625
+EBUILD mistune-0.8.4.ebuild 533 BLAKE2B ee0df859d0f2f26156f933000faaee7e007eb3a76626b45d1a2890bf7125bd07aeadcbc6f948010a62262cf9e03b8a1408ff9e5a20d251e29a43f51f91579c58 SHA512 1afeacbba46da5f13b72b05510a778422b70c3196b37e45552a6cf7f8cb53da798a7f57b8e4ce976074e507c432127db177ac376ae7cc9fde22039a72754951e
 MISC metadata.xml 377 BLAKE2B 6c495d3d88811994e4baf0aabb5267343c09162239cc655b5fe4f9b8b63df4cb08dff0186cbe6b63018eac2cc2489a3f612f72d49885df3055591da74f5fa5a5 SHA512 3630e9ba514f3f3b1ecf532ca928c3bc89c05ab50a9113ab4b1d609edf07a6421796774ee4a71cf17ea3c2939acea24e22a74f33b66fe630706dcd6482cf817e
diff --git a/dev-python/mistune/mistune-0.8.4.ebuild b/dev-python/mistune/mistune-0.8.4.ebuild
index 63b21c2482ff..f5c29b53f3fa 100644
--- a/dev-python/mistune/mistune-0.8.4.ebuild
+++ b/dev-python/mistune/mistune-0.8.4.ebuild
@@ -13,6 +13,6 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="BSD"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux"
 
 distutils_enable_tests nose
diff --git a/dev-python/mock/Manifest b/dev-python/mock/Manifest
index 3bc4df0bf4d4..015ec6a77b60 100644
--- a/dev-python/mock/Manifest
+++ b/dev-python/mock/Manifest
@@ -1,3 +1,3 @@
 DIST mock-3.0.5.gh.tar.gz 67887 BLAKE2B b9c49b3627275889d73aff9ea9c7925093f9cafb304448b2f06eda2fff26152a031aafb4844537e4d58bc112709e59a44e08d32602776386a30d039743def29c SHA512 9ab4f0c794f5701ba1367d982cf79a5662d4233753d12ed9c88ae20282db1f44be73f84c4d9f6d03ff64926b8c1b6d0c9a79b2a4724a3eb36c247ffd4ab03e2d
-EBUILD mock-3.0.5-r1.ebuild 1483 BLAKE2B 8c6c3f7ab500f41c4017bfa05d62ac9bc3ada442079a07ba84ca84874f0d9d2eb97b2b8e066c2fc0812beda5b9d366bb57a389faafa35b5798045deab0076c3b SHA512 ef8e9963dfff8fbd5f87927a95f578ad45b4dbe0d4a070f2ed565ddc60438d06ff85403dc5f2fc0871f46e60b83db3d5df0795b9739bddede389596d9b6e7ac1
+EBUILD mock-3.0.5-r1.ebuild 1490 BLAKE2B 344fbdb5ba058a8e7cce151eb7d707c57c1f9c10da7b1ba62baba57c0e23161959b8b121fe14fd6d14835f4fd433ddf03c0ba051900770d2fe7b2119975cd92d SHA512 2a80b24382057d546268913f4b31d994023516b353b4fee15580554affa618357a0089d0a70efd5bf33e58f0d13570253a03d3c94194bc9d645bfe1f13eb7fa2
 MISC metadata.xml 365 BLAKE2B 80ce989b7585192744838e804490286b598d6a4e082a2e88fce1efdc34c3ef3185478fa6ce3f08c81dd680c62b4de0c7eff3fe7c926d96479ab856aa46c69250 SHA512 89eda97d1f0ece91d573a9fc4fb5d357733b757b1214a56c7bb14a10f84e1c275d2cc49ed773597c4e320df03f751fb093fef7f3805deb450380df4dd83d875f
diff --git a/dev-python/mock/mock-3.0.5-r1.ebuild b/dev-python/mock/mock-3.0.5-r1.ebuild
index 93258859435b..ae11de1bc1bd 100644
--- a/dev-python/mock/mock-3.0.5-r1.ebuild
+++ b/dev-python/mock/mock-3.0.5-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/testing-cabal/mock/archive/${PV}.tar.gz -> ${P}.gh.t
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 
 RDEPEND="
 	$(python_gen_cond_dep '
diff --git a/dev-python/more-itertools/Manifest b/dev-python/more-itertools/Manifest
index b63d9e3df54a..c674373b2b1c 100644
--- a/dev-python/more-itertools/Manifest
+++ b/dev-python/more-itertools/Manifest
@@ -3,5 +3,5 @@ DIST more-itertools-8.4.0.tar.gz 83626 BLAKE2B 84370e495a6f32c856f751907e45c6155
 DIST more-itertools-8.5.0.tar.gz 86861 BLAKE2B 6c5d7e0e2bfa89b65636115d5539ca5a36de24b7e0971638721d8fa13f6ad84f0fc64b297b5c3c30d380f78e271f6b6622d72a41ffb8f1941945d5918ec6c78a SHA512 f11a4443d4d5e79fe241fc6e170ae51b08cfb1f1093dddad036e1ba043c30d03c53ab9fccbfb4de97279862c6cfe44759ae88ce6027d871515b032e7d9e435e7
 EBUILD more-itertools-5.0.0.ebuild 714 BLAKE2B 157f253d495410285f2c9c38f6487943eb2965ad1fc9fcb18ae4222f199b7db215995193f10b2d23163756a8ce5dc3600a7517cee2a2ffda69302faf204bf839 SHA512 75274ecf32e551be840489f74ba6d03c5c0cb3bbf85138282da5836b07f7b0555afad83d7640075e380cb90bef1db12327b44fd402a5b26c33ba085316b4c474
 EBUILD more-itertools-8.4.0.ebuild 660 BLAKE2B 9c1d96501f32515dfffb61e65baaf2c81daa7a8a9f94a582ef341ac00b2bb160c72200a9ef415f2e847e37d1dafab6032df192c1f48a429826b3a49fefc05f33 SHA512 31a0b198d7bd5533c49301b6abd83d2a5cb029dc3e4fc0ec566cb85a6c82bd648ba843aca19fc77275a7b1f6518dabce727493c716f2f9fb84173b92130a7b33
-EBUILD more-itertools-8.5.0.ebuild 669 BLAKE2B 365de101d7a208d6dfe8bc956a38110a95c25e2e152d564dd5ea5e8e29b669032d4d8d34ec4e813075bf08d4ba48dad57fc196fad8aef8b0f4dbaf636856ee4b SHA512 a53f2d0928535bfe5a80a968a01ebc3449f6fc153a79152643996e312be06056e58539c394e921b1cbb8f28dcbdfd5c31c3a85427d6e08afc5cb2218d8354596
+EBUILD more-itertools-8.5.0.ebuild 676 BLAKE2B 27451991e55f4732f675bafc01b5d3dc4558e31e55194ed8f6a228129200f56b914e7e513504aa66f09f4d39c61bf1128b8831059ce74ba0afbc512a1eca04d6 SHA512 f69c52f49c34965ac6db6ea36ebdcc2abbfb61da5e8f13ac27edb29406fc4af38c118a2f308b1a39897d0a0e5a8c650c3c17c0950711f5bc5dc9923fe72ca0d6
 MISC metadata.xml 475 BLAKE2B de5a09fa0987ae45ca73d94cdf2ecaaee8b0f697e1cc4e1b535fd16f50a10460cd5a3293bc1a0633ab099c3ef07fc1ae0d99a2faebfe4117f0a5ab53837ac94f SHA512 3cccec99e9f80ef9751d2e19fc196a177f62a6b72ada30859fb8cc577fd362cac9b8261869b59a85ff1e8b4d9716daaf190cc97b3733f63e014d2e2c838d00e4
diff --git a/dev-python/more-itertools/more-itertools-8.5.0.ebuild b/dev-python/more-itertools/more-itertools-8.5.0.ebuild
index b1c4f1688dec..b3ba108b1290 100644
--- a/dev-python/more-itertools/more-itertools-8.5.0.ebuild
+++ b/dev-python/more-itertools/more-itertools-8.5.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 BDEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/moto/Manifest b/dev-python/moto/Manifest
index 19c5e09494e1..b794283d0bc8 100644
--- a/dev-python/moto/Manifest
+++ b/dev-python/moto/Manifest
@@ -2,5 +2,9 @@ AUX moto-1.3.14-newer-botocore.patch 2398 BLAKE2B ea5ebf10d926cca1e9e5a804317bb9
 AUX moto-1.3.14-py39.patch 1372 BLAKE2B 620592a897b8f2ddf1973fa3f00a7c2c2512d3da02bf7f5a1474e6f8a934815cdaf00951898af292ebc5b38a0cc961d685c59fd8dd952d5fbe64dcff086d9d19 SHA512 336d9c1d399d2969cc603a3070285ebd4cc2f58bd8fa8d477fd6bde8cfc9a9a873c15b98fd2814f8c3b1cf591826101c024658f5b4468f40e6beaa229c8c8f50
 AUX moto-1.3.14-tests.patch 2306 BLAKE2B 83bf272204ba9128623ad13bfb4a468d6b2a4e5de89633b7915d2090be44b4a7823ca88ea6a706fd878e40434335a3d381e28b88806f7ed5f402fdb9977837a0 SHA512 549e1e6715f04b56729f5621f2806e8b9192ec9fd6e5bd4cacfdf4a1a5ee48ed8701f0a9acb5b1cc08e40efa4d3dc1ad5ff0821c794e97a9da6288dd3cd1be5a
 DIST moto-1.3.14.tar.gz 1829165 BLAKE2B 2ec30c4cc571492a9d2c08f66a39ad04cfc0baa7864db8a5be4ea9af24ecb59bad3e85c44fa8a7babc16bf66188cb6bef89484f1f302a11e6eec1f8dbf516492 SHA512 1fe7e9d49dadada82f24d6bef1c21419c414e027c21ed1099bd1eab7c269ac5638ed44a29d1557b37562a44b22a7c7251fc1ca8ba88cde6b82d39dbc620aa6a6
+DIST moto-1.3.15.tar.gz 1760920 BLAKE2B 61f64f31e0227a29d773c033cbd77eb7dc4e0c8ad3eed5b373c34cb0ca410032dd02fe5ce26885d25b48e06d40a0e6988100720abd9b4a6b67318b6b6972ad1b SHA512 140b94eb063b08562429edc933da2bde87dc09d6bdbb8ea9846318772de9b9135181e62d0b552b638351e98bf8e1168305e45bc484258c9fe6991ca906ce5af0
+DIST moto-1.3.16.tar.gz 1761006 BLAKE2B adb48ac770e0753403fd41309ebc2085e5d9cdfad5dc791d9cc1216af10e55038c37526a8549a034a3327d821c56b0f6cdd775a17336285bfc637c09191dd78d SHA512 80a1335fea8d6dd42b4062365da4719d26cd6c18e5c186c950bbb844dce44e91ffe5e5173742f3b60d6ba2cab93d45359b43c2cb0ccf74d16009986457c243a4
 EBUILD moto-1.3.14-r3.ebuild 2875 BLAKE2B a59ffb75225e6df25c038a683deaec98fedc2c875c142696c828dd0d2a3daddb59c7c2af21417c4f9236473032d36e091bd4ed0c625316479338bce4efadb21d SHA512 f79e21f53adc1498d650446a17d1cd20ca10151be63778b880d2c61b3cb64459da23e3cf9fc70b9d89409fe4c962359bc33d062017abb41ca94fb2d82c0288e3
+EBUILD moto-1.3.15.ebuild 2988 BLAKE2B 10bdb9d8b6d4ab192ad5ac576a0cec68b6d3211988a188247135ae37897076fd2d78446865541a89b3cb7e4b20f04ecd5eabbb60cdd1c1fddf3e4331e6d04652 SHA512 35b4f3cce6d03bb00d31a5ad63bfd8c0a68352ad1572065d196e689703b507e0e432e117016f264aa8419fee2e174de8a8f671fccbb859fcaf0036eaa1e30fe3
+EBUILD moto-1.3.16-r1.ebuild 3189 BLAKE2B 9e3470adb3e752166d13bc6f0dc48627260eabd3bc578b3e4ff5e62b8bc9fee46e0596972d89eab3df85e9e33204c8cdb9af85daae4cdb691df3edfd38d71009 SHA512 c6d97de1720e0ca832dba635beae82097e031da535184617198e67ac57463b0ac602287a68a8d8a1f34438fa1abcb9deb65f87a4b79133f91ff3d91455d1d01e
 MISC metadata.xml 486 BLAKE2B 5fbd350934c9a51d9b34d57a4031b6180acad41a2f981465b8ce78b76cf2ed25679fc4b5e9af59dab1e27cfe0eff2856419394902bcca26a2ffb7ece199d1838 SHA512 9e69d49c588ebbeef151cee987986de7a942a3daa9bf4d4f442314d7e47bd1ad8650c6190c6313e6f4303c03038313b6562d5e0a32ec536227c04e7702ef316f
diff --git a/dev-python/moto/moto-1.3.15.ebuild b/dev-python/moto/moto-1.3.15.ebuild
new file mode 100644
index 000000000000..cebf5f92d963
--- /dev/null
+++ b/dev-python/moto/moto-1.3.15.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6..9} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+inherit distutils-r1
+
+DESCRIPTION="Mock library for boto"
+HOMEPAGE="https://github.com/spulec/moto"
+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"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-python/aws-xray-sdk-python-0.93[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep 'dev-python/backports-tempfile[${PYTHON_USEDEP}]' python3_{6,7})
+	dev-python/cfn-python-lint[${PYTHON_USEDEP}]
+	>=dev-python/cryptography-2.3.0[${PYTHON_USEDEP}]
+	dev-python/cookies[${PYTHON_USEDEP}]
+	dev-python/dicttoxml[${PYTHON_USEDEP}]
+	>=dev-python/docker-py-2.5.1[${PYTHON_USEDEP}]
+	>=dev-python/idna-2.5[${PYTHON_USEDEP}]
+	>=dev-python/jinja-2.10.1[${PYTHON_USEDEP}]
+	>=dev-python/jsondiff-1.1.2[${PYTHON_USEDEP}]
+	>=dev-python/boto-2.36.0[${PYTHON_USEDEP}]
+	>=dev-python/boto3-1.9.201[${PYTHON_USEDEP}]
+	>=dev-python/botocore-1.12.201[${PYTHON_USEDEP}]
+	dev-python/flask[${PYTHON_USEDEP}]
+	dev-python/mock[${PYTHON_USEDEP}]
+	dev-python/pretty-yaml[${PYTHON_USEDEP}]
+	>=dev-python/pyyaml-5.1[${PYTHON_USEDEP}]
+	>=dev-python/python-dateutil-2.1[${PYTHON_USEDEP}]
+	dev-python/pytz[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	dev-python/python-jose[${PYTHON_USEDEP}]
+	dev-python/python-sshpubkeys[${PYTHON_USEDEP}]
+	>=dev-python/responses-0.9.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.5[${PYTHON_USEDEP}]
+	dev-python/xmltodict[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9[${PYTHON_USEDEP}]
+	dev-python/werkzeug[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? ( ${RDEPEND}
+		dev-python/freezegun[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/parameterized[${PYTHON_USEDEP}]
+		dev-python/responses[${PYTHON_USEDEP}]
+		>=dev-python/sure-1.4.11[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests nose
+
+python_prepare_all() {
+	# Disable tests that fail with network-sandbox.
+	sed -e 's|^\(def \)\(test_context_manager()\)|\1_\2|' \
+		-e 's|^\(def \)\(test_decorator_start_and_stop()\)|\1_\2|' \
+		-i tests/test_core/test_decorator_calls.py || die
+
+	# require docker
+	rm tests/test_awslambda/test_lambda*.py || die
+	rm tests/test_batch/test_batch.py || die
+
+	sed -e 's:test_create_stack_lambda_and_dynamodb:_&:' \
+		-i tests/test_cloudformation/test_cloudformation_stack_crud.py || die
+	sed -e 's:test_lambda_function:_&:' \
+		-i tests/test_cloudformation/test_cloudformation_stack_integration.py || die
+	sed -e 's:test_passthrough_requests:_&:' \
+		-i tests/test_core/test_request_mocking.py || die
+	sed -e 's:test_delete_subscription_filter_errors:_&:' \
+		-e 's:test_put_subscription_filter_update:_&:' \
+		-e 's:test_put_subscription_filter_with_lambda:_&:' \
+		-i tests/test_logs/test_logs.py || die
+
+	# these tests crash nose
+	rm tests/test_xray/test_xray_client.py || die
+
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/moto/moto-1.3.16-r1.ebuild b/dev-python/moto/moto-1.3.16-r1.ebuild
new file mode 100644
index 000000000000..ed31801a86c2
--- /dev/null
+++ b/dev-python/moto/moto-1.3.16-r1.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6..9} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+inherit distutils-r1
+
+DESCRIPTION="Mock library for boto"
+HOMEPAGE="https://github.com/spulec/moto"
+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"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-python/aws-xray-sdk-python-0.93[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep 'dev-python/backports-tempfile[${PYTHON_USEDEP}]' python3_{6,7})
+	dev-python/cfn-python-lint[${PYTHON_USEDEP}]
+	>=dev-python/cryptography-2.3.0[${PYTHON_USEDEP}]
+	dev-python/cookies[${PYTHON_USEDEP}]
+	dev-python/dicttoxml[${PYTHON_USEDEP}]
+	>=dev-python/docker-py-2.5.1[${PYTHON_USEDEP}]
+	>=dev-python/idna-2.5[${PYTHON_USEDEP}]
+	>=dev-python/jinja-2.10.1[${PYTHON_USEDEP}]
+	>=dev-python/jsondiff-1.1.2[${PYTHON_USEDEP}]
+	>=dev-python/boto-2.36.0[${PYTHON_USEDEP}]
+	>=dev-python/boto3-1.9.201[${PYTHON_USEDEP}]
+	>=dev-python/botocore-1.12.201[${PYTHON_USEDEP}]
+	dev-python/flask[${PYTHON_USEDEP}]
+	dev-python/mock[${PYTHON_USEDEP}]
+	dev-python/more-itertools[${PYTHON_USEDEP}]
+	dev-python/pretty-yaml[${PYTHON_USEDEP}]
+	>=dev-python/pyyaml-5.1[${PYTHON_USEDEP}]
+	>=dev-python/python-dateutil-2.1[${PYTHON_USEDEP}]
+	dev-python/pytz[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	dev-python/python-jose[${PYTHON_USEDEP}]
+	dev-python/python-sshpubkeys[${PYTHON_USEDEP}]
+	>=dev-python/responses-0.9.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.5[${PYTHON_USEDEP}]
+	dev-python/xmltodict[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9[${PYTHON_USEDEP}]
+	dev-python/werkzeug[${PYTHON_USEDEP}]
+	dev-python/zipp[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? ( ${RDEPEND}
+		dev-python/freezegun[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/parameterized[${PYTHON_USEDEP}]
+		dev-python/responses[${PYTHON_USEDEP}]
+		>=dev-python/sure-1.4.11[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests nose
+
+python_prepare_all() {
+	# unping indirect dep on ecdsa that's supposed to workaround pip
+	# bugs
+	sed -i -e '/ecdsa/s:<0.15::' setup.py || die
+
+	# Disable tests that fail with network-sandbox.
+	sed -e 's|^\(def \)\(test_context_manager()\)|\1_\2|' \
+		-e 's|^\(def \)\(test_decorator_start_and_stop()\)|\1_\2|' \
+		-i tests/test_core/test_decorator_calls.py || die
+
+	# require docker
+	rm tests/test_awslambda/test_lambda*.py || die
+	rm tests/test_batch/test_batch.py || die
+
+	sed -e 's:test_create_stack_lambda_and_dynamodb:_&:' \
+		-i tests/test_cloudformation/test_cloudformation_stack_crud.py || die
+	sed -e 's:test_lambda_function:_&:' \
+		-i tests/test_cloudformation/test_cloudformation_stack_integration.py || die
+	sed -e 's:test_passthrough_requests:_&:' \
+		-i tests/test_core/test_request_mocking.py || die
+	sed -e 's:test_delete_subscription_filter_errors:_&:' \
+		-e 's:test_put_subscription_filter_update:_&:' \
+		-e 's:test_put_subscription_filter_with_lambda:_&:' \
+		-i tests/test_logs/test_logs.py || die
+
+	# these tests crash nose
+	rm tests/test_xray/test_xray_client.py || die
+
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/msgpack/Manifest b/dev-python/msgpack/Manifest
index 6b215a73cfcc..3d2cb780cb0e 100644
--- a/dev-python/msgpack/Manifest
+++ b/dev-python/msgpack/Manifest
@@ -1,3 +1,5 @@
 DIST msgpack-0.6.2.tar.gz 119062 BLAKE2B 6b20a0d31b811ae66e66dbfaacec6f0cf2152b2937423b78f3e6244bfa49c87767788c5ee1db41b9020801b8777a4c15b1fe1853182718adf622bc7e1bff858e SHA512 95b92e3d35e0500dd4256d18bf76e586e57cc66319b4459ac5daef599277a5049177a89ad86e291dbdc4c7a918901a89d9218353ddc4a7d0b399e8a98afef363
+DIST msgpack-1.0.0.tar.gz 232331 BLAKE2B ab7b3aede06c31e0cf70a7f7fbdf2b1dddd89aa2d5d9847b11117c66a2f4572ac468674cdbcaf79bc571278f02429d223aeeb0ea8cb50c31ad251142642cc05f SHA512 6dc168b111cd37807e8e8a09840d1b116d7f38d56f4622b9d36ab7dbd983ebe2f34e763f48c6348148c6945c9f1c9a0f83f5f03e12d12bc18f7b8e0cbd669f87
 EBUILD msgpack-0.6.2.ebuild 965 BLAKE2B 22e255852af105f9ff8076270f05d98539d4524f18334fe688222e271d52b775bea7017bdce52e3055a551fe90c5c3141bc3ae7399ab2ddb0ffb23c1e5154bf7 SHA512 a8b61e21a45683de30bf09f9faf22b926d47e38215e756b9735cc856789832a2bfe18dafad61d073049d5211eb1621be3d77536b024a74cf8241ebd34b3426f5
+EBUILD msgpack-1.0.0.ebuild 928 BLAKE2B fb05d2d903e7cfa040c409032967f945da530fbeb542e469c3320c068debf6e45e482736d07e8e73e2558a97cd90ef02f41f7658a46f9a59124ef34b3c593cd0 SHA512 c1c5c20226d66f2760727066dd7c992aa84d2201f848ed7ee540f5d8cd33cc1d9b54a0bb3d417ee0a895670d626fe9c21f796145ffd4e1979274d52a8cd2b54a
 MISC metadata.xml 550 BLAKE2B 6627bc6b0f417157d1728bac9f8bbf3cbd69eaa4f2b5ba25ada62f01295342ddf5231563e1ab7210acaca476cb807572208a26a20674aaff79bd8c4a47755d92 SHA512 519d1c9d2ce1825bc350fe4b1338246c37d38cfead466989976da6dceca8d033ac33b135b94d9feea79fc555017d681031f414aeb6a09de302ed9f11b6e35416
diff --git a/dev-python/msgpack/msgpack-1.0.0.ebuild b/dev-python/msgpack/msgpack-1.0.0.ebuild
new file mode 100644
index 000000000000..d4a598d68036
--- /dev/null
+++ b/dev-python/msgpack/msgpack-1.0.0.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="MessagePack (de)serializer for Python"
+HOMEPAGE="https://msgpack.org
+	https://github.com/msgpack/msgpack-python/
+	https://pypi.org/project/msgpack/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
+IUSE="+native-extensions"
+
+BDEPEND="
+	native-extensions? (
+		$(python_gen_cond_dep '>=dev-python/cython-0.16[${PYTHON_USEDEP}]' 'python*')
+	)
+	test? (	dev-python/six[${PYTHON_USEDEP}] )
+"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# Remove pre-generated cython files
+	rm msgpack/{_packer,_unpacker,_cmsgpack}.pyx || die
+
+	if ! use native-extensions ; then
+		sed -i -e "/have_cython/s:True:False:" setup.py || die
+	fi
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/mss/Manifest b/dev-python/mss/Manifest
new file mode 100644
index 000000000000..29ee56009c1a
--- /dev/null
+++ b/dev-python/mss/Manifest
@@ -0,0 +1,3 @@
+DIST mss-6.0.0.tar.gz 90010 BLAKE2B 0e4f0a2dbd720d83c496dc3fe618a2fa8057c378426a5b758ccaa931a819a354732d6ec6d220ec02292d08ddc111bbccf89676f32bd124ba084dbf5e4d1287ed SHA512 751fda0fd988ff14e80d7a8bb35c3ae9101a85f4e37dc297b6fc8ac23f7484faf19b07424081183157c7617c95a41f31f74f2dee0ff3bcc8d6bf1a699732af6d
+EBUILD mss-6.0.0.ebuild 765 BLAKE2B 52bb296f532f5f536e415b008f8a58fcdb757e21550c1db04bd91386add1aa85bb6f950ab25591aaf766b9b267007d016cb832407105e7a3028f1bccf5524d6f SHA512 0960f09cd79912b4c4c678b157a1eba4031e53f96d7fa2b5e7de22a15f2c5f4c9b8a0e43f03fee0a7dcde466fca89e817c4c85f3125bcf135c1e742e3b747923
+MISC metadata.xml 375 BLAKE2B 393138e315b4eae4dacb9339fbb5766e9dbaa84b7482babaddc08d524fb8b9939f6622ee9c6d09b66c61ac270fcc483fac39996a12ba87ccccf7cafd4c6d36db SHA512 9a44b6b9de4d1a61d6af9256519473541d5513cef349c15178c025dee3aaaa3f6772b1be56576411a985fcd9c70029c00743d8f577be8eaec4c5a44646c9cbf6
diff --git a/dev-python/mss/metadata.xml b/dev-python/mss/metadata.xml
new file mode 100644
index 000000000000..d22e99d73577
--- /dev/null
+++ b/dev-python/mss/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>andrewammerlaan@riseup.net</email>
+		<name>Andrew Ammerlaan</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-python/mss/mss-6.0.0.ebuild b/dev-python/mss/mss-6.0.0.ebuild
new file mode 100644
index 000000000000..28a7a6fe0acc
--- /dev/null
+++ b/dev-python/mss/mss-6.0.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1 virtualx
+
+DESCRIPTION="An ultra fast cross-platform multiple screenshots module in python using ctypes"
+HOMEPAGE="https://github.com/BoboTiG/python-mss"
+SRC_URI="https://github.com/BoboTiG/python-mss/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+S="${WORKDIR}/python-${PN}-${PV}"
+
+BDEPEND="test? (
+	dev-python/flaky[${PYTHON_USEDEP}]
+	dev-python/wheel[${PYTHON_USEDEP}]
+	sys-process/lsof
+)"
+
+distutils_enable_tests pytest
+distutils_enable_sphinx docs/source dev-python/sphinx_rtd_theme
+
+python_test() {
+	virtx pytest -vv
+}
diff --git a/dev-python/multidict/Manifest b/dev-python/multidict/Manifest
index 72dd78169bd9..e7f49b41db2f 100644
--- a/dev-python/multidict/Manifest
+++ b/dev-python/multidict/Manifest
@@ -1,3 +1,3 @@
 DIST multidict-4.7.6.tar.gz 57710 BLAKE2B f08a45d4ce404dbb64d2561ee2328c0aa3a8fbf65483082c11e5e1554bec23e5c711da2350e241308a1239256b942ef6c420e6e51aef342b380cc01f84d4ca72 SHA512 5f90cb04fe2562884c331018a5002e1370e2596e0afd21e4289ab696847a3028a074bbaa6717b3905161f823f8592d6572475307039f8f97c1ac65aad815a6b0
-EBUILD multidict-4.7.6.ebuild 734 BLAKE2B 32068b1a933da24d53f7936972e45a3d5e094b7326fbf4dd3e8b2e5260be3a06a74f7532ed1cd8e6868563421c66a6b6a007645a82c18209588231c410c3fcf5 SHA512 c95fc9d6489ea4914df052a0fb6b7b04acebe33e15d36f5126b82dbae18456ecaf2929458ca46cb7d66c8d1f909dd932da4c838eb4b1c15809dbfea691ed4933
+EBUILD multidict-4.7.6.ebuild 737 BLAKE2B 59c11fb4f3324bc772a31bd92af93f4557afc3c5a4638b7ddbf712a6c3592db7fb727222d97f5853c9839e6b7b01de1f1ebd805fe3ace929ec06929e56c0f675 SHA512 369d4a8fbbf02db10aa5f63fc0383db27ff370cc52ac3bab175c2894bf347b446f12b30ce8c5d7dc54382b88c1c7317c1bab67ffb7b52a04288042d11ac8c168
 MISC metadata.xml 428 BLAKE2B 3f7c1f816583b35bd0150ae21c61142bbb7ac5b216edb5011bc032410e408f2566801db025c8f6274dafbfc555b0b32aaca2708684a3601ffe8d371b23e0d556 SHA512 edb199503c42c55b838b5338656b41e760c90ec3e81114106dd352e2c3886f0161a0c6ef258c5c0a0728d2420bde5d26dea41b25b030eb947dbacd702cb2b594
diff --git a/dev-python/multidict/multidict-4.7.6.ebuild b/dev-python/multidict/multidict-4.7.6.ebuild
index d0789c39d20c..2e0a72a5166f 100644
--- a/dev-python/multidict/multidict-4.7.6.ebuild
+++ b/dev-python/multidict/multidict-4.7.6.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/aio-libs/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
 
 BDEPEND="
 	>=dev-python/cython-0.28.4[${PYTHON_USEDEP}]
diff --git a/dev-python/munch/Manifest b/dev-python/munch/Manifest
index 968497453ae9..8ab445be5364 100644
--- a/dev-python/munch/Manifest
+++ b/dev-python/munch/Manifest
@@ -1,4 +1,4 @@
 AUX munch-2.5.0-revert-pbr.patch 1301 BLAKE2B ab22d6d9e73444d5e5240a5bd64662acce9816363f824d1e5361bdb08a762812c0c9286b4c4210f17c67f3ae1c7cdbe56343d3206c47c31c96756d4c139dd26e SHA512 d7e896112db30357a279433b6d6a334ec0495fb1a4d40cedefd3e0e1eabdbfaff09d484472a72d88eb2bbab72142261e9e6f1ad134cede92fdb4f68feb7eb27c
 DIST munch-2.5.0.tar.gz 17015 BLAKE2B 17af271ae082a6e5f91781ba48a440f11cbe85ecb81d47ee2bc51910307080e3ba6c95e99e7475534400b2915a86d8f853bc65d419c3d3b7138bf021e66de25c SHA512 7eca31111f40782a19b49535322bc56d723022d52b0842c4beff512f32fa415a6c75851eb84950358cb6a11693095cafe56364028e48385b11135de414edca21
-EBUILD munch-2.5.0-r1.ebuild 730 BLAKE2B ca265f58fdb1753c943f603edf034f229cdb2a388f84dc2190d5bcd89301d9f6ed57a103446038c8b31b492bffbcf50e4061cbf010d36e5515cf99204da26872 SHA512 f116b4f1a213f3064f06f53a57e4ca72c860e69ed822f8b46c528fc54cff28146b6ae4b7b78159ea2f22908d1f183527253fbf506c6deb07e975ceb38924f11a
+EBUILD munch-2.5.0-r1.ebuild 729 BLAKE2B 4027b7026afd7b4a663fafff10d047086ff8b343ba994ff2509eacd4602aed2d69cc6163d82ab0fd8f586e186f87380913f835d1c4dbd8037b0deaced672108e SHA512 a19707f9827389cf831db14b3168e998b996c4aa5cfca027a6b7267ad5cdb9b3c2977de293f7f6fdabcec6dfd0797d7b8fca985d7052e7adb90625aa52c939f0
 MISC metadata.xml 375 BLAKE2B 55482baad37c27ba7d0ec36732e880b82a635bbf7358e4219d96d0986e56eab1052c7f09d11a2cae544612643b524ca333c7217f92e569d5dc7cf89e025dd53c SHA512 333c300e6d943df9e1d7f43ccb7fb2b96ff13522dca55f8725ab71cf6e4f740d4c11a6bf136a1f1caec79adbafdaac51ea4ec36e0fb1b456edf4f39682036ada
diff --git a/dev-python/munch/munch-2.5.0-r1.ebuild b/dev-python/munch/munch-2.5.0-r1.ebuild
index 1f0c3675ecbf..32c44b8d0ca5 100644
--- a/dev-python/munch/munch-2.5.0-r1.ebuild
+++ b/dev-python/munch/munch-2.5.0-r1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://github.com/Infinidat/munch"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ~ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86"
 SLOT="0"
 
 BDEPEND="
diff --git a/dev-python/mypy_extensions/Manifest b/dev-python/mypy_extensions/Manifest
index 474447c44983..020bbb0815b1 100644
--- a/dev-python/mypy_extensions/Manifest
+++ b/dev-python/mypy_extensions/Manifest
@@ -1,4 +1,4 @@
 DIST mypy_extensions-0.4.3.tar.gz 5545 BLAKE2B 8f1f988562390ee1ba3d90cafafec73c6fe080eef6b4321252d3b3aeffebf1ad13bdcae7ae75c69eac7bef91dcf3f846ae7f9a3f2ad6bad9de2bc8cfe5eed29f SHA512 22d8dc538cf6f77d97f4113dd34fce8095dd98944c7613fab2b3e71a3e9b7df1374654af41ead5c934f789ef1b72f54d980ab06f3ca28b8b4c6bb14ba1ca3ce2
-EBUILD mypy_extensions-0.4.3-r1.ebuild 785 BLAKE2B 93d2501047f437a250720773c964d4c81057fa5c4a30975a42ab0d2eaa8c878f3c46942b40c22161078e131f00e280d58d13b7204b35c6f5777526057fd9fc55 SHA512 7f586d22671227c34d0f76cad32516500c8132fec78c6352e8508877e80c4eac630678ba0dcdf5ce285c36a16a6f61f5f6c56b5f72c339594b9fec6bd94c3a6a
+EBUILD mypy_extensions-0.4.3-r1.ebuild 811 BLAKE2B 46af92ddbe58766cab9a8bbbc9fb16a7f6ddd3104be6171093892d670506e9ccb7ebb51c3a58b62842e152754961ecf00c6f5a46488597b618eb72ab69899897 SHA512 47b2b1175204931b3c9549c8c3d3eb08bffbba6662e8e7a746400a5825758ab1744c2d697b9b8005159fbcb8fab5b4257bfedf258c5f0abf3a7516bacc23c8b4
 EBUILD mypy_extensions-0.4.3.ebuild 1025 BLAKE2B 6e531146c9e8c331c64453e6701842bac7d4fb80330a103bdd897d11a10618202cf291a4ab5691b5e7f6ed7dd3c9986f66f9b216f9185b95e284e7784e6a419f SHA512 770e6c1ed105f69d7f8bbb33b6e16b9b5a906962ff81c65efbed6f5a2639cf469a49f09bb284aa1f078da36d7b7cc752e2410cae91d8c18fd979c40ee460c2c4
 MISC metadata.xml 328 BLAKE2B c8305ff15b161dc506756c3a5e9d06fd2d22de1789676d02b610377520d593a594aebe733dfe88d0c88bf235e7c0dbfc16309d57f729365660c9fe9284fa9830 SHA512 6fa42508eacd37f3cdb2b47371baa13f67d985bb4f47237a0f9be5fa27b2ce86670de842abb75ca6c21f8d4255e56be552f5415c66244fe0c5dc99865e61b252
diff --git a/dev-python/mypy_extensions/mypy_extensions-0.4.3-r1.ebuild b/dev-python/mypy_extensions/mypy_extensions-0.4.3-r1.ebuild
index 5a2945009492..5451fe4f4b28 100644
--- a/dev-python/mypy_extensions/mypy_extensions-0.4.3-r1.ebuild
+++ b/dev-python/mypy_extensions/mypy_extensions-0.4.3-r1.ebuild
@@ -15,7 +15,7 @@ if [[ "${PV}" =~ [9]{4,} ]]; then
 	EGIT_REPO_URI="https://github.com/python/${PN}"
 	EGIT_COMMIT="master"
 else
-	KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
 fi
 
 LICENSE="MIT"
diff --git a/dev-python/nagiosplugin/Manifest b/dev-python/nagiosplugin/Manifest
index 30cbea191893..52e28c483c9c 100644
--- a/dev-python/nagiosplugin/Manifest
+++ b/dev-python/nagiosplugin/Manifest
@@ -1,3 +1,3 @@
 DIST nagiosplugin-1.3.2.tar.gz 54262 BLAKE2B af2a8a876105a1ea26671b39d611beaa46303998544adadee3370c6d1b5096fa93160121f89412f3778a2bbc1c3e95606a49413b8f3f0880c9c9ca4e946fb1b8 SHA512 899650852397bffb66ad53843233adec2c91e96656674a9b21c5a02ed97ce4db69c1440d1b88c5799a54745e69b8c05f52188403b5a2fe9050acbd0067806d50
-EBUILD nagiosplugin-1.3.2-r1.ebuild 519 BLAKE2B ccff76683f70387ca4ba47539d1d172ec026ec5e9675d558263e83b401a6e36960db9e2e74f0dd9ea7454da01440d9d31cf52d7db873ea60e1cdab71d9712c04 SHA512 05e1f500fec92f80dd822a8f123faae57b7e62c3111751ace4aebec3f6ba747795d37f1367270294fd6c1e7f94f0cc22f48483599a3d326dbefb681bcede962e
+EBUILD nagiosplugin-1.3.2-r1.ebuild 521 BLAKE2B 7d245de1c146893feb95018bc034def0040c46b774faffe19a3ad1b7afdb1673af1a56231133bad1a3653a6a1881c1b85da8d879192a97dc62f12dc73ae6538c SHA512 6f717c7aed1f7e894188e5cdac27e6c660a655e342669afcee3422c532a800a6182991445a9549314015cf07adaadbe82a7c83e168d56e16bf2648e35a1dcf50
 MISC metadata.xml 452 BLAKE2B 39030b9d85edf373418952f1986d9a1b4c5a73ca191112d9e979b754eb12891f16a522d19a4d4278853ec4b07aaaf14537ed64eed658886c02859d8a451eb81f SHA512 2eec420a3b59460798f9d8504d86a8d01afd309867f0bdb0f46f5a87484c06f8398221946bff4d06c150cf8085a6cbc15a9e61ba815519e696a26376cc018fe0
diff --git a/dev-python/nagiosplugin/nagiosplugin-1.3.2-r1.ebuild b/dev-python/nagiosplugin/nagiosplugin-1.3.2-r1.ebuild
index fba554d9f858..2062e3867cd2 100644
--- a/dev-python/nagiosplugin/nagiosplugin-1.3.2-r1.ebuild
+++ b/dev-python/nagiosplugin/nagiosplugin-1.3.2-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( pypy3 python3_{6,7,8} )
+PYTHON_COMPAT=( pypy3 python3_{6,7,8,9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/namespace-jaraco/Manifest b/dev-python/namespace-jaraco/Manifest
index d65ff3bbd63e..7af2f898876a 100644
--- a/dev-python/namespace-jaraco/Manifest
+++ b/dev-python/namespace-jaraco/Manifest
@@ -1,2 +1,2 @@
-EBUILD namespace-jaraco-2.ebuild 802 BLAKE2B 9962312b8a6ab98c8de61911297395824c3971de11ab6df9c0266677b6c83d60c32e24f1e7b75548291338efbf3fe5a317be523f9a22635e35762d218949808a SHA512 b429a8f406b2b0e03d237bcdad954be5d82851181ffb363f54ed41e475ad5d1b312ac5b8c027790d2e3b9e97882d1fb56f7e326f356547623b12d64afda8a02b
+EBUILD namespace-jaraco-2.ebuild 809 BLAKE2B 66dae9c6eef9dca286d8cf4e79b0bdac3e8f8894d802e83ed27dfa70589e8d55553a3a548669a75b117176785a288c83421b6bbbf85722737010595d8e731cf1 SHA512 5b8ed87ec1837f66ee08b8ec96c07153498715727ed624455433636aa72861ba280dde9d469335e432f57ed92288a218436ffb60142c8979c2f4ac7154430fcf
 MISC metadata.xml 346 BLAKE2B bf549c97be0470c6694566c73fb27eda911bd1c7e38641ccfc90e0cbf33717499177dcd4d6b6ce475d430a04ba395500d41aa5cf7d7938ae8bdd1c0840e0a6e0 SHA512 747d2fe0daa0213a7f9d737cc8c5037438ef9262ba049a7a687e944cb1251b9b3dc39ea03a810b5ca61c7b95c7f1360bc397c4d75fc26746cab5029f7736efdf
diff --git a/dev-python/namespace-jaraco/namespace-jaraco-2.ebuild b/dev-python/namespace-jaraco/namespace-jaraco-2.ebuild
index 8277cdf3e768..7cfab7705f6d 100644
--- a/dev-python/namespace-jaraco/namespace-jaraco-2.ebuild
+++ b/dev-python/namespace-jaraco/namespace-jaraco-2.ebuild
@@ -12,7 +12,7 @@ SRC_URI=""
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
 IUSE=""
 
 RDEPEND="
diff --git a/dev-python/namespace-sphinxcontrib/Manifest b/dev-python/namespace-sphinxcontrib/Manifest
index 5f5ac594a969..db1dbffc6a6e 100644
--- a/dev-python/namespace-sphinxcontrib/Manifest
+++ b/dev-python/namespace-sphinxcontrib/Manifest
@@ -1,2 +1,2 @@
-EBUILD namespace-sphinxcontrib-1.0.ebuild 947 BLAKE2B 93a6c34672c05ddb007159ec10d4874aa678921acf5dd8b5ad0136340d97339aa74146191083eb16968368de0840668677608bf1afc482793cbb3733918da12b SHA512 13c436bca486506c392aa4c6d7048cb3cfb7a8c296bbf9fa57225a1c4e75a8306275538e5613c3490601bcfd80c3a3bdaeecba7e16acab6155cb200e515bd7d0
+EBUILD namespace-sphinxcontrib-1.0.ebuild 954 BLAKE2B 83131196f2b21a498e554aedb6e3895f579825c0bab91d83fd24e5e0ff167d7ba43295bf49eb956c32f47052faa251d6e5edf0ac698736f3914ec225b428144d SHA512 ec28b375e84f7c83ffa4f7297f516df865726baf1afd3556eab6e3705d3800a4c1b5d391a2a4abd4b9fe1f7725a41e03eea76756cdf49892912fb077c10c874e
 MISC metadata.xml 222 BLAKE2B 627c0e9a843219968eef5f67d4a3656240cc8795a1fe885983efab35f57ec02cff5f28533c665c77e1391de3c7d2e1d7025aff9f82213e38f4c5c0e6b504c11c SHA512 b9b20f913c2b6bc8ec843d5d46a97ca2d847ccadd4dcadf7b68a60535e44b721541c72cc74b17c55fe21161a1dcfbc86a3d08e58659a8c431b574729fe87607d
diff --git a/dev-python/namespace-sphinxcontrib/namespace-sphinxcontrib-1.0.ebuild b/dev-python/namespace-sphinxcontrib/namespace-sphinxcontrib-1.0.ebuild
index d1895484fb09..4a59584e1e93 100644
--- a/dev-python/namespace-sphinxcontrib/namespace-sphinxcontrib-1.0.ebuild
+++ b/dev-python/namespace-sphinxcontrib/namespace-sphinxcontrib-1.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI=""
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/namespace-zope/Manifest b/dev-python/namespace-zope/Manifest
index 6205ba98c387..f87569583448 100644
--- a/dev-python/namespace-zope/Manifest
+++ b/dev-python/namespace-zope/Manifest
@@ -1,2 +1,2 @@
-EBUILD namespace-zope-1.ebuild 903 BLAKE2B 161b5fdd46bd98923ebef1a79aa28459f8bc9b3a95dad181ace997074fd9da0ea80fe0f6e8c8cfb9874c78dcb267a3bc98edcb6538f22ff9a171b140e062816d SHA512 74b6940e1a6eac593185ba5e36731da3bfe13ae9931cb4d84a82013c893cd83186cd9ebbf3115594fca5c5b27f612fdcb4191fe7377efa227e60e41e85320036
+EBUILD namespace-zope-1.ebuild 910 BLAKE2B 0920076804c9e80fce80e294dcb82e111d400d38074d0c4a6deca3298b53cc2f696938aac26455fbbc3cfdb84a628f2061704385f6387f972d22a5158f31711d SHA512 90c71fac2aa339027a2da5499773084fdedb002272da0f9e8951e3fceecea36c613b794b5bb2d7340f43b8490105827d19cf4c13468295abc48a24cc1119891b
 MISC metadata.xml 218 BLAKE2B 086fdcf7b63ca7bd6c58e861d717bb375e1cd372eff26d5d2eeeb176d8c5e6f10e653562abafb50eae7d7508f8e3d421b87e6a749acd0490308672828d0da697 SHA512 4558fee4c51117e21b1f42ca3edbdf1195ed297db798d6bfa0e5fbb7019654a187422b0abde7af5d800caffed66d1e55e4280e8be602bad591424d9776c46781
diff --git a/dev-python/namespace-zope/namespace-zope-1.ebuild b/dev-python/namespace-zope/namespace-zope-1.ebuild
index 241014284a1f..ac8198da2020 100644
--- a/dev-python/namespace-zope/namespace-zope-1.ebuild
+++ b/dev-python/namespace-zope/namespace-zope-1.ebuild
@@ -12,7 +12,7 @@ SRC_URI=""
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/nbclient/Manifest b/dev-python/nbclient/Manifest
new file mode 100644
index 000000000000..325cee75a58d
--- /dev/null
+++ b/dev-python/nbclient/Manifest
@@ -0,0 +1,3 @@
+DIST nbclient-0.5.0.gh.tar.gz 68957 BLAKE2B bb041b98ffa38fbafc3e8dd1b21b56b3cdf4eec0ee435e118baa063d13a4a2c13d49e17591bb1365a31ed4dbf6b19732f225402de6fc15fcbbd73b73db2016df SHA512 0633b1237d545be422626758993309e252c34ca16370203476244e2c98c518deaa5cb99987a8282aecc18e6ef1fdb4a4b9b76bc4fd62affa5e3d2fd31175e95a
+EBUILD nbclient-0.5.0.ebuild 957 BLAKE2B 08d15b971364d80e02a937db5f82fb5c4bcd1fe138c1708d56e248bfd1d11f8a0656dc530f399fdf7697507bc02b898f588505f67b6919e0c1d38c0000a7226d SHA512 0088176537e9032632c9e3bfe651ef3cc9607ff10e06d3a3de3985f9eeaa998248c9e62952fd3961fa27c4d0572e146f1786a5cc7530eedecafb852b40ef37f9
+MISC metadata.xml 404 BLAKE2B 72a6751149738e4d2cacf081ae2fc8e960bf0314cccd4bbb2fe7b7edb568c9fc7f6de518b66bc7dde4c712aad07f424e77bf419b9a88a67110258acbf954bf25 SHA512 3430db25e62ec960e7f36bef9ef56341f1aa2654396421071fbfefc9464c815c6ff53b5fee9d66991c144e0d2996db930b5a5bd775c88ee1d5b961a01137cda6
diff --git a/dev-python/paver/metadata.xml b/dev-python/nbclient/metadata.xml
index 065b9b4b9d63..f4e41e36ad78 100644
--- a/dev-python/paver/metadata.xml
+++ b/dev-python/nbclient/metadata.xml
@@ -7,7 +7,7 @@
   </maintainer>
   <stabilize-allarches/>
   <upstream>
-    <remote-id type="pypi">Paver</remote-id>
-    <remote-id type="github">paver/paver</remote-id>
+    <remote-id type="pypi">nbclient</remote-id>
+    <remote-id type="github">jupyter/nbclient</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-python/nbclient/nbclient-0.5.0.ebuild b/dev-python/nbclient/nbclient-0.5.0.ebuild
new file mode 100644
index 000000000000..0f4853ee4e00
--- /dev/null
+++ b/dev-python/nbclient/nbclient-0.5.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 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 client library for executing Jupyter notebooks"
+HOMEPAGE="
+	https://nbclient.readthedocs.io/en/latest/
+	https://github.com/jupyter/nbclient/
+	https://pypi.org/project/nbclient/"
+SRC_URI="
+	https://github.com/jupyter/nbclient/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-python/async_generator[${PYTHON_USEDEP}]
+	>=dev-python/jupyter_client-6.1.5[${PYTHON_USEDEP}]
+	>=dev-python/nbformat-5.0[${PYTHON_USEDEP}]
+	dev-python/nest_asyncio[${PYTHON_USEDEP}]
+	>=dev-python/traitlets-4.2[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/ipython[${PYTHON_USEDEP}]
+		dev-python/ipykernel[${PYTHON_USEDEP}]
+		dev-python/ipywidgets[${PYTHON_USEDEP}]
+		dev-python/xmltodict[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/nbconvert/Manifest b/dev-python/nbconvert/Manifest
index 3699dc64ded0..df7c1eef9df7 100644
--- a/dev-python/nbconvert/Manifest
+++ b/dev-python/nbconvert/Manifest
@@ -1,6 +1,10 @@
 AUX nbconvert-5.6.1-inkscape-1.patch 6526 BLAKE2B f3baf2b80321e63a261ad281c81818d95bde8f719382cb8a4b2a2d4511e7c102658fcfec9f86067bb0c296caf9b164842986bb664ca7dc9184206e2a76b20221 SHA512 880385a0c42e185f01521ee26fe9d859c99c6ba3477e5b71d292cc0f6b4998a2b9c4ec0dcff5a30ca3fce261769c3481ec320b6c0ca0e0f46dd493e72b7267b3
 AUX nbconvert-5.6.1-py39.patch 1199 BLAKE2B 7ddcc42c81e9d86007142f3f5c6ce9a88b1ead4400c1e65f3c816e97fbc707eea3bd71a5bf64e6266678c1935a678321230a30d92522f6188f19d3273028647a SHA512 f9590d808cadea8a2c95079dbfe4aac4339ecddcb204e7b57a8c62f4cfd0545d17961b01599ec3f4ce52d772175be43ad441a0ebc56d52e6332fda11110f5463
 DIST nbconvert-5.6.1.tar.gz 703233 BLAKE2B e75d558aee6c66fe8e7455ecf22dbbcd2a0698380ffec80eff15aea6c70bc853daa9ab2fd1d114453bd5dfe7e75617afb9f5c1075704bfadbb59fef34bca88a9 SHA512 0c68adcb9f28ead9ec058fc2e02a9a1e6f65818709c99f7a006a59a7562b5f5ee74afe5287e41568c35542898dc1b43c4543d2386cc05a721b3f99d5cc789435
-EBUILD nbconvert-5.6.1-r1.ebuild 1776 BLAKE2B 30fd82d8c6793a9b2240019ff0f426202e02e4638077ec55aa648fb8149f7da9ec332fdd6eec015274c3adc56074d724583c0c50fdd3de8db3a684422504ff9a SHA512 b2fe3c48448cf9d4d1cd126b367a54bd3e0085bd23a8e7183d86a1ddb4f977e76581c4f9d3078d3c3bfdc27900239abbede3a3350517b2be6d1d9770fa106e81
+DIST nbconvert-6.0.1.tar.gz 838950 BLAKE2B 7ccb821bd7affab3faed0c1fb139b0641f295c71109c783e9ce40c5a4c15c2d87a327ce7c802ed3cfde2fcde4c360375dd751f9592eeda102d520aee4e94f2d5 SHA512 7c782a068fc004a42cbc2e09d8d4fbce5385a8f6fb8491fa39d14df123a00bf81e6e7f11885fe39300156ecf560b92f5631537a5956e5541ea3dcf9ec5f9f365
+DIST nbconvert-6.0.2.tar.gz 847737 BLAKE2B c787840ec25661a1242bd1a4ef46ca0c022fd23385da5dc48ff8ec391ad440fc70ab841fdfd1fd0a98836a4a30592ed0f121ce94895f2a70c33899c11760e43b SHA512 faad2c4e697a0189e4b156e061f1d2a13676ef0dc7703993f0d445093d83a73618bc2529fceca094797415e7468e7f067d573556bfcf793a37956c082403d5fa
+EBUILD nbconvert-5.6.1-r1.ebuild 1774 BLAKE2B cf6aa9eb1227a7d9dedf168a661d88d922695bd9ee4ff5b45a835698d578994138ec910e8e0310dd6074ca04847b439c2f66e8b81c7d68a3663de37d7b3096ac SHA512 de02167b73df31f010047b24d886cee5f9aa05d7c907c523316cbaded195d31c4a0ddab2f1b1ed21f4a5291c2b9e7198844ebaef14d800cd8e6c76c752737b0f
 EBUILD nbconvert-5.6.1.ebuild 1774 BLAKE2B e63b986fd418ce6d54ee612cc2add3ec95c29608c158c07684fdfea0d068c7920039c8a557c28027c7e038cac93a50f47ac5f2ed9b2b5134c24411c47541f00e SHA512 769089b76c9c9d8c1ef6f982198a7e3cf309aca6417f9eae1424beac9d9e97f17fd6e0c00aca7c87df75e2aed1495750a66fd584d6994b98cd2e8d15b76a9473
-MISC metadata.xml 501 BLAKE2B a99beea687357c74454ec232dea268f95e9b775c882b1ea29e196ec124e829b9749d5fbc4c585f88e46c16bc868d57a757b6f9043545bc5905e0dc86c7f0b44a SHA512 d0735c82e490860baf8ae76f78058a9981dc345d7f5b06d54bbdfd1741a7619f68dbca3386f7bba12b58df46a1125384935de85dff3ad883fb11781df933a866
+EBUILD nbconvert-6.0.1.ebuild 1969 BLAKE2B 577e6bc5d231af0a27216ffc33bda23421dd0399aec895555dcdcf639ff78541a04fd924bf3b72ee2a059a8e98ac67469a4691e4467ceda8f19f4c526d765603 SHA512 0083e57006ecb75e834e6c78ef40bc1494e6d0531b8f4a6cf3d2c2559c008fbf5b09ee42b0f5f1ca585113cb4d6d308e7d67bb89e057410385b0042cb20143f8
+EBUILD nbconvert-6.0.2.ebuild 1969 BLAKE2B 577e6bc5d231af0a27216ffc33bda23421dd0399aec895555dcdcf639ff78541a04fd924bf3b72ee2a059a8e98ac67469a4691e4467ceda8f19f4c526d765603 SHA512 0083e57006ecb75e834e6c78ef40bc1494e6d0531b8f4a6cf3d2c2559c008fbf5b09ee42b0f5f1ca585113cb4d6d308e7d67bb89e057410385b0042cb20143f8
+MISC metadata.xml 526 BLAKE2B 8dc0ccbe9aabcdc429a5559dc79beecd4937384f3c4d84d610f04fcc347c3b5746bfba4d096ef5251003a4f81e1159663fbe338a7d5dd0dcd19b9c97c43bc1f0 SHA512 ec7ec447bab3315501d428a1f3a1bcd6e512b028982985af9862334397d4d06c837f9e40628a6b750dc4bdb9844d2ad3fd3b4b44c8f1066e5f0fbd4e8ce1cd96
diff --git a/dev-python/nbconvert/metadata.xml b/dev-python/nbconvert/metadata.xml
index d47832d4ed86..2c9c9e738dce 100644
--- a/dev-python/nbconvert/metadata.xml
+++ b/dev-python/nbconvert/metadata.xml
@@ -9,6 +9,7 @@
     <email>python@gentoo.org</email>
     <name>Python</name>
   </maintainer>
+  <stabilize-allarches/>
   <upstream>
     <remote-id type="pypi">nbconvert</remote-id>
     <remote-id type="github">jupyter/nbconvert</remote-id>
diff --git a/dev-python/nbconvert/nbconvert-5.6.1-r1.ebuild b/dev-python/nbconvert/nbconvert-5.6.1-r1.ebuild
index 44cb131fda5d..177e1a67086d 100644
--- a/dev-python/nbconvert/nbconvert-5.6.1-r1.ebuild
+++ b/dev-python/nbconvert/nbconvert-5.6.1-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-python/nbconvert/nbconvert-6.0.1.ebuild b/dev-python/nbconvert/nbconvert-6.0.1.ebuild
new file mode 100644
index 000000000000..bc104bb52acf
--- /dev/null
+++ b/dev-python/nbconvert/nbconvert-6.0.1.ebuild
@@ -0,0 +1,72 @@
+# 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="Converting Jupyter Notebooks"
+HOMEPAGE="https://nbconvert.readthedocs.io/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-python/bleach[${PYTHON_USEDEP}]
+	dev-python/defusedxml[${PYTHON_USEDEP}]
+	>=dev-python/entrypoints-0.2.2[${PYTHON_USEDEP}]
+	dev-python/jinja[${PYTHON_USEDEP}]
+	dev-python/jupyter_core[${PYTHON_USEDEP}]
+	dev-python/jupyterlab_pygments[${PYTHON_USEDEP}]
+	>=dev-python/mistune-0.7.4[${PYTHON_USEDEP}]
+	dev-python/nbclient[${PYTHON_USEDEP}]
+	dev-python/nbformat[${PYTHON_USEDEP}]
+	>=dev-python/pandocfilters-1.4.1[${PYTHON_USEDEP}]
+	dev-python/pygments[${PYTHON_USEDEP}]
+	>=dev-python/traitlets-4.2.1[${PYTHON_USEDEP}]
+	dev-python/testpath[${PYTHON_USEDEP}]
+	www-servers/tornado[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/pebble[${PYTHON_USEDEP}]
+		dev-python/ipykernel[${PYTHON_USEDEP}]
+		dev-python/ipywidgets[${PYTHON_USEDEP}]
+		>=dev-python/jupyter_client-4.2[${PYTHON_USEDEP}]
+		media-gfx/inkscape
+	)
+"
+
+distutils_enable_tests pytest
+
+src_test() {
+	mkdir -p "${HOME}/.local" || die
+	cp -r share "${HOME}/.local/" || die
+	distutils-r1_src_test
+}
+
+python_test() {
+	local deselect=(
+		# Missing pyppeteer for now
+		# TODO: Doesn't skip?
+		--deselect exporters/tests/test_webpdf.py
+		# Needs pyppeteer too
+		--deselect 'tests/test_nbconvertapp.py::TestNbConvertApp::test_webpdf_with_chromium'
+	)
+
+	distutils_install_for_testing bdist_egg
+	cd "${TEST_DIR}"/lib || die
+	pytest -vv "${deselect[@]}" --pyargs nbconvert || die "Tests failed with ${EPYTHON}"
+}
+
+pkg_postinst() {
+	if ! has_version app-text/pandoc ; then
+		einfo "Pandoc is required for converting to formats other than Python,"
+		einfo "HTML, and Markdown. If you need this functionality, install"
+		einfo "app-text/pandoc."
+	fi
+}
diff --git a/dev-python/nbconvert/nbconvert-6.0.2.ebuild b/dev-python/nbconvert/nbconvert-6.0.2.ebuild
new file mode 100644
index 000000000000..bc104bb52acf
--- /dev/null
+++ b/dev-python/nbconvert/nbconvert-6.0.2.ebuild
@@ -0,0 +1,72 @@
+# 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="Converting Jupyter Notebooks"
+HOMEPAGE="https://nbconvert.readthedocs.io/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-python/bleach[${PYTHON_USEDEP}]
+	dev-python/defusedxml[${PYTHON_USEDEP}]
+	>=dev-python/entrypoints-0.2.2[${PYTHON_USEDEP}]
+	dev-python/jinja[${PYTHON_USEDEP}]
+	dev-python/jupyter_core[${PYTHON_USEDEP}]
+	dev-python/jupyterlab_pygments[${PYTHON_USEDEP}]
+	>=dev-python/mistune-0.7.4[${PYTHON_USEDEP}]
+	dev-python/nbclient[${PYTHON_USEDEP}]
+	dev-python/nbformat[${PYTHON_USEDEP}]
+	>=dev-python/pandocfilters-1.4.1[${PYTHON_USEDEP}]
+	dev-python/pygments[${PYTHON_USEDEP}]
+	>=dev-python/traitlets-4.2.1[${PYTHON_USEDEP}]
+	dev-python/testpath[${PYTHON_USEDEP}]
+	www-servers/tornado[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/pebble[${PYTHON_USEDEP}]
+		dev-python/ipykernel[${PYTHON_USEDEP}]
+		dev-python/ipywidgets[${PYTHON_USEDEP}]
+		>=dev-python/jupyter_client-4.2[${PYTHON_USEDEP}]
+		media-gfx/inkscape
+	)
+"
+
+distutils_enable_tests pytest
+
+src_test() {
+	mkdir -p "${HOME}/.local" || die
+	cp -r share "${HOME}/.local/" || die
+	distutils-r1_src_test
+}
+
+python_test() {
+	local deselect=(
+		# Missing pyppeteer for now
+		# TODO: Doesn't skip?
+		--deselect exporters/tests/test_webpdf.py
+		# Needs pyppeteer too
+		--deselect 'tests/test_nbconvertapp.py::TestNbConvertApp::test_webpdf_with_chromium'
+	)
+
+	distutils_install_for_testing bdist_egg
+	cd "${TEST_DIR}"/lib || die
+	pytest -vv "${deselect[@]}" --pyargs nbconvert || die "Tests failed with ${EPYTHON}"
+}
+
+pkg_postinst() {
+	if ! has_version app-text/pandoc ; then
+		einfo "Pandoc is required for converting to formats other than Python,"
+		einfo "HTML, and Markdown. If you need this functionality, install"
+		einfo "app-text/pandoc."
+	fi
+}
diff --git a/dev-python/nbdime/Manifest b/dev-python/nbdime/Manifest
index 19cbdd528549..fe012ea20af6 100644
--- a/dev-python/nbdime/Manifest
+++ b/dev-python/nbdime/Manifest
@@ -1,4 +1,4 @@
 AUX nbdime-2.0.0-remove-bdist_egg-hack.patch 1176 BLAKE2B 49c2d31632b8341f7fd52d70f063d8229d74a65a23058fe24410fac62939bd64adcf9af419d6f7b626d67150e54016323f33c735d7a51e80b35403dee1055979 SHA512 9d8200ebf6c6d76d3efc89ae384586404fa2d9b345c16f63ddc93d76c8ac2e17e34099bc0b2b907723f6fe096f6c56273b423263f328bc5882046488c077bbbe
 DIST nbdime-2.0.0.tar.gz 7768807 BLAKE2B a92ed166ae863185d06e4b3e667df4323b4cd9af9211999109186c1b559522f39ab235b710c7993515aa3c44a55ac3c4b90c424cdc28d04cc013a58add7d61cd SHA512 e68e69e37f6ece701ba8d6e59d8ee321ddaca78d9338e0c52f92b6942bfd3fbf0ec2407e9ae98cb820eb4c26509644a1770f249b815c53265dfdbffbe2b55142
-EBUILD nbdime-2.0.0.ebuild 1514 BLAKE2B 117f17e07d1884532145be78e4a483ef95c48a9b93108e91a230dc47b19c568d6942782dfa2a5bb611f275b372be49d8b08a9b03deed9860143f77d014f15602 SHA512 ad682cd164be21c7ba8db6c8abcf61b7a39294fbf5b0815016df2deef35cd107b72198e2eff7dd71817263a28d81033bfa45ea2b2c279de5b7696f41ee3ce9d3
-MISC metadata.xml 488 BLAKE2B 09009f9ff2f65bc42c73932d08b655510769b97ebe47999e57181765d7ef98da41f6ea7b84e266adf27e86b1f033bdb3d4b608c7628e5824a5a22316aa937f17 SHA512 efed147379fa8694f1a04b84188feae93709ea1c78c1421f32292d1f23b656738b1cb27226987b7f7e8c623e45e49eb0fa9c63ea57718c1fb459e84e7de6a3a1
+EBUILD nbdime-2.0.0-r1.ebuild 1514 BLAKE2B 117f17e07d1884532145be78e4a483ef95c48a9b93108e91a230dc47b19c568d6942782dfa2a5bb611f275b372be49d8b08a9b03deed9860143f77d014f15602 SHA512 ad682cd164be21c7ba8db6c8abcf61b7a39294fbf5b0815016df2deef35cd107b72198e2eff7dd71817263a28d81033bfa45ea2b2c279de5b7696f41ee3ce9d3
+MISC metadata.xml 513 BLAKE2B 9d048715b1a128ebdf9c620f1a584df9dc1971c61c8adeafad024ed205a15e68fbd8fc5ed323179a58df47251a908b493c16c34685bfbd6eafe85168e7f50f97 SHA512 95f7fb7ad3d414cd73e0e60441ac29250584c33ab46407f0f99a373d27e71a04c6ac0ae267319139e3df7bfc28dc8fe4a44b0dbb99ea097546b1b5fec8131b29
diff --git a/dev-python/nbdime/metadata.xml b/dev-python/nbdime/metadata.xml
index e11d50abc886..ac6865dc5c14 100644
--- a/dev-python/nbdime/metadata.xml
+++ b/dev-python/nbdime/metadata.xml
@@ -9,6 +9,7 @@
     <remote-id type="github">jupyter/nbdime</remote-id>
     <remote-id type="pypi">nbdime</remote-id>
   </upstream>
+  <stabilize-allarches/>
   <use>
     <flag name="webtools">
       Install web-based diff and merge tools.
diff --git a/dev-python/nbdime/nbdime-2.0.0.ebuild b/dev-python/nbdime/nbdime-2.0.0-r1.ebuild
index 13f592127ee1..13f592127ee1 100644
--- a/dev-python/nbdime/nbdime-2.0.0.ebuild
+++ b/dev-python/nbdime/nbdime-2.0.0-r1.ebuild
diff --git a/dev-python/nbsphinx/Manifest b/dev-python/nbsphinx/Manifest
index 836db950d862..4d39d60567a9 100644
--- a/dev-python/nbsphinx/Manifest
+++ b/dev-python/nbsphinx/Manifest
@@ -1,4 +1,4 @@
 DIST nbsphinx-0.7.1.tar.gz 129553 BLAKE2B 635d102804a0e9d3c649707c874d28e8455d3e7082653cb12542a5fbe9cad991815f9f577333f3850347ccad46b77e880d40581a44e1e4fcc515be1ff40d90c5 SHA512 af03272459f5cc20ea2e0abc644ce602c6be5a21c7d3e81950ca153cc6e9566e89defb6f1cbb4caa154958f3e8832d0924dcd1ba5b902d2e1a4496f5c3ac6c8c
-EBUILD nbsphinx-0.7.1-r1.ebuild 630 BLAKE2B 4bea5e0e6fc0770d39ecc02e6f7e7c638bb720e9a29105d1ec728efc50da7c5a0969878c319a6f794c38714b012a05163f74903b2c5af23a9f741f5b01ab1fe1 SHA512 2b1f603ac3109f50e01a50086b17a944e8488051455e7839522c1d8acea309dd4ccdeca06c90db68fec0ac1887ba7e2d9c8178c1f7c1744fa930295ba277b693
+EBUILD nbsphinx-0.7.1-r1.ebuild 628 BLAKE2B 5cd38e1f522cc22993a1022ad137f592349a58a38c4f602d19d290bb6517b8d1fe4f8e145b43086c45b17b6c2aced26925ba8734900a6baadedadba420b7f854 SHA512 c6ff66bc9626620bfb5ca7a26733cbf9d293f306b085092d06a40aa81f7053e51845a047c57dd13b0e16fc7798e51b797fa4f201e002351a5d3f5557d93c94a5
 EBUILD nbsphinx-0.7.1.ebuild 632 BLAKE2B 9f4a0c9125368cd69a5b52e0f4dcde41d38b7eeeb0385341c7856a0a9d7bbc34cf134680252e7e423fb6cc14879d18c7648e2e87ca0d5a953143bb7ebf075a0b SHA512 a79724d2bd9dec926bd1082b6fcc27e1a2e65150372faa952cd72d0a734a9d6877154155218cc872233a18f07bbafb6a2d00b686cfee454a424a874598038457
 MISC metadata.xml 834 BLAKE2B 628cddfa0e7fba3b9668e7cf53b3a906330a2bcc8d1bd8957d811558c98e48487f28f058d0bb45b4987977857461af2bb122853f6578ab67c2a6f97d242b4880 SHA512 b6c045e0fb6636f440e97b167318ff6cb0f71c8ba6cfd05c3afeecb4580ca1f37f03d765921624ad8ae54bfab76d0d913fb8eb30cb70387104d6df90167b4c65
diff --git a/dev-python/nbsphinx/nbsphinx-0.7.1-r1.ebuild b/dev-python/nbsphinx/nbsphinx-0.7.1-r1.ebuild
index 1bcfd4e9e45a..1ddddad25f0d 100644
--- a/dev-python/nbsphinx/nbsphinx-0.7.1-r1.ebuild
+++ b/dev-python/nbsphinx/nbsphinx-0.7.1-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/dev-python/nbval/Manifest b/dev-python/nbval/Manifest
index 8784b6dc49f6..a199437d7413 100644
--- a/dev-python/nbval/Manifest
+++ b/dev-python/nbval/Manifest
@@ -1,3 +1,3 @@
 DIST nbval-0.9.1.tar.gz 64476 BLAKE2B 299f6cb9a1e28b80b2e27a74f2b6614e83e5b571b1dc27d0f6829693dd0f6c2b59845543c91487615a8621e21ac2cbc2d34e60e62b7a646914283e23649d8bd9 SHA512 8ab0cb4e09907d99f898b148b635f0818660d04417c1c809beb93680862a5ecab14b606ecc3f90eff85e5f01de7dbf10954f1edf3629a1cf8ddac00556d4d6e7
-EBUILD nbval-0.9.1.ebuild 741 BLAKE2B ea91fba6b2812224b5fe4ba5cd6a40131e9c64fc43e5497c19d9324885aea95b94d98a41130228d72cd387e051e21fec92437c1d258c774480d22f08f20abbe8 SHA512 c4378dbf5267f26d9b66b5f8cdd6c1e6ba36d116ed83fc6e3bade9698806885e0a2b1ec9802ce2e4e92d8c8ccbcf0d684b0599b622158953ce402c0b49b64af7
+EBUILD nbval-0.9.1-r1.ebuild 740 BLAKE2B 69c62d981984faae61a0aeb70d4c038f78a791607fdb741495eb896d04e7e0356e8f928471ef51798aec14d3fb75b2aa73ebeab4a79f38813e274a161cb3af08 SHA512 c00a36c40e79a10161fd740f003172d39b07c753bc3e7bed8c267e6bb249f8d49f419337670f0bf06eb8a3cb4c9c6b1a7d915823f5122c389c4dfc6331753389
 MISC metadata.xml 959 BLAKE2B a6a44c85198fd92b1b26ae2b110ee4f1803d8e6e7dd55860f9aef67f57b29369c31d26d85f27de5a028551d8ce7c502a82189cd0ee2ff127491a05f0d965609e SHA512 63debd61c5149c3d9dc97a10fb4e40aaf2debc480608319158fcad3a8aa39a7f0623470fe906a78ed66ce844894780aab65d4b7a3a4afb5fbfad8dd06acd7af2
diff --git a/dev-python/nbval/nbval-0.9.1.ebuild b/dev-python/nbval/nbval-0.9.1-r1.ebuild
index 53372f1f3414..24226b042d45 100644
--- a/dev-python/nbval/nbval-0.9.1.ebuild
+++ b/dev-python/nbval/nbval-0.9.1-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/nest_asyncio/Manifest b/dev-python/nest_asyncio/Manifest
new file mode 100644
index 000000000000..5f3c920f9af6
--- /dev/null
+++ b/dev-python/nest_asyncio/Manifest
@@ -0,0 +1,3 @@
+DIST nest_asyncio-1.4.0.tar.gz 7053 BLAKE2B e9bdfa53f8a94ddbfd87b638962b5281aa3e8830c75a019d66d8275eb107aa7268d7f5aa24782d648a5fcfbfc4e1040abf2f2f0ca5678a513a95111d293eb055 SHA512 6a5130938baabafba30c4d5435276d33aa5df5e52a84e5646de55ab64bc01d3b69340b725b74dbe3dd158d5fba8db1470a322bdcdc3b75aa1a121076e3553a06
+EBUILD nest_asyncio-1.4.0.ebuild 405 BLAKE2B c876ce441bada97bd3543840731d3ed832f02232491416235fd05656dfba6acfb0957e64d07a17a68e1cf65d5a7a039c392c4f698b4e752fb6e9200fdc40e6a8 SHA512 239452b5fc569c115f2869fe9c3c7ff51039b8aae541dd11c0b1323041ec889fc6f5d8620ab1baf3615a1e00fd0e7763cf10022857770c059b1897739713f495
+MISC metadata.xml 426 BLAKE2B 905a2414e3fe005187fde26a1c87fa38e45437c1fc220865699f92370e51c2d260f0b71e26815e2ddf9e35c2f6bf5b3bd3f7b0e0043f72e17ac6de096a6ed16c SHA512 04ba0886e7c91629644cbff7715e7275df7e38d6b1178e411d03464726b3f777d0e2dc6716fa06ba9c8104196636af081fcd178322895d1a1694cd7b7b624bc1
diff --git a/dev-python/nest_asyncio/metadata.xml b/dev-python/nest_asyncio/metadata.xml
new file mode 100644
index 000000000000..31536e562ab6
--- /dev/null
+++ b/dev-python/nest_asyncio/metadata.xml
@@ -0,0 +1,13 @@
+<?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>
+    <description>Python</description>
+  </maintainer>
+  <stabilize-allarches/>
+  <upstream>
+    <remote-id type="pypi">nest_asyncio</remote-id>
+    <remote-id type="github">erdewit/nest_asyncio</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/nest_asyncio/nest_asyncio-1.4.0.ebuild b/dev-python/nest_asyncio/nest_asyncio-1.4.0.ebuild
new file mode 100644
index 000000000000..b89a9cafeae7
--- /dev/null
+++ b/dev-python/nest_asyncio/nest_asyncio-1.4.0.ebuild
@@ -0,0 +1,18 @@
+# Copyright 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="Patch asyncio to allow nested event loops"
+HOMEPAGE="https://github.com/erdewit/nest_asyncio"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+distutils_enable_tests setup.py
diff --git a/dev-python/netaddr/Manifest b/dev-python/netaddr/Manifest
index 71026fe5a66a..eae559431125 100644
--- a/dev-python/netaddr/Manifest
+++ b/dev-python/netaddr/Manifest
@@ -1,3 +1,5 @@
 DIST netaddr-0.7.19.tar.gz 1622835 BLAKE2B 31e2c2a0f6f0b0e03494718364f93dddedc13714ff9fe12823fccb34c0693987c01e50e37d10497613cfc226a47b8d55593ed48bf25a7f7e64b7035b83511d12 SHA512 8440dee19d51828cd0dee403ec8c2fbc70e42d8c7c922d1a6a2a752100f9a313c521fa5e0789e024af0998f713599d50cf986e96867d3cc62a4143875e52d6bf
+DIST netaddr-0.8.0.tar.gz 1959055 BLAKE2B c0a361c100490c17203aad14eb14a3e09c63f5a6ce2f4b7e85bc57942329ac4603a1d4b3a09a9ab964a775dfb50a8746f6dd4a05d2f9bba01674624a7d7b46c1 SHA512 0b518ef240b81af425a5aaa6f087b10dece3f352c0c67cde8553ac00daa9d1890637c05d16740e2c23b30ae068c1b4c409ca8291e02093699fafd638701b9069
 EBUILD netaddr-0.7.19.ebuild 810 BLAKE2B eb31f4d97575432180389573bca0c6f9ec18edb6f369d90deb52ade0f7909b96543f60702ecda9c52ebc2dcf8ac64e1fea792655d6958031a8deafd7069ef666 SHA512 1a9d3a008d2a2f1cbb37135463f3d30f373f8355e3f5db6e00fbcf6171b7fd2fa09a4b9c578cf24bfb5db9e35382e1e609149507d2e73155d29ae6f15bd4424a
-MISC metadata.xml 486 BLAKE2B a7a912615f72839971663e2dbbf5e4bb7fbd87a22cc9bf1080edb6756553f34eea3dfedb7487df85f6d94b0d9d835f5d3b5cecedf7f03e54af2026fac5e09be4 SHA512 91e00ad588636fbfc6edc9212349e9c04227cd388cbffff622baf699741e5875019eb80a811f91c14a76f9c9106bd35a9a45ba9caedc4c145c04b9913afd1a99
+EBUILD netaddr-0.8.0.ebuild 1077 BLAKE2B b86704581cfac7abe837c1d2852746db71353412626dc90e78e5fe6cc261ad9a58bffffc8e8d124df6324d9a81b745cd64c04956fa79e44a0c7a28177932ac0f SHA512 4e30330de56cbced991db1298544aba9d477288f67e10d6ce3a5318ab579ffb171cbb33f907999ced39ee3cbfd637f5249fa89d6607f087a7930046d733c3f5b
+MISC metadata.xml 761 BLAKE2B 94a2554e9c9ef6ae5a877a258c6c7b49de96a4f7e8a2f95bb0de9f71e6772e0a1cd8edb4eefa30cbeb0d6eee542e319d30919a1b144e99ead1719205290386a4 SHA512 f6017ac18a389019c05db0a75e4c7842356e23e97ebf6b1e0e3cdcd1b1eb9fd65a7c985b51cd8068db997132fd8ee878b397bae0707f707cc18bcade919981c9
diff --git a/dev-python/netaddr/metadata.xml b/dev-python/netaddr/metadata.xml
index 48f423e837e6..ab8d2fb83b0a 100644
--- a/dev-python/netaddr/metadata.xml
+++ b/dev-python/netaddr/metadata.xml
@@ -1,15 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>maksbotan@gentoo.org</email>
-    <name>Maxim Koltsov</name>
-  </maintainer>
-  <use>
-    <flag name="cli">Enable netaddr shell with <pkg>dev-python/ipython</pkg></flag>
-  </use>
-  <upstream>
-    <remote-id type="pypi">netaddr</remote-id>
-    <remote-id type="github">drkjam/netaddr</remote-id>
-  </upstream>
+	<maintainer type="person">
+		<email>maksbotan@gentoo.org</email>
+		<name>Maxim Koltsov</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<use>
+		<flag name="cli">Enable netaddr shell with <pkg>dev-python/ipython</pkg></flag>
+	</use>
+	<upstream>
+		<remote-id type="pypi">netaddr</remote-id>
+		<remote-id type="github">drkjam/netaddr</remote-id>
+		<bugs-to>https://github.com/netaddr/netaddr/issues</bugs-to>
+		<changelog>https://github.com/netaddr/netaddr/blob/master/CHANGELOG</changelog>
+		<doc>https://netaddr.readthedocs.io/</doc>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/netaddr/netaddr-0.8.0.ebuild b/dev-python/netaddr/netaddr-0.8.0.ebuild
new file mode 100644
index 000000000000..cdd931175b5e
--- /dev/null
+++ b/dev-python/netaddr/netaddr-0.8.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+DESCRIPTION="Network address representation and manipulation library"
+HOMEPAGE="https://github.com/drkjam/netaddr https://pypi.org/project/netaddr/ https://netaddr.readthedocs.org"
+# The next release should have docs in the PyPI tarball
+# https://github.com/netaddr/netaddr/commit/e6f545fccd83dbd14baff40070594cc96838c9bf
+SRC_URI="https://github.com/netaddr/netaddr/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="cli"
+
+RDEPEND="
+	$(python_gen_cond_dep 'dev-python/importlib_resources[${PYTHON_USEDEP}]' python3_6)
+	cli? (
+		>=dev-python/ipython-0.13.1-r1[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx docs/source
+distutils_enable_tests pytest
+
+src_prepare() {
+	# Disable coverage (requires additional plugins)
+	sed -i 's/^addopts = .*//' pytest.ini || die
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/netifaces/Manifest b/dev-python/netifaces/Manifest
index 061e6f82e0ac..ba54887312fe 100644
--- a/dev-python/netifaces/Manifest
+++ b/dev-python/netifaces/Manifest
@@ -1,4 +1,4 @@
 AUX netifaces-0.10.4-remove-osx-fix.patch 353 BLAKE2B 49b66642156ada3e01e7a7fa28b6e12a36b5bacd38676972b1685a2c2710bcdb531849d3c27ce5279feafa1048d060eb227a79ddd5569c5d48accba600f32e69 SHA512 0c47d026e1be42fdae860aade01762d0c7e27083fbe17dbed76526e72852f0444e56617431d081de9e4e86c7ce65293d83e704e56a3219face4d07106730255c
 DIST netifaces-0.10.9.tar.gz 28844 BLAKE2B abbe36ef82c5fa70bac60abe4c7bda671f8bc009567dfd38fcf2084bac5b09cbd42cc16c5c8023f3219129892f8def296e3cad8f9241d8c904a9c362c8077aa6 SHA512 8fc593de4d2cbda46a3e2430ede031360f1abfc64d47d00fbec09f3395fd83479bf29d97cb6834b1df06850c9ac2745c9344b6814f34be5975d4d5df98e05e87
-EBUILD netifaces-0.10.9.ebuild 608 BLAKE2B fd106943f6ed84b7b58250c5e9c090cddd9141c40ef60f8657f491a9ce4e85386ca0e9931a80b98e48656afc1a9062222baee229935224a3fa4c8ced80f641a0 SHA512 826a1e09e72809217edf9b427d2c5a7dfdeb1e7a59cd2e08da729c3263b86e919e9bd146fa09af69002274ece28ba628e279c548015f36567a5594d51baf59fd
+EBUILD netifaces-0.10.9.ebuild 561 BLAKE2B 724a2dbc80f37047f08c12fb77d0bdce3f2ac39493899ae27da55e0f26e2e311713b8280606a6614788083e2d33418f64a58ff25437ae618f55919d10efe5689 SHA512 685995198f464cb610d6a10470187bbc5f816f7cf3221b0d20a33f18d0fbb380e7ae55d29551bebb402bce38f6e45542d13370d09d5d00c1508c6f7f0b54961e
 MISC metadata.xml 513 BLAKE2B 2668fe590efd338d410c10a71076e5de04297b18f998b07dbb88a3df99e1c4e66ed92f97fcf6d06b2496bfec3ec308d3812f08b1640b73f1d2221beb669ad3d6 SHA512 88793ae0c8b539b78d70e1af3a18e65b7702e3663d950a9ea1ce7528ed3300ea0b4c69c5a48a652fac4c2a32ede679062dc929c165035a3cd4dec13513669691
diff --git a/dev-python/netifaces/netifaces-0.10.9.ebuild b/dev-python/netifaces/netifaces-0.10.9.ebuild
index faa08acf317a..ed88a284797e 100644
--- a/dev-python/netifaces/netifaces-0.10.9.ebuild
+++ b/dev-python/netifaces/netifaces-0.10.9.ebuild
@@ -2,7 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( pypy3 python3_{6,7,8} )
+
+PYTHON_COMPAT=( pypy3 python3_{6,7,8,9} )
 
 inherit distutils-r1
 
@@ -18,6 +19,4 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="amd64 arm arm64 x86 ~amd64-linux ~x86-linux"
 
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
 PATCHES=( "${FILESDIR}"/${PN}-0.10.4-remove-osx-fix.patch )
diff --git a/dev-python/nnpy/Manifest b/dev-python/nnpy/Manifest
index d0d3e4321611..dfce2250b4d0 100644
--- a/dev-python/nnpy/Manifest
+++ b/dev-python/nnpy/Manifest
@@ -1,3 +1,3 @@
 DIST nnpy-1.4.2.tar.gz 4830 BLAKE2B 7e1e3d3ade400e96e43504e490f22e5595850d54e80d4591fa0a519a47a492aaf569d9937c4ee05fc9504c4beb5cb2ef8496a65874e64b6162087eade6762906 SHA512 b0908e3b53ac62d8a41ecadd412b2c4bff69773d5eeecc2eb72cad2667c3a14405dc1dfa6f2cdf4f81cf76b9eadbcdca5bdfa1499a2f0c3beddbacbd3e21b7d7
-EBUILD nnpy-1.4.2.ebuild 574 BLAKE2B cbdfa20a0150931fa2a0fdf9cc39a1b0e258fb2d6351329207186fb896d568d2231044df49c0dc5fd2a581b0a353f0c493e5d36775a0eb2356cfe7060ee714f0 SHA512 ee7dcdb91b22ae6fc9a4f6a0ae55673e9ab5da8a238e1cd21a89384c768d0ca4e4d9e4c793f1d507bb489d7de18be60d1f2f836b9b9f96ec6afcf0effec4204a
+EBUILD nnpy-1.4.2.ebuild 575 BLAKE2B 28b815d6579648c455e2b55c0742780ab6a54a6e085d90f903ecb942a80e4614c34a622a10ace747dfc2d696ae970f28915e507f4b44319e6f4fea07ae090034 SHA512 02cf486080d0ea7bc6b1850903b0c0569916565e52ff5d95d08b19524d901401540cdbf86ca140d3aabbceea7fd7868614fafc3027a488b545c8fc6242a15bfc
 MISC metadata.xml 432 BLAKE2B 3fa5f82774cdc03df8a39db591bc688e25401a58c302aad0230074916a7e0c97e838552f50569f0f5278d570bf8ae810d242893bf704bb10273890d1def55e5d SHA512 4831a2c1564e14be4136a2e6431a0bc5d8964fd644f13e63633090b8d962fca501bde23407cfb69672db93fcc27c14c19fbfb19fb9e2a5de8e460f014551070b
diff --git a/dev-python/nnpy/nnpy-1.4.2.ebuild b/dev-python/nnpy/nnpy-1.4.2.ebuild
index 5f229a8e0b40..2f5fb5ec4614 100644
--- a/dev-python/nnpy/nnpy-1.4.2.ebuild
+++ b/dev-python/nnpy/nnpy-1.4.2.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-PYTHON_COMPAT=( python3_6 )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
 
 inherit distutils-r1
 
@@ -23,5 +23,5 @@ DEPEND="
 RDEPEND="${DEPEND}"
 
 python_test() {
-	PYTHONPATH="${S}:${PYTHONPATH}" "${PYTHON}" "${S}/nnpy/tests.py" || die
+	PYTHONPATH="${S}:${PYTHONPATH}" "${PYTHON}" -m nnpy.tests || die
 }
diff --git a/dev-python/nose/Manifest b/dev-python/nose/Manifest
index b0743105ea93..2938f80b26af 100644
--- a/dev-python/nose/Manifest
+++ b/dev-python/nose/Manifest
@@ -2,5 +2,5 @@ AUX nose-1.3.7-coverage-4.1-support.patch 950 BLAKE2B 451402abfaf917b42584fb2530
 AUX nose-1.3.7-python-3.5-backport.patch 1802 BLAKE2B 8513cd506f7031ec4af1a4acd619b1bc01da05a1a81e95d3d9dfa097b131727229a05228315252a67c57ab15aaf2dc90df59c7ff3c726ae62f4a5ef86776bb87 SHA512 032c4c291edd76bb594329578e57483942ced2a46c3f6cd4e914d905f3894e420cc4da0ba2a63c266c81dd4d8f40b8df180f56ac75cb3c5e83e0309bbac573b2
 AUX nose-1.3.7-python-3.6-test.patch 3289 BLAKE2B 4f19c4f6e4f376cb09896f9e7b054753c339ad371e151f01cc8c54e83ecffee72e4959d827a88d03b4944192b43085b50017ef8b8785222125ce32fac5831717 SHA512 0be6e49f08a4098b4c5dd1d9678e757c8f1f317fb13bd355a035c44bcdd9cd043be1755bb97c4ca78397985f07f6fc486ddd10cb56dd8d8774d631eebcc81127
 DIST nose-1.3.7.tar.gz 280488 BLAKE2B 4bb479b2786f813f9e9a5fd401e30023a473a053ae013d7887be15af415422c09fb399af6058ae99ed65c5fa4da84eb274eb805e895ca74db159d952905f5be4 SHA512 e65c914f621f8da06b9ab11a0ff2763d6e29b82ce2aaed56da0e3773dc899d9deb1f20015789d44c65a5dad7214520f5b659b3f8d7695fb207ad3f78e5cf1b62
-EBUILD nose-1.3.7-r5.ebuild 2295 BLAKE2B 4b784950f9d1e23fa439603751ed9f353f16741001fa990577c25442cf6ad2abc9f70165d7858cef941b8324872540e44a464e9460e09edc519db5d908b98178 SHA512 bd596cd6d76260fe5290d2c30f318eec3fa76061076a785413e93068f0c49ae6212c5115c8d33403abc2ae91fa6fa5822cfbef3906ccc7edd1739a5f8e7d79ba
+EBUILD nose-1.3.7-r5.ebuild 2302 BLAKE2B 36c85acf613838269ce35f47c35d5d14462e1cd304e7209c76ded0680ca52b6390650e3061336767895b4dd47103b888bba578d89958801af880e140dfabb55a SHA512 05ec5cd9e17df8d1a6c437b80d615c9eabc9a21cdb0cb486ce5ede4a6fd446f2b3bbb57a8fc7bb4aec223e39bcac500b1d4f7541707fe6004f66d5f34b9c19bd
 MISC metadata.xml 524 BLAKE2B 90a98bae0d27a49c51aee677f8bdebcbee461d74fad0f349f73458229098ba3038705d63a88c59f90ef8621931e5d3902c0209bd627c28d2b0296deaff4af75d SHA512 4dc9346469b9b3a0b87fffe49db530107a019bd798fba0620b671d71a43805537face8451c24d6ad40bf11ed3498d8970ddc1ce3109398534c9f3c8ed72743e0
diff --git a/dev-python/nose/nose-1.3.7-r5.ebuild b/dev-python/nose/nose-1.3.7-r5.ebuild
index 7cd58888bdb7..747066036365 100644
--- a/dev-python/nose/nose-1.3.7-r5.ebuild
+++ b/dev-python/nose/nose-1.3.7-r5.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="coverage examples test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/notebook/Manifest b/dev-python/notebook/Manifest
index dac19f35ba6f..b5b4066f988c 100644
--- a/dev-python/notebook/Manifest
+++ b/dev-python/notebook/Manifest
@@ -1,10 +1,10 @@
-AUX notebook-5.0.0-example-execution.patch 941 BLAKE2B 6df33095a99042a5345dc3b759121a43d269d1092288c1384d61844430d90e967868ad71fd7eddb6bba4b2493e489ac6b57b01f21d8a48297cd36438cd98861b SHA512 f9482d26fc098b9a3d525f5e299cf094cce192c6231d6bf6242e3e8081b7ab69f8f7955a746772aca7aef3d4c973b444f5f04004d1fe54e623bbd84d761f0512
-AUX notebook-5.0.0-setupbase.py.patch 1368 BLAKE2B 7c80334d515becf41d881a1d4b3820a263c8cac2913dd9ef4df149bcd85ee7a09df6ba91e607f15ac35dde1a504e89775dec93043bfcdc7700643b645c986929 SHA512 14274ae6e2bc664e6c92390d480da0f5615b7f51863c10f3d11a7ec1a788ff357ae8113bac0c3d15932e322137b9e251c31bdf34c36a2dbbc0771407fe614a96
 AUX notebook-5.7.0-no-mathjax.patch 1438 BLAKE2B 66719f5342c08fce7576a70780b38a97ac3e768f3385218da15e7e2b7073ec0e1bbe943f320e4ebd0618401760de96295fc1b0ea0f2e919487b41f90acabfef0 SHA512 ef2754a0e7f552de34411532e7cbddffeab66364075a5514290b09f956b3486791f757b9a159a6c3f975507b8a5626612efeee754933927e2b505aea5f5df2db
 AUX notebook-6.0.3-py39.patch 4042 BLAKE2B c15f7e4779cc6ccc20f837bf7867eb4ced353b0848b783e786b02549975a56e122ba85dec7ad9dae3963a80c34e8c22c1d8c95b054077cd397607db0c9c15329 SHA512 8e0d0851156935fab5b47fcf13fe0a92f6675914b9c3fac1a36c28e282b4003501572dcddac4d729ba798609c7c49b8241ac72277491907adbeb52b2dd14041f
 DIST notebook-6.0.3.tar.gz 14048151 BLAKE2B ad4e433accc90acc13efc8005146dd8bcf2e645c104473f0e71d8d9fab80d7e128eb4e070b8aa04aee77e0d6115499e61beb841d94cf66b0e098dc50d3916cbd SHA512 fb56d0e10da3f8673e9578cdf04759dc3247547af6be4f479e9b183f3c5bd0a891fbfede187e0f5aca5c6ffdb9cae6ada23fe6dd159aca2d9cdf967f1f150922
 DIST notebook-6.1.3.tar.gz 13806042 BLAKE2B da63fdabd1a71e4247a9e340539e688410a84c58d94049dfb7e8e3fcdc53686a55eb855687df34ff48f599a0c5aececbd9a8e1aa1d2ff7baa2a6da1b4e1bcf24 SHA512 67a8feb01dfb665bb24f3ce1b28212e9bad5a188e8cef1d168c4edaf207cbc16d516f6024ca905f75f1c27ba4890da858c5278a3ee84a4c4ac1bdbf225afa351
+DIST notebook-6.1.4.tar.gz 13933373 BLAKE2B 9e58a9913a3c24bb1cb364863a18993d44496e995dc43dc9a4b428c54a0dddcc8b7c4b444073029d97705f0b3eee37d63bb50eec066b9b5fe4cd0ee48f8df558 SHA512 55637ec76b283429ac8bc1de260529983cf0e4cb0f25b268330fcc1d07c6e75329d2806eaa5f10d149bf80bd11df26592fa71548fa03bdb05a57265221466b57
 EBUILD notebook-6.0.3.ebuild 2369 BLAKE2B 89ebccda62bf6c1597dd015ed76fc9cf407bc3749a013c5762a530844528288bb8193c9454f604be02791b3d349227661dac899fee2030a250bcc558867e39c2 SHA512 7c17a5b0124fb1dc6af18cb9736793ea3a9b3e5b9179e64c7cd60311b1762e5339d4ac5c023d433bc57c2abd6bec5cbf65b91e167300ce139583e0ad7a33beb4
-EBUILD notebook-6.1.3-r1.ebuild 2589 BLAKE2B ba41ae96b619b3d1348c24604dfcd215cc25f89bd8c88b2fd76c9760295f09d7ccc88910726df55d614e30a7828c02f199dbfd268277bd1decbda8b581db5a1d SHA512 293d8e2ab1e28729414f9b7acb9af2198cc74ae18317722eaaf54338123e0bb8ade5e4ea38c1e02467db77c757a80e35ae2ec1b94b896f02603f0346c069fba2
+EBUILD notebook-6.1.3-r1.ebuild 2587 BLAKE2B f1fa42de905aa9732ae0a80893e680eec6de96c96fe39f793538736cc37bc30c1638ac6e0008a99dd70215f53f979e5c977c714abb3f9c54723ede6add29d781 SHA512 214e9bb13da3d0f320f9e88e2d6f8463747e586dff2927e9153fadd9c72ab511c829bc7da0ed8e4077ce13e01b60bdb354297a880aff232a8f62e64b42ee8d56
 EBUILD notebook-6.1.3.ebuild 2589 BLAKE2B 111e1f31138241640409c8e08aabe188bed91c14d73c4962f021cc55e2cb015eb0638d10426bf63df30dfe935d6a84a9e04f1d3d416694abead8af75d616f1d9 SHA512 a26da170b99ab62deac489455a4139d04086bb525eb62c70f529f5063d4fb30a3d860a28bc3ce01015c16f5eb874bf542a850062bda1039df517331ee9933628
-MISC metadata.xml 441 BLAKE2B f744bd6821b3c38aaaff373d5e44b8b84d35bb50a58e1fb6515cc580727a29240a2394c0d6a0c846dd76062905a8de7d75faf96ddb0b23a0bc05b24875918013 SHA512 4f59ae02210d5df4c6416cdec8d85931577e931e885fe7807967ff708a7c5436fe246e152f060e99b0ada2665e8a0321bd4382640680a892ad514b16926351f7
+EBUILD notebook-6.1.4.ebuild 2589 BLAKE2B ba41ae96b619b3d1348c24604dfcd215cc25f89bd8c88b2fd76c9760295f09d7ccc88910726df55d614e30a7828c02f199dbfd268277bd1decbda8b581db5a1d SHA512 293d8e2ab1e28729414f9b7acb9af2198cc74ae18317722eaaf54338123e0bb8ade5e4ea38c1e02467db77c757a80e35ae2ec1b94b896f02603f0346c069fba2
+MISC metadata.xml 466 BLAKE2B a907de2cb309e201f79881fbc1084337fc9d5bb88af8ba4b65db62123703c5193df08d7a1ed7255417fe619bb197290ed76fa70bc5e04133a616c13f69cc7d3f SHA512 cffa01ae84a4242117574bb9dfc26f7152307f263d12270a9ee8bc978b780c8a19ae26db0b9e7bc98ab1ba82a44f222849a6a33a8a0c50a2887a01f3f94dc6c2
diff --git a/dev-python/notebook/files/notebook-5.0.0-example-execution.patch b/dev-python/notebook/files/notebook-5.0.0-example-execution.patch
deleted file mode 100644
index 4516cadf11f6..000000000000
--- a/dev-python/notebook/files/notebook-5.0.0-example-execution.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-commit db90e16d17acc778efdfff6dca69767b47b60cbd
-Author: Benda Xu <heroxbd@gentoo.org>
-Date:   Sat Aug 19 17:31:38 2017 +0900
-
-    d/s/examples/N/Importing Notebooks.ipynb: disable execution.
-    
-      This notebook example includes writing to the directory of another
-      module, usually resulting in a doc build failure.  Therefore we
-      disable its execution by nbsphinx.
-    
-    Closes: #2372
-    See-Also: https://bugs.gentoo.org/show_bug.cgi?id=626860
-
-diff --git a/docs/source/examples/Notebook/Importing Notebooks.ipynb b/docs/source/examples/Notebook/Importing Notebooks.ipynb
-index ee42ad526..d6db5395e 100644
---- a/docs/source/examples/Notebook/Importing Notebooks.ipynb	
-+++ b/docs/source/examples/Notebook/Importing Notebooks.ipynb	
-@@ -511,6 +511,9 @@
-  ],
-  "metadata": {
-   "gist_id": "6011986",
-+  "nbsphinx": {
-+   "execute": "never"
-+  },
-   "kernelspec": {
-    "display_name": "Python 3",
-    "language": "python",
diff --git a/dev-python/notebook/files/notebook-5.0.0-setupbase.py.patch b/dev-python/notebook/files/notebook-5.0.0-setupbase.py.patch
deleted file mode 100644
index 4dc55d937cae..000000000000
--- a/dev-python/notebook/files/notebook-5.0.0-setupbase.py.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-Disable bundled mathjax.
-
-Patch by Marius Brehler
---- a/setupbase.py
-+++ b/setupbase.py
-@@ -165,37 +165,6 @@ def find_package_data():
-             if f.endswith(('.js', '.css')):
-                 static_data.append(pjoin(parent, f))
- 
--    # Trim mathjax
--    mj = lambda *path: pjoin(components, 'MathJax', *path)
--    static_data.extend([
--        mj('MathJax.js'),
--        mj('config', 'TeX-AMS-MML_HTMLorMML-full.js'),
--        mj('config', 'Safe.js'),
--    ])
--    
--    trees = []
--    mj_out = mj('jax', 'output')
--    
--    if os.path.exists(mj_out):
--        for output in os.listdir(mj_out):
--            path = pjoin(mj_out, output)
--            static_data.append(pjoin(path, '*.js'))
--            autoload = pjoin(path, 'autoload')
--            if os.path.isdir(autoload):
--                trees.append(autoload)
--
--    for tree in trees + [
--        mj('localization'), # limit to en?
--        mj('fonts', 'HTML-CSS', 'STIX-Web', 'woff'),
--        mj('extensions'),
--        mj('jax', 'input', 'TeX'),
--        mj('jax', 'output', 'HTML-CSS', 'fonts', 'STIX-Web'),
--        mj('jax', 'output', 'SVG', 'fonts', 'STIX-Web'),
--    ]:
--        for parent, dirs, files in os.walk(tree):
--            for f in files:
--                static_data.append(pjoin(parent, f))
--
-     os.chdir(os.path.join('tests',))
-     js_tests = glob('*.js') + glob('*/*.js')
- 
diff --git a/dev-python/notebook/metadata.xml b/dev-python/notebook/metadata.xml
index ed4782de272a..68142250c5d8 100644
--- a/dev-python/notebook/metadata.xml
+++ b/dev-python/notebook/metadata.xml
@@ -9,6 +9,7 @@
     <email>python@gentoo.org</email>
     <name>Python</name>
   </maintainer>
+  <stabilize-allarches/>
   <upstream>
     <remote-id type="pypi">notebook</remote-id>
   </upstream>
diff --git a/dev-python/notebook/notebook-6.1.3-r1.ebuild b/dev-python/notebook/notebook-6.1.3-r1.ebuild
index 2f974c926f26..a484e7f04afd 100644
--- a/dev-python/notebook/notebook-6.1.3-r1.ebuild
+++ b/dev-python/notebook/notebook-6.1.3-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 
 RDEPEND="
 	>=dev-libs/mathjax-2.4
diff --git a/dev-python/notebook/notebook-6.1.4.ebuild b/dev-python/notebook/notebook-6.1.4.ebuild
new file mode 100644
index 000000000000..2f974c926f26
--- /dev/null
+++ b/dev-python/notebook/notebook-6.1.4.ebuild
@@ -0,0 +1,93 @@
+# 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_{7..9} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="Jupyter Interactive Notebook"
+HOMEPAGE="https://jupyter.org"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+RDEPEND="
+	>=dev-libs/mathjax-2.4
+	dev-python/argon2-cffi[${PYTHON_USEDEP}]
+	dev-python/jinja[${PYTHON_USEDEP}]
+	>=dev-python/terminado-0.8.3[${PYTHON_USEDEP}]
+	>=www-servers/tornado-5.0[${PYTHON_USEDEP}]
+	dev-python/ipython_genutils[${PYTHON_USEDEP}]
+	>=dev-python/traitlets-4.2.1[${PYTHON_USEDEP}]
+	>=dev-python/jupyter_core-4.6.1[${PYTHON_USEDEP}]
+	>=dev-python/pyzmq-17[${PYTHON_USEDEP}]
+	>=dev-python/jupyter_client-5.3.4[${PYTHON_USEDEP}]
+	dev-python/nbformat[${PYTHON_USEDEP}]
+	>=dev-python/nbconvert-4.2.0[${PYTHON_USEDEP}]
+	dev-python/ipykernel[${PYTHON_USEDEP}]
+	dev-python/send2trash[${PYTHON_USEDEP}]
+	dev-python/prometheus_client[${PYTHON_USEDEP}]"
+
+# sphinx 2+ seems to have a problem with its github plugin. temporarily adding
+# a version constraint.
+BDEPEND="
+	test? (
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/nose_warnings_filters[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+		dev-python/requests-unixsocket[${PYTHON_USEDEP}]
+	)
+	"
+
+PATCHES=(
+	"${FILESDIR}/${PN}"-5.7.0-no-mathjax.patch
+)
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# disable bundled mathjax
+	sed -i 's/^.*MathJax.*$//' bower.json || die
+
+	# require geckodriver
+	rm -r notebook/tests/selenium || die
+	# trash doesn't seem to work for us
+	sed -e 's:test_delete:_&:' \
+		-i notebook/services/contents/tests/test_manager.py || die
+	sed -e 's:test_checkpoints_follow_file:_&:' \
+		-e 's:test_delete:_&:' \
+		-i notebook/services/contents/tests/test_contents_api.py || die
+	# network-sandbox?
+	sed -e 's:test_connections:_&:' \
+		-e 's:test_culling:_&:' \
+		-i notebook/services/kernels/tests/test_kernels_api.py || die
+
+	sed -i -e "/'bdist_egg':/d" setup.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	distutils_install_for_testing
+	local -x PATH=${TEST_DIR}/scripts:${PATH}
+	pytest -vv || die "Tests failed with ${EPYTHON}"
+}
+
+python_install() {
+	distutils-r1_python_install
+
+	ln -sf \
+		"${EPREFIX}/usr/share/mathjax" \
+		"${D}$(python_get_sitedir)/notebook/static/components/MathJax" || die
+}
+
+pkg_preinst() {
+	# remove old mathjax folder if present
+	rm -rf "${EROOT}"/usr/lib*/python*/site-packages/notebook/static/components/MathJax || die
+}
diff --git a/dev-python/nuitka/Manifest b/dev-python/nuitka/Manifest
index 7f9eb6ddfc07..62d8a7cbf471 100644
--- a/dev-python/nuitka/Manifest
+++ b/dev-python/nuitka/Manifest
@@ -1,3 +1,3 @@
 DIST Nuitka-0.6.8.tar.gz 2390759 BLAKE2B 5f207a2dcac6a2825143268d3c28eab113705c050b67dbbfd3b655a0221ca3c04b2b206f3e8a85b4f17d28db52c11f19ea6260d2e7853c382942a76a15dc1973 SHA512 d9a9add759736c35fda57bbf82382effbcebce954228e56bf7c124502b96513f17a7083ded66da3ee33c52443b18c92839bff59a5c081d8fe44d6eec6c15fe54
-EBUILD nuitka-0.6.8.ebuild 798 BLAKE2B 621164897d4845339bf233f9cab2a5d3ca696b31bef3ca89c972ab1341b64a38ac117ede67a69d57b660b06fac476a2ae2d42f9b0511c9c053c45fb2b14e8ccd SHA512 e9a855f2d946da21b8a2abf8248f991c5509eed06cacb64507326723171b6a88ff3e6518b25be258bcbd6df561848e17575b4ed9dc85ce37fb47ba0951516715
+EBUILD nuitka-0.6.8.ebuild 802 BLAKE2B db9306a53158bff5900263e3a5be071c8d7d34556ba344ad82680b8dd495c9be3489e254eea43425bc2696a14f89989c92535cb46235f609f76111dd183c0b18 SHA512 f1775ddd5e1c4abe6a2077d29e8dea126158fc013dde5fede7768ab31715bc605b784e354428f5f42f269efe70198f763305fc7ee6a4b8839e22edd950bc6333
 MISC metadata.xml 750 BLAKE2B 56bff65b936301e2d0347e553a1ea85b89c4c991697f665b47b01dfd7e40b94726fca15c67e4387fb79ec19f77851e275bb80c48ded3f76e6cf4cb81d10ba90f SHA512 01ed4ef871d9d43ccb30b60e5051f513b56d7ab3eb46ad64b76e6ee8f53f0088c4a3d75227a0870e82664476954d6603f70614232735f107bb24a06702c014ab
diff --git a/dev-python/nuitka/nuitka-0.6.8.ebuild b/dev-python/nuitka/nuitka-0.6.8.ebuild
index 7c8d263ff4db..cac2e2285ee4 100644
--- a/dev-python/nuitka/nuitka-0.6.8.ebuild
+++ b/dev-python/nuitka/nuitka-0.6.8.ebuild
@@ -7,7 +7,7 @@ DISTUTILS_USE_SETUPTOOLS="rdepend"
 
 PYTHON_COMPAT=( python3_{6,7,8} )
 
-inherit distutils-r1 eutils
+inherit distutils-r1 optfeature
 
 DESCRIPTION="Python to native compiler"
 HOMEPAGE="https://www.nuitka.net"
diff --git a/dev-python/numpy/Manifest b/dev-python/numpy/Manifest
index e3a8305f34b1..a6ad53b8aa72 100644
--- a/dev-python/numpy/Manifest
+++ b/dev-python/numpy/Manifest
@@ -5,11 +5,13 @@ DIST numpy-1.16.5.zip 5138208 BLAKE2B f5511650e66939a6ce21cfad7874aecdeb6c07a70b
 DIST numpy-1.17.4.zip 6366657 BLAKE2B 89f729bb0740fa721dfe8d1165094a96302fde1e8c272689c11cb4a9bb39d11afaf6eda3ded8a370333b47b9d1ee25e8cb0a602c8cf44964612342c50ea5824f SHA512 f3264be7152437d71718da4728222962013ebd7fe02288d5063f1c763d1c4eee26485c27e8088f4dff79a4d491bc9f191849748c6007d093d22e89c6bff317f3
 DIST numpy-1.19.0.zip 7296082 BLAKE2B e388a1b8aa8fa5e23b57c69c5aa5f2b7b286a69fca6007843adbfa374d541ace7875757a302e851bc41194f565390b52777fff13da8166e7a2c6b0a0f3efd29c SHA512 24f8847ff6b72dd44db197fbd80596677f9f3c5afcc87f30c41a4c0a2ccd4ee652ca630a537997ba8fe68c4919fa488e9d8cadd9a310e5356b017f6086055850
 DIST numpy-1.19.1.zip 7301568 BLAKE2B f7c17666d8cd4f477d7946be383d2ff1656c412e23dc49c55f94a6fcb95a6cffe6b4958169b1b27e027a7d674feb96de979d8bba4f1e3d9daef9b72e7f48cafa SHA512 ddc5f5e262d6f7f6e1a8879165860427baa237b6aad5b09d5b943a36bb0d5922424aac4c0e32a2cc3e14087bf6eb671988b6ff6df0d9ab8c89724e093220eead
+DIST numpy-1.19.2.zip 7310530 BLAKE2B a019c64809bd61071a4dd5e10c2cdf6927f392ebe58b45a08529295079bca68a683502aba89847578e122271d2fa4ea6d2d5461f1e58322f550cda863d36125b SHA512 56ae348f08818e30b6675df7d41a2b03687af452d7a96356fccfce2994843c7b61918946381c3af25fe03f209413d0378ee691fc38d805491a12c464e49bb59c
 DIST numpy-html-1.16.4.zip 12097069 BLAKE2B db1f897342fbc80a761fbaee7b0eee3761dbfa04ef6c46a137bb2392caaec8256580467ce06498cceeada2639151a1ec75dafab484d64cb897c008727d6d32a5 SHA512 c44c5e1e0cb22f9dd46fe9e302030292d85e567456178fee296746a414271634e906509fb6665ac63fbfebdd13c5383574f0aa47b4fbc639063da31addc3316a
 DIST numpy-ref-1.16.4.pdf 5176571 BLAKE2B 9a875ebd1473b241d463d810a6d191581aef961158f2f82959671b554ace3ad482795e4f3e1cb7dd4632cff926c1e864c675a7624fb0f4e4f297948bf50f0564 SHA512 983ba0f34a70c011886bdbc9fd8f3f75a3a967ca29217acc76fa46e7da391296a5628c9a557ac76efb393271abfb8ee4f376d401c1cc1e5c30622e54b9325d09
 DIST numpy-user-1.16.4.pdf 596203 BLAKE2B da3ad1f0ec1c965d20656f73a970911cbb58efa73a5df89e2e6485e0dd763f483e35eea1395ac919bf35d496fb216cee954fc5d31edebc1796a24a2a7a2d12b9 SHA512 3083008547213bfa98ffa5cd8e2cea13f6947f42d83aef61502a2a852b0d5f27d727c76b42d281d7a2f4f76c78e88b12ee3d9b164b39fe1f0213ace7097357d6
 EBUILD numpy-1.16.5-r1.ebuild 4364 BLAKE2B f8d83c189cc4dda70593621135607520ed993de72ea3495f3b41bc5a7ce2d39df3e92ac8f60e14a32cba17e062a97c45bc8c975e94c09a4213b4651f9c0d78bc SHA512 cc185d66671c12022ef77ad93117b01035302daad8bc71409e43ba5ed90ff1453b7ae05896aaf085fd94eee7abbd572e476e11996e16106b2fcb265aed274d73
 EBUILD numpy-1.17.4-r3.ebuild 3563 BLAKE2B 638577e95e35d83b2f343e35c7035e3e7e4f6180e1d5ba4b2088febb5dc417acfaa17704d2b499ec2ff4196dc276a55f5050e6f43c01b9e55a94a991de305d6e SHA512 ed5d291db03806a28c16fc1011bf61a52cd81457b2d6825d94f0e3b2f11a32353e2ff7b93f2d0927bf81e710dc457ca9eea896159d6c52bb72fa3d598c1a1077
 EBUILD numpy-1.19.0.ebuild 3726 BLAKE2B b7ff98d3782d037656a810490a46f8d6a1f9ffa407577b910fcc7a06ce900390d341a06213c5f8d3b6073c7b20053f151f65636beccb07cb055e4dd5a965cc9c SHA512 36ef418f6e17a0cb364bb0f5cef4890fdb84d3a2b748733e35f576574a84cdebfb1e086b8764aa6a14ab887d1730f12cd7f6550a70a792d942622b7ed8602407
-EBUILD numpy-1.19.1.ebuild 3734 BLAKE2B 77a3823e986b7cb9fc4f29b8eb29988ad63c73d8d0a5cc40836339519b9d54978c725e4e68f6c191be2e47ef53bf6d53b916a9fb1246355b428ebe0e6e6aa2af SHA512 ec1db0b21abbe07d24267a4d773ed6473efb1b640aaf2eea874526971a75fae4dd263d0f13581756703b4a923c037239093dc266a64ef5d74678cedd3b562100
+EBUILD numpy-1.19.1.ebuild 3741 BLAKE2B 3d16e9b26a02dc4c6a5a0d34bb5734aa73e161e198cc7e4311de287676c9b4cfd1d4fd982fe6572c71553d284be16978c06f5b170a9674dc747c3c99eb3728b0 SHA512 984cf6adc67ae4dd627ce0209522080f84a12cabac4c809fa17589e5acf1cc59060753d3a5f11cf3e5139904e3b8eeff2aba3f3490ff4551da23d0551756c235
+EBUILD numpy-1.19.2.ebuild 3741 BLAKE2B 3d16e9b26a02dc4c6a5a0d34bb5734aa73e161e198cc7e4311de287676c9b4cfd1d4fd982fe6572c71553d284be16978c06f5b170a9674dc747c3c99eb3728b0 SHA512 984cf6adc67ae4dd627ce0209522080f84a12cabac4c809fa17589e5acf1cc59060753d3a5f11cf3e5139904e3b8eeff2aba3f3490ff4551da23d0551756c235
 MISC metadata.xml 876 BLAKE2B 5e257d6ea3c59c5819d854db7b7db3ebff53b5c87b5ce9348786085f09db12aa6fc8fa86393b9e6c06760ac0d9f36a52fdfb1865c9d1d9ad5526d74d3d53e8b1 SHA512 d35d0954ff8f21e370edeab3ce3e5ab501bf216c93399e807ede6f1910ba0ea41359425bf894d813a39442fb92a724fe83ec8a5c64e6bd97de9422f67700d549
diff --git a/dev-python/numpy/numpy-1.19.1.ebuild b/dev-python/numpy/numpy-1.19.1.ebuild
index e70cf23d73a1..48984ec1246c 100644
--- a/dev-python/numpy/numpy-1.19.1.ebuild
+++ b/dev-python/numpy/numpy-1.19.1.ebuild
@@ -24,7 +24,7 @@ SRC_URI="
 	)"
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc lapack"
 
 RDEPEND="
diff --git a/dev-python/numpy/numpy-1.19.2.ebuild b/dev-python/numpy/numpy-1.19.2.ebuild
new file mode 100644
index 000000000000..48984ec1246c
--- /dev/null
+++ b/dev-python/numpy/numpy-1.19.2.ebuild
@@ -0,0 +1,145 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+PYTHON_REQ_USE="threads(+)"
+
+FORTRAN_NEEDED=lapack
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1 flag-o-matic fortran-2 multiprocessing toolchain-funcs
+
+DOC_PV="1.16.4"
+DESCRIPTION="Fast array and numerical python library"
+HOMEPAGE="https://www.numpy.org"
+SRC_URI="
+	mirror://pypi/${PN:0:1}/${PN}/${P}.zip
+	doc? (
+		https://numpy.org/doc/$(ver_cut 1-2 ${DOC_PV})/numpy-html.zip -> numpy-html-${DOC_PV}.zip
+		https://numpy.org/doc/$(ver_cut 1-2 ${DOC_PV})/numpy-ref.pdf -> numpy-ref-${DOC_PV}.pdf
+		https://numpy.org/doc/$(ver_cut 1-2 ${DOC_PV})/numpy-user.pdf -> numpy-user-${DOC_PV}.pdf
+	)"
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc lapack"
+
+RDEPEND="
+	lapack? (
+		>=virtual/cblas-3.8
+		>=virtual/lapack-3.8
+	)
+"
+BDEPEND="
+	${RDEPEND}
+	app-arch/unzip
+	>=dev-python/cython-0.29.21[${PYTHON_USEDEP}]
+	lapack? ( virtual/pkgconfig )
+	test? (
+		>=dev-python/hypothesis-5.8.0[${PYTHON_USEDEP}]
+		>=dev-python/pytz-2019.3[${PYTHON_USEDEP}]
+		>=dev-python/cffi-1.14.0[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.17.4-no-hardcode-blasv2.patch
+)
+
+distutils_enable_tests pytest
+
+src_unpack() {
+	default
+	if use doc; then
+		unzip -qo "${DISTDIR}"/numpy-html-${DOC_PV}.zip -d html || die
+	fi
+}
+
+python_prepare_all() {
+	if use lapack; then
+		local incdir="${EPREFIX}"/usr/include
+		local libdir="${EPREFIX}"/usr/$(get_libdir)
+		cat >> site.cfg <<-EOF || die
+			[blas]
+			include_dirs = ${incdir}
+			library_dirs = ${libdir}
+			blas_libs = cblas,blas
+			[lapack]
+			library_dirs = ${libdir}
+			lapack_libs = lapack
+		EOF
+	else
+		export {ATLAS,PTATLAS,BLAS,LAPACK,MKL}=None
+	fi
+
+	export CC="$(tc-getCC) ${CFLAGS}"
+
+	append-flags -fno-strict-aliasing
+
+	# See progress in http://projects.scipy.org/scipy/numpy/ticket/573
+	# with the subtle difference that we don't want to break Darwin where
+	# -shared is not a valid linker argument
+	if [[ ${CHOST} != *-darwin* ]]; then
+		append-ldflags -shared
+	fi
+
+	# only one fortran to link with:
+	# linking with cblas and lapack library will force
+	# autodetecting and linking to all available fortran compilers
+	append-fflags -fPIC
+	if use lapack; then
+		NUMPY_FCONFIG="config_fc --noopt --noarch"
+		# workaround bug 335908
+		[[ $(tc-getFC) == *gfortran* ]] && NUMPY_FCONFIG+=" --fcompiler=gnu95"
+	fi
+
+	# don't version f2py, we will handle it.
+	sed -i -e '/f2py_exe/s: + os\.path.*$::' numpy/f2py/setup.py || die
+
+	# disable fuzzed tests
+	find numpy/*/tests -name '*.py' -exec sed -i \
+		-e 's:def \(.*_fuzz\):def _\1:' {} + || die
+	# very memory- and disk-hungry
+	sed -i -e 's:test_large_zip:_&:' numpy/lib/tests/test_io.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile() {
+	export MAKEOPTS=-j1 #660754
+
+	distutils-r1_python_compile ${NUMPY_FCONFIG}
+}
+
+python_test() {
+	distutils_install_for_testing --single-version-externally-managed \
+		--record "${TMPDIR}/record.txt" ${NUMPY_FCONFIG}
+
+	cd "${TMPDIR}" || die
+
+	"${EPYTHON}" -c "
+import numpy, sys
+r = numpy.test(label='full', verbose=3)
+sys.exit(0 if r else 1)" || die "Tests fail with ${EPYTHON}"
+}
+
+python_install() {
+	# https://github.com/numpy/numpy/issues/16005
+	local mydistutilsargs=( build_src )
+	distutils-r1_python_install ${NUMPY_FCONFIG}
+	python_optimize
+}
+
+python_install_all() {
+	local DOCS=( LICENSE.txt README.md THANKS.txt )
+
+	if use doc; then
+		local HTML_DOCS=( "${WORKDIR}"/html/. )
+		DOCS+=( "${DISTDIR}"/${PN}-{user,ref}-${DOC_PV}.pdf )
+	fi
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/oct2py/Manifest b/dev-python/oct2py/Manifest
index 5865453f9f69..415bc97299f6 100644
--- a/dev-python/oct2py/Manifest
+++ b/dev-python/oct2py/Manifest
@@ -1,4 +1,4 @@
 AUX oct2py-5.2.0-mask-pkg-load-test.patch 384 BLAKE2B eb97b0f6fdf6df1bfc6907984ee1b223b9ec406c831c8c7f5908d3f5e130cddb85610487ee6eacf664e2e1859c3cc2ec1f5a22072d3dcac09b68bb631534e015 SHA512 44755cfd9725ef5e4dc572ac5e17954f023c4ae0bbe68ed984e696b485cf96bb15e11ee2d0a8a4a411237d0f5337269f13767af509554a9826fe572a7a2bfa71
 DIST oct2py-5.2.0.tar.gz 436128 BLAKE2B 674bd034a44aa9cdb5fd4258c96665fda1b1d79a13ae9fa8d36d168e39385a978ed75bf8748ecdd53f57720785ea8e6c5ffd85d81f3b3c307a748fbc8d328a86 SHA512 55c2ee68b4fd73a8901fa2f7f67fefde5fa37d5070434aee03bfa2a746ff5179f51ccb96541a112e416438eb912caa81e040a5a1cbcbfac36b0285d496ac96fd
-EBUILD oct2py-5.2.0.ebuild 1239 BLAKE2B d5c658f0c11597c08d0a8bd6620b2e8f5a03785be3f2ad4bb39c9f7e2ab4e6edfb37c4ad3b4cc4dd9a76901bb05da9ff7c00203b27d343f01b654816748bf290 SHA512 67a5861a4b1c7edf646d3b9f466f8c955fb6245beae28b34d404ab3b1401cf1225dd73a78e4452de2200e99818ac3d90c66a090789c553c50e1e5b668285dade
+EBUILD oct2py-5.2.0-r1.ebuild 1239 BLAKE2B d5c658f0c11597c08d0a8bd6620b2e8f5a03785be3f2ad4bb39c9f7e2ab4e6edfb37c4ad3b4cc4dd9a76901bb05da9ff7c00203b27d343f01b654816748bf290 SHA512 67a5861a4b1c7edf646d3b9f466f8c955fb6245beae28b34d404ab3b1401cf1225dd73a78e4452de2200e99818ac3d90c66a090789c553c50e1e5b668285dade
 MISC metadata.xml 615 BLAKE2B 32a95461360131faf43212d3e419ba75a12f853749baf7f862499155d6f445492c311860ea5ee7c7e22c5e9586c722df8382cfe2eb6f67ac7bc1596f6cb9602a SHA512 e476f193cbbdefdf56caeb8a8a501f57daf1b74a12a32c426b6e9150ea0d5b2538b7bd9bbeb3b7f45ba01aa741be2fd0b4dbf8e8302e867230fc1b2512c10ca2
diff --git a/dev-python/oct2py/oct2py-5.2.0.ebuild b/dev-python/oct2py/oct2py-5.2.0-r1.ebuild
index 475ad273c818..475ad273c818 100644
--- a/dev-python/oct2py/oct2py-5.2.0.ebuild
+++ b/dev-python/oct2py/oct2py-5.2.0-r1.ebuild
diff --git a/dev-python/octave_kernel/Manifest b/dev-python/octave_kernel/Manifest
index 8eab8ef83a52..1a977967c082 100644
--- a/dev-python/octave_kernel/Manifest
+++ b/dev-python/octave_kernel/Manifest
@@ -1,3 +1,3 @@
 DIST octave_kernel-0.32.0.tar.gz 27353 BLAKE2B da8ddb0c50c65937b4c2b803b6ecc6c5627b3044597ad21377fae9aca5e0ad4bddb6ba65dea77606741c51e435d55c83770d7442de66874c2124f63fda333ac3 SHA512 de8293bed51aca9fe16c2969a467916c90c0c900c5818d48368cd4307bc2b5f0a925f85a0c824c4789d48f72bc31fd7cb341486e70c87a0ca6bc61c799da0ab9
-EBUILD octave_kernel-0.32.0.ebuild 575 BLAKE2B ead1b15fb745b2e9c44dec2c7b45c96e583ea5f2862857bc781ac7c7d764a28a3ec1ef8907c7a4eab28f42a704f6dd397f652aef26e5a9304c0427f81f624432 SHA512 e7701732a02423b9322d02b604bc6df5fa4d5567385424e9867f8b89b9eec477a6d5c59337dddca63291304bbbb92d0b916f64da75c851a769899a43e4b136a7
+EBUILD octave_kernel-0.32.0-r1.ebuild 575 BLAKE2B ead1b15fb745b2e9c44dec2c7b45c96e583ea5f2862857bc781ac7c7d764a28a3ec1ef8907c7a4eab28f42a704f6dd397f652aef26e5a9304c0427f81f624432 SHA512 e7701732a02423b9322d02b604bc6df5fa4d5567385424e9867f8b89b9eec477a6d5c59337dddca63291304bbbb92d0b916f64da75c851a769899a43e4b136a7
 MISC metadata.xml 418 BLAKE2B 1f29af2c31afa65190dd80d2f311b00dd31591ff38e8f1fa3fbce2c59bcaebad9381bff4205c63cbd600b57cee5165ca3864fbfea308ceee14c05b570ca59fe8 SHA512 224e53302cea053e81e7be5b31fe21b95f373e2465777d5ce3816c3c5109cd045f787db41d573f6f09ae56d99c2170cd37cbe58f38638b8e0efd2df7ed4911f4
diff --git a/dev-python/octave_kernel/octave_kernel-0.32.0.ebuild b/dev-python/octave_kernel/octave_kernel-0.32.0-r1.ebuild
index 4658ee510d56..4658ee510d56 100644
--- a/dev-python/octave_kernel/octave_kernel-0.32.0.ebuild
+++ b/dev-python/octave_kernel/octave_kernel-0.32.0-r1.ebuild
diff --git a/dev-python/ordered-set/Manifest b/dev-python/ordered-set/Manifest
index e44e87473a2b..fd41d6c5a465 100644
--- a/dev-python/ordered-set/Manifest
+++ b/dev-python/ordered-set/Manifest
@@ -1,3 +1,3 @@
 DIST ordered-set-4.0.1.tar.gz 10607 BLAKE2B e9bb24f8709c73099b83ee27abe30193ff1b530cd92fe3f2a43bc25212542d80e459fe404aa97aa7447ef52ea239153d427087f1ed517a7e7c8e18d68f27d0f2 SHA512 6ebe758efba7b847cce4a06001e84bf4a60728ae5d088cd7e3a2ebab86a6f5aa6a421bfda1cea0e8751bafd60eac1b3f2ec14e74a7b71f469dc7851aafe52235
-EBUILD ordered-set-4.0.1.ebuild 428 BLAKE2B 48611d6f202b9e463f3e41c407570f76a58811004cfafd1c4d4b99cd471fe5a5bc05bdca2178bd937444e8ba8592d54217393a0044f0ab38c71b214d9ed44e54 SHA512 46cfff275712276d347e68c36463411e0acdccfa7c1d8acf76db3128f3184826361a5646de9901972bd8fb2c7dbe2243805c6053e5c12f983363f16c980f2ce2
+EBUILD ordered-set-4.0.1.ebuild 427 BLAKE2B 7ba0ab92891e6e8f1331a5cbd04406a434cd50320113207f739cdef7b9c155f3651d76181e393e761c17480d425f2649382efce1cdb1d6f1ebead3c17ceb07a7 SHA512 ce99a1c547020b9f5528e13a539115492e26533b52b31b31e6edc2d068bab88c2c58f3bbad48acb77a022eaa5867eb0f625f1c56b352bae3a6bc09e63797b3ec
 MISC metadata.xml 254 BLAKE2B 975bbf0379cab76237f5c98a5722b00f260e44a5c216bb096be1d9c4dff854c39b5ade4b1b0e82130b40b7a77172d5cb8a57e62cd7c0d2046a06cdd2483f4c6a SHA512 4ddb51fe1406eb74843b84f306330d4fba63c96c52fd5c9c806418a93dc8d4f2be6310f39a841fa6abf856e277a8f48e32bc5f6cd4d73ee9d608367bf2e8f96e
diff --git a/dev-python/ordered-set/ordered-set-4.0.1.ebuild b/dev-python/ordered-set/ordered-set-4.0.1.ebuild
index 14092ec7338a..a2aa35113fe5 100644
--- a/dev-python/ordered-set/ordered-set-4.0.1.ebuild
+++ b/dev-python/ordered-set/ordered-set-4.0.1.ebuild
@@ -13,6 +13,6 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 
 distutils_enable_tests pytest
diff --git a/dev-python/os-diskconfig-python-novaclient-ext/Manifest b/dev-python/os-diskconfig-python-novaclient-ext/Manifest
index 82f2252c130f..8b7c9bd472ae 100644
--- a/dev-python/os-diskconfig-python-novaclient-ext/Manifest
+++ b/dev-python/os-diskconfig-python-novaclient-ext/Manifest
@@ -1,4 +1,4 @@
 DIST os_diskconfig_python_novaclient_ext-0.1.3.tar.gz 2543 BLAKE2B 07fb502eaa1fa4340c2adff63e5ecbea17292bf7a7c69171507be83b51e9fe65870b0716cdc857d49fe31d01a6522cd265950a7ccf9487599cc19dd0c808ca55 SHA512 4733c4ef720d0fdfabaa26c4288b933ac7d9e4433b20257cfe206399b71154dc6ee98ab621e67aa4c3446df2ec1929edfb9341538d7d4ab69d71576652a9d591
 EBUILD os-diskconfig-python-novaclient-ext-0.1.3.ebuild 625 BLAKE2B 7b465440c09dd957f5e1c65576b37963af23f8f6a55add7ecee5629442a84403f1ce0e3e05b4015ffdc8b442a1e75f8482354e9a6a3353d74236a5dc80ca2e37 SHA512 077eb1265014835165c0afd158b8e9e57a72469546f95cb5de6a68333e3cf51f4ea9755654e81df69ff01f8cab2012a55a06c4b95f52a8c401521c1490155397
 EBUILD os-diskconfig-python-novaclient-ext-9999.ebuild 544 BLAKE2B cd8be386da925fd094d7284ec44d361feca2a6ddc11a9a8c3b30f196e0085f761e2e8030b7c91b9e030c29ed0f10019184940750a26a2cf471a63cf8d09340ea SHA512 448ec68e242ae0defb319eb29639543597c46555cab0be0b7524194766defdbe7f08058d60a7753662292deac8ed1e1216bda0d653884ab66f49652b4dade5d1
-MISC metadata.xml 548 BLAKE2B cb64b77ba8095d687feac35c3b45a15df13ee6c6a5ddc389dc9ddad79d40087f3efa2cf6ece1a75480b2ad55176ee70106fc4548270ae504b9f613bc8501dae3 SHA512 04af40651fbcf6ef3c98b5dfa65a51d05f384ea3c6a51ff20f1c0355f0bc8376f74e17659a98280e2e45650d6c79b2b9f169e8035bb2fa96c4c806c783988616
+MISC metadata.xml 449 BLAKE2B be304cfb7485f5882cec34455cc7d918f7b96495f886c18de6898fc978a73c326d66164501a499d81f85a13546df44e9c1df92dddecc812fe1c4e800fc13754b SHA512 b9eea726f932e84333dec6d86d50ddf2a3030c31e729e25c24226e0a98e34e3f1662c55afa65605b2bb69af40112c781fe3ba41efff040404bef8ae461b4010d
diff --git a/dev-python/os-diskconfig-python-novaclient-ext/metadata.xml b/dev-python/os-diskconfig-python-novaclient-ext/metadata.xml
index e3d562fda91a..23ac45501758 100644
--- a/dev-python/os-diskconfig-python-novaclient-ext/metadata.xml
+++ b/dev-python/os-diskconfig-python-novaclient-ext/metadata.xml
@@ -5,9 +5,6 @@
     <email>prometheanfire@gentoo.org</email>
     <name>Matthew Thode</name>
   </maintainer>
-  <longdescription lang="en">
-    Disk Config extension for python-novaclient
-  </longdescription>
   <upstream>
     <remote-id type="pypi">os_diskconfig_python_novaclient_ext</remote-id>
     <remote-id type="github">rackspace/os_diskconfig_python_novaclient_ext</remote-id>
diff --git a/dev-python/os-service-types/Manifest b/dev-python/os-service-types/Manifest
index d54b750f856b..6b7e2bdd9fa6 100644
--- a/dev-python/os-service-types/Manifest
+++ b/dev-python/os-service-types/Manifest
@@ -1,3 +1,3 @@
 DIST os-service-types-1.7.0.tar.gz 24474 BLAKE2B 8adf1cf29d61cc37d08e7282d5b07312345a59ed94898da71f13702f51d4f3651b18d34cb51789fbc560a10c5dfeb8d760aca0fe25f630c7c00fbfd0fd4072c1 SHA512 d73f826134ce9d26720e027a352d8a91a8a029ac92bbcf0ace022a041f3c0aaea900a4e50fa00027f699a793b53ecc538bad5ec3bd8e2efbbe8b18540322ee57
 EBUILD os-service-types-1.7.0.ebuild 555 BLAKE2B 38fed3a4cb04add0f59a62d8a9cd58a6a1a371c0070825d26a3e3dcd481a671a8053e5466ac7b3a98ec7460fb513a8b2bf62289de6e05437eb7ea52ae602f4f6 SHA512 74f40b1a3fcefc4960c4cce7edc49e755da7534bf46c62a4366cc8fbb3bfc9e6bd7ab42c014685915a394144e6f31af0b292967dcadad047a549f72d4189a633
-MISC metadata.xml 596 BLAKE2B cd24306b859d804610fccde33b67ec4e0e9ac1724449f67af93df2e98e840781d7a077daac575dd9401c03d53148192d3f520b488426d428f803ffe812fd631a SHA512 063efcfb4484e91c21d5b2d0ea66acb2362a791c402bc2f2fe5a7f8bd2401a732dc0859e9be2a87f5eed72454fc87e05eaaa7666a9f99f73b68c35baa1f734ba
+MISC metadata.xml 478 BLAKE2B b2adbb00563c579932cd362f5ff0e4c17c9d510f9210769de52d989ae734b5f4b75613a357ae850bd201dfa5408144b75e3e2a05cdf22cdd0f3e87b5e47b9b1a SHA512 edf558fd97f5eafb164af966a3dc79f7e5bba8f89e925a6cba1c3245b9b053361485fb3937c89c9fee2abb1f55582f65db6cdea97d2c8cb236f2cff62fa9ae64
diff --git a/dev-python/os-service-types/metadata.xml b/dev-python/os-service-types/metadata.xml
index a6ad9a507e8c..c80dfa261dff 100644
--- a/dev-python/os-service-types/metadata.xml
+++ b/dev-python/os-service-types/metadata.xml
@@ -8,9 +8,6 @@
 		<email>prometheanfire@gentoo.org</email>
 		<name>Matthew Thode</name>
 	</maintainer>
-	<longdescription lang="en">
-		Python library for consuming OpenStack sevice-types-authority data
-	</longdescription>
 	<upstream>
 		<remote-id type="github">openstack/os-service-types</remote-id>
 		<remote-id type="pypi">os-service-types</remote-id>
diff --git a/dev-python/os-win/Manifest b/dev-python/os-win/Manifest
index c48d510a2160..331573a60dbe 100644
--- a/dev-python/os-win/Manifest
+++ b/dev-python/os-win/Manifest
@@ -1,3 +1,3 @@
 DIST os-win-4.2.0.tar.gz 214676 BLAKE2B 689417494acd7ddf219b7b29d670ed888dc0649fddb5e0a94b5160b2bec66167c14a315e0daa2f0fa794de96cecb15a054cbc6f4df0c4c8d26abb2367eb06862 SHA512 5f828e5b0b0a178a65959bb69f88c7bf30282b71f458ac36c11ef197dac3e821a2cbfb8be43acbc90d845e247be990ce6618b6dbe60205af8e890c2f7b7d245e
 EBUILD os-win-4.2.0.ebuild 1147 BLAKE2B 4d3adc4ba3384bf76908f3aee30215edeae575dd67da0e34d3d2da2ee9304e77ba048c2e3b36e45fcfa8c38150a181107079998ba46c0816e05a3859f5c4cafb SHA512 069e3aee3752de235b9033c7ede59bed73dbbb5f45b0e67f44bff5787bbea5ee1f82ed7c62dc203df288306959fc07c80fec2a3645a036f3fc0ccbdae1ac5e24
-MISC metadata.xml 480 BLAKE2B b17e3983e5660147a3a55a76948e00dd9e0fc800e442cdf92e4e17a70737740b749a86063f3f644b092df6e0d00d4e9c36d11f6a8ba697f214c08fd79c560008 SHA512 6454d56af0f829cf94cd211f78651a6d611eabebd8a3aaf5cf2cb92aef29107ed6efa5e974b5f9e5f6f53ed29565c1c6ac0448de72a3f21efbf73ecbcad2dd3e
+MISC metadata.xml 379 BLAKE2B 221fd31006c800565bbed8c644064d4ce7a310d462c54c58bbd71675953d08fca725f5e0ce545f99fd96ad6dd0043956c5654b76c13088063ed0a15e59e0d54f SHA512 f52b0f9667e80279be3ee42df1bdaec3c8f9952ebe7b166b2fe7c2bc10017ba29833b50072d9f42bf1950d3c9a2e8e72d476c24aa51b2efe308ad55501df60ed
diff --git a/dev-python/os-win/metadata.xml b/dev-python/os-win/metadata.xml
index 4d5ec9ded55c..c763b6a4b983 100644
--- a/dev-python/os-win/metadata.xml
+++ b/dev-python/os-win/metadata.xml
@@ -1,13 +1,10 @@
-<?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="person">
 		<email>prometheanfire@gentoo.org</email>
 		<name>Matthew Thode</name>
 	</maintainer>
-	<longdescription lang="en">
-		Windows / Hyper-V library for OpenStack projects.
-	</longdescription>
 	<upstream>
 		<remote-id type="github">openstack/os-win</remote-id>
 		<remote-id type="pypi">os-win</remote-id>
diff --git a/dev-python/oslo-privsep/Manifest b/dev-python/oslo-privsep/Manifest
index 7fb28fe2d6bf..bed372e03411 100644
--- a/dev-python/oslo-privsep/Manifest
+++ b/dev-python/oslo-privsep/Manifest
@@ -1,3 +1,3 @@
 DIST oslo.privsep-1.33.3.tar.gz 38774 BLAKE2B f2d2db494e7af1ace672734dad89fcccb9d78d446d646fb25446db2f788bf2b762e85a14e7da6bb0be382289cc1f43b448bf506f8932ede53f87cd4f5e6ade58 SHA512 5a4ef7cc8b04689f544eababb76b4c5070ce9105eaa3f04d80c5976ec1358ce8b6f13fef7f968b4dd2131aff666264be00749f630651b7e39c93aad96a772bbd
 EBUILD oslo-privsep-1.33.3.ebuild 1218 BLAKE2B 2aca81ed3f11cb61d2a0792c79620434ee2abb587a74e23e5511de7e9e51d9f93b80863d6c2af9cfcc35b3fa28622231e81ab42cc1d1c4368cfaf2d713925bac SHA512 837248f3e43aa1bd12a964418446e5ca989e3c56e08237b846c6ae0b4533dfc2e4c1a12b89f7db3b40d9c4994e92ce3e0a876d717143310a3a54d9f72ebde785
-MISC metadata.xml 544 BLAKE2B a76322f18a6f2b32d17934a5d8c747963f5bf647cae027babcc4508c4b15ad6c958baa30399247302aa696dcde2ade3a9ae4552de7c1538d4b0af79b3da2ce69 SHA512 f7f8a7194b5439872af70f9ae742bf8cb6e338b8100e3cddbdea34be89c187c5475d6e0523dac5cc886a85133d18bb8669ef9292228e4351d31122c73561dd30
+MISC metadata.xml 446 BLAKE2B d956bd7abe201b7077a3bdec92a7b3e438d0ff4e8818cbf043d6ee2b5e08575a7614d3bd9125cdad58cf4098c94f7ae0248878fb827519db3e21ba3aed8efb82 SHA512 747f269490ea0517bf3787e29814455c387e6093bd8ff8c644bfbdb4548f6630014400553a99b2460276f142439c2c50cf65a25481766d1623db359b17789a63
diff --git a/dev-python/oslo-privsep/metadata.xml b/dev-python/oslo-privsep/metadata.xml
index 43a2333c4012..9c6ed37ae861 100644
--- a/dev-python/oslo-privsep/metadata.xml
+++ b/dev-python/oslo-privsep/metadata.xml
@@ -9,9 +9,6 @@
     <email>python@gentoo.org</email>
     <name>Python</name>
   </maintainer>
-  <longdescription lang="en">
-    OpenStack library for privilege separation
-  </longdescription>
   <upstream>
     <remote-id type="pypi">oslo.privsep</remote-id>
   </upstream>
diff --git a/dev-python/oslo-rootwrap/Manifest b/dev-python/oslo-rootwrap/Manifest
index c1e3d1e3e7d8..8044d9d7298d 100644
--- a/dev-python/oslo-rootwrap/Manifest
+++ b/dev-python/oslo-rootwrap/Manifest
@@ -1,3 +1,3 @@
 DIST oslo.rootwrap-5.15.2.tar.gz 45566 BLAKE2B 1755a52d1e380a512c50f5314f7a4f249da9e62030abfef531bf973277a98f1f42f1c27a69a4e6e5cf64441e6a7263a3780355da4860461cfafed172ea087946 SHA512 9fc4c4678a25ebecb08026e71ef8da44bf1214f177d5330de8d68cfce8c3d85f4085a9e19f282bc8b498a36d8a7e384cde354a95619a800e3a68aba088df5aad
 EBUILD oslo-rootwrap-5.15.2.ebuild 1662 BLAKE2B 29c4e8045b94a195c475c519abd71fd0c7e228759eaa3851398670d193bfe240fed41b96c54c96b4a4b4bd9bf8d8ca62c284ee84fd54a6d5a5cacc443b411de0 SHA512 29439dd9e4955a7ed36c39f4703df4ba1c6b14fd88c1460909d6c1ca2c3452e4f511e85bae5e5972c92568d245710aa6096c2b044381643f8d61d26f0779798b
-MISC metadata.xml 600 BLAKE2B 93dce16794b8495f34be98af703ca0ba06ff4a2e378805f7f3b08d4805f01ad015a1144124e1ad32eb63e6b5c9a9378aea30a4b82eeab54b1cb9dc95280fc6fd SHA512 ad1012d9f43875065679837f787f6a8087876d4ef1e56d24fcd2aa379c85e628848dcf5fa03e84e5929cdfabc4c1b6e2f7167ac0a508f7f26b6b533405932e10
+MISC metadata.xml 447 BLAKE2B 269a6cfe2dd1188e9dcec7ba15706f0882f87e9590f17d26714d45ab79d3ae4a435f44829025a7930d969370c95f531abc220b1d51a22f691c5526c52344a5a5 SHA512 27644a02386255ee593374059a8196ce401f751d4ce77d57db636f14d26597f7d9146b4cb41ab753e6e3dd3d63c014b61d4519182e41c375e9e65032d60ae7c2
diff --git a/dev-python/oslo-rootwrap/metadata.xml b/dev-python/oslo-rootwrap/metadata.xml
index 1007566efb08..57eaee98758d 100644
--- a/dev-python/oslo-rootwrap/metadata.xml
+++ b/dev-python/oslo-rootwrap/metadata.xml
@@ -9,9 +9,6 @@
     <email>python@gentoo.org</email>
     <name>Python</name>
   </maintainer>
-  <longdescription lang="en">
-    The Oslo Rootwrap allows fine filtering of shell commands to run as root from OpenStack services.
-  </longdescription>
   <upstream>
     <remote-id type="pypi">oslo.rootwrap</remote-id>
   </upstream>
diff --git a/dev-python/oslo-sphinx/Manifest b/dev-python/oslo-sphinx/Manifest
index d070b9b67973..c39e3a950488 100644
--- a/dev-python/oslo-sphinx/Manifest
+++ b/dev-python/oslo-sphinx/Manifest
@@ -1,3 +1,3 @@
 DIST oslosphinx-4.18.0.tar.gz 32046 BLAKE2B b10b13f819cc2f4c3e769c195bc340a74545a4cab2a2e9894e56e4352f5f35c1cdd7f1d40d47c2b7449d30bc77dbadb1feae129f6ff31d54e6227349a0c31e57 SHA512 b736dbf68a3ad8c32ca6d8de72cb79e49ab4b84593c70d0165615de66a8c343ce7094656d3b0be3383453143308a4862f27529b1c9d72920c5418a3f62dbcc46
 EBUILD oslo-sphinx-4.18.0.ebuild 801 BLAKE2B c00cd2258b6fbd91c44a64226a0eb3583744ed46f94cbc8aa45601129dc5ddea28dcb67b408c549642bae44f94976bf7b2342247b4df4c470b13c921eb5e210e SHA512 1e5cace0faa40c16e09adf8c6a3295e2ef761c846b1b4697dea1979429ba016d27b61a15f244b6fa8091d86b1d94a6c7fe556b23a79674848811c7fd8755363c
-MISC metadata.xml 586 BLAKE2B b78b49fc66eaa7ca4a79da676895e28b397359cc8579a3e9b91dca1d933779d3ec7f9153d0789b7f44dd75c8fa8f9d866cd916911a4dfe3bd6d89435a0330960 SHA512 ebd5d188edde4955081fa7cb073daeace8c9580dab828d4fd12f10f27bb562ca7736ec77f816e243a02e808b83dc712ab53f40f70e1865cec014413514ffa000
+MISC metadata.xml 450 BLAKE2B ed2843d297ca834a5c1fa48afe5a0eea2c85c4946c61b3cbe8c41fb28c56c33edfdbb2f092847adefd4f12e5c0501b1ef096561944ab3d67db20e85520e4e3ab SHA512 28dc3e14e04c5a12a3e05450e6fda5d48b94141fe16815fe693c68a5d5f571504d794521befe0cdc7097e274a6cda81ade3198239b48b15e3e33fbd8b92842b0
diff --git a/dev-python/oslo-sphinx/metadata.xml b/dev-python/oslo-sphinx/metadata.xml
index 5f205567f249..992b0a428821 100644
--- a/dev-python/oslo-sphinx/metadata.xml
+++ b/dev-python/oslo-sphinx/metadata.xml
@@ -9,9 +9,6 @@
     <email>openstack@gentoo.org</email>
     <name>Openstack</name>
   </maintainer>
-  <longdescription lang="en">
-    Theme and extension support for Sphinx documentation from the OpenStack project.
-  </longdescription>
   <upstream>
     <remote-id type="pypi">oslosphinx</remote-id>
   </upstream>
diff --git a/dev-python/osprofiler/Manifest b/dev-python/osprofiler/Manifest
index 076113678d28..ef4ad95869bc 100644
--- a/dev-python/osprofiler/Manifest
+++ b/dev-python/osprofiler/Manifest
@@ -1,3 +1,3 @@
 DIST osprofiler-2.6.0.tar.gz 80518 BLAKE2B bc45f9bf3378b75a8c702ab1bf9ba40e9f6d77bba808882c7c504adb4f1c295449ab2cc19d128cdec7ebb3120a3d0c49eb77e1769625bafa216e32b3304c6f1e SHA512 3c911961b3107f28bc7b625738d6afb0098d87b891603d1a41be5cfea2b21eb0a3358f3f2fc5cfa0f9b32287f59d732c4ade8ae3436fe46095fa220b5bfb7a15
 EBUILD osprofiler-2.6.0.ebuild 921 BLAKE2B 2cb4fce4efb47ac2b3e4286bed75282328c915f49781811d23f2300024f37dc24302053f46c3df2c9ee071ff272931b8b34ccbdafdecab5e455e9006c8170d03 SHA512 e6f770eb6053b5e84cf4fde7a4a807caa32d8057506be9989481096b64957dfa588bb3da82e0c1b99727d56624dc2a792c0747275be4f34ae5ee25bf0d55badf
-MISC metadata.xml 564 BLAKE2B 7af0039638bc73eb560dfaee133f1990851111a2f3ab51e270cc5418bce6c044fa0b15355823fd37b54f73b84d2187096a1e29918b1e0fa073138d901654232c SHA512 2a8070a290ebecb271dec1bb576fd361c937191f69390e1477bac368eb6c9b91ddb3c9eb78af9aa4e4f6e3982a8a83f3ad2c8d5675b1278d6e7191aa3bd36589
+MISC metadata.xml 487 BLAKE2B da94dbd7ac99177ce1e967c3e3383dd44f75afae03e5638c7f02663601e4328082a72c1d2bdb2a85ad6829d9ced39d319c513530a3409a7f0315152707df2536 SHA512 cb2b515f507c6c5e4cec191800ca344f273e7fcdc28c61747d3eac8b7903c03bfd6a76f2bf1b2ccf8f2870d0c4525009ffb31cad65c999f5756046ca40f47dbc
diff --git a/dev-python/osprofiler/metadata.xml b/dev-python/osprofiler/metadata.xml
index 6358b4b13b39..06e5479cd1f9 100644
--- a/dev-python/osprofiler/metadata.xml
+++ b/dev-python/osprofiler/metadata.xml
@@ -9,9 +9,6 @@
 		<email>openstack@gentoo.org</email>
 		<name>Openstack</name>
 	</maintainer>
-	<longdescription lang="en">
-	OpenStack Profiler Library
-	</longdescription>
 	<upstream>
 		<remote-id type="pypi">osprofiler</remote-id>
 		<remote-id type="launchpad">osprofiler</remote-id>
diff --git a/dev-python/packaging/Manifest b/dev-python/packaging/Manifest
index 60f8e10fb12a..9c7c7f1b1701 100644
--- a/dev-python/packaging/Manifest
+++ b/dev-python/packaging/Manifest
@@ -1,4 +1,4 @@
 AUX packaging-16.8-distutils.patch 447 BLAKE2B ee667f6aed01fc273092b896acafc676e399a2bf8e68324e1f08d20738863e272a8ab13bac2e40d1216f44296711281a177c1382337d27d439873230aa323ea8 SHA512 080a1af701c81f694beb336e6239661d04932db904cc6c0ea7e9fd2c2d0e9a42ac3690dfd64eee745c12368f222d20d4b2cdd9d578d7a3b7142924f41b1887d3
 DIST packaging-20.4.tar.gz 74402 BLAKE2B 3c667c1605445aec37d264ec3846a1a6678f13a12aecc09a6d16e09ea27041fcd65d23538acef4f6272ab0458ce479c42906b15cb6eddd9c8001b1970c23e4fc SHA512 d53912041a9950efb5d221fc968adc328c2ef1e54ec9806d2158fd6db1b170e37afb05213f5750b10c59927504083ca3781c958caa0c802b1c7c0fe1ac1682a4
-EBUILD packaging-20.4.ebuild 1406 BLAKE2B 9b948feb8a5976aef30817d0545c8e3e6cd551ccb41ce8f5eac1408d8d9f0d87d443a07616746cbde4e16ab48bbec9819d726c2bc891b045f1d4443ed5858e09 SHA512 99f1ac586b369e123fa201ec4c4a0235ffbaf472dcf4159e0b746d61488beffc4da7f899f5b39389f504e3645201994a54a046db306448ae4e475a2e8d1df6b3
+EBUILD packaging-20.4.ebuild 1413 BLAKE2B 624c7d6854a4b3c52ee40c5e4a33335bf581a9ea2907bc0811162faa85681efef3063edaf9442d04efd80c73a61b74ca21d404a9883fa5dd60c642417f5f913e SHA512 2301430ee498e3b2e9a80c42b6857ce8e9ee9cdddc5b0dcc7e54f127aa87e582d89ac4d92eed82b2c04b00356989da41518cdc8f97096004e36a0d1980806944
 MISC metadata.xml 390 BLAKE2B 98afec1f8a7889d12e1a44ef1ff2bf1db635818b7fcb8d86dff0d820fc8fc92920615cd5de63f35cbb6eae6c29f8d6942807f0a7bd48b320c9a0d55a7fa0de69 SHA512 d082f5d387c5d71f0f6cfca4572d4637081daa863186d8b05050738269559617b910c95de97ac3eddd41434cc528e34597125a6973b7b239734c91bb2c588235
diff --git a/dev-python/packaging/packaging-20.4.ebuild b/dev-python/packaging/packaging-20.4.ebuild
index a9225d1e48c6..6aa24ffb81db 100644
--- a/dev-python/packaging/packaging-20.4.ebuild
+++ b/dev-python/packaging/packaging-20.4.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="|| ( Apache-2.0 BSD-2 )"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/pallets-sphinx-themes/Manifest b/dev-python/pallets-sphinx-themes/Manifest
index a1fc838ca6bd..964e46eaa976 100644
--- a/dev-python/pallets-sphinx-themes/Manifest
+++ b/dev-python/pallets-sphinx-themes/Manifest
@@ -1,3 +1,3 @@
 DIST pallets-sphinx-themes-1.1.2.tar.gz 17054 BLAKE2B 2c106be4a8ba68c6c270035ad6764bf87c65a20ca3515991f6287e3bd6a280d3ad0df121c6bad995fe8964425bee4c6ec4d229eef15489c3ae4e4e98eebe4d22 SHA512 0537f1e24b22612720909f1e19f2893b35622411d72298a407cb19318eaf33a0f7c97ee6f69874a172c135b65c9c16726115c1decd6d7a3d6cbda3e1dbdb50fb
-EBUILD pallets-sphinx-themes-1.1.2.ebuild 645 BLAKE2B bf0e30d8ccb8633039ca2970e46739abfa54b0a22f91e324c80def35363c9aa5d04b30b55d443d74bc67961712043c356c1ced17a5bcbc6673a48571e712c924 SHA512 1555dac88f1e9c0d2ddf6b553ad3ad1de5756d02f153064e5121aa209a09ea4b97605b38131b21c9d2bd5188b9e45d55bd70f48934bb13837dee8274d4265998
+EBUILD pallets-sphinx-themes-1.1.2.ebuild 652 BLAKE2B 9cad8db5e2df82cdff536a0393fd06c6baaf142adbd129983c6453662a16c2f1124c78d14425c93160a3f6e969f3aab243483d8b9fc23e6474ef8c38188aa338 SHA512 897564e3b0a76d2b4019ea2a0d3ca07f1d2c3675ca1e661ef7850b93d6030b57905db3dff19f2d3b5ec242e937f041bd140dc7337cbd56c99ad690463c511850
 MISC metadata.xml 324 BLAKE2B 270575fc533cde85d524756cbbe22ce43375a25f5d2b83ec37423b8af4a54fea9c679ebb66433a3c3ee090150201551c8804ff86fefe12636a6e0a83da25f417 SHA512 dd0d1c39fbfdcae041c6cccee7855d5fb6eac3037be3ac79cae0d36122f3ff75ed86c7ad63aee8a5fcebd936cfd2a03bfde52cc009655aebb1f25db77a18e698
diff --git a/dev-python/pallets-sphinx-themes/pallets-sphinx-themes-1.1.2.ebuild b/dev-python/pallets-sphinx-themes/pallets-sphinx-themes-1.1.2.ebuild
index c4e8e8d6f90a..f8ada342641a 100644
--- a/dev-python/pallets-sphinx-themes/pallets-sphinx-themes-1.1.2.ebuild
+++ b/dev-python/pallets-sphinx-themes/pallets-sphinx-themes-1.1.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/pallets/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 RDEPEND="dev-python/jinja[${PYTHON_USEDEP}]
diff --git a/dev-python/pandas/Manifest b/dev-python/pandas/Manifest
index bf7dd83edcd5..36ec657f3468 100644
--- a/dev-python/pandas/Manifest
+++ b/dev-python/pandas/Manifest
@@ -1,7 +1,9 @@
 DIST pandas-1.0.5.tar.gz 5007108 BLAKE2B 6aff9602f8b1642af1dca70c7c596f2978bfef8ca9bc782d55aeeab85d3768289849ccd0150291c33cab3442d38cedada91fb846abaade1b3905098edb06c06e SHA512 bb9e3ed9988f7b878ac6f9d7c6c054b119acfc4b960ae42ea92436979ef2098289123cac32b176753942a1edb3b6bd35c4eaf05112a25fbf8a89078fd76a2646
 DIST pandas-1.1.0.tar.gz 5211071 BLAKE2B 538e7579384dceb29f1761e00181fda4f07556ee15723a127966e47c317babead19b364943808d11f03007d5a48da3b28bf8fd9e5c1f40bb3285604307bff267 SHA512 496344967e6061ed451edfe2057d0b63d7277cdce0e12e2e2ce558aef2c23fa5d85daae239fcf88820196add3a928734f31af2734866da7b0385f363607e2885
 DIST pandas-1.1.1.tar.gz 5213685 BLAKE2B 6604c7def761f8eef4596a9ad6c1afe1f59fdd6181f9cdc9edfa97939a9e668e745ebc0abd8664eda4f864be54740d46e4aa10f32728306b897e397bd6e1f682 SHA512 db93e66956d832da594f04aaa5cb895ea22f66acd0e97ad76f22153f9e872e46845dad5b952b54463ec8ef3e2a73a766eea8d53e980a5508e3a3346429a07999
-EBUILD pandas-1.0.5.ebuild 5703 BLAKE2B 8166d35533d3e445cc1a9cac416ad36e4218b2a7cc3482c158a18d646109752eee9c4f7fcc1f400e36b1021823adc2a4c5b9e8c71d9bed6c582d15cb4c9597e8 SHA512 4f71c014c4903b70971c14c77e1d1b2cc4901ebf941d95d7e62d691f469f28136a3b640ec6b91d7f93c06523cbfe7c262025822767db6b9ca6b0a46f8fdfcd22
-EBUILD pandas-1.1.0.ebuild 5746 BLAKE2B d0819597a8aaf55e162ac7b3667a4b9aa020520c79ab3b5c063a0bb06fafebb10f176fa56c2e3256029e8aa59f1252692da8143a3e25a2e515cdbddd84f552ad SHA512 3ca6b4e8753037479a9dc7d9e912418e3bc56cd55c96f5c85b0d82631aa9dd47c2ba56a9ed0723b4293e4cf426339103bd2bc2d0006e02d9ff537ac9e5a2d79d
-EBUILD pandas-1.1.1.ebuild 5943 BLAKE2B 077adad2e53abed0d99e40ffcaec21b09228d1dd548816f91f53bb9fd1323460d717b7a6ad52e08d7f1c09a42d8fc5a72e77eda66edb8bba2823355e0b81dfa0 SHA512 c2266494fe0c851e911bc7c7bc11ebeb8e8a42aafd79da5fd4d487fb1d27aa7ab28ce97371169708e87389e7f6328a5be28fa49e2dab1a7d37611c8a3caf7693
-MISC metadata.xml 834 BLAKE2B b075b9c90c4f1be265117df2c47ace4c86dad3fec9945b5a483a11048211348ee10e433f378610de4a9b599031914b32992b9fad693b832cf0266b0f171b3e38 SHA512 85ad67a653f4ced5fb9331b778fb2906c253874cf8e522f1b67547ef8e2f49e084e84d9e055aee7e2a57c6e6e4e7f7791a4ce299fac7c74dd6448a94977e8f5e
+DIST pandas-1.1.2.tar.gz 5220166 BLAKE2B 3351bf0e539335b7f13dd6e6590309989c3bd5d36c0fd188808be14a147b828f1a3a14007fc499e2b5f580072b02de8587885629a8ffb1fc70b2577fbd034001 SHA512 a81e9f82b866cc48eaf55c288610b150fe3fa6ba6100c0b13516eb0ce4b569397127b85161e53454d0b2b24f276aa9806baa007a521623aad2345e7b7168cbb5
+EBUILD pandas-1.0.5.ebuild 5707 BLAKE2B f51de871b42925692d18001d4ec66d06570f8006d1695b131f84ae8697775468166317bcbf4d66d7c618f21c6d5ab394c968998302778efd41ac5963de030c92 SHA512 87afde84b724bc221efb829e7b660c38f9f0e88aca3ce9b1737cf204aec9a4795a43e3d3332837cd3937693951b797667918632224fb9ede2c714d6353999f3d
+EBUILD pandas-1.1.0.ebuild 5750 BLAKE2B 6d812e8874b3a2e064285a64bc6e3869702f344b49b5e5955fb4de284b5d84d77ff8c486050874fbfb0f9ae7048c9ae32413d7857ed92b2624b4374584670c3d SHA512 acae3a0f51c032b373083a5fef660f801d106bd1a4f75916b4691ed6f11541b01a29d17f144e33cef43127d5a43eaab3c0d1f2771fe5e3352339a5607c2d8ed7
+EBUILD pandas-1.1.1.ebuild 5947 BLAKE2B 361810b2a9dba5c75e0feede3e5ce93bf9f9485b7a2b038e3dddaf089a776ca31aba0000cfb2607525a1dfb793d583c50aeeac64e0c2f7f57edc9a97fce2db98 SHA512 21fa836ee46caa4fdafa9717d55da3335d2b4b39acce204d59f547cbf32986d79cb35d0097fc914e64cc871ca361b69160b860b7d01bdb3c9dd21d898602b2bd
+EBUILD pandas-1.1.2.ebuild 5947 BLAKE2B 361810b2a9dba5c75e0feede3e5ce93bf9f9485b7a2b038e3dddaf089a776ca31aba0000cfb2607525a1dfb793d583c50aeeac64e0c2f7f57edc9a97fce2db98 SHA512 21fa836ee46caa4fdafa9717d55da3335d2b4b39acce204d59f547cbf32986d79cb35d0097fc914e64cc871ca361b69160b860b7d01bdb3c9dd21d898602b2bd
+MISC metadata.xml 917 BLAKE2B 52ce164457db6dcf39fe8cd3482021ca88bb1d8d35f09adbc189e23f31b098229d2d5381ce2df7e68f996f50dd5b41b8ccb851fe877d5a7c468c8e42d1cc457b SHA512 fdfd49c8327288be612fa5f5a7a230a278d0634b090ac8da1dcc63c732db84dbcd7cb37dee74a9996127c4062bc73a5be1a9f911715166ed6af16758a578e333
diff --git a/dev-python/pandas/metadata.xml b/dev-python/pandas/metadata.xml
index 2afb9b3d5636..b9765738f6c1 100644
--- a/dev-python/pandas/metadata.xml
+++ b/dev-python/pandas/metadata.xml
@@ -5,6 +5,9 @@
     <email>sci@gentoo.org</email>
     <name>Gentoo Science Project</name>
   </maintainer>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+  </maintainer>
   <longdescription lang="en">
   Pandas is a Python package providing fast, flexible, and expressive
   data structures designed to make working with "relational" or
diff --git a/dev-python/pandas/pandas-1.0.5.ebuild b/dev-python/pandas/pandas-1.0.5.ebuild
index 18ac6398c79f..a58806fe2056 100644
--- a/dev-python/pandas/pandas-1.0.5.ebuild
+++ b/dev-python/pandas/pandas-1.0.5.ebuild
@@ -9,7 +9,7 @@ PYTHON_REQ_USE="threads(+)"
 VIRTUALX_REQUIRED="manual"
 DISTUTILS_USE_SETUPTOOLS=rdepend
 
-inherit distutils-r1 eutils flag-o-matic virtualx
+inherit distutils-r1 flag-o-matic optfeature virtualx
 
 DESCRIPTION="Powerful data structures for data analysis and statistics"
 HOMEPAGE="https://pandas.pydata.org/"
diff --git a/dev-python/pandas/pandas-1.1.0.ebuild b/dev-python/pandas/pandas-1.1.0.ebuild
index 51acafe7c742..0497d0641024 100644
--- a/dev-python/pandas/pandas-1.1.0.ebuild
+++ b/dev-python/pandas/pandas-1.1.0.ebuild
@@ -9,7 +9,7 @@ PYTHON_REQ_USE="threads(+)"
 VIRTUALX_REQUIRED="manual"
 DISTUTILS_USE_SETUPTOOLS=rdepend
 
-inherit distutils-r1 eutils flag-o-matic virtualx
+inherit distutils-r1 flag-o-matic optfeature virtualx
 
 DESCRIPTION="Powerful data structures for data analysis and statistics"
 HOMEPAGE="https://pandas.pydata.org/"
diff --git a/dev-python/pandas/pandas-1.1.1.ebuild b/dev-python/pandas/pandas-1.1.1.ebuild
index 92a7859edfd7..de735561e5c8 100644
--- a/dev-python/pandas/pandas-1.1.1.ebuild
+++ b/dev-python/pandas/pandas-1.1.1.ebuild
@@ -9,7 +9,7 @@ PYTHON_REQ_USE="threads(+)"
 VIRTUALX_REQUIRED="manual"
 DISTUTILS_USE_SETUPTOOLS=rdepend
 
-inherit distutils-r1 eutils flag-o-matic multiprocessing virtualx
+inherit distutils-r1 flag-o-matic multiprocessing optfeature virtualx
 
 DESCRIPTION="Powerful data structures for data analysis and statistics"
 HOMEPAGE="https://pandas.pydata.org/"
diff --git a/dev-python/pandas/pandas-1.1.2.ebuild b/dev-python/pandas/pandas-1.1.2.ebuild
new file mode 100644
index 000000000000..de735561e5c8
--- /dev/null
+++ b/dev-python/pandas/pandas-1.1.2.ebuild
@@ -0,0 +1,181 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+PYTHON_REQ_USE="threads(+)"
+
+VIRTUALX_REQUIRED="manual"
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1 flag-o-matic multiprocessing optfeature virtualx
+
+DESCRIPTION="Powerful data structures for data analysis and statistics"
+HOMEPAGE="https://pandas.pydata.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P/_/}.tar.gz"
+S="${WORKDIR}/${P/_/}"
+
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="doc full-support minimal test X"
+RESTRICT="!test? ( test )"
+
+RECOMMENDED_DEPEND="
+	>=dev-python/bottleneck-1.2.1[${PYTHON_USEDEP}]
+	>=dev-python/numexpr-2.1[${PYTHON_USEDEP}]
+"
+
+# TODO: add pandas-gbq to the tree
+OPTIONAL_DEPEND="
+	dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
+	dev-python/blosc[${PYTHON_USEDEP}]
+	|| (
+		dev-python/html5lib[${PYTHON_USEDEP}]
+		dev-python/lxml[${PYTHON_USEDEP}]
+	)
+	dev-python/jinja[${PYTHON_USEDEP}]
+	dev-python/matplotlib[${PYTHON_USEDEP}]
+	|| (
+		dev-python/openpyxl[${PYTHON_USEDEP}]
+		dev-python/xlsxwriter[${PYTHON_USEDEP}]
+	)
+	>=dev-python/pytables-3.2.1[${PYTHON_USEDEP}]
+	dev-python/s3fs[${PYTHON_USEDEP}]
+	dev-python/statsmodels[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/xarray-0.10.8[${PYTHON_USEDEP}]
+	' python3_{6,7})
+	>=dev-python/sqlalchemy-0.8.1[${PYTHON_USEDEP}]
+	>=dev-python/xlrd-1.0.0[${PYTHON_USEDEP}]
+	dev-python/xlwt[${PYTHON_USEDEP}]
+	>=sci-libs/scipy-1.1[${PYTHON_USEDEP}]
+	X? (
+		|| (
+			dev-python/PyQt5[${PYTHON_USEDEP}]
+			x11-misc/xclip
+			x11-misc/xsel
+		)
+	)
+"
+COMMON_DEPEND="
+	>dev-python/numpy-1.15.4[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	dev-python/pytz[${PYTHON_USEDEP}]
+"
+DEPEND="${COMMON_DEPEND}
+	>=dev-python/cython-0.29.20-r1[${PYTHON_USEDEP}]
+	doc? (
+		${VIRTUALX_DEPEND}
+		app-text/pandoc
+		dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
+		dev-python/html5lib[${PYTHON_USEDEP}]
+		dev-python/ipython[${PYTHON_USEDEP}]
+		dev-python/lxml[${PYTHON_USEDEP}]
+		dev-python/matplotlib[${PYTHON_USEDEP}]
+		dev-python/nbsphinx[${PYTHON_USEDEP}]
+		>=dev-python/numpydoc-0.9.1[${PYTHON_USEDEP}]
+		>=dev-python/openpyxl-1.6.1[${PYTHON_USEDEP}]
+		>=dev-python/pytables-3.0.0[${PYTHON_USEDEP}]
+		dev-python/pytz[${PYTHON_USEDEP}]
+		dev-python/rpy[${PYTHON_USEDEP}]
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		dev-python/xlrd[${PYTHON_USEDEP}]
+		dev-python/xlwt[${PYTHON_USEDEP}]
+		sci-libs/scipy[${PYTHON_USEDEP}]
+		x11-misc/xclip
+	)
+	test? (
+		${VIRTUALX_DEPEND}
+		${RECOMMENDED_DEPEND}
+		${OPTIONAL_DEPEND}
+		dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
+		dev-python/hypothesis[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/openpyxl[${PYTHON_USEDEP}]
+		dev-python/pymysql[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+		dev-python/psycopg:2[${PYTHON_USEDEP}]
+		dev-python/xlsxwriter[${PYTHON_USEDEP}]
+		x11-misc/xclip
+		x11-misc/xsel
+	)
+"
+# dev-python/statsmodels invokes a circular dep
+#  hence rm from doc? ( ), again
+RDEPEND="${COMMON_DEPEND}
+	!minimal? ( ${RECOMMENDED_DEPEND} )
+	full-support? ( ${OPTIONAL_DEPEND} )
+"
+
+python_prepare_all() {
+	# Prevent un-needed download during build
+	sed -e "/^              'sphinx.ext.intersphinx',/d" \
+		-i doc/source/conf.py || die
+
+	# requires package installed
+	sed -e 's:test_register_entrypoint:_&:' \
+		-i pandas/tests/plotting/test_backend.py || die
+
+	sed -e '/extra_compile_args =/s:"-Werror"::' \
+		-i setup.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	# To build docs the need be located in $BUILD_DIR,
+	# else PYTHONPATH points to unusable modules.
+	if use doc; then
+		cd "${BUILD_DIR}"/lib || die
+		cp -ar "${S}"/doc . && cd doc || die
+		LANG=C PYTHONPATH=. virtx ${EPYTHON} make.py html
+	fi
+}
+
+src_test() {
+	virtx distutils-r1_src_test
+}
+
+python_test() {
+	local -x LC_ALL=C.UTF-8
+	pushd  "${BUILD_DIR}"/lib > /dev/null || die
+	"${EPYTHON}" -c "import pandas; pandas.show_versions()" || die
+	PYTHONPATH=. pytest pandas -v --skip-slow --skip-network \
+		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")" \
+		-m "not single" || die "Tests failed with ${EPYTHON}"
+	find . '(' -name .pytest_cache -o -name .hypothesis ')' \
+		-exec rm -r {} + || die
+	popd > /dev/null || die
+}
+
+python_install_all() {
+	if use doc; then
+		dodoc -r "${BUILD_DIR}"/lib/doc/build/html
+		einfo "An initial build of docs is absent of references to statsmodels"
+		einfo "due to circular dependency. To have them included, emerge"
+		einfo "statsmodels next and re-emerge pandas with USE doc"
+	fi
+
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	optfeature "accelerating certain types of NaN evaluations, using specialized cython routines to achieve large speedups." dev-python/bottleneck
+	optfeature "accelerating certain numerical operations, using multiple cores as well as smart chunking and caching to achieve large speedups" ">=dev-python/numexpr-2.1"
+	optfeature "needed for pandas.io.html.read_html" dev-python/beautifulsoup:4 dev-python/html5lib dev-python/lxml
+	optfeature "for msgpack compression using blosc" dev-python/blosc
+	optfeature "necessary for Amazon S3 access" dev-python/s3fs
+	optfeature "Template engine for conditional HTML formatting" dev-python/jinja
+	optfeature "Plotting support" dev-python/matplotlib
+	optfeature "Needed for Excel I/O" ">=dev-python/openpyxl-1.6.1" dev-python/xlsxwriter dev-python/xlrd dev-python/xlwt
+	optfeature "necessary for HDF5-based storage" ">=dev-python/pytables-3.2.1"
+	optfeature "R I/O support" dev-python/rpy
+	optfeature "Needed for parts of pandas.stats" dev-python/statsmodels
+	optfeature "SQL database support" ">=dev-python/sqlalchemy-0.8.1"
+	optfeature "miscellaneous statistical functions" sci-libs/scipy
+	optfeature "necessary to use pandas.io.clipboard.read_clipboard support" dev-python/PyQt5 dev-python/pygtk x11-misc/xclip x11-misc/xsel
+}
diff --git a/dev-python/parso/Manifest b/dev-python/parso/Manifest
index 0d600e39d7a8..bc93e9de84cd 100644
--- a/dev-python/parso/Manifest
+++ b/dev-python/parso/Manifest
@@ -3,5 +3,5 @@ DIST parso-0.7.1.tar.gz 399842 BLAKE2B 1e47c1dd6846d01aa5820d7cedc3eafcf12ea0d4a
 DIST parso-0.8.0.tar.gz 392579 BLAKE2B b816a9f54aca54fbb8df772d1f6501d55fccef91d3c9bfcddc9f069e1b5a15dee7742bf37dbfd07f26253247a29a42303c4034608c6c9991c97e55acac77b69d SHA512 fe9d1c46cb128d6af9c45f333e49475da795c1ed67572891f4daf08af620814b9db18469be11f771869e0f44acea9446e1419067e1b72affc1cb669a277d6a2c
 EBUILD parso-0.7.0.ebuild 745 BLAKE2B 46e9ec6bcb841cc3455ddf4d88168eeaa3eb75af8a52b8781390fdff83fbc0cfaebac1256b71d29481bd07250f0e75c7bc7da84c9e09c47c6b204a3f18d0bee2 SHA512 42c314ed631e7a57fcfb3759699d277f6d9821e8ddbc64a7d63e9a0aaafc1e6f6033df4f2de595c2bf7f781ef96eb77eac75b94a419d3f88cb367b58d8f0e95f
 EBUILD parso-0.7.1.ebuild 562 BLAKE2B c94515e599b4fdb6c249910f317fb514726c117c5492ad6bff82cf4ea20d264a63faf53073db078d33d12d7a4ae62f4f53a1944123148bd2c7afbdc086238400 SHA512 5f262af6404fd9256431fbb2c8009aa9a80e0acb139ee8c4d822d6dc8d66a48c21ed675f26ad7e0db7a144f8e37991274030e36739ed763c7e74f1859ce50906
-EBUILD parso-0.8.0.ebuild 552 BLAKE2B 5deb6f54cac8603aae1447e63ce9b7d4d7c7e2ae26f385ce2b90987adfe9f3613c0b4249f51cd88179ccd48f10a40abc46a90d25cf70cde962156d67f7ae0c4e SHA512 660631d957d0fd51b295c4a8831e0cc8735b1259326dd84d84254b7f6c05b16cb4c77ff01f524b88a90da012d748f92174aa67ebf43568d19b72731e92359800
+EBUILD parso-0.8.0.ebuild 548 BLAKE2B 4243ba3804a5ce72bc9597ccbc33160e76ef908c5d327fc4365c26b3a7e516b7561dffe8a3a5db41e76cc5c9304848a9cb16ec2e4bc340ed9b210a3159b63639 SHA512 edfc8aa30585fc2d36e7dd0dd4f96567c7c107dfb737bc64a147a8a8abc6310a94b114a562700df4541df2af710f3e814281a3ad8841873be8e58971c00ef210
 MISC metadata.xml 402 BLAKE2B 3dbbdbbd15ec82aa4f38d92f52f4342a14b209edff3aa09b5dc1866784533e21f8c5d75146e3b9b535c01bb4dd36cd259abb2deb959382866242d99fb5d8fad3 SHA512 61cca7520333f595582f3e52602afa09d685d8072a211c4b8a2930fccbd98645c8c69ef7f687a25c05e2e2dc7ddda2fee16b7666cc2854b0b5ac6e23a95bac42
diff --git a/dev-python/parso/parso-0.8.0.ebuild b/dev-python/parso/parso-0.8.0.ebuild
index e5da1da9a57f..4d79fb3ac091 100644
--- a/dev-python/parso/parso-0.8.0.ebuild
+++ b/dev-python/parso/parso-0.8.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/davidhalter/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc ppc64 x86"
 
 distutils_enable_sphinx docs
 distutils_enable_tests pytest
diff --git a/dev-python/paste/Manifest b/dev-python/paste/Manifest
index 77d187758572..4d0b85b841e8 100644
--- a/dev-python/paste/Manifest
+++ b/dev-python/paste/Manifest
@@ -1,5 +1,7 @@
 DIST Paste-3.4.1.tar.gz 633491 BLAKE2B be599b9385ecad754fc431a936ccd78ee088825c88040986ddd4ccb3ca81342d642a23699ca7ef9338be5360703ce5d5a2d966ff9e405744b286fa3fe69bce41 SHA512 90b6bd33e83fde70691be6206ad1de653603900b88fade79f6960df22bb84c6e82c9b6f4ddc11406f4e206273a2b5591b81ca034f8f42a3e993b85b16d07e3f0
 DIST Paste-3.4.3.tar.gz 630569 BLAKE2B fa81b60ad048a2c999d4e57992f5a5603680bf7505f13a8618a55425b388ef906ceb2e118821d689905a20e7ec2b31d27a6aecd704f529540db6c4436f30268c SHA512 0869a3330a74cc14f88fb5ce24183328ec38fed1fc5cd669b428f09ee2fcafc770e95c2f4dc8de86dfce4d66861bad26c9502cccb81966c519ca4593ada094b1
+DIST Paste-3.4.4.tar.gz 630575 BLAKE2B 1d81efae1e1a783daf2d3fa86eb2e80cb95173a4bb182326c27471e2612b7de047bb3d98c0943aba9600f9888d760f39edd7c93ff4c16fbd4c90f68ebaa0caf6 SHA512 f977fa02b6800be27f703115b87987dcf8a1e4edd681f253b20fb363bfe625109b424ec6a0faba066e1d074f55a2ba336e17654f899b3100c9e3c3252d38b5a6
 EBUILD paste-3.4.1.ebuild 1094 BLAKE2B 42c35e023b4d38e2645cf89004712660142cd5860f2f65d3ee37745662dc7d4d991525a7e15c6d1068b934ad4de5cc73f3e9d1a60bc9e99e5fce64598135540a SHA512 0621ce3e077a240b7fe1f3d16e49c5ffad728502a8c3279fcea1cb53ceaa7a1575034ae41ac65a0a44145714fe9a95396f2c7539151fb9ac13243829724bab78
-EBUILD paste-3.4.3.ebuild 1103 BLAKE2B c5ad50193533d210fac4623a9de9cc8b558116e355feab4a6a495b09e7a757c09d2dce160f3079a1fba8843b1866443692ac5fd1dbcfbc058528b7e3133a79f4 SHA512 8ecf848ad049463f59557961afd799f6094b7a9f00ad765432ed89566af3739a977043ad1cf6f06bb447631ed904f3b08772154b05cf14d392ce930784240aac
+EBUILD paste-3.4.3.ebuild 1094 BLAKE2B 42c35e023b4d38e2645cf89004712660142cd5860f2f65d3ee37745662dc7d4d991525a7e15c6d1068b934ad4de5cc73f3e9d1a60bc9e99e5fce64598135540a SHA512 0621ce3e077a240b7fe1f3d16e49c5ffad728502a8c3279fcea1cb53ceaa7a1575034ae41ac65a0a44145714fe9a95396f2c7539151fb9ac13243829724bab78
+EBUILD paste-3.4.4.ebuild 1103 BLAKE2B c5ad50193533d210fac4623a9de9cc8b558116e355feab4a6a495b09e7a757c09d2dce160f3079a1fba8843b1866443692ac5fd1dbcfbc058528b7e3133a79f4 SHA512 8ecf848ad049463f59557961afd799f6094b7a9f00ad765432ed89566af3739a977043ad1cf6f06bb447631ed904f3b08772154b05cf14d392ce930784240aac
 MISC metadata.xml 627 BLAKE2B 544d8a892fba33e583c08d31ff232d71c71397981b5d51f721545e9d1dae4342b68741d656d8eba8988f57eb9a6990adc2827c4f2f4a7b9262fa2be9bd9740be SHA512 a49e8e5ce28d107c97b02b00e7c0b3c260c780fc4ac7d80ea3e8163cd5a8fb44756470ad2603b0d9db312e5cd36b0039eae61dddc0339618ef0c6ee675f1ef58
diff --git a/dev-python/paste/paste-3.4.3.ebuild b/dev-python/paste/paste-3.4.3.ebuild
index 5bbbe51a411a..5015b7c191bc 100644
--- a/dev-python/paste/paste-3.4.3.ebuild
+++ b/dev-python/paste/paste-3.4.3.ebuild
@@ -16,7 +16,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris"
 
 RDEPEND="dev-python/namespace-paste[${PYTHON_USEDEP}]
 	>=dev-python/six-1.4.0[${PYTHON_USEDEP}]"
diff --git a/dev-python/paste/paste-3.4.4.ebuild b/dev-python/paste/paste-3.4.4.ebuild
new file mode 100644
index 000000000000..5bbbe51a411a
--- /dev/null
+++ b/dev-python/paste/paste-3.4.4.ebuild
@@ -0,0 +1,42 @@
+# 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,7,8,9} pypy3 )
+
+inherit distutils-r1
+
+MY_P="Paste-${PV}"
+DESCRIPTION="Tools for using a Web Server Gateway Interface stack"
+HOMEPAGE="https://pypi.org/project/Paste/"
+SRC_URI="mirror://pypi/${MY_P::1}/${PN^}/${MY_P}.tar.gz"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris"
+
+RDEPEND="dev-python/namespace-paste[${PYTHON_USEDEP}]
+	>=dev-python/six-1.4.0[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
+distutils_enable_sphinx docs
+
+python_prepare_all() {
+	# TODO: 'Address already in use'
+	sed -e 's:test_address_family_v4:_&:' \
+		-i tests/test_httpserver.py || die
+
+	# Remove a test that runs against the paste website.
+	rm -f tests/test_proxy.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	find "${D}" -name '*.pth' -delete || die
+}
diff --git a/dev-python/path-py/Manifest b/dev-python/path-py/Manifest
index 6687a696a461..e82572a71ae5 100644
--- a/dev-python/path-py/Manifest
+++ b/dev-python/path-py/Manifest
@@ -2,5 +2,5 @@ AUX path-py-12.0.2-py38.patch 602 BLAKE2B 5a836612a8fb6e85595973eedcc39720cf59b5
 DIST path-14.0.1.tar.gz 73830 BLAKE2B 7528f90708423802dbb177309b1a608bf8dd6b8b1563fcf3904a805830b1c53b76866ec8055bb8d4afda4adb88209b789aed90a33916e450748866479cad1889 SHA512 195abf3e70f3e82566653c8a1154047a8ab82b98eda09a2ae38ba8989e382fd3225fb5c772b827be54a3eafa696829afda2a0198d1bef7ee369e6dc40b0bf11c
 DIST path-15.0.0.tar.gz 73642 BLAKE2B 186b77b6571dd878a5b64b575289bb5ee549145ccd0c7b858f99c9e3772cf98f2cc7ff5da759e7fa660296abc49c053a388ad95466c51adccce2162c682c6566 SHA512 e41684c576b959e27258f60c0d8b69719c38a5a7a04d9646089aea91227781573368a08f01230dca831732ae687741d22caf52efd9a481378b8d4e77627fe3a5
 EBUILD path-py-14.0.1.ebuild 1416 BLAKE2B 855c9725a45b11734fd99bd03f5b2ecb20ca3a4aaac623380eb6121dd5302f5715b2c4e33d4136780d5b70a0d798597fb2a42d4320f7f39562ebb4eb508af5f9 SHA512 8395bb60da8df801e43581bdcd9a5b247f166e141032ee26e29714079becf7977f8f3ae713a6ff7092ec9d6980d521a6133c9c337f779e87a8313f93530ee037
-EBUILD path-py-15.0.0.ebuild 1255 BLAKE2B 9cda1d2c1757437b7fe2504198427542a49c00b43b7981199ba6fdaa8fe7db5127f529ccfe2cd075bafbf2aed1481cb7ca711f3f52a558525acc826352509981 SHA512 90997341e5b1e20e18dd53d7cfe3c41c0ea60258f80c6fdf32169f26ae313ed31d9638d3f51709e5f55fbf6cd2f20f6c03b30cd8c6fbf3b0df4b9e7cf9615882
+EBUILD path-py-15.0.0.ebuild 1253 BLAKE2B e67759daea90401a8b89abdfdf0434f1a140bc43d6e7b9c448c43c390237c01be3fc097cf5285eb6ba35076b2f1542180c0ff280e44c5becf8f088c91c1575a3 SHA512 dca9e206803c8e3b34d38e05d2fe35b7ec647b0a3ec771adb4fdea67164660f317c949e3f53876a8e66f02c22fff008a69d584e7adfb2de7076eb5a0c9f9ebf8
 MISC metadata.xml 401 BLAKE2B 5a8d84aaf65dc91b75cd7222e333e75f9bd6654ce4f9d55c91a8d28b141c5fc982b8c8a6a0b3b4f1c04fcf05fa56b13725062233961f323383110ace44089da6 SHA512 415b7917fd35598bd39c03ec7ede5e0e13266927b73647a995abb62d56004039aacebaeade95be39a265ef3944c35f3c61145cdb2100e563d8125753547bb729
diff --git a/dev-python/path-py/path-py-15.0.0.ebuild b/dev-python/path-py/path-py-15.0.0.ebuild
index 4779263856c0..13c63b0ca9e1 100644
--- a/dev-python/path-py/path-py-15.0.0.ebuild
+++ b/dev-python/path-py/path-py-15.0.0.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/${MY_P}"
 
 SLOT="0"
 LICENSE="MIT"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	dev-python/appdirs[${PYTHON_USEDEP}]
diff --git a/dev-python/pathspec/Manifest b/dev-python/pathspec/Manifest
index e17adc417e34..3278eb59c04c 100644
--- a/dev-python/pathspec/Manifest
+++ b/dev-python/pathspec/Manifest
@@ -1,3 +1,3 @@
 DIST pathspec-0.8.0.tar.gz 26256 BLAKE2B 3d4f2238c515253d83bfd17a2f3319e38024d4fbb22fb0f078bbcca73d3aff45f246a35752c4039b0d88f204ae49b4467b2d9e3b9134e14a7a171895dac770be SHA512 e0cb1883d11506b3d11963397db98a0fd3411f56df7c3e2ab3ac44116ab53977112bb51d1918591afc48b9c08f9cf997d34beba373aafbfbca2aa8749ffaf6c8
-EBUILD pathspec-0.8.0.ebuild 550 BLAKE2B a55d531c78e12204e966973d227ce30c3cbd7db5369e7c61ebb7fdb47815b4d54a194cc5ec60d1f4d25f8962bf6f8f5f24dedabc04bbbe8870bda6b225fbbb5f SHA512 971624edd8d3332441b24073c4d4d3b57548a269a428be583b948c12000df1b088a5593acfc386a0231bca353d703e7a5e6c86098a20262741140ebeea5b2cf4
+EBUILD pathspec-0.8.0.ebuild 554 BLAKE2B d0e10c970143392d06742308c113c6a6258724abd33baa9f97e59344ba2897a105872d288ac5bbf2f4b4dadbdaffd229e2552a65e3f37459c4bdc9eb3119ef47 SHA512 ffcd4edf0046715e3e3b504eacfc7b89c0f203812484ec19dec350e4d374529d65f8db8f46c3c60475ed6d596fd282da9f304481f61707f29d2d06a1f435dfac
 MISC metadata.xml 421 BLAKE2B 388eb128b62746868b4ceabca9cc533b64ce5d5cfcf5fd70b235b2e3f569148b8de15443dd9f7406ac7a050dcda0e73999f3451ea51f8a7b7ccf979115ddcd32 SHA512 fd54f8bd2c7ef1515c4f4dc936b7de16c8efaa5c81e0ce313c719172d61874455c342b6c4103b5528cc423624d04cd236aa795d5adecdaa106f7f42277e5ccf8
diff --git a/dev-python/pathspec/pathspec-0.8.0.ebuild b/dev-python/pathspec/pathspec-0.8.0.ebuild
index cc0c5aa755e4..65c3fd6463f4 100644
--- a/dev-python/pathspec/pathspec-0.8.0.ebuild
+++ b/dev-python/pathspec/pathspec-0.8.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MPL-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE=""
 
 distutils_enable_tests setup.py
diff --git a/dev-python/paver/Manifest b/dev-python/paver/Manifest
deleted file mode 100644
index 33d4dd7c5fa6..000000000000
--- a/dev-python/paver/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST Paver-1.3.4.tar.gz 446425 BLAKE2B 6ed6014e45d0d54f5323fba7a2aa713f860b6d8a7e6ed2d409f17e02b245b516196cf298602dea98022efc640cb2a94fddec060a396d02807fb872240a3bff3e SHA512 f29d6a67ebae8100f3dc7f7cea06acf5606c4c3691be49a86cd85ff69aecff4441c28e41ce5e1b79050d32946f9bb55b213e68ee966ffc0ae1e0b0bea4871aa7
-EBUILD paver-1.3.4-r1.ebuild 1029 BLAKE2B 663d4cb4f532817a23c6ba8c5c7f4e57cd9a9eef46be191b081055aa7d4745852f3202a8a1611d601d57b8554d82de8099da0a7f1aa21c20e64473829e2f8b31 SHA512 6ccf7466cd5810473498e638e14b3f08af8d66482f8b4f3f2677c398f49ec3dbf626c46dbd26650ed04d5349a40b8feba49e710ce627c46a46d78583850da64b
-MISC metadata.xml 396 BLAKE2B 98b898d09add16cea57b4a09ed9789f019280c41c99e48933d23ddb32c79319526c7d7632c882158281a85810a6c3eb820eea10d7acfc8520253ae4c5673ee10 SHA512 2d2c5596ea93c7a16d517e69c0bc8650b16a0f19280b36be8b4ccf394c31d15234d27c0e52ad4c98ab5b964ed70138fc6a962aa70b337ac1f1fbab411580621d
diff --git a/dev-python/paver/paver-1.3.4-r1.ebuild b/dev-python/paver/paver-1.3.4-r1.ebuild
deleted file mode 100644
index a751a449de0a..000000000000
--- a/dev-python/paver/paver-1.3.4-r1.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=( python{3_6,3_7} )
-
-inherit distutils-r1
-
-MY_PN=${PN/p/P}
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Python-based software project scripting tool along the lines of Make"
-HOMEPAGE="https://pythonhosted.org/Paver/ https://github.com/paver/paver"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 sparc x86 ~x64-macos ~x86-macos"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]"
-
-DEPEND="
-	${RDEPEND}
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-	)"
-
-S="${WORKDIR}/${MY_P}"
-
-python_prepare_all() {
-	# https://github.com/paver/paver/issues/143#issuecomment-103943327
-	find paver/tests -name '*.pyc' -delete || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	nosetests || die "Testing failed with ${EPYTHON}"
-}
diff --git a/dev-python/pbr/Manifest b/dev-python/pbr/Manifest
index 818601205a08..92dc233e8f0c 100644
--- a/dev-python/pbr/Manifest
+++ b/dev-python/pbr/Manifest
@@ -1,3 +1,5 @@
 DIST pbr-5.4.5.tar.gz 120510 BLAKE2B f0f22a25e41820a0848aface6c241e38d8c4500d14ac3c8abf3d3b5f3f2d88680505d43f045589d700e9c07ade1643712274b156832246ca3f2050f44e4cda26 SHA512 b53ca10b7af7e365ff99ecf11942d3f047112d69f7e963716d07bc156077b08d79bb708bb93aae342e5e03c83278507b6990137dc34d0ebc11de53bd57ab3654
+DIST pbr-5.5.0.tar.gz 117967 BLAKE2B cc3f023493150f0687ede07ccadc3abfb4a8dc5e0cdc0f9fd946d3a28fe2cf496683f37f934a5555875b5ac0546a0c0ed99e1bc2f7be53b47ec68d64d27cb78a SHA512 ce187787d5a51700d854790b329274aafd7d4f9e724b1b69b5ea8684cdc58c738274d30fd85bb890671bb77f2c7c88ccb488ea11df7ae9fd0505b4dc29292889
 EBUILD pbr-5.4.5.ebuild 2497 BLAKE2B 1fdfe4a2af6eb1757f279127b6e02dc0bab35c32cbaf74b97145a4a15d15a057eda21ff65e4aff21d05e28d53cdf21e2a345a2c64273c28fbf7ac09601d1b6c0 SHA512 6c94faf041ac2cf9931753a3f2399ac27d52c939d2b151bdae36fb7a2724d2feb807d7e691a8634235fd700071873076a242498c9b22c0d97217e030f371e9df
+EBUILD pbr-5.5.0.ebuild 2321 BLAKE2B 03a2af0cbdca8b229d12fcb00f5b0fc3032e8fe34a718cd1d8122fdf307433d527c6dc64249b30faccc735a39ae70539255c15d1498ee260eb95ca2ab18704e9 SHA512 29dc669ce26a1b739ba1a44466b067fd981bb595d3d9556f793613f64760404c67f94c1a478e5a745ad1675f6f0acc72abc82c181ea21e385270e1e01a72aed2
 MISC metadata.xml 818 BLAKE2B b3ed054273dccfd8cd24f2e86e1505be70445aa45d193d37c30e6f5abcfcab489d59cb6a1e11d54cea70bbbcd152d9a208dc32237058537b99061172f573b868 SHA512 3d21678a6769bea88b901391d5df75882798e49ab5266ab7d5a73282c30793e479ebbe24cbb5b7d35ad19b517996e52243d238632a390f136ff30f77f54436fe
diff --git a/dev-python/pbr/pbr-5.5.0.ebuild b/dev-python/pbr/pbr-5.5.0.ebuild
new file mode 100644
index 000000000000..a738c43b0daf
--- /dev/null
+++ b/dev-python/pbr/pbr-5.5.0.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python2_7 python3_{6..9} pypy3 )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="Inject some useful and sensible default behaviors into setuptools"
+HOMEPAGE="https://github.com/openstack-dev/pbr"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+# git is needed for tests, see https://bugs.launchpad.net/pbr/+bug/1326682 and https://bugs.gentoo.org/show_bug.cgi?id=561038
+# docutils is needed for sphinx exceptions... https://bugs.gentoo.org/show_bug.cgi?id=603848
+# stestr is run as external tool
+BDEPEND="
+	test? (
+		$(python_gen_cond_dep '
+			>=dev-python/wheel-0.32.0[${PYTHON_USEDEP}]
+			>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
+			>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
+			>=dev-python/six-1.12.0[${PYTHON_USEDEP}]
+			dev-python/sphinx[${PYTHON_USEDEP}]
+			>=dev-python/testresources-2.0.0[${PYTHON_USEDEP}]
+			>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
+			>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
+			>=dev-python/virtualenv-20.0.3[${PYTHON_USEDEP}]
+			>=dev-python/stestr-2.1.0
+			dev-vcs/git
+		' -3)
+	)"
+PDEPEND=""
+
+# This normally actually belongs here.
+python_prepare_all() {
+	# TODO: investigate
+	sed -e s':test_console_script_develop:_&:' \
+		-e s':test_console_script_install:_&:' \
+		-i pbr/tests/test_core.py || die
+	# broken on pypy3
+	# https://bugs.launchpad.net/pbr/+bug/1881479
+	sed -e 's:test_generates_c_extensions:_&:' \
+		-i pbr/tests/test_packaging.py || die
+	rm pbr/tests/test_wsgi.py || die "couldn't remove wsgi network tests"
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	if ! python_is_python3; then
+		ewarn "Skipping tests on ${EPYTHON} to unblock circular deps."
+		ewarn "Please run tests manually."
+		return
+	fi
+
+	distutils_install_for_testing
+	local -x PATH=${TEST_DIR}/scripts:${PATH}
+
+	rm -rf .testrepository || die "couldn't remove '.testrepository' under ${EPTYHON}"
+
+	stestr init || die "stestr init failed under ${EPYTHON}"
+	stestr run || die "stestr run failed under ${EPYTHON}"
+}
diff --git a/dev-python/pelican-minify/Manifest b/dev-python/pelican-minify/Manifest
index afa3fe4b4200..5583151b2ad8 100644
--- a/dev-python/pelican-minify/Manifest
+++ b/dev-python/pelican-minify/Manifest
@@ -1,3 +1,3 @@
 DIST pelican-minify-0.9.tar.gz 223517 BLAKE2B 808601e027af7b3970e3fcac08e9f0f656e48fe016a470b4a5b3892a108264e2fff52a9b036861fb9007da263e59c7fcf68867e789f65e20b29278fb8de445a0 SHA512 de28727ed6b39e89461b2d725139b88010def892f3fd23f822a6e84a585b3f93771fdc9ca8f402adc9bb196a0dde03b9d6417317c7e8141d83f0e6460860cd33
 EBUILD pelican-minify-0.9.ebuild 621 BLAKE2B 6076e8c7eeb122135d4d2bd6bc3b951cfb1629511da4f2b6efa7bf8d6140e35151f121b933932be40ff1d3c6f57f1f592458117cae6ac1973b8ad06398450296 SHA512 5c324a17289dd9d4f9fbff151c5a912d3b9848fb28982e2a3490af7857d8253046cc7276ecfdfe31f255b1e52cb10413cffd04b158d1d04b150eb993d23bd692
-MISC metadata.xml 452 BLAKE2B bbe68af4fc0f50adc241fcd2a7c39fd15a2092ce59d1ce84a72e70d3174d44c95fd00342ca6e85b2d7c014a7543dff3bdbc56e11fa70d3f091a60b3e26f797d8 SHA512 838e7d6032dde459c275fc2d6cce3a3c4a86f4766573d2950031f7cacd52d66550961bb834010a56ed9b3a45d0182da3b35e06e71c2e55cdb66fef361035e242
+MISC metadata.xml 333 BLAKE2B 1a681ac99aee289a919b530bb87037df6fe53b044ce14ce3a9da3cec54a73d7fde58cf01f12678f18397d16b56c9e5bf88d289ddec4469e343d7193502124124 SHA512 a73512d246562e6591eb9c8d13759352cede7f0ae978d02c87bd72b1fe2c9b155cc3908e8489b136387bada61f1257d8e0771e01e26d998b51f9ce13c087ec41
diff --git a/dev-python/pelican-minify/metadata.xml b/dev-python/pelican-minify/metadata.xml
index 29e5ec2149b3..3ee70120def4 100644
--- a/dev-python/pelican-minify/metadata.xml
+++ b/dev-python/pelican-minify/metadata.xml
@@ -8,7 +8,4 @@
 		<email>prometheanfire@gentoo.org</email>
 		<name>Matthew Thode</name>
 	</maintainer>
-	<longdescription lang="en">
-		An HTML minification plugin for Pelican, the static site generator.
-	</longdescription>
 </pkgmetadata>
diff --git a/dev-python/pexpect/Manifest b/dev-python/pexpect/Manifest
index 5ee3a50ec02d..be750c1caf17 100644
--- a/dev-python/pexpect/Manifest
+++ b/dev-python/pexpect/Manifest
@@ -1,4 +1,4 @@
 AUX pexpect-4.8.0-sphinx-3.patch 761 BLAKE2B 609849b3587cd5eeada58ba5065111f3d5d38514d525c49682a9554fe5b21c4b5994ad3cc70725c1a73e19daf03c66644a7fa0ac880d87e912620263396df3d9 SHA512 d6cd0c3554c83c0092f46a2254dbe1752773abd76c220e0eeecd4a416f01ec57ecd51f26011e17d03537746d24f913472467d9ac8b569bdc168b6975292b4cab
 DIST pexpect-4.8.0.tar.gz 157037 BLAKE2B 742642bd6b9ec3f6cdfad054d4fd22db56b4a55b746d675c27a8cdf824ea749ec4589e296dffa08778195f3ccd20feb56bc0fd5212984396ea5aa0555c41ca96 SHA512 7447ae2d1e13be422c894a8fd51c5aaa788e37ea7f0c798c88b77afd401fb3631400a637077ccbb83c2e3876b0d0c5e1dbd5fdc9d3739d785b4d5ad7c0192580
-EBUILD pexpect-4.8.0.ebuild 1263 BLAKE2B ea4c0b893f71ede8947e157a1b4b2a4cba7adf00b973e3026d1929a63a5b6526ea92b3ad3fab8b2f0782a0d149f365120f27b28c80b537a884f0579b0f18f6f8 SHA512 a5ee13a3e56daf6eaaaf6d430282d3da5b40cc406ea3a40c839d9c8ee66ca7bcf5e1718a09347c95cc8541cce1b88a0904d107c49991105c3843e38f48635522
+EBUILD pexpect-4.8.0.ebuild 1270 BLAKE2B 7f6c75df697ad0403f4f8967317643ab5cf6a4e897935cf666ed70abbf116612ee5f9c3acfc56b36f5a4880b7f59eca6ce778043c27cce6babb4ca85eab60a56 SHA512 ef27c452064c133de69a32e59f13fcc86e60d942251677201b3ae0e21feca573a5f3bc6343032080db03682ee32402b8679cd99b5532142058fbd05961f72217
 MISC metadata.xml 402 BLAKE2B e6c1f9d8cc5397177b54d7bda059a281267e005b9391e6d18e3b70ec3e6fd09bbdf1d214a105e608e3a43f34f0f6e5d7e924366e33647fdfc7d68283c8749d06 SHA512 bd48e666243651d02523b111ee7d8073ed10b8813765f19c7d17e12b7b84bf58be03a157486fcaa65f34866a983d46885723d944348a0cc16b9bb05cc474ffaa
diff --git a/dev-python/pexpect/pexpect-4.8.0.ebuild b/dev-python/pexpect/pexpect-4.8.0.ebuild
index 4ae04af473c4..c2f4dd7dd9eb 100644
--- a/dev-python/pexpect/pexpect-4.8.0.ebuild
+++ b/dev-python/pexpect/pexpect-4.8.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="doc examples"
 
 RDEPEND=">=dev-python/ptyprocess-0.5[${PYTHON_USEDEP}]"
diff --git a/dev-python/phonenumbers/Manifest b/dev-python/phonenumbers/Manifest
index b8a729cb2435..056cf1f25807 100644
--- a/dev-python/phonenumbers/Manifest
+++ b/dev-python/phonenumbers/Manifest
@@ -1,5 +1,7 @@
 DIST phonenumbers-8.12.6.tar.gz 2249614 BLAKE2B 5dd062cecf424bba0263e92c847161069e998e1b1ee26e273939996dadc1cca302ee4b567f083d58791717633db2ddd6263e625db01639e7fdb61187092f26d2 SHA512 1f79e7bd469861c6100ab4ea88f0b20cb5534e97a8da39f8681b4d201d21d2bbac1948bd49c08c474cb0b129a2c1228f7c5b664dc6033e6f4d2dd79d130897d2
 DIST phonenumbers-8.12.8.tar.gz 2249617 BLAKE2B e02f851774bee9806f01b0359ea4e159c8c890a815edf45f19162dc35972aaa3c84f9e2e19a51ef3efb053d4e307a4d3a31b664a7fffc7c4ffe9a7c6c281ae86 SHA512 0897a5298b5aaee7c0775e12cbe35a6e25b85a1836d8302abc5eee7e327fc559bc06f3130c63ac5aa14207900d1615f3a7cd4137d6561855e4ad38b6e4af220f
+DIST phonenumbers-8.12.9.tar.gz 2250397 BLAKE2B 06b3f8beefe3c1e5cfa4d0f9bb550f40e568692f711513784001e9bad9d3805adc42ba0bdacfa292935239c6bcb47e4723a72da160efde21269308329299fce0 SHA512 0f1de43bd56ca05920721cc9639249bffaa6516f4713fc54b53491e4ffecceb357a26cd9d6126ea9e91eec1bb1fb4bf2003f95f1d62f61ae2f1275e0dca58e29
 EBUILD phonenumbers-8.12.6.ebuild 433 BLAKE2B 05a63352cb4e9522f74d8bedc829b3f01ca7396c2cafd311ccec56a4079539d9c6784abea36076454ddc5fc27911323130cda292240e3f18b5510f085e0c8cfc SHA512 58baa6deb1d024174a2d019e63420ed0a33817234b643530ed9006e62644873540fe8f8dc4e0fec7152fe153e0709db6d8e66b91c216980dacea323f6dcd6f5a
 EBUILD phonenumbers-8.12.8.ebuild 435 BLAKE2B 79b981b633b68fa232f0c431dbf4a180c9d4596931386e69046e2850e6f7aafc05600776af068613cbfd54484ecb2c5a3ee0653afd0338f12a18b43aeb9d6653 SHA512 e3f59e06254641b3ce2d4433ec1b1a74f786d0ae4ffcc1a407e30c8f4ec57f539925fdbaedbdaaf71ff4cecc9bcd95651f3b876affbf9e86c5b99546a122c17a
+EBUILD phonenumbers-8.12.9.ebuild 435 BLAKE2B 79b981b633b68fa232f0c431dbf4a180c9d4596931386e69046e2850e6f7aafc05600776af068613cbfd54484ecb2c5a3ee0653afd0338f12a18b43aeb9d6653 SHA512 e3f59e06254641b3ce2d4433ec1b1a74f786d0ae4ffcc1a407e30c8f4ec57f539925fdbaedbdaaf71ff4cecc9bcd95651f3b876affbf9e86c5b99546a122c17a
 MISC metadata.xml 517 BLAKE2B fbbefd64340f179046eff07f02cfc01416d9c99817d8bd4061aa908eaabf59560e704e40876b5d514389766b26697ee811a1a4ef9ee5a306790156892f45e8d1 SHA512 5246cff049767fba3892ae49499127453cc26806d3eca35de98012c71df29cca4192d104810ea21921a1160e736a2225e3538e829016d9712a0b489be0e5a17b
diff --git a/dev-python/phonenumbers/phonenumbers-8.12.9.ebuild b/dev-python/phonenumbers/phonenumbers-8.12.9.ebuild
new file mode 100644
index 000000000000..4d3183b1591b
--- /dev/null
+++ b/dev-python/phonenumbers/phonenumbers-8.12.9.ebuild
@@ -0,0 +1,20 @@
+# 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 port of Google's libphonenumber"
+HOMEPAGE="https://github.com/daviddrysdale/python-phonenumbers"
+SRC_URI="mirror://pypi/p/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DOCS=(README.md)
+
+distutils_enable_tests setup.py
diff --git a/dev-python/pillow/Manifest b/dev-python/pillow/Manifest
index 0b5c7abb37ac..422c62c77207 100644
--- a/dev-python/pillow/Manifest
+++ b/dev-python/pillow/Manifest
@@ -4,6 +4,6 @@ DIST pillow-7.1.2.tar.gz 38933761 BLAKE2B b1d8cedeb0e8108af3bc5de672bcf812cb2f5e
 DIST pillow-7.2.0.tar.gz 39125407 BLAKE2B f49015922c34473590740c9fa63435f85f9a517b3295abd2e758941b95162cef0fb1fa2a0e6ee0ac86323709ee3af02888f6e029a1905f13698e82c1f38d5d94 SHA512 ac9c7c8f445b3f67f51bea13fad118d1612c45272c26d33bec286f3c2e198912b934378c4bf986b409aaa2a83d92ff176ee4d25f28701d61746c9cb86d0f412b
 EBUILD pillow-6.2.2.ebuild 2648 BLAKE2B 759c37375cc6e360927e58a039a3d10f4b36e177553e05993cf685ec001015d956599c1a8fd6d94cce86522cfe0f8016b0fc7c9e35b90f42ab35d6c902a1609a SHA512 ad0aafc5257de131825fffe2aa8f18be67207ab7282f27a9b443f7db457e9a4f913fc5d4ee71f5ea141b96c5250e9479f85ec36de3f6cab0593935a1ce7ccf98
 EBUILD pillow-7.0.0.ebuild 2638 BLAKE2B bc13ea32fd5b0a25aad6c976bc4776ebadddd6fd778126e0995391e684bab49aac9c8681face6a2ff9663203d820de77a9c18b895ab6ccf48862ad153cc01225 SHA512 a709259b589008d5e745b6011b10f503db7664fd9e52b858e3c45ef91e428b531bf461da9962a2807a5c0058980cbb7b70e0a22b84aa624ecf9690075c202ff0
-EBUILD pillow-7.1.2.ebuild 2691 BLAKE2B 942d0ce65a6668f64fe150a0e45d41697a3b7cefab69c0accd2e431afd554a45d8aa79aab8c021af29b240ea6c48e075ddcbd06fddea43b54f63583d05727816 SHA512 b660e43ba44341ac0af2e99d2416348a1f85373a5f45b5bc4b87a99f83bb2029858c41e31236fedc56c601032bce1e9c62efb64f5b1b750c5bc818b89871a821
-EBUILD pillow-7.2.0.ebuild 2697 BLAKE2B bf8f2ad857e8861f9c16f634b2152cd09d3ad5267a91b35fdab56c53cafbab22dd30ba23270c075cf3fd29d8987a246483e6a07006aeeb8666e57a7faf662cd4 SHA512 5e308b832863c2db20bb2eaf4f999afdea3857f0ecda813f3b115c5199cda526ae0a62beb46cd03b22e4253569d4faa86d26fc25ec4264fa84abc906f3806ba1
+EBUILD pillow-7.1.2.ebuild 2690 BLAKE2B 7ece3327d28947075bd36ce820d41d41a2a0683dd185cc0c8b4f6f7e11bd6a6640f3aa806e2cedf38a0cd3a9c5a07cbfa881d95e366647ba4b20ae97633186c2 SHA512 e5fb28570426a7bbb5a5ede26d5695233179e5f9db3532f804186805e19604edda3d7c343a1be261cf7f798902f20fbe087abfa5c0a35ffe67b50b9acb6def7e
+EBUILD pillow-7.2.0.ebuild 2695 BLAKE2B 1b4ee46ff5821a68079e43b2645f40a7f86e964b5875b5dbb10a232be9f55901be1efada636d0383930dd5fc76a0ad1f12e8af090e981b7e036a3393d7e48632 SHA512 1de60e1ed6de3d9945ce4c6d8ce0e7f04669c76133f564dc0a58914124be6c644dd09fb80cc6589e67dead064e109a9675366bb58ad63529bf312ed878675864
 MISC metadata.xml 479 BLAKE2B 8573c3f71b8e0d548f50dcb630a7c36d773ca8bb80f210bec320dc85bf12b70e9f30068dea615925c401726f0a5430827baa0104300abfd85060b522065c8d37 SHA512 473a9aea70516087faba8abddcd02bb76cb62711a5446fc5c58cedc0f0beb70cdef32e928ec293698b524d2e49440be2328567f84efeea4333477b7b9bd7a7d2
diff --git a/dev-python/pillow/pillow-7.1.2.ebuild b/dev-python/pillow/pillow-7.1.2.ebuild
index 06dd83d419de..cc3a9df249e4 100644
--- a/dev-python/pillow/pillow-7.1.2.ebuild
+++ b/dev-python/pillow/pillow-7.1.2.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="HPND"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="examples imagequant jpeg jpeg2k lcms test tiff tk truetype webp xcb zlib"
 REQUIRED_USE="test? ( jpeg tiff )"
 RESTRICT="!test? ( test )"
diff --git a/dev-python/pillow/pillow-7.2.0.ebuild b/dev-python/pillow/pillow-7.2.0.ebuild
index 7f1a3bd72f1b..1ace1e74cac3 100644
--- a/dev-python/pillow/pillow-7.2.0.ebuild
+++ b/dev-python/pillow/pillow-7.2.0.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="HPND"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="examples imagequant jpeg jpeg2k lcms test tiff tk truetype webp xcb zlib"
 REQUIRED_USE="test? ( jpeg tiff )"
 RESTRICT="!test? ( test )"
diff --git a/dev-python/pip/Manifest b/dev-python/pip/Manifest
index 7656342b5861..0219bd053fea 100644
--- a/dev-python/pip/Manifest
+++ b/dev-python/pip/Manifest
@@ -5,9 +5,11 @@ AUX pip-20.2-no-coverage.patch 6154 BLAKE2B 743dcacd3107d9c6447197dd01bc85b1b16d
 DIST pip-20.0.2.tar.gz 6445047 BLAKE2B 8f6e0a8908cf594c8d51818942b0839f59a495697a95dcc0347235e90cbe6d7f035f155761e7da9cfca1ba08b2c5a2c5def52c60c381f5428ef48efd1b6b5131 SHA512 f9965944ca0f319d01db1638ce97cf64772afff1778b3b1271155de73208cfcb3954d89a469c1143c0bf3288a53d4446165a49df994374b16ac6f7ffdae85857
 DIST pip-20.1.1.tar.gz 6503229 BLAKE2B 5b0409042c970ec47fa6f947b21a53aca43563a6bb442fd5f91788fa97caf7167a84b4f581de87453eb0e55657d2ccd11dca2d1815c3bfe9ef5923994306a6db SHA512 ee7b0345c08fbe0215811d07b4c57c1ceece826871842f6d1c174d82e8eee0ad810aa5413d6763ecd5a513e151792a53c36623ab99d2049555ef2542d32d1658
 DIST pip-20.2.2.tar.gz 8719081 BLAKE2B 642a8e9b2f7c3dc08b7e8f7874b7d1d988622f50b9430939060c3b9c086ae7bdaf4a58e9709376e0d36411fb2b492d4e44ddb6282f1fe12d7c8b9ecfdb1c0482 SHA512 0b000977f169900eebd4afeabfc7bd59b104246bbb048ce5b4db7f701e20ef1caef22c7ca2311843eafc4a37abbb81a74beddddf655eeaf2e33e3949d5a811e6
+DIST pip-20.2.3.tar.gz 8719284 BLAKE2B 280637627750302b11828f066b949df7a8d38c6fbdb7532a41eed0d4bd5b83a24ec717e9f57ebcf9d246a0c5aeb272bdaefc9299926dfe308ce20b84e82d81c2 SHA512 b2f7c6b2d5b0c3d743fa8b1061196f8cedf7f106e0cb87507070f1d930d1f1c8a875c800b2d1f7be5b9cada1ba6d3e5b2d7e2f3bdd42e43fd5147536ec1bdf48
 DIST setuptools-44.0.0-py2.py3-none-any.whl 583230 BLAKE2B 823e6792471660f247e30a938aa869d345a63db7294e5f9b4bd88f15a7694779011d29740fe317149620985f705fc6e18cbb07a18e5680cc11d7c229ffbc74f6 SHA512 7006fd303181afbeeec0e30cafb9fd1e4d3c6f55cfdd6343fedbc32b17dbb96b3d96ae37f4db27bfb168738727474cf425904ec280ff1d2b789fc48077a8fa84
 DIST wheel-0.34.2-py2.py3-none-any.whl 26502 BLAKE2B 3a1bd4571c582245b60ff33c9bf74ff8a2ebafb26e56fc7b9bd215058d059b6bd13bbe21ce46002af257813a54126f27e19253f211e21c4548c7cf84cd15caf7 SHA512 4f1a44f4691ed8baad777d7874f7f4da96a5019eb485fd3a9eed9259aa2a9d5acccc6dc63a72128664347c64ee039a6076c6ca9c3b75a1f94457967864e522ed
 EBUILD pip-20.0.2.ebuild 4027 BLAKE2B 2694a675757d8f34c8d0188021c6fe16e9f5574954fd17665158ea53f0f7ebd03cbbaf5d9773d31433b06e2cb9dd8e0549b4e4bd1f120f36c6eaa6e16d2991d7 SHA512 b83221a980e5ba8b7451dd00bc610827b4541dd0549096d5c70adb5cebe1aadab77b362583e62cbe427a174e67819c88762d3a3467e198f3b500649c0824fdb5
-EBUILD pip-20.1.1.ebuild 4154 BLAKE2B d3779d260da376b29f09d37150ed34a50e771332ed7044255f918713d203c4ff9c6ffcde71051e9f8c87f2a75111e5700ef09070abbfe10b6d98a1ded0118abb SHA512 8bf788208e7bfd044c4b362ed29b65da300b9996694e33dd9bb6146fc686b5de3a1df14abfdffc70dbe36f8c60e74de1f4d58f6be9245446f08a7ef09ab86dce
-EBUILD pip-20.2.2.ebuild 4229 BLAKE2B c5b6a4071e909aa5eed3316624bf8d3f0cd41d57aaa622228ddcc0fa06ff781a8f0aec860e995e2bca855d0072c000114794d00fcbcdb4a79ed11af7198d9005 SHA512 81337ccec86e9ca492e77e2676d03ad3e8d2325b6a30ff49d24ed52ad2c9c88b96b12f740bbd6b531681361518e257ed4bfd487703cd46269ea93a9151422712
+EBUILD pip-20.1.1.ebuild 4152 BLAKE2B c8cf629ffcdb751c355899818a708ca3744fa851ffd08d71de389c8d1473cffb3939d69f55277dbed14738a0bcbd069522cf91e92ca1376d1c61ab7a0da235f1 SHA512 933a2f64acc19e2158e263104fb0bcddae69b3d084967d1feb0e2d4a5f7de7a97ff4769c82571f1bb36781102b77401bc7628e253a5cc8353d6bfee0f7b2180a
+EBUILD pip-20.2.2.ebuild 4236 BLAKE2B 8763b760eaa9ca163a32a66b7dcfd85e1aae8ecb4a1dd742f438f1ff6e27d9bf313d9cca92dbf8d2463765ee4f651dd84fae8eadab3eae3945524e8039e12edd SHA512 6ec0569bc7c9f04c4341a9b01cf68ca98dcc503afe02c605a7e2a9b64eb1b8eecea7992422c76cb3432cd080fdeffbe7e823bdf25366fc56db4a3ab8a4ecdfd8
+EBUILD pip-20.2.3.ebuild 4236 BLAKE2B 8763b760eaa9ca163a32a66b7dcfd85e1aae8ecb4a1dd742f438f1ff6e27d9bf313d9cca92dbf8d2463765ee4f651dd84fae8eadab3eae3945524e8039e12edd SHA512 6ec0569bc7c9f04c4341a9b01cf68ca98dcc503afe02c605a7e2a9b64eb1b8eecea7992422c76cb3432cd080fdeffbe7e823bdf25366fc56db4a3ab8a4ecdfd8
 MISC metadata.xml 391 BLAKE2B d8537d1b2f8886d7c30dad3975568e0198a04f16a7ced44f3682f1b865e25f0b7552a640955dd915b2f059eec78eb3f920a0bea0f5f1503f366731a5d20a96c2 SHA512 27ee4b430cd0175c9eecc279765fd617ce5ab55d36932879a0710c2eb66ac2de449de303b1b70fc0ce925666c87008814d64e62d904fc3b9f800380c53478e69
diff --git a/dev-python/pip/pip-20.1.1.ebuild b/dev-python/pip/pip-20.1.1.ebuild
index 4366b9350805..ab0a570b64c3 100644
--- a/dev-python/pip/pip-20.1.1.ebuild
+++ b/dev-python/pip/pip-20.1.1.ebuild
@@ -25,7 +25,7 @@ SRC_URI="
 # setuptools & wheel .whl files are required for testing, exact version is not very important.
 
 LICENSE="MIT"
-KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~ppc ~ppc64 sparc x86"
+KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86"
 SLOT="0"
 IUSE="test -vanilla"
 
diff --git a/dev-python/pip/pip-20.2.2.ebuild b/dev-python/pip/pip-20.2.2.ebuild
index 8da2d952643e..c9f558ef467e 100644
--- a/dev-python/pip/pip-20.2.2.ebuild
+++ b/dev-python/pip/pip-20.2.2.ebuild
@@ -25,7 +25,7 @@ SRC_URI="
 # setuptools & wheel .whl files are required for testing, exact version is not very important.
 
 LICENSE="MIT"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
 SLOT="0"
 IUSE="test -vanilla"
 
diff --git a/dev-python/pip/pip-20.2.3.ebuild b/dev-python/pip/pip-20.2.3.ebuild
new file mode 100644
index 000000000000..c9f558ef467e
--- /dev/null
+++ b/dev-python/pip/pip-20.2.3.ebuild
@@ -0,0 +1,145 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python2_7 python3_{6,7,8,9} pypy3 )
+PYTHON_REQ_USE="ssl(+),threads(+)"
+
+inherit bash-completion-r1 distutils-r1 multiprocessing
+
+SETUPTOOLS_PV="44.0.0"
+WHEEL_PV="0.34.2"
+
+DESCRIPTION="Installs python packages -- replacement for easy_install"
+HOMEPAGE="https://pip.pypa.io/ https://pypi.org/project/pip/ https://github.com/pypa/pip/"
+SRC_URI="
+	https://github.com/pypa/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
+	test? (
+		https://files.pythonhosted.org/packages/py2.py3/s/setuptools/setuptools-${SETUPTOOLS_PV}-py2.py3-none-any.whl
+		https://files.pythonhosted.org/packages/py2.py3/w/wheel/wheel-${WHEEL_PV}-py2.py3-none-any.whl
+	)
+"
+# PyPI archive does not have tests, so we need to download from GitHub.
+# setuptools & wheel .whl files are required for testing, exact version is not very important.
+
+LICENSE="MIT"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+SLOT="0"
+IUSE="test -vanilla"
+
+# disable-system-install patch breaks tests
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-python/setuptools-39.2.0[${PYTHON_USEDEP}]
+"
+DEPEND="
+	${RDEPEND}
+	test? (
+		dev-python/cryptography[${PYTHON_USEDEP}]
+		dev-python/csv23[${PYTHON_USEDEP}]
+		dev-python/freezegun[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pretend[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+		dev-python/scripttest[${PYTHON_USEDEP}]
+		<dev-python/virtualenv-20[${PYTHON_USEDEP}]
+		dev-python/werkzeug[${PYTHON_USEDEP}]
+		dev-python/wheel[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep 'dev-python/enum34[${PYTHON_USEDEP}]' -2)
+	)
+"
+
+python_prepare_all() {
+	local PATCHES=(
+		"${FILESDIR}/${PN}-19.3-disable-version-check.patch"
+		"${FILESDIR}/${PN}-20.2-no-coverage.patch"
+	)
+	if ! use vanilla; then
+		PATCHES+=( "${FILESDIR}/pip-20.0.2-disable-system-install.patch" )
+	fi
+
+	# TODO
+	rm tests/functional/test_new_resolver_user.py || die
+
+	distutils-r1_python_prepare_all
+
+	if use test; then
+		mkdir tests/data/common_wheels/ || die
+		cp "${DISTDIR}"/setuptools-${SETUPTOOLS_PV}-py2.py3-none-any.whl \
+			tests/data/common_wheels/ || die
+
+		cp "${DISTDIR}"/wheel-${WHEEL_PV}-py2.py3-none-any.whl \
+			tests/data/common_wheels/ || die
+	fi
+}
+
+python_test() {
+	if [[ ${EPYTHON} == pypy* ]]; then
+		ewarn "Skipping tests on ${EPYTHON} since they are very broken"
+		return 0
+	fi
+
+	local -a exclude_tests
+
+	# these will be built in to an expression passed to pytest to exclude
+	exclude_tests=(
+		git
+		svn
+		bazaar
+		mercurial
+		version_check
+		uninstall_non_local_distutils
+		pep518_uses_build_env
+		install_package_with_root
+		install_editable_with_prefix
+		install_user_wheel
+		install_from_current_directory_into_usersite
+		uninstall_editable_from_usersite
+		uninstall_from_usersite_with_dist_in_global_site
+		build_env_isolation
+		user_config_accepted
+	)
+
+	distutils_install_for_testing
+
+	# generate the expression to exclude failing tests
+	local exclude_expr
+	printf -v exclude_expr "or %s " "${exclude_tests[@]}" || die
+	exclude_expr="not (${exclude_expr#or })" || die
+
+	local -x GENTOO_PIP_TESTING=1 \
+		PATH="${TEST_DIR}/scripts:${PATH}" \
+		PYTHONPATH="${TEST_DIR}/lib:${BUILD_DIR}/lib"
+
+	pytest -vv \
+		-k "${exclude_expr}" \
+		-m "not network" \
+		|| die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	# Prevent dbus auto-launch
+	# https://bugs.gentoo.org/692178
+	export DBUS_SESSION_BUS_ADDRESS="disabled:"
+
+	local DOCS=( AUTHORS.txt docs/html/**/*.rst )
+	distutils-r1_python_install_all
+
+	COMPLETION="${T}"/completion.tmp
+
+	# 'pip completion' command embeds full $0 into completion script, which confuses
+	# 'complete' and causes QA warning when running as "${PYTHON} -m pip".
+	# This trick sets correct $0 while still calling just installed pip.
+	local pipcmd='import sys; sys.argv[0] = "pip"; import pip.__main__; sys.exit(pip.__main__._main())'
+
+	${PYTHON} -c "${pipcmd}" completion --bash > "${COMPLETION}" || die
+	newbashcomp "${COMPLETION}" ${PN}
+
+	${PYTHON} -c "${pipcmd}" completion --zsh > "${COMPLETION}" || die
+	insinto /usr/share/zsh/site-functions
+	newins "${COMPLETION}" _pip
+}
diff --git a/dev-python/pluggy/Manifest b/dev-python/pluggy/Manifest
index 6dd26c07311e..353adcc89039 100644
--- a/dev-python/pluggy/Manifest
+++ b/dev-python/pluggy/Manifest
@@ -2,5 +2,5 @@ AUX pluggy-0.12.0-strip-setuptools_scm.patch 1186 BLAKE2B 443f5af807826baaca7e95
 DIST pluggy-0.11.0.tar.gz 56897 BLAKE2B 2d40ca953fa0ead7516dd81007ef6f1f88b0ebe45512b031fda9ed69c953bca08109f157676ba2ed545ffb1f8f7bb18fa1b8532635d6fc929c62bf0b5de45128 SHA512 8808f5015fa6f33fcb07047c644706bf3acceed1e107dd617395e61aa9765a45e3a641e49c610ab817ebaa2c4f3b32a15bf347579206e979fe6b844ba2f684b5
 DIST pluggy-0.13.1.tar.gz 57962 BLAKE2B aa0a3eec06c988a727bc15511313f12a08bde65da55bcc5e7547a654e3ca8a34c12dfa72166b6a37b524972730f08454b6a0446e071d2710396e868ae3a77151 SHA512 eb747ff341cedacbd90eb20e22ad3d1ddf5588056f14d069f56331f4141a15b7eccaee23ea196d2f4906964ddb77a79b156bbf3ef8c8083e9952c55d13d55f3e
 EBUILD pluggy-0.11.0.ebuild 849 BLAKE2B ccf14580737128928dc9bb67d0bee729829e40da6d629ee35605d11664b2df6e55ac933da779c385821342f8ebc76319b2a01371ddf0502346d839400c9aee36 SHA512 3d20936b6a60e9a834448c9714615378dabfa6634538778d0f609a54eae1273041d9ff27cb27579933968561a05b30df1fb41a72028e3f9711dac5d02c5f2694
-EBUILD pluggy-0.13.1.ebuild 732 BLAKE2B 6ed2aa59edb374605500fbfbe64dc7d2fcedd88afd63d357a4611bbb784b64a0b10e9eec23ac845fca54aecacc84367a4a9cc0559064f223cc16d5aeb875c547 SHA512 925b658a1a29443f7dc9c44355e2de0291217124d35074ac5220eeb8221629dafc54fc03e8c252845b9fd83f86278bc5f7940352402cddeba1cebc7f26c558aa
+EBUILD pluggy-0.13.1.ebuild 739 BLAKE2B c9da3f3b5a60cf963185c792a2cc71c9129084236ef24e5700548a04df3addde3956f5a380b7a03cfd3eada898a3245b113d66590cfcf56f40859c81f957285d SHA512 441389264c8b5e7a4227978db1d7b4bb943c9b70f8b504f0ea3a9d1a25b7350b164692b13399927d4f352d9192b64df18e9f247ba13462f5a7105b6c89f64cef
 MISC metadata.xml 444 BLAKE2B 9b0b62a0670449bdfade395d9766e192088182f724deebd2a2ace8800ac5c0ff6f37da7174186434f727aa3bee08b9416e6dafae443cd01e01baaae741c899cb SHA512 2ecb5fb612627c44f3499080fcde9241daf2f25a974a8e24fe8190b7d5f8baa6a457b7a902e788f98fe9ed1fdb2cd0f46770337e8f836e430b0aa6f0d323ad50
diff --git a/dev-python/pluggy/pluggy-0.13.1.ebuild b/dev-python/pluggy/pluggy-0.13.1.ebuild
index 4efc417a5ce3..fc9042f61d5e 100644
--- a/dev-python/pluggy/pluggy-0.13.1.ebuild
+++ b/dev-python/pluggy/pluggy-0.13.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="$(python_gen_cond_dep \
 	'dev-python/importlib_metadata[${PYTHON_USEDEP}]' -2 python3_{5,6,7} pypy3)"
diff --git a/dev-python/ply/Manifest b/dev-python/ply/Manifest
index eb909dde7493..520f68142bb2 100644
--- a/dev-python/ply/Manifest
+++ b/dev-python/ply/Manifest
@@ -1,4 +1,4 @@
 AUX 3.6-picklefile-IOError.patch 681 BLAKE2B 2aacef3639c9ec920d6cfc5e56ead129234d54019757a4c816c48c563789e119e6148ed409e5432ccdd763b62ad83c1359b63faf8432326ef8ebf4c93fa564c3 SHA512 6dce69df1cc538ff9787cb70617437ac36972b68a998922123bd4f0529dd6f155befe4104741e704e7e8a1ed8822f2e99580867bbc894fc57896aad4130c317b
 DIST ply-3.11.tar.gz 159130 BLAKE2B 58c50b9dad445ad83a64aaa8174ed4602b36f5c8df33a7d62590a92388c4a21c9800599c1d4e4db6f02630e8dee4c8482611e26498e4aa8ccdb2cf3453ae1db4 SHA512 37e39a4f930874933223be58a3da7f259e155b75135f1edd47069b3b40e5e96af883ebf1c8a1bbd32f914a9e92cfc12e29fec05cf61b518f46c1d37421b20008
-EBUILD ply-3.11.ebuild 1075 BLAKE2B 3d114b01cce585e443e7c7c2366afbb8cff3961be0bb6fc9403ebeb1785b713f0b2585b0653298c5d08b138ba52506715a5c668afe3c6dd57cf186911568796f SHA512 6b914015bc96ebaa4582f87b51c15014a24154b1cad007a2ab528ce919e8c2ac819474773ede0a8f1d490d69c0f33b64bd68810ed94182a54c3a75ebab18899e
+EBUILD ply-3.11.ebuild 1082 BLAKE2B 8c1b0b4c1fe710e8d12748d4313483020f6e6a647162e9885b596d66d18e02f1d457ba54be9db6588e0764e283ecfa70164cb8aa6c91f5f65f00ae362fa94907 SHA512 757e9e7e47151af5d44fdad9d4775fcfed34950b75dd4016f4a162b7198b182ca79904b96f059fcf2c13e24a7eb359096962f961a02bfdef9018e0ada5dbaf63
 MISC metadata.xml 1418 BLAKE2B df2c9fa5b1d9a0b7779fd72b390d4509f83e1ca4c49f3d64dd2c0b440d2f583c0b936535eb2c15bf323e649cacb4f1bd72bea797bd51afaf611fd8fa6490ae78 SHA512 92a5a470227858726239f537b3d8559e29d589a8aca0f1d43b8a1ee3ec00470117efb45275b5bfc0ab6d0678863db50aadd36aec326978e7a3e858c0b0be41dc
diff --git a/dev-python/ply/ply-3.11.ebuild b/dev-python/ply/ply-3.11.ebuild
index 6596c5673904..464e6b1233c2 100644
--- a/dev-python/ply/ply-3.11.ebuild
+++ b/dev-python/ply/ply-3.11.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="examples"
 
 DOCS=( ANNOUNCE CHANGES TODO )
diff --git a/dev-python/plyvel/Manifest b/dev-python/plyvel/Manifest
index b571a0ba39d0..e42a4ef8e523 100644
--- a/dev-python/plyvel/Manifest
+++ b/dev-python/plyvel/Manifest
@@ -1,3 +1,3 @@
 DIST plyvel-1.2.0.tar.gz 145528 BLAKE2B 3a1604b536e462b3eccb7c8294c607828b8f41f3ead65c74fd200d3bb4179765d63f57508cb3bfaee1c4c57ecda7b986afe9416714ae74ed9ad35a9247397c98 SHA512 00b3424e248d1ed17f6443c9862c9f35c94ad76707df5adfe625d7a387620252ff71b3e1f7e903dda1c5cfcd53cb23883c1049e31df541dfe566b8e849c0a96d
-EBUILD plyvel-1.2.0.ebuild 802 BLAKE2B f11c33eaa8b281ae75912588cb2b8f1b604fd529d0ea816727194dedeae25b3a854d223a8dca208c6d91c54f23a9d4bb89ffa48acb43055abb79736675b25c29 SHA512 7cd3752acd7829e392986fe60824110d2d891279f6d023d552ffa26b396b0ed2b74efe52cd5549e54439aaf79c00db08fa8effa88d49b3de257031559734d6c8
+EBUILD plyvel-1.2.0.ebuild 805 BLAKE2B abf8640c1d3a845eec15a47ee9efd851b2c9329f58ed18be83c2f290c5420750f7303b2a305a628fa66e30a1cb633cee09ff6ac64381425abd564ed6b4288f1f SHA512 2080fa6bb7714eda413956d84ae357ec3991cb41f4a9f19e2c2b13f0e87e584cacf3007a1c45f3ac6521bb9f7dba56a5bacb57d5ee197464a930eedb2e6a36b5
 MISC metadata.xml 432 BLAKE2B 5ff794b8cd6bb312ed6fc0a3ef74ab6a89be65b45d90fee726ec4350f702b45e46da69c35ac2fea606bdd2b7cc87a9d360ce03d101b4243950cbd54567a772d7 SHA512 fbd7143b819341c3d6686e6861b5c8642b6e18f3e0c73b0ab0221dae9f074fba26d7792f41a23a67074679594ed2739a9a6926124365c1fab88765e51915f288
diff --git a/dev-python/plyvel/plyvel-1.2.0.ebuild b/dev-python/plyvel/plyvel-1.2.0.ebuild
index c10e32908265..e3b7a85bbc35 100644
--- a/dev-python/plyvel/plyvel-1.2.0.ebuild
+++ b/dev-python/plyvel/plyvel-1.2.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( pypy3 python3_{6,7,8} )
+PYTHON_COMPAT=( pypy3 python3_{6,7,8,9} )
 
 inherit distutils-r1
 
@@ -24,6 +24,7 @@ DEPEND="
 		dev-python/pytest[${PYTHON_USEDEP}]
 	)
 "
+
 distutils_enable_sphinx doc
 
 python_test() {
diff --git a/dev-python/pony/Manifest b/dev-python/pony/Manifest
index bd0a924bd9c8..0830d27a65b8 100644
--- a/dev-python/pony/Manifest
+++ b/dev-python/pony/Manifest
@@ -1,3 +1,3 @@
 DIST pony-0.7.13.gh.tar.gz 302541 BLAKE2B a1e6f82c6eb72f8626238cbfcc0bc01d1ad3498a75a5ce4c3b8a4511e6d1fbfdd39a239f0462458ae1d64dc9446b338bbaea33d6bbdd861c8d0738e50d58a717 SHA512 431d19e3297ba1cdae5313948123d8b8cd71ee8ad5868b8cc2f5447eb435875fdbcdc3768834b9afe22ce8e4c1abaabeb597f3e6974b00aab33aa61e497d6390
-EBUILD pony-0.7.13.ebuild 548 BLAKE2B fcb348cc8c3f8019cd9cef72bea1220d7715149b1dc089f876721267bf208724840a5792b888253a9ab0dd039102ef36b962514a0b6b2496782e2f9693572131 SHA512 5217b7a96c0f1f61974694b03eaca7648371ab26032d88a6b60f502d1b85d6caac63a8483d0a5b277280f72bf05ae63bbf3c2fd9c29ba6492fddc2060d439642
+EBUILD pony-0.7.13.ebuild 547 BLAKE2B daea6fbb688148b05319f2aba406eb338a6d39bf0869e593f0e9439c2dc333d745e6baa17d116f9fd3f709f451366bfbf70d1ae487ae5ba0a73818e4ea316521 SHA512 7ab067e1f9e62e2fd609432182e96085be1b43364aca23812bb123a6eb8721a9590bced454af275383a7538cbcd5ea9ed964fa50b7cdc0a1b84779b4cb3ee674
 MISC metadata.xml 218 BLAKE2B 086fdcf7b63ca7bd6c58e861d717bb375e1cd372eff26d5d2eeeb176d8c5e6f10e653562abafb50eae7d7508f8e3d421b87e6a749acd0490308672828d0da697 SHA512 4558fee4c51117e21b1f42ca3edbdf1195ed297db798d6bfa0e5fbb7019654a187422b0abde7af5d800caffed66d1e55e4280e8be602bad591424d9776c46781
diff --git a/dev-python/pony/pony-0.7.13.ebuild b/dev-python/pony/pony-0.7.13.ebuild
index a0c95cff3085..fbfa5b2adaf0 100644
--- a/dev-python/pony/pony-0.7.13.ebuild
+++ b/dev-python/pony/pony-0.7.13.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/portend/Manifest b/dev-python/portend/Manifest
index 934e66f32da8..2a9d774042de 100644
--- a/dev-python/portend/Manifest
+++ b/dev-python/portend/Manifest
@@ -1,3 +1,3 @@
 DIST portend-2.6.tar.gz 12295 BLAKE2B 307bb77bb7d73e201f00ca203204149bb4fba8a00277da08f804626be4d01b15bdd38ade7a49c7acafd37263cad6e8c62e0eb6e6bdec0d9e10267c1fbf469aa9 SHA512 9e53c668ba9d0ddb2e92d9b4c97d2b8a4d858a6fc44123414ee3c8ac433f51f50a4773ee08f85bb134e49aeace2a17baffd32962d36df0b19b505a2c6634bf7e
-EBUILD portend-2.6.ebuild 932 BLAKE2B d7f8da8dec13f4193e45d12f545da0ac11f140e6b072e776c1d0f6e5e94b5e4ae9f2d78072d31d95bdedcad51a909a2160ed85c18a78708dc98b1d7add00e961 SHA512 60a85154d51027fa8914fd63f1f29c416fa1ff29caf4b23d4cd3b203337aa349c4e20461261b13bafcb7691d2e6cdfe10e8ad2e4aee4bf859e607791fc3ddadc
+EBUILD portend-2.6.ebuild 931 BLAKE2B df64c60f2e9b229e3174b51428ed610651243887d65d7c757c82f808df007e14d6d5af93f4d0bac7955d63994c9b8536e02d8b8d1411b87b9549ff353a689703 SHA512 dcfe995679a39d07a845a3dd4c459e72d1086a91e5dc4f90f8569f277f073048afc95a850fdc39d15fe514b2f6050f5eb87bb7dc0cdc3ea96f2822544c616f9e
 MISC metadata.xml 469 BLAKE2B d4b527da8fd402a1f9099000265ed003555c4a6f492a5d9c0ee5c350af1a044fae6505b6f847d55f45eb4551c1dc6f1ac8b946c6ab5b68768bc583521fc4a485 SHA512 3ab794a7c4545b3d5a5281499ae87a0ed377bf7f83acd0ab8bb2eedddc3005f03d793837ef9aa8e681374357067a5edf7bcf50da48c0b5d36bf0696d8bd2353f
diff --git a/dev-python/portend/portend-2.6.ebuild b/dev-python/portend/portend-2.6.ebuild
index 32b39420da25..036c10a3c95a 100644
--- a/dev-python/portend/portend-2.6.ebuild
+++ b/dev-python/portend/portend-2.6.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/p/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ~ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
 IUSE="test"
 
 RDEPEND=">=dev-python/tempora-1.8[${PYTHON_USEDEP}]"
diff --git a/dev-python/precis-i18n/Manifest b/dev-python/precis-i18n/Manifest
index ced895b7c318..61d943c7edc4 100644
--- a/dev-python/precis-i18n/Manifest
+++ b/dev-python/precis-i18n/Manifest
@@ -1,3 +1,5 @@
 DIST precis_i18n-1.0.1.tar.gz 63941 BLAKE2B ee429304f41fd225b306d6df342e1ab62a9dcc3daa40ae08c88a02809230d7e356090c3414136799b176b74debfd901863cb673b577b336784411ca5baf3e92c SHA512 d8aaf99bbf3bde148f173ac8ffa5cab5051ec873d53e19336171dcd29f995e706746e5969d37aef05b6c9db064ca5e7b3944ae049b0a41e605e71a854248251b
+DIST precis_i18n-1.0.2.tar.gz 65375 BLAKE2B 0ba2a23838306502448c4bc4bba5fec5228e4b819e7223cb5319ca3428cd558b5fdbd389327af7a8e718a5b8369b3d13de0f739456df9bae026acbbaba62e8dc SHA512 bef972f44e068954297429a22452d08c0e3fca983eb38dd22e3f90b3265bba1096343d34f7c9a226b24f92a823fdabf09af8eafba6bfbfdc8ddda8f0f4a28bdf
 EBUILD precis-i18n-1.0.1.ebuild 541 BLAKE2B 6065b086f8861cf984b90256c34628eddc956e04187aff33272f7b1a48827d6cb69a43bdcfbd4a00ff63df178d81e549b7b094d0193b26391630cc1655b02d8a SHA512 bdb2db6f4526b880a7330b602552a59c4642cedecf665c889cc41322a6953f92c83263fc8f9e0e1858afa8d9e4a552f1981ac3e00c49921784cc4be516abe718
+EBUILD precis-i18n-1.0.2.ebuild 626 BLAKE2B 6b14e3f535d597106e066d696337e34f6077233e98627c94f543da9baa5ebf48f9097686b2c27eb9f60e16f612c0efcc4543d18e5e918aeb4df554e1d1a91924 SHA512 9bb6ea11c94f4f7a3d42de66e22f3be11cef2e6619eb4e185950e6a155a7046231c5326ad4c6ad5c36b7762d9fcc249f5ce8cfeb1131c2d1641927d160bf7f6c
 MISC metadata.xml 894 BLAKE2B 66ca3d5449bae69a189243c2d9ef83c1ae48ef8c964864b6e44ffdfb372a5e42f9998be79f3ffed2d08f82e80646422f87c95636ad3df9593955454db8f572b4 SHA512 cccc0547fd799cc6e3c0b3fc7a1efe4d17a83e31369e3e829a1be32ce5d7e50e447fafad9168a813eb8ab20de36150a06fbd9c23e7db31f26b2491b5dcb005fc
diff --git a/dev-python/precis-i18n/precis-i18n-1.0.2.ebuild b/dev-python/precis-i18n/precis-i18n-1.0.2.ebuild
new file mode 100644
index 000000000000..9d8dd6bebc58
--- /dev/null
+++ b/dev-python/precis-i18n/precis-i18n-1.0.2.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9} )
+
+inherit distutils-r1
+
+MY_PN="${PN/-/_}"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Internationalized Usernames and Passwords"
+HOMEPAGE="https://pypi.python.org/pypi/precis-i18n"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN/-/_}/${P/-/_}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+S="${WORKDIR}/${MY_P}"
+
+python_test() {
+	# requires additional files not in tarball
+	rm test/test_derived_props_files.py
+	esetup.py test
+}
diff --git a/dev-python/pretend/Manifest b/dev-python/pretend/Manifest
index 206094dcd99f..f8ba24788e01 100644
--- a/dev-python/pretend/Manifest
+++ b/dev-python/pretend/Manifest
@@ -1,3 +1,3 @@
 DIST pretend-1.0.9.tar.gz 5656 BLAKE2B 1a8e280fbbf147f502f1148b9e3685630e0f5cd270dc8b6fa8fbbd8177aaa08efe401a6684b669a976d828e7fcdd48d686170bfa3cd3d8a857b78af473a5b6f8 SHA512 976e3272557aecfb11e4147a868ea96e23546e277d57d726f41b945103bef3451039716e6bbc5082d691fa1fd331c06b3d0f8b254deb0510948153571326eaf0
-EBUILD pretend-1.0.9.ebuild 697 BLAKE2B 40312c9e67b9fa7c644a306a80478671e3d16129c8e6ea34c0aec0f2e742f35a798dc1fed014d7e23d91994777393e14c07411c73fc0d82ebca633d93a48c239 SHA512 0769d4aa66fd66bc9bd5a4e50edee2a6dfe0abb20d7874aa576fa6e0423a64c8e1f4f30d73b871b7db1e93afdd37afd81cbcf12d38de9817975c344f80efefc4
+EBUILD pretend-1.0.9.ebuild 704 BLAKE2B 06dacc21d3e5e5c7f763359985b478de2cb6f4b3d14e297cc212c2d1fdd1a912db89b69c56602e5cb8e28b6479090f5ff44c3b36f28073cba620db721dfa2648 SHA512 c3fdaf476dd1c279b782366064801c8f95251688ffc83bdd8011f33535947ac687ae7fbcce8d52ce2962c777d45a348255e15e0cfbda86bab6942239df2b87b6
 MISC metadata.xml 399 BLAKE2B 38a6664ea12847385fc96635326862910e05adcc15632c88f73a32add4a14fcf8f40183aa38ac54e56443bfc569e8d8fe9cf2429dde00d691e33546894c86bef SHA512 1841d97fe0bfd8350feffef40741b7de2d5a54e9689aaf62fac7b3be1eda8834454ba8d589aa7ce781b966656ad290ca1706e2417e2108583800f79a7310c650
diff --git a/dev-python/pretend/pretend-1.0.9.ebuild b/dev-python/pretend/pretend-1.0.9.ebuild
index bc29e4a37109..f68eb8152e06 100644
--- a/dev-python/pretend/pretend-1.0.9.ebuild
+++ b/dev-python/pretend/pretend-1.0.9.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/alex/pretend/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 DEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/priority/Manifest b/dev-python/priority/Manifest
index 462e9260cb32..04e24ea11592 100644
--- a/dev-python/priority/Manifest
+++ b/dev-python/priority/Manifest
@@ -1,4 +1,4 @@
 AUX priority-1.3.0-test-timeout.patch 716 BLAKE2B b48691b508a4116c9656acaa3a31871e5c8a66c45d6724506590c95e09eac027969def8198c5bdaa14e50cd77ea105881b7ddb7f36c95665502799f5ea751b6d SHA512 9e809600bc972baf4e1f5366c65db5e5d050bcfd0df23da3d1f75f653a0fdc27f7e4a59e96e13bd42636360653dfdc1de1991e6684e95bfffbf0c4384d7dc550
 DIST priority-1.3.0.tar.gz 13827 BLAKE2B 8c100eb44ed42f4f624bfb37dd6f698a3da84812783bd44ba82afef565562379a7677b3cbc9e16c4ea5a5dcc91d0897fa47c341a81bc1875461a72aff328fcff SHA512 cefb13b15e99ef98c37fdd1486466c9e1d7d04b4574cbca1665fde7b7b44cc7d66964bed41184315a9b51bd6f9d0e02bbe113bfa004a754ac270170309b71e0a
-EBUILD priority-1.3.0.ebuild 690 BLAKE2B cc5072e240c801c21e1fe1b478398624a44498b340a8e9b18db175038877c05030a2c102ba394b695d9a56763e2e64d1cb10f49f5324e6e13a49680b79fecc83 SHA512 086d9bf4e2f8a271f899a549ac609818ab9d6d397b1d1485f9bdd24e2c545b90f8f7953695fc793be5b593a01b0ddc8ee005c433eba745a671a6413ab95967c1
+EBUILD priority-1.3.0.ebuild 697 BLAKE2B 57c9b400348f666ba029dfb087ef2b9f633fd4ed7860ea3a72421eec5d9c87782a6836d923612d0f81b53bbc9bf494ecff1f0b4440724ab45a386422d9f363de SHA512 755c3a2df275e42cd8f4fb32c67e49a169087ddf576d0dd2454241eac0067d6c459b00b1e50be7daf2cd2f177673156dd87fb38c6cf76d2601fd21b5b936757e
 MISC metadata.xml 839 BLAKE2B 2a922ade07ccabbde2eaaeaac310e1c89206f7a6194ea14cd83f53182270edfd2cca4b1d13072d8a4c81c96563ba3b81251626eb777ced188bc9a22a37dcbffb SHA512 fbd62fe6b97e29566a18a29d155b8b08124d5c1561a21ad7aef7daac1a68b75b48b82d3edc612a27888da0d24ecde73b808cb90dfb7fe78ee97adc5fb507b003
diff --git a/dev-python/priority/priority-1.3.0.ebuild b/dev-python/priority/priority-1.3.0.ebuild
index f90fc1f1b489..a4ed270e0b1f 100644
--- a/dev-python/priority/priority-1.3.0.ebuild
+++ b/dev-python/priority/priority-1.3.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86"
 
 DEPEND="
 	test? ( >=dev-python/hypothesis-3.4.2[${PYTHON_USEDEP}] )
diff --git a/dev-python/process-tests/Manifest b/dev-python/process-tests/Manifest
index 4e7f2ef2fc8b..8f64e7c5c5ef 100644
--- a/dev-python/process-tests/Manifest
+++ b/dev-python/process-tests/Manifest
@@ -1,5 +1,5 @@
 DIST process-tests-2.0.2.tar.gz 4815 BLAKE2B 14f2b2e266fd7365c4c1382a608ce641734c34c5215131b45b895a6d1d72591c2396332d1483f006ea7333a30993fae98d25e1a95cd58b38995d949c395da035 SHA512 6cf64d14587ab577a0680760ab6be146a60590091a0bbd6fb35d5c06ddf5289fa4d873c5658f882313837291b70adb37a3e41c13f1fe541777e05f5e9dac1750
 DIST process-tests-2.1.1.tar.gz 11522 BLAKE2B 6f6b97da73f1e4f449c3c7f85a6d860611de57e78cb57c352ea4563be07d7866a5c44107fae0ecfaad24b262c933806b59c2c9218be959b2576fc0d8250da4b9 SHA512 4bb520074a9964d3eed4aca7a1952bf1a0d99b475f3f61b5c51137d8f2e804352639187da5b5ff30ea8739466200eb9361e77dc3c43a20d5ea418f63a2765a1c
 EBUILD process-tests-2.0.2.ebuild 628 BLAKE2B 7c365f149c1bc8ca2df6440a9651fd7df2764962289f40a3f7459b2b8774be5398b94cea0a5df633528d3995d7a0f7823c44eb4b9a917a9a0589a34c05c4647f SHA512 5a106c5d5295afe8b283dce39c44222351100cbff55f4696b1e7af3db802170ba84800577360f5bdff262dc11527d4bde545ddd33055c0b14847c34cf755efe9
-EBUILD process-tests-2.1.1.ebuild 637 BLAKE2B 185230ae7c1de695d3d0d00db0632d6ea424594bf1c0ad13e9acdd2515867a894452ad62c8e0718ffdc71184c2b29cb11d532df666dc8a3aafe2e489a60baf38 SHA512 51e9a0e5158116aabb5aed37031a9da8585affce380e90839b748a1b1c3fdbff8c6f3af7c25550421c8863616593d10a5ed373ed8c711dcd1cd3465dd47615ac
+EBUILD process-tests-2.1.1.ebuild 644 BLAKE2B c7044748399003ed13be8e779d4b65ae37043503ae2febb8634f381e9d37c0a916c145784200f4990d7a52ed7c9152cbac6dbb2bf19ebe67ab0558cea2b5b064 SHA512 012fef9e44178df7c40a4145ca79ecd5c04ef3f4c1140c7a2ec89f66eca10a9018f006a11c235163905d40aafb48c1f56ce9338be9035e6fe6e970bdc68538b7
 MISC metadata.xml 240 BLAKE2B 41e6a4d9da33dab2decc5ff419924f382a8f64d27a81fdb97576db8c6cf125be95911747946ec8be1b453f56617fef1084f5947f84b50a8db419d46df2ae8a0f SHA512 9c23321eaa853f851bf00195ea64ac2ba093e516f9b57855ee5aa58fbb1988130c9f0c17c2a9ce9fae4ee033e0a28a70c868e0f5acdfa1dd316ab533c5279d59
diff --git a/dev-python/process-tests/process-tests-2.1.1.ebuild b/dev-python/process-tests/process-tests-2.1.1.ebuild
index d9912175eee2..bd0aebc70432 100644
--- a/dev-python/process-tests/process-tests-2.1.1.ebuild
+++ b/dev-python/process-tests/process-tests-2.1.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="BSD"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
 
 # There are no tests at all, under TODO
 # see https://pypi.org/project/process-tests/2.0.2/
diff --git a/dev-python/protobuf-python/Manifest b/dev-python/protobuf-python/Manifest
index ec2b46195a0c..b64d9cbe0d4a 100644
--- a/dev-python/protobuf-python/Manifest
+++ b/dev-python/protobuf-python/Manifest
@@ -1,6 +1,10 @@
 DIST protobuf-3.11.4.tar.gz 5140799 BLAKE2B 97b450c0623593efe6a42b66582ff183344b8831689e6a5b4d36096dbd57c33da9569bbf26578536aaf73ecd866ac0588b6cb7d55a6a9b9a6e840d4c57099001 SHA512 777bbb0e9e2375eaebe6b8c87abd660bac70ee469c9ad00dd25917b82d7fb5bbe33cf87f0d69c90e19d55c07a7285ec20974ba4768623ce9ccfadf147fd5e261
 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.13.0.tar.gz 5277913 BLAKE2B 168aaa5beef83be675cd2543ca8efeaf5174f5e7fd861a056b04b01c8c781dc7b1fcbd05068ae89f051dfacfdc47c34b19cc33c8d09dd3212d3827746e3408f2 SHA512 514efa65fc8a36bc0791e6d39bdfb07b2689e9c2a4b82536c657859b800e7bc1e1a0ae86a7ee33f30c43a473a49b5c346ce830ac0057b6da104ed37f90b8b0fd
 EBUILD protobuf-python-3.11.4.ebuild 1557 BLAKE2B 4a81edccba9763452cec9166535bda9bfdef9b65d044d4151eb8f48bda036cbeef61a81cf7ae8dcb35a7df5bc031c5bc169fbf972098aec7f792c8db8e1964a9 SHA512 c3581654a93005e894d071a30a197358fe0643ff0a462a8fe2b21ceb6b27b208099251a3ff61af617c5ff443d0d090c9f2e8744c4eae6d9c8b542465ab4850c6
 EBUILD protobuf-python-3.12.2.ebuild 1559 BLAKE2B cbf8fe7187083fcd94ae6cd1b91dfeecc2462e1a863bf7b227569fb6433de9ac2288017de69747b703f6b7ba339910a59105409f5bb1623d6a34bdbec4e15a70 SHA512 af881934dca2db4fbcd4834621f7e218ab94d33e500f5e3874b014114b43d8fe46c3b40ce5bdce20f1844e8d30853788b56814d32c2dc7e1c539fa7330b917c1
-EBUILD protobuf-python-9999.ebuild 1449 BLAKE2B d3ca882213c7df008b5955062f8ccbdf1a1f4f06ccc4743d6509390cd75bfcf7dc4291357fd8f869d6c141412236befd06ea76e082e46a0e6cad182c58a45d7a SHA512 90e479adde363fbdf6823de5d6efd3709056ae11d9f298f7f1becb6b88bb180569c101ea22d3f75a6eaa5ad7dbfbb90494d325b495a989ce7e6e9cee582eba24
+EBUILD protobuf-python-3.12.4.ebuild 1566 BLAKE2B cc05b4213196c3b14186cfa0f5b0c879ff8245793e4853837b098cf7793edd60b5443d58e4562bafd9e451cade4b4920353ec988b15fe9c346eeb8156945dbc7 SHA512 a08d31ad529c83aec7809ae2f3dbf2d1f12a0c7308037a6864b9d8cca246c9685f7f6a3bd9993aee7bc80a59779bbf1a84ed512c896cfe65283e17f0761c71fe
+EBUILD protobuf-python-3.13.0.ebuild 1702 BLAKE2B 7e604f9b0d3a50481a8a9f5a834144e8f7ae0eea2d8bfc3e0227aa526d89f4a20b8647a0189c8c7b1db8c02882bca6926762ab20c2d1c133b67e6a610944d007 SHA512 c47643e5bb62983182a32a07180b5cd7e7076d302bfb2089f195b7a97b7afb95c6a2818973ec4e11950f443af3e542557b14668b142da92d1aebf949aba5c51a
+EBUILD protobuf-python-9999.ebuild 1589 BLAKE2B 80f58d38b49188a283d5f0d2045a6d1a57617768684f6d01894ace01623d7249ec9c9cfaadc59dc8cd2f572bf9893995e0af512c210704d52eecc0fa250e0e5b SHA512 f4273ae04f591b947d646c5c8921d0334c4997b07b3bb60e699a09ac4cf36a893c46bcbf0bec5954b03f06674a78125c93987c9865f7510bc3ffeb827275c3e5
 MISC metadata.xml 539 BLAKE2B 32831dd18b1c8c19a3e5339788b48bcbc6719654148fab93412bb91aa53ccad7b39529bbc2ea78b33b157eeb024e77cfa981088375466273e58b9d043ebdd70b SHA512 c6f28c8549dc8d3552836e81322db479ed4ac7ab5a12232f64d55cd909d8e4face39eed67b3f2c79f01023cfe3d00cf0540493acdb0aac419e6b58abcd430890
diff --git a/dev-python/protobuf-python/protobuf-python-3.12.4.ebuild b/dev-python/protobuf-python/protobuf-python-3.12.4.ebuild
new file mode 100644
index 000000000000..45575c8ab012
--- /dev/null
+++ b/dev-python/protobuf-python/protobuf-python-3.12.4.ebuild
@@ -0,0 +1,63 @@
+# Copyright 2008-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+PYTHON_COMPAT=(python{2_7,3_6,3_7,3_8,3_9})
+DISTUTILS_USE_SETUPTOOLS="manual"
+
+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/23"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-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}"
+RDEPEND="${BDEPEND}
+	!<dev-libs/protobuf-3[python(-)]"
+
+S="${WORKDIR}/protobuf-${PV}/python"
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_CHECKOUT_DIR="${WORKDIR}/protobuf-${PV}"
+fi
+
+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.13.0.ebuild b/dev-python/protobuf-python/protobuf-python-3.13.0.ebuild
new file mode 100644
index 000000000000..93da8a7a9f4b
--- /dev/null
+++ b/dev-python/protobuf-python/protobuf-python-3.13.0.ebuild
@@ -0,0 +1,69 @@
+# Copyright 2008-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+PYTHON_COMPAT=(python{2_7,3_6,3_7,3_8,3_9})
+DISTUTILS_USE_SETUPTOOLS="manual"
+
+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 ~x86-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}"
+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() {
+	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-9999.ebuild b/dev-python/protobuf-python/protobuf-python-9999.ebuild
index f47c4a98916d..6ea098fc2992 100644
--- a/dev-python/protobuf-python/protobuf-python-9999.ebuild
+++ b/dev-python/protobuf-python/protobuf-python-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
-PYTHON_COMPAT=(python{2_7,3_6,3_7,3_8})
+PYTHON_COMPAT=(python{2_7,3_6,3_7,3_8,3_9})
 DISTUTILS_USE_SETUPTOOLS="manual"
 
 inherit distutils-r1
@@ -23,7 +23,7 @@ else
 fi
 
 LICENSE="BSD"
-SLOT="0/23"
+SLOT="0/24"
 KEYWORDS=""
 IUSE=""
 
@@ -43,6 +43,12 @@ if [[ "${PV}" == "9999" ]]; then
 	EGIT_CHECKOUT_DIR="${WORKDIR}/protobuf-${PV}"
 fi
 
+python_prepare_all() {
+	distutils-r1_python_prepare_all
+
+	sed -e "/^[[:space:]]*setup_requires = \['wheel'\],$/d" -i setup.py || die
+}
+
 python_configure_all() {
 	mydistutilsargs=(--cpp_implementation)
 }
diff --git a/dev-python/psutil/Manifest b/dev-python/psutil/Manifest
index 611597f9950e..6919e7c6a973 100644
--- a/dev-python/psutil/Manifest
+++ b/dev-python/psutil/Manifest
@@ -3,5 +3,5 @@ AUX psutil-5.7.2-tests.patch 4427 BLAKE2B 8b2847eb445eb39080123dc1018ccf8c68c0ce
 DIST psutil-5.7.0.tar.gz 449628 BLAKE2B 3bd07a0a2f95a539910fa1cef92e72d168c3ee7a495c0defd3fad307d96448d81182b7ccc5e4388d6726495a18df26b076e27b3cbf57096a5c3c8326c00f2dea SHA512 8cee64ab396dae79866e961aeabdb9a4174e1339bcd5c0a35f23fee97ca2a61c0cb08f7152d7e0db90c387400c5c6fb3da2dd2124ce9bf97dfffe6f3b4967981
 DIST psutil-5.7.2.tar.gz 460198 BLAKE2B 203445423ce5e0ef35bbee00a7160a282401108c161efa58febf0e84efeee1b9866e34ceb230bfec1b177a540558f2e0c9a55b1ba4e0b764e494553d9f0a5f7b SHA512 b0c9b6bceffc031b230d656f76eca555e5cd481d8dc70de1c6068ec31f1ffd74314aa35c8e11903901f58c326152128749ff9525064ecca117df258311d27320
 EBUILD psutil-5.7.0.ebuild 1295 BLAKE2B ac185c61234ac07cb4fa62d8afcd4546dd7eb882a0c96928ea4c64c743519f7f2f589547b849dbda6998f0c8869466cbcb82591f2fee66eb69546fa9f1475c17 SHA512 27ebe9f0471435c11e987f6b7a67ea627882faa0f379a3b2b6a493421a39b11ccf2fd3ffb21a6e637f73599be3f3616e31b6d39472d41aff6b3cd9d20e516310
-EBUILD psutil-5.7.2.ebuild 1346 BLAKE2B 2904016593d1709f2a06331e54e5805fe3bc2c3acf061fa6d04e46a32dbd4e24268ed40747ff8c65e2b80e4fe52e75bb538b4e35564f6c4fb48a5c17f0acec09 SHA512 5d3073e9334b2ccdaaa13cf0fa818de36d16540a9cff9d08820371b641e9f409cf5c013edf22ec3014cbf24553a0ae61ae2906e0c8658a93e7899c281af6b723
+EBUILD psutil-5.7.2.ebuild 1352 BLAKE2B 65b95f068cf758b9d916928799d20296fd5f5929f24378e9df6437eec7f3abc8e0548e3614e2effdd4d9c7da436cf25171ad78dbe0eb546192c94908d5379257 SHA512 58c5232d4ce7c821cd513b9f73131220755b0156bf6a35dabcdcbba6083be5d757de716d2b84d66b29cfcd8c7fb15770af51cbb7ee8680fbd92669a7a5f400f7
 MISC metadata.xml 377 BLAKE2B 0e671ef95025f24d295ceb5c5295544f4d68bf94459537537e229efd273bbac058b385fa94f1fa1191f23785d2572a5960d84a1d3ece41f10316b38101cb26d0 SHA512 a28e7a1e32a0b2750a4f0956d2252c73d20b4aa9817aac2e776365febd7d03de88e88508aabdfc29ae15d8bf7ebf1ed662c000e2ca8c79e3d50a3362ce1c2d2d
diff --git a/dev-python/psutil/psutil-5.7.2.ebuild b/dev-python/psutil/psutil-5.7.2.ebuild
index 1a02f15f462c..15770393edef 100644
--- a/dev-python/psutil/psutil-5.7.2.ebuild
+++ b/dev-python/psutil/psutil-5.7.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/psycopg/Manifest b/dev-python/psycopg/Manifest
index 948be0c8d3a9..0d1e2a876f1b 100644
--- a/dev-python/psycopg/Manifest
+++ b/dev-python/psycopg/Manifest
@@ -2,6 +2,8 @@ AUX psycopg-2.7.3-avoid-mxdatetime.patch 1832 BLAKE2B dff21302f85dc05be27147d1a5
 AUX psycopg-2.8.3-avoid-mxdatetime.patch 954 BLAKE2B 073eca8e49dd4d7fd2ec920dfe52e255d3fbb0e9975cd0378574d7c6f6f097c4b0bae0f4eba74e939b15c19ccab1dbe84d28f434830d38db6b59e18246c3f2c2 SHA512 9e0ac41a70002bdac03628ac15b84edd3e67e589f8ca145242018aab03fc42b8befc1c0330f0111d01b239dc00b6ffc29965ba3c18ce0965cbe9e7b31d1fef4d
 DIST psycopg2-2.7.7.tar.gz 427474 BLAKE2B bc721b721693bc5f560a4829e84715d15e8c14523ada00109c7d7ba916c91928082fff286bd3c2ff5987c0436443128d1408ac9de073ad538b1e356fc73aaf8f SHA512 032344957c00bf659ca5e46f54f827a6d79809e370d661cd349e2ce935873359bcc4f440b74c6f14658bf1cd9598b6d884abae507fd33db9e07b01fc87967fb0
 DIST psycopg2-2.8.5.tar.gz 380874 BLAKE2B 843321175499bf00b080d3e58ce0d586e674585af4be5a08866b5dbb68256ff9232d3c25e2603a3a0920a6c91927eb9fbb5942acd429be5dab9177c65da0c32e SHA512 d4cf9b94573b90fe56555ea5cf841aa0c4c806770f92f35a7ef2531999bb50f98eb1276e56f1540b5f2695e443bac7e9cb8bbfbd24ed82164f99663259d2da3e
+DIST psycopg2-2.8.6.tar.gz 383797 BLAKE2B da0e3f1e143c51c940ba1f51d3e457b492d880ab71267dacd4747444bc767711ccd6c2f54d9e10ce5ad8fae0c3206fb4b6199f267e9bbaf12eb654227f59c2b0 SHA512 1e1d5d8755c6d1a153d84210bf29902afafe853659d709e13abc6bc5772def13779d2394690af1c544384c9c607edc0fe5cf2763244fb346febf9a9e0032b45f
 EBUILD psycopg-2.7.7.ebuild 1541 BLAKE2B 6388fff673f66631cdba8911a16e36e3bd575d2a88c85704297ac7fc6ba4a3c351e54625f459e89f287a44171ea9d1c15f456d55c68e29a30b24c4784e2be1d8 SHA512 b420616a1edc69f2a181651d2e11cffa0dd5896bb239d2e5c9e642540fd9eccc70a764c3048d432c0971f751c8b3f29f92ce86358995614af4ea02d371502851
 EBUILD psycopg-2.8.5.ebuild 1524 BLAKE2B 1402eecade47b0ef53252a7a00b282f8bbac55956b858e0625a5784b71e19a7eeea2ffd40ba87aee963c89437b7413644b719faaf983e1fb83eb351bedd55562 SHA512 25d3d9113ecc63762a1c1916511760d3c9059a1af35aebc533942fcbd0aeae8109c6e46f21da7c641c1c0e1e492f0795b4403563f7c9344bb3ed0eac18546cbc
+EBUILD psycopg-2.8.6.ebuild 1627 BLAKE2B 2bb102633147da683597d92361ce51c871f034bae961df0a9cd437aedb5eee10c32b9ff02d5c1a500973d4e9b4bd76153e5bfbe3f94489145f1ee86ab7a7c29a SHA512 c4cfca9cac251613213ffa755f3f2b157503fbdd470ab24493f87f07d4018aa3fe1e3e20b079738ac8b39b9d2b4e86c290c31376876aab7c854763b8e29c132f
 MISC metadata.xml 321 BLAKE2B aff48bec04e34b92668aa18214d86ddbedef2376eeced4815118d35eebfb8e6af87234a9470828f465626f7d9ed56fe0fcb8f078c23945371248136533651ad3 SHA512 358b751b3a65f64ab5468bcf4022315f7069a2fb60709c2bb12ac02577866a3ff24ab2dd69577052070cf010a51428cb3ec385ca7cfe48640f4dd25ae478a966
diff --git a/dev-python/psycopg/psycopg-2.8.6.ebuild b/dev-python/psycopg/psycopg-2.8.6.ebuild
new file mode 100644
index 000000000000..eab79881aa49
--- /dev/null
+++ b/dev-python/psycopg/psycopg-2.8.6.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{6..9} )
+
+inherit distutils-r1 flag-o-matic
+
+MY_PN="${PN}2"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="PostgreSQL database adapter for Python"
+HOMEPAGE="https://www.psycopg.org https://pypi.org/project/psycopg2/"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="LGPL-3+"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+IUSE="debug test"
+RESTRICT="!test? ( test )"
+
+# automagic dep on mxdatetime (from egenix-mx-base)
+# the package was removed, so let's just make sure it's gone
+RDEPEND=">=dev-db/postgresql-8.1:*"
+DEPEND="${RDEPEND}
+	test? ( >=dev-db/postgresql-8.1[server] )
+	!!dev-python/egenix-mx-base"
+
+python_compile() {
+	local CFLAGS=${CFLAGS} CXXFLAGS=${CXXFLAGS}
+
+	! python_is_python3 && append-flags -fno-strict-aliasing
+
+	distutils-r1_python_compile
+}
+
+python_prepare_all() {
+	if use debug; then
+		sed -i 's/^\(define=\)/\1PSYCOPG_DEBUG,/' setup.cfg || die
+	fi
+
+	distutils-r1_python_prepare_all
+}
+
+src_test() {
+	initdb -D "${T}"/pgsql || die
+	# TODO: random port
+	pg_ctl -w -D "${T}"/pgsql start \
+		-o "-h '' -k '${T}'" || die
+	createdb -h "${T}" psycopg2_test || die
+
+	local -x PSYCOPG2_TESTDB_HOST="${T}"
+	distutils-r1_src_test
+
+	pg_ctl -w -D "${T}"/pgsql stop || die
+}
+
+python_test() {
+	"${EPYTHON}" -c "
+import tests
+tests.unittest.main(defaultTest='tests.test_suite')
+" --verbose || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/ptyprocess/Manifest b/dev-python/ptyprocess/Manifest
index 2d43f45d30fa..4a362d2e02b8 100644
--- a/dev-python/ptyprocess/Manifest
+++ b/dev-python/ptyprocess/Manifest
@@ -1,3 +1,3 @@
 DIST ptyprocess-0.6.0.tar.gz 70115 BLAKE2B 02499e560c4df2f852d0951a9acfcb88a2bfe659592ead0304bb6a240e831fb093dd40a457714a8a91d1af70b5364b7af91d2c14c956d8a84d3eeec3eb2a9edf SHA512 b34b6bca977f09d1443b210e338e1300e12d6ef35857f9543b3a116ef3b500ad4844357a7a283321756f886af41bddb1f02b27bf200ef1e82a96fd9e431bed86
-EBUILD ptyprocess-0.6.0.ebuild 531 BLAKE2B e99ba27a4f188300c37d9f2901123f56c0a48f773388006e7f0ea49d6a91cc05f101cd3a5bbfcaa4f57fbff3bfe58c690c6d0bc921cc1f5f8a389f6dd77b2dae SHA512 02911b4c3adb8739978aff6d51917e12206826d349072847dc8a0f7f9d923dfd4accfa465090df89b2a86f16e8ded3b6de05457460e5c11827f19e11d148c1f1
+EBUILD ptyprocess-0.6.0.ebuild 538 BLAKE2B 356b08eaacf57bac959d06f276ee980728b02b140133d4e0240c8ca91c3979270edbe630c59fd0efb8177f27ad57f52968f3e78cc6cc376a9123461467edf384 SHA512 e4dff738cbf644ead7cbbe16f41322a5a1e570f66d58fb061b715b6b195fd584b7a1772ab08cbf7d5969270118563cdcc8800153bc7160696200aa89f9dcfa78
 MISC metadata.xml 383 BLAKE2B 03c99bb4daff695f738e75605fe765379ada90b822ded3015bd82e3e34fff7ff61699978e00dd615d2ca6684567b3d072316debbf66abb0c6f9413ff2e3ad724 SHA512 4355f5b56f756ee65c09bcc3647050e727abdd9abbee62a3f2fedf18fb97bbd523182c55ac8eb8456b0d8b7c0904372ee92cbfeed50765d6f2d608280655b05a
diff --git a/dev-python/ptyprocess/ptyprocess-0.6.0.ebuild b/dev-python/ptyprocess/ptyprocess-0.6.0.ebuild
index 1642dd8e28bc..8eddb3a72f8d 100644
--- a/dev-python/ptyprocess/ptyprocess-0.6.0.ebuild
+++ b/dev-python/ptyprocess/ptyprocess-0.6.0.ebuild
@@ -14,6 +14,6 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 
 distutils_enable_tests pytest
diff --git a/dev-python/pushbullet-py/Manifest b/dev-python/pushbullet-py/Manifest
index 3abc2ef5b27f..9c4b08cf5d35 100644
--- a/dev-python/pushbullet-py/Manifest
+++ b/dev-python/pushbullet-py/Manifest
@@ -1,3 +1,3 @@
 DIST pushbullet.py-0.11.0.tar.gz 21653 BLAKE2B a6c9b6f4958ce35b63ea4043d1d4f8691885bd0aa2927af541f2080a0b0b65a7df979a497967f3adceab8ad2382448a4c6a02d1184c9d72a18d91844eb970722 SHA512 b236f30b99e5bb79eff183529716c1c8f83cfd2526fdf50d86041eb6d3fcd6670d0c4dce407ae6e50aea0fa96d6a5527af980148f0c71ef758c480f972ad9659
-EBUILD pushbullet-py-0.11.0-r1.ebuild 1141 BLAKE2B 8cd7760e7d8191d6851d6ba7d0e50c5a622ba11c3b41b4f3b70afef7d60d7c773dcb8f4ba7a95f89eb35ec47094b67fb5a6cf408a822d13adc3308e89a1b5394 SHA512 c4c4bec26bd661aa8be271b22d9f74560175e492e6bdfe5a259a2c17d4abe73ad41acdd8f56bfcc0b9aa0ce6e124f641228b5361f12cbbb0d8c3140ceefd7663
+EBUILD pushbullet-py-0.11.0-r1.ebuild 1144 BLAKE2B cc9364728bc0d5dddc69e5c8e3ff9a4806e33dd4e6bdc5c2c93cd90845ff64e67e8796b053201ea7226ff2c131c2265bd49c2dd1bffe57f60fe68d4b52b28ee5 SHA512 7a39703152b250512fceb7b6d5bfab63f6cd0a622af34fa13d5bc905f9a1cceb5119bab1c112f75a7c4a3a43855b2c2928b18152aa7e75977d707e0fe7fea9e0
 MISC metadata.xml 459 BLAKE2B 86e83479fde9503defd709e67ea6ba81e5dd9430e1e1b4ea6545f332979173fab9a2392528007638531c58ec205f2d45ca9817f21981b4ebd94f0f81596bde71 SHA512 cda083520abafb4b81b0691234a2bc2bbdf75f4bef69943e5243492a8d8916f9924eae5f06288a6f636ef7bf36477e198dc6a33a04e55a9fd2376a03999f91a2
diff --git a/dev-python/pushbullet-py/pushbullet-py-0.11.0-r1.ebuild b/dev-python/pushbullet-py/pushbullet-py-0.11.0-r1.ebuild
index d5dba92dc0b6..b882f021a144 100644
--- a/dev-python/pushbullet-py/pushbullet-py-0.11.0-r1.ebuild
+++ b/dev-python/pushbullet-py/pushbullet-py-0.11.0-r1.ebuild
@@ -2,7 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( pypy3 python3_{6,7,8} )
+
+PYTHON_COMPAT=( pypy3 python3_{6,7,8,9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/pweave/Manifest b/dev-python/pweave/Manifest
index cc1d93b95800..a5ecc99b24e1 100644
--- a/dev-python/pweave/Manifest
+++ b/dev-python/pweave/Manifest
@@ -1,5 +1,5 @@
 AUX pweave-0.30.3-docs.patch 384 BLAKE2B f965c866a87e4ba7084767e73113d119ca6c1c7ce5d184d843f84cdf9f3237038a2192aa41b834d9b39f584ee5294d802857d1fb0f2d457721b2b82376b00215 SHA512 7a4396e2383c630e1bd8cab770952e8898be157b80dab23ce0f7cabcc1ecda4bed9a9cb4ad46d48e521b05de7de324106128d281ef88e06735425cc430f43717
 AUX pweave-0.30.3-rm-online-tests.patch 3991 BLAKE2B ea2462239edd8cf029a308a0fb3d3464a3932d6f714e7d6501730e62deb6b417482c5dc67a023c467d3efc1456674f0d31fa96f585ba9d81943e4c9dcf0aa875 SHA512 74f496bd263d87b9f63293be843eac78c40c6f66de5b493afe8aca893441e43bf02b157130b8252f893a928c8a03ac6b7594ae2876b4af1c1a2745e0aaf8d3ba
 DIST pweave-0.30.3.tar.gz 2173323 BLAKE2B 13aaa70d424026e58648ee949d8046d1f9fdf6e402df018b120dbb235c7b7a29846cb341aba1642c97be5a8ebafeea33a71be177f92498db186e8044624eebb8 SHA512 d2ffc2a6921837eff471041cc13789ac370d9e00c8a66f451ae53859c110c838e360b4bfd820aa33656fdf509cda8dc24a1d2c1bfcb44ae99de751726c33b3ae
-EBUILD pweave-0.30.3.ebuild 1363 BLAKE2B 630b7131320b8a04c626a9ecc2cb88d446c116db652de839c3f0f752de2534c4a43a5724641e22faf9f1d463984fb64013b38b2c63f7cc5d0d5ee60cf1dc0e36 SHA512 12b1922d73b4102d10e5d8988b1ea5c14ac390fce9adb7ed6830083376e76c19fbabc064b39f94a2596dbcad507bb6040e3e3a1307b11b5fdfc8a2a4f561a7ab
+EBUILD pweave-0.30.3-r1.ebuild 1363 BLAKE2B 630b7131320b8a04c626a9ecc2cb88d446c116db652de839c3f0f752de2534c4a43a5724641e22faf9f1d463984fb64013b38b2c63f7cc5d0d5ee60cf1dc0e36 SHA512 12b1922d73b4102d10e5d8988b1ea5c14ac390fce9adb7ed6830083376e76c19fbabc064b39f94a2596dbcad507bb6040e3e3a1307b11b5fdfc8a2a4f561a7ab
 MISC metadata.xml 375 BLAKE2B d5aff616cc3473bac743c6d809eba454c54e2fc1514a115be5ae1ca11be7de212fe72f2ffeb520db05a11837d8ff93daa1128cdef7867244b9f829d8e52e6214 SHA512 c00656e8233157fbe266e364bc10a6b351063221b27a73d43add57a50d00beb2e540b491ea671fcc4b7acafd97c4a5e56c73a9937aab64ee2d79d553fd0658ee
diff --git a/dev-python/pweave/pweave-0.30.3.ebuild b/dev-python/pweave/pweave-0.30.3-r1.ebuild
index f85db19e41dd..f85db19e41dd 100644
--- a/dev-python/pweave/pweave-0.30.3.ebuild
+++ b/dev-python/pweave/pweave-0.30.3-r1.ebuild
diff --git a/dev-python/py-cpuinfo/Manifest b/dev-python/py-cpuinfo/Manifest
index b9d6c0463fc2..5a7949919149 100644
--- a/dev-python/py-cpuinfo/Manifest
+++ b/dev-python/py-cpuinfo/Manifest
@@ -1,3 +1,5 @@
 DIST py-cpuinfo-6.0.0.tar.gz 145260 BLAKE2B 58cfeb698619f2f51dada63b236969393e387f6e66fffe853ab633e438b4b893489c097211a20ece597a06d3c0cf89d285b5ab34e80029510e86b1a322ff1f06 SHA512 4941a5193cc376a44e99bc82644ec9d7e8f9f11b4e5fb1ad22a71c959959dde7f67290b436dfad2f26c68ef17d08e33538cf80443f763268c503af17b8479438
+DIST py-cpuinfo-7.0.0.tar.gz 95887 BLAKE2B 8f5764db94faf41dc554353ac2a21416998efd602b6228f21db6e5b3257563b4f7352221eb7f354ebe431910b0b8dadd52558233261df557c6a7943b7ec138c4 SHA512 fd291533dc5e78d75851e61ef2a754d9bdb62cbb5e04c86db0d6ea2d074a1e920b1ff50c136df3dd640cb64deaccd4f187c5af02c586a3d28b8c74dfe4143893
 EBUILD py-cpuinfo-6.0.0.ebuild 530 BLAKE2B e754b8e37910a0518280b6a5023a46c2da6de338e28e0a3164a86516a25a4f5b5d444e5c08b668dd60430b77d87915d1df2100d2672ca9444cc73299376ae712 SHA512 d159b906e76a897f208569eaf7374b83a25caee689e389ce90ce21bd5e2e7bff6f553e4d74aab7baddc2f4800b2d49843851a9f906d6fece7cbbc037ad5ed162
+EBUILD py-cpuinfo-7.0.0.ebuild 504 BLAKE2B f1e2dc4f45fd38ce4f9531fdf338abc93b0b779f7f42248f1dbab2db14b318c30b4a12e9dcae6af43434d30a8db7807b2fb22eaf1658d53b1bd97bb7d76503e8 SHA512 a8faabd306376e5cde22c914e60cf581c9d2963da7e76d4abfdd7d98af21728ea66faf50066f042ded9b87f9ba366d817e754ef2f0e58cf7b458ab1ff9e403ba
 MISC metadata.xml 531 BLAKE2B ae246808bbc91d82d4d635474be548d3a3e5d48cf45dadfe17e13c6b3e766871106c329a1e478ce7f65478cba17bc28673b459c83b6bbe779891a7f86d605ce0 SHA512 388ada1a9c39b57369dfc9f164530a871801149d44a1439679509fc733b90f33256e8f9a5b5ef22af854e5aaa7c9e1857e87943f25f0c4e06eff2c6b64d440d4
diff --git a/dev-python/py-cpuinfo/py-cpuinfo-7.0.0.ebuild b/dev-python/py-cpuinfo/py-cpuinfo-7.0.0.ebuild
new file mode 100644
index 000000000000..2a9d661c1c18
--- /dev/null
+++ b/dev-python/py-cpuinfo/py-cpuinfo-7.0.0.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( pypy3 python3_{6,7,8,9} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+DESCRIPTION="Get CPU info with pure Python 2 & 3"
+HOMEPAGE="https://github.com/workhorsy/py-cpuinfo https://pypi.org/project/py-cpuinfo/"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+distutils_enable_tests setup.py
diff --git a/dev-python/py/Manifest b/dev-python/py/Manifest
index 2203934f3ffc..e3ad6193bf3f 100644
--- a/dev-python/py/Manifest
+++ b/dev-python/py/Manifest
@@ -3,5 +3,5 @@ AUX py-1.8.0-pytest-4.patch 20364 BLAKE2B 8fe8f3b659ef6f586d3de299dcc2e986fec0ed
 DIST py-1.8.0.tar.gz 205096 BLAKE2B e08554fc3e0bae2e2d4515f075991707af29aa5c39e1387e8f8a7dab25e78c7340d389c79936ddea27b1fb0438ebdee8b5e218bbb48c62089d7fb656b1b6dbe8 SHA512 37b9a66229b834a034d9ba6769a46addf098380b494c1eb863607a52d00b7ec5b9157dd7ac6ffc52535a05006648c775c78716d7f85cf44966065b225be6e95b
 DIST py-1.9.0.tar.gz 210098 BLAKE2B d7f9b22ebaedd12534198912c1fa0be80f42e97751701442e060e1c244b06ab82239fe78a3cc7119fa4df5d87ecfd97bfb2568744693d3ffe9824ae1d73e59f9 SHA512 965b2adfe1b13177629ccfcdf6d0a13460683ca7a01d585163deb1af15d926fc86680d9e51660f6cbb8569f822a4d54ce281c029e363d244ddf67e33b102ad0a
 EBUILD py-1.8.0.ebuild 1708 BLAKE2B bf4579b20c2b98910f611fa6c12ae64083e1e274a1062aff8ba528697a16b536e91189cee78ef9add278ff90005dbc7b638f599fe012a6263e1431c05473ca13 SHA512 65bee22f4d16768e8403cf46fa90e93347e29b9850b5a966a437693b2aa26be42140562d6f38a6bab501cd957835293bb0aa88caf5dc64ca68bb06f46770871f
-EBUILD py-1.9.0.ebuild 1279 BLAKE2B b593b7c7e87195d71f9d8dc8f67522a67a8d74d4a84d74559cdaea2530c7e2bc735a1def19cec5f3147d1acb183a3ccd07e5bb5bdc3f85d07f6b22b8a4a7ad36 SHA512 f125cb91420fe2770a5e285c8a0f174ba04ae07e07b891d54a01c29d5a3acf8b4ac7119f88106d759886efb4913da587f4c73fce6f2bfa1ce241b1df6d3c6e30
+EBUILD py-1.9.0.ebuild 1277 BLAKE2B 94c8716883077800ecefdd89af820072932c296f7dac23c2caae81d6230717bd0af0f0863c7423347dd2e3efd5be5855e176fc6894c96bf9f91cfc920c704f0d SHA512 c609ba52aa45702fbfb45fe353f8af62c9f5eda34bb33c3ddc09609d96fd2eada2868f38381570eb21edf8bb6871bcf333326af2dac1dbc73284a9248e6993f8
 MISC metadata.xml 340 BLAKE2B 110b7f7cc26818661b98f60f589a782c0a9ed827fb43a89eef8cd7096045b1cc168410d9525641d4a78dee9709679d4d9ee7c38680caef5f37a73f1e726007cd SHA512 ce65db3c076a27acc6af28c1adecf61bfd7d10872612994fd616c72e91264be87460823055182e3b60f6931f22386d3a9f541ddd16c902fd8e02a6a345e65f5c
diff --git a/dev-python/py/py-1.9.0.ebuild b/dev-python/py/py-1.9.0.ebuild
index 958ce68bf629..69f323e39f2a 100644
--- a/dev-python/py/py-1.9.0.ebuild
+++ b/dev-python/py/py-1.9.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 BDEPEND="
 	dev-python/setuptools_scm[${PYTHON_USEDEP}]"
diff --git a/dev-python/pyClamd/Manifest b/dev-python/pyClamd/Manifest
index 46a0a69832c5..ca7f7574d0e5 100644
--- a/dev-python/pyClamd/Manifest
+++ b/dev-python/pyClamd/Manifest
@@ -1,3 +1,4 @@
 DIST pyClamd-0.4.0.tar.gz 11177 BLAKE2B cb69c9e1fec936d416a18658a2c3e9df4dc4684cf56c19e8a02ad9929b4c86d9985395c38a8f88f7053f81fe08fa3574c6a206bcc519a9494c2a61caf6b995b1 SHA512 b96e26729e0fe2600572534c0fa22a01238761589f1771e72a054dde9c1b8f122493c83ca04cffda167f7a0e44fbf309bdf76b8fe1de499ec50d56c677923bd4
 EBUILD pyClamd-0.4.0-r1.ebuild 554 BLAKE2B 4dfb141be54f4fe27f32b943538e8ef3287b6eec53b5a249039c163b7126afb456120ede3ae3cf47692bddca9cbd2ad2f37398d36ed4722aa6728d33ec83c155 SHA512 6ad49cfce596a64d128e0d8f6ef226ecb033ec3eef772f57fab2bb0c6265fbf80d3fa16d4046ee89efabc051d96899ec5b3242bd4113a7c5a01ab5ef1bdaa5e0
+EBUILD pyClamd-0.4.0-r2.ebuild 558 BLAKE2B b2b8dda1438db965b235496e3e46b361fc62713e7769744fd3b764e2c8f509be941919d5c97c050fe7c60b1418dd76f75612ec5a593a65c913d0e7f60c229cf4 SHA512 b1bd152f1cca4a5801aec58f372e5654b82c01379e1e948d3d8c153cd897b9aec47a6408b17e7907cfefe47128cfcc480827bfc729e56faf59003752f6d9f66a
 MISC metadata.xml 294 BLAKE2B 5afec3e518db21e9f221a65a2229a99361b4aeab9c53ca3e7b8676f5b3b18b36f0e327b9a1d806c43c1470105da4200e7c46e6a03364c05e5c6970fea9ce6a2e SHA512 7a1d0eeba424c98b65554c534cdadb43674818c8f7d2ec4b366ce35d7cdac32474cc761915285b12ba798cb1c703a74d54dec9779a142c199e9e76c05a370043
diff --git a/dev-python/pyClamd/pyClamd-0.4.0-r2.ebuild b/dev-python/pyClamd/pyClamd-0.4.0-r2.ebuild
new file mode 100644
index 000000000000..ac100d23389d
--- /dev/null
+++ b/dev-python/pyClamd/pyClamd-0.4.0-r2.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9} )
+
+inherit distutils-r1
+
+DESCRIPTION="python interface to Clamd (Clamav daemon)"
+HOMEPAGE="https://xael.org/pages/pyclamd-en.html"
+SRC_URI="mirror://pypi/p/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	default
+	sed -e 's:/etc/clamav/clamd.conf:/etc/clamd.conf:' \
+		-i pyclamd/pyclamd.py || die
+}
diff --git a/dev-python/pyasn1-modules/Manifest b/dev-python/pyasn1-modules/Manifest
index 6471ba1e3712..822a58440594 100644
--- a/dev-python/pyasn1-modules/Manifest
+++ b/dev-python/pyasn1-modules/Manifest
@@ -1,3 +1,3 @@
 DIST pyasn1-modules-0.2.8.tar.gz 242864 BLAKE2B 22b6cc27d45d19d8e7f5b12c8aeff1fa379bd567fda6b1dc0fafd00c0f4367d32f21cd48cf3cba140f2f11ba7d258140e8014c8420300451ab1acff475d28da7 SHA512 fdfcaa065deffdd732deaa1fa30dec2fc4a90ffe15bd12de40636ce0212f447611096d2f4e652ed786b5c47544439e6a93721fabe121f3320f13965692a1ca5b
-EBUILD pyasn1-modules-0.2.8.ebuild 777 BLAKE2B 664a6c0aa856cf5795ee6af36dc2b4167b3bd7edaa6cf8b500a3f2f7b18b0dbfd205ac0d6305d110ed5b652ed1112b2a377dc15b925198f6991be3ce45622453 SHA512 470a607a82c5bd105470c9568eefdfff71ec9f73b6d0760b6c22854daaec9188c00447976ac02cced7bded32ade6f91a72b46e562d2bf9fb5cb7dead45d113ab
+EBUILD pyasn1-modules-0.2.8.ebuild 784 BLAKE2B 14b47bd035a5ef2f0b6c6ca1626717466179fb2cd23ae681526751f0f9932d727096d6a76e541b50ad3046cf6ae8f9666c0613112283e51a442ee6910acddac9 SHA512 674e7b2c6b6513156cef2ea7bcb2753c7d0d503fb45c3bdff81764748339509288980bb834ae9a8b4cf4e615456648f911ddb8362ad089ca79f5128d0489bf37
 MISC metadata.xml 405 BLAKE2B add7a93411177af899c2635b8222655804111e50ebbd82de341a19478a2ebbf8087efa7e473732d131af3db70fefc0d8d495eeb98cb927961156d65c0b8ff06d SHA512 fd42b04e0186119d96caeb401efb0d8810c837bf50a349d1a0ad9a38323c4b42226a5e9202ed4530823343c877895214e6eb92f9760c7599b2a6843a79261246
diff --git a/dev-python/pyasn1-modules/pyasn1-modules-0.2.8.ebuild b/dev-python/pyasn1-modules/pyasn1-modules-0.2.8.ebuild
index c50ac1108988..10b78b290a0f 100644
--- a/dev-python/pyasn1-modules/pyasn1-modules-0.2.8.ebuild
+++ b/dev-python/pyasn1-modules/pyasn1-modules-0.2.8.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/pyasn1/Manifest b/dev-python/pyasn1/Manifest
index 90d69db01d39..21c74096806b 100644
--- a/dev-python/pyasn1/Manifest
+++ b/dev-python/pyasn1/Manifest
@@ -1,3 +1,3 @@
 DIST pyasn1-0.4.8.tar.gz 146820 BLAKE2B 5c00b47c2014e599d1aa2e14c3004b3688786c7afd160c85709d5a0f324166abb1d29ebbd9f3e13100166e7176710e4dc6e1b8fcf80db5f5bdaa202912f8a023 SHA512 e64e70b325c8067f87ace7c0673149e82fe564aa4b0fa146d29b43cb588ecd6e81b1b82803b8cfa7a17d3d0489b6d88b4af5afb3aa0052bf92e8a1769fe8f7b0
-EBUILD pyasn1-0.4.8.ebuild 566 BLAKE2B 775b86f14eaf63bc77f95ec7b418c30375abbd61d0aecd669d3b79441225f417281f6063fb3c3da56d6119742da8c01ebeee8adf0d9c0d3a4674b943c512e78c SHA512 b44f001cb1c0ded2680dfba68c000c3e56b57a9a03f40bf4c332f574b73b482a26d253dc4822d10dc9c00d0b9016ea3ae625c5925d4ce5e66866d5be3f1309fb
+EBUILD pyasn1-0.4.8.ebuild 573 BLAKE2B 4b80c3381201951facc85a5477b24883742bc73d305e92ed3a23e35728e4a145dc257afacbfaf5615567b607cae4dddbfb9a3a1682305a14d0487d94853bcdfc SHA512 e45b3b00e198293e1d6818410b713e20171de93988a748fcfbb1f2f64774b93a16950730b31b777510c3170dc70aa045169446d57c9b7ccfe53aef237d9e1945
 MISC metadata.xml 453 BLAKE2B 0a3c1a0971fb35d969c1c04b7b0a81c82935306249537a640d581aea84979f52f9c762e6761a4d7278bb0e4ad252cb522f26eb2cd9b91a6b80275a7e031016d5 SHA512 17fb0536bb137058ef242036076ba1f7366f03a246903286e7288452b81f84036548bf11dfc0b5c2bb18aa4f7ba83608634c17aa9e1c0d268c99afef4f9edcb8
diff --git a/dev-python/pyasn1/pyasn1-0.4.8.ebuild b/dev-python/pyasn1/pyasn1-0.4.8.ebuild
index 6e4a519e6723..665debfd5a89 100644
--- a/dev-python/pyasn1/pyasn1-0.4.8.ebuild
+++ b/dev-python/pyasn1/pyasn1-0.4.8.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE="doc"
 
 distutils_enable_tests setup.py
diff --git a/dev-python/pyatspi/Manifest b/dev-python/pyatspi/Manifest
index c6ed737357af..17515e3bce73 100644
--- a/dev-python/pyatspi/Manifest
+++ b/dev-python/pyatspi/Manifest
@@ -1,5 +1,5 @@
 DIST pyatspi-2.34.0.tar.xz 314060 BLAKE2B 1d2c390c6f110a37e9553b1f1aeba75fa0585beabddb2d6db54aa8fddc671b844e7c670c7fdf9696e3833c8f9619dc8a2ecc364019f14703647e7996033c7dd7 SHA512 61b157f067e23b7a964cf8268f556ad059982f448e436ecb25c96915ecb53918c6ab7b29bfb4e7b85e25e6038e27678fbd3d0bfb61d14a038ab5eaeee1f682b4
 DIST pyatspi-2.36.0.tar.xz 315076 BLAKE2B f3f92dafab68ce003e9d63f8ebf901ef834eafb1fab3ddd2051dcfb308b79d7ce6fc4d9187ed51f3af8bebad5e6ef2296c19215ee209ad37fe717f332af8d8f7 SHA512 709236fd992f570426043e32b201bdfee06bb28faa3d1237778f4069d3548b88b8336e53c0951359f5c7e2914b90f6f682ac58e33c84e32f360bdc32662800af
 EBUILD pyatspi-2.34.0.ebuild 1232 BLAKE2B 43516e905b00fbf3686785c5f92c7f6687e8ad7675a81b515a34ef32c4aad5778c8caf28f4eaaaf1b0bbf56eb1c71517ce274254ec574c46d9c4d2e5cf57bec1 SHA512 fac094885ab5740b5dd759cd0fb32e98d412074df535797877ef09d884865e0c58eff5d454144d30fed4a0711d99bbb6d6de918590751ec7c68230654c457bd3
-EBUILD pyatspi-2.36.0.ebuild 1362 BLAKE2B e0324ad84d5f7e33e80e17be002f21d3f72890285582fc8bb55dedf5839e45e0b49b8ab0dcddcc27d9b7b4c02b849ff38c06c551875a34e9832eafd36b5c070b SHA512 f26e07b2c896993d6531035baec942368b7a495be7324cded9ed236bda1a928aa2d8e8b911d1c849fe34d727e0ef809a2536d4f7e3a5d4e8d57fb622aeef755a
+EBUILD pyatspi-2.36.0.ebuild 1361 BLAKE2B 30fae97145e9978d8f821d14e9c3ce322551b2593cc512dab79f779c52ab7c35d94b19ce484916d7e7716b94ee2fc1a5844e424a038649d5249f666941ed3630 SHA512 b6bd48082c8da2a85b527d139ef02ec9094eb7c1df7f7f94666a28b5b59aab6d883d10e2c079b2e5b21d9140e0d50827e84b81da6cfbacb776bee3623446d43e
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-python/pyatspi/pyatspi-2.36.0.ebuild b/dev-python/pyatspi/pyatspi-2.36.0.ebuild
index 4c5230acd974..803dd65fb50e 100644
--- a/dev-python/pyatspi/pyatspi-2.36.0.ebuild
+++ b/dev-python/pyatspi/pyatspi-2.36.0.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://wiki.gnome.org/Accessibility"
 # Note: only some of the tests are GPL-licensed, everything else is LGPL
 LICENSE="LGPL-2 GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 sparc x86"
 
 IUSE="test"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/dev-python/pybind11/Manifest b/dev-python/pybind11/Manifest
index 79f912d8e8c6..cacfa60ad8e8 100644
--- a/dev-python/pybind11/Manifest
+++ b/dev-python/pybind11/Manifest
@@ -1,3 +1,3 @@
 DIST pybind11-2.5.0.tar.gz 573769 BLAKE2B e46d99f873f8266efc577d3e0ab1e8a78784a45c35995bc3486501d627698e0fb10205008e8cb82c84e971f20cd02a6d2f08390f3a3041fff1a21c45f11b197f SHA512 7f3a9c71916749436898d1844ef6b112baf0817a386308b5df8dec2a912ef4b6a932b94965e98f227c49fa77312f131972a6039f23b84a3daf6442a8ab0be7c2
-EBUILD pybind11-2.5.0.ebuild 1303 BLAKE2B 8de7024e7289b6b0f087d832152f4cc0b733d8e445d7c587f4ac366185ed59aca45d76d4a0fef53262234e002c2cc0564339f512aa940afbd8812c60cea2929c SHA512 29de39860e46956b71ef265207ae197608f7a6d867ecee3c75300b0bb13df58acb84253d7885102d0eaceb278d330aecf745a080f9f9e664e4de46d6975e0530
+EBUILD pybind11-2.5.0.ebuild 1302 BLAKE2B 52c61ccc0c7de0eaaa6f39fa4e6496f72893e948d65bc84f3d544bac9d2d79c13843b4fbfefec6f61f106de4542056323bc2e7e9f4309530a99597d84623ac78 SHA512 9cdb6b256fd146d4d3113e57f8e944bb7e793609c27796c7bb9a5e2076620302413dfd1ed4138ae9ba5f70e7cbcea1f437c7a562f2a618e556cdae827f2b2fdc
 MISC metadata.xml 348 BLAKE2B 06ae224547d14422e51d6e07615adf51fee22afcde2391a4483a8e1937b932a4268f0b31b94d4df12bb06804101b0e6b51614f0ffcb601a4fa34616dcc939377 SHA512 02a7f6afd867bf9f7832a9c8b2d1470be6b1fd537ae8f9509143bb6acb3af75c1eefa38b330bad6aa5e2c37a1158b4b0260277c6307a9b97d144d6c3695a855b
diff --git a/dev-python/pybind11/pybind11-2.5.0.ebuild b/dev-python/pybind11/pybind11-2.5.0.ebuild
index 60f04a27366c..7951de5e881e 100644
--- a/dev-python/pybind11/pybind11-2.5.0.ebuild
+++ b/dev-python/pybind11/pybind11-2.5.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/pybind/pybind11/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 
 RDEPEND="
 	dev-cpp/eigen:3
diff --git a/dev-python/pycadf/Manifest b/dev-python/pycadf/Manifest
index 346b48887852..c8c0f5148c6d 100644
--- a/dev-python/pycadf/Manifest
+++ b/dev-python/pycadf/Manifest
@@ -1,3 +1,3 @@
 DIST pycadf-2.9.0.tar.gz 249992 BLAKE2B d6c1fd12991e24fa747e2f0ba35719faf6b4392334957ead977901f14c8cd98b26f1f93e4b866085e73b7009f66a1ce692e58e478ec501dd4fa988ebf11c2f5b SHA512 da94d778db2fa06b129ae5e85151e301eb68b9ca551fe33f86a9e627cf2c879c71451df140dddbc6d3dfcbac4b6939fce6748711549400713e96165b6673c356
 EBUILD pycadf-2.9.0-r1.ebuild 1845 BLAKE2B 334d4a07eafc927e5ac3a1ce1d7d83791e55be3f123390ef76aa533feae6b2f3fc05086a8029e242aaef9ea08333758aa468465bb8837404ab58a9691913b2aa SHA512 13d5755670962d08a5391af3c915e1efe04defcfe5c24c98f6457aa92e4b4faa7ab50d0138aae538e32d1ab22f410e2dd15ff5d0920902c505be1cfb8af5297c
-MISC metadata.xml 555 BLAKE2B 87869fe50262ccda3c9f08312ba7d4017e655da6e4e18e31bf8dd99cfb552ea2a1a13cd71793bc00feb6d6d362c19bbc6fcff9779ffa7334db96833548b567dc SHA512 370b97a8a71e49aa553cd6d56b5060074fbfcf366e84672527e8ce49e086c3393198a6afc7d675ce7db71fb8c2abf7bbd4921140da3180f78eee687a2edadf0d
+MISC metadata.xml 440 BLAKE2B c449dc9e0b25b81f29c54539e788d03d32f2aa5bb751c490dede35d9d8429ae320e604aa62cf3afb6b3d8deeeebdc332ce6309dd2b3be7823947e589cf237a0f SHA512 6d92ddb43e9a63829d93535978ba2f70d6960176c2cb84cf805574ec7db5f4a20ad600557fc823d4df4aee397dae90d3a4f529e9df8782bc4aaa096fb4c2b059
diff --git a/dev-python/pycadf/metadata.xml b/dev-python/pycadf/metadata.xml
index 8ec77b898826..e015cfd2e1da 100644
--- a/dev-python/pycadf/metadata.xml
+++ b/dev-python/pycadf/metadata.xml
@@ -9,9 +9,6 @@
     <email>python@gentoo.org</email>
     <name>Python</name>
   </maintainer>
-  <longdescription lang="en">
-    python implementation of DMTF Cloud Audit (CADF) data model
-  </longdescription>
   <upstream>
     <remote-id type="pypi">pycadf</remote-id>
   </upstream>
diff --git a/dev-python/pycapnp/Manifest b/dev-python/pycapnp/Manifest
index 7785bda3d319..beb41419c512 100644
--- a/dev-python/pycapnp/Manifest
+++ b/dev-python/pycapnp/Manifest
@@ -1,4 +1,4 @@
 AUX sdist.patch 437 BLAKE2B 772ad2962f35c470496d2d13ccababa442183e12df2274c207bc9944e889c14aa72c27c90512dcdda7941ebe68324f706ffd033a39fff2e89ae0f757becdcb28 SHA512 1036fa52cc7df49740d9c4cb06f4fbdce52c2de9181d44559ef4182e6f469d0236bc8d0103576516826b78a0e1d6a841a89d15e1b2283a8fd2099b205fc0b222
 DIST pycapnp-0.6.4.tar.gz 531404 BLAKE2B 035e0f37292275af8d5e292cb98f85f3d40ffe6284c0defecdb6d0c79afac97e4570e0042c0be6716a992ab904b844c9f046c5795b97cd8b7dd7625af1b2b219 SHA512 3f2c9d93bcf226fb39ef233b8b5fbc86af73d796986e82b897a571db5d8223fb4f65cc28a8bf4ed57b787b6e5defdca70388ac865f036daff48d6d6f93cbbfc3
-EBUILD pycapnp-0.6.4.ebuild 792 BLAKE2B 1b4406f7795e25eb3e72ef6ecd74b5d54ab38a9bbb9d0c493c66e44315d42b8cfeb1035ab33c42f6d31271b76dff8e97a78acf2c27cda443643baa1e670a3bad SHA512 431d5b23ae020b882ba9c0fb745137592e7b0079e95fde0317cbc74c64382ccfd9abd3e1746dd5f008c7997262cb119e1b7deedc6f4c53ccb4df0dd95bf82e99
+EBUILD pycapnp-0.6.4.ebuild 796 BLAKE2B 8e2c593a7c6b508987db6f383b0b9691de4e702c18d92ea42da860d30d3df02ad827587b406c32bbbd3b0554894b0b2cb0ad2bc179204253a35aee0df03a3488 SHA512 73c6c07315687638eac8c95d64f82c298b401a89b86b24b2cb2fe6596b2b9b0701b4685c3186e5a6812b21e04127462e2af1846499f44c3c4710a0142f832b93
 MISC metadata.xml 514 BLAKE2B 0294a7ef4293cdef64d7a287cc824e81b4c22b75ea1e7c2f770c756a56c5c251610e006bf63a28b549527b99b9cc958a5535d43a1c822d9ad724c45f1113e5bd SHA512 10bc088e1650bfa18b74023ba1cd5fd78618051febe89be2756ba0aa706cd695ca98548096392a60a38c94ab168660f347c6e73e2789c32acf7eb927de7d2923
diff --git a/dev-python/pycapnp/pycapnp-0.6.4.ebuild b/dev-python/pycapnp/pycapnp-0.6.4.ebuild
index c8e8551a477a..3c53d702de38 100644
--- a/dev-python/pycapnp/pycapnp-0.6.4.ebuild
+++ b/dev-python/pycapnp/pycapnp-0.6.4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/pychromecast/Manifest b/dev-python/pychromecast/Manifest
index 9f5c3d6cdf1e..953ce1ac75bc 100644
--- a/dev-python/pychromecast/Manifest
+++ b/dev-python/pychromecast/Manifest
@@ -1,3 +1,3 @@
 DIST PyChromecast-4.1.0.tar.gz 44463 BLAKE2B 3ee92cfe57134665621c347dda9b21a06fa1d000f840d25b49f843edef86e35e22b82c9d4f80b8e0ae6f5fabcc4662d7c619363686a37903e27d84e0f85c8fca SHA512 688014a115f3189fed5535e70622a7323e4a29fd65678aa14a302047c5246dbc6a932a8f4eabb58f9fcecc0f4bdbe627d1496a4b6d28e680ad4fac6dd902c825
 EBUILD pychromecast-4.1.0.ebuild 706 BLAKE2B 6d6869ec8953db731ff349600fc82cf4fad509c21dedb0092436f00d7da42d8c03ef935a529f0df2216b03c58e5b77eb03deb47b507262e41bd277f3dca86f32 SHA512 89e0e175391bc8567f0802a8951700f5de70317fedaa97e823fea53aa2165839fbca875be91123960851b8957145ca20dd20efc7f06a3267a47af74f83e95c2a
-MISC metadata.xml 455 BLAKE2B 1fc5a60702092a7f317262f9410b93a330e07f99221b42e58a9f1855eaa370350cffe1e1d2535e2ec116ee0b82687e9b6fb65d9af176314df726e4a8d3d78749 SHA512 d9ca042a81b58cfeafaa5e06b8d2be4f71ddec498ee6f7e6619ad24a6223ab68e3e99a43329344738b1fd6a61a6f771ce0d58b2643e739d836565f977c9d7eb2
+MISC metadata.xml 333 BLAKE2B 1a681ac99aee289a919b530bb87037df6fe53b044ce14ce3a9da3cec54a73d7fde58cf01f12678f18397d16b56c9e5bf88d289ddec4469e343d7193502124124 SHA512 a73512d246562e6591eb9c8d13759352cede7f0ae978d02c87bd72b1fe2c9b155cc3908e8489b136387bada61f1257d8e0771e01e26d998b51f9ce13c087ec41
diff --git a/dev-python/pychromecast/metadata.xml b/dev-python/pychromecast/metadata.xml
index 24fcd1714e2b..3ee70120def4 100644
--- a/dev-python/pychromecast/metadata.xml
+++ b/dev-python/pychromecast/metadata.xml
@@ -8,7 +8,4 @@
 		<email>prometheanfire@gentoo.org</email>
 		<name>Matthew Thode</name>
 	</maintainer>
-	<longdescription lang="en">
-			Library for Python 2 and 3 to communicate with the Google Chromecast.
-	</longdescription>
 </pkgmetadata>
diff --git a/dev-python/pycountry/Manifest b/dev-python/pycountry/Manifest
index b378811ced69..491cf9a06815 100644
--- a/dev-python/pycountry/Manifest
+++ b/dev-python/pycountry/Manifest
@@ -1,3 +1,3 @@
 DIST pycountry-19.8.18.tar.gz 10003160 BLAKE2B ac7894e9fc1ed4e8f386cc6e07c1fc2abefee63c39c7c851c100519418606b52bc18be8da672930ceefdc7ca7b51571e4b3884ea0c20e547e5b596e249ebf407 SHA512 39ba06629eeea55460424d06992ca5f1e5bf6168b219dc4880ec326f6aa0c92a4fdc54d4143a8b8bb1490149af793e760e291c6d704104a57ba91e88228ab669
 EBUILD pycountry-19.8.18.ebuild 902 BLAKE2B 80b782a69ee57cbd3aa573eb92ffc7addb6f9e793c32870b7e8a61543a78a9542264f7672b0b2fd3db9dfec58856dea5e8a0936cbb1f7206f01c660ff99107b8 SHA512 0e5b22e1fad3d0ba447ff6596c549c3e6270cab301b53b42df8ce34e80e4af12264f6e4189af68fef36920464c0017689b916d27231b4d721f1fb888693f8b6f
-MISC metadata.xml 515 BLAKE2B b39316b60d9676dc4fa8aca9dee6234fd8544ccc98799c66b62d3f238bb3a54e18ec723b4f3dab7b6b075175f864793e79d761362c83fc99a3ba3160214d6611 SHA512 850daa7c8f083a51f534d898469cc6166f632c5081d4a8e1988787b2f562465464dddeb349c67294b22858e517a1766dca60c14bf1df4ef7c488ad59b913756c
+MISC metadata.xml 376 BLAKE2B ef3ecd43b3e7ddb74704800edb1d4e10d1cb0b8ed422400fc8d8f695c6b1b067c9c3a3da1eddd6c45ee7a74349f0188ad30547230ae5c2b01524fefd1be15a39 SHA512 f96945c42bd3b18b148257a3cbcd726848c4311f9186bbd68c6af81d1850ed1c113c61d519d7380f4b656b2352e3378fbf02705720f9a4aafc3c4502b10f180f
diff --git a/dev-python/pycountry/metadata.xml b/dev-python/pycountry/metadata.xml
index f046b0f72b6c..1d74157770c4 100644
--- a/dev-python/pycountry/metadata.xml
+++ b/dev-python/pycountry/metadata.xml
@@ -5,8 +5,6 @@
 		<email>python@gentoo.org</email>
 		<name>Python</name>
 	</maintainer>
-	<longdescription lang="en">ISO country, subdivision, language, currency and script definitions and
-		their translations</longdescription>
 	<upstream>
 		<remote-id type="pypi">pycountry</remote-id>
 		<remote-id type="github">flyingcircusio/pycountry</remote-id>
diff --git a/dev-python/pycparser/Manifest b/dev-python/pycparser/Manifest
index fd3e4d36eb9b..95ca50842b38 100644
--- a/dev-python/pycparser/Manifest
+++ b/dev-python/pycparser/Manifest
@@ -1,3 +1,3 @@
 DIST pycparser-2.20.tar.gz 161330 BLAKE2B 9a114e4b73e6c3c495bd78c393957146ec425eb5b15d72266cbf424f15e8d2e2e6402ef36d60a9dff41b393aab80fe1356befd25549517f398e129836a76b037 SHA512 ff0853c9f981b43b4f2e879350715c07b02cf9dab223d4980d8fe0a3138c98041b5f848a9355ae4f1cb45e7f137c03a88843008e18d77af9250e0d9c55f5ca1b
-EBUILD pycparser-2.20.ebuild 1676 BLAKE2B 3ebcf538175273151c08e46e0d9be1c2f7ec80f9be5678c0e6f74b7e1f1dee72e349474573d33b424ea7b17b926813683148765ed820eb6233f8556a00de40fa SHA512 87d9174b8b8f5dfa4adc0abe9a4c214984e99709fc22f602561c750e7525b66e5cad21533d92e2a3e81d23d30f1b92510e75d39bd1fdbf853890c4ea5a10fd9b
+EBUILD pycparser-2.20.ebuild 1683 BLAKE2B ad7cab4e547bcea5362f5de8d0207fef55b919b677d7297c37ad934980b2ac40bb7ea7d84f6909fdf4b73ecc7226534d73564a15ca642ce01a94dcefbfbff02a SHA512 5c92fbd01060822351c8b93026096499b587da471b2687c97213840e2285f6957de58114d4cc29b907a27339cf4b87715ca7b1b494b50f8ee2ebfdb7a4b02ae3
 MISC metadata.xml 380 BLAKE2B b013fa2cb5c61b39b122c1c051ce40a8c002d4d4c6995ab78e0f3a35cec07d2f81cb5b05326ddac9c2526eb3ebcf90bc2660f588c4ebe5bacbd1a861fcf91985 SHA512 98ca8c63733123ae6a1d1c8b338d5f98a679b8f84b1e0abed8dc7fefa5549735a7f4de9a5851a26507a6169336fa46689616e46a49df0e9a52f6efb669eac865
diff --git a/dev-python/pycparser/pycparser-2.20.ebuild b/dev-python/pycparser/pycparser-2.20.ebuild
index f70df58cbc19..86f47ce182ea 100644
--- a/dev-python/pycparser/pycparser-2.20.ebuild
+++ b/dev-python/pycparser/pycparser-2.20.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="dev-python/ply:=[${PYTHON_USEDEP}]"
 BDEPEND="${RDEPEND}
diff --git a/dev-python/pycryptodomex/Manifest b/dev-python/pycryptodomex/Manifest
new file mode 100644
index 000000000000..9e4767cf9548
--- /dev/null
+++ b/dev-python/pycryptodomex/Manifest
@@ -0,0 +1,4 @@
+AUX pycryptodome-3.9.4-parallel-make.patch 756 BLAKE2B 06a79eff056ecb983131838287563d4d60896f27e28d5c2534f4ab008e50017694ac9355b43f8f387cc29abfd21ffd648233c3dbae33a06fcedb12a6c7e11e80 SHA512 06b42ea780bd374cf5cb5d6cef3fade5d695c1ee0d765e2659408da7645ad311eef2028f17d8ec0289d49c3a5851b4c63503d7c922de15873dbbf16d0db58b08
+DIST pycryptodomex-3.9.8.tar.gz 15633485 BLAKE2B 3d7b8a74d2f7cc0f47c73f3f3d1dcf13c8b9feb9f2f532dc48751c4a73915aa081ecf273a81731076070f054f5b2037a5eba9054ca71e549aad18ed0c3148c74 SHA512 bcc5fb27a89c00e6348eacc744a23d687d0b308d5c8ad8f6d955fe2b9e84288a592206336e7fef699800948f8ea7b1ac06d2bec60df0b9ff0fa32d0a05380869
+EBUILD pycryptodomex-3.9.8.ebuild 1326 BLAKE2B 2ad09640a04fc98b7ed803a3b843d52edd55bf14b8b62de34dfd35fd63fdf5979a5fa5d745fd8f675048b130e504aa7f87799f303be6a5efacb30f6f8f1b496c SHA512 5ae9a1e0a9f7db68fa43d13bfc6489f680fb400c651e08ec651c33e94d0181f1a5411b5f0ad31859a66c08f753661034b30aa40da7926fa0e614a98f2d4c8101
+MISC metadata.xml 445 BLAKE2B 0486ce910a7107f8fd04a495f27f6c830ac8e2176442c3be759aaedfa43439050e8da73d0a0e58343e0fd0fa5ff1845dbe55bfeef814b395cea764104dea52a7 SHA512 957a228f0f1d67f803d5faf5f143bca871f3e83849b5d02ef6b5454247e085f93776eb14880dd9e4eaa18da149a34ff2f9b1e783df40f2a749ac6be813d3ac2a
diff --git a/dev-python/pycryptodomex/files/pycryptodome-3.9.4-parallel-make.patch b/dev-python/pycryptodomex/files/pycryptodome-3.9.4-parallel-make.patch
new file mode 100644
index 000000000000..331333533f10
--- /dev/null
+++ b/dev-python/pycryptodomex/files/pycryptodome-3.9.4-parallel-make.patch
@@ -0,0 +1,22 @@
+diff --git a/setup.py b/setup.py
+index 1d70caad..c72f64ff 100644
+--- a/setup.py
++++ b/setup.py
+@@ -364,7 +364,7 @@ ext_modules = [
+     Extension("Crypto.Cipher._raw_eksblowfish",
+         include_dirs=['src/'],
+         define_macros=[('EKS',None),],
+-        sources=["src/blowfish.c"]),
++        sources=["src/blowfish_eks.c"]),
+     Extension("Crypto.Cipher._raw_cast",
+         include_dirs=['src/'],
+         sources=["src/CAST.c"]),
+@@ -427,7 +427,7 @@ ext_modules = [
+     # Math
+     Extension("Crypto.Math._modexp",
+         include_dirs=['src/'],
+-        sources=['src/modexp.c', 'src/siphash.c', 'src/modexp_utils.c', 'src/mont.c'],
++        sources=['src/modexp.c', 'src/siphash.c', 'src/modexp_utils.c', 'src/mont_math.c'],
+         ),
+ ]
+ 
diff --git a/dev-python/pycryptodomex/metadata.xml b/dev-python/pycryptodomex/metadata.xml
new file mode 100644
index 000000000000..ff92fe1587b7
--- /dev/null
+++ b/dev-python/pycryptodomex/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>chutzpah@gentoo.org</email>
+		<name>Patrick McLean</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">Legrandin/pycryptodome</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/pycryptodomex/pycryptodomex-3.9.8.ebuild b/dev-python/pycryptodomex/pycryptodomex-3.9.8.ebuild
new file mode 100644
index 000000000000..485ba9c9ea37
--- /dev/null
+++ b/dev-python/pycryptodomex/pycryptodomex-3.9.8.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} pypy3 )
+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="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND="dev-libs/gmp:0
+	virtual/python-cffi[${PYTHON_USEDEP}]
+	!dev-python/pycrypto"
+BDEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/pycryptodome-3.9.4-parallel-make.patch"
+)
+
+distutils_enable_tests setup.py
+
+python_prepare_all() {
+	# parallel make fixes
+	#  Multiple targets were compiling the same file, setuptools doesn't
+	#  understand this and you get race conditions where a file gets
+	#  overwritten while it's linking. This makes the files look like separate
+	#  files so this race won't happen
+	ln src/blowfish.c src/blowfish_eks.c || die
+	ln src/mont.c src/mont_math.c || die
+
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/pycson/Manifest b/dev-python/pycson/Manifest
index 75d3c1e9fe4b..d623b7fa52a9 100644
--- a/dev-python/pycson/Manifest
+++ b/dev-python/pycson/Manifest
@@ -1,3 +1,5 @@
 DIST pycson-0.7.tar.gz 9970 BLAKE2B 4ea59d558cd668b0ee074d22f19509056f5b39ee35289fb4de9123ff39472121a2cf57cba59888c43275c3a8ead2fdee2355b654aecad4fedbf796b478c02c06 SHA512 e8a48afbdd48d4250891d449c80f99bfc668e128a2784c1b951acd7e217cb66f6e527a7d417be3c5362930d426fc189cd3d0a7f4b2e41df351d2347f44d0e206
+DIST pycson-0.8.tar.gz 10448 BLAKE2B 55e2ec4a447761d6764e9f25cdff534d3dcdf2a0e3bfd9255f02b1a5cd9834e4f4323ba47a1659ea973f995c34519622e36c691bef763ba83c8caf87fbc49f58 SHA512 873f1b0d825ad318ca5c62fccbdd12a8738c8b9ff58b4fe27ea611aa47575e24218b5010f6d6b12f5ebda835c2778dd15472ca5c73b634b3004aa08496f45328
 EBUILD pycson-0.7.ebuild 480 BLAKE2B a7f5155febcdc5c0593141691a2d6becace436505ee43d80fe92bdac21b6f07447b99e7e0681171a88878b96ff23aa5267f2928873e80cc0fbb4dbee315b0a41 SHA512 fbd73f3ffae4560197959b5601e4546e5e01bb9b6007cfdf5d1ba23c90e3eb0dd3c9cfc8c9a971361b7e6a41c6610d1be0739d0396b63d06ed4e162073c0fb85
+EBUILD pycson-0.8.ebuild 484 BLAKE2B a4a9f2e6ac0d508bd54ef00c1d8f9a6727de97b420c72ebdff8c8c8324d5bbd4479c16e82a93225425fb9520feeb4c10974133563b211f13399b7bf5c2d5b216 SHA512 cd5fdbb7b50ccb20fdf431d1f4c58c44d3a4030cb057a573be9c98600ad9afae9c52b23040a3f55d34b55c3ebf6346aa6d139d7627f78d561210c4f0e0d967a7
 MISC metadata.xml 378 BLAKE2B 6219f2f67b53bfb416508e9d0701fdb719fa45f6748c2a31d4eb7df19cb80cb25f774c19bcdef069c65d34952839c06e3d597da3187d500eeedbaa3bd5fcb24b SHA512 7f3674a4976aa6c6591771922354183b1c448fbfd204ab9be0c160604f220fc3e6d483c155f8a06a47f7808e0ed79943843ad7ce5c03f3679808a58fa2377095
diff --git a/dev-python/pycson/pycson-0.8.ebuild b/dev-python/pycson/pycson-0.8.ebuild
new file mode 100644
index 000000000000..92211e1ff6d7
--- /dev/null
+++ b/dev-python/pycson/pycson-0.8.ebuild
@@ -0,0 +1,13 @@
+# 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 parser for the Coffeescript Object Notation (CSON)"
+HOMEPAGE="https://github.com/avakar/pycson/"
+SRC_URI="https://github.com/avakar/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="~amd64 ~x86"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="dev-python/speg"
diff --git a/dev-python/pycurl/Manifest b/dev-python/pycurl/Manifest
index dc4fd91b43cc..351942d22479 100644
--- a/dev-python/pycurl/Manifest
+++ b/dev-python/pycurl/Manifest
@@ -2,6 +2,8 @@ AUX pycurl-7.43.0.5-cc-cflags.patch 1145 BLAKE2B c67a94b7ee13c784d8ddd3870e00e5b
 AUX pycurl-7.43.0.5-multiple-ssl.patch 5530 BLAKE2B 2a6657c417ccba6d42cefc79721170c6990ef73c85361e31fd6090dfa4a8bd0a74f78343a46032cb550ace7812c5101b587aab24a9b7cf06307f24b1bff879a3 SHA512 2a0c49a95e922414b37ed60e133aaded631cf7b10d10b26d69b2fd083dc991a5170b56a1f28fd9d800c77c331f35dd6216a71699af638096a590f1d03c17bd4c
 AUX pycurl-7.43.0.5-telnet-test.patch 1561 BLAKE2B 640203da8a9b6a13cb5fce187c6699127d8492f0e5ab3a9b8d540b458416a095b474cc84e7ed2068a15e20860e5f7becfe42f010747a8c2a5fa551300e4082db SHA512 58046c87e42ea6f86ee3b23f541e616b33be5f09ee5a2d3d1fd6bce717f59dc52a56a3cd5dc3aaebc9aa5948e4dcad91c1841bf1e1b66f31e66f04d095820cef
 DIST pycurl-7.43.0.5.tar.gz 216877 BLAKE2B 57605fa3426a76e0cdcc1bb4f247985a27439d67d32769945332f94c49eead7fadb2847accf98f0d0994e461fc9d6fd100a181ff6d3ac0765dad31d546a75ff4 SHA512 835ed6cca25d2dd3e7084f905f3b0b082d4af04761fa9d4dc4714865863a97c095c08e6f55ada91b9f60ccad7838328a82fb2add8108aea12056200cf1f12845
+DIST pycurl-7.43.0.6.tar.gz 222895 BLAKE2B 5a923a3d7a57aa553361206fd0c0e43e6ad66a70af72540c08a29903a9a71ed6b9460c06ab6e50fc2a01d1badd45edf41eb36f6dd97fca3c83bef30f12e41c40 SHA512 5625d9e38159fb785afaf539372a8ac658d9118fb25f581f11629859fde400b6fccf65e03a19e182534a78169531304639b1e6f1bfdd2cb09bce95d581b52850
 EBUILD pycurl-7.43.0.5-r1.ebuild 3340 BLAKE2B 9d4b8b02f9c2f274d02a72fc67ac7a563d18b2926dee0ae2422ff94f64bea30da16d90d92504450af2a1c87e4f78870209ff7fc2b0d70763dbd703ff58f9f3a7 SHA512 538fe2175d4e7b4aa8f08ba8f17c8393c2190345a30e5a154b9f5f251f09940a60759c2723dfc9d69c1f4e5d161500cbe75af15ee61e699dc9c7f4b4212f2c2e
 EBUILD pycurl-7.43.0.5.ebuild 3282 BLAKE2B 64dbe0b8109bf5360c992912db7f2897bf1cc90162c3d13aff35dec07cf7d56a17e5367a18d50ce41cc684177b11a62fe8ca3248b08d13138fdf079d48a1ad68 SHA512 e948084e13314e7f30a45cd7775542a64317dcdbb58bde0b672752b7d09e52dc2bb723d776feed7302abc121e5531a6bfbd6e30a69e6d6d21ba61150e3f298d7
+EBUILD pycurl-7.43.0.6.ebuild 2952 BLAKE2B d629ed5149b8ef953e962fac94682ea96bc7a3a0c11dca5ef195ecc076f9b9aab553549462225a752af1ef96179b9e56c7460158f9fef8634ec0bd97d66bcaba SHA512 948d84a2d7420b3eb7a93688b52df66efd3d632c0b270372eb1da3607bc59381de1040c63f48e672ef718b5b3661d371b675d354449fc4a31bca4e0d2301552f
 MISC metadata.xml 1099 BLAKE2B d96159920135d8d85a01449423d1638889d2c6ed9f84d08eabd7405a3271efe85315cece0fc4f6832bd43b622089c819df3d20fd725150c89a0910ec26ac339a SHA512 8f8b3a10d2f72aa67d1b5f7462ea62803d9150cab3d96792adbd65b379a45c074d68809b25d4a2b558bf28dae72e095c598bd0485fce4c5dafba0784de517a6c
diff --git a/dev-python/pycurl/pycurl-7.43.0.6.ebuild b/dev-python/pycurl/pycurl-7.43.0.6.ebuild
new file mode 100644
index 000000000000..b9e03ef669f6
--- /dev/null
+++ b/dev-python/pycurl/pycurl-7.43.0.6.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=manual
+# The selftests fail with pypy, and urlgrabber segfaults for me.
+PYTHON_COMPAT=( python3_{6,7,8,9} )
+
+inherit distutils-r1 toolchain-funcs
+
+DESCRIPTION="python binding for curl/libcurl"
+HOMEPAGE="
+	https://github.com/pycurl/pycurl
+	https://pypi.org/project/pycurl/
+	http://pycurl.io/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="curl_ssl_gnutls curl_ssl_libressl curl_ssl_nss +curl_ssl_openssl examples ssl test"
+RESTRICT="!test? ( test )"
+
+# Depend on a curl with curl_ssl_* USE flags.
+# libcurl must not be using an ssl backend we do not support.
+# If the libcurl ssl backend changes pycurl should be recompiled.
+# If curl uses gnutls, depend on at least gnutls 2.11.0 so that pycurl
+# does not need to initialize gcrypt threading and we do not need to
+# explicitly link to libgcrypt.
+RDEPEND="
+	>=net-misc/curl-7.25.0-r1:=[ssl=]
+	ssl? (
+		net-misc/curl[curl_ssl_gnutls(-)=,curl_ssl_libressl(-)=,curl_ssl_nss(-)=,curl_ssl_openssl(-)=,-curl_ssl_axtls(-),-curl_ssl_cyassl(-)]
+		curl_ssl_gnutls? ( >=net-libs/gnutls-2.11.0:= )
+		curl_ssl_libressl? ( dev-libs/libressl:= )
+		curl_ssl_openssl? ( dev-libs/openssl:= )
+	)"
+
+# bottle-0.12.7: https://github.com/pycurl/pycurl/issues/180
+# bottle-0.12.7: https://github.com/defnull/bottle/commit/f35197e2a18de1672831a70a163fcfd38327a802
+DEPEND="${RDEPEND}
+	test? (
+		dev-python/bottle[${PYTHON_USEDEP}]
+		dev-python/flaky[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+		net-misc/curl[curl_ssl_gnutls(-)=,curl_ssl_libressl(-)=,curl_ssl_nss(-)=,curl_ssl_openssl(-)=,-curl_ssl_axtls(-),-curl_ssl_cyassl(-),http2]
+		>=dev-python/bottle-0.12.7[${PYTHON_USEDEP}]
+	)"
+
+python_prepare_all() {
+	sed -e "/setup_args\['data_files'\] = /d" -i setup.py || die
+	# disable automagic use of setuptools
+	sed -e 's:import wheel:raise ImportError:' -i setup.py || die
+	# these tests are broken with newer versions of bottle
+	sed -e 's:test.*_invalid_utf8:_&:' -i tests/getinfo_test.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_configure_all() {
+	# Override faulty detection in setup.py, bug 510974.
+	export PYCURL_SSL_LIBRARY=${CURL_SSL/libressl/openssl}
+}
+
+src_test() {
+	emake -C tests/fake-curl/libcurl CC="$(tc-getCC)"
+
+	distutils-r1_src_test
+}
+
+python_compile() {
+	python_is_python3 || local -x CFLAGS="${CFLAGS} -fno-strict-aliasing"
+	distutils-r1_python_compile
+}
+
+python_test() {
+	nosetests -a '!standalone,!gssapi' -v --with-flaky || die "Tests fail with ${EPYTHON}"
+	nosetests -a 'standalone' -v --with-flaky || die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	local HTML_DOCS=( doc/. )
+	use examples && dodoc -r examples
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/pydata-sphinx-theme/Manifest b/dev-python/pydata-sphinx-theme/Manifest
new file mode 100644
index 000000000000..4e3705a6fa74
--- /dev/null
+++ b/dev-python/pydata-sphinx-theme/Manifest
@@ -0,0 +1,3 @@
+DIST pydata-sphinx-theme-0.4.0.tar.gz 3276611 BLAKE2B fb260de2ad40f9a3b5e524ef299a5bf2ee9fbe3f36a0b0e365b53a04702f8a5644154535cfa9f1f3c1deced5de8adbbaf5671488b467d3024b9ae3f60a6f7018 SHA512 abe4924277ec41193019e80a26ccb2ce195741fdae9defc9b500ecc2a63ab9070d1eba5a3398415641ef87ccfe8d573ce6fd10eb069e0f13f09891b5b5e2f932
+EBUILD pydata-sphinx-theme-0.4.0.ebuild 910 BLAKE2B bf12b45889b81de57ff9fcf74b46381696c0cc2dddcb89a223013ed2c7d5be1b1a01b85829b1df288020300b233a9375baca178a71db6d81eac05dd89c1e5c77 SHA512 31b263cc7e9745a5a78da76f6a0d6a9f73ae9cc1216666f6b691707ec87028142916542dcadb7edc6d017bf76fdb9c090f54870af1b1e898b13f2fd8a5f1c9b5
+MISC metadata.xml 375 BLAKE2B 393138e315b4eae4dacb9339fbb5766e9dbaa84b7482babaddc08d524fb8b9939f6622ee9c6d09b66c61ac270fcc483fac39996a12ba87ccccf7cafd4c6d36db SHA512 9a44b6b9de4d1a61d6af9256519473541d5513cef349c15178c025dee3aaaa3f6772b1be56576411a985fcd9c70029c00743d8f577be8eaec4c5a44646c9cbf6
diff --git a/dev-python/pydata-sphinx-theme/metadata.xml b/dev-python/pydata-sphinx-theme/metadata.xml
new file mode 100644
index 000000000000..d22e99d73577
--- /dev/null
+++ b/dev-python/pydata-sphinx-theme/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>andrewammerlaan@riseup.net</email>
+		<name>Andrew Ammerlaan</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-python/pydata-sphinx-theme/pydata-sphinx-theme-0.4.0.ebuild b/dev-python/pydata-sphinx-theme/pydata-sphinx-theme-0.4.0.ebuild
new file mode 100644
index 000000000000..cdb917978f59
--- /dev/null
+++ b/dev-python/pydata-sphinx-theme/pydata-sphinx-theme-0.4.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+DESCRIPTION="Bootstrap-based Sphinx theme from the PyData community"
+HOMEPAGE="https://github.com/pandas-dev/pydata-sphinx-theme"
+SRC_URI="https://github.com/pandas-dev/pydata-sphinx-theme/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-with-disclosure"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+BDEPEND="test? (
+	dev-python/beautifulsoup[${PYTHON_USEDEP}]
+	dev-python/pytest-regressions[${PYTHON_USEDEP}]
+)"
+
+RDEPEND="dev-python/sphinx[${PYTHON_USEDEP}]"
+
+# ModuleNotFoundError: No module named 'plotly' even if dev-python/plotly is installed
+#distutils_enable_sphinx docs dev-python/commonmark dev-python/recommonmark dev-python/numpydoc dev-python/jupyter-sphinx dev-python/plotly
+distutils_enable_tests pytest
diff --git a/dev-python/pydiff/Manifest b/dev-python/pydiff/Manifest
index 9d62967d7401..3d356186bf36 100644
--- a/dev-python/pydiff/Manifest
+++ b/dev-python/pydiff/Manifest
@@ -1,3 +1,3 @@
 DIST pydiff-0.2.tar.gz 4108 BLAKE2B 868b9b31f96e49a4e375d2933fc158845ced4bc561816512f41c85dbd6d5373567a51153dedc527826ef2d03306288e3255d300fc2b400e28983e6616eec6a25 SHA512 0f55edf17138c4a1894a1ca03db21e6d6d21fb3961a2738c00d59e05d32a006413aee04005962f1ba6628c012bb018d43fcbbef50665ea10d3397539e5d3def1
-EBUILD pydiff-0.2-r1.ebuild 522 BLAKE2B e17edff19ac86c0847aac7772b93489a3f29aa56440aa1fa98939e53c32d81776ba5b69789d10ee1fa2409a4211786beda2f217c4d12c594710a28d3cd7bef9b SHA512 d146669bc0450acd7ca2ab555756286a59275c04627a0fda2d129c42f083f11e12c31a251189e943200f3b658c3b57339985558389006a908efafe865fc62369
+EBUILD pydiff-0.2-r1.ebuild 521 BLAKE2B 90dcdefb0b0ef4ebe3c1b3745b9755927d5e4b1ecab6496a55943edc592dba87b76e62865be873080da6b43d334b6474923b404cc45328f8bd43cb3b5b926a29 SHA512 345cb20117e9632d41aae37002a8e13bb18ad8df26d4b478f455a1ffba14d7bbdfbbb0d9fc492ba3b76d96d1396784457290fd3ca2a0fce5bd3d9a57b29db649
 MISC metadata.xml 373 BLAKE2B 8e20b47c64105d9f29c7beb15868eee311dc1f6bc49645729b780629d1e7d26ea7296f0768b29de4f4cb9df2e629d25d100409e646f30f336608a7996364ba34 SHA512 cc56455c69ef9816eecb5ca62fa6f660ca124cae7d62d58006133a9d9af79aa4bc45e572ca1d2cf5d9b64c7f7617f62b94b573b65d799327a2088e1f80902402
diff --git a/dev-python/pydiff/pydiff-0.2-r1.ebuild b/dev-python/pydiff/pydiff-0.2-r1.ebuild
index 9883f81d1deb..a0648cbbd2af 100644
--- a/dev-python/pydiff/pydiff-0.2-r1.ebuild
+++ b/dev-python/pydiff/pydiff-0.2-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python3_{6,7,8} pypy3 )
+PYTHON_COMPAT=( python3_{6..9} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/pydocstyle/Manifest b/dev-python/pydocstyle/Manifest
index 24b66d8f0227..752e9f220061 100644
--- a/dev-python/pydocstyle/Manifest
+++ b/dev-python/pydocstyle/Manifest
@@ -1,3 +1,5 @@
 DIST pydocstyle-5.0.2.tar.gz 68063 BLAKE2B 6d7bf04e97c853e50d953342d332847d0e80b080d5ab044f9d444536ed0352ad44402a1af0c3a6f552ec9f3bb3a372a84af2a5bbdaee58bb18dab585cad5dddb SHA512 5ac2e017ae95ff5c7759d6a2cb9ac990f94f668f5fd940792d927cc62628cd036afcf39ab5db6a11100dcca32af344b47f4a7319dd3a47c36367844d0c06d34a
+DIST pydocstyle-5.1.1.tar.gz 70759 BLAKE2B 3cdb519d7f9459a201c9b7bc3002e69dae76b79758b155198b3101c6817c66db01616723e789dd8105d0339d6163fec02ab50db2370b13d3a8d1c5a17ecded6c SHA512 70c7408dfa4c8e54a3abf0548a9af26a7ad7ee0bb76f3a41bf6f2297ce09c13c03ab5e066b1b15404ba6390ddfcacbc5e199d8b73ee74e3b184759d88c8b2a51
 EBUILD pydocstyle-5.0.2.ebuild 955 BLAKE2B c2f040156346bcb23a85f42b6b7ff3ed0d8d59321b5da4fb8fb8f5c4ab795b4cea15b9547324ea3e920f3525aeb2f8bbc69653928233e51fcc85cfcabe96c72b SHA512 9f401abfdf48c389747a92b2a84668fced98e6cb624d8dd2fddc472bbbe5c0428e291c43437220adc7630917b81ec6cf109e789e676f89c979f98622a6143792
+EBUILD pydocstyle-5.1.1.ebuild 985 BLAKE2B 53013f661970331d3ec7af2111d3971c4e4a1b727b92add28a5bf23aab0fffe64a053a2018dadc97a319e317e4619842ce4cb7a35d6192b2ec06318959885335 SHA512 901d8b2299a1d09551ae37425f65698e05f2f506d07c07f2c1a72f732a3c8f8b776faff13e85565b5720c084f142e50a4f0b340eedf12af835f7a0a91efe3f31
 MISC metadata.xml 762 BLAKE2B 3beb9d084f02d336a8b8785df8bcad21c5e49f972b3a9a255eba79291630a1cb6dedd77d1a6c72c7cf787149b6a8ed0c4df2cc49dfb3eb0d9094ca271bbd5220 SHA512 8c3ddff21e08bce744df0d7f6157e0024f13f4e6dbc51c053b46058152c6c889ab529dcc423659f993b79b8292a5a76ad1bb161e3fd949a9bc3a3e7b416a86bb
diff --git a/dev-python/pydocstyle/pydocstyle-5.1.1.ebuild b/dev-python/pydocstyle/pydocstyle-5.1.1.ebuild
new file mode 100644
index 000000000000..002dcd2f4f59
--- /dev/null
+++ b/dev-python/pydocstyle/pydocstyle-5.1.1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+DESCRIPTION="Python docstring style checker"
+HOMEPAGE="https://github.com/PyCQA/pydocstyle/"
+SRC_URI="https://github.com/PyCQA/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="dev-python/snowballstemmer[${PYTHON_USEDEP}]"
+
+DEPEND="test? (
+	dev-python/pytest-pep8[${PYTHON_USEDEP}]
+	dev-python/mypy[${PYTHON_USEDEP}]
+	dev-python/tox[${PYTHON_USEDEP}]
+)"
+
+distutils_enable_tests pytest
+# Requires network to lookup github issues
+#distutils_enable_sphinx docs dev-python/sphinx_rtd_theme dev-python/sphinxcontrib-issuetracker
+
+python_prepare_all() {
+	# These tests call pip.
+	# pip install fails because we are not allowed to do that inside an ebuild.
+	rm "${S}/src/tests/test_integration.py" || die
+
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/pydotplus/Manifest b/dev-python/pydotplus/Manifest
index 38c9142f7abc..bc17cc5b5de6 100644
--- a/dev-python/pydotplus/Manifest
+++ b/dev-python/pydotplus/Manifest
@@ -1,3 +1,4 @@
+AUX pydotplus-2.0.2-tests.patch 907 BLAKE2B 387823545ea3b1372b6584a4b2daca756eb21d81487e3749309c155e37b21171e8e624d54caecc0b356a1456446a4e3b8340b5fc233301bc270fb3056571a601 SHA512 21dd557a0a94d6ad0e4932e01a97a450d76c0f7bcceab870b0ba60a2b96c711ab139fc682ca2a20da4c68b49fe37577763639bb77b9fbe28c7fa1281f2e5bb4b
 DIST pydotplus-2.0.2.tar.gz 278677 BLAKE2B 879271ba7e2104134a71caef7676082420770dcdb34aeabfe76232ad8f9774d3e90a9f7ca5fb407a7a4e8e0c4e5e01824bd0d5936fe77554cc661839fcc0dc7b SHA512 6f06a1f284401123a4514f9e9a4974dee8dc8d01e6b7c40a797fb70eed22b99fe774272f8b106b5632a33f524b356349fe1ff9633101ff61ef2fc3fe69d641ac
-EBUILD pydotplus-2.0.2.ebuild 933 BLAKE2B 2ace3cd5e39fd96752e866e4c24e1f2df8ba3dba134777630fa98580ea1bc39f26ebbc7d3a6f2133ca975e4b08da2895d847776cd8ec9e6cde0f7b1c56141c81 SHA512 9934ca01585aab07eac01c02b22d133dc29d9fbb2c888396f168f41b439e82d8a15e401594d2383d53985adeceb657f5f432c385745951d223547e7b9ae65280
-MISC metadata.xml 608 BLAKE2B ced35e0b512acddd9ecd1ab4b335bba68fa15e0dfb9d4de8e498d00f4257e029035af24db49c7cb8c932e0626017283088e36b02e463f18abd22cfd4618e7d3f SHA512 385fae41f18094ee1d813eadcc1ee1d9abe75b1b0b713b79fd15a10ecdf31e897cd0a24d6bca58080d4a3404bb0cf17965d449347745789afa74dec7e3b78fb2
+EBUILD pydotplus-2.0.2.ebuild 656 BLAKE2B 3619d05d14fcd707dd15d52c0e46ec6ce61c13de3e76188b085d5169b8bb432e2e5bd6a3481c4ae636b59ce6f1cfce7ace89be54e8b945780c11421424b02a6c SHA512 f8195c8916cd4963124c8b3f3d8fd2cedae02f926e695a2b78d93865fe82de4a8790e8c3f882573ef7b7e5802f06ced6a50d78bad297e4df44347a78f8844d04
+MISC metadata.xml 608 BLAKE2B a3bb72fe1014a3c5a094baff6002a47999c6055d81681b0df29f90d24554cd609b5940b30560d34550ffe3c161a6e76fe05d2a7128a2292f2e8cb4494d7aae30 SHA512 f05b8685f9afe5083512eafb1041f8b868c67b5b97f90f912a13e78717826526c5530af6c11a5e92318f27eab8a875835a66775ff36453fd6f9158dcdeb78a62
diff --git a/dev-python/pydotplus/files/pydotplus-2.0.2-tests.patch b/dev-python/pydotplus/files/pydotplus-2.0.2-tests.patch
new file mode 100644
index 000000000000..65d9c5f9f45b
--- /dev/null
+++ b/dev-python/pydotplus/files/pydotplus-2.0.2-tests.patch
@@ -0,0 +1,17 @@
+--- a/test/pydot_unittest.py
++++ b/test/pydot_unittest.py
+@@ -142,6 +142,7 @@ class TestGraphAPI(unittest.TestCase):
+         self.assertEqual(g2.get_edges()[0].get_source(), node1)
+         self.assertEqual(g2.get_edges()[0].get_destination(), node2)
+
++    @unittest.skip(reason="Known to fail on Gentoo, reported upstream: https://github.com/carlos-jenkins/pydotplus/issues/22")
+     def test_graph_with_shapefiles(self):
+
+         shapefile_dir = os.path.join(TEST_DIR, 'from-past-to-future')
+@@ -225,6 +226,7 @@ class TestGraphAPI(unittest.TestCase):
+     def test_my_regression_tests(self):
+         self._render_and_compare_dot_files(MY_REGRESSION_TESTS_DIR)
+
++    @unittest.skip(reason="Known to fail on Gentoo, reported upstream: https://github.com/carlos-jenkins/pydotplus/issues/22")
+     def test_graphviz_regression_tests(self):
+         self._render_and_compare_dot_files(REGRESSION_TESTS_DIR)
diff --git a/dev-python/pydotplus/metadata.xml b/dev-python/pydotplus/metadata.xml
index 3f0fc2d5c2a5..f90e59377221 100644
--- a/dev-python/pydotplus/metadata.xml
+++ b/dev-python/pydotplus/metadata.xml
@@ -10,8 +10,8 @@
 		<name>Proxy Maintainers</name>
 	</maintainer>
 	<longdescription lang="en">
-		PyDotPlus is an improved version of the old pydot project that provides a Python
-		Interface to Graphviz’s Dot language.
+		PyDotPlus is an improved version of the old pydot project that provides
+		a Python Interface to Graphviz’s Dot language.
 	</longdescription>
 	<upstream>
 		<remote-id type="pypi">pydotplus</remote-id>
diff --git a/dev-python/pydotplus/pydotplus-2.0.2.ebuild b/dev-python/pydotplus/pydotplus-2.0.2.ebuild
index f2a0a8effac2..c8aa79de634c 100644
--- a/dev-python/pydotplus/pydotplus-2.0.2.ebuild
+++ b/dev-python/pydotplus/pydotplus-2.0.2.ebuild
@@ -1,38 +1,32 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-PYTHON_COMPAT=( python3_6 )
+PYTHON_COMPAT=( python3_{7,8} )
 
 inherit distutils-r1
 
 DESCRIPTION="Improved version of the old pydot project"
-HOMEPAGE="http://pydotplus.readthedocs.org/"
+HOMEPAGE="https://pydotplus.readthedocs.org/"
 SRC_URI="mirror://pypi/p/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-#	test? (
-#		dev-python/flake8[${PYTHON_USEDEP}]
-#		dev-python/pytest[${PYTHON_USEDEP}]
-#		dev-python/pytest-cov[${PYTHON_USEDEP}]
-#		dev-python/sphinx[${PYTHON_USEDEP}]
-#		dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
-#		dev-python/tox[${PYTHON_USEDEP}]
-#		)
+IUSE="test"
+RESTRICT="!test? ( test )"
+
 RDEPEND="
 	dev-python/pyparsing[${PYTHON_USEDEP}]
-	"
-
-#test phase curently disabled, waiting on upstream to include
-#the required files:
-#https://github.com/carlos-jenkins/pydotplus/issues/12
-#python_test() {
-#	${EPYTHON} -m unittest discover || die
-#	tox
-#}
+	media-gfx/graphviz
+"
+DEPEND="test? ( ${RDEPEND} )"
+
+PATCHES=( "${FILESDIR}/${P}-tests.patch" )
+
+python_test() {
+	pushd test > /dev/null || die
+		python pydot_unittest.py || die
+	popd > /dev/null || die
+}
diff --git a/dev-python/pyenchant/Manifest b/dev-python/pyenchant/Manifest
index 1a4d1c862a15..c197764bb5ec 100644
--- a/dev-python/pyenchant/Manifest
+++ b/dev-python/pyenchant/Manifest
@@ -1,3 +1,3 @@
 DIST pyenchant-3.1.0.gh.tar.gz 75012 BLAKE2B dde78c4f8e986be7e7b4f82979bc446d68a88c3289d472948bb704120fb0dfc3064b8fd46b1883724b0084eefb9e52dfd522bcda290ed5e7a99ae62c948f828c SHA512 d2bf872c15fca1e2c1aa8de06a9ee2c0e6128a69f728383ae9b91fb0ead2d66f804388671cc8156716e240548c29da41eb6c0678dd889012009c690bd078a7de
-EBUILD pyenchant-3.1.0.ebuild 698 BLAKE2B 6d1296b826fb1e8723ea71c47757c59de9bb713e23c5d853d500a2e3537e90ca9f00a89448e93febdf6152a2d0c07e98e0c5e888abf3dc4e3c7632c0ffea6fac SHA512 07f561c6bdebd804f05aec76505a497da725ef5fd816b90ea39852f4a14a00a26ae11fae35fd5a40c2188df145cefc5ed4d465499bb6d1169d69771822d947ec
+EBUILD pyenchant-3.1.0.ebuild 705 BLAKE2B 8fe00b1225cbe5ed97590fd4f5fbdef7a03f53ba81bac5d879ba05079852cc69e827375c4f17f55970726c8fc95fd1789faa789117a84913b5445e807301af9f SHA512 b5f7281dc69893bc56eeda19d907175b045ecee92e4248c776c220cc576641adca4c158370a886cfa664a45c5c986eab7ddf4167fbd4eaf9a150db2c8ed65d5c
 MISC metadata.xml 870 BLAKE2B 991969a849f8342f8fcde0b547b58163214703c68ee65864522f6a64d74d8f8a5058619bb9cf00f61533e4cc218da2e3cc217049072b1cd2396cc7fa3ef298e9 SHA512 bf35258041e5664b6cea0a0c697edd684ee32c5a72f3dba7ef4bd87d060f58790d60a120c80dfbe4376cebd8edd9d45b5c2cb6b0fc5562334d8345b398cb565b
diff --git a/dev-python/pyenchant/pyenchant-3.1.0.ebuild b/dev-python/pyenchant/pyenchant-3.1.0.ebuild
index 164782e1d371..efc28ba48790 100644
--- a/dev-python/pyenchant/pyenchant-3.1.0.ebuild
+++ b/dev-python/pyenchant/pyenchant-3.1.0.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
+KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86"
 
 RDEPEND="app-text/enchant:*"
 BDEPEND="
diff --git a/dev-python/pyfakefs/Manifest b/dev-python/pyfakefs/Manifest
index 3b5c13855517..52748303c7e2 100644
--- a/dev-python/pyfakefs/Manifest
+++ b/dev-python/pyfakefs/Manifest
@@ -2,5 +2,5 @@ AUX pyfakefs-4.1.0-openpyxl.patch 1239 BLAKE2B e30306dfcbfe84a26e96550ce7fadaa15
 DIST pyfakefs-3.7.2.tar.gz 180195 BLAKE2B f1e76b652fc67f630fb45798974dc22455e9e99509829fbcaa479f36887c90207d7b6f087e89c9e113bb44df8c4221dc4676129663740812a9426d84a1d47401 SHA512 33bdbf7e21f1135c0ee048943a4b7dffec96e018285e4ee2e6a1c6a7f9e595e27348c83af3803d80322e7fd12a59985a6bf6342aa6211ba95c74ffa20929fb5a
 DIST pyfakefs-4.1.0.tar.gz 185920 BLAKE2B ee61e5ecda697150374bef035054038aed29e23958c58a3b135aae8dae7b397a194586ef6fd3ae70db1d136572a23a876d7f2dacb7e5814c1bedc9bb4502c3fe SHA512 946e21e34643db2b84e53d14bd9758c8edaa9e5e40b827fd74b245f018e8084995f55256900bf795c23a5aae29f124d9fcb80caf08442f6292adb80ee59d79b4
 EBUILD pyfakefs-3.7.2.ebuild 891 BLAKE2B 78f7762db59798dc284049bb9155f89bce96ee625bc2b97b20f4e1640252897c914840f72b984cb8ff5ead1ada6bee4d77566ea207be4684653438870aab6607 SHA512 c48e7fd77ea469d9bde01754b86839b7897d4a5208bb8559c5481eff3f01c401788a064fed506a8ed9a0af364fb993d8f7559eb34ad202300b5c6fbd9c6e5ec1
-EBUILD pyfakefs-4.1.0.ebuild 764 BLAKE2B b9b5af3324a385608892207630e44ca6ec2776e109fe7e06436800b1c2b68ab31b043b397148917ba9c9e3135b283f0f18a6bd29388b143346aa699c3d5200a3 SHA512 463931a17f23eb9f30ccf3f36c49230f3c2a61c9340e849114fa5fbea25108d350168ceac3ed0458ed2e5a0d153741805bc2d6749aa9327cd210df937a2b0a0a
+EBUILD pyfakefs-4.1.0.ebuild 771 BLAKE2B 9e0a8cccac7d80d33d5beee7307530af1a3594c0dee7ae69cc67317adf566d11367e4e143569f10c216323d00bb2c14db75a544d5099e535b36f83d3a6c285ba SHA512 2ba295825ecd8779eced94595a5b3c437c8809a58a0fc01f2d12069a4f5031a32a031e4171fcde4498200f0079b360324e75eccb687053b151e668386b20ec8f
 MISC metadata.xml 394 BLAKE2B 634b3dfe1c293b5c4918de8dcee95766878982f71c1d73c169e0e5a6dc68f84485af2edeac3a4cb924b04d4f265b84be309021f9ab4a1d4b59c5aa13d5a9dfce SHA512 4320246ff77e0e68f22065ae24232541bd1a2f6793706fda02fa6b0ef89eb3b3322d224026024984ada6cca4bf468512dde648f54d8c7737830b3155531921b0
diff --git a/dev-python/pyfakefs/pyfakefs-4.1.0.ebuild b/dev-python/pyfakefs/pyfakefs-4.1.0.ebuild
index b51d5b7e0bf1..29678aafee36 100644
--- a/dev-python/pyfakefs/pyfakefs-4.1.0.ebuild
+++ b/dev-python/pyfakefs/pyfakefs-4.1.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/jmcgeheeiv/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
 
 distutils_enable_tests pytest
 
diff --git a/dev-python/pyfeyn/Manifest b/dev-python/pyfeyn/Manifest
index 1247fbc030de..0fb09e0ab8f4 100644
--- a/dev-python/pyfeyn/Manifest
+++ b/dev-python/pyfeyn/Manifest
@@ -1,4 +1,4 @@
 AUX pyfeyn-1.0.0.patch 1012 BLAKE2B d3d8ba8f46c9fe6eac5db4183c18fbbe118ba36bbcc3b9a263a470fac702ac81c17bb77acf7b913c3a3bb51d4f12bda60b07d8152a324b8f4c927f1800b104c2 SHA512 43811f881c479062af0376c9d3dbe440383599d7e6937481ad2ca8dbca3ff404ab8d04adaa4afcdf1c4eb001340ed1870a7f50730fbc3d4c458f5d6a1936cc73
 DIST pyfeyn-1.0.0.tar.gz 27316 BLAKE2B f1ece2e64be35f6e64dbe539406462c1802bb0149577662a92658769c1b347c2d98786cd83998e8887cc609f8ffa5aac3e3c995c253f54badd5bed43050dbf0f SHA512 edecbb61cbc63adb5d218cd53e45568f42aa018875bd57485afe612080300a16dd93d1dd0a1286b040a27aaf727a9e35e210f2a2edccaf9e6e114301a91c839a
 EBUILD pyfeyn-1.0.0-r2.ebuild 557 BLAKE2B eb246772aec7185307d5dc0d0818b9c83e7e7c86a2a7b9d2977069f933d1c66a067e437efb6cf4e6a1287d58e8d986fd1a1078d0a0e1ec38d6cd6ae1b41c3ec3 SHA512 f65b450c425a43fb928722dd947fdf907c44357dc08572d0ed35af170abb8d65412c28a8d8d42c12cbccb266bbb5cdbdee4ce58caf9ecfee16bc11a1c004fa8d
-MISC metadata.xml 498 BLAKE2B 31414fd895669d8706e4025d404575d0de13b04dcd23dc175262701489fc98d8e11407e758aef681805a8275323397a6bf1b5296247f48b36ff34c9b9d410ae5 SHA512 19364d290277c99a31dc436a941d66d60a1829c2ffac855cc35c85e4923124d559c8310b0c87a8129d0115e482ba0ec13287e6f1994fb93ae43de969f9082751
+MISC metadata.xml 416 BLAKE2B c20c145ce1ca35144a1a016795ecf71be2f34ba56a7738ccc4d2593f66c799a30b83424db34cf9f5f500cd8c2e6d8cfcf1cbebfd1104d574fd0bde7a770ba966 SHA512 5b455766710aac2c5d72df7a9385bb343e0a593ac9895f30d8c128a582d4ed775df2e6859b8886adc7b03c119e11da200da670e019e885d3fcd6fb23a3b38af1
diff --git a/dev-python/pyfeyn/metadata.xml b/dev-python/pyfeyn/metadata.xml
index ef28dfdb1e96..22349c2fece6 100644
--- a/dev-python/pyfeyn/metadata.xml
+++ b/dev-python/pyfeyn/metadata.xml
@@ -9,8 +9,6 @@
 		<email>python@gentoo.org</email>
 		<name>Python</name>
 	</maintainer>
-	<longdescription>Python package for drawing Feynman diagrams
-	</longdescription>
 	<upstream>
 		<remote-id type="pypi">pyfeyn</remote-id>
 	</upstream>
diff --git a/dev-python/pyftpdlib/Manifest b/dev-python/pyftpdlib/Manifest
index 16a37c1a5f89..3b9296e1678b 100644
--- a/dev-python/pyftpdlib/Manifest
+++ b/dev-python/pyftpdlib/Manifest
@@ -1,3 +1,3 @@
 DIST pyftpdlib-1.5.6.tar.gz 188099 BLAKE2B 508e94da6b27b4b1f15306df2916c176f07ca31944398e9ac580fca8d2cdc72ca0ee8e7db282de6745e2e401b23b1fa8cb8de400dc2ba998b93ac45772c78157 SHA512 a3c3c1cac221a8a3c090ee208c03134bb1b8de58099a23ca6ee422f06fb97a0ed561c96e62c62b21fa112dd0b3458651b9fc0c55d72dc0bed79d0583b319a50d
-EBUILD pyftpdlib-1.5.6.ebuild 3087 BLAKE2B 59afa5e6d8c19a08011642bf1e2c3ec4226e95d9e9a579f577470a2bd829f01a0e806f786989ee317f93dd69730866122703d63112fd74b529a8f9aa042b5703 SHA512 85a508dc09f2b4050fac49d473e1027671a8d60b24e6f7a33d5b85fd247d8d59dd279fbf5d0f5aab47eb7ba10242fad01894a22619dbb73dec578872618a5c05
+EBUILD pyftpdlib-1.5.6-r1.ebuild 2732 BLAKE2B 3e88a21fb6c968d686c587b36eb2642a038beaa9f76210042a7368a07ff51a3f8291877f12ea716c2c1b1c53d9c9c248b1f212c07967b085bbcc6b2178b4775a SHA512 cdc40c132a64002a8d112c400180479ce436f9609e43c4ca8e70c1cc51221b363bdcf43efeb76036ca3dea5d45d3d8925cb383709eb0a643f63c54f8b48dafef
 MISC metadata.xml 438 BLAKE2B 0e0860eb9d885ec9b432b504bef6a9394cf4a2d6d99751c80fec8441d8910f8a17364e5f32782638ac689abf5cdd3ebcb5fa20e7da3d612a5e8844e8c8a34d76 SHA512 a748827370b53c94fed352cd6bbd7468a22c7ca2f15c4601c98a2689e3a7e652ed28434bcd125fe0f3018d5508600df03130c18d7d67834b28ac0c3480b16345
diff --git a/dev-python/pyftpdlib/pyftpdlib-1.5.6.ebuild b/dev-python/pyftpdlib/pyftpdlib-1.5.6-r1.ebuild
index ef5525f50ada..c98a11ff0494 100644
--- a/dev-python/pyftpdlib/pyftpdlib-1.5.6.ebuild
+++ b/dev-python/pyftpdlib/pyftpdlib-1.5.6-r1.ebuild
@@ -2,7 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8} )
+
+PYTHON_COMPAT=( python3_{6,7,8,9} )
 PYTHON_REQ_USE="ssl(+)"
 
 inherit distutils-r1
@@ -19,13 +20,10 @@ RESTRICT="!test? ( test )"
 
 RDEPEND="
 	ssl? ( dev-python/pyopenssl[${PYTHON_USEDEP}] )
-	dev-python/pysendfile[${PYTHON_USEDEP}]
 "
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
+BDEPEND="
 	test? (
 		${RDEPEND}
-		dev-python/mock[${PYTHON_USEDEP}]
 		dev-python/psutil[${PYTHON_USEDEP}]
 		dev-python/pyopenssl[${PYTHON_USEDEP}]
 		dev-python/pytest[${PYTHON_USEDEP}]
@@ -40,6 +38,8 @@ python_test() {
 	pytest ${PN}/test/test_misc.py || die "Tests failed with ${EPYTHON}"
 	# Some of these tests tend to fail
 	local skipped_tests=(
+		# Those tests are run separately
+		pyftpdlib/test/test_misc.py
 		# https://github.com/giampaolo/pyftpdlib/issues/470
 		# https://bugs.gentoo.org/659108
 		pyftpdlib/test/test_functional_ssl.py::TestTimeouts::test_idle_data_timeout2
@@ -62,8 +62,7 @@ python_test() {
 		pyftpdlib/test/test_servers.py::TestFtpAuthentication::test_auth_failed
 	)
 	# Tests fail with TZ=GMT, see https://bugs.gentoo.org/666623
-	TZ=UTC+1 pytest -vv \
-		--ignore ${PN}/test/test_misc.py ${skipped_tests[@]/#/--deselect } \
+	TZ=UTC+1 pytest -vv ${skipped_tests[@]/#/--deselect } \
 			|| die "Tests failed with ${EPYTHON}"
 }
 
@@ -75,12 +74,3 @@ python_install_all() {
 	fi
 	distutils-r1_python_install_all
 }
-
-pkg_postinst() {
-	if [[ -z ${REPLACING_VERSIONS} ]] && \
-		[[ ${PYTHON_TARGETS} == *python2_7* ]] && \
-		! has_version dev-python/pysendfile ; then
-		elog "dev-python/pysendfile is not installed"
-		elog "It can considerably speed up file transfers for Python 2"
-	fi
-}
diff --git a/dev-python/pygments/Manifest b/dev-python/pygments/Manifest
index e5b0e92ca3ab..c57d860635ca 100644
--- a/dev-python/pygments/Manifest
+++ b/dev-python/pygments/Manifest
@@ -1,5 +1,7 @@
 DIST Pygments-2.5.2.tar.gz 20263984 BLAKE2B fab5d11458bcb3bd9a825026f119c0bde6f672b00704f3d5db24ce050b959f0c1a34544642fc1b5911f6ae12a9b595a2cbedadc791d6a3e8c83da1a1add60471 SHA512 d6715ca26cdb68d4c771bb530b2395805025c14c78d9099b033d3410ea239c41033fb611e43e39cbaa4ac38078a09324d8cfde42269129be0a096dcc13586859
 DIST Pygments-2.6.1.tar.gz 3303050 BLAKE2B 105f43301d2e7348937345519fe04817fa5baa5de4d0b9b0e9096d34612018bb992721df58a24008b009c0690054ac02c18c57b6b1a8a68039f9b4d20b5900a6 SHA512 0d793bb6eabe43645541347e44932ee50ccd4309f40e7a327422bcbe57d40a7cb8bbf2fb0911744ed6f316c6c08f4216462be88d79192a2ea004d6da51329932
+DIST Pygments-2.7.0.tar.gz 2358072 BLAKE2B a9c4753f62589a676300d366804aecc9349de2367b609919518f11be3ea40c3fb264d68c5da515cf80aaa42fb4e4dd9dd362d58945148a21c81a214c7e6c6b58 SHA512 b70714dd33cac725e0b32678971ab5902895c7d2fd8c9548f69110af32c82ba46a2d366dbbc9c4017e91c39120abe3e5d28e69893e8d92058f0bcbf579909db5
 EBUILD pygments-2.5.2.ebuild 1132 BLAKE2B 31fbbc45348a8c3b851775ccf26dd4e8db056fcf481b47a1f07c01c6f0ef6dd1e8d6733277e2c87ec7f2bf090fe8dcd65b37b65a549831e89abfdfcd4243f7cf SHA512 a05a761bc5f20a2293964e36a3b8a2650628b640e31743d7d598d78135751bd2207f44510fb88cf33fc69586800cef9069190c4d0257fdd94eec24da160540ca
 EBUILD pygments-2.6.1.ebuild 1122 BLAKE2B c2c52252e8e7a6e7971a7afede468a3b2ffdf1706f200bce925498458c7b041e70f3645ac83779234f5d8e14329661cda49de4675f2f9858ca32a2466131e78a SHA512 dbec1e6acb5e559672ee31fca4e2a14c0e21da3c11c9b6c9e22f5abce86a1c8eafaf1814e6d2fb7b6ee4b2f904e20585faebcc1960eaf151938b141c09a04bb5
+EBUILD pygments-2.7.0.ebuild 1131 BLAKE2B cffa90ae8004c74b462c1e6c5f21f4a8f0f80dcd171920d49d04f835fbda83ff3400829bbfd1ed1cd06d76cf101f03887f31803bfb437537883f962a5ce89a16 SHA512 e7754c7cc98b3182980e269066878438b1f499fdcd9d9a856e98e18e003861f0923ce7bd23fb96fb27ce460710c638dcdf2c4884b662f075ab1b3318b9568668
 MISC metadata.xml 566 BLAKE2B 59eee3ae82c16c84fe57d3c1f757627e8ae05651e3a70e9a39ae53aefd3087201679d17962fca2ac45c8c1e3ca3b8568af534328e95c1d02cd8cfcf2a5caf565 SHA512 9b98bb9303be406d2f521b7a772fd45fdd560542f6f69c042ba219f9e261935faeae9ba2f82f328e6a34627a18cdaa030244d7cdc422641ab4fa921c64ae0166
diff --git a/dev-python/pygments/pygments-2.7.0.ebuild b/dev-python/pygments/pygments-2.7.0.ebuild
new file mode 100644
index 000000000000..d203e4246cb1
--- /dev/null
+++ b/dev-python/pygments/pygments-2.7.0.ebuild
@@ -0,0 +1,41 @@
+# 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,7,8,9} pypy3 )
+
+inherit distutils-r1 bash-completion-r1
+
+MY_PN="Pygments"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Pygments is a syntax highlighting package written in Python"
+HOMEPAGE="https://pygments.org/ https://pypi.org/project/Pygments/"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	test? (
+		dev-python/pytest[${PYTHON_USEDEP}]
+		virtual/ttf-fonts
+	)"
+
+distutils_enable_sphinx doc
+
+python_test() {
+	cp -r -l tests "${BUILD_DIR}"/ || die
+	pytest -vv "${BUILD_DIR}"/tests || die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	newbashcomp external/pygments.bashcomp pygmentize
+}
diff --git a/dev-python/pygobject/Manifest b/dev-python/pygobject/Manifest
index 8727540eae8f..7e300262834e 100644
--- a/dev-python/pygobject/Manifest
+++ b/dev-python/pygobject/Manifest
@@ -11,5 +11,5 @@ DIST pygobject-3.34.0.tar.xz 552268 BLAKE2B a9cbeb644e0aa1b23067b591fe5c62997413
 DIST pygobject-3.36.1.tar.xz 556568 BLAKE2B cd38aec8e71ff230926327e77867d07ae0fd5549b71619301bb3be01821ea93e557ecf335ea238292176981a864b269eaa2a86da47e8fb320f187f54caf24dc4 SHA512 5e00dcd03dfe4f92acbf827c13c164b6b9740b2a8cef3b2dce70f96a2156fee2411c84dc669f12b910f4a93daa03ba845282832e2b09d8c887102d43764a345f
 EBUILD pygobject-2.28.6-r55.ebuild 3540 BLAKE2B d719fe69f2e35d2e77700f478230336ccaae8875b7b82ed65172bf236b0abf96cf47a67aaee844353d7719c03cf6f634b1b19da7950807a8233a191f6da6c309 SHA512 e62dd5e5c9228ce363385c4991a20264d1569c1f7640dc3564667d1d121123d1605bd9c617fb2fd8961d7b9de8b09e6a8833f94f77c679e2a44aa0203111e029
 EBUILD pygobject-3.34.0.ebuild 1765 BLAKE2B 970cf7614f18e3f4e1b227d06e135d86f26ae2d526468389d7275f9185688cfcdcaa6fb2b39932062e4bca6d04d610598e26d67555c45c48c6dac940e17f323c SHA512 890d6a11e87b2dc7e39aaa923f833fc9890323abeb8698692a6f78b532164c7c7d424b1520f96f4fede63f3deb3d35f7e15c2196aa4edd6edce1b02455575b97
-EBUILD pygobject-3.36.1.ebuild 1769 BLAKE2B 12a622462748170a3cde1c260ef954cc717b7e5689ae9c266c8c95246982e017f7b55ca8faad3bde7782063038d108922b841478fda6cd67f8d7df3ac94c6478 SHA512 d82c370a8021447b2cf1b6786ce3e19b881fe4fd5b53372b85c068b96845c3c707a9e98ba6658e1c81155c3f876da1a6e5709173c3c75adf14bcf2c614864876
+EBUILD pygobject-3.36.1.ebuild 1767 BLAKE2B fecbaf7f2b02877bc5922a3ef1d14797bc0c940cbb070ee7e09273f6a255820e1ed7741d423115d24ab7ba9f5bc060df069caf01b5da03b3959e1452314c0020 SHA512 79c8531a876ddf6a9690590103a62b74eb789ec664b1e5d551912159a75b25384a9e869929f4014ceae3249e680df1110d77ce357cbcc137f8b947baba5c6659
 MISC metadata.xml 1220 BLAKE2B 4f2d4f1091eef503e2ca7457418888071d70509e346ded7c5e77839c8e5e6dd1c27957e6645a7f32bc7ba0810aff8a55874e7225f7a9e7674e4c1bfccee2ce1d SHA512 991d11e7aba9fc7d6ccd6971a150d50ebcd397968a9a2c2c901093f598acfa70eb8719a3a590c10433147fde97603012862fe1fc613f766ccaa2a159705a6ae6
diff --git a/dev-python/pygobject/pygobject-3.36.1.ebuild b/dev-python/pygobject/pygobject-3.36.1.ebuild
index ad787fa51389..b4bc8e3bab46 100644
--- a/dev-python/pygobject/pygobject-3.36.1.ebuild
+++ b/dev-python/pygobject/pygobject-3.36.1.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://pygobject.readthedocs.io/"
 
 LICENSE="LGPL-2.1+"
 SLOT="3"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="+cairo examples test"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/dev-python/pygpu/Manifest b/dev-python/pygpu/Manifest
index f3c93cb6aab7..83f946c24527 100644
--- a/dev-python/pygpu/Manifest
+++ b/dev-python/pygpu/Manifest
@@ -1,3 +1,3 @@
 DIST pygpu-0.6.7.tar.gz 256440 BLAKE2B cc0880259c368c02fe0fca1a7f9424ad78f057540426d28179ee2cb20a2559853566c9ebb7de3488d5fdf0fa0eefb4e9f16db198cda2727370d567fd16363480 SHA512 39cdb67ec12d0f939d7a3ebef9726c40e64387413200addbeaf205db4151d09efd90118fec4a71b9d1f81fdde9b52e37d2d97763bf2cc9efa1667c5b9ff716b2
 EBUILD pygpu-0.6.7.ebuild 904 BLAKE2B ecd59e0029c546b6243042b1dd9b7cee9aa704008c1c673c7dd92b792737a018130b97013a206f63f1e61df0277c1cd54cd8e55df79bac881629c9e982dcd5e2 SHA512 6c7ced336fb43b22fceaab68bc988ddb180f9e9001f9e7ba88eb3bc8cee04a6f23bcf1da0ac4faddc967e1a532b125622e9d28c7767b4743c77b99f6c8886371
-MISC metadata.xml 625 BLAKE2B 876c239967452f073b73a66ee4afa5e1d8affa03a8d849f5f74ad193d14bc51d0c1f1340744c0af5f3274a82bd81224bad64d5078142b65f09775f40907cc0e7 SHA512 370f27b57bd3815ab8b2f177e8d6755c4a70800c37164c99643a8f2e134acbe259e193d20998e47e521cb8f6c15d1a1703afcdd799499ef79dd4f313335979e2
+MISC metadata.xml 480 BLAKE2B faf2ea46d5aa3f5db7925b4aadc66845422a689966267c28f03f9584f14654d3ad13902e3e6bc2ef2badd10686c048c67de32075d0ba06b1e4ad1e88550bbac2 SHA512 8444592e276092efc570723a082fc0ff6ee02cdafe6fe25a82e93282f3eee999f02ea3c23a0e3c0a0f4609fa6eda9cc5d2516a74210ed0b9e385b817ceeff045
diff --git a/dev-python/pygpu/metadata.xml b/dev-python/pygpu/metadata.xml
index e05423a24848..65435dfa5d26 100644
--- a/dev-python/pygpu/metadata.xml
+++ b/dev-python/pygpu/metadata.xml
@@ -5,10 +5,6 @@
     <email>sci@gentoo.org</email>
     <name>Gentoo Science Project</name>
   </maintainer>
-  <longdescription>
-     This package contains the Python bindings to libgpuarray which
-     are build in the top of NumPy.
-  </longdescription>
   <upstream>
     <remote-id type="github">Theano/libgpuarray</remote-id>
   </upstream>
diff --git a/dev-python/pygresql/Manifest b/dev-python/pygresql/Manifest
index 511cadfc9a41..f41db1dc8c75 100644
--- a/dev-python/pygresql/Manifest
+++ b/dev-python/pygresql/Manifest
@@ -2,5 +2,5 @@ AUX pygresql-5.2-CFLAGS.patch 333 BLAKE2B caa18ab6ba4da14437637faf6cea4d27e829c4
 DIST PyGreSQL-5.1.tar.gz 642216 BLAKE2B 4f3ff4e59c47d86007884b41355ec5cbc3893ba21e3e5b7a354aab698dde947622ba4b7a1590325ae36f132759e26f37868844c3c21605ead068261129331453 SHA512 d36be0f121c20469193600c551e15b430fdc9e44db00e4ae7adb4985697ddc5653f52fb642b0f3de8316fb916616d07ac1ef03e1e6b20043b7cace131b232a3a
 DIST PyGreSQL-5.2.tar.gz 267557 BLAKE2B 92c2c0810a9b763fc2e9fec2e920ca1e21da4eb4ede5f2e20f66fd385ccc623fd9fe74075c6b995c6ea6348df76dcd723c8e4b6d83afdb53c978c02cc5220e49 SHA512 ce1cd29c714ab863dbdc7dde920f8938b115535ae3a0b54c770d7648f05011a716d604eec2d73c321fe2a408e64bcd9208c204856e5ddb0e0675ef7c076e4da7
 EBUILD pygresql-5.1.ebuild 734 BLAKE2B 4ac66942fcb27dfd9790f82f8474b228ad36e9bd73fb4ec153ec1032a845aaf3d3dadfb6852be67db2aacaf7c18af6d0ec375a323745bedd83e5094f3d7bd2bf SHA512 660943ae719d760b0f7a6ec71b6762206da18dd68ff46b120d2339f6785e420b9ff0575280652a390588b8d4b98ef7ab7765869cab24e37d05c6f0939af5869a
-EBUILD pygresql-5.2.ebuild 719 BLAKE2B d521f3ad487c1b6d07385746ff3f8f3d9febbb32b8f95dcbe1f67facaec1a4eec26b3a40e281fa08682ad8a3d124b5f4e48038d74a1378ff1de9d93d3c49582d SHA512 27965b13f17276d7a2d031fe252bad47f090cfbed7400a00987257d48f1b2b2e0f0f23ef4517c987ea3c3969800fd3aaca2d3a2fdbcfb827eae36642795cad43
+EBUILD pygresql-5.2.ebuild 716 BLAKE2B 42addf8de65496ced3dc58174f46e74b96dd154e0d192bc6c68c1e69ad23971e3ed508f496d9056ebc64c63a665a016907520c1b8ef891b87e2676729f819716 SHA512 ca0e4c3941e87211791ce994aafdf055adb243c94dbf861d22e82c2a6ae479fb9904c9ddcfb4d3c5b69aa2eebb8c1e8ce3b68dc0cc3e3b76692de55349d1cd48
 MISC metadata.xml 452 BLAKE2B 8d60fd06e68e39b5d373f30fec25979a0a67c51eee216425e382b559b908ccd12e425c95995dfd28d8487fb306f03fa10d8a71320a4ff5ebd6349e887af624e9 SHA512 f6877e2fd8cb2b6606a29e421d0f0ab4fd66a5e7446a4307718d1c0435c2e8ab3c59db795ca1e18e58eb79d0474c57bf35a3d0544095d2d7d618cf25e96ff55f
diff --git a/dev-python/pygresql/pygresql-5.2.ebuild b/dev-python/pygresql/pygresql-5.2.ebuild
index 849038866a69..a4ad7e5b804a 100644
--- a/dev-python/pygresql/pygresql-5.2.ebuild
+++ b/dev-python/pygresql/pygresql-5.2.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/P/PyGreSQL/${MY_P}.tar.gz"
 
 LICENSE="POSTGRESQL"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~hppa ~ia64 ppc ~sparc x86"
 
 DEPEND="${POSTGRES_DEP}"
 RDEPEND="${DEPEND}"
diff --git a/dev-python/pygsl/Manifest b/dev-python/pygsl/Manifest
index 61198bf2d92f..4c2a82f1925c 100644
--- a/dev-python/pygsl/Manifest
+++ b/dev-python/pygsl/Manifest
@@ -1,3 +1,3 @@
 DIST pygsl-2.1.1.tar.gz 727636 BLAKE2B 42b87a945a41418a295ebc9ddd3c5a367256427145e4c3bbf980e561df0cc3d84a64ddab22f936c5d1a5ad58b4649e36b121648f125824e6922a3d34fcd07d10 SHA512 141232032f0221b756596bc3426160849749642ddaa3667d36b19abf3b4a22b76b5e0b0e9452898494b7f6ce0f8d17a2e392bdaba535633bbfbf1a672bf8d62e
 EBUILD pygsl-2.1.1.ebuild 661 BLAKE2B fd0e14a845e0d8c62669b2543a544573b0d4476df12f66a5822e3f65aa0aca25ed9b74437eb16b79f9ee2e8b95465efeccf5ade1c993ebd3177b980c2a8b23f0 SHA512 82559a4e221d1fc2ad8c4d3ecc239bbc7709626033c3f3d133ff2d3d128ef4b1a1f66909a2038f276493e7d8236cf1ae8919d32593dce0f6dc0a837f0c55641d
-MISC metadata.xml 453 BLAKE2B c9e06b215efc777dce1614d91240ed97dc87a32dcf0c0dc31c51dbcedf808026b7f89c191ab2eb1b50723bffe2cb5c536f6ac062ef07236f0a4641d9c78aba67 SHA512 e8fa7a19a1aca1b17b9490a7cd3ea612de43d01e5d1b37c02f2991b7e80327dba5875baceef9bc1b116e768e1fcc1457066a69eb94d74c381ecc8363b259b165
+MISC metadata.xml 328 BLAKE2B dbe768a8fe3fa9ae2cd95a1889b12c06ec32ef4dd99770bc26281cd94f36d2ae38cecaa34fdd9295e8a4c0b9ef0f6df1ddd415bc77c2cc1073320c58e43219ef SHA512 3de34a79ba1833451763b3595e09aec116bb53a697b00aacf345893340f370cd0ed3ea8a7c67ad0806b065f9be604c61ad918ec90d18879db40181cb839b7b0f
diff --git a/dev-python/pygsl/metadata.xml b/dev-python/pygsl/metadata.xml
index 2f82549b6e52..ce25420a6948 100644
--- a/dev-python/pygsl/metadata.xml
+++ b/dev-python/pygsl/metadata.xml
@@ -5,10 +5,6 @@
 		<email>sci@gentoo.org</email>
 		<name>Gentoo Science Project</name>
 	</maintainer>
-	<longdescription lang="en">
-		PyGSL provides a python interface for the GNU scientific library
-		(gsl).
-	</longdescription>
 	<upstream>
 		<remote-id type="sourceforge">pygsl</remote-id>
 	</upstream>
diff --git a/dev-python/pyhamcrest/Manifest b/dev-python/pyhamcrest/Manifest
index 981de324e817..c73b1c204a0c 100644
--- a/dev-python/pyhamcrest/Manifest
+++ b/dev-python/pyhamcrest/Manifest
@@ -1,3 +1,3 @@
 DIST PyHamcrest-2.0.2.gh.tar.gz 55491 BLAKE2B 749f227b8cb1180a64e24cdbf97b6f610b9871b21215a761642d19fdd43ad8e175718b12cfb0de2cdb5c6ae8c3c5271e04b7c3b489e01ac689769e24202ece56 SHA512 d6e510ca1e6533b425b424d411e23c4ee2a6bad2d635695e4e68f991fbdc57269c3a433361e431cb5dda7891278951d5de7a05f5c1c167714eecdaf74644d1c8
-EBUILD pyhamcrest-2.0.2.ebuild 745 BLAKE2B 3b59e7a9ebf959a03278f4f1440de3715913ff9b60f3176be3c8cae2a105721e035cebd5e04494537a7e2d4f7378c928478d1905044f9fba004b0850572d274f SHA512 3a9bd0abd01d03493936c9f382727c549c341f8fdca375a891bf68b4fe6fb96158cd15e8c26ceef040bf804431c553b580fd1cf5e2d32422f845704c0ef848b1
+EBUILD pyhamcrest-2.0.2.ebuild 752 BLAKE2B baa08ac1e1e6a8986a664784583636d0b980c4baadcf1736c351feab1cce41bc3ea36a969558fd66879e5c098a6fe02b332ad10a4e80aa22dc84839a4b9ac5e4 SHA512 64ec73bb0642eaaeccf4dd364ec766092962aed1d2e09f3e05cf98f0c0ab55768b8091767de82856ad088c2fc20814cc92b0fc7cf34d46258a931f4d96489d93
 MISC metadata.xml 396 BLAKE2B 1086960a423e348fa862f395703ef468c4e2a5a362e8fa78d15cf8c2c0e56f8bc21627688c1295dc57014cdd91644ddd81037fb0505ef1f43e2e8c93bd9774a0 SHA512 cb07fb7bf1b7af660af9ab2cbba7f87a51afd254fbb5896bed0dfa07f98dc2a6d0361e567eb9cd240291cffcabc8eb3f3427809e1ce8b95b1de36d964d8262a5
diff --git a/dev-python/pyhamcrest/pyhamcrest-2.0.2.ebuild b/dev-python/pyhamcrest/pyhamcrest-2.0.2.ebuild
index 0b57b1bb6ce0..7566d36864ce 100644
--- a/dev-python/pyhamcrest/pyhamcrest-2.0.2.ebuild
+++ b/dev-python/pyhamcrest/pyhamcrest-2.0.2.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_PN}-${PV}"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="examples"
 
 distutils_enable_sphinx doc \
diff --git a/dev-python/pyilmbase/Manifest b/dev-python/pyilmbase/Manifest
index 54860e1954ea..eb76f16d362e 100644
--- a/dev-python/pyilmbase/Manifest
+++ b/dev-python/pyilmbase/Manifest
@@ -5,4 +5,4 @@ DIST pyilmbase-2.3.0.tar.gz 524975 BLAKE2B 7c3114921392ad29198025c672c366e6c98d2
 DIST pyilmbase-2.5.2.tar.gz 27525326 BLAKE2B c48a61513457f2c04f3a512963ae27eaf154933ffe7c6ff3e2d71f27f246ae624a34dbe6f8ab500c51a56898ad0f61e6784f5cd3f9c3df591ce347b46ba4ac88 SHA512 62f98695cf56600303db9c2d13d34cacc1851a103d8ffb7e7ce8c6d9d14e6bf02804836c718ae03e8d685ef3dda0cf7b2130e2d363f8095b22a15bf30d706fab
 EBUILD pyilmbase-2.3.0-r2.ebuild 1563 BLAKE2B e13ceefe8eaf32d75d8ea61372cebc26f057dad652f76660300d149016aa7c6820a51e64a3b01d688d973f41631d1e18641e82edf045b1573320546e2dfa8aee SHA512 2c2e81c0530ceef420aa1aa7f0ca8cd3a0ffff251a47b12d9b141111339fa8a4894478b0650acc056bc016220e14392e59309b18155361a38b533e0ec9b1d3ec
 EBUILD pyilmbase-2.5.2-r1.ebuild 1484 BLAKE2B 9808e56335ef42c9bc1bfb17e6629b0643ddbecbd5e51068fe56a114146e9a21f0f9ce73410fd5af03001902d649389007e5dd63a5b60044164d94dc3073d403 SHA512 d8c8139249f34803b50a7dc0407dee68518f353bf6b2da9430d15c6c7e1821fcd2b384c0bbb375c9aadbba94731bbb139edda5a80358c49829cf39268e89069d
-MISC metadata.xml 747 BLAKE2B ab28da77947c2bc358815f40f597f5a9973a97be33f5b29910bcd395ed6b722d383dac53ba3083d75077cc1899286d6b9505eb6b0d574035d38b357697926ffd SHA512 a2c785799d3ca82acd3a3d8e8296f09fd63108a318fb64a95ef58a60d7f63a8b6dbaea2793451b47a94400a66d9f491ebe39893ede68f0c896a47dc199d86ff8
+MISC metadata.xml 652 BLAKE2B a1f5b54cf36def29e3cdc8727b65085b2b83d26bbe0019421cc4b2acc09a027843dbb1ebc5d93bbec9174e1024b496394f9061477b842760048dcd82afc6b347 SHA512 b6e05005a16a6f72261fc1f3d305880b3e073f8a975275e19720742799e1f78fd7e29ac23a589a7724fbab9f4c6cd3b4fe5c81bd309d4532ef94a300e9440840
diff --git a/dev-python/pyilmbase/metadata.xml b/dev-python/pyilmbase/metadata.xml
index 6cc59a0acbc2..c6ab205bdae8 100644
--- a/dev-python/pyilmbase/metadata.xml
+++ b/dev-python/pyilmbase/metadata.xml
@@ -9,7 +9,6 @@
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
-	<longdescription>Provides python bindings for <pkg>media-libs/ilmbase</pkg></longdescription>
 	<use>
 		<flag name="exceptions">
 			Enable runtime floating point exceptions in PyIMath.
diff --git a/dev-python/pyjwt/Manifest b/dev-python/pyjwt/Manifest
index d111e7ae26d0..28e9b63fa16d 100644
--- a/dev-python/pyjwt/Manifest
+++ b/dev-python/pyjwt/Manifest
@@ -1,4 +1,4 @@
 AUX pyjwt-1.7.1-ecdsa-fix.patch 1179 BLAKE2B 79fcaf69d6021f04fb624fc36314135c9704a8abeef8eb6872d1f2dc24bcd9372f2372e8022fb24e9db736c9014756805d608415e8893084ca45fbb3e76a8948 SHA512 6fb83a17ebe768a147f6f610c823a11a500cc1828efe8cb12f3623be153574c94abacabb441150ee9d3bcba5762cb2eea73e30b46cc748044842e787172808da
 DIST PyJWT-1.7.1.tar.gz 41979 BLAKE2B 5604b309838b2dfb2f95e18e291c43703954664aa8acb7439072f002c1c8a1e49ff2c21d907be77a4d2f86e695ec71970d550aad2541252ac85bd7133e300b28 SHA512 70cd38127b6848933992c8b88303725ef71bfb430ad42eb63247e549b0bdab2a194137349d43ab02a1c97212dbc89f447ee3f0c5403dd14632b8b4b6b9235fc4
-EBUILD pyjwt-1.7.1-r1.ebuild 1405 BLAKE2B 8c63157a91842304c5ccd1c17b444c79a1196b8e28f47ba6a5aa27cc05a45431ec798b135c4147c120e44d0936ea999abae1ad4dc86079d7fb31c68bbede4627 SHA512 96755f3bdc9ccdfef6a90029481851e219c867e6fd8e26e6677dcc66cc37c14f3b989b5d95e180b3ad9f976b3bfc7a191d5970bdd529778a5f1931696ce28f7d
+EBUILD pyjwt-1.7.1-r1.ebuild 1409 BLAKE2B 73f74ed92b2d173331ac50699c4b81e12eabb0490960daca103d0d00c1f9958e85bf701a8241636506c58e70c3a6be4ea4ec4c8a5098fb92df90e5ae813d36b7 SHA512 88c49f736866501a08055845e51f3b7036e341ce46fa615402e9eff2e17660d7f0414732ca03bcd88e68afb21360c68bc9c12ad833b7137cf687e2f2a25b2509
 MISC metadata.xml 439 BLAKE2B 33beede4418baa6979f4d9c56ebf114e4de4e36f7fdacab5b7948c5a500121a0d1590aeef3ebbb6b86127bde04b0663e3cff53d669b570034fbb32d6aa44f950 SHA512 5bb236a696e0ad2f4f0fc39ff651fa6c1c2764fe777fd5c6be29b0610c1de9c85bdb72594f56b903b7c646014d10ddcf772bd49595581f0b67b183bbe361bdd2
diff --git a/dev-python/pyjwt/pyjwt-1.7.1-r1.ebuild b/dev-python/pyjwt/pyjwt-1.7.1-r1.ebuild
index 0cb072fed98d..cf944a1e3510 100644
--- a/dev-python/pyjwt/pyjwt-1.7.1-r1.ebuild
+++ b/dev-python/pyjwt/pyjwt-1.7.1-r1.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 DISTUTILS_USE_SETUPTOOLS=rdepend
 PYTHON_COMPAT=( python3_{6..9} pypy3 )
 
-inherit distutils-r1 eutils
+inherit distutils-r1 optfeature
 
 MY_PN="PyJWT"
 DESCRIPTION="JSON Web Token implementation in Python"
diff --git a/dev-python/pylast/Manifest b/dev-python/pylast/Manifest
index 1f268d7fb37b..b526c8bdfcd8 100644
--- a/dev-python/pylast/Manifest
+++ b/dev-python/pylast/Manifest
@@ -1,5 +1,5 @@
 DIST pylast-3.2.1.tar.gz 39763 BLAKE2B 1162efb68b89e381528b73eb5fb1dd45a15fcf8129b59fcae824ee78f100f6ea523207cda5b689b2fe66628b0aa5db313b5fa2f504b61b3b4ef6b64ccf13ea5b SHA512 e79a258e6f7c8490d98b4b737abae29cf763dcc5520f47dfe9fe7827f3163bc43ad7dc5c25edd1099cb4c4cd3483cdc5014331caba6f8c3cb29fb1394a8bfa3a
 DIST pylast-3.3.0.tar.gz 40209 BLAKE2B 45725d8424a54ac03b53a6c7fe79febb0038c07ee6c2685d7b66f29933f91fb4ea55818be1d02f8fb1126758acd1d9ce3366e8a7d84fe3082b9b3003a9b948b3 SHA512 8b0c089896d7efb37bdf3a701d150b0f94f386715eb73122a4a7618f5b1a514f9f7577e8c7c84eacb36b18e69aa064220403a578d0544344ab11e87e1b46695a
 EBUILD pylast-3.2.1.ebuild 867 BLAKE2B e3284a7c05c7ad2f7b9392360b79b8050d4961f254fa41abf94c466df0aba4cd3cb82d1aec912e8819b6e6389911ef5df6092bc67029d7dbce300a73ec52ba6a SHA512 86f2b4271a5d371048e82fe0e8e7a50523c273170bc06b37780b202e676a5ee7d13b71010be81b2f08abb15105ffeb211cd2bb84f3aa3fda5903bb626ee7ecb3
-EBUILD pylast-3.3.0.ebuild 795 BLAKE2B 2906255c11201188e9975e8fcca4ab34dc9258a9ad12bccaa480344ffb6e62abc95348eeb67be3b44298cafff098b2cbcd04145c2ee14078ec0860de96490f30 SHA512 0db6fd5fae88b05d0049e2ecc9107438aa23d689393f4562c64b563312b2fef78ccbe6b65bac41d7a69bbe2b33dc6d5046cc7bbc7694da17199b8612bf9c9dcc
-MISC metadata.xml 838 BLAKE2B 6e7565ee2b6821052c09371d7cd6dd33964010c15ef8cb7b7a4a4570628683ed16510385f2a54c084ee605c590132a4bb4926510b9805ac7fd7238bb8d571537 SHA512 e0ed92b884e1a5be485ce44bf08fcb6c38068134e083423bde3e4a2f2180d0cb14f76bf9f154f69247a8008e5a952021925110cf1d0985a7a7d15f082150fad0
+EBUILD pylast-3.3.0.ebuild 800 BLAKE2B d32458dd7a81fb811299ce026e317238e46bb34145be6336e3b2fe1024c5d00002d2b84bbdb681bbc4571a9a3630043ac6b72a1f28744c88af3038830c5f0f76 SHA512 7f4a366b0206b954d3c2cfa395a58bd08a48a6c64f1dfdfcdd3fbf27a81b75899cec0ac4ef4aa44a188bbe39f1700a733ea36d78157385e5b6b1c42673f84766
+MISC metadata.xml 863 BLAKE2B baa94af51c12d8ef4cbc482d99afdf0f41851837a560b48d190410b690878fe01add338503f4264f2f031c83615f6d53231be56f8efd20833b7df93263394530 SHA512 2363edae5cf8ca68874aa0891ece420b69855fb2d4c6da7dd2147d149504800a72bbf725ef34d25c104de4dbb2200d045097644b0b85e264dc9bbb083f6278d2
diff --git a/dev-python/pylast/metadata.xml b/dev-python/pylast/metadata.xml
index 8728f1894c38..d92c10f33e69 100644
--- a/dev-python/pylast/metadata.xml
+++ b/dev-python/pylast/metadata.xml
@@ -16,6 +16,7 @@
     * Support for other API-compatible networks like Libre.fm
     * Python3-friendly (Starting from 0.5).
   </longdescription>
+  <stabilize-allarches/>
   <upstream>
     <remote-id type="pypi">pylast</remote-id>
     <remote-id type="github">pylast/pylast</remote-id>
diff --git a/dev-python/pylast/pylast-3.3.0.ebuild b/dev-python/pylast/pylast-3.3.0.ebuild
index 31901f1e1f6e..9c1b08ffdd51 100644
--- a/dev-python/pylast/pylast-3.3.0.ebuild
+++ b/dev-python/pylast/pylast-3.3.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc64 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 
 RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
 BDEPEND="
diff --git a/dev-python/pylatex/Manifest b/dev-python/pylatex/Manifest
index 173408f8f1a6..45a7d18185d2 100644
--- a/dev-python/pylatex/Manifest
+++ b/dev-python/pylatex/Manifest
@@ -1,3 +1,3 @@
 DIST pylatex-1.3.3.tar.gz 300639 BLAKE2B ac8fad8fa7e6e821cda168f3ae8ffb5acec21d688761b153ef2f9383b6a2f2ac7daea65f04389eb1ba3152fc50176d73cb814a78d2b5250ead2c6647eb96635a SHA512 12f51805996d84840f68844b79384ce4d2c29dde4db06f73b8887fe012abeaa4b9c5cf5e449132e626132b50ba26f014a899d548e3c0def25289671fd92e41a6
-EBUILD pylatex-1.3.3.ebuild 1262 BLAKE2B 7b6c7583e4b81b109de7dfb65798ac5ff29f706e79845926cd19fad434882b58a9869ead24cbb8b95427349fe189cb4bd0e57f6125fd76a7fe44ad4f8bc398f4 SHA512 4ed3ce684cc483caeed7158aaf23e0899c7e20c91d5e556cd5f3cc9de3bc3816217d802f25853b38cc8904e7656330aed7ea2e74ca3d83c628432c5c2aed62b5
+EBUILD pylatex-1.3.3.ebuild 1265 BLAKE2B 5f57ff1825e5d72f5bd7df63a234bc3a6ef62c003a194526a494921f066c90d77adbec1ba3d67e3ba93622fc7e413e2655ff1e70e58df6fe22e46f63ed1a7dbd SHA512 edf06e179c3b5ef8d295129882460e756e1c11399eff298667655cb6695db6269f0cac8502e98cb1f8c1ee91b645b4be1e0e5cbe6dfccd5ebcf09eef2d05d9b0
 MISC metadata.xml 719 BLAKE2B 783c71b21422f66a2f58b8afe718d9029f9b5fc4b4b7b82a1e4e94fc4d5c3a7a13bf55a116591352a6bc48ad5a2249bfca32b60c45d319d79a420a109203b1f0 SHA512 c3c7d820a541708fd78cdda73c425e491b5d527742ff641d9291ecbc107d79cf870cc2150e72f45cfaaf2de8f678b9b54ed041611caaed8538f21615e5fbc374
diff --git a/dev-python/pylatex/pylatex-1.3.3.ebuild b/dev-python/pylatex/pylatex-1.3.3.ebuild
index 624ebdd6af61..d755dbceb178 100644
--- a/dev-python/pylatex/pylatex-1.3.3.ebuild
+++ b/dev-python/pylatex/pylatex-1.3.3.ebuild
@@ -8,7 +8,7 @@ MY_P="${MY_PN}-${PV}"
 
 PYTHON_COMPAT=( python3_{6,7,8,9} )
 
-inherit distutils-r1 eutils
+inherit distutils-r1 optfeature
 
 DESCRIPTION="A Python library for creating LaTeX files and snippets"
 HOMEPAGE="https://github.com/JelteF/PyLaTeX"
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/JelteF/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 IUSE="examples"
 
 RDEPEND="
diff --git a/dev-python/pylint/Manifest b/dev-python/pylint/Manifest
index 5b6051616d9d..e3bf220ec8a1 100644
--- a/dev-python/pylint/Manifest
+++ b/dev-python/pylint/Manifest
@@ -2,5 +2,5 @@ AUX pylint-2.4.4-sphinx-theme.patch 468 BLAKE2B 741a362b51d35f574b245b4df81309b1
 AUX pylint-2.5.3-no-pytest-runner.patch 533 BLAKE2B 0882d3b057cd214ac04645c3992585e9550624f551206d863817940846fc6bd7d863431c33df46f0a83379fdc3ab411949b73f0475e08fd7debd465d83e848eb SHA512 9ed1784e83693b2aeff1862f9592fa574f20bb2d513f3bdef34b895263a31d6d747b4c76d09e6d48e15031388cd70b01caabfd84628ca98e1634fa42b6988eae
 AUX pylint-2.5.3-tests.patch 455 BLAKE2B 608ec913ea9d8088c3e7303026339eca69cbf706601ccb841642eef83ae9eccb7d6863da6c7957f9f49a81f24d17e72d835c3740ef177ced6356bec7510a0221 SHA512 dd1930e47dc342cb76fe55fad22cde3b4d5935a62c62d740b75e27701606bb8d5513b8f2c9e2f3116c0456a545a2c56f6d75b87903e2cdec1df97e4b8ed1b532
 DIST pylint-2.5.3.tar.gz 684449 BLAKE2B 7b494f5334376ff571fd8971851198d037e87c5be83d0123fcb108701489769785164bb077eb10b4851c89b82dadc40c510186eaf03be1621c4d78c79dffbceb SHA512 03fcd893d361b66794f17433e90df108099fee2eccb35507c7f61befb8db846f0242e5ce2b4ee63727c9cc780a376c3b93d5af3186f884a4fdaad68b224ed7d2
-EBUILD pylint-2.5.3.ebuild 1604 BLAKE2B 36455c4999d1e54ea89fea6359b654226ce7ea9df5e21e03c201de7daf7155b886ff6d669bb3e7e09c0aafd3bc5d6d338e9f4a12c5fb3e4b51a727a62ca00e59 SHA512 ca7e95401d063fbae9f2de19fd40fba53b3771ddbe02acfb45e71577d916cf0d76a9c67c83fbd2960603d9e002ff5edfccb2755f0cd3621150a131837b7038b2
+EBUILD pylint-2.5.3.ebuild 1608 BLAKE2B edd1ce858dc80cf214232cc05e46293949c989766f3693d29a9d544663d8a17ee43db50370774756964090f2958aea04d80f7f2d9db5c05df4d5fbc1951fc6a1 SHA512 bee7ae021b2cb2fabb5bb6c4438637fcaf56ab89cd71efe6d4b1b20196a33725fbf0b8074abffdd8d56b1ff28f5746949441fb39dc4a8f639079d563237ca54b
 MISC metadata.xml 1099 BLAKE2B 5933d1532c718b45075ebcf1c4d5010d855f4d8d1034b0a96ae6c64ecab6f03212a7e261215dfcb70e688521f17070e7875fdefe427a4f4a3be2eedde2b36605 SHA512 0d7fb923cfaa8af4c4d1fb294f16a686a22f10c248111b135b76f2b56a1a42f7bdb3337d5f0080d6d4d2b449743ad89358e86f3090488d0d6baf4f8faee2c79a
diff --git a/dev-python/pylint/pylint-2.5.3.ebuild b/dev-python/pylint/pylint-2.5.3.ebuild
index 4dec5c52ccde..8cae6d66c8b7 100644
--- a/dev-python/pylint/pylint-2.5.3.ebuild
+++ b/dev-python/pylint/pylint-2.5.3.ebuild
@@ -9,7 +9,7 @@ DISTUTILS_USE_SETUPTOOLS=rdepend
 # entry_points is added via **kwargs in a dict
 _DISTUTILS_SETUPTOOLS_WARNED=1
 
-inherit distutils-r1 eutils
+inherit distutils-r1 optfeature
 
 DESCRIPTION="Python code static checker"
 HOMEPAGE="https://www.logilab.org/project/pylint
diff --git a/dev-python/pymediainfo/Manifest b/dev-python/pymediainfo/Manifest
index 614f838463e1..5599dbcd8003 100644
--- a/dev-python/pymediainfo/Manifest
+++ b/dev-python/pymediainfo/Manifest
@@ -1,3 +1,3 @@
 DIST pymediainfo-4.2.1.tar.gz 434723 BLAKE2B 9dc9754fe8b993b9674da1a02150addb2f7eecfb38e60914e0644fddc1de564e8e0a81260c999f8ae3379d484e26786d0e67ed8aa0e3cc17b70066edf3e75b9c SHA512 33343838312ce240a23fa3856d808bf4b1346a1c65ed99c0405664aceaf452df610144114c228ad43e525f7abc9609420071bc6960f92b68ed7abe5dae8764aa
-EBUILD pymediainfo-4.2.1.ebuild 944 BLAKE2B f2c71f7524d4069caef8866b7e008427f846ebef7105de8ba52a2149998cb1b4c52bdf40dda8ceaf798bd618f793041f3bc95339062ba1f28d21768dec2d6571 SHA512 cd604ff86a4208bd2817dc74122e83f71d4e84109073d8e5479d538ca941921b1a779ee8eee9ca99267aa96a34f61549c613fe3aa3165dd05eceea54222c9b45
-MISC metadata.xml 441 BLAKE2B 6dcb65038010218beb340daaab820392fa857e77a417aa8957f678983f0b56fbb878c508790f9c7f33b6acd8eeaab2320c7b0ca2d2533e112ccb984f9ec7d3c0 SHA512 a5052eb10a6672d924cd1a09505d2eccb26187cc11a16b2ab30dcf7e1ebf1e59e12e10f5b35426eebbe9c74a74611b25ea70464e661e9abaf22fee3ed361fea3
+EBUILD pymediainfo-4.2.1.ebuild 946 BLAKE2B 33a632f0d27a5f1be50e7b3bcba36ef7b6484fa36977dbeafea7d1abe13d3e79aeffe8644dcfe053b8c66cac0788e9fbbf45914807c996ce8ca5ce63cd3debc6 SHA512 882dc3e397a6e228a33800d4d74dfb487a78dd6aedf8317a714c26d1a5683ff9d8eb5e893ab4d737f771bf04e06524fb23b5848241548ee735cbbae6d0427953
+MISC metadata.xml 490 BLAKE2B af57dd2a5e345a6f7278614b276fc5ff9e9754286e2e24a651f94f18c238a0be6387319fd10d3b3709bdd22509840b9b02344d4bd3c5d196eb2816d41759890d SHA512 10ecb149acb001a0ba8e0e4af45121672f4a683f5e5690cc2d5fb112cc17b45754cf2a3fe303408fd99c16ea57d799829eca56037a2252ab36fddf730a5fa22a
diff --git a/dev-python/pymediainfo/metadata.xml b/dev-python/pymediainfo/metadata.xml
index ff5ec5019c51..14288a8c4ec9 100644
--- a/dev-python/pymediainfo/metadata.xml
+++ b/dev-python/pymediainfo/metadata.xml
@@ -9,5 +9,6 @@
 		<remote-id type="pypi">pymediainfo</remote-id>
 		<remote-id type="github">sbraz/pymediainfo</remote-id>
 		<bugs-to>https://github.com/sbraz/pymediainfo/issues</bugs-to>
+		<doc>https://pymediainfo.readthedocs.io/</doc>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/pymediainfo/pymediainfo-4.2.1.ebuild b/dev-python/pymediainfo/pymediainfo-4.2.1.ebuild
index 60bfaa83a98a..50f33e037c42 100644
--- a/dev-python/pymediainfo/pymediainfo-4.2.1.ebuild
+++ b/dev-python/pymediainfo/pymediainfo-4.2.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( pypy3 python3_{6,7,8} )
+PYTHON_COMPAT=( pypy3 python3_{6,7,8,9} )
 PYTHON_REQ_USE="xml(+)"
 # The package uses pkg_resources to determine its version
 DISTUTILS_USE_SETUPTOOLS=manual
diff --git a/dev-python/pymetar/Manifest b/dev-python/pymetar/Manifest
index c1e555ab5a3e..fddf4e63397d 100644
--- a/dev-python/pymetar/Manifest
+++ b/dev-python/pymetar/Manifest
@@ -1,3 +1,3 @@
 DIST pymetar-1.1.tar.gz 3162533 BLAKE2B 43cc79a0c8b27f7146a0f89d4271830ace0bd25790e8df006c19205419eabec88b90645d473019951b21952ee67df25261f6eea8c2d58de95e13186ab4bce214 SHA512 3e830065d3201373695c381f45969e7b532d69de8218cb32e107ed72235cd7cff8051e129c6ae4761154ed9d3fca81c530938520d6a54e7bf467cf28ebf9de02
-EBUILD pymetar-1.1.ebuild 455 BLAKE2B 47c12905586b40d0b64c99833c97c68324cb23a6df9f668d14d77974618b2b5acda310be00a866a2028ac337aac5b55c8baf273830655093e721036cca75182e SHA512 1ff7be4fa29048200ee47b30f2a6c222e6308e6018a85e176c4efbafd5b2ded9de59b3b62edf3dbccbe1455cde0461f9512d04507614ce2ef747d89be83ccb5e
+EBUILD pymetar-1.1-r1.ebuild 457 BLAKE2B a3c6dacb74e8e4d03381deffb34517cc6013c36ff0d068a28cb4be7cae6f604463e0b791bffb872a1eec5a59b3a3852152235afeb2068c186777ef4412494b76 SHA512 d5667c9978cc42cbe110f59107954001a697238bec3a53b5e27dc8dd4ade873191147c2d74106c92c2d9db5cd563dac7019dda0515381674675d6158a241c895
 MISC metadata.xml 959 BLAKE2B d9fc6e95f4c432c64667a617894a8e86e0c69801fb73d1a2d4dfbfcc490f84e32f97c3b2ff425eb30d30769b799d79f39863e4bf6dbc4cb848c03025a34d40d1 SHA512 de0134cfbc608c80cccfd3029faf769fa6e8fae8c3df9ed2bb7afb6231f6d68c68a6bc97fd690987b552aa026c40358e3dbd70d8a8df2633f4c6368ca7651143
diff --git a/dev-python/pymetar/pymetar-1.1.ebuild b/dev-python/pymetar/pymetar-1.1-r1.ebuild
index 5bfbb5db6653..4889e2e0e0ad 100644
--- a/dev-python/pymetar/pymetar-1.1.ebuild
+++ b/dev-python/pymetar/pymetar-1.1-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 
 inherit distutils-r1
 
diff --git a/dev-python/pyopenssl/Manifest b/dev-python/pyopenssl/Manifest
index cc1fbea625f3..d010c631f850 100644
--- a/dev-python/pyopenssl/Manifest
+++ b/dev-python/pyopenssl/Manifest
@@ -1,3 +1,3 @@
 DIST pyOpenSSL-19.1.0.tar.gz 160510 BLAKE2B e6e39f860221a2696aa3fa32ac89ed48e34b18e4accc366a86264d943a15a1b00ba1a0d8349550d1775d25836aa5d214e1e3fe4ec0a9c0f6d5ab00cd9fede633 SHA512 4acd96f287d72eb11bd812697d28cd6eb6a96a4653248b65f967187830a6b17cc1254775a18a3405469f3d45abdae6f02d165f2f35f035f3174c2826fba82916
-EBUILD pyopenssl-19.1.0.ebuild 1398 BLAKE2B fc7a107ae797a37a83a5311c398bc2dcc3b263266d419c8fc82e6ac91b99465ec96d4536ae2fa523f8aa14a574eb4368db9569e6fbc052e0cfc52377a5bc2f74 SHA512 e0e3f22463ab7fe2628747cf4b9fd2e60768c32e6be8f570f61d260a9ab71097f5eba464d1a5c3a55b1033416a3cc86b86419272d16ef3a0618bdf0d238d6d0b
+EBUILD pyopenssl-19.1.0.ebuild 1405 BLAKE2B 35b245c10bc8608d58ff807e72692a119e18b154c0cfe52b8924298701e461a85cf72dca05eb4e13e0cfdd64fadc3a4d80ffa8dedeb2647a8494d37edf41161e SHA512 6bc2541f17c7d05d3eb9b8d26adcb0fe6454424187847789ac14778ff0d935f60ef7902dc7e78e3e970aac0546f93901cf9f26553fae12e5626d73c4a62737fb
 MISC metadata.xml 481 BLAKE2B e25a44e19e9e7fb701742e1c4916a41a777efcaa046b8147510fc8d9d021cbaad9fb887d8df6769b91006acdc9418df6cec4ba20a78fdec88d26b7cc4ac5c2f0 SHA512 d568654867ca274e7c67a9b30a7f50e739309a22d78c3c1f06f4216a224b00e3a05be022920614befaf96a65ac55782966c9a1fd0ae88c806acc559af307ca38
diff --git a/dev-python/pyopenssl/pyopenssl-19.1.0.ebuild b/dev-python/pyopenssl/pyopenssl-19.1.0.ebuild
index 355d5a3d0c1f..eac70597e267 100644
--- a/dev-python/pyopenssl/pyopenssl-19.1.0.ebuild
+++ b/dev-python/pyopenssl/pyopenssl-19.1.0.ebuild
@@ -22,7 +22,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/pyparsing/Manifest b/dev-python/pyparsing/Manifest
index 01e3acc7258e..bcd4b1791863 100644
--- a/dev-python/pyparsing/Manifest
+++ b/dev-python/pyparsing/Manifest
@@ -1,3 +1,3 @@
 DIST pyparsing_2.4.7.tar.gz 648158 BLAKE2B 24525b4ee7876e245b9eb270f0e3e22fe2d8b398f9777ad3b3657b8a1227dcbd25983aa64a3f3018debdbffc1a042c732e6b3a09800e081c7acac7b97da15317 SHA512 c7a546729f86a2b5176e2482b566b9fd715b03e495aaef4d720b21307bb03f385dbc849247f8d266cb3d92be0a83c34ce4995b655ce85318355d5a0d42d6991e
-EBUILD pyparsing-2.4.7.ebuild 1007 BLAKE2B e5f921041df7b76129ee3a4f27b16bf6f79120d8dd046ccbbe3238e6b05783e1e73cdcc7e866da5ebd639eab4ec19cdf733f3eb3b10a7db2196d1ee5f0875c17 SHA512 8df4a7f9eebe49308a375f8ef16f455ed7a73a03326bcd0b75c475d67b09fd032a0127cbffd331b7a7acde5f1f70d220f3e1200b84e825bdeb12033986b6b996
+EBUILD pyparsing-2.4.7.ebuild 1014 BLAKE2B 0b8579e667c69497bddd9c33c326c997c47fc9d9c519d69a05f7b929c1968036c764796932b9b588c5f855d223eb05e48dad9685ba5740872c50d90c1e1b5754 SHA512 c33e9adc63ab6580fbbfde14f35307c7c2be38b1166d44ab131ea96a220faedce4e764e1adee4c6227ecbf038021c77e19c5b80dbc19bbcea0c4bfcfacd2c1bd
 MISC metadata.xml 762 BLAKE2B adad994029179676a767488775141e8d79d51803f1fa9546d85c33dfbaa2a656e82bbd1c684c401bdccad5f2be763878296f149c9032097f1db87c60865dbc7a SHA512 7afb6c24b323080e02f552a35c89e7b0117482ed9edf5ad28e845553d98db9ba0d02919419ec8029bfc431ed39c5b60bc270360e6c5567d34e883c819b2ca9c1
diff --git a/dev-python/pyparsing/pyparsing-2.4.7.ebuild b/dev-python/pyparsing/pyparsing-2.4.7.ebuild
index 0e591f5e691d..b412b387bec6 100644
--- a/dev-python/pyparsing/pyparsing-2.4.7.ebuild
+++ b/dev-python/pyparsing/pyparsing-2.4.7.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${MY_P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="examples"
 
 distutils_enable_tests setup.py
diff --git a/dev-python/pypiserver/Manifest b/dev-python/pypiserver/Manifest
index e3cee37aadd7..3f1c7f0f7a96 100644
--- a/dev-python/pypiserver/Manifest
+++ b/dev-python/pypiserver/Manifest
@@ -1,4 +1,3 @@
-AUX pypiserver-1.3.1-no-internet.patch 3125 BLAKE2B bf6d0891897d1a7cfea6151df1ad274cda77dde74d85e355a2fb00815513cd612c1af393b4397ce5fa946634397980127545fba3a657e5a9def9eb50136ed12f SHA512 7775abae4f70e45888450a4dce6f55858b7d48d4c7bdfc9f1653319a65608fdc26010040b0beb781a5aa9e0804f016fb56405290426b85724e29177a68658b06
 DIST pypiserver-1.3.2.tar.gz 505905 BLAKE2B 4e62d11cf280524d532e793d3ffc4dc59f1e72c6aba2ed6bd0d70f86104162dc60377b56e08676ab03326c33885acae698dc60b435426b195f13bf9f60bb7b8c SHA512 de823376f7711bfdaff3a1acefae37e1d7528802203929b8aeb8790c2b1c466badaf5a1d5084100bc37f41636d2cdfc2038cd3ad9805d15ca42c80834760b4da
-EBUILD pypiserver-1.3.2.ebuild 1210 BLAKE2B fce159dbde950c324a3a547e2f16bf8faa0e38c09aa219f60feb8262afe0bbfe287439a00c5d8f72a94dbe0d4095af4c5d8b5c6ed0ffa219f22b5992fd99791a SHA512 013d17c06d4d3ae3f78b093e4fce404726a0090cea4cb7346fd8fb5696df297f84bb1c295042ec6804389f68fb19543cceb080ca1fc3616c6d1d3e27a2063420
+EBUILD pypiserver-1.3.2.ebuild 1217 BLAKE2B 82709cfe793d656ac79e96bc04ee307a2599169dbb4bdb834d2f806d9644646f247639b251b4eb6a3bbb1d8fc4b7d055d2c1207c6d4adc2974aa678310255543 SHA512 17b339a073f45b18e8b21830684222de20b5d89d78d11f55dfdf630b0c71f6d1c1dfa4166470f4b305c19dadf24414c7f768466ca35d721245e6d0bc768d25f4
 MISC metadata.xml 384 BLAKE2B 3b55101f9c900a8570344ac9335687f3c505f5055022af866fe090878b2b44222a311d3166103e16be780d28a84d9142416acf2933be1a01712587910f7c5d77 SHA512 b18e80dac13f712ff61216f2b23f7c33fea7508634ad523b67f232fcb8301000edff1ca92307834878b6392ea38be8f03118abd2dc55ff6b9c03c8c4dd342e4d
diff --git a/dev-python/pypiserver/files/pypiserver-1.3.1-no-internet.patch b/dev-python/pypiserver/files/pypiserver-1.3.1-no-internet.patch
deleted file mode 100644
index 2df183f6404f..000000000000
--- a/dev-python/pypiserver/files/pypiserver-1.3.1-no-internet.patch
+++ /dev/null
@@ -1,90 +0,0 @@
-diff --git a/tests/test_app.py b/tests/test_app.py
-index 52ce234..46cd23a 100644
---- a/tests/test_app.py
-+++ b/tests/test_app.py
-@@ -2,6 +2,7 @@
- 
- # Builtin imports
- import logging
-+import unittest
- 
- 
- try:  # python 3
-@@ -177,6 +178,7 @@ def test_favicon(testapp):
-     testapp.get("/favicon.ico", status=404)
- 
- 
-+@unittest.skip("Requires internet access")
- def test_fallback(root, _app, testapp):
-     assert _app.config.redirect_to_fallback
-     resp = testapp.get("/simple/pypiserver/", status=302)
-diff --git a/tests/test_manage.py b/tests/test_manage.py
-index 9735ac6..bde267d 100755
---- a/tests/test_manage.py
-+++ b/tests/test_manage.py
-@@ -118,6 +118,7 @@ def test_pip_cmd_root(pip_ver, cmd_type):
-     assert tuple(PipCmd.update_root(pip_ver)) == exp_cmd
- 
- 
-+@pytest.mark.skip(reason="Requires internet access")
- def test_pip_cmd_update():
-     """Verify the correct determination of a pip command."""
-     index = 'https://pypi.org/simple'
-@@ -138,6 +139,7 @@ def test_pip_cmd_update():
-     )
- 
- 
-+@pytest.mark.skip(reason="Requires internet access")
- def test_pip_cmd_update_index_overridden():
-     """Verify the correct determination of a pip command."""
-     index = 'https://pypi.org/complex'
-@@ -156,6 +158,7 @@ def test_pip_cmd_update_index_overridden():
-     )
- 
- 
-+@pytest.mark.skip(reason="Requires internet access")
- def test_update_package(monkeypatch):
-     """Test generating an update command for a package."""
-     monkeypatch.setattr(manage, 'call', Mock())
-diff --git a/tests/test_server.py b/tests/test_server.py
-index 6cb4bc4..6325b6f 100644
---- a/tests/test_server.py
-+++ b/tests/test_server.py
-@@ -275,7 +275,6 @@ def twine_register(packages, repository='test', conf='pypirc',
- # Tests
- # ######################################################################
- 
--
- def test_pipInstall_packageNotFound(empty_packdir, port, pipdir, package):
-     with new_server(empty_packdir, port):
-         cmd = "centodeps"
-@@ -283,18 +282,21 @@ def test_pipInstall_packageNotFound(empty_packdir, port, pipdir, package):
-         assert not pipdir.listdir()
- 
- 
-+@pytest.mark.skip(reason="Needs internet")
- def test_pipInstall_openOk(open_server, package, pipdir):
-     cmd = "centodeps"
-     assert _run_pip_install(cmd, open_server.port, pipdir) == 0
-     assert pipdir.join(package.basename).check()
- 
- 
-+@pytest.mark.skip(reason="Needs internet")
- def test_pipInstall_authedFails(protected_server, pipdir):
-     cmd = "centodeps"
-     assert _run_pip_install(cmd, protected_server.port, pipdir) != 0
-     assert not pipdir.listdir()
- 
- 
-+@pytest.mark.skip(reason="Needs internet")
- def test_pipInstall_authedOk(protected_server, package, pipdir):
-     cmd = "centodeps"
-     assert _run_pip_install(cmd, protected_server.port, pipdir,
-@@ -395,6 +397,7 @@ def test_twine_upload_open(empty_packdir, port, package):
-     assert len(empty_packdir.listdir()) == 1
- 
- 
-+@pytest.mark.skip(reason="needs internet")
- @pytest.mark.parametrize("hash_algo", ("md5", "sha256", "sha512"))
- def test_hash_algos(empty_packdir, port, package, pipdir, hash_algo):
-     """Test twine upload with no authentication"""
diff --git a/dev-python/pypiserver/pypiserver-1.3.2.ebuild b/dev-python/pypiserver/pypiserver-1.3.2.ebuild
index cb7e56092aea..13964332829d 100644
--- a/dev-python/pypiserver/pypiserver-1.3.2.ebuild
+++ b/dev-python/pypiserver/pypiserver-1.3.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="ZLIB MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-python/pypy-exe/Manifest b/dev-python/pypy-exe/Manifest
index 079b405746db..88774b9cf8b2 100644
--- a/dev-python/pypy-exe/Manifest
+++ b/dev-python/pypy-exe/Manifest
@@ -1,5 +1,7 @@
 DIST pypy2.7-v7.3.0-src.tar.bz2 20328540 BLAKE2B 7f71c98f436f11e8f4d248b6aeb3e2f81962cdeeaf3eb534473f1c6b5e8cd37d9abc047d7fa750a1ceeeaa63fab6eff6e5f1e60394b8104bbcd7e1fc47885c61 SHA512 05f039f090d837a72012db55f23d94da3f21c7458f18bd1e8ba632489248eb6486ced07b786d05e573abf2b3def2a68d96e7e1109e6d189d8e6c303c60ee3535
 DIST pypy2.7-v7.3.1-src.tar.bz2 21053306 BLAKE2B 071d59b7978c98e9ed9243d9a64d93d21b524351cb9a45e0f7d48828f919c84585a1164e7c38739fdd8828ab4b1eedade96dff7d64d0d9cbfe00c74d88d532bb SHA512 1bec44fa0fc4b1186e25f69303f9e332df32184be990d86fba41c40152664a93bd65eabf4dded133371271402cea9b150b60c13bce89d1004b276f0908c0b8f1
+DIST pypy2.7-v7.3.2rc1-src.tar.bz2 21136151 BLAKE2B 50a2fb407624f3831095af9a1859399a39be039e54673a2f015049071cbf128302567f6fd7423bbdf757f46b9f32a09c0ba09985ce046731893f4d1563416050 SHA512 09b0aa48e5d09d87b592d6a5cfa3c7d3e2c93898b8250c31cfae99c44c79c41f05ac1d4b400d82d610e4e56dedacdd97c51b89308ea3a38f6ded8eda0779a08b
 EBUILD pypy-exe-7.3.0.ebuild 3891 BLAKE2B 1121625d5422a1d52114e58fd7f1632f175fc1623b2b931c3fb528acb1f18fdfc1a0859218330fe3e7c20bc539ff2819ea21cac2cb41328a4d295e7f5e9f684a SHA512 6bff225e427ae47b014a20ae7ab3893e55a893d5ce0670dc0474b4e6626113f5cbeef893e8585d42c8be78a64a051addbbbff1eb90b2266284d6064e73feeb2f
 EBUILD pypy-exe-7.3.1.ebuild 3891 BLAKE2B 1121625d5422a1d52114e58fd7f1632f175fc1623b2b931c3fb528acb1f18fdfc1a0859218330fe3e7c20bc539ff2819ea21cac2cb41328a4d295e7f5e9f684a SHA512 6bff225e427ae47b014a20ae7ab3893e55a893d5ce0670dc0474b4e6626113f5cbeef893e8585d42c8be78a64a051addbbbff1eb90b2266284d6064e73feeb2f
+EBUILD pypy-exe-7.3.2_rc1.ebuild 3893 BLAKE2B 68647b133594b77ad1c361f587edaaf29a0f6f4d4dfacbe647e0b60c01e91e30b27f5c3b70ac0d74d71d3a40804a69d903782a577bd10d501a958418e1a329d7 SHA512 447c447548223d0dc3711b3d856d3abda964cce8b7b3f691917b47481e6ee4306744ebdc547d861a1f13f0c513d7891410eac8f7d030570c583ddd08ccc88cb5
 MISC metadata.xml 574 BLAKE2B 780347fb0394d2ed8955c96b0a60c66abf4d5835a584dc666ee20d2eb45d6fe4f54800d6bdbedbcd986165c12d89ad5cb730c24c4d85dd67f2d4d85a925a45dc SHA512 32b48188c88a38a5f107a891519ca7749e3c0566f8f0b4a148e14fa31f762c90814d85199efbeae651d8191558b12a13920e899e5a8e2e07b5fdaaca9c4388b2
diff --git a/dev-python/pypy-exe/pypy-exe-7.3.2_rc1.ebuild b/dev-python/pypy-exe/pypy-exe-7.3.2_rc1.ebuild
new file mode 100644
index 000000000000..07e3be2ee5c4
--- /dev/null
+++ b/dev-python/pypy-exe/pypy-exe-7.3.2_rc1.ebuild
@@ -0,0 +1,162 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 )
+inherit check-reqs pax-utils python-any-r1 toolchain-funcs
+
+MY_P=pypy2.7-v${PV/_/}
+DESCRIPTION="PyPy executable (build from source)"
+HOMEPAGE="https://pypy.org/"
+SRC_URI="https://downloads.python.org/pypy/${MY_P}-src.tar.bz2"
+S="${WORKDIR}/${MY_P}-src"
+
+LICENSE="MIT"
+SLOT="${PV}"
+KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="bzip2 +jit low-memory ncurses cpu_flags_x86_sse2"
+
+RDEPEND=">=sys-libs/zlib-1.1.3:0=
+	dev-libs/libffi:0=
+	virtual/libintl:0=
+	dev-libs/expat:0=
+	bzip2? ( app-arch/bzip2:0= )
+	ncurses? ( sys-libs/ncurses:0= )
+	!dev-python/pypy-exe-bin:${PV}"
+# don't enforce the dep on pypy with USE=low-memory since it's going
+# to cause either collisions or circular dep on itself
+DEPEND="${RDEPEND}"
+BDEPEND="
+	!low-memory? (
+		|| (
+			dev-python/pypy
+			(
+				dev-lang/python:2.7
+				dev-python/pycparser[python_targets_python2_7(-),python_single_target_python2_7(+)]
+			)
+		)
+	)"
+
+check_env() {
+	if use low-memory; then
+		if ! has_version -b dev-python/pypy &&
+				! has_version -b dev-python/pypy-bin
+		then
+			eerror "USE=low-memory requires a (possibly old) version of dev-python/pypy"
+			eerror "being installed. Please install it using e.g.:"
+			eerror
+			eerror "  $ emerge -1v dev-python/pypy dev-python/pypy-exe-bin"
+			eerror
+			eerror "before attempting to build dev-python/pypy-exe[low-memory]."
+			die "dev-python/pypy needs to be installed for USE=low-memory"
+		fi
+
+		CHECKREQS_MEMORY="1750M"
+		use amd64 && CHECKREQS_MEMORY="3500M"
+	else
+		CHECKREQS_MEMORY="3G"
+		use amd64 && CHECKREQS_MEMORY="6G"
+	fi
+
+	check-reqs_pkg_pretend
+}
+
+pkg_pretend() {
+	[[ ${MERGE_TYPE} != binary ]] && check_env
+}
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		check_env
+
+		use low-memory && EPYTHON=
+		if [[ ! ${EPYTHON} || ${EPYTHON} == pypy ]] &&
+				{ has_version -b dev-python/pypy ||
+				has_version -b dev-python/pypy-bin; }
+		then
+			einfo "Using already-installed PyPy to perform the translation."
+			EPYTHON=pypy
+		else
+			einfo "Using ${EPYTHON} to perform the translation. Please note that upstream"
+			einfo "recommends using PyPy for that. If you wish to do so, please unset"
+			einfo "the EPYTHON variable."
+			python-any-r1_pkg_setup
+		fi
+	fi
+}
+
+src_configure() {
+	tc-export CC
+
+	local jit_backend
+	if use jit; then
+		jit_backend='--jit-backend='
+
+		# We only need the explicit sse2 switch for x86.
+		# On other arches we can rely on autodetection which uses
+		# compiler macros. Plus, --jit-backend= doesn't accept all
+		# the modern values...
+
+		if use x86; then
+			if use cpu_flags_x86_sse2; then
+				jit_backend+=x86
+			else
+				jit_backend+=x86-without-sse2
+			fi
+		else
+			jit_backend+=auto
+		fi
+	fi
+
+	local args=(
+		--no-shared
+		$(usex jit -Ojit -O2)
+
+		${jit_backend}
+
+		pypy/goal/targetpypystandalone
+	)
+
+	# Avoid linking against libraries disabled by use flags
+	local opts=(
+		bzip2:bz2
+		ncurses:_minimal_curses
+	)
+
+	local opt
+	for opt in "${opts[@]}"; do
+		local flag=${opt%:*}
+		local mod=${opt#*:}
+
+		args+=(
+			$(usex ${flag} --withmod --withoutmod)-${mod}
+		)
+	done
+
+	local interp=( "${EPYTHON}" )
+	if use low-memory; then
+		interp=( env PYPY_GC_MAX_DELTA=200MB
+			"${EPYTHON}" --jit loop_longevity=300 )
+	fi
+
+	# translate into the C sources
+	# we're going to make them ourselves since otherwise pypy does not
+	# free up the unneeded memory before spawning the compiler
+	set -- "${interp[@]}" rpython/bin/rpython --batch --source "${args[@]}"
+	echo -e "\033[1m${@}\033[0m"
+	"${@}" || die "translation failed"
+}
+
+src_compile() {
+	emake -C "${T}"/usession*-0/testing_1
+}
+
+src_install() {
+	local dest=/usr/lib/pypy2.7
+	exeinto "${dest}"
+	newexe "${T}"/usession*-0/testing_1/pypy-c pypy-c-${PV}
+	insinto "${dest}"/include/${PV}
+	doins include/pypy_*
+	pax-mark m "${ED}${dest}/pypy-c-${PV}"
+}
diff --git a/dev-python/pypy/Manifest b/dev-python/pypy/Manifest
index 2abb5b94aa94..290c8b0bbe2e 100644
--- a/dev-python/pypy/Manifest
+++ b/dev-python/pypy/Manifest
@@ -4,7 +4,10 @@ AUX 7.0.0-gentoo-path.patch 1945 BLAKE2B 15cf6008d0032fd839e91e968eeadce5b0ab633
 AUX 7.3.1-gentoo-path.patch 1575 BLAKE2B e374b879aabdb1a9b4d3bb07ba03510e9df7c00e6fba13e117dd718268118ade06fa76f7468855463fa50112fb780fddb9687198f4a24bb0a6cc69b5b79e70d4 SHA512 14e14e4c000166bfe3f1cd10377baecc721b43c2df43c0d5d85e8dc6f220e1a453d7fe30cfbaab547e5483f8f493ddd840620b8de4de6d55abe8f9cddcca2464
 DIST pypy2.7-v7.3.0-src.tar.bz2 20328540 BLAKE2B 7f71c98f436f11e8f4d248b6aeb3e2f81962cdeeaf3eb534473f1c6b5e8cd37d9abc047d7fa750a1ceeeaa63fab6eff6e5f1e60394b8104bbcd7e1fc47885c61 SHA512 05f039f090d837a72012db55f23d94da3f21c7458f18bd1e8ba632489248eb6486ced07b786d05e573abf2b3def2a68d96e7e1109e6d189d8e6c303c60ee3535
 DIST pypy2.7-v7.3.1-src.tar.bz2 21053306 BLAKE2B 071d59b7978c98e9ed9243d9a64d93d21b524351cb9a45e0f7d48828f919c84585a1164e7c38739fdd8828ab4b1eedade96dff7d64d0d9cbfe00c74d88d532bb SHA512 1bec44fa0fc4b1186e25f69303f9e332df32184be990d86fba41c40152664a93bd65eabf4dded133371271402cea9b150b60c13bce89d1004b276f0908c0b8f1
+DIST pypy2.7-v7.3.2rc1-src.tar.bz2 21136151 BLAKE2B 50a2fb407624f3831095af9a1859399a39be039e54673a2f015049071cbf128302567f6fd7423bbdf757f46b9f32a09c0ba09985ce046731893f4d1563416050 SHA512 09b0aa48e5d09d87b592d6a5cfa3c7d3e2c93898b8250c31cfae99c44c79c41f05ac1d4b400d82d610e4e56dedacdd97c51b89308ea3a38f6ded8eda0779a08b
 DIST python-gentoo-patches-2.7.17-r1.tar.xz 14708 BLAKE2B f6e25236a471649de122d0f29506f7a4f34044a568ead47a68980411d9722b761fe1f9d653d5edccb6978b65c8c1eecbef55f403b94f32b37c0ad68e061505a8 SHA512 ecdde5e38c6fe5e69691fb3a68c8f4f43da7857d4abaff763d3cf6ad864ba43c769c03b186b60f2736a1ffb1e3e4c9982715d1b8a99ff3f5740096153bb8a90f
+DIST python-gentoo-patches-2.7.18-r1.tar.xz 15500 BLAKE2B 7008b29827dbbd80d4ab8f010ccf9efced99c6b4b9109e4430c0ba269ce53529cb6fedd832502c8d2d3aa21938749cc3591c2545b21c0a59a6e60f8598e84ccc SHA512 e656ab07281fd932b92165674619bbf55ecf410d2937ae4ae771d490b4532540498cc731d30d19c1e8aafd1f64df8a406bbfbb46ea985b3dcd8edb89a0b7f20f
 EBUILD pypy-7.3.0.ebuild 5886 BLAKE2B 8ca542188afd20cdf3b44f3c4d2d12f62e4c9f936fd4c0b14fcc2afeb3bcff762da32ff9241593fb4de2a96173c9e39ae89e3f17aff78561eaa72191b62d221d SHA512 5d55ac2ef028570981dc3979bdf86950a939472e469f53f67ce8803f5cd07480ddff0f282686c18f16580087537db05659e26ce866707d5dfd2efe71b6c09e48
 EBUILD pypy-7.3.1-r2.ebuild 5672 BLAKE2B 4660915fbb37951e58b4dfc05b8c3f907a63fd5def51c0eb33508abbd168288b45b69f60b75ff39ba6a176a55aef4e7f5addca5e84b3a427b7877543e321c653 SHA512 7705c0690eed05a795e6d69d1ff0922eb800880705273a0976ed88bcddce30309614000fad4caee3fb39d54c107fe00f07caa411e2c73d2544e133d68f6974e4
+EBUILD pypy-7.3.2_rc1.ebuild 5576 BLAKE2B 64f73bf88ff816282ec55c0273848623bf240a2ab253a29b2aceffb2113fdcb150d4cf36c81c5249cc0dbaed7581fbd2c8822e735cd70cf79c12abc5df5e7aa9 SHA512 14dbcfabb599ac94e723e181a8dd3254f94dd3882c740735a41496525351c667b1955d7b85e35de60321a9bcd60bd691a037d4c47a786e313e0e3f6391ee3400
 MISC metadata.xml 317 BLAKE2B d7be288f31d09754073e991e0f753e673e47fe1698408d13ce01dd58aa458e9ff9894973b27a293e426c074fbafaf5ca784fdbae0c784c1a5bf5d51bad1abd21 SHA512 65d1795605d0120c94911b2c295d8da13e01f9ac6b0750a7d536be64bf5244e20e2bb7286b33e75346e0dea333dc8970c4dcf0e98842e28f5a202ee2ddbba294
diff --git a/dev-python/pypy/pypy-7.3.2_rc1.ebuild b/dev-python/pypy/pypy-7.3.2_rc1.ebuild
new file mode 100644
index 000000000000..1d0ad929c04b
--- /dev/null
+++ b/dev-python/pypy/pypy-7.3.2_rc1.ebuild
@@ -0,0 +1,173 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit pax-utils python-utils-r1
+
+MY_P=pypy2.7-v${PV/_/}
+# note: remember to update this to newest dev-lang/python:2.7 on bump
+PATCHSET="python-gentoo-patches-2.7.18-r1"
+
+DESCRIPTION="A fast, compliant alternative implementation of the Python language"
+HOMEPAGE="https://pypy.org/"
+SRC_URI="https://downloads.python.org/pypy/${MY_P}-src.tar.bz2
+	https://dev.gentoo.org/~mgorny/dist/python/${PATCHSET}.tar.xz"
+S="${WORKDIR}/${MY_P}-src"
+
+LICENSE="MIT"
+# pypy -c 'import sysconfig; print sysconfig.get_config_var("SOABI")'
+SLOT="0/73"
+KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="bzip2 gdbm +jit libressl ncurses sqlite tk"
+
+RDEPEND="
+	|| (
+		dev-python/pypy-exe:${PV}[bzip2?,ncurses?]
+		dev-python/pypy-exe-bin:${PV}
+	)
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
+	gdbm? ( sys-libs/gdbm:0= )
+	sqlite? ( dev-db/sqlite:3= )
+	tk? (
+		dev-lang/tk:0=
+		dev-tcltk/tix:0=
+	)
+	!<dev-python/pypy-bin-7.3.0:0"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	eapply "${FILESDIR}/7.3.1-gentoo-path.patch"
+	eapply "${FILESDIR}/1.9-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch"
+
+	sed -e "s^@EPREFIX@^${EPREFIX}^" \
+		-i lib-python/2.7/distutils/command/install.py || die
+
+	# apply CPython stdlib patches
+	pushd lib-python/2.7 > /dev/null || die
+	# TODO: cpy turkish locale patch now fixes C code
+	# probably needs better port to pypy, if it is broken there
+	eapply "${FILESDIR}"/5.8.0_all_distutils_cxx.patch
+	eapply -p2 "${WORKDIR}/${PATCHSET}"/0010-use_pyxml.patch
+	eapply -p2 "${WORKDIR}/${PATCHSET}"/0017-bpo-39017-Avoid-infinite-loop-in-the-tarfile-module-.patch
+	popd > /dev/null || die
+
+	# this test relies on pypy-c hardcoding correct build time paths
+	sed -i -e 's:test_executable_without_cwd:_&:' \
+		lib-python/2.7/test/test_subprocess.py || die
+	# requires Internet
+	sed -i -e '/class NetworkedTests/i@unittest.skip("Requires networking")' \
+		lib-python/2.7/test/test_ssl.py || die
+
+	eapply_user
+}
+
+src_compile() {
+	# copy over to make sys.prefix happy
+	cp -p "${BROOT}"/usr/lib/pypy2.7/pypy-c-${PV} pypy-c || die
+	cp -p "${BROOT}"/usr/lib/pypy2.7/include/${PV}/* include/ || die
+	# (not installed by pypy)
+	rm pypy/module/cpyext/include/_numpypy/numpy/README || die
+	mv pypy/module/cpyext/include/* include/ || die
+	mv pypy/module/cpyext/parse/*.h include/ || die
+	pax-mark m pypy-c
+
+	einfo "Generating caches and CFFI modules ..."
+
+	# Generate Grammar and PatternGrammar pickles.
+	./pypy-c -c "import lib2to3.pygram, lib2to3.patcomp; lib2to3.patcomp.PatternCompiler()" \
+		|| die "Generation of Grammar and PatternGrammar pickles failed"
+
+	# Generate cffi modules
+	# Please keep in sync with pypy/tool/build_cffi_imports.py!
+#cffi_build_scripts = {
+#    "_ssl": "_ssl_build.py",
+#    "sqlite3": "_sqlite3_build.py",
+#    "audioop": "_audioop_build.py",
+#    "tk": "_tkinter/tklib_build.py",
+#    "curses": "_curses_build.py" if sys.platform != "win32" else None,
+#    "syslog": "_syslog_build.py" if sys.platform != "win32" else None,
+#    "gdbm": "_gdbm_build.py"  if sys.platform != "win32" else None,
+#    "pwdgrp": "_pwdgrp_build.py" if sys.platform != "win32" else None,
+#    "resource": "_resource_build.py" if sys.platform != "win32" else None,
+	cffi_targets=( ssl audioop syslog pwdgrp resource )
+	use gdbm && cffi_targets+=( gdbm )
+	use ncurses && cffi_targets+=( curses )
+	use sqlite && cffi_targets+=( sqlite3 )
+	use tk && cffi_targets+=( tkinter/tklib )
+
+	local t
+	# all modules except tkinter output to .
+	# tkinter outputs to the correct dir ...
+	cd lib_pypy || die
+	for t in "${cffi_targets[@]}"; do
+		# tkinter doesn't work via -m
+		../pypy-c "_${t}_build.py" || die "Failed to build CFFI bindings for ${t}"
+	done
+
+	# Cleanup temporary objects
+	find -name "_cffi_*.[co]" -delete || die
+	find -type d -empty -delete || die
+}
+
+src_test() {
+	# (unset)
+	local -x PYTHONDONTWRITEBYTECODE=
+
+	local ignored_tests=(
+		# network
+		--ignore=lib-python/2.7/test/test_urllibnet.py
+		--ignore=lib-python/2.7/test/test_urllib2net.py
+		# lots of free space
+		--ignore=lib-python/2.7/test/test_zipfile64.py
+		# no module named 'worker' -- a lot
+		--ignore=lib-python/2.7/test/test_xpickle.py
+	)
+
+	./pypy-c ./pypy/test_all.py --pypy=./pypy-c -vv \
+		"${ignored_tests[@]}" lib-python || die
+}
+
+src_install() {
+	local dest=/usr/lib/pypy2.7
+	einfo "Installing PyPy ..."
+	dosym pypy-c-${PV} "${dest}/pypy-c"
+	insinto "${dest}"
+	# preserve mtimes to avoid obsoleting caches
+	insopts -p
+	doins -r include lib_pypy lib-python
+
+	# replace copied headers with symlinks
+	for x in "${BROOT}"/usr/lib/pypy2.7/include/${PV}/*; do
+		dosym "${PV}/${x##*/}" "${dest}/include/${x##*/}"
+	done
+
+	dosym ../lib/pypy2.7/pypy-c /usr/bin/pypy
+	dodoc README.rst
+
+	if ! use gdbm; then
+		rm -r "${ED}${dest}"/lib_pypy/gdbm.py \
+			"${ED}${dest}"/lib-python/*2.7/test/test_gdbm.py || die
+	fi
+	if ! use sqlite; then
+		rm -r "${ED}${dest}"/lib-python/*2.7/sqlite3 \
+			"${ED}${dest}"/lib_pypy/_sqlite3.py \
+			"${ED}${dest}"/lib-python/*2.7/test/test_sqlite.py || die
+	fi
+	if ! use tk; then
+		rm -r "${ED}${dest}"/lib-python/*2.7/{idlelib,lib-tk} \
+			"${ED}${dest}"/lib_pypy/_tkinter \
+			"${ED}${dest}"/lib-python/*2.7/test/test_{tcl,tk,ttk*}.py || die
+	fi
+
+	local -x EPYTHON=pypy
+	local -x PYTHON=${ED}${dest}/pypy-c
+
+	echo "EPYTHON='${EPYTHON}'" > epython.py || die
+	python_moduleinto /usr/lib/pypy2.7/site-packages
+	python_domodule epython.py
+
+	einfo "Byte-compiling Python standard library..."
+	python_optimize "${ED}${dest}"
+}
diff --git a/dev-python/pypy3-exe/Manifest b/dev-python/pypy3-exe/Manifest
index 77b5677018ac..47751ec85aca 100644
--- a/dev-python/pypy3-exe/Manifest
+++ b/dev-python/pypy3-exe/Manifest
@@ -1,6 +1,10 @@
 AUX pypy3-exe-7.3.0-gcc10-fno-common.patch 1083 BLAKE2B c0601013dd4eb62df0eaef45b64d91d3a9b5d055b69fe754cef8157e1a0f03d28184d09d00137d170ddcf4aa7d3ece20071586d2fe998fd13150dd2c8eaa3159 SHA512 a4c797c31b2a7ead67c4c0b3e39bd3ab51ddf1554e33526057447d9d2eefc57425a536ba84aac060082f5eb24d6c6de40f82b5bee53ba4b12f5985cf27fe1814
 DIST pypy3.6-v7.3.0-src.tar.bz2 21937786 BLAKE2B c53ac32a9cca1c4624160eae9f11b5705a59613f1e5100fbb0ee86118de5a7845b8fa5087165d7f5a077d20337dfca14a1c7eadbe768995e20e249ec271ac10d SHA512 313a4254262dd8d8b995a50bddbc360cfb67add0818e51a3e9ce25bda6a9b639e9fea8efe7da6adda76dff0a86a364544a13faa516e51b9ea6c25ec99223b435
 DIST pypy3.6-v7.3.1-src.tar.bz2 22712809 BLAKE2B 4250b3fe98c611b9635319c106b80e88ab469eab5f883babb738e175e7b7adc22c85f8ef3fdce1cdc127b521beef8d6c7862e188d8c8889c39f90136d6bbe374 SHA512 f8e32aae7f01225e0e4d6763eaac40fc02dffc3d0b6a30f22d422147f9be4f3290ea78160a912ffae311dea3d503eb31a7a4f3999d3b541fbccd93d1cef4ca56
+DIST pypy3.6-v7.3.2rc1-src.tar.bz2 22730858 BLAKE2B 41a0702d0077c0f546998b858bc8b76226fe8903f4819497aa284231edcb32bc8b047b0a2a35bacfb18ea11fb85de98b95998276c22a3f0dc716b16871b35a3a SHA512 1a6f93f7e767b0db5c40c1e06cadd781c6ddfb02ec86aa61a37f649fe1aa5cd71f7857052e5b48092e3bf8b5cbef6d6401097bf4c4e80c62f7dbdffcd20b70c0
+DIST pypy3.7-v7.3.2rc1-src.tar.bz2 24805791 BLAKE2B 7b16ba9f0b33d572facdf009701712fe1b2c1eb5a4187c3a9197973ef4da140c7704b3409c7c336e1027f89df340fcefc9e52c6ccac75b251aa79d67c98e49c4 SHA512 d2a5c02a541c0ae79cf8c8e1a38299351f9dd81d1a17724d9fe346d8eb4311e2566a319cf1b8a90d393bffdc11657f6fa2f6475441634e57701b00e74899baa0
 EBUILD pypy3-exe-7.3.0.ebuild 3555 BLAKE2B 5d87f3ad1c2a2b796b404c7ca210ebc97faf75e6f4f4dd691c06702e80a7c7d0b77bab7ee6ebfbb75cdf30b71aa91085bb416a2da0e80ca4481e83438ea18721 SHA512 f38f5ccb7d7512bb28184f7ba67b1ba031c06b640a65039685278fe40a794132c97817ca7dd799dd161d27eae1898abc62af8a2c44fd27ae6372153675546136
 EBUILD pypy3-exe-7.3.1.ebuild 3458 BLAKE2B 70d5be9e72cdd482d6f2107143cd79ddc024d50ef242b7fdf467d91c9a2d3c1130510750c54bfa869220fb248aba7fb46c9ce7b50dd0cbc69d55c23c98a3b60a SHA512 2b986efb595c46e284e96cfba530fdb7f16a6d931f015b98ab1254ecb142064ca562e9cfa797d6b28dd942b74640ba5d7436afbc360c42582f45d1e105a2c7e3
+EBUILD pypy3-exe-7.3.2_rc1-r100.ebuild 3465 BLAKE2B cc766f540da927ac792485f8f9ff91e4be6032b9b1348bcfc84a578f21ed160a345e7f8e9e8927e5f021b8ba4e5925a1b55b2bf63330fb2b3f6cc58bf03b9379 SHA512 804c634a5b80fd89cf6c6ce12ce3c889428a0bd60135a807b61f67818097247e814e665f0f5e082f5b00252ddd78a2a7ff803d9ec969cb0ce64bb2acec280828
+EBUILD pypy3-exe-7.3.2_rc1.ebuild 3460 BLAKE2B ee6b32591968dd52639dc1b629b40d2501c892a9f96dea1982d1096bae4ea01ac90ee676bb7ca3f36617da677ce8de7692f83ed192b9f0ece463a76dacfe8d37 SHA512 e04629e3d99ff807e09a1d1dda16f1eee722a6a7bcc85c238b026b39df3319bc5f988258a029d52ff57e4e1c67218daca3580c90dc40152079c67012b4917436
 MISC metadata.xml 574 BLAKE2B 780347fb0394d2ed8955c96b0a60c66abf4d5835a584dc666ee20d2eb45d6fe4f54800d6bdbedbcd986165c12d89ad5cb730c24c4d85dd67f2d4d85a925a45dc SHA512 32b48188c88a38a5f107a891519ca7749e3c0566f8f0b4a148e14fa31f762c90814d85199efbeae651d8191558b12a13920e899e5a8e2e07b5fdaaca9c4388b2
diff --git a/dev-python/pypy3-exe/pypy3-exe-7.3.2_rc1-r100.ebuild b/dev-python/pypy3-exe/pypy3-exe-7.3.2_rc1-r100.ebuild
new file mode 100644
index 000000000000..df9d87c92395
--- /dev/null
+++ b/dev-python/pypy3-exe/pypy3-exe-7.3.2_rc1-r100.ebuild
@@ -0,0 +1,151 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# pypy3 needs to be built using python 2
+PYTHON_COMPAT=( python2_7 )
+inherit check-reqs pax-utils python-any-r1 toolchain-funcs
+
+MY_P=pypy3.7-v${PV/_/}
+DESCRIPTION="PyPy3 executable (build from source)"
+HOMEPAGE="https://pypy.org/"
+SRC_URI="https://downloads.python.org/pypy/${MY_P}-src.tar.bz2"
+S="${WORKDIR}/${MY_P}-src"
+
+LICENSE="MIT"
+SLOT="${PV}-py37"
+KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="bzip2 +jit low-memory ncurses cpu_flags_x86_sse2"
+
+RDEPEND=">=sys-libs/zlib-1.1.3:0=
+	dev-libs/libffi:0=
+	virtual/libintl:0=
+	dev-libs/expat:0=
+	bzip2? ( app-arch/bzip2:0= )
+	ncurses? ( sys-libs/ncurses:0= )
+	!dev-python/pypy3-exe-bin:${PV}"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	low-memory? ( dev-python/pypy )
+	!low-memory? (
+		|| (
+			dev-python/pypy
+			(
+				dev-lang/python:2.7
+				dev-python/pycparser[python_targets_python2_7(-),python_single_target_python2_7(+)]
+			)
+		)
+	)"
+
+check_env() {
+	if use low-memory; then
+		CHECKREQS_MEMORY="1750M"
+		use amd64 && CHECKREQS_MEMORY="3500M"
+	else
+		CHECKREQS_MEMORY="3G"
+		use amd64 && CHECKREQS_MEMORY="6G"
+	fi
+
+	check-reqs_pkg_pretend
+}
+
+pkg_pretend() {
+	[[ ${MERGE_TYPE} != binary ]] && check_env
+}
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		check_env
+
+		# unset to allow forcing pypy below :)
+		use low-memory && EPYTHON=
+		if [[ ! ${EPYTHON} || ${EPYTHON} == pypy ]] &&
+				{ has_version -b dev-python/pypy ||
+				has_version -b dev-python/pypy-bin; }
+		then
+			einfo "Using PyPy to perform the translation."
+			EPYTHON=pypy
+		else
+			einfo "Using ${EPYTHON:-python2} to perform the translation. Please note that upstream"
+			einfo "recommends using PyPy for that. If you wish to do so, please install"
+			einfo "dev-python/pypy and ensure that EPYTHON variable is unset."
+			python-any-r1_pkg_setup
+		fi
+	fi
+}
+
+src_configure() {
+	tc-export CC
+
+	local jit_backend
+	if use jit; then
+		jit_backend='--jit-backend='
+
+		# We only need the explicit sse2 switch for x86.
+		# On other arches we can rely on autodetection which uses
+		# compiler macros. Plus, --jit-backend= doesn't accept all
+		# the modern values...
+
+		if use x86; then
+			if use cpu_flags_x86_sse2; then
+				jit_backend+=x86
+			else
+				jit_backend+=x86-without-sse2
+			fi
+		else
+			jit_backend+=auto
+		fi
+	fi
+
+	local args=(
+		--no-shared
+		$(usex jit -Ojit -O2)
+
+		${jit_backend}
+
+		pypy/goal/targetpypystandalone
+	)
+
+	# Avoid linking against libraries disabled by use flags
+	local opts=(
+		bzip2:bz2
+		ncurses:_minimal_curses
+	)
+
+	local opt
+	for opt in "${opts[@]}"; do
+		local flag=${opt%:*}
+		local mod=${opt#*:}
+
+		args+=(
+			$(usex ${flag} --withmod --withoutmod)-${mod}
+		)
+	done
+
+	local interp=( "${EPYTHON}" )
+	if use low-memory; then
+		interp=( env PYPY_GC_MAX_DELTA=200MB
+			"${EPYTHON}" --jit loop_longevity=300 )
+	fi
+
+	# translate into the C sources
+	# we're going to make them ourselves since otherwise pypy does not
+	# free up the unneeded memory before spawning the compiler
+	set -- "${interp[@]}" rpython/bin/rpython --batch --source "${args[@]}"
+	echo -e "\033[1m${@}\033[0m"
+	"${@}" || die "translation failed"
+}
+
+src_compile() {
+	emake -C "${T}"/usession*-0/testing_1
+}
+
+src_install() {
+	local dest=/usr/lib/pypy3.7
+	exeinto "${dest}"
+	newexe "${T}"/usession*-0/testing_1/pypy3-c pypy3-c-${PV}
+	insinto "${dest}"/include/${PV}
+	doins include/pypy_*
+	pax-mark m "${ED}${dest}/pypy3-c-${PV}"
+}
diff --git a/dev-python/pypy3-exe/pypy3-exe-7.3.2_rc1.ebuild b/dev-python/pypy3-exe/pypy3-exe-7.3.2_rc1.ebuild
new file mode 100644
index 000000000000..24b904343e13
--- /dev/null
+++ b/dev-python/pypy3-exe/pypy3-exe-7.3.2_rc1.ebuild
@@ -0,0 +1,151 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# pypy3 needs to be built using python 2
+PYTHON_COMPAT=( python2_7 )
+inherit check-reqs pax-utils python-any-r1 toolchain-funcs
+
+MY_P=pypy3.6-v${PV/_/}
+DESCRIPTION="PyPy3 executable (build from source)"
+HOMEPAGE="https://pypy.org/"
+SRC_URI="https://downloads.python.org/pypy/${MY_P}-src.tar.bz2"
+S="${WORKDIR}/${MY_P}-src"
+
+LICENSE="MIT"
+SLOT="${PV}"
+KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="bzip2 +jit low-memory ncurses cpu_flags_x86_sse2"
+
+RDEPEND=">=sys-libs/zlib-1.1.3:0=
+	dev-libs/libffi:0=
+	virtual/libintl:0=
+	dev-libs/expat:0=
+	bzip2? ( app-arch/bzip2:0= )
+	ncurses? ( sys-libs/ncurses:0= )
+	!dev-python/pypy3-exe-bin:${PV}"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	low-memory? ( dev-python/pypy )
+	!low-memory? (
+		|| (
+			dev-python/pypy
+			(
+				dev-lang/python:2.7
+				dev-python/pycparser[python_targets_python2_7(-),python_single_target_python2_7(+)]
+			)
+		)
+	)"
+
+check_env() {
+	if use low-memory; then
+		CHECKREQS_MEMORY="1750M"
+		use amd64 && CHECKREQS_MEMORY="3500M"
+	else
+		CHECKREQS_MEMORY="3G"
+		use amd64 && CHECKREQS_MEMORY="6G"
+	fi
+
+	check-reqs_pkg_pretend
+}
+
+pkg_pretend() {
+	[[ ${MERGE_TYPE} != binary ]] && check_env
+}
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		check_env
+
+		# unset to allow forcing pypy below :)
+		use low-memory && EPYTHON=
+		if [[ ! ${EPYTHON} || ${EPYTHON} == pypy ]] &&
+				{ has_version -b dev-python/pypy ||
+				has_version -b dev-python/pypy-bin; }
+		then
+			einfo "Using PyPy to perform the translation."
+			EPYTHON=pypy
+		else
+			einfo "Using ${EPYTHON:-python2} to perform the translation. Please note that upstream"
+			einfo "recommends using PyPy for that. If you wish to do so, please install"
+			einfo "dev-python/pypy and ensure that EPYTHON variable is unset."
+			python-any-r1_pkg_setup
+		fi
+	fi
+}
+
+src_configure() {
+	tc-export CC
+
+	local jit_backend
+	if use jit; then
+		jit_backend='--jit-backend='
+
+		# We only need the explicit sse2 switch for x86.
+		# On other arches we can rely on autodetection which uses
+		# compiler macros. Plus, --jit-backend= doesn't accept all
+		# the modern values...
+
+		if use x86; then
+			if use cpu_flags_x86_sse2; then
+				jit_backend+=x86
+			else
+				jit_backend+=x86-without-sse2
+			fi
+		else
+			jit_backend+=auto
+		fi
+	fi
+
+	local args=(
+		--no-shared
+		$(usex jit -Ojit -O2)
+
+		${jit_backend}
+
+		pypy/goal/targetpypystandalone
+	)
+
+	# Avoid linking against libraries disabled by use flags
+	local opts=(
+		bzip2:bz2
+		ncurses:_minimal_curses
+	)
+
+	local opt
+	for opt in "${opts[@]}"; do
+		local flag=${opt%:*}
+		local mod=${opt#*:}
+
+		args+=(
+			$(usex ${flag} --withmod --withoutmod)-${mod}
+		)
+	done
+
+	local interp=( "${EPYTHON}" )
+	if use low-memory; then
+		interp=( env PYPY_GC_MAX_DELTA=200MB
+			"${EPYTHON}" --jit loop_longevity=300 )
+	fi
+
+	# translate into the C sources
+	# we're going to make them ourselves since otherwise pypy does not
+	# free up the unneeded memory before spawning the compiler
+	set -- "${interp[@]}" rpython/bin/rpython --batch --source "${args[@]}"
+	echo -e "\033[1m${@}\033[0m"
+	"${@}" || die "translation failed"
+}
+
+src_compile() {
+	emake -C "${T}"/usession*-0/testing_1
+}
+
+src_install() {
+	local dest=/usr/lib/pypy3.6
+	exeinto "${dest}"
+	newexe "${T}"/usession*-0/testing_1/pypy3-c pypy3-c-${PV}
+	insinto "${dest}"/include/${PV}
+	doins include/pypy_*
+	pax-mark m "${ED}${dest}/pypy3-c-${PV}"
+}
diff --git a/dev-python/pypy3/Manifest b/dev-python/pypy3/Manifest
index de881b2e310d..23a0b519e5bd 100644
--- a/dev-python/pypy3/Manifest
+++ b/dev-python/pypy3/Manifest
@@ -2,9 +2,14 @@ AUX 1.9-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch 5
 AUX 7.0.0-gentoo-path.patch 1880 BLAKE2B ff89983185c9249a91e32bf69903e139d75efeadcda3c1b4b11e3cc23091956bb08ebf9c9dea548cd5c895ef093455fd69b7273027bc9916658effae955c0490 SHA512 a332c6f8454186f774fd4a0b7f8b940facddb894a17df405d144b2707ece4393bd11695df5ad3bf1e274e59d9cd3bf81c02c4c55226480f0890e5d7318545e0a
 AUX 7.2.0-distutils-cxx.patch 14432 BLAKE2B 7c2f5a22457781c4b7d21954a3ffe7b1dfb55f12f890205cfe294316be86e7b206c4ce732f15fbf021c0fc87ed05a20aa57918cda869226efadb01e5fb2823a7 SHA512 7ccb64419d4ad90d03958bf6ddbb700a253fec75bceca7f9355f5f8496e1aba9ac72b09d0616600ebf8169d5ec705d6b058556905b032db8fb5abd23cf9b30e8
 AUX 7.3.1-gentoo-path.patch 1565 BLAKE2B 3c444b8112fd40de747fae75cc6d6f5ff8d2ecdafc17c76dde4d23169ecbde86ec6ca3e5a9646a719ea91ada57b8a7bf151ee3d63420730aae0a6003136551f7 SHA512 ce8258ac5c87b9c978ce780120c31848306a652d9b87ece90ba17ebbaee545806fc62e6f63538fc0cdf557c6b98eec8c0978fe4fbe3b24ea8e2ab9617c99b1ef
+AUX 7.3.2-py37-distutils-cxx.patch 14756 BLAKE2B 3524f2fbeef2b23a17c2248fbe07e0b194f2d6cc8be9c4ffec9c7a745421577d0c246a82c61afbd4af116f6ec756ce11988093e3e0a74337868530382206dd7d SHA512 e590266f1f6f5571b0056fbbf38c54bd7f07bebcdc009dbfaa3203aaeb3f70eac0f9b281df3ec04771960dea930b30ae861bb1dbc886fa28dfb8c58e484f6a8d
 AUX python-3.5-distutils-OO-build.patch 3627 BLAKE2B fe4fd23515f0d1cfc236ac3e773b6a70a9b0fbbaff4719c1f1621e21433cfdb1f53b6bf5f348069d7bf03d26bd039f793e4ef2ac4f6271062d83c088ccbab56d SHA512 5e8e4ab7d326386a244df9d0fca5b54e16b5943e35d12ecaf9ea986e79d2d8d8e85585f6286e0fc440dbb7a8c17e2bcf7a11498ff9cc5f523e97d8b353d9a511
 DIST pypy3.6-v7.3.0-src.tar.bz2 21937786 BLAKE2B c53ac32a9cca1c4624160eae9f11b5705a59613f1e5100fbb0ee86118de5a7845b8fa5087165d7f5a077d20337dfca14a1c7eadbe768995e20e249ec271ac10d SHA512 313a4254262dd8d8b995a50bddbc360cfb67add0818e51a3e9ce25bda6a9b639e9fea8efe7da6adda76dff0a86a364544a13faa516e51b9ea6c25ec99223b435
 DIST pypy3.6-v7.3.1-src.tar.bz2 22712809 BLAKE2B 4250b3fe98c611b9635319c106b80e88ab469eab5f883babb738e175e7b7adc22c85f8ef3fdce1cdc127b521beef8d6c7862e188d8c8889c39f90136d6bbe374 SHA512 f8e32aae7f01225e0e4d6763eaac40fc02dffc3d0b6a30f22d422147f9be4f3290ea78160a912ffae311dea3d503eb31a7a4f3999d3b541fbccd93d1cef4ca56
+DIST pypy3.6-v7.3.2rc1-src.tar.bz2 22730858 BLAKE2B 41a0702d0077c0f546998b858bc8b76226fe8903f4819497aa284231edcb32bc8b047b0a2a35bacfb18ea11fb85de98b95998276c22a3f0dc716b16871b35a3a SHA512 1a6f93f7e767b0db5c40c1e06cadd781c6ddfb02ec86aa61a37f649fe1aa5cd71f7857052e5b48092e3bf8b5cbef6d6401097bf4c4e80c62f7dbdffcd20b70c0
+DIST pypy3.7-v7.3.2rc1-src.tar.bz2 24805791 BLAKE2B 7b16ba9f0b33d572facdf009701712fe1b2c1eb5a4187c3a9197973ef4da140c7704b3409c7c336e1027f89df340fcefc9e52c6ccac75b251aa79d67c98e49c4 SHA512 d2a5c02a541c0ae79cf8c8e1a38299351f9dd81d1a17724d9fe346d8eb4311e2566a319cf1b8a90d393bffdc11657f6fa2f6475441634e57701b00e74899baa0
 EBUILD pypy3-7.3.0.ebuild 7350 BLAKE2B e025f75151c4e084575f6d52f2b3a4cbb8e5619db81ff5b962e6c431f3dac1a9fe76b875f7da00c08715c171bed054f03c9c92737a20dc14eb9050116cb0a836 SHA512 5aaae803d0b9a166bf4f95ef5adff413e1b7671731af0d003895b2d9ccceb7580e73e5f6603b38fc4194326c984a314b4d99351436ff50a2766f66dc520e05d7
 EBUILD pypy3-7.3.1-r2.ebuild 6871 BLAKE2B 0ae1116b88d0c4b15df7e6e0450e820f870d9050c311b2ca4f73a6304dbb2dd79672c427d11f061c5576952b221b33b0a1e7da6a0ac7080e8668bfdc33129e78 SHA512 c34f6ac05f31697a373d20eae53b54593b6c1c60376be67367972b6f30101661775a05e20836f09b0e84fd4f67341eda2a929150bfea32c8fd2972c5e4086810
+EBUILD pypy3-7.3.2_rc1-r100.ebuild 12752 BLAKE2B 2c0dc9988404d8e3e00e7679537306872b119806bda3f0c813156d4a23c1a24eebb38cb3de45251626d2c15f6bae73c1edaaaf7e404d35e45b42f2843c5cad8a SHA512 429232677a75347d9467d0452e57cf8a9f1ded80c0bfc81ccb2558d8a7980b468de14a0b48672cff63002ffc8c1455c4d52c7ed80948a9a93ca9ca3c036d3a05
+EBUILD pypy3-7.3.2_rc1.ebuild 6410 BLAKE2B b168bcff6f551c98897effa8310698548463011d01835f5ad04cd340219a3a86212c1d2d0078989b43c2a85885fb80247a54949ff8c8be3a075c711c98ffc0f2 SHA512 865e8e2d64334839fa52b71590b19d89209420654300bf19e0495fc70246c8159a87ff2f258adba54cfd891ba5908030e91da719ac7580f25fbd237645ab468d
 MISC metadata.xml 317 BLAKE2B d7be288f31d09754073e991e0f753e673e47fe1698408d13ce01dd58aa458e9ff9894973b27a293e426c074fbafaf5ca784fdbae0c784c1a5bf5d51bad1abd21 SHA512 65d1795605d0120c94911b2c295d8da13e01f9ac6b0750a7d536be64bf5244e20e2bb7286b33e75346e0dea333dc8970c4dcf0e98842e28f5a202ee2ddbba294
diff --git a/dev-python/pypy3/files/7.3.2-py37-distutils-cxx.patch b/dev-python/pypy3/files/7.3.2-py37-distutils-cxx.patch
new file mode 100644
index 000000000000..d126edacc6b9
--- /dev/null
+++ b/dev-python/pypy3/files/7.3.2-py37-distutils-cxx.patch
@@ -0,0 +1,314 @@
+diff --git a/lib-python/3/distutils/cygwinccompiler.py b/lib-python/3/distutils/cygwinccompiler.py
+index 6c5d777..640fa2d 100644
+--- a/lib-python/3/distutils/cygwinccompiler.py
++++ b/lib-python/3/distutils/cygwinccompiler.py
+@@ -125,8 +125,10 @@ class CygwinCCompiler(UnixCCompiler):
+         # dllwrap 2.10.90 is buggy
+         if self.ld_version >= "2.10.90":
+             self.linker_dll = "gcc"
++            self.linker_dll_cxx = "g++"
+         else:
+             self.linker_dll = "dllwrap"
++            self.linker_dll_cxx = "dllwrap"
+ 
+         # ld_version >= "2.13" support -shared so use it instead of
+         # -mdll -static
+@@ -140,9 +142,13 @@ class CygwinCCompiler(UnixCCompiler):
+         self.set_executables(compiler='gcc -mcygwin -O -Wall',
+                              compiler_so='gcc -mcygwin -mdll -O -Wall',
+                              compiler_cxx='g++ -mcygwin -O -Wall',
++                             compiler_so_cxx='g++ -mcygwin -mdll -O -Wall',
+                              linker_exe='gcc -mcygwin',
+                              linker_so=('%s -mcygwin %s' %
+-                                        (self.linker_dll, shared_option)))
++                                        (self.linker_dll, shared_option)),
++                             linker_exe_cxx='g++ -mcygwin',
++                             linker_so_cxx=('%s -mcygwin %s' %
++                                            (self.linker_dll_cxx, shared_option)))
+ 
+         # cygwin and mingw32 need different sets of libraries
+         if self.gcc_version == "2.91.57":
+@@ -166,8 +172,12 @@ class CygwinCCompiler(UnixCCompiler):
+                 raise CompileError(msg)
+         else: # for other files use the C-compiler
+             try:
+-                self.spawn(self.compiler_so + cc_args + [src, '-o', obj] +
+-                           extra_postargs)
++                if self.detect_language(src) == 'c++':
++                    self.spawn(self.compiler_so_cxx + cc_args + [src, '-o', obj] +
++                               extra_postargs)
++                else:
++                    self.spawn(self.compiler_so + cc_args + [src, '-o', obj] +
++                               extra_postargs)
+             except DistutilsExecError as msg:
+                 raise CompileError(msg)
+ 
+@@ -302,9 +312,14 @@ class Mingw32CCompiler(CygwinCCompiler):
+         self.set_executables(compiler='gcc -O -Wall',
+                              compiler_so='gcc -mdll -O -Wall',
+                              compiler_cxx='g++ -O -Wall',
++                             compiler_so_cxx='g++ -mdll -O -Wall',
+                              linker_exe='gcc',
+                              linker_so='%s %s %s'
+                                         % (self.linker_dll, shared_option,
++                                           entry_point),
++                             linker_exe_cxx='g++',
++                             linker_so_cxx='%s %s %s'
++                                        % (self.linker_dll_cxx, shared_option,
+                                            entry_point))
+         # Maybe we should also append -mthreads, but then the finished
+         # dlls need another dll (mingwm10.dll see Mingw32 docs)
+diff --git a/lib-python/3/distutils/sysconfig_cpython.py b/lib-python/3/distutils/sysconfig_cpython.py
+index 484721f..0088dd4 100644
+--- a/lib-python/3/distutils/sysconfig_cpython.py
++++ b/lib-python/3/distutils/sysconfig_cpython.py
+@@ -188,9 +188,13 @@ def customize_compiler(compiler):
+                 _osx_support.customize_compiler(_config_vars)
+                 _config_vars['CUSTOMIZED_OSX_COMPILER'] = 'True'
+ 
+-        (cc, cxx, cflags, ccshared, ldshared, shlib_suffix, ar, ar_flags) = \
+-            get_config_vars('CC', 'CXX', 'CFLAGS',
+-                            'CCSHARED', 'LDSHARED', 'SHLIB_SUFFIX', 'AR', 'ARFLAGS')
++        (cc, cxx, ccshared, ldshared, ldcxxshared, shlib_suffix, ar, ar_flags) = \
++            get_config_vars('CC', 'CXX',
++                            'CCSHARED', 'LDSHARED', 'LDCXXSHARED',
++                            'SHLIB_SUFFIX', 'AR', 'ARFLAGS')
++
++        cflags = ''
++        cxxflags = ''
+ 
+         if 'CC' in os.environ:
+             newcc = os.environ['CC']
+@@ -205,19 +209,27 @@ def customize_compiler(compiler):
+             cxx = os.environ['CXX']
+         if 'LDSHARED' in os.environ:
+             ldshared = os.environ['LDSHARED']
++        if 'LDCXXSHARED' in os.environ:
++            ldcxxshared = os.environ['LDCXXSHARED']
+         if 'CPP' in os.environ:
+             cpp = os.environ['CPP']
+         else:
+             cpp = cc + " -E"           # not always
+         if 'LDFLAGS' in os.environ:
+             ldshared = ldshared + ' ' + os.environ['LDFLAGS']
++            ldcxxshared = ldcxxshared + ' ' + os.environ['LDFLAGS']
+         if 'CFLAGS' in os.environ:
+-            cflags = cflags + ' ' + os.environ['CFLAGS']
++            cflags = os.environ['CFLAGS']
+             ldshared = ldshared + ' ' + os.environ['CFLAGS']
++        if 'CXXFLAGS' in os.environ:
++            cxxflags = os.environ['CXXFLAGS']
++            ldcxxshared = ldcxxshared + ' ' + os.environ['CXXFLAGS']
+         if 'CPPFLAGS' in os.environ:
+             cpp = cpp + ' ' + os.environ['CPPFLAGS']
+             cflags = cflags + ' ' + os.environ['CPPFLAGS']
++            cxxflags = cxxflags + ' ' + os.environ['CPPFLAGS']
+             ldshared = ldshared + ' ' + os.environ['CPPFLAGS']
++            ldcxxshared = ldcxxshared + ' ' + os.environ['CPPFLAGS']
+         if 'AR' in os.environ:
+             ar = os.environ['AR']
+         if 'ARFLAGS' in os.environ:
+@@ -226,13 +238,17 @@ def customize_compiler(compiler):
+             archiver = ar + ' ' + ar_flags
+ 
+         cc_cmd = cc + ' ' + cflags
++        cxx_cmd = cxx + ' ' + cxxflags
+         compiler.set_executables(
+             preprocessor=cpp,
+             compiler=cc_cmd,
+             compiler_so=cc_cmd + ' ' + ccshared,
+-            compiler_cxx=cxx,
++            compiler_cxx=cxx_cmd,
++            compiler_so_cxx=cxx_cmd + ' ' + ccshared,
+             linker_so=ldshared,
+             linker_exe=cc,
++            linker_so_cxx=ldcxxshared,
++            linker_exe_cxx=cxx,
+             archiver=archiver)
+ 
+         compiler.shared_lib_extension = shlib_suffix
+diff --git a/lib-python/3/distutils/sysconfig_pypy.py b/lib-python/3/distutils/sysconfig_pypy.py
+index bf1748e..70dfd72 100644
+--- a/lib-python/3/distutils/sysconfig_pypy.py
++++ b/lib-python/3/distutils/sysconfig_pypy.py
+@@ -145,36 +145,52 @@ def customize_compiler(compiler):
+                 _osx_support.customize_compiler(_config_vars)
+                 _config_vars['CUSTOMIZED_OSX_COMPILER'] = 'True'
+ 
+-        (cc, cxx, opt, cflags, ccshared, ldshared, shlib_suffix, ar, ar_flags) = \
+-            get_config_vars('CC', 'CXX', 'OPT', 'CFLAGS',
+-                            'CCSHARED', 'LDSHARED', 'SHLIB_SUFFIX', 'AR', 'ARFLAGS')
++        (cc, cxx, ccshared, ldshared, ldcxxshared, shlib_suffix, ar, ar_flags) = \
++            get_config_vars('CC', 'CXX', 'CCSHARED', 'LDSHARED', 'LDCXXSHARED',
++                            'SHLIB_SUFFIX', 'AR', 'ARFLAGS')
++
++        cflags = ''
++        cxxflags = ''
+ 
+         if 'CC' in os.environ:
+             newcc = os.environ['CC']
+-            if (sys.platform == 'darwin'
++            if (True
+                     and 'LDSHARED' not in os.environ
+                     and ldshared.startswith(cc)):
+                 # On OS X, if CC is overridden, use that as the default
+                 #       command for LDSHARED as well
++                # Gentoo: s/OS X/every system/
+                 ldshared = newcc + ldshared[len(cc):]
+             cc = newcc
+         if 'CXX' in os.environ:
+-            cxx = os.environ['CXX']
++            newcxx = os.environ['CXX']
++            if ('LDCXXSHARED' not in os.environ
++                    and ldcxxshared.startswith(cxx)):
++                ldcxxshared = newcxx + ldcxxshared[len(cxx):]
++            cxx = newcxx
+         if 'LDSHARED' in os.environ:
+             ldshared = os.environ['LDSHARED']
++        if 'LDCXXSHARED' in os.environ:
++            ldcxxshared = os.environ['LDCXXSHARED']
+         if 'CPP' in os.environ:
+             cpp = os.environ['CPP']
+         else:
+             cpp = cc + " -E"           # not always
+         if 'LDFLAGS' in os.environ:
+             ldshared = ldshared + ' ' + os.environ['LDFLAGS']
++            ldcxxshared = ldcxxshared + ' ' + os.environ['LDFLAGS']
+         if 'CFLAGS' in os.environ:
+-            cflags = opt + ' ' + os.environ['CFLAGS']
++            cflags = os.environ['CFLAGS']
+             ldshared = ldshared + ' ' + os.environ['CFLAGS']
++        if 'CXXFLAGS' in os.environ:
++            cxxflags = os.environ['CXXFLAGS']
++            ldcxxshared = ldcxxshared + ' ' + os.environ['CXXFLAGS']
+         if 'CPPFLAGS' in os.environ:
+             cpp = cpp + ' ' + os.environ['CPPFLAGS']
+             cflags = cflags + ' ' + os.environ['CPPFLAGS']
++            cxxflags = cxxflags + ' ' + os.environ['CPPFLAGS']
+             ldshared = ldshared + ' ' + os.environ['CPPFLAGS']
++            ldcxxshared = ldcxxshared + ' ' + os.environ['CPPFLAGS']
+         if 'AR' in os.environ:
+             ar = os.environ['AR']
+         if 'ARFLAGS' in os.environ:
+@@ -183,13 +199,17 @@ def customize_compiler(compiler):
+             archiver = ar + ' ' + ar_flags
+ 
+         cc_cmd = cc + ' ' + cflags
++        cxx_cmd = cxx + ' ' + cxxflags
+         compiler.set_executables(
+             preprocessor=cpp,
+             compiler=cc_cmd,
+             compiler_so=cc_cmd + ' ' + ccshared,
+-            compiler_cxx=cxx,
++            compiler_cxx=cxx_cmd,
++            compiler_so_cxx=cxx_cmd + ' ' + ccshared,
+             linker_so=ldshared,
+             linker_exe=cc,
++            linker_so_cxx=ldcxxshared,
++            linker_exe_cxx=cxx,
+             archiver=archiver)
+ 
+         compiler.shared_lib_extension = shlib_suffix
+diff --git a/lib-python/3/distutils/unixccompiler.py b/lib-python/3/distutils/unixccompiler.py
+index 06fc718..c3773f0 100644
+--- a/lib-python/3/distutils/unixccompiler.py
++++ b/lib-python/3/distutils/unixccompiler.py
+@@ -52,14 +52,17 @@ class UnixCCompiler(CCompiler):
+     # are pretty generic; they will probably have to be set by an outsider
+     # (eg. using information discovered by the sysconfig about building
+     # Python extensions).
+-    executables = {'preprocessor' : None,
+-                   'compiler'     : ["cc"],
+-                   'compiler_so'  : ["cc"],
+-                   'compiler_cxx' : ["c++"],  # pypy: changed, 'cc' is bogus
+-                   'linker_so'    : ["cc", "-shared"],
+-                   'linker_exe'   : ["cc"],
+-                   'archiver'     : ["ar", "-cr"],
+-                   'ranlib'       : None,
++    executables = {'preprocessor'    : None,
++                   'compiler'        : ["cc"],
++                   'compiler_so'     : ["cc"],
++                   'compiler_cxx'    : ["c++"],
++                   'compiler_so_cxx' : ["c++"],
++                   'linker_so'       : ["cc", "-shared"],
++                   'linker_exe'      : ["cc"],
++                   'linker_so_cxx'   : ["c++", "-shared"],
++                   'linker_exe_cxx'  : ["c++"],
++                   'archiver'        : ["ar", "-cr"],
++                   'ranlib'          : None,
+                   }
+ 
+     if sys.platform[:6] == "darwin":
+@@ -125,12 +128,19 @@ class UnixCCompiler(CCompiler):
+ 
+     def _compile(self, obj, src, ext, cc_args, extra_postargs, pp_opts):
+         compiler_so = self.compiler_so
++        compiler_so_cxx = self.compiler_so_cxx
+         if sys.platform == 'darwin':
+             compiler_so = _osx_support.compiler_fixup(compiler_so,
+                                                     cc_args + extra_postargs)
++            compiler_so_cxx = _osx_support.compiler_fixup(compiler_so_cxx,
++                                                    cc_args + extra_postargs)
+         try:
+-            self.spawn(compiler_so + cc_args + [src, '-o', obj] +
+-                       extra_postargs)
++            if self.detect_language(src) == 'c++':
++                self.spawn(compiler_so_cxx + cc_args + [src, '-o', obj] +
++                           extra_postargs)
++            else:
++                self.spawn(compiler_so + cc_args + [src, '-o', obj] +
++                           extra_postargs)
+         except DistutilsExecError as msg:
+             raise CompileError(msg)
+ 
+@@ -188,30 +198,16 @@ class UnixCCompiler(CCompiler):
+                 ld_args.extend(extra_postargs)
+             self.mkpath(os.path.dirname(output_filename))
+             try:
+-                if target_desc == CCompiler.EXECUTABLE:
+-                    linker = self.linker_exe[:]
++                if target_lang == "c++":
++                    if target_desc == CCompiler.EXECUTABLE:
++                        linker = self.linker_exe_cxx[:]
++                    else:
++                        linker = self.linker_so_cxx[:]
+                 else:
+-                    linker = self.linker_so[:]
+-                if target_lang == "c++" and self.compiler_cxx:
+-                    # skip over environment variable settings if /usr/bin/env
+-                    # is used to set up the linker's environment.
+-                    # This is needed on OSX. Note: this assumes that the
+-                    # normal and C++ compiler have the same environment
+-                    # settings.
+-                    i = 0
+-                    if os.path.basename(linker[0]) == "env":
+-                        i = 1
+-                        while '=' in linker[i]:
+-                            i += 1
+-
+-                    if os.path.basename(linker[i]) == 'ld_so_aix':
+-                        # AIX platforms prefix the compiler with the ld_so_aix
+-                        # script, so we need to adjust our linker index
+-                        offset = 1
++                    if target_desc == CCompiler.EXECUTABLE:
++                        linker = self.linker_exe[:]
+                     else:
+-                        offset = 0
+-
+-                    linker[i+offset] = self.compiler_cxx[i]
++                        linker = self.linker_so[:]
+ 
+                 if sys.platform == 'darwin':
+                     linker = _osx_support.compiler_fixup(linker, ld_args)
+diff --git a/lib_pypy/_sysconfigdata.py b/lib_pypy/_sysconfigdata.py
+index f1cca41..3ec5b4c 100644
+--- a/lib_pypy/_sysconfigdata.py
++++ b/lib_pypy/_sysconfigdata.py
+@@ -20,6 +20,7 @@ build_time_vars = {
+     'CFLAGS': "-DNDEBUG -O2",
+     'CCSHARED': "-fPIC",
+     'LDSHARED': "cc -pthread -shared",
++    'LDCXXSHARED': "c++ -pthread -shared",
+     'EXT_SUFFIX': so_ext,
+     'SHLIB_SUFFIX': ".so",
+     'AR': "ar",
diff --git a/dev-python/pypy3/pypy3-7.3.2_rc1-r100.ebuild b/dev-python/pypy3/pypy3-7.3.2_rc1-r100.ebuild
new file mode 100644
index 000000000000..2ba33e2c40c3
--- /dev/null
+++ b/dev-python/pypy3/pypy3-7.3.2_rc1-r100.ebuild
@@ -0,0 +1,352 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 )
+inherit pax-utils python-any-r1 toolchain-funcs
+
+MY_P=pypy3.7-v${PV/_/}
+
+DESCRIPTION="A fast, compliant alternative implementation of the Python (3.7) language"
+HOMEPAGE="https://pypy.org/"
+SRC_URI="https://downloads.python.org/pypy/${MY_P}-src.tar.bz2"
+S="${WORKDIR}/${MY_P}-src"
+
+LICENSE="MIT"
+# pypy3 -c 'import sysconfig; print(sysconfig.get_config_var("SOABI"))'
+SLOT="0/pypy37-pp73"
+KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="bzip2 gdbm +jit libressl ncurses sqlite test tk"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	|| (
+		dev-python/pypy3-exe:${PV}-py37[bzip2?,ncurses?]
+		dev-python/pypy3-exe-bin:${PV}-py37
+	)
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
+	gdbm? ( sys-libs/gdbm:0= )
+	sqlite? ( dev-db/sqlite:3= )
+	tk? (
+		dev-lang/tk:0=
+		dev-tcltk/tix:0=
+	)
+	!<dev-python/pypy3-bin-7.3.0:0"
+DEPEND="${RDEPEND}
+	test? (
+		${PYTHON_DEPS}
+		!!dev-python/pytest-forked
+	)"
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	eapply "${FILESDIR}/7.3.1-gentoo-path.patch"
+	eapply "${FILESDIR}/1.9-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch"
+	eapply "${FILESDIR}/7.3.2-py37-distutils-cxx.patch"
+
+	sed -e "s^@EPREFIX@^${EPREFIX}^" \
+		-i lib-python/3/distutils/command/install.py || die
+
+	# apply CPython stdlib patches
+	pushd lib-python/3 > /dev/null || die
+	eapply "${FILESDIR}"/python-3.5-distutils-OO-build.patch
+	popd > /dev/null || die
+
+	# see http://buildbot.pypy.org/summary?branch=py3.7&builder=pypy-c-jit-linux-x86-64
+	sed -i -e 's:test_snippets(:_&:' \
+		lib-python/3/test/test_ast.py || die
+	sed -i -e 's:testConstructorErrorMessages(:_&:' \
+		lib-python/3/test/test_class.py || die
+	sed -i -e 's:test_pythonmalloc(:_&:' \
+		-e 's:test_sys_flags_set(:_&:' \
+		-e 's:test_unbuffered_output(:_&:' \
+		-e 's:test_xdev(:_&:' \
+		-e 's:test_ignore_PYTHONHASHSEED(:_&:' \
+		lib-python/3/test/test_cmd_line.py || die
+	sed -i -e 's:test_consistent_sys_path_for_module_execution(:_&:' \
+		-e 's:test_issue8202(:_&:' \
+		-e 's:test_issue8202_dash_m_file_ignored(:_&:' \
+		-e 's:test_module_in_package(:_&:' \
+		-e 's:test_module_in_package_in_zipfile(:_&:' \
+		-e 's:test_module_in_subpackage_in_zipfile(:_&:' \
+		-e 's:test_nonexisting_script(:_&:' \
+		-e 's:test_package(:_&:' \
+		-e 's:test_package_compiled(:_&:' \
+		-e 's:test_script_compiled(:_&:' \
+		lib-python/3/test/test_cmd_line_script.py || die
+	sed -i -e 's:test_incremental_errors(:_&:' \
+		lib-python/3/test/test_codecs.py || die
+	sed -i -e 's:test_ressources_gced_in_workers(:_&:' \
+		-e 's:test_submit_after_interpreter_shutdown(:_&:' \
+		lib-python/3/test/test_concurrent_futures.py || die
+	sed -i -e 's:test_for_3(:_&:' \
+		-e 's:test_func_4(:_&:' \
+		lib-python/3/test/test_coroutines.py || die
+	sed -i -e 's:test_strftime(:_&:' \
+		-e 's:test_more_strftime(:_&:' \
+		lib-python/3/test/datetimetester.py || die
+	sed -i -e 's:test_info(:_&:' \
+		-e 's:test_code_info(:_&:' \
+		-e 's:test_show_code(:_&:' \
+		-e 's:test_disassemble_recursive(:_&:' \
+		-e 's:test_disassemble_str(:_&:' \
+		-e 's:test_jumpy(:_&:' \
+		lib-python/3/test/test_dis.py || die
+	sed -i -e 's:test_generator_doesnt_retain_old_exc2(:_&:' \
+		-e 's:test_attributes(:_&:' \
+		lib-python/3/test/test_exceptions.py || die
+	sed -i -e 's:test_frozen(:_&:' \
+		lib-python/3/test/test_frozen.py || die
+	sed -i -e 's:test_ssl_raises(:_&:' \
+		-e 's:test_ssl_verified(:_&:' \
+		lib-python/3/test/test_imaplib.py || die
+	sed -i -e 's:test_script_compiled(:_&:' \
+		lib-python/3/test/test_multiprocessing_main_handling.py || die
+	sed -i -e 's:test_execve_invalid_env(:_&:' \
+		lib-python/3/test/test_os.py || die
+	sed -i -e 's:test_get_and_set_scheduler_and_param(:_&:' \
+		lib-python/3/test/test_posix.py || die
+	sed -i -e 's:test_copying(:_&:' \
+		-e 's:test_re_split(:_&:' \
+		-e 's:test_zerowidth(:_&:' \
+		-e 's:test_locale_caching(:_&:' \
+		-e 's:test_locale_compiled(:_&:' \
+		-e 's:test_match_repr(:_&:' \
+		-e 's:test_qualified_re_split(:_&:' \
+		-e 's:test_scoped_flags(:_&:' \
+		lib-python/3/test/test_re.py || die
+	sed -i -e 's:test_auto_history_disabled(:_&:' \
+		-e 's:test_auto_history_enabled(:_&:' \
+		-e 's:test_history_size(:_&:' \
+		lib-python/3/test/test_readline.py || die
+	sed -i -e 's:test_multiprocess(:_&:' \
+		lib-python/3/test/test_regrtest.py || die
+	sed -i -e 's:test_warn_on_full_buffer(:_&:' \
+		lib-python/3/test/test_signal.py || die
+	sed -i -e 's:test_get_path(:_&:' \
+		lib-python/3/test/test_site.py || die
+	sed -i -e 's:test_check_hostname(:_&:' \
+		-e 's:test_npn_protocols(:_&:' \
+		-e 's:test_sni_callback(:_&:' \
+		-e 's:test_sni_callback_raising(:_&:' \
+		lib-python/3/test/test_ssl.py || die
+	sed -i -e 's:test_invalid_placeholders(:_&:' \
+		lib-python/3/test/test_string.py || die
+	sed -i -e 's:test_eval_bytes_invalid_escape(:_&:' \
+		-e 's:test_eval_str_invalid_escape(:_&:' \
+		lib-python/3/test/test_string_literals.py || die
+	sed -i -e 's:test_boundary_error_message_with_large_offset(:_&:' \
+		lib-python/3/test/test_struct.py || die
+	sed -i -e 's:test_restore_signals(:_&:' \
+		lib-python/3/test/test_subprocess.py || die
+	sed -i -e 's:test_jump_out_of_async_for_block_backwards(:_&:' \
+		-e 's:test_jump_out_of_async_for_block_forwards(:_&:' \
+		-e 's:test_jump_over_async_for_block_before_else(:_&:' \
+		-e 's:test_no_jump_backwards_into_async_for_block(:_&:' \
+		-e 's:test_no_jump_forwards_into_async_for_block(:_&:' \
+		-e 's:test_no_jump_into_async_for_block_before_else(:_&:' \
+		-e 's:test_no_jump_from_yield(:_&:' \
+		lib-python/3/test/test_sys_settrace.py || die
+	sed -i -e 's:test_install_schemes(:_&:' \
+		lib-python/3/test/test_sysconfig_pypy.py || die
+	sed -i -e 's:test_circular_imports(:_&:' \
+		lib-python/3/test/test_threaded_import.py || die
+	sed -i -e 's:test_main_milliseconds(:_&:' \
+		-e 's:test_main_verbose(:_&:' \
+		-e 's:test_main_very_verbose(:_&:' \
+		-e 's:test_main_with_time_unit(:_&:' \
+		lib-python/3/test/test_timeit.py || die
+	sed -i -e 's:test_cannot_subclass(:_&:' \
+		lib-python/3/test/test_typing.py || die
+	sed -i -e 's:test_warnings(:_&:' \
+		lib-python/3/unittest/test/test_runner.py || die
+	sed -i -e 's:test_cmd_line(:_&:' \
+		-e 's:test_env_var(:_&:' \
+		-e 's:test_locale_getpreferredencoding(:_&:' \
+		-e 's:test_posix_locale(:_&:' \
+		-e 's:test_stdio(:_&:' \
+		-e 's:test_xoption(:_&:' \
+		lib-python/3/test/test_utf8_mode.py || die
+	sed -i -e 's:test_asyncgen_finalization_by_gc(:_&:' \
+		-e 's:test_asyncgen_finalization_by_gc_in_other_thread(:_&:' \
+		-e 's:test_create_connection_ipv6_scope(:_&:' \
+		lib-python/3/test/test_asyncio/test_base_events.py || die
+	sed -i -e 's:test_buffered_proto_create_connection(:_&:' \
+		lib-python/3/test/test_asyncio/test_buffered_proto.py || die
+	sed -i -e 's:test_create_connection_memory_leak(:_&:' \
+		-e 's:test_handshake_timeout(:_&:' \
+		-e 's:test_start_tls_client_reg_proto_1(:_&:' \
+		lib-python/3/test/test_asyncio/test_sslproto.py || die
+	sed -i -e 's:test_bare_create_task(:_&:' \
+		-e 's:test_current_task(:_&:' \
+		lib-python/3/test/test_asyncio/test_tasks.py || die
+	sed -i -e 's:test_asyncio_task_decimal_context(:_&:' \
+		lib-python/3/test/test_asyncio/test_context.py || die
+	sed -i -e 's:test_create_server_ssl_match_failed(:_&:' \
+		lib-python/3/test/test_asyncio/test_events.py || die
+	sed -i -e 's:test_binding(:_&:' \
+		-e 's:test_from_import_AttributeError(:_&:' \
+		-e 's:test_from_import_missing_attr_has_name_and_path(:_&:' \
+		-e 's:test_from_import_missing_attr_path_is_canonical(:_&:' \
+		lib-python/3/test/test_import/__init__.py || die
+	sed -i -e 's:test_unrelated_contents(:_&:' \
+		-e 's:test_contents(:_&:' \
+		-e 's:test_submodule_contents(:_&:' \
+		-e 's:test_submodule_contents_by_name(:_&:' \
+		-e 's:test_is_resource_good_path(:_&:' \
+		-e 's:test_is_submodule_resource(:_&:' \
+		-e 's:test_read_submodule_resource_by_name(:_&:' \
+		lib-python/3/test/test_importlib/test_resource.py || die
+	sed -i -e 's:test_non_string_keys_dict(:_&:' \
+		lib-python/3/test/test_json/test_fail.py || die
+	sed -i -e 's:test_module(:_&:' \
+		lib-python/3/test/test_warnings/__init__.py || die
+
+	# flaky
+	sed -i -e 's:test_2_join_in_forked_process(:_&:' \
+		lib-python/3/test/test_threading.py || die
+
+	# TODO
+	sed -i -e 's:test_external_target_locale_configuration(:_&:' \
+		lib-python/3/test/test_c_locale_coercion.py || die
+	sed -i -e 's:test_locale(:_&:' \
+		lib-python/3/test/test_format.py || die
+	sed -i -e 's:test_decompressor_bug_28275(:_&:' \
+		lib-python/3/test/test_lzma.py || die
+	sed -i -e 's:test_wrapped_exception:_&:' \
+		lib-python/3/test/_test_multiprocessing.py || die
+	sed -i -e 's:test_https_sni(:_&:' \
+		lib-python/3/test/test_urllib2_localnet.py || die
+
+	# the first one's broken by sandbox, the second by our env
+	sed -i -e 's:test_executable(:_&:' \
+		-e 's:test_executable_without_cwd(:_&:' \
+		lib-python/3/test/test_subprocess.py || die
+
+	eapply_user
+}
+
+src_configure() {
+	tc-export CC
+}
+
+src_compile() {
+	# copy over to make sys.prefix happy
+	cp -p "${BROOT}"/usr/lib/pypy3.7/pypy3-c-${PV} pypy3-c || die
+	cp -p "${BROOT}"/usr/lib/pypy3.7/include/${PV}/* include/ || die
+	# (not installed by pypy)
+	rm pypy/module/cpyext/include/_numpypy/numpy/README || die
+	mv pypy/module/cpyext/include/* include/ || die
+	mv pypy/module/cpyext/parse/*.h include/ || die
+	pax-mark m pypy3-c
+
+	einfo "Generating caches and CFFI modules ..."
+
+	# Generate Grammar and PatternGrammar pickles.
+	./pypy3-c -c "import lib2to3.pygram, lib2to3.patcomp; lib2to3.patcomp.PatternCompiler()" \
+		|| die "Generation of Grammar and PatternGrammar pickles failed"
+
+	# Generate cffi modules
+	# Please keep in sync with pypy/tool/build_cffi_imports.py!
+#cffi_build_scripts = {
+#    "_blake2": "_blake2/_blake2_build.py",
+#    "_ssl": "_ssl_build.py",
+#    "sqlite3": "_sqlite3_build.py",
+#    "audioop": "_audioop_build.py",
+#    "tk": "_tkinter/tklib_build.py",
+#    "curses": "_curses_build.py" if sys.platform != "win32" else None,
+#    "syslog": "_syslog_build.py" if sys.platform != "win32" else None,
+#    "gdbm": "_gdbm_build.py"  if sys.platform != "win32" else None,
+#    "pwdgrp": "_pwdgrp_build.py" if sys.platform != "win32" else None,
+#    "resource": "_resource_build.py" if sys.platform != "win32" else None,
+#    "lzma": "_lzma_build.py",
+#    "_decimal": "_decimal_build.py",
+#    "_sha3": "_sha3/_sha3_build.py",
+	cffi_targets=( blake2/_blake2 sha3/_sha3 ssl
+		audioop syslog pwdgrp resource lzma decimal )
+	use gdbm && cffi_targets+=( gdbm )
+	use ncurses && cffi_targets+=( curses )
+	use sqlite && cffi_targets+=( sqlite3 )
+	use tk && cffi_targets+=( tkinter/tklib )
+
+	local t
+	# all modules except tkinter output to .
+	# tkinter outputs to the correct dir ...
+	cd lib_pypy || die
+	for t in "${cffi_targets[@]}"; do
+		# tkinter doesn't work via -m
+		../pypy3-c "_${t}_build.py" || die "Failed to build CFFI bindings for ${t}"
+	done
+
+	# Cleanup temporary objects
+	find -name "_cffi_*.[co]" -delete || die
+	find -type d -empty -delete || die
+}
+
+src_test() {
+	# (unset)
+	local -x PYTHONDONTWRITEBYTECODE=
+	local -x COLUMNS=80
+
+	local ignore=(
+		# failing doctests
+		lib-python/3/test/test_extcall.py
+		lib-python/3/test/test_unpack_ex.py
+
+		# segfault
+		lib-python/3/test/test_capi.py
+	)
+
+	# Test runner requires Python 2 too. However, it spawns PyPy3
+	# internally so that we end up testing the correct interpreter.
+	# (--deselect for failing doctests)
+	"${EPYTHON}" ./pypy/test_all.py --pypy=./pypy3-c -vv lib-python \
+		${ignore[@]/#/--ignore } || die
+}
+
+src_install() {
+	local dest=/usr/lib/pypy3.7
+	einfo "Installing PyPy ..."
+	dosym pypy3-c-${PV} "${dest}/pypy3-c"
+	insinto "${dest}"
+	# preserve mtimes to avoid obsoleting caches
+	insopts -p
+	doins -r include lib_pypy lib-python
+
+	# replace copied headers with symlinks
+	for x in "${BROOT}"/usr/lib/pypy3.7/include/${PV}/*; do
+		dosym "${PV}/${x##*/}" "${dest}/include/${x##*/}"
+	done
+
+	dosym ../lib/pypy3.7/pypy3-c /usr/bin/pypy3
+	dodoc README.rst
+
+	if ! use gdbm; then
+		rm -r "${ED}${dest}"/lib_pypy/_gdbm* || die
+	fi
+	if ! use sqlite; then
+		rm -r "${ED}${dest}"/lib-python/*3/sqlite3 \
+			"${ED}${dest}"/lib_pypy/_sqlite3* \
+			"${ED}${dest}"/lib-python/*3/test/test_sqlite.py || die
+	fi
+	if ! use tk; then
+		rm -r "${ED}${dest}"/lib-python/*3/{idlelib,tkinter} \
+			"${ED}${dest}"/lib_pypy/_tkinter \
+			"${ED}${dest}"/lib-python/*3/test/test_{tcl,tk,ttk*}.py || die
+	fi
+
+	local -x EPYTHON=pypy3
+	local -x PYTHON=${ED}${dest}/pypy3-c
+
+	echo "EPYTHON='${EPYTHON}'" > epython.py || die
+	python_moduleinto /usr/lib/pypy3.7/site-packages
+	python_domodule epython.py
+
+	einfo "Byte-compiling Python standard library..."
+	python_optimize "${ED}${dest}"
+}
diff --git a/dev-python/pypy3/pypy3-7.3.2_rc1.ebuild b/dev-python/pypy3/pypy3-7.3.2_rc1.ebuild
new file mode 100644
index 000000000000..45d2ebfd2176
--- /dev/null
+++ b/dev-python/pypy3/pypy3-7.3.2_rc1.ebuild
@@ -0,0 +1,202 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 )
+inherit pax-utils python-any-r1 toolchain-funcs
+
+MY_P=pypy3.6-v${PV/_/}
+
+DESCRIPTION="A fast, compliant alternative implementation of the Python (3.6) language"
+HOMEPAGE="https://pypy.org/"
+SRC_URI="https://downloads.python.org/pypy/${MY_P}-src.tar.bz2"
+S="${WORKDIR}/${MY_P}-src"
+
+LICENSE="MIT"
+# pypy3 -c 'import sysconfig; print(sysconfig.get_config_var("SOABI"))'
+SLOT="0/pypy36-pp73"
+KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="bzip2 gdbm +jit libressl ncurses sqlite test tk"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	|| (
+		dev-python/pypy3-exe:${PV}[bzip2?,ncurses?]
+		dev-python/pypy3-exe-bin:${PV}
+	)
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
+	gdbm? ( sys-libs/gdbm:0= )
+	sqlite? ( dev-db/sqlite:3= )
+	tk? (
+		dev-lang/tk:0=
+		dev-tcltk/tix:0=
+	)
+	!<dev-python/pypy3-bin-7.3.0:0"
+DEPEND="${RDEPEND}
+	test? (
+		${PYTHON_DEPS}
+		!!dev-python/pytest-forked
+	)"
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	eapply "${FILESDIR}/7.3.1-gentoo-path.patch"
+	eapply "${FILESDIR}/1.9-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch"
+	eapply "${FILESDIR}"/7.2.0-distutils-cxx.patch
+
+	sed -e "s^@EPREFIX@^${EPREFIX}^" \
+		-i lib-python/3/distutils/command/install.py || die
+
+	# apply CPython stdlib patches
+	pushd lib-python/3 > /dev/null || die
+	eapply "${FILESDIR}"/python-3.5-distutils-OO-build.patch
+	popd > /dev/null || die
+
+	# see http://buildbot.pypy.org/summary?branch=py3.6&builder=pypy-c-jit-linux-x86-64
+	sed -i -e 's:test_jumpy:_&:' \
+		lib-python/3/test/test_dis.py || die
+	sed -i -e 's:test_get_and_set_scheduler_and_param:_&:' \
+		lib-python/3/test/test_posix.py || die
+	sed -i -e 's:test_auto_history:_&:' \
+		-e 's:test_history_size:_&:' \
+		lib-python/3/test/test_readline.py || die
+	sed -i -e 's:test_eval_bytes_invalid_escape:_&:' \
+		-e 's:test_eval_str_invalid_escape:_&:' \
+		lib-python/3/test/test_string_literals.py || die
+	sed -i -e 's:test_jump_out_of_async_for_block:_&:' \
+		-e 's:test_jump_over_async_for_block_before_else:_&:' \
+		-e 's:test_no_jump_.*wards_into_async_for_block:_&:' \
+		-e 's:test_no_jump_into_async_for_block_before_else:_&:' \
+		-e 's:test_no_jump_from_yield:_&:' \
+		lib-python/3/test/test_sys_settrace.py || die
+	sed -i -e 's:test_circular_imports:_&:' \
+		lib-python/3/test/test_threaded_import.py || die
+
+	# the first one's broken by sandbox, the second by our env
+	sed -i -e 's:test_empty_env:_&:' \
+		-e 's:test_executable(:_&:' \
+		-e 's:test_executable_without_cwd:_&:' \
+		lib-python/3/test/test_subprocess.py || die
+
+	# XXX
+	sed -i -e 's:test_locale:_&:' \
+		lib-python/3/test/test_format.py || die
+	sed -i -e 's:test_decompressor_bug_28275:_&:' \
+		lib-python/3/test/test_lzma.py || die
+
+	eapply_user
+}
+
+src_configure() {
+	tc-export CC
+}
+
+src_compile() {
+	# copy over to make sys.prefix happy
+	cp -p "${BROOT}"/usr/lib/pypy3.6/pypy3-c-${PV} pypy3-c || die
+	cp -p "${BROOT}"/usr/lib/pypy3.6/include/${PV}/* include/ || die
+	# (not installed by pypy)
+	rm pypy/module/cpyext/include/_numpypy/numpy/README || die
+	mv pypy/module/cpyext/include/* include/ || die
+	mv pypy/module/cpyext/parse/*.h include/ || die
+	pax-mark m pypy3-c
+
+	einfo "Generating caches and CFFI modules ..."
+
+	# Generate Grammar and PatternGrammar pickles.
+	./pypy3-c -c "import lib2to3.pygram, lib2to3.patcomp; lib2to3.patcomp.PatternCompiler()" \
+		|| die "Generation of Grammar and PatternGrammar pickles failed"
+
+	# Generate cffi modules
+	# Please keep in sync with pypy/tool/build_cffi_imports.py!
+#cffi_build_scripts = {
+#    "_blake2": "_blake2/_blake2_build.py",
+#    "_ssl": "_ssl_build.py",
+#    "sqlite3": "_sqlite3_build.py",
+#    "audioop": "_audioop_build.py",
+#    "tk": "_tkinter/tklib_build.py",
+#    "curses": "_curses_build.py" if sys.platform != "win32" else None,
+#    "syslog": "_syslog_build.py" if sys.platform != "win32" else None,
+#    "gdbm": "_gdbm_build.py"  if sys.platform != "win32" else None,
+#    "pwdgrp": "_pwdgrp_build.py" if sys.platform != "win32" else None,
+#    "resource": "_resource_build.py" if sys.platform != "win32" else None,
+#    "lzma": "_lzma_build.py",
+#    "_decimal": "_decimal_build.py",
+#    "_sha3": "_sha3/_sha3_build.py",
+	cffi_targets=( blake2/_blake2 sha3/_sha3 ssl
+		audioop syslog pwdgrp resource lzma decimal )
+	use gdbm && cffi_targets+=( gdbm )
+	use ncurses && cffi_targets+=( curses )
+	use sqlite && cffi_targets+=( sqlite3 )
+	use tk && cffi_targets+=( tkinter/tklib )
+
+	local t
+	# all modules except tkinter output to .
+	# tkinter outputs to the correct dir ...
+	cd lib_pypy || die
+	for t in "${cffi_targets[@]}"; do
+		# tkinter doesn't work via -m
+		../pypy3-c "_${t}_build.py" || die "Failed to build CFFI bindings for ${t}"
+	done
+
+	# Cleanup temporary objects
+	find -name "_cffi_*.[co]" -delete || die
+	find -type d -empty -delete || die
+}
+
+src_test() {
+	# (unset)
+	local -x PYTHONDONTWRITEBYTECODE=
+	local -x COLUMNS=80
+
+	# Test runner requires Python 2 too. However, it spawns PyPy3
+	# internally so that we end up testing the correct interpreter.
+	"${EPYTHON}" ./pypy/test_all.py --pypy=./pypy3-c -vv lib-python || die
+}
+
+src_install() {
+	local dest=/usr/lib/pypy3.6
+	einfo "Installing PyPy ..."
+	dosym pypy3-c-${PV} "${dest}/pypy3-c"
+	insinto "${dest}"
+	# preserve mtimes to avoid obsoleting caches
+	insopts -p
+	doins -r include lib_pypy lib-python
+
+	# replace copied headers with symlinks
+	for x in "${BROOT}"/usr/lib/pypy3.6/include/${PV}/*; do
+		dosym "${PV}/${x##*/}" "${dest}/include/${x##*/}"
+	done
+
+	dosym ../lib/pypy3.6/pypy3-c /usr/bin/pypy3
+	dodoc README.rst
+
+	if ! use gdbm; then
+		rm -r "${ED}${dest}"/lib_pypy/_gdbm* || die
+	fi
+	if ! use sqlite; then
+		rm -r "${ED}${dest}"/lib-python/*3/sqlite3 \
+			"${ED}${dest}"/lib_pypy/_sqlite3* \
+			"${ED}${dest}"/lib-python/*3/test/test_sqlite.py || die
+	fi
+	if ! use tk; then
+		rm -r "${ED}${dest}"/lib-python/*3/{idlelib,tkinter} \
+			"${ED}${dest}"/lib_pypy/_tkinter \
+			"${ED}${dest}"/lib-python/*3/test/test_{tcl,tk,ttk*}.py || die
+	fi
+
+	local -x EPYTHON=pypy3
+	local -x PYTHON=${ED}${dest}/pypy3-c
+
+	echo "EPYTHON='${EPYTHON}'" > epython.py || die
+	python_moduleinto /usr/lib/pypy3.6/site-packages
+	python_domodule epython.py
+
+	einfo "Byte-compiling Python standard library..."
+	python_optimize "${ED}${dest}"
+}
diff --git a/dev-python/pyqt-distutils/Manifest b/dev-python/pyqt-distutils/Manifest
index 0ce8d70d280d..facb57f02296 100644
--- a/dev-python/pyqt-distutils/Manifest
+++ b/dev-python/pyqt-distutils/Manifest
@@ -1,3 +1,3 @@
-DIST pyqt-distutils-0.3.0.tar.gz 4659 BLAKE2B 2897696881c6ee18558eb24a923b6675588bd38456fc4e9aff6b1780e7c2c31576c4a7427104c0b15238bed1ad52e2f13ab316441adb06fc0ffd9cbe5052ef30 SHA512 052a1fa0e687ac9aba5fc9623c72f8fff9a25f6d19083668e900ad1ff98bdd99c66c0ac45ba5f5f0c09b76a97370ebf4a4fef9fbd266bc0312bb05567c4ae577
-EBUILD pyqt-distutils-0.3.0.ebuild 522 BLAKE2B b1a6c5f57f19b4fa2108c7695c0ba5d2b3e60d028c25db78867c3e02969e58d37e9bbd5afca527d46d9ae279b7b198ac7c13e943c2ee6ab90aa6485e2d478c9f SHA512 f3462f74e13e88a9bfa72fd21c89e6ac9cf43c3baf3e9f19ac180b109ed51b8519303928604055333de7d4f937587041bac4a1ffcdb4684d59113921bc810519
+DIST pyqt-distutils-0.7.3.gh.tar.gz 16628 BLAKE2B 0d9d7f951890c00efd95bf3caef8c8964d02f3097840f84006a8d9523c0ad9b78dbb5f46c4d752945074ba971c92e81e81be0345b7a8c807932e7157ecd00e03 SHA512 450569be205aa0de792c3f2d8c43e26eb6fed1088b241291347ae14d2343b61517bd7547f741bd62bb9e1bfb92077d1ae5c64b871c39d59a67ca82172ac1c598
+EBUILD pyqt-distutils-0.7.3.ebuild 607 BLAKE2B 151fb272e3c929937f6cc887861d9c3447cee52807543c1e20f8eca98de9b43ea0e18a36ba4cc24abe30b3a9de2b92253f91dab5d1969a78fd637f1b6be8578b SHA512 16edcf6a1de7ddaa5f2d7a986e45eb083b62e0ecdb6d075261c5c7b98fbc08dbdd0e1c58e2c3fa8e975d846064a4c74860f79137fadbda584eaf99281efdd3b5
 MISC metadata.xml 410 BLAKE2B 3ed7ef5688df2c5f2e4bec3044d79f225b8b8154ccae5bc487a444aabeadeed5af2e8d60392b09fb731103572da91edacc13fe669e89490a7d30fb585ace1d5e SHA512 52c81f7e76feeb110ca5bf49da1c3fbc82c2b4f61c02ba7622312631c4a9618e42df1cba0f62253f039427b21420751f981d0541b7892ff162ac6e27aeee7748
diff --git a/dev-python/pyqt-distutils/pyqt-distutils-0.3.0.ebuild b/dev-python/pyqt-distutils/pyqt-distutils-0.7.3.ebuild
index c83838844b80..ba764f5808df 100644
--- a/dev-python/pyqt-distutils/pyqt-distutils-0.3.0.ebuild
+++ b/dev-python/pyqt-distutils/pyqt-distutils-0.7.3.ebuild
@@ -1,25 +1,23 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
 
-PYTHON_COMPAT=( python3_6 )
 inherit distutils-r1
 
+MY_P=${PN/-/_}-${PV}
 DESCRIPTION="distutils extension to work with PyQt applications and UI files"
 HOMEPAGE="https://github.com/ColinDuquesnoy/pyqt_distutils"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+SRC_URI="https://github.com/ColinDuquesnoy/pyqt_distutils/archive/${PV}.tar.gz -> ${P}.gh.tar.gz"
+S="${WORKDIR}/${MY_P}"
 
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"
+RDEPEND="dev-python/docopt[${PYTHON_USEDEP}]"
 
-RDEPEND="
-	${DEPEND}
-	dev-python/docopt[${PYTHON_USEDEP}]
-"
+distutils_enable_tests pytest
diff --git a/dev-python/pyqtgraph/Manifest b/dev-python/pyqtgraph/Manifest
index f2833bec8e1e..a83e237e0fd8 100644
--- a/dev-python/pyqtgraph/Manifest
+++ b/dev-python/pyqtgraph/Manifest
@@ -1,4 +1,3 @@
-AUX pyqtgraph-0.10.0-qt5.patch 439 BLAKE2B 8c0b5f766adf64d67800873145223ed8f9dda75ce1d5d62784129d827c4dfb9d44bd5532b44dbe42abc6bd67d5b13082c1691d8796c3a53b4ea873faaa2d7f00 SHA512 792a739e1cdc2c7c1ce059945c4a5280f1187a88dd767669fee83fbbdb5c315c022b99c5312c9c53d88afc6d24767fcb93426f6e05b9a5d08db084ba3110cc93
 AUX pyqtgraph-0.11.0-qt5_only.patch 361 BLAKE2B 5c4f904df6b19bcf29c9e44a623400015b1ebe4cac8b797a50478e75c82ac964cb05ca4c67dfa73332528e4f232f612d2f9a9bf439dbaf63765fb1f6d650bd77 SHA512 34600cdbb1e361288393fecfd8740b147ef16dfcd0719f0eed62a93201eb5fd54b09aebb86201effe6a791a6b5be934ece07a07756284ae0b2bbde4aaee137dd
 DIST pyqtgraph-0.11.0_rc0.tar.gz 755973 BLAKE2B 845c57a16c71d449419cca452ac70468eb21f198b3aebe39204e8ac1408ebd4471a95b24cbd91cd4c745439c17a805738e50a29f8690de5d84f86c2597310aea SHA512 6eb5573b19c7fc0bc263bdc5d75a9a7a5d86d5ce525e406fcbd8f4215a8b2a0a9a7d4839d177fb10ff62a5feacdf088347828900daa9f60ae84e54824b98f470
 EBUILD pyqtgraph-0.11.0_rc0.ebuild 1072 BLAKE2B f62759d444f186d3cab758d8df0539a70d90011eebcfc3e4bb892d5fb13fca6705b99390cda6ae6b9e07370d84355bd639e0f08687385b7ddc6ed25f79d4dc66 SHA512 6524de9e2864b59ebbcdc34cbed34e128e285b6861f96c8f0dd43e9a8956a1bb7e636e6c97813e61e57c820822fd2f82b69e83ce2e66209afdf3f8d59ca7b5d0
diff --git a/dev-python/pyqtgraph/files/pyqtgraph-0.10.0-qt5.patch b/dev-python/pyqtgraph/files/pyqtgraph-0.10.0-qt5.patch
deleted file mode 100644
index b74df26df5d3..000000000000
--- a/dev-python/pyqtgraph/files/pyqtgraph-0.10.0-qt5.patch
+++ /dev/null
@@ -1,10 +0,0 @@
-diff -r -U2 pyqtgraph-0.10.0.orig/pyqtgraph/Qt.py pyqtgraph-0.10.0/pyqtgraph/Qt.py
---- pyqtgraph-0.10.0.orig/pyqtgraph/Qt.py	2016-10-17 23:22:41.000000000 +0700
-+++ pyqtgraph-0.10.0/pyqtgraph/Qt.py	2018-01-23 22:52:19.503525554 +0700
-@@ -25,5 +25,5 @@
- ## is already imported. If not, then attempt to import PyQt4, then PySide.
- if QT_LIB is None:
--    libOrder = [PYQT4, PYSIDE, PYQT5]
-+    libOrder = [PYQT5]
- 
-     for lib in libOrder:
diff --git a/dev-python/pyquery/Manifest b/dev-python/pyquery/Manifest
index 1b7bd6f2d077..f422504c9100 100644
--- a/dev-python/pyquery/Manifest
+++ b/dev-python/pyquery/Manifest
@@ -1,5 +1,5 @@
 AUX pyquery-1.4.1-network-tests.patch 613 BLAKE2B d9e9f2e11c2183f6759a90e35d60a96a3522790743da1d3ec21ad8006e40d98753fb90c14c14c705ab781b08143c52ecf04722d25928f3abe44ebabb59d04342 SHA512 e6ba986a24bf1adf9e1d6c5f4d59fc28a5a613062aa691f84d760c82beeb77d9198a655795e2701dec05184c4fef377cb4bb6f5cc75f49d2ecf798770cb8f86a
 AUX pyquery-1.4.1-tests-pypy.patch 715 BLAKE2B 9f0ef9cf79cddbd90fb6cac1d6297c98f495f5e258b78f4dbac92c4ce3b26e302614a424bad25b9cab2f6a08f8c8e07525d57a6c1ccfd1c4e51893768704edfa SHA512 ba78b8db4c934598de0aeb37ba76e3eda96b123ebd6a85f458dcd8e8a8d13a37935989dcdb9a282748b188267137f85fe6ad3dfa2c0670f77e76ccae47c819ca
 DIST pyquery-1.4.1.tar.gz 47983 BLAKE2B eb8d0ca59122734a4c715c33f40fd0b5fcc8edcabe9e41649ddf332feb1df603f8527a668aa7b9d78974b3d049e774355296644abd9b4d426d96e6e3c7a74065 SHA512 e2bfbbf51f99a408e9696a2b9c15f8875813847a10b5bd93c4c7a6886ac1b3ae6c7883ec4fb64e9bccab2127617843961e181044fe927f3c80c8ac363ed86141
-EBUILD pyquery-1.4.1-r1.ebuild 1162 BLAKE2B e0d1d10a476292323129b5569c135e7b7be5387267172d8c812f4da8dfd9712405fb9d093d96b4f37220dfe31016c1a6aea37343cf5dcf09105403e1096566f1 SHA512 7540ddfcfa3379c81feb52971a57e776e5f2043cd0a694b5866d1d4d6b3dfb8cce7f1dbda13d3ec00d1b42a7846926319588995d72002e5c19a621c7e8883090
+EBUILD pyquery-1.4.1-r1.ebuild 1166 BLAKE2B 2e7107a78b04b8140578938eb5adb80da02bfca536558dfde1a0480a44250b25a31893d160c634716a5fab06864e9a3a7ee0ab198a09b644bd21f27c79c2f5a7 SHA512 58c3304621c3c380e079defedcac926c1abe7f4f1e80aa6593115214aeb2357887ff83d052f1d2546c640a4309744e0eb771085ae264693520cac700eb2aa4e6
 MISC metadata.xml 375 BLAKE2B 6b09c68dc28585cedb0d7109e174b26cdd2ca11c3e8413550f3032a7b2cd11c7745cafc530d7e18692fab76c6c6717e6ba2d92111e2e1df0cae8be73a3e833bd SHA512 ebed84e50582171d8a99f7ee1031553a6afc558f5aa6914f2aa5eacccc7efd6c87b284eec803dd81fef3dd91426fd28f93ae21f6cab1e74c9e4541df3904956f
diff --git a/dev-python/pyquery/pyquery-1.4.1-r1.ebuild b/dev-python/pyquery/pyquery-1.4.1-r1.ebuild
index 564d4dcd2f3c..613b1dc5b19f 100644
--- a/dev-python/pyquery/pyquery-1.4.1-r1.ebuild
+++ b/dev-python/pyquery/pyquery-1.4.1-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 PYTHON_COMPAT=( python3_{6,7,8,9} pypy3 )
 
-inherit distutils-r1 eutils
+inherit distutils-r1 optfeature
 
 DESCRIPTION="A jQuery-like library for python"
 HOMEPAGE="https://github.com/gawel/pyquery"
diff --git a/dev-python/pyrsistent/Manifest b/dev-python/pyrsistent/Manifest
index 985a6cc5093c..0b705b187ed4 100644
--- a/dev-python/pyrsistent/Manifest
+++ b/dev-python/pyrsistent/Manifest
@@ -1,5 +1,11 @@
 DIST pyrsistent-0.15.6.tar.gz 107424 BLAKE2B 432ce7223fee524cbcd65237171af6f0fa16d23dfcc65b7cb5bc8d19dc8216344bf21660d2acf9b07eb1bc9b883840c0b5de679cfe52a0f977e64cea21cd584f SHA512 42b259c66e118d5b09bcc64e57441729146ed9b40e9fd18cda83c4aa0523d5bc3acde3177113e1f2a1b5c1e3a14d15b369df9701a9218a88a656ba0359b5ff10
 DIST pyrsistent-0.16.0.tar.gz 108012 BLAKE2B 62283b8ef478302964fc6b1869c3646c23b78762c5f4fad68aa239433c54d9c652544d5ce05dee18107c8f9604b689043d07f67b9396f6dce0cce3aab022e2de SHA512 d5764b1a185d4578bf308f338037e0546b06e79a3e7189b904e24e95e0e907bc98d7c1c68becc5549a541a5864df75aba6088cafa3558ecb0a63dafb22f5674a
+DIST pyrsistent-0.17.0.tar.gz 106451 BLAKE2B 6d752f9d396b03cc6391979cb908b4b1a112e160e31961cd7d437f789c99a61c8dfa1406ad18c0873f96a3609e779e12cadcd2d75dd290e4ef4ca1a4e4feaf0e SHA512 e361b1e7e53153fd6d8195766e548a9c708624f2f8ba1c05c1c137306f11f336bffc95d62b6484ee810e71d96ca9faa703b1ebb4e8ff485f28371ecaf5ea27f1
+DIST pyrsistent-0.17.2.tar.gz 106594 BLAKE2B c6135f45b43d4742ac39c722636b42813c24823e5319dc34f4c3f2e97a0e311046bc7cfef305cc0710fb26c5b7b595963953307485645c35d1ccc75383ec08df SHA512 58b78457481b188b65bfbe29da1318128795732b8c98ff89b1bdec1741d821807ae120000ae79115b2c4881f328dd8853e7ae48b0406e0e7fc69fca3c41fcd6f
+DIST pyrsistent-0.17.3.tar.gz 106911 BLAKE2B 90a05617ad1e32801286d3da834bf52b4ea864e7463a0789904e4a3bbfda2f7b987e13ea93e16980f2cf3b5d999e6040b7c5980a81b516999175b4e5f2ed392e SHA512 2d18e1d4cfe9a0a576fd363f466ba920094af0b1cbbb49aec11b32df6c23e59f6552235a496838dab00928cc7f6dad2a4a8aaa0b52cb6a38eba6faedd12846c8
 EBUILD pyrsistent-0.15.6.ebuild 651 BLAKE2B 379b5169b1bf9ec52c6470d1398730189491c67ad65a0d756dacbd9cd8abb3a254bc29f3a415940380a2300c1e0694440d8176becadf236bf6051d1a03db1f4f SHA512 29d8d5250cbf300d3df5a9176631663e5f2849fb8347798180d64ac32a12a5a2381067591278757c81a572dd574819f6bd1792727e7903d5bb7538f63c5b84a2
 EBUILD pyrsistent-0.16.0.ebuild 646 BLAKE2B dfbda08ad6d2f9359e23d1208275b763dbc0b1f30148070d39ffa44556e9f80783cb9fd5214e3b59a47d7d0d846cb08f924707797c1c9daa83415b9558565706 SHA512 3598e0806a7b4a0cb43dc2c32a79f143278c5fda354862f8810d38692742a8163f8c746129e6a803e754f1103110687727da2b5831d3fd81024520270434c504
+EBUILD pyrsistent-0.17.0.ebuild 609 BLAKE2B 7ad3d411d29c5c9c6d8035b890b0df5e48d9fb4dc89dd12422e7bb446b15b4df253618b23657d0beac0c84ed33958aaeb15386e2846cb7318768444b09a58391 SHA512 3b58451cb534c240a09f6bc793169e285ce79f3edbc11be9608d6ca467b76f0e33ecd4ebe6e04a34176a27ce2809bc823d95746e4217c9b039bad069f6e6ee30
+EBUILD pyrsistent-0.17.2.ebuild 609 BLAKE2B 7ad3d411d29c5c9c6d8035b890b0df5e48d9fb4dc89dd12422e7bb446b15b4df253618b23657d0beac0c84ed33958aaeb15386e2846cb7318768444b09a58391 SHA512 3b58451cb534c240a09f6bc793169e285ce79f3edbc11be9608d6ca467b76f0e33ecd4ebe6e04a34176a27ce2809bc823d95746e4217c9b039bad069f6e6ee30
+EBUILD pyrsistent-0.17.3.ebuild 609 BLAKE2B 7ad3d411d29c5c9c6d8035b890b0df5e48d9fb4dc89dd12422e7bb446b15b4df253618b23657d0beac0c84ed33958aaeb15386e2846cb7318768444b09a58391 SHA512 3b58451cb534c240a09f6bc793169e285ce79f3edbc11be9608d6ca467b76f0e33ecd4ebe6e04a34176a27ce2809bc823d95746e4217c9b039bad069f6e6ee30
 MISC metadata.xml 521 BLAKE2B 0081a54c9db451d020647e808b80c47e590530bc952c40d3dc6c11e187cb6ff4c644c9c8c448b206ef3036a3a0ae07760e23ba88d41938667b0a83ab2299cd9d SHA512 16d13966bbf6d52360d9438a56a949e6e31a9d2ace85e319db27be14f85c8446ee28e00c6bafc9232b3608e3a209396dc601cb3ce193d3cb4e8284cc8b3cfef1
diff --git a/dev-python/pyrsistent/pyrsistent-0.17.0.ebuild b/dev-python/pyrsistent/pyrsistent-0.17.0.ebuild
new file mode 100644
index 000000000000..e732f866136e
--- /dev/null
+++ b/dev-python/pyrsistent/pyrsistent-0.17.0.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Persistent/Functional/Immutable data structures"
+HOMEPAGE="https://github.com/tobgu/pyrsistent/ https://pypi.org/project/pyrsistent/"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+BDEPEND="
+	test? (
+		dev-python/hypothesis[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
diff --git a/dev-python/pyrsistent/pyrsistent-0.17.2.ebuild b/dev-python/pyrsistent/pyrsistent-0.17.2.ebuild
new file mode 100644
index 000000000000..e732f866136e
--- /dev/null
+++ b/dev-python/pyrsistent/pyrsistent-0.17.2.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Persistent/Functional/Immutable data structures"
+HOMEPAGE="https://github.com/tobgu/pyrsistent/ https://pypi.org/project/pyrsistent/"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+BDEPEND="
+	test? (
+		dev-python/hypothesis[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
diff --git a/dev-python/pyrsistent/pyrsistent-0.17.3.ebuild b/dev-python/pyrsistent/pyrsistent-0.17.3.ebuild
new file mode 100644
index 000000000000..e732f866136e
--- /dev/null
+++ b/dev-python/pyrsistent/pyrsistent-0.17.3.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Persistent/Functional/Immutable data structures"
+HOMEPAGE="https://github.com/tobgu/pyrsistent/ https://pypi.org/project/pyrsistent/"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+BDEPEND="
+	test? (
+		dev-python/hypothesis[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
diff --git a/dev-python/pyscard/Manifest b/dev-python/pyscard/Manifest
index ba3f1cbb7051..143898449cc7 100644
--- a/dev-python/pyscard/Manifest
+++ b/dev-python/pyscard/Manifest
@@ -1,3 +1,3 @@
 DIST pyscard-1.9.9.tar.gz 145428 BLAKE2B c62d9c2f13d9f19df1b7399509efc9df2baf2da00a9dc0bd9a0b440dcef232beeb0f7da88b12e3fb8ecffeb28f268eaaa04c9d45dc3420a1071835afe7a36c95 SHA512 88c7314c10153f509eb9bf6318e62210c7182e51b531af752a402bf8d05cfa2658cc1a4e7b9385a474038ddfa5a1bfbf1f208fcd9abe02a60161ce7c757c67b2
-EBUILD pyscard-1.9.9.ebuild 759 BLAKE2B 11205877ee1c742cc804ee4eef46f9ba54906b1524137bfb0fb0276a59cb51945b773327f7806e0eb9609308a4b69988c1f94e069a59babc1ff2354a782f469a SHA512 c317d6aaae96b995c0a0e397dd139482b3f233b309e0817280b8eee2454786c4fef1eccb4337590af4c750f2b3831456c3bca1b7f1eb63d1689ff474a435a41e
+EBUILD pyscard-1.9.9.ebuild 763 BLAKE2B 002f2302972cb6e5b0b3d12fb23c5e79fc69343899687eab3908d64f7c9253ae32742da3bede1001874a0bacfe9c5634f2625a1cfdfb2bc68883b2020a9e61fb SHA512 37f506186c80b3b580ba50ad5864e842b0bc5ec630b7ccac2edfb5cbf8068e6e4e43c1aaf470dd5df55dd28cb857eb0edd4c6c696c7c919de9b9d760493e2f28
 MISC metadata.xml 317 BLAKE2B f87dee8af30517c70bf141fe7da6a953f61f894e7f97897f3c2a594fae16212a518e80eb2141e2ae18da562a91a85ca74209e0c77f4b9bc54e91fe9bd02f650c SHA512 f0ee67c282ef764df07b1f49ea3fa4714ecc6094046aa6fb986274968e58801eb3f7a32463bf4282dfb607202b2b4e5e1b50a0d54f79e85f64a6abb2d68e309e
diff --git a/dev-python/pyscard/pyscard-1.9.9.ebuild b/dev-python/pyscard/pyscard-1.9.9.ebuild
index 9321e8fa39a1..ae9fc5fb5080 100644
--- a/dev-python/pyscard/pyscard-1.9.9.ebuild
+++ b/dev-python/pyscard/pyscard-1.9.9.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 PYTHON_COMPAT=( python3_{6,7,8} )
 
-inherit distutils-r1 eutils
+inherit distutils-r1 optfeature
 
 DESCRIPTION="Smart cards support in python"
 HOMEPAGE="https://pyscard.sourceforge.io/
diff --git a/dev-python/pyscreenshot/Manifest b/dev-python/pyscreenshot/Manifest
new file mode 100644
index 000000000000..3c1236922b63
--- /dev/null
+++ b/dev-python/pyscreenshot/Manifest
@@ -0,0 +1,3 @@
+DIST pyscreenshot-2.2.tar.gz 29726 BLAKE2B d1e314be360d4716b35b4302de82010dfc9a97212b3f4472b42e40f9470fd0575fe8f0ceb976adfe13059c0566413414e03f78189d4afa193d88a0aaf4c5c26e SHA512 6689ccbcd5c6164aeb12d911ee93c8958f6c6b5aaba5ba7d4073ee855e6398180ed27fce6299480b18b3d7ffad12cd17694c3db1f1c7373d4b25be0073d49338
+EBUILD pyscreenshot-2.2.ebuild 1620 BLAKE2B 3cf0f0b73638a3e0ced1433fafca358868970f9d78a65ca39a20ffc6bba1a5d355b71fd011aba1cbf03b4412a4e58090f72611aec60b41600dc4f4921576c9c4 SHA512 f7a7f320a8772ef9b6606ba482bb2fb6bc64dc7651b247763eab6d4172b960e1128e0ab4bdb04649c7751e9814a50ca02e81da76a856fbd2b42afafe3999fafb
+MISC metadata.xml 375 BLAKE2B 393138e315b4eae4dacb9339fbb5766e9dbaa84b7482babaddc08d524fb8b9939f6622ee9c6d09b66c61ac270fcc483fac39996a12ba87ccccf7cafd4c6d36db SHA512 9a44b6b9de4d1a61d6af9256519473541d5513cef349c15178c025dee3aaaa3f6772b1be56576411a985fcd9c70029c00743d8f577be8eaec4c5a44646c9cbf6
diff --git a/dev-python/pyscreenshot/metadata.xml b/dev-python/pyscreenshot/metadata.xml
new file mode 100644
index 000000000000..d22e99d73577
--- /dev/null
+++ b/dev-python/pyscreenshot/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>andrewammerlaan@riseup.net</email>
+		<name>Andrew Ammerlaan</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-python/pyscreenshot/pyscreenshot-2.2.ebuild b/dev-python/pyscreenshot/pyscreenshot-2.2.ebuild
new file mode 100644
index 000000000000..d4e41d5057b3
--- /dev/null
+++ b/dev-python/pyscreenshot/pyscreenshot-2.2.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8} )
+
+inherit distutils-r1 virtualx
+
+DESCRIPTION="Python screenshot library"
+HOMEPAGE="https://github.com/ponty/pyscreenshot"
+SRC_URI="https://github.com/ponty/pyscreenshot/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+BDEPEND="test? (
+	dev-python/path-py[${PYTHON_USEDEP}]
+	dev-python/pillow[${PYTHON_USEDEP}]
+	dev-python/python-xlib[${PYTHON_USEDEP}]
+	dev-python/pyvirtualdisplay[${PYTHON_USEDEP}]
+	media-gfx/pqiv
+)"
+
+DEPEND="
+	dev-python/easyprocess[${PYTHON_USEDEP}]
+	dev-python/entrypoint2[${PYTHON_USEDEP}]
+	dev-python/jeepney[${PYTHON_USEDEP}]
+	dev-python/mss[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# easyprocess.EasyProcessError: start error fails inside emerge env
+	sed -i -e 's:test_default:_&:' \
+			tests/test_default.py || die
+
+	# AssertionError
+	sed -i -e 's:test_imagemagick:_&:' \
+			tests/test_imagemagick.py || die
+
+	# Needs access to dbus
+	sed -i -e 's:test_kwin_dbus:_&:' \
+			tests/test_kwin_dbus.py || die
+
+	# AssertionError
+	sed -i -e 's:test_mss:_&:' \
+			tests/test_mss.py || die
+
+	# AssertionError
+	sed -i -e 's:test_pygdk3:_&:' \
+			tests/test_pygdk3.py || die
+
+	# AssertionError
+	sed -i -e 's:test_pyqt5:_&:' \
+			tests/test_pyqt5.py || die
+
+	# AssertionError
+	sed -i -e 's:test_qtpy:_&:' \
+			tests/test_qtpy.py || die
+
+	# AssertionError
+	sed -i -e 's:test_scrot:_&:' \
+			tests/test_scrot.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	virtx pytest -vv
+}
diff --git a/dev-python/pysendfile/Manifest b/dev-python/pysendfile/Manifest
index 0d8b2f3699db..791cc344896d 100644
--- a/dev-python/pysendfile/Manifest
+++ b/dev-python/pysendfile/Manifest
@@ -1,3 +1,3 @@
 DIST pysendfile-2.0.1.tar.gz 19315 BLAKE2B ac5776069de0228d5103053e82786b499478dc3cad57b1f74ede3b8b8724abb780c5b51cf8578ebece7a12ce269b7a9b5bc72f08409077bbce2d4daf63046119 SHA512 d6ee08eb251fac30c90a9ee829fd992f3620697eef2893ced5a2c6273486c3c5fd35c70962585a8d747d578817391f91c929bfeeba8c4485d52a15748229ca9c
-EBUILD pysendfile-2.0.1-r1.ebuild 590 BLAKE2B b1e8743c3e1d4dc9c95ac98781444debddc0b1e7ae2ff4f7362af23658b0452a4d1e4b1489654172199aa22bab8ae6e5a8a9013616f3fa7ee99a3cdb3d31d25c SHA512 0862253aae36053540be77a6a94429f78ddc90de99d90b3aa0883907c0d05664a5cc505d40a6056f137212bb43121930c531bfc76feaf9cb5c6cadf1af64435c
+EBUILD pysendfile-2.0.1-r1.ebuild 541 BLAKE2B 436918a20bfdf6521736b474b9cb543812db1e3572f6e94baecdde817614d4fb97aded3e23d643be18a4db32e547037a0c3f5d848b44ede66341e0da723fb4f7 SHA512 0b0b53f8be56b958fabd92ffef15ce42fc79a07868415884a2065b828dab6e95ee38cf932694b0d85b4d2940aa27ff4c4e9ac9654983f803e5b93b2b2e618127
 MISC metadata.xml 461 BLAKE2B 30a174cb9b4196658e94e080e4aad73dbfd3f28bc9c5e0d966672b1d811a6d85cdabf97faa07c89a4a868f2494c46da07f6601c0f08a292f1cd00df3b95e42ae SHA512 1b76475c93a4462264ff4ee5f9b1b3da11fe666f80fbd47322e64f981d3c2ee4d7817fe3d3ef151b991f04fd9353d0b6dda9fe80f732409415fb6d7b0146e17f
diff --git a/dev-python/pysendfile/pysendfile-2.0.1-r1.ebuild b/dev-python/pysendfile/pysendfile-2.0.1-r1.ebuild
index 5d6541382f8f..b3694e1aaa96 100644
--- a/dev-python/pysendfile/pysendfile-2.0.1-r1.ebuild
+++ b/dev-python/pysendfile/pysendfile-2.0.1-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( pypy3 python3_{6,7,8} )
+PYTHON_COMPAT=( pypy3 python3_{6,7,8,9} )
 
 inherit distutils-r1
 
@@ -16,8 +16,6 @@ IUSE=""
 LICENSE="MIT"
 SLOT="0"
 
-BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
 python_test() {
 	"${EPYTHON}" test/test_sendfile.py || die "tests failed with ${EPYTHON}"
 }
diff --git a/dev-python/pyserial/Manifest b/dev-python/pyserial/Manifest
index 2868f4239684..8495d1df73a0 100644
--- a/dev-python/pyserial/Manifest
+++ b/dev-python/pyserial/Manifest
@@ -1,3 +1,3 @@
 DIST pyserial-3.4.tar.gz 151657 BLAKE2B cf47aba4a6f3bb2fe39d99e72907496faa1c9f37857810fef4d826cca72c361d0e43dbc33d9cf2291a589bf0193d17355d149e6eb61b4f9e28250207708ef09a SHA512 d71dffc330704e41caac6054adf192bee2f1c119691faf2ea93fe22e8e3ba000dc4a1434293f6f80d05a5577d85b96791f656e28d5c63fb0ce6a6605467a117f
-EBUILD pyserial-3.4.ebuild 813 BLAKE2B 2f316a51911f5b3aeb713a9df188b961ab2eae43854304c007ef9085ad121897f3c93afc757da9cc71c6f95b711d3958410c76b266739ae8d7004ca9dd78e6e0 SHA512 211a2ecb3a10d64831d074e05e126ac7a3debf043f207719eb5ad04f964429229fb63461db8c69259bfb108a3e7253a5ac4996d93cf244705cef3ed85c4f5e9b
+EBUILD pyserial-3.4.ebuild 820 BLAKE2B 87bb59de2c81aa2939ccdeb0a29192855dd53341b1cbed4af3e08ba566d3c58e986130868eb754e9df07f316af910702c83970773c7ae46e2b9a94837510b5ee SHA512 e335e40a6e90ef7ad1ab4ebebfa67bcd3b910a8694bb3c0b330a5af488cf01ffa7a1df6caa2ce68762d802e0b4c8593ef5fa1500016e511eeb996edf088a5741
 MISC metadata.xml 421 BLAKE2B f3c94b0b72c3df17d9c539e8b76e1f644e0b4ae1bb3d905652b568084e449bf11cab07f27e7775031eee857095671debd28bf1d2eb8c1992c6b980620b32109b SHA512 30c1232aed930c665c2603443cbff9efbb843b1866d6a4d034a517e0669f28f1e6e7562103a8badbd8fb1efd9e69b058870b9c4fcea8fa5e74e7a1ec8ba17fde
diff --git a/dev-python/pyserial/pyserial-3.4.ebuild b/dev-python/pyserial/pyserial-3.4.ebuild
index 11492e2a223a..1751f98a277e 100644
--- a/dev-python/pyserial/pyserial-3.4.ebuild
+++ b/dev-python/pyserial/pyserial-3.4.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="PSF-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
 IUSE="examples"
 
 DOCS=( CHANGES.rst README.rst )
diff --git a/dev-python/pytest-aiohttp/Manifest b/dev-python/pytest-aiohttp/Manifest
index a7208c96a2b6..397b43426761 100644
--- a/dev-python/pytest-aiohttp/Manifest
+++ b/dev-python/pytest-aiohttp/Manifest
@@ -1,3 +1,3 @@
 DIST pytest-aiohttp-0.3.0.tar.gz 6884 BLAKE2B 02b50fcd14192d23a4b257c2b7cb235966eff52b1c0ac87a4c61a20bc0babdb22eb999938c63e267a797d52ce57c9fb471232db3d0bc6566168a2d73f6404cd4 SHA512 4164166465dc40ff78a86304d1bcd4db9fb3f7dad3188f8ebe2ff151ed51eb0bf9c1b7a608d94cfe3339ee3b6efd4d5abbaa0691388460d5ac95635afa14984c
-EBUILD pytest-aiohttp-0.3.0-r1.ebuild 544 BLAKE2B 84f90724d142b489924266c828a92fbd242a8ca1fbe27af32671d33605ecb463d5d4d07720be4fca8e4d192d09c0b821121bfd76ac21f663e47d14985cd853a5 SHA512 1aae874cb459a5498e3225329e2049025ebb31e44a0e0b973611e3839ed052eb45fcd39b3f6f040149481e9b275335e2c01e6d439e1e703062549293188367cb
+EBUILD pytest-aiohttp-0.3.0-r1.ebuild 563 BLAKE2B f47938d5a669d6f5c05bf85fc6b81f9884902598562e746c92e9fcddd7959d82d5eb9dd8778aacb5120269e0f14a56684b5ca036b2594cf1c66b8a4982d2acdc SHA512 207aa008f6a40a1ec761f912f99049f7dd0882d58e231b06ca3597fbd3e225c7b4b0e53bb7dd89d739de27d7ff260d07ce6f58077220a6cd82e9f632420101e4
 MISC metadata.xml 382 BLAKE2B 24ac18217bfebed19f5049bbaca9955da1a0eebe08b8fd3f8f870db50369ceec3e68f4fae68604a399084122a3e3ae460481f855e4a4a3c419e494103d452c56 SHA512 73da71aee91bfb48dc637ef0e4d47a4693ba602f8cb15d0056cc0a14f4bb74d11cad7edcee8a1e892eaf2c3cf1d85735c9f5745ea0ae8d5026a7776c0550cf3f
diff --git a/dev-python/pytest-aiohttp/pytest-aiohttp-0.3.0-r1.ebuild b/dev-python/pytest-aiohttp/pytest-aiohttp-0.3.0-r1.ebuild
index 7ac6c22a0027..a7beb4a8a18d 100644
--- a/dev-python/pytest-aiohttp/pytest-aiohttp-0.3.0-r1.ebuild
+++ b/dev-python/pytest-aiohttp/pytest-aiohttp-0.3.0-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86"
 IUSE=""
 
 RDEPEND="
diff --git a/dev-python/pytest-cov/Manifest b/dev-python/pytest-cov/Manifest
index 4938ed52328b..7176a95cc6cc 100644
--- a/dev-python/pytest-cov/Manifest
+++ b/dev-python/pytest-cov/Manifest
@@ -2,5 +2,5 @@ AUX pytest-cov-2.8.1-disable-broken-tests.patch 763 BLAKE2B d36ec8acb8329cff8619
 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.8.1.tar.gz 47661 BLAKE2B 590fd50b69d01a71b20982d8cdbed0698ebe24c290d791bb44c96aa1aaaf77cf1f379d565eb775864c6945facf6d271115236cb44b95e4a4c9bb7cc6fd591acf SHA512 769a17c2095dbe990df148a0105c9e3dc88ac2265ac77ac31448dab6abf6d8cc0d54f5c6ff01fd708bd38700bfea93f57d3bb702bd9bb0a708257d094b2376ec
-EBUILD pytest-cov-2.8.1.ebuild 1379 BLAKE2B af9d3b41059044fb681a5cc95a2cc54ff154e254fa45c41404572fbd5ce7583d7a9e94bfd8e8b9a916dffad18a4cf4dd69a86ee36a0c21c47ab84403800693d6 SHA512 1d4c068babaf0c6b34d755e4de2eaf55b3e933c2f2e417874b4653cd72f6793966b28b0df9e3bfff8f0d7ffd45ab0f82b2580b74f2d65eeff0897833c272f4b5
+EBUILD pytest-cov-2.8.1.ebuild 1386 BLAKE2B 2d43817613e950e798f8050eedd3423663b0ab9d23114df0f6bb5989e92937369d0046aabdf257813dcaf65020ea6cb5fac9bed0f00cbf4ab331a67f47dfb4fc SHA512 46021be6c3ac55590f663701bccf7dc01ce46c106ec377a61bc8760ea5c831a7f89ab7dd0a34cdf2d9072c95797e906852d9420c26c13f3ebfe3481b9390fe77
 MISC metadata.xml 476 BLAKE2B be2e8759e98061a26e63e9431f2d62f5d66dcad8d1e82c88c53bbcf129511a3e443cb0332ee27ad450740b719d164d4feb3f6e176e3541a58cecd34dea96d9a7 SHA512 380f75130a29a9b4408eba5d9dce8e6a2bae7ed25fe337ca1f7ec99e941f06063ea088a71b3c1c5fd3e0b617fec676dc52e4f76b8b270485aef7993969712e3e
diff --git a/dev-python/pytest-cov/pytest-cov-2.8.1.ebuild b/dev-python/pytest-cov/pytest-cov-2.8.1.ebuild
index 974fb87fee81..cb1fb3d61127 100644
--- a/dev-python/pytest-cov/pytest-cov-2.8.1.ebuild
+++ b/dev-python/pytest-cov/pytest-cov-2.8.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/pytest-datadir/Manifest b/dev-python/pytest-datadir/Manifest
new file mode 100644
index 000000000000..ed237c3884c8
--- /dev/null
+++ b/dev-python/pytest-datadir/Manifest
@@ -0,0 +1,3 @@
+DIST pytest-datadir-1.3.1.tar.gz 15230 BLAKE2B 72c5daaeb93315be55ae052d39a22eee4e64a1aaafa344ae64b527eebd137dc4667cee2f60af887551f00814d7ea4e5788097d0f59f7769335545c5083aef356 SHA512 2ab035ea4e6c4eaaead746a5fd3988feed31a314f73e18270faf4ae606521aa045f3d6c5e1301adcb87f8fd5b1ba5f3f1784f212ad778707ba46ad638d594f8c
+EBUILD pytest-datadir-1.3.1.ebuild 731 BLAKE2B c8794551a495d3cc267c063864476d632ac03ed7287483cd08c89936323063cdac776b1f73cfcc48772944a0f15b39718a8f23ad6d66a49ed4e2c1ae309d40a7 SHA512 772041e2c64ff8a5a82d0c377d6096ccad650e73c5c7daf342c0c28fa23171628d5402df0346b95fcde37264b9fae1749f90bd39b93eafc70cde74a959517bcc
+MISC metadata.xml 375 BLAKE2B 393138e315b4eae4dacb9339fbb5766e9dbaa84b7482babaddc08d524fb8b9939f6622ee9c6d09b66c61ac270fcc483fac39996a12ba87ccccf7cafd4c6d36db SHA512 9a44b6b9de4d1a61d6af9256519473541d5513cef349c15178c025dee3aaaa3f6772b1be56576411a985fcd9c70029c00743d8f577be8eaec4c5a44646c9cbf6
diff --git a/dev-python/pytest-datadir/metadata.xml b/dev-python/pytest-datadir/metadata.xml
new file mode 100644
index 000000000000..d22e99d73577
--- /dev/null
+++ b/dev-python/pytest-datadir/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>andrewammerlaan@riseup.net</email>
+		<name>Andrew Ammerlaan</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-python/pytest-datadir/pytest-datadir-1.3.1.ebuild b/dev-python/pytest-datadir/pytest-datadir-1.3.1.ebuild
new file mode 100644
index 000000000000..4410dfb88542
--- /dev/null
+++ b/dev-python/pytest-datadir/pytest-datadir-1.3.1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+DESCRIPTION="Pytest plugin for manipulating test data directories and files"
+HOMEPAGE="https://github.com/gabrielcnr/pytest-datadir"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="dev-python/pytest[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
+
+python_test() {
+	distutils_install_for_testing
+	pytest -vv || die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	distutils-r1_python_install
+
+	# Do not install license to /usr
+	rm "${D}/usr/LICENSE" || die
+}
diff --git a/dev-python/pytest-expect/Manifest b/dev-python/pytest-expect/Manifest
index 80710d812ceb..040b9f7632aa 100644
--- a/dev-python/pytest-expect/Manifest
+++ b/dev-python/pytest-expect/Manifest
@@ -1,3 +1,3 @@
 DIST pytest-expect-1.1.0.tar.gz 3595 BLAKE2B f291021c1fb44371f43d5970573872d3db04e0b29e909de01c2183e79d96f9a72060b75f914cd7460b914864b98191460b4c44809a0f5ddf728fc6ef0c94c348 SHA512 41d2b296844e9dab9429f34eec37fe106a4e6c2039824c37067ed048dcc328b13e666b22d3482ccfc6153af4e44b5d895f3011ec45df55ffa07a98459e3caefd
-EBUILD pytest-expect-1.1.0-r1.ebuild 646 BLAKE2B 2c19e380454c57f0dd9022a41b18650fee3c8af32b6b56bbe0af85e5b564c31f9c924e97401eee4696914f7a091aa07ed0080c3dbefbc8d1ceb810ff7059f1ba SHA512 064f79933aa0367060aaacadb37fe253f9a7d9b6f1fc4835ab8a22b5cb0a4b6a99d908eeb9905d3ad8685cf68b4b604628a7680cc1fb3c2f6e080acdee5bbe55
+EBUILD pytest-expect-1.1.0-r1.ebuild 653 BLAKE2B 0b3e26a7cb5230600c664fa48655274fbf388118ab116ba588a971663fdcad7b92ce1a6b57dd2cdda9ce0212a56ef6656d4b28363fcca87c6b624c1599ab0820 SHA512 83f49efa1acc87bf0bbbf16f9cf4bc82e4de30c3a9942ceb83f068199903ffcf4d67961b66db57c5da1fa6938136df8f1d7bcc9870126c69f3c67bada6272c11
 MISC metadata.xml 458 BLAKE2B b8e23df2621be3f2cf2818753ab7a18102fd3e1ff32e80aa425c50b36f9f7ea736a1e9eb9030920c2882e65bdb2372afb0ece371ee13dbb45b3be3144d73f8fa SHA512 a366c816a1513376742bf1d43bb4cc60df9923b3e191d169ae56ee9706f60cbf8edbe35a195f41fd214bdc4cc10fc35c106d798845b3d45ac6b878f16718eeae
diff --git a/dev-python/pytest-expect/pytest-expect-1.1.0-r1.ebuild b/dev-python/pytest-expect/pytest-expect-1.1.0-r1.ebuild
index 87a8f34bb03a..0dc1f353d6f0 100644
--- a/dev-python/pytest-expect/pytest-expect-1.1.0-r1.ebuild
+++ b/dev-python/pytest-expect/pytest-expect-1.1.0-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86"
 IUSE=""
 
 RDEPEND="
diff --git a/dev-python/pytest-faulthandler/Manifest b/dev-python/pytest-faulthandler/Manifest
new file mode 100644
index 000000000000..23432e570f51
--- /dev/null
+++ b/dev-python/pytest-faulthandler/Manifest
@@ -0,0 +1,5 @@
+DIST pytest-faulthandler-1.6.0.tar.gz 6656 BLAKE2B 0fe66827e09c6b566ac6a9aa3fd4da03f0f5c4ea1e8601b16ed1a211c33150bcc0eaac5b47786040f571ceb266300bcb5142e2a8d977aeb69f89bd0ecefec4c3 SHA512 23146b1c0965e66ac201cae82192f3833daad2563f2177d916050df14b532a3eb78f2dd3b888cec3d28121b334ee86c9b762c5aadb8fb624c9a4288fbad693a5
+DIST pytest-faulthandler-2.0.1.tar.gz 3629 BLAKE2B f66b6989673b179b3ad3f583b9e7b9615b08e1e062f06969f37bd8a9a57e58bd0207544b0c11aa4a9d03f4db40a125bbbe1924160b2bdcb2c0c589de07281570 SHA512 184b4228693db0f15fdcf250f09c3ee9ef4767e744af9000ec46876f0c68e17434a6d1e25c7d59f610b2baa659d7af5a784cbf0e5e29b105f48d50d00cb1a7ca
+EBUILD pytest-faulthandler-1.6.0.ebuild 782 BLAKE2B 6d315dc19b4aa9c7f5fef1e917bd41128f2467b483cb5a9e82b8c7c301cad1d20c8ffbb47b202052499be71e2827ef185d658e6569222afe9e24eabad6eec2bc SHA512 0b128bfb428f18b0777c9a608c51560636f1bce387178988bc23e1036c8cfded4babe6eee9587978b5c1fd3697fffdd0ff8bcc3a8da9ac4df26909b68d7fdd25
+EBUILD pytest-faulthandler-2.0.1.ebuild 508 BLAKE2B ca48afbf9fd9a646b51c9bfa4146d8297d67bf9b1eee3c5f671d1df5f561056cb0b18e9c042a751c4de43e25a76fcb30e782bdadbaae399e48df4441f7b0d62f SHA512 7ca9d022cdca8a6749d5068ccc5ba8e5671a32949fc4ab89e273f36336384db9c276550c6e049bb23619ef26567607bf4287680ebd8c7e5821d9e84212a6be8a
+MISC metadata.xml 375 BLAKE2B 393138e315b4eae4dacb9339fbb5766e9dbaa84b7482babaddc08d524fb8b9939f6622ee9c6d09b66c61ac270fcc483fac39996a12ba87ccccf7cafd4c6d36db SHA512 9a44b6b9de4d1a61d6af9256519473541d5513cef349c15178c025dee3aaaa3f6772b1be56576411a985fcd9c70029c00743d8f577be8eaec4c5a44646c9cbf6
diff --git a/dev-python/pytest-faulthandler/metadata.xml b/dev-python/pytest-faulthandler/metadata.xml
new file mode 100644
index 000000000000..d22e99d73577
--- /dev/null
+++ b/dev-python/pytest-faulthandler/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>andrewammerlaan@riseup.net</email>
+		<name>Andrew Ammerlaan</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-python/pytest-faulthandler/pytest-faulthandler-1.6.0.ebuild b/dev-python/pytest-faulthandler/pytest-faulthandler-1.6.0.ebuild
new file mode 100644
index 000000000000..5033fc34123b
--- /dev/null
+++ b/dev-python/pytest-faulthandler/pytest-faulthandler-1.6.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+DESCRIPTION="Pytest plugin that activates the fault handler module for tests"
+HOMEPAGE="https://github.com/pytest-dev/pytest-faulthandler"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? (
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+	)
+"
+
+DEPEND="
+	>=dev-python/pytest-4.0[${PYTHON_USEDEP}]
+	<dev-python/pytest-5.0[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	distutils_install_for_testing
+	pytest -vv || die "Tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/pytest-faulthandler/pytest-faulthandler-2.0.1.ebuild b/dev-python/pytest-faulthandler/pytest-faulthandler-2.0.1.ebuild
new file mode 100644
index 000000000000..38021a87f44e
--- /dev/null
+++ b/dev-python/pytest-faulthandler/pytest-faulthandler-2.0.1.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Pytest plugin that activates the fault handler module for tests"
+HOMEPAGE="https://github.com/pytest-dev/pytest-faulthandler"
+SRC_URI="https://github.com/pytest-dev/pytest-faulthandler/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>=dev-python/pytest-5.0[${PYTHON_USEDEP}]
+"
diff --git a/dev-python/pytest-forked/Manifest b/dev-python/pytest-forked/Manifest
index 2b04484b4b08..9151a59c6705 100644
--- a/dev-python/pytest-forked/Manifest
+++ b/dev-python/pytest-forked/Manifest
@@ -1,5 +1,5 @@
 DIST pytest-forked-1.2.0.tar.gz 9533 BLAKE2B f9762fd34ffa05eb0abe143388c9608563b0b3d8d5f8c6cbb2e5e36271f4625f10e573042e66d5be5f7f9e124cb5171e570e0d59f2bc1100d2d88ee54c9b4e9b SHA512 d7ed2c36213cfb81988e84e370e0504add77fdb79d31aed4d7aabb73943042f860b4a3ca6c9aad7de5b11234631b1e0f66eb067fcb46079d2cc4ba53ef0cabfb
 DIST pytest-forked-1.3.0.tar.gz 9850 BLAKE2B cbe44d87052c5a3bc58934ac17153401810004aaa38b53ff3100384535cb2ea0fa99dada706113f324fa0a135ddbd9b97488319b4a9554d912388c341b62943c SHA512 25d639aa43380155d7744f1d05a95e0144f5fe7dea42ff3c2bba3803a07d73b5eb008525469330c5dda14800fe4b611241691be197132f31f88f66930c3ecac0
 EBUILD pytest-forked-1.2.0.ebuild 963 BLAKE2B 6ecd1551fefff7b4584e8dbd6f954ec8e7ac765bbcb4c34b19951ce762d4b7f1e6b2c633ecde9d6003b70b1f8a82e5f472559ec7432b2163326dd0b6d9a18d95 SHA512 353abc3083c5f29dfb17804ab8ddcd3257ac87069064c4d0ca8675d7fc7447b22246a3155eaf3d3b2fd71e0c67ec458662351b3d6b21cfac4441c8ed8062e35b
-EBUILD pytest-forked-1.3.0.ebuild 1014 BLAKE2B 3d39126be48628983e4770809868da3439d3962bd568cdebfd9dc99f956eeea1e5c3c3c24461a016cef2882e27eabdeedcd371030d824c207ff2a0a134038737 SHA512 3134d45fbe783c446392c33b25df3a0205cefa0bbcf3c2308c867d7deeffb1ebbc8ffbf937e4f7a5f726f06ce39000c10660ef4ff0d285fdca3e3548f5a800ac
+EBUILD pytest-forked-1.3.0.ebuild 1012 BLAKE2B fb76ebdeff8850963908f9079daec5d088dc58546f1401168056c09e33d5cbe69d2fd41c5901b09f1bb936eb49fe0bd26982b0ff9712d74156247ae032ef96d6 SHA512 a9fa563fe0542f8308d25c081ed08ff5b2a73b35684acb615a6ac1c59efbc338eebbe709d674b305c14fb6d4e44d6e8e7473078d8f8e8b5c565ed0f03869d22e
 MISC metadata.xml 404 BLAKE2B f53cbdb55297b417dc11e904b9bb22d7576ee7df9fa2f5ac80968c31dd9580ffb908bdf1c5ee966b910d8642971410bde39800fb38a01545f5e361f512389a65 SHA512 f6dc614da0c972e76e4ccb2f2141e7da63ac6b6899108b57f3374ec0296652345b97882dab1bf958aaa23046a1070c11889fe3fbc6eecb111bb2bc420620bfff
diff --git a/dev-python/pytest-forked/pytest-forked-1.3.0.ebuild b/dev-python/pytest-forked/pytest-forked-1.3.0.ebuild
index 8a7709a86625..86bf51f97fc0 100644
--- a/dev-python/pytest-forked/pytest-forked-1.3.0.ebuild
+++ b/dev-python/pytest-forked/pytest-forked-1.3.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="MIT"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/pytest-freezegun/Manifest b/dev-python/pytest-freezegun/Manifest
index e2798533dd33..e575dcd24437 100644
--- a/dev-python/pytest-freezegun/Manifest
+++ b/dev-python/pytest-freezegun/Manifest
@@ -1,3 +1,3 @@
 DIST pytest-freezegun-0.4.2.gh.tar.gz 7058 BLAKE2B 1c89979d85dbdedf87a26de57d1cfe120ed52831e8d69c42b6117ac49c9eb7376bab018a23ca10b582fc583ca61a03930a86878c141b0c5bf4d807552484fe70 SHA512 2bea7746e4e6a7f2a979cbc5c6d7a2576e0e2631a4e1d5abb7f27f76d6c32b0520a277474c092c5e05ce257f2ba19091918f67e28b7a2da1d5829037c6b70c55
-EBUILD pytest-freezegun-0.4.2.ebuild 716 BLAKE2B f20c5a2094d032dc8b4c55ea626e8925f81199a4e43abc8ddc3707fe1b62fefef95c533c409ed921e449a227353e8758d179f05dd3586c5993a15a51de41bd1a SHA512 9fa412a231fe345501d970f78bdbcb432dac2df99456ffd641e2701f6642b518f1f1ba4fd4e3147b2b7ab6df1ba278b7dfa16855451e999c571bacb0204a1da1
+EBUILD pytest-freezegun-0.4.2.ebuild 723 BLAKE2B 38ff7a3fd8c40c524f52639769e78aca280208056db819c25e472424dd6fc359f812b21084cbcc681b0e87b840838c01efe5eaf736846cc73f60fda39799a511 SHA512 fac3acd4cc86281f062d29acbe02a1c879fa27bf7623953993fa9dd22d80769d53631df6a0d22b37d0f3f07d5b62f062a1699e0799bfb6753b273050bbf7a050
 MISC metadata.xml 218 BLAKE2B 086fdcf7b63ca7bd6c58e861d717bb375e1cd372eff26d5d2eeeb176d8c5e6f10e653562abafb50eae7d7508f8e3d421b87e6a749acd0490308672828d0da697 SHA512 4558fee4c51117e21b1f42ca3edbdf1195ed297db798d6bfa0e5fbb7019654a187422b0abde7af5d800caffed66d1e55e4280e8be602bad591424d9776c46781
diff --git a/dev-python/pytest-freezegun/pytest-freezegun-0.4.2.ebuild b/dev-python/pytest-freezegun/pytest-freezegun-0.4.2.ebuild
index 03a8461f53fc..f1bccb38751b 100644
--- a/dev-python/pytest-freezegun/pytest-freezegun-0.4.2.ebuild
+++ b/dev-python/pytest-freezegun/pytest-freezegun-0.4.2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ~ia64 ppc ~ppc64 sparc x86"
+KEYWORDS="amd64 arm arm64 hppa ~ia64 ppc ~ppc64 ~riscv sparc x86"
 
 RDEPEND="
 	dev-python/freezegun[${PYTHON_USEDEP}]
diff --git a/dev-python/pytest-httpbin/Manifest b/dev-python/pytest-httpbin/Manifest
index 076cb1ae53f2..af00dbb0e57b 100644
--- a/dev-python/pytest-httpbin/Manifest
+++ b/dev-python/pytest-httpbin/Manifest
@@ -1,4 +1,4 @@
 AUX pytest-httpbin-1.0.0-pypy3-hang.patch 1099 BLAKE2B 4bb8dd686aadc35aab144a6467d52e7de675bcc7d6de8f130bc5942c17fd19c0c914d9aef81af3ed0a815ce21caf40ad8e7c8f724710fe07290dcc8fb92d6a24 SHA512 b0f417e7fdf658783e9297a895f50587d7b997de5065f5322fb46644028caa7cd10cf6130c578f6dd1f8b6aefbd281342f6aa8f5477284de3d4037b799604f72
 DIST pytest-httpbin-1.0.0.gh.tar.gz 17813 BLAKE2B b7e0ad9f131e4d236161b66b1d6d8e6087285a6d52df1accb044b30bcdac6c5f3350e9dbfe1cf33ab64b6d6aac6b463de81c31fd12dd950426b6ed8ef4eaf289 SHA512 2794134cc005cb969752e0c1119459d3f1e106f679942880a6b9ff507f2ee31c8ac4146a9c01b9a920368ea516443954b1b7044f7b1c270fe251f7d36adf7661
-EBUILD pytest-httpbin-1.0.0.ebuild 850 BLAKE2B 48a676944a544aef4e01d55a8a341ed2bb96bbab37f7000efce89d0277321ed1b76bc6d4e3dc86bd3d940d95309a065ef5072bad031ac90dda6ba7e887e871fd SHA512 adeaafc8d9366a378de6e384ceb7e198af9281d934b5598c6e2e2d51146760f65ecf44498ff446fd3f2debbdb14c45e270fc89f1fd7122a2a1d8aa077751548d
+EBUILD pytest-httpbin-1.0.0.ebuild 857 BLAKE2B b80976edacd958c60cab44a7f76455a2a80f2538f2bca52332d7c997d43054d10734f07775c54f331fbf0c8812f5c97e371ef5e7986001b265ee275b0d1c7451 SHA512 b61efcac011a126550849a9e52135b5f282f32ffe869dc8288640fe86d66df746b989fa6b66782248dfd5adb0c74b1e5d835ab49b86e2f965b255b92ede4b3fe
 MISC metadata.xml 521 BLAKE2B f3135defad3eccac1a8f9a7188de8e375a970fd3b6c665395fad1d4ed570aa4a3a90728644fe45f13af527d5c51216e04631ddec670cb6ce5f026b508eb5f58f SHA512 19e78d9a8706ad253eb0f7873f0e8bf308065d4cdcafc6d2ebed792f31f526c1d4c45bd2f7aecac338bd30c4ebda33b301b056f3075c11231b8d0d5ad4e77d2e
diff --git a/dev-python/pytest-httpbin/pytest-httpbin-1.0.0.ebuild b/dev-python/pytest-httpbin/pytest-httpbin-1.0.0.ebuild
index 4eab5f5ee096..6b09c271d442 100644
--- a/dev-python/pytest-httpbin/pytest-httpbin-1.0.0.ebuild
+++ b/dev-python/pytest-httpbin/pytest-httpbin-1.0.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/kevin1024/pytest-httpbin/archive/v${PV}.tar.gz -> ${
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	dev-python/httpbin[${PYTHON_USEDEP}]
diff --git a/dev-python/pytest-localserver/Manifest b/dev-python/pytest-localserver/Manifest
index 387b5a6d97fc..cca84924cfae 100644
--- a/dev-python/pytest-localserver/Manifest
+++ b/dev-python/pytest-localserver/Manifest
@@ -1,3 +1,3 @@
 DIST pytest-localserver-0.5.0.tar.gz 20409 BLAKE2B 62376065ee1aeb698ea5e3bd2d5ea3d6b511cc6793142aad458423513b0e3b358a0d0269a78a0f5aeda44fc53757ff85da786627840ee48cbed8b78ee34c2227 SHA512 aedf1e1c9563396457070df13df228ad0ebdd19173fa2ac5a598288d3e1a1ac8b8a0c0288cba0d8478e43d2e1de4848f2393bf640705916957f12ab31171c6cc
-EBUILD pytest-localserver-0.5.0.ebuild 708 BLAKE2B 10e4b25cd1a9090c08c8e9463d5664c2f1ccdb15e00488563c6aba7eace4270e59ee44dedf34f365a002197a5d35095b0b96c36a7e73d8b530599d96d36ccadc SHA512 8ac6bd5083f36712fe5b3cfd9346a02e79e3addde59ed0fa0b383f7312205186203fea068bffe5980947a7dd315c22ce1c01407fa1c534f5ba5cad13b9869535
+EBUILD pytest-localserver-0.5.0.ebuild 715 BLAKE2B c85630354a73f6a2a25ddbb94ebb97c57d6b46e48ddf10ce9a623d508913d0e3ba856d465a8e1c806128919eb86033246bfbd392814986707438bfe940230093 SHA512 778af5d81b537fa4e9e32a4c9f5816a0433fc54673f72944614390038b212d33a597ee377facf7258c5820944902a686a8bdea62f55e4909825ec9df88e96ba3
 MISC metadata.xml 345 BLAKE2B 79e94a8ee25d0f7284462fc21638c20778f60d0f8cf2e84f6904bedc165293c5f13335b3bc2976cf6bd0170fdb0be80b52b256a3abfdb9eacbaa98661a9466b8 SHA512 5a2e28bdb0a20b1a04e1f549130a7f1bf3b33fdd176baa50db33e999540474abe091bcf8ad76c4554a0e046dec7466c72f0786acaa87c88e72f6164891c3decd
diff --git a/dev-python/pytest-localserver/pytest-localserver-0.5.0.ebuild b/dev-python/pytest-localserver/pytest-localserver-0.5.0.ebuild
index e313962f0ef9..2c1995d5e655 100644
--- a/dev-python/pytest-localserver/pytest-localserver-0.5.0.ebuild
+++ b/dev-python/pytest-localserver/pytest-localserver-0.5.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86"
 
 RDEPEND=">=dev-python/werkzeug-0.10[${PYTHON_USEDEP}]"
 BDEPEND="
diff --git a/dev-python/pytest-mock/Manifest b/dev-python/pytest-mock/Manifest
index 0be0c9a21ba5..85dbc905b545 100644
--- a/dev-python/pytest-mock/Manifest
+++ b/dev-python/pytest-mock/Manifest
@@ -1,5 +1,4 @@
 AUX pytest-mock-2.0.0-warnings.patch 1363 BLAKE2B 67611daf7c070a0de2d368506b3e34653940f21bf565b0d7361b5f1e759c84533001f68483e1ca301e86cf2d734e10f973737f3775f898928c4b4c2d1aee9bf1 SHA512 6b306f19834559223af3e64372d46fed0146a783a6f134ed07883742b5ba1ad974fd3ba440376350345f939105e84abd8efdc7bf99cb9796eb638ba2c22e4e64
-AUX pytest-mock-3.1.0-warnings.patch 1373 BLAKE2B 1bac1315bb8d95d1e6435aa15415dd973d2834cd9fb68867b99d72f5b8233c736b40d3865d19ec9f4042387f3d01e57a0055f992fa7a37f2084c043be52c7e88 SHA512 177a318dee0957ff761d02db57890bedf3f780ce46e3d756f21c2c743d264e982eb9a711b17647ad2fb43e17f9f1b30808e943b5c89076b9c905c16e57a3e313
 DIST pytest-mock-1.11.2.tar.gz 22825 BLAKE2B d6843d1cb1afc0d5a242103ec4900d56418198b84fa037faf4b6841d7fbfd388273a819a26bfe051e6030690105e74211a27d2b864448598962b3e03788958fa SHA512 6dc927ce35001d088bddd9d79e024141b9e8163033b07af14b1f63330ef8b93dbf88649702f8fcc4f6ad314212fa5cbd39486b539811ec918450b3f7a716f96c
 DIST pytest-mock-2.0.0.tar.gz 24665 BLAKE2B 31a3464e8bff5a2109716e95492ce1d59f2555769e69cccf4012bc268f88c5eeca99924006bdc78cc5e20cf227860d845bead9656aba1c081da58effb38ea100 SHA512 8bd7f634afebeae628470270c81f0198647bf8cd5b0fac438891d881d9823e40e814d598670bb9c9722b864990958e69d385c7c6a6e2adc81d2adcb303fbe0b0
 DIST pytest-mock-3.2.0.tar.gz 25569 BLAKE2B e6a1ab23142cf3d7ac9385ac221bfce680c7b982cb489306557b60ca81563718cb9b7fcbb149cccb2cf6f06de5c3fa737d28b0711a3197fbbc86e432c5f4e614 SHA512 1ff442e26339ac41414a8678303fbc7eab573964661c664ef029c3b3377df4ab40173976316ef99e49dd208dc1e3c7cd0a0090f5453865343090cc9439f85fa9
@@ -9,5 +8,5 @@ EBUILD pytest-mock-1.11.2.ebuild 1456 BLAKE2B 79673aaf4f03ec6c5475e68a5eb5960bea
 EBUILD pytest-mock-2.0.0.ebuild 1112 BLAKE2B e84f9be37980feef82140399dc81f41141ce42d2b3304bbb93c31b444975a1976fadbff5ebb5a9d4a1ad5127a04172a8d88d4d2be7c176560b980cb1d20de160 SHA512 c726eccf84c8e58b34a479cc7f0741f1e80830f39f631c223399f851351426b3959293990348823e794bbe25e0c0578d9ccb0990d1d03f87947e1a457e557979
 EBUILD pytest-mock-3.2.0.ebuild 970 BLAKE2B c2d9bf51aa358b3748bedbc4b8fc73a47f1ae9c6d0af02d98847ecf72edca0334f7d7846b4ad2c95da73da2063ea71722926afe1eb4eb3a8fb29291858594920 SHA512 322d6aa0f181cf291d0a46471018d1ec717dc4c8f1122ad2cc71a8d1feac7f025e489712cae90769e287444055b8f2887a5a447828d2ebc16e407f575312cd30
 EBUILD pytest-mock-3.3.0.ebuild 978 BLAKE2B 121c1744dd24724d6573014125f7551dc519e1958df58c684da83850ea50baa0d545e1cc90360780442acd0df173e9d27a7c84acdf27c397b7d1d8f6e3b35c8e SHA512 89c6d2e5c974101ce96916c46a5031312dc4adf2e5d88082c638478595acbeac69f259789f85520e8577a8b38d55e46b68bdfc6337292fea8cd81ce76eb66062
-EBUILD pytest-mock-3.3.1.ebuild 978 BLAKE2B 121c1744dd24724d6573014125f7551dc519e1958df58c684da83850ea50baa0d545e1cc90360780442acd0df173e9d27a7c84acdf27c397b7d1d8f6e3b35c8e SHA512 89c6d2e5c974101ce96916c46a5031312dc4adf2e5d88082c638478595acbeac69f259789f85520e8577a8b38d55e46b68bdfc6337292fea8cd81ce76eb66062
+EBUILD pytest-mock-3.3.1.ebuild 985 BLAKE2B 30be5d360b8742cc9929f450c36c9c6f0205280379646963a889f2c2ac67b9af99803d903d4b5cbd8e20d2afc8ace4b513e328d6256f66f87659b9409425d2ca SHA512 3a89a01fe99c3594e1134fec2d1523fde5f0df18d140c882a886689e521e37abb08b027e254b5328a94a058eddbc128891798982ca4fd9de1ca50bfe58b434dc
 MISC metadata.xml 457 BLAKE2B 9ec62ff0eda60ae60bb1b63509ecc696ae4256d1b3ff00c9b7f834ffd735f87edef57ccbfb78a2f9002632c4287b581a8a81003c45601b314059675a8f2d288d SHA512 0defca8aefe2c6bb95d36112b14645d93c8bc5b8db08956b97b9a42cf4a7e1d97170068937e6ec818e43d4d6afd7ef414e1d5d7f4b72bae71291eeda9caf5c1a
diff --git a/dev-python/pytest-mock/files/pytest-mock-3.1.0-warnings.patch b/dev-python/pytest-mock/files/pytest-mock-3.1.0-warnings.patch
deleted file mode 100644
index 4851afe9d1ba..000000000000
--- a/dev-python/pytest-mock/files/pytest-mock-3.1.0-warnings.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 1ef3d6111a8e4f32dfa9a2c311b6996afd9e98a5 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Tue, 26 May 2020 10:56:27 +0200
-Subject: [PATCH] Permit warnings in *_stale_pyc tests
-
-The *_stale_pyc test is repeatedly failing on production systems
-due to additional pytest plugins being installed and triggering
-PytestAssertRewriteWarnings.  This causes 'passed *' string not to match
-because of the ',' after 'passed'.  Match just 'passed*' instead
-to solve this.
----
- tests/test_pytest_mock.py | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/tests/test_pytest_mock.py b/tests/test_pytest_mock.py
-index 73509a4..5e1a502 100644
---- a/tests/test_pytest_mock.py
-+++ b/tests/test_pytest_mock.py
-@@ -809,7 +809,7 @@ def test_abort_patch_context_manager_with_stale_pyc(testdir):
-     """
-     )
-     result = testdir.runpytest()
--    result.stdout.fnmatch_lines("* 1 passed *")
-+    result.stdout.fnmatch_lines("* 1 passed*")
- 
-     kwargs = {"legacy": True}
-     assert compileall.compile_file(str(py_fn), **kwargs)
-@@ -819,7 +819,7 @@ def test_abort_patch_context_manager_with_stale_pyc(testdir):
- 
-     py_fn.remove()
-     result = testdir.runpytest()
--    result.stdout.fnmatch_lines("* 1 passed *")
-+    result.stdout.fnmatch_lines("* 1 passed*")
- 
- 
- def test_used_with_class_scope(testdir):
--- 
-2.26.2
-
diff --git a/dev-python/pytest-mock/pytest-mock-3.3.1.ebuild b/dev-python/pytest-mock/pytest-mock-3.3.1.ebuild
index a646df8a08aa..bc5e1e840ae8 100644
--- a/dev-python/pytest-mock/pytest-mock-3.3.1.ebuild
+++ b/dev-python/pytest-mock/pytest-mock-3.3.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
 IUSE=""
 
 RDEPEND=">=dev-python/pytest-5[${PYTHON_USEDEP}]"
diff --git a/dev-python/pytest-ordering/Manifest b/dev-python/pytest-ordering/Manifest
new file mode 100644
index 000000000000..8b1173dd2a30
--- /dev/null
+++ b/dev-python/pytest-ordering/Manifest
@@ -0,0 +1,3 @@
+DIST pytest-ordering-0.6.tar.gz 11046 BLAKE2B 468ae5f04029b96ed3058b7f429aec0aaf96092453b229c3de5eab174702af2c1a9fe83171c68d282c4a144b3dd736daf9ed87b9e139a7bd175114f504049ebc SHA512 fd3aec83914f64d1295e1a1bf3fdc580c6824a749a1da8cebae275fef940d6ed6e5dcafad321d94f504a153e13e298b6544dc3c2db716a6b25d3148c2365fe15
+EBUILD pytest-ordering-0.6.ebuild 879 BLAKE2B 35fa23dc46599112adce653b4099d70594ae935894380517895380e4a0c44b7f2ee6a1da67095b6a61736e4ce9585722a53c148c5e98bd8c9ef63e56087f3c00 SHA512 2f1ba63e6a969bbe6e7c2f3b51a607b161e725f6d1234ee2308deaf7e97b30d3b887374f364f371b6b664ee24930ed1586ad0c6372ba06c87e4164117f3ff6c3
+MISC metadata.xml 535 BLAKE2B 3949f8116cb403fcf2a38e77a127cefba7a3326588032533a221331f79af318039780757437373784ae1894a058c8cc86f41e9ade54a789af2603e8f7561c508 SHA512 5e60df7ff87953007e7d12c198266462faca5c477cc62c8e9d031d3843edb867f3cf0aa3433fbaae16ecfe045da0bc067c6b5da47446356b2d878ce0cc99c311
diff --git a/dev-python/pytest-ordering/metadata.xml b/dev-python/pytest-ordering/metadata.xml
new file mode 100644
index 000000000000..48b39a119114
--- /dev/null
+++ b/dev-python/pytest-ordering/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+
+<pkgmetadata>
+	<maintainer type="person">
+		<email>andrewammerlaan@riseup.net</email>
+		<name>Andrew Ammerlaan</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">https://github.com/ftobia/pytest-ordering</remote-id>
+		<remote-id type="pypi">pytest-ordering</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/pytest-ordering/pytest-ordering-0.6.ebuild b/dev-python/pytest-ordering/pytest-ordering-0.6.ebuild
new file mode 100644
index 000000000000..a6fe80e2943f
--- /dev/null
+++ b/dev-python/pytest-ordering/pytest-ordering-0.6.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+DESCRIPTION="pytest plugin to run your tests in a specific order"
+HOMEPAGE="
+	https://github.com/ftobia/pytest-ordering
+	https://pypi.org/project/pytest-ordering
+"
+SRC_URI="https://github.com/ftobia/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="test? ( dev-python/pytest-ordering[${PYTHON_USEDEP}] )"
+
+distutils_enable_tests pytest
+distutils_enable_sphinx docs/source
+
+python_prepare_all() {
+	# TypeError: `args` parameter expected to be a list or tuple of strings, got: '--markers' (type: <class 'str'>)
+	sed -i -e 's:test_run_marker_registered:_&:' \
+			tests/test_ordering.py || die
+
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/pytest-qt/Manifest b/dev-python/pytest-qt/Manifest
index 5cb4abede9eb..233de20189ed 100644
--- a/dev-python/pytest-qt/Manifest
+++ b/dev-python/pytest-qt/Manifest
@@ -1,4 +1,5 @@
+AUX pytest-qt-3.3.0-fix-file-match-test.patch 646 BLAKE2B 60a34a0a5d3e7d4cedd6e0e0886eeee5eb4bf447544a0f712e8906edc5ea62f60555917b97c143a4804fe76e5244090907abf51bf69f98c2893552115af64fd2 SHA512 ab68967a2f30acc2aaed1c8eadeee84283b469b3465c5e79d9c37ee14236ea0e2fe827ba83efa92d5d33c369298e548cea72f80109949426aa38121ba7edb45f
 AUX pytest-qt-3.3.0-skip-show-window-test.patch 1318 BLAKE2B 7e1c628c13f02d6219d752e3bbd6c54d17b54d45fe84b608093a42796ed6208f12c62a6bfc7a685cf3f445f5c4f6ca9e496d9b55b088cfddc28313e02c07d45d SHA512 27f788b560e66e0de3b9f17144cdc2a31fb9a4a270efdb490dfe106109051669d55e10072c841ce8f0aa313bcfec397ff59c6c76842a6a4b58194a03c3ff07d3
 DIST pytest-qt-3.3.0.tar.gz 113439 BLAKE2B 1eb486d2d44825058577306ed3b9ade34e6cbad0d90038fe314114bb22c82ae069c9fe66c170591de6c97bad99f5f9e0021c8b3dc38c858b8293a22c448bed74 SHA512 8b3ce7b62621c55fb319966b162cb60663c5ef290f34e62e6a9329e67f530c2bde1329ae0b045b15c99ae14f5f6a5fef9ee930475fa700922c50ee725adf7983
-EBUILD pytest-qt-3.3.0.ebuild 944 BLAKE2B 3a9fda78bae4be8b255f98fceaebc183a9319f6ba93e56b03fd7660e65842da7ea6a7b7ed96e12f6d2fb711231bdcc855385af372676609fcf53a4e9fb01d180 SHA512 bcd3d27da564f383c09083beb1ae4f5c7ecc9c55756862106aa1964cde88a3499c8f1f4c4647f22c4c4256f8eebf4520d14059b16d7a27f6eb1b2e32f3f0b2da
+EBUILD pytest-qt-3.3.0.ebuild 1219 BLAKE2B a22f09af353a6846703b7977f60dabd2116c6a566a44a31ce2eb2c8eda031d1d795a5c34ff8a0ac9ab2e22ef30d0045fd98d9c48531314e668fdbf0c47c2fed8 SHA512 7cfd33c2e2ffff7aa17f0548b7866af8fb5232391a1583103b201d835654ec96cefa48229dbb891d2bc1a167c67911cde8c684447e6e12ebb19e96938ed93d8f
 MISC metadata.xml 375 BLAKE2B 393138e315b4eae4dacb9339fbb5766e9dbaa84b7482babaddc08d524fb8b9939f6622ee9c6d09b66c61ac270fcc483fac39996a12ba87ccccf7cafd4c6d36db SHA512 9a44b6b9de4d1a61d6af9256519473541d5513cef349c15178c025dee3aaaa3f6772b1be56576411a985fcd9c70029c00743d8f577be8eaec4c5a44646c9cbf6
diff --git a/dev-python/pytest-qt/files/pytest-qt-3.3.0-fix-file-match-test.patch b/dev-python/pytest-qt/files/pytest-qt-3.3.0-fix-file-match-test.patch
new file mode 100644
index 000000000000..cbdeb80c1c56
--- /dev/null
+++ b/dev-python/pytest-qt/files/pytest-qt-3.3.0-fix-file-match-test.patch
@@ -0,0 +1,13 @@
+diff --git a/tests/test_modeltest.py b/tests/test_modeltest.py
+index ef9371c..becd3ae 100644
+--- a/tests/test_modeltest.py
++++ b/tests/test_modeltest.py
+@@ -350,7 +350,7 @@ def test_qt_tester_invalid(testdir):
+             "test_qt_tester_invalid.py:*: Qt modeltester errors",
+             "*-- Captured Qt messages --*",
+             "* QtWarningMsg: FAIL! model->columnCount(QModelIndex()) >= 0 () returned FALSE "
+-            "(qabstractitemmodeltester.cpp:*)",
++            "(*qabstractitemmodeltester.cpp:*)",
+             "*-- Captured stdout call --*",
+             "modeltest: Using Qt C++ tester",
+             "*== 1 failed in * ==*",
diff --git a/dev-python/pytest-qt/pytest-qt-3.3.0.ebuild b/dev-python/pytest-qt/pytest-qt-3.3.0.ebuild
index 1a43c9248d65..55715700f9e8 100644
--- a/dev-python/pytest-qt/pytest-qt-3.3.0.ebuild
+++ b/dev-python/pytest-qt/pytest-qt-3.3.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
 
 DISTUTILS_USE_SETUPTOOLS=rdepend
 
@@ -19,7 +19,13 @@ KEYWORDS="~amd64 ~x86"
 
 DEPEND="dev-python/QtPy[gui,testlib,${PYTHON_USEDEP}]"
 
-PATCHES=( "${FILESDIR}/${P}-skip-show-window-test.patch" )
+# Patch 1 skips a test that does not work inside the emerge environment:
+# pytestqt.exceptions.TimeoutError: widget <PyQt5.QtWidgets.QWidget object at 0x7f57d8527af8> not activated in 1000 ms.
+# Patch 2 fixes upstream bug 314
+PATCHES=(
+	"${FILESDIR}/${P}-skip-show-window-test.patch"
+	"${FILESDIR}/${P}-fix-file-match-test.patch"
+)
 
 distutils_enable_tests pytest
 distutils_enable_sphinx docs dev-python/sphinx_rtd_theme
diff --git a/dev-python/pytest-regressions/Manifest b/dev-python/pytest-regressions/Manifest
new file mode 100644
index 000000000000..6eda31adf7a6
--- /dev/null
+++ b/dev-python/pytest-regressions/Manifest
@@ -0,0 +1,3 @@
+DIST pytest-regressions-2.0.1.tar.gz 77934 BLAKE2B 4bf9868afd3bae1ab1668a6cb75bbc661336b3bd7dca23b0b6e0ab810cb60645737e45008c74a09f90763869982db5d819f170f6b251d9419681ceee810c4657 SHA512 9c35f356ef2c2914674b022b4a357ec75a4a12c8090c44d959111f1eaa1f10f492f8103098b273292bff08a5957d7f2ae3f0b0bd051438d6467ce1491f234d97
+EBUILD pytest-regressions-2.0.1.ebuild 942 BLAKE2B cf2162af0d4698fecba5b00a62549802bd1dff7303f98907cadef90e3d7f2dedfa8bee21e26b8369555376425ac5bb4dedcbc65fa3d7747469bb541b3aad03bb SHA512 fa88c071d14c80eed061f313bf953e33b02eeb313d856b4636acf72c2ac2918d72b90f865e8375e2a64c91fc5effa9293d32293cf3e2fb4ebf9c21eb1d3637c9
+MISC metadata.xml 375 BLAKE2B 393138e315b4eae4dacb9339fbb5766e9dbaa84b7482babaddc08d524fb8b9939f6622ee9c6d09b66c61ac270fcc483fac39996a12ba87ccccf7cafd4c6d36db SHA512 9a44b6b9de4d1a61d6af9256519473541d5513cef349c15178c025dee3aaaa3f6772b1be56576411a985fcd9c70029c00743d8f577be8eaec4c5a44646c9cbf6
diff --git a/dev-python/pytest-regressions/metadata.xml b/dev-python/pytest-regressions/metadata.xml
new file mode 100644
index 000000000000..d22e99d73577
--- /dev/null
+++ b/dev-python/pytest-regressions/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>andrewammerlaan@riseup.net</email>
+		<name>Andrew Ammerlaan</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-python/pytest-regressions/pytest-regressions-2.0.1.ebuild b/dev-python/pytest-regressions/pytest-regressions-2.0.1.ebuild
new file mode 100644
index 000000000000..5acfd446bdee
--- /dev/null
+++ b/dev-python/pytest-regressions/pytest-regressions-2.0.1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+DESCRIPTION="Easy to use fixtures to write regression tests"
+HOMEPAGE="https://github.com/ESSS/pytest-regressions"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+BDEPEND="test? (
+	dev-python/matplotlib[${PYTHON_USEDEP}]
+	dev-python/numpy[${PYTHON_USEDEP}]
+	dev-python/pandas[${PYTHON_USEDEP}]
+	dev-python/pillow[${PYTHON_USEDEP}]
+	dev-python/tox[${PYTHON_USEDEP}]
+)"
+
+RDEPEND="
+	dev-python/pytest[${PYTHON_USEDEP}]
+	dev-python/pytest-datadir[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+distutils_enable_sphinx doc dev-python/sphinx_rtd_theme
+
+python_test() {
+	distutils_install_for_testing
+	pytest -vv || die "Tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/pytest-salt-factories/Manifest b/dev-python/pytest-salt-factories/Manifest
new file mode 100644
index 000000000000..a93fa8978676
--- /dev/null
+++ b/dev-python/pytest-salt-factories/Manifest
@@ -0,0 +1,4 @@
+AUX pytest-salt-factories-0.92.0-setup.patch 507 BLAKE2B 6bc3f42686618d3a450d7e6be327cb8ed91c42dc18965cc4ea7a70cd8695f47ac97a517dcf7e36336512ad76d817194f940472a1c0a87838519bf17a71a428d8 SHA512 c7cadb4239ee5bf9fae9594e6612bf36878a910184ca6d98f58241707163ffe2a830b567b06ba4d7c4f218a88d5b72c3dde4387d224cb250308a1fcfc0c4ee37
+DIST pytest-salt-factories-0.92.0.tar.gz 112049 BLAKE2B 054ec70df87bb1c1ccd4217ddf66b1efa1329d95c72cc40a633b5516afbe5bc80b4210560438e039def40a5c4aec3730a36f83c7911fd3a12a7bd5d33d388986 SHA512 308a446c870528437967eb5b3167861818311683dd9c4f55af8aa1766cde29ab438e5bf0ba922933d893f1a5469af4b827c422e59adb12cb2b422302550dfdd5
+EBUILD pytest-salt-factories-0.92.0.ebuild 890 BLAKE2B 34bfdebb04f5409d9ea5732b72fd312b24d135fe3157573bde504a6141568116d8ee6dea60260c0833e7065d3b35c6b3c15e64803d9dbbd726327cfd40b85084 SHA512 08cf492cc4036ce35ee2e2028507d7f28b0892f4e8b987d9de39429eddbd67215ffe8750cd7f84e387eb0d456649d6e98d31fb6ede61aaaf0351f575632de7f1
+MISC metadata.xml 249 BLAKE2B 9e4529cdac0a55f14c36fde3fa54e30645a61a73d58e83ce460edf84d729bb3cd4cdc3e52d588690945508bc7d253b1edfb7734ebee94a88b75fee249a043c84 SHA512 ecad16da7f98e9b1cb1882147e6d8b7d541e4839d92fc26f3db1bea69ed633637da9259947b2b78d204a11d0edd3daa84f173613b6dc19110b5406c6fddfa7f0
diff --git a/dev-python/pytest-salt-factories/files/pytest-salt-factories-0.92.0-setup.patch b/dev-python/pytest-salt-factories/files/pytest-salt-factories-0.92.0-setup.patch
new file mode 100644
index 000000000000..d8d1a915a789
--- /dev/null
+++ b/dev-python/pytest-salt-factories/files/pytest-salt-factories-0.92.0-setup.patch
@@ -0,0 +1,13 @@
+diff --git a/setup.py b/setup.py
+index d7cab46..1321f06 100644
+--- a/setup.py
++++ b/setup.py
+@@ -51,7 +51,7 @@ setup(
+     url="https://github.com/saltstack/pytest-salt-factories",
+     description="Pytest Salt Plugin",
+     long_description=read("README.rst"),
+-    packages=find_packages(),
++    packages=find_packages(exclude=['tests', 'tests.*']),
+     cmdclass=versioneer.get_cmdclass(),
+     install_requires=parse_requirements(),
+     extras_require={"docker": ["docker"], "salt": ["salt>=3000.1"]},
diff --git a/dev-python/pythonutils/metadata.xml b/dev-python/pytest-salt-factories/metadata.xml
index a32d600f949d..cee379b15409 100644
--- a/dev-python/pythonutils/metadata.xml
+++ b/dev-python/pytest-salt-factories/metadata.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>whissi@gentoo.org</email>
-		<name>Thomas Deutschmann</name>
+		<email>chutzpah@gentoo.org</email>
+		<name>Patrick McLean</name>
 	</maintainer>
 </pkgmetadata>
diff --git a/dev-python/pytest-salt-factories/pytest-salt-factories-0.92.0.ebuild b/dev-python/pytest-salt-factories/pytest-salt-factories-0.92.0.ebuild
new file mode 100644
index 000000000000..371c83a76ec6
--- /dev/null
+++ b/dev-python/pytest-salt-factories/pytest-salt-factories-0.92.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..8} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+inherit distutils-r1
+
+DESCRIPTION="The new generation of the pytest-salt Plugin"
+HOMEPAGE="https://github.com/saltstack/pytest-salt-factories"
+SRC_URI="https://github.com/saltstack/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="
+	>=dev-python/pytest-4.6.6[${PYTHON_USEDEP}]
+	dev-python/pytest-tempdir[${PYTHON_USEDEP}]
+	dev-python/psutil[${PYTHON_USEDEP}]
+	dev-python/pyzmq[${PYTHON_USEDEP}]
+	dev-python/msgpack[${PYTHON_USEDEP}]
+"
+BDEPEND="${RDEPEND}
+	test? ( >=app-admin/salt-3000.0[${PYTHON_USEDEP}] )
+"
+
+# pytest just bombs
+RESTRICT="test"
+
+PATCHES=(
+	"${FILESDIR}/pytest-salt-factories-0.92.0-setup.patch"
+)
+
+distutils_enable_tests pytest
diff --git a/dev-python/pytest-timeout/Manifest b/dev-python/pytest-timeout/Manifest
index 67ca92b3ca26..02369a6452d5 100644
--- a/dev-python/pytest-timeout/Manifest
+++ b/dev-python/pytest-timeout/Manifest
@@ -2,5 +2,5 @@ AUX pytest-timeout-1.4.2-optional-cov.patch 839 BLAKE2B adc39941d090788666a5fa74
 DIST pytest-timeout-1.3.4.tar.gz 12255 BLAKE2B c8991e0255a490048f43e1163d0315cb8fabfaf9d96deb476e2d59da7efce8c63da09b1e8e6f9d6f3fe82b3c6f67608b5e5db117e6378a041ca6e5ba9c71fc05 SHA512 29af25f3c3776d9ef63c6b7217ffc6b0cedd873b8cc96be742a642da84d12c8988bb9b409e00850246e554b21908d6fd2207692650b154cf6831f38c4395bc80
 DIST pytest-timeout-1.4.2.tar.gz 15424 BLAKE2B b7ab91833e59af56ae50c066c14bb9b8ae9995d1586f35b29f107665d7da124828d7accc1b0149702f2973c61f18024739c68de736ae8aae6f55e8a10bf5d4ff SHA512 3446ecdb5aaad5fbca12df4e7f4f40c6c1a12895d3ed9f3a3ee24800ce36deed3cb8c09a4cc72220c962b06f821cfd55bf7eebbca23664c56abf2d0e5bc8fbea
 EBUILD pytest-timeout-1.3.4.ebuild 752 BLAKE2B 059b1014e51bccdddbad59eac0ad718b5523073b6b032838458ddc365897027eccac6ada911142b41d72443cbca27b9b81a248fb0d8b400bf03bcf695fb2b4b4 SHA512 0fc9cf5951d8faa9c6790ca875aa97653c6e6fdf08c73314b5c31589e891bada76e22a08da66ffdcf80b3bee2fabf706c8f7708ccf023cec0183cba33c495c94
-EBUILD pytest-timeout-1.4.2.ebuild 941 BLAKE2B 02338bfdcab14553372cf19dd990cf0cae211fa0c2f3a33b8dd8bfce2db713f8ddb11606b88005f15cbf803c607a9815aa47e0d0170881a9e2e796314af932bb SHA512 023668bf37770a54966a20bf6d1ffa44f3b87e93fdf906cb26072fe8a045c91c1f311a7a0e57199d331312061c4bcda63903d5dee4e30664091bd0ad8eb6d66b
+EBUILD pytest-timeout-1.4.2.ebuild 948 BLAKE2B ac65a7c91a09bfe029e80c49f06c4470123ad429ebf1de75b9d3b3e2e8b76b6b4a386711030a326b25214062c0e671aee98c75046bda49e431fae7e14fa82f2c SHA512 6cce0eca5e9b8d73f4d00ba5f09f2cec99dcb48d6ad74edc34ac6245aaf831838e12b2a50885a118506b80fe9d8dc1a0a507be756e47e6351822b102faa48a94
 MISC metadata.xml 352 BLAKE2B c3aa8ea91e07badacd5ac6d00f8580b4a2616b3909ce79f56e9760af95597289379072b6e4cfd65e9da4306ec0f1b0c4a77a920ef8cc10821b83ee5013c0e5f4 SHA512 3459606d8b5c8b639ce59bc18c85581076f10384d42cb00288a88159fdeb7c30cf51efec99e1696c69b69793da42ea25bab3674343629b1bd979f8836bc488dd
diff --git a/dev-python/pytest-timeout/pytest-timeout-1.4.2.ebuild b/dev-python/pytest-timeout/pytest-timeout-1.4.2.ebuild
index 2821063d3083..ceb22907310d 100644
--- a/dev-python/pytest-timeout/pytest-timeout-1.4.2.ebuild
+++ b/dev-python/pytest-timeout/pytest-timeout-1.4.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="MIT"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
 
 # do not rdepend on pytest, it won't be used without it anyway
 # pytest-cov used to test compatibility
diff --git a/dev-python/pytest-xdist/Manifest b/dev-python/pytest-xdist/Manifest
index 5e2118098bf3..0362718e9419 100644
--- a/dev-python/pytest-xdist/Manifest
+++ b/dev-python/pytest-xdist/Manifest
@@ -5,7 +5,7 @@ DIST pytest-xdist-1.34.0.tar.gz 66151 BLAKE2B ac5274e32b3ef6b72113efd4300eb6946a
 DIST pytest-xdist-2.0.0.tar.gz 65663 BLAKE2B 01f4154ae77c0ca67bef9cc0c36f9e3aea03ea554ba45ababb53647720795eae85e6c884eee6cd14037d566dc7bc46f49496aaaecfaaa31322b045339e6c01e8 SHA512 ad1e22ec6963e16f3f1408f0ed39c2945da8f8d2b332b29c36151bc1245e1b9ab532315d8315c22f93f249a64ab508fd78bccd5390be7315d962dd2382f63e0d
 DIST pytest-xdist-2.1.0.tar.gz 66332 BLAKE2B ac3c19a32bb9153537edfcf55bc656011661cf0d166da1aba969055a398616bb5782534a12ba354175be722c070fcfb2013d58405048814a3d11434a314e38b8 SHA512 85c69d8e649a19de5639738eae4cb213dc7323d96883ec82f39ab51a196346edd9fadbaf97f9763ac0dea104bc123d521264a39d2701878edfa76ce7e5bb347b
 EBUILD pytest-xdist-1.33.0.ebuild 1056 BLAKE2B 94e4bdef998cbe0fb49237c364223aa761247ebea7970720491113aaa11aaf65b8afa4cf11bae2be7ad6a980bd060bbc18ef0484c2803f67dec76fb192963b28 SHA512 64703fa61cd35fd69970c3574b38fda94fe534ab59949092d5da6551e9093596f00c0a0f896d862077f250eb8e934bc6a74c120c41c33b2a23aa2657abf8fc24
-EBUILD pytest-xdist-1.34.0.ebuild 1087 BLAKE2B 3c34ddabce31ea834e64d0d36343c57e623c6ba5993599db23e4cdbb6548c8aea84e5f2700f2bb05924ca3600d44bc5c93aaee0d4c96ef2463631c503f30760b SHA512 b5fba8ca40bdee2869a879b8309d8cac32cdfe8fabae205e543609299d1e83ca07ae9843a4f8affc3ef628eee394f7b8aebb7ab2eabc34755f121bb908da51fb
+EBUILD pytest-xdist-1.34.0.ebuild 1079 BLAKE2B 1820d596a247be18e633c0b1b344e3308868c5f30e5dbce843e55bf6205a8ebfd908968399708621adb038e2a591ce46442259e26c9ce44e8c7ed2b5c8b1b9cd SHA512 47e03af86ce46f3046ec8e9657bc5d908be52b9e746c68b1bbb01dc175782f4d9436956ab4f66c42ad162b50e5cec935a3257c2d511b883c28905a721a7a35c4
 EBUILD pytest-xdist-2.0.0.ebuild 974 BLAKE2B 787263f04153aa40ab2aaaa4387a88cf25eae00d5df9cde0540a5eb852e08413cd49bdfc0806206dc1c606dd2a319a060adea0f614049491d139b3210ed8bcab SHA512 0373a088d378678d4edfc9cff2e1ae2f3531e52c923c691436119af4c9efc87e7e2e445cbd5d2ed462bd00d67004ca492b5714975791879b58950c4c205ac429
-EBUILD pytest-xdist-2.1.0.ebuild 974 BLAKE2B 787263f04153aa40ab2aaaa4387a88cf25eae00d5df9cde0540a5eb852e08413cd49bdfc0806206dc1c606dd2a319a060adea0f614049491d139b3210ed8bcab SHA512 0373a088d378678d4edfc9cff2e1ae2f3531e52c923c691436119af4c9efc87e7e2e445cbd5d2ed462bd00d67004ca492b5714975791879b58950c4c205ac429
+EBUILD pytest-xdist-2.1.0.ebuild 981 BLAKE2B a045f87ed0cb6327e537c0333bdc1a44c4073eec64f912643dfea9fb442778b314c3f3865ea84474493f6e2f52f05b5482d03dd932ad91e684fce8624be11149 SHA512 6edc1e05d9b7a6b8093c2ee71342dab41410382f0d715994965c8c11edf6dff0e5cf4bc1b9e4fd89076c78e47436581444a9b179a50bb84c7406bb271aaf7fe8
 MISC metadata.xml 453 BLAKE2B 9480ffb520fafac8b32ec407fb065a89b67c085c7474032528e6a7489fdb26d288228cb75a502e407d92f0e53283bda58c2632e552d4daf65d37b78d33b3598b SHA512 13ec72148a023c16de4b51f02f8a34f5a29ba26bae56aebd8a89ca7a90f249126f92096d138d41d770eb1053618e58679211f468e3136f594514a936f414b265
diff --git a/dev-python/pytest-xdist/pytest-xdist-1.34.0.ebuild b/dev-python/pytest-xdist/pytest-xdist-1.34.0.ebuild
index 2cc790bff706..d71a0fb7c1d9 100644
--- a/dev-python/pytest-xdist/pytest-xdist-1.34.0.ebuild
+++ b/dev-python/pytest-xdist/pytest-xdist-1.34.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="MIT"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/pytest-xdist/pytest-xdist-2.1.0.ebuild b/dev-python/pytest-xdist/pytest-xdist-2.1.0.ebuild
index 454164201554..60bf4edb5e89 100644
--- a/dev-python/pytest-xdist/pytest-xdist-2.1.0.ebuild
+++ b/dev-python/pytest-xdist/pytest-xdist-2.1.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="MIT"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 
 # please do not depend on pytest to avoid unnecessary USEDEP enforcement
 RDEPEND="
diff --git a/dev-python/pytest-xprocess/Manifest b/dev-python/pytest-xprocess/Manifest
index 1b29b0ee406a..6ea3463dfc3d 100644
--- a/dev-python/pytest-xprocess/Manifest
+++ b/dev-python/pytest-xprocess/Manifest
@@ -1,3 +1,3 @@
 DIST pytest-xprocess-0.13.1.tar.gz 10273 BLAKE2B 0c2a8bdf5e31543b32ada50f2bb5e1a09b45de820064807bf41321638d11d6b6fea28fd2a8c795e7bc6f7ac7370a3e78988e8aee318fad9df194fd3b06cce7cd SHA512 e0ab9e13d7f90ffca1bb3646e5789582806519ff5e665e13ed0db00896d799a7828b39e7657e947783d15ec1a961b33c1c981e39069dd298bf352826dbdc496f
-EBUILD pytest-xprocess-0.13.1.ebuild 666 BLAKE2B aa2ef6c031092babb15c62282c0658df3b71164d2c34322dc803f5f5146baa7ef5bf22f42d5f83fcb1a0ce82c43df8f86fc1ffaaf5b8d990ccd417dd409f8b22 SHA512 9ecf54be79b963f91717b52e962fc9c917c924d563d7772d73fc3cb9c16b398d6f30acd17a4efb945266b6aab2267b5ae4146f130624fd65f7e9b2be7a9d0a05
+EBUILD pytest-xprocess-0.13.1.ebuild 673 BLAKE2B b6a282358b54bca204906b8bd019b4b3289d19fd602dc930995722223cb59f3a2db38d89ef0962c876309b6b0fdbe8e71c747855feacf79710f81329636edbd4 SHA512 6f7618c4544740ad3a6155b11ded14864d9ef9c83fa8a4b1795b40561f3b68a20d3f5acef607f326147a472ee7629cec6c7c85898abbfe55bb1a9f4ce86cca22
 MISC metadata.xml 424 BLAKE2B c4e4e4a90fc6e7dd7e474686b1a0215a380925523d3d41cba07cd5f59f0ce322a2e8fd10cd834ac263bcdef2d0f62bfcb48bf85373036bd8869f764ea06ef788 SHA512 822c6bb63a93d2ec81c4d7c00faa75ba7e97813f510d570385f075a1a0b641408d6323c9718ddd899fdf25b2d198204c5bba38604a593841a7cf89c44410134b
diff --git a/dev-python/pytest-xprocess/pytest-xprocess-0.13.1.ebuild b/dev-python/pytest-xprocess/pytest-xprocess-0.13.1.ebuild
index 69cd4344e0ac..058e9c690342 100644
--- a/dev-python/pytest-xprocess/pytest-xprocess-0.13.1.ebuild
+++ b/dev-python/pytest-xprocess/pytest-xprocess-0.13.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="MIT"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	dev-python/pytest[${PYTHON_USEDEP}]
diff --git a/dev-python/pytest-xvfb/Manifest b/dev-python/pytest-xvfb/Manifest
new file mode 100644
index 000000000000..39fde7714d30
--- /dev/null
+++ b/dev-python/pytest-xvfb/Manifest
@@ -0,0 +1,3 @@
+DIST pytest-xvfb-2.0.0.tar.gz 6855 BLAKE2B 338802ccbf5fc0c9ab3fccd7c172b31867cc86869dfc50dbb30daf396ecd9865e71c6486cc96c2485e2d5b6195dc2eff83a033864f88e1b2c64a3937b6b48c84 SHA512 42c2119b2c529a45b5de9f8ac2781306cfb9f00c1d0e0e9045ed40ccb7260cb6f400683802ab845ce2481dcadfcef007c8417a481e9c04f14ee1bdc68244d391
+EBUILD pytest-xvfb-2.0.0.ebuild 709 BLAKE2B 25f3aa409b21b977d83c642600acc193bcf6fe1ede05fc49d6e1b26371cf650d77c987f17835a50f0059f3a3ef08b82038f0ab2a758622b7885e2b9e99f89a9f SHA512 7299538014555557e5cac872ef79b03a44166ee01324940e17662f834a57566db26693e113713ca9fc467ad3e51e99621b6f9ae33082672d9dcb61cece439cf8
+MISC metadata.xml 375 BLAKE2B 393138e315b4eae4dacb9339fbb5766e9dbaa84b7482babaddc08d524fb8b9939f6622ee9c6d09b66c61ac270fcc483fac39996a12ba87ccccf7cafd4c6d36db SHA512 9a44b6b9de4d1a61d6af9256519473541d5513cef349c15178c025dee3aaaa3f6772b1be56576411a985fcd9c70029c00743d8f577be8eaec4c5a44646c9cbf6
diff --git a/dev-python/pytest-xvfb/metadata.xml b/dev-python/pytest-xvfb/metadata.xml
new file mode 100644
index 000000000000..d22e99d73577
--- /dev/null
+++ b/dev-python/pytest-xvfb/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>andrewammerlaan@riseup.net</email>
+		<name>Andrew Ammerlaan</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-python/pytest-xvfb/pytest-xvfb-2.0.0.ebuild b/dev-python/pytest-xvfb/pytest-xvfb-2.0.0.ebuild
new file mode 100644
index 000000000000..f6108d71158a
--- /dev/null
+++ b/dev-python/pytest-xvfb/pytest-xvfb-2.0.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+DESCRIPTION="A pytest plugin to run Xvfb for tests"
+HOMEPAGE="https://pypi.org/project/pytest-xvfb/"
+SRC_URI="https://github.com/The-Compiler/pytest-xvfb/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="
+	>=dev-python/pytest-2.8.1[${PYTHON_USEDEP}]
+	>=dev-python/pyvirtualdisplay-1.3[${PYTHON_USEDEP}]
+	x11-base/xorg-server[xvfb]
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	distutils_install_for_testing
+	pytest -vv || die "Tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/pytest/Manifest b/dev-python/pytest/Manifest
index 12527a0757ce..86d68ce4b82b 100644
--- a/dev-python/pytest/Manifest
+++ b/dev-python/pytest/Manifest
@@ -3,7 +3,9 @@ AUX pytest-4.6.10-timeout.patch 1297 BLAKE2B 3a5b4005b1aff72b17a366283e692bca19e
 DIST pytest-4.6.11.tar.gz 952305 BLAKE2B af07adf5e8fc614b1fdb7b5673fb9c557ff0dd3f22e2f3bf853c643c5c8bd38f307018579299b700d90034a826db73a3e569857d6d6f7ac6646ace894b35a39b SHA512 6fddf4944bd9fab83024aa2d338d54aaf3d164bd5c7f634357376f3b0d2dab6a43d784e7fb567236c2d2f029151c5d9e2cb36c22e9b551c2c8823c52a2246e9c
 DIST pytest-5.4.3.tar.gz 1022353 BLAKE2B 70d4f23cbbfc4c4ce63c512ee0a01556973761a6d3ebb71a6d9ed4fb4a4a21531e1b151ed0e4c5e56e5dd3243a1a272441f17c4c2c4e3b0b19c24654b74e8e52 SHA512 0a07d4f4f791969c6f21961a0ba0f8c6670e5870c6cc1cebf93766587bb9cb3e10db8e57f0bd33dd22b275f3aad7aa674949f124ac80e0ccca64e35be4beee4e
 DIST pytest-6.0.1.tar.gz 1069631 BLAKE2B 89a78ebf8e8cf968ea767fe7244408ca79d247c1ca459815ac299ce773b44c375429935c8a25b4de26349969113c60e4b6812d5aa2d805691664af74796ea85b SHA512 bdd790c3860da2ed3a3ff47f04512c3bfae4fa1e31fc6b96fc19bd57d1804a6fec968ecf17a11c5b20d30dcf82d6391ef0d893ae57a3da9ad777a15c078c129f
+DIST pytest-6.0.2.tar.gz 1070533 BLAKE2B 54397bdf8255641e1cb0555a78b3687a49376d9cc603a98b6df3415159aef0331cbaa7d0883bafbceea1b2273fc0ba5c867f7b66eef5b2b4c24f3e5196786877 SHA512 478d28c30f4f990dcdd98edcd074051e32d9ab25941c21bdc9c4cc47b726da79b5b3a01572ff97f608598ef6bb9df075ebba49abb2f1420947e0c6d4fe0be9c8
 EBUILD pytest-4.6.11.ebuild 2483 BLAKE2B e86dc097a51aa541671c6ec5570e5087337c4ee0ce32e5d06e8f9efffed3f9d1dab45a5b0509ba06be45371dc189d7dc25c5069e83986fe42a66626ee2051add SHA512 b0ec3a8f2ec77ba07b92d4ee81ff0ec65ef954125a073b771a78cb3d36cd2c0ee72bb2e8378955caa67bc0c0ed1fd0ec0e45c9cf546f926193c93039e0f1d679
 EBUILD pytest-5.4.3.ebuild 1940 BLAKE2B b17bc0f3efe70c149ee494d2528f8e16a839c4cb2965378ab6c8b37e3c1b295bab253edd8410f6f2a69cbeb288d6299898320d387330e2d7b5b31418e985a0d8 SHA512 d99fa3064053e3ac99fadce4b23749e16dc2d9e6658f3ab07b1e68c1885d9fd243f4ab4f5462e127b9afdbb957bb498c41126ce79164a31cb2accbbaa1f4b7e9
-EBUILD pytest-6.0.1.ebuild 1620 BLAKE2B 38bfa8c63fa796c384a4d301d6091a9463f7497398b4127d0e7f17ec173f062dc110e195686a64081622c0fa8d97c26d584faac4a9dbe92c661ebd3aa91dd6ca SHA512 64c74dcf6d2c9f041167cdb4b359cf618a5ed613e6c54859014a049b13d42fe4e44faabb1c79c27cef9260f0b3b17e46bb3bd2165120f81465567476f50973b4
+EBUILD pytest-6.0.1.ebuild 1634 BLAKE2B 686355683a64bef1a43e7aa49063b498685e8d9a33833d405b8d2feec664add0e96661e103a061a024394e0dc626f01786eeb625d16e4c321b7c574658d02197 SHA512 14d677aacd2fbc691dbf3b2840f5efbba75e6df0c8622a7b3e4594f2155ffa9d62ddae0e060f2b6d8b1d1c7a26c71d4ce548acc5ee9ab85fe04bf0f1153a2d05
+EBUILD pytest-6.0.2.ebuild 1639 BLAKE2B 2717ed1f35c783793700e904c29e5a94372787cc7d6b7d0200aa0c90dd8aa56818db06bf3328f449727f3a58c7441171f0df5fd49ce132c798778f65bef59995 SHA512 632c7acc6f09cce77307310a71e55f872c73528388da3113582c6cded7b9cddf77ce8c6942fa45cd35ee3f2c40f82bc05f5c004ac8f653ade0dcb673329463f1
 MISC metadata.xml 333 BLAKE2B 2155c30735de72aace8fe3e88a16c011f3961b4b644d761be31c45094f243f1eeeac1803f5a74219198039dcf1f7474531b2ec814a3ed591c59fd6d9ad5a914a SHA512 c59e04710dd640b2e7bb0214e52b05ec50367d895d057886ae9bf9342312006e7b21f5625e1c4f5d7a9e12a7f7b64a968e5371f8c2c45a8ac8b1c8ca6d39b10b
diff --git a/dev-python/pytest/pytest-6.0.1.ebuild b/dev-python/pytest/pytest-6.0.1.ebuild
index 9fcfa6c56d65..c9ea210721ab 100644
--- a/dev-python/pytest/pytest-6.0.1.ebuild
+++ b/dev-python/pytest/pytest-6.0.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc64 ~riscv ~sparc ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/pytest/pytest-6.0.2.ebuild b/dev-python/pytest/pytest-6.0.2.ebuild
new file mode 100644
index 000000000000..79c06ee7d705
--- /dev/null
+++ b/dev-python/pytest/pytest-6.0.2.ebuild
@@ -0,0 +1,62 @@
+# 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="Simple powerful testing with Python"
+HOMEPAGE="https://pytest.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-python/attrs-17.4.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/importlib_metadata[${PYTHON_USEDEP}]
+	' python3_{6,7} pypy3)
+	dev-python/iniconfig[${PYTHON_USEDEP}]
+	>=dev-python/more-itertools-4.0.0[${PYTHON_USEDEP}]
+	dev-python/packaging[${PYTHON_USEDEP}]
+	>=dev-python/pluggy-0.12[${PYTHON_USEDEP}]
+	<dev-python/pluggy-1
+	>=dev-python/py-1.8.2[${PYTHON_USEDEP}]
+	dev-python/toml[${PYTHON_USEDEP}]
+"
+# flake cause a number of tests to fail
+DEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? (
+		${RDEPEND}
+		dev-python/argcomplete[${PYTHON_USEDEP}]
+		>=dev-python/hypothesis-3.56[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+		dev-python/xmlschema[${PYTHON_USEDEP}]
+		!!dev-python/flaky
+	)"
+
+python_prepare_all() {
+	# fragile to warnings from other packages (setuptools)
+	# little value for us to run it
+	sed -i -e 's:test_no_warnings:_&:' \
+		testing/test_meta.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	distutils_install_for_testing
+
+	"${EPYTHON}" -m pytest -vv --lsof -rfsxX ||
+		die "Tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/python-barbicanclient/Manifest b/dev-python/python-barbicanclient/Manifest
index f6b3f8ca4717..942fa0eb1f87 100644
--- a/dev-python/python-barbicanclient/Manifest
+++ b/dev-python/python-barbicanclient/Manifest
@@ -1,3 +1,3 @@
 DIST python-barbicanclient-4.8.1.tar.gz 118919 BLAKE2B 0c29eb4fb3b77d6ef69051a956db1aae8cb151d07156e4c888259888f1a9a6eac0be9e5339ac9a3dee9dabcb1c06c6e835312b47bec4338b34842e71546e3e75 SHA512 836b54156e72faf7ec590d6f11ccc2ca61258da38368410fb65f448b8a0e0ea272d224f46f5c6f08afc7477197a090be77720e07e3a4cb60ef71982367dbfcdb
 EBUILD python-barbicanclient-4.8.1.ebuild 855 BLAKE2B bbb4b95739df3d82c465a747c79c4c4a76e4c7e9b132eb009ff935b8ed95090a3cc2959e237bcfca63091af1cfe60084476b448b90c782abe7229cb267f155b5 SHA512 64282dfc6743d0074594e5285801a1bbc84b965eb265380bc6b11169f7a51d05e3aecc3fe961b1d2060aabde704be06e666bea400ac5fb7bff6e5b45b3e43d15
-MISC metadata.xml 586 BLAKE2B be3884c7ffa487cd45252e4737bbbc3cd460a0e6075b2ed38439d74c66518832c2739e1826cad8184bc794ac0af6441cd900c7e3f88fe8d41361f21796f6f87d SHA512 7e03d93945bf23a92dce98fdcc0fe7f65d4b709ac5105155cffe338e979802c55c9e6e59b876e9f77cc9719c863b0ee18b2dc94e04be1230d1841e525a019cbc
+MISC metadata.xml 503 BLAKE2B cc7d84978dd3c22fd1146b3b77ea2041a96652643e96fce2429c42599b232e98291da14285a88dbdc0039c293883d6151393f09d45b5dc3d35962403235bc620 SHA512 02a04551a97b8317268a1ba7a5e1b069ddb938db982d0a017596c1b70015e137b23da758a65f2ac90860ef30a12ed014df036ef426086e61befa41bc29f28832
diff --git a/dev-python/python-barbicanclient/metadata.xml b/dev-python/python-barbicanclient/metadata.xml
index 4fdec15d6e3f..2e7e5c087ca3 100644
--- a/dev-python/python-barbicanclient/metadata.xml
+++ b/dev-python/python-barbicanclient/metadata.xml
@@ -9,9 +9,6 @@
 		<email>openstack@gentoo.org</email>
 		<name>Openstack</name>
 	</maintainer>
-	<longdescription lang="en">
-	Client library for Barbican API.
-	</longdescription>
 	<upstream>
 		<remote-id type="pypi">python-barbicanclient</remote-id>
 		<remote-id type="github">openstack/barbican</remote-id>
diff --git a/dev-python/python-blazarclient/Manifest b/dev-python/python-blazarclient/Manifest
index 89822a5d1bcf..49c3a6911d68 100644
--- a/dev-python/python-blazarclient/Manifest
+++ b/dev-python/python-blazarclient/Manifest
@@ -1,3 +1,3 @@
 DIST python-blazarclient-2.1.0.tar.gz 32950 BLAKE2B cdad6f6e60e95ba97fff6a3d54e642679e2ba203d1aadcadb8190c9fda38dab27808ffbddcfa41852dc72504e9009ec62863991f832d086d70e22bf9652151b5 SHA512 a5d2749969d354ff96b4f223d49f69333a874f167e62663edf4209879b3783d1272dc591157b5a8d1b25206e7c796aa4e0d5966de74aac4429c2ebd9670d1987
 EBUILD python-blazarclient-2.1.0.ebuild 1087 BLAKE2B 80d9ca300260aae1098ed624caa350ac4ca0426c28dfa458fd0521dee5445944f5c4008c8460195478e14cbd4953e36364d166445987422df68f6f39f1b6713f SHA512 d61a02b814dff546646f990c2e757f7eba5167f63faa031eed221d16d07b6a41307ebb0ca43fd962dc7eee487bc4c42c9719a8145da2fba0a930ea3d5ac8ce40
-MISC metadata.xml 431 BLAKE2B 360c1bd7ad09d6c8ef45bab793e3b7514de1460df7eb22fe086584940812cecfb4a626ea975de1921234de7a5c151915fb80404c9ac42ba839fd8e87e1d45ea2 SHA512 2bf14d8fa014027952f8767e00ee336955fc1ce0c16979f825f1b3be7e060a2ee4f7becfaf14e885f5f08da896dc8faa15aaab797ebb522f74db7f4768f2875e
+MISC metadata.xml 333 BLAKE2B 1a681ac99aee289a919b530bb87037df6fe53b044ce14ce3a9da3cec54a73d7fde58cf01f12678f18397d16b56c9e5bf88d289ddec4469e343d7193502124124 SHA512 a73512d246562e6591eb9c8d13759352cede7f0ae978d02c87bd72b1fe2c9b155cc3908e8489b136387bada61f1257d8e0771e01e26d998b51f9ce13c087ec41
diff --git a/dev-python/python-blazarclient/metadata.xml b/dev-python/python-blazarclient/metadata.xml
index 5791a0bcc69e..3ee70120def4 100644
--- a/dev-python/python-blazarclient/metadata.xml
+++ b/dev-python/python-blazarclient/metadata.xml
@@ -8,7 +8,4 @@
 		<email>prometheanfire@gentoo.org</email>
 		<name>Matthew Thode</name>
 	</maintainer>
-	<longdescription lang="en">
-		This is a client for the OpenStack Blazar API.
-	</longdescription>
 </pkgmetadata>
diff --git a/dev-python/python-bugzilla/Manifest b/dev-python/python-bugzilla/Manifest
index f461b9445428..5143289e5ad4 100644
--- a/dev-python/python-bugzilla/Manifest
+++ b/dev-python/python-bugzilla/Manifest
@@ -1,3 +1,3 @@
 DIST python-bugzilla-2.5.0.tar.gz 110931 BLAKE2B e7a4dc0ee00abd4bd4c55aafac8a8d2902ade116b9f35d881c3ea07441b340dc247405951b5437545720c1742f54aae3c28fe64f93191a4d7f178a3cd2db7a0e SHA512 a840db5790a7f45cdcf6ef9e261d86c6b930db30ab6340a1f351b3fd32f32e4d0f6afb68af9befef5d4e84969d568471c5c236be047f6dbab52534af3570a244
-EBUILD python-bugzilla-2.5.0.ebuild 669 BLAKE2B 346b0766609dc137684a6c68dee70895cea240eb53381a152bd8b2fb7d54a226f24bf007372e4892f1f9a29d169311050a5bd69f935bc1fe78fee79e1b68b223 SHA512 c98ea2ef050ef9bae9605166439e03ba35bf8b82e0e7fa856a8fe4de3259ca4c21b2aead64f2c44b303cb78358f7763455f9aa6f08caf97f32ec9b3064c116b5
+EBUILD python-bugzilla-2.5.0.ebuild 681 BLAKE2B 08a923ee9456774edc52255ac77f240a3a118d4d1d1b5b20cb5921d5133e5db88a81484ba561a67cff5cf4a2660d9a3de35f407021c0b6c3d4b32363794c2f4a SHA512 9fe24ff129a7b8fc92619cff76af5b143675a6c9c980556e8a7ca3e8c0745e0a460f8b2142ecc8dbf54aec671463cc5d9559f6311cc49636f829c22e64c94eaa
 MISC metadata.xml 661 BLAKE2B 71e2d61d2c3f6f68dc260f2849bcc6cc444bd1eae0ed95e0e5312ea6b362e7de644bc18573d83bde770511174f42b79d04478c8a0ab49622e66deb4d06059535 SHA512 0b31da040d6c68a84d20c171f614fecee1ebc2a01be1c6fc5480774d9ba4e47c7d8dbcb2b58ff8e2dcd56bf96a8e9b6181960173ede6e73bc9eb2355f2945ca3
diff --git a/dev-python/python-bugzilla/python-bugzilla-2.5.0.ebuild b/dev-python/python-bugzilla/python-bugzilla-2.5.0.ebuild
index 0244dcb58ba4..f997f2f1be61 100644
--- a/dev-python/python-bugzilla/python-bugzilla-2.5.0.ebuild
+++ b/dev-python/python-bugzilla/python-bugzilla-2.5.0.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="A python module for interacting with Bugzilla over XMLRPC"
 HOMEPAGE="https://github.com/python-bugzilla/python-bugzilla"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
-KEYWORDS="amd64 ~arm ~arm64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
 LICENSE="GPL-2+"
 SLOT="0"
 
diff --git a/dev-python/python-ctags/Manifest b/dev-python/python-ctags/Manifest
index 1ade0c76aed9..b9a4a7966a17 100644
--- a/dev-python/python-ctags/Manifest
+++ b/dev-python/python-ctags/Manifest
@@ -1,3 +1,5 @@
 DIST python-ctags3-1.3.0.tar.gz 54615 BLAKE2B b334b834cefb01bdbf2c061d44ef6e38070c2b3e5da6de25beb09d24bc9d5891a6892a4b0c9e8fa8f8168bf344c10880ac987e263844cb3dd21303f8c2d105e6 SHA512 3ad4433d69bd159879ff4eface5150acc8c0f609cc7597885824056ce4ec148e55ad234dffa53f07977aa3ace24846e180adce5316a2950ac8d4ff58ad128b68
+DIST python-ctags3-1.5.0.tar.gz 59091 BLAKE2B 303b061e7e660c1ed08c52fa76e4a96e288c6359167006a112de2262eff8c6bb564cb5c5ed310e091a3e88c5d5494e883020e7aa3ed900dc9a316cc8a9f597e8 SHA512 a5f1e2ff49abf9cf471a0139c1d2e1c4f836557386f394a96e67692d6153c60717df16fc7dbf832f69182270842fdc550f77194855111534c3b71b81ac94e483
 EBUILD python-ctags-1.3.0-r1.ebuild 509 BLAKE2B 286f221226367204d9d03b25e7cfad3e0ec2e049f38568d8f171c60f3a33ebae22cca3fef898e2a92a10d7f94b70de958fdc8e54e88e9723aed28ff109bc4b05 SHA512 4998aaad7c7b4c7ea182bf34021c1141c2616fc96b5112b10f1962df5f5294393e7aa1355cae82f32519a1f893fed172e9a7c583ab6bd5cbb7a7687880aa8677
+EBUILD python-ctags-1.5.0.ebuild 511 BLAKE2B ced203eb14f7f16f015fc2f7f18da86485ac59398f41ba946f7d5d9bd60fa23343d8dc17501e9650439234d237e74006e18293ab3b67d5e96a96ed5e1f855691 SHA512 9d140ba4707ac5d3385ac365b2d7ba63065a1dd757f3e89d253fc9e87ec5d8b12a4a746da0e1b1bc957633be23a6a73f42befcdd49ae986973d2c9eea6bbc2bc
 MISC metadata.xml 455 BLAKE2B af37b4a79a49f4128c7ed43a10ba5a384d5d6d4a33912cf74fb59ddbddd155184f1e47161519649ddac98556ad17cee495913321632f30a629704eabf7fc5d11 SHA512 480ef8e0ccfb6e278348ed31be811e51ec6a845c984c92d9d215d0375305278639dda7e409b66f18860ea980de149656b0dfd8111d26aaf79787e3c7a34ce848
diff --git a/dev-python/python-ctags/python-ctags-1.5.0.ebuild b/dev-python/python-ctags/python-ctags-1.5.0.ebuild
new file mode 100644
index 000000000000..ad9ef15a077b
--- /dev/null
+++ b/dev-python/python-ctags/python-ctags-1.5.0.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( pypy3 python3_{6,7,8,9} )
+
+inherit distutils-r1
+
+MY_PN="${PN}3"
+DESCRIPTION="Exuberant Ctags indexing python bindings"
+HOMEPAGE="https://github.com/jonashaag/python-ctags3"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="dev-util/ctags:="
+
+distutils_enable_tests setup.py
diff --git a/dev-python/python-daemon/Manifest b/dev-python/python-daemon/Manifest
index 5ae30671d2a8..87cb05845dbe 100644
--- a/dev-python/python-daemon/Manifest
+++ b/dev-python/python-daemon/Manifest
@@ -1,3 +1,5 @@
 DIST python-daemon-2.1.2.tar.gz 76176 BLAKE2B f8252bb3ee23b9d2a4ac33057df98720708b2a7e10c38c188c537d3c90ad641e33ba73e39f1bbfca10655e2ebd5d550179ed55d09a2f767832fa1d26accc9e21 SHA512 28ae118fd652a0a26524215568df0b16264e3a844640fe47f0a08c45c7a16be1b60d78293c2fc13edfe1402a8b5dcd72ec11101c3b53e5b66f232b7e21d5d346
+DIST python-daemon-2.2.4.tar.gz 80775 BLAKE2B 3f260993a2207e6467db03c456d9f8621d1f3252236b6d49432ff14c1039416db901feb5d405620106d02ae2ea186fd0b10183156f31d17f9f4fa62964fbd333 SHA512 9a7a4e23e126f05e4c1c503f15401cddd758c5f9195c370997060ca1bbfe71cc51d82d3ae16bcf0023c28fa50b0b8d6cd406e515b27725ffa9fec10fde3ed64a
 EBUILD python-daemon-2.1.2.ebuild 795 BLAKE2B 91acd4776b431e3db41576b8414e8aabe8b729d88bd91723878ba955c97b0d640abeed6a0bb8a5bf1ebe0a45fbddd0af45644e15f7090032d976176e474db0f8 SHA512 613a5215b2741395ed4b22255fb2d4ef4e4bfe9700b216880997891eb484692b223a77071f07baafbd7111b62f2cd63bb01b6bcb27c0b7f8198473a6ae50f7f3
+EBUILD python-daemon-2.2.4.ebuild 772 BLAKE2B 70edc4ca9768005e51a58a07d56f0de88b16ef9254a311776f8fa968a41900114a0b5d3082d33280817e6600cebc759b99baac8198349e4cb8b14754bee6eb63 SHA512 23d98e63ce7e19d73127cf8fe3697e12a13d5f1413a3efa757f5160227e886c6945596c05e7687c4864cca3d98d88d7eed16153df033ea4d5a6852758a5813bc
 MISC metadata.xml 316 BLAKE2B 413934d7b67818ac0d3ddb8c1e5040de2f3008a2e1c01efff6afa4c0aeb6bb849391bdb8730e14091c3efffa47566b831d44cd7728cc9496c6e3bbc7a6c56d97 SHA512 b3b79f6094ec59bc09c2a14e3752edc0722c0e50c9559ac59e6c1355577c1f36ff98ccf6af969d0624b1e6b8b907a7886f6daafb6c0d789a403ec402083b06a4
diff --git a/dev-python/python-daemon/python-daemon-2.2.4.ebuild b/dev-python/python-daemon/python-daemon-2.2.4.ebuild
new file mode 100644
index 000000000000..c056689964c1
--- /dev/null
+++ b/dev-python/python-daemon/python-daemon-2.2.4.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Library to implement a well-behaved Unix daemon process"
+HOMEPAGE="https://pypi.org/project/python-daemon/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="PSF-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="test"
+
+RDEPEND="
+	dev-python/lockfile[${PYTHON_USEDEP}]
+"
+
+BDEPEND="${RDEPEND}
+	dev-python/docutils[${PYTHON_USEDEP}]
+	dev-python/twine[${PYTHON_USEDEP}]
+	test? (
+		dev-python/unittest2[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/testtools[${PYTHON_USEDEP}]
+		dev-python/testscenarios[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests setup.py
diff --git a/dev-python/python-dateutil/Manifest b/dev-python/python-dateutil/Manifest
index f63a174ed5ee..ce35d0e1c6ef 100644
--- a/dev-python/python-dateutil/Manifest
+++ b/dev-python/python-dateutil/Manifest
@@ -1,5 +1,5 @@
 AUX 0001-zoneinfo-Get-timezone-data-from-system-tzdata-r1.patch 3527 BLAKE2B eb793ad1ec92a944445a405f323aae660031d63db7612856265c1afe339db4b05f40f2d6c94f988d47dd769b7835bdb2d438718a1eb6d192c3213ee7f055fc86 SHA512 e0c48ed24aadd457cddc98f30965bfebb1b9c9b6f8921fb43d065877cb1344ee7f0d0ba157f9090e2190419f04470e7acbd34c388de07e3e8b586ded7012c2a0
 AUX python-dateutil-2.8.1-no-pytest-cov.patch 687 BLAKE2B 97eb6d653a013b6fb279209804d7a82b4599ed672eb7a6b94654dc789ae3ad5e2978c9684439d94e405423c0a022ff70155c7d50f5d03a5e74cfe111a665ff7c SHA512 f4e90ed1d1cdab509a574319ae6cf0b646c2741eb05459c408caa29e1a6ca512e71a258ca8119c8e1f59948276c9e14e726b6f53cea868709bd89dea2280b700
 DIST python-dateutil-2.8.1.tar.gz 331745 BLAKE2B 9785fe93976d9bbe21d6610133e37e558cdde4062a1a738ccbf2bf80aa062882ba59c60f2b9bfc44c53e0f8fc4b5ebdd5d12b6ba54a60706576360e453b2f160 SHA512 337000216e0f8ce32d6363768444144183ab9268f69082f20858f2b3322b1c449e53b2f2b5dcb3645be22294659ce7838f74ace2fd7a7c4f2adc6cf806a9fa2c
-EBUILD python-dateutil-2.8.1-r1.ebuild 1351 BLAKE2B 0edbb96e7c12be0cf602a323e6676944f699c95cd2a6b44473616b9e3e5adca5c69027fbfdda0bcda4b3c9ce3b02e28223725bfaac179e29a9f85c382f977f66 SHA512 1a2780b105298059091e612723f9177471b9e2de65197fa784628c63b6904de0aa39e03300605bb26cb1b8c79a099cbc6d44d9e91429e499acdad2b4d50e2e89
+EBUILD python-dateutil-2.8.1-r1.ebuild 1358 BLAKE2B 436981e4f4d1c7e20d3a17dedcd4b496ff1fbe9b834b6fd3173008f5bef215a76fdcde92be25e834fda8664d7941e25380c882be05e671af6f51b4d073241125 SHA512 8eb0474355fb83d0c6cbd374876542aeb201f329745da0154f87d895ced74ae5483c90736a5767700f534291761c054ea98b2fb29eae7ed21ca152d009a74070
 MISC metadata.xml 603 BLAKE2B 1bf49feeeec3ffc2f767228a84b3f9edf53cf44d8a1df3fa8f85798c0d3ea8f448d6113d425baa6b4b342b88746133d2770b951488d602dbb175f5ff9a99ea36 SHA512 87f5ea8b8918e72b57b91d32ed103d88f93ad9fbbe0a8f3f8b8ea72627d82e5cac25246553a0cb6988af26c30841ca5a3ddccf7f957603283a1b4e455a7c6439
diff --git a/dev-python/python-dateutil/python-dateutil-2.8.1-r1.ebuild b/dev-python/python-dateutil/python-dateutil-2.8.1-r1.ebuild
index d1931458e5e4..8632cbf5e2c3 100644
--- a/dev-python/python-dateutil/python-dateutil-2.8.1-r1.ebuild
+++ b/dev-python/python-dateutil/python-dateutil-2.8.1-r1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 
 RDEPEND="
 	>=dev-python/six-1.5[${PYTHON_USEDEP}]
diff --git a/dev-python/python-debian/Manifest b/dev-python/python-debian/Manifest
index 838d808d7d12..6ddc110525b3 100644
--- a/dev-python/python-debian/Manifest
+++ b/dev-python/python-debian/Manifest
@@ -1,4 +1,6 @@
 AUX 0.1.36-disable-apt-pkg.patch 6718 BLAKE2B bd4cff4d6beb2ac85c2bc9c3b223774e9579a5d4d13ea5ce0eed55d9049a13a47dae712ee7d6165d7ab562321741bf4cc7476512ca7cc38ee23772e4855f69e8 SHA512 7937c8f21fb1e352c707cc87f6de4f6d9393ccd551007dc892ff6e2824c22bd48a66fc3c7ef718992d545b5b15f146b460ec09ba41e16f4a5db3827f30068e5f
 DIST python-debian_0.1.36.tar.xz 308364 BLAKE2B 1cc7e2844db8143a3a4cc4f59c4bbb90bb90ab024b2524335d8ab69947ffe8c64b2b41a54a5d199cd287a3d6b6a0173c75be708af9aedfeb871e354ac1873528 SHA512 3f2ca6d86f6b6d383a1628021a77d19b562b0c409d204dba4de6968d2cdd2c8fb4aa882429fa1ce6af5361352f7a51b339c481dd47937cb103a08132379d77c5
+DIST python-debian_0.1.37.tar.xz 308568 BLAKE2B 7747ed21d3d6e06d5342ace6de83b79a93c76e44e8fd6d5738575e154f6d55dacd5dbb27d0210fac6f0a9db95b6d95b1fb9106da64ffbe7f77ec9d1a3e829d49 SHA512 0c13d6ee008bdcdfc28ac35d031a8486994a79a90d6b817349f09936c798211333604fd967bfde720fbc6b089bbec8e52b8c0977c430517e6f8c23d370fdff7c
 EBUILD python-debian-0.1.36.ebuild 879 BLAKE2B 1434aae56894778870b5c252808f816daca20eb24fb5e803b060afb1a239dce1ef5ce652ecf45825d16747c33136d9b69f69ecd17b61c3e4d70c6a4da09808b0 SHA512 83b3dcfcd5afa201b4e1a7382b2d72c3712a6df3f44d99cc110dd3229cac668d318e1aa3ba215ace5c8ec2e0c76a312be347241bc1e18e096d0843afcd4324ce
+EBUILD python-debian-0.1.37.ebuild 883 BLAKE2B 1c1688cee26d16417a8040e008620e2e0c3d6afb654d644d74d1a618b5cba965dbf2f3bc07c514331eac02bbea6093f8ca1ce1f5a043e9da1e0cf15677bcfe60 SHA512 7e258417846df22482242c518a8e740ff03af4c7f4651dafda5b64536ccf0654864c820fafc5ba954752418bf47b544f21038a1de2a3e38196ab8df9b45ce43d
 MISC metadata.xml 347 BLAKE2B ec810ad047c9d21228d5a0df18b78d6935168d4e474007c9aa057bc09bef0507cab59a1d087c72c880c98a055c36c4aea3d8ecadb1f6f746a0838d5630a61b00 SHA512 acad36081dda09984a3eee3348ea00e74a61c0d330ab5a9b14f1705fd1a5af82976d57e86a027d7c7c15bf9bda44dfce21eedc4c56f6337832769f8ed8cd1462
diff --git a/dev-python/python-debian/python-debian-0.1.37.ebuild b/dev-python/python-debian/python-debian-0.1.37.ebuild
new file mode 100644
index 000000000000..0f352c156f2f
--- /dev/null
+++ b/dev-python/python-debian/python-debian-0.1.37.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8,9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python modules to work with Debian-related data formats"
+HOMEPAGE="https://packages.debian.org/sid/python-debian"
+SRC_URI="mirror://debian/pool/main/${P:0:1}/${PN}/${PN}_${PV}.tar.xz"
+
+LICENSE="GPL-2 GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-python/chardet[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+"
+
+BDEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( app-arch/dpkg )
+"
+
+PATCHES=( "${FILESDIR}/0.1.36-disable-apt-pkg.patch" )
+
+python_compile_all() {
+	${EPYTHON} lib/debian/doc-debtags > README.debtags || die
+}
+
+python_test() {
+	${EPYTHON} -m unittest discover --verbose lib || die "Testing failed with ${EPYTHON}"
+}
diff --git a/dev-python/python-dotenv/Manifest b/dev-python/python-dotenv/Manifest
index f7c102076c56..01d5b43a59e6 100644
--- a/dev-python/python-dotenv/Manifest
+++ b/dev-python/python-dotenv/Manifest
@@ -1,3 +1,3 @@
 DIST python-dotenv-0.14.0.tar.gz 29029 BLAKE2B 33db159192faf9b74439b5e98e2b9a090a68001ac19eafd2925071ac7fc1872f7ee585b575dd96615c2ef934041dbfacca7948b7a8a69419243f9823f3bf6b42 SHA512 e8f6d575cd76cb231d14d98befe8a75017c927e0de39fbffc0ecb852b2aab1ada964cf37ed51c50968a4e8a96822a794c960a058a6deb6a2f0a8f8061d0560df
-EBUILD python-dotenv-0.14.0.ebuild 670 BLAKE2B 19b2e6f076d519c7c08af127a772852f1b42beaf311ce6ab5ea9ea3acfabb55966d7a1448941b9061e293379b5cb9e64f0a7168a34c03a47caffa5e7ea8b224a SHA512 4c57e4f396b267dd5146d56c0f14a4b88c358c23202f6b7e0c32048a9f349def2c81d8084d5072d733ee36f28d9e8b06307b2ec3311e48a402ad369a59a19b62
+EBUILD python-dotenv-0.14.0.ebuild 651 BLAKE2B c0e487604fa7003386c407b5aab532be099d0f3b66903827af98076ddc3fa790e199a235f61076a3068a9b2ca2a1215f553e7446516a787d859def9eabcf7826 SHA512 91298aaf03002fc0bb3c1f20c836c326954ca6f76fe24cf1c09e7ad9d2e24d5286ea76ade9611c7af71177a3122341efea8bf34c507fc2fbb5fef45614aa6cd4
 MISC metadata.xml 365 BLAKE2B be359f891f6469f9d650dd2d0ec29e0641b3313f8dd5132462a3385d557a6cc72aab5fbf59f416c98239973630f8fa9c6e7d926b6cde078bb6535de322c033b5 SHA512 7eb826c13ed20a90b7317fad1a4647a8b52baad287c0286c3b1005c7d0ffbc148d376c8e7c4e2cb55a9af66aba6169f9a680e0f4eb8e8ad3fb7e55fce01b4b8f
diff --git a/dev-python/python-dotenv/python-dotenv-0.14.0.ebuild b/dev-python/python-dotenv/python-dotenv-0.14.0.ebuild
index 19b23974b9e8..f73be0464463 100644
--- a/dev-python/python-dotenv/python-dotenv-0.14.0.ebuild
+++ b/dev-python/python-dotenv/python-dotenv-0.14.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
 DISTUTILS_USE_SETUPTOOLS=rdepend
 
 inherit distutils-r1
@@ -14,17 +14,16 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE="test"
 
 DEPEND="test? (
 		>=dev-python/click-5[${PYTHON_USEDEP}]
+		dev-python/ipython[${PYTHON_USEDEP}]
 		dev-python/mock[${PYTHON_USEDEP}]
 		>=dev-python/sh-1.09[${PYTHON_USEDEP}]
 	)"
 
-RESTRICT="test"  # help fixing tests welcome, please get in touch
-
 DOCS=( CHANGELOG.md README.md )
 
 distutils_enable_tests pytest
diff --git a/dev-python/python-fastimport/Manifest b/dev-python/python-fastimport/Manifest
index 629e0e178082..3fe3a1e88e91 100644
--- a/dev-python/python-fastimport/Manifest
+++ b/dev-python/python-fastimport/Manifest
@@ -1,3 +1,3 @@
 DIST fastimport-0.9.8.tar.gz 39512 BLAKE2B 484ba865e749cca33df73417285e51a9117e7c905ab2922588d6eef9a64ea6b3d72de285a2affbe7d4a770ead9ece30f6242777087af1c469d59c8f2a4e1b008 SHA512 5d195b641cf6138fdbc6c75781a4a6d3699e3ada9743bbe4c4264879b2da2f8a2e995e7cc3955a5241e9c7a7f24f8114474a0a30907f86e2e335e2be4669f588
-EBUILD python-fastimport-0.9.8.ebuild 782 BLAKE2B b9051a9ce9a1f592c32161e74d57af1df19a00e20f80de38ec66b2888589530cb52d2ed70f54538ef92943abac6fc3f4b1df7734e65ff11150c2fbf043c179a6 SHA512 917f0d169e37f6f79ec21a37f0eb55d19cc83eff83e9954457e24a0a428548c6f731523e88b90a76171655251c022cc2c0c161a39e9cbd64fc2ea6a2f3798d75
+EBUILD python-fastimport-0.9.8.ebuild 784 BLAKE2B dd2b0d26c815e1eee079e5c2ea68fdd72d8d21a5353b7793f6683e645c762c8bf5377340f2590d53742429adcbaaecee4450127a4239786d6de01a54fbaff72e SHA512 e5d0f041eaa0c27d9b63cdb1e7e49b210cb88f65cae9012e4beea5e42dc38f1abcf7f4ce4888953697040247de44930a8a57df3331895a5556a9a3af6cf7e2d3
 MISC metadata.xml 509 BLAKE2B 23407a89645a4f2fbc0954f2f02eb60c74e8aaf2c7385d3d8c098e64fbf949b66f262378de964c5fae6d84db4e6e04d4000438c8cbf4d44fc629d74e2f524b42 SHA512 2242fe2ba9731aee3face6de5e7fe146ecab037b24825a7fd5ed26bbfcf4136ab50791ccaaea4bcac5a23711fdbcac30e2181a39c8d0a3d33cd7acfe56ea2f56
diff --git a/dev-python/python-fastimport/python-fastimport-0.9.8.ebuild b/dev-python/python-fastimport/python-fastimport-0.9.8.ebuild
index 2e4a3c90c52e..7c291a20c533 100644
--- a/dev-python/python-fastimport/python-fastimport-0.9.8.ebuild
+++ b/dev-python/python-fastimport/python-fastimport-0.9.8.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( pypy3 python{2_7,3_{6,7,8}} )
+PYTHON_COMPAT=( pypy3 python{2_7,3_{6,7,8,9}} )
 
 inherit distutils-r1
 
diff --git a/dev-python/python-heatclient/Manifest b/dev-python/python-heatclient/Manifest
index 537ffe8dedff..9efa96b60b4a 100644
--- a/dev-python/python-heatclient/Manifest
+++ b/dev-python/python-heatclient/Manifest
@@ -1,3 +1,3 @@
 DIST python-heatclient-1.17.0.tar.gz 172475 BLAKE2B 79dbaa2b6f3bc5e97ac4f2630e3e5ef5a320b7b37b1abdfee5ce66df6c63c9d488770135ffdaff53d3e88f93becd8f26019c4c1967624693c9c0ce1479055181 SHA512 44a16f32ede251c36546a0dcab2ca2ca0e145ce924f257c623cc375e52a851094639529a77d770d2703e28f9446e27e03424240fdc0272096e91703180dd6190
 EBUILD python-heatclient-1.17.0.ebuild 2333 BLAKE2B 2c45e4b0c3ae93445e1bb463feabb669ae69ac85bc132378bbe4c11c2fec8eb6bca06ee5916b787bcf745309d21f74c953795a31bdca8e8f65dab6201cec1ce6 SHA512 7a530a7c4c68fb4dd2dd0ea0ee370abd8e942744ffc7601320677c9b77e2a3e5be61f3e44bd04bd5fa170aaa93c172cf64cd17461dd0d3095d0d37869229b9c1
-MISC metadata.xml 582 BLAKE2B 51e093bfad4008e3d662b8eb5d3714815f7ced2ce68867b2b4dddceff4cad927a60b84706dbb14a36609720e96259a744460a3cd82a068810e1de6173bcf7dc1 SHA512 b0af42a00c8e7e226f912a056edf53b3fdaf356457fd76edd34cb243d45e7f6427fac8bebd39e1aad57c0d16da8e222b3c6414fa9c5b85728294032afdf5804c
+MISC metadata.xml 457 BLAKE2B d768c02f5d9f1373bee1b07041846d8f19106faadc16eb3ba246bed343be8538b77653b4cd7bfe12d3368567256c6a509d39b33bcb225556caa892c8aef226e8 SHA512 98a578c3f7835c7560184fb171d8052c202e9a708e1b2132b60b2359d52b7003a301f8390e9f3439b09a060257983e5927d0cea8dada6348b9ebb78ee9bbb4dd
diff --git a/dev-python/python-heatclient/metadata.xml b/dev-python/python-heatclient/metadata.xml
index 646822e8986a..7b130c7316f2 100644
--- a/dev-python/python-heatclient/metadata.xml
+++ b/dev-python/python-heatclient/metadata.xml
@@ -9,9 +9,6 @@
     <email>openstack@gentoo.org</email>
     <name>Openstack</name>
   </maintainer>
-  <longdescription lang="en">
-    This is a client library for Heat built on the Heat orchestration API
-  </longdescription>
   <upstream>
     <remote-id type="pypi">python-heatclient</remote-id>
   </upstream>
diff --git a/dev-python/python-iptables/Manifest b/dev-python/python-iptables/Manifest
index 5e19227bda28..5286b74487f4 100644
--- a/dev-python/python-iptables/Manifest
+++ b/dev-python/python-iptables/Manifest
@@ -1,3 +1,5 @@
 DIST python-iptables-0.13.0.tar.gz 83456 BLAKE2B 9c8da40437d408c6bb49e700b8d1663e7fdb0a1001b15409cf4c8b9edf612f75eb546207bc86d0535f8fb3744e42244f3e067dff80037c5a3eadc028ec8024f3 SHA512 1693924b8ee79b3b0929b57e86908282d53d28044b063d7bd169a6e9c1b45b5b6b4a79e54d024beedbfd6e42f88417eb2d0312bf90895702a3b8bfe2c2eb22b2
+DIST python-iptables-1.0.0.tar.gz 52245 BLAKE2B f61cf655440a40c96e49452caa1070046e539313ce709c629cb93c11ac66d51dad5fb11c183a8babbba5766b8bea27d0ab604d7aec104775371791cedc2262f6 SHA512 417ebec4391c6967f3b1cfa56d79dc1c6d053570d71bb29713ed327ee1fd52e0be9c3b9a62a1ae666644bbb472e5174402584cd5ddfb0b24c11e1d30773bcea5
 EBUILD python-iptables-0.13.0.ebuild 919 BLAKE2B 88a236355660ed1e9ea86584735703a399b623dc43c62a6087efd1412dedf586f325b2e3aa1d525998cad9cbd36bc8f4b1d1b26f0741a60427818c3d0ca52d08 SHA512 33021e2b05d79e023059a033bb296c274ea7c300d5430b450b0473843f886dddc6042ad39454ef0b7b477fc12b005e74795fdc2d603336b627115a85d5168818
+EBUILD python-iptables-1.0.0.ebuild 714 BLAKE2B 34ef04307c585ef473a9371556d37c31c03e89e638d009073306632994b4a4d63f711c342438832719a2f85546aaf60f9781ec990f816479217c191f664eed64 SHA512 b36c480bc7d0a08aa971ea47b6e676298c8d1b5ab918bfb1c619b154bb6bebd87a0f819f1b97bb9334e05a6665c1c2ca6be10d5a6701932c09f4a3937840d3ca
 MISC metadata.xml 1340 BLAKE2B d7f6bd56d29a11e19dc402343c03007866bfa0e33415317d866bdc9e7b76bd2cc35238270db24299cb31986166044f5bbc84d90efa37e9fad36fe8b16ffc3e03 SHA512 90c875cee0c4ea9e2f34d509152cdd4d83a41010b8a858515fa3bc766bb0ba11e047957f4c005fdaf2e49b088df78cb3b4414a5ecfdb1b6ded550eb6c9dd01d9
diff --git a/dev-python/python-iptables/python-iptables-1.0.0.ebuild b/dev-python/python-iptables/python-iptables-1.0.0.ebuild
new file mode 100644
index 000000000000..53037c8775b5
--- /dev/null
+++ b/dev-python/python-iptables/python-iptables-1.0.0.ebuild
@@ -0,0 +1,28 @@
+# 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 bindings for iptables"
+HOMEPAGE="https://github.com/ldx/python-iptables"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="net-firewall/iptables"
+
+# tests manipulate live iptables rules, so disable them by default
+RESTRICT="test"
+
+distutils_enable_sphinx doc
+distutils_enable_tests setup.py
+
+python_prepare_all() {
+	# Prevent un-needed d'loading during doc build
+	sed -e "s/, 'sphinx.ext.intersphinx'//" -i doc/conf.py || die
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/python-jose/Manifest b/dev-python/python-jose/Manifest
index 101fb15b9645..4e11c002e755 100644
--- a/dev-python/python-jose/Manifest
+++ b/dev-python/python-jose/Manifest
@@ -1,5 +1,5 @@
 DIST python-jose-3.1.0.tar.gz 101693 BLAKE2B 1ee43ac5aef673f32c3d56e492784e28939b8f74a8232a83d31381b3f978d96ab132c94527df686b52f60c2865936ce022c2cd31ea66f009a83772d1389a7d4a SHA512 c4a04bed8fc17d65cb8fc9b2cf37996edb50fa0dcdc2dedd76a97c784f8af34a9c86748ea2f9ea348955ce780035fbe3a756abc8e1eb5e9b77ad57d411622c6b
 DIST python-jose-3.2.0.tar.gz 102183 BLAKE2B edc0b0e651ec63333345eb29e0c08649823d8c59e88e2f39127081a04c2afedee0ae1c83709dc45bd81f4143cc0e1e76d22117ea11160ab6418372c69f1b216a SHA512 f81e0284ef2df05a5b2dfc5448f3cce0c8988c4ba5d40f935666ee1693a964db3db62609a38192e317bab6b3945fc5c3122b59f373dbc308363d123ea9752efa
 EBUILD python-jose-3.1.0.ebuild 1077 BLAKE2B 1671774b5403290ae752bcfc1e5f1194093687dbef6895936d15d07885c637853d01ed69adb2f1535081490b6253e90322383cdaa1171fda0f75d116f2405ddc SHA512 62cac143d24c40a91a1abf8f05de81fb5ef9e5a11851217366001b686d6b0273d3542c2ebb166c25114d41af6be34a58389bbfa3cc7827afa8701d40a51ddb16
-EBUILD python-jose-3.2.0.ebuild 1079 BLAKE2B e50eed8b6c4a6f107f5bd73523d1ee2956cc6133a6c21afdf110e6b7b4452ef4f88f995e9251e09045ce9a1e7646ebe62b0749959754c56a3bd8e493b9544935 SHA512 1d5d82f7c2b2cbce20871699f69217b36c75f9c30588693dcd1a032fb1657fee12a4244d201f5a9e98d006792c5b719165e343803622cb6a1f4c1d7393c28ed8
-MISC metadata.xml 545 BLAKE2B 239d505d9411dc5e1f129f6f7c922d9e2ceb541b1d1706f75aee921862af80c94372100145eea73b3d25649c97371f83d6278ef4ef9de65fc1049eaca1f4bf88 SHA512 8192d2511a4a14c938f5a6e877b83ddc850982a9f2e07212bad1da48e7eab9a698466caa8a31780f37bb82135eca7383eee62553f21b5b7304bbae8e2eaba1d5
+EBUILD python-jose-3.2.0-r1.ebuild 1109 BLAKE2B 15f5c7ac6f457aac9d8ccd2ae9a82a83c8ce5ac37f28ac562b6087d0f59e6f43fee444fe6a4190ccc31b3c07753a45bf07d14c10176e0e18765c5f71302ad6ca SHA512 41c921b266dc13bb5e99412f0194ee92dd94139fdadb055f6f2191440d9f2fb61cb25e4ec4e37e87897066540b23018d4d3df4b09d4742df3462c6c940ab03b5
+MISC metadata.xml 569 BLAKE2B ded16eceef718c98d5b51e15f3342262f07a57626e4f83cc851d0505112938351c0cb01e74bd9ac2bd190b2ee3f1ef4c5b748e37c7128e9b1861a48d2fa6e3e5 SHA512 9d2dee6efdf0bf24fdfac3b55a213331ec0696e58f8f101758efca0d56477c666ebd0184a573ce53c93cd00047b06d33f9bc4de33a43f96562f77a8c21a65747
diff --git a/dev-python/python-jose/metadata.xml b/dev-python/python-jose/metadata.xml
index b5a80bcad542..5712954ba036 100644
--- a/dev-python/python-jose/metadata.xml
+++ b/dev-python/python-jose/metadata.xml
@@ -9,6 +9,7 @@
 		<email>python@gentoo.org</email>
 		<name>Python</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="github">mpdavis/python-jose</remote-id>
 		<remote-id type="pypi">python-jose</remote-id>
diff --git a/dev-python/python-jose/python-jose-3.2.0.ebuild b/dev-python/python-jose/python-jose-3.2.0-r1.ebuild
index f46dbd7c1edc..b2ca73861572 100644
--- a/dev-python/python-jose/python-jose-3.2.0.ebuild
+++ b/dev-python/python-jose/python-jose-3.2.0-r1.ebuild
@@ -27,7 +27,9 @@ RDEPEND="
 distutils_enable_tests pytest
 
 python_prepare_all() {
-	sed -e '/pytest-runner/d' -i setup.py || die
+	sed -e '/pytest-runner/d' \
+		-e '/ecdsa/s:<0.15::' \
+		-i setup.py || die
 	sed -e '/addopts/d' -i setup.cfg || die
 	sed -e 's:test_key_too_short:_&:' \
 		-i tests/algorithms/test_EC.py || die
diff --git a/dev-python/python-language-server/Manifest b/dev-python/python-language-server/Manifest
index a256e5b83f6a..2c1d8e728835 100644
--- a/dev-python/python-language-server/Manifest
+++ b/dev-python/python-language-server/Manifest
@@ -1,3 +1,3 @@
 DIST python-language-server-0.34.1.tar.gz 70238 BLAKE2B 55ec41875907bb6c09f682c8ce6165e7e2fab5d03c3d4758bcbe658968aeeee7f0316a472efe68ddd87872b0e2d34908c8a7e9528aa5eec6d3359b2565a2cbbc SHA512 12404753f4271ec3606cee535ba8e886037bf0c61cc5c4415358066be837e2248f6393124340551387cba7351dee924b4f5ebc9c4e35b1ab0943067968967a90
-EBUILD python-language-server-0.34.1.ebuild 2329 BLAKE2B a91a2877912e64dcd1561cf5770fdd12e71c175cc2179c27983f4dbf3b76b4d1afc941c64ff80e5f7846781e2a9172c8d27b413bcc32164ee74c1ddc46878f0f SHA512 40af5bcda777ae3645ec2f551fceb68613bae70cfa2f86b8c57d822f4c330a5bd14fd6902e02fc0fb775a50a7312322955faa7627830367a42255a17b1f52f29
+EBUILD python-language-server-0.34.1.ebuild 2333 BLAKE2B 769f38ef10b364ffa0f780a61879a558b7c29e79b7e8036d6965804c891b908240cdb7f976e358588c3f1739f81e5928d518a89a3de2b95ee0ee3f9ae6fe953c SHA512 ee9b21699c16bd8ad745139d99f27ef38a61183a86dfe5d431d8b708734da7917fff0ce6e19bf3ce4feb90656ee758c5214fa0d07e4dc4dd6e9e59efd1d11338
 MISC metadata.xml 412 BLAKE2B 1c1563b175b955ba98fa211a2277e49347a6e3bdf4aa4fc585a2eeab65b080e2b63ddaaac5958521f9e421ac3c0a8bb5872416e0186490b0185eea76d527dbab SHA512 d5cfa13aa12b5612ac426563ec40fe585231a3a599b91490d81745c5b77c9ea603335fedfac9d62e810694e25f2fa5ed71e47e13c85cb75db57c116db3164225
diff --git a/dev-python/python-language-server/python-language-server-0.34.1.ebuild b/dev-python/python-language-server/python-language-server-0.34.1.ebuild
index ecdf65416d5b..03dbc1d1dd8d 100644
--- a/dev-python/python-language-server/python-language-server-0.34.1.ebuild
+++ b/dev-python/python-language-server/python-language-server-0.34.1.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python3_{7,8} )
 
 DISTUTILS_USE_SETUPTOOLS=rdepend
 
-inherit eutils distutils-r1
+inherit distutils-r1 optfeature
 
 DESCRIPTION="An implementation of the Language Server Protocol for Python"
 HOMEPAGE="https://github.com/palantir/python-language-server"
diff --git a/dev-python/python-magnumclient/Manifest b/dev-python/python-magnumclient/Manifest
index 72fd35185bef..2cf75efce8c4 100644
--- a/dev-python/python-magnumclient/Manifest
+++ b/dev-python/python-magnumclient/Manifest
@@ -1,3 +1,3 @@
 DIST python-magnumclient-2.12.0.tar.gz 106073 BLAKE2B aec03c74429b1934ea46aa8109f4f779aa06281136eab2ad422c851ca347f6703faec9feadb7bc49423b4e335cfedb3ebecaddaba7c9cdb32e8a8ca0de9118ca SHA512 a6d8790b87801ca313bb119e75490cb2913a11558925b6a49e276a7bfed102cf8e575f344fce8e31223f835c4961c50c2918844689ef88ef34c72c8a1032f340
 EBUILD python-magnumclient-2.12.0.ebuild 1558 BLAKE2B 0486f7e5370bbcd5d89038634b13ab9968e0947b810945d5cf57a7ca5fa4fcef7b4ffd9db591523af5f00976a09626d69ec6d9975f5ceccc912976ab83a49518 SHA512 8854d7c42f303992bc5c71daec5902ea64fd06440ef94a84e854b137633e77fda540254c8dc44437d4a837500ad5fc6742e650d888fe9a413566bab412097942
-MISC metadata.xml 610 BLAKE2B 532ff58caf9789485db0e81caef4e9bfe6332e0194b15cc9058084810604a75622e405eb4199d90ff9b9f326a51fce96757772ab722dc683b65648168e6f3090 SHA512 598aef60abc1d45b3c6dd00f3db16a6effc1dd826e98d349348b422c9a4f1926f79531e9f3ccf106f934d59fef499bb0e5a1b3571d702e66a8d78dcbb90e3e0a
+MISC metadata.xml 512 BLAKE2B 0feb01af1cde1b2c2f25a8b7b508a7c606fddaf9e1e083aeb48ebad7f19de96927becff62ca4d6e0a82a202be2b75eae0f87750d864ef10541e1f63acd4e8dcc SHA512 a43116c6b379e8e9372d4a5304c226f500d58c7f01799ce2274de268ad572b80fab7da24ca0ce4994e91f3c1e948eee156bf8487824e95479b952c60520d07c9
diff --git a/dev-python/python-magnumclient/metadata.xml b/dev-python/python-magnumclient/metadata.xml
index cadd7a84e54c..613fd157a4e8 100644
--- a/dev-python/python-magnumclient/metadata.xml
+++ b/dev-python/python-magnumclient/metadata.xml
@@ -9,9 +9,6 @@
 		<email>openstack@gentoo.org</email>
 		<name>Openstack</name>
 	</maintainer>
-	<longdescription lang="en">
-		This is a client for the OpenStack Magnum API.
-	</longdescription>
 	<upstream>
 		<remote-id type="pypi">python-magnumclient</remote-id>
 		<remote-id type="github">openstack/python-magnumclient</remote-id>
diff --git a/dev-python/python-manilaclient/Manifest b/dev-python/python-manilaclient/Manifest
index d6a399a59803..ac5e62ab9e7e 100644
--- a/dev-python/python-manilaclient/Manifest
+++ b/dev-python/python-manilaclient/Manifest
@@ -1,3 +1,3 @@
 DIST python-manilaclient-1.27.0.tar.gz 214632 BLAKE2B 5a0b6433712ae34f52b72838a771a6e81c7c28ff0b049f208bdf9b5fd311025ebe90e850b071def454f76245f19a28b27fea5dda59473f445e9882917eae90d9 SHA512 0dd621c8ff22abdf81177887fc8bc7b9792d637eabc092de06d5059ed3fcea0218961643a1e5256fd130e5d1753be143b474342d9daf5c8e5e39c305527ad811
 EBUILD python-manilaclient-1.27.0.ebuild 1421 BLAKE2B 81aba1072dc225c16c341c574da784fb2c9d216a3b9c0177a87db9af5eff14fa8520c3baff5cbca8d32cfc55f44c37c42d2949c9112cdcf84ed289c9806b9b93 SHA512 c448e9e7fe59e1303146809e43abcf173aa5e492472efc5a8e55682a2150022214b396df6a6e92a8743442640f08d3f04e4bcc6595cf16d77116b1d3481ea543
-MISC metadata.xml 610 BLAKE2B 9ff81f126608795602d31173afdff53356b7dd97c211523dce93af86ab9dc0d57c84117401a72fbfc2c2fcc6467d0e1a0adceb7c1616c6c0cc9294945fd987f8 SHA512 917b1ad570615b9d3a509c55e7ab70d88f47cdc7efbc9cf0f141be5ef5316141d0327050b61f8a64a87836a409b08ae410886a8634a8df137cd032bf1c205208
+MISC metadata.xml 512 BLAKE2B 63e9ffe529d70482557f026318ecf6362cd8c369610a7f1759da10193c6e54a1aade77adb392ba6f94abbb2933826d72a9dfc6b9f92a94d9f32a9f12663b6270 SHA512 3d083565c78c40429b2c71539c8e626cb4896a9a75a308588a43d59abf7d29959abdbdd069a4c013e04ea45857ef32118344bd60d7a3019107242c03ad825b5a
diff --git a/dev-python/python-manilaclient/metadata.xml b/dev-python/python-manilaclient/metadata.xml
index 550299559b45..c04205840a7e 100644
--- a/dev-python/python-manilaclient/metadata.xml
+++ b/dev-python/python-manilaclient/metadata.xml
@@ -9,9 +9,6 @@
 		<email>openstack@gentoo.org</email>
 		<name>Openstack</name>
 	</maintainer>
-	<longdescription lang="en">
-		This is a client for the OpenStack Manila API.
-	</longdescription>
 	<upstream>
 		<remote-id type="pypi">python-manilaclient</remote-id>
 		<remote-id type="github">openstack/python-manilaclient</remote-id>
diff --git a/dev-python/python-mistralclient/Manifest b/dev-python/python-mistralclient/Manifest
index 09beb8e37f34..9609e98dd4da 100644
--- a/dev-python/python-mistralclient/Manifest
+++ b/dev-python/python-mistralclient/Manifest
@@ -1,3 +1,3 @@
 DIST python-mistralclient-3.8.1.tar.gz 95616 BLAKE2B bc7185522b24e30321c5f57b6bc31cf239873343bce66e901e8928aedbc3caef36102a8ee67e01f6b46f77cc0d708006ac69ec4147a22b72e52e01441e39eec4 SHA512 ccde34b3ac6e12137d57dbfce597a8f9c43824a8b2450af15ab065fe03469edf0787a2b91c8e5e1da78de5d9d4d20213701e992d4c41e61c459fd987461d5298
 EBUILD python-mistralclient-3.8.1.ebuild 1288 BLAKE2B fd29cfffc645bb4c30faf1658edcaff9c7aa58add8ee900960769a4cb5d817fa466d985ff3a5a53bc70dd3c82224c943dc1d1fccf5b4dc75f57e29b962e95e6e SHA512 8c68eb012ae43ce119c4ac078520c2ce24fae024e882a71b4e3fb9404480025cee35066c6de981f503e8f125f2a6c75cc4c5a0c9216583bc80bf529a6add53d1
-MISC metadata.xml 635 BLAKE2B 7d074b84873590ac98f48bfde93536bca796bf1544ee050a900f0e6dcaf9fc4f48e47dae31201e530cefe1cf58343d4bd13a07c0cb4314b05636c732e2ae47c1 SHA512 f3e92e2bb38afdbfc7605c5244d6f60b0c72843617197e7bdb08031d69ca283b544b88af340ce75382bf2135150f9314eaffbf1b0e45c16a9434e15c89131622
+MISC metadata.xml 532 BLAKE2B bd20623ebfedea698515ef0a7eabf894f49da2f9dcc521939a249c20e4de991e641494fec76837c46e4974473662e44bcf38081a2a5dd84206239e456cbcae5e SHA512 1d9da81a99200bc15e158f8ba4c3774b0880d393e91e8fe7eff63eb14b22de230fbbde947e7c5cb5c59c42204dc518b468bc84194c5ed86e4a2472b816ed5c4d
diff --git a/dev-python/python-mistralclient/metadata.xml b/dev-python/python-mistralclient/metadata.xml
index abc88fce0a7b..5fdf08e55bc5 100644
--- a/dev-python/python-mistralclient/metadata.xml
+++ b/dev-python/python-mistralclient/metadata.xml
@@ -9,9 +9,6 @@
     <email>openstack@gentoo.org</email>
     <name>Openstack</name>
   </maintainer>
-  <longdescription lang="en">
-    This is a client for the OpenStack Mistral API.
-  </longdescription>
   <upstream>
     <remote-id type="pypi">python-mistralclient</remote-id>
     <remote-id type="github">openstack/python-mistralclient</remote-id>
diff --git a/dev-python/python-monascaclient/Manifest b/dev-python/python-monascaclient/Manifest
index acfb7d51cb5d..0b5f2d245036 100644
--- a/dev-python/python-monascaclient/Manifest
+++ b/dev-python/python-monascaclient/Manifest
@@ -1,3 +1,3 @@
 DIST python-monascaclient-1.15.0.tar.gz 46868 BLAKE2B fe78e21e0324f6a4b95d8583c43a9bf166896b3e610ad884d278208cd3e5597038c7a04b96f5e3ad6913e2a23c13dbcb4937bed05982a12c154cccae6698adda SHA512 d9378d01d78742e26abfc82ffcb13d64451ce10e6d3182a03893f21bcc76e9b961c3daaed6d9635b6bc709e5782f44e20485b53468bb2d825d64b18c6b9bca50
 EBUILD python-monascaclient-1.15.0.ebuild 1235 BLAKE2B 9fc99a90cb93c1f6e7d2b24196de5095d9d65f260ff3eecaa1994353e5fe9dd727137c888efe3e1fbf96009024b7b5a3f49da5dc19fc56800b3162e3d48d8c20 SHA512 f2a6ad0acfe95c3cd053e4380f2d4603a0dcadec7a9413f32f0acd8ae60e7bdbce86593186ff25210a2c27e8fd486dc5058cb0928a77b00c05c25328c8660557
-MISC metadata.xml 635 BLAKE2B cd2cedd1168ce9005dc1a4da260be2501333a5d93a5b82914d729a4a6033aa100a99b83c54695e1e28297883cc8ace8eeba9946c04733a273c79f80cd210afa9 SHA512 48ee0716888ea7082498f9e62a76c9b422bb4595b24ef612f771e93ad634ead94a25eeb77a1dcc89c49bc1fdf529d2e40a3083e273e4155f231c5be6e176fbda
+MISC metadata.xml 532 BLAKE2B ab2caf530aca8820ec1b2a83c98c39dd718d2b79cc8da46a31a89408893e0ca3961a1ebb926d9ff5bb0e7b3407b765a8b6f92eca944c01aa884cf06b0a1a9f51 SHA512 1fd099d1de3917f1d823d12558aeb610b814a61b23a9d8b56225c12f895d797fdcce414ffde7317a504f994a390845a3b8e0228c5ed9c393c2889ff305a4f5d0
diff --git a/dev-python/python-monascaclient/metadata.xml b/dev-python/python-monascaclient/metadata.xml
index bf1c1f8f17b2..5ee1512f006b 100644
--- a/dev-python/python-monascaclient/metadata.xml
+++ b/dev-python/python-monascaclient/metadata.xml
@@ -9,9 +9,6 @@
     <email>openstack@gentoo.org</email>
     <name>Openstack</name>
   </maintainer>
-  <longdescription lang="en">
-    This is a client for the OpenStack Monasca API.
-  </longdescription>
   <upstream>
     <remote-id type="pypi">python-monascaclient</remote-id>
     <remote-id type="github">openstack/python-monascaclient</remote-id>
diff --git a/dev-python/python-nbxmpp/Manifest b/dev-python/python-nbxmpp/Manifest
index 518a9f5eb948..4705f79eea06 100644
--- a/dev-python/python-nbxmpp/Manifest
+++ b/dev-python/python-nbxmpp/Manifest
@@ -1,5 +1,7 @@
 DIST python-nbxmpp-1.0.0.tar.bz2 111378 BLAKE2B 1dd0fff8e14bb438727a05ba0bd3db3613d91fa08f593cae3e77aec6240ece41a403a324aa3fee89e3173703f185e65e875aa1a49d877d2fc0235d664af9d083 SHA512 4eb1c4ec33ea4008b8ef4cf57e2a7a63450008974ae109af70455a49e716ea5ad612629fb2c7e0b06e69a77ee28b592a089469a645ecdd1bc2160a907804c2ac
 DIST python-nbxmpp-1.0.1.tar.bz2 112700 BLAKE2B ea0d271961a7e15a374cafa42678429b9f3395a8921f7cb92ff20664adf17f0482235240f0f849e8492d20aeb23d99eabfb1375eaeb48d55bf81aed4e3d702a6 SHA512 f3bda30b08e48ce59c19b705d45efe13286b4f8a27f44a60fe5759f9e7915beb655166d240ed1f875615f5995764a28a3c5f676e84068aab870f32ecb7d684a5
+DIST python-nbxmpp-1.0.2.tar.bz2 112977 BLAKE2B 950d0046e0c01b3e501ca36fbe6e50e383e807d866e83b64d011c4f398d89e6feb2adbee52122a43b307b6c231693d1e9cd2dad36c580ec40c26c1301886a83a SHA512 a20f5e3f55ec6afe2f8846467c45740a3acff2c9f7e3c94ca000113a6f95486abcbb73e78a12901039d019179afb0611e83c245357614474f42286d8f95803d6
 EBUILD python-nbxmpp-1.0.0.ebuild 542 BLAKE2B 4bf7d26b351b76f4f4d22b9218d7a86ca565f10628aa422468579065ff7ec7394ff10606b834ac357ad2788ad4951b850a49c47dbf09d197c29977946ce2079f SHA512 41c82248248fcfd63ed1aee3a08440edbaf65edb0ce702f5fa1b3022109481ee1f5f68d3017eac19fa0730fe34e9631bd1144851256beb8b1cc53a253f163e16
-EBUILD python-nbxmpp-1.0.1.ebuild 543 BLAKE2B 92034d3ae5b060090b02fcbb4db9122d9f2609421fe071b74a077c3b5f20658f96fdcaa17206da34842b66ab3d23251a68dc8d63ec818a14da5e0a48a2d235be SHA512 09afb2000ce3d093d1e29a3c346264fa5a5d3500351da2fc23c982ba670ec3ad13c6f8f92243de048c42a7a49a49066f737e627c9c30395ddca9bde23c0bc19c
+EBUILD python-nbxmpp-1.0.1.ebuild 542 BLAKE2B 4bf7d26b351b76f4f4d22b9218d7a86ca565f10628aa422468579065ff7ec7394ff10606b834ac357ad2788ad4951b850a49c47dbf09d197c29977946ce2079f SHA512 41c82248248fcfd63ed1aee3a08440edbaf65edb0ce702f5fa1b3022109481ee1f5f68d3017eac19fa0730fe34e9631bd1144851256beb8b1cc53a253f163e16
+EBUILD python-nbxmpp-1.0.2.ebuild 549 BLAKE2B 5d04455810ce5c1104074b08db000972274564fc30906a8d04a30abb860b1f097db7df3e02c60be3c9506a06a0f49b6109eae90947da059ceba20824feb1222d SHA512 b59356ccad48f102db6e8e1c43ad69e78c0695f55d7a95df2e6e7a58920537688345ffedd24758577999f661df29ee31853967b996617979dd81685957891a19
 MISC metadata.xml 425 BLAKE2B 6dbbfb9cbb285e3c60d69855db7d3d6f098c1e7eb9b26e3accc70b79e440450add7984d64271bac57aaa029ac375e3b98f028866bb70043ff12dc010de6eaa51 SHA512 7f93c232860052e3ddbcf369a7234790125a2ab1831624f80a07a1b34a11c261f67fa88ca13549b1cce774d6b58899d2b6f2e0ae60c0fdecc6d1b4861d2c41ab
diff --git a/dev-python/python-nbxmpp/python-nbxmpp-1.0.1.ebuild b/dev-python/python-nbxmpp/python-nbxmpp-1.0.1.ebuild
index 5081ffeb86a1..d834f82c670d 100644
--- a/dev-python/python-nbxmpp/python-nbxmpp-1.0.1.ebuild
+++ b/dev-python/python-nbxmpp/python-nbxmpp-1.0.1.ebuild
@@ -13,5 +13,5 @@ SRC_URI="https://dev.gajim.org/gajim/python-nbxmpp/-/archive/nbxmpp-${PV}/python
 
 SLOT="0"
 LICENSE="GPL-3"
-KEYWORDS="~alpha amd64 arm ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE=""
diff --git a/dev-python/python-nbxmpp/python-nbxmpp-1.0.2.ebuild b/dev-python/python-nbxmpp/python-nbxmpp-1.0.2.ebuild
new file mode 100644
index 000000000000..5e6d216a70d9
--- /dev/null
+++ b/dev-python/python-nbxmpp/python-nbxmpp-1.0.2.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9} )
+
+inherit distutils-r1 vcs-snapshot
+
+DESCRIPTION="Python library to use Jabber/XMPP networks in a non-blocking way"
+HOMEPAGE="https://dev.gajim.org/gajim/python-nbxmpp/"
+SRC_URI="https://dev.gajim.org/gajim/python-nbxmpp/-/archive/nbxmpp-${PV}/python-nbxmpp-nbxmpp-${PV}.tar.bz2 -> ${P}.tar.bz2"
+
+SLOT="0"
+LICENSE="GPL-3"
+KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
diff --git a/dev-python/python-saharaclient/Manifest b/dev-python/python-saharaclient/Manifest
index 040fca2a9937..9f77576c5a55 100644
--- a/dev-python/python-saharaclient/Manifest
+++ b/dev-python/python-saharaclient/Manifest
@@ -1,3 +1,3 @@
 DIST python-saharaclient-2.2.1.tar.gz 111417 BLAKE2B b4545a161a630caabca9318eb0ead796b417d686cdf2c134f7e8022e3e62e7b01e5db7cff1950826d49798d6e6ea41334138bcf918dfb23a2eaf6527c0788fde SHA512 f5ebbe76d00a9bab4239bc19df2bde30b133b261bf8abb63db12cde9539c5bc92fb1a24b6c9ed6e8a509a44ae2abe98f5e8b74655517a1e2c2126938cc5c517f
 EBUILD python-saharaclient-2.2.1.ebuild 1753 BLAKE2B eaf9b5a76f3c1491b054389c11ffa27dbc53a4ffc487aaa929f978632c8f83eae1a54cd814221dd1ae1cd70bb51ad50cba0b49250fbf6b3c56459faa17361457 SHA512 cfc6240a5f7f62f05c94a166d507d39f97d7bee09b65551812ea2774094995cfb9969f9842ed938c18114c30bf0461ab93b7d55d4b19baae1cbde2dec50c4264
-MISC metadata.xml 643 BLAKE2B 2a3c45ea4f9fa3c045cb88796e093436e66719daf71739c7679882f11123f2ac405926c8405046aed4efb55328d7235619192b9b7f978f7571c673e306953834 SHA512 4ab105b6287560e19a7b6ba8e999da16bdb520ff8f1a812e0e17ebff9c1edd2f7ec1475978ee478c556d31af8c201555669c92ff388de45a206b45005ec95d2c
+MISC metadata.xml 530 BLAKE2B cc41ece7af29e282dd7a19bc1fd050c82040d9cd7a41046f84f1e82b42e96831aca620019433da7fbdf4f65f75362a307cf1fc8bad0da48c5683f3c12efcba45 SHA512 06ff7dd4e6eaf9a1ac8a016c57ca7c5a7206017baff2bf5c4df64d240266827e5765bd487c5e109120ea13f62ce6955671327620d7aea1bea479b007648b77fe
diff --git a/dev-python/python-saharaclient/metadata.xml b/dev-python/python-saharaclient/metadata.xml
index 0c5d6367e225..b94cfadbb366 100644
--- a/dev-python/python-saharaclient/metadata.xml
+++ b/dev-python/python-saharaclient/metadata.xml
@@ -9,9 +9,6 @@
     <email>openstack@gentoo.org</email>
     <name>Openstack</name>
   </maintainer>
-  <longdescription lang="en">
-    This is a client for the OpenStack Sahara API, aka HADOOP
-  </longdescription>
   <upstream>
     <remote-id type="pypi">python-saharaclient</remote-id>
     <remote-id type="github">openstack/python-saharaclient</remote-id>
diff --git a/dev-python/python-senlinclient/Manifest b/dev-python/python-senlinclient/Manifest
index fc1f4262e77f..133210b601f3 100644
--- a/dev-python/python-senlinclient/Manifest
+++ b/dev-python/python-senlinclient/Manifest
@@ -1,3 +1,3 @@
 DIST python-senlinclient-1.2.0.tar.gz 107117 BLAKE2B cb1f70c59414b6bc54d58a3370ad5917851e36a19b65248125efd53bc24d29d3edb4fbc7734ba6d9d64c1ccea78307c7363de96c93c03fb801c66c83c1edf40e SHA512 1216e9511715a2cc5a703020a08ebb01bc24111150230f7ae8441ab750865c4cc07535f2b9d15ee8f7c93cc4f2ebd24473fb38b3946476063eff05c103d8ef6b
 EBUILD python-senlinclient-1.2.0.ebuild 1471 BLAKE2B 5321666dc192230e0e27b4263a17be42454bd13c3d9f2b41a17e7c304db40cf5b9fc201e8ac278916f0682b7375dc086181b59557db265e69af5867660fe7eae SHA512 fafdc54bd3ccb86f86990c2b70d2269b014c117ad1f018a1e5420f0559b4e2d90f81001fed90073b4c59dcdf815c05d7b99d69c46c766d47028c370e1e50d644
-MISC metadata.xml 610 BLAKE2B 62bc9e2f9ef0cd99f8f61cf0ffbd07037da020d7be1074f917ad0e6710dc549aa0d9eeabefa63a6a4855d1ff2318f4a805a0e96f88accf41e2466c0f42167e55 SHA512 606dd0a5e69cfbc20bd104b7d163d860256997921407022a0740f90eb85b73a738ef9372e8c226f8f87ad9b7548e784c04c8b4f69ab39c77eb27b3f5b6c02895
+MISC metadata.xml 512 BLAKE2B 09cfbde6587c01d6c77d489a5cdc1996609335daaea933444646d865ad3f1f0581448903eea1deb2ecc3a444e58b7fd8fa78e0c2ade82e8c4ef5c795273ceffb SHA512 186acb6a47aa41e5a0b2d49b4e95e8db69ba581fe85bfb5401c2be10e6b90c72f8d5b15d7fc6fcb448cd08ee43309f48fbf61c5f0a96bca32fed8c88b65beeb0
diff --git a/dev-python/python-senlinclient/metadata.xml b/dev-python/python-senlinclient/metadata.xml
index 57238cfd0210..17025f778bed 100644
--- a/dev-python/python-senlinclient/metadata.xml
+++ b/dev-python/python-senlinclient/metadata.xml
@@ -9,9 +9,6 @@
 		<email>openstack@gentoo.org</email>
 		<name>Openstack</name>
 	</maintainer>
-	<longdescription lang="en">
-		This is a client for the OpenStack Senlin API.
-	</longdescription>
 	<upstream>
 		<remote-id type="pypi">python-senlinclient</remote-id>
 		<remote-id type="github">openstack/python-senlinclient</remote-id>
diff --git a/dev-python/python-swiftclient/Manifest b/dev-python/python-swiftclient/Manifest
index f35eec7a27c8..2de739be157f 100644
--- a/dev-python/python-swiftclient/Manifest
+++ b/dev-python/python-swiftclient/Manifest
@@ -1,3 +1,3 @@
 DIST python-swiftclient-3.7.0.tar.gz 190256 BLAKE2B f3e4c462f05a34af8f6b7775b9e238e14a29af0970f4838dbda21c0fe43481a84ad51be1f2f62592109ac6fc5a84931fce154381129fad9e1d7a60333c44c7e9 SHA512 85b762cbc9f5e90c7d4dcbb5f016ee4bdc61fe6c869d24fb9bc5f3a3c3e336b171b0d3f384b51ed7bf0edf38df3936f778be85598e4c6a9bf165f8dde0d3333f
 EBUILD python-swiftclient-3.7.0.ebuild 1462 BLAKE2B 4e66be79a4eb449c0e3d15ebb1c425df2365c644a5c9963d06c43e933deb259b9057632c7edd4b6d336bc601e51abfee93688add19433171ac1374c3db17365c SHA512 df1e29186e4c056bf34fb23f1c795220681244a2d431c107483a3328067105f00faae81468d9584f58b56755595f7b370f983cf2600cb48a084138c2ae2c680f
-MISC metadata.xml 597 BLAKE2B c32e50a6b0ff995f2c237c4a6e7ca80636487a9ca4d412c74e6032a32230141f36949fa42cd39ad293a456d8961cbe14e86d6df3a772f88c76283956c46830a5 SHA512 fdcb820e96b82093910b251aff11fd5831253b86972435fe6456bdbfbeba4cc0c9d0dcfe10078103d5e7b7f29cb84e5f379293be94c30ea54fe4af741e097435
+MISC metadata.xml 490 BLAKE2B e7834fe7f35e68048c4c27aa7ae92cb7f29fa9137eef921dd37da74864d4a9286b8b0940b7bf77f34cbaf7ec54f27765f518e62f0c33e2df0bb1829ff41a3a49 SHA512 36cbea7b5462f02da560044d000dcf88561b3a91f002f6ae0792005050e84c596b0b1dbc4d7d4b2bc11dff1a98ed02c173bff737830b26c229fb3e995b49b920
diff --git a/dev-python/python-swiftclient/metadata.xml b/dev-python/python-swiftclient/metadata.xml
index 619f2612f74a..a010a5af3d53 100644
--- a/dev-python/python-swiftclient/metadata.xml
+++ b/dev-python/python-swiftclient/metadata.xml
@@ -8,9 +8,6 @@
     <email>openstack@gentoo.org</email>
     <name>Openstack</name>
   </maintainer>
-  <longdescription lang="en">
-    Python bindings to the OpenStack Object Storage API
-  </longdescription>
   <upstream>
     <remote-id type="pypi">python-swiftclient</remote-id>
     <remote-id type="launchpad">python-swiftclient</remote-id>
diff --git a/dev-python/python-troveclient/Manifest b/dev-python/python-troveclient/Manifest
index f3dcd37d2edd..fb58f7600ea7 100644
--- a/dev-python/python-troveclient/Manifest
+++ b/dev-python/python-troveclient/Manifest
@@ -1,3 +1,3 @@
 DIST python-troveclient-2.17.0.tar.gz 189560 BLAKE2B 680d76af88b8242956eb8e7a8644c11b47fee785eb0940bca1d3b8c5c500c3c233ac0e452d7a609d10028571e68ad52d47d3834898e98642cbb93b0b17f0db40 SHA512 b314115d2c50c87658b02f5dfe9a22f68cb31ba89c3baedf45bf87c4f482aeb235c751753da538bb38c514600b374b1d3f43e17d4a8b929738b4c742e28c63d8
 EBUILD python-troveclient-2.17.0.ebuild 2113 BLAKE2B e2b7956848f2347db21386189163e74174173a9d9848d034a865ea950133547df1269ccf240565fc7a8bd43f8daf61cbad5d9892955bdc3a993ae9608726463f SHA512 7acbab15bfc31a25732719d228a45f4b957b39ac96cce657c12f52e0a7651d67e5a53d585abfaffb901716654d6a256dd836709491de0d9a49678c18aee51110
-MISC metadata.xml 669 BLAKE2B 0cded2233b688bdcc98e7a140c018450a1ca1d151520ed71d0c3c4d1d079edbcd212cd0608d7e3d646555dc94248648767f88049bc375e4551a3aef3b9ba6a5e SHA512 ca61691e9d8d0f274e7d187ef24d080059f79f6fab866ded771a08740f15559456a50a5dd97ec2eb73dffec1324097331f4c4185bdd62a6dfbed37b75da2f426
+MISC metadata.xml 528 BLAKE2B 722dc4a2e0ef2ea432627c7bf2ec0580d1fee96110e024e19f20049b0fcf1cf99f8cef5c4afd9fd71e02a60ac004585dec47e07d25aad33b2323e4806b99d771 SHA512 f12be51c489c2b9cd3b6917258f55f3b1880021f1a3bd4a415f6d455ee1b07e5b7aecb754b9c3a6aa87802090874ffe624970714a98b398c5e318a1e2ac45eec
diff --git a/dev-python/python-troveclient/metadata.xml b/dev-python/python-troveclient/metadata.xml
index fb83e0b86415..c0a405d5dac8 100644
--- a/dev-python/python-troveclient/metadata.xml
+++ b/dev-python/python-troveclient/metadata.xml
@@ -9,9 +9,6 @@
     <email>openstack@gentoo.org</email>
     <name>Openstack</name>
   </maintainer>
-  <longdescription lang="en">
-    This is a client for the OpenStack Trove API, a scalable relational database service.
-  </longdescription>
   <upstream>
     <remote-id type="pypi">python-troveclient</remote-id>
     <remote-id type="github">openstack/python-troveclient</remote-id>
diff --git a/dev-python/python3-openid/Manifest b/dev-python/python3-openid/Manifest
new file mode 100644
index 000000000000..e8ebcc31372a
--- /dev/null
+++ b/dev-python/python3-openid/Manifest
@@ -0,0 +1,3 @@
+DIST python3-openid-3.2.0.tar.gz 305600 BLAKE2B d793eb61335d7240d5c25324b8377d19781df15012c8da6d5d0d7445c8a7fcb31711156b48d32efae8b6de27509e8f9112535ece7820779ca9b7f2e7be04fb0f SHA512 54412820fef21928e1bf30d16c9bc73d454e9ff41df028a12047c08abdb4c2c9e1d9053daebab8b0327cb0fe0f67e364c2506a47509fef6db5bff42f8399b799
+EBUILD python3-openid-3.2.0.ebuild 524 BLAKE2B 113f61f3ce7070512d8d58c875f5069ba5208a0e5d38e01baa1263e9a2984be48ed527f9bbdb21432485db4333c2d19fb14a890351d8236e3107f0416b750f74 SHA512 643adfdc9ea37406ccf0cbb878255fc9ca3bc781f1fad10d4ba8d393abf7dd81e1b6dea0bb48ad23c48c0d6399fc4e634c41a5e06da2c657d1b733baf8624831
+MISC metadata.xml 293 BLAKE2B 27e4faf925c2b05785ab8dcc62975601cd78facad53d650f72c808e57ff372c7c6ade224ce3b962153e96d2d56ff07f4cc0627cfbae32b92ab46c62d6adf622f SHA512 4090e1f1c00cd72343469553c0ea80c4cc380ccfb61ce04ae75329884d5f4a00fc2079c786c6060114e690d7537c4c3dc56d0052445bb3d2b59e71094255e707
diff --git a/dev-python/python3-openid/metadata.xml b/dev-python/python3-openid/metadata.xml
new file mode 100644
index 000000000000..4c9521c7cf13
--- /dev/null
+++ b/dev-python/python3-openid/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>hanno@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">python3-openid</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/python3-openid/python3-openid-3.2.0.ebuild b/dev-python/python3-openid/python3-openid-3.2.0.ebuild
new file mode 100644
index 000000000000..dbb072652b9a
--- /dev/null
+++ b/dev-python/python3-openid/python3-openid-3.2.0.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9} )
+
+inherit distutils-r1
+
+DESCRIPTION="OpenID support for modern servers and consumers"
+HOMEPAGE="https://github.com/necaris/python3-openid"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="dev-python/defusedxml[${PYTHON_USEDEP}]"
+
+DOCS=( NEWS.md README.md )
diff --git a/dev-python/pythonutils/Manifest b/dev-python/pythonutils/Manifest
deleted file mode 100644
index 09aaf7823638..000000000000
--- a/dev-python/pythonutils/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST pythonutils-0.4.0.zip 313577 BLAKE2B 43dbe69d9207c406d8f6290af1e95f023f24e0fe26bd97e6811d467efc18336b4819aabe1b026edbb7227770c42cd5754e887f908d0969c43fb4dfacbe26be0c SHA512 1759f1f267a6dfc2252d2a9a90fcf46f6613ee7e9dc60b6484d434443e7bb1dbc748134ec1355dd904a615d1e8a3874386c482a0ca98ffb51cdf3d9fd4f6999c
-EBUILD pythonutils-0.4.0-r1.ebuild 535 BLAKE2B c3dae90ab99da8ad4793f912d4dd0608a1fd2d83f0f1a96ed37a0b19eb75bf71406c01f77176c4ded37af5fead2b0d659fa18d5db67c845519d991432a7a5f3c SHA512 03e9129aa27d14f61ad549881e1ea38859601dcdc2f53240f00f213e4557c8a3aa766eed2ef18f616da07c6b5f5e5fff562e88e6075b8b3a69dd9217463b1b26
-MISC metadata.xml 251 BLAKE2B fb85d245662fa1577cfe1d77526bd34fb2a674dd447192f2defe78b751423e3d14ae73efd3ac0e1e5e6fdb6259622a782e724ec77021faf526509f199dd20d61 SHA512 46942a98ef7e36470d1169a5bc8839d25603e33c143cd36327a8a85fc14cb6bfb32247eb7608d92cc58a06cc8eef5bd64d6ec2d21e69a88632e4b936598aa772
diff --git a/dev-python/pythonutils/pythonutils-0.4.0-r1.ebuild b/dev-python/pythonutils/pythonutils-0.4.0-r1.ebuild
deleted file mode 100644
index 68cce676c047..000000000000
--- a/dev-python/pythonutils/pythonutils-0.4.0-r1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="Voidspace Python modules"
-HOMEPAGE="http://www.voidspace.org.uk/python/pythonutils.html"
-SRC_URI="http://www.voidspace.org.uk/downloads/${P}.zip"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc"
-
-DEPEND="app-arch/unzip"
-RDEPEND=""
-
-python_install_all() {
-	dodoc docs/*.txt
-	use doc && local HTML_DOCS=( docs/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pytools/Manifest b/dev-python/pytools/Manifest
index 79ce36a26b07..93c04a3468ae 100644
--- a/dev-python/pytools/Manifest
+++ b/dev-python/pytools/Manifest
@@ -1,7 +1,5 @@
-DIST pytools-2020.1.tar.gz 60662 BLAKE2B fcab8af5e10a483f9fdbb835bbc18fc98ebf3da80da9c8e98ff5131eb4a9e780562827966ba15f64df17ee46c48ef2498caf292e29b6b838ebfc5a49a1dccbae SHA512 b8b6513677f84fe97dfee9b96449ce6f2bad5d1dbd51a4f36b080136efd3b1d97850f02ec52e8e70c317104f99ad383dd9d2b260f0c151eb11851b03efcefe58
 DIST pytools-2020.3.1.tar.gz 67635 BLAKE2B e10f80ee743165b0c1f9ee7a171a313ef70644ce4a7bd10a04764bd0e1244b9c98077d659b119b34f0976bfae6ac3caa172f5b24ea967da487536b59aab4a9cd SHA512 819e4d10efffac95f75e07838cd05052136f5a62183680119763dde4952013530493a2292bcb73541b6d329823feca32befa89fcf2dfe5cbe5cd1b00240b40e8
 DIST pytools-2020.4.tar.gz 67157 BLAKE2B 57fd583a7d5cc1337e20fedb5bc1c53c4025a01e7d4e3a5b05a0770a86e2bcabdde31dd535321215cf1bf2c7f3ed0b54e2407583bea63b63ca5b829f590a00be SHA512 66dea0d67c99c152edd7cd44e1262b6d163f065f5a4b697a5997f7453145af8fb0539d8eafa606fa18128908ce933c724b51bd1a76a6f7ab02e27db24496dc4c
-EBUILD pytools-2020.1.ebuild 723 BLAKE2B cf1dca7c8b57b9ca13710be55298ded50d235ee924d5ee4fdd9c578f5075d87ba82c61dd0c30176d0949f6c2275e40decdc2f77920f5f8c0d1420ee5dcc321b1 SHA512 1901b039414fe6899f1866b87298d39405e473a83f66c82aaa257b8d830fc719e284cece71961dc0c06b8d52ea4796ab7f5be64a00fdda8fdd73a8e12ec7e6ab
 EBUILD pytools-2020.3.1.ebuild 670 BLAKE2B a4dea2ba67077ed0c59807debe1b73c59f7526c0201784813853b818a5a280be90526110dde5f4102aa080995e0214416f09f6bcc3c3641e218147bb6ded0e1a SHA512 9da434ab7b2fa6cc73c246a920e62d8a0af1769f3b988eaa74cdcdee3846f4110a4c54327dc38c86d3f42cd6712147b0c04f09427d5af0e10868038eb18834ed
 EBUILD pytools-2020.4.ebuild 671 BLAKE2B 839e1f378bb8802c37a1b831dc6dfc58fa72837a9d9a2f00814163c5d02c4eeeb11c3c2a0a534b405998084e46f528d98c45319840c66dd870b385f58af4d213 SHA512 d340adf02e9ee7e6cd033d668cc9bb48a8786de6d1e63f4d6715fefe8e3c79431f7b15d52b0df9f9719cf7057542611b5c100ea6722c88bd51640e9659321999
 EBUILD pytools-9999.ebuild 659 BLAKE2B e95a3d9d028e49f5f6123a98342ac999ec1d6a3487ab7acfb2b09b4814d6b4a3af9d609ff17b9451bf93509926cb665c4568ccdf4a2dbeb93dab80ad82f976d1 SHA512 07ef3afa1568beae15a9210426a0d5b4687becf12249443e7f2d5e867b6a8632c17b01eca5dbb69ce1055eaecdda62256129783106b0bc45a88ec48e9670ed38
diff --git a/dev-python/pytools/pytools-2020.1.ebuild b/dev-python/pytools/pytools-2020.1.ebuild
deleted file mode 100644
index fd8e593b8554..000000000000
--- a/dev-python/pytools/pytools-2020.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} )
-PYTHON_REQ_USE='sqlite'
-
-inherit distutils-r1
-
-DESCRIPTION="Collection of tools missing from the Python standard library"
-HOMEPAGE="https://mathema.tician.de/software/pytools/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64"
-
-RDEPEND="
-	>=dev-python/appdirs-1.4.0[${PYTHON_USEDEP}]
-	>=dev-python/decorator-3.2.0[${PYTHON_USEDEP}]
-	>=dev-python/numpy-1.6.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.8.0[${PYTHON_USEDEP}]
-"
-DEPEND="
-	>=dev-python/setuptools-0.7.2[${PYTHON_USEDEP}]
-	test? ( ${RDEPEND} )
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/pytz/Manifest b/dev-python/pytz/Manifest
index 5bf44d08ef35..ba09269ce1c0 100644
--- a/dev-python/pytz/Manifest
+++ b/dev-python/pytz/Manifest
@@ -1,5 +1,5 @@
 AUX 2018.4-zoneinfo.patch 549 BLAKE2B 5654ac8133627afaf9dc17dd9ae8e6a22ef9206efc6ca88495bfdec0078fc77a290ab7a62d6d1aa722ac01b9428bf37382d5f19d9da65593aed43354d05ceeec SHA512 eb365950d2eb62c8d984146228c7d96fca96b2ab4ea90b951a85b3f450550451e6c014da21e403476435e71c5ae989f169d21e07c56fab9713dacec0aee3184f
 AUX pytz-2018.4-zoneinfo-noinstall.patch 579 BLAKE2B 1d21d01160dbdf6c6848c2c0088cbc6ca326270b106098ce7157b363acf6f4da750a58498be95a8b5bf1ee342b679fdbbf16cf9d542d5f46088062db83f866f7 SHA512 309c2427f5a8ebb77bdf899ad3fb34029c46901cbaf2baf3ab697b83608dd1d3c6e7cf776b1b9b592918b91cbafd148ee3e4c0b4255f38ea3e41c0bca94f4c51
 DIST pytz-2020.1.tar.gz 311771 BLAKE2B 2d7dd9987fd912dd2a62b5c4ab1667a13f3704ff407796c00fd76b6f3ac4dfcffba9f58740f9456ddfade6c2ef6deacc754f57f5e434b97da36b36fca3024d0f SHA512 4f652ab400bac0bd83ed305be7540094e674029a0cbde7da280adfd911b8c0a44023799b7c61971a5a61a1d6e3992c5b621e5e95bbfe962f310d5f26d4fda3ce
-EBUILD pytz-2020.1.ebuild 959 BLAKE2B 29cd1c62b31c3b45de541f907d0b86d0757658876cea8b43aa79ac995676e0d4868f272c55b00a5b143a49e7f3e83ab77ab65c0967ce7f45467fae0596fe95ba SHA512 c5ca799c82795e99b83d4be3e78eca0e32f9828963e881bd2badd5100e7adf6db721b22f2b7328d0e611b1818d5f658a47f007db5f61f7faaeb870369862ac0e
+EBUILD pytz-2020.1.ebuild 966 BLAKE2B 81f167a26c51b2bfc0082684f7f0efa11e8c93bdde96183199e99881816a43aa5f21aa860b14fc3ce1922aec1829229251ea4efacc951df7c0dcd018f99e1627 SHA512 3544878350f10f8151272601858216359d660689ad7c3b6c256dcfccd9bb45e8adc25296f538e25700e5dce7d3fba46fb468f012a2eab776ae172374e0d36feb
 MISC metadata.xml 764 BLAKE2B d26c3334bd7cf99b7a8a7767def5d9ec82ee6e335e27aaf891a47c5037eeb2816457974ea99a1cc865359718a5d7fc30e41f68d8b7ecc82a7a7e87b5943c10ed SHA512 6160a54921cc7c8f7dd504121b359727ab14ef9277bdb96720a31c8e32d223d29080cf9eb76531a94da8a5c7752372938fa5760e4e6cc77118a4792c31813580
diff --git a/dev-python/pytz/pytz-2020.1.ebuild b/dev-python/pytz/pytz-2020.1.ebuild
index 802b437f99de..9b85408af154 100644
--- a/dev-python/pytz/pytz-2020.1.ebuild
+++ b/dev-python/pytz/pytz-2020.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
 IUSE=""
 
 RDEPEND="
diff --git a/dev-python/pyusb/Manifest b/dev-python/pyusb/Manifest
index 0ead3e63b403..cca8b387f15d 100644
--- a/dev-python/pyusb/Manifest
+++ b/dev-python/pyusb/Manifest
@@ -1,3 +1,3 @@
 DIST pyusb-1.0.2.tar.gz 68694 BLAKE2B 8910d9d6d7abd8b0dddf725ad9cc745ce5b06f69a4824a86ed9783918d0fc88d438674852288654964c4555d8278f22d3daab679149c64ea8a6fd3dd2f1cf284 SHA512 6a264b796e17612004196a7a526a7c6df99feac9062f8354540221016411a78a65d413731aea2fc1206ed5ea2b84787078898b9ca3754164f1dfe2a9878b75a5
 EBUILD pyusb-1.0.2.ebuild 820 BLAKE2B cbccda513edfa3c6b9490ebaa3cca511f617efae84534d6b283496944ef19ccbfd0c14c03a57846c34b809aa1a795b8fc804554da6e7312ae1e1354d6887d0d9 SHA512 b7df13123e23f88ffd36aabb3ca46204aae594aaee7e2599a4b4d82e5846641f86f870e0fe1c8d52da576c0a0015e772f359973e271c58ac2fef3f5cf7f5bdea
-MISC metadata.xml 472 BLAKE2B bae31bb84443c5d215f931618d90cabbc11633d90a1dea5e29ade93e42671b4bf1cd037f235e9a58059d2571b0e9b32f0261508108bc6678544dc09f3293b8da SHA512 7db6620b2545b31d9dd3c3844f9d02d0403c266a931935ec8e5728bb936ed3ec1f5ec5fd5d7146668e4e17c9f8f1eb31affaaec90dc93e690864b574a7ddbc4c
+MISC metadata.xml 359 BLAKE2B 44a04e5fad69cdf343bb324f0367a1b52ce7443d4ef4c6bcd1e7742ac0cb9c6eeb8afc5b250d126c2bf4472c9fca2cce7f9a12a7354372bba8351d0489972e09 SHA512 ac428041984c13af0492c228514fcfabb00d98645b97ff78347c4fee2813df292f52ec9c37dd00392eff6c306a18513bec6d4c883cede2ff31f18c2973bff494
diff --git a/dev-python/pyusb/metadata.xml b/dev-python/pyusb/metadata.xml
index 7a1db2dc3782..892a08caac4d 100644
--- a/dev-python/pyusb/metadata.xml
+++ b/dev-python/pyusb/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<longdescription>
-		pyusb is a python wrapper for the libusb user space USB device library.
-	</longdescription>
 	<maintainer type="project">
 		<email>python@gentoo.org</email>
 		<name>Python</name>
diff --git a/dev-python/pyvirtualdisplay/Manifest b/dev-python/pyvirtualdisplay/Manifest
new file mode 100644
index 000000000000..3c90f21a1ff9
--- /dev/null
+++ b/dev-python/pyvirtualdisplay/Manifest
@@ -0,0 +1,3 @@
+DIST pyvirtualdisplay-1.3.2.tar.gz 38532 BLAKE2B 2c0cb3af426abc58dc895667c5fecb40ee9aa870dbb08a51ac32fbd5bd3620b97498b3dfc6e7026362604c82f67b60885370f0704a1349a65668628d9a21e80c SHA512 422e1530bb740fc77cc0b7abb73cb8e7326689c80c5f49b58be70b262e8a2c28274d3b83a0ec7753adfbf78b780047f61cf7b18fb14f935d483a5e3d04953210
+EBUILD pyvirtualdisplay-1.3.2.ebuild 1420 BLAKE2B f9516de05022d7ef481485201fcec30879362c14ceb078e13cefb73029e5c79fe95c0e4b024324dcdf5815ebfd90bf0db8b2ade3211a0338174d0a63c5890fc5 SHA512 be965933560924ffbce696cd369fd9acc5011be7073bb83e46d8b7d78e9aab3f53ac4e5a7c31827a7de703ca3379ae85b150cfaff457b9ae94777d044888e561
+MISC metadata.xml 375 BLAKE2B 393138e315b4eae4dacb9339fbb5766e9dbaa84b7482babaddc08d524fb8b9939f6622ee9c6d09b66c61ac270fcc483fac39996a12ba87ccccf7cafd4c6d36db SHA512 9a44b6b9de4d1a61d6af9256519473541d5513cef349c15178c025dee3aaaa3f6772b1be56576411a985fcd9c70029c00743d8f577be8eaec4c5a44646c9cbf6
diff --git a/dev-python/pyvirtualdisplay/metadata.xml b/dev-python/pyvirtualdisplay/metadata.xml
new file mode 100644
index 000000000000..d22e99d73577
--- /dev/null
+++ b/dev-python/pyvirtualdisplay/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>andrewammerlaan@riseup.net</email>
+		<name>Andrew Ammerlaan</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-python/pyvirtualdisplay/pyvirtualdisplay-1.3.2.ebuild b/dev-python/pyvirtualdisplay/pyvirtualdisplay-1.3.2.ebuild
new file mode 100644
index 000000000000..fcb0f048615e
--- /dev/null
+++ b/dev-python/pyvirtualdisplay/pyvirtualdisplay-1.3.2.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python wrapper for Xvfb, Xephyr and Xvnc"
+HOMEPAGE="https://github.com/ponty/PyVirtualDisplay"
+SRC_URI="https://github.com/ponty/PyVirtualDisplay/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+BDEPEND="test? (
+	dev-python/backports[${PYTHON_USEDEP}]
+	dev-python/backports-tempfile[${PYTHON_USEDEP}]
+	dev-python/entrypoint2[${PYTHON_USEDEP}]
+	dev-python/path-py[${PYTHON_USEDEP}]
+	dev-python/pillow[${PYTHON_USEDEP}]
+	dev-python/pyscreenshot[${PYTHON_USEDEP}]
+	~dev-python/vncdotool-0.13.0[${PYTHON_USEDEP}]
+	x11-base/xorg-server[xvfb,xephyr]
+	x11-misc/x11vnc
+)"
+
+DEPEND="dev-python/easyprocess[${PYTHON_USEDEP}]"
+
+S="${WORKDIR}/PyVirtualDisplay-${PV}"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# all of this fails: AssertionError
+	rm tests/test_examples.py || die
+
+	# Assertion error No such file or directory: 'Xvnc': 'Xvnc'
+	sed -i -e 's:test_race_10_xvnc:_&:' \
+			tests/test_race.py || die
+
+	# No such file or directory: 'Xvnc': 'Xvnc'
+	sed -i -e 's:test_slowshot:_&:' \
+		-e 's:test_slowshot_with:_&:' \
+			tests/test_smart.py || die
+
+	# No such file or directory: 'Xvnc': 'Xvnc'
+	sed -i -e 's:test_double:_&:' \
+			tests/test_smart2.py || die
+
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/pyxattr/Manifest b/dev-python/pyxattr/Manifest
index c131a2959663..c3df9de25e41 100644
--- a/dev-python/pyxattr/Manifest
+++ b/dev-python/pyxattr/Manifest
@@ -1,4 +1,3 @@
-AUX pyxattr-0.6.0-xattr_header.patch 1780 BLAKE2B 43244b281bec7166d539155c66e604c907f2e74197414422c9486c93bec84ba8f4515afd20eb6bdcb898207200da4d1071489a7390a14e835531816a5b458865 SHA512 24531ff4fb116c69b8ab3e432753bad2d0b704c86ec21efe69741f2d34ced24c6a580872acab0e063f3be3dfad4f91199bf61fb8d1485d1c86a9266f7c163cd9
 DIST pyxattr-0.7.1.tar.gz 30580 BLAKE2B 748ce0610ebc1a074dee87dffc67a88e1def0ea467f13758d2d85f9f5c37954586d85dfb8ceb1b77f4ef637295d57a153849b00d773e2e79b06902974fe01663 SHA512 093cb3f9b9637194b9737c07da7dde45b3d5083ec16a9209af80d30c86da8f93badff5aada395415be3dd48da73004286e47d0aa0671c95e65b0492d02e86009
 EBUILD pyxattr-0.7.1.ebuild 823 BLAKE2B 43d40a0701f4d8ef869655a5ba8c4dc337f6045a60c0eef7799d1c42e3d9eb71ddc41ca42000b1d5741c751d94b1cad8bee97d6e9242e23172baca39d6155c5f SHA512 b980df47ba500ffc800ebed6ebc0b703c9befd7f88429741f4eb03aac68bfcf226cc91a05e5e26f5037e708617f10286ec36012dd8d47b1e0b489f95ee78d924
 MISC metadata.xml 609 BLAKE2B 8f3429390129e4438c5bb4c8d82ae11e9824863d4b200a57d660d0ae93692711b96c6cbcfd9e7e8ad46848beba86dd2ee971acde59c08c9fc6f317283358157f SHA512 8a18175143b319bf6f623304ad8f534ad34eaf8b67c57ee1addb8886e34d79bd3a74723bce4f66fb5e9e3dad4768aaf253cec8fb8e97365f152d0b8f772d7df6
diff --git a/dev-python/pyxattr/files/pyxattr-0.6.0-xattr_header.patch b/dev-python/pyxattr/files/pyxattr-0.6.0-xattr_header.patch
deleted file mode 100644
index 89b18730c3d9..000000000000
--- a/dev-python/pyxattr/files/pyxattr-0.6.0-xattr_header.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From cc0bc63b291ee1a831f07c81946149dbe8c8146d Mon Sep 17 00:00:00 2001
-From: Lars Wendler <polynomial-c@gentoo.org>
-Date: Wed, 10 Jan 2018 11:45:35 +0100
-Subject: [PATCH] xattr.c: There is no more attr/xattr.h with >=attr-2.4.48
-
-See also:
-http://git.savannah.nongnu.org/cgit/attr.git/commit/?id=7921157890d07858d092f4003ca4c6bae9fd2c38
----
- xattr.c | 13 +++----------
- 1 file changed, 3 insertions(+), 10 deletions(-)
-
-diff --git a/xattr.c b/xattr.c
-index 111cec1..c82ee32 100644
---- a/xattr.c
-+++ b/xattr.c
-@@ -23,10 +23,8 @@
- 
- #define PY_SSIZE_T_CLEAN
- #include <Python.h>
--#if defined(__APPLE__)
-+#if defined(__APPLE__) || defined(__linux__)
- #include <sys/xattr.h>
--#elif defined(__linux__)
--#include <attr/xattr.h>
- #endif
- #include <stdio.h>
- 
-@@ -642,11 +640,7 @@ get_all(PyObject *self, PyObject *args, PyObject *keywds)
-         /* Now retrieve the attribute value */
-         nval = _generic_get(_get_obj, &tgt, s, &buf_val, &nalloc, &io_errno);
-         if (nval == -1) {
--          if (
--#ifdef ENODATA
--              io_errno == ENODATA ||
--#endif
--              io_errno == ENOATTR) {
-+          if (io_errno == ENODATA) {
-             PyErr_Clear();
-             continue;
-           } else {
-@@ -1173,8 +1167,7 @@ static char __xattr_doc__[] = \
-     "   a :exc:`EnvironmentError`; under\n"
-     "   Linux, the following ``errno`` values are used:\n"
-     "\n"
--    "   - ``ENOATTR`` and ``ENODATA`` mean that the attribute name is\n"
--    "     invalid\n"
-+    "   - ``ENODATA`` means that the attribute name is\n invalid\n"
-     "   - ``ENOTSUP`` and ``EOPNOTSUPP`` mean that the filesystem does not\n"
-     "     support extended attributes, or that the namespace is invalid\n"
-     "   - ``E2BIG`` mean that the attribute value is too big\n"
--- 
-2.16.0.rc1
-
diff --git a/dev-python/pyzmq/Manifest b/dev-python/pyzmq/Manifest
index 8b0d6f227f39..f7ec0cc9d72d 100644
--- a/dev-python/pyzmq/Manifest
+++ b/dev-python/pyzmq/Manifest
@@ -1,4 +1,6 @@
 AUX pyzmq-19.0.0-tests.patch 6686 BLAKE2B 91ca18b17331f64448b151269c971ce4dec01b753f00623ea5570a2694b5e2dbbb457c420f22772e8471228f1042da656b06ca740f79f7d6b9ef0d18b8176317 SHA512 971ed65fb299f865edc96c7e138f65cecbed9de526ef10f412e4d81a53c4dc4d65512455bc2ca17c0bc24c09d7bfd7b79cc4acd08f93b517f42466e2b1490836
 DIST pyzmq-19.0.1_p20200608.tar.gz 390927 BLAKE2B d70a2f615782cc5a53ed2ffab4d5549bc5d15cc1e0e63f640a357fe8575ca327a5976a3e8b11d97c236a31ca17025f37fe423d166b684b5c4aafc139a0941492 SHA512 7f077ed3858c226eb1e3f5e51dfb5d4b517ec94357b37cc66d17cfe2543786b86627ce7eb4c12785a2709a499af998d02642d972c119a637df3cec5201e909d1
+DIST pyzmq-19.0.2.tar.gz 390927 BLAKE2B d70a2f615782cc5a53ed2ffab4d5549bc5d15cc1e0e63f640a357fe8575ca327a5976a3e8b11d97c236a31ca17025f37fe423d166b684b5c4aafc139a0941492 SHA512 7f077ed3858c226eb1e3f5e51dfb5d4b517ec94357b37cc66d17cfe2543786b86627ce7eb4c12785a2709a499af998d02642d972c119a637df3cec5201e909d1
 EBUILD pyzmq-19.0.1_p20200608.ebuild 1497 BLAKE2B fea10c8b964a2a0730242c8d45a40135bfc646d217fe67122a95f39503f0b335f7bd9e2df03df9f8eeb43d274e14d2cdbd3b1d151dbe144d94bb75160f5cc7b3 SHA512 88cbb433c1baef81aa3fe2801a93f0f66d7c3874141376f3ca8da86b9e64b4f7377d1a711bf4b0dcfce3f6ea6f329f6193d9ac2fe3271cf6350335d349128355
+EBUILD pyzmq-19.0.2.ebuild 2979 BLAKE2B 687c883bf9003268caff444084df6db512db05e2fa1d920ba206b3a2ec99976cd106bac5678bcf02e56eeac68f8fc9ce12c45cc58de2ff8d1e1fa02e19485afb SHA512 cf031069972cdcfd2e175ace2c069d2f1edc5f73ffa6db07c07c7d480f14afe59e03ee591eaede3730f9bd8c92a05d0f6e5dbf3ff6459409dcb35d13633bc3ac
 MISC metadata.xml 390 BLAKE2B bef63f0fd0f88f72fbbdbe6ecbc25572a97dedb5cf17e4a4f99b4698a4e437935970425fc7a32b46059ceb2cf2ea177b25c324a00261e22d881ff4c5d9fd408f SHA512 8b702f02b5ed0233f1b9cd7c7366e108436ad8331082af8606d864145c967f45d1317b7c4f260a0542430397dfc1a5fb18e69bef90f154bb65ff07a4f7132dc7
diff --git a/dev-python/pyzmq/pyzmq-19.0.2.ebuild b/dev-python/pyzmq/pyzmq-19.0.2.ebuild
new file mode 100644
index 000000000000..d484501919b9
--- /dev/null
+++ b/dev-python/pyzmq/pyzmq-19.0.2.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit flag-o-matic distutils-r1 toolchain-funcs
+
+EGIT_COMMIT="dd4dac055152d47c829034224cdecf594c7b3f12"
+DESCRIPTION="Lightweight and super-fast messaging library built on top of the ZeroMQ library"
+HOMEPAGE="
+	https://www.zeromq.org/bindings:python
+	https://pypi.org/project/pyzmq/
+	https://github.com/zeromq/pyzmq/"
+SRC_URI="
+	https://github.com/zeromq/pyzmq/archive/${EGIT_COMMIT}.tar.gz
+		-> ${P}.tar.gz"
+S=${WORKDIR}/${PN}-${EGIT_COMMIT}
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="+draft"
+
+DEPEND="
+	>=net-libs/zeromq-4.2.2-r2:=[drafts]
+"
+RDEPEND="${DEPEND}
+	dev-python/py[${PYTHON_USEDEP}]
+	dev-python/cffi:=[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/cython[${PYTHON_USEDEP}]
+	test? (
+		>=www-servers/tornado-5.0.2[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+distutils_enable_sphinx docs \
+	"dev-python/numpydoc"
+
+python_configure_all() {
+	tc-export CC
+	append-cppflags -DZMQ_BUILD_DRAFT_API=$(usex draft '1' '0')
+}
+
+python_compile() {
+	esetup.py cython --force
+	distutils-r1_python_compile
+}
+
+python_test() {
+	local deselect=(
+		# lore says it sometimes hangs
+		zmq/tests/test_auth.py::TestThreadAuthentication::test_curve
+
+		# broken tests
+		zmq/tests/test_auth.py::TestThreadAuthentication::test_curve_user_id
+		zmq/tests/test_constants.py::TestConstants::test_draft
+		zmq/tests/test_context.py::TestContext::test_mockable
+		zmq/tests/test_draft.py::TestDraftSockets::test_client_server
+		zmq/tests/test_draft.py::TestDraftSockets::test_radio_dish
+		zmq/tests/test_message.py::TestFrame::test_buffer_numpy
+		zmq/tests/test_message.py::TestFrame::test_bytes
+		zmq/tests/test_message.py::TestFrame::test_frame_more
+		zmq/tests/test_message.py::TestFrame::test_lifecycle1
+		zmq/tests/test_message.py::TestFrame::test_lifecycle2
+		zmq/tests/test_message.py::TestFrame::test_memoryview_shape
+		zmq/tests/test_message.py::TestFrame::test_multi_tracker
+		zmq/tests/test_message.py::TestFrame::test_tracker
+		zmq/tests/test_security.py::TestSecurity::test_curve
+		zmq/tests/test_security.py::TestSecurity::test_plain
+		zmq/tests/test_socket.py::TestSocket::test_large_send
+		zmq/tests/test_socket.py::TestSocket::test_tracker
+		zmq/tests/test_socket.py::TestSocketGreen::test_large_send
+
+		# hanging tests
+		zmq/tests/test_socket.py::TestSocketGreen::test_tracker
+		zmq/tests/asyncio/test_asyncio.py::TestAsyncioAuthentication::test_blacklist
+		zmq/tests/asyncio/test_asyncio.py::TestAsyncioAuthentication::test_curve
+		zmq/tests/asyncio/test_asyncio.py::TestAsyncioAuthentication::test_plain
+	)
+	[[ ${EPYTHON} == python3.9 ]] && deselect+=(
+		# crashes python
+		zmq/tests/test_socket.py::TestSocketGreen
+	)
+
+	pytest -vv ${deselect[@]/#/--deselect } ||
+		die "Tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/qdarkstyle/Manifest b/dev-python/qdarkstyle/Manifest
index d52b2730fd95..b379c4c5fd2b 100644
--- a/dev-python/qdarkstyle/Manifest
+++ b/dev-python/qdarkstyle/Manifest
@@ -1,3 +1,3 @@
 DIST qdarkstyle-2.8.1.tar.gz 7883937 BLAKE2B fd5a35467c6c47e9eb135d4a119b3f382bfe20b9b0ac2d407fef7113e5ce4d914f3d8e462d26a71b8f1494f42b71a4f8819b0eb2c6579d87ca9dd497d09d39d7 SHA512 10c3f834b1ea50f665c2ce3fde16533c7dfc62c2d055afcc7d2434c09d14fb9a6181b73ce12d3af72897b9d26b41db81cc76e7c7cb6112eef097cd86630b6532
-EBUILD qdarkstyle-2.8.1.ebuild 1441 BLAKE2B 99bd0d347ea0ce028e897fbde9c0b11fce98416f3de517ea80efea83f894783f6cff71ec28df403d0295ef84d1ac4b6ea58cc0d0858de6e874b67381c191bf92 SHA512 f47628b0d4a16e38de6ba1a75d4dcc1c7d6ff2b1d841370f14f39a2323616457fc226c4bab2ccb4578369a0ec2c72ab85d9bcc486e4ac71b11e57bd4353dcd97
+EBUILD qdarkstyle-2.8.1.ebuild 1445 BLAKE2B bb5e98ce1dbb81dc08424dbb59e5547d687299339286e26a5da6a0ade88bb0b85aab1fbc15014b70f8fdbc5b3b5fa8cc30164594eb2ef449d6964bb57ecb3b3b SHA512 23ad7399a9b8197441a4fd50dd061a67fd85266a28c7f80ff9dd9016a49967fbd75e87c12e1dfeb2ba87022655e3ab901b113996462b1a677c0fde8cf796e713
 MISC metadata.xml 376 BLAKE2B 66f5bc55ef2f40919601f4ed1fddd0bac47a7e42cf87f4a5fe085a90420d6d3ff21fb156319cb6c241b1241f7dfb261612ba0aa20d54dfbeb9801cbad34aeee2 SHA512 9741d92e63a63121645ec2c8f08a37850524b299cfdad5b4e70def0a8a50f35dde5c9417f4d4c067edee641b2050a128c7a792ed6d59137809e1b1a77fb469c9
diff --git a/dev-python/qdarkstyle/qdarkstyle-2.8.1.ebuild b/dev-python/qdarkstyle/qdarkstyle-2.8.1.ebuild
index fd2c520e477f..637111a307f8 100644
--- a/dev-python/qdarkstyle/qdarkstyle-2.8.1.ebuild
+++ b/dev-python/qdarkstyle/qdarkstyle-2.8.1.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python3_{6,7,8,9} )
 
 DISTUTILS_USE_SETUPTOOLS=rdepend
 
-inherit eutils distutils-r1
+inherit distutils-r1 optfeature
 
 MY_PN="QDarkStyleSheet"
 
diff --git a/dev-python/qtconsole/Manifest b/dev-python/qtconsole/Manifest
index 4da75e57cff5..62e849ef5b4d 100644
--- a/dev-python/qtconsole/Manifest
+++ b/dev-python/qtconsole/Manifest
@@ -1,6 +1,8 @@
 DIST qtconsole-4.7.5.tar.gz 424850 BLAKE2B e2d2ba50ce57b13504bdf8ad1ee3374b76abc980f0b74dfe1177c3f066ba24382bc51f8d3db2614a8d74b198ed20f01fac67c288602ae6e31fe90165e63ab9e9 SHA512 ee57ad2de5b840ee4e7f439be08a3c82fd39ef1bf6113b7eda95fa1aabd132c799ff584a2ac7f7e2c89df4bcd9a9409bbaeee108a6bb49e6197d2e3395336ad7
 DIST qtconsole-4.7.6.tar.gz 424919 BLAKE2B d973b3b94dfad1b38603695e22927bcdcb8a4f2db9f4a638d5fe6a83c24061153dbaa36c26e632708953af32a015af1d40ecbf175dd5314a3b954b15a6625cc0 SHA512 e4e12eb90533e922786b5b6517fba5d9c4dfedf00547f1403c8cd65fb464f5c1a13517df69924e4428e9a8a811dfc359a7768fbaa90adbe02d79cba9a5aa852e
+DIST qtconsole-4.7.7.tar.gz 425068 BLAKE2B 61fa3bede2d531e294e8a272287885ffeff095bca8b998b2a28fd3f4d912b20aa30807fe7d4caf15f8594e7820e037b3c9955ad76e9dd5eb1da2cbe00ca9a941 SHA512 1f04d54138f37b32c112db2cbbc8f79dc16b13bf5dffcc3dd872d43d48ef9ed5454d660e4fab08ccd71344153de391d91558edd0f71a2b626da47779f0f0bb53
 EBUILD qtconsole-4.7.5.ebuild 1251 BLAKE2B 5abc609de0126c2838c063fa637c814c980209738cc03569eab99bc799e9e904e2fe19161751811031d7653261e2df9487483b7efc867055fb834bb13a991278 SHA512 95a8268f168336bdc7a613b3dab0019a658f5fed6a1285554eac8ffcf78129d4222278b54a631826a510699872f4e91ff98fd19eb3e8d17489e022d46ba6452c
-EBUILD qtconsole-4.7.6-r1.ebuild 1254 BLAKE2B c07c73315ee0df652a09aed64be94b07a974f165bf27294ee5d38d05614fc7fa9e2da560cd99c4f25f8ae4dbbfd915c4a503b29391aa67d2defcefc93054b938 SHA512 784e2034469a9c1552010a766d91bb0e7cf33fed11d372c1442857f5f31e19b9d956632123d61a792475764e263c37360211bf1ded27c89ec4afbe4a705cc9d7
+EBUILD qtconsole-4.7.6-r1.ebuild 1251 BLAKE2B e9d90a46e866e1d7eca2102d084ea5c2e053bc84f14d087d66e4f6d1e90783cc63503f1a5577282f97e32c35ae4c39737484cfd4c75fb661b379d13c9c5847ec SHA512 92f8f6a41ad3baf41cbfb31446378c72f2108cc238c58393843ceb416808e20c2061446c22d290a18136f6611261675fc07bab77cd39fa2b399af38b3caccd02
 EBUILD qtconsole-4.7.6.ebuild 1254 BLAKE2B 15c92570050a4b8552bfb34888d5baec793537525beed4c2e691cf48fb1425a0407ab6d0dbc2b56004acb6c9ae7c1e691aec9839d84be02a90831aceffd531f1 SHA512 ed4edb7506bfcdcc63ca26f9a7ef63069a8d24d4eaee865f1925404fbd7ecf3b01334b2663cc28028a9c4e176f07f7e75506d20fd822a1f8fa6fe9375e1e1055
+EBUILD qtconsole-4.7.7.ebuild 1254 BLAKE2B c07c73315ee0df652a09aed64be94b07a974f165bf27294ee5d38d05614fc7fa9e2da560cd99c4f25f8ae4dbbfd915c4a503b29391aa67d2defcefc93054b938 SHA512 784e2034469a9c1552010a766d91bb0e7cf33fed11d372c1442857f5f31e19b9d956632123d61a792475764e263c37360211bf1ded27c89ec4afbe4a705cc9d7
 MISC metadata.xml 689 BLAKE2B 65c50141dd002a264402eb90385ad3203ebdec1fc47bfa0d94055a82bd98bbe93cc0cacdd4b0f9cab0cc36ad3ea22f500f53c55398347b6cc1cada2569abdb22 SHA512 40e7ef3f4437946e75f1a2be9373ba06b3c58b4ebae0cef8958e2c101aa855e4c92aa0a426d2a74d8e946d05e176690006324db1d8514598bb574f1071644d81
diff --git a/dev-python/qtconsole/qtconsole-4.7.6-r1.ebuild b/dev-python/qtconsole/qtconsole-4.7.6-r1.ebuild
index 4e7d19048ac5..cee68e3cccd4 100644
--- a/dev-python/qtconsole/qtconsole-4.7.6-r1.ebuild
+++ b/dev-python/qtconsole/qtconsole-4.7.6-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 
 RDEPEND="
 	dev-python/ipykernel[${PYTHON_USEDEP}]
diff --git a/dev-python/qtconsole/qtconsole-4.7.7.ebuild b/dev-python/qtconsole/qtconsole-4.7.7.ebuild
new file mode 100644
index 000000000000..4e7d19048ac5
--- /dev/null
+++ b/dev-python/qtconsole/qtconsole-4.7.7.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_REQ_USE="threads(+)"
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+DESCRIPTION="Qt-based console for Jupyter with support for rich media output"
+HOMEPAGE="https://jupyter.org"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+RDEPEND="
+	dev-python/ipykernel[${PYTHON_USEDEP}]
+	dev-python/ipython_genutils[${PYTHON_USEDEP}]
+	dev-python/jupyter_core[${PYTHON_USEDEP}]
+	>=dev-python/jupyter_client-4.1.1[${PYTHON_USEDEP}]
+	dev-python/pygments[${PYTHON_USEDEP}]
+	dev-python/traitlets[${PYTHON_USEDEP}]
+	dev-python/QtPy[${PYTHON_USEDEP},gui,printsupport,svg]
+"
+BDEPEND="
+	test? (
+		dev-python/QtPy[${PYTHON_USEDEP},svg,testlib]
+	)
+"
+# required by removed tests:
+#		dev-python/pytest-qt[${PYTHON_USEDEP}]
+PDEPEND="dev-python/ipython[${PYTHON_USEDEP}]"
+
+distutils_enable_sphinx docs/source
+distutils_enable_tests pytest
+
+src_prepare() {
+	# TODO: these tests require virtx; however, running under virtx
+	# causes pytest to segv on exit (even though tests pass)
+	rm qtconsole/tests/test_00_console_widget.py || die
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/quantities/Manifest b/dev-python/quantities/Manifest
index 87de01f93ec3..9360896bace8 100644
--- a/dev-python/quantities/Manifest
+++ b/dev-python/quantities/Manifest
@@ -1,3 +1,3 @@
 DIST python-quantities-0.12.4.tar.gz 104093 BLAKE2B 84587726ef3c2f4c7dce4ea538363aecc42aa88c31d2990f834f2de9540b52d6ca0c437c1876a4c2dd5512b4be3af95cc64a1294ea60555ed1b51819f7f46125 SHA512 b5d181880d0789e6fbd55837c5ce65b677764a718be4550f1f553131e171caa59f8fc84d67e69563a293cda01e7b0678074fb311b3766f0013e658a9fa00471f
-EBUILD quantities-0.12.4.ebuild 817 BLAKE2B 0cb0a3555c857ddeeb5959e2976bd0384c0d0170c027d7890f52463685cd895bc634ef79ed81a29b4c28fb2ac56fb276a92d5a043cd799827e670b81d8afe9e7 SHA512 a82c6407016798da18aaa46e17137cd5dd01ee3c3b73b71bf7bbb1e887caee9b15eef6cbda366070728a55cc0362c59c3faf68606ee290b64b8840b23161452e
+EBUILD quantities-0.12.4.ebuild 816 BLAKE2B 104781eb3d7f0cdb081ea04d5dfd0f50e724cb4e5d2e0ab76d63660286d4499d31d9003e72b37cb6c4c2ff3dd3eb54ae7703bf89c4ff5f89418550bb7785f34e SHA512 5a9adf251b088d2aae83b5da552089e772b2a620091106ecbc3668d5e7b24780c18b821b9111bf1b6cd364ad9441a676e87e7df7ce2e569780c63654eb63bd8b
 MISC metadata.xml 515 BLAKE2B 6745bb76b63c90cb4c7de8c1b103e9cb5b0fbb9a3b0f5635f02e37f05d48236f9f203d8b6cb540921254226dc251111c9f1e90713fa6f8441db0ccb568ffeefa SHA512 9cfdf5931dec119f380401ae62a1226243a41cae42cd4002e80a324eac3ab50772fd31b4a54c3025d53d8b6aec2e64d0fb0703b71a98f03a413e39042083e96e
diff --git a/dev-python/quantities/quantities-0.12.4.ebuild b/dev-python/quantities/quantities-0.12.4.ebuild
index 41a8e27b48b7..b759aa0a0066 100644
--- a/dev-python/quantities/quantities-0.12.4.ebuild
+++ b/dev-python/quantities/quantities-0.12.4.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/python-quantities/${MY_PN}/archive/v${MY_PV}.tar.gz
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 
 RDEPEND="
 	dev-python/numpy[$PYTHON_USEDEP]
diff --git a/dev-python/quex/Manifest b/dev-python/quex/Manifest
index 1cd749e4677c..1812b9f90c2f 100644
--- a/dev-python/quex/Manifest
+++ b/dev-python/quex/Manifest
@@ -1,5 +1,4 @@
 AUX quex-0.65.4-gentoo.patch 1255 BLAKE2B b37ffe9069f97ef75737b31e0ebca6d93ab0a25f0168bd746c1651e2ab39e39f4540c1121d55f5fec1b96caa25aa02e8536f69090f406be555c888a58a090380 SHA512 992be8f711482333ce32e0d8ddfa17488e439f822dfd6e20f1fa5788ddcc550d2cb94eac962680e71eb933c3c51229255f06a1e70904b433eee0e3ccb03b4ebb
-AUX quex-0.70.0-gentoo.patch 530 BLAKE2B 93fec6f7a4516c14af50b13314e6cadee8dade71fd471f632e2021979328661efa0bb85de41b67a26f1955f9681345818cfbbfd32fa8283a431115c31e113819 SHA512 6e56e192f84b0de8ccb4c64276b3538a09717e155342ccd583af19dbfc855fef98919eef2acdb7cca459bcb1748f49209a2501c74e018192f3a11e7711cac1d3
 AUX quex-0.71.0-gentoo.patch 533 BLAKE2B 40c189ff1c0cf6dde96351af9aa1d54f98111b23794b616dacf092c779a1ce8993fe87c8a03d486be1eaa819a1efab158bb27cc161a4c5fad1482ce004c75b4d SHA512 6d3fcaecbf45f130ada04bdcbbcd71e81cd623b3ff4ce5c5952285026e1080734f3d07ae4b59302c12787d06457cab561334f58fdd66a1bfed6f3b5cdd7c31d2
 AUX quex-0.71.0-py37.patch 604 BLAKE2B 50115d12bca3e4fa448549b799163944e85b01065a95df71c5dace1a5bb6e1671425758c3011dc80530ac3878cec24267a2506d58dbcb7427fcba7100dfad120 SHA512 92bce2ce2b6d9fa7438c8ff97f815db5ad17f422ca43937921f7b585aebf33f66bae2c385bb37f6a31962924786aee3b1e37e87daebf25e741878c81369ed3ef
 AUX quex.sh 28 BLAKE2B c2ae538107a05055fe883c5327c8c4baf2c45568fe34cae8d616a8145d4bc870c111f90aa6c7e88771ed6f20c4d55751625bdbede97b2b306ea025ca11223fd5 SHA512 97fb88ea8894d618ee133aac6edaf6317c247728801bb39f9a7be9ee30b278073290659a27dc72834d2783156fbf4ab6f1cb3c15da178ac0acf4718e6aa476df
diff --git a/dev-python/quex/files/quex-0.70.0-gentoo.patch b/dev-python/quex/files/quex-0.70.0-gentoo.patch
deleted file mode 100644
index c110c4bdb24d..000000000000
--- a/dev-python/quex/files/quex-0.70.0-gentoo.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/quex/DEFINITIONS.py	2017-12-13 21:48:52.887765325 +0100
-+++ b/quex/DEFINITIONS.py	2017-12-13 21:52:29.805877359 +0100
-@@ -57,7 +57,7 @@
-     global QUEX_INSTALLATION_DIR
- 
-     # -- Try to acces the file 'quex-exe.py' in order to verify
--    if os.access(QUEX_INSTALLATION_DIR + "/quex-exe.py", os.F_OK) == False:
-+    if False:
-         print "error: Environment variable 'QUEX_PATH' does not point to"
-         print "error: a valid installation directory of quex."
-         print "error: current setting of 'QUEX_PATH':"
diff --git a/dev-python/readthedocs-sphinx-ext/Manifest b/dev-python/readthedocs-sphinx-ext/Manifest
index 93948f6c7f5c..e53e027ea3ae 100644
--- a/dev-python/readthedocs-sphinx-ext/Manifest
+++ b/dev-python/readthedocs-sphinx-ext/Manifest
@@ -1,5 +1,5 @@
 DIST readthedocs-sphinx-ext-2.1.0.tar.gz 9961 BLAKE2B a172fb2b7bff930f4ef728c5509e0a303bd46fd07e5da496721896751dcd0fa4fa4ba3b4d3251931598cb6172e186a3f340100f13d88c840bcb6912e5a134185 SHA512 81e60f3b6216e1c0fef12493e668cff561937bc5da965b0dfd06dca2f034f95291dfa977f94f726ec7f0bf048fa57d9fd7887219ec172b14ff2558be5e09a130
 DIST readthedocs-sphinx-ext-2.1.1.tar.gz 10181 BLAKE2B 01ca34befd0f18bb747d7f843e0cc394e19db4fe471f2bb21617b6dbdf4c1ad9721047185561f9bfbd8f770e1fefd5b560e65d7c5e2675c1bc8d74e08252eeb1 SHA512 5594e375133477ecdc1d22a78c0d4dac73c5e8c1715f4309a9674497ef860b07e8872bb4ba471fbffacd8bd22bc49741b8df54ad9ca9bb474acd9cdee72c8969
 EBUILD readthedocs-sphinx-ext-2.1.0.ebuild 737 BLAKE2B c454efbb516d2b45c56fd90406e549cdf1f8ba04648c3e44d5ab4f32bd9f7cc2c26ba4bee5124ffdd5e7dd17e41a8e1ea0aa05936a147a58e3be72635e03f52b SHA512 4c7c892fcbe2c99ffe18409237b0f399779806e8facbf583f487d10f1721f6ece30e01d6746702f88d8c3aba268ba9d90d4cfc6b5ce7c0c6cde03a589a12d862
-EBUILD readthedocs-sphinx-ext-2.1.1.ebuild 743 BLAKE2B 6e7da88b3fa326bdc62496fb5473bfb04ac5d37dda1ae10daa02f7c97dd6c7222d88ab98af491369e13b3730cb04ec6e6a140ad56983a8783516622320ae92a2 SHA512 39b9a25537ad2287cbe521864cd2b38ec322bd7aa295d1ec5ae4d56a8d075e1aca47a9838f9f8658d52a58241ee9d45dea40dc17391d6f0d8e63808604970a5e
+EBUILD readthedocs-sphinx-ext-2.1.1.ebuild 750 BLAKE2B 591836dc90d61cd2b77039707282416410c9a4a988155ceb7eb38f9a78a79e7be43e691b6ce41053b96280de8fd3d853dbcb6990e195846a5599eac2cba4593c SHA512 6cbc6080a04ed2009bc5c60182824a89ef519ddc3715f9e6b4e0c58146b6ed57660473809b7e561b7c5d9f86803fb198fddc8ab52b58c522ef72ba45c12533e6
 MISC metadata.xml 271 BLAKE2B 31405284f0b172a72344c5300348da7b62689758b67e08380f46cd0b4d58313324f234550c2d8ffad7cf2c70165edf59c24a8b32ff6aeb82b63f7c40fc4180f5 SHA512 6c24a69f1cf6d89afe9dcea1b07cc8fd3fb9debc3cbfd154dcafa42bb18c84005e83d9204b9a21d91bbb23e952b1069d2f72c753e644926ef9bafd3d86fb4e2a
diff --git a/dev-python/readthedocs-sphinx-ext/readthedocs-sphinx-ext-2.1.1.ebuild b/dev-python/readthedocs-sphinx-ext/readthedocs-sphinx-ext-2.1.1.ebuild
index 72b472afcbca..98b6308e9fa2 100644
--- a/dev-python/readthedocs-sphinx-ext/readthedocs-sphinx-ext-2.1.1.ebuild
+++ b/dev-python/readthedocs-sphinx-ext/readthedocs-sphinx-ext-2.1.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
 
 RDEPEND="
 	>=dev-python/jinja-2.9[${PYTHON_USEDEP}]
diff --git a/dev-python/redis-py/Manifest b/dev-python/redis-py/Manifest
index de2084ee45f0..a2e23f7b15db 100644
--- a/dev-python/redis-py/Manifest
+++ b/dev-python/redis-py/Manifest
@@ -1,5 +1,5 @@
 DIST redis-py-3.3.11.tar.gz 131072 BLAKE2B 6becafba3da22bae796a4a9ba55d11a61d9ed1a8b693a734d4ef3f0e463c0c39a05c01546225f69eb36a788779d6e45d0136e1a6d6856ec63c3dd07994b5db9a SHA512 a32327fcebc6242367c0eda6c6dcd1a15d5d575527af2e9de0d76e05bc4afc7402566d9254e467663b81907a310731af3041236b6b135f3b8ff1429a502c1000
 DIST redis-py-3.5.3.tar.gz 141112 BLAKE2B b953d553a3cfa2d6ba6f5aa35dfaf93865acbfad0e901a96082c3b1c027dc23b6ceedde185f24e86772522fbbf4f0a4d18e115a6b40aff6a65450bbe397d5c07 SHA512 eae6ac6b3e0f1366a9c29e5e2d9a5210e4627e62e3006159b1c290f36cd9c1c2c12cafe0944f7a010e04632b517874f230aa9411491993b7ecf2080546217206
 EBUILD redis-py-3.3.11.ebuild 1392 BLAKE2B 0c8044cc01e3ddd2e0241b6c0c11af2e7502841ee35467e85ee0ce9d1f6d3a504f13dec3e398c3f25d824c4b1351455ad076f7f6c470c35cde219d34f29d576f SHA512 5e5e60f524274914a9aa3921f2e6f5d8f9cacef862d37aec617ae6f91c7970c0b6d629b3fdadc47f0a765fd85f87a8c90c89c2730cb4c8d39a468b697b6868e0
-EBUILD redis-py-3.5.3.ebuild 1729 BLAKE2B db3ed4946abbcc7759cf464a0973d7813a8fb1e5bcdfcbdadb290bc4155038fcefd6ceb2a2d643a5327be93c3dc835f4eab9936880158fcb22c98c68e9a4da82 SHA512 78a4901fb4e2e12d96617f3931637d8eb5765fc7e4729c8484cca59368f702103f7937444c31498af5e5640907e9d772427e0fea85d40dadd9888b2d3384499c
-MISC metadata.xml 511 BLAKE2B 6b9a364015a9b526496a892cb8d65ff20a347b7781813312272845504c36db9ee2a351169c306d0130dcb6cc71365d68ba1fc327140f5dda290c5e7281f0d6ed SHA512 9fba3ab00a43d2b876b6cbce7be1946a4fadfe22bcd360af49b738632583385f9607bf28fd828eff543f7b8877b6c86e8492367536dd44239800f3ddcd4d0bff
+EBUILD redis-py-3.5.3.ebuild 1723 BLAKE2B d96b22278935e59af6af816ea818f29592bcb3ae16232dd845b1d991eeb74cfb12482c8053ab7deda556d5a8d2854b89a7a9b550b9958c7cbffbdc84a1887cc3 SHA512 55588bd699a8d7836bf32f426dfcb1e7840c394f01435ec3f691ffa1f5a03bbf78ab567c9959777cd59ff03d98ecdd908fd9c2aca6fbeb1987d01acf0f3ac825
+MISC metadata.xml 536 BLAKE2B e146a8713662d8d635cf9e0927223bb427cbb4f684d7b484d3c005e84a7b961f587b7e31123d27ea8be7ac7ce83890c54a670b6d1062f221bacc496229f798ab SHA512 c651a0f6dfab0e857e04ba15924937a42d74c913cc82a1d8f46a0641f6e4fe85315da1a76cb1bf3a8ba3d4a3ee6649872af221b7c1196100cde107d9454c5dd0
diff --git a/dev-python/redis-py/metadata.xml b/dev-python/redis-py/metadata.xml
index 0d56d7eae1f1..add34b6842b7 100644
--- a/dev-python/redis-py/metadata.xml
+++ b/dev-python/redis-py/metadata.xml
@@ -14,4 +14,5 @@
     <remote-id type="pypi">redis</remote-id>
     <remote-id type="github">andymccurdy/redis-py</remote-id>
   </upstream>
+  <stabilize-allarches/>
 </pkgmetadata>
diff --git a/dev-python/redis-py/redis-py-3.5.3.ebuild b/dev-python/redis-py/redis-py-3.5.3.ebuild
index bd958cbad2e7..38013b4188fd 100644
--- a/dev-python/redis-py/redis-py-3.5.3.ebuild
+++ b/dev-python/redis-py/redis-py-3.5.3.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/redlock-py/Manifest b/dev-python/redlock-py/Manifest
index ca9f94e1a526..1e1bc14c8f52 100644
--- a/dev-python/redlock-py/Manifest
+++ b/dev-python/redlock-py/Manifest
@@ -1,3 +1,3 @@
 DIST redlock-py-1.0.8.tar.gz 6035 BLAKE2B c728aa262b0c0a8b87829edef4819a35700423500cdde7abf2ea8dae99451055006649ea6f52325ce632178f746639af0c716ab8998a815a22709d3b5b0ba202 SHA512 16c5e52019baddf0ff2a996e227d9a469be19dc4cb16a6f33df873c121717f9338ca180f264171e9e0de34c2c9dbc592e47a5c7272b646ec6dd047f46b1349a1
 EBUILD redlock-py-1.0.8.ebuild 545 BLAKE2B cda6cefe9de8e35c13671eadaa32595ee9df584c9cb5bc04aa9687228595c66723fdf46b94ea886bb481cc156d70370df297d6221750983734d74bb41c1a654b SHA512 c059d68b6c472b20498b8997b20fbab51ad8af6a3e3424d0fd0a326b6b5a41434df5357bfb0813e7474d7e9bee677e2de2e022cb5d6c6c4225c3d44b66e2af06
-MISC metadata.xml 353 BLAKE2B dd0204b4287ddb1cfcc5bd5728d83c84ea0b32dfdc1e5c552f50d5384cba0fb770b09f568ccf4333393d4935305ebbb4166883106341b83bff1fe6899cf88b81 SHA512 a5558284d50fb55c555137cb67dda3dfdf4d27245f1afa3f30c7aa8242e417c12f546f7d7c422bb98c8627de698f8d413bb9dc0fbeb00494c20cd6b5b5ad2224
+MISC metadata.xml 302 BLAKE2B d1520bf48d7d2b438d640af4928bd3a357a2149b6f62ce2a4289223dc8fb57f47e4ee6365c1fd010f0cbb6c3a5a1dd5b6d02196bfe67b9a60468447392a373ff SHA512 d2d74da9cf600c75f8a482bd9fff9e300352910615dcf3185d0cd2fb513b7a46fadf425bb8056900c3d4e2c7bf26767ba2c4f032bf459f0afbd01dfa8f3df3d9
diff --git a/dev-python/redlock-py/metadata.xml b/dev-python/redlock-py/metadata.xml
index 0fb0920e1af1..5f11f0716639 100644
--- a/dev-python/redlock-py/metadata.xml
+++ b/dev-python/redlock-py/metadata.xml
@@ -1,11 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="pypi">redlock-py</remote-id>
 		<remote-id type="github">SPSCommerce/redlock-py</remote-id>
 	</upstream>
-	<maintainer type="person">
-		<email>zmedico@gentoo.org</email>
-	</maintainer>
 </pkgmetadata>
diff --git a/dev-python/regex/Manifest b/dev-python/regex/Manifest
index 25e03bfa90ab..d3506afad0a8 100644
--- a/dev-python/regex/Manifest
+++ b/dev-python/regex/Manifest
@@ -1,4 +1,4 @@
 AUX regex-2019.11.1-pypy.patch 10520 BLAKE2B 7ba3b494c1562475ab3e5b996083bd75e2273104dd0e16d44a4162b5c6e994aa6ea109a05b1e338b0fc9e39be28edf193ca52d2642ac6bd57549d9dfde0825cc SHA512 145c7b530c807dc4a331a7c48a90a56418be1ab1cdd3072c554607f579836acf3199c8ff6dd56f74ef221dd24bf7ae390bde932f5d4a00761ce2e23dc2af1f4e
 DIST regex-2020.4.4.tar.gz 695848 BLAKE2B 0dc41e1f1464014bcdc10b7209f7ac0506aeb6a3e09c16b4ca302619aaa8271cb06138627e8ed7f64ff80cf661eb83f07b4514828cf7fa94f21211fc42ae9f7c SHA512 95eadaaffaf87a19b31024ad3cff670d34a31de8b9be430fc276a533a584203842d1634b66a346c4aaecf2407b973bb1ae9c8ee8b48785d03bd5e45a67a271a9
-EBUILD regex-2020.4.4.ebuild 884 BLAKE2B 887c9215e1a9f7574b1ab65d4d798c3fcda668f0a897e8043fb0be005bf9398de5690aa78fe1d035d611fd37d56e5a9f9413e977afea6f79e18705af0a074cff SHA512 677ddb3380776e6839382d46e4573a1548adc61dcab70e6bbf716651a8ea97de82d4ad89f449bd2630482cd6afa39fa9f9d33db14beedda4b9d4d614ca71bada
+EBUILD regex-2020.4.4.ebuild 891 BLAKE2B cc297438e718edd52cf697f07de339eca1cfd80ea9f863008bf3141c424d20cebac15ef4fa1a8099ccf19fd7ede3d8394b9673580b22d6e3dddd45382c6fc75c SHA512 a65381a6911d114a9c8d0cecbb0fb6ae02c3e4c79a75c3d53bce39d528d9ec861fe1c370046db2c781cefccb4c0e3f27b06f3553b7ab70ea3295d77b28fbb23e
 MISC metadata.xml 384 BLAKE2B 4928f66b54b5e4de6a8b913207ec6e46c124e55510eac304a7fd46c6ca63cce60704757e9289bf35d2d58e9ddcd4aa98d751a079c79f09dda9206553096e0561 SHA512 3db0a8abe7036cd9d0fd8b1450598436dbb30581806380ad51c3d0f49d129325aba1bad9700d14adffc7cfd199c4ec3377e6eb0225244bfc82368bbb50548e07
diff --git a/dev-python/regex/regex-2020.4.4.ebuild b/dev-python/regex/regex-2020.4.4.ebuild
index af9059b06afd..807392594a6e 100644
--- a/dev-python/regex/regex-2020.4.4.ebuild
+++ b/dev-python/regex/regex-2020.4.4.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86"
 IUSE="doc"
 
 PATCHES=(
diff --git a/dev-python/requests-cache/Manifest b/dev-python/requests-cache/Manifest
index 9c026f5ee981..ce9a508bccea 100644
--- a/dev-python/requests-cache/Manifest
+++ b/dev-python/requests-cache/Manifest
@@ -3,4 +3,4 @@ DIST requests-cache-0.5.2.tar.gz 31159 BLAKE2B 4fca146a751064baf70954a71df64dbb7
 EBUILD requests-cache-0.4.12-r1.ebuild 660 BLAKE2B 14efb1699ae8bb1ea2680c3798c4f50143885325ec74d9b15f8cbbf63150e74aa4b0972095e12799c73dda31482da6c25c70467ec40da5c62cd69d2173307838 SHA512 3add4369d3b8716f9aa89985d69c973fe99dc1d28b02c12a9b4768f493edfb5a5b9e843e9a7ca9360b94ac9d01c5e8eb7e6f033d1023083ab5b8606ab59406ed
 EBUILD requests-cache-0.4.12.ebuild 837 BLAKE2B 6784908d623e3d0cb4839ffc6d50b53e0dad3b37e1e9469773dbd6a3a793ed0c677965a8ca2a04c8e160df8a4e0ac9b4f19319184060c9b4cd99f399b69d01f9 SHA512 a89a3b2a4475a910167fb67284e08a7b1e30e90e3358ac340f3fced156021c9e74e31265398cb76d21c0f40d0c85a49fe981d84deebbe34fc44883ca04fd78f1
 EBUILD requests-cache-0.5.2.ebuild 2836 BLAKE2B 3c83e773ed1470a22c792d395ee460bf06ff38f6f1a63cd3812b35e6debb1201749e32c1dad0c12bff1a7f5a6d9a8df0b57d143a5885fe5457067eb5ae09f3c2 SHA512 479c04691d3a9d2343b752e6f55b8890f7a463dd74e78016500f76e4c6fb0d94da06fb6148207531e43c8cd4af267e5859598ce9d997e6c20e2cfcea4b7cfb91
-MISC metadata.xml 444 BLAKE2B 6008ac86bdb3740724aff487116d542902602f70670735ac2219b72db042b1974ffa6b4eab0254e59d16fa0438e022d8b9f675899b0ac181d88d4f82dd78d04e SHA512 0cc1b4cee3f1aecef89eb15ffd1e03a0ff4887f9b87a10ea90b6d11e3f5144b8d8d67dcad8c1dd26df3cea9e07140ed1ec76c4b1587d0db1b0f9c60b6daad41f
+MISC metadata.xml 469 BLAKE2B 7a0fbb271ec0f40665d6fbce539cb49a818f5f3876642c7d9d721566fac8fa81b0f39f4a2ce6b2b0884b6c2ea79a1bbf8c95d2f86c75372725dbc53757f0154b SHA512 6485eecd67956b0ad5eaaad22c5e68e9bc9acaf0330aca6c3c0a378b5153ecc7a086fac08e9932d03ea4ff6448c63958fc8faeabefd4c68140f44b0fda0f31f5
diff --git a/dev-python/requests-cache/metadata.xml b/dev-python/requests-cache/metadata.xml
index 54115df8f824..e9326246e42b 100644
--- a/dev-python/requests-cache/metadata.xml
+++ b/dev-python/requests-cache/metadata.xml
@@ -9,6 +9,7 @@
     <email>python@gentoo.org</email>
     <name>Python</name>
   </maintainer>
+  <stabilize-allarches/>
   <upstream>
     <remote-id type="pypi">requests-cache</remote-id>
   </upstream>
diff --git a/dev-python/requests-kerberos/Manifest b/dev-python/requests-kerberos/Manifest
index c93c40034335..c8986c304c2a 100644
--- a/dev-python/requests-kerberos/Manifest
+++ b/dev-python/requests-kerberos/Manifest
@@ -1,3 +1,3 @@
 DIST requests-kerberos-0.12.0.tar.gz 21579 BLAKE2B 297cbecb0fc3508f5f62440c5860dcd94eeb077e68757c0646e7e3bec65cd34e19212b9992dad491ce0adeb91234db533528936f740599e42ff439f78af103ba SHA512 b925b5f9f6753e87368dce451927df09568d0d6126d4ae8514bbd99a794d983e32298b92b6239be9f95595483e2682259cf165c6997d17d9cea64a81d4af1a06
-EBUILD requests-kerberos-0.12.0-r1.ebuild 786 BLAKE2B 26a5a41022a20da8db637dc099c7c50c6631081224f13d6b4f9666bc8ac799baea82f5966178639409b082c8cc964cf3ec9c105910664f79cdcb6dad5003051f SHA512 763c3454a6bfd7a8902d747de27527c5dde93309202ae6534523ec962c82f4cd1563848e20a659cba0fd740d6b967507c8c58f31161b30f681231aa0ce175ed4
+EBUILD requests-kerberos-0.12.0-r1.ebuild 785 BLAKE2B ba29fb850e944606b93a3bd8b71c749360536493835ef05c67dc86a677fb377e53a13250fb36ff3b04bd7f2cd1cff526ec3234b29fe2115c74ba29b3e18d34e5 SHA512 d61dde76a112cc87fc1a950498440eee7f3fa41b73fa7fe1228f04057cb0e0ceb030926c040c763d7255d6c96307a0aa3c26863f0529e924a4b2d36e5aaea0fd
 MISC metadata.xml 320 BLAKE2B c58268e9df73385438694b43f3784a58d11f003adcebc306d70ddeea26789cfa22f709484a99902326074d16072563011c07f09eb071a9c141e4ee6ded7dbd56 SHA512 a33854d5f3c9a4d077d51a4254d18045a4fb0a50c223e809ea0a7415c869152e30122c3d7e005b25c7e07bd660678db5613449688c086582c172a77d19a9e540
diff --git a/dev-python/requests-kerberos/requests-kerberos-0.12.0-r1.ebuild b/dev-python/requests-kerberos/requests-kerberos-0.12.0-r1.ebuild
index bd443921b993..67dbb48b22f6 100644
--- a/dev-python/requests-kerberos/requests-kerberos-0.12.0-r1.ebuild
+++ b/dev-python/requests-kerberos/requests-kerberos-0.12.0-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/requests/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/requests/Manifest b/dev-python/requests/Manifest
index eb06269cd2a1..4e6805979386 100644
--- a/dev-python/requests/Manifest
+++ b/dev-python/requests/Manifest
@@ -1,5 +1,5 @@
 DIST requests-2.23.0.tar.gz 114327 BLAKE2B 75bdf83e117e9f67c2032609ed5c20582f743519ab8364dd6b12685efd6b6e438f1c155fe9d3df87e48608747f59df6d99698d1f68e5df6c0cbced9e7d1a9b37 SHA512 a0f7db5cc9ce67af9f6f81b72e41491735a102f2a1da2fbde98e279846e2140cd26b6370aa5ec79c148c397885a7ae2bbce45c4587215f510dd02b8ac57cb46e
 DIST requests-2.24.0.tar.gz 115071 BLAKE2B ae98be1d023b2a7b883e15a7a5d214ecbf482234e9de6bfc9cd06d1f04d1b57d101d41a2c6fdd07b7a6b468875463514841d2e023391ac8ae0797a2cb58b3424 SHA512 46ca8ab70eb39be8398c242404b9b3ffb6baddd5c78eaad125b55c719154eb8c7b6a737a8dc587b0cb51b3b9a074abaa8b2ff347a64d38f4f90cdba4db16a119
 EBUILD requests-2.23.0.ebuild 1734 BLAKE2B 283bb4889f5d8609ca75afd8c1cab7eaef7733308b6dc804b2bb94fc6df7e8706496727b181f3663bf1a6b1448669788576c3c48d52aa86292a6d77309d61bfd SHA512 790beb81a88ac5b44d720fd04160db94d1bf7eded7287e69e38d013500650de6c920794d7bfebdd14e972e87fe79b9d1930ad19ab3e67461cea51076818fa3ce
-EBUILD requests-2.24.0.ebuild 1503 BLAKE2B bc4214375ea420b17caab74480625ea35a9b8dad44f3ce1646771d73848b3635c9d69396545302055441e3de2c1986512ae945213f43e6afc3986ebb41755600 SHA512 4d39cbed421dcf4277af1fcea9ae22054019f41cd81e5d4e63ce7766066224f4af2a1b436821e35f98e75eaf097607eb77230bcea3f669c4afc1c27da4e6fc85
+EBUILD requests-2.24.0.ebuild 1510 BLAKE2B ebd7140f06fcc78c879b15dc0b0022ab6934fa1ad6f1dbbaa1eb2e97f10f722cb2d1d79ef756a3dcfc7a3dc88e66066ed08974721a5e446c13e0aa06c8a2613f SHA512 6643d9bf90198fd708f041c126d51c52c3b477e210a417c0aec5b423f6904196999015547cf9dca9f5287fc9d40708cfc59a6e00d85e7738096e2b6ea5644dba
 MISC metadata.xml 769 BLAKE2B 3b70fd8b559e10b971a7c72e4e134028300406af09445bf3d9c013cc15899f10452b493730b0af5f1ec958b81f719ae1af9be96cbf3fb5c0e3bf6f5bf1de7326 SHA512 12d72ea4ecc2ba0a58306917322a1687b73a3234b6dfa7f9ddbc4aa861daa4a56bcc6a8ea7e5da7cafdca2239f065c0f839a998de133958656b2c9a764fc30ae
diff --git a/dev-python/requests/requests-2.24.0.ebuild b/dev-python/requests/requests-2.24.0.ebuild
index abb1b5f16cc4..5b2fd3419e23 100644
--- a/dev-python/requests/requests-2.24.0.ebuild
+++ b/dev-python/requests/requests-2.24.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="socks5 +ssl"
 
 RDEPEND="
diff --git a/dev-python/responses/Manifest b/dev-python/responses/Manifest
index d0d5d67878ae..682dc8437035 100644
--- a/dev-python/responses/Manifest
+++ b/dev-python/responses/Manifest
@@ -5,5 +5,5 @@ DIST responses-0.12.0.tar.gz 26527 BLAKE2B 71769b683f9c672d52844803e76ff66def61a
 EBUILD responses-0.10.15.ebuild 679 BLAKE2B d645fc1d382f505a1e6edc028ea85e21aabb3f3af20748affa0cb9ee5da00cd814b6becc8dfe064636ace682c88778620aee83f8716e79f215b1725a752c8312 SHA512 20d427ec114cb68fa7f1a711d21d489797ee8f9d9dbfcdb281be0c99c6e7920d54b7a3376cd8b761cfb7af5f3eceb404d9cfe6475d68f7d607e60f40d4e2e031
 EBUILD responses-0.10.16.ebuild 741 BLAKE2B f468d5cf7b8ac61d6712938ef415b12d4a92fb82f78bbdce63c67f073a7db5a2a858ed3bdb832e078fa09e4996f32702ae42506a359adfd2618c1fd1d9b1ea2e SHA512 7051cd03689b283a125be6e27f49b50120ebf675f221985f4fcae839a7239ecbcf2006026a56043f7526dc66feff2e3bb778579ddf05bd18cf06f228be5c61f3
 EBUILD responses-0.11.0.ebuild 754 BLAKE2B b69e9ec2b714f75bd6f381fa5570ba8e380aaf34df52aa3c3aa9211f71dd00692040c2cd4da25ecf83208c2e2c6bfc4ec5f6428ac4ccf8148e5afe3c52ecaad7 SHA512 424dc0b08a0f378f7f3040ed1b046dcb931dc5005d33f0cf2eeabc271f44b3a3bcde4854a745094620180daf0917bf7f3b12869e99ae0272a22a8d10170b49a1
-EBUILD responses-0.12.0.ebuild 767 BLAKE2B dcd8765793b7a5a89c318765be5526b797d53792a186ac7e92cbce64cf7a1e9ae76a935464d9e6a37620002b6f14ac2cd7741f47f44550421e9ec3e17c2c2181 SHA512 b678427ef8b2578e06816921b223df22a172f493a6e7fa9f2f82c78fb8f91dc64968211dd2393669cd2e68f1c6d163e3a370f2f613292e21f0e31d86c05158b5
+EBUILD responses-0.12.0.ebuild 772 BLAKE2B 1414f48b939f053746f4e940bdb00c23e6c0b4b6bab4ae00cc44bb8fa2b91fd94a24fbdec4da2cd527a41b380b7d094fb3d6e50353482e8c3abb99f6971a0787 SHA512 06dc9a1e5c655c1bbd6f2d05442ba345680fcc8786e8de2801bac48443f0c502f493a1a8377fcbb3b913dac41ab63f945b43e6f3198dc085b1f6280c1eaf9beb
 MISC metadata.xml 462 BLAKE2B c0afeab502da79631572ffa360f5b5cb19d41be177e9dc028041642cc756e08df0df9685c49825a40f3f343a29defe87f1f1e4805568d1037eab73895606221e SHA512 1b33da0d6d1ea49e0f108362c903f3521704ce8eaf1f328441eeb6950c19900eae5abf08204a0402cf7387077f32da97e5a84b2b6bb7c347a39a38e18032de33
diff --git a/dev-python/responses/responses-0.12.0.ebuild b/dev-python/responses/responses-0.12.0.ebuild
index e92b34b1dd04..238112b0babe 100644
--- a/dev-python/responses/responses-0.12.0.ebuild
+++ b/dev-python/responses/responses-0.12.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-python/rfc3986/Manifest b/dev-python/rfc3986/Manifest
index 9a1fa8d0c9f0..79fd4047163e 100644
--- a/dev-python/rfc3986/Manifest
+++ b/dev-python/rfc3986/Manifest
@@ -1,5 +1,5 @@
 DIST rfc3986-1.2.0.tar.gz 40162 BLAKE2B d51db37285366fdc7a6d25632afe440bbcdf4fbca46488082286824f046cfd81129b8f0e0695f986120276cf446dde5751dc52ebeb5f2f61f60c5acb92f2da1a SHA512 b88bdc47fa2daa6a9ffc339b1b997a85d0c8b3bf3ab271554e2a1a684c0394370e9cba07a82a542f39533a4c8cae69414234545db6caa2508e0ee7e7f8bdff3d
 DIST rfc3986-1.4.0.tar.gz 44912 BLAKE2B 595a644f8f92823ad31113ce88218cb30d16b37ec7303c0d8e89d2d2b1e18448d99003e95d61dcf09cb64aae517037bae798d1e89c74b652d517a648e80856e8 SHA512 dbcddc09331b794eafed8c2d7b81b7b632ba5cae2741e33ad12e781bc923427a05febd2f2715d037f35769b18c8d790546dfd4bbebe6e71d35777745e446888b
 EBUILD rfc3986-1.2.0.ebuild 695 BLAKE2B 95fe3ea442f935fece537c2f9f734505da65d160b86760fea67632660831b0d270d65b23987ffcae61df03e7ece9f172ae1a10e0b1279b7db2886332f909696d SHA512 3a2f6f515b046b9a22d83ccc33ff7aa6f5c6dd004931f938d26d902b9d3368cdb7ad7679e58c340cd4a104ed260e81d7669e76267b99e0e355b38bf8d5bf2b0f
-EBUILD rfc3986-1.4.0.ebuild 665 BLAKE2B 6409aeaa2ce678f1500ab807365ba6922609e54e349e6336cf83a4f8332e5ded854eb7001bbad0d5ee8a75f02518241309c69c146f2b9ede65380f0fbb74ecdb SHA512 417b9080e7a40cfcb7648d739a7fa97781cfbf6fca8005d93818d42730eb2c3264ef28e8f8fe501fb76d6050bd6e20a996dbd47c4dc77d9d11923098eda2f750
+EBUILD rfc3986-1.4.0.ebuild 664 BLAKE2B abb58bc5c28ee5d4ad9e37d77c7b568e3e67ffead849cb04d974995798876a403bcb547890377f210b698e81fde62ec323c38df35ef797a9025fd8751550891b SHA512 cd911d46b16f6f5748ecb7cdc2a2ca9ec47142431f1aea957c4dfcd6436554cef924d2f471fd82c23792c0970f4af98ef3a29181ca2ef81fc1cddc5d3eed8264
 MISC metadata.xml 740 BLAKE2B ad52fb6e822fe4ab8e910af9f4896079209f0704c649d240464eb283c9796f5bead9303b7bb02f5db5049b9afa430bd190871c1bc391a21647eceb0d353c02c0 SHA512 3b74fb8b21300169b3d9da6c8a14bcd950d277c56ea242a73fc56637d853cba64de931567b19c0cd8b9acd6f7b8e486fb9e1ce0716b1c291669e6588caf6611c
diff --git a/dev-python/rfc3986/rfc3986-1.4.0.ebuild b/dev-python/rfc3986/rfc3986-1.4.0.ebuild
index c4344c9d9d9d..c7ee2f6a9745 100644
--- a/dev-python/rfc3986/rfc3986-1.4.0.ebuild
+++ b/dev-python/rfc3986/rfc3986-1.4.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
 IUSE="idna"
 
 RDEPEND="
diff --git a/dev-python/rq/Manifest b/dev-python/rq/Manifest
index 38f072da5111..be69949b1d53 100644
--- a/dev-python/rq/Manifest
+++ b/dev-python/rq/Manifest
@@ -1,6 +1,8 @@
 AUX rq-1.5.0-no-install-tests.patch 449 BLAKE2B 3a69c2fcf868c21565b2660fafb519fd175cb375643f85d91754a651fc012d12db32c8875b8f8236407672aaa787aef1e4484a4e33b9582c65aad00c525a7180 SHA512 373b94f956aded0d54ecaa04250533f564f3a8e81d693353c4ce63dfd754f013e741084faaed976ae9b0aca4c0f2a21cf70f2118820f157282966a8446f7c1e8
 DIST rq-1.5.0.tar.gz 569320 BLAKE2B 5349f6e806c5348e584513bf8fe8828c44909b8f4e53fcdfe40e0c617f162859dbc89d4595993c29227a25cef5b6ddbb758c51c3e50b442ada62eaca0585490a SHA512 87eb83de529afe3a1e0a9f2b1727aba97482e3e55024aede29ad6e12ed5b92ca147bef8d720a09b34939c04ac5e37642147aea5b1b7686ed4b2aaacdcf998f6d
 DIST rq-1.5.1.tar.gz 569967 BLAKE2B 9de43fa2d88a58186e8889163f4c1ea92da068c3652c5e32008a39c0e3b27e06f4a1c696a88d1dbf5b05d280bff9c1c56a1995673e9d0ff3fb3a50498729e96b SHA512 2a03b79c7f1b253e2974007616ad3342e0b98ef9f57b0ca9dd41ecb4319074cec3ae4ba5f8958f54a1c2a6342062d74a33ec6d03689f3a89074854483af74b4f
-EBUILD rq-1.5.0.ebuild 1707 BLAKE2B fce5cb210014c7d1fedef4863a03395bbae186b4f11dec7dcd777a787e8c759899ec803654fbba9d34652ab2de05418ecccdd8de759c257074c7cc7f9612fa22 SHA512 35b86e12b4dde7dfb6e8e10f949ea33f2d96b2a5970f8e3e93d6a65d232b93397cc204e23058a97ebb6ec9b0ecd4a3a77d5203a569f699b6d00b781d102800c9
+DIST rq-1.5.2.tar.gz 570138 BLAKE2B de1f9b9b1d790d0ea3efcd93e916f79b2f28521571652ba048adc725bd53b657cab5a7b2bc65b320a1c2766f77dba399ae62e90fa0a2514fc59565b8949c0327 SHA512 2e2cfe97d427057281415cfb1593ad504485b0398b72f55a93cfa48c7bae8f800ed1b1ad2aa447fe3f6baabd7bb112af29181577d31b270aee58cf4558d15a5b
+EBUILD rq-1.5.0.ebuild 1701 BLAKE2B 820a93a33aa4aadb3651e1390825b3a5cb97a82683d63018b4e37654aec7aeac3f4341cb95cc123eda1b1e58b4bdb218b4fa4f4a067bea6d3620839d1a50bd7a SHA512 1bee4738d4726293394aa81252f5ac35e43afd32760c54efa50f3884b2425c2304b69c31421cf351f85ac86ebb82373bb35308e7e74ef1b14a66bd7f43089443
 EBUILD rq-1.5.1.ebuild 1707 BLAKE2B fce5cb210014c7d1fedef4863a03395bbae186b4f11dec7dcd777a787e8c759899ec803654fbba9d34652ab2de05418ecccdd8de759c257074c7cc7f9612fa22 SHA512 35b86e12b4dde7dfb6e8e10f949ea33f2d96b2a5970f8e3e93d6a65d232b93397cc204e23058a97ebb6ec9b0ecd4a3a77d5203a569f699b6d00b781d102800c9
-MISC metadata.xml 537 BLAKE2B cea9e02497c7b7bbb6201bd29fba755b56a3202e7442f3995eb33d7d7467ed8f52f6448fd351963e350bb3c7fd77ed94d3413f84a6cdaac0878d5872964b1076 SHA512 abff6d380c7da5b198297b9804e1ab8b950a051226f8f2c7bbbbc875dfe6a6efdb73f58800b21658406000280d91c401342552319e124b6fdc6c3e72d2c9cb32
+EBUILD rq-1.5.2.ebuild 1706 BLAKE2B 6da88de91e0fc4a6d2a7b4d9927a9facd49d42db6b547628bc7416ab7c058bf0ca2eea534d4f2f8b829828d222ea4cdfe3a749a82596a719d3d3d59e7dae4b9c SHA512 07b51057ab62b5a7c421e9b5b24ef809af721e30f42bf08aaf6d6c11247500d78ecd43fcc6a0ec0ddf060e891947068ee8c6a18bc66e0f4da7153511071994ef
+MISC metadata.xml 561 BLAKE2B b0f95e81961b91a9ee8b6911f12a4ae0738dfb424b18f934a8a113dc509a31f87c69cbb22b8e049b82f847f34509b222baca3985b3873567cf7089238d6568ba SHA512 bf1c6bc1794ae0e20f6622c9bacc501bb6b0d9ddb4f1caa2de64e20b31f050a6329ecaa7baf26159f24f04a2b75798693fbb3071554d0fbbb9f8577ce8d91797
diff --git a/dev-python/rq/metadata.xml b/dev-python/rq/metadata.xml
index 87176f9df319..6baf4a0d2bfc 100644
--- a/dev-python/rq/metadata.xml
+++ b/dev-python/rq/metadata.xml
@@ -16,4 +16,5 @@
 		<remote-id type="github">rq/rq</remote-id>
 		<remote-id type="pypi">rq</remote-id>
 	</upstream>
+	<stabilize-allarches/>
 </pkgmetadata>
diff --git a/dev-python/rq/rq-1.5.0.ebuild b/dev-python/rq/rq-1.5.0.ebuild
index f812fe5722f3..bf64010f33eb 100644
--- a/dev-python/rq/rq-1.5.0.ebuild
+++ b/dev-python/rq/rq-1.5.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/rq/rq/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/rq/rq-1.5.2.ebuild b/dev-python/rq/rq-1.5.2.ebuild
new file mode 100644
index 000000000000..7c976453a10c
--- /dev/null
+++ b/dev-python/rq/rq-1.5.2.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+DESCRIPTION="simple, lightweight library for creating and processing background jobs"
+HOMEPAGE="https://python-rq.org https://github.com/rq/rq"
+SRC_URI="https://github.com/rq/rq/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+
+BDEPEND="
+	test? (
+		dev-db/redis
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/sentry-sdk[${PYTHON_USEDEP}]
+	)
+"
+DEPEND="
+	>=dev-python/click-5.0[${PYTHON_USEDEP}]
+	>=dev-python/redis-py-3.5.0[${PYTHON_USEDEP}]
+"
+RDEPEND="${DEPEND}"
+
+distutils_enable_tests pytest
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.5.0-no-install-tests.patch"
+)
+
+src_test() {
+	local redis_pid="${T}"/redis.pid
+	local redis_port=6379
+	local redis_test_config="daemonize yes
+		pidfile ${redis_pid}
+		port ${redis_port}
+		bind 127.0.0.1
+	"
+
+	# Spawn Redis itself for testing purposes
+	# NOTE: On sam@'s machine, spawning Redis can hang in the sandbox.
+	# I'm not restricting tests yet because this doesn't happen for anyone else AFAICT.
+	elog "Spawning Redis"
+	elog "NOTE: Port ${redis_port} must be free"
+	/usr/sbin/redis-server - <<< "${redis_test_config}" || die
+
+	# Run the actual tests
+	distutils-r1_src_test
+
+	# Clean up afterwards
+	kill "$(<"${redis_pid}")" || die
+}
+
+python_test() {
+	# Tests needing rqworker:
+	# TestWorkerSubprocess::test_run_access_self, test_run_empty_queue, test_run_scheduled_access_self
+	distutils_install_for_testing
+	PATH="${BUILD_DIR}/test/scripts:${PATH}" pytest -vv || die "Testsuite failed under ${EPYTHON}"
+}
diff --git a/dev-python/rsa/Manifest b/dev-python/rsa/Manifest
index 0ea78b628b8f..bf31d2e2db3a 100644
--- a/dev-python/rsa/Manifest
+++ b/dev-python/rsa/Manifest
@@ -1,4 +1,3 @@
-AUX rsa-3.4.2-cve-2020-13757.patch 5806 BLAKE2B 45f87653e3c0cbe29054d0a2d4e4838dcd1e91aeb921b3abc540d1f9dec157a75559ffdd933ef406f053343721b0963e3e647ee1e71cccf28946b2a1a4a0f97d SHA512 075ce7a8c6a4eb3716e51c9fc1ca446f5a922d701158dab5beb745887083c04b9e434f2cd4c8468fb71c814a51e5b7d96161d44dddafc539fcb5dfec4bf2602b
 DIST python-rsa-version-4.2.gh.tar.gz 63280 BLAKE2B 1260fe2a0f34c16b3cd2e18bc642da2e9c6caad851920a4c010aaad31959d0baab397356cd2437eb4a9091b3f524760f45b8d46ff9a207be009b2613615681c1 SHA512 a4df2de41d252a42627e96298b044a50953c429b5062f02cc7b64a7e17f75b09bb8b0f9b371353e639d1daec7775c20f20348f45baf00f591514c54e1315f044
 EBUILD rsa-4.2.ebuild 770 BLAKE2B 04113beba14d1c9756ac2977b54e2f5af7fb8c54d00ac5f6eeefe9e9f813f603b6035c56cc3c0d90c401b73501a931e2a279648849a2609e91ca8f281d41c50a SHA512 214b60d5718324085bcb94f1fb67ccd04ee7567a6cb42c876e335e7869e8364368dcf831cb55515c5f56fe807ed85f69cdacbc7fc1b8971427000f8c28e043f5
 MISC metadata.xml 316 BLAKE2B fd1e4f7bdee45f5ab99e67cc3918634b9ac5ecfad75167aad5f2ee33cea308f99d8d03aab5b5e0c01e8c1bf41ca8a45f67146c5126f84af4b6d914f58af0ea38 SHA512 4d8c48ae8e4360727f5c4b83e426f42a597a175dfa2a965c9f966e5824a83291c78d3e8e636d21b4f28d73f7e912abc7db1b09078baaa0e3a1b25713abd3d0a1
diff --git a/dev-python/rsa/files/rsa-3.4.2-cve-2020-13757.patch b/dev-python/rsa/files/rsa-3.4.2-cve-2020-13757.patch
deleted file mode 100644
index ccee6c0281bb..000000000000
--- a/dev-python/rsa/files/rsa-3.4.2-cve-2020-13757.patch
+++ /dev/null
@@ -1,95 +0,0 @@
-diff -Nur rsa-3.4.2.orig/rsa/pkcs1.py rsa-3.4.2/rsa/pkcs1.py
---- rsa-3.4.2.orig/rsa/pkcs1.py	2020-07-05 10:28:57.622204136 +0200
-+++ rsa-3.4.2/rsa/pkcs1.py	2020-07-05 10:30:28.103672033 +0200
-@@ -232,6 +232,12 @@
-     decrypted = priv_key.blinded_decrypt(encrypted)
-     cleartext = transform.int2bytes(decrypted, blocksize)
- 
-+    # Detect leading zeroes in the crypto. These are not reflected in the
-+    # encrypted value (as leading zeroes do not influence the value of an
-+    # integer). This fixes CVE-2020-13757.
-+    if len(crypto) > blocksize:
-+        raise DecryptionError('Decryption failed')
-+
-     # If we can't find the cleartext marker, decryption failed.
-     if cleartext[0:2] != b('\x00\x02'):
-         raise DecryptionError('Decryption failed')
-@@ -310,6 +316,9 @@
-     cleartext = HASH_ASN1[method_name] + message_hash
-     expected = _pad_for_signing(cleartext, keylength)
- 
-+    if len(signature) != keylength:
-+        raise VerificationError('Verification failed')
-+
-     # Compare with the signed one
-     if expected != clearsig:
-         raise VerificationError('Verification failed')
-diff -Nur rsa-3.4.2.orig/tests/test_pkcs1.py rsa-3.4.2/tests/test_pkcs1.py
---- rsa-3.4.2.orig/tests/test_pkcs1.py	2020-07-05 10:28:57.621204131 +0200
-+++ rsa-3.4.2/tests/test_pkcs1.py	2020-07-05 10:32:26.858286153 +0200
-@@ -17,6 +17,7 @@
- """Tests string operations."""
- 
- import struct
-+import sys
- import unittest
- 
- import rsa
-@@ -64,6 +65,35 @@
- 
-         self.assertNotEqual(encrypted1, encrypted2)
- 
-+class ExtraZeroesTest(unittest.TestCase):
-+    def setUp(self):
-+        # Key, cyphertext, and plaintext taken from https://github.com/sybrenstuvel/python-rsa/issues/146
-+        self.private_key = rsa.PrivateKey.load_pkcs1(
-+            "-----BEGIN RSA PRIVATE KEY-----\nMIIEowIBAAKCAQEAs1EKK81M5kTFtZSuUFnhKy8FS2WNXaWVmi/fGHG4CLw98+Yo\n0nkuUarVwSS0O9pFPcpc3kvPKOe9Tv+6DLS3Qru21aATy2PRqjqJ4CYn71OYtSwM\n/ZfSCKvrjXybzgu+sBmobdtYm+sppbdL+GEHXGd8gdQw8DDCZSR6+dPJFAzLZTCd\nB+Ctwe/RXPF+ewVdfaOGjkZIzDoYDw7n+OHnsYCYozkbTOcWHpjVevipR+IBpGPi\n1rvKgFnlcG6d/tj0hWRl/6cS7RqhjoiNEtxqoJzpXs/Kg8xbCxXbCchkf11STA8u\ndiCjQWuWI8rcDwl69XMmHJjIQAqhKvOOQ8rYTQIDAQABAoIBABpQLQ7qbHtp4h1Y\nORAfcFRW7Q74UvtH/iEHH1TF8zyM6wZsYtcn4y0mxYE3Mp+J0xlTJbeVJkwZXYVH\nL3UH29CWHSlR+TWiazTwrCTRVJDhEoqbcTiRW8fb+o/jljVxMcVDrpyYUHNo2c6w\njBxhmKPtp66hhaDpds1Cwi0A8APZ8Z2W6kya/L/hRBzMgCz7Bon1nYBMak5PQEwV\nF0dF7Wy4vIjvCzO6DSqA415DvJDzUAUucgFudbANNXo4HJwNRnBpymYIh8mHdmNJ\n/MQ0YLSqUWvOB57dh7oWQwe3UsJ37ZUorTugvxh3NJ7Tt5ZqbCQBEECb9ND63gxo\n/a3YR/0CgYEA7BJc834xCi/0YmO5suBinWOQAF7IiRPU+3G9TdhWEkSYquupg9e6\nK9lC5k0iP+t6I69NYF7+6mvXDTmv6Z01o6oV50oXaHeAk74O3UqNCbLe9tybZ/+F\ndkYlwuGSNttMQBzjCiVy0+y0+Wm3rRnFIsAtd0RlZ24aN3bFTWJINIsCgYEAwnQq\nvNmJe9SwtnH5c/yCqPhKv1cF/4jdQZSGI6/p3KYNxlQzkHZ/6uvrU5V27ov6YbX8\nvKlKfO91oJFQxUD6lpTdgAStI3GMiJBJIZNpyZ9EWNSvwUj28H34cySpbZz3s4Xd\nhiJBShgy+fKURvBQwtWmQHZJ3EGrcOI7PcwiyYcCgYEAlql5jSUCY0ALtidzQogW\nJ+B87N+RGHsBuJ/0cxQYinwg+ySAAVbSyF1WZujfbO/5+YBN362A/1dn3lbswCnH\nK/bHF9+fZNqvwprPnceQj5oK1n4g6JSZNsy6GNAhosT+uwQ0misgR8SQE4W25dDG\nkdEYsz+BgCsyrCcu8J5C+tUCgYAFVPQbC4f2ikVyKzvgz0qx4WUDTBqRACq48p6e\n+eLatv7nskVbr7QgN+nS9+Uz80ihR0Ev1yCAvnwmM/XYAskcOea87OPmdeWZlQM8\nVXNwINrZ6LMNBLgorfuTBK1UoRo1pPUHCYdqxbEYI2unak18mikd2WB7Fp3h0YI4\nVpGZnwKBgBxkAYnZv+jGI4MyEKdsQgxvROXXYOJZkWzsKuKxVkVpYP2V4nR2YMOJ\nViJQ8FUEnPq35cMDlUk4SnoqrrHIJNOvcJSCqM+bWHAioAsfByLbUPM8sm3CDdIk\nXVJl32HuKYPJOMIWfc7hIfxLRHnCN+coz2M6tgqMDs0E/OfjuqVZ\n-----END RSA PRIVATE KEY-----",
-+            format='PEM')
-+        cyphertext = "4501b4d669e01b9ef2dc800aa1b06d49196f5a09fe8fbcd037323c60eaf027bfb98432be4e4a26c567ffec718bcbea977dd26812fa071c33808b4d5ebb742d9879806094b6fbeea63d25ea3141733b60e31c6912106e1b758a7fe0014f075193faa8b4622bfd5d3013f0a32190a95de61a3604711bc62945f95a6522bd4dfed0a994ef185b28c281f7b5e4c8ed41176d12d9fc1b837e6a0111d0132d08a6d6f0580de0c9eed8ed105531799482d1e466c68c23b0c222af7fc12ac279bc4ff57e7b4586d209371b38c4c1035edd418dc5f960441cb21ea2bedbfea86de0d7861e81021b650a1de51002c315f1e7c12debe4dcebf790caaa54a2f26b149cf9e77d"
-+        plaintext = "54657374"
-+
-+        if sys.version_info < (3, 0):
-+            self.cyphertext = cyphertext.decode("hex")
-+            self.plaintext = plaintext.decode('hex')
-+        else:
-+            self.cyphertext = bytes.fromhex(cyphertext)
-+            self.plaintext = bytes.fromhex(plaintext)
-+
-+    def test_unmodified(self):
-+        message = rsa.decrypt(self.cyphertext, self.private_key)
-+        self.assertEqual(message, self.plaintext)
-+
-+    def test_prepend_zeroes(self):
-+        cyphertext = b'\00\00' + self.cyphertext
-+        with self.assertRaises(rsa.DecryptionError):
-+            rsa.decrypt(cyphertext, self.private_key)
-+
-+    def test_append_zeroes(self):
-+        cyphertext = self.cyphertext + b'\00\00'
-+        with self.assertRaises(rsa.DecryptionError):
-+            rsa.decrypt(cyphertext, self.private_key)
- 
- class SignatureTest(unittest.TestCase):
-     def setUp(self):
-@@ -105,3 +135,21 @@
-         signature2 = pkcs1.sign(message, self.priv, 'SHA-1')
- 
-         self.assertEqual(signature1, signature2)
-+
-+    def test_prepend_zeroes(self):
-+        """Prepending the signature with zeroes should be detected."""
-+
-+        message = b'je moeder'
-+        signature = pkcs1.sign(message, self.priv, 'SHA-256')
-+        signature = b'\00\00' + signature
-+        with self.assertRaises(rsa.VerificationError):
-+            pkcs1.verify(message, signature, self.pub)
-+
-+    def test_apppend_zeroes(self):
-+        """Apppending the signature with zeroes should be detected."""
-+
-+        message = b'je moeder'
-+        signature = pkcs1.sign(message, self.priv, 'SHA-256')
-+        signature = signature + b'\00\00'
-+        with self.assertRaises(rsa.VerificationError):
-+            pkcs1.verify(message, signature, self.pub)
diff --git a/dev-python/rst-linker/Manifest b/dev-python/rst-linker/Manifest
index 6c248878a808..c825721e3047 100644
--- a/dev-python/rst-linker/Manifest
+++ b/dev-python/rst-linker/Manifest
@@ -1,3 +1,3 @@
 DIST rst.linker-2.0.0.tar.gz 12861 BLAKE2B f52ddab3c8119f0bac64e294e4a5a3cc50916f19f49ca1ca4983d8b5d2bb5401c6accb5873df38609386e12fcd1cb02b867f3633edd4d10606a98936e96e62eb SHA512 ea9fa95de66c95dc384c888446512be66b180d0d76e99fe7a6b8f8348436d4be959d3d567fa521d9fc925b537467a4fdf05f9e9d17f7a6df4aafd6dfd323e4fc
-EBUILD rst-linker-2.0.0.ebuild 1336 BLAKE2B ed8e449b771f8966411864d042b230d5bdeeb551c94128261acb4d225bed55000ed9add55a72957869903cef3660e13361a10186e01b8cd2252604c700929208 SHA512 a884f0591febf613f9dbc7f2b1215880b7adda69ba57ae6adccb458493521a63194018ca65a44e85d95ccdd00352d6956e3732a138a0bf63a97301da7190f370
+EBUILD rst-linker-2.0.0.ebuild 1442 BLAKE2B 8cbaa7d78777efc98111c528ff8cf7cb85fae02a1006ec8db4dfec714aae8b60dc697112321aac820155b0e126ef253bc2e6105cbd631c5ec9290868ad84423d SHA512 a3857eebc8258397194e59bb5c41406ad6a68207f67fb21efbcc036fe50cb6811dde3f7a0ae01de76f1bce6501e49772ec2a719c7438974e6faafe32b0c9c952
 MISC metadata.xml 464 BLAKE2B 553b3e9fd8b0a5df09e6ff044ecc6724c155bff6ea5ce21ceb1cbf919e1dee65122f8902921235a40b20baf656a54861741633dfa853405785d8ceecdf0c37b3 SHA512 cb0e45d357d9134fda6c859885350414a04ba45d8a5bbf4424f3f4311f0e662aefce70238434392d8be98b0d7ecb6c470f6725935143e88e09463ff3f0519f02
diff --git a/dev-python/rst-linker/rst-linker-2.0.0.ebuild b/dev-python/rst-linker/rst-linker-2.0.0.ebuild
index fd3f73e3d1f0..5204e241d7e8 100644
--- a/dev-python/rst-linker/rst-linker-2.0.0.ebuild
+++ b/dev-python/rst-linker/rst-linker-2.0.0.ebuild
@@ -3,7 +3,9 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( pypy3 python3_{6,7,8} )
+PYTHON_COMPAT=( pypy3 python3_{6,7,8,9} )
+# [options.entry_points] is present in setup.cfg but it is empty
+DISTUTILS_USE_SETUPTOOLS=manual
 
 inherit distutils-r1
 
@@ -14,7 +16,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/rtslib-fb/Manifest b/dev-python/rtslib-fb/Manifest
index e82806fc0f18..3f96bbde5895 100644
--- a/dev-python/rtslib-fb/Manifest
+++ b/dev-python/rtslib-fb/Manifest
@@ -1,4 +1,4 @@
 AUX target.service 330 BLAKE2B 81d01885925feeef2a1fe9214b520d0d4035b971fea22f4efcbe295a7316568cc6b6e152aa53a7e7defa602e55df61c3a06f3c028ef20301bb0032a4c919a43a SHA512 3c634f1c466d0a8c3dd2b57a230438aaeeb0e66324863a2ded57dd69a2ca5946f83c4ab511766f510f3e63b43aedcf7e368bcf5bc325ee69c016bb0bb2612de5
 DIST rtslib-fb-2.1.73.tar.gz 73883 BLAKE2B 2e1a9306386b019ed7d4f89dc976959020f981812a28f0a8f4c520f311ec6ce08da2e45115d394cab272296bd84e16fd1c15a6aecdf4650d52f96e294aed4cc5 SHA512 70bfad6a055af1242f989fcab706b5a49ebe8c1ed7183ac3f739eb54e0c628cc27efe9823dd017c33d735847888a142a791fdba3e5f4d4817290df7f8b6347f0
 EBUILD rtslib-fb-2.1.73.ebuild 621 BLAKE2B 3d0b77f1fe867ac081d0a87dc9613603d013e78f9f352c11690b122f16d01e61c0d2acb875970b41767b937a1d10d787ae54c59098ea77c27e447e8dfcf1740a SHA512 01407f2658f90a2a2ace43982ae56ccfb16e7b1e983841631f16e0fe9d223dd60990f6b75770dcc4cf9988398a0c5a9ec2a6e70975713834ba007e547e935d85
-MISC metadata.xml 827 BLAKE2B 488d8f9e2e3cdbf10224b0312e83fa23887952e960b6aa8ff95780acbbd9ef96175aa51bbd14e934af300903cecdcc50795c6078d210e833b5db9654bd5f217c SHA512 2082be66a05829bef801444b95306dbfe427e11f3f3f64049c1e96207f62603708c503bae6c92ababb371e640a2c0a071bd07bf37e69d341926d5654c6b8337f
+MISC metadata.xml 710 BLAKE2B b54fadaa43b064783c8c7122338329aecf2571caa5fed741576c1abbd62072b55c424c745d54c52ac6360e58301f02d061f99484d4620aea0884b3bf8a1284fa SHA512 f0e31c674a3e9c55060c8d153527bf728536deffe2582888310477f56a831dcb1130ea2399f9029a4c5387c072c7d8a9def510b343bc65ddced73cec9074a550
diff --git a/dev-python/rtslib-fb/metadata.xml b/dev-python/rtslib-fb/metadata.xml
index 1900d7f743ff..c215ffbabf74 100644
--- a/dev-python/rtslib-fb/metadata.xml
+++ b/dev-python/rtslib-fb/metadata.xml
@@ -9,9 +9,6 @@
     <email>openstack@gentoo.org</email>
     <name>Openstack</name>
   </maintainer>
-  <longdescription lang="en">
-     A Python object API for managing the Linux LIO kernel target
-  </longdescription>
   <upstream>
     <maintainer status="active">
       <email>mlombard@redhat.com</email>
diff --git a/dev-python/ruamel-yaml-clib/Manifest b/dev-python/ruamel-yaml-clib/Manifest
index 1aded02f15db..8a4d7f98037b 100644
--- a/dev-python/ruamel-yaml-clib/Manifest
+++ b/dev-python/ruamel-yaml-clib/Manifest
@@ -1,3 +1,5 @@
 DIST ruamel.yaml.clib-0.2.0.tar.gz 178084 BLAKE2B a4d23e5c931a0c720edb80818ca11bfcc1638f28ec910878f53720139bd8fbd034de6db73154c0e758ceb6c5233c10a2bf7d779f8e7f4a134c8b07cc33382a1b SHA512 7d716e27963b97a1735ba7ff0e581f7ecdfa62725cc42def59ad0ccdf9e23a9f7dfbc3cac298bb3e29362535036b07ba0f523452d6f73248be53c69796637e34
+DIST ruamel.yaml.clib-0.2.2.tar.gz 179914 BLAKE2B 90fe272c3c4f8943e944d43dcf1f61367600bd3b1fb296d7434b27183433267a510b6e41cfd50fac8e17bebcfaa51d7d1ca89d4d23da0b1107c468cafa65ac3f SHA512 5bbab2a23c65b1416480758cf0d0a75dcf8ddece0f8df603ce90f2b1c54356bb6876ac113d53e01c4869e3c9fb22b13ea29e66dc31a09144d4426c3e0f3b9399
 EBUILD ruamel-yaml-clib-0.2.0.ebuild 714 BLAKE2B 89c14677f992995643dd5ced5a3a3a0ae6ebda01e535ea6de87aeef2ee285f1ee8a3db0ba42b5393b94c1042430ae34e79d2286777697da4e26920316f424b4d SHA512 52e3685e459f4a781b2d069dcb3d1efbf3078d2b8992ee26d3bca51342f79048374c89b075987f1a8f60aa0e5fab465c8368d0288e97f38bd6f5590522b4af8b
+EBUILD ruamel-yaml-clib-0.2.2.ebuild 722 BLAKE2B 8fa764b104dc4416451bc96b3f4c6213b1a86b18c405509e4d5e888d17c27f3f74e1ab399b70f6d1fef2332a086927889be8c73dc5076321657e2db6785ae076 SHA512 4ede4e04074e3c75e481e1bccf3a710ac491aeaa73e7f2554fe5901ffa4a6fdd66b71ea1124bf7383fe3c4d00d4831e7e94de9318bab37ce27ad23bb2700fea9
 MISC metadata.xml 1153 BLAKE2B 58de7fd7876683773ffee4304160d3a5207855b637b7116b83af5445d5d79636e39176c0d8c69f61ce3c728f273f16be0a6f39292464abc010b5e5c693c27c4d SHA512 eb4ff5e5bf91ede5c09114a76233e43913416781eb477032c4e04e4d1b0c0ab68969a6574319cc4a95f4db0fa426e831c4f9535393f9f7252b29189b1db5a47e
diff --git a/dev-python/ruamel-yaml-clib/ruamel-yaml-clib-0.2.2.ebuild b/dev-python/ruamel-yaml-clib/ruamel-yaml-clib-0.2.2.ebuild
new file mode 100644
index 000000000000..71a96cc35b0e
--- /dev/null
+++ b/dev-python/ruamel-yaml-clib/ruamel-yaml-clib-0.2.2.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( pypy3 python3_{6..9} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+MY_PN="${PN//-/.}"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="C-based reader/scanner and emitter for dev-python/ruamel-yaml"
+HOMEPAGE="https://pypi.org/project/ruamel.yaml.clib/ https://sourceforge.net/p/ruamel-yaml-clib"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+RDEPEND="!<dev-python/ruamel-yaml-0.16.0"
+
+S="${WORKDIR}"/${MY_P}
+
+python_install() {
+	distutils-r1_python_install --single-version-externally-managed
+}
diff --git a/dev-python/ruamel-yaml/Manifest b/dev-python/ruamel-yaml/Manifest
index a771bcc3e531..197dab18ed21 100644
--- a/dev-python/ruamel-yaml/Manifest
+++ b/dev-python/ruamel-yaml/Manifest
@@ -1,3 +1,5 @@
 DIST ruamel.yaml-0.16.10.tar.gz 147033 BLAKE2B 35e5b0a1bd5a42ee539e66309dbca64bccd9570da427631d230c77d9cc09dc28637abb787c441b4fe8f8f17d9b6b313607887ce79eb631ce8b265cc18570e8fd SHA512 f124575a5054f993d5826d03aa7a9500a1084c5201be1517be36e587bfc60ea4d13b29dbdb3e62bfbd309fe9992590fd0a5028a43f0fd26a5a5cbc9f3dcf423b
+DIST ruamel.yaml-0.16.12.tar.gz 147355 BLAKE2B 6e91116029dba57b81580f4ce34a066fc49ec2c6167c2bd6ec2ae940b16bc12ba53cbd4c62f9ae3975664917ce990b050e9f15b434f5ff66f9dece5426049c9d SHA512 21be4d956d01164b84233c3d3945a4e56351a8fc59c35a8e71b1276da84aa43b125e3860f9884e95a1f895bc53e0b85b6d3f0f4b03512d629a892d8664e3ecd6
 EBUILD ruamel-yaml-0.16.10.ebuild 764 BLAKE2B c6087a1971d6a4477a0f81c42b0ec0be5da928effc63bd4285a08c8cd875cc94acf0d1d6711ea93f8b05bfaa618f77d5c50efc5e685f246b17beb0defbd874bf SHA512 8554601fffda4f88c275e8783a8a16814a8880ec2689d3dcab1a752fdbb0093e3eeddc4e3db43667d592191ec0d5df849e00d656c594b7c26ec358baa1e3e84a
+EBUILD ruamel-yaml-0.16.12.ebuild 772 BLAKE2B 2c54b980c7e2969ea080648dc6fbe12f0d40c1314ee714f82b579873dc8c2b6a374e66e418fdd5f3c7cb45205531422b9ce0dfbc775ce6da72709ba8aba6dfdf SHA512 306b2b051022f2c623a5d046bb5a5923b73939c3d4094106d7da3428d4f4903fca855278c5fc77349fd23702698fda76023bc48ca3979139cb3698af0bc07f2b
 MISC metadata.xml 715 BLAKE2B 8adfe458db838b8217c79ae03ba0133fd7aabd143c99f2177debff61e8960bb9b89df4e7bab27eb392127bc95a34ec7ab2a7e2ab96ec87adc28ea7453bcce6b8 SHA512 bb76d173705214d1df3e44032301d078ea0f1abb41ddbbe743d4ae3928ade3fc3622b26bc54d8c66f47ef2e2f445180aad381bccdc18a6e5fc512c9e83826a9f
diff --git a/dev-python/ruamel-yaml/ruamel-yaml-0.16.12.ebuild b/dev-python/ruamel-yaml/ruamel-yaml-0.16.12.ebuild
new file mode 100644
index 000000000000..4c7c61d9affa
--- /dev/null
+++ b/dev-python/ruamel-yaml/ruamel-yaml-0.16.12.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( pypy3 python3_{6..9} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+MY_PN="${PN//-/.}"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="YAML parser/emitter that supports roundtrip comment preservation"
+HOMEPAGE="https://pypi.org/project/ruamel.yaml/ https://sourceforge.net/p/ruamel-yaml"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+RDEPEND="dev-python/ruamel-yaml-clib[${PYTHON_USEDEP}]"
+
+S="${WORKDIR}"/${MY_P}
+
+python_install() {
+	distutils-r1_python_install --single-version-externally-managed
+	find "${ED}" -name '*.pth' -delete || die
+}
diff --git a/dev-python/scripttest/Manifest b/dev-python/scripttest/Manifest
index 8c621f16fa8d..9440fc8eadf0 100644
--- a/dev-python/scripttest/Manifest
+++ b/dev-python/scripttest/Manifest
@@ -1,3 +1,3 @@
 DIST scripttest-1.3.0.tar.gz 14885 BLAKE2B 1984bb175b49248bd369d2d2ed6f70051113285b6870bce67e0c2203d29b4c5b2735fa96dfef7ee11aa38db74e9beb026bbc946c8549b2810f6b90e896bcae0e SHA512 038bfb1726bff85b6e3675be51db829d3519b47665266f6ae1d3c5c6f4f06e7b16742262ca1ba240544e9bd39ae96c1be0bd5e8583736f72bb04241a1bb8acf6
-EBUILD scripttest-1.3.0.ebuild 551 BLAKE2B d230c565de2254cd95900690043ca99c6f722cb9023b6b3e62d97d9d8ef3daaf6fe112cd58a9f37f2c2e826838023675eb2cf48603b7dbdf2aa3420e18803208 SHA512 8c442462d71d139e514a05bf87ae1bb26565ba368917156f7b7103243a0149c4f8a75135e4d7c8d2ad182fb5ca6e3e8ad9cddec925a9b30504c6f45aafbc7523
+EBUILD scripttest-1.3.0.ebuild 558 BLAKE2B 2ffdff88995029d15ad107b71769391efc9a7ebab51f34d0cd5cb2267878a41831a1800febd00dc5274ffe6089def5f762d4a8c6896cd39ec3690ab154b4cf7f SHA512 17c13e209c329d215229b15c27fe5323f704f8290b07026914b7b47adaa6453e5dfe55645f867b43ad226585d3ad17b1e8ccf555a403d7c858c4007fab0a429a
 MISC metadata.xml 313 BLAKE2B 70bc88a2b745b46e0da17a41ef420dd6b0ae2fcb3f444ed6be3d6bcdea63a4b0019790e0dba51b46c3a5d82c93f667f25b116793623604edad4d01841af723f5 SHA512 ae1c2257d3367ea3bdba8e040c0efd98674fe833f7a025c1b554e8cae6e1a41de6867e63c3d792593fa2f4baab158b046d2efaa08d6c8376f8ec749cdc7d4ff9
diff --git a/dev-python/scripttest/scripttest-1.3.0.ebuild b/dev-python/scripttest/scripttest-1.3.0.ebuild
index ccad3cfea21e..02e7cf81f2cd 100644
--- a/dev-python/scripttest/scripttest-1.3.0.ebuild
+++ b/dev-python/scripttest/scripttest-1.3.0.ebuild
@@ -14,6 +14,6 @@ SRC_URI="https://github.com/pypa/scripttest/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86"
 
 distutils_enable_tests pytest
diff --git a/dev-python/scrypt/Manifest b/dev-python/scrypt/Manifest
index be52caf724e0..7a0af90d0a0b 100644
--- a/dev-python/scrypt/Manifest
+++ b/dev-python/scrypt/Manifest
@@ -1,3 +1,5 @@
 DIST scrypt-0.8.15.tar.gz 53954 BLAKE2B 9f9bfc6ead25f14b9b3194853cd64a7b2244685d15a7d257e2395b0acf3fb968487fffc5d5eb5a245de1518b0740483d3e6feed841282b40ecec86ce178de46e SHA512 db5f688b341f816935a0fd5a538d8633a1e43c69c7228d9fc127459c9673528f92405170339a5a43eca86eb5a2ea17b951ac16a203993e452e05f2589914a66f
+DIST scrypt-0.8.16.tar.gz 54205 BLAKE2B ce4f86f8bacb4f12408604822a32c9f63f96a155469cca1d2aa50cf67fc9e9576432f13ef49694a9d7ce21696aedcef27419fc0d3aad67a87d16c3bf8c0f94c4 SHA512 9498637d1354a84021f2c069a919ff157ff189d1385453397a9c43e522de77af9d628a90d649d50e9243abfc0b96efe4e38b615322d83133137bad94d448ef06
 EBUILD scrypt-0.8.15.ebuild 594 BLAKE2B d01247d9c618e2083b9dde83215f2ea588b3b1c03438f5f59c5472e0e1e3d62433edf1c632dcd1b252f36561ec309a9cb1aa736216c8ab79c053e8ef8b12f17e SHA512 8e1379e65f1ecea2f62dd142d7cfb28a3b3ae075387173ef8e2ce8148eabbd78d207c349fe05d9ebec77546eb2173862652e524a70eb052ab8457bafdaf24198
+EBUILD scrypt-0.8.16.ebuild 602 BLAKE2B 297d8fac6a678b9568de22e9145810167561f46b015593a4891d22013a76c7d232cd960164ad9bc46c4132517b77dd707c43f55b3daf97641be20162ad11a2f7 SHA512 5e059dcc4d64398eb9463e1d8ecde6774597d797e4c668c16d6f040fc01d713fe2e6f82838679354d42e25057cabe6afa2028dba4f353cedb06bf21d3b811afc
 MISC metadata.xml 479 BLAKE2B 699d8337f530cbac981bd6be4556e75e85874bed107100eebd605d3dbe01172b85a66712c7d20bbfb4310d5bf6d32df97bfe47132334ab2239190818b2fd3fec SHA512 43f00f2f4910b07e5f9db676cba1527b27f5ae4bcd49d59d118fe1e9656f185bb08535c1cc04f95bce6b59613c5b022440d746033efbbc3c26e3ade81fadb56c
diff --git a/dev-python/scrypt/scrypt-0.8.16.ebuild b/dev-python/scrypt/scrypt-0.8.16.ebuild
new file mode 100644
index 000000000000..92065ee32932
--- /dev/null
+++ b/dev-python/scrypt/scrypt-0.8.16.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Bindings for the scrypt key derivation function library"
+HOMEPAGE="https://github.com/holgern/py-scrypt/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD-2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+SLOT="0"
+IUSE="libressl"
+
+RDEPEND="
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
+"
+DEPEND="${RDEPEND}"
+
+distutils_enable_tests unittest
diff --git a/dev-python/seaborn/Manifest b/dev-python/seaborn/Manifest
index 72b0e8270117..5dec0913b53c 100644
--- a/dev-python/seaborn/Manifest
+++ b/dev-python/seaborn/Manifest
@@ -1,3 +1,5 @@
 DIST seaborn-0.10.0.tar.gz 194113 BLAKE2B 7e5d6efd7a8446172a3f102c2c7815483f5e24cd2698f52e70186395468a782e45e1cc8fa7eacf7e2956b66e2a6cda76525973b2fecdc43a784af85319c9f5fa SHA512 1f6288931cb63d3109663b5aedc7c11b6b97a6afd8cf9b9e94a9a1f4e18c45456ae7bb055c5be0fb0c34dbb3fdf992d7a88bc1cb88506bebf9ddf9bf685aa3ea
+DIST seaborn-0.10.1.tar.gz 193770 BLAKE2B f23271b222d409464853ab8f853e17e462890d6f00ca222bcc40d681ff815ef9f1e545e8693f2d33ceeaed51bd6e21ff7edb72835813d4813fffebfa80c84e00 SHA512 167d44d7d64936e15e6c9061cc6bd53a40c0a3e4d619f936ae58de745d5f5273ee8acbd470d3ac155639aac072356a2c2655dff511c4be7d041c3528ab35386f
 EBUILD seaborn-0.10.0.ebuild 904 BLAKE2B 7fb36d1c751c3b11724de837e94a0d833205ae48e1e27ab855f73e9fae2b53fe178ae700a988974f2e783349b6deee865c4f42f18c6dc955baae6e1a90368464 SHA512 84a1db153e9b1137917093f865f972be81350d44d9808abbe9178d995348c397a0d81ed4a2f6a179f06f8530df3d363584a122af8ce57646bc45f47a381b06dc
+EBUILD seaborn-0.10.1.ebuild 922 BLAKE2B 4bcd6ab32d5d556645467d20495466b76cb7b3880fcac5b4d708f7d265b29bed3b809ee2e5871c392890e23a30ce7c60f8eba1304837b19e46611b1c36fd3429 SHA512 35522138c9758d9ae854f0ca1ff5261d150b5939342b33a73de2ea21bdc4ac1a40eb4e1d55c08ce5d197ebf1865900c851360809fda4834c437566b657fdc246
 MISC metadata.xml 1733 BLAKE2B 5db2e7a05acb3e4a6d8ac48f846d03cb0464449a7fe9ddde982b4eeb60f01ce68bf325228dfee4692db3cf209d8f3c5b5914fdba0f28ae925ef6efcfa16bf510 SHA512 46661d2e706b5ba2e84b963fc6dd9e39787fa399732a5f762295c96efa8149d8ad2c6e7cf918b4ec17fcee80771da209b9bce91f05c780292be0dbe858b5b19f
diff --git a/dev-python/seaborn/seaborn-0.10.1.ebuild b/dev-python/seaborn/seaborn-0.10.1.ebuild
new file mode 100644
index 000000000000..3075fc84222b
--- /dev/null
+++ b/dev-python/seaborn/seaborn-0.10.1.ebuild
@@ -0,0 +1,40 @@
+# 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="Statistical data visualization"
+HOMEPAGE="https://seaborn.pydata.org https://github.com/mwaskom/seaborn"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	<dev-python/matplotlib-3.3.0[${PYTHON_USEDEP}]
+	>=dev-python/numpy-1.13.3[${PYTHON_USEDEP}]
+	>=dev-python/pandas-0.22.0[${PYTHON_USEDEP}]
+	dev-python/patsy[${PYTHON_USEDEP}]
+	dev-python/statsmodels[${PYTHON_USEDEP}]
+	>=sci-libs/scipy-1.0.1[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	test? (
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)
+"
+
+python_test() {
+	cat > matplotlibrc <<- EOF || die
+	backend : Agg
+	EOF
+	pytest -vv || die
+}
diff --git a/dev-python/secretstorage/Manifest b/dev-python/secretstorage/Manifest
index e55ab7f1347a..978af8100206 100644
--- a/dev-python/secretstorage/Manifest
+++ b/dev-python/secretstorage/Manifest
@@ -1,3 +1,3 @@
 DIST SecretStorage-3.1.2.tar.gz 17848 BLAKE2B 3d108f98fd0c26958860aa65554a21924822a5d51a90ae20c5496792f4571babbdfd2aec5b70d1bdd908498ad1b61606130d5db2900406ae85f8e3367ad3013f SHA512 c132b21556c55b5912354fd27b6062d32c0f510234f7fe57f6e8e0acb08393ad95e0896967b577de97821387cd714e62b657359230296449e4e0a7ae5a797803
-EBUILD secretstorage-3.1.2.ebuild 1139 BLAKE2B 0fd6c169a3424b00178eb6e6b941bfb76cd1cbd02f1803b8500832599ac2ac8a97fb852ec730032bd40558ad7ec65c4c43204c2a26c9e980ea68fc32cd7b69f2 SHA512 7ffd826f02305c3d95628f0ea7badd21135f7720b085469ebc2cdc9b5eb7add5cd8b51aefcb1b1f39213f721400af333887316446b2caeafae0c5aed7dbb69f7
+EBUILD secretstorage-3.1.2.ebuild 1138 BLAKE2B 6089e6ecce166476afeea659d97855b350695e441b101f54096f98ee8f024e29bc45de8257fd9f13dcf027306d1f61ab12b25c0b07cb4457ce611ae84a009bf8 SHA512 cfaf8a6fd4b444db0b6ce6952ac395eac0240f90e8bef9abe824e9065109d2f48b2d275a79729416311bedc603555c9ecc3ad42401ef90f6230b94b1b6b6a608
 MISC metadata.xml 401 BLAKE2B dd985b75846d20aaa47a4c419e44ff481bcfe95b0eebd1c6c8c66e8d75561f6e583c188cb16e1adf6ee35f2f7aa430f5426215d0ba68f5bab5e3a501a4787efa SHA512 75758f0d9498d427aa39ce1c7ddcefdbd08de06a6b5a2bf7df94f6571ac0d2d3c7aa3dea0ed467179bdc6763704ddd5446ad004abc8618794222e51d9502ccb4
diff --git a/dev-python/secretstorage/secretstorage-3.1.2.ebuild b/dev-python/secretstorage/secretstorage-3.1.2.ebuild
index 88740afaaf2b..65375843c0c4 100644
--- a/dev-python/secretstorage/secretstorage-3.1.2.ebuild
+++ b/dev-python/secretstorage/secretstorage-3.1.2.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_PN}-${PV}"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	dev-python/cryptography[${PYTHON_USEDEP}]
diff --git a/dev-python/selenium/Manifest b/dev-python/selenium/Manifest
index 35489fc5a3b2..34d3997c1d03 100644
--- a/dev-python/selenium/Manifest
+++ b/dev-python/selenium/Manifest
@@ -1,4 +1,4 @@
 DIST selenium-3.141.0.gh.tar.gz 155705874 BLAKE2B f75eec80e6caa86744092020abaeef56defcfac8278dd3fd605c29d6860c1c046956c7599164ba1b4682f20dfa997f5a942d83f7ad707b052ad3ca98c0800527 SHA512 add14d426c5b929901cd71104460c7ceaacf46374b46898254dc2e2602f4a9a370199da603e3f35375c0f297d6fc2fda00c9ce2ede9d5b893b072e0487883df2
 DIST selenium-3.141.0.tar.gz 854669 BLAKE2B 621f4ab03bf85718b50099fdf10cdfadaf326bc7d9c9f1676a2a20e3ad23bede7884d8017b98bc6ebc314c6a4221c7668628d2d1888f36350c95eed1d82acee7 SHA512 3d2afbe9e96f88e9c055a89786b5090af387d3feba4598577b70fd3e0b20c2c09c4b25af920c654f52ec7e34f23181e6d278ac05f1a1f960d2d371ce7a6b82d8
-EBUILD selenium-3.141.0-r1.ebuild 1151 BLAKE2B 58569052795dfd9e278febfd03f5f99a17ec07d6c9daa7da5425aba7d34051992c09a7dbc2c30d74663c1ccda4c30a283aac331986a476d7ac8cbed8dfa0f4cd SHA512 0163ead669fe2bd50dcc3ba39285d33945dc39943f3123ce4086a90a1dcd93349d6ddaf53a077636622b666c813754ec5e63d8fdc12c0f3839f448ea4b766800
+EBUILD selenium-3.141.0-r1.ebuild 1158 BLAKE2B 115af3a9ebb4b719b25820dd0d5f201bad1e2e6474c9da9429161c7c42b813d7599d06256c98e91ae3d7e5375b0b0d89cee9b6c69fa64b38a7bd77620a27e0a0 SHA512 bb73665ba0b9c7c38a5e09e2e8b2cbb346ca8f66ee5fe409e009b0a2ede84dc24fd78d7df21e874b5f2996489ba2d3bb3bc060b471d26f209b9fe84cfdc48b4d
 MISC metadata.xml 382 BLAKE2B 2069f6989e396728b0de8e072c064980714dfa75f5bc8ac56b17d7b311e553c2a821a2d58433ca43289b059ae40f7a822c788c1af1d8eb883936662d6eb17bfc SHA512 85f758426e03c1ef8b1e4e9f7098df95965547a10ee9e2168398b9a71b612a61b531860a46d75701d9c4ce0a83df9e4344354ee65ab1ee166f45738a2b1c9955
diff --git a/dev-python/selenium/selenium-3.141.0-r1.ebuild b/dev-python/selenium/selenium-3.141.0-r1.ebuild
index 8d7c91fdbe16..a5962b98373e 100644
--- a/dev-python/selenium/selenium-3.141.0-r1.ebuild
+++ b/dev-python/selenium/selenium-3.141.0-r1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
 			-> ${P}.gh.tar.gz
 	)"
 
-KEYWORDS="amd64 arm arm64 ~ia64 ppc ppc64 sparc x86"
+KEYWORDS="amd64 arm arm64 ~ia64 ppc ppc64 ~riscv sparc x86"
 LICENSE="Apache-2.0"
 SLOT="0"
 
diff --git a/dev-python/semantic_version/Manifest b/dev-python/semantic_version/Manifest
index e376578fd6d4..22b0ca5c4d84 100644
--- a/dev-python/semantic_version/Manifest
+++ b/dev-python/semantic_version/Manifest
@@ -1,3 +1,3 @@
 DIST semantic_version-2.8.5.tar.gz 50009 BLAKE2B 5f966ca68358d4963b3a41574c100a8f78275445285aebbfa47d1febb0b7a2eb3a638254d4d1bd8e093acbef47a101ef0a0d7a86475313aefa211d2a0a3cfc19 SHA512 2ab59024c148239d78de062ff3a357f81a33fd066b6be8b6f9ef0753841a4945829b1c11899cfbda6c3ff09e00aa3b689e1fb6f8b9a92bbb3c2a62dd713b6049
-EBUILD semantic_version-2.8.5.ebuild 602 BLAKE2B d29dd42808dbceac897723e1b4d63d6c5849974dd28ae6e1ee7ad6c9260b2a0b8a7a0ea85e785ac4951cdaed30f149742d2ee13417384394361bcc0a9532b716 SHA512 c74524022ffa1b1b1e771e331be31720f94f8f984f3e718cd6a9ba20509cf60b16e995bdb727e746237c32e843c8741c1d51450942acf99d945aee77f5c9edab
+EBUILD semantic_version-2.8.5.ebuild 614 BLAKE2B 264f0f8f831b350c190ba7d03b548ab64ea845f47e08b2c9fc49eec94f8e6ebc475200cabee998a377723e321e92e78c48ecec196dfcec08597451d76ff155e5 SHA512 53e39107ac0e573dac02d9e2daae7259c53083b2a97aa8c59b310c8e779ac3eb59bf1632497e4c5761aeedc03bfea68372b7376f35131b7f4c4771e2bf9fe5b2
 MISC metadata.xml 819 BLAKE2B 3b85ef79ccc81d2c8a07e28697fef8e0eac70d9711b49bb194f9708ab5d734982d09fdebfb29174d8c9b0b8fe650641a07847e844182b5f78474f94844e182e7 SHA512 214c06da33a967f4ef3f8046dd88232f3916c59f5d220458b01151fa8db83cf1af889e02b2583281ea465de756c235766153ea2d5cc3a9dc39f5ea38fc8ba4da
diff --git a/dev-python/semantic_version/semantic_version-2.8.5.ebuild b/dev-python/semantic_version/semantic_version-2.8.5.ebuild
index 8f96204566eb..fbfa023af245 100644
--- a/dev-python/semantic_version/semantic_version-2.8.5.ebuild
+++ b/dev-python/semantic_version/semantic_version-2.8.5.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 x86"
 
 distutils_enable_sphinx docs \
 	dev-python/sphinx_rtd_theme
diff --git a/dev-python/sentry-sdk/Manifest b/dev-python/sentry-sdk/Manifest
index f4ff32fcf864..1f46e84118f9 100644
--- a/dev-python/sentry-sdk/Manifest
+++ b/dev-python/sentry-sdk/Manifest
@@ -1,5 +1,7 @@
-DIST sentry-sdk-0.14.4.tar.gz 75420 BLAKE2B cbc5f401fae8a4a9eaa8f6fff8ca16a61cf2d339f14787610646112f67d7b0694d95a6076d2810968d28eb176d447fec6cf49af9a317bb2c30b4e6ab2d89a4f0 SHA512 66886df71a3d8f9f86f41bfc4078bf80f217bcb0a27fb9e93acee193b482d3045db44953f6f0b4d05e79daa91dadb56c2784b13d1308e7bc00fb40f485537dab
 DIST sentry-sdk-0.16.3.tar.gz 170145 BLAKE2B bf619313fb3f49800f5384f0dfec3aa34ef4bb030c5e038a485a8861a733a537ee7c834c8c200a2244335c3c61e7d564005b81d4e5c5f603d2864b2a943a5384 SHA512 e8589f7bd433d4aff068099e860c0cf012fc88dc63806873573a338bb91848d73e0a2af76dad0a5e023a1b25b0be85507346b77dec5c5a265942005219541699
-EBUILD sentry-sdk-0.14.4.ebuild 630 BLAKE2B ae27b8659b9e7777f1f125cc5ee15f2afab351e0d698ad46daf6f6c8e4d9ccfd4baeb2714be7453accf82df65b2fe2c28583b945a16332916a795333bafadce3 SHA512 fd379211a4f3de92ab9c6339d9c20aa2e51d3e737a7328aa7c97774d10d446ce0bbc20773d82b42893e30cc41ed55ef97961895b3f64427c37d632f24fdfda91
-EBUILD sentry-sdk-0.16.3.ebuild 627 BLAKE2B f014670034b1eee91bf1382fb807a8810b68236f809628248c576490f7534e5d3e9770b1aa4174ab6ccad0d7928ca0ed7a87fbf3acdf5a0ede8a18a303f1dd0d SHA512 ac7ad13beabf70ef557883d43023d526302d54c13b5d1655584a9f2ee1956a196378a0a7c56a792314b643e7fda5bec79c8d9e24a5b2afaad950fba58f54577e
-MISC metadata.xml 422 BLAKE2B 40203c82cbd2c3bd3a7fb0efeb325573895e00d57131355f501aa0bcd8ea2fd431521f43be6f0fbc35e663b4d009ea6fe14afcac432f052570a4e4d2eb5eaf90 SHA512 5167cc4004c64227502da603869e7a92f1efd52c334807b057607dbfd77cb409fda1a54b1eb6a1e18085844f88e04b5297e7dd1d8d0730e7d80648fa5e50a91f
+DIST sentry-sdk-0.17.5.tar.gz 183114 BLAKE2B a2fdd5fb0ffb18f7987eae9f3837a4bf4df20df9757d89bcc3ec18f7022d20de083c905f6edbb854bcc7f074f6d158cbf30f69d953a75048e7d9d0d98e859477 SHA512 5f0d6679832fed346d00b27bac9f680909a7ede38e46b1c05c583fcc574edc193d855dba2f11a629e2919da5e13cc2e89f6c0b231e47bc7b0a67138ff7905d9f
+DIST sentry-sdk-0.17.6.tar.gz 183157 BLAKE2B ea0f6af54c31abc785274fc75238a02b8c9f7a978881a01203e0928e100c18df2257ec4a3cef608141b6846c616566388134a4ec31364f26d0bc2b0fadbb0dac SHA512 1af433b5c2311612ad650ea196ddfedb444e9ccb424df72422759f8647fe6cc22bb81a15933f2716cf40313ce3b2e262c077168aa831758d057a1f2e5e1499ff
+EBUILD sentry-sdk-0.16.3.ebuild 621 BLAKE2B d2ffc79e8d2ec8daad9d01f0120760c3d1225bfebf1162cd5246bb1b7ddc5f176e6ba1b272701cb5b3a99aefe171f660cafa6be0e8594a65c0e7d2d803fb199f SHA512 32df9a79cf7988ae3687264f2ab7eca66af45447886e5e7cd33de8218373b49eb3222bb5cd30fa64648c46dbc6453176e555a27a94e1388d3d6295fe3c8060b8
+EBUILD sentry-sdk-0.17.5.ebuild 2693 BLAKE2B e356a6b4a4cc5bd02e80789902cf3cf37b9233eeb6d09136f318a9d620dafd423959891294367f0071794f1a39ec5855b6aa2689385e7e5b15457eba39f02dd8 SHA512 08d8a32c1ab5e873cef1ae3f56dadeec27283fe485a9fc2f8ce5cef3330ef2879985796c6ab160d26b846dbda8a3ab24e3ebd947bd5874ae2add3990f09b6b34
+EBUILD sentry-sdk-0.17.6.ebuild 2693 BLAKE2B e356a6b4a4cc5bd02e80789902cf3cf37b9233eeb6d09136f318a9d620dafd423959891294367f0071794f1a39ec5855b6aa2689385e7e5b15457eba39f02dd8 SHA512 08d8a32c1ab5e873cef1ae3f56dadeec27283fe485a9fc2f8ce5cef3330ef2879985796c6ab160d26b846dbda8a3ab24e3ebd947bd5874ae2add3990f09b6b34
+MISC metadata.xml 446 BLAKE2B d115ce1b9a1d92cfeb93cd220c96247f1d6ae9514b0d598a0abc9fc6b17e45851a33e6f61b364f682f6530e4ac2611fd0a65b2fb5b21d394e78030f6ef34d1fa SHA512 f7167d56812496468a0766bf6e7d29b99e5efcef8cd61723ed7b09188b515b50fa13275d665f7ff8400b5b451e05ddcec403cc4c75e55509b21b849cafde0a3e
diff --git a/dev-python/sentry-sdk/metadata.xml b/dev-python/sentry-sdk/metadata.xml
index 86ca5393eddb..6fbea5d2a147 100644
--- a/dev-python/sentry-sdk/metadata.xml
+++ b/dev-python/sentry-sdk/metadata.xml
@@ -12,4 +12,5 @@
 	<upstream>
 		<remote-id type="pypi">sentry-sdk</remote-id>
 	</upstream>
+	<stabilize-allarches/>
 </pkgmetadata>
diff --git a/dev-python/sentry-sdk/sentry-sdk-0.14.4.ebuild b/dev-python/sentry-sdk/sentry-sdk-0.14.4.ebuild
deleted file mode 100644
index 7cf55716208b..000000000000
--- a/dev-python/sentry-sdk/sentry-sdk-0.14.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,8} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python client for Sentry"
-HOMEPAGE="https://getsentry.com https://pypi.org/project/sentry-sdk/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="PSF-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE=""
-
-BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="
-	dev-python/urllib3
-	dev-python/certifi
-"
-
-RESTRICT="test"
-
-python_test() {
-	cd "${S}"/src || die
-	"${PYTHON}" test_typing.py || die "tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/sentry-sdk/sentry-sdk-0.16.3.ebuild b/dev-python/sentry-sdk/sentry-sdk-0.16.3.ebuild
index b536923dc9c9..61141dcf4743 100644
--- a/dev-python/sentry-sdk/sentry-sdk-0.16.3.ebuild
+++ b/dev-python/sentry-sdk/sentry-sdk-0.16.3.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/sentry-python-${PV}"
 
 LICENSE="PSF-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
 
 RDEPEND="
 	dev-python/urllib3[${PYTHON_USEDEP}]
diff --git a/dev-python/sentry-sdk/sentry-sdk-0.17.5.ebuild b/dev-python/sentry-sdk/sentry-sdk-0.17.5.ebuild
new file mode 100644
index 000000000000..89a0a6dd3b2a
--- /dev/null
+++ b/dev-python/sentry-sdk/sentry-sdk-0.17.5.ebuild
@@ -0,0 +1,85 @@
+# 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 client for Sentry"
+HOMEPAGE="https://getsentry.com https://pypi.org/project/sentry-sdk/"
+SRC_URI="https://github.com/getsentry/sentry-python/archive/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/sentry-python-${PV}"
+
+LICENSE="PSF-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+
+RDEPEND="
+	dev-python/urllib3[${PYTHON_USEDEP}]
+	dev-python/certifi[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/asttokens[${PYTHON_USEDEP}]
+		<dev-python/dnspython-2[${PYTHON_USEDEP}]
+		dev-python/executing[${PYTHON_USEDEP}]
+		dev-python/eventlet[${PYTHON_USEDEP}]
+		dev-python/fakeredis[${PYTHON_USEDEP}]
+		dev-python/flask-login[${PYTHON_USEDEP}]
+		dev-python/gevent[${PYTHON_USEDEP}]
+		dev-python/jsonschema[${PYTHON_USEDEP}]
+		dev-python/pyrsistent[${PYTHON_USEDEP}]
+		dev-python/pytest-aiohttp[${PYTHON_USEDEP}]
+		dev-python/pytest-forked[${PYTHON_USEDEP}]
+		dev-python/pytest-localserver[${PYTHON_USEDEP}]
+		dev-python/werkzeug[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep '
+			dev-python/aiocontextvars[${PYTHON_USEDEP}]
+			dev-python/contextvars[${PYTHON_USEDEP}]
+		' python3_6)
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local deselect=(
+		# tests require Internet access
+		--deselect tests/integrations/stdlib/test_httplib.py
+		--deselect tests/integrations/requests/test_requests.py
+		# wtf is it supposed to do?!
+		--deselect tests/integrations/gcp/test_gcp.py
+		# fails on py3.6, hangs on py3.7+
+		--deselect
+		'tests/test_transport.py::test_transport_works[eventlet'
+		# TODO
+		--deselect
+		'tests/test_basics.py::test_auto_enabling_integrations_catches_import_error'
+		--deselect
+		tests/test_client.py::test_databag_depth_stripping
+		--deselect
+		tests/test_client.py::test_databag_string_stripping
+		--deselect
+		tests/test_client.py::test_databag_breadth_stripping
+		# test_filename: apparently unhappy about pytest being called pytest
+		--deselect 'tests/utils/test_general.py::test_filename'
+		# test_circular_references: apparently fragile
+		--deselect
+		'tests/integrations/threading/test_threading.py::test_circular_references'
+	)
+	[[ ${EPYTHON} == python3.6 ]] && deselect+=(
+		# broken with contextvars on py3.6
+		--deselect
+		'tests/utils/test_contextvars.py::test_leaks[greenlet]'
+		--deselect
+		'tests/test_transport.py::test_transport_works[greenlet'
+	)
+
+	# Prevent tests/integrations/modules/test_modules.py:test_basic failure
+	# Needs to detect sentry-sdk in the installed modules
+	distutils_install_for_testing
+
+	pytest -vv "${deselect[@]}" || die "Tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/sentry-sdk/sentry-sdk-0.17.6.ebuild b/dev-python/sentry-sdk/sentry-sdk-0.17.6.ebuild
new file mode 100644
index 000000000000..89a0a6dd3b2a
--- /dev/null
+++ b/dev-python/sentry-sdk/sentry-sdk-0.17.6.ebuild
@@ -0,0 +1,85 @@
+# 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 client for Sentry"
+HOMEPAGE="https://getsentry.com https://pypi.org/project/sentry-sdk/"
+SRC_URI="https://github.com/getsentry/sentry-python/archive/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/sentry-python-${PV}"
+
+LICENSE="PSF-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+
+RDEPEND="
+	dev-python/urllib3[${PYTHON_USEDEP}]
+	dev-python/certifi[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/asttokens[${PYTHON_USEDEP}]
+		<dev-python/dnspython-2[${PYTHON_USEDEP}]
+		dev-python/executing[${PYTHON_USEDEP}]
+		dev-python/eventlet[${PYTHON_USEDEP}]
+		dev-python/fakeredis[${PYTHON_USEDEP}]
+		dev-python/flask-login[${PYTHON_USEDEP}]
+		dev-python/gevent[${PYTHON_USEDEP}]
+		dev-python/jsonschema[${PYTHON_USEDEP}]
+		dev-python/pyrsistent[${PYTHON_USEDEP}]
+		dev-python/pytest-aiohttp[${PYTHON_USEDEP}]
+		dev-python/pytest-forked[${PYTHON_USEDEP}]
+		dev-python/pytest-localserver[${PYTHON_USEDEP}]
+		dev-python/werkzeug[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep '
+			dev-python/aiocontextvars[${PYTHON_USEDEP}]
+			dev-python/contextvars[${PYTHON_USEDEP}]
+		' python3_6)
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local deselect=(
+		# tests require Internet access
+		--deselect tests/integrations/stdlib/test_httplib.py
+		--deselect tests/integrations/requests/test_requests.py
+		# wtf is it supposed to do?!
+		--deselect tests/integrations/gcp/test_gcp.py
+		# fails on py3.6, hangs on py3.7+
+		--deselect
+		'tests/test_transport.py::test_transport_works[eventlet'
+		# TODO
+		--deselect
+		'tests/test_basics.py::test_auto_enabling_integrations_catches_import_error'
+		--deselect
+		tests/test_client.py::test_databag_depth_stripping
+		--deselect
+		tests/test_client.py::test_databag_string_stripping
+		--deselect
+		tests/test_client.py::test_databag_breadth_stripping
+		# test_filename: apparently unhappy about pytest being called pytest
+		--deselect 'tests/utils/test_general.py::test_filename'
+		# test_circular_references: apparently fragile
+		--deselect
+		'tests/integrations/threading/test_threading.py::test_circular_references'
+	)
+	[[ ${EPYTHON} == python3.6 ]] && deselect+=(
+		# broken with contextvars on py3.6
+		--deselect
+		'tests/utils/test_contextvars.py::test_leaks[greenlet]'
+		--deselect
+		'tests/test_transport.py::test_transport_works[greenlet'
+	)
+
+	# Prevent tests/integrations/modules/test_modules.py:test_basic failure
+	# Needs to detect sentry-sdk in the installed modules
+	distutils_install_for_testing
+
+	pytest -vv "${deselect[@]}" || die "Tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/service_identity/Manifest b/dev-python/service_identity/Manifest
index 0664a0a2cfb5..3bd2341ca1d6 100644
--- a/dev-python/service_identity/Manifest
+++ b/dev-python/service_identity/Manifest
@@ -1,3 +1,3 @@
 DIST service_identity-18.1.0.gh.tar.gz 34252 BLAKE2B 18823e6b8ca9444591f063b4835362522e3ae374cd669f2da299389fa2977f42e0a1d715b35d90e9518bdd8ac8c76e0adf4e121e85e2352de78e621d5f1e6259 SHA512 6b6da48c543bfbe0d9da9f0d03dbd735ce97e64a76cbf9eae2b615ced7b91c5fcca1f25353e53858c48da9c4e0c0be4e33fa4559adb50899a79689cbb372f49b
-EBUILD service_identity-18.1.0.ebuild 870 BLAKE2B 5418958e0dc26b393b5e2328660f7571f1ff23eb6af21ad58393678edbe6407f6e9437d7e16095d8c5764e2981360af5a9a214168a0bfb47f9cce4440b89aa70 SHA512 450e427cb3cb38943ba84079fcf99235bfd62addae33307646a147ecdcb8dc9bd92ebdd152dc5882f928e33197bbf7b8ca80dcc53a7a53ba5d970516815f234a
+EBUILD service_identity-18.1.0.ebuild 877 BLAKE2B 783f2847f7026dbfb919301529c89d3700c8afe6208286eb239d583a665d177de24d9649a79009b27f33ec1dffef058002df8c6a828767b2812ef863a5124a52 SHA512 33f44284852a2360baf7fffa31f74948920772e6d928033559db7e93742a884f05a3b29a75a563f2b77dade58ae44ad93e2e0239107a6f980dce733be057918d
 MISC metadata.xml 417 BLAKE2B 756a633325c85cd35b7f10932f339fb309cad72766c32d8af26e6cd05004c163cf1349ccc61f8657d1d19728bc375f937ddf951243d775cb91dc3ec01881093c SHA512 26f165fd38aa65dd4c4d7c705b3db4e7e8bb1ddb8f7d326d1f4403c2bcb7820a9ff12d000675444fcd945201ad0176b34a695222f04ef6c0c803ff36da771870
diff --git a/dev-python/service_identity/service_identity-18.1.0.ebuild b/dev-python/service_identity/service_identity-18.1.0.ebuild
index 43dea76bb118..9991f69d8527 100644
--- a/dev-python/service_identity/service_identity-18.1.0.ebuild
+++ b/dev-python/service_identity/service_identity-18.1.0.ebuild
@@ -14,7 +14,7 @@ S=${WORKDIR}/${P/_/-}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux"
 
 # TODO: upstream made pyopenssl optional
 RDEPEND="
diff --git a/dev-python/setuptools-git/Manifest b/dev-python/setuptools-git/Manifest
index 142a9f162b64..fbfeab791331 100644
--- a/dev-python/setuptools-git/Manifest
+++ b/dev-python/setuptools-git/Manifest
@@ -1,3 +1,3 @@
 DIST setuptools-git-1.2.tar.gz 10546 BLAKE2B 52b7cd8387037b1eaee91e9df7de9944ea08bf02f4cf9ea74fa9d0febf85d930af989e9a07289935d8886f0fa4439c4cb46556ff81343981153ca35314703a9b SHA512 c070911618b6b92c862fb0bd40f1daeaf79e2ba10389fa1e69e4c50cfdd39c8e57a612082cbc7d932f8cea12a769e13451e35e1c8fe34f170d4817fd0d44f156
-EBUILD setuptools-git-1.2.ebuild 680 BLAKE2B 1ca4a06bacd7497e9ed586450875ea95325c88858c90e92f2c301b7ef34ee5364ccb3e7e3617ca84f48f3bb85772c1c3df692dea715c321e7ff51faa5b4c2136 SHA512 5e8260f9e07b12bcaaffc25de095fdd3140019d47115fea4f57dd22aea8e237d445c5bcf9555f7419a0a752db370dc92426e0a4fdf157c01a6fd55f6e784956d
+EBUILD setuptools-git-1.2.ebuild 687 BLAKE2B 788b59409df72302df4d345a4ed23768b703051d5631c2d96a05bf4f2e941043f8e3e91c432e93d9aa2a8fb9ff8480660368be1f5a507db31a0df0796cc2c88f SHA512 4c91db80f6791411aa09d417e0d584f38334a08de6331acfe4dd746fcd5339bea8e6bd776a0fc54d10f055fa9e6c6d97ae9868801bd4c2c778e9241ad62a7be1
 MISC metadata.xml 512 BLAKE2B 4d7dde26fb48dba04fcb6cd768f4a825e982f57cadb98c74c696f7bc79210ebdaab5a27fb3aa307edc7fb7781f8aea64885460e67cda9f25b6f01edffa42c118 SHA512 32d994cd5a5c5314b43f52ba9d14c37ca3cca3325dac5b241acc1793583b1afd5921bb6da9b5802aee09779e9bb472ef9fc1fb330030824fb12b7d49e567edf9
diff --git a/dev-python/setuptools-git/setuptools-git-1.2.ebuild b/dev-python/setuptools-git/setuptools-git-1.2.ebuild
index 7f69c0ee96e2..1956e144fa54 100644
--- a/dev-python/setuptools-git/setuptools-git-1.2.ebuild
+++ b/dev-python/setuptools-git/setuptools-git-1.2.ebuild
@@ -12,7 +12,7 @@ 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"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
 	dev-vcs/git"
diff --git a/dev-python/setuptools/Manifest b/dev-python/setuptools/Manifest
index eeff8aaa2bf4..442f463232da 100644
--- a/dev-python/setuptools/Manifest
+++ b/dev-python/setuptools/Manifest
@@ -1,6 +1,12 @@
 DIST setuptools-46.4.0.zip 865912 BLAKE2B 452d36132f5648c79c7e1616a93ff6a39ab2f64b2864ee397b4f57e7f72c47d418ff274f5decd35b0591b09800ad2a7cbd71c283550bd0e60a4d85744a57d4ec SHA512 31e58fd1d682089a45d23aa07c3c2c4c952ca016fa4c3416b2cba979d8b57369f80baef98ce857912e506e87d6cb456497a1ce1c75a0cdf1ee25d4e753b58726
 DIST setuptools-49.6.0.zip 2188590 BLAKE2B b789386d31c0d5cbc0c899d24e9af35baad371b698b488ed46b768e8831bae7245b391971e1e402799bc555475c1d8b78bd59a224c26bc78ba68b122a06e0154 SHA512 aad6e74b0e276da0f79c9429860a6d1c7860a30e9a02ce55527abbe7671366640423a1e5476da9ecadfc62ae1bf803cb0c664e2a09cf7619a9c8ac3965b9cf31
+DIST setuptools-50.1.0.zip 2168599 BLAKE2B ebfedb9607dd45f638b689ad73714575a584b112b55f9764d2e72333ded7b9170878b76bc92465fdc4ff60a9ff830c9994efc7d1f0195fd5bf8b50c87e7f8fb4 SHA512 b5b0fa45bf87d567847b0a5275cc06f3847f53282832b8b5a0084412c16f558a9db9b8084e27a34b0e99081275bc714acd494731dd487f5850b7ad59257e5cfc
+DIST setuptools-50.2.0.zip 2168687 BLAKE2B c725fb1103f37cef80f78aa7e0920a8e64c8a03d3f696f521ce94a3466c4a97512bf3a2512a24e9d6e92b277f391e8e5163c22ad28c0d34daace432f44ad4ac9 SHA512 1d6d52bd058b4fd3c8322538b7b31b601c04eaf196b49e89f758d691a65fe6e76fca486ba740fbb96bd817ed67b1d390a3724742977be8cc2963106a73c4c17a
+DIST setuptools-50.3.0.zip 2169216 BLAKE2B 029ea0159de270af0078a4661c696b93681b33dcc475640c7626f5a40bf1bb4759e5915948696c03b76dca10bdc4e790e2e9ef9628f41abca9a6aa48adcb72f6 SHA512 f67a2b7d639e03bf8b3815133e128902a559baf689afdd5893844ddc7c83505d727a6bb30ced1f78c4d2719dd405d2f4c527576bfa14dd9cb50c8ec4a479683e
 EBUILD setuptools-46.4.0-r1.ebuild 2349 BLAKE2B addf1d5afe6cc50865cab5c470a759a09be4929960fabebb8e76b2f467153bf58939a7800e3b5beb91d2c70a3e8944a9d9968ad68bccbf6dbd3514d2f8b15a4d SHA512 e8dc79476786ec15580f12a272e42cb3f862fa384102bd4928bb3798d341cc5247603f573fa86cdce9d815b20e2c844ded0d969c393cb40fabf464130e219cd4
-EBUILD setuptools-46.4.0-r2.ebuild 2478 BLAKE2B 28b4e7fe8f73e5161ad5ec6d05614e7907115c2c6ea9c2a62da6c3170e55a3e6cd21848726cd28218c84d85b99c5049753eec5f9f7c42d92a7127a17f657727b SHA512 415cbe43a31997249a945fb69635c2e4be07607aca2305a7edda480438fe920c412f9235a41a90fdcf8bda0bdc918e3c1022276a5bd2da768b3800a38461a8bd
+EBUILD setuptools-46.4.0-r2.ebuild 2485 BLAKE2B 4e9f769b8ca985f4682ac3bef2c42b78fe825b074ef527745ed78ce2c2f19488dbe34de6d1dddff8c81a478bff117bab5aad3780f7cf8d8d203f55e683a605b2 SHA512 8b1204421622c55ab33da6bb7e93bd3185db6d76c83295ffd3d8b880ebeb36b9103904b9fa7a43646a85d0bbd15264d78e50f29d0b1ae8e17bffdccb335b3353
 EBUILD setuptools-49.6.0.ebuild 2242 BLAKE2B 55cbd8c45e536ca370d6f28bd5a4378ea04cb91ede8b5842615ed5ccbbdbf2814c0fbd4e62a089c8c16cf431d1f293fa5e5fb7cdb9502396acc51cd3ad6e1a85 SHA512 300664b69a018daf86725ffa2a7c1e293136cc864482b522b7e97e520e4d38b74fad48c2f695846a5525461f39eecc09e924789c31215b16d6e6994471b10d11
+EBUILD setuptools-50.1.0.ebuild 2242 BLAKE2B 55cbd8c45e536ca370d6f28bd5a4378ea04cb91ede8b5842615ed5ccbbdbf2814c0fbd4e62a089c8c16cf431d1f293fa5e5fb7cdb9502396acc51cd3ad6e1a85 SHA512 300664b69a018daf86725ffa2a7c1e293136cc864482b522b7e97e520e4d38b74fad48c2f695846a5525461f39eecc09e924789c31215b16d6e6994471b10d11
+EBUILD setuptools-50.2.0.ebuild 2242 BLAKE2B 55cbd8c45e536ca370d6f28bd5a4378ea04cb91ede8b5842615ed5ccbbdbf2814c0fbd4e62a089c8c16cf431d1f293fa5e5fb7cdb9502396acc51cd3ad6e1a85 SHA512 300664b69a018daf86725ffa2a7c1e293136cc864482b522b7e97e520e4d38b74fad48c2f695846a5525461f39eecc09e924789c31215b16d6e6994471b10d11
+EBUILD setuptools-50.3.0.ebuild 2242 BLAKE2B 55cbd8c45e536ca370d6f28bd5a4378ea04cb91ede8b5842615ed5ccbbdbf2814c0fbd4e62a089c8c16cf431d1f293fa5e5fb7cdb9502396acc51cd3ad6e1a85 SHA512 300664b69a018daf86725ffa2a7c1e293136cc864482b522b7e97e520e4d38b74fad48c2f695846a5525461f39eecc09e924789c31215b16d6e6994471b10d11
 MISC metadata.xml 443 BLAKE2B 2b923468b7dc3062ad0f95edd944ffdde6dd4a8303ce8cc9a95730fefeb211e67ea64b7a289e60009003b64731d047ab3bb47cc6c8f0805a05a3a38f57846448 SHA512 2b2b1c7a0647283b069af29be73d0aa9c1e1ec8374d15d8a3b53a44b11d4698cba57a26ef5963795eb8bdbda9602b18a02194c5741485023ffd0b3218c028110
diff --git a/dev-python/setuptools/setuptools-46.4.0-r2.ebuild b/dev-python/setuptools/setuptools-46.4.0-r2.ebuild
index fe0f241c6160..0e0690d1dba8 100644
--- a/dev-python/setuptools/setuptools-46.4.0-r2.ebuild
+++ b/dev-python/setuptools/setuptools-46.4.0-r2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/setuptools/setuptools-50.1.0.ebuild b/dev-python/setuptools/setuptools-50.1.0.ebuild
new file mode 100644
index 000000000000..0d8d2e8bfb98
--- /dev/null
+++ b/dev-python/setuptools/setuptools-50.1.0.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+DISTUTILS_USE_SETUPTOOLS=no
+PYTHON_COMPAT=( python3_{6,7,8,9} pypy3 )
+PYTHON_REQ_USE="xml(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="Collection of extensions to Distutils"
+HOMEPAGE="https://github.com/pypa/setuptools https://pypi.org/project/setuptools/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	app-arch/unzip
+	test? (
+		dev-python/jaraco-envs[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pip[${PYTHON_USEDEP}]
+		>=dev-python/pytest-3.7.0[${PYTHON_USEDEP}]
+		dev-python/pytest-fixture-config[${PYTHON_USEDEP}]
+		dev-python/pytest-virtualenv[${PYTHON_USEDEP}]
+		dev-python/wheel[${PYTHON_USEDEP}]
+	)
+"
+PDEPEND="
+	>=dev-python/certifi-2016.9.26[${PYTHON_USEDEP}]
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]"
+
+# Force in-source build because build system modifies sources.
+DISTUTILS_IN_SOURCE_BUILD=1
+
+DOCS=( {CHANGES,README}.rst docs/{easy_install.txt,pkg_resources.txt,setuptools.txt} )
+
+python_prepare_all() {
+	# disable tests requiring a network connection
+	rm setuptools/tests/test_packageindex.py || die
+
+	# don't run integration tests
+	rm setuptools/tests/test_integration.py || die
+
+	# xpass-es for me on py3
+	#sed -e '/xfail.*710/s:(:(six.PY2, :' \
+	#	-i setuptools/tests/test_archive_util.py || die
+
+	# avoid pointless dep on flake8
+	sed -i -e 's:--flake8::' -e 's:--cov::' pytest.ini || die
+
+	# disable the code disabling non-existing coverage plugin
+	sed -i -e 's:cov = .*:return:' conftest.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	distutils_install_for_testing
+	# test_easy_install raises a SandboxViolation due to ${HOME}/.pydistutils.cfg
+	# It tries to sandbox the test in a tempdir
+	HOME="${PWD}" pytest -vv ${PN} || die "Tests failed under ${EPYTHON}"
+}
+
+python_install() {
+	export DISTRIBUTE_DISABLE_VERSIONED_EASY_INSTALL_SCRIPT=1
+	distutils-r1_python_install
+}
diff --git a/dev-python/setuptools/setuptools-50.2.0.ebuild b/dev-python/setuptools/setuptools-50.2.0.ebuild
new file mode 100644
index 000000000000..0d8d2e8bfb98
--- /dev/null
+++ b/dev-python/setuptools/setuptools-50.2.0.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+DISTUTILS_USE_SETUPTOOLS=no
+PYTHON_COMPAT=( python3_{6,7,8,9} pypy3 )
+PYTHON_REQ_USE="xml(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="Collection of extensions to Distutils"
+HOMEPAGE="https://github.com/pypa/setuptools https://pypi.org/project/setuptools/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	app-arch/unzip
+	test? (
+		dev-python/jaraco-envs[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pip[${PYTHON_USEDEP}]
+		>=dev-python/pytest-3.7.0[${PYTHON_USEDEP}]
+		dev-python/pytest-fixture-config[${PYTHON_USEDEP}]
+		dev-python/pytest-virtualenv[${PYTHON_USEDEP}]
+		dev-python/wheel[${PYTHON_USEDEP}]
+	)
+"
+PDEPEND="
+	>=dev-python/certifi-2016.9.26[${PYTHON_USEDEP}]
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]"
+
+# Force in-source build because build system modifies sources.
+DISTUTILS_IN_SOURCE_BUILD=1
+
+DOCS=( {CHANGES,README}.rst docs/{easy_install.txt,pkg_resources.txt,setuptools.txt} )
+
+python_prepare_all() {
+	# disable tests requiring a network connection
+	rm setuptools/tests/test_packageindex.py || die
+
+	# don't run integration tests
+	rm setuptools/tests/test_integration.py || die
+
+	# xpass-es for me on py3
+	#sed -e '/xfail.*710/s:(:(six.PY2, :' \
+	#	-i setuptools/tests/test_archive_util.py || die
+
+	# avoid pointless dep on flake8
+	sed -i -e 's:--flake8::' -e 's:--cov::' pytest.ini || die
+
+	# disable the code disabling non-existing coverage plugin
+	sed -i -e 's:cov = .*:return:' conftest.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	distutils_install_for_testing
+	# test_easy_install raises a SandboxViolation due to ${HOME}/.pydistutils.cfg
+	# It tries to sandbox the test in a tempdir
+	HOME="${PWD}" pytest -vv ${PN} || die "Tests failed under ${EPYTHON}"
+}
+
+python_install() {
+	export DISTRIBUTE_DISABLE_VERSIONED_EASY_INSTALL_SCRIPT=1
+	distutils-r1_python_install
+}
diff --git a/dev-python/setuptools/setuptools-50.3.0.ebuild b/dev-python/setuptools/setuptools-50.3.0.ebuild
new file mode 100644
index 000000000000..0d8d2e8bfb98
--- /dev/null
+++ b/dev-python/setuptools/setuptools-50.3.0.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+DISTUTILS_USE_SETUPTOOLS=no
+PYTHON_COMPAT=( python3_{6,7,8,9} pypy3 )
+PYTHON_REQ_USE="xml(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="Collection of extensions to Distutils"
+HOMEPAGE="https://github.com/pypa/setuptools https://pypi.org/project/setuptools/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	app-arch/unzip
+	test? (
+		dev-python/jaraco-envs[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pip[${PYTHON_USEDEP}]
+		>=dev-python/pytest-3.7.0[${PYTHON_USEDEP}]
+		dev-python/pytest-fixture-config[${PYTHON_USEDEP}]
+		dev-python/pytest-virtualenv[${PYTHON_USEDEP}]
+		dev-python/wheel[${PYTHON_USEDEP}]
+	)
+"
+PDEPEND="
+	>=dev-python/certifi-2016.9.26[${PYTHON_USEDEP}]
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]"
+
+# Force in-source build because build system modifies sources.
+DISTUTILS_IN_SOURCE_BUILD=1
+
+DOCS=( {CHANGES,README}.rst docs/{easy_install.txt,pkg_resources.txt,setuptools.txt} )
+
+python_prepare_all() {
+	# disable tests requiring a network connection
+	rm setuptools/tests/test_packageindex.py || die
+
+	# don't run integration tests
+	rm setuptools/tests/test_integration.py || die
+
+	# xpass-es for me on py3
+	#sed -e '/xfail.*710/s:(:(six.PY2, :' \
+	#	-i setuptools/tests/test_archive_util.py || die
+
+	# avoid pointless dep on flake8
+	sed -i -e 's:--flake8::' -e 's:--cov::' pytest.ini || die
+
+	# disable the code disabling non-existing coverage plugin
+	sed -i -e 's:cov = .*:return:' conftest.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	distutils_install_for_testing
+	# test_easy_install raises a SandboxViolation due to ${HOME}/.pydistutils.cfg
+	# It tries to sandbox the test in a tempdir
+	HOME="${PWD}" pytest -vv ${PN} || die "Tests failed under ${EPYTHON}"
+}
+
+python_install() {
+	export DISTRIBUTE_DISABLE_VERSIONED_EASY_INSTALL_SCRIPT=1
+	distutils-r1_python_install
+}
diff --git a/dev-python/setuptools_scm/Manifest b/dev-python/setuptools_scm/Manifest
index d36d41fbd7b7..1e12d3d6b913 100644
--- a/dev-python/setuptools_scm/Manifest
+++ b/dev-python/setuptools_scm/Manifest
@@ -1,3 +1,3 @@
 DIST setuptools_scm-4.1.2.tar.gz 48784 BLAKE2B 258fab119d3c37c17bd173e4ac34d338a222cee5f55f6b4756f2cb7feeb09e366f8578eead56caeeebc02d1b048199c0b560609e5aecacb23870398ae86f0cf7 SHA512 3d9d1e0479f00f6159b57f9e5b24e34df035d2009ec50d3779c77b1246aabc6d816f2a2d3e6651791316009e39dfcc8a1b84b779077c39501b9de5740abe6af6
-EBUILD setuptools_scm-4.1.2.ebuild 1128 BLAKE2B ccf0261f067448cdac2abfcfc923ccfa482b644270d420709dfd0ae366cb24441c0fddcbe7609b48d8d5a33e7188f02fa9ad94f9f4b3069151523be13b7842c8 SHA512 3082b7cdf790e0c543a72eccf862d4f27ac0d4a4f3de41a3cf0ed5413a9f1cf443fb45dc524152b9bb1895fceaf483483ebb06ffa699ba43cdd90810846205a8
+EBUILD setuptools_scm-4.1.2.ebuild 1135 BLAKE2B a347c6871b8d2b9f5aa146b61a04b262bc2f475def228fec735814cc5fd9edd961514a14e8700dc5b4bb2445bfb6a3ea81ce981b90170e346a2b857b2d29f5b7 SHA512 10ae7d95d77435040ba010852054fa0785bbefab3fb8d0949b854c92d1dbcf30305ae24cf4ec16b68816cd4affec21362ea57310c619f76d85de6443005012e9
 MISC metadata.xml 462 BLAKE2B 257bda789df46f229831124349133582141ed8046ffe22a2ed2537562e583ca694f9a23ac8fb70a8a7efec1414530a5b16db73568dbec22cddbf791797a1c781 SHA512 1118b7d883678dd5cf0c80bbfe28a926172646369032aa54b634dc518d617754482ab35962a3647aaf88310c7abeb17842d4d98b431a7bea0d0780112d06993a
diff --git a/dev-python/setuptools_scm/setuptools_scm-4.1.2.ebuild b/dev-python/setuptools_scm/setuptools_scm-4.1.2.ebuild
index c00fd3c90d9f..69cfab169eea 100644
--- a/dev-python/setuptools_scm/setuptools_scm-4.1.2.ebuild
+++ b/dev-python/setuptools_scm/setuptools_scm-4.1.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/sgmllib3k/Manifest b/dev-python/sgmllib3k/Manifest
index 92315a5aef74..76ebda800400 100644
--- a/dev-python/sgmllib3k/Manifest
+++ b/dev-python/sgmllib3k/Manifest
@@ -1,3 +1,3 @@
 DIST sgmllib3k-1.0.0.tar.gz 5750 BLAKE2B 188ac3c55245ff431e1ad7981f706f1a8fce3e9f3aaf844252c02da1189e5b9c7d29b76d803cbbcfc157fbb1ec7f36245186693472b95ed1634a2989185308ae SHA512 f9238afb831356f66b1c3e55975e0ea88007ffe1469b8b4e325e704d1915eb0ab120f5f9e98f36eeb4bf6204a1938d8a4d5a424f0cc054b141ac94adc8ef8ca9
-EBUILD sgmllib3k-1.0.0.ebuild 444 BLAKE2B e1234122587687c82c20128eca184dd7e29564bf0fd609090cb54ff1f644e6ab1210ed63fa24a21f17db0dcc8cbd1b58c0b22e4ae4d23cfa38fffaeb2e0bf022 SHA512 54a00a05f09fd23d3da2e1c06bdbde135a2ecba6b25de9308266f6d77f775d5764f640d1a855062c441aacf3515479d43871927fa00218a2e1eb94b7d5ff9515
+EBUILD sgmllib3k-1.0.0.ebuild 439 BLAKE2B 85ee002377ddb1f9a145319e24a9d578f17814e309ecedfc305eef805b927431ba4534ab934adda563ea94e1cd3098b74210554836d68cdc3740a2af4cc6e4df SHA512 a85938b80ffaa3314f22e85f95654f6383891c9e411cd12ee614878edc990b68f94a0ef9388b54242d683abd5dab44f6a8fb64937d5f1d084fafeb3ea3bd56b7
 MISC metadata.xml 218 BLAKE2B 086fdcf7b63ca7bd6c58e861d717bb375e1cd372eff26d5d2eeeb176d8c5e6f10e653562abafb50eae7d7508f8e3d421b87e6a749acd0490308672828d0da697 SHA512 4558fee4c51117e21b1f42ca3edbdf1195ed297db798d6bfa0e5fbb7019654a187422b0abde7af5d800caffed66d1e55e4280e8be602bad591424d9776c46781
diff --git a/dev-python/sgmllib3k/sgmllib3k-1.0.0.ebuild b/dev-python/sgmllib3k/sgmllib3k-1.0.0.ebuild
index 56060a4e95fd..640429ce91b2 100644
--- a/dev-python/sgmllib3k/sgmllib3k-1.0.0.ebuild
+++ b/dev-python/sgmllib3k/sgmllib3k-1.0.0.ebuild
@@ -12,4 +12,4 @@ SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
 
 LICENSE="PSF-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha ~amd64 arm ~arm64 hppa ~ia64 ppc ppc64 ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
diff --git a/dev-python/sh/Manifest b/dev-python/sh/Manifest
index 014064481227..730a9617e800 100644
--- a/dev-python/sh/Manifest
+++ b/dev-python/sh/Manifest
@@ -1,5 +1,9 @@
 AUX sh-1.12.14-skip-unreliable-test.patch 317 BLAKE2B 3c45673daeec13cbdf851dd97061df85c41783a1b5d760d9d45386b8b4e3f88e25e3f98cbdbce44796e5803614d5474444e554d305089d098fab2cb07075cf71 SHA512 6adc7fd1e2a9f52804272bba1d83eddd6db82b4b67569fc75d169794a19c505d51fd53c949eaabdeb775119a5e3929902c2bbf3883ed299b2de0e4faad597835
 AUX sh-1.12.14-tests.patch 1261 BLAKE2B 57c41b50078596998758410f79f0c54458b7884015382f28c82c893223620b42191d19f7fcb4a7065c38e6f2c35ee3e5e3c238667154aa0a2ad3ed6c6e342664 SHA512 e31ef40766e793e1717d15a537a30bf184cdee767d97b06b073074e0545c7d7fbb6a215e21d86ac70e0991a2a4d1bc35165442414ffdea4ece9a7c6a0c73952d
+AUX sh-1.14.0-fix-sleep-test.patch 1231 BLAKE2B 290a33009a7046d2a461e623e6e3fd7789ea04a2a54cb086f98bc7fcecddcda6cb3ec3d85429107688ac4d1e5e3dc7555dc924e64241f54fe1875832ce8651dc SHA512 a69ae0ef2b1637cfb579a2c7c4de903f191af9e32f1347add26a2efd32ecb6085799b5cbc96eddaa59d6cb4a9164f61df54b5ec1449b98705fac60526a2b3ff2
+AUX sh-1.14.0-skip-unreliable-test.patch 237 BLAKE2B 55b600d9426f127704cb698bb4df90b103b0ee08d29165f4d45e3fa56f1c0e20d3ab63b404cfa8d2bc372549a77474a2396903081c606516837ff295990eb47d SHA512 632f195df6a85cd65890d093400f4fed099c2344fe4e7f9d46f3decd817405ea587a18b271da3449088cc23519b5f16b30a2030a81d3bfcee30d4d55c591d5fe
 DIST sh-1.12.14.tar.gz 56861 BLAKE2B dcab86c518fdfdf763053f05a6701fbd0faa76e05d710d6ef709dca89b7527157385ecde355f5f358ba08f7da8e551712732ef43f3074f5568fc7092ed12f014 SHA512 5f2daa2666cf8efe90ba550c8ea5875f2a8812d787597c9d9b933f58feccd192e1ec0ab5695b756bdbfbf9748d106c2045be20838e680b31dac3f778970b5786
-EBUILD sh-1.12.14.ebuild 657 BLAKE2B 608e5bdfb1ff2a4c31931160d2861249b684688cd384dcee1daeb3538a87206acf8a56274318e6f83b5985f9244a989d91d1ae30379da70e9d9754be8b6dd423 SHA512 05c1479352fd063121156970f6acd10ca11769d078843062f7dea928baf359149a934ee200f6cea70f5bfd1da6d584e6a5a05fd3a337473b9cb20159cfdc03d5
+DIST sh-1.14.0.tar.gz 63313 BLAKE2B 9975944455077729d172a34dcf7847930f9bb943d5345729a9c09afeb411de72b59cd5e4f1192406ba8430a26439acd2ee4d477b10f31b5e55be936c711f70a9 SHA512 816c0562f4f779ba79b5206d151893cd5043898d1b74ee109c0ea67f862a097ab9c7509e4a20459fc623f14fa3fb1a9e2a2ccec8257a68fcba14414779a20128
+EBUILD sh-1.12.14.ebuild 664 BLAKE2B 0240a7357f987bfcb30b0c555885f8a47afba39d91127bba53b37e08d4308227d869de89f0d17503379ad2c9414fc0cf499a095474e886ee172e0d0b06855739 SHA512 1947b561b548815bea59f43cff14d10291a0a75cd98793ef3c21583714192b07a19c7a183086d65de3847da7d9838c221d7e8ec04965bfd5c69d15ba670cf220
+EBUILD sh-1.14.0.ebuild 674 BLAKE2B f4ef389f33d613dac307f3e5f7684eec2b1fba7fb7d542f97c46512de7683eabbf038ea0710b23a87da6f55bbbd97b3c6066ed438f477432be74773fe3c8c441 SHA512 98584e699e6983f513045014056e40f97b8bff46ec060400f92f5b324299dc46bdf1719a2d7ebb5c2207737f3468221e134f00ecf511eef3a0e863a3dfe46a69
 MISC metadata.xml 676 BLAKE2B 217e170b6b5cbfba2e5029c250dba3927f3cd2b3bbc5111cb5ea459fdcc1bcff0448a8dd2e4e2d8afe42f459e7a485fe4fe04202e9c253bd51f785eec216eb5a SHA512 4d4633de70608259eb2bb288af89992c90fe192258ac157d07f2d568922a88b497cf6a3e2961b266603089e55ce7cfcd7ae2831879ed9afce4c3c740479c2756
diff --git a/dev-python/sh/files/sh-1.14.0-fix-sleep-test.patch b/dev-python/sh/files/sh-1.14.0-fix-sleep-test.patch
new file mode 100644
index 000000000000..28d1ec9847fd
--- /dev/null
+++ b/dev-python/sh/files/sh-1.14.0-fix-sleep-test.patch
@@ -0,0 +1,33 @@
+From 83b189de4f461ed0370b0472f1938d3162ed00c7 Mon Sep 17 00:00:00 2001
+From: David Runge <dave@sleepmap.de>
+Date: Tue, 1 Sep 2020 23:18:13 +0200
+Subject: [PATCH] Remove hardcoded path for sleep executable
+
+test.py:
+In test_timeout the path for the sleep executable has been hardcoded to
+be /bin/sleep. However, on operating systems such as Arch Linux, Fedora
+or Solaris the executable resides in /usr/bin/sleep due to a /usr merge
+(e.g. see
+  https://www.freedesktop.org/wiki/Software/systemd/TheCaseForTheUsrMerge/).
+By only checking for the name of the executable and its parameter the
+test becomes more generic and thus can run on any (Unix-like) operating
+system (given that `sleep` is in PATH).
+
+Fixes #539
+---
+ test.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/test.py b/test.py
+index f8029c04..142fcc0d 100644
+--- a/test.py
++++ b/test.py
+@@ -2014,7 +2014,7 @@ def test_timeout(self):
+         try:
+             sh.sleep(sleep_for, _timeout=timeout).wait()
+         except sh.TimeoutException as e:
+-            self.assertEqual(e.full_cmd, '/bin/sleep 3')
++            assert 'sleep 3' in e.full_cmd
+         else:
+             self.fail("no timeout exception")
+         elapsed = time() - started
diff --git a/dev-python/sh/files/sh-1.14.0-skip-unreliable-test.patch b/dev-python/sh/files/sh-1.14.0-skip-unreliable-test.patch
new file mode 100644
index 000000000000..ea79229459ec
--- /dev/null
+++ b/dev-python/sh/files/sh-1.14.0-skip-unreliable-test.patch
@@ -0,0 +1,8 @@
+diff --git a/test.py b/test.py
+index a4b9915..fb2ffdd 100644
+--- a/test.py
++++ b/test.py
+@@ -2799,2 +2799,3 @@ print("cool")
+     @requires_progs("lsof")
++    @unittest.skip("Test seems to be unreliable")
+     def test_no_fd_leak(self):
diff --git a/dev-python/sh/sh-1.12.14.ebuild b/dev-python/sh/sh-1.12.14.ebuild
index 6278d6e98ad6..57ff7f3454da 100644
--- a/dev-python/sh/sh-1.12.14.ebuild
+++ b/dev-python/sh/sh-1.12.14.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
 
 BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/sh/sh-1.14.0.ebuild b/dev-python/sh/sh-1.14.0.ebuild
new file mode 100644
index 000000000000..1e7ec620c4a5
--- /dev/null
+++ b/dev-python/sh/sh-1.14.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( pypy3 python3_{6,7,8,9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python subprocess interface"
+HOMEPAGE="https://github.com/amoffat/sh"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+
+PATCHES=(
+	"${FILESDIR}/sh-1.12.14-skip-unreliable-test.patch"
+	"${FILESDIR}/sh-1.14.0-skip-unreliable-test.patch"
+	# https://github.com/amoffat/sh/pull/540
+	"${FILESDIR}/sh-1.14.0-fix-sleep-test.patch"
+)
+
+python_test() {
+	"${EPYTHON}" test.py || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/simplejson/Manifest b/dev-python/simplejson/Manifest
index 2cec95243416..446e051bba50 100644
--- a/dev-python/simplejson/Manifest
+++ b/dev-python/simplejson/Manifest
@@ -1,5 +1,5 @@
 DIST simplejson-3.17.0.tar.gz 83119 BLAKE2B 979dbcb5d50aeb55fd1c16daa398ef915ee1f23ca25a84870a3132c265202d1cd253090157cdea179cecc6603618df293a28adeadc795238ec3ccfceda88ea0a SHA512 383ee4fa3b2f378cd83152ba588ffbb620aa0e7cec80d3e3097edfb406a60e96afd6c5302a5b64adb710d3a52479c609873a2db7ab5756d7ca7a51412029e4c6
 DIST simplejson-3.17.2.tar.gz 83210 BLAKE2B 1b9f97a43bfe84f1ad506713d81483ebcd4006d1174558b7a27373f99d014e23ed72a9ec2b2006e64760c61e1e500a4f1ea4547104e7f4c71ba51003df0a5052 SHA512 003b2fbcb3f8e0849bdbd958c78f8b470081d97527bef82306db77940c6734a1cbf3b5dcb0984d2f9c9d14aa525e7865a08e70a10971f8841e138f7ad6476e4a
 EBUILD simplejson-3.17.0.ebuild 774 BLAKE2B eaec307788c130d7e32ccc3760379e3712f1407b9180c1a087daab1327ac230caaeab92fe6a32df2d58219c11264b9c24317fc64b536a67e24ebf870fcb49a37 SHA512 69226587cf94ab5de79b4a1a0687ca2554b545807d9796ea23a9c82419b53d0d1ab6f36ef73a51936514a66c773f3655cc6c2b74eb690e1ac1a2763929d6eb03
-EBUILD simplejson-3.17.2.ebuild 775 BLAKE2B 293c58cc538db9c81be5599eb02441c172b0b560a39558443d9611a2e6716ed93b0acee8d356831c1d5b0b54919d3fe355b534e4ac4b069a7fdddba1b2c82a23 SHA512 de266669a56712eff48bed22001dda7af03a465f60985294a467bf4e17491b5361f0b246c69c61d47404cc523a291a9a8432d983f0ca59edba343052645519ef
+EBUILD simplejson-3.17.2.ebuild 781 BLAKE2B 2a330a8acb09e31a8987ccff86a79d8256079ea18f8e37c978785c9c3f71391ab97da2ff83b7039ab07d839b71fb6a9fc9538079002ad225d46da3dd66c58759 SHA512 1a1632bc4742529653249e449859399586b1126588db3863aa67086d2da7c7f9aa9fd6669efb71910a39de36d51077459b3853bb34e4d80ca66861f4aeb9c144
 MISC metadata.xml 323 BLAKE2B c21be649394bb8a261a6169a710fd3862f1dd539505381a15f99611f323ea1e5fe4e6e54f1ed73d28bdddc2459812f13e40658ed99c09d0ba0f93f724b4bcfc9 SHA512 7db760ee80a6281bcc370303bafc40aea566465bf3264381336222c6f6002f573bfac205f2e42cca557c7b31855f082e1ed29ec9ab3b1125e455cf84bdaf54ec
diff --git a/dev-python/simplejson/simplejson-3.17.2.ebuild b/dev-python/simplejson/simplejson-3.17.2.ebuild
index fcd6b3f6d3f1..c583dc0725e0 100644
--- a/dev-python/simplejson/simplejson-3.17.2.ebuild
+++ b/dev-python/simplejson/simplejson-3.17.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="|| ( MIT AFL-2.1 )"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ~ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 
 DOCS=( README.rst CHANGES.txt )
 
diff --git a/dev-python/six/Manifest b/dev-python/six/Manifest
index a8060e4612ac..e59faa137c51 100644
--- a/dev-python/six/Manifest
+++ b/dev-python/six/Manifest
@@ -1,3 +1,3 @@
 DIST six-1.15.0.tar.gz 33917 BLAKE2B 57e852b6c35dd19e256814c0371cfbc26141b0f25a31f79a1cbd1b0cdd7d3cacf1236b96f5452f968cc426e6dff4d1ad70a9f2432bc361ba3c8c17fd40fe7582 SHA512 eb840ac17f433f1fc4af56de75cfbfe0b54e6a737bb23c453bf09a4a13d768d153e46064880dc763f4c5cc2785b78ea6d3d3b4a41fed181cb9064837e3f699a9
-EBUILD six-1.15.0.ebuild 691 BLAKE2B 49ca8f129495ebe8af17da6336f454de3f5ef97dd8805c97f74f4cf1d8b88a1944a9426def28d111091b1974fde659880ceefe7d02078fcf988d5c03650bc4ae SHA512 226f52169078c7a4d4d62d2917372812bc11fe5ea311c5fa62af874b5c074467ca8e4037618517b471df4143913de852665d81e725fb9e37b1162b860c15f265
+EBUILD six-1.15.0.ebuild 698 BLAKE2B 1fac9dd88e096cd6e7569d18c52f969eae15c5e083fa9c46ddf22f40dcfac81659fe9871f4896a754cb990652be1636a21df31d8e9287ddc9c5d5b9192ea0c48 SHA512 631b8be993d1402d3631b6ba7cfd43528aac00ea06b004e57ec904388deaf5a07b0191f8e9a9fb0fd3d7ad16ef1333fc35a824cc7e450f41caa9aaa55f52e242
 MISC metadata.xml 396 BLAKE2B 4b08f7faa6e73dee9d4f39caebc0eef9901f408c1cdfe5d883b350af406de2731e654c2a1c266daf07299451f57b8a717214ca1716463f7f43b376a51b4f6c2c SHA512 03881122a5eae7539c27d078eaf69f34e121f3a8a43c7e0ca9470c0ec6863ea268b5facc64e0ab100cc6b8c00473f784042047f077ceaa7f13d70d71dce03391
diff --git a/dev-python/six/six-1.15.0.ebuild b/dev-python/six/six-1.15.0.ebuild
index 685f6840a365..17b191fa1df6 100644
--- a/dev-python/six/six-1.15.0.ebuild
+++ b/dev-python/six/six-1.15.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc"
 
 distutils_enable_sphinx documentation --no-autodoc
diff --git a/dev-python/snowballstemmer/Manifest b/dev-python/snowballstemmer/Manifest
index f08c6847fa54..a8f5dbab477c 100644
--- a/dev-python/snowballstemmer/Manifest
+++ b/dev-python/snowballstemmer/Manifest
@@ -1,3 +1,3 @@
 DIST snowballstemmer-2.0.0.tar.gz 79284 BLAKE2B 2d9b5de8493ca8833b3b52b143e1f56b40a87cbde3f182793edc3ecfa8b3577c9ab506c19aa93870b3e03b5d86a62fb515b2df0bc616d4d88b4b9894ecde174e SHA512 d673205cacc7f6e81eaee23e6c50064af77c3c4464dbdf5dc1c3f5682dec2688fe6e7069b7ed2e59259312ba926d3be84bd846a132b6138e30b4ff2b9a9353e8
-EBUILD snowballstemmer-2.0.0.ebuild 535 BLAKE2B 78e1373cf44cc024c126175cce8d7dc416e69c56e1c8d698cf91bc3589e94d98094b4a17bd976f93357f83cf03061524be6c11af2b6f3ef9df559af58eb3c0ec SHA512 8c0991a35da0f9e12b28cac0a16e150ebd41c5430659aeb4b1d4c3dbd97bf8d05dd7bf6a3bce26b6f9a8d9b807e3a017c46e47cdfa4e3adf553c5060ddd0338a
+EBUILD snowballstemmer-2.0.0.ebuild 542 BLAKE2B ef9aeb69c1089a8b87b35c7d4c62a5156e16bff86e8453f9290e62ddc65f09eec032a5bbe27e1100959a9180138871dba697653bad37666ecb271bf99723a8af SHA512 7180736bf097bd0d21b45868850288ec21d13e43a673dfb61477ea28ac68933b2a3e6e4c881edf52d3812d6ab53104eb959946b130aca0dd0d470853d543c814
 MISC metadata.xml 416 BLAKE2B 0030a77ed97805fd6a4ede1f713188010f6941ecaee137d1d9e37c2e8c8c687c1971b3f5c38769815c950efebf6c5284d92ee930855c535743d03e010b42ec1e SHA512 6a0bb6e150616b856977ae455af4c954fa871f1b0d675c73c079ba22867db2870210c91a63d4d83d3ffe672d49a90666dc988e5cd778a0486864aa41a497635c
diff --git a/dev-python/snowballstemmer/snowballstemmer-2.0.0.ebuild b/dev-python/snowballstemmer/snowballstemmer-2.0.0.ebuild
index a6f633ad3dd4..b327eb6e56c4 100644
--- a/dev-python/snowballstemmer/snowballstemmer-2.0.0.ebuild
+++ b/dev-python/snowballstemmer/snowballstemmer-2.0.0.ebuild
@@ -14,4 +14,4 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-solaris"
diff --git a/dev-python/sortedcollections/Manifest b/dev-python/sortedcollections/Manifest
index 3dd4bd2f2806..90562418e953 100644
--- a/dev-python/sortedcollections/Manifest
+++ b/dev-python/sortedcollections/Manifest
@@ -1,3 +1,3 @@
 DIST sortedcollections-0.5.3.tar.gz 7021 BLAKE2B fdef18b938502f0fc7ce1683977b0982c23aa915d79b6bac30cf9cd74aa19af695f2aacb658a8411304497f28d270e9ba95bbdbcc47220f0302cd376edf312d9 SHA512 e0076017d1a97d7dc18b02bc4e3739c535ab001260be739fab2784cb58deac4323957fe21b4c679f55a790d864ca696695a603298709225b04eae740d859ab28
 EBUILD sortedcollections-0.5.3.ebuild 594 BLAKE2B bababcad1f7c0a7adc8a9abd31659b5830b14a6a4b3456c779a4f5d19870d94ec2aea6a49b24b9397a07760eeee70f7ccdb89a65b94b596a853eee91b29ed5f5 SHA512 3f6678d0d42f8fff823d5814526bdc975105fb1be3abd850b9fffbf47918b38160dd994fc40d7b2cab2cd933234a9db17d4496b253bd9518b80095ef6eaa750f
-MISC metadata.xml 498 BLAKE2B 5638984052d38b48773ba3efad23de34d7d22e5de6ab570a0f1c8494918b0f331b2a3f7cd72d976de9d1d24ae623af07370bf9daf6833792019472a1a23c2fc0 SHA512 d332e588cdf6194708c1e3f00e9e8159669eb36cb21b4c6eed8e5af44f09f7e71f12fe437ce889b96599994f7a9c9d7c4fa6642c2ab74cedb0490d21a3165d21
+MISC metadata.xml 404 BLAKE2B e3cb8758699848252139bac7663ed93cb357077f4dfa6ae465143cdec28613311f93ace54b46b080d31c8fe68b6bc04eb6668d7076575ec5359656612e6876f1 SHA512 f5ab0fc8bd94ecb8af58686dea0d8706eb22e912aed36c30e20dcbb4244e3722d218d023221d37e995d89160942eaf1dd12a085f39ad613b1aaf0e0d89d4db2d
diff --git a/dev-python/sortedcollections/metadata.xml b/dev-python/sortedcollections/metadata.xml
index 4c79be884169..8b24aaac3f54 100644
--- a/dev-python/sortedcollections/metadata.xml
+++ b/dev-python/sortedcollections/metadata.xml
@@ -5,9 +5,6 @@
     <email>python@gentoo.org</email>
     <name>Python</name>
   </maintainer>
-  <longdescription lang="en">
-    Pure python sorted collection library.
-  </longdescription>
   <upstream>
     <remote-id type="pypi">sortedcollections</remote-id>
     <remote-id type="github">grantjenks/sortedcollections</remote-id>    
diff --git a/dev-python/sortedcontainers/Manifest b/dev-python/sortedcontainers/Manifest
index 2c451584fb7e..4856965ac455 100644
--- a/dev-python/sortedcontainers/Manifest
+++ b/dev-python/sortedcontainers/Manifest
@@ -1,3 +1,3 @@
 DIST python-sortedcontainers-2.2.2.gh.tar.gz 9228894 BLAKE2B 358a2028a00748c89046069ed7ff075350d4a93f98521b48a72ba466719fd8b1eaa023f4c9d93beec1538315518f7fcc8b5b02478b1506c65fafa3840081b668 SHA512 413212aa35a80d24ec208caf19314dcc42dae207ec4ea8fdd7dc240c6fbf17372cb4c3e2209f6e40094419fa3eeb2fc9b23ad8bd7fb4e6fdaca46fd2fb248281
-EBUILD sortedcontainers-2.2.2.ebuild 829 BLAKE2B d118d1902b9d19a473aec17f2f5635220881c5bcf3710c4a1ae1fee9d400ff4b7b18b38d8c7a547cdccd7db451ca1601a1e422952bb5ff085b2dea29e6e181e7 SHA512 0259df22aaf0f336777e4e9f732d586f2b31ef9e03ab7c2c68015ce60637bf63c970c641f1a1736edb2f91d00fe5d931bd135a71cb75fa37c12fd597d05b6820
+EBUILD sortedcontainers-2.2.2.ebuild 836 BLAKE2B 4a3d55731d9a11acb12aec7c78ea1361ff0191babfe4d9064aca3a1ba6bab64e15f8608610834bf354a52ff93d3ef6e2de027f85d53ea7ec5a579c5ca608155a SHA512 a960dfe2a5d183bd1dbe44ec3b2b73f18320490c1761095eab0ddb77fe4dcd58baef7bd0ffbee22a5f7593d0c315398bc1b33fab324b50d7614ef6475b110b3e
 MISC metadata.xml 428 BLAKE2B a57e7ccaa33683eb26b7c30516ef267c10ff1b5057c8a5b2327228c1ba5e231cbdb137dffff389906947cfb7eed56f1a10a630634be2fbc91e20de4b84fe5c0b SHA512 71c37340680fda3bca57ae6c9930cb0e87c4f38c469964baf41e844302aaa25186509d556efdaf67c4750da50b2fdca8ed9dac2d9f287c6f83ccec4fa7f7aaa2
diff --git a/dev-python/sortedcontainers/sortedcontainers-2.2.2.ebuild b/dev-python/sortedcontainers/sortedcontainers-2.2.2.ebuild
index 7b0ae5192bd0..8b209c7e49af 100644
--- a/dev-python/sortedcontainers/sortedcontainers-2.2.2.ebuild
+++ b/dev-python/sortedcontainers/sortedcontainers-2.2.2.ebuild
@@ -18,7 +18,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 
 distutils_enable_tests pytest
 
diff --git a/dev-python/speg/Manifest b/dev-python/speg/Manifest
index ad418d06377a..c9b719584bad 100644
--- a/dev-python/speg/Manifest
+++ b/dev-python/speg/Manifest
@@ -1,3 +1,4 @@
 DIST speg-0.3.tar.gz 2592 BLAKE2B 1b82d6e122783fbc58f2c711a67e9b8b721d69c08de5ac2815d1ae459ce337552d10bb747cd1e31363f48f4a50bbc967b650d7e6048668d28d4133b5875aed14 SHA512 9faed6af0eb1a6ff0a7dc2e2f5b885a58a5430938b463420ad52277fe2900ae98531057ebbcc21d8cd259d4779bfb0c919125043503635721afe574b4f1f99ce
+EBUILD speg-0.3-r1.ebuild 455 BLAKE2B e5a2597aaf04a85af3400fccdf26ddd2ea685cc4bd6a1c5b9e245ede56dcd8dd7b8d0c427d9dfd4dfde2b5c327e48328af0fa740d278a32075a43c9ededbb90f SHA512 bd2df278fb0927c5eebf763fe673e7596525ae5a65f3cda558f9b60a5231eedc7a24a897f37334a0509a58ac52131f49b4f05ef09e1dd66fdb469fb24068f1fc
 EBUILD speg-0.3.ebuild 451 BLAKE2B a4c33a5038d498a6181e482a9d6c73a18100e0a516ac30cf6c583f5fd1d6493ed87ba08f5013ab53e48d76c5e180518206d5be5ffdbdf324a07558c0fd41c447 SHA512 f3febe6eda31a70940fbbcc5646cd626762a2dbfc02867296b320d7e48baaa1b9c362d6c8bc17f46e96d9b30f8ef149273acb9097a456a79bb1c25b6f65a8f7e
 MISC metadata.xml 376 BLAKE2B 113a90a20506bc63a3ff04dbbadcd4816e77cff90a67af41fffa4607b3d04846e10a32aff17406fa6020b0e7352ab856f04f0633985ca99a93aded3aace8786f SHA512 06f948d869175579e428cdea7b74c1074418fb0eddfa256492ad54d8905add9528100f95b42357271ffea24c4d73545d0d4dcdc66cef8fe656d753f175317a6d
diff --git a/dev-python/speg/speg-0.3-r1.ebuild b/dev-python/speg/speg-0.3-r1.ebuild
new file mode 100644
index 000000000000..53fe6ac90cba
--- /dev/null
+++ b/dev-python/speg/speg-0.3-r1.ebuild
@@ -0,0 +1,13 @@
+# 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 PEG-based parser interpreter with memoization"
+HOMEPAGE="https://github.com/avakar/speg/"
+SRC_URI="https://github.com/avakar/speg/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="~amd64 ~x86"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND=""
diff --git a/dev-python/sphinx-aiohttp-theme/Manifest b/dev-python/sphinx-aiohttp-theme/Manifest
index 843e2b3b47f2..606691123db7 100644
--- a/dev-python/sphinx-aiohttp-theme/Manifest
+++ b/dev-python/sphinx-aiohttp-theme/Manifest
@@ -1,3 +1,3 @@
 DIST aiohttp-theme-0.1.6.tar.gz 10921 BLAKE2B f1a5a0b82c1a99e0afa2fa118e9b2a13d59d742634c8826c0f67f45bd049c96851f1ac694cb6ebfcee1f66b1e03d445b4a3eef676135076af99a1d30541a0a4e SHA512 58b3b595eed97de546484dae562172c7751a3d4d90a6a1ea885e86a44b78d9017834372179d2881e048c4b2916f2b53d11ddb9368a5474462ac9ef7d75925b7f
-EBUILD sphinx-aiohttp-theme-0.1.6.ebuild 584 BLAKE2B 34d329ed6d25068bcf0725102718ee234899bf1d491b8afd8d8fc3cde6f6937a9cd05bc594f91a052c3ca931cd1268f973f2cb43837a29b7566c01b08c1b17d8 SHA512 24ccab07bc8c1c032b225ba6432d6b765d630e6ddb9ba7741e96179628f7ec49a2333c7ba0c7e9cd1f898a2b84823cdd4cb08e551ad59091ca12c9af37eeae8a
+EBUILD sphinx-aiohttp-theme-0.1.6.ebuild 596 BLAKE2B e29f865f47781f3a232d8d265cd56820a6342602c75aea96b4b70bfaea08d804d7e1dd508f6675a4751b07fbd9ef1c97860a8f568014955440d5b5e6bf7964fa SHA512 ac562a2ad33553ee8a5b7eac635a0f5a33e9b88f8a1b53b7afdf75d0303c11dc8657e91dc0a8b1c4307bd8c233db21f756f1c542c8213f463e909ab48b69c23a
 MISC metadata.xml 356 BLAKE2B c6f21942be22de996083446c4cf4d1d188e582ffc7550975b513475021f7097835512409e58eee10f86b205770734c968234d5fc542ec1a622d3883714685824 SHA512 9130b60a4ba5ad45d7bc2ae275485917c365933b215e9551ab000cd5a34a6932a07b02b7513d0890403fbf6a7cd713dd8cfcaaccd1c4819a0a9f15207f062d9a
diff --git a/dev-python/sphinx-aiohttp-theme/sphinx-aiohttp-theme-0.1.6.ebuild b/dev-python/sphinx-aiohttp-theme/sphinx-aiohttp-theme-0.1.6.ebuild
index cdb1da129949..9901d7169e98 100644
--- a/dev-python/sphinx-aiohttp-theme/sphinx-aiohttp-theme-0.1.6.ebuild
+++ b/dev-python/sphinx-aiohttp-theme/sphinx-aiohttp-theme-0.1.6.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~ppc64 ~sparc x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86"
 IUSE=""
 
 RDEPEND="dev-python/sphinx[${PYTHON_USEDEP}]"
diff --git a/dev-python/sphinx-bootstrap-theme/Manifest b/dev-python/sphinx-bootstrap-theme/Manifest
index dff09307ae9d..585a4f11d70b 100644
--- a/dev-python/sphinx-bootstrap-theme/Manifest
+++ b/dev-python/sphinx-bootstrap-theme/Manifest
@@ -1,3 +1,5 @@
 DIST sphinx-bootstrap-theme-0.6.5.tar.gz 1232943 BLAKE2B 76cd6f70cd485c552e9a76c559c8687129851fa40e03e206bdafc5fc0f948ed53d07ea8196908d2c17af1718eb721aaeb4fd1d65313e12a069a7186008a4f222 SHA512 30ef77364aa4c830000f1a2ee7f663740670124a6f433ed59af05ed408a59cb35643b66e3fea391edcb811cbd9ae3713eb174c76bf00bbad9801910935159bbe
+DIST sphinx-bootstrap-theme-0.8.0.tar.gz 1225612 BLAKE2B db5e65db732163048909903c7af0eb301a81b12fbf9ce299070d55ea8f949e2094f3c5624182fd8ac625d553f982cba6ef1bc0c2680de55993d57e82a779956a SHA512 25a2d05c424c52d4571e9a50a55be0c7f3a32aa855c3fe6fb642b1afcebcabb0fa715aac48da280a556b6c8d206b7018b45d8f9bd092123a9c03940290bbfc63
 EBUILD sphinx-bootstrap-theme-0.6.5.ebuild 540 BLAKE2B 054a89f55c2bd1e35f5d08eb123690e2cebeafd7e050aaf4333dea70d781af059e059a918ed35c2df6397cf04f5fca24c269cd05f23d8a80cf1b203499b39235 SHA512 15e81acf82758d508a22619585d134239aa362d0501560c47a69e30e68d4c3a378b239239d0d006fc9fc2b5600841b6aa9c7810f837e71e63bc2d987c57626de
+EBUILD sphinx-bootstrap-theme-0.8.0.ebuild 675 BLAKE2B 2aac2efcd2eb915c9b6d8302d5b3796b80667dd5d93e7a247058332c713c7bd4067ae8275fb279986085776f5ce8f12604d3f52df51aeebb85086d56dcf042d0 SHA512 fb3a806e1de2266e8926f2e08264411b940b20de4a23e307bc7518ea6ac8ef2f8d349dcd2a159597f12b3d377fa10feeeadd37d2e60a7163aae99004243621fa
 MISC metadata.xml 495 BLAKE2B f1850c5403281533f2edf707dd9db4c1e339e56f4e5677d9189c51376b892f79c084bc987c0b1f28ae2fd09030daf5f249cb42681e8f22787df3b31c422b649f SHA512 c6011ce51a2c8f73d33eb80eb3adfcda50911dc535a1c6f18862eeec7c601245aa76acfdf7a9f6f80f4aed2793ad5ac244ae2e0a893723106a36539cd7d0651b
diff --git a/dev-python/sphinx-bootstrap-theme/sphinx-bootstrap-theme-0.8.0.ebuild b/dev-python/sphinx-bootstrap-theme/sphinx-bootstrap-theme-0.8.0.ebuild
new file mode 100644
index 000000000000..244c96ff8ffe
--- /dev/null
+++ b/dev-python/sphinx-bootstrap-theme/sphinx-bootstrap-theme-0.8.0.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( pypy3 python3_{6,7,8,9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Sphinx theme integrates the Bootstrap CSS / JavaScript framework"
+HOMEPAGE="https://ryan-roemer.github.io/sphinx-bootstrap-theme/README.html"
+# Latest version isn't on PyPI
+# https://github.com/ryan-roemer/sphinx-bootstrap-theme/issues/210
+SRC_URI="https://github.com/ryan-roemer/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
diff --git a/dev-python/sphinx-gallery/Manifest b/dev-python/sphinx-gallery/Manifest
index 340ed365eda0..21a3fdca3b8b 100644
--- a/dev-python/sphinx-gallery/Manifest
+++ b/dev-python/sphinx-gallery/Manifest
@@ -1,3 +1,7 @@
 DIST sphinx-gallery-0.3.1.tar.gz 88807 BLAKE2B 79218a1f438e2b8607c52b14f098c0136cb4d5ce15a12d82bdb3caf0c7c1090e7c4f210437fc660d8d4d19bf87bbaa2ec3c208d2dc8a77ad9deea5b5cefa3c05 SHA512 c51eaaef63a7496e223a4541d0560f694420b6ac4b2cde3779c405f0ab92d34aef7a37e4c41da9e59bd8a050c8d3eed330df3799e76a60ae35cdbc6f7c9cb8c1
+DIST sphinx-gallery-0.8.0.tar.gz 6501815 BLAKE2B ac4b131ea9395bc230e2bab57d3823951365828f7d56ec0317878014a349ebba02e372625551f033784f30788f7c1ed110a2ba901834c9cec7cd18fa0b7ae27f SHA512 8646dd903dc6006d9333d5c9e94d2ce3cdfdc97a84a009fc3fb7abca75b0b0428b9c186625d18eb5dbdb29649efbb82a567815e82d46712bc07b1be2d0e95f1a
+DIST sphinx-gallery-0.8.1.tar.gz 6502920 BLAKE2B 35f6bfe6039910518c21dadcdb7d814f4400baf3996ee5df21ff6a16b8fe87b0ec0355073b854e9b07ab7f2aced6d2de4453b9ebb2aa142506e9cbfebb99ea4c SHA512 0e77b75fe1d9c44d68235603529c116fad0460156d59f6b2f41ff299e42074930694f1768d99fe585428734617d18e1f1379fdc14e359b0274d1614c092141f6
 EBUILD sphinx-gallery-0.3.1-r1.ebuild 713 BLAKE2B e698e727864dfd0118b6847b76c756fea6cb21edab7a28941e082f466d7808d6d922e3d73699573067f9e23f71032305e3a935892701743eafa39f0e1db3ec88 SHA512 b581594ac4db20310940ddc069e044b30b75ace4e723f6df106fc97da0e63dde1c6c9d1fc34612e713b4024cb19f4f7420575a36641aa36cf5cacdfb10880c3f
+EBUILD sphinx-gallery-0.8.0.ebuild 1231 BLAKE2B 35e209047bead6f8db2ef5eb5fa0f9ce983e27ba27bceafc9d35bbd9485af1460288b907df6c98f9678413d75d1f826537e4ba19045b0cebd21f7ba41f6f6df1 SHA512 16e5841cf99f5c43f8e17f0169bfe4daa941db836a7e7d47f7445ad2d786e6a691b02a64f8c7f68741d654c6077e69d3d83407f2af39001b73ffdb9558971ba0
+EBUILD sphinx-gallery-0.8.1.ebuild 1081 BLAKE2B 6576f33ff00308e6ac02f7aac3e8ef3e96318849f649ce9029d7b7088e0736885282fd773b7c7407cb68469eba86c0ef2b88feabae3746f668ad9c84245684a0 SHA512 08e1cfbf3b365e5319d96104d1ffc660bda17ce56a047d63c7d750412993808784afb5089d745870f9aa3ddae9aeb857d5fa9c937c03b9fd3cfd7c8df6b30c24
 MISC metadata.xml 398 BLAKE2B 9ba3eb9dc8d9d9e16cb83963ab758bdcd11c6f7c8ff5ee6a9244b8c0e9c9db2162a22b855bdcd43148c0d23ef8c31c075e36bd4afdffa1a2eb5f30d08ce00747 SHA512 3b9762099b163b539d7de52602291433608ef33a9e60d3713e07bcf0b2b8345a52a0b162f6be52c9a88cfd419e5bc4e59307d07213f1d5aa3c4ca892d91f8b9b
diff --git a/dev-python/sphinx-gallery/sphinx-gallery-0.8.0.ebuild b/dev-python/sphinx-gallery/sphinx-gallery-0.8.0.ebuild
new file mode 100644
index 000000000000..4099672df38c
--- /dev/null
+++ b/dev-python/sphinx-gallery/sphinx-gallery-0.8.0.ebuild
@@ -0,0 +1,49 @@
+# 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="Sphinx extension to automatically generate an examples gallery"
+HOMEPAGE="
+	https://sphinx-gallery.github.io/
+	https://github.com/sphinx-gallery/sphinx-gallery"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND="
+	dev-python/matplotlib[${PYTHON_USEDEP}]
+	dev-python/pillow[${PYTHON_USEDEP}]
+	dev-python/sphinx[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/joblib[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	sed -i -e 's:--cov-report= --cov=sphinx_gallery::' setup.cfg || die
+
+	# tests require internet
+	sed -e 's:test_embed_code_links_get_data:_&:' \
+		-i sphinx_gallery/tests/test_docs_resolv.py || die
+	sed -e 's:test_run_sphinx:_&:' \
+		-e 's:test_embed_links_and_styles:_&:' \
+		-i sphinx_gallery/tests/test_full.py || die
+
+	# TODO: the path is clearly wrong (/../.. <- leading slash)
+	sed -e 's:test_binder_logo_exists:_&:' \
+		-i sphinx_gallery/tests/test_full.py || die
+
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/sphinx-gallery/sphinx-gallery-0.8.1.ebuild b/dev-python/sphinx-gallery/sphinx-gallery-0.8.1.ebuild
new file mode 100644
index 000000000000..c2e131784883
--- /dev/null
+++ b/dev-python/sphinx-gallery/sphinx-gallery-0.8.1.ebuild
@@ -0,0 +1,45 @@
+# 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="Sphinx extension to automatically generate an examples gallery"
+HOMEPAGE="
+	https://sphinx-gallery.github.io/
+	https://github.com/sphinx-gallery/sphinx-gallery"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND="
+	dev-python/matplotlib[${PYTHON_USEDEP}]
+	dev-python/pillow[${PYTHON_USEDEP}]
+	dev-python/sphinx[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/joblib[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	sed -i -e 's:--cov-report= --cov=sphinx_gallery::' setup.cfg || die
+
+	# tests require internet
+	sed -e 's:test_embed_code_links_get_data:_&:' \
+		-i sphinx_gallery/tests/test_docs_resolv.py || die
+	sed -e 's:test_run_sphinx:_&:' \
+		-e 's:test_embed_links_and_styles:_&:' \
+		-i sphinx_gallery/tests/test_full.py || die
+
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/sphinx-multiversion/Manifest b/dev-python/sphinx-multiversion/Manifest
new file mode 100644
index 000000000000..8ca1c6f559a1
--- /dev/null
+++ b/dev-python/sphinx-multiversion/Manifest
@@ -0,0 +1,3 @@
+DIST sphinx-multiversion-0.2.4.tar.gz 20468 BLAKE2B 9bdc59691b63c280d08c77108318b778c8bf948c502538e94e77072589c4e6565bcb7e863a8d765f55be012b21a1a0242d37077248312a7ee18dc788a7dbc633 SHA512 68441793631f59df3330ecc84c0d1aa279f0492021108121f2bdab92d5a3eb61522664f14c4ebe8709126e0088ff8eb323aeeebb5d1e7a2dcbd358eeac772d08
+EBUILD sphinx-multiversion-0.2.4.ebuild 580 BLAKE2B 20fdca4fcda42b34286ebb6ff20c22266c9536bc36fbf400c61d5d6f0201ef3fd6d7ef7b2c95c8a4e03372b8291841f19c33ea991b4a27569f7d446ea6abc067 SHA512 5b1e799ae2b6ab6b31ebc32f32864b9c896c72d47a5b0664372a88cff54d4cf98d815876aaa383a462c3a1bae6ef5cb3db55f911536abc21a3a2d86eb8aa6106
+MISC metadata.xml 375 BLAKE2B 393138e315b4eae4dacb9339fbb5766e9dbaa84b7482babaddc08d524fb8b9939f6622ee9c6d09b66c61ac270fcc483fac39996a12ba87ccccf7cafd4c6d36db SHA512 9a44b6b9de4d1a61d6af9256519473541d5513cef349c15178c025dee3aaaa3f6772b1be56576411a985fcd9c70029c00743d8f577be8eaec4c5a44646c9cbf6
diff --git a/dev-python/sphinx-multiversion/metadata.xml b/dev-python/sphinx-multiversion/metadata.xml
new file mode 100644
index 000000000000..d22e99d73577
--- /dev/null
+++ b/dev-python/sphinx-multiversion/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>andrewammerlaan@riseup.net</email>
+		<name>Andrew Ammerlaan</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-python/sphinx-multiversion/sphinx-multiversion-0.2.4.ebuild b/dev-python/sphinx-multiversion/sphinx-multiversion-0.2.4.ebuild
new file mode 100644
index 000000000000..eb17e4c52eac
--- /dev/null
+++ b/dev-python/sphinx-multiversion/sphinx-multiversion-0.2.4.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+DESCRIPTION="Add support for multiple versions to sphinx"
+HOMEPAGE="https://github.com/Holzhaus/sphinx-multiversion"
+SRC_URI="https://github.com/Holzhaus/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="
+	dev-python/sphinx[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+distutils_enable_sphinx docs dev-python/alabaster
diff --git a/dev-python/sphinx-notfound-page/Manifest b/dev-python/sphinx-notfound-page/Manifest
index 4806e7562cdd..ddd78d69c77f 100644
--- a/dev-python/sphinx-notfound-page/Manifest
+++ b/dev-python/sphinx-notfound-page/Manifest
@@ -1,3 +1,5 @@
 DIST sphinx-notfound-page-0.4.tar.gz 5685 BLAKE2B 0bfc6cf98e0731a5cc95f1802dad1e7297ed764a626831b970d75d82ec0f7d6edb45c404851ea13bf38decc39aabf0e3dd6b136714a591e8ab595f11e23e67cd SHA512 56e867e6954f26da498b77e8fa43e8d62961ab33ee9c16d2084745dd54a998df51c7d882a47560196135d2fb4d473f7305ef19b31373bc205f8eaf0d3d4946f0
+DIST sphinx-notfound-page-0.5.tar.gz 47806 BLAKE2B 4715bed7509970f9198a0c666a568ca403157ad0704d0e1d17d222e6e8dc7adefab3922a4b79e056d20034463d5f034cba8c7b65248569a46866a964abec7e70 SHA512 a48cf4bcc755687c9e02482727ab2c28abe314118cef775e6b5625e2db67e4040745740c3c9fd88206bf050f1621ef20ffb0262ec614c11497ef030f9fb675a3
 EBUILD sphinx-notfound-page-0.4.ebuild 514 BLAKE2B 32325c5bd2224450f430332b74793a1b009e9c77358cd2ee54ec1f4aee9dcb4d7b1b8e448dd5a3e4cb10ed7534aa43b5f08c3211596a2fb4e8d79698af2ec998 SHA512 6faac5bb77a4ce6bbf704a45278242ba73160637af47b4ff26d9d8093d06e91ff13cbbbb336262a8221d75fc21860039d8e5ba3702ce9f0cd9df452c4fa27abd
-MISC metadata.xml 440 BLAKE2B 0a08957b47eac83866fdbfd2fc137fa09413c2f6e4cbe961a0c587cb1604951d76061d41acae0a925a9f1775c785e8dc0808255685c14d88b5543e729052aeca SHA512 84b278d6a84dccb896c1e5c10ff1018ec801ea1a36083896f08629db28e82f8b20be2cad95a13b2ad53ba3751c9f6ba0c8a6367ad9baeb2881d22211793c2671
+EBUILD sphinx-notfound-page-0.5.ebuild 646 BLAKE2B 9a55bfbd0eb3caa9e2f657e3ed7480a2f21762fe1f77252da0c76b480a40193e8561968baba4cb3ff4244308417166c65189001fb51828f5c1f07b87b8102b23 SHA512 f00c1b89941ccf18a8ff239d840badf65c9938c356c5f21b557884738cae539119287763eeaec59b1008de4273b894675614c7c3e93df2ed5f698a48f1175cae
+MISC metadata.xml 626 BLAKE2B a9cc30ad83ffd4e697b10525cd5d5d555ed6293ff54044a67eeb871f29d9683c5330c4c49c378c990e126db241fbca487d00510960e8154f74b1fcd50325dfe7 SHA512 3c92f220c2a0d3668c1c0d968f43cc5986494130952aec2d014900576f39fccb67953c1f8fe90e70d0591ee618e2b3b312828c436f3acf6ed75425d4f4694048
diff --git a/dev-python/sphinx-notfound-page/metadata.xml b/dev-python/sphinx-notfound-page/metadata.xml
index 7f94ee92d1e7..f7ae32667577 100644
--- a/dev-python/sphinx-notfound-page/metadata.xml
+++ b/dev-python/sphinx-notfound-page/metadata.xml
@@ -8,7 +8,10 @@
 		<email>prometheanfire@gentoo.org</email>
 		<name>Matthew Thode</name>
 	</maintainer>
-	<longdescription lang="en">
-			Create a custom 404 page with absolute URLs hardcoded.
-	</longdescription>
+	<upstream>
+		<remote-id type="pypi">sphinx-notfound-page</remote-id>
+		<remote-id type="github">readthedocs/sphinx-notfound-page</remote-id>
+		<bugs-to>https://github.com/readthedocs/sphinx-notfound-page/issues</bugs-to>
+		<doc>https://sphinx-notfound-page.readthedocs.io/</doc>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/sphinx-notfound-page/sphinx-notfound-page-0.5.ebuild b/dev-python/sphinx-notfound-page/sphinx-notfound-page-0.5.ebuild
new file mode 100644
index 000000000000..6fef53b3f911
--- /dev/null
+++ b/dev-python/sphinx-notfound-page/sphinx-notfound-page-0.5.ebuild
@@ -0,0 +1,22 @@
+# Copyright 2019-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( pypy3 python3_{6,7,8,9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Create a custom 404 page with absolute URLs hardcoded."
+HOMEPAGE="https://sphinx-notfound-page.readthedocs.io/"
+# PyPI tarballs lack tests
+# https://github.com/readthedocs/sphinx-notfound-page/pull/110
+SRC_URI="https://github.com/readthedocs/sphinx-notfound-page/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~x64-macos"
+
+RDEPEND="dev-python/sphinx[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
diff --git a/dev-python/sphinx-panels/Manifest b/dev-python/sphinx-panels/Manifest
new file mode 100644
index 000000000000..7230294a4224
--- /dev/null
+++ b/dev-python/sphinx-panels/Manifest
@@ -0,0 +1,3 @@
+DIST sphinx-panels-0.4.1.tar.gz 393088 BLAKE2B 3ba183710d211ddc623791dfa1994e08a65a2a3b4c3cda44bba7c13da255dd32c571a3637961bb901dadddfd7d06e7304eb7c489bcdcce8a05452efa151830f3 SHA512 a86377197682fe456d4d1d94571dfcb41bd09b086b79b3fd06a2d170aa97392130315f95534c04160e202cf8674bcd4005893dd306b2a1210647708863d22517
+EBUILD sphinx-panels-0.4.1.ebuild 620 BLAKE2B bd9c4a9a88e089bc62c04f7f08aad47fc5eeecb01c63fffc721a711f224a0ef180f69e36f3e968430b5925d36465083c5d055301c87ffe6fec8520f82ad97f39 SHA512 896a771b268b5e3eb2f79edb3d14ecef54b61c33186bdc568baccf1ef8230c5ffcdfa668b0336dc236b865393c2e5a1fddf2c9c4fc03aa3f0ac151bdb27bf86e
+MISC metadata.xml 375 BLAKE2B 393138e315b4eae4dacb9339fbb5766e9dbaa84b7482babaddc08d524fb8b9939f6622ee9c6d09b66c61ac270fcc483fac39996a12ba87ccccf7cafd4c6d36db SHA512 9a44b6b9de4d1a61d6af9256519473541d5513cef349c15178c025dee3aaaa3f6772b1be56576411a985fcd9c70029c00743d8f577be8eaec4c5a44646c9cbf6
diff --git a/dev-python/sphinx-panels/metadata.xml b/dev-python/sphinx-panels/metadata.xml
new file mode 100644
index 000000000000..d22e99d73577
--- /dev/null
+++ b/dev-python/sphinx-panels/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>andrewammerlaan@riseup.net</email>
+		<name>Andrew Ammerlaan</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-python/sphinx-panels/sphinx-panels-0.4.1.ebuild b/dev-python/sphinx-panels/sphinx-panels-0.4.1.ebuild
new file mode 100644
index 000000000000..10cc2d0a18c3
--- /dev/null
+++ b/dev-python/sphinx-panels/sphinx-panels-0.4.1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+
+inherit distutils-r1
+
+DESCRIPTION="A sphinx extension for creating panels in a grid layout"
+HOMEPAGE="https://github.com/executablebooks/sphinx-panels"
+SRC_URI="https://github.com/executablebooks/sphinx-panels/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-python/docutils[${PYTHON_USEDEP}]
+	dev-python/sphinx[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+distutils_enable_sphinx docs dev-python/sphinx_rtd_theme
diff --git a/dev-python/sphinx-py3doc-enhanced-theme/Manifest b/dev-python/sphinx-py3doc-enhanced-theme/Manifest
index 137c2633079a..667109e39e33 100644
--- a/dev-python/sphinx-py3doc-enhanced-theme/Manifest
+++ b/dev-python/sphinx-py3doc-enhanced-theme/Manifest
@@ -1,3 +1,3 @@
 DIST sphinx-py3doc-enhanced-theme-2.3.2.tar.gz 41894 BLAKE2B 9a38169b7e2c3331267f5c0a102d01cb0185689334adc98abe91626b27217add0abacde3422fe528588322ccc96f6976b80ce0e510cecfa80837d9b595cb2457 SHA512 efeeaf1bbb7f5557f5e1500dd0a49aa001b714f329f594e95676d8833eede7eb5e0fa978257caeab9630360b05f48132ffb00137262c7a5b663cae6a009ed42d
-EBUILD sphinx-py3doc-enhanced-theme-2.3.2-r1.ebuild 551 BLAKE2B d6ab7419239e139a4b44a6f019b7ac5a253767534c076714f7b3b4ac32ac9147f1046a2c3973193ce8a4503d739394ae295b1a0c63df382dceb19e8c649b548f SHA512 84a91583bbbdbde755b275866c5a5ab0d6ddd3e5f4a65869150a76205ba8a78c6e38aa4071cd583bf586f06277c118f8017dd719b82aa616a235b2f4bc8d75e6
+EBUILD sphinx-py3doc-enhanced-theme-2.3.2-r1.ebuild 558 BLAKE2B c7793d09e0f2d80ee13675fd9fdb60b6aef135d6c154e9d11fe95f6af13a7800d1a62dbc426694c7d92fe77e609e45db8209638864893df1241f5e9b99a02a8e SHA512 ea13dae03a677804bd6a086fcd323ecac2674995710e86a53c11c43fe05ddb56ff4a5f9d2129a55f1971dd43dc1cb785523cacb1919ec366ae83ec75085e2693
 MISC metadata.xml 539 BLAKE2B ff83809c3ed8818080adfb13e16a4f97964a1c4a3f455fadd22a374ddaf01dd5a55d13110aee9b44e14c784eecdf4bbfdfe44992990a3f41ab2558c188c4d741 SHA512 7880c83b91cf5d2760157ab1dba1f869084670ff0fe51a477545801dbaa1bd70861ea90860953e9eb3ee9b526acfe33eae931915b7ad990213db05c4d829ad54
diff --git a/dev-python/sphinx-py3doc-enhanced-theme/sphinx-py3doc-enhanced-theme-2.3.2-r1.ebuild b/dev-python/sphinx-py3doc-enhanced-theme/sphinx-py3doc-enhanced-theme-2.3.2-r1.ebuild
index b49feb99203b..e2422dd96419 100644
--- a/dev-python/sphinx-py3doc-enhanced-theme/sphinx-py3doc-enhanced-theme-2.3.2-r1.ebuild
+++ b/dev-python/sphinx-py3doc-enhanced-theme/sphinx-py3doc-enhanced-theme-2.3.2-r1.ebuild
@@ -15,5 +15,5 @@ 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"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86"
 IUSE=""
diff --git a/dev-python/sphinx-testing/Manifest b/dev-python/sphinx-testing/Manifest
index 22be58a0a553..6d0aa9a4d737 100644
--- a/dev-python/sphinx-testing/Manifest
+++ b/dev-python/sphinx-testing/Manifest
@@ -1,3 +1,3 @@
 DIST sphinx-testing-1.0.1.tar.gz 11513 BLAKE2B 46ede243507a0d90b2ad4b918deadb818491bb0ed15ce41886040c52650f9fd348ff57c03766fd1e7719bbb54726f8915e091cf94a5396da946102ca49fd07b2 SHA512 2d377c0c6fe8e34a463b35e96938507a3ca35fa06cd19a2682eb55825e1b88982a80a02ebb9a02a47f11ca5e8fe6a5b9e5c8114d955fa3b774e0148e82121818
-EBUILD sphinx-testing-1.0.1-r1.ebuild 816 BLAKE2B 6570aa17afdd9e91b1392f64fb20b4ca711c9192d17316061861c5f86676ae178d3fa6ee7e1d080d8233fa77e4705e6ee140b4c3a6213c909e73ca58f37006b3 SHA512 e3ca5795c4189cf05f2c99eab0c5b9aa73835f410b5d8c5a3c106460f7f9a09287adb9c6f12cc768835b22c0f873a00b20c531ae084d8758e6174d49f1b2268b
+EBUILD sphinx-testing-1.0.1-r1.ebuild 821 BLAKE2B 4a0b3349cbe1c81e9683c9e67f753364d0f5b8689e08d6315ebe8dc2429408492086e8083cfd84972bd8476f6990498b18be1b59ba29d472574a5d15f640e147 SHA512 2f99fb21da6e31da7fb887d864a4a165c49dcbf36396479208d9867b2c7bd9caa8217435b25749511eb1145eb84c798ceec442b61b5956a7eadba11cbb287701
 MISC metadata.xml 340 BLAKE2B 9a1df283aab1420d7818f4661b57f6d60cd734016c3711c633b9a6a11c401c8603503530fa5e1f50940bd28c1fed83196c1c543d16b5217b996f6afef23175a8 SHA512 f5299851dc6aa3c3ad1109123ac6c4eb5b5c7e1177fa1f068da5cef0920bbece63a8f1c424c5b95addf661e5a7d15a05a427676f6c272a54741495c77e316b78
diff --git a/dev-python/sphinx-testing/sphinx-testing-1.0.1-r1.ebuild b/dev-python/sphinx-testing/sphinx-testing-1.0.1-r1.ebuild
index 1b302e866357..c9e677f2f19b 100644
--- a/dev-python/sphinx-testing/sphinx-testing-1.0.1-r1.ebuild
+++ b/dev-python/sphinx-testing/sphinx-testing-1.0.1-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ia64 ~ppc64 ~sparc x86"
+KEYWORDS="amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/sphinx/Manifest b/dev-python/sphinx/Manifest
index eb84a7cef5d4..7bb4fc8f0964 100644
--- a/dev-python/sphinx/Manifest
+++ b/dev-python/sphinx/Manifest
@@ -5,5 +5,5 @@ DIST Sphinx-3.2.1.tar.gz 5970067 BLAKE2B 6158d31390c9b07aa3abcdc4eb7ed827cf21601
 EBUILD sphinx-2.0.1-r1.ebuild 3449 BLAKE2B 2111f0525ba29ef2e6c0fb7001ca49b52e645f1a8f884391a85418d040fb4a90a4a1df2a1896d7eeacb86304aded025bb043afd748fe8e0fae349d7d80bc8970 SHA512 17051761d94c11eb95cc1e3e4b946407432b895ebe1b2fccf1cf9187fb859e5edd525bd52c79347747b0a8dd93c0d32e3c9fcaf1577118fc3c97ad71118445aa
 EBUILD sphinx-2.4.4.ebuild 3644 BLAKE2B 28df6a37d7fab6255e893501fbc4a45f427f1928f9e77420806f8eb2bcc2b23f05d2d5eb2b9a04258913555f1401c94c968811b270f4c3a0085340bd7e334ff5 SHA512 f6332488785a0c6795348b76db72a80e3bfc839a3ded793e12ae185941ebbba062f91c10f7dc8aca111bb951f62dc8f86fdd946a80e7253dbd14735dd5d6648c
 EBUILD sphinx-3.1.2.ebuild 4766 BLAKE2B 88bbb6fd8d6fd89e4aa5b57d0810f115825d72c73a7db612cd2c9ed18b82e65b0b6549d1d51bc6de136002f9aa8af7e282fc2dc7a4563137149d66942f5da2c6 SHA512 bd06851b66530079903f95050be806b872d86603f8beb59f7f598567cc43f5e43c88b2f98c76cd5e7fc393da5150df8aada0f2b37b01265970ee85d95687b9cb
-EBUILD sphinx-3.2.1.ebuild 4775 BLAKE2B 29587fdcea2941967b086fcaef708e74c599c216a45df08cd33fa3fc87912f8b129806c1bfe07db450d2d99864fa78ce9d315a063b1a5db8f61db19bb7f49339 SHA512 f77036ecaad0798063ae2853394a639d53d7b238978cf878ebf0daa1764b8342964a96f1332e9bd0816b2369376ee9b1d1bd282936d17235631250455583d13c
+EBUILD sphinx-3.2.1.ebuild 4782 BLAKE2B 8d58a1ce2044572d5f684da65d4032ca2043304a4a5dc3efb0f988a91be4addd7d0319d4cb724c6b54eb1a1d758c59d4292ccc96f1903ea4371a0cf80d5162b6 SHA512 ff3d07c2a7ecd27c0cec2735b99a16976b7781f2e87e776bacb5bac8efbfd85f75b9b97dd67ef0fa48b67ad40784c114d2ce2531e2df9f1b562e0b250107dc31
 MISC metadata.xml 510 BLAKE2B 878684f285906bb31649cb244f7af0e62ce854d20d260c269c0f1764f142adff08ce690fd778e3932181fa62947a2fa5521ee76c17871d15f73783dbd7730388 SHA512 496e3380982af69d59b05c94b773ff6e9449023e6b9bd314876e952fc54dd23db4a09ad24dfddfd752656445c71631503ae898ad778ad1702385057b047ebaab
diff --git a/dev-python/sphinx/sphinx-3.2.1.ebuild b/dev-python/sphinx/sphinx-3.2.1.ebuild
index 02e54fb7e8fd..ed45daf8de54 100644
--- a/dev-python/sphinx/sphinx-3.2.1.ebuild
+++ b/dev-python/sphinx/sphinx-3.2.1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/S/${PN^}/${P^}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
 IUSE="doc latex test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/sphinx_rtd_theme/Manifest b/dev-python/sphinx_rtd_theme/Manifest
index e33d5d15ebca..4a1dbd352d8a 100644
--- a/dev-python/sphinx_rtd_theme/Manifest
+++ b/dev-python/sphinx_rtd_theme/Manifest
@@ -1,5 +1,5 @@
 DIST sphinx_rtd_theme-0.2.4.tar.gz 1392456 BLAKE2B daf2365d74823465a73ea37352f0a8e85f196ac9c89006e79610a2981b1a266e523865c3b6f7866fa9e77a856c5a6fe001a2eb114dcb252920b19231eade9709 SHA512 865b09febc1c289d47a8be3f3d7caa9d2a4715b350e2e2d058855831321a6f870e8339b2ef22eafc2b9fe72ad48f96b8d2fda4bc032c5f8dcdf23f314869cfbb
 DIST sphinx_rtd_theme-0.4.3.tar.gz 5391190 BLAKE2B 6e08e079378c023f160fc3b858544bec6a295b256564d91c49b9ed8b5d2ee87bb2f21a30239f99fd2463840d194fde820c84ccd8e0b908f96fb7e5ca0fd9e6da SHA512 44b9309ddd041181542747c70b6e180c07aaf8cd7ee9e4c7eb9e3948685b8bd578e815c022bd991cc7f4bc7d02bb3c7a6d213e5d0c2e8214aa85d50b73e53853
 EBUILD sphinx_rtd_theme-0.2.4.ebuild 530 BLAKE2B 24792fa3bc71996a62c4a6ffff9f13e821b3840c4f69837424be49ec310b6c9aba88603cb117646499bc53c545ea222c42549ffc2a6e685ab56d551757f1147a SHA512 db6eca3195cf032522a5efa413f2009133af06f9290aa6d04d6a5e624253eb761b40af9e2206cb20c5f131c48a9efe083a8d4efac9f9c425afa995bbaa575ebd
-EBUILD sphinx_rtd_theme-0.4.3-r1.ebuild 626 BLAKE2B 284d4a2dcb38cf05f97c55d2ced83883203f9f59cdfc9ddfec1b80ca7d4191cde3c7d35a550d5f0f84d3795edd54d66636cbabfe7ed5f3e092d5324b22768f68 SHA512 f3178584456a509e6d7b682df7f94c83f4a86ad150f3183f889eb1a09b77cc7674cf5d32446add7b7eb6bbff95e8d1b9be3266606bd6b74c04b045f5e1a9a3a8
+EBUILD sphinx_rtd_theme-0.4.3-r1.ebuild 633 BLAKE2B 1dacee3f28f2a953d52371469d5f929e35fd44f53e4187da2f17b18758d5081998811e49e62ecc477156bfe754793ed0327dca2ac2e19b6d20c7bab81bcc94a4 SHA512 2e2388f345c7f5e57751957f655cd20fd8d871fbbd249c27fc781d5b1d9ad2059f0e1b4f7687cab3244550ad4207c250ed6f82d5b8d13a076aff7ce7d77b523c
 MISC metadata.xml 418 BLAKE2B fe6864764dcebdf3a58e27839031a1559f626bf9e978b8a3d0b4821e8b97fcb705e9d4efd113c009e810a2a8dfe0ff541904a28ce090ab4e1f275302771a244b SHA512 b52facf796826029a795da70e00eed180c79c8b5bb4ea9ba7f95e5afa930debded9b2003c3dbf5a622deed093cab47a657142e567f2e1b639afac53e23e4ab04
diff --git a/dev-python/sphinx_rtd_theme/sphinx_rtd_theme-0.4.3-r1.ebuild b/dev-python/sphinx_rtd_theme/sphinx_rtd_theme-0.4.3-r1.ebuild
index 12c5cba90b2b..dbff97743a14 100644
--- a/dev-python/sphinx_rtd_theme/sphinx_rtd_theme-0.4.3-r1.ebuild
+++ b/dev-python/sphinx_rtd_theme/sphinx_rtd_theme-0.4.3-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 ~riscv sparc x86"
 IUSE=""
 
 PDEPEND="dev-python/sphinx[${PYTHON_USEDEP}]"
diff --git a/dev-python/sphinxcontrib-applehelp/Manifest b/dev-python/sphinxcontrib-applehelp/Manifest
index e74c584a71b1..2190564adf37 100644
--- a/dev-python/sphinxcontrib-applehelp/Manifest
+++ b/dev-python/sphinxcontrib-applehelp/Manifest
@@ -1,3 +1,3 @@
 DIST sphinxcontrib-applehelp-1.0.2.tar.gz 24548 BLAKE2B 9532cb990ed97c6773388a66895a066958187e9100d226e2274c26ba07fc5832e42ba407864b69b002da926a79e71ac2d6315125906156214df3920b585d9f71 SHA512 1325ac83ff15dd28d6f2791caf64e6c08d1dd2f0946dc8891f5c4d8fd062a1e8650c9c39a7459195ef41f3b425f5b8d6c5e277ea85621a36dd870ca5162508da
-EBUILD sphinxcontrib-applehelp-1.0.2.ebuild 843 BLAKE2B 4769c8e43b1721fbc4cc5b73348595f2936cd0d12bed591b54564cea51de0cdb0a08a13f9e6b0940b297f08199c9eb634f27373cfff31c23c90bfc2fe64ac1a4 SHA512 60628f107b7149d02da9e377b41bd227448b3eb69692426a0bdf32551eb3cc4de2ca0737bebad92f5a430b35431fd015515a43b5c9fff73c7d9d0c5a80f553d5
+EBUILD sphinxcontrib-applehelp-1.0.2.ebuild 850 BLAKE2B 85d595e0923d276f51c6bb578789bcccc3a972364cbaac2230e1dc5a7f3913771c023825113b544414f9c8b29fe18d81f93eeae528199d4eb8bc165d0f6b53a2 SHA512 d48c226b227057fe4c0af9378c83ecc7c75d86d00dc0e929900ee0db72a679d6835f67daf3b8b491e321d869060a47deac62fa6ffbca2a4dc36447232f9c81f8
 MISC metadata.xml 326 BLAKE2B ad14acf80a55c014b396340b6f42885185c7059c9b2159662d0291c9fbc4b03b9000b612d53fd2d95eb861b410d35ca301cf00bde26ea3344219923ba1fbf3b1 SHA512 55187b429105dff1f05c80cf935da48c02fcf8b00dccd572a562d75fdba50b73183d2781d67c498c2fee181707eb32e09e7e5dc12a88e7bdfa7212f916c45543
diff --git a/dev-python/sphinxcontrib-applehelp/sphinxcontrib-applehelp-1.0.2.ebuild b/dev-python/sphinxcontrib-applehelp/sphinxcontrib-applehelp-1.0.2.ebuild
index 0a2d64fa09a7..0859b6da9b4b 100644
--- a/dev-python/sphinxcontrib-applehelp/sphinxcontrib-applehelp-1.0.2.ebuild
+++ b/dev-python/sphinxcontrib-applehelp/sphinxcontrib-applehelp-1.0.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
 
 RDEPEND="dev-python/namespace-sphinxcontrib[${PYTHON_USEDEP}]"
 PDEPEND="
diff --git a/dev-python/sphinxcontrib-asyncio/Manifest b/dev-python/sphinxcontrib-asyncio/Manifest
index 13f3c4ddfaad..0295da5c6b29 100644
--- a/dev-python/sphinxcontrib-asyncio/Manifest
+++ b/dev-python/sphinxcontrib-asyncio/Manifest
@@ -1,3 +1,3 @@
 DIST sphinxcontrib-asyncio-0.2.0.tar.gz 10689 BLAKE2B 9e03989a1ed22d7d467bdb7626e2e908407a0de15a943a432ff9707340f0cefe7caf1684380c25764637798b585b32287c4bcfc0f2014a78b7019547405e7ded SHA512 2ca25717c03385ae9bf879b8efeab8d508292d07f96d941032720d755d3db2e7bbc3c9a33c6103af9d83849ed8878bea1048d349bd0873288ee2addfee9756b7
-EBUILD sphinxcontrib-asyncio-0.2.0-r2.ebuild 1045 BLAKE2B 11be1bf7189c7304df93923da4692f48f6c7700dce24d002f4edeefa5cf025eafbd7e2ad0911c70df6cf153024388f73a5c3181ff2e0f2e5ea6a0ad7e741c3e2 SHA512 db8ba66c491a64c7b0cabeb6b4ffa1f96b333b559350785358d29ab7fc58928d145674b34fe63608db287007ff745a0be8ccda4c58df615d013f4b87f13b986d
+EBUILD sphinxcontrib-asyncio-0.2.0-r2.ebuild 1052 BLAKE2B f1953b0cfc45577d539056609477b817b7f2f235339dd59605b3f63b3d6f7daac0965f77a59dc9a3f8ae09dda90603a5e2da0d5adce35702a447010250d92df3 SHA512 5e399db6b1db8c2d8f717169a5c1a3e143f1b85f854ee911ae9cd34236fb63574f0a6df10ef479389328a409aeff4121b53b9150c1235620c9ed50f54e80c722
 MISC metadata.xml 372 BLAKE2B fc779af5274229957de772908e2a2fb9bc0cd75673af9ab88e4b6869164c75b7cca2fff4895beab62bbce984e93255b6578a6360621c5d0eefadcf49ae3f787f SHA512 63aeaf1b521f6c789128dc03be198ddcbfb6dc7e63fa6b24eef1cd23e9557d5de5f7c990514b95dd2b74634f47f3f5db89f233dfbbfb711527e51806bcd5a367
diff --git a/dev-python/sphinxcontrib-asyncio/sphinxcontrib-asyncio-0.2.0-r2.ebuild b/dev-python/sphinxcontrib-asyncio/sphinxcontrib-asyncio-0.2.0-r2.ebuild
index e0d25754fbeb..bedbad8a4532 100644
--- a/dev-python/sphinxcontrib-asyncio/sphinxcontrib-asyncio-0.2.0-r2.ebuild
+++ b/dev-python/sphinxcontrib-asyncio/sphinxcontrib-asyncio-0.2.0-r2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="doc"
 
 DEPEND="
diff --git a/dev-python/sphinxcontrib-blockdiag/Manifest b/dev-python/sphinxcontrib-blockdiag/Manifest
index db3a7ae603cb..31690eb39404 100644
--- a/dev-python/sphinxcontrib-blockdiag/Manifest
+++ b/dev-python/sphinxcontrib-blockdiag/Manifest
@@ -1,3 +1,3 @@
 DIST sphinxcontrib-blockdiag-2.0.0.tar.gz 11903 BLAKE2B 9301fe05ff936836e8e648a507b7e2e5fd8cada58252fd46b274a4bb3e6b51b00b7696ceee712d12bd590c40c5ae1235e0b532ef55ffc2e78b2986cdae64a0f2 SHA512 305ad9b27bbb44480c69139cc0ae9cd8e47c6ad95da5b14a964c703a17e62ab9b342ff567e8312e403549a794f6381fe4c4d444ccb7a8e41410d1a3754ffb3f1
-EBUILD sphinxcontrib-blockdiag-2.0.0.ebuild 1188 BLAKE2B 66ca579424331b19e9467e3f239af13b30750ab0ad88479233055f6e20fe7a5317548d217df157e731e26a065fb446144144ac01deb97dea4c564da03d290bc0 SHA512 d3ba3de5e9105aee3dc3026a56af94c22458f888079880aa8a3474a71a37efb502a8ca63989a4bd12987b9e7936eaeb1e817de107d9a94a753cd3e5ad0384b2c
+EBUILD sphinxcontrib-blockdiag-2.0.0.ebuild 1200 BLAKE2B b6adac68aa51ab9c8920b7d7bf245a4e6ca6eeb8e92bac927eb1f360cd5e45f277a86b798b46c3b54c66cfbf5555f3e4630a26df2d5147bff0fed7e682ca4f8f SHA512 7150a6d6f630540f01df334665fcbb4690b61844ccc9ce1d911cfc6ce37421664f8d0d131fb840af1e63acd68e9bec4e771587beed9bb2f621e481ea6106ae4d
 MISC metadata.xml 416 BLAKE2B 4383283e64d8db0b5576f1defc62412b5c4f4003e5ac75a2755e79d3e2a53f6d7aff82741d6225d2c96f0e2d87df650d47110a31cc91362dee641a86c54b18da SHA512 10fc4ff78fce4beadf8f8b64cfcaf4b71f84c3f74d80bd7299055ef7c2a759bf8d8eaef841e464d72d3272d999fe20ebfbcd382f2025932eef474387e92be6e0
diff --git a/dev-python/sphinxcontrib-blockdiag/sphinxcontrib-blockdiag-2.0.0.ebuild b/dev-python/sphinxcontrib-blockdiag/sphinxcontrib-blockdiag-2.0.0.ebuild
index 29d970775e27..11b7e45bee75 100644
--- a/dev-python/sphinxcontrib-blockdiag/sphinxcontrib-blockdiag-2.0.0.ebuild
+++ b/dev-python/sphinxcontrib-blockdiag/sphinxcontrib-blockdiag-2.0.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/blockdiag/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
 
 RDEPEND="
 	>=dev-python/sphinx-2.0[${PYTHON_USEDEP}]
diff --git a/dev-python/sphinxcontrib-devhelp/Manifest b/dev-python/sphinxcontrib-devhelp/Manifest
index 104dba93f2c9..cb339ea77b8c 100644
--- a/dev-python/sphinxcontrib-devhelp/Manifest
+++ b/dev-python/sphinxcontrib-devhelp/Manifest
@@ -1,3 +1,3 @@
 DIST sphinxcontrib-devhelp-1.0.2.tar.gz 17398 BLAKE2B fcf04148bc4a77963517d9011c20a6b77eee499f1a5dcd4a9631b4f415f80a9f7091b254f74ba2fbc9b7106dfb741dc839e14813e088d5a0802793ed457e95df SHA512 83b46eaf26df3932ea2136cfda1c0fca4fc08ce8bca564845b3efe5bb00d6c8c93991f4edd4913d4ec796e2d85bd2c7265adf28e98f42e8094daeb5ac11a0eb1
-EBUILD sphinxcontrib-devhelp-1.0.2.ebuild 843 BLAKE2B 4afee752764f0a787b399732c4c39fd727d02ec490fd4c9013582528d3a9878a09519a298abe41bf4d3f494a0d59645e019c1feaef2783ee4877105ce8d5d7b9 SHA512 851122a62035547148ce610f479aafeb46106bc5c18044479277b8ee4ab1e6baa39d0ea1074844f93a1dac50fd06b5133fd082b43b3c994471d2ac57beb50360
+EBUILD sphinxcontrib-devhelp-1.0.2.ebuild 850 BLAKE2B 991b0361295e983330b533ca2348a7941be2a94b369cf6c585633f725c983ea4ad2203aef56b8cba8b8a6802ff3f23eb25f708a632f863c613ffae6634088788 SHA512 2e217a41aea32cff7151c8e8842b0cded13f46c2bf7d49fa44b21f458c3bbc1b8ec9395369c12f2f1f0f356f4c4b17146ee29fd351b076e7f855903782488393
 MISC metadata.xml 324 BLAKE2B 986204c86559fccc9a83332d2a443367be0d3f6d58ee2f50d5119688db2c3bf979aa14ad41979bfe0cabab649594e6d69e83c592a4d883e6d14b4840d3dcdf4d SHA512 d4f768df06e1c208502e7f87ec3ff4481f07ff84fd77721a5afc8a7c3bb7804a17a6a5798bc056e384d2ce433954790403c0d5d5cbba459ce835659bf8072a53
diff --git a/dev-python/sphinxcontrib-devhelp/sphinxcontrib-devhelp-1.0.2.ebuild b/dev-python/sphinxcontrib-devhelp/sphinxcontrib-devhelp-1.0.2.ebuild
index 873571929afb..c4b852f22d8f 100644
--- a/dev-python/sphinxcontrib-devhelp/sphinxcontrib-devhelp-1.0.2.ebuild
+++ b/dev-python/sphinxcontrib-devhelp/sphinxcontrib-devhelp-1.0.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
 
 RDEPEND="dev-python/namespace-sphinxcontrib[${PYTHON_USEDEP}]"
 PDEPEND="
diff --git a/dev-python/sphinxcontrib-htmlhelp/Manifest b/dev-python/sphinxcontrib-htmlhelp/Manifest
index 3fb02185776f..58cf35275758 100644
--- a/dev-python/sphinxcontrib-htmlhelp/Manifest
+++ b/dev-python/sphinxcontrib-htmlhelp/Manifest
@@ -1,3 +1,3 @@
 DIST sphinxcontrib-htmlhelp-1.0.3.tar.gz 24248 BLAKE2B eeb7edd0bce99621ce6fa3a2bb9ba90a619af18403c8b4b0148a7d20fd3847f418f35bb1bb413531c0799b5b98be7b45aca51aa5c8120d9c997abb86ab0b0f01 SHA512 f37542c5789340bb26c41b84512e08998e4ef45ff2eb0fdb0e10f585cff27a145d5821b8eb3766d009e2b5a38c3d7efb127ab898982e1b6fd1d4ff7e26907db4
-EBUILD sphinxcontrib-htmlhelp-1.0.3.ebuild 884 BLAKE2B 268b942029557887abcd59d7a7a11b7eb44981fa868e47c12c36303f28689f3ae59e965efd2b7705ad38dec5929d0242adaa5c3815fa8baa23bb4d1182c35d3c SHA512 091cc78ba8a363ca4c85235081e0c8390cc20e58bdd90889df89208e2ee204e078f52b58f474d204b8b48cf9ba468f533051a29c4f5df19c54ab0269348b9117
+EBUILD sphinxcontrib-htmlhelp-1.0.3.ebuild 891 BLAKE2B 751898d9c7bcfaac9fd3d8d01f31aa6650119e7aea2bd1337fa4dc54518946ef3fa225ab9dde5ba5fe32dcec09298a044dd1bcbac4fc17af67b4039fd82123fe SHA512 f95a886922eba85e6b44f6a168ae792ae5da963785477fcb930a5dd8476acb8deb01fef600d2c2d7bee423480d6012dbe641580368db1facbd48f7eb8d546e50
 MISC metadata.xml 325 BLAKE2B 86b320327210716251580bcde7ca53cece58e22f07973de023d09bb7a6b68cc4e4c4cace4c9b8ba73f15482332e3b94e38650468fe790e8f6c123c77b9f2ad48 SHA512 700c19351b017fed0536e0e57728b410052b2c34bf06912aedc754e4f931614f3f4b31a10bb67381134c9bd5f61f9af23f204641e8e531ec0ff9a6c1cf9eb41f
diff --git a/dev-python/sphinxcontrib-htmlhelp/sphinxcontrib-htmlhelp-1.0.3.ebuild b/dev-python/sphinxcontrib-htmlhelp/sphinxcontrib-htmlhelp-1.0.3.ebuild
index 362a4601fc64..279be33ea211 100644
--- a/dev-python/sphinxcontrib-htmlhelp/sphinxcontrib-htmlhelp-1.0.3.ebuild
+++ b/dev-python/sphinxcontrib-htmlhelp/sphinxcontrib-htmlhelp-1.0.3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
 
 RDEPEND="dev-python/namespace-sphinxcontrib[${PYTHON_USEDEP}]"
 PDEPEND="
diff --git a/dev-python/sphinxcontrib-jsmath/Manifest b/dev-python/sphinxcontrib-jsmath/Manifest
index 04b37c2c8faa..3a88c4ff8ea8 100644
--- a/dev-python/sphinxcontrib-jsmath/Manifest
+++ b/dev-python/sphinxcontrib-jsmath/Manifest
@@ -1,3 +1,3 @@
 DIST sphinxcontrib-jsmath-1.0.1.tar.gz 5787 BLAKE2B 055ff298e11678d7d30975e4bef509ece0128be30ca0c5fd2be1323c2eb4fe92f861826ea5ddfcbd2d3e3a80535b374d2b1a13446c2604f3e448d5a8982b9881 SHA512 c1e6488f5c0ca4567c27ec7c597c9db321ac32ce354c4ad62fea534b2ae1c0acb183a921f46216bbc3891f14acfaac05ddf324b8fdaf99828df07bc91aa7e5c7
-EBUILD sphinxcontrib-jsmath-1.0.1-r1.ebuild 860 BLAKE2B e03373aa94cf707b686796a7b831622130259220ac84767dded95a742229f5a789f6efdbcc195bca3c624b2eeb41e4545d9c66a7f915feacd7f8964463608e70 SHA512 96a968650c67296d1353deb3f086bed3997663d3f118205fb4ff48e1532dbe4c4635854510c495246cc2f087a572bec80dbc8e9884f447dc2448443cc59b6b86
+EBUILD sphinxcontrib-jsmath-1.0.1-r1.ebuild 867 BLAKE2B cc68803d3bf9bdbe3ad6550319e1d9b4f0e925ecb0404bc50c771fa699fdbcf0e74aa5fd3ea89a60dbe74f9a409ebf06604b886e62ec5a0bccccbcc645793479 SHA512 535bb0f1f4f3d66b797884651a5301f860412f7dc7f7872cdbec354b3ba85ea8b387bfd61fc86686d50808c59d927aa065c5b530c9942dc2fe0465741f21f95c
 MISC metadata.xml 323 BLAKE2B bae56c440e079dcb99602f6e513fb9bf5c2415292f4c058e9da93fca5c14e0048789b1f9c1000b4d83cc37bc08d2fb3008898c2417a819c1128d1efe19e46414 SHA512 03745eb2d0defdb73cfd778eb7ab217cd839f9f94ce7cc1ef70c75c326cc0ba94bbc745624f8adca19e9049a332ca57c0951b0249f8a21b95ef6015ed6f545d0
diff --git a/dev-python/sphinxcontrib-jsmath/sphinxcontrib-jsmath-1.0.1-r1.ebuild b/dev-python/sphinxcontrib-jsmath/sphinxcontrib-jsmath-1.0.1-r1.ebuild
index 97538f025fd1..277beabc2e4a 100644
--- a/dev-python/sphinxcontrib-jsmath/sphinxcontrib-jsmath-1.0.1-r1.ebuild
+++ b/dev-python/sphinxcontrib-jsmath/sphinxcontrib-jsmath-1.0.1-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
 
 RDEPEND="dev-python/namespace-sphinxcontrib[${PYTHON_USEDEP}]"
 PDEPEND="
diff --git a/dev-python/sphinxcontrib-newsfeed/Manifest b/dev-python/sphinxcontrib-newsfeed/Manifest
index 736d0c2f8faf..36f4fe0a9ef6 100644
--- a/dev-python/sphinxcontrib-newsfeed/Manifest
+++ b/dev-python/sphinxcontrib-newsfeed/Manifest
@@ -1,3 +1,3 @@
 DIST sphinxcontrib-newsfeed-0.1.4.tar.gz 10862 BLAKE2B 708c7a725ac36f54ea735953ba9d230b05da95147eabc91de9d610d3e02ec7d0d1ab8f5882d4e97327da425fc49e1b1a1753e011445ede859edd4f3cd5fb2a16 SHA512 96d9d0c15fca8b62f945bafc8f0eafa62df9c471f7510e2f153e47b66534e5f3041e5c01df772e6c35a9f09baa70064642f7f0fa43ccfd33dd64c2604494f2fc
-EBUILD sphinxcontrib-newsfeed-0.1.4.ebuild 840 BLAKE2B 861b5b2bc0ac23d354bce19c81c2a4b9d194f7289a2f86d02a4e9639b397e23331e9b7a52999a23f22df9af7b0f31d202514456bf37e72797e154ff5c363ddbe SHA512 d31a3f0c8dce55977db98a0078122f0d718592c8b8a8699a9aef00ff818d5d705bf9a1745d7fbae59f759b512d804fdad4b281a61feb620402908f928bdd633b
+EBUILD sphinxcontrib-newsfeed-0.1.4.ebuild 852 BLAKE2B e3e1aaaefc9b409f1e1c35296aebbb975f3232be707ffd52501584709899c5397cbe90965691151358aa1a6a8b8c68c210794c0d62150e4906cd70290e47cfc9 SHA512 1d3a62e62ea17f6a6c49402bff7b905fb6bf418d4386cf10d793a146ba673ec390c360eb8bd82810596dc4a1a5a263b664ae5e612230f4c2ef95e8d5f79c4d70
 MISC metadata.xml 331 BLAKE2B 9d40d757fbfbfc80c527481f0c1a3c558eee5829369ac3eda6ae4ed3ed63ef9b26a750057038aea1b670b48b9430aa6c4cf788d55a11ac7f072111c8a3437e5d SHA512 ec0eeb87c3e18a9ade919171833be4727e87d32664c83863bed8c33898112a2f237261b28e5b7a2521df495df61b9825cd8140352d9270e52412b53a1c5df3d7
diff --git a/dev-python/sphinxcontrib-newsfeed/sphinxcontrib-newsfeed-0.1.4.ebuild b/dev-python/sphinxcontrib-newsfeed/sphinxcontrib-newsfeed-0.1.4.ebuild
index 30caa460973e..1f7123b6c317 100644
--- a/dev-python/sphinxcontrib-newsfeed/sphinxcontrib-newsfeed-0.1.4.ebuild
+++ b/dev-python/sphinxcontrib-newsfeed/sphinxcontrib-newsfeed-0.1.4.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="examples"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/sphinxcontrib-qthelp/Manifest b/dev-python/sphinxcontrib-qthelp/Manifest
index 0aa4390f90ec..b52bab6e86d4 100644
--- a/dev-python/sphinxcontrib-qthelp/Manifest
+++ b/dev-python/sphinxcontrib-qthelp/Manifest
@@ -1,3 +1,3 @@
 DIST sphinxcontrib-qthelp-1.0.3.tar.gz 21658 BLAKE2B 7a82e8941d49836cf3e64aabe05ba65b34596f7ba0287b4dc7ed2c5940f6944d1853790d1d52637b03d934effbba8fc5094089e2924322cf1b373432c60bce6a SHA512 29f77e4b3f1a4868c2a34dbd853415e5d813f482cd23b982aeed42d53acba09b896d77ba930c34cce8af043bb7d64a19acff610430e942038d95a410b6e0b5fa
-EBUILD sphinxcontrib-qthelp-1.0.3.ebuild 841 BLAKE2B 4b5a16e50f7148e6e43425326d4ae11e0376c59ae643d264c659739d7802a7abe51c6b1a6d98605b00d4c48b4b5432c26f3cc3fc6e6fb3bf2655dd348f2547e3 SHA512 4db33388feb73122d5a842595bfe7b2984caaf04bfe51991fa58a0cdd2c909f8df9cae0d20c978d40ba0e0e7cba0f052ed3df75c701703e528a9be004b008194
+EBUILD sphinxcontrib-qthelp-1.0.3.ebuild 848 BLAKE2B 58750a57257c98eafd6cba28d331db35305df40513a38458653f2a1b055346fe3ade7c4d79d01d10b17d637324377f08903c2a5ad527172fdc4c27e849718db5 SHA512 f5338fbdb17d2dff2da541040c5b57fcbd476241b486ba4ac7bb529354a369c6ecd53a5475b77f11cdc7216eb2c83c72abf31e547203f5aa9d61cebdf3e855e9
 MISC metadata.xml 323 BLAKE2B 958abf4a10551f32a30bf4a103bf38f001d827dad8f8b7c0d737cd8d6cd5a1a7bd4bb0de765ef457875bfedc913a9303fbb94d4f8f796dd6114b1c15a3849b3a SHA512 5b1be7c4599df98adaf5c3b08b078cd15c207957c5e8e7025181be66f09cfe3331b0e1c53404c10041612c34e3cb0af388f1b1c34e3e508b609721c617dc89d6
diff --git a/dev-python/sphinxcontrib-qthelp/sphinxcontrib-qthelp-1.0.3.ebuild b/dev-python/sphinxcontrib-qthelp/sphinxcontrib-qthelp-1.0.3.ebuild
index 185b85b3f675..0d952312a5e3 100644
--- a/dev-python/sphinxcontrib-qthelp/sphinxcontrib-qthelp-1.0.3.ebuild
+++ b/dev-python/sphinxcontrib-qthelp/sphinxcontrib-qthelp-1.0.3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
 
 RDEPEND="dev-python/namespace-sphinxcontrib[${PYTHON_USEDEP}]"
 PDEPEND="
diff --git a/dev-python/sphinxcontrib-serializinghtml/Manifest b/dev-python/sphinxcontrib-serializinghtml/Manifest
index 934a3d4b9b7f..a8def6eef330 100644
--- a/dev-python/sphinxcontrib-serializinghtml/Manifest
+++ b/dev-python/sphinxcontrib-serializinghtml/Manifest
@@ -1,3 +1,3 @@
 DIST sphinxcontrib-serializinghtml-1.1.4.tar.gz 18647 BLAKE2B aa5dcbacf28a0433cbe86d9da3f6dc5859ec6148f74714654f5095ed1f21042e0d4ab1cbfb1bc816c1de40136ac51cb6f78c913cebf5465a4a11c25b22b36a14 SHA512 d132f75f1e0491167cd6d0f5b3697ac0fc1b16e63fd3dcd480b961e332b521932e405679a695522a4aeb56f57949eb9b1ed7635e9807dd059ae44a6384bdc6d0
-EBUILD sphinxcontrib-serializinghtml-1.1.4.ebuild 903 BLAKE2B 5cf605fe300daad1e3082ea53bb2c9e9bd4f36aa36fc52e10cbd0012e878df5107ee304d658eda853ae20d459d438dd266789a5bb783a054768605d914f29ea0 SHA512 126f4db2a672efd622bb4df20f2732d264b8932e02670d95cc952143606c66ca45e08f53f2e2d874ab05b782db19a80a0c495c601e3c96130ff8a000f787ea95
+EBUILD sphinxcontrib-serializinghtml-1.1.4.ebuild 910 BLAKE2B 6a42cba836ae872f3d1954b51e8f5b41004f57d3dcfadbf4069ae7c39ea6eeef0c92d1ec4201cda948242c39b376ab26882e4b10c327bbe64a1c3f308a845d4d SHA512 7afc71c6bb8856e4e450d538cdfb0ddce8b1663098ff4a0e49a2727d515f8b03ada0ae45e8bbc68341facb2c777f3e3b8baef60089d97c7ec488678f3fd4e44d
 MISC metadata.xml 356 BLAKE2B 6d800ff5be26c447eac58bee688f218526b5bc6dcbe53deb3e5d4c7f0dc9ee394f50d9c2aa9b057c1246bba9704584725b1230abd13f99b676457558148ad478 SHA512 fc2bd51cb07ffcc9d3970af8bbba54e66e0e23192477d7cea8ccf8e2515feb625d0418343b2e1f67ad28b07c3853ae74a3c3db8d1f5c2833fad2e272ca8c82ff
diff --git a/dev-python/sphinxcontrib-serializinghtml/sphinxcontrib-serializinghtml-1.1.4.ebuild b/dev-python/sphinxcontrib-serializinghtml/sphinxcontrib-serializinghtml-1.1.4.ebuild
index 127ed1ee7e54..26f8ad75b6af 100644
--- a/dev-python/sphinxcontrib-serializinghtml/sphinxcontrib-serializinghtml-1.1.4.ebuild
+++ b/dev-python/sphinxcontrib-serializinghtml/sphinxcontrib-serializinghtml-1.1.4.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
 
 RDEPEND="dev-python/namespace-sphinxcontrib[${PYTHON_USEDEP}]"
 PDEPEND="
diff --git a/dev-python/sphinxcontrib-spelling/Manifest b/dev-python/sphinxcontrib-spelling/Manifest
index 34be0ebee8e0..dfeb43ae40c0 100644
--- a/dev-python/sphinxcontrib-spelling/Manifest
+++ b/dev-python/sphinxcontrib-spelling/Manifest
@@ -1,5 +1,5 @@
 DIST sphinxcontrib-spelling-5.1.2.tar.gz 22962 BLAKE2B c7b15289b4b6dce5e6c5fb529c4be2cd7c1f41d8bfc6ac86daf1a982f711bd2c426d9b3a615471538fe221197b64ccd907efd4620ea2440f6ec07b2a078d6bee SHA512 4a0398b7c79a035e12d9ae96100fcaa4df42aeae07a01a73f7d875ba04fbbeb3d7441c9debe77491876d78b0a3753677cff4cb3a575e3490364fe5780f5a70b2
 DIST sphinxcontrib-spelling-5.3.0.tar.gz 45665 BLAKE2B c44c8c2621aecd74734c6137e1344a763e99fb61b3ce882c8ea70364df17a7e2fac49acc8878753cab1b70df2cf084de5087bed77f8b1bffe311410ecec3504d SHA512 8f3c4718877e55b0ebcd3d8c0f078a6c06c27c2cdd3cc557fd2e0e990f0c8956179fd9a8b3135b280973e45c0c8657f71372746ef4b55319078db8f16c7e00e9
 EBUILD sphinxcontrib-spelling-5.1.2.ebuild 941 BLAKE2B d7a4baf4284165354c8689e49e1f9c35d856c2e8bc2d207db2a30b358daefa72a9b70ee7f37b19f0b184646e3f9d6f505e93c55bd7045f229f3c5752f1e3e99e SHA512 70cfa8fd9fd9c229b4b1e3f48016e28e4ca1a5355a47fab5cef9163b3560b76d6483407ddb264189a03c07e72a863658b5f5031fceca6dc74d746565276b5e93
-EBUILD sphinxcontrib-spelling-5.3.0.ebuild 1091 BLAKE2B 043557487ea86c052c57d05724cd989d2cbbaeb7eb9c50b8f7d95c53d336c525ec75ec245e6e668581513b2cc3a1ffeff7b5e59ef598528086c6fcb682057f28 SHA512 3e7f575cf5089e72a4655caafa57a1a0ce4dfc1944e9c80e71772d7f2725c3bdbd8b830ad38df5c157a31f9ead95e0b8582bf959ceb62f8dee62ad445d75863d
+EBUILD sphinxcontrib-spelling-5.3.0.ebuild 1110 BLAKE2B 1f6f62ced5b2e82c55cb7327f22b6727c1e194a1429456f5622f430fea4b296bbb20937ec051b59e2c6a40dd7bd4214707bb6bd31a027c9200585326d0d0bf16 SHA512 d4e522d4ea079245648948d35c2f2a198ac0fc57ad04d06f58dfc1701e7e4deadff77c1174dc08da019aa0b56c771cb8195f00b7b34066c6c7e09020dec1e4ad
 MISC metadata.xml 390 BLAKE2B 8d41fe5d3b7602e6f29d13d8059ae1e942991659b4681c8d2a6e62fa32816690289c4183e28b2cc0abc14ea2078368f87cd1d82e71f1c4ed9fb684fb7d2e1449 SHA512 8407fc4fa34e474aa5f74fc1623004bcfa4f6ba451d56e62704366e8c21919e8617a54b5f7fec31318c4b7b34c4eb064c18c9d448c04d28430aa4e961ceb28af
diff --git a/dev-python/sphinxcontrib-spelling/sphinxcontrib-spelling-5.3.0.ebuild b/dev-python/sphinxcontrib-spelling/sphinxcontrib-spelling-5.3.0.ebuild
index 26fa09a591df..b8e4d54551d5 100644
--- a/dev-python/sphinxcontrib-spelling/sphinxcontrib-spelling-5.3.0.ebuild
+++ b/dev-python/sphinxcontrib-spelling/sphinxcontrib-spelling-5.3.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	$(python_gen_cond_dep '
diff --git a/dev-python/spyder-kernels/Manifest b/dev-python/spyder-kernels/Manifest
index dc1592373350..8f8bbc1ed87a 100644
--- a/dev-python/spyder-kernels/Manifest
+++ b/dev-python/spyder-kernels/Manifest
@@ -1,3 +1,5 @@
 DIST spyder-kernels-1.9.2-gh.tar.gz 72034 BLAKE2B c6ba0f911ecc7ae000ef57605276cf7a089eeee580d78d0b9ba5b4a667f493754d0956690a8ee14e3e5031cec0407915ee4c8526e815a2226a7d50cc849cb414 SHA512 f7aab11bcfc746d56d67c28162ebadc5d583f0e05a5dda27ec30f5ac37f736c1f8d785371b5080bb19b964087d6c730d5f377c29781b7bd7bee273ec533799d9
+DIST spyder-kernels-1.9.4-gh.tar.gz 72428 BLAKE2B e612905046b25f87deb2013b7d39155ddacf2e3ebe5fb4ee2090ccc28fd6be47571c4423c910c932c248bb69b0b39f762c1a159311413ce3da784bb4b7a076db SHA512 51ae84d2cb05a75d658a57ff43387f1b15c82692660b33ff0b9c6fb80fa7cac92c286e342c4ef1888b2d8c889c6406219538e2d4ad0066e1b8e18481bd191386
 EBUILD spyder-kernels-1.9.2.ebuild 1241 BLAKE2B ad7f9b1d68ea4fc423f5d04c416d66396f4ed40fb05e05f1bc5b82a2db045e23b48ee8738c586fd20d9709d386151ac5bff790d5a604c743ccd76f64295b9c59 SHA512 ece1339283b209085a507d9b7eb0d0b3c134a66a441e6b06d42a4c602e035c01a183f7393573e33f31e7c7654cd56b5fb77a8f9cccbaf45cf6067d217bf17115
+EBUILD spyder-kernels-1.9.4.ebuild 1267 BLAKE2B 03eb2b3634990b5d2e58737b5f58d7893ba9cc7ba25cf444e54990f12b896123de14bfa2859eec1f2810949276c076889b9b664f51a3305eb1607e91a36404d9 SHA512 3f362f6e14afd7a55dc2a50028f2eae90c5a7ee956047446d907b680d9bc8a6fe0cbc513b11663ecbb9ebbabc01055c26dc69dffcebea754d4a797a2f6557018
 MISC metadata.xml 535 BLAKE2B 48c4e591e65dd5ae7180c4834379783b32a9cde2c899531252e7eedb990291399d33eba01c4bba9137ab6f426bcb7a5b443812094b9fa84fc9e8102b8c44db72 SHA512 d0c67672928b7aa931f8b50ef75ba7bb60c2531e6fa8285cd1e3aa2817f60286274b35dd6814409b6366a23bebbd8572a2c5ca4376ea34a74e92dee4bf66e202
diff --git a/dev-python/spyder-kernels/spyder-kernels-1.9.4.ebuild b/dev-python/spyder-kernels/spyder-kernels-1.9.4.ebuild
new file mode 100644
index 000000000000..979f038c90f7
--- /dev/null
+++ b/dev-python/spyder-kernels/spyder-kernels-1.9.4.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8} )
+
+inherit distutils-r1
+
+DESCRIPTION="Kernels used by spyder on its ipython console"
+HOMEPAGE="https://github.com/spyder-ide/spyder-kernels/
+	https://pypi.org/project/spyder-kernels/"
+SRC_URI="https://github.com/spyder-ide/${PN}/archive/v${PV}.tar.gz -> ${P}-gh.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="dev-python/cloudpickle[${PYTHON_USEDEP}]
+	>=dev-python/ipykernel-5.1.3[${PYTHON_USEDEP}]
+	>=dev-python/jupyter_client-5.3.4[${PYTHON_USEDEP}]
+	>=dev-python/pyzmq-17[${PYTHON_USEDEP}]
+	>=dev-python/wurlitzer-1.0.3[${PYTHON_USEDEP}]
+"
+
+DEPEND="test? (
+	dev-python/cython[${PYTHON_USEDEP}]
+	dev-python/flaky[${PYTHON_USEDEP}]
+	dev-python/matplotlib[${PYTHON_USEDEP}]
+	dev-python/mock[${PYTHON_USEDEP}]
+	dev-python/numpy[${PYTHON_USEDEP}]
+	dev-python/pandas[${PYTHON_USEDEP}]
+	sci-libs/scipy[${PYTHON_USEDEP}]
+	dev-python/xarray[${PYTHON_USEDEP}]
+)"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# assert False
+	sed -i -e 's:test_dask_multiprocessing:_&:' \
+		-e 's:test_turtle_launch:_&:' \
+				spyder_kernels/console/tests/test_console_kernel.py || die
+
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/spyder-line-profiler/Manifest b/dev-python/spyder-line-profiler/Manifest
index e5597dd4b406..2c51316b6f80 100644
--- a/dev-python/spyder-line-profiler/Manifest
+++ b/dev-python/spyder-line-profiler/Manifest
@@ -1,3 +1,3 @@
 DIST spyder-line-profiler-0.2.1.tar.gz 71109 BLAKE2B f16a5ac743b91a441b23b497a5aa8d1ede2f458a2de3e92d91c2f3af32621b07efa0fbf6646929a28c085117006044c8bf34f911c57bc221c12b1a71b949440e SHA512 2e6cdd8fe5387c8c229fdc503937cab3a30b72d2eb2a23a14de49584d317a1ed89eb76ebffbf03aed7a8aa5a183677c316814d50c73e79c6175da6a46e5937fb
-EBUILD spyder-line-profiler-0.2.1.ebuild 747 BLAKE2B 5e3b1ace9b8b7c74822648043423cd00f25ad406ead30437129c448e53807d43142eefcdc73189ea06e8794ee2639642d146e4bab3fd54593d80570bec04a541 SHA512 47d94c2aaabcf04f2841f2e50ee12c054d727850a8438324f5fb7570e311f0ae9f8e45275569a7ed7381cfbca9d07f755a8e55b51e3921e31e177f00a21fae34
+EBUILD spyder-line-profiler-0.2.1.ebuild 761 BLAKE2B 09f9c98f25290f1502d7deb585b845f65da7d3ecde21459ba23bd850be63032f6ea16ce102ee326bb1900efb1a1193163fca0d7ed61641e613a723c0871234e2 SHA512 1f14b9e93aea7cc1d59557bd047081fcb6cc8a0a6e10c3106b65d73221efaf6c6ab9ebcbb8b7dfab2c98097bbc850f19e90c77d0bb5c52b1e427cca0de159179
 MISC metadata.xml 375 BLAKE2B d5aff616cc3473bac743c6d809eba454c54e2fc1514a115be5ae1ca11be7de212fe72f2ffeb520db05a11837d8ff93daa1128cdef7867244b9f829d8e52e6214 SHA512 c00656e8233157fbe266e364bc10a6b351063221b27a73d43add57a50d00beb2e540b491ea671fcc4b7acafd97c4a5e56c73a9937aab64ee2d79d553fd0658ee
diff --git a/dev-python/spyder-line-profiler/spyder-line-profiler-0.2.1.ebuild b/dev-python/spyder-line-profiler/spyder-line-profiler-0.2.1.ebuild
index 16a6a96a2d6b..d72cb2f56160 100644
--- a/dev-python/spyder-line-profiler/spyder-line-profiler-0.2.1.ebuild
+++ b/dev-python/spyder-line-profiler/spyder-line-profiler-0.2.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_7 )
+PYTHON_COMPAT=( python3_{7,8} )
 
 inherit distutils-r1 virtualx
 
@@ -17,11 +17,13 @@ KEYWORDS="~amd64 ~x86"
 
 RDEPEND="
 	dev-python/line_profiler[${PYTHON_USEDEP}]
-	>=dev-python/spyder-4.0.0[${PYTHON_USEDEP}]"
+	>=dev-python/spyder-4.0.0[${PYTHON_USEDEP}]
+	<dev-python/spyder-5.0.0[${PYTHON_USEDEP}]
+"
 
 DEPEND="test? (
-	dev-python/mock[${PYTHON_USEDEP}]
-	dev-python/pytest-qt[${PYTHON_USEDEP}] )"
+	dev-python/pytest-qt[${PYTHON_USEDEP}]
+)"
 
 distutils_enable_tests pytest
 
diff --git a/dev-python/spyder-memory-profiler/Manifest b/dev-python/spyder-memory-profiler/Manifest
index b7b2a1fa03ce..ba9fca7a1b35 100644
--- a/dev-python/spyder-memory-profiler/Manifest
+++ b/dev-python/spyder-memory-profiler/Manifest
@@ -1,3 +1,3 @@
 DIST spyder-memory-profiler-0.2.1.tar.gz 16802 BLAKE2B a42bddaa1a470b1e23c203033daca9870d873a5160a9600f4e2932d30e15885fa63c90e334d0e92e7ad6d2ef380f022c94753d5fb24b451259f11f44803c390d SHA512 14eb5ea0e5a87cbdce6dc4bbcdd7e3a4f3dec566955431173ade068e1b110f5282fefc960d94351bdf76be125f099414c6e3b776ac4288065139e222c43a30d9
-EBUILD spyder-memory-profiler-0.2.1.ebuild 753 BLAKE2B d34c65bee239d54e12fcf0e400c12e67d5ecdcc6edbd30f3455a2e40603b6f683058d9f40971a1248a727da7a78693e63bda87769264679238c7559b656c25cf SHA512 4a991e047985412bfd8d68a4afbb45ab18433694051e42a1541259232ccf9652b9104137c2d3af7f555130ed9cf580e9427eb9e5e56ad947292f1bffac27083b
+EBUILD spyder-memory-profiler-0.2.1.ebuild 769 BLAKE2B e86fe75db0e08a151aa1e00058a8c81b13c67cfcd55eb64861e784b15b39b95b5479df9f9e44e48155f2a2f7d6dbc34373f687fd9da444611e6b88d2bbf2b7df SHA512 47f54d78a83bc0ce969a1a4237fab8945d1d5bd724cb5ae496c6b03f2f22eba20a876c33dc4af3608ba199e46d4a921e038aaaa0d9c903f308789fa77828bfc3
 MISC metadata.xml 375 BLAKE2B d5aff616cc3473bac743c6d809eba454c54e2fc1514a115be5ae1ca11be7de212fe72f2ffeb520db05a11837d8ff93daa1128cdef7867244b9f829d8e52e6214 SHA512 c00656e8233157fbe266e364bc10a6b351063221b27a73d43add57a50d00beb2e540b491ea671fcc4b7acafd97c4a5e56c73a9937aab64ee2d79d553fd0658ee
diff --git a/dev-python/spyder-memory-profiler/spyder-memory-profiler-0.2.1.ebuild b/dev-python/spyder-memory-profiler/spyder-memory-profiler-0.2.1.ebuild
index 6a7df158ca88..44303fc8b16d 100644
--- a/dev-python/spyder-memory-profiler/spyder-memory-profiler-0.2.1.ebuild
+++ b/dev-python/spyder-memory-profiler/spyder-memory-profiler-0.2.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_7 )
+PYTHON_COMPAT=( python3_{7,8} )
 
 inherit distutils-r1 virtualx
 
@@ -15,12 +15,15 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
-RDEPEND=">=dev-python/spyder-4.0.0[${PYTHON_USEDEP}]
-	dev-python/memory_profiler[${PYTHON_USEDEP}]"
+RDEPEND="
+	dev-python/memory_profiler[${PYTHON_USEDEP}]
+	>=dev-python/spyder-4.0.0[${PYTHON_USEDEP}]
+	<dev-python/spyder-5.0.0[${PYTHON_USEDEP}]
+"
 
 DEPEND="test? (
-	dev-python/mock[${PYTHON_USEDEP}]
-	dev-python/pytest-qt[${PYTHON_USEDEP}] )"
+	dev-python/pytest-qt[${PYTHON_USEDEP}]
+)"
 
 distutils_enable_tests pytest
 
diff --git a/dev-python/spyder-notebook/Manifest b/dev-python/spyder-notebook/Manifest
index 3d62d1351de5..bc11f74fe47c 100644
--- a/dev-python/spyder-notebook/Manifest
+++ b/dev-python/spyder-notebook/Manifest
@@ -1,3 +1,3 @@
 DIST spyder-notebook-0.3.0.tar.gz 3862097 BLAKE2B 12f9edb3b49373419e491ae3f123b8c325dddefe5a55e8bb853d720aba2c28fbde0be50ec1e5f74198fa1e21faee8a7378218b3e7b3e8378c82be5ee3a10b9b8 SHA512 9259ccfcd79b7d86d49eda74182e3f1e66188f644ca7560a8929dd07c1a453f17bb976ab325ed55df879a00cbc4d14d3724909fb49c56cf1bbf9665ad69b9ec5
-EBUILD spyder-notebook-0.3.0.ebuild 1181 BLAKE2B 98d16232b35ccc2cb5761588fde07ea4f9a31c124c6e9c6b53c26a07d6bf01c72d2180b97212590f620b4f5bf7fa6b7dc8f5cfbb55c2e0eed122e076a6f92ba6 SHA512 97e79bc6cf5759ac83fbf3263bf2c6f70ca5fc1ab1ce9bb831b9ef81cc05c1be9dd6a324b31595a408677f757e2e46aef85a795c053d6ebe3920c823048ebbb3
+EBUILD spyder-notebook-0.3.0.ebuild 1185 BLAKE2B 26f138e30018fcbf6cc973dc7bbd3e9141ab74b3fe047e718f984466a0bae8a1d2f15c88c49d97f397f41f64c10ee92d91c0e9b2d202288ff4404f248ed5433f SHA512 77a79e39c050e6a4246a9cd8467f94487bd2288a990d0b94a7681620f17276bb45cfdf742d8e3ae83e4a3bf51b4f60ced795a9a2cb7a36d67a8b0282a2aaf471
 MISC metadata.xml 375 BLAKE2B d5aff616cc3473bac743c6d809eba454c54e2fc1514a115be5ae1ca11be7de212fe72f2ffeb520db05a11837d8ff93daa1128cdef7867244b9f829d8e52e6214 SHA512 c00656e8233157fbe266e364bc10a6b351063221b27a73d43add57a50d00beb2e540b491ea671fcc4b7acafd97c4a5e56c73a9937aab64ee2d79d553fd0658ee
diff --git a/dev-python/spyder-notebook/spyder-notebook-0.3.0.ebuild b/dev-python/spyder-notebook/spyder-notebook-0.3.0.ebuild
index 2392d07aaefd..9297921518d5 100644
--- a/dev-python/spyder-notebook/spyder-notebook-0.3.0.ebuild
+++ b/dev-python/spyder-notebook/spyder-notebook-0.3.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_7 )
+PYTHON_COMPAT=( python3_{7,8} )
 
 inherit distutils-r1 virtualx
 
diff --git a/dev-python/spyder-terminal/Manifest b/dev-python/spyder-terminal/Manifest
index 45c7f666717a..d33d535f6731 100644
--- a/dev-python/spyder-terminal/Manifest
+++ b/dev-python/spyder-terminal/Manifest
@@ -1,3 +1,3 @@
-DIST spyder-terminal-0.4.0.tar.gz 9099944 BLAKE2B ee8dd4d896e5afd0610c7bcc8c33779431a8f2a36873f25132bacf66c2bdaf6d2fee85603c213e3cc60ae5aee51f4a99449abb5903e12adf43a2a2f2900ad418 SHA512 e3531f9439c8773eaa74b64890583398384673868303c5413052c99d5be711ea63f977d714e8f4854a426c2154a62df8c272d4b262400f3f4b4d627074d8f2e5
-EBUILD spyder-terminal-0.4.0.ebuild 585 BLAKE2B b6d2a06a57d8c7f65d9b59072ad997e37f476f5ea857eaec0f1c0b04ae0eee8a82a56d9bb4d2e996407137a5823ab47cce9c8789109997a2ffe684d06f630703 SHA512 f6f85f6f0dcfd15e328c677ee1e8856da6f3121ebe64ca27fef96c617256b8ba58053262e708790e4527c189aa1a0461ee9a038a69a009aaf07df56a5a253d35
+DIST spyder-terminal-0.4.2.tar.gz 9123613 BLAKE2B badad7ba21c5d195bd7251719aeb74044b3d82ff840d0902046028c2dde006fc6c9da0095d1e56893f8f0c1ab01207ba559ef40e1f9d9f794768e4bbf701d1d5 SHA512 ac2755adbee2f8d0a799843fa5c9938ddfe612665452fef7b57d189481fb235c50efbc6665f0ef644db11324697382a65ece71d98051e8e17c6b968f5e94db39
+EBUILD spyder-terminal-0.4.2.ebuild 591 BLAKE2B 759fc7ecfc76911f412adcfc9bfa401b0531608e0f50a5b33f4a8f55f05cd606be383bd49f42f59ddb3d8e799cb1ad8bfe5f24ec0aec96a948474d15a57f6baa SHA512 c6213c54eff66929d5b796cefeb537bd1f06658a973b2ffef39f47e7c942aa6ab92b86bdf27e990ef8530e5b592ebd66e882bffc4c76bae36cf807873ccb65ab
 MISC metadata.xml 375 BLAKE2B d5aff616cc3473bac743c6d809eba454c54e2fc1514a115be5ae1ca11be7de212fe72f2ffeb520db05a11837d8ff93daa1128cdef7867244b9f829d8e52e6214 SHA512 c00656e8233157fbe266e364bc10a6b351063221b27a73d43add57a50d00beb2e540b491ea671fcc4b7acafd97c4a5e56c73a9937aab64ee2d79d553fd0658ee
diff --git a/dev-python/spyder-terminal/spyder-terminal-0.4.0.ebuild b/dev-python/spyder-terminal/spyder-terminal-0.4.2.ebuild
index 3c158e86cddf..0555d35ae087 100644
--- a/dev-python/spyder-terminal/spyder-terminal-0.4.0.ebuild
+++ b/dev-python/spyder-terminal/spyder-terminal-0.4.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_7 )
+PYTHON_COMPAT=( python3_{7,8} )
 
 inherit distutils-r1
 
@@ -15,7 +15,8 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
-RDEPEND="dev-python/coloredlogs[${PYTHON_USEDEP}]
+RDEPEND="
+	dev-python/coloredlogs[${PYTHON_USEDEP}]
 	dev-python/requests[${PYTHON_USEDEP}]
 	>=dev-python/spyder-4.0.0[${PYTHON_USEDEP}]
 	dev-python/terminado[${PYTHON_USEDEP}]
diff --git a/dev-python/spyder-unittest/Manifest b/dev-python/spyder-unittest/Manifest
index 4fba42aafb6f..eb77830ec8b1 100644
--- a/dev-python/spyder-unittest/Manifest
+++ b/dev-python/spyder-unittest/Manifest
@@ -1,3 +1,3 @@
 DIST spyder-unittest-0.4.1.tar.gz 79158 BLAKE2B 10b7a8fde9dffdb436c44f22d305ceab84970dabd19aaeb7b5685be21f0e7bfc701a5fbbf9e393a71c9feb36dd6a2be68680e276c8d0841b2133a7171c504e3f SHA512 17e08b09accd938bf533c409f9a8011e9780f9cc4533af0ec754b6a01061490f198213cb77af9050e1e67e2b4b9c25251bbab27dce23d3f6e09f502cfbef95fc
-EBUILD spyder-unittest-0.4.1.ebuild 992 BLAKE2B 1173068f5cc830c810fc2240dbb2181585f55c5a5df9ca53e7abac47040ffcabb0e16a622ae061c8c70eee11642927ae48cf76fd8e71606fc306fdb03a796f2f SHA512 d0b32af90882ad86019b1f030c6f4160e0e6d3e0fce030014e7b40a6980d92ac63676dd0af0691d174f68543882f67444f575821a3fe661b204536c053d84c98
+EBUILD spyder-unittest-0.4.1.ebuild 1085 BLAKE2B 47c1234f68356d866e4bbeff0ec49bf59d0084cc0350f2ca2ecb508b18d25f64a228efb0be41d670eff0987c2bc338a1eb6b99835394d81ee091fc812b2b1caa SHA512 7d802ac4dbf44408a6e27792ae7a5532bdc869ee27e9ab177790a1a0af4fc9d750c87a6d4ab5a9db52910c8f3b0f270fb6e58f46338cce7fdb0794121724fe0c
 MISC metadata.xml 375 BLAKE2B d5aff616cc3473bac743c6d809eba454c54e2fc1514a115be5ae1ca11be7de212fe72f2ffeb520db05a11837d8ff93daa1128cdef7867244b9f829d8e52e6214 SHA512 c00656e8233157fbe266e364bc10a6b351063221b27a73d43add57a50d00beb2e540b491ea671fcc4b7acafd97c4a5e56c73a9937aab64ee2d79d553fd0658ee
diff --git a/dev-python/spyder-unittest/spyder-unittest-0.4.1.ebuild b/dev-python/spyder-unittest/spyder-unittest-0.4.1.ebuild
index 5a999c55cae6..14eb1d313ebb 100644
--- a/dev-python/spyder-unittest/spyder-unittest-0.4.1.ebuild
+++ b/dev-python/spyder-unittest/spyder-unittest-0.4.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_7 )
+PYTHON_COMPAT=( python3_{7,8} )
 
 inherit distutils-r1 virtualx
 
@@ -15,14 +15,19 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
-RDEPEND=">=dev-python/spyder-4.0.0[${PYTHON_USEDEP}]
+RDEPEND="
+	>=dev-python/spyder-4.0.0[${PYTHON_USEDEP}]
+	<dev-python/spyder-5.0.0[${PYTHON_USEDEP}]
 	dev-python/pyzmq[${PYTHON_USEDEP}]
-	dev-python/lxml[${PYTHON_USEDEP}]"
+	dev-python/lxml[${PYTHON_USEDEP}]
+"
 
 DEPEND="test? (
 	dev-python/flaky[${PYTHON_USEDEP}]
 	dev-python/nose[${PYTHON_USEDEP}]
-	dev-python/pytest-qt[${PYTHON_USEDEP}] )"
+	dev-python/pytest-mock[${PYTHON_USEDEP}]
+	dev-python/pytest-qt[${PYTHON_USEDEP}]
+)"
 
 distutils_enable_tests pytest
 
diff --git a/dev-python/spyder-vim/Manifest b/dev-python/spyder-vim/Manifest
index 7a658006232d..b03047b779de 100644
--- a/dev-python/spyder-vim/Manifest
+++ b/dev-python/spyder-vim/Manifest
@@ -1,3 +1,3 @@
-DIST spyder-vim-0_pre20200514.tar.gz 286672 BLAKE2B ab3f8fbb86a21077a7563be880a4c7844c45d3837fc9255d70442e5e0b7c9d65fc94bf5a1db71de21943847e964aadae62a1064443f9de68b67edccef20933cd SHA512 63645b95ae26a903f2427e45be6061b927c713675fab8c13f108f1eb9765e4e2f3a0172f9fcf709cb8e8d5a2c703297ff28ecb030f24b00bed93dde004c88595
-EBUILD spyder-vim-0_pre20200514.ebuild 757 BLAKE2B 9770cc5f230818eec5c8906cfddd104a44b2d32abf9d5771082debed1479195671e80445cc94318c0c16d9983bfb70c28f9ed2e360d90360fb98db9b08f0b95f SHA512 ecd41d17ef00fba16a655ee68cb8f7df2f9bc96d116ef7c7cda144406dea204c7b0679192deeb4afe68e077d6fb8aef485632eba2193cf9c6e09cab9ba32ff73
+DIST spyder-vim-0_pre20200721.tar.gz 291815 BLAKE2B 6fbcd5dfc73de14a3e31deb4e7dae2e1881a1ad4fb07213c04b4c7446b225ebfdbf90c95c441e0b275dd020fa972eddd7b8ef11cab52b44fc369531f82dc381c SHA512 4363606f6329c3be84cab7431c7eda08012ee365e475446dd1addf858896ce1584ff04d3603a0f0a1473d3741b23befd311e3a107a96869da90eb6dc3c844361
+EBUILD spyder-vim-0_pre20200721.ebuild 804 BLAKE2B 9661eb836077851c7232dacf38cb1b2f454fc96f449550bdb1a3fae4e264b25e72b3de618ef0a5daee67c8c540d62d97d2e7dd7f80eea09ce72b2603ccc381e6 SHA512 707de491e8ed3bdc602886fa169e026d37b23b1e21032b07cf4e984ad6f99fa8a86cf767f8c0137b58c2a7b713278ee3ef623ebb2733705610effff77e14e987
 MISC metadata.xml 375 BLAKE2B d5aff616cc3473bac743c6d809eba454c54e2fc1514a115be5ae1ca11be7de212fe72f2ffeb520db05a11837d8ff93daa1128cdef7867244b9f829d8e52e6214 SHA512 c00656e8233157fbe266e364bc10a6b351063221b27a73d43add57a50d00beb2e540b491ea671fcc4b7acafd97c4a5e56c73a9937aab64ee2d79d553fd0658ee
diff --git a/dev-python/spyder-vim/spyder-vim-0_pre20200514.ebuild b/dev-python/spyder-vim/spyder-vim-0_pre20200721.ebuild
index ee631d43a904..07c570778ebc 100644
--- a/dev-python/spyder-vim/spyder-vim-0_pre20200514.ebuild
+++ b/dev-python/spyder-vim/spyder-vim-0_pre20200721.ebuild
@@ -3,11 +3,11 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_7 )
+PYTHON_COMPAT=( python3_{7,8} )
 
 inherit distutils-r1 virtualx
 
-COMMIT="0a5f982392a03a0f6448f2cfdfa116d027dc52b1"
+COMMIT="c6f6ad75d1298d4cdadab69d57b2b4e2d235d8f3"
 
 DESCRIPTION="Plugin for Spyder to enable Vim keybindings"
 HOMEPAGE="https://github.com/spyder-ide/spyder-vim"
@@ -20,8 +20,10 @@ KEYWORDS="~amd64 ~x86"
 RDEPEND=">dev-python/spyder-4.0.0[${PYTHON_USEDEP}]"
 
 DEPEND="test? (
-	dev-python/mock[${PYTHON_USEDEP}]
-	dev-python/pytest-qt[${PYTHON_USEDEP}] )"
+	dev-python/flaky[${PYTHON_USEDEP}]
+	dev-python/pytest-mock[${PYTHON_USEDEP}]
+	dev-python/pytest-qt[${PYTHON_USEDEP}]
+)"
 
 DOCS=( "README.rst" "doc/example.gif" )
 
diff --git a/dev-python/spyder/Manifest b/dev-python/spyder/Manifest
index 78e22894da78..2faa012e610e 100644
--- a/dev-python/spyder/Manifest
+++ b/dev-python/spyder/Manifest
@@ -1,6 +1,10 @@
 AUX spyder-4.1.2-build.patch 1503 BLAKE2B 06d768f741703df74bf9183c6a80e4507a6e0afaf6eeae3cbf8f5f00dbf5f07a02d7f0f7639f5e91f412b1d08c7de58347b2a336b262ab2dd2bf0982978a1ee4 SHA512 ee372db7b1dfa4c77feaee6b9def35c4238df00cc8cd7de1ba5a309672ce1b60b2e84f9e9eae552d08f26dd73cd3cd1789e65344bd8e13e87764413340d7a480
 AUX spyder-4.1.2-py3-only.patch 2100 BLAKE2B 95223b087b2d85b5069822d96cc185f1e4005ff75d8a894a4684dc0a2ca11e2807ea912b0732dabc7ea5069fd3547ad30932cb92f5ce899c2313c6c784723046 SHA512 ec8361268d511888ac19326ff558198f39415237d528910ffb6ececba49a2d5bfacdf81f3f6deb299ac9375908ab371fa115211e77366409c87aa3e64b971466
+AUX spyder-4.1.5-doc-theme-renamed.patch 375 BLAKE2B f4c902b331e9e6f034018d781d483380e85b3277f5e8f3f64f15ebcd4673ee1a805838a10c5606aa853c1c0779c10a439bb556dd57a7427bf96aa2fce0c7b9a9 SHA512 7671f0639c8947a0cbd4ac24c0a9731cb31a7c8f2ca49ac7a9d2dc8f4b7b08aa033448c285ba71f844fc8588167bf91b44c3cadaf3fd83883160c2eddc5b7e7b
 DIST spyder-4.1.4.tar.gz 11699453 BLAKE2B 208ba4f32fa548ef8478d72c046e70ba43a2fccd2040629af03f7f56c379ebefa1e90594054f15a92aebdd14307d001c68ee5e6d2401a841e408c4af42436c33 SHA512 8a5f63b11648002838e0b4e5427b1c7cf9cbe4a4fd20af7e33e5e789cddaf6393bb7200bfacf8c7af19d723f12d99d2e962a769706b806335f7146ddd6853735
+DIST spyder-4.1.5.tar.gz 11705605 BLAKE2B da22046116ea67c1d4f02ddf44d846fcf4361c45bae57a0b328ae646a1bcdc35494d42cb909c8b4d51cf0ae7c6578c4b4a3c746e55a5055a98dcb6a2b7c3cabb SHA512 9b118d857806791ed83182019088ad5b877fffe5e26cd47b4638cd9bdc68fc6ad8339186046a30715b5ccc6c503bc0a2824b7260f325816c9f750b9af667e3f1
 DIST spyder-docs-0d5afe26b8e28f3eb9f36f4ec3828bf8375c339e.tar.gz 29749238 BLAKE2B 9cf655c2a6fdf84278eaeb2e6f13c92eb4e585f213fd4f164a2707bc3cf8cb8abaaa213c5e781414fb0eecb3cf26b1f1708b394cd1ca12fa353ccbdd33f01dcb SHA512 8ed005cbfc32d7c68cf633790446d5d271f4d38ad190c09b2bcfd3ee96f24af5443d911bcdea90dc6ad94c5dab78437b9db02d0d4a7ceb9afa37a31e4bad24ae
-EBUILD spyder-4.1.4.ebuild 6065 BLAKE2B 60946f019296720480b43224beec7608b65a96b06bac0f7291443c18c38b31535831b18452f2d8724186d20f9430e1b4a3910aa4accae0e5913d9818af3d95ab SHA512 f773bccebff54a16d00f74eaf97a11e44a5b49bd8c327a0c83ce34c94eb61cd763e6025fe6fe327c4318062612b018ab9422128dcc7a1cd9396c7441cedfddce
+DIST spyder-docs-7fbdabcbc37fe696e4ad5604cdbf4023dfbe8b6c.tar.gz 58822544 BLAKE2B 9ddd662eb0e3b2845a15bc38a0ab994fcf43824a560cf635a29e16b5eb66407706a412ea50a2f8e5c0212675df3422ece649bd1e50e3ecd1c34ee5727f8a2df9 SHA512 ab30f287733681da0b1d15656a44cd320401330309efbff8f0a89f59a15d5c57532a2eab3e8353d8c3856eac0a393385a852663d6698d0a0d309def21d13933d
+EBUILD spyder-4.1.4.ebuild 6069 BLAKE2B cb688d82c8fc52ffc4c065c65fc8a74847a88d7f09126bebb6f6abd527e425c44faa35cbcf2f9ff2cabbd515431d23b6c03d36fccb719191ee1f596d91eb0fe2 SHA512 118a9696b218f98376058371296304401631e6df1677e99e5541e98882d6a1c2a138f90b6dde39af5ee2a8b0e1a787415518802f4a8eda437f3287e7eecf84bd
+EBUILD spyder-4.1.5.ebuild 8089 BLAKE2B fda390a471de6d4363ec9418b8f7af7400c4f375f71dd260f687abfeed32b2406de9263692f15d7d524fd84986b77b1d2fbbd37d753e0e87fd28967df13bfc55 SHA512 17f7774c0340292d3d405bf7e6ae1c4048b5a1dcdbed3ecee0d7cfb50c4406d3b52c86391b21222347374c381dc739c50a45862bf730496f9503933f2929585f
 MISC metadata.xml 1413 BLAKE2B cf9779b0f4f71f9929c9faefc8e50c1f0a06a55927002f1473958934a9eb808651c0df8171ef8faf16f7ce2bb3149ff119a8e9df1896e18121c545d6244ae13c SHA512 bbb55ced9bcc673df13224acb530de91094a496e97af91229ce5dc8ab167414f1a606994596779e0b6d99845c157b699783c63af761c4e9428ba35a658ef9cdf
diff --git a/dev-python/spyder/files/spyder-4.1.5-doc-theme-renamed.patch b/dev-python/spyder/files/spyder-4.1.5-doc-theme-renamed.patch
new file mode 100644
index 000000000000..8a93662950f0
--- /dev/null
+++ b/dev-python/spyder/files/spyder-4.1.5-doc-theme-renamed.patch
@@ -0,0 +1,13 @@
+diff --git a/docs/doc/conf.py b/docs/doc/conf.py
+index fd6d5ec..3de0bad 100644
+--- a/docs/doc/conf.py
++++ b/docs/doc/conf.py
+@@ -129,7 +129,7 @@ pygments_style = "sphinx"
+ #
+ # CI = True
+ # TRAVIS_BRANCH = 'master'
+-html_theme = "pandas_sphinx_theme"
++html_theme = "pydata_sphinx_theme"
+ html_logo = '_static/spyder_logo.png'
+ html_theme_options = {
+     "external_links": [
diff --git a/dev-python/spyder/spyder-4.1.4.ebuild b/dev-python/spyder/spyder-4.1.4.ebuild
index 184855914157..557c7b2359f0 100644
--- a/dev-python/spyder/spyder-4.1.4.ebuild
+++ b/dev-python/spyder/spyder-4.1.4.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 PYTHON_COMPAT=( python3_7 )
 
-inherit eutils xdg distutils-r1 virtualx
+inherit optfeature xdg distutils-r1 virtualx
 
 # Commit of documentation to fetch
 DOCS_PV="0d5afe26b8e28f3eb9f36f4ec3828bf8375c339e"
diff --git a/dev-python/spyder/spyder-4.1.5.ebuild b/dev-python/spyder/spyder-4.1.5.ebuild
new file mode 100644
index 000000000000..d8bcd60bdc25
--- /dev/null
+++ b/dev-python/spyder/spyder-4.1.5.ebuild
@@ -0,0 +1,207 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8} )
+
+inherit eutils xdg distutils-r1
+
+# Commit of documentation to fetch
+DOCS_PV="7fbdabcbc37fe696e4ad5604cdbf4023dfbe8b6c"
+
+MYPV="${PV/_alpha/a}"
+
+DESCRIPTION="The Scientific Python Development Environment"
+HOMEPAGE="
+	https://www.spyder-ide.org/
+	https://github.com/spyder-ide/spyder/
+	https://pypi.org/project/spyder/"
+SRC_URI="https://github.com/spyder-ide/${PN}/archive/v${MYPV}.tar.gz -> ${P}.tar.gz
+	https://github.com/spyder-ide/${PN}-docs/archive/${DOCS_PV}.tar.gz -> ${PN}-docs-${DOCS_PV}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+# Extra indented deps are expansion of python-language-server[all] dep
+# As the pyls ebuild does not add flags for optional runtime dependencies
+# we have to manually specify these desp instead of just depending on the [all]
+# flag. The indentation allows us to distinguish them from spyders direct deps.
+RDEPEND="
+	>=dev-python/atomicwrites-1.2.0[${PYTHON_USEDEP}]
+	>=dev-python/chardet-2.0.0[${PYTHON_USEDEP}]
+	>=dev-python/cloudpickle-0.5.0[${PYTHON_USEDEP}]
+	>=dev-util/cookiecutter-1.6.0[${PYTHON_USEDEP}]
+	>=dev-python/diff-match-patch-20181111[${PYTHON_USEDEP}]
+	dev-python/intervaltree[${PYTHON_USEDEP}]
+	>=dev-python/ipython-4.0[${PYTHON_USEDEP}]
+	~dev-python/jedi-0.17.1[${PYTHON_USEDEP}]
+	dev-python/keyring[${PYTHON_USEDEP}]
+	>=dev-python/nbconvert-4.0[${PYTHON_USEDEP}]
+	>=dev-python/numpydoc-0.6.0[${PYTHON_USEDEP}]
+	~dev-python/parso-0.7.0[${PYTHON_USEDEP}]
+	>=dev-python/pexpect-4.4.0[${PYTHON_USEDEP}]
+	>=dev-python/pickleshare-0.4[${PYTHON_USEDEP}]
+	>=dev-python/psutil-5.3[${PYTHON_USEDEP}]
+	>=dev-python/pygments-2.0[${PYTHON_USEDEP}]
+	>=dev-python/pylint-1.0[${PYTHON_USEDEP}]
+	>=dev-python/python-language-server-0.34.0[${PYTHON_USEDEP}]
+
+	dev-python/autopep8[${PYTHON_USEDEP}]
+	>=dev-python/flake8-3.8.0[${PYTHON_USEDEP}]
+	>=dev-python/mccabe-0.6.0[${PYTHON_USEDEP}]
+	<dev-python/mccabe-0.7.0[${PYTHON_USEDEP}]
+	>=dev-python/pycodestyle-2.6.0[${PYTHON_USEDEP}]
+	<dev-python/pycodestyle-2.7.0[${PYTHON_USEDEP}]
+	>=dev-python/pydocstyle-2.0.0[${PYTHON_USEDEP}]
+	>=dev-python/pyflakes-2.2.0[${PYTHON_USEDEP}]
+	<dev-python/pyflakes-2.3.0[${PYTHON_USEDEP}]
+	dev-python/pylint[${PYTHON_USEDEP}]
+	>=dev-python/rope-0.10.5[${PYTHON_USEDEP}]
+	dev-python/yapf[${PYTHON_USEDEP}]
+
+	<dev-python/python-language-server-1.0.0[${PYTHON_USEDEP}]
+	>=dev-python/pyxdg-0.26[${PYTHON_USEDEP}]
+	>=dev-python/pyzmq-17.0.0[${PYTHON_USEDEP}]
+	>=dev-python/qdarkstyle-2.8[${PYTHON_USEDEP}]
+	>=dev-python/qtawesome-0.5.7[${PYTHON_USEDEP}]
+	>=dev-python/qtconsole-4.6.0[${PYTHON_USEDEP}]
+	>=dev-python/QtPy-1.5.0[${PYTHON_USEDEP},svg,webengine]
+	>=dev-python/sphinx-0.6.6[${PYTHON_USEDEP}]
+	>=dev-python/spyder-kernels-1.9.4[${PYTHON_USEDEP}]
+	<dev-python/spyder-kernels-1.10.0[${PYTHON_USEDEP}]
+	dev-python/watchdog[${PYTHON_USEDEP}]
+"
+
+BDEPEND="test? (
+	<dev-python/coverage-5.0[${PYTHON_USEDEP}]
+	dev-python/cython[${PYTHON_USEDEP}]
+	dev-python/flaky[${PYTHON_USEDEP}]
+	dev-python/matplotlib[tk,${PYTHON_USEDEP}]
+	dev-python/mock[${PYTHON_USEDEP}]
+	dev-python/pandas[${PYTHON_USEDEP}]
+	dev-python/pillow[${PYTHON_USEDEP}]
+	<dev-python/pytest-5.0[${PYTHON_USEDEP}]
+	<dev-python/pytest-faulthandler-2.0[${PYTHON_USEDEP}]
+	dev-python/pytest-lazy-fixture[${PYTHON_USEDEP}]
+	dev-python/pytest-mock[${PYTHON_USEDEP}]
+	dev-python/pytest-ordering[${PYTHON_USEDEP}]
+	dev-python/pytest-qt[${PYTHON_USEDEP}]
+	dev-python/pytest-xvfb[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	sci-libs/scipy[${PYTHON_USEDEP}]
+	dev-python/sympy[${PYTHON_USEDEP}]
+)"
+
+# Based on the courtesy of Arfrever
+# This patch removes a call to update-desktop-database during build
+# This fails because access is denied to this command during build
+PATCHES=(
+	"${FILESDIR}/${PN}-4.1.2-build.patch"
+	"${FILESDIR}/${PN}-4.1.2-py3-only.patch"
+	"${FILESDIR}/${PN}-4.1.5-doc-theme-renamed.patch"
+)
+
+DOCS=(
+	"AUTHORS.txt"
+	"Announcements.md"
+	"CHANGELOG.md"
+	"CODE_OF_CONDUCT.md"
+	"CONTRIBUTING.md"
+	"NOTICE.txt"
+	"README.md"
+	"RELEASE.md"
+	"TROUBLESHOOTING.md"
+)
+
+S="${WORKDIR}/${PN}-${MYPV}"
+
+distutils_enable_tests pytest
+distutils_enable_sphinx docs/doc dev-python/sphinx-panels dev-python/pydata-sphinx-theme dev-python/sphinx-multiversion
+
+python_prepare_all() {
+	# move docs into workdir
+	mv ../spyder-docs-${DOCS_PV}* docs || die
+
+	# these deps are packaged separately: dev-python/spyder-kernels, dev-python/python-language-server
+	rm external-deps/* -r || die
+
+	# do not depend on pyqt5<13
+	sed -i -e '/pyqt5/d' \
+		-e '/pyqtwebengine/d' \
+			setup.py || die
+
+	# do not check deps, fails because we removed pyqt5 dependency above
+	sed -i -e 's:test_dependencies_for_spyder_setup_install_requires_in_sync:_&:' \
+		spyder/tests/test_dependencies_in_sync.py || die
+
+	# some tests still depend on QtPy[webkit] which is removed
+	# spyder itself works fine without webkit
+	rm spyder/widgets/tests/test_browser.py || die
+	rm spyder/plugins/onlinehelp/tests/test_pydocgui.py || die
+	rm spyder/plugins/ipythonconsole/tests/test_ipythonconsole.py || die
+	rm spyder/plugins/ipythonconsole/tests/test_ipython_config_dialog.py || die
+	rm spyder/plugins/help/tests/test_widgets.py || die
+	rm spyder/plugins/help/tests/test_plugin.py  || die
+	rm spyder/app/tests/test_mainwindow.py || die
+
+	# skip online test
+	rm spyder/widgets/github/tests/test_github_backend.py || die
+
+	# AssertionError: assert '' == 'This is some test text!'
+	sed -i -e 's:test_tab_copies_find_to_replace:_&:' \
+		spyder/plugins/editor/widgets/tests/test_editor.py || die
+
+	# RuntimeError: Unsafe load() call disabled by Gentoo. See bug #659348
+	sed -i -e 's:test_dependencies_for_binder_in_sync:_&:' \
+		spyder/tests/test_dependencies_in_sync.py || die
+
+	# Fatal Python error: Segmentation fault
+	# sometimes it works, sometimes it segfaults
+	sed -i -e 's:test_copy_path:_&:' \
+		-e 's:test_copy_file:_&:' \
+		-e 's:test_save_file:_&:' \
+		-e 's:test_delete_file:_&:' \
+		spyder/plugins/explorer/widgets/tests/test_explorer.py || die
+
+	# Assertion error, can't connect/remember inside ebuild environment
+	rm spyder/plugins/ipythonconsole/widgets/tests/test_kernelconnect.py || die
+
+	# AssertionError: assert 47 in [43, 44, 45, 46]
+	sed -i -e 's:test_objectexplorer_collection_types:_&:' \
+		spyder/plugins/variableexplorer/widgets/objectexplorer/tests/test_objectexplorer.py  || die
+
+	distutils-r1_python_prepare_all
+}
+
+# Calling pytest directly makes the tests freeze after completing even if successful
+# Exit code is nonzero even upon success, so can't add || die here
+# test results should be checked for success manually
+python_test() {
+	${EPYTHON} runtests.py
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	elog "To get additional features, optional runtime dependencies may be installed:"
+		optfeature "2D/3D plotting in the Python and IPython consoles" dev-python/matplotlib
+		optfeature "View and edit DataFrames and Series in the Variable Explorer" dev-python/pandas
+		optfeature "View and edit two or three dimensional arrays in the Variable Explorer" dev-python/numpy
+		optfeature "Symbolic mathematics in the IPython console" dev-python/sympy
+		optfeature "Import Matlab workspace files in the Variable Explorer" sci-libs/scipy
+		optfeature "Run Cython files in the IPython console" dev-python/cython
+		optfeature "The hdf5/h5py plugin" dev-python/h5py
+		optfeature "The line profiler plugin" dev-python/spyder-line-profiler
+		optfeature "The memory profiler plugin" dev-python/spyder-memory-profiler
+		# spyder-autopep8 does not have a release (yet)
+		# and are not compatible with >=spyder-4.0.0 at the moment
+		# optfeature "The autopep8 plugin" dev-python/spyder-autopep8
+		optfeature "Vim key bindings" dev-python/spyder-vim
+		optfeature "Unittest support" dev-python/spyder-unittest
+		optfeature "Jupyter notebook support" dev-python/spyder-notebook
+		optfeature "System terminal inside spyder" dev-python/spyder-terminal
+		# spyder-reports not yet updated to >=spyder-4.0.0
+		# optfeature "Markdown reports using Pweave" dev-python/spyder-reports
+}
diff --git a/dev-python/sqlalchemy/Manifest b/dev-python/sqlalchemy/Manifest
index c0969683f882..9b34d7e81b3f 100644
--- a/dev-python/sqlalchemy/Manifest
+++ b/dev-python/sqlalchemy/Manifest
@@ -1,6 +1,6 @@
 AUX sqlalchemy-pytest-deprecation.patch 2695 BLAKE2B d71c791e39a6caf9d8e67dc61ede490749ee7774c8719238b9291dfdd1e0fd591f278baaa47b7b61b4729b9aa1017bebd2b2d6dee4d15a47b2ad6d1f3829ca0e SHA512 709c0f80bfef99a1ef42446cad94a9518535b07697de21a7b4a83ce22a2fd30df495747e8ce31dfed21291f8ffc56867ccc0b0eff4b38de41ef26c99685a46d1
 DIST SQLAlchemy-1.3.11.tar.gz 6007784 BLAKE2B c889ea28ae08fcb83d338ab01a64533142428ee91a6c11b9a7f2116f99161c066e66f49d76bdd2c7600f1a7f86a2add217f49dda4cf97566a875f28d3d4b24be SHA512 c691539db4edd62af749087728dfd424010bfb3ca2cc8503a4b96c1625d059d4c2a748b9a35cc870cc99ca9df61966cce406f9b570b25e55c3632a99b8621e74
 DIST SQLAlchemy-1.3.17.tar.gz 5979141 BLAKE2B f0fa46493461f532ebca9420fc9f49a2c04af888aa99653946a5bb563d40b8bb714a03301300ebb80cca76a99f8226ddfcde4216e8fc2593d3a161b5072276ab SHA512 6f6d54b9018ece6c289f28a3a41ffb1b2216206edee08c49f387e9f30740969dfe0f8272654ce4efca159a2a6619e76c41b2ad2b10c391cdd64681ac17d0bc79
-EBUILD sqlalchemy-1.3.11.ebuild 1588 BLAKE2B e1165a050cf6e2f08135698679c94e1ab14b20c6b3160326349350b21fd97fa1d88b8c2aebddf984030236ca4b879cc822bc16f12e8842ff288cefdb0d314b0a SHA512 affca1b12188fcb6ff6b2919ce93c05413661e50b2b68aa6b7980ab5a416e0e82d1fcdca3621fb2202d12772df24edaf38a40e783059eb0c567bc44cf63242cc
-EBUILD sqlalchemy-1.3.17.ebuild 1463 BLAKE2B 46a4a523d014fe7b948f04b2d4fff22ea68dedbe54230fa721e2a1eaf4f6b25dc91158016c2b450b095597a383451162c0b18e4be0fd69dd7431789b67ccb2aa SHA512 560b879d1eb17684e7a5d53d93a2c771b7839868e7fc5fe7cca903898d44d675384b97375ee4b54569d4ece9c768e1c7a269ed8ef22cd72d984864b17b899f0c
+EBUILD sqlalchemy-1.3.11.ebuild 1592 BLAKE2B 13dfeb772f622cb4f92c06f657385cae9793d3dd87b7e31649adfa49bed27dfcd24222ee2c1dda87f70890232e184fc2475155a8a47c49dbef11bb4275895d5f SHA512 341a8d6e9cc1b6346a1c68c3c70776c373fe2e5a73a33cf7822e158efdf9a504d4f74752beef428d0b4d5c0d044c311de310939c7572706c42449bc1869cb8cc
+EBUILD sqlalchemy-1.3.17.ebuild 1467 BLAKE2B bdef045c84c2f1edbe7fe2a156f1dcc9bb3129554e9e0abcf7461d70f43614200f7f8299664758bb80b98930bee809b6d34ce25990fae8f3ba686e1e8063b564 SHA512 ce9065eedcc9ad44b404b9f9a4fae30289939579a6356931509b922f03296eb17264dd71a3d855fe02fc0c91409be0b011ed1641b0e631b260f5a950ce473bd8
 MISC metadata.xml 313 BLAKE2B 71212a9a3076b472b488bdb4e12fef98e16881a32a8383c5fa6a9008353d2e043dfe64cb536ecef145ba74ba77ef3a6c43d705d5072d1b56e11eacfadd1d0edd SHA512 ef6298f9e38312117a0d1ab1e63f2fb21ae51ff149053603c19437b90d954827858579ab8f021cb52919aff4474a27f5a598d8515a7e5a9f2e7e35aee53c5326
diff --git a/dev-python/sqlalchemy/sqlalchemy-1.3.11.ebuild b/dev-python/sqlalchemy/sqlalchemy-1.3.11.ebuild
index 0e10b45ac3d4..ede4b5dfa758 100644
--- a/dev-python/sqlalchemy/sqlalchemy-1.3.11.ebuild
+++ b/dev-python/sqlalchemy/sqlalchemy-1.3.11.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 PYTHON_COMPAT=( python3_{6,7,8} pypy3 )
 PYTHON_REQ_USE="sqlite?"
 
-inherit distutils-r1 eutils flag-o-matic
+inherit distutils-r1 flag-o-matic optfeature
 
 MY_PN="SQLAlchemy"
 MY_P="${MY_PN}-${PV/_beta/b}"
diff --git a/dev-python/sqlalchemy/sqlalchemy-1.3.17.ebuild b/dev-python/sqlalchemy/sqlalchemy-1.3.17.ebuild
index 3e4038cfff5f..9ae4dbf92750 100644
--- a/dev-python/sqlalchemy/sqlalchemy-1.3.17.ebuild
+++ b/dev-python/sqlalchemy/sqlalchemy-1.3.17.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 PYTHON_COMPAT=( python3_{6..9} pypy3 )
 PYTHON_REQ_USE="sqlite?"
 
-inherit distutils-r1 eutils flag-o-matic
+inherit distutils-r1 flag-o-matic optfeature
 
 MY_PN="SQLAlchemy"
 MY_P="${MY_PN}-${PV/_beta/b}"
diff --git a/dev-python/statsmodels/Manifest b/dev-python/statsmodels/Manifest
index 6c988a6e9da7..611291adbd2a 100644
--- a/dev-python/statsmodels/Manifest
+++ b/dev-python/statsmodels/Manifest
@@ -1,7 +1,7 @@
 AUX statsmodels-0.11.1-tests.patch 1915 BLAKE2B 90c13595a80cf1e59e81c483746f4b7e25bbb47d03211c39fda4dc9f441b03a9e793398d88e235ab53895e3d08cf97f7080d961317c4ea3fab04e011f0e5b64b SHA512 ec7f858b1af512d0bf591d35681b8663041e08e64a6e223e56cf600316a203259cd6386d2004bf884224608945b9e4938e9d39f8370d11c8914f6b773cd2773d
 DIST statsmodels-0.11.1.tar.gz 15381516 BLAKE2B a40cf9138edd8a9a6707a550d9885e0610f9bc666fcd73a60bd11ade6dcfa806ecd912a725cf2a13902e92f31af2c3e82f244280f70586bb3359dc8fc2842508 SHA512 54afe55a23b431154c159f44d284aa093f3368988f0695c0f3fbb206046cdfb171ab2ba51ce94285d567b8536141f93a1ef404b5f7222f1e61264baf0541926d
 DIST statsmodels-0.12.0.tar.gz 17502050 BLAKE2B 8621882d920db652d1244fcd4a0bc4f31310663c4dc6582421cd64a040e0b64917070aef5962515b07a8e92c0d690d43dea19d8ee9b71c7a3c2548e903e69125 SHA512 a9cbba0c8cd7e11bef4fbb303c204d5d4db4eb9f3f93f608b9be5b3c0d7feccc08dd84b4904557fbd1c12f49f3376b2aa7fabd06daf5649fd72c16b7041afac9
-EBUILD statsmodels-0.11.1.ebuild 2200 BLAKE2B 62991021e4489b3923fb03164d8f6ed8176a469543c8d6661abc282d54a4147eeac5981a12e259855d313aa4e1f5e2726498fa6dc30b9b0ef2e4e502190857cb SHA512 ab2ba2a1fa3a151150ba17993e14882f9bc87fdff26492d36cc83447edf118d4e1ef8855c48d9446834c33f3f832e6ee298190a003bc525008a3e1527cbc0da8
-EBUILD statsmodels-0.12.0.ebuild 2009 BLAKE2B a537123de26a3ed3b3857495b9688d206de2e20dcd158adc5ac0e5f682d1d369d7e5bac20dbeed2986f52c4a88a2791ac3bbd2bf51d3a1dc912a0e6440e44c6a SHA512 516108e182fd628487f07881fd4e5d78b52f1ed8b9346950d6c78622688f15db93fc82dbb15bcdc858db3634577ddd408583747871f1fe306ee9890d61eeb4ea
-EBUILD statsmodels-9999.ebuild 1984 BLAKE2B 7ee4c8dbe27a102107ac29f0438b8608492cadde4bb6740cfc7c70781885ef256164a994f592bbd6a00b75767f3c756f1297e16d8ff4fbb6e752a54f26c0e95a SHA512 8e3bcafaa6251aec5e3bfc40afefc00608a5c13eb80ebe5a9eccbcd2dfb8072f10f88679710cd757c70aaee88865d6abc830b7fd1a0faae1caa0b8b7d80748f1
+EBUILD statsmodels-0.11.1.ebuild 2204 BLAKE2B 1762e82d5ac00851cb1c688d3846e5b6b6c9bf50b9578a62db60c04937e2992daab0246e86f27872874bea7e3c052f78dfcaf0a99c68603923218695cc1d619d SHA512 0e0f0114ca24f562fd7e4c73d5d784eb8a3d413f1e179fa3ba7e056a169cac3308fb062f4ec99fe8115eac262512709b9139016f9b90e8f5e1b092262a46662c
+EBUILD statsmodels-0.12.0.ebuild 2013 BLAKE2B f5e99fcfd6a23e5262b8d1be02d1ddbb67f7c3917583ba18342a034e9db69dced3912d700f5a1956f840e91a465dff152f206039c7c521bfc5ebb26cf628e205 SHA512 f7b6df8675ac752efa5260f2e45cf0bbb513663a5f2ffee0aea9aec33d0fcd29c98332ce277ace9ddbfb78b1912f82b7ce9379c8bfa966a98e0e4860f71d1939
+EBUILD statsmodels-9999.ebuild 1988 BLAKE2B fb94ba1c7744d1659ff7737f83629442cbdb5e4fc47675e526a703b74d9e8f06ba336c386f31ecf3ff60848cd78dfd04a27de7a9e663460ef4645fe32e70f0ba SHA512 60fa5df86746c894ba3eb5d70ab7f347e2399bcd6b4ee863859411628547c9506295580e64940f50ea89cdadd4df8db2070a97044ef0354f01ec68414e6e07f0
 MISC metadata.xml 1310 BLAKE2B de8c73b0fb91a3bd65b2ee149b3ef01b3f93c78dfaf1642f9c81335e21c0ace42a771a0901a30dfebc7a8bbb80e9fb7057bd047a26035e103c7ece9e9dbef58a SHA512 96bfb2a3e0b677a67c0256bfcdc76b3621eac9d9242c2aaa7d22322bb53be9bb2185ed82a2fa65cb7cd16df7562c1999ac0d936471608700030ecff4de7174b6
diff --git a/dev-python/statsmodels/statsmodels-0.11.1.ebuild b/dev-python/statsmodels/statsmodels-0.11.1.ebuild
index f7a12631400a..4abed0cfcb29 100644
--- a/dev-python/statsmodels/statsmodels-0.11.1.ebuild
+++ b/dev-python/statsmodels/statsmodels-0.11.1.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 PYTHON_COMPAT=( python3_{6..9} )
 
-inherit distutils-r1 eutils
+inherit distutils-r1 optfeature
 
 DESCRIPTION="Statistical computations and models for use with SciPy"
 HOMEPAGE="https://www.statsmodels.org/stable/index.html"
diff --git a/dev-python/statsmodels/statsmodels-0.12.0.ebuild b/dev-python/statsmodels/statsmodels-0.12.0.ebuild
index dfa23119e7a4..c1acf54013fe 100644
--- a/dev-python/statsmodels/statsmodels-0.12.0.ebuild
+++ b/dev-python/statsmodels/statsmodels-0.12.0.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 PYTHON_COMPAT=( python3_{6..9} )
 
-inherit distutils-r1 eutils
+inherit distutils-r1 optfeature
 
 DESCRIPTION="Statistical computations and models for use with SciPy"
 HOMEPAGE="https://www.statsmodels.org/stable/index.html"
diff --git a/dev-python/statsmodels/statsmodels-9999.ebuild b/dev-python/statsmodels/statsmodels-9999.ebuild
index a5784025a635..37a2fc6336eb 100644
--- a/dev-python/statsmodels/statsmodels-9999.ebuild
+++ b/dev-python/statsmodels/statsmodels-9999.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 PYTHON_COMPAT=( python3_{6,7} )
 
-inherit distutils-r1 eutils git-r3 virtualx
+inherit distutils-r1 git-r3 optfeature virtualx
 
 DESCRIPTION="Statistical computations and models for use with SciPy"
 HOMEPAGE="https://www.statsmodels.org/stable/index.html"
diff --git a/dev-python/stevedore/Manifest b/dev-python/stevedore/Manifest
index 436510e4b9cd..13e2d19be6e5 100644
--- a/dev-python/stevedore/Manifest
+++ b/dev-python/stevedore/Manifest
@@ -1,3 +1,7 @@
 DIST stevedore-3.2.0.tar.gz 510559 BLAKE2B 69faa75eed9efff36a0dd5f91730dd22936af646bd54e1f8c47da5d3bc3d33e949714ac81898747336bcd8acbdd1bb2addc68fb64add825493ad29fb22393fee SHA512 89b6c88ff41bd9429561886fa2e7cbeef1658e955266b61e1ac9809812ee8e290ecb39819618a12b1a6e080d2e86ea03d951a0a31f7ff4920d8b22bb55420439
+DIST stevedore-3.2.1.tar.gz 511635 BLAKE2B 82f2a2f385018db799af45f444b90e34ca2fb5f1bb03db654315aa80f456a51415a11c692d27d4a5d4f5fc4e3f52d6fbee5ea8c94225cde6f14fcff8be6905e5 SHA512 1a1fbfc44ab318ae21567412c8f112de898c69fe5dadc82141a82048f6006f16c281159aca3411c4c81f492495232c338d260f2e6f0595dc6cf6203ac1595af2
+DIST stevedore-3.2.2.tar.gz 512174 BLAKE2B 60061f04cee8b4ab1c95ab7c02083abd15a623970168df379c82860bb2ea9b27171f5862851eb194c88001b02878eacab4428a76cbfbe528e7246b3e492abfe1 SHA512 1c3f81157b16af800c1caa971f063c50638a70eced582dbcffafaf7d9bbd4e402f75003fcd73b3cb85940bbe9027bac24e37754ffcacffb06d133e938e07ebcf
 EBUILD stevedore-3.2.0.ebuild 1119 BLAKE2B a542b4e9dba2e54def5cb10ad288ab2c77ba602c52d455ee7ad1435660423df4b81c0d8ef3663a07a6ee0e99fa9509566f61ddbb4046888d67a676046c3cca3f SHA512 9d2cf7d8898db0692176b1b7e6813ee3d9831510156931acca77901ad5743579cdc52c3c4e97c7d3c662b33e4a3f1076ba4f4655d06ed16370ea6c3a46864833
+EBUILD stevedore-3.2.1.ebuild 1124 BLAKE2B 128ca4f978a6499ccfe9e7b0c4ea3b2f945785c8c4f36e3d2e9bb7054b5ffb20d67629651cec90599effab949e00466434ae232b0dd47899946380371fb58382 SHA512 1b259c89d92fecd9cf9a2c17a89a9eab047419d346ba37160a5de4e3694dbd89c16b0f625a78cc21280edd68dc044aeb5b8c2d52b28ce40646832e988bfc1d24
+EBUILD stevedore-3.2.2.ebuild 1124 BLAKE2B 128ca4f978a6499ccfe9e7b0c4ea3b2f945785c8c4f36e3d2e9bb7054b5ffb20d67629651cec90599effab949e00466434ae232b0dd47899946380371fb58382 SHA512 1b259c89d92fecd9cf9a2c17a89a9eab047419d346ba37160a5de4e3694dbd89c16b0f625a78cc21280edd68dc044aeb5b8c2d52b28ce40646832e988bfc1d24
 MISC metadata.xml 521 BLAKE2B 6ac47530dc97a775a197bee97ee62ef419c402a134cb6785ba953a9efdd94bf0c4a79f01dbb7142774e9be25087334efbed7ad1f00b68544cdff9de8807078e5 SHA512 549144ae7c90fffb566c473e7301e3a461b47911cf7d2b1c03b5d0a39b1508f3462365e0ab27f5638d08c677556c8d2348a33b5fa018c68a5c64b2965a545fd2
diff --git a/dev-python/stevedore/stevedore-3.2.1.ebuild b/dev-python/stevedore/stevedore-3.2.1.ebuild
new file mode 100644
index 000000000000..9bd342f667de
--- /dev/null
+++ b/dev-python/stevedore/stevedore-3.2.1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+DESCRIPTION="Manage dynamic plugins for Python applications"
+HOMEPAGE="https://github.com/openstack/stevedore https://pypi.org/project/stevedore/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~sparc ~x86"
+
+RDEPEND="
+	$(python_gen_cond_dep '
+		>=dev-python/importlib_metadata-1.7.0[${PYTHON_USEDEP}]
+	' python3_{6,7})
+	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	>=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
+	test? (
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		dev-python/testtools[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests unittest
+distutils_enable_sphinx 'doc/source' \
+	'>=dev-python/openstackdocstheme-1.18.1' \
+	'>=dev-python/reno-2.5.0' \
+	'>=dev-python/sphinx-2.0.0'
+
+python_prepare_all() {
+	# Delete spurious data in requirements.txt
+	sed -e '/^pbr/d' -i requirements.txt || die
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/stevedore/stevedore-3.2.2.ebuild b/dev-python/stevedore/stevedore-3.2.2.ebuild
new file mode 100644
index 000000000000..9bd342f667de
--- /dev/null
+++ b/dev-python/stevedore/stevedore-3.2.2.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+DESCRIPTION="Manage dynamic plugins for Python applications"
+HOMEPAGE="https://github.com/openstack/stevedore https://pypi.org/project/stevedore/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~sparc ~x86"
+
+RDEPEND="
+	$(python_gen_cond_dep '
+		>=dev-python/importlib_metadata-1.7.0[${PYTHON_USEDEP}]
+	' python3_{6,7})
+	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	>=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
+	test? (
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		dev-python/testtools[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests unittest
+distutils_enable_sphinx 'doc/source' \
+	'>=dev-python/openstackdocstheme-1.18.1' \
+	'>=dev-python/reno-2.5.0' \
+	'>=dev-python/sphinx-2.0.0'
+
+python_prepare_all() {
+	# Delete spurious data in requirements.txt
+	sed -e '/^pbr/d' -i requirements.txt || die
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/tabulate/Manifest b/dev-python/tabulate/Manifest
index 9e02554ee4b4..3fa027446364 100644
--- a/dev-python/tabulate/Manifest
+++ b/dev-python/tabulate/Manifest
@@ -3,4 +3,4 @@ DIST tabulate-0.8.6.tar.gz 39420 BLAKE2B 28cd8c175b258b56a406a78d7891919a49c867d
 DIST tabulate-0.8.7.tar.gz 40800 BLAKE2B 4e15ef79d152ed6a01fcc88496aed81462e2ac5c5aea1a9977eca955d3c6d743019f8c56a48ef268217cdd7c2780505c4837020ff8cb1bda442304d82e560a5c SHA512 77eb619d3115bbd574ff72b82d55e09f1e2bfe29da0b937b72930b3e65423135722bdc54bed818adf2e25cb49a58f8f85d0ca3b3ed0fcfcfda34a25e54781d0c
 EBUILD tabulate-0.8.6.ebuild 897 BLAKE2B 0b1cb786af5d36b5bb38e0c7e9f62de8443d09c5f631fb9bc27092ccb7d72b824bbff3a72ca8f5eced2b7dca96650cd79d16752753e6655a3e3eca009629c5e8 SHA512 4cef430fb5b07e44bffbe165248efeaf2681d5954cff51632995f1d63eea55ee19261ec9b9ce563fc80211cf1603cf93748cd4220d3e85485d66cd2cee8a7048
 EBUILD tabulate-0.8.7.ebuild 899 BLAKE2B b6a64377bf99713802019f353a55018b8d22c1d476297d705b604c8c3e3def0194102829d9c42fa653d4a0fd86b9be52ff50c5a247321d6d6f2e3c3ae1fb748e SHA512 3e3862147fefaa76ea9c5c4bf818735b60961de5b921a3de62264b2d563b1212b90226b1c7b6421ab7ec38c6bf0a079097b1b9f63be4428294844f765ee0928b
-MISC metadata.xml 321 BLAKE2B 8b68baf97f22e2360ba30d2a86e181492217d12162d7717d3f69dff5a51926867d5ac8a227fa93c345e3ddb80036ba97839e7ab22aab5df27ec974048b666a41 SHA512 4967ca411c6ee428e897be2be259da008f9dec1991754235f0e8f79d64b5175e69d460c3cfee72f49faa41704ebda3c46bb2f30fc157e95cec4d8d60ae7ba89d
+MISC metadata.xml 346 BLAKE2B e13b78a2ccbf8c7ab6c25c7d5074b5ee6edb2f9901047f8ba6658fff33fbbe11deeeaf7915925d7b49c98b082ef395dbc9eba28ac2e06d97ce3aa2a49d9dee2e SHA512 63130f8d0d3e57aa615bcc159df00c6594676eb89fa212a94444836f19682ef466c9df4d75d267f68b4de6c524ff79cab5d65235a515230c09366cb34209946c
diff --git a/dev-python/tabulate/metadata.xml b/dev-python/tabulate/metadata.xml
index 4d3a5455d953..76f47821e8e1 100644
--- a/dev-python/tabulate/metadata.xml
+++ b/dev-python/tabulate/metadata.xml
@@ -5,6 +5,7 @@
     <email>python@gentoo.org</email>
     <name>Python</name>
   </maintainer>
+  <stabilize-allarches/>
   <upstream>
     <remote-id type="pypi">tabulate</remote-id>
   </upstream>
diff --git a/dev-python/tblib/Manifest b/dev-python/tblib/Manifest
index 4a6746989114..b703ee59e3bc 100644
--- a/dev-python/tblib/Manifest
+++ b/dev-python/tblib/Manifest
@@ -1,5 +1,5 @@
 DIST tblib-1.6.0.tar.gz 31450 BLAKE2B a1efccab5c6363c166ef73e8e03750d1f47993684fda662065f9705d115347cf4b2ed3438ef375e3d14a0dbc35ceb234c8357ee33d2ac9e3a94b66bec3670b3a SHA512 3b11b94f341499f648c182e7a9b6c648b5312a18b3f23bf7e5d554052db4ffb7c4a4faa097bc2426b4159e28f0578c6b369ff4d02eb7711726b5359242216d35
 DIST tblib-1.7.0.tar.gz 33074 BLAKE2B e05b94b9a36efde4d3fe76e9b72502674554e84e49916ea585de4f6cf9e898d1544535b1a8935fe15ffc100fcbf2b5d4f9edfdcf0ce5c86d479f2f412d3ea83f SHA512 10dcff18a1da386d9dd6bae35608f4a2d3bc8f87c15fcf49d886f98d95a6defd348ef0dc5637e03f4c553a933a0ecb4c215cf15b1e78fca58fea10052f9fb4e9
 EBUILD tblib-1.6.0.ebuild 548 BLAKE2B b5cc563baa22a6e78b60c55c6f64d8ec87173c97a439f1c49454385a79857e3221035b1fc2e15211c932b16fd546212e37ff58525650796714197d459dd9e775 SHA512 2f8c68a8ec6205586a7a9e0bfbc0bea2cd3f187a78219e2f6877596054e48c2fd766be266bb591cd697e872e0c8d2cedd2f0db60a991f2e82e11ae3ed57aca1c
-EBUILD tblib-1.7.0.ebuild 556 BLAKE2B 09003f4b734347c8233b915a2ba8c376ad39499d49d8d781ce896215eaca1701ecb3937c5de965263bb38904dfb68bfca108590c9ba1ef63c5052590d540c9b5 SHA512 99c91505c6e42af638441b13bedadcf81434f215335c6a49a30f7e299656208d165719d7005e1fbc070ea12a8068b0f7f840de5ccaee29925424db1debae9378
-MISC metadata.xml 380 BLAKE2B 2d2d82601724f6960ddd56f2c45b5e85c30bf1366c6bcfb6b6810e885c87bf974c7dae1cf0a4d01a5bbfcfa9c5b2bb8aca6460047f549786527b5d1742b315c2 SHA512 649b0a9457aeb0b3e211e293305a8bd93f0ae1c91c5c31f2d7d1d94c55eabff5df4f7bda64c19d07b216778cbe7bb68dbdaac3a06d9a627a06b8f205fe818d40
+EBUILD tblib-1.7.0.ebuild 553 BLAKE2B 10ad1ca319e48d4881d7b2c9938eef7ae39da25160b45ad0de47129a085415921cd0d6da7c69e8c1ec4125aed5b33a6c5c087a61b02cd5cf1e44ad64a3d228e1 SHA512 158042a7c8cf4f759db56e1ddb06684a86be2c6c4f9c6ecb8b871215a8595919b14a33fa853822c266f10b67d2e153881168901aad3bf363619628ac1007ea75
+MISC metadata.xml 405 BLAKE2B a9cb9a48ed88b8e80a16761949fcf8973512ec76687eeec4285f65bcfa1b60a92159aead88f4fe9facb2cc2e20bc3e0577c68f862e3bdc296b428918bde3db00 SHA512 b4616a156c1c52141dbfa07452a2f8a22828d8c2a2be6d857079a6246cfe4c773f379c3932d5156f7ce6e9606e8443971089223af87f6d725c7aaa2027a4b994
diff --git a/dev-python/tblib/metadata.xml b/dev-python/tblib/metadata.xml
index ec6fc75c9c1c..e316df07bbd7 100644
--- a/dev-python/tblib/metadata.xml
+++ b/dev-python/tblib/metadata.xml
@@ -5,6 +5,7 @@
     <email>python@gentoo.org</email>
     <name>Python</name>
   </maintainer>
+  <stabilize-allarches/>
   <upstream>
     <remote-id type="pypi">tblib</remote-id>
     <remote-id type="github">ionelmc/python-tblib</remote-id>
diff --git a/dev-python/tblib/tblib-1.7.0.ebuild b/dev-python/tblib/tblib-1.7.0.ebuild
index 437f2c2d4915..2fe903a543ca 100644
--- a/dev-python/tblib/tblib-1.7.0.ebuild
+++ b/dev-python/tblib/tblib-1.7.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
 BDEPEND="test? ( dev-python/twisted[${PYTHON_USEDEP}] )"
diff --git a/dev-python/tempora/Manifest b/dev-python/tempora/Manifest
index f525a2569bb2..f26f0dac00b8 100644
--- a/dev-python/tempora/Manifest
+++ b/dev-python/tempora/Manifest
@@ -1,5 +1,5 @@
 DIST tempora-3.0.0.tar.gz 21500 BLAKE2B 7bf241d5ab60c78c0ea56df6b28e33504200eb5427cdffaf9d5f34da202c3ba4550fa4dcc48874ee870345fa5a10f2b874687fe7de2bbe049b1c14d05161b0e0 SHA512 2d397c1d17bb4c502817ad0278090137fb8ca00273c63a7336200ed7e621a99cd5c954cdc2da00d06eba34ed4f079429f5ddc68b928cc83feacb2335f995e1b7
 DIST tempora-4.0.0.tar.gz 47217 BLAKE2B 3f8489c584768c074874fd299d11ca71b51c646f07792ac910dbd3fa76c309a866e599204364bbc06e6589a6fa046d3150bff05c9d3beb9b427ff409e2c27fe6 SHA512 59792bf03b4ccbdd5b849f0f6b9a0b5f2672e1cc3076b85449b8f183524d23de05588c3a8185550cdb9e52cc610e29db18ed151b8c5f5f25438de41015cc595e
-EBUILD tempora-3.0.0.ebuild 1512 BLAKE2B bd20ee242a1fa86de4b266670289110e6fe0d11aa7e274fc0650fdc0d323376ccb362fbd070aa972aaf959dd257d3704547874a75be991415045cda19d51a87c SHA512 b36730adbf19e408d2a834f0ae5004850e4422f7a8a2f19aa8db493401d9b664d1e039cbb25273ed14916070f84937ebc673521e54c5c8b4cc0961460c610475
+EBUILD tempora-3.0.0.ebuild 1511 BLAKE2B 5076914b2292fad9eb845421042f05c19a8ccef702834ed5419c64051f7d3fc3bc740aaba6185d7b3d16319b705bb71f2feb3e9f39a6f4ab1fa929368f3530ab SHA512 c3fe5e474d92c3aa5ba417a1573648166b4d08906294494e4b726a0e2ddd6af726de1d5935619093ce9acaffd34586c30f36e121b56b9625b809f08ce12b3052
 EBUILD tempora-4.0.0.ebuild 1052 BLAKE2B 27ee5e889a1701173f255982a0c106e7cce3b4ea708783fb4ea8d2cb71fe309004730c5a2ba56540082e14e34ad51ae56fd815c61071f8769cdb366487ef55b8 SHA512 f52cca94743848f46e8a35b616c12c1baf2842f934d7c8e6f0da8161380d87a78aaf33b465e9c0ad2016c9c47b8b69ca79708ae6142119d4eafff53d2f6dcc6d
 MISC metadata.xml 615 BLAKE2B d393b579842c51e2dea6da1afde0a5571d5034905a9a4d5f4cbfa70cd80e918157ffbb1f98fbcefed28ee6c1ba20dc64e7583ea7ebd82fc1b8f9d3e57dc796da SHA512 7346fb2daa80f58a819462fe96220fa85d242795e24cc2fce5be013f4f0a678e1201b2b56bdcdd2881d95f0fd93386f47e900492862ed8b54e90ced91dd27f33
diff --git a/dev-python/tempora/tempora-3.0.0.ebuild b/dev-python/tempora/tempora-3.0.0.ebuild
index ef04ec574011..e457ce52409d 100644
--- a/dev-python/tempora/tempora-3.0.0.ebuild
+++ b/dev-python/tempora/tempora-3.0.0.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_PN}-${PV}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ~ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/tenacity/Manifest b/dev-python/tenacity/Manifest
index ecb5c430a700..8fb481e46337 100644
--- a/dev-python/tenacity/Manifest
+++ b/dev-python/tenacity/Manifest
@@ -1,3 +1,5 @@
 DIST tenacity-6.1.0.tar.gz 33438 BLAKE2B e3f7c0ef19f98c0ac5b2a9a1be53241292d895547e5c10810ff94c27f34e8bbca7ef3aea79ce6e4042c84109e209b4be2913e6231233a3b050c18ed52f8af087 SHA512 a8f52f77e066a35c4a35cdd80fe01922613d9f4ca07975aece4a35bc743475f7540bf419e5095eacf94cb248ce33bdd89b46c5e3c5bd5a93bd99a601cf580732
+DIST tenacity-6.2.0.tar.gz 35213 BLAKE2B 830953463ef9d7ee9e99fc0c9d3f55910754f4c2c777110ad8af65b0af186b2aada25ec3d9ae80f266ad9200080db1af70b80bb77f1edc51148001ca49e0bd08 SHA512 3753ab44390810458c559d243bdc5e3c0092a0c2af7eb4e6fa43d5e6e215a58d4bf3ff6e81800db2f517796b501fff038964b424e364ac417ddd3e70b57bc6c8
 EBUILD tenacity-6.1.0-r1.ebuild 608 BLAKE2B 7a3c9672d856039254946a764852fc70cb17e2a44fd499d801cbd3ac948bcc1c39f1f8bf96ff9978a0a956e1e7ea3af5fc104d4fb662aa6e29f30924251e3c13 SHA512 47c15546d862e77b94082364219e9e32dfb391351be9965e7c7b6f4bda719c6e79da006bfa43177da0fdb0d88f714d890733cc39f262caba5daa94be93d74b81
+EBUILD tenacity-6.2.0.ebuild 706 BLAKE2B b6a6b06ce2ea53c617b2b77ecc4b17256af5010121c1c0244b483b352c734cfa7761ac7fa30773d2e798f276de2dc6e2bc2ed6746bfbcc1f23ecf411c811e785 SHA512 65d70a04e25fbac61e0dd272bae27c218d3e9b8b8f0df425b8100725bdef7f47cd8f24b09f719ca8bdaf0921ca6f4b343d6b630e80eb4459cf63f34a54d0a934
 MISC metadata.xml 730 BLAKE2B 11af1697135e424eec2e9a719f67a747e3888cf9e501fc65b99ef1eff28a153b47dc5e827792197dc9a19d1ff16c03a8c0b95ce44c177135ce44452ae3e097e1 SHA512 0b355562b481aebb7daf0940cc5548dc33e8252ae39e8bbd811f957f6253aa481c0fd02fefb7b30672392af50d5aa69731767915d47cbf83b71788cf8f5a6144
diff --git a/dev-python/tenacity/tenacity-6.2.0.ebuild b/dev-python/tenacity/tenacity-6.2.0.ebuild
new file mode 100644
index 000000000000..33a571a754a1
--- /dev/null
+++ b/dev-python/tenacity/tenacity-6.2.0.ebuild
@@ -0,0 +1,32 @@
+# 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="General-purpose retrying library"
+HOMEPAGE="https://github.com/jd/tenacity"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE=""
+
+DEPEND="
+	dev-python/pbr[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+"
+RDEPEND="
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/monotonic-0.6[${PYTHON_USEDEP}]
+"
+
+python_prepare_all() {
+	sed -i '/typing/d' setup.cfg || die
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/testfixtures/Manifest b/dev-python/testfixtures/Manifest
index 68e1042a4ea0..cd227675804b 100644
--- a/dev-python/testfixtures/Manifest
+++ b/dev-python/testfixtures/Manifest
@@ -1,3 +1,5 @@
 DIST testfixtures-6.14.1.tar.gz 114969 BLAKE2B 21e6b377e24240cb275feed2e160da256ca75884c5a6dc842364986031c3cd21fb1b5bc13f3e8780354d47179e6c038cb461a39a04d34bfc8beebbf9809d6431 SHA512 0da31d5e382984c22ada846c07570d4a179ba819005dd29891e551b99190fabaaf17174456f7ed4864e9c4aa25f7d5d8b86aa123b4628328610d6930c9c5d6bd
+DIST testfixtures-6.14.2.tar.gz 115229 BLAKE2B 311ef13cc6f596aa9d4c54c0cc02e25c412704eefa3474c3a078f4f50ba556e9872d3ecff3d122443986f0917b2e1c6fff8315d20bd319dec1148fd9851321ba SHA512 fbaeefc439a755d9f9e5ee223c6ce00288adfc2d12c9bef70ab06ea7bc4e9757d7a2429ac8046f7171aca1ac7d667f8a26168cd711f1cc4c719d66bbe8210cc6
 EBUILD testfixtures-6.14.1.ebuild 1497 BLAKE2B c70168019185c9e49824e4e3cffb3f45fe28ab3a8782bb35f7b7aa4089b824b62fb05c5041bd0bddc3507adc2b4863a5d15901599ee4e0a21386907a8406568d SHA512 4b0f50aecf8a3da34701e52f7b3009df706f5beb69624748d32309868a77e767b31c119db501a37b550f2459708aa4167b19719b2815d3c910b94f9d7ca2411b
+EBUILD testfixtures-6.14.2.ebuild 1499 BLAKE2B 0b2bdf8ea2c2b75d1a0e45f160c51ae2fa9e3c969241ab8f58b6967295e06561f902624b91c8a2e9c330e89680788b7f40303b49a4c68dfb6898dfbedf9d9fc6 SHA512 20d27749bf48dd38b979015c9360592c3bf4e49bf726f4b99e268530c6ac4fcaf6668c0b8b658481c1a4a4f3c452e8dd3cd96da07e8e958f576ebac504ea12c5
 MISC metadata.xml 415 BLAKE2B d3e133602f86d013faf5998b2e52256dca88ed9593b9ea26bed0277b70823eda4dd27deca7488a7f66fac2f77e3312cddf833a4b865cf400c7e78a4d267a4c5b SHA512 78fd16b4fd4e8ea3f244b3d8fcce8451a38713d0374df3d2661453f2ad06af587b4613c9119b11bf4cfe3d226fd04620bfa74f58f2660e44ba7e84b93c99c20e
diff --git a/dev-python/testfixtures/testfixtures-6.14.2.ebuild b/dev-python/testfixtures/testfixtures-6.14.2.ebuild
new file mode 100644
index 000000000000..e5277b293383
--- /dev/null
+++ b/dev-python/testfixtures/testfixtures-6.14.2.ebuild
@@ -0,0 +1,56 @@
+# 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 collection of helpers and mock objects for unit tests and doc tests"
+HOMEPAGE="https://pypi.org/project/testfixtures/ https://github.com/Simplistix/testfixtures"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	doc? (
+		dev-python/sphinx[${PYTHON_USEDEP}]
+	)
+	test? (
+		$(python_gen_impl_dep sqlite)
+		dev-python/django[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/pytest-django[${PYTHON_USEDEP}]
+		dev-python/sybil[${PYTHON_USEDEP}]
+		>=dev-python/twisted-18[${PYTHON_USEDEP}]
+		dev-python/zope-component[${PYTHON_USEDEP}]
+	)"
+
+python_prepare_all() {
+	# Prevent un-needed download during build, fix Makefile for doc build
+	sed -e '/'sphinx.ext.intersphinx'/d' -i docs/conf.py || die
+
+	# remove test that tests the stripped zope-component test_components.ComponentsTests
+	rm -f testfixtures/tests/test_components.py docs/components.txt || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	PYTHONPATH="." \
+	DJANGO_SETTINGS_MODULE=testfixtures.tests.test_django.settings \
+	pytest -vv || die
+}
+
+python_install_all() {
+	use doc && HTML_DOCS=( docs/_build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/texttable/Manifest b/dev-python/texttable/Manifest
index ec14d184c3a3..6594f3f0248c 100644
--- a/dev-python/texttable/Manifest
+++ b/dev-python/texttable/Manifest
@@ -1,3 +1,5 @@
 DIST texttable-1.6.2.tar.gz 11450 BLAKE2B 8090914b20a93283ea3d533a8120d4d2c5f058a0e79550b29d4b9fa740db5e309d84a7983fb6665149e3624ba7039b67ff6a553b180b915a348e5b53e793d5cd SHA512 e59275c64813bd00fa5172c43491820122b6045e1a416c917576cbf595c1ec24d146e571708379f4b32775bda904f16ced0e9e15ab7b2dde78a214f26a1c4de6
-EBUILD texttable-1.6.2-r1.ebuild 676 BLAKE2B a0751b9b176128f312fb480d111da09d8f8b7560c88614c1df2da6de9c08027e67ef53a70932b9af06162a54654f5810969b277217193e062327b213b37429b2 SHA512 2663504b7283fc6ca08b0f291819a080b3cf97c3105a7755b4c8d71ca1b21b58b8f0b3242ce26cdebc131e9b86e61f18cb62991cdf8d59b01b36d20eb239e6da
+DIST texttable-1.6.3.tar.gz 11574 BLAKE2B aebb306acb89f62963e9473ab6e22291a1ec93993a0106ddd2943f656737cb0960a10e680a69b6577ebb8ac0af3c6ecdfd8c58647a6ce37d9a6531e41f61f480 SHA512 89a26ef7d9947ec4edfc5791c91f2ac327c79bbc5aa0e0f89c0a63dbd80bc420027af073da935254faa143b9e8bef85a7bb352791b45b0cd60c7bcf569869f2d
+EBUILD texttable-1.6.2-r1.ebuild 687 BLAKE2B f9166a9a1364136586bbf9804b4fc3ff487f09fc7c71a7adc79b00ae321160b6ce459d0dbb6237e03415fbf35117ba416847e6aced27f7d4db50c9eacbf3326b SHA512 8ba46681108c58e1d28e404ffd45dff41607278e7c744cf571d66c954742bb5b7be11265e7b70f03423fb3c478b19b7b9dee2b462a196c9948bcbbfdb1e69de0
+EBUILD texttable-1.6.3.ebuild 689 BLAKE2B 23613bee79e9f8c4fa4feb08f6c37a235837397f55745bf7dd5b23677193b6975fa1ff117543c92393446508e2f776bb32a2726113666a403b2deb2808f92c45 SHA512 fe010e0b51740d73a4a5e22f96cf162395d9cb74f01b11c4d4af596240a691d654fb38f416911b952640a097714aff07e5ce7a5d14ae4cf132c0ebcf646c9b56
 MISC metadata.xml 330 BLAKE2B ee4c551d00203affdb9666d0d3f58541249543f6aa6a586fda4b028f3b9c5255e61abdc6ef9faf62d1c6dda4f60afed5c8af2090bf6c54d229681c567ff6299a SHA512 900e4bcdc1580e4dee2ab5298c2b1115e0942d95c410d76dbf6cb062f759fecb3d633d9e7f223e92d997ce88d98c2a3d719cdf7cdcc7625a78cc5b3294c3ddec
diff --git a/dev-python/texttable/texttable-1.6.2-r1.ebuild b/dev-python/texttable/texttable-1.6.2-r1.ebuild
index 9a89499c0207..1c3c33958eb0 100644
--- a/dev-python/texttable/texttable-1.6.2-r1.ebuild
+++ b/dev-python/texttable/texttable-1.6.2-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 PYTHON_COMPAT=( python3_{6..9} )
 
-inherit distutils-r1 eutils
+inherit distutils-r1 optfeature
 
 DESCRIPTION="Module for creating simple ASCII tables"
 HOMEPAGE="https://github.com/foutaise/texttable https://pypi.org/project/texttable/"
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/foutaise/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~arm64 x86"
 
 RDEPEND="dev-python/wcwidth[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/texttable/texttable-1.6.3.ebuild b/dev-python/texttable/texttable-1.6.3.ebuild
new file mode 100644
index 000000000000..16349f82863d
--- /dev/null
+++ b/dev-python/texttable/texttable-1.6.3.ebuild
@@ -0,0 +1,29 @@
+# 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 optfeature
+
+DESCRIPTION="Module for creating simple ASCII tables"
+HOMEPAGE="https://github.com/foutaise/texttable https://pypi.org/project/texttable/"
+SRC_URI="https://github.com/foutaise/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+RDEPEND="dev-python/wcwidth[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
+
+python_test() {
+	pytest -vv tests.py || die
+}
+
+pkg_postinst() {
+	elog "Optional features: "
+	optfeature "better wrapping of CJK text" dev-python/cjkwrap
+}
diff --git a/dev-python/theano/Manifest b/dev-python/theano/Manifest
index b01646a380cd..037e8c4ddbd0 100644
--- a/dev-python/theano/Manifest
+++ b/dev-python/theano/Manifest
@@ -1,3 +1,3 @@
 DIST Theano-1.0.5.tar.gz 2842778 BLAKE2B ee82e9487a5265a1040750ace70465c450134e70eba4e58752cbaa7d487be5fb3cce31b838429cb52f7bc31d32a20379e158ee289dd5732dd8b86a9ee36b6d89 SHA512 6bb27753957d32392ea793e39ea56eff94baafbb55e27488f9c0bbdb387172a6829e64f461f83dae192486d9764b72d815e3b8dc059b2af116b024fc7228a118
-EBUILD theano-1.0.5.ebuild 1068 BLAKE2B 8a9a875661e7d0e1f250e78d9851343a4e1ea8ae03fbc050c31afe975c69c8dd617b917539da0788b2723952039375b3f760036e952c11de17996e743a703e5b SHA512 3607caaa7b0d4c3a8501da5f0ecf19051b1de8887ff9a08b5f076f58043360e8ac906e2f723564de3503955f1ffbb5a2e29a681a2161915bc00886f60fe6f113
+EBUILD theano-1.0.5.ebuild 1072 BLAKE2B af43558b49ab1f11419d378aed28b4519d165a65b80243bc9968f557606781d406038a336ad5a6949c25eb9630f8a6b7ac309261b22a79e0e18104652af58183 SHA512 ebc4dcff7f63300e408d0bc17c0c59004c17f15c86faea6b93fd5450120b9a1b3b20169386f2f3277e9b6f2699d43050eb412953cdb5e2f1fcdee0b03eafca32
 MISC metadata.xml 632 BLAKE2B 2bee1d4912596b45d3f5cc0528a927078a072091148dfce38892319b91a0635859fa91dea32565b4a7f5ed02726364a50870bab22197c57ff33c88a48ad9d223 SHA512 653fc6d180455ee24967e70f78682ed2a7e61022d6867390b4c4eb994699b3f293bafe45b4fcf1c4ace3f102acba41c5491e8fb39b9f6102f1022a2c51955ef7
diff --git a/dev-python/theano/theano-1.0.5.ebuild b/dev-python/theano/theano-1.0.5.ebuild
index f96083149264..ca434f006540 100644
--- a/dev-python/theano/theano-1.0.5.ebuild
+++ b/dev-python/theano/theano-1.0.5.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 PYTHON_COMPAT=( python3_{6..9} )
 DISTUTILS_USE_SETUPTOOLS=rdepend
 
-inherit distutils-r1 eutils
+inherit distutils-r1 optfeature
 
 MY_P=${P^}
 
diff --git a/dev-python/toml/Manifest b/dev-python/toml/Manifest
index ead046da15de..0090390f991f 100644
--- a/dev-python/toml/Manifest
+++ b/dev-python/toml/Manifest
@@ -1,5 +1,5 @@
 AUX toml-0.10.1-skip-numpy.patch 1105 BLAKE2B a3cb255be800f833a5bf32b3860b7d6737b1c02b8f42079b99393ed49daac05659cbd9b9961de86160dfc7e995e5eb783c855fe2e4a3f1e75597e672dc8b3a4f SHA512 b51112969c531d465e83616690dc8c0098c3a3bee6ac56771beedbd92a0a0e7d79a4ee96e2961881a56b166283c2cdd4ecd75bb26bd0173c405e3fbe738b7f9d
 DIST toml-0.10.1-1.tar.gz 22559 BLAKE2B 17d9d9c78f2b78a6fc5bc0efd8530af5514d2f965eb1896a0eaca9a6d8ce1dda3a5dc825a8b6cd2a2096a582bd35952e6f0a3372021c739c69186d5a2c5642be SHA512 0a2348bffc889e63f4c6f8ae4faf022cceff069b178d086a37ff03e97e0f24b4b5a72810a345692f21810f3f41908b6981da902862adb06286bdb2941e9e0d60
 DIST toml-test-280497fa5f12e43d7233aed0d74e07ca61ef176b.tar.gz 19593 BLAKE2B e9deba7c5d1eea7bd87fcf5e5c74bda4c2b9e9686e597e3ad51516f60eb8d192fb01d052ac57729c6f0851e2715cc6409a904affd637c9b099cabc1b12ad5d52 SHA512 7bd69b8c14f09bf431094b52d988eb233922527719ba5047ff769d2e709c2039fb6fb1c8144e630ad2a58835d19e0e4cc51433a427596d37f8eccb6d73d7e5c0
-EBUILD toml-0.10.1.ebuild 1055 BLAKE2B 8deab8451c61121c04811124f1dcfba838322230fd29ccf2e4e87bc7cfd758d7bfb92971dfc8a0fb3efe223a7230c4fe57d9fcb79cf8e75073692a16d70dc07f SHA512 56f6c554bbf46cbdd383708a63fa2a831940a86a5f57b4ea7a8ad2939fcc379da733ddac5e08fba4ce083a1ab2914eb84c646457b4e56f645ac7c22de763daf2
+EBUILD toml-0.10.1.ebuild 1062 BLAKE2B 9cd2d534dca07a37e4a7114f90cc3a991c74edde6be0463ddd996e104ca366052ef500ebf489e6560c887df4b71f02ff4949c4f97bd304f74af4ca3b4f92c379 SHA512 ae943d678b80442f02d48db6369d54faeb24276383d12576bcc7d774aa5cd8ff9acad71e481ef344a8d5835aff45f493f55b3a62ded2f9f8a4375f41826d28d2
 MISC metadata.xml 349 BLAKE2B 2616a9e0b3c28e61eed2c14cb21f10bedfa7440b2e82a132cb2b26356c2f79f0a4a73d42b59dd6a8e1eb03af8700e637e851664eff281d84bace343a4b0f9ca9 SHA512 2840c365fe21c27f1bfe512a2a85312116477427f4cb1325fbbe4db2c0f653fa8af7c8ca5c6160e5c248a5e055146d6e1d1bfbe563de6724810c319de2138f30
diff --git a/dev-python/toml/toml-0.10.1.ebuild b/dev-python/toml/toml-0.10.1.ebuild
index e17ce0ef4b9c..08356fa1836c 100644
--- a/dev-python/toml/toml-0.10.1.ebuild
+++ b/dev-python/toml/toml-0.10.1.ebuild
@@ -17,7 +17,7 @@ IUSE="test"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86"
 
 BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
 	test? (
diff --git a/dev-python/towncrier/Manifest b/dev-python/towncrier/Manifest
index 44d9e16be031..54fd1545bf97 100644
--- a/dev-python/towncrier/Manifest
+++ b/dev-python/towncrier/Manifest
@@ -1,3 +1,3 @@
 DIST towncrier-19.2.0.tar.gz 18089 BLAKE2B d1e17e707b90089b19d9eedebd898b71fcc9a582cbae0166650a6bd52a8ac6bb3921a458a6d2c10e5930b92230ddf5efc5a428646c464edb6eb4bfc06949e217 SHA512 60999446c4ae404fb54ea6282a862621d49f62a2488d31eecf8fed9dd7afa6e01f4feac6e3dd26b882ee75f747424d63d05521e33b5f6b8df7059ce32dbe5c4f
-EBUILD towncrier-19.2.0.ebuild 915 BLAKE2B 65e95cd364e4aa85132d560eb6521c4e4ede943cd9fd39293f44bc182b4e10b0ba0ea51223f9d89ec1b8c4611c496c56c9fc07850e003345bbf2ea9b8c3a014c SHA512 8d38fbfe2b0a204022e820c5c01afc14d9ff6cfd5c182345b0699dfe95123b4d111cbe75d6a68c574e2850190f7a3aa6324d7bd3408609682281fc7ac26e9bd9
+EBUILD towncrier-19.2.0.ebuild 922 BLAKE2B 9a679070cc26f514d3d4de078f8526d6b739359f6296e1cec98af79722a9c16fd6bdb7ce7a9ad2ec521c1c0ae489128ea93340535b75a4280d2eb7a99cab9916 SHA512 fad41c68e7c31da1ea008634f70f2d058d9db022f9a726e99ba0a9375d9c956ffc33ed988eef88b11c39323411f91af6b80eb6ae30cd8dff681773550b89fc56
 MISC metadata.xml 312 BLAKE2B fb9710abb0c693626d09df383f38a85e69b165f13f76aac9ba46da772e04d2679f4898dab39ed4d383854a4338713c24a389b7ac37b797eb78388e696c8191cf SHA512 4f75330d767fd48bd21128ea81256aa5c5031e0898eb07889a5ebf4c2275e7af174e715500a0724428bf8ef5d8051d29d2a489fdcf557b19a88d294b4c85e5b2
diff --git a/dev-python/towncrier/towncrier-19.2.0.ebuild b/dev-python/towncrier/towncrier-19.2.0.ebuild
index dd62c54b8eb8..87c91b811faf 100644
--- a/dev-python/towncrier/towncrier-19.2.0.ebuild
+++ b/dev-python/towncrier/towncrier-19.2.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/hawkowl/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-python/tox/Manifest b/dev-python/tox/Manifest
index 5fbc94203804..494c9dbf32f8 100644
--- a/dev-python/tox/Manifest
+++ b/dev-python/tox/Manifest
@@ -1,8 +1,7 @@
-AUX tox-3.9.0-strip-setuptools_scm.patch 699 BLAKE2B 15c001c0523420c2ae22013cc6729b34b97f1a25f7cddcde53f752dc11e1329d66522eeebbbda00bce58781c96b622ce4cd22127902b5ddf34b43e5197577792 SHA512 6c23dfa907303a826595cc7ff897212272841b151b574596d401b87bd441d26599c12b36bc08a5659af3e6639c20773c866df7b53c4230bb3eea86986253eb07
 DIST tox-3.17.1.tar.gz 294492 BLAKE2B 1a2ed9a26ad366a1ae7343289b45a338a8d2a58c1b6df2aaf716a2e8bbcc1cbc797c70fb51665411cf1bb69243aa8415f7fb7c82d78afb2ffb7117e4ae75edad SHA512 b084d4552609c90d006573dc95d46d0b27cf53c40a54465040e3c625b5d33eb19f95f3fa488439f11029e30ca414ce4e9ed6793a44072023826bc1f4398aaeeb
 DIST tox-3.19.0.tar.gz 296499 BLAKE2B cad41c7791108ecdf6efc7bca99623c66d1d8ffbb2b06688eb84e575f14958ba2b497e0035ccc331fc8e0ce667824cba2c8dd37488ac48b3c16902c7b546074b SHA512 7a542282dc2fdef7ab8aff04372aeeeaad54b83bd7f1022c1c60465604d67a5984abcea7d409b8593b646192407c78cb88422aa4dfd11fb2a2d9da520aeafb39
 DIST tox-3.20.0.tar.gz 297432 BLAKE2B 279a6d407c4a490309843ba30e62fe2f0c6ace63af2dfd5b5c2fc8ee6ab784b99da56e9d7d76cd0170f85432bef500c31b824fee32558f7f21d4491385d13b4a SHA512 eb8e55eb3c232356cdb3e1477399ef055df497f1276f0b5c5423f30c780e2619067d1e44c2d6702016e63f96a76d04d0c5e7b6c6f1faa1a98f1dcc5b1cbeae39
 EBUILD tox-3.17.1.ebuild 2229 BLAKE2B 40d7b8dc05367102a5c9442187bd4ef3b1f8a2a0708cd751a9b009723896b67b41bf9705870457d5afc93e05397ff6c944e0b72601b33162377e3ea480bfe5e7 SHA512 f5488902e1a68cabfde1eef47b6180d8ab215ddee2d3788b9f803933b7f4372d9424eaeaaf1bebc653c68bd1dc4722e8e787aa70cdf221ae70c55a11abb2c20a
-EBUILD tox-3.19.0.ebuild 2236 BLAKE2B a23faaf319dc2589304ceb01f48e5a9220d017e7962ad7feb06d2e2c438d3a627e41d84cb8248fbae064073f5eec9a7f021698f567a4de6151382a8f057f04f1 SHA512 0af72e70c86c1844ef67c9a0594e0b2ef5fd79519eb35c01b019de1ce4fcc3c7db575623e1f8dc6f3f70abc8fb679d0eff046bf17f70e73703327312a7b3cbd6
+EBUILD tox-3.19.0.ebuild 2229 BLAKE2B 40d7b8dc05367102a5c9442187bd4ef3b1f8a2a0708cd751a9b009723896b67b41bf9705870457d5afc93e05397ff6c944e0b72601b33162377e3ea480bfe5e7 SHA512 f5488902e1a68cabfde1eef47b6180d8ab215ddee2d3788b9f803933b7f4372d9424eaeaaf1bebc653c68bd1dc4722e8e787aa70cdf221ae70c55a11abb2c20a
 EBUILD tox-3.20.0.ebuild 2236 BLAKE2B a23faaf319dc2589304ceb01f48e5a9220d017e7962ad7feb06d2e2c438d3a627e41d84cb8248fbae064073f5eec9a7f021698f567a4de6151382a8f057f04f1 SHA512 0af72e70c86c1844ef67c9a0594e0b2ef5fd79519eb35c01b019de1ce4fcc3c7db575623e1f8dc6f3f70abc8fb679d0eff046bf17f70e73703327312a7b3cbd6
 MISC metadata.xml 381 BLAKE2B b690863c744dafd1aed2f7ef7b648f3abbebba225bfd14b0c977ba3def34f59a23a07d04dab8ae42d494db7ecfd8b89d4b011200e7ba4f36ecc1c81c3ae67e37 SHA512 620820cfdc3328e19da1b0e7b4db2967510de45e1fba55173474d6b0631b785ebf7e8f1441fc8411a101403fbbc0cad1f919e89563de1939cce66436546a9cbf
diff --git a/dev-python/tox/files/tox-3.9.0-strip-setuptools_scm.patch b/dev-python/tox/files/tox-3.9.0-strip-setuptools_scm.patch
deleted file mode 100644
index f6f78af192dd..000000000000
--- a/dev-python/tox/files/tox-3.9.0-strip-setuptools_scm.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff --git a/setup.py b/setup.py
-index 73f2540..8d6f3c3 100644
---- a/setup.py
-+++ b/setup.py
-@@ -1,19 +1,13 @@
- # -*- coding: utf-8 -*-
--import textwrap
-+import os
- 
- from setuptools import setup
- 
--setup(
--    use_scm_version={
--        "write_to": "src/tox/version.py",
--        "write_to_template": textwrap.dedent(
--            """
--             # coding: utf-8
--             from __future__ import unicode_literals
-+VERSION = os.environ['PV']
-+with open('src/tox/version.py', 'wt') as fp:
-+    fp.write("__version__ = u'{}'".format(VERSION))
- 
--             __version__ = {version!r}
--             """
--        ).lstrip(),
--    },
-+setup(
-+    version=VERSION,
-     package_dir={"": "src"},
- )
diff --git a/dev-python/tox/tox-3.19.0.ebuild b/dev-python/tox/tox-3.19.0.ebuild
index 499658c518d4..8fcf947120f9 100644
--- a/dev-python/tox/tox-3.19.0.ebuild
+++ b/dev-python/tox/tox-3.19.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/tox-dev/tox/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 sparc x86"
 # doc disabled because of missing deps in tree
 IUSE="test"
 RESTRICT="!test? ( test )"
diff --git a/dev-python/tqdm/Manifest b/dev-python/tqdm/Manifest
index 734f729b8c9f..5421f92e0568 100644
--- a/dev-python/tqdm/Manifest
+++ b/dev-python/tqdm/Manifest
@@ -1,6 +1,8 @@
 DIST tqdm-4.47.0.tar.gz 145749 BLAKE2B 77a5efec763a8e58e071ee571077ee0db72d9243308592519ecd2c38f60d6b621fd7362dd87bdd0759a39f25c19cc3cc889e9a8376dc658ed565ca7e19fc68cd SHA512 4023988cef757f43a6f59f7eddc8f40246cbca4994cea91dbb4a788385c0706f376f4c0fd5c8c47146c10eb8c52be2c9d4855b7bea0a5036162c55447aac95d7
 DIST tqdm-4.48.2.tar.gz 148978 BLAKE2B 2423a3d23b86ec6b535a2157d0fbaea6921f95873fb2507a08ff57de0fdcf8fcbfb030210393f5410437ee9977da3ad2011f07a866b3f91a057e338082325976 SHA512 849e4dad4bd0819b328e906af8a8f7acf2ebfd559c9ae3ebf822bc64c1b1a5c96e44b9b69d3dedf6387c44cf9eed559f1377ea29f71fadfc8f056c52685425e9
+DIST tqdm-4.49.0.tar.gz 151935 BLAKE2B 790e2912a402795af9aba2e4db80cf41a7cb08267dad5946d89b4d9fb8b8c7a1dd65f33dcaf315bbe82862c0c2934b2dd2b8cee894c592d5a61ac61dd8c5126f SHA512 44197eb09b90551eb66c8b2e0dc97f6864fc91654465e7d478ece6ecd610242d8e378c6814f9d3e1cf05b2db1aa533743535051ad456ec5ef6d477be906ee217
 EBUILD tqdm-4.47.0.ebuild 1324 BLAKE2B 2b8486f5732dab05928a461aae1d86f1ba63eab9cb9546b39243a7de9db6a4ad5bcadbac19cdb2614329848816cdb47f1dd25d6bc2ac870c8dbc68cac406ae43 SHA512 5a8e146ac5df40e3289afbb8af6dfa3501951278dd470a2cccdfaee4bd683445296f0c1311aafa4dc316e45af15529fdc922875fa0c4b29a1bd0ae4692c6cb30
-EBUILD tqdm-4.48.2.ebuild 1332 BLAKE2B dee2de91c08d69b94b0918389669970cde86b12f61c54a4bdd5260960e6d24047d2dd355d8937ea0c53cababb85a983288a6b576cf143108f5a437f4c18a9716 SHA512 5ea2d7ef53c758a13d19f815455fc04041695d62aa75c7446591c5974a7636b0a73dc413547f2f665365bc58f0122f4cea0b1f14c5694d583ff0667160383b92
+EBUILD tqdm-4.48.2.ebuild 1324 BLAKE2B 2b8486f5732dab05928a461aae1d86f1ba63eab9cb9546b39243a7de9db6a4ad5bcadbac19cdb2614329848816cdb47f1dd25d6bc2ac870c8dbc68cac406ae43 SHA512 5a8e146ac5df40e3289afbb8af6dfa3501951278dd470a2cccdfaee4bd683445296f0c1311aafa4dc316e45af15529fdc922875fa0c4b29a1bd0ae4692c6cb30
+EBUILD tqdm-4.49.0.ebuild 1332 BLAKE2B dee2de91c08d69b94b0918389669970cde86b12f61c54a4bdd5260960e6d24047d2dd355d8937ea0c53cababb85a983288a6b576cf143108f5a437f4c18a9716 SHA512 5ea2d7ef53c758a13d19f815455fc04041695d62aa75c7446591c5974a7636b0a73dc413547f2f665365bc58f0122f4cea0b1f14c5694d583ff0667160383b92
 EBUILD tqdm-9999.ebuild 1326 BLAKE2B 984897423b7a16d82725c544ff1efa1984545d9438ce8e857eb9f0170cbbc18337c18d7d4af30dbe9a462948bef89c6bea81c74ee2590e4f3955d308649f5086 SHA512 a16afed262e1155ad2eff7ea87b4974d4632bb62ec42761902f9648509093857fd28e7878816f9f8bef2245643453feacc0a0d50454baaf5ea8e7e42538928ef
 MISC metadata.xml 827 BLAKE2B 58d9989c380867ec71e25ccd9bb5818de73112978d422a30bae0230ae1b87af04e3e999d6dc5480303b0caea284ec1387497371d5698e63c65bd07b5ecd8c07e SHA512 a1a68e4bad52c71f46664563338b2ea5273d603a914bee55ce427f23ac6bd29a452a0a6dc8375ce9f4bd77f2b9386972cfb6719aced4964d9b9793cd0aa2e270
diff --git a/dev-python/tqdm/tqdm-4.48.2.ebuild b/dev-python/tqdm/tqdm-4.48.2.ebuild
index 27373f57ea4f..a51d15b84f05 100644
--- a/dev-python/tqdm/tqdm-4.48.2.ebuild
+++ b/dev-python/tqdm/tqdm-4.48.2.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/tqdm/tqdm"
 else
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86"
 fi
 
 DESCRIPTION="Add a progress meter to your loops in a second"
diff --git a/dev-python/tqdm/tqdm-4.49.0.ebuild b/dev-python/tqdm/tqdm-4.49.0.ebuild
new file mode 100644
index 000000000000..27373f57ea4f
--- /dev/null
+++ b/dev-python/tqdm/tqdm-4.49.0.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( pypy3 python3_{6,7,8,9} )
+
+inherit distutils-r1
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/tqdm/tqdm"
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+fi
+
+DESCRIPTION="Add a progress meter to your loops in a second"
+HOMEPAGE="https://github.com/tqdm/tqdm"
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="examples"
+
+distutils_enable_tests nose
+
+python_prepare_all() {
+	sed -r \
+		-e "s:'nose'(,[[:space:]]*|)::" \
+		-e "s:'flake8'(,[[:space:]]*|)::" \
+		-e "s:'coverage'(,[[:space:]]*|)::" \
+		-i setup.py
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	# tests_main.py requires the package to be installed
+	distutils_install_for_testing
+	# Skip unpredictable performance tests
+	nosetests tqdm -v --ignore 'tests_perf.py' \
+		|| die "tests failed with ${EPYTHON}"
+}
+
+python_install() {
+	doman "${BUILD_DIR}"/lib/tqdm/tqdm.1
+	rm "${BUILD_DIR}"/lib/tqdm/tqdm.1 || die
+	distutils-r1_python_install --skip-build
+}
+
+python_install_all() {
+	if use examples; then
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/traitlets/Manifest b/dev-python/traitlets/Manifest
index 6932b605e3c5..9895b86ca8af 100644
--- a/dev-python/traitlets/Manifest
+++ b/dev-python/traitlets/Manifest
@@ -1,3 +1,9 @@
 DIST traitlets-4.3.3.tar.gz 89838 BLAKE2B 04b50fabdc312c427f0cff6d4e8be0a5afcafe6d5a7a5804fb37e6f92b867e6a9c6401c23b7cdd7b0a6372eadaf3e8350018db5d21c5cbc546390138932a2820 SHA512 a7ae0276e5234d6d428908e1ec74c0b92f2b1b73e37402ad154151c41ef6e4aaaad53e8990d4233d8023c31d919e4ea66f100a82324abcb0e6ffb92283fd3c9e
+DIST traitlets-5.0.2.tar.gz 120788 BLAKE2B 9cb4f7527f97329cefba2b4a581e9208dfeb80fa87d4950373da5b57193179dc94384631eae473c08c23e6631cdcddebcbff991fc2f36dd07eead53b09800c0b SHA512 f92ef784b213b7e29830a4948a6d1bd7eecc928b45ab1fa393e4da85f4603f2236bf27f7f6659f0778fec51f9d82a18cb0fdf5a283fd6edd5de21aec7e5b2579
+DIST traitlets-5.0.3.tar.gz 120885 BLAKE2B 53dfcddf8be609b1150c422f350aabda7056531055dd34c31bae9ee46aa6d16c9f269cfaf3c88c38cdf8e7f23bbb4a8933af3bfc8eeb869749070017fe005307 SHA512 c464fce509601d5ad71d9287f8c21f9386a1b826b141d45f605113c78aca06cd1f6d0adbd80b34dee41b9b8b64d7a020f1ecaeeb633231b1972c6a58aedd6824
+DIST traitlets-5.0.4.tar.gz 124409 BLAKE2B 32aeabb43f70b2d62212c0bbf8c61441890e253ac181a3568eb4c5552d7160f3f4b6b11dc856db731469b91fed0c1666bb7e1d27d66cba47c75c1e2184100f15 SHA512 91389f141d40331cf3c2a43ed8f7d546ed75e9d5fb0c20f64b1535a8ec7a112dce47db69367918b49f4e8527ad938dd67ae4b4657acc404371960c6bcdaef9eb
 EBUILD traitlets-4.3.3.ebuild 623 BLAKE2B 7f9eaa77a6248c64d1c48fe7e2c04eff431311f0a75e9ea6740d872a79c6c2369f4b7463201e71fc92bb6cfabfc14b28a1137d68b947eb76cb90073a6f8cc968 SHA512 c35a1dd350106f6fe3bd56455123d7045e1bbde777e7509f2069ecf6f3a1276511c78db6e46a41a3dd4831b4798095b14b1d132da62b100f8cc02e43823c3981
+EBUILD traitlets-5.0.2.ebuild 553 BLAKE2B 8c342a8f10a6b40c0066e419216f32260b68e0f6d580f8649a050937c1c10c85adefd00f0296420e2b91dbe4927453bc9c756126a54f2a1dce7f81aacdbefe60 SHA512 1aee81836b8ac508d5d4e75ccbdb7a6ff1879d1029297ec4e81e665dcc41092686e90ccb12bfbb1bb41e9d82e12f8ae71135686ddde86e5b10fcc9e80f42cbbb
+EBUILD traitlets-5.0.3.ebuild 553 BLAKE2B 8c342a8f10a6b40c0066e419216f32260b68e0f6d580f8649a050937c1c10c85adefd00f0296420e2b91dbe4927453bc9c756126a54f2a1dce7f81aacdbefe60 SHA512 1aee81836b8ac508d5d4e75ccbdb7a6ff1879d1029297ec4e81e665dcc41092686e90ccb12bfbb1bb41e9d82e12f8ae71135686ddde86e5b10fcc9e80f42cbbb
+EBUILD traitlets-5.0.4.ebuild 553 BLAKE2B 8c342a8f10a6b40c0066e419216f32260b68e0f6d580f8649a050937c1c10c85adefd00f0296420e2b91dbe4927453bc9c756126a54f2a1dce7f81aacdbefe60 SHA512 1aee81836b8ac508d5d4e75ccbdb7a6ff1879d1029297ec4e81e665dcc41092686e90ccb12bfbb1bb41e9d82e12f8ae71135686ddde86e5b10fcc9e80f42cbbb
 MISC metadata.xml 711 BLAKE2B e8a10398927e2f5dd1d51df84ea8d156f175c2d7f5a14599d154cb413263cd8a396cf037fd50e9adbafa96fcf4dc060d3073ec1c775443538ecc963112728951 SHA512 5b6aa6c0c602beb2cbf3c2b6fb5eb35af48bb1fcb1801f0cb7cc9cbc7645757cac4ab9e06c492705acc3e51ae6565e5124d97dba6be6b204fa58483c7ee42204
diff --git a/dev-python/traitlets/traitlets-5.0.2.ebuild b/dev-python/traitlets/traitlets-5.0.2.ebuild
new file mode 100644
index 000000000000..fc902514738a
--- /dev/null
+++ b/dev-python/traitlets/traitlets-5.0.2.ebuild
@@ -0,0 +1,24 @@
+# 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 configuration system for Python applications"
+HOMEPAGE="https://github.com/ipython/traitlets"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+
+RDEPEND="
+	dev-python/ipython_genutils[${PYTHON_USEDEP}]
+	"
+
+distutils_enable_sphinx docs \
+	dev-python/ipython_genutils
+distutils_enable_tests pytest
diff --git a/dev-python/traitlets/traitlets-5.0.3.ebuild b/dev-python/traitlets/traitlets-5.0.3.ebuild
new file mode 100644
index 000000000000..fc902514738a
--- /dev/null
+++ b/dev-python/traitlets/traitlets-5.0.3.ebuild
@@ -0,0 +1,24 @@
+# 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 configuration system for Python applications"
+HOMEPAGE="https://github.com/ipython/traitlets"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+
+RDEPEND="
+	dev-python/ipython_genutils[${PYTHON_USEDEP}]
+	"
+
+distutils_enable_sphinx docs \
+	dev-python/ipython_genutils
+distutils_enable_tests pytest
diff --git a/dev-python/traitlets/traitlets-5.0.4.ebuild b/dev-python/traitlets/traitlets-5.0.4.ebuild
new file mode 100644
index 000000000000..fc902514738a
--- /dev/null
+++ b/dev-python/traitlets/traitlets-5.0.4.ebuild
@@ -0,0 +1,24 @@
+# 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 configuration system for Python applications"
+HOMEPAGE="https://github.com/ipython/traitlets"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+
+RDEPEND="
+	dev-python/ipython_genutils[${PYTHON_USEDEP}]
+	"
+
+distutils_enable_sphinx docs \
+	dev-python/ipython_genutils
+distutils_enable_tests pytest
diff --git a/dev-python/trustme/Manifest b/dev-python/trustme/Manifest
index 82480c9aa49d..6c7d38f624b9 100644
--- a/dev-python/trustme/Manifest
+++ b/dev-python/trustme/Manifest
@@ -1,3 +1,3 @@
 DIST trustme-0.6.0.tar.gz 24062 BLAKE2B 77f72ab225653e5cd4fdf57b22c4a227e7f186370cfca795df57b5f3c1acdd72b920c0a4ed8364bf2ab4b367a8cda71550d9ff801d6e864eac9ecdef91d947dc SHA512 9fda58320f2055d2c23369d2df213994cafd9af7b7eb3933162bbe09a81abd7a9cd2b2e7cae43b25d40d20311213d8a1c13155b61498b848a2850d22fa1e1418
-EBUILD trustme-0.6.0.ebuild 899 BLAKE2B d0d07dedecb338ad4d08b293057ef494b4d981703ff78a54fe440bdaf5387d854a9da6c0966d18ea80ce8120d6032516b4d914286271ce7ab7dd4b2eb89432ba SHA512 c9814b4d8196a6911ae1deb2a762465c49a7b974c8c4287c8f62a26907bc74a167376633c7128bec8a4aec90587b2d7e1eac244aff2b1d2eebc6bebd74664434
+EBUILD trustme-0.6.0.ebuild 906 BLAKE2B 0e56ce7443884e41d2d83760306b7876c4850fa8d5d7ff98a8fbda35f6e6e873172e53e2df3722dd2804f0f32bcbd27eb1a79bde4f907eb080dc09845c3090fa SHA512 b47fd72f544ed86bc9c26e480c9dde326e3895ce2c856f82fef43eed563c23987f5b8a6d89432d5ba4a2ab0e7f805f411a33cb40d20cf6426fd9c65a2914a5ac
 MISC metadata.xml 349 BLAKE2B d750432001725ac1266b82b174011a342b115739dcce7a9ba4da4465a907f64620f0e5e4e38cf6b41beffc4021cfd070b1f68b6da88f2a309f44c45d23b4b40f SHA512 6152f78467097c2e5ed0c65dbdf6bcedd84310b74c9ee92efda96fb855db3f0f990387a48f58f34e2c9f4769bc0f7a28b1c6c4be7e9561f6a3c4a22fa279cf0f
diff --git a/dev-python/trustme/trustme-0.6.0.ebuild b/dev-python/trustme/trustme-0.6.0.ebuild
index 99f5e639226f..628bf98142dc 100644
--- a/dev-python/trustme/trustme-0.6.0.ebuild
+++ b/dev-python/trustme/trustme-0.6.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="|| ( Apache-2.0 MIT )"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="dev-python/cryptography[${PYTHON_USEDEP}]
 	dev-python/idna[${PYTHON_USEDEP}]
diff --git a/dev-python/twine/Manifest b/dev-python/twine/Manifest
index 0a8ac76db4dc..6b3137cfc043 100644
--- a/dev-python/twine/Manifest
+++ b/dev-python/twine/Manifest
@@ -1,7 +1,6 @@
 AUX twine-1.15.0-tests.patch 731 BLAKE2B 8720a98cbcc69f20096aa0e7e19be78c6ebb842b36c0c5f24bb60f1c2425e555e0b775c9f3cc1b3df7efafa8c7938cc5d85aff5f2ea364734459be7090f1ab6a SHA512 c8388f642045030bdd381c9fc6924ee12ce173f886559161a5941cf343912c2a649bd47e190b031c25d1d73266f3e5b5a9aa740f0315b129d91a4708e77c4446
-AUX twine-3.0.0-tests.patch 595 BLAKE2B 839f6a17293c23e3cc01bb2497b9e8402bafc725db39dc5dd555b4f87b468110e72b6f899835cf1dc3a129762bf9d162cff98e7453814cf917562c401315df3e SHA512 a3ed4afa3c4b4137e953adba6fd8994f95fdd7b5dac67a57b8f75247a78c09f59699e37e43fe3d38e9440d3ba41dd0713f6bed539538e521cce5501a80ee6d81
 DIST twine-1.15.0.tar.gz 135851 BLAKE2B 5e85c30e23615e9fa7e40ed767412560b29c42ec777afbb17850781a384bc2d3787534a8114a65ac2374ab80441eb2d3b6d75dcff400e7b47a42453a9210130d SHA512 e0eae05c108e1e766a0a8ec684e3423b0537c8aa671675f30403171fd4f48ec65666d407df53f6dd9eefa0b98e5fd2fdf7dbf1f0f9150686c499de131f6f2435
 DIST twine-3.2.0.tar.gz 145280 BLAKE2B b25fa984486a375e09705703a47994b529f6e5b48c6733c0a07b57bec6c0dfcdf4096d6ac6b0f9b7a7bfebfb32ea1cfb49c5de79f29495eb2a8fc59a5f8de4e5 SHA512 9959430913ea570d22f2d8b94e929af36b409b71691b3f66de8ddb77cfbfbe36590e21a6062db2a4a4f56ce2eb96984b0a474a93ea96b7734f53ada7a6411c28
 EBUILD twine-1.15.0.ebuild 1224 BLAKE2B 26ed3c59f0e1a4215ba1b8a9c63d22c227a18d9a5ddba92a109bfe3461cd13f4391017bfa56ea86cbf94f1bd90c2d95c22ef0be59774ff862c612075c9b24a0b SHA512 73cc966d65ca3fa0265235cdc8ab4e2177712541f77fb788f69f72f10e3d06be92a1590a6e7aeeb877cd3a599c883420aca6a21614bbd63430baa040e9b19092
-EBUILD twine-3.2.0.ebuild 1994 BLAKE2B c5b41281d0cc519a3520a9ca9e2122bc1671e4a19264d33732bc63de39cd23b286b64c9fcd0366be062d9afbe204143170ab2d8c0c96420800c7c2391b92680f SHA512 73db48d2caee8da04d9caa713ffd687f5d82ba1c032118c2377c5cf397396e7b4aefc76e3b328e4bf991c8d2f86f35e75a3875cc1464f7f1ee06015570a8ffd3
+EBUILD twine-3.2.0.ebuild 1993 BLAKE2B ac9984f134f91fb6d3ed548226e663fd0b87d1fb5355907d4bcbe42c776717cee770a2d2794161acc0242b80ef670f6dac449ab08ef62279a94b8865f2480e93 SHA512 719f8085cc37668237b2e1a9cd0ad7f3ff63e3e6c8b9586204a89f9ed4a9b39e8134c45b02f247077b572354875b76b1c16934091416faa37d4a0d97dc6cfe42
 MISC metadata.xml 382 BLAKE2B 7b1f58005d26a36c877707986c59a6ae3549b9e8118f01fc87aa05a1f7dfa4271ea2100663d49b7b5b8f278409e96b2dabcdb0d9a74809bba75d440fd42d88bd SHA512 c4ce9e0c6029c9efb8be9b36720281ed4ebf0d829e3d936d0a7a864d8f42b1f7c71dc8b605717547ac004bd94c7baebd5b2d2a224899fad0efa0747124ba5bfb
diff --git a/dev-python/twine/files/twine-3.0.0-tests.patch b/dev-python/twine/files/twine-3.0.0-tests.patch
deleted file mode 100644
index e79fa03646d2..000000000000
--- a/dev-python/twine/files/twine-3.0.0-tests.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff --git a/tests/test_upload.py b/tests/test_upload.py
-index c87e16e..1487a0d 100644
---- a/tests/test_upload.py
-+++ b/tests/test_upload.py
-@@ -13,6 +13,7 @@
- # limitations under the License.
- import pretend
- import pytest
-+import unittest
- from requests.exceptions import HTTPError
- 
- from twine.commands import upload
-@@ -298,6 +299,7 @@ def test_values_from_env(monkeypatch):
-     "https://test.pypi.org/",
-     "https://pypi.org/"
- ])
-+@unittest.skip("needs internet access")
- def test_check_status_code_for_wrong_repo_url(repo_url, make_settings):
-     upload_settings = make_settings()
- 
diff --git a/dev-python/twine/twine-3.2.0.ebuild b/dev-python/twine/twine-3.2.0.ebuild
index 49f51f7098f5..d3d319a5e3c8 100644
--- a/dev-python/twine/twine-3.2.0.ebuild
+++ b/dev-python/twine/twine-3.2.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/pypa/twine/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ~ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/twisted/Manifest b/dev-python/twisted/Manifest
index 0fa382da07e9..44bbc8b70a12 100644
--- a/dev-python/twisted/Manifest
+++ b/dev-python/twisted/Manifest
@@ -11,5 +11,5 @@ DIST Twisted-19.10.0.tar.bz2 3118485 BLAKE2B a0d532b67177aa017e463bf823d7842d4f6
 DIST Twisted-20.3.0.tar.bz2 3127793 BLAKE2B 2e85fc3ec26d89e563c9e79a5d2adea81ff1745d18f0f92b8d45ae3729fbddf09998664257880372c7a4caeb5977c5cad7c863596b8c27ad7890275cead9f763 SHA512 1b850e5fc21a3630ead4c2cc3622c16e78bb3be38ab11d021779b7ce3d3c30acc4e19d79c7791a5fce6c5c6e09c2baa349901dffe952de67dd98eec419846365
 DIST twisted-regen-cache.gz 911 BLAKE2B ffd3fcda6c67ffe6fd3ef581c8d507548396b66ed0708e9a5c790095e579c0d5f0f71596acf05712989da2ddef2b8d437eca973bc4d80ef8a9fa852915f38305 SHA512 95a9b931c73017d16d1b5e6b41345dddffe62b6af1a8e93b5e40d06d3d15be17b0dd0181c767ffeeb791534d463764ef9e066fa6c2ee2ac4b53c86d1da8fce03
 EBUILD twisted-19.10.0.ebuild 5779 BLAKE2B ff2e99dab9506621df1f30a47435a3bba2e689e26722fb1b6fd110e063422f5e5cb9250de71e7acb528caf22eb3ec9022cd790e096acf93fbebe37b27fa22fe4 SHA512 cf4a6b161e4958e0de605d271cfa3b84defe1cd2703e692b79cefc5c98b19fea2d1463837d7554655165795e161d59aab26751997df3efb08cf4e975b847fd89
-EBUILD twisted-20.3.0.ebuild 5595 BLAKE2B 954a85bfcd63d4a861d3eede43a2e3f47f49d75aff3d3c11a78be5995d5db0b11e962a55d52e42b0bd0d819bb1b336cbeeaf095d406c3591e7ac6b21ccd8a2f4 SHA512 d0dc5e956273dc94d7b7f97d18dfbb14b7e42e9fdc9bc801720121f80ce3fb46de8acdab79690b1756e963ab598cec308aa1997539a81860ebe9d6689f76b369
+EBUILD twisted-20.3.0.ebuild 5602 BLAKE2B 4df15170dd2ee5d93582b65c7e7a550a093adc7ddcf0289aa0249809726419ab3429cd96e8e5b5d99a5d14575f7526f04b2cd4cf5ab1a2171537462a0719768d SHA512 14c3feccef79b0b21ba520376effa36dafee9239b61e0cb067d7f6e00bca6a0d79a112b12f854854112e2c931e669e346cdb3bd2a03bd6755b84cfa5acffc6aa
 MISC metadata.xml 1351 BLAKE2B b3a4ccdc922dd4aa902b24b2545f3cc5517b2842c92f1195e8eaa2a8b62558c1ea86059cc23b9ad6a8e6093216a11a01f46360b5ba259e5eadcb351ad3bc0094 SHA512 403d692122913d079c5a93cb5b226f33316776360663a171cd757584d219d0789b24809c9e65840aaeb63eae4cb7cc79258757837abb1e3dd92536369fff6604
diff --git a/dev-python/twisted/twisted-20.3.0.ebuild b/dev-python/twisted/twisted-20.3.0.ebuild
index e15cad78074c..7cfc88b3bb76 100644
--- a/dev-python/twisted/twisted-20.3.0.ebuild
+++ b/dev-python/twisted/twisted-20.3.0.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://twistedmatrix.com/Releases/${TWISTED_PN}"
 SRC_URI="${SRC_URI}/${TWISTED_RELEASE}/${TWISTED_P}.tar.bz2
 	https://dev.gentoo.org/~mgorny/dist/twisted-regen-cache.gz"
 
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux"
 
 LICENSE="MIT"
 SLOT="0"
diff --git a/dev-python/typed-ast/Manifest b/dev-python/typed-ast/Manifest
index a414d848f47a..7167b23e0421 100644
--- a/dev-python/typed-ast/Manifest
+++ b/dev-python/typed-ast/Manifest
@@ -1,3 +1,3 @@
 DIST typed_ast-1.4.1.tar.gz 208587 BLAKE2B db874caf459cb73345305051a7c4e97244e92b28e94e82f59b38bb91b7c6c69a2531a81c84d483eca8d641bc947f6aa1b98ba59cd880f7560fbdec55bce41787 SHA512 a3154fe723aeadf998694aba0faf516e5b9abb876e4c7d91843b3694474ff6911b3e77a6cb7366cfa8e5a573b331906b6a0b134b25627aaba0dcbe92c4e25590
-EBUILD typed-ast-1.4.1.ebuild 568 BLAKE2B d854196548ac86e7282da240da35b453887f43d231f237cfc265e08086499053c26b42a23f25d5dfbf9cd47c2fcc077a96360a49ece690642fe2d199d2a557bd SHA512 f3e7be91a676d71fb402bda7f772a03c5c9fa56b842853f4f75a0388a870f89000b28fcb96186449c91409f2cb30102088e20d91f46cc645f7c2db4aa201b94f
+EBUILD typed-ast-1.4.1.ebuild 575 BLAKE2B 7c659a96f3a4d8ef86294e23df53c4fbbb1608061d1e9ae7571e28ebc29a9eb8b708a5a6d0a38993844a4137ca07c827445b960e31f35e97139f827649747082 SHA512 cee375c74449a155a7620e3b81df60e741a9401369925872e5e0f643e382c5dd67b39a5d48541dacfd8d93312d2189fd7314fd0f3a57442f75d1e4461112448a
 MISC metadata.xml 368 BLAKE2B 857d763576c4a8d9d13016cdb5c18b5bf343012143e58356e823dbd40e0899e2b31cabdbadedd7958b45f7fd6c2cfe47995b2f8262bcc596047f15375e3807aa SHA512 e72d87878400135962ad878c3bb8f44b267eb0c733c88a1f53f3459744a173a8b7fab2be08a3eb33867dbb2dbabcbb023e9293bf00aa2ac8beb2951a1e334009
diff --git a/dev-python/typed-ast/typed-ast-1.4.1.ebuild b/dev-python/typed-ast/typed-ast-1.4.1.ebuild
index ed2ae5db3482..b79af83794d4 100644
--- a/dev-python/typed-ast/typed-ast-1.4.1.ebuild
+++ b/dev-python/typed-ast/typed-ast-1.4.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN/-/_}/${P/-/_}.tar.gz"
 
 LICENSE="Apache-2.0 MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/typing-extensions/Manifest b/dev-python/typing-extensions/Manifest
index 94abdb5d52b5..12ce223f59e2 100644
--- a/dev-python/typing-extensions/Manifest
+++ b/dev-python/typing-extensions/Manifest
@@ -3,5 +3,5 @@ DIST typing_extensions-3.7.4.2.tar.gz 38427 BLAKE2B 9d7514cb27b5a8dbf246b15c8643
 DIST typing_extensions-3.7.4.3.tar.gz 38979 BLAKE2B c1b0cc4d5d66f43628f6b488aefdcdd9878aa75cd426fce68aea6039006c1f0126f1a492a817e5a18d2c611aa399c5415d8b5e047b58868ee7b8b2cccfe13825 SHA512 fa1f96b73b13308ddb2676684862916aac8741be4523387c6a0f682a52d307190aac3e4149317842e686d14483d8a37a9e1de2514a2d1ca86f9ae9c8b0e18eb1
 EBUILD typing-extensions-3.7.4.1.ebuild 798 BLAKE2B c4ce0d6c159da89ad63a4cb8f858d44e1aa25180f1536b96258e3a860b175bcf1bf1a1e8a6ce9737f735b10767314dc0664ea094bef847e7470627b3bcdebfa0 SHA512 c97bf9daefe20b239adf5979868c550e8ef1ed2cf662764f62fe176b51396d8a8dae3c066214ae52529dcb7b8b789945dc3d9ed7f9d78f5e0c14f2f6478a4fa3
 EBUILD typing-extensions-3.7.4.2.ebuild 719 BLAKE2B db1f7b94debbfa2b792869a3ee51b2ee3a6f71b3e0de815780c4835bf70b606b7652b65a6fd457f1a4c3efd6656ce1f8ef04c441e9d9178d0877278925b5bbc2 SHA512 5a0d4f63549b8ae636092d76e46afaea51be4b016f4697a597f82f74bfbb90141d92f7d6f91547cb4a9d7757a842a1dedb4c32b6863f3dae98392f05c2409328
-EBUILD typing-extensions-3.7.4.3.ebuild 719 BLAKE2B a860bdff5b23485ee60f91a2c254fdec495786c016ded26fb6f1a5d80341b2732a886ad249a7505a6d109792d02f170b89b91747a36e5b02f9d57403d5da7fec SHA512 ccaf8a6f9705439f96dcc19f55005c45d1e4814fb975b695ed0c0913d156ca7865c33a0496c464762a1f4592437af923003a89a42a76ff70990971aace150ef7
-MISC metadata.xml 309 BLAKE2B 22c8c811a8b91dfcc0b4b8e2b6081e10cefda4e3a37733ac985c7412b71bd995dbf21b43ef6766a80e6decf3a5d9c6878623785eed9fcb817b63a7ca853502f7 SHA512 c483306bdc995969591e21452fd1cb20310e5e9e496b2b4a0ace1c1533023b6225dad6ea156ee12f0045e9bfb6a5426d9a16f05131395b960e529b3194b4331b
+EBUILD typing-extensions-3.7.4.3.ebuild 726 BLAKE2B b84b47fc639672d4f5269d2e442ba21f4e83da59f303e85e6f81ba8abb0ea042ad860bf3eb37f4dfb552077207dc78f90c17c941df56630dfa7b0e9b749749ab SHA512 366152444902d9ecc9b3520e2474ae51464b71c0fed8a460f7372257c64e770a02b2dc4ecc8a6b607381293244e56c35c408f87d7560bab3e4e6e973f84b78d1
+MISC metadata.xml 333 BLAKE2B 7c8ba2188c6cbc930151cad7d365c6b26677aa23348454bf307f4549f296857681c2d871af330b7c889f38524dd63e3abf782ef5bbd7f5f606adcb60741c3461 SHA512 b411ac2336820d0fc123dd6f1575d92d001f6c472537fb1a4899b489bb2f223955e86c5a5a89f98490374ffac231cfc678472c14faeff56c33705850f3d23e0f
diff --git a/dev-python/typing-extensions/metadata.xml b/dev-python/typing-extensions/metadata.xml
index 8fac39f099e5..3dd5571701ad 100644
--- a/dev-python/typing-extensions/metadata.xml
+++ b/dev-python/typing-extensions/metadata.xml
@@ -5,6 +5,7 @@
 		<email>python@gentoo.org</email>
 		<name>Python</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">typing</remote-id>
 	</upstream>
diff --git a/dev-python/typing-extensions/typing-extensions-3.7.4.3.ebuild b/dev-python/typing-extensions/typing-extensions-3.7.4.3.ebuild
index d2e532c3e11e..25491624f5f3 100644
--- a/dev-python/typing-extensions/typing-extensions-3.7.4.3.ebuild
+++ b/dev-python/typing-extensions/typing-extensions-3.7.4.3.ebuild
@@ -17,7 +17,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="PSF-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris"
 
 python_test() {
 	cd "${S}"/src_py3 || die
diff --git a/dev-python/u-msgpack/Manifest b/dev-python/u-msgpack/Manifest
index 0c6dd9b0ab4e..425e4fc6d478 100644
--- a/dev-python/u-msgpack/Manifest
+++ b/dev-python/u-msgpack/Manifest
@@ -1,5 +1,5 @@
 DIST u-msgpack-2.6.0.tar.gz 19911 BLAKE2B a6599a85fcb386f91dce4d11fd8d10c6be75c1fe4e80756c58058bcb7c2934c2174afe65bc0b88e11c5c9e3f66b46c956c9209bb6faf74ab5c382bd665c412fc SHA512 b0f2fa677001705a8a1e96e590fd334d0561065e0617a56a31abd506907dc2446c93f8c4429e65e86c87f6d2cf3e19a921fa0aaccad5cdaf1acd1ae0a1235688
 DIST u-msgpack-2.7.0.tar.gz 20427 BLAKE2B f4e4447635fc20ef5246bbc90ee9cc0b93eaa9d13a0384423145531bb8bbb21dc9d1ddadc075a4a5e456dd8cc758fed3add4b2b43f83c0115c78a0095030ff70 SHA512 b5a6676aa3eea878e3f1cc6ca1351f59ae0fdffdfe4d68c43303a1c5d257449bdcd08bef0fc75117b238544366e42b43c6444bb93ba63d1633aadd0c32061c8b
 EBUILD u-msgpack-2.6.0.ebuild 652 BLAKE2B 582c36afb53b81c72a67d948f66724f298a9c4d788fbd5c15d2afbcc9dee9d508322648892d983dbece9215fc243e40705e23aedeead0682472b7541ecb6087a SHA512 9400b141650b85d7484abe6d54d2143ea5ac0c48a6d915d85227df61ee4f033364c4e5666d2371c537d51be20b43dc225d56d0004a79b6c23ac519a9004f3046
-EBUILD u-msgpack-2.7.0.ebuild 661 BLAKE2B fb05633914823142a0d518b18acaac085e144eb150da4ee01084d647f2272398ac5658318795f8cec18aedf2a1d888cd93bc3aba76feb66f5cb1eeed9bd4792b SHA512 7d0c6e623abc1f0346980de4634b69248b865db28278411dcb056ccd05047263adcb272901dc3f559e36860a677085bd5191897ae0960f464c2b98e840dee268
+EBUILD u-msgpack-2.7.0.ebuild 668 BLAKE2B e50d59267d16323708b4d2511bfd22bc1401b3fa6d39a3048544572abca0c0d1a9fcf0c58f91283b61a16a5e3508365a51eb4a97a4f6b5d7dc5a9449c37e9950 SHA512 6b9a56a5e61e7d1af8308fd76c0785575a9a00f6528eae062f31309d18bc00eb6d335dc475c169bedf082645464f927359849a88b0167d9e7f5661167aa86e2f
 MISC metadata.xml 931 BLAKE2B 14f05bd4d72f2d6d09096f581e720fba96e533781ad16d0ded28ad62f3aef92eeff0fdece705b6b1d8735f0756cf73f338ce26b92bc6380e7679aee7fac6970b SHA512 642b3a1e3f70a4a6d49f87f61e2a197f93ef47238dbd7f1d591cffdd4857299e3110a9cb01cfd430aca328ceb533e3c6080d765bc2fc0fa7fc133456e2ec1de4
diff --git a/dev-python/u-msgpack/u-msgpack-2.7.0.ebuild b/dev-python/u-msgpack/u-msgpack-2.7.0.ebuild
index 30dea55f9b99..687c0d28c295 100644
--- a/dev-python/u-msgpack/u-msgpack-2.7.0.ebuild
+++ b/dev-python/u-msgpack/u-msgpack-2.7.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
 
 S="${WORKDIR}/${MY_P}"
 
diff --git a/dev-python/ujson/Manifest b/dev-python/ujson/Manifest
index 5a6042b1a5c1..aeee8965c44c 100644
--- a/dev-python/ujson/Manifest
+++ b/dev-python/ujson/Manifest
@@ -8,7 +8,9 @@ AUX ujson-3.0.0-pypy3-test.patch 2694 BLAKE2B 415ba9375614c69aa4397aa0401e609304
 DIST ujson-1.35.tar.gz 192027 BLAKE2B 320058e7142f2264bee8b02a411bedb3b32d1c2fc86157eb47272f75cb401e6c75ce7d9e3dba5092cd1db99dbded8804347d4c7be11eaedb47bc8b4b8125fbd3 SHA512 931d8f574fc4920c9ded48369774666060e951f40982606ce9f1d9de3420004042af7d797075a54d92a2b25c4f313572a5e1a30f3bc8ce387ef8f3881193eee7
 DIST ujson-3.0.0.tar.gz 7128523 BLAKE2B b19525edf1528e3b2a43cb08ecbf7b5d070f2455fb0bbffbe4b866bbaca91df09d7f4d46509dfb92d825095d4b922fc866fa36e051fa0e27af60fe558c69c854 SHA512 058675627c1275df1dbada02fca3750e544e25c0d0842b4a4268a664456cae1869423d832b7e4af40e56168b687ec711adf124e9ab34b7c06a244b61f7e2fdfc
 DIST ujson-3.1.0.tar.gz 7128419 BLAKE2B 544afb68e23fe942a6bb241f6948998d61a42d61799dff257f139510e4e97e9bba5c4742e1ed1f0b0e78dfcde0589f0b255c92fc5f3059b6cdd86279aabfe141 SHA512 c40953a4b5b55e894e42fccded618a9f2ed771904e1d1e90a28f4691a53fbd8b2fab3dc98a36b6e0637d2ef40ac87ebf9f2d8fce33cd3bc4e68bf7c18c7a33c3
+DIST ujson-3.2.0.tar.gz 7128952 BLAKE2B 7e4c409eb8e87d542d37595439ded5c85e934e87a18987e18dce5ab0aebd5f9431b8a2c12ebaa467da928c3158d03325a40a9ae65230e39c93106d65b098c407 SHA512 8915e17acbd9650964dc9ae4f8a89021af921fac8f77f5456fdb8c0d6ceaa02767891d070c515c926deef76efb210a969c573e387ae62c15b2c8be761f6adb70
 EBUILD ujson-1.35-r1.ebuild 918 BLAKE2B b6924b75688ae427d726f11bb6acc73ea26cd5554a4d4c505c44e17aaa149be62673aa5c47677caf42c3e03b47f730c6abf37a44e6e51e3baae3212929fb44ad SHA512 5085de8190dac63d4e951d7fca160de6b1d68708ea6f1293f193f1dc93a34a48e5b9193d7e683535e2ea4a06c5cc3cfec3ef085ca8ca03179b2b5cfa3d8fc448
 EBUILD ujson-3.0.0.ebuild 631 BLAKE2B 88b9cbbced507463e6aee7342f0d76b5468edabf2f009d7852cf153025b6749679cc339812f32465a34879df11428f7f3aeb3ab6baf2aa78a57798e015055ed5 SHA512 390ec9c2d42d22f229463fcf3659e96bc025cd0eb6dde344e4e45c85a9fd9828adb07903a98d6b20fdf9c4a834b13cbbc4c9b991da7958e30eb9eb8defa89450
-EBUILD ujson-3.1.0.ebuild 585 BLAKE2B f045597ecb0e5505804161e10b1b43ab2d1fe8942e4d98e219dc6ce6e5ef270db2a3a8ee3458fc3fc3315ab545018086e40bef54af6af4ce8441ec9a75e650b1 SHA512 75d47578b8abfe2ff26273cfd8f7472338e3d55cbb011762f5a15f6a2abc52ee1b53a50fbb420850a831709e25731d90c73f539e86bcdb1ce6458a5f21453815
+EBUILD ujson-3.1.0.ebuild 583 BLAKE2B 37bc5a98c5e8fa348177255ae571d320ca247794eeca5d55b2b88d1a104d87aee32b90178a0cbcf61e8e3be55c5e9501e1279c51b3b7f37da324d7470f044394 SHA512 91b25f5311c437ced258f23724660d1b77ad39ea3671d7c0326f1ae0c8cd486c29af5e56870ab0907e5d5137c5a60e4b27211a02c7a1e03ac96313194eb54ca4
+EBUILD ujson-3.2.0.ebuild 585 BLAKE2B f045597ecb0e5505804161e10b1b43ab2d1fe8942e4d98e219dc6ce6e5ef270db2a3a8ee3458fc3fc3315ab545018086e40bef54af6af4ce8441ec9a75e650b1 SHA512 75d47578b8abfe2ff26273cfd8f7472338e3d55cbb011762f5a15f6a2abc52ee1b53a50fbb420850a831709e25731d90c73f539e86bcdb1ce6458a5f21453815
 MISC metadata.xml 432 BLAKE2B 9218fa7b4dcf0c44ae1d5b30869a2f8981dc03714245aa258de0552e5f27de7cc359acdcb8d22da82069bcf465a91ac7d4401f111cf52abedbe4451e08d67153 SHA512 485e866809b2704a344436f956dd242b8720ecf46daf53a7a64fcf8a5edd3b3915faf59d48da4224b361ba35f7ab8c346e16b0a037cf8846d663d175486bed8f
diff --git a/dev-python/ujson/ujson-3.1.0.ebuild b/dev-python/ujson/ujson-3.1.0.ebuild
index 18e434f25cf1..580474477867 100644
--- a/dev-python/ujson/ujson-3.1.0.ebuild
+++ b/dev-python/ujson/ujson-3.1.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 arm arm64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/ujson/ujson-3.2.0.ebuild b/dev-python/ujson/ujson-3.2.0.ebuild
new file mode 100644
index 000000000000..18e434f25cf1
--- /dev/null
+++ b/dev-python/ujson/ujson-3.2.0.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6..9} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Ultra fast JSON encoder and decoder for Python"
+HOMEPAGE="https://pypi.org/project/ujson/"
+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="test"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? ( dev-python/pytz[${PYTHON_USEDEP}] )
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/uranium/Manifest b/dev-python/uranium/Manifest
index 915ba9964bb1..0f1221797e8c 100644
--- a/dev-python/uranium/Manifest
+++ b/dev-python/uranium/Manifest
@@ -1,4 +1,6 @@
 AUX uranium-4.6.1-fix-install-paths.patch 1584 BLAKE2B 45a4461a2dddf00772098c0ab374fc511dcea1fc2eed94c563e1088be61c8ca6658fb6dbbf6bf2b628bd021d937fdef98a9b9b07bc861a9c3f84954fd38ecb5a SHA512 fba41223d1e14a25232b0efa0b83ccdae9e86bc18f49c5a495c2e3058bacc4a3647a567c346bd0184b22f25319c8e63e1f92fa13b4cf50385dea57d03013494f
 DIST uranium-4.6.1.tar.gz 1013314 BLAKE2B 2a89eb1c4ffab35879eea9a681ea20e9cc5f78736d9c8bda5bf33baf5ef6d3f6418fd1f4b779738d644afd2d553d500c4892559ae402eeab0c38a4d95b295cf5 SHA512 ba7ed12d507fb1bd08fc0e77285933802a31b63d09f2dd0c7329e5644f82e6372fa11a1bbc28f3f1928ae0acfb3cb0afdeedf8e90e619c484fd5f623f8af722a
+DIST uranium-4.7.0.tar.gz 1021541 BLAKE2B 2a2e354def88764801f275751aaf7643c9f4ca6329c2c302d87b3d617d0e93921d0aef20b0c25c9b0a082a836f7d0cca962dfedaa0298fcf943b1a0b683e0e28 SHA512 e049fff57823107785b418a368d6c6c399775c35ffad90831c77643dee060be2ab13ad8871b11f8d59d2a090a1d26786f4cf39a5a731b616a1b08a8ae5dea996
 EBUILD uranium-4.6.1.ebuild 1767 BLAKE2B 1431554d0fc021d74e951bbac246880b3f74c5dd1c388a46481eb8a038b3342362b8cc13dddb1dfcf6fd58b8b6718a1e40775ec7f67d939fc67e32184bd045a1 SHA512 96d1d8a702c4d26b36328ee4873772f3c2ef907706e90916f1e60ffabf7cb9d08b57072e2e52c952e84184755f475cdf42bfdd2a6744aba39caf5c9e0633ec8c
+EBUILD uranium-4.7.0.ebuild 2281 BLAKE2B f5189d47f8e29e341951738163b8ae6d65c4d9e1b752ba73b1ab736b9fdb9cfcf0b3b5987c87b74dfe6ae0e85a77a609319c3ef31307c20bcb057206783c1a8b SHA512 b4ad0fe95cc70a0c2dfbb97713690ac83409ea1ad950bf1b6623ab0114c78add305094f51ec7c6a6da687299dd9fd331d3ebf5cc1c9a28d4ee1e4b7c3d3562f5
 MISC metadata.xml 975 BLAKE2B 42ea7df7c2ee42408ada0328335319d95edc41c92d8ae74d77fb178629e48c7ab7886e4ea07f058b9be9b67f04d29b795eb353e47de60370b7949158cb7798ca SHA512 6074599c0b62f2f527041621550ec183bfa26400eee212c3e9cd0ab9742917ddf762ef668a6bba4628cee8063a0f40104f21d25e260de1d164b61389c9544824
diff --git a/dev-python/uranium/uranium-4.7.0.ebuild b/dev-python/uranium/uranium-4.7.0.ebuild
new file mode 100644
index 000000000000..7e03615ebb5b
--- /dev/null
+++ b/dev-python/uranium/uranium-4.7.0.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_SINGLE_IMPL=1
+PYTHON_COMPAT=(python3_{6..8})
+
+inherit cmake distutils-r1
+
+MY_PN="Uranium"
+
+DESCRIPTION="A Python framework for building 3D printing related applications"
+HOMEPAGE="https://github.com/Ultimaker/Uranium"
+SRC_URI="https://github.com/Ultimaker/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug doc test"
+
+BDEPEND="${PYTHON_DEPS}
+	sys-devel/gettext
+	doc? ( app-doc/doxygen[dot] )
+	test? (
+		$(python_gen_cond_dep '
+			dev-python/pytest[${PYTHON_USEDEP}]
+			dev-python/mypy[${PYTHON_USEDEP}]
+		')
+	)"
+
+DEPEND="${PYTHON_DEPS}
+	~dev-libs/libarcus-${PV}:=[python,${PYTHON_SINGLE_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/PyQt5[${PYTHON_USEDEP},declarative,network,svg]
+		dev-python/numpy[${PYTHON_USEDEP}]
+		>=sci-libs/scipy-1.1[${PYTHON_USEDEP}]
+		sci-libs/Shapely[${PYTHON_USEDEP}]
+	')"
+
+RDEPEND="${DEPEND}
+	dev-qt/qtquickcontrols:5
+	dev-qt/qtquickcontrols2:5"
+
+DOCS=( README.md )
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	python_fix_shebang .
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCURA_BINARY_DATA_DIRECTORY:STRING="/usr/share/cura/"
+		-DGETTEXT_MSGINIT_EXECUTABLE="msginit"
+	)
+
+	if ! use debug; then
+		sed -i -e 's logging.DEBUG logging.ERROR g' \
+		 plugins/ConsoleLogger/ConsoleLogger.py \
+		 plugins/FileLogger/FileLogger.py || die
+	fi
+
+	sed -i \
+		-e "s/find_package(PythonInterp 3 REQUIRED/find_package(Python3 ${EPYTHON##python} EXACT REQUIRED COMPONENTS Interpreter/g" \
+		CMakeLists.txt cmake/UraniumPluginInstall.cmake
+
+	sed -i \
+		-e "s/find_package(Python3 REQUIRED/find_package(Python3 ${EPYTHON##python} EXACT REQUIRED/g" \
+		-e 's/set(Python3_EXECUTABLE ${PYTHON_EXECUTABLE})//g' \
+		cmake/UraniumPluginInstall.cmake
+
+	sed -i \
+		-e "s lib\${LIB_SUFFIX}/python\${PYTHON_VERSION_MAJOR}.\${PYTHON_VERSION_MINOR}/site-packages $(python_get_sitedir) g" \
+		-e 's cmake-${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} cmake g' \
+		CMakeLists.txt
+
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+
+	use doc && cmake_src_compile doc
+}
+
+src_install() {
+	cmake_src_install
+
+	python_optimize "${ED}"/usr
+}
diff --git a/dev-python/urllib3/Manifest b/dev-python/urllib3/Manifest
index e0bcf5b09d69..943ecb1a4584 100644
--- a/dev-python/urllib3/Manifest
+++ b/dev-python/urllib3/Manifest
@@ -2,6 +2,6 @@ DIST urllib3-1.24.2.tar.gz 230699 BLAKE2B 9c2f2be8fa743f542493d75072c02423d1bd40
 DIST urllib3-1.25.10.tar.gz 256875 BLAKE2B 3f2ad2cb3ac9a09f73c1ec03e89aa7313055afa443c53ec82fd9227348859566e20ca33b803972134be24eeed070c63b98e6ae75efde4006e2a4bb7b4cf3f054 SHA512 5718dab472a476bfd555753758ceef46c81dc358131205b6db05d186a66f397dc07252eda1622d12586390ccf14e8e17acdb9486c17cb7d34e323287a67373af
 DIST urllib3-1.25.9.tar.gz 254921 BLAKE2B bd78d7a1de71ffe3b1f62352bb49f94fd402870f57e86ae07ea5462706c19b0ae1f8e23a7e8a4a83482b57e007cb95f5ae242d179cec7e9568fcb440b9d95b82 SHA512 505f1d9137e469a48ee0de417f2be36946cf1d9bbcf1233280be399a6c6d8650b5b3c6cfcf884b04e0156974da703f48843381b9aab377738a2e60f7d2d3799b
 EBUILD urllib3-1.24.2.ebuild 1786 BLAKE2B 3c413607941e08872efa7f4f598e69d6a858adea7505b183ae2efeb7bf418edf8b06fbd04d0f3aa640a50f9ee18616f8b5186f382fb8fc6f250a667348c7d088 SHA512 4f217cb09fc22adb26371a336d42c274be4ca2aa1e8ea5404b8ac97f573b7d7f6c577b8e12a5f9281e1df39e4967614c8f9d9aa626c3544bef20c86053f1a95e
-EBUILD urllib3-1.25.10.ebuild 2105 BLAKE2B 7fcb111436dfa4cffea70d3c23e7b8291261ca6ab629e876df66b9e42db3a78337482532660c70defecc52ab9eb43feeef467b00d9b09ab2888b6640c1a14404 SHA512 193b25c1ff69cff201123b0dbfd72e628fed83790a087705b737531d7cbb6784f6e565fb094ddc525dd0494c08dc4989ea61e3a757c4416abb15df6bd531d65e
+EBUILD urllib3-1.25.10.ebuild 2112 BLAKE2B 0e8f86ee6e056d6e9028c703cd961915c686d77098d725a92d9e73cf9ebfaa0b53a14605fd5b305b0bf26bca80b4c47896cb2ad02894734e7b56c4709b2bb506 SHA512 a0f3caaaf922cff812af68889f9ee4fb985ab200c621af420a48002d5ab7108375cba7f178ae779d2536a7e080e9c1bbff3e8004e245639465baa866d323702d
 EBUILD urllib3-1.25.9.ebuild 2106 BLAKE2B 365be3ed3d45043b7f2bb1f8c414570d412273c879984c1d9ab41f486f0e8a39867414f0d11afb0758f7620086da92ff134739852de82cd3bc5af2b7e094e164 SHA512 3c9b415e8aaf9ea37d7ba4643ce5efef645d4e00b4c687295eb3057acb9e95e4dd23043107a269bb64b21e78dfe991e55129bf7f707a5d0684793fa441868a79
 MISC metadata.xml 548 BLAKE2B 47edce866bd0c727c4b945630c97f2944c34f8e81c43bdbe57e28c4859dd3e681c64eb2d3b75101ad41c85587890ddbc819a2fd04188331dd5fad23a1d9d0ba9 SHA512 014f625e8de5ea3f00628fe360db47dde9dc82efd0b11218b4118a20b7638bd4e6ac14253888073740c0dca4a19a196567cc2af1864d52f3e1c959389c77c9d2
diff --git a/dev-python/urllib3/urllib3-1.25.10.ebuild b/dev-python/urllib3/urllib3-1.25.10.ebuild
index fa5b173c516e..911f80d2650d 100644
--- a/dev-python/urllib3/urllib3-1.25.10.ebuild
+++ b/dev-python/urllib3/urllib3-1.25.10.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv s390 sparc x86"
 IUSE="brotli test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/urwid/Manifest b/dev-python/urwid/Manifest
index a8c2bd4052cc..a637a3c7bd9b 100644
--- a/dev-python/urwid/Manifest
+++ b/dev-python/urwid/Manifest
@@ -2,5 +2,5 @@ AUX urwid-2.1.1-ignore-resetting-to-invalid-locale.patch 998 BLAKE2B c76965b4bb6
 DIST urwid-2.1.0.tar.gz 630226 BLAKE2B 62e36080419cd4acf8c3415ce6393483244f44ffa881730ceebea71ae5535da04a7f45bd5e23fa0808a88a192c8d9d21fa2b1cf7dc3fb20485ee3280c2eeda99 SHA512 c121c0e49ab9531f67bff8740d29fc716fb8c9203e1b2ddb7257f01095e0bf976f3f2131a3b1f95a3b5368ddeea6a09b9c867ab459b91e3e9be6cba4f18ec654
 DIST urwid-2.1.1.tar.gz 633082 BLAKE2B 93393cc9f8e755cf2e25119f26487e062ab145ff4c966c69ad0b153cc2a286aac4f70be9b7e82c57f644fb850f70c88c0c9562cf1c07dcdd427e0afe409a01b0 SHA512 08fc51205f0adeea0ecce876ca17d921961b665894aef440fd826ef0f8b9230cd8d22c5db85fcf4e227f8e70841e3439860e5035ff874b8d0c1834111c3a97db
 EBUILD urwid-2.1.0.ebuild 985 BLAKE2B 33914c61c857f995ffa096a08e27bce1ba5137130b8d1aabf6c4cce08b3eeb1d2a7795bf1fe1593adb23774d394b9022e62ebf8a8500ae6f42f7597885638a6f SHA512 23acfc9e34aaacbb8ca3f929934989dfd992405ea460adab19173d570704bf99291a2352eb78bb5d731b93ffe82703a095410df79180821059b3c6a21318954a
-EBUILD urwid-2.1.1.ebuild 1102 BLAKE2B 4aa5b866c1a91224051f3be17cfa61fe49de279607a458f7534900f58e3ed1e97eb058680a886e74f183ff40ae606f37a26ca3655d8e1581debc4f38b6398160 SHA512 d5c752a2e7c8bb1a686ddebcd420370ea93c779c4fdfba5be95ca0f735a3989f011c525809e94412ff12b51881244baf4b2bfec0fd28a0812cbf70bf441f1958
+EBUILD urwid-2.1.1.ebuild 1100 BLAKE2B fcbbc62063457b6a6eb8d673d54ac5c922c0a2aed0bf3b6f3576c5dc7fb609f08429334856038c9552914e1edcdaec2f90938cc281b22318506b621dfb8622f9 SHA512 37f43341e7e2955dc333d60b9364960cbcf118052c7f239e9e58ecf5d6b3b54aa9cfc13c5f2752d08b54349bf08a54f4ff0bfffc605456458d0da3dae90df7f6
 MISC metadata.xml 1152 BLAKE2B 4b992c5bc6907498186b29eba5804d17341a20715dfd9ea568e0b066d5f6b8775a79a703be450a436badf46d052a790a62cb8ce7100cdb54f24faa68eae6ecda SHA512 4bb4df4cc9398e2b77815b908cfc3821a96370e083a7b4452d601009186bc2c29418987f6e9a25d64332a15b860addb66ee4594e30ea51f34a1eae2d8be0a680
diff --git a/dev-python/urwid/urwid-2.1.1.ebuild b/dev-python/urwid/urwid-2.1.1.ebuild
index 1492f14e7d41..db41fcfa386e 100644
--- a/dev-python/urwid/urwid-2.1.1.ebuild
+++ b/dev-python/urwid/urwid-2.1.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~mips ppc ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="examples"
 
 PATCHES=(
diff --git a/dev-python/vcrpy/Manifest b/dev-python/vcrpy/Manifest
index ce7bd592bf49..eefd9edc9a54 100644
--- a/dev-python/vcrpy/Manifest
+++ b/dev-python/vcrpy/Manifest
@@ -1,5 +1,5 @@
 DIST vcrpy-4.0.2.tar.gz 324196 BLAKE2B 8910ba40bd56c7836a92c120c480e633063c78beb1d7c4dcfffb6180135cf0e28586410307ba3e19b3fa484a72a176dbf877f781ade7bae7c81110fde2eedd32 SHA512 17eebc9574ff14f97ad200b99c50b0440a93fbf38afe8ad95f443370d84c43177ac55ab655ffea7e7985b0cd76124eff3c394898e71a0ba0c434014f07e526f9
 DIST vcrpy-4.1.0.tar.gz 330122 BLAKE2B a7a2516d4dfcc01da801fb8685ea3b56f50ce474d35477ae36785ea1bfbae113bd3c18fb3faadb13fc81c37fa1d282a84bc60fdd27f4fc4a1f3e952312d7bc5f SHA512 7ad5517cd52f6f31448db9b608d8a7b274741727487ede21b7f80e4060e3ddbb34c731166f67ae7136c86a8d3e7fd23128e035a148f18f771066bfa71319624f
-EBUILD vcrpy-4.0.2.ebuild 1389 BLAKE2B 84a6c873cb48a40c6f7b7e133863d58bef6ae00edca2faa3a9739bccdbf141f5f45aa413170508abb27fd70a039685eeab9dd0abe6b51e622fca5bc8ed1eb78d SHA512 2f56198bb62bc2844b37e99dcbdf2ec909188ec16db101ffde5f03fe799aca29f7b73262d347f38521fb3859a1bc618f1da813e344e9d2909fe93a495053481d
-EBUILD vcrpy-4.1.0.ebuild 1393 BLAKE2B a6470456c465894972edffdce4e89823153dee2cbb7d8bc033cc4536ae95ff169c24f140290f3a0c1b8d82565809c5208af61675b0340a844fffdaf926c0fd3f SHA512 09704e8002f65ad1bee470f333fd3a2e995dd0d90b97b62d24f2b51ac3fa9818565ae47e28f6c335b5fc4f3ae250b3367a1394110f5c5b79fcd95b3426167fb1
-MISC metadata.xml 363 BLAKE2B e447766d191bb1c155e27a7b892fd38df143e2bb0f45be8b635df6bcef92f6f292db010b22659d0e699f3f333f84d0be24d3c9a293e1a2f00f641e21a356daa3 SHA512 7cb4c7132da46b1a34425492476204519a02b71643cdb6dffbda39281ada4a55b45577707076783add52639ff5993f0c90c48713b94ca1230eb3559ad1207804
+EBUILD vcrpy-4.0.2.ebuild 1385 BLAKE2B ae7515f0660eb331f2ac40f7644a5438bb1c2170c3444b4866935b70514b81f8481c58e010988196dfe7c718be84f1759865c88a7c19aeba5343594b10a44644 SHA512 7458a9a48a4d11f01eb4058450070716e5d96c11b6260fb426ced67cfdf944a699a9a1ee79bba467fc6628860737ab2a77e616416a40d5ec2f603d3e548dd6a5
+EBUILD vcrpy-4.1.0.ebuild 1385 BLAKE2B ae7515f0660eb331f2ac40f7644a5438bb1c2170c3444b4866935b70514b81f8481c58e010988196dfe7c718be84f1759865c88a7c19aeba5343594b10a44644 SHA512 7458a9a48a4d11f01eb4058450070716e5d96c11b6260fb426ced67cfdf944a699a9a1ee79bba467fc6628860737ab2a77e616416a40d5ec2f603d3e548dd6a5
+MISC metadata.xml 387 BLAKE2B 09c086ca73a9932b1ac06f46f7c7ef216db357fe831fd6d8f996acedcf24a636420752130597318f4cc0a8d11a584d2162a892ca412403d1bbf15cdd86a1fbaa SHA512 09ba6aaf53089115dc98031b4dba4d526864b6d38ba7950fc3fccd9c2b1a0e14702f5235b3923a41300fabd4152e06eae22e20e86b54795bee453a184bd8828e
diff --git a/dev-python/vcrpy/metadata.xml b/dev-python/vcrpy/metadata.xml
index 625f4389c4af..87a6e3276d87 100644
--- a/dev-python/vcrpy/metadata.xml
+++ b/dev-python/vcrpy/metadata.xml
@@ -5,6 +5,7 @@
 		<email>python@gentoo.org</email>
 		<name>Python</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="github">kevin1024/vcrpy</remote-id>
 		<remote-id type="pypi">vcrpy</remote-id>
diff --git a/dev-python/vcrpy/vcrpy-4.0.2.ebuild b/dev-python/vcrpy/vcrpy-4.0.2.ebuild
index d2d8fd9f9217..3eb99b56e0ee 100644
--- a/dev-python/vcrpy/vcrpy-4.0.2.ebuild
+++ b/dev-python/vcrpy/vcrpy-4.0.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/kevin1024/vcrpy/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86"
 
 RDEPEND="
 	>=dev-python/httplib2-0.9.1[${PYTHON_USEDEP}]
diff --git a/dev-python/vcrpy/vcrpy-4.1.0.ebuild b/dev-python/vcrpy/vcrpy-4.1.0.ebuild
index 75f411685298..3eb99b56e0ee 100644
--- a/dev-python/vcrpy/vcrpy-4.1.0.ebuild
+++ b/dev-python/vcrpy/vcrpy-4.1.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/kevin1024/vcrpy/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86"
 
 RDEPEND="
 	>=dev-python/httplib2-0.9.1[${PYTHON_USEDEP}]
diff --git a/dev-python/virtualenv/Manifest b/dev-python/virtualenv/Manifest
index beff94d3969b..ec137845c21a 100644
--- a/dev-python/virtualenv/Manifest
+++ b/dev-python/virtualenv/Manifest
@@ -3,6 +3,6 @@ AUX virtualenv-16.7.7-tests.patch 2092 BLAKE2B fe9eef6372958265ff4b0b919c424a163
 AUX virtualenv-16.7.8-tests-pypy.patch 3133 BLAKE2B 37d544c96a1546aa0df4e820014ee6091d4b4ca5155da86280aaebfb1a8d26ce9c6a055e47b11129509d7d00abcee0e3a915bd6ff4665b289cfce399f2dfd3b6 SHA512 f99cd435fe9fa98465addc6b22310e5d708c87edef224cdf540556a2ab1a70bebf06e828c02148bb597d163c31b2816845c0c8126727d1d25b38ffcb91c2251e
 DIST virtualenv-16.7.10.tar.gz 5116776 BLAKE2B 42f0a4b4330850b504f8febd991ef6ecdcbb0821efdd94ca324a8cc34a68a760a8a98de97f0cb2384d8e6cbb0ce8f261995c6433886444e29b75ba0ce09ca12c SHA512 f06d7c354ce1910f04dbcbe1a77e60392653bbe4f638bafbe9284454db2c0e5d63cf9159201d0916fc01aaba91d45fb733b63096c38517fcd83fd00ed8b26d28
 DIST virtualenv-20.0.31.tar.gz 8300305 BLAKE2B 1574b553b2bc8e05bf00584379f80c1e5c0ee9798595255830059eedea62f02f02d216c421aa2cb312bc9e60694f6a409d0c2495858a89fc1ad7aaddea7965ff SHA512 46220bda37b3b860e44c4d0775a89c22a7ba775287f05438d1d3698201cc213a05b2718ef40be302627005ae349dc59a3141c7a30cc1dab6dc81f7692c7f16a5
-EBUILD virtualenv-16.7.10.ebuild 1901 BLAKE2B e9464ea36c8772c6cbc19df04458ebc53bceafa9cf39a8e13ec2805d9a8c3a38a2e7b1bbae6a589dc5d912256c770e55f54a84b476b81d2c41c2907e495dfbe6 SHA512 586cc1b761b9a46e03a45835a010877aa9e7e29b00e35d722f5bc244a051aa3aad2458ac2f36311749291bf9a3e81671fd77d14fbcd9fe5aace0652d843d0686
-EBUILD virtualenv-20.0.31.ebuild 2612 BLAKE2B 1d09906f4570e8dd0bfd8e02569bb58ecbe7790f0afa506bc533b6fdf6f12005ba02b67589bc68fded0b0ef07c2ef063c093507adbef90692b57f7858fb70fc3 SHA512 bb1ee0a4b9a3f68c6e6fc2eae5250e4de465a1a575c4f517e7c52e59007058a939a29203a8480d9c593b0a5fd7a465c0a0e8a6d24b10958960996a21b5b3fdb3
+EBUILD virtualenv-16.7.10.ebuild 1908 BLAKE2B d8ce09b748bfefb3d797581b5ff98c54fb19a681fa6776173cb690b7d42f05961bc977f34b9614b0790b0f508d3d756db1dd92ea8e228e07ec65bcd06c728487 SHA512 c0706e594946916b393ed7ef148ddb10276886d4b880669ba977dfc81cfdd4cbfca95c78e150f23c57a65dd5df872592b97bfe834c71fa8dddf297efa447448b
+EBUILD virtualenv-20.0.31.ebuild 2618 BLAKE2B 58ad54219c048ac81ac05ffd6910e4805e13fa30e68a3d09231e0a598741107a998a015e7f4a2ed3f78ac49c12a98e62c5e4fde760b18280afd24bd30b7310cb SHA512 47b80c4b372475f1003126d6a5960f4b4957c54ccc0f965f14a5db9626294fb972129d74ff8062e6ef9c27baa13c8d5e3b1c387a4d464666dd0494b9bb7718d5
 MISC metadata.xml 380 BLAKE2B 9a15805179f82d4e5c60aeb56191e690f9fe9260e34d9b4e0b893a51522fdc61246f02b20c1b55084709e06d6ce53b2e6436947aa178e2d413a923102d7ee125 SHA512 b6385fef70c6988548a00e6987bf5004979d139ad6c501d3f7b739bacef06eafa39a40bee8cc2d1164e01bb425f131aeea13f4b58ed6e75d66773a4f1c1df824
diff --git a/dev-python/virtualenv/virtualenv-16.7.10.ebuild b/dev-python/virtualenv/virtualenv-16.7.10.ebuild
index b8f4327d4e7d..e4d99e7a79d0 100644
--- a/dev-python/virtualenv/virtualenv-16.7.10.ebuild
+++ b/dev-python/virtualenv/virtualenv-16.7.10.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/pypa/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 #KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
 SLOT="0"
 IUSE="test"
 RESTRICT="!test? ( test )"
diff --git a/dev-python/virtualenv/virtualenv-20.0.31.ebuild b/dev-python/virtualenv/virtualenv-20.0.31.ebuild
index 651770201985..874b73871c3e 100644
--- a/dev-python/virtualenv/virtualenv-20.0.31.ebuild
+++ b/dev-python/virtualenv/virtualenv-20.0.31.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 SLOT="0"
 IUSE="test"
 RESTRICT="!test? ( test )"
diff --git a/dev-python/visitor/Manifest b/dev-python/visitor/Manifest
index 6c6ee097f8ec..ea963b186614 100644
--- a/dev-python/visitor/Manifest
+++ b/dev-python/visitor/Manifest
@@ -1,3 +1,4 @@
 DIST visitor-0.1.3.tar.gz 2985 BLAKE2B d645e3524ee5d072320e6feca39faef72b880ec7341053d078778765d9b279bd2ee3f892c0fcd5f21633e7851acd49ac23aef769eaf190147803ce711b717da6 SHA512 414c77df8efcc22df5ee8073e02b8c5c28563954ef9b9a869c4ea3f7f1268a97929c1fe29142ba41e3a5acafea52599f6bf073aacd654643d7d8380cd4f41fbc
+EBUILD visitor-0.1.3-r1.ebuild 502 BLAKE2B b6b7bceac4013312a8b8ae17c13bb892c9cd15416a94527af2e6221592d8c8f218b1c85633fc23b480cd97f80e9737183ecb76159b8bfae5e6d67982ccb8ab9d SHA512 a3073e2594b2d6455643a7fa797e03b8ac94b5ee6d2c6136770043001d969dc36b9116ae088139f2a40783e09e924a8beb853b6056119053960a09cd662e3fe0
 EBUILD visitor-0.1.3.ebuild 671 BLAKE2B 6d2b03f918ed400886130425b1884b5d6dffa8d1575f7e152f288bb1e18a3f45dbdae7e50044a4ca42e2951f47e813f59914c43396af8d7a8a5b3e5cfe9a9f9b SHA512 565af55df320308610d8689ed34730329d20ebf0fec5c0448608988456e60e2fd57e52a68a213224b83fbf22846311f31c8fcdc5a46aa50e730215cc43f02195
 MISC metadata.xml 425 BLAKE2B cc0a5e61430649338d19a17059161dceb4e843aad01757da22faf77c327750b901abc8bbcfe0879909febb0f94d764c77494aed2ab9eb4b7b241412a9a993a79 SHA512 21c655b1feebe9dd77a24e8af3fed6c8f40a79c6696940b455da05ad61c0cada17dc99f8c34f3b05309fcaaa1f96261d6546dfa3e8ca21d26323985f713d6bfa
diff --git a/dev-python/visitor/visitor-0.1.3-r1.ebuild b/dev-python/visitor/visitor-0.1.3-r1.ebuild
new file mode 100644
index 000000000000..2432bb2c6c8e
--- /dev/null
+++ b/dev-python/visitor/visitor-0.1.3-r1.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( pypy3 python3_{6,7,8,9} )
+
+inherit distutils-r1
+
+DESCRIPTION="A tiny pythonic visitor implementation"
+HOMEPAGE="https://github.com/mbr/visitor"
+# PyPI tarballs don't include tests
+# https://github.com/mbr/visitor/pull/2
+SRC_URI="https://github.com/mbr/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+distutils_enable_tests pytest
diff --git a/dev-python/vncdotool/Manifest b/dev-python/vncdotool/Manifest
new file mode 100644
index 000000000000..afc9dcc6bc6d
--- /dev/null
+++ b/dev-python/vncdotool/Manifest
@@ -0,0 +1,5 @@
+DIST vncdotool-0.13.0.tar.gz 72780 BLAKE2B 6a27565c5410148f569bd5a8e212327d734f9fd044549683bafcbbaed0df56e0a4853b4750eadc74e2186463313cd510c5290a8c4de69eba5ecbc42ea5d94c32 SHA512 65e275c53dbc805114801b149bff86743cdcb2b8d69b038425fd7dd6f911b113e332246178080c71314d58624137152205057c00b451a3ec6b46541f1b294b98
+DIST vncdotool-1.0.0.tar.gz 62580 BLAKE2B d09b26e81496055f17e96fa5b60ea006ddd210fa8b0044785c107582af18a61fb5beec83f577222b32cc8f446694235cd3ab468cfa917ec3ef4b00b6fbc1a8bc SHA512 45fba9ba3549ad575923bcfb3ab62c53b3c2d85882c87ca2b656795314b9c32aa989a1fdae280f904cb4d79f509622810ffd4d1e2977beac917f0289d6ff24a4
+EBUILD vncdotool-0.13.0.ebuild 1065 BLAKE2B 212a69f6171034556d303796dbaeb010438b109430e03de7eec2092afc62502a0fd1d7988d951418073333226d272320c03e0f49da7dac577e267b7870ea2e78 SHA512 29003f9c97fa72ecfcb10015959031fd6a64c561a56d868f42167a7d55db29e7a13c15481c374d4a0a4a2947372fa81b1311472a5aa509d913193f0a0fa5a0de
+EBUILD vncdotool-1.0.0.ebuild 1065 BLAKE2B 212a69f6171034556d303796dbaeb010438b109430e03de7eec2092afc62502a0fd1d7988d951418073333226d272320c03e0f49da7dac577e267b7870ea2e78 SHA512 29003f9c97fa72ecfcb10015959031fd6a64c561a56d868f42167a7d55db29e7a13c15481c374d4a0a4a2947372fa81b1311472a5aa509d913193f0a0fa5a0de
+MISC metadata.xml 375 BLAKE2B 393138e315b4eae4dacb9339fbb5766e9dbaa84b7482babaddc08d524fb8b9939f6622ee9c6d09b66c61ac270fcc483fac39996a12ba87ccccf7cafd4c6d36db SHA512 9a44b6b9de4d1a61d6af9256519473541d5513cef349c15178c025dee3aaaa3f6772b1be56576411a985fcd9c70029c00743d8f577be8eaec4c5a44646c9cbf6
diff --git a/dev-python/vncdotool/metadata.xml b/dev-python/vncdotool/metadata.xml
new file mode 100644
index 000000000000..d22e99d73577
--- /dev/null
+++ b/dev-python/vncdotool/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>andrewammerlaan@riseup.net</email>
+		<name>Andrew Ammerlaan</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-python/vncdotool/vncdotool-0.13.0.ebuild b/dev-python/vncdotool/vncdotool-0.13.0.ebuild
new file mode 100644
index 000000000000..586c2cf93a15
--- /dev/null
+++ b/dev-python/vncdotool/vncdotool-0.13.0.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+DESCRIPTION="Command line VNC client"
+HOMEPAGE="https://github.com/sibson/vncdotool"
+SRC_URI="https://github.com/sibson/vncdotool/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+# No clue why this happens:
+# pexpect.exceptions.ExceptionPexpect: The command was not found or was not executable: vncev.
+RESTRICT="test"
+
+BDEPEND="test? (
+	dev-python/mock[${PYTHON_USEDEP}]
+	dev-python/nose[${PYTHON_USEDEP}]
+	dev-python/pexpect[${PYTHON_USEDEP}]
+	dev-python/pluggy[${PYTHON_USEDEP}]
+	dev-python/ptyprocess[${PYTHON_USEDEP}]
+	dev-python/py[${PYTHON_USEDEP}]
+	dev-python/tox[${PYTHON_USEDEP}]
+	dev-python/virtualenv[${PYTHON_USEDEP}]
+)"
+
+DEPEND="
+	dev-python/pillow[${PYTHON_USEDEP}]
+	dev-python/twisted[${PYTHON_USEDEP}]
+	dev-python/zope-interface[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+distutils_enable_sphinx docs
diff --git a/dev-python/vncdotool/vncdotool-1.0.0.ebuild b/dev-python/vncdotool/vncdotool-1.0.0.ebuild
new file mode 100644
index 000000000000..586c2cf93a15
--- /dev/null
+++ b/dev-python/vncdotool/vncdotool-1.0.0.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+DESCRIPTION="Command line VNC client"
+HOMEPAGE="https://github.com/sibson/vncdotool"
+SRC_URI="https://github.com/sibson/vncdotool/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+# No clue why this happens:
+# pexpect.exceptions.ExceptionPexpect: The command was not found or was not executable: vncev.
+RESTRICT="test"
+
+BDEPEND="test? (
+	dev-python/mock[${PYTHON_USEDEP}]
+	dev-python/nose[${PYTHON_USEDEP}]
+	dev-python/pexpect[${PYTHON_USEDEP}]
+	dev-python/pluggy[${PYTHON_USEDEP}]
+	dev-python/ptyprocess[${PYTHON_USEDEP}]
+	dev-python/py[${PYTHON_USEDEP}]
+	dev-python/tox[${PYTHON_USEDEP}]
+	dev-python/virtualenv[${PYTHON_USEDEP}]
+)"
+
+DEPEND="
+	dev-python/pillow[${PYTHON_USEDEP}]
+	dev-python/twisted[${PYTHON_USEDEP}]
+	dev-python/zope-interface[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+distutils_enable_sphinx docs
diff --git a/dev-python/vpython/Manifest b/dev-python/vpython/Manifest
index a5cff500f582..13b702d79860 100644
--- a/dev-python/vpython/Manifest
+++ b/dev-python/vpython/Manifest
@@ -1,3 +1,3 @@
 DIST vpython-7.6.1.tar.gz 3552831 BLAKE2B 78281ebbdae2bf09d139569cd344f32aa77aad59ce988a72c57b9984774bc376348c6e69c9119822fe1fbd5dbe6cecf81f17da3977b257c64321e4d4f2deb755 SHA512 8a06bf41865a6bb61c6616c853889b24128f32a9ce1eb8cd9ff861e4995f700ea24e7ffc04fd1edf9cd823a1a592083202abecb1373d5f544facc8646f0cf30b
-EBUILD vpython-7.6.1-r1.ebuild 668 BLAKE2B 2a40d6c4d434a0c097e2acf2718e5f48bbb99e2a14d1d56d50360bdfcdcc37bea55d9b103da9edbd08fdf3a2da4fed9ed10489b004394a5091343b9f2f643b60 SHA512 e38bae96de59cd5af18d181fa158f9c36d57429629c0f0aaa6aaba93339084cff9542d10e4cb309a05b1bf31af46fc709816aaa3cd64608e9ac7adc13bc01b24
+EBUILD vpython-7.6.1-r2.ebuild 668 BLAKE2B 2a40d6c4d434a0c097e2acf2718e5f48bbb99e2a14d1d56d50360bdfcdcc37bea55d9b103da9edbd08fdf3a2da4fed9ed10489b004394a5091343b9f2f643b60 SHA512 e38bae96de59cd5af18d181fa158f9c36d57429629c0f0aaa6aaba93339084cff9542d10e4cb309a05b1bf31af46fc709816aaa3cd64608e9ac7adc13bc01b24
 MISC metadata.xml 621 BLAKE2B 9b76c9b14bafc55ba1e99bf584a43ebc4414183230809eae1994db3cf10b35e8d7591db002828c9a18e25c73c55183a0a27812d4b6491d282c2229bf17761733 SHA512 fa384102ed51e900a7b27be256688c2fe94cb9e08f5240f116ad3ee4b2581e47b2956efb6446de448554718311e212dde2eecedb5c9ecd01a59dff7e2f14eacc
diff --git a/dev-python/vpython/vpython-7.6.1-r1.ebuild b/dev-python/vpython/vpython-7.6.1-r2.ebuild
index 0b80bad621f1..0b80bad621f1 100644
--- a/dev-python/vpython/vpython-7.6.1-r1.ebuild
+++ b/dev-python/vpython/vpython-7.6.1-r2.ebuild
diff --git a/dev-python/wand/Manifest b/dev-python/wand/Manifest
index f15ba770741d..585ea93369b1 100644
--- a/dev-python/wand/Manifest
+++ b/dev-python/wand/Manifest
@@ -1,3 +1,5 @@
 DIST Wand-0.6.2.tar.gz 10503865 BLAKE2B ad488a2d3d6b5801b20ca3caab884069cd5fb6913e04fb719885abdd49578f77cfc4b47a33235f4833463d75c01ad80e06c0687badb9c981a16c9c358c815032 SHA512 906490a0a75a4fc315b592fec12dea21cd40102c461381a79d5215c70ab6fb9c8a1e888fc478ea2ad006db6549dfdd2b7b1e01879cc2aba34dcc0cdd6ae2d128
+DIST Wand-0.6.3.tar.gz 10506834 BLAKE2B 65ba3d5719f7ad8d77a088d94344cc96f14ca45e95850494033a395cc8772d431653a16b2c3494268f351ee4187e5f5f0dbc22058266e9526cff2312e9a2c5b9 SHA512 9aef97434cc8cdef0880d1d1b2bbbdadba807543489d2c82725aa0b5287718f2a10f5508ca7d72a859e242e2b3e205e5f95649cb43be56d5eec8a83c272d0bac
 EBUILD wand-0.6.2.ebuild 788 BLAKE2B 420a5ef0c4a2ea8467c743f54ed57b23525c7c93eff9f292241c66adcd7360fc381a18bae9c1617895497e6a10eeb8fcd46877a47e99f34ab933074d62083420 SHA512 e30871367c46c9d79d1572a8b91d3796cf98c42367d190ea92a9e465bd493c38f11d774e973ef5225b048a4d6f376373048911e1590a58b64c91a6c52848e264
+EBUILD wand-0.6.3.ebuild 788 BLAKE2B 420a5ef0c4a2ea8467c743f54ed57b23525c7c93eff9f292241c66adcd7360fc381a18bae9c1617895497e6a10eeb8fcd46877a47e99f34ab933074d62083420 SHA512 e30871367c46c9d79d1572a8b91d3796cf98c42367d190ea92a9e465bd493c38f11d774e973ef5225b048a4d6f376373048911e1590a58b64c91a6c52848e264
 MISC metadata.xml 432 BLAKE2B b4cf502cb70ef3ca2d5077a491e37fa6d610504ca76e1381a2220e734c6dc435f42a9a260805114e4803dcb8f69871fcb57b92ec9085734c7d2a06f0d7f3a040 SHA512 d5253cbcab45e68901d7678652329552082f0d95a0d38d797ac351f4419a77116ae18cdfbbd8561bbde14c9d99c6ba0b5ce0a435d34c10b99eb14288275709b6
diff --git a/dev-python/wand/wand-0.6.3.ebuild b/dev-python/wand/wand-0.6.3.ebuild
new file mode 100644
index 000000000000..094165125f7a
--- /dev/null
+++ b/dev-python/wand/wand-0.6.3.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( pypy3 python3_{7,8,9} )
+
+inherit distutils-r1
+
+MY_P="${PN^}-${PV}"
+DESCRIPTION="Ctypes-based simple ImageMagick binding for Python"
+HOMEPAGE="http://wand-py.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="media-gfx/imagemagick"
+BDEPEND="
+	test? (
+		media-gfx/imagemagick[fftw,jpeg,png,truetype,xml]
+		>=dev-python/pytest-5.3.5[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx docs
+
+python_test() {
+	# PDF support is blocked by the default ImageMagick security policy
+	pytest -vv --skip-pdf || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/watchdog/Manifest b/dev-python/watchdog/Manifest
index ffd2c1143f14..9672e2937413 100644
--- a/dev-python/watchdog/Manifest
+++ b/dev-python/watchdog/Manifest
@@ -1,5 +1,5 @@
 DIST watchdog-0.10.3.tar.gz 89215 BLAKE2B bbe8a2ab3f84b7eff60d4ebd38ac928db85998910fc5b107dcd645c9b91388a9e45d317777f08288ce3bc2befcf9310bb7c8aef4f8e3309481919dc87e84b2a1 SHA512 6061b1393cd07038ee22271101bd6d5c847ee9732b14f63bbb5d94fba9f8273ca728cdc58b6f53a95d8213d0ed35bc71e8bb9c54960bf3aea2f64da066a864f5
 DIST watchdog-0.8.3.tar.gz 83154 BLAKE2B d5d0635e83bbcd31544d5ea5811c2f202b0da76bd7a4086e8fc61e3293640e701b04599f95decaa82bee3705dbd6b91ad24b9dbd20edcfc329913600c8a3c932 SHA512 61f1db886e8e9a6d78b569329f4d5944c296778a5a34f94fbf115a748fb4c3be422bf4d3cc828e22fcdcd380fdf9009f5bd91a8a5edc87089afc58297a0b946f
-EBUILD watchdog-0.10.3.ebuild 885 BLAKE2B e5ab730671b85478750191853042b6acbff0455c2e00fa4f259e8cc7a2dcc599ce20f2332655d71f6e7ffa78f3f84b91ab1830eafb6071da670e98b05b108981 SHA512 d84f509a72d427b7e2d480f025641e8c21cc08fbf6b56c23346f1b6d80981f4f4efe42c300508d540f4edffb463d275126eb61f0e5dcdff76d6550e4126abca5
-EBUILD watchdog-0.8.3-r2.ebuild 861 BLAKE2B 070bafe08d44109c44a77efdd0efb94020c183c6ed6dc7fbf3f737b80b4a81f23555925ec800891b9ab5ec59fa0ad15fedc4e25198ea8aaf8eef39be6d28c039 SHA512 7150865640631d784f9edfb2d2034d9c6bfe7bffd784cbe14eadc6a5b4dd1e5271da820e94a2b280753d3d4c47b2ec317e355b546e18226496b8377f2405bc38
+EBUILD watchdog-0.10.3.ebuild 889 BLAKE2B b3886a016606d7d738cb423cb3645519cf4caffb2f24d83e0125e7f52dc01635997f98e1a660e32ea01e9f79ad4232ebb77cfe7e93d95db35901650d1224233b SHA512 1ad339f2ee5bea9d03b4ed79588c25d6589882e3a08638e0099d2c28dfc1718dc0e68d48f86ab031d92be58fb090bfc48796443ead25f92ea0fadbce49798835
+EBUILD watchdog-0.8.3-r2.ebuild 866 BLAKE2B da2e726c073a1a91556f91aa35e61fdeb7314a414a2f144d4b16e0e4e9c2a14160f69641fbebb0fc257fd4f49eaf833da54b195c668eab2fa11818b82df25b7e SHA512 aceffd14697d54e2014bce38222d59d02a9321eb2388dc7e1d8bdf94369e3834a80de27efc121db2229f5a28d1eb363458a00fd2fe3a2f55c820f81b387de457
 MISC metadata.xml 409 BLAKE2B 066a5f62332bfdbd1ee84be547214935022d96e8f51d270302fb891d8c9e438141bc4d42cda84cdf02ec65e80c5ad5dbdc8aaeffbf777bb7ee9b153c95cfdfa7 SHA512 dc751fd76505ab72f2e58c28fef326745ee464749e3640510679e852af6752906312f3d8c82b3b0220a120e0112c96e83d62738321a3bc7b71fd6aee803fea9a
diff --git a/dev-python/watchdog/watchdog-0.10.3.ebuild b/dev-python/watchdog/watchdog-0.10.3.ebuild
index 9af812bf99fe..431bc5d5048b 100644
--- a/dev-python/watchdog/watchdog-0.10.3.ebuild
+++ b/dev-python/watchdog/watchdog-0.10.3.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 DISTUTILS_USE_SETUPTOOLS=rdepend
 PYTHON_COMPAT=( python3_{6..9} )
 
-inherit distutils-r1 eutils
+inherit distutils-r1 optfeature
 
 DESCRIPTION="Python API and shell utilities to monitor file system events"
 HOMEPAGE="https://github.com/gorakhargosh/watchdog"
diff --git a/dev-python/watchdog/watchdog-0.8.3-r2.ebuild b/dev-python/watchdog/watchdog-0.8.3-r2.ebuild
index 7b2615c34eee..c171e12e9e4a 100644
--- a/dev-python/watchdog/watchdog-0.8.3-r2.ebuild
+++ b/dev-python/watchdog/watchdog-0.8.3-r2.ebuild
@@ -3,9 +3,9 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python3_6)
+PYTHON_COMPAT=( python3_6 )
 
-inherit distutils-r1 eutils
+inherit distutils-r1 optfeature
 
 DESCRIPTION="Python API and shell utilities to monitor file system events"
 HOMEPAGE="https://github.com/gorakhargosh/watchdog"
diff --git a/dev-python/webencodings/Manifest b/dev-python/webencodings/Manifest
index 779fb9d25159..5f4db6fb1910 100644
--- a/dev-python/webencodings/Manifest
+++ b/dev-python/webencodings/Manifest
@@ -1,3 +1,3 @@
 DIST webencodings-0.5.1.tar.gz 9721 BLAKE2B f62ee91cf0230f55bfbe9973a621bbaf3aa250f511b2e1e2c0c6db00bf52760bb058957040600cb33d6f9208987302a70783b04325be4ff344c428a43664290a SHA512 b727b01bac6ec79bca517960d27b4c0668b295f25559471b9641c2c33dab55db6dac9c990952177964c6418382c22831b14d57df5e632d51d7abf97b61f24326
-EBUILD webencodings-0.5.1-r1.ebuild 687 BLAKE2B 9d990b9e1c8ca9d3f56cdc7f4ada704fe1506ff72be7e3959f566412082e413bd5a4f528bed69e8a0ad3b4b82743b56f1d548cf715ae92c62cd12be6a0b0ff36 SHA512 ded5153d953860838458f1bcc79226be5d0ddb3e6245fc4022f19c1f109ddea0c92faa40cffa3217d201b5c716cba86b7fd1c129fcfd29feec8c4f7325f5c59d
+EBUILD webencodings-0.5.1-r1.ebuild 694 BLAKE2B 288349c6c44d371b8d7df2f5b0cd3b80d5d46d77ac1a0f71b732e755b0fae478c4f8dcce4f323be4eb784005aba936945bbe5d53cc69894927b8bb61c5e2438b SHA512 774859fa0fb13f97b2b00cff11e361709da827e4e3f6484b16a5c0c3a94bf9b325f03f9d9d973e6f04bc504e11f8b9b17a3a7b7dd35169cba55e22b777be26fb
 MISC metadata.xml 601 BLAKE2B 1611511f6d29c01cec657104f06188182e5bdffdfd95e0d1df407e9ce6697f3b89294221028b5f1d20cc09566ea505a33e8f7be068c7bd17cae761a0e2b96858 SHA512 aed1b164cc066e122462888591003a5a6cd8ffc4a151a8c986f763a262f35674bb7d741268f1efe413857335e455d9ed24c1e9d10e0bf37142158e20fd460dec
diff --git a/dev-python/webencodings/webencodings-0.5.1-r1.ebuild b/dev-python/webencodings/webencodings-0.5.1-r1.ebuild
index 41c058d08075..df7139054de6 100644
--- a/dev-python/webencodings/webencodings-0.5.1-r1.ebuild
+++ b/dev-python/webencodings/webencodings-0.5.1-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${P: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 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 
 distutils_enable_tests pytest
 
diff --git a/dev-python/werkzeug/Manifest b/dev-python/werkzeug/Manifest
index 31f91d98776c..224c6c289a96 100644
--- a/dev-python/werkzeug/Manifest
+++ b/dev-python/werkzeug/Manifest
@@ -1,3 +1,3 @@
 DIST werkzeug-1.0.1.gh.tar.gz 907482 BLAKE2B d2dcdce8b1bcbb177b52b0915f2c0ac17d235dee3c77b23e81e4b35412d1f53a194d3c7c7f2a5c065ade99797effe72cc464cf6980b12c761a8a919338021660 SHA512 ba82120fb3e96e3a1334c6452d5ba1950fc016d2d147d643bbc2168ccec496f1dea799982ae8c578167155082c0bdbda5d56a23f64b4b6865f97e90e22df022e
-EBUILD werkzeug-1.0.1.ebuild 1368 BLAKE2B 2d9135a10d9b482548dde1ef34b284f7d0dbb6b3056314ff68cc2e5e3db469e6daf7b56d8bb6afed87afc1ad13592d25a7847c99b71dc79bac1c377cbd8df811 SHA512 12867c9fa8499b7999bc9d9582bbf51b7f4b86869d29f1452f7c2b5923c99c3da803fa5fb43b9b4836e835a09732c2e39342a7374e9eac395a4bc3d5accf94c2
+EBUILD werkzeug-1.0.1.ebuild 1375 BLAKE2B a8c1e27872a28ab39babc47b8b1e4b3f8a5f4918c97512fab6bd74d0480039ed84807c6a815659559cadd8c1ef79c971fcac7553d1b25e04acf85126640283f1 SHA512 c5133c6231f229f245c1b5acd274f7f7cb03a6eec178c50b7e648d958dc3ce7e913293a09e5c4373ecc2ab8791a727d8fb01e5d6342f7139a367ab267a51ea16
 MISC metadata.xml 321 BLAKE2B f2d43f339f0bc82cbc2b0081d1c571cba47744e59bceb960e0a9708d3401445e5d416fc3fd956f6bafc6d8e1d9309eaf5bdfc28e938f5450a9acc1b80cc88b9c SHA512 8c4768582ab693e8a95ad3cfb28b7ed6d7b926700393739c05b50a0297a31a37bad4b2b3ee388a963820258410dc8e2af2a40436821009c746916d0969b1d97a
diff --git a/dev-python/werkzeug/werkzeug-1.0.1.ebuild b/dev-python/werkzeug/werkzeug-1.0.1.ebuild
index aa43e65dc429..15ef06ed2227 100644
--- a/dev-python/werkzeug/werkzeug-1.0.1.ebuild
+++ b/dev-python/werkzeug/werkzeug-1.0.1.ebuild
@@ -20,7 +20,7 @@ SRC_URI="https://github.com/pallets/werkzeug/archive/${PV}.tar.gz -> ${P}.gh.tar
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 
 RDEPEND="dev-python/simplejson[${PYTHON_USEDEP}]"
 DEPEND="
diff --git a/dev-python/wheel/Manifest b/dev-python/wheel/Manifest
index 67ec6ec4956a..05dc7ce42504 100644
--- a/dev-python/wheel/Manifest
+++ b/dev-python/wheel/Manifest
@@ -1,5 +1,5 @@
 DIST wheel-0.34.2.gh.tar.gz 57175 BLAKE2B 4d06c411561f80e51c15422f2d3318efa565f9119e869a2f9284adb9bd3aff7bc104013a63fefae36742d7d87c8468b42292723ed031c2b109323a9141fd1cea SHA512 fcd02cf770382c26b5250aa48f60481ac868ff7e1b08245ed4616aaa7d6dc5e3280d9ab787c4d1690b11550de9f6160c0d31dd65b79554711ab5d02de479e1ab
 DIST wheel-0.35.1.gh.tar.gz 63563 BLAKE2B d1432a638b91e821cb9b9fc748567b9ad18bbfd4737cee915ee3e2c585c4758e79bcf163edac56a09f9e356d81a057214c8e84c5c75b45505c67aa761e97fe3f SHA512 34cd6d1a649842abd895418c0183e68f44e228be905041e1dd8562987fbab8aa617da9b78479cb8d56fb6bb8714ec1085b87640c385bfc933e215f6e33ccf55b
 EBUILD wheel-0.34.2.ebuild 787 BLAKE2B be23b828e156e96519b635eaa585f60fdd3f2fc6a80d1150d2d997e20930b31bcfcf838c93b6aa98bbd3cf26349300164f56656db815865b78afe270163bc1f3 SHA512 255a55734745a37a6203c85ca279aa5ffbc31cd0efb2f190db430fbd2f3ef7fbc2cf8d96f8a880054b825033e36d6db5636fc881ebf140765d3131869ffcd5b3
-EBUILD wheel-0.35.1.ebuild 945 BLAKE2B 62355aae4169edd0c26ef259c36f06b9bf08222eb51e7badbeb49d359fcba72e64aaebd2a305c7173e72cd95d9dfd8a059c0e191000efb1eb53777c36f5908b6 SHA512 bf4142de9d626c84caa75ce6ba6148428c77384e6fe831b3cdeae7fad6bd9e5b62298c6a7d443a62868ffef4632f68d7360d429038feb1d199130a3e1acda74d
+EBUILD wheel-0.35.1.ebuild 952 BLAKE2B 29dbda47aa4986db56b39f8c36d44ffdb7002a3a0fb4a160ec217921b8ceb9dda662b26fce5879cacda80431532f3965b3b650eee6fd87ed929ca7c90b4b8ae2 SHA512 44f0e809043c692a1dc459da364a50a365f09f45549f0037ab746faf543a336812bf74204a02d0a0cf6962089943738f5878dbd839a7ebdaab93839e37059cfe
 MISC metadata.xml 332 BLAKE2B 6c674dc3f3401ae851af12ce14e50ddfe100ffcf26caf3bd49dd93a19433d8c190fe3aabbeba3280f4eb96fe1856d58ce2a5b7c24ee15dacc4593d0534fbac9d SHA512 f0e8a4870fdc46f2a8cdb719832a7d1e108283a35f8f1a2756259c8823480509f9fdfdafdb59d9f0ec2f38c2e78ea6e2937ef5a086408e5e7aeb43b951e0c9a0
diff --git a/dev-python/wheel/wheel-0.35.1.ebuild b/dev-python/wheel/wheel-0.35.1.ebuild
index 60f3b6e68015..00d89540eb5d 100644
--- a/dev-python/wheel/wheel-0.35.1.ebuild
+++ b/dev-python/wheel/wheel-0.35.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/pypa/wheel/archive/${PV}.tar.gz -> ${P}.gh.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 
 distutils_enable_tests pytest
 
diff --git a/dev-python/widgetsnbextension/Manifest b/dev-python/widgetsnbextension/Manifest
index b6e432b479e6..958905895861 100644
--- a/dev-python/widgetsnbextension/Manifest
+++ b/dev-python/widgetsnbextension/Manifest
@@ -1,4 +1,4 @@
 DIST widgetsnbextension-3.5.1.tar.gz 1112877 BLAKE2B 9608a4bb385e697685383e52ee3a17127b87dded4e8edd22233ed03ec837818798a8c08709a83ef7c13995797ebc1b43961e2bc8592e542c5b4fe7c2f5f08f7b SHA512 484f6d91e36ab734c02675973e9007b1f379f1a1cb762c863ad0d80c8c6eb8c9c49a138b3280894ed17ed86775f517a13790cb4537e1cf8bcbdc57e72d13cc2b
-EBUILD widgetsnbextension-3.5.1-r1.ebuild 482 BLAKE2B b6a9c8cf3b7a2dd8b044b3734cbefad035445fcc2b4488321fc463dc94482ab76a3d737124dfb01d75818b9373b86ee0ebd606f1dba83f160f394a38edb28aec SHA512 c96566b4d15c612d1161e6c51a87316d664eb32db497bfd617d988fe9c2c8a27b40d1b01ccd93b0b0e544c88b49a55935013fb2eb91af4ac6e15a70fcf81b240
+EBUILD widgetsnbextension-3.5.1-r1.ebuild 480 BLAKE2B eba91b66a553b63ca35de4292030b4bd0bc17e13f5cdd648b3bc18ee5a383156a7b043862eb36be702b84e05f262902e3464d71ba8958cac60b0eacb9935472f SHA512 1e17d87fe5c0fc24004782f2a5de1d75de87d5ad3037923236f1f6dfc07053f4e5984f3e2e63eb130584d6277180c713ea6d438b20f9cc0b01c25e7331ae0349
 EBUILD widgetsnbextension-3.5.1.ebuild 480 BLAKE2B bb4e624240b86ed5b0d988eef02e04095feb06b43e40bb9a6666322774f561b95bbaf1a8c7248aeb1ee1b1c528212af252c9f0989b2d4e4700d2dec2cf59dc5a SHA512 4a40d26e24f80ec5ef3e5eadaf2307d8bc91f8f44619f4ce3ffc2d09a420e8b690a92af565f60ba52b6ac5fb6e64d1b389a3b5838b44ab1a32dca5a293cf9f89
-MISC metadata.xml 519 BLAKE2B 592ea12fcf1d68154b5e993b0aaf5370e3675c6fb0151800b777e36d35e93f59d4126167b6a00c7ea0c4fd08469d0a5d14c9fc9c5ab7759ea839057d021e9824 SHA512 abe9fb9ee0902e30755d996d2886ce34419bc6291feb9c51a91d374675279fc7e03850c0a6f319a034c5fa5288797747a67a5b248855622e15ae9444264fac76
+MISC metadata.xml 544 BLAKE2B 5ae92f8adf45b22143aa1717552f19fdc586fc657fa2dd8a335903fccae5a60967d4af5a2f11051baa03ad816d592918dee2828f5fb57355ba61a481cbab4357 SHA512 6231ffbb4147fa54e4889732d11dd7a2791c69ba947b7a803e8cf0a299dc91d1d3a4a9ab4b6f1c2b100b65991f7747b6c66f53324eb39386a706f16d00ea696f
diff --git a/dev-python/widgetsnbextension/metadata.xml b/dev-python/widgetsnbextension/metadata.xml
index 1877c69f73cd..766289891e2c 100644
--- a/dev-python/widgetsnbextension/metadata.xml
+++ b/dev-python/widgetsnbextension/metadata.xml
@@ -9,6 +9,7 @@
     <email>python@gentoo.org</email>
     <name>Python</name>
   </maintainer>
+  <stabilize-allarches/>
   <upstream>
     <remote-id type="pypi">widgetsnbextension</remote-id>
     <remote-id type="github">jupyter-widgets/ipywidgets</remote-id>
diff --git a/dev-python/widgetsnbextension/widgetsnbextension-3.5.1-r1.ebuild b/dev-python/widgetsnbextension/widgetsnbextension-3.5.1-r1.ebuild
index 28147f8a5302..58815ccbbd91 100644
--- a/dev-python/widgetsnbextension/widgetsnbextension-3.5.1-r1.ebuild
+++ b/dev-python/widgetsnbextension/widgetsnbextension-3.5.1-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6..9} )
+PYTHON_COMPAT=( python3_{7..9} )
 PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND="dev-python/notebook[${PYTHON_USEDEP}]"
diff --git a/dev-python/wrapt/Manifest b/dev-python/wrapt/Manifest
index dc5eb8bed099..bcfb0fdd194e 100644
--- a/dev-python/wrapt/Manifest
+++ b/dev-python/wrapt/Manifest
@@ -1,4 +1,4 @@
 AUX wrapt-1.12.1-py39.patch 8250 BLAKE2B d3f40b0ef14dc61a12b4e386d1b14b5f5d7f944ea991c7efb70c535b5f77c489feb31f9b162c9aa6fb68236bd0775ceed6c6582247ca0aacbb79255c90b10d57 SHA512 e157e40e720a173762ca227a1daa0acc7fc437f632943c5b5158cb776b32457d592571ff7dadc4f0069b5ace9cb1fd2ebb51807d78d62ca94d8148a4d5be48aa
 DIST wrapt-1.12.1.tar.gz 126750 BLAKE2B 92aba2d400aa626445be68fdda2831132e1c341a2f20065b3d7071a2ebc174cb9de7e6a20a8375360cf7df181881fd20b7b2f70dbfdf533e8823982eeaa722f5 SHA512 33e964cb3aa2437bc7d084a98f622f7c5c8c719d97806796ae0317d35130bdb2679a9dd87be7077e2cae1eb32b65d152349fa7cc138cb392d5999cbfdcecc9ac
-EBUILD wrapt-1.12.1.ebuild 766 BLAKE2B 0cdb1af4ae7f151f801b1bf2359f2bb30c771152e5d37aa589ec1d833535bc1006d2b1855fc38757270fd174107bddc2b01f3d2d0bcae7534bb683e96fed5ea4 SHA512 7c4a45038f6da2f69b3256ecf5d8f2cfb3f1ed41c820967799b8ef95da807935305db6abc67e0385573b0ed07b4640c55f29b49417ca1fdc0c91df18c1ffc8e8
+EBUILD wrapt-1.12.1.ebuild 765 BLAKE2B d6b77c05284a5a54a6cc35e268e7fbc86ff0d2e89581df9183079825beeae15d02b97898b9b9a698fe354f17cfe95097bf1ccea6e7d86362466ef52054af8e2f SHA512 0b45b2eaccd2e6ae8f29398fe0b179b9eca8aa882e9b1aa8bdbeca00eb13f32b9c4f88a9db7468356659cdbd067a5997369460d8df7a032deb4aa273d28a9b52
 MISC metadata.xml 369 BLAKE2B 6a901e590d47a47fb9fe27cafa1708f61f0a3285b651ddcb138ee1fe1add01a163a031dfb9f37b6706fe1712a9da42903317a7560915be98524168e7dfee438c SHA512 2e999c320cf8b1894ef8efea6262304c7902e37692cefb376c36a16cf457133255a8f7c709e329232614fce918d65a82b61f2f340fdc277ae8d1b37c6d60a3ad
diff --git a/dev-python/wrapt/wrapt-1.12.1.ebuild b/dev-python/wrapt/wrapt-1.12.1.ebuild
index c7e2f23bdedf..962fa99da966 100644
--- a/dev-python/wrapt/wrapt-1.12.1.ebuild
+++ b/dev-python/wrapt/wrapt-1.12.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/GrahamDumpleton/${PN}/archive/${PV}.tar.gz -> ${P}.t
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 
 distutils_enable_tests pytest
 distutils_enable_sphinx docs dev-python/sphinx_rtd_theme
diff --git a/dev-python/wtforms/Manifest b/dev-python/wtforms/Manifest
index d34526e4300d..a6b7a384a3ae 100644
--- a/dev-python/wtforms/Manifest
+++ b/dev-python/wtforms/Manifest
@@ -2,4 +2,4 @@ DIST WTForms-2.3.1.tar.gz 162773 BLAKE2B b51b5cb26c550a2502c8c70c1de91c7e6e320f6
 DIST WTForms-2.3.3.tar.gz 162945 BLAKE2B 5f9f2c920ffc784c34d69f42cd259c1cb6007edbc99028bede98b7c3e24b8ba616b89eceac241cc9b20b241e758ee0c88a9c6736597ddc83c90542135a004fec SHA512 934cf1483beec37d698d13a81e44a733d082baad1f418d3087306fd908df809d37fffe000ed1ecabf65d2c31b57034bf6f25c3b77cfc5598ae1f65bf4a115fe5
 EBUILD wtforms-2.3.1.ebuild 1166 BLAKE2B eeb46e175c9ae3d5e1ce169a02c269438131e896bedf1cfaae35798bd48019e8f379eab0fc9a386590921e7a7cdb9367994e99b9af65432cddf8fbe7b1364a32 SHA512 590fa611c411def976e2e0d2ec2c11e3ebd2ac6fd1cd6a5044a31551ec00f7b98b1e82f5d328968b426e97116d494fed01fa80615e2be3ce24b702e2306ce447
 EBUILD wtforms-2.3.3.ebuild 1168 BLAKE2B 2390e15d8542eada503e79be88129728ec89b338bf90ef5fa5448cdfa7d354d47c5641731db6c92e68b919acc4008cd71534daa01a71e8b3c1c0e30ea1505372 SHA512 bf727d8066bf7f04e723063f61e675cde87def3d23c6aae76800cc9d21dc4ba5c29f8cfd9859c24bee652d8aadfb0c1e4cd478e3fa83233be7d9107cb741b6b3
-MISC metadata.xml 428 BLAKE2B 56881cd6ce12c4829ba29d6571369d4fe5f0d62810934c5f89b04c61cb00ec592773f7a6b79dc9034ee74240db95d9af690271027c87bc4e2997902a21614940 SHA512 2399e15e7dfc3dfeea12c49f3f4df7bab32e03a38860d268ce1de64ca7978dcf197c7658250778b4d4006eb7d2626f2d17632cb3dd2ca507c0d918e5996918a0
+MISC metadata.xml 452 BLAKE2B 6f54aff59134f0efc15ee22abf968b703c0ebc4bc36cbd1e6354ca3e77382334b2692f3d0a44983c2943e72c5af9d67e213c9b77a5c5a7479b1e9ebb644b18ca SHA512 77f29486b5d7635aac3f3c8fda3286b14a2791ed817b00551f4401405e308e128c19b43b40ea68518755d73208905bd934a0bdcbf3480857e94ac724847494fa
diff --git a/dev-python/wtforms/metadata.xml b/dev-python/wtforms/metadata.xml
index cea903f60e3a..6809b4697579 100644
--- a/dev-python/wtforms/metadata.xml
+++ b/dev-python/wtforms/metadata.xml
@@ -5,6 +5,7 @@
 		<email>python@gentoo.org</email>
 		<name>Python</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">WTForms</remote-id>
 		<remote-id type="github">wtforms/wtforms</remote-id>
diff --git a/dev-python/xapp/Manifest b/dev-python/xapp/Manifest
index 20b2121c81d2..6792d1424501 100644
--- a/dev-python/xapp/Manifest
+++ b/dev-python/xapp/Manifest
@@ -1,3 +1,3 @@
 DIST xapp-2.0.1.tar.gz 19839 BLAKE2B 692ef5a560681f415ab211b6f2870339dc80ca3ce90ac860637ce6765309b03f8ac41499ad5bcef51cde194b7cee2e3366abb3ddb5ee7e2212e3dac0da625387 SHA512 a529680ab2adbcd829ec224b7dafeb5f641afaabd51ac6cea154d1adf46772b0f2c58a78c6f136d3c6dde0b5d69a4e53a988f69d282af852ecf9ffa130ec1fe4
 EBUILD xapp-2.0.1.ebuild 552 BLAKE2B b31f8e833684636c9f87e100e0343b9943a0baf9806a8bc2d921e7999a13f0a4d466d9eb901b069f5a5e0084ab90a71579b7bf547845e32b55a29d3f2bb6a714 SHA512 39b2369f25cbbff7f189674a263307514d09f9e93dfe5ec3c01ff616cf896f4f3817f70343f02b64b84adb784059a0f53529b4dec82e9a878fcf7fa82082b448
-MISC metadata.xml 697 BLAKE2B 46fd11d93f7328bbe2f62bc5c02ffe5853a0ff9e2250bdb7e8083c21a5142668090af8d955db323604a035c0adc400820cf775014cffa28af3a0ec4ee0405f9b SHA512 df90d562f1a1d8125b8c5a565cd19b343f9cf2d56a4526969fed9edcd8de01ec4856ba88858b4908b4366f646b1e6baed1ace3945452e487d69bf1dbb705498b
+MISC metadata.xml 584 BLAKE2B 7b0110a8ad67b0faa3125ddd088a8d019129d239cc541a08b4443f8bddd3c1efc1891ccbd935309fd13c940b1cf95bf6f1e769c078e895393f7bccf3a366a0ea SHA512 3273919c56af741c5cfde4b69180c20a2defdb16a59f34c0a57147f955c8454eb73cd20f5d02fe827432b7f7310e9a313b324832df96c724300cf3b05cb30141
diff --git a/dev-python/xapp/metadata.xml b/dev-python/xapp/metadata.xml
index b8b9642e16b7..638807cf1f81 100644
--- a/dev-python/xapp/metadata.xml
+++ b/dev-python/xapp/metadata.xml
@@ -5,18 +5,14 @@
 		<email>olivier.laurantin@laposte.net</email>
 		<name>Olivier Laurantin</name>
 	</maintainer>
-	<maintainer type="project">
-		<email>cinnamon@gentoo.org</email>
-		<name>Cinnamon Project</name>
+	<maintainer type="person">
+		<email>sparky@bluefang-logic.com</email>
+		<name>Matthew Turnbull</name>
 	</maintainer>
 	<maintainer type="project">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
-	<maintainer type="person">
-		<email>sparky@bluefang-logic.com</email>
-		<name>Matthew Turnbull</name>
-	</maintainer>
 	<upstream>
 		<remote-id type="github">linuxmint/python3-xapp</remote-id>
 	</upstream>
diff --git a/dev-python/xcffib/Manifest b/dev-python/xcffib/Manifest
index 6f3e22c0ad2b..1f0e0d085a76 100644
--- a/dev-python/xcffib/Manifest
+++ b/dev-python/xcffib/Manifest
@@ -1,7 +1,6 @@
-AUX xcffib-0.10.0-testing.patch 712 BLAKE2B 755afd987d0a6240f4d140717c62c62bf0ee89a1e4f14000b9059269a5674d58fef7aeefd45025f2c7dbfabb9ac7024f1abe8d7fb5f77b3a6a0a4a04bc337fd3 SHA512 98da04ef2a26ac89824ea9b4986840f30f398dffa1ffd22cfcc95242aff65e94ca2c3bcea7890c0081c8c8e721fbe617734af32b756dbd86d6982bae69b05889
 AUX xcffib-0.4.2-test-imports.patch 902 BLAKE2B 386d1a45dff2454925655b09f8dabf8159ab3be6dd0750723d0f70f85b15f75b48d7989d37ab808a090bb4723ae7cbbfcc271eca390b1653a10dc2244ce0564e SHA512 f08590fb2d5979f464d56f9c7e45b83f20954005980f98d2ee3d2c6ce5c44554431059fc911040943ecdcd4ca786c345bab6bae733a46379ad58fa487d516697
 DIST xcffib-0.10.1.tar.gz 84689 BLAKE2B e36ad4f9c6bf5bc63400ae35d0d58ea1def00f299c0f811807cde430e6a6850132e77584359f77fb2f4ce5fdf5f22ec91ed22e1b7ce5d6d318b7a8dc5f3e0939 SHA512 98412fe36962108902dc0599f05ac9be5d7412d7f12fc6566e020c2ce84ae4a536a20ae2dfddd2dc9a536f37cd82539bf19e1993ee65f0b09c44372008cd7edf
 DIST xcffib-0.9.0.tar.gz 83063 BLAKE2B 898fbce1ff503a9ad64a4c34778e0b5ffef531cf2ad04327f1890c87adb5f91287465e39a981a3c5a628c048b8acbb38bac3b0b76a58c3bbe45ab34c9a5eacf5 SHA512 e5891f080fcf1df596c37bb64a70e0de4a41d83b4675dac3b1c128656ab1b09d865e3ab0bfe0e5cc523e89a75dc6127dfc455ab66ca543ba6eeae9ee5bdae168
-EBUILD xcffib-0.10.1.ebuild 670 BLAKE2B 0e16be14e328d6556037a3b2feeee0d3aefa09ac7e2f82576a0927ca43f4f4bce825c1bbb32f16cc96e61ed45e3de0441453b06c16974de9c953e5b39ee9d2f1 SHA512 916b3936253ae434a7af483748ff8f9393db36b762b8e529e545009fb4fa99e3c4c25d1c9b976417f54234f723cfbe5bde4b52d22d63e2dfecffa6a7bccadc0c
+EBUILD xcffib-0.10.1.ebuild 669 BLAKE2B 053ad1204935b13c10a8ddee72fed71ac8ff7b0cf1ab5434ba28668279d293392ebfe6a228de641aac9cc0afc91c0a0dd0fbfaba0b0c428e38e0fbc05d63dd13 SHA512 ecd0dc08026ecad9944a64ee45eb604682513c6bf00633ea5bec86e6c398be8a0d86bbebd48ba03387561610ad38a103f2d0a7313b0af97e642591195e0809bc
 EBUILD xcffib-0.9.0.ebuild 762 BLAKE2B 0292d0cd3101a0b6d7fa2b7b7dbdea76f99500a0b31c451babe58a4a9df2f62abd7623c0934e337f9887d53b3b310f07d24de7a9c301d4f2545fc4d2afa97eda SHA512 3b9f580fc0a743166b9a6bb84d6c53530a930c7707f2d73e61589a4990136b04dd1efd997f6d7d42d61e559a13d55aaa561c7cca4a84b7c660bca7c21b777c67
 MISC metadata.xml 373 BLAKE2B e21d3d9113705facf550e641e786485f657d976a1cbc19f5f1513d534e9a6bde20f68b104a95914dbe95347e0144c0cb0bdc8f87df31906f5f70be71324495dd SHA512 2c7291bce1de8d82151379bcdcc039344659570feec49b82ce9e7274b5e0abecf8499fe7c595b06f71c37ab7bfcb3f2ce8771f216282a50b6c1aba5dffc1008c
diff --git a/dev-python/xcffib/files/xcffib-0.10.0-testing.patch b/dev-python/xcffib/files/xcffib-0.10.0-testing.patch
deleted file mode 100644
index 7c075ae9811c..000000000000
--- a/dev-python/xcffib/files/xcffib-0.10.0-testing.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff --git a/xcffib/testing.py b/xcffib/testing.py
-index ef0268a..0662fcf 100644
---- a/xcffib/testing.py
-+++ b/xcffib/testing.py
-@@ -31,11 +31,14 @@ def lock_path(display):
- def find_display():
-     display = 10
-     while True:
--        f = open(lock_path(display), "w+")
-         try:
--            fcntl.flock(f.fileno(), fcntl.LOCK_EX | fcntl.LOCK_NB)
--        except OSError:
--            f.close()
-+            f = open(lock_path(display), "w+")
-+            try:
-+                fcntl.flock(f.fileno(), fcntl.LOCK_EX | fcntl.LOCK_NB)
-+            except:
-+                f.close()
-+                raise
-+        except OSError:
-             display += 1
-             continue
-         return display, f
diff --git a/dev-python/xcffib/xcffib-0.10.1.ebuild b/dev-python/xcffib/xcffib-0.10.1.ebuild
index d04a31e501a4..5a3d6f10490b 100644
--- a/dev-python/xcffib/xcffib-0.10.1.ebuild
+++ b/dev-python/xcffib/xcffib-0.10.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc ppc64 x86"
 
 DEPEND="x11-libs/libxcb"
 RDEPEND="
diff --git a/dev-python/xmlschema/Manifest b/dev-python/xmlschema/Manifest
index aa1c05776792..1de632cb4706 100644
--- a/dev-python/xmlschema/Manifest
+++ b/dev-python/xmlschema/Manifest
@@ -1,5 +1,7 @@
 DIST xmlschema-1.2.2.tar.gz 318829 BLAKE2B 5ebb8749d56491e65a2c09b56e965ea6b3e9be3d453a01671fa0da065389ca4bf44993693517bed4ef9df22cb94b9398660a7a838405c1757ee1c6f40aedacd3 SHA512 51be4317530cd1055438a4bf8e484b70d8a9414da5507fd30ed506271317859e5255fc729ed9fa5df2230e2af049ff40e693c67a5062e61fda43a1329ef2138d
 DIST xmlschema-1.2.3.tar.gz 322076 BLAKE2B 2b6c587772a14b4b804a35614a2e1e77ade9be0ef25cabfc331efc3a443058fd51c178339f1d6df2cbda77d2a8d1c2ac2c33155406e7e7f36c10225ecb70a3e7 SHA512 15c47c7e93cb0bf14534dfc298848ba4ac332677583ee14eca0c5908fd935e1a3dc01b96f92e7df6eb45b215eae2b67d74ee2d4d227fb3e3360be944815532b7
+DIST xmlschema-1.2.4.tar.gz 287636 BLAKE2B bbb06fcf0e93b98ad7b9746fa0492bc79705dab79fa3d738bc02368e5d777b61cce60f6bd65f095dc99395037d7f0af3056c0877f0c96efb830fa65e1a389c2b SHA512 27f50890728be149e3c36a5ad706b27c32efecf859699a99bebe9a0b81dea2c1ab733860366a2cf0d30680de7f45d8ae581cb445ba78708db3ed25ff7eef94ee
 EBUILD xmlschema-1.2.2.ebuild 936 BLAKE2B de45d9ef22dffbfa20fc2b8808cc9d0c540c6e7dfda939dc70c8f207775960ae703ec395d54013df5b87f97d327c9a993f42c259623432e260ed2a652657d088 SHA512 e5cd335f21f8fa0139dc6195c285ac6c3ab7488a0903dd9d030d0627b620c82be8b98e22ce8a15569aec0600f0728da1736032e69eb6041ee76d6a710929ed60
-EBUILD xmlschema-1.2.3-r1.ebuild 764 BLAKE2B 492d235417e5ae1bb14b241bc6368ae851f95e3d594824fa6a161a05bdd868f33c8e9b457eb1e1fc4c38c7bdf771589fd7554c400aec9a89b3c21fae620559b4 SHA512 082ee380c94521786c6be10e61114e74722aa375c1f76dc9f4ea17dcf29893f0ff6e22a9461a40489b09050e4048e0452b6675c61415dfa2e575b7341e88bdf1
+EBUILD xmlschema-1.2.3-r1.ebuild 771 BLAKE2B d1e2c611ea0dbcc145777fb0ad58868087c02228f13486c3cfd6ce929d860bf3af6f4b9f284cba5a1e233293c9c4b213a3e9764c7e134a7658b7ed9baf9301c8 SHA512 d71dbb2867fb07b1a12b558bba7396468f5322b25c2b8f9b2dd6b62dec8e6ece6b3518756908f94f31892b7ce82925d2c651499398f05eb830e91b2ccdc77d88
+EBUILD xmlschema-1.2.4.ebuild 771 BLAKE2B 4309dbe31a282e1109b16e5de5398081be337468626dddf0897b08ba235b1154e6fc74e0ef32dd6f4b46ee280e7bb5ce5376781be7a171f62692f2fd2b0ec6bf SHA512 813010e93a9f84d1873968035e0846fd3a2976200975e0f280624b398bd6b675521816656b59e1963da2d80c25dfbfa0a2f020897b373f75f8a232ea17a6c311
 MISC metadata.xml 242 BLAKE2B 17fd7db1343fb7dba1842d5b62d83e56e2816962b0122ec6eee7f9e163f333d69ede2cbdf2a2ba8c77613367fca3d2cee779697fb25b5d8cf0439e1e845dbf1f SHA512 2ce768d5aae91f32da90c62900f556c647eb9806c810a817b6c45c5356e71f504b5a646bf75f553c3a9bfd3f94c4317df4948bae863ef7525b4a013b63618cd8
diff --git a/dev-python/xmlschema/xmlschema-1.2.3-r1.ebuild b/dev-python/xmlschema/xmlschema-1.2.3-r1.ebuild
index 12fb0529cc95..f2fa1e9ec85f 100644
--- a/dev-python/xmlschema/xmlschema-1.2.3-r1.ebuild
+++ b/dev-python/xmlschema/xmlschema-1.2.3-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/xmlschema/xmlschema-1.2.4.ebuild b/dev-python/xmlschema/xmlschema-1.2.4.ebuild
new file mode 100644
index 000000000000..6984a361dd20
--- /dev/null
+++ b/dev-python/xmlschema/xmlschema-1.2.4.ebuild
@@ -0,0 +1,30 @@
+# Copyright 2019-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python3_{6,7,8,9} pypy3 )
+inherit distutils-r1
+
+DESCRIPTION="An XML Schema validator and decoder"
+HOMEPAGE="https://github.com/sissaschool/xmlschema https://pypi.org/project/xmlschema/"
+SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-python/elementpath-2.0.2[${PYTHON_USEDEP}]"
+BDEPEND="${RDEPEND}
+	test? (
+		dev-python/lxml[${PYTHON_USEDEP}]
+	)"
+
+python_test() {
+	"${EPYTHON}" tests/test_all.py -v ||
+		die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/xxhash/Manifest b/dev-python/xxhash/Manifest
new file mode 100644
index 000000000000..0de3cfbeef96
--- /dev/null
+++ b/dev-python/xxhash/Manifest
@@ -0,0 +1,3 @@
+DIST xxhash-2.0.0.tar.gz 64099 BLAKE2B bf4a013b70f02945b00b01043b34ff32bda0ce8aac5a533a0c7c606665a4054f443a46b1f60454b4d19a064db276ea66370a159d4037df49d5213dfc33703421 SHA512 c0d303f2705542ef8edb78ccccf42e3da6904e81cecb52f45861d0f0215f0882ad1617167273781c19bb5ff7ed776ec41a36a380eab2ce59e02636fc76f4b009
+EBUILD xxhash-2.0.0.ebuild 658 BLAKE2B 5ed31268925214e3b4440343827eaabd622dab055877195180b238c77ca4b0d45d08b1f587c29d94c511a7a9fe269e3beadc32b4b22ef58da210124e6eeb005d SHA512 08296dc2d5465d7a92cda7231c4397232c48302d422df3b7a7bcc8e8ed79071dc3370411d0fcc5212eff75300c69276b3da0712b86ede7807884e9809e01ab3a
+MISC metadata.xml 419 BLAKE2B 3c95ab655b449a422530861428bc659fd4f5678439abda9a7b5893fa4c9f67e780fb040cd391b8c0774a66c1576d8334b17e5a98fb42f18774c13ffdc4ca697a SHA512 d3e579f2293ce696a1959c93d77680a90ed5a441d26bf90c52d17132a27490c6ae4347f0fce76013e35072304b430b3def8976f4f2b66b83ff0f4dfa560142fa
diff --git a/dev-python/xxhash/metadata.xml b/dev-python/xxhash/metadata.xml
new file mode 100644
index 000000000000..da5553da7dc9
--- /dev/null
+++ b/dev-python/xxhash/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+    <maintainer type="project">
+        <email>3dprint@gentoo.org</email>
+        <name>Gentoo 3D Printer Project</name>
+    </maintainer>
+    <upstream>
+        <remote-id type="github">mikedh/trimesh</remote-id>
+        <remote-id type="pypi">xxhash</remote-id>
+    </upstream>
+</pkgmetadata>
diff --git a/dev-python/xxhash/xxhash-2.0.0.ebuild b/dev-python/xxhash/xxhash-2.0.0.ebuild
new file mode 100644
index 000000000000..ea7b6e71a9a1
--- /dev/null
+++ b/dev-python/xxhash/xxhash-2.0.0.ebuild
@@ -0,0 +1,32 @@
+# 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 binding for the xxHash library"
+HOMEPAGE="https://github.com/ifduyue/python-xxhash
+	https://pypi.org/project/xxhash/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+LICENSE="MIT"
+
+KEYWORDS="~amd64"
+SLOT="0"
+IUSE="test"
+
+RDEPEND=">=dev-libs/xxhash-0.8.0"
+BDEPEND="${RDEPEND}"
+
+distutils_enable_tests unittest
+
+python_configure_all() {
+	export XXHASH_LINK_SO=1
+}
+
+python_test() {
+	cd tests
+	"${EPYTHON}" -m unittest discover -v || die "tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/yarl/Manifest b/dev-python/yarl/Manifest
index 05e39df6c538..20a67deac1b8 100644
--- a/dev-python/yarl/Manifest
+++ b/dev-python/yarl/Manifest
@@ -1,8 +1,7 @@
 AUX yarl-1.4.2-disable-broken-tests.patch 750 BLAKE2B a4d0346c790f68e49c4c1baf5ac0f713a619cd9bae6514bfd22157c8edad08f950b1e207f78b2c9e06e0a0bf281a4406a639200e7b3559a727ff048cf4c51105 SHA512 a0ac3983aa6d88a30b1b31872f24b1ecd7c1055d5f8354ecb14da6aaab029ffe9e5f818d75e5ff3f44f6f70c624ec20bd9f5ae1831e3297cdaf423af7e2ce3d5
 AUX yarl-1.4.2-test-without-coverage.patch 585 BLAKE2B 2a49dbc7f8c0465b51f0d3405e897b61ce16355c64a7b19cb805d1d546b26a8088e1aca834b215b3337ed6062d068d646e635d85fdbfa9ae98744fa0a5956cf7 SHA512 f7775c6a01fac42c9c4a544d9326692d97cdf4a4a2e8c7d69a53dc6d0847eaef9660d193531c9bf50964b0e01d764fe85761c3ba1dae8c70669795723da7154d
-AUX yarl-1.5.0-typing_ext.patch 1762 BLAKE2B e633e9dac216db8c530338b87275fa0b655623adc3a1e651bc5a13d82ff8f064507bb2bd875f23124ca329b6c6d7dc146bb2f058400aa3e71db8c87c6c2e8870 SHA512 ac2b28541876815d9e8e7ad15a30d6cb183315bea56c8c7ab1aefe0eb8e95797a81846045371a03ec2ffa797f6ba0587c15a479b263726b08869287be9821653
 DIST yarl-1.4.2.tar.gz 163521 BLAKE2B ababd1d35bca51a84c8d189266ef5d35f7a4dc65c84c4097a260e86fb838b1a35d2a639c1cf2a407aac8e68c5f67222aae6fa1f6cbfa5cb71dd851b385bae45a SHA512 036562b645d7b9b3ed4a749decb189587b41ab13b5dda5ff461b00eebadf1ecdbd8d5ae06932cc7d8b7ff551cd630f8671eb0f6c854b20996cda4a6897994fa0
 DIST yarl-1.5.1.tar.gz 173005 BLAKE2B 08bfbe914a2f9a148e558d6db955b61c0d95d3f19d6da6290cf6bcd82f3b46ca58836aebd57e148d6f0fd2dfc4b1244f633e7f472b759c3a4fe0d620f80e3f3d SHA512 c82b0722f347279a03d3f6e82b7c0c357678e850b80ed87befab570846a71c55897cfa25d36757a93ac42c023334ecdf890beaeca7fde4536f68b6f70fdf2127
-EBUILD yarl-1.4.2.ebuild 723 BLAKE2B d0ec747247e1342272e63daf606b5637d413a06fbed263a73cb04cd3e89ed15c16c31416a52c966075cc0c9ed0c33280e8e6447f494b3c29bca1937752d3c70e SHA512 39c3dccccac74e8244d466b5c62ba1959b790545680cab67a67ce444453295b0665872905ca4f39ce42e0d001ff758f137b03057ecbb05650cacc8af99aa6387
-EBUILD yarl-1.5.1.ebuild 724 BLAKE2B 22f6d1f3db8859ebd110edf1560395a7fbb3bebdc35c04b60483066b3391c3dbf12e8a12f0d55bb87e6fcfe99feebf21ef6cf2c3f5ad64caa680381ef4526d49 SHA512 7a5ec414096aab918b1086d27dcb8802d56055375d51818de50176f7e8836929d4c8b26331d2382a57a5fc1904e576867ebd0eca0a24754f0e919b799f203f45
+EBUILD yarl-1.4.2.ebuild 719 BLAKE2B 3354c40f113ed2db98e8680ab88f3cce22b87b3bd2eb3ad5c24ccdd08d3088bc75b7cedb63908df10043f98ed10ff5811698243c754fb32e12b38d452ad5063b SHA512 dfe79f360e1162543b5bd2870a3ad6d0421cc3941202702a8a72ba1c85c17722fd05230874461e6a1409a2fab55a932fe79f0d21cc818f0722dca00dd18d2af6
+EBUILD yarl-1.5.1.ebuild 731 BLAKE2B dc50c14dd0e15502daaf748c91b429b58bf284881c591301dbee301fc1ccd63c690ba6c70e7e9bb7f487c09b5bdf754303ebe1a9a2a52a4b59fa6d4c9a1f3981 SHA512 1c6818c83ec259d88bd9f2706c6170abdad72846e261de4f9d72edd502d243bf735965bd21c6aaddea9c5a3704ae7daa011e716774e2f10d80981b637dfc1dde
 MISC metadata.xml 439 BLAKE2B 8d9b97af296f25f501da90aa57deffca21625c8dda04f04e458879977865609e2fece4231deea45f297e3dc74740cea6a2d3a1e0be9b8c37eb5b08379361fef6 SHA512 f554403c332e415434d21a63d65f755dfd80dcdd813f3832b8e09ece9e26a2d28d274de9afcff7dbf2cf64122e4f4b50e546d7a2f67cc6f2090a4da8205cba8c
diff --git a/dev-python/yarl/files/yarl-1.5.0-typing_ext.patch b/dev-python/yarl/files/yarl-1.5.0-typing_ext.patch
deleted file mode 100644
index 737135b0ff00..000000000000
--- a/dev-python/yarl/files/yarl-1.5.0-typing_ext.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From 47478e942992aaaa26c2defc3294cac45ede2cfe Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Mon, 27 Jul 2020 07:13:19 +0200
-Subject: [PATCH] Require typing_extensions for py<3.8 only
-
-All the names imported from typing_extensions are available already
-in Python 3.8, so there is no need to use the additional dependency
-there.  Furthermore, typing_extensions currently do not support
-Python 3.9, effectively blocking yarl from doing so.  To solve this,
-use external typing_extensions only for py<3.8, and just use builtin
-typing in 3.8+.
----
- requirements/test.txt | 2 +-
- setup.py              | 3 ++-
- yarl/__init__.pyi     | 7 ++++++-
- 3 files changed, 9 insertions(+), 3 deletions(-)
-
-diff --git a/setup.py b/setup.py
-index 41d684d..1ed5bfe 100644
---- a/setup.py
-+++ b/setup.py
-@@ -30,7 +30,8 @@ with fname.open(encoding="utf8") as fp:
-     except IndexError:
-         raise RuntimeError("Unable to determine version.")
- 
--install_requires = ["multidict>=4.0", "idna>=2.0", "typing_extensions>=3.7.4"]
-+install_requires = ["multidict>=4.0", "idna>=2.0",
-+                    "typing_extensions>=3.7.4;python_version<\"3.8\""]
- 
- 
- def read(name):
-diff --git a/yarl/__init__.pyi b/yarl/__init__.pyi
-index b3b58ec..eb4a12f 100644
---- a/yarl/__init__.pyi
-+++ b/yarl/__init__.pyi
-@@ -1,7 +1,12 @@
- from typing import overload, Any, Tuple, Optional, Mapping, Union, Sequence, Type
--from typing_extensions import TypedDict, Final, final
- import multidict
- from functools import _CacheInfo
-+import sys
-+
-+if sys.hexversion >= 0x03080000:
-+    from typing import TypedDict, Final, final
-+else:
-+    from typing_extensions import TypedDict, Final, final
- 
- _QueryVariable = Union[str, int]
- _Query = Union[
--- 
-2.27.0
-
diff --git a/dev-python/yarl/yarl-1.4.2.ebuild b/dev-python/yarl/yarl-1.4.2.ebuild
index f58f2871d2bf..8b0deec64b05 100644
--- a/dev-python/yarl/yarl-1.4.2.ebuild
+++ b/dev-python/yarl/yarl-1.4.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86"
 
 RDEPEND="
 	>=dev-python/multidict-4.0[${PYTHON_USEDEP}]
diff --git a/dev-python/yarl/yarl-1.5.1.ebuild b/dev-python/yarl/yarl-1.5.1.ebuild
index 87144d1075ec..28fd8a84c1dc 100644
--- a/dev-python/yarl/yarl-1.5.1.ebuild
+++ b/dev-python/yarl/yarl-1.5.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 
 RDEPEND="
 	>=dev-python/multidict-4.0[${PYTHON_USEDEP}]
diff --git a/dev-python/zipp/Manifest b/dev-python/zipp/Manifest
index 14132b96a0ef..a246087a2da3 100644
--- a/dev-python/zipp/Manifest
+++ b/dev-python/zipp/Manifest
@@ -1,7 +1,7 @@
 DIST zipp-1.0.0.tar.gz 10821 BLAKE2B f5e0476cb0ca01054abc0c56f1a9581a6f537c002791c4a363238555ce9a211fe13114041374c1bfef426544545e3c654e5b0a7e0541c30b775757c43df6d756 SHA512 dbfadfedd30ca4cb31ac4163f367134d96e57405ef00d5f4c19c0af7a141f78487dec29a0ba94975584fcb462d22c8b536bf29c67b7e298368072e897b0e9d82
 DIST zipp-2.0.1.tar.gz 12790 BLAKE2B 107079d2cbe73c4d0d7053696181d99636192374eac4598a8f2007b8197c007e90ef39a56d193052d484b36247d73d5712d878ea35d222895e5b3ff21963ba13 SHA512 ac49f0c0aa83398ad0892932b1f067df94e2108691338c80400235053834bcbcb1a58b2b7b5807f398088a09e9d1cb591d94153a2a44ef3ef96506271d817e05
 DIST zipp-3.1.0.tar.gz 14808 BLAKE2B fb5524c2619e51c5f8c1b85fa819d1001e6296df6c9d5320c6ab3ec88fa5c932c139161e621d51b2827ef40402bb2492b8b08e470b7333e847495ec690024879 SHA512 bb8dea71eccc4f3b18fc816dae700582c3feb72f346e115bb2d1adc336f121304a285e4d5dad48d15b386b9e137c6e1d1793ef50d22b6bd697812a661817684e
-EBUILD zipp-1.0.0.ebuild 1175 BLAKE2B 8db2f85a33a6054e92c8be22bf33a93ce6ac39d175734576e19a7891ac26f26a0cb08be4b07ac6652b0dfd0296f001c8a4d983a1d74851eae837a2d5189ded93 SHA512 6ac6030b7846260c5fc5adc16cb1ec601fe765110db1ff01e81cf57301b5077049c114663fd0ffd835cc688b766d2d6247b620444ced35d1412df303e555a5fc
+EBUILD zipp-1.0.0.ebuild 1166 BLAKE2B 33ba317190548130b06eb6d48362d7a67e743a6db7b90d62b861bc21e318173745fd1fc356486e900b8f6f12b04f6aca1d7f18146bc8f41805d1a1635899f2ca SHA512 559eb7f50f497c306b566e12c2667280581beaf76342825d82f6f0be6000aab5d2bed9eb93fd2d9f7884f10e4a36be427ff5e14bf27b6f323314c5f85832464f
 EBUILD zipp-2.0.1.ebuild 905 BLAKE2B 70547e97cae1c2a97c517ecd3b7001977e4ccad27f1d8710a9a00b1d9e1bb8cb216c4a3901dad9d2e026310bdc021d63785c842671fe96037277a91ca661b28a SHA512 51e57c1be1277f944feb93d280b50e0e0e85c634cefc332a8817175cf32cce0c63a2dc7c72b8acdbc2a9e53e621c96b9195654c3e68c459a8b338ef846cb6c93
-EBUILD zipp-3.1.0.ebuild 1128 BLAKE2B 925f9a189aa350b5dd3550e123b8c5c937830143af48a01b1b90af6a44d8775b82bff9ab9a870fa8ec4c3af340213923479130ebcd531eb0a3a14148c049f921 SHA512 0b6bc95646147707da1b4188da10361034dd4e23bdc9716f1a04448856b78f547d8324d6f19a83bef8416e92bbbe47befdeba857c41c1cc05ab0f1e1260bba9d
+EBUILD zipp-3.1.0.ebuild 1134 BLAKE2B fcfe0536584396dba9b06f478732b7733e4cbcc42d4de96cae9db60efc99f73beabdc9624c961f5ffc8f8c0badb6db015526e9e4e69523be77fa7c7fe462ac00 SHA512 fa173589fe538ea30eb7944b30a42010f8321506210fafd60232a5b62f8de783c87cfc9eec639fc93b3f3884221125e4a6921d76054abca2eafa2c083d273411
 MISC metadata.xml 547 BLAKE2B 18466508bbc1bd39ebac74f8ae583b1f58e7444f96171132ba3521f302d179417cec21f34ea55d95b94a5ce8242ef77cbab5805f844d84de809c58f5a48b5bd4 SHA512 693f379106d242cb63a5bc2e04133d0619f168b964e9e4cfd5dbbacfb06b6d4e732d9304b2029afe28e800020ac771f5b38a0963477976cc5bc049359ef7b6b8
diff --git a/dev-python/zipp/zipp-1.0.0.ebuild b/dev-python/zipp/zipp-1.0.0.ebuild
index c84afd3ef586..7b3294151af0 100644
--- a/dev-python/zipp/zipp-1.0.0.ebuild
+++ b/dev-python/zipp/zipp-1.0.0.ebuild
@@ -3,7 +3,8 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( pypy3 python{2_7,3_{6,7,8}} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( pypy3 python{2_7,3_{6..9}} )
 
 inherit distutils-r1
 
@@ -18,7 +19,6 @@ IUSE="test"
 
 RDEPEND="dev-python/more-itertools[${PYTHON_USEDEP}]"
 BDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
 	test? (
 		${RDEPEND}
 		$(python_gen_cond_dep '
diff --git a/dev-python/zipp/zipp-3.1.0.ebuild b/dev-python/zipp/zipp-3.1.0.ebuild
index f95016aff4ea..736fe71888a3 100644
--- a/dev-python/zipp/zipp-3.1.0.ebuild
+++ b/dev-python/zipp/zipp-3.1.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( pypy3 python3_{6,7,8} )
+PYTHON_COMPAT=( pypy3 python3_{6..9} )
 # [options.entry_points] is present in setup.cfg but it is empty
 DISTUTILS_USE_SETUPTOOLS=manual
 
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="test"
 
 BDEPEND="
diff --git a/dev-python/zope-event/Manifest b/dev-python/zope-event/Manifest
index 3f9e2e48c016..2d651abe82ad 100644
--- a/dev-python/zope-event/Manifest
+++ b/dev-python/zope-event/Manifest
@@ -1,3 +1,3 @@
 DIST zope.event-4.4.tar.gz 18818 BLAKE2B 628625280c1e3f06f2c2e6e9aa88d3e34958718ea4624d54a5b915f8a570e38d4893adc0a0c688a7f09d3c81ffd67fbb69a3bc89ad58d95be498c2de48fff697 SHA512 34dac7ce2e8faf464bdb3861217beb1dd0976b1cc047d45a79f1640dd256bf33162da6e105c00135217fcdb888fc3ac7a4b0b4b047f64ce310c4d11cff71a985
-EBUILD zope-event-4.4.ebuild 1004 BLAKE2B 335f99d044d8b1d199c86e0320e728a9c3394b3c8a02d7eb97b271b278a1b44f0f2d998c88be026d62f76c18934f123331db0ce0fe3b5a40996ebe3c420d6da7 SHA512 95f5e6d0f5ab73563df3e5d1c34b49ebdda05fb3c0ddeb25be8a10fe1f6e56449ac93aefcfbadb069ef79db905e22f0c2f0639f427b0736e8fdfcfe3e68ed6b6
+EBUILD zope-event-4.4.ebuild 1011 BLAKE2B 9c00b76aff358496b93267c7be7dc92927b0f53da6345214921a86bb5d9c5d08addf64e31ffa90c4cf13b6d2988ed6d1a8cb48ae9beee45dec3000f1dd3fa14a SHA512 f8a56415238e4364dbff0cd0ec91c3e9061d2da0e4d872632f82894f16aa27629e163943e255ad8a790323c26d213ea002ade9b7b0be0c0147d3280a16ecb388
 MISC metadata.xml 378 BLAKE2B 53e40f9f0e2a3c17be6503b23c943f72c4221f8d131e56378bc7aa56ed8d889706a4e09f177e137fd1cdece259a2b13a2c6aabf4709b57e20d7e3964fdc580d7 SHA512 b04f8e3a6a16e89458912a27c16154f89067883f11c35552a00cd273095b30ae085b19eb0bebe860055db4876d23085b062b57f937eca21bbc98098a8a06a831
diff --git a/dev-python/zope-event/zope-event-4.4.ebuild b/dev-python/zope-event/zope-event-4.4.ebuild
index e96a0587ae64..35216cc3df14 100644
--- a/dev-python/zope-event/zope-event-4.4.ebuild
+++ b/dev-python/zope-event/zope-event-4.4.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="ZPL"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="dev-python/namespace-zope[${PYTHON_USEDEP}]"
 BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/zope-interface/Manifest b/dev-python/zope-interface/Manifest
index f4160595573f..aafbef3588ec 100644
--- a/dev-python/zope-interface/Manifest
+++ b/dev-python/zope-interface/Manifest
@@ -1,4 +1,4 @@
 AUX 5.1.0-drop-coverage.patch 571 BLAKE2B d5f334b7f5ec5df710174f9a3768c2d7400cefec7c3bb7cb0e4a3fced701b812af738d601ced61df57b78212f1ec621c6a53b906be2bbdf0838c31dc8c6f9e29 SHA512 04b30a85357fd7d0e0a4c52913b0260cc437f7cde2344399d400c2fc0e10cc60261eb4a3201954a515dfd030cfa564c9a222424390af8a3e20349270c89272b6
 DIST zope.interface-5.1.0.tar.gz 225400 BLAKE2B 6ad412bbf3c0327d2b8f37899c1e71fe4bf63c3840c9f2c7e776e3208ec8999c4812aaae89cb9a78724b40ef3dd883323b00eeccab44714eabef6c33c171be48 SHA512 be8319913222ada47a22559e22322ec12dff3adf17f45335d007c5aa3509d84a7d0a7e6c113967b91810b3613344b5c60e002eb740af2bbb454b2807de8dad98
-EBUILD zope-interface-5.1.0.ebuild 1275 BLAKE2B c5983d70c1a8057c41f8bde60527f94dc269a4d3e18ca23333d1e2f0a25317fec0ba4c206420e4dbbbb7fa44d182e22a153a411025504c7f9ad36bfea95a7e6d SHA512 3fdbe02a25e93106ada616f3121eef6f1e36a6b311cb76a8eee95a13bc310e7e1e468599186d14b45a23bc5c647064828558e51b6d10a86239f5d940aa684eb1
+EBUILD zope-interface-5.1.0.ebuild 1282 BLAKE2B 51a20746476e95039b1ccb3accd59f9642ffc7f1a8a9a54259ed787e5a24d37d4a9de878f83f5907be1ca9fb98e919aa189a3c4cf5eaf913a1b20f0e9a375e48 SHA512 87b0cc4b00d70158c7d22b502f5894f0a367ea770e1c7ba1966843f7aafb33d1ec46a324168355724eaa7750eca6be216f99ba74ec4d80b6ced4def874c4375a
 MISC metadata.xml 386 BLAKE2B f8454bc6cb7c55f203d75f44428b0fe404d050e4938f80e5ca1e0504811a3ea73980ab474d12b47f31a87ed508a2f23143d6393eaf2f66eaface7b35a2058a61 SHA512 fc31e083f990006f9a4bdf1cdef5b8efee3e69e8444f614dd5fdcc0d7ddb8291cc1e45c21ab1418668c2e247068a39467e837aa8b869cc050a856635b8789fdd
diff --git a/dev-python/zope-interface/zope-interface-5.1.0.ebuild b/dev-python/zope-interface/zope-interface-5.1.0.ebuild
index 89a3e41851a8..9cbda90218ee 100644
--- a/dev-python/zope-interface/zope-interface-5.1.0.ebuild
+++ b/dev-python/zope-interface/zope-interface-5.1.0.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="ZPL"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="dev-python/namespace-zope[${PYTHON_USEDEP}]"
 BDEPEND="
diff --git a/dev-python/zope-testing/Manifest b/dev-python/zope-testing/Manifest
index ceb123248216..afc52a57dc37 100644
--- a/dev-python/zope-testing/Manifest
+++ b/dev-python/zope-testing/Manifest
@@ -1,3 +1,3 @@
 DIST zope.testing-4.7.tar.gz 63474 BLAKE2B dc825849c288b9f8ab9e4edfe670e09aa49f28c64047da8e0fb36cbfa6cf24d70cf6a49ea8a51ca1831b152f3ffa4b0c62cde29750036f13c9f754df2bb80da2 SHA512 cdf87f95196880a0f55c740f6340286bb29e96e9273d0c645bbb50def54a0645cce22d971adba3f15ff57b1021a72749219af83abc4e8fa775fb982d8164791d
-EBUILD zope-testing-4.7-r1.ebuild 988 BLAKE2B af7c47bde639071da2b0990e43fc665b9f8ba9e48cb8ab8eb140d8d9a849a4621a70fdc8a2d837a53051b1eb59a6ef525245eb808ec0eae7f95394d8e6532a5f SHA512 81e5fec851adf12cfe60dcdc2fd1d2ffb40c9a9678e96c712f3d10ae81889dbfb51236dccaff60e9bbe9c3ca73b22ba506b9ad2291d37c45879181ec948dbbb5
+EBUILD zope-testing-4.7-r1.ebuild 995 BLAKE2B 9a0e131e003018beb47c33bd6557b5b44acbaf79d29e0a69b4d2ed07fd9a52726bd632c5d59dd18eeff438e1d26a1503ce95f6a081e7905cbb620eaa209f5cbc SHA512 453b53e32b88ac33dd431373948f5cdf9588196fc2f2ecc951623412e85f8d38256006e3ee9c86013b67c38530491bf771896d3fa816ea2fd0c0b6847dff2e06
 MISC metadata.xml 382 BLAKE2B 3931e1281c2947e5d4582aeb10a79579e4b3c7bddca959fb1f6a65f47cd1b42df2a54f8d3200d3ab4f1dba843b978a4bfc29a9cc23070977ddfee1a74b3c69e1 SHA512 ddd7e2cd30860e71eee851d969e3ea69f72edaf4dff87dba784925e203cd1f0fada3c51090291fd8b5aee8e715f097a0bd6be1e89abe37526f57dde529c5e61d
diff --git a/dev-python/zope-testing/zope-testing-4.7-r1.ebuild b/dev-python/zope-testing/zope-testing-4.7-r1.ebuild
index a8de4c37fa3b..7d3661d32da2 100644
--- a/dev-python/zope-testing/zope-testing-4.7-r1.ebuild
+++ b/dev-python/zope-testing/zope-testing-4.7-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${MY_PN::1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="ZPL"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="dev-python/namespace-zope[${PYTHON_USEDEP}]"
diff --git a/dev-python/zstandard/Manifest b/dev-python/zstandard/Manifest
index a4e5f2387542..de0d279e4483 100644
--- a/dev-python/zstandard/Manifest
+++ b/dev-python/zstandard/Manifest
@@ -1,8 +1,7 @@
-AUX zstandard-0.13.0-compiler.patch 770 BLAKE2B 43ef34c46cf54d5e872c74a12870a3dfba561ea1e91aa0b950dfcdd5f08d68c4a8dceaac3617dd2aa9fd4f05c1c3a556c194c37863bb1dea46e8bd289d35a0f2 SHA512 83eed984669604d84a597c93a86539b6768199947c9e742105fe6fd6eff667e2b738b889ca99165b50cd9b35b804fbaddcc19c15aaeeca0085452f42667631a9
 DIST zstandard-0.12.0.tar.gz 648827 BLAKE2B bb644150e4126997d447dad3e5aec9f6e15ee344366634772d75b246a9ab82fad13f85ce986f36e45331fff26449b05a0864ad77d949def8cb024f598a218c74 SHA512 ebf896a77ce5cdc82a1edb658a0b96bcf99deee7aa031163879fc21fe3d03623061182fd2c11840a5a46a8ad0a08b98b802b4703b963d448a25c0b52685d3b64
 DIST zstandard-0.14.0.tar.gz 676761 BLAKE2B f90fcee6571f89eb5964ba50c722be8f3b846a0aaa6f79bd41389131ce332a4c6f7ec3d2eabd16268a42d211c7c02c2f7379019ef44272eb23cc74a20e5e9b3d SHA512 57c62eb7dedde2a2178f79a5658b87b5c5f176b282311273953003824272afa03e126a79b57fc8b75e9e15585d44d6b9931318a8ea5e7c75ec0feebbd7eb6cf0
 DIST zstandard-0.8.1.tar.gz 463785 BLAKE2B ac4dce58cefa05d265824004464bad89a7f4c4e5f19ac1d8b5b8b0ad6f806318e2b82ffb6f3a290e3605961801909b339b1e5d89fdccd76fd28c75a695a92e0a SHA512 0ddbe22381397443c6c9f84e64f9358160bede104c4f48351119d880ac4f88994739b0b3915454567d2b2b04930c6ead5aa290a40323ba4b0bacf5e97809793c
 EBUILD zstandard-0.12.0.ebuild 859 BLAKE2B 97e7550806562e05879ba14d5fd2794d2b24607b87c8bfc582bd405740c7843a4e1a23802bdf23020662ac4e7931778819771be6ecab6ff5c5b5cb83c11e4ff2 SHA512 3bfd23c6f6ebea1c12ef618449915e6103f2b304a92e8ee56707d8938d5542482a6d4a35baac041c7884c348fd41047033ccb21fc181f89dcefa80a9dd07f2da
-EBUILD zstandard-0.14.0.ebuild 789 BLAKE2B 2ee199ec23794e2524044a895551f0a6fb0e49f2044d74c917452476839ad4f4b3efef97a933e02714f41227da908b5f67806f19c96cbff2cf526f97ce99f3e3 SHA512 4129104bf52449791d0e9649f7caafe504a4eb551665c320343fa159cbd377ab937aab821fe8812e32ca104d590c571ddc1018126ca935b9881fe4c15bbd4cf8
+EBUILD zstandard-0.14.0.ebuild 796 BLAKE2B 674efede48b9c34c15de6f9a3ec027b0761e2ee63fc3ce558a07a5e82f61998f856e7d3f1cca96452b7a719414d66795c71e65eb6c321f3682b343562c7a421c SHA512 c6f294d894d765c477986667cdf083219ac30d85f355798ccce31a19480be265c3870cc10f3f63169f70488aadebf2258ce80f7f67ffaf96e038c10577cd48a1
 EBUILD zstandard-0.8.1.ebuild 664 BLAKE2B 1b8903a1d059e9e3f8a903784a03658d733fb55648acd4c9b5fa49e89e49898263a48b77c38ef38d50612102b8d7cf46ff140b28ffa14890be691baeed24e4f5 SHA512 b8da1b96c32dda93794ee527971e607500097b8227f0e9cbb5dfac03ee4ed6a81846b60f88a295f31753bfad5d913adf49831bf61d946362ad4b54040e829c56
 MISC metadata.xml 377 BLAKE2B 987c1e1f5a7a37a8686acf05929a8c7cfa702358d5c8fcb678ebec0e28ab590d2dbfe92892330d006b202cc4fbc22eb4fec8876902ab56f44990a59932d6c0f3 SHA512 54b4b2a4b98fda27659ac1cb39e16ff788687aa814d882822ffdfa9c085b04bb3a24885f9a08ea73b05b959ed6441a6ff5090c1159300c1d024f1abf239cb141
diff --git a/dev-python/zstandard/files/zstandard-0.13.0-compiler.patch b/dev-python/zstandard/files/zstandard-0.13.0-compiler.patch
deleted file mode 100644
index fdaa4aa03922..000000000000
--- a/dev-python/zstandard/files/zstandard-0.13.0-compiler.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff --git a/make_cffi.py b/make_cffi.py
-index 0db4f71..4fe9cc4 100644
---- a/make_cffi.py
-+++ b/make_cffi.py
-@@ -8,6 +8,7 @@ from __future__ import absolute_import
- 
- import cffi
- import distutils.ccompiler
-+import distutils.sysconfig
- import os
- import re
- import subprocess
-@@ -75,10 +76,12 @@ compiler = distutils.ccompiler.new_compiler()
- if hasattr(compiler, "initialize"):
-     compiler.initialize()
- 
-+distutils.sysconfig.customize_compiler(compiler)
-+
- # Distutils doesn't set compiler.preprocessor, so invoke the preprocessor
- # manually.
- if compiler.compiler_type == "unix":
--    args = list(compiler.executables["compiler"])
-+    args = compiler.compiler
-     args.extend(
-         ["-E", "-DZSTD_STATIC_LINKING_ONLY", "-DZDICT_STATIC_LINKING_ONLY",]
-     )
diff --git a/dev-python/zstandard/zstandard-0.14.0.ebuild b/dev-python/zstandard/zstandard-0.14.0.ebuild
index 5723d9054b2e..62f5bce2971e 100644
--- a/dev-python/zstandard/zstandard-0.14.0.ebuild
+++ b/dev-python/zstandard/zstandard-0.14.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="BSD"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND=">=dev-python/cffi-1.14.0-r2:=[${PYTHON_USEDEP}]"
 BDEPEND="
diff --git a/dev-python/zxcvbn/Manifest b/dev-python/zxcvbn/Manifest
index 76a4a81047cf..8a1b920da634 100644
--- a/dev-python/zxcvbn/Manifest
+++ b/dev-python/zxcvbn/Manifest
@@ -1,3 +1,3 @@
 DIST zxcvbn-4.4.28.gh.tar.gz 9392042 BLAKE2B e3baf57df00819243f9588c8203598b14b9f03e0a232d53152584b3b74872baef7050fdf8f11f25e8a8776e2e4a7a0af15c9045f07700fe686c6cb021f794f2b SHA512 be85f976dcf685e2885edff116147cc4549f9c86dee4317b61b84dc4f36ab2c8c2f3468d5d1a55e8890693c852a09104b14360f9ce43feb3727f8fc164eb78f1
-EBUILD zxcvbn-4.4.28.ebuild 509 BLAKE2B bb3601deb04e9dbe60d03296285afd745dadfe9ce0f98aa90e5ee7d2fa088a7ee6781e5c5dc973d80c799efce5e21018845ff5d75279757f2b6940f768854998 SHA512 7037ec2d52446fba35dede62776382e5e7027a7856f3a84f4702ff487d0d0e02bcbb9cfa04f768d73523ef5241479e6494c00742dfd157d41b9cffa5268faef4
+EBUILD zxcvbn-4.4.28.ebuild 508 BLAKE2B a202c2b6a220225801ad36685183f23de6fc419bf4300a6f48ca0d6a7afa146c4c48f07f5d59e3a2ba91a7ea0f371090b606c7bbd9ed012c3a807914cdff0085 SHA512 1cf28786a2509d438a9622cd9abd007221bdce063582d655af75c5ccfdf5f06f9d16043ee0b458af594f8b92cacfc215b6bfeff65406841601fe604b71f2c1b3
 MISC metadata.xml 218 BLAKE2B 086fdcf7b63ca7bd6c58e861d717bb375e1cd372eff26d5d2eeeb176d8c5e6f10e653562abafb50eae7d7508f8e3d421b87e6a749acd0490308672828d0da697 SHA512 4558fee4c51117e21b1f42ca3edbdf1195ed297db798d6bfa0e5fbb7019654a187422b0abde7af5d800caffed66d1e55e4280e8be602bad591424d9776c46781
diff --git a/dev-python/zxcvbn/zxcvbn-4.4.28.ebuild b/dev-python/zxcvbn/zxcvbn-4.4.28.ebuild
index b5bbfd07f856..a70685ca6749 100644
--- a/dev-python/zxcvbn/zxcvbn-4.4.28.ebuild
+++ b/dev-python/zxcvbn/zxcvbn-4.4.28.ebuild
@@ -16,6 +16,6 @@ S=${WORKDIR}/zxcvbn-python-${PV}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 
 distutils_enable_tests pytest
author	V3n3RiX <venerix@redcorelinux.org>	2020-09-16 09:32:48 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2020-09-16 09:32:48 +0100
commit	9ee6d97c2883d42f204a533a8bc1f4562df778fb (patch)
tree	b690ddc0ca30f1472887edbb0b8313629bfcbbb2 /dev-python
parent	b17a3ef12038de50228bade1f05502c74e135321 (diff)