Adding metadata

23 files changed, 332 insertions, 62 deletions

diff --git a/dev-python/aesara/Manifest b/dev-python/aesara/Manifest
index 8ee5387ada82..c35e82cfb67c 100644
--- a/dev-python/aesara/Manifest
+++ b/dev-python/aesara/Manifest
@@ -1,3 +1,4 @@
 DIST aesara-rel-2.5.3.tar.gz 8191431 BLAKE2B 698bc3b6f7e84288be3318796989d13d7de92f72c66abfa83b14c08f6310f974f7381d729e712c2bd5e76f398d74a3c5dc03d7515a22254261312e586e3fd461 SHA512 5c1ad9d6ad1fb58be1477713d863f2b1371544ea8293d8e9e1a690860a0483b83c9558827856a2546498bab26360f141a5ee97d4c7f3f2aad773e84f9766a59b
 DIST aesara-rel-2.6.0.tar.gz 7846131 BLAKE2B 23e1f115eb2e8794a00d29fa2b9705ba6bf0d17c9bb290675f9406e4008b24b45dfd9b2732cb6fc3c6ce18154a3d75b6b0fc750a99f76588cab91387dbc4728d SHA512 8acff0f3fbb8969970b988f363cb3e2107fd3ee5450f238e426f0959d6bf42909c6eb2951b1803629148a57a9a27c47b4364756942a42692b44abf151cf736d2
 DIST aesara-rel-2.6.2.tar.gz 7846413 BLAKE2B bd25da68fc0bc138eedda1c7203ef1cf0e3f0cde84e9eb2be0aed9baeedf292f7270e0117cbcb72aeb2542727b24d4a5374e2c2f930945240b911916942b10fe SHA512 e1da313d5f2a8498565bb0cc1442b1c3eae0206caf09976903c54314b4002a68dae53d7289ad1fb06e5e8ed015613d989c4c5db85d57f6c072d2e2414019acd5
+DIST aesara-rel-2.6.3.tar.gz 7845423 BLAKE2B 66b84a10337efc01e37d82793da56b61b1825829d982e24e0f93ebb67cd3c22e5bb2e37c71ab8bd9648b039efaf4c667dc53df2a9613ba9370c2138eb74ca400 SHA512 e0a804c0c3c1cd24753a237c386df9600d2b01cf4991aeca3d794df4068f584a9ab5341b72fa5695ccb9d06f1e4954f450436e3a7ebe4c2efc1354a5c2e5979d
diff --git a/dev-python/aesara/aesara-2.6.3.ebuild b/dev-python/aesara/aesara-2.6.3.ebuild
new file mode 100644
index 000000000000..6b6cb11e6b93
--- /dev/null
+++ b/dev-python/aesara/aesara-2.6.3.ebuild
@@ -0,0 +1,80 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{7,8,9,10} )
+
+inherit distutils-r1 multiprocessing optfeature
+
+MY_P=aesara-rel-${PV}
+DESCRIPTION="Library for operating on mathematical expressions with multi-dimensional arrays"
+HOMEPAGE="
+	https://github.com/aesara-devs/aesara/
+	https://pypi.org/project/aesara/
+"
+SRC_URI="
+	https://github.com/aesara-devs/aesara/archive/rel-${PV}.tar.gz
+		-> ${MY_P}.tar.gz
+"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+
+RDEPEND="
+	dev-python/cons[${PYTHON_USEDEP}]
+	dev-python/etuples[${PYTHON_USEDEP}]
+	dev-python/logical-unification[${PYTHON_USEDEP}]
+	dev-python/minikanren[${PYTHON_USEDEP}]
+	dev-python/filelock[${PYTHON_USEDEP}]
+	>=dev-python/numpy-1.17.0[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/scipy[${PYTHON_USEDEP}]
+	dev-python/typing-extensions[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx doc 'dev-python/sphinx_rtd_theme'
+distutils_enable_tests pytest
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# speed tests are unreliable
+		tests/scan/test_basic.py::test_speed
+		tests/scan/test_basic.py::test_speed_rnn
+		tests/scan/test_basic.py::test_speed_batchrnn
+		tests/link/test_vm.py::test_speed
+		tests/link/test_vm.py::test_speed_lazy
+		tests/tensor/test_gc.py::test_merge_opt_runtime
+
+		# rounding problem?
+		# https://github.com/aesara-devs/aesara/issues/477
+		tests/tensor/test_math_scipy.py::TestGammaUBroadcast::test_good
+		tests/tensor/test_math_scipy.py::TestGammaUInplaceBroadcast::test_good
+	)
+	local EPYTEST_IGNORE=(
+		# we do not package numba
+		tests/link/test_numba.py
+		tests/link/test_numba_performance.py
+	)
+
+	epytest -n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
+}
+
+python_compile() {
+	esetup.py build_py
+	distutils-r1_python_compile
+	rm "${BUILD_DIR}/install$(python_get_sitedir)/bin/__init__.py" || die
+}
+
+pkg_postinst() {
+	optfeature "GPU code generation/execution on NVIDIA gpus" dev-util/nvidia-cuda-toolkit dev-util/nvidia-cuda-sdk
+	optfeature "GPU/CPU code generation on CUDA and OpenCL devices" dev-libs/libgpuarray dev-python/pycuda
+}
diff --git a/dev-python/ipyparallel/ipyparallel-8.2.1.ebuild b/dev-python/ipyparallel/ipyparallel-8.2.1.ebuild
index 160b18b43b6d..88b8e8960ead 100644
--- a/dev-python/ipyparallel/ipyparallel-8.2.1.ebuild
+++ b/dev-python/ipyparallel/ipyparallel-8.2.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN: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="
 	dev-python/entrypoints[${PYTHON_USEDEP}]
