Adding metadata

34 files changed, 270 insertions, 168 deletions

diff --git a/dev-python/ansible-runner/ansible-runner-1.4.7-r1.ebuild b/dev-python/ansible-runner/ansible-runner-1.4.7-r1.ebuild
index 819e958778b6..87bbe7c148c3 100644
--- a/dev-python/ansible-runner/ansible-runner-1.4.7-r1.ebuild
+++ b/dev-python/ansible-runner/ansible-runner-1.4.7-r1.ebuild
@@ -4,18 +4,16 @@
 EAPI=7
 
 PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-DISTUTILS_USE_SETUPTOOLS=bdepend
-
 inherit distutils-r1
 
 DESCRIPTION="A tool and python library that helps when interfacing with Ansible"
 HOMEPAGE="https://github.com/ansible/ansible-runner"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-KEYWORDS="~amd64"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-IUSE="test"
+KEYWORDS="~amd64"
+
 RDEPEND="
 	dev-python/pexpect[${PYTHON_USEDEP}]
 	dev-python/psutil[${PYTHON_USEDEP}]
@@ -23,8 +21,8 @@ RDEPEND="
 	dev-python/pyyaml[${PYTHON_USEDEP}]
 	dev-python/six[${PYTHON_USEDEP}]
 "
-DEPEND="${RDEPEND}"
 BDEPEND="test? ( dev-python/mock[${PYTHON_USEDEP}] )"
