Adding metadata

30 files changed, 193 insertions, 135 deletions

diff --git a/dev-python/aesara/aesara-2.2.6.ebuild b/dev-python/aesara/aesara-2.2.6.ebuild
index 56d7b770c32b..ee76812f80e1 100644
--- a/dev-python/aesara/aesara-2.2.6.ebuild
+++ b/dev-python/aesara/aesara-2.2.6.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ~riscv x86"
 
 RDEPEND="
 	dev-python/filelock[${PYTHON_USEDEP}]
diff --git a/dev-python/cbor2/Manifest b/dev-python/cbor2/Manifest
index 2700d1f13559..ef261c2ddc02 100644
--- a/dev-python/cbor2/Manifest
+++ b/dev-python/cbor2/Manifest
@@ -1,2 +1 @@
-DIST cbor2-5.4.1.tar.gz 85777 BLAKE2B 7e81436c066dc245038fea6c5c8fb25ad87aae4c8b0a4d3e8ffa1a262dd4b08c6b0d8a79214dc13c87dc4ab6902b7762847b75f217a83769ef97783e2a25a6f4 SHA512 40aa8ad631eb6ba9a59a70fea4c6871057401550d7b4b59846e06b8a068458957beac9de1b811c8a9ca377ac06120efefb527e9a280defb55eb5767110ccb62c
 DIST cbor2-5.4.2.tar.gz 85847 BLAKE2B 1ad8b7bf54343ad7e969c797a444653e9cf501139facb98f92727be4d31148acedff29885e99c1535a44bcc9add4e4a1890c8f4605c2b82c9975821ee029d7bb SHA512 86e79ae19120dc39e79aa410b1e75df1d82b40c0523865989310f2d7214bfd824bf86ba158b2f695542ef2f34c76c8c4d5b28dbbb9815ee923444b00e86940d4
diff --git a/dev-python/cbor2/cbor2-5.4.1.ebuild b/dev-python/cbor2/cbor2-5.4.1.ebuild
deleted file mode 100644
index c3bf63675b52..000000000000
--- a/dev-python/cbor2/cbor2-5.4.1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Pure Python CBOR (de)serializer with extensive tag support"
-HOMEPAGE="https://github.com/agronholm/cbor2 https://pypi.org/project/cbor2/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 x86"
-
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# remove pytest-cov dep
-	sed -e "s/pytest-cov//" \
-		-e "s/--cov //" \
-		-i setup.cfg || die
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/cbor2/cbor2-5.4.2.ebuild b/dev-python/cbor2/cbor2-5.4.2.ebuild
index 194e5dbf1f64..c3bf63675b52 100644
--- a/dev-python/cbor2/cbor2-5.4.2.ebuild
+++ b/dev-python/cbor2/cbor2-5.4.2.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"
 
 BDEPEND="
 	dev-python/setuptools_scm[${PYTHON_USEDEP}]"
diff --git a/dev-python/cffi/cffi-1.15.0.ebuild b/dev-python/cffi/cffi-1.15.0.ebuild
index 6c23c708b493..605538d3eb4d 100644
--- a/dev-python/cffi/cffi-1.15.0.ebuild
+++ b/dev-python/cffi/cffi-1.15.0.ebuild
@@ -15,7 +15,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 ~riscv ~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"
 
 DEPEND="dev-libs/libffi:="
 RDEPEND="${DEPEND}
