Sync with portage [Mon May 2 22:02:29 MSK 2022].

2 years ago · 5f44044ad4
parent 19c05e5739
commit 5f44044ad4
279 changed files with 3024 additions and 1250 deletions
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
--- a/app-admin/ansible-base/ansible-base-2.12.4.ebuild
+++ b/app-admin/ansible-base/ansible-base-2.12.4.ebuild
@ -19,7 +19,7 @@ else
 	MY_PN="${PN/-base/-core}"
 	MY_P="${MY_PN}-${PV}"
 	SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~x64-macos"
+	KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86 ~x64-macos"
 	S="${WORKDIR}"/${MY_P}
 fi

--- a/app-admin/ansible/Manifest
+++ b/app-admin/ansible/Manifest
@ -1,6 +1,4 @@
 DIST ansible-4.6.0.tar.gz 35644507 BLAKE2B 94f544caa81ba7d20493f469483612f2ebf9eb1c4be18006b5ca6afdb3bd45428226340a0658b8f1ebecf8bd06396763ba888bb1cbd48aa6b71aaa6a56542d38 SHA512 5b7fad69628dded0b42a25e3f2fbbcc30ef876dc3f97dc1dff2c7db6443d1506fe5db62bc4d8a00ebfb7dc78ecc205a56bea3bf760f85260c835b2286f63b702
-DIST ansible-5.0.1.tar.gz 38449873 BLAKE2B 1b2cfab6f851c3eb9cc124c7178d9a156a4279fa539e960213289a6e7c8e6b4efcde009fe8484259150ffb8a2ce90080c7e9356308bea6f46e51645518593f6b SHA512 ade29442ed12f635161b2a98dabce75c125b8eac855b33cfc484f35624e55f51534a8a0c414450db60cdf3d8f25ae6ab66946a1cd2c3468f921d7a2ced38a2de
-DIST ansible-5.3.0.tar.gz 38005050 BLAKE2B 57e196fe005060cf53f9d76e33e61d461035fc9472254e90c28eb5107dc3546aa38c5f3bc340a7ace518e853bc50bb4299015dc087e286064efc661825df5ba9 SHA512 15f814f23305ceae3426464bccd6fc5cfb9b7b86b6634ce9b867d20c3d512e669387cbd12cb2ea03a66c352272aa72b53f255dfdd03c3198b70fc286e527f43a
 DIST ansible-5.4.0.tar.gz 38255326 BLAKE2B a7a840d9c8f6f260c8fc2b488b7d8c4b59fa1eeb68751f1cfe4cbf2cc68644ac0d716fd59e0df29f671e8bd3719b37d529ecbf008025988d38eb202fe7a41c75 SHA512 7065c7d16a3bb13db27a3ec99c33c48e9d4abb4bec8267751e3d8df89da7d0948a8415b50b8fabd05f6a97fba661714f08f8473ae145fcb323dd83f6c7349a6d
 DIST ansible-5.5.0.tar.gz 42044944 BLAKE2B f82b31ca7f329d408efdfdcbd0e281815efc618bb6d0dfa634fc66d0ad0113ab93941a1418dd2a5058a4bd63604e154e99d6b25eb3289b155fe76a9aec3ac045 SHA512 1a7b2021a2d5223c82eb05b517f61b0da62f6f33aef5dd7dd006527d71f41d18491634f156ab3a654bcdd4e03be5de4d6809c79e1b1053cbc577510e5ba47578
 DIST ansible-5.7.0.tar.gz 35864998 BLAKE2B 9bee56b3c1aec3af8fec68a80f97431d8c610a8646b755974cf6365d68e57a4adefb4f678ed76da1dd25802eec1abb45b596030b9ebca8337e4b9bf8c18b469b SHA512 2e2f88948e875a1ce5a6cac58ae0d918adf903848c60e125728314e935cbf29aae6db6ec87d9aad14fd5406751251a681b441f1209c789f14a1df6e68b91c3d9
--- a/app-admin/ansible/ansible-5.0.1.ebuild
+++ b/app-admin/ansible/ansible-5.0.1.ebuild
@ -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_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Model-driven deployment, config management, and command execution framework"
-HOMEPAGE="https://www.ansible.com/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86 ~x64-macos"
-RESTRICT="test"
-
-RDEPEND=">=app-admin/ansible-base-2.12.0
-	<app-admin/ansible-base-2.13"
-
-python_compile() {
-	local -x ANSIBLE_SKIP_CONFLICT_CHECK=1
-	distutils-r1_python_compile
-}
-python_install() {
-	local -x ANSIBLE_SKIP_CONFLICT_CHECK=1
-	distutils-r1_python_install
-}
--- a/app-admin/ansible/ansible-5.3.0.ebuild
+++ b/app-admin/ansible/ansible-5.3.0.ebuild
@ -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_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Model-driven deployment, config management, and command execution framework"
-HOMEPAGE="https://www.ansible.com/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86 ~x64-macos"
-RESTRICT="test"
-
-RDEPEND=">=app-admin/ansible-base-2.12.0
-	<app-admin/ansible-base-2.13"
-
-python_compile() {
-	local -x ANSIBLE_SKIP_CONFLICT_CHECK=1
-	distutils-r1_python_compile
-}
-python_install() {
-	local -x ANSIBLE_SKIP_CONFLICT_CHECK=1
-	distutils-r1_python_install
-}
--- a/app-admin/ansible/ansible-5.5.0.ebuild
+++ b/app-admin/ansible/ansible-5.5.0.ebuild
@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"

 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~x64-macos"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86 ~x64-macos"
 RESTRICT="test"

 RDEPEND=">=app-admin/ansible-base-2.12.0
--- a/app-containers/Manifest.gz
+++ b/app-containers/Manifest.gz
--- a/app-containers/docker-compose/Manifest
+++ b/app-containers/docker-compose/Manifest
@ -3,3 +3,5 @@ DIST docker-compose-2.3.3-deps.tar.xz 486283624 BLAKE2B 1bb2f743ff0ee46e4b5790bc
 DIST docker-compose-2.3.3.tar.gz 270143 BLAKE2B 9ab2863a37402ebcb881797e1d6a170dd9557d14a8174dec4049b55f6f3c106752423ac13d9e2ec1bb95dab83df83e53747519f4ceed91f7d9a5805c630e82e0 SHA512 5986f4f54302fd552c7aeb0cdfbe8d5185744bc2a2fe6f136e1a4009b3b9f68cf7578d3b6a2acb2067ef9a889eb33d159b2daf80140315a29412bda15d2a5446
 DIST docker-compose-2.4.1-deps.tar.xz 110605892 BLAKE2B 042d84818b963c23769e039a930076355cb2ebb2d86c5f8af56f240689012ae7aeff12cf366b46f2bf0fa0799d5f7b825f726686f54db218787e91a6c308ba5f SHA512 28bb292daac3ddf1055c4dd5f0b1920dc8145636e878beaac90863fec8b86e277f6906d82753b62fc7c9f755a9246c223307fad5fb412e41c0ca11b4d60e7e0e
 DIST docker-compose-2.4.1.tar.gz 274404 BLAKE2B 346c9c527630217fdeada28e7329400a910007c5296cf4b8b7f41d90049c51c54c518f82f602b71332d9ecd91eeb65e1135aa18c37fe98ee02b99238cf7dbadb SHA512 0c7611c95955b63a4cc77a4498393c52c7107a4a6fe950dbf2d1181df8f44f682337eb6cc7814e9902551b230507b12a05d1377acac7b2342f829401f1d24651
+DIST docker-compose-2.5.0-deps.tar.xz 110626568 BLAKE2B 657d4d421172a6ba3516475045af50ef2351cc847933a799b7232ad6a46485d7961ad5875c9f19bf96d39adf275ca943d02fba2b939a210c080c6d38211e56f5 SHA512 231416474c6b3f73911bc7cf344ea5bfdb719cecf6ad7b159c755814df08ffcb60d05ccbdd294211cb7f64a52a5a81e2dfd357bdc10738918d47a75909d20bf9
+DIST docker-compose-2.5.0.tar.gz 274812 BLAKE2B cf3b49cc13a8ab37d6426e78f4d9fca9a7b629346d292458e32ca2b66d20ba49929cc354d570b05deec3a0e0ac7778a02045ea87070059fc20c352f2d2ddb589 SHA512 7b556394e58dcdd49229c608d0672fe1aa5bd0b715f49b4b3e2ecbea16cc4962deb7e816ea057a8a565c598c21207316b8f7b5e41f0af0c3f330054ae81c2703
--- a/app-containers/docker-compose/docker-compose-2.5.0.ebuild
+++ b/app-containers/docker-compose/docker-compose-2.5.0.ebuild
@ -0,0 +1,50 @@
+# Copyright 2018-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit bash-completion-r1 go-module
+MY_PV=${PV/_/-}
+
+DESCRIPTION="Multi-container orchestration for Docker"
+HOMEPAGE="https://github.com/docker/compose"
+SRC_URI="https://github.com/docker/compose/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI+=" https://dev.gentoo.org/~williamh/dist/${P}-deps.tar.xz"
+
+LICENSE="Apache-2.0"
+SLOT="2"
+KEYWORDS="~amd64 ~arm64"
+
+RDEPEND=">=app-containers/docker-cli-20.10.3"
+
+S="${WORKDIR}/compose-${MY_PV}"
+
+src_prepare() {
+	default
+	# do not strip
+	sed -i -e 's/-s -w//' builder.Makefile || die
+}
+
+src_compile() {
+	emake -f builder.Makefile GIT_TAG=v${PV}
+}
+
+src_test() {
+	emake -f builder.Makefile test
+}
+
+src_install() {
+	exeinto /usr/libexec/docker/cli-plugins
+	doexe bin/docker-compose
+	dodoc README.md
+}
+
+pkg_postinst() {
+	has_version =app-containers/docker-compose-1* || return
+	ewarn
+	ewarn "docker-compose 2.x is a sub command of docker"
+	ewarn "Use 'docker compose' from the command line instead of"
+	ewarn "'docker-compose'"
+	ewarn "If you need to keep 1.x around, please run the following"
+	ewarn "command before your next --depclean"
+	ewarn "# emerge --noreplace docker-compose:0"
+}
--- a/app-crypt/Manifest.gz
+++ b/app-crypt/Manifest.gz
--- a/app-crypt/acme/Manifest
+++ b/app-crypt/acme/Manifest
@ -1,3 +1,2 @@
-DIST certbot-1.24.0.tar.gz 1360049 BLAKE2B e1c7f4b56ac66b73f74eb8c9d6c31bc12529c2e7a1a51679e715227e61a2e72a30aa5053abe1684be9d665e399ca67f2d11afcc5c60c76bb86d1c0feb68308ca SHA512 fa2a45e650107f48da1e5d7d7469e8a23598e0e0e1127bc62a66ba2351a8fe518da6ec3e53370f7042631ee74e82c65fcc323c71e8f485911363e805ccb6f045
 DIST certbot-1.25.0.tar.gz 1362891 BLAKE2B c109f7777328dcaa2760b524a005f648f8695518a3a052a1d3ff20367f0b704c2a15c912ede091ef6f0f2faf2838caaa74d3bdac6deeb4cc069e6ca16cfb26a7 SHA512 e32cac530d7854cb626aed6d7bac7b4482b7c3634d94fbabd6fa767f9c1268ed3baed0c945362df247e4fc7d51147e5561825850d52c1a8f11b3a1fb2827bd4a
 DIST certbot-1.26.0.tar.gz 1364070 BLAKE2B f9b13df8fb424e579293280202b71756c37a3ec7f986da38a5fd318d00ab7e2ed89223c62a20448ad30271783bb3c44db11a0ce4afebced9f1e9ca4e4c6de3f2 SHA512 bd27cb0a0ef6fc143a3d0dcf5d530d336b93a24d7010e6427c25614befb815f33076b4a3043bb247cafdfad17b8714a19ead43257c64f4fd72ac99f02cb07cde