+
 distutils_enable_tests pytest
 
 python_prepare_all() {
diff --git a/dev-python/arrow/arrow-1.1.1.ebuild b/dev-python/arrow/arrow-1.1.1.ebuild
index bb81a3e3b64a..ba068ceea14d 100644
--- a/dev-python/arrow/arrow-1.1.1.ebuild
+++ b/dev-python/arrow/arrow-1.1.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	>=dev-python/python-dateutil-2.7.0[${PYTHON_USEDEP}]
diff --git a/dev-python/async_timeout/async_timeout-4.0.0.ebuild b/dev-python/async_timeout/async_timeout-4.0.0.ebuild
index 9226fbf1c728..12b9bf327ec0 100644
--- a/dev-python/async_timeout/async_timeout-4.0.0.ebuild
+++ b/dev-python/async_timeout/async_timeout-4.0.0.ebuild
@@ -18,6 +18,7 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~
 
 BDEPEND="
 	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	dev-python/typing-extensions[${PYTHON_USEDEP}]
 	test? (
 		dev-python/pytest-aiohttp[${PYTHON_USEDEP}]
 		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
diff --git a/dev-python/cairocffi/Manifest b/dev-python/cairocffi/Manifest
index 107da076235d..b9dae2d62c3c 100644
--- a/dev-python/cairocffi/Manifest
+++ b/dev-python/cairocffi/Manifest
@@ -1,2 +1 @@
-DIST cairocffi-1.2.0.tar.gz 70393 BLAKE2B b5cc69ec2805524e8f66a6234c4e19502181fad18c754379d91b05c2d2a88c82742f2b2057afcaac93f4d23ee64b41b2e84f029b6cb4ce2e7b3fa81ae0e8a485 SHA512 0f5b58ae85b2cc880bfb8ede6cbfe4905737211dab5b080815eb59f7cdd9c580367b9e00e7216d68ea9cbb84bda3f21ddcbccb2e744b86d6da8b991cffb96caf
 DIST cairocffi-1.3.0.tar.gz 88784 BLAKE2B 022634825febd3d70a0115f0632e9b146719a2ab802583e0f57ebbd36c65c9e73f4547dbc5ea3651b8b38a043d519f000e908c34b77f3bf49e2ed5ded1a0ca02 SHA512 be459a5f4c1986cf339b7b15fdb7d3ac52476c8c31ff663b4708917ce8abd6fc66860d1966744b69aebf7aebca4415b32166df79505ad42f315ffd76d7163d7e
diff --git a/dev-python/cairocffi/cairocffi-1.2.0.ebuild b/dev-python/cairocffi/cairocffi-1.2.0.ebuild
deleted file mode 100644
index c0288a3a43ee..000000000000
--- a/dev-python/cairocffi/cairocffi-1.2.0.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-
-inherit distutils-r1 virtualx
-
-DESCRIPTION="CFFI-based drop-in replacement for Pycairo"
-HOMEPAGE="https://github.com/Kozea/cairocffi"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	$(python_gen_cond_dep '
-		>=dev-python/cffi-1.1.0:=[${PYTHON_USEDEP}]
-	' 'python*')
-	>=dev-python/xcffib-0.3.2[${PYTHON_USEDEP}]
-	x11-libs/cairo:0=[X,xcb(+)]
-	x11-libs/gdk-pixbuf[jpeg]"
-BDEPEND="
-	test? ( dev-python/numpy[${PYTHON_USEDEP}] )"
-
-distutils_enable_tests pytest
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.8.0-tests.patch
-)
-
-src_prepare() {
-	sed -i -e '/pytest-/d' -e '/addopts/d' setup.cfg || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	virtx pytest -vv --pyargs cairocffi
-}
diff --git a/dev-python/cairocffi/cairocffi-1.3.0.ebuild b/dev-python/cairocffi/cairocffi-1.3.0.ebuild
index 0b4451835152..c29a87539766 100644
--- a/dev-python/cairocffi/cairocffi-1.3.0.ebuild
+++ b/dev-python/cairocffi/cairocffi-1.3.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	$(python_gen_cond_dep '
diff --git a/dev-python/cfn-lint/Manifest b/dev-python/cfn-lint/Manifest
index 2ef7cc40e552..9b2e7485c9f3 100644
--- a/dev-python/cfn-lint/Manifest
+++ b/dev-python/cfn-lint/Manifest
@@ -1,2 +1,3 @@
 DIST cfn-lint-0.54.3.tar.gz 7806470 BLAKE2B b61cb4b46e7c9d04aa70d2542e2aee0d029cc265ca3b85d9bd1c9ddcf2d22a56b28d74f27d6ccf5348cef7224e1ca9d1efec3e5a7b478e8bb87afcb0d39b3da8 SHA512 40e593f0bf092dafca7d7a801deaf2e09c37f4421d58b9244a2da533c3079da076dab70cb974868fd3eb9300ef69897414b03854f8e8fee139e1f5b4781795fc
 DIST cfn-lint-0.54.4.tar.gz 7835716 BLAKE2B 1709adda09a08b02f4a2637af1ed2a43c096d8f9eef91b3cfbac55365e0910be64c632e28e403356742396b72a4af6c88740b27d13a67b62b5f5af98c8639e43 SHA512 f31b8fc407adf75b1eb54a29719b39298494efcdba65e68610e28ca1d066dfdb3fa051e8a90fe589793683c01e49d1bab30832255153e8932bd9caca96b54441
+DIST cfn-lint-0.56.0.tar.gz 8069291 BLAKE2B 6a6b0481f857e3360d2abeb372415a43ae59ed54f2c1ef08ea079f32442bea9f30a7222233cfadd398922994bc70aa78e92b8807d7386ca4b979548622d3e5f4 SHA512 f12ca4ba831c32d7c9c8079ed9d59baf6346a2c4a09cf2af0a8b258dc551b381983cb346800b37e6df3022fbb6f09ee186b44bb9ba3e0a2713c8faabce83f67b
diff --git a/dev-python/cfn-lint/cfn-lint-0.56.0.ebuild b/dev-python/cfn-lint/cfn-lint-0.56.0.ebuild
new file mode 100644
index 000000000000..e2947ee58992
--- /dev/null
+++ b/dev-python/cfn-lint/cfn-lint-0.56.0.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+inherit distutils-r1
+
+DESCRIPTION="CloudFormation Linter"
+HOMEPAGE="https://pypi.org/project/cfn-lint/ https://github.com/aws-cloudformation/cfn-lint/"
+SRC_URI="
+	https://github.com/aws-cloudformation/cfn-lint/archive/v${PV}.tar.gz
+		-> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	>=dev-python/aws-sam-translator-1.40.0[${PYTHON_USEDEP}]
+	dev-python/jsonpatch[${PYTHON_USEDEP}]
+	>=dev-python/jschema_to_python-1.2.3[${PYTHON_USEDEP}]
+	>=dev-python/jsonschema-3.0[${PYTHON_USEDEP}]
+	dev-python/junit-xml[${PYTHON_USEDEP}]
+	dev-python/networkx[${PYTHON_USEDEP}]
+	>=dev-python/pyyaml-5.4[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.15.0[${PYTHON_USEDEP}]
+	>=dev-python/sarif_om-1.0.4[${PYTHON_USEDEP}]
+	>=dev-python/six-1.11[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests --install pytest
+
+EPYTEST_DESELECT=(
+	# TODO
+	test/unit/module/test_template.py::TestTemplate::test_build_graph
+	# requires git repo
+	test/unit/module/maintenance/test_update_documentation.py::TestUpdateDocumentation::test_update_docs
+	# Internet
+	test/unit/module/formatters/test_formatters.py::TestFormatters::test_sarif_formatter
+	test/unit/module/maintenance/test_update_resource_specs.py::TestUpdateResourceSpecs::test_update_resource_specs_python_2
+	test/unit/module/maintenance/test_update_resource_specs.py::TestUpdateResourceSpecs::test_update_resource_specs_python_3
+)
+
+src_prepare() {
+	# unpin the deps
+	sed -e 's:~=[0-9.]*::' -i setup.py || die
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/coverage/coverage-6.0.2.ebuild b/dev-python/coverage/coverage-6.0.2.ebuild
index d0e2e906076b..e70b99823eff 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/fqdn/fqdn-1.5.1.ebuild b/dev-python/fqdn/fqdn-1.5.1.ebuild
index cd6506c2f3f2..1daea71195b5 100644
--- a/dev-python/fqdn/fqdn-1.5.1.ebuild
+++ b/dev-python/fqdn/fqdn-1.5.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/ypcrts/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MPL-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="amd64 arm arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	$(python_gen_cond_dep '
diff --git a/dev-python/isoduration/isoduration-20.11.0.ebuild b/dev-python/isoduration/isoduration-20.11.0.ebuild
index b50c6c367462..c2606f48bd88 100644
--- a/dev-python/isoduration/isoduration-20.11.0.ebuild
+++ b/dev-python/isoduration/isoduration-20.11.0.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="amd64 arm arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND=">=dev-python/arrow-0.15.0[${PYTHON_USEDEP}]"
 BDEPEND="
diff --git a/dev-python/jschema_to_python/Manifest b/dev-python/jschema_to_python/Manifest
new file mode 100644
index 000000000000..da7796f56a79
--- /dev/null
+++ b/dev-python/jschema_to_python/Manifest
@@ -0,0 +1 @@
+DIST jschema_to_python-1.2.3.tar.gz 10061 BLAKE2B e6d16ce5950cf787bc2073c5470c304f8d10bf97fdcc53f4ec2dd00f7cc5d6ec1308ef0813ef3eaf5b98a5cd018b43f3ca30abba441c5b1cb9a02783aa596f22 SHA512 e7e37612573e2f5cf96df6fe7206ecf31c83993e40877b0587df2a42ef2f2ae192e4f8442d40cdfb728c27fca880ae5bb427935fa7b0bbd9fadbb9a643c3c1f0
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
new file mode 100644
index 000000000000..234bf8681163
--- /dev/null
+++ b/dev-python/jschema_to_python/jschema_to_python-1.2.3.ebuild
@@ -0,0 +1,26 @@
+# Copyright 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="Generate source code for Python classes from a JSON schema"
+HOMEPAGE="
+	https://pypi.org/project/jschema-to-python/
+	https://github.com/microsoft/jschema-to-python/"
+SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	dev-python/attrs[${PYTHON_USEDEP}]
+	dev-python/jsonpickle[${PYTHON_USEDEP}]
+	dev-python/pbr[${PYTHON_USEDEP}]"
+BDEPEND="
+	dev-python/pbr[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
diff --git a/dev-python/jschema_to_python/metadata.xml b/dev-python/jschema_to_python/metadata.xml
new file mode 100644
index 000000000000..d05a4b0137af
--- /dev/null
+++ b/dev-python/jschema_to_python/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">jschema-to-python</remote-id>
+ </upstream>
+ <origin>gentoo-staging</origin>
+ <stabilize-allarches/>
+</pkgmetadata>
\ No newline at end of file
diff --git a/dev-python/jsonschema/jsonschema-4.1.2.ebuild b/dev-python/jsonschema/jsonschema-4.1.2.ebuild
index b5410fc8be64..4126963aa70e 100644
--- a/dev-python/jsonschema/jsonschema-4.1.2.ebuild
+++ b/dev-python/jsonschema/jsonschema-4.1.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="amd64 arm arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	dev-python/attrs[${PYTHON_USEDEP}]
diff --git a/dev-python/multidict/multidict-5.2.0.ebuild b/dev-python/multidict/multidict-5.2.0.ebuild
index a9d61ce4b730..dd04cff5d533 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/proto-plus/Manifest b/dev-python/proto-plus/Manifest
index a51ca87dab6c..15c0caf13613 100644
--- a/dev-python/proto-plus/Manifest
+++ b/dev-python/proto-plus/Manifest
@@ -1 +1,2 @@
 DIST proto-plus-1.19.2.gh.tar.gz 61183 BLAKE2B 8c1c0a70ae573fc8c64004e4bd923f403bf82dbb3f9aef19239770fcd316e513ba11e6e47c56bda65c88e476072f0d90af02c83eb0fe8a4045cf3ceeccca3fc7 SHA512 c3cfb1b6aabeb4eab7f6c2c16551c1f9fbf29dc3199b496bc4b47b4b80cbe4684e5c97abe26fa4c1afd03c844a2e8f006f16c24932d2a7cf8190452943c2fad0
+DIST proto-plus-1.19.7.gh.tar.gz 64614 BLAKE2B 918bb04a084cff8a2188a68c31f08aebd25443fd399d69ba9734d002f773df2769904e4aa551cd1d93586ee4710f2b7160e6a8eb4160fe1bb846be18155a7b29 SHA512 118187a852a998deba3b5d7e700cd084eab966b549c7dba6150f318e9602f950a9533e27d775f9f0bca2fedaed6375b592bae42c55cf5aee8b52708fcc4691c8
diff --git a/dev-python/proto-plus/proto-plus-1.19.7.ebuild b/dev-python/proto-plus/proto-plus-1.19.7.ebuild
new file mode 100644
index 000000000000..3d929fce3337
--- /dev/null
+++ b/dev-python/proto-plus/proto-plus-1.19.7.ebuild
@@ -0,0 +1,34 @@
+# Copyright 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="Beautiful, Pythonic protocol buffers"
+HOMEPAGE="https://pypi.org/project/proto-plus/ https://github.com/googleapis/proto-plus-python"
+SRC_URI="
+	https://github.com/googleapis/proto-plus-python/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+S="${WORKDIR}/${PN}-python-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-python/protobuf-python[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/google-api-core[${PYTHON_USEDEP}]
+		dev-python/grpcio[${PYTHON_USEDEP}]
+		dev-python/pytz[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+distutils_enable_sphinx docs \
+	dev-python/sphinx_rtd_theme
diff --git a/dev-python/pybind11/Manifest b/dev-python/pybind11/Manifest
index f92ed463cb7e..0e1154459ca6 100644
--- a/dev-python/pybind11/Manifest
+++ b/dev-python/pybind11/Manifest
@@ -1,3 +1 @@
-DIST pybind11-2.7.1.tar.gz 668217 BLAKE2B 92d857f14290ee0717bd9f9b871dcecd6c0b36209bb9879f107c8542326fb0cc42c051f3bc12a8be50df892f1e26c26b710f60ed275f0dff206e30149547f2b4 SHA512 f09f46622b394d3990ab82aa7ea15a06e298df109cd2df263ba9d6ac7fb248217df7450e1954a9679a8360335d5bbf662926a34c8b7c61b6e4c396bbdfd88305
-DIST pybind11-2.8.0.tar.gz 688544 BLAKE2B 3652ebf56cdec9c50a431915b4b59cd7c61d58be5a521dd2bea20ea9a0e56ae8782400d4460a5e32f3c3ec086709ee466b6b39c6adc5cd712da05b4016f9f2e1 SHA512 2f066ab1a3d4a22513625f52b55d7722f953007876e800b4a08d6341b9ae70f73a3b0fd57f76cee443e7b8cf0eecdaafc032a23ddad2b8bca2c8108ac4090a82
 DIST pybind11-2.8.1.tar.gz 693075 BLAKE2B 00f691121858bbe019b5398ab5418523b352f29716901ec6572817e3a35efeb953a9a1542ad37830aab6b9e5a6d6dd56c7aee390772f1d992ef570e03472ebd8 SHA512 6738b4551a1ca2fdf6676be78216b9056cecf8b4d125f0d1aaae9929614bcbf4a9b233fc3c52b8f9dfd19a9ca1496515e6748c1afd8968b9c52c9a1e8b28da10
diff --git a/dev-python/pybind11/pybind11-2.7.1.ebuild b/dev-python/pybind11/pybind11-2.7.1.ebuild
deleted file mode 100644
index 53a2b20a4e60..000000000000
--- a/dev-python/pybind11/pybind11-2.7.1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-inherit cmake distutils-r1
-
-DESCRIPTION="AST-based Python refactoring library"
-HOMEPAGE="https://pybind11.readthedocs.io/en/stable/"
-SRC_URI="https://github.com/pybind/pybind11/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-
-RDEPEND="
-	dev-cpp/eigen:3
-"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	export PYBIND11_USE_CMAKE=1
-
-	cmake_src_prepare
-	distutils-r1_python_prepare_all
-}
-
-python_configure() {
-	local mycmakeargs=(
-		# disable forced lto
-		-DPYBIND11_LTO_CXX_FLAGS=
-		-DPYBIND11_INSTALL=ON
-		-DPYBIND11_TEST=$(usex test)
-	)
-	cmake_src_configure
-}
-
-python_compile() {
-	distutils-r1_python_compile
-	# Compilation only does anything for tests
-	use test && cmake_src_compile
-}
-
-python_test() {
-	cmake_build check
-}
-
-python_install() {
-	distutils-r1_python_install
-	cmake_src_install
-}
diff --git a/dev-python/pybind11/pybind11-2.8.0.ebuild b/dev-python/pybind11/pybind11-2.8.0.ebuild
deleted file mode 100644
index 1cec8da48b40..000000000000
--- a/dev-python/pybind11/pybind11-2.8.0.ebuild
+++ /dev/null
@@ -1,53 +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 cmake distutils-r1
-
-DESCRIPTION="AST-based Python refactoring library"
-HOMEPAGE="https://pybind11.readthedocs.io/en/stable/"
-SRC_URI="https://github.com/pybind/pybind11/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
-
-RDEPEND="
-	dev-cpp/eigen:3
-"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	export PYBIND11_USE_CMAKE=1
-
-	cmake_src_prepare
-	distutils-r1_python_prepare_all
-}
-
-python_configure() {
-	local mycmakeargs=(
-		# disable forced lto
-		-DPYBIND11_LTO_CXX_FLAGS=
-		-DPYBIND11_INSTALL=ON
-		-DPYBIND11_TEST=$(usex test)
-	)
-	cmake_src_configure
-}
-
-python_compile() {
-	distutils-r1_python_compile
-	# Compilation only does anything for tests
-	use test && cmake_src_compile
-}
-
-python_test() {
-	cmake_build check
-}
-
-python_install() {
-	distutils-r1_python_install
-	cmake_src_install
-}
diff --git a/dev-python/pybind11/pybind11-2.8.1.ebuild b/dev-python/pybind11/pybind11-2.8.1.ebuild
index dee6a98f3912..fce8aa678eb2 100644
--- a/dev-python/pybind11/pybind11-2.8.1.ebuild
+++ b/dev-python/pybind11/pybind11-2.8.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/pybind/pybind11/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ia64 ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="amd64 arm arm64 ~ia64 ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 
 RDEPEND="
 	dev-cpp/eigen:3
diff --git a/dev-python/python-daemon/files/python-daemon-2.3.0-fix-py3.10.patch b/dev-python/python-daemon/files/python-daemon-2.3.0-fix-py3.10.patch
new file mode 100644
index 000000000000..4fd082dc8f77
--- /dev/null
+++ b/dev-python/python-daemon/files/python-daemon-2.3.0-fix-py3.10.patch
@@ -0,0 +1,28 @@
+https://pagure.io/python-daemon/c/0c67a3c6407fbf4483ccfc94a7a0d78cf3379296
+
+From: Miro Hrončok <miro@hroncok.cz>
+Date: Sep 29 2021 10:05:27 +0000
+Subject: Remove incorrect double-patch of objects in test cases.
+
+The specific test cases relying on the patches, already are decorated
+to patch the specific attributes needed. We don't need a general patch
+of the attributes in the test case setup.
+
+Signed-off-by: Ben Finney <ben+python@benfinney.id.au>
+
+--- a/test/test_pidfile.py
++++ b/test/test_pidfile.py
+@@ -367,12 +367,6 @@ class TimeoutPIDLockFile_TestCase(scaffold.TestCase):
+         pidlockfile_scenarios = make_pidlockfile_scenarios()
+         self.pidlockfile_scenario = pidlockfile_scenarios['simple']
+ 
+-        for func_name in ['__init__', 'acquire']:
+-            func_patcher = unittest.mock.patch.object(
+-                    lockfile.pidlockfile.PIDLockFile, func_name)
+-            func_patcher.start()
+-            self.addCleanup(func_patcher.stop)
+-
+         self.scenario = {
+                 'pidfile_path': self.pidlockfile_scenario['pidfile_path'],
+                 'acquire_timeout': self.getUniqueInteger(),
+
diff --git a/dev-python/python-daemon/python-daemon-2.3.0-r1.ebuild b/dev-python/python-daemon/python-daemon-2.3.0-r1.ebuild
index 4ace3642ef5c..c08918145d6a 100644
--- a/dev-python/python-daemon/python-daemon-2.3.0-r1.ebuild
+++ b/dev-python/python-daemon/python-daemon-2.3.0-r1.ebuild
@@ -29,6 +29,10 @@ BDEPEND="
 	)
 "
 
+PATCHES=(
+	"${FILESDIR}/${P}-fix-py3.10.patch"
+)
+
 distutils_enable_tests unittest
 
 src_prepare() {
diff --git a/dev-python/sarif_om/Manifest b/dev-python/sarif_om/Manifest
new file mode 100644
index 000000000000..db4edf9f9a61
--- /dev/null
+++ b/dev-python/sarif_om/Manifest
@@ -0,0 +1 @@
+DIST sarif_om-1.0.4.tar.gz 28847 BLAKE2B 9e4df8bc9c025b0164b8442bca5bab95693fa63211384a2cbe04362e7ce531edc68e589349384710ba09f7584bbfaa7a85253a6f930ad24e8158bdf45ff476b2 SHA512 2261c2e4baba7f8621315a8e3e6933aa73bebce92eede570a22816ceca09bbfdeacae804e74de127443347c999fe9459cc5ae69c9e1570c79fafcd1c1b3c7f7c
diff --git a/dev-python/sarif_om/metadata.xml b/dev-python/sarif_om/metadata.xml
new file mode 100644
index 000000000000..e7ef4b94f630
--- /dev/null
+++ b/dev-python/sarif_om/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">sarif-om</remote-id>
+ </upstream>
+ <origin>gentoo-staging</origin>
+ <stabilize-allarches/>
+</pkgmetadata>
\ No newline at end of file
diff --git a/dev-python/sarif_om/sarif_om-1.0.4.ebuild b/dev-python/sarif_om/sarif_om-1.0.4.ebuild
new file mode 100644
index 000000000000..a24b7f589b0d
--- /dev/null
+++ b/dev-python/sarif_om/sarif_om-1.0.4.ebuild
@@ -0,0 +1,24 @@
+# Copyright 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="Classes implementing the SARIF 2.1.0 object model"
+HOMEPAGE="
+	https://pypi.org/project/sarif-om/
+	https://github.com/microsoft/sarif-python-om/"
+SRC_URI="
+	mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	dev-python/attrs[${PYTHON_USEDEP}]
+	dev-python/pbr[${PYTHON_USEDEP}]"
+BDEPEND="
+	dev-python/pbr[${PYTHON_USEDEP}]"
diff --git a/dev-python/spyder/spyder-4.2.5-r2.ebuild b/dev-python/spyder/spyder-4.2.5-r3.ebuild
index 0342ecb58482..c7b919e80364 100644
--- a/dev-python/spyder/spyder-4.2.5-r2.ebuild
+++ b/dev-python/spyder/spyder-4.2.5-r3.ebuild
@@ -145,7 +145,17 @@ python_prepare_all() {
 		-e '/python-lsp-server/d' \
 		-e '/parso/d' \
 		-e '/jedi/d' \
-			{setup.py,requirements/conda.txt} || die
+		-e '/pylint/d' \
+			requirements/conda.txt || die
+	sed -i \
+		-e "/'pyqt5[ 0-9<=>.,]*',/d" \
+		-e "/'pyqtwebengine[ 0-9<=>.,]*',/d" \
+		-e "/'python-lsp-server\[all\][ 0-9<=>.,]*',/d" \
+		-e "/'python-language-server\[all\][ 0-9<=>.,]*',/d" \
+		-e "/'parso[ 0-9<=>.,]*',/d" \
+		-e "/'jedi[ 0-9<=>.,]*',/d" \
+		-e "/'pylint[ 0-9<=>.,]*',/d" \
+			setup.py || die
 	sed -i \
 		-e "/^PYLS_REQVER/c\PYLS_REQVER = '>=0.0.1'" \
 		-e "/^PYLSP_REQVER/c\PYLSP_REQVER = '>=0.0.1'" \
diff --git a/dev-python/spyder/spyder-5.0.5-r1.ebuild b/dev-python/spyder/spyder-5.0.5-r2.ebuild
index f1117b4a4431..4bb3ee821b74 100644
--- a/dev-python/spyder/spyder-5.0.5-r1.ebuild
+++ b/dev-python/spyder/spyder-5.0.5-r2.ebuild
@@ -152,7 +152,17 @@ python_prepare_all() {
 		-e '/python-lsp-server/d' \
 		-e '/parso/d' \
 		-e '/jedi/d' \
-			{setup.py,requirements/conda.txt} || die
+		-e '/pylint/d' \
+			requirements/conda.txt || die
+	sed -i \
+		-e "/'pyqt5[ 0-9<=>.,]*',/d" \
+		-e "/'pyqtwebengine[ 0-9<=>.,]*',/d" \
+		-e "/'python-lsp-server\[all\][ 0-9<=>.,]*',/d" \
+		-e "/'python-language-server\[all\][ 0-9<=>.,]*',/d" \
+		-e "/'parso[ 0-9<=>.,]*',/d" \
+		-e "/'jedi[ 0-9<=>.,]*',/d" \
+		-e "/'pylint[ 0-9<=>.,]*',/d" \
+			setup.py || die
 	sed -i \
 		-e "/^PYLS_REQVER/c\PYLS_REQVER = '>=0.0.1'" \
 		-e "/^PYLSP_REQVER/c\PYLSP_REQVER = '>=0.0.1'" \
diff --git a/dev-python/spyder/spyder-5.1.5-r1.ebuild b/dev-python/spyder/spyder-5.1.5-r2.ebuild
index fc3fc92b4656..aa1553fe84eb 100644
--- a/dev-python/spyder/spyder-5.1.5-r1.ebuild
+++ b/dev-python/spyder/spyder-5.1.5-r2.ebuild
@@ -136,7 +136,15 @@ python_prepare_all() {
 		-e '/parso/d' \
 		-e '/jedi/d' \
 		-e '/pylint/d' \
-			{setup.py,requirements/conda.txt} || die
+			requirements/conda.txt || die
+	sed -i \
+		-e "/'pyqt5[ 0-9<=>.,]*',/d" \
+		-e "/'pyqtwebengine[ 0-9<=>.,]*',/d" \
+		-e "/'python-lsp-server\[all\][ 0-9<=>.,]*',/d" \
+		-e "/'parso[ 0-9<=>.,]*',/d" \
+		-e "/'jedi[ 0-9<=>.,]*',/d" \
+		-e "/'pylint[ 0-9<=>.,]*',/d" \
+			setup.py || die
 	sed -i \
 		-e "/^PYLS_REQVER/c\PYLS_REQVER = '>=0.0.1'" \
 		-e "/^PYLSP_REQVER/c\PYLSP_REQVER = '>=0.0.1'" \
diff --git a/dev-python/tomli-w/Manifest b/dev-python/tomli-w/Manifest
index d51775295d71..fe492e2f4aa0 100644
--- a/dev-python/tomli-w/Manifest
+++ b/dev-python/tomli-w/Manifest
@@ -1 +1,2 @@
 DIST tomli-w-0.3.0.gh.tar.gz 61366 BLAKE2B 1ca3d50237d41fb22e8d506d2d8af3c5d9f690161a44439d3a79038bda7a67a6af9ad62b077169b5c2bdaee2110a3be5e3eec652aa8866a20c5841662f18a7e1 SHA512 618b93f2d98eee4fafe502e25f8770dc58558b25d9ec548fa5d0a6bdd8914e487fb1d16b68d138e0f8a48a6e5713c23e4d1a6daf70c8eafa27630fee05dfe8df
+DIST tomli-w-0.4.0.gh.tar.gz 63717 BLAKE2B 13f73718e84602e65243708481c546379120741bdef2c9b5dd53fc0a8f81bb098acfc18d8623d3b4ad9fe0ac37594c3c0fee94e009428cde2b46b6819f5598d1 SHA512 0a3940fd738aa62c9409cf33c515c33e232796374c10a7d0b0a7fcaf2d39e846cc1cf87700b5e8d5601e4bd02e76f5ee322c9d5fb37d4706670d34d8313fd19d
diff --git a/dev-python/tomli-w/metadata.xml b/dev-python/tomli-w/metadata.xml
index 66d957c27152..d300cf044318 100644
--- a/dev-python/tomli-w/metadata.xml
+++ b/dev-python/tomli-w/metadata.xml
@@ -5,7 +5,7 @@
   <email>python@gentoo.org</email>
  </maintainer>
  <upstream>
-  <remote-id type="pypi">tomli_w</remote-id>
+  <remote-id type="pypi">tomli-w</remote-id>
  </upstream>
  <origin>gentoo-staging</origin>
  <stabilize-allarches/>
diff --git a/dev-python/tomli-w/tomli-w-0.4.0.ebuild b/dev-python/tomli-w/tomli-w-0.4.0.ebuild
new file mode 100644
index 000000000000..7765cc3e016c
--- /dev/null
+++ b/dev-python/tomli-w/tomli-w-0.4.0.ebuild
@@ -0,0 +1,26 @@
+# 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="A lil' TOML writer"
+HOMEPAGE="
+	https://pypi.org/project/tomli-w/
+	https://github.com/hukkin/tomli-w/"
+SRC_URI="
+	https://github.com/hukkin/tomli-w/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+BDEPEND="
+	test? ( dev-python/tomli[${PYTHON_USEDEP}] )"
+
+distutils_enable_tests pytest
diff --git a/dev-python/wrapt/wrapt-1.13.2.ebuild b/dev-python/wrapt/wrapt-1.13.2.ebuild
index efaf1ee24f3d..c9f9e9e9abbf 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