gentoo resync : 16.04.2022

21 files changed, 54 insertions, 267 deletions

diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz
index b91ea360a789..dd4dca522207 100644
--- a/app-crypt/Manifest.gz
+++ b/app-crypt/Manifest.gz
diff --git a/app-crypt/acme/Manifest b/app-crypt/acme/Manifest
index 8ff8c714319a..15eced4c2cb9 100644
--- a/app-crypt/acme/Manifest
+++ b/app-crypt/acme/Manifest
@@ -1,8 +1,6 @@
-DIST certbot-1.23.0.tar.gz 1361107 BLAKE2B a1b1e029436eb32840d56ca815478df3774a30b69552c5f7a4ca18b054a49c8ce342fe7f7ffecfb6c0fb93338bb722d57e4537e1f142ab162bb8208575ee34be SHA512 bb64139c6406e7c87571beb94d435e079368cbb249d96b522dab72a9529b3a825f9258aac70c5a582d58117c700da281fb43ed8369f40a236c0b7e6acb5237b0
 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
-EBUILD acme-1.23.0.ebuild 1131 BLAKE2B 6e845db59eae454ae90bab6d1b28fd93fbe41a7400f23d4f21cc3613066cb13de266dca8264d9cd2d669c4a5fb25fd27eac0067fa15405ddfb0fb9c9fa05079c SHA512 2880e2bde0e06bfec48bb874988ec4c7c7fe5675ae5b3f00cb36ad13d831907b7d4a93c4b4e87337fc6b8faec226ef49589342f9e7e7b4e7d060e1ced13b4f92
 EBUILD acme-1.24.0.ebuild 1140 BLAKE2B c7d9a0aadb9fc19e0952bf952efd9ee9b9279a0f2a01725df139116cbf63ee5d7ba2cac0d87ec27d83017c764c3720c5045aa5a2154a8533910c085baa6f9f6d SHA512 e74f2386ba68c226740e5e61f8a76088bf26a8f13e1f269b8c11c7e978da13b0852b6ca2b129021febd690c2a2ba490c332edd68420a4667bde0fd17c5ad0d6c
 EBUILD acme-1.25.0.ebuild 1142 BLAKE2B 53a5d26bdec0161638b21e37b8f274de986e029568ec4ac83fa92fe4ba5596f7b30b6cc07527f2c251a3009ab851ea57ff7c1c298d59defa65fde67647815c0f SHA512 dcb6317e211f649b2b4923d3912761454e72094bab3ca505194eef240deabadade81f7bf49c42e42d3b1e77398130c7dd85092ea593523b66c3ade7d82273d5b
 EBUILD acme-1.26.0.ebuild 1142 BLAKE2B 53a5d26bdec0161638b21e37b8f274de986e029568ec4ac83fa92fe4ba5596f7b30b6cc07527f2c251a3009ab851ea57ff7c1c298d59defa65fde67647815c0f SHA512 dcb6317e211f649b2b4923d3912761454e72094bab3ca505194eef240deabadade81f7bf49c42e42d3b1e77398130c7dd85092ea593523b66c3ade7d82273d5b