diff --git a/dev-python/cov-core/cov-core-1.15.0-r2.ebuild b/dev-python/cov-core/cov-core-1.15.0-r2.ebuild
deleted file mode 100644
index 471a7116f87f..000000000000
--- a/dev-python/cov-core/cov-core-1.15.0-r2.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
-inherit distutils-r1
-
-DESCRIPTION="plugin core for use by pytest-cov, nose-cov and nose2-cov"
-HOMEPAGE="https://github.com/schlamar/cov-core"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
-
-RDEPEND=">=dev-python/coverage-3.6[${PYTHON_USEDEP}]"
diff --git a/dev-python/cov-core/cov-core-1.15.0-r3.ebuild b/dev-python/cov-core/cov-core-1.15.0-r3.ebuild
index 9494790e3e02..4de5b8d6172b 100644
--- a/dev-python/cov-core/cov-core-1.15.0-r3.ebuild
+++ b/dev-python/cov-core/cov-core-1.15.0-r3.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 ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND=">=dev-python/coverage-3.6[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/flask-htmlmin/Manifest b/dev-python/flask-htmlmin/Manifest
index e89adb2596dc..c299eb8e264e 100644
--- a/dev-python/flask-htmlmin/Manifest
+++ b/dev-python/flask-htmlmin/Manifest
@@ -1,2 +1 @@
-DIST Flask-HTMLmin-2.1.0.gh.tar.gz 16395 BLAKE2B 259d3af497343d35fabb60e4aa1a832782de47fa78f2e8c6bdaa47a7e78efa8dfa756e87d0d03b5972f3e051a29dfff53b370cb1f3ee1f8a9e401d06c40894fd SHA512 3d3ea40bc5d802f41b0d3a99fcca59407b3948d9b4fe2300bc597bbfbaa851435276a7dcee4b6cc08cc52b0674a53fd655b7bb1c6504bd53ea9963600626a59a
 DIST Flask-HTMLmin-2.2.0.gh.tar.gz 17637 BLAKE2B 541ae212ba5bfd5e5881adb108d62c994248a7f851512d0fddedb001737620433cb46e267cdd66de73a353c6b357802eb89ea33c771153bc0acf3937c06f83c3 SHA512 24287ef93e99a16e7dde35ba6b7b8fefa06f11ce30fb47969313c3e0e1135ac8a2685aac06bc430d3253162f4f2bc7e8eed90ddda2092bbad092d4e0d09cb4fc
