Adding metadata

42 files changed, 297 insertions, 291 deletions

diff --git a/dev-python/Levenshtein/Levenshtein-0.20.8.ebuild b/dev-python/Levenshtein/Levenshtein-0.20.8.ebuild
index c6536a889e72..88a4b8e0fc05 100644
--- a/dev-python/Levenshtein/Levenshtein-0.20.8.ebuild
+++ b/dev-python/Levenshtein/Levenshtein-0.20.8.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~riscv"
+KEYWORDS="~amd64 ~arm ~riscv"
 
 DEPEND="
 	>=dev-cpp/rapidfuzz-cpp-1.7.0
diff --git a/dev-python/QtPy/QtPy-2.2.0.ebuild b/dev-python/QtPy/QtPy-2.2.0.ebuild
index e88218f30e6a..fe20b931140b 100644
--- a/dev-python/QtPy/QtPy-2.2.0.ebuild
+++ b/dev-python/QtPy/QtPy-2.2.0.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~riscv"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
 
 _IUSE_QT_MODULES="
 	designer +gui help multimedia +network opengl positioning
diff --git a/dev-python/QtPy/QtPy-2.2.1.ebuild b/dev-python/QtPy/QtPy-2.2.1.ebuild
index 9727d06e9008..545f338a704f 100644
--- a/dev-python/QtPy/QtPy-2.2.1.ebuild
+++ b/dev-python/QtPy/QtPy-2.2.1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~riscv"
+KEYWORDS="amd64 ~arm ~arm64 ~riscv ~x86"
 
 _IUSE_QT_MODULES="
 	designer +gui help multimedia +network opengl positioning
diff --git a/dev-python/autopep8/Manifest b/dev-python/autopep8/Manifest
index 9ac5d03cf508..5751bc12e9d1 100644
--- a/dev-python/autopep8/Manifest
+++ b/dev-python/autopep8/Manifest
@@ -1,2 +1,2 @@
-DIST autopep8-1.7.0.tar.gz 117055 BLAKE2B 36e2789551eb671b0bc7481742d9edf25aa622bd3f605fb2491195c45f7630378116e4b0bffb536cf7596b3b1c5ea695796259b944a886d55f05c9891e280d0c SHA512 e93ddf90ff989af71790f70f7e7101f7cc60890c8a976552a097c13b0a0e10c16dfd8770214b19d7fabd59403e6d87a9a37d75a2c6f3ed27f8c82a7d8da95dad
 DIST autopep8-1.7.1.tar.gz 117449 BLAKE2B 27bfdc58f647f3f2a7c3945f7faee152667e1dffc13c2b4a5af1f74e7d544c21d1472dc34c797818ca45fccae9f53e7a333c71b52b825b0fb97b50f12567889b SHA512 7a4a8ebf0bacd781fdf7ae32a34bd64f5b6ba9e8ccef5709799cefe5e5bc24da47f36ea49092e26a7c3e254bbea5d6feaeca38f64ffc3fe440307b1331be4766
+DIST autopep8-2.0.0.tar.gz 117507 BLAKE2B 8722b19454f47d0b960e3cc0e18ff3d6150ead009630047ecd1ce9001ea6f6d68595f80d7ad1087bddd2993e95d0634d63495b1d43dee095d114535bf632d1bf SHA512 883b79f7011a374a2ef88073a45748268a20449a3bc8da519c036c71700352dd8c4accc60fcb592f1a53ceac06984fcbe6ede8a272bc718c2b79873be5f35dd8
diff --git a/dev-python/autopep8/autopep8-1.7.0.ebuild b/dev-python/autopep8/autopep8-2.0.0.ebuild
index c935ff2ab530..2788c50132ad 100644
--- a/dev-python/autopep8/autopep8-1.7.0.ebuild
+++ b/dev-python/autopep8/autopep8-2.0.0.ebuild
@@ -16,9 +16,7 @@ LICENSE="MIT"
 SLOT="0"
 IUSE="test"
 
-RDEPEND="
-	>=dev-python/pycodestyle-2.7.0[${PYTHON_USEDEP}]
-	>=dev-python/pycodestyle-2.5.0[${PYTHON_USEDEP}]"
+RDEPEND=">=dev-python/pycodestyle-2.7.0[${PYTHON_USEDEP}]"
 
 DEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/cairocffi/cairocffi-1.4.0.ebuild b/dev-python/cairocffi/cairocffi-1.4.0.ebuild
