Adding metadata

38 files changed, 596 insertions, 102 deletions

diff --git a/dev-python/abydos/abydos-0.5.0-r1.ebuild b/dev-python/abydos/abydos-0.5.0-r1.ebuild
index 2452a0ea812c..da0465a9a953 100644
--- a/dev-python/abydos/abydos-0.5.0-r1.ebuild
+++ b/dev-python/abydos/abydos-0.5.0-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/chrislit/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 # Requires access to the internet
 RESTRICT="test"
diff --git a/dev-python/abydos/abydos-0.5.0.ebuild b/dev-python/abydos/abydos-0.5.0.ebuild
deleted file mode 100644
index da0465a9a953..000000000000
--- a/dev-python/abydos/abydos-0.5.0.ebuild
+++ /dev/null
@@ -1,39 +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} )
-
-inherit distutils-r1
-
-DESCRIPTION="Abydos NLP/IR library"
-HOMEPAGE="https://github.com/chrislit/abydos"
-SRC_URI="https://github.com/chrislit/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-# Requires access to the internet
-RESTRICT="test"
-
-RDEPEND="
-	dev-python/deprecation[${PYTHON_USEDEP}]
-	dev-python/numpy[${PYTHON_USEDEP}]
-"
-
-BDEPEND="test? (
-	dev-python/nltk[${PYTHON_USEDEP}]
-)"
-
-distutils_enable_tests pytest
-# Extension error: You must configure the bibtex_bibfiles setting
-#distutils_enable_sphinx docs dev-python/sphinx_rtd_theme dev-python/sphinxcontrib-bibtex
-
-python_prepare_all() {
-	# do not depend on pytest-cov
-	sed -i -e '/addopts/d' setup.cfg || die
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/argh/argh-0.26.2-r2.ebuild b/dev-python/argh/argh-0.26.2-r2.ebuild
index c8c35b4fbfda..ab545193b411 100644
--- a/dev-python/argh/argh-0.26.2-r2.ebuild
+++ b/dev-python/argh/argh-0.26.2-r2.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://pythonhosted.org/argh/"
 SRC_URI="mirror://pypi/a/${PN}/${P}.tar.gz"
 
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86"
+KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86"
 LICENSE="LGPL-3"
 
 BDEPEND="
diff --git a/dev-python/boto3/Manifest b/dev-python/boto3/Manifest
index ca43a4aa70a4..1c841be2984d 100644
--- a/dev-python/boto3/Manifest
+++ b/dev-python/boto3/Manifest
@@ -1,4 +1,5 @@
 DIST boto3-1.17.100.tar.gz 385310 BLAKE2B fef5fb0cf4862819c05efa3eb793cf2c9756c003aa4de2c8288a0b46d2f6f2cace53ba09429761437073fac366ad73cc1e816b480a22d42f1d3b9c5160fc3a07 SHA512 2d137d2dc6265a784af961b4e61faddf2a9b9493fc281da9764fd1ef8e855777d48daeaef7380e9d83408c6358e33c2898ad60c95e685bc04a9821cb0b2cfc3b
+DIST boto3-1.17.101.tar.gz 385690 BLAKE2B 7b98615588eb09513eba33f1fd1019631c862def949f9c8314cc8b8506e83be3b3bfe88c08d97166e9f669db2724b02a247769db7f4262c7b4d306afdb3bf2e6 SHA512 cda7c5c42ef809397002d64f04e23bfac271086b4601595b635dacbab4592cab401b6238291ae2fa898d2419b4a0f2d3d0bc7828c0a7de2442ad0026a5565d56
 DIST boto3-1.17.54.tar.gz 362224 BLAKE2B d67ea9a2833d4cf6ec50fc4eab9c194f813f92ef00fa0d1638e0dca0bf03a92fa5208707b3ceda70759231aa69c35bf83028eada42d04209a55d05daf37ce764 SHA512 795a78807e8aad9ba53b196ac6b3547e23d2f7cc962a34121280fe47dfa8f99eac19765c87817918c6ee36dfb7e2b647e5646b7da27eb67900f29430bfe2fb5c
 DIST boto3-1.17.74.tar.gz 371719 BLAKE2B f6d44206a14cdf395c8963be048e81391ecbf6817b1c00e1cd081abf111df8bd85c05fa1c04b013de7e6d916835e4876cc961891c8d52d8a32e41713080ed96e SHA512 a79012072238286561ab43ca7bb9f24236e858e0bf550be9a074517145445d0d520cc207683d99f6f704416f617b5f89468c87357223db9564e4310a2a2676f1
 DIST boto3-1.17.78.tar.gz 374487 BLAKE2B 8a83cb32db8336351454251a3cf78efad6197885a66c10a4e3f9e13770d92d7cd9e9b51bfc7c4bfdb2f5183c5246872d7f3075d55b5129606ad9d977ecbf9891 SHA512 8ab9f13360f63342219d7b0278e2ca5613f8d051d006ef26da14307e83fcaaf1a546c566cb4b8ba012fa5e8e6b5e409722228da0989e56f50e40df4a733602de
diff --git a/dev-python/boto3/boto3-1.17.101.ebuild b/dev-python/boto3/boto3-1.17.101.ebuild
new file mode 100644
index 000000000000..76a508785b03
--- /dev/null
+++ b/dev-python/boto3/boto3-1.17.101.ebuild
@@ -0,0 +1,56 @@
+# 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} )
+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 ~ppc ~ppc64 ~sparc ~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 c2c5ca83d412..05658383dd6b 100644
--- a/dev-python/botocore/Manifest
+++ b/dev-python/botocore/Manifest
@@ -1,4 +1,5 @@
 DIST botocore-1.20.100.tar.gz 7870739 BLAKE2B 0af8337b44f78f0d66062c3e351e6c2805ab4e205e1404a698bad7240abf37f4fd47206c9b3f9a302053c933ab774e8842edefa38979b09d5b111b836137119f SHA512 af20cf638e48375b0adbadac5329aa62008def72e158159acbcdc200b250c0ac27e0ea568cd216ad8e81772b42491efed5a271f186d9caf0dc7e3bbf0197b7c6
+DIST botocore-1.20.101.tar.gz 7872329 BLAKE2B 417f92e0747d32e9238e318af1f4063c86aca6364c63f312755efea6135df9415dd37dfa754896e78573329da0bb9e5f5609cbd836fd771e4ef185d691b1f5f3 SHA512 6641f14bbe9385acc764377be27b8d50f8eb0044330bc7248adc27c7605d4bcb489203f3953cd3ef17ec0f3e49d1df4e84f6ebce2c7d5b2b54d98406d836b49a
 DIST botocore-1.20.54.tar.gz 7650344 BLAKE2B 2dd0a3f8c7c5665e849cf74b663a88e63416f1dea8ca3ee7dbdf10cf35239d466919f2ae4b3c9a639b9e25a23d982b723b24f32ece43715d40283e96e3bf10f6 SHA512 77cdaf68378836205c94c7dfd8424f9ca44ac822fd418d323df30639157bb38e5534fcfbc5bb6cdd7695bec62e24a1d52b81a0be54b0f69f16d20c5182db004b
 DIST botocore-1.20.74.tar.gz 7729804 BLAKE2B 0693da2be219ee140c5c00a540756d31651d3e4c78976a7f766705123e9fba23e98d73e551b86a6b661530c20abb560b0e36fea8e1c13600303894b3163d2274 SHA512 51bcf78c6804b4a8cddd57eeff96d7ecb65731dfbd87eb665de1356c1daedb4317323b3a0d905e3d459800d800ce6d6ffd8fd1239b26ecf56884bee37159f2b7
 DIST botocore-1.20.78.tar.gz 7758829 BLAKE2B af13d6c1aa918e2c49c6dc931c9a78e1899c83e62657c063e20ba2a5544c48e4946018628e47d6a56db456a3a8d43fe3b577824bd76bbc339abaef375459932e SHA512 fc96ed8b6b4af05404654e470a4f83419b885fa32d9dc704727f4ffb3d5deeefa752d235b37fd81448b7f3b101bc0f8e7ea09ae8641f8961566f77f6a039cef9
diff --git a/dev-python/botocore/botocore-1.20.101.ebuild b/dev-python/botocore/botocore-1.20.101.ebuild
new file mode 100644
index 000000000000..ca62b7dad65f
--- /dev/null
+++ b/dev-python/botocore/botocore-1.20.101.ebuild
@@ -0,0 +1,59 @@
+# 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} )
+
+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 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+fi
+
+RDEPEND="
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/jmespath[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	>=dev-python/urllib3-1.25.4[${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"
+)
+
+distutils_enable_sphinx docs/source \
+	'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests nose
+
+src_prepare() {
+	# unpin deps
+	sed -i -e "s:>=.*':':" setup.py || 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/cachelib/Manifest b/dev-python/cachelib/Manifest
index c95aaa1f639f..23172b94e34a 100644
--- a/dev-python/cachelib/Manifest
+++ b/dev-python/cachelib/Manifest
@@ -1 +1,2 @@
 DIST cachelib-0.1.1.tar.gz 10192 BLAKE2B ce1ac03498e331c0df405e99b26f24cf38f21243c60d90ca3b0fab599abce5ac8c59ba8c566216d761fea170d64934c63fd74f9733c50aa3ebe382c54b80bcfa SHA512 865dba727427907227b021ecc5962738c85fb74f898acfe1612e48247ada9eda3eddb72c3c29c700fe4275ed699accc5af9526afbaf0dfbfb3a1a1a6370cc3d6
+DIST cachelib-0.2.0.tar.gz 17735 BLAKE2B 737c5083b719b6330df4eab3e256fa64b9bd2292d46a1c0b82c72c6f69f4f2fae6623fd4bc167533101e0ff01b5273a1042f5c1bdf35080a5241358de642cba3 SHA512 4011d9ead4fe27a54508355eba46e91a924ce30ef3d7cdc5a2049f7e0e48f924b64d65f203aebcf9a8729f956b6edde4160cdb7edfa7e63293e2853b94bd6601
diff --git a/dev-python/cachelib/cachelib-0.2.0.ebuild b/dev-python/cachelib/cachelib-0.2.0.ebuild
new file mode 100644
index 000000000000..1bb489332930
--- /dev/null
+++ b/dev-python/cachelib/cachelib-0.2.0.ebuild
@@ -0,0 +1,28 @@
+# 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} )
+
+inherit distutils-r1
+
+DESCRIPTION="Collection of cache libraries in the same API interface. Extracted from werkzeug"
+HOMEPAGE="https://pypi.org/project/cachelib/ https://github.com/pallets/cachelib"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+
+BDEPEND="
+	test? (
+		dev-db/redis
+		dev-python/pylibmc[${PYTHON_USEDEP}]
+		dev-python/pytest-xprocess[${PYTHON_USEDEP}]
+		dev-python/redis-py[${PYTHON_USEDEP}]
+		net-misc/memcached
+		www-servers/uwsgi[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
diff --git a/dev-python/cachelib/metadata.xml b/dev-python/cachelib/metadata.xml
index 5ec6df696391..af03b0c89564 100644
--- a/dev-python/cachelib/metadata.xml
+++ b/dev-python/cachelib/metadata.xml
@@ -4,6 +4,10 @@
  <maintainer type="person">
   <email>kensington@gentoo.org</email>
  </maintainer>
+ <maintainer type="project">
+  <email>python@gentoo.org</email>
+  <name>Python</name>
+ </maintainer>
  <upstream>
   <remote-id type="pypi">cachelib</remote-id>
   <remote-id type="github">pallets/cachelib</remote-id>
diff --git a/dev-python/croniter/Manifest b/dev-python/croniter/Manifest
index ad52ccf8714c..85d9a23e541d 100644
--- a/dev-python/croniter/Manifest
+++ b/dev-python/croniter/Manifest
@@ -1,2 +1,3 @@
 DIST croniter-1.0.12.tar.gz 38763 BLAKE2B 28bb662b05d893c782807687261b3bdafa0b1412d98dc8ceebcc0d9fff941f58b22a3abf9462c0f601bbe8701460350dad70d1239aa4f28978444698836b87b2 SHA512 ff5e35ddb0a6080ff95155de2ac5942fa1cab827a4cbb6e639553f8646b89063d0292b7fd69bc38fca90429da0272f3efeeefe0cbde0d83b9915ecb078340f08
 DIST croniter-1.0.13.tar.gz 38907 BLAKE2B 436bb766c39ad61343913e354d0838458e56048115ed5d15ef95b0dc0c22b38fb4e7ec3fe6162856d208d45268fd360c8b18698b7c61bb0f70636b79a6a84988 SHA512 721749a268734e06776ab968a1fb01926f416e1a42678ee28dcac9b4655a92b5cb17984a9b9d886f8d963484f1af7382b17e72fd3998e3e1e8101fa5038a4fa1
+DIST croniter-1.0.15.tar.gz 39164 BLAKE2B daf40bcc7c791dd2a65d2cd132c380dff03353ab6d7920adddff2b1b6a87166050be6ed2b7bac5eb2b9543dcab9a4f2f65738506dc35eff0836cc591e486f885 SHA512 5aebc8a60d278acae3cef7eee6ee0ec223e44ae01b69dae601f76cb14f135547557b1417498d71a84e187dd478605efdf15355f8ad0344e459b6b40d41e994af
diff --git a/dev-python/croniter/croniter-1.0.15.ebuild b/dev-python/croniter/croniter-1.0.15.ebuild
new file mode 100644
index 000000000000..abce99f9e8d3
--- /dev/null
+++ b/dev-python/croniter/croniter-1.0.15.ebuild
@@ -0,0 +1,26 @@
+# 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} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python module to provide iteration for datetime object"
+HOMEPAGE="https://github.com/kiorky/croniter https://pypi.org/project/croniter/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+RDEPEND="
+	dev-python/python-dateutil[${PYTHON_USEDEP}]"
+BDEPEND="
+	test? (
+		dev-python/pytz[${PYTHON_USEDEP}]
+		dev-python/tzlocal[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
diff --git a/dev-python/emcee/Manifest b/dev-python/emcee/Manifest
index 26942bdbd401..b93a888cdd80 100644
--- a/dev-python/emcee/Manifest
+++ b/dev-python/emcee/Manifest
@@ -1 +1,2 @@
 DIST emcee-3.0.2.tar.gz 4054969 BLAKE2B 16b9ebd34b450f8fb92dc50f0652a34f06d20a027ff1cacd73474f4c74ecce7102d5eea54182598fc17175897980131742c0d60ef217b0dc8285c18406ef4d7f SHA512 517c447b9426eb97b72b6e3b21d77720b58a42fc1efe9495cf7ad8a0682841b8d7178a6f070641f68a09aef507e854ceefab9a54afe6baaca8b41f16f34dce9e
+DIST emcee-3.1.0.tar.gz 2868282 BLAKE2B 333bb3dfb1b88bd768dc824763827d7b5f7f6dbef83c98a3934789a52d2989fc09474f628a609b3c0b930f3582bd75240895a4f0fe6e2cab486bc5cdc6947c56 SHA512 45f4ee3a9f6e7f8b4e3cf6eef187facbc1c93dece10a6b0c9c2d55da093f26e159c254818aada3abb1c45985950cd83f286b7f3e5acc467ebd2f292df9f1202b
diff --git a/dev-python/emcee/emcee-3.1.0.ebuild b/dev-python/emcee/emcee-3.1.0.ebuild
new file mode 100644
index 000000000000..888ea718e662
--- /dev/null
+++ b/dev-python/emcee/emcee-3.1.0.ebuild
@@ -0,0 +1,38 @@
+# 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} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python ensemble sampling toolkit for affine-invariant MCMC"
+HOMEPAGE="https://emcee.readthedocs.io/en/stable/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	dev-python/h5py[${PYTHON_USEDEP}]
+	dev-python/numpy[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? (
+		dev-python/scipy[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+DOCS=( AUTHORS.rst README.rst )
+
+src_prepare() {
+	# unnecessary dep
+	sed -i -e '/wheel/d' setup.py || die
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/iocapture/iocapture-0.1.2-r2.ebuild b/dev-python/iocapture/iocapture-0.1.2-r2.ebuild
index fa5531994085..a10b012059a1 100644
--- a/dev-python/iocapture/iocapture-0.1.2-r2.ebuild
+++ b/dev-python/iocapture/iocapture-0.1.2-r2.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://pypi.org/project/iocapture/"
 SRC_URI="https://github.com/oinume/iocapture/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86"
+KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86"
 LICENSE="MIT"
 
 BDEPEND="
diff --git a/dev-python/ipython/Manifest b/dev-python/ipython/Manifest
index 5a86f52a0334..6be207cb4a60 100644
--- a/dev-python/ipython/Manifest
+++ b/dev-python/ipython/Manifest
@@ -1,3 +1,4 @@
 DIST ipython-7.22.0.tar.gz 5143229 BLAKE2B be78fc7089d620cb9ad437ed8154b37ac8c7cd68ca18a2569cfcf7ea9af968c58eeee18c8d18a1f26459ccef73e59083ac27055c19e4df254836e484ce0a9908 SHA512 2647dcd5e0d9b6afc8d990d2c099ad7ed581b5eff6d657630929e0d0d9f8965e7c7924c51a10a797e7d7406212d7a06c941c163e6f6046aa62130049a9bbc0d0
 DIST ipython-7.23.1.tar.gz 5188898 BLAKE2B 9713b0f1f75e283e53ba19044c9919f0c4d0b1c120e63d7a79ab9c6b8783499ed115e86a24cab34fc13c46245fb43865b851e6f98a2ee729ee35c3db242fa2ba SHA512 9b35626a8a07c6bd0b93552341e5a61d3d90a60c72ad6e3fc71266d9509134366c46a7ae8aeca9c3acc7509dfeab47b5144f105cb3d1d05ef1c7acca6c2f365d
 DIST ipython-7.24.1.tar.gz 5146561 BLAKE2B ae63d024f488f44dbd61eb9f3e14ac5b8ad801b1db195632c184c6106d4c2e6d6143c1524ae6fc5a2f6f631683b73f241c9115c439c0f97a4fe540cc232fb181 SHA512 0ea8843a1f2e7f9357ff9896f2b6da058adb5fcbbad5c3b1fc4138a085eb57034c62c0b50d82dea0e563523649ec112edd4ef0c267a914f6a7d33b44be30b977
+DIST ipython-7.25.0.tar.gz 5147224 BLAKE2B 0a2ae7cd315ba1abde18cdfcb7ed5227e5fc43b9a053f82e7db0146cbec66b0c2a1585158e60c37559523b457ab339ad42ab8fb3fccfc9e5ea7b880593de2e73 SHA512 726d3577bfb05d0c01c55d7111f8ee03fa879427de0750ee25b0a6451365728b5fb8ccf79c42585268f768680b13f628956d292f27b9e622e5dee0b4d368d22b
diff --git a/dev-python/ipython/ipython-7.25.0.ebuild b/dev-python/ipython/ipython-7.25.0.ebuild
new file mode 100644
index 000000000000..df50f5b4ea69
--- /dev/null
+++ b/dev-python/ipython/ipython-7.25.0.ebuild
@@ -0,0 +1,139 @@
+# Copyright 1999-2021 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,10} )
+PYTHON_REQ_USE='readline,sqlite,threads(+)'
+
+inherit distutils-r1 optfeature virtualx
+
+DESCRIPTION="Advanced interactive shell for Python"
+HOMEPAGE="https://ipython.org/ https://github.com/ipython/ipython/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~sparc ~x86"
+IUSE="doc examples matplotlib notebook nbconvert qt5 +smp test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-python/backcall[${PYTHON_USEDEP}]
+	dev-python/decorator[${PYTHON_USEDEP}]
+	>=dev-python/jedi-0.16[${PYTHON_USEDEP}]
+	>=dev-python/pexpect-4.3[${PYTHON_USEDEP}]
+	dev-python/pickleshare[${PYTHON_USEDEP}]
+	>=dev-python/prompt_toolkit-2[${PYTHON_USEDEP}]
+	<dev-python/prompt_toolkit-3.1[${PYTHON_USEDEP}]
+	dev-python/pygments[${PYTHON_USEDEP}]
+	dev-python/traitlets[${PYTHON_USEDEP}]
+	matplotlib? (
+		dev-python/matplotlib[${PYTHON_USEDEP}]
+		dev-python/matplotlib-inline[${PYTHON_USEDEP}]
+	)
+"
+
+BDEPEND="
+	test? (
+		app-text/dvipng[truetype]
+		>=dev-python/ipykernel-5.1.0[${PYTHON_USEDEP}]
+		dev-python/matplotlib[${PYTHON_USEDEP}]
+		dev-python/matplotlib-inline[${PYTHON_USEDEP}]
+		dev-python/nbformat[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+		>=dev-python/numpy-1.17[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+		dev-python/testpath[${PYTHON_USEDEP}]
+	)
+	doc? (
+		>=dev-python/ipykernel-5.1.0[${PYTHON_USEDEP}]
+		dev-python/matplotlib[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-2[${PYTHON_USEDEP}]
+		dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
+
+RDEPEND+="
+	nbconvert? ( dev-python/nbconvert[${PYTHON_USEDEP}] )"
+PDEPEND="
+	notebook? (
+		dev-python/notebook[${PYTHON_USEDEP}]
+		dev-python/ipywidgets[${PYTHON_USEDEP}]
+		dev-python/widgetsnbextension[${PYTHON_USEDEP}]
+	)
+	qt5? ( dev-python/qtconsole[${PYTHON_USEDEP}] )
+	smp? (
+		>=dev-python/ipykernel-5.1.0[${PYTHON_USEDEP}]
+		>=dev-python/ipyparallel-6.2.3[${PYTHON_USEDEP}]
+	)"
+
+PATCHES=( "${FILESDIR}"/2.1.0-substitute-files.patch )
+
+DISTUTILS_IN_SOURCE_BUILD=1
+
+python_prepare_all() {
+	# Remove out of date insource files
+	rm IPython/extensions/cythonmagic.py || die
+	rm IPython/extensions/rmagic.py || die
+
+	# Prevent un-needed download during build
+	if use doc; then
+		sed -e "/^    'sphinx.ext.intersphinx',/d" -i docs/source/conf.py || die
+	fi
+
+	# Rename the test directory to reduce sys.path pollution
+	# https://github.com/ipython/ipython/issues/12892
+	mv IPython/extensions/{,ipython_}tests || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	if use doc; then
+		emake -C docs html_noapi
+		HTML_DOCS=( docs/build/html/. )
+	fi
+}
+
+src_test() {
+	virtx distutils-r1_src_test
+}
+
+python_install() {
+	distutils-r1_python_install
+
+	# Create ipythonX.Y symlinks.
+	# TODO:
+	# 1. do we want them for pypy? No.  pypy has no numpy
+	# 2. handle it in the eclass instead (use _python_ln_rel).
+	# With pypy not an option the dosym becomes unconditional
+	dosym ../lib/python-exec/${EPYTHON}/ipython \
+		/usr/bin/ipython${EPYTHON#python}
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	if use examples; then
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+}
+
+pkg_postinst() {
+	optfeature "sympyprinting" dev-python/sympy
+	optfeature "cythonmagic" dev-python/cython
+	optfeature "%lprun magic command" dev-python/line_profiler
+	optfeature "%mprun magic command" dev-python/memory_profiler
+
+	if use nbconvert; then
+		if ! has_version app-text/pandoc ; then
+			einfo "Node.js will be used to convert notebooks to other formats"
+			einfo "like HTML. Support for that is still experimental. If you"
+			einfo "encounter any problems, please use app-text/pandoc instead."
+		fi
+	fi
+}
diff --git a/dev-python/jinja/Manifest b/dev-python/jinja/Manifest
index 49c8eee8dbac..51ad3844ff68 100644
--- a/dev-python/jinja/Manifest
+++ b/dev-python/jinja/Manifest
@@ -1,3 +1,2 @@
 DIST jinja-2.11.3.tar.gz 258057 BLAKE2B 4735464d044718ce1e6b2663ecb1b238b38fbf0f37ed683257775fe9e853186c089b98494209e511be5aa96bf6df8f6d472be132b6184a7d9213e182099c0433 SHA512 f8e2951edf780d7b44ac74d36579c89b0a5c076b4250faf643ae7e3ff6a431fedaabed640e5efb496cda1a79a4057bf312ae652484c8d4631d521689eb0adbc1
-DIST jinja-3.0.0.tar.gz 271882 BLAKE2B 7013d74802534273c62db275d95f05f203af97f52fdf9f9be9ec89522e2fce2d4cd0dc00611ad1442680da9ec624dd4ca8be375f021bc9572ef736801fb4b0d0 SHA512 54841f5fc07349eb01002156fb148e8e5905574dcb6e0d51bef2f340c8b94f2b50964b94e09d888d8cd6aa834de3a495301bf2b3cdf3282bce1b04129ea6d69e
 DIST jinja-3.0.1.tar.gz 272329 BLAKE2B 71aff8e78c49a522ef78d418be1b3b104dc149dd623b75aed3022f979930c8d6071c2adc3693a6110425469d6092e84a7721ac9d7907a8dc0c8414ccdf7c9049 SHA512 da3238bbab9f5966df933dd0511faf010d799aebf06d17b9352f412417ceea842145ee970a0ddd84f49a3ef1f7fbca29f62a14ee75c136a083168311eda89ddd
diff --git a/dev-python/jinja/jinja-3.0.0.ebuild b/dev-python/jinja/jinja-3.0.0.ebuild
deleted file mode 100644
index a14704798227..000000000000
--- a/dev-python/jinja/jinja-3.0.0.ebuild
+++ /dev/null
@@ -1,52 +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 )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="A full-featured template engine for Python"
-HOMEPAGE="https://jinja.palletsprojects.com/ https://pypi.org/project/Jinja2/"
-# pypi tarball is missing tests
-SRC_URI="https://github.com/pallets/jinja/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris"
-IUSE="examples"
-
-RDEPEND="
-	>=dev-python/markupsafe-2.0.0_rc2[${PYTHON_USEDEP}]
-	!dev-python/jinja:compat"
-
-distutils_enable_sphinx docs \
-	dev-python/sphinx-issues \
-	dev-python/pallets-sphinx-themes
-distutils_enable_tests pytest
-
-# XXX: handle Babel better?
-
-src_prepare() {
-	# avoid unnecessary dep on extra sphinxcontrib modules
-	sed -i '/sphinxcontrib.log_cabinet/ d' docs/conf.py || die
-
-	distutils-r1_src_prepare
-}
-
-python_install_all() {
-	if use examples ; then
-		docinto examples
-		dodoc -r examples/.
-	fi
-
-	distutils-r1_python_install_all
-}
-
-pkg_postinst() {
-	if ! has_version dev-python/Babel; then
-		elog "For i18n support, please emerge dev-python/Babel."
-	fi
-}
diff --git a/dev-python/jinja/jinja-3.0.1.ebuild b/dev-python/jinja/jinja-3.0.1.ebuild
index f895dd5881ae..81166232fbb7 100644
--- a/dev-python/jinja/jinja-3.0.1.ebuild
+++ b/dev-python/jinja/jinja-3.0.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/pallets/jinja/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris"
 IUSE="examples"
 
 RDEPEND="
diff --git a/dev-python/jupyter_packaging/Manifest b/dev-python/jupyter_packaging/Manifest
index 70d35997c061..fabc64785c4f 100644
--- a/dev-python/jupyter_packaging/Manifest
+++ b/dev-python/jupyter_packaging/Manifest
@@ -1 +1,2 @@
 DIST jupyter_packaging-0.10.2.tar.gz 21735 BLAKE2B 92de31e6835a2228f85b008b0fa3b3b8b5ebd175399fa82ee79d328f97b50c09a86dbc325e0378a7f946de34522d4af12fa5997507895ff6d85e77d4e7d38e3c SHA512 c1f5562b8fd72d64998d32d1a85dd1af2b730fa7e4a0d9e2036ea4d5a607ce02b1e9c641f01997ea3b0d6e047fa797009ce3c2ca52ef866ec9c7492ef836e679
+DIST jupyter_packaging-0.10.3.tar.gz 21530 BLAKE2B 43392f938d40e859e79f42b7942a199f808218c1da697c48a8ae0b1c5a4e8a408f983196e9d148edbf17d1725186216ed79446bd42fe8f18baaf8fc9f66efe1c SHA512 7634a056d506328af6e963ac7a8d6ac5fdb5d5303a31495af2275a7feca3732b60aeebb332cdc009ab690aa4185f5b3687ae002300b4885620cb9f2da6d2c79e
diff --git a/dev-python/jupyter_packaging/jupyter_packaging-0.10.3.ebuild b/dev-python/jupyter_packaging/jupyter_packaging-0.10.3.ebuild
new file mode 100644
index 000000000000..bcd095358848
--- /dev/null
+++ b/dev-python/jupyter_packaging/jupyter_packaging-0.10.3.ebuild
@@ -0,0 +1,47 @@
+# 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} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+DESCRIPTION="Tools to help build and install Jupyter Python packages"
+HOMEPAGE="https://jupyter.org"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	dev-python/packaging[${PYTHON_USEDEP}]
+	dev-python/tomlkit[${PYTHON_USEDEP}]
+	dev-python/wheel[${PYTHON_USEDEP}]
+	dev-python/deprecation[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local deselect=(
+		# TODO: package "build"
+		tests/test_build_api.py::test_build_package
+		tests/test_build_api.py::test_deprecated_metadata
+
+		# broken by Gentoo pip patch
+		# TODO: retry when we finally make the patch less intrusive
+		tests/test_datafiles_install.py
+		tests/test_install.py
+	)
+
+	distutils_install_for_testing --via-venv
+	epytest ${deselect[@]/#/--deselect }
+}
diff --git a/dev-python/lunr/lunr-0.6.0.ebuild b/dev-python/lunr/lunr-0.6.0.ebuild
index 6bc5ca4ca296..994c74bf1d4e 100644
--- a/dev-python/lunr/lunr-0.6.0.ebuild
+++ b/dev-python/lunr/lunr-0.6.0.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${PN}.py-${PV}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="dev-python/nltk[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/phonenumbers/Manifest b/dev-python/phonenumbers/Manifest
index 26362e49fa93..77f62d822348 100644
--- a/dev-python/phonenumbers/Manifest
+++ b/dev-python/phonenumbers/Manifest
@@ -1,2 +1,3 @@
 DIST phonenumbers-8.12.24.tar.gz 2257982 BLAKE2B b7fa2a29c1c9a4a1029013d7de3eed9998c764a12b41a9db2db8d4c9c2fcef1bff00167809f9cdffd484ba1c9d22ef244d45e7c21bb61899a37fc4d3cbb0b6d5 SHA512 1145c527e349436ecc8eaae5bf2dc2e10d25eab73d2ab3b566d7aaddc2cfcd9ae1ada4e3b9876f133f42f7ce023c74a91e48619df69d817f74964e429ebc20a8
 DIST phonenumbers-8.12.25.tar.gz 2257994 BLAKE2B 4bcd5e21819c1f42281fc684c97d41824a0dca1fc296b1968094e3a88ff235823d76cdd3b31da68bec677aea15021689ea40906b2c50363b999958029a05fcdf SHA512 24e6f1fb903d07214eed80eefd8f67e73dd4d66f0bb66308867453d05ea1b6272a8338e11bdb45395a37eb2ce8d6c3b80d90491763f843b3da4c131b43f5db73
+DIST phonenumbers-8.12.26.tar.gz 2257950 BLAKE2B 67d146b4c82691d2d4c481dd52ae23c8ec075af0b20e64947bc203aad538e5f45f63b0827458b8504679a8f5b84782793c3c11636b344c8cb4d21b418a7444b3 SHA512 12d5daaa9f82b0646bf22ece9d617971b21bfa5ac3a9731a2917bc33e6f790a7ff1423f49da14895a8de3004babf3a83b490397b0b7551c144f4f14776d1ab62
diff --git a/dev-python/phonenumbers/phonenumbers-8.12.26.ebuild b/dev-python/phonenumbers/phonenumbers-8.12.26.ebuild
new file mode 100644
index 000000000000..ac8788fcaacf
--- /dev/null
+++ b/dev-python/phonenumbers/phonenumbers-8.12.26.ebuild
@@ -0,0 +1,20 @@
+# 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} )
+
+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/pyclipper/Manifest b/dev-python/pyclipper/Manifest
index 1e643e5e02ea..e1094370854e 100644
--- a/dev-python/pyclipper/Manifest
+++ b/dev-python/pyclipper/Manifest
@@ -1 +1,2 @@
 DIST pyclipper-1.2.1.tar.gz 51862 BLAKE2B be59011d44ba4364e3e0d1d789c10f76635a5bc690dad8030104fa7965cc118e3529bf6505e5c4e743a8ff21e0d24129be716cd91e09b7521baa64359de364ab SHA512 0fc411bd8fa33fc3e5a71ec149b720b5c2f2e9a5e704d5e175b5930e0e073bacfd26b68e19c00802ab68e7a8946bdfcacae858e2d6d81b87d85b3747fa4a316b
+DIST pyclipper-1.3.0.tar.gz 51405 BLAKE2B a7a3e81452c8178d907528b7595fb92521dfb039a6ea116d7f189639ea2975d8058ac1f685a211c98be921c41a694d89f7f431264dfe366e3acc842b25d670f4 SHA512 bee6c5f835e84baa65cbca1d812219bd94272010bbeed365b3835ef3d191042129fdcccdd85ce7841f60f46cbfd52edd270d108ff81d64b0ca712c1369394d40
diff --git a/dev-python/pyclipper/pyclipper-1.3.0.ebuild b/dev-python/pyclipper/pyclipper-1.3.0.ebuild
new file mode 100644
index 000000000000..beedc151bf11
--- /dev/null
+++ b/dev-python/pyclipper/pyclipper-1.3.0.ebuild
@@ -0,0 +1,30 @@
+# 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} )
+inherit distutils-r1
+
+DESCRIPTION="Cython wrapper for the C++ translation of the Angus Johnson's Clipper library"
+HOMEPAGE="https://github.com/fonttools/pyclipper"
+SRC_URI="https://github.com/fonttools/pyclipper/archive/${PV/_p/.post}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${P/_p/.post}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE=""
+
+BDEPEND="
+	dev-python/cython[${PYTHON_USEDEP}]
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	sed -i -e 's:from unittest2:from unittest:' tests/test_pyclipper.py || die
+	distutils-r1_src_prepare
+	export SETUPTOOLS_SCM_PRETEND_VERSION="${PV/_p/.post}"
+}
diff --git a/dev-python/pytest-ordering/pytest-ordering-0.6.ebuild b/dev-python/pytest-ordering/pytest-ordering-0.6.ebuild
index 4e7ed5a50c27..593b8fcc4da2 100644
--- a/dev-python/pytest-ordering/pytest-ordering-0.6.ebuild
+++ b/dev-python/pytest-ordering/pytest-ordering-0.6.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/ftobia/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm x86"
+KEYWORDS="amd64 ~arm ~sparc x86"
 
 RDEPEND="<dev-python/pytest-6[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/python-dotenv/files/python-dotenv-0.18.0-second-entrypoint.patch b/dev-python/python-dotenv/files/python-dotenv-0.18.0-second-entrypoint.patch
new file mode 100644
index 000000000000..9d69c8b6b008
--- /dev/null
+++ b/dev-python/python-dotenv/files/python-dotenv-0.18.0-second-entrypoint.patch
@@ -0,0 +1,24 @@
+From c57f0aa05145ff84b708ffd64106ae741096027e Mon Sep 17 00:00:00 2001
+From: Sebastian Pipping <sebastian@pipping.org>
+Date: Sat, 26 Jun 2021 01:38:14 +0200
+Subject: [PATCH] setup.py: Add second entrypoint "python-dotenv"
+
+---
+ setup.py | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/setup.py b/setup.py
+index fd5785a..bb31c40 100644
+--- a/setup.py
++++ b/setup.py
+@@ -42,6 +42,7 @@ setup(
+     entry_points='''
+         [console_scripts]
+         dotenv=dotenv.cli:cli
++        python-dotenv=dotenv.cli:cli
+     ''',
+     license='BSD-3-Clause',
+     classifiers=[
+-- 
+2.31.1
+
diff --git a/dev-python/python-dotenv/python-dotenv-0.17.1.ebuild b/dev-python/python-dotenv/python-dotenv-0.17.1.ebuild
index 44a897378a6d..f1f1a00526bc 100644
--- a/dev-python/python-dotenv/python-dotenv-0.17.1.ebuild
+++ b/dev-python/python-dotenv/python-dotenv-0.17.1.ebuild
@@ -23,6 +23,7 @@ DEPEND="
 		dev-python/mock[${PYTHON_USEDEP}]
 		>=dev-python/sh-1.09[${PYTHON_USEDEP}]
 	)"
+RDEPEND="!dev-ruby/dotenv"  # bug 798648
 
 DOCS=( CHANGELOG.md README.md )
 
diff --git a/dev-python/python-dotenv/python-dotenv-0.18.0-r1.ebuild b/dev-python/python-dotenv/python-dotenv-0.18.0-r1.ebuild
new file mode 100644
index 000000000000..042bb1e19fc7
--- /dev/null
+++ b/dev-python/python-dotenv/python-dotenv-0.18.0-r1.ebuild
@@ -0,0 +1,38 @@
+# 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} )
+inherit distutils-r1
+
+DESCRIPTION="Manage .env files"
+HOMEPAGE="https://github.com/theskumar/python-dotenv"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~sparc ~x86"
+
+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}]
+	)"
+
+DOCS=( CHANGELOG.md README.md )
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.18.0-second-entrypoint.patch  # bug 798648
+)
+
+distutils_enable_tests --install pytest
+
+src_install() {
+	distutils-r1_src_install
+
+	# Avoid collision with dev-ruby/dotenv (bug #798648)
+	rm "${D}"/usr/bin/dotenv || die
+}
diff --git a/dev-python/python-dotenv/python-dotenv-0.18.0.ebuild b/dev-python/python-dotenv/python-dotenv-0.18.0.ebuild
index 2c637fc18639..34a5400e0ae2 100644
--- a/dev-python/python-dotenv/python-dotenv-0.18.0.ebuild
+++ b/dev-python/python-dotenv/python-dotenv-0.18.0.ebuild
@@ -21,6 +21,7 @@ DEPEND="
 		dev-python/mock[${PYTHON_USEDEP}]
 		>=dev-python/sh-1.09[${PYTHON_USEDEP}]
 	)"
+RDEPEND="!dev-ruby/dotenv"  # bug 798648
 
 DOCS=( CHANGELOG.md README.md )
 
diff --git a/dev-python/sphinx-autodoc-typehints/sphinx-autodoc-typehints-1.12.0.ebuild b/dev-python/sphinx-autodoc-typehints/sphinx-autodoc-typehints-1.12.0.ebuild
index ff280f58bad6..c8db49ab98ff 100644
--- a/dev-python/sphinx-autodoc-typehints/sphinx-autodoc-typehints-1.12.0.ebuild
+++ b/dev-python/sphinx-autodoc-typehints/sphinx-autodoc-typehints-1.12.0.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
-KEYWORDS="~amd64 ~arm"
+KEYWORDS="~amd64 ~arm ~sparc"
 SLOT="0"
 
 BDEPEND="
diff --git a/dev-python/sphobjinv/sphobjinv-2.1.ebuild b/dev-python/sphobjinv/sphobjinv-2.1.ebuild
index 18016ebbfc59..5e5344171f19 100644
--- a/dev-python/sphobjinv/sphobjinv-2.1.ebuild
+++ b/dev-python/sphobjinv/sphobjinv-2.1.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 SRC_URI="https://github.com/bskinn/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
-KEYWORDS="~amd64 ~arm"
+KEYWORDS="~amd64 ~arm ~sparc"
 SLOT="0"
 
 # This requires pytest-check, but that does not work at all, even if it
diff --git a/dev-python/tree-sitter/tree-sitter-0.19.0_p20210506-r1.ebuild b/dev-python/tree-sitter/tree-sitter-0.19.0_p20210506-r1.ebuild
index b557855ced4f..0843abd629af 100644
--- a/dev-python/tree-sitter/tree-sitter-0.19.0_p20210506-r1.ebuild
+++ b/dev-python/tree-sitter/tree-sitter-0.19.0_p20210506-r1.ebuild
@@ -25,7 +25,7 @@ S=${WORKDIR}/${MY_P}
 
 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-libs/tree-sitter:="
 DEPEND=${RDEPEND}
diff --git a/dev-python/urllib3/Manifest b/dev-python/urllib3/Manifest
index 1db813682e5f..5e3859c6a5d4 100644
--- a/dev-python/urllib3/Manifest
+++ b/dev-python/urllib3/Manifest
@@ -1,2 +1,3 @@
 DIST urllib3-1.26.4.tar.gz 293008 BLAKE2B 6ca88861baa87814d3856cd0f1fa0a6cb9e11ee745c782b598c4f5fe74b195ba47e8430b993ed8a5fb269153d700e4a803cd2ebc177e20e3186b3b26612262c7 SHA512 daf2ba432f2e4edaa6aa8c6bdaaea21fcb77cc5fdfd991f89b1f753b4f9901faab04120841e9fa8d93e2bd3d72cbdb647f1492d882266b4e0281c725e8d55a7a
 DIST urllib3-1.26.5.tar.gz 292865 BLAKE2B 0b22a485635f70f198c022c13d03af2b1a9b6907276e3bc3acaa2242e1c632447762f86e9588e735462e6479ff93a172f458691ea9bf28ceaebd5e1cfbc55501 SHA512 4a1899b223b00894d49f6dff5fc95d410e5b0ab28c11f7e3cd82d03e50438b0c5b0adf693a33fd80f1586312dc0012836713998674da15531bf82d52645881f6
+DIST urllib3-1.26.6.tar.gz 289927 BLAKE2B 197b0df759b27fc4906c565426e9c7b533fad56f10695ab5ae6c6c4d05d5c889dba906be526d8b8f41405f29696046b7db6e2cbb2fa16843af80e072138cc35f SHA512 19eb4b88b7a575db717db420ff79b304769d9a6d2b576a236d69719101c4d52d6b0079bd049c885e630f0dfd60471f8bb33836847e0569652cddece910ec2979
diff --git a/dev-python/urllib3/urllib3-1.26.6.ebuild b/dev-python/urllib3/urllib3-1.26.6.ebuild
new file mode 100644
index 000000000000..febf2408fdba
--- /dev/null
+++ b/dev-python/urllib3/urllib3-1.26.6.ebuild
@@ -0,0 +1,65 @@
+# 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 )
+PYTHON_REQ_USE="ssl(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="HTTP library with thread-safe connection pooling, file post, and more"
+HOMEPAGE="https://github.com/urllib3/urllib3"
+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 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="brotli test"
+RESTRICT="!test? ( test )"
+
+# dev-python/{pyopenssl,cryptography,idna,certifi} are optional runtime
+# dependencies. Do not add them to RDEPEND. They should be unnecessary with
+# modern versions of python (>= 3.2).
+RDEPEND="
+	>=dev-python/PySocks-1.5.8[${PYTHON_USEDEP}]
+	<dev-python/PySocks-2.0[${PYTHON_USEDEP}]
+	brotli? ( dev-python/brotlicffi[${PYTHON_USEDEP}] )
+"
+BDEPEND="
+	test? (
+		$(python_gen_cond_dep "
+			${RDEPEND}
+			dev-python/brotlicffi[\${PYTHON_USEDEP}]
+			dev-python/mock[\${PYTHON_USEDEP}]
+			dev-python/pytest[\${PYTHON_USEDEP}]
+			dev-python/pytest-freezegun[\${PYTHON_USEDEP}]
+			>=dev-python/trustme-0.5.3[\${PYTHON_USEDEP}]
+			>=www-servers/tornado-4.2.1[\${PYTHON_USEDEP}]
+		" python3_{6..10})
+	)
+"
+
+python_prepare_all() {
+	# tests failing if 'localhost.' cannot be resolved
+	sed -e 's:test_dotted_fqdn:_&:' \
+		-i test/with_dummyserver/test_https.py || die
+	sed -e 's:test_request_host_header_ignores_fqdn_dot:_&:' \
+		-i test/with_dummyserver/test_socketlevel.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	local -x CI=1
+	# FIXME: get tornado ported
+	# please keep in sync with BDEPEND!
+	has "${EPYTHON}" python3.{6..10} || continue
+
+	local deselect=(
+		# TODO?
+		test/with_dummyserver/test_socketlevel.py::TestSocketClosing::test_timeout_errors_cause_retries
+	)
+
+	epytest ${deselect[@]/#/--deselect }
+}
diff --git a/dev-python/watchdog/watchdog-2.1.2.ebuild b/dev-python/watchdog/watchdog-2.1.2.ebuild
index 814d25982386..8c7a2e0f9c5c 100644
--- a/dev-python/watchdog/watchdog-2.1.2.ebuild
+++ b/dev-python/watchdog/watchdog-2.1.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/gorakhargosh/${PN}/archive/v${PV}.tar.gz -> ${P}.tar
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86"
+KEYWORDS="amd64 arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86"
 
 CDEPEND="dev-python/pyyaml[${PYTHON_USEDEP}]"
 RDEPEND="${CDEPEND}