diff --git a/dev-python/flask-htmlmin/flask-htmlmin-2.1.0.ebuild b/dev-python/flask-htmlmin/flask-htmlmin-2.1.0.ebuild
deleted file mode 100644
index 7550ed3d4b97..000000000000
--- a/dev-python/flask-htmlmin/flask-htmlmin-2.1.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_PN="Flask-HTMLmin"
-MY_P=${MY_PN}-${PV}
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-inherit distutils-r1
-
-DESCRIPTION="Minimize your flask rendered html"
-HOMEPAGE="https://github.com/hamidfzm/Flask-HTMLmin"
-SRC_URI="
-	https://github.com/hamidfzm/Flask-HTMLmin/archive/v${PV}.tar.gz
-		-> ${MY_P}.gh.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="
-	app-text/htmlmin[${PYTHON_USEDEP}]
-	dev-python/flask[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	sed -i -e '/pytest-runner/d' setup.py || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/flask-htmlmin/flask-htmlmin-2.2.0.ebuild b/dev-python/flask-htmlmin/flask-htmlmin-2.2.0.ebuild
index 53a9eb5d47a0..2c646d2d511b 100644
--- a/dev-python/flask-htmlmin/flask-htmlmin-2.2.0.ebuild
+++ b/dev-python/flask-htmlmin/flask-htmlmin-2.2.0.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="
 	app-text/cssmin[${PYTHON_USEDEP}]
diff --git a/dev-python/fonttools/Manifest b/dev-python/fonttools/Manifest
index ef633a894f23..cd3dc815738f 100644
--- a/dev-python/fonttools/Manifest
+++ b/dev-python/fonttools/Manifest
@@ -1,3 +1,4 @@
 DIST fonttools-4.26.2.tar.gz 2579391 BLAKE2B 35a2533a336498aa1d5b9c2a61c1de6af03e6a7a1932a1ad71522f7f73e52590c347fe3e7d60b93b013389023792e6e6b91d6b4bfb92e007062dc2ac494adbb6 SHA512 2caa52a48574e6bdf418fe57fb4ca69686eeae65cb1f44c0cb16c64400ea666530dfcca9e8a619859cf553435f93b38f63e422c315206ecec467eed6339a5987
 DIST fonttools-4.28.0.tar.gz 2654535 BLAKE2B 2bdde1a5c9184574e220bf3fa5dea04ae0e4ab8bb85bb8893e38e96cd028dc6cdcb88b21a9d12429292fe9cb282a90ce7b3abf4f17dea95df52165f5f4d0da0c SHA512 6fddef1d065001afd63147fc474c49f7799895aafddb37b3c94e981fa86e829b39865a40c61e3bf1e64f64a40cf4d5ae02fa98fcf7c89d3f893a2588d213427d
 DIST fonttools-4.28.1.tar.gz 2654329 BLAKE2B 4d1f2f5caea6ee3ae73a7791ad34da0c49353ef8b8f834c29e990c3c937b05bfdbf32474a4279c9f32f9fce78b4935ba9ba8434576b318b70736c1e14763eb70 SHA512 abcc8b182436feae8e1cfe263488c87f2351079d25a2211529ccf3401a9533f5322a7028d20ba0e31405ec3acad369b46d3b07bf8b4dfe16e43f48859fc5a29f
+DIST fonttools-4.28.2.tar.gz 2940111 BLAKE2B 32f67f2c270520d9e2091052242e504b9a8e459a87f233e22f50bfe3d17309a09a3c7ad5da20a3411df1c7c58b790dd395535407fdeddb02e7391c28d8d08fa3 SHA512 0295c571e92e71f6467b06bd89afacae76861e374147a2051fe3f5323176c3f3458b977ba2ed25cadcdba9e55b325b6febc50bc9c539d8806471730a15faed47
diff --git a/dev-python/fonttools/fonttools-4.28.2.ebuild b/dev-python/fonttools/fonttools-4.28.2.ebuild
new file mode 100644
index 000000000000..280f5b4947c7
--- /dev/null
+++ b/dev-python/fonttools/fonttools-4.28.2.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+PYTHON_REQ_USE="xml(+)"
+
+inherit distutils-r1 virtualx
+
+DESCRIPTION="Library for manipulating TrueType, OpenType, AFM and Type1 fonts"
+HOMEPAGE="https://github.com/fonttools/fonttools/"
+SRC_URI="https://github.com/fonttools/fonttools/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
+
+RDEPEND=">=dev-python/fs-2.4.9[${PYTHON_USEDEP}]"
+BDEPEND="
+	${RDEPEND}
+	dev-python/cython[${PYTHON_USEDEP}]
+	test? (
+		app-arch/brotli[python,${PYTHON_USEDEP}]
+		app-arch/zopfli
+	)"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# When dev-python/pytest-shutil is installed, we get weird import errors.
+	# This is due to incomplete nesting in the Tests/ tree:
+	#
+	#   Tests/feaLib/__init__.py
+	#   Tests/ufoLib/__init__.py
+	#   Tests/svgLib/path/__init__.py
+	#   Tests/otlLib/__init__.py
+	#   Tests/varLib/__init__.py
+	#
+	# This tree requires an __init__.py in Tests/svgLib/ too, bug #701148.
+	touch Tests/svgLib/__init__.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+src_configure() {
+	DISTUTILS_ARGS=( --with-cython )
+}
+
+python_test() {
+	distutils_install_for_testing
+	# virtualx used when matplotlib is installed causing plot module tests to run
+	virtx epytest Tests fontTools
+}
diff --git a/dev-python/furo/furo-2021.10.9.ebuild b/dev-python/furo/furo-2021.10.9.ebuild
index a8804c77f96c..83b63e4ec8d8 100644
--- a/dev-python/furo/furo-2021.10.9.ebuild
+++ b/dev-python/furo/furo-2021.10.9.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~sparc x86"
+KEYWORDS="amd64 arm arm64 ~riscv ~sparc x86"
 
 RDEPEND="
 	dev-python/beautifulsoup4[${PYTHON_USEDEP}]
diff --git a/dev-python/hypothesis/Manifest b/dev-python/hypothesis/Manifest
index e57ee372411b..46a4550d4db2 100644
--- a/dev-python/hypothesis/Manifest
+++ b/dev-python/hypothesis/Manifest
@@ -3,3 +3,4 @@ DIST hypothesis-python-6.24.4.tar.gz 9168664 BLAKE2B fe3d2fa28d7e8f47e4ce60fa91b
 DIST hypothesis-python-6.24.5.tar.gz 9168940 BLAKE2B 719efd5c307708f3fa205e2096e54ad44009248bd6c03873cbf14eaacb48c5aaf2f444b430418ae3d6d107b53def52a0a6194d9827e94abb1c97af4f12f02072 SHA512 215c4009b9496983c1c3bb3fee7c051fed434c57d48dbcaa5ff0aa42c60c33a507c424eb7e604d323b61c6171d97cbd02d492bcda99bc278b099fd2f3fb074ca
 DIST hypothesis-python-6.24.6.tar.gz 9169209 BLAKE2B 448eedad86d41c766d2bb450f18965592e5f8c53bfc341a081591ae916be00e2a9d5e82633059753e6c47b7905cb09a94e634463cd90bd65c87598f8d92bc58c SHA512 6cd13eb1bf33d5a72debbc262f691949b60ee8bcf6a1c3c263a55b4cc4498c1bd0568088f541ef68152219e9a12d7cfd2a53a3d37a6bba0cec7b2b57b4500e42
 DIST hypothesis-python-6.25.0.tar.gz 9170363 BLAKE2B 505aebee64882de9516a653d7906b0d739d2077fd3d2d5bffa2532111d37ca4cdd62ce768dfedf9b9987d1750af7851a015d7feafbed77ab131d15e62f8ec6f1 SHA512 a22ee5632d77dd7c3570b4c5b9faa04c2ee6e7f101d87a3046ee5206b8a444367311573d39c02b12a6ec5b626ab8b89b523bed7e387da59ee3d673601e3f8015
+DIST hypothesis-python-6.27.0.tar.gz 9172229 BLAKE2B e5d69923579877a4abaa740663a36510452e10cb782c1c239db03ae22bad9898ba881d808d33ecedaf9319130e619ccadfe87ad9719b1fb05bbcbcd9683d8bba SHA512 54083e0fff2e1af8d3cd91b0e059565091e63058029a501a098228a5b1a411fe652ac542e847c0b03407f9b3f27ca5358b43b15740d6e9e0c882c94ef9e48bad
diff --git a/dev-python/hypothesis/hypothesis-6.27.0.ebuild b/dev-python/hypothesis/hypothesis-6.27.0.ebuild
new file mode 100644
index 000000000000..8b48444a4699
--- /dev/null
+++ b/dev-python/hypothesis/hypothesis-6.27.0.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
+PYTHON_REQ_USE="threads(+),sqlite"
+
+inherit distutils-r1 multiprocessing optfeature
+
+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 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+IUSE="cli"
+
+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_{7..9})
+	)
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pexpect[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+		!!<dev-python/typing-3.7.4.1
+	)
+"
+
+distutils_enable_tests --install pytest
+
+python_prepare() {
+	if ! use cli || ! has "${EPYTHON}" python3.{7..9}; then
+		sed -i -e '/console_scripts/d' setup.py || die
+	fi
+}
+
+python_test() {
+	distutils_install_for_testing
+	epytest tests/cover tests/pytest tests/quality \
+		-p no:pytest-describe \
+		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
+}
+
+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/mpmath/mpmath-1.2.1.ebuild b/dev-python/mpmath/mpmath-1.2.1.ebuild
index 15e8ff9caf95..5d0ce0f9d264 100644
--- a/dev-python/mpmath/mpmath-1.2.1.ebuild
+++ b/dev-python/mpmath/mpmath-1.2.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/fredrik-johansson/${PN}/archive/${PV}.tar.gz -> ${P}
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="gmp matplotlib"
 
 RDEPEND="
