Adding metadata

23 files changed, 356 insertions, 245 deletions

diff --git a/dev-python/QtPy/Manifest b/dev-python/QtPy/Manifest
index 724b914aaef8..6bb3ddeff649 100644
--- a/dev-python/QtPy/Manifest
+++ b/dev-python/QtPy/Manifest
@@ -1,3 +1,4 @@
 DIST QtPy-1.11.2.tar.gz 37098 BLAKE2B 8806cce798c4c2d885dd340d0d077567353cf0f3f1c2b284fd788c190b28b6133d052d31dea861e7d2497d0db88ba7ce8be83074360c61823f7a78dc01c015a5 SHA512 e49beb3180789a8080a19406b0e122bc9fc2192ac89b59f0956d7c65ac957779b192062956a97a7526f32724000df18abf32ddd6bda52f9cdf440ddc551887f8
 DIST QtPy-1.11.3.tar.gz 39637 BLAKE2B d1bfa0944dcebf5e408b9a061bcc6bab2fe172a70f0eadd36b229d2c9b40d74d8159c820608d3afd71a91085d5703af9b7045f359209730c53a9a83007159ce5 SHA512 461d858b05ff75f27017f6f0058f3e47643d5fe6c236e4307fa006735ad80e4c1fa487f1ab75edcfe881026541e302cdc3f8221c4ad7b97bce8c96b66db580bb
 DIST QtPy-2.0.0.tar.gz 39628 BLAKE2B bc1b2cf975c3457cb026016854ec70e0aa3247c1234643dbf95681f655678e43ba0200b26e16a0b9eafd6fb373c1f876d9a54458ceb9b9b035ad463b7874db2c SHA512 95855c305da7f54850bcb6297a1f12ceda79eaf6d9b01771b1391d2d7b07b8f690e134cc2d52417bcc320395dce8c1f7f5c6ccadf2939db196e0ed5441215d5a