--- a/app-crypt/acme/acme-1.24.0.ebuild
+++ b/app-crypt/acme/acme-1.24.0.ebuild
@ -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_{8..10} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1
-
-if [[ ${PV} == 9999* ]]; then
-	EGIT_REPO_URI="https://github.com/certbot/certbot.git"
-	inherit git-r3
-	S=${WORKDIR}/${P}/${PN}
-else
-	SRC_URI="https://github.com/certbot/certbot/archive/v${PV}.tar.gz -> certbot-${PV}.tar.gz"
-	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86"
-	S=${WORKDIR}/certbot-${PV}/acme
-fi
-
-DESCRIPTION="An implementation of the ACME protocol"
-HOMEPAGE="https://github.com/certbot/certbot https://letsencrypt.org/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-
-RDEPEND="
-	dev-python/chardet[${PYTHON_USEDEP}]
-	>=dev-python/cryptography-2.5.0[${PYTHON_USEDEP}]
-	>=dev-python/josepy-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/pyopenssl-17.3.0[${PYTHON_USEDEP}]
-	dev-python/pyrfc3339[${PYTHON_USEDEP}]
-	>=dev-python/pytz-2019.3[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.20.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-toolbelt-0.3.0[${PYTHON_USEDEP}]
-"
-
-distutils_enable_sphinx docs dev-python/sphinx_rtd_theme
-distutils_enable_tests pytest
--- a/app-crypt/certbot-apache/Manifest
+++ b/app-crypt/certbot-apache/Manifest
@ -1,3 +1,2 @@
-DIST certbot-1.24.0.tar.gz 1360049 BLAKE2B e1c7f4b56ac66b73f74eb8c9d6c31bc12529c2e7a1a51679e715227e61a2e72a30aa5053abe1684be9d665e399ca67f2d11afcc5c60c76bb86d1c0feb68308ca SHA512 fa2a45e650107f48da1e5d7d7469e8a23598e0e0e1127bc62a66ba2351a8fe518da6ec3e53370f7042631ee74e82c65fcc323c71e8f485911363e805ccb6f045
 DIST certbot-1.25.0.tar.gz 1362891 BLAKE2B c109f7777328dcaa2760b524a005f648f8695518a3a052a1d3ff20367f0b704c2a15c912ede091ef6f0f2faf2838caaa74d3bdac6deeb4cc069e6ca16cfb26a7 SHA512 e32cac530d7854cb626aed6d7bac7b4482b7c3634d94fbabd6fa767f9c1268ed3baed0c945362df247e4fc7d51147e5561825850d52c1a8f11b3a1fb2827bd4a
 DIST certbot-1.26.0.tar.gz 1364070 BLAKE2B f9b13df8fb424e579293280202b71756c37a3ec7f986da38a5fd318d00ab7e2ed89223c62a20448ad30271783bb3c44db11a0ce4afebced9f1e9ca4e4c6de3f2 SHA512 bd27cb0a0ef6fc143a3d0dcf5d530d336b93a24d7010e6427c25614befb815f33076b4a3043bb247cafdfad17b8714a19ead43257c64f4fd72ac99f02cb07cde
--- a/app-crypt/certbot-apache/certbot-apache-1.24.0.ebuild
+++ b/app-crypt/certbot-apache/certbot-apache-1.24.0.ebuild
@ -1,33 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-if [[ ${PV} == 9999* ]]; then
-	EGIT_REPO_URI="https://github.com/certbot/certbot.git"
-	inherit git-r3
-	S=${WORKDIR}/${P}/${PN}
-else
-	SRC_URI="https://github.com/${PN%-apache}/${PN%-apache}/archive/v${PV}.tar.gz -> ${PN%-apache}-${PV}.tar.gz"
-	KEYWORDS="amd64 ~arm64 x86"
-	S=${WORKDIR}/${PN%-apache}-${PV}/${PN}
-fi
-
-inherit distutils-r1
-
-DESCRIPTION="Apache plugin for certbot (Let's Encrypt Client)"
-HOMEPAGE="https://github.com/certbot/certbot https://letsencrypt.org/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-
-RDEPEND=">=app-crypt/acme-${PV}[${PYTHON_USEDEP}]
-	>=app-crypt/certbot-${PV}[${PYTHON_USEDEP}]
-	dev-python/python-augeas[${PYTHON_USEDEP}]
-	dev-python/zope-component[${PYTHON_USEDEP}]
-	dev-python/zope-interface[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
--- a/app-crypt/certbot-nginx/Manifest
+++ b/app-crypt/certbot-nginx/Manifest
@ -1,3 +1,2 @@
-DIST certbot-1.24.0.tar.gz 1360049 BLAKE2B e1c7f4b56ac66b73f74eb8c9d6c31bc12529c2e7a1a51679e715227e61a2e72a30aa5053abe1684be9d665e399ca67f2d11afcc5c60c76bb86d1c0feb68308ca SHA512 fa2a45e650107f48da1e5d7d7469e8a23598e0e0e1127bc62a66ba2351a8fe518da6ec3e53370f7042631ee74e82c65fcc323c71e8f485911363e805ccb6f045
 DIST certbot-1.25.0.tar.gz 1362891 BLAKE2B c109f7777328dcaa2760b524a005f648f8695518a3a052a1d3ff20367f0b704c2a15c912ede091ef6f0f2faf2838caaa74d3bdac6deeb4cc069e6ca16cfb26a7 SHA512 e32cac530d7854cb626aed6d7bac7b4482b7c3634d94fbabd6fa767f9c1268ed3baed0c945362df247e4fc7d51147e5561825850d52c1a8f11b3a1fb2827bd4a
 DIST certbot-1.26.0.tar.gz 1364070 BLAKE2B f9b13df8fb424e579293280202b71756c37a3ec7f986da38a5fd318d00ab7e2ed89223c62a20448ad30271783bb3c44db11a0ce4afebced9f1e9ca4e4c6de3f2 SHA512 bd27cb0a0ef6fc143a3d0dcf5d530d336b93a24d7010e6427c25614befb815f33076b4a3043bb247cafdfad17b8714a19ead43257c64f4fd72ac99f02cb07cde
--- a/app-crypt/certbot-nginx/certbot-nginx-1.24.0.ebuild
+++ b/app-crypt/certbot-nginx/certbot-nginx-1.24.0.ebuild
@ -1,35 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-if [[ ${PV} == 9999* ]]; then
-	EGIT_REPO_URI="https://github.com/certbot/certbot.git"
-	inherit git-r3
-	S=${WORKDIR}/${P}/${PN}
-else
-	SRC_URI="https://github.com/${PN%-nginx}/${PN%-nginx}/archive/v${PV}.tar.gz -> ${PN%-nginx}-${PV}.tar.gz"
-	KEYWORDS="amd64 ~arm ~arm64 x86"
-	S=${WORKDIR}/${PN%-nginx}-${PV}/${PN}
-fi
-
-inherit distutils-r1
-
-DESCRIPTION="Nginx plugin for certbot (Let's Encrypt Client)"
-HOMEPAGE="https://github.com/certbot/certbot https://letsencrypt.org/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	>=app-crypt/acme-${PV}[${PYTHON_USEDEP}]
-	>=app-crypt/certbot-${PV}[${PYTHON_USEDEP}]
-	>=dev-python/pyopenssl-17.3.0[${PYTHON_USEDEP}]
-	>=dev-python/pyparsing-2.2.1[${PYTHON_USEDEP}]
-	dev-python/zope-interface[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
--- a/app-crypt/certbot/Manifest
+++ b/app-crypt/certbot/Manifest
@ -1,3 +1,2 @@
-DIST certbot-1.24.0.tar.gz 1360049 BLAKE2B e1c7f4b56ac66b73f74eb8c9d6c31bc12529c2e7a1a51679e715227e61a2e72a30aa5053abe1684be9d665e399ca67f2d11afcc5c60c76bb86d1c0feb68308ca SHA512 fa2a45e650107f48da1e5d7d7469e8a23598e0e0e1127bc62a66ba2351a8fe518da6ec3e53370f7042631ee74e82c65fcc323c71e8f485911363e805ccb6f045
 DIST certbot-1.25.0.tar.gz 1362891 BLAKE2B c109f7777328dcaa2760b524a005f648f8695518a3a052a1d3ff20367f0b704c2a15c912ede091ef6f0f2faf2838caaa74d3bdac6deeb4cc069e6ca16cfb26a7 SHA512 e32cac530d7854cb626aed6d7bac7b4482b7c3634d94fbabd6fa767f9c1268ed3baed0c945362df247e4fc7d51147e5561825850d52c1a8f11b3a1fb2827bd4a
 DIST certbot-1.26.0.tar.gz 1364070 BLAKE2B f9b13df8fb424e579293280202b71756c37a3ec7f986da38a5fd318d00ab7e2ed89223c62a20448ad30271783bb3c44db11a0ce4afebced9f1e9ca4e4c6de3f2 SHA512 bd27cb0a0ef6fc143a3d0dcf5d530d336b93a24d7010e6427c25614befb815f33076b4a3043bb247cafdfad17b8714a19ead43257c64f4fd72ac99f02cb07cde
--- a/app-crypt/certbot/certbot-1.24.0.ebuild
+++ b/app-crypt/certbot/certbot-1.24.0.ebuild
@ -1,39 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-if [[ ${PV} == 9999* ]]; then
-	EGIT_REPO_URI="https://github.com/certbot/certbot.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86"
-fi
-S=${WORKDIR}/${P}/${PN}
-
-inherit distutils-r1
-
-DESCRIPTION="Let's encrypt client to automate deployment of X.509 certificates"
-HOMEPAGE="https://github.com/certbot/certbot https://letsencrypt.org/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-
-RDEPEND="
-	>=app-crypt/acme-${PV}[${PYTHON_USEDEP}]
-	>=dev-python/configargparse-0.9.3[${PYTHON_USEDEP}]
-	>=dev-python/configobj-5.0.6[${PYTHON_USEDEP}]
-	>=dev-python/cryptography-2.5.0[${PYTHON_USEDEP}]
-	>=dev-python/distro-1.0.1[${PYTHON_USEDEP}]
-	>=dev-python/josepy-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/parsedatetime-2.4[${PYTHON_USEDEP}]
-	dev-python/pyrfc3339[${PYTHON_USEDEP}]
-	>=dev-python/pytz-2019.3[${PYTHON_USEDEP}]
-	dev-python/zope-component[${PYTHON_USEDEP}]
-	dev-python/zope-interface[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
--- a/app-editors/Manifest.gz
+++ b/app-editors/Manifest.gz
--- a/app-editors/qhexedit2/Manifest
+++ b/app-editors/qhexedit2/Manifest
@ -1 +1,2 @@
 DIST qhexedit2-0.8.6_p20190316.tar.gz 355512 BLAKE2B a7edc8d05a7788f3a3f2202762ca3dc436cafbde1b1216ff1bb342055600a2e9d53c27fe324380331b8182904545c698106129238065cd2416d244fdfa176446 SHA512 4ef288c8a220c308d38c41fee83fe962e213cdfa448445ef73c3d2fe1952b68f2096732e78d2aa0a87eddd3cf2f47bed3e77807e12d2b7616c1447b3bf1b0e7d
+DIST qhexedit2-0.8.9_p20210525.tar.gz 342178 BLAKE2B baffe5b5e1130476162f23a91420cc86675a162c39539c9f07685cecc82571817625202814006221f96b56e94c0325fd7a6d8f2294041b426054f809c9967bad SHA512 d8a5159433a1212085371473cc7a89c4888c6af6b1416a34e3ea9d1ef9ae19411af32bea2e2fb256a024d6f2d05c733d285314cfc17f37dae065d7407a9c0d2c
--- a/app-editors/qhexedit2/files/qhexedit2-0.8.9.patch
+++ b/app-editors/qhexedit2/files/qhexedit2-0.8.9.patch
@ -0,0 +1,36 @@
+diff --git a/setup.py b/setup.py
+index 1a0d912..646c359 100644
+--- a/setup.py
+++ b/setup.py
+@@ -98,7 +98,7 @@ if cfg.qt_framework:
+                                       lib + ".framework", "Headers")]
+ else:
+     if PyQt_Version == 'PyQt5':
+-        for qt_inc_dir in ('/usr/include/qt', '/usr/include/x86_64-linux-gnu/qt5'):
+        for qt_inc_dir in ('/usr/include/qt', '/usr/include/qt5'):
+             include_dirs.append(qt_inc_dir)
+             include_dirs += [os.path.join(qt_inc_dir, lib) for lib in qt_libs]
+         libraries = ["Qt5" + lib[2:] for lib in qt_libs]
+diff --git a/src/qhexedit.pro b/src/qhexedit.pro
+index 2a94016..55d7bc2 100644
+--- a/src/qhexedit.pro
+++ b/src/qhexedit.pro
+@@ -23,5 +23,7 @@ Release:TARGET = qhexedit
+ Debug:TARGET = qhexeditd
+ 
+ 
+-unix:DESTDIR = /usr/lib
+ win32:DESTDIR = ../lib
+
+target.path = /usr/lib64
+INSTALLS += target
+diff --git a/src/qhexedit.sip b/src/qhexedit.sip
+index 082621e..a7ef4e7 100644
+--- a/src/qhexedit.sip
+++ b/src/qhexedit.sip
+@@ -1,4 +1,4 @@
+-%Module(name=qhexedit, version=1)
+%Module(name=qhexedit)
+ 
+ %Import QtCore/QtCoremod.sip
+ %Import QtGui/QtGuimod.sip
--- a/app-editors/qhexedit2/qhexedit2-0.8.9_p20210525.ebuild
+++ b/app-editors/qhexedit2/qhexedit2-0.8.9_p20210525.ebuild
@ -0,0 +1,79 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8,9,10} )
+
+#DISTUTILS_OPTIONAL=1
+#DISTUTILS_USE_PEP517=p
+
+inherit distutils-r1 qmake-utils
+
+EGIT_COMMIT="541139125be034b90b6811a84faa1413e357fd94"
+DESCRIPTION="Hex editor library, Qt application written in C++ with Python bindings"
+HOMEPAGE="https://github.com/Simsys/qhexedit2/"
+SRC_URI="https://github.com/Simsys/${PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv ~x86"
+IUSE="doc +gui python"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+PATCHES=( "${FILESDIR}/${PN}-0.8.9.patch" )
+
+RDEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+	python? (
+		dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}]
+		${PYTHON_DEPS}
+		)
+"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${PN}-${EGIT_COMMIT}"
+
+src_configure() {
+	eqmake5 src/qhexedit.pro
+	if use gui; then
+		cd example || die "can't cd example"
+		eqmake5 qhexedit.pro
+	fi
+}
+
+src_compile() {
+	default
+	use python && distutils-r1_src_compile
+	use gui && emake -C example
+}
+
+python_compile() {
+	use python && distutils-r1_python_compile build_ext
+}
+
+src_test() {
+	cd test || die "can't cd test"
+	mkdir logs || die "can't create logs dir"
+	eqmake5 chunks.pro
+	emake
+	./chunks || die "test run failed"
+	grep -q "^NOK" logs/Summary.log && die "test failed"
+}
+
+src_install() {
+	doheader src/*.h
+	dolib.so libqhexedit.so*
+	use python && distutils-r1_src_install
+	if use gui; then
+		dobin example/qhexedit
+		insinto /usr/share/${PN}/
+		doins example/translations/*.qm
+	fi
+	if use doc; then
+		dodoc -r doc/html
+		dodoc doc/release.txt
+	fi
+}
--- a/app-emulation/Manifest.gz
+++ b/app-emulation/Manifest.gz
--- a/app-emulation/libvirt/libvirt-8.2.0.ebuild
+++ b/app-emulation/libvirt/libvirt-8.2.0.ebuild
@ -16,7 +16,7 @@ if [[ ${PV} = *9999* ]]; then
 else
 	SRC_URI="https://libvirt.org/sources/${P}.tar.xz
 		verify-sig? ( https://libvirt.org/sources/${P}.tar.xz.asc )"
-	KEYWORDS="~amd64 ~arm64 ~ppc64 x86"
+	KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 fi

 DESCRIPTION="C toolkit to manipulate virtual machines"
--- a/app-portage/Manifest.gz
+++ b/app-portage/Manifest.gz
--- a/app-portage/eix/eix-0.36.1.ebuild
+++ b/app-portage/eix/eix-0.36.1.ebuild
@ -22,6 +22,7 @@ RDEPEND="${DEPEND}
 	>=app-shells/quoter-3.0_p2-r1"
 BDEPEND="
 	app-arch/xz-utils
+	virtual/pkgconfig
 	nls? ( sys-devel/gettext )"

 pkg_setup() {
--- a/app-portage/eix/eix-0.36.2.ebuild
+++ b/app-portage/eix/eix-0.36.2.ebuild
@ -22,6 +22,7 @@ RDEPEND="${DEPEND}
 	>=app-shells/quoter-3.0_p2-r1"
 BDEPEND="
 	app-arch/xz-utils
+	virtual/pkgconfig
 	nls? ( sys-devel/gettext )"

 pkg_setup() {
--- a/app-shells/Manifest.gz
+++ b/app-shells/Manifest.gz
--- a/app-shells/zsh/files/zsh-5.8.1-performance_regression_fix.patch
+++ b/app-shells/zsh/files/zsh-5.8.1-performance_regression_fix.patch
@ -0,0 +1,139 @@
+From cbe8d2bcdc20682464217856aa48628804637f28 Mon Sep 17 00:00:00 2001
+From: Bart Schaefer <schaefer@zsh.org>
+Date: Thu, 28 Apr 2022 21:06:51 -0700
+Subject: [PATCH] 50133: use read-ahead and lseek-rewind for efficient
+ line-buffered input
+
+---
+ ChangeLog    |  6 ++++++
+ Src/input.c  | 24 ++++++++++++++++++++-
+ configure.ac | 59 ++++++++++++++++++++++++++++++++++++++++++++++++++++
+ 3 files changed, 88 insertions(+), 1 deletion(-)
+
+diff --git a/ChangeLog b/ChangeLog
+index cae2fc4e3..79c77741b 100644
+--- a/ChangeLog
+++ b/ChangeLog
+@@ -1,3 +1,9 @@
+2022-04-28  Bart Schaefer  <schaefer@zsh.org>
+
+	* 50133 (Bart, PWS, Jun-ichi): Src/input.c, configure.ac: when
+	lseek(2) is available, use it to check for and rewind read-ahead
+	for more efficient line-buffered input.
+
+ 2022-03-03  Peter Stephenson  <p.w.stephenson@ntlworld.com>
+ 
+ 	* 49792: Src/input.c, Test/A01grammar.ztst: Use line buffering
+diff --git a/Src/input.c b/Src/input.c
+index caa8e23b0..6cc1b8a51 100644
+--- a/Src/input.c
+++ b/Src/input.c
+@@ -217,12 +217,34 @@ shinbufrestore(void)
+ static int
+ shingetchar(void)
+ {
+-    int nread;
+    int nread, rsize = isset(SHINSTDIN) ? 1 : SHINBUFSIZE;
+ 
+     if (shinbufptr < shinbufendptr)
+ 	return STOUC(*shinbufptr++);
+ 
+     shinbufreset();
+#ifdef USE_LSEEK
+    if (rsize == 1 && lseek(SHIN, 0, SEEK_CUR) != (off_t)-1)
+	rsize = SHINBUFSIZE;
+    if (rsize > 1) {
+	do {
+	    errno = 0;
+	    nread = read(SHIN, shinbuffer, rsize);
+	} while (nread < 0 && errno == EINTR);
+	if (nread <= 0)
+	    return -1;
+	if (isset(SHINSTDIN) &&
+	    (shinbufendptr = memchr(shinbuffer, '\n', nread))) {
+	    shinbufendptr++;
+	    rsize = (shinbufendptr - shinbuffer);
+	    if (nread > rsize &&
+		lseek(SHIN, -(nread - rsize), SEEK_CUR) < 0)
+		zerr("lseek(%d, %d): %e", SHIN, -(nread - rsize), errno);
+	} else
+	    shinbufendptr = shinbuffer + nread;
+	return STOUC(*shinbufptr++);
+    }
+#endif
+     for (;;) {
+        errno = 0;
+        nread = read(SHIN, shinbufendptr, 1);
+diff --git a/configure.ac b/configure.ac
+index af8c5bba8..42f2837cd 100644
+--- a/configure.ac
+++ b/configure.ac
+@@ -2304,6 +2304,65 @@ if test x$zsh_cv_sys_fifo = xyes; then
+   AC_DEFINE(HAVE_FIFOS)
+ fi
+ 
+dnl -----------
+dnl check that lseek() correctly reports seekability.
+dnl -----------
+AC_CACHE_CHECK(if lseek() correctly reports seekability,
+zsh_cv_sys_lseek,
+[AC_RUN_IFELSE([AC_LANG_SOURCE([[
+#include <stdio.h>
+#include <sys/types.h>
+#include <fcntl.h>
+#include <unistd.h>
+#include <sys/socket.h>
+#include <sys/stat.h>
+int main() {
+    int pipefd[2], fd;
+    off_t ret;
+    char* tmpfile = "seekfiletest.tmp";
+    if ((fd = open(tmpfile, O_CREAT, S_IRUSR)) < 0) {
+	fprintf(stderr, "creating file failed\n");
+	return 1;
+    }
+    ret = lseek(fd, 0, SEEK_CUR);
+    close(fd);
+    unlink(tmpfile);
+    if (ret == (off_t)-1) {
+	fprintf(stderr, "lseek on regular file failed\n");
+	return 1;
+    }
+    if (pipe(pipefd) < 0) {
+	fprintf(stderr, "creating pipe failed\n");
+	return 1;
+    }
+    write(pipefd[1], "abcdefgh", 8);
+    ret = lseek(pipefd[0], 0, SEEK_CUR);
+    close(pipefd[0]);
+    close(pipefd[1]);
+    if (ret != (off_t)-1) {
+	fprintf(stderr, "lseek on pipe succeeded\n");
+	return 1;
+    }
+    if ((fd = socket(AF_UNIX, SOCK_STREAM, 0)) < 0) {
+	fprintf(stderr, "creating UNIX domain socket failed\n");
+	return 1;
+    }
+    ret = lseek(fd, 0, SEEK_CUR);
+    close(fd);
+    if (ret != (off_t)-1) {
+	fprintf(stderr, "lseek on UNIX domain socket succeeded\n");
+	return 1;
+    }
+    return 0;
+}
+]])],[zsh_cv_sys_lseek=yes],[zsh_cv_sys_lseek=no],[zsh_cv_sys_lseek=yes])
+])
+AH_TEMPLATE([USE_LSEEK],
+[Define to 1 if lseek() can be used for SHIN.])
+if test x$zsh_cv_sys_lseek = xyes; then
+  AC_DEFINE(USE_LSEEK)
+fi
+
+ dnl -----------
+ dnl test for whether link() works
+ dnl for instance, BeOS R4.51 doesn't support hard links yet
+-- 
+2.36.0
+
--- a/app-shells/zsh/zsh-5.8.1-r2.ebuild
+++ b/app-shells/zsh/zsh-5.8.1-r2.ebuild
@ -53,6 +53,7 @@ fi

 PATCHES=(
 	"${FILESDIR}/${P}-non_interactive_shell_regression_fix.patch"
+	"${FILESDIR}/${P}-performance_regression_fix.patch" #839900
 )

 src_prepare() {
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
--- a/app-text/zotero-bin/Manifest
+++ b/app-text/zotero-bin/Manifest
@ -1 +1 @@
-DIST zotero-bin-6.0.5.tar.bz2 68482314 BLAKE2B 77c17665b8584b828764a07012f3f91237dc73b334a9635fe50fae9da1ca20901a7bab22ef7008baf14c60209fc0ed9d1f6791c0a4bf3bd9414713a1071c9685 SHA512 568583c44436d9830e0b9271bfaedf7380556498c757de0bcea07ba97202aa853f92501c9aa755637ba4810d266a43c2ee17a1eedef564d22821e7f4ee337ff0
+DIST zotero-bin-6.0.6.tar.bz2 68462336 BLAKE2B 5d42f0439d9bf6188a602d44aa75613e257a17efc76e089fdbdc5fe036a383e74fba39086bbc05f8275477b79bab4a840132f7e839fcd904d25f218c1959fee8 SHA512 b38990497ff1471e763f4bbc96c09aaa89fc0d10a0e55a584edd3bb35f9d446d359eac1d8637a9af4bb8585870bbb27393ffb12379dab1b04dab3469c68b4741
--- a/app-text/zotero-bin/zotero-bin-6.0.6.ebuild
+++ b/app-text/zotero-bin/zotero-bin-6.0.6.ebuild
--- a/dev-embedded/Manifest.gz
+++ b/dev-embedded/Manifest.gz
--- a/dev-embedded/platformio/platformio-5.2.5-r1.ebuild
+++ b/dev-embedded/platformio/platformio-5.2.5-r1.ebuild
@ -39,7 +39,7 @@ RDEPEND="
 		>=dev-python/marshmallow-2.20.5[${PYTHON_USEDEP}]
 		=dev-python/starlette-0.18*[${PYTHON_USEDEP}]
 		=dev-python/uvicorn-0.17*[${PYTHON_USEDEP}]
-		=dev-python/wsproto-1.0*[${PYTHON_USEDEP}]
+		dev-python/wsproto[${PYTHON_USEDEP}]
 		>=dev-python/zeroconf-0.37[${PYTHON_USEDEP}]
 	')
 	virtual/udev"
@ -70,7 +70,10 @@ distutils_enable_tests pytest

 src_prepare() {
 	# Allow newer versions of zeroconf, Bug #831181.
-	sed -i '/zeroconf/s/==/>=/' "${S}"/setup.py || die
+	# Also wsproto.
+	sed -e '/zeroconf/s/==[0-9.*]*//' \
+		-e '/wsproto/s/==[0-9.*]*//' \
+		-i setup.py || die
 	default
 }

