Adding metadata

16 files changed, 65 insertions, 742 deletions

diff --git a/dev-python/google-auth/Manifest b/dev-python/google-auth/Manifest
index cf7d3a4f30bc..8deeca55e81d 100644
--- a/dev-python/google-auth/Manifest
+++ b/dev-python/google-auth/Manifest
@@ -1,3 +1,3 @@
 DIST google-auth-1.24.0.tar.gz 120351 BLAKE2B b0a78ad87622bc806cce72847d5dad3844afe080ffbcd822575dab6208952806360bed4e8756133d5b4fe2755f6cbeeb239b8f51634dd3d4cede9346372b689a SHA512 3e678dd946eb6c3c865cd35df1480a96ed35cf14b973f2239c5213b223a6569b4a9642609ac51243af75c662a08bbf0518d8592db97af297cf67c52b83019e30
 DIST google-auth-1.25.0.tar.gz 121940 BLAKE2B 9c7346b134153321fe7116cc77bdcd0d07b2d4a5264d4a982f23a44458ba17c03ef8d204d2c6bd697561c11563bbff1d093ec4563700910ea3bbd9a063006005 SHA512 1c83f18904b646264263c8ba20c13bcc61572b9de397331564b1c2e65083a27e6393dd9435b03789136d2fc2b43750f784d21a3dc670a58cc4bade9de267f195
-DIST google-auth-1.26.0.tar.gz 156982 BLAKE2B b7511ae345e239ccbba87210ad2dd75cb845512753afe7b18613d3657a24e94e9525ff3f6fdd14f81623503fd0cb66696790285f8d4b812ee0b498005536768e SHA512 7e98afdf59d74c52abf074b158d15a75f2e4e17da9da917fd18a64e463168b51aab66cb5d9b09740b380f7fd268319b63d15259af8bb706d49c64abf587f298b
+DIST google-auth-1.26.1.tar.gz 121927 BLAKE2B a24a9c5bca8de234213e75673ba49ef6b82eb3c165f9c3af276b3c4cd47750c6d8a53e46084ae71c8eadf474ec8f53c6a2469fd91e7bdcc87f61bd46bbf9704d SHA512 632cdada9975311ab079022da79334f69ae703183bef395c3b04fc86192c23032b9925259ade7c115883659b10a403661f2d9a39f3b5262b964d0b9f2947567f
diff --git a/dev-python/google-auth/google-auth-1.26.0.ebuild b/dev-python/google-auth/google-auth-1.26.1.ebuild
index 8106ce0b3386..8106ce0b3386 100644
--- a/dev-python/google-auth/google-auth-1.26.0.ebuild
+++ b/dev-python/google-auth/google-auth-1.26.1.ebuild
diff --git a/dev-python/libvirt-python/Manifest b/dev-python/libvirt-python/Manifest
index 2af3329852d2..02025edee573 100644
--- a/dev-python/libvirt-python/Manifest
+++ b/dev-python/libvirt-python/Manifest
@@ -1,4 +1,2 @@
-DIST libvirt-python-6.10.0.tar.gz 212567 BLAKE2B 0ba583646c16c8e298a4cde789dca9c0f4920a3ac7e241134e251e5d0fc426a37c297870571acc673de2ce14c3de5bb7069316805581ce33cc044090930dd599 SHA512 bc9d65fa82cf021c0929c8f2760a31de606d52c860d15d1961438fd763131f05fa3f4e12f0030b45ad12c3ae40d84b21167091ae810376487b7aae11c2e3ab2b
 DIST libvirt-python-6.8.0.tar.gz 210034 BLAKE2B 667c2713bf9c0936f444c5b621f5af4e5273deda31496bc01c8834286a0ec0eb1c056006549cc5d129ef597264f8582acee62db3a2fd375daa4ebbceacb8fcc1 SHA512 6d2f82fafd414047cff16f0ad655fefd69c8c0da04be07d27da44e3ab17dd03e4e4ff102be1c30948c361268f57ea312978f9198fd128bfb54a3c1a07150e6af
-DIST libvirt-python-6.9.0.tar.gz 210366 BLAKE2B 384d8ce4d6c91f7185484e3ad35572a3245712c59f416d0f117ce7936d1e6234458c3454a8d773ee287de4d529eae7229e3dd67111df7955369cd36b028be1cc SHA512 d15a80de5418586f769101525464efc88154c9038f59c805030a60b4b711f11f15531f4e1fd01575e1646397342fefa38fca9371e8146157b61f607b3c286fe1
 DIST libvirt-python-7.0.0.tar.gz 214945 BLAKE2B 9ab616fa6336a284dbb1dcebf0be6a06d9ca0c41e83ca403cb335c61ff217e1e9f0343fc915e20e16f3e59adc5c7b1c51e493143c45cd50f48f627ebe2e9c211 SHA512 c56bc53da06a81d330389f684df204d0ae8edb28127eccd81ac551342a0965341d20832f6e2b044e02e9217320349f6f5cb36098c5cc46508a4026fb1e59c4ac