diff --git a/dev-python/jupyter_server/jupyter_server-1.15.6.ebuild b/dev-python/jupyter_server/jupyter_server-1.15.6.ebuild
index dc2f5ea0ace5..ca2f92a49ff3 100644
--- a/dev-python/jupyter_server/jupyter_server-1.15.6.ebuild
+++ b/dev-python/jupyter_server/jupyter_server-1.15.6.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN: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="
 	dev-python/jinja[${PYTHON_USEDEP}]
diff --git a/dev-python/pdfminer-six/Manifest b/dev-python/pdfminer-six/Manifest
index 7f75d9615860..cc1d5cb76515 100644
--- a/dev-python/pdfminer-six/Manifest
+++ b/dev-python/pdfminer-six/Manifest
@@ -1,2 +1,2 @@
 DIST pdfminer-six-20201018.tar.gz 10256409 BLAKE2B 87e4b693621efc36c0f248d977c8c4310d8865629bc459c8f2bb65385ae215ce07701a016e8a5f31a81f84dc596dca9f58895ac98ad34f7549ea557282cfcc9e SHA512 62d3ef815072627baf30cda966f6914422ff4df4945e0442bdaa93e04f42d2e0874f0dba46cec0f789308d787f1c8842e913bb0b590709c22faf12f605ae258e
-DIST pdfminer-six-20220319.tar.gz 10852993 BLAKE2B 4b81069c19cbba4d7e7797803d58d13f1419f3251e49745879071441b83fe11cb7282618a2698a4c819f0166aeed1fc3c57817d0a08590394218ec83ec79781a SHA512 1aebbef2e3cf84af61b77e20976487f0cdf4edceed4522f681f7898f5f149c9d6512b50cfdf6f44700a763b340fabefb49f76c634d56c131b46e3fa5c6d5e56f
+DIST pdfminer.six-20220319.tar.gz 7356602 BLAKE2B e4ba2e62e923b53bcbd15dc2fdde11ededd6acee0f76cbbd5bb68eccc7d612c4f3d92edaf2b63e30586a2390360ff4bfdcec55515b66846b12494d569cb8cb7f SHA512 b11d4a306a1b4c0f022bd2628d26254069cec6a74b3375f1b335b7b31077fcc9377e8d8ea04ca5accf1133f111f6c2b70d9c25e12341536cc27f9411ca0f05e2
diff --git a/dev-python/pdfminer-six/metadata.xml b/dev-python/pdfminer-six/metadata.xml
index 498a8147049a..fe86776747f2 100644
--- a/dev-python/pdfminer-six/metadata.xml
+++ b/dev-python/pdfminer-six/metadata.xml
@@ -5,6 +5,10 @@
   <email>alarig@swordarmor.fr</email>
   <name>Alarig Le Lay</name>
  </maintainer>
