Adding metadata

26 files changed, 183 insertions, 208 deletions

diff --git a/dev-python/flask-migrate/Manifest b/dev-python/flask-migrate/Manifest
index 1205b7849660..cfd45f767f3d 100644
--- a/dev-python/flask-migrate/Manifest
+++ b/dev-python/flask-migrate/Manifest
@@ -1,2 +1,3 @@
 DIST Flask-Migrate-2.7.0.tar.gz 12627 BLAKE2B 2ad252ef6338bd45c2df4cf95ebaa137e43b5cce7780ccafcc9a0d972473ab230acae03ca14c1dd1f500ceb4c5fa1d0ed6a892bf7e2317c9dfd530a59c025da3 SHA512 9d5f5845c3483bc2ab1271431312331bbc45aeac5bd9464f99898e16e32d9ba124cb11f11fae59a29bf1d6e3dba5f2ca922ae32c2548a5d67d9286ca17d475ab
 DIST Flask-Migrate-3.0.0.tar.gz 11536 BLAKE2B 6bee958fc059f5980ed1b75309c7166940f6ecee536f83a7f7f219e0ce5acd4e62aecffcae5979d2da53b4b074c526c662b4c7c74be0548240f64501c0c2a27d SHA512 e13c3f96e68892b9319292998fcec43df253e01534d9d02a24fc54a2c2ef8fe87b5a01706842e9825819021d29a41f56f635963ed5157c6fc16bf9686212d107