--- a/dev-embedded/ponyprog/Manifest
+++ b/dev-embedded/ponyprog/Manifest
@ -1 +1,2 @@
 DIST ponyprog-3.1.2.tar.gz 1364636 BLAKE2B a913903278791d937266da50fcd5b5bda892dcc316011117816e37fc4ef03becce893b597fb34f2a6ef05b5692bb375e4ba10b04c079a63eb735aa0ddadb5ab9 SHA512 697c6fdc775629086a1c01ad94f291fda550a9ad6065e5fdff9db9fb035b8270ed9058894db7ca17d0daf2a26cc5e431415c160d61f65214677eae2109d87603
+DIST ponyprog-3.1.3.tar.gz 11479313 BLAKE2B 56704b28877687c356c72b1f28f28115cb11f40c701e207f5d3ec4aa4fa7194991162f0940400016d9ee5d42ff0a7e7da5b252f9b76417d0d8272638989fedec SHA512 09e702f3f98e65799e8c59b9c8eca6f477db3f36a2648a1fab3797f91d56c7c4e9533e32bef1fe4c641512e31828a39df4d3d83639b7541714a3cc9050cd4e67
--- a/dev-embedded/ponyprog/files/ponyprog-3.1.3-fix-build-system.patch
+++ b/dev-embedded/ponyprog/files/ponyprog-3.1.3-fix-build-system.patch
@ -0,0 +1,79 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 99e6ff1..d80dcc8 100644
+--- a/CMakeLists.txt
+++ b/CMakeLists.txt
+@@ -1,7 +1,7 @@
+ PROJECT(ponyprog)
+ 
+ # Configure CMake ...
+-CMAKE_MINIMUM_REQUIRED(VERSION 2.8 FATAL_ERROR)
+CMAKE_MINIMUM_REQUIRED(VERSION 2.8.12 FATAL_ERROR)
+ # CMAKE_POLICY(SET CMP0003 OLD)
+ # CMAKE_POLICY(SET CMP0015 OLD)
+ 
+@@ -46,14 +46,7 @@ OPTION (USE_DEBUGGER "Include in binary file debug information" OFF)
+ OPTION (USE_PROFILER "Include in binary file profiling information" OFF)
+ 
+ 
+-IF(${USE_DEBUGGER})
+-  SET(CMAKE_BUILD_TYPE Debug)
+-  SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS_DEBUG} -Wall")
+-ELSE()
+-  SET(CMAKE_BUILD_TYPE Release)
+-  SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS_RELEASE} -Wall")
+-ENDIF()
+-
+ADD_COMPILE_OPTIONS("-Wall")
+ MESSAGE(STATUS "CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS}")
+ 
+ INCLUDE(CheckIncludeFile)
+@@ -239,11 +232,12 @@ SET ( MOC_DIR temp )
+ SET ( UI_HEADERS_DIR temp )
+ SET ( UI_SOURCES_DIR temp )
+ 
+-ADD_SUBDIRECTORY(qhexedit2/src)
+ ADD_SUBDIRECTORY(SrcPony)
+ 
+-INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_SOURCE_DIR}/qhexedit2/src/ ${CMAKE_CURRENT_SOURCE_DIR}/SrcPony/ )
+find_library(QHexEdit_LIBRARY NAMES qhexedit)
+set(QHexEdit_LIBRARIES "${QHexEdit_LIBRARY}")
+ 
+INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_SOURCE_DIR}/SrcPony/ )
+ 
+ IF(${USE_QT_VERSION} MATCHES "4")
+ #     QT4_ADD_TRANSLATION(APP_TRANSLATIONS ${TRANSLATION})
+@@ -312,7 +306,7 @@ ELSE()
+ ENDIF()
+ 
+ #TARGET_LINK_LIBRARIES(${CMAKE_PROJECT_NAME} ${LIBFTDI_LIBRARIES} )
+-TARGET_LINK_LIBRARIES(${CMAKE_PROJECT_NAME} ${LIBFTDIPP_LIBRARY} ${LIBFTDI_LIBRARY} ${LIBUSB_LIBRARIES})
+TARGET_LINK_LIBRARIES(${CMAKE_PROJECT_NAME} ${LIBFTDIPP_LIBRARY} ${LIBFTDI_LIBRARY} ${LIBUSB_LIBRARIES} ${QHexEdit_LIBRARIES})
+ 
+ ADD_CUSTOM_TARGET (tags
+     COMMAND  ctags -R -f tags ${CMAKE_SOURCE_DIR}/SrcPony
+diff --git a/SrcPony/e2cmdw.cpp b/SrcPony/e2cmdw.cpp
+index 252c730..cec93cc 100644
+--- a/SrcPony/e2cmdw.cpp
+++ b/SrcPony/e2cmdw.cpp
+@@ -44,7 +44,7 @@
+ #include <QMessageBox>
+ #include <QDesktopServices>
+ 
+-#include "qhexedit.h"
+#include <qhexedit.h>
+ 
+ #include "version.h"
+ #include "e2profil.h"
+diff --git a/SrcPony/e2cmdw.h b/SrcPony/e2cmdw.h
+index c349bf3..df47206 100644
+--- a/SrcPony/e2cmdw.h
+++ b/SrcPony/e2cmdw.h
+@@ -57,7 +57,7 @@
+ 
+ 
+ #include "ui_mainwindow.h"
+-#include "qhexedit.h"
+#include <qhexedit.h>
+ 
+ 
+ 
--- a/dev-embedded/ponyprog/ponyprog-3.1.3.ebuild
+++ b/dev-embedded/ponyprog/ponyprog-3.1.3.ebuild
@ -0,0 +1,43 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake udev
+
+DESCRIPTION="EEPROM and microcontroller programmer/flasher"
+HOMEPAGE="https://github.com/lancos/ponyprog/"
+SRC_URI="https://github.com/lancos/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc"
+
+DEPEND="
+	>app-editors/qhexedit2-0.8.8_p20200625
+	dev-embedded/libftdi:1[cxx]
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtmultimedia:5
+	dev-qt/qtprintsupport:5
+	dev-qt/qtwidgets:5
+	virtual/libusb:1
+"
+# blocker on libftdi-1.5-r2: see #775116
+RDEPEND="${DEPEND}
+	!=dev-embedded/libftdi-1.5-r2
+"
+
+PATCHES=( "${FILESDIR}"/${P}-fix-build-system.patch )
+
+pkg_postinst() {
+	udev_reload
+
+	elog "To use the COM port in user mode (not as root), you need to"
+	elog "be in the 'uucp' group."
+	elog
+	elog "To use the LPT port in user mode (not as root) you need a kernel with"
+	elog "ppdev, parport and parport_pc compiled in or as modules. You need the"
+	elog "rights to write to /dev/parport? devices."
+}
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
--- a/dev-libs/libansilove/Manifest
+++ b/dev-libs/libansilove/Manifest
@ -1,3 +1,3 @@
-DIST libansilove-1.2.8.tar.gz 59695 BLAKE2B 4be4fb1f7277cc53bdc31399b429fc142cd3b87933da4c87604fe290b8697dd4c3d03a4c77bbac62648b0b8b0da509b5f7b17d2867e2e9e56eaf00674219fff3 SHA512 99df7fa0e5f2eb26a95b5073587e957378163fcab9ca828f7d6eca79dcb92463b1788285813c4fed6bfc9ee753c425fd34968e5e08999bc63fe6c4ba5939198f
 DIST libansilove-1.2.9.tar.gz 58703 BLAKE2B b7feb458c01ab6bb96be1893d7f8ffc92dff63e23aa81fad29519ff574d55c0bbf84f66da0bf54a9ff428079f7d101e50b92d6f600934400f67d06497123abf7 SHA512 80fe2463634005c4ba5ba74587b1248fa5ef4789600a3b9603678bf63c8bb7d9c60348388d103589b6b11516fe033ec080a7a625ed84233976c44334c6ac1959
 DIST libansilove-1.3.0.tar.gz 59167 BLAKE2B efb7234b4a61182e051f229d3ae443c59e0f59d74a38f4f08e48d5ec1ee4ccc491b824fb91c1d26b22c2e7c5fa8638c0c64f9f33e9114c278bf09808ba1bbf34 SHA512 225a5bb3fe3547a893dba5d176d5b7f3950d33457b58b50583ad33517f194fa2cda2fdeb0cfd7d7a48bf0dd9d2bc1a60b00b6a31ac8df9036c8b0385a086e3b9
+DIST libansilove-1.3.1.tar.gz 59223 BLAKE2B e35229c601e6dfe3bc98ba9b10408a7318d8eb96a7e34e5053f4438a30a03cf31a40e6a74ea036165e90f96e3d4fca8db1f82c24ac818b699b67ae2eded57eeb SHA512 d08c240b7e5c3386a3db76ea9eca2fd80446a79c8eb0426b50b58a860996a76d9f94825ed1651b62c800afb8d0e4003e0707c7c2d285c27df63e45b4bdea0cf8
--- a/dev-libs/libansilove/libansilove-1.3.1.ebuild
+++ b/dev-libs/libansilove/libansilove-1.3.1.ebuild
--- a/dev-libs/libfilezilla/Manifest
+++ b/dev-libs/libfilezilla/Manifest
@ -1,2 +1,3 @@
 DIST libfilezilla-0.36.0.tar.bz2 598327 BLAKE2B d578b7c83cbd440acbb3efe2994c7140bfb0a11271e68a8bae52ac53f10e1ccf428c50d07e8cfc79f63beb0a3bffe8fbffd962413725817ac9df14e0b3b3a1cd SHA512 c6b0240c560afb87426f7ccf01e34eb92975b043697be89f26a12dcfaf4a109d308eed200429f986b14f80111573ea5a869194375c844fa7b666d173e9629a0a
 DIST libfilezilla-0.37.1.tar.bz2 608419 BLAKE2B ae76a1d9d9829061ec95ae3b94e282a32835db19b85859c39db5b089a478f93b511fce4a798ebe79bf628bcb6b30f3ea40ff34aacfe2201bfa93887d4f8ce48e SHA512 1bcf9da8ec0fbac1ffada95d8dc1e4a67fbd77fca9273fa9e67418c7e89c74139683535fb917db4fa750bd263cb45a8f230e32b6ab890f3ca5ef5af39ef8ecae
+DIST libfilezilla-0.37.2.tar.bz2 609128 BLAKE2B 8ff4bee0c007c2c527d172bef8a6efd4e3238e9a265d75d5a8bcc50a204e0fcef09876f112d7eacd4df4f4cf6551361e99646dd7729ab09774a7416440c5ee06 SHA512 a8902977bae5f442045faa8a68c2f85e667a2371b1e643fde49e592fa9544b0a672c476246b01b2ba7b52390b37b0f1f33e5196be4499eddf5783f225091c93a
--- a/dev-libs/libfilezilla/libfilezilla-0.37.2.ebuild
+++ b/dev-libs/libfilezilla/libfilezilla-0.37.2.ebuild
@ -0,0 +1,51 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit flag-o-matic
+
+DESCRIPTION="C++ library offering some basic functionality for platform-independent programs"
+HOMEPAGE="https://lib.filezilla-project.org/"
+SRC_URI="https://download.filezilla-project.org/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2+"
+SLOT="0/25" # libfilezilla.so version
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~x86"
+IUSE="test"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-libs/nettle:0=
+	>=net-libs/gnutls-3.5.7:=
+	virtual/libcrypt:=
+"
+DEPEND="${RDEPEND}
+	test? ( dev-util/cppunit )"
+
+PATCHES=( "${FILESDIR}"/${PN}-0.37.1-pthread.patch )
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		if ! test-flag-CXX -std=c++14; then
+			eerror "${P} requires C++14-capable C++ compiler. Your current compiler"
+			eerror "does not seem to support -std=c++14 option. Please upgrade your compiler"
+			eerror "to gcc-4.9 or an equivalent version supporting C++14."
+			die "Currently active compiler does not support -std=c++14"
+		fi
+	fi
+}
+
+src_configure() {
+	if use ppc || use arm || use hppa; then
+		# bug 727652
+		append-libs -latomic
+	fi
+
+	econf --disable-static
+}
+
+src_install() {
+	default
+	find "${ED}" -type f -name "*.la" -delete || die
+}
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
--- a/dev-python/PyPDF2/Manifest
+++ b/dev-python/PyPDF2/Manifest
@ -1,5 +1,7 @@
+DIST PyPDF2-1.27.11.gh.tar.gz 3431028 BLAKE2B 4917d40f3b896e086ea1deac43b9a3d4391d758ff2eb4e2ab731d632d24478781ca862ceffd707b26ae7bb0295c922089ca9a9a90e0878d2e0aef466d1464346 SHA512 cd1578295fafd480016b838a865a658e8996c04a0e22817f8e45d8c00dbdf6dcac2e8c80a8de878e8db4a2984022382f74e8a56af5e305acfb8e3de5f965d207
 DIST PyPDF2-1.27.5.gh.tar.gz 2053469 BLAKE2B 1a01289145574a4551f1fa237e4c790dd866088787f5bc9afb529ea99424f4d211f1913737cf4a2c744ceae90568ca26612cc4956ff1eda5840624e41df76d78 SHA512 c1f77c7ea46e866da104cf05421ccf15870db07923ff5860a6b44c944d599b38e98d33d6042a155b0698ecd100d1c6f57aa7bb8904dd08e679f6560a578d4488
 DIST PyPDF2-1.27.6.gh.tar.gz 2092950 BLAKE2B 786d5102275d6c04628d76fd0225d453aa8f74cb0a6e135f3d56ed1143c114144aa9daef17e5971ce9e4c14cc01016125107717296d76cf7eb34c1cadbdd42cd SHA512 bf1c60453e6a98a50c382cf967fc7aa1fb8dffc14d426f97bc0e41c34a6534930849fe053c8debe585b3877eadca9f8b43f803b1f01586f6c693a1eefe43e3dd
 DIST PyPDF2-1.27.7.gh.tar.gz 2093013 BLAKE2B 5637094972228ad1a5790f36f71e3fd8a694c9fd99bad7874a03f299ca0bb6198064f6756552cac41127fd67a827ca191e6de56281b25c13629a99edcdac7685 SHA512 dbcb944f3bafb0c0e81842e92e8a72609c85c271eba83841ee5bc901119178a6a4ff503a4796014854a75137b9f8f25a245d55a550e770b9f78daf8e1e92dcba
 DIST PyPDF2-1.27.8.gh.tar.gz 2104282 BLAKE2B 849a801783b0e3990c3d8c68449b8f9717c2b2155fc78b9c4d07f99cf84ebc453e388192a361f06c8e6405fc5057e25fcd4158475266e6739fb1e91f35f9b1c1 SHA512 42406303f293962a43ac462d9cc7e5ce2fecf999bb7b37913970104f88298ff393f801c187b879b0bebd055a87c70d79a726be3c37c2a53fc872825112fdc98d
 DIST PyPDF2-1.27.9.gh.tar.gz 2124754 BLAKE2B 5b1279d84b949a33571950d7256c4ee7b319ff551b5d1c5fc78193048bf54ec3a835cf73a4def7c8fc4ff77f8edd8738062a9e76dc858e1708a21fafee0633cc SHA512 9cae31bb9410dd65746da955a4fc25f8e741fca5dd76181229e5af22d069641a7e8d92c23b117f16fb5a6ee635cd83dccb910fe4ff94a85222bbc856c2109127
