Adding metadata

54 files changed, 75 insertions, 195 deletions

diff --git a/dev-python/aiohttp/aiohttp-3.8.0.ebuild b/dev-python/aiohttp/aiohttp-3.8.0.ebuild
index bff4b64aa7e9..bb087d58322a 100644
--- a/dev-python/aiohttp/aiohttp-3.8.0.ebuild
+++ b/dev-python/aiohttp/aiohttp-3.8.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64"
+KEYWORDS="~amd64 ~arm ~arm64 ~sparc"
 
 RDEPEND="
 	app-arch/brotli[python,${PYTHON_USEDEP}]
@@ -26,9 +26,6 @@ RDEPEND="
 	>=dev-python/frozenlist-1.1.1[${PYTHON_USEDEP}]
 	>=dev-python/multidict-4.5.0[${PYTHON_USEDEP}]
 	>=dev-python/yarl-1.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/pypy3-7.3.6
-	' pypy3)
 "
 BDEPEND="
 	test? (
@@ -63,6 +60,9 @@ src_prepare() {
 		"${FILESDIR}"/${P}-examples.patch
 	)
 
+	# increate a little the timeout
+	sed -e '/abs_tol=/s/0.001/0.01/' -i tests/test_helpers.py || die
+
 	# xfail_strict fails on py3.10
 	sed -i -e '/--cov/d' -e '/xfail_strict/d' setup.cfg || die
 	distutils-r1_src_prepare
diff --git a/dev-python/arrow/arrow-1.1.1.ebuild b/dev-python/arrow/arrow-1.1.1-r1.ebuild
index d0ebce0e32f8..054c6a3af79f 100644
--- a/dev-python/arrow/arrow-1.1.1.ebuild
+++ b/dev-python/arrow/arrow-1.1.1-r1.ebuild
@@ -15,10 +15,7 @@ SLOT="0"
 KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
-	>=dev-python/python-dateutil-2.7.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		dev-python/typing-extensions[${PYTHON_USEDEP}]
-	' pypy3)"
+	>=dev-python/python-dateutil-2.7.0[${PYTHON_USEDEP}]"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/arrow/arrow-1.2.0.ebuild b/dev-python/arrow/arrow-1.2.0.ebuild
index 6d26a7aa396b..c6a43ca9bc8f 100644
--- a/dev-python/arrow/arrow-1.2.0.ebuild
+++ b/dev-python/arrow/arrow-1.2.0.ebuild
@@ -15,10 +15,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 
 RDEPEND="
-	>=dev-python/python-dateutil-2.7.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		dev-python/typing-extensions[${PYTHON_USEDEP}]
-	' pypy3)"
+	>=dev-python/python-dateutil-2.7.0[${PYTHON_USEDEP}]"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/arrow/arrow-1.2.1.ebuild b/dev-python/arrow/arrow-1.2.1-r1.ebuild
index a13e35cebce2..5fe4546a2fcb 100644
--- a/dev-python/arrow/arrow-1.2.1.ebuild
+++ b/dev-python/arrow/arrow-1.2.1-r1.ebuild
@@ -15,10 +15,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 
 RDEPEND="
-	>=dev-python/python-dateutil-2.7.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		dev-python/typing-extensions[${PYTHON_USEDEP}]
-	' pypy3)"
+	>=dev-python/python-dateutil-2.7.0[${PYTHON_USEDEP}]"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/backports-entry_points_selectable/backports-entry_points_selectable-1.1.0.ebuild b/dev-python/backports-entry_points_selectable/backports-entry_points_selectable-1.1.0-r1.ebuild
index 74df829c4c4a..78015c2296a1 100644
--- a/dev-python/backports-entry_points_selectable/backports-entry_points_selectable-1.1.0.ebuild
+++ b/dev-python/backports-entry_points_selectable/backports-entry_points_selectable-1.1.0-r1.ebuild
@@ -20,11 +20,6 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
-RDEPEND="
-	$(python_gen_cond_dep '
-		dev-python/importlib_metadata[${PYTHON_USEDEP}]
-	' pypy3)"
-
 distutils_enable_tests pytest
 
 export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
diff --git a/dev-python/backports-zoneinfo/backports-zoneinfo-0.2.1-r1.ebuild b/dev-python/backports-zoneinfo/backports-zoneinfo-0.2.1-r2.ebuild
index e0f46f7163a6..d8ef0fd39c4d 100644
--- a/dev-python/backports-zoneinfo/backports-zoneinfo-0.2.1-r1.ebuild
+++ b/dev-python/backports-zoneinfo/backports-zoneinfo-0.2.1-r2.ebuild
@@ -18,18 +18,8 @@ LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 
-RDEPEND="
-	$(python_gen_cond_dep '
-		dev-python/importlib_resources[${PYTHON_USEDEP}]
-	' python3_6 pypy3)"
 BDEPEND="
 	test? (
-		$(python_gen_cond_dep '
-			dev-python/dataclasses[${PYTHON_USEDEP}]
-		' python3_6)
-		$(python_gen_cond_dep '
-			dev-python/importlib_metadata[${PYTHON_USEDEP}]
-		' python3_{6,7})
 		>=dev-python/hypothesis-5.7.0[${PYTHON_USEDEP}]
 		dev-python/pytest[${PYTHON_USEDEP}]
 	)"
diff --git a/dev-python/cachelib/Manifest b/dev-python/cachelib/Manifest
index 32ff3517666e..82013f93160d 100644
--- a/dev-python/cachelib/Manifest
+++ b/dev-python/cachelib/Manifest
@@ -1,2 +1 @@
-DIST cachelib-0.3.0.tar.gz 18340 BLAKE2B e7f8aef925320c23691721f2f4ee7cfa66ab0ae8bf1e414d7344fc5799fbe66187791ffb9544f27b16dbf56ba8d2ec27a6ed080ccdf154a9b1a8582aa86c0127 SHA512 f9184cf9702c2df77e09d28d6feb8e6f0bc22f17c110a2371e76c4b78163950803e4f013c3746e21b9ac5771f72238ecd8bb041c5a7f44eab6bcb4de6e2ea377
 DIST cachelib-0.4.1.tar.gz 19762 BLAKE2B baadfe920fda339cd8f3241664ae91b2767423ed09bdb6204573b2679e37c2dd3157f3b4d0f16841b1ab859f7c777986c0c251bcbe4bdf1ade69c442ff8ec756 SHA512 051e6f31b6ee58836a1512de4c7eedc718c081389df92605ad065f4bc5e4c861971507af636686d8abf00273a379ff31730bf040a7633a143dc1492263e3a543
diff --git a/dev-python/cachelib/cachelib-0.3.0.ebuild b/dev-python/cachelib/cachelib-0.3.0.ebuild
deleted file mode 100644
index b6a86128c05f..000000000000
--- a/dev-python/cachelib/cachelib-0.3.0.ebuild
+++ /dev/null
@@ -1,32 +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="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 ~arm64 x86"
-
-BDEPEND="
-	test? (
-		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
-
-EPYTEST_IGNORE=(
-	# bug #818523
-	tests/test_redis_cache.py
-)
diff --git a/dev-python/cachelib/cachelib-0.4.1.ebuild b/dev-python/cachelib/cachelib-0.4.1.ebuild
index 2e233afce07c..b6a86128c05f 100644
--- a/dev-python/cachelib/cachelib-0.4.1.ebuild
+++ b/dev-python/cachelib/cachelib-0.4.1.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 x86"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/cfn-lint/cfn-lint-0.56.0.ebuild b/dev-python/cfn-lint/cfn-lint-0.56.0.ebuild
index e2947ee58992..b913d5eac494 100644
--- a/dev-python/cfn-lint/cfn-lint-0.56.0.ebuild
+++ b/dev-python/cfn-lint/cfn-lint-0.56.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 
 RDEPEND="
 	>=dev-python/aws-sam-translator-1.40.0[${PYTHON_USEDEP}]
diff --git a/dev-python/click/click-8.0.2.ebuild b/dev-python/click/click-8.0.2.ebuild
index df774ccd9da0..5cbab4c20e5d 100644
--- a/dev-python/click/click-8.0.2.ebuild
+++ b/dev-python/click/click-8.0.2.ebuild
@@ -15,11 +15,6 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
 IUSE="examples"
 
-RDEPEND="
-	$(python_gen_cond_dep '
-		dev-python/importlib_metadata[${PYTHON_USEDEP}]
-	' pypy3)"
-
 distutils_enable_sphinx docs \
 	'>=dev-python/docutils-0.14' \
 	dev-python/pallets-sphinx-themes \
diff --git a/dev-python/click/click-8.0.3.ebuild b/dev-python/click/click-8.0.3.ebuild
index df774ccd9da0..5cbab4c20e5d 100644
--- a/dev-python/click/click-8.0.3.ebuild
+++ b/dev-python/click/click-8.0.3.ebuild
@@ -15,11 +15,6 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
 IUSE="examples"
 
-RDEPEND="
-	$(python_gen_cond_dep '
-		dev-python/importlib_metadata[${PYTHON_USEDEP}]
-	' pypy3)"
-
 distutils_enable_sphinx docs \
 	'>=dev-python/docutils-0.14' \
 	dev-python/pallets-sphinx-themes \
diff --git a/dev-python/coverage/coverage-6.0.2.ebuild b/dev-python/coverage/coverage-6.0.2.ebuild
index e70b99823eff..e32ed8012f48 100644
--- a/dev-python/coverage/coverage-6.0.2.ebuild
+++ b/dev-python/coverage/coverage-6.0.2.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 ~riscv ~s390 sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 #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/dbus-python/dbus-python-1.2.18.ebuild b/dev-python/dbus-python/dbus-python-1.2.18.ebuild
index da295721ebc3..d77643cd4923 100644
--- a/dev-python/dbus-python/dbus-python-1.2.18.ebuild
+++ b/dev-python/dbus-python/dbus-python-1.2.18.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://dbus.freedesktop.org/releases/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 IUSE="doc examples test"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/dev-python/flake8/flake8-3.9.2.ebuild b/dev-python/flake8/flake8-3.9.2-r1.ebuild
index 53ae6e736d05..4f31678081ad 100644
--- a/dev-python/flake8/flake8-3.9.2.ebuild
+++ b/dev-python/flake8/flake8-3.9.2-r1.ebuild
@@ -20,7 +20,6 @@ RDEPEND="
 	<dev-python/pyflakes-2.4.0[${PYTHON_USEDEP}]
 	>=dev-python/pycodestyle-2.7.0[${PYTHON_USEDEP}]
 	<dev-python/pycodestyle-2.8.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep 'dev-python/importlib_metadata[${PYTHON_USEDEP}]' pypy3)
 "
 PDEPEND="
 	>=dev-python/mccabe-0.6.0[${PYTHON_USEDEP}]
diff --git a/dev-python/flake8/flake8-4.0.0.ebuild b/dev-python/flake8/flake8-4.0.0.ebuild
index 3cfc2fbff3ef..d614395b63d8 100644
--- a/dev-python/flake8/flake8-4.0.0.ebuild
+++ b/dev-python/flake8/flake8-4.0.0.ebuild
@@ -20,7 +20,6 @@ RDEPEND="
 	<dev-python/pyflakes-2.5.0[${PYTHON_USEDEP}]
 	>=dev-python/pycodestyle-2.8.0[${PYTHON_USEDEP}]
 	<dev-python/pycodestyle-2.9.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep 'dev-python/importlib_metadata[${PYTHON_USEDEP}]' pypy3)
 "
 PDEPEND="
 	>=dev-python/mccabe-0.6.0[${PYTHON_USEDEP}]
diff --git a/dev-python/flake8/flake8-4.0.1.ebuild b/dev-python/flake8/flake8-4.0.1-r1.ebuild
index 503cd48ef89f..b92f793e5709 100644
--- a/dev-python/flake8/flake8-4.0.1.ebuild
+++ b/dev-python/flake8/flake8-4.0.1-r1.ebuild
@@ -20,7 +20,6 @@ RDEPEND="
 	<dev-python/pyflakes-2.5.0[${PYTHON_USEDEP}]
 	>=dev-python/pycodestyle-2.8.0[${PYTHON_USEDEP}]
 	<dev-python/pycodestyle-2.9.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep 'dev-python/importlib_metadata[${PYTHON_USEDEP}]' pypy3)
 "
 PDEPEND="
 	>=dev-python/mccabe-0.6.0[${PYTHON_USEDEP}]
diff --git a/dev-python/fonttools/fonttools-4.27.1.ebuild b/dev-python/fonttools/fonttools-4.27.1.ebuild
index 4e9a40987f15..8379447d97e2 100644
--- a/dev-python/fonttools/fonttools-4.27.1.ebuild
+++ b/dev-python/fonttools/fonttools-4.27.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/fonttools/fonttools/archive/${PV}.tar.gz -> ${P}.tar
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ppc ppc64 ~riscv sparc x86 ~x64-macos"
+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="
diff --git a/dev-python/fqdn/fqdn-1.5.1.ebuild b/dev-python/fqdn/fqdn-1.5.1-r1.ebuild
index 7f7144c65d61..3602e9c285c3 100644
--- a/dev-python/fqdn/fqdn-1.5.1.ebuild
+++ b/dev-python/fqdn/fqdn-1.5.1-r1.ebuild
@@ -15,10 +15,5 @@ LICENSE="MPL-2.0"
 SLOT="0"
 KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~s390 sparc x86"
 
-RDEPEND="
-	$(python_gen_cond_dep '
-		dev-python/cached-property[${PYTHON_USEDEP}]
-	' pypy3)"
-
 distutils_enable_tests pytest
 distutils_enable_sphinx docs
diff --git a/dev-python/humanize/humanize-3.12.0-r1.ebuild b/dev-python/humanize/humanize-3.12.0-r2.ebuild
index d99c3b5556de..fa32a484fb7e 100644
--- a/dev-python/humanize/humanize-3.12.0-r1.ebuild
+++ b/dev-python/humanize/humanize-3.12.0-r2.ebuild
@@ -14,11 +14,6 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
-RDEPEND="
-	$(python_gen_cond_dep '
-		dev-python/importlib_metadata[${PYTHON_USEDEP}]
-	' pypy3)
-"
 BDEPEND="
 	dev-python/setuptools_scm[${PYTHON_USEDEP}]
 	test? ( dev-python/freezegun[${PYTHON_USEDEP}] )
diff --git a/dev-python/importlib_metadata/importlib_metadata-4.8.1.ebuild b/dev-python/importlib_metadata/importlib_metadata-4.8.1-r1.ebuild
index 459c3ae052fc..234a8b2d75b6 100644
--- a/dev-python/importlib_metadata/importlib_metadata-4.8.1.ebuild
+++ b/dev-python/importlib_metadata/importlib_metadata-4.8.1-r1.ebuild
@@ -17,7 +17,6 @@ SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 
 RDEPEND="
-	$(python_gen_cond_dep 'dev-python/typing-extensions[${PYTHON_USEDEP}]' pypy3)
 	dev-python/zipp[${PYTHON_USEDEP}]
 "
 BDEPEND="
diff --git a/dev-python/importlib_metadata/importlib_metadata-4.8.2.ebuild b/dev-python/importlib_metadata/importlib_metadata-4.8.2-r1.ebuild
index ff9c09d60191..1c7e40eb2d1b 100644
--- a/dev-python/importlib_metadata/importlib_metadata-4.8.2.ebuild
+++ b/dev-python/importlib_metadata/importlib_metadata-4.8.2-r1.ebuild
@@ -17,7 +17,6 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
 
 RDEPEND="
-	$(python_gen_cond_dep 'dev-python/typing-extensions[${PYTHON_USEDEP}]' pypy3)
 	dev-python/zipp[${PYTHON_USEDEP}]
 "
 BDEPEND="
diff --git a/dev-python/importlib_resources/importlib_resources-5.2.2.ebuild b/dev-python/importlib_resources/importlib_resources-5.2.2-r1.ebuild
index 46c39be70d5e..10ff67c4243b 100644
--- a/dev-python/importlib_resources/importlib_resources-5.2.2.ebuild
+++ b/dev-python/importlib_resources/importlib_resources-5.2.2-r1.ebuild
@@ -15,11 +15,6 @@ LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 
-RDEPEND="
-	$(python_gen_cond_dep '
-		>=dev-python/zipp-3.1.0[${PYTHON_USEDEP}]
-	' pypy3)
-"
 BDEPEND="
 	dev-python/toml[${PYTHON_USEDEP}]
 	>=dev-python/setuptools_scm-3.4.1[${PYTHON_USEDEP}]
diff --git a/dev-python/importlib_resources/importlib_resources-5.2.3.ebuild b/dev-python/importlib_resources/importlib_resources-5.2.3.ebuild
index 3122ce294d47..8a96c6388ae1 100644
--- a/dev-python/importlib_resources/importlib_resources-5.2.3.ebuild
+++ b/dev-python/importlib_resources/importlib_resources-5.2.3.ebuild
@@ -15,11 +15,6 @@ LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
 
-RDEPEND="
-	$(python_gen_cond_dep '
-		>=dev-python/zipp-3.1.0[${PYTHON_USEDEP}]
-	' pypy3)
-"
 BDEPEND="
 	dev-python/toml[${PYTHON_USEDEP}]
 	>=dev-python/setuptools_scm-3.4.1[${PYTHON_USEDEP}]
diff --git a/dev-python/importlib_resources/importlib_resources-5.3.0.ebuild b/dev-python/importlib_resources/importlib_resources-5.3.0.ebuild
index 3122ce294d47..8a96c6388ae1 100644
--- a/dev-python/importlib_resources/importlib_resources-5.3.0.ebuild
+++ b/dev-python/importlib_resources/importlib_resources-5.3.0.ebuild
@@ -15,11 +15,6 @@ LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
 
-RDEPEND="
-	$(python_gen_cond_dep '
-		>=dev-python/zipp-3.1.0[${PYTHON_USEDEP}]
-	' pypy3)
-"
 BDEPEND="
 	dev-python/toml[${PYTHON_USEDEP}]
 	>=dev-python/setuptools_scm-3.4.1[${PYTHON_USEDEP}]
diff --git a/dev-python/importlib_resources/importlib_resources-5.4.0.ebuild b/dev-python/importlib_resources/importlib_resources-5.4.0-r1.ebuild
index 3122ce294d47..8a96c6388ae1 100644
--- a/dev-python/importlib_resources/importlib_resources-5.4.0.ebuild
+++ b/dev-python/importlib_resources/importlib_resources-5.4.0-r1.ebuild
@@ -15,11 +15,6 @@ LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
 
-RDEPEND="
-	$(python_gen_cond_dep '
-		>=dev-python/zipp-3.1.0[${PYTHON_USEDEP}]
-	' pypy3)
-"
 BDEPEND="
 	dev-python/toml[${PYTHON_USEDEP}]
 	>=dev-python/setuptools_scm-3.4.1[${PYTHON_USEDEP}]
diff --git a/dev-python/jschema_to_python/jschema_to_python-1.2.3.ebuild b/dev-python/jschema_to_python/jschema_to_python-1.2.3.ebuild
index 234bf8681163..4231bf8476c7 100644
--- a/dev-python/jschema_to_python/jschema_to_python-1.2.3.ebuild
+++ b/dev-python/jschema_to_python/jschema_to_python-1.2.3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 
 RDEPEND="
 	dev-python/attrs[${PYTHON_USEDEP}]
diff --git a/dev-python/jsonschema/jsonschema-3.2.0.ebuild b/dev-python/jsonschema/jsonschema-3.2.0-r1.ebuild
index 123f78a71f30..1d722807c4d1 100644
--- a/dev-python/jsonschema/jsonschema-3.2.0.ebuild
+++ b/dev-python/jsonschema/jsonschema-3.2.0-r1.ebuild
@@ -20,9 +20,6 @@ BDEPEND="
 	dev-python/attrs[${PYTHON_USEDEP}]
 	dev-python/pyrsistent[${PYTHON_USEDEP}]
 	dev-python/six[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		dev-python/importlib_metadata[${PYTHON_USEDEP}]
-		' pypy3)
 	test? ( dev-python/twisted[${PYTHON_USEDEP}] )
 "
 
diff --git a/dev-python/jsonschema/jsonschema-4.1.2.ebuild b/dev-python/jsonschema/jsonschema-4.1.2-r1.ebuild
index e9aa39ae301a..6aafb42b3232 100644
--- a/dev-python/jsonschema/jsonschema-4.1.2.ebuild
+++ b/dev-python/jsonschema/jsonschema-4.1.2-r1.ebuild
@@ -18,9 +18,6 @@ KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~s390 sparc x86"
 RDEPEND="
 	dev-python/attrs[${PYTHON_USEDEP}]
 	>=dev-python/pyrsistent-0.18.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		dev-python/importlib_metadata[${PYTHON_USEDEP}]
-	' pypy3)
 "
 
 # formatter deps
diff --git a/dev-python/jsonschema/jsonschema-4.2.1.ebuild b/dev-python/jsonschema/jsonschema-4.2.1-r1.ebuild
index 5b8d3c75eaef..a5a3da13a88b 100644
--- a/dev-python/jsonschema/jsonschema-4.2.1.ebuild
+++ b/dev-python/jsonschema/jsonschema-4.2.1-r1.ebuild
@@ -19,9 +19,6 @@ RDEPEND="
 	dev-python/attrs[${PYTHON_USEDEP}]
 	>=dev-python/pyrsistent-0.18.0[${PYTHON_USEDEP}]
 	$(python_gen_cond_dep '
-		dev-python/importlib_metadata[${PYTHON_USEDEP}]
-	' pypy3)
-	$(python_gen_cond_dep '
 		>=dev-python/importlib_resources-1.4.0[${PYTHON_USEDEP}]
 	' pypy3 python3_8)
 "
diff --git a/dev-python/multidict/multidict-5.2.0.ebuild b/dev-python/multidict/multidict-5.2.0.ebuild
index b91f6a8dcf3e..3222e0b3a0aa 100644
--- a/dev-python/multidict/multidict-5.2.0.ebuild
+++ b/dev-python/multidict/multidict-5.2.0.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 ~riscv ~s390 sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 
 BDEPEND=">=dev-python/cython-0.28.4[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/pallets-sphinx-themes/pallets-sphinx-themes-2.0.1.ebuild b/dev-python/pallets-sphinx-themes/pallets-sphinx-themes-2.0.1-r1.ebuild
index ec1bcc2cbd8b..4d91b26d09e7 100644
--- a/dev-python/pallets-sphinx-themes/pallets-sphinx-themes-2.0.1.ebuild
+++ b/dev-python/pallets-sphinx-themes/pallets-sphinx-themes-2.0.1-r1.ebuild
@@ -16,7 +16,4 @@ KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 s
 
 RDEPEND="dev-python/jinja[${PYTHON_USEDEP}]
 	dev-python/packaging[${PYTHON_USEDEP}]
-	dev-python/sphinx[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		dev-python/importlib_metadata[${PYTHON_USEDEP}]
-	' pypy3)"
+	dev-python/sphinx[${PYTHON_USEDEP}]"
diff --git a/dev-python/pep517/Manifest b/dev-python/pep517/Manifest
new file mode 100644
index 000000000000..a7c369ebdc32
--- /dev/null
+++ b/dev-python/pep517/Manifest
@@ -0,0 +1 @@
+DIST pep517-0.12.0.gh.tar.gz 24726 BLAKE2B 7d022ab88c68b7254df5d922db2f571e2bab2ee58b8a2ed0ce1adeadf89f22f11f6a609b558133acfed5342a9cf6a398d805949bdfb485a4abf272e2b9322e05 SHA512 6b224759733c1f5e346909788233b0acf49c60a0b6ef2d99d953b2e7bb570b2913fd0b133d5bc6884ec3de98adf2e41fa9506fed344b8fd76cc58dfcd1778e80
diff --git a/dev-python/pep517/metadata.xml b/dev-python/pep517/metadata.xml
new file mode 100644
index 000000000000..3fafe313fb89
--- /dev/null
+++ b/dev-python/pep517/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+  <email>python@gentoo.org</email>
+ </maintainer>
+ <upstream>
+  <remote-id type="pypi">pep517</remote-id>
+ </upstream>
+ <origin>gentoo-staging</origin>
+ <stabilize-allarches/>
+</pkgmetadata>
\ No newline at end of file
diff --git a/dev-python/pep517/pep517-0.12.0.ebuild b/dev-python/pep517/pep517-0.12.0.ebuild
new file mode 100644
index 000000000000..27f727cd68df
--- /dev/null
+++ b/dev-python/pep517/pep517-0.12.0.ebuild
@@ -0,0 +1,41 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_SETUPTOOLS=pyproject.toml
+PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Wrappers to build Python packages using PEP 517 hooks"
+HOMEPAGE="
+	https://pypi.org/project/pep517/
+	https://github.com/pypa/pep517/
+	https://pep517.readthedocs.io/"
+SRC_URI="
+	https://github.com/pypa/pep517/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	dev-python/tomli[${PYTHON_USEDEP}]"
+BDEPEND="
+	test? (
+		dev-python/testpath[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
+
+EPYTEST_IGNORE=(
+	# require Internet
+	tests/test_meta.py
+)
+
+src_prepare() {
+	sed -i -e '/--flake8/d' pytest.ini || die
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/pluggy/pluggy-1.0.0.ebuild b/dev-python/pluggy/pluggy-1.0.0-r1.ebuild
index 6ec1d19c3670..48cbee973577 100644
--- a/dev-python/pluggy/pluggy-1.0.0.ebuild
+++ b/dev-python/pluggy/pluggy-1.0.0-r1.ebuild
@@ -14,8 +14,6 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 
-RDEPEND="$(python_gen_cond_dep \
-	'dev-python/importlib_metadata[${PYTHON_USEDEP}]' pypy3)"
 BDEPEND="
 	dev-python/setuptools_scm[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/prettytable/prettytable-2.2.1.ebuild b/dev-python/prettytable/prettytable-2.2.1-r1.ebuild
index 355cb8aa72dd..3c88be83e439 100644
--- a/dev-python/prettytable/prettytable-2.2.1.ebuild
+++ b/dev-python/prettytable/prettytable-2.2.1-r1.ebuild
@@ -18,9 +18,6 @@ KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc64 ~riscv sparc x86 ~amd6
 
 RDEPEND="
 	dev-python/wcwidth[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		dev-python/importlib_metadata[${PYTHON_USEDEP}]
-	' pypy3)
 "
 BDEPEND="
 	dev-python/setuptools_scm[${PYTHON_USEDEP}]
diff --git a/dev-python/prettytable/prettytable-2.3.0.ebuild b/dev-python/prettytable/prettytable-2.3.0.ebuild
index abc42be5443d..325891009a2a 100644
--- a/dev-python/prettytable/prettytable-2.3.0.ebuild
+++ b/dev-python/prettytable/prettytable-2.3.0.ebuild
@@ -18,9 +18,6 @@ KEYWORDS="~amd64 ~riscv ~sparc ~x86"
 
 RDEPEND="
 	dev-python/wcwidth[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		dev-python/importlib_metadata[${PYTHON_USEDEP}]
-	' pypy3)
 "
 BDEPEND="
 	dev-python/setuptools_scm[${PYTHON_USEDEP}]
diff --git a/dev-python/prettytable/prettytable-2.4.0.ebuild b/dev-python/prettytable/prettytable-2.4.0-r1.ebuild
index ff2738b3b942..adadd1cddfe2 100644
--- a/dev-python/prettytable/prettytable-2.4.0.ebuild
+++ b/dev-python/prettytable/prettytable-2.4.0-r1.ebuild
@@ -18,9 +18,6 @@ KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~sparc ~x86"
 
 RDEPEND="
 	dev-python/wcwidth[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		dev-python/importlib_metadata[${PYTHON_USEDEP}]
-	' pypy3)
 "
 BDEPEND="
 	dev-python/setuptools_scm[${PYTHON_USEDEP}]
diff --git a/dev-python/pytest/pytest-6.2.5.ebuild b/dev-python/pytest/pytest-6.2.5-r1.ebuild
index 6fad14d4c7d4..040c550f22c9 100644
--- a/dev-python/pytest/pytest-6.2.5.ebuild
+++ b/dev-python/pytest/pytest-6.2.5-r1.ebuild
@@ -18,9 +18,6 @@ RESTRICT="!test? ( test )"
 
 RDEPEND="
 	>=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		dev-python/importlib_metadata[${PYTHON_USEDEP}]
-	' pypy3)
 	dev-python/iniconfig[${PYTHON_USEDEP}]
 	>=dev-python/more-itertools-4.0.0[${PYTHON_USEDEP}]
 	dev-python/packaging[${PYTHON_USEDEP}]
diff --git a/dev-python/sarif_om/sarif_om-1.0.4.ebuild b/dev-python/sarif_om/sarif_om-1.0.4.ebuild
index a24b7f589b0d..1305435068b9 100644
--- a/dev-python/sarif_om/sarif_om-1.0.4.ebuild
+++ b/dev-python/sarif_om/sarif_om-1.0.4.ebuild
@@ -15,7 +15,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 
 RDEPEND="
 	dev-python/attrs[${PYTHON_USEDEP}]
diff --git a/dev-python/sqlalchemy/sqlalchemy-1.4.20.ebuild b/dev-python/sqlalchemy/sqlalchemy-1.4.20-r1.ebuild
index 64a5106694fe..0c32907dbf0e 100644
--- a/dev-python/sqlalchemy/sqlalchemy-1.4.20.ebuild
+++ b/dev-python/sqlalchemy/sqlalchemy-1.4.20-r1.ebuild
@@ -21,11 +21,6 @@ SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="examples +sqlite test"
 
-RDEPEND="
-	$(python_gen_cond_dep '
-		dev-python/importlib_metadata[${PYTHON_USEDEP}]
-	' pypy3)
-"
 # Use pytest-xdist to speed up tests
 BDEPEND="
 	test? (
diff --git a/dev-python/sqlalchemy/sqlalchemy-1.4.22.ebuild b/dev-python/sqlalchemy/sqlalchemy-1.4.22-r1.ebuild
index d9b3b6378b99..4062be68ad3a 100644
--- a/dev-python/sqlalchemy/sqlalchemy-1.4.22.ebuild
+++ b/dev-python/sqlalchemy/sqlalchemy-1.4.22-r1.ebuild
@@ -21,11 +21,6 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="examples +sqlite test"
 
-RDEPEND="
-	$(python_gen_cond_dep '
-		dev-python/importlib_metadata[${PYTHON_USEDEP}]
-	' pypy3)
-"
 # Use pytest-xdist to speed up tests
 BDEPEND="
 	test? (
diff --git a/dev-python/sqlalchemy/sqlalchemy-1.4.23.ebuild b/dev-python/sqlalchemy/sqlalchemy-1.4.23-r1.ebuild
index 9d2f230f8dbd..fb9d6f19bb4a 100644
--- a/dev-python/sqlalchemy/sqlalchemy-1.4.23.ebuild
+++ b/dev-python/sqlalchemy/sqlalchemy-1.4.23-r1.ebuild
@@ -21,11 +21,6 @@ SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="examples +sqlite test"
 
-RDEPEND="
-	$(python_gen_cond_dep '
-		dev-python/importlib_metadata[${PYTHON_USEDEP}]
-	' pypy3)
-"
 BDEPEND="
 	test? (
 		$(python_gen_impl_dep sqlite)
diff --git a/dev-python/sqlalchemy/sqlalchemy-1.4.25.ebuild b/dev-python/sqlalchemy/sqlalchemy-1.4.25-r1.ebuild
index 7b1ca0b1e262..1943057782b8 100644
--- a/dev-python/sqlalchemy/sqlalchemy-1.4.25.ebuild
+++ b/dev-python/sqlalchemy/sqlalchemy-1.4.25-r1.ebuild
@@ -21,11 +21,6 @@ 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 ~x64-solaris"
 IUSE="examples +sqlite test"
 
-RDEPEND="
-	$(python_gen_cond_dep '
-		dev-python/importlib_metadata[${PYTHON_USEDEP}]
-	' pypy3)
-"
 BDEPEND="
 	test? (
 		$(python_gen_impl_dep sqlite)
diff --git a/dev-python/sqlalchemy/sqlalchemy-1.4.26.ebuild b/dev-python/sqlalchemy/sqlalchemy-1.4.26-r1.ebuild
index 5800bed93ab8..a6092e761860 100644
--- a/dev-python/sqlalchemy/sqlalchemy-1.4.26.ebuild
+++ b/dev-python/sqlalchemy/sqlalchemy-1.4.26-r1.ebuild
@@ -21,11 +21,6 @@ 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 ~x64-solaris"
 IUSE="examples +sqlite test"
 
-RDEPEND="
-	$(python_gen_cond_dep '
-		dev-python/importlib_metadata[${PYTHON_USEDEP}]
-	' pypy3)
-"
 BDEPEND="
 	test? (
 		$(python_gen_impl_dep sqlite)
diff --git a/dev-python/tox/tox-3.24.4.ebuild b/dev-python/tox/tox-3.24.4-r1.ebuild
index 4a65e0590484..c5079fed35f5 100644
--- a/dev-python/tox/tox-3.24.4.ebuild
+++ b/dev-python/tox/tox-3.24.4-r1.ebuild
@@ -19,9 +19,6 @@ RESTRICT="!test? ( test )"
 
 RDEPEND="
 	dev-python/filelock[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/importlib_metadata-1.1[${PYTHON_USEDEP}]
-	' pypy3)
 	dev-python/packaging[${PYTHON_USEDEP}]
 	>=dev-python/pluggy-0.12[${PYTHON_USEDEP}]
 	dev-python/pip[${PYTHON_USEDEP}]
diff --git a/dev-python/virtualenv/virtualenv-20.9.0.ebuild b/dev-python/virtualenv/virtualenv-20.10.0-r1.ebuild
index ba9590962c9b..be2cf623ac94 100644
--- a/dev-python/virtualenv/virtualenv-20.9.0.ebuild
+++ b/dev-python/virtualenv/virtualenv-20.10.0-r1.ebuild
@@ -26,10 +26,7 @@ RDEPEND="
 	>=dev-python/filelock-3[${PYTHON_USEDEP}]
 	>=dev-python/platformdirs-2[${PYTHON_USEDEP}]
 	>=dev-python/setuptools-41[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/importlib_metadata-0.12[${PYTHON_USEDEP}]
-	' pypy3)"
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]"
 # coverage is used somehow magically in virtualenv, maybe it actually
 # tests something useful
 BDEPEND="
diff --git a/dev-python/virtualenv/virtualenv-20.7.2-r1.ebuild b/dev-python/virtualenv/virtualenv-20.7.2-r2.ebuild
index 49bb3dbacf90..7784e6b1147d 100644
--- a/dev-python/virtualenv/virtualenv-20.7.2-r1.ebuild
+++ b/dev-python/virtualenv/virtualenv-20.7.2-r2.ebuild
@@ -26,10 +26,7 @@ RDEPEND="
 	>=dev-python/filelock-3[${PYTHON_USEDEP}]
 	>=dev-python/platformdirs-2[${PYTHON_USEDEP}]
 	>=dev-python/setuptools-41[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/importlib_metadata-0.12[${PYTHON_USEDEP}]
-	' pypy3)"
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]"
 # coverage is used somehow magically in virtualenv, maybe it actually
 # tests something useful
 BDEPEND="
diff --git a/dev-python/virtualenv/virtualenv-20.8.1-r1.ebuild b/dev-python/virtualenv/virtualenv-20.8.1-r2.ebuild
index 2300441a4b01..27cd3cd6f86a 100644
--- a/dev-python/virtualenv/virtualenv-20.8.1-r1.ebuild
+++ b/dev-python/virtualenv/virtualenv-20.8.1-r2.ebuild
@@ -26,10 +26,7 @@ RDEPEND="
 	>=dev-python/filelock-3[${PYTHON_USEDEP}]
 	>=dev-python/platformdirs-2[${PYTHON_USEDEP}]
 	>=dev-python/setuptools-41[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/importlib_metadata-0.12[${PYTHON_USEDEP}]
-	' pypy3)"
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]"
 # coverage is used somehow magically in virtualenv, maybe it actually
 # tests something useful
 BDEPEND="
diff --git a/dev-python/virtualenv/virtualenv-20.10.0.ebuild b/dev-python/virtualenv/virtualenv-20.9.0-r1.ebuild
index ba9590962c9b..be2cf623ac94 100644
--- a/dev-python/virtualenv/virtualenv-20.10.0.ebuild
+++ b/dev-python/virtualenv/virtualenv-20.9.0-r1.ebuild
@@ -26,10 +26,7 @@ RDEPEND="
 	>=dev-python/filelock-3[${PYTHON_USEDEP}]
 	>=dev-python/platformdirs-2[${PYTHON_USEDEP}]
 	>=dev-python/setuptools-41[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/importlib_metadata-0.12[${PYTHON_USEDEP}]
-	' pypy3)"
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]"
 # coverage is used somehow magically in virtualenv, maybe it actually
 # tests something useful
 BDEPEND="
diff --git a/dev-python/wrapt/wrapt-1.13.2.ebuild b/dev-python/wrapt/wrapt-1.13.2.ebuild
index c9f9e9e9abbf..5aada7cd0be1 100644
--- a/dev-python/wrapt/wrapt-1.13.2.ebuild
+++ b/dev-python/wrapt/wrapt-1.13.2.ebuild
@@ -12,7 +12,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 ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 
 distutils_enable_tests pytest
 distutils_enable_sphinx docs dev-python/sphinx_rtd_theme
diff --git a/dev-python/yarl/yarl-1.7.0.ebuild b/dev-python/yarl/yarl-1.7.0.ebuild
index 75791c2bd634..f1af231199b9 100644
--- a/dev-python/yarl/yarl-1.7.0.ebuild
+++ b/dev-python/yarl/yarl-1.7.0.ebuild
@@ -17,9 +17,6 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc
 RDEPEND="
 	>=dev-python/multidict-4.0[${PYTHON_USEDEP}]
 	>=dev-python/idna-2.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/typing-extensions-3.7.4[${PYTHON_USEDEP}]
-	' pypy3)
 "
 
 distutils_enable_tests pytest
diff --git a/dev-python/yarl/yarl-1.7.2.ebuild b/dev-python/yarl/yarl-1.7.2-r1.ebuild
index 75791c2bd634..f1af231199b9 100644
--- a/dev-python/yarl/yarl-1.7.2.ebuild
+++ b/dev-python/yarl/yarl-1.7.2-r1.ebuild
@@ -17,9 +17,6 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc
 RDEPEND="
 	>=dev-python/multidict-4.0[${PYTHON_USEDEP}]
 	>=dev-python/idna-2.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/typing-extensions-3.7.4[${PYTHON_USEDEP}]
-	' pypy3)
 "
 
 distutils_enable_tests pytest