+DIST QtPy-2.0.1.tar.gz 43047 BLAKE2B 66625852e75fbfcf0bf96e740754ca26b6d5226dd5450d0274cf6dc875cba18e5ed8e339c8c7ad084ffa9b135f19447e087b338690ec521205316c4f22f09197 SHA512 5d482b0a5bd2be67a0fabccf98a9dedf28ef328641c8c976e2274d4a5afb14b9fefce251e80496ed54425dcb3da24984c6c36308db0bfc810ea2142528ad88fd
diff --git a/dev-python/QtPy/QtPy-2.0.1.ebuild b/dev-python/QtPy/QtPy-2.0.1.ebuild
new file mode 100644
index 000000000000..0c0e1044b86c
--- /dev/null
+++ b/dev-python/QtPy/QtPy-2.0.1.ebuild
@@ -0,0 +1,140 @@
+# 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 virtualx
+
+DESCRIPTION="Abstraction layer on top of PyQt5 and PySide2 and additional custom QWidgets"
+HOMEPAGE="https://github.com/spyder-ide/qtpy/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+_IUSE_QT_MODULES="
+	declarative designer gui help location multimedia network opengl
+	positioning printsupport sensors serialport speech sql svg testlib
+	webchannel webengine websockets widgets x11extras xml xmlpatterns
+"
+IUSE="+pyqt5 pyside2 ${_IUSE_QT_MODULES}"
+unset _IUSE_QT_MODULES
+
+REQUIRED_USE="|| ( pyqt5 pyside2 )"
+
+# These flags are currently *not* common to both the PySide2 and PyQt5 ebuild
+# Disable them for now, please check periodically if this is still up to date.
+# 	bluetooth? ( pyqt5 )
+# 	dbus? ( pyqt5 )
+#
+# 	3d? ( pyside2 )
+# 	charts? ( pyside2 )
+# 	concurrent? ( pyside2 )
+# 	datavis? ( pyside2 )
+# 	scxml? ( pyside2 )
+# 	script? ( pyside2 )
+# 	scripttools? ( pyside2 )
+
+# WARNING: the obvious solution of using || for PyQt5/pyside2 is not going
+# to work. The package only checks whether PyQt5/pyside2 is installed, it does
+# not verify whether they have the necessary modules (i.e. satisfy the USE dep).
+#
+# Webengine is a special case, because PyQt5 provides this in a separate package
+# while PySide2 ships it in the same package.
+#
+# declarative/qml/quick is a special case, because PyQt5 bundles the bindings
+# for qml and quick in one flag: declarative PySide2 does not.
+#
+# The PyQt5 ebuild currently enables xml support unconditionally, the flag is
+# added anyway with a (+) to make it future proof if the ebuild were to change
+# this behaviour in the future.
+#
+# The PySide2 ebuild currently enables opengl and serialport support
+# unconditionally, the flag is added anyway with a (+) to make it future proof
+# if the ebuild were to change this behaviour in the future.
+RDEPEND="
+	dev-python/packaging[${PYTHON_USEDEP}]
+	pyqt5? (
+		dev-python/PyQt5[${PYTHON_USEDEP}]
+		dev-python/PyQt5[declarative?,designer?,gui?,help?,location?]
+		dev-python/PyQt5[multimedia?,network?,opengl?,positioning?]
+		dev-python/PyQt5[printsupport?,sensors?,serialport?,speech(-)?,sql?,svg?]
+		dev-python/PyQt5[testlib?,webchannel?,websockets?,widgets?]
+		dev-python/PyQt5[x11extras?,xml(+)?,xmlpatterns?]
+		webengine? ( dev-python/PyQtWebEngine[${PYTHON_USEDEP}] )
+	)
+	pyside2? (
+		dev-python/pyside2[${PYTHON_USEDEP}]
+		dev-python/pyside2[designer?,gui?,help?,location?,multimedia?]
+		dev-python/pyside2[network?,opengl(+)?,positioning?,printsupport?]
+		dev-python/pyside2[sensors?,serialport(+)?,speech?,sql?,svg?]
+		dev-python/pyside2[testlib?,webchannel?,webengine?,websockets?]
+		dev-python/pyside2[widgets?,x11extras?,xml?,xmlpatterns?]
+		declarative? ( dev-python/pyside2[qml,quick] )
+	)
+"
+
+# The QtPy testsuite skips tests for bindings that are not installed, so here we
+# ensure that everything is available and all tests are run. Note that not
+# all flags are available in PyQt5/PySide2, so some tests are still skipped.
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		pyqt5? (
+			dev-python/PyQt5[${PYTHON_USEDEP}]
+			dev-python/PyQt5[bluetooth,dbus,declarative,designer,gui,help,location]
+			dev-python/PyQt5[multimedia,network,opengl,positioning,printsupport]
+			dev-python/PyQt5[sensors,serialport,speech(-),sql,svg,testlib,webchannel]
+			dev-python/PyQt5[websockets,widgets,x11extras,xml(+),xmlpatterns]
+			dev-python/PyQtWebEngine[${PYTHON_USEDEP}]
+		)
+		pyside2? (
+			dev-python/pyside2[${PYTHON_USEDEP}]
+			dev-python/pyside2[3d,charts,concurrent,datavis,designer,gui,help]
+			dev-python/pyside2[location,multimedia,network,opengl(+),positioning]
+			dev-python/pyside2[printsupport,qml,quick,script,scripttools,scxml]
+			dev-python/pyside2[sensors,serialport(+),speech,sql,svg,testlib]
+			dev-python/pyside2[webchannel,webengine,websockets,widgets,x11extras]
+			dev-python/pyside2[xml,xmlpatterns]
+		)
+	)
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	default
+	# Disale Qt for Python implementations that are not selected
+	if ! use pyqt5; then
+		sed -i -e "s/from PyQt5.QtCore import/raise ImportError #/" qtpy/__init__.py || die
+	fi
+	if ! use pyside2; then
+		sed -i -e "s/from PySide2 import/raise ImportError #/" qtpy/__init__.py || die
+		sed -i -e "s/from PySide2.QtCore import/raise ImportError #/" qtpy/__init__.py || die
+	fi
+
+	# Disable outdated PyQt4 and PySide
+	sed -i -e "s/from PyQt4.Qt import/raise ImportError #/" qtpy/__init__.py || die
+	sed -i -e "s/from PyQt4.QtCore import/raise ImportError #/" qtpy/__init__.py || die
+	sed -i -e "s/from PySide import/raise ImportError #/" qtpy/__init__.py || die
+	sed -i -e "s/from PySide.QtCore import/raise ImportError #/" qtpy/__init__.py || die
+}
+
+python_test() {
+	if use pyqt5; then
+		QT_API="pyqt5" virtx epytest
+	fi
+	if use pyside2; then
+		QT_API="pyside2" virtx epytest
+	fi
+}
+
+pkg_postinst() {
+	if use pyqt5 && use pyside2; then
+		ewarn "You have enabled both PyQt5 and PySide2, note that QtPy will default"
+		ewarn "to PyQt5 unless the QT_API environment variable overrides this."
+	fi
+}
diff --git a/dev-python/httpcore/Manifest b/dev-python/httpcore/Manifest
index 53d6932bdbf9..1a780dabcc57 100644
--- a/dev-python/httpcore/Manifest
+++ b/dev-python/httpcore/Manifest
@@ -1,6 +1 @@
-DIST httpcore-0.13.7.tar.gz 64734 BLAKE2B e6c4b1720ce4bf62689995d3e1c648c4702bb416f3b3586eb8dd2f0cfd2155046e64181c4c04e65f721a5f0fcbc23b5ffd01c2930c7c69d37ee4c36e37b7d0d4 SHA512 0cc48828d0710066b3ef89998ec85975285763ac63a8b59106952ef2dac5a02dac71e7e106c4b6ea1022eb4d06a9cb5ee3e634eb564bad49c5508beff75279d6
-DIST httpcore-0.14.3.tar.gz 64650 BLAKE2B 140c55af60f54ff13db958cecef50af2b8857837c00c2e5b1ec48d8866bc08146f608864a3dcaed0014505ba0ea10b8d457a763ecf434a0d40a2e11debdd4003 SHA512 05e92109839c2e2f7ec81fea9507fb15a12d1bf6ae92048170953b1cb0139237b81c892feff1bc3840e06887e8916cadcc4124725874344524e45e3640a00379
-DIST httpcore-0.14.4.tar.gz 68463 BLAKE2B cc6c17da3b97c2a8fb9edb0aeb6247904240748645f605b2f3c84194fc06bab10f568ce21b8beaf1dee9a8d68166f1691e00f17e44d89efce0a18a6fbd91d5a5 SHA512 4dfb2d0dd10df1de45f4e78ddedddf02bf500a81a0132919894bd5c07f02a2975ce589ba3f6d79dd92ec882128f86f338bd32f35cdecb6618307e446ed369310
-DIST httpcore-0.14.5.tar.gz 74227 BLAKE2B 8e54b6b40d35a9228b96682d87651a6d3967441b74f3544a21b378620b417b48978f51d25b1980d87fad4748537036c6f2a4751e8b58e622c7c76389ff1afb67 SHA512 1705cf83df3ead454065e2ed4c300697c5d0a6609846a3eadfca2af2d9c1578f951c2f4bf3ac018c3cc984d2d2ccd39c4b2de781747588a6116eebe1007afff0
-DIST httpcore-0.14.6.tar.gz 75303 BLAKE2B 408d140e754cf765809af2549d0ae8a076c63ef9df8358596fd893e2a744c95353fa1f8cadaafc5ca9b4710a87db6c27bdae1f5913f83a7d69c7b9b45192e994 SHA512 a3e2474619fec999150c5e2adb475e000b1d2de4ec84a9e93788e816717cd699f0ddc3494ec9e6f07cb1c6a95d74d39a83799ac4fd07d02a8fab72a1253b97ba
 DIST httpcore-0.14.7.gh.tar.gz 75844 BLAKE2B 50d5fac7f44996cc5a08b4f994c2109b173e5b9fea080c8740309b799421d012a70280a84fffe93e290bf425e5ee6eb1bfcb74aff81fa7e737c21f25019e6664 SHA512 6865e97f9b84846bb4e9304ea358b0a28d66fd2d1e244e8a2a439ee446a294ecbc68ac07d5a718fd1c3eceaa44a391d7a8f7f2ca659f1674eb17a90f39987d48
