Adding metadata

51 files changed, 301 insertions, 324 deletions

diff --git a/dev-python/adblock/metadata.xml b/dev-python/adblock/metadata.xml
index 47f61ed367be..aded743950e6 100644
--- a/dev-python/adblock/metadata.xml
+++ b/dev-python/adblock/metadata.xml
@@ -2,13 +2,13 @@
 <!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
  <maintainer type="person">
-  <email>steils@gentoo.org</email>
-  <name>Stefan Strogin</name>
- </maintainer>
- <maintainer type="person">
   <email>ionen@gentoo.org</email>
   <name>Ionen Wolkens</name>
  </maintainer>
+ <maintainer type="person">
+  <email>steils@gentoo.org</email>
+  <name>Stefan Strogin</name>
+ </maintainer>
  
  <origin>gentoo-staging</origin>
 </pkgmetadata>
\ No newline at end of file
diff --git a/dev-python/brotlicffi/brotlicffi-1.0.9.2-r1.ebuild b/dev-python/brotlicffi/brotlicffi-1.0.9.2-r1.ebuild
index b590f73345ff..2df0cd1828a9 100644
--- a/dev-python/brotlicffi/brotlicffi-1.0.9.2-r1.ebuild
+++ b/dev-python/brotlicffi/brotlicffi-1.0.9.2-r1.ebuild
@@ -28,7 +28,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	app-arch/brotli:=
diff --git a/dev-python/coverage/coverage-6.4.1.ebuild b/dev-python/coverage/coverage-6.4.1.ebuild
index ee2009680b79..fad63a381732 100644
--- a/dev-python/coverage/coverage-6.4.1.ebuild
+++ b/dev-python/coverage/coverage-6.4.1.ebuild
@@ -19,7 +19,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ~ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/croniter/Manifest b/dev-python/croniter/Manifest
index 04940001380b..18712a118e47 100644
--- a/dev-python/croniter/Manifest
+++ b/dev-python/croniter/Manifest
@@ -1,2 +1 @@
-DIST croniter-1.3.4.tar.gz 39351 BLAKE2B 38701e865b67a382e8c6f511ebf801c83e27aec31cc0f0636b9f8a7b13405a27531b3314523ac819d5193c3907f8aecfc6132901856a1565e6c986ea73dceed0 SHA512 aa55f8849abfa0c8ff24514051362e21fab821d2ffcde182d9e0f267b3b5e1706278710eae80df3ced82a1444323af44eff25cfc34ab92bd15fbb31d7d791037
 DIST croniter-1.3.5.tar.gz 38606 BLAKE2B 45586ef4ef6622caca3611fd596818a875a451ade6353cf4a99219f38ab76e72656c885bd61238670a809203d487d78d884d700c5e2e4c6eb1bdf44dfc14a1c4 SHA512 9b59334f8537cd5b48e17be2c83fcb78f2c0a8c62b7c28091600c84cf202e6847d7d1d40ff5ebb57cac3a713013ca247620e348aa9f3a408483cf4110a88545f