diff --git a/dev-python/netaddr/metadata.xml b/dev-python/netaddr/metadata.xml
index d38d7239b0ec..b7055133c907 100644
--- a/dev-python/netaddr/metadata.xml
+++ b/dev-python/netaddr/metadata.xml
@@ -11,8 +11,5 @@
   <bugs-to>https://github.com/netaddr/netaddr/issues</bugs-to>
   <doc>https://netaddr.readthedocs.io/</doc>
  </upstream>
- <use>
-  <flag name="cli">Enable netaddr shell with <pkg>dev-python/ipython</pkg></flag>
- </use>
  <origin>gentoo-staging</origin>
 </pkgmetadata>
\ No newline at end of file
diff --git a/dev-python/netaddr/netaddr-0.8.0.ebuild b/dev-python/netaddr/netaddr-0.8.0.ebuild
index 537d8f0b3635..0b0605019002 100644
--- a/dev-python/netaddr/netaddr-0.8.0.ebuild
+++ b/dev-python/netaddr/netaddr-0.8.0.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 PYTHON_COMPAT=( python3_{6,7,8,9,10} )
 
-inherit distutils-r1
+inherit distutils-r1 optfeature
 
 DESCRIPTION="Network address representation and manipulation library"
 HOMEPAGE="https://github.com/drkjam/netaddr https://pypi.org/project/netaddr/ https://netaddr.readthedocs.org"