diff --git a/dev-python/httpcore/httpcore-0.13.7.ebuild b/dev-python/httpcore/httpcore-0.13.7.ebuild
deleted file mode 100644
index 5f769836ce51..000000000000
--- a/dev-python/httpcore/httpcore-0.13.7.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2021 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="A minimal low-level HTTP client"
-HOMEPAGE="https://www.encode.io/httpcore/"
-SRC_URI="https://github.com/encode/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ppc ppc64 ~riscv sparc x86"
-
-RDEPEND="
-	=dev-python/anyio-3*[${PYTHON_USEDEP}]
-	<dev-python/h11-0.13[${PYTHON_USEDEP}]
-	<dev-python/h2-5[${PYTHON_USEDEP}]
-	=dev-python/sniffio-1*[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-		dev-python/trustme[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# trio is not in the tree, anyio is causing tons of test failures
-	# (probably insisting on using trio)
-	sed -i 's/^@pytest.mark.\(anyio\|trio\)/@pytest.mark.skip/' \
-		tests/async_tests/test_*.py || die
-	sed -i '/^import trio/d' tests/utils.py || die
-	# pproxy is not in the tree, the associated fixture
-	# must be disabled to prevent errors during test setup
-	sed -i 's/def proxy_server().*/&\n    pytest.skip()/' \
-		tests/conftest.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	local skipped_tests=(
-		# Require Internet access or hypercorn (not in the tree)
-		tests/test_threadsafety.py::test_threadsafe_basic
-		tests/sync_tests/test_interfaces.py::test_http_request
-		tests/sync_tests/test_interfaces.py::test_https_request
-		tests/sync_tests/test_interfaces.py::test_http2_request
-		tests/sync_tests/test_interfaces.py::test_closing_http_request
-		tests/sync_tests/test_interfaces.py::test_connection_pool_get_connection_info
-		tests/sync_tests/test_interfaces.py::test_max_keepalive_connections_handled_correctly
-		tests/sync_tests/test_interfaces.py::test_explicit_backend_name
-		tests/sync_tests/test_interfaces.py::test_connection_timeout_tcp
-		tests/sync_tests/test_interfaces.py::test_broken_socket_detection_many_open_files
-		tests/sync_tests/test_retries.py::test_no_retries
-		tests/sync_tests/test_retries.py::test_retries_exceeded
-		tests/sync_tests/test_retries.py::test_retries_enabled
-		# Require hypercorn
-		tests/sync_tests/test_interfaces.py::test_connection_timeout_uds
-	)
-	epytest ${skipped_tests[@]/#/--deselect }
-}
diff --git a/dev-python/httpcore/httpcore-0.14.3.ebuild b/dev-python/httpcore/httpcore-0.14.3.ebuild
deleted file mode 100644
index 133f03e95bf5..000000000000
--- a/dev-python/httpcore/httpcore-0.14.3.ebuild
+++ /dev/null
@@ -1,34 +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} )
-inherit distutils-r1
-
-DESCRIPTION="A minimal low-level HTTP client"
-HOMEPAGE="https://www.encode.io/httpcore/"
-SRC_URI="https://github.com/encode/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ppc ppc64 ~riscv sparc x86"
-
-RDEPEND="
-	=dev-python/anyio-3*[${PYTHON_USEDEP}]
-	dev-python/certifi[${PYTHON_USEDEP}]
-	<dev-python/h11-0.13[${PYTHON_USEDEP}]
-	<dev-python/h2-5[${PYTHON_USEDEP}]
-	=dev-python/sniffio-1*[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-		dev-python/pytest-httpbin[${PYTHON_USEDEP}]
-		dev-python/pytest-trio[${PYTHON_USEDEP}]
-		dev-python/trio[${PYTHON_USEDEP}]
-		dev-python/trustme[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/httpcore/httpcore-0.14.4.ebuild b/dev-python/httpcore/httpcore-0.14.4.ebuild
deleted file mode 100644
index 5a13510b01a1..000000000000
--- a/dev-python/httpcore/httpcore-0.14.4.ebuild
+++ /dev/null
@@ -1,34 +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} )
-inherit distutils-r1
-
-DESCRIPTION="A minimal low-level HTTP client"
-HOMEPAGE="https://www.encode.io/httpcore/"
-SRC_URI="https://github.com/encode/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
-
-RDEPEND="
-	=dev-python/anyio-3*[${PYTHON_USEDEP}]
-	dev-python/certifi[${PYTHON_USEDEP}]
-	<dev-python/h11-0.13[${PYTHON_USEDEP}]
-	<dev-python/h2-5[${PYTHON_USEDEP}]
-	=dev-python/sniffio-1*[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-		dev-python/pytest-httpbin[${PYTHON_USEDEP}]
-		dev-python/pytest-trio[${PYTHON_USEDEP}]
-		dev-python/trio[${PYTHON_USEDEP}]
-		dev-python/trustme[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/httpcore/httpcore-0.14.5.ebuild b/dev-python/httpcore/httpcore-0.14.5.ebuild
deleted file mode 100644
index 30c4579b2972..000000000000
--- a/dev-python/httpcore/httpcore-0.14.5.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
-
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-inherit distutils-r1 optfeature
-
-DESCRIPTION="A minimal low-level HTTP client"
-HOMEPAGE="https://www.encode.io/httpcore/"
-SRC_URI="https://github.com/encode/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
-
-RDEPEND="
-	=dev-python/anyio-3*[${PYTHON_USEDEP}]
-	dev-python/certifi[${PYTHON_USEDEP}]
-	<dev-python/h11-0.13[${PYTHON_USEDEP}]
-	<dev-python/h2-5[${PYTHON_USEDEP}]
-	=dev-python/sniffio-1*[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-		dev-python/pytest-httpbin[${PYTHON_USEDEP}]
-		dev-python/pytest-trio[${PYTHON_USEDEP}]
-		dev-python/socksio[${PYTHON_USEDEP}]
-		dev-python/trio[${PYTHON_USEDEP}]
-		dev-python/trustme[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-pkg_postinst() {
-	optfeature "SOCKs support" dev-python/socksio
-}
diff --git a/dev-python/httpcore/httpcore-0.14.6.ebuild b/dev-python/httpcore/httpcore-0.14.6.ebuild
deleted file mode 100644
index e34818d28788..000000000000
--- a/dev-python/httpcore/httpcore-0.14.6.ebuild
+++ /dev/null
@@ -1,41 +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 optfeature
-
-DESCRIPTION="A minimal low-level HTTP client"
-HOMEPAGE="https://www.encode.io/httpcore/"
-SRC_URI="https://github.com/encode/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
-
-RDEPEND="
-	=dev-python/anyio-3*[${PYTHON_USEDEP}]
-	dev-python/certifi[${PYTHON_USEDEP}]
-	<dev-python/h11-0.13[${PYTHON_USEDEP}]
-	<dev-python/h2-5[${PYTHON_USEDEP}]
-	=dev-python/sniffio-1*[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-		dev-python/pytest-httpbin[${PYTHON_USEDEP}]
-		dev-python/pytest-trio[${PYTHON_USEDEP}]
-		dev-python/socksio[${PYTHON_USEDEP}]
-		dev-python/trio[${PYTHON_USEDEP}]
-		dev-python/trustme[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-pkg_postinst() {
-	optfeature "SOCKS support" dev-python/socksio
-}
diff --git a/dev-python/httpcore/httpcore-0.14.7.ebuild b/dev-python/httpcore/httpcore-0.14.7.ebuild
index 30cfd153bc86..7ba7d24f91c9 100644
--- a/dev-python/httpcore/httpcore-0.14.7.ebuild
+++ b/dev-python/httpcore/httpcore-0.14.7.ebuild
@@ -15,7 +15,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 hppa ppc ~ppc64 ~riscv sparc x86"
+KEYWORDS="amd64 arm arm64 hppa ppc ppc64 ~riscv sparc x86"
 
 RDEPEND="
 	=dev-python/anyio-3*[${PYTHON_USEDEP}]
diff --git a/dev-python/mkdocs-git-authors-plugin/Manifest b/dev-python/mkdocs-git-authors-plugin/Manifest
index 9a3ffcb3f1c9..a43334a698a2 100644
--- a/dev-python/mkdocs-git-authors-plugin/Manifest
+++ b/dev-python/mkdocs-git-authors-plugin/Manifest
@@ -1,2 +1,3 @@
 DIST mkdocs-git-authors-plugin-0.6.2.tar.gz 27623 BLAKE2B 7b0dd3b865b067b63e467fa75018a92cea8cfeabdeb66791664ea143ebecbb072110698f1366f917f390dd29c33794c7d2cc03e03bb84f8913b572d667e77b9d SHA512 75e4a4e6f3ca443257b5f61f5f0d9784cb4bb28a5a03412cde5c226da697117a29c2f4a3d1cac2aa362421f244fd56ea8580a923414a8e096bedc4502afcb5b0
 DIST mkdocs-git-authors-plugin-0.6.3.tar.gz 27644 BLAKE2B a8778baeb504db5d0571aa20603e8d60e04d8c315c096b5b3f89bb6a3b433a11b04a510d7f80ae86a9bb54259c6a2b0f2e1cb5cdade4220d4dfa1f06612e4aea SHA512 ab1f6984da002b72af2a53131222a3ff7b6b50a7a57f5d1986bca9e7d34365eaa5bfdf7d920e4dbc555e332587607480eef4134d847faf866a3b4750db3747eb
+DIST mkdocs-git-authors-plugin-0.6.4.tar.gz 27799 BLAKE2B 02456df969fac72fc29906ed6faa34ead8d04dcd005fdc39bf72393e5252934c398995cb07133107af99672328d03b96e9a19625a7a83ee438278cf4f8587f50 SHA512 948b59bed123acc4b02a01248b831ac27fd98a24653fbae315424a1da33573d109667ff8b836be454e7c9b56a6f68f45200effe8649fd4fe6d5551d1b93a6cd5
diff --git a/dev-python/mkdocs-git-authors-plugin/mkdocs-git-authors-plugin-0.6.4.ebuild b/dev-python/mkdocs-git-authors-plugin/mkdocs-git-authors-plugin-0.6.4.ebuild
new file mode 100644
index 000000000000..ae8d29287886
--- /dev/null
+++ b/dev-python/mkdocs-git-authors-plugin/mkdocs-git-authors-plugin-0.6.4.ebuild
@@ -0,0 +1,52 @@
+# 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} )
+
+DOCS_BUILDER="mkdocs"
+DOCS_DEPEND="dev-python/mkdocs-material"
+
+inherit distutils-r1 docs
+
+DESCRIPTION="Mkdocs plugin to display git authors of a page"
+HOMEPAGE="
+	https://github.com/timvink/mkdocs-git-authors-plugin/
+	https://pypi.org/project/mkdocs-git-authors-plugin/
+"
+SRC_URI="https://github.com/timvink/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv ~x86"
+
+RDEPEND="
+	dev-python/GitPython[${PYTHON_USEDEP}]
+	>=dev-python/mkdocs-1.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/click[${PYTHON_USEDEP}]
+		dev-python/mkdocs-material[${PYTHON_USEDEP}]
+		dev-python/mkdocs-git-revision-date-localized-plugin[${PYTHON_USEDEP}]
+		dev-vcs/git
+	)
+	doc? ( dev-vcs/git )
+"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# mkdocs-git-authors tests need git repo
+	if use test || use doc; then
+		git init -q || die
+		git config --global user.email "you@example.com" || die
+		git config --global user.name "Your Name" || die
+		git add . || die
+		git commit -qm 'init' || die
+	fi
+
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/mkdocs-git-revision-date-localized-plugin/Manifest b/dev-python/mkdocs-git-revision-date-localized-plugin/Manifest
index e5ac25e24acd..270cce364289 100644
--- a/dev-python/mkdocs-git-revision-date-localized-plugin/Manifest
+++ b/dev-python/mkdocs-git-revision-date-localized-plugin/Manifest
@@ -1 +1,2 @@
 DIST mkdocs-git-revision-date-localized-plugin-0.11.1.tar.gz 369943 BLAKE2B 261813f3d63d6b1bfb021aab3f9db96f7977ac8f6bf6239158f1d8045e1eb5b21b89f2c4eb493634944b202334f59ce589797624137bfc643cda3ef52969bd73 SHA512 fb5e1c1b65f431585dc6a6887fc079a3181e73286697c331317a69f7748453af61abfb8fc58eb55203f09c9a70c752781dd834d03e13184ddb0bb761aa10e371
+DIST mkdocs-git-revision-date-localized-plugin-0.12.1.tar.gz 370763 BLAKE2B 6b69b34a18288d042aa754bcb6f3c6a3b96de0016db1ef888d2b0fe09f479964e6d0473d8af700aec904befb79d5a56e775847c87cd06b1ffc90cfdbe6e73b18 SHA512 4368ae0341fa9e3af08f93cce883b03cc9bd3bef16dcec7314c7e439d6524726173ffb60bbc11bcdd9e3c9ef5f1fa7d24a1c01dc543241061c61a8b0f5044614
diff --git a/dev-python/mkdocs-git-revision-date-localized-plugin/mkdocs-git-revision-date-localized-plugin-0.12.1.ebuild b/dev-python/mkdocs-git-revision-date-localized-plugin/mkdocs-git-revision-date-localized-plugin-0.12.1.ebuild
new file mode 100644
index 000000000000..e74497a9737a
--- /dev/null
+++ b/dev-python/mkdocs-git-revision-date-localized-plugin/mkdocs-git-revision-date-localized-plugin-0.12.1.ebuild
@@ -0,0 +1,55 @@
+# 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} )
+
+DOCS_BUILDER="mkdocs"
+DOCS_DEPEND="
+	dev-python/mkdocs-material
+	dev-python/mkdocs-git-authors-plugin
+"
+
+inherit distutils-r1 docs
+
+DESCRIPTION="Display the localized date of the last git modification of a markdown file"
+HOMEPAGE="
+	https://github.com/timvink/mkdocs-git-revision-date-localized-plugin/
+	https://pypi.org/project/mkdocs-git-revision-date-localized-plugin/
+"
+SRC_URI="https://github.com/timvink/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv ~x86"
+
+RDEPEND="
+	>=dev-python/Babel-2.7.0[${PYTHON_USEDEP}]
+	dev-python/GitPython[${PYTHON_USEDEP}]
+	>=dev-python/mkdocs-1.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/click[${PYTHON_USEDEP}]
+		dev-python/mkdocs-material[${PYTHON_USEDEP}]
+		dev-vcs/git
+	)
+	doc? ( dev-vcs/git )
+"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# mkdocs-git-revision-date-localized-plugin's tests need git repo
+	if use test || use doc; then
+		git init -q || die
+		git config --global user.email "you@example.com" || die
+		git config --global user.name "Your Name" || die
+		git add . || die
+		git commit -qm 'init' || die
+	fi
+
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/mkdocs-material/Manifest b/dev-python/mkdocs-material/Manifest
index 88350d794c0e..b8c62e621cfd 100644
--- a/dev-python/mkdocs-material/Manifest
+++ b/dev-python/mkdocs-material/Manifest
@@ -1,2 +1,3 @@
 DIST mkdocs-material-8.1.8.gh.tar.gz 7942776 BLAKE2B 368f922f4b8b4723db36354697131a7055fcad4af0db015ef7e9c43b37431a8e7e64635241232b845bf73ab5a45a738f7741dc6d5e47d364c54be61df6a0a314 SHA512 9e3bc19d9c23b484c4c9dcd7f357efd151d351e1ab15be70a44607b4a6b59e367e93d3ccf4c31e5975cb41cb63939614cf26ca9ba6788abf000ad94b3a920b7b
 DIST mkdocs-material-8.1.9.gh.tar.gz 7969721 BLAKE2B 91c72e67baac0889077ed7b93afb697042f7b09a144e3cdb343cad88a7d7f55dafa01aa96d7fdc10b09b60213e849027bcb158dd4cb41d5f5443e43f43258628 SHA512 6a1e4284364215cb9f53a67c493b4e01e6449fa0970e8c93ca84a2bd585c631255599254bb215a281a1462dc9e6ea1db478a90647b32702e175c63a59f2b0d21
+DIST mkdocs-material-8.2.1.gh.tar.gz 8102602 BLAKE2B 04e8e3230d44376ace16a34d78a19c290a3c87013a2193983a60d8b8fa8bf456d407e11be250750135ad7cfe8633152e7c031c4b4e9a99093ac98885caacacca SHA512 2a79504d882360152bc130f5ee2903ed360685294e4f57ab5cb6fef6095fa6ca68da2c5d580837a30cc50e3c6f89d3b7a2ff1c62e768faa080e65d8220e43db7
diff --git a/dev-python/mkdocs-material/mkdocs-material-8.2.1.ebuild b/dev-python/mkdocs-material/mkdocs-material-8.2.1.ebuild
new file mode 100644
index 000000000000..23ac9d216aac
--- /dev/null
+++ b/dev-python/mkdocs-material/mkdocs-material-8.2.1.ebuild
@@ -0,0 +1,38 @@
+# 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} )
+
+DOCS_BUILDER="mkdocs"
+DOCS_DEPEND="
+	dev-python/mkdocs-minify-plugin
+	dev-python/mkdocs-redirects
+"
+
+inherit distutils-r1 docs
+
+DESCRIPTION="A Material Design theme for MkDocs"
+HOMEPAGE="
+	https://github.com/squidfunk/mkdocs-material
+	https://pypi.org/project/mkdocs-material
+"
+SRC_URI="
+	https://github.com/squidfunk/${PN}/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv ~x86"
+
+RDEPEND="
+	>=dev-python/jinja-2.11.1[${PYTHON_USEDEP}]
+	>=dev-python/markdown-3.2[${PYTHON_USEDEP}]
+	>=dev-python/mkdocs-1.2.3[${PYTHON_USEDEP}]
+	>=dev-python/pygments-2.10[${PYTHON_USEDEP}]
+	>=dev-python/pymdown-extensions-9.0[${PYTHON_USEDEP}]
+	>=dev-python/mkdocs-material-extensions-1.0[${PYTHON_USEDEP}]
+"
diff --git a/dev-python/mkdocs_pymdownx_material_extras/Manifest b/dev-python/mkdocs_pymdownx_material_extras/Manifest
index 5e3dcbe45726..04fff69cb7a6 100644
--- a/dev-python/mkdocs_pymdownx_material_extras/Manifest
+++ b/dev-python/mkdocs_pymdownx_material_extras/Manifest
@@ -2,3 +2,4 @@ DIST mkdocs_pymdownx_material_extras-1.0.7.tar.gz 17995 BLAKE2B a7a8715ec07b9ef5
 DIST mkdocs_pymdownx_material_extras-1.1.3.tar.gz 40029 BLAKE2B faa17e6e4d27a5d5e34a98a6830e34b934f8623fafb87a73051eb424cf95d29c5dd185bbfbbe49dd3e93eeee00a8310ac0543d480ab70e5abee4047b1cecc774 SHA512 340818ebcd8f9cf175e5049028d0932a0d6208de3d8f86cf5ea47747680079c6b9b3bf27e0c32ee10ee6a1bc7ab8ffc6cc3aa48470be43ed32adfde74f44d5dd
 DIST mkdocs_pymdownx_material_extras-1.5.5.tar.gz 23950 BLAKE2B 00ff2c961e77eab05fce2432c59a2f6e62cc888501df69aea83ba870cb353f259d00d8217386593dc2252b39e709cef12c20505d98b2e56a5cdafe337f3ad1e7 SHA512 e421940fd204bc8ac2293e495a98fbb9b4615ab80f8a230f2a829bf9b8991b1425c454f70a4a37048d6df9fa5c302395ffad0c63e020e65987cff9b12576cad6
 DIST mkdocs_pymdownx_material_extras-1.5.7.tar.gz 24006 BLAKE2B 8c8b23bc86829bd8ce1760d6d538db94606a4ebffbfb6e0e92a656474d814861985a087a241c3bb34e1ba0f856e519ead36f83d2262b6692effcc9d745f74e55 SHA512 bfb73202f7e9a11feecd10812c90ffabf6e687bbf618002f6252281b432f35cd46e27820e170eaa6c7b84a587d40cde26652da54ec70cd744da7df1544e302c5
+DIST mkdocs_pymdownx_material_extras-1.6.tar.gz 25764 BLAKE2B d28f98f82818aaaf81d70b80ed656d94f2454e366d1ebdf6ed6448adac112f6f5876ae43f791c29aab5d7f2da1d48f67d413f7e9dab57f1a85a497317fed36b0 SHA512 b815d773476d6a5a76c7a483907164870e37cfec31dc3a3596ccf21f4f93b8ea1ca52654cd1dfc64df67380e1c6f4dccb1d6534fa6425fb29cf0654f9cb094e1
diff --git a/dev-python/mkdocs_pymdownx_material_extras/mkdocs_pymdownx_material_extras-1.6.ebuild b/dev-python/mkdocs_pymdownx_material_extras/mkdocs_pymdownx_material_extras-1.6.ebuild
new file mode 100644
index 000000000000..6297ecdae43c
--- /dev/null
+++ b/dev-python/mkdocs_pymdownx_material_extras/mkdocs_pymdownx_material_extras-1.6.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} )
+
+inherit distutils-r1
+
+DESCRIPTION="Custom alterations based on Mkdocs-Material"
+HOMEPAGE="
+	https://github.com/facelessuser/mkdocs_pymdownx_material_extras
+	https://pypi.org/project/mkdocs-pymdownx-material-extras"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv ~x86"
+
+RDEPEND="
+	>=dev-python/mkdocs-material-5.0.2[${PYTHON_USEDEP}]
+"
diff --git a/dev-python/pyrsistent/Manifest b/dev-python/pyrsistent/Manifest
index bd3df50de8df..adb357a8ba40 100644
--- a/dev-python/pyrsistent/Manifest
+++ b/dev-python/pyrsistent/Manifest
@@ -1,2 +1 @@
-DIST pyrsistent-0.18.0.tar.gz 104215 BLAKE2B 028c26a6b4bcaa8c3e3e1ad1748a6b45f664355c66f0f97c70e4d26c66946a55b346d0340c2e697e9890039692580c03032055cab7c198c39530e5561be83801 SHA512 f56062430f914a884a9317ecf5278ccc09d98f1d6867716f89173db47996b8d4c1ef4f5c0121c955d81fc4fe8aba7d30f38679baea6208168c3952846064cfeb
 DIST pyrsistent-0.18.1.tar.gz 100522 BLAKE2B 75632d254993666076a68d81b8b5a7aced8601146fed5cd63f1d56c5e0578650a197aca7630855de32a8447eab972203aa7d83009398f96e6f374c0a4b2cc1ba SHA512 353ad6e9165e1afdde37730a9289cf8dde28491abb688d702a8c8f5279e24f5ce387a5d00ac4a077322299f9c1a535781bcacdcd1cb914ddb317b3ca9641778b
diff --git a/dev-python/pyrsistent/pyrsistent-0.18.0.ebuild b/dev-python/pyrsistent/pyrsistent-0.18.0.ebuild
deleted file mode 100644
index 385ec3c5b2b4..000000000000
--- a/dev-python/pyrsistent/pyrsistent-0.18.0.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2021 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="Persistent/Functional/Immutable data structures"
-HOMEPAGE="https://github.com/tobgu/pyrsistent/ https://pypi.org/project/pyrsistent/"
-SRC_URI="mirror://pypi/${P: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"
-
-BDEPEND="
-	test? (
-		dev-python/hypothesis[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
diff --git a/dev-python/pyrsistent/pyrsistent-0.18.1.ebuild b/dev-python/pyrsistent/pyrsistent-0.18.1.ebuild
index 977528f1b921..9f8e1ed65cea 100644
--- a/dev-python/pyrsistent/pyrsistent-0.18.1.ebuild
+++ b/dev-python/pyrsistent/pyrsistent-0.18.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${P: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"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/python3-saml/Manifest b/dev-python/python3-saml/Manifest
index b4371a78cfb7..18a0b376494e 100644
--- a/dev-python/python3-saml/Manifest
+++ b/dev-python/python3-saml/Manifest
@@ -1,2 +1,3 @@
 DIST python3-saml-1.11.0.tar.gz 506373 BLAKE2B 909244e18b6ccb3cd0ed0059e387c14eb75a1a0fb709bdbc33f6dbcdda5b70359e6fedd77ab88e580aaf28503ca3f3fe49308f56338a1d8855149a7ba992034d SHA512 9e54eee28e2b6430d9f08342c312997b6a20f85e3f663573b93c4d8d65a6540c7d6f4e05d35314014b20ba080110a2a51718ac6754ef2b19bfe23d2d4381de24
 DIST python3-saml-1.13.0.gh.tar.gz 509986 BLAKE2B e7c1720683f0391fe943de6ac95c69605a9e1499cf68d9bc416b56390bb5a4f16b17722aad4f6af2cf018195251554ebcc27a10a1605529fd3c98dd37efa4fea SHA512 e13325cdb2857d95ebd34dc4417f7929a76d1afdeb11972ef2fe3719c2db210137c5fef2c5dd4c09bd4dc467aa76afe5cbf14015f7eaf0941b369487313d3c97
+DIST python3-saml-1.14.0.gh.tar.gz 510031 BLAKE2B 10c1102b29b58017a39241dbab7d2fb85231f051e3701ff24197f2e501ae19b1889d4032fe86a60ed5ee708380d44111dc6ab87900c8463a141ea911fe774eeb SHA512 6807a4741164dfdf185a4c63691d5a1f0e91feff387265dc8b54b135d44158c751c2274eb1f47eb71d61c7e233d38ddc83f34d092cb842676830699ad6ee8af4
diff --git a/dev-python/python3-saml/python3-saml-1.14.0.ebuild b/dev-python/python3-saml/python3-saml-1.14.0.ebuild
new file mode 100644
index 000000000000..971ee87ea1f1
--- /dev/null
+++ b/dev-python/python3-saml/python3-saml-1.14.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 2020-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="OneLogin's SAML Python Toolkit"
+HOMEPAGE="https://github.com/onelogin/python3-saml
+	https://pypi.org/project/python3-saml/"
+SRC_URI="
+	https://github.com/onelogin/python3-saml/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+
+RDEPEND="
+	>=dev-python/isodate-0.6.1[${PYTHON_USEDEP}]
+	>=dev-python/lxml-4.7.0[${PYTHON_USEDEP}]
+	>=dev-python/python-xmlsec-1.3.9[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/freezegun[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests setup.py
+
+src_prepare() {
+	# unpin deps
+	sed -e '/lxml/s/</>=/' -i setup.py || die
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/socksio/socksio-1.0.0.ebuild b/dev-python/socksio/socksio-1.0.0.ebuild
index aeb3dc67cab7..f294d474638a 100644
--- a/dev-python/socksio/socksio-1.0.0.ebuild
+++ b/dev-python/socksio/socksio-1.0.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 hppa ppc ~ppc64 ~riscv sparc x86"
+KEYWORDS="amd64 arm arm64 hppa ppc ppc64 ~riscv sparc x86"
 
 distutils_enable_tests pytest