diff --git a/app-crypt/acme/acme-1.23.0.ebuild b/app-crypt/acme/acme-1.23.0.ebuild
deleted file mode 100644
index 24fb5b46fab7..000000000000
--- a/app-crypt/acme/acme-1.23.0.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-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[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
-	>=dev-python/requests-toolbelt-0.3.0[${PYTHON_USEDEP}]
-"
-
-distutils_enable_sphinx docs dev-python/sphinx_rtd_theme
-distutils_enable_tests pytest
diff --git a/app-crypt/asekey/Manifest b/app-crypt/asekey/Manifest
index a662d2711068..890d553a874b 100644
--- a/app-crypt/asekey/Manifest
+++ b/app-crypt/asekey/Manifest
@@ -1,4 +1,4 @@
 AUX asekey-3.7-bundle.patch 727 BLAKE2B 0758992095369eadb49e4daec62a0786e790acf7e39f980f74627440b53a4eae8ac57be07cb0cabbb898e207adda3e543631e9b398770e72cc4e38fd1e153a16 SHA512 4cc556687f59371d0f1919f8649b705801da4427cdc011a40b9627601e90cd27f3a06684a721cb25f1c51b10ec28f6ae728e33fbc30217716250d42c6c15efe2
 DIST asekey-3.7.tar.bz2 33304 BLAKE2B 95bba8ded9557105dba50a587665ee638162ae6eefe1017a4ed272364eec1da7154b21833ed2f08fa7f4c3d570971795a0a6f65efebe517124da572d0b9b7d91 SHA512 29a01f8250d5fb26a4ba2aca562211cadf403c9e986f9fa6930faf477c374e13095c025b2917e6e837cbe8d83f3a3e023a527598b151ef1c704247c7e7c40647
-EBUILD asekey-3.7.ebuild 685 BLAKE2B 48f4d6aad57d64ad7cfdccf8e9672cc79cec4d5ae2abca06623b387448462b76eef4e00c23fd654ed71bcf12ed01b186b5414fd9cd26a7f6ba70a549334a7ff2 SHA512 6c5ae60dec8c7fa5563785c0712d559ec28a582742168abc078e1cd310db01e2f8b09255205461f751ac95aed802c2405e4d33c82b22cbe5ac7c85609643b69c
+EBUILD asekey-3.7.ebuild 692 BLAKE2B dcb7a2545d4c4490d42255ec32b68cafd228493b9e7c9d3ccf86804b382b4b9e6625b4912ca2aa104a4e2e41792f145eb6e71551b1119ebb03757b9a1f4e6980 SHA512 eb53cbbb4cd928bbc75dec44e2ddef3027283b0fb321275c0d5e100c05ff9b73e6087a1eac62c7074892c75ab34d5128b04483523de0c32e4811d0d72d277774
 MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/app-crypt/asekey/asekey-3.7.ebuild b/app-crypt/asekey/asekey-3.7.ebuild
index fcf24ad70acf..e7f6dbe08462 100644
--- a/app-crypt/asekey/asekey-3.7.ebuild
+++ b/app-crypt/asekey/asekey-3.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="http://www.athena-scs.com/docs/reader-drivers/${PN}-${PV/./-}-tar.bz2 -
 LICENSE="BSD LGPL-2.1"
 
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~riscv ~x86"
 
 RDEPEND="sys-apps/pcsc-lite[udev]
 	virtual/libusb:0"
diff --git a/app-crypt/certbot-apache/Manifest b/app-crypt/certbot-apache/Manifest
index d27cdc43044d..caf3d9194a11 100644
--- a/app-crypt/certbot-apache/Manifest
+++ b/app-crypt/certbot-apache/Manifest
@@ -1,8 +1,6 @@
-DIST certbot-1.23.0.tar.gz 1361107 BLAKE2B a1b1e029436eb32840d56ca815478df3774a30b69552c5f7a4ca18b054a49c8ce342fe7f7ffecfb6c0fb93338bb722d57e4537e1f142ab162bb8208575ee34be SHA512 bb64139c6406e7c87571beb94d435e079368cbb249d96b522dab72a9529b3a825f9258aac70c5a582d58117c700da281fb43ed8369f40a236c0b7e6acb5237b0
 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
-EBUILD certbot-apache-1.23.0.ebuild 945 BLAKE2B 11822156671a8a090c234685393f7a1e832f03eb168d7c65775163fbbfde98cf47e106466e68f11b0036536bd380764bc153ce7f73e9b2b1115893324ad8a621 SHA512 aa6605c150f841510e7b1eee3ef4a8a2edd4f9cccb28dd66d3c3ad9aac029c0b3c6c0aff189ca9e2621fba93ad0cb11a80a6f7ea75892d4c32876cd381752c6f
 EBUILD certbot-apache-1.24.0.ebuild 945 BLAKE2B 11822156671a8a090c234685393f7a1e832f03eb168d7c65775163fbbfde98cf47e106466e68f11b0036536bd380764bc153ce7f73e9b2b1115893324ad8a621 SHA512 aa6605c150f841510e7b1eee3ef4a8a2edd4f9cccb28dd66d3c3ad9aac029c0b3c6c0aff189ca9e2621fba93ad0cb11a80a6f7ea75892d4c32876cd381752c6f
 EBUILD certbot-apache-1.25.0.ebuild 947 BLAKE2B 57472217512ae222c82d13b4f4d9ad0298c4ecf3f177714e0fa82486e94b6f49a2db45ec125c1af349e63cd24c432f3e24d67f61e2725da031988d38aa8dfa09 SHA512 2712fed72fa6a444ec6fd048cb47760580c432eb73ae2bd6167523a7e512489b241d7f7eef567980b2d188c9755abc35b3cd304044b6e5304aa002901c5cf9b3
 EBUILD certbot-apache-1.26.0.ebuild 947 BLAKE2B 57472217512ae222c82d13b4f4d9ad0298c4ecf3f177714e0fa82486e94b6f49a2db45ec125c1af349e63cd24c432f3e24d67f61e2725da031988d38aa8dfa09 SHA512 2712fed72fa6a444ec6fd048cb47760580c432eb73ae2bd6167523a7e512489b241d7f7eef567980b2d188c9755abc35b3cd304044b6e5304aa002901c5cf9b3
diff --git a/app-crypt/certbot-apache/certbot-apache-1.23.0.ebuild b/app-crypt/certbot-apache/certbot-apache-1.23.0.ebuild
deleted file mode 100644
index 85b55229a0d2..000000000000
--- a/app-crypt/certbot-apache/certbot-apache-1.23.0.ebuild
+++ /dev/null
@@ -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
diff --git a/app-crypt/certbot-nginx/Manifest b/app-crypt/certbot-nginx/Manifest
index b2669a2779b5..3e24039ced2b 100644
--- a/app-crypt/certbot-nginx/Manifest
+++ b/app-crypt/certbot-nginx/Manifest
@@ -1,8 +1,6 @@
-DIST certbot-1.23.0.tar.gz 1361107 BLAKE2B a1b1e029436eb32840d56ca815478df3774a30b69552c5f7a4ca18b054a49c8ce342fe7f7ffecfb6c0fb93338bb722d57e4537e1f142ab162bb8208575ee34be SHA512 bb64139c6406e7c87571beb94d435e079368cbb249d96b522dab72a9529b3a825f9258aac70c5a582d58117c700da281fb43ed8369f40a236c0b7e6acb5237b0
 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
-EBUILD certbot-nginx-1.23.0.ebuild 963 BLAKE2B 20859aa73cec63010791a78c32e72f719d80f707f2d0e69fde17c033cf97cd74b8924e65913d9301222ca9c4f6129328b03989f46df88200b5bf1be3f6357565 SHA512 da4806d3e91315b41f4c9fac029dc56024b3386073d706b7cc558054aa3a3614361c439e769979ae9ea1cea01b8f334596a68267dec6e96b4977b6842879e5e7
 EBUILD certbot-nginx-1.24.0.ebuild 963 BLAKE2B ef69ff6b60789e3339091a31c52b8b3ca8ede1cb84c877e741eb975e860d295d03b85345a3ace63baf2f24fb3f6fd8dc14e81e769ed09fb92efe17e37d155299 SHA512 05c3214eb5ae0fb4ae2df86da5196d1c45627431d7e7462d650a71f7e7645a4cb991cd31c4be03a72919d222fa8b228a549374c6442c4f0055c8dab87a41047e
 EBUILD certbot-nginx-1.25.0.ebuild 965 BLAKE2B 7b098dd3c540c9fe96750722a696386de685db8e4bc62689e08cc298b3d53fd8561411f7e8366b93999a49aaf2f7dcca7c5b483a49ba873ef7c746f49a36001c SHA512 4acb894e4d79fd1b989cc03cc738a6bc81605eb6d889c31f73a2398aead9b46a5cfbea8c0adc07f079adc21dbcb10655135024bbe2d091fdb748d71b0ff98539
 EBUILD certbot-nginx-1.26.0.ebuild 965 BLAKE2B 7b098dd3c540c9fe96750722a696386de685db8e4bc62689e08cc298b3d53fd8561411f7e8366b93999a49aaf2f7dcca7c5b483a49ba873ef7c746f49a36001c SHA512 4acb894e4d79fd1b989cc03cc738a6bc81605eb6d889c31f73a2398aead9b46a5cfbea8c0adc07f079adc21dbcb10655135024bbe2d091fdb748d71b0ff98539
diff --git a/app-crypt/certbot-nginx/certbot-nginx-1.23.0.ebuild b/app-crypt/certbot-nginx/certbot-nginx-1.23.0.ebuild
deleted file mode 100644
index 89ab14446617..000000000000
--- a/app-crypt/certbot-nginx/certbot-nginx-1.23.0.ebuild
+++ /dev/null
@@ -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.0[${PYTHON_USEDEP}]
-	dev-python/zope-interface[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
diff --git a/app-crypt/certbot/Manifest b/app-crypt/certbot/Manifest
index 6bfea7d560c5..fdf78ad56ae5 100644
--- a/app-crypt/certbot/Manifest
+++ b/app-crypt/certbot/Manifest
@@ -1,8 +1,6 @@
-DIST certbot-1.23.0.tar.gz 1361107 BLAKE2B a1b1e029436eb32840d56ca815478df3774a30b69552c5f7a4ca18b054a49c8ce342fe7f7ffecfb6c0fb93338bb722d57e4537e1f142ab162bb8208575ee34be SHA512 bb64139c6406e7c87571beb94d435e079368cbb249d96b522dab72a9529b3a825f9258aac70c5a582d58117c700da281fb43ed8369f40a236c0b7e6acb5237b0
 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
-EBUILD certbot-1.23.0.ebuild 1189 BLAKE2B 48787ae31f36e63f29778acd2065e7415ae8b5d567d91560ebd000efa5d9fa31e4c2011c195587013ffc86c0c0adc2a318c7477330e01f3829b46043b34f7ecf SHA512 88734a7665c33ce553b63fb7473a2687e2e305984fb1eb4288402fc1a7d01b3099d2c081f884d5da2768476ff8b02eeab42be46fe8bb2599e120e8095837a24b
 EBUILD certbot-1.24.0.ebuild 1198 BLAKE2B a68e47a00da38c01662214ba5c8fc7ee424eab0e5901891bf532c662df0313cdadaeb2f6e6275f88219259f72ddccc7e15cc05f3179dbe67f8047be59810cf2a SHA512 801f729a2b7dceb289d61549a7f9659658bae7230337f4b373b1bce680fb21cec06896d4227ffaa8e3d05b620b89af3f42c0870ca82a946e486097e06b097f31
 EBUILD certbot-1.25.0.ebuild 1201 BLAKE2B ad7fab99d0f48ee39b4e5a3a730e02b38cac87f88e491afe2a094eafefd2458aa90c7e54f9ee2f892952d872d1f224034efa3497bd31ad74d1e8c03f6c2301ed SHA512 ed209dfe4b42ba1b2a8d839ad40dab0a18a690b0db1e8388f647b3e1b8e67876015f6d34ee0448d1ab5236f4bfb91a907deb00af0fc43fb8e170152bb5831f49
 EBUILD certbot-1.26.0.ebuild 1201 BLAKE2B ad7fab99d0f48ee39b4e5a3a730e02b38cac87f88e491afe2a094eafefd2458aa90c7e54f9ee2f892952d872d1f224034efa3497bd31ad74d1e8c03f6c2301ed SHA512 ed209dfe4b42ba1b2a8d839ad40dab0a18a690b0db1e8388f647b3e1b8e67876015f6d34ee0448d1ab5236f4bfb91a907deb00af0fc43fb8e170152bb5831f49
diff --git a/app-crypt/certbot/certbot-1.23.0.ebuild b/app-crypt/certbot/certbot-1.23.0.ebuild
deleted file mode 100644
index 08785c973b2a..000000000000
--- a/app-crypt/certbot/certbot-1.23.0.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=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[${PYTHON_USEDEP}]
-	dev-python/zope-component[${PYTHON_USEDEP}]
-	dev-python/zope-interface[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
diff --git a/app-crypt/signify/Manifest b/app-crypt/signify/Manifest
index 5297e1426160..fef387f7f3d2 100644
--- a/app-crypt/signify/Manifest
+++ b/app-crypt/signify/Manifest
@@ -2,6 +2,6 @@ AUX signify-30-man_compress.patch 576 BLAKE2B b6c82f0737dcfd569bc781d84eaecad2c0
 DIST signify-30.sha.sig 246 BLAKE2B b5c26ad1d90ce562a5e6e8cb0a26c031da6bcc9d04cdd668f7b81410ba38ef1777db8f1a4b38fc515c251c840baf38e3df6b3f730a59a0921180ccb88f457fe5 SHA512 b0aea8736b4508ce5a45a296e11150218d694351b15d87478cad235869a6b0150d1893247d1600ea1679d47e71e87e629f5cf4932ecafa2ad4f05aa962f1743d
 DIST signify-30.tar.gz 94593 BLAKE2B 2d432cef9990a8ce23d0f05449ef02dcf7a00f4328a25dcab98cd25c2c74875fd8ea7ed7a67b7e4ac6c9f432a91564edcc1fc9260627c37352c19cc17581aea3 SHA512 4a1ebcdbf7aa74865b97cadbf5380460702306b6d0a77306e6c943bb0c3419ca929ecd3455522da4448d780a56c8eddeb26fb4d7fb006fc3bf23f69693c39e87
 DIST signify-30.tar.xz 73824 BLAKE2B 27de72ac82d9b66346185292cad71e57af0767111123ba0c618a7d5d4add2e5502b546ffd53ffa2956c66b8f00d2b1a96d21958125d5649d6efb23254c0f56ac SHA512 e760fd89de8a3fea76bd0aa52c683e1d331968620190f4ac487bbca30da00f8d6e2636bbe3c59b0e6fa925b1bbcf81516f50c0bc37707ae7e7465b61fee5c372
-EBUILD signify-30-r2.ebuild 1163 BLAKE2B 480194840d37c4d8ad5cc374a7bc4c11bdb4b46413335969c1ad9334cadb0373fa569f8ad38e1efa4243ff9faf54a739054c226c130fdd9a45cb9e5bbaf03953 SHA512 b6b2cddda9127951439d2a297247d20e061ffa51180855468fc38d4884750dd89c806310950045ee14377c230506fe2d84ff8275392c00ba472c68a938dda472
+EBUILD signify-30-r2.ebuild 1175 BLAKE2B 7b341ab95bb70a3a426c1e79b58caf739f2b03e54b9ea00c83a7b0eb7f4cf149cfc2b5ea950a26f5d91c0520c8f7da0d2d88de35fb2857773611a25de2882980 SHA512 0d8fa956f84dfc93aefcce797a43f050e29aa197d63ff44b9a9655c9e49a034b77b543d03bd0e7078dde7f0eb7ac7a4d017995535db16a6b6e7b95687c10d431
 EBUILD signify-30.ebuild 616 BLAKE2B 970eeb3f56883853c77608f81af3f712d8057bb71cd5c99565a551a5e1a267358cf21e52c9e020461c8cfff09b18170cb3fb26645e8c811f9694e3169494de89 SHA512 3973c9115bf57c8582575a3791dae541bd3125241b0bfee2c046c795e627d818db8910fba83acb997fc8c27525df172908c136435006bc3fd4da571d5611f0b1
 MISC metadata.xml 437 BLAKE2B 75f7f8a4b2475b052a41134e41ab274386c5f59847bad67ad3d8bd447984a2b42a119bbc60b13df0ebed9988f98ea5382c4aff4fa093cf44c7c8d2907d0db26a SHA512 ce3b623779a2b51556bb440df1b08f386f9fcdca641d1c0b06b3c2f0d1e98649ca8b45d8b32406f7b2b53a6f781c58121da09802c1fedb76e0c604c0a3627f44
diff --git a/app-crypt/signify/signify-30-r2.ebuild b/app-crypt/signify/signify-30-r2.ebuild
index e171ad94ae3b..376a87a347f8 100644
--- a/app-crypt/signify/signify-30-r2.ebuild
+++ b/app-crypt/signify/signify-30-r2.ebuild
@@ -17,7 +17,7 @@ SRC_URI="
 
 LICENSE="BSD-1"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~riscv ~sparc x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc x86"
 
 RDEPEND="!net-mail/signify
 	>=dev-libs/libbsd-0.7"
diff --git a/app-crypt/swtpm/Manifest b/app-crypt/swtpm/Manifest
index bd04faaf7302..f6397fdf27a9 100644
--- a/app-crypt/swtpm/Manifest
+++ b/app-crypt/swtpm/Manifest
@@ -1,6 +1,6 @@
 AUX swtpm-0.5.0-build-sys-Remove-WError.patch 431 BLAKE2B 8b0d63dcab783a322c72aab6b8f7cd3de53509716d48fd2f30d136279bb2a52a6a942f43a2c87e6f66db9f3470f0486255db8056da8c49b2b788048af62aa3ba SHA512 981a1fe5bf25c7a820dc5913b0384bc48b0bc50cd84e04921f0f64a4be6dd6b2a815d4cba39370b2e62c4473f2edbdc6bba7b09ce74b9e441f1b8df3166eb959
-AUX swtpm-0.5.0-disable-test-dependencies.patch 696 BLAKE2B 7cbfb36e82b88d125dabaab8508803cde8b4fe414b1bf0e193421a7632597baa3142dcefa1bd53c7ebe6fea529ad827fc65bfd42bd617c415043b795d5c36c15 SHA512 32931311e8a4c57ae167379db5ff3decc5c1b3b891f180e6ee4991a9cf366ac26049c2e3eabc434eef3890635317f2f2cb1a80cf827a4c3e44fe76943665e85c
 AUX swtpm-0.6.0-fix-localca-path.patch 1321 BLAKE2B 06d9e7409dda7554bd819a822e2ec4e3e1b8b0a9a41bcb4c45705e082b887d4739d7bd23481dd0c528f957b78e1c84d0e33a0e8b211ee2266018c79014b83afa SHA512 c90c438ad805db4310b2fd2b8c985f86c30e4010f08be9cae2de65d8ba4c4c65df8f80eb62636b30b2cc1d5df3ebc4a225bc32f77434d603aa71ee917560d5c8
+AUX swtpm-0.7.2-Conditionalize-test-dependencies.patch 1065 BLAKE2B 359cf6e692691317255d8c456abee7fe59a5370bf94f0bdd37ee6bb16ceb80340939f3f0a348398c6c93177690f4e2dc141d2b6c9f12319586c5a850dec2cd5c SHA512 8a2731b9d9c49fa2a8ea2732b20dbbd7264b1c93b00848e67f83e5d54f8ed150e97ff940422ccf46de21ae8d81fbf951314b3908ef0377d8548adebc4872474f
 DIST swtpm-0.7.2.tar.gz 353941 BLAKE2B e4d69919b5d255cff5eb9cda4c98e84e9fd53290360312742f95d63444ad5279fc7808e7f2e040cc2c87475c409b3c0f22e54ca301e8cb18bee71290f661ecc8 SHA512 91a8f9371a13f5f6bb329ef4bd7638fb9abe5ec84631b1d22e7eb9abcb91b7f3cccfdf147f65d54c03bf4d8a141b6b5fb6385d90f78d35096bd3b8ce140d39cb
-EBUILD swtpm-0.7.2.ebuild 1441 BLAKE2B 650f9464aedf2c87df79e3a0544817284241ca0564492e62a6d094dd241a4d28be785c203b989fc3f966c089a5401f4146e22053437f1cc5070fdd68f628b4e9 SHA512 19ccd142d8a80f52abf963a6b58eec4d64edade0f0c22481e74b5661d5a337b629a516b1d78bd7a746b7e2152724dc465ee3086b371bcc009b7a2f3b826b3779
+EBUILD swtpm-0.7.2.ebuild 1452 BLAKE2B d3371c8191093994df3abef65d564c98c1f84cf5b2c9d83c2bb4a6eea094adf9da527eef5fcec5c7b61c1d888d02059578155390adb87aa7205a35236aa86224 SHA512 385e9ab56f278bcf18289d3587df6ac117b7648c539f4c0a01c1075b3b996a9ab316fff4d9187a4a4b83683e3c1b22d806bbfc1a101916a7c12b9df717e1d43c
 MISC metadata.xml 623 BLAKE2B 10e2a56c1ad2da7890bb641cdb368f0f512185cefd18356ef96c8e7b34a873c439e9f7d5d98e0e2f339a0a9f090cb372a1ef8d1cd7251efc115fc021ab05825c SHA512 edd9f7ccc6147cb92f32415ba3ed6ad9351a49fbff8655866c99e80f1782801df90a63f3ca40153bfb01d689ab642823cea5d6e144b0aede0ce6d7da8b48f5f1
diff --git a/app-crypt/swtpm/files/swtpm-0.5.0-disable-test-dependencies.patch b/app-crypt/swtpm/files/swtpm-0.5.0-disable-test-dependencies.patch
deleted file mode 100644
index 3880385256e3..000000000000
--- a/app-crypt/swtpm/files/swtpm-0.5.0-disable-test-dependencies.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index d035653..0728a2e 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -325,21 +325,11 @@ fi
- AM_CONDITIONAL([WITH_GNUTLS], [test "x$with_gnutls" = "xyes"])
- AC_SUBST([GNUTLS_LIBS])
- 
--AC_PATH_PROG([EXPECT], expect)
--if test "x$EXPECT" = "x"; then
--	AC_MSG_ERROR([expect is required: expect package])
--fi
--
- AC_PATH_PROG([GAWK], gawk)
- if test "x$GAWK" = "x"; then
- 	AC_MSG_ERROR([gawk is required: gawk package])
- fi
- 
--AC_PATH_PROG([SOCAT], socat)
--if test "x$SOCAT" = "x"; then
--	AC_MSG_ERROR([socat is required: socat package])
--fi
--
- AC_PATH_PROG([BASE64], base64)
- if test "x$BASE64" = "x"; then
- 	AC_MSG_ERROR([base64 is required: base64 package])
diff --git a/app-crypt/swtpm/files/swtpm-0.7.2-Conditionalize-test-dependencies.patch b/app-crypt/swtpm/files/swtpm-0.7.2-Conditionalize-test-dependencies.patch
new file mode 100644
index 000000000000..b17e1c2470fc
--- /dev/null
+++ b/app-crypt/swtpm/files/swtpm-0.7.2-Conditionalize-test-dependencies.patch
@@ -0,0 +1,42 @@
+configure.ac: Conditionalize test dependencies
+
+Signed-off-by: Christopher Byrne <salah.coronya@gmail.com>
+--- a/configure.ac
++++ b/configure.ac
+@@ -369,20 +369,25 @@ else
+ fi
+ AC_SUBST([DEFAULT_PCR_BANKS])
+ 
+-AC_PATH_PROG([EXPECT], expect)
+-if test "x$EXPECT" = "x"; then
+-	AC_MSG_ERROR([expect is required: expect package])
+-fi
++AC_ARG_ENABLE([test],
++	[AS_HELP_STRING([--enable-test],
++			[enable tests (default is yes)])],
++	[enable_test=$enableval],
++	[enable_test=yes])
++
++AS_IF([test "x$enable_test" != xno],
++	[AC_PATH_PROG([EXPECT], expect)
++	AS_IF([test "x$EXPECT" = "x"],
++		AC_MSG_ERROR([expect is required: expect package]))
++	AC_PATH_PROG([SOCAT], socat)
++	AS_IF([test "x$SOCAT" = "x"],
++		AC_MSG_ERROR([socat is required: socat package]))])
+ 
+ AC_PATH_PROG([GAWK], gawk)
+ if test "x$GAWK" = "x"; then
+ 	AC_MSG_ERROR([gawk is required: gawk package])
+ fi
+ 
+-AC_PATH_PROG([SOCAT], socat)
+-if test "x$SOCAT" = "x"; then
+-	AC_MSG_ERROR([socat is required: socat package])
+-fi
+ 
+ AC_PATH_PROG([BASE64], base64)
+ if test "x$BASE64" = "x"; then
+-- 
+2.34.1
+
diff --git a/app-crypt/swtpm/swtpm-0.7.2.ebuild b/app-crypt/swtpm/swtpm-0.7.2.ebuild
index 445bd551d578..5563aa1b7f60 100644
--- a/app-crypt/swtpm/swtpm-0.7.2.ebuild
+++ b/app-crypt/swtpm/swtpm-0.7.2.ebuild
@@ -44,10 +44,10 @@ DEPEND="${RDEPEND}
 PATCHES=(
 	"${FILESDIR}/${PN}-0.6.0-fix-localca-path.patch"
 	"${FILESDIR}/${PN}-0.5.0-build-sys-Remove-WError.patch"
+	"${FILESDIR}/${PN}-0.7.2-Conditionalize-test-dependencies.patch"
 )
 
 src_prepare() {
-	use test || eapply "${FILESDIR}/${PN}-0.5.0-disable-test-dependencies.patch"
 	default
 	eautoreconf
 }
@@ -58,7 +58,8 @@ src_configure() {
 		--without-selinux \
 		$(use_with fuse cuse) \
 		$(use_with gnutls) \
-		$(use_with seccomp)
+		$(use_with seccomp) \
+		$(use_enable test)
 }
 
 src_install() {
diff --git a/app-crypt/yubikey-manager/Manifest b/app-crypt/yubikey-manager/Manifest
index 3438daaa4eaf..93ed90021a36 100644
--- a/app-crypt/yubikey-manager/Manifest
+++ b/app-crypt/yubikey-manager/Manifest
@@ -1,7 +1,3 @@
-DIST yubikey-manager-4.0.5.tar.gz 142197 BLAKE2B c48a9c6ae5f2d54b24888b750c6263eb501e68be56beb9fb964e8b9ea5131a608786b2e67d0d092ebcfacb15b09cae3eec19f4271893ac77eba70eee28b6d06d SHA512 f8bddf3121c0c509fcacb56500f1c1885354aff5c00b3347d9ca84cdf1df65276ed744209d9653474909b6cba7595bc5529cd4b37ec34c35d2d2c3cf2ff850de
-DIST yubikey-manager-4.0.7.tar.gz 143622 BLAKE2B 1ea768b4b95a65dc2cbc34f1e796a1012b534495154f475c7deb9ec7dbc807ff688d864abba8001752d3717034acbf39cd1cb17f147842fc38d27a83cb8c8ddc SHA512 7ba11488cddcc7d4bb15e673b7d8d82d8e85c52d8a4a3a13c6681cc494ecf33b88eb54556785783e6ec458292f155668bac0bb3a38a2df1702a24f623f8b084e
 DIST yubikey-manager-4.0.8.tar.gz 147076 BLAKE2B efdefb15c3939bfb2171766aec195fb776668894d4439565840587d14387999e052aee6eb225b9332662f1ebdbf1db24fceb606393e23d591ff61b91c1ee96f5 SHA512 87352bbb133eead48d1588df2db5420687278a9f76ceb283a53af8eab3d29e30c86e01a588a6da2884e6dac6af192ad355a28745f2f8505ef6cd0e96dea3e9c7
-EBUILD yubikey-manager-4.0.5-r1.ebuild 992 BLAKE2B 97f3f6c6c731a99c73c0a8c138cf3245a35003d4fab8bfa03908d91183ba8c60f62125e153cd71706c8746f089d77b29d99a1b685cb2db199ac66570d182ca80 SHA512 719cab973ed71b98c2ba156ee072d7c2a524fc259c3d80420925512cb19aebeec1df4306113f8dd8675ad46f4bd40c289a155822c88c38721417f8d954c4da51
-EBUILD yubikey-manager-4.0.7.ebuild 1006 BLAKE2B 364336b23b74f0db1e9423917a68a8b3941c6a2aa8d47aa1eee43b218243b3ffa6fb022e2db31d0f9f6b02072344e083b555b07b2611f0c75392cb1b0f010b74 SHA512 8fcb0743e3c150b37e3c8c7c27be0b228ba8c3392521041c173b486d2894effbd87aae1bf45d988082b9b76d8a252d21a4ac7dec6d44f02f08423a012fe1e2b6
-EBUILD yubikey-manager-4.0.8.ebuild 1097 BLAKE2B adb63279d970b4599e48c1996285bfbe1f25f13e12c9c036c1018b1a48cac0148b8e8ef9f68e509d1af2e3493de556a2e08416ea782cfd6da414d730b8d14778 SHA512 7795882f4f55ad3132e6547add71e72df51f5a949ba1125b06362014d36725c94a0c46cb4104d142c8f022a1c26b205cfe23cfd019817583c9524c6cb18140a2
+EBUILD yubikey-manager-4.0.8.ebuild 1095 BLAKE2B 0779e3f2db841ecc0c2026bd4dadc71fc038d2460d69bd2174ac0c5122e45e9967d0f4b884a6a34eb48fba50569dac9e0ff305a6de22790aa11cb327481356f5 SHA512 2561181f6e3682be5b50c9339555f16e17925d2b6c3e138a31a6ffbb386e0a78b385faba5fc4cb02ae1f3d1e9058049f566d5e6dee6a45e2818a575162e25cd6
 MISC metadata.xml 534 BLAKE2B 1dc91b31fae812c9abf38e762d18db228cf07cb29dc41f5c7928ef417002826acaaabaa3b1374433f9fdfc251b5f5fbabbc43e66e3b94cc6df3174d3ae5aa059 SHA512 cf47e3400679f7f4feb73ef3b8282d3f4dae6b6d0e5034cbc22935fd0196be0784946bf9ac93dea7fb36a16347f867d092845c1ce3528a00c704de9657ad3821
diff --git a/app-crypt/yubikey-manager/yubikey-manager-4.0.5-r1.ebuild b/app-crypt/yubikey-manager/yubikey-manager-4.0.5-r1.ebuild
deleted file mode 100644
index 6ea12c8bda01..000000000000
--- a/app-crypt/yubikey-manager/yubikey-manager-4.0.5-r1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-DISTUTILS_USE_SETUPTOOLS=pyproject.toml
-
-inherit distutils-r1
-
-DESCRIPTION="Python library and command line tool for configuring a YubiKey"
-HOMEPAGE="https://developers.yubico.com/yubikey-manager/"
-# Per https://github.com/Yubico/yubikey-manager/issues/217, Yubico is
-# the official source for tarballs, not Github
-SRC_URI="https://developers.yubico.com/${PN}/Releases/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="amd64 ~riscv x86"
-RESTRICT="test" # Tests require non-existing package makefun
-
-# app-crypt/ccid required for
-# - 'ykman oath'
-# - 'ykman openpgp'
-# - 'ykman piv'
-RDEPEND="
-	app-crypt/ccid
-	dev-python/click[${PYTHON_USEDEP}]
-	dev-python/cryptography[${PYTHON_USEDEP}]
-	dev-python/fido2:0/0.9[${PYTHON_USEDEP}]
-	dev-python/pyscard[${PYTHON_USEDEP}]"
-
-python_install_all() {
-	distutils-r1_python_install_all
-	doman man/ykman.1
-}
diff --git a/app-crypt/yubikey-manager/yubikey-manager-4.0.7.ebuild b/app-crypt/yubikey-manager/yubikey-manager-4.0.7.ebuild
deleted file mode 100644
index 8d71a30afada..000000000000
--- a/app-crypt/yubikey-manager/yubikey-manager-4.0.7.ebuild
+++ /dev/null
@@ -1,36 +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=pyproject.toml
-
-inherit distutils-r1
-
-DESCRIPTION="Python library and command line tool for configuring a YubiKey"
-HOMEPAGE="https://developers.yubico.com/yubikey-manager/"
-# Per https://github.com/Yubico/yubikey-manager/issues/217, Yubico is
-# the official source for tarballs, not Github
-SRC_URI="https://developers.yubico.com/${PN}/Releases/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv x86"
-RESTRICT="test" # Tests require non-existing package makefun
-
-# app-crypt/ccid required for
-# - 'ykman oath'
-# - 'ykman openpgp'
-# - 'ykman piv'
-RDEPEND="
-	app-crypt/ccid
-	dev-python/click[${PYTHON_USEDEP}]
-	dev-python/cryptography[${PYTHON_USEDEP}]
-	dev-python/fido2:0/0.9[${PYTHON_USEDEP}]
-	dev-python/pyscard[${PYTHON_USEDEP}]"
-
-python_install_all() {
-	distutils-r1_python_install_all
-	doman man/ykman.1
-}
diff --git a/app-crypt/yubikey-manager/yubikey-manager-4.0.8.ebuild b/app-crypt/yubikey-manager/yubikey-manager-4.0.8.ebuild
index a1c35da4ab92..946c6bf3f775 100644
--- a/app-crypt/yubikey-manager/yubikey-manager-4.0.8.ebuild
+++ b/app-crypt/yubikey-manager/yubikey-manager-4.0.8.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://developers.yubico.com/${PN}/Releases/${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv x86"
 IUSE="ssl"
 
 # app-crypt/ccid required for