+ <maintainer type="person">
+  <email>carana2099@gmail.com</email>
+  <name>Carlos Eduardo</name>
+ </maintainer>
  
  <origin>gentoo-guru-overlay</origin>
 </pkgmetadata>
\ No newline at end of file
diff --git a/dev-python/pdfminer-six/pdfminer-six-20220319.ebuild b/dev-python/pdfminer-six/pdfminer-six-20220319-r1.ebuild
index 4e11068a558c..1744e10dbfd0 100644
--- a/dev-python/pdfminer-six/pdfminer-six-20220319.ebuild
+++ b/dev-python/pdfminer-six/pdfminer-six-20220319-r1.ebuild
@@ -11,11 +11,12 @@ MY_PN="${PN/-/.}"
 
 DESCRIPTION="Community maintained fork of pdfminer"
 HOMEPAGE="https://github.com/pdfminer/pdfminer.six"
-SRC_URI="https://github.com/pdfminer/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/pdfminer/${MY_PN}/releases/download/${PV}/${MY_PN}-${PV}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
+IUSE="test"
 
 RDEPEND="
 	>=dev-python/chardet-3.0[${PYTHON_USEDEP}]
@@ -25,5 +26,5 @@ RDEPEND="
 
 S="${WORKDIR}/${MY_PN}-${PV}"
 
-distutils_enable_tests nose
+distutils_enable_tests pytest
 distutils_enable_sphinx docs/source dev-python/sphinx-argparse
diff --git a/dev-python/pytest/Manifest b/dev-python/pytest/Manifest
index 986dfc9dd5ce..38e7728d3ef9 100644
--- a/dev-python/pytest/Manifest
+++ b/dev-python/pytest/Manifest
@@ -1,2 +1,3 @@
 DIST pytest-7.0.1.tar.gz 1249154 BLAKE2B fcaef6afc6e98f6716a80f6451671b2abbf9ad676330a6e66e917a73e018eef966de8e7ef7ab48a1213167476eef1eb37cc5e84ec2bd9e5eab4ec6f1a8071c87 SHA512 21493717159a64fe6467bd096b578b127d81438d04f5b03ba2f4047237054f865a1f50a4e291b9d95b1a144f59bc7a8b3a00008493f4fb4f14bff7fb65c5edc2
 DIST pytest-7.1.1.tar.gz 1255528 BLAKE2B cc70b61ab863c19db62fc765c1819624d2e330116e4c8561693a895d3157ea6011a9f2db4e96f22cb802b295ae841c81e71a741cec8f64d4b7f70c539356fa7e SHA512 53fd016f030ac0394ac686a3756fad05efca8363d6b93df04f90732efea7643cdbba9501dad6d9055d314fcaec0887674496d56986efeb73915976276bf0a700