+DIST PyPDF2-sample-files-41b5cd4f774f8fbd8ac42d93b9962f0376352a15.tar.gz 5406287 BLAKE2B 8ddad01235bdb55cee596d9114e5b6c3b153919bcff5203d229311243516f3595cb36dcca87cae27514a8231d72daa94782115795bff8c1c3d046236811c21e0 SHA512 6c38d5ee0e1c5c0ffdd78f7c2fe56dbf357a1e82d2af642a10264a6102ae8fb95cba6d2f76b26df6a33a5d84cfd5111885d39c1747cf95a5ce545f26bdb37263
--- a/dev-python/PyPDF2/PyPDF2-1.27.11.ebuild
+++ b/dev-python/PyPDF2/PyPDF2-1.27.11.ebuild
@ -0,0 +1,51 @@
+# 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_{8..10} )
+
+inherit distutils-r1
+
+SAMPLE_COMMIT=41b5cd4f774f8fbd8ac42d93b9962f0376352a15
+DESCRIPTION="Python library to work with PDF files"
+HOMEPAGE="
+	https://pypi.org/project/PyPDF2/
+	https://github.com/py-pdf/PyPDF2/
+"
+SRC_URI="
+	https://github.com/py-pdf/PyPDF2/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+	test? (
+		https://github.com/py-pdf/sample-files/archive/${SAMPLE_COMMIT}.tar.gz
+			-> ${PN}-sample-files-${SAMPLE_COMMIT}.tar.gz
+	)
+"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+IUSE="examples"
+
+BDEPEND="
+	dev-python/pillow[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+src_unpack() {
+	default
+	if use test; then
+		mv "sample-files-${SAMPLE_COMMIT}"/* "${P}"/sample-files/ || die
+	fi
+}
+
+src_install() {
+	if use examples; then
+		docinto examples
+		dodoc -r Sample_Code/.
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+	distutils-r1_src_install
+}
--- a/dev-python/apispec/Manifest
+++ b/dev-python/apispec/Manifest
@ -1,2 +1,3 @@
 DIST apispec-5.1.1.gh.tar.gz 70296 BLAKE2B 339706890d23c796ea73c23735c5655694315a8a8017eba8f69574ed4e85ddf9a65c3a26482a78f08a118afd19e3c9bbcc9d264bb770941d7affbf7cf85eb925 SHA512 4e0e2959699c735c5242aa1a954392d97ea4809aafbd8d091f608baf7397a31964852588c474acb84e8755a62849837d741eb1e5fdf1cd5304f46c852e346d03
 DIST apispec-5.2.0.gh.tar.gz 71284 BLAKE2B 554539790c58f88f475a7c638130ccdf24bcf80e024bc640919226b0a1408af97c3403ff294f47fb2cb478a26285bc6aacb021f6275eb211dc86fd31780f573a SHA512 6f36dcce8b503847a981c87ed1139b89bbb9be9e22db67402cd7e74be8a5ce58714329b33c8489b63f5aa56fe92d65fb5aea332c9bd2e8f140dfc92165432005
+DIST apispec-5.2.1.gh.tar.gz 71348 BLAKE2B c908fb3741e72d0e8a3dfd70c186255cb5862f7c51c32c5c54ea3cba38a7ce9e02143e029a505f30f284f7b5490946897fead535a9a8743549806aacd1c7791d SHA512 020d377e4dd9e2e3514cf48450bee9a5b957cb0d419f7fa4da35691b68cd108673b133d4ad07b908ca377b1418d087979eea409382ca743d350aec95b796f00f
--- a/dev-python/apispec/apispec-5.2.1.ebuild
+++ b/dev-python/apispec/apispec-5.2.1.ebuild
@ -0,0 +1,45 @@
+# 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_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="A pluggable API specification generator"
+HOMEPAGE="
+	https://github.com/marshmallow-code/apispec/
+	https://pypi.org/project/apispec/
+"
+SRC_URI="
+	https://github.com/marshmallow-code/apispec/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>=dev-python/pyyaml-3.10[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/bottle[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		>=dev-python/marshmallow-3.13.0[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+distutils_enable_sphinx docs \
+	dev-python/sphinx-issues \
+	dev-python/sphinx_rtd_theme
+
+EPYTEST_DESELECT=(
+	# requires unpackaged prance
+	tests/test_ext_marshmallow_openapi.py::test_openapi_tools_validate_v2
+	tests/test_ext_marshmallow_openapi.py::test_openapi_tools_validate_v3
+)
--- a/dev-python/bcrypt/Manifest
+++ b/dev-python/bcrypt/Manifest
@ -1,2 +1,3 @@
 DIST bcrypt-3.2.0.tar.gz 42416 BLAKE2B ff9cca995e38fe27c6f02e9770e9349dfe528a1c9c18f41c72f29dfc01e981373fc0964f3a74161f2a7dddea63c5f48708539221adcd5a8ae99b7c30d7b1afd8 SHA512 aa782aa6a725434e0b0737973e33e6c2bf4e82d39e8dfba0913da5d7dd051d55217adab8004c3eaf896fc3c3e145ba543da1b5162a667a3d82a4eb6b07430b80
 DIST bcrypt-3.2.1.tar.gz 42371 BLAKE2B b2157dbde3412cfc643bed9e847999bfc02a2d6f41b6527e85e52ddb04b462fdacd2fd40f2794fdfcdd6a7be6a153dfd98a50212bb78bfd870262a040b2de592 SHA512 16fdb1740d635eba11f6786cf02684cd9012899e4136347e95ec7944c41f838014dd8b5c73c47070bce50f475aa9ff3ba9078f68de4450d2d92a94761fb6de44
+DIST bcrypt-3.2.2.tar.gz 42455 BLAKE2B 01cfd126662b16bd9df782effd58cf8fa1bc518af95d814fb5a857ff8d8a4a9bc302241341e656247c49e0f39a7d69feb0d40dec9dd8463bc150b6ebdd165c2b SHA512 2f3b88bffaa9ff820aba6fb3143253b7936a1440ae93caff13cbdff58c1f8427f132cce60299cda523659b7026751a954b476857f2b9841cdd2a1a50c430a626
--- a/dev-python/bcrypt/bcrypt-3.2.2.ebuild
+++ b/dev-python/bcrypt/bcrypt-3.2.2.ebuild
@ -0,0 +1,28 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
+DISTUTILS_USE_PEP517=setuptools
+
+inherit distutils-r1
+
+DESCRIPTION="Modern password hashing for software and servers"
+HOMEPAGE="
+	https://github.com/pyca/bcrypt/
+	https://pypi.org/project/bcrypt/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="Apache-2.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 ~sparc-solaris"
+
+RDEPEND="
+	$(python_gen_cond_dep '
+		>=dev-python/cffi-1.1:=[${PYTHON_USEDEP}]
+	' 'python*')
+"
+
+distutils_enable_tests pytest
--- a/dev-python/flask-login/Manifest
+++ b/dev-python/flask-login/Manifest
@ -1 +1,2 @@
 DIST flask-login-0.6.0.gh.tar.gz 47368 BLAKE2B 799591ec0bd538e6cc467a80b3a8891a97ee60bbfcf01eb6ba7be1ab48e7ea9be22e8777801621b39bf089c00d7914f7b045e4e6617e45d623354276ba7e245b SHA512 0766ef5702105bc2cea7082b2b2a9bebed282a9166757adbc91a02c4adcc291d41a3217e8b9566b6bb4778db4a1d2453edb0b7a727c9bff2673833d27b69148e
+DIST flask-login-0.6.1.gh.tar.gz 48215 BLAKE2B eb1fa81aad9bd8cf663b3ea85649f90f39d7a91c4c771e697b0cb7d66c7e4a5994befbaad36a7deba6f5aea27e6f47ff616aa00cd073433851cf8a9248e4b3a3 SHA512 f220e24079923c669d1ce27fdbc7ff8e07e92bc947e2708034cb349176e33ae0adf36ef6c30e8328f592d9a3eb6d0796dc577033f07c33ef0bc48c13a11a942e
--- a/dev-python/flask-login/flask-login-0.6.1.ebuild
+++ b/dev-python/flask-login/flask-login-0.6.1.ebuild
@ -0,0 +1,42 @@
+# 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_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Login session support for Flask"
+HOMEPAGE="
+	https://github.com/maxcountryman/flask-login/
+	https://pypi.org/project/Flask-Login/
+"
+SRC_URI="
+	https://github.com/maxcountryman/flask-login/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+RDEPEND="
+	>=dev-python/flask-1.0.4[${PYTHON_USEDEP}]
+	>=dev-python/werkzeug-1.0.1[${PYTHON_USEDEP}]
+"
+DEPEND="
+	test? (
+		dev-python/asgiref[${PYTHON_USEDEP}]
+		dev-python/blinker[${PYTHON_USEDEP}]
+		dev-python/semantic_version[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx docs
+distutils_enable_tests pytest
+
+python_test() {
+	epytest -p no:httpbin
+}
--- a/dev-python/imageio/Manifest
+++ b/dev-python/imageio/Manifest
@ -1,3 +1,2 @@
-DIST imageio-2.16.2.gh.tar.gz 366758 BLAKE2B cf2f9f2649f3d5a44d5d8efee19406b38cbb8de6fbd079170fd8eb43f893151f68b256e5d3d1fbb766c7f0562783ca2237e6171785927c8ed69a14840f1acb02 SHA512 1a6e0c9ed58d91fc89810d36acc8f5355ec5f0cf8a7dcc099f3a71cd77bc9d5fcf2821a7bd5f67723be46395290c99e4f478949aa11134f11ff2068504c83c04
-DIST imageio-2.17.0.gh.tar.gz 383819 BLAKE2B 3676fb6c4de9d4a1dea8e240d14702dec760970f4e5655e54acf68530f1833e24f22b938175795d359eac99c63c32e1a99c45501b54729ec4efcc308cdb2e745 SHA512 f6cb4697ceddd43338ef994fc242a921f0c8054655ce63878cc25c8afd28317fadf9806b84f6f337bcc30a61306b451ca29582ddcc1f66e40b6f298620287e11
 DIST imageio-2.18.0.gh.tar.gz 384312 BLAKE2B 5683ec01db358d9074c5e02c0006bf89e5978418d86b13ce93b1c0fb0800fb650b76d53bd4fdea94c69c185af3341e1e2e80c91815d0f74ebadcaa01ee497e5a SHA512 ddd7606f4b72e3a768b2f7f71d058d11df2bd6e48455240d17b2d93394808158c4f52289ea6f47b5c5655ec45e514aa4413248de0aff1806d28922723540aa50
+DIST imageio-2.19.0.gh.tar.gz 387467 BLAKE2B bd37ed1d8c147159a6e3dc951c512ddd1bdcc5c664ea1cae80d7eed4544b9329e92f711452442a459e776ec151db751d1d1c62a7d9e1165c18dcc5f0d05ec9c2 SHA512 effa3865259a1dab901a1ef2acf2cdbd57db96308b9edd8d489ff7421e51da0b2b8b8b93a7e3003bac43dd010c4f30aa683fd22236ea5d82af9d8d48b7b60db7
--- a/dev-python/imageio/imageio-2.16.2.ebuild
+++ b/dev-python/imageio/imageio-2.16.2.ebuild
@ -1,51 +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_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python library for reading and writing image data"
-HOMEPAGE="https://imageio.github.io/"
-SRC_URI="
-	https://github.com/imageio/imageio/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-# over 50% of tests rely on Internet
-PROPERTIES="test_network"
-RESTRICT="test"
-
-RDEPEND="
-	>=dev-python/numpy-1.20.0[${PYTHON_USEDEP}]
-	>=dev-python/pillow-8.3.2[${PYTHON_USEDEP}]
-	media-libs/freeimage
-"
-# requests for fsspec[github]
-BDEPEND="
-	test? (
-		dev-python/fsspec[${PYTHON_USEDEP}]
-		dev-python/psutil[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/tifffile[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	# Fails because of system installed freeimage
-	tests/test_core.py::test_findlib2
-)
-
-EPYTEST_IGNORE=(
-	# Needs unpackaged imageio_ffmpeg
-	tests/test_ffmpeg.py
-	tests/test_ffmpeg_info.py
-)
--- a/dev-python/imageio/imageio-2.19.0.ebuild
+++ b/dev-python/imageio/imageio-2.19.0.ebuild
@ -9,7 +9,11 @@ PYTHON_COMPAT=( python3_{8..10} )
 inherit distutils-r1

 DESCRIPTION="Python library for reading and writing image data"
-HOMEPAGE="https://imageio.github.io/"
+HOMEPAGE="
+	https://imageio.readthedocs.io/en/stable/
+	https://github.com/imageio/imageio/
+	https://pypi.org/project/imageio/
+"
 SRC_URI="
 	https://github.com/imageio/imageio/archive/v${PV}.tar.gz
 		-> ${P}.gh.tar.gz
@ -43,4 +47,6 @@ distutils_enable_tests pytest
 EPYTEST_DESELECT=(
 	# Fails because of system installed freeimage
 	tests/test_core.py::test_findlib2
+	# Tries to download ffmpeg binary ?!
+	tests/test_ffmpeg.py::test_get_exe_installed
 )
--- a/dev-python/inflect/Manifest
+++ b/dev-python/inflect/Manifest
@ -1,2 +1,3 @@
 DIST inflect-5.4.0.tar.gz 68594 BLAKE2B 60898e019c04b9d86a1591c341f48e7e3093eaa4f93bb4f902f4d405f1151d705f902b792028ca97a85ed47ffe509bab758b3ec74878ec82f5dac3c953197ca0 SHA512 48b7d38faf41b3f682226b66ea5493b7d4ff58a8db52c9b90092fc329aee761b090791deeda24234b9f9fa47d8db9b499e1f4304367ef3637c441959e8b8d005
 DIST inflect-5.5.2.tar.gz 68843 BLAKE2B 60bfeedc6a106b5b2715aebe158670fe18c097f7b28a353b6225d71366723113ff247fc9d23d5e740385811dfa335f1c67fa1497712854e3140ff3b0a150459a SHA512 836ae6ec8dd450d6ffca5e69ac1b4889c631fa0caf9326716b571a56aec9feace33894a35cd87a56dadd7ecdd2586cde12345a6b06368ef485ef9ce2b117d137
+DIST inflect-5.6.0.tar.gz 69251 BLAKE2B 49ebba7149fb550a75818a18a47c6524a046855c330d924bbcad7751b09538902cd1f9075a77922defdda1b8d29dd4966569c7f8c1a2364518cef96799ed21cf SHA512 c7cdd57d84b40c2479637eaf37089b2c5c16d738feb28c71f4fbd3fa4e08f0683c8e1a1e47904fb89afb90404ec8652e48941cbd2f1643dfdfebeaaf307e56ac
--- a/dev-python/inflect/inflect-5.6.0.ebuild
+++ b/dev-python/inflect/inflect-5.6.0.ebuild
@ -0,0 +1,26 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( pypy3 python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Correctly inflect words and numbers"
+HOMEPAGE="
+	https://pypi.org/project/inflect/
+	https://github.com/jaraco/inflect/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+
+BDEPEND="
+	>=dev-python/setuptools_scm-3.4.1[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
--- a/dev-python/jupyterlab-lsp/Manifest
+++ b/dev-python/jupyterlab-lsp/Manifest
@ -1 +1 @@
-DIST jupyterlab-lsp-3.10.0.tar.gz 269237 BLAKE2B 379716c2dc61053f10b70969b63a62b3d8c57915c472ee04f55513236f318d787ae92257751f789a2a7fe3b6faef5141e54ef7708c76f7720eabe8edf855a28e SHA512 a62073744a6ab5d57af12e738ef754f139bf34fdcbd54921127a1273f238cbda3f9ac859f7702ab862ba5597dcd75d22c0db9423ef6c7b2ee9c3459efda3b2a5
+DIST jupyterlab-lsp-3.10.1.tar.gz 269339 BLAKE2B 18949cb5b2ae73b1beb623756d9aa316192ea0ba5074edc106e3acd8a3cc6e0803c01727ce4416a3ba0f6b2fc88def2d4c93deead33ca55c4735e8a45c48afd9 SHA512 56fccdc383ebf12572dc61f37d76c0a6aaa0021fea75ead7dbf51e9eba7e25986d9f3752f1146b6dc2cad8c565026e7354cd0c56bf32607421c6a4de0f9b5da6
--- a/dev-python/jupyterlab-lsp/jupyterlab-lsp-3.10.1.ebuild
+++ b/dev-python/jupyterlab-lsp/jupyterlab-lsp-3.10.1.ebuild
--- a/dev-python/jupyterlab/Manifest
+++ b/dev-python/jupyterlab/Manifest
@ -1 +1 @@
-DIST jupyterlab-3.3.2.tar.gz 17141751 BLAKE2B 268a83f201fe9d31b7f90538312f5729b5fd174b2e51eb5c65d3ed8d1bc34655571cc239d34c5f38ae1c76eccae30f82ce2152dbddf2bb7149affbda6d3e0cc9 SHA512 35384ddf82860b98f4ed17ad8eacebb9f4a2fdaef955b016c6971ca228b2c42cbf13cac7975d76fffdfcd703f9b128ddca5099d6d5ef1625fe12fe68e14137ac
+DIST jupyterlab-3.3.4.tar.gz 17147292 BLAKE2B 0ae9895a96deaa81f5da9f6ddc74c9127c579722a8275df82e10a0da849552369d34259877acbf6c1ae5de4519fbce96c8923437db913d44cc8b8db4ff5433ea SHA512 d5002e86c4d84664271e735069db2bdaa8ab3a567861433793ca388a601e6f582bf884680992e0c2238f3bc2880a05c3a1ffd4e95aa0f7df91c4bed58f7692b6
--- a/dev-python/jupyterlab/jupyterlab-3.3.4.ebuild
+++ b/dev-python/jupyterlab/jupyterlab-3.3.4.ebuild
@ -4,6 +4,7 @@
 EAPI=8

 PYTHON_COMPAT=( python3_{8..10} )
+DISTUTILS_USE_PEP517=jupyter
 inherit distutils-r1

 DESCRIPTION="JupyterLab computational environment"
--- a/dev-python/jupyterlab_server/Manifest
+++ b/dev-python/jupyterlab_server/Manifest
@ -1 +1,2 @@
 DIST jupyterlab_server-2.11.2.tar.gz 62113 BLAKE2B b5c7e9062e3419d643d22980804c608ce3e274f9f213f184fb44131dc21ed192b46de61b97c55785dc88e7ce9e3145e1d6319316cc743b4de849be81fa43261e SHA512 c3b6a3455841ba7b2b2613987eec41ffe1c6023685ae46755980cbef4fab8b98ab4d47bf02345852941c8f6e15107f79ebf981b68e3ce47d5ead14ccc81cbdfe
+DIST jupyterlab_server-2.13.0.tar.gz 63896 BLAKE2B 4dd1f643cc68c9676ebab347a6ea01a58176a35d45262174e66c2e5b49881b21aa24692996d0622b96d0453793d04164f6eba710c2d7a31420ce12e52ac2c7fd SHA512 b7243c77765c811bce8ba82a612c034da22aa8ac7bc889a5d246a7db283bca29bf555f4ca849b8615c28d3d4cab57fbf08b0a15e08e045e9032792805cee59f8
--- a/dev-python/jupyterlab_server/jupyterlab_server-2.13.0.ebuild
+++ b/dev-python/jupyterlab_server/jupyterlab_server-2.13.0.ebuild
@ -0,0 +1,42 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+DISTUTILS_USE_PEP517=setuptools
+inherit distutils-r1
+
+DESCRIPTION="Server components for JupyterLab and JupyterLab like applications"
+HOMEPAGE="https://jupyter.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+
+# TODO: package openapi et al
+RESTRICT="test"
+
+RDEPEND="
+	dev-python/Babel[${PYTHON_USEDEP}]
+	>=dev-python/importlib_metadata-3.6[${PYTHON_USEDEP}]
+	>=dev-python/jinja-3.0.3[${PYTHON_USEDEP}]
+	dev-python/json5[${PYTHON_USEDEP}]
+	>=dev-python/jsonschema-3.0.1[${PYTHON_USEDEP}]
+	dev-python/packaging[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	>=dev-python/jupyter_server-1.8[${PYTHON_USEDEP}]
+	<dev-python/jupyter_server-2[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+# TODO: package autodoc_traits
+#distutils_enable_sphinx docs/source dev-python/pydata-sphinx-theme dev-python/myst_parser
+
+python_prepare_all() {
+	# Do not depend on pytest-cov
+	sed -i -e '/addopts/d' pyproject.toml || die
+
+	distutils-r1_python_prepare_all
+}
--- a/dev-python/libvirt-python/libvirt-python-8.2.0.ebuild
+++ b/dev-python/libvirt-python/libvirt-python-8.2.0.ebuild
@ -18,7 +18,7 @@ if [[ ${PV} == *9999* ]]; then
 else
 	SRC_URI="https://libvirt.org/sources/python/${MY_P}.tar.gz
 		verify-sig? ( https://libvirt.org/sources/python/${MY_P}.tar.gz.asc )"
-	KEYWORDS="~amd64 ~arm64 ~ppc64 x86"
+	KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 	RDEPEND="app-emulation/libvirt:0/${PV}"
 fi
 S="${WORKDIR}/${P%_rc*}"
--- a/dev-python/mkdocs-git-revision-date-localized-plugin/Manifest
+++ b/dev-python/mkdocs-git-revision-date-localized-plugin/Manifest
@ -1,3 +1,4 @@
 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
 DIST mkdocs-git-revision-date-localized-plugin-1.0.0.tar.gz 375656 BLAKE2B 3dc850f219ca0396015c474d714412253b05075f5ad55fbfdcc4ed90468466e6c6735904517d598b66cf408c222e83ed35d176b1379a26a97b64d88bcbff06b6 SHA512 632f4e2d0ce8fc0f90707918526e49e2752ecc36c2623eb0df76d49476f6e4b347265166f5f1d6148475bb01bdb61a6337a3edf6ccba2cccb2c372a9aba70cac
+DIST mkdocs-git-revision-date-localized-plugin-1.0.1.tar.gz 375668 BLAKE2B 355b0fdced378305dd12c72d05186ef50fc1e5b7e5302c9c0887ced03329d598528367313e81d3c8a4658ed1bb2e940c9495c09c2e6e40a03cbc52833fbb13a5 SHA512 7f54ac18bb09ce1f396d593edb5e456476c18c68464dafc62e6b6e1f3aa89735319016925d2f2b8a4ff7aed03d8e02109da23f23a84d9ae0d138bbca278aafd5
--- a/dev-python/mkdocs-git-revision-date-localized-plugin/mkdocs-git-revision-date-localized-plugin-1.0.1.ebuild
+++ b/dev-python/mkdocs-git-revision-date-localized-plugin/mkdocs-git-revision-date-localized-plugin-1.0.1.ebuild
@ -0,0 +1,58 @@
+# 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_{8..10} )
+
+DOCS_BUILDER="mkdocs"
+DOCS_DEPEND="
+	dev-python/mkdocs-i18n
+	dev-python/mkdocs-material
+	dev-python/mkdocs-git-authors-plugin
+	dev-python/mkdocs-git-revision-date-localized-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-python/mkdocs-i18n[${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
+}
--- a/dev-python/mkdocs-material/Manifest
+++ b/dev-python/mkdocs-material/Manifest
@ -1,3 +1,4 @@
 DIST mkdocs-material-8.2.10.gh.tar.gz 8324008 BLAKE2B 333c8cdcc09cb4b64cc165884933e81c5986b9d7c423f722c517b73a6348d97396b359ca20488de5dbd547816070c4585f6e21f0ad13e8415f7b007d1207fb72 SHA512 c9babbb06a91d52e8a9f6e33b1a2a15ab124af5322b893667d704acaa77f4d7702b4fd05e3d677770f02dcf7e9a14bc70ac048599ecbb8817c7af3ce84b69368
 DIST mkdocs-material-8.2.11.gh.tar.gz 8333237 BLAKE2B 10b891f712a9df03a6e3cccb2e1df15c8dca138b18aed3f4ece33bdc5c81c545b3d5a8030f5a6346277150661586fce33888a4837cc7452c077362da7be9bfaf SHA512 02af540a966cc684d2dd014764b18f85ffe854c0093ac7b69ae147ba57c4d059d8a8ba83439ca9b31c9bdf4436c524467590de74e09f2bdbb070c1cfd464ff2a
+DIST mkdocs-material-8.2.13.gh.tar.gz 8333520 BLAKE2B f2ba716a43f2db823cc824e69b57b9ea2982cc8da73c61fa6b4984a04aab04df72bfa63b671c21e8db9648e2d6891d6e0c9e9294d3bf88b4f530ae22a7c8a6d7 SHA512 ffcde4b54e4ff0fb298ef9c818230209aaeae41d5489e735d6c3b25a0c0242b58e1d587cf791791ac6b1f19152e7f599898d5c3da44eb7888abbebb4e3e3ef63
 DIST mkdocs-material-8.2.8.gh.tar.gz 8304608 BLAKE2B ff44912e812a32c7bc99fb7a07178864a952ecfbe953fe8e4d06188e2cf79f87276a881aeba1b2e5b5c290b4e12afa72761b35988290b7039163c643ec51c154 SHA512 fd2308f78c2dfff81d917f958903fee44fdd214a209464c4279d399812a686a26084e40367b0809889f682adfe5d1fe3b4707dc206621f3aa216be59e13d5d0a
--- a/dev-python/mkdocs-material/mkdocs-material-8.2.13.ebuild
+++ b/dev-python/mkdocs-material/mkdocs-material-8.2.13.ebuild
@ -0,0 +1,41 @@
+# 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_{8..10} )
+
+DOCS_BUILDER="mkdocs"
+DOCS_DEPEND="
+	dev-python/mkdocs-material-extensions
+	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.3.0[${PYTHON_USEDEP}]
+	>=dev-python/pygments-2.12[${PYTHON_USEDEP}]
+	>=dev-python/pymdown-extensions-9.4[${PYTHON_USEDEP}]
+"
+
+# mkdocs-material-extensions depends on mkdocs-material creating a circular dep
+PDEPEND=">=dev-python/mkdocs-material-extensions-1.0.3[${PYTHON_USEDEP}]"
--- a/dev-python/mkdocs-redirects/Manifest
+++ b/dev-python/mkdocs-redirects/Manifest
@ -1 +1,2 @@
 DIST mkdocs-redirects-1.0.3.gh.tar.gz 6395 BLAKE2B 6e6b319cacd5039550755b1796d09c5377b65174b9e0f2dab7e47b37626bfdeda4f9c52ecc7eb3adeec31f4c28c408bcbc4f8461b16c8f02cfb60bdf929d776a SHA512 7977e92e1e8e29a7ef3f3644060d1d872bb67c2386d1880799b95e7d505834ff629bf70824301972f10af39ad8c60e8813f28ca3165ddb9b150af359bce361c9
+DIST mkdocs-redirects-1.0.4.tar.gz 7028 BLAKE2B b1f266b2bd68ecaf722d28f3fde7f5ab6eb51c800027d09838282f12f8705d2f9ed6f3d45c809ec575e73c70a05ab23d0700f0d6e15a0f36e1fa2f8becabb5b0 SHA512 965989351c62ad83dab4f02526ad118f90d3b9eca9863189565a04d7013aa5de0fb2ac1a8480f308e72aef125ecd74c53a7d2db0b279835074272d30c9eb87ab
--- a/dev-python/mkdocs-redirects/mkdocs-redirects-1.0.3-r1.ebuild
+++ b/dev-python/mkdocs-redirects/mkdocs-redirects-1.0.3-r1.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 EAPI=8
@ -12,11 +12,11 @@ COMMIT="07ef89796ec97be3c6ea2681441992d5d4bfa87b"

 DESCRIPTION="Plugin for Mkdocs page redirects"
 HOMEPAGE="
-	https://github.com/datarobot/mkdocs-redirects
+	https://github.com/mkdocs/mkdocs-redirects
 	https://pypi.org/project/mkdocs-redirects/
 "
 SRC_URI="
-	https://github.com/datarobot/mkdocs-redirects/archive/${COMMIT}.tar.gz
+	https://github.com/mkdocs/mkdocs-redirects/archive/${COMMIT}.tar.gz
 		-> ${P}.gh.tar.gz
 "
 S="${WORKDIR}/${PN}-${COMMIT}"
--- a/dev-python/mkdocs-redirects/mkdocs-redirects-1.0.4.ebuild
+++ b/dev-python/mkdocs-redirects/mkdocs-redirects-1.0.4.ebuild
@ -0,0 +1,28 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Plugin for Mkdocs page redirects"
+HOMEPAGE="
+	https://github.com/mkdocs/mkdocs-redirects
+	https://pypi.org/project/mkdocs-redirects/
+"
+SRC_URI="https://github.com/mkdocs/mkdocs-redirects/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv ~x86"
+
+RDEPEND="
+	>=dev-python/mkdocs-1.0.4[${PYTHON_USEDEP}]
+	<dev-python/mkdocs-2[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/twine[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
--- a/dev-python/nbclassic/Manifest
+++ b/dev-python/nbclassic/Manifest
@ -1 +1 @@
-DIST nbclassic-0.3.5.tar.gz 22668 BLAKE2B d7e74e1274294e9d0d8888d0ccb2718fd02d73eca22d29b3b944a1886f4b7dfd8c7ee893239856790f0b7e84e3c9102c27fa12cd06be8a4015b0197e3516d41a SHA512 a3b5b0b4f11be93adee4f8669127de0b1a5c9d38fedefbb924b7b446db9f0e7e0987b17f62f7d831d7a2dd87de605a2300973735a4d2b8cefbbcbab8403a3d1c
+DIST nbclassic-0.3.7.tar.gz 15973 BLAKE2B a26a975fa8711c41a199e0b88b5ec83aefa4b812fce6ab4a765aa4920fae6b863519dbae556d663bf761a866a26ee6fe7c322c947312b89770a34f2a5b570455 SHA512 3ceaeeafa7e56d17cda29e4c86b4cb5f44517721b47e41ad1ac535704b8f460d88a5feb280ad8a9cef78366581e08c94837cab4ef2eae8dbce2ded183a787ea2
--- a/dev-python/nbclassic/nbclassic-0.3.7.ebuild
+++ b/dev-python/nbclassic/nbclassic-0.3.7.ebuild
@ -4,7 +4,7 @@
 EAPI=8

 PYTHON_COMPAT=( python3_{8..10} )
-
+DISTUTILS_USE_PEP517=jupyter
 inherit distutils-r1

 DESCRIPTION="Jupyter Notebook as a Jupyter Server Extension"
@ -16,8 +16,9 @@ SLOT="0"
 KEYWORDS="~amd64"

 RDEPEND="
-	dev-python/jupyter_server[${PYTHON_USEDEP}]
+	>=dev-python/jupyter_server-1.8[${PYTHON_USEDEP}]
 	<dev-python/notebook-7[${PYTHON_USEDEP}]
+	>=dev-python/notebook_shim-0.1.0[${PYTHON_USEDEP}]
 "

 BDEPEND="
@ -29,13 +30,6 @@ BDEPEND="

 distutils_enable_tests pytest

-python_prepare_all() {
-	# Defining 'pytest_plugins' in a non-top-level conftest is no longer supported:
-	mv ${PN}/conftest.py . || die
-
-	distutils-r1_python_prepare_all
-}
-
 python_install_all() {
 	distutils-r1_python_install_all
 	# move /usr/etc stuff to /etc
--- a/dev-python/notebook_shim/Manifest
+++ b/dev-python/notebook_shim/Manifest
@ -0,0 +1 @@
+DIST notebook_shim-0.1.0.tar.gz 12275 BLAKE2B 47e975cd91b9ee1e6436db099b13ff664b25c96f3fd7fa39b54d5daad5154976bdf877607156688d118c6bfc458f941151fc9763c596458432e70e17de77eb59 SHA512 7814b5bb4d4c4dd39b1ce3629e77513bdc3069a553208ee5a2bb6432fda5d20dcf48bbf5d8f61b9bc1f2ea666abd8706a8e8ba627b27ff4561eb4982ba04b1dc
--- a/dev-python/notebook_shim/metadata.xml
+++ b/dev-python/notebook_shim/metadata.xml
@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <stabilize-allarches/>
+  <upstream>
+    <remote-id type="pypi">notebook-shim</remote-id>
+    <remote-id type="github">jupyter/notebook_shim</remote-id>
+  </upstream>
+</pkgmetadata>
--- a/dev-python/notebook_shim/notebook_shim-0.1.0.ebuild
+++ b/dev-python/notebook_shim/notebook_shim-0.1.0.ebuild
@ -0,0 +1,43 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+DISTUTILS_USE_PEP517=jupyter
+inherit distutils-r1
+
+DESCRIPTION="A shim layer for notebook traits and config"
+HOMEPAGE="https://jupyter.org"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	>=dev-python/jupyter_server-1.8[${PYTHON_USEDEP}]
+"
+
+BDEPEND="
+	>=dev-python/jupyter_packaging-0.9[${PYTHON_USEDEP}]
+	test? (
+		dev-python/pytest-console-scripts[${PYTHON_USEDEP}]
+		dev-python/pytest-tornasync[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# Defining 'pytest_plugins' in a non-top-level conftest is no longer supported:
+	mv ${PN}/conftest.py . || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	# move /usr/etc stuff to /etc
+	mv "${ED}/usr/etc" "${ED}/etc" || die
+}
--- a/dev-python/pypiserver/Manifest
+++ b/dev-python/pypiserver/Manifest
@ -1 +1,2 @@
 DIST pypiserver-1.4.2.tar.gz 511019 BLAKE2B fe9a41c35d601ee20f2cfe0773ce341b8c8fe387a2b825d1e6d669d5f358846b436158beb8a1222fa33cf1841cad5aceacc0f5063f899445ad15ca9eb5b8efd7 SHA512 8597a6a7e83cb3f5ead3418ee91167e1764c123b244c05397fa892c8ebe84b58569f27ce85cd9849d6a41d20342de21cf9cc46e00b233d9d94d0540470e1c49b
+DIST pypiserver-1.5.0.gh.tar.gz 149963 BLAKE2B bfc0760982f97e93357702342eb5b1776f72c43e66742a8741ee2ba3109839006e99e49b65e04380097500c400e09bce77b74fc5f9072c7670349817ae3a73cb SHA512 c93e724a3aa6ec265d483c2989129292a05132d3d52db6d9b9c1429610ee23b56e106c9389bdfaad142f34071ee258bdd4291668c11f8bb412df043bf4555611
--- a/dev-python/pypiserver/pypiserver-1.5.0.ebuild
+++ b/dev-python/pypiserver/pypiserver-1.5.0.ebuild
@ -0,0 +1,57 @@
+# 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_{8..10} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Minimal PyPI server"
+HOMEPAGE="
+	https://github.com/pypiserver/pypiserver/
+	https://pypi.org/project/pypiserver/
+"
+SRC_URI="
+	https://github.com/pypiserver/pypiserver/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="ZLIB MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+
+RDEPEND="
+	dev-python/pip[${PYTHON_USEDEP}]
+	>=dev-python/wheel-0.25.0[${PYTHON_USEDEP}]
+"
+# NB: many test deps are optional/specific to tests we skip
+BDEPEND="
+	dev-python/setuptools-git[${PYTHON_USEDEP}]
+	test? (
+		>=dev-python/passlib-1.6[${PYTHON_USEDEP}]
+		dev-python/setuptools[${PYTHON_USEDEP}]
+		dev-python/twine[${PYTHON_USEDEP}]
+		dev-python/webtest[${PYTHON_USEDEP}]
+	)
+"
+
+DOCS=( README.rst )
+
+distutils_enable_tests pytest
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# Internet
+		tests/test_server.py::test_hash_algos
+		tests/test_server.py::test_pipInstall_openOk
+		tests/test_server.py::test_pipInstall_authedOk
+		# TODO
+		tests/test_app.py::test_root_count
+		tests/test_server.py::test_pip_install_open_succeeds
+		tests/test_server.py::test_pip_install_authed_succeeds
+	)
+
+	epytest tests
+}
--- a/dev-python/python-email-validator/Manifest
+++ b/dev-python/python-email-validator/Manifest
@ -1,2 +1,3 @@
 DIST python-email-validator-1.1.3.tar.gz 19863 BLAKE2B 10700b4c6a48c50095045b6e3c9218cd565776b26e17c1c043633e208b9fbd346162cedaa4a1116ec2fccf63b4383438c7e1aef6faf9d2ead5512af7f934675c SHA512 d9087bf56783daf389909e13652a9db8f0408badf454f6239aa20f6a5e9510619d3662cf1567a03d0b14c4bbe81644509cd12975b2aa1b544d644b6c2b2854f4
 DIST python-email-validator-1.2.0.tar.gz 22603 BLAKE2B cc2364e903cf4f1c3983ad4764a46a317188353899f8cd929c72c60387a25a819405b0cf8253488fa11e4ce9be48df98c64bdc0c3df1664a74c2e6c9c4389e6a SHA512 3c4f87e0992615ae4d1f44e6e0fe9909b43d5810f2aca96129f5ee4dcadac7b4ec5a979dbf6e03f60b8bda2ff0d7cf87f9276c4b4c624e2d036627e2d5d8afad
+DIST python-email-validator-1.2.1.gh.tar.gz 24348 BLAKE2B 7cd19c07bd0b8c467c0f0ec15376f0677305c6025eff5a86854dfd7cad3fe6971e218e724d86d4040af3f590fe5e841e469dea7dc8526031dccb494845848630 SHA512 e758518ef114e08cca0f83c681e6ff7ec6fad54c1e0bba727ee0f8917e93040ed3873ba0207e21a4830208d98637937294c5c28d67c317dc4ad3351c7d3f99a4
--- a/dev-python/python-email-validator/python-email-validator-1.2.1.ebuild
+++ b/dev-python/python-email-validator/python-email-validator-1.2.1.ebuild
@ -0,0 +1,44 @@
+# 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_{8..10} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="A robust email syntax and deliverability validation library"
+HOMEPAGE="
+	https://github.com/JoshData/python-email-validator/
+	https://pypi.org/project/email-validator/
+"
+SRC_URI="
+	https://github.com/JoshData/python-email-validator/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="CC0-1.0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+SLOT="0"
+
+RDEPEND="
+	>=dev-python/idna-2.8[${PYTHON_USEDEP}]
+	>=dev-python/dnspython-1.15.0[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+	# these tests rely on access to gmail.com
+	tests/test_main.py::test_deliverability_found
+	tests/test_main.py::test_deliverability_fails
+	# these tests rely on example.com being resolvable
+	"tests/test_main.py::test_email_example_reserved_domain[me@mail.example]"
+	"tests/test_main.py::test_email_example_reserved_domain[me@example.com]"
+	"tests/test_main.py::test_email_example_reserved_domain[me@mail.example.com]"
+	tests/test_main.py::test_validate_email__with_caching_resolver
+	tests/test_main.py::test_main_single_good_input
+	tests/test_main.py::test_main_multi_input
+	tests/test_main.py::test_main_input_shim
+)
--- a/dev-python/python-mpv/Manifest
+++ b/dev-python/python-mpv/Manifest
@ -1 +1,2 @@
 DIST python-mpv-0.5.2.tar.gz 207755 BLAKE2B 3222a54db145a66ae8b992f1c4e8243c50099573586fd8be9a2d88ff360898bf9b72905c22c8d056178b7917f093a494dce9138f3f8bb5782152dc38b71b1dad SHA512 cd542b0866d6c75395f1ca00bb6df3981998dd801dcee97b15e080fe66e94270f15daa674f663aa6974dcf6aa425d6e17f8476031badeec035727b2b690816f3
+DIST python-mpv-1.0.1.tar.gz 210008 BLAKE2B 3ba95ac4d3219615c80ea475c1f6dc3acd608a8ded919eea55efac8bb44a8946c959a2b39473e6c9e80fa1a4e52f525d6ef9871e3eb4b2664aeb1460208bc677 SHA512 16a6e93b63f30e535c1e3bd77702d7c703dd9c0a6a689f09e689663cac04e587bdc2135612062d791ffb38c709bc289d0297ebf9f1ddaf9b1771f25eae225f1b
--- a/dev-python/python-mpv/python-mpv-1.0.1.ebuild
+++ b/dev-python/python-mpv/python-mpv-1.0.1.ebuild
@ -0,0 +1,32 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+DISTUTILS_USE_PEP517=setuptools
+inherit distutils-r1 virtualx
+
+DESCRIPTION="Python interface to the mpv media player"
+HOMEPAGE="https://github.com/jaseg/python-mpv"
+SRC_URI="https://github.com/jaseg/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="AGPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+
+# https://github.com/jaseg/python-mpv/issues/209
+RESTRICT="test"
+
+RDEPEND="
+	media-video/mpv[libmpv]
+	dev-python/pillow[${PYTHON_USEDEP}]
+"
+
+BDEPEND="test? ( dev-python/xvfbwrapper[${PYTHON_USEDEP}] )"
+
+distutils_enable_tests pytest
+
+python_test() {
+	virtx epytest
+}
--- a/dev-python/pyzotero/Manifest
+++ b/dev-python/pyzotero/Manifest
@ -1,2 +1 @@
-DIST pyzotero-1.5.1.gh.tar.gz 520410 BLAKE2B ac3aeb0f55f4685135bcf35594fc925f471a92ac9dfe866a4cffffc62d06b1447c80fedc566100d5fc9550ebcc54c7bcaa0b3d8494229791a4b51c806b40dc1c SHA512 76a498a6d16cef0024cd0e1a6d5011a4c2639a573746d0acd2d18616e452ad1f0eabbb92ae073e7e36ebc208870dedb2b3a01b0d70442b10ae81148e9b1cfd73
-DIST pyzotero-1.5.2.gh.tar.gz 520633 BLAKE2B a23641098e595194291df39b87433f47165e60d2af38ba8698d6ff8772841216a95afe413435fea17c2b9e55d60700878593c4b7ae79546b3568aecc22320d5b SHA512 610a0a56854acfa7df7c2ed3467339c9e735c3269e90601ac2e3d0c0c8d538e6023e8d6a6ce9a787c909aa1c005084c0648e5dfd924e81b6ba138811cf630517
+DIST pyzotero-1.5.3.tar.gz 525734 BLAKE2B 11de38c1954478ed9918f33bdbf550d6d0eda99a6e38154361c2da336158bacfaf16f1d9bb9ff08550e6951c3e29efe50618c78672bfcec6237bc42e6b52c6c5 SHA512 b31872db4a2fd53f6c17f6a33115ac762147810efae6f6351579a03f651f843e46b1d5f584cc47c1d20d8dad5c318d2835c2e053bc43f3063e84bce85658d9fb
--- a/dev-python/pyzotero/pyzotero-1.5.1-r1.ebuild
+++ b/dev-python/pyzotero/pyzotero-1.5.1-r1.ebuild
@ -1,35 +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_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="A Python client for the Zotero API"
-HOMEPAGE="https://github.com/urschrei/pyzotero"
-SRC_URI="https://github.com/urschrei/pyzotero/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="
-	app-text/zotero-bin
-	dev-python/bibtexparser[${PYTHON_USEDEP}]
-	dev-python/feedparser[${PYTHON_USEDEP}]
-	dev-python/pytz[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-"
-
-BDEPEND="
-	test? (
-		dev-python/python-dateutil[${PYTHON_USEDEP}]
-		dev-python/httpretty[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx doc --no-autodoc
-distutils_enable_tests pytest
--- a/dev-python/pyzotero/pyzotero-1.5.1.ebuild
+++ b/dev-python/pyzotero/pyzotero-1.5.1.ebuild
@ -1,32 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="A Python client for the Zotero API"
-HOMEPAGE="https://github.com/urschrei/pyzotero"
-SRC_URI="https://github.com/urschrei/pyzotero/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="
-	app-text/zotero-bin
-	dev-python/bibtexparser[${PYTHON_USEDEP}]
-	dev-python/feedparser[${PYTHON_USEDEP}]
-	dev-python/pytz[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-"
-
-BDEPEND="
-	test? (
-		dev-python/python-dateutil[${PYTHON_USEDEP}]
-		dev-python/httpretty[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_sphinx doc --no-autodoc
-distutils_enable_tests pytest
--- a/dev-python/pyzotero/pyzotero-1.5.3.ebuild
+++ b/dev-python/pyzotero/pyzotero-1.5.3.ebuild
@ -10,7 +10,7 @@ inherit distutils-r1

 DESCRIPTION="A Python client for the Zotero API"
 HOMEPAGE="https://github.com/urschrei/pyzotero"
-SRC_URI="https://github.com/urschrei/pyzotero/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"

 LICENSE="MIT"
 SLOT="0"
--- a/dev-python/sqlalchemy/sqlalchemy-1.4.35.ebuild
+++ b/dev-python/sqlalchemy/sqlalchemy-1.4.35.ebuild
@ -49,6 +49,14 @@ python_test() {
 	[[ ${EPYTHON} == pypy3 ]] && EPYTEST_DESELECT+=(
 		test/ext/test_associationproxy.py::ProxyHybridTest::test_msg_fails_on_cls_access
 	)
+	if ! has_version "dev-python/greenlet[${PYTHON_USEDEP}]"; then
+		EPYTEST_DESELECT+=(
+			test/ext/asyncio/test_engine_py3k.py::TextSyncDBAPI::test_sync_driver_execution
+			test/ext/asyncio/test_engine_py3k.py::TextSyncDBAPI::test_sync_driver_run_sync
+			"test/engine/test_pool.py::PoolEventsTest::test_checkin_event_gc[True-_exclusions0]"
+			"test/engine/test_pool.py::QueuePoolTest::test_userspace_disconnectionerror_weakref_finalizer[True-_exclusions0]"
+		)
+	fi

 	# upstream's test suite is horribly hacky; it relies on disabling
 	# the warnings plugin and turning warnings into errors;  this also
--- a/dev-python/sqlalchemy/sqlalchemy-1.4.36.ebuild
+++ b/dev-python/sqlalchemy/sqlalchemy-1.4.36.ebuild
@ -49,6 +49,14 @@ python_test() {
 	[[ ${EPYTHON} == pypy3 ]] && EPYTEST_DESELECT+=(
 		test/ext/test_associationproxy.py::ProxyHybridTest::test_msg_fails_on_cls_access
 	)
+	if ! has_version "dev-python/greenlet[${PYTHON_USEDEP}]"; then
+		EPYTEST_DESELECT+=(
+			test/ext/asyncio/test_engine_py3k.py::TextSyncDBAPI::test_sync_driver_execution
+			test/ext/asyncio/test_engine_py3k.py::TextSyncDBAPI::test_sync_driver_run_sync
+			"test/engine/test_pool.py::PoolEventsTest::test_checkin_event_gc[True-_exclusions0]"
+			"test/engine/test_pool.py::QueuePoolTest::test_userspace_disconnectionerror_weakref_finalizer[True-_exclusions0]"
+		)
+	fi

 	# upstream's test suite is horribly hacky; it relies on disabling
 	# the warnings plugin and turning warnings into errors;  this also
--- a/dev-python/wrapt/Manifest
+++ b/dev-python/wrapt/Manifest
@ -1,2 +1,3 @@
 DIST wrapt-1.13.2.tar.gz 130624 BLAKE2B 7ad74653208042326630ae4464494fcdd5299b35a42d495a16a3cbd68bb60fe5ea17f3e95eac85d98142fe339a593a8cda7e3182ce2a6e96f6ba2bb204a1fc46 SHA512 14648465745af7972ffd449783a24a4b5bf8187cbee517d3427825409bd5d073e3153a0c61f5583b84fc6ca2c48479ebf112977ce340369019a617559d09dfc0
 DIST wrapt-1.14.0.tar.gz 133565 BLAKE2B 7548183c4b0b566df3a96cb309b44975a633976f6b56a332d87587dbce5bfaf80cbbfc692ef163118794c1d8e44995ef4750748990ab3e6f5f87968df44f02aa SHA512 ef31279873688208bb17d875a3bbdba3d506f5d9febeae28f1bdb740830395d86aa21dcbe747d592f098b745e5a599c352e122a642f923eab0eb39a30f19695d
+DIST wrapt-1.14.1.gh.tar.gz 133767 BLAKE2B 407a9531f581b034be7fe4392dcbf94803aa9c3a82d7c392750dfef62a5cbb84582e292819bf749356fad2b6e98cc89777df0f3b0f4ca70422e75b72ad256711 SHA512 c67e99eb29afeefb2512fb545cd180b8e96f69235d6281edebe62ea5e411188a904a7e683afdda2d6a86cf8b7fd74f79a3c3bec04e19a7c5ef347729bb43f94c
--- a/dev-python/wrapt/wrapt-1.14.1.ebuild
+++ b/dev-python/wrapt/wrapt-1.14.1.ebuild
@ -0,0 +1,31 @@
+# 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_{8..10} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Module for decorators, wrappers and monkey patching"
+HOMEPAGE="
+	https://github.com/GrahamDumpleton/wrapt/
+	https://pypi.org/project/wrapt/
+"
+SRC_URI="
+	https://github.com/GrahamDumpleton/wrapt/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+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"
+
+distutils_enable_tests pytest
+distutils_enable_sphinx docs dev-python/sphinx_rtd_theme
+
+python_compile() {
+	local -x WRAPT_INSTALL_EXTENSIONS=true
+	distutils-r1_python_compile
+}
--- a/dev-python/wsproto/Manifest
+++ b/dev-python/wsproto/Manifest
@ -1,2 +1 @@
-DIST wsproto-1.0.0.tar.gz 53423 BLAKE2B b4cc8c1ef0ccf324821b893b57fc86ab744c639dd07604618485004ef56ca105b5515e1f34a08ccc93de941b1a93eb76ef0d1946f11e05f80d40b98bfe7e4c56 SHA512 36f8c4eebf84bfe869f7124330898d22416b423f47396f2e3f72069e14f1763514e1df700c3e8ee81467cf973197e10143e088978d0688930fa98518af8773fb
 DIST wsproto-1.1.0.tar.gz 52928 BLAKE2B 837f5d8411a55b026d8c5df8b03b44c92f71fe2856884e5199e639a5c060fabbe8eec39cb6861e8f88ae7fc366cbeef4f9d62dade2c95857d27339fa73e90638 SHA512 0cd726bc62ca4d11e96f470f51511008bd43dbb9e99a17633d2a40da7bdaf19716e0a1c995350f5c8f418f906848dd6f2b9b0a853c1b6858ddafa1cc02fab710
--- a/dev-python/wsproto/wsproto-1.0.0-r1.ebuild
+++ b/dev-python/wsproto/wsproto-1.0.0-r1.ebuild
@ -1,26 +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_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="WebSockets state-machine based protocol implementation"
-HOMEPAGE="
-	https://github.com/python-hyper/wsproto/
-	https://pypi.org/project/wsproto/
-"
-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"
-
-RDEPEND="
-	>=dev-python/h11-0.9[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
--- a/dev-python/wsproto/wsproto-1.0.0.ebuild
+++ b/dev-python/wsproto/wsproto-1.0.0.ebuild
@ -1,22 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="WebSockets state-machine based protocol implementation"
-HOMEPAGE="
-	https://github.com/python-hyper/wsproto/
-	https://pypi.org/project/wsproto/"
-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"
-
-RDEPEND=">=dev-python/h11-0.9[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
--- a/dev-python/zeroconf/Manifest
+++ b/dev-python/zeroconf/Manifest
@ -1 +1,2 @@
 DIST python-zeroconf-0.38.4.gh.tar.gz 133770 BLAKE2B 2b7b01112957ed9456acd7ef842a010d38b2a6e589b1714ed3fd47d2b51f448bf716bdd8511b0a3f4560cdcf0cc16bad06ac73f9a42b5c5cf4154b48cafdf97b SHA512 6b0df6fed453dab2e554d4af4d807eed1108fe50fdcc41096a11944577ee8cfa0a0b30491a1ebe6d95ddc5b78c3c0cb07bd34ef279fbfca70775628667f40212
+DIST python-zeroconf-0.38.5.gh.tar.gz 134146 BLAKE2B d1ad69e8fe9f236c95862e1e415c5739a5627ed6d96b71f7af418e1f5cc9ca9c57feac34fa18d3928bdc6cf54c7d28dd30c9f259038e018746ad6a3671101225 SHA512 68ee397b567795f55e9374906761682e404ee0428b8b104c3dfedac473bbda780c086d50b598be9940a9b14e58642960dc29280036d3ff8e3fb76660806e0f54
--- a/dev-python/zeroconf/zeroconf-0.38.5.ebuild
+++ b/dev-python/zeroconf/zeroconf-0.38.5.ebuild
@ -0,0 +1,46 @@
+# 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_{8..10} )
+
+inherit distutils-r1
+
+MY_P=python-zeroconf-${PV}
+DESCRIPTION="Pure Python Multicast DNS Service Discovery Library (Bonjour/Avahi compatible)"
+HOMEPAGE="
+	https://github.com/jstasiak/python-zeroconf/
+	https://pypi.org/project/zeroconf/
+"
+SRC_URI="
+	https://github.com/jstasiak/python-zeroconf/archive/${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	>=dev-python/ifaddr-0.1.7[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+	# network
+	tests/test_core.py::Framework::test_close_multiple_times
+	tests/test_core.py::Framework::test_launch_and_close
+	tests/test_core.py::Framework::test_launch_and_close_context_manager
+	tests/test_core.py::Framework::test_launch_and_close_v4_v6
+	tests/test_core.py::Framework::test_launch_and_close_v6_only
+	tests/services/test_types.py::ServiceTypesQuery::test_integration_with_listener_ipv6
+)
--- a/eclass/Manifest.gz
+++ b/eclass/Manifest.gz
--- a/eclass/apache-2.eclass
+++ b/eclass/apache-2.eclass
@ -650,7 +650,6 @@ apache-2_src_install() {
 	mv -f "${ED%/}/var/www/localhost/icons" \
 		"${ED%/}/usr/share/apache2/icons" || die
 	rm -rf "${ED%/}/var/www/localhost/" || die
-	eend $?

 	# set some sane permissions for suexec
 	if use suexec ; then
--- a/games-action/Manifest.gz
+++ b/games-action/Manifest.gz
--- a/games-action/polymc/Manifest
+++ b/games-action/polymc/Manifest
@ -1,2 +1 @@
-DIST polymc-1.1.1.tar.gz 5116164 BLAKE2B ca251cac3c8ea21de8a59297a0e637dac078d751476fec5fe86696df270c63ff079779056f016fa656506ea205bb7ace50ab6e0df190ffca14e43297b92292af SHA512 db32479e9e8a92ec61292c97281673b3084e1085d29b764214834de872d9eddf2ed1d2e383bcd79197e0c9321eec025af652b12c863596ff6abb0f5fba9a7af5
 DIST polymc-1.2.1.tar.gz 5157547 BLAKE2B 92a65cd1303b4f2dce299d2a40824de54babd47bd21a894827e7a0e94276551fc747873ba44e63ac13b3ca46649c3d5280ec9eecd92eb63678f8cbc3c27e4f69 SHA512 193415b552dbc3f540f481c22e36c2b9d0604757cb12283ec0fc2979246757937648b76821818f0742b3f5201ed7af8e535dff9ef3d5efcb22f7a1ddf9ee67d2
--- a/Show More
+++ b/Show More
				`@ -0,0 +1 @@`
				`DIST notebook_shim-0.1.0.tar.gz 12275 BLAKE2B 47e975cd91b9ee1e6436db099b13ff664b25c96f3fd7fa39b54d5daad5154976bdf877607156688d118c6bfc458f941151fc9763c596458432e70e17de77eb59 SHA512 7814b5bb4d4c4dd39b1ce3629e77513bdc3069a553208ee5a2bb6432fda5d20dcf48bbf5d8f61b9bc1f2ea666abd8706a8e8ba627b27ff4561eb4982ba04b1dc`