diff --git a/dev-python/libvirt-python/libvirt-python-6.10.0.ebuild b/dev-python/libvirt-python/libvirt-python-6.10.0.ebuild
deleted file mode 100644
index d2ab4718245f..000000000000
--- a/dev-python/libvirt-python/libvirt-python-6.10.0.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-
-DISTUTILS_USE_SETUPTOOLS=no
-
-MY_P="${P/_rc/-rc}"
-
-inherit distutils-r1
-
-if [[ ${PV} = *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://libvirt.org/git/libvirt-python.git"
-	RDEPEND="app-emulation/libvirt:=[-python(-)]"
-else
-	SRC_URI="https://libvirt.org/sources/python/${MY_P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-	RDEPEND="app-emulation/libvirt:0/${PV}"
-fi
-S="${WORKDIR}/${P%_rc*}"
-
-DESCRIPTION="libvirt Python bindings"
-HOMEPAGE="https://www.libvirt.org"
-LICENSE="LGPL-2"
-SLOT="0"
-IUSE="examples test"
-RESTRICT="!test? ( test )"
-
-DEPEND="virtual/pkgconfig"
-BDEPEND="test? (
-	dev-python/lxml[${PYTHON_USEDEP}]
-	dev-python/nose[${PYTHON_USEDEP}]
-)"
-
-distutils_enable_tests setup.py
-
-python_install_all() {
-	if use examples; then
-		dodoc -r examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/libvirt-python/libvirt-python-6.9.0.ebuild b/dev-python/libvirt-python/libvirt-python-6.9.0.ebuild
deleted file mode 100644
index d2ab4718245f..000000000000
--- a/dev-python/libvirt-python/libvirt-python-6.9.0.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-
-DISTUTILS_USE_SETUPTOOLS=no
-
-MY_P="${P/_rc/-rc}"
-
-inherit distutils-r1
-
-if [[ ${PV} = *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://libvirt.org/git/libvirt-python.git"
-	RDEPEND="app-emulation/libvirt:=[-python(-)]"
-else
-	SRC_URI="https://libvirt.org/sources/python/${MY_P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-	RDEPEND="app-emulation/libvirt:0/${PV}"
-fi
-S="${WORKDIR}/${P%_rc*}"
-
-DESCRIPTION="libvirt Python bindings"
-HOMEPAGE="https://www.libvirt.org"
-LICENSE="LGPL-2"
-SLOT="0"
-IUSE="examples test"
-RESTRICT="!test? ( test )"
-
-DEPEND="virtual/pkgconfig"
-BDEPEND="test? (
-	dev-python/lxml[${PYTHON_USEDEP}]
-	dev-python/nose[${PYTHON_USEDEP}]
-)"
-
-distutils_enable_tests setup.py
-
-python_install_all() {
-	if use examples; then
-		dodoc -r examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/lmdb/lmdb-1.1.1-r1.ebuild b/dev-python/lmdb/lmdb-1.1.1-r1.ebuild
new file mode 100644
index 000000000000..9fd6bd26013e
--- /dev/null
+++ b/dev-python/lmdb/lmdb-1.1.1-r1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Python bindings for the Lightning Database"
+HOMEPAGE="https://github.com/jnwatson/py-lmdb/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="OPENLDAP"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND=">=dev-db/lmdb-0.9.28:="
+DEPEND="${RDEPEND}"
+
+distutils_enable_sphinx docs
+distutils_enable_tests pytest
+
+python_compile() {
+	LMDB_FORCE_SYSTEM=1 distutils-r1_python_compile
+}
+
+python_test() {
+	pytest tests -vv || die "Tests fail with ${EPYTHON}"
+}
+
+python_install() {
+	# This is required when the CFFI extension is used (for PyPy3)
+	LMDB_FORCE_SYSTEM=1 distutils-r1_python_install
+}
diff --git a/dev-python/pikepdf/pikepdf-2.5.2.ebuild b/dev-python/pikepdf/pikepdf-2.5.2.ebuild
index 53520d56253c..4afa61d49856 100644
--- a/dev-python/pikepdf/pikepdf-2.5.2.ebuild
+++ b/dev-python/pikepdf/pikepdf-2.5.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MPL-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 
 DEPEND="app-text/qpdf:0="
 RDEPEND="${DEPEND}
diff --git a/dev-python/prompt_toolkit/Manifest b/dev-python/prompt_toolkit/Manifest
index b94964991175..1deb83a7fa27 100644
--- a/dev-python/prompt_toolkit/Manifest
+++ b/dev-python/prompt_toolkit/Manifest
@@ -4,5 +4,6 @@ DIST prompt_toolkit-3.0.11.tar.gz 3024453 BLAKE2B 3e4b278797b1d55c35566d35ea08b3
 DIST prompt_toolkit-3.0.13.tar.gz 3024804 BLAKE2B 9e2db8742bd2bf64a662dbf2bf859b475a2b55213bb90dbee334deecde19a26d325713b9515b53b6e4e946020a7bd8263a391bcad738a3742d02e38bda4f2188 SHA512 d71671d3608e9d7600c5c846d215da829919dfec5fe2bb69615b2e6aaab2226c5c7fbb444eb31019d208b1f590f7ac29b5705d422b164eed0cb61802b90beb12
 DIST prompt_toolkit-3.0.14.tar.gz 385647 BLAKE2B 08e4483846ba0e6cc69828840a0791e1b85a7db91718042e9a357741164183c0ccd241130c83b980b88884ba32bcb60714c7f920731aa6ca91186ed6f256bafe SHA512 7767861d9f6e5cf88b398420187e4b0a075aaa4645cd8c346db104101f89bbe7c0da2a6518c82066da5efa7376db5144451416ec7b12e92360972f8d4e25d018
 DIST prompt_toolkit-3.0.15.tar.gz 3027170 BLAKE2B c00c44310784ccb652f8130fb236605bb2fa7cec4c396ff842038e6e07667fb185cfb0b2b6df676c1a4472f35a14542252080429662c959712c2ec566bbfefa2 SHA512 a8e2078f01a5e4b5f50fbdd16a4aa98e34322460da64be416a127234736074ae851d2be62a19bc98064376f49afc24aef40e4d568c43e92a16d55e31e7551c71
+DIST prompt_toolkit-3.0.16.tar.gz 3033157 BLAKE2B 6f21544701f956a1e9ec29d049750dc47a6e3861e33a0ccc1e407185ece967c692d3f868e670779dadef3cdf5ec72bd6477e1b3ebfeddd84c267db94efa33f22 SHA512 fd8ebf4ceb61fb823a13bf81ebd6864e817541d08d0744eec8968afe9a9d44bfa95031fe7c53accc81a1612253041e742957aee3718dd18c437d8c3e1b616f35
 DIST prompt_toolkit-3.0.7.tar.gz 3018359 BLAKE2B c1d1f897a422df599d2bfbbfc53851489bf9f41a7ddb57fb1a03cae8411a7468bd047423922a5e95dcdcfb2730dee38029bdaa15eb7dc92ff47066b4b6edc6cb SHA512 3ee4cf65f175343273eb2c1b76250b35430ac3f3ee7cc61bfbcca86a717fdaaf74c723dba400d872b47b06883bed959b166df33b8960173beb466edf9266ff43
 DIST prompt_toolkit-3.0.9.tar.gz 3019859 BLAKE2B ebde3bd1ecf0f24b98e4f3e173c0a885c47af4a30bc19ce50bdc01636cd095cb7b09f9aacf37fd5f33f92ad2e5adec7f94cc85d5a48264c186a3a7460ef04b7d SHA512 8e9777215b73e1076f82e9733963151bbc4248581298b0f996cc1700db2aa28eaef3fb1a07470706e7569021f5e47ad9bc3a9a93c976fa36b6979552afc522b7
diff --git a/dev-python/prompt_toolkit/prompt_toolkit-3.0.16.ebuild b/dev-python/prompt_toolkit/prompt_toolkit-3.0.16.ebuild
new file mode 100644
index 000000000000..46cd3eff785d
--- /dev/null
+++ b/dev-python/prompt_toolkit/prompt_toolkit-3.0.16.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} )
+inherit distutils-r1
+
+DESCRIPTION="Building powerful interactive command lines in Python"
+HOMEPAGE="
+	https://pypi.org/project/prompt-toolkit/
+	https://github.com/prompt-toolkit/python-prompt-toolkit"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE=""
+
+RDEPEND="
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	dev-python/wcwidth[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/py/files/py-1.5.2-skip-apiwarn-pytest31.patch b/dev-python/py/files/py-1.5.2-skip-apiwarn-pytest31.patch
deleted file mode 100644
index 36727df9366b..000000000000
--- a/dev-python/py/files/py-1.5.2-skip-apiwarn-pytest31.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-https://github.com/pytest-dev/py/issues/162
-
---- a/testing/log/test_warning.py
-+++ b/testing/log/test_warning.py
-@@ -8,8 +8,7 @@ import py
- mypath = py.path.local(__file__).new(ext=".py")
- 
- 
--win = sys.platform.startswith('win')
--pytestmark = pytest.mark.skipif(win and LooseVersion(pytest.__version__) >= LooseVersion('3.1'),
-+pytestmark = pytest.mark.skipif(LooseVersion(pytest.__version__) >= LooseVersion('3.1'),
-                                 reason='apiwarn is not compatible with pytest >= 3.1 (#162)')
- 
- 
diff --git a/dev-python/py/files/py-1.8.0-pytest-4.patch b/dev-python/py/files/py-1.8.0-pytest-4.patch
deleted file mode 100644
index 7d4de73ba776..000000000000
--- a/dev-python/py/files/py-1.8.0-pytest-4.patch
+++ /dev/null
@@ -1,555 +0,0 @@
-From f4ed62ad39f289d09b3efdfed7305f935ce60bfc Mon Sep 17 00:00:00 2001
-From: Stanislav Levin <slev@altlinux.org>
-Date: Tue, 4 Jun 2019 14:33:36 +0300
-Subject: [PATCH] Fix Pytest4.x compatibility errors
-
-This patch should fix such errors/warnings as:
-
-- raises / warns with a string as the second argument
-Deprecated since version 4.1.
-
-- pytest_funcarg__ prefix
-Removed in version 4.0.
-
-- getfuncargvalue
-
-- Metafunc.addcall
-Removed in version 4.0.
-
-Fixes: https://github.com/pytest-dev/py/issues/209
-Signed-off-by: Stanislav Levin <slev@altlinux.org>
----
- doc/faq.txt                                  | 14 -------------
- testing/code/test_assertion.py               |  9 +++------
- testing/code/test_code.py                    |  3 ++-
- testing/code/test_excinfo.py                 | 12 ++++++-----
- testing/code/test_source.py                  | 18 ++++++++---------
- testing/io_/test_capture.py                  | 15 +++++++++-----
- testing/io_/test_terminalwriter.py           | 17 ++++++++--------
- testing/io_/test_terminalwriter_linewidth.py |  6 ++++++
- testing/log/test_log.py                      |  6 ++++--
- testing/path/common.py                       |  7 ++++---
- testing/path/conftest.py                     | 16 +++++++--------
- testing/path/test_cacheutil.py               |  6 ++++--
- testing/path/test_svnauth.py                 |  6 ++++--
- testing/path/test_svnurl.py                  | 21 +++++++++++++-------
- testing/path/test_svnwc.py                   | 17 ++++++++++------
- testing/root/test_builtin.py                 |  6 ++++--
- testing/root/test_std.py                     |  3 ++-
- 17 files changed, 100 insertions(+), 82 deletions(-)
-
-diff --git a/testing/code/test_assertion.py b/testing/code/test_assertion.py
-index e2a7f903..4cb39fe2 100644
---- a/testing/code/test_assertion.py
-+++ b/testing/code/test_assertion.py
-@@ -18,15 +18,12 @@ def test_assert():
- 
- 
- def test_assert_within_finally():
--    excinfo = py.test.raises(ZeroDivisionError, """
-+    with py.test.raises(ZeroDivisionError,
-+                        match=".*division.* by zero"):
-         try:
--            1/0
-+            1 / 0
-         finally:
-             i = 42
--    """)
--    s = excinfo.exconly()
--    assert re.search("ZeroDivisionError:.*division", s) is not None
--
- 
- def test_assert_multiline_1():
-     try:
-diff --git a/testing/code/test_code.py b/testing/code/test_code.py
-index 28ec628b..65328bb7 100644
---- a/testing/code/test_code.py
-+++ b/testing/code/test_code.py
-@@ -18,7 +18,8 @@ def test_code_gives_back_name_for_not_existing_file():
- def test_code_with_class():
-     class A:
-         pass
--    py.test.raises(TypeError, "py.code.Code(A)")
-+    with py.test.raises(TypeError):
-+        py.code.Code(A)
- 
- if True:
-     def x():
-diff --git a/testing/code/test_excinfo.py b/testing/code/test_excinfo.py
-index c148ab8c..05ec3d9c 100644
---- a/testing/code/test_excinfo.py
-+++ b/testing/code/test_excinfo.py
-@@ -145,7 +145,8 @@ def test_traceback_cut(self):
- 
-     def test_traceback_cut_excludepath(self, testdir):
-         p = testdir.makepyfile("def f(): raise ValueError")
--        excinfo = py.test.raises(ValueError, "p.pyimport().f()")
-+        with py.test.raises(ValueError) as excinfo:
-+            p.pyimport().f()
-         basedir = py.path.local(py.test.__file__).dirpath()
-         newtraceback = excinfo.traceback.cut(excludepath=basedir)
-         for x in newtraceback:
-@@ -273,8 +274,8 @@ def test_tbentry_reinterpret():
- def test_excinfo_exconly():
-     excinfo = py.test.raises(ValueError, h)
-     assert excinfo.exconly().startswith('ValueError')
--    excinfo = py.test.raises(ValueError,
--        "raise ValueError('hello\\nworld')")
-+    with py.test.raises(ValueError) as excinfo:
-+        raise ValueError('hello\\nworld')
-     msg = excinfo.exconly(tryshort=True)
-     assert msg.startswith('ValueError')
-     assert msg.endswith("world")
-@@ -350,10 +351,11 @@ def test_codepath_Queue_example():
- 
- 
- class TestFormattedExcinfo:
--    def pytest_funcarg__importasmod(self, request):
-+    @pytest.fixture
-+    def importasmod(self, request):
-         def importasmod(source):
-             source = py.code.Source(source)
--            tmpdir = request.getfuncargvalue("tmpdir")
-+            tmpdir = request.getfixturevalue("tmpdir")
-             modpath = tmpdir.join("mod.py")
-             tmpdir.ensure("__init__.py")
-             modpath.write(source)
-diff --git a/testing/code/test_source.py b/testing/code/test_source.py
-index 3492761a..676dcb0a 100644
---- a/testing/code/test_source.py
-+++ b/testing/code/test_source.py
-@@ -272,7 +272,8 @@ def test_compile_and_getsource(self):
-         co = self.source.compile()
-         py.builtin.exec_(co, globals())
-         f(7)
--        excinfo = py.test.raises(AssertionError, "f(6)")
-+        with py.test.raises(AssertionError) as excinfo:
-+            f(6)
-         frame = excinfo.traceback[-1].frame
-         stmt = frame.code.fullsource.getstatement(frame.lineno)
-         #print "block", str(block)
-@@ -326,14 +327,13 @@ def __init__(self, *args):
- 
- def test_getline_finally():
-     def c(): pass
--    excinfo = py.test.raises(TypeError, """
--           teardown = None
--           try:
--                c(1)
--           finally:
--                if teardown:
--                    teardown()
--    """)
-+    with py.test.raises(TypeError) as excinfo:
-+       teardown = None
-+       try:
-+            c(1)
-+       finally:
-+            if teardown:
-+                teardown()
-     source = excinfo.traceback[-1].statement
-     assert str(source).strip() == 'c(1)'
- 
-diff --git a/testing/io_/test_capture.py b/testing/io_/test_capture.py
-index b5fedd0a..652c8b7f 100644
---- a/testing/io_/test_capture.py
-+++ b/testing/io_/test_capture.py
-@@ -1,6 +1,7 @@
- from __future__ import with_statement
- 
- import os, sys
-+import pytest
- import py
- 
- needsdup = py.test.mark.skipif("not hasattr(os, 'dup')")
-@@ -45,7 +46,8 @@ def test_unicode_and_str_mixture(self):
-         f = py.io.TextIO()
-         if sys.version_info >= (3,0):
-             f.write("\u00f6")
--            py.test.raises(TypeError, "f.write(bytes('hello', 'UTF-8'))")
-+            with py.test.raises(TypeError):
-+                f.write(bytes('hello', 'UTF-8'))
-         else:
-             f.write(unicode("\u00f6", 'UTF-8'))
-             f.write("hello") # bytes
-@@ -56,7 +58,8 @@ def test_unicode_and_str_mixture(self):
- def test_bytes_io():
-     f = py.io.BytesIO()
-     f.write(tobytes("hello"))
--    py.test.raises(TypeError, "f.write(totext('hello'))")
-+    with py.test.raises(TypeError):
-+        f.write(totext('hello'))
-     s = f.getvalue()
-     assert s == tobytes("hello")
- 
-@@ -70,8 +73,9 @@ def test_dontreadfrominput():
-     py.test.raises(ValueError, f.fileno)
-     f.close() # just for completeness
- 
--def pytest_funcarg__tmpfile(request):
--    testdir = request.getfuncargvalue("testdir")
-+@pytest.fixture
-+def tmpfile(request):
-+    testdir = request.getfixturevalue("testdir")
-     f = testdir.makepyfile("").open('wb+')
-     request.addfinalizer(f.close)
-     return f
-@@ -315,7 +319,8 @@ def test_stdin_nulled_by_default(self):
-         print ("XXX which indicates an error in the underlying capturing")
-         print ("XXX mechanisms")
-         cap = self.getcapture()
--        py.test.raises(IOError, "sys.stdin.read()")
-+        with py.test.raises(IOError):
-+            sys.stdin.read()
-         out, err = cap.reset()
- 
-     def test_suspend_resume(self):
-diff --git a/testing/io_/test_terminalwriter.py b/testing/io_/test_terminalwriter.py
-index 1eef7f7d..2953dfff 100644
---- a/testing/io_/test_terminalwriter.py
-+++ b/testing/io_/test_terminalwriter.py
-@@ -107,14 +107,11 @@ def test_unicode_on_file_with_ascii_encoding(tmpdir, monkeypatch, encoding):
- 
- win32 = int(sys.platform == "win32")
- class TestTerminalWriter:
--    def pytest_generate_tests(self, metafunc):
--        if "tw" in metafunc.funcargnames:
--            metafunc.addcall(id="path", param="path")
--            metafunc.addcall(id="stringio", param="stringio")
--            metafunc.addcall(id="callable", param="callable")
--    def pytest_funcarg__tw(self, request):
-+
-+    @pytest.fixture(params=["path", "stringio", "callable"])
-+    def tw(self, request):
-         if request.param == "path":
--            tmpdir = request.getfuncargvalue("tmpdir")
-+            tmpdir = request.getfixturevalue("tmpdir")
-             p = tmpdir.join("tmpfile")
-             f = codecs.open(str(p), 'w+', encoding='utf8')
-             tw = py.io.TerminalWriter(f)
-@@ -182,8 +179,10 @@ def test_markup(self, tw):
-             for color in ("red", "green"):
-                 text2 = tw.markup("hello", **{color: True, 'bold': bold})
-                 assert text2.find("hello") != -1
--        py.test.raises(ValueError, "tw.markup('x', wronkw=3)")
--        py.test.raises(ValueError, "tw.markup('x', wronkw=0)")
-+        with py.test.raises(ValueError):
-+            tw.markup('x', wronkw=3)
-+        with py.test.raises(ValueError):
-+            tw.markup('x', wronkw=0)
- 
-     def test_line_write_markup(self, tw):
-         tw.hasmarkup = True
-diff --git a/testing/io_/test_terminalwriter_linewidth.py b/testing/io_/test_terminalwriter_linewidth.py
-index e6d84fbf..1fe2810e 100644
---- a/testing/io_/test_terminalwriter_linewidth.py
-+++ b/testing/io_/test_terminalwriter_linewidth.py
-@@ -1,6 +1,8 @@
- # coding: utf-8
- from __future__ import unicode_literals
- 
-+import pytest
-+
- from py._io.terminalwriter import TerminalWriter
- 
- 
-@@ -31,6 +33,10 @@ def test_terminal_writer_line_width_update_with_wide_text():
-     assert tw.width_of_current_line == 21  # 5*2 + 1 + 5*2
- 
- 
-+@pytest.mark.skipif(
-+    'sys.version_info > (3,)',
-+    reason='Bytes are not accepted'
-+           ' https://github.com/pytest-dev/pytest/issues/4861')
- def test_terminal_writer_line_width_update_with_wide_bytes():
-     tw = TerminalWriter()
-     tw.write('乇乂ㄒ尺卂 ㄒ卄丨匚匚'.encode('utf-8'))
-diff --git a/testing/log/test_log.py b/testing/log/test_log.py
-index 5c706d9b..ebf12705 100644
---- a/testing/log/test_log.py
-+++ b/testing/log/test_log.py
-@@ -89,8 +89,10 @@ def test_simple_consumer_match_2(self):
- 
-     def test_no_auto_producer(self):
-         p = py.log.Producer('x')
--        py.test.raises(AttributeError, "p._x")
--        py.test.raises(AttributeError, "p.x_y")
-+        with py.test.raises(AttributeError):
-+            p._x
-+        with py.test.raises(AttributeError):
-+            p.x_y
- 
-     def test_setconsumer_with_producer(self):
-         l = []
-diff --git a/testing/path/common.py b/testing/path/common.py
-index d69a1c39..14558222 100644
---- a/testing/path/common.py
-+++ b/testing/path/common.py
-@@ -155,8 +155,8 @@ def test_listdir(self, path1):
-         l = path1.listdir()
-         assert path1.join('sampledir') in l
-         assert path1.join('samplefile') in l
--        py.test.raises(py.error.ENOTDIR,
--                       "path1.join('samplefile').listdir()")
-+        with py.test.raises(py.error.ENOTDIR):
-+            path1.join('samplefile').listdir()
- 
-     def test_listdir_fnmatchstring(self, path1):
-         l = path1.listdir('s*dir')
-@@ -300,7 +300,8 @@ def test_mtime(self, path1):
-         assert url.mtime() > 0
- 
-     def test_relto_wrong_type(self, path1):
--        py.test.raises(TypeError, "path1.relto(42)")
-+        with py.test.raises(TypeError):
-+            path1.relto(42)
- 
-     def test_load(self, path1):
-         p = path1.join('samplepickle')
-diff --git a/testing/path/conftest.py b/testing/path/conftest.py
-index 84fb5c82..015bd039 100644
---- a/testing/path/conftest.py
-+++ b/testing/path/conftest.py
-@@ -1,20 +1,19 @@
- import py
- import sys
-+import pytest
- from py._path import svnwc as svncommon
- 
- svnbin = py.path.local.sysfind('svn')
- repodump = py.path.local(__file__).dirpath('repotest.dump')
- from py.builtin import print_
- 
--def pytest_funcarg__repowc1(request):
-+@pytest.fixture
-+def repowc1(request):
-     if svnbin is None:
-         py.test.skip("svn binary not found")
- 
--    tmpdir = request.getfuncargvalue("tmpdir")
--    repo, repourl, wc = request.cached_setup(
--        setup=lambda: getrepowc(tmpdir, "path1repo", "path1wc"),
--        scope="module",
--    )
-+    tmpdir = request.getfixturevalue("tmpdir")
-+    repo, repourl, wc = getrepowc(tmpdir, "path1repo", "path1wc")
-     for x in ('test_remove', 'test_move', 'test_status_deleted'):
-         if request.function.__name__.startswith(x):
-             #print >>sys.stderr, ("saving repo", repo, "for", request.function)
-@@ -22,8 +21,9 @@ def pytest_funcarg__repowc1(request):
-             request.addfinalizer(lambda: restore_repowc(_savedrepowc))
-     return repo, repourl, wc
- 
--def pytest_funcarg__repowc2(request):
--    tmpdir = request.getfuncargvalue("tmpdir")
-+@pytest.fixture
-+def repowc2(request):
-+    tmpdir = request.getfixturevalue("tmpdir")
-     name = request.function.__name__
-     repo, url, wc = getrepowc(tmpdir, "%s-repo-2" % name, "%s-wc-2" % name)
-     return repo, url, wc
-diff --git a/testing/path/test_cacheutil.py b/testing/path/test_cacheutil.py
-index c9fc0746..76023a04 100644
---- a/testing/path/test_cacheutil.py
-+++ b/testing/path/test_cacheutil.py
-@@ -12,12 +12,14 @@ def test_getorbuild(self):
-         assert val == 42
- 
-     def test_cache_get_key_error(self):
--        pytest.raises(KeyError, "self.cache._getentry(-23)")
-+        with pytest.raises(KeyError):
-+            self.cache._getentry(-23)
- 
-     def test_delentry_non_raising(self):
-         self.cache.getorbuild(100, lambda: 100)
-         self.cache.delentry(100)
--        pytest.raises(KeyError, "self.cache._getentry(100)")
-+        with pytest.raises(KeyError):
-+            self.cache._getentry(100)
- 
-     def test_delentry_raising(self):
-         self.cache.getorbuild(100, lambda: 100)
-diff --git a/testing/path/test_svnauth.py b/testing/path/test_svnauth.py
-index 654f0332..d24028dd 100644
---- a/testing/path/test_svnauth.py
-+++ b/testing/path/test_svnauth.py
-@@ -2,6 +2,7 @@
- from py.path import SvnAuth
- import time
- import sys
-+import pytest
- 
- svnbin = py.path.local.sysfind('svn')
- 
-@@ -261,7 +262,8 @@ def test_propget(self):
-         u.propget('foo')
-         assert '--username="foo" --password="bar"' in u.commands[0]
- 
--def pytest_funcarg__setup(request):
-+@pytest.fixture
-+def setup(request):
-     return Setup(request)
- 
- class Setup:
-@@ -271,7 +273,7 @@ def __init__(self, request):
-         if not request.config.option.runslowtests:
-             py.test.skip('use --runslowtests to run these tests')
- 
--        tmpdir = request.getfuncargvalue("tmpdir")
-+        tmpdir = request.getfixturevalue("tmpdir")
-         repodir = tmpdir.join("repo")
-         py.process.cmdexec('svnadmin create %s' % repodir)
-         if sys.platform == 'win32':
-diff --git a/testing/path/test_svnurl.py b/testing/path/test_svnurl.py
-index 15fbea50..7cea4f2b 100644
---- a/testing/path/test_svnurl.py
-+++ b/testing/path/test_svnurl.py
-@@ -2,10 +2,12 @@
- from py._path.svnurl import InfoSvnCommand
- import datetime
- import time
-+import pytest
- from svntestbase import CommonSvnTests
- 
--def pytest_funcarg__path1(request):
--    repo, repourl, wc = request.getfuncargvalue("repowc1")
-+@pytest.fixture
-+def path1(request):
-+    repo, repourl, wc = request.getfixturevalue("repowc1")
-     return py.path.svnurl(repourl)
- 
- class TestSvnURLCommandPath(CommonSvnTests):
-@@ -20,10 +22,12 @@ def test_visit_ignore(self, path1):
-         super(TestSvnURLCommandPath, self).test_visit_ignore(path1)
- 
-     def test_svnurl_needs_arg(self, path1):
--        py.test.raises(TypeError, "py.path.svnurl()")
-+        with py.test.raises(TypeError):
-+            py.path.svnurl()
- 
-     def test_svnurl_does_not_accept_None_either(self, path1):
--        py.test.raises(Exception, "py.path.svnurl(None)")
-+        with py.test.raises(Exception):
-+            py.path.svnurl(None)
- 
-     def test_svnurl_characters_simple(self, path1):
-         py.path.svnurl("svn+ssh://hello/world")
-@@ -32,7 +36,8 @@ def test_svnurl_characters_at_user(self, path1):
-         py.path.svnurl("http://user@host.com/some/dir")
- 
-     def test_svnurl_characters_at_path(self, path1):
--        py.test.raises(ValueError, 'py.path.svnurl("http://host.com/foo@bar")')
-+        with py.test.raises(ValueError):
-+            py.path.svnurl("http://host.com/foo@bar")
- 
-     def test_svnurl_characters_colon_port(self, path1):
-         py.path.svnurl("http://host.com:8080/some/dir")
-@@ -45,7 +50,8 @@ def test_svnurl_characters_colon_path(self, path1):
-         # colons are allowed on win32, because they're part of the drive
-         # part of an absolute path... however, they shouldn't be allowed in
-         # other parts, I think
--        py.test.raises(ValueError, 'py.path.svnurl("http://host.com/foo:bar")')
-+        with py.test.raises(ValueError):
-+            py.path.svnurl("http://host.com/foo:bar")
- 
-     def test_export(self, path1, tmpdir):
-         tmpdir = tmpdir.join("empty")
-@@ -92,4 +98,5 @@ def test_svn_1_3_b(self):
-         assert info.kind == 'dir'
- 
- def test_badchars():
--    py.test.raises(ValueError, "py.path.svnurl('http://host/tmp/@@@:')")
-+    with py.test.raises(ValueError):
-+        py.path.svnurl('http://host/tmp/@@@:')
-diff --git a/testing/path/test_svnwc.py b/testing/path/test_svnwc.py
-index c643d998..25a3650c 100644
---- a/testing/path/test_svnwc.py
-+++ b/testing/path/test_svnwc.py
-@@ -30,8 +30,9 @@ def test_make_repo(path1, tmpdir):
-     rev = wc.commit()
-     assert rev is None
- 
--def pytest_funcarg__path1(request):
--    repo, repourl, wc = request.getfuncargvalue("repowc1")
-+@pytest.fixture
-+def path1(request):
-+    repo, repourl, wc = request.getfixturevalue("repowc1")
-     return wc
- 
- class TestWCSvnCommandPath(CommonSvnTests):
-@@ -346,7 +347,8 @@ def test_lock_unlock(self, path1):
-         somefile = root.join('somefile')
-         somefile.ensure(file=True)
-         # not yet added to repo
--        py.test.raises(Exception, 'somefile.lock()')
-+        with py.test.raises(Exception):
-+            somefile.lock()
-         somefile.write('foo')
-         somefile.commit('test')
-         assert somefile.check(versioned=True)
-@@ -357,13 +359,15 @@ def test_lock_unlock(self, path1):
-             assert locked[0].basename == somefile.basename
-             assert locked[0].dirpath().basename == somefile.dirpath().basename
-             #assert somefile.locked()
--            py.test.raises(Exception, 'somefile.lock()')
-+            with py.test.raises(Exception):
-+                somefile.lock()
-         finally:
-             somefile.unlock()
-         #assert not somefile.locked()
-         locked = root.status().locked
-         assert locked == []
--        py.test.raises(Exception, 'somefile,unlock()')
-+        with py.test.raises(Exception):
-+            somefile,unlock()
-         somefile.remove()
- 
-     def test_commit_nonrecursive(self, path1):
-@@ -481,7 +485,8 @@ def test_svn_1_3(self, path1):
- 
- 
- def test_characters_at():
--    py.test.raises(ValueError, "py.path.svnwc('/tmp/@@@:')")
-+    with py.test.raises(ValueError):
-+        py.path.svnwc('/tmp/@@@:')
- 
- def test_characters_tilde():
-     py.path.svnwc('/tmp/test~')
-diff --git a/testing/root/test_builtin.py b/testing/root/test_builtin.py
-index 287c60d5..b2881de4 100644
---- a/testing/root/test_builtin.py
-+++ b/testing/root/test_builtin.py
-@@ -56,7 +56,8 @@ def test_frozenset():
- 
- def test_print_simple():
-     from py.builtin import print_
--    py.test.raises(TypeError, "print_(hello=3)")
-+    with py.test.raises(TypeError):
-+        print_(hello=3)
-     f = py.io.TextIO()
-     print_("hello", "world", file=f)
-     s = f.getvalue()
-@@ -133,7 +134,8 @@ def test_reraise():
-         raise Exception()
-     except Exception:
-         cls, val, tb = sys.exc_info()
--    excinfo = py.test.raises(Exception, "_reraise(cls, val, tb)")
-+    with py.test.raises(Exception):
-+        _reraise(cls, val, tb)
- 
- def test_exec():
-     l = []
-diff --git a/testing/root/test_std.py b/testing/root/test_std.py
-index 143556a0..dca0c671 100644
---- a/testing/root/test_std.py
-+++ b/testing/root/test_std.py
-@@ -6,7 +6,8 @@ def test_os():
-     assert py.std.os is os
- 
- def test_import_error_converts_to_attributeerror():
--    py.test.raises(AttributeError, "py.std.xyzalskdj")
-+    with py.test.raises(AttributeError):
-+        py.std.xyzalskdj
- 
- def test_std_gets_it():
-     for x in py.std.sys.modules:
diff --git a/dev-python/py/files/py-1.9.0-cve-2020-29651.patch b/dev-python/py/files/py-1.9.0-cve-2020-29651.patch
deleted file mode 100644
index af89fb14808c..000000000000
--- a/dev-python/py/files/py-1.9.0-cve-2020-29651.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 4a9017dc6199d2a564b6e4b0aa39d6d8870e4144 Mon Sep 17 00:00:00 2001
-From: Ran Benita <ran@unusedvar.com>
-Date: Fri, 4 Sep 2020 13:57:26 +0300
-Subject: [PATCH] svnwc: fix regular expression vulnerable to DoS in blame
- functionality
-
-The subpattern `\d+\s*\S+` is ambiguous which makes the pattern subject
-to catastrophic backtracing given a string like `"1" * 5000`.
-
-SVN blame output seems to always have at least one space between the
-revision number and the user name, so the ambiguity can be fixed by
-changing the `*` to `+`.
-
-Fixes #256.
----
- py/_path/svnwc.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/py/_path/svnwc.py b/py/_path/svnwc.py
-index 3138dd85..b5b9d8d5 100644
---- a/py/_path/svnwc.py
-+++ b/py/_path/svnwc.py
-@@ -396,7 +396,7 @@ def makecmdoptions(self):
-     def __str__(self):
-         return "<SvnAuth username=%s ...>" %(self.username,)
- 
--rex_blame = re.compile(r'\s*(\d+)\s*(\S+) (.*)')
-+rex_blame = re.compile(r'\s*(\d+)\s+(\S+) (.*)')
- 
- class SvnWCCommandPath(common.PathBase):
-     """ path implementation offering access/modification to svn working copies.
diff --git a/dev-python/pyFFTW/Manifest b/dev-python/pyFFTW/Manifest
index 318b8f68c3d8..94156daae57f 100644
--- a/dev-python/pyFFTW/Manifest
+++ b/dev-python/pyFFTW/Manifest
@@ -1,2 +1 @@
-DIST pyFFTW-0.11.1.tar.gz 144045 BLAKE2B dcf37653e8d5259d8d74282699eb8d9820694f21e092528105e07a8c7e05fe213d908590560e83a5a4ad993716fcf343ef0780126bbd689ee4ff584a01ee6453 SHA512 88769fd65b1a9ba3228a920226ac82f9b4e0a9023b6b73fffc0dc52a8983197e4406c376e89d00888526cfe3a9abb3e15a576daa51ba5bea8e8302514176763a
 DIST pyFFTW-0.12.0.tar.gz 147372 BLAKE2B 1ea1f1f8de6759c42781a535b30d7119c0cb02dffea3abfe4130a97c465e000aa9b3064a219718569552304513a77ac51aa309f1be29f9eecae25c63cce70c6c SHA512 e4d7258d5c053b5367d8c4f1892eba8e595f9d540c1c3e6caf61e0c113d598ba872b5e72a21edace66be70d9ad75c599e4b1fbc692e0015c3c1ae35e9a7ba599
diff --git a/dev-python/pyFFTW/pyFFTW-0.11.1.ebuild b/dev-python/pyFFTW/pyFFTW-0.11.1.ebuild
deleted file mode 100644
index d343d8d902ef..000000000000
--- a/dev-python/pyFFTW/pyFFTW-0.11.1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-inherit distutils-r1
-
-DESCRIPTION="A pythonic python wrapper around FFTW"
-HOMEPAGE="https://github.com/pyFFTW/pyFFTW"
-
-LICENSE="BSD"
-SLOT="0"
-if [ "${PV}" = "9999" ]; then
-	KEYWORDS=""
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/pyFFTW/pyFFTW.git"
-else
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/pyFFTW/pyFFTW/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-fi
-
-IUSE=""
-
-DEPEND="dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/cython[${PYTHON_USEDEP}]
-		>=sci-libs/fftw-3.3:3.0="
-RDEPEND="${DEPEND}"
diff --git a/dev-python/python-xmp-toolkit/python-xmp-toolkit-2.0.1-r1.ebuild b/dev-python/python-xmp-toolkit/python-xmp-toolkit-2.0.1-r1.ebuild
index e0e4ee79d8ff..2cd21c866dd8 100644
--- a/dev-python/python-xmp-toolkit/python-xmp-toolkit-2.0.1-r1.ebuild
+++ b/dev-python/python-xmp-toolkit/python-xmp-toolkit-2.0.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2020 Gentoo Authors
+# Copyright 2020-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://github.com/python-xmp-toolkit/${PN}.git"
 else
 	SRC_URI="https://github.com/python-xmp-toolkit/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 ~x86"
 fi
 
 DESCRIPTION="Library for working with XMP metadata"
diff --git a/dev-python/tikzplotlib/tikzplotlib-0.9.7.ebuild b/dev-python/tikzplotlib/tikzplotlib-0.9.7.ebuild
index f0f5782e21c1..1c9c50e34e33 100644
--- a/dev-python/tikzplotlib/tikzplotlib-0.9.7.ebuild
+++ b/dev-python/tikzplotlib/tikzplotlib-0.9.7.ebuild
@@ -3,6 +3,7 @@
 
 EAPI=7
 
+DISTUTILS_USE_SETUPTOOLS=pyproject.toml
 PYTHON_COMPAT=( python3_{6,7,8,9,10} )
 
 inherit distutils-r1 virtualx
@@ -35,21 +36,6 @@ BDEPEND="
 distutils_enable_tests pytest
 distutils_enable_sphinx doc dev-python/mock
 
-python_prepare_all() {
-	# setup.py was removed in commit f04323cfa575caf8a25a9236f55fe6baf1a33b20
-	# for some reason, DISTUTULS_USE_SETUPTOOLS="pyproject.toml" is not working
-	# it complains about file not found, setup.cfg does exist
-
-	cat > setup.py <<EOF || die
-from setuptools import setup
-
-if __name__ == "__main__":
-	setup()
-EOF
-
-	distutils-r1_python_prepare_all
-}
-
 python_test() {
 	local -x MPLBACKEND=Agg
 	virtx pytest -vv