+DIST Flask-Migrate-3.0.1.tar.gz 12154 BLAKE2B a6902b3ff1a369fa507d01c9c9bed13b0d93d167fa511a3b54f707e27cb48f40e30957414ae5c1443796c635894cf6ed17f72b9d3e3b0e1e7bdabfe4d5157d56 SHA512 cefad924e471730778dfca16da665b499733ff236ad2d499e27094b1caf73da5d6c8d667fe51bb5fc353ec9954e6952a22bb85c223ce9a4009d5a6e831284421
diff --git a/dev-python/flask-migrate/flask-migrate-3.0.1.ebuild b/dev-python/flask-migrate/flask-migrate-3.0.1.ebuild
new file mode 100644
index 000000000000..4a43f241e9bc
--- /dev/null
+++ b/dev-python/flask-migrate/flask-migrate-3.0.1.ebuild
@@ -0,0 +1,27 @@
+# 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
+
+MY_PN="Flask-Migrate"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="SQLAlchemy database migrations for Flask applications using Alembic"
+HOMEPAGE="https://pypi.org/project/Flask-Migrate/"
+SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>=dev-python/alembic-0.7[${PYTHON_USEDEP}]
+	>=dev-python/flask-0.9[${PYTHON_USEDEP}]
+	>=dev-python/flask-sqlalchemy-1.0[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests unittest
diff --git a/dev-python/identify/Manifest b/dev-python/identify/Manifest
index a2e0c1ef6ef1..4875122a6599 100644
--- a/dev-python/identify/Manifest
+++ b/dev-python/identify/Manifest
@@ -1,2 +1,3 @@
 DIST identify-2.2.4.tar.gz 100967 BLAKE2B 9473a157ce2aed13ed45d6e8d83b4510c40ae977406b9d7b211caa70c27d1850cf49da8848495841281b1f192b576d269a5372215effd7d89c9211e51d51151d SHA512 25e255fd62d0e75aafa7037085362b7bf2ba8ae142bfb11e0e20452d503d8ec3f90ec84c8ef8966fb021fe1054c226862b3ce99d2288ec9aaa758a8971d1c87a
 DIST identify-2.2.6.tar.gz 101016 BLAKE2B eac32751d54379e3ba5ca5970c3fc02b6ac9f677a26f7a2c91986ba6ce8773a8e51ed98f17b6b12ba920cabd3d66ca23cd765d2cb6c48253ff97c34ddb9cb81e SHA512 09694ea3d92265385a79464ef948effb5b074f5b67a8a25171b4872b2cd70537a17c87c2aa94b66e3079f2047b290300beb7ed74be50ecdf09cb723948bc11d9
+DIST identify-2.2.7.tar.gz 101032 BLAKE2B 988aecb3f32b1d1416984ad7cb5937f85600e222a1053d2800dda1c498fea2660f86ee42208611c71e29b9827e212992fed35697a3d24f02814cc6ea8a560615 SHA512 f3c4073a9018ba595c8535447c7ccb20ca1f8d8bb006b4662db19b3356afc33d810b2073810b86d7dec4572b151c53301feca09bf0662d4d683febbdf7735e06
diff --git a/dev-python/identify/identify-2.2.7.ebuild b/dev-python/identify/identify-2.2.7.ebuild
new file mode 100644
index 000000000000..5e6f8e81442f
--- /dev/null
+++ b/dev-python/identify/identify-2.2.7.ebuild
@@ -0,0 +1,19 @@
+# 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="File identification library for Python"
+HOMEPAGE="https://github.com/pre-commit/identify"
+SRC_URI="https://github.com/pre-commit/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="dev-python/editdistance-s[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
diff --git a/dev-python/lxml/lxml-4.6.3-r1.ebuild b/dev-python/lxml/lxml-4.6.3-r1.ebuild
index e6ea77bcfbda..4635dadcc951 100644
--- a/dev-python/lxml/lxml-4.6.3-r1.ebuild
+++ b/dev-python/lxml/lxml-4.6.3-r1.ebuild
@@ -14,7 +14,7 @@ S=${WORKDIR}/lxml-${P}
 
 LICENSE="BSD ElementTree GPL-2 PSF-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc examples +threads test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/pyTenable/Manifest b/dev-python/pyTenable/Manifest
deleted file mode 100644
index 2dc9a801faea..000000000000
--- a/dev-python/pyTenable/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST pyTenable-1.1.3.tar.gz 139494 BLAKE2B 292b5f8a4da5a88e0b0f6be8d3dc72601e7218361fabf31afcfd229c1448f82b85b4911f93e34523ea03b69f2d932f03febf0084861d72e37e5c2f2b6ec49f67 SHA512 1998c1d58edcdc75983deef083b9c6d382f144aadc87a5e4be287712a8e07751fcb43ac697c5c7df56b671aa23c769db45d362247eea9456e24b7fa0a1241b9d
diff --git a/dev-python/pyTenable/metadata.xml b/dev-python/pyTenable/metadata.xml
deleted file mode 100644
index de7c1d90367a..000000000000
--- a/dev-python/pyTenable/metadata.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="person">
-  <email>gyakovlev@gentoo.org</email>
-  <name>Georgy Yakovlev</name>
- </maintainer>
- <upstream>
-  <remote-id type="github">tenable/pyTenable</remote-id>
-  <remote-id type="pypi">pyTenable</remote-id>
- </upstream>
- <origin>gentoo-staging</origin>
-</pkgmetadata>
\ No newline at end of file
diff --git a/dev-python/pyTenable/pyTenable-1.1.3.ebuild b/dev-python/pyTenable/pyTenable-1.1.3.ebuild
deleted file mode 100644
index f2f919b4481f..000000000000
--- a/dev-python/pyTenable/pyTenable-1.1.3.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 2018-2020 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="Tenable API Library for Tenable.io and SecurityCenter"
-HOMEPAGE="https://github.com/tenable/pyTenable"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-IUSE=""
-
-RDEPEND="
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/requests_pkcs12[${PYTHON_USEDEP}]
-	dev-python/semver[${PYTHON_USEDEP}]
-	dev-python/defusedxml[${PYTHON_USEDEP}]
-	dev-python/docker-py[${PYTHON_USEDEP}]
-"
-
-# requires networking and API endpoint
-RESTRICT="test"
diff --git a/dev-python/pyatspi/Manifest b/dev-python/pyatspi/Manifest
index 3912a10f292f..abf1bc5ff677 100644
--- a/dev-python/pyatspi/Manifest
+++ b/dev-python/pyatspi/Manifest
@@ -1,2 +1 @@
-DIST pyatspi-2.36.0.tar.xz 315076 BLAKE2B f3f92dafab68ce003e9d63f8ebf901ef834eafb1fab3ddd2051dcfb308b79d7ce6fc4d9187ed51f3af8bebad5e6ef2296c19215ee209ad37fe717f332af8d8f7 SHA512 709236fd992f570426043e32b201bdfee06bb28faa3d1237778f4069d3548b88b8336e53c0951359f5c7e2914b90f6f682ac58e33c84e32f360bdc32662800af
 DIST pyatspi-2.38.1.tar.xz 316724 BLAKE2B 59ca2569575f3d319d33972477ebc966670138df8cb6570ac260dd903f54df66fd12beeeee53e3380938e4571910b99ae2bf3f395776b16a73ac27f8fa023c49 SHA512 bf8f1ee9a6e00014a84e4329bb971bec8b4bc8f72c3905ca585ca20b1cf000b855965159fcc10871eb92e9808a6b41b5d793f3ab563ff0867f185279eedcd487
diff --git a/dev-python/pyatspi/pyatspi-2.36.0.ebuild b/dev-python/pyatspi/pyatspi-2.36.0.ebuild
deleted file mode 100644
index 0ac68cb48195..000000000000
--- a/dev-python/pyatspi/pyatspi-2.36.0.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-
-inherit gnome2 python-r1 virtualx
-
-DESCRIPTION="Python client bindings for D-Bus AT-SPI"
-HOMEPAGE="https://wiki.gnome.org/Accessibility"
-
-# Note: only some of the tests are GPL-licensed, everything else is LGPL
-LICENSE="LGPL-2 GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 sparc x86"
-
-IUSE="test"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-COMMON_DEPEND="${PYTHON_DEPS}
-	>=dev-libs/atk-2.11.2
-	dev-python/dbus-python[${PYTHON_USEDEP}]
-	>=dev-python/pygobject-2.90.1:3[${PYTHON_USEDEP}]
-"
-RDEPEND="${COMMON_DEPEND}
-	>=sys-apps/dbus-1
-	>=app-accessibility/at-spi2-core-2.34[introspection]
-	!<gnome-extra/at-spi-1.32.0-r1
-"
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig
-	test? ( dev-libs/dbus-glib )
-"
-
-src_prepare() {
-	gnome2_src_prepare
-	python_copy_sources
-}
-
-src_configure() {
-	python_foreach_impl run_in_build_dir gnome2_src_configure $(use_enable test tests)
-}
-
-src_compile() {
-	python_foreach_impl run_in_build_dir gnome2_src_compile
-}
-
-src_test() {
-	python_foreach_impl run_in_build_dir virtx dbus-run-session emake check
-}
-
-src_install() {
-	installing() {
-		gnome2_src_install
-		python_optimize
-	}
-	python_foreach_impl run_in_build_dir installing
-
-	docinto examples
-	dodoc examples/*.py
-}
diff --git a/dev-python/pyside2-tools/pyside2-tools-5.15.1-r1.ebuild b/dev-python/pyside2-tools/pyside2-tools-5.15.1-r1.ebuild
index 224bf4f4dc96..493ca1c3584d 100644
--- a/dev-python/pyside2-tools/pyside2-tools-5.15.1-r1.ebuild
+++ b/dev-python/pyside2-tools/pyside2-tools-5.15.1-r1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://download.qt.io/official_releases/QtForPython/pyside2/PySide2-${
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 CDEPEND="${PYTHON_DEPS}
diff --git a/dev-python/pytools/Manifest b/dev-python/pytools/Manifest
index bf514350ea76..1b096a4ecffa 100644
--- a/dev-python/pytools/Manifest
+++ b/dev-python/pytools/Manifest
@@ -1 +1,2 @@
 DIST pytools-2021.2.6.tar.gz 63630 BLAKE2B a94420134688514f5a27c85aedb3655e507ca37b30e0db81656e9c1597b2527f55e534b777d97daef889ed496766718bd42c1e6193ac62d45ec90e9305a91959 SHA512 378c58c4e321f5ca3bb8e3d36d06dfdbe20d04210ca9943cff0909b85d2fd89791c1d966992b2e6f5ccd772f68d223eb13c02b335d9f5c0ac3b17d36fe04aed0
+DIST pytools-2021.2.7.tar.gz 63673 BLAKE2B 0d64aea8c87bf7d8f6f0fb432545fc20589aadf8cee41fdc9096a1e59e1ec4588812b803cffcbf8cc92bab4e18d5ea4422beeddc9408051af11e06b04d8e7a6a SHA512 284fbdb638d40247e330c254567f594f723cad467a504bb31852c0ec5cbbb0648d9596c65e9839975bbe3a52556896440c25da5d2171aaed7c26ba38db6a4426
diff --git a/dev-python/pytools/pytools-2021.2.7.ebuild b/dev-python/pytools/pytools-2021.2.7.ebuild
new file mode 100644
index 000000000000..c73c8d5facb9
--- /dev/null
+++ b/dev-python/pytools/pytools-2021.2.7.ebuild
@@ -0,0 +1,24 @@
+# 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} )
+PYTHON_REQ_USE='sqlite'
+
+inherit distutils-r1
+
+DESCRIPTION="Collection of tools missing from the Python standard library"
+HOMEPAGE="https://mathema.tician.de/software/pytools/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	>=dev-python/appdirs-1.4.0[${PYTHON_USEDEP}]
+	>=dev-python/numpy-1.6.0[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/scipy/scipy-1.6.2.ebuild b/dev-python/scipy/scipy-1.6.2.ebuild
index f3e68c041686..d7b9b44c79c5 100644
--- a/dev-python/scipy/scipy-1.6.2.ebuild
+++ b/dev-python/scipy/scipy-1.6.2.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
 
 LICENSE="BSD LGPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="doc sparse"
 
 DEPEND="
diff --git a/dev-python/sqlalchemy/sqlalchemy-1.4.15.ebuild b/dev-python/sqlalchemy/sqlalchemy-1.4.15.ebuild
index ed6104acaf88..feebe3f8bcf6 100644
--- a/dev-python/sqlalchemy/sqlalchemy-1.4.15.ebuild
+++ b/dev-python/sqlalchemy/sqlalchemy-1.4.15.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="examples +sqlite test"
 
 RDEPEND="
diff --git a/dev-python/vcrpy/vcrpy-4.1.1.ebuild b/dev-python/vcrpy/vcrpy-4.1.1.ebuild
index ec02a5dfdbf8..6e2132368f28 100644
--- a/dev-python/vcrpy/vcrpy-4.1.1.ebuild
+++ b/dev-python/vcrpy/vcrpy-4.1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/kevin1024/vcrpy/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 
 RDEPEND="
 	>=dev-python/httplib2-0.9.1[${PYTHON_USEDEP}]
diff --git a/dev-python/zope-component/zope-component-4.4.1.ebuild b/dev-python/zope-component/zope-component-4.4.1.ebuild
index dd2307c1dc4c..7956cf9adc77 100644
--- a/dev-python/zope-component/zope-component-4.4.1.ebuild
+++ b/dev-python/zope-component/zope-component-4.4.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,25 +14,20 @@ DESCRIPTION="Zope Component Architecture"
 HOMEPAGE="https://github.com/zopefoundation/zope.component
 	https://docs.zope.org/zope.component/"
 SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+S=${WORKDIR}/${MY_P}
 
 LICENSE="ZPL"
 SLOT="0"
 KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
-IUSE="test"
 
 RDEPEND="dev-python/namespace-zope[${PYTHON_USEDEP}]
 	dev-python/zope-event[${PYTHON_USEDEP}]
 	>=dev-python/zope-interface-4.1.0[${PYTHON_USEDEP}]"
-DEPEND="test? ( ${RDEPEND}
-	dev-python/nose[${PYTHON_USEDEP}] )"
-
-S=${WORKDIR}/${MY_P}
 
+# Uses multiple new dependencies, which isn't worth it
 RESTRICT="test"
 
-python_test() {
-	nosetests || die
-}
+distutils_enable_tests nose
 
 python_install_all() {
 	distutils-r1_python_install_all
diff --git a/dev-python/zope-deprecation/zope-deprecation-4.4.0.ebuild b/dev-python/zope-deprecation/zope-deprecation-4.4.0.ebuild
index c503a88c2f9c..a59e85e95534 100644
--- a/dev-python/zope-deprecation/zope-deprecation-4.4.0.ebuild
+++ b/dev-python/zope-deprecation/zope-deprecation-4.4.0.ebuild
@@ -14,6 +14,7 @@ MY_P=${MY_PN}-${PV}
 DESCRIPTION="Zope Deprecation Infrastructure"
 HOMEPAGE="https://github.com/zopefoundation/zope.deprecation"
 SRC_URI="mirror://pypi/${MY_PN::1}/${MY_PN}/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
 
 LICENSE="ZPL"
 SLOT="0"
@@ -21,8 +22,6 @@ KEYWORDS="amd64 x86"
 
 RDEPEND="dev-python/namespace-zope[${PYTHON_USEDEP}]"
 
-S="${WORKDIR}/${MY_P}"
-
 distutils_enable_tests setup.py
 
 python_install_all() {
diff --git a/dev-python/zope-exceptions/files/zope-exceptions-4.4-fix-test-py3.10.patch b/dev-python/zope-exceptions/files/zope-exceptions-4.4-fix-test-py3.10.patch
new file mode 100644
index 000000000000..a218797b25a2
--- /dev/null
+++ b/dev-python/zope-exceptions/files/zope-exceptions-4.4-fix-test-py3.10.patch
@@ -0,0 +1,23 @@
+From 71be9d0724f087c99857edeef514d0b99e429cc9 Mon Sep 17 00:00:00 2001
+From: Zamarin Arthur <arthurzam@gmail.com>
+Date: Mon, 31 May 2021 12:14:30 +0300
+Subject: [PATCH] Adapt to python 3.10 SyntaxError messages
+
+Signed-off-by: Zamarin Arthur <arthurzam@gmail.com>
+---
+ src/zope/exceptions/tests/test_exceptionformatter.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/zope/exceptions/tests/test_exceptionformatter.py b/src/zope/exceptions/tests/test_exceptionformatter.py
+index 64729b1..0f5ee8c 100644
+--- a/src/zope/exceptions/tests/test_exceptionformatter.py
++++ b/src/zope/exceptions/tests/test_exceptionformatter.py
+@@ -668,7 +668,7 @@ def test_multiline_exception(self):
+         self.assertEqual(lines[0], '    syntax error')
+         # PyPy has a shorter prefix
+         self.assertTrue(lines[1].endswith('    ^'))
+-        self.assertEqual(lines[2], 'SyntaxError: invalid syntax')
++        self.assertRegex(lines[2], '^SyntaxError: invalid syntax')
+ 
+     def test_traceback_info_non_ascii(self):
+         __traceback_info__ = u"Have a Snowman: \u2603"
diff --git a/dev-python/zope-exceptions/zope-exceptions-4.4.ebuild b/dev-python/zope-exceptions/zope-exceptions-4.4.ebuild
index 78902d44e51b..5da406f522fe 100644
--- a/dev-python/zope-exceptions/zope-exceptions-4.4.ebuild
+++ b/dev-python/zope-exceptions/zope-exceptions-4.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,6 +14,7 @@ MY_P=${MY_PN}-${PV}
 DESCRIPTION="General purpose exceptions for Zope packages"
 HOMEPAGE="https://pypi.org/project/zope.exceptions/ https://github.com/zopefoundation/zope.exceptions"
 SRC_URI="mirror://pypi/${MY_PN::1}/${MY_PN}/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
 
 LICENSE="ZPL"
 SLOT="0"
@@ -23,7 +24,9 @@ RDEPEND="dev-python/namespace-zope[${PYTHON_USEDEP}]
 	dev-python/zope-interface[${PYTHON_USEDEP}]"
 BDEPEND="test? ( dev-python/zope-testrunner[${PYTHON_USEDEP}] )"
 
-S="${WORKDIR}/${MY_P}"
+PATCHES=(
+	"${FILESDIR}/${P}-fix-test-py3.10.patch"
+)
 
 distutils_enable_tests setup.py
 
diff --git a/dev-python/zope-i18nmessageid/zope-i18nmessageid-5.0.1.ebuild b/dev-python/zope-i18nmessageid/zope-i18nmessageid-5.0.1.ebuild
index cc6d7ba5f870..b86a2272c25f 100644
--- a/dev-python/zope-i18nmessageid/zope-i18nmessageid-5.0.1.ebuild
+++ b/dev-python/zope-i18nmessageid/zope-i18nmessageid-5.0.1.ebuild
@@ -29,8 +29,7 @@ RDEPEND="
 distutils_enable_tests unittest
 
 python_test() {
-	"${EPYTHON}" -m unittest discover -v -s "${BUILD_DIR}"/lib ||
-		die "Tests failed with ${EPYTHON}"
+	eunittest "${BUILD_DIR}"/lib
 }
 
 python_install_all() {
diff --git a/dev-python/zope-schema/Manifest b/dev-python/zope-schema/Manifest
index 709b858f0604..a88f0390965a 100644
--- a/dev-python/zope-schema/Manifest
+++ b/dev-python/zope-schema/Manifest
@@ -1,3 +1 @@
-DIST zope.schema-6.0.0.tar.gz 110343 BLAKE2B 8dad6fcbd5bf3ef5902657bb7cfc4d31509cf8b74be3e44ec2a5977dc998bbe9b2605dd0edd85aec7f5e67e5e4e7ea6e9ddde2e63f5d56226dfead804e10eb61 SHA512 3258e6b2bf97485b9496f19319ef5af9a1e908b6c2661c27f45cfd64057597cfd514acbe79d86ddda1b80e66be45a10680fc3d9e662513b360d5f047917735d8
-DIST zope.schema-6.0.1.tar.gz 108325 BLAKE2B 4e23b2a864ce8ca650d71723f2ec89f04e05e7739cbe6b236ebdd4ffe80261a75faac414ae411b1ea525f93375f8eb4b6eb1e6186e04d225467b729f5c630b77 SHA512 c8b9182975b1f2834827877c725a8d0c800bf3cbed9dce2625bb3e1715c0fb7d346b8206f47a96994fa79240a0cb30c4aa38cea56f9ecb79351fd97e0bc021ba
 DIST zope.schema-6.1.0.tar.gz 103042 BLAKE2B 1892e5724b6f947cda40567f0694821d49ee66239af51d13d331dbb55b8251352670a7b37ff77ad6b36da7c18a8614338364e43f1fcf92464121d6b5daf65985 SHA512 a832bc779195dc3f1ce812610adc97205a4074c9523d70ee4019e03285f7d94df24f165a834e65cf26b06fc48754b76189299e58af5d4888a4abb15dc0d64ec0
diff --git a/dev-python/zope-schema/zope-schema-6.0.0.ebuild b/dev-python/zope-schema/zope-schema-6.0.0.ebuild
deleted file mode 100644
index 59cd550ab477..000000000000
--- a/dev-python/zope-schema/zope-schema-6.0.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
-
-inherit distutils-r1
-
-MY_PN=${PN/-/.}
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Zope schema Architecture"
-HOMEPAGE="https://github.com/zopefoundation/zope.schema"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="ZPL"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-
-RDEPEND="dev-python/zope-event[${PYTHON_USEDEP}]
-	>=dev-python/zope-interface-5.0.0[${PYTHON_USEDEP}]"
-BDEPEND="test? (
-		dev-python/zope-i18nmessageid[${PYTHON_USEDEP}]
-		dev-python/zope-testing[${PYTHON_USEDEP}]
-		dev-python/zope-testrunner[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests setup.py
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	# remove .pth files since dev-python/namespace-zope handles the ns
-	find "${D}" -name '*.pth' -delete || die
-}
diff --git a/dev-python/zope-schema/zope-schema-6.0.1.ebuild b/dev-python/zope-schema/zope-schema-6.0.1.ebuild
deleted file mode 100644
index 6da293143bb4..000000000000
--- a/dev-python/zope-schema/zope-schema-6.0.1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
-
-inherit distutils-r1
-
-MY_PN=${PN/-/.}
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Zope schema Architecture"
-HOMEPAGE="https://github.com/zopefoundation/zope.schema"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="ZPL"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-
-RDEPEND="
-	dev-python/zope-event[${PYTHON_USEDEP}]
-	>=dev-python/zope-interface-5.0.0[${PYTHON_USEDEP}]"
-BDEPEND="
-	test? (
-		dev-python/zope-i18nmessageid[${PYTHON_USEDEP}]
-		dev-python/zope-testing[${PYTHON_USEDEP}]
-		dev-python/zope-testrunner[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests setup.py
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	# remove .pth files since dev-python/namespace-zope handles the ns
-	find "${D}" -name '*.pth' -delete || die
-}
diff --git a/dev-python/zope-testrunner/files/zope-testrunner-5.3.0-fix-test-py3.10.patch b/dev-python/zope-testrunner/files/zope-testrunner-5.3.0-fix-test-py3.10.patch
new file mode 100644
index 000000000000..6d495ba2cf5f
--- /dev/null
+++ b/dev-python/zope-testrunner/files/zope-testrunner-5.3.0-fix-test-py3.10.patch
@@ -0,0 +1,64 @@
+From af8bfec49d90613633b76e914a6f54884463ba94 Mon Sep 17 00:00:00 2001
+From: Jerry James <loganjerry@gmail.com>
+Date: Mon, 10 May 2021 09:55:23 -0600
+Subject: [PATCH] Adapt to python 3.10 SyntaxError messages
+
+---
+ .../testrunner/tests/testrunner-debugging-import-failure.rst    | 2 +-
+ src/zope/testrunner/tests/testrunner-errors.rst                 | 2 +-
+ src/zope/testrunner/tests/testrunner-subunit-v2.rst             | 2 +-
+ src/zope/testrunner/tests/testrunner-subunit.rst                | 2 +-
+ 4 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/src/zope/testrunner/tests/testrunner-debugging-import-failure.rst b/src/zope/testrunner/tests/testrunner-debugging-import-failure.rst
+index 1613cb9..c0b2aee 100644
+--- a/src/zope/testrunner/tests/testrunner-debugging-import-failure.rst
++++ b/src/zope/testrunner/tests/testrunner-debugging-import-failure.rst
+@@ -41,7 +41,7 @@ Post-mortem debugging also works when there is an import failure.
+       File ".../TESTS-DIR/tests.py", line 2
+         impot doctest
+                     ^
+-    SyntaxError: invalid syntax
++    SyntaxError: invalid syntax...
+     > ...find.py(399)import_name()
+     -> __import__(name)
+     (Pdb) c
+diff --git a/src/zope/testrunner/tests/testrunner-errors.rst b/src/zope/testrunner/tests/testrunner-errors.rst
+index e210fe3..05d74b8 100644
+--- a/src/zope/testrunner/tests/testrunner-errors.rst
++++ b/src/zope/testrunner/tests/testrunner-errors.rst
+@@ -818,7 +818,7 @@ Then run the tests:
+       File "testrunner-ex/sample2/sampletests_i.py", line 1
+         importx unittest
+                        ^
+-    SyntaxError: invalid syntax
++    SyntaxError: invalid syntax...
+     <BLANKLINE>
+     <BLANKLINE>
+     Module: sample2.sample21.sampletests_i
+diff --git a/src/zope/testrunner/tests/testrunner-subunit-v2.rst b/src/zope/testrunner/tests/testrunner-subunit-v2.rst
+index 8658fe3..c165b23 100644
+--- a/src/zope/testrunner/tests/testrunner-subunit-v2.rst
++++ b/src/zope/testrunner/tests/testrunner-subunit-v2.rst
+@@ -447,7 +447,7 @@ Let's run tests including a module with some bad syntax:
+       File "/home/benji/workspace/all-the-trunks/zope.testrunner/src/zope/testrunner/testrunner-ex/sample2/badsyntax.py", line 16
+         importx unittest  # noqa: E999
+                        ^
+-    SyntaxError: invalid syntax
++    SyntaxError: invalid syntax...
+     <BLANKLINE>
+     id=sample2.badsyntax status=fail tags=(zope:import_error)
+     id=sample2.sample21.sampletests_i status=inprogress
+diff --git a/src/zope/testrunner/tests/testrunner-subunit.rst b/src/zope/testrunner/tests/testrunner-subunit.rst
+index 6597a88..1882671 100644
+--- a/src/zope/testrunner/tests/testrunner-subunit.rst
++++ b/src/zope/testrunner/tests/testrunner-subunit.rst
+@@ -480,7 +480,7 @@ Let's run tests including a module with some bad syntax:
+       File "/home/benji/workspace/all-the-trunks/zope.testrunner/src/zope/testrunner/testrunner-ex/sample2/badsyntax.py", line 16
+         importx unittest  # noqa: E999
+                        ^
+-    SyntaxError: invalid syntax
++    SyntaxError: invalid syntax...
+     ]
+     test: sample2.sample21.sampletests_i
+     tags: zope:import_error
diff --git a/dev-python/zope-testrunner/zope-testrunner-5.3.0.ebuild b/dev-python/zope-testrunner/zope-testrunner-5.3.0.ebuild
index f1be71c6d4d9..0bcf323aeab4 100644
--- a/dev-python/zope-testrunner/zope-testrunner-5.3.0.ebuild
+++ b/dev-python/zope-testrunner/zope-testrunner-5.3.0.ebuild
@@ -20,13 +20,17 @@ LICENSE="ZPL"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 
-BDEPEND="
-	test? ( dev-python/zope-testing[${PYTHON_USEDEP}] )"
 RDEPEND="
 	dev-python/namespace-zope[${PYTHON_USEDEP}]
 	dev-python/six[${PYTHON_USEDEP}]
 	dev-python/zope-exceptions[${PYTHON_USEDEP}]
 	dev-python/zope-interface[${PYTHON_USEDEP}]"
+BDEPEND="
+	test? ( dev-python/zope-testing[${PYTHON_USEDEP}] )"
+
+PATCHES=(
+	"${FILESDIR}/${P}-fix-test-py3.10.patch"
+)
 
 distutils_enable_tests setup.py