@@ -16,13 +16,6 @@ SRC_URI="https://github.com/netaddr/netaddr/archive/${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
-IUSE="cli"
-
-RDEPEND="
-	cli? (
-		>=dev-python/ipython-0.13.1-r1[${PYTHON_USEDEP}]
-	)
-"
 
 distutils_enable_sphinx docs/source
 distutils_enable_tests pytest
@@ -32,3 +25,7 @@ src_prepare() {
 	sed -i 's/^addopts = .*//' pytest.ini || die
 	distutils-r1_src_prepare
 }
+
+pkg_postinst() {
+	optfeature "CLI support" dev-python/ipython
+}
diff --git a/dev-python/pikepdf/Manifest b/dev-python/pikepdf/Manifest
index f7821f765ff9..ae37cbc821c7 100644
--- a/dev-python/pikepdf/Manifest
+++ b/dev-python/pikepdf/Manifest
@@ -1,3 +1,4 @@
 DIST pikepdf-3.2.0.tar.gz 2335339 BLAKE2B 3d294c2c8241bfcfa2b84f4c6af10e4da2e624374af0aed9c4fa597f9d0a789b9d85cb074d945ba521dbdd10f126326bb6d698a97102a93e6de589d89d7fee57 SHA512 307e2289811697b65c021e90496a4d1606e171e557bf5f19e5327be782e59e8683847524eb177ced54612d1e586b070860119a51e74fe25003787b359bf74531
 DIST pikepdf-4.0.0.tar.gz 2335830 BLAKE2B 80e36162709cd9eb23ce70994286d51cd4e83d242dafe65c724fa64a46b67bee048d76efa3934717334ba196d98d7ec70dd7f20b5d42a2a2d56326603f0adc88 SHA512 5727f60c05a72d1b7a249803020358cbb579e180ad1e5685d6120443b75a2b8483bd16c5c705f1fccd5159a0ab23a8b844ab57d39499ce4bf883e5caf2710051
 DIST pikepdf-4.0.1.tar.gz 2335951 BLAKE2B 760e80991d902b37d2d1a832e5d0c2685603e409772cc3cbf5a2ec24230ff0b10989adc7ca78c7f335fc8214df537479b303bab35bd7754c8397ccb72ed56cf7 SHA512 b552f711324eb81fa6f848500ecc2ea215cb938464a4cc6d02348ef3feeda8fc1fbab9b96601b4f5ad1f950322b8d68ddb3ae5bf0b3a703fc07bdc973aa36afd