index f4106a458f1d..ce67513a4922 100644
--- a/dev-python/cairocffi/cairocffi-1.4.0.ebuild
+++ b/dev-python/cairocffi/cairocffi-1.4.0.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
 
 RDEPEND="
 	$(python_gen_cond_dep '
diff --git a/dev-python/dict2xml/Manifest b/dev-python/dict2xml/Manifest
new file mode 100644
index 000000000000..238f7a0fee27
--- /dev/null
+++ b/dev-python/dict2xml/Manifest
@@ -0,0 +1 @@
+DIST dict2xml-1.7.2.tar.gz 12295 BLAKE2B 7bd1c771f3b1c38f96bb322f88d78fb4ab763b153a0531f1953ad97e4b8eb93464a4cfb2aeaffc1599967145a54f0decc5152f3084587f6d94f25cdcbd5837c1 SHA512 fea3a65c5decfee8a22135fc262764c9afbc6b9f41232557f2de1b18a5b30e65c6910ef9f7d4e4b22c2d6c27d5b18eb6a83679c656564061bb7e5e8c55945c76
diff --git a/dev-python/dict2xml/dict2xml-1.7.2.ebuild b/dev-python/dict2xml/dict2xml-1.7.2.ebuild
new file mode 100644
index 000000000000..2ed51888e078
--- /dev/null
+++ b/dev-python/dict2xml/dict2xml-1.7.2.ebuild
@@ -0,0 +1,21 @@
+# 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,11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Small utility to convert a python dictionary into an XML string"
+HOMEPAGE="https://pypi.org/project/dict2xml/ https://github.com/delfick/python-dict2xml"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+# dict2xml uses noseOfYeti for its test, which is not yet available.
+RESTRICT="test"
+
+distutils_enable_tests pytest
diff --git a/dev-python/dict2xml/metadata.xml b/dev-python/dict2xml/metadata.xml
new file mode 100644
index 000000000000..283e6bae6b97
--- /dev/null
+++ b/dev-python/dict2xml/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+  <email>flow@gentoo.org</email>
+  <name>Florian Schmaus</name>
+ </maintainer>
+ <maintainer type="project">
+  <email>python@gentoo.org</email>
+ </maintainer>
+ 
+ <origin>gentoo-staging</origin>
+ <stabilize-allarches/>
+</pkgmetadata>
\ No newline at end of file
diff --git a/dev-python/easyprocess/easyprocess-1.1-r1.ebuild b/dev-python/easyprocess/easyprocess-1.1-r1.ebuild
index 246b040c9d07..b197a0c0311c 100644
--- a/dev-python/easyprocess/easyprocess-1.1-r1.ebuild
+++ b/dev-python/easyprocess/easyprocess-1.1-r1.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/EasyProcess-${PV}"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~riscv x86"
+KEYWORDS="amd64 ~arm ~arm64 ~riscv x86"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/entrypoint2/entrypoint2-1.1.ebuild b/dev-python/entrypoint2/entrypoint2-1.1.ebuild
index 6dac75ce6868..e2687d159065 100644
--- a/dev-python/entrypoint2/entrypoint2-1.1.ebuild
+++ b/dev-python/entrypoint2/entrypoint2-1.1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~riscv x86"
+KEYWORDS="amd64 ~arm ~arm64 ~riscv x86"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/google-i18n-address/Manifest b/dev-python/google-i18n-address/Manifest
new file mode 100644
index 000000000000..279277d6a879
--- /dev/null
+++ b/dev-python/google-i18n-address/Manifest
@@ -0,0 +1 @@
+DIST google-i18n-address-2.5.2.gh.tar.gz 724067 BLAKE2B 1ec13e99216e263985d04ceb3efd6708041a91be2cc6d4531c099d1599bfa55e21ebbc785d94bda245304bc904778e906c036b2bf0235c9e7c26c8439a69ad07 SHA512 3e9a583cee35af2c045c41fbdafea8dab2897354422a4d2df96834d56443499442a62fb19be42d06cd8974fac677936cb34713730b1c3c18c9a041a7ae46c5cb
diff --git a/dev-python/google-i18n-address/google-i18n-address-2.5.2.ebuild b/dev-python/google-i18n-address/google-i18n-address-2.5.2.ebuild
new file mode 100644
index 000000000000..9ecee5d1d7a4
--- /dev/null
+++ b/dev-python/google-i18n-address/google-i18n-address-2.5.2.ebuild
@@ -0,0 +1,20 @@
+# 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,11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Google's i18n address metadata repository"
+HOMEPAGE="https://pypi.org/project/google-i18n-address/"
+# Using the github release, as it contains the tests (unlike the pypi artifact).
+SRC_URI="https://github.com/mirumee/google-i18n-address/archive/refs/tags/${PV}.tar.gz -> ${P}.gh.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+distutils_enable_tests pytest
diff --git a/dev-python/google-i18n-address/metadata.xml b/dev-python/google-i18n-address/metadata.xml
new file mode 100644
index 000000000000..283e6bae6b97
--- /dev/null
+++ b/dev-python/google-i18n-address/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+  <email>flow@gentoo.org</email>
+  <name>Florian Schmaus</name>
+ </maintainer>
+ <maintainer type="project">
+  <email>python@gentoo.org</email>
+ </maintainer>
+ 
+ <origin>gentoo-staging</origin>
+ <stabilize-allarches/>
+</pkgmetadata>
\ No newline at end of file
diff --git a/dev-python/h5py/h5py-3.7.0.ebuild b/dev-python/h5py/h5py-3.7.0.ebuild
index 6d63185f92fd..91efa76ccf32 100644
--- a/dev-python/h5py/h5py-3.7.0.ebuild
+++ b/dev-python/h5py/h5py-3.7.0.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~riscv x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~riscv x86 ~amd64-linux ~x86-linux"
 # disable mpi until mpi4py gets python3_8
 #IUSE="examples mpi"
 IUSE="examples"
diff --git a/dev-python/mss/mss-7.0.1.ebuild b/dev-python/mss/mss-7.0.1.ebuild
index 5ddc06c920dc..0cd1aa2a7b0a 100644
--- a/dev-python/mss/mss-7.0.1.ebuild
+++ b/dev-python/mss/mss-7.0.1.ebuild
@@ -22,7 +22,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/nautilus-python/metadata.xml b/dev-python/nautilus-python/metadata.xml
index f2710c9e5c09..738a9b52cb8a 100644
--- a/dev-python/nautilus-python/metadata.xml
+++ b/dev-python/nautilus-python/metadata.xml
@@ -5,6 +5,8 @@
   <email>gnome@gentoo.org</email>
   <name>Gentoo GNOME Desktop</name>
  </maintainer>
- 
+ <upstream>
+  <remote-id type="gnome-gitlab">GNOME/nautilus-python</remote-id>
+ </upstream>
  <origin>gentoo-staging</origin>
 </pkgmetadata>
\ No newline at end of file
diff --git a/dev-python/pikepdf/Manifest b/dev-python/pikepdf/Manifest
index 746301f54a23..9340fd1021ff 100644
--- a/dev-python/pikepdf/Manifest
+++ b/dev-python/pikepdf/Manifest
@@ -1,5 +1 @@
-DIST pikepdf-5.6.1.gh.tar.gz 2905150 BLAKE2B 35c06251debb935b88f13e27f42f80b36275575d7848409bb19fa380be7429b785b8fea36e7d882a49df2e40e6c34fcc3d900b1b362f5ccf600780291f43d1f7 SHA512 add8edb16cba2081c479739ec215dc8c96a1896a159febb5bc2f74c2da1e8cf83b12a1302e1ad2ce8ab6fbf01a16104f8efb9c7a764fa1eedbc795dc45a71dfe
-DIST pikepdf-6.0.2.gh.tar.gz 2905158 BLAKE2B b80bee6690513ebd43b590ec5addb40f81a31b27adab77e04f0fd521e0a23a5bc974c6026163f1c9faf23f0d9e2b004961d93a19fab20a43bdf27b0a69597413 SHA512 8c1213535d503f388de6845d28f430947630717f8c299e6a384204de38e2f5f1a5858a0307abd5a34a2f4d79787bdab0e1be286a99ce91b64fc0fcf3f3553d89
-DIST pikepdf-6.1.0.gh.tar.gz 2905226 BLAKE2B efa6ce6d75e36885f6b59eb01a869c50ba4eddae4d7c10bdfb13d1c8162a6f21a51d4b4fa3d3d0d80180d72c558a245aadf4fa372993efcdf735c5a4a7a64a35 SHA512 75349634a97fed40dc8f86ad58c4e45cccf3e6e78818d473894c6bc52a3a5584f4f705836fab038e8256b44b7d02801d3e7202488366b8ba298972fa6f0ef809
-DIST pikepdf-6.2.0.gh.tar.gz 2905445 BLAKE2B 07a6ade367c438ab5df885827d7610e998252d1c8784b1f81d377c2d3ac897a812802a6ed1b8e84cedeb6fc8394e2e77116e2628c31ae06d3b08a8ca6957b25f SHA512 3287ed2203b8dc1c2f5281a45612cfda3107576413d4579984b9e7f6a5bcdbb795bf09559b4ca8a4fe5d7f70d94f5c404b4e3f6422bdfde4b8fd48830c1e280d
 DIST pikepdf-6.2.1.gh.tar.gz 2905482 BLAKE2B 9a5b2c7a1b23f4156b89b44780e98f2a82582c05221c0ec2ead3490f3a14a6fa34caea000fb34c0df1458d8aac019bbb0bce10bbbf8bba0c159639b3129e597c SHA512 f6888dcd42c18377f69aa71fce92aa752b73f369e2db4afc106b2b345556a3a9efbb007101066d562f44cfed0bb5816ae0a6cd998b1d634555bf27fbe94baddf
diff --git a/dev-python/pikepdf/pikepdf-5.6.1.ebuild b/dev-python/pikepdf/pikepdf-5.6.1.ebuild
deleted file mode 100644
index 879d58476a69..000000000000
--- a/dev-python/pikepdf/pikepdf-5.6.1.ebuild
+++ /dev/null
@@ -1,62 +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,11} )
-
-inherit distutils-r1
-
-MY_P=${P/_p/.post}
-DESCRIPTION="Python library to work with pdf files based on qpdf"
-HOMEPAGE="
-	https://github.com/pikepdf/pikepdf/
-	https://pypi.org/project/pikepdf/
-"
-SRC_URI="
-	https://github.com/${PN}/${PN}/archive/v${PV/_p/.post}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="MPL-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-
-DEPEND="
-	>=app-text/qpdf-10.6.2:0=
-"
-RDEPEND="
-	${DEPEND}
-	dev-python/deprecation[${PYTHON_USEDEP}]
-	>=dev-python/lxml-4.0[${PYTHON_USEDEP}]
-	dev-python/packaging[${PYTHON_USEDEP}]
-	>=dev-python/pillow-9[${PYTHON_USEDEP}]
-	>=dev-python/pybind11-2.9.1[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	>=dev-python/pybind11-2.9.1[${PYTHON_USEDEP}]
-	>=dev-python/setuptools_scm-7.0.5[${PYTHON_USEDEP}]
-	dev-python/setuptools_scm_git_archive[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		dev-python/tomli[${PYTHON_USEDEP}]
-	' 3.8 3.9 3.10)
-	test? (
-		>=dev-python/attrs-20.2.0[${PYTHON_USEDEP}]
-		>=dev-python/hypothesis-5[${PYTHON_USEDEP}]
-		>=dev-python/pillow-5.0.0[${PYTHON_USEDEP},jpeg,lcms,tiff]
-		>=dev-python/psutil-5[${PYTHON_USEDEP}]
-		>=dev-python/pytest-6[${PYTHON_USEDEP}]
-		>=dev-python/pytest-timeout-1.4.2[${PYTHON_USEDEP}]
-		>=dev-python/python-dateutil-2.8.0[${PYTHON_USEDEP}]
-		>=dev-python/python-xmp-toolkit-2.0.1[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	sed -e '/-n auto/d' -i pyproject.toml || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/pikepdf/pikepdf-6.0.2.ebuild b/dev-python/pikepdf/pikepdf-6.0.2.ebuild
deleted file mode 100644
index db6acd07f016..000000000000
--- a/dev-python/pikepdf/pikepdf-6.0.2.ebuild
+++ /dev/null
@@ -1,62 +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,11} )
-
-inherit distutils-r1
-
-MY_P=${P/_p/.post}
-DESCRIPTION="Python library to work with pdf files based on qpdf"
-HOMEPAGE="
-	https://github.com/pikepdf/pikepdf/
-	https://pypi.org/project/pikepdf/
-"
-SRC_URI="
-	https://github.com/${PN}/${PN}/archive/v${PV/_p/.post}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="MPL-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
-
-DEPEND="
-	>=app-text/qpdf-11.0.0:0=
-"
-RDEPEND="
-	${DEPEND}
-	dev-python/deprecation[${PYTHON_USEDEP}]
-	>=dev-python/lxml-4.0[${PYTHON_USEDEP}]
-	dev-python/packaging[${PYTHON_USEDEP}]
-	>=dev-python/pillow-9[${PYTHON_USEDEP}]
-	>=dev-python/pybind11-2.9.1[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	>=dev-python/pybind11-2.9.1[${PYTHON_USEDEP}]
-	>=dev-python/setuptools_scm-7.0.5[${PYTHON_USEDEP}]
-	dev-python/setuptools_scm_git_archive[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		dev-python/tomli[${PYTHON_USEDEP}]
-	' 3.8 3.9 3.10)
-	test? (
-		>=dev-python/attrs-20.2.0[${PYTHON_USEDEP}]
-		>=dev-python/hypothesis-5[${PYTHON_USEDEP}]
-		>=dev-python/pillow-5.0.0[${PYTHON_USEDEP},jpeg,lcms,tiff]
-		>=dev-python/psutil-5[${PYTHON_USEDEP}]
-		>=dev-python/pytest-6[${PYTHON_USEDEP}]
-		>=dev-python/pytest-timeout-1.4.2[${PYTHON_USEDEP}]
-		>=dev-python/python-dateutil-2.8.0[${PYTHON_USEDEP}]
-		>=dev-python/python-xmp-toolkit-2.0.1[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	sed -e '/-n auto/d' -i pyproject.toml || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/pikepdf/pikepdf-6.1.0.ebuild b/dev-python/pikepdf/pikepdf-6.1.0.ebuild
deleted file mode 100644
index aff348081caf..000000000000
--- a/dev-python/pikepdf/pikepdf-6.1.0.ebuild
+++ /dev/null
@@ -1,62 +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,11} )
-
-inherit distutils-r1
-
-MY_P=${P/_p/.post}
-DESCRIPTION="Python library to work with pdf files based on qpdf"
-HOMEPAGE="
-	https://github.com/pikepdf/pikepdf/
-	https://pypi.org/project/pikepdf/
-"
-SRC_URI="
-	https://github.com/${PN}/${PN}/archive/v${PV/_p/.post}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="MPL-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
-
-DEPEND="
-	>=app-text/qpdf-11.1.1:0=
-"
-RDEPEND="
-	${DEPEND}
-	dev-python/deprecation[${PYTHON_USEDEP}]
-	>=dev-python/lxml-4.0[${PYTHON_USEDEP}]
-	dev-python/packaging[${PYTHON_USEDEP}]
-	>=dev-python/pillow-9[${PYTHON_USEDEP}]
-	>=dev-python/pybind11-2.9.1[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	>=dev-python/pybind11-2.9.1[${PYTHON_USEDEP}]
-	>=dev-python/setuptools_scm-7.0.5[${PYTHON_USEDEP}]
-	dev-python/setuptools_scm_git_archive[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		dev-python/tomli[${PYTHON_USEDEP}]
-	' 3.8 3.9 3.10)
-	test? (
-		>=dev-python/attrs-20.2.0[${PYTHON_USEDEP}]
-		>=dev-python/hypothesis-5[${PYTHON_USEDEP}]
-		>=dev-python/pillow-5.0.0[${PYTHON_USEDEP},jpeg,lcms,tiff]
-		>=dev-python/psutil-5[${PYTHON_USEDEP}]
-		>=dev-python/pytest-6[${PYTHON_USEDEP}]
-		>=dev-python/pytest-timeout-1.4.2[${PYTHON_USEDEP}]
-		>=dev-python/python-dateutil-2.8.0[${PYTHON_USEDEP}]
-		>=dev-python/python-xmp-toolkit-2.0.1[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	sed -e '/-n auto/d' -i pyproject.toml || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/pikepdf/pikepdf-6.2.0.ebuild b/dev-python/pikepdf/pikepdf-6.2.0.ebuild
deleted file mode 100644
index ba70db36aa8d..000000000000
--- a/dev-python/pikepdf/pikepdf-6.2.0.ebuild
+++ /dev/null
@@ -1,62 +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,11} )
-
-inherit distutils-r1
-
-MY_P=${P/_p/.post}
-DESCRIPTION="Python library to work with pdf files based on qpdf"
-HOMEPAGE="
-	https://github.com/pikepdf/pikepdf/
-	https://pypi.org/project/pikepdf/
-"
-SRC_URI="
-	https://github.com/${PN}/${PN}/archive/v${PV/_p/.post}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="MPL-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
-
-DEPEND="
-	>=app-text/qpdf-11.1.1:0=
-"
-RDEPEND="
-	${DEPEND}
-	dev-python/deprecation[${PYTHON_USEDEP}]
-	>=dev-python/lxml-4.0[${PYTHON_USEDEP}]
-	dev-python/packaging[${PYTHON_USEDEP}]
-	>=dev-python/pillow-9[${PYTHON_USEDEP}]
-	>=dev-python/pybind11-2.9.1[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	>=dev-python/pybind11-2.9.1[${PYTHON_USEDEP}]
-	>=dev-python/setuptools_scm-7.0.5[${PYTHON_USEDEP}]
-	dev-python/setuptools_scm_git_archive[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		dev-python/tomli[${PYTHON_USEDEP}]
-	' 3.8 3.9 3.10)
-	test? (
-		>=dev-python/attrs-20.2.0[${PYTHON_USEDEP}]
-		>=dev-python/hypothesis-5[${PYTHON_USEDEP}]
-		>=dev-python/pillow-5.0.0[${PYTHON_USEDEP},jpeg,lcms,tiff]
-		>=dev-python/psutil-5[${PYTHON_USEDEP}]
-		>=dev-python/pytest-6[${PYTHON_USEDEP}]
-		>=dev-python/pytest-timeout-1.4.2[${PYTHON_USEDEP}]
-		>=dev-python/python-dateutil-2.8.0[${PYTHON_USEDEP}]
-		>=dev-python/python-xmp-toolkit-2.0.1[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	sed -e '/-n auto/d' -i pyproject.toml || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/pikepdf/pikepdf-6.2.1.ebuild b/dev-python/pikepdf/pikepdf-6.2.1.ebuild
index ba70db36aa8d..32a9788b6053 100644
--- a/dev-python/pikepdf/pikepdf-6.2.1.ebuild
+++ b/dev-python/pikepdf/pikepdf-6.2.1.ebuild
@@ -22,7 +22,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="MPL-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
 
 DEPEND="
 	>=app-text/qpdf-11.1.1:0=
diff --git a/dev-python/pyatspi/metadata.xml b/dev-python/pyatspi/metadata.xml
index f2710c9e5c09..0007bb08527d 100644
--- a/dev-python/pyatspi/metadata.xml
+++ b/dev-python/pyatspi/metadata.xml
@@ -5,6 +5,8 @@
   <email>gnome@gentoo.org</email>
   <name>Gentoo GNOME Desktop</name>
  </maintainer>
- 
+ <upstream>
+  <remote-id type="gnome-gitlab">GNOME/pyatspi2</remote-id>
+ </upstream>
  <origin>gentoo-staging</origin>
 </pkgmetadata>
\ No newline at end of file
diff --git a/dev-python/pygccxml/pygccxml-2.2.1.ebuild b/dev-python/pygccxml/pygccxml-2.2.1.ebuild
index df15a85fe79f..c1358089a0bd 100644
--- a/dev-python/pygccxml/pygccxml-2.2.1.ebuild
+++ b/dev-python/pygccxml/pygccxml-2.2.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/CastXML/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Boost-1.0"
 SLOT="0"
-KEYWORDS="~amd64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm ~riscv ~x86"
 IUSE="doc"
 
 distutils_enable_sphinx docs dev-python/sphinx_rtd_theme
diff --git a/dev-python/pygobject/metadata.xml b/dev-python/pygobject/metadata.xml
index 31fb4c93afa5..4b6068fd8a07 100644
--- a/dev-python/pygobject/metadata.xml
+++ b/dev-python/pygobject/metadata.xml
@@ -10,19 +10,21 @@
   <name>Python</name>
  </maintainer>
  <longdescription lang="en">
-		GObject is a object system used by GTK+, GStreamer and other libraries.
-		PyGObject provides a convenient wrapper for use in Python programs when
-		accessing GObject libraries. Like the GObject library itself PyGObject
-		is licensed under the GNU LGPL, so is suitable for use in both free
-		software and proprietary applications. It is already in use in many
-		applications ranging from small single purpose scripts up to large full
-		featured applications. PyGObject now dynamically accesses any GObject
-		libraries that uses GObject Introspection. It replaces the need for
-		separate modules such as PyGTK, GIO and python-gnome to build a full
-		GNOME 3.0 application. Once new functionality is added to gobject
-		library it is instantly available as a Python API without the need for
-		intermediate Python glue.
-	</longdescription>
- 
+    GObject is a object system used by GTK+, GStreamer and other libraries.
+    PyGObject provides a convenient wrapper for use in Python programs when
+    accessing GObject libraries. Like the GObject library itself PyGObject
+    is licensed under the GNU LGPL, so is suitable for use in both free
+    software and proprietary applications. It is already in use in many
+    applications ranging from small single purpose scripts up to large full
+    featured applications. PyGObject now dynamically accesses any GObject
+    libraries that uses GObject Introspection. It replaces the need for
+    separate modules such as PyGTK, GIO and python-gnome to build a full
+    GNOME 3.0 application. Once new functionality is added to gobject
+    library it is instantly available as a Python API without the need for
+    intermediate Python glue.
+  </longdescription>
+ <upstream>
+  <remote-id type="gnome-gitlab">GNOME/pygobject</remote-id>
+ </upstream>
  <origin>gentoo-staging</origin>
 </pkgmetadata>
\ No newline at end of file
diff --git a/dev-python/pymacaroons/Manifest b/dev-python/pymacaroons/Manifest
index 6aab45d7ecae..b043635a70ff 100644
--- a/dev-python/pymacaroons/Manifest
+++ b/dev-python/pymacaroons/Manifest
@@ -1 +1,2 @@
+DIST pymacaroons-0.13.0-nose-to-pytest.patch 18750 BLAKE2B 36e884b77fa5d540f5c849a6dead98ad30a41b04a512d85843ffc7f18f85660a0520e6b17dd55f48c0ac1c0f98f86c0ea9751942a0592d2e64698aa9d9a65131 SHA512 36a582ad8395eb114a164d027b0d73cb6dfc10230538c0f7c3beb9b9afca26cd9a4964cd3f12cb144fd7e63acc0f7ce19760a9ad75be1f5a9a37ccc350462056
 DIST pymacaroons-0.13.0.gh.tar.gz 25607 BLAKE2B ff21e88842c54f7ce84e8b3ad59d42ee43f2bb2073ebbb7f47dee123086c1466024420246a4da2eae462bc36e44a3621b75144846e090073c5063b0af24f1ad1 SHA512 60da7e03d68083f8effdc06b338dd04dbd6a39ff137373721af09f1282fb035f969459d2ef80f4d728dcf95f6244b7b2de443e48658e0551462ab46daf3884a2
diff --git a/dev-python/pymacaroons/pymacaroons-0.13.0-r1.ebuild b/dev-python/pymacaroons/pymacaroons-0.13.0-r1.ebuild
new file mode 100644
index 000000000000..9bbd9db58cd3
--- /dev/null
+++ b/dev-python/pymacaroons/pymacaroons-0.13.0-r1.ebuild
@@ -0,0 +1,49 @@
+# 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,11} )
+
+inherit distutils-r1
+
+DESCRIPTION="A Python implementation of Macaroons"
+HOMEPAGE="
+	https://github.com/ecordell/pymacaroons
+	https://pypi.org/project/pymacaroons/
+"
+SRC_URI="
+	https://github.com/ecordell/pymacaroons/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+	https://github.com/arkamar/pymacaroons/commit/backport-upstream-pr59.patch
+		-> ${P}-nose-to-pytest.patch
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64"
+
+RDEPEND="
+	dev-python/pynacl[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+	# The patch is backported from upstream PR #59 to v0.13.0 and stored in my
+	# fork, see SRC_URI.
+	"${DISTDIR}/${P}-nose-to-pytest.patch"
+)
+
+EPYTEST_IGNORE=(
+	# The package also contains property_tests, however, they are incompatible
+	# with dev-python/hypothesis in gentoo. The package requires too old version.
+	tests/property_tests
+)
+
+distutils_enable_tests pytest
diff --git a/dev-python/pyqtgraph/pyqtgraph-0.13.1.ebuild b/dev-python/pyqtgraph/pyqtgraph-0.13.1.ebuild
index cdb53899bc67..586c8db1bac2 100644
--- a/dev-python/pyqtgraph/pyqtgraph-0.13.1.ebuild
+++ b/dev-python/pyqtgraph/pyqtgraph-0.13.1.ebuild
@@ -22,7 +22,7 @@ S=${WORKDIR}/${PN}-${P}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm ~riscv ~x86"
 IUSE="opengl svg"
 REQUIRED_USE="test? ( opengl svg )"
 
diff --git a/dev-python/pyscreenshot/pyscreenshot-3.0-r1.ebuild b/dev-python/pyscreenshot/pyscreenshot-3.0-r1.ebuild
index 7876e5627504..91471d091fc1 100644
--- a/dev-python/pyscreenshot/pyscreenshot-3.0-r1.ebuild
+++ b/dev-python/pyscreenshot/pyscreenshot-3.0-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/ponty/pyscreenshot/archive/${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~riscv x86"
+KEYWORDS="amd64 ~arm ~arm64 ~riscv x86"
 
 RDEPEND="
 	dev-python/easyprocess[${PYTHON_USEDEP}]
diff --git a/dev-python/pytest-xvfb/pytest-xvfb-2.0.0-r2.ebuild b/dev-python/pytest-xvfb/pytest-xvfb-2.0.0-r2.ebuild
index b88ddb24feab..baba6bb15862 100644
--- a/dev-python/pytest-xvfb/pytest-xvfb-2.0.0-r2.ebuild
+++ b/dev-python/pytest-xvfb/pytest-xvfb-2.0.0-r2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/The-Compiler/pytest-xvfb/archive/v${PV}.tar.gz -> ${
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~riscv x86"
+KEYWORDS="amd64 ~arm ~arm64 ~riscv x86"
 
 RDEPEND="
 	>=dev-python/pytest-2.8.1[${PYTHON_USEDEP}]
diff --git a/dev-python/python-xmp-toolkit/python-xmp-toolkit-2.0.1-r2.ebuild b/dev-python/python-xmp-toolkit/python-xmp-toolkit-2.0.1-r2.ebuild
index 3dc8db01379d..3bf71885d050 100644
--- a/dev-python/python-xmp-toolkit/python-xmp-toolkit-2.0.1-r2.ebuild
+++ b/dev-python/python-xmp-toolkit/python-xmp-toolkit-2.0.1-r2.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://github.com/python-xmp-toolkit/${PN}.git"
 else
 	SRC_URI="https://github.com/python-xmp-toolkit/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha amd64 ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="~alpha amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
 fi
 
 DESCRIPTION="Library for working with XMP metadata"
diff --git a/dev-python/pyvirtualdisplay/pyvirtualdisplay-3.0.ebuild b/dev-python/pyvirtualdisplay/pyvirtualdisplay-3.0.ebuild
index 8f13fbe15072..97f1c73170ac 100644
--- a/dev-python/pyvirtualdisplay/pyvirtualdisplay-3.0.ebuild
+++ b/dev-python/pyvirtualdisplay/pyvirtualdisplay-3.0.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~riscv x86"
+KEYWORDS="amd64 ~arm ~arm64 ~riscv x86"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/pyzbar/metadata.xml b/dev-python/pyzbar/metadata.xml
index 853174b8f2ab..ea8988e8af6a 100644
--- a/dev-python/pyzbar/metadata.xml
+++ b/dev-python/pyzbar/metadata.xml
@@ -7,4 +7,5 @@
  </maintainer>
  
  <origin>gentoo-staging</origin>
+ <stabilize-allarches/>
 </pkgmetadata>
\ No newline at end of file
diff --git a/dev-python/rapidfuzz/rapidfuzz-2.12.0.ebuild b/dev-python/rapidfuzz/rapidfuzz-2.12.0.ebuild
index 2e02cb2d1603..cb32d027cbb6 100644
--- a/dev-python/rapidfuzz/rapidfuzz-2.12.0.ebuild
+++ b/dev-python/rapidfuzz/rapidfuzz-2.12.0.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~riscv"
+KEYWORDS="~amd64 ~arm ~riscv"
 
 # all these are header-only libraries
 DEPEND="
diff --git a/dev-python/rapidfuzz_capi/rapidfuzz_capi-1.0.5.ebuild b/dev-python/rapidfuzz_capi/rapidfuzz_capi-1.0.5.ebuild
index 932923eb9c97..3ab979260a27 100644
--- a/dev-python/rapidfuzz_capi/rapidfuzz_capi-1.0.5.ebuild
+++ b/dev-python/rapidfuzz_capi/rapidfuzz_capi-1.0.5.ebuild
@@ -20,4 +20,4 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~riscv"
+KEYWORDS="~amd64 ~arm ~riscv"
diff --git a/dev-python/responses/Manifest b/dev-python/responses/Manifest
index eca80389c095..a813d44ba754 100644
--- a/dev-python/responses/Manifest
+++ b/dev-python/responses/Manifest
@@ -1,2 +1,3 @@
 DIST responses-0.21.0.gh.tar.gz 49551 BLAKE2B 3796fd29353f80a04b26a7348153902d959038e072bf512ee4ba8ffd434157c0ce5c37073d114e0d2865c827d82166ee1fcefe2f250c895c23c53664ab919903 SHA512 9e82f0fb7d2a2a4ea071a6384584ba58ebde13504408f8bac351d24df206f0f6815ce3b6d7e013fb87b04d3a1cdccbe7a5287f56f4f9bfb3d4567ad2eeafa778
+DIST responses-0.22.0-tomli.patch 4793 BLAKE2B d5991f55f4378d35224a19d4e85ee9786612f6b5931e52e326c46ca2b791e6e2f8985f69ebff14779948b45a6433d6b4223f8fabe615b0ad479364d941128179 SHA512 0d0bd3d10e4f38fdb236204f161ae499f876d8daadc8306b6ad02efec9277fdfdbc1c862704f49aec69cabbd52f3616acf74d3baab573f1f5418436928af3c6c
 DIST responses-0.22.0.gh.tar.gz 54094 BLAKE2B eacb1ba4fcae10d3a4e29fe1516da3f1d3ff07eacbaf65b0dd3f86ecfb36aa51527c0d89547a1480064654c49fd1233d2c3491d9afdf4eff34a4058e4f89ec0d SHA512 361e59e02df36fac0fb0ba2a070b730e485ec94fe90490c271e4ac86fae7954a551bf2486714d95c91e9d0b011f06a9d10b0d6408fd4d03234e1224cca1e9d0e
diff --git a/dev-python/responses/responses-0.22.0.ebuild b/dev-python/responses/responses-0.22.0-r1.ebuild
index c87fe94454d1..1808bd53041a 100644
--- a/dev-python/responses/responses-0.22.0.ebuild
+++ b/dev-python/responses/responses-0.22.0-r1.ebuild
@@ -16,6 +16,8 @@ HOMEPAGE="
 SRC_URI="
 	https://github.com/getsentry/responses/archive/${PV}.tar.gz
 		-> ${P}.gh.tar.gz
+	https://github.com/getsentry/responses/pull/596.patch
+		-> ${P}-tomli.patch
 "
 
 LICENSE="Apache-2.0"
@@ -25,7 +27,8 @@ KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
 RDEPEND="
 	<dev-python/requests-3[${PYTHON_USEDEP}]
 	>=dev-python/requests-2.22.0[${PYTHON_USEDEP}]
-	dev-python/toml[${PYTHON_USEDEP}]
+	dev-python/tomli[${PYTHON_USEDEP}]
+	dev-python/tomli-w[${PYTHON_USEDEP}]
 	>=dev-python/urllib3-1.25.10[${PYTHON_USEDEP}]
 "
 
@@ -36,3 +39,7 @@ BDEPEND="
 "
 
 distutils_enable_tests pytest
+
+PATCHES=(
+	"${DISTDIR}"/${P}-tomli.patch
+)
diff --git a/dev-python/spotipy/Manifest b/dev-python/spotipy/Manifest
index 6a5da472b855..94171c508e26 100644
--- a/dev-python/spotipy/Manifest
+++ b/dev-python/spotipy/Manifest
@@ -1,2 +1,3 @@
 DIST spotipy-2.19.0.tar.gz 102703 BLAKE2B bc132edb972236b43097c0bbc9d86932a3305d8bd3807e44e20767b123455950b8e01060efd83c87b3a162e329f5c48614205f131686af7f9312a44894a7f1e7 SHA512 fbaecd1a2cab3ef458d30de46cb89462021dfc3cfc85516d8bfe509af016a0b19af2f8de4f5cae36188b1ce1f5718c75edff0e71af2a87f4d720ee99d4541a6a
 DIST spotipy-2.20.0.tar.gz 103437 BLAKE2B 78b026b9de04b0115c5621345e4f4c0ee47a51980221c77da8754c54fc8c321a1826983ceb9bcf9c415690906f3b3ea4657243e6b5d351d3edb48084baeca292 SHA512 8b5d0704fa84974ea0728dda0fe89d021b7b1550b464026d2b087671102745c7edcab116246399dd97de42d9c0cc7411295297c328b301712b6536aa6a3cd6fd
+DIST spotipy-2.21.0.tar.gz 105500 BLAKE2B fa49c31da93efdac23fd5cbaa31b513f48e3a90c56dee8708bf695a20c1f6040c68a22a04d6589b3a890f503d54e7c0fb017f2911ae28abe54a9e7f5bff3b540 SHA512 8783261e43962b3e98cb9b680f908d38feecf784ff404352ba16d6bb3d2e4bf1d2308b60f1437c56402e1c2a993a5bba876103f968bb8bdd81be1aef1fe6d058
diff --git a/dev-python/spotipy/spotipy-2.21.0.ebuild b/dev-python/spotipy/spotipy-2.21.0.ebuild
new file mode 100644
index 000000000000..b628e93c6197
--- /dev/null
+++ b/dev-python/spotipy/spotipy-2.21.0.ebuild
@@ -0,0 +1,49 @@
+# 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,11} )
+
+inherit distutils-r1
+
+DESCRIPTION="A light weight Python library for the Spotify Web API"
+HOMEPAGE="https://spotipy.readthedocs.io"
+SRC_URI="https://github.com/plamere/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+IUSE="examples"
+
+RDEPEND="
+	dev-python/redis-py[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/urllib3[${PYTHON_USEDEP}]
+"
+BDEPEND="test? ( dev-python/mock[${PYTHON_USEDEP}] )"
+
+distutils_enable_sphinx docs
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# Requires user credentials
+	rm tests/integration/test_user_endpoints.py || die
+
+	# Requires a spotify client ID
+	rm tests/integration/test_non_user_endpoints.py || die
+
+	# Needs internet access
+	sed -i -e 's:test_spotify_client_credentials_get_access_token:_&:' \
+		tests/unit/test_oauth.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	use examples && dodoc -r examples
+}
diff --git a/dev-python/txAMQP/txAMQP-0.8.2-r1.ebuild b/dev-python/txAMQP/txAMQP-0.8.2-r1.ebuild
new file mode 100644
index 000000000000..ac835954cefe
--- /dev/null
+++ b/dev-python/txAMQP/txAMQP-0.8.2-r1.ebuild
@@ -0,0 +1,74 @@
+# 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,11} )
+PYTHON_REQ_USE="xml(+)"
+
+inherit distutils-r1
+
+MY_P="${PN,,}-${PV}"
+
+DESCRIPTION="Python library for communicating with AMQP peers using Twisted"
+HOMEPAGE="https://github.com/txamqp/txamqp"
+# pypi tarball misses doc files
+# https://github.com/txamqp/txamqp/pull/10
+SRC_URI="https://github.com/txamqp/txamqp/archive/${PV}.tar.gz -> ${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~x64-solaris"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-python/twisted[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		${RDEPEND}
+		net-misc/rabbitmq-server
+	)
+"
+
+python_test() {
+	cd src || die
+	# tests look for those files relatively to modules
+	cp -r specs "${BUILD_DIR}"/lib || die
+
+	TXAMQP_BROKER=RABBITMQ "${EPYTHON}" -m twisted.trial txamqp
+	local ret=${?}
+
+	[[ ${ret} == 0 ]] || die "Tests failed with ${EPYTHON}"
+}
+
+src_test() {
+	einfo "Starting rabbitmq"
+	local -x RABBITMQ_LOG_BASE="${T}/rabbitmq/log"
+	local -x RABBITMQ_MNESIA_BASE="${T}/rabbitmq/mnesia"
+	local -x RABBITMQ_LOGS="${T}/rabbitmq.log"
+	local -x RABBITMQ_PID_FILE="${T}/rabbitmq.pid"
+	local -x RABBITMQ_ENABLED_PLUGINS_FILE="${T}/rabbitmq/enabled_plugins"
+	/usr/libexec/rabbitmq/rabbitmq-server -p 5672:5672 &
+
+	einfo "Waiting for rabbitmq to fully load"
+	while ! { echo >/dev/tcp/localhost/5672 ; } &> /dev/null; do
+		sleep 1
+	done
+	einfo "rabbitmq is ready"
+
+	distutils-r1_src_test
+
+	einfo "Stopping rabbitmq"
+	kill "$(<"${RABBITMQ_PID_FILE}")" || die
+}
+
+python_install_all() {
+	local DOCS=( doc/* )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/vncdotool/vncdotool-0.13.0-r1.ebuild b/dev-python/vncdotool/vncdotool-0.13.0-r1.ebuild
index bba2c0fe477a..d8ca115aa69d 100644
--- a/dev-python/vncdotool/vncdotool-0.13.0-r1.ebuild
+++ b/dev-python/vncdotool/vncdotool-0.13.0-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/sibson/vncdotool/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~riscv x86"
+KEYWORDS="amd64 ~arm ~arm64 ~riscv x86"
 
 # A lot of errors such as the following appear
 # pexpect.exceptions.ExceptionPexpect: The command was not found or was not executable: vncev.