diff --git a/dev-python/croniter/croniter-1.3.4.ebuild b/dev-python/croniter/croniter-1.3.4.ebuild
deleted file mode 100644
index 61c832f5c8e9..000000000000
--- a/dev-python/croniter/croniter-1.3.4.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# 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
-
-DESCRIPTION="Python module to provide iteration for datetime object"
-HOMEPAGE="https://github.com/kiorky/croniter https://pypi.org/project/croniter/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~riscv x86"
-
-RDEPEND="
-	dev-python/python-dateutil[${PYTHON_USEDEP}]"
-BDEPEND="
-	test? (
-		dev-python/pytz[${PYTHON_USEDEP}]
-		dev-python/tzlocal[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
diff --git a/dev-python/croniter/croniter-1.3.5.ebuild b/dev-python/croniter/croniter-1.3.5.ebuild
index fe3e4ab82a7f..9b729b469564 100644
--- a/dev-python/croniter/croniter-1.3.5.ebuild
+++ b/dev-python/croniter/croniter-1.3.5.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm64 ~riscv x86"
 
 RDEPEND="
 	dev-python/python-dateutil[${PYTHON_USEDEP}]"
diff --git a/dev-python/defcon/Manifest b/dev-python/defcon/Manifest
index a9cf9fe659a8..f72dfb8f9ecf 100644
--- a/dev-python/defcon/Manifest
+++ b/dev-python/defcon/Manifest
@@ -1,2 +1 @@
-DIST defcon-0.10.0.tar.gz 426111 BLAKE2B 6750ac064677bd1b2a2b49d37792b4e35c923ddd239c521490dd3aa0c40f55a96dcdac156a2511c3bb40605505beb920c66053488bb2bc2508899d4a81f77ddb SHA512 69d48701bdf419080b7acafe2b92c1897358d969d6ea5b78330969b79b9e393a1c53cfb1a17b4d58719329c403ac3a52a4e12828d99b8793d8dd19ddda151c76
 DIST defcon-0.10.1.tar.gz 426234 BLAKE2B 0d4f0749c061860603d343bd8d0291699a64794ec8f3f1e6f1cff0af0f22cd0cfc4ae60d578c5f55131d1de694b3234017afd124a4266c972217b39d70071473 SHA512 12cb1512321b91676f8be380999dfb00942eb8355389db409ef896f7e7100fc97186a920c1c0a741b660e57134e880d068446e5ad00e2768221f80a26608819c
diff --git a/dev-python/defcon/defcon-0.10.0-r1.ebuild b/dev-python/defcon/defcon-0.10.0-r1.ebuild
deleted file mode 100644
index f31eb8970a83..000000000000
--- a/dev-python/defcon/defcon-0.10.0-r1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# 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
-
-DESCRIPTION="A set of UFO based objects for use in font editing applications"
-HOMEPAGE="https://github.com/robotools/defcon"
-SRC_URI="https://github.com/robotools/defcon/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
-
-RDEPEND="
-	>=dev-python/fonttools-4.28.5[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? (
-		dev-python/fs[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
diff --git a/dev-python/defcon/defcon-0.10.1.ebuild b/dev-python/defcon/defcon-0.10.1.ebuild
index 6fe9142a097c..f3656f7e6977 100644
--- a/dev-python/defcon/defcon-0.10.1.ebuild
+++ b/dev-python/defcon/defcon-0.10.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/robotools/defcon/archive/${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86"
 
 RDEPEND="
 	>=dev-python/fonttools-4.28.5[${PYTHON_USEDEP}]
diff --git a/dev-python/eventlet/eventlet-0.33.1.ebuild b/dev-python/eventlet/eventlet-0.33.1.ebuild
index 8e4f270e3b5c..b93cbe89cb2e 100644
--- a/dev-python/eventlet/eventlet-0.33.1.ebuild
+++ b/dev-python/eventlet/eventlet-0.33.1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ppc ~ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="amd64 arm arm64 ppc ~ppc64 ~riscv ~s390 sparc x86"
 IUSE="examples"
 
 RDEPEND="
diff --git a/dev-python/gcs-oauth2-boto-plugin/Manifest b/dev-python/gcs-oauth2-boto-plugin/Manifest
index 210a637a8aef..2a6681a95916 100644
--- a/dev-python/gcs-oauth2-boto-plugin/Manifest
+++ b/dev-python/gcs-oauth2-boto-plugin/Manifest
@@ -1 +1,2 @@
 DIST gcs-oauth2-boto-plugin-2.7.tar.gz 20929 BLAKE2B 79db6c7bdf76320c2f74ab5edca0dd1cf7967bd38fb9a7a0a34c05fca3cab51317fb3ebd3e9ba195b42af2944cc951d150e3ee90cc93cdeab176f79d027a9800 SHA512 0ea8d4b01a2da79397e06de9dc0279594017e58e3874a2633b32007590efa2e8a29b5d2127d0218663cf7e63042adcc9801dbbb11bdfcb40d0c5d67c47267a09
+DIST gcs-oauth2-boto-plugin-3.0.tar.gz 20908 BLAKE2B 85c20d8b39dde8ed8a0bad887572040b8eb1eab91b41558c57ef7c190fff9cc5e0502579881a08ed514de87d5fe91a393779e2de071a53bb21e2371f8f13c047 SHA512 84cef64c2b0cc5e38685bb39b3939c54ceced2c0995a67787bf3541bf8a93b91ffec3da83094b7d6957d5afb60833c5ba4ffe7fb688ba8aa943c5f72c719e93b
diff --git a/dev-python/gcs-oauth2-boto-plugin/gcs-oauth2-boto-plugin-3.0.ebuild b/dev-python/gcs-oauth2-boto-plugin/gcs-oauth2-boto-plugin-3.0.ebuild
new file mode 100644
index 000000000000..2cad4aa7b3b7
--- /dev/null
+++ b/dev-python/gcs-oauth2-boto-plugin/gcs-oauth2-boto-plugin-3.0.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-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="OAuth 2.0 plugin for Google Cloud Storage credentials in the Boto library"
+HOMEPAGE="https://pypi.org/project/gcs-oauth2-boto-plugin/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+# Keep versions in sync with setup.py.
+BDEPEND="
+	test? ( dev-python/freezegun[${PYTHON_USEDEP}] )
+"
+RDEPEND="
+	${PYTHON_DEPS}
+	>=dev-python/boto-2.29.1[${PYTHON_USEDEP}]
+	>=dev-python/google-reauth-python-0.1.0[${PYTHON_USEDEP}]
+	>=dev-python/httplib2-0.18[${PYTHON_USEDEP}]
+	>=dev-python/oauth2client-2.2.0[${PYTHON_USEDEP}]
+	>=dev-python/pyopenssl-0.13[${PYTHON_USEDEP}]
+	>=dev-python/retry-decorator-1.0.0[${PYTHON_USEDEP}]
+	>=dev-python/six-1.12.0[${PYTHON_USEDEP}]
+"
+
+python_prepare_all() {
+	distutils-r1_python_prepare_all
+	# Make sure the unittests aren't installed.
+	mv gcs_oauth2_boto_plugin/test_oauth2_client.py ./ || die
+}
+
+python_test() {
+	"${EPYTHON}" "${S}"/test_oauth2_client.py -v \
+		|| die "tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/gmpy/gmpy-2.1.2-r1.ebuild b/dev-python/gmpy/gmpy-2.1.2-r1.ebuild
index be86e735b30b..60ea5f4b18ba 100644
--- a/dev-python/gmpy/gmpy-2.1.2-r1.ebuild
+++ b/dev-python/gmpy/gmpy-2.1.2-r1.ebuild
@@ -21,7 +21,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="LGPL-3+"
 SLOT="2"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 
 DEPEND="
 	>=dev-libs/mpc-1.0.2:=
diff --git a/dev-python/happybase/Manifest b/dev-python/happybase/Manifest
index 6c1b0e3212c6..a80401b18903 100644
--- a/dev-python/happybase/Manifest
+++ b/dev-python/happybase/Manifest
@@ -1 +1 @@
-DIST happybase-0.9_p20210701.tar.gz 106551 BLAKE2B 66e39d8db10b8b7adbab5b77462560d50a2a494e1cd9b0411abd1c928cb4b630e42ca0cc6740c35cc9a3b65dab8e637df6ae6d4105665fa21fa7668324c82ec5 SHA512 b55028e6fe8b1087e835b01d373af6357ecc495e82badda6bd1641d1d7ef79d5ec72d3336ca7112b5b6886d28b4a6296336c96b83ce58740ea5802c4f11ab12e
+DIST happybase-1.2.0.gh.tar.gz 43753 BLAKE2B 17c7762ca6268bbcfd1c379463a1f370aab354a526db2606e133b19c6b225e30561a079e22bee9f0232d74006c534d4c38d00ea1d651c93d94577dad9f60b0fe SHA512 0a93e390b854bdb047df8528aa6c19b3e0444c3d317feee4e2e0b8025792ece252422674d7b1feeb601b53966fec10e52593f2ad5119ec7f5e06128ad38ac2f6
diff --git a/dev-python/happybase/happybase-0.9_p20210701.ebuild b/dev-python/happybase/happybase-1.2.0.ebuild
index 42d47b98321c..d14273e2fede 100644
--- a/dev-python/happybase/happybase-0.9_p20210701.ebuild
+++ b/dev-python/happybase/happybase-1.2.0.ebuild
@@ -1,7 +1,7 @@
-# Copyright 2021 Gentoo Authors
+# Copyright 2021-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 PYTHON_COMPAT=( python3_{7,8,9,10} )
 inherit distutils-r1
@@ -10,8 +10,9 @@ COMMIT_HASH="f5b6d104140c2be93e4175c0c844aaf094eb43da"
 
 DESCRIPTION="A developer-friendly Python library to interact with Apache HBase"
 HOMEPAGE="https://github.com/python-happybase/happybase https://happybase.readthedocs.io/"
-SRC_URI="https://github.com/python-happybase/happybase/archive/${COMMIT_HASH}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${PN}-${COMMIT_HASH}"
+SRC_URI="
+	https://github.com/python-happybase/happybase/archive/${PV}.tar.gz -> ${P}.gh.tar.gz
+"
 
 LICENSE="MIT Apache-2.0"
 SLOT="0"
@@ -26,8 +27,3 @@ RDEPEND="
 RESTRICT="test"
 
 distutils_enable_tests pytest
-
-python_prepare_all() {
-	rm pytest.ini || die
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/jaraco-stream/jaraco-stream-3.0.3-r1.ebuild b/dev-python/jaraco-stream/jaraco-stream-3.0.3-r1.ebuild
index 227a63805e1e..8d7092b7ba8b 100644
--- a/dev-python/jaraco-stream/jaraco-stream-3.0.3-r1.ebuild
+++ b/dev-python/jaraco-stream/jaraco-stream-3.0.3-r1.ebuild
@@ -15,7 +15,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~riscv ~x86"
+KEYWORDS="amd64 ~riscv x86"
 
 BDEPEND="
 	>=dev-python/setuptools_scm-1.15.0[${PYTHON_USEDEP}]
diff --git a/dev-python/jaraco-stream/jaraco-stream-3.0.3.ebuild b/dev-python/jaraco-stream/jaraco-stream-3.0.3.ebuild
deleted file mode 100644
index 3ea147849e1b..000000000000
--- a/dev-python/jaraco-stream/jaraco-stream-3.0.3.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{7,8,9,10} pypy3 )
-inherit distutils-r1
-
-MY_P=${P/-/.}
-DESCRIPTION="Routines for handling streaming data"
-HOMEPAGE="https://github.com/jaraco/jaraco.stream"
-SRC_URI="mirror://pypi/${MY_P::1}/${PN/-/.}/${MY_P}.tar.gz"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~riscv x86"
-
-BDEPEND="
-	>=dev-python/setuptools_scm-1.15.0[${PYTHON_USEDEP}]
-	test? (
-		dev-python/more-itertools[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs \
-	">=dev-python/jaraco-packaging-3.2" \
-	">=dev-python/rst-linker-1.9"
-distutils_enable_tests pytest
diff --git a/dev-python/lazy-object-proxy/lazy-object-proxy-1.7.1-r1.ebuild b/dev-python/lazy-object-proxy/lazy-object-proxy-1.7.1-r1.ebuild
index 44d6124facda..1ef75236c1f5 100644
--- a/dev-python/lazy-object-proxy/lazy-object-proxy-1.7.1-r1.ebuild
+++ b/dev-python/lazy-object-proxy/lazy-object-proxy-1.7.1-r1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 
 BDEPEND="
 	dev-python/setuptools_scm[${PYTHON_USEDEP}]
diff --git a/dev-python/mccabe/mccabe-0.7.0.ebuild b/dev-python/mccabe/mccabe-0.7.0.ebuild
index ec6e1d615e84..1cc271398a74 100644
--- a/dev-python/mccabe/mccabe-0.7.0.ebuild
+++ b/dev-python/mccabe/mccabe-0.7.0.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="flake8 plugin: McCabe complexity checker"
 HOMEPAGE="https://github.com/PyCQA/mccabe"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 LICENSE="MIT"
 SLOT="0"
 
diff --git a/dev-python/pybind11/pybind11-2.9.2-r1.ebuild b/dev-python/pybind11/pybind11-2.9.2-r1.ebuild
index f68fbea145ef..d9f39cdd9b26 100644
--- a/dev-python/pybind11/pybind11-2.9.2-r1.ebuild
+++ b/dev-python/pybind11/pybind11-2.9.2-r1.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 RDEPEND="
 	dev-cpp/eigen:3
diff --git a/dev-python/pycurl/pycurl-7.44.1-r1.ebuild b/dev-python/pycurl/pycurl-7.44.1-r1.ebuild
index 8f173b1bb56b..ddb45e576168 100644
--- a/dev-python/pycurl/pycurl-7.44.1-r1.ebuild
+++ b/dev-python/pycurl/pycurl-7.44.1-r1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="curl_ssl_gnutls curl_ssl_nss +curl_ssl_openssl examples ssl test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/pynacl/pynacl-1.5.0-r1.ebuild b/dev-python/pynacl/pynacl-1.5.0-r1.ebuild
index 72e072030424..d41ab9439630 100644
--- a/dev-python/pynacl/pynacl-1.5.0-r1.ebuild
+++ b/dev-python/pynacl/pynacl-1.5.0-r1.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	dev-python/six[${PYTHON_USEDEP}]
diff --git a/dev-python/pyroute2/Manifest b/dev-python/pyroute2/Manifest
index e997e6d6e5c2..9109b75b72ca 100644
--- a/dev-python/pyroute2/Manifest
+++ b/dev-python/pyroute2/Manifest
@@ -1 +1,2 @@
 DIST pyroute2-0.5.14.tar.gz 436853 BLAKE2B 9febcd6563d89b5ffd71342d8d83a3251494f978ad4449532b568cf0929c9f3d8d8d36e1a0b0f6733013e12f6322aea46d991a22f5c3fa93e47dfa08376ddd13 SHA512 9601cf8133b703c55770b6292cca1e907a029689aaeb350b6eee40406b56de5563ee0ba37b4814540c365a5974be78a024dcb27bc7ee00eac74676f4013cf277
+DIST pyroute2-0.5.19.gh.tar.gz 457432 BLAKE2B ffb2717c60badb1453eeb15f5b83f1494e851ee011fcdebd3a5d249ecc4bea7064069a1af2fe2d34aefe9812c8b6808b8a14cbe518383c165b0b008d10505c5c SHA512 19b0acbff17415acad20a214e0622ca9a3fc51b92e603ab15663ea7e8da290fc0b2033aeca1c20200307e34173802f89998151f77d5bcfc5f87eb8b42ba591ce
diff --git a/dev-python/pyroute2/files/pyroute2-0.5.19-exclude-tests.patch b/dev-python/pyroute2/files/pyroute2-0.5.19-exclude-tests.patch
new file mode 100644
index 000000000000..723c638349b7
--- /dev/null
+++ b/dev-python/pyroute2/files/pyroute2-0.5.19-exclude-tests.patch
@@ -0,0 +1,13 @@
+Index: pyroute2-0.5.19/setup.cfg
+===================================================================
+--- pyroute2-0.5.19.orig/setup.cfg
++++ pyroute2-0.5.19/setup.cfg
+@@ -35,5 +35,8 @@ packages_dir =
+     =pyroute2
+ packages = find:
+ 
++[options.packages.find]
++exclude = tests
++
+ [options.extras_require]
+ ss2 = psutil~=5.0
diff --git a/dev-python/pyroute2/metadata.xml b/dev-python/pyroute2/metadata.xml
index 7b4ccb096e4f..28c89949480b 100644
--- a/dev-python/pyroute2/metadata.xml
+++ b/dev-python/pyroute2/metadata.xml
@@ -2,12 +2,12 @@
 <!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
  <maintainer type="person">
-  <email>prometheanfire@gentoo.org</email>
-  <name>Matthew Thode</name>
+  <email>henning@hennsch.de</email>
+  <name>Henning Schild</name>
  </maintainer>
  <maintainer type="project">
-  <email>openstack@gentoo.org</email>
-  <name>Openstack</name>
+  <email>proxy-maint@gentoo.org</email>
+  <name>Proxy Maintainers</name>
  </maintainer>
  
  <origin>gentoo-staging</origin>
diff --git a/dev-python/pyroute2/pyroute2-0.5.19.ebuild b/dev-python/pyroute2/pyroute2-0.5.19.ebuild
new file mode 100644
index 000000000000..d101c14594b8
--- /dev/null
+++ b/dev-python/pyroute2/pyroute2-0.5.19.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{7,8,9,10} pypy3 )
+PYTHON_REQ_USE="sqlite"
+
+inherit distutils-r1
+
+DESCRIPTION="A pure Python netlink and Linux network configuration library"
+HOMEPAGE="https://github.com/svinota/pyroute2"
+SRC_URI="
+	https://github.com/svinota/${PN}/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+PATCHES=(
+	"${FILESDIR}/${P}-exclude-tests.patch"
+)
+
+# tests need root access
+RESTRICT="test"
diff --git a/dev-python/pyrsistent/pyrsistent-0.18.1-r1.ebuild b/dev-python/pyrsistent/pyrsistent-0.18.1-r1.ebuild
index 2191ab84d682..0fd7aa6698ce 100644
--- a/dev-python/pyrsistent/pyrsistent-0.18.1-r1.ebuild
+++ b/dev-python/pyrsistent/pyrsistent-0.18.1-r1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/python-ldap/python-ldap-3.4.0_p20220420.ebuild b/dev-python/python-ldap/python-ldap-3.4.0_p20220420.ebuild
index 76b497b1a445..952518beabf6 100644
--- a/dev-python/python-ldap/python-ldap-3.4.0_p20220420.ebuild
+++ b/dev-python/python-ldap/python-ldap-3.4.0_p20220420.ebuild
@@ -24,7 +24,7 @@ else
 	SRC_URI="https://github.com/python-ldap/python-ldap/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}"/${PN}-${MY_COMMIT}
 
-	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86 ~x86-solaris"
+	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ppc64 ~riscv ~sparc x86 ~x86-solaris"
 fi
 
 LICENSE="MIT PSF-2"
diff --git a/dev-python/python-utils/Manifest b/dev-python/python-utils/Manifest
index d622857f6f6e..b4c9779b8b92 100644
--- a/dev-python/python-utils/Manifest
+++ b/dev-python/python-utils/Manifest
@@ -1,6 +1 @@
-DIST python-utils-3.1.0.tar.gz 24251 BLAKE2B c00f4c45480f0948cddfa65d4f1ce17ac6831e29b24913d225544619ebedaca67c0f143b55698f8e2edd658e5f90ac39e005a5c29e09d75b5643f79992ba878a SHA512 e22ea0dc7aa0e6c5b45c55843011971c5075639424d38a712703b0d5ef8af32e3661d39af63b6015c4edfe11fca7a256f4f02c3705e1724fe8b9015931d85cbf
-DIST python-utils-3.2.2.tar.gz 25202 BLAKE2B ae36d918bfd125ed1c01a71f8b448390b70071eca8c404f2ce89312c0de8296b29026cd72baa1eeba940d84e2f0b5275ea0ee96735fdecd1b7fb8f5d42ac1b57 SHA512 cd3a9efbd71e33a343de4793c1b415129fbe280ea6b6bc40e84fc1ada7d409139d8bef6c7e2954ef6cd3b9407d817b07a61093d1a8b9de70f6af0b6aba3ebc8d
-DIST python-utils-3.2.3.tar.gz 25153 BLAKE2B b4e65b647b42288111edc7a90f7c1b1c3a222a999edacc2f0764e378f7c5f0b5c512842d73ea9f2e70052ba43ac48f9eb914a8a410b564bcd965c357672eda57 SHA512 85f1607faacf210c8e377a438c5d2f66e237cc870a91a9ed1ec7150aa8a7bb8f8fd5b3b0fb5e9585afb81801e7048f92b7ea46943205ddd9e271d6087b5e05d5
-DIST python-utils-3.3.0.tar.gz 27537 BLAKE2B 95570896c9a96161f0bcd2966ab8ffe8cf29ef29d50b8103ed6d0df4824aa3cbb6058d2b1d58b0ab98033775c5ea522c962bded2fd48b156bb57d686c8c872b0 SHA512 94a6ba6d303990cfd976d5676b5383df672d775385327e342b938483033fbd12fc75ce75afc6b66dd9fbf729d13e2a695246cc6a48073f579eeb7c0c82c7730e
-DIST python-utils-3.3.1.tar.gz 27565 BLAKE2B 79e865342d57ee1a841d9f17f26a26586ab477f5b7538ce514091f2c1f6d9054b34b8642ebc0f3555abdf696f74ce1473d80365844819829b9d8be37d1cc58f0 SHA512 d2c91f50999b3706696c161abd1f3bee5e39cb5078daa8d4604ad9c9905a02a221d0ffb7ae57bdb7c278b8d0c14c763d613305bf3371cb01adf4075ae55fd4f4
 DIST python-utils-3.3.3.tar.gz 28031 BLAKE2B d491e5ba1c8e2ab8d7c7797757cb6163f5f4cff223b898b4a9502f85b740df3c128234fd0034fc422d17efb38cfc7056aa7fb3aee9441f1f763fc742930da5b3 SHA512 6becb1873da57f66aec26b98dab22c7917dacddd1a843a0c6e4f2939986a33888cb3b6addfa3b98660f9f35ca54763cf6da34e4099cd3e21987660f12a574b27
diff --git a/dev-python/python-utils/python-utils-3.1.0.ebuild b/dev-python/python-utils/python-utils-3.1.0.ebuild
deleted file mode 100644
index 230b03b9670a..000000000000
--- a/dev-python/python-utils/python-utils-3.1.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{7,8,9,10} pypy3 )
-inherit distutils-r1
-
-DESCRIPTION="Collection of small Python functions & classes"
-HOMEPAGE="https://pypi.org/project/python-utils/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-
-BDEPEND="test? ( dev-python/pytest-asyncio[${PYTHON_USEDEP}] )"
-
-distutils_enable_tests pytest
-
-EPYTEST_IGNORE=(
-	docs
-)
-
-python_prepare_all() {
-	sed -i -e '/--cov/d' -e '/--mypy/d' pytest.ini || die
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/python-utils/python-utils-3.2.2.ebuild b/dev-python/python-utils/python-utils-3.2.2.ebuild
deleted file mode 100644
index e51c7aa0ebd5..000000000000
--- a/dev-python/python-utils/python-utils-3.2.2.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# 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="Collection of small Python functions & classes"
-HOMEPAGE="
-	https://github.com/WoLpH/python-utils/
-	https://pypi.org/project/python-utils/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-BDEPEND="
-	test? (
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_IGNORE=(
-	docs
-	_python_utils_tests/test_logger.py
-	python_utils/loguru.py
-)
-
-python_prepare_all() {
-	sed -i -e '/--cov/d' -e '/--mypy/d' pytest.ini || die
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/python-utils/python-utils-3.2.3.ebuild b/dev-python/python-utils/python-utils-3.2.3.ebuild
deleted file mode 100644
index e51c7aa0ebd5..000000000000
--- a/dev-python/python-utils/python-utils-3.2.3.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# 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="Collection of small Python functions & classes"
-HOMEPAGE="
-	https://github.com/WoLpH/python-utils/
-	https://pypi.org/project/python-utils/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-BDEPEND="
-	test? (
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_IGNORE=(
-	docs
-	_python_utils_tests/test_logger.py
-	python_utils/loguru.py
-)
-
-python_prepare_all() {
-	sed -i -e '/--cov/d' -e '/--mypy/d' pytest.ini || die
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/python-utils/python-utils-3.3.0.ebuild b/dev-python/python-utils/python-utils-3.3.0.ebuild
deleted file mode 100644
index e51c7aa0ebd5..000000000000
--- a/dev-python/python-utils/python-utils-3.3.0.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# 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="Collection of small Python functions & classes"
-HOMEPAGE="
-	https://github.com/WoLpH/python-utils/
-	https://pypi.org/project/python-utils/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-BDEPEND="
-	test? (
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_IGNORE=(
-	docs
-	_python_utils_tests/test_logger.py
-	python_utils/loguru.py
-)
-
-python_prepare_all() {
-	sed -i -e '/--cov/d' -e '/--mypy/d' pytest.ini || die
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/python-utils/python-utils-3.3.1.ebuild b/dev-python/python-utils/python-utils-3.3.1.ebuild
deleted file mode 100644
index e51c7aa0ebd5..000000000000
--- a/dev-python/python-utils/python-utils-3.3.1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# 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="Collection of small Python functions & classes"
-HOMEPAGE="
-	https://github.com/WoLpH/python-utils/
-	https://pypi.org/project/python-utils/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-BDEPEND="
-	test? (
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_IGNORE=(
-	docs
-	_python_utils_tests/test_logger.py
-	python_utils/loguru.py
-)
-
-python_prepare_all() {
-	sed -i -e '/--cov/d' -e '/--mypy/d' pytest.ini || die
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/python-utils/python-utils-3.3.3.ebuild b/dev-python/python-utils/python-utils-3.3.3.ebuild
index e51c7aa0ebd5..f2cdf49d625d 100644
--- a/dev-python/python-utils/python-utils-3.3.3.ebuild
+++ b/dev-python/python-utils/python-utils-3.3.3.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/pyx/metadata.xml b/dev-python/pyx/metadata.xml
index 7293f5075e26..0ebcced622c6 100644
--- a/dev-python/pyx/metadata.xml
+++ b/dev-python/pyx/metadata.xml
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
+ <maintainer type="person">
+  <email>grozin@gentoo.org</email>
+  <name>Andrey Grozin</name>
+ </maintainer>
  <maintainer type="project">
   <email>python@gentoo.org</email>
   <name>Python</name>
diff --git a/dev-python/pyyaml/pyyaml-6.0-r1.ebuild b/dev-python/pyyaml/pyyaml-6.0-r1.ebuild
index feb2eea8c387..097422228981 100644
--- a/dev-python/pyyaml/pyyaml-6.0-r1.ebuild
+++ b/dev-python/pyyaml/pyyaml-6.0-r1.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
 IUSE="examples"
 
 DEPEND="
diff --git a/dev-python/shiboken2/shiboken2-5.15.2-r1.ebuild b/dev-python/shiboken2/shiboken2-5.15.2-r1.ebuild
index 55658a6f35b3..29b7c2f7420d 100644
--- a/dev-python/shiboken2/shiboken2-5.15.2-r1.ebuild
+++ b/dev-python/shiboken2/shiboken2-5.15.2-r1.ebuild
@@ -77,7 +77,7 @@ src_prepare() {
 	# Shiboken2 assumes Vulkan headers live under either "$VULKAN_SDK/include"
 	# or "$VK_SDK_PATH/include" rather than "${EPREFIX}/usr/include/vulkan".
 	if use vulkan; then
-		sed -i -e 's~\bdetectVulkan(&headerPaths);~headerPaths.append(HeaderPath{QByteArrayLiteral("'${EPREFIX}'/usr/include/vulkan"), HeaderType::System});~' \
+		sed -i -e "s~\bdetectVulkan(&headerPaths);~headerPaths.append(HeaderPath{QByteArrayLiteral(\"${EPREFIX}/usr/include/vulkan\"), HeaderType::System});~" \
 			ApiExtractor/clangparser/compilersupport.cpp || die
 	fi
 
@@ -96,7 +96,7 @@ src_prepare() {
 	# PySide2 does *NOT* care whether the end user has done so or not, as
 	# PySide2 unconditionally requires Clang in either case. See also:
 	#     https://bugs.gentoo.org/619490
-	sed -i -e 's~(findClangBuiltInIncludesDir())~(QStringLiteral("'${EPREFIX}'/usr/lib/clang/'$(CPP=clang clang-fullversion)'/include"))~' \
+	sed -i -e 's~(findClangBuiltInIncludesDir())~(QStringLiteral("'"${EPREFIX}"'/usr/lib/clang/'$(CPP=clang clang-fullversion)'/include"))~' \
 		ApiExtractor/clangparser/compilersupport.cpp || die
 
 	cmake_src_prepare
diff --git a/dev-python/sphinx/Manifest b/dev-python/sphinx/Manifest
index eba82d499de6..b77dfed25072 100644
--- a/dev-python/sphinx/Manifest
+++ b/dev-python/sphinx/Manifest
@@ -1,3 +1,4 @@
 DIST Sphinx-4.5.0.tar.gz 6698212 BLAKE2B e6c46d35492c3d3068c4f97e497d33973ca86b40934578804fcec901fa89d2c52b45a7546b835b873846dd16936c1bd34a7b053aec8206c688d974671155fd56 SHA512 b44d2a81ed67adaefe16a07ae0cf053b5e6c775023aaa6c57d7b3950f171deac410e8004f787b151c3c2fc350650aa69a4dc2dc7239d1fd3d351e5194617cb2c
 DIST Sphinx-5.0.0.tar.gz 6726986 BLAKE2B 95f2b85c7de6d900922730c3e431259e2333b3fe27e25cbe35e9584ccf1ac3442ca0949018e64ca8481e60f2298b46f6a77523a7a67e6aafe7492b62ff97aa70 SHA512 6b58427aa8a4d9e159f5b84366ab2193df5a9e940c9cb11b440dabd2c32dcdbadbb7eddbd9f6f8c53e577bf7bfb7c11f979835b5df75139b5c5315f88794871f
 DIST Sphinx-5.0.1.tar.gz 6728011 BLAKE2B fe75d6bae6c035ee8ce24e3edb8ed8df9973835bdc935170775a7e80e1420bb0dee31976343dd0c3791508cc944f7b9ea44793569a94dc03756ab02d313e26d6 SHA512 6a850860fd7a320c49f2d406c511d1e7e2fc0e044911f98be3a07b1d519e79d57cd2d16c0042926255323625f186a26509772b425611fea85dfbeaae7e8e06c1
+DIST Sphinx-5.0.2.tar.gz 6729086 BLAKE2B a2cbf8efca673d15e364d0db74a8c5e2c0ff469f2a102317fb9bf23aac12c12ced2593e3a5e2dd0ee2bc114f2018356d382d601a3c7ff9b2943e38b59fe45db4 SHA512 d564697f0b82a9a59dd6a81e7822dbeac00fb6cc98cdc2422f04ec87c5133b5e03057ccdfdcfe38dccff41f6c53262d49f4ee6f77047c579aa2e55370bfe2dc6
diff --git a/dev-python/sphinx/sphinx-5.0.2.ebuild b/dev-python/sphinx/sphinx-5.0.2.ebuild
new file mode 100644
index 000000000000..ed31ba692c8d
--- /dev/null
+++ b/dev-python/sphinx/sphinx-5.0.2.ebuild
@@ -0,0 +1,122 @@
+# 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 )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+MY_P=${P^}
+DESCRIPTION="Python documentation generator"
+HOMEPAGE="
+	https://www.sphinx-doc.org/
+	https://github.com/sphinx-doc/sphinx/
+	https://pypi.org/project/Sphinx/
+"
+SRC_URI="mirror://pypi/${MY_P::1}/${PN^}/${MY_P}.tar.gz"
+S="${WORKDIR}"/${MY_P}
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="doc latex"
+
+RDEPEND="
+	<dev-python/alabaster-0.8[${PYTHON_USEDEP}]
+	>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
+	<dev-python/docutils-0.19[${PYTHON_USEDEP}]
+	dev-python/imagesize[${PYTHON_USEDEP}]
+	>=dev-python/jinja-2.3[${PYTHON_USEDEP}]
+	>=dev-python/pygments-2.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.5.0[${PYTHON_USEDEP}]
+	>=dev-python/snowballstemmer-1.1[${PYTHON_USEDEP}]
+	dev-python/sphinxcontrib-applehelp[${PYTHON_USEDEP}]
+	dev-python/sphinxcontrib-devhelp[${PYTHON_USEDEP}]
+	dev-python/sphinxcontrib-jsmath[${PYTHON_USEDEP}]
+	>=dev-python/sphinxcontrib-htmlhelp-2.0.0[${PYTHON_USEDEP}]
+	>=dev-python/sphinxcontrib-serializinghtml-1.1.5[${PYTHON_USEDEP}]
+	dev-python/sphinxcontrib-qthelp[${PYTHON_USEDEP}]
+	dev-python/packaging[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/importlib_metadata-4.4[${PYTHON_USEDEP}]
+	' 3.8 3.9)
+	latex? (
+		dev-texlive/texlive-latexextra
+		dev-texlive/texlive-luatex
+		app-text/dvipng
+	)
+	!dev-python/namespace-sphinxcontrib
+"
+BDEPEND="
+	doc? (
+		dev-python/sphinxcontrib-websupport[${PYTHON_USEDEP}]
+		media-gfx/graphviz
+	)
+	test? (
+		dev-python/html5lib[${PYTHON_USEDEP}]
+		virtual/imagemagick-tools[jpeg,png,svg]
+		dev-texlive/texlive-fontsextra
+		dev-texlive/texlive-latexextra
+		dev-texlive/texlive-luatex
+		app-text/dvipng
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/sphinx-3.2.1-doc-link.patch"
+	"${FILESDIR}/sphinx-4.3.2-doc-link.patch"
+)
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# disable internet access
+	sed -i -e 's:^intersphinx_mapping:disabled_&:' \
+		doc/conf.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	if use doc; then
+		esetup.py build_sphinx
+		HTML_DOCS=( "${BUILD_DIR}"/sphinx/html/. )
+	fi
+}
+
+python_test() {
+	mkdir -p "${BUILD_DIR}/sphinx_tempdir" || die
+	local -x SPHINX_TEST_TEMPDIR="${BUILD_DIR}/sphinx_tempdir"
+
+	local EPYTEST_DESELECT=(
+		# these tests require Internet access
+		tests/test_build_latex.py::test_latex_images
+		tests/test_build_linkcheck.py::test_defaults
+		tests/test_build_linkcheck.py::test_defaults_json
+		tests/test_build_linkcheck.py::test_anchors_ignored
+		# TODO
+		tests/test_ext_autodoc_autoclass.py::test_classes
+		tests/test_ext_autodoc_autofunction.py::test_classes
+	)
+	[[ ${EPYTHON} == pypy3 ]] && EPYTEST_DESELECT+=(
+		tests/test_ext_autodoc.py::test_autodoc_inherited_members_None
+		tests/test_ext_autodoc.py::test_automethod_for_builtin
+		tests/test_ext_autodoc.py::test_cython
+		tests/test_ext_autodoc.py::test_partialfunction
+		tests/test_ext_autodoc_autoclass.py::test_autodoc_process_bases
+		tests/test_ext_autodoc_autoclass.py::test_show_inheritance_for_decendants_of_generic_type
+		tests/test_ext_autodoc_autoclass.py::test_show_inheritance_for_subclass_of_generic_type
+		tests/test_ext_autodoc_autofunction.py::test_builtin_function
+		tests/test_ext_autodoc_autofunction.py::test_methoddescriptor
+		tests/test_ext_autodoc_automodule.py::test_automodule_inherited_members
+		tests/test_ext_autosummary.py::test_autosummary_generate_content_for_module
+		tests/test_ext_autosummary.py::test_autosummary_generate_content_for_module_skipped
+		tests/test_util_inspect.py::test_isattributedescriptor
+		tests/test_util_typing.py::test_stringify_type_hints_pep_585
+	)
+
+	epytest
+}
diff --git a/dev-python/thriftpy2/Manifest b/dev-python/thriftpy2/Manifest
index e844d9323692..907734570ece 100644
--- a/dev-python/thriftpy2/Manifest
+++ b/dev-python/thriftpy2/Manifest
@@ -1 +1 @@
-DIST thriftpy2-0.4.14.tar.gz 127552 BLAKE2B 4061642fb14b60ba53e0c4e6342ead25f781ee923b718a6c557235fcbfe4219b4d8944894afe9783062e7950b689b909af6be5cefe3b634a476ec582adfefbed SHA512 0b248c4999b0a97287d8db3e5b79ac687bc7e25a5478ef125b479e0baf9be9d0aa5f9eaadf0612c228133295743ba913bfe69e7fe59a8d5f854a682da9d31c50
+DIST thriftpy2-0.4.14.gh.tar.gz 127552 BLAKE2B 4061642fb14b60ba53e0c4e6342ead25f781ee923b718a6c557235fcbfe4219b4d8944894afe9783062e7950b689b909af6be5cefe3b634a476ec582adfefbed SHA512 0b248c4999b0a97287d8db3e5b79ac687bc7e25a5478ef125b479e0baf9be9d0aa5f9eaadf0612c228133295743ba913bfe69e7fe59a8d5f854a682da9d31c50
diff --git a/dev-python/thriftpy2/thriftpy2-0.4.14.ebuild b/dev-python/thriftpy2/thriftpy2-0.4.14-r1.ebuild
index a302eff18026..198c62ff548c 100644
--- a/dev-python/thriftpy2/thriftpy2-0.4.14.ebuild
+++ b/dev-python/thriftpy2/thriftpy2-0.4.14-r1.ebuild
@@ -1,14 +1,14 @@
-# Copyright 2021 Gentoo Authors
+# Copyright 2021-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 PYTHON_COMPAT=( python3_{7,8,9,10} )
 inherit distutils-r1
 
 DESCRIPTION="Pure python approach of Apache Thrift"
 HOMEPAGE="https://github.com/Thriftpy/thriftpy2"
-SRC_URI="https://github.com/Thriftpy/thriftpy2/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/Thriftpy/thriftpy2/archive/refs/tags/v${PV}.tar.gz -> ${P}.gh.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
@@ -27,7 +27,8 @@ BDEPEND="
 distutils_enable_tests --install pytest
 
 python_prepare_all() {
-	rm tests/test_tornado.py || die
+	# tests that need network access
+	rm tests/test_{tornado,rpc,sslsocket}.py || die
 	distutils-r1_python_prepare_all
 }
 
diff --git a/dev-python/uritemplate/uritemplate-4.1.1.ebuild b/dev-python/uritemplate/uritemplate-4.1.1.ebuild
index b4e4f4f77a3b..57b7e9240c45 100644
--- a/dev-python/uritemplate/uritemplate-4.1.1.ebuild
+++ b/dev-python/uritemplate/uritemplate-4.1.1.ebuild
@@ -18,6 +18,6 @@ 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"
+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/watchdog/watchdog-2.1.8.ebuild b/dev-python/watchdog/watchdog-2.1.8.ebuild
index 33481f974c95..a006cd03d97f 100644
--- a/dev-python/watchdog/watchdog-2.1.8.ebuild
+++ b/dev-python/watchdog/watchdog-2.1.8.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ppc ~ppc64 ~riscv ~s390 sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	dev-python/pyyaml[${PYTHON_USEDEP}]
diff --git a/dev-python/whoosh/metadata.xml b/dev-python/whoosh/metadata.xml
index e42c616f4dd7..35567c209514 100644
--- a/dev-python/whoosh/metadata.xml
+++ b/dev-python/whoosh/metadata.xml
@@ -18,4 +18,5 @@
 	</longdescription>
  
  <origin>gentoo-staging</origin>
+ <stabilize-allarches/>
 </pkgmetadata>
\ No newline at end of file
diff --git a/dev-python/whoosh/whoosh-2.7.4-r2.ebuild b/dev-python/whoosh/whoosh-2.7.4-r2.ebuild
index abf9921c45df..11e042e4c593 100644
--- a/dev-python/whoosh/whoosh-2.7.4-r2.ebuild
+++ b/dev-python/whoosh/whoosh-2.7.4-r2.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${P^}"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-solaris"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-2.7.4-tests-specify-utf8.patch
diff --git a/dev-python/wrapt/wrapt-1.14.1.ebuild b/dev-python/wrapt/wrapt-1.14.1.ebuild
index 4508e812b0bf..978d5b2c1f0a 100644
--- a/dev-python/wrapt/wrapt-1.14.1.ebuild
+++ b/dev-python/wrapt/wrapt-1.14.1.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 
 distutils_enable_tests pytest
 distutils_enable_sphinx docs dev-python/sphinx_rtd_theme
diff --git a/dev-python/yarl/yarl-1.7.2-r3.ebuild b/dev-python/yarl/yarl-1.7.2-r3.ebuild
index cd64f133ff31..092cfa1be3a7 100644
--- a/dev-python/yarl/yarl-1.7.2-r3.ebuild
+++ b/dev-python/yarl/yarl-1.7.2-r3.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 
 RDEPEND="
 	>=dev-python/multidict-4.0[${PYTHON_USEDEP}]
diff --git a/dev-python/yaxmldiff/Manifest b/dev-python/yaxmldiff/Manifest
new file mode 100644
index 000000000000..bd082e210f10
--- /dev/null
+++ b/dev-python/yaxmldiff/Manifest
@@ -0,0 +1 @@
+DIST yaxmldiff-0.1.0.gh.tar.gz 8938 BLAKE2B 9fd9b9ede1d5c28c7d5a47967748de411dbc56b0191c4bcb7f2ee6270093523172497d470c6b99e87ccf50c8a70310500b103ecc3d28a49046f09c70055564b0 SHA512 3b853edd13a95f92d82f563d784d30df4f2876d0a9bf89ad67b3e53228a908fe32407386c221725b30668ac2b98be98623a2fb6da8e268380ee586b49e5ae78e
diff --git a/dev-python/yaxmldiff/metadata.xml b/dev-python/yaxmldiff/metadata.xml
new file mode 100644
index 000000000000..0f2e57ded13c
--- /dev/null
+++ b/dev-python/yaxmldiff/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+  <email>chutzpah@gentoo.org</email>
+  <name>Patrick McLean</name>
+ </maintainer>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
\ No newline at end of file
diff --git a/dev-python/yaxmldiff/yaxmldiff-0.1.0.ebuild b/dev-python/yaxmldiff/yaxmldiff-0.1.0.ebuild
new file mode 100644
index 000000000000..7b76a22b3e53
--- /dev/null
+++ b/dev-python/yaxmldiff/yaxmldiff-0.1.0.ebuild
@@ -0,0 +1,34 @@
+# 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} pypy3 )
+inherit distutils-r1
+
+DESCRIPTION="Yet Another XML Differ"
+HOMEPAGE="
+	https://pypi.org/project/yaxmldiff/
+	https://github.com/latk/yaxmldiff.py
+"
+SRC_URI="https://github.com/latk/${PN}.py/archive/refs/tags/v${PV}.tar.gz -> ${P}.gh.tar.gz"
+S="${WORKDIR}/${PN}.py-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-python/lxml[${PYTHON_USEDEP}]
+"
+
+# no tests currently
+RESTRICT="test"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	sed -i '/license_file/ d' setup.cfg || die
+	distutils-r1_python_prepare_all
+}