+DIST pikepdf-4.0.2.tar.gz 2336204 BLAKE2B d7c8e0c16195b2738302ebc4d29f898a590716ddcf382776a8ea55c75bb39a491473f552bf51b1daad76e74999e2c006282f4b861ce0c8bc967bc4a94740af46 SHA512 a2f1df8d6ae427e59a03232bead0034ef27ff68123efdb522da6ceaeb0d213182b8f6cce11bf89f0c39b464a8569e40164e2b028e2fd6b8b166ab45bf89aff11
diff --git a/dev-python/pikepdf/pikepdf-4.0.2.ebuild b/dev-python/pikepdf/pikepdf-4.0.2.ebuild
new file mode 100644
index 000000000000..2f4e00da349b
--- /dev/null
+++ b/dev-python/pikepdf/pikepdf-4.0.2.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+inherit distutils-r1
+
+MY_P=${P/_p/.post}
+DESCRIPTION="Python library to work with pdf files based on qpdf"
+HOMEPAGE="https://pypi.org/project/pikepdf/ https://github.com/pikepdf/pikepdf"
+SRC_URI="
+	https://github.com/${PN}/${PN}/archive/v${PV/_p/.post}.tar.gz
+		-> ${MY_P}.tar.gz"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND=">=app-text/qpdf-10.3.1:0="
+RDEPEND="${DEPEND}
+	>=dev-python/pillow-7[${PYTHON_USEDEP}]
+	>=dev-python/lxml-4.0[${PYTHON_USEDEP}]
+	>=dev-python/pybind11-2.7.1[${PYTHON_USEDEP}]"
+BDEPEND="
+	>=dev-python/pybind11-2.7.1[${PYTHON_USEDEP}]
+	>=dev-python/setuptools_scm-4.1[${PYTHON_USEDEP}]
+	dev-python/toml[${PYTHON_USEDEP}]
+	dev-python/setuptools_scm_git_archive[${PYTHON_USEDEP}]
+	test? (
+		>=dev-python/attrs-20.2.0[${PYTHON_USEDEP}]
+		>=dev-python/hypothesis-5[${PYTHON_USEDEP}]
+		>=dev-python/pillow-5.0.0[${PYTHON_USEDEP},jpeg,lcms,tiff]
+		>=dev-python/psutil-5[${PYTHON_USEDEP}]
+		>=dev-python/pytest-6[${PYTHON_USEDEP}]
+		>=dev-python/pytest-timeout-1.4.2[${PYTHON_USEDEP}]
+		>=dev-python/python-dateutil-2.8.0[${PYTHON_USEDEP}]
+		>=dev-python/python-xmp-toolkit-2.0.1[${PYTHON_USEDEP}]
+	)"
+
+#distutils_enable_sphinx docs \
+#	dev-python/ipython \
+#	dev-python/matplotlib \
+#	dev-python/sphinx_rtd_theme
+distutils_enable_tests pytest
+
+src_prepare() {
+	sed -i -e '/-n auto/d' pyproject.toml || die
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/pydecomp/pydecomp-0.3-r1.ebuild b/dev-python/pydecomp/pydecomp-0.3-r1.ebuild
deleted file mode 100644
index 51bf1b5f93a2..000000000000
--- a/dev-python/pydecomp/pydecomp-0.3-r1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-DISTUTILS_USE_SETUPTOOLS=no
-
-inherit distutils-r1
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_BRANCH="master"
-	EGIT_REPO_URI="https://github.com/dol-sen/pyDeComp.git"
-	inherit git-r3
-else
-	SRC_URI="https://dev.gentoo.org/~dolsen/releases/${PN}/pyDeComp-${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-	S="${WORKDIR}/pyDeComp-${PV}"
-fi
-
-DESCRIPTION="A python library of common (de)compression and contents handling"
-HOMEPAGE="https://github.com/dol-sen/pyDeComp"
-
-LICENSE="BSD"
-SLOT="0"
diff --git a/dev-python/pyglet/pyglet-1.5.21.ebuild b/dev-python/pyglet/pyglet-1.5.21.ebuild
index 283e937205d0..a5553ee2ec95 100644
--- a/dev-python/pyglet/pyglet-1.5.21.ebuild
+++ b/dev-python/pyglet/pyglet-1.5.21.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/pyglet/pyglet/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~riscv x86 ~amd64-linux ~x86-linux"
 IUSE="examples image +sound"
 
 BDEPEND="
diff --git a/dev-python/pynvim/pynvim-0.4.3.ebuild b/dev-python/pynvim/pynvim-0.4.3-r1.ebuild
index 04cd81dac244..eabc1f35f4e7 100644
--- a/dev-python/pynvim/pynvim-0.4.3.ebuild
+++ b/dev-python/pynvim/pynvim-0.4.3-r1.ebuild
@@ -14,9 +14,9 @@ LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="amd64 ~arm ~x86"
 
-DEPEND="
-	dev-python/msgpack[${PYTHON_USEDEP}]
-	virtual/python-greenlet[${PYTHON_USEDEP}]
+RDEPEND="dev-python/msgpack[${PYTHON_USEDEP}]
+	virtual/python-greenlet[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
 	test? ( app-editors/neovim )"
 
 distutils_enable_tests pytest
diff --git a/dev-python/pytz_deprecation_shim/pytz_deprecation_shim-0.1.0_p0-r1.ebuild b/dev-python/pytz_deprecation_shim/pytz_deprecation_shim-0.1.0_p0-r1.ebuild
index 45821933a1cd..bbca3ace85b8 100644
--- a/dev-python/pytz_deprecation_shim/pytz_deprecation_shim-0.1.0_p0-r1.ebuild
+++ b/dev-python/pytz_deprecation_shim/pytz_deprecation_shim-0.1.0_p0-r1.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86"
 
 RDEPEND="
 	$(python_gen_cond_dep '
diff --git a/dev-python/pyyaml/pyyaml-6.0.ebuild b/dev-python/pyyaml/pyyaml-6.0.ebuild
index c2673feb164a..69db6a8781a2 100644
--- a/dev-python/pyyaml/pyyaml-6.0.ebuild
+++ b/dev-python/pyyaml/pyyaml-6.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/yaml/pyyaml/archive/${PV}.tar.gz -> ${P}.gh.tar.gz"
 
 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 ~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 ~x64-solaris ~x86-solaris"
 IUSE="examples"
 
 RDEPEND="dev-libs/libyaml:="
diff --git a/dev-python/reportlab/reportlab-3.6.2.ebuild b/dev-python/reportlab/reportlab-3.6.2.ebuild
index b7bf963cd077..4bba1393256f 100644
--- a/dev-python/reportlab/reportlab-3.6.2.ebuild
+++ b/dev-python/reportlab/reportlab-3.6.2.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
 
 DEPEND="
 	media-libs/freetype
diff --git a/dev-python/symengine/symengine-0.7.2-r2.ebuild b/dev-python/symengine/symengine-0.7.2-r2.ebuild
index 4145fdad27ec..a2e613c813ee 100644
--- a/dev-python/symengine/symengine-0.7.2-r2.ebuild
+++ b/dev-python/symengine/symengine-0.7.2-r2.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~riscv x86 ~amd64-linux ~x86-linux"
 
 BDEPEND="
 	dev-util/cmake
diff --git a/dev-python/sympy/sympy-1.8.ebuild b/dev-python/sympy/sympy-1.8.ebuild
index c846bc3ff0a3..8a24a6330b8e 100644
--- a/dev-python/sympy/sympy-1.8.ebuild
+++ b/dev-python/sympy/sympy-1.8.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/${PN}-${P}"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="amd64 ~arm ~arm64 ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="aesara examples imaging ipython latex mathml opengl pdf png pyglet symengine test texmacs"
 
 RDEPEND="
diff --git a/dev-python/tzlocal/tzlocal-4.1.ebuild b/dev-python/tzlocal/tzlocal-4.1.ebuild
index 678232801053..0c75adb39d3a 100644
--- a/dev-python/tzlocal/tzlocal-4.1.ebuild
+++ b/dev-python/tzlocal/tzlocal-4.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/regebro/tzlocal/archive/${PV}.tar.gz -> ${P}.gh.tar.
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86"
 
 RDEPEND="
 	dev-python/pytz_deprecation_shim[${PYTHON_USEDEP}]
diff --git a/dev-python/zstandard/zstandard-0.16.0.ebuild b/dev-python/zstandard/zstandard-0.16.0.ebuild
index 496fa1026788..43bbd2dbb624 100644
--- a/dev-python/zstandard/zstandard-0.16.0.ebuild
+++ b/dev-python/zstandard/zstandard-0.16.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 ~mips ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 DEPEND="
 	app-arch/zstd:="