+DIST pytest-7.1.2.tar.gz 1256241 BLAKE2B c59e477ba52f2ff6f9885b91bbdc9b70dd4ffced3902417cd2e8cf28ba778e92ab5738f1be4d1c8c5c41c7140ac56622b6d44261d618426ae39fd00026bf139c SHA512 e61c9b0a8fc053626da307d6bac1f5caab451c4948ef7c7f2e2f991c3433a55f81ec0d9412fca646c02f22e695c71e873ee48fc0ab0aad337ce01b70628df494
diff --git a/dev-python/pytest/pytest-7.1.2.ebuild b/dev-python/pytest/pytest-7.1.2.ebuild
new file mode 100644
index 000000000000..baa608ec23a5
--- /dev/null
+++ b/dev-python/pytest/pytest-7.1.2.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{7,8,9,10} pypy3 )
+
+inherit distutils-r1 multiprocessing
+
+DESCRIPTION="Simple powerful testing with Python"
+HOMEPAGE="
+	https://pytest.org/
+	https://github.com/pytest-dev/pytest/
+	https://pypi.org/project/pytest/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
+	dev-python/iniconfig[${PYTHON_USEDEP}]
+	>=dev-python/more-itertools-4.0.0[${PYTHON_USEDEP}]
+	dev-python/packaging[${PYTHON_USEDEP}]
+	>=dev-python/pluggy-0.12[${PYTHON_USEDEP}]
+	>=dev-python/py-1.8.2[${PYTHON_USEDEP}]
+	>=dev-python/tomli-1.0.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	>=dev-python/setuptools_scm-6.2.3[${PYTHON_USEDEP}]
+	test? (
+		${RDEPEND}
+		dev-python/argcomplete[${PYTHON_USEDEP}]
+		>=dev-python/hypothesis-3.56[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+		>=dev-python/pygments-2.7.2[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+		dev-python/xmlschema[${PYTHON_USEDEP}]
+	)
+"
+
+src_test() {
+	# workaround new readline defaults
+	echo "set enable-bracketed-paste off" > "${T}"/inputrc || die
+	local -x INPUTRC="${T}"/inputrc
+	distutils-r1_src_test
+}
+
+python_test() {
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	local -x COLUMNS=80
+
+	local EPYTEST_DESELECT=(
+		# broken by epytest args
+		testing/test_warnings.py::test_works_with_filterwarnings
+
+		# tend to be broken by random pytest plugins
+		# (these tests patch PYTEST_DISABLE_PLUGIN_AUTOLOAD out)
+		testing/test_helpconfig.py::test_version_less_verbose
+		testing/test_helpconfig.py::test_version_verbose
+		testing/test_junitxml.py::test_random_report_log_xdist
+		testing/test_junitxml.py::test_runs_twice_xdist
+		testing/test_terminal.py::TestProgressOutputStyle::test_xdist_normal
+		testing/test_terminal.py::TestProgressOutputStyle::test_xdist_normal_count
+		testing/test_terminal.py::TestProgressOutputStyle::test_xdist_verbose
+		testing/test_terminal.py::TestProgressWithTeardown::test_xdist_normal
+		testing/test_terminal.py::TestTerminalFunctional::test_header_trailer_info
+		testing/test_terminal.py::TestTerminalFunctional::test_no_header_trailer_info
+
+		# unstable with xdist
+		testing/test_terminal.py::TestTerminalFunctional::test_verbose_reporting_xdist
+	)
+
+	[[ ${EPYTHON} == pypy3 ]] && EPYTEST_DESELECT+=(
+		# regressions on pypy3.9
+		# https://github.com/pytest-dev/pytest/issues/9787
+		testing/test_skipping.py::test_errors_in_xfail_skip_expressions
+		testing/test_unraisableexception.py
+	)
+
+	epytest -p xdist -n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
+}
diff --git a/dev-python/retworkx/retworkx-0.11.0.ebuild b/dev-python/retworkx/retworkx-0.11.0.ebuild
index 338670a50b88..252dfec50aaa 100644
--- a/dev-python/retworkx/retworkx-0.11.0.ebuild
+++ b/dev-python/retworkx/retworkx-0.11.0.ebuild
@@ -85,7 +85,7 @@ LICENSE="Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD BSD-2 MIT"
 SLOT="0"
 KEYWORDS="~amd64"
 
-BDEPEND="dev-python/setuptools_rust
+BDEPEND="dev-python/setuptools-rust
 	test? (
 		dev-python/fixtures[${PYTHON_USEDEP}]
 		>=dev-python/testtools-2.5.0[${PYTHON_USEDEP}]
diff --git a/dev-python/sphinxcontrib-httpdomain/sphinxcontrib-httpdomain-1.8.0.ebuild b/dev-python/sphinxcontrib-httpdomain/sphinxcontrib-httpdomain-1.8.0.ebuild
index 9d71129e45fa..90e263e1d733 100644
--- a/dev-python/sphinxcontrib-httpdomain/sphinxcontrib-httpdomain-1.8.0.ebuild
+++ b/dev-python/sphinxcontrib-httpdomain/sphinxcontrib-httpdomain-1.8.0.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}/httpdomain-${PV}"
 
 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="
 	dev-python/sphinx[${PYTHON_USEDEP}]
diff --git a/dev-python/sphinxcontrib-openapi/sphinxcontrib-openapi-0.7.0.ebuild b/dev-python/sphinxcontrib-openapi/sphinxcontrib-openapi-0.7.0.ebuild
index f0bc1c3e9d9b..60ffa4ca198b 100644
--- a/dev-python/sphinxcontrib-openapi/sphinxcontrib-openapi-0.7.0.ebuild
+++ b/dev-python/sphinxcontrib-openapi/sphinxcontrib-openapi-0.7.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN: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="
 	dev-python/sphinx[${PYTHON_USEDEP}]
diff --git a/dev-python/uritemplate/Manifest b/dev-python/uritemplate/Manifest
index 9d0f75f84da6..21e82e3c839b 100644
--- a/dev-python/uritemplate/Manifest
+++ b/dev-python/uritemplate/Manifest
@@ -1 +1,2 @@
 DIST uritemplate-4.1.0.tar.gz 273924 BLAKE2B b21115c6db8f94c635dda1033b4650dd7d2d54b6f52f51bff31ae8cf89e0b3dbcfc1bd029eadc68f5f94eecbd167eabc652c24be6f0bb807beecb5f254520626 SHA512 e62812a4e9ff315a1b06ba9e88f3dd47aea8353cae4ead9ce7bf59b65c83cd6ae7c973cb29b8ddc25266c264f229df8f2d9e982ab489f2f37a5dbd460b87a5e0
+DIST uritemplate-4.1.1.tar.gz 273898 BLAKE2B 08a9179da7ccdb8b6d1a85ccf34f44f8282e6b5a00ddea541364272816588c238f4f8f960a197a7e8074607bcb8d1b52226740bddf0b92fb3751cb2d4b8fad51 SHA512 7682c7dcd9c8d4428b047e3adbc283b78f755face4d8dd1b0cd11df9583bd0435543640ba79229d436aeecad2b5b29684befdccc84ba71f72769ee130cb6576a
diff --git a/dev-python/uritemplate/uritemplate-4.1.1.ebuild b/dev-python/uritemplate/uritemplate-4.1.1.ebuild
new file mode 100644
index 000000000000..2ccc583105fe
--- /dev/null
+++ b/dev-python/uritemplate/uritemplate-4.1.1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{7,8,9,10} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Python implementation of RFC6570, URI Template"
+HOMEPAGE="
+	https://uritemplate.readthedocs.io/en/latest/
+	https://pypi.org/project/uritemplate/
+	https://github.com/python-hyper/uritemplate/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="Apache-2.0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+distutils_enable_tests pytest
diff --git a/dev-python/waitress/metadata.xml b/dev-python/waitress/metadata.xml
index ea8988e8af6a..0c31d276ab89 100644
--- a/dev-python/waitress/metadata.xml
+++ b/dev-python/waitress/metadata.xml
@@ -5,7 +5,9 @@
   <email>python@gentoo.org</email>
   <name>Python</name>
  </maintainer>
- 
+ <upstream>
+  <remote-id type="cpe">cpe:/a:agendaless:waitress</remote-id>
+ </upstream>
  <origin>gentoo-staging</origin>
  <stabilize-allarches/>
 </pkgmetadata>
\ No newline at end of file
diff --git a/dev-python/watchgod/Manifest b/dev-python/watchgod/Manifest
index 8a8555ac2c7b..bc4b2f4231e7 100644
--- a/dev-python/watchgod/Manifest
+++ b/dev-python/watchgod/Manifest
@@ -1,2 +1 @@
-DIST watchgod-0.8.1.gh.tar.gz 15414 BLAKE2B 237b03a08b053f6979b884a02818b8651ce7415dbd08a848c2d754361c3f9aaf315db2b352a8f159f6245f2db92ea2f5485daacfb8924edcc361049f307467bb SHA512 a30ac1093df1e26ce78bbc09f5b1155cd5a9becad13da54ab3009012a5630404bb94695474be05133ad3e57c1727743efc408235a19a25f276265d752f0624cc
-DIST watchgod-0.8.gh.tar.gz 15354 BLAKE2B 1325f452593e54e8cc40eca0fc9867aff0c93d89de767b9512508fee02efe94e43284b30c316b2cce31a15acc2ee9ff19ca7f9cc6fb46cfffdb0458e502d85ca SHA512 0e86d9dd3eba0cd3aaeccc009ebdba8528ba23d63ad19ff789dffda075b4a01c32be0dfabf38f15e7966bc09e7fb5ae3a94a9dd89a55358a95622aaf5cad0947
+DIST watchfiles-0.8.1.gh.tar.gz 15405 BLAKE2B ea5d6d59b930f00d6b4b8d6236a38dbb2463866246f1ff4cda828a99a7383fac9c47b131417d8f375a105733c7567f32895759a8dc4503f5671b524977e282ed SHA512 2f611786d267ceae5d6e9094400f5dc6eb59a008f047a511b58b329762e63bbcd83a56cc95cca54c8480b1702c160548baa30549e907e6b85c8bf176ba339fb6
diff --git a/dev-python/watchgod/watchgod-0.8.1.ebuild b/dev-python/watchgod/watchgod-0.8.1.ebuild
index c6be653d28cb..50466b0b640a 100644
--- a/dev-python/watchgod/watchgod-0.8.1.ebuild
+++ b/dev-python/watchgod/watchgod-0.8.1.ebuild
@@ -8,19 +8,21 @@ PYTHON_COMPAT=( python3_{7,8,9,10} pypy3 )
 
 inherit distutils-r1
 
+MY_P=watchfiles-${PV}
 DESCRIPTION="Simple, modern file watching and code reload in Python"
 HOMEPAGE="
 	https://pypi.org/project/watchgod/
-	https://github.com/samuelcolvin/watchgod/
+	https://github.com/samuelcolvin/watchfiles/
 "
 SRC_URI="
-	https://github.com/samuelcolvin/watchgod/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
+	https://github.com/samuelcolvin/watchfiles/archive/v${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz
 "
+S=${WORKDIR}/${MY_P}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86"
 
 RDEPEND="
 	=dev-python/anyio-3*[${PYTHON_USEDEP}]
diff --git a/dev-python/watchgod/watchgod-0.8.ebuild b/dev-python/watchgod/watchgod-0.8.ebuild
deleted file mode 100644
index 151aecbd466c..000000000000
--- a/dev-python/watchgod/watchgod-0.8.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 2021-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-inherit distutils-r1
-
-DESCRIPTION="Simple, modern file watching and code reload in Python"
-HOMEPAGE="
-	https://pypi.org/project/watchgod/
-	https://github.com/samuelcolvin/watchgod/
-"
-SRC_URI="
-	https://github.com/samuelcolvin/watchgod/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ppc ppc64 ~riscv sparc x86"
-
-RDEPEND="
-	=dev-python/anyio-3*[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		dev-python/pytest-toolbox[${PYTHON_USEDEP}]
-		dev-python/trio[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	# flaky test on slow systems, https://github.com/samuelcolvin/watchgod/issues/84
-	tests/test_watch.py::test_awatch_log
-)
-
-src_prepare() {
-	# increase timeout
-	sed -e '/sleep/s/0.01/1.0/' -i tests/test_watch.py || die
-
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/zope-component/Manifest b/dev-python/zope-component/Manifest
index 94bc87e964e7..4aa808dcdb5d 100644
--- a/dev-python/zope-component/Manifest
+++ b/dev-python/zope-component/Manifest
@@ -1 +1,2 @@
 DIST zope.component-4.4.1.tar.gz 84745 BLAKE2B 3b8a58bdaf1de1bc57e9642bf76100bd8aa0bbccfc8d6682e7f78363f08f13ac98c7ff37d4892c3558e26537294dd184b75810afaf95c6f8d6a529c9938ea8dc SHA512 dc9f6a725cc49ac94a164d11786ef977e94e1c9a7c88de4aaeb0f62621cfe00284007ae44937ec92ae6cffc5b16ab4af1548db2237b0ba4b818e2c8f6355ecbd
+DIST zope.component-5.0.1.tar.gz 91130 BLAKE2B 4dbd78b003ba3688c0468573f4552c87333fd5fb7e0cd89d4844633f28c19443b3ea884438ff7f7ba8b056790f008c246c1e7ad52403d7b72b146d0d53edd8ad SHA512 fad011816fe5bb869bb2e43e11a66841a6be2abf9002e41207ef1dfe69b1afb5ca486d275daeddf71d2a0e79e1a9c839c4735190dddcd118b675a976bde07a64
diff --git a/dev-python/zope-component/zope-component-5.0.1.ebuild b/dev-python/zope-component/zope-component-5.0.1.ebuild
new file mode 100644
index 000000000000..65fec5dbfbc9
--- /dev/null
+++ b/dev-python/zope-component/zope-component-5.0.1.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{7,8,9,10} )
+
+inherit distutils-r1
+
+MY_PN=zope.component
+MY_P=${MY_PN}-${PV}
+DESCRIPTION="Zope Component Architecture"
+HOMEPAGE="
+	https://pypi.org/project/zope.component/
+	https://github.com/zopefoundation/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"
+
+RDEPEND="
+	dev-python/zope-event[${PYTHON_USEDEP}]
+	>=dev-python/zope-hookable-4.2.0[${PYTHON_USEDEP}]
+	>=dev-python/zope-interface-5.3.0[${PYTHON_USEDEP}]
+	!dev-python/namespace-zope
+"
+BDEPEND="
+	test? (
+		dev-python/zope-configuration[${PYTHON_USEDEP}]
+		dev-python/zope-i18nmessageid[${PYTHON_USEDEP}]
+		dev-python/zope-testing[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests unittest
+
+src_prepare() {
+	# strip rdep specific to namespaces
+	sed -i -e "/'setuptools'/d" setup.py || die
+	distutils-r1_src_prepare
+}
+
+python_compile() {
+	distutils-r1_python_compile
+	find "${BUILD_DIR}" -name '*.pth' -delete || die
+}
+
+python_test() {
+	cd "${BUILD_DIR}/install$(python_get_sitedir)" || die
+	distutils_write_namespace zope
+	eunittest
+}
diff --git a/dev-python/zope-hookable/Manifest b/dev-python/zope-hookable/Manifest
new file mode 100644
index 000000000000..f68460b1feec
--- /dev/null
+++ b/dev-python/zope-hookable/Manifest
@@ -0,0 +1 @@
+DIST zope.hookable-5.1.0.tar.gz 21922 BLAKE2B c8bb0c6fb20718127fc2b3d7a2654035a14f87a52b41331ec3d564fe7dd175a977911e1a5847e544e30eeeb473b1fdb5d75ece7ece4b5a4212fec8f6d85a3d44 SHA512 af63fd7c83bbaf2c6c1faaefc7081a9a739b835fb5f1fe48f8f6b66a82596d52d0559df8de1beceb129578ee2ed9711ee05a9aa2dd0eec98dca6db40b45a4665
diff --git a/dev-python/zope-hookable/metadata.xml b/dev-python/zope-hookable/metadata.xml
new file mode 100644
index 000000000000..7ad11570cc7d
--- /dev/null
+++ b/dev-python/zope-hookable/metadata.xml
@@ -0,0 +1,9 @@
+<?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>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
\ No newline at end of file
diff --git a/dev-python/zope-hookable/zope-hookable-5.1.0.ebuild b/dev-python/zope-hookable/zope-hookable-5.1.0.ebuild
new file mode 100644
index 000000000000..b26822b7c842
--- /dev/null
+++ b/dev-python/zope-hookable/zope-hookable-5.1.0.ebuild
@@ -0,0 +1,47 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{7,8,9,10} )
+
+inherit distutils-r1
+
+MY_PN=${PN/-/.}
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="Efficient creation of 'hookable' objects"
+HOMEPAGE="
+	https://pypi.org/project/zope.hookable/
+	https://github.com/zopefoundation/zope.hookable/
+"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="ZPL"
+SLOT="0"
+KEYWORDS="~amd64"
+
+BDEPEND="
+	test? (
+		dev-python/zope-testing[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests unittest
+
+src_prepare() {
+	# strip rdep specific to namespaces
+	sed -i -e "/'setuptools'/d" setup.py || die
+	distutils-r1_src_prepare
+}
+
+python_compile() {
+	distutils-r1_python_compile
+	find "${BUILD_DIR}" -name '*.pth' -delete || die
+}
+
+python_test() {
+	eunittest -s "${BUILD_DIR}/install$(python_get_sitedir)/zope/